diff --git a/erpnext/translations/ar.csv b/erpnext/translations/ar.csv
index 04a5b9d..3db323e 100644
--- a/erpnext/translations/ar.csv
+++ b/erpnext/translations/ar.csv
@@ -1,13 +1,12 @@
 DocType: Employee,Salary Mode,وضع الراتب
 DocType: Cost Center,"Select Monthly Distribution, if you want to track based on seasonality.",تحديد التوزيع الشهري، إذا كنت تريد أن تتبع على أساس موسمية.
 DocType: Employee,Divorced,المطلقات
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +86,Warning: Same item has been entered multiple times.,تم إدخال البند نفسه عدة مرات: تحذير.
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +80,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,تسمح البند التي يمكن ان تضاف عدة مرات في معاملة
 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/page/setup_wizard/fixtures/industry_type.py +19,Consumer Products,المنتجات الاستهلاكية
+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,الرجاء اختيار الحزب النوع الأول
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +90,Annealing,الصلب
 DocType: Item,Customer Items,عناصر العملاء
 apps/erpnext/erpnext/accounts/doctype/account/account.py +45,Account {0}: Parent account {1} can not be a ledger,حساب {0}: حساب الرئيسي {1} لا يمكن أن يكون دفتر الأستاذ
 DocType: Item,Publish Item to hub.erpnext.com,نشر البند إلى hub.erpnext.com
@@ -20,15 +19,14 @@
 DocType: About Us Settings,Website,الموقع
 DocType: POS Profile,Applicable for User,ينطبق على العضو
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +169,"Stopped Production Order cannot be cancelled, Unstop it first to cancel",لا يمكن إلغاء توقفت أمر الإنتاج، نزع السدادة لأول مرة إلغاء
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +23,Compaction plus sintering,الضغط بالإضافة إلى تلبد
 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.,* سيتم احتسابه في المعاملة.
 DocType: Purchase Order,Customer Contact,العملاء الاتصال
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +549,From Material Request,من المواد طلب
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +572,From Material Request,من المواد طلب
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} شجرة
 DocType: Job Applicant,Job Applicant,طالب العمل
 apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,لا مزيد من النتائج.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +78,Legal,قانوني
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +34,Legal,قانوني
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +114,Actual type tax cannot be included in Item rate in row {0},لا يمكن تضمين ضريبة نوع الفعلية في سعر الصنف في الصف {0}
 DocType: C-Form,Customer,زبون
 DocType: Purchase Receipt Item,Required By,المطلوبة من قبل
@@ -43,7 +41,6 @@
 DocType: Manufacturing Settings,Default 10 mins,افتراضي 10 دقيقة
 DocType: Leave Type,Leave Type Name,ترك اسم نوع
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +148,Series Updated Successfully,تم تحديث الترقيم المتسلسل بنجاح
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +150,Stitching,درز
 DocType: Pricing Rule,Apply On,تنطبق على
 DocType: Item Price,Multiple Item prices.,أسعار الإغلاق متعددة .
 ,Purchase Order Items To Be Received,أمر شراء الأصناف التي سترد
@@ -51,8 +48,8 @@
 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 +104,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 +189,New Leave Application,إجازة جديدة التطبيق
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +134,Bank Draft,البنك مشروع
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +204,New Leave Application,إجازة جديدة التطبيق
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +134,Bank Draft,البنك مشروع
 DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,1. للحفاظ على العملاء رمز البند الحكيمة والبحث فيها لجعلها تقوم على التعليمات البرمجية الخاصة بهم استخدام هذا الخيار
 DocType: Mode of Payment Account,Mode of Payment Account,طريقة حساب الدفع
 apps/erpnext/erpnext/stock/doctype/item/item.js +34,Show Variants,مشاهدة المتغيرات
@@ -64,25 +61,23 @@
 DocType: Production Plan Item,Production Plan Item,خطة إنتاج السلعة
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +141,User {0} is already assigned to Employee {1},المستخدم {0} تم تعيينه بالفعل إلى موظف {1}
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +13,Make new POS Profile,جعل الملف الجديد POS
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +31,Health Care,الرعاية الصحية
+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 +494,Invoice,فاتورة
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +519,Invoice,فاتورة
 DocType: Maintenance Schedule Item,Periodicity,دورية
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +357,Email Address,عنوان البريد الإلكتروني
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +21,Defense,دفاع
+apps/erpnext/erpnext/public/js/setup_wizard.js +107,Email Address,عنوان البريد الإلكتروني
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,دفاع
 DocType: Company,Abbr,ابر
 DocType: Appraisal Goal,Score (0-5),نقاط (0-5)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +193,Row {0}: {1} {2} does not match with {3},صف {0} {1} {2} لا يتطابق مع {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +67,Row # {0}:,الصف # {0}
 DocType: Delivery Note,Vehicle No,السيارة لا
 apps/erpnext/erpnext/public/js/pos/pos.js +528,Please select Price List,الرجاء اختيار قائمة الأسعار
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +162,Woodworking,النجارة
 DocType: Production Order Operation,Work In Progress,التقدم في العمل
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +153,3D printing,طباعة ثلاثية الأبعاد
 DocType: Employee,Holiday List,عطلة قائمة
 DocType: Time Log,Time Log,وقت دخول
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +530,Accountant,محاسب
+apps/erpnext/erpnext/public/js/setup_wizard.js +274,Accountant,محاسب
 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.",سجل الأنشطة التي يقوم بها المستخدمين من المهام التي يمكن استخدامها لتتبع الوقت، والفواتير.
@@ -98,18 +93,19 @@
 DocType: Bin,Quantity Requested for Purchase,مطلوب للشراء كمية
 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/setup/page/setup_wizard/setup_wizard.js +626,Kg,كجم
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Kg,كجم
 apps/erpnext/erpnext/config/hr.py +48,Opening for a Job.,فتح عن وظيفة.
 DocType: Item Attribute,Increment,زيادة
 apps/erpnext/erpnext/public/js/stock_analytics.js +63,Select Warehouse...,حدد مستودع ...
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +6,Advertising,إعلان
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,إعلان
+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/doctype/sales_invoice/sales_invoice.py +389,Stock cannot be updated against Delivery Note {0},لا يمكن تحديث الأسهم ضد تسليم مذكرة {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +391,Stock cannot be updated against Delivery Note {0},لا يمكن تحديث الأسهم ضد تسليم مذكرة {0}
 DocType: Payment Reconciliation,Reconcile,توفيق
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +30,Grocery,بقالة
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,بقالة
 DocType: Quality Inspection Reading,Reading 1,قراءة 1
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Make Bank Entry,جعل الدخول البنك
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +40,Pension Funds,صناديق المعاشات التقاعدية
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,صناديق المعاشات التقاعدية
 apps/erpnext/erpnext/accounts/doctype/account/account.py +142,Warehouse is mandatory if account type is Warehouse,مستودع إلزامي إذا كان نوع الحساب هو مستودع
 DocType: SMS Center,All Sales Person,كل عملية بيع شخص
 DocType: Lead,Person Name,اسم الشخص
@@ -131,7 +127,7 @@
 DocType: Quality Inspection,Get Specification Details,الحصول على تفاصيل المواصفات
 DocType: Lead,Interested,مهتم
 apps/erpnext/erpnext/config/manufacturing.py +14,Bill of Material,فاتورة المواد
-apps/erpnext/erpnext/public/js/stock_analytics.js +45,Opening,افتتاح
+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,نسخة من المجموعة السلعة
 DocType: Journal Entry,Opening Entry,فتح دخول
@@ -145,23 +141,22 @@
 DocType: Employee Education,Under Graduate,تحت الدراسات العليا
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +22,Target On,الهدف في
 DocType: BOM,Total Cost,التكلفة الكلية لل
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +99,Reaming,التوسيع
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +9,Activity Log:,:سجل النشاط
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +199,Item {0} does not exist in the system or has expired,البند {0} غير موجود في النظام أو قد انتهت صلاحيتها
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +44,Real Estate,عقارات
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +44,Real Estate,عقارات
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +4,Statement of Account,كشف حساب
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +41,Pharmaceuticals,المستحضرات الصيدلانية
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,المستحضرات الصيدلانية
 DocType: Expense Claim Detail,Claim Amount,المطالبة المبلغ
 DocType: Employee,Mr,السيد
 DocType: Custom Script,Client,عميل	
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,المورد نوع / المورد
 DocType: Naming Series,Prefix,بادئة
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Consumable,الاستهلاكية
+apps/erpnext/erpnext/public/js/setup_wizard.js +359,Consumable,الاستهلاكية
 DocType: Upload Attendance,Import Log,استيراد دخول
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.js +19,Send,إرسال
 DocType: Sales Invoice Item,Delivered By Supplier,سلمت من قبل مزود
 DocType: SMS Center,All Contact,جميع الاتصالات
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +164,Annual Salary,الراتب السنوي
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +164,Annual Salary,الراتب السنوي
 DocType: Period Closing Voucher,Closing Fiscal Year,إغلاق السنة المالية
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +69,Stock Expenses,مصاريف الأسهم
 DocType: Newsletter,Email Sent?,البريد الإلكتروني المرسلة؟
@@ -169,7 +164,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +92,Show Time Logs,عرض الوقت سجلات
 DocType: Journal Entry Account,Credit in Company Currency,الائتمان في الشركة العملات
 DocType: Delivery Note,Installation Status,تثبيت الحالة
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +115,Accepted + Rejected Qty must be equal to Received quantity for Item {0},الكمية المقبولة + المرفوضة يجب أن تساوي الكمية المستلمة من الصنف {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +118,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 +133,Item {0} must be a Purchase Item,البند {0} يجب أن يكون شراء السلعة
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
@@ -177,19 +172,17 @@
  جميع التواريخ والموظف الجمع في الفترة المختارة سيأتي في القالب، مع سجلات الحضور القائمة"
 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 +493,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included",ل تشمل الضريبة في الصف {0} في معدل الإغلاق ، {1} ويجب أيضا تضمين الضرائب في الصفوف
+apps/erpnext/erpnext/controllers/accounts_controller.py +494,"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 +90,Settings for HR Module,إعدادات وحدة الموارد البشرية
 DocType: SMS Center,SMS Center,مركز SMS
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +78,Straightening,استقامة
 DocType: BOM Replace Tool,New BOM,BOM جديدة
 apps/erpnext/erpnext/config/projects.py +28,Batch Time Logs for billing.,دفعة سجلات الوقت لإعداد الفواتير.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +15,Countergravity casting,Countergravity الصب
 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/setup/page/setup_wizard/fixtures/industry_type.py +14,Broadcasting,إذاعة
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +140,Execution,إعدام
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +364,The first user will become the System Manager (you can change this later).,المستخدم الأول سوف تصبح مدير النظام (يمكنك تغيير هذا لاحقا).
+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/public/js/setup_wizard.js +114,The first user will become the System Manager (you can change this later).,المستخدم الأول سوف تصبح مدير النظام (يمكنك تغيير هذا لاحقا).
 apps/erpnext/erpnext/config/manufacturing.py +39,Details of the operations carried out.,حملت تفاصيل العمليات بها.
 DocType: Serial No,Maintenance Status,حالة الصيانة
 apps/erpnext/erpnext/config/stock.py +263,Items and Pricing,البنود والتسعير
@@ -206,7 +199,6 @@
 DocType: Pricing Rule,Discount on Price List Rate (%),خصم على قائمة الأسعار معدل (٪)
 apps/frappe/frappe/public/js/frappe/form/print.js +96,Start,بداية
 DocType: User,First Name,الاسم الأول
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +12,Full-mold casting,كامل قالب الصب
 DocType: Offer Letter,Select Terms and Conditions,اختر الشروط والأحكام
 DocType: Production Planning Tool,Sales Orders,أوامر البيع
 DocType: Purchase Taxes and Charges,Valuation,تقييم
@@ -218,8 +210,7 @@
 DocType: Bank Reconciliation,Bank Account,الحساب المصرفي
 DocType: Leave Type,Allow Negative Balance,تسمح الرصيد السلبي
 DocType: Selling Settings,Default Territory,الافتراضي الإقليم
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +53,Television,تلفزيون
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +138,Gashing,Gashing
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,تلفزيون
 DocType: Production Order Operation,Updated via 'Time Log',"تحديث عبر 'وقت دخول """
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +82,Account {0} does not belong to Company {1},حساب {0} لا ينتمي إلى شركة {1}
 DocType: Naming Series,Series List for this Transaction,قائمة متسلسلة لهذه العملية
@@ -234,14 +225,13 @@
 DocType: Leave Allocation,Add unused leaves from previous allocations,إضافة الأوراق غير المستخدمة من المخصصات السابقة
 apps/erpnext/erpnext/controllers/recurring_document.py +206,Next Recurring {0} will be created on {1},المتكرر التالي {0} سيتم إنشاؤها على {1}
 DocType: Newsletter List,Total Subscribers,إجمالي عدد المشتركين
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +575,Contact Name,اسم جهة الاتصال
+,Contact Name,اسم جهة الاتصال
 DocType: Production Plan Item,SO Pending Qty,وفي انتظار SO الكمية
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,يخلق زلة مرتبات المعايير المذكورة أعلاه.
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,طلب للشراء.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +107,Double housing,الإسكان مزدوج
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +156,Only the selected Leave Approver can submit this Leave Application,و اترك الموافق المحددة فقط يمكن أن يقدم هذا التطبيق اترك
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +171,Only the selected Leave Approver can submit this Leave Application,و اترك الموافق المحددة فقط يمكن أن يقدم هذا التطبيق اترك
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,تخفيف التسجيل يجب أن يكون أكبر من تاريخ الالتحاق بالعمل
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +172,Leaves per Year,يترك في السنة
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +172,Leaves per Year,يترك في السنة
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup > Settings > Naming Series,الرجاء تعيين تسمية Series لل{0} عبر إعداد&gt; إعدادات&gt; تسمية السلسلة
 DocType: Time Log,Will be updated when batched.,سيتم تحديث عندما دفعات.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +104,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,"صف {0}: يرجى التحقق ""هل المسبق ضد حساب {1} إذا كان هذا هو إدخال مسبق."
@@ -250,25 +240,24 @@
 DocType: Item Website Specification,Item Website Specification,البند مواصفات الموقع
 DocType: Dropbox Backup,Dropbox Access Key,دروببوإكس مفتاح الوصول
 DocType: Payment Tool,Reference No,المرجع لا
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +348,Leave Blocked,ترك الممنوع
-apps/erpnext/erpnext/stock/doctype/item/item.py +535,Item {0} has reached its end of life on {1},البند {0} قد بلغ نهايته من الحياة على {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +392,Leave Blocked,ترك الممنوع
+apps/erpnext/erpnext/stock/doctype/item/item.py +539,Item {0} has reached its end of life on {1},البند {0} قد بلغ نهايته من الحياة على {1}
 apps/erpnext/erpnext/accounts/utils.py +339,Annual,سنوي
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,الأسهم المصالحة البند
 DocType: Stock Entry,Sales Invoice No,فاتورة مبيعات لا
 DocType: Material Request Item,Min Order Qty,دقيقة الكمية ترتيب
 DocType: Lead,Do Not Contact,عدم الاتصال
 DocType: Sales Invoice,The unique id for tracking all recurring invoices. It is generated on submit.,المعرف الفريد لتتبع جميع الفواتير المتكررة. يتم إنشاؤها على تقديم.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +93,Software Developer,البرنامج المطور
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +93,Software Developer,البرنامج المطور
 DocType: Item,Minimum Order Qty,الحد الأدنى لطلب الكمية
 DocType: Pricing Rule,Supplier Type,المورد نوع
 DocType: Item,Publish in Hub,نشر في المحور
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +555,Item {0} is cancelled,البند {0} تم إلغاء
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +598,Material Request,طلب المواد
+apps/erpnext/erpnext/stock/doctype/item/item.py +559,Item {0} is cancelled,البند {0} تم إلغاء
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +607,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} غير موجودة في &quot;المواد الخام الموردة&quot; الجدول في أمر الشراء {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +129,Wire brushing,بالفرشاة السلك
 DocType: Employee,Relation,علاقة
 DocType: Shipping Rule,Worldwide Shipping,الشحن في جميع أنحاء العالم
 apps/erpnext/erpnext/config/selling.py +23,Confirmed orders from Customers.,أكد أوامر من العملاء.
@@ -284,12 +273,11 @@
 DocType: Supplier,Address HTML,معالجة HTML
 DocType: Lead,Mobile No.,رقم الجوال
 DocType: Maintenance Schedule,Generate Schedule,توليد جدول
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +81,Hubbing,Hubbing
 DocType: Purchase Invoice Item,Expense Head,رئيس حساب
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +86,Please select Charge Type first,الرجاء اختيار نوع التهمة الأولى
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,آخر
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +395,Max 5 characters,5 أحرف كحد أقصى
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +195,Select Your Language,اختر اللغة الخاصة بك
+apps/erpnext/erpnext/public/js/setup_wizard.js +143,Max 5 characters,5 أحرف كحد أقصى
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +245,Select Your Language,اختر اللغة الخاصة بك
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,سيتم تعيين أول اترك الموافق في القائمة بوصفها الإجازة الموافق الافتراضي
 DocType: Manufacturing Settings,"Disables creation of time logs against Production Orders.
 Operations shall not be tracked against Production Order",تعطيل إنشاء سجلات المرة ضد أوامر الإنتاج. لا يجوز تعقب عمليات ضد النظام الإنتاج
@@ -301,8 +289,6 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +34,Item {0} must be Service Item,البند {0} يجب أن تكون خدمة المدينة
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +303,Completed Qty can not be greater than 'Qty to Manufacture',"الانتهاء الكمية لا يمكن أن يكون أكبر من ""الكمية لتصنيع"""
 DocType: DocType,Administrator,مدير
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +136,Laser drilling,الحفر بالليزر
-DocType: Stock UOM Replace Utility,New Stock UOM,ألبوم جديد UOM
 DocType: Period Closing Voucher,Closing Account Head,إغلاق حساب رئيس
 DocType: Employee,External Work History,التاريخ العمل الخارجي
 apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,خطأ مرجع دائري
@@ -311,18 +297,15 @@
 DocType: Lead,Industry,صناعة
 DocType: Employee,Job Profile,الملف ظيفة
 DocType: Newsletter,Newsletter,النشرة الإخبارية
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +84,Hydroforming,Hydroforming
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +49,Necking,معانقة
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,إبلاغ عن طريق البريد الإلكتروني على خلق مادة التلقائي طلب
 DocType: Journal Entry,Multi Currency,متعدد العملات
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +51,Item is updated,يتم تحديث البند
 DocType: Async Task,System Manager,إدارة نظام
 DocType: Payment Reconciliation Invoice,Invoice Type,نوع الفاتورة
 DocType: Sales Invoice Item,Delivery Note,ملاحظة التسليم
 DocType: Dropbox Backup,Allow Dropbox Access,تسمح قطاف الدخول
 apps/erpnext/erpnext/config/learn.py +72,Setting up Taxes,إنشاء الضرائب
 apps/erpnext/erpnext/accounts/utils.py +189,Payment Entry has been modified after you pulled it. Please pull it again.,لقد تم تعديل دفع الدخول بعد سحبها. يرجى تسحبه مرة أخرى.
-apps/erpnext/erpnext/stock/doctype/item/item.py +343,{0} entered twice in Item Tax,{0} دخلت مرتين في ضريبة الصنف
+apps/erpnext/erpnext/stock/doctype/item/item.py +347,{0} entered twice in Item Tax,{0} دخلت مرتين في ضريبة الصنف
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +105,Summary for this week and pending activities,ملخص لهذا الأسبوع والأنشطة المعلقة
 DocType: Workstation,Rent Cost,الإيجار التكلفة
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +74,Please select month and year,الرجاء اختيار الشهر والسنة
@@ -339,24 +322,22 @@
 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",المتاحة في BOM ، تسليم مذكرة ، شراء الفاتورة ، ترتيب الإنتاج، طلب شراء ، شراء استلام ، فاتورة المبيعات ، ترتيب المبيعات ، اسهم الدخول و الجدول الزمني
 DocType: Item Tax,Tax Rate,ضريبة
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Select Item,اختر البند
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +540,Select Item,اختر البند
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +143,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","البند: {0} المدارة دفعة الحكيمة، لا يمكن التوفيق بينها باستخدام \
  المالية المصالحة، بدلا من استخدام الدخول المالية"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +259,Purchase Invoice {0} is already submitted,شراء الفاتورة {0} يقدم بالفعل
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +262,Purchase Invoice {0} is already submitted,شراء الفاتورة {0} يقدم بالفعل
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Batch No must be same as {1} {2},الصف # {0}: لا دفعة ويجب أن يكون نفس {1} {2}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Convert to non-Group,تحويل لغير المجموعه
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +55,Purchase Receipt must be submitted,يجب تقديم شراء إيصال
-DocType: Stock UOM Replace Utility,Current Stock UOM,الأسهم الحالية UOM
 apps/erpnext/erpnext/config/stock.py +53,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}
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Your email address,عنوان البريد الإلكتروني الخاص بك
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +194,Please see attachment,يرجى الاطلاع على المرفقات
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +203,Please see attachment,يرجى الاطلاع على المرفقات
 DocType: Purchase Order,% Received,تم استلام٪
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +109,Water jet cutting,قطع المياه النفاثة
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +24,Setup Already Complete!!,الإعداد الكامل بالفعل !
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +20,Setup Already Complete!!,الإعداد الكامل بالفعل !
 ,Finished Goods,السلع تامة الصنع
 DocType: Delivery Note,Instructions,تعليمات
 DocType: Quality Inspection,Inspected By,تفتيش من قبل
@@ -371,6 +352,7 @@
 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,تحويل العملات
 DocType: Purchase Invoice Item,Item Name,البند الاسم
+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",البنود التي يطلب منها &quot;غير متاح&quot; النظر في جميع المخازن على أساس الكمية المتوقعة والحد الأدنى الكمية ترتيب
@@ -380,11 +362,10 @@
 ,Purchase Register,سجل شراء
 DocType: Landed Cost Item,Applicable Charges,الرسوم المطبقة
 DocType: Workstation,Consumable Cost,التكلفة الاستهلاكية
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,{0} ({1}) must have role 'Leave Approver',{0} ({1})يجب أن يمتلك صلاحية (إعتماد الإجازات) 
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +167,{0} ({1}) must have role 'Leave Approver',{0} ({1})يجب أن يمتلك صلاحية (إعتماد الإجازات) 
 DocType: Purchase Receipt,Vehicle Date,مركبة التسجيل
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +39,Medical,طبي
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +39,Medical,طبي
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,السبب لفقدان
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +36,Tube beading,أنبوب الديكور
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},مغلق محطة العمل في التواريخ التالية وفقا لقائمة عطلة: {0}
 DocType: Employee,Single,وحيد
 DocType: Issue,Attachment,التعلق
@@ -405,10 +386,8 @@
 DocType: Account,Is Group,غير المجموعة
 DocType: Stock Settings,Automatically Set Serial Nos based on FIFO,تعيين تلقائيا المسلسل رقم استنادا FIFO
 DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,الاختيار فاتورة المورد عدد تفرد
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +31,Thermoforming,بالحرارة
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +66,Slitting,الحز
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +57,'To Case No.' cannot be less than 'From Case No.','الى الحالة  رقم' لا يمكن أن يكون أقل من 'من الحالة رقم'
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +104,Non Profit,غير الربح
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +104,Non Profit,غير الربح
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_list.js +7,Not Started,لم تبدأ
 DocType: Lead,Channel Partner,قناة الشريك
 DocType: Account,Old Parent,العمر الرئيسي
@@ -417,13 +396,12 @@
 apps/erpnext/erpnext/config/manufacturing.py +74,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 +512,Attribute {0} selected multiple times in Attributes Table,السمة {0} اختيار عدة مرات في سمات الجدول
+apps/erpnext/erpnext/stock/doctype/item/item.py +516,Attribute {0} selected multiple times in Attributes Table,السمة {0} اختيار عدة مرات في سمات الجدول
 DocType: Sales Order,Not Applicable,لا ينطبق
 apps/erpnext/erpnext/config/hr.py +140,Holiday master.,عطلة الرئيسي.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +19,Shell molding,صب قذيفة
 DocType: Material Request Item,Required Date,تاريخ المطلوبة
 DocType: Delivery Note,Billing Address,عنوان الفواتير
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +644,Please enter Item Code.,الرجاء إدخال رمز المدينة .
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +648,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,إجمالي الكمية
@@ -433,7 +411,7 @@
 DocType: Item Attribute,To Range,تتراوح
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,الأوراق المالية و الودائع
 DocType: Features Setup,Imports,واردات
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +144,Adhesive bonding,الربط اللصق
+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.,سجل الحضور.
@@ -441,26 +419,25 @@
 DocType: Sales Order Item,Used for Production Plan,تستخدم لخطة الإنتاج
 DocType: System Settings,Loading...,تحميل ...
 DocType: DocField,Password,كلمة السر
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +155,Fused deposition modeling,تنصهر النمذجة ترسب
 DocType: Manufacturing Settings,Time Between Operations (in mins),الوقت بين العمليات (في دقيقة)
 DocType: Customer,Buyer of Goods and Services.,المشتري من السلع والخدمات.
 DocType: Journal Entry,Accounts Payable,ذمم دائنة
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +24,Add Subscribers,إضافة المشتركين
 apps/erpnext/erpnext/public/js/feature_setup.js +220,""" does not exists",""" لا يوجد"
 DocType: Pricing Rule,Valid Upto,صالحة لغاية
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +564,List a few of your customers. They could be organizations or individuals.,قائمة قليلة من الزبائن. يمكن أن تكون المنظمات أو الأفراد.
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,List a few of your customers. They could be organizations or individuals.,قائمة قليلة من الزبائن. يمكن أن تكون المنظمات أو الأفراد.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Direct Income,الدخل المباشر
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +33,"Can not filter based on Account, if grouped by Account",لا يمكن تصفية استنادا إلى الحساب ، إذا جمعت بواسطة حساب
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +88,Administrative Officer,موظف إداري
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Administrative Officer,موظف إداري
 DocType: Payment Tool,Received Or Paid,تلقى أو المدفوعة
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +318,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 +305,Please enter Warehouse for which Material Request will be raised,من فضلك ادخل مستودع لل والتي سيتم رفع طلب المواد
 DocType: Production Order,Additional Operating Cost,إضافية تكاليف التشغيل
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +20,Cosmetics,مستحضرات التجميل
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,مستحضرات التجميل
 DocType: DocField,Type,نوع
-apps/erpnext/erpnext/stock/doctype/item/item.py +417,"To merge, following properties must be same for both items",لدمج ، يجب أن يكون نفس الخصائص التالية ل كلا البندين
+apps/erpnext/erpnext/stock/doctype/item/item.py +421,"To merge, following properties must be same for both items",لدمج ، يجب أن يكون نفس الخصائص التالية ل كلا البندين
 DocType: Communication,Subject,موضوع
 DocType: Shipping Rule,Net Weight,الوزن الصافي
 DocType: Employee,Emergency Phone,الهاتف في حالات الطوارئ
@@ -470,7 +447,6 @@
 DocType: Journal Entry,Difference (Dr - Cr),الفرق ( الدكتور - الكروم )
 DocType: Account,Profit and Loss,الربح والخسارة
 apps/erpnext/erpnext/config/stock.py +293,Managing Subcontracting,إدارة التعاقد من الباطن
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +58,New UOM must NOT be of type Whole Number,يجب أن لا تكون جديدة UOM من النوع الجامع رقم
 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 +47,Account {0} does not belong to company: {1},حساب {0} لا تنتمي إلى الشركة: {1}
@@ -490,14 +466,14 @@
 DocType: Purchase Invoice,Supplier Invoice No,رقم فاتورة المورد
 DocType: Territory,For reference,للرجوع إليها
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +154,"Cannot delete Serial No {0}, as it is used in stock transactions",لا يمكن حذف الرقم التسلسلي {0}، كما يتم استخدامه في المعاملات الأسهم
-apps/erpnext/erpnext/public/js/account_tree_grid.js +52,Closing (Cr),إغلاق (الكروم)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +227,Closing (Cr),إغلاق (الكروم)
 DocType: Serial No,Warranty Period (Days),فترة الضمان (أيام)
 DocType: Installation Note Item,Installation Note Item,ملاحظة تثبيت الإغلاق
 ,Pending Qty,في انتظار الكمية
 DocType: Job Applicant,Thread HTML,الموضوع HTML
 DocType: Company,Ignore,تجاهل
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +86,SMS sent to following numbers: {0},أرسل SMS إلى الأرقام التالية: {0}
-apps/erpnext/erpnext/controllers/buying_controller.py +135,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,المورد مستودع إلزامية ل إيصال الشراء التعاقد من الباطن
+apps/erpnext/erpnext/controllers/buying_controller.py +126,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,المورد مستودع إلزامية ل إيصال الشراء التعاقد من الباطن
 DocType: Pricing Rule,Valid From,صالحة من
 DocType: Sales Invoice,Total Commission,مجموع العمولة
 DocType: Pricing Rule,Sales Partner,شريك مبيعات
@@ -507,7 +483,7 @@
 To distribute a budget using this distribution, set this **Monthly Distribution** in the **Cost Center**","** توزيع شهري ** يساعدك على توزيع ميزانيتك على مدى عدة شهور إذا كان لديك موسمية في عملك.
 
  لتوزيع الميزانية باستخدام هذا التوزيع، تعيين هذا التوزيع الشهري ** ** في ** ** مركز التكلفة"
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +183,No records found in the Invoice table,لا توجد في جدول الفاتورة السجلات
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +130,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 +84,Financial / accounting year.,المالية / المحاسبة العام.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged",آسف ، المسلسل نص لا يمكن دمج
@@ -523,25 +499,25 @@
 DocType: Sales Order,Billing and Delivery Status,الفوترة والدفع الحالة
 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/setup/page/setup_wizard/setup_wizard_page.html +16,Previous,سابق
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard_page.html +16,Previous,سابق
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +620,Sales Return,مبيعات العودة
 DocType: Production Planning Tool,Select Sales Orders from which you want to create Production Orders.,حدد أوامر المبيعات التي تريد إنشاء أوامر الإنتاج.
 DocType: Item,Delivered by Supplier (Drop Ship),سلمت من قبل مزود (هبوط السفينة)
 apps/erpnext/erpnext/config/hr.py +120,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.,العملاء قاعدة البيانات.
 DocType: Quotation,Quotation To,تسعيرة إلى
 DocType: Lead,Middle Income,المتوسطة الدخل
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),افتتاح (الكروم )
 apps/erpnext/erpnext/accounts/utils.py +193,Allocated amount can not be negative,المبلغ المخصص لا يمكن أن تكون سلبية
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +123,Tumbling,تراجع
 DocType: Purchase Order Item,Billed Amt,المنقار AMT
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,مستودع المنطقي الذي ضد مصنوعة إدخالات الأسهم.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +92,Reference No & Reference Date is required for {0},مطلوب المرجعية لا والمراجع التسجيل لل {0}
 DocType: Event,Wednesday,الأربعاء
 DocType: Sales Invoice,Customer's Vendor,العميل البائع
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +214,Production Order is Mandatory,إنتاج النظام هو إجباري
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +139,Proposal Writing,الكتابة الاقتراح
+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} موجود مع نفس الرقم الوظيفي
 apps/erpnext/erpnext/stock/stock_ledger.py +336,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},خطأ الأسهم السلبية ( { } 6 ) القطعة ل {0} في {1} في معرض النماذج ثلاثية على {2} {3} {4} في {5}
 DocType: Fiscal Year Company,Fiscal Year Company,الشركة السنة المالية
@@ -564,7 +540,7 @@
 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/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.py +179,Please install dropbox python module,الرجاء تثبيت قطاف بيثون وحدة
 DocType: Employee,Passport Number,رقم جواز السفر
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +82,Manager,مدير
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Manager,مدير
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +494,From Purchase Receipt,من إيصال الشراء
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +219,Same item has been entered multiple times.,تم إدخال البند نفسه عدة مرات.
 DocType: SMS Settings,Receiver Parameter,استقبال معلمة
@@ -572,10 +548,9 @@
 DocType: Sales Person,Sales Person Targets,أهداف المبيعات شخص
 apps/frappe/frappe/public/js/frappe/form/workflow.js +116,To,إلى
 apps/frappe/frappe/templates/base.html +145,Please enter email address,يرجى إدخال عنوان البريد الإلكتروني
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +35,End tube forming,نهاية أنبوب تشكيل
 DocType: Production Order Operation,In minutes,في دقائق
 DocType: Issue,Resolution Date,تاريخ القرار
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +635,Please set default Cash or Bank account in Mode of Payment {0},الرجاء تعيين النقدية الافتراضي أو حساب مصرفي في طريقة الدفع {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +637,Please set default Cash or Bank account in Mode of Payment {0},الرجاء تعيين النقدية الافتراضي أو حساب مصرفي في طريقة الدفع {0}
 DocType: Selling Settings,Customer Naming By,العملاء تسمية بواسطة
 apps/erpnext/erpnext/accounts/doctype/account/account.js +67,Convert to Group,تحويل إلى المجموعة
 DocType: Activity Cost,Activity Type,نوع النشاط
@@ -583,12 +558,12 @@
 DocType: Customer,Fixed Days,يوم الثابتة
 DocType: Sales Invoice,Packing List,قائمة التعبئة
 apps/erpnext/erpnext/config/buying.py +28,Purchase Orders given to Suppliers.,أوامر الشراء نظرا للموردين.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +43,Publishing,نشر
+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 +198,{0}: {1} not found in Invoice Details table,{0}: {1} غير موجود في جدول تفاصيل الفاتورة
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,{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 +208,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,صيانة زيارة {0} يجب أن يتم إلغاء هذا الأمر قبل إلغاء المبيعات
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +203,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),افتتاح ( الدكتور )
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},يجب أن يكون الطابع الزمني بالإرسال بعد {0}
@@ -600,7 +575,6 @@
 DocType: Pricing Rule,Sales Manager,مدير المبيعات
 apps/frappe/frappe/public/js/frappe/model/model.js +492,Rename,إعادة تسمية
 DocType: Journal Entry,Write Off Amount,شطب المبلغ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +52,Bending,تقويس
 apps/frappe/frappe/core/page/user_permissions/user_permissions.js +246,Allow User,تسمح للمستخدم
 DocType: Journal Entry,Bill No,رقم الفاتورة
 DocType: Purchase Invoice,Quarterly,فصلي
@@ -610,17 +584,16 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Please enter item details,يرجى إدخال تفاصيل البند
 DocType: Purchase Receipt,Other Details,تفاصيل أخرى
 DocType: Account,Accounts,حسابات
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +67,Marketing,تسويق
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +65,Straight shearing,مستقيم قص
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +67,Marketing,تسويق
 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/stock/doctype/purchase_receipt/purchase_receipt.py +99,Rejected Warehouse is mandatory against regected item,مستودع رفض إلزامي ضد البند regected
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +102,Rejected Warehouse is mandatory against regected item,مستودع رفض إلزامي ضد البند regected
 DocType: Account,Expenses Included In Valuation,وشملت النفقات في التقييم
 DocType: Employee,Provide email id registered in company,توفير معرف البريد الإلكتروني المسجلة في الشركة
 DocType: Hub Settings,Seller City,مدينة البائع
 DocType: Email Digest,Next email will be sent on:,سيتم إرسال البريد الإلكتروني التالي على:
 DocType: Offer Letter Term,Offer Letter Term,تقديم رسالة الأجل
-apps/erpnext/erpnext/stock/doctype/item/item.py +492,Item has variants.,البند لديه المتغيرات.
+apps/erpnext/erpnext/stock/doctype/item/item.py +496,Item has variants.,البند لديه المتغيرات.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,البند {0} لم يتم العثور على
 DocType: Bin,Stock Value,الأسهم القيمة
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,نوع الشجرة
@@ -629,10 +602,9 @@
 DocType: Material Request Item,Quantity and Warehouse,الكمية والنماذج
 DocType: Sales Invoice,Commission Rate (%),اللجنة قيم (٪)
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +172,"Against Voucher Type must be one of Sales Order, Sales Invoice or Journal Entry",ضد قسيمة النوع يجب أن يكون واحدا من ترتيب المبيعات، مبيعات فاتورة أو إدخال دفتر اليومية
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +139,Biomachining,Biomachining
 apps/erpnext/erpnext/setup/utils.py +89,Unable to find exchange rate,تعذر العثور على سعر الصرف
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +7,Aerospace,الفضاء
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +19,Welcome,ترحيب
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +7,Aerospace,الفضاء
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +40,Welcome,ترحيب
 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.,تلقى السلع من الموردين.
@@ -655,19 +627,19 @@
 DocType: Employee,Cell Number,الخلية رقم
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,مفقود
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +120,You can not enter current voucher in 'Against Journal Entry' column,"لا يمكنك إدخال قسيمة الحالي في ""ضد إدخال دفتر اليومية"" عمود"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +25,Energy,طاقة
+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.,بيان الراتب الشهري.
 DocType: Item Group,Website Specifications,موقع المواصفات
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +205,New Account,حساب جديد
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +21,{0}: From {0} of type {1},{0} من {0} من نوع {1}
-apps/erpnext/erpnext/controllers/buying_controller.py +283,Row {0}: Conversion Factor is mandatory,الصف {0}: تحويل عامل إلزامي
+apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,الصف {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.,القيود المحاسبية ويمكن إجراء ضد العقد ورقة. لا يسمح مقالات ضد المجموعات.
 DocType: ToDo,High,ارتفاع
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +361,Cannot deactivate or cancel BOM as it is linked with other BOMs,لا يمكن إيقاف أو إلغاء BOM كما أنه مرتبط مع BOMs أخرى
 DocType: Opportunity,Maintenance,صيانة
 DocType: User,Male,ذكر
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +182,Purchase Receipt number required for Item {0},عدد الشراء استلام المطلوبة القطعة ل {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +183,Purchase Receipt number required for Item {0},عدد الشراء استلام المطلوبة القطعة ل {0}
 DocType: Item Attribute Value,Item Attribute Value,البند قيمة السمة
 apps/erpnext/erpnext/config/crm.py +64,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.
@@ -715,10 +687,9 @@
 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 +324,"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/page/setup_wizard/fixtures/industry_type.py +13,Biotechnology,التكنولوجيا الحيوية
+apps/erpnext/erpnext/controllers/accounts_controller.py +325,"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,مصاريف صيانة المكاتب
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +53,Hemming,هدب
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +66,Please enter Item first,الرجاء إدخال العنصر الأول
 DocType: Account,Liability,مسئولية
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +62,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,المبلغ عقوبات لا يمكن أن يكون أكبر من مبلغ المطالبة في صف {0}.
@@ -731,10 +702,10 @@
 DocType: Company,Default Bank Account,الافتراضي الحساب المصرفي
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +47,"To filter based on Party, select Party Type first",لتصفية استنادا الحزب، حدد حزب النوع الأول
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},&quot;الأوراق المالية التحديث&quot; لا يمكن التحقق من أنه لم يتم تسليم المواد عن طريق {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Nos,غ
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,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 +627,My Invoices,بلدي الفواتير
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +629,My Invoices,بلدي الفواتير
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,لا توجد موظف
 DocType: Purchase Order,Stopped,توقف
 DocType: Item,If subcontracted to a vendor,إذا الباطن للبائع
@@ -753,35 +724,33 @@
 DocType: Features Setup,"To enable ""Point of Sale"" features",لتمكين &quot;نقطة بيع&quot; ميزات
 DocType: Bin,Moving Average Rate,الانتقال متوسط ​​معدل
 DocType: Production Planning Tool,Select Items,حدد العناصر
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,{0} against Bill {1} dated {2},{0} مقابل الفاتورة {1} بتاريخ {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +328,{0} against Bill {1} dated {2},{0} مقابل الفاتورة {1} بتاريخ {2}
 DocType: Comment,Reference Name,مرجع اسم
 DocType: Maintenance Visit,Completion Status,استكمال الحالة
 DocType: Sales Invoice Item,Target Warehouse,الهدف مستودع
 DocType: Item,Allow over delivery or receipt upto this percent,سماح على تسليم أو استلام تصل هذه النسبة
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +49,Expected Delivery Date cannot be before Sales Order Date,التسليم المتوقع التاريخ لا يمكن أن يكون قبل تاريخ ترتيب المبيعات
 DocType: Upload Attendance,Import Attendance,الحضور الاستيراد
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +17,All Item Groups,جميع مجموعات الصنف
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +17,All Item Groups,جميع مجموعات الصنف
 DocType: Process Payroll,Activity Log,سجل النشاط
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +30,Net Profit / Loss,صافي الربح / الخسارة
 apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,يؤلف تلقائيا رسالة على تقديم المعاملات.
 DocType: Production Order,Item To Manufacture,البند لتصنيع
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +16,Permanent mold casting,قالب الصب الدائم
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} الوضع هو {2}
 apps/erpnext/erpnext/config/learn.py +172,Purchase Order to Payment,أمر الشراء إلى الدفع
 DocType: Sales Order Item,Projected Qty,الكمية المتوقع
 DocType: Sales Invoice,Payment Due Date,تاريخ استحقاق السداد
 DocType: Newsletter,Newsletter Manager,مدير النشرة الإخبارية
-apps/erpnext/erpnext/stock/doctype/item/item.js +229,Item Variant {0} already exists with same attributes,البند البديل {0} موجود بالفعل مع نفس الصفات
+apps/erpnext/erpnext/stock/doctype/item/item.js +231,Item Variant {0} already exists with same attributes,البند البديل {0} موجود بالفعل مع نفس الصفات
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening',&#39;فتح&#39;
 DocType: Notification Control,Delivery Note Message,ملاحظة تسليم رسالة
 DocType: Expense Claim,Expenses,نفقات
 DocType: Item Variant Attribute,Item Variant Attribute,البند البديل سمة
 ,Purchase Receipt Trends,شراء اتجاهات الإيصال
 DocType: Appraisal,Select template from which you want to get the Goals,حدد قالب الذي تريد للحصول على الأهداف
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +77,Research & Development,البحوث والتنمية
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Research & Development,البحوث والتنمية
 ,Amount to Bill,تصل إلى بيل
 DocType: Company,Registration Details,تسجيل تفاصيل
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +75,Staking,عمادا
 DocType: Item,Re-Order Qty,إعادة ترتيب الكميه
 DocType: Leave Block List Date,Leave Block List Date,ترك بلوك تاريخ قائمة
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +25,Scheduled to send to {0},من المقرر أن يرسل إلى {0}
@@ -792,18 +761,16 @@
 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/hr/doctype/leave_allocation/leave_allocation.py +71,Cannot carry forward {0},لا يمكن المضي قدما {0}
 apps/erpnext/erpnext/accounts/doctype/account/account.py +91,"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,المطالبة حساب رفض رسالة
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +145,Nailing,تسمير
 ,Available Qty,الكمية المتاحة
 DocType: Purchase Taxes and Charges,On Previous Row Total,على إجمالي الصف السابق
 DocType: Salary Slip,Working Days,أيام عمل إنجليزية
 DocType: Serial No,Incoming Rate,الواردة قيم
 DocType: Packing Slip,Gross Weight,الوزن الإجمالي
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +410,The name of your company for which you are setting up this system.,اسم الشركة التي كنت تقوم بإعداد هذا النظام.
+apps/erpnext/erpnext/public/js/setup_wizard.js +158,The name of your company for which you are setting up this system.,اسم الشركة التي كنت تقوم بإعداد هذا النظام.
 DocType: HR Settings,Include holidays in Total no. of Working Days,تشمل أيام العطل في المجموع لا. أيام العمل
 DocType: Job Applicant,Hold,عقد
 DocType: Employee,Date of Joining,تاريخ الانضمام
@@ -813,7 +780,6 @@
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +3,View Subscribers,رأي المشتركين
 DocType: Purchase Invoice Item,Purchase Receipt,ايصال شراء
 ,Received Items To Be Billed,العناصر الواردة إلى أن توصف
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +114,Abrasive blasting,الكشط
 DocType: Employee,Ms,MS
 apps/erpnext/erpnext/config/accounts.py +148,Currency exchange rate master.,أسعار صرف العملات الرئيسية .
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +253,Unable to find Time Slot in the next {0} days for Operation {1},تعذر العثور على فتحة الزمنية في {0} الأيام القليلة القادمة للعملية {1}
@@ -825,7 +791,7 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +209,Serial No {0} does not belong to Item {1},المسلسل لا {0} لا ينتمي إلى البند {1}
 DocType: Purchase Receipt Item Supplied,Required Qty,مطلوب الكمية
 DocType: Bank Reconciliation,Total Amount,المبلغ الكلي لل
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +32,Internet Publishing,نشر الإنترنت
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,نشر الإنترنت
 DocType: Production Planning Tool,Production Orders,أوامر الإنتاج
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +35,Balance Value,توازن القيمة
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,قائمة مبيعات الأسعار
@@ -836,7 +802,7 @@
 DocType: Supplier,Default Payable Accounts,الحسابات الدائنة الافتراضي
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,موظف {0} غير نشط أو غير موجود
 DocType: Features Setup,Item Barcode,البند الباركود
-apps/erpnext/erpnext/stock/doctype/item/item.py +487,Item Variants {0} updated,البند المتغيرات {0} تحديث
+apps/erpnext/erpnext/stock/doctype/item/item.py +491,Item Variants {0} updated,البند المتغيرات {0} تحديث
 DocType: Quality Inspection Reading,Reading 6,قراءة 6
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,مقدم فاتورة الشراء
 DocType: Address,Shop,تسوق
@@ -845,7 +811,7 @@
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,سيتم الافتراضي بنك / الصرف حساب الفاتورة تلقائيا تحديث في POS عند تحديد هذا الوضع.
 DocType: Employee,Permanent Address Is,العنوان الدائم هو
 DocType: Production Order Operation,Operation completed for how many finished goods?,اكتمال عملية لكيفية العديد من السلع تامة الصنع؟
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +491,The Brand,العلامة التجارية
+apps/erpnext/erpnext/public/js/setup_wizard.js +237,The Brand,العلامة التجارية
 apps/erpnext/erpnext/controllers/status_updater.py +163,Allowance for over-{0} crossed for Item {1}.,اتاحة لأكثر من {0} للصنف {1}
 DocType: Employee,Exit Interview Details,تفاصيل مقابلة الخروج
 DocType: Item,Is Purchase Item,هو شراء مادة
@@ -865,16 +831,16 @@
 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,ضبط كمية الدفع = المبلغ المستحق
 DocType: Contact Us Settings,Address Line 1,العنوان سطر 1
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Variance,فرق
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +392,Company Name,اسم الشركة
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +53,Variance,فرق
+,Company Name,اسم الشركة
 DocType: SMS Center,Total Message(s),مجموع الرسائل ( ق )
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +515,Select Item for Transfer,اختر البند لنقل
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +538,Select Item for Transfer,اختر البند لنقل
 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.,حدد رئيس حساب في البنك حيث أودع الاختيار.
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,تسمح للمستخدم لتحرير الأسعار قائمة قيم في المعاملات
 DocType: Pricing Rule,Max Qty,ماكس الكمية
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +106,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,صف {0}: الدفع مقابل مبيعات / طلب شراء ينبغي دائما أن تكون علامة مسبقا
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +16,Chemical,مادة كيميائية
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,مادة كيميائية
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +693,All items have already been transferred for this Production Order.,كل الأصناف قد تم ترحيلها من قبل لأمر الانتاج هذا.
 DocType: Process Payroll,Select Payroll Year and Month,حدد الرواتب السنة والشهر
 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""",انتقل إلى المجموعة المناسبة (عادة طلب تمويل&gt; الأصول الحالية&gt; الحسابات المصرفية وإنشاء حساب جديد (بالنقر على إضافة الطفل) من نوع &quot;البنك&quot;
@@ -885,12 +851,12 @@
 DocType: Item,Inspection Criteria,التفتيش معايير
 apps/erpnext/erpnext/config/accounts.py +101,Tree of finanial Cost Centers.,شجرة مراكز التكلفة finanial .
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,نقلها
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +492,Upload your letter head and logo. (you can edit them later).,تحميل رئيس رسالتكم والشعار. (يمكنك تحريرها لاحقا).
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +156,White,أبيض
+apps/erpnext/erpnext/public/js/setup_wizard.js +238,Upload your letter head and logo. (you can edit them later).,تحميل رئيس رسالتكم والشعار. (يمكنك تحريرها لاحقا).
+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/setup/page/setup_wizard/setup_wizard.js +362,Attach Your Picture,إرفاق صورتك
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Make ,جعل
+apps/erpnext/erpnext/public/js/setup_wizard.js +112,Attach Your Picture,إرفاق صورتك
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +540,Make ,جعل
 DocType: Journal Entry,Total Amount in Words,المبلغ الكلي في كلمات
 DocType: Workflow State,Stop,توقف
 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 إذا استمرت المشكلة.
@@ -899,14 +865,13 @@
 DocType: Lead,Next Contact Date,تاريخ لاحق اتصل
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,فتح الكمية
 DocType: Holiday List,Holiday List Name,عطلة اسم قائمة
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +168,Stock Options,خيارات الأسهم
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +168,Stock Options,خيارات الأسهم
 DocType: Journal Entry Account,Expense Claim,حساب المطالبة
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +181,Qty for {0},الكمية ل{0}
 DocType: Leave Application,Leave Application,ترك التطبيق
 apps/erpnext/erpnext/config/hr.py +77,Leave Allocation Tool,ترك أداة تخصيص
 DocType: Leave Block List,Leave Block List Dates,ترك التواريخ قائمة الحظر
 DocType: Company,If Monthly Budget Exceeded (for expense account),إذا تجاوز الميزانية الشهرية (لحساب المصاريف)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +56,Trimming,زركشة
 DocType: Workstation,Net Hour Rate,صافي معدل ساعة
 DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,هبطت استلام تكلفة الشراء
 DocType: Company,Default Terms,شروط الافتراضية
@@ -914,10 +879,9 @@
 DocType: POS Profile,Cash/Bank Account,النقد / البنك حساب
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,Removed items with no change in quantity or value.,العناصر إزالتها مع أي تغيير في كمية أو قيمة.
 DocType: Delivery Note,Delivery To,التسليم إلى
-apps/erpnext/erpnext/stock/doctype/item/item.py +509,Attribute table is mandatory,الجدول السمة إلزامي
+apps/erpnext/erpnext/stock/doctype/item/item.py +513,Attribute table is mandatory,الجدول السمة إلزامي
 DocType: Production Planning Tool,Get Sales Orders,الحصول على أوامر المبيعات
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} لا يمكن أن تكون سلبية
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +103,Filing,الايداع
 apps/erpnext/erpnext/templates/form_grid/item_grid.html +72,Discount,خصم
 DocType: Features Setup,Purchase Discounts,شراء خصومات
 DocType: Workstation,Wages,أجور
@@ -934,6 +898,7 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +112,You are the Expense Approver for this record. Please Update the 'Status' and Save,"كنت الموافق المصروفات لهذا السجل . يرجى تحديث ""الحالة"" و فروا"
 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 +136,"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 +194,Serial No {0} is under maintenance contract upto {1},المسلسل لا {0} هو بموجب عقد صيانة لغاية {1}
@@ -942,7 +907,7 @@
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,مصاريف المبيعات
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Buying,شراء القياسية
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +120,Standard Buying,شراء القياسية
 DocType: GL Entry,Against,ضد
 DocType: Item,Default Selling Cost Center,الافتراضي البيع مركز التكلفة
 DocType: Sales Partner,Implementation Partner,تنفيذ الشريك
@@ -963,29 +928,29 @@
 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/setup/page/setup_wizard/setup_wizard.js +588,List a few of your suppliers. They could be organizations or individuals.,قائمة قليلة من الموردين الخاصة بك . يمكن أن تكون المنظمات أو الأفراد.
+apps/erpnext/erpnext/public/js/setup_wizard.js +326,List a few of your suppliers. They could be organizations or individuals.,قائمة قليلة من الموردين الخاصة بك . يمكن أن تكون المنظمات أو الأفراد.
 DocType: Company,Default Currency,العملة الافتراضية
 DocType: Contact,Enter designation of this Contact,أدخل تسمية هذا الاتصال
 DocType: Contact Us Settings,Address,عنوان
 DocType: Expense Claim,From Employee,من موظف
-apps/erpnext/erpnext/controllers/accounts_controller.py +338,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,تحذير : سيقوم النظام لا تحقق بالمغالاة في الفواتير منذ مبلغ القطعة ل {0} في {1} هو صفر
+apps/erpnext/erpnext/controllers/accounts_controller.py +339,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,مفتاح الأداء المنطقة
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +54,Transportation,نقل
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +54,Transportation,نقل
 apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +67, and year: ,والسنة:
 DocType: Email Digest,Annual Expense,المصاريف السنوية
 DocType: SMS Center,Total Characters,مجموع أحرف
-apps/erpnext/erpnext/controllers/buying_controller.py +139,Please select BOM in BOM field for Item {0},يرجى تحديد BOM في الحقل BOM القطعة ل{0}
+apps/erpnext/erpnext/controllers/buying_controller.py +130,Please select BOM in BOM field for Item {0},يرجى تحديد BOM في الحقل BOM القطعة ل{0}
 DocType: C-Form Invoice Detail,C-Form Invoice Detail, تفاصيل الفاتورة نموذج - س 
 DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,دفع فاتورة المصالحة
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +32,Contribution %,المساهمة٪
 DocType: Item,website page link,الموقع رابط الصفحة
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +192,Let's prepare the system for first use.,دعونا نقوم بإعداد النظام للمرة الاولى.
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +242,Let's prepare the system for first use.,دعونا نقوم بإعداد النظام للمرة الاولى.
 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 +214,Production Order {0} must be cancelled before cancelling this Sales Order,إنتاج النظام {0} يجب أن يتم إلغاء هذا الأمر قبل إلغاء المبيعات
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +209,Production Order {0} must be cancelled before cancelling this Sales Order,إنتاج النظام {0} يجب أن يتم إلغاء هذا الأمر قبل إلغاء المبيعات
 ,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.,حدد وقت السجلات وتقديمها إلى إنشاء فاتورة مبيعات جديدة.
@@ -1005,14 +970,13 @@
 DocType: Sales Invoice Advance,Sales Invoice Advance,فاتورة مبيعات المقدمة
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +398,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/page/setup_wizard/install_fixtures.py +75,Management,إدارة
+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/setup/page/setup_wizard/fixtures/operations.py +14,Investment casting,الاستثمار الصب
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +51,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.,سوف تدفع صافي (في كلمة) تكون مرئية بمجرد حفظ زلة الراتب.
 apps/frappe/frappe/core/doctype/user/user_list.js +12,Active,نشط
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +154,Blue,أزرق
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +154,Blue,أزرق
 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,العقد الإضافية التي يمكن أن تنشأ إلا في ظل العقد نوع ' المجموعة '
@@ -1022,18 +986,16 @@
 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,UOM تحويل عامل
 DocType: Stock Settings,Default Item Group,المجموعة الافتراضية الإغلاق
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +156,Laminated object manufacturing,تصنيع الكائن مغلفة
 apps/erpnext/erpnext/config/buying.py +13,Supplier database.,مزود قاعدة البيانات.
 DocType: Account,Balance Sheet,الميزانية العمومية
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +561,Cost Center For Item with Item Code ',"مركز تكلفة بالنسبة للبند مع رمز المدينة """
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +45,Stretch forming,تمتد تشكيل
 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 +210,"Further accounts can be made under Groups, but entries can be made against non-Groups",حسابات أخرى يمكن أن يتم ضمن مجموعات، ولكن يمكن أن يتم مقالات ضد المجموعات غير-
 apps/erpnext/erpnext/config/hr.py +125,Tax and other salary deductions.,الضرائب والاقتطاعات من الراتب أخرى.
 DocType: Lead,Lead,مبادرة بيع
 DocType: Email Digest,Payables,الذمم الدائنة
 DocType: Account,Warehouse,مستودع
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +90,Row #{0}: Rejected Qty can not be entered in Purchase Return,الصف # {0} مرفوض الكمية لا يمكن إدخالها في شراء العودة
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +93,Row #{0}: Rejected Qty can not be entered in Purchase Return,الصف # {0} مرفوض الكمية لا يمكن إدخالها في شراء العودة
 ,Purchase Order Items To Be Billed,أمر الشراء البنود لتكون وصفت
 DocType: Purchase Invoice Item,Net Rate,صافي معدل
 DocType: Purchase Invoice Item,Purchase Invoice Item,شراء السلعة الفاتورة
@@ -1048,13 +1010,13 @@
 DocType: Global Defaults,Current Fiscal Year,السنة المالية الحالية
 DocType: Global Defaults,Disable Rounded Total,تعطيل إجمالي مدور
 DocType: Lead,Call,دعوة
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +384,'Entries' cannot be empty,' المدخلات ' لا يمكن أن تكون فارغة
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +386,'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 +205,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/page/setup_wizard/install_fixtures.py +138,Research,بحث
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +138,Research,بحث
 DocType: Maintenance Visit Purpose,Work Done,العمل المنجز
 apps/erpnext/erpnext/controllers/item_variant.py +25,Please specify at least one attribute in the Attributes table,يرجى تحديد سمة واحدة على الأقل في الجدول سمات
 DocType: Contact,User ID,المستخدم ID
@@ -1062,10 +1024,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +57,View Ledger,عرض ليدجر
 DocType: File,Lft,LFT
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,أقرب
-apps/erpnext/erpnext/stock/doctype/item/item.py +394,"An Item Group exists with same name, please change the item name or rename the item group",يوجد اسم مجموعة أصناف بنفس الاسم، الرجاء تغيير اسم الصنف أو إعادة تسمية المجموعة
+apps/erpnext/erpnext/stock/doctype/item/item.py +398,"An Item Group exists with same name, please change the item name or rename the item group",يوجد اسم مجموعة أصناف بنفس الاسم، الرجاء تغيير اسم الصنف أو إعادة تسمية المجموعة
 DocType: Communication,Delivery Status,حالة التسليم
 DocType: Production Order,Manufacture against Sales Order,تصنيع ضد ترتيب المبيعات
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +517,Rest Of The World,بقية العالم
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +455,Rest Of The World,بقية العالم
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,العنصر {0} لا يمكن أن يكون دفعة
 ,Budget Variance Report,تقرير الفرق الميزانية
 DocType: Salary Slip,Gross Pay,إجمالي الأجور
@@ -1076,13 +1038,11 @@
 DocType: BOM Item,Item Description,وصف السلعة
 DocType: Payment Tool,Payment Mode,طريقة الدفع
 DocType: Purchase Invoice,Is Recurring,غير متكرر
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +154,Direct metal laser sintering,تلبد الليزر معدنية مباشرة
 DocType: Purchase Order,Supplied Items,الأصناف الموردة
 DocType: Production Order,Qty To Manufacture,الكمية للتصنيع
 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,افتتاح مؤقت
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +41,Cryorolling,Cryorolling
 ,Employee Leave Balance,الموظف اترك الرصيد
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +128,Balance for Account {0} must always be {1},التوازن ل حساب {0} يجب أن يكون دائما {1}
 DocType: Address,Address Type,نوع العنوان
@@ -1098,23 +1058,23 @@
 DocType: Journal Entry,Get Outstanding Invoices,الحصول على الفواتير المستحقة
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,ترتيب المبيعات {0} غير صالح
 apps/erpnext/erpnext/setup/doctype/company/company.py +172,"Sorry, companies cannot be merged",آسف، و الشركات لا يمكن دمج
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +145,Small,صغير
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Small,صغير
 DocType: Employee,Employee Number,رقم الموظف
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},الحالة رقم ( ق ) قيد الاستخدام بالفعل. محاولة من القضية لا { 0 ​​}
 ,Invoiced Amount (Exculsive Tax),المبلغ فواتير ( Exculsive الضرائب )
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,البند 2
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +59,Account head {0} created,رئيس الاعتبار {0} خلق
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +153,Green,أخضر
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Green,أخضر
 DocType: Item,Auto re-order,السيارات إعادة ترتيب
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +57,Total Achieved,الإجمالي المحقق
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +59,Total Achieved,الإجمالي المحقق
 DocType: Employee,Place of Issue,مكان الإصدار
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +59,Contract,عقد
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Contract,عقد
 DocType: Report,Disabled,معاق
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +490,UOM coversion factor required for UOM: {0} in Item: {1},عامل coversion UOM اللازمة لUOM: {0} في المدينة: {1}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +83,Indirect Expenses,المصاريف غير المباشرة
 apps/erpnext/erpnext/controllers/selling_controller.py +163,Row {0}: Qty is mandatory,الصف {0}: الكمية إلزامي
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +8,Agriculture,زراعة
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +611,Your Products or Services,المنتجات أو الخدمات الخاصة بك
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,زراعة
+apps/erpnext/erpnext/public/js/setup_wizard.js +347,Your Products or Services,المنتجات أو الخدمات الخاصة بك
 DocType: Mode of Payment,Mode of Payment,طريقة الدفع
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,هذه هي مجموعة البند الجذرية والتي لا يمكن تحريرها.
 DocType: Journal Entry Account,Purchase Order,أمر الشراء
@@ -1126,7 +1086,7 @@
 DocType: Serial No,Serial No Details,تفاصيل المسلسل
 DocType: Purchase Invoice Item,Item Tax Rate,البند ضريبة
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +113,"For {0}, only credit accounts can be linked against another debit entry",ل{0}، فقط حسابات الائتمان يمكن ربط ضد دخول السحب أخرى
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Delivery Note {0} is not submitted,تسليم مذكرة {0} لم تقدم
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +470,Delivery Note {0} is not submitted,تسليم مذكرة {0} لم تقدم
 apps/erpnext/erpnext/stock/get_item_details.py +136,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.",يتم تحديد الأسعار على أساس القاعدة الأولى 'تطبيق في' الميدان، التي يمكن أن تكون مادة، مادة أو مجموعة العلامة التجارية.
@@ -1136,7 +1096,7 @@
 DocType: Appraisal Goal,Goal,هدف
 DocType: Sales Invoice Item,Edit Description,تحرير الوصف
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +318,Expected Delivery Date is lesser than Planned Start Date.,التسليم المتوقع التاريخ هو أقل من الموعد المقرر ابدأ.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +579,For Supplier,ل مزود
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +602,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,مجموع المنتهية ولايته
@@ -1162,10 +1122,10 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +74,"Total {0} for all items is zero, may you should change 'Distribute Charges Based On'",مجموعه {0} لجميع المواد والصفر، قد يجب عليك تغيير &quot;توزيع التهم على أساس &#39;
 DocType: Purchase Invoice,Taxes and Charges Calculation,الضرائب والرسوم حساب
 DocType: BOM Operation,Workstation,محطة العمل
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +112,Hardware,خردوات
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +112,Hardware,خردوات
 DocType: Attendance,HR Manager,مدير الموارد البشرية
 apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,الرجاء اختيار الشركة
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +50,Privilege Leave,امتياز الإجازة
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +50,Privilege Leave,امتياز الإجازة
 DocType: Purchase Invoice,Supplier Invoice Date,المورد فاتورة التسجيل
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +79,You need to enable Shopping Cart,تحتاج إلى تمكين سلة التسوق
 apps/frappe/frappe/public/js/frappe/form/grid_body.html +6,No Data,لا توجد بيانات
@@ -1178,7 +1138,7 @@
 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 +168,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/setup/page/setup_wizard/install_fixtures.py +38,Food,غذاء
+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 +139,You can make a time log only against a submitted production order,يمكنك جعل السجل الوقت فقط ضد نظام إنتاج المقدمة
 DocType: Maintenance Schedule Item,No of Visits,لا الزيارات
@@ -1198,6 +1158,7 @@
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,View Offer Letter,مشاهدة خطاب العرض
 DocType: Communication,Communication,اتصالات
 DocType: Item,Is Service Item,هو البند خدمة
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +81,Application period cannot be outside leave allocation period,فترة التطبيق لا يمكن أن يكون تخصيص فترة إجازة الخارجي
 DocType: Activity Cost,Projects,مشاريع
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +31,Please select Fiscal Year,الرجاء اختيار السنة المالية
 apps/erpnext/erpnext/controllers/buying_controller.py +23,From {0} | {1} {2},من {0} | {1} {2}
@@ -1216,7 +1177,7 @@
 DocType: Item,Maintain Stock,الحفاظ على الأوراق المالية
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +213,Stock Entries already created for Production Order ,مقالات الأسهم التي تم إنشاؤها بالفعل لترتيب الإنتاج
 DocType: Leave Control Panel,Leave blank if considered for all designations,ترك فارغا إذا نظرت لجميع التسميات
-apps/erpnext/erpnext/controllers/accounts_controller.py +499,Charge of type 'Actual' in row {0} cannot be included in Item Rate,لا يمكن تضمين تهمة من نوع ' الفعلي ' في الصف {0} في سعر السلعة
+apps/erpnext/erpnext/controllers/accounts_controller.py +500,Charge of type 'Actual' in row {0} cannot be included in Item Rate,لا يمكن تضمين تهمة من نوع ' الفعلي ' في الصف {0} في سعر السلعة
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,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,لشركة
@@ -1226,7 +1187,7 @@
 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 +471,cannot be greater than 100,لا يمكن أن يكون أكبر من 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +546,Item {0} is not a stock Item,البند {0} ليس الأسهم الإغلاق
+apps/erpnext/erpnext/stock/doctype/item/item.py +550,Item {0} is not a stock Item,البند {0} ليس الأسهم الإغلاق
 DocType: Maintenance Visit,Unscheduled,غير المجدولة
 DocType: Employee,Owned,تملكها
 DocType: Salary Slip Deduction,Depends on Leave Without Pay,يعتمد على إجازة بدون مرتب
@@ -1240,31 +1201,29 @@
 DocType: HR Settings,Employee Settings,إعدادات موظف
 ,Batch-Wise Balance History,دفعة الحكيم التاريخ الرصيد
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +72,To Do List,قائمة المهام
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +63,Apprentice,مبتدئ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Apprentice,مبتدئ
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +99,Negative Quantity is not allowed,لا يسمح السلبية الكمية
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
 Used for Taxes and Charges","التفاصيل الضرائب الجدول المنال من سيده البند كسلسلة وتخزينها في هذا المجال.
  المستخدمة للضرائب والرسوم"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +61,Lancing,الوخز
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +151,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 +435,Accounting Entry for {0}: {1} can only be made in currency: {2},القيد المحاسبي ل{0}: {1} لا يمكن إلا أن يكون في العملة: {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +436,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 +38,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 +112,Tax Rule for transactions.,القاعدة الضريبية للمعاملات.
 DocType: Rename Tool,Type of document to rename.,نوع الوثيقة إلى إعادة تسمية.
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +630,We buy this Item,نشتري هذه القطعة
+apps/erpnext/erpnext/public/js/setup_wizard.js +366,We buy this Item,نشتري هذه القطعة
 DocType: Address,Billing,الفواتير
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +77,Flanging,تشفيه
 DocType: Bulk Email,Not Sent,لا ترسل
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +73,Explosive forming,المتفجرات تشكيل
 DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),مجموع الضرائب والرسوم (عملة الشركة)
 DocType: Shipping Rule,Shipping Account,حساب الشحن
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +43,Scheduled to send to {0} recipients,من المقرر أن يرسل إلى {0} المتلقين
 DocType: Quality Inspection,Readings,قراءات
 DocType: Stock Entry,Total Additional Costs,مجموع التكاليف الإضافية
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Sub Assemblies,الجمعيات الفرعية
+apps/erpnext/erpnext/public/js/setup_wizard.js +359,Sub Assemblies,الجمعيات الفرعية
 DocType: Shipping Rule Condition,To Value,إلى القيمة
 DocType: Supplier,Stock Manager,الأسهم مدير
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +143,Source warehouse is mandatory for row {0},مستودع مصدر إلزامي ل صف {0}
@@ -1274,44 +1233,42 @@
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,استيراد فشل !
 apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,أي عنوان أضاف بعد.
 DocType: Workstation Working Hour,Workstation Working Hour,محطة العمل ساعة العمل
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +83,Analyst,محلل
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +202,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},يجب أن يكون المبلغ المخصص {1} أقل من أو يساوي مبلغ JV {2} الصف {0}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Analyst,محلل
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +149,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},يجب أن يكون المبلغ المخصص {1} أقل من أو يساوي مبلغ JV {2} الصف {0}
 DocType: Item,Inventory,جرد
 DocType: Features Setup,"To enable ""Point of Sale"" view",لتمكين &quot;نقطة البيع&quot; وجهة نظر
 apps/erpnext/erpnext/public/js/pos/pos.js +402,Payment cannot be made for empty cart,لا يمكن أن يتم السداد للسلة فارغة
 DocType: Item,Sales Details,تفاصيل المبيعات
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +149,Pinning,تعلق
 DocType: Opportunity,With Items,مع الأصناف
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,في الكمية
 DocType: Notification Control,Expense Claim Rejected,المطالبة حساب مرفوض
 DocType: Sales Invoice,"The date on which next invoice will be generated. It is generated on submit.
 ",التاريخ الذي سيتم إنشاء الفاتورة القادمة. يتم إنشاؤها على تقديم.
 DocType: Item Attribute,Item Attribute,البند السمة
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +105,Government,حكومة
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Government,حكومة
 apps/erpnext/erpnext/config/stock.py +268,Item Variants,المتغيرات البند
 DocType: Company,Services,الخدمات
 apps/erpnext/erpnext/accounts/report/financial_statements.py +147,Total ({0}),مجموع ({0})
 DocType: Cost Center,Parent Cost Center,الأم تكلفة مركز
 DocType: Sales Invoice,Source,مصدر
 DocType: Leave Type,Is Leave Without Pay,وإجازة بدون راتب
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +186,No records found in the Payment table,لا توجد في جدول الدفع السجلات
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +405,Financial Year Start Date,تاريخ بدء السنة المالية
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +133,No records found in the Payment table,لا توجد في جدول الدفع السجلات
+apps/erpnext/erpnext/public/js/setup_wizard.js +153,Financial Year Start Date,تاريخ بدء السنة المالية
 DocType: Employee External Work History,Total Experience,مجموع الخبرة
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +100,Countersinking,التوسيع
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +271,Packing Slip(s) cancelled,زلة التعبئة (ق ) إلغاء
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +276,Packing Slip(s) cancelled,زلة التعبئة (ق ) إلغاء
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,الشحن و التخليص الرسوم
 DocType: Material Request Item,Sales Order No,ترتيب المبيعات لا
 DocType: Item Group,Item Group Name,البند اسم المجموعة
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +50,Taken,مأخوذ
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,مأخوذ
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +66,Transfer Materials for Manufacture,المواد نقل لصناعة
 DocType: Pricing Rule,For Price List,لائحة الأسعار
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +27,Executive Search,البحث التنفيذي
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,البحث التنفيذي
 apps/erpnext/erpnext/stock/stock_ledger.py +405,"Purchase rate for item: {0} not found, which is required to book accounting entry (expense). Please mention item price against a buying price list.",معدل شراء البند: {0} لم يتم العثور، وهو مطلوب لحجز دخول المحاسبة (النفقات). يرجى ذكر سعر البند ضد لائحة أسعار الشراء.
 DocType: Maintenance Schedule,Schedules,جداول
 DocType: Purchase Invoice Item,Net Amount,صافي القيمة
 DocType: Purchase Order Item Supplied,BOM Detail No,BOM تفاصيل لا
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),إضافي مقدار الخصم (العملة الشركة)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +537,Error: {0} > {1},الخطأ: {0} > {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +541,Error: {0} > {1},الخطأ: {0} > {1}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,يرجى إنشاء حساب جديد من الرسم البياني للحسابات .
 DocType: Maintenance Visit,Maintenance Visit,صيانة زيارة
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer > Customer Group > Territory,العملاء> مجموعة العملاء> إقليم
@@ -1322,7 +1279,6 @@
 DocType: Event,Tuesday,الثلاثاء
 DocType: Leave Block List,Block Holidays on important days.,عطلات كتلة في الأيام الهامة.
 ,Accounts Receivable Summary,حسابات المقبوضات ملخص
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +43,Leaves for type {0} already allocated for Employee {1} for period {2} - {3},يترك لنوع {0} المخصصة أصلا لموظف {1} لفترة {2} - {3}
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +187,Please set User ID field in an Employee record to set Employee Role,الرجاء تعيين حقل معرف المستخدم في سجل الموظف لتحديد دور موظف
 DocType: UOM,UOM Name,UOM اسم
 DocType: Top Bar Item,Target,الهدف
@@ -1334,15 +1290,14 @@
 DocType: ToDo,Due Date,بسبب تاريخ
 DocType: Sales Invoice Item,Brand Name,العلامة التجارية اسم
 DocType: Purchase Receipt,Transporter Details,تفاصيل نقل
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Box,صندوق
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +389,The Organization,منظمة
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Box,صندوق
+apps/erpnext/erpnext/public/js/setup_wizard.js +137,The Organization,منظمة
 DocType: Monthly Distribution,Monthly Distribution,التوزيع الشهري
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,قائمة المتلقي هو فارغ. يرجى إنشاء قائمة استقبال
 DocType: Production Plan Sales Order,Production Plan Sales Order,أمر الإنتاج خطة المبيعات
 DocType: Sales Partner,Sales Partner Target,مبيعات الشريك الهدف
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},القيد المحاسبي ل{0} لا يمكن إلا أن تكون في العملة: {1}
 DocType: Pricing Rule,Pricing Rule,التسعير القاعدة
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +58,Notching,الإحراز
 apps/erpnext/erpnext/config/learn.py +167,Material Request to Purchase Order,طلب المادي لأمر الشراء
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +74,Row # {0}: Returned Item {1} does not exists in {2} {3},لا يوجد عاد هذا البند {1} في {2} {3} الصف # {0}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,الحسابات المصرفية
@@ -1359,20 +1314,19 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Amounts not reflected in bank,المبالغ لا ينعكس في البنك
 DocType: Quality Inspection Reading,Reading 4,قراءة 4
 apps/erpnext/erpnext/config/hr.py +23,Claims for company expense.,مطالبات لحساب الشركة.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +8,Centrifugal casting,صب الطرد المركزي
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +119,Magnetic field-assisted finishing,المغناطيسي التشطيب بمساعدة ميدانية
 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,الاتصال المحمول لا
 DocType: Production Planning Tool,Select Sales Orders,حدد أوامر المبيعات
 ,Material Requests for which Supplier Quotations are not created,طلبات المواد التي الاقتباسات مورد لا يتم إنشاء
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +117,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,اليوم (ق) الذي يتم تطبيق للحصول على إجازة وأيام العطل. لا تحتاج إلى تقديم طلب للحصول الإجازة.
 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/buying/doctype/purchase_order/purchase_order.js +477,Mark as Delivered,إجعلها تسليم
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +497,Mark as Delivered,إجعلها تسليم
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +34,Make Quotation,جعل الاقتباس
 DocType: Dependent Task,Dependent Task,العمل تعتمد
-apps/erpnext/erpnext/stock/doctype/item/item.py +306,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 +141,Leave of type {0} cannot be longer than {1},إجازة من نوع {0} لا يمكن أن تكون أطول من {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +310,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 +155,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,استقبال قائمة
@@ -1380,15 +1334,14 @@
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,الكمية المستهلكة
 apps/erpnext/erpnext/public/js/pos/pos.js +491,{0} View,{0} مشاهدة
 DocType: Salary Structure Deduction,Salary Structure Deduction,هيكل المرتبات / الخصومات
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +158,Selective laser sintering,انتقائية تلبد الليزر
-apps/erpnext/erpnext/stock/doctype/item/item.py +301,Unit of Measure {0} has been entered more than once in Conversion Factor Table,وحدة القياس {0} تم إدخال أكثر من مرة واحدة في معامل التحويل الجدول
+apps/erpnext/erpnext/stock/doctype/item/item.py +305,Unit of Measure {0} has been entered more than once in Conversion Factor Table,وحدة القياس {0} تم إدخال أكثر من مرة واحدة في معامل التحويل الجدول
 apps/frappe/frappe/core/page/data_import_tool/data_import_tool.js +108,Import Successful!,استيراد الناجحة !
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,تكلفة عناصر صدر
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +185,Quantity must not be more than {0},لا يجب أن تكون الكمية أكثر من {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +41,Age (Days),سن (أيام)
 DocType: Quotation Item,Quotation Item,عنصر تسعيرة
 DocType: Account,Account Name,اسم الحساب
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +41,From Date cannot be greater than To Date,من تاريخ لا يمكن أن يكون أكبر من إلى تاريخ
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +34,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.,المورد الرئيسي نوع .
 DocType: Purchase Order Item,Supplier Part Number,المورد رقم الجزء
@@ -1397,14 +1350,14 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +247,{0} {1} is cancelled or stopped,{0} {1} تم إلغاء أو توقف
 DocType: Accounts Settings,Credit Controller,المراقب الائتمان
 DocType: Delivery Note,Vehicle Dispatch Date,سيارة الإرسال التسجيل
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +197,Purchase Receipt {0} is not submitted,شراء استلام {0} لم تقدم
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +198,Purchase Receipt {0} is not submitted,شراء استلام {0} لم تقدم
 DocType: Company,Default Payable Account,افتراضي الدائنة حساب
 apps/erpnext/erpnext/config/website.py +13,"Settings for online shopping cart such as shipping rules, price list etc.",إعدادات الإنترنت عربة التسوق مثل قواعد الشحن، وقائمة الأسعار الخ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +660,Setup Complete,الإعداد كاملة
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +124,Setup Complete,الإعداد كاملة
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +65,{0}% Billed,{0} فوترت٪
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +17,Reserved Qty,الكمية المحجوزة
 DocType: Party Account,Party Account,حساب طرف
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +74,Human Resources,الموارد البشرية
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +74,Human Resources,الموارد البشرية
 DocType: Lead,Upper Income,العلوي الدخل
 DocType: Journal Entry Account,Debit in Company Currency,الخصم في الشركة العملات
 apps/erpnext/erpnext/support/doctype/issue/issue.py +58,My Issues,قضايا بلدي
@@ -1413,11 +1366,9 @@
 DocType: Company,Default Values,قيم افتراضية
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +236,Row {0}: Payment amount can not be negative,صف {0} كمية الدفع لا يمكن أن يكون سلبيا
 DocType: Expense Claim,Total Amount Reimbursed,مجموع المبلغ المسدد
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +152,Press fitting,الصحافة المناسب
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +64,Against Supplier Invoice {0} dated {1},مقابل فاتورة المورد {0} بتاريخ {1}
 DocType: Customer,Default Price List,قائمة الأسعار الافتراضي
 DocType: Payment Reconciliation,Payments,المدفوعات
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +24,Hot isostatic pressing,المتوازنة التضاغط الملحة الساخنة
 DocType: ToDo,Medium,متوسط
 DocType: Budget Detail,Budget Allocated,الميزانية المخصصة
 DocType: Journal Entry,Entry Type,نوع الدخول
@@ -1430,9 +1381,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +56,None of the items have any change in quantity or value.,لا شيء من هذه البنود يكون أي تغيير في كمية أو قيمة.
 DocType: Warranty Claim,Warranty Claim,المطالبة الضمان
 ,Lead Details,تفاصيل مبادرة بيع
-DocType: Authorization Rule,Approving User,الموافقة العضو
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +37,Forging,تزوير
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +126,Plating,تصفيح
 DocType: Purchase Invoice,End date of current invoice's period,تاريخ نهاية فترة الفاتورة الحالية
 DocType: Pricing Rule,Applicable For,قابل للتطبيق ل
 DocType: Bank Reconciliation,From Date,من تاريخ
@@ -1454,31 +1402,29 @@
 DocType: Sales Invoice,Paid Amount (Company Currency),المبلغ المدفوع (شركة العملات)
 DocType: Purchase Invoice,Additional Discount,خصم إضافي
 DocType: Selling Settings,Selling Settings,بيع إعدادات
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +39,Online Auctions,مزادات على الانترنت
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,مزادات على الانترنت
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +94,Please specify either Quantity or Valuation Rate or both,يرجى تحديد الكمية أو التقييم إما قيم أو كليهما
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +50,"Company, Month and Fiscal Year is mandatory",شركة والشهر و السنة المالية إلزامي
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Marketing Expenses,مصاريف التسويق
 ,Item Shortage Report,البند تقرير نقص
-apps/erpnext/erpnext/stock/doctype/item/item.js +183,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","يذكر الوزن، \n يرجى ذكر ""الوزن UOM"" للغاية"
+apps/erpnext/erpnext/stock/doctype/item/item.js +185,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","يذكر الوزن، \n يرجى ذكر ""الوزن UOM"" للغاية"
 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 +212,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 +384,Warehouse required at Row No {0},مستودع المطلوبة في صف لا {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +386,Warehouse required at Row No {0},مستودع المطلوبة في صف لا {0}
 DocType: Employee,Date Of Retirement,تاريخ التقاعد
 DocType: Upload Attendance,Get Template,الحصول على قالب
 DocType: Address,Postal,بريدي
 DocType: Item,Weightage,الوزن
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +159,Mining,تعدين
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +17,Resin casting,الراتنج صب
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,يوجد مجموعة العملاء مع نفس الاسم الرجاء تغيير اسم العميل أو إعادة تسمية المجموعة العملاء
 apps/erpnext/erpnext/public/js/pos/pos.js +147,Please select {0} first.,الرجاء اختيار {0} أولا.
 apps/erpnext/erpnext/templates/pages/order.html +57,text {0},النص {0}
 DocType: Territory,Parent Territory,الأم الأرض
 DocType: Quality Inspection Reading,Reading 2,القراءة 2
 DocType: Stock Entry,Material Receipt,أستلام مواد
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +622,Products,المنتجات
+apps/erpnext/erpnext/public/js/setup_wizard.js +358,Products,المنتجات
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +47,Party Type and Party is required for Receivable / Payable account {0},مطلوب نوع الحزب وحزب المقبوضات / حسابات المدفوعات {0}
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.",إذا كان هذا البند لديها بدائل، فإنه لا يمكن اختيارها في أوامر البيع الخ
 DocType: Lead,Next Contact By,لاحق اتصل بواسطة
@@ -1488,13 +1434,13 @@
 DocType: Purchase Invoice,Notification Email Address,عنوان البريد الإلكتروني الإخطار
 DocType: Payment Tool,Find Invoices to Match,البحث عن الفواتير لتطابق
 ,Item-wise Sales Register,مبيعات البند الحكيم سجل
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +399,"e.g. ""XYZ National Bank""","على سبيل المثال ""البنك الوطني XYZ """
+apps/erpnext/erpnext/public/js/setup_wizard.js +147,"e.g. ""XYZ National Bank""","على سبيل المثال ""البنك الوطني XYZ """
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,وهذه الضريبة متضمنة في سعر الأساسية؟
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +57,Total Target,إجمالي المستهدف
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Target,إجمالي المستهدف
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.js +22,Shopping Cart is enabled,يتم تمكين سلة التسوق
 DocType: Job Applicant,Applicant for a Job,المتقدم للحصول على وظيفة
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +173,No Production Orders created,لا أوامر الإنتاج التي تم إنشاؤها
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +131,Salary Slip of employee {0} already created for this month,إيصال راتب الموظف تم إنشاؤها مسبقا لهذا الشهر 
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +140,Salary Slip of employee {0} already created for this month,إيصال راتب الموظف تم إنشاؤها مسبقا لهذا الشهر 
 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.,عدد كبير جدا من الأعمدة. تصدير التقرير وطباعته باستخدام تطبيق جدول البيانات.
 DocType: Sales Invoice Item,Batch No,رقم دفعة
@@ -1504,14 +1450,14 @@
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +13,Variant,مختلف
 apps/frappe/frappe/public/js/frappe/form/toolbar.js +165,New {0},جديد {0}
 DocType: Naming Series,Set prefix for numbering series on your transactions,تحديد بادئة للترقيم المتسلسل على المعاملات الخاصة بك
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +169,Stopped order cannot be cancelled. Unstop to cancel.,لا يمكن إلغاء النظام على توقف . نزع السدادة لإلغاء .
-apps/erpnext/erpnext/stock/doctype/item/item.py +323,Default BOM ({0}) must be active for this item or its template,BOM الافتراضي ({0}) يجب أن تكون نشطة لهذا البند أو قالبها
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +164,Stopped order cannot be cancelled. Unstop to cancel.,لا يمكن إلغاء النظام على توقف . نزع السدادة لإلغاء .
+apps/erpnext/erpnext/stock/doctype/item/item.py +327,Default BOM ({0}) must be active for this item or its template,BOM الافتراضي ({0}) يجب أن تكون نشطة لهذا البند أو قالبها
 DocType: Employee,Leave Encashed?,ترك صرفها؟
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,فرصة من الحقل إلزامي
 DocType: Item,Variants,المتغيرات
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +458,Make Purchase Order,جعل أمر الشراء
 DocType: SMS Center,Send To,أرسل إلى
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +111,There is not enough leave balance for Leave Type {0},ليس هناك ما يكفي من التوازن إجازة ل إجازة نوع {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +127,There is not enough leave balance for Leave Type {0},ليس هناك ما يكفي من التوازن إجازة ل إجازة نوع {0}
 DocType: Sales Team,Contribution to Net Total,المساهمة في صافي إجمالي
 DocType: Sales Invoice Item,Customer's Item Code,كود الصنف العميل
 DocType: Stock Reconciliation,Stock Reconciliation,الأسهم المصالحة
@@ -1548,11 +1494,11 @@
 DocType: Sales Order Item,Actual Qty,الكمية الفعلية
 DocType: Sales Invoice Item,References,المراجع
 DocType: Quality Inspection Reading,Reading 10,قراءة 10
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +612,"List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start.",قائمة المنتجات أو الخدمات التي تشتري أو تبيع الخاص بك.
+apps/erpnext/erpnext/public/js/setup_wizard.js +348,"List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start.",قائمة المنتجات أو الخدمات التي تشتري أو تبيع الخاص بك.
 DocType: Hub Settings,Hub Node,المحور عقدة
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,لقد دخلت عناصر مكررة . يرجى تصحيح و حاول مرة أخرى.
 apps/erpnext/erpnext/controllers/item_variant.py +65,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values,قيمة {0} للسمة {1} غير موجود في قائمة صالحة قيم سمة العنصر
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +87,Associate,مساعد
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Associate,مساعد
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +46,Item {0} is not a serialized Item,البند {0} ليس البند المتسلسلة
 DocType: SMS Center,Create Receiver List,إنشاء قائمة استقبال
 apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +5,Expired,انتهى
@@ -1561,7 +1507,7 @@
 DocType: Warranty Claim,Issue Date,تاريخ القضية
 DocType: Activity Cost,Activity Cost,النشاط التكلفة
 DocType: Purchase Receipt Item Supplied,Consumed Qty,تستهلك الكمية
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +52,Telecommunications,الاتصالات السلكية واللاسلكية
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +52,Telecommunications,الاتصالات السلكية واللاسلكية
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),يشير إلى أن الحزمة هو جزء من هذا التسليم (مشروع فقط)
 DocType: Payment Tool,Make Payment Entry,جعل الدفع الاشتراك
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +119,Quantity for Item {0} must be less than {1},كمية القطعة ل {0} يجب أن يكون أقل من {1}
@@ -1578,10 +1524,8 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +37,"Selling must be checked, if Applicable For is selected as {0}",يجب أن يتم التحقق البيع، إذا تم تحديد مطبق للك {0}
 DocType: Purchase Order Item,Supplier Quotation Item,المورد اقتباس الإغلاق
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +27,Make Salary Structure,جعل هيكل الرواتب
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +54,Shearing,قص
 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.,انقر على &#39;جعل مبيعات الفاتورة &quot;الزر لإنشاء فاتورة مبيعات جديدة.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +166,Packaging and labeling,التعبئة والتغليف ووضع العلامات
 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,يرجى تحديد العملة الافتراضية في شركة ماستر وافتراضيات العالمية
@@ -1592,19 +1536,18 @@
 DocType: Budget Detail,Fiscal Year,السنة المالية
 DocType: Cost Center,Budget,ميزانية
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +41,"Budget cannot be assigned against {0}, as it's not an Income or Expense account",الميزانية لا يمكن المبينة قرين {0}، كما انها ليست حساب الإيرادات والمصروفات
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Achieved,حقق
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,حقق
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +65,Territory / Customer,أراضي / العملاء
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,e.g. 5,على سبيل المثال 5
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +207,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},يجب أن يكون المبلغ المخصص {1} أقل من أو يساوي الفاتورة المبلغ المستحق {2} الصف {0}
+apps/erpnext/erpnext/public/js/setup_wizard.js +294,e.g. 5,على سبيل المثال 5
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},يجب أن يكون المبلغ المخصص {1} أقل من أو يساوي الفاتورة المبلغ المستحق {2} الصف {0}
 DocType: Sales Invoice,In Words will be visible once you save the Sales Invoice.,وبعبارة تكون مرئية بمجرد حفظ فاتورة المبيعات.
 DocType: Item,Is Sales Item,هو المبيعات الإغلاق
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,البند المجموعة شجرة
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,البند {0} ليس الإعداد لل سيد رقم التسلسلي تاريخ المغادرة
 DocType: Maintenance Visit,Maintenance Time,وقت الصيانة
 ,Amount to Deliver,المبلغ تسليم
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +620,A Product or Service,منتج أو خدمة
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +158,There were errors.,كانت هناك أخطاء .
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +101,Tapping,نقر
+apps/erpnext/erpnext/public/js/setup_wizard.js +356,A Product or Service,منتج أو خدمة
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +146,There were errors.,كانت هناك أخطاء .
 DocType: Naming Series,Current Value,القيمة الحالية
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +171,{0} created,{0} تم إنشاء
 DocType: Delivery Note Item,Against Sales Order,ضد ترتيب المبيعات
@@ -1619,7 +1562,7 @@
 apps/erpnext/erpnext/accounts/party.py +275,Due Date cannot be before Posting Date,بسبب التاريخ لا يمكن أن يكون قبل المشاركة في التسجيل
 DocType: Website Item Group,Website Item Group,مجموعة الأصناف للموقع
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Duties and Taxes,الرسوم والضرائب
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Please enter Reference date,من فضلك ادخل تاريخ المرجعي
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +312,Please enter Reference date,من فضلك ادخل تاريخ المرجعي
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} إدخالات الدفع لا يمكن أن تتم تصفيته من قبل {1}
 DocType: Item Website Specification,Table for Item that will be shown in Web Site,الجدول القطعة لأنه سيظهر في الموقع
 DocType: Purchase Order Item Supplied,Supplied Qty,الموردة الكمية
@@ -1627,7 +1570,7 @@
 apps/erpnext/erpnext/config/stock.py +103,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,البند الحكيم تاريخ الشراء
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +152,Red,أحمر
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Red,أحمر
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +228,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},الرجاء انقر على ' إنشاء الجدول ' لجلب رقم المسلسل أضاف القطعة ل {0}
 DocType: Account,Frozen,تجميد
 ,Open Production Orders,أوامر مفتوحة الانتاج
@@ -1642,7 +1585,7 @@
 DocType: Item Attribute,Attribute Name,السمة اسم
 apps/erpnext/erpnext/controllers/selling_controller.py +236,Item {0} must be Sales or Service Item in {1},البند {0} يجب أن تكون المبيعات أو خدمة عنصر في {1}
 DocType: Item Group,Show In Website,تظهر في الموقع
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +621,Group,مجموعة
+apps/erpnext/erpnext/public/js/setup_wizard.js +357,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",لتتبع اسم العلامة التجارية في الوثائق التالية تسليم مذكرة، فرصة، طلب المواد، البند، طلب شراء، شراء قسيمة، المشتري استلام، الاقتباس، فاتورة المبيعات، حزمة المنتج، ترتيب المبيعات، المسلسل لا
@@ -1652,6 +1595,7 @@
 DocType: Features Setup,Brands,العلامات التجارية
 DocType: C-Form Invoice Detail,Invoice No,الفاتورة لا
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +480,From Purchase Order,من أمر الشراء
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +92,"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,استقالة تاريخ رسالة
@@ -1659,35 +1603,31 @@
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +137,Not Set,غير محدد
 DocType: Communication,Date,تاريخ
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,كرر الإيرادات العملاء
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +651,Sit tight while your system is being setup. This may take a few moments.,"الرجاء الانتظار حتى يتم الانتهاء من اعداد النظام, قد يستغرق بضع دقائق."
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +115,Sit tight while your system is being setup. This may take a few moments.,"الرجاء الانتظار حتى يتم الانتهاء من اعداد النظام, قد يستغرق بضع دقائق."
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +51,{0} ({1}) must have role 'Expense Approver',{0} ({1}) يجب أن يمتلك صلاحية (إعتماد النفقات)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Pair,زوج
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Pair,زوج
 DocType: Bank Reconciliation Detail,Against Account,ضد الحساب
 DocType: Maintenance Schedule Detail,Actual Date,التاريخ الفعلي
 DocType: Item,Has Batch No,ودفعة واحدة لا
 DocType: Delivery Note,Excise Page Number,المكوس رقم الصفحة
 DocType: Employee,Personal Details,تفاصيل شخصية
 ,Maintenance Schedules,جداول الصيانة
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +44,Embossing,النقش
 ,Quotation Trends,اتجاهات الاقتباس
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +139,Item Group not mentioned in item master for item {0},المجموعة البند لم يرد ذكرها في البند الرئيسي لمادة {0}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +302,Debit To account must be a Receivable account,يجب أن يكون الخصم لحساب حساب المقبوضات
-apps/erpnext/erpnext/stock/doctype/item/item.py +310,"As Production Order can be made for this item, it must be a stock item.",لأنه يمكن أن يتم اصدار أمر إنتاج لهذا الصنف، يجب أن يكون الصنف من نوع المخزون .
 DocType: Shipping Rule Condition,Shipping Amount,الشحن المبلغ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +140,Joining,انضمام
-DocType: Authorization Rule,Above Value,فوق القيمة
 ,Pending Amount,في انتظار المبلغ
 DocType: Purchase Invoice Item,Conversion Factor,معامل التحويل
 DocType: Purchase Order,Delivered,تسليم
 apps/erpnext/erpnext/config/hr.py +160,Setup incoming server for jobs email id. (e.g. jobs@example.com),إعداد ملقم واردة عن وظائف البريد الإلكتروني معرف . (على سبيل المثال jobs@example.com )
 DocType: Purchase Receipt,Vehicle Number,عدد المركبات
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,التاريخ الذي سيتم فاتورة المتكررة وقف
+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,حسابات القبض
 ,Supplier-Wise Sales Analytics,المورد حكيم المبيعات تحليلات
 DocType: Address Template,This format is used if country specific format is not found,ويستخدم هذا الشكل إذا لم يتم العثور على صيغة محددة البلاد
 DocType: Custom Field,Custom,عرف
 DocType: Production Order,Use Multi-Level BOM,استخدام متعدد المستويات BOM
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +26,Injection molding,حقن صب
 DocType: Bank Reconciliation,Include Reconciled Entries,وتشمل مقالات التوفيق
 apps/erpnext/erpnext/config/accounts.py +41,Tree of finanial accounts.,شجرة حسابات finanial .
 DocType: Leave Control Panel,Leave blank if considered for all employee types,ترك فارغا إذا نظرت لجميع أنواع موظف
@@ -1697,30 +1637,28 @@
 apps/frappe/frappe/config/setup.py +130,Printing,طبع
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +114,Expense Claim is pending approval. Only the Expense Approver can update status.,حساب المطالبة بانتظار الموافقة. فقط الموافق المصروفات يمكن تحديث الحالة.
 DocType: Purchase Invoice,Additional Discount Amount,إضافي مقدار الخصم
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +99,The day(s) on which you are applying for leave are holiday. You need not apply for leave.,اليوم ( ق ) التي كنت متقدما للحصول على إذن هي عطلة. لا تحتاج إلى تطبيق للحصول على إجازة .
 apps/frappe/frappe/public/js/frappe/misc/utils.js +110,and,و
 DocType: Leave Block List Allow,Leave Block List Allow,ترك قائمة الحظر السماح
 apps/erpnext/erpnext/setup/doctype/company/company.py +236,Abbr can not be blank or space,ابر لا يمكن أن تكون فارغة أو الفضاء
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +50,Sports,الرياضة
+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/setup/page/setup_wizard/setup_wizard.js +626,Unit,وحدة
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Unit,وحدة
 apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.py +182,Please set Dropbox access keys in your site config,الرجاء تعيين مفاتيح الوصول دروببوإكس في التكوين موقعك
 apps/erpnext/erpnext/stock/get_item_details.py +113,Please specify Company,يرجى تحديد شركة
 ,Customer Acquisition and Loyalty,اكتساب العملاء و الولاء
 DocType: Purchase Receipt,Warehouse where you are maintaining stock of rejected items,مستودع حيث كنت الحفاظ على المخزون من المواد رفضت
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +408,Your financial year ends on,السنة المالية تنتهي في الخاص
+apps/erpnext/erpnext/public/js/setup_wizard.js +156,Your financial year ends on,السنة المالية تنتهي في الخاص
 DocType: POS Profile,Price List,قائمة الأسعار
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +20,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0} الآن سنة مالية افتراضية،  يرجى تحديث المتصفح ليصبح التغيير نافذ المفعول .
 apps/erpnext/erpnext/projects/doctype/project/project.js +47,Expense Claims,مطالبات حساب
 DocType: Issue,Support,دعم
-DocType: Authorization Rule,Approving Role,الموافقة على دور
 ,BOM Search,BOM البحث
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +176,Closing (Opening + Totals),إغلاق (فتح + المجاميع)
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +26,Please specify currency in Company,يرجى تحديد العملة في الشركة
 DocType: Workstation,Wages per hour,الأجور في الساعة
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,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/controllers/accounts_controller.py +236,Account {0} is invalid. Account Currency must be {1},حساب {0} غير صالح. يجب أن تكون عملة الحساب {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +237,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},مطلوب عامل UOM التحويل في الصف {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +53,Clearance date cannot be before check date in row {0},تاريخ التخليص لا يمكن أن يكون قبل تاريخ الاختيار في الصف {0}
 DocType: Salary Slip,Deduction,اقتطاع
@@ -1739,13 +1677,13 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +82,Item {0} has already been returned,البند {0} تم بالفعل عاد
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** السنة المالية ** يمثل السنة المالية. يتم تعقب كل القيود المحاسبية والمعاملات الرئيسية الأخرى مقابل السنة المالية ** **.
 DocType: Opportunity,Customer / Lead Address,العميل / الرصاص العنوان
+apps/erpnext/erpnext/stock/doctype/item/item.py +112,Warning: Invalid SSL certificate on attachment {0},تحذير: شهادة SSL غير صالحة في المرفق {0}
 DocType: Production Order Operation,Actual Operation Time,الفعلي وقت التشغيل
 DocType: Authorization Rule,Applicable To (User),تنطبق على (المستخدم)
 DocType: Purchase Taxes and Charges,Deduct,خصم
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +170,Job Description,المسمى الوظيفي
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +170,Job Description,المسمى الوظيفي
 DocType: Purchase Order Item,Qty as per Stock UOM,حسب الكمية سهم UOM
 apps/frappe/frappe/model/rename_doc.py +343,Please select a valid csv file with data,يرجى تحديد ملف CSV صالحة مع البيانات
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +92,Coating,طلية
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +126,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","أحرف خاصة باستثناء ""-"" "".""، ""#""، و""/"" غير مسموح به في تسمية الترقيم المتسلسل"
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.",تتبع الحملات المبيعات. تتبع يؤدي، الاقتباسات، ترتيب المبيعات الخ من الحملات لقياس العائد على الاستثمار. 
 DocType: Expense Claim,Approver,الموافق
@@ -1755,12 +1693,11 @@
 DocType: Supplier Quotation,Manufacturing Manager,مدير التصنيع
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +191,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/hooks.py +84,Shipments,شحنات
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +29,Dip molding,تراجع صب
+apps/erpnext/erpnext/hooks.py +68,Shipments,شحنات
 DocType: Purchase Order,To be delivered to customer,ليتم تسليمها إلى العملاء
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,يجب تقديم الوقت سجل الحالة.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,المسلسل لا {0} لا تنتمي إلى أي مستودع
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +650,Setting Up,إنشاء
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +114,Setting Up,إنشاء
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,Row # ,الصف #
 DocType: Purchase Invoice,In Words (Company Currency),في كلمات (عملة الشركة)
 DocType: Pricing Rule,Supplier,مزود
@@ -1768,7 +1705,7 @@
 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 +166,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,حساب أو حساب الفرق إلزامي القطعة ل {0} لأنها آثار قيمة الأسهم الإجمالية
-apps/erpnext/erpnext/controllers/accounts_controller.py +354,"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/accounts_controller.py +355,"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 +135,User {0} is disabled,المستخدم {0} تم تعطيل
@@ -1781,27 +1718,26 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,{0} is mandatory for Item {1},{0} إلزامي للصنف {1}
 DocType: Currency Exchange,From Currency,من العملات
 DocType: DocField,Name,اسم
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +211,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row",يرجى تحديد المبلغ المخصص، نوع الفاتورة ورقم الفاتورة في أتلست صف واحد
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +104,Sales Order required for Item {0},ترتيب المبيعات المطلوبة القطعة ل {0}
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +158,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row",يرجى تحديد المبلغ المخصص، نوع الفاتورة ورقم الفاتورة في أتلست صف واحد
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +107,Sales Order required for Item {0},ترتيب المبيعات المطلوبة القطعة ل {0}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +43,Amounts not reflected in system,المبالغ لم تنعكس في نظام
 DocType: Purchase Invoice Item,Rate (Company Currency),معدل (عملة الشركة)
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +40,Others,آخرون
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +40,Others,آخرون
 apps/erpnext/erpnext/templates/includes/product_page.js +80,Cannot find a matching Item. Please select some other value for {0}.,لا يمكن العثور على مطابقة البند. الرجاء تحديد قيمة أخرى ل{0}.
 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/frappe/frappe/core/doctype/doctype/boilerplate/controller_list.html +31,Completed,الانتهاء
 DocType: Web Form,Select DocType,حدد DOCTYPE
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +104,Broaching,التطرق
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +12,Banking,مصرفي
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,مصرفي
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +38,Please click on 'Generate Schedule' to get schedule,الرجاء انقر على ' إنشاء الجدول ' للحصول على الجدول الزمني
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +283,New Cost Center,مركز تكلفة جديدة
 DocType: Bin,Ordered Quantity,أمرت الكمية
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +397,"e.g. ""Build tools for builders""","مثلاً: ""نبني أدوات البنائين"""
+apps/erpnext/erpnext/public/js/setup_wizard.js +145,"e.g. ""Build tools for builders""","مثلاً: ""نبني أدوات البنائين"""
 DocType: Quality Inspection,In Process,في عملية
 DocType: Authorization Rule,Itemwise Discount,Itemwise الخصم
 DocType: Purchase Order Item,Reference Document Type,مرجع نوع الوثيقة
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +318,{0} against Sales Order {1},{0} مقابل ترتيب المبيعات {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +320,{0} against Sales Order {1},{0} مقابل ترتيب المبيعات {1}
 DocType: Account,Fixed Asset,الأصول الثابتة
 apps/erpnext/erpnext/config/stock.py +283,Serialized Inventory,جرد المتسلسلة
 DocType: Activity Type,Default Billing Rate,افتراضي الفواتير أسعار
@@ -1816,14 +1752,13 @@
 DocType: Purchase Invoice Item,Page Break,فاصل الصفحة
 DocType: Production Order Operation,Pending,ريثما
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,المستخدمين الذين يمكنهم الموافقة على الطلبات إجازة موظف معين ل
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +33,You cannot change default UOM of Variant. To change default UOM for Variant change default UOM of the Template,لا يمكنك تغيير UOM الافتراضي متغير. لتغيير UOM الافتراضي للخيار UOM تغيير الافتراضي للقالب
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +50,Office Equipments,أدوات المكتب
 DocType: Purchase Invoice Item,Qty,الكمية
 DocType: Fiscal Year,Companies,الشركات
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +24,Electronics,إلكترونيات
+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/support/doctype/maintenance_visit/maintenance_visit.js +18,From Maintenance Schedule,من جدول الصيانة
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +56,Full-time,بدوام كامل
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +56,Full-time,بدوام كامل
 DocType: Purchase Invoice,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.",إذا قمت بإنشاء قالب قياسي في قالب الضرائب على المبيعات والرسوم، اختر واحدا وانقر على الزر أدناه.
@@ -1835,11 +1770,12 @@
 DocType: Job Applicant,Job Opening,افتتاح العمل
 DocType: Payment Reconciliation,Payment Reconciliation,دفع المصالحة
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +154,Please select Incharge Person's name,يرجى تحديد اسم الشخص المكلف
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +51,Technology,تكنولوجيا
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,تكنولوجيا
 DocType: Offer Letter,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,إجمالي الفاتورة آمت
 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.",لإضافة العقد التابعة ، واستكشاف شجرة وانقر على العقدة التي بموجبها تريد إضافة المزيد من العقد .
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +102,Credit To account must be a Payable account,يجب أن يكون الائتمان لحساب حسابات المدفوعات
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +233,BOM recursion: {0} cannot be parent or child of {2},BOM العودية : {0} لا يمكن أن يكون الأم أو الطفل من {2}
@@ -1852,10 +1788,8 @@
 DocType: Item,Customer Item Codes,رموز العملاء البند
 DocType: Opportunity,Lost Reason,فقد السبب
 apps/erpnext/erpnext/config/accounts.py +68,Create Payment Entries against Orders or Invoices.,خلق مقالات الدفع ضد أوامر أو الفواتير.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +141,Welding,لحام
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +40,New Stock UOM is required,مطلوب اسهم جديدة UOM
 DocType: Quality Inspection,Sample Size,حجم العينة
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +443,All items have already been invoiced,كل الأصناف قد تم فوترتها من قبل
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +446,All items have already been invoiced,كل الأصناف قد تم فوترتها من قبل
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',الرجاء تحديد صالح &#39;من القضية رقم&#39;
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +287,Further cost centers can be made under Groups but entries can be made against non-Groups,مراكز تكلفة إضافية يمكن أن تكون ضمن مجموعات ولكن يمكن أن تكون إدخالات ضد المجموعات غير-
 DocType: Project,External,خارجي
@@ -1867,8 +1801,7 @@
 DocType: Bin,Actual Quantity,الكمية الفعلية
 DocType: Shipping Rule,example: Next Day Shipping,مثال: اليوم التالي شحن
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,المسلسل لا {0} لم يتم العثور
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +563,Your Customers,العملاء
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +27,Compression molding,صب صب
+apps/erpnext/erpnext/public/js/setup_wizard.js +303,Your Customers,العملاء
 DocType: Leave Block List Date,Block Date,منع تاريخ
 DocType: Sales Order,Not Delivered,ولا يتم توريدها
 ,Bank Clearance Summary,بنك ملخص التخليص
@@ -1889,10 +1822,10 @@
 DocType: SMS Log,Sent To,يرسل الى
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +28,Make Sales Invoice,جعل فاتورة المبيعات
 DocType: Company,For Reference Only.,للاشارة فقط.
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +29,Invalid {0}: {1},باطلة {0} {1}
+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,القدرة على التخطيط
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +49,'From Date' is required,من تاريخ (مطلوب)
+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,مكان العمل الجديد
@@ -1907,7 +1840,7 @@
 DocType: Serial No,Delivery Time,وقت التسليم
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,بناء على شيخوخة
 DocType: Item,End of Life,نهاية الحياة
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +41,Travel,سفر
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +41,Travel,سفر
 DocType: Leave Block List,Allow Users,السماح للمستخدمين
 DocType: Purchase Order,Customer Mobile No,العميل رقم هاتفك الجوال
 DocType: Sales Invoice,Recurring,تواتري
@@ -1921,7 +1854,7 @@
 DocType: Naming Series,User must always select,يجب دائما مستخدم تحديد
 DocType: Stock Settings,Allow Negative Stock,تسمح الأسهم السلبية
 DocType: Installation Note,Installation Note,ملاحظة التثبيت
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +541,Add Taxes,إضافة الضرائب
+apps/erpnext/erpnext/public/js/setup_wizard.js +283,Add Taxes,إضافة الضرائب
 ,Financial Analytics,تحليلات مالية
 DocType: Quality Inspection,Verified By,التحقق من
 DocType: Address,Subsidiary,شركة فرعية
@@ -1931,7 +1864,6 @@
 DocType: System Settings,In Hours,في ساعات
 DocType: Process Payroll,Create Salary Slip,إنشاء زلة الراتب
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Expected balance as per bank,التوازن المتوقع حسب البنك
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +115,Buffing,التلميع
 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,موظف
@@ -1948,11 +1880,11 @@
 DocType: Rename Tool,File to Rename,ملف إعادة تسمية
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +176,Purchse Order number required for Item {0},رقم الطلب من purchse المطلوبة القطعة ل {0}
 apps/erpnext/erpnext/public/js/controllers/transaction.js +136,Show Payments,مشاهدة المدفوعات
-apps/erpnext/erpnext/controllers/buying_controller.py +245,Specified BOM {0} does not exist for Item {1},محدد BOM {0} غير موجود القطعة ل{1}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +202,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,{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 +197,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,{0} يجب أن يتم إلغاء جدول الصيانة قبل إلغاء هذا الأمر المبيعات
 apps/frappe/frappe/desk/page/backups/backups.html +13,Size,حجم
 DocType: Notification Control,Expense Claim Approved,المطالبة حساب المعتمدة
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +113,Pharmaceutical,الأدوية
+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,ترتيب المبيعات المطلوبة
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +30,Create Customer,خلق العملاء
@@ -1962,7 +1894,6 @@
 DocType: Quality Inspection Reading,Reading 9,قراءة 9
 DocType: Supplier,Is Frozen,غير المجمدة
 DocType: Buying Settings,Buying Settings,إعدادات الشراء
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +122,Mass finishing,التشطيب الشامل
 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),إعداد ملقم البريد الإلكتروني الوارد لل مبيعات الهوية. (على سبيل المثال sales@example.com )
@@ -1970,7 +1901,7 @@
 DocType: Payment Tool,Payment Account,حساب الدفع
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +713,Please specify Company to proceed,يرجى تحديد الشركة للمضي قدما
 apps/frappe/frappe/public/js/frappe/model/indicator.js +30,Draft,مسودة
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +46,Compensatory Off,التعويضية
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Compensatory Off,التعويضية
 DocType: Quality Inspection Reading,Accepted,مقبول
 DocType: User,Female,أنثى
 DocType: Journal Entry Account,Debit in Account Currency,الخصم في عملة الحساب
@@ -1982,7 +1913,7 @@
 DocType: Shipping Rule,Shipping Rule Label,الشحن تسمية القاعدة
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +209,Raw Materials cannot be blank.,المواد الخام لا يمكن أن يكون فارغا.
 DocType: Newsletter,Test,اختبار
-apps/erpnext/erpnext/stock/doctype/item/item.py +364,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +368,"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'",كما أن هناك معاملات الأوراق المالية الموجودة لهذا البند، \ لا يمكنك تغيير قيم &quot;ليس لديه المسلسل &#39;،&#39; لديه دفعة لا &#39;،&#39; هل البند الأسهم&quot; و &quot;أسلوب التقييم&quot;
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +448,Quick Journal Entry,خيارات مجلة الدخول
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +92,You can not change rate if BOM mentioned agianst any item,لا يمكنك تغيير معدل إذا ذكر BOM agianst أي بند
@@ -1993,13 +1924,14 @@
 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.,سيتم إنشاء منفصلة أمر الإنتاج لمادة جيدة لكل النهائي.
 DocType: Purchase Invoice,Terms and Conditions1,حيث وConditions1
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +18,Complete Setup,الإعداد الكامل
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard_page.html +18,Complete Setup,الإعداد الكامل
 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/config/crm.py +96,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 +57,Total Absent,إجمالي غائب
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +746,Item or Warehouse for row {0} does not match Material Request,البند أو مستودع لل صف {0} لا يطابق المواد طلب
@@ -2024,16 +1956,15 @@
 DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),أسعار الأساسي (كما في الأوراق المالية UOM)
 DocType: SMS Log,No of Requested SMS,لا للSMS مطلوب
 DocType: Campaign,Campaign-.####,حملة # # # #
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +55,Piercing,ثاقب
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,خطوات القادمة
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +117,Contract End Date must be greater than Date of Joining,يجب أن يكون تاريخ الانتهاء العقد أكبر من تاريخ الالتحاق بالعمل
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,موزع طرف ثالث / تاجر / عمولة الوكيل / التابعة / التجزئة الذي يبيع منتجات شركة من أجل عمولة.
 DocType: Customer Group,Has Child Node,وعقدة الطفل
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{0} against Purchase Order {1},{0} مقابل طلب شراء {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +332,{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/page/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
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +110,Photochemical machining,بالقطع الضوئي
 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.
 
 #### Note
@@ -2079,7 +2010,7 @@
 DocType: Purchase Receipt Item,Recd Quantity,Recd الكمية
 DocType: Email Account,Email Ids,البريد الإلكتروني معرفات
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},لا يمكن أن تنتج أكثر تفاصيل {0} من المبيعات كمية الطلب {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +471,Stock Entry {0} is not submitted,لم يقدم الاسهم الدخول {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +473,Stock Entry {0} is not submitted,لم يقدم الاسهم الدخول {0}
 DocType: Payment Reconciliation,Bank / Cash Account,البنك حساب / النقدية
 DocType: Tax Rule,Billing City,مدينة الفوترة
 DocType: Global Defaults,Hide Currency Symbol,إخفاء رمز العملة
@@ -2095,7 +2026,7 @@
 DocType: Purchase Invoice,Currency and Price List,العملة وقائمة الأسعار
 DocType: Opportunity,Customer / Lead Name,العميل / اسم الرصاص
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +63,Clearance Date not mentioned,إزالة التاريخ لم يرد ذكرها
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +71,Production,الإنتاج
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Production,الإنتاج
 DocType: Item,Allow Production Order,تسمح أمر الإنتاج
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +60,Row {0}:Start Date must be before End Date,الصف {0} : يجب أن يكون تاريخ بدء قبل تاريخ الانتهاء
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),إجمالي (الكمية)
@@ -2108,7 +2039,7 @@
 apps/erpnext/erpnext/utilities/doctype/address/address.py +113,My Addresses,بلدي العناوين
 DocType: Stock Ledger Entry,Outgoing Rate,أسعار المنتهية ولايته
 apps/erpnext/erpnext/config/hr.py +100,Organization branch master.,فرع المؤسسة الرئيسية .
-apps/erpnext/erpnext/controllers/accounts_controller.py +237, or ,أو
+apps/erpnext/erpnext/controllers/accounts_controller.py +238, 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 وفوق
@@ -2135,6 +2066,7 @@
 DocType: Stock Entry Detail,Serial No / Batch,المسلسل لا / دفعة
 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 +213,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',لم يتم إنشاء الجدول الصيانة ل كافة العناصر. الرجاء انقر على ' إنشاء الجدول '
 ,To Produce,لإنتاج
 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} يجب أيضا أن يدرج الصفوف
@@ -2142,10 +2074,7 @@
 DocType: Bin,Reserved Quantity,الكمية المحجوزة
 DocType: Landed Cost Voucher,Purchase Receipt Items,شراء قطع الإيصال
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,نماذج التخصيص
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +62,Cutting,قطع
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +69,Flattening,تسطيح
 DocType: Account,Income Account,دخل الحساب
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +22,Molding,صب
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +632,Delivery,تسليم
 DocType: Stock Reconciliation Item,Current Qty,الكمية الحالية
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",انظر &quot;نسبة المواد على أساس&quot; التكلفة في القسم
@@ -2155,20 +2084,19 @@
 apps/frappe/frappe/desk/moduleview.py +61,Documents,وثائق
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +17,Ref,المرجع
 DocType: Cost Center,Cost Center,مركز التكلفة
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.js +48,Voucher #,سند #
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +36,Voucher #,سند #
 DocType: Notification Control,Purchase Order Message,رسالة طلب شراء
 DocType: Tax Rule,Shipping Country,النقل البحري القطرية
 DocType: Upload Attendance,Upload HTML,تحميل HTML
-apps/erpnext/erpnext/controllers/accounts_controller.py +391,"Total advance ({0}) against Order {1} cannot be greater \
+apps/erpnext/erpnext/controllers/accounts_controller.py +392,"Total advance ({0}) against Order {1} cannot be greater \
 				than the Grand Total ({2})","إجمالي مقدما ({0}) ضد بالدفع {1} لا يمكن أن يكون أكبر \
  من المجموع الكلي ({2})"
 DocType: Employee,Relieving Date,تخفيف تاريخ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +12,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.",يتم تسعير المادة الكتابة قائمة الأسعار / تحديد نسبة الخصم، استنادا إلى بعض المعايير.
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,لا يمكن إلا أن تتغير مستودع عبر دخول سوق الأسهم / التوصيل ملاحظة / شراء الإيصال
 DocType: Employee Education,Class / Percentage,فئة / النسبة المئوية
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +92,Head of Marketing and Sales,رئيس التسويق والمبيعات
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +31,Income Tax,ضريبة الدخل
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +157,Laser engineered net shaping,الليزر هندسة صافي تشكيل
+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.,المسار يؤدي حسب نوع الصناعة .
 DocType: Item Supplier,Item Supplier,البند مزود
@@ -2191,31 +2119,28 @@
 DocType: Stock Ledger Entry,Actual Qty After Transaction,الكمية الفعلية بعد العملية
 ,Pending SO Items For Purchase Request,العناصر المعلقة وذلك لطلب الشراء
 DocType: Supplier,Billing Currency,الفواتير العملات
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +148,Extra Large,كبير جدا
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,Extra Large,كبير جدا
 ,Profit and Loss Statement,الأرباح والخسائر
 DocType: Bank Reconciliation Detail,Cheque Number,عدد الشيكات
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +43,Pressing,ملح
 DocType: Payment Tool Detail,Payment Tool Detail,دفع أداة التفاصيل
 ,Sales Browser,متصفح المبيعات
 DocType: Journal Entry,Total Credit,إجمالي الائتمان
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +474,Warning: Another {0} # {1} exists against stock entry {2},موجود آخر {0} # {1} ضد دخول الأسهم {2}: تحذير
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +459,Local,محلي
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +476,Warning: Another {0} # {1} exists against stock entry {2},موجود آخر {0} # {1} ضد دخول الأسهم {2}: تحذير
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +397,Local,محلي
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),القروض والسلفيات (الأصول )
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,المدينين
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +147,Large,كبير
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +23,No employee found!,أي موظف موجود!
+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 +152,Please mention no of visits required,يرجى ذكر أي من الزيارات المطلوبة
 DocType: Purchase Order,Customer Address Display,عنوان العميل العرض
 DocType: Stock Settings,Default Valuation Method,أسلوب التقييم الافتراضي
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +127,Polishing,تلميع
 DocType: Production Order Operation,Planned Start Time,المخططة بداية
 apps/erpnext/erpnext/config/accounts.py +63,Close Balance Sheet and book Profit or Loss.,وثيقة الميزانية العمومية و كتاب الربح أو الخسارة .
-apps/erpnext/erpnext/stock/doctype/item/item.py +661,"Default Unit of Measure for Item {0} cannot be changed directly because \
+apps/erpnext/erpnext/stock/doctype/item/item.py +665,"Default Unit of Measure for Item {0} cannot be changed directly because \
 			you have already made some transaction(s) with another UOM. To change default UOM, \
 			use 'UOM Replace Utility' tool under Stock module.",وحدة القياس الافتراضية للالبند {0} لا يمكن أن تتغير بشكل مباشر بسبب \ كنت قد قدمت بالفعل بعض المعاملات (s) مع UOM آخر. لتغيير UOM الافتراضي، \ استخدام &quot;UOM استبدال أداة&quot; أداة تحت وحدة المالية.
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,تحديد سعر الصرف لتحويل عملة إلى أخرى
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +146,Quotation {0} is cancelled,اقتباس {0} تم إلغاء
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +141,Quotation {0} is cancelled,اقتباس {0} تم إلغاء
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,إجمالي المبلغ المستحق
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} was on leave on {1}. Cannot mark attendance.,{0} كان الموظف في إجازة في {1} . لا يمكن ان يمثل الحضور.
 DocType: Sales Partner,Targets,أهداف
@@ -2226,7 +2151,6 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +158,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,أجهزة الكمبيوتر
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +112,Electro-chemical grinding,الكهربائية والكيميائية طحن
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +14,This is a root customer group and cannot be edited.,هذه هي مجموعة العملاء الجذرية والتي لا يمكن تحريرها.
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +39,Please setup your chart of accounts before you start Accounting Entries,إرضاء الإعداد مخططك من الحسابات قبل البدء مقالات المحاسبة
 DocType: Purchase Invoice,Ignore Pricing Rule,تجاهل التسعير القاعدة
@@ -2284,7 +2208,6 @@
 DocType: Maintenance Visit,Purposes,أغراض
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +103,Atleast one item should be entered with negative quantity in return document,يجب إدخال أتلست عنصر واحد مع كمية السلبية في الوثيقة عودة
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +67,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations",عملية {0} أطول من أي ساعات العمل المتاحة في محطة {1}، وتحطيم العملية في عمليات متعددة
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +134,Electrochemical machining,الآلات الكهروكيميائية
 ,Requested,طلب
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +66,No Remarks,لا ملاحظات
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +13,Overdue,متأخر
@@ -2293,7 +2216,7 @@
 DocType: Monthly Distribution,Distribution Name,توزيع الاسم
 DocType: Features Setup,Sales and Purchase,المبيعات والمشتريات
 DocType: Supplier Quotation Item,Material Request No,طلب مواد لا
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +218,Quality Inspection required for Item {0},التفتيش الجودة المطلوبة القطعة ل {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +221,Quality Inspection required for Item {0},التفتيش الجودة المطلوبة القطعة ل {0}
 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),صافي معدل (شركة العملات)
@@ -2311,9 +2234,8 @@
 apps/erpnext/erpnext/accounts/report/financial_statements.py +16,Fiscal Year {0} not found.,لم يتم العثور السنة المالية {0}.
 DocType: Bank Reconciliation,Get Relevant Entries,الحصول على مقالات ذات صلة
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +407,Accounting Entry for Stock,الدخول المحاسبة للسهم
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +64,Coining,السك
 DocType: Sales Invoice,Sales Team1,مبيعات Team1
-apps/erpnext/erpnext/stock/doctype/item/item.py +412,Item {0} does not exist,البند {0} غير موجود
+apps/erpnext/erpnext/stock/doctype/item/item.py +416,Item {0} does not exist,البند {0} غير موجود
 DocType: Sales Invoice,Customer Address,العنوان العملاء
 apps/frappe/frappe/desk/query_report.py +136,Total,مجموع
 DocType: Purchase Invoice,Apply Additional Discount On,تطبيق خصم إضافي على
@@ -2325,14 +2247,13 @@
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),مبلغ الضريبة بعد خصم مبلغ (شركة العملات)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +149,Target warehouse is mandatory for row {0},مستودع الهدف هو إلزامية ل صف {0}
 DocType: Quality Inspection,Quality Inspection,فحص الجودة
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +144,Extra Small,اضافية الصغيرة
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +20,Spray forming,رش تشكيل
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Extra Small,اضافية الصغيرة
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +458,Warning: Material Requested Qty is less than Minimum Order Qty,تحذير : المواد المطلوبة الكمية هي أقل من الحد الأدنى للطلب الكمية
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +191,Account {0} is frozen,حساب {0} مجمد
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,كيان قانوني / الفرعية مع مخطط مستقل للحسابات تابعة للمنظمة.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +29,"Food, Beverage & Tobacco",الغذاء و المشروبات و التبغ
+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 +529,Can only make payment against unbilled {0},ان تجعل دفع فواتير فقط ضد {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +531,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/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Minimum Inventory Level,الحد الأدنى مستوى المخزون
 DocType: Stock Entry,Subcontract,قام بمقاولة فرعية
@@ -2343,19 +2264,18 @@
 DocType: Item,Manufacturer Part Number,الصانع الجزء رقم
 DocType: Production Order Operation,Estimated Time and Cost,الوقت المقدر والتكلفة
 DocType: Bin,Bin,بن
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +50,Nosing,الإشتمام
 DocType: SMS Log,No of Sent SMS,لا للSMS المرسلة
 DocType: Account,Company,شركة
 DocType: Account,Expense Account,حساب حساب
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +49,Software,البرمجيات
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +151,Colour,اللون
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +49,Software,البرمجيات
+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",يرجى تحديد عنصر، حيث قال &quot;هل البند الأسهم&quot; هو &quot;لا&quot; و &quot;هل المبيعات البند&quot; هو &quot;نعم&quot; وليس هناك حزمة المنتجات الأخرى
 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 +281,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 +134,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 +145,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,إعادة تسمية الدخول
@@ -2365,7 +2285,7 @@
 apps/erpnext/erpnext/controllers/recurring_document.py +162,Please select {0},الرجاء اختيار {0}
 DocType: C-Form,C-Form No,رقم النموذج - س 
 DocType: BOM,Exploded_items,Exploded_items
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +95,Researcher,الباحث
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Researcher,الباحث
 apps/frappe/frappe/custom/doctype/customize_form/customize_form.js +88,Update,تحديث
 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 +23,Name or Email is mandatory,الاسم أو البريد الإلكتروني إلزامي
@@ -2374,11 +2294,10 @@
 DocType: Employee,Exit,خروج
 apps/erpnext/erpnext/accounts/doctype/account/account.py +134,Root Type is mandatory,نوع الجذر إلزامي
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +295,Serial No {0} created,المسلسل لا {0} خلق
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +125,Vibratory finishing,التشطيب اهتزازي
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes",لراحة العملاء، ويمكن استخدام هذه الرموز في أشكال الطباعة مثل الفواتير والسندات التسليم
 DocType: Employee,You can enter any date manually,يمكنك إدخال أي تاريخ يدويا
 DocType: Sales Invoice,Advertisement,إعلان
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +165,Probationary Period,فترة الاختبار
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Probationary Period,فترة الاختبار
 DocType: Customer Group,Only leaf nodes are allowed in transaction,ويسمح العقد ورقة فقط في المعاملة
 DocType: Expense Claim,Expense Approver,حساب الموافق
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,شراء السلعة استلام الموردة
@@ -2386,19 +2305,16 @@
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +17,To Datetime,إلى التاريخ والوقت
 DocType: SMS Settings,SMS Gateway URL,SMS بوابة URL
 apps/erpnext/erpnext/config/crm.py +53,Logs for maintaining sms delivery status,سجلات للحفاظ على حالة تسليم الرسائل القصيرة
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +137,Grinding,طحن
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +34,Shrink wrapping,يتقلص التفاف
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +36,Pending Activities,الأنشطة المعلقة
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,Confirmed,مؤكد
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier > Supplier Type,المورد> نوع مورد
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +127,Please enter relieving date.,من فضلك ادخل تاريخ التخفيف .
 apps/erpnext/erpnext/controllers/trends.py +137,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/hr/doctype/leave_application/leave_application.py +51,Only Leave Applications with status 'Approved' can be submitted,اترك فقط مع وضع تطبيقات ' وافق ' يمكن تقديم
 apps/erpnext/erpnext/utilities/doctype/address/address.py +21,Address Title is mandatory.,عنوان عنوانها إلزامية.
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,أدخل اسم الحملة إذا كان مصدر من التحقيق هو حملة
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +38,Newspaper Publishers,صحيفة الناشرين
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +38,Newspaper Publishers,صحيفة الناشرين
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,تحديد السنة المالية
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +88,Smelting,صهر
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,إعادة ترتيب مستوى
 DocType: Attendance,Attendance Date,تاريخ الحضور
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,تفكك الراتب على أساس الكسب وخصم.
@@ -2413,16 +2329,15 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +414,[Error],[خطأ]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,وبعبارة تكون مرئية بمجرد حفظ ترتيب المبيعات.
 ,Employee Birthday,عيد ميلاد موظف
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +55,Venture Capital,فينشر كابيتال
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,فينشر كابيتال
 DocType: UOM,Must be Whole Number,يجب أن يكون عدد صحيح
 DocType: Leave Control Panel,New Leaves Allocated (In Days),أوراق الجديدة المخصصة (بالأيام)
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +51,Serial No {0} does not exist,المسلسل لا {0} غير موجود
 DocType: Pricing Rule,Discount Percentage,نسبة الخصم
 DocType: Payment Reconciliation Invoice,Invoice Number,رقم الفاتورة
-apps/erpnext/erpnext/hooks.py +70,Orders,أوامر
+apps/erpnext/erpnext/hooks.py +54,Orders,أوامر
 DocType: Leave Control Panel,Employee Type,نوع الموظف
 DocType: Employee Leave Approver,Leave Approver,ترك الموافق
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +70,Swaging,تطريق
 DocType: Manufacturing Settings,Material Transferred for Manufacture,المواد المنقولة لغرض صناعة
 DocType: Expense Claim,"A user with ""Expense Approver"" role","يمكن للمستخدم مع ""النفقات الموافق"" دور"
 ,Issued Items Against Production Order,الأصناف التي صدرت بحق أمر الإنتاج
@@ -2434,7 +2349,6 @@
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +62,Cost Center with existing transactions can not be converted to group,مركز التكلفة مع المعاملات القائمة لا يمكن تحويلها إلى مجموعة
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Depreciation,خفض
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),المورد (ق)
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +29,Invalid period,فترة غير صالحة
 DocType: Customer,Credit Limit,الحد الائتماني
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,حدد النوع من المعاملات
 DocType: GL Entry,Voucher No,رقم السند
@@ -2444,9 +2358,9 @@
 DocType: Customer,Address and Contact,عنوان والاتصال
 DocType: Customer,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}
 apps/erpnext/erpnext/accounts/party.py +284,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),ملاحظة: نظرا / المرجعي تاريخ يتجاوز المسموح أيام الائتمان العملاء التي كتبها {0} يوم (s)
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +621,Maint. Schedule,صيانة جدول
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +108,Abrasive jet machining,جلخ الآلات النفاثة
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +632,Maint. Schedule,صيانة جدول
 DocType: Stock Settings,Freeze Stock Entries,تجميد مقالات المالية
 DocType: Website Settings,Website Settings,إعدادات الموقع
 DocType: Item,Reorder level based on Warehouse,مستوى إعادة الطلب بناء على مستودع
@@ -2463,7 +2377,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +75,Show Stock Entries,مشاهدة سهم مقالات
 ,Is Primary Address,هو العنوان الرئيسي
 DocType: Production Order,Work-in-Progress Warehouse,مستودع العمل قيد التنفيذ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +308,Reference #{0} dated {1},إشارة # {0} بتاريخ {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Reference #{0} dated {1},إشارة # {0} بتاريخ {1}
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +13,Manage Addresses,إدارة العناوين
 DocType: Pricing Rule,Item Code,البند الرمز
 DocType: Production Planning Tool,Create Production Orders,إنشاء أوامر الإنتاج
@@ -2472,7 +2386,7 @@
 DocType: Lead,Market Segment,سوق القطاع
 DocType: Communication,Phone,هاتف
 DocType: Employee Internal Work History,Employee Internal Work History,التاريخ الموظف العمل الداخلية
-apps/erpnext/erpnext/public/js/account_tree_grid.js +50,Closing (Dr),إغلاق (الدكتور)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +221,Closing (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.,قالب الضريبية لبيع صفقة.
@@ -2488,8 +2402,8 @@
 ,Billed Amount,مبلغ الفاتورة
 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 +129,Material Request {0} is cancelled or stopped,طلب المواد {0} تم إلغاء أو توقف
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +641,Add a few sample records,إضافة بعض السجلات عينة
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +133,Material Request {0} is cancelled or stopped,طلب المواد {0} تم إلغاء أو توقف
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Add a few sample records,إضافة بعض السجلات عينة
 apps/erpnext/erpnext/config/hr.py +210,Leave Management,ترك الإدارة
 DocType: Event,Groups,مجموعات
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,مجموعة بواسطة حساب
@@ -2502,38 +2416,34 @@
 DocType: Features Setup,Sales Extras,مبيعات إضافات
 apps/erpnext/erpnext/accounts/utils.py +344,{0} budget for Account {1} against Cost Center {2} will exceed by {3},{0} ميزانية الحساب {1} مقابل مركز التكلفة {2} سيتجاوز التي كتبها {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +236,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry",يجب أن يكون حساب الفرق حساب نوع الأصول / الخصوم، لأن هذا المخزون المصالحة هو الدخول افتتاح
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +138,Purchase Order number required for Item {0},عدد طلب شراء مطلوب القطعة ل {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Order number required for Item {0},عدد طلب شراء مطلوب القطعة ل {0}
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',"""من تاريخ "" يجب أن يكون بعد "" إلى تاريخ """
 ,Stock Projected Qty,الأسهم المتوقعة الكمية
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +147,Customer {0} does not belong to project {1},العملاء {0} لا تنتمي لمشروع {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +150,Customer {0} does not belong to project {1},العملاء {0} لا تنتمي لمشروع {1}
 DocType: Sales Order,Customer's Purchase Order,طلب شراء الزبون
 DocType: Warranty Claim,From Company,من شركة
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,القيمة أو الكمية
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Minute,دقيقة
+apps/erpnext/erpnext/public/js/setup_wizard.js +363,Minute,دقيقة
 DocType: Purchase Invoice,Purchase Taxes and Charges,الضرائب والرسوم الشراء
 ,Qty to Receive,الكمية للاستلام
 DocType: Leave Block List,Leave Block List Allowed,ترك قائمة الحظر مسموح
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +61,Conversion factor cannot be in fractions,معامل التحويل لا يمكن أن يكون في الكسور
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +358,You will use it to Login,ستستخدم هذا لتسجيل الدخول
+apps/erpnext/erpnext/public/js/setup_wizard.js +108,You will use it to Login,ستستخدم هذا لتسجيل الدخول
 DocType: Sales Partner,Retailer,متاجر التجزئة
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +99,Credit To account must be a Balance Sheet account,يجب أن يكون الائتمان لحساب حساب الميزانية العمومية
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,جميع أنواع مزود
 apps/erpnext/erpnext/stock/doctype/item/item.py +37,Item Code is mandatory because Item is not automatically numbered,كود البند إلزامي لأن السلعة بسهولة و غير مرقمة تلقائيا
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +99,Quotation {0} not of type {1},اقتباس {0} ليست من نوع {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +93,Quotation {0} not of type {1},اقتباس {0} ليست من نوع {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,صيانة جدول السلعة
 DocType: Sales Order,%  Delivered,تم إيصاله٪
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,Bank Overdraft Account,حساب السحب على المكشوف المصرفي
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +15,Make Salary Slip,جعل زلة الراتب
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +18,Browse BOM,تصفح BOM
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +175,Secured Loans,القروض المضمونة
-apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +3,Awesome Products,المنتجات رهيبة
+apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +3,Awesome Products,المنتجات رهيبة
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +189,Opening Balance Equity,افتتاح ميزان العدالة
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +80,Cannot approve leave as you are not authorized to approve leaves on Block Dates,لا يمكن الموافقة على الإجازة كما لا يحق لك الموافقة على أوراق تواريخ كتلة
 DocType: Appraisal,Appraisal,تقييم
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +13,Lost-foam casting,صب فقدت رغوة
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +47,Drawing,رسم
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +22,Date is repeated,ويتكرر التاريخ
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +148,Leave approver must be one of {0},يجب أن تكون واحدة من ترك الموافق {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +162,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,بداية
@@ -2547,7 +2457,7 @@
 DocType: Purchase Invoice Item,Net Amount (Company Currency),صافي المبلغ (شركة العملات)
 DocType: BOM Operation,Hour Rate,ساعة قيم
 DocType: Stock Settings,Item Naming By,البند تسمية بواسطة
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +642,From Quotation,من اقتباس
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +655,From Quotation,من اقتباس
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},دخول أخرى الفترة الإنتهاء {0} أحرز بعد {1}
 DocType: Production Order,Material Transferred for Manufacturing,المواد المنقولة لغرض التصنيع
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +29,Account {0} does not exists,حساب {0} لا يوجد
@@ -2561,21 +2471,19 @@
 DocType: Purchase Invoice Item,PR Detail,PR التفاصيل
 DocType: Sales Order,Fully Billed,وصفت تماما
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +20,Cash In Hand,نقد في الصندوق
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +72,Delivery warehouse required for stock item {0},مستودع تسليم المطلوب للبند الأوراق المالية {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +119,Delivery warehouse required for stock item {0},مستودع تسليم المطلوب للبند الأوراق المالية {0}
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),الوزن الكلي للحزمة. الوزن الصافي عادة + تغليف المواد الوزن. (للطباعة)
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,يسمح للمستخدمين مع هذا الدور لضبط الحسابات المجمدة و إنشاء / تعديل القيود المحاسبية على حسابات مجمدة
 DocType: Serial No,Is Cancelled,وألغي
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +281,My Shipments,بلدي الشحنات
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +286,My Shipments,بلدي الشحنات
 DocType: Journal Entry,Bill Date,تاريخ الفاتورة
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +43,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:",حتى لو كانت هناك قوانين التسعير متعددة مع الأولوية القصوى، يتم تطبيق الأولويات الداخلية ثم التالية:
 DocType: Supplier,Supplier Details,تفاصيل المورد
 DocType: Communication,Recipients,المستلمين
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +146,Screwing,الشد
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +96,Knurling,التخريش
 DocType: Expense Claim,Approval Status,حالة القبول
 DocType: Hub Settings,Publish Items to Hub,نشر عناصر إلى المحور
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +44,From value must be less than to value in row {0},من القيمة يجب أن يكون أقل من القيمة ل في الصف {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +133,Wire Transfer,حوالة مصرفية
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +133,Wire Transfer,حوالة مصرفية
 apps/erpnext/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py +25,Please select Bank Account,الرجاء اختيار حساب البنك
 DocType: Newsletter,Create and Send Newsletters,إنشاء وإرسال النشرات الإخبارية
 apps/frappe/frappe/public/js/frappe/views/reports/grid_report.js +305,From Date must be before To Date,يجب أن تكون من تاريخ إلى تاريخ قبل
@@ -2583,14 +2491,14 @@
 DocType: Company,Default Income Account,الافتراضي الدخل حساب
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,المجموعة العملاء / الزبائن
 DocType: Item Group,Check this if you want to show in website,التحقق من ذلك إذا كنت تريد أن تظهر في الموقع
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +190,Welcome to ERPNext,مرحبا بكم في ERPNext
+,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/page/setup_wizard/install_fixtures.py +37,Calls,المكالمات
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Calls,المكالمات
 DocType: Project,Total Costing Amount (via Time Logs),المبلغ الكلي التكاليف (عبر الزمن سجلات)
 DocType: Purchase Order Item Supplied,Stock UOM,الأسهم UOM
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Purchase Order {0} is not submitted,طلب شراء {0} لم تقدم
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +194,Purchase Order {0} is not submitted,طلب شراء {0} لم تقدم
 ,Projected,المتوقع
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},المسلسل لا {0} لا ينتمي إلى مستودع {1}
 apps/erpnext/erpnext/controllers/status_updater.py +136,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,ملاحظة : سوف النظام لا تحقق الإفراط التسليم و الإفراط في حجز القطعة ل {0} حيث الكمية أو المبلغ 0
@@ -2598,7 +2506,6 @@
 DocType: Issue,Opening Date,تاريخ الفتح
 DocType: Journal Entry,Remark,كلام
 DocType: Purchase Receipt Item,Rate and Amount,معدل والمبلغ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +95,Boring,ممل
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +667,From Sales Order,من طلب مبيعات
 DocType: Blog Category,Parent Website Route,الوالد موقع الطريق
 DocType: Sales Order,Not Billed,لا صفت
@@ -2612,19 +2519,17 @@
 apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount Amount,خصم المبلغ
 DocType: Purchase Invoice,Return Against Purchase Invoice,العودة ضد شراء فاتورة
 DocType: Item,Warranty Period (in days),فترة الضمان (بالأيام)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +550,e.g. VAT,على سبيل المثال ضريبة
+apps/erpnext/erpnext/public/js/setup_wizard.js +292,e.g. VAT,على سبيل المثال ضريبة
 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,اقتباس السلسلة
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +52,"An item exists with same name ({0}), please change the item group name or rename the item",يوجد صنف بنفس الإسم ( {0} ) ، الرجاء تغيير اسم مجموعة الصنف أو إعادة تسمية هذا الصنف
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +82,Hot metal gas forming,الغاز المعدن الساخن تشكيل
 DocType: Sales Order Item,Sales Order Date,مبيعات الترتيب التاريخ
 DocType: Sales Invoice Item,Delivered Qty,تسليم الكمية
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +63,Warehouse {0}: Company is mandatory,مستودع {0}: شركة إلزامي
 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.",انتقل إلى المجموعة المناسبة (عادة مصدر الأموال&gt; المطلوبات المتداولة&gt; الضرائب والرسوم وإنشاء حساب جديد (بالنقر على إضافة الطفل) من نوع &quot;الضريبة&quot; والقيام نذكر معدل الضريبة.
 ,Payment Period Based On Invoice Date,طريقة الدفع بناء على تاريخ الفاتورة
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +50,Missing Currency Exchange Rates for {0},في عداد المفقودين أسعار صرف العملات ل{0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +135,Laser cutting,القطع بالليزر
 DocType: Event,Monday,يوم الاثنين
 DocType: Journal Entry,Stock Entry,الأسهم الدخول
 DocType: Account,Payable,المستحقة
@@ -2657,7 +2562,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +111,Date Of Retirement must be greater than Date of Joining,تاريخ التقاعد يجب أن يكون أكبر من تاريخ الالتحاق بالعمل
 DocType: Sales Invoice,Against Income Account,ضد حساب الدخل
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +69,{0}% Delivered,{0} سلمت٪
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +78,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,البند {0} الكمية المطلوبة {1} لا يمكن أن يكون أقل من الحد الأدنى من الكمية ترتيب {2} (المحددة في البند).
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,البند {0} الكمية المطلوبة {1} لا يمكن أن يكون أقل من الحد الأدنى من الكمية ترتيب {2} (المحددة في البند).
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,الشهرية توزيع النسبة المئوية
 DocType: Territory,Territory Targets,الأراضي الأهداف
 DocType: Delivery Note,Transporter Info,نقل معلومات
@@ -2666,7 +2571,6 @@
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,عناوين لقوالب الطباعة على سبيل المثال فاتورة أولية.
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +140,Valuation type charges can not marked as Inclusive,اتهامات نوع التقييم لا يمكن وضع علامة الشاملة
 DocType: POS Profile,Update Stock,تحديث الأسهم
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +128,Superfinishing,Superfinishing
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,سوف UOM مختلفة لعناصر تؤدي إلى غير صحيحة ( مجموع ) صافي قيمة الوزن . تأكد من أن الوزن الصافي من كل عنصر في نفس UOM .
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM أسعار
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +85,Please pull items from Delivery Note,يرجى سحب العناصر من التسليم ملاحظة
@@ -2681,7 +2585,6 @@
 ,Purchase Analytics,شراء تحليلات
 DocType: Sales Invoice Item,Delivery Note Item,ملاحظة تسليم السلعة
 DocType: Expense Claim,Task,مهمة
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +57,Shaving,حلق
 DocType: Purchase Taxes and Charges,Reference Row #,مرجع صف #
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},رقم الباتش إلزامي للصنف{0}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js +14,This is a root sales person and cannot be edited.,هذا هو الشخص المبيعات الجذرية والتي لا يمكن تحريرها.
@@ -2693,13 +2596,11 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +74,Purpose must be one of {0},يجب أن يكون هدف واحد من {0}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +108,Fill the form and save it,تعبئة النموذج وحفظه
 DocType: Production Planning Tool,Download a report containing all raw materials with their latest inventory status,تحميل تقريرا يتضمن جميع المواد الخام مع وضعهم أحدث المخزون
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +94,Facing,مواجهة
 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,إرسال SMS
 DocType: Company,Default Letter Head,افتراضي رسالة رئيس
 DocType: Time Log,Billable,فوترة
-DocType: Authorization Rule,This will be used for setting rule in HR module,وسوف تستخدم هذه القاعدة لإعداد وحدة في HR
 DocType: Account,Rate at which this tax is applied,المعدل الذي يتم تطبيق هذه الضريبة
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reorder Qty,إعادة ترتيب الكميه
 DocType: Company,Stock Adjustment Account,حساب تسوية الأوراق المالية
@@ -2726,16 +2627,15 @@
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,يجب أن تكون نسبة تخصيص تساوي 100 ٪
 DocType: Serial No,Out of AMC,من AMC
 DocType: Purchase Order Item,Material Request Detail No,تفاصيل طلب المواد لا
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +97,Hard turning,تحول الصعب
 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 +79,Company (not Customer or Supplier) master.,شركة (وليس العميل أو المورد) الرئيسي.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +106,Please enter 'Expected Delivery Date',"يرجى إدخال "" التاريخ المتوقع تسليم '"
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +187,Delivery Notes {0} must be cancelled before cancelling this Sales Order,تسليم ملاحظات {0} يجب أن يتم إلغاء هذا الأمر قبل إلغاء المبيعات
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +100,Please enter 'Expected Delivery Date',"يرجى إدخال "" التاريخ المتوقع تسليم '"
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +182,Delivery Notes {0} must be cancelled before cancelling this Sales Order,تسليم ملاحظات {0} يجب أن يتم إلغاء هذا الأمر قبل إلغاء المبيعات
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +373,Paid amount + Write Off Amount can not be greater than Grand Total,المبلغ المدفوع + شطب المبلغ لا يمكن أن يكون أكبر من المجموع الكلي
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} ليس رقم الدفعة صالحة للصنف {1}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,Note: There is not enough leave balance for Leave Type {0},ملاحظة : ليس هناك ما يكفي من التوازن إجازة ل إجازة نوع {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +124,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,الفرصة نوع
@@ -2747,7 +2647,7 @@
 DocType: Hub Settings,Publish Availability,نشر توافر
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +105,Date of Birth cannot be greater than today.,تاريخ الميلاد لا يمكن أن يكون أكبر مما هو عليه اليوم.
 ,Stock Ageing,الأسهم شيخوخة
-apps/erpnext/erpnext/controllers/accounts_controller.py +200,{0} '{1}' is disabled,{0} '{1}' معطل
+apps/erpnext/erpnext/controllers/accounts_controller.py +201,{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.,إرسال رسائل البريد الإلكتروني التلقائي لاتصالات على المعاملات تقديم.
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +232,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
@@ -2757,44 +2657,38 @@
 DocType: Purchase Order,Customer Contact Email,العملاء الاتصال البريد الإلكتروني
 DocType: Event,Sunday,الأحد
 DocType: Sales Team,Contribution (%),مساهمة (٪)
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +455,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,"ملاحظة : لن يتم إنشاء الدفع منذ دخول ' النقد أو البنك الحساب "" لم يتم تحديد"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +171,Responsibilities,المسؤوليات
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +457,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 +11,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,الرجاء إدخال الاقل فاتورة 1 في الجدول
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +511,Add Users,إضافة مستخدمين
+apps/erpnext/erpnext/public/js/setup_wizard.js +255,Add Users,إضافة مستخدمين
 DocType: Pricing Rule,Item Group,البند المجموعة
 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),الضرائب والرسوم المضافة (عملة الشركة)
-apps/erpnext/erpnext/stock/doctype/item/item.py +340,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,البند ضريبة صف {0} يجب أن يكون في الاعتبار نوع ضريبة الدخل أو المصاريف أو إتهام أو
+apps/erpnext/erpnext/stock/doctype/item/item.py +344,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,البند ضريبة صف {0} يجب أن يكون في الاعتبار نوع ضريبة الدخل أو المصاريف أو إتهام أو
 DocType: Sales Order,Partly Billed,وصفت جزئيا
 DocType: Item,Default BOM,الافتراضي BOM
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +79,Decambering,Decambering
 apps/erpnext/erpnext/setup/doctype/company/company.js +22,Please re-type company name to confirm,الرجاء إعادة الكتابة اسم الشركة لتأكيد
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,إجمالي المعلقة آمت
 DocType: Time Log Batch,Total Hours,مجموع ساعات
 DocType: Journal Entry,Printing Settings,إعدادات الطباعة
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +268,Total Debit must be equal to Total Credit. The difference is {0},يجب أن يكون إجمالي الخصم يساوي إجمالي الائتمان .
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +11,Automotive,السيارات
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +37,Item is required,مطلوب البند
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +25,Metal injection molding,المعادن حقن صب
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +258,Total Debit must be equal to Total Credit. The difference is {0},يجب أن يكون إجمالي الخصم يساوي إجمالي الائتمان .
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,السيارات
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +684,From Delivery Note,من التسليم ملاحظة
 DocType: Time Log,From Time,من وقت
 DocType: Notification Control,Custom Message,رسالة مخصصة
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +33,Investment Banking,الخدمات المصرفية الاستثمارية
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +261,"Select your Country, Time Zone and Currency",اختر بلدك، المنطقة الزمنية والعملات
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,الخدمات المصرفية الاستثمارية
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +316,"Select your Country, Time Zone and Currency",اختر بلدك، المنطقة الزمنية والعملات
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +369,Cash or Bank Account is mandatory for making payment entry,نقدا أو الحساب المصرفي إلزامي لجعل الدخول الدفع
 DocType: Purchase Invoice,Price List Exchange Rate,معدل سعر صرف قائمة
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +91,Pickling,تخليل
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +18,Sand casting,صب الرمل
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +117,Electroplating,طلاء بالكهرباء
 DocType: Purchase Invoice Item,Rate,معدل
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +62,Intern,المتدرب
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Intern,المتدرب
 DocType: Newsletter,A Lead with this email id should exist,وينبغي أن يكون هذا المعرف الرصاص مع البريد الإلكتروني موجود
 DocType: Stock Entry,From BOM,من BOM
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +34,Basic,الأساسية
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +34,Basic,الأساسية
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,يتم تجميد المعاملات الاسهم قبل {0}
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +217,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,إلى التسجيل يجب أن يكون نفس التاريخ من ل إجازة نصف يوم
@@ -2802,11 +2696,11 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +96,Reference No is mandatory if you entered Reference Date,المرجعية لا إلزامي إذا كنت دخلت التاريخ المرجعي
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +108,Date of Joining must be greater than Date of Birth,يجب أن يكون تاريخ الالتحاق بالعمل أكبر من تاريخ الميلاد
 DocType: Salary Structure,Salary Structure,هيكل المرتبات
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +242,"Multiple Price Rule exists with same criteria, please resolve \
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +246,"Multiple Price Rule exists with same criteria, please resolve \
 			conflict by assigning priority. Price Rules: {0}","توجد عدة الأسعار القاعدة مع المعايير نفسها، يرجى حل \
  الصراع عن طريق تعيين الأولوية. قواعد السعر: {0}"
 DocType: Account,Bank,مصرف
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +9,Airline,شركة الطيران
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,شركة الطيران
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +493,Issue Material,قضية المواد
 DocType: Material Request Item,For Warehouse,لمستودع
 DocType: Employee,Offer Date,عرض التسجيل
@@ -2816,29 +2710,24 @@
 DocType: Item,Is Fixed Asset Item,هي الأصول الثابتة الإغلاق
 DocType: Stock Entry,Including items for sub assemblies,بما في ذلك البنود عن المجالس الفرعية
 DocType: Features Setup,"If you have long print formats, this feature can be used to split the page to be printed on multiple pages with all headers and footers on each page",إذا كان لديك طباعة الأشكال طويلة، يمكن استخدام هذه الميزة لتقسيم ليتم طباعة الصفحة على صفحات متعددة مع جميع الرؤوس والتذييلات على كل صفحة
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +131,Hobbing,Hobbing
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +98,All Territories,جميع الأقاليم
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +98,All Territories,جميع الأقاليم
 DocType: Purchase Invoice,Items,البنود
 DocType: Fiscal Year,Year Name,اسم العام
 DocType: Process Payroll,Process Payroll,عملية كشوف المرتبات
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +59,There are more holidays than working days this month.,هناك أكثر من العطلات أيام عمل من هذا الشهر.
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +68,There are more holidays than working days this month.,هناك أكثر من العطلات أيام عمل من هذا الشهر.
 DocType: Product Bundle Item,Product Bundle Item,المنتج حزمة البند
 DocType: Sales Partner,Sales Partner Name,مبيعات الشريك الاسم
 DocType: Purchase Invoice Item,Image View,عرض الصورة
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +113,Finishing & industrial finishing,تشطيب وتشطيب الصناعي
 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/page/setup_wizard/fixtures/industry_type.py +46,Securities & Commodity Exchanges,الأوراق المالية و البورصات السلعية
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,الأوراق المالية و البورصات السلعية
 DocType: Shipping Rule,Calculate Based On,إحسب الربح بناء على
 DocType: Delivery Note Item,From Warehouse,من مستودع
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +98,Drilling,حفر
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +28,Blow molding,ضربة صب
 DocType: Purchase Taxes and Charges,Valuation and Total,التقييم وتوتال
 DocType: Tax Rule,Shipping City,الشحن سيتي
 apps/erpnext/erpnext/stock/doctype/item/item.js +43,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,"هذا البند هو البديل من {0} (قالب). سيتم نسخ سمات على من القالب ما لم يتم تعيين ""لا نسخ '"
 DocType: Account,Purchase User,شراء العضو
 DocType: Notification Control,Customize the Notification,تخصيص إعلام
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +87,Hammering,يدق
 DocType: Web Page,Slideshow,عرض الشرائح
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +24,Default Address Template cannot be deleted,لا يمكن حذف القالب الافتراضي العنوان
 DocType: Sales Invoice,Shipping Rule,الشحن القاعدة
@@ -2847,9 +2736,8 @@
 DocType: Workflow State,Search,البحث
 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/setup/page/setup_wizard/fixtures/operations.py +142,Brazing,مختلط
 DocType: C-Form,Amended From,عدل من
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Raw Material,المواد الخام
+apps/erpnext/erpnext/public/js/setup_wizard.js +359,Raw Material,المواد الخام
 DocType: Leave Application,Follow via Email,متابعة عبر البريد الإلكتروني
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,المبلغ الضريبي بعد الخصم المبلغ
 apps/erpnext/erpnext/accounts/doctype/account/account.py +174,Child account exists for this account. You can not delete this account.,موجود حساب الطفل لهذا الحساب . لا يمكنك حذف هذا الحساب.
@@ -2863,10 +2751,10 @@
 ,Produced,أنتجت
 DocType: Item,Item Code for Suppliers,البند رمز للموردين
 DocType: Issue,Raised By (Email),التي أثارها (بريد إلكتروني)
-apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +72,General,عام
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +495,Attach Letterhead,نعلق رأسية
+apps/erpnext/erpnext/setup/setup_wizard/default_website.py +72,General,عام
+apps/erpnext/erpnext/public/js/setup_wizard.js +241,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/setup/page/setup_wizard/setup_wizard.js +542,"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/public/js/setup_wizard.js +284,"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}
 DocType: Journal Entry,Bank Entry,دخول الضفة
 DocType: Authorization Rule,Applicable To (Designation),تنطبق على (تعيين)
@@ -2875,33 +2763,32 @@
 apps/erpnext/erpnext/config/accounts.py +143,Enable / disable currencies.,تمكين / تعطيل العملات .
 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),إجمالي (آمت)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +26,Entertainment & Leisure,الترفيه وترفيهية
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,الترفيه وترفيهية
 DocType: Purchase Order,The date on which recurring order will be stop,التاريخ الذي سيتم تتوقف أجل متكرر
 DocType: Quality Inspection,Item Serial No,البند رقم المسلسل
 apps/erpnext/erpnext/controllers/status_updater.py +142,{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 +57,Total Present,إجمالي الحاضر
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Hour,ساعة
+apps/erpnext/erpnext/public/js/setup_wizard.js +363,Hour,ساعة
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +138,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation","متسلسلة البند {0} لا يمكن تحديث \
  باستخدام الأسهم المصالحة"
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +488,Transfer Material to Supplier,نقل المواد إلى المورد
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +513,Transfer Material to Supplier,نقل المواد إلى المورد
 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/crm/doctype/opportunity/opportunity.js +82,Create Quotation,إنشاء اقتباس
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +306,All these items have already been invoiced,لقد تم من قبل فوترت جميع الأصناف
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,You are not authorized to approve leaves on Block Dates,غير مصرح لك الموافقة على أوراق تواريخ بلوك
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +311,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,وBOM الجديدة بعد استبدال
 DocType: Features Setup,Point of Sale,نقطة بيع
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +83,Curling,متجعد
 DocType: Account,Tax,ضريبة
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +28,Row {0}: {1} is not a valid {2},صف {0}: {1} ليست صالحة {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +89,Refining,تنقية
+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,إنتاج أداة تخطيط المنزل
 DocType: Quality Inspection,Report Date,تقرير تاريخ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +130,Routing,التوجيه
 DocType: C-Form,Invoices,الفواتير
 DocType: Job Opening,Job Title,المسمى الوظيفي
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +54,{0} already allocated for Employee {1} for period {2} - {3},{0} المخصصة أصلا لموظف {1} لفترة {2} - {3}
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +80,{0} Recipients,{0} المستلمين
 DocType: Features Setup,Item Groups in Details,المجموعات في البند تفاصيل
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +335,Quantity to Manufacture must be greater than 0.,يجب أن تكون الكمية لصنع أكبر من 0.
@@ -2919,14 +2806,13 @@
 DocType: DocType,Setup,الإعداد
 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,ملخص لهذا الشهر والأنشطة المعلقة
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +39,Cold rolling,المتداول الباردة
 DocType: Customer Group,Customer Group Name,العملاء اسم المجموعة
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +408,Please remove this Invoice {0} from C-Form {1},الرجاء إزالة هذا فاتورة {0} من C-نموذج {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +410,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,سمات
 DocType: Packing Slip,Get Items,الحصول على العناصر
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +186,Please enter Write Off Account,الرجاء إدخال شطب الحساب
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +187,Please enter Write Off Account,الرجاء إدخال شطب الحساب
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +71,Last Order Date,أمر آخر تاريخ
 DocType: DocField,Image,صورة
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +179,Make Excise Invoice,جعل المكوس الفاتورة
@@ -2936,7 +2822,7 @@
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +146,Operation ID not set,ID العملية لم تحدد
 DocType: Production Order,Planned Start Date,المخطط لها تاريخ بدء
 DocType: Serial No,Creation Document Type,نوع الوثيقة إنشاء
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +620,Maint. Visit,صيانة زيارة
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +631,Maint. Visit,صيانة زيارة
 DocType: Leave Type,Is Encash,هو يحققوا ربحا
 DocType: Purchase Invoice,Mobile No,رقم الجوال
 DocType: Payment Tool,Make Journal Entry,جعل إدخال دفتر اليومية
@@ -2944,35 +2830,31 @@
 apps/erpnext/erpnext/controllers/trends.py +257,Project-wise data is not available for Quotation,بيانات المشروع من الحكمة ليست متاحة لل اقتباس
 DocType: Project,Expected End Date,تاريخ الإنتهاء المتوقع
 DocType: Appraisal Template,Appraisal Template Title,تقييم قالب عنوان
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +440,Commercial,تجاري
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +378,Commercial,تجاري
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +23,Parent Item {0} must not be a Stock Item,الأم البند {0} لا يجب أن يكون البند الأسهم
 DocType: Cost Center,Distribution Id,توزيع رقم
-apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +14,Awesome Services,خدمات رهيبة
+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,العنوان المورد
 DocType: Contact Us Settings,Address Line 2,العنوان سطر 2
 DocType: ToDo,Reference,مرجع
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +59,Perforating,تثقيب
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,من الكمية
 apps/erpnext/erpnext/config/accounts.py +128,Rules to calculate shipping amount for a sale,قواعد لحساب كمية الشحن لبيع
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +29,Series is mandatory,الترقيم المتسلسل إلزامي
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +28,Financial Services,الخدمات المالية
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,الخدمات المالية
 apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3},يجب أن تكون قيمة للسمة {0} ضمن مجموعة من {1} إلى {2} في الزيادات من {3}
 DocType: Tax Rule,Sales,مبيعات
 DocType: Stock Entry Detail,Basic Amount,المبلغ الأساسي
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +173,Warehouse required for stock Item {0},مستودع الأسهم المطلوبة لل تفاصيل {0}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +178,Warehouse required for stock Item {0},مستودع الأسهم المطلوبة لل تفاصيل {0}
 DocType: Leave Allocation,Unused leaves,الأوراق غير المستخدمة
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,كر
 DocType: Customer,Default Receivable Accounts,افتراضي حسابات المقبوضات
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +102,Sawing,نشر
 DocType: Tax Rule,Billing State,الدولة الفواتير
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +32,Laminating,الترقق
 DocType: Item Reorder,Transfer,نقل
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +549,Fetch exploded BOM (including sub-assemblies),جلب BOM انفجرت (بما في ذلك المجالس الفرعية)
 DocType: Authorization Rule,Applicable To (Employee),تنطبق على (موظف)
 apps/erpnext/erpnext/controllers/accounts_controller.py +101,Due Date is mandatory,يرجع تاريخ إلزامي
 apps/erpnext/erpnext/controllers/item_variant.py +51,Increment for Attribute {0} cannot be 0,الاضافة للسمة {0} لا يمكن أن يكون 0
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +143,Sintering,تلبد
 DocType: Journal Entry,Pay To / Recd From,دفع إلى / من Recd
 DocType: Naming Series,Setup Series,إعداد الترقيم المتسلسل
 DocType: Supplier,Contact HTML,الاتصال HTML
@@ -2985,7 +2867,6 @@
 DocType: Attendance,Absent,غائب
 DocType: Product Bundle,Product Bundle,حزمة المنتج
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +180,Row {0}: Invalid reference {1},الصف {0}: إشارة غير صالحة {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +165,Crushing,الساحق
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,شراء قالب الضرائب والرسوم
 DocType: Upload Attendance,Download Template,تحميل قالب
 DocType: GL Entry,Remarks,تصريحات
@@ -2993,14 +2874,12 @@
 DocType: Journal Entry,Write Off Based On,شطب بناء على
 DocType: Features Setup,POS View,عرض نقطة مبيعات
 apps/erpnext/erpnext/config/stock.py +38,Installation record for a Serial No.,سجل لتثبيت الرقم التسلسلي
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +9,Continuous casting,الصب المستمر
 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/setup/page/setup_wizard/fixtures/operations.py +80,Cold sizing,التحجيم البارد
 DocType: Salary Slip,Earning & Deduction,وكسب الخصم
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +76,Account {0} cannot be a Group,حساب {0} لا يمكن أن يكون مجموعة
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +259,Region,منطقة
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +314,Region,منطقة
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +213,Optional. This setting will be used to filter in various transactions.,اختياري . سيتم استخدام هذا الإعداد لتصفية في المعاملات المختلفة.
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +104,Negative Valuation Rate is not allowed,لا يسمح السلبية قيم التقييم
 DocType: Holiday List,Weekly Off,العطلة الأسبوعية
@@ -3018,7 +2897,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,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,الحضور من التسجيل والحضور إلى تاريخ إلزامي
-apps/erpnext/erpnext/controllers/buying_controller.py +131,Please enter 'Is Subcontracted' as Yes or No,"يرجى إدخال "" التعاقد من الباطن "" كما نعم أو لا"
+apps/erpnext/erpnext/controllers/buying_controller.py +122,Please enter 'Is Subcontracted' as Yes or No,"يرجى إدخال "" التعاقد من الباطن "" كما نعم أو لا"
 DocType: Sales Team,Contact No.,الاتصال رقم
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,'Profit and Loss' type account {0} not allowed in Opening Entry,نوع حساب الأرباح و الخسائر {0} غير مسموح به في الأرصدة الافتتاحية
 DocType: Workflow State,Time,مرة
@@ -3027,14 +2906,13 @@
 DocType: Authorization Rule,Authorization Rule,إذن القاعدة
 DocType: Sales Invoice,Terms and Conditions Details,شروط وتفاصيل الشروط
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,الضرائب على المبيعات والرسوم قالب
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +10,Apparel & Accessories,ملابس واكسسوارات
+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,عدد بالدفع
 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 +121,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/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +47,Conversion Factor is required,مطلوب معامل التحويل
 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,قيمة / الوصف
@@ -3042,10 +2920,8 @@
 ,Customers Not Buying Since Long Time,الزبائن لا يشترون منذ وقت طويل
 DocType: Production Order,Expected Delivery Date,يتوقع تسليم تاريخ
 apps/erpnext/erpnext/accounts/general_ledger.py +121,Debit and Credit not equal for {0} #{1}. Difference is {2}.,الخصم والائتمان لا يساوي ل{0} # {1}. الفرق هو {2}.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +48,Bulging,منتفخ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +11,Evaporative-pattern casting,التبخر نمط الصب
 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 +195,Sales Invoice {0} must be cancelled before cancelling this Sales Order,فاتورة المبيعات {0} يجب أن يتم إلغاء هذا الأمر قبل إلغاء المبيعات
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +190,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.
@@ -3064,26 +2940,24 @@
 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 +241,Account: {0} with currency: {1} can not be selected,الحساب: {0} مع العملة: {1} لا يمكن اختيارها
+apps/erpnext/erpnext/controllers/accounts_controller.py +242,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 +47,Account {0}: Parent account {1} does not belong to company: {2},حساب {0}: حساب الرئيسي {1} لا تنتمي إلى الشركة: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted all transactions related to this company!,تم حذف جميع المعاملات المتعلقة بهذه الشركة!
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,كما في تاريخ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +111,Honing,جلخ
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +58,Probation,امتحان
-apps/erpnext/erpnext/stock/doctype/item/item.py +264,Default Warehouse is mandatory for stock Item.,مستودع الافتراضي هو إلزامي بالنسبة لمخزون السلعة .
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Probation,امتحان
+apps/erpnext/erpnext/stock/doctype/item/item.py +268,Default Warehouse is mandatory for stock Item.,مستودع الافتراضي هو إلزامي بالنسبة لمخزون السلعة .
 DocType: Feed,Full Name,الاسم الكامل
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +148,Clinching,حسمه
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +191,Payment of salary for the month {0} and year {1},دفع المرتبات لشهر {0} و السنة {1}
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +173,Payment of salary for the month {0} and year {1},دفع المرتبات لشهر {0} و السنة {1}
 DocType: Stock Settings,Auto insert Price List rate if missing,إدراج السيارات أسعار قائمة الأسعار إذا مفقود
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,إجمالي المبلغ المدفوع
 ,Transferred Qty,نقل الكمية
 apps/erpnext/erpnext/config/learn.py +11,Navigating,التنقل
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +137,Planning,تخطيط
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +137,Planning,تخطيط
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +9,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),المبلغ الكلي الفواتير (عبر الزمن سجلات)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +629,We sell this Item,نبيع هذه القطعة
+apps/erpnext/erpnext/public/js/setup_wizard.js +365,We sell this Item,نبيع هذه القطعة
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +65,Supplier Id,المورد رقم
 DocType: Journal Entry,Cash Entry,الدخول النقدية
 DocType: Sales Partner,Contact Desc,الاتصال التفاصيل
@@ -3092,18 +2966,16 @@
 DocType: Brand,Item Manager,مدير البند
 DocType: Cost Center,Add rows to set annual budgets on Accounts.,إضافة صفوف لوضع الميزانيات السنوية على الحسابات.
 DocType: Buying Settings,Default Supplier Type,الافتراضي مزود نوع
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +160,Quarrying,المحاجر
 DocType: Production Order,Total Operating Cost,إجمالي تكاليف التشغيل
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +160,Note: Item {0} entered multiple times,ملاحظة : البند {0} دخلت عدة مرات
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +163,Note: Item {0} entered multiple times,ملاحظة : البند {0} دخلت عدة مرات
 apps/erpnext/erpnext/config/crm.py +27,All Contacts.,جميع جهات الاتصال.
 DocType: Newsletter,Test Email Id,اختبار البريد الإلكتروني معرف
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +394,Company Abbreviation,اختصار الشركة
+apps/erpnext/erpnext/public/js/setup_wizard.js +142,Company Abbreviation,اختصار الشركة
 DocType: Features Setup,If you follow Quality Inspection. Enables Item QA Required and QA No in Purchase Receipt,إذا كنت تتبع فحص الجودة . تمكن البند QA المطلوبة وضمان الجودة لا في إيصال الشراء
 DocType: GL Entry,Party Type,نوع الحزب
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +68,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/setup/page/setup_wizard/fixtures/operations.py +30,Rotational molding,صب التناوب
 apps/erpnext/erpnext/config/hr.py +115,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,مجموعة القاعدة الضريبية لعربة التسوق
@@ -3117,15 +2989,15 @@
 apps/erpnext/erpnext/config/selling.py +18,Quotes to Leads or Customers.,اقتباسات لعروض أو العملاء.
 DocType: Stock Settings,Role Allowed to edit frozen stock,دور الأليفة لتحرير الأسهم المجمدة
 ,Territory Target Variance Item Group-Wise,الأراضي المستهدفة الفرق البند المجموعة الحكيم
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +101,All Customer Groups,جميع المجموعات العملاء
-apps/erpnext/erpnext/controllers/accounts_controller.py +474,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} إلزامي. ربما لا يتم إنشاء سجل سعر صرف العملة ل{1} إلى {2}.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +101,All Customer Groups,جميع المجموعات العملاء
+apps/erpnext/erpnext/controllers/accounts_controller.py +475,{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 +41,Account {0}: Parent account {1} does not exist,حساب {0}: حساب الرئيسي {1} غير موجود
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),قائمة الأسعار معدل (عملة الشركة)
 DocType: Account,Temporary,مؤقت
 DocType: Address,Preferred Billing Address,يفضل عنوان الفواتير
 DocType: Monthly Distribution Percentage,Percentage Allocation,نسبة توزيع
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +86,Secretary,أمين
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Secretary,أمين
 DocType: Serial No,Distinct unit of an Item,وحدة متميزة من عنصر
 DocType: Pricing Rule,Buying,شراء
 DocType: HR Settings,Employee Records to be created by,سجلات الموظفين المراد إنشاؤها من قبل
@@ -3138,9 +3010,8 @@
 ,Item-wise Price List Rate,البند الحكيمة قائمة الأسعار قيم
 DocType: Purchase Order Item,Supplier Quotation,اقتباس المورد
 DocType: Quotation,In Words will be visible once you save the Quotation.,وبعبارة تكون مرئية بمجرد حفظ اقتباس.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +68,Ironing,الكي
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is stopped,{0} {1} لم يتوقف
-apps/erpnext/erpnext/stock/doctype/item/item.py +352,Barcode {0} already used in Item {1},الباركود {0} مستخدم بالفعل في الصنف {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +356,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/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,الأحداث القادمة
@@ -3149,13 +3020,12 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +27,Quick Entry,دخول سريع
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0} غير إلزامية من أجل العودة
 DocType: Purchase Order,To Receive,تلقي
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +33,Shrink fitting,يتقلص المناسب
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +522,user@example.com,user@example.com
+apps/erpnext/erpnext/public/js/setup_wizard.js +266,user@example.com,user@example.com
 DocType: Email Digest,Income / Expense,الدخل / المصاريف
 DocType: Employee,Personal Email,البريد الالكتروني الشخصية
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +58,Total Variance,مجموع الفروق
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +62,Total Variance,مجموع الفروق
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.",إذا مكن، سيقوم النظام إضافة القيود المحاسبية للمخزون تلقائيا.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +15,Brokerage,سمسرة
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +15,Brokerage,سمسرة
 DocType: Address,Postal Code,الرمز البريدي
 DocType: Production Order Operation,"in Minutes
 Updated via 'Time Log'","في دقائق 
@@ -3163,14 +3033,13 @@
 DocType: Customer,From Lead,من العميل المحتمل
 apps/erpnext/erpnext/config/manufacturing.py +19,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 +442,POS Profile required to make POS Entry,POS الملف المطلوب لجعل الدخول POS
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +444,POS Profile required to make POS Entry,POS الملف المطلوب لجعل الدخول POS
 DocType: Hub Settings,Name Token,اسم رمز
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +106,Planing,التخطيط
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Selling,البيع القياسية
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +120,Standard Selling,البيع القياسية
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +137,Atleast one warehouse is mandatory,واحدة على الاقل مستودع إلزامي
 DocType: Serial No,Out of Warranty,لا تغطيه الضمان
 DocType: BOM Replace Tool,Replace,استبدل
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +314,{0} against Sales Invoice {1},{0} مقابل فاتورة المبيعات {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +316,{0} against Sales Invoice {1},{0} مقابل فاتورة المبيعات {1}
 apps/erpnext/erpnext/stock/doctype/item/item.py +49,Please enter default Unit of Measure,الرجاء إدخال حدة القياس الافتراضية
 DocType: Purchase Invoice Item,Project Name,اسم المشروع
 DocType: Supplier,Mention if non-standard receivable account,أذكر إذا غير القياسية حساب المستحق
@@ -3186,9 +3055,8 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,Journal Entry {0} does not have account {1} or already matched against other voucher,إدخال دفتر اليومية {0} ليس لديه حساب {1} أو بالفعل يقابل ضد قسيمة أخرى
 DocType: Item,Moving Average,المتوسط ​​المتحرك
 DocType: BOM Replace Tool,The BOM which will be replaced,وBOM التي سيتم استبدالها
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +43,New Stock UOM must be different from current stock UOM,يجب أن تكون جديدة اسهم UOM مختلفة من UOM الأسهم الحالية
 DocType: Account,Debit,مدين
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +34,Leaves must be allocated in multiples of 0.5,يجب تخصيص الأوراق في مضاعفات 0.5
+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/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,آمت المتميز
@@ -3206,8 +3074,7 @@
 DocType: Employee,Internal Work History,التاريخ العمل الداخلي
 DocType: DocField,Column Break,العمود استراحة
 DocType: Event,Thursday,الخميس
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +42,Private Equity,الأسهم الخاصة
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +93,Turning,خراطة
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,الأسهم الخاصة
 DocType: Maintenance Visit,Customer Feedback,ملاحظات العملاء
 DocType: Account,Expense,نفقة
 DocType: Sales Invoice,Exhibition,معرض
@@ -3220,19 +3087,19 @@
 DocType: Employee,Held On,عقدت في
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +33,Production Item,إنتاج البند
 ,Employee Information,معلومات الموظف
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,Rate (%),معدل ( ٪ )
+apps/erpnext/erpnext/public/js/setup_wizard.js +294,Rate (%),معدل ( ٪ )
 DocType: Stock Entry Detail,Additional Cost,تكلفة إضافية
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +407,Financial Year End Date,تاريخ نهاية السنة المالية
+apps/erpnext/erpnext/public/js/setup_wizard.js +155,Financial Year End Date,تاريخ نهاية السنة المالية
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Voucher No, if grouped by Voucher",لا يمكن تصفية استنادا قسيمة لا، إذا تم تجميعها حسب قسيمة
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +484,Make Supplier Quotation,جعل مورد اقتباس
 DocType: Quality Inspection,Incoming,الوارد
 DocType: BOM,Materials Required (Exploded),المواد المطلوبة (انفجرت)
 DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),خفض عائد لإجازة بدون أجر (LWP)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +512,"Add users to your organization, other than yourself",إضافة مستخدمين إلى مؤسستك، وغيرها من نفسك
+apps/erpnext/erpnext/public/js/setup_wizard.js +256,"Add users to your organization, other than yourself",إضافة مستخدمين إلى مؤسستك، وغيرها من نفسك
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No {1} does not match with {2} {3},الصف # {0}: المسلسل لا {1} لا يتطابق مع {2} {3}
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +44,Casual Leave,عارضة اترك
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +44,Casual Leave,عارضة اترك
 DocType: Batch,Batch ID,دفعة ID
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +334,Note: {0},ملاحظة : {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +336,Note: {0},ملاحظة : {0}
 ,Delivery Note Trends,ملاحظة اتجاهات التسليم
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +104,This Week's Summary,ملخص هذا الأسبوع
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +74,{0} must be a Purchased or Sub-Contracted Item in row {1},{0} يجب أن يكون الصنف مشترى أو متعاقد من الباطن في الصف {1}
@@ -3244,7 +3111,7 @@
 DocType: Purchase Receipt,Return Against Purchase Receipt,العودة ضد شراء إيصال
 DocType: Purchase Order,To Bill,لبيل
 DocType: Material Request,% Ordered,٪ أمرت
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +61,Piecework,العمل مقاولة
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Piecework,العمل مقاولة
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +64,Avg. Buying Rate,متوسط. سعر شراء
 DocType: Task,Actual Time (in Hours),الوقت الفعلي (بالساعات)
 DocType: Employee,History In Company,وفي تاريخ الشركة
@@ -3261,13 +3128,13 @@
 DocType: Opportunity,To Discuss,لمناقشة
 DocType: SMS Settings,SMS Settings,SMS إعدادات
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +60,Temporary Accounts,حسابات مؤقتة
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +155,Black,أسود
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Black,أسود
 DocType: BOM Explosion Item,BOM Explosion Item,BOM  Explosion Item
 DocType: Account,Auditor,مدقق حسابات
 DocType: Purchase Order,End date of current order's period,تاريخ انتهاء الفترة لكي الحالي
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +17,Make Offer Letter,تقديم عرض رسالة
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +10,Return,عودة
-apps/erpnext/erpnext/stock/doctype/item/item.py +503,Default Unit of Measure for Variant must be same as Template,يجب أن تكون وحدة القياس الافتراضية للخيار نفس قالب
+apps/erpnext/erpnext/stock/doctype/item/item.py +507,Default Unit of Measure for Variant must be same as Template,يجب أن تكون وحدة القياس الافتراضية للخيار نفس قالب
 DocType: DocField,Fold,طية
 DocType: Production Order Operation,Production Order Operation,أمر الإنتاج عملية
 DocType: Pricing Rule,Disable,تعطيل
@@ -3278,13 +3145,12 @@
 DocType: Page,Page Name,اسم الصفحة
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +110,To Time must be greater than From Time,إلى الوقت يجب أن تكون أكبر من من الوقت
 DocType: Journal Entry Account,Exchange Rate,سعر الصرف
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +465,Sales Order {0} is not submitted,ترتيب المبيعات {0} لم تقدم
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +467,Sales Order {0} is not submitted,ترتيب المبيعات {0} لم تقدم
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0}: Parent account {1} does not bolong to the company {2},مستودع {0}: حساب الرئيسي {1} لا بولونغ للشركة {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +124,Spindle finishing,تشطيب المغزل
 DocType: BOM,Last Purchase Rate,أخر سعر توريد
 DocType: Account,Asset,الأصول
 DocType: Project Task,Task ID,ID مهمة
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +395,"e.g. ""MC""","على سبيل المثال "" MC """
+apps/erpnext/erpnext/public/js/setup_wizard.js +143,"e.g. ""MC""","على سبيل المثال "" MC """
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,Stock cannot exist for Item {0} since has variants,الأوراق المالية لا يمكن أن توجد القطعة ل{0} منذ ديه المتغيرات
 ,Sales Person-wise Transaction Summary,الشخص الحكيم مبيعات ملخص عملية
 DocType: System Settings,Time Zone,منطقة زمنية
@@ -3293,9 +3159,7 @@
 DocType: Monthly Distribution,Monthly Distribution Percentages,النسب المئوية لتوزيع الشهرية
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +16,The selected item cannot have Batch,العنصر المحدد لا يمكن أن يكون دفعة
 DocType: Delivery Note,% of materials delivered against this Delivery Note,٪ من المواد الموردة  سلمت من أمر التوصيل
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +151,Stapling,التدبيس
 DocType: Customer,Customer Details,تفاصيل العملاء
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +105,Shaping,تشكيل
 DocType: Employee,Reports to,تقارير إلى
 DocType: SMS Settings,Enter url parameter for receiver nos,أدخل عنوان URL لمعلمة NOS استقبال
 DocType: Sales Invoice,Paid Amount,المبلغ المدفوع
@@ -3304,13 +3168,13 @@
 DocType: Item Variant,Item Variant,البديل البند
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +15,Setting this Address Template as default as there is no other default,وضع هذا القالب كما العنوان الافتراضي حيث لا يوجد الافتراضية الأخرى
 apps/erpnext/erpnext/accounts/doctype/account/account.py +89,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","رصيد حساب بالفعل في الخصم، لا يسمح لك تعيين ""الرصيد يجب أن يكون 'ك' الائتمان '"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +76,Quality Management,إدارة الجودة
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Quality Management,إدارة الجودة
 DocType: Production Planning Tool,Filter based on customer,تصفية على أساس العملاء
 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}
 DocType: Employee External Work History,Employee External Work History,التاريخ الموظف العمل الخارجي
 DocType: Tax Rule,Purchase,شراء
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +34,Balance Qty,التوازن الكمية
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Balance Qty,التوازن الكمية
 DocType: Item Group,Parent Item Group,الأم الإغلاق المجموعة
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +21,{0} for {1},{0} ل {1}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +96,Cost Centers,مراكز التكلفة
@@ -3320,12 +3184,12 @@
 DocType: Opportunity,Next Contact,التالي اتصل بنا
 DocType: Employee,Employment Type,مجال العمل
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,الموجودات الثابتة
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +84,Application period cannot be across two alocation records,فترة التطبيق لا يمكن أن يكون عبر اثنين من السجلات alocation
 DocType: Item Group,Default Expense Account,الافتراضي نفقات الحساب
 DocType: Employee,Notice (days),إشعار (أيام )
 DocType: Page,Yes,نعم
 DocType: Tax Rule,Sales Tax Template,قالب ضريبة المبيعات
 DocType: Employee,Encashment Date,تاريخ التحصيل
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +74,Electroforming,الكهربائية وتشكيل
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +179,"Against Voucher Type must be one of Purchase Order, Purchase Invoice or Journal Entry",ضد قسيمة النوع يجب أن يكون واحدا من طلب شراء، شراء الفاتورة أو إدخال دفتر اليومية
 DocType: Account,Stock Adjustment,الأسهم التكيف
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +34,Default Activity Cost exists for Activity Type - {0},موجود آخر الافتراضي التكلفة لنوع النشاط - {0}
@@ -3361,12 +3225,12 @@
 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,التوزيع
 apps/erpnext/erpnext/public/js/pos/pos.html +36,Amount Paid,المبلغ المدفوع
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +91,Project Manager,مدير المشروع
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +72,Dispatch,إيفاد
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Project Manager,مدير المشروع
+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: Customer,Default Taxes and Charges,الضرائب والرسوم الافتراضية
 DocType: Account,Receivable,القبض
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +268,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,الصف # {0}: غير مسموح لتغيير مورد السلعة كما طلب شراء موجود بالفعل
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +263,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 لبنود فرعية الجمعية للحصول على المواد الخام. خلاف ذلك، سيتم معاملة جميع البنود الفرعية الجمعية كمادة خام.
@@ -3374,8 +3238,8 @@
 DocType: Hub Settings,Seller Description,البائع الوصف
 DocType: Employee Education,Qualification,المؤهل
 DocType: Item Price,Item Price,البند السعر
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +48,Soap & Detergent,الصابون والمنظفات
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +36,Motion Picture & Video,الحركة صور والفيديو
+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,أمر
 DocType: Warehouse,Warehouse Name,مستودع اسم
 DocType: Naming Series,Select Transaction,حدد المعاملات
@@ -3384,7 +3248,6 @@
 DocType: BOM,Rate Of Materials Based On,معدل المواد التي تقوم على
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,Analtyics الدعم
 apps/erpnext/erpnext/accounts/doctype/accounts_settings/accounts_settings.py +27,Company is missing in warehouses {0},شركة مفقود في المستودعات {0}
-DocType: Stock UOM Replace Utility,Stock UOM Replace Utility,الأسهم أداة استبدال UOM
 DocType: POS Profile,Terms and Conditions,الشروط والأحكام
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,To Date should be within the Fiscal Year. Assuming To Date = {0},إلى التسجيل يجب أن يكون ضمن السنة المالية. على افتراض إلى تاريخ = {0}
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc",هنا يمكنك الحفاظ على الطول والوزن، والحساسية، الخ المخاوف الطبية
@@ -3396,7 +3259,7 @@
 DocType: Sales Order Item,For Production,للإنتاج
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +103,Please enter sales order in the above table,يرجى إدخال أمر المبيعات في الجدول أعلاه
 DocType: Project Task,View Task,عرض العمل
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +406,Your financial year begins on,تبدأ السنة المالية الخاصة بك على
+apps/erpnext/erpnext/public/js/setup_wizard.js +154,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: Email Digest,Add/Remove Recipients,إضافة / إزالة المستلمين
@@ -3404,16 +3267,14 @@
 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),إعداد ملقم واردة ل دعم البريد الإلكتروني معرف . (على سبيل المثال 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 +528,Item variant {0} exists with same attributes,البديل البند {0} موجود مع نفس الصفات
+apps/erpnext/erpnext/stock/doctype/item/item.py +532,Item variant {0} exists with same attributes,البديل البند {0} موجود مع نفس الصفات
 DocType: Salary Slip,Salary Slip,إيصال الراتب
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +116,Burnishing,الصقل
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +54,'To Date' is required,' إلى تاريخ ' مطلوب
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,' إلى تاريخ ' مطلوب
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.",توليد التعبئة زلات لحزم ليتم تسليمها. تستخدم لإعلام عدد حزمة، حزمة المحتويات وزنه.
 DocType: Sales Invoice Item,Sales Order Item,ترتيب المبيعات الإغلاق
 DocType: Salary Slip,Payment Days,يوم الدفع
 DocType: BOM,Manage cost of operations,إدارة تكلفة العمليات
 DocType: Features Setup,Item Advanced,البند المتقدم
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +40,Hot rolling,الساخنة المتداول
 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.",عند &quot;المقدمة&quot; أي من المعاملات تم، بريد الكتروني المنبثقة تلقائيا فتح لإرسال بريد الكتروني الى &quot;الاتصال&quot; المرتبطة في تلك المعاملة، مع الصفقة كمرفق. يجوز للمستخدم أو قد لا إرسال البريد الإلكتروني.
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,إعدادات العالمية
 DocType: Employee Education,Employee Education,موظف التعليم
@@ -3426,25 +3287,23 @@
 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/setup/page/setup_wizard/install_fixtures.py +48,Sick Leave,الإجازات المرضية
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +174,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/page/setup_wizard/fixtures/industry_type.py +22,Department Stores,المتاجر
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,المتاجر
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +40,System Balance,توازن النظام
 DocType: Workflow,Is Active,نشط
 apps/erpnext/erpnext/controllers/stock_controller.py +71,No accounting entries for the following warehouses,لا القيود المحاسبية للمستودعات التالية
 apps/erpnext/erpnext/projects/doctype/project/project.js +22,Save the document first.,حفظ المستند أولا.
 DocType: Account,Chargeable,تحمل
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +121,Linishing,Linishing
 DocType: Company,Change Abbreviation,تغيير اختصار
 DocType: Workflow State,Primary,أساسي
 DocType: Expense Claim Detail,Expense Date,حساب تاريخ
 DocType: Item,Max Discount (%),ماكس الخصم (٪)
 DocType: Communication,More Information,المزيد من المعلومات
 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/setup/page/setup_wizard/fixtures/operations.py +161,Blasting,نسف
 DocType: Company,Warn,حذر
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +111,Item valuation updated,التقييم البند تحديث
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.",أي ملاحظات أخرى، جهد يذكر أن يجب أن تذهب في السجلات.
 DocType: BOM,Manufacturing User,التصنيع العضو
 DocType: Purchase Order,Raw Materials Supplied,المواد الخام الموردة
@@ -3454,7 +3313,7 @@
 DocType: Appraisal,Appraisal Template,تقييم قالب
 DocType: Communication,Email,البريد الإلكتروني
 DocType: Item Group,Item Classification,تصنيف البند
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +89,Business Development Manager,مدير تطوير الأعمال
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Business Development Manager,مدير تطوير الأعمال
 DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,صيانة زيارة الغرض
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.js +15,Period,فترة
 ,General Ledger,دفتر الأستاذ العام
@@ -3464,9 +3323,7 @@
 ,Itemwise Recommended Reorder Level,يوصى به Itemwise إعادة ترتيب مستوى
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +264,Please select {0} first,الرجاء اختيار {0} الأولى
 DocType: Features Setup,To get Item Group in details table,للحصول على تفاصيل المجموعة في الجدول تفاصيل
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +67,Redrawing,إعادة رسم
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +112,Batch {0} of Item {1} has expired.,دفعة {0} من البند {1} قد انتهت صلاحيتها.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +120,Etching,خرط
 DocType: Sales Invoice,Commission,عمولة
 DocType: Address Template,"<h4>Default Template</h4>
 <p>Uses <a href=""http://jinja.pocoo.org/docs/templates/"">Jinja Templating</a> and all the fields of Address (including Custom Fields if any) will be available</p>
@@ -3511,7 +3368,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +340,Operation Time must be greater than 0 for Operation {0},عملية الوقت يجب أن تكون أكبر من 0 لعملية {0}
 DocType: Supplier,Address and Contacts,عنوان واتصالات
 DocType: UOM Conversion Detail,UOM Conversion Detail,UOM تحويل التفاصيل
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +496,Keep it web friendly 900px (w) by 100px (h),يبقيه على شبكة الإنترنت 900px دية ( ث ) من قبل 100px (ح )
+apps/erpnext/erpnext/public/js/setup_wizard.js +242,Keep it web friendly 900px (w) by 100px (h),يبقيه على شبكة الإنترنت 900px دية ( ث ) من قبل 100px (ح )
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +329,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,الحصول على قسائم المعلقة
@@ -3527,54 +3384,49 @@
 DocType: Item,Average time taken by the supplier to deliver,متوسط ​​الوقت المستغرق من قبل المورد لتسليم
 DocType: Time Log,Hours,ساعات
 DocType: Project,Expected Start Date,يتوقع البدء تاريخ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +38,Rolling,المتداول
 DocType: ToDo,Priority,أفضلية
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +41,Remove item if charges is not applicable to that item,إزالة البند إذا الرسوم لا تنطبق على هذا البند
 DocType: Dropbox Backup,Dropbox Access Allowed,دروببوإكس الدخول الأليفة
 DocType: Dropbox Backup,Weekly,الأسبوعية
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,على سبيل المثال. smsgateway.com / API / send_sms.cgi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +485,Receive,تسلم
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +510,Receive,تسلم
 DocType: Maintenance Visit,Fully Completed,يكتمل
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}٪ مكتمل
 DocType: Employee,Educational Qualification,المؤهلات العلمية
 DocType: Workstation,Operating Costs,تكاليف التشغيل
 DocType: Employee Leave Approver,Employee Leave Approver,الموظف إجازة الموافق
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,{0} has been successfully added to our Newsletter list.,{0} تمت إضافة بنجاح إلى قائمة النشرة الإخبارية لدينا.
-apps/erpnext/erpnext/stock/doctype/item/item.py +383,Row {0}: An Reorder entry already exists for this warehouse {1},صف {0}: إدخال إعادة ترتيب موجود بالفعل لهذا المستودع {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +387,Row {0}: An Reorder entry already exists for this warehouse {1},صف {0}: إدخال إعادة ترتيب موجود بالفعل لهذا المستودع {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +67,"Cannot declare as lost, because Quotation has been made.",لا يمكن ان تعلن بانها فقدت ، لأن أحرز اقتباس .
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +133,Electron beam machining,الإلكترون شعاع بالقطع
 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 +150,Please select Start Date and End Date for Item {0},يرجى تحديد تاريخ بدء و نهاية التاريخ القطعة ل {0}
 apps/erpnext/erpnext/config/stock.py +141,Main Reports,الرئيسية تقارير
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +102,Stock Ledger entries balances updated,الأسهم ليدجر إدخالات أرصدة تحديث
 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 +176,Add / Edit Prices,إضافة / تحرير الأسعار
+apps/erpnext/erpnext/stock/doctype/item/item.js +178,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 +298,My Orders,بلدي أوامر
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +293,My Orders,بلدي أوامر
 DocType: Price List,Price List Name,قائمة الأسعار اسم
 DocType: Time Log,For Manufacturing,لصناعة
-apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +70,Totals,المجاميع
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +174,Totals,المجاميع
 DocType: BOM,Manufacturing,تصنيع
 ,Ordered Items To Be Delivered,أمرت عناصر ليتم تسليمها
 DocType: Account,Income,دخل
 ,Setup Wizard,معالج الإعداد
 DocType: Industry Type,Industry Type,صناعة نوع
 apps/erpnext/erpnext/templates/includes/cart.js +137,Something went wrong!,حدث خطأ!
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +68,Warning: Leave application contains following block dates,يحتوي التطبيق اترك التواريخ الكتلة التالية: تحذير
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +251,Sales Invoice {0} has already been submitted,{0} سبق أن قدمت فاتورة المبيعات
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +100,Warning: Leave application contains following block dates,يحتوي التطبيق اترك التواريخ الكتلة التالية: تحذير
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +256,Sales Invoice {0} has already been submitted,{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/setup/page/setup_wizard/fixtures/operations.py +10,Die casting,يموت الصب
 DocType: Email Alert,Reference Date,المرجع تاريخ
 apps/erpnext/erpnext/config/hr.py +105,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,من فضلك ادخل الرسالة قبل إرسالها
 DocType: Async Task,Status,حالة
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +65,Stock UOM updated for Item {0},الأسهم UOM تحديث القطعة ل{0}
 DocType: Company History,Year,عام
 apps/erpnext/erpnext/config/accounts.py +127,Point-of-Sale Profile,نقطة من بيع الشخصي
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +68,Please Update SMS Settings,يرجى تحديث إعدادات SMS
@@ -3588,12 +3440,12 @@
 ,Serial No Service Contract Expiry,مسلسل العقد لا انتهاء الاشتراك خدمة
 DocType: Item,Unit of Measure Conversion,وحدة القياس التحويل
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +86,Employee can not be changed,لا يمكن تغيير موظف
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +259,You cannot credit and debit same account at the same time,لا يمكنك الائتمان والخصم نفس الحساب في نفس الوقت
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,You cannot credit and debit same account at the same time,لا يمكنك الائتمان والخصم نفس الحساب في نفس الوقت
 DocType: Naming Series,Help HTML,مساعدة HTML
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},يجب أن يكون مجموع الترجيح تعيين 100 ٪ . فمن {0}
 apps/erpnext/erpnext/controllers/status_updater.py +140,Allowance for over-{0} crossed for Item {1},اتاحة لأكثر من {0} للصنف {1}
 DocType: Address,Name of person or organization that this address belongs to.,اسم الشخص أو المنظمة التي ينتمي إلى هذا العنوان.
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +587,Your Suppliers,لديك موردون
+apps/erpnext/erpnext/public/js/setup_wizard.js +325,Your Suppliers,لديك موردون
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,لا يمكن تعيين كما فقدت كما يرصد ترتيب المبيعات .
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +65,Another Salary Structure {0} is active for employee {1}. Please make its status 'Inactive' to proceed.,"آخر هيكل الراتب {0} نشط للموظف {1}. يرجى التأكد مكانتها ""غير فعال"" للمتابعة."
 DocType: Purchase Invoice,Contact,اتصل
@@ -3602,37 +3454,35 @@
 DocType: Item,Has Serial No,ورقم المسلسل
 DocType: Employee,Date of Issue,تاريخ الإصدار
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +16,{0}: From {0} for {1},{0} من {0} ب {1}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +154,Row #{0}: Set Supplier for item {1},الصف # {0}: تعيين مورد للالبند {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +149,Row #{0}: Set Supplier for item {1},الصف # {0}: تعيين مورد للالبند {1}
 DocType: Issue,Content Type,نوع المحتوى
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +17,Computer,الكمبيوتر
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,الكمبيوتر
 DocType: Item,List this Item in multiple groups on the website.,قائمة هذا البند في مجموعات متعددة على شبكة الانترنت.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +283,Please check Multi Currency option to allow accounts with other currency,يرجى التحقق من خيار العملات المتعددة للسماح حسابات مع عملة أخرى
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +285,Please check Multi Currency option to allow accounts with other currency,يرجى التحقق من خيار العملات المتعددة للسماح حسابات مع عملة أخرى
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +62,Item: {0} does not exist in the system,البند: {0} غير موجود في النظام
 apps/erpnext/erpnext/accounts/doctype/account/account.py +81,You are not authorized to set Frozen value,لا يحق لك تعيين القيمة المجمدة
 DocType: Payment Reconciliation,Get Unreconciled Entries,الحصول على مقالات لم تتم تسويتها
 DocType: Cost Center,Budgets,الميزانيات
 apps/frappe/frappe/core/page/modules_setup/modules_setup.py +11,Updated,تحديث
 DocType: Employee,Emergency Contact Details,تفاصيل الاتصال في حالات الطوارئ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +396,What does it do?,مجال عمل الشركة؟
+apps/erpnext/erpnext/public/js/setup_wizard.js +144,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,متوسط ​​العمولة
-apps/erpnext/erpnext/stock/doctype/item/item.py +313,'Has Serial No' can not be 'Yes' for non-stock item,""" لا يحوي رقم متسلسل""  لا يمكن أن يكون "" نعم "" للأصناف الغير مخزنة"
+apps/erpnext/erpnext/stock/doctype/item/item.py +317,'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/setup/page/setup_wizard/install_fixtures.py +111,Electrical,كهربائي
+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 +302,Row {0}: Exchange Rate is mandatory,الصف {0}: سعر صرف إلزامي
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +304,Row {0}: Exchange Rate is mandatory,الصف {0}: سعر صرف إلزامي
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},هوية المستخدم لم يتم تعيين موظف ل {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +72,Peening,الرصاص Peening
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,From Warranty Claim,من المطالبة الضمان
 DocType: Stock Entry,Default Source Warehouse,المصدر الافتراضي مستودع
 DocType: Item,Customer Code,قانون العملاء
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +212,Birthday Reminder for {0},تذكير عيد ميلاد ل{0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +163,Lapping,اللف
-apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.js +8,Days Since Last Order,منذ أيام طلب آخر
+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 +299,Debit To account must be a Balance Sheet account,يجب أن يكون الخصم لحساب حساب الميزانية العمومية
 DocType: Buying Settings,Naming Series,تسمية السلسلة
 DocType: Leave Block List,Leave Block List Name,ترك اسم كتلة قائمة
@@ -3646,7 +3496,7 @@
 DocType: Notification Control,Sales Invoice Message,فاتورة مبيعات رسالة
 DocType: Authorization Rule,Based On,وبناء على
 DocType: Sales Order Item,Ordered Qty,أمرت الكمية
-apps/erpnext/erpnext/stock/doctype/item/item.py +539,Item {0} is disabled,البند هو تعطيل {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +543,Item {0} is disabled,البند هو تعطيل {0}
 DocType: Stock Settings,Stock Frozen Upto,الأسهم المجمدة لغاية
 apps/erpnext/erpnext/controllers/recurring_document.py +166,Period From and Period To dates mandatory for recurring {0},فترة من وفترة لمواعيد إلزامية لالمتكررة {0}
 apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,مشروع النشاط / المهمة.
@@ -3656,7 +3506,6 @@
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,يجب أن يكون الخصم أقل من 100
 DocType: ToDo,Low,منخفض
 DocType: Purchase Invoice,Write Off Amount (Company Currency),شطب المبلغ (شركة العملات)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +71,Spinning,الغزل
 DocType: Landed Cost Voucher,Landed Cost Voucher,هبطت التكلفة قسيمة
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +55,Please set {0},الرجاء تعيين {0}
 DocType: Purchase Invoice,Repeat on Day of Month,تكرار في يوم من شهر
@@ -3678,7 +3527,6 @@
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +37,Campaign Name is required,مطلوب اسم حملة
 DocType: Maintenance Visit,Maintenance Date,تاريخ الصيانة
 DocType: Purchase Receipt Item,Rejected Serial No,رقم المسلسل رفض
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +51,Deep drawing,السحب العميق
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +40,New Newsletter,النشرة الإخبارية جديدة
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +157,Start date should be less than end date for Item {0},يجب أن يكون تاريخ البدء أقل من تاريخ انتهاء القطعة ل {0}
 apps/erpnext/erpnext/stock/doctype/item/item.js +17,Show Balance,مشاهدة الميزان
@@ -3689,7 +3537,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +119,BOM and Manufacturing Quantity are required,ويلزم BOM والتصنيع الكمية
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,المدى شيخوخة 2
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +450,Amount,كمية
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +147,Riveting,التثبيت
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,استبدال BOM
 ,Sales Analytics,مبيعات تحليلات
 DocType: Manufacturing Settings,Manufacturing Settings,إعدادات التصنيع
@@ -3701,20 +3548,19 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +207,New Account Name,اسم الحساب الجديد
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,المواد الخام الموردة التكلفة
 DocType: Selling Settings,Settings for Selling Module,إعدادات لبيع وحدة
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +73,Customer Service,خدمة العملاء
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Customer Service,خدمة العملاء
 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.,عرض المرشح على وظيفة.
 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 +70,Item {0} must be a stock Item,البند {0} يجب أن يكون البند الأسهم
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,افتراضي العمل في مستودع التقدم
 apps/erpnext/erpnext/config/accounts.py +107,Default settings for accounting transactions.,الإعدادات الافتراضية ل معاملات المحاسبية.
 apps/frappe/frappe/model/naming.py +40,{0} is required,{0} مطلوب
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +21,Vacuum molding,فراغ الصب
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,التاريخ المتوقع لا يمكن أن يكون قبل تاريخ طلب المواد
 DocType: Contact Us Settings,City,مدينة
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +132,Ultrasonic machining,بالموجات فوق الصوتية بالقطع
 apps/frappe/frappe/templates/base.html +137,Error: Not a valid id?,خطأ: لا بطاقة هوية صالحة؟
 apps/erpnext/erpnext/stock/get_item_details.py +125,Item {0} must be a Sales Item,البند {0} يجب أن يكون عنصر المبيعات
 DocType: Naming Series,Update Series Number,تحديث الرقم المتسلسل
@@ -3722,7 +3568,7 @@
 DocType: Sales Order,Printing Details,تفاصيل الطباعة
 DocType: Task,Closing Date,تاريخ الإنتهاء
 DocType: Sales Order Item,Produced Quantity,أنتجت الكمية
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +84,Engineer,مهندس
+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 +379,Item Code required at Row No {0},كود البند المطلوبة في صف لا { 0 ​​}
 DocType: Sales Partner,Partner Type,نوع الشريك
@@ -3730,7 +3576,7 @@
 DocType: Authorization Rule,Customerwise Discount,Customerwise الخصم
 DocType: Purchase Invoice,Against Expense Account,ضد حساب المصاريف
 DocType: Production Order,Production Order,الإنتاج ترتيب
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +258,Installation Note {0} has already been submitted,تركيب ملاحظة {0} وقد تم بالفعل قدمت
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +263,Installation Note {0} has already been submitted,تركيب ملاحظة {0} وقد تم بالفعل قدمت
 DocType: Quotation Item,Against Docname,ضد Docname
 DocType: SMS Center,All Employee (Active),جميع الموظفين (فعالة)
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,عرض الآن
@@ -3739,19 +3585,19 @@
 DocType: Item,Re-Order Level,إعادة ترتيب مستوى
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,إدخال عناصر والكمية المخططة التي تريد رفع أوامر الإنتاج أو تحميل المواد الخام لتحليلها.
 apps/frappe/frappe/public/js/frappe/views/ganttview.js +45,Gantt Chart,مخطط جانت
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +57,Part-time,جزئي
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,Part-time,جزئي
 DocType: Employee,Applicable Holiday List,ينطبق عطلة قائمة
 DocType: Employee,Cheque,شيك
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,تم تحديث الرقم المتسلسل
 apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Report Type is mandatory,تقرير نوع إلزامي
 DocType: Item,Serial Number Series,المسلسل عدد سلسلة
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},مستودع إلزامي للسهم المدينة {0} في {1} الصف
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +45,Retail & Wholesale,تجارة التجزئة و الجملة
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,تجارة التجزئة و الجملة
 DocType: Issue,First Responded On,أجاب أولا على
 DocType: Website Item Group,Cross Listing of Item in multiple groups,قائمة صليب البند في مجموعات متعددة
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +351,The First User: You,المستخدم أولا : أنت
+apps/erpnext/erpnext/public/js/setup_wizard.js +101,The First User: You,المستخدم أولا : أنت
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +48,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 +172,Successfully Reconciled,التوفيق بنجاح
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +119,Successfully Reconciled,التوفيق بنجاح
 DocType: Production Order,Planned End Date,المخطط لها تاريخ الانتهاء
 apps/erpnext/erpnext/config/stock.py +43,Where items are stored.,حيث يتم تخزين العناصر.
 DocType: Tax Rule,Validity,صحة
@@ -3771,39 +3617,36 @@
 DocType: DocPerm,Level,مستوى
 DocType: Purchase Taxes and Charges,On Net Total,على إجمالي صافي
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +160,Target warehouse in row {0} must be same as Production Order,مستودع الهدف في الصف {0} يجب أن يكون نفس ترتيب الإنتاج
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +59,No permission to use Payment Tool,لا إذن لاستخدام أداة الدفع
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +97,No permission to use Payment Tool,لا إذن لاستخدام أداة الدفع
 apps/erpnext/erpnext/controllers/recurring_document.py +192,'Notification Email Addresses' not specified for recurring %s,"""عناويين الإيميل للتنبيه""  غير محددة للمدخلات المتكررة %s"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +86,Milling,طحن
 apps/erpnext/erpnext/accounts/doctype/account/account.py +99,Currency can not be changed after making entries using some other currency,لا يمكن تغيير العملة بعد إجراء إدخالات باستخدام بعض العملات الأخرى
 DocType: Company,Round Off Account,جولة قبالة حساب
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +60,Nibbling,القضم
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,المصاريف الإدارية
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +18,Consulting,الاستشارات
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +18,Consulting,الاستشارات
 DocType: Customer Group,Parent Customer Group,الأم العملاء مجموعة
 apps/erpnext/erpnext/public/js/pos/pos.js +429,Change,تغيير
 DocType: Purchase Invoice,Contact Email,عنوان البريد الإلكتروني
 DocType: Appraisal Goal,Score Earned,نقاط المكتسبة
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +393,"e.g. ""My Company LLC""","على سبيل المثال ""شركتي ذ.م.م. """
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +173,Notice Period,فترة إشعار
+apps/erpnext/erpnext/public/js/setup_wizard.js +141,"e.g. ""My Company LLC""","على سبيل المثال ""شركتي ذ.م.م. """
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +173,Notice Period,فترة إشعار
 DocType: Bank Reconciliation Detail,Voucher ID,قسيمة ID
 apps/erpnext/erpnext/setup/doctype/territory/territory.js +14,This is a root territory and cannot be edited.,هذا هو الجذر الأرض والتي لا يمكن تحريرها.
 DocType: Packing Slip,Gross Weight UOM,الوزن الإجمالي UOM
 DocType: Email Digest,Receivables / Payables,الذمم المدينة / الدائنة
 DocType: Delivery Note Item,Against Sales Invoice,ضد فاتورة المبيعات
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +63,Stamping,ختم
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +457,Credit Account,حساب الائتمان
 DocType: Landed Cost Item,Landed Cost Item,هبطت تكلفة السلعة
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +56,Show zero values,إظهار القيم الصفر
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,كمية البند تم الحصول عليها بعد تصنيع / إعادة التعبئة من كميات معينة من المواد الخام
 DocType: Payment Reconciliation,Receivable / Payable Account,القبض / حساب الدائنة
 DocType: Delivery Note Item,Against Sales Order Item,مقابل المبيعات 
-apps/erpnext/erpnext/stock/doctype/item/item.py +521,Please specify Attribute Value for attribute {0},يرجى تحديد قيمة السمة للسمة {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +525,Please specify Attribute Value for attribute {0},يرجى تحديد قيمة السمة للسمة {0}
 DocType: Item,Default Warehouse,النماذج الافتراضية
 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,طباعة دون المبلغ
-apps/erpnext/erpnext/controllers/buying_controller.py +69,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,ضريبة الفئة لا يمكن أن يكون ' التقييم ' أو ' تقييم وتوتال ' وجميع العناصر هي العناصر غير الأسهم
+apps/erpnext/erpnext/controllers/buying_controller.py +60,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,ضريبة الفئة لا يمكن أن يكون ' التقييم ' أو ' تقييم وتوتال ' وجميع العناصر هي العناصر غير الأسهم
 DocType: User,Last Name,اسم العائلة
 DocType: Web Page,Left,ترك
 DocType: Event,All Day,كل يوم
@@ -3811,7 +3654,7 @@
 DocType: Appraisal,Total Score (Out of 5),مجموع نقاط (من 5)
 DocType: Contact Us Settings,State,دولة
 DocType: Batch,Batch,دفعة
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +51,Balance,توازن
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +28,Balance,توازن
 DocType: Project,Total Expense Claim (via Expense Claims),مجموع المطالبة المصاريف (عبر مطالبات النفقات)
 DocType: User,Gender,جنس
 DocType: Journal Entry,Debit Note,ملاحظة الخصم
@@ -3841,8 +3684,7 @@
 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/setup/page/setup_wizard/fixtures/operations.py +76,Seaming,الاغلاق
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +197,"Company Email ID not found, hence mail not sent",شركة البريد الإلكتروني معرف لم يتم العثور على ، وبالتالي لم ترسل البريد
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +206,"Company Email ID not found, hence mail not sent",شركة البريد الإلكتروني معرف لم يتم العثور على ، وبالتالي لم ترسل البريد
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),تطبيق الأموال (الأصول )
 DocType: Production Planning Tool,Filter based on item,تصفية استنادا إلى البند
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +451,Debit Account,حساب الخصم
@@ -3854,17 +3696,16 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +95,{0} {1} has been modified. Please refresh.,تم تعديل {0} {1}، يرجى تحديث الصفحة من المتصفح
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,وقف المستخدمين من إجراء تطبيقات على إجازة الأيام التالية.
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +591,From Opportunity,من الفرص
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +46,Blanking,تقطيع
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +166,Employee Benefits,فوائد الموظف
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,Employee Benefits,فوائد الموظف
 DocType: Sales Invoice,Is POS,هو POS
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +240,Packed quantity must equal quantity for Item {0} in row {1},الكمية معبأة يجب أن يساوي كمية القطعة ل {0} في {1} الصف
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +245,Packed quantity must equal quantity for Item {0} in row {1},الكمية معبأة يجب أن يساوي كمية القطعة ل {0} في {1} الصف
 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.,رفعت فواتير للعملاء.
 DocType: DocField,Default,الافتراضي
 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 +466,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},الصف لا {0}: مبلغ لا يمكن أن يكون أكبر من ريثما المبلغ من النفقات المطالبة {1}. في انتظار المبلغ {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +468,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}  مشتركين تم اضافتهم
 DocType: Maintenance Schedule,Schedule,جدول
 DocType: Cost Center,"Define Budget for this Cost Center. To set budget action, see ""Company List""",تحديد الميزانية لهذا مركز التكلفة. لمجموعة العمل الميزانية، انظر &quot;قائمة الشركات&quot;
@@ -3875,7 +3716,7 @@
 apps/erpnext/erpnext/public/js/pos/pos.js +91,Price List not found or disabled,قائمة الأسعار لم يتم العثور أو تعطيلها
 DocType: Expense Claim,Approved,وافق
 DocType: Pricing Rule,Price,السعر
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +79,Employee relieved on {0} must be set as 'Left',يجب أن يتم تعيين الموظف مرتاح على {0} ك ' اليسار '
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +88,Employee relieved on {0} must be set as 'Left',يجب أن يتم تعيين الموظف مرتاح على {0} ك ' اليسار '
 DocType: Item,"Selecting ""Yes"" will give a unique identity to each entity of this item which can be viewed in the Serial No master.",واختيار &quot;نعم&quot; يعطي هوية فريدة من نوعها لكل كيان في هذا البند والتي يمكن عرضها في المسلسل الرئيسية.
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +39,Appraisal {0} created for Employee {1} in the given date range,تقييم {0} لخلق موظف {1} في نطاق تاريخ معين
 DocType: Employee,Education,تعليم
@@ -3886,7 +3727,7 @@
 apps/frappe/frappe/desk/moduleview.py +67,Standard Reports,تقارير قياسية
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,المحاسبة إدخالات دفتر اليومية.
 DocType: Delivery Note Item,Available Qty at From Warehouse,الكمية المتوفرة في المستودعات من
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +209,Please select Employee Record first.,يرجى تحديد سجل الموظف أولا.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +224,Please select Employee Record first.,يرجى تحديد سجل الموظف أولا.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,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 +233,Please enter Expense Account,الرجاء إدخال حساب المصاريف
@@ -3899,46 +3740,43 @@
 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,سحب أوامر البيع (في انتظار لتسليم) بناء على المعايير المذكورة أعلاه
 DocType: DocShare,Document Type,نوع الوثيقة
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +565,From Supplier Quotation,من مزود اقتباس
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +588,From Supplier Quotation,من مزود اقتباس
 DocType: Deduction Type,Deduction Type,خصم نوع
 DocType: Attendance,Half Day,نصف يوم
 DocType: Pricing Rule,Min Qty,دقيقة الكمية
 DocType: Features Setup,"To track items in sales and purchase documents with batch nos. ""Preferred Industry: Chemicals""",لتعقب العناصر في المبيعات وثائق شراء مع غ دفعة واحدة. &quot;الصناعة المفضلة: كيماويات&quot;
 DocType: GL Entry,Transaction Date,تاريخ المعاملة
 DocType: Production Plan Item,Planned Qty,المخطط الكمية
-apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +91,Total Tax,مجموع الضرائب
+apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +93,Total Tax,مجموع الضرائب
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +178,For Quantity (Manufactured Qty) is mandatory,لالكمية (الكمية المصنعة) إلزامي
 DocType: Stock Entry,Default Target Warehouse,الهدف الافتراضي مستودع
 DocType: Purchase Invoice,Net Total (Company Currency),المجموع الصافي (عملة الشركة)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +79,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,الصف {0}: نوع الحزب والحزب لا ينطبق إلا على المقبوضات / حسابات المدفوعات
 DocType: Notification Control,Purchase Receipt Message,رسالة إيصال شراء
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +95,Total allocated leaves are more than period,مجموع الأوراق المخصصة لأكثر من فترة
 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.,تسجيل حركة البند.
 DocType: Newsletter List Subscriber,Newsletter List Subscriber,قائمة النشرة المشترك
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +164,Morticing,Morticing
 DocType: Email Account,Service,خدمة
 DocType: Hub Settings,Hub Settings,إعدادات المحور
 DocType: Project,Gross Margin %,هامش إجمالي٪
 DocType: BOM,With Operations,مع عمليات
 apps/erpnext/erpnext/accounts/party.py +232,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,وقد أجريت بالفعل القيود المحاسبية بالعملة {0} لشركة {1}. يرجى تحديد حساب المستحق أو تدفع بالعملة {0}.
 ,Monthly Salary Register,سجل الراتب الشهري
-apps/frappe/frappe/website/template.py +140,Next,التالي
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard_page.html +17,Next,التالي
 DocType: Warranty Claim,If different than customer address,إذا كان مختلفا عن عنوان العميل
 DocType: BOM Operation,BOM Operation,BOM عملية
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +118,Electropolishing,بالكهرباء
 DocType: Purchase Taxes and Charges,On Previous Row Amount,على المبلغ الصف السابق
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +24,Please enter Payment Amount in atleast one row,الرجاء إدخال مبلغ الدفع في أتلست صف واحد
+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 الملف الشخصي
 apps/erpnext/erpnext/config/accounts.py +153,"Seasonality for setting budgets, targets etc.",موسمية لوضع الميزانيات والأهداف الخ
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +238,Row {0}: Payment Amount cannot be greater than Outstanding Amount,صف {0}: دفع مبلغ لا يمكن أن يكون أكبر من المبلغ المستحق
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +46,Total Unpaid,عدد غير مدفوع
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +21,Time Log is not billable,دخول الوقت ليس للفوترة
 apps/erpnext/erpnext/stock/get_item_details.py +128,"Item {0} is a template, please select one of its variants",{0} البند هو قالب، يرجى اختيار واحد من مشتقاته
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +528,Purchaser,مشتر
+apps/erpnext/erpnext/public/js/setup_wizard.js +272,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 +71,Please enter the Against Vouchers manually,الرجاء إدخال ضد قسائم يدويا
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +107,Please enter the Against Vouchers manually,الرجاء إدخال ضد قسائم يدويا
 DocType: SMS Settings,Static Parameters,ثابت معلمات
 DocType: Purchase Order,Advance Paid,مسبقا المدفوعة
 DocType: Item,Item Tax,البند الضرائب
@@ -3947,14 +3785,12 @@
 apps/erpnext/erpnext/config/crm.py +48,Send mass SMS to your contacts,إرسال SMS الشامل لجهات الاتصال الخاصة بك
 DocType: Purchase Taxes and Charges,Consider Tax or Charge for,النظر في ضريبة أو رسم ل
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,الكمية الفعلية هي إلزامية
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +42,Cross-rolling,عبر المتداول
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +132,Credit Card,بطاقة إئتمان
+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 +95,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,من فضلك ادخل الضرائب والرسوم
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +85,Machining,بالقطع
 DocType: Sales Invoice Item,Drop Ship,هبوط السفينة
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children",هنا يمكنك الحفاظ على تفاصيل مثل اسم العائلة واحتلال الزوج، الوالدين والأطفال
 DocType: Hub Settings,Seller Name,البائع اسم
@@ -3964,7 +3800,7 @@
 DocType: Stock Entry,Repack,أعد حزم
 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/setup/page/setup_wizard/setup_wizard.js +500,Attach Logo,إرفاق صورة الشعار/العلامة التجارية
+apps/erpnext/erpnext/public/js/setup_wizard.js +246,Attach Logo,إرفاق صورة الشعار/العلامة التجارية
 DocType: Customer,Commission Rate,اللجنة قيم
 apps/erpnext/erpnext/stock/doctype/item/item.js +38,Make Variant,جعل البديل
 apps/erpnext/erpnext/config/hr.py +145,Block leave applications by department.,منع مغادرة الطلبات المقدمة من الإدارة.
@@ -3979,19 +3815,19 @@
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +105,Please select a csv file,يرجى تحديد ملف CSV
 DocType: Dropbox Backup,Send Backups to Dropbox,إرسال النسخ الاحتياطية لدروببوإكس
 DocType: Purchase Order,To Receive and Bill,لتلقي وبيل
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +94,Designer,مصمم
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Designer,مصمم
 apps/erpnext/erpnext/config/selling.py +121,Terms and Conditions Template,الشروط والأحكام قالب
 DocType: Serial No,Delivery Details,الدفع تفاصيل
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +383,Cost Center is required in row {0} in Taxes table for type {1},مطلوب مركز تكلفة في الصف {0} في جدول الضرائب لنوع {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +386,Cost Center is required in row {0} in Taxes table for type {1},مطلوب مركز تكلفة في الصف {0} في جدول الضرائب لنوع {1}
 DocType: Item,Automatically create Material Request if quantity falls below this level,إنشاء المواد طلب تلقائيا إذا وقعت كمية أقل من هذا المستوى
 ,Item-wise Purchase Register,البند من الحكمة الشراء تسجيل
 DocType: Batch,Expiry Date,تاريخ انتهاء الصلاحية
-apps/erpnext/erpnext/stock/doctype/item/item.py +375,"To set reorder level, item must be a Purchase Item or Manufacturing Item",لضبط مستوى إعادة الطلب، يجب أن يكون البند لشراء السلعة أو التصنيع البند
+apps/erpnext/erpnext/stock/doctype/item/item.py +379,"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.,المشروع الرئيسي.
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,لا تظهر أي رمز مثل $ الخ بجانب العملات.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +330, (Half Day),(نصف يوم)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +374, (Half Day),(نصف يوم)
 DocType: Supplier,Credit Days,الائتمان أيام
 DocType: Leave Type,Is Carry Forward,والمضي قدما
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +478,Get Items from BOM,الحصول على عناصر من BOM
@@ -3999,7 +3835,7 @@
 apps/erpnext/erpnext/config/manufacturing.py +120,Bill of Materials,فاتورة المواد
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +77,Row {0}: Party Type and Party is required for Receivable / Payable account {1},الصف {0}: مطلوب نوع الحزب وحزب المقبوضات / حسابات المدفوعات {1}
 DocType: Dropbox Backup,Send Notifications To,إرسال إشعارات إلى
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html +26,Ref Date,المرجع التسجيل
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +54,Ref Date,المرجع التسجيل
 DocType: Employee,Reason for Leaving,سبب ترك العمل
 DocType: Expense Claim Detail,Sanctioned Amount,يعاقب المبلغ
 DocType: GL Entry,Is Opening,وفتح
@@ -4007,4 +3843,3 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +188,Account {0} does not exist,حساب {0} غير موجود
 DocType: Account,Cash,نقد
 DocType: Employee,Short biography for website and other publications.,نبذة عن سيرة حياة لموقع الويب وغيرها من المطبوعات.
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +31,Please create Salary Structure for employee {0},يرجى إنشاء هيكل الرواتب ل موظف {0}
diff --git a/erpnext/translations/bg.csv b/erpnext/translations/bg.csv
index aab07ce..f629cf6 100644
--- a/erpnext/translations/bg.csv
+++ b/erpnext/translations/bg.csv
@@ -1,13 +1,12 @@
 DocType: Employee,Salary Mode,Mode Заплата
 DocType: Cost Center,"Select Monthly Distribution, if you want to track based on seasonality.","Изберете месец Distribution, ако искате да проследите различните сезони."
 DocType: Employee,Divorced,Разведен
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +86,Warning: Same item has been entered multiple times.,Внимание: една и съща позиция е въведен няколко пъти.
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +80,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,Оставя т да бъдат добавени няколко пъти в една сделка
 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/page/setup_wizard/fixtures/industry_type.py +19,Consumer Products,Потребителски продукти
+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,Моля изберете страна Type първи
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +90,Annealing,Каляване
 DocType: Item,Customer Items,Предмети на клиенти
 apps/erpnext/erpnext/accounts/doctype/account/account.py +45,Account {0}: Parent account {1} can not be a ledger,Account {0}: Родителска сметка {1} не може да бъде Главна счетоводна книга
 DocType: Item,Publish Item to hub.erpnext.com,Публикуване т да hub.erpnext.com
@@ -20,15 +19,14 @@
 DocType: About Us Settings,Website,Уебсайт
 DocType: POS Profile,Applicable for User,Приложимо за User
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +169,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Спряно производство Поръчка не може да бъде отменено, отпуши го първо да отмените"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +23,Compaction plus sintering,Уплътняване плюс синтероване
 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.,* Ще се изчисли при транзакция.
 DocType: Purchase Order,Customer Contact,Клиента Контакти
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +549,From Material Request,От Материал Искане
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +572,From Material Request,От Материал Искане
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} Дървовидно
 DocType: Job Applicant,Job Applicant,Кандидат За Работа
 apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,Не повече резултати.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +78,Legal,Правен
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +34,Legal,Правен
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +114,Actual type tax cannot be included in Item rate in row {0},Actual type tax cannot be included in Item rate in row {0} 
 DocType: C-Form,Customer,Клиент
 DocType: Purchase Receipt Item,Required By,Изисквани от
@@ -43,7 +41,6 @@
 DocType: Manufacturing Settings,Default 10 mins,По подразбиране 10 минути
 DocType: Leave Type,Leave Type Name,Оставете Тип Име
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +148,Series Updated Successfully,Series успешно обновени
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +150,Stitching,Етикетиране
 DocType: Pricing Rule,Apply On,Нанася се върху
 DocType: Item Price,Multiple Item prices.,Множество цени елемент.
 ,Purchase Order Items To Be Received,Покупка Поръчка артикули да бъдат получени
@@ -51,8 +48,8 @@
 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 +104,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Row # {0}: Курсове трябва да е същото като {1}: {2} ({3} / {4})
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +189,New Leave Application,New Оставете Application
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +134,Bank Draft,Bank Проект
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +204,New Leave Application,New Оставете Application
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +134,Bank Draft,Bank Проект
 DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,1. To maintain the customer wise item code and to make them searchable based on their code use this option 
 DocType: Mode of Payment Account,Mode of Payment Account,Начин на разплащателна сметка
 apps/erpnext/erpnext/stock/doctype/item/item.js +34,Show Variants,Покажи Варианти
@@ -64,25 +61,23 @@
 DocType: Production Plan Item,Production Plan Item,Производство Plan Точка
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +141,User {0} is already assigned to Employee {1},Потребителят {0} вече е назначен служител {1}
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +13,Make new POS Profile,Направете нов POS профил
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +31,Health Care,Грижа за здравето
+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 +494,Invoice,Фактура
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +519,Invoice,Фактура
 DocType: Maintenance Schedule Item,Periodicity,Периодичност
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +357,Email Address,Имейл Адрес
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +21,Defense,Отбрана
+apps/erpnext/erpnext/public/js/setup_wizard.js +107,Email Address,Имейл Адрес
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,Отбрана
 DocType: Company,Abbr,Съкращение
 DocType: Appraisal Goal,Score (0-5),Резултати на (0-5)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +193,Row {0}: {1} {2} does not match with {3},Row {0}: {1} {2} не съвпада с {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +67,Row # {0}:,Row # {0}:
 DocType: Delivery Note,Vehicle No,Превозно средство не
 apps/erpnext/erpnext/public/js/pos/pos.js +528,Please select Price List,Моля изберете Ценоразпис
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +162,Woodworking,Дървообработване
 DocType: Production Order Operation,Work In Progress,Незавършено производство
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +153,3D printing,3D печат
 DocType: Employee,Holiday List,Holiday Списък
 DocType: Time Log,Time Log,Време Log
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +530,Accountant,Счетоводител
+apps/erpnext/erpnext/public/js/setup_wizard.js +274,Accountant,Счетоводител
 DocType: Cost Center,Stock User,Склад за потребителя
 DocType: Company,Phone No,Телефон No
 DocType: Time Log,"Log of Activities performed by users against Tasks that can be used for tracking time, billing.","Вход на дейности, извършени от потребители срещу задачи, които могат да се използват за проследяване на времето, за фактуриране."
@@ -98,18 +93,19 @@
 DocType: Bin,Quantity Requested for Purchase,Поискани количества за покупка
 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/setup/page/setup_wizard/setup_wizard.js +626,Kg,Кг
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Kg,Кг
 apps/erpnext/erpnext/config/hr.py +48,Opening for a Job.,Откриване на работа.
 DocType: Item Attribute,Increment,Увеличение
 apps/erpnext/erpnext/public/js/stock_analytics.js +63,Select Warehouse...,Изберете Warehouse ...
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +6,Advertising,Реклама
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,Реклама
+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/doctype/sales_invoice/sales_invoice.py +389,Stock cannot be updated against Delivery Note {0},Фондова не може да бъде актуализиран срещу Бележка за доставка {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +391,Stock cannot be updated against Delivery Note {0},Фондова не може да бъде актуализиран срещу Бележка за доставка {0}
 DocType: Payment Reconciliation,Reconcile,Съгласувайте
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +30,Grocery,Хранителни стоки
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,Хранителни стоки
 DocType: Quality Inspection Reading,Reading 1,Четене 1
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Make Bank Entry,Направи Bank Влизане
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +40,Pension Funds,Пенсионни фондове
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,Пенсионни фондове
 apps/erpnext/erpnext/accounts/doctype/account/account.py +142,Warehouse is mandatory if account type is Warehouse,"Warehouse е задължително, ако типа на профила е Warehouse"
 DocType: SMS Center,All Sales Person,Всички продажби Person
 DocType: Lead,Person Name,Лице Име
@@ -131,7 +127,7 @@
 DocType: Quality Inspection,Get Specification Details,Вземи Specification Детайли
 DocType: Lead,Interested,Заинтересован
 apps/erpnext/erpnext/config/manufacturing.py +14,Bill of Material,Бил на Материал
-apps/erpnext/erpnext/public/js/stock_analytics.js +45,Opening,Отвор
+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,Copy от позиция Group
 DocType: Journal Entry,Opening Entry,Откриване Влизане
@@ -145,23 +141,22 @@
 DocType: Employee Education,Under Graduate,Под Graduate
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +22,Target On,Target On
 DocType: BOM,Total Cost,Обща Цена
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +99,Reaming,Райбероване
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +9,Activity Log:,Activity Log:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +199,Item {0} does not exist in the system or has expired,Точка {0} не съществува в системата или е с изтекъл срок
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +44,Real Estate,Недвижим имот
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +44,Real Estate,Недвижим имот
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +4,Statement of Account,Извлечение от сметка
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +41,Pharmaceuticals,Pharmaceuticals
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,Pharmaceuticals
 DocType: Expense Claim Detail,Claim Amount,Изискайте Сума
 DocType: Employee,Mr,Господин
 DocType: Custom Script,Client,Клиент
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,Доставчик Type / Доставчик
 DocType: Naming Series,Prefix,Префикс
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Consumable,Консумативи
+apps/erpnext/erpnext/public/js/setup_wizard.js +359,Consumable,Консумативи
 DocType: Upload Attendance,Import Log,Внос Log
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.js +19,Send,Изпращам
 DocType: Sales Invoice Item,Delivered By Supplier,Доставени от доставчик
 DocType: SMS Center,All Contact,Всички контакти
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +164,Annual Salary,Годишна заплата
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +164,Annual Salary,Годишна заплата
 DocType: Period Closing Voucher,Closing Fiscal Year,Приключване на финансовата година
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +69,Stock Expenses,Сток Разходи
 DocType: Newsletter,Email Sent?,Email изпратени?
@@ -169,26 +164,24 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +92,Show Time Logs,Покажи Час Logs
 DocType: Journal Entry Account,Credit in Company Currency,Credit през Company валути
 DocType: Delivery Note,Installation Status,Монтаж Status
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +115,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Прието + Отхвърлено Количество трябва да бъде равно на Получено количество за {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +118,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 +133,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 +493,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","За да включват курортна такса в ред {0} в скоростта на т, данъци в редове {1} трябва да се включат и"
+apps/erpnext/erpnext/controllers/accounts_controller.py +494,"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 +90,Settings for HR Module,Настройки за Module HR
 DocType: SMS Center,SMS Center,SMS Center
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +78,Straightening,Изправяне
 DocType: BOM Replace Tool,New BOM,New BOM
 apps/erpnext/erpnext/config/projects.py +28,Batch Time Logs for billing.,Batch Час Logs за фактуриране.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +15,Countergravity casting,Countergravity леене
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +30,Newsletter has already been sent,Newsletter вече е било изпратено
 DocType: Lead,Request Type,Заявка Type
 DocType: Leave Application,Reason,Причина
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +14,Broadcasting,Радиопредаване
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +140,Execution,Изпълнение
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +364,The first user will become the System Manager (you can change this later).,Първият потребителят ще стане мениджър System (можете да промените това по-късно).
+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/public/js/setup_wizard.js +114,The first user will become the System Manager (you can change this later).,Първият потребителят ще стане мениджър System (можете да промените това по-късно).
 apps/erpnext/erpnext/config/manufacturing.py +39,Details of the operations carried out.,Подробности за извършените операции.
 DocType: Serial No,Maintenance Status,Поддръжка Status
 apps/erpnext/erpnext/config/stock.py +263,Items and Pricing,Артикули и ценообразуване
@@ -205,7 +198,6 @@
 DocType: Pricing Rule,Discount on Price List Rate (%),Отстъпка за Ценоразпис Rate (%)
 apps/frappe/frappe/public/js/frappe/form/print.js +96,Start,Начало
 DocType: User,First Name,Първо Име
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +12,Full-mold casting,Леене в пълен мухъл
 DocType: Offer Letter,Select Terms and Conditions,Изберете Общи условия
 DocType: Production Planning Tool,Sales Orders,Продажби Поръчки
 DocType: Purchase Taxes and Charges,Valuation,Оценка
@@ -217,8 +209,7 @@
 DocType: Bank Reconciliation,Bank Account,Банкова Сметка
 DocType: Leave Type,Allow Negative Balance,Оставя отрицателен баланс
 DocType: Selling Settings,Default Territory,Default Territory
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +53,Television,Телевизия
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +138,Gashing,Gashing
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,Телевизия
 DocType: Production Order Operation,Updated via 'Time Log',Updated чрез &quot;Time Log&quot;
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +82,Account {0} does not belong to Company {1},Сметка {0} не принадлежи към Фирма {1}
 DocType: Naming Series,Series List for this Transaction,Series Списък за тази транзакция
@@ -233,14 +224,13 @@
 DocType: Leave Allocation,Add unused leaves from previous allocations,Добави неизползвани отпуски от предишни разпределения
 apps/erpnext/erpnext/controllers/recurring_document.py +206,Next Recurring {0} will be created on {1},Следваща повтарящо {0} ще бъде създаден на {1}
 DocType: Newsletter List,Total Subscribers,Общо Абонати
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +575,Contact Name,Име За Контакт
+,Contact Name,Име За Контакт
 DocType: Production Plan Item,SO Pending Qty,"Така, докато се Количество"
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Създава заплата приплъзване за посочените по-горе критерии.
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,Заявка за покупка.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +107,Double housing,Двойна жилища
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +156,Only the selected Leave Approver can submit this Leave Application,Само избраният Оставете одобряващ да подадете този отпуск Application
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +171,Only the selected Leave Approver can submit this Leave Application,Само избраният Оставете одобряващ да подадете този отпуск Application
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,Облекчаване дата трябва да е по-голяма от Дата на Присъединяване
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +172,Leaves per Year,Листата на година
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +172,Leaves per Year,Листата на година
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup > Settings > Naming Series,"Моля, задайте именуване Series за {0} чрез Setup&gt; Settings&gt; именуване Series"
 DocType: Time Log,Will be updated when batched.,"Ще бъде актуализиран, когато дозирани."
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +104,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,"Row {0}: Моля, проверете &quot;е Advance&quot; срещу Account {1}, ако това е предварително влизане."
@@ -249,25 +239,24 @@
 DocType: Item Website Specification,Item Website Specification,Позиция Website Specification
 DocType: Dropbox Backup,Dropbox Access Key,Dropbox Access Key
 DocType: Payment Tool,Reference No,Референтен номер по
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +348,Leave Blocked,Оставете Блокирани
-apps/erpnext/erpnext/stock/doctype/item/item.py +535,Item {0} has reached its end of life on {1},Точка {0} е достигнал края на своя живот на {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +392,Leave Blocked,Оставете Блокирани
+apps/erpnext/erpnext/stock/doctype/item/item.py +539,Item {0} has reached its end of life on {1},Точка {0} е достигнал края на своя живот на {1}
 apps/erpnext/erpnext/accounts/utils.py +339,Annual,Годишен
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Склад за помирение Точка
 DocType: Stock Entry,Sales Invoice No,Продажби Фактура Не
 DocType: Material Request Item,Min Order Qty,Min Поръчка Количество
 DocType: Lead,Do Not Contact,Не допирайте
 DocType: Sales Invoice,The unique id for tracking all recurring invoices. It is generated on submit.,Уникалния идентификационен код за проследяване на всички повтарящи се фактури. Той се генерира на представи.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +93,Software Developer,Разработчик На Софтуер
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +93,Software Developer,Разработчик На Софтуер
 DocType: Item,Minimum Order Qty,Минимална поръчка Количество
 DocType: Pricing Rule,Supplier Type,Доставчик Type
 DocType: Item,Publish in Hub,Публикувай в Hub
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +555,Item {0} is cancelled,Точка {0} е отменен
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +598,Material Request,Материал Искане
+apps/erpnext/erpnext/stock/doctype/item/item.py +559,Item {0} is cancelled,Точка {0} е отменен
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +607,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} не е открит в &quot;суровини Доставя&quot; маса в Поръчката {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +129,Wire brushing,Телена четка
 DocType: Employee,Relation,Връзка
 DocType: Shipping Rule,Worldwide Shipping,Worldwide Доставка
 apps/erpnext/erpnext/config/selling.py +23,Confirmed orders from Customers.,Потвърдените поръчки от клиенти.
@@ -283,12 +272,11 @@
 DocType: Supplier,Address HTML,Адрес HTML
 DocType: Lead,Mobile No.,Mobile No.
 DocType: Maintenance Schedule,Generate Schedule,Генериране Schedule
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +81,Hubbing,Hubbing
 DocType: Purchase Invoice Item,Expense Head,Expense Head
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +86,Please select Charge Type first,Моля изберете Charge Type първи
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,Последен
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +395,Max 5 characters,Max 5 символа
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +195,Select Your Language,Изберете вашия език
+apps/erpnext/erpnext/public/js/setup_wizard.js +143,Max 5 characters,Max 5 символа
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +245,Select Your Language,Изберете вашия език
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,Първият Оставете одобряващ в списъка ще бъде избран по подразбиране Оставете одобряващ
 DocType: Manufacturing Settings,"Disables creation of time logs against Production Orders.
 Operations shall not be tracked against Production Order",Забранява създаването на времеви трупи срещу производствени поръчки. Операциите не се проследяват срещу производството Поръчка
@@ -300,8 +288,6 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +34,Item {0} must be Service Item,"Точка {0} трябва да е услуга, т"
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +303,Completed Qty can not be greater than 'Qty to Manufacture',Завършен Количество не може да бъде по-голяма от &quot;Количество за производство&quot;
 DocType: DocType,Administrator,Администратор
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +136,Laser drilling,Лазерно сондиране
-DocType: Stock UOM Replace Utility,New Stock UOM,New фондова мерна единица
 DocType: Period Closing Voucher,Closing Account Head,Закриване на профила Head
 DocType: Employee,External Work History,Външно работа
 apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,Circular Референтен Error
@@ -310,18 +296,15 @@
 DocType: Lead,Industry,Промишленост
 DocType: Employee,Job Profile,Job профил
 DocType: Newsletter,Newsletter,Newsletter
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +84,Hydroforming,Хидроформинг
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +49,Necking,Милувки
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Изпращайте по имейл за създаване на автоматична Материал Искане
 DocType: Journal Entry,Multi Currency,Multi валути
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +51,Item is updated,Точка се актуализира
 DocType: Async Task,System Manager,Система на мениджъра
 DocType: Payment Reconciliation Invoice,Invoice Type,Тип Invoice
 DocType: Sales Invoice Item,Delivery Note,Фактура
 DocType: Dropbox Backup,Allow Dropbox Access,Оставя Dropbox Access
 apps/erpnext/erpnext/config/learn.py +72,Setting up Taxes,Създаване Данъци
 apps/erpnext/erpnext/accounts/utils.py +189,Payment Entry has been modified after you pulled it. Please pull it again.,"Заплащане вписване е променен, след като го извади. Моля, изтеглете го отново."
-apps/erpnext/erpnext/stock/doctype/item/item.py +343,{0} entered twice in Item Tax,{0} въведен два пъти в Данък
+apps/erpnext/erpnext/stock/doctype/item/item.py +347,{0} entered twice in Item Tax,{0} въведен два пъти в Данък
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +105,Summary for this week and pending activities,Резюме за тази седмица и предстоящи дейности
 DocType: Workstation,Rent Cost,Rent Cost
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +74,Please select month and year,"Моля, изберете месец и година"
@@ -338,23 +321,21 @@
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,"Скоростта, с която Customer валути се превръща в основна валута на клиента"
 DocType: Features Setup,"Available in BOM, Delivery Note, Purchase Invoice, Production Order, Purchase Order, Purchase Receipt, Sales Invoice, Sales Order, Stock Entry, Timesheet","Предлага се в BOM, известието за доставка, фактурата за покупка, производство поръчка за покупка, покупка разписка, фактурата за продажба, продажба Поръчка, Фондова вписване, график"
 DocType: Item Tax,Tax Rate,Данъчна Ставка
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Select Item,Изберете Точка
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +540,Select Item,Изберете Точка
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +143,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","Позиция: {0} успя партиди, не може да се примири с помощта \ фондова помирение, вместо това използвайте фондова Влизане"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +259,Purchase Invoice {0} is already submitted,Фактурата за покупка {0} вече се представя
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +262,Purchase Invoice {0} is already submitted,Фактурата за покупка {0} вече се представя
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Batch No must be same as {1} {2},Row # {0}: Batch Не трябва да е същото като {1} {2}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Convert to non-Group,Конвертиране в не-Group
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +55,Purchase Receipt must be submitted,Покупка разписка трябва да бъде представено
-DocType: Stock UOM Replace Utility,Current Stock UOM,Current Stock мерна единица
 apps/erpnext/erpnext/config/stock.py +53,Batch (lot) of an Item.,Batch (много) на дадена позиция.
 DocType: C-Form Invoice Detail,Invoice Date,Дата на фактура
 DocType: GL Entry,Debit Amount,Debit Сума
 apps/erpnext/erpnext/accounts/party.py +223,There can only be 1 Account per Company in {0} {1},Не може да има само един акаунт на тази фирма и в {0} {1}
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Your email address,Вашата електронна поща
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +194,Please see attachment,"Моля, вижте прикачения файл"
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +203,Please see attachment,"Моля, вижте прикачения файл"
 DocType: Purchase Order,% Received,% Получени
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +109,Water jet cutting,Рязане с водна струя
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +24,Setup Already Complete!!,Setup Вече Complete !!
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +20,Setup Already Complete!!,Setup Вече Complete !!
 ,Finished Goods,Готова продукция
 DocType: Delivery Note,Instructions,Инструкции
 DocType: Quality Inspection,Inspected By,Инспектирани от
@@ -369,6 +350,7 @@
 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,Обмяна На Валута
 DocType: Purchase Invoice Item,Item Name,Име на артикул
+DocType: Authorization Rule,Approving User  (above authorized value),Одобряване на потребителя (над разрешено стойност)
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Credit Balance,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","Предмети да бъдат поискани, които са &quot;на склад&quot; за това, всички складове на базата на прогнозни Количество и минимална Количество поръчка"
@@ -378,11 +360,10 @@
 ,Purchase Register,Покупка Регистрация
 DocType: Landed Cost Item,Applicable Charges,Приложимите цени
 DocType: Workstation,Consumable Cost,Консумативи Cost
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,{0} ({1}) must have role 'Leave Approver',"{0} ({1}) трябва да има роля в ""Одобряващ напускане"""
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +167,{0} ({1}) must have role 'Leave Approver',"{0} ({1}) трябва да има роля в ""Одобряващ напускане"""
 DocType: Purchase Receipt,Vehicle Date,Камион Дата
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +39,Medical,Медицински
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +39,Medical,Медицински
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,Причина за загубата
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +36,Tube beading,Tube форма на пръчки
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},"Workstation е затворен на следните дати, както на Holiday Списък: {0}"
 DocType: Employee,Single,Единичен
 DocType: Issue,Attachment,Привързаност
@@ -403,10 +384,8 @@
 DocType: Account,Is Group,Is Група
 DocType: Stock Settings,Automatically Set Serial Nos based on FIFO,Автоматично Определете серийни номера на базата на FIFO
 DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,Проверете доставчик Invoice Брой Уникалност
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +31,Thermoforming,Термоформоване
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +66,Slitting,Разрязване
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +57,'To Case No.' cannot be less than 'From Case No.',&quot;За да Case No.&quot; не може да бъде по-малко от &quot;От Case No.&quot;
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +104,Non Profit,Non Profit
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +104,Non Profit,Non Profit
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_list.js +7,Not Started,Не е започнал
 DocType: Lead,Channel Partner,Channel Partner
 DocType: Account,Old Parent,Old-майка
@@ -415,13 +394,12 @@
 apps/erpnext/erpnext/config/manufacturing.py +74,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 +512,Attribute {0} selected multiple times in Attributes Table,Умение {0} избрани няколко пъти в атрибути на маса
+apps/erpnext/erpnext/stock/doctype/item/item.py +516,Attribute {0} selected multiple times in Attributes Table,Умение {0} избрани няколко пъти в атрибути на маса
 DocType: Sales Order,Not Applicable,Не Е Приложимо
 apps/erpnext/erpnext/config/hr.py +140,Holiday master.,Holiday майстор.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +19,Shell molding,Shell корнизи
 DocType: Material Request Item,Required Date,Задължително Дата
 DocType: Delivery Note,Billing Address,Адрес На Плащане
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +644,Please enter Item Code.,"Моля, въведете Код."
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +648,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","Ако е избрано, размерът на данъка ще се считат за която вече е включена в Print Курсове / Print размер"
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,Общо Количество
@@ -431,7 +409,7 @@
 DocType: Item Attribute,To Range,Гамата
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Ценни книжа и депозити
 DocType: Features Setup,Imports,Вносът
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +144,Adhesive bonding,Лепенето
+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.,Присъствие запис.
@@ -439,26 +417,25 @@
 DocType: Sales Order Item,Used for Production Plan,Използвани за производство на План
 DocType: System Settings,Loading...,Зарежда се ...
 DocType: DocField,Password,Парола
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +155,Fused deposition modeling,Разтопен моделиране отлагане
 DocType: Manufacturing Settings,Time Between Operations (in mins),Време между операциите (в минути)
 DocType: Customer,Buyer of Goods and Services.,Купувач на стоки и услуги.
 DocType: Journal Entry,Accounts Payable,Задължения
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +24,Add Subscribers,Добави Абонати
 apps/erpnext/erpnext/public/js/feature_setup.js +220,""" does not exists",&quot;Не съществува
 DocType: Pricing Rule,Valid Upto,Валиден Upto
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +564,List a few of your customers. They could be organizations or individuals.,Списък някои от вашите клиенти. Те могат да бъдат организации или лица.
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,List a few of your customers. They could be organizations or individuals.,Списък някои от вашите клиенти. Те могат да бъдат организации или лица.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Direct Income,Direct подоходно
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +33,"Can not filter based on Account, if grouped by Account","Не може да се филтрира по Account, ако групирани по профил"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +88,Administrative Officer,Административният директор
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Administrative Officer,Административният директор
 DocType: Payment Tool,Received Or Paid,Получени или заплатени
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +318,Please select Company,Моля изберете 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 +305,Please enter Warehouse for which Material Request will be raised,"Моля, въведете Warehouse, за които ще бъдат повдигнати Материал Искане"
 DocType: Production Order,Additional Operating Cost,Допълнителна експлоатационни разходи
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +20,Cosmetics,Козметика
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,Козметика
 DocType: DocField,Type,Тип
-apps/erpnext/erpnext/stock/doctype/item/item.py +417,"To merge, following properties must be same for both items","За да се слеят, следните свойства трябва да са едни и същи и за двете позиции"
+apps/erpnext/erpnext/stock/doctype/item/item.py +421,"To merge, following properties must be same for both items","За да се слеят, следните свойства трябва да са едни и същи и за двете позиции"
 DocType: Communication,Subject,Предмет
 DocType: Shipping Rule,Net Weight,Нето Тегло
 DocType: Employee,Emergency Phone,Телефон за спешни
@@ -468,7 +445,6 @@
 DocType: Journal Entry,Difference (Dr - Cr),Разлика (Dr - Cr)
 DocType: Account,Profit and Loss,Приходите и разходите
 apps/erpnext/erpnext/config/stock.py +293,Managing Subcontracting,Управление Подизпълнители
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +58,New UOM must NOT be of type Whole Number,Нова мерна единица не трябва да се от тип цяло число
 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 +47,Account {0} does not belong to company: {1},Сметка {0} не принадлежи на фирма: {1}
@@ -487,14 +463,14 @@
 DocType: Purchase Invoice,Supplier Invoice No,Доставчик Invoice Не
 DocType: Territory,For reference,За справка
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +154,"Cannot delete Serial No {0}, as it is used in stock transactions","Не може да се изтрие Пореден № {0}, тъй като се използва в сделки с акции"
-apps/erpnext/erpnext/public/js/account_tree_grid.js +52,Closing (Cr),Закриване (Cr)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +227,Closing (Cr),Закриване (Cr)
 DocType: Serial No,Warranty Period (Days),Гаранционен период (дни)
 DocType: Installation Note Item,Installation Note Item,Монтаж Забележка Точка
 ,Pending Qty,Отложена Количество
 DocType: Job Applicant,Thread HTML,Тема HTML
 DocType: Company,Ignore,Игнорирам
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +86,SMS sent to following numbers: {0},SMS изпратен на следните номера: {0}
-apps/erpnext/erpnext/controllers/buying_controller.py +135,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Доставчик Warehouse задължително за подизпълнители Покупка Разписка
+apps/erpnext/erpnext/controllers/buying_controller.py +126,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Доставчик Warehouse задължително за подизпълнители Покупка Разписка
 DocType: Pricing Rule,Valid From,Валидна от
 DocType: Sales Invoice,Total Commission,Общо Комисия
 DocType: Pricing Rule,Sales Partner,Продажбите Partner
@@ -502,7 +478,7 @@
 DocType: Monthly Distribution,"**Monthly Distribution** helps you distribute your budget across months if you have seasonality in your business.
 
 To distribute a budget using this distribution, set this **Monthly Distribution** in the **Cost Center**","** Месечен Разпределение ** ви помага да разпространявате бюджета си през месеца, ако имате сезонност в бизнеса си. За разпределяне на бюджета, използвайки тази дистрибуция, задайте тази ** Месечен Разпределение ** в ** разходен център на **"
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +183,No records found in the Invoice table,Не са намерени в таблицата с Invoice записи
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +130,No records found in the Invoice table,Не са намерени в таблицата с Invoice записи
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +20,Please select Company and Party Type first,Моля изберете Company и Party Type първи
 apps/erpnext/erpnext/config/accounts.py +84,Financial / accounting year.,Финансови / Счетоводство година.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","Съжаляваме, серийни номера не могат да бъдат слети"
@@ -518,25 +494,25 @@
 DocType: Sales Order,Billing and Delivery Status,Billing и Delivery Status
 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/setup/page/setup_wizard/setup_wizard_page.html +16,Previous,Предишен
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard_page.html +16,Previous,Предишен
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +620,Sales Return,Продажбите Return
 DocType: Production Planning Tool,Select Sales Orders from which you want to create Production Orders.,Изберете Продажби Поръчки от която искате да създадете производствени поръчки.
 DocType: Item,Delivered by Supplier (Drop Ship),Доставени от доставчик (Drop Ship)
 apps/erpnext/erpnext/config/hr.py +120,Salary components.,Компоненти заплата.
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,База данни за потенциални клиенти.
+DocType: Authorization Rule,Customer or Item,Customer или т
 apps/erpnext/erpnext/config/crm.py +17,Customer database.,Клиентска база данни.
 DocType: Quotation,Quotation To,Офертата до
 DocType: Lead,Middle Income,Среден доход
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),Откриване (Cr)
 apps/erpnext/erpnext/accounts/utils.py +193,Allocated amount can not be negative,Отпусната сума не може да бъде отрицателна
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +123,Tumbling,Акробатика
 DocType: Purchase Order Item,Billed Amt,Таксуваната Amt
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,"Логически Склад, за които са направени стоковите разписки."
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +92,Reference No & Reference Date is required for {0},Референтен номер по &amp; Референтен Дата се изисква за {0}
 DocType: Event,Wednesday,Сряда
 DocType: Sales Invoice,Customer's Vendor,Търговец на клиента
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +214,Production Order is Mandatory,Производство на поръчката е задължително
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +139,Proposal Writing,Предложение за писане
+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,Съществува друга продажбите Person {0} със същия Employee ID
 apps/erpnext/erpnext/stock/stock_ledger.py +336,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},Negative фондова Error ({6}) за позиция {0} в Warehouse {1} на {2} {3} в {4} {5}
 DocType: Fiscal Year Company,Fiscal Year Company,Фискална година Company
@@ -559,7 +535,7 @@
 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.","Тогава към цените правилник се филтрират базирани на гостите, група клиенти, територия, доставчик, доставчик Type, Кампания, продажба Partner т.н."
 apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.py +179,Please install dropbox python module,Моля инсталирайте Dropbox Пайтън модул
 DocType: Employee,Passport Number,Номер на паспорт
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +82,Manager,Мениджър
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Manager,Мениджър
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +494,From Purchase Receipt,От Покупка Разписка
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +219,Same item has been entered multiple times.,Същата позиция е влязъл няколко пъти.
 DocType: SMS Settings,Receiver Parameter,Приемник на параметъра
@@ -567,10 +543,9 @@
 DocType: Sales Person,Sales Person Targets,Търговец Цели
 apps/frappe/frappe/public/js/frappe/form/workflow.js +116,To,Към
 apps/frappe/frappe/templates/base.html +145,Please enter email address,"Моля, въведете имейл адреса си"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +35,End tube forming,"Край тръба, образуваща"
 DocType: Production Order Operation,In minutes,В минути
 DocType: Issue,Resolution Date,Резолюция Дата
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +635,Please set default Cash or Bank account in Mode of Payment {0},"Моля, задайте по подразбиране брой или банкова сметка в начинът на плащане {0}"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +637,Please set default Cash or Bank account in Mode of Payment {0},"Моля, задайте по подразбиране брой или банкова сметка в начинът на плащане {0}"
 DocType: Selling Settings,Customer Naming By,Задаване на име на клиента от
 apps/erpnext/erpnext/accounts/doctype/account/account.js +67,Convert to Group,Конвертиране в Група
 DocType: Activity Cost,Activity Type,Вид Дейност
@@ -578,12 +553,12 @@
 DocType: Customer,Fixed Days,Фиксирани Days
 DocType: Sales Invoice,Packing List,Опаковъчен Лист
 apps/erpnext/erpnext/config/buying.py +28,Purchase Orders given to Suppliers.,Поръчки дадени доставчици.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +43,Publishing,Издаване
+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 +198,{0}: {1} not found in Invoice Details table,{0}: {1} не е намерен в Таблица Фактури
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,{0}: {1} not found in Invoice Details table,{0}: {1} не е намерен в Таблица Фактури
 DocType: Company,Round Off Cost Center,Завършете Cost Center
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +208,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Поддръжка посещение {0} трябва да се отмени преди анулирането този Продажби Поръчка
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +203,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Поддръжка посещение {0} трябва да се отмени преди анулирането този Продажби Поръчка
 DocType: Material Request,Material Transfer,Материал 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}
@@ -595,7 +570,6 @@
 DocType: Pricing Rule,Sales Manager,Мениджър Продажби
 apps/frappe/frappe/public/js/frappe/model/model.js +492,Rename,Преименувам
 DocType: Journal Entry,Write Off Amount,Отпишат Сума
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +52,Bending,Огъване
 apps/frappe/frappe/core/page/user_permissions/user_permissions.js +246,Allow User,Позволи на потребителя
 DocType: Journal Entry,Bill No,Бил Не
 DocType: Purchase Invoice,Quarterly,Тримесечно
@@ -605,17 +579,16 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Please enter item details,"Моля, въведете данните т"
 DocType: Purchase Receipt,Other Details,Други детайли
 DocType: Account,Accounts,Профили
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +67,Marketing,Маркетинг
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +65,Straight shearing,Прав срязване
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +67,Marketing,Маркетинг
 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,Current Stock
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +99,Rejected Warehouse is mandatory against regected item,Отхвърлени Warehouse е задължително срещу regected т
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +102,Rejected Warehouse is mandatory against regected item,Отхвърлени Warehouse е задължително срещу regected т
 DocType: Account,Expenses Included In Valuation,"Разходи, включени в остойностяване"
 DocType: Employee,Provide email id registered in company,Осигуряване на имейл ID регистриран в компания
 DocType: Hub Settings,Seller City,Продавач City
 DocType: Email Digest,Next email will be sent on:,Следваща ще бъде изпратен имейл на:
 DocType: Offer Letter Term,Offer Letter Term,Оферта Писмо Term
-apps/erpnext/erpnext/stock/doctype/item/item.py +492,Item has variants.,Точка има варианти.
+apps/erpnext/erpnext/stock/doctype/item/item.py +496,Item has variants.,Точка има варианти.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Точка {0} не е намерен
 DocType: Bin,Stock Value,Стойността на акциите
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,Tree Type
@@ -624,10 +597,9 @@
 DocType: Material Request Item,Quantity and Warehouse,Количество и Warehouse
 DocType: Sales Invoice,Commission Rate (%),Курсове на Комисията (%)
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +172,"Against Voucher Type must be one of Sales Order, Sales Invoice or Journal Entry","Срещу Ваучер тип трябва да е един от продажби Поръчка, продажба на фактура или вестник Влизане"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +139,Biomachining,Biomachining
 apps/erpnext/erpnext/setup/utils.py +89,Unable to find exchange rate,Не може да се намери на валутния курс
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +7,Aerospace,Космически
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +19,Welcome,Добре дошъл
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +7,Aerospace,Космически
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +40,Welcome,Добре дошъл
 DocType: Journal Entry,Credit Card Entry,Credit Card Влизане
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +18,Task Subject,Task Относно
 apps/erpnext/erpnext/config/stock.py +33,Goods received from Suppliers.,Получените стоки от доставчици.
@@ -650,19 +622,19 @@
 DocType: Employee,Cell Number,Броя на клетките
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Загубен
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +120,You can not enter current voucher in 'Against Journal Entry' column,Вие не можете да въведете текущата ваучер &quot;Срещу вестник Entry&quot; колона
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +25,Energy,Енергия
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,Енергия
 DocType: Opportunity,Opportunity From,Opportunity От
 apps/erpnext/erpnext/config/hr.py +33,Monthly salary statement.,Месечно извлечение заплата.
 DocType: Item Group,Website Specifications,Сайт Спецификации
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +205,New Account,New Account
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +21,{0}: From {0} of type {1},{0}: От {0} от вид {1}
-apps/erpnext/erpnext/controllers/buying_controller.py +283,Row {0}: Conversion Factor is mandatory,Row {0}: Превръщане Factor е задължително
+apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,Row {0}: Превръщане Factor е задължително
 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.,Accounting Entries can be made against leaf nodes. Entries against Groups are not allowed. 
 DocType: ToDo,High,Високо
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +361,Cannot deactivate or cancel BOM as it is linked with other BOMs,Не може да деактивирате или да отмени BOM тъй като тя е свързана с други спецификации на материали
 DocType: Opportunity,Maintenance,Поддръжка
 DocType: User,Male,Мъжки
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +182,Purchase Receipt number required for Item {0},"Покупка Квитанция брой, необходим за т {0}"
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +183,Purchase Receipt number required for Item {0},"Покупка Квитанция брой, необходим за т {0}"
 DocType: Item Attribute Value,Item Attribute Value,Позиция атрибута Value
 apps/erpnext/erpnext/config/crm.py +64,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.
@@ -691,10 +663,9 @@
 DocType: Address,Personal,Персонален
 DocType: Expense Claim Detail,Expense Claim Type,Expense претенция Type
 DocType: Shopping Cart Settings,Default settings for Shopping Cart,Настройките по подразбиране за количката
-apps/erpnext/erpnext/controllers/accounts_controller.py +324,"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/page/setup_wizard/fixtures/industry_type.py +13,Biotechnology,Biotechnology
+apps/erpnext/erpnext/controllers/accounts_controller.py +325,"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,Biotechnology
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Office Maintenance Expenses,Office Поддръжка Разходи
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +53,Hemming,Хеминг
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +66,Please enter Item first,"Моля, въведете Точка първа"
 DocType: Account,Liability,Отговорност
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +62,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Санкционирани сума не може да бъде по-голяма от претенция Сума в Row {0}.
@@ -707,10 +678,10 @@
 DocType: Company,Default Bank Account,Default Bank Account
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +47,"To filter based on Party, select Party Type first","За да филтрирате базирани на партия, изберете страна Напишете първия"
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},"""Обнови Наличност"" не може да е маркирана, защото артикулите, не са доставени чрез {0}"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Nos,Nos
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Nos,Nos
 DocType: Item,Items with higher weightage will be shown higher,Предмети с висше weightage ще бъдат показани по-високи
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,"Банково извлечение, Подробности"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +627,My Invoices,Моят Фактури
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +629,My Invoices,Моят Фактури
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,Няма намерен служител
 DocType: Purchase Order,Stopped,Спряно
 DocType: Item,If subcontracted to a vendor,Ако възложи на продавача
@@ -729,35 +700,33 @@
 DocType: Features Setup,"To enable ""Point of Sale"" features",За да се даде възможност на &quot;точка на продажба&quot; функции
 DocType: Bin,Moving Average Rate,Moving Average Курсове
 DocType: Production Planning Tool,Select Items,Изберете артикули
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,{0} against Bill {1} dated {2},{0} срещу Сметка {1} ​​от {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +328,{0} against Bill {1} dated {2},{0} срещу Сметка {1} ​​от {2}
 DocType: Comment,Reference Name,Референтен номер Име
 DocType: Maintenance Visit,Completion Status,Завършване Status
 DocType: Sales Invoice Item,Target Warehouse,Target Warehouse
 DocType: Item,Allow over delivery or receipt upto this percent,Оставя се в продължение на доставка или получаване до запълването този процент
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +49,Expected Delivery Date cannot be before Sales Order Date,Очаквана дата на доставка не може да бъде преди Продажби Поръчка Дата
 DocType: Upload Attendance,Import Attendance,Внос Присъствие
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +17,All Item Groups,Всички стокови групи
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +17,All Item Groups,Всички стокови групи
 DocType: Process Payroll,Activity Log,Activity Log 
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +30,Net Profit / Loss,Нетна печалба / загуба
 apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,Автоматично композира съобщение при представяне на сделките.
 DocType: Production Order,Item To Manufacture,Точка за производство
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +16,Permanent mold casting,Постоянен леярска форма
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} статут е {2}
 apps/erpnext/erpnext/config/learn.py +172,Purchase Order to Payment,Поръчка за покупка на плащане
 DocType: Sales Order Item,Projected Qty,Прогнозно Количество
 DocType: Sales Invoice,Payment Due Date,Дължимото плащане Дата
 DocType: Newsletter,Newsletter Manager,Newsletter мениджъра
-apps/erpnext/erpnext/stock/doctype/item/item.js +229,Item Variant {0} already exists with same attributes,Позиция Variant {0} вече съществува с едни и същи атрибути
+apps/erpnext/erpnext/stock/doctype/item/item.js +231,Item Variant {0} already exists with same attributes,Позиция Variant {0} вече съществува с едни и същи атрибути
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening',"""Начален балнс"""
 DocType: Notification Control,Delivery Note Message,Бележка за доставка на ЛС
 DocType: Expense Claim,Expenses,Разходи
 DocType: Item Variant Attribute,Item Variant Attribute,Позиция Variant Умение
 ,Purchase Receipt Trends,Покупка Квитанция Trends
 DocType: Appraisal,Select template from which you want to get the Goals,"Изберете шаблон, от който искате да получите най-Целите"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +77,Research & Development,Research &amp; развитие
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Research & Development,Research &amp; развитие
 ,Amount to Bill,Сума за Bill
 DocType: Company,Registration Details,Регистрация Детайли
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +75,Staking,Залагане
 DocType: Item,Re-Order Qty,Re-Поръчка Количество
 DocType: Leave Block List Date,Leave Block List Date,Оставете Block List Дата
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +25,Scheduled to send to {0},Планирана да изпрати на {0}
@@ -768,18 +737,16 @@
 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/hr/doctype/leave_allocation/leave_allocation.py +71,Cannot carry forward {0},Не може да се пренесе {0}
 apps/erpnext/erpnext/accounts/doctype/account/account.py +91,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","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,Expense искането се отхвърля Message
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +145,Nailing,Превъзходен
 ,Available Qty,В наличност Количество
 DocType: Purchase Taxes and Charges,On Previous Row Total,На предишния ред Total
 DocType: Salary Slip,Working Days,Работни дни
 DocType: Serial No,Incoming Rate,Постъпили Курсове
 DocType: Packing Slip,Gross Weight,Брутно Тегло
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +410,The name of your company for which you are setting up this system.,"Името на Вашата фирма, за която искате да създадете тази система."
+apps/erpnext/erpnext/public/js/setup_wizard.js +158,The name of your company for which you are setting up this system.,"Името на Вашата фирма, за която искате да създадете тази система."
 DocType: HR Settings,Include holidays in Total no. of Working Days,Включи празници общо на не. на работните дни
 DocType: Job Applicant,Hold,Държа
 DocType: Employee,Date of Joining,Дата на Присъединяване
@@ -789,7 +756,6 @@
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +3,View Subscribers,Вижте Абонати
 DocType: Purchase Invoice Item,Purchase Receipt,Покупка Разписка
 ,Received Items To Be Billed,"Приети артикули, които се таксуват"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +114,Abrasive blasting,Abrasive blasting
 DocType: Employee,Ms,Госпожица
 apps/erpnext/erpnext/config/accounts.py +148,Currency exchange rate master.,Валута на валутния курс майстор.
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +253,Unable to find Time Slot in the next {0} days for Operation {1},Не може да се намери време слот за следващия {0} ден за операция {1}
@@ -801,7 +767,7 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +209,Serial No {0} does not belong to Item {1},Пореден № {0} не принадлежи на т {1}
 DocType: Purchase Receipt Item Supplied,Required Qty,Необходим Количество
 DocType: Bank Reconciliation,Total Amount,Обща Сума
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +32,Internet Publishing,Internet Publishing
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,Internet Publishing
 DocType: Production Planning Tool,Production Orders,Производствени поръчки
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +35,Balance Value,Балансова стойност
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,Продажби Ценоразпис
@@ -812,7 +778,7 @@
 DocType: Supplier,Default Payable Accounts,По подразбиране Платими сметки
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,Служител {0} не е активен или не съществува
 DocType: Features Setup,Item Barcode,Позиция Barcode
-apps/erpnext/erpnext/stock/doctype/item/item.py +487,Item Variants {0} updated,Позиция Варианти {0} актуализиран
+apps/erpnext/erpnext/stock/doctype/item/item.py +491,Item Variants {0} updated,Позиция Варианти {0} актуализиран
 DocType: Quality Inspection Reading,Reading 6,Четене 6
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Фактурата за покупка Advance
 DocType: Address,Shop,Магазин
@@ -821,7 +787,7 @@
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,"Default Bank / Cash сметка ще се актуализира автоматично в POS Invoice, когато е избран този режим."
 DocType: Employee,Permanent Address Is,Постоянен адрес е
 DocType: Production Order Operation,Operation completed for how many finished goods?,Операция попълва за колко готова продукция?
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +491,The Brand,Марката
+apps/erpnext/erpnext/public/js/setup_wizard.js +237,The Brand,Марката
 apps/erpnext/erpnext/controllers/status_updater.py +163,Allowance for over-{0} crossed for Item {1}.,Помощи за свръх {0} прекоси за позиция {1}.
 DocType: Employee,Exit Interview Details,Exit Интервю Детайли
 DocType: Item,Is Purchase Item,Дали Покупка Точка
@@ -841,16 +807,16 @@
 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,Определете сумата на плащането = непогасения размер
 DocType: Contact Us Settings,Address Line 1,Адрес Line 1
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Variance,Вариране
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +392,Company Name,Име На Фирмата
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +53,Variance,Вариране
+,Company Name,Име На Фирмата
 DocType: SMS Center,Total Message(s),Общо Message (и)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +515,Select Item for Transfer,Изберете точката за прехвърляне
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +538,Select Item for Transfer,Изберете точката за прехвърляне
 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.,"Изберете акаунт шеф на банката, в която е депозирана проверка."
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,Позволи на потребителя да редактира Ценоразпис Курсове по сделки
 DocType: Pricing Rule,Max Qty,Max Количество
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +106,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,"Row {0}: Плащането срещу Продажби / Поръчката трябва винаги да бъде маркиран, като предварително"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +16,Chemical,Химически
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,Химически
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +693,All items have already been transferred for this Production Order.,Всички предмети са били прехвърлени вече за тази производствена поръчка.
 DocType: Process Payroll,Select Payroll Year and Month,Изберете Payroll година и месец
 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""",Отидете на подходящата група (обикновено Прилагане на фондове&gt; Текущи активи&gt; Банкови сметки и да създадете нов акаунт (като кликнете върху Добавяне на детето) от тип &quot;Bank&quot;
@@ -861,12 +827,12 @@
 DocType: Item,Inspection Criteria,Критериите за инспекция
 apps/erpnext/erpnext/config/accounts.py +101,Tree of finanial Cost Centers.,Дърво на finanial разходни центрове.
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,Прехвърлят
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +492,Upload your letter head and logo. (you can edit them later).,Качете вашето писмо главата и лого. (Можете да ги редактирате по-късно).
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +156,White,Бял
+apps/erpnext/erpnext/public/js/setup_wizard.js +238,Upload your letter head and logo. (you can edit them later).,Качете вашето писмо главата и лого. (Можете да ги редактирате по-късно).
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,White,Бял
 DocType: SMS Center,All Lead (Open),All Lead (Open)
 DocType: Purchase Invoice,Get Advances Paid,Вземи платени аванси
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +362,Attach Your Picture,Прикрепете вашата снимка
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Make ,Правя
+apps/erpnext/erpnext/public/js/setup_wizard.js +112,Attach Your Picture,Прикрепете вашата снимка
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +540,Make ,Правя
 DocType: Journal Entry,Total Amount in Words,Обща сума в Думи
 DocType: Workflow State,Stop,Спри
 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 ако проблемът не бъде отстранен."
@@ -875,14 +841,13 @@
 DocType: Lead,Next Contact Date,Следваща Свържи Дата
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,Откриване Количество
 DocType: Holiday List,Holiday List Name,Holiday Списък име
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +168,Stock Options,Сток Options
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +168,Stock Options,Сток Options
 DocType: Journal Entry Account,Expense Claim,Expense претенция
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +181,Qty for {0},Количество за {0}
 DocType: Leave Application,Leave Application,Оставете Application
 apps/erpnext/erpnext/config/hr.py +77,Leave Allocation Tool,Оставете Tool Разпределение
 DocType: Leave Block List,Leave Block List Dates,Оставете Block Списък Дати
 DocType: Company,If Monthly Budget Exceeded (for expense account),Ако Месечен Бюджет Превишена (за сметка сметка)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +56,Trimming,Подстригване
 DocType: Workstation,Net Hour Rate,Net Hour Курсове
 DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,Кацнал на разхода за закупуване Разписка
 DocType: Company,Default Terms,По подразбиране Условия
@@ -890,10 +855,9 @@
 DocType: POS Profile,Cash/Bank Account,Cash / Bank Account
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,Removed items with no change in quantity or value.,Премахнати артикули с никаква промяна в количеството или стойността.
 DocType: Delivery Note,Delivery To,Доставка до
-apps/erpnext/erpnext/stock/doctype/item/item.py +509,Attribute table is mandatory,Умение маса е задължително
+apps/erpnext/erpnext/stock/doctype/item/item.py +513,Attribute table is mandatory,Умение маса е задължително
 DocType: Production Planning Tool,Get Sales Orders,Вземи Продажби Поръчки
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} не може да бъде отрицателна
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +103,Filing,Регистриране
 apps/erpnext/erpnext/templates/form_grid/item_grid.html +72,Discount,Отстъпка
 DocType: Features Setup,Purchase Discounts,Изкупните Отстъпки
 DocType: Workstation,Wages,Заплати
@@ -910,6 +874,7 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +112,You are the Expense Approver for this record. Please Update the 'Status' and Save,Вие сте за сметка одобряващ за този запис. Моля Актуализирайте &quot;Състояние&quot; и спести
 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 +136,"Attributes for Item Variants. e.g Size, Color etc.","Атрибути за т варианти. например размер, цвят и т.н."
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +39,WIP Warehouse,WIP Warehouse
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +194,Serial No {0} is under maintenance contract upto {1},Пореден № {0} е по силата на договор за техническо обслужване до запълването {1}
@@ -918,7 +883,7 @@
 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,Т трябва да се добавят с помощта на &quot;получават от покупка Приходи&quot; бутона
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,Продажби Разходи
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Buying,Standard Изкупуването
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +120,Standard Buying,Standard Изкупуването
 DocType: GL Entry,Against,Срещу
 DocType: Item,Default Selling Cost Center,Default Selling Cost Center
 DocType: Sales Partner,Implementation Partner,Партньор за изпълнение
@@ -939,29 +904,29 @@
 DocType: Time Log Batch,updated via Time Logs,актуализиран чрез Час 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/setup/page/setup_wizard/setup_wizard.js +588,List a few of your suppliers. They could be organizations or individuals.,Списък някои от вашите доставчици. Те могат да бъдат организации или лица.
+apps/erpnext/erpnext/public/js/setup_wizard.js +326,List a few of your suppliers. They could be organizations or individuals.,Списък някои от вашите доставчици. Те могат да бъдат организации или лица.
 DocType: Company,Default Currency,Default валути
 DocType: Contact,Enter designation of this Contact,Въведете наименование за този контакт
 DocType: Contact Us Settings,Address,Адрес
 DocType: Expense Claim,From Employee,От Employee
-apps/erpnext/erpnext/controllers/accounts_controller.py +338,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,"Внимание: Системата няма да се покажат некоректно, тъй като сума за позиция {0} в {1} е нула"
+apps/erpnext/erpnext/controllers/accounts_controller.py +339,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,Ключова област на ефективността
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +54,Transportation,Транспорт
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +54,Transportation,Транспорт
 apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +67, and year: ,и година:
 DocType: Email Digest,Annual Expense,Годишен Expense
 DocType: SMS Center,Total Characters,Общо Герои
-apps/erpnext/erpnext/controllers/buying_controller.py +139,Please select BOM in BOM field for Item {0},Моля изберете BOM BOM в полето за позиция {0}
+apps/erpnext/erpnext/controllers/buying_controller.py +130,Please select BOM in BOM field for Item {0},Моля изберете BOM BOM в полето за позиция {0}
 DocType: C-Form Invoice Detail,C-Form Invoice Detail,Подробности C-Form Invoice
 DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,Заплащане помирение Invoice
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +32,Contribution %,Принос%
 DocType: Item,website page link,Сайт Страница връзка
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +192,Let's prepare the system for first use.,Нека да се подготви системата за първа употреба.
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +242,Let's prepare the system for first use.,Нека да се подготви системата за първа употреба.
 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 +214,Production Order {0} must be cancelled before cancelling this Sales Order,Производство Поръчка {0} трябва да се отмени преди анулира тази поръчка за продажба
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +209,Production Order {0} must be cancelled before cancelling this Sales Order,Производство Поръчка {0} трябва да се отмени преди анулира тази поръчка за продажба
 ,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,От 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.,Изберете Час Logs и подадем да създадете нов фактурата за продажба.
@@ -981,14 +946,13 @@
 DocType: Sales Invoice Advance,Sales Invoice Advance,Фактурата за продажба Advance
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +398,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/page/setup_wizard/install_fixtures.py +75,Management,Управление
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +75,Management,Управление
 apps/erpnext/erpnext/config/projects.py +33,Types of activities for Time Sheets,Видове дейности за времето Sheets
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +14,Investment casting,Леене на инвестициите
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +51,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""","Това ще бъде приложена към Кодекса Точка на варианта. Например, ако вашият съкращението е &quot;SM&quot;, а кодът на елемент е &quot;ТЕНИСКА&quot;, кодът позиция на варианта ще бъде &quot;ТЕНИСКА-SM&quot;"
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,Net Pay (словом) ще бъде видим след като спаси квитанцията за заплата.
 apps/frappe/frappe/core/doctype/user/user_list.js +12,Active,Активен
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +154,Blue,Син
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +154,Blue,Син
 DocType: Purchase Invoice,Is Return,Дали Return
 DocType: Price List Country,Price List Country,Ценоразпис Country
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +123,Further nodes can be only created under 'Group' type nodes,Допълнителни възли могат да се създават само при тип възли &quot;група&quot;
@@ -998,18 +962,16 @@
 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,Мерна единица реализациите Factor
 DocType: Stock Settings,Default Item Group,По подразбиране Елемент Group
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +156,Laminated object manufacturing,Ламиниран производствения обект
 apps/erpnext/erpnext/config/buying.py +13,Supplier database.,Доставчик на база данни.
 DocType: Account,Balance Sheet,Баланс
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +561,Cost Center For Item with Item Code ',Разходен център за позиция с Код &quot;
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +45,Stretch forming,Stretch формиране
 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 +210,"Further accounts can be made under Groups, but entries can be made against non-Groups","Допълнителни сметки могат да бъдат направени по групи, но записи могат да бъдат направени по отношение на не-групи"
 apps/erpnext/erpnext/config/hr.py +125,Tax and other salary deductions.,Данъчни и други облекчения за заплати.
 DocType: Lead,Lead,Lead
 DocType: Email Digest,Payables,Задължения
 DocType: Account,Warehouse,Warehouse
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +90,Row #{0}: Rejected Qty can not be entered in Purchase Return,Row # {0}: отхвърля Количество не могат да бъдат вписани в Покупка Return
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +93,Row #{0}: Rejected Qty can not be entered in Purchase Return,Row # {0}: отхвърля Количество не могат да бъдат вписани в Покупка Return
 ,Purchase Order Items To Be Billed,"Покупка Поръчка артикули, които се таксуват"
 DocType: Purchase Invoice Item,Net Rate,Нетен коефициент
 DocType: Purchase Invoice Item,Purchase Invoice Item,"Фактурата за покупка, т"
@@ -1024,13 +986,13 @@
 DocType: Global Defaults,Current Fiscal Year,Текущата фискална година
 DocType: Global Defaults,Disable Rounded Total,Забранете Rounded Общо
 DocType: Lead,Call,Повикване
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +384,'Entries' cannot be empty,&quot;Записи&quot; не могат да бъдат празни
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +386,'Entries' cannot be empty,&quot;Записи&quot; не могат да бъдат празни
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},Duplicate ред {0} със същия {1}
 ,Trial Balance,Оборотна ведомост
 apps/erpnext/erpnext/config/hr.py +205,Setting up Employees,Създаване Служители
 apps/erpnext/erpnext/public/js/feature_setup.js +220,"Grid """,Grid &quot;
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +150,Please select prefix first,Моля изберете префикс първа
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +138,Research,Проучване
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +138,Research,Проучване
 DocType: Maintenance Visit Purpose,Work Done,"Работата, извършена"
 apps/erpnext/erpnext/controllers/item_variant.py +25,Please specify at least one attribute in the Attributes table,"Моля, посочете поне един атрибут в таблицата с атрибути"
 DocType: Contact,User ID,User ID
@@ -1038,10 +1000,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +57,View Ledger,Виж Ledger
 DocType: File,Lft,Lft
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Най-ранната
-apps/erpnext/erpnext/stock/doctype/item/item.py +394,"An Item Group exists with same name, please change the item name or rename the item group","Артикул Group съществува със същото име, моля да промените името на елемент или преименувате група т"
+apps/erpnext/erpnext/stock/doctype/item/item.py +398,"An Item Group exists with same name, please change the item name or rename the item group","Артикул Group съществува със същото име, моля да промените името на елемент или преименувате група т"
 DocType: Communication,Delivery Status,Delivery Status
 DocType: Production Order,Manufacture against Sales Order,Производство срещу Продажби Поръчка
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +517,Rest Of The World,Останалата част от света
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +455,Rest Of The World,Останалата част от света
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,Продуктът {0} не може да има Batch
 ,Budget Variance Report,Бюджет Вариацията Доклад
 DocType: Salary Slip,Gross Pay,Брутно възнаграждение
@@ -1052,13 +1014,11 @@
 DocType: BOM Item,Item Description,Елемент Описание
 DocType: Payment Tool,Payment Mode,Режимът на плащане
 DocType: Purchase Invoice,Is Recurring,Дали повтарящо
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +154,Direct metal laser sintering,Direct метал лазерно синтероване
 DocType: Purchase Order,Supplied Items,Аксесоарита
 DocType: Production Order,Qty To Manufacture,Количество за производство
 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,Временно Откриване
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +41,Cryorolling,Cryorolling
 ,Employee Leave Balance,Служител Оставете Balance
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +128,Balance for Account {0} must always be {1},Везни за Account {0} винаги трябва да е {1}
 DocType: Address,Address Type,Вид Адрес
@@ -1074,23 +1034,23 @@
 DocType: Journal Entry,Get Outstanding Invoices,Вземи неплатените фактури
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,Продажбите Поръчка {0} не е валидна
 apps/erpnext/erpnext/setup/doctype/company/company.py +172,"Sorry, companies cannot be merged","Съжаляваме, компаниите не могат да бъдат слети"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +145,Small,Малък
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Small,Малък
 DocType: Employee,Employee Number,Брой на служителите
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},Дело Номер (а) вече са в употреба. Опитайте от Case Не {0}
 ,Invoiced Amount (Exculsive Tax),Сума по фактура (Изключителен Tax)
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,Позиция 2
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +59,Account head {0} created,Главна Сметка {0} е създадена
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +153,Green,Зелен
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Green,Зелен
 DocType: Item,Auto re-order,Авто повторна поръчка
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +57,Total Achieved,Общо Постигнати
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +59,Total Achieved,Общо Постигнати
 DocType: Employee,Place of Issue,Място на издаване
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +59,Contract,Договор
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Contract,Договор
 DocType: Report,Disabled,За хора с увреждания
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +490,UOM coversion factor required for UOM: {0} in Item: {1},Мерна единица фактор coversion изисква за мерна единица: {0} в продукт: {1}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +83,Indirect Expenses,Непреките разходи
 apps/erpnext/erpnext/controllers/selling_controller.py +163,Row {0}: Qty is mandatory,Row {0}: Кол е задължително
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +8,Agriculture,Земеделие
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +611,Your Products or Services,Вашите продукти или услуги
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,Земеделие
+apps/erpnext/erpnext/public/js/setup_wizard.js +347,Your Products or Services,Вашите продукти или услуги
 DocType: Mode of Payment,Mode of Payment,Начин на плащане
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,Това е главната позиция група и не може да се редактира.
 DocType: Journal Entry Account,Purchase Order,Поръчка
@@ -1102,7 +1062,7 @@
 DocType: Serial No,Serial No Details,Пореден № Детайли
 DocType: Purchase Invoice Item,Item Tax Rate,Позиция данъчна ставка
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +113,"For {0}, only credit accounts can be linked against another debit entry","За {0}, само кредитни сметки могат да бъдат свързани с друг запис дебитна"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Delivery Note {0} is not submitted,Бележка за доставка {0} не е подадена
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +470,Delivery Note {0} is not submitted,Бележка за доставка {0} не е подадена
 apps/erpnext/erpnext/stock/get_item_details.py +136,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.","Ценообразуване правило е първият избран на базата на &quot;Нанесете върху&quot; област, която може да бъде т, т Group или търговска марка."
@@ -1112,7 +1072,7 @@
 DocType: Appraisal Goal,Goal,Гол
 DocType: Sales Invoice Item,Edit Description,Edit Описание
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +318,Expected Delivery Date is lesser than Planned Start Date.,Очаквана дата на доставка е по-малка от планираното Начална дата.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +579,For Supplier,За доставчик
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +602,For Supplier,За доставчик
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,Задаване типа на профила ви помага при избора на този профил в сделките.
 DocType: Purchase Invoice,Grand Total (Company Currency),Grand Total (Company валути)
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,Общо Outgoing
@@ -1138,10 +1098,10 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +74,"Total {0} for all items is zero, may you should change 'Distribute Charges Based On'","Общо {0} за всички позиции е равна на нула, може да трябва да се промени &quot;Разпределете такси на базата на&quot;"
 DocType: Purchase Invoice,Taxes and Charges Calculation,Данъци и такси Изчисление
 DocType: BOM Operation,Workstation,Workstation
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +112,Hardware,Железария
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +112,Hardware,Железария
 DocType: Attendance,HR Manager,HR мениджъра
 apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,Моля изберете Company
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +50,Privilege Leave,Privilege отпуск
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +50,Privilege Leave,Privilege отпуск
 DocType: Purchase Invoice,Supplier Invoice Date,Доставчик Дата Invoice
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +79,You need to enable Shopping Cart,Трябва да се даде възможност на количката
 apps/frappe/frappe/public/js/frappe/form/grid_body.html +6,No Data,Няма Данни
@@ -1154,7 +1114,7 @@
 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 +168,Against Journal Entry {0} is already adjusted against some other voucher,Against Journal Entry {0} is already adjusted against some other voucher 
 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/setup/page/setup_wizard/install_fixtures.py +38,Food,Храна
+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,Застаряването на населението Range 3
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +139,You can make a time log only against a submitted production order,Можете да направите дневник време само срещу представена производствена поръчка
 DocType: Maintenance Schedule Item,No of Visits,Не на Посещения
@@ -1174,6 +1134,7 @@
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,View Offer Letter,Вижте предложението Letter
 DocType: Communication,Communication,Общуване
 DocType: Item,Is Service Item,Дали Service Точка
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +81,Application period cannot be outside leave allocation period,Срок за кандидатстване не може да бъде извън отпуск период на разпределение
 DocType: Activity Cost,Projects,Проекти
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +31,Please select Fiscal Year,Моля изберете фискална година
 apps/erpnext/erpnext/controllers/buying_controller.py +23,From {0} | {1} {2},От {0} | {1} {2}
@@ -1192,7 +1153,7 @@
 DocType: Item,Maintain Stock,Поддържайте Фондова
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +213,Stock Entries already created for Production Order ,Вписване в запасите вече създадени за производствена поръчка
 DocType: Leave Control Panel,Leave blank if considered for all designations,"Оставете празно, ако считат за всички наименования"
-apps/erpnext/erpnext/controllers/accounts_controller.py +499,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Charge от тип &quot;Край&quot; в ред {0} не могат да бъдат включени в т Курсове
+apps/erpnext/erpnext/controllers/accounts_controller.py +500,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Charge от тип &quot;Край&quot; в ред {0} не могат да бъдат включени в т Курсове
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,Max: {0},Max: {0}
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +16,From Datetime,От за дата
 DocType: Email Digest,For Company,За Company
@@ -1202,7 +1163,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +50,Chart of Accounts,Сметкоплан
 DocType: Material Request,Terms and Conditions Content,Условия Content
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +471,cannot be greater than 100,не може да бъде по-голяма от 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +546,Item {0} is not a stock Item,"Точка {0} не е в наличност, т"
+apps/erpnext/erpnext/stock/doctype/item/item.py +550,Item {0} is not a stock Item,"Точка {0} не е в наличност, т"
 DocType: Maintenance Visit,Unscheduled,Нерепаративен
 DocType: Employee,Owned,Собственост
 DocType: Salary Slip Deduction,Depends on Leave Without Pay,Зависи от тръгне без Pay
@@ -1216,30 +1177,28 @@
 DocType: HR Settings,Employee Settings,Настройки на наети
 ,Batch-Wise Balance History,Партиди Balance История
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +72,To Do List,За да се направи списък
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +63,Apprentice,Чирак
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Apprentice,Чирак
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +99,Negative Quantity is not allowed,Отрицателна величина не е позволено
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
 Used for Taxes and Charges","Данъчна подробно маса, извлечен от т майстор като низ и се съхранява в тази област. Използва се за данъци и такси"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +61,Lancing,Lancing
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +151,Employee cannot report to himself.,Служител не може да докладва пред самия себе си.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Ако сметката е замразено, записи право да ограничават потребителите."
 DocType: Email Digest,Bank Balance,Bank Balance
-apps/erpnext/erpnext/controllers/accounts_controller.py +435,Accounting Entry for {0}: {1} can only be made in currency: {2},Счетоводство Entry за {0}: {1} може да се направи само в валута: {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +436,Accounting Entry for {0}: {1} can only be made in currency: {2},Счетоводство Entry за {0}: {1} може да се направи само в валута: {2}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +38,No active Salary Structure found for employee {0} and the month,Няма активен Структура Заплата намерено за служител {0} и месеца
 DocType: Job Opening,"Job profile, qualifications required etc.","Профил на Job, необходими квалификации и т.н."
 DocType: Journal Entry Account,Account Balance,Баланс на Сметка
 apps/erpnext/erpnext/config/accounts.py +112,Tax Rule for transactions.,Данъчна Правило за сделки.
 DocType: Rename Tool,Type of document to rename.,Вид на документа за преименуване.
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +630,We buy this Item,Ние купуваме този артикул
+apps/erpnext/erpnext/public/js/setup_wizard.js +366,We buy this Item,Ние купуваме този артикул
 DocType: Address,Billing,Billing
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +77,Flanging,Фланец
 DocType: Bulk Email,Not Sent,Не е изпратено
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +73,Explosive forming,Explosive формиране
 DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),Общо данъци и такси (фирма валута)
 DocType: Shipping Rule,Shipping Account,Доставка Акаунт
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +43,Scheduled to send to {0} recipients,Планирана да изпрати на {0} получатели
 DocType: Quality Inspection,Readings,Четения
 DocType: Stock Entry,Total Additional Costs,Общо допълнителни разходи
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Sub Assemblies,Възложени Изпълнения
+apps/erpnext/erpnext/public/js/setup_wizard.js +359,Sub Assemblies,Възложени Изпълнения
 DocType: Shipping Rule Condition,To Value,За да Value
 DocType: Supplier,Stock Manager,Склад за мениджъра
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +143,Source warehouse is mandatory for row {0},Източник склад е задължително за поредна {0}
@@ -1249,44 +1208,42 @@
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Внос Неуспех!
 apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,Не адрес добавя още.
 DocType: Workstation Working Hour,Workstation Working Hour,Workstation работен час
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +83,Analyst,Аналитик
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +202,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Row {0}: отпусната сума {1} трябва да е по-малка или равна на JV количество {2}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Analyst,Аналитик
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +149,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Row {0}: отпусната сума {1} трябва да е по-малка или равна на JV количество {2}
 DocType: Item,Inventory,Инвентаризация
 DocType: Features Setup,"To enable ""Point of Sale"" view",За да се даде възможност на &quot;точка на продажба&quot; изглед
 apps/erpnext/erpnext/public/js/pos/pos.js +402,Payment cannot be made for empty cart,Плащането не може да се направи за празна количката
 DocType: Item,Sales Details,Продажби Детайли
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +149,Pinning,Прикова
 DocType: Opportunity,With Items,С артикули
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,В Количество
 DocType: Notification Control,Expense Claim Rejected,Expense искането се отхвърля
 DocType: Sales Invoice,"The date on which next invoice will be generated. It is generated on submit.
 ","Датата, на която ще се генерира следващата фактура. Той се генерира на представи."
 DocType: Item Attribute,Item Attribute,Позиция атрибут
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +105,Government,Правителство
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Government,Правителство
 apps/erpnext/erpnext/config/stock.py +268,Item Variants,Елемент Варианти
 DocType: Company,Services,Услуги
 apps/erpnext/erpnext/accounts/report/financial_statements.py +147,Total ({0}),Общо ({0})
 DocType: Cost Center,Parent Cost Center,Родител Cost Center
 DocType: Sales Invoice,Source,Източник
 DocType: Leave Type,Is Leave Without Pay,Дали си тръгне без Pay
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +186,No records found in the Payment table,Не са намерени в таблицата за плащане записи
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +405,Financial Year Start Date,Финансова година Начална дата
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +133,No records found in the Payment table,Не са намерени в таблицата за плащане записи
+apps/erpnext/erpnext/public/js/setup_wizard.js +153,Financial Year Start Date,Финансова година Начална дата
 DocType: Employee External Work History,Total Experience,Общо Experience
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +100,Countersinking,Зенкероване
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +271,Packing Slip(s) cancelled,Приемо-предавателен протокол (и) анулиране
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +276,Packing Slip(s) cancelled,Приемо-предавателен протокол (и) анулиране
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,Товарни и спедиция Такси
 DocType: Material Request Item,Sales Order No,Продажбите Заповед №
 DocType: Item Group,Item Group Name,Име на артикул Group
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +50,Taken,Взети
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,Взети
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +66,Transfer Materials for Manufacture,Прехвърляне Материали за Производство
 DocType: Pricing Rule,For Price List,За Ценовата листа
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +27,Executive Search,Executive Search
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,Executive Search
 apps/erpnext/erpnext/stock/stock_ledger.py +405,"Purchase rate for item: {0} not found, which is required to book accounting entry (expense). Please mention item price against a buying price list.","Ставка за покупка за покупка: {0} не е намерен, която се изисква, за да резервират счетоводство (разходи). Моля, посочете т цена срещу купуването ценоразпис."
 DocType: Maintenance Schedule,Schedules,Списъци
 DocType: Purchase Invoice Item,Net Amount,Нетна сума
 DocType: Purchase Order Item Supplied,BOM Detail No,BOM Подробности Не
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),Допълнителна отстъпка сума (във Валута на Фирмата)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +537,Error: {0} > {1},Грешка: {0}&gt; {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +541,Error: {0} > {1},Грешка: {0}&gt; {1}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,Моля да създадете нов акаунт от сметкоплан.
 DocType: Maintenance Visit,Maintenance Visit,Поддръжка посещение
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer > Customer Group > Territory,Customer&gt; Customer Group&gt; Territory
@@ -1297,7 +1254,6 @@
 DocType: Event,Tuesday,Вторник
 DocType: Leave Block List,Block Holidays on important days.,Блок Holidays по важни дни.
 ,Accounts Receivable Summary,Вземания Резюме
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +43,Leaves for type {0} already allocated for Employee {1} for period {2} - {3},Листата за вид {0} вече разпределена за Employee {1} за период {2} - {3}
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +187,Please set User ID field in an Employee record to set Employee Role,"Моля, задайте поле ID на потребителя в рекордно Employee да зададете Role Employee"
 DocType: UOM,UOM Name,Мерна единица Име
 DocType: Top Bar Item,Target,Мишена
@@ -1309,15 +1265,14 @@
 DocType: ToDo,Due Date,Поради Дата
 DocType: Sales Invoice Item,Brand Name,Марка Име
 DocType: Purchase Receipt,Transporter Details,Transporter Детайли
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Box,Кутия
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +389,The Organization,Организацията
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Box,Кутия
+apps/erpnext/erpnext/public/js/setup_wizard.js +137,The Organization,Организацията
 DocType: Monthly Distribution,Monthly Distribution,Месечен Разпределение
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,"Списък Receiver е празна. Моля, създайте Списък Receiver"
 DocType: Production Plan Sales Order,Production Plan Sales Order,Производство планира продажбите Поръчка
 DocType: Sales Partner,Sales Partner Target,Продажбите Partner Target
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},Счетоводство Entry за {0} може да се направи само в валута: {1}
 DocType: Pricing Rule,Pricing Rule,Ценообразуване Правило
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +58,Notching,Назъбване
 apps/erpnext/erpnext/config/learn.py +167,Material Request to Purchase Order,Материал Заявка за пазаруване Поръчка
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +74,Row # {0}: Returned Item {1} does not exists in {2} {3},Row # {0}: Върнати т {1} не съществува в {2} {3}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,Банкови сметки
@@ -1334,20 +1289,19 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Amounts not reflected in bank,Суми не постъпят по банковата
 DocType: Quality Inspection Reading,Reading 4,Четене 4
 apps/erpnext/erpnext/config/hr.py +23,Claims for company expense.,Искове за сметка на фирмата.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +8,Centrifugal casting,Центробежно леене
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +119,Magnetic field-assisted finishing,Магнитно поле с помощта на довършителни
 DocType: Company,Default Holiday List,По подразбиране Holiday Списък
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +165,Stock Liabilities,Сток Задължения
 DocType: Purchase Receipt,Supplier Warehouse,Доставчик Warehouse
 DocType: Opportunity,Contact Mobile No,Свържи Mobile Не
 DocType: Production Planning Tool,Select Sales Orders,Изберете Продажби Поръчки
 ,Material Requests for which Supplier Quotations are not created,Материал Исканията за които не са създадени Доставчик Цитати
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +117,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,"В деня (и), на която кандидатствате за отпуск са празници. Не е нужно да кандидатствате за отпуск."
 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/buying/doctype/purchase_order/purchase_order.js +477,Mark as Delivered,Маркирай като Доставени
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +497,Mark as Delivered,Маркирай като Доставени
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +34,Make Quotation,Направи оферта
 DocType: Dependent Task,Dependent Task,Зависим Task
-apps/erpnext/erpnext/stock/doctype/item/item.py +306,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 +141,Leave of type {0} cannot be longer than {1},Разрешение за типа {0} не може да бъде по-дълъг от {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +310,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 +155,Leave of type {0} cannot be longer than {1},Разрешение за типа {0} не може да бъде по-дълъг от {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Опитайте планира операции за Х дни предварително.
 DocType: HR Settings,Stop Birthday Reminders,Stop напомняне за рождени дни
 DocType: SMS Center,Receiver List,Списък Receiver
@@ -1355,15 +1309,14 @@
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Консумирана Сума
 apps/erpnext/erpnext/public/js/pos/pos.js +491,{0} View,{0} Изглед
 DocType: Salary Structure Deduction,Salary Structure Deduction,Структура Заплата Приспадане
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +158,Selective laser sintering,Селективно лазерно синтероване
-apps/erpnext/erpnext/stock/doctype/item/item.py +301,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Мерна единица {0} е въведен повече от веднъж в реализациите Factor Таблица
+apps/erpnext/erpnext/stock/doctype/item/item.py +305,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Мерна единица {0} е въведен повече от веднъж в реализациите Factor Таблица
 apps/frappe/frappe/core/page/data_import_tool/data_import_tool.js +108,Import Successful!,Внос Успешно!
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Разходите за Издадена артикули
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +185,Quantity must not be more than {0},Количество не трябва да бъде повече от {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +41,Age (Days),Възраст (дни)
 DocType: Quotation Item,Quotation Item,Цитат Позиция
 DocType: Account,Account Name,Име на Сметка
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +41,From Date cannot be greater than To Date,"От дата не може да бъде по-голяма, отколкото към днешна дата"
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +34,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.,Доставчик Type майстор.
 DocType: Purchase Order Item,Supplier Part Number,Доставчик Номер
@@ -1372,14 +1325,14 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +247,{0} {1} is cancelled or stopped,{1} {0} е отменен или спрян
 DocType: Accounts Settings,Credit Controller,Credit Controller
 DocType: Delivery Note,Vehicle Dispatch Date,Камион Dispatch Дата
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +197,Purchase Receipt {0} is not submitted,Покупка Квитанция {0} не е подадена
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +198,Purchase Receipt {0} is not submitted,Покупка Квитанция {0} не е подадена
 DocType: Company,Default Payable Account,Default Платим Акаунт
 apps/erpnext/erpnext/config/website.py +13,"Settings for online shopping cart such as shipping rules, price list etc.","Настройки за онлайн пазарска количка като правилата за корабоплаване, Ценоразпис т.н."
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +660,Setup Complete,Setup Complete
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +124,Setup Complete,Setup Complete
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +65,{0}% Billed,{0}% Начислен
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +17,Reserved Qty,Reserved Количество
 DocType: Party Account,Party Account,Party Акаунт
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +74,Human Resources,Човешки Ресурси
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +74,Human Resources,Човешки Ресурси
 DocType: Lead,Upper Income,Upper подоходно
 DocType: Journal Entry Account,Debit in Company Currency,Debit в Company валути
 apps/erpnext/erpnext/support/doctype/issue/issue.py +58,My Issues,Моите въпроси
@@ -1388,11 +1341,9 @@
 DocType: Company,Default Values,Стойности по подразбиране
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +236,Row {0}: Payment amount can not be negative,Row {0}: Сума за плащане не може да бъде отрицателна
 DocType: Expense Claim,Total Amount Reimbursed,Общия размер на възстановените
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +152,Press fitting,Натиснете монтаж
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +64,Against Supplier Invoice {0} dated {1},Срещу фактура от доставчик {0} от {1}
 DocType: Customer,Default Price List,Default Ценоразпис
 DocType: Payment Reconciliation,Payments,Плащания
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +24,Hot isostatic pressing,Горещо изостатично пресоване
 DocType: ToDo,Medium,Среда
 DocType: Budget Detail,Budget Allocated,"Бюджетът, отпуснат"
 DocType: Journal Entry,Entry Type,Влизане Type
@@ -1405,9 +1356,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +56,None of the items have any change in quantity or value.,"Нито един от елементите, има ли промяна в количеството или стойността."
 DocType: Warranty Claim,Warranty Claim,Гаранционен иск
 ,Lead Details,Олово Детайли
-DocType: Authorization Rule,Approving User,Одобряване на потребителя
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +37,Forging,Коване
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +126,Plating,Позлатяване
 DocType: Purchase Invoice,End date of current invoice's period,Крайна дата на периода на текущата фактура за
 DocType: Pricing Rule,Applicable For,ТАКИВА
 DocType: Bank Reconciliation,From Date,От Дата
@@ -1429,31 +1377,29 @@
 DocType: Sales Invoice,Paid Amount (Company Currency),Платената сума (Company валути)
 DocType: Purchase Invoice,Additional Discount,Допълнителна отстъпка
 DocType: Selling Settings,Selling Settings,Продаваме Settings
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +39,Online Auctions,Онлайн Търгове
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,Онлайн Търгове
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +94,Please specify either Quantity or Valuation Rate or both,"Моля, посочете или Количество или остойностяване цена, или и двете"
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +50,"Company, Month and Fiscal Year is mandatory","Фирма, Месец и фискална година е задължително"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Marketing Expenses,Разходите за маркетинг
 ,Item Shortage Report,Позиция Недостиг Доклад
-apps/erpnext/erpnext/stock/doctype/item/item.js +183,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Тегло се споменава, \ nМоля спомена &quot;Тегло мерна единица&quot; твърде"
+apps/erpnext/erpnext/stock/doctype/item/item.js +185,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Тегло се споменава, \ nМоля спомена &quot;Тегло мерна единица&quot; твърде"
 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 +212,Time Log Batch {0} must be 'Submitted',Време Log Партида {0} трябва да бъде &quot;Изпратен&quot;
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,Направи счетоводен запис за всеки склад Movement
 DocType: Leave Allocation,Total Leaves Allocated,Общо Leaves Отпуснати
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +384,Warehouse required at Row No {0},Warehouse изисква най Row Не {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +386,Warehouse required at Row No {0},Warehouse изисква най Row Не {0}
 DocType: Employee,Date Of Retirement,Дата на пенсиониране
 DocType: Upload Attendance,Get Template,Вземи Template
 DocType: Address,Postal,Пощенски
 DocType: Item,Weightage,Weightage
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +159,Mining,Минен
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +17,Resin casting,Леене смола
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"A Група Клиенти съществува със същото име моля, променете името на Клиента или преименувайте Група Клиенти"
 apps/erpnext/erpnext/public/js/pos/pos.js +147,Please select {0} first.,Моля изберете {0} на първо място.
 apps/erpnext/erpnext/templates/pages/order.html +57,text {0},текст {0}
 DocType: Territory,Parent Territory,Родител Territory
 DocType: Quality Inspection Reading,Reading 2,Четене 2
 DocType: Stock Entry,Material Receipt,Материал Разписка
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +622,Products,Продукти
+apps/erpnext/erpnext/public/js/setup_wizard.js +358,Products,Продукти
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +47,Party Type and Party is required for Receivable / Payable account {0},Party Тип и страна се изисква за получаване / плащане сметка {0}
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.","Ако този елемент има варианти, то не може да бъде избран в поръчки за продажба и т.н."
 DocType: Lead,Next Contact By,Следваща Контакт
@@ -1463,13 +1409,13 @@
 DocType: Purchase Invoice,Notification Email Address,Уведомление имейл адрес
 DocType: Payment Tool,Find Invoices to Match,Намерете Фактури несравними
 ,Item-wise Sales Register,Точка-мъдър Продажби Регистрация
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +399,"e.g. ""XYZ National Bank""",например &quot;XYZ National Bank&quot;
+apps/erpnext/erpnext/public/js/setup_wizard.js +147,"e.g. ""XYZ National Bank""",например &quot;XYZ National Bank&quot;
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,"Това ли е данък, включен в основната ставка?"
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +57,Total Target,Общо Target
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Target,Общо Target
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.js +22,Shopping Cart is enabled,Количка е активиран
 DocType: Job Applicant,Applicant for a Job,Заявител на Job
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +173,No Production Orders created,"Не производствени поръчки, създадени"
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +131,Salary Slip of employee {0} already created for this month,Заплата поднасяне на служител {0} вече създаден за този месец
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +140,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.,Твърде много колони. Износ на доклада и да го отпечатате с помощта на приложение за електронни таблици.
 DocType: Sales Invoice Item,Batch No,Партиден №
@@ -1479,14 +1425,14 @@
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +13,Variant,Вариант
 apps/frappe/frappe/public/js/frappe/form/toolbar.js +165,New {0},New {0}
 DocType: Naming Series,Set prefix for numbering series on your transactions,Определете префикс за номериране серия от вашите сделки
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +169,Stopped order cannot be cancelled. Unstop to cancel.,"Спряно за да не могат да бъдат отменени. Отпуши, за да отмените."
-apps/erpnext/erpnext/stock/doctype/item/item.py +323,Default BOM ({0}) must be active for this item or its template,Default BOM ({0}) трябва да бъде активен за тази позиция или си шаблон
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +164,Stopped order cannot be cancelled. Unstop to cancel.,"Спряно за да не могат да бъдат отменени. Отпуши, за да отмените."
+apps/erpnext/erpnext/stock/doctype/item/item.py +327,Default BOM ({0}) must be active for this item or its template,Default BOM ({0}) трябва да бъде активен за тази позиция или си шаблон
 DocType: Employee,Leave Encashed?,Оставете осребряват?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Opportunity От поле е задължително
 DocType: Item,Variants,Варианти
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +458,Make Purchase Order,Направи поръчка
 DocType: SMS Center,Send To,Изпрати на
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +111,There is not enough leave balance for Leave Type {0},Няма достатъчно отпуск баланс за отпуск Тип {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +127,There is not enough leave balance for Leave Type {0},Няма достатъчно отпуск баланс за отпуск Тип {0}
 DocType: Sales Team,Contribution to Net Total,Принос към Net Общо
 DocType: Sales Invoice Item,Customer's Item Code,Клиента Код
 DocType: Stock Reconciliation,Stock Reconciliation,Склад за помирение
@@ -1523,11 +1469,11 @@
 DocType: Sales Order Item,Actual Qty,Действително Количество
 DocType: Sales Invoice Item,References,Препратки
 DocType: Quality Inspection Reading,Reading 10,Четене 10
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +612,"List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start.","Списък на вашите продукти или услуги, които купуват или продават. Уверете се, че за да се провери стокова група, мерна единица и други свойства, когато започнете."
+apps/erpnext/erpnext/public/js/setup_wizard.js +348,"List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start.","Списък на вашите продукти или услуги, които купуват или продават. Уверете се, че за да се провери стокова група, мерна единица и други свойства, когато започнете."
 DocType: Hub Settings,Hub Node,Hub Node
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,"Въвели сте дублиращи се елементи. Моля, поправи и опитайте отново."
 apps/erpnext/erpnext/controllers/item_variant.py +65,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values,"Value {0} за Умение {1}, не съществува в списъка с валиден т Умение Ценности"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +87,Associate,Сътрудник
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Associate,Сътрудник
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +46,Item {0} is not a serialized Item,Точка {0} не е сериализирани Точка
 DocType: SMS Center,Create Receiver List,Създайте Списък Receiver
 apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +5,Expired,Изтекъл
@@ -1536,7 +1482,7 @@
 DocType: Warranty Claim,Issue Date,Дата На Издаване
 DocType: Activity Cost,Activity Cost,Разходи за дейността
 DocType: Purchase Receipt Item Supplied,Consumed Qty,Консумирана Количество
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +52,Telecommunications,Телекомуникации
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +52,Telecommunications,Телекомуникации
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),"Показва, че опаковката е част от тази доставка (Само Проект)"
 DocType: Payment Tool,Make Payment Entry,Извършване на плащане Влизане
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +119,Quantity for Item {0} must be less than {1},Количество за позиция {0} трябва да е по-малко от {1}
@@ -1553,10 +1499,8 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +37,"Selling must be checked, if Applicable For is selected as {0}","Продажба трябва да се провери, ако има такива се избира като {0}"
 DocType: Purchase Order Item,Supplier Quotation Item,Доставчик оферта Точка
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +27,Make Salary Structure,Направи структурата на заплатите
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +54,Shearing,Срязване
 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.,"Щракнете върху бутона &quot;Направи фактурата за продажба&quot;, за да създадете нов фактурата за продажба."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +166,Packaging and labeling,Опаковка и етикетиране
 DocType: Monthly Distribution,Name of the Monthly Distribution,Име на месец Дистрибуцията
 DocType: Sales Person,Parent Sales Person,Родител Продажби Person
 apps/erpnext/erpnext/setup/utils.py +14,Please specify Default Currency in Company Master and Global Defaults,"Моля, посочете Default валути в Company магистър и глобални Defaults"
@@ -1567,19 +1511,18 @@
 DocType: Budget Detail,Fiscal Year,Фискална Година
 DocType: Cost Center,Budget,Бюджет
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +41,"Budget cannot be assigned against {0}, as it's not an Income or Expense account","Бюджет не могат да бъдат причислени към {0}, тъй като това не е сметка за приход или разход"
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Achieved,Постигнато
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,Постигнато
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +65,Territory / Customer,Територия / Customer
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,e.g. 5,например 5
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +207,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},Row {0}: отпусната сума {1} трябва да е по-малка или равна на фактурира непогасения {2}
+apps/erpnext/erpnext/public/js/setup_wizard.js +294,e.g. 5,например 5
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},Row {0}: отпусната сума {1} трябва да е по-малка или равна на фактурира непогасения {2}
 DocType: Sales Invoice,In Words will be visible once you save the Sales Invoice.,По думите ще бъде видим след като спаси фактурата за продажба.
 DocType: Item,Is Sales Item,Е-продажба Точка
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,Позиция Group Tree
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,Точка {0} не е настройка за серийни номера. Проверете опция майстор
 DocType: Maintenance Visit,Maintenance Time,Поддръжка на времето
 ,Amount to Deliver,Сума за Избави
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +620,A Product or Service,Продукт или Услуга
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +158,There were errors.,Имаше грешки.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +101,Tapping,Почукване
+apps/erpnext/erpnext/public/js/setup_wizard.js +356,A Product or Service,Продукт или Услуга
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +146,There were errors.,Имаше грешки.
 DocType: Naming Series,Current Value,Current Value
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +171,{0} created,{0} е създадена
 DocType: Delivery Note Item,Against Sales Order,Срещу поръчка за продажба
@@ -1593,7 +1536,7 @@
 apps/erpnext/erpnext/accounts/party.py +275,Due Date cannot be before Posting Date,"Падежа, не може да бъде, преди да публикувате Дата"
 DocType: Website Item Group,Website Item Group,Website т Group
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Duties and Taxes,Мита и такси
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Please enter Reference date,"Моля, въведете Референтна дата"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +312,Please enter Reference date,"Моля, въведете Референтна дата"
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0}  записи на плажания не може да се филтрира по  {1}
 DocType: Item Website Specification,Table for Item that will be shown in Web Site,"Таблица за елемент, който ще бъде показан в Web Site"
 DocType: Purchase Order Item Supplied,Supplied Qty,Приложен Количество
@@ -1601,7 +1544,7 @@
 apps/erpnext/erpnext/config/stock.py +103,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,Не може да се отнесе поредни номера по-голям или равен на текущия брой ред за този тип Charge
 ,Item-wise Purchase History,Точка-мъдър История на покупките
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +152,Red,Червен
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Red,Червен
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +228,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},"Моля, кликнете върху &quot;Генериране Schedule&quot;, за да донесе Пореден № добавя за позиция {0}"
 DocType: Account,Frozen,Замръзнал
 ,Open Production Orders,Отворените нареждания за производство
@@ -1616,7 +1559,7 @@
 DocType: Item Attribute,Attribute Name,Име на атрибута
 apps/erpnext/erpnext/controllers/selling_controller.py +236,Item {0} must be Sales or Service Item in {1},"Точка {0} трябва да е продажба или услуга, елемент от {1}"
 DocType: Item Group,Show In Website,Покажи В Website
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +621,Group,Група
+apps/erpnext/erpnext/public/js/setup_wizard.js +357,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","За да проследите марка в следните документи Бележка за доставка, възможност Материал Искането, т, Поръчката, Покупка ваучер Purchaser разписка, цитата, продажба на фактура, Каталог Bundle, продажба Поръчка, сериен номер"
@@ -1626,6 +1569,7 @@
 DocType: Features Setup,Brands,Brands
 DocType: C-Form Invoice Detail,Invoice No,Фактура Не
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +480,From Purchase Order,От поръчка
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +92,"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,Оставка Letter Дата
@@ -1633,35 +1577,31 @@
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +137,Not Set,Не е зададен
 DocType: Communication,Date,Дата
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,Повторете Приходи Customer
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +651,Sit tight while your system is being setup. This may take a few moments.,"Стойте там, докато вашата система е настройка. Това може да отнеме няколко минути."
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +115,Sit tight while your system is being setup. This may take a few moments.,"Стойте там, докато вашата система е настройка. Това може да отнеме няколко минути."
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +51,{0} ({1}) must have role 'Expense Approver',"{0} ({1}) трябва да има роля ""Одобряващ разходи"""
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Pair,Двойка
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Pair,Двойка
 DocType: Bank Reconciliation Detail,Against Account,Срещу Сметка
 DocType: Maintenance Schedule Detail,Actual Date,Действителна дата
 DocType: Item,Has Batch No,Разполага с партиден №
 DocType: Delivery Note,Excise Page Number,Акцизите Page Number
 DocType: Employee,Personal Details,Лични Данни
 ,Maintenance Schedules,Графици за поддръжка
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +44,Embossing,Щампа
 ,Quotation Trends,Цитати Trends
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +139,Item Group not mentioned in item master for item {0},Позиция Group не са посочени в т майстор за т {0}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +302,Debit To account must be a Receivable account,Дебитиране на сметката трябва да е вземане под внимание
-apps/erpnext/erpnext/stock/doctype/item/item.py +310,"As Production Order can be made for this item, it must be a stock item.","Като производствена поръчка може да се направи за тази позиция, той трябва да бъде елемент от склад."
 DocType: Shipping Rule Condition,Shipping Amount,Доставка Сума
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +140,Joining,Свързване
-DocType: Authorization Rule,Above Value,Над Стойност
 ,Pending Amount,До Сума
 DocType: Purchase Invoice Item,Conversion Factor,Превръщане Factor
 DocType: Purchase Order,Delivered,Доставени
 apps/erpnext/erpnext/config/hr.py +160,Setup incoming server for jobs email id. (e.g. jobs@example.com),Setup входящия сървър за работни места имейл ID. (Например jobs@example.com)
 DocType: Purchase Receipt,Vehicle Number,Номер на возилото
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,"Датата, на която повтарящите фактура ще се спре"
+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,Вземания
 ,Supplier-Wise Sales Analytics,Доставчик мъдър анализ на продажбите
 DocType: Address Template,This format is used if country specific format is not found,"Този формат се използва, ако не се намери специфичен формат за държавата"
 DocType: Custom Field,Custom,Обичай
 DocType: Production Order,Use Multi-Level BOM,Използвайте Multi-Level BOM
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +26,Injection molding,Шприцване
 DocType: Bank Reconciliation,Include Reconciled Entries,Включи примирени влизания
 apps/erpnext/erpnext/config/accounts.py +41,Tree of finanial accounts.,Дърво на finanial сметки.
 DocType: Leave Control Panel,Leave blank if considered for all employee types,"Оставете празно, ако считат за всички видове наети лица"
@@ -1671,30 +1611,28 @@
 apps/frappe/frappe/config/setup.py +130,Printing,Печатане
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +114,Expense Claim is pending approval. Only the Expense Approver can update status.,Expense претенция изчаква одобрение. Само за сметка одобряващ да актуализирате състоянието.
 DocType: Purchase Invoice,Additional Discount Amount,Допълнителна отстъпка сума
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +99,The day(s) on which you are applying for leave are holiday. You need not apply for leave.,"В деня (и), на която кандидатствате за отпуск са почивка. Не е нужно да подава молба за отпуск."
 apps/frappe/frappe/public/js/frappe/misc/utils.js +110,and,и
 DocType: Leave Block List Allow,Leave Block List Allow,Оставете Block List Позволете
 apps/erpnext/erpnext/setup/doctype/company/company.py +236,Abbr can not be blank or space,Съкращение не може да бъде празно или интервал
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +50,Sports,Спортен
+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/setup/page/setup_wizard/setup_wizard.js +626,Unit,Единица
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Unit,Единица
 apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.py +182,Please set Dropbox access keys in your site config,"Моля, задайте Dropbox клавишите за достъп в сайта си довереник"
 apps/erpnext/erpnext/stock/get_item_details.py +113,Please specify Company,"Моля, посочете Company"
 ,Customer Acquisition and Loyalty,Customer Acquisition и лоялност
 DocType: Purchase Receipt,Warehouse where you are maintaining stock of rejected items,"Склад, в която сте се поддържа запас от отхвърлените елементи"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +408,Your financial year ends on,Вашият финансовата година приключва на
+apps/erpnext/erpnext/public/js/setup_wizard.js +156,Your financial year ends on,Вашият финансовата година приключва на
 DocType: POS Profile,Price List,Ценова Листа
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +20,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,"{0} сега е по подразбиране фискална година. Моля, опреснете браузъра си за да влезе в сила промяната."
 apps/erpnext/erpnext/projects/doctype/project/project.js +47,Expense Claims,Разходните Вземания
 DocType: Issue,Support,Подкрепа
-DocType: Authorization Rule,Approving Role,Приемане Role
 ,BOM Search,BOM Търсене
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +176,Closing (Opening + Totals),Закриване (откриване + Общо)
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +26,Please specify currency in Company,"Моля, посочете валута през Company"
 DocType: Workstation,Wages per hour,Заплатите на час
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},Склад за баланс в Batch {0} ще стане отрицателна {1} за позиция {2} в склада {3}
 apps/erpnext/erpnext/config/setup.py +83,"Show / Hide features like Serial Nos, POS etc.","Покажи / скрий функции, като серийни номера, POS и т.н."
-apps/erpnext/erpnext/controllers/accounts_controller.py +236,Account {0} is invalid. Account Currency must be {1},"Account {0} е невалиден. Сметка на валути, трябва да {1}"
+apps/erpnext/erpnext/controllers/accounts_controller.py +237,Account {0} is invalid. Account Currency must be {1},"Account {0} е невалиден. Сметка на валути, трябва да {1}"
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +34,UOM Conversion factor is required in row {0},Фактор мерна единица реализациите се изисква в ред {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +53,Clearance date cannot be before check date in row {0},Дата Клирънсът не може да бъде преди датата проверка в ред {0}
 DocType: Salary Slip,Deduction,Дедукция
@@ -1713,13 +1651,13 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +82,Item {0} has already been returned,Точка {0} вече е върнал
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** Фискална година ** представлява финансова година. Всички счетоводни записвания и други големи сделки се проследяват срещу ** Фискална година **.
 DocType: Opportunity,Customer / Lead Address,Клиент / Lead Адрес
+apps/erpnext/erpnext/stock/doctype/item/item.py +112,Warning: Invalid SSL certificate on attachment {0},Внимание: Invalid сертификат SSL за закрепване {0}
 DocType: Production Order Operation,Actual Operation Time,Действително време за операцията
 DocType: Authorization Rule,Applicable To (User),Приложими по отношение на (User)
 DocType: Purchase Taxes and Charges,Deduct,Приспада
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +170,Job Description,Описание На Работа
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +170,Job Description,Описание На Работа
 DocType: Purchase Order Item,Qty as per Stock UOM,Количество по Фондова мерна единица
 apps/frappe/frappe/model/rename_doc.py +343,Please select a valid csv file with data,"Моля, изберете валиден CSV файл с данни"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +92,Coating,Слой
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +126,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Специални знаци с изключение на &quot;-&quot; &quot;.&quot;, &quot;#&quot;, и &quot;/&quot; не е позволено в именуване серия"
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Следете Продажби кампании. Следете Leads, цитати, продажба Поръчка т.н. от кампании, за да се прецени възвръщаемост на инвестициите."
 DocType: Expense Claim,Approver,Одобряващ
@@ -1729,12 +1667,11 @@
 DocType: Supplier Quotation,Manufacturing Manager,Производство на мениджъра
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},Пореден № {0} е в гаранция до запълването {1}
 apps/erpnext/erpnext/config/stock.py +69,Split Delivery Note into packages.,Split Бележка за доставка в пакети.
-apps/erpnext/erpnext/hooks.py +84,Shipments,Превозите
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +29,Dip molding,Dip корнизи
+apps/erpnext/erpnext/hooks.py +68,Shipments,Превозите
 DocType: Purchase Order,To be delivered to customer,За да бъде доставен на клиент
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,Време Log Status трябва да бъдат изпратени.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,Пореден № {0} не принадлежи на нито една Warehouse
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +650,Setting Up,Настройване
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +114,Setting Up,Настройване
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,Row # ,Row #
 DocType: Purchase Invoice,In Words (Company Currency),По думите (Company валути)
 DocType: Pricing Rule,Supplier,Доставчик
@@ -1742,7 +1679,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +105,Miscellaneous Expenses,Други разходи
 DocType: Global Defaults,Default Company,Default Company
 apps/erpnext/erpnext/controllers/stock_controller.py +166,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,"Expense или Разлика сметка е задължително за т {0}, както цялостната стойност фондова тя влияе"
-apps/erpnext/erpnext/controllers/accounts_controller.py +354,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","Не може да се overbill за позиция {0} на ред {1} повече от {2}. За да се даде възможност некоректно, моля, задайте на склад Settings"
+apps/erpnext/erpnext/controllers/accounts_controller.py +355,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","Не може да се overbill за позиция {0} на ред {1} повече от {2}. За да се даде възможност некоректно, моля, задайте на склад Settings"
 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 +135,User {0} is disabled,Потребителят {0} е деактивиран
@@ -1755,27 +1692,26 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,{0} is mandatory for Item {1},{0} е задължително за {1}
 DocType: Currency Exchange,From Currency,От Валута
 DocType: DocField,Name,Име
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +211,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Моля изберете отпусната сума, Тип фактура и фактура Номер в поне един ред"
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +104,Sales Order required for Item {0},Продажбите на поръчката изисква за т {0}
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +158,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Моля изберете отпусната сума, Тип фактура и фактура Номер в поне един ред"
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +107,Sales Order required for Item {0},Продажбите на поръчката изисква за т {0}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +43,Amounts not reflected in system,"Сумите, които не е отразено в системата"
 DocType: Purchase Invoice Item,Rate (Company Currency),Rate (Company валути)
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +40,Others,Други
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +40,Others,Други
 apps/erpnext/erpnext/templates/includes/product_page.js +80,Cannot find a matching Item. Please select some other value for {0}.,Не можете да намерите съвпадение на т. Моля изберете някоя друга стойност за {0}.
 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,Не можете да изберете тип заряд като &quot;На предишния ред Сума&quot; или &quot;На предишния ред Total&quot; за първи ред
 apps/frappe/frappe/core/doctype/doctype/boilerplate/controller_list.html +31,Completed,Завършен
 DocType: Web Form,Select DocType,Изберете DocType
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +104,Broaching,Грил
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +12,Banking,Банково дело
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,Банково дело
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +38,Please click on 'Generate Schedule' to get schedule,"Моля, кликнете върху &quot;Генериране Schedule&quot;, за да получите график"
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +283,New Cost Center,New Cost Center
 DocType: Bin,Ordered Quantity,Поръчаното количество
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +397,"e.g. ""Build tools for builders""",например &quot;Билд инструменти за строители&quot;
+apps/erpnext/erpnext/public/js/setup_wizard.js +145,"e.g. ""Build tools for builders""",например &quot;Билд инструменти за строители&quot;
 DocType: Quality Inspection,In Process,В Процес
 DocType: Authorization Rule,Itemwise Discount,Itemwise Отстъпка
 DocType: Purchase Order Item,Reference Document Type,Референтен Document Type
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +318,{0} against Sales Order {1},{0} срещу Поръчка за Продажба {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +320,{0} against Sales Order {1},{0} срещу Поръчка за Продажба {1}
 DocType: Account,Fixed Asset,Дълготраен актив
 apps/erpnext/erpnext/config/stock.py +283,Serialized Inventory,Сериализирани Инвентаризация
 DocType: Activity Type,Default Billing Rate,Default Billing Курсове
@@ -1790,14 +1726,13 @@
 DocType: Purchase Invoice Item,Page Break,Page Break
 DocType: Production Order Operation,Pending,В очакване на
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,"Потребителите, които могат да одобряват заявленията за отпуск специфичен служителя"
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +33,You cannot change default UOM of Variant. To change default UOM for Variant change default UOM of the Template,Не можете да промените по подразбиране мерна единица на вариант. За да промените по подразбиране мерна единица за Variant промяна подразбиране мерна единица на шаблон
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +50,Office Equipments,Офис оборудване
 DocType: Purchase Invoice Item,Qty,Количество
 DocType: Fiscal Year,Companies,Фирми
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +24,Electronics,Електроника
+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/support/doctype/maintenance_visit/maintenance_visit.js +18,From Maintenance Schedule,От График за поддръжка
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +56,Full-time,Пълен работен ден
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +56,Full-time,Пълен работен ден
 DocType: Purchase Invoice,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.","Ако сте създали стандартен формуляр в продажбите данъци и такси Template, изберете един и кликнете върху бутона по-долу."
@@ -1809,11 +1744,12 @@
 DocType: Job Applicant,Job Opening,Откриване на работа
 DocType: Payment Reconciliation,Payment Reconciliation,Заплащане помирение
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +154,Please select Incharge Person's name,Моля изберете име Incharge Лице
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +51,Technology,Технология
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,Технология
 DocType: Offer Letter,Offer Letter,Оферта 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,Общо фактурирани Amt
 DocType: Time Log,To Time,На време
+DocType: Authorization Rule,Approving Role (above authorized value),Приемане Role (над разрешено стойност)
 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.","За да добавите деца възли, опознаването на дърво и кликнете върху възела, при които искате да добавите повече възли."
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +102,Credit To account must be a Payable account,Кредитът за сметка трябва да бъде Платим акаунт
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +233,BOM recursion: {0} cannot be parent or child of {2},BOM рекурсия: {0} не може да бъде родител или дете на {2}
@@ -1826,10 +1762,8 @@
 DocType: Item,Customer Item Codes,Customer Елемент кодове
 DocType: Opportunity,Lost Reason,Загубил Причина
 apps/erpnext/erpnext/config/accounts.py +68,Create Payment Entries against Orders or Invoices.,Създаване на плащане влизания срещу заповеди или фактури.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +141,Welding,Заваряване
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +40,New Stock UOM is required,New фондова мерна единица се изисква
 DocType: Quality Inspection,Sample Size,Размер на извадката
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +443,All items have already been invoiced,Всички елементи вече са фактурирани
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +446,All items have already been invoiced,Всички елементи вече са фактурирани
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',"Моля, посочете валиден &quot;От Case No.&quot;"
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +287,Further cost centers can be made under Groups but entries can be made against non-Groups,"Допълнителни разходни центрове могат да бъдат направени по групи, но записи могат да бъдат направени по отношение на не-групи"
 DocType: Project,External,Външен
@@ -1841,8 +1775,7 @@
 DocType: Bin,Actual Quantity,Действителното количество
 DocType: Shipping Rule,example: Next Day Shipping,Например: Next Day Shipping
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,Пореден № {0} не е намерен
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +563,Your Customers,Вашите клиенти
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +27,Compression molding,Формоване чрез пресоване
+apps/erpnext/erpnext/public/js/setup_wizard.js +303,Your Customers,Вашите клиенти
 DocType: Leave Block List Date,Block Date,Block Дата
 DocType: Sales Order,Not Delivered,Не е представил
 ,Bank Clearance Summary,Bank Клирънсът Резюме
@@ -1863,10 +1796,10 @@
 DocType: SMS Log,Sent To,Изпратени На
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +28,Make Sales Invoice,Направи фактурата за продажба
 DocType: Company,For Reference Only.,Само за справка.
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +29,Invalid {0}: {1},Невалиден {0}: {1}
+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,Планиране на капацитета
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +49,'From Date' is required,&quot;От дата&quot; се изисква
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +43,'From Date' is required,&quot;От дата&quot; се изисква
 DocType: Journal Entry,Reference Number,Референтен Номер
 DocType: Employee,Employment Details,Детайли по заетостта
 DocType: Employee,New Workplace,New Workplace
@@ -1881,7 +1814,7 @@
 DocType: Serial No,Delivery Time,Време За Доставка
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Застаряването на населението на базата на
 DocType: Item,End of Life,Края на живота
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +41,Travel,Пътуване
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +41,Travel,Пътуване
 DocType: Leave Block List,Allow Users,Позволяват на потребителите
 DocType: Purchase Order,Customer Mobile No,Customer Mobile Не
 DocType: Sales Invoice,Recurring,Повтарящ се
@@ -1895,7 +1828,7 @@
 DocType: Naming Series,User must always select,Потребителят трябва винаги да изберете
 DocType: Stock Settings,Allow Negative Stock,Оставя Negative Фондова
 DocType: Installation Note,Installation Note,Монтаж Note
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +541,Add Taxes,Добави Данъци
+apps/erpnext/erpnext/public/js/setup_wizard.js +283,Add Taxes,Добави Данъци
 ,Financial Analytics,Финансови Analytics
 DocType: Quality Inspection,Verified By,Проверени от
 DocType: Address,Subsidiary,Филиал
@@ -1905,7 +1838,6 @@
 DocType: System Settings,In Hours,В Часа
 DocType: Process Payroll,Create Salary Slip,Създайте Заплата Slip
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Expected balance as per bank,"Очаквания баланс, като в една банка"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +115,Buffing,Полировъчен
 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,Employee
@@ -1922,11 +1854,11 @@
 DocType: Rename Tool,File to Rename,Файл за Преименуване
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +176,Purchse Order number required for Item {0},"Purchse номер на поръчката, необходима за т {0}"
 apps/erpnext/erpnext/public/js/controllers/transaction.js +136,Show Payments,Покажи Плащания
-apps/erpnext/erpnext/controllers/buying_controller.py +245,Specified BOM {0} does not exist for Item {1},Предвидени BOM {0} не съществува за позиция {1}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +202,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,График за поддръжка {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 +197,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,График за поддръжка {0} трябва да се отмени преди анулира тази поръчка за продажба
 apps/frappe/frappe/desk/page/backups/backups.html +13,Size,Размер
 DocType: Notification Control,Expense Claim Approved,Expense претенция Одобрен
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +113,Pharmaceutical,Лекарствена
+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,Продажбите Поръчка Задължително
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +30,Create Customer,Създаване на клиенти
@@ -1936,7 +1868,6 @@
 DocType: Quality Inspection Reading,Reading 9,Четене 9
 DocType: Supplier,Is Frozen,Е замразен
 DocType: Buying Settings,Buying Settings,Настройки Изкупуването
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +122,Mass finishing,Mass довършителни
 DocType: Stock Entry Detail,BOM No. for a Finished Good Item,BOM No. За завършената Good Точка
 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),Setup входящия сървър за продажби имейл ID. (Например sales@example.com)
@@ -1944,7 +1875,7 @@
 DocType: Payment Tool,Payment Account,Разплащателна сметка
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +713,Please specify Company to proceed,"Моля, посочете Company, за да продължите"
 apps/frappe/frappe/public/js/frappe/model/indicator.js +30,Draft,Проект
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +46,Compensatory Off,Компенсаторни Off
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Compensatory Off,Компенсаторни Off
 DocType: Quality Inspection Reading,Accepted,Приет
 DocType: User,Female,Женски
 DocType: Journal Entry Account,Debit in Account Currency,Debit в профила на валути
@@ -1956,7 +1887,7 @@
 DocType: Shipping Rule,Shipping Rule Label,Доставка Правило Label
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +209,Raw Materials cannot be blank.,"Суровини, които не могат да бъдат празни."
 DocType: Newsletter,Test,Тест
-apps/erpnext/erpnext/stock/doctype/item/item.py +364,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +368,"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'","Тъй като има съществуващи сделки борсови за тази позиция, \ не можете да промените стойностите на &#39;има сериен номер &quot;,&quot; Има Batch Не &quot;,&quot; Трябва ли Фондова т &quot;и&quot; Метод на оценка &quot;"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +448,Quick Journal Entry,Quick вестник Влизане
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +92,You can not change rate if BOM mentioned agianst any item,"Вие не можете да променяте скоростта, ако BOM споменато agianst всеки елемент"
@@ -1967,13 +1898,14 @@
 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.,Отделно производство цел ще бъде създаден за всеки завършен добра позиция.
 DocType: Purchase Invoice,Terms and Conditions1,Условия и Conditions1
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +18,Complete Setup,Пълна Setup
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard_page.html +18,Complete Setup,Пълна Setup
 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/config/crm.py +96,Newsletter Mailing List,Newsletter мейлинг лист
 DocType: Delivery Note,Transporter Name,Превозвач Име
+DocType: Authorization Rule,Authorized Value,Оторизиран Value
 DocType: Contact,Enter department to which this Contact belongs,"Въведете отдела, в който се свържете с нас принадлежи"
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Absent,Общо Отсъства
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +746,Item or Warehouse for row {0} does not match Material Request,Точка или склад за ред {0} не съвпада Материал Искане
@@ -1998,16 +1930,15 @@
 DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),Basic Rate (по Фондова мерна единица)
 DocType: SMS Log,No of Requested SMS,Не на запитаната SMS
 DocType: Campaign,Campaign-.####,Кампания -. ####
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +55,Piercing,Пронизителен
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,Следващи стъпки
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +117,Contract End Date must be greater than Date of Joining,Договор Крайна дата трябва да бъде по-голяма от Дата на Присъединяване
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,"Трето лице дистрибутор / дилър / комисионер / филиал / търговец, който продава на фирми продукти срещу комисионна."
 DocType: Customer Group,Has Child Node,Има Node Child
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{0} against Purchase Order {1},{0} срещу Поръчка {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +332,{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/page/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,Застаряването на населението Range 1
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +110,Photochemical machining,Фотохимичен машинна
 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.
 
 #### Note
@@ -2033,7 +1964,7 @@
 DocType: Purchase Receipt Item,Recd Quantity,Recd Количество
 DocType: Email Account,Email Ids,Email документи за самоличност
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},Не може да се произвежда повече Точка {0} от продажби Поръчка количество {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +471,Stock Entry {0} is not submitted,Склад за вписване {0} не е подадена
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +473,Stock Entry {0} is not submitted,Склад за вписване {0} не е подадена
 DocType: Payment Reconciliation,Bank / Cash Account,Bank / Cash Акаунт
 DocType: Tax Rule,Billing City,Billing City
 DocType: Global Defaults,Hide Currency Symbol,Скриване на валути Symbol
@@ -2049,7 +1980,7 @@
 DocType: Purchase Invoice,Currency and Price List,Валута и ценова листа
 DocType: Opportunity,Customer / Lead Name,Клиент / Lead Име
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +63,Clearance Date not mentioned,Клирънсът Дата които не са споменати
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +71,Production,Производство
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Production,Производство
 DocType: Item,Allow Production Order,Оставя производствена поръчка
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +60,Row {0}:Start Date must be before End Date,Row {0}: Началната дата трябва да е преди крайната дата
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Общо (Количество)
@@ -2062,7 +1993,7 @@
 apps/erpnext/erpnext/utilities/doctype/address/address.py +113,My Addresses,Моите адреси
 DocType: Stock Ledger Entry,Outgoing Rate,Изходящ Курсове
 apps/erpnext/erpnext/config/hr.py +100,Organization branch master.,Браншова организация майстор.
-apps/erpnext/erpnext/controllers/accounts_controller.py +237, or ,или
+apps/erpnext/erpnext/controllers/accounts_controller.py +238, or ,или
 DocType: Sales Order,Billing Status,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 - 
@@ -2089,6 +2020,7 @@
 DocType: Stock Entry Detail,Serial No / Batch,Serial No / Batch
 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,Оставете Type {0} не може да се извърши-препрати
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +213,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',"График за поддръжка не се генерира за всички предмети. Моля, кликнете върху &quot;Генериране Schedule&quot;"
 ,To Produce,Да Произвежда
 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} трябва да се включат и"
@@ -2096,10 +2028,7 @@
 DocType: Bin,Reserved Quantity,Включено Количество
 DocType: Landed Cost Voucher,Purchase Receipt Items,Покупка Квитанция артикули
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,Персонализиране Forms
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +62,Cutting,Рязане
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +69,Flattening,Сплескване
 DocType: Account,Income Account,Дохода
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +22,Molding,Формоване
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +632,Delivery,Доставка
 DocType: Stock Reconciliation Item,Current Qty,Current Количество
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",Вижте &quot;Курсове на материали на основата на&quot; в Остойностяване Раздел
@@ -2109,19 +2038,18 @@
 apps/frappe/frappe/desk/moduleview.py +61,Documents,Документи
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +17,Ref,Ref
 DocType: Cost Center,Cost Center,Cost Center
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.js +48,Voucher #,Ваучер #
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +36,Voucher #,Ваучер #
 DocType: Notification Control,Purchase Order Message,Поръчка за покупка на ЛС
 DocType: Tax Rule,Shipping Country,Доставка Country
 DocType: Upload Attendance,Upload HTML,Качи HTML
-apps/erpnext/erpnext/controllers/accounts_controller.py +391,"Total advance ({0}) against Order {1} cannot be greater \
+apps/erpnext/erpnext/controllers/accounts_controller.py +392,"Total advance ({0}) against Order {1} cannot be greater \
 				than the Grand Total ({2})",Общо предварително ({0}) срещу Заповед {1} не може да бъде по-голям \ от общия сбор ({2})
 DocType: Employee,Relieving Date,Облекчаване Дата
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +12,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.","Ценообразуване правило се прави, за да презапише Ценоразпис / определи отстъпка процент, базиран на някои критерии."
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,Warehouse може да се променя само чрез фондова Entry / Бележка за доставка / Покупка Разписка
 DocType: Employee Education,Class / Percentage,Клас / Процент
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +92,Head of Marketing and Sales,Ръководител на отдел Маркетинг и Продажби
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +31,Income Tax,Данък общ доход
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +157,Laser engineered net shaping,Laser инженерство нетна оформяне
+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.","Ако избран ценообразуване правило се прави за &quot;Цена&quot;, той ще замени ценовата листа. Ценообразуване Правило цена е крайната цена, така че не се колебайте отстъпка трябва да се прилага. Следователно, при сделки, като продажби поръчка за покупка и т.н., то ще бъдат изведени в поле &quot;Оцени&quot;, а не поле &quot;Ценоразпис Курсове&quot;."
 apps/erpnext/erpnext/config/selling.py +163,Track Leads by Industry Type.,Track Изводи от Industry Type.
 DocType: Item Supplier,Item Supplier,Позиция доставчик
@@ -2144,31 +2072,28 @@
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Действително Количество След Трансакция
 ,Pending SO Items For Purchase Request,До SO артикули за покупка Искане
 DocType: Supplier,Billing Currency,Billing валути
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +148,Extra Large,Много Голям
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,Extra Large,Много Голям
 ,Profit and Loss Statement,На печалбите и загубите
 DocType: Bank Reconciliation Detail,Cheque Number,Чек Номер
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +43,Pressing,Натискане
 DocType: Payment Tool Detail,Payment Tool Detail,Заплащане Tool Подробности
 ,Sales Browser,Продажбите Browser
 DocType: Journal Entry,Total Credit,Общ кредит
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +474,Warning: Another {0} # {1} exists against stock entry {2},Съществува Друг {0} # {1} срещу входната запас {2}: Предупреждение
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +459,Local,Местен
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +476,Warning: Another {0} # {1} exists against stock entry {2},Съществува Друг {0} # {1} срещу входната запас {2}: Предупреждение
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +397,Local,Местен
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),Кредитите и авансите (активи)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,Длъжници
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +147,Large,Голям
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +23,No employee found!,Никой служител е открит!
+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 +152,Please mention no of visits required,"Моля, не споменете на посещенията, изисквани"
 DocType: Purchase Order,Customer Address Display,Customer Адрес Display
 DocType: Stock Settings,Default Valuation Method,Метод на оценка Default
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +127,Polishing,Полиране
 DocType: Production Order Operation,Planned Start Time,Планиран Start Time
 apps/erpnext/erpnext/config/accounts.py +63,Close Balance Sheet and book Profit or Loss.,Close Баланс и книга печалбата или загубата.
-apps/erpnext/erpnext/stock/doctype/item/item.py +661,"Default Unit of Measure for Item {0} cannot be changed directly because \
+apps/erpnext/erpnext/stock/doctype/item/item.py +665,"Default Unit of Measure for Item {0} cannot be changed directly because \
 			you have already made some transaction(s) with another UOM. To change default UOM, \
 			use 'UOM Replace Utility' tool under Stock module.","Default мерната единица за т {0} не може да се променя директно, защото \ вас вече са направили някаква сделка (и) с друга мерна единица. За да промените по подразбиране мерна единица, \ употреба &quot;мерна единица Сменете Utility&quot; инструмент по Фондова модул."
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,Посочете Валутен курс за конвертиране на една валута в друга
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +146,Quotation {0} is cancelled,Цитат {0} е отменен
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +141,Quotation {0} is cancelled,Цитат {0} е отменен
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,Общият размер
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} was on leave on {1}. Cannot mark attendance.,Служител {0} е бил в отпуск по {1}. Не може да се маркира и обслужване.
 DocType: Sales Partner,Targets,Цели
@@ -2179,7 +2104,6 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +158,Please create Customer from Lead {0},"Моля, създайте Customer от Lead {0}"
 DocType: Price List,Applicable for Countries,Приложимо за Държави
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Computers,Компютри
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +112,Electro-chemical grinding,Electro-химична смилане
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +14,This is a root customer group and cannot be edited.,Това е корен група клиенти и не може да се редактира.
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +39,Please setup your chart of accounts before you start Accounting Entries,"Моля, настройка на вашия сметкоплан, преди да започнете счетоводни записвания"
 DocType: Purchase Invoice,Ignore Pricing Rule,Игнориране на ценообразуване Правило
@@ -2225,7 +2149,6 @@
 DocType: Maintenance Visit,Purposes,Цел
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +103,Atleast one item should be entered with negative quantity in return document,Поне един елемент следва да бъде вписано с отрицателна величина в замяна документ
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +67,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","Операция {0} по-дълго от всички налични работни часа в работно {1}, съборят операцията в множество операции"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +134,Electrochemical machining,Електрохимична обработка
 ,Requested,Заявени
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +66,No Remarks,Без забележки
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +13,Overdue,Просрочен
@@ -2234,7 +2157,7 @@
 DocType: Monthly Distribution,Distribution Name,Разпределение Име
 DocType: Features Setup,Sales and Purchase,Продажба и покупка
 DocType: Supplier Quotation Item,Material Request No,Материал Заявка Не
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +218,Quality Inspection required for Item {0},"Инспекция на качеството, необходимо за т {0}"
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +221,Quality Inspection required for Item {0},"Инспекция на качеството, необходимо за т {0}"
 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),Net Rate (Company валути)
@@ -2252,9 +2175,8 @@
 apps/erpnext/erpnext/accounts/report/financial_statements.py +16,Fiscal Year {0} not found.,Фискална година {0} не е намерен.
 DocType: Bank Reconciliation,Get Relevant Entries,Вземете съответните вписвания
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +407,Accounting Entry for Stock,Счетоводен запис за Складова аличност
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +64,Coining,Печели доста
 DocType: Sales Invoice,Sales Team1,Продажбите Team1
-apps/erpnext/erpnext/stock/doctype/item/item.py +412,Item {0} does not exist,Точка {0} не съществува
+apps/erpnext/erpnext/stock/doctype/item/item.py +416,Item {0} does not exist,Точка {0} не съществува
 DocType: Sales Invoice,Customer Address,Customer Адрес
 apps/frappe/frappe/desk/query_report.py +136,Total,Общо
 DocType: Purchase Invoice,Apply Additional Discount On,Нанесете Допълнителна отстъпка от
@@ -2266,14 +2188,13 @@
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),Данъчен сума след Сума Discount (Company валути)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +149,Target warehouse is mandatory for row {0},Target склад е задължително за поредна {0}
 DocType: Quality Inspection,Quality Inspection,Проверка на качеството
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +144,Extra Small,Extra Small
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +20,Spray forming,Спрей формиране
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Extra Small,Extra Small
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +458,Warning: Material Requested Qty is less than Minimum Order Qty,Внимание: Материал Заявени Количество е по-малко от минималното Поръчка Количество
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +191,Account {0} is frozen,Сметка {0} е замразена
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,"Legal Entity / Дъщерно дружество с отделен сметкоплан, членуващи в организацията."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +29,"Food, Beverage & Tobacco","Храни, напитки и тютюневи"
+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 +529,Can only make payment against unbilled {0},Мога само да направи плащане срещу нетаксувано {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +531,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/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Minimum Inventory Level,Минимална Инвентаризация Level
 DocType: Stock Entry,Subcontract,Подизпълнение
@@ -2284,19 +2205,18 @@
 DocType: Item,Manufacturer Part Number,Производител Номер
 DocType: Production Order Operation,Estimated Time and Cost,Очаквано време и разходи
 DocType: Bin,Bin,Хамбар
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +50,Nosing,Ръб на стъпало
 DocType: SMS Log,No of Sent SMS,Не на изпратените SMS
 DocType: Account,Company,Компания
 DocType: Account,Expense Account,Expense Account
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +49,Software,Software
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +151,Colour,Цвят
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +49,Software,Software
+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","Моля изберете позиция, където &quot;е Фондова Позиция&quot; е &quot;Не&quot; и &quot;Е-продажба точка&quot; е &quot;Да&quot; и няма друг Bundle продукта"
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,Изберете месец Distribution да неравномерно разпределяне цели през месеца.
 DocType: Purchase Invoice Item,Valuation Rate,Оценка Оценка
 apps/erpnext/erpnext/stock/get_item_details.py +281,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,Позиция Row {0}: Покупка Квитанция {1} не съществува в таблицата по-горе &quot;Покупка Приходи&quot;
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +134,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 +145,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,Преименуване Log
@@ -2306,7 +2226,7 @@
 apps/erpnext/erpnext/controllers/recurring_document.py +162,Please select {0},Моля изберете {0}
 DocType: C-Form,C-Form No,C-Form Не
 DocType: BOM,Exploded_items,Exploded_items
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +95,Researcher,Изследовател
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Researcher,Изследовател
 apps/frappe/frappe/custom/doctype/customize_form/customize_form.js +88,Update,Актуализация
 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 +23,Name or Email is mandatory,Име или имейл е задължително
@@ -2315,11 +2235,10 @@
 DocType: Employee,Exit,Изход
 apps/erpnext/erpnext/accounts/doctype/account/account.py +134,Root Type is mandatory,Root Type е задължително
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +295,Serial No {0} created,Пореден № {0} е създадена
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +125,Vibratory finishing,Вибрационна окончателна обработка
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","За удобство на клиентите, тези кодове могат да бъдат използвани в печатни формати като фактури и доставка Notes"
 DocType: Employee,You can enter any date manually,Можете да въведете всяка дата ръчно
 DocType: Sales Invoice,Advertisement,Реклама
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +165,Probationary Period,Изпитателен Срок
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Probationary Period,Изпитателен Срок
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Само листните възли са позволени в сделка
 DocType: Expense Claim,Expense Approver,Expense одобряващ
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,Покупка Квитанция приложените аксесоари
@@ -2327,19 +2246,16 @@
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +17,To Datetime,Към за дата
 DocType: SMS Settings,SMS Gateway URL,SMS Gateway URL
 apps/erpnext/erpnext/config/crm.py +53,Logs for maintaining sms delivery status,Дневници за поддържане състоянието на доставка SMS
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +137,Grinding,Стържещ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +34,Shrink wrapping,Свиване опаковане
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +36,Pending Activities,Предстоящите дейности
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,Confirmed,Потвърден
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier > Supplier Type,Доставчик&gt; Доставчик Type
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +127,Please enter relieving date.,"Моля, въведете облекчаване дата."
 apps/erpnext/erpnext/controllers/trends.py +137,Amt,Amt
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' can be submitted,"Оставете само заявления, със статут на &quot;Одобрена&quot; може да бъде подадено"
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +51,Only Leave Applications with status 'Approved' can be submitted,"Оставете само заявления, със статут на &quot;Одобрена&quot; може да бъде подадено"
 apps/erpnext/erpnext/utilities/doctype/address/address.py +21,Address Title is mandatory.,Заглавие на Адрес е задължително.
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,"Въведете името на кампанията, ако източник на запитване е кампания"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +38,Newspaper Publishers,Издателите на вестници
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +38,Newspaper Publishers,Издателите на вестници
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,Изберете фискална година
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +88,Smelting,Топене
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Пренареждане Level
 DocType: Attendance,Attendance Date,Присъствие Дата
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,Заплата раздялата въз основа на доходите и приспадане.
@@ -2354,16 +2270,15 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +414,[Error],[Грешка]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,По думите ще бъде видим след като спаси поръчка за продажба.
 ,Employee Birthday,Служител Birthday
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +55,Venture Capital,Venture Capital
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,Venture Capital
 DocType: UOM,Must be Whole Number,Трябва да е цяло число
 DocType: Leave Control Panel,New Leaves Allocated (In Days),Нови листа Отпуснати (в дни)
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +51,Serial No {0} does not exist,Пореден № {0} не съществува
 DocType: Pricing Rule,Discount Percentage,Отстъпка Процент
 DocType: Payment Reconciliation Invoice,Invoice Number,Номер на фактура
-apps/erpnext/erpnext/hooks.py +70,Orders,Заповеди
+apps/erpnext/erpnext/hooks.py +54,Orders,Заповеди
 DocType: Leave Control Panel,Employee Type,Тип Employee
 DocType: Employee Leave Approver,Leave Approver,Оставете одобряващ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +70,Swaging,Земни работи
 DocType: Manufacturing Settings,Material Transferred for Manufacture,Материал Прехвърлен за Производство
 DocType: Expense Claim,"A user with ""Expense Approver"" role","Потребител с роля "" Одобряващ разходи"""
 ,Issued Items Against Production Order,Издадени артикули срещу производството Поръчка
@@ -2375,7 +2290,6 @@
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +62,Cost Center with existing transactions can not be converted to group,Cost Center със съществуващите операции не могат да бъдат превърнати в група
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Depreciation,Амортизация
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Доставчик (ци)
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +29,Invalid period,Невалиден период
 DocType: Customer,Credit Limit,Кредитен лимит
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,Изберете тип сделка
 DocType: GL Entry,Voucher No,Отрязък №
@@ -2385,9 +2299,9 @@
 DocType: Customer,Address and Contact,Адрес и контакти
 DocType: Customer,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}"
 apps/erpnext/erpnext/accounts/party.py +284,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Забележка: Поради / Референция Дата надвишава право кредитни клиент дни от {0} ден (и)
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +621,Maint. Schedule,Мейнт. Разписание
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +108,Abrasive jet machining,Абразивно струйно обработване
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +632,Maint. Schedule,Мейнт. Разписание
 DocType: Stock Settings,Freeze Stock Entries,Фиксиране на вписване в запасите
 DocType: Website Settings,Website Settings,Настройки Сайт
 DocType: Item,Reorder level based on Warehouse,Пренареждане равнище въз основа на Warehouse
@@ -2404,7 +2318,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +75,Show Stock Entries,Показване на вписване в запасите
 ,Is Primary Address,Дали Основен адрес
 DocType: Production Order,Work-in-Progress Warehouse,Работа в прогрес Warehouse
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +308,Reference #{0} dated {1},Референтен # {0} от {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Reference #{0} dated {1},Референтен # {0} от {1}
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +13,Manage Addresses,Управление на адреси
 DocType: Pricing Rule,Item Code,Код
 DocType: Production Planning Tool,Create Production Orders,Създаване на производствени поръчки
@@ -2413,7 +2327,7 @@
 DocType: Lead,Market Segment,Пазарен сегмент
 DocType: Communication,Phone,Телефон
 DocType: Employee Internal Work History,Employee Internal Work History,Служител Вътрешен Work История
-apps/erpnext/erpnext/public/js/account_tree_grid.js +50,Closing (Dr),Закриване (Dr)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +221,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.,Данъчна шаблон за продажба сделки.
@@ -2429,8 +2343,8 @@
 ,Billed Amount,Обявен Сума
 DocType: Bank Reconciliation,Bank Reconciliation,Bank помирение
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +9,Get Updates,Получаване на актуализации
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +129,Material Request {0} is cancelled or stopped,Материал Заявка {0} е отменен или спрян
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +641,Add a few sample records,Добавяне на няколко примерни записи
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +133,Material Request {0} is cancelled or stopped,Материал Заявка {0} е отменен или спрян
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Add a few sample records,Добавяне на няколко примерни записи
 apps/erpnext/erpnext/config/hr.py +210,Leave Management,Оставете Management
 DocType: Event,Groups,Групи
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,Групата от Профил
@@ -2443,38 +2357,34 @@
 DocType: Features Setup,Sales Extras,Продажби Екстри
 apps/erpnext/erpnext/accounts/utils.py +344,{0} budget for Account {1} against Cost Center {2} will exceed by {3},{0} бюджет за Смтка {1} срещу Разходен Център {2} ще превишава с {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +236,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Разлика трябва да се вида на актива / Отговорност сметка, тъй като това Фондова Помирението е Откриване Влизане"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +138,Purchase Order number required for Item {0},"Поръчка за покупка брой, необходим за т {0}"
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Order number required for Item {0},"Поръчка за покупка брой, необходим за т {0}"
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',&quot;От дата&quot; трябва да е след &quot;Към днешна дата&quot;
 ,Stock Projected Qty,Фондова Прогнозно Количество
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +147,Customer {0} does not belong to project {1},Customer {0} не принадлежи на проекта {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +150,Customer {0} does not belong to project {1},Customer {0} не принадлежи на проекта {1}
 DocType: Sales Order,Customer's Purchase Order,Поръчката на Клиента
 DocType: Warranty Claim,From Company,От Company
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,Стойност или Количество
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Minute,Минута
+apps/erpnext/erpnext/public/js/setup_wizard.js +363,Minute,Минута
 DocType: Purchase Invoice,Purchase Taxes and Charges,Покупка данъци и такси
 ,Qty to Receive,Количество за да получат за
 DocType: Leave Block List,Leave Block List Allowed,Оставете Block List любимци
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +61,Conversion factor cannot be in fractions,Коефициент на преобразуване не може да бъде по фракции
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +358,You will use it to Login,Вие ще го използвате за вход
+apps/erpnext/erpnext/public/js/setup_wizard.js +108,You will use it to Login,Вие ще го използвате за вход
 DocType: Sales Partner,Retailer,Търговец на дребно
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +99,Credit To account must be a Balance Sheet account,Credit За сметка трябва да бъде партида Баланс
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,Всички Видове Доставчик
 apps/erpnext/erpnext/stock/doctype/item/item.py +37,Item Code is mandatory because Item is not automatically numbered,"Код е задължително, тъй като опция не се номерира автоматично"
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +99,Quotation {0} not of type {1},Цитат {0} не от типа {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +93,Quotation {0} not of type {1},Цитат {0} не от типа {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,График за техническо обслужване Точка
 DocType: Sales Order,%  Delivered,% Доставени
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,Bank Overdraft Account,Овърдрафт Акаунт
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +15,Make Salary Slip,Направи Заплата Slip
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +18,Browse BOM,Browse BOM
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +175,Secured Loans,Обезпечени кредити
-apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +3,Awesome Products,Яки Продукти
+apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +3,Awesome Products,Яки Продукти
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +189,Opening Balance Equity,Началното салдо Equity
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +80,Cannot approve leave as you are not authorized to approve leaves on Block Dates,"Не може да одобри отпуск, тъй като не са получили разрешение да одобрява листа на Блок Дати"
 DocType: Appraisal,Appraisal,Оценка
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +13,Lost-foam casting,Леене Загубил-пяна
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +47,Drawing,Чертеж
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +22,Date is repeated,Дата се повтаря
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +148,Leave approver must be one of {0},Оставете одобряващ трябва да бъде един от {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +162,Leave approver must be one of {0},Оставете одобряващ трябва да бъде един от {0}
 DocType: Hub Settings,Seller Email,Продавач Email
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Общата покупна цена на придобиване (чрез покупка на фактура)
 DocType: Workstation Working Hour,Start Time,Начален Час
@@ -2488,7 +2398,7 @@
 DocType: Purchase Invoice Item,Net Amount (Company Currency),Нетната сума (Company валути)
 DocType: BOM Operation,Hour Rate,Час Курсове
 DocType: Stock Settings,Item Naming By,"Позиция наименуването им,"
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +642,From Quotation,От цитата
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +655,From Quotation,От цитата
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},Друг период Закриване Влизане {0} е направено след {1}
 DocType: Production Order,Material Transferred for Manufacturing,"Материал, прехвърлен за производство"
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +29,Account {0} does not exists,Сметка {0} не съществува
@@ -2502,21 +2412,19 @@
 DocType: Purchase Invoice Item,PR Detail,PR Подробности
 DocType: Sales Order,Fully Billed,Напълно Обявен
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +20,Cash In Hand,Парични средства в брой
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +72,Delivery warehouse required for stock item {0},Доставка склад изисква за склад т {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +119,Delivery warehouse required for stock item {0},Доставка склад изисква за склад т {0}
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),Брутното тегло на опаковката. Обикновено нетно тегло + опаковъчен материал тегло. (За печат)
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Потребителите с тази роля е разрешено да задават замразени сметки и да се създаде / модифицира счетоводни записи срещу замразените сметки
 DocType: Serial No,Is Cancelled,Дали Отменен
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +281,My Shipments,Моите пратки
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +286,My Shipments,Моите пратки
 DocType: Journal Entry,Bill Date,Бил Дата
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +43,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","Дори и да има няколко ценови правила с най-висок приоритет, се прилагат след това следните вътрешни приоритети:"
 DocType: Supplier,Supplier Details,Доставчик Детайли
 DocType: Communication,Recipients,Получатели
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +146,Screwing,Завинтване
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +96,Knurling,Набраздяване
 DocType: Expense Claim,Approval Status,Одобрение Status
 DocType: Hub Settings,Publish Items to Hub,Публикуване продукти в Hub
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +44,From value must be less than to value in row {0},"От стойност трябва да е по-малко, отколкото на стойност в ред {0}"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +133,Wire Transfer,Банков Превод
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +133,Wire Transfer,Банков Превод
 apps/erpnext/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py +25,Please select Bank Account,Моля изберете Bank Account
 DocType: Newsletter,Create and Send Newsletters,Създаване и изпращане Бюлетини
 apps/frappe/frappe/public/js/frappe/views/reports/grid_report.js +305,From Date must be before To Date,От дата трябва да е преди Към днешна дата
@@ -2524,14 +2432,14 @@
 DocType: Company,Default Income Account,Account Default подоходно
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,Customer Group / Customer
 DocType: Item Group,Check this if you want to show in website,"Проверете това, ако искате да се показват в сайт"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +190,Welcome to ERPNext,Добре дошли в ERPNext
+,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,От Customer
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +37,Calls,Призовава
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Calls,Призовава
 DocType: Project,Total Costing Amount (via Time Logs),Общо Остойностяване сума (чрез Time Logs)
 DocType: Purchase Order Item Supplied,Stock UOM,Склад за мерна единица
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Purchase Order {0} is not submitted,Поръчка за покупка {0} не е подадена
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +194,Purchase Order {0} is not submitted,Поръчка за покупка {0} не е подадена
 ,Projected,Проектиран
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},Пореден № {0} не принадлежи на Warehouse {1}
 apps/erpnext/erpnext/controllers/status_updater.py +136,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Забележка: Системата няма да се покажат над-доставка и свръх-резервации за позиция {0} като количество или стойност е 0
@@ -2539,7 +2447,6 @@
 DocType: Issue,Opening Date,Откриване Дата
 DocType: Journal Entry,Remark,Забележка
 DocType: Purchase Receipt Item,Rate and Amount,Процент и размер
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +95,Boring,Пробиване
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +667,From Sales Order,От продажби Поръчка
 DocType: Blog Category,Parent Website Route,Родител Website Route
 DocType: Sales Order,Not Billed,Не Обявен
@@ -2553,19 +2460,17 @@
 apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount Amount,Отстъпка Сума
 DocType: Purchase Invoice,Return Against Purchase Invoice,Върнете Срещу фактурата за покупка
 DocType: Item,Warranty Period (in days),Гаранционен срок (в дни)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +550,e.g. VAT,например ДДС
+apps/erpnext/erpnext/public/js/setup_wizard.js +292,e.g. VAT,например ДДС
 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,Цитат Series
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +52,"An item exists with same name ({0}), please change the item group name or rename the item","Една статия, съществува със същото име ({0}), моля да промените името на стокова група или преименувате елемента"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +82,Hot metal gas forming,Формиране Hot метална газ
 DocType: Sales Order Item,Sales Order Date,Продажбите Поръчка Дата
 DocType: Sales Invoice Item,Delivered Qty,Доставени Количество
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +63,Warehouse {0}: Company is mandatory,Warehouse {0}: Company е задължително
 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.",Отидете на подходящата група (обикновено източник на средства&gt; Текущи задължения&gt; данъци и мита и да създадете нов акаунт (като кликнете върху Добавяне на детето) от тип &quot;данък&quot; и се споменава Данъчната ставка.
 ,Payment Period Based On Invoice Date,Заплащане Период на базата на датата на фактурата
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +50,Missing Currency Exchange Rates for {0},Липсва обмен на валута цени за {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +135,Laser cutting,Лазерно рязане
 DocType: Event,Monday,Понеделник
 DocType: Journal Entry,Stock Entry,Склад за вписване
 DocType: Account,Payable,Платим
@@ -2598,7 +2503,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +111,Date Of Retirement must be greater than Date of Joining,Дата на пенсиониране трябва да е по-голяма от Дата на Присъединяване
 DocType: Sales Invoice,Against Income Account,Срещу Приходна Сметка
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +69,{0}% Delivered,{0}% Доставени
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +78,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Точка {0}: Поръчано Количество {1} не може да бъде по-малък от минималния Количество цел {2} (дефинирана в точка).
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Точка {0}: Поръчано Количество {1} не може да бъде по-малък от минималния Количество цел {2} (дефинирана в точка).
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Месечен Процентно разпределение
 DocType: Territory,Territory Targets,Територия Цели
 DocType: Delivery Note,Transporter Info,Transporter Info
@@ -2607,7 +2512,6 @@
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,"Заглавия за шаблони за печат, например проформа фактура."
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +140,Valuation type charges can not marked as Inclusive,Такси тип оценка не може маркирани като Inclusive
 DocType: POS Profile,Update Stock,Актуализация Фондова
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +128,Superfinishing,Свръхзаглаждането
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,"Different мерна единица за елементи ще доведе до неправилно (Total) Нетна стойност на теглото. Уверете се, че нетното тегло на всеки артикул е в една и съща мерна единица."
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM Курсове
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +85,Please pull items from Delivery Note,"Моля, дръпнете елементи от Delivery Note"
@@ -2622,7 +2526,6 @@
 ,Purchase Analytics,Изкупните Analytics
 DocType: Sales Invoice Item,Delivery Note Item,Бележка за доставка Позиция
 DocType: Expense Claim,Task,Задача
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +57,Shaving,Бръснене
 DocType: Purchase Taxes and Charges,Reference Row #,Референтен Row #
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},Номер на партидата е задължително за т {0}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js +14,This is a root sales person and cannot be edited.,"Това е човек, корен на продажбите и не може да се редактира."
@@ -2634,13 +2537,11 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +74,Purpose must be one of {0},Цел трябва да бъде един от {0}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +108,Fill the form and save it,Попълнете формата и да го запишете
 DocType: Production Planning Tool,Download a report containing all raw materials with their latest inventory status,"Свали доклад, съдържащ всички суровини с най-новите си статус инвентара"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +94,Facing,Облицовка
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,Community Forum
 DocType: Leave Application,Leave Balance Before Application,Оставете Balance Преди Application
 DocType: SMS Center,Send SMS,Изпратете SMS
 DocType: Company,Default Letter Head,По подразбиране Letter Head
 DocType: Time Log,Billable,Подлежащи на таксуване
-DocType: Authorization Rule,This will be used for setting rule in HR module,Това ще бъде използвано за създаване правило в HR модул
 DocType: Account,Rate at which this tax is applied,"Скоростта, с която се прилага този данък"
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reorder Qty,Пренареждане Количество
 DocType: Company,Stock Adjustment Account,Склад за приспособяване Акаунт
@@ -2667,16 +2568,15 @@
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,Процентно разпределение следва да е равна на 100%
 DocType: Serial No,Out of AMC,Няма AMC
 DocType: Purchase Order Item,Material Request Detail No,Материал Заявка Подробности Не
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +97,Hard turning,Hard повратна
 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,Default Cash Акаунт
 apps/erpnext/erpnext/config/accounts.py +79,Company (not Customer or Supplier) master.,Company (не клиент или доставчик) майстор.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +106,Please enter 'Expected Delivery Date',"Моля, въведете &quot;Очаквана дата на доставка&quot;"
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +187,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Доставка Notes {0} трябва да се отмени преди анулирането този Продажби Поръчка
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +100,Please enter 'Expected Delivery Date',"Моля, въведете &quot;Очаквана дата на доставка&quot;"
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +182,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Доставка Notes {0} трябва да се отмени преди анулирането този Продажби Поръчка
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +373,Paid amount + Write Off Amount can not be greater than Grand Total,Платената сума + отпишат сума не може да бъде по-голяма от Grand Total
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} не е валиден Партиден номер за {1}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,Note: There is not enough leave balance for Leave Type {0},Забележка: Няма достатъчно отпуск баланс за отпуск Тип {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +124,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,Opportunity Type
@@ -2688,7 +2588,7 @@
 DocType: Hub Settings,Publish Availability,Публикуване Наличност
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +105,Date of Birth cannot be greater than today.,"Дата на раждане не може да бъде по-голяма, отколкото е днес."
 ,Stock Ageing,Склад за живот на възрастните хора
-apps/erpnext/erpnext/controllers/accounts_controller.py +200,{0} '{1}' is disabled,{0} &quot;{1}&quot; е деактивирана
+apps/erpnext/erpnext/controllers/accounts_controller.py +201,{0} '{1}' is disabled,{0} &quot;{1}&quot; е деактивирана
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Задай като Open
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Изпрати автоматични имейли в Контакти при подаването на сделки.
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +232,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
@@ -2697,44 +2597,38 @@
 DocType: Purchase Order,Customer Contact Email,Customer Контакт Email
 DocType: Event,Sunday,Неделя
 DocType: Sales Team,Contribution (%),Принос (%)
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +455,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,Забележка: Плащане Влизане няма да се създали от &quot;пари или с банкова сметка&quot; Не е посочено
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +171,Responsibilities,Отговорности
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +457,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,Забележка: Плащане Влизане няма да се създали от &quot;пари или с банкова сметка&quot; Не е посочено
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +171,Responsibilities,Отговорности
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,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/setup/page/setup_wizard/setup_wizard.js +511,Add Users,Добави Потребители
+apps/erpnext/erpnext/public/js/setup_wizard.js +255,Add Users,Добави Потребители
 DocType: Pricing Rule,Item Group,Позиция Group
 DocType: Task,Actual Start Date (via Time Logs),Действителна Начална дата (чрез 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),Данъци и такси Добавен (Company валути)
-apps/erpnext/erpnext/stock/doctype/item/item.py +340,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Позиция Tax Row {0} Трябва да имате предвид тип данък или приход или разход или Дължими
+apps/erpnext/erpnext/stock/doctype/item/item.py +344,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Позиция Tax Row {0} Трябва да имате предвид тип данък или приход или разход или Дължими
 DocType: Sales Order,Partly Billed,Частично Обявен
 DocType: Item,Default BOM,Default BOM
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +79,Decambering,Decambering
 apps/erpnext/erpnext/setup/doctype/company/company.js +22,Please re-type company name to confirm,"Моля име повторно вид фирма, за да потвърдите"
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,Общият размер на неизплатените Amt
 DocType: Time Log Batch,Total Hours,Общо Часа
 DocType: Journal Entry,Printing Settings,Настройки за печат
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +268,Total Debit must be equal to Total Credit. The difference is {0},Общ дебит трябва да бъде равна на Общ кредит. Разликата е {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +11,Automotive,Автомобилен
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +37,Item is required,Е необходим елемент
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +25,Metal injection molding,Метални шприцоване
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +258,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/accounts/doctype/sales_invoice/sales_invoice.js +684,From Delivery Note,От Бележка за доставка
 DocType: Time Log,From Time,От време
 DocType: Notification Control,Custom Message,Персонализирано съобщение
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +33,Investment Banking,Инвестиционно банкиране
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +261,"Select your Country, Time Zone and Currency","Изберете вашата държава, Time Zone и валути"
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,Инвестиционно банкиране
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +316,"Select your Country, Time Zone and Currency","Изберете вашата държава, Time Zone и валути"
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +369,Cash or Bank Account is mandatory for making payment entry,Брой или банкова сметка е задължителна за вземане на влизане плащане
 DocType: Purchase Invoice,Price List Exchange Rate,Ценоразпис Валутен курс
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +91,Pickling,Мариноване
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +18,Sand casting,Пясък леене
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +117,Electroplating,Галванопластика
 DocType: Purchase Invoice Item,Rate,Скорост
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +62,Intern,Интерниран
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Intern,Интерниран
 DocType: Newsletter,A Lead with this email id should exist,A Lead with this email id should exist 
 DocType: Stock Entry,From BOM,От BOM
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +34,Basic,Основен
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +34,Basic,Основен
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,Сток сделки преди {0} са замразени
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +217,Please click on 'Generate Schedule',"Моля, кликнете върху &quot;Генериране Schedule&quot;"
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +61,To Date should be same as From Date for Half Day leave,"Към днешна дата трябва да бъде една и съща от датата, за половин ден отпуск"
@@ -2742,10 +2636,10 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +96,Reference No is mandatory if you entered Reference Date,"Референтен Не е задължително, ако сте въвели, Референция Дата"
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +108,Date of Joining must be greater than Date of Birth,Дата на Присъединяване трябва да е по-голяма от Дата на раждане
 DocType: Salary Structure,Salary Structure,Структура Заплата
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +242,"Multiple Price Rule exists with same criteria, please resolve \
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +246,"Multiple Price Rule exists with same criteria, please resolve \
 			conflict by assigning priority. Price Rules: {0}","Multiple Цена правило съществува с едни и същи критерии, моля решаване \ конфликт чрез възлагане приоритет. Цена Правила: {0}"
 DocType: Account,Bank,Банка
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +9,Airline,Авиолиния
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,Авиолиния
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +493,Issue Material,Материал Issue
 DocType: Material Request Item,For Warehouse,За Warehouse
 DocType: Employee,Offer Date,Оферта Дата
@@ -2755,29 +2649,24 @@
 DocType: Item,Is Fixed Asset Item,Е фиксирана позиция в актива
 DocType: Stock Entry,Including items for sub assemblies,Включително артикули за под събрания
 DocType: Features Setup,"If you have long print formats, this feature can be used to split the page to be printed on multiple pages with all headers and footers on each page","Ако имате дълги формати за печат, тази функция може да се използва за разделяне на страницата, за да бъдат отпечатани на няколко страници с всички горни и долни колонтитули на всяка страница"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +131,Hobbing,Hobbing
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +98,All Territories,Всички територии
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +98,All Territories,Всички територии
 DocType: Purchase Invoice,Items,Предмети
 DocType: Fiscal Year,Year Name,Година Име
 DocType: Process Payroll,Process Payroll,Process Payroll
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +59,There are more holidays than working days this month.,Има повече почивки в работни дни този месец.
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +68,There are more holidays than working days this month.,Има повече почивки в работни дни този месец.
 DocType: Product Bundle Item,Product Bundle Item,Каталог Bundle Точка
 DocType: Sales Partner,Sales Partner Name,Продажбите Partner Име
 DocType: Purchase Invoice Item,Image View,Вижте изображението
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +113,Finishing & industrial finishing,Довършителни и промишлена обработка
 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/page/setup_wizard/fixtures/industry_type.py +46,Securities & Commodity Exchanges,Ценни книжа и стоковите борси
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Ценни книжа и стоковите борси
 DocType: Shipping Rule,Calculate Based On,Изчислете основава на
 DocType: Delivery Note Item,From Warehouse,От Warehouse
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +98,Drilling,Пробиване
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +28,Blow molding,Бластване
 DocType: Purchase Taxes and Charges,Valuation and Total,Оценка и Total
 DocType: Tax Rule,Shipping City,Доставка City
 apps/erpnext/erpnext/stock/doctype/item/item.js +43,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,"Тази позиция е вариант на {0} (по образец). Атрибути ще бъдат копирани от шаблона, освен ако &quot;Не Copy&quot; е зададен"
 DocType: Account,Purchase User,Покупка на потребителя
 DocType: Notification Control,Customize the Notification,Персонализиране на Notification
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +87,Hammering,Чукане
 DocType: Web Page,Slideshow,Slideshow
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +24,Default Address Template cannot be deleted,Default Адрес Template не може да бъде изтрита
 DocType: Sales Invoice,Shipping Rule,Доставка Правило
@@ -2786,9 +2675,8 @@
 DocType: Workflow State,Search,Търсене
 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/setup/page/setup_wizard/fixtures/operations.py +142,Brazing,Твърда заварка
 DocType: C-Form,Amended From,Изменен От
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Raw Material,Суров Материал
+apps/erpnext/erpnext/public/js/setup_wizard.js +359,Raw Material,Суров Материал
 DocType: Leave Application,Follow via Email,Следвайте по имейл
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Данъчен сума след Сума Отстъпка
 apps/erpnext/erpnext/accounts/doctype/account/account.py +174,Child account exists for this account. You can not delete this account.,Предвид Child съществува за този профил. Не можете да изтриете този профил.
@@ -2802,10 +2690,10 @@
 ,Produced,Продуциран
 DocType: Item,Item Code for Suppliers,Код на доставчици
 DocType: Issue,Raised By (Email),Повдигнат от (Email)
-apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +72,General,Общ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +495,Attach Letterhead,Прикрепете бланки
+apps/erpnext/erpnext/setup/setup_wizard/default_website.py +72,General,Общ
+apps/erpnext/erpnext/public/js/setup_wizard.js +241,Attach Letterhead,Прикрепете бланки
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +272,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',Не може да се приспадне при категория е за &quot;оценка&quot; или &quot;Оценка и Total&quot;
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +542,"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/public/js/setup_wizard.js +284,"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}"
 DocType: Journal Entry,Bank Entry,Bank Влизане
 DocType: Authorization Rule,Applicable To (Designation),Приложими по отношение на (наименование)
@@ -2814,32 +2702,31 @@
 apps/erpnext/erpnext/config/accounts.py +143,Enable / disable currencies.,Включване / Изключване на валути.
 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)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +26,Entertainment & Leisure,Entertainment &amp; Leisure
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,Entertainment &amp; Leisure
 DocType: Purchase Order,The date on which recurring order will be stop,"Датата, на която повтарящ цел ще бъде да спре"
 DocType: Quality Inspection,Item Serial No,Позиция Пореден №
 apps/erpnext/erpnext/controllers/status_updater.py +142,{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 +57,Total Present,Общо Present
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Hour,Час
+apps/erpnext/erpnext/public/js/setup_wizard.js +363,Hour,Час
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +138,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation",Сериализирани т {0} не може да бъде актуализиран \ използвайки фондова помирение
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +488,Transfer Material to Supplier,Трансфер Материал на доставчик
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +513,Transfer Material to Supplier,Трансфер Материал на доставчик
 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,New Serial Не може да има Warehouse. Warehouse трябва да бъде определен от Фондова Влизане или покупка Разписка
 DocType: Lead,Lead Type,Lead Type
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +82,Create Quotation,Създаване на цитата
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +306,All these items have already been invoiced,Всички тези елементи вече са били фактурирани
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,You are not authorized to approve leaves on Block Dates,Вие нямате право да одобри листата на Блок Дати
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +311,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,Новият BOM след подмяна
 DocType: Features Setup,Point of Sale,Точка на продажба
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +83,Curling,Кърлинг
 DocType: Account,Tax,Данък
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +28,Row {0}: {1} is not a valid {2},Row {0}: {1} не е валиден {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +89,Refining,Refining
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +37,Row {0}: {1} is not a valid {2},Row {0}: {1} не е валиден {2}
 DocType: Production Planning Tool,Production Planning Tool,Tool Производствено планиране
 DocType: Quality Inspection,Report Date,Доклад Дата
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +130,Routing,Routing
 DocType: C-Form,Invoices,Фактури
 DocType: Job Opening,Job Title,Длъжност
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +54,{0} already allocated for Employee {1} for period {2} - {3},{0} вече разпределена за Employee {1} за период {2} - {3}
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +80,{0} Recipients,{0} Получатели
 DocType: Features Setup,Item Groups in Details,Елемент групи Детайли
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +335,Quantity to Manufacture must be greater than 0.,Количество за Производство трябва да е по-голямо от 0.
@@ -2857,14 +2744,13 @@
 DocType: DocType,Setup,Настройвам
 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,Резюме за този месец и предстоящи дейности
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +39,Cold rolling,Студено валцуване
 DocType: Customer Group,Customer Group Name,Customer Group Име
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +408,Please remove this Invoice {0} from C-Form {1},"Моля, премахнете тази фактура {0} от C-Form {1}"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +410,Please remove this Invoice {0} from C-Form {1},"Моля, премахнете тази фактура {0} от C-Form {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,Атрибутите
 DocType: Packing Slip,Get Items,Вземи артикули
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +186,Please enter Write Off Account,"Моля, въведете отпишат Акаунт"
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +187,Please enter Write Off Account,"Моля, въведете отпишат Акаунт"
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +71,Last Order Date,Последна Поръчка Дата
 DocType: DocField,Image,Изображение
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +179,Make Excise Invoice,Направи акцизите Invoice
@@ -2874,7 +2760,7 @@
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +146,Operation ID not set,Операция ID не е зададено
 DocType: Production Order,Planned Start Date,Планирана начална дата
 DocType: Serial No,Creation Document Type,Създаване Type Document
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +620,Maint. Visit,Мейнт. Посещение
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +631,Maint. Visit,Мейнт. Посещение
 DocType: Leave Type,Is Encash,Дали инкасира
 DocType: Purchase Invoice,Mobile No,Mobile Не
 DocType: Payment Tool,Make Journal Entry,Направи вестник Влизане
@@ -2882,35 +2768,31 @@
 apps/erpnext/erpnext/controllers/trends.py +257,Project-wise data is not available for Quotation,Project-мъдър данни не е достъпно за оферта
 DocType: Project,Expected End Date,Очаквано Крайна дата
 DocType: Appraisal Template,Appraisal Template Title,Оценка Template Title
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +440,Commercial,Търговски
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +378,Commercial,Търговски
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +23,Parent Item {0} must not be a Stock Item,Родител т {0} не трябва да бъде фондова Точка
 DocType: Cost Center,Distribution Id,Id Разпределение
-apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +14,Awesome Services,Яки Услуги
+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,Доставчик Адрес
 DocType: Contact Us Settings,Address Line 2,Адрес Line 2
 DocType: ToDo,Reference,Препратка
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +59,Perforating,Перфорация
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,Out Количество
 apps/erpnext/erpnext/config/accounts.py +128,Rules to calculate shipping amount for a sale,Правила за изчисляване на сумата на пратката за продажба
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +29,Series is mandatory,Series е задължително
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +28,Financial Services,Финансови Услуги
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,Финансови Услуги
 apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3},"Цена Умение {0} трябва да бъде в границите от {1} {2}, за да в инкрементите {3}"
 DocType: Tax Rule,Sales,Търговски
 DocType: Stock Entry Detail,Basic Amount,Основен размер
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +173,Warehouse required for stock Item {0},Warehouse изисква за склад т {0}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +178,Warehouse required for stock Item {0},Warehouse изисква за склад т {0}
 DocType: Leave Allocation,Unused leaves,Неизползваните отпуски
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,Cr
 DocType: Customer,Default Receivable Accounts,По подразбиране вземания Accounts
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +102,Sawing,Нарязване
 DocType: Tax Rule,Billing State,Billing членка
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +32,Laminating,Ламиниране
 DocType: Item Reorder,Transfer,Прехвърляне
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +549,Fetch exploded BOM (including sub-assemblies),Изважда се взриви BOM (включително монтажните възли)
 DocType: Authorization Rule,Applicable To (Employee),Приложими по отношение на (Employee)
 apps/erpnext/erpnext/controllers/accounts_controller.py +101,Due Date is mandatory,Поради Дата е задължително
 apps/erpnext/erpnext/controllers/item_variant.py +51,Increment for Attribute {0} cannot be 0,Увеличаване на Умение {0} не може да бъде 0
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +143,Sintering,Синтероване
 DocType: Journal Entry,Pay To / Recd From,Заплати на / Recd От
 DocType: Naming Series,Setup Series,Setup Series
 DocType: Supplier,Contact HTML,Свържи се с HTML
@@ -2923,7 +2805,6 @@
 DocType: Attendance,Absent,Липсващ
 DocType: Product Bundle,Product Bundle,Каталог Bundle
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +180,Row {0}: Invalid reference {1},Row {0}: Invalid позоваване {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +165,Crushing,Смачкване
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Покупка данъци и такси Template
 DocType: Upload Attendance,Download Template,Изтеглете шаблони
 DocType: GL Entry,Remarks,Забележки
@@ -2931,14 +2812,12 @@
 DocType: Journal Entry,Write Off Based On,Отписване на базата на
 DocType: Features Setup,POS View,POS View
 apps/erpnext/erpnext/config/stock.py +38,Installation record for a Serial No.,Монтаж рекорд за Serial No.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +9,Continuous casting,Непрекъснато леене
 apps/erpnext/erpnext/public/js/queries.js +39,Please specify a,"Моля, посочете"
 DocType: Offer Letter,Awaiting Response,Очаква Response
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +53,Above,Горе
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +80,Cold sizing,Cold оразмеряване
 DocType: Salary Slip,Earning & Deduction,Приходи &amp; Приспадане
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +76,Account {0} cannot be a Group,Сметка {0} не може да бъде Група
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +259,Region,Област
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +314,Region,Област
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +213,Optional. This setting will be used to filter in various transactions.,"По избор. Тази настройка ще бъде използван, за да филтрирате по различни сделки."
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +104,Negative Valuation Rate is not allowed,Отрицателна оценка процент не е позволено
 DocType: Holiday List,Weekly Off,Седмичен Off
@@ -2956,7 +2835,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,Account {0} is inactive,Сметка {0} е неактивна
 DocType: GL Entry,Is Advance,Дали Advance
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,Присъствие От Дата и зрители към днешна дата е задължително
-apps/erpnext/erpnext/controllers/buying_controller.py +131,Please enter 'Is Subcontracted' as Yes or No,"Моля, въведете &quot;преотстъпват&quot; като Да или Не"
+apps/erpnext/erpnext/controllers/buying_controller.py +122,Please enter 'Is Subcontracted' as Yes or No,"Моля, въведете &quot;преотстъпват&quot; като Да или Не"
 DocType: Sales Team,Contact No.,Свържи No.
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,'Profit and Loss' type account {0} not allowed in Opening Entry,"Сметка вид ""Печалби и загуби"" {0} не е позволена при Начален Баланс"
 DocType: Workflow State,Time,Време
@@ -2965,14 +2844,13 @@
 DocType: Authorization Rule,Authorization Rule,Разрешение Правило
 DocType: Sales Invoice,Terms and Conditions Details,Условия за ползване Детайли
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,Продажби данъци и такси в шаблона
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +10,Apparel & Accessories,Облекло &amp; Аксесоари
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,Облекло &amp; Аксесоари
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.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 +121,Add Child,Добави Поделемент
 DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,Роля позволено да определят замразени сметки &amp; Редактиране на замразени влизания
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +52,Cannot convert Cost Center to ledger as it has child nodes,"Не може да конвертирате Cost Center да Леджър, тъй като има дете възли"
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +47,Conversion Factor is required,Се изисква Factor реализациите
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +37,Serial #,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,Стойност / Описание
@@ -2980,10 +2858,8 @@
 ,Customers Not Buying Since Long Time,Клиентите не купуват от дълго време
 DocType: Production Order,Expected Delivery Date,Очаквана дата на доставка
 apps/erpnext/erpnext/accounts/general_ledger.py +121,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Дебитни и кредитни не е равно на {0} # {1}. Разликата е {2}.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +48,Bulging,Издут
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +11,Evaporative-pattern casting,Леене Evaporative-модел
 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 +195,Sales Invoice {0} must be cancelled before cancelling this Sales Order,Фактурата за продажба {0} трябва да се отмени преди анулирането този Продажби Поръчка
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +190,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,Billing Сума
 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."
@@ -3002,26 +2878,24 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,New Customer приходите
 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 +241,Account: {0} with currency: {1} can not be selected,Сметка: {0} с валута: не може да бъде избран {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +242,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 +47,Account {0}: Parent account {1} does not belong to company: {2},Сметка {0}: Родителска сметка {1} не принадлежи на фирмата: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted all transactions related to this company!,"Успешно заличава всички транзакции, свързани с тази компания!"
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,Както по Дата
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +111,Honing,Доизкусурващи
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +58,Probation,Изпитание
-apps/erpnext/erpnext/stock/doctype/item/item.py +264,Default Warehouse is mandatory for stock Item.,"Default Warehouse е задължително за склад, т."
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Probation,Изпитание
+apps/erpnext/erpnext/stock/doctype/item/item.py +268,Default Warehouse is mandatory for stock Item.,"Default Warehouse е задължително за склад, т."
 DocType: Feed,Full Name,Пълно Име
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +148,Clinching,Клинч
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +191,Payment of salary for the month {0} and year {1},Изплащането на заплатите за месец {0} и година {1}
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +173,Payment of salary for the month {0} and year {1},Изплащането на заплатите за месец {0} и година {1}
 DocType: Stock Settings,Auto insert Price List rate if missing,"Auto вложка Ценоразпис ставка, ако липсва"
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,Общо платената сума
 ,Transferred Qty,Прехвърлени Количество
 apps/erpnext/erpnext/config/learn.py +11,Navigating,Навигация
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +137,Planning,Планиране
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +137,Planning,Планиране
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +9,Make Time Log Batch,Направи Time Log Batch
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Issued,Издаден
 DocType: Project,Total Billing Amount (via Time Logs),Общо Billing сума (чрез Time Logs)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +629,We sell this Item,Ние продаваме този артикул
+apps/erpnext/erpnext/public/js/setup_wizard.js +365,We sell this Item,Ние продаваме този артикул
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +65,Supplier Id,Id доставчик
 DocType: Journal Entry,Cash Entry,Cash Влизане
 DocType: Sales Partner,Contact Desc,Свържи Описание
@@ -3030,18 +2904,16 @@
 DocType: Brand,Item Manager,Точка на мениджъра
 DocType: Cost Center,Add rows to set annual budgets on Accounts.,"Добавете редове, за да зададете годишни бюджети по сметки."
 DocType: Buying Settings,Default Supplier Type,Default доставчик Type
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +160,Quarrying,Добиване
 DocType: Production Order,Total Operating Cost,Общо оперативни разходи
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +160,Note: Item {0} entered multiple times,Забележка: Точка {0} влезе няколко пъти
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +163,Note: Item {0} entered multiple times,Забележка: Точка {0} влезе няколко пъти
 apps/erpnext/erpnext/config/crm.py +27,All Contacts.,Всички контакти.
 DocType: Newsletter,Test Email Id,Test Email Id
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +394,Company Abbreviation,Фирма Съкращение
+apps/erpnext/erpnext/public/js/setup_wizard.js +142,Company Abbreviation,Фирма Съкращение
 DocType: Features Setup,If you follow Quality Inspection. Enables Item QA Required and QA No in Purchase Receipt,Ако следвате качествения контрол. Активира Позиция QA Задължителни и QA Не на изкупните Разписка
 DocType: GL Entry,Party Type,Party Type
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +68,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,Не authroized тъй {0} надхвърля границите
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +30,Rotational molding,Ротационното отливане
 apps/erpnext/erpnext/config/hr.py +115,Salary template master.,Заплата шаблон майстор.
 DocType: Leave Type,Max Days Leave Allowed,Max Days Оставете любимци
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +55,Set Tax Rule for shopping cart,Определете Tax Правило за количка
@@ -3055,15 +2927,15 @@
 apps/erpnext/erpnext/config/selling.py +18,Quotes to Leads or Customers.,Цитати на потенциални клиенти или клиенти.
 DocType: Stock Settings,Role Allowed to edit frozen stock,Роля за редактиране замразена
 ,Territory Target Variance Item Group-Wise,Територия Target Вариацията т Group-Wise
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +101,All Customer Groups,Всички групи клиенти
-apps/erpnext/erpnext/controllers/accounts_controller.py +474,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} е задължително. Може би запис за обменни курсове на валута не е създаден за {1} {2} да.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +101,All Customer Groups,Всички групи клиенти
+apps/erpnext/erpnext/controllers/accounts_controller.py +475,{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.,Данъчна Template е задължително.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +41,Account {0}: Parent account {1} does not exist,Account {0}: Родителска сметка {1} не съществува
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Ценоразпис Rate (Company валути)
 DocType: Account,Temporary,Временен
 DocType: Address,Preferred Billing Address,Предпочитана Billing Адрес
 DocType: Monthly Distribution Percentage,Percentage Allocation,Процентно разпределение
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +86,Secretary,Секретар
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Secretary,Секретар
 DocType: Serial No,Distinct unit of an Item,Обособена единица на артикул
 DocType: Pricing Rule,Buying,Купуване
 DocType: HR Settings,Employee Records to be created by,Архивите на служителите да бъдат създадени от
@@ -3076,9 +2948,8 @@
 ,Item-wise Price List Rate,Точка-мъдър Ценоразпис Курсове
 DocType: Purchase Order Item,Supplier Quotation,Доставчик оферта
 DocType: Quotation,In Words will be visible once you save the Quotation.,По думите ще бъде видим след като спаси цитата.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +68,Ironing,Гладене
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is stopped,{0} {1} е спрян
-apps/erpnext/erpnext/stock/doctype/item/item.py +352,Barcode {0} already used in Item {1},Barcode {0} вече се използва в т {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +356,Barcode {0} already used in Item {1},Barcode {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/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,Предстоящи събития
@@ -3087,27 +2958,25 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +27,Quick Entry,Бързо Влизане
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0} е задължително за Връщане
 DocType: Purchase Order,To Receive,Получавам
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +33,Shrink fitting,Свиване монтаж
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +522,user@example.com,user@example.com
+apps/erpnext/erpnext/public/js/setup_wizard.js +266,user@example.com,user@example.com
 DocType: Email Digest,Income / Expense,Приходи / разходи
 DocType: Employee,Personal Email,Personal Email
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +58,Total Variance,Общото разсейване
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +62,Total Variance,Общото разсейване
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.","Ако е активирана, системата ще публикуваме счетоводни записвания за инвентара автоматично."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +15,Brokerage,Брокераж
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +15,Brokerage,Брокераж
 DocType: Address,Postal Code,пощенски код
 DocType: Production Order Operation,"in Minutes
 Updated via 'Time Log'",в протокола Updated чрез &quot;Time Log&quot;
 DocType: Customer,From Lead,От Lead
 apps/erpnext/erpnext/config/manufacturing.py +19,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 +442,POS Profile required to make POS Entry,POS профил изисква да направи POS Влизане
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +444,POS Profile required to make POS Entry,POS профил изисква да направи POS Влизане
 DocType: Hub Settings,Name Token,Име Token
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +106,Planing,Рендосване
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Selling,Standard Selling
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +120,Standard Selling,Standard Selling
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +137,Atleast one warehouse is mandatory,Поне един склад е задължително
 DocType: Serial No,Out of Warranty,Извън гаранция
 DocType: BOM Replace Tool,Replace,Заменете
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +314,{0} against Sales Invoice {1},{0} срещу Фактура за продажба {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +316,{0} against Sales Invoice {1},{0} срещу Фактура за продажба {1}
 apps/erpnext/erpnext/stock/doctype/item/item.py +49,Please enter default Unit of Measure,"Моля, въведете подразбиране Мерна единица"
 DocType: Purchase Invoice Item,Project Name,Име на проекта
 DocType: Supplier,Mention if non-standard receivable account,"Споменете, ако нестандартно вземане предвид"
@@ -3123,9 +2992,8 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,Journal Entry {0} does not have account {1} or already matched against other voucher,Вестник Влизане {0} не разполага сметка {1} или вече съвпадащи срещу друг ваучер
 DocType: Item,Moving Average,Moving Average
 DocType: BOM Replace Tool,The BOM which will be replaced,The BOM който ще бъде заменен
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +43,New Stock UOM must be different from current stock UOM,New фондова мерна единица трябва да бъде различен от сегашния състав мерна единица
 DocType: Account,Debit,Дебит
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +34,Leaves must be allocated in multiples of 0.5,"Листата трябва да бъдат разпределени в кратни на 0,5"
+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,Операция Cost
 apps/erpnext/erpnext/config/hr.py +71,Upload attendance from a .csv file,Качване на посещаемостта от .csv файл
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,Изключително Amt
@@ -3143,8 +3011,7 @@
 DocType: Employee,Internal Work History,Вътрешен Work История
 DocType: DocField,Column Break,Колона Break
 DocType: Event,Thursday,Четвъртък
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +42,Private Equity,Private Equity
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +93,Turning,Обръщане
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,Private Equity
 DocType: Maintenance Visit,Customer Feedback,Обратна връзка с клиент
 DocType: Account,Expense,Разход
 DocType: Sales Invoice,Exhibition,Изложба
@@ -3157,19 +3024,19 @@
 DocType: Employee,Held On,Проведена На
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +33,Production Item,Производство Точка
 ,Employee Information,Информация Employee
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,Rate (%),Rate (%)
+apps/erpnext/erpnext/public/js/setup_wizard.js +294,Rate (%),Rate (%)
 DocType: Stock Entry Detail,Additional Cost,Допълнителна Cost
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +407,Financial Year End Date,Финансова година Крайна дата
+apps/erpnext/erpnext/public/js/setup_wizard.js +155,Financial Year End Date,Финансова година Крайна дата
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Voucher No, if grouped by Voucher","Не може да се филтрира по Ваучер Не, ако групирани по Ваучер"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +484,Make Supplier Quotation,Направи Доставчик оферта
 DocType: Quality Inspection,Incoming,Входящ
 DocType: BOM,Materials Required (Exploded),Необходими материали (разглобен)
 DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),"Намаляване Приходи за да напуснат, без Pay (LWP)"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +512,"Add users to your organization, other than yourself","Добавте на потребители към вашата организация, различни от себе си"
+apps/erpnext/erpnext/public/js/setup_wizard.js +256,"Add users to your organization, other than yourself","Добавте на потребители към вашата организация, различни от себе си"
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No {1} does not match with {2} {3},Row # {0}: Пореден № {1} не съвпада с {2} {3}
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +44,Casual Leave,Casual отпуск
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +44,Casual Leave,Casual отпуск
 DocType: Batch,Batch ID,Batch ID
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +334,Note: {0},Забележка: {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +336,Note: {0},Забележка: {0}
 ,Delivery Note Trends,Бележка за доставка Trends
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +104,This Week's Summary,Тази Седмица Резюме
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +74,{0} must be a Purchased or Sub-Contracted Item in row {1},{0} трябва да бъде Закупен или Подизпълнителен в ред {1}
@@ -3181,7 +3048,7 @@
 DocType: Purchase Receipt,Return Against Purchase Receipt,Върнете Срещу Покупка Разписка
 DocType: Purchase Order,To Bill,За да Bill
 DocType: Material Request,% Ordered,Поръчано%
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +61,Piecework,Работа заплащана на парче
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Piecework,Работа заплащана на парче
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +64,Avg. Buying Rate,Ср. Изкупуването Курсове
 DocType: Task,Actual Time (in Hours),Действителното време (в часове)
 DocType: Employee,History In Company,История През Company
@@ -3198,13 +3065,13 @@
 DocType: Opportunity,To Discuss,Да Обсъдим
 DocType: SMS Settings,SMS Settings,SMS Settings
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +60,Temporary Accounts,Временни сметки
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +155,Black,Черен
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Black,Черен
 DocType: BOM Explosion Item,BOM Explosion Item,BOM Explosion Точка
 DocType: Account,Auditor,Одитор
 DocType: Purchase Order,End date of current order's period,Крайна дата на периода на текущата поръчката
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +17,Make Offer Letter,Направи оферта Letter
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +10,Return,Връщане
-apps/erpnext/erpnext/stock/doctype/item/item.py +503,Default Unit of Measure for Variant must be same as Template,Default мерната единица за Variant трябва да е същото като Template
+apps/erpnext/erpnext/stock/doctype/item/item.py +507,Default Unit of Measure for Variant must be same as Template,Default мерната единица за Variant трябва да е същото като Template
 DocType: DocField,Fold,Гънка
 DocType: Production Order Operation,Production Order Operation,Производство Поръчка Operation
 DocType: Pricing Rule,Disable,Правя неспособен
@@ -3215,13 +3082,12 @@
 DocType: Page,Page Name,Page Име
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +110,To Time must be greater than From Time,"На време трябва да бъде по-голяма, отколкото от време"
 DocType: Journal Entry Account,Exchange Rate,Обменен курс
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +465,Sales Order {0} is not submitted,Продажбите Поръчка {0} не е подадена
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +467,Sales Order {0} is not submitted,Продажбите Поръчка {0} не е подадена
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0}: Parent account {1} does not bolong to the company {2},Warehouse {0}: майка сметка {1} не Bolong на дружеството {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +124,Spindle finishing,Шпиндела довършителни
 DocType: BOM,Last Purchase Rate,Последна Покупка Курсове
 DocType: Account,Asset,Придобивка
 DocType: Project Task,Task ID,Task ID
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +395,"e.g. ""MC""",например &quot;MC&quot;
+apps/erpnext/erpnext/public/js/setup_wizard.js +143,"e.g. ""MC""",например &quot;MC&quot;
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,Stock cannot exist for Item {0} since has variants,"Фондова не може да съществува за позиция {0}, тъй като има варианти"
 ,Sales Person-wise Transaction Summary,Продажбите Person-мъдър Transaction Резюме
 DocType: System Settings,Time Zone,Часова Зона
@@ -3230,9 +3096,7 @@
 DocType: Monthly Distribution,Monthly Distribution Percentages,Месечни Процентите за дистрибуция
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +16,The selected item cannot have Batch,Избраният елемент не може да има Batch
 DocType: Delivery Note,% of materials delivered against this Delivery Note,% от материали доставени по тази Бележка за доставка
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +151,Stapling,Подшиване
 DocType: Customer,Customer Details,Данни за клиента
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +105,Shaping,Оформяне
 DocType: Employee,Reports to,Доклади до
 DocType: SMS Settings,Enter url parameter for receiver nos,Въведете URL параметър за приемник с номера
 DocType: Sales Invoice,Paid Amount,Платената сума
@@ -3241,13 +3105,13 @@
 DocType: Item Variant,Item Variant,Позиция Variant
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +15,Setting this Address Template as default as there is no other default,"Настройването на тази Адрес Шаблон по подразбиране, тъй като няма друг случай на неизпълнение"
 apps/erpnext/erpnext/accounts/doctype/account/account.py +89,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit' "
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +76,Quality Management,Управление на качеството
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Quality Management,Управление на качеството
 DocType: Production Planning Tool,Filter based on customer,Филтър на базата на клиент
 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}"
 DocType: Employee External Work History,Employee External Work History,Служител за външна работа
 DocType: Tax Rule,Purchase,Покупка
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +34,Balance Qty,Balance Количество
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Balance Qty,Balance Количество
 DocType: Item Group,Parent Item Group,Родител т Group
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +21,{0} for {1},{0} за {1}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +96,Cost Centers,Разходни центрове
@@ -3257,12 +3121,12 @@
 DocType: Opportunity,Next Contact,Следваща Контакт
 DocType: Employee,Employment Type,Тип заетост
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,Дълготрайни активи
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +84,Application period cannot be across two alocation records,Срок за кандидатстване не може да бъде в два alocation записи
 DocType: Item Group,Default Expense Account,Default Expense Account
 DocType: Employee,Notice (days),Известие (дни)
 DocType: Page,Yes,Да
 DocType: Tax Rule,Sales Tax Template,Данъка върху продажбите Template
 DocType: Employee,Encashment Date,Инкасо Дата
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +74,Electroforming,Electroforming
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +179,"Against Voucher Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Срещу Ваучер тип трябва да е един от поръчка, фактурата за покупка или вестник Влизане"
 DocType: Account,Stock Adjustment,Склад за приспособяване
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +34,Default Activity Cost exists for Activity Type - {0},Съществува Cost Default активност за вид дейност - {0}
@@ -3298,12 +3162,12 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,"Warehouse не може да се заличи, тъй като съществува влизане фондова книга за този склад."
 DocType: Company,Distribution,Разпределение
 apps/erpnext/erpnext/public/js/pos/pos.html +36,Amount Paid,"Сума, платена"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +91,Project Manager,Ръководител На Проект
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +72,Dispatch,Изпращане
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Project Manager,Ръководител На Проект
+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}%,Max отстъпка разрешено за покупка: {0} е {1}%
 DocType: Customer,Default Taxes and Charges,По подразбиране данъци и такси
 DocType: Account,Receivable,За получаване
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +268,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,Row # {0}: Не е позволено да се промени Доставчик като вече съществува поръчка
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +263,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,Row # {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 за скрепление позиции ще се счита за получаване на суровини. В противен случай, всички елементи скрепление ще бъдат третирани като суровина."
@@ -3311,8 +3175,8 @@
 DocType: Hub Settings,Seller Description,Продавач Описание
 DocType: Employee Education,Qualification,Квалификация
 DocType: Item Price,Item Price,Елемент Цена
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +48,Soap & Detergent,Soap &amp; почистващи препарати
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +36,Motion Picture & Video,Motion Picture &amp; Video
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +48,Soap & Detergent,Soap &amp; почистващи препарати
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +36,Motion Picture & Video,Motion Picture &amp; Video
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Поръчан
 DocType: Warehouse,Warehouse Name,Warehouse Име
 DocType: Naming Series,Select Transaction,Изберете Transaction
@@ -3321,7 +3185,6 @@
 DocType: BOM,Rate Of Materials Based On,Курсове на материали на основата на
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,Поддръжка Analtyics
 apps/erpnext/erpnext/accounts/doctype/accounts_settings/accounts_settings.py +27,Company is missing in warehouses {0},Фирма липсва в складовете {0}
-DocType: Stock UOM Replace Utility,Stock UOM Replace Utility,Склад за мерна единица Сменете Utility
 DocType: POS Profile,Terms and Conditions,Правила и условия
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,To Date should be within the Fiscal Year. Assuming To Date = {0},"Към днешна дата трябва да бъде в рамките на фискалната година. Ако приемем, че към днешна дата = {0}"
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","Тук можете да се поддържа височина, тегло, алергии, медицински опасения и т.н."
@@ -3333,7 +3196,7 @@
 DocType: Sales Order Item,For Production,За производство
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +103,Please enter sales order in the above table,"Моля, въведете продажбите ред в таблицата по-горе"
 DocType: Project Task,View Task,Виж Task
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +406,Your financial year begins on,Вашият финансова година започва на
+apps/erpnext/erpnext/public/js/setup_wizard.js +154,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: Email Digest,Add/Remove Recipients,Добавяне / Премахване на Получатели
@@ -3341,16 +3204,14 @@
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","За да зададете тази фискална година, като по подразбиране, щракнете върху &quot;По подразбиране&quot;"
 apps/erpnext/erpnext/config/support.py +54,Setup incoming server for support email id. (e.g. support@example.com),Setup входящия сървър за подкрепа имейл 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 +528,Item variant {0} exists with same attributes,Съществува т вариант {0} със същите атрибути
+apps/erpnext/erpnext/stock/doctype/item/item.py +532,Item variant {0} exists with same attributes,Съществува т вариант {0} със същите атрибути
 DocType: Salary Slip,Salary Slip,Заплата Slip
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +116,Burnishing,Полировъчен
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +54,'To Date' is required,&quot;Към днешна дата&quot; се изисква
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,&quot;Към днешна дата&quot; се изисква
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","Генериране на товарителници за пакети трябва да бъдат доставени. Използва се за уведомяване на пакетите номер, съдържание на пакети и теглото му."
 DocType: Sales Invoice Item,Sales Order Item,Продажбите Поръчка Точка
 DocType: Salary Slip,Payment Days,Плащане Days
 DocType: BOM,Manage cost of operations,Управление на разходите за дейността
 DocType: Features Setup,Item Advanced,Позиция Advanced
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +40,Hot rolling,Топло валцоване
 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.","Когато някоя от проверени сделките се &quot;Изпратен&quot;, имейл изскачащ автоматично отваря, за да изпратите електронно писмо до свързаната с &quot;контакт&quot; в тази сделка, със сделката като прикачен файл. Потребителят може или не може да изпрати имейл."
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,Global Settings
 DocType: Employee Education,Employee Education,Служител Образование
@@ -3363,25 +3224,23 @@
 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/setup/page/setup_wizard/install_fixtures.py +48,Sick Leave,Отпуск По Болест
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +174,Invalid {0},Невалиден {0}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +48,Sick Leave,Отпуск По Болест
 DocType: Email Digest,Email Digest,Email бюлетин
 DocType: Delivery Note,Billing Address Name,Адрес за име
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +22,Department Stores,Универсални Магазини
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,Универсални Магазини
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +40,System Balance,System Balance
 DocType: Workflow,Is Active,Е активен
 apps/erpnext/erpnext/controllers/stock_controller.py +71,No accounting entries for the following warehouses,Не са счетоводни записвания за следните складове
 apps/erpnext/erpnext/projects/doctype/project/project.js +22,Save the document first.,Записване на документа на първо място.
 DocType: Account,Chargeable,Платим
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +121,Linishing,Linishing
 DocType: Company,Change Abbreviation,Промени Съкращение
 DocType: Workflow State,Primary,Първичен
 DocType: Expense Claim Detail,Expense Date,Expense Дата
 DocType: Item,Max Discount (%),Max Отстъпка (%)
 DocType: Communication,More Information,Повече информация
 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/setup/page/setup_wizard/fixtures/operations.py +161,Blasting,Взривен
 DocType: Company,Warn,Предупреждавам
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +111,Item valuation updated,Позиция остойностяване актуализиран
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Всякакви други забележки, отбелязване на усилието, които трябва да отиде в регистрите."
 DocType: BOM,Manufacturing User,Производство на потребителя
 DocType: Purchase Order,Raw Materials Supplied,"Сурови материали, доставени"
@@ -3391,7 +3250,7 @@
 DocType: Appraisal,Appraisal Template,Оценка Template
 DocType: Communication,Email,Email
 DocType: Item Group,Item Classification,Позиция Класификация
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +89,Business Development Manager,Мениджър Бизнес развитие
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Business Development Manager,Мениджър Бизнес развитие
 DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,Поддръжка посещение Предназначение
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.js +15,Period,Период
 ,General Ledger,Главна книга
@@ -3401,9 +3260,7 @@
 ,Itemwise Recommended Reorder Level,Itemwise Препоръчано Пренареждане Level
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +264,Please select {0} first,Моля изберете {0} първия
 DocType: Features Setup,To get Item Group in details table,За да получите т Group в детайли маса
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +67,Redrawing,Прекрояване
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +112,Batch {0} of Item {1} has expired.,Партида {0} на т {1} е изтекъл.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +120,Etching,Офорт
 DocType: Sales Invoice,Commission,Комисионна
 DocType: Address Template,"<h4>Default Template</h4>
 <p>Uses <a href=""http://jinja.pocoo.org/docs/templates/"">Jinja Templating</a> and all the fields of Address (including Custom Fields if any) will be available</p>
@@ -3437,7 +3294,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +340,Operation Time must be greater than 0 for Operation {0},Операция на времето трябва да е по-голямо от 0 за Operation {0}
 DocType: Supplier,Address and Contacts,Адрес и контакти
 DocType: UOM Conversion Detail,UOM Conversion Detail,Подробности мерна единица на реализациите
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +496,Keep it web friendly 900px (w) by 100px (h),Дръжте го уеб приятелски 900px (w) от 100px (з)
+apps/erpnext/erpnext/public/js/setup_wizard.js +242,Keep it web friendly 900px (w) by 100px (h),Дръжте го уеб приятелски 900px (w) от 100px (з)
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +329,Production Order cannot be raised against a Item Template,Производство на поръчката не може да бъде повдигнато срещу т 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,Получи изключително Ваучери
@@ -3453,54 +3310,49 @@
 DocType: Item,Average time taken by the supplier to deliver,Средното време взети от доставчика да достави
 DocType: Time Log,Hours,Часове
 DocType: Project,Expected Start Date,Очаквана начална дата
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +38,Rolling,Подвижният
 DocType: ToDo,Priority,Приоритет
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +41,Remove item if charges is not applicable to that item,"Махни позиция, ако цените не се отнася за тази позиция"
 DocType: Dropbox Backup,Dropbox Access Allowed,Позволени Dropbox Access
 DocType: Dropbox Backup,Weekly,Седмично
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,Напр. smsgateway.com/api/send_sms.cgi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +485,Receive,Получавам
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +510,Receive,Получавам
 DocType: Maintenance Visit,Fully Completed,Завършен до ключ
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% Завършен
 DocType: Employee,Educational Qualification,Образователно-квалификационна
 DocType: Workstation,Operating Costs,Оперативни разходи
 DocType: Employee Leave Approver,Employee Leave Approver,Служител Оставете одобряващ
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,{0} has been successfully added to our Newsletter list.,{0} е успешно добавен в нашия Бюлетин.
-apps/erpnext/erpnext/stock/doctype/item/item.py +383,Row {0}: An Reorder entry already exists for this warehouse {1},Row {0}: Един запис Пренареждане вече съществува за този склад {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +387,Row {0}: An Reorder entry already exists for this warehouse {1},Row {0}: Един запис Пренареждане вече съществува за този склад {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +67,"Cannot declare as lost, because Quotation has been made.","Не може да се декларира като изгубена, защото цитата е направено."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +133,Electron beam machining,Електронно-лъчево обработване
 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 +150,Please select Start Date and End Date for Item {0},Моля изберете Начална дата и крайна дата за т {0}
 apps/erpnext/erpnext/config/stock.py +141,Main Reports,Основните доклади
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +102,Stock Ledger entries balances updated,Фондова Ledger вписвания салда обновяват
 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 +176,Add / Edit Prices,Добавяне / Редактиране на цените
+apps/erpnext/erpnext/stock/doctype/item/item.js +178,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 +298,My Orders,Моите поръчки
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +293,My Orders,Моите поръчки
 DocType: Price List,Price List Name,Ценоразпис Име
 DocType: Time Log,For Manufacturing,За производство
-apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +70,Totals,Общо
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +174,Totals,Общо
 DocType: BOM,Manufacturing,Производство
 ,Ordered Items To Be Delivered,Поръчаните артикули да бъдат доставени
 DocType: Account,Income,Доход
 ,Setup Wizard,Wizard Setup
 DocType: Industry Type,Industry Type,Industry Type
 apps/erpnext/erpnext/templates/includes/cart.js +137,Something went wrong!,Нещо се обърка!
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +68,Warning: Leave application contains following block dates,Внимание: Оставете заявка съдържа следните дати блок
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +251,Sales Invoice {0} has already been submitted,Фактурата за продажба {0} вече е била подадена
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +100,Warning: Leave application contains following block dates,Внимание: Оставете заявка съдържа следните дати блок
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +256,Sales Invoice {0} has already been submitted,Фактурата за продажба {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),Сума (Company валути)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +10,Die casting,Леене
 DocType: Email Alert,Reference Date,Референтен Дата
 apps/erpnext/erpnext/config/hr.py +105,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,"Моля, въведете съобщение, преди да изпратите"
 DocType: Async Task,Status,Статус
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +65,Stock UOM updated for Item {0},Склад за мерна единица актуализиран за позиция {0}
 DocType: Company History,Year,Година
 apps/erpnext/erpnext/config/accounts.py +127,Point-of-Sale Profile,Точка на продажба на профил
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +68,Please Update SMS Settings,"Моля, актуализирайте SMS Settings"
@@ -3514,12 +3366,12 @@
 ,Serial No Service Contract Expiry,Пореден № Договор за услуги Изтичане
 DocType: Item,Unit of Measure Conversion,Мерна единица на реализациите
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +86,Employee can not be changed,Работникът или служителят не може да се променя
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +259,You cannot credit and debit same account at the same time,Вие не можете да кредитни и дебитни същия акаунт в същото време
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,You cannot credit and debit same account at the same time,Вие не можете да кредитни и дебитни същия акаунт в същото време
 DocType: Naming Series,Help HTML,Помощ HTML
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},Общо weightage определен да бъде 100%. Това е {0}
 apps/erpnext/erpnext/controllers/status_updater.py +140,Allowance for over-{0} crossed for Item {1},Помощи за свръх {0} прекоси за позиция {1}
 DocType: Address,Name of person or organization that this address belongs to.,"Име на лицето или организацията, че този адрес принадлежи."
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +587,Your Suppliers,Вашите доставчици
+apps/erpnext/erpnext/public/js/setup_wizard.js +325,Your Suppliers,Вашите доставчици
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,Не може да се определи като губи като поръчка за продажба е направена.
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +65,Another Salary Structure {0} is active for employee {1}. Please make its status 'Inactive' to proceed.,"Друг заплата структура {0} е активен за служител {1}. Моля, направете своя статут &quot;неактивни&quot;, за да продължите."
 DocType: Purchase Invoice,Contact,Контакт
@@ -3528,37 +3380,35 @@
 DocType: Item,Has Serial No,Има сериен номер
 DocType: Employee,Date of Issue,Дата на издаване
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +16,{0}: From {0} for {1},{0}: От {0} за {1}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +154,Row #{0}: Set Supplier for item {1},Row # {0}: Определете доставчик за т {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +149,Row #{0}: Set Supplier for item {1},Row # {0}: Определете доставчик за т {1}
 DocType: Issue,Content Type,Content Type
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +17,Computer,Компютър
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,Компютър
 DocType: Item,List this Item in multiple groups on the website.,Списък този продукт в няколко групи в сайта.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +283,Please check Multi Currency option to allow accounts with other currency,"Моля, проверете опцията Multi валути да се позволи на сметки в друга валута"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +285,Please check Multi Currency option to allow accounts with other currency,"Моля, проверете опцията Multi валути да се позволи на сметки в друга валута"
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +62,Item: {0} does not exist in the system,Позиция: {0} не съществува в системата
 apps/erpnext/erpnext/accounts/doctype/account/account.py +81,You are not authorized to set Frozen value,Вие не можете да настроите Frozen стойност
 DocType: Payment Reconciliation,Get Unreconciled Entries,Вземи Неизравнени влизания
 DocType: Cost Center,Budgets,Бюджети
 apps/frappe/frappe/core/page/modules_setup/modules_setup.py +11,Updated,Обновено
 DocType: Employee,Emergency Contact Details,Аварийни контактни Детайли
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +396,What does it do?,Какво прави?
+apps/erpnext/erpnext/public/js/setup_wizard.js +144,What does it do?,Какво прави?
 DocType: Delivery Note,To Warehouse,За да 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,Средна Комисията Курсове
-apps/erpnext/erpnext/stock/doctype/item/item.py +313,'Has Serial No' can not be 'Yes' for non-stock item,"'Има сериен номер' не може да бъде 'Да' за стока, която не на склад"
+apps/erpnext/erpnext/stock/doctype/item/item.py +317,'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/setup/page/setup_wizard/install_fixtures.py +111,Electrical,Електрически
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +111,Electrical,Електрически
 DocType: Stock Entry,Total Value Difference (Out - In),Общо Разлика Value (Out - В)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +302,Row {0}: Exchange Rate is mandatory,Row {0}: Валутен курс е задължително
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +304,Row {0}: Exchange Rate is mandatory,Row {0}: Валутен курс е задължително
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},User ID не е конфигуриран за Employee {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +72,Peening,Peening
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,From Warranty Claim,От гаранционен иск
 DocType: Stock Entry,Default Source Warehouse,Default Източник Warehouse
 DocType: Item,Customer Code,Код Customer
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +212,Birthday Reminder for {0},Birthday Reminder за {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +163,Lapping,Плиска
-apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.js +8,Days Since Last Order,Дни след Last Поръчка
+apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +72,Days Since Last Order,Дни след Last Поръчка
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +299,Debit To account must be a Balance Sheet account,Debit За сметка трябва да бъде партида Баланс
 DocType: Buying Settings,Naming Series,Именуване Series
 DocType: Leave Block List,Leave Block List Name,Оставете Block List Име
@@ -3572,7 +3422,7 @@
 DocType: Notification Control,Sales Invoice Message,Съобщението фактурата за продажба
 DocType: Authorization Rule,Based On,Базиран На
 DocType: Sales Order Item,Ordered Qty,Поръчано Количество
-apps/erpnext/erpnext/stock/doctype/item/item.py +539,Item {0} is disabled,Точка {0} е деактивиран
+apps/erpnext/erpnext/stock/doctype/item/item.py +543,Item {0} is disabled,Точка {0} е деактивиран
 DocType: Stock Settings,Stock Frozen Upto,Фондова Frozen Upto
 apps/erpnext/erpnext/controllers/recurring_document.py +166,Period From and Period To dates mandatory for recurring {0},"Период От и периода, за датите задължителни за повтарящи {0}"
 apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,Дейността на проект / задача.
@@ -3582,7 +3432,6 @@
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,Отстъпка трябва да е по-малко от 100
 DocType: ToDo,Low,Нисък
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Напиши Off Сума (Company валути)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +71,Spinning,Предене
 DocType: Landed Cost Voucher,Landed Cost Voucher,Поземлен Cost Ваучер
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +55,Please set {0},"Моля, задайте {0}"
 DocType: Purchase Invoice,Repeat on Day of Month,Повторете в Деня на Месец
@@ -3604,7 +3453,6 @@
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +37,Campaign Name is required,Се изисква Име на кампанията
 DocType: Maintenance Visit,Maintenance Date,Поддръжка Дата
 DocType: Purchase Receipt Item,Rejected Serial No,Отхвърлени Пореден №
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +51,Deep drawing,Дълбоко изтегляне
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +40,New Newsletter,New Newsletter
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +157,Start date should be less than end date for Item {0},Начална дата трябва да бъде по-малко от крайната дата за позиция {0}
 apps/erpnext/erpnext/stock/doctype/item/item.js +17,Show Balance,Покажи Balance
@@ -3614,7 +3462,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +119,BOM and Manufacturing Quantity are required,BOM и производство Количество са задължителни
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Застаряването на населението Range 2
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +450,Amount,Размер
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +147,Riveting,Занитване
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,BOM заменя
 ,Sales Analytics,Продажби Analytics
 DocType: Manufacturing Settings,Manufacturing Settings,Настройки производство
@@ -3626,20 +3473,19 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +207,New Account Name,New Account Име
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,Суровини Доставя Cost
 DocType: Selling Settings,Settings for Selling Module,Настройки за продажба на Module
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +73,Customer Service,Обслужване На Клиенти
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Customer Service,Обслужване На Клиенти
 DocType: Item,Thumbnail,Thumbnail
 DocType: Item Customer Detail,Item Customer Detail,Елемент Подробности Customer
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +147,Confirm Your Email,Потвърдете Вашият Email
 apps/erpnext/erpnext/config/hr.py +53,Offer candidate a Job.,Оферта кандидат за работа.
 DocType: Notification Control,Prompt for Email on Submission of,Пита за Email при представяне на
+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 +70,Item {0} must be a stock Item,Точка {0} трябва да бъде в наличност Позиция
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,Default Work В Warehouse Progress
 apps/erpnext/erpnext/config/accounts.py +107,Default settings for accounting transactions.,Настройките по подразбиране за счетоводни операции.
 apps/frappe/frappe/model/naming.py +40,{0} is required,{0} е необходим
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +21,Vacuum molding,Вакуум формоване
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,Очаквана дата не може да бъде преди Материал Заявка Дата
 DocType: Contact Us Settings,City,Град
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +132,Ultrasonic machining,Ултразвукова обработка
 apps/frappe/frappe/templates/base.html +137,Error: Not a valid id?,Грешка: Не е валиден документ за самоличност?
 apps/erpnext/erpnext/stock/get_item_details.py +125,Item {0} must be a Sales Item,Точка {0} трябва да бъде Продажби Точка
 DocType: Naming Series,Update Series Number,Актуализация Series Number
@@ -3647,7 +3493,7 @@
 DocType: Sales Order,Printing Details,Printing Детайли
 DocType: Task,Closing Date,Крайна дата
 DocType: Sales Order Item,Produced Quantity,Произведено количество
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +84,Engineer,Инженер
+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 +379,Item Code required at Row No {0},Код изисква най Row Не {0}
 DocType: Sales Partner,Partner Type,Partner Type
@@ -3655,7 +3501,7 @@
 DocType: Authorization Rule,Customerwise Discount,Customerwise Отстъпка
 DocType: Purchase Invoice,Against Expense Account,Срещу Разходна Сметка
 DocType: Production Order,Production Order,Производство Поръчка
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +258,Installation Note {0} has already been submitted,Монтаж Забележка {0} вече е била подадена
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +263,Installation Note {0} has already been submitted,Монтаж Забележка {0} вече е била подадена
 DocType: Quotation Item,Against Docname,Срещу Документ
 DocType: SMS Center,All Employee (Active),All Employee (Active)
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,Вижте сега
@@ -3664,19 +3510,19 @@
 DocType: Item,Re-Order Level,Re-Поръчка Level
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,"Въведете предмети и планирано Количество, за които искате да се повиши производствените поръчки или да изтеглите суровини за анализ."
 apps/frappe/frappe/public/js/frappe/views/ganttview.js +45,Gantt Chart,Gantt Chart
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +57,Part-time,Непълен работен ден
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,Part-time,Непълен работен ден
 DocType: Employee,Applicable Holiday List,Приложимо Holiday Списък
 DocType: Employee,Cheque,Чек
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,Series Обновено
 apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Report Type is mandatory,Тип на отчета е задължително
 DocType: Item,Serial Number Series,Сериен номер Series
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},Warehouse е задължително за склад т {0} на ред {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +45,Retail & Wholesale,Retail &amp; търговия
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,Retail &amp; търговия
 DocType: Issue,First Responded On,Първо Отговорили On
 DocType: Website Item Group,Cross Listing of Item in multiple groups,Cross Обява на артикул в няколко групи
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +351,The First User: You,Първият потребител: Вие
+apps/erpnext/erpnext/public/js/setup_wizard.js +101,The First User: You,Първият потребител: Вие
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +48,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 +172,Successfully Reconciled,Успешно Съгласувани
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +119,Successfully Reconciled,Успешно Съгласувани
 DocType: Production Order,Planned End Date,Планиран Крайна дата
 apps/erpnext/erpnext/config/stock.py +43,Where items are stored.,Когато елементите са съхранени.
 DocType: Tax Rule,Validity,Валидност
@@ -3696,39 +3542,36 @@
 DocType: DocPerm,Level,Ниво
 DocType: Purchase Taxes and Charges,On Net Total,На Net Общо
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +160,Target warehouse in row {0} must be same as Production Order,Target склад в ред {0} трябва да е същото като производствена поръчка
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +59,No permission to use Payment Tool,Няма разрешение за ползване Плащане Tool
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +97,No permission to use Payment Tool,Няма разрешение за ползване Плащане Tool
 apps/erpnext/erpnext/controllers/recurring_document.py +192,'Notification Email Addresses' not specified for recurring %s,"""имейл адреси за известяване"" не е зададен за повтарящи % S"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +86,Milling,Фрезоване
 apps/erpnext/erpnext/accounts/doctype/account/account.py +99,Currency can not be changed after making entries using some other currency,"Валутна не може да се промени, след като записи с помощта на някои друга валута"
 DocType: Company,Round Off Account,Завършете Акаунт
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +60,Nibbling,Залъгва
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,Административни разходи
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +18,Consulting,Консултативен
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +18,Consulting,Консултативен
 DocType: Customer Group,Parent Customer Group,Родител Customer Group
 apps/erpnext/erpnext/public/js/pos/pos.js +429,Change,Промяна
 DocType: Purchase Invoice,Contact Email,Контакт Email
 DocType: Appraisal Goal,Score Earned,Резултат спечелените
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +393,"e.g. ""My Company LLC""",например &quot;My Company LLC&quot;
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +173,Notice Period,Срок На Предизвестие
+apps/erpnext/erpnext/public/js/setup_wizard.js +141,"e.g. ""My Company LLC""",например &quot;My Company LLC&quot;
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +173,Notice Period,Срок На Предизвестие
 DocType: Bank Reconciliation Detail,Voucher ID,Ваучер ID
 apps/erpnext/erpnext/setup/doctype/territory/territory.js +14,This is a root territory and cannot be edited.,Това е корен територия и не може да се редактира.
 DocType: Packing Slip,Gross Weight UOM,Бруто тегло мерна единица
 DocType: Email Digest,Receivables / Payables,Вземания / Задължения
 DocType: Delivery Note Item,Against Sales Invoice,Срещу фактура за продажба
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +63,Stamping,Щампосване
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +457,Credit Account,Кредитна сметка
 DocType: Landed Cost Item,Landed Cost Item,Поземлен Cost Точка
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +56,Show zero values,Покажи нулеви стойности
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,Брой на т получен след производството / препакетиране от дадени количества суровини
 DocType: Payment Reconciliation,Receivable / Payable Account,Вземания / дължими суми Акаунт
 DocType: Delivery Note Item,Against Sales Order Item,Срещу ред от поръчка за продажба
-apps/erpnext/erpnext/stock/doctype/item/item.py +521,Please specify Attribute Value for attribute {0},"Моля, посочете Умение Цена атрибут {0}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +525,Please specify Attribute Value for attribute {0},"Моля, посочете Умение Цена атрибут {0}"
 DocType: Item,Default Warehouse,Default Warehouse
 DocType: Task,Actual End Date (via Time Logs),Действителна Крайна дата (чрез Time Logs)
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +37,Budget cannot be assigned against Group Account {0},Бюджетът не може да бъде назначен срещу Group Account {0}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +23,Please enter parent cost center,"Моля, въведете разходен център майка"
 DocType: Delivery Note,Print Without Amount,Печат Без Сума
-apps/erpnext/erpnext/controllers/buying_controller.py +69,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,"Данъчна Категория не може да бъде &quot;Оценка&quot; или &quot;Оценка и Total&quot;, тъй като всички изделия са без склад продукта"
+apps/erpnext/erpnext/controllers/buying_controller.py +60,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,"Данъчна Категория не може да бъде &quot;Оценка&quot; или &quot;Оценка и Total&quot;, тъй като всички изделия са без склад продукта"
 DocType: User,Last Name,Фамилия
 DocType: Web Page,Left,Наляво
 DocType: Event,All Day,Цял Ден
@@ -3736,7 +3579,7 @@
 DocType: Appraisal,Total Score (Out of 5),Общ резултат (от 5)
 DocType: Contact Us Settings,State,Състояние
 DocType: Batch,Batch,Партида
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +51,Balance,Баланс
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +28,Balance,Баланс
 DocType: Project,Total Expense Claim (via Expense Claims),Общо разход претенция (чрез разход Вземания)
 DocType: User,Gender,Пол
 DocType: Journal Entry,Debit Note,Дебитно известие
@@ -3766,8 +3609,7 @@
 DocType: Purchase Order,Get Last Purchase Rate,Вземи Last Покупка Курсове
 DocType: Time Log,Billing Rate based on Activity Type (per hour),Billing процент въз основа на Type активност (на час)
 DocType: Company,Company Info,Информация за фирмата
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +76,Seaming,Фалцуване
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +197,"Company Email ID not found, hence mail not sent","Фирма Email ID не е намерен, следователно не съобщение, изпратено"
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +206,"Company Email ID not found, hence mail not sent","Фирма Email ID не е намерен, следователно не съобщение, изпратено"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Прилагане на средства (активи)
 DocType: Production Planning Tool,Filter based on item,Филтър на базата на т
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +451,Debit Account,Debit Акаунт
@@ -3779,17 +3621,16 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +95,{0} {1} has been modified. Please refresh.,"{0} {1} е променен. Моля, опреснете."
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,Спрете потребители от извършване Оставете Заявленията за следните дни.
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +591,From Opportunity,От Opportunity
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +46,Blanking,Глуха
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +166,Employee Benefits,Доходи на наети лица
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,Employee Benefits,Доходи на наети лица
 DocType: Sales Invoice,Is POS,Дали POS
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +240,Packed quantity must equal quantity for Item {0} in row {1},Опакован количество трябва да е равно количество за т {0} на ред {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +245,Packed quantity must equal quantity for Item {0} in row {1},Опакован количество трябва да е равно количество за т {0} на ред {1}
 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.,"Законопроекти, повдигнати на клиентите."
 DocType: DocField,Default,Неустойка
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Id Project
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +466,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},"Row Не {0}: сума не може да бъде по-голяма, отколкото До сума срещу Expense претенция {1}. До сума е {2}"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +468,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},"Row Не {0}: сума не може да бъде по-голяма, отколкото До сума срещу Expense претенция {1}. До сума е {2}"
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +40,{0} subscribers added,Добавени {0} абонати
 DocType: Maintenance Schedule,Schedule,Разписание
 DocType: Cost Center,"Define Budget for this Cost Center. To set budget action, see ""Company List""","Определете бюджета за тази Cost Center. За да зададете бюджет действия, вижте &quot;Company List&quot;"
@@ -3800,7 +3641,7 @@
 apps/erpnext/erpnext/public/js/pos/pos.js +91,Price List not found or disabled,Ценова листа не е намерен или инвалиди
 DocType: Expense Claim,Approved,Одобрен
 DocType: Pricing Rule,Price,Цена
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +79,Employee relieved on {0} must be set as 'Left',Служител облекчение на {0} трябва да се зададе като &quot;Ляв&quot;
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +88,Employee relieved on {0} must be set as 'Left',Служител облекчение на {0} трябва да се зададе като &quot;Ляв&quot;
 DocType: Item,"Selecting ""Yes"" will give a unique identity to each entity of this item which can be viewed in the Serial No master.","Изборът на &quot;Yes&quot; ще даде уникална идентичност на всеки субект на този елемент, който може да бъде разгледана в Пореден № капитана."
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +39,Appraisal {0} created for Employee {1} in the given date range,Оценка {0} е създадена за Employee {1} в даден период от време
 DocType: Employee,Education,Образование
@@ -3811,7 +3652,7 @@
 apps/frappe/frappe/desk/moduleview.py +67,Standard Reports,Стандартни отчети
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,Счетоводни вписвания в дневник.
 DocType: Delivery Note Item,Available Qty at From Warehouse,В наличност Количество в От Warehouse
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +209,Please select Employee Record first.,Моля изберете Record Employee първия.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +224,Please select Employee Record first.,Моля изберете Record Employee първия.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Row {0}: Party / Сметка не съвпада с {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 +233,Please enter Expense Account,"Моля, въведете Expense Account"
@@ -3824,46 +3665,43 @@
 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,"Поръчки за продажба Pull (висящите да достави), основано на горните критерии"
 DocType: DocShare,Document Type,Document Type
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +565,From Supplier Quotation,От Доставчик оферта
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +588,From Supplier Quotation,От Доставчик оферта
 DocType: Deduction Type,Deduction Type,Приспадане Type
 DocType: Attendance,Half Day,Half Day
 DocType: Pricing Rule,Min Qty,Min Количество
 DocType: Features Setup,"To track items in sales and purchase documents with batch nos. ""Preferred Industry: Chemicals""",За да проследите позиции в продажбите и закупуване на документи с партидни номера. &quot;Предпочитана Индустрия: Chemicals&quot;
 DocType: GL Entry,Transaction Date,Transaction Дата
 DocType: Production Plan Item,Planned Qty,Планиран Количество
-apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +91,Total Tax,Общо Tax
+apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +93,Total Tax,Общо Tax
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +178,For Quantity (Manufactured Qty) is mandatory,За Количество (Произведен Количество) е задължително
 DocType: Stock Entry,Default Target Warehouse,Default Target Warehouse
 DocType: Purchase Invoice,Net Total (Company Currency),Net Общо (Company валути)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +79,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Row {0}: Party Тип и страна е приложима само срещу получаване / плащане акаунт
 DocType: Notification Control,Purchase Receipt Message,Покупка получено съобщение
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +95,Total allocated leaves are more than period,Общо отпуснати листа са повече от период
 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.,Запишете движение т.
 DocType: Newsletter List Subscriber,Newsletter List Subscriber,Newsletter Списък Subscriber
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +164,Morticing,Дълбаене
 DocType: Email Account,Service,Обслужване
 DocType: Hub Settings,Hub Settings,Настройки Hub
 DocType: Project,Gross Margin %,Gross Margin%
 DocType: BOM,With Operations,С Operations
 apps/erpnext/erpnext/accounts/party.py +232,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Счетоводни записи вече са направени във валута {0} за компанията {1}. Моля изберете вземания или платима сметка с валута {0}.
 ,Monthly Salary Register,Месечна заплата Регистрация
-apps/frappe/frappe/website/template.py +140,Next,До
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard_page.html +17,Next,До
 DocType: Warranty Claim,If different than customer address,Ако е различен от адреса на клиента
 DocType: BOM Operation,BOM Operation,BOM Operation
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +118,Electropolishing,Electropolishing
 DocType: Purchase Taxes and Charges,On Previous Row Amount,На предишния ред Сума
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +24,Please enter Payment Amount in atleast one row,"Моля, въведете сумата за плащане в поне един ред"
+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 профил
 apps/erpnext/erpnext/config/accounts.py +153,"Seasonality for setting budgets, targets etc.","Сезонността за определяне на бюджетите, цели и т.н."
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +238,Row {0}: Payment Amount cannot be greater than Outstanding Amount,Row {0}: Начин на плащане сума не може да бъде по-голяма от дължимата сума
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +46,Total Unpaid,Общата сума на неплатените
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +21,Time Log is not billable,Време Влезте не е таксувана
 apps/erpnext/erpnext/stock/get_item_details.py +128,"Item {0} is a template, please select one of its variants","Точка {0} е шаблон, моля изберете една от неговите варианти"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +528,Purchaser,Купувач
+apps/erpnext/erpnext/public/js/setup_wizard.js +272,Purchaser,Купувач
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +81,Net pay cannot be negative,Net заплащането не може да бъде отрицателна
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +71,Please enter the Against Vouchers manually,"Моля, въведете с документите, ръчно"
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +107,Please enter the Against Vouchers manually,"Моля, въведете с документите, ръчно"
 DocType: SMS Settings,Static Parameters,Статични параметри
 DocType: Purchase Order,Advance Paid,Авансово изплатени суми
 DocType: Item,Item Tax,Позиция Tax
@@ -3872,14 +3710,12 @@
 apps/erpnext/erpnext/config/crm.py +48,Send mass SMS to your contacts,Изпратете маса SMS към вашите контакти
 DocType: Purchase Taxes and Charges,Consider Tax or Charge for,Помислете данък или такса за
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,Действително Количество е задължително
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +42,Cross-rolling,Cross-подвижен
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +132,Credit Card,Кредитна Карта
+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 +95,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,"Моля, въведете данъци и такси"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +85,Machining,Механична обработка
 DocType: Sales Invoice Item,Drop Ship,Капка Корабно
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","Тук можете да поддържат семейните детайли като името и професията на майка, съпруга и деца"
 DocType: Hub Settings,Seller Name,Продавач Име
@@ -3889,7 +3725,7 @@
 DocType: Stock Entry,Repack,Опаковайте
 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/setup/page/setup_wizard/setup_wizard.js +500,Attach Logo,Прикрепете Logo
+apps/erpnext/erpnext/public/js/setup_wizard.js +246,Attach Logo,Прикрепете Logo
 DocType: Customer,Commission Rate,Комисията Курсове
 apps/erpnext/erpnext/stock/doctype/item/item.js +38,Make Variant,Направи Variant
 apps/erpnext/erpnext/config/hr.py +145,Block leave applications by department.,Заявленията за отпуск блок на отдел.
@@ -3904,19 +3740,19 @@
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +105,Please select a csv file,Моля изберете файл CSV
 DocType: Dropbox Backup,Send Backups to Dropbox,Изпрати на резервни копия на Dropbox
 DocType: Purchase Order,To Receive and Bill,За получаване и Bill
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +94,Designer,Дизайнер
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Designer,Дизайнер
 apps/erpnext/erpnext/config/selling.py +121,Terms and Conditions Template,Условия Template
 DocType: Serial No,Delivery Details,Детайли за доставка
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +383,Cost Center is required in row {0} in Taxes table for type {1},Cost Center се изисква в ред {0} в Данъци маса за вид {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +386,Cost Center is required in row {0} in Taxes table for type {1},Cost Center се изисква в ред {0} в Данъци маса за вид {1}
 DocType: Item,Automatically create Material Request if quantity falls below this level,"Автоматично създаване Материал искане, ако количеството падне под това ниво"
 ,Item-wise Purchase Register,Точка-мъдър Покупка Регистрация
 DocType: Batch,Expiry Date,Срок На Годност
-apps/erpnext/erpnext/stock/doctype/item/item.py +375,"To set reorder level, item must be a Purchase Item or Manufacturing Item","За да зададете ниво на повторна поръчка, т трябва да бъде покупка или производство Точка Точка"
+apps/erpnext/erpnext/stock/doctype/item/item.py +379,"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.,Майстор Project.
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,Да не се показва всеки символ като $ и т.н. до валути.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +330, (Half Day),(Половин ден)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +374, (Half Day),(Половин ден)
 DocType: Supplier,Credit Days,Кредитните Days
 DocType: Leave Type,Is Carry Forward,Дали Пренасяне
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +478,Get Items from BOM,Получават от BOM
@@ -3924,7 +3760,7 @@
 apps/erpnext/erpnext/config/manufacturing.py +120,Bill of Materials,Бил на материали
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +77,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Row {0}: Party Тип и страна се изисква за получаване / плащане сметка {1}
 DocType: Dropbox Backup,Send Notifications To,Изпращайте известия до
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html +26,Ref Date,Ref Дата
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +54,Ref Date,Ref Дата
 DocType: Employee,Reason for Leaving,Причина за напускане
 DocType: Expense Claim Detail,Sanctioned Amount,Санкционирани Сума
 DocType: GL Entry,Is Opening,Се отваря
@@ -3932,4 +3768,3 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +188,Account {0} does not exist,Сметка {0} не съществува
 DocType: Account,Cash,Пари в брой
 DocType: Employee,Short biography for website and other publications.,Кратка биография на уебсайт и други публикации.
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +31,Please create Salary Structure for employee {0},"Моля, създайте Заплата структура за служител {0}"
diff --git a/erpnext/translations/bn.csv b/erpnext/translations/bn.csv
index 2e14720..3467d11 100644
--- a/erpnext/translations/bn.csv
+++ b/erpnext/translations/bn.csv
@@ -1,13 +1,12 @@
 DocType: Employee,Salary Mode,বেতন মোড
 DocType: Cost Center,"Select Monthly Distribution, if you want to track based on seasonality.","আপনি ঋতু উপর ভিত্তি করে ট্র্যাক করতে চান তাহলে, মাসিক ডিস্ট্রিবিউশন নির্বাচন."
 DocType: Employee,Divorced,তালাকপ্রাপ্ত
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +86,Warning: Same item has been entered multiple times.,সতর্কতা: একই আইটেমের একাধিক বার প্রবেশ করানো হয়েছে.
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +80,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,আইটেম একটি লেনদেনের মধ্যে একাধিক বার যুক্ত করা সম্ভব
 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/page/setup_wizard/fixtures/industry_type.py +19,Consumer Products,ভোগ্যপণ্য
+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,প্রথম পক্ষের ধরন নির্বাচন করুন
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +90,Annealing,পাইন
 DocType: Item,Customer Items,গ্রাহক চলছে
 apps/erpnext/erpnext/accounts/doctype/account/account.py +45,Account {0}: Parent account {1} can not be a ledger,অ্যাকাউন্ট {0}: মূল অ্যাকাউন্ট তথ্য {1} একটি খতিয়ান হতে পারবেন না
 DocType: Item,Publish Item to hub.erpnext.com,Hub.erpnext.com আইটেমটি প্রকাশ করুন
@@ -20,15 +19,14 @@
 DocType: About Us Settings,Website,ওয়েবসাইট
 DocType: POS Profile,Applicable for User,ব্যবহারকারী জন্য প্রযোজ্য
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +169,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","থামানো উৎপাদন অর্ডার বাতিল করা যাবে না, বাতিল করতে এটি প্রথম দুর"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +23,Compaction plus sintering,সংকুচন প্লাস sintering
 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.,* লেনদেনে গণনা করা হবে.
 DocType: Purchase Order,Customer Contact,গ্রাহকের পরিচিতি
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +549,From Material Request,উপাদান অনুরোধ থেকে
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +572,From Material Request,উপাদান অনুরোধ থেকে
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} বৃক্ষ
 DocType: Job Applicant,Job Applicant,কাজ আবেদনকারী
 apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,কোন ফলাফল.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +78,Legal,আইনগত
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +34,Legal,আইনগত
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +114,Actual type tax cannot be included in Item rate in row {0},প্রকৃত টাইপ ট্যাক্স সারিতে আইটেম রেট অন্তর্ভুক্ত করা যাবে না {0}
 DocType: C-Form,Customer,ক্রেতা
 DocType: Purchase Receipt Item,Required By,ক্সসে
@@ -43,7 +41,6 @@
 DocType: Manufacturing Settings,Default 10 mins,10 মিনিট ডিফল্ট
 DocType: Leave Type,Leave Type Name,প্রকার নাম ত্যাগ
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +148,Series Updated Successfully,সিরিজ সফলভাবে আপডেট
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +150,Stitching,সেলাই
 DocType: Pricing Rule,Apply On,উপর প্রয়োগ
 DocType: Item Price,Multiple Item prices.,একাধিক আইটেম মূল্য.
 ,Purchase Order Items To Be Received,ক্রয় আদেশ আইটেম গ্রহন করা
@@ -51,8 +48,8 @@
 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 +104,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 +189,New Leave Application,নিউ ছুটি আবেদন
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +134,Bank Draft,ব্যাংক খসড়া
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +204,New Leave Application,নিউ ছুটি আবেদন
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +134,Bank Draft,ব্যাংক খসড়া
 DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,1. গ্রাহক জ্ঞানী আইটেমটি কোড বজায় রাখা এবং তাদের কোড ব্যবহার করা এই অপশনটি স্থান উপর ভিত্তি করে এদের অনুসন্ধানযোগ্য করে
 DocType: Mode of Payment Account,Mode of Payment Account,পেমেন্ট একাউন্ট এর মোড
 apps/erpnext/erpnext/stock/doctype/item/item.js +34,Show Variants,দেখান রুপভেদ
@@ -64,25 +61,23 @@
 DocType: Production Plan Item,Production Plan Item,উৎপাদন পরিকল্পনা আইটেম
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +141,User {0} is already assigned to Employee {1},ব্যবহারকারী {0} ইতিমধ্যে কর্মচারী নির্ধারিত হয় {1}
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +13,Make new POS Profile,নতুন পিওএস প্রোফাইল তৈরি করুন
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +31,Health Care,স্বাস্থ্যের যত্ন
+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 +494,Invoice,চালান
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +519,Invoice,চালান
 DocType: Maintenance Schedule Item,Periodicity,পর্যাবৃত্তি
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +357,Email Address,ইমেল ঠিকানা
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +21,Defense,প্রতিরক্ষা
+apps/erpnext/erpnext/public/js/setup_wizard.js +107,Email Address,ইমেল ঠিকানা
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,প্রতিরক্ষা
 DocType: Company,Abbr,সংক্ষিপ্তকরণ
 DocType: Appraisal Goal,Score (0-5),স্কোর (0-5)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +193,Row {0}: {1} {2} does not match with {3},সারি {0}: {1} {2} সঙ্গে মেলে না {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +67,Row # {0}:,সারি # {0}:
 DocType: Delivery Note,Vehicle No,যানবাহন কোন
 apps/erpnext/erpnext/public/js/pos/pos.js +528,Please select Price List,মূল্য তালিকা নির্বাচন করুন
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +162,Woodworking,কাঠের
 DocType: Production Order Operation,Work In Progress,কাজ চলছে
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +153,3D printing,3D মুদ্রন
 DocType: Employee,Holiday List,ছুটির তালিকা
 DocType: Time Log,Time Log,টাইম ইন
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +530,Accountant,হিসাবরক্ষক
+apps/erpnext/erpnext/public/js/setup_wizard.js +274,Accountant,হিসাবরক্ষক
 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.","ক্রিয়াকলাপ এর লগ, বিলিং সময় ট্র্যাকিং জন্য ব্যবহার করা যেতে পারে যে কার্য বিরুদ্ধে ব্যবহারকারীদের দ্বারা সঞ্চালিত."
@@ -98,18 +93,19 @@
 DocType: Bin,Quantity Requested for Purchase,পরিমাণ ক্রয় জন্য অনুরোধ করা
 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/setup/page/setup_wizard/setup_wizard.js +626,Kg,কেজি
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Kg,কেজি
 apps/erpnext/erpnext/config/hr.py +48,Opening for a Job.,একটি কাজের জন্য খোলা.
 DocType: Item Attribute,Increment,বৃদ্ধি
 apps/erpnext/erpnext/public/js/stock_analytics.js +63,Select Warehouse...,ওয়ারহাউস নির্বাচন ...
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +6,Advertising,বিজ্ঞাপন
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,বিজ্ঞাপন
+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/doctype/sales_invoice/sales_invoice.py +389,Stock cannot be updated against Delivery Note {0},শেয়ার হুণ্ডি বিরুদ্ধে আপডেট করা যাবে না {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +391,Stock cannot be updated against Delivery Note {0},শেয়ার হুণ্ডি বিরুদ্ধে আপডেট করা যাবে না {0}
 DocType: Payment Reconciliation,Reconcile,মিলনসাধন করা
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +30,Grocery,মুদিখানা
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,মুদিখানা
 DocType: Quality Inspection Reading,Reading 1,1 পঠন
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Make Bank Entry,ব্যাংক এন্ট্রি করতে
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +40,Pension Funds,অবসর বৃত্তি পেনশন ভাতা তহবিল
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,অবসর বৃত্তি পেনশন ভাতা তহবিল
 apps/erpnext/erpnext/accounts/doctype/account/account.py +142,Warehouse is mandatory if account type is Warehouse,অ্যাকাউন্টের ধরণ ওয়্যারহাউস যদি ওয়্যারহাউস বাধ্যতামূলক
 DocType: SMS Center,All Sales Person,সব বিক্রয় ব্যক্তি
 DocType: Lead,Person Name,ব্যক্তির নাম
@@ -124,14 +120,14 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +141,You are not authorized to add or update entries before {0},আপনি আগে এন্ট্রি যোগ করতে অথবা আপডেট করার জন্য অনুমতিপ্রাপ্ত নন {0}
 DocType: Item,Item Image (if not slideshow),আইটেম ইমেজ (ছবি না হলে)
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,একটি গ্রাহক এই একই নামের
-DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(ঘন্টা হার / 60) * প্রকৃত অপারেশন টাইম
+DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(ঘন্টা হার / ৬০) * প্রকৃত অপারেশন টাইম
 DocType: SMS Log,SMS Log,এসএমএস লগ
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,বিতরণ আইটেম খরচ
 DocType: Blog Post,Guest,অতিথি
 DocType: Quality Inspection,Get Specification Details,স্পেসিফিকেশন বিবরণ পান
 DocType: Lead,Interested,আগ্রহী
 apps/erpnext/erpnext/config/manufacturing.py +14,Bill of Material,উপাদান বিল
-apps/erpnext/erpnext/public/js/stock_analytics.js +45,Opening,উদ্বোধন
+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,আইটেম গ্রুপ থেকে কপি
 DocType: Journal Entry,Opening Entry,প্রারম্ভিক ভুক্তি
@@ -145,23 +141,22 @@
 DocType: Employee Education,Under Graduate,গ্রাজুয়েট অধীনে
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +22,Target On,টার্গেটের
 DocType: BOM,Total Cost,মোট খরচ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +99,Reaming,Reaming
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +9,Activity Log:,কার্য বিবরণ:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +199,Item {0} does not exist in the system or has expired,{0} আইটেম সিস্টেমে কোন অস্তিত্ব নেই অথবা মেয়াদ শেষ হয়ে গেছে
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +44,Real Estate,আবাসন
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +44,Real Estate,আবাসন
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +4,Statement of Account,অ্যাকাউন্ট বিবৃতি
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +41,Pharmaceuticals,ফার্মাসিউটিক্যালস
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,ফার্মাসিউটিক্যালস
 DocType: Expense Claim Detail,Claim Amount,দাবি পরিমাণ
 DocType: Employee,Mr,জনাব
 DocType: Custom Script,Client,মক্কেল
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,সরবরাহকারী ধরন / সরবরাহকারী
 DocType: Naming Series,Prefix,উপসর্গ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Consumable,Consumable
+apps/erpnext/erpnext/public/js/setup_wizard.js +359,Consumable,Consumable
 DocType: Upload Attendance,Import Log,আমদানি লগ
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.js +19,Send,পাঠান
 DocType: Sales Invoice Item,Delivered By Supplier,সরবরাহকারী দ্বারা বিতরণ
 DocType: SMS Center,All Contact,সমস্ত যোগাযোগ
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +164,Annual Salary,বার্ষিক বেতন
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +164,Annual Salary,বার্ষিক বেতন
 DocType: Period Closing Voucher,Closing Fiscal Year,ফিস্ক্যাল বছর সমাপ্তি
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +69,Stock Expenses,স্টক খরচ
 DocType: Newsletter,Email Sent?,ইমেইল পাঠানো?
@@ -169,26 +164,24 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +92,Show Time Logs,সময় দেখান লগ
 DocType: Journal Entry Account,Credit in Company Currency,কোম্পানি একক ঋণ
 DocType: Delivery Note,Installation Status,ইনস্টলেশনের অবস্থা
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +115,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Qty পরিত্যক্ত গৃহীত + আইটেম জন্য গৃহীত পরিমাণ সমান হতে হবে {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +118,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Qty পরিত্যক্ত গৃহীত + আইটেম জন্য গৃহীত পরিমাণ সমান হতে হবে {0}
 DocType: Item,Supply Raw Materials for Purchase,সাপ্লাই কাঁচামালের ক্রয় জন্য
 apps/erpnext/erpnext/stock/get_item_details.py +133,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 +493,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","আইটেম রেট সারি {0} মধ্যে ট্যাক্স সহ, সারি করের {1} এছাড়াও অন্তর্ভুক্ত করা আবশ্যক"
+apps/erpnext/erpnext/controllers/accounts_controller.py +494,"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 +90,Settings for HR Module,এইচআর মডিউল ব্যবহার সংক্রান্ত সেটিংস Comment
 DocType: SMS Center,SMS Center,এসএমএস কেন্দ্র
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +78,Straightening,সোজা
 DocType: BOM Replace Tool,New BOM,নতুন BOM
 apps/erpnext/erpnext/config/projects.py +28,Batch Time Logs for billing.,ব্যাচ বিলিং জন্য সময় লগসমূহ.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +15,Countergravity casting,Countergravity ঢালাই
 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/setup/page/setup_wizard/fixtures/industry_type.py +14,Broadcasting,সম্প্রচার
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +140,Execution,সম্পাদন
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +364,The first user will become the System Manager (you can change this later).,সিস্টেম ম্যানেজার হয়ে যাবে প্রথম ব্যবহারকারী (আপনি পরে তা পরিবর্তন করতে পারবেন).
+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/public/js/setup_wizard.js +114,The first user will become the System Manager (you can change this later).,সিস্টেম ম্যানেজার হয়ে যাবে প্রথম ব্যবহারকারী (আপনি পরে তা পরিবর্তন করতে পারবেন).
 apps/erpnext/erpnext/config/manufacturing.py +39,Details of the operations carried out.,অপারেশনের বিবরণ সম্পন্ন.
 DocType: Serial No,Maintenance Status,রক্ষণাবেক্ষণ অবস্থা
 apps/erpnext/erpnext/config/stock.py +263,Items and Pricing,চলছে এবং প্রাইসিং
@@ -205,7 +198,6 @@
 DocType: Pricing Rule,Discount on Price List Rate (%),মূল্য তালিকা রেট বাট্টা (%)
 apps/frappe/frappe/public/js/frappe/form/print.js +96,Start,শুরু
 DocType: User,First Name,প্রথম নাম
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +12,Full-mold casting,সম্পূর্ণ ছাঁচ কাস্টিং
 DocType: Offer Letter,Select Terms and Conditions,নির্বাচন শর্তাবলী
 DocType: Production Planning Tool,Sales Orders,বিক্রয় আদেশ
 DocType: Purchase Taxes and Charges,Valuation,মাননির্ণয়
@@ -217,8 +209,7 @@
 DocType: Bank Reconciliation,Bank Account,ব্যাংক হিসাব
 DocType: Leave Type,Allow Negative Balance,ঋণাত্মক ব্যালান্স মঞ্জুরি
 DocType: Selling Settings,Default Territory,ডিফল্ট টেরিটরি
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +53,Television,টিভি
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +138,Gashing,Gashing
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,টিভি
 DocType: Production Order Operation,Updated via 'Time Log',&#39;টাইম ইন&#39; র মাধ্যমে আপডেট
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +82,Account {0} does not belong to Company {1},অ্যাকাউন্ট {0} কোম্পানি অন্তর্গত নয় {1}
 DocType: Naming Series,Series List for this Transaction,এই লেনদেনে সিরিজ তালিকা
@@ -233,14 +224,13 @@
 DocType: Leave Allocation,Add unused leaves from previous allocations,আগের বরাদ্দ থেকে অব্যবহৃত পাতার করো
 apps/erpnext/erpnext/controllers/recurring_document.py +206,Next Recurring {0} will be created on {1},পরবর্তী আবর্তক {0} উপর তৈরি করা হবে {1}
 DocType: Newsletter List,Total Subscribers,মোট গ্রাহক
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +575,Contact Name,যোগাযোগের নাম
+,Contact Name,যোগাযোগের নাম
 DocType: Production Plan Item,SO Pending Qty,মুলতুবি Qty
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,উপরে উল্লিখিত মানদণ্ড জন্য বেতন স্লিপ তৈরি করা হয়.
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,কেনার জন্য অনুরোধ জানান.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +107,Double housing,ডাবল হাউজিং
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +156,Only the selected Leave Approver can submit this Leave Application,শুধু নির্বাচিত ছুটি রাজসাক্ষী এই ছুটি আবেদন জমা দিতে পারেন
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +171,Only the selected Leave Approver can submit this Leave Application,শুধু নির্বাচিত ছুটি রাজসাক্ষী এই ছুটি আবেদন জমা দিতে পারেন
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,তারিখ মুক্তিদান যোগদান তারিখ থেকে বড় হওয়া উচিত
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +172,Leaves per Year,প্রতি বছর পত্রাদি
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +172,Leaves per Year,প্রতি বছর পত্রাদি
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup > Settings > Naming Series,{0} সেটআপ&gt; সেটিংস মাধ্যমে&gt; নামকরণ সিরিজ জন্য সিরিজ নামকরণ সেট করুন
 DocType: Time Log,Will be updated when batched.,Batched যখন আপডেট করা হবে.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +104,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,সারি {0}: চেক করুন অ্যাকাউন্টের বিরুদ্ধে &#39;আগাম&#39; {1} এই একটি অগ্রিম এন্ট্রি হয়.
@@ -249,25 +239,24 @@
 DocType: Item Website Specification,Item Website Specification,আইটেম ওয়েবসাইট স্পেসিফিকেশন
 DocType: Dropbox Backup,Dropbox Access Key,ড্রপবক্স অ্যাক্সেস কী
 DocType: Payment Tool,Reference No,রেফারেন্স কোন
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +348,Leave Blocked,ত্যাগ অবরুদ্ধ
-apps/erpnext/erpnext/stock/doctype/item/item.py +535,Item {0} has reached its end of life on {1},আইটেম {0} জীবনের তার শেষ পৌঁছেছে {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +392,Leave Blocked,ত্যাগ অবরুদ্ধ
+apps/erpnext/erpnext/stock/doctype/item/item.py +539,Item {0} has reached its end of life on {1},আইটেম {0} জীবনের তার শেষ পৌঁছেছে {1}
 apps/erpnext/erpnext/accounts/utils.py +339,Annual,বার্ষিক
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,শেয়ার রিকনসিলিয়েশন আইটেম
 DocType: Stock Entry,Sales Invoice No,বিক্রয় চালান কোন
 DocType: Material Request Item,Min Order Qty,ন্যূনতম আদেশ Qty
 DocType: Lead,Do Not Contact,যোগাযোগ না
 DocType: Sales Invoice,The unique id for tracking all recurring invoices. It is generated on submit.,সব আবর্তক চালান ট্র্যাকিং জন্য অনন্য আইডি. এটি জমা দিতে হবে নির্মাণ করা হয়.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +93,Software Developer,সফ্টওয়্যার ডেভেলপার
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +93,Software Developer,সফ্টওয়্যার ডেভেলপার
 DocType: Item,Minimum Order Qty,নূন্যতম আদেশ Qty
 DocType: Pricing Rule,Supplier Type,সরবরাহকারী ধরন
 DocType: Item,Publish in Hub,হাব প্রকাশ
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +555,Item {0} is cancelled,{0} আইটেম বাতিল করা হয়
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +598,Material Request,উপাদানের জন্য অনুরোধ
+apps/erpnext/erpnext/stock/doctype/item/item.py +559,Item {0} is cancelled,{0} আইটেম বাতিল করা হয়
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +607,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},ক্রয় করার &#39;কাঁচামাল সরবরাহ করা&#39; টেবিলের মধ্যে পাওয়া আইটেম {0} {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +129,Wire brushing,ওয়্যার মার্জন
 DocType: Employee,Relation,সম্পর্ক
 DocType: Shipping Rule,Worldwide Shipping,বিশ্বব্যাপী শিপিং
 apps/erpnext/erpnext/config/selling.py +23,Confirmed orders from Customers.,গ্রাহকরা থেকে নিশ্চিত আদেশ.
@@ -283,12 +272,11 @@
 DocType: Supplier,Address HTML,ঠিকানা এইচটিএমএল
 DocType: Lead,Mobile No.,মোবাইল নাম্বার.
 DocType: Maintenance Schedule,Generate Schedule,সূচি নির্মাণ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +81,Hubbing,Hubbing
 DocType: Purchase Invoice Item,Expense Head,ব্যয় হেড
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +86,Please select Charge Type first,প্রথম অভিযোগ টাইপ নির্বাচন করুন
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,সর্বশেষ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +395,Max 5 characters,সর্বোচ্চ 5 টি অক্ষর
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +195,Select Your Language,আপনার ভাষা নির্বাচন করুন
+apps/erpnext/erpnext/public/js/setup_wizard.js +143,Max 5 characters,সর্বোচ্চ 5 টি অক্ষর
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +245,Select Your Language,আপনার ভাষা নির্বাচন করুন
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,যদি তালিকার প্রথম ছুটি রাজসাক্ষী ডিফল্ট ছুটি রাজসাক্ষী হিসাবে নির্ধারণ করা হবে
 DocType: Manufacturing Settings,"Disables creation of time logs against Production Orders.
 Operations shall not be tracked against Production Order",উত্পাদনের অবাধ্য সময় লগ সৃষ্টি নিষ্ক্রিয় করা হয়. অপারেশনস উত্পাদনের আদেশের বিরুদ্ধে ট্র্যাক করা হবে না
@@ -300,8 +288,6 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +34,Item {0} must be Service Item,আইটেম {0} পরিষেবা আইটেম হতে হবে
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +303,Completed Qty can not be greater than 'Qty to Manufacture',চেয়ে &#39;স্টক প্রস্তুত করতে&#39; সম্পন্ন Qty বৃহত্তর হতে পারে না
 DocType: DocType,Administrator,প্রশাসক
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +136,Laser drilling,লেজার তুরপুন
-DocType: Stock UOM Replace Utility,New Stock UOM,নতুন শেয়ার UOM
 DocType: Period Closing Voucher,Closing Account Head,অ্যাকাউন্ট হেড সমাপ্তি
 DocType: Employee,External Work History,বাহ্যিক কাজের ইতিহাস
 apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,সার্কুলার রেফারেন্স ত্রুটি
@@ -310,18 +296,15 @@
 DocType: Lead,Industry,শিল্প
 DocType: Employee,Job Profile,চাকরি বৃত্তান্ত
 DocType: Newsletter,Newsletter,নিউজলেটার
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +84,Hydroforming,Hydroforming
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +49,Necking,স্তম্ভগ্রীবা
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,স্বয়ংক্রিয় উপাদান অনুরোধ নির্মাণের ইমেইল দ্বারা সূচিত
 DocType: Journal Entry,Multi Currency,বিভিন্ন দেশের মুদ্রা
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +51,Item is updated,আইটেম আপডেট করা হয়
 DocType: Async Task,System Manager,সিস্টেম ম্যানেজার
 DocType: Payment Reconciliation Invoice,Invoice Type,চালান প্রকার
 DocType: Sales Invoice Item,Delivery Note,চালান পত্র
 DocType: Dropbox Backup,Allow Dropbox Access,ড্রপবক্স ব্যবহারের অনুমতি
 apps/erpnext/erpnext/config/learn.py +72,Setting up Taxes,করের আপ সেট
 apps/erpnext/erpnext/accounts/utils.py +189,Payment Entry has been modified after you pulled it. Please pull it again.,আপনি এটি টানা পরে পেমেন্ট ভুক্তি নথীটি পরিবর্তিত হয়েছে. আবার এটি টান করুন.
-apps/erpnext/erpnext/stock/doctype/item/item.py +343,{0} entered twice in Item Tax,{0} আইটেম ট্যাক্স দুইবার প্রবেশ
+apps/erpnext/erpnext/stock/doctype/item/item.py +347,{0} entered twice in Item Tax,{0} আইটেম ট্যাক্স দুইবার প্রবেশ
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +105,Summary for this week and pending activities,এই সপ্তাহে এবং স্থগিত কার্যক্রম জন্য সারসংক্ষেপ
 DocType: Workstation,Rent Cost,ভাড়া খরচ
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +74,Please select month and year,মাস এবং বছর নির্বাচন করুন
@@ -338,23 +321,21 @@
 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","BOM, আদেয়ক, ক্রয় চালান, উত্পাদনের আদেশ, ক্রয় আদেশ, কেনার রসিদ, বিক্রয় চালান, বিক্রয় আদেশ, শেয়ার এন্ট্রি, শ্রমিকের খাটুনিঘণ্টা লিপিবদ্ধ কার্ড পাওয়া যায়"
 DocType: Item Tax,Tax Rate,করের হার
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Select Item,পছন্দ করো
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +540,Select Item,পছন্দ করো
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +143,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","আইটেম: {0} ব্যাচ প্রজ্ঞাময়, পরিবর্তে ব্যবহার স্টক এণ্ট্রি \ শেয়ার রিকনসিলিয়েশন ব্যবহার মিলন করা যাবে না পরিচালিত"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +259,Purchase Invoice {0} is already submitted,চালান {0} ইতিমধ্যেই জমা ক্রয়
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +262,Purchase Invoice {0} is already submitted,চালান {0} ইতিমধ্যেই জমা ক্রয়
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Batch No must be same as {1} {2},সারি # {0}: ব্যাচ কোন হিসাবে একই হতে হবে {1} {2}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Convert to non-Group,অ দলের রূপান্তর
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +55,Purchase Receipt must be submitted,কেনার রসিদ দাখিল করতে হবে
-DocType: Stock UOM Replace Utility,Current Stock UOM,বর্তমান স্টক UOM
 apps/erpnext/erpnext/config/stock.py +53,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}
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Your email address,আপনার ইমেইল ঠিকানা
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +194,Please see attachment,অনুগ্রহ পূর্বক সংযুক্তি দেখুন
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +203,Please see attachment,অনুগ্রহ পূর্বক সংযুক্তি দেখুন
 DocType: Purchase Order,% Received,% গৃহীত
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +109,Water jet cutting,ওয়াটার জেট কাটিং
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +24,Setup Already Complete!!,সেটআপ ইতিমধ্যে সম্পূর্ণ !!
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +20,Setup Already Complete!!,সেটআপ ইতিমধ্যে সম্পূর্ণ !!
 ,Finished Goods,সমাপ্ত পণ্য
 DocType: Delivery Note,Instructions,নির্দেশনা
 DocType: Quality Inspection,Inspected By,পরিদর্শন
@@ -369,6 +350,7 @@
 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,টাকা অদলবদল
 DocType: Purchase Invoice Item,Item Name,আইটেম নাম
+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",চলছে অভিক্ষিপ্ত Qty এবং সর্বনিম্ন ক্রম Qty উপর ভিত্তি করে সব গুদাম বিবেচনা যা &quot;স্টক আউট&quot; হয় অনুরোধ করা
@@ -378,11 +360,10 @@
 ,Purchase Register,ক্রয় নিবন্ধন
 DocType: Landed Cost Item,Applicable Charges,চার্জ প্রযোজ্য
 DocType: Workstation,Consumable Cost,Consumable খরচ
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,{0} ({1}) must have role 'Leave Approver',{0} ({1}) ভূমিকা থাকতে হবে &#39;ছুটি রাজসাক্ষী&#39;
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +167,{0} ({1}) must have role 'Leave Approver',{0} ({1}) ভূমিকা থাকতে হবে &#39;ছুটি রাজসাক্ষী&#39;
 DocType: Purchase Receipt,Vehicle Date,যানবাহন তারিখ
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +39,Medical,মেডিকেল
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +39,Medical,মেডিকেল
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,হারানোর জন্য কারণ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +36,Tube beading,টিউব beading
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},ওয়ার্কস্টেশন ছুটির তালিকা অনুযায়ী নিম্নলিখিত তারিখগুলি উপর বন্ধ করা হয়: {0}
 DocType: Employee,Single,একক
 DocType: Issue,Attachment,ক্রোক
@@ -395,7 +376,7 @@
 DocType: Purchase Order,Start date of current order's period,বর্তমান অর্ডারের সময়সীমার তারিখ শুরু
 apps/erpnext/erpnext/utilities/transaction_base.py +128,Quantity cannot be a fraction in row {0},পরিমাণ সারিতে একটি ভগ্নাংশ হতে পারবেন না {0}
 DocType: Purchase Invoice Item,Quantity and Rate,পরিমাণ ও হার
-DocType: Delivery Note,% Installed,% ইনস্টল
+DocType: Delivery Note,% Installed,% ইনস্টল করা হয়েছে 
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +59,Please enter company name first,প্রথম কোম্পানি নাম লিখুন
 DocType: BOM,Item Desription,আইটেম Desription
 DocType: Purchase Invoice,Supplier Name,সরবরাহকারী নাম
@@ -403,10 +384,8 @@
 DocType: Account,Is Group,দলটির
 DocType: Stock Settings,Automatically Set Serial Nos based on FIFO,স্বয়ংক্রিয়ভাবে FIFO উপর ভিত্তি করে আমরা সিরিয়াল সেট
 DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,চেক সরবরাহকারী চালান নম্বর স্বতন্ত্রতা
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +31,Thermoforming,Thermoforming
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +66,Slitting,অতীত
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +57,'To Case No.' cannot be less than 'From Case No.',&#39;কেস নং&#39; &#39;কেস নং থেকে&#39; কম হতে পারে না
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +104,Non Profit,মুনাফা বিহীন
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +57,'To Case No.' cannot be less than 'From Case No.','কেস নংপর্যন্ত' কখনই 'কেস নং থেকে' এর চেয়ে কম হতে পারে না
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +104,Non Profit,মুনাফা বিহীন
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_list.js +7,Not Started,শুরু না
 DocType: Lead,Channel Partner,চ্যানেল পার্টনার
 DocType: Account,Old Parent,প্রাচীন মূল
@@ -415,13 +394,12 @@
 apps/erpnext/erpnext/config/manufacturing.py +74,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 +512,Attribute {0} selected multiple times in Attributes Table,গুন {0} আরোপ ছক মধ্যে একাধিক বার নির্বাচিত
+apps/erpnext/erpnext/stock/doctype/item/item.py +516,Attribute {0} selected multiple times in Attributes Table,গুন {0} আরোপ ছক মধ্যে একাধিক বার নির্বাচিত
 DocType: Sales Order,Not Applicable,প্রযোজ্য নয়
 apps/erpnext/erpnext/config/hr.py +140,Holiday master.,হলিডে মাস্টার.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +19,Shell molding,শেল ঢালাই
 DocType: Material Request Item,Required Date,প্রয়োজনীয় তারিখ
 DocType: Delivery Note,Billing Address,বিলিং ঠিকানা
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +644,Please enter Item Code.,আইটেম কোড প্রবেশ করুন.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +648,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,মোট Qty
@@ -431,7 +409,7 @@
 DocType: Item Attribute,To Range,পরিসীমা
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,সিকিউরিটিজ এবং আমানত
 DocType: Features Setup,Imports,আমদানি
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +144,Adhesive bonding,আঠালো bonding
+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.,উপস্থিতি দলিল.
@@ -439,26 +417,25 @@
 DocType: Sales Order Item,Used for Production Plan,উৎপাদন পরিকল্পনা জন্য ব্যবহৃত
 DocType: System Settings,Loading...,লোড হচ্ছে ...
 DocType: DocField,Password,পাসওয়ার্ড
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +155,Fused deposition modeling,নিলীন এজাহার মডেলিং
 DocType: Manufacturing Settings,Time Between Operations (in mins),(মিনিট) অপারেশনস মধ্যে সময়
 DocType: Customer,Buyer of Goods and Services.,পণ্য ও সার্ভিসেস ক্রেতা.
 DocType: Journal Entry,Accounts Payable,পরিশোধযোগ্য হিসাব
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +24,Add Subscribers,গ্রাহক
-apps/erpnext/erpnext/public/js/feature_setup.js +220,""" does not exists",&quot;বিদ্যমান না
+apps/erpnext/erpnext/public/js/feature_setup.js +220,""" does not exists",""" বিদ্যমান না"
 DocType: Pricing Rule,Valid Upto,বৈধ পর্যন্ত
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +564,List a few of your customers. They could be organizations or individuals.,আপনার গ্রাহকদের কয়েক তালিকা. তারা সংগঠন বা ব্যক্তি হতে পারে.
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,List a few of your customers. They could be organizations or individuals.,আপনার গ্রাহকদের কয়েক তালিকা. তারা সংগঠন বা ব্যক্তি হতে পারে.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Direct Income,সরাসরি আয়
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +33,"Can not filter based on Account, if grouped by Account",অ্যাকাউন্ট দ্বারা গ্রুপকৃত তাহলে অ্যাকাউন্ট উপর ভিত্তি করে ফিল্টার করতে পারবে না
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +88,Administrative Officer,প্রশাসনিক কর্মকর্তা
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Administrative Officer,প্রশাসনিক কর্মকর্তা
 DocType: Payment Tool,Received Or Paid,গৃহীত বা প্রদত্ত
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +318,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 +305,Please enter Warehouse for which Material Request will be raised,"উপাদান অনুরোধ উত্থাপিত হবে, যার জন্য গুদাম লিখুন দয়া করে"
 DocType: Production Order,Additional Operating Cost,অতিরিক্ত অপারেটিং খরচ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +20,Cosmetics,অঙ্গরাগ
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,অঙ্গরাগ
 DocType: DocField,Type,শ্রেণী
-apps/erpnext/erpnext/stock/doctype/item/item.py +417,"To merge, following properties must be same for both items",মার্জ করার জন্য নিম্নলিখিত বৈশিষ্ট্য উভয় আইটেম জন্য একই হতে হবে
+apps/erpnext/erpnext/stock/doctype/item/item.py +421,"To merge, following properties must be same for both items",মার্জ করার জন্য নিম্নলিখিত বৈশিষ্ট্য উভয় আইটেম জন্য একই হতে হবে
 DocType: Communication,Subject,বিষয়
 DocType: Shipping Rule,Net Weight,প্রকৃত ওজন
 DocType: Employee,Emergency Phone,জরুরী ফোন
@@ -468,7 +445,6 @@
 DocType: Journal Entry,Difference (Dr - Cr),পার্থক্য (ডাঃ - CR)
 DocType: Account,Profit and Loss,লাভ এবং ক্ষতি
 apps/erpnext/erpnext/config/stock.py +293,Managing Subcontracting,ম্যানেজিং প্রণীত
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +58,New UOM must NOT be of type Whole Number,নতুন UOM টাইপ পূর্ণ সংখ্যা অন্তর্ভুক্ত হবেন না হবে
 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 +47,Account {0} does not belong to company: {1},{0} অ্যাকাউন্ট কোম্পানি অন্তর্গত নয়: {1}
@@ -487,14 +463,14 @@
 DocType: Purchase Invoice,Supplier Invoice No,সরবরাহকারী চালান কোন
 DocType: Territory,For reference,অবগতির জন্য
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +154,"Cannot delete Serial No {0}, as it is used in stock transactions","মুছে ফেলা যায় না সিরিয়াল কোন {0}, এটা শেয়ার লেনদেনের ক্ষেত্রে ব্যবহার করা হয় যেমন"
-apps/erpnext/erpnext/public/js/account_tree_grid.js +52,Closing (Cr),বন্ধ (যোগাযোগ Cr)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +227,Closing (Cr),বন্ধ (যোগাযোগ Cr)
 DocType: Serial No,Warranty Period (Days),পাটা কাল (দিন)
 DocType: Installation Note Item,Installation Note Item,ইনস্টলেশন নোট আইটেম
 ,Pending Qty,মুলতুবি Qty
 DocType: Job Applicant,Thread HTML,থ্রেড এইচটিএমএল
 DocType: Company,Ignore,উপেক্ষা করা
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +86,SMS sent to following numbers: {0},এসএমএস নিম্নলিখিত সংখ্যা পাঠানো: {0}
-apps/erpnext/erpnext/controllers/buying_controller.py +135,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,উপ-সংকুচিত কেনার রসিদ জন্য বাধ্যতামূলক সরবরাহকারী ওয়্যারহাউস
+apps/erpnext/erpnext/controllers/buying_controller.py +126,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,উপ-সংকুচিত কেনার রসিদ জন্য বাধ্যতামূলক সরবরাহকারী ওয়্যারহাউস
 DocType: Pricing Rule,Valid From,বৈধ হবে
 DocType: Sales Invoice,Total Commission,মোট কমিশন
 DocType: Pricing Rule,Sales Partner,বিক্রয় অংশীদার
@@ -502,7 +478,7 @@
 DocType: Monthly Distribution,"**Monthly Distribution** helps you distribute your budget across months if you have seasonality in your business.
 
 To distribute a budget using this distribution, set this **Monthly Distribution** in the **Cost Center**","** মাসিক বন্টন ** আপনার ব্যবসা যদি আপনি ঋতু আছে, যদি আপনি মাস জুড়ে আপনার বাজেটের বিতরণ করতে সাহায্য করে. ** এই ডিস্ট্রিবিউশন ব্যবহার একটি বাজেট বিতরণ ** কস্ট সেন্টারে ** এই ** মাসিক বন্টন সেট করুন"
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +183,No records found in the Invoice table,চালান টেবিল অন্তর্ভুক্ত কোন রেকর্ড
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +130,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 +84,Financial / accounting year.,আর্থিক / অ্যাকাউন্টিং বছর.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","দুঃখিত, সিরিয়াল আমরা মার্জ করা যাবে না"
@@ -518,25 +494,25 @@
 DocType: Sales Order,Billing and Delivery Status,বিলিং এবং বিলি অবস্থা
 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/setup/page/setup_wizard/setup_wizard_page.html +16,Previous,পূর্ববর্তী
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard_page.html +16,Previous,পূর্ববর্তী
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +620,Sales Return,সেলস প্রত্যাবর্তন
 DocType: Production Planning Tool,Select Sales Orders from which you want to create Production Orders.,আপনি উত্পাদনের আদেশ তৈরি করতে চান যা থেকে বিক্রয় আদেশ নির্বাচন.
 DocType: Item,Delivered by Supplier (Drop Ship),সরবরাহকারীকে বিতরণ (ড্রপ জাহাজ)
 apps/erpnext/erpnext/config/hr.py +120,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.,গ্রাহক ডাটাবেস.
 DocType: Quotation,Quotation To,উদ্ধৃতি
 DocType: Lead,Middle Income,মধ্য আয়
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),খোলা (যোগাযোগ Cr)
 apps/erpnext/erpnext/accounts/utils.py +193,Allocated amount can not be negative,বরাদ্দ পরিমাণ নেতিবাচক হতে পারে না
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +123,Tumbling,গড়াগড়ি
 DocType: Purchase Order Item,Billed Amt,দেখানো হয়েছিল মাসিক
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,শেয়ার এন্ট্রি তৈরি করা হয় যার বিরুদ্ধে একটি লজিক্যাল ওয়্যারহাউস.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +92,Reference No & Reference Date is required for {0},রেফারেন্স কোন ও রেফারেন্স তারিখ জন্য প্রয়োজন বোধ করা হয় {0}
 DocType: Event,Wednesday,বুধবার
 DocType: Sales Invoice,Customer's Vendor,গ্রাহকের বিক্রেতার
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +214,Production Order is Mandatory,উৎপাদন অর্ডার বাধ্যতামূলক
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +139,Proposal Writing,প্রস্তাবনা লিখন
+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} একই কর্মচারী আইডি দিয়ে বিদ্যমান
 apps/erpnext/erpnext/stock/stock_ledger.py +336,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},নেতিবাচক শেয়ার ত্রুটি ({6}) আইটেম জন্য {0} গুদাম {1} উপর {2} {3} মধ্যে {4} {5}
 DocType: Fiscal Year Company,Fiscal Year Company,অর্থবছরের কোম্পানি
@@ -559,7 +535,7 @@
 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/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.py +179,Please install dropbox python module,ড্রপবক্স পাইথন মডিউল ইনস্টল করুন
 DocType: Employee,Passport Number,পাসপোর্ট নম্বার
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +82,Manager,ম্যানেজার
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Manager,ম্যানেজার
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +494,From Purchase Receipt,কেনার রসিদ থেকে
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +219,Same item has been entered multiple times.,একই আইটেমের একাধিক বার প্রবেশ করানো হয়েছে.
 DocType: SMS Settings,Receiver Parameter,রিসিভার পরামিতি
@@ -567,10 +543,9 @@
 DocType: Sales Person,Sales Person Targets,সেলস পারসন লক্ষ্যমাত্রা
 apps/frappe/frappe/public/js/frappe/form/workflow.js +116,To,থেকে
 apps/frappe/frappe/templates/base.html +145,Please enter email address,ইমেল ঠিকানা লিখুন
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +35,End tube forming,গঠন শেষ টিউব
 DocType: Production Order Operation,In minutes,মিনিটের মধ্যে
 DocType: Issue,Resolution Date,রেজোলিউশন তারিখ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +635,Please set default Cash or Bank account in Mode of Payment {0},পেমেন্ট মোডে ডিফল্ট ক্যাশ বা ব্যাংক একাউন্ট সেট করুন {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +637,Please set default Cash or Bank account in Mode of Payment {0},পেমেন্ট মোডে ডিফল্ট ক্যাশ বা ব্যাংক একাউন্ট সেট করুন {0}
 DocType: Selling Settings,Customer Naming By,গ্রাহক নেমিং
 apps/erpnext/erpnext/accounts/doctype/account/account.js +67,Convert to Group,গ্রুপ রূপান্তর
 DocType: Activity Cost,Activity Type,কার্যকলাপ টাইপ
@@ -578,12 +553,12 @@
 DocType: Customer,Fixed Days,স্থায়ী দিন
 DocType: Sales Invoice,Packing List,প্যাকিং তালিকা
 apps/erpnext/erpnext/config/buying.py +28,Purchase Orders given to Suppliers.,ক্রয় আদেশ সরবরাহকারীদের দেওয়া.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +43,Publishing,প্রকাশক
+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 +198,{0}: {1} not found in Invoice Details table,{0}: {1} চালান বিবরণ টেবিল মধ্যে পাওয়া যায়নি
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,{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 +208,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,রক্ষণাবেক্ষণ যান {0} এই সেলস অর্ডার বাতিলের আগে বাতিল করা হবে
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +203,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),খোলা (ড)
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},পোস্ট টাইমস্ট্যাম্প পরে হবে {0}
@@ -595,7 +570,6 @@
 DocType: Pricing Rule,Sales Manager,বিক্রয় ব্যবস্থাপক
 apps/frappe/frappe/public/js/frappe/model/model.js +492,Rename,পুনঃনামকরণ
 DocType: Journal Entry,Write Off Amount,পরিমাণ বন্ধ লিখুন
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +52,Bending,নমন
 apps/frappe/frappe/core/page/user_permissions/user_permissions.js +246,Allow User,অনুমতি
 DocType: Journal Entry,Bill No,বিল কোন
 DocType: Purchase Invoice,Quarterly,ত্রৈমাসিক
@@ -605,17 +579,16 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Please enter item details,আইটেম বিবরণ লিখুন দয়া করে
 DocType: Purchase Receipt,Other Details,অন্যান্য বিস্তারিত
 DocType: Account,Accounts,অ্যাকাউন্ট
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +67,Marketing,মার্কেটিং
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +65,Straight shearing,স্ট্রেইট গা থেকে লোম ছাঁটা
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +67,Marketing,মার্কেটিং
 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/stock/doctype/purchase_receipt/purchase_receipt.py +99,Rejected Warehouse is mandatory against regected item,পরিত্যক্ত গুদাম regected আইটেমটি বিরুদ্ধে বাধ্যতামূলক
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +102,Rejected Warehouse is mandatory against regected item,পরিত্যক্ত গুদাম regected আইটেমটি বিরুদ্ধে বাধ্যতামূলক
 DocType: Account,Expenses Included In Valuation,খরচ মূল্যনির্ধারণ অন্তর্ভুক্ত
 DocType: Employee,Provide email id registered in company,কোম্পানি নিবন্ধিত ইমেইল আইডি প্রদান
 DocType: Hub Settings,Seller City,বিক্রেতা সিটি
 DocType: Email Digest,Next email will be sent on:,পরবর্তী ইমেলে পাঠানো হবে:
 DocType: Offer Letter Term,Offer Letter Term,পত্র টার্ম প্রস্তাব
-apps/erpnext/erpnext/stock/doctype/item/item.py +492,Item has variants.,আইটেম ভিন্নতা আছে.
+apps/erpnext/erpnext/stock/doctype/item/item.py +496,Item has variants.,আইটেম ভিন্নতা আছে.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,আইটেম {0} পাওয়া যায়নি
 DocType: Bin,Stock Value,স্টক মূল্য
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,বৃক্ষ ধরন
@@ -624,10 +597,9 @@
 DocType: Material Request Item,Quantity and Warehouse,পরিমাণ এবং ওয়্যারহাউস
 DocType: Sales Invoice,Commission Rate (%),কমিশন হার (%)
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +172,"Against Voucher Type must be one of Sales Order, Sales Invoice or Journal Entry","ভাউচার বিরুদ্ধে প্রকার বিক্রয় আদেশ এক, বিক্রয় চালান বা জার্নাল এন্ট্রিতে হতে হবে"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +139,Biomachining,Biomachining
 apps/erpnext/erpnext/setup/utils.py +89,Unable to find exchange rate,বিনিময় হার খুঁজে পেতে অসমর্থ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +7,Aerospace,বিমান উড্ডয়ন এলাকা
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +19,Welcome,স্বাগত
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +7,Aerospace,বিমান উড্ডয়ন এলাকা
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +40,Welcome,স্বাগত
 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.,পণ্য সরবরাহকারী থেকে প্রাপ্ত.
@@ -650,19 +622,19 @@
 DocType: Employee,Cell Number,মোবাইল নম্বর
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,নষ্ট
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +120,You can not enter current voucher in 'Against Journal Entry' column,আপনি কলাম &#39;জার্নাল এন্ট্রি বিরুদ্ধে&#39; বর্তমান ভাউচার লিখতে পারবেন না
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +25,Energy,শক্তি
+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.,মাসিক বেতন বিবৃতি.
 DocType: Item Group,Website Specifications,ওয়েবসাইট উল্লেখ
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +205,New Account,নতুন একাউন্ট
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +21,{0}: From {0} of type {1},{0}: থেকে {0} টাইপ {1}
-apps/erpnext/erpnext/controllers/buying_controller.py +283,Row {0}: Conversion Factor is mandatory,সারি {0}: রূপান্তর ফ্যাক্টর বাধ্যতামূলক
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +21,{0}: From {0} of type {1},{0}: টাইপ {1} এর {0} থেকে
+apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,সারি {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.,হিসাব থেকে পাতার নোড বিরুদ্ধে তৈরি করা যেতে পারে. দলের বিরুদ্ধে সাজপোশাকটি অনুমতি দেওয়া হয় না.
 DocType: ToDo,High,উচ্চ
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +361,Cannot deactivate or cancel BOM as it is linked with other BOMs,নিষ্ক্রিয় অথবা অন্য BOMs সাথে সংযুক্ত করা হয় হিসাবে BOM বাতিল করতে পারেন না
 DocType: Opportunity,Maintenance,রক্ষণাবেক্ষণ
 DocType: User,Male,পুরুষ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +182,Purchase Receipt number required for Item {0},আইটেম জন্য প্রয়োজন কেনার রসিদ নম্বর {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +183,Purchase Receipt number required for Item {0},আইটেম জন্য প্রয়োজন কেনার রসিদ নম্বর {0}
 DocType: Item Attribute Value,Item Attribute Value,আইটেম মান গুন
 apps/erpnext/erpnext/config/crm.py +64,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.
@@ -691,10 +663,9 @@
 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 +324,"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/page/setup_wizard/fixtures/industry_type.py +13,Biotechnology,বায়োটেকনোলজি
+apps/erpnext/erpnext/controllers/accounts_controller.py +325,"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,অফিস রক্ষণাবেক্ষণ খরচ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +53,Hemming,Hemming
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +66,Please enter Item first,প্রথম আইটেম লিখুন দয়া করে
 DocType: Account,Liability,দায়
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +62,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,অনুমোদিত পরিমাণ সারি মধ্যে দাবি করে বেশি পরিমাণে হতে পারে না {0}.
@@ -707,10 +678,10 @@
 DocType: Company,Default Bank Account,ডিফল্ট ব্যাঙ্ক অ্যাকাউন্ট
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +47,"To filter based on Party, select Party Type first","পার্টি উপর ভিত্তি করে ফিল্টার করুন, নির্বাচন পার্টি প্রথম টাইপ"
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},"আইটেম মাধ্যমে বিতরণ করা হয় না, কারণ &#39;আপডেট স্টক চেক করা যাবে না {0}"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Nos,আমরা
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,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 +627,My Invoices,আমার চালান
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +629,My Invoices,আমার চালান
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,কোন কর্মচারী পাওয়া
 DocType: Purchase Order,Stopped,বন্ধ
 DocType: Item,If subcontracted to a vendor,একটি বিক্রেতা আউটসোর্স করে
@@ -729,35 +700,33 @@
 DocType: Features Setup,"To enable ""Point of Sale"" features",&quot;বিক্রয় বিন্দু&quot; বৈশিষ্ট্য সক্রিয় করুন
 DocType: Bin,Moving Average Rate,গড় হার মুভিং
 DocType: Production Planning Tool,Select Items,আইটেম নির্বাচন করুন
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,{0} against Bill {1} dated {2},{0} বিল বিরুদ্ধে {1} তারিখের {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +328,{0} against Bill {1} dated {2},{0} বিল বিরুদ্ধে {1} তারিখের {2}
 DocType: Comment,Reference Name,রেফারেন্স নাম
 DocType: Maintenance Visit,Completion Status,শেষ অবস্থা
 DocType: Sales Invoice Item,Target Warehouse,উদ্দিষ্ট ওয়্যারহাউস
 DocType: Item,Allow over delivery or receipt upto this percent,এই শতাংশ পর্যন্ত বিতরণ বা প্রাপ্তি ধরে মঞ্জুরি
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +49,Expected Delivery Date cannot be before Sales Order Date,প্রত্যাশিত প্রসবের তারিখ বিক্রয় আদেশ তারিখের আগে হতে পারে না
 DocType: Upload Attendance,Import Attendance,আমদানি এ্যাটেনডেন্স
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +17,All Item Groups,সকল আইটেম গ্রুপ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +17,All Item Groups,সকল আইটেম গ্রুপ
 DocType: Process Payroll,Activity Log,কার্য বিবরণ
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +30,Net Profit / Loss,নিট লাভ / ক্ষতি
 apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,স্বয়ংক্রিয়ভাবে লেনদেন জমা বার্তা রচনা.
 DocType: Production Order,Item To Manufacture,আইটেম উত্পাদনপ্রণালী
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +16,Permanent mold casting,স্থায়ী ছাঁচ কাস্টিং
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} অবস্থা {2} হয়
 apps/erpnext/erpnext/config/learn.py +172,Purchase Order to Payment,পেমেন্ট করার আদেশ ক্রয়
 DocType: Sales Order Item,Projected Qty,অভিক্ষিপ্ত Qty
 DocType: Sales Invoice,Payment Due Date,পরিশোধযোগ্য তারিখ
 DocType: Newsletter,Newsletter Manager,নিউজলেটার ম্যানেজার
-apps/erpnext/erpnext/stock/doctype/item/item.js +229,Item Variant {0} already exists with same attributes,আইটেম ভেরিয়েন্ট {0} ইতিমধ্যে একই বৈশিষ্ট্যাবলী সঙ্গে বিদ্যমান
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening',&#39;খোলা&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.js +231,Item Variant {0} already exists with same attributes,আইটেম ভেরিয়েন্ট {0} ইতিমধ্যে একই বৈশিষ্ট্যাবলী সঙ্গে বিদ্যমান
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening',' শুরু'
 DocType: Notification Control,Delivery Note Message,হুণ্ডি পাঠান
 DocType: Expense Claim,Expenses,খরচ
 DocType: Item Variant Attribute,Item Variant Attribute,আইটেম ভেরিয়েন্ট গুন
 ,Purchase Receipt Trends,কেনার রসিদ প্রবণতা
 DocType: Appraisal,Select template from which you want to get the Goals,আপনি গোল পেতে চান যা থেকে টেম্পলেট নির্বাচন
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +77,Research & Development,গবেষণা ও উন্নয়ন
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Research & Development,গবেষণা ও উন্নয়ন
 ,Amount to Bill,বিল পরিমাণ
 DocType: Company,Registration Details,রেজিস্ট্রেশন বিস্তারিত
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +75,Staking,ধর্মঘট
 DocType: Item,Re-Order Qty,পুনরায় আদেশ Qty
 DocType: Leave Block List Date,Leave Block List Date,ব্লক তালিকা তারিখ ত্যাগ
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +25,Scheduled to send to {0},পাঠাতে তফসিলি {0}
@@ -768,18 +737,16 @@
 DocType: Sales Invoice Item,Stock Details,স্টক 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/hr/doctype/leave_allocation/leave_allocation.py +71,Cannot carry forward {0},এগিয়ে বহন করা যাবে না {0}
 apps/erpnext/erpnext/accounts/doctype/account/account.py +91,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","ইতিমধ্যে ক্রেডিট অ্যাকাউন্ট ব্যালেন্স, আপনি &#39;ডেবিট&#39; হিসেবে &#39;ব্যালেন্স করতে হবে&#39; সেট করার অনুমতি দেওয়া হয় না"
 DocType: Account,Balance must be,ব্যালেন্স থাকতে হবে
 DocType: Hub Settings,Publish Pricing,প্রাইসিং প্রকাশ
 DocType: Notification Control,Expense Claim Rejected Message,ব্যয় দাবি প্রত্যাখ্যান পাঠান
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +145,Nailing,উত্কৃষ্ট
 ,Available Qty,প্রাপ্তিসাধ্য Qty
 DocType: Purchase Taxes and Charges,On Previous Row Total,পূর্ববর্তী সারি মোট উপর
 DocType: Salary Slip,Working Days,কর্মদিবস
 DocType: Serial No,Incoming Rate,ইনকামিং হার
 DocType: Packing Slip,Gross Weight,মোট ওজন
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +410,The name of your company for which you are setting up this system.,"আপনার কোম্পানির নাম, যার জন্য আপনি এই সিস্টেম সেট আপ করা হয়."
+apps/erpnext/erpnext/public/js/setup_wizard.js +158,The name of your company for which you are setting up this system.,"আপনার কোম্পানির নাম, যার জন্য আপনি এই সিস্টেম সেট আপ করা হয়."
 DocType: HR Settings,Include holidays in Total no. of Working Days,কোন মোট মধ্যে ছুটির অন্তর্ভুক্ত. কার্যদিবসের
 DocType: Job Applicant,Hold,রাখা
 DocType: Employee,Date of Joining,যোগদান তারিখ
@@ -789,7 +756,6 @@
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +3,View Subscribers,দেখুন সদস্যবৃন্দ
 DocType: Purchase Invoice Item,Purchase Receipt,কেনার রশিদ
 ,Received Items To Be Billed,গৃহীত চলছে বিল তৈরি করা
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +114,Abrasive blasting,ঘষিয়া তুলিয়া ফেলিতে সক্ষম লোকসান
 DocType: Employee,Ms,শ্রীমতি
 apps/erpnext/erpnext/config/accounts.py +148,Currency exchange rate master.,মুদ্রা বিনিময় হার মাস্টার.
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +253,Unable to find Time Slot in the next {0} days for Operation {1},অপারেশন জন্য পরের {0} দিন টাইম স্লটে এটি অক্ষম {1}
@@ -801,7 +767,7 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +209,Serial No {0} does not belong to Item {1},সিরিয়াল কোন {0} আইটেম অন্তর্গত নয় {1}
 DocType: Purchase Receipt Item Supplied,Required Qty,প্রয়োজনীয় Qty
 DocType: Bank Reconciliation,Total Amount,মোট পরিমাণ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +32,Internet Publishing,ইন্টারনেট প্রকাশনা
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,ইন্টারনেট প্রকাশনা
 DocType: Production Planning Tool,Production Orders,উত্পাদনের আদেশ
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +35,Balance Value,ব্যালেন্স মূল্য
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,বিক্রয় মূল্য তালিকা
@@ -812,7 +778,7 @@
 DocType: Supplier,Default Payable Accounts,ডিফল্ট পরিশোধযোগ্য অংশ
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,{0} কর্মচারী সক্রিয় নয় বা কোন অস্তিত্ব নেই
 DocType: Features Setup,Item Barcode,আইটেম বারকোড
-apps/erpnext/erpnext/stock/doctype/item/item.py +487,Item Variants {0} updated,আইটেম রুপভেদ {0} আপডেট
+apps/erpnext/erpnext/stock/doctype/item/item.py +491,Item Variants {0} updated,আইটেম রুপভেদ {0} আপডেট
 DocType: Quality Inspection Reading,Reading 6,6 পঠন
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,চালান অগ্রিম ক্রয়
 DocType: Address,Shop,দোকান
@@ -821,7 +787,7 @@
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,এই মোড নির্বাচন করা হলে ডিফল্ট ব্যাঙ্ক / ক্যাশ অ্যাকাউন্ট স্বয়ংক্রিয়ভাবে পিওএস চালান মধ্যে আপডেট করা হবে.
 DocType: Employee,Permanent Address Is,স্থায়ী ঠিকানা
 DocType: Production Order Operation,Operation completed for how many finished goods?,অপারেশন কতগুলি সমাপ্ত পণ্য জন্য সম্পন্ন?
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +491,The Brand,ব্র্যান্ড
+apps/erpnext/erpnext/public/js/setup_wizard.js +237,The Brand,ব্র্যান্ড
 apps/erpnext/erpnext/controllers/status_updater.py +163,Allowance for over-{0} crossed for Item {1}.,{0} আইটেম জন্য পার ওভার জন্য ভাতা {1}.
 DocType: Employee,Exit Interview Details,প্রস্থান ইন্টারভিউ এর বর্ণনা
 DocType: Item,Is Purchase Item,ক্রয় আইটেম
@@ -833,7 +799,7 @@
 DocType: Payment Tool,Paid,প্রদত্ত
 DocType: Salary Slip,Total in words,কথায় মোট
 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/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 +111,Row #{0}: Please specify Serial No for Item {1},সারি # {0}: আইটেম জন্য কোন সিরিয়াল উল্লেখ করুন {1}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +538,"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.","&#39;পণ্য সমষ্টি&#39; আইটেম, গুদাম, সিরিয়াল না এবং ব্যাচ জন্য কোন &#39;প্যাকিং তালিকা টেবিল থেকে বিবেচনা করা হবে. ওয়ারহাউস ও ব্যাচ কোন কোন &#39;পণ্য সমষ্টি&#39; আইটেমের জন্য সব প্যাকিং আইটেম জন্য একই থাকে, যারা মান প্রধান আইটেম টেবিলে সন্নিবেশ করানো যাবে, মান মেজ বোঁচকা তালিকা &#39;থেকে কপি করা হবে."
 apps/erpnext/erpnext/config/stock.py +28,Shipments to customers.,গ্রাহকদের চালানে.
@@ -841,16 +807,16 @@
 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,সেট প্রদান পরিমাণ = বকেয়া পরিমাণ
 DocType: Contact Us Settings,Address Line 1,ঠিকানা লাইন 1
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Variance,অনৈক্য
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +392,Company Name,কোমপানির নাম
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +53,Variance,অনৈক্য
+,Company Name,কোমপানির নাম
 DocType: SMS Center,Total Message(s),মোট বার্তা (গুলি)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +515,Select Item for Transfer,স্থানান্তর জন্য নির্বাচন আইটেম
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +538,Select Item for Transfer,স্থানান্তর জন্য নির্বাচন আইটেম
 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.,চেক জমা ছিল ব্যাংকের নির্বাচন অ্যাকাউন্ট মাথা.
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,ব্যবহারকারী লেনদেনের মূল্য তালিকা হার সম্পাদন করার অনুমতি প্রদান
 DocType: Pricing Rule,Max Qty,সর্বোচ্চ Qty
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +106,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,সারি {0}: সেলস / ক্রয় আদেশের বিরুদ্ধে পেমেন্ট সবসময় অগ্রিম হিসেবে চিহ্নিত করা উচিত
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +16,Chemical,রাসায়নিক
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,রাসায়নিক
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +693,All items have already been transferred for this Production Order.,সকল আইটেম ইতিমধ্যে এই উৎপাদন অর্ডার জন্য স্থানান্তর করা হয়েছে.
 DocType: Process Payroll,Select Payroll Year and Month,বেতনের বছর এবং মাস নির্বাচন করুন
 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""",উপযুক্ত গ্রুপ (সাধারণত তহবিলের আবেদন&gt; চলতি সম্পদ&gt; ব্যাংক অ্যাকাউন্ট থেকে যান এবং টাইপ) শিশু যোগ উপর ক্লিক করে (একটি নতুন অ্যাকাউন্ট তৈরি করুন &quot;ব্যাংক&quot;
@@ -861,12 +827,12 @@
 DocType: Item,Inspection Criteria,ইন্সপেকশন নির্ণায়ক
 apps/erpnext/erpnext/config/accounts.py +101,Tree of finanial Cost Centers.,Finanial খরচ কেন্দ্র বৃক্ষ.
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,স্থানান্তরিত
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +492,Upload your letter head and logo. (you can edit them later).,আপনার চিঠি মাথা এবং লোগো আপলোড করুন. (আপনি তাদের পরে সম্পাদনা করতে পারেন).
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +156,White,সাদা
+apps/erpnext/erpnext/public/js/setup_wizard.js +238,Upload your letter head and logo. (you can edit them later).,আপনার চিঠি মাথা এবং লোগো আপলোড করুন. (আপনি তাদের পরে সম্পাদনা করতে পারেন).
+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/setup/page/setup_wizard/setup_wizard.js +362,Attach Your Picture,তোমার ছবি সংযুক্ত
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Make ,করা
+apps/erpnext/erpnext/public/js/setup_wizard.js +112,Attach Your Picture,তোমার ছবি সংযুক্ত
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +540,Make ,করা
 DocType: Journal Entry,Total Amount in Words,শব্দ মধ্যে মোট পরিমাণ
 DocType: Workflow State,Stop,থামুন
 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 সাথে যোগাযোগ করুন.
@@ -875,14 +841,13 @@
 DocType: Lead,Next Contact Date,পরের যোগাযোগ তারিখ
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,Qty খোলা
 DocType: Holiday List,Holiday List Name,ছুটির তালিকা নাম
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +168,Stock Options,বিকল্প তহবিল
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +168,Stock Options,বিকল্প তহবিল
 DocType: Journal Entry Account,Expense Claim,ব্যয় দাবি
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +181,Qty for {0},জন্য Qty {0}
 DocType: Leave Application,Leave Application,আবেদন কর
 apps/erpnext/erpnext/config/hr.py +77,Leave Allocation Tool,অ্যালোকেশন টুল ত্যাগ
 DocType: Leave Block List,Leave Block List Dates,ব্লক তালিকা তারিখগুলি ছেড়ে
 DocType: Company,If Monthly Budget Exceeded (for expense account),মাসিক বাজেট (ব্যয় অ্যাকাউন্টের জন্য) অতিক্রম করেছে
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +56,Trimming,ছাঁটাই
 DocType: Workstation,Net Hour Rate,নিট ঘন্টা হার
 DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,ল্যান্ড খরচ কেনার রসিদ
 DocType: Company,Default Terms,ডিফল্ট শর্তাবলী
@@ -890,10 +855,9 @@
 DocType: POS Profile,Cash/Bank Account,নগদ / ব্যাংক অ্যাকাউন্ট
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,Removed items with no change in quantity or value.,পরিমাণ বা মান কোন পরিবর্তনের সঙ্গে সরানো আইটেম.
 DocType: Delivery Note,Delivery To,বিতরণ
-apps/erpnext/erpnext/stock/doctype/item/item.py +509,Attribute table is mandatory,গুন টেবিল বাধ্যতামূলক
+apps/erpnext/erpnext/stock/doctype/item/item.py +513,Attribute table is mandatory,গুন টেবিল বাধ্যতামূলক
 DocType: Production Planning Tool,Get Sales Orders,বিক্রয় আদেশ পান
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} নেতিবাচক হতে পারে না
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +103,Filing,ফাইলিং
 apps/erpnext/erpnext/templates/form_grid/item_grid.html +72,Discount,ডিসকাউন্ট
 DocType: Features Setup,Purchase Discounts,ক্রয় ডিসকাউন্ট
 DocType: Workstation,Wages,মজুরি
@@ -910,6 +874,7 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +112,You are the Expense Approver for this record. Please Update the 'Status' and Save,আপনি এই রেকর্ডের জন্য ব্যয় রাজসাক্ষী হয়. ‧- &#39;status&#39; এবং সংরক্ষণ আপডেট করুন
 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 +136,"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 +194,Serial No {0} is under maintenance contract upto {1},সিরিয়াল কোন {0} পর্যন্ত রক্ষণাবেক্ষণ চুক্তির অধীন হয় {1}
@@ -918,7 +883,7 @@
 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,আইটেম বাটন &#39;ক্রয় রসিদ থেকে জানানোর পান&#39; ব্যবহার করে যোগ করা হবে
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,সেলস খরচ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Buying,স্ট্যান্ডার্ড রাজধানীতে
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +120,Standard Buying,স্ট্যান্ডার্ড রাজধানীতে
 DocType: GL Entry,Against,বিরুদ্ধে
 DocType: Item,Default Selling Cost Center,ডিফল্ট বিক্রি খরচ কেন্দ্র
 DocType: Sales Partner,Implementation Partner,বাস্তবায়ন অংশীদার
@@ -939,29 +904,29 @@
 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/setup/page/setup_wizard/setup_wizard.js +588,List a few of your suppliers. They could be organizations or individuals.,আপনার সরবরাহকারীদের একটি কয়েক তালিকা. তারা সংগঠন বা ব্যক্তি হতে পারে.
+apps/erpnext/erpnext/public/js/setup_wizard.js +326,List a few of your suppliers. They could be organizations or individuals.,আপনার সরবরাহকারীদের একটি কয়েক তালিকা. তারা সংগঠন বা ব্যক্তি হতে পারে.
 DocType: Company,Default Currency,ডিফল্ট মুদ্রা
 DocType: Contact,Enter designation of this Contact,এই যোগাযোগ উপাধি লিখুন
 DocType: Contact Us Settings,Address,ঠিকানা
 DocType: Expense Claim,From Employee,কর্মী থেকে
-apps/erpnext/erpnext/controllers/accounts_controller.py +338,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,সতর্কতা: সিস্টেম আইটেম জন্য পরিমাণ যেহেতু overbilling পরীক্ষা করা হবে না {0} মধ্যে {1} শূন্য
+apps/erpnext/erpnext/controllers/accounts_controller.py +339,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,সতর্কতা: সিস্টেম আইটেম জন্য পরিমাণ যেহেতু overbilling পরীক্ষা করা হবে না {0} মধ্যে {1} শূন্য
 DocType: Journal Entry,Make Difference Entry,পার্থক্য এন্ট্রি করতে
 DocType: Upload Attendance,Attendance From Date,জন্ম থেকে উপস্থিতি
 DocType: Appraisal Template Goal,Key Performance Area,কী পারফরমেন্স ফোন
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +54,Transportation,পরিবহন
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +54,Transportation,পরিবহন
 apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +67, and year: ,এবং বছর:
 DocType: Email Digest,Annual Expense,বার্ষিক ব্যয়
 DocType: SMS Center,Total Characters,মোট অক্ষর
-apps/erpnext/erpnext/controllers/buying_controller.py +139,Please select BOM in BOM field for Item {0},আইটেম জন্য BOM ক্ষেত্রের মধ্যে BOM নির্বাচন করুন {0}
+apps/erpnext/erpnext/controllers/buying_controller.py +130,Please select BOM in BOM field for Item {0},আইটেম জন্য BOM ক্ষেত্রের মধ্যে BOM নির্বাচন করুন {0}
 DocType: C-Form Invoice Detail,C-Form Invoice Detail,সি-ফরম চালান বিস্তারিত
 DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,পেমেন্ট রিকনসিলিয়েশন চালান
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +32,Contribution %,অবদান%
 DocType: Item,website page link,ওয়েবসাইট পৃষ্ঠার লিঙ্ক
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +192,Let's prepare the system for first use.,প্রথম ব্যবহারের জন্য সিস্টেম প্রস্তুত করা যাক.
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +242,Let's prepare the system for first use.,প্রথম ব্যবহারের জন্য সিস্টেম প্রস্তুত করা যাক.
 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 +214,Production Order {0} must be cancelled before cancelling this Sales Order,উৎপাদন অর্ডার {0} এই সেলস অর্ডার বাতিলের আগে বাতিল করা হবে
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +209,Production Order {0} must be cancelled before cancelling this Sales Order,উৎপাদন অর্ডার {0} এই সেলস অর্ডার বাতিলের আগে বাতিল করা হবে
 ,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.,সময় লগসমূহ নির্বাচন করুন এবং একটি নতুন বিক্রয় চালান তৈরি জমা দিন.
@@ -980,15 +945,14 @@
 apps/erpnext/erpnext/config/learn.py +77,Opening Accounting Balance,খোলা অ্যাকাউন্টিং ব্যালান্স
 DocType: Sales Invoice Advance,Sales Invoice Advance,বিক্রয় চালান অগ্রিম
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +398,Nothing to request,কিছুই অনুরোধ করতে
-apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date',&#39;প্রকৃত আরম্ভের তারিখ&#39; &#39;প্রকৃত শেষ তারিখ&#39; বেশি হতে পারে না
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +75,Management,ম্যানেজমেন্ট
+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/setup/page/setup_wizard/fixtures/operations.py +14,Investment casting,আপনি উত্তর দিবেন না আপনি উত্তর দিবেন না
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +51,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""","এই বৈকল্পিক আইটেম কোড যোগ করা হবে. আপনার সমাহার &quot;এস এম&quot;, এবং উদাহরণস্বরূপ, যদি আইটেমটি কোড &quot;টি-শার্ট&quot;, ​​&quot;টি-শার্ট-এস এম&quot; হতে হবে বৈকল্পিক আইটেমটি কোড"
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,আপনি বেতন স্লিপ সংরক্ষণ একবার (কথায়) নিট পে দৃশ্যমান হবে.
 apps/frappe/frappe/core/doctype/user/user_list.js +12,Active,সক্রিয়
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +154,Blue,নীল
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +154,Blue,নীল
 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,আরও নোড শুধুমাত্র &#39;গ্রুপ&#39; টাইপ নোড অধীনে তৈরি করা যেতে পারে
@@ -998,18 +962,16 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +22,POS Profile {0} already created for user: {1} and company {2},পিওএস প্রোফাইল {0} ইতিমধ্যে ব্যবহারকারীর জন্য তৈরি: {1} এবং কোম্পানি {2}
 DocType: Purchase Order Item,UOM Conversion Factor,UOM রূপান্তর ফ্যাক্টর
 DocType: Stock Settings,Default Item Group,ডিফল্ট আইটেম গ্রুপ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +156,Laminated object manufacturing,পরতী বস্তুর উত্পাদন
 apps/erpnext/erpnext/config/buying.py +13,Supplier database.,সরবরাহকারী ডাটাবেস.
 DocType: Account,Balance Sheet,হিসাবনিকাশপত্র
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +561,Cost Center For Item with Item Code ',&#39;আইটেম কোড দিয়ে আইটেমের জন্য কেন্দ্র উড়ানের তালিকাটি
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +45,Stretch forming,গঠন করুন
 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 +210,"Further accounts can be made under Groups, but entries can be made against non-Groups","আরও অ্যাকাউন্ট দলের অধীনে করা যেতে পারে, কিন্তু এন্ট্রি অ গ্রুপের বিরুদ্ধে করা যেতে পারে"
 apps/erpnext/erpnext/config/hr.py +125,Tax and other salary deductions.,ট্যাক্স ও অন্যান্য বেতন কর্তন.
 DocType: Lead,Lead,লিড
 DocType: Email Digest,Payables,Payables
 DocType: Account,Warehouse,গুদাম
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +90,Row #{0}: Rejected Qty can not be entered in Purchase Return,সারি # {0}: স্টক ক্রয় ফেরত মধ্যে প্রবেশ করা যাবে না প্রত্যাখ্যাত
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +93,Row #{0}: Rejected Qty can not be entered in Purchase Return,সারি # {0}: স্টক ক্রয় ফেরত মধ্যে প্রবেশ করা যাবে না প্রত্যাখ্যাত
 ,Purchase Order Items To Be Billed,ক্রয় আদেশ আইটেম বিল তৈরি করা
 DocType: Purchase Invoice Item,Net Rate,নিট হার
 DocType: Purchase Invoice Item,Purchase Invoice Item,চালান আইটেম ক্রয়
@@ -1024,13 +986,13 @@
 DocType: Global Defaults,Current Fiscal Year,চলতি অর্থবছরের
 DocType: Global Defaults,Disable Rounded Total,গোলাকৃতি মোট অক্ষম
 DocType: Lead,Call,কল
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +384,'Entries' cannot be empty,&#39;এন্ট্রি&#39; খালি রাখা যাবে না
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +386,'Entries' cannot be empty,&#39;এন্ট্রি&#39; খালি রাখা যাবে না
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},সদৃশ সারিতে {0} একই {1}
 ,Trial Balance,ট্রায়াল ব্যালেন্স
 apps/erpnext/erpnext/config/hr.py +205,Setting up Employees,এমপ্লয়িজ স্থাপনের
 apps/erpnext/erpnext/public/js/feature_setup.js +220,"Grid """,গ্রিড &quot;
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +150,Please select prefix first,প্রথম উপসর্গ নির্বাচন করুন
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +138,Research,গবেষণা
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +138,Research,গবেষণা
 DocType: Maintenance Visit Purpose,Work Done,কাজ শেষ
 apps/erpnext/erpnext/controllers/item_variant.py +25,Please specify at least one attribute in the Attributes table,আরোপ করা টেবিলের মধ্যে অন্তত একটি বৈশিষ্ট্য উল্লেখ করুন
 DocType: Contact,User ID,ব্যবহারকারী আইডি
@@ -1038,10 +1000,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +57,View Ledger,দেখুন লেজার
 DocType: File,Lft,এলএফটি
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,পুরনো
-apps/erpnext/erpnext/stock/doctype/item/item.py +394,"An Item Group exists with same name, please change the item name or rename the item group","একটি আইটেম গ্রুপ একই নামের সঙ্গে বিদ্যমান, আইটেমের নাম পরিবর্তন বা আইটেম গ্রুপ নামান্তর করুন"
+apps/erpnext/erpnext/stock/doctype/item/item.py +398,"An Item Group exists with same name, please change the item name or rename the item group","একটি আইটেম গ্রুপ একই নামের সঙ্গে বিদ্যমান, আইটেমের নাম পরিবর্তন বা আইটেম গ্রুপ নামান্তর করুন"
 DocType: Communication,Delivery Status,ডেলিভারি স্থিতি
 DocType: Production Order,Manufacture against Sales Order,সেলস আদেশের বিরুদ্ধে প্রস্তুত
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +517,Rest Of The World,বিশ্বের বাকি
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +455,Rest Of The World,বিশ্বের বাকি
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,আইটেম {0} ব্যাচ থাকতে পারে না
 ,Budget Variance Report,বাজেট ভেদাংক প্রতিবেদন
 DocType: Salary Slip,Gross Pay,গ্রস পে
@@ -1052,13 +1014,11 @@
 DocType: BOM Item,Item Description,পন্নের বর্ণনা
 DocType: Payment Tool,Payment Mode,পরিশোধের মাধ্যম
 DocType: Purchase Invoice,Is Recurring,পুনরাবৃত্ত হয়
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +154,Direct metal laser sintering,ডাইরেক্ট ধাতু লেজারের sintering
 DocType: Purchase Order,Supplied Items,সরবরাহকৃত চলছে
 DocType: Production Order,Qty To Manufacture,উত্পাদনপ্রণালী Qty
 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,অস্থায়ী খোলা
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +41,Cryorolling,Cryorolling
 ,Employee Leave Balance,কর্মচারী ছুটি ভারসাম্য
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +128,Balance for Account {0} must always be {1},অ্যাকাউন্টের জন্য ব্যালেন্স {0} সবসময় হতে হবে {1}
 DocType: Address,Address Type,ঠিকানা টাইপ করুন
@@ -1074,23 +1034,23 @@
 DocType: Journal Entry,Get Outstanding Invoices,অসামান্য চালানে পান
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,বিক্রয় আদেশ {0} বৈধ নয়
 apps/erpnext/erpnext/setup/doctype/company/company.py +172,"Sorry, companies cannot be merged","দুঃখিত, কোম্পানি মার্জ করা যাবে না"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +145,Small,ছোট
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Small,ছোট
 DocType: Employee,Employee Number,চাকুরিজীবী সংখ্যা
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},মামলা নং (গুলি) ইতিমধ্যে ব্যবহারে রয়েছে. মামলা নং থেকে কর {0}
 ,Invoiced Amount (Exculsive Tax),Invoiced পরিমাণ (Exculsive ট্যাক্স)
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,আইটেম 2
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +59,Account head {0} created,অ্যাকাউন্ট মাথা {0} সৃষ্টি
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +153,Green,সবুজ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Green,সবুজ
 DocType: Item,Auto re-order,অটো পুনরায় আদেশ
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +57,Total Achieved,মোট অর্জন
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +59,Total Achieved,মোট অর্জন
 DocType: Employee,Place of Issue,ঘটনার কেন্দ্রবিন্দু
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +59,Contract,চুক্তি
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Contract,চুক্তি
 DocType: Report,Disabled,অক্ষম
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +490,UOM coversion factor required for UOM: {0} in Item: {1},UOM জন্য প্রয়োজন UOM coversion ফ্যাক্টর: {0} আইটেম: {1}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +83,Indirect Expenses,পরোক্ষ খরচ
 apps/erpnext/erpnext/controllers/selling_controller.py +163,Row {0}: Qty is mandatory,সারি {0}: Qty বাধ্যতামূলক
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +8,Agriculture,কৃষি
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +611,Your Products or Services,আপনার পণ্য বা সেবা
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,কৃষি
+apps/erpnext/erpnext/public/js/setup_wizard.js +347,Your Products or Services,আপনার পণ্য বা সেবা
 DocType: Mode of Payment,Mode of Payment,পেমেন্ট মোড
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,এটি একটি root আইটেমটি গ্রুপ এবং সম্পাদনা করা যাবে না.
 DocType: Journal Entry Account,Purchase Order,ক্রয় আদেশ
@@ -1102,7 +1062,7 @@
 DocType: Serial No,Serial No Details,সিরিয়াল কোন বিবরণ
 DocType: Purchase Invoice Item,Item Tax Rate,আইটেমটি ট্যাক্স হার
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +113,"For {0}, only credit accounts can be linked against another debit entry","{0}, শুধুমাত্র ক্রেডিট অ্যাকাউন্ট অন্য ডেবিট এন্ট্রি বিরুদ্ধে সংযুক্ত করা যাবে জন্য"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Delivery Note {0} is not submitted,হুণ্ডি {0} দাখিল করা হয় না
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +470,Delivery Note {0} is not submitted,হুণ্ডি {0} দাখিল করা হয় না
 apps/erpnext/erpnext/stock/get_item_details.py +136,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.","প্রাইসিং রুল প্রথম উপর ভিত্তি করে নির্বাচন করা হয় আইটেম, আইটেম গ্রুপ বা ব্র্যান্ড হতে পারে, যা ক্ষেত্র &#39;প্রয়োগ&#39;."
@@ -1112,7 +1072,7 @@
 DocType: Appraisal Goal,Goal,লক্ষ্য
 DocType: Sales Invoice Item,Edit Description,সম্পাদনা বিবরণ
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +318,Expected Delivery Date is lesser than Planned Start Date.,প্রত্যাশিত প্রসবের তারিখ পরিকল্পনা শুরুর তারিখ তুলনায় কম হয়.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +579,For Supplier,সরবরাহকারী
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +602,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,মোট আউটগোয়িং
@@ -1138,10 +1098,10 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +74,"Total {0} for all items is zero, may you should change 'Distribute Charges Based On'","মোট {0} সব আইটেম জন্য আপনি &#39;উপর ভিত্তি করে চার্জ বিতরণ&#39; পরিবর্তন করা উচিত পারে, শূন্য"
 DocType: Purchase Invoice,Taxes and Charges Calculation,কর ও শুল্ক ক্যালকুলেশন
 DocType: BOM Operation,Workstation,ওয়ার্কস্টেশন
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +112,Hardware,হার্ডওয়্যারের
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +112,Hardware,হার্ডওয়্যারের
 DocType: Attendance,HR Manager,মানবসম্পদ ব্যবস্থাপক
 apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,একটি কোম্পানি নির্বাচন করুন
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +50,Privilege Leave,সুবিধা বাতিল ছুটি
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +50,Privilege Leave,সুবিধা বাতিল ছুটি
 DocType: Purchase Invoice,Supplier Invoice Date,সরবরাহকারী চালান তারিখ
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +79,You need to enable Shopping Cart,আপনি শপিং কার্ট সক্রিয় করতে হবে
 apps/frappe/frappe/public/js/frappe/form/grid_body.html +6,No Data,কোন ডেটা
@@ -1154,7 +1114,7 @@
 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 +168,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/setup/page/setup_wizard/install_fixtures.py +38,Food,খাদ্য
+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 +139,You can make a time log only against a submitted production order,আপনি শুধুমাত্র একটি পেশ প্রকাশনা আদেশের বিরুদ্ধে একটি সময় লগ করা যাবে
 DocType: Maintenance Schedule Item,No of Visits,ভিজিট কোন
@@ -1174,6 +1134,7 @@
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,View Offer Letter,দেখুন অফার লেটার
 DocType: Communication,Communication,যোগাযোগ
 DocType: Item,Is Service Item,পরিষেবা আইটেম
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +81,Application period cannot be outside leave allocation period,আবেদনের সময় বাইরে ছুটি বরাদ্দ সময়ের হতে পারে না
 DocType: Activity Cost,Projects,প্রকল্প
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +31,Please select Fiscal Year,ফিস্ক্যাল বছর নির্বাচন করুন
 apps/erpnext/erpnext/controllers/buying_controller.py +23,From {0} | {1} {2},থেকে {0} | {1} {2}
@@ -1185,14 +1146,14 @@
 DocType: Pricing Rule,Campaign,প্রচারাভিযান
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +30,Approval Status must be 'Approved' or 'Rejected',অনুমোদন অবস্থা &#39;অনুমোদিত&#39; বা &#39;পরিত্যক্ত&#39; হতে হবে
 DocType: Purchase Invoice,Contact Person,ব্যক্তি যোগাযোগ
-apps/erpnext/erpnext/projects/doctype/task/task.py +35,'Expected Start Date' can not be greater than 'Expected End Date',&#39;প্রত্যাশিত স্টার্ট জন্ম&#39; এর চেয়ে বড় &#39;প্রত্যাশিত শেষ তারিখ&#39; হতে পারে না
+apps/erpnext/erpnext/projects/doctype/task/task.py +35,'Expected Start Date' can not be greater than 'Expected End Date','প্রত্যাশিত শুরুর তারিখ' কখনও 'প্রত্যাশিত শেষ তারিখ' এর চেয়ে বড় হতে পারে না
 DocType: Holiday List,Holidays,ছুটির
 DocType: Sales Order Item,Planned Quantity,পরিকল্পনা পরিমাণ
 DocType: Purchase Invoice Item,Item Tax Amount,আইটেমটি ট্যাক্স পরিমাণ
 DocType: Item,Maintain Stock,শেয়ার বজায়
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +213,Stock Entries already created for Production Order ,ইতিমধ্যে উৎপাদন অর্ডার নির্মিত শেয়ার সাজপোশাকটি
 DocType: Leave Control Panel,Leave blank if considered for all designations,সব প্রশিক্ষণে জন্য বিবেচিত হলে ফাঁকা ছেড়ে দিন
-apps/erpnext/erpnext/controllers/accounts_controller.py +499,Charge of type 'Actual' in row {0} cannot be included in Item Rate,টাইপ &#39;প্রকৃত&#39; সারিতে ভারপ্রাপ্ত {0} আইটেম রেট মধ্যে অন্তর্ভুক্ত করা যাবে না
+apps/erpnext/erpnext/controllers/accounts_controller.py +500,Charge of type 'Actual' in row {0} cannot be included in Item Rate,টাইপ &#39;প্রকৃত&#39; সারিতে ভারপ্রাপ্ত {0} আইটেম রেট মধ্যে অন্তর্ভুক্ত করা যাবে না
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,Max: {0},সর্বোচ্চ: {0}
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +16,From Datetime,Datetime থেকে
 DocType: Email Digest,For Company,কোম্পানি জন্য
@@ -1202,7 +1163,7 @@
 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 +471,cannot be greater than 100,এর চেয়ে বড় 100 হতে পারে না
-apps/erpnext/erpnext/stock/doctype/item/item.py +546,Item {0} is not a stock Item,{0} আইটেম একটি স্টক আইটেম নয়
+apps/erpnext/erpnext/stock/doctype/item/item.py +550,Item {0} is not a stock Item,{0} আইটেম একটি স্টক আইটেম নয়
 DocType: Maintenance Visit,Unscheduled,অনির্ধারিত
 DocType: Employee,Owned,মালিক
 DocType: Salary Slip Deduction,Depends on Leave Without Pay,বিনা বেতনে ছুটি উপর নির্ভর করে
@@ -1216,30 +1177,28 @@
 DocType: HR Settings,Employee Settings,কর্মচারী সেটিংস
 ,Batch-Wise Balance History,ব্যাচ প্রজ্ঞাময় বাকি ইতিহাস
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +72,To Do List,কি কি করতে হবে
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +63,Apprentice,শিক্ষানবিস
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Apprentice,শিক্ষানবিস
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +99,Negative Quantity is not allowed,নেতিবাচক পরিমাণ অনুমোদিত নয়
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
 Used for Taxes and Charges",পংক্তিরূপে উল্লিখিত হয় আইটেমটি মাস্টার থেকে সংগৃহীত এবং এই ক্ষেত্রের মধ্যে সংরক্ষিত ট্যাক্স বিস্তারিত টেবিল. কর ও চার্জের জন্য ব্যবহৃত
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +61,Lancing,Lancing
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +151,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 +435,Accounting Entry for {0}: {1} can only be made in currency: {2},{1} শুধুমাত্র মুদ্রা তৈরি করা যাবে: {0} জন্য অ্যাকাউন্টিং এণ্ট্রি {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +436,Accounting Entry for {0}: {1} can only be made in currency: {2},{1} শুধুমাত্র মুদ্রা তৈরি করা যাবে: {0} জন্য অ্যাকাউন্টিং এণ্ট্রি {2}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +38,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 +112,Tax Rule for transactions.,লেনদেনের জন্য ট্যাক্স রুল.
 DocType: Rename Tool,Type of document to rename.,নথির ধরন নামান্তর.
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +630,We buy this Item,আমরা এই আইটেম কিনতে
+apps/erpnext/erpnext/public/js/setup_wizard.js +366,We buy this Item,আমরা এই আইটেম কিনতে
 DocType: Address,Billing,বিলিং
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +77,Flanging,Flanging
 DocType: Bulk Email,Not Sent,পাঠাই নি
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +73,Explosive forming,বিরচন বিস্ফোরক
 DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),মোট কর ও শুল্ক (কোম্পানি একক)
 DocType: Shipping Rule,Shipping Account,শিপিং অ্যাকাউন্ট
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +43,Scheduled to send to {0} recipients,{0} প্রাপকদের পাঠাতে তফসিলি
 DocType: Quality Inspection,Readings,রিডিং
 DocType: Stock Entry,Total Additional Costs,মোট অতিরিক্ত খরচ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Sub Assemblies,উপ সমাহারগুলি
+apps/erpnext/erpnext/public/js/setup_wizard.js +359,Sub Assemblies,উপ সমাহারগুলি
 DocType: Shipping Rule Condition,To Value,মান
 DocType: Supplier,Stock Manager,স্টক ম্যানেজার
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +143,Source warehouse is mandatory for row {0},উত্স গুদাম সারিতে জন্য বাধ্যতামূলক {0}
@@ -1249,44 +1208,42 @@
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,আমদানি ব্যর্থ!
 apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,কোনো ঠিকানা এখনো যোগ.
 DocType: Workstation Working Hour,Workstation Working Hour,ওয়ার্কস্টেশন কাজ ঘন্টা
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +83,Analyst,বিশ্লেষক
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +202,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},সারি {0}: বরাদ্দ পরিমাণ {1} কম হতে পারে অথবা জেভি পরিমাণ সমান নয় {2}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Analyst,বিশ্লেষক
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +149,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},সারি {0}: বরাদ্দ পরিমাণ {1} কম হতে পারে অথবা জেভি পরিমাণ সমান নয় {2}
 DocType: Item,Inventory,জায়
 DocType: Features Setup,"To enable ""Point of Sale"" view",দেখুন &quot;বিক্রয় বিন্দু&quot; সচল করুন
 apps/erpnext/erpnext/public/js/pos/pos.js +402,Payment cannot be made for empty cart,পেমেন্ট খালি ট্রলি জন্য তৈরি করা যাবে না
 DocType: Item,Sales Details,বিক্রয় বিবরণ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +149,Pinning,পিন
 DocType: Opportunity,With Items,জানানোর সঙ্গে
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,Qty ইন
 DocType: Notification Control,Expense Claim Rejected,ব্যয় দাবি প্রত্যাখ্যান
 DocType: Sales Invoice,"The date on which next invoice will be generated. It is generated on submit.
 ",পরের চালান তৈরি করা হবে কোন তারিখে. এটি জমা দিতে হবে নির্মাণ করা হয়.
 DocType: Item Attribute,Item Attribute,আইটেম বৈশিষ্ট্য
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +105,Government,সরকার
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Government,সরকার
 apps/erpnext/erpnext/config/stock.py +268,Item Variants,আইটেম রুপভেদ
 DocType: Company,Services,সেবা
 apps/erpnext/erpnext/accounts/report/financial_statements.py +147,Total ({0}),মোট ({0})
 DocType: Cost Center,Parent Cost Center,মূল খরচ কেন্দ্র
 DocType: Sales Invoice,Source,উত্স
 DocType: Leave Type,Is Leave Without Pay,বিনা বেতনে ছুটি হয়
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +186,No records found in the Payment table,পেমেন্ট টেবিল অন্তর্ভুক্ত কোন রেকর্ড
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +405,Financial Year Start Date,আর্থিক বছরের শুরু তারিখ
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +133,No records found in the Payment table,পেমেন্ট টেবিল অন্তর্ভুক্ত কোন রেকর্ড
+apps/erpnext/erpnext/public/js/setup_wizard.js +153,Financial Year Start Date,আর্থিক বছরের শুরু তারিখ
 DocType: Employee External Work History,Total Experience,মোট অভিজ্ঞতা
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +100,Countersinking,Countersinking
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +271,Packing Slip(s) cancelled,বাতিল প্যাকিং স্লিপ (গুলি)
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +276,Packing Slip(s) cancelled,বাতিল প্যাকিং স্লিপ (গুলি)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,মাল ও ফরোয়ার্ডিং চার্জ
 DocType: Material Request Item,Sales Order No,বিক্রয় আদেশ কোন
 DocType: Item Group,Item Group Name,আইটেমটি গ্রুপ নাম
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +50,Taken,ধরা
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,ধরা
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +66,Transfer Materials for Manufacture,প্রস্তুত জন্য স্থানান্তর সামগ্রী
 DocType: Pricing Rule,For Price List,মূল্য তালিকা জন্য
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +27,Executive Search,নির্বাহী অনুসন্ধান
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,নির্বাহী অনুসন্ধান
 apps/erpnext/erpnext/stock/stock_ledger.py +405,"Purchase rate for item: {0} not found, which is required to book accounting entry (expense). Please mention item price against a buying price list.","আইটেম জন্য ক্রয় হার: {0} পাওয়া যায়নি, অ্যাকাউন্টিং এন্ট্রি (ব্যয়) বই প্রয়োজন বোধ করা হয় যা. একটি ক্রয় মূল্য তালিকা বিরুদ্ধে আইটেমের মূল্য উল্লেখ করুন."
 DocType: Maintenance Schedule,Schedules,সূচী
 DocType: Purchase Invoice Item,Net Amount,থোক
 DocType: Purchase Order Item Supplied,BOM Detail No,BOM বিস্তারিত কোন
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),অতিরিক্ত মূল্য ছাড়ের পরিমাণ (কোম্পানি একক)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +537,Error: {0} > {1},ত্রুটি: {0}&gt; {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +541,Error: {0} > {1},ত্রুটি: {0}&gt; {1}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,অ্যাকাউন্ট চার্ট থেকে নতুন একাউন্ট তৈরি করুন.
 DocType: Maintenance Visit,Maintenance Visit,রক্ষণাবেক্ষণ পরিদর্শন
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer > Customer Group > Territory,গ্রাহক&gt; গ্রাহক গ্রুপ&gt; টেরিটরি
@@ -1297,7 +1254,6 @@
 DocType: Event,Tuesday,মঙ্গলবার
 DocType: Leave Block List,Block Holidays on important days.,গুরুত্বপূর্ণ দিন অবরোধ ছুটির দিন.
 ,Accounts Receivable Summary,গ্রহনযোগ্য অ্যাকাউন্ট সারাংশ
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +43,Leaves for type {0} already allocated for Employee {1} for period {2} - {3},ইতিমধ্যে সময়ের জন্য কর্মচারী {1} জন্য বরাদ্দ টাইপ {0} পাতার জন্য {2} - {3}
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +187,Please set User ID field in an Employee record to set Employee Role,কর্মচারী ভূমিকা সেট একজন কর্মী রেকর্ডে ইউজার আইডি ক্ষেত্রের সেট করুন
 DocType: UOM,UOM Name,UOM নাম
 DocType: Top Bar Item,Target,লক্ষ্য
@@ -1309,15 +1265,14 @@
 DocType: ToDo,Due Date,নির্দিষ্ট তারিখ
 DocType: Sales Invoice Item,Brand Name,পরিচিতিমুলক নাম
 DocType: Purchase Receipt,Transporter Details,স্থানান্তরকারী বিস্তারিত
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Box,বক্স
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +389,The Organization,প্রতিষ্ঠান
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Box,বক্স
+apps/erpnext/erpnext/public/js/setup_wizard.js +137,The Organization,প্রতিষ্ঠান
 DocType: Monthly Distribution,Monthly Distribution,মাসিক বন্টন
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,রিসিভার তালিকা শূণ্য. রিসিভার তালিকা তৈরি করুন
 DocType: Production Plan Sales Order,Production Plan Sales Order,উৎপাদন পরিকল্পনা বিক্রয় আদেশ
 DocType: Sales Partner,Sales Partner Target,বিক্রয় অংশীদার উদ্দিষ্ট
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},{0} জন্য অ্যাকাউন্টিং কেবল প্রবেশ মুদ্রা তৈরি করা যাবে: {1}
 DocType: Pricing Rule,Pricing Rule,প্রাইসিং রুল
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +58,Notching,খাঁজ
 apps/erpnext/erpnext/config/learn.py +167,Material Request to Purchase Order,আদেশ ক্রয় উপাদানের জন্য অনুরোধ
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +74,Row # {0}: Returned Item {1} does not exists in {2} {3},সারি # {0}: Returned আইটেম {1} না মধ্যে উপস্থিত থাকে না {2} {3}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,ব্যাংক হিসাব
@@ -1325,7 +1280,7 @@
 DocType: Address,Lead Name,লিড নাম
 ,POS,পিওএস
 apps/erpnext/erpnext/config/stock.py +273,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/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},আরো tranfer করা অনুমোদিত নয় {0} চেয়ে {1} ক্রয় আদেশের বিরুদ্ধে {2}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +62,Leaves Allocated Successfully for {0},সাফল্যের বরাদ্দ পাতার {0}
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,কোনও আইটেম প্যাক
@@ -1334,20 +1289,19 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Amounts not reflected in bank,ব্যাংক প্রতিফলিত না পরিমাণে
 DocType: Quality Inspection Reading,Reading 4,4 পঠন
 apps/erpnext/erpnext/config/hr.py +23,Claims for company expense.,কোম্পানি ব্যয় জন্য দাবি করে.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +8,Centrifugal casting,কেন্দ্রাতিগ ঢালাই
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +119,Magnetic field-assisted finishing,চৌম্বক ক্ষেত্রের সহায়তায় সমাপ্তি
 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,যোগাযোগ মোবাইল নম্বর
 DocType: Production Planning Tool,Select Sales Orders,বিক্রয় আদেশ নির্বাচন
 ,Material Requests for which Supplier Quotations are not created,"সরবরাহকারী এবার তৈরি করা যাবে না, যার জন্য উপাদান অনুরোধ"
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +117,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,"আপনি ছুটি জন্য আবেদন করেন, যা প্রথম দিন (গুলি) ছুটির হয়. আপনি চলে জন্য আবেদন করার প্রয়োজন নেই."
 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/buying/doctype/purchase_order/purchase_order.js +477,Mark as Delivered,মার্ক হিসাবে বিতরণ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +497,Mark as Delivered,মার্ক হিসাবে বিতরণ
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +34,Make Quotation,উদ্ধৃতি করা
 DocType: Dependent Task,Dependent Task,নির্ভরশীল কার্য
-apps/erpnext/erpnext/stock/doctype/item/item.py +306,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 +141,Leave of type {0} cannot be longer than {1},ধরনের ছুটি {0} চেয়ে বেশি হতে পারেনা {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +310,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 +155,Leave of type {0} cannot be longer than {1},ধরনের ছুটি {0} চেয়ে বেশি হতে পারেনা {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,অগ্রিম এক্স দিনের জন্য অপারেশন পরিকল্পনা চেষ্টা করুন.
 DocType: HR Settings,Stop Birthday Reminders,বন্ধ করুন জন্মদিনের রিমাইন্ডার
 DocType: SMS Center,Receiver List,রিসিভার তালিকা
@@ -1355,15 +1309,14 @@
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,ক্ষয়প্রাপ্ত পরিমাণ
 apps/erpnext/erpnext/public/js/pos/pos.js +491,{0} View,{0} দেখুন
 DocType: Salary Structure Deduction,Salary Structure Deduction,বেতন কাঠামো সিদ্ধান্তগ্রহণ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +158,Selective laser sintering,সিলেক্টিভ লেজার sintering
-apps/erpnext/erpnext/stock/doctype/item/item.py +301,Unit of Measure {0} has been entered more than once in Conversion Factor Table,মেজার {0} এর ইউনিট রূপান্তর ফ্যাক্টর ছক একাধিকবার প্রবেশ করানো হয়েছে
+apps/erpnext/erpnext/stock/doctype/item/item.py +305,Unit of Measure {0} has been entered more than once in Conversion Factor Table,মেজার {0} এর ইউনিট রূপান্তর ফ্যাক্টর ছক একাধিকবার প্রবেশ করানো হয়েছে
 apps/frappe/frappe/core/page/data_import_tool/data_import_tool.js +108,Import Successful!,আমদানি সফল!
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,প্রথম প্রকাশ আইটেম খরচ
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +185,Quantity must not be more than {0},পরিমাণ বেশী হবে না {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +41,Age (Days),বয়স (দিন)
 DocType: Quotation Item,Quotation Item,উদ্ধৃতি আইটেম
 DocType: Account,Account Name,অ্যাকাউন্ট নাম
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +41,From Date cannot be greater than To Date,জন্ম তারিখ এর চেয়ে বড় হতে পারে না
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +34,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.,সরবরাহকারী প্রকার মাস্টার.
 DocType: Purchase Order Item,Supplier Part Number,সরবরাহকারী পার্ট সংখ্যা
@@ -1372,14 +1325,14 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +247,{0} {1} is cancelled or stopped,{0} {1} বাতিল বা বন্ধ করা হয়
 DocType: Accounts Settings,Credit Controller,ক্রেডিট কন্ট্রোলার
 DocType: Delivery Note,Vehicle Dispatch Date,যানবাহন ডিসপ্যাচ তারিখ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +197,Purchase Receipt {0} is not submitted,কেনার রসিদ {0} দাখিল করা হয় না
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +198,Purchase Receipt {0} is not submitted,কেনার রসিদ {0} দাখিল করা হয় না
 DocType: Company,Default Payable Account,ডিফল্ট প্রদেয় অ্যাকাউন্ট
 apps/erpnext/erpnext/config/website.py +13,"Settings for online shopping cart such as shipping rules, price list etc.","যেমন গ্রেপ্তার নিয়ম, মূল্যতালিকা ইত্যাদি হিসাবে অনলাইন শপিং কার্ট এর সেটিংস"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +660,Setup Complete,সম্পূর্ণ সেটআপ
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +124,Setup Complete,সম্পূর্ণ সেটআপ
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +65,{0}% Billed,{0}% দেখানো হয়েছিল
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +17,Reserved Qty,সংরক্ষিত Qty
 DocType: Party Account,Party Account,পক্ষের অ্যাকাউন্টে
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +74,Human Resources,মানব সম্পদ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +74,Human Resources,মানব সম্পদ
 DocType: Lead,Upper Income,আপার আয়
 DocType: Journal Entry Account,Debit in Company Currency,কোম্পানি মুদ্রা ডেবিট
 apps/erpnext/erpnext/support/doctype/issue/issue.py +58,My Issues,আমার সমস্যা
@@ -1388,11 +1341,9 @@
 DocType: Company,Default Values,ডিফল্ট মান
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +236,Row {0}: Payment amount can not be negative,সারি {0}: পেমেন্ট পরিমাণ নেতিবাচক হতে পারে না
 DocType: Expense Claim,Total Amount Reimbursed,মোট পরিমাণ শিশুবের
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +152,Press fitting,প্রেস ফিটিং
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +64,Against Supplier Invoice {0} dated {1},সরবরাহকারী বিরুদ্ধে চালান {0} তারিখের {1}
 DocType: Customer,Default Price List,ডিফল্ট মূল্য তালিকা
 DocType: Payment Reconciliation,Payments,পেমেন্টস্
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +24,Hot isostatic pressing,টিপে গরম isostatic
 DocType: ToDo,Medium,মাঝারি
 DocType: Budget Detail,Budget Allocated,বাজেট বরাদ্দ
 DocType: Journal Entry,Entry Type,এন্ট্রি টাইপ
@@ -1405,9 +1356,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +56,None of the items have any change in quantity or value.,আইটেম কোনটিই পরিমাণ বা মান কোনো পরিবর্তন আছে.
 DocType: Warranty Claim,Warranty Claim,পাটা দাবি
 ,Lead Details,সীসা বিবরণ
-DocType: Authorization Rule,Approving User,অনুমোদন নিচে
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +37,Forging,Forging
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +126,Plating,কলাই
 DocType: Purchase Invoice,End date of current invoice's period,বর্তমান চালান এর সময়ের শেষ তারিখ
 DocType: Pricing Rule,Applicable For,জন্য প্রযোজ্য
 DocType: Bank Reconciliation,From Date,তারিখ থেকে
@@ -1429,31 +1377,29 @@
 DocType: Sales Invoice,Paid Amount (Company Currency),প্রদত্ত পরিমাণ (কোম্পানি একক)
 DocType: Purchase Invoice,Additional Discount,অতিরিক্ত ছাড়
 DocType: Selling Settings,Selling Settings,সেটিংস বিক্রি
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +39,Online Auctions,অনলাইন নিলাম
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,অনলাইন নিলাম
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +94,Please specify either Quantity or Valuation Rate or both,পরিমাণ বা মূল্যনির্ধারণ হার বা উভয়ই উল্লেখ করুন
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +50,"Company, Month and Fiscal Year is mandatory","কোম্পানি, মাস এবং ফিস্ক্যাল বছর বাধ্যতামূলক"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Marketing Expenses,বিপণন খরচ
 ,Item Shortage Report,আইটেম পত্র
-apps/erpnext/erpnext/stock/doctype/item/item.js +183,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","ওজন \ n দয়া খুব &quot;ওজন UOM&quot; উল্লেখ, উল্লেখ করা হয়"
+apps/erpnext/erpnext/stock/doctype/item/item.js +185,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","ওজন \ n দয়া খুব &quot;ওজন UOM&quot; উল্লেখ, উল্লেখ করা হয়"
 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 +212,Time Log Batch {0} must be 'Submitted',টাইম ইন ব্যাচ {0} &#39;লগইন&#39; হতে হবে
 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 +384,Warehouse required at Row No {0},সারি কোন সময়ে প্রয়োজনীয় গুদাম {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +386,Warehouse required at Row No {0},সারি কোন সময়ে প্রয়োজনীয় গুদাম {0}
 DocType: Employee,Date Of Retirement,অবসর তারিখ
 DocType: Upload Attendance,Get Template,টেমপ্লেট করুন
 DocType: Address,Postal,ঠিকানা
 DocType: Item,Weightage,গুরুত্ব
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +159,Mining,খনন
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +17,Resin casting,রজন
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,একটি গ্রাহক গ্রুপ একই নামের সঙ্গে বিদ্যমান গ্রাহকের নাম পরিবর্তন বা ক্রেতা গ্রুপ নামান্তর করুন
 apps/erpnext/erpnext/public/js/pos/pos.js +147,Please select {0} first.,{0} প্রথম নির্বাচন করুন.
 apps/erpnext/erpnext/templates/pages/order.html +57,text {0},টেক্সট {0}
 DocType: Territory,Parent Territory,মূল টেরিটরি
 DocType: Quality Inspection Reading,Reading 2,2 পড়া
 DocType: Stock Entry,Material Receipt,উপাদান রশিদ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +622,Products,পণ্য
+apps/erpnext/erpnext/public/js/setup_wizard.js +358,Products,পণ্য
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +47,Party Type and Party is required for Receivable / Payable account {0},পার্টি প্রকার ও অনুষ্ঠান গ্রহনযোগ্য / প্রদেয় অ্যাকাউন্টের জন্য প্রয়োজন বোধ করা হয় {0}
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.","এই আইটেমটি ভিন্নতা আছে, তাহলে এটি বিক্রয় আদেশ ইত্যাদি নির্বাচন করা যাবে না"
 DocType: Lead,Next Contact By,পরবর্তী যোগাযোগ
@@ -1463,13 +1409,13 @@
 DocType: Purchase Invoice,Notification Email Address,বিজ্ঞপ্তি ইমেল ঠিকানা
 DocType: Payment Tool,Find Invoices to Match,ম্যাচ চালান খুঁজুন
 ,Item-wise Sales Register,আইটেম-জ্ঞানী সেলস নিবন্ধন
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +399,"e.g. ""XYZ National Bank""",যেমন &quot;xyz ন্যাশনাল ব্যাংক&quot;
+apps/erpnext/erpnext/public/js/setup_wizard.js +147,"e.g. ""XYZ National Bank""",যেমন &quot;xyz ন্যাশনাল ব্যাংক&quot;
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,মৌলিক হার মধ্যে অন্তর্ভুক্ত এই খাজনা?
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +57,Total Target,মোট লক্ষ্যমাত্রা
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Target,মোট লক্ষ্যমাত্রা
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.js +22,Shopping Cart is enabled,শপিং কার্ট সক্রিয় করা হয়
 DocType: Job Applicant,Applicant for a Job,একটি কাজের জন্য আবেদনকারী
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +173,No Production Orders created,নির্মিত কোন উৎপাদন আদেশ
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +131,Salary Slip of employee {0} already created for this month,তাঁরা বেতন স্লিপ {0} ইতিমধ্যে এই মাসের জন্য নির্মিত
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +140,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.,অনেক কলাম. প্রতিবেদন এবং রফতানি একটি স্প্রেডশীট অ্যাপ্লিকেশন ব্যবহার করে তা প্রিন্ট করা হবে.
 DocType: Sales Invoice Item,Batch No,ব্যাচ নাম্বার
@@ -1479,14 +1425,14 @@
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +13,Variant,বৈকল্পিক
 apps/frappe/frappe/public/js/frappe/form/toolbar.js +165,New {0},নতুন {0}
 DocType: Naming Series,Set prefix for numbering series on your transactions,আপনার লেনদেনের উপর সিরিজ সংখ্যায়ন জন্য সেট উপসর্গ
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +169,Stopped order cannot be cancelled. Unstop to cancel.,থামানো অর্ডার বাতিল করা যাবে না. বাতিল করতে দুর.
-apps/erpnext/erpnext/stock/doctype/item/item.py +323,Default BOM ({0}) must be active for this item or its template,ডিফল্ট BOM ({0}) এই আইটেমটি বা তার টেমপ্লেট জন্য সক্রিয় হতে হবে
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +164,Stopped order cannot be cancelled. Unstop to cancel.,থামানো অর্ডার বাতিল করা যাবে না. বাতিল করতে দুর.
+apps/erpnext/erpnext/stock/doctype/item/item.py +327,Default BOM ({0}) must be active for this item or its template,ডিফল্ট BOM ({0}) এই আইটেমটি বা তার টেমপ্লেট জন্য সক্রিয় হতে হবে
 DocType: Employee,Leave Encashed?,Encashed ত্যাগ করবেন?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,ক্ষেত্রের থেকে সুযোগ বাধ্যতামূলক
 DocType: Item,Variants,রুপভেদ
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +458,Make Purchase Order,ক্রয় আদেশ করা
 DocType: SMS Center,Send To,পাঠানো
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +111,There is not enough leave balance for Leave Type {0},ছুটি টাইপ জন্য যথেষ্ট ছুটি ভারসাম্য নেই {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +127,There is not enough leave balance for Leave Type {0},ছুটি টাইপ জন্য যথেষ্ট ছুটি ভারসাম্য নেই {0}
 DocType: Sales Team,Contribution to Net Total,একুন অবদান
 DocType: Sales Invoice Item,Customer's Item Code,গ্রাহকের আইটেম কোড
 DocType: Stock Reconciliation,Stock Reconciliation,শেয়ার রিকনসিলিয়েশন
@@ -1523,11 +1469,11 @@
 DocType: Sales Order Item,Actual Qty,প্রকৃত স্টক
 DocType: Sales Invoice Item,References,তথ্যসূত্র
 DocType: Quality Inspection Reading,Reading 10,10 পঠন
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +612,"List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start.","আপনি কিনতে বা বিক্রি করে যে আপনার পণ্য বা সেবা তালিকা. যখন আপনি শুরু মেজার এবং অন্যান্য বৈশিষ্ট্য আইটেমটি গ্রুপ, ইউনিট চেক করতে ভুলবেন না."
+apps/erpnext/erpnext/public/js/setup_wizard.js +348,"List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start.","আপনি কিনতে বা বিক্রি করে যে আপনার পণ্য বা সেবা তালিকা. যখন আপনি শুরু মেজার এবং অন্যান্য বৈশিষ্ট্য আইটেমটি গ্রুপ, ইউনিট চেক করতে ভুলবেন না."
 DocType: Hub Settings,Hub Node,হাব নোড
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,আপনি ডুপ্লিকেট জিনিস প্রবেশ করে. ত্রুটিমুক্ত এবং আবার চেষ্টা করুন.
 apps/erpnext/erpnext/controllers/item_variant.py +65,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values,মূল্য {0} অ্যাট্রিবিউট জন্য {1} বৈধ আইটেম এর তালিকার মধ্যে উপস্থিত না মান বৈশিষ্ট্য
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +87,Associate,সহযোগী
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Associate,সহযোগী
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +46,Item {0} is not a serialized Item,{0} আইটেম ধারাবাহিকভাবে আইটেম নয়
 DocType: SMS Center,Create Receiver List,রিসিভার তালিকা তৈরি করুন
 apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +5,Expired,মেয়াদউত্তীর্ণ
@@ -1536,7 +1482,7 @@
 DocType: Warranty Claim,Issue Date,প্রদানের তারিখ
 DocType: Activity Cost,Activity Cost,কার্যকলাপ খরচ
 DocType: Purchase Receipt Item Supplied,Consumed Qty,ক্ষয়প্রাপ্ত Qty
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +52,Telecommunications,টেলিযোগাযোগ
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +52,Telecommunications,টেলিযোগাযোগ
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),বাক্স এই বন্টন (শুধু খসড়া) একটি অংশ কিনা তা চিহ্নিত
 DocType: Payment Tool,Make Payment Entry,পেমেন্ট এন্ট্রি করতে
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +119,Quantity for Item {0} must be less than {1},আইটেমের জন্য পরিমাণ {0} চেয়ে কম হতে হবে {1}
@@ -1553,10 +1499,8 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +37,"Selling must be checked, if Applicable For is selected as {0}","প্রযোজ্য হিসাবে নির্বাচিত করা হয়, তাহলে বিক্রি, চেক করা আবশ্যক {0}"
 DocType: Purchase Order Item,Supplier Quotation Item,সরবরাহকারী উদ্ধৃতি আইটেম
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +27,Make Salary Structure,বেতন কাঠামো করুন
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +54,Shearing,গা থেকে লোম ছাঁটা
 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.,একটি নতুন বিক্রয় চালান তৈরি করতে &#39;বিক্রয় চালান করুন&#39; বাটনে ক্লিক করুন.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +166,Packaging and labeling,প্যাকেজিং এবং লেবেল
 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,কোম্পানি মাস্টার এবং গ্লোবাল ডিফল্ট মান ডিফল্ট মুদ্রা উল্লেখ করুন
@@ -1567,21 +1511,20 @@
 DocType: Budget Detail,Fiscal Year,অর্থবছর
 DocType: Cost Center,Budget,বাজেট
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +41,"Budget cannot be assigned against {0}, as it's not an Income or Expense account",এটি একটি আয় বা ব্যয় অ্যাকাউন্ট না হিসাবে বাজেট বিরুদ্ধে {0} নিয়োগ করা যাবে না
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Achieved,অর্জন
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,অর্জন
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +65,Territory / Customer,টেরিটরি / গ্রাহক
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,e.g. 5,যেমন 5
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +207,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},সারি {0}: বরাদ্দ পরিমাণ {1} কম হতে পারে অথবা বকেয়া পরিমাণ চালান সমান নয় {2}
+apps/erpnext/erpnext/public/js/setup_wizard.js +294,e.g. 5,যেমন 5
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},সারি {0}: বরাদ্দ পরিমাণ {1} কম হতে পারে অথবা বকেয়া পরিমাণ চালান সমান নয় {2}
 DocType: Sales Invoice,In Words will be visible once you save the Sales Invoice.,আপনি বিক্রয় চালান সংরক্ষণ একবার শব্দ দৃশ্যমান হবে.
 DocType: Item,Is Sales Item,সেলস আইটেম
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,আইটেমটি গ্রুপ বৃক্ষ
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,{0} আইটেম সিরিয়াল আমরা জন্য সেটআপ নয়. আইটেম মাস্টার চেক
 DocType: Maintenance Visit,Maintenance Time,রক্ষণাবেক্ষণ সময়
 ,Amount to Deliver,পরিমাণ প্রদান করতে
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +620,A Product or Service,একটি পণ্য বা পরিষেবা
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +158,There were errors.,ত্রুটি রয়েছে.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +101,Tapping,লঘুপাত
+apps/erpnext/erpnext/public/js/setup_wizard.js +356,A Product or Service,একটি পণ্য বা পরিষেবা
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +146,There were errors.,ত্রুটি রয়েছে.
 DocType: Naming Series,Current Value,বর্তমান মূল্য
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +171,{0} created,{0} সৃষ্টি
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +171,{0} created,{0} তৈরি হয়েছে 
 DocType: Delivery Note Item,Against Sales Order,সেলস আদেশের বিরুদ্ধে
 ,Serial No Status,সিরিয়াল কোন স্ট্যাটাস
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +382,Item table can not be blank,আইটেম টেবিল ফাঁকা থাকতে পারে না
@@ -1593,7 +1536,7 @@
 apps/erpnext/erpnext/accounts/party.py +275,Due Date cannot be before Posting Date,দরুন জন্ম তারিখ পোস্ট করার আগে হতে পারে না
 DocType: Website Item Group,Website Item Group,ওয়েবসাইট আইটেমটি গ্রুপ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Duties and Taxes,কর্তব্য এবং কর
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Please enter Reference date,রেফারেন্স তারিখ লিখুন দয়া করে
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +312,Please enter Reference date,রেফারেন্স তারিখ লিখুন দয়া করে
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} পেমেন্ট থেকে দ্বারা ফিল্টার করা যাবে না {1}
 DocType: Item Website Specification,Table for Item that will be shown in Web Site,ওয়েব সাইট এ দেখানো হবে যে আইটেমটি জন্য ছক
 DocType: Purchase Order Item Supplied,Supplied Qty,সরবরাহকৃত Qty
@@ -1601,7 +1544,7 @@
 apps/erpnext/erpnext/config/stock.py +103,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,আইটেম-বিজ্ঞ ক্রয় ইতিহাস
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +152,Red,লাল
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Red,লাল
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +228,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},সিরিয়াল কোন আইটেম জন্য যোগ সংগ্রহ করার &#39;নির্মাণ সূচি&#39; তে ক্লিক করুন {0}
 DocType: Account,Frozen,হিমায়িত
 ,Open Production Orders,ওপেন উত্পাদনের আদেশ
@@ -1616,7 +1559,7 @@
 DocType: Item Attribute,Attribute Name,নাম গুন
 apps/erpnext/erpnext/controllers/selling_controller.py +236,Item {0} must be Sales or Service Item in {1},আইটেম {0} এ সেলস বা পরিষেবা আইটেম হতে হবে {1}
 DocType: Item Group,Show In Website,ওয়েবসাইট দেখান
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +621,Group,গ্রুপ
+apps/erpnext/erpnext/public/js/setup_wizard.js +357,Group,গ্রুপ
 DocType: Task,Expected Time (in hours),(ঘণ্টায়) প্রত্যাশিত সময়
 ,Qty to Order,অর্ডার Qty
 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","নিম্নলিখিত কাগজপত্র হুণ্ডি, সুযোগ, উপাদান অনুরোধ, আইটেম, ক্রয় আদেশ, ক্রয় ভাউচার, ক্রেতা রশিদ, উদ্ধৃতি, বিক্রয় চালান, পণ্য সমষ্টি, বিক্রয় আদেশ, সিরিয়াল কোন ব্র্যান্ড নাম ট্র্যাক"
@@ -1626,6 +1569,7 @@
 DocType: Features Setup,Brands,ব্র্যান্ড
 DocType: C-Form Invoice Detail,Invoice No,চালান নং
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +480,From Purchase Order,ক্রয় অর্ডার থেকে
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +92,"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,পদত্যাগ পত্র তারিখ
@@ -1633,35 +1577,31 @@
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +137,Not Set,সেট না
 DocType: Communication,Date,তারিখ
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,পুনরাবৃত্ত গ্রাহক রাজস্ব
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +651,Sit tight while your system is being setup. This may take a few moments.,"আপনার সিস্টেম সেটআপ করা হচ্ছে, যখন শক্ত হয়ে বসুন. এটি কয়েক মিনিট সময় নিতে পারে."
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +115,Sit tight while your system is being setup. This may take a few moments.,"আপনার সিস্টেম সেটআপ করা হচ্ছে, যখন শক্ত হয়ে বসুন. এটি কয়েক মিনিট সময় নিতে পারে."
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +51,{0} ({1}) must have role 'Expense Approver',{0} ({1}) ভূমিকা &#39;ব্যয় রাজসাক্ষী&#39; থাকতে হবে
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Pair,জুড়ি
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Pair,জুড়ি
 DocType: Bank Reconciliation Detail,Against Account,অ্যাকাউন্টের বিরুদ্ধে
 DocType: Maintenance Schedule Detail,Actual Date,সঠিক তারিখ
 DocType: Item,Has Batch No,ব্যাচ কোন আছে
 DocType: Delivery Note,Excise Page Number,আবগারি পৃষ্ঠা সংখ্যা
 DocType: Employee,Personal Details,ব্যক্তিগত বিবরণ
 ,Maintenance Schedules,রক্ষণাবেক্ষণ সময়সূচী
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +44,Embossing,এমবসিং
 ,Quotation Trends,উদ্ধৃতি প্রবণতা
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +139,Item Group not mentioned in item master for item {0},আইটেমটি গ্রুপ আইটেমের জন্য আইটেম মাস্টার উল্লেখ না {0}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +302,Debit To account must be a Receivable account,অ্যাকাউন্ট ডেবিট একটি গ্রহনযোগ্য অ্যাকাউন্ট থাকতে হবে
-apps/erpnext/erpnext/stock/doctype/item/item.py +310,"As Production Order can be made for this item, it must be a stock item.","উৎপাদন অর্ডার এই আইটেমটি জন্য করা যেতে পারে, এটি একটি স্টক আইটেমটি হতে হবে."
 DocType: Shipping Rule Condition,Shipping Amount,শিপিং পরিমাণ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +140,Joining,যোগদান
-DocType: Authorization Rule,Above Value,মান উপরে
 ,Pending Amount,অপেক্ষারত পরিমাণ
 DocType: Purchase Invoice Item,Conversion Factor,রূপান্তর ফ্যাক্টর
 DocType: Purchase Order,Delivered,নিষ্কৃত
 apps/erpnext/erpnext/config/hr.py +160,Setup incoming server for jobs email id. (e.g. jobs@example.com),কাজ ইমেল আইডি জন্য সেটআপ ইনকামিং সার্ভার. (যেমন jobs@example.com)
 DocType: Purchase Receipt,Vehicle Number,গাড়ির সংখ্যা
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,আবর্তক চালান বন্ধ করা হবে কোন তারিখে
+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,গ্রহনযোগ্য অ্যাকাউন্ট
 ,Supplier-Wise Sales Analytics,সরবরাহকারী প্রজ্ঞাময় বিক্রয় বিশ্লেষণ
 DocType: Address Template,This format is used if country specific format is not found,দেশ নির্দিষ্ট ফরম্যাটে পাওয়া না গেলে এই বিন্যাস ব্যবহার করা হয়েছে
 DocType: Custom Field,Custom,প্রথা
 DocType: Production Order,Use Multi-Level BOM,মাল্টি লেভেল BOM ব্যবহার
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +26,Injection molding,ইনজেকশন ছাঁচনির্মাণ
 DocType: Bank Reconciliation,Include Reconciled Entries,মীমাংসা দাখিলা অন্তর্ভুক্ত
 apps/erpnext/erpnext/config/accounts.py +41,Tree of finanial accounts.,Finanial অ্যাকাউন্টের বৃক্ষ.
 DocType: Leave Control Panel,Leave blank if considered for all employee types,সব কর্মচারী ধরনের জন্য বিবেচিত হলে ফাঁকা ছেড়ে দিন
@@ -1671,37 +1611,35 @@
 apps/frappe/frappe/config/setup.py +130,Printing,মুদ্রণ
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +114,Expense Claim is pending approval. Only the Expense Approver can update status.,ব্যয় দাবি অনুমোদনের জন্য স্থগিত করা হয়. শুধু ব্যয় রাজসাক্ষী স্ট্যাটাস আপডেট করতে পারবেন.
 DocType: Purchase Invoice,Additional Discount Amount,অতিরিক্ত মূল্য ছাড়ের পরিমাণ
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +99,The day(s) on which you are applying for leave are holiday. You need not apply for leave.,"আপনি ছুটি জন্য আবেদন করেন, যা প্রথম দিন (গুলি) হলিডে হয়. আপনি চলে জন্য আবেদন করার প্রয়োজন নেই."
 apps/frappe/frappe/public/js/frappe/misc/utils.js +110,and,এবং
 DocType: Leave Block List Allow,Leave Block List Allow,ব্লক মঞ্জুর তালিকা ত্যাগ
 apps/erpnext/erpnext/setup/doctype/company/company.py +236,Abbr can not be blank or space,সংক্ষিপ্তকরণ ফাঁকা বা স্থান হতে পারে না
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +50,Sports,স্পোর্টস
+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/setup/page/setup_wizard/setup_wizard.js +626,Unit,একক
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Unit,একক
 apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.py +182,Please set Dropbox access keys in your site config,আপনার সাইটে কনফিগ ড্রপবক্স এক্সেস কী সেট করুন
 apps/erpnext/erpnext/stock/get_item_details.py +113,Please specify Company,কোম্পানি উল্লেখ করুন
 ,Customer Acquisition and Loyalty,গ্রাহক অধিগ্রহণ ও বিশ্বস্ততা
 DocType: Purchase Receipt,Warehouse where you are maintaining stock of rejected items,অগ্রাহ্য আইটেম শেয়ার রয়েছে সেখানে ওয়্যারহাউস
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +408,Your financial year ends on,তোমার আর্থিক বছরের শেষ
+apps/erpnext/erpnext/public/js/setup_wizard.js +156,Your financial year ends on,তোমার আর্থিক বছরের শেষ
 DocType: POS Profile,Price List,মূল্য তালিকা
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +20,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0} ডিফল্ট অর্থবছরের এখন হয়. পরিবর্তন কার্যকর করার জন্য আপনার ব্রাউজার রিফ্রেশ করুন.
 apps/erpnext/erpnext/projects/doctype/project/project.js +47,Expense Claims,ব্যয় দাবি
 DocType: Issue,Support,সমর্থন
-DocType: Authorization Rule,Approving Role,ভূমিকা অনুমোদন
 ,BOM Search,খোঁজো
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +176,Closing (Opening + Totals),বন্ধ (+ + সমগ্র খোলা)
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +26,Please specify currency in Company,কোম্পানি মুদ্রা উল্লেখ করুন
 DocType: Workstation,Wages per hour,প্রতি ঘন্টায় মজুরী
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,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.","ইত্যাদি সিরিয়াল টি, পিওএস মত প্রদর্শন করুন / আড়াল বৈশিষ্ট্য"
-apps/erpnext/erpnext/controllers/accounts_controller.py +236,Account {0} is invalid. Account Currency must be {1},অ্যাকাউন্ট {0} অবৈধ. অ্যাকাউন্টের মুদ্রা হতে হবে {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +237,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},UOM রূপান্তর ফ্যাক্টর সারিতে প্রয়োজন বোধ করা হয় {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +53,Clearance date cannot be before check date in row {0},পরিস্কারের তারিখ সারিতে চেক তারিখের আগে হতে পারে না {0}
 DocType: Salary Slip,Deduction,সিদ্ধান্তগ্রহণ
 DocType: Address Template,Address Template,ঠিকানা টেমপ্লেট
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +128,Please enter Employee Id of this sales person,এই বিক্রয় ব্যক্তির কর্মী ID লিখুন দয়া করে
 DocType: Territory,Classification of Customers by region,অঞ্চল গ্রাহকের সাইট
-DocType: Project,% Tasks Completed,% কাজগুলো সম্পন্ন
+DocType: Project,% Tasks Completed,% কাজগুলো সম্পন্ন  হয়েছে
 DocType: Project,Gross Margin,গ্রস মার্জিন
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +140,Please enter Production Item first,প্রথম উত্পাদন আইটেম লিখুন দয়া করে
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +72,disabled user,প্রতিবন্ধী ব্যবহারকারী
@@ -1713,13 +1651,13 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +82,Item {0} has already been returned,আইটেম {0} ইতিমধ্যে ফেরত দেয়া হয়েছে
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** অর্থবছরের ** একটি অর্থবছরে প্রতিনিধিত্ব করে. সব হিসাব ভুক্তি এবং অন্যান্য প্রধান লেনদেন ** ** অর্থবছরের বিরুদ্ধে ট্র্যাক করা হয়.
 DocType: Opportunity,Customer / Lead Address,গ্রাহক / লিড ঠিকানা
+apps/erpnext/erpnext/stock/doctype/item/item.py +112,Warning: Invalid SSL certificate on attachment {0},সতর্কবাণী: সংযুক্তি অবৈধ SSL সার্টিফিকেট {0}
 DocType: Production Order Operation,Actual Operation Time,প্রকৃত অপারেশন টাইম
 DocType: Authorization Rule,Applicable To (User),প্রযোজ্য (ব্যবহারকারী)
 DocType: Purchase Taxes and Charges,Deduct,বিয়োগ করা
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +170,Job Description,কাজের বর্ণনা
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +170,Job Description,কাজের বর্ণনা
 DocType: Purchase Order Item,Qty as per Stock UOM,স্টক Qty UOM অনুযায়ী
 apps/frappe/frappe/model/rename_doc.py +343,Please select a valid csv file with data,তথ্য দিয়ে একটি বৈধ CSV ফাইল নির্বাচন করুন
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +92,Coating,লেপ
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +126,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","ব্যাপারটি তেমন বিশেষ অক্ষর &quot;-&quot; &quot;.&quot;, &quot;#&quot;, এবং &quot;/&quot; সিরিজ নামকরণ অনুমোদিত নয়"
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","সেলস প্রচারাভিযান সম্পর্কে অবগত থাকুন. বাড়ে, উদ্ধৃতি সম্পর্কে অবগত থাকুন, বিক্রয় আদেশ ইত্যাদি প্রচারণা থেকে বিনিয়োগ ফিরে মূল্যাবধারণ করা."
 DocType: Expense Claim,Approver,রাজসাক্ষী
@@ -1729,12 +1667,11 @@
 DocType: Supplier Quotation,Manufacturing Manager,উৎপাদন ম্যানেজার
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +191,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/hooks.py +84,Shipments,চালানে
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +29,Dip molding,চোবান ছাঁচনির্মাণ
+apps/erpnext/erpnext/hooks.py +68,Shipments,চালানে
 DocType: Purchase Order,To be delivered to customer,গ্রাহকের মধ্যে বিতরণ করা হবে
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,টাইম ইন স্থিতি জমা িদেত হেব.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,সিরিয়াল কোন {0} কোনো গুদাম অন্তর্গত নয়
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +650,Setting Up,ঠিককরা
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +114,Setting Up,ঠিককরা
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,Row # ,সারি #
 DocType: Purchase Invoice,In Words (Company Currency),ভাষায় (কোম্পানি একক)
 DocType: Pricing Rule,Supplier,সরবরাহকারী
@@ -1742,7 +1679,7 @@
 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 +166,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,ব্যয় বা পার্থক্য অ্যাকাউন্ট আইটেম {0} হিসাবে এটি প্রভাব সার্বিক শেয়ার মূল্য জন্য বাধ্যতামূলক
-apps/erpnext/erpnext/controllers/accounts_controller.py +354,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","সারিতে আইটেম {0} জন্য overbill পারবেন না {1} বেশী {2}. Overbilling, স্টক সেটিংস এ সেট করুন অনুমতি করুন"
+apps/erpnext/erpnext/controllers/accounts_controller.py +355,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","সারিতে আইটেম {0} জন্য overbill পারবেন না {1} বেশী {2}. Overbilling, স্টক সেটিংস এ সেট করুন অনুমতি করুন"
 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 +135,User {0} is disabled,ব্যবহারকারী {0} নিষ্ক্রিয় করা হয়
@@ -1752,30 +1689,29 @@
 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 +95,"Types of employment (permanent, contract, intern etc.).","কর্মসংস্থান প্রকারভেদ (স্থায়ী, চুক্তি, অন্তরীণ ইত্যাদি)."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,{0} is mandatory for Item {1},{0} আইটেম জন্য বাধ্যতামূলক {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,{0} is mandatory for Item {1},{0} আইটেমের জন্য বাধ্যতামূলক {1}
 DocType: Currency Exchange,From Currency,মুদ্রা থেকে
 DocType: DocField,Name,নাম
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +211,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","অন্তত একটি সারিতে বরাদ্দ পরিমাণ, চালান প্রকার এবং চালান নম্বর নির্বাচন করুন"
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +104,Sales Order required for Item {0},আইটেম জন্য প্রয়োজন বিক্রয় আদেশ {0}
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +158,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","অন্তত একটি সারিতে বরাদ্দ পরিমাণ, চালান প্রকার এবং চালান নম্বর নির্বাচন করুন"
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +107,Sales Order required for Item {0},আইটেম জন্য প্রয়োজন বিক্রয় আদেশ {0}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +43,Amounts not reflected in system,সিস্টেম প্রতিফলিত না পরিমাণে
 DocType: Purchase Invoice Item,Rate (Company Currency),হার (কোম্পানি একক)
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +40,Others,অন্যরা
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +40,Others,অন্যরা
 apps/erpnext/erpnext/templates/includes/product_page.js +80,Cannot find a matching Item. Please select some other value for {0}.,একটি মিল খুঁজে খুঁজে পাচ্ছেন না. জন্য {0} অন্য কোনো মান নির্বাচন করুন.
 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,প্রথম সারির &#39;পূর্ববর্তী সারি মোট&#39; &#39;পূর্ববর্তী সারি পরিমাণ&#39; হিসেবে অভিযোগ টাইপ নির্বাচন করা বা না করা
 apps/frappe/frappe/core/doctype/doctype/boilerplate/controller_list.html +31,Completed,সম্পন্ন
 DocType: Web Form,Select DocType,নির্বাচন DOCTYPE
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +104,Broaching,Broaching
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +12,Banking,ব্যাংকিং
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,ব্যাংকিং
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +38,Please click on 'Generate Schedule' to get schedule,সময়সূচী পেতে &#39;নির্মাণ সূচি&#39; তে ক্লিক করুন
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +283,New Cost Center,নতুন খরচ কেন্দ্র
 DocType: Bin,Ordered Quantity,আদেশ পরিমাণ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +397,"e.g. ""Build tools for builders""",যেমন &quot;নির্মাতা জন্য সরঞ্জাম তৈরি করুন&quot;
+apps/erpnext/erpnext/public/js/setup_wizard.js +145,"e.g. ""Build tools for builders""",যেমন &quot;নির্মাতা জন্য সরঞ্জাম তৈরি করুন&quot;
 DocType: Quality Inspection,In Process,প্রক্রিয়াধীন
 DocType: Authorization Rule,Itemwise Discount,Itemwise ছাড়
 DocType: Purchase Order Item,Reference Document Type,রেফারেন্স ডকুমেন্ট টাইপ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +318,{0} against Sales Order {1},{0} সেলস আদেশের বিরুদ্ধে {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +320,{0} against Sales Order {1},{0} সেলস আদেশের বিরুদ্ধে {1}
 DocType: Account,Fixed Asset,নির্দিষ্ট সম্পত্তি
 apps/erpnext/erpnext/config/stock.py +283,Serialized Inventory,ধারাবাহিকভাবে পরিসংখ্যা
 DocType: Activity Type,Default Billing Rate,ডিফল্ট বিলিং রেট
@@ -1790,14 +1726,13 @@
 DocType: Purchase Invoice Item,Page Break,পৃষ্ঠা বিরতি
 DocType: Production Order Operation,Pending,বিচারাধীন
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,একটি নির্দিষ্ট কর্মচারী হুকুমে অ্যাপ্লিকেশন অনুমোদন করতে পারেন ব্যবহারকারীরা
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +33,You cannot change default UOM of Variant. To change default UOM for Variant change default UOM of the Template,আপনি বৈকল্পিক ডিফল্ট UOM পরিবর্তন করতে পারবেন না. টেমপ্লেট মধ্যে variant পরিবর্তনের ডিফল্ট UOM জন্য ডিফল্ট UOM পরিবর্তন করুন
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +50,Office Equipments,অফিস সরঞ্জাম
 DocType: Purchase Invoice Item,Qty,Qty
 DocType: Fiscal Year,Companies,কোম্পানি
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +24,Electronics,যন্ত্রপাতির
+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/support/doctype/maintenance_visit/maintenance_visit.js +18,From Maintenance Schedule,রক্ষণাবেক্ষণ সূচি থেকে
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +56,Full-time,ফুল টাইম
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +56,Full-time,ফুল টাইম
 DocType: Purchase Invoice,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.","আপনি বিক্রয় করের এবং চার্জ টেমপ্লেট একটি স্ট্যান্ডার্ড টেমপ্লেট নির্মাণ করা হলে, একটি নির্বাচন করুন এবং নিচের বাটনে ক্লিক করুন."
@@ -1809,11 +1744,12 @@
 DocType: Job Applicant,Job Opening,কর্মখালির
 DocType: Payment Reconciliation,Payment Reconciliation,পেমেন্ট রিকনসিলিয়েশন
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +154,Please select Incharge Person's name,ইনচার্জ ব্যক্তির নাম নির্বাচন করুন
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +51,Technology,প্রযুক্তি
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,প্রযুক্তি
 DocType: Offer Letter,Offer Letter,প্রস্তাবপত্র
 apps/erpnext/erpnext/config/manufacturing.py +51,Generate Material Requests (MRP) and Production Orders.,উপাদান অনুরোধ (এমআরপি) অ্যান্ড প্রোডাকশন আদেশ নির্মাণ করা হয়.
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +68,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.","সন্তানের যোগ নোড, বৃক্ষ এবং এক্সপ্লোর আপনি আরো নোড যোগ করতে চান যার অধীনে নোডে ক্লিক করুন."
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +102,Credit To account must be a Payable account,একাউন্টে ক্রেডিট একটি প্রদেয় অ্যাকাউন্ট থাকতে হবে
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +233,BOM recursion: {0} cannot be parent or child of {2},BOM recursion: {0} এর পিতা বা মাতা বা সন্তান হতে পারবেন না {2}
@@ -1826,10 +1762,8 @@
 DocType: Item,Customer Item Codes,গ্রাহক আইটেম সঙ্কেত
 DocType: Opportunity,Lost Reason,লস্ট কারণ
 apps/erpnext/erpnext/config/accounts.py +68,Create Payment Entries against Orders or Invoices.,আদেশ বা চালানে বিরুদ্ধে পেমেন্ট থেকে.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +141,Welding,ঢালাই
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +40,New Stock UOM is required,নতুন শেয়ার UOM প্রয়োজন বোধ করা হয়
 DocType: Quality Inspection,Sample Size,সাধারন মাপ
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +443,All items have already been invoiced,সকল আইটেম ইতিমধ্যে invoiced হয়েছে
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +446,All items have already been invoiced,সকল আইটেম ইতিমধ্যে invoiced হয়েছে
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',&#39;কেস নং থেকে&#39; একটি বৈধ উল্লেখ করুন
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +287,Further cost centers can be made under Groups but entries can be made against non-Groups,অতিরিক্ত খরচ সেন্টার গ্রুপ অধীন করা যেতে পারে কিন্তু এন্ট্রি অ গ্রুপের বিরুদ্ধে করা যেতে পারে
 DocType: Project,External,বহিরাগত
@@ -1841,8 +1775,7 @@
 DocType: Bin,Actual Quantity,প্রকৃত পরিমাণ
 DocType: Shipping Rule,example: Next Day Shipping,উদাহরণস্বরূপ: আগামী দিন গ্রেপ্তার
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,পাওয়া না সিরিয়াল কোন {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +563,Your Customers,তোমার গ্রাহকরা
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +27,Compression molding,কম্প্রেশন ঢালাই
+apps/erpnext/erpnext/public/js/setup_wizard.js +303,Your Customers,তোমার গ্রাহকরা
 DocType: Leave Block List Date,Block Date,ব্লক তারিখ
 DocType: Sales Order,Not Delivered,বিতরিত হয় নি
 ,Bank Clearance Summary,ব্যাংক পরিস্কারের সংক্ষিপ্ত
@@ -1863,10 +1796,10 @@
 DocType: SMS Log,Sent To,প্রেরিত
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +28,Make Sales Invoice,বিক্রয় চালান করুন
 DocType: Company,For Reference Only.,শুধুমাত্র রেফারেন্সের জন্য.
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +29,Invalid {0}: {1},অকার্যকর {0}: {1}
+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,ক্ষমতা পরিকল্পনা
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +49,'From Date' is required,প্রয়োজন বোধ করা হয় &#39;জন্ম থেকে&#39;
+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,নতুন কর্মক্ষেত্রে
@@ -1881,7 +1814,7 @@
 DocType: Serial No,Delivery Time,প্রসবের সময়
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,উপর ভিত্তি করে বুড়ো
 DocType: Item,End of Life,জীবনের শেষে
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +41,Travel,ভ্রমণ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +41,Travel,ভ্রমণ
 DocType: Leave Block List,Allow Users,ব্যবহারকারীদের মঞ্জুরি
 DocType: Purchase Order,Customer Mobile No,গ্রাহক মোবাইল কোন
 DocType: Sales Invoice,Recurring,আবৃত্ত
@@ -1895,7 +1828,7 @@
 DocType: Naming Series,User must always select,ব্যবহারকারী সবসময় নির্বাচন করতে হবে
 DocType: Stock Settings,Allow Negative Stock,নেতিবাচক শেয়ার মঞ্জুরি
 DocType: Installation Note,Installation Note,ইনস্টলেশন উল্লেখ্য
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +541,Add Taxes,করের যোগ
+apps/erpnext/erpnext/public/js/setup_wizard.js +283,Add Taxes,করের যোগ
 ,Financial Analytics,আর্থিক বিশ্লেষণ
 DocType: Quality Inspection,Verified By,কর্তৃক যাচাইকৃত
 DocType: Address,Subsidiary,সহায়ক
@@ -1905,7 +1838,6 @@
 DocType: System Settings,In Hours,ঘন্টা ইন
 DocType: Process Payroll,Create Salary Slip,বেতন স্লিপ তৈরি
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Expected balance as per bank,ব্যাংক হিসাবে প্রত্যাশিত ভারসাম্য
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +115,Buffing,একযোগে
 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,কর্মচারী
@@ -1922,11 +1854,11 @@
 DocType: Rename Tool,File to Rename,পুনঃনামকরণ করা ফাইল
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +176,Purchse Order number required for Item {0},আইটেম জন্য প্রয়োজন Purchse ক্রম সংখ্যা {0}
 apps/erpnext/erpnext/public/js/controllers/transaction.js +136,Show Payments,দেখান পেমেন্টস্
-apps/erpnext/erpnext/controllers/buying_controller.py +245,Specified BOM {0} does not exist for Item {1},আইটেম জন্য বিদ্যমান নয় নির্দিষ্ট BOM {0} {1}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +202,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,রক্ষণাবেক্ষণ সূচি {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 +197,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,রক্ষণাবেক্ষণ সূচি {0} এই সেলস অর্ডার বাতিলের আগে বাতিল করা হবে
 apps/frappe/frappe/desk/page/backups/backups.html +13,Size,আয়তন
 DocType: Notification Control,Expense Claim Approved,ব্যয় দাবি অনুমোদিত
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +113,Pharmaceutical,ফার্মাসিউটিক্যাল
+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,সেলস আদেশ প্রয়োজন
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +30,Create Customer,গ্রাহক তৈরি
@@ -1936,7 +1868,6 @@
 DocType: Quality Inspection Reading,Reading 9,9 পঠন
 DocType: Supplier,Is Frozen,জমাটবাধা
 DocType: Buying Settings,Buying Settings,রাজধানীতে সেটিংস
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +122,Mass finishing,ভর সমাপ্তি
 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),বিক্রয় ইমেইল আইডি জন্য সেটআপ ইনকামিং সার্ভার. (যেমন sales@example.com)
@@ -1944,7 +1875,7 @@
 DocType: Payment Tool,Payment Account,টাকা পরিষদের অ্যাকাউন্ট
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +713,Please specify Company to proceed,এগিয়ে যেতে কোম্পানি উল্লেখ করুন
 apps/frappe/frappe/public/js/frappe/model/indicator.js +30,Draft,খসড়া
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +46,Compensatory Off,পূরক অফ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Compensatory Off,পূরক অফ
 DocType: Quality Inspection Reading,Accepted,গৃহীত
 DocType: User,Female,মহিলা
 DocType: Journal Entry Account,Debit in Account Currency,অ্যাকাউন্টের মুদ্রা ডেবিট
@@ -1956,7 +1887,7 @@
 DocType: Shipping Rule,Shipping Rule Label,শিপিং রুল ট্যাগ
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +209,Raw Materials cannot be blank.,কাঁচামালের ফাঁকা থাকতে পারে না.
 DocType: Newsletter,Test,পরীক্ষা
-apps/erpnext/erpnext/stock/doctype/item/item.py +364,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +368,"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'","বিদ্যমান শেয়ার লেনদেন আপনাকে মান পরিবর্তন করতে পারবেন না \ এই আইটেমটি জন্য আছে &#39;সিরিয়াল কোন হয়েছে&#39;, &#39;ব্যাচ করিয়াছেন&#39;, &#39;স্টক আইটেম&#39; এবং &#39;মূল্যনির্ধারণ পদ্ধতি&#39;"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +448,Quick Journal Entry,দ্রুত জার্নাল এন্ট্রি
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +92,You can not change rate if BOM mentioned agianst any item,BOM কোন আইটেম agianst উল্লেখ তাহলে আপনি হার পরিবর্তন করতে পারবেন না
@@ -1967,13 +1898,14 @@
 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.,পৃথক উত্পাদন যাতে প্রতিটি সমাপ্ত ভাল আইটেমের জন্য তৈরি করা হবে.
 DocType: Purchase Invoice,Terms and Conditions1,শর্তাবলী এবং Conditions1
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +18,Complete Setup,সম্পূর্ণ সেটআপ
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard_page.html +18,Complete Setup,সম্পূর্ণ সেটআপ
 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),ভগ্নাংশ অননুমোদন এই পরীক্ষা. (আমরা জন্য)
 apps/erpnext/erpnext/config/crm.py +96,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 +57,Total Absent,মোট অনুপস্থিত
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +746,Item or Warehouse for row {0} does not match Material Request,সারি {0} মেলে না উপাদানের জন্য অনুরোধ জন্য আইটেম বা গুদাম
@@ -1998,16 +1930,15 @@
 DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),মৌলিক হার (স্টক UOM অনুযায়ী)
 DocType: SMS Log,No of Requested SMS,অনুরোধ করা এসএমএস এর কোন
 DocType: Campaign,Campaign-.####,প্রচারাভিযান -. ####
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +55,Piercing,তীক্ষ্ন
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,পরবর্তী ধাপ
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +117,Contract End Date must be greater than Date of Joining,চুক্তি শেষ তারিখ যোগদান তারিখ থেকে বড় হওয়া উচিত
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,একটি কমিশন জন্য কোম্পানি পণ্য বিক্রি একটি তৃতীয় পক্ষের যারা পরিবেশক / ব্যাপারী / কমিশন এজেন্ট / অধিভুক্ত / রিসেলার.
 DocType: Customer Group,Has Child Node,সন্তানের নোড আছে
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{0} against Purchase Order {1},{0} ক্রয় আদেশের বিরুদ্ধে {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +332,{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/page/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
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +110,Photochemical machining,আলোক যন্ত্র
 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.
 
 #### Note
@@ -2033,7 +1964,7 @@
 DocType: Purchase Receipt Item,Recd Quantity,Recd পরিমাণ
 DocType: Email Account,Email Ids,ইমেল আইডি
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},সেলস আদেশ পরিমাণ বেশী আইটেম {0} সৃষ্টি করতে পারে না {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +471,Stock Entry {0} is not submitted,শেয়ার এণ্ট্রি {0} দাখিল করা হয় না
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +473,Stock Entry {0} is not submitted,শেয়ার এণ্ট্রি {0} দাখিল করা হয় না
 DocType: Payment Reconciliation,Bank / Cash Account,ব্যাংক / নগদ অ্যাকাউন্ট
 DocType: Tax Rule,Billing City,বিলিং সিটি
 DocType: Global Defaults,Hide Currency Symbol,মুদ্রা প্রতীক লুকান
@@ -2049,7 +1980,7 @@
 DocType: Purchase Invoice,Currency and Price List,মুদ্রা ও মূল্যতালিকা
 DocType: Opportunity,Customer / Lead Name,গ্রাহক / লিড নাম
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +63,Clearance Date not mentioned,পরিস্কারের তারিখ উল্লেখ না
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +71,Production,উত্পাদনের
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Production,উত্পাদনের
 DocType: Item,Allow Production Order,মঞ্জুরি উৎপাদন অর্ডার
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +60,Row {0}:Start Date must be before End Date,সারি {0}: আরম্ভের তারিখ শেষ তারিখের আগে হওয়া আবশ্যক
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),মোট (Qty)
@@ -2062,7 +1993,7 @@
 apps/erpnext/erpnext/utilities/doctype/address/address.py +113,My Addresses,আমার ঠিকানা
 DocType: Stock Ledger Entry,Outgoing Rate,আউটগোয়িং কলের হার
 apps/erpnext/erpnext/config/hr.py +100,Organization branch master.,সংস্থার শাখা মাস্টার.
-apps/erpnext/erpnext/controllers/accounts_controller.py +237, or ,বা
+apps/erpnext/erpnext/controllers/accounts_controller.py +238, 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-উপরে
@@ -2089,6 +2020,7 @@
 DocType: Stock Entry Detail,Serial No / Batch,সিরিয়াল কোন / ব্যাচ
 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 +213,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',রক্ষণাবেক্ষণ সূচি সব আইটেম জন্য উত্পন্ন করা হয় না. &#39;নির্মাণ সূচি&#39; তে ক্লিক করুন
 ,To Produce,উৎপাদন করা
 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} এছাড়াও অন্তর্ভুক্ত করা আবশ্যক"
@@ -2096,10 +2028,7 @@
 DocType: Bin,Reserved Quantity,সংরক্ষিত পরিমাণ
 DocType: Landed Cost Voucher,Purchase Receipt Items,কেনার রসিদ চলছে
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,কাস্টমাইজ ফরম
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +62,Cutting,কাটা
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +69,Flattening,সমরূপতার
 DocType: Account,Income Account,আয় অ্যাকাউন্ট
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +22,Molding,ছাঁচনির্মাণ
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +632,Delivery,বিলি
 DocType: Stock Reconciliation Item,Current Qty,বর্তমান স্টক
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",দেখুন খোয়াতে বিভাগে &quot;সামগ্রী ভিত্তি করে হার&quot;
@@ -2109,19 +2038,18 @@
 apps/frappe/frappe/desk/moduleview.py +61,Documents,কাগজপত্র
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +17,Ref,সুত্র
 DocType: Cost Center,Cost Center,খরচ কেন্দ্র
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.js +48,Voucher #,ভাউচার #
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +36,Voucher #,ভাউচার #
 DocType: Notification Control,Purchase Order Message,আদেশ বার্তাতে ক্রয়
 DocType: Tax Rule,Shipping Country,শিপিং দেশ
 DocType: Upload Attendance,Upload HTML,আপলোড এইচটিএমএল
-apps/erpnext/erpnext/controllers/accounts_controller.py +391,"Total advance ({0}) against Order {1} cannot be greater \
+apps/erpnext/erpnext/controllers/accounts_controller.py +392,"Total advance ({0}) against Order {1} cannot be greater \
 				than the Grand Total ({2})",মোট অগ্রিম ({0}) আদেশের বিরুদ্ধে {1} \ বৃহত্তর হতে পারে না সর্বমোট তুলনায় ({2})
 DocType: Employee,Relieving Date,মুক্তিদান তারিখ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +12,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.","প্রাইসিং রুল কিছু মানদণ্ডের উপর ভিত্তি করে, / মূল্য তালিকা মুছে ফেলা ডিসকাউন্ট শতাংশ নির্ধারণ করা হয়."
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,গুদাম শুধুমাত্র স্টক এন্ট্রি এর মাধ্যমে পরিবর্তন করা যাবে / হুণ্ডি / কেনার রসিদ
 DocType: Employee Education,Class / Percentage,ক্লাস / শতাংশ
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +92,Head of Marketing and Sales,মার্কেটিং ও সেলস হেড
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +31,Income Tax,আয়কর
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +157,Laser engineered net shaping,লেজার নেট রুপায়ণ engineered
+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.","নির্বাচিত প্রাইসিং রুল &#39;মূল্য&#39; জন্য তৈরি করা হয় তাহলে, এটি মূল্য তালিকা মুছে ফেলা হবে. প্রাইসিং রুল মূল্য চূড়ান্ত দাম, তাই কোন অতিরিক্ত ছাড় প্রয়োগ করতে হবে. অত: পর, ইত্যাদি বিক্রয় আদেশ, ক্রয় আদেশ মত লেনদেন, এটা বরং &#39;মূল্য তালিকা হার&#39; ক্ষেত্র ছাড়া, &#39;হার&#39; ক্ষেত্র সংগৃহীত হবে."
 apps/erpnext/erpnext/config/selling.py +163,Track Leads by Industry Type.,ট্র্যাক শিল্প টাইপ দ্বারা অনুসন্ধান.
 DocType: Item Supplier,Item Supplier,আইটেম সরবরাহকারী
@@ -2144,31 +2072,28 @@
 DocType: Stock Ledger Entry,Actual Qty After Transaction,লেনদেন পরে আসল Qty
 ,Pending SO Items For Purchase Request,ক্রয় অনুরোধ জন্য তাই চলছে অপেক্ষারত
 DocType: Supplier,Billing Currency,বিলিং মুদ্রা
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +148,Extra Large,অতি বৃহদাকার
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,Extra Large,অতি বৃহদাকার
 ,Profit and Loss Statement,লাভ এবং লোকসান বিবরণী
 DocType: Bank Reconciliation Detail,Cheque Number,চেক সংখ্যা
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +43,Pressing,টিপলে
 DocType: Payment Tool Detail,Payment Tool Detail,পেমেন্ট টুল বিস্তারিত
 ,Sales Browser,সেলস ব্রাউজার
 DocType: Journal Entry,Total Credit,মোট ক্রেডিট
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +474,Warning: Another {0} # {1} exists against stock entry {2},সতর্কতা: আরেকটি {0} # {1} শেয়ার এন্ট্রি বিরুদ্ধে বিদ্যমান {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +459,Local,স্থানীয়
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +476,Warning: Another {0} # {1} exists against stock entry {2},সতর্কতা: আরেকটি {0} # {1} শেয়ার এন্ট্রি বিরুদ্ধে বিদ্যমান {2}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +397,Local,স্থানীয়
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),ঋণ ও অগ্রিমের (সম্পদ)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,ঋণ গ্রহিতা
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +147,Large,বড়
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +23,No employee found!,কোন কর্মচারী পাওয়া!
+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 +152,Please mention no of visits required,প্রয়োজনীয় ভিজিট কোন উল্লেখ করুন
 DocType: Purchase Order,Customer Address Display,গ্রাহকের ঠিকানা প্রদর্শন
 DocType: Stock Settings,Default Valuation Method,ডিফল্ট মূল্যনির্ধারণ পদ্ধতি
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +127,Polishing,মসৃণতা
 DocType: Production Order Operation,Planned Start Time,পরিকল্পনা শুরুর সময়
 apps/erpnext/erpnext/config/accounts.py +63,Close Balance Sheet and book Profit or Loss.,বন্ধ স্থিতিপত্র ও বই লাভ বা ক্ষতি.
-apps/erpnext/erpnext/stock/doctype/item/item.py +661,"Default Unit of Measure for Item {0} cannot be changed directly because \
+apps/erpnext/erpnext/stock/doctype/item/item.py +665,"Default Unit of Measure for Item {0} cannot be changed directly because \
 			you have already made some transaction(s) with another UOM. To change default UOM, \
 			use 'UOM Replace Utility' tool under Stock module.","আপনি ইতিমধ্যে অন্য UOM সঙ্গে কিছু লেনদেন (গুলি) করেছেন \ কারণ আইটেম জন্য মেজার ডিফল্ট ইউনিট {0} সরাসরি পরিবর্তন করা যাবে না. ডিফল্ট UOM পরিবর্তন করার জন্য, ব্যবহারের \ শেয়ার মডিউল অধীনে টুল &#39;UOM ইউটিলিটি র পরিবর্তে&#39;."
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,বিনিময় হার অন্য মধ্যে এক মুদ্রা রূপান্তর উল্লেখ
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +146,Quotation {0} is cancelled,উদ্ধৃতি {0} বাতিল করা হয়
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +141,Quotation {0} is cancelled,উদ্ধৃতি {0} বাতিল করা হয়
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,মোট বকেয়া পরিমাণ
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} was on leave on {1}. Cannot mark attendance.,{0} কর্মচারী ছুটি ছিল {1}. উপস্থিতির চিহ্নিত করতে পারবেন না.
 DocType: Sales Partner,Targets,লক্ষ্যমাত্রা
@@ -2179,7 +2104,6 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +158,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,কম্পিউটার
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +112,Electro-chemical grinding,তড়িৎ রাসায়নিক হয়রান
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +14,This is a root customer group and cannot be edited.,এটি একটি root গ্রাহক গ্রুপ এবং সম্পাদনা করা যাবে না.
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +39,Please setup your chart of accounts before you start Accounting Entries,অ্যাকাউন্টের আপনার চার্ট সেটআপ আপনি হিসাব থেকে শুরু দয়া করে আগে
 DocType: Purchase Invoice,Ignore Pricing Rule,প্রাইসিং বিধি উপেক্ষা
@@ -2225,7 +2149,6 @@
 DocType: Maintenance Visit,Purposes,উদ্দেশ্যসমূহ
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +103,Atleast one item should be entered with negative quantity in return document,অন্তত একটি আইটেম ফিরে নথিতে নেতিবাচক পরিমাণ সঙ্গে প্রবেশ করা উচিত
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +67,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","অপারেশন {0} ওয়ার্কস্টেশন কোনো উপলব্ধ কাজের সময় চেয়ে দীর্ঘতর {1}, একাধিক অপারেশন মধ্যে অপারেশন ভাঙ্গিয়া"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +134,Electrochemical machining,তাড়িত যন্ত্র
 ,Requested,অনুরোধ করা
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +66,No Remarks,কোন মন্তব্য
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +13,Overdue,পরিশোধসময়াতীত
@@ -2234,9 +2157,9 @@
 DocType: Monthly Distribution,Distribution Name,বন্টন নাম
 DocType: Features Setup,Sales and Purchase,ক্রয় এবং বিক্রয়
 DocType: Supplier Quotation Item,Material Request No,উপাদানের জন্য অনুরোধ কোন
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +218,Quality Inspection required for Item {0},আইটেম জন্য প্রয়োজনীয় মান পরিদর্শন {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +221,Quality Inspection required for Item {0},আইটেম জন্য প্রয়োজনীয় মান পরিদর্শন {0}
 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} এই তালিকা থেকে সফলভাবে রদ করা হয়েছে.
+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/frappe/frappe/templates/base.html +134,Added,যোগ করা
 apps/erpnext/erpnext/config/crm.py +81,Manage Territory Tree.,টেরিটরি গাছ পরিচালনা.
@@ -2252,9 +2175,8 @@
 apps/erpnext/erpnext/accounts/report/financial_statements.py +16,Fiscal Year {0} not found.,অর্থবছরের {0} পাওয়া যায়নি.
 DocType: Bank Reconciliation,Get Relevant Entries,প্রাসঙ্গিক এন্ট্রি পেতে
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +407,Accounting Entry for Stock,স্টক জন্য অ্যাকাউন্টিং এণ্ট্রি
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +64,Coining,Coining
 DocType: Sales Invoice,Sales Team1,সেলস team1
-apps/erpnext/erpnext/stock/doctype/item/item.py +412,Item {0} does not exist,আইটেম {0} অস্তিত্ব নেই
+apps/erpnext/erpnext/stock/doctype/item/item.py +416,Item {0} does not exist,আইটেম {0} অস্তিত্ব নেই
 DocType: Sales Invoice,Customer Address,গ্রাহকের ঠিকানা
 apps/frappe/frappe/desk/query_report.py +136,Total,মোট
 DocType: Purchase Invoice,Apply Additional Discount On,অতিরিক্ত ডিসকাউন্ট উপর প্রয়োগ
@@ -2266,14 +2188,13 @@
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),ছাড়ের পরিমাণ পরে ট্যাক্স পরিমাণ (কোম্পানি একক)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +149,Target warehouse is mandatory for row {0},উদ্দিষ্ট গুদাম সারিতে জন্য বাধ্যতামূলক {0}
 DocType: Quality Inspection,Quality Inspection,উচ্চমানের তদন্ত
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +144,Extra Small,অতিরিক্ত ছোট
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +20,Spray forming,বিরচন স্প্রে
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Extra Small,অতিরিক্ত ছোট
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +458,Warning: Material Requested Qty is less than Minimum Order Qty,সতর্কতা: Qty অনুরোধ উপাদান নূন্যতম অর্ডার QTY কম হয়
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +191,Account {0} is frozen,অ্যাকাউন্ট {0} নিথর হয়
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,সংস্থার একাত্মতার অ্যাকাউন্টের একটি পৃথক চার্ট সঙ্গে আইনি সত্তা / সাবসিডিয়ারি.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +29,"Food, Beverage & Tobacco","খাদ্য, পানীয় ও তামাকের"
+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,পিএল বা বঙ্গাব্দের
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,Can only make payment against unbilled {0},শুধুমাত্র বিরুদ্ধে পেমেন্ট করতে পারবেন যেতে উদ্ভাবনী উপায় {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +531,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/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Minimum Inventory Level,নূন্যতম পরিসংখ্যা শ্রেনী
 DocType: Stock Entry,Subcontract,ঠিকা
@@ -2284,19 +2205,18 @@
 DocType: Item,Manufacturer Part Number,প্রস্তুতকর্তা পার্ট সংখ্যা
 DocType: Production Order Operation,Estimated Time and Cost,আনুমানিক সময় এবং খরচ
 DocType: Bin,Bin,বিন
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +50,Nosing,Nosing
 DocType: SMS Log,No of Sent SMS,এসএমএস পাঠানোর কোন
 DocType: Account,Company,কোম্পানি
 DocType: Account,Expense Account,দামী হিসাব
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +49,Software,সফটওয়্যার
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +151,Colour,রঙিন
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +49,Software,সফটওয়্যার
+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","&quot;না&quot; এবং &quot;বিক্রয় আইটেম&quot; &quot;শেয়ার আইটেম&quot; যেখানে &quot;হ্যাঁ&quot; হয় আইটেম নির্বাচন করুন এবং অন্য কোন পণ্য সমষ্টি নেই, অনুগ্রহ করে"
 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 +281,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} উপরোক্ত &#39;ক্রয় রসিদের&#39; টেবিলের অস্তিত্ব নেই কেনার রসিদ
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +134,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 +145,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,পাসওয়ার্ড ভুলে গেছেন? পুনঃনামকরণ
@@ -2306,7 +2226,7 @@
 apps/erpnext/erpnext/controllers/recurring_document.py +162,Please select {0},দয়া করে নির্বাচন করুন {0}
 DocType: C-Form,C-Form No,সি-ফরম কোন
 DocType: BOM,Exploded_items,Exploded_items
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +95,Researcher,গবেষক
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Researcher,গবেষক
 apps/frappe/frappe/custom/doctype/customize_form/customize_form.js +88,Update,আপডেট
 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 +23,Name or Email is mandatory,নাম বা ইমেল বাধ্যতামূলক
@@ -2315,11 +2235,10 @@
 DocType: Employee,Exit,প্রস্থান
 apps/erpnext/erpnext/accounts/doctype/account/account.py +134,Root Type is mandatory,Root- র ধরন বাধ্যতামূলক
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +295,Serial No {0} created,{0} নির্মিত সিরিয়াল কোন
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +125,Vibratory finishing,ঝাঁকি সমাপ্তি
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","গ্রাহকদের সুবিধার জন্য, এই কোড চালান এবং বিলি নোট মত মুদ্রণ বিন্যাস ব্যবহার করা যেতে পারে"
 DocType: Employee,You can enter any date manually,আপনি নিজে কোনো তারিখ লিখতে পারেন
 DocType: Sales Invoice,Advertisement,বিজ্ঞাপন
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +165,Probationary Period,অবেক্ষাধীন সময়ের
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Probationary Period,অবেক্ষাধীন সময়ের
 DocType: Customer Group,Only leaf nodes are allowed in transaction,শুধু পাতার নোড লেনদেনের অনুমতি দেওয়া হয়
 DocType: Expense Claim,Expense Approver,ব্যয় রাজসাক্ষী
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,কেনার রসিদ আইটেম সরবরাহ
@@ -2327,19 +2246,16 @@
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +17,To Datetime,Datetime করুন
 DocType: SMS Settings,SMS Gateway URL,এসএমএস গেটওয়ে ইউআরএল
 apps/erpnext/erpnext/config/crm.py +53,Logs for maintaining sms delivery status,SMS বিতরণ অবস্থা বজায় রাখার জন্য লগ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +137,Grinding,হয়রান
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +34,Shrink wrapping,মোড়কে সঙ্কুচিত
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +36,Pending Activities,মুলতুবি কার্যক্রম
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,Confirmed,নিশ্চিতকৃত
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier > Supplier Type,সরবরাহকারী&gt; সরবরাহকারী ধরন
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +127,Please enter relieving date.,তারিখ মুক্তিদান লিখুন.
 apps/erpnext/erpnext/controllers/trends.py +137,Amt,AMT
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' can be submitted,শুধু স্ট্যাটাস &#39;অনুমোদিত&#39; জমা করা যেতে পারে সঙ্গে অ্যাপ্লিকেশন ছেড়ে দিন
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +51,Only Leave Applications with status 'Approved' can be submitted,শুধু স্ট্যাটাস &#39;অনুমোদিত&#39; জমা করা যেতে পারে সঙ্গে অ্যাপ্লিকেশন ছেড়ে দিন
 apps/erpnext/erpnext/utilities/doctype/address/address.py +21,Address Title is mandatory.,ঠিকানা শিরোনাম বাধ্যতামূলক.
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,তদন্ত উৎস প্রচারণা যদি প্রচারাভিযানের নাম লিখুন
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +38,Newspaper Publishers,সংবাদপত্র পাবলিশার্স
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +38,Newspaper Publishers,সংবাদপত্র পাবলিশার্স
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,ফিস্ক্যাল বছর নির্বাচন
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +88,Smelting,ধাতু বিগলন
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,পুনর্বিন্যাস স্তর
 DocType: Attendance,Attendance Date,এ্যাটেনডেন্স তারিখ
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,আদায় এবং সিদ্ধান্তগ্রহণ উপর ভিত্তি করে বেতন ছুটি.
@@ -2354,16 +2270,15 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +414,[Error],[ত্রুটি]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,আপনি বিক্রয় আদেশ সংরক্ষণ একবার শব্দ দৃশ্যমান হবে.
 ,Employee Birthday,কর্মচারী জন্মদিনের
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +55,Venture Capital,ভেনচার ক্যাপিটাল
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,ভেনচার ক্যাপিটাল
 DocType: UOM,Must be Whole Number,গোটা সংখ্যা হতে হবে
 DocType: Leave Control Panel,New Leaves Allocated (In Days),(দিন) বরাদ্দ নতুন পাতার
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +51,Serial No {0} does not exist,সিরিয়াল কোন {0} অস্তিত্ব নেই
 DocType: Pricing Rule,Discount Percentage,ডিসকাউন্ট শতাংশ
 DocType: Payment Reconciliation Invoice,Invoice Number,চালান নম্বর
-apps/erpnext/erpnext/hooks.py +70,Orders,আদেশ
+apps/erpnext/erpnext/hooks.py +54,Orders,আদেশ
 DocType: Leave Control Panel,Employee Type,কর্মচারী ধরন
 DocType: Employee Leave Approver,Leave Approver,রাজসাক্ষী ত্যাগ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +70,Swaging,Swaging
 DocType: Manufacturing Settings,Material Transferred for Manufacture,উপাদান প্রস্তুত জন্য বদলিকৃত
 DocType: Expense Claim,"A user with ""Expense Approver"" role",&quot;ব্যয় রাজসাক্ষী&quot; ভূমিকা সাথে একজন ব্যবহারকারী
 ,Issued Items Against Production Order,উৎপাদন অর্ডার বিরুদ্ধে জারি চলছে
@@ -2375,7 +2290,6 @@
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +62,Cost Center with existing transactions can not be converted to group,বিদ্যমান লেনদেন সঙ্গে খরচ কেন্দ্র গ্রুপ রূপান্তরিত করা যাবে না
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Depreciation,অবচয়
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),সরবরাহকারী (গুলি)
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +29,Invalid period,অকার্যকর সময়ের
 DocType: Customer,Credit Limit,ক্রেডিট সীমা
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,লেনদেনের ধরন নির্বাচন করুন
 DocType: GL Entry,Voucher No,ভাউচার কোন
@@ -2385,9 +2299,9 @@
 DocType: Customer,Address and Contact,ঠিকানা ও যোগাযোগ
 DocType: Customer,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}"
 apps/erpnext/erpnext/accounts/party.py +284,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),উল্লেখ্য: দরুন / রেফারেন্স তারিখ {0} দিন দ্বারা অনুমোদিত গ্রাহকের ক্রেডিট দিন অতিক্রম (গুলি)
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +621,Maint. Schedule,Maint. সময়সূচি
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +108,Abrasive jet machining,ঘষিয়া তুলিয়া ফেলিতে সক্ষম জেট যন্ত্র
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +632,Maint. Schedule,Maint. সময়সূচি
 DocType: Stock Settings,Freeze Stock Entries,ফ্রিজ শেয়ার সাজপোশাকটি
 DocType: Website Settings,Website Settings,ওয়েবসাইট সেটিংস
 DocType: Item,Reorder level based on Warehouse,গুদাম উপর ভিত্তি রেকর্ডার স্তর
@@ -2404,7 +2318,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +75,Show Stock Entries,দেখান স্টক সাজপোশাকটি
 ,Is Primary Address,প্রাথমিক ঠিকানা
 DocType: Production Order,Work-in-Progress Warehouse,কাজ-অগ্রগতি ওয়্যারহাউস
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +308,Reference #{0} dated {1},রেফারেন্স # {0} তারিখের {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Reference #{0} dated {1},রেফারেন্স # {0} তারিখের {1}
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +13,Manage Addresses,ঠিকানা ও পরিচালনা
 DocType: Pricing Rule,Item Code,পণ্য সংকেত
 DocType: Production Planning Tool,Create Production Orders,উত্পাদনের আদেশ করুন
@@ -2413,7 +2327,7 @@
 DocType: Lead,Market Segment,মার্কেটের অংশ
 DocType: Communication,Phone,ফোন
 DocType: Employee Internal Work History,Employee Internal Work History,কর্মচারী অভ্যন্তরীণ কাজের ইতিহাস
-apps/erpnext/erpnext/public/js/account_tree_grid.js +50,Closing (Dr),বন্ধ (ড)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +221,Closing (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.,লেনদেন বিক্রি জন্য ট্যাক্স টেমপ্লেট.
@@ -2429,8 +2343,8 @@
 ,Billed Amount,বিলের পরিমাণ
 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 +129,Material Request {0} is cancelled or stopped,উপাদানের জন্য অনুরোধ {0} বাতিল বা বন্ধ করা হয়
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +641,Add a few sample records,কয়েকটি নমুনা রেকর্ড যোগ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +133,Material Request {0} is cancelled or stopped,উপাদানের জন্য অনুরোধ {0} বাতিল বা বন্ধ করা হয়
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Add a few sample records,কয়েকটি নমুনা রেকর্ড যোগ
 apps/erpnext/erpnext/config/hr.py +210,Leave Management,ম্যানেজমেন্ট ত্যাগ
 DocType: Event,Groups,গ্রুপ
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,অ্যাকাউন্ট দ্বারা গ্রুপ
@@ -2443,38 +2357,34 @@
 DocType: Features Setup,Sales Extras,সেলস অতিরিক্ত
 apps/erpnext/erpnext/accounts/utils.py +344,{0} budget for Account {1} against Cost Center {2} will exceed by {3},{2} খরচ কেন্দ্র বিরুদ্ধে একাউন্ট {1} জন্য {0} বাজেট অতিক্রম করবে {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +236,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","এই স্টক রিকনসিলিয়েশন একটি খোলা এণ্ট্রি যেহেতু পার্থক্য অ্যাকাউন্ট, একটি সম্পদ / দায় ধরনের অ্যাকাউন্ট থাকতে হবে"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +138,Purchase Order number required for Item {0},আইটেম জন্য প্রয়োজন ক্রম সংখ্যা ক্রয় {0}
-apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',&#39;তারিখ থেকে&#39; পরে &#39;টু&#39; হতে হবে
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Order number required for Item {0},আইটেম জন্য প্রয়োজন ক্রম সংখ্যা ক্রয় {0}
+apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date','তারিখ থেকে' অবশ্যই 'তারিখ পর্যন্ত' এর পরে হতে হবে
 ,Stock Projected Qty,স্টক Qty অনুমিত
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +147,Customer {0} does not belong to project {1},অন্তর্গত নয় {0} গ্রাহক প্রকল্পের {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +150,Customer {0} does not belong to project {1},অন্তর্গত নয় {0} গ্রাহক প্রকল্পের {1}
 DocType: Sales Order,Customer's Purchase Order,গ্রাহকের ক্রয় আদেশ
 DocType: Warranty Claim,From Company,কোম্পানীর কাছ থেকে
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,মূল্য বা স্টক
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Minute,মিনিট
+apps/erpnext/erpnext/public/js/setup_wizard.js +363,Minute,মিনিট
 DocType: Purchase Invoice,Purchase Taxes and Charges,কর ও শুল্ক ক্রয়
 ,Qty to Receive,জখন Qty
 DocType: Leave Block List,Leave Block List Allowed,ব্লক তালিকা প্রেজেন্টেশন ত্যাগ
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +61,Conversion factor cannot be in fractions,রূপান্তর ফ্যাক্টর ভগ্নাংশ হতে পারবেন না
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +358,You will use it to Login,আপনাকে অবশ্যই লগইন করতে এটি ব্যবহার করা হবে
+apps/erpnext/erpnext/public/js/setup_wizard.js +108,You will use it to Login,আপনাকে অবশ্যই লগইন করতে এটি ব্যবহার করা হবে
 DocType: Sales Partner,Retailer,খুচরা বিক্রেতা
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +99,Credit To account must be a Balance Sheet account,একাউন্টে ক্রেডিট একটি ব্যালান্স শিটের অ্যাকাউন্ট থাকতে হবে
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,সমস্ত সরবরাহকারী প্রকারভেদ
 apps/erpnext/erpnext/stock/doctype/item/item.py +37,Item Code is mandatory because Item is not automatically numbered,"আইটেম স্বয়ংক্রিয়ভাবে গণনা করা হয়, কারণ আইটেমটি কোড বাধ্যতামূলক"
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +99,Quotation {0} not of type {1},উদ্ধৃতি {0} না টাইপ {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +93,Quotation {0} not of type {1},উদ্ধৃতি {0} না টাইপ {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,রক্ষণাবেক্ষণ সময়সূচী আইটেমটি
-DocType: Sales Order,%  Delivered,% বিতরণ
+DocType: Sales Order,%  Delivered,% বিতরণ করা হয়েছে 
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,Bank Overdraft Account,ব্যাংক ওভারড্রাফ্ট অ্যাকাউন্ট
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +15,Make Salary Slip,বেতন স্লিপ করুন
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +18,Browse BOM,ব্রাউজ BOM
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +175,Secured Loans,নিরাপদ ঋণ
-apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +3,Awesome Products,ভয়ঙ্কর পণ্য
+apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +3,Awesome Products,ভয়ঙ্কর পণ্য
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +189,Opening Balance Equity,খোলা ব্যালেন্স ইকুইটি
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +80,Cannot approve leave as you are not authorized to approve leaves on Block Dates,আপনি ব্লক তারিখগুলি উপর পাতার অনুমোদন যথাযথ অনুমতি নেই ছুটি অনুমোদন করা যায়নি
 DocType: Appraisal,Appraisal,গুণগ্রাহিতা
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +13,Lost-foam casting,লস্ট-ফেনা ঢালাই
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +47,Drawing,অঙ্কন
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +22,Date is repeated,তারিখ পুনরাবৃত্তি করা হয়
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +148,Leave approver must be one of {0},এক হতে হবে রাজসাক্ষী ত্যাগ {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +162,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,সময় শুরু
@@ -2488,7 +2398,7 @@
 DocType: Purchase Invoice Item,Net Amount (Company Currency),থোক (কোম্পানি একক)
 DocType: BOM Operation,Hour Rate,ঘন্টা হার
 DocType: Stock Settings,Item Naming By,দফে নামকরণ
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +642,From Quotation,উদ্ধৃতি থেকে
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +655,From Quotation,উদ্ধৃতি থেকে
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},অন্য সময়ের সমাপ্তি এন্ট্রি {0} পরে তৈরি করা হয়েছে {1}
 DocType: Production Order,Material Transferred for Manufacturing,উপাদান উৎপাদন জন্য বদলিকৃত
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +29,Account {0} does not exists,অ্যাকাউন্ট {0} না বিদ্যমান
@@ -2502,21 +2412,19 @@
 DocType: Purchase Invoice Item,PR Detail,জনসংযোগ বিস্তারিত
 DocType: Sales Order,Fully Billed,সম্পূর্ণ দেখানো হয়েছিল
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +20,Cash In Hand,হাতে নগদ
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +72,Delivery warehouse required for stock item {0},ডেলিভারি গুদাম স্টক আইটেমটি জন্য প্রয়োজন {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +119,Delivery warehouse required for stock item {0},ডেলিভারি গুদাম স্টক আইটেমটি জন্য প্রয়োজন {0}
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),প্যাকেজের গ্রস ওজন. সাধারণত নেট ওজন + প্যাকেজিং উপাদান ওজন. (প্রিন্ট জন্য)
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,এই ব্যবহারকারীরা হিমায়িত অ্যাকাউন্ট বিরুদ্ধে হিসাব থেকে হিমায়িত অ্যাকাউন্ট সেট এবং তৈরি / পরিবর্তন করার অনুমতি দেওয়া হয়
 DocType: Serial No,Is Cancelled,বাতিল করা হয়
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +281,My Shipments,আমার চালানে
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +286,My Shipments,আমার চালানে
 DocType: Journal Entry,Bill Date,বিল তারিখ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +43,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","সর্বোচ্চ অগ্রাধিকার দিয়ে একাধিক প্রাইসিং নিয়ম আছে, এমনকি যদি তারপর নিচের অভ্যন্তরীণ অগ্রাধিকার প্রয়োগ করা হয়:"
 DocType: Supplier,Supplier Details,সরবরাহকারী
 DocType: Communication,Recipients,প্রাপক
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +146,Screwing,Screwing
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +96,Knurling,Knurling
 DocType: Expense Claim,Approval Status,অনুমোদন অবস্থা
 DocType: Hub Settings,Publish Items to Hub,হাব আইটেম প্রকাশ
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +44,From value must be less than to value in row {0},মূল্য সারিতে মান কম হতে হবে থেকে {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +133,Wire Transfer,ওয়্যার ট্রান্সফার
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +133,Wire Transfer,ওয়্যার ট্রান্সফার
 apps/erpnext/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py +25,Please select Bank Account,ব্যাংক অ্যাকাউন্ট নির্বাচন করুন
 DocType: Newsletter,Create and Send Newsletters,তৈরি করুন এবং পাঠান লেটার
 apps/frappe/frappe/public/js/frappe/views/reports/grid_report.js +305,From Date must be before To Date,জন্ম তারিখ থেকে আগে হওয়া আবশ্যক
@@ -2524,14 +2432,14 @@
 DocType: Company,Default Income Account,ডিফল্ট আয় অ্যাকাউন্ট
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,গ্রাহক গ্রুপ / গ্রাহক
 DocType: Item Group,Check this if you want to show in website,আপনি ওয়েবসাইট প্রদর্শন করতে চান তাহলে এই পরীক্ষা
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +190,Welcome to ERPNext,ERPNext স্বাগতম
+,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/page/setup_wizard/install_fixtures.py +37,Calls,কল
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Calls,কল
 DocType: Project,Total Costing Amount (via Time Logs),মোট খোয়াতে পরিমাণ (সময় লগসমূহ মাধ্যমে)
 DocType: Purchase Order Item Supplied,Stock UOM,শেয়ার UOM
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Purchase Order {0} is not submitted,অর্ডার {0} দাখিল করা হয় না ক্রয়
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +194,Purchase Order {0} is not submitted,অর্ডার {0} দাখিল করা হয় না ক্রয়
 ,Projected,অভিক্ষিপ্ত
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},সিরিয়াল কোন {0} ওয়্যারহাউস অন্তর্গত নয় {1}
 apps/erpnext/erpnext/controllers/status_updater.py +136,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,উল্লেখ্য: {0} পরিমাণ বা পরিমাণ 0 হিসাবে বিতরণ-বহুবার-বুকিং আইটেম জন্য সিস্টেম পরীক্ষা করা হবে না
@@ -2539,7 +2447,6 @@
 DocType: Issue,Opening Date,খোলার তারিখ
 DocType: Journal Entry,Remark,মন্তব্য
 DocType: Purchase Receipt Item,Rate and Amount,হার এবং পরিমাণ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +95,Boring,বিরক্তিকর
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +667,From Sales Order,সেলস অর্ডার থেকে
 DocType: Blog Category,Parent Website Route,মূল ওয়েবসাইট রুট
 DocType: Sales Order,Not Billed,বিল না
@@ -2553,19 +2460,17 @@
 apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount Amount,হ্রাসকৃত মুল্য
 DocType: Purchase Invoice,Return Against Purchase Invoice,বিরুদ্ধে ক্রয় চালান আসতে
 DocType: Item,Warranty Period (in days),(দিন) ওয়্যারেন্টি সময়কাল
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +550,e.g. VAT,যেমন ভ্যাট
+apps/erpnext/erpnext/public/js/setup_wizard.js +292,e.g. VAT,যেমন ভ্যাট
 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,উদ্ধৃতি সিরিজের
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +52,"An item exists with same name ({0}), please change the item group name or rename the item","একটি আইটেম একই নামের সঙ্গে বিদ্যমান ({0}), আইটেম গ্রুপের নাম পরিবর্তন বা আইটেম নামান্তর করুন"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +82,Hot metal gas forming,গঠন গরম ধাতু গ্যাস
 DocType: Sales Order Item,Sales Order Date,বিক্রয় আদেশ তারিখ
 DocType: Sales Invoice Item,Delivered Qty,বিতরিত Qty
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +63,Warehouse {0}: Company is mandatory,ওয়ারহাউস {0}: কোম্পানি বাধ্যতামূলক
 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.",ট্যাক্স হার উল্লেখ করা উপযুক্ত গ্রুপ (ফান্ডস&gt; চলতি দায়&gt; ট্যাক্সসমূহ ও দায়িত্ব সাধারণত উত্স থেকে যান এবং টাইপ &quot;ট্যাক্স&quot; এর) শিশু যোগ উপর ক্লিক করে (একটি নতুন অ্যাকাউন্ট তৈরি করা এবং না.
 ,Payment Period Based On Invoice Date,চালান তারিখ উপর ভিত্তি করে পরিশোধ সময়সীমার
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +50,Missing Currency Exchange Rates for {0},নিখোঁজ মুদ্রা বিনিময় হার {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +135,Laser cutting,লেজারের কাটিং
 DocType: Event,Monday,সোমবার
 DocType: Journal Entry,Stock Entry,শেয়ার এণ্ট্রি
 DocType: Account,Payable,প্রদেয়
@@ -2597,8 +2502,8 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +25,Current BOM and New BOM can not be same,বর্তমান BOM এবং নতুন BOM একই হতে পারে না
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +111,Date Of Retirement must be greater than Date of Joining,অবসর তারিখ যোগদান তারিখ থেকে বড় হওয়া উচিত
 DocType: Sales Invoice,Against Income Account,আয় অ্যাকাউন্টের বিরুদ্ধে
-apps/erpnext/erpnext/controllers/website_list_for_contact.py +69,{0}% Delivered,{0}% বিতরণ
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +78,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,আইটেম {0}: আদেশ Qty {1} সর্বনিম্ন ক্রম Qty {2} (আইটেমটি সংজ্ঞায়িত) কম হতে পারে না.
+apps/erpnext/erpnext/controllers/website_list_for_contact.py +69,{0}% Delivered,{0}% বিতরণ করা হয়েছে 
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,আইটেম {0}: আদেশ Qty {1} সর্বনিম্ন ক্রম Qty {2} (আইটেমটি সংজ্ঞায়িত) কম হতে পারে না.
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,মাসিক বন্টন শতকরা
 DocType: Territory,Territory Targets,টেরিটরি লক্ষ্যমাত্রা
 DocType: Delivery Note,Transporter Info,স্থানান্তরকারী তথ্য
@@ -2607,7 +2512,6 @@
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,মুদ্রণ টেমপ্লেট শিরোনাম চালানকল্প যেমন.
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +140,Valuation type charges can not marked as Inclusive,মূল্যনির্ধারণ টাইপ চার্জ সমেত হিসাবে চিহ্নিত করতে পারেন না
 DocType: POS Profile,Update Stock,আপডেট শেয়ার
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +128,Superfinishing,Superfinishing
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,আইটেম জন্য বিভিন্ন UOM ভুল (মোট) নিট ওজন মান হতে হবে. প্রতিটি আইটেমের নিট ওজন একই UOM হয় তা নিশ্চিত করুন.
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM হার
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +85,Please pull items from Delivery Note,হুণ্ডি থেকে আইটেম টান অনুগ্রহ
@@ -2622,7 +2526,6 @@
 ,Purchase Analytics,ক্রয় অ্যানালিটিক্স
 DocType: Sales Invoice Item,Delivery Note Item,হুণ্ডি আইটেম
 DocType: Expense Claim,Task,কার্য
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +57,Shaving,খেউরি
 DocType: Purchase Taxes and Charges,Reference Row #,রেফারেন্স সারি #
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},ব্যাচ নম্বর আইটেম জন্য বাধ্যতামূলক {0}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js +14,This is a root sales person and cannot be edited.,এটি একটি root বিক্রয় ব্যক্তি এবং সম্পাদনা করা যাবে না.
@@ -2634,20 +2537,18 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +74,Purpose must be one of {0},"উদ্দেশ্য, এক হতে হবে {0}"
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +108,Fill the form and save it,ফর্ম পূরণ করুন এবং এটি সংরক্ষণ
 DocType: Production Planning Tool,Download a report containing all raw materials with their latest inventory status,তাদের সর্বশেষ জায় অবস্থা সব কাঁচামাল সম্বলিত একটি প্রতিবেদন ডাউনলোড
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +94,Facing,সম্মুখ
 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: Time Log,Billable,বিলযোগ্য
-DocType: Authorization Rule,This will be used for setting rule in HR module,এই এইচআর মডিউলে নিয়ম সেট করার জন্য ব্যবহার করা হবে
 DocType: Account,Rate at which this tax is applied,"এই ট্যাক্স প্রয়োগ করা হয়, যা এ হার"
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reorder Qty,রেকর্ডার Qty
 DocType: Company,Stock Adjustment Account,শেয়ার সামঞ্জস্য অ্যাকাউন্ট
 DocType: Journal Entry,Write Off,খরচ লেখা
 DocType: Time Log,Operation 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}
+apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}: {1} থেকে 
 DocType: Task,depends_on,নির্ভর করে
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +86,Opportunity Lost,সুযোগ হারিয়েছে
 DocType: Features Setup,"Discount Fields will be available in Purchase Order, Purchase Receipt, Purchase Invoice","ছাড়ের ক্ষেত্র ক্রয় আদেশ, কেনার রসিদ, ক্রয় চালান মধ্যে উপলব্ধ করা হবে"
@@ -2667,16 +2568,15 @@
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,শতকরা বরাদ্দ 100% সমান হওয়া উচিত
 DocType: Serial No,Out of AMC,এএমসি আউট
 DocType: Purchase Order Item,Material Request Detail No,উপাদানের জন্য অনুরোধ বিস্তারিত কোন
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +97,Hard turning,হার্ড বাঁক
 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 +79,Company (not Customer or Supplier) master.,কোম্পানি (না গ্রাহক বা সরবরাহকারীর) মাস্টার.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +106,Please enter 'Expected Delivery Date',&#39;প্রত্যাশিত প্রসবের তারিখ&#39; দয়া করে প্রবেশ করুন
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +187,Delivery Notes {0} must be cancelled before cancelling this Sales Order,প্রসবের নোট {0} এই সেলস অর্ডার বাতিলের আগে বাতিল করা হবে
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +100,Please enter 'Expected Delivery Date',&#39;প্রত্যাশিত প্রসবের তারিখ&#39; দয়া করে প্রবেশ করুন
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +182,Delivery Notes {0} must be cancelled before cancelling this Sales Order,প্রসবের নোট {0} এই সেলস অর্ডার বাতিলের আগে বাতিল করা হবে
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +373,Paid amount + Write Off Amount can not be greater than Grand Total,প্রদত্ত পরিমাণ পরিমাণ সর্বমোট তার চেয়ে অনেক বেশী হতে পারে না বন্ধ লিখুন + +
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} আইটেম জন্য একটি বৈধ ব্যাচ নম্বর নয় {1}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,Note: There is not enough leave balance for Leave Type {0},উল্লেখ্য: ছুটি টাইপ জন্য যথেষ্ট ছুটি ভারসাম্য নেই {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +124,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,সুযোগ ধরন
@@ -2688,7 +2588,7 @@
 DocType: Hub Settings,Publish Availability,সহজলভ্যতা প্রকাশ
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +105,Date of Birth cannot be greater than today.,জন্ম তারিখ আজ তার চেয়ে অনেক বেশী হতে পারে না.
 ,Stock Ageing,শেয়ার বুড়ো
-apps/erpnext/erpnext/controllers/accounts_controller.py +200,{0} '{1}' is disabled,{0} &#39;{1}&#39; নিষ্ক্রিয় করা হয়
+apps/erpnext/erpnext/controllers/accounts_controller.py +201,{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.,জমা লেনদেনের পরিচিতিতে স্বয়ংক্রিয় ইমেল পাঠান.
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +232,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
@@ -2697,44 +2597,38 @@
 DocType: Purchase Order,Customer Contact Email,গ্রাহক যোগাযোগ ইমেইল
 DocType: Event,Sunday,রবিবার
 DocType: Sales Team,Contribution (%),অবদান (%)
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +455,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,উল্লেখ্য: পেমেন্ট ভুক্তি থেকে তৈরি করা হবে না &#39;ক্যাশ বা ব্যাংক একাউন্ট&#39; উল্লেখ করা হয়নি
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +171,Responsibilities,দায়িত্ব
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +457,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,উল্লেখ্য: পেমেন্ট ভুক্তি থেকে তৈরি করা হবে না &#39;ক্যাশ বা ব্যাংক একাউন্ট&#39; উল্লেখ করা হয়নি
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +171,Responsibilities,দায়িত্ব
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,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,টেবিলের অন্তত 1 চালান লিখুন দয়া করে
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +511,Add Users,ব্যবহারকারী যুক্ত করুন
+apps/erpnext/erpnext/public/js/setup_wizard.js +255,Add Users,ব্যবহারকারী যুক্ত করুন
 DocType: Pricing Rule,Item Group,আইটেমটি গ্রুপ
 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),কর ও চার্জ যোগ (কোম্পানি একক)
-apps/erpnext/erpnext/stock/doctype/item/item.py +340,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,আইটেমটি ট্যাক্স সারি {0} টাইপ ট্যাক্স বা আয় বা ব্যয় বা প্রদেয় এর একাউন্ট থাকতে হবে
+apps/erpnext/erpnext/stock/doctype/item/item.py +344,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,আইটেমটি ট্যাক্স সারি {0} টাইপ ট্যাক্স বা আয় বা ব্যয় বা প্রদেয় এর একাউন্ট থাকতে হবে
 DocType: Sales Order,Partly Billed,আংশিক দেখানো হয়েছিল
 DocType: Item,Default BOM,ডিফল্ট BOM
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +79,Decambering,Decambering
 apps/erpnext/erpnext/setup/doctype/company/company.js +22,Please re-type company name to confirm,পুনরায় টাইপ কোম্পানি নাম নিশ্চিত অনুগ্রহ
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,মোট বিশিষ্ট মাসিক
 DocType: Time Log Batch,Total Hours,মোট ঘণ্টা
 DocType: Journal Entry,Printing Settings,মুদ্রণ সেটিংস
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +268,Total Debit must be equal to Total Credit. The difference is {0},মোট ডেবিট মোট ক্রেডিট সমান হতে হবে. পার্থক্য হল {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +11,Automotive,স্বয়ংচালিত
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +37,Item is required,আইটেম প্রয়োজন বোধ করা হয়
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +25,Metal injection molding,মেটাল ইনজেকশন ছাঁচনির্মাণ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +258,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/accounts/doctype/sales_invoice/sales_invoice.js +684,From Delivery Note,ডেলিভারি নোট থেকে
 DocType: Time Log,From Time,সময় থেকে
 DocType: Notification Control,Custom Message,নিজস্ব বার্তা
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +33,Investment Banking,বিনিয়োগ ব্যাংকিং
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +261,"Select your Country, Time Zone and Currency","আপনার দেশ, সময় মন্ডল ও মুদ্রা নির্বাচন"
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,বিনিয়োগ ব্যাংকিং
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +316,"Select your Country, Time Zone and Currency","আপনার দেশ, সময় মন্ডল ও মুদ্রা নির্বাচন"
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +369,Cash or Bank Account is mandatory for making payment entry,ক্যাশ বা ব্যাংক একাউন্ট পেমেন্ট এন্ট্রি করার জন্য বাধ্যতামূলক
 DocType: Purchase Invoice,Price List Exchange Rate,মূল্য তালিকা বিনিময় হার
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +91,Pickling,Pickling
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +18,Sand casting,বালি ঢালাই
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +117,Electroplating,তাড়িতলেপন
 DocType: Purchase Invoice Item,Rate,হার
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +62,Intern,অন্তরীণ করা
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Intern,অন্তরীণ করা
 DocType: Newsletter,A Lead with this email id should exist,এই ইমেইল আইডি দিয়ে লিড বিদ্যমান উচিত
 DocType: Stock Entry,From BOM,BOM থেকে
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +34,Basic,মৌলিক
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +34,Basic,মৌলিক
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,{0} নিথর হয় আগে স্টক লেনদেন
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +217,Please click on 'Generate Schedule',&#39;নির্মাণ সূচি&#39; তে ক্লিক করুন
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +61,To Date should be same as From Date for Half Day leave,জন্ম অর্ধদিবস ছুটি তারিখ থেকে একই হতে হবে
@@ -2742,10 +2636,10 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +96,Reference No is mandatory if you entered Reference Date,আপনি রেফারেন্স তারিখ প্রবেশ যদি রেফারেন্স কোন বাধ্যতামূলক
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +108,Date of Joining must be greater than Date of Birth,যোগদান তারিখ জন্ম তারিখ থেকে বড় হওয়া উচিত
 DocType: Salary Structure,Salary Structure,বেতন কাঠামো
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +242,"Multiple Price Rule exists with same criteria, please resolve \
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +246,"Multiple Price Rule exists with same criteria, please resolve \
 			conflict by assigning priority. Price Rules: {0}","একাধিক মূল্য রুল একই মানদণ্ডের সঙ্গে বিদ্যমান, অগ্রাধিকার বরাদ্দ দ্বারা \ দ্বন্দ্ব সমাধান করুন. দাম বিধি: {0}"
 DocType: Account,Bank,ব্যাংক
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +9,Airline,বিমানসংস্থা
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,বিমানসংস্থা
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +493,Issue Material,ইস্যু উপাদান
 DocType: Material Request Item,For Warehouse,গুদাম জন্য
 DocType: Employee,Offer Date,অপরাধ তারিখ
@@ -2755,29 +2649,24 @@
 DocType: Item,Is Fixed Asset Item,পরিসম্পদ আইটেম
 DocType: Stock Entry,Including items for sub assemblies,সাব সমাহারকে জিনিস সহ
 DocType: Features Setup,"If you have long print formats, this feature can be used to split the page to be printed on multiple pages with all headers and footers on each page","আপনি দীর্ঘ মুদ্রণ বিন্যাস আছে, এই বৈশিষ্ট্য প্রতিটি পেজে সব শিরোলেখ এবং পাদলেখ সঙ্গে একাধিক পাতায় ছাপা হবে পাতা বিভক্ত করতে ব্যবহার করা যেতে পারে"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +131,Hobbing,Hobbing
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +98,All Territories,সমস্ত অঞ্চল
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +98,All Territories,সমস্ত অঞ্চল
 DocType: Purchase Invoice,Items,চলছে
 DocType: Fiscal Year,Year Name,সাল নাম
 DocType: Process Payroll,Process Payroll,প্রক্রিয়া বেতনের
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +59,There are more holidays than working days this month.,কার্যদিবসের তুলনায় আরো ছুটির এই মাস আছে.
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +68,There are more holidays than working days this month.,কার্যদিবসের তুলনায় আরো ছুটির এই মাস আছে.
 DocType: Product Bundle Item,Product Bundle Item,পণ্য সমষ্টি আইটেম
 DocType: Sales Partner,Sales Partner Name,বিক্রয় অংশীদার নাম
 DocType: Purchase Invoice Item,Image View,চিত্র দেখুন
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +113,Finishing & industrial finishing,সমাপ্তি ও শিল্প সমাপ্তি
 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/page/setup_wizard/fixtures/industry_type.py +46,Securities & Commodity Exchanges,সিকিউরিটিজ ও পণ্য বিনিময়ের
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,সিকিউরিটিজ ও পণ্য বিনিময়ের
 DocType: Shipping Rule,Calculate Based On,ভিত্তি করে গণনা
 DocType: Delivery Note Item,From Warehouse,গুদাম থেকে
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +98,Drilling,তুরপুন
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +28,Blow molding,ঘা ঢালাই
 DocType: Purchase Taxes and Charges,Valuation and Total,মূল্যনির্ধারণ এবং মোট
 DocType: Tax Rule,Shipping City,শিপিং সিটি
 apps/erpnext/erpnext/stock/doctype/item/item.js +43,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,"এই আইটেম {0} (টেমপ্লেট) একটি বৈকল্পিক. &#39;কোন কপি করো&#39; সেট করা হয়, যদি না আরোপ টেমপ্লেট থেকে কপি করা হবে"
 DocType: Account,Purchase User,ক্রয় ব্যবহারকারী
 DocType: Notification Control,Customize the Notification,বিজ্ঞপ্তি কাস্টমাইজ করুন
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +87,Hammering,বিধ্বস্ত
 DocType: Web Page,Slideshow,ছবি
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +24,Default Address Template cannot be deleted,ডিফল্ট ঠিকানা টেমপ্লেট মোছা যাবে না
 DocType: Sales Invoice,Shipping Rule,শিপিং রুল
@@ -2785,10 +2674,9 @@
 DocType: Quotation,Maintenance Manager,রক্ষণাবেক্ষণ ব্যাবস্থাপক
 DocType: Workflow State,Search,অনুসন্ধান
 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,&#39;শেষ আদেশ থেকে দিনের&#39; শূন্য এর চেয়ে বড় বা সমান হতে হবে
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +142,Brazing,Brazing
+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,'সর্বশেষ অর্ডার থেকে এখন পর্যন্ত হওয়া দিনের সংখ্যা' শূন্য এর চেয়ে বড় বা সমান হতে হবে
 DocType: C-Form,Amended From,সংশোধিত
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Raw Material,কাঁচামাল
+apps/erpnext/erpnext/public/js/setup_wizard.js +359,Raw Material,কাঁচামাল
 DocType: Leave Application,Follow via Email,ইমেইলের মাধ্যমে অনুসরণ করুন
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,ছাড়ের পরিমাণ পরে ট্যাক্স পরিমাণ
 apps/erpnext/erpnext/accounts/doctype/account/account.py +174,Child account exists for this account. You can not delete this account.,শিশু অ্যাকাউন্ট এই অ্যাকাউন্টের জন্য বিদ্যমান. আপনি এই অ্যাকাউন্ট মুছে ফেলতে পারবেন না.
@@ -2802,10 +2690,10 @@
 ,Produced,উত্পাদিত
 DocType: Item,Item Code for Suppliers,সরবরাহকারীদের জন্য আইটেম কোড
 DocType: Issue,Raised By (Email),দ্বারা উত্থাপিত (ইমেইল)
-apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +72,General,সাধারণ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +495,Attach Letterhead,লেটারহেড সংযুক্ত
+apps/erpnext/erpnext/setup/setup_wizard/default_website.py +72,General,সাধারণ
+apps/erpnext/erpnext/public/js/setup_wizard.js +241,Attach Letterhead,লেটারহেড সংযুক্ত
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +272,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',বিভাগ &#39;মূল্যনির্ধারণ&#39; বা &#39;মূল্যনির্ধারণ এবং মোট&#39; জন্য যখন বিয়োগ করা যাবে
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +542,"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/public/js/setup_wizard.js +284,"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}
 DocType: Journal Entry,Bank Entry,ব্যাংক এণ্ট্রি
 DocType: Authorization Rule,Applicable To (Designation),প্রযোজ্য (পদবী)
@@ -2814,32 +2702,31 @@
 apps/erpnext/erpnext/config/accounts.py +143,Enable / disable currencies.,/ নিষ্ক্রিয় মুদ্রা সক্রিয় করুন.
 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)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +26,Entertainment & Leisure,বিনোদন ও অবকাশ
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,বিনোদন ও অবকাশ
 DocType: Purchase Order,The date on which recurring order will be stop,আবর্তক অর্ডার বন্ধ করা হবে কোন তারিখে
 DocType: Quality Inspection,Item Serial No,আইটেম সিরিয়াল কোন
 apps/erpnext/erpnext/controllers/status_updater.py +142,{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 +57,Total Present,মোট বর্তমান
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Hour,ঘন্টা
+apps/erpnext/erpnext/public/js/setup_wizard.js +363,Hour,ঘন্টা
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +138,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation",ধারাবাহিকভাবে আইটেম {0} শেয়ার রিকনসিলিয়েশন ব্যবহার \ আপডেট করা যাবে না
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +488,Transfer Material to Supplier,সরবরাহকারী উপাদান স্থানান্তর
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +513,Transfer Material to Supplier,সরবরাহকারী উপাদান স্থানান্তর
 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/crm/doctype/opportunity/opportunity.js +82,Create Quotation,উদ্ধৃতি তৈরি
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +306,All these items have already been invoiced,এই সব জিনিস ইতিমধ্যে invoiced হয়েছে
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,You are not authorized to approve leaves on Block Dates,আপনি ব্লক তারিখগুলি উপর পাতার অনুমোদন যথাযথ অনুমতি নেই
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +311,All these items have already been invoiced,এই সব জিনিস ইতিমধ্যে 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,প্রতিস্থাপন পরে নতুন BOM
 DocType: Features Setup,Point of Sale,বিক্রয় বিন্দু
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +83,Curling,কুঁচিতকরণ
 DocType: Account,Tax,কর
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +28,Row {0}: {1} is not a valid {2},সারি {0}: {1} একটি বৈধ নয় {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +89,Refining,বিশোধক
+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,উৎপাদন পরিকল্পনা টুল
 DocType: Quality Inspection,Report Date,প্রতিবেদন তারিখ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +130,Routing,রাউটিং
 DocType: C-Form,Invoices,চালান
 DocType: Job Opening,Job Title,কাজের শিরোনাম
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +54,{0} already allocated for Employee {1} for period {2} - {3},{0} ইতিমধ্যে সময়ের জন্য কর্মচারী {1} জন্য বরাদ্দ {2} - {3}
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +80,{0} Recipients,{0} প্রাপক
 DocType: Features Setup,Item Groups in Details,বিবরণ আইটেম গ্রুপ
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +335,Quantity to Manufacture must be greater than 0.,প্রস্তুত পরিমাণ 0 থেকে বড় হওয়া উচিত.
@@ -2857,14 +2744,13 @@
 DocType: DocType,Setup,সেটআপ
 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,এই মাস এবং স্থগিত কার্যক্রম জন্য সারসংক্ষেপ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +39,Cold rolling,কোল্ড রোলিং
 DocType: Customer Group,Customer Group Name,গ্রাহক গ্রুপ নাম
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +408,Please remove this Invoice {0} from C-Form {1},সি-ফরম থেকে এই চালান {0} মুছে ফেলুন দয়া করে {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +410,Please remove this Invoice {0} from C-Form {1},সি-ফরম থেকে এই চালান {0} মুছে ফেলুন দয়া করে {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,আরোপ করা
 DocType: Packing Slip,Get Items,জানানোর পান
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +186,Please enter Write Off Account,"অ্যাকাউন্ট বন্ধ লিখতে লিখতে, অনুগ্রহ করে"
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +187,Please enter Write Off Account,"অ্যাকাউন্ট বন্ধ লিখতে লিখতে, অনুগ্রহ করে"
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +71,Last Order Date,শেষ আদেশ তারিখ
 DocType: DocField,Image,ভাবমূর্তি
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +179,Make Excise Invoice,আবগারি চালান করুন
@@ -2874,7 +2760,7 @@
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +146,Operation ID not set,অপারেশন আইডি সেট না
 DocType: Production Order,Planned Start Date,পরিকল্পনা শুরুর তারিখ
 DocType: Serial No,Creation Document Type,ক্রিয়েশন ডকুমেন্ট টাইপ
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +620,Maint. Visit,Maint. দর্শন
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +631,Maint. Visit,Maint. দর্শন
 DocType: Leave Type,Is Encash,ভাঙ্গান হয়
 DocType: Purchase Invoice,Mobile No,মোবাইল নাম্বার
 DocType: Payment Tool,Make Journal Entry,জার্নাল এন্ট্রি করতে
@@ -2882,35 +2768,31 @@
 apps/erpnext/erpnext/controllers/trends.py +257,Project-wise data is not available for Quotation,প্রকল্প-ভিত্তিক তথ্য উদ্ধৃতি জন্য উপলব্ধ নয়
 DocType: Project,Expected End Date,সমাপ্তি প্রত্যাশিত তারিখ
 DocType: Appraisal Template,Appraisal Template Title,মূল্যায়ন টেমপ্লেট শিরোনাম
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +440,Commercial,ব্যবসায়িক
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +378,Commercial,ব্যবসায়িক
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +23,Parent Item {0} must not be a Stock Item,মূল আইটেমটি {0} একটি স্টক আইটেম হবে না
 DocType: Cost Center,Distribution Id,বন্টন আইডি
-apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +14,Awesome Services,জট্টিল সেবা
+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,সরবরাহকারী ঠিকানা
 DocType: Contact Us Settings,Address Line 2,ঠিকানা লাইন ২
 DocType: ToDo,Reference,উল্লেখ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +59,Perforating,বেধক
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,Qty আউট
 apps/erpnext/erpnext/config/accounts.py +128,Rules to calculate shipping amount for a sale,বিধি একটি বিক্রয়ের জন্য শিপিং পরিমাণ নিরূপণ করা
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +29,Series is mandatory,সিরিজ বাধ্যতামূলক
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +28,Financial Services,অর্থনৈতিক সেবা
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,অর্থনৈতিক সেবা
 apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3},{0} অ্যাট্রিবিউট জন্য মূল্য পরিসীমা মধ্যে হতে হবে {1} করার {2} এর মধ্যে বাড়তি {3}
 DocType: Tax Rule,Sales,সেলস
 DocType: Stock Entry Detail,Basic Amount,বেসিক পরিমাণ
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +173,Warehouse required for stock Item {0},গুদাম স্টক আইটেম জন্য প্রয়োজন {0}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +178,Warehouse required for stock Item {0},গুদাম স্টক আইটেম জন্য প্রয়োজন {0}
 DocType: Leave Allocation,Unused leaves,অব্যবহৃত পাতার
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,CR
 DocType: Customer,Default Receivable Accounts,গ্রহনযোগ্য অ্যাকাউন্ট ডিফল্ট
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +102,Sawing,Sawing
 DocType: Tax Rule,Billing State,বিলিং রাজ্য
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +32,Laminating,ল্যামিনেট
 DocType: Item Reorder,Transfer,হস্তান্তর
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +549,Fetch exploded BOM (including sub-assemblies),(সাব-সমাহারগুলি সহ) অপ্রমাণিত BOM পান
 DocType: Authorization Rule,Applicable To (Employee),প্রযোজ্য (কর্মচারী)
 apps/erpnext/erpnext/controllers/accounts_controller.py +101,Due Date is mandatory,দরুন জন্ম বাধ্যতামূলক
 apps/erpnext/erpnext/controllers/item_variant.py +51,Increment for Attribute {0} cannot be 0,অ্যাট্রিবিউট জন্য বর্ধিত {0} 0 হতে পারবেন না
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +143,Sintering,Sintering
 DocType: Journal Entry,Pay To / Recd From,থেকে / Recd যেন পে
 DocType: Naming Series,Setup Series,সেটআপ সিরিজ
 DocType: Supplier,Contact HTML,যোগাযোগ এইচটিএমএল
@@ -2923,7 +2805,6 @@
 DocType: Attendance,Absent,অনুপস্থিত
 DocType: Product Bundle,Product Bundle,পণ্য সমষ্টি
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +180,Row {0}: Invalid reference {1},সারি {0}: অবৈধ উল্লেখ {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +165,Crushing,নিষ্পেষণ
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,কর ও শুল্ক টেমপ্লেট ক্রয়
 DocType: Upload Attendance,Download Template,ডাউনলোড টেমপ্লেট
 DocType: GL Entry,Remarks,মন্তব্য
@@ -2931,14 +2812,12 @@
 DocType: Journal Entry,Write Off Based On,ভিত্তি করে লিখুন বন্ধ
 DocType: Features Setup,POS View,পিওএস দেখুন
 apps/erpnext/erpnext/config/stock.py +38,Installation record for a Serial No.,একটি সিরিয়াল নং জন্য ইনস্টলেশন রেকর্ড
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +9,Continuous casting,একটানা ভোটদান
 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/setup/page/setup_wizard/fixtures/operations.py +80,Cold sizing,কোল্ড নির্ধারন
 DocType: Salary Slip,Earning & Deduction,রোজগার &amp; সিদ্ধান্তগ্রহণ
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +76,Account {0} cannot be a Group,অ্যাকাউন্ট {0} একটি গ্রুপ হতে পারে না
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +259,Region,এলাকা
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +314,Region,এলাকা
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +213,Optional. This setting will be used to filter in various transactions.,ঐচ্ছিক. এই সেটিং বিভিন্ন লেনদেন ফিল্টার ব্যবহার করা হবে.
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +104,Negative Valuation Rate is not allowed,নেতিবাচক মূল্যনির্ধারণ হার অনুমোদিত নয়
 DocType: Holiday List,Weekly Off,সাপ্তাহিক ছুটি
@@ -2956,7 +2835,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,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,জন্ম তারিখ এবং উপস্থিত এ্যাটেনডেন্স বাধ্যতামূলক
-apps/erpnext/erpnext/controllers/buying_controller.py +131,Please enter 'Is Subcontracted' as Yes or No,হ্যাঁ অথবা না হিসাবে &#39;আউটসোর্স থাকলে&#39; দয়া করে প্রবেশ করুন
+apps/erpnext/erpnext/controllers/buying_controller.py +122,Please enter 'Is Subcontracted' as Yes or No,হ্যাঁ অথবা না হিসাবে &#39;আউটসোর্স থাকলে&#39; দয়া করে প্রবেশ করুন
 DocType: Sales Team,Contact No.,যোগাযোগের নম্বর.
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,'Profit and Loss' type account {0} not allowed in Opening Entry,এন্ট্রি খোলা অনুমোদিত নয় &#39;লাভ ও ক্ষতি&#39; টাইপ অ্যাকাউন্ট {0}
 DocType: Workflow State,Time,সময়
@@ -2965,14 +2844,13 @@
 DocType: Authorization Rule,Authorization Rule,অনুমোদন রুল
 DocType: Sales Invoice,Terms and Conditions Details,শর্তাবলী বিস্তারিত
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,বিক্রয় করের এবং চার্জ টেমপ্লেট
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +10,Apparel & Accessories,পোশাক ও আনুষাঙ্গিক
+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,অর্ডার সংখ্যা
 DocType: Item Group,HTML / Banner that will show on the top of product list.,পণ্য তালিকার শীর্ষে প্রদর্শন করবে এইচটিএমএল / ব্যানার.
 DocType: Shipping Rule,Specify conditions to calculate shipping amount,শিপিং পরিমাণ নিরূপণ শর্ত নির্দিষ্ট
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +121,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/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +47,Conversion Factor is required,রূপান্তর ফ্যাক্টর প্রয়োজন বোধ করা হয়
 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,মূল্য / বিবরণ:
@@ -2980,10 +2858,8 @@
 ,Customers Not Buying Since Long Time,গ্রাহকদের দীর্ঘ সময় থেকে কেনা হয় না
 DocType: Production Order,Expected Delivery Date,প্রত্যাশিত প্রসবের তারিখ
 apps/erpnext/erpnext/accounts/general_ledger.py +121,Debit and Credit not equal for {0} #{1}. Difference is {2}.,ডেবিট ও ক্রেডিট {0} # জন্য সমান নয় {1}. পার্থক্য হল {2}.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +48,Bulging,স্ফীত
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +11,Evaporative-pattern casting,বাষ্পীভবনের-প্যাটার্ন ঢালাই
 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 +195,Sales Invoice {0} must be cancelled before cancelling this Sales Order,এই সেলস অর্ডার বাতিলের আগে চালান {0} বাতিল করতে হবে বিক্রয়
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +190,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 তুলনায় বড় হওয়া উচিত.
@@ -3002,26 +2878,24 @@
 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 +241,Account: {0} with currency: {1} can not be selected,অ্যাকাউন্ট: {0} একক সঙ্গে: {1} নির্বাচন করা যাবে না
+apps/erpnext/erpnext/controllers/accounts_controller.py +242,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 +47,Account {0}: Parent account {1} does not belong to company: {2},অ্যাকাউন্ট {0}: মূল অ্যাকাউন্ট {1} কোম্পানি অন্তর্গত নয়: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted all transactions related to this company!,সফলভাবে এই কোম্পানীর সাথে সম্পর্কিত সব লেনদেন মোছা!
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,আজকের তারিখে
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +111,Honing,Honing
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +58,Probation,পরীক্ষাকাল
-apps/erpnext/erpnext/stock/doctype/item/item.py +264,Default Warehouse is mandatory for stock Item.,ডিফল্ট গুদাম স্টক আইটেম জন্য বাধ্যতামূলক.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Probation,পরীক্ষাকাল
+apps/erpnext/erpnext/stock/doctype/item/item.py +268,Default Warehouse is mandatory for stock Item.,ডিফল্ট গুদাম স্টক আইটেম জন্য বাধ্যতামূলক.
 DocType: Feed,Full Name,পুরো নাম
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +148,Clinching,সমর্থন
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +191,Payment of salary for the month {0} and year {1},মাসের জন্য বেতন পরিশোধ {0} এবং বছরের {1}
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +173,Payment of salary for the month {0} and year {1},মাসের জন্য বেতন পরিশোধ {0} এবং বছরের {1}
 DocType: Stock Settings,Auto insert Price List rate if missing,অটো সন্নিবেশ মূল্য তালিকা হার অনুপস্থিত যদি
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,মোট প্রদত্ত পরিমাণ
 ,Transferred Qty,স্থানান্তর করা Qty
 apps/erpnext/erpnext/config/learn.py +11,Navigating,সমুদ্রপথে
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +137,Planning,পরিকল্পনা
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +137,Planning,পরিকল্পনা
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +9,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),মোট বিলিং পরিমাণ (সময় লগসমূহ মাধ্যমে)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +629,We sell this Item,আমরা এই আইটেম বিক্রয়
+apps/erpnext/erpnext/public/js/setup_wizard.js +365,We sell this Item,আমরা এই আইটেম বিক্রয়
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +65,Supplier Id,সরবরাহকারী আইডি
 DocType: Journal Entry,Cash Entry,ক্যাশ এণ্ট্রি
 DocType: Sales Partner,Contact Desc,যোগাযোগ নিম্নক্রমে
@@ -3030,18 +2904,16 @@
 DocType: Brand,Item Manager,আইটেম ম্যানেজার
 DocType: Cost Center,Add rows to set annual budgets on Accounts.,হিসাব বার্ষিক বাজেটের সেট সারি করো.
 DocType: Buying Settings,Default Supplier Type,ডিফল্ট সরবরাহকারী ধরন
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +160,Quarrying,Quarrying
 DocType: Production Order,Total Operating Cost,মোট অপারেটিং খরচ
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +160,Note: Item {0} entered multiple times,উল্লেখ্য: আইটেম {0} একাধিক বার প্রবেশ
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +163,Note: Item {0} entered multiple times,উল্লেখ্য: আইটেম {0} একাধিক বার প্রবেশ
 apps/erpnext/erpnext/config/crm.py +27,All Contacts.,সকল যোগাযোগ.
 DocType: Newsletter,Test Email Id,টেস্ট ইমেইল আইডি
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +394,Company Abbreviation,কোম্পানি সমাহার
+apps/erpnext/erpnext/public/js/setup_wizard.js +142,Company Abbreviation,কোম্পানি সমাহার
 DocType: Features Setup,If you follow Quality Inspection. Enables Item QA Required and QA No in Purchase Receipt,দ্বারা বিষয় কঠোর মান পরিদর্শন অনুসরণ করে. কেনার রসিদ মধ্যে কোন আইটেম কিউএ প্রয়োজনীয় এবং QA সক্ষম করে
 DocType: GL Entry,Party Type,পার্টি শ্রেণী
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +68,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} সীমা অতিক্রম করে, যেহেতু authroized না"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +30,Rotational molding,আবর্তনশীল ছাঁচনির্মাণ
 apps/erpnext/erpnext/config/hr.py +115,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,শপিং কার্ট জন্য সেট করের রুল
@@ -3055,15 +2927,15 @@
 apps/erpnext/erpnext/config/selling.py +18,Quotes to Leads or Customers.,বিশালাকার বা গ্রাহকরা কোট.
 DocType: Stock Settings,Role Allowed to edit frozen stock,ভূমিকা হিমায়িত শেয়ার সম্পাদনা করতে পারবেন
 ,Territory Target Variance Item Group-Wise,টেরিটরি উদ্দিষ্ট ভেদাংক আইটেমটি গ্রুপ-প্রজ্ঞাময়
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +101,All Customer Groups,সকল গ্রাহকের গ্রুপ
-apps/erpnext/erpnext/controllers/accounts_controller.py +474,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} বাধ্যতামূলক. হয়তো মুদ্রা বিনিময় রেকর্ড {1} {2} করার জন্য তৈরি করা হয় না.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +101,All Customer Groups,সকল গ্রাহকের গ্রুপ
+apps/erpnext/erpnext/controllers/accounts_controller.py +475,{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 +41,Account {0}: Parent account {1} does not exist,অ্যাকাউন্ট {0}: মূল অ্যাকাউন্ট {1} অস্তিত্ব নেই
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),মূল্যতালিকা হার (কোম্পানি একক)
 DocType: Account,Temporary,অস্থায়ী
 DocType: Address,Preferred Billing Address,পছন্দের বিলিং ঠিকানা
 DocType: Monthly Distribution Percentage,Percentage Allocation,শতকরা বরাদ্দ
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +86,Secretary,সম্পাদক
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Secretary,সম্পাদক
 DocType: Serial No,Distinct unit of an Item,একটি আইটেম এর স্বতন্ত্র ইউনিট
 DocType: Pricing Rule,Buying,ক্রয়
 DocType: HR Settings,Employee Records to be created by,কর্মচারী রেকর্ড করে তৈরি করা
@@ -3076,38 +2948,35 @@
 ,Item-wise Price List Rate,আইটেম-জ্ঞানী মূল্য তালিকা হার
 DocType: Purchase Order Item,Supplier Quotation,সরবরাহকারী উদ্ধৃতি
 DocType: Quotation,In Words will be visible once you save the Quotation.,আপনি উধৃতি সংরক্ষণ একবার শব্দ দৃশ্যমান হবে.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +68,Ironing,Ironing
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is stopped,{0} {1} থামানো হয়
-apps/erpnext/erpnext/stock/doctype/item/item.py +352,Barcode {0} already used in Item {1},বারকোড {0} ইতিমধ্যে আইটেম ব্যবহৃত {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +356,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/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,আসন্ন ঘটনাবলী
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,গ্রাহক প্রয়োজন বোধ করা হয়
 DocType: Letter Head,Letter Head,চিঠি মাথা
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +27,Quick Entry,দ্রুত এন্ট্রি
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0} ফিরুন বাধ্যতামূলক
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0} ফিরার জন্য বাধ্যতামূলক
 DocType: Purchase Order,To Receive,গ্রহণ করতে
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +33,Shrink fitting,ফিটিং সঙ্কুচিত
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +522,user@example.com,user@example.com
+apps/erpnext/erpnext/public/js/setup_wizard.js +266,user@example.com,user@example.com
 DocType: Email Digest,Income / Expense,আয় / ব্যয়
 DocType: Employee,Personal Email,ব্যক্তিগত ইমেইল
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +58,Total Variance,মোট ভেদাংক
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +62,Total Variance,মোট ভেদাংক
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.","সক্রিয় করা হলে, সিস্টেম স্বয়ংক্রিয়ভাবে পরিসংখ্যা জন্য অ্যাকাউন্টিং এন্ট্রি পোস্ট করতে হবে."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +15,Brokerage,দালালি
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +15,Brokerage,দালালি
 DocType: Address,Postal Code,পোস্ট অফিসের নাম্বার
 DocType: Production Order Operation,"in Minutes
 Updated via 'Time Log'",মিনিটের মধ্যে &#39;টাইম ইন&#39; র মাধ্যমে আপডেট
 DocType: Customer,From Lead,লিড
 apps/erpnext/erpnext/config/manufacturing.py +19,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 +442,POS Profile required to make POS Entry,পিওএস প্রোফাইল পিওএস এন্ট্রি করতে প্রয়োজন
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +444,POS Profile required to make POS Entry,পিওএস প্রোফাইল পিওএস এন্ট্রি করতে প্রয়োজন
 DocType: Hub Settings,Name Token,নাম টোকেন
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +106,Planing,Planing
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Selling,স্ট্যান্ডার্ড বিক্রি
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +120,Standard Selling,স্ট্যান্ডার্ড বিক্রি
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +137,Atleast one warehouse is mandatory,অন্তত একটি গুদাম বাধ্যতামূলক
 DocType: Serial No,Out of Warranty,পাটা আউট
 DocType: BOM Replace Tool,Replace,প্রতিস্থাপন করা
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +314,{0} against Sales Invoice {1},{0} বিক্রয় চালান বিরুদ্ধে {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +316,{0} against Sales Invoice {1},{0} বিক্রয় চালান বিরুদ্ধে {1}
 apps/erpnext/erpnext/stock/doctype/item/item.py +49,Please enter default Unit of Measure,মেজার ডিফল্ট ইউনিট লিখুন দয়া করে
 DocType: Purchase Invoice Item,Project Name,প্রকল্পের নাম
 DocType: Supplier,Mention if non-standard receivable account,উল্লেখ অ স্ট্যান্ডার্ড প্রাপ্য তাহলে
@@ -3123,9 +2992,8 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,Journal Entry {0} does not have account {1} or already matched against other voucher,জার্নাল এন্ট্রি {0} {1} বা ইতিমধ্যে অন্যান্য ভাউচার বিরুদ্ধে মিলেছে অ্যাকাউন্ট নেই
 DocType: Item,Moving Average,চলন্ত গড়
 DocType: BOM Replace Tool,The BOM which will be replaced,"প্রতিস্থাপন করা হবে, যা BOM"
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +43,New Stock UOM must be different from current stock UOM,নতুন শেয়ার UOM বর্তমান স্টক UOM থেকে আলাদা হতে হবে
 DocType: Account,Debit,ডেবিট
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +34,Leaves must be allocated in multiples of 0.5,পাতার 0.5 এর গুণিতক বরাদ্দ করা আবশ্যক
+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/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,বিশিষ্ট মাসিক
@@ -3143,8 +3011,7 @@
 DocType: Employee,Internal Work History,অভ্যন্তরীণ কাজের ইতিহাস
 DocType: DocField,Column Break,কলাম বিরতি
 DocType: Event,Thursday,বৃহস্পতিবার
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +42,Private Equity,ব্যক্তিগত মালিকানা
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +93,Turning,বাঁক
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,ব্যক্তিগত মালিকানা
 DocType: Maintenance Visit,Customer Feedback,গ্রাহকের প্রতিক্রিয়া
 DocType: Account,Expense,ব্যয়
 DocType: Sales Invoice,Exhibition,প্রদর্শনী
@@ -3157,19 +3024,19 @@
 DocType: Employee,Held On,অনুষ্ঠিত
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +33,Production Item,উত্পাদনের আইটেম
 ,Employee Information,কর্মচারী তথ্য
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,Rate (%),হার (%)
+apps/erpnext/erpnext/public/js/setup_wizard.js +294,Rate (%),হার (%)
 DocType: Stock Entry Detail,Additional Cost,অতিরিক্ত খরচ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +407,Financial Year End Date,আর্থিক বছরের শেষ তারিখ
+apps/erpnext/erpnext/public/js/setup_wizard.js +155,Financial Year End Date,আর্থিক বছরের শেষ তারিখ
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Voucher No, if grouped by Voucher","ভাউচার কোন উপর ভিত্তি করে ফিল্টার করতে পারবে না, ভাউচার দ্বারা গ্রুপকৃত যদি"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +484,Make Supplier Quotation,সরবরাহকারী উদ্ধৃতি করা
 DocType: Quality Inspection,Incoming,ইনকামিং
 DocType: BOM,Materials Required (Exploded),উপকরণ (অপ্রমাণিত) প্রয়োজন
 DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),বিনা বেতনে ছুটি জন্য আদায় হ্রাস (LWP)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +512,"Add users to your organization, other than yourself","নিজেকে ছাড়া অন্য, আপনার প্রতিষ্ঠানের ব্যবহারকারীদের যুক্ত করুন"
+apps/erpnext/erpnext/public/js/setup_wizard.js +256,"Add users to your organization, other than yourself","নিজেকে ছাড়া অন্য, আপনার প্রতিষ্ঠানের ব্যবহারকারীদের যুক্ত করুন"
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No {1} does not match with {2} {3},সারি # {0}: সিরিয়াল কোন {1} সঙ্গে মেলে না {2} {3}
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +44,Casual Leave,নৈমিত্তিক ছুটি
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +44,Casual Leave,নৈমিত্তিক ছুটি
 DocType: Batch,Batch ID,ব্যাচ আইডি
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +334,Note: {0},উল্লেখ্য: {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +336,Note: {0},উল্লেখ্য: {0}
 ,Delivery Note Trends,হুণ্ডি প্রবণতা
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +104,This Week's Summary,এই সপ্তাহের সংক্ষিপ্ত
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +74,{0} must be a Purchased or Sub-Contracted Item in row {1},{0} সারিতে একটি ক্রয় বা উপ-সংকুচিত আইটেম হতে হবে {1}
@@ -3181,7 +3048,7 @@
 DocType: Purchase Receipt,Return Against Purchase Receipt,কেনার রসিদ বিরুদ্ধে ফিরে
 DocType: Purchase Order,To Bill,বিল
 DocType: Material Request,% Ordered,% আদেশ
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +61,Piecework,ফুরণ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Piecework,ফুরণ
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +64,Avg. Buying Rate,গড়. রাজধানীতে হার
 DocType: Task,Actual Time (in Hours),(ঘন্টায়) প্রকৃত সময়
 DocType: Employee,History In Company,কোম্পানি ইন ইতিহাস
@@ -3198,13 +3065,13 @@
 DocType: Opportunity,To Discuss,আলোচনা করতে
 DocType: SMS Settings,SMS Settings,এসএমএস সেটিংস
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +60,Temporary Accounts,অস্থায়ী অ্যাকাউন্ট
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +155,Black,কালো
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Black,কালো
 DocType: BOM Explosion Item,BOM Explosion Item,BOM বিস্ফোরণ আইটেম
 DocType: Account,Auditor,নিরীক্ষক
 DocType: Purchase Order,End date of current order's period,বর্তমান অর্ডারের সময়ের শেষ তারিখ
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +17,Make Offer Letter,অফার লেটার করুন
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +10,Return,প্রত্যাবর্তন
-apps/erpnext/erpnext/stock/doctype/item/item.py +503,Default Unit of Measure for Variant must be same as Template,বৈকল্পিক জন্য মেজার ডিফল্ট ইউনিট টেমপ্লেট হিসাবে একই হতে হবে
+apps/erpnext/erpnext/stock/doctype/item/item.py +507,Default Unit of Measure for Variant must be same as Template,বৈকল্পিক জন্য মেজার ডিফল্ট ইউনিট টেমপ্লেট হিসাবে একই হতে হবে
 DocType: DocField,Fold,ভাঁজ
 DocType: Production Order Operation,Production Order Operation,উৎপাদন অর্ডার অপারেশন
 DocType: Pricing Rule,Disable,অক্ষম
@@ -3215,13 +3082,12 @@
 DocType: Page,Page Name,পৃষ্ঠার নাম
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +110,To Time must be greater than From Time,সময় সময় থেকে তার চেয়ে অনেক বেশী করা আবশ্যক
 DocType: Journal Entry Account,Exchange Rate,বিনিময় হার
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +465,Sales Order {0} is not submitted,বিক্রয় আদেশ {0} দাখিল করা হয় না
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +467,Sales Order {0} is not submitted,বিক্রয় আদেশ {0} দাখিল করা হয় না
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0}: Parent account {1} does not bolong to the company {2},ওয়ারহাউস {0}: মূল অ্যাকাউন্ট {1} কোম্পানী bolong না {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +124,Spindle finishing,টাকু সমাপ্তি
 DocType: BOM,Last Purchase Rate,শেষ কেনার হার
 DocType: Account,Asset,সম্পদ
 DocType: Project Task,Task ID,টাস্ক আইডি
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +395,"e.g. ""MC""",যেমন &quot;এমসি&quot;
+apps/erpnext/erpnext/public/js/setup_wizard.js +143,"e.g. ""MC""",যেমন &quot;এমসি&quot;
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,Stock cannot exist for Item {0} since has variants,আইটেম জন্য উপস্থিত হতে পারে না শেয়ার {0} থেকে ভিন্নতা আছে
 ,Sales Person-wise Transaction Summary,সেলস পারসন অনুসার লেনদেন সংক্ষিপ্ত
 DocType: System Settings,Time Zone,সময় অঞ্চল
@@ -3230,9 +3096,7 @@
 DocType: Monthly Distribution,Monthly Distribution Percentages,মাসিক বন্টন শতকরা
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +16,The selected item cannot have Batch,নির্বাচিত আইটেমের ব্যাচ থাকতে পারে না
 DocType: Delivery Note,% of materials delivered against this Delivery Note,উপকরণ% এই হুণ্ডি বিরুদ্ধে বিতরণ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +151,Stapling,Stapling
 DocType: Customer,Customer Details,কাস্টমার বিস্তারিত
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +105,Shaping,রুপায়ণ
 DocType: Employee,Reports to,রিপোর্ট হতে
 DocType: SMS Settings,Enter url parameter for receiver nos,রিসিভার আমরা জন্য URL প্যারামিটার লিখুন
 DocType: Sales Invoice,Paid Amount,দেওয়া পরিমাণ
@@ -3241,15 +3105,15 @@
 DocType: Item Variant,Item Variant,আইটেম ভেরিয়েন্ট
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +15,Setting this Address Template as default as there is no other default,অন্য কোন ডিফল্ট আছে হিসাবে ডিফল্ট হিসেবে এই ঠিকানায় টেমপ্লেট সেটিং
 apps/erpnext/erpnext/accounts/doctype/account/account.py +89,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","ইতিমধ্যে ডেবিট অ্যাকাউন্ট ব্যালেন্স, আপনি &#39;ক্রেডিট&#39; হিসেবে &#39;ব্যালেন্স করতে হবে&#39; সেট করার অনুমতি দেওয়া হয় না"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +76,Quality Management,গুনমান ব্যবস্থাপনা
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Quality Management,গুনমান ব্যবস্থাপনা
 DocType: Production Planning Tool,Filter based on customer,ফিল্টার গ্রাহক উপর ভিত্তি করে
 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}
 DocType: Employee External Work History,Employee External Work History,কর্মচারী বাহ্যিক কাজের ইতিহাস
 DocType: Tax Rule,Purchase,ক্রয়
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +34,Balance Qty,ব্যালেন্স Qty
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Balance Qty,ব্যালেন্স Qty
 DocType: Item Group,Parent Item Group,মূল আইটেমটি গ্রুপ
-apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +21,{0} for {1},{0} জন্য {1}
+apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +21,{0} for {1},{1} এর জন্য {0}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +96,Cost Centers,খরচ কেন্দ্র
 apps/erpnext/erpnext/config/stock.py +115,Warehouses.,ওয়ারহাউস.
 DocType: Purchase Receipt,Rate at which supplier's currency is converted to company's base currency,যা সরবরাহকারী মুদ্রার হারে কোম্পানির বেস কারেন্সি রূপান্তরিত হয়
@@ -3257,12 +3121,12 @@
 DocType: Opportunity,Next Contact,পরবর্তী যোগাযোগ
 DocType: Employee,Employment Type,কর্মসংস্থান প্রকার
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,নির্দিষ্ট পরিমান সম্পত্তি
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +84,Application period cannot be across two alocation records,আবেদনের সময় দুই alocation রেকর্ড জুড়ে হতে পারে না
 DocType: Item Group,Default Expense Account,ডিফল্ট ব্যায়ের অ্যাকাউন্ট
 DocType: Employee,Notice (days),নোটিশ (দিন)
 DocType: Page,Yes,হাঁ
 DocType: Tax Rule,Sales Tax Template,সেলস ট্যাক্স টেমপ্লেট
 DocType: Employee,Encashment Date,নগদীকরণ তারিখ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +74,Electroforming,Electroforming
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +179,"Against Voucher Type must be one of Purchase Order, Purchase Invoice or Journal Entry","ভাউচার বিরুদ্ধে প্রকার ক্রয় আদেশ এক, ক্রয় চালান বা জার্নাল এন্ট্রিতে হতে হবে"
 DocType: Account,Stock Adjustment,শেয়ার সামঞ্জস্য
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +34,Default Activity Cost exists for Activity Type - {0},ডিফল্ট কার্যকলাপ খরচ কার্যকলাপ টাইপ জন্য বিদ্যমান - {0}
@@ -3298,12 +3162,12 @@
 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,বিতরণ
 apps/erpnext/erpnext/public/js/pos/pos.html +36,Amount Paid,পরিমাণ অর্থ প্রদান করা
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +91,Project Manager,প্রকল্প ব্যবস্থাপক
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +72,Dispatch,প্রাণবধ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Project Manager,প্রকল্প ব্যবস্থাপক
+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: Customer,Default Taxes and Charges,ডিফল্ট কর ও শুল্ক
 DocType: Account,Receivable,প্রাপ্য
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +268,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,সারি # {0}: ক্রয় আদেশ ইতিমধ্যেই বিদ্যমান হিসাবে সরবরাহকারী পরিবর্তন করার অনুমতি নেই
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +263,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 কাঁচামাল পাওয়ার জন্য বিবেচনা করা হবে. অন্যথা, সব সাব-সমাবেশ জিনিস কাঁচামাল হিসেবে গণ্য করা হবে."
@@ -3311,8 +3175,8 @@
 DocType: Hub Settings,Seller Description,বিক্রেতা বিবরণ
 DocType: Employee Education,Qualification,যোগ্যতা
 DocType: Item Price,Item Price,আইটেমের মূল্য
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +48,Soap & Detergent,সাবান ও ডিটারজেন্ট
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +36,Motion Picture & Video,মোশন পিকচার ও ভিডিও
+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,আদেশ
 DocType: Warehouse,Warehouse Name,ওয়ারহাউস নাম
 DocType: Naming Series,Select Transaction,নির্বাচন লেনদেন
@@ -3321,7 +3185,6 @@
 DocType: BOM,Rate Of Materials Based On,হার উপকরণ ভিত্তি করে
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,সাপোর্ট Analtyics
 apps/erpnext/erpnext/accounts/doctype/accounts_settings/accounts_settings.py +27,Company is missing in warehouses {0},কোম্পানি গুদাম অনুপস্থিত {0}
-DocType: Stock UOM Replace Utility,Stock UOM Replace Utility,শেয়ার UOM উপযোগীতা প্রতিস্থাপন
 DocType: POS Profile,Terms and Conditions,শর্তাবলী
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,To Date should be within the Fiscal Year. Assuming To Date = {0},তারিখ রাজস্ব বছরের মধ্যে হতে হবে. = জন্ম Assuming {0}
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","এখানে আপনি ইত্যাদি উচ্চতা, ওজন, এলার্জি, ঔষধ উদ্বেগ স্থাপন করতে পারে"
@@ -3333,7 +3196,7 @@
 DocType: Sales Order Item,For Production,উত্পাদনের জন্য
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +103,Please enter sales order in the above table,উপরে টেবিল বিক্রয় আদেশ লিখুন দয়া করে
 DocType: Project Task,View Task,দেখুন টাস্ক
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +406,Your financial year begins on,তোমার আর্থিক বছরের শুরু
+apps/erpnext/erpnext/public/js/setup_wizard.js +154,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: Email Digest,Add/Remove Recipients,প্রাপক Add / Remove
@@ -3341,16 +3204,14 @@
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'",", ডিফল্ট হিসাবে চলতি অর্থবছরেই সেট করতে &#39;ডিফল্ট হিসাবে সেট করুন&#39; ক্লিক করুন"
 apps/erpnext/erpnext/config/support.py +54,Setup incoming server for support email id. (e.g. support@example.com),সমর্থন ইমেল আইডি জন্য সেটআপ ইনকামিং সার্ভার. (যেমন support@example.com)
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,ঘাটতি Qty
-apps/erpnext/erpnext/stock/doctype/item/item.py +528,Item variant {0} exists with same attributes,আইটেম বৈকল্পিক {0} একই বৈশিষ্ট্যাবলী সঙ্গে বিদ্যমান
+apps/erpnext/erpnext/stock/doctype/item/item.py +532,Item variant {0} exists with same attributes,আইটেম বৈকল্পিক {0} একই বৈশিষ্ট্যাবলী সঙ্গে বিদ্যমান
 DocType: Salary Slip,Salary Slip,বেতন পিছলানো
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +116,Burnishing,Burnishing
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +54,'To Date' is required,&#39;তারিখ&#39; প্রয়োজন বোধ করা হয়
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,'তারিখ পর্যন্ত' প্রয়োজন
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","প্যাকেজ বিতরণ করা জন্য স্লিপ বোঁচকা নির্মাণ করা হয়. বাক্স সংখ্যা, প্যাকেজের বিষয়বস্তু এবং তার ওজন অবহিত করা."
 DocType: Sales Invoice Item,Sales Order Item,সেলস অর্ডার আইটেমটি
 DocType: Salary Slip,Payment Days,পেমেন্ট দিন
 DocType: BOM,Manage cost of operations,অপারেশনের খরচ পরিচালনা
 DocType: Features Setup,Item Advanced,আইটেম উন্নত
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +40,Hot rolling,হট ঢালাই
 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.","চেক লেনদেনের কোনো &quot;জমা&quot; করা হয়, তখন একটি ইমেল পপ-আপ স্বয়ংক্রিয়ভাবে একটি সংযুক্তি হিসাবে লেনদেনের সঙ্গে, যে লেনদেনে যুক্ত &quot;যোগাযোগ&quot; একটি ইমেল পাঠাতে খোলা. ব্যবহারকারী may অথবা ইমেইল পাঠাতে পারে."
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,গ্লোবাল সেটিংস
 DocType: Employee Education,Employee Education,কর্মচারী শিক্ষা
@@ -3363,25 +3224,23 @@
 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/setup/page/setup_wizard/install_fixtures.py +48,Sick Leave,অসুস্থতাজনিত ছুটি
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +174,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/page/setup_wizard/fixtures/industry_type.py +22,Department Stores,ডিপার্টমেন্ট স্টোর
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,ডিপার্টমেন্ট স্টোর
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +40,System Balance,সিস্টেম ব্যালেন্স
 DocType: Workflow,Is Active,সক্রিয়
 apps/erpnext/erpnext/controllers/stock_controller.py +71,No accounting entries for the following warehouses,নিম্নলিখিত গুদাম জন্য কোন হিসাব এন্ট্রি
 apps/erpnext/erpnext/projects/doctype/project/project.js +22,Save the document first.,প্রথম নথি সংরক্ষণ করুন.
 DocType: Account,Chargeable,প্রদেয়
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +121,Linishing,Linishing
 DocType: Company,Change Abbreviation,পরিবর্তন সমাহার
 DocType: Workflow State,Primary,প্রাথমিক
 DocType: Expense Claim Detail,Expense Date,ব্যয় তারিখ
 DocType: Item,Max Discount (%),সর্বোচ্চ ছাড় (%)
 DocType: Communication,More Information,অধিক তথ্য
 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/setup/page/setup_wizard/fixtures/operations.py +161,Blasting,লোকসান
 DocType: Company,Warn,সতর্ক করো
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +111,Item valuation updated,আইটেম মূল্যনির্ধারণ আপডেট
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","অন্য কোন মন্তব্য, রেকর্ড মধ্যে যেতে হবে যে উল্লেখযোগ্য প্রচেষ্টা."
 DocType: BOM,Manufacturing User,উৎপাদন ব্যবহারকারী
 DocType: Purchase Order,Raw Materials Supplied,কাঁচামালের সরবরাহ
@@ -3391,7 +3250,7 @@
 DocType: Appraisal,Appraisal Template,মূল্যায়ন টেমপ্লেট
 DocType: Communication,Email,ইমেইল
 DocType: Item Group,Item Classification,আইটেম সাইট
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +89,Business Development Manager,ব্যবসা উন্নয়ন ব্যবস্থাপক
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Business Development Manager,ব্যবসা উন্নয়ন ব্যবস্থাপক
 DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,রক্ষণাবেক্ষণ যান উদ্দেশ্য
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.js +15,Period,কাল
 ,General Ledger,জেনারেল লেজার
@@ -3401,9 +3260,7 @@
 ,Itemwise Recommended Reorder Level,Itemwise রেকর্ডার শ্রেনী প্রস্তাবিত
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +264,Please select {0} first,প্রথম {0} দয়া করে নির্বাচন করুন
 DocType: Features Setup,To get Item Group in details table,বিবরণ টেবিলে আইটেম গ্রুপ পেতে
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +67,Redrawing,Redrawing
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +112,Batch {0} of Item {1} has expired.,আইটেম এর ব্যাচ {0} {1} মেয়াদ শেষ হয়ে গেছে.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +120,Etching,নকশাকাটা
 DocType: Sales Invoice,Commission,কমিশন
 DocType: Address Template,"<h4>Default Template</h4>
 <p>Uses <a href=""http://jinja.pocoo.org/docs/templates/"">Jinja Templating</a> and all the fields of Address (including Custom Fields if any) will be available</p>
@@ -3437,7 +3294,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +340,Operation Time must be greater than 0 for Operation {0},অপারেশন টাইম অপারেশন জন্য তার চেয়ে অনেক বেশী 0 হতে হবে {0}
 DocType: Supplier,Address and Contacts,ঠিকানা এবং পরিচিতি
 DocType: UOM Conversion Detail,UOM Conversion Detail,UOM রূপান্তর বিস্তারিত
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +496,Keep it web friendly 900px (w) by 100px (h),100px দ্বারা এটি (W) ওয়েব বান্ধব 900px রাখুন (H)
+apps/erpnext/erpnext/public/js/setup_wizard.js +242,Keep it web friendly 900px (w) by 100px (h),100px দ্বারা এটি (W) ওয়েব বান্ধব 900px রাখুন (H)
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +329,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,বিশিষ্ট ভাউচার পেতে
@@ -3453,54 +3310,49 @@
 DocType: Item,Average time taken by the supplier to deliver,সরবরাহকারী কর্তৃক গৃহীত মাঝামাঝি সময় বিলি
 DocType: Time Log,Hours,ঘন্টা
 DocType: Project,Expected Start Date,প্রত্যাশিত স্টার্ট তারিখ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +38,Rolling,ঘূর্ণায়মান
 DocType: ToDo,Priority,অগ্রাধিকার
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +41,Remove item if charges is not applicable to that item,চার্জ যে আইটেমটি জন্য প্রযোজ্য নয় যদি আইটেমটি মুছে ফেলুন
 DocType: Dropbox Backup,Dropbox Access Allowed,ড্রপবক্স অ্যাক্সেস অনুমতি
 DocType: Dropbox Backup,Weekly,সাপ্তাহিক
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,যেমন. smsgateway.com/api/send_sms.cgi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +485,Receive,গ্রহণ করা
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +510,Receive,গ্রহণ করা
 DocType: Maintenance Visit,Fully Completed,সম্পূর্ণরূপে সম্পন্ন
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% সমাপ্তি
 DocType: Employee,Educational Qualification,শিক্ষাগত যোগ্যতা
 DocType: Workstation,Operating Costs,অপারেটিং খরচ
 DocType: Employee Leave Approver,Employee Leave Approver,কর্মী ছুটি রাজসাক্ষী
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,{0} has been successfully added to our Newsletter list.,{0} সফলভাবে আমাদের নিউজলেটার তালিকায় যুক্ত হয়েছে.
-apps/erpnext/erpnext/stock/doctype/item/item.py +383,Row {0}: An Reorder entry already exists for this warehouse {1},সারি {0}: একটি রেকর্ডার এন্ট্রি ইতিমধ্যে এই গুদাম জন্য বিদ্যমান {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +387,Row {0}: An Reorder entry already exists for this warehouse {1},সারি {0}: একটি রেকর্ডার এন্ট্রি ইতিমধ্যে এই গুদাম জন্য বিদ্যমান {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +67,"Cannot declare as lost, because Quotation has been made.","উদ্ধৃতি দেয়া হয়েছে, কারণ যত হারিয়ে ডিক্লেয়ার করতে পারেন না."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +133,Electron beam machining,ইলেক্ট্রন মরীচি যন্ত্র
 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 +150,Please select Start Date and End Date for Item {0},আইটেম জন্য আরম্ভের তারিখ ও শেষ তারিখ নির্বাচন করুন {0}
 apps/erpnext/erpnext/config/stock.py +141,Main Reports,প্রধান প্রতিবেদন
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +102,Stock Ledger entries balances updated,স্টক লেজার আপডেট ব্যালেন্স এন্ট্রি
 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 +176,Add / Edit Prices,/ সম্পাদনা বর্ণনা করো
+apps/erpnext/erpnext/stock/doctype/item/item.js +178,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 +298,My Orders,আমার আদেশ
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +293,My Orders,আমার আদেশ
 DocType: Price List,Price List Name,মূল্যতালিকা নাম
 DocType: Time Log,For Manufacturing,উৎপাদনের জন্য
-apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +70,Totals,সমগ্র
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +174,Totals,সমগ্র
 DocType: BOM,Manufacturing,উৎপাদন
 ,Ordered Items To Be Delivered,আদেশ আইটেম বিতরণ করা
 DocType: Account,Income,আয়
 ,Setup Wizard,ঐন্দ্রজালি সংযুক্ত করা
 DocType: Industry Type,Industry Type,শিল্প শ্রেণী
 apps/erpnext/erpnext/templates/includes/cart.js +137,Something went wrong!,কিছু ভুল হয়েছে!
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +68,Warning: Leave application contains following block dates,সতর্কতা: ছুটি আবেদন নিম্নলিখিত ব্লক তারিখ রয়েছে
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +251,Sales Invoice {0} has already been submitted,চালান {0} ইতিমধ্যেই জমা দেওয়া হয়েছে বিক্রয়
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +100,Warning: Leave application contains following block dates,সতর্কতা: ছুটি আবেদন নিম্নলিখিত ব্লক তারিখ রয়েছে
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +256,Sales Invoice {0} has already been submitted,চালান {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/setup/page/setup_wizard/fixtures/operations.py +10,Die casting,মরা ঢালাই
 DocType: Email Alert,Reference Date,রেফারেন্স তারিখ
 apps/erpnext/erpnext/config/hr.py +105,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,পাঠানোর আগে বার্তা লিখতে
 DocType: Async Task,Status,অবস্থা
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +65,Stock UOM updated for Item {0},শেয়ার UOM আইটেম জন্য আপডেট {0}
 DocType: Company History,Year,বছর
 apps/erpnext/erpnext/config/accounts.py +127,Point-of-Sale Profile,পয়েন্ট অফ বিক্রয় প্রোফাইল
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +68,Please Update SMS Settings,এসএমএস সেটিংস আপডেট করুন
@@ -3514,12 +3366,12 @@
 ,Serial No Service Contract Expiry,সিরিয়াল কোন সার্ভিস চুক্তি মেয়াদ উত্তীর্ন
 DocType: Item,Unit of Measure Conversion,পরিমাপ রূপান্তর ইউনিট
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +86,Employee can not be changed,কর্মচারী পরিবর্তন করা যাবে না
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +259,You cannot credit and debit same account at the same time,আপনি ক্রেডিট এবং একই সময়ে একই অ্যাকাউন্ট ডেবিট পারবেন না
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,You cannot credit and debit same account at the same time,আপনি ক্রেডিট এবং একই সময়ে একই অ্যাকাউন্ট ডেবিট পারবেন না
 DocType: Naming Series,Help HTML,হেল্প এইচটিএমএল
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},100% হওয়া উচিত নির্ধারিত মোট গুরুত্ব. এটা হল {0}
 apps/erpnext/erpnext/controllers/status_updater.py +140,Allowance for over-{0} crossed for Item {1},{0} আইটেম জন্য পার ওভার জন্য ভাতা {1}
 DocType: Address,Name of person or organization that this address belongs to.,এই অঙ্ক জন্যে যে ব্যক্তি বা প্রতিষ্ঠানের নাম.
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +587,Your Suppliers,আপনার সরবরাহকারীদের
+apps/erpnext/erpnext/public/js/setup_wizard.js +325,Your Suppliers,আপনার সরবরাহকারীদের
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,বিক্রয় আদেশ তৈরি করা হয় যেমন বিচ্ছিন্ন সেট করা যায় না.
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +65,Another Salary Structure {0} is active for employee {1}. Please make its status 'Inactive' to proceed.,আরেকটি বেতন কাঠামো {0} কর্মচারীর জন্য সক্রিয় {1}. তার অবস্থা &#39;নিষ্ক্রিয়&#39; এগিয়ে যাওয়ার জন্য দয়া করে নিশ্চিত করুন.
 DocType: Purchase Invoice,Contact,যোগাযোগ
@@ -3527,38 +3379,36 @@
 DocType: Lead,Converted,ধর্মান্তরিত
 DocType: Item,Has Serial No,সিরিয়াল কোন আছে
 DocType: Employee,Date of Issue,প্রদান এর তারিখ
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +16,{0}: From {0} for {1},{0}: থেকে {0} জন্য {1}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +154,Row #{0}: Set Supplier for item {1},সারি # {0}: আইটেমের জন্য সেট সরবরাহকারী {1}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +16,{0}: From {0} for {1},{0}: {0} থেকে {1} এর জন্য 
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +149,Row #{0}: Set Supplier for item {1},সারি # {0}: আইটেমের জন্য সেট সরবরাহকারী {1}
 DocType: Issue,Content Type,কোন ধরনের
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +17,Computer,কম্পিউটার
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,কম্পিউটার
 DocType: Item,List this Item in multiple groups on the website.,ওয়েবসাইটে একাধিক গ্রুপ এই আইটেম তালিকা.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +283,Please check Multi Currency option to allow accounts with other currency,অন্যান্য মুদ্রা হিসাব অনুমতি মাল্টি মুদ্রা বিকল্প চেক করুন
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +285,Please check Multi Currency option to allow accounts with other currency,অন্যান্য মুদ্রা হিসাব অনুমতি মাল্টি মুদ্রা বিকল্প চেক করুন
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +62,Item: {0} does not exist in the system,আইটেম: {0} সিস্টেমের মধ্যে উপস্থিত না
 apps/erpnext/erpnext/accounts/doctype/account/account.py +81,You are not authorized to set Frozen value,আপনি হিমায়িত মূল্য নির্ধারণ করার জন্য অনুমতিপ্রাপ্ত নন
 DocType: Payment Reconciliation,Get Unreconciled Entries,অসমর্পিত এন্ট্রি পেতে
 DocType: Cost Center,Budgets,বাজেট
 apps/frappe/frappe/core/page/modules_setup/modules_setup.py +11,Updated,আপডেট করা হয়েছে
 DocType: Employee,Emergency Contact Details,জরুরী যোগাযোগের তথ্য
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +396,What does it do?,এটার কাজ কি?
+apps/erpnext/erpnext/public/js/setup_wizard.js +144,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,গড় কমিশন হার
-apps/erpnext/erpnext/stock/doctype/item/item.py +313,'Has Serial No' can not be 'Yes' for non-stock item,&#39;হ্যাঁ&#39; হতে অ স্টক আইটেম জন্য না পারেন &#39;সিরিয়াল কোন হয়েছে&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +317,'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/setup/page/setup_wizard/install_fixtures.py +111,Electrical,বৈদ্যুতিক
+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 +302,Row {0}: Exchange Rate is mandatory,সারি {0}: বিনিময় হার বাধ্যতামূলক
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +304,Row {0}: Exchange Rate is mandatory,সারি {0}: বিনিময় হার বাধ্যতামূলক
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},ইউজার আইডি কর্মচারী জন্য নির্ধারণ করে না {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +72,Peening,Peening
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,From Warranty Claim,পাটা দাবি
 DocType: Stock Entry,Default Source Warehouse,ডিফল্ট সোর্স ওয়্যারহাউস
 DocType: Item,Customer Code,গ্রাহক কোড
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +212,Birthday Reminder for {0},জন্য জন্মদিনের স্মারক {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +163,Lapping,চাপান
-apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.js +8,Days Since Last Order,শেষ আদেশ থেকে দিনের
+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 +299,Debit To account must be a Balance Sheet account,অ্যাকাউন্ট ডেবিট একটি ব্যালান্স শিটের অ্যাকাউন্ট থাকতে হবে
 DocType: Buying Settings,Naming Series,নামকরণ সিরিজ
 DocType: Leave Block List,Leave Block List Name,ব্লক তালিকা নাম
@@ -3572,7 +3422,7 @@
 DocType: Notification Control,Sales Invoice Message,বিক্রয় চালান পাঠান
 DocType: Authorization Rule,Based On,উপর ভিত্তি করে
 DocType: Sales Order Item,Ordered Qty,আদেশ Qty
-apps/erpnext/erpnext/stock/doctype/item/item.py +539,Item {0} is disabled,আইটেম {0} নিষ্ক্রিয় করা হয়
+apps/erpnext/erpnext/stock/doctype/item/item.py +543,Item {0} is disabled,আইটেম {0} নিষ্ক্রিয় করা হয়
 DocType: Stock Settings,Stock Frozen Upto,শেয়ার হিমায়িত পর্যন্ত
 apps/erpnext/erpnext/controllers/recurring_document.py +166,Period From and Period To dates mandatory for recurring {0},থেকে এবং আবর্তক সময়সীমার জন্য বাধ্যতামূলক তারিখ সময়ের {0}
 apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,প্রকল্পের কার্যকলাপ / টাস্ক.
@@ -3582,7 +3432,6 @@
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,বাট্টা কম 100 হতে হবে
 DocType: ToDo,Low,কম
 DocType: Purchase Invoice,Write Off Amount (Company Currency),পরিমাণ বন্ধ লিখুন (কোম্পানি একক)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +71,Spinning,কাটনা
 DocType: Landed Cost Voucher,Landed Cost Voucher,ল্যান্ড কস্ট ভাউচার
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +55,Please set {0},সেট করুন {0}
 DocType: Purchase Invoice,Repeat on Day of Month,মাস দিন পুনরাবৃত্তি
@@ -3594,7 +3443,7 @@
 DocType: Employee External Work History,Salary,বেতন
 DocType: Serial No,Delivery Document Type,ডেলিভারি ডকুমেন্ট টাইপ
 DocType: Process Payroll,Submit all salary slips for the above selected criteria,উপরে নির্বাচিত মানদণ্ডের জন্য সব বেতন স্লিপ জমা
-apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +93,{0} Items synced,{0} চলছে সিঙ্ক
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +93,{0} Items synced,{0} জিনিসসমূহ সিঙ্ক করা হয়েছে 
 DocType: Sales Order,Partly Delivered,আংশিক বিতরণ
 DocType: Sales Invoice,Existing Customer,অবশিষ্ট ক্রেতা
 DocType: Email Digest,Receivables,সম্ভাব্য
@@ -3604,7 +3453,6 @@
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +37,Campaign Name is required,প্রচারাভিযান নাম প্রয়োজন বোধ করা হয়
 DocType: Maintenance Visit,Maintenance Date,রক্ষণাবেক্ষণ তারিখ
 DocType: Purchase Receipt Item,Rejected Serial No,প্রত্যাখ্যাত সিরিয়াল কোন
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +51,Deep drawing,ডিপ অঙ্কন
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +40,New Newsletter,নতুন নিউজলেটার
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +157,Start date should be less than end date for Item {0},আইটেম জন্য শেষ তারিখ চেয়ে কম হওয়া উচিত তারিখ শুরু {0}
 apps/erpnext/erpnext/stock/doctype/item/item.js +17,Show Balance,দেখান ব্যালেন্স
@@ -3614,7 +3462,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +119,BOM and Manufacturing Quantity are required,BOM ও উৎপাদন পরিমাণ প্রয়োজন হয়
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,বুড়ো বিন্যাস 2
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +450,Amount,পরিমাণ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +147,Riveting,Riveting
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,BOM প্রতিস্থাপিত
 ,Sales Analytics,বিক্রয় বিশ্লেষণ
 DocType: Manufacturing Settings,Manufacturing Settings,উৎপাদন সেটিংস
@@ -3626,20 +3473,19 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +207,New Account Name,নতুন অ্যাকাউন্ট নাম
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,কাঁচামালের সরবরাহ খরচ
 DocType: Selling Settings,Settings for Selling Module,মডিউল বিক্রী জন্য সেটিংস
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +73,Customer Service,গ্রাহক সেবা
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Customer Service,গ্রাহক সেবা
 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.,অপরাধ প্রার্থী একটি কাজের.
 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 +70,Item {0} must be a stock Item,আইটেম {0} একটি স্টক আইটেম হতে হবে
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,প্রগতি গুদাম ডিফল্ট কাজ
 apps/erpnext/erpnext/config/accounts.py +107,Default settings for accounting transactions.,অ্যাকাউন্টিং লেনদেনের জন্য ডিফল্ট সেটিংস.
-apps/frappe/frappe/model/naming.py +40,{0} is required,{0} প্রয়োজন বোধ করা হয়
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +21,Vacuum molding,ভ্যাকুয়াম ছাঁচনির্মাণ
+apps/frappe/frappe/model/naming.py +40,{0} is required,{0} প্রয়োজন 
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,প্রত্যাশিত তারিখ উপাদান অনুরোধ তারিখের আগে হতে পারে না
 DocType: Contact Us Settings,City,শহর
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +132,Ultrasonic machining,শ্রুতির যন্ত্র
 apps/frappe/frappe/templates/base.html +137,Error: Not a valid id?,ত্রুটি: একটি বৈধ আইডি?
 apps/erpnext/erpnext/stock/get_item_details.py +125,Item {0} must be a Sales Item,আইটেম {0} একটি সেলস পেইজ হতে হবে
 DocType: Naming Series,Update Series Number,আপডেট সিরিজ সংখ্যা
@@ -3647,7 +3493,7 @@
 DocType: Sales Order,Printing Details,মুদ্রণ বিস্তারিত
 DocType: Task,Closing Date,বন্ধের তারিখ
 DocType: Sales Order Item,Produced Quantity,উত্পাদিত পরিমাণ
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +84,Engineer,ইঞ্জিনিয়ার
+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 +379,Item Code required at Row No {0},আইটেম কোড সারি কোন সময়ে প্রয়োজনীয় {0}
 DocType: Sales Partner,Partner Type,সাথি ধরন
@@ -3655,7 +3501,7 @@
 DocType: Authorization Rule,Customerwise Discount,Customerwise ছাড়
 DocType: Purchase Invoice,Against Expense Account,ব্যয় অ্যাকাউন্টের বিরুদ্ধে
 DocType: Production Order,Production Order,উৎপাদন অর্ডার
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +258,Installation Note {0} has already been submitted,ইনস্টলেশন উল্লেখ্য {0} ইতিমধ্যেই জমা দেওয়া হয়েছে
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +263,Installation Note {0} has already been submitted,ইনস্টলেশন উল্লেখ্য {0} ইতিমধ্যেই জমা দেওয়া হয়েছে
 DocType: Quotation Item,Against Docname,Docname বিরুদ্ধে
 DocType: SMS Center,All Employee (Active),সকল কর্মচারী (অনলাইনে)
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,এখন দেখুন
@@ -3664,19 +3510,19 @@
 DocType: Item,Re-Order Level,পুনর্বিন্যাস স্তর
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,"আপনি প্রকাশনা আদেশ বাড়াতে বা বিশ্লেষণের জন্য কাঁচামাল ডাউনলোড করতে চান, যার জন্য জিনিস এবং পরিকল্পনা Qty লিখুন."
 apps/frappe/frappe/public/js/frappe/views/ganttview.js +45,Gantt Chart,Gantt চার্ট
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +57,Part-time,খন্ডকালীন
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,Part-time,খন্ডকালীন
 DocType: Employee,Applicable Holiday List,প্রযোজ্য ছুটির তালিকা
 DocType: Employee,Cheque,চেক
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,সিরিজ আপডেট
 apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Report Type is mandatory,প্রতিবেদন প্রকার বাধ্যতামূলক
 DocType: Item,Serial Number Series,ক্রমিক সংখ্যা সিরিজ
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},ওয়্যারহাউস সারিতে স্টক আইটেম {0} জন্য বাধ্যতামূলক {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +45,Retail & Wholesale,খুচরা পাইকারি
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,খুচরা পাইকারি
 DocType: Issue,First Responded On,প্রথম প্রতিক্রিয়া
 DocType: Website Item Group,Cross Listing of Item in multiple groups,একাধিক গ্রুপ আইটেমের ক্রস তালিকা
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +351,The First User: You,প্রথম ব্যবহারকারী: আপনি
+apps/erpnext/erpnext/public/js/setup_wizard.js +101,The First User: You,প্রথম ব্যবহারকারী: আপনি
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +48,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 +172,Successfully Reconciled,সফলভাবে মীমাংসা
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +119,Successfully Reconciled,সফলভাবে মীমাংসা
 DocType: Production Order,Planned End Date,পরিকল্পনা শেষ তারিখ
 apps/erpnext/erpnext/config/stock.py +43,Where items are stored.,আইটেম কোথায় সংরক্ষণ করা হয়.
 DocType: Tax Rule,Validity,বৈধতা
@@ -3696,39 +3542,36 @@
 DocType: DocPerm,Level,শ্রেনী
 DocType: Purchase Taxes and Charges,On Net Total,একুন উপর
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +160,Target warehouse in row {0} must be same as Production Order,{0} সারিতে উদ্দিষ্ট গুদাম উৎপাদন অর্ডার হিসাবে একই হতে হবে
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +59,No permission to use Payment Tool,কোন অনুমতি পেমেন্ট টুল ব্যবহার
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +97,No permission to use Payment Tool,কোন অনুমতি পেমেন্ট টুল ব্যবহার
 apps/erpnext/erpnext/controllers/recurring_document.py +192,'Notification Email Addresses' not specified for recurring %s,% এর আবৃত্ত জন্য নির্দিষ্ট না &#39;সূচনা ইমেল ঠিকানা&#39;
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +86,Milling,মিল
 apps/erpnext/erpnext/accounts/doctype/account/account.py +99,Currency can not be changed after making entries using some other currency,মুদ্রা একক কিছু অন্যান্য মুদ্রা ব্যবহার এন্ট্রি করার পর পরিবর্তন করা যাবে না
 DocType: Company,Round Off Account,অ্যাকাউন্ট বন্ধ বৃত্তাকার
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +60,Nibbling,ঠোকর
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,প্রশাসনিক খরচ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +18,Consulting,পরামর্শকারী
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +18,Consulting,পরামর্শকারী
 DocType: Customer Group,Parent Customer Group,মূল ক্রেতা গ্রুপ
 apps/erpnext/erpnext/public/js/pos/pos.js +429,Change,পরিবর্তন
 DocType: Purchase Invoice,Contact Email,যোগাযোগের ই - মেইল
 DocType: Appraisal Goal,Score Earned,স্কোর অর্জিত
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +393,"e.g. ""My Company LLC""",যেমন &quot;আমার কোম্পানি এলএলসি&quot;
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +173,Notice Period,বিজ্ঞপ্তি সময়কাল
+apps/erpnext/erpnext/public/js/setup_wizard.js +141,"e.g. ""My Company LLC""",যেমন &quot;আমার কোম্পানি এলএলসি&quot;
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +173,Notice Period,বিজ্ঞপ্তি সময়কাল
 DocType: Bank Reconciliation Detail,Voucher ID,ভাউচার আইডি
 apps/erpnext/erpnext/setup/doctype/territory/territory.js +14,This is a root territory and cannot be edited.,এটি একটি root অঞ্চল এবং সম্পাদনা করা যাবে না.
 DocType: Packing Slip,Gross Weight UOM,গ্রস ওজন UOM
 DocType: Email Digest,Receivables / Payables,সম্ভাব্য / Payables
 DocType: Delivery Note Item,Against Sales Invoice,বিক্রয় চালান বিরুদ্ধে
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +63,Stamping,মুদ্রাঙ্কন
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +457,Credit Account,ক্রেডিট অ্যাকাউন্ট
 DocType: Landed Cost Item,Landed Cost Item,ল্যান্ড খরচ আইটেমটি
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +56,Show zero values,শূন্য মান দেখাও
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,আইটেমের পরিমাণ কাঁচামাল দেওয়া পরিমাণে থেকে repacking / উত্পাদন পরে প্রাপ্ত
 DocType: Payment Reconciliation,Receivable / Payable Account,গ্রহনযোগ্য / প্রদেয় অ্যাকাউন্ট
 DocType: Delivery Note Item,Against Sales Order Item,বিক্রয় আদেশ আইটেমটি বিরুদ্ধে
-apps/erpnext/erpnext/stock/doctype/item/item.py +521,Please specify Attribute Value for attribute {0},অ্যাট্রিবিউট মূল্য গুন উল্লেখ করুন {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +525,Please specify Attribute Value for attribute {0},অ্যাট্রিবিউট মূল্য গুন উল্লেখ করুন {0}
 DocType: Item,Default Warehouse,ডিফল্ট ওয়্যারহাউস
 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,পরিমাণ ব্যতীত প্রিন্ট
-apps/erpnext/erpnext/controllers/buying_controller.py +69,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,সব জিনিস অ স্টক আইটেম হিসাবে ট্যাক্স শ্রেণী &#39;মূল্যনির্ধারণ&#39; বা &#39;মূল্যনির্ধারণ এবং মোট&#39; হতে পারে না
+apps/erpnext/erpnext/controllers/buying_controller.py +60,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,সব জিনিস অ স্টক আইটেম হিসাবে ট্যাক্স শ্রেণী &#39;মূল্যনির্ধারণ&#39; বা &#39;মূল্যনির্ধারণ এবং মোট&#39; হতে পারে না
 DocType: User,Last Name,নামের শেষাংশ
 DocType: Web Page,Left,বাম
 DocType: Event,All Day,সারাদিন
@@ -3736,7 +3579,7 @@
 DocType: Appraisal,Total Score (Out of 5),(5 এর মধ্যে) মোট স্কোর
 DocType: Contact Us Settings,State,রাষ্ট্র
 DocType: Batch,Batch,ব্যাচ
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +51,Balance,ভারসাম্য
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +28,Balance,ভারসাম্য
 DocType: Project,Total Expense Claim (via Expense Claims),মোট ব্যয় দাবি (ব্যয় দাবি মাধ্যমে)
 DocType: User,Gender,লিঙ্গ
 DocType: Journal Entry,Debit Note,ডেবিট নোট
@@ -3766,8 +3609,7 @@
 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/setup/page/setup_wizard/fixtures/operations.py +76,Seaming,Seaming
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +197,"Company Email ID not found, hence mail not sent","কোম্পানি ইমেইল আইডি পাওয়া যায়নি, তাই পাঠানো না mail"
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +206,"Company Email ID not found, hence mail not sent","কোম্পানি ইমেইল আইডি পাওয়া যায়নি, তাই পাঠানো না mail"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),ফান্ডস (সম্পদ) এর আবেদন
 DocType: Production Planning Tool,Filter based on item,ফিল্টার আইটেম উপর ভিত্তি করে
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +451,Debit Account,ডেবিট অ্যাকাউন্ট
@@ -3779,18 +3621,17 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +95,{0} {1} has been modified. Please refresh.,{0} {1} নথীটি পরিবর্তিত হয়েছে. রিফ্রেশ করুন.
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,নিম্নলিখিত দিন ছুটি অ্যাপ্লিকেশন তৈরি করা থেকে ব্যবহারকারীদের বিরত থাকুন.
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +591,From Opportunity,সুযোগ থেকে
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +46,Blanking,Blanking
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +166,Employee Benefits,কর্মচারীর সুবিধা
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,Employee Benefits,কর্মচারীর সুবিধা
 DocType: Sales Invoice,Is POS,পিওএস
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +240,Packed quantity must equal quantity for Item {0} in row {1},বস্তাবন্দী পরিমাণ সারিতে আইটেম {0} জন্য পরিমাণ সমান নয় {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +245,Packed quantity must equal quantity for Item {0} in row {1},বস্তাবন্দী পরিমাণ সারিতে আইটেম {0} জন্য পরিমাণ সমান নয় {1}
 DocType: Production Order,Manufactured Qty,শিল্পজাত Qty
 DocType: Purchase Receipt Item,Accepted Quantity,গৃহীত পরিমাণ
-apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} না বিদ্যমান
+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.,গ্রাহকরা উত্থাপিত বিল.
 DocType: DocField,Default,ডিফল্ট
 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 +466,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} গ্রাহকদের যোগ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +468,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} গ্রাহকদের যোগ করা হয়েছে 
 DocType: Maintenance Schedule,Schedule,সময়সূচি
 DocType: Cost Center,"Define Budget for this Cost Center. To set budget action, see ""Company List""","এই খরচ কেন্দ্র বাজেট নির্ধারণ করুন. বাজেটের কর্ম নির্ধারণ করার জন্য, দেখুন &quot;কোম্পানি তালিকা&quot;"
 DocType: Account,Parent Account,মূল অ্যাকাউন্ট
@@ -3800,7 +3641,7 @@
 apps/erpnext/erpnext/public/js/pos/pos.js +91,Price List not found or disabled,মূল্য তালিকা পাওয়া বা প্রতিবন্ধী না
 DocType: Expense Claim,Approved,অনুমোদিত
 DocType: Pricing Rule,Price,মূল্য
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +79,Employee relieved on {0} must be set as 'Left',{0} নির্ধারণ করা আবশ্যক উপর অব্যাহতিপ্রাপ্ত কর্মচারী &#39;বাম&#39; হিসাবে
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +88,Employee relieved on {0} must be set as 'Left',{0} নির্ধারণ করা আবশ্যক উপর অব্যাহতিপ্রাপ্ত কর্মচারী &#39;বাম&#39; হিসাবে
 DocType: Item,"Selecting ""Yes"" will give a unique identity to each entity of this item which can be viewed in the Serial No master.",নির্বাচন &quot;হ্যাঁ&quot; সিরিয়াল কোন মাস্টার দেখা যাবে যা এই আইটেমটি প্রতিটি সত্তা একটি অনন্য পরিচয় দিতে হবে.
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +39,Appraisal {0} created for Employee {1} in the given date range,মূল্যায়ন {0} {1} প্রদত্ত সময়সীমার মধ্যে কর্মচারী জন্য তৈরি
 DocType: Employee,Education,শিক্ষা
@@ -3811,7 +3652,7 @@
 apps/frappe/frappe/desk/moduleview.py +67,Standard Reports,স্ট্যান্ডার্ড প্রতিবেদন
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,অ্যাকাউন্টিং জার্নাল এন্ট্রি.
 DocType: Delivery Note Item,Available Qty at From Warehouse,গুদাম থেকে এ উপলব্ধ Qty
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +209,Please select Employee Record first.,প্রথম কর্মী রেকর্ড নির্বাচন করুন.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +224,Please select Employee Record first.,প্রথম কর্মী রেকর্ড নির্বাচন করুন.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,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 +233,Please enter Expense Account,ব্যয় অ্যাকাউন্ট লিখুন দয়া করে
@@ -3824,46 +3665,43 @@
 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,টানুন বিক্রয় আদেশ উপরে মাপকাঠির ভিত্তিতে (বিলি মুলতুবি)
 DocType: DocShare,Document Type,নথিপত্র ধরণ
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +565,From Supplier Quotation,সরবরাহকারী উদ্ধৃতি থেকে
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +588,From Supplier Quotation,সরবরাহকারী উদ্ধৃতি থেকে
 DocType: Deduction Type,Deduction Type,সিদ্ধান্তগ্রহণ ধরন
 DocType: Attendance,Half Day,অর্ধদিবস
 DocType: Pricing Rule,Min Qty,ন্যূনতম Qty
 DocType: Features Setup,"To track items in sales and purchase documents with batch nos. ""Preferred Industry: Chemicals""",ব্যাচ আমরা বিক্রয় এবং ক্রয় নথিতে আইটেম ট্র্যাক. &quot;পছন্দের শিল্প: কেমিক্যাল&quot;
 DocType: GL Entry,Transaction Date,লেনদেন তারিখ
 DocType: Production Plan Item,Planned Qty,পরিকল্পিত Qty
-apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +91,Total Tax,মোট ট্যাক্স
+apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +93,Total Tax,মোট ট্যাক্স
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +178,For Quantity (Manufactured Qty) is mandatory,পরিমাণ (Qty শিল্পজাত) বাধ্যতামূলক
 DocType: Stock Entry,Default Target Warehouse,ডিফল্ট উদ্দিষ্ট ওয়্যারহাউস
 DocType: Purchase Invoice,Net Total (Company Currency),একুন (কোম্পানি একক)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +79,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,সারি {0}: পার্টি প্রকার ও অনুষ্ঠান গ্রহনযোগ্য / প্রদেয় অ্যাকাউন্ট বিরুদ্ধে শুধুমাত্র প্রযোজ্য
 DocType: Notification Control,Purchase Receipt Message,কেনার রসিদ পাঠান
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +95,Total allocated leaves are more than period,সর্বমোট পাতার সময়ের চেয়ে বেশি হয়
 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.,রেকর্ড আইটেমটি আন্দোলন.
 DocType: Newsletter List Subscriber,Newsletter List Subscriber,নিউজলেটার তালিকা গ্রাহক
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +164,Morticing,Morticing
 DocType: Email Account,Service,সেবা
 DocType: Hub Settings,Hub Settings,হাব সেটিংস
 DocType: Project,Gross Margin %,গ্রস মার্জিন%
 DocType: BOM,With Operations,অপারেশন সঙ্গে
 apps/erpnext/erpnext/accounts/party.py +232,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,হিসাব থেকে ইতিমধ্যে মুদ্রা তৈরি করা হয়েছে {0} কোম্পানির জন্য {1}. মুদ্রা একক সঙ্গে একটি প্রাপ্য বা প্রদেয় অ্যাকাউন্ট নির্বাচন করুন {0}.
 ,Monthly Salary Register,মাসিক বেতন নিবন্ধন
-apps/frappe/frappe/website/template.py +140,Next,পরবর্তী
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard_page.html +17,Next,পরবর্তী
 DocType: Warranty Claim,If different than customer address,গ্রাহক অঙ্ক চেয়ে ভিন্ন যদি
 DocType: BOM Operation,BOM Operation,BOM অপারেশন
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +118,Electropolishing,Electropolishing
 DocType: Purchase Taxes and Charges,On Previous Row Amount,পূর্ববর্তী সারি পরিমাণ
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +24,Please enter Payment Amount in atleast one row,অন্তত একটি সারিতে প্রদেয় টাকার পরিমাণ লিখতে অনুগ্রহ
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +33,Please enter Payment Amount in atleast one row,অন্তত একটি সারিতে প্রদেয় টাকার পরিমাণ লিখতে অনুগ্রহ
 DocType: POS Profile,POS Profile,পিওএস প্রোফাইল
 apps/erpnext/erpnext/config/accounts.py +153,"Seasonality for setting budgets, targets etc.","সেটিং বাজেটের, লক্ষ্যমাত্রা ইত্যাদি জন্য ঋতু"
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +238,Row {0}: Payment Amount cannot be greater than Outstanding Amount,সারি {0}: পেমেন্ট পরিমাণ বকেয়া পরিমাণ তার চেয়ে অনেক বেশী হতে পারে না
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +46,Total Unpaid,অবৈতনিক মোট
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +21,Time Log is not billable,টাইম ইন বিলযোগ্য নয়
 apps/erpnext/erpnext/stock/get_item_details.py +128,"Item {0} is a template, please select one of its variants","{0} আইটেম একটি টেমপ্লেট, তার ভিন্নতা একটি নির্বাচন করুন"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +528,Purchaser,ক্রেতা
+apps/erpnext/erpnext/public/js/setup_wizard.js +272,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 +71,Please enter the Against Vouchers manually,নিজে বিরুদ্ধে ভাউচার লিখুন দয়া করে
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +107,Please enter the Against Vouchers manually,নিজে বিরুদ্ধে ভাউচার লিখুন দয়া করে
 DocType: SMS Settings,Static Parameters,স্ট্যাটিক পরামিতি
 DocType: Purchase Order,Advance Paid,অগ্রিম প্রদত্ত
 DocType: Item,Item Tax,আইটেমটি ট্যাক্স
@@ -3872,14 +3710,12 @@
 apps/erpnext/erpnext/config/crm.py +48,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 +57,Actual Qty is mandatory,প্রকৃত স্টক বাধ্যতামূলক
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +42,Cross-rolling,ক্রস-রোলিং
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +132,Credit Card,ক্রেডিট কার্ড
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +132,Credit Card,ক্রেডিট কার্ড
 DocType: BOM,Item to be manufactured or repacked,আইটেম শিল্পজাত বা repacked করা
 apps/erpnext/erpnext/config/stock.py +95,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,কর ও চার্জ লিখুন দয়া করে
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +85,Machining,যন্ত্র
 DocType: Sales Invoice Item,Drop Ship,ড্রপ জাহাজ
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","এখানে আপনি নামের এবং পিতা বা মাতা, স্ত্রী ও সন্তানদের বৃত্তি মত পরিবার বিবরণ স্থাপন করতে পারে"
 DocType: Hub Settings,Seller Name,বিক্রেতা নাম
@@ -3889,7 +3725,7 @@
 DocType: Stock Entry,Repack,Repack
 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/setup/page/setup_wizard/setup_wizard.js +500,Attach Logo,লোগো সংযুক্ত
+apps/erpnext/erpnext/public/js/setup_wizard.js +246,Attach Logo,লোগো সংযুক্ত
 DocType: Customer,Commission Rate,কমিশন হার
 apps/erpnext/erpnext/stock/doctype/item/item.js +38,Make Variant,ভেরিয়েন্ট করুন
 apps/erpnext/erpnext/config/hr.py +145,Block leave applications by department.,ডিপার্টমেন্ট দ্বারা ব্লক ছেড়ে অ্যাপ্লিকেশন.
@@ -3904,19 +3740,19 @@
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +105,Please select a csv file,একটি CSV ফাইল নির্বাচন করুন
 DocType: Dropbox Backup,Send Backups to Dropbox,ড্রপবক্স ব্যাকআপ পাঠান
 DocType: Purchase Order,To Receive and Bill,জখন এবং বিল থেকে
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +94,Designer,ডিজাইনার
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Designer,ডিজাইনার
 apps/erpnext/erpnext/config/selling.py +121,Terms and Conditions Template,শর্তাবলী টেমপ্লেট
 DocType: Serial No,Delivery Details,প্রসবের বিবরণ
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +383,Cost Center is required in row {0} in Taxes table for type {1},ধরণ জন্য খরচ কেন্দ্র সারিতে প্রয়োজন বোধ করা হয় {0} কর টেবিল {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +386,Cost Center is required in row {0} in Taxes table for type {1},ধরণ জন্য খরচ কেন্দ্র সারিতে প্রয়োজন বোধ করা হয় {0} কর টেবিল {1}
 DocType: Item,Automatically create Material Request if quantity falls below this level,পরিমাণ এই সীমার নিচে পড়ে তাহলে স্বয়ংক্রিয়ভাবে উপাদান অনুরোধ করুন
 ,Item-wise Purchase Register,আইটেম-বিজ্ঞ ক্রয় নিবন্ধন
 DocType: Batch,Expiry Date,মেয়াদ শেষ হওয়ার তারিখ
-apps/erpnext/erpnext/stock/doctype/item/item.py +375,"To set reorder level, item must be a Purchase Item or Manufacturing Item","পুনর্বিন্যাস স্তর সেট করতে, আইটেমটি একটি ক্রয় আইটেম বা উৎপাদন আইটেম হতে হবে"
+apps/erpnext/erpnext/stock/doctype/item/item.py +379,"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.,প্রকল্প মাস্টার.
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,মুদ্রা ইত্যাদি $ মত কোন প্রতীক পরের প্রদর্শন না.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +330, (Half Day),(অর্ধদিবস)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +374, (Half Day),(অর্ধদিবস)
 DocType: Supplier,Credit Days,ক্রেডিট দিন
 DocType: Leave Type,Is Carry Forward,এগিয়ে বহন করা হয়
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +478,Get Items from BOM,BOM থেকে জানানোর পান
@@ -3924,7 +3760,7 @@
 apps/erpnext/erpnext/config/manufacturing.py +120,Bill of Materials,উপকরণ বিল
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +77,Row {0}: Party Type and Party is required for Receivable / Payable account {1},সারি {0}: পার্টি প্রকার ও অনুষ্ঠান গ্রহনযোগ্য / প্রদেয় অ্যাকাউন্টের জন্য প্রয়োজন বোধ করা হয় {1}
 DocType: Dropbox Backup,Send Notifications To,বিজ্ঞপ্তি পাঠান
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html +26,Ref Date,সুত্র তারিখ
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +54,Ref Date,সুত্র তারিখ
 DocType: Employee,Reason for Leaving,ত্যাগ করার জন্য কারণ
 DocType: Expense Claim Detail,Sanctioned Amount,অনুমোদিত পরিমাণ
 DocType: GL Entry,Is Opening,খোলার
@@ -3932,4 +3768,3 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +188,Account {0} does not exist,অ্যাকাউন্ট {0} অস্তিত্ব নেই
 DocType: Account,Cash,নগদ
 DocType: Employee,Short biography for website and other publications.,ওয়েবসাইট ও অন্যান্য প্রকাশনা সংক্ষিপ্ত জীবনী.
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +31,Please create Salary Structure for employee {0},কর্মচারীর জন্য বেতন কাঠামো তৈরি করুন {0}
diff --git a/erpnext/translations/bs.csv b/erpnext/translations/bs.csv
index 479f085..49f8acb 100644
--- a/erpnext/translations/bs.csv
+++ b/erpnext/translations/bs.csv
@@ -1,13 +1,12 @@
 DocType: Employee,Salary Mode,Plaća način
 DocType: Cost Center,"Select Monthly Distribution, if you want to track based on seasonality.","Odaberite Mjesečna distribucija, ako želite pratiti na osnovu sezonski."
 DocType: Employee,Divorced,Rastavljen
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +86,Warning: Same item has been entered multiple times.,Upozorenje: Ista stavka je ušao više puta.
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +80,Warning: Same item has been entered multiple times.,Upozorenje: Ista stavka je ušao više puta.
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +96,Items already synced,Predmeti već sinhronizovani
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,Dozvolite Stavka treba dodati više puta u transakciji
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,Odustani Materijal {0} Posjeti prije otkazivanja ova garancija potraživanje
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +19,Consumer Products,Consumer Products
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,Consumer Products
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +68,Please select Party Type first,Molimo prvo odaberite Party Tip
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +90,Annealing,Prekaljivanje
 DocType: Item,Customer Items,Customer Predmeti
 apps/erpnext/erpnext/accounts/doctype/account/account.py +45,Account {0}: Parent account {1} can not be a ledger,Konto {0}: Nadređeni konto {1} Ne može biti knjiga
 DocType: Item,Publish Item to hub.erpnext.com,Objavite stavku da hub.erpnext.com
@@ -20,15 +19,14 @@
 DocType: About Us Settings,Website,Web stranica
 DocType: POS Profile,Applicable for User,Primjenjivo za korisnika
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +169,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Zaustavila proizvodnju Naredba se ne može otkazati, odčepiti to prvi koji će otkazati"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +23,Compaction plus sintering,Zbijanja plus sinteriranje
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,Currency is required for Price List {0},Valuta je potreban za Cjenovnik {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Hoće li biti izračunata u transakciji.
 DocType: Purchase Order,Customer Contact,Customer Contact
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +549,From Material Request,Od materijala zahtjev
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +572,From Material Request,Od materijala zahtjev
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} Tree
 DocType: Job Applicant,Job Applicant,Posao podnositelj
 apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,Nema više rezultata.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +78,Legal,Pravni
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +34,Legal,Pravni
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +114,Actual type tax cannot be included in Item rate in row {0},Stvarni tip porez ne može biti uključen u stopu stavka u nizu {0}
 DocType: C-Form,Customer,Kupci
 DocType: Purchase Receipt Item,Required By,Potrebna Do
@@ -43,7 +41,6 @@
 DocType: Manufacturing Settings,Default 10 mins,Uobičajeno 10 min
 DocType: Leave Type,Leave Type Name,Ostavite ime tipa
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +148,Series Updated Successfully,Serija Updated uspješno
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +150,Stitching,Šivanje
 DocType: Pricing Rule,Apply On,Primjeni na
 DocType: Item Price,Multiple Item prices.,Više cijene stavke.
 ,Purchase Order Items To Be Received,Narudžbenica Proizvodi treba primiti
@@ -51,8 +48,8 @@
 DocType: Quality Inspection Reading,Parameter,Parametar
 apps/erpnext/erpnext/projects/doctype/project/project.py +43,Expected End Date can not be less than Expected Start Date,Očekivani Završni datum ne može biti manji od očekivanog datuma Početak
 apps/erpnext/erpnext/utilities/transaction_base.py +104,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Row # {0}: Rate moraju biti isti kao {1}: {2} ({3} / {4})
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +189,New Leave Application,Novi dopust Primjena
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +134,Bank Draft,Bank Nacrt
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +204,New Leave Application,Novi dopust Primjena
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +134,Bank Draft,Bank Nacrt
 DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,1. Za održavanje kupaca mudar Šifra i kako bi ih pretraživati ​​na temelju svog koda koristiti ovu opciju
 DocType: Mode of Payment Account,Mode of Payment Account,Način plaćanja računa
 apps/erpnext/erpnext/stock/doctype/item/item.js +34,Show Variants,Show Varijante
@@ -64,25 +61,23 @@
 DocType: Production Plan Item,Production Plan Item,Proizvodnja plan artikla
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +141,User {0} is already assigned to Employee {1},Korisnik {0} već dodijeljena zaposlenika {1}
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +13,Make new POS Profile,Napravite novi POS profil
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +31,Health Care,Zdravstvena zaštita
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,Zdravstvena zaštita
 DocType: Purchase Invoice,Monthly,Mjesečno
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +66,Delay in payment (Days),Kašnjenje u plaćanju (Dani)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +494,Invoice,Faktura
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +519,Invoice,Faktura
 DocType: Maintenance Schedule Item,Periodicity,Periodičnost
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +357,Email Address,E-mail adresa
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +21,Defense,Obrana
+apps/erpnext/erpnext/public/js/setup_wizard.js +107,Email Address,E-mail adresa
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,Obrana
 DocType: Company,Abbr,Skraćeni naziv
 DocType: Appraisal Goal,Score (0-5),Ocjena (0-5)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +193,Row {0}: {1} {2} does not match with {3},Row {0}: {1} {2} ne odgovara {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +67,Row # {0}:,Row # {0}:
 DocType: Delivery Note,Vehicle No,Ne vozila
 apps/erpnext/erpnext/public/js/pos/pos.js +528,Please select Price List,Molimo odaberite Cjenik
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +162,Woodworking,Obradu
 DocType: Production Order Operation,Work In Progress,Radovi u toku
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +153,3D printing,3D ispis
 DocType: Employee,Holiday List,Lista odmora
 DocType: Time Log,Time Log,Vrijeme Log
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +530,Accountant,Računovođa
+apps/erpnext/erpnext/public/js/setup_wizard.js +274,Accountant,Računovođa
 DocType: Cost Center,Stock User,Stock korisnika
 DocType: Company,Phone No,Telefonski broj
 DocType: Time Log,"Log of Activities performed by users against Tasks that can be used for tracking time, billing.","Log aktivnosti obavljaju korisnike od zadataka koji se mogu koristiti za praćenje vremena, billing."
@@ -98,18 +93,19 @@
 DocType: Bin,Quantity Requested for Purchase,Količina Traženi za kupnju
 DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name","Priložiti .csv datoteku s dvije kolone, jedan za stari naziv i jedna za novo ime"
 DocType: Packed Item,Parent Detail docname,Roditelj Detalj docname
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Kg,kg
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Kg,kg
 apps/erpnext/erpnext/config/hr.py +48,Opening for a Job.,Otvaranje za posao.
 DocType: Item Attribute,Increment,Prirast
 apps/erpnext/erpnext/public/js/stock_analytics.js +63,Select Warehouse...,Odaberite Warehouse ...
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +6,Advertising,Oglašavanje
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,Oglašavanje
+apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,Ista firma je ušao više od jednom
 DocType: Employee,Married,Oženjen
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +389,Stock cannot be updated against Delivery Note {0},Dionica ne može biti obnovljeno protiv isporuke Napomena {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +391,Stock cannot be updated against Delivery Note {0},Dionica ne može biti obnovljeno protiv isporuke Napomena {0}
 DocType: Payment Reconciliation,Reconcile,pomiriti
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +30,Grocery,Trgovina prehrambenom robom
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,Trgovina prehrambenom robom
 DocType: Quality Inspection Reading,Reading 1,Čitanje 1
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Make Bank Entry,Make Bank Entry
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +40,Pension Funds,mirovinskim fondovima
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,mirovinskim fondovima
 apps/erpnext/erpnext/accounts/doctype/account/account.py +142,Warehouse is mandatory if account type is Warehouse,Skladište je obavezno ako je tip naloga Skladište
 DocType: SMS Center,All Sales Person,Svi prodavači
 DocType: Lead,Person Name,Osoba Ime
@@ -131,7 +127,7 @@
 DocType: Quality Inspection,Get Specification Details,Kreiraj detalje specifikacija
 DocType: Lead,Interested,Zainteresiran
 apps/erpnext/erpnext/config/manufacturing.py +14,Bill of Material,Sastavnica
-apps/erpnext/erpnext/public/js/stock_analytics.js +45,Opening,Otvaranje
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +158,Opening,Otvaranje
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},Od {0} do {1}
 DocType: Item,Copy From Item Group,Primjerak iz točke Group
 DocType: Journal Entry,Opening Entry,Otvaranje unos
@@ -145,23 +141,22 @@
 DocType: Employee Education,Under Graduate,Pod diplomski
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +22,Target On,Target Na
 DocType: BOM,Total Cost,Ukupan trošak
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +99,Reaming,Razvrtanje
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +9,Activity Log:,Dnevnik aktivnosti:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +199,Item {0} does not exist in the system or has expired,Artikal {0} ne postoji u sustavu ili je istekao
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +44,Real Estate,Nekretnine
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +44,Real Estate,Nekretnine
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +4,Statement of Account,Izjava o računu
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +41,Pharmaceuticals,Lijekovi
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,Lijekovi
 DocType: Expense Claim Detail,Claim Amount,Iznos štete
 DocType: Employee,Mr,G-din
 DocType: Custom Script,Client,Klijent
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,Dobavljač Tip / Supplier
 DocType: Naming Series,Prefix,Prefiks
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Consumable,Potrošni
+apps/erpnext/erpnext/public/js/setup_wizard.js +359,Consumable,Potrošni
 DocType: Upload Attendance,Import Log,Uvoz Prijavite
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.js +19,Send,Poslati
 DocType: Sales Invoice Item,Delivered By Supplier,Isporučuje dobavljač
 DocType: SMS Center,All Contact,Svi kontakti
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +164,Annual Salary,Godišnja zarada
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +164,Annual Salary,Godišnja zarada
 DocType: Period Closing Voucher,Closing Fiscal Year,Zatvaranje Fiskalna godina
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +69,Stock Expenses,Stock Troškovi
 DocType: Newsletter,Email Sent?,Je li e-mail poslan?
@@ -169,7 +164,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +92,Show Time Logs,Show time Dnevnici
 DocType: Journal Entry Account,Credit in Company Currency,Credit Company valuta
 DocType: Delivery Note,Installation Status,Status instalacije
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +115,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Količina prihvaćeno + odbijeno mora biti jednaka zaprimljenoj količini proizvoda {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +118,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Količina prihvaćeno + odbijeno mora biti jednaka zaprimljenoj količini proizvoda {0}
 DocType: Item,Supply Raw Materials for Purchase,Supply sirovine za kupovinu
 apps/erpnext/erpnext/stock/get_item_details.py +133,Item {0} must be a Purchase Item,Stavka {0} mora bitikupnja artikla
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
@@ -177,19 +172,17 @@
  Svi datumi i zaposlenog kombinacija u odabranom periodu doći će u predlošku, sa postojećim pohađanje evidencije"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +446,Item {0} is not active or end of life has been reached,Stavka {0} nije aktivan ili kraj života je postignut
 DocType: Time Log Batch,Will be updated after Sales Invoice is Submitted.,Hoće li se obnavljaju nakon prodaje fakture je Prijavljen.
-apps/erpnext/erpnext/controllers/accounts_controller.py +493,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","To uključuje porez u redu {0} u stopu točke , porezi u redovima {1} također moraju biti uključeni"
+apps/erpnext/erpnext/controllers/accounts_controller.py +494,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","To uključuje porez u redu {0} u stopu točke , porezi u redovima {1} također moraju biti uključeni"
 apps/erpnext/erpnext/config/hr.py +90,Settings for HR Module,Podešavanja modula ljudskih resursa
 DocType: SMS Center,SMS Center,SMS centar
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +78,Straightening,Ispravljanje
 DocType: BOM Replace Tool,New BOM,Novi BOM
 apps/erpnext/erpnext/config/projects.py +28,Batch Time Logs for billing.,Batch Time Dnevnici za naplatu.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +15,Countergravity casting,Countergravity casting
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +30,Newsletter has already been sent,Newsletter je već poslana
 DocType: Lead,Request Type,Zahtjev Tip
 DocType: Leave Application,Reason,Razlog
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +14,Broadcasting,radiodifuzija
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +140,Execution,izvršenje
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +364,The first user will become the System Manager (you can change this later).,Prvi korisnik će postati System Manager (to možete promijeniti kasnije).
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,radiodifuzija
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +140,Execution,izvršenje
+apps/erpnext/erpnext/public/js/setup_wizard.js +114,The first user will become the System Manager (you can change this later).,Prvi korisnik će postati System Manager (to možete promijeniti kasnije).
 apps/erpnext/erpnext/config/manufacturing.py +39,Details of the operations carried out.,Detalji o poslovanju obavlja.
 DocType: Serial No,Maintenance Status,Održavanje statusa
 apps/erpnext/erpnext/config/stock.py +263,Items and Pricing,Stavke i cijene
@@ -206,7 +199,6 @@
 DocType: Pricing Rule,Discount on Price List Rate (%),Popust na cijenu List stopa (%)
 apps/frappe/frappe/public/js/frappe/form/print.js +96,Start,početak
 DocType: User,First Name,Ime
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +12,Full-mold casting,Full-kalupa casting
 DocType: Offer Letter,Select Terms and Conditions,Odaberite uvjeti
 DocType: Production Planning Tool,Sales Orders,Sales Orders
 DocType: Purchase Taxes and Charges,Valuation,Procjena
@@ -218,8 +210,7 @@
 DocType: Bank Reconciliation,Bank Account,Žiro račun
 DocType: Leave Type,Allow Negative Balance,Dopustite negativan saldo
 DocType: Selling Settings,Default Territory,Zadani teritorij
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +53,Television,Televizija
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +138,Gashing,Gashing
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,Televizija
 DocType: Production Order Operation,Updated via 'Time Log',Ažurirano putem 'Time Log'
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +82,Account {0} does not belong to Company {1},Konto {0} ne pripada preduzeću {1}
 DocType: Naming Series,Series List for this Transaction,Serija Popis za ovu transakciju
@@ -234,14 +225,13 @@
 DocType: Leave Allocation,Add unused leaves from previous allocations,Dodaj neiskorišteni lišće iz prethodnog izdvajanja
 apps/erpnext/erpnext/controllers/recurring_document.py +206,Next Recurring {0} will be created on {1},Sljedeća Ponavljajući {0} će biti kreiran na {1}
 DocType: Newsletter List,Total Subscribers,Ukupno Pretplatnici
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +575,Contact Name,Kontakt ime
+,Contact Name,Kontakt ime
 DocType: Production Plan Item,SO Pending Qty,SO čekanju Kol
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Stvara plaće slip za gore navedene kriterije.
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,Zahtjev za kupnju.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +107,Double housing,Double stanovanje
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +156,Only the selected Leave Approver can submit this Leave Application,Samoodabrani Ostavite Odobritelj može podnijeti ovo ostaviti aplikacija
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +171,Only the selected Leave Approver can submit this Leave Application,Samoodabrani Ostavite Odobritelj može podnijeti ovo ostaviti aplikacija
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,Olakšavanja Datum mora biti veći od dana ulaska u
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +172,Leaves per Year,Ostavlja per Godina
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +172,Leaves per Year,Ostavlja per Godina
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup > Settings > Naming Series,Molimo podesite Imenovanje serije za {0} preko Podešavanje&gt; Settings&gt; Imenovanje serije
 DocType: Time Log,Will be updated when batched.,Hoće li biti ažurirani kada izmiješane.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +104,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,"Row {0}: Molimo provjerite 'Je li Advance ""protiv Account {1} ako je to unaprijed unos."
@@ -250,25 +240,24 @@
 DocType: Item Website Specification,Item Website Specification,Specifikacija web stranice artikla
 DocType: Dropbox Backup,Dropbox Access Key,Dropbox pristupni ključ
 DocType: Payment Tool,Reference No,Poziv na broj
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +348,Leave Blocked,Ostavite blokirani
-apps/erpnext/erpnext/stock/doctype/item/item.py +535,Item {0} has reached its end of life on {1},Artikal {0} je dosegao svoj rok trajanja na {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +392,Leave Blocked,Ostavite blokirani
+apps/erpnext/erpnext/stock/doctype/item/item.py +539,Item {0} has reached its end of life on {1},Artikal {0} je dosegao svoj rok trajanja na {1}
 apps/erpnext/erpnext/accounts/utils.py +339,Annual,godišnji
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Stock Pomirenje Item
 DocType: Stock Entry,Sales Invoice No,Faktura prodaje br
 DocType: Material Request Item,Min Order Qty,Min Red Kol
 DocType: Lead,Do Not Contact,Ne kontaktirati
 DocType: Sales Invoice,The unique id for tracking all recurring invoices. It is generated on submit.,Jedinstveni ID za praćenje svih ponavljajući fakture. To je izrađen podnijeti.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +93,Software Developer,Software Developer
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +93,Software Developer,Software Developer
 DocType: Item,Minimum Order Qty,Minimalna količina za naručiti
 DocType: Pricing Rule,Supplier Type,Dobavljač Tip
 DocType: Item,Publish in Hub,Objavite u Hub
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +555,Item {0} is cancelled,Artikal {0} je otkazan
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +598,Material Request,Materijal zahtjev
+apps/erpnext/erpnext/stock/doctype/item/item.py +559,Item {0} is cancelled,Artikal {0} je otkazan
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +607,Material Request,Materijal zahtjev
 DocType: Bank Reconciliation,Update Clearance Date,Ažurirajte provjeri datum
 DocType: Item,Purchase Details,Kupnja Detalji
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +323,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},Stavka {0} nije pronađena u &#39;sirovine Isporučuje&#39; sto u narudžbenice {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +129,Wire brushing,Wire četkanje
 DocType: Employee,Relation,Odnos
 DocType: Shipping Rule,Worldwide Shipping,Dostavom diljem svijeta
 apps/erpnext/erpnext/config/selling.py +23,Confirmed orders from Customers.,Potvrđene narudžbe od kupaca.
@@ -284,12 +273,11 @@
 DocType: Supplier,Address HTML,Adressa u HTML-u
 DocType: Lead,Mobile No.,Mobitel broj
 DocType: Maintenance Schedule,Generate Schedule,Generiranje Raspored
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +81,Hubbing,Hubbing
 DocType: Purchase Invoice Item,Expense Head,Rashodi voditelj
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +86,Please select Charge Type first,Odaberite Naknada za prvi
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,Najnovije
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +395,Max 5 characters,Max 5 znakova
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +195,Select Your Language,Odaberite jezik
+apps/erpnext/erpnext/public/js/setup_wizard.js +143,Max 5 characters,Max 5 znakova
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +245,Select Your Language,Odaberite jezik
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,Prvi dopust Odobritelj na popisu će se postaviti kao zadani Odobritelj dopust
 DocType: Manufacturing Settings,"Disables creation of time logs against Production Orders.
 Operations shall not be tracked against Production Order",Onemogućava stvaranje vremena trupaca protiv naloga za proizvodnju. Operacije neće biti bager protiv Proizvodnja Order
@@ -301,8 +289,6 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +34,Item {0} must be Service Item,Stavka {0} mora biti usluga Stavka
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +303,Completed Qty can not be greater than 'Qty to Manufacture',Završene Qty ne može biti veća od 'Količina za proizvodnju'
 DocType: DocType,Administrator,Administrator
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +136,Laser drilling,Laser bušenja
-DocType: Stock UOM Replace Utility,New Stock UOM,Novi kataloški UOM
 DocType: Period Closing Voucher,Closing Account Head,Zatvaranje računa šefa
 DocType: Employee,External Work History,Vanjski History Work
 apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,Kružna Reference Error
@@ -311,18 +297,15 @@
 DocType: Lead,Industry,Industrija
 DocType: Employee,Job Profile,posao Profile
 DocType: Newsletter,Newsletter,Bilten
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +84,Hydroforming,Hydroforming
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +49,Necking,Ljubakanje
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Obavijesti putem e-pošte na stvaranje automatskog Materijal Zahtjeva
 DocType: Journal Entry,Multi Currency,Multi valuta
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +51,Item is updated,Artikl je ažuriran
 DocType: Async Task,System Manager,System Manager
 DocType: Payment Reconciliation Invoice,Invoice Type,Tip fakture
 DocType: Sales Invoice Item,Delivery Note,Otpremnica
 DocType: Dropbox Backup,Allow Dropbox Access,Dopusti pristup Dropbox
 apps/erpnext/erpnext/config/learn.py +72,Setting up Taxes,Postavljanje Porezi
 apps/erpnext/erpnext/accounts/utils.py +189,Payment Entry has been modified after you pulled it. Please pull it again.,Plaćanje Entry je izmijenjena nakon što ste ga izvukao. Molimo vas da se ponovo povucite.
-apps/erpnext/erpnext/stock/doctype/item/item.py +343,{0} entered twice in Item Tax,{0} dva puta ušao u točki poreza
+apps/erpnext/erpnext/stock/doctype/item/item.py +347,{0} entered twice in Item Tax,{0} dva puta ušao u točki poreza
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +105,Summary for this week and pending activities,Pregled za ovaj tjedan i aktivnostima na čekanju
 DocType: Workstation,Rent Cost,Rent cost
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +74,Please select month and year,Molimo odaberite mjesec i godinu
@@ -339,24 +322,22 @@
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,Stopa po kojoj Kupac valuta se pretvaraju u kupca osnovne valute
 DocType: Features Setup,"Available in BOM, Delivery Note, Purchase Invoice, Production Order, Purchase Order, Purchase Receipt, Sales Invoice, Sales Order, Stock Entry, Timesheet","Dostupno u sastavnicama, otpremnicama, računu kupnje, nalogu za proizvodnju, narudžbi kupnje, primci, prodajnom računu, narudžbi kupca, ulaznog naloga i kontrolnoj kartici"
 DocType: Item Tax,Tax Rate,Porezna stopa
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Select Item,Odaberite Item
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +540,Select Item,Odaberite Item
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +143,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","Detaljnije: {0} uspio batch-mudar, ne može se pomiriti koristeći \
  Stock pomirenje, umjesto koristi Stock Entry"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +259,Purchase Invoice {0} is already submitted,Kupnja Račun {0} već je podnijela
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +262,Purchase Invoice {0} is already submitted,Kupnja Račun {0} već je podnijela
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Batch No must be same as {1} {2},Row # {0}: serijski br mora biti isti kao {1} {2}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Convert to non-Group,Pretvoriti u non-Group
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +55,Purchase Receipt must be submitted,Kupovina Prijem mora biti dostavljena
-DocType: Stock UOM Replace Utility,Current Stock UOM,Trenutni kataloški UOM
 apps/erpnext/erpnext/config/stock.py +53,Batch (lot) of an Item.,Serija (puno) proizvoda.
 DocType: C-Form Invoice Detail,Invoice Date,Datum fakture
 DocType: GL Entry,Debit Amount,Debit Iznos
 apps/erpnext/erpnext/accounts/party.py +223,There can only be 1 Account per Company in {0} {1},Tu može biti samo 1 račun po kompanije u {0} {1}
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Your email address,Vaša e-mail adresa
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +194,Please see attachment,Pogledajte prilog
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +203,Please see attachment,Pogledajte prilog
 DocType: Purchase Order,% Received,% Pozicija
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +109,Water jet cutting,Rezanje vodenim mlazom
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +24,Setup Already Complete!!,Podešavanja je već okončano!!
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +20,Setup Already Complete!!,Podešavanja je već okončano!!
 ,Finished Goods,gotovih proizvoda
 DocType: Delivery Note,Instructions,Instrukcije
 DocType: Quality Inspection,Inspected By,Provjereno od strane
@@ -371,6 +352,7 @@
 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.,Molimo vas da ne stvaraju računi za kupcima i dobavljačima. Oni su stvorili direktno od kupca / dobavljača majstora.
 DocType: Currency Exchange,Currency Exchange,Mjenjačnica
 DocType: Purchase Invoice Item,Item Name,Naziv artikla
+DocType: Authorization Rule,Approving User  (above authorized value),Odobravanje korisnika (iznad ovlašteni vrijednost)
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Credit Balance,Credit Balance
 DocType: Employee,Widowed,Udovički
 DocType: Production Planning Tool,"Items to be requested which are ""Out of Stock"" considering all warehouses based on projected qty and minimum order qty",Proizvodi se traži što su &quot;Out of Stock&quot; s obzirom na sve skladišta na temelju projicirane Qty i minimalne narudžbe Kol
@@ -380,11 +362,10 @@
 ,Purchase Register,Kupnja Registracija
 DocType: Landed Cost Item,Applicable Charges,Mjerodavno Optužbe
 DocType: Workstation,Consumable Cost,potrošni cost
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,{0} ({1}) must have role 'Leave Approver',{0} ({1}) mora imati ulogu 'Leave Approver'
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +167,{0} ({1}) must have role 'Leave Approver',{0} ({1}) mora imati ulogu 'Leave Approver'
 DocType: Purchase Receipt,Vehicle Date,Vozilo Datum
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +39,Medical,liječnički
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +39,Medical,liječnički
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,Razlog za gubljenje
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +36,Tube beading,Tube izvlačenja
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},Workstation je zatvoren sljedećih datuma po Holiday List: {0}
 DocType: Employee,Single,Singl
 DocType: Issue,Attachment,Vezanost
@@ -405,10 +386,8 @@
 DocType: Account,Is Group,Is Group
 DocType: Stock Settings,Automatically Set Serial Nos based on FIFO,Automatski se postavlja rednim brojevima na osnovu FIFO
 DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,Check Dobavljač Faktura Broj Jedinstvenost
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +31,Thermoforming,Termoformiranje
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +66,Slitting,Rezanje
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +57,'To Case No.' cannot be less than 'From Case No.',&#39;Za Predmet br&#39; ne može biti manja od &#39;Od Predmet br&#39;
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +104,Non Profit,Neprofitne
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +104,Non Profit,Neprofitne
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_list.js +7,Not Started,Nije počela
 DocType: Lead,Channel Partner,Channel Partner
 DocType: Account,Old Parent,Stari Roditelj
@@ -417,13 +396,12 @@
 apps/erpnext/erpnext/config/manufacturing.py +74,Global settings for all manufacturing processes.,Global postavke za sve proizvodne procese.
 DocType: Accounts Settings,Accounts Frozen Upto,Računi Frozen Upto
 DocType: SMS Log,Sent On,Poslano na adresu
-apps/erpnext/erpnext/stock/doctype/item/item.py +512,Attribute {0} selected multiple times in Attributes Table,Atribut {0} odabrani više puta u atributi tabeli
+apps/erpnext/erpnext/stock/doctype/item/item.py +516,Attribute {0} selected multiple times in Attributes Table,Atribut {0} odabrani više puta u atributi tabeli
 DocType: Sales Order,Not Applicable,Nije primjenjivo
 apps/erpnext/erpnext/config/hr.py +140,Holiday master.,Majstor za odmor .
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +19,Shell molding,Shell lajsne
 DocType: Material Request Item,Required Date,Potrebna Datum
 DocType: Delivery Note,Billing Address,Adresa za naplatu
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +644,Please enter Item Code.,Unesite kod artikal .
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +648,Please enter Item Code.,Unesite kod artikal .
 DocType: BOM,Costing,Koštanje
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount","Ako je označeno, iznos poreza će se smatrati već uključena u Print Rate / Ispis Iznos"
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,Ukupno Qty
@@ -433,7 +411,7 @@
 DocType: Item Attribute,To Range,U rasponu
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Vrijednosni papiri i depoziti
 DocType: Features Setup,Imports,Uvozi
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +144,Adhesive bonding,Lepljenje
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +77,Total leaves allocated is mandatory,Ukupno lišće dodijeljena je obavezno
 DocType: Job Opening,Description of a Job Opening,Opis posla Otvaranje
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +102,Pending activities for today,Aktivnostima na čekanju za danas
 apps/erpnext/erpnext/config/hr.py +28,Attendance record.,Gledatelja rekord.
@@ -441,26 +419,25 @@
 DocType: Sales Order Item,Used for Production Plan,Koristi se za plan proizvodnje
 DocType: System Settings,Loading...,Učitavanje ...
 DocType: DocField,Password,Zaporka
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +155,Fused deposition modeling,Fused modeliranje taloženja
 DocType: Manufacturing Settings,Time Between Operations (in mins),Vrijeme između operacije (u min)
 DocType: Customer,Buyer of Goods and Services.,Kupac robe i usluga.
 DocType: Journal Entry,Accounts Payable,Naplativa konta
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +24,Add Subscribers,Dodaj Pretplatnici
 apps/erpnext/erpnext/public/js/feature_setup.js +220,""" does not exists",""" Ne postoji"
 DocType: Pricing Rule,Valid Upto,Vrijedi Upto
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +564,List a few of your customers. They could be organizations or individuals.,Navedite nekoliko svojih kupaca. Oni mogu biti tvrtke ili fizičke osobe.
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,List a few of your customers. They could be organizations or individuals.,Navedite nekoliko svojih kupaca. Oni mogu biti tvrtke ili fizičke osobe.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Direct Income,Direktni prihodi
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +33,"Can not filter based on Account, if grouped by Account","Ne možete filtrirati na temelju računa , ako grupirani po računu"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +88,Administrative Officer,Administrativni službenik
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Administrative Officer,Administrativni službenik
 DocType: Payment Tool,Received Or Paid,Primi ili isplati
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +318,Please select Company,Molimo odaberite Company
 DocType: Stock Entry,Difference Account,Konto razlike
 apps/erpnext/erpnext/projects/doctype/task/task.py +44,Cannot close task as its dependant task {0} is not closed.,Ne možete zatvoriti zadatak kao zavisne zadatak {0} nije zatvoren.
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +305,Please enter Warehouse for which Material Request will be raised,Unesite skladište za koje Materijal Zahtjev će biti podignuta
 DocType: Production Order,Additional Operating Cost,Dodatni operativnih troškova
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +20,Cosmetics,kozmetika
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,kozmetika
 DocType: DocField,Type,Vrsta
-apps/erpnext/erpnext/stock/doctype/item/item.py +417,"To merge, following properties must be same for both items","Spojiti , ova svojstva moraju biti isti za obje stavke"
+apps/erpnext/erpnext/stock/doctype/item/item.py +421,"To merge, following properties must be same for both items","Spojiti , ova svojstva moraju biti isti za obje stavke"
 DocType: Communication,Subject,Predmet
 DocType: Shipping Rule,Net Weight,Neto težina
 DocType: Employee,Emergency Phone,Hitna Telefon
@@ -470,7 +447,6 @@
 DocType: Journal Entry,Difference (Dr - Cr),Razlika ( dr. - Cr )
 DocType: Account,Profit and Loss,Račun dobiti i gubitka
 apps/erpnext/erpnext/config/stock.py +293,Managing Subcontracting,Upravljanje Subcontracting
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +58,New UOM must NOT be of type Whole Number,Novi UOM ne mora biti tipa cijeli broj
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Furniture and Fixture,Namještaj i susret
 DocType: Quotation,Rate at which Price list currency is converted to company's base currency,Stopa po kojoj Cjenik valute se pretvaraju u tvrtke bazne valute
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Account {0} does not belong to company: {1},Konto {0} ne pripada preduzeću {1}
@@ -490,14 +466,14 @@
 DocType: Purchase Invoice,Supplier Invoice No,Dobavljač Račun br
 DocType: Territory,For reference,Za referencu
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +154,"Cannot delete Serial No {0}, as it is used in stock transactions","Ne možete izbrisati serijski broj {0}, koji se koristi u prodaji transakcije"
-apps/erpnext/erpnext/public/js/account_tree_grid.js +52,Closing (Cr),Zatvaranje (Cr)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +227,Closing (Cr),Zatvaranje (Cr)
 DocType: Serial No,Warranty Period (Days),Jamstveni period (dani)
 DocType: Installation Note Item,Installation Note Item,Napomena instalacije proizvoda
 ,Pending Qty,U očekivanju Količina
 DocType: Job Applicant,Thread HTML,Temu HTML
 DocType: Company,Ignore,Ignorirati
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +86,SMS sent to following numbers: {0},SMS poslati na sljedeće brojeve: {0}
-apps/erpnext/erpnext/controllers/buying_controller.py +135,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Dobavljač skladišta obvezan je za sub - ugovoreni kupiti primitka
+apps/erpnext/erpnext/controllers/buying_controller.py +126,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Dobavljač skladišta obvezan je za sub - ugovoreni kupiti primitka
 DocType: Pricing Rule,Valid From,Vrijedi od
 DocType: Sales Invoice,Total Commission,Ukupno komisija
 DocType: Pricing Rule,Sales Partner,Prodajni partner
@@ -507,7 +483,7 @@
 To distribute a budget using this distribution, set this **Monthly Distribution** in the **Cost Center**","** ** Mjesečni Distribucija će Vam pomoći distribuirati svoj proračun kroz mjesece ako imate sezonski u vašem poslu.
 
  Distribuirati budžet koristeći ovu distribucije, postavite ovu ** Mjesečna distribucija ** u ** Troškovi Centru **"
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +183,No records found in the Invoice table,Nisu pronađeni u tablici fakturu
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +130,No records found in the Invoice table,Nisu pronađeni u tablici fakturu
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +20,Please select Company and Party Type first,Molimo najprije odaberite Društva i Party Tip
 apps/erpnext/erpnext/config/accounts.py +84,Financial / accounting year.,Financijska / obračunska godina .
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","Žao nam je , Serial Nos ne mogu spojiti"
@@ -523,25 +499,25 @@
 DocType: Sales Order,Billing and Delivery Status,Obračun i Status isporuke
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Ponovite Kupci
 DocType: Leave Control Panel,Allocate,Dodijeli
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +16,Previous,prijašnji
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard_page.html +16,Previous,prijašnji
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +620,Sales Return,Povrat robe
 DocType: Production Planning Tool,Select Sales Orders from which you want to create Production Orders.,Odaberite narudžbe iz kojih želite stvoriti radne naloge.
 DocType: Item,Delivered by Supplier (Drop Ship),Isporučuje Dobavljač (Drop Ship)
 apps/erpnext/erpnext/config/hr.py +120,Salary components.,Plaća komponente.
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,Baza potencijalnih kupaca.
+DocType: Authorization Rule,Customer or Item,Customer ili Stavka
 apps/erpnext/erpnext/config/crm.py +17,Customer database.,Šifarnik kupaca
 DocType: Quotation,Quotation To,Ponuda za
 DocType: Lead,Middle Income,Srednji Prihodi
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),Otvaranje ( Cr )
 apps/erpnext/erpnext/accounts/utils.py +193,Allocated amount can not be negative,Dodijeljeni iznos ne može biti negativan
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +123,Tumbling,Gimnastika
 DocType: Purchase Order Item,Billed Amt,Naplaćeni izn
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,A logično Skladište protiv kojih su napravljeni unosa zaliha.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +92,Reference No & Reference Date is required for {0},Reference Nema & Reference Datum je potrebno za {0}
 DocType: Event,Wednesday,Srijeda
 DocType: Sales Invoice,Customer's Vendor,Kupca Prodavatelj
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +214,Production Order is Mandatory,Proizvodnja Order je obavezna
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +139,Proposal Writing,Pisanje prijedlog
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,Proposal Writing,Pisanje prijedlog
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,Još jedna osoba Sales {0} postoji s istim ID zaposlenih
 apps/erpnext/erpnext/stock/stock_ledger.py +336,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},Negativna Stock Error ( {6} ) za točke {0} u skladište {1} na {2} {3} u {4} {5}
 DocType: Fiscal Year Company,Fiscal Year Company,Fiskalna godina Company
@@ -564,7 +540,7 @@
 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.","Zatim Cjenovna Pravila filtriraju se temelji na Kupca, Kupac Group, Teritorij, dobavljač, proizvođač tip, Kampanja, prodajni partner i sl."
 apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.py +179,Please install dropbox python module,Molimo instalirajte Dropbox piton modul
 DocType: Employee,Passport Number,Putovnica Broj
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +82,Manager,menadžer
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Manager,menadžer
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +494,From Purchase Receipt,Od Račun kupnje
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +219,Same item has been entered multiple times.,Istu stavku je ušao više puta.
 DocType: SMS Settings,Receiver Parameter,Prijemnik parametra
@@ -572,10 +548,9 @@
 DocType: Sales Person,Sales Person Targets,Prodaje osobi Mete
 apps/frappe/frappe/public/js/frappe/form/workflow.js +116,To,u
 apps/frappe/frappe/templates/base.html +145,Please enter email address,Molimo unesite e-mail adresu
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +35,End tube forming,Kraj cijevi formiranje
 DocType: Production Order Operation,In minutes,U minuta
 DocType: Issue,Resolution Date,Rezolucija Datum
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +635,Please set default Cash or Bank account in Mode of Payment {0},Molimo postavite zadanu gotovinom ili banka računa u načinu plaćanja {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +637,Please set default Cash or Bank account in Mode of Payment {0},Molimo postavite zadanu gotovinom ili banka računa u načinu plaćanja {0}
 DocType: Selling Settings,Customer Naming By,Kupac Imenovanje By
 apps/erpnext/erpnext/accounts/doctype/account/account.js +67,Convert to Group,Pretvori u Grupi
 DocType: Activity Cost,Activity Type,Tip aktivnosti
@@ -583,12 +558,12 @@
 DocType: Customer,Fixed Days,Fiksni Dani
 DocType: Sales Invoice,Packing List,Popis pakiranja
 apps/erpnext/erpnext/config/buying.py +28,Purchase Orders given to Suppliers.,Kupnja naloge koje je dao dobavljače.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +43,Publishing,objavljivanje
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +43,Publishing,objavljivanje
 DocType: Activity Cost,Projects User,Projekti korisnika
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Consumed,Consumed
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +198,{0}: {1} not found in Invoice Details table,{0}: {1} nije pronađen u Pojedinosti dostavnice stolu
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,{0}: {1} not found in Invoice Details table,{0}: {1} nije pronađen u Pojedinosti dostavnice stolu
 DocType: Company,Round Off Cost Center,Zaokružimo troškova Center
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +208,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Održavanje Posjetite {0} mora biti otkazana prije poništenja ovu prodajnog naloga
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +203,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Održavanje Posjetite {0} mora biti otkazana prije poništenja ovu prodajnog naloga
 DocType: Material Request,Material Transfer,Materijal transfera
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +56,Opening (Dr),Otvaranje ( DR)
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},Objavljivanje timestamp mora biti poslije {0}
@@ -600,7 +575,6 @@
 DocType: Pricing Rule,Sales Manager,Sales Manager
 apps/frappe/frappe/public/js/frappe/model/model.js +492,Rename,preimenovati
 DocType: Journal Entry,Write Off Amount,Napišite paušalni iznos
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +52,Bending,Savijanje
 apps/frappe/frappe/core/page/user_permissions/user_permissions.js +246,Allow User,Dopusti korisnika
 DocType: Journal Entry,Bill No,Račun br
 DocType: Purchase Invoice,Quarterly,Kvartalno
@@ -610,17 +584,16 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Please enter item details,Unesite Detalji
 DocType: Purchase Receipt,Other Details,Ostali detalji
 DocType: Account,Accounts,Konta
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +67,Marketing,marketing
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +65,Straight shearing,Straight smicanje
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +67,Marketing,marketing
 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.,Za praćenje stavke u prodaji i kupnji dokumenata na temelju njihovih serijskih br. To je također može koristiti za praćenje jamstvene podatke o proizvodu.
 DocType: Purchase Receipt Item Supplied,Current Stock,Trenutni Stock
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +99,Rejected Warehouse is mandatory against regected item,Odbijen Skladište je obavezno protiv regected stavku
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +102,Rejected Warehouse is mandatory against regected item,Odbijen Skladište je obavezno protiv regected stavku
 DocType: Account,Expenses Included In Valuation,Troškovi uključeni u vrednovanje
 DocType: Employee,Provide email id registered in company,Osigurati e id registriran u tvrtki
 DocType: Hub Settings,Seller City,Prodavač City
 DocType: Email Digest,Next email will be sent on:,Sljedeća e-mail će biti poslan na:
 DocType: Offer Letter Term,Offer Letter Term,Ponuda Pismo Term
-apps/erpnext/erpnext/stock/doctype/item/item.py +492,Item has variants.,Stavka ima varijante.
+apps/erpnext/erpnext/stock/doctype/item/item.py +496,Item has variants.,Stavka ima varijante.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Stavka {0} nije pronađena
 DocType: Bin,Stock Value,Stock vrijednost
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,Tree Type
@@ -629,10 +602,9 @@
 DocType: Material Request Item,Quantity and Warehouse,Količina i skladišta
 DocType: Sales Invoice,Commission Rate (%),Komisija stopa (%)
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +172,"Against Voucher Type must be one of Sales Order, Sales Invoice or Journal Entry","Protiv vaučera Tip mora biti jedan od naloga prodaje, prodaje fakture ili Journal Entry"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +139,Biomachining,Biomachining
 apps/erpnext/erpnext/setup/utils.py +89,Unable to find exchange rate,Ne mogu da nađu kursu
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +7,Aerospace,Zračno-kosmički prostor
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +19,Welcome,Dobrodošli
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +7,Aerospace,Zračno-kosmički prostor
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +40,Welcome,Dobrodošli
 DocType: Journal Entry,Credit Card Entry,Credit Card Entry
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +18,Task Subject,Zadatak Tema
 apps/erpnext/erpnext/config/stock.py +33,Goods received from Suppliers.,Roba dobijena od dobavljača.
@@ -655,19 +627,19 @@
 DocType: Employee,Cell Number,Mobitel Broj
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Izgubljen
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +120,You can not enter current voucher in 'Against Journal Entry' column,Ne možete ući trenutni voucher u 'Protiv Journal Entry' koloni
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +25,Energy,energija
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,energija
 DocType: Opportunity,Opportunity From,Prilika od
 apps/erpnext/erpnext/config/hr.py +33,Monthly salary statement.,Mjesečna plaća izjava.
 DocType: Item Group,Website Specifications,Web Specifikacije
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +205,New Account,Novi račun
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +21,{0}: From {0} of type {1},{0}: Od {0} {1} tipa
-apps/erpnext/erpnext/controllers/buying_controller.py +283,Row {0}: Conversion Factor is mandatory,Red {0}: pretvorbe Factor je obvezno
+apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,Red {0}: pretvorbe Factor je obvezno
 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.,Računovodstva unosi može biti pokrenuta protiv lista čvorova. Nisu dozvoljeni stavke protiv Grupe.
 DocType: ToDo,High,Visok
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +361,Cannot deactivate or cancel BOM as it is linked with other BOMs,Ne može se isključiti ili otkaže BOM kao što je povezano s drugim Boms
 DocType: Opportunity,Maintenance,Održavanje
 DocType: User,Male,Muški
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +182,Purchase Receipt number required for Item {0},Broj primke je potreban za artikal {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +183,Purchase Receipt number required for Item {0},Broj primke je potreban za artikal {0}
 DocType: Item Attribute Value,Item Attribute Value,Stavka vrijednost atributa
 apps/erpnext/erpnext/config/crm.py +64,Sales campaigns.,Prodajne kampanje.
 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.
@@ -715,10 +687,9 @@
 DocType: Address,Personal,Osobno
 DocType: Expense Claim Detail,Expense Claim Type,Rashodi Vrsta polaganja
 DocType: Shopping Cart Settings,Default settings for Shopping Cart,Početne postavke za Košarica
-apps/erpnext/erpnext/controllers/accounts_controller.py +324,"Journal Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Journal Entry {0} je povezana protiv Order {1}, provjerite da li treba biti povučen kao napredak u ovom računu."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +13,Biotechnology,Biotehnologija
+apps/erpnext/erpnext/controllers/accounts_controller.py +325,"Journal Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Journal Entry {0} je povezana protiv Order {1}, provjerite da li treba biti povučen kao napredak u ovom računu."
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +13,Biotechnology,Biotehnologija
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Office Maintenance Expenses,Troškovi održavanja ureda
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +53,Hemming,Hemming
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +66,Please enter Item first,Unesite predmeta prvi
 DocType: Account,Liability,Odgovornost
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +62,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Sankcionisano Iznos ne može biti veći od potraživanja Iznos u nizu {0}.
@@ -731,10 +702,10 @@
 DocType: Company,Default Bank Account,Zadani bankovni račun
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +47,"To filter based on Party, select Party Type first","Da biste filtrirali na osnovu stranke, izaberite Party prvog tipa"
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},&#39;Update Stock &quot;ne može provjeriti jer se predmeti nisu dostavljene putem {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Nos,Nos
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Nos,Nos
 DocType: Item,Items with higher weightage will be shown higher,Predmeti sa višim weightage će biti prikazan veći
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Banka Pomirenje Detalj
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +627,My Invoices,Moj Fakture
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +629,My Invoices,Moj Fakture
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,Niti jedan zaposlenik pronađena
 DocType: Purchase Order,Stopped,Zaustavljen
 DocType: Item,If subcontracted to a vendor,Ako podizvođača na dobavljača
@@ -753,35 +724,33 @@
 DocType: Features Setup,"To enable ""Point of Sale"" features",Da biste omogućili &quot;Point of Sale&quot; karakteristika
 DocType: Bin,Moving Average Rate,Premještanje prosječna stopa
 DocType: Production Planning Tool,Select Items,Odaberite artikle
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,{0} against Bill {1} dated {2},{0} {1} protiv Bill od {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +328,{0} against Bill {1} dated {2},{0} {1} protiv Bill od {2}
 DocType: Comment,Reference Name,Referenca Ime
 DocType: Maintenance Visit,Completion Status,Završetak Status
 DocType: Sales Invoice Item,Target Warehouse,Ciljana galerija
 DocType: Item,Allow over delivery or receipt upto this percent,Dozvolite preko isporuke ili primitka upto ovu posto
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +49,Expected Delivery Date cannot be before Sales Order Date,Očekuje se dostava Datum ne može biti prije prodajnog naloga Datum
 DocType: Upload Attendance,Import Attendance,Uvoz posjećenost
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +17,All Item Groups,Sve grupe artikala
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +17,All Item Groups,Sve grupe artikala
 DocType: Process Payroll,Activity Log,Dnevnik aktivnosti
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +30,Net Profit / Loss,Neto dobit / gubitak
 apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,Automatski nova poruka na podnošenje transakcija .
 DocType: Production Order,Item To Manufacture,Artikal za proizvodnju
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +16,Permanent mold casting,Stalni kalupa casting
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} {2} status
 apps/erpnext/erpnext/config/learn.py +172,Purchase Order to Payment,Purchase Order na isplatu
 DocType: Sales Order Item,Projected Qty,Predviđen Kol
 DocType: Sales Invoice,Payment Due Date,Plaćanje Due Date
 DocType: Newsletter,Newsletter Manager,Newsletter Manager
-apps/erpnext/erpnext/stock/doctype/item/item.js +229,Item Variant {0} already exists with same attributes,Stavka Variant {0} već postoji s istim atributima
+apps/erpnext/erpnext/stock/doctype/item/item.js +231,Item Variant {0} already exists with same attributes,Stavka Variant {0} već postoji s istim atributima
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening',&#39;Otvaranje&#39;
 DocType: Notification Control,Delivery Note Message,Otpremnica - poruka
 DocType: Expense Claim,Expenses,troškovi
 DocType: Item Variant Attribute,Item Variant Attribute,Stavka Variant Atributi
 ,Purchase Receipt Trends,Račun kupnje trendovi
 DocType: Appraisal,Select template from which you want to get the Goals,Odaberite predložak s kojeg želite dobiti ciljeva
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +77,Research & Development,Istraživanje i razvoj
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Research & Development,Istraživanje i razvoj
 ,Amount to Bill,Iznos za naplatu
 DocType: Company,Registration Details,Registracija Brodu
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +75,Staking,Staking
 DocType: Item,Re-Order Qty,Re-order Količina
 DocType: Leave Block List Date,Leave Block List Date,Ostavite Date Popis Block
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +25,Scheduled to send to {0},Planirano za slanje na {0}
@@ -792,18 +761,16 @@
 DocType: Sales Invoice Item,Stock Details,Stock Detalji
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Projekt Vrijednost
 apps/erpnext/erpnext/config/selling.py +304,Point-of-Sale,Point-of-prodaju
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,Cannot carry forward {0},Ne mogu prenositi {0}
 apps/erpnext/erpnext/accounts/doctype/account/account.py +91,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","Stanje računa već u kredit, što se ne smije postaviti 'ravnoteža se mora' kao 'zaduženje """
 DocType: Account,Balance must be,Bilans mora biti
 DocType: Hub Settings,Publish Pricing,Objavite Pricing
 DocType: Notification Control,Expense Claim Rejected Message,Rashodi Zahtjev odbijen poruku
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +145,Nailing,Zakucavanje
 ,Available Qty,Dostupno Količina
 DocType: Purchase Taxes and Charges,On Previous Row Total,Na prethodni redak Ukupno
 DocType: Salary Slip,Working Days,Radnih dana
 DocType: Serial No,Incoming Rate,Dolazni Stopa
 DocType: Packing Slip,Gross Weight,Bruto težina
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +410,The name of your company for which you are setting up this system.,Ime vaše tvrtke za koje ste postavljanje ovog sustava .
+apps/erpnext/erpnext/public/js/setup_wizard.js +158,The name of your company for which you are setting up this system.,Ime vaše tvrtke za koje ste postavljanje ovog sustava .
 DocType: HR Settings,Include holidays in Total no. of Working Days,Uključi odmor u ukupnom. radnih dana
 DocType: Job Applicant,Hold,Zadrži
 DocType: Employee,Date of Joining,Datum pristupa
@@ -813,7 +780,6 @@
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +3,View Subscribers,Pogledaj Pretplatnici
 DocType: Purchase Invoice Item,Purchase Receipt,Račun kupnje
 ,Received Items To Be Billed,Primljeni Proizvodi se naplaćuje
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +114,Abrasive blasting,Pjeskarenje
 DocType: Employee,Ms,G-đa
 apps/erpnext/erpnext/config/accounts.py +148,Currency exchange rate master.,Majstor valute .
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +253,Unable to find Time Slot in the next {0} days for Operation {1},U nemogućnosti da pronađe termin u narednih {0} dana za operaciju {1}
@@ -825,7 +791,7 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +209,Serial No {0} does not belong to Item {1},Serijski Ne {0} ne pripada točki {1}
 DocType: Purchase Receipt Item Supplied,Required Qty,Potrebna Kol
 DocType: Bank Reconciliation,Total Amount,Ukupan iznos
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +32,Internet Publishing,Internet izdavaštvo
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,Internet izdavaštvo
 DocType: Production Planning Tool,Production Orders,Nalozi
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +35,Balance Value,Vrijednost bilance
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,Sales Cjenovnik
@@ -836,7 +802,7 @@
 DocType: Supplier,Default Payable Accounts,Uobičajeno Računi dobavljača
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,Zaposlenik {0} nije aktivan ili ne postoji
 DocType: Features Setup,Item Barcode,Barkod artikla
-apps/erpnext/erpnext/stock/doctype/item/item.py +487,Item Variants {0} updated,Stavka Varijante {0} ažurirani
+apps/erpnext/erpnext/stock/doctype/item/item.py +491,Item Variants {0} updated,Stavka Varijante {0} ažurirani
 DocType: Quality Inspection Reading,Reading 6,Čitanje 6
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Kupnja fakture Predujam
 DocType: Address,Shop,Prodavnica
@@ -845,7 +811,7 @@
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,"Zadana banka / novčani račun će se automatski ažurirati prema POS računu, kada je ovaj mod odabran."
 DocType: Employee,Permanent Address Is,Stalna adresa je
 DocType: Production Order Operation,Operation completed for how many finished goods?,Operacija završena za koliko gotovih proizvoda?
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +491,The Brand,The Brand
+apps/erpnext/erpnext/public/js/setup_wizard.js +237,The Brand,The Brand
 apps/erpnext/erpnext/controllers/status_updater.py +163,Allowance for over-{0} crossed for Item {1}.,Dodatak za prekomjerno {0} prešao za točku {1}.
 DocType: Employee,Exit Interview Details,Izlaz Intervju Detalji
 DocType: Item,Is Purchase Item,Je dobavljivi proizvod
@@ -865,16 +831,16 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Indirect Income,Neizravni dohodak
 DocType: Payment Tool,Set Payment Amount = Outstanding Amount,Set iznos uplate = preostali iznos
 DocType: Contact Us Settings,Address Line 1,Adresa - linija 1
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Variance,Varijacija
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +392,Company Name,Naziv preduzeća
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +53,Variance,Varijacija
+,Company Name,Naziv preduzeća
 DocType: SMS Center,Total Message(s),Ukupno poruka ( i)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +515,Select Item for Transfer,Izaberite Stavka za transfer
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +538,Select Item for Transfer,Izaberite Stavka za transfer
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,Pogledaj listu svih snimke Pomoć
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,Odaberite račun šefa banke gdje je ček bio pohranjen.
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,Dopustite korisniku uređivanje cjenika u transakcijama
 DocType: Pricing Rule,Max Qty,Max kol
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +106,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Row {0}: Plaćanje protiv Prodaja / narudžbenice treba uvijek biti označeni kao unaprijed
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +16,Chemical,Hemijski
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,Hemijski
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +693,All items have already been transferred for this Production Order.,Svi predmeti su već prebačen za ovu proizvodnju Order.
 DocType: Process Payroll,Select Payroll Year and Month,Odaberite plata i godina Mjesec
 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""",Idi na odgovarajuću grupu (obično Primjena sredstava&gt; Kratkotrajna imovina&gt; bankovnih računa i stvoriti novi račun (klikom na Dodaj djeteta) tipa &quot;Banka&quot;
@@ -885,12 +851,12 @@
 DocType: Item,Inspection Criteria,Inspekcijski Kriteriji
 apps/erpnext/erpnext/config/accounts.py +101,Tree of finanial Cost Centers.,Drvo finanial troška .
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,Prenose
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +492,Upload your letter head and logo. (you can edit them later).,Unos glavu pismo i logo. (Možete ih kasnije uređivanje).
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +156,White,Bijel
+apps/erpnext/erpnext/public/js/setup_wizard.js +238,Upload your letter head and logo. (you can edit them later).,Unos glavu pismo i logo. (Možete ih kasnije uređivanje).
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,White,Bijel
 DocType: SMS Center,All Lead (Open),Svi potencijalni kupci (aktualni)
 DocType: Purchase Invoice,Get Advances Paid,Kreiraj avansno plaćanje
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +362,Attach Your Picture,Priložite svoju sliku
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Make ,Napraviti
+apps/erpnext/erpnext/public/js/setup_wizard.js +112,Attach Your Picture,Priložite svoju sliku
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +540,Make ,Napraviti
 DocType: Journal Entry,Total Amount in Words,Ukupan iznos riječima
 DocType: Workflow State,Stop,zaustaviti
 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.,Došlo je do pogreške . Jedan vjerojatan razlog bi mogao biti da niste spremili obrazac. Molimo kontaktirajte support@erpnext.com ako se problem ne riješi .
@@ -899,14 +865,13 @@
 DocType: Lead,Next Contact Date,Sljedeća Kontakt Datum
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,Otvaranje Kol
 DocType: Holiday List,Holiday List Name,Naziv liste odmora
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +168,Stock Options,Stock Opcije
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +168,Stock Options,Stock Opcije
 DocType: Journal Entry Account,Expense Claim,Rashodi polaganja
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +181,Qty for {0},Količina za {0}
 DocType: Leave Application,Leave Application,Ostavite aplikaciju
 apps/erpnext/erpnext/config/hr.py +77,Leave Allocation Tool,Ostavite raspodjele alat
 DocType: Leave Block List,Leave Block List Dates,Ostavite datumi lista blokiranih
 DocType: Company,If Monthly Budget Exceeded (for expense account),Ako Mjesečni budžet prekoračena (za trošak računa)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +56,Trimming,Podrezivanje
 DocType: Workstation,Net Hour Rate,Neto Hour Rate
 DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,Sletio Trošak Kupnja Potvrda
 DocType: Company,Default Terms,Uobičajeno Uvjeti
@@ -914,10 +879,9 @@
 DocType: POS Profile,Cash/Bank Account,Novac / bankovni račun
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,Removed items with no change in quantity or value.,Ukloniti stavke bez promjene u količini ili vrijednosti.
 DocType: Delivery Note,Delivery To,Dostava za
-apps/erpnext/erpnext/stock/doctype/item/item.py +509,Attribute table is mandatory,Atribut sto je obavezno
+apps/erpnext/erpnext/stock/doctype/item/item.py +513,Attribute table is mandatory,Atribut sto je obavezno
 DocType: Production Planning Tool,Get Sales Orders,Kreiraj narudžbe
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} ne može biti negativna
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +103,Filing,Podnošenje
 apps/erpnext/erpnext/templates/form_grid/item_grid.html +72,Discount,Popust
 DocType: Features Setup,Purchase Discounts,Kupnja Popusti
 DocType: Workstation,Wages,Plata
@@ -934,6 +898,7 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +112,You are the Expense Approver for this record. Please Update the 'Status' and Save,"Vi steRashodi Odobritelj za ovaj rekord . Molimo Ažuriranje "" status"" i Save"
 DocType: Serial No,Creation Document No,Stvaranje dokumenata nema
 DocType: Issue,Issue,Izdanje
+apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account does not match with Company,Račun ne odgovara poduzeća
 apps/erpnext/erpnext/config/stock.py +136,"Attributes for Item Variants. e.g Size, Color etc.","Osobine Stavka Varijante. npr veličina, boja i sl"
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +39,WIP Warehouse,WIP Skladište
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +194,Serial No {0} is under maintenance contract upto {1},Serijski Ne {0} je pod ugovorom za održavanje upto {1}
@@ -942,7 +907,7 @@
 DocType: Tax Rule,Shipping State,State dostava
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,Stavka mora biti dodan pomoću 'Get stavki iz Kupovina Primici' gumb
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,Prodajni troškovi
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Buying,Standardna kupnju
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +120,Standard Buying,Standardna kupnju
 DocType: GL Entry,Against,Protiv
 DocType: Item,Default Selling Cost Center,Zadani trošak prodaje
 DocType: Sales Partner,Implementation Partner,Provedba partner
@@ -963,29 +928,29 @@
 DocType: Time Log Batch,updated via Time Logs,ažurirani preko Time Dnevnici
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,Prosječna starost
 DocType: Opportunity,Your sales person who will contact the customer in future,Vaš prodavač koji će ubuduće kontaktirati kupca
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +588,List a few of your suppliers. They could be organizations or individuals.,Navedite nekoliko svojih dobavljača. Oni mogu biti tvrtke ili fizičke osobe.
+apps/erpnext/erpnext/public/js/setup_wizard.js +326,List a few of your suppliers. They could be organizations or individuals.,Navedite nekoliko svojih dobavljača. Oni mogu biti tvrtke ili fizičke osobe.
 DocType: Company,Default Currency,Zadana valuta
 DocType: Contact,Enter designation of this Contact,Upišite oznaku ove Kontakt
 DocType: Contact Us Settings,Address,Adresa
 DocType: Expense Claim,From Employee,Od zaposlenika
-apps/erpnext/erpnext/controllers/accounts_controller.py +338,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Upozorenje : Sustav neće provjeravati overbilling od iznosa za točku {0} u {1} je nula
+apps/erpnext/erpnext/controllers/accounts_controller.py +339,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Upozorenje : Sustav neće provjeravati overbilling od iznosa za točku {0} u {1} je nula
 DocType: Journal Entry,Make Difference Entry,Čine razliku Entry
 DocType: Upload Attendance,Attendance From Date,Gledatelja Od datuma
 DocType: Appraisal Template Goal,Key Performance Area,Područje djelovanja
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +54,Transportation,promet
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +54,Transportation,promet
 apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +67, and year: ,i godina:
 DocType: Email Digest,Annual Expense,Godišnji trošak
 DocType: SMS Center,Total Characters,Ukupno Likovi
-apps/erpnext/erpnext/controllers/buying_controller.py +139,Please select BOM in BOM field for Item {0},Molimo odaberite BOM BOM u polje za Stavka {0}
+apps/erpnext/erpnext/controllers/buying_controller.py +130,Please select BOM in BOM field for Item {0},Molimo odaberite BOM BOM u polje za Stavka {0}
 DocType: C-Form Invoice Detail,C-Form Invoice Detail,C-Obrazac Račun Detalj
 DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,Pomirenje Plaćanje fakture
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +32,Contribution %,Doprinos%
 DocType: Item,website page link,web stranica vode
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +192,Let's prepare the system for first use.,Idemo pripremiti sustav za prve upotrebe.
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +242,Let's prepare the system for first use.,Idemo pripremiti sustav za prve upotrebe.
 DocType: Company,Company registration numbers for your reference. Tax numbers etc.,Tvrtka registracijski brojevi za svoju referencu. Porezni brojevi itd.
 DocType: Sales Partner,Distributor,Distributer
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Košarica Shipping pravilo
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +214,Production Order {0} must be cancelled before cancelling this Sales Order,Proizvodnja Red {0} mora biti otkazana prije poništenja ovu prodajnog naloga
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +209,Production Order {0} must be cancelled before cancelling this Sales Order,Proizvodnja Red {0} mora biti otkazana prije poništenja ovu prodajnog naloga
 ,Ordered Items To Be Billed,Naručeni artikli za naplatu
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +24,From Range has to be less than To Range,Od opseg mora biti manji od u rasponu
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +21,Select Time Logs and Submit to create a new Sales Invoice.,Odaberite vrijeme Evidencije i slanje stvoriti novi prodajni fakture.
@@ -1005,14 +970,13 @@
 DocType: Sales Invoice Advance,Sales Invoice Advance,Predujam prodajnog računa
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +398,Nothing to request,Ništa se zatražiti
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date',"' Stvarni datum početka ' ne može biti veći od stvarnih datuma završetka """
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +75,Management,upravljanje
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +75,Management,upravljanje
 apps/erpnext/erpnext/config/projects.py +33,Types of activities for Time Sheets,Vrste aktivnosti za vrijeme listova
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +14,Investment casting,Investment casting
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +51,Either debit or credit amount is required for {0},Ili debitna ili kreditna iznos potreban za {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""","Ovo će biti dodan na Šifra za varijantu. Na primjer, ako je vaš skraćenica ""SM"", a stavka kod je ""T-SHIRT"", stavka kod varijante će biti ""T-SHIRT-SM"""
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,Neto plaća (riječima) će biti vidljiva nakon što spremite klizne plaće.
 apps/frappe/frappe/core/doctype/user/user_list.js +12,Active,Aktivan
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +154,Blue,Plava boja
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +154,Blue,Plava boja
 DocType: Purchase Invoice,Is Return,Je li povratak
 DocType: Price List Country,Price List Country,Cijena Lista država
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +123,Further nodes can be only created under 'Group' type nodes,"Daljnje čvorovi mogu se samo stvorio pod ""Grupa"" tipa čvorova"
@@ -1022,18 +986,16 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +22,POS Profile {0} already created for user: {1} and company {2},POS profil {0} već kreirali za korisnika: {1} {2} i kompanija
 DocType: Purchase Order Item,UOM Conversion Factor,UOM konverzijski faktor
 DocType: Stock Settings,Default Item Group,Zadana grupa proizvoda
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +156,Laminated object manufacturing,Laminirano proizvodnih objekata
 apps/erpnext/erpnext/config/buying.py +13,Supplier database.,Šifarnik dobavljača
 DocType: Account,Balance Sheet,Završni račun
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +561,Cost Center For Item with Item Code ',Troška Za Stavke sa Šifra '
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +45,Stretch forming,Stretch formiranje
 DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,Prodavač će dobiti podsjetnik na taj datum kako bi pravovremeno kontaktirao kupca
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +210,"Further accounts can be made under Groups, but entries can be made against non-Groups","Dalje računa može biti pod Grupe, ali unosa može biti protiv ne-Grupe"
 apps/erpnext/erpnext/config/hr.py +125,Tax and other salary deductions.,Porez i drugih isplata plaća.
 DocType: Lead,Lead,Potencijalni kupac
 DocType: Email Digest,Payables,Obveze
 DocType: Account,Warehouse,Skladište
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +90,Row #{0}: Rejected Qty can not be entered in Purchase Return,Row # {0}: Odbijena Količina ne može unijeti u Kupovina Povratak
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +93,Row #{0}: Rejected Qty can not be entered in Purchase Return,Row # {0}: Odbijena Količina ne može unijeti u Kupovina Povratak
 ,Purchase Order Items To Be Billed,Narudžbenica Proizvodi se naplaćuje
 DocType: Purchase Invoice Item,Net Rate,Neto stopa
 DocType: Purchase Invoice Item,Purchase Invoice Item,Kupnja fakture predmet
@@ -1048,13 +1010,13 @@
 DocType: Global Defaults,Current Fiscal Year,Tekuće fiskalne godine
 DocType: Global Defaults,Disable Rounded Total,Ugasiti zaokruženi iznos
 DocType: Lead,Call,Poziv
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +384,'Entries' cannot be empty,' Prijave ' ne može biti prazno
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +386,'Entries' cannot be empty,' Prijave ' ne može biti prazno
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},Dupli red {0} sa istim {1}
 ,Trial Balance,Pretresno bilanca
 apps/erpnext/erpnext/config/hr.py +205,Setting up Employees,Postavljanje Zaposleni
 apps/erpnext/erpnext/public/js/feature_setup.js +220,"Grid ""","Grid """
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +150,Please select prefix first,Odaberite prefiks prvi
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +138,Research,istraživanje
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +138,Research,istraživanje
 DocType: Maintenance Visit Purpose,Work Done,Rad Done
 apps/erpnext/erpnext/controllers/item_variant.py +25,Please specify at least one attribute in the Attributes table,Molimo navedite barem jedan atribut atribute tabeli
 DocType: Contact,User ID,Korisnički ID
@@ -1062,10 +1024,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +57,View Ledger,Pogledaj Ledger
 DocType: File,Lft,LFT
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Najstarije
-apps/erpnext/erpnext/stock/doctype/item/item.py +394,"An Item Group exists with same name, please change the item name or rename the item group","Stavka Grupa postoji s istim imenom , molimo promijenite ime stavku ili preimenovati stavku grupe"
+apps/erpnext/erpnext/stock/doctype/item/item.py +398,"An Item Group exists with same name, please change the item name or rename the item group","Stavka Grupa postoji s istim imenom , molimo promijenite ime stavku ili preimenovati stavku grupe"
 DocType: Communication,Delivery Status,Status isporuke
 DocType: Production Order,Manufacture against Sales Order,Proizvodnja protiv prodaje Reda
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +517,Rest Of The World,Ostatak svijeta
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +455,Rest Of The World,Ostatak svijeta
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,Stavka {0} ne može imati Batch
 ,Budget Variance Report,Proračun varijance Prijavi
 DocType: Salary Slip,Gross Pay,Bruto plaća
@@ -1076,13 +1038,11 @@
 DocType: BOM Item,Item Description,Opis artikla
 DocType: Payment Tool,Payment Mode,Način plaćanja
 DocType: Purchase Invoice,Is Recurring,Je li se ponavlja
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +154,Direct metal laser sintering,Direktan metala laserom sinteriranje
 DocType: Purchase Order,Supplied Items,Isporučenog pribora
 DocType: Production Order,Qty To Manufacture,Količina za proizvodnju
 DocType: Buying Settings,Maintain same rate throughout purchase cycle,Održavanje istu stopu tijekom kupnje ciklusa
 DocType: Opportunity Item,Opportunity Item,Prilika artikla
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +61,Temporary Opening,Privremeni Otvaranje
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +41,Cryorolling,Cryorolling
 ,Employee Leave Balance,Zaposlenik napuste balans
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +128,Balance for Account {0} must always be {1},Bilans konta {0} uvijek mora biti {1}
 DocType: Address,Address Type,Tip adrese
@@ -1098,23 +1058,23 @@
 DocType: Journal Entry,Get Outstanding Invoices,Kreiraj neplaćene račune
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,Prodajnog naloga {0} nije ispravan
 apps/erpnext/erpnext/setup/doctype/company/company.py +172,"Sorry, companies cannot be merged","Žao nam je , tvrtke ne mogu spojiti"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +145,Small,Mali
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Small,Mali
 DocType: Employee,Employee Number,Zaposlenik Broj
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},Slučaj Ne ( i) je već u uporabi . Pokušajte s predmetu broj {0}
 ,Invoiced Amount (Exculsive Tax),Dostavljeni iznos ( Exculsive poreza )
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,Stavku 2
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +59,Account head {0} created,Zaglavlje konta {0} je kreirano
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +153,Green,Zelenilo
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Green,Zelenilo
 DocType: Item,Auto re-order,Autorefiniš reda
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +57,Total Achieved,Ukupno Ostvareni
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +59,Total Achieved,Ukupno Ostvareni
 DocType: Employee,Place of Issue,Mjesto izdavanja
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +59,Contract,ugovor
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Contract,ugovor
 DocType: Report,Disabled,Ugašeno
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +490,UOM coversion factor required for UOM: {0} in Item: {1},UOM faktor coversion potrebna za UOM: {0} u točki: {1}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +83,Indirect Expenses,Neizravni troškovi
 apps/erpnext/erpnext/controllers/selling_controller.py +163,Row {0}: Qty is mandatory,Red {0}: Količina je obvezno
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +8,Agriculture,Poljoprivreda
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +611,Your Products or Services,Vaši proizvodi ili usluge
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,Poljoprivreda
+apps/erpnext/erpnext/public/js/setup_wizard.js +347,Your Products or Services,Vaši proizvodi ili usluge
 DocType: Mode of Payment,Mode of Payment,Način plaćanja
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,To jekorijen stavka grupa i ne može se mijenjati .
 DocType: Journal Entry Account,Purchase Order,Narudžbenica
@@ -1126,7 +1086,7 @@
 DocType: Serial No,Serial No Details,Serijski nema podataka
 DocType: Purchase Invoice Item,Item Tax Rate,Poreska stopa artikla
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +113,"For {0}, only credit accounts can be linked against another debit entry","Za {0}, samo kredit računa može biti povezan protiv drugog ulaska debit"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Delivery Note {0} is not submitted,Otpremnica {0} nije potvrđena
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +470,Delivery Note {0} is not submitted,Otpremnica {0} nije potvrđena
 apps/erpnext/erpnext/stock/get_item_details.py +136,Item {0} must be a Sub-contracted Item,Stavka {0} mora bitisklopljen ugovor artikla
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,Kapitalni oprema
 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.","Cijene Pravilo prvo se bira na temelju 'Nanesite na' terenu, koji može biti točka, točka Grupa ili Brand."
@@ -1136,7 +1096,7 @@
 DocType: Appraisal Goal,Goal,Cilj
 DocType: Sales Invoice Item,Edit Description,Uredi opis
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +318,Expected Delivery Date is lesser than Planned Start Date.,Očekivani datum isporuke je manje nego što je planirano Ozljede Datum.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +579,For Supplier,za Supplier
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +602,For Supplier,za Supplier
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,Postavljanje Vrsta računa pomaže u odabiru ovaj račun u prometu.
 DocType: Purchase Invoice,Grand Total (Company Currency),Sveukupno (valuta tvrtke)
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,Ukupno Odlazni
@@ -1162,10 +1122,10 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +74,"Total {0} for all items is zero, may you should change 'Distribute Charges Based On'","Ukupno {0} za sve stavke nula, možda bi trebalo promijeniti &quot;Podijelite Optužbe na osnovu &#39;"
 DocType: Purchase Invoice,Taxes and Charges Calculation,Porezi i naknade Proračun
 DocType: BOM Operation,Workstation,Workstation
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +112,Hardware,Hardver
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +112,Hardware,Hardver
 DocType: Attendance,HR Manager,Šef ljudskih resursa
 apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,Molimo odaberite poduzeća
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +50,Privilege Leave,Privilege dopust
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +50,Privilege Leave,Privilege dopust
 DocType: Purchase Invoice,Supplier Invoice Date,Dobavljač Datum fakture
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +79,You need to enable Shopping Cart,Trebate omogućiti Košarica
 apps/frappe/frappe/public/js/frappe/form/grid_body.html +6,No Data,Nema podataka
@@ -1178,7 +1138,7 @@
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +81,Overlapping conditions found between:,Preklapanje uvjeti nalaze između :
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +168,Against Journal Entry {0} is already adjusted against some other voucher,Protiv Journal Entry {0} je već prilagođen protiv nekih drugih vaučer
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +68,Total Order Value,Ukupna vrijednost Order
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +38,Food,Hrana
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +38,Food,Hrana
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Starenje Range 3
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +139,You can make a time log only against a submitted production order,Možete napraviti vremena dnevnik samo protiv podnosi proizvodnju kako bi
 DocType: Maintenance Schedule Item,No of Visits,Bez pregleda
@@ -1198,6 +1158,7 @@
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,View Offer Letter,Pogledaj Ponuda Pismo
 DocType: Communication,Communication,Komunikacija
 DocType: Item,Is Service Item,Je usluga
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +81,Application period cannot be outside leave allocation period,Period aplikacija ne može biti razdoblje raspodjele izvan odsustva
 DocType: Activity Cost,Projects,Projekti
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +31,Please select Fiscal Year,Odaberite Fiskalna godina
 apps/erpnext/erpnext/controllers/buying_controller.py +23,From {0} | {1} {2},Od {0} | {1} {2}
@@ -1216,7 +1177,7 @@
 DocType: Item,Maintain Stock,Održavati Stock
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +213,Stock Entries already created for Production Order ,Stock unosi već stvorene za proizvodnju Order
 DocType: Leave Control Panel,Leave blank if considered for all designations,Ostavite prazno ako smatra za sve oznake
-apps/erpnext/erpnext/controllers/accounts_controller.py +499,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Punjenje tipa ' Stvarni ' u redu {0} ne mogu biti uključeni u točki Rate
+apps/erpnext/erpnext/controllers/accounts_controller.py +500,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Punjenje tipa ' Stvarni ' u redu {0} ne mogu biti uključeni u točki Rate
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,Max: {0},Max: {0}
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +16,From Datetime,Od datuma i vremena
 DocType: Email Digest,For Company,Za tvrtke
@@ -1226,7 +1187,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +50,Chart of Accounts,Šifarnik konta
 DocType: Material Request,Terms and Conditions Content,Uvjeti sadržaj
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +471,cannot be greater than 100,ne može biti veća od 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +546,Item {0} is not a stock Item,Stavka {0} nijestock Stavka
+apps/erpnext/erpnext/stock/doctype/item/item.py +550,Item {0} is not a stock Item,Stavka {0} nijestock Stavka
 DocType: Maintenance Visit,Unscheduled,Neplanski
 DocType: Employee,Owned,U vlasništvu
 DocType: Salary Slip Deduction,Depends on Leave Without Pay,Ovisi o neplaćeni odmor
@@ -1240,31 +1201,29 @@
 DocType: HR Settings,Employee Settings,Postavke zaposlenih
 ,Batch-Wise Balance History,Batch-Wise bilanca Povijest
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +72,To Do List,Popis podsjetnika
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +63,Apprentice,šegrt
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Apprentice,šegrt
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +99,Negative Quantity is not allowed,Negativna količina nije dopuštena
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
 Used for Taxes and Charges","Porez detalj stol učitani iz stavka master kao string i pohranjeni u ovoj oblasti.
  Koristi se za poreza i naknada"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +61,Lancing,Lancing
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +151,Employee cannot report to himself.,Zaposleni ne može prijaviti za sebe.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Ako je račun zamrznut , unosi dopušteno ograničene korisnike ."
 DocType: Email Digest,Bank Balance,Banka Balance
-apps/erpnext/erpnext/controllers/accounts_controller.py +435,Accounting Entry for {0}: {1} can only be made in currency: {2},Knjiženju za {0}: {1} može se vršiti samo u valuti: {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +436,Accounting Entry for {0}: {1} can only be made in currency: {2},Knjiženju za {0}: {1} može se vršiti samo u valuti: {2}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +38,No active Salary Structure found for employee {0} and the month,Nema aktivnih struktura plata nađeni za zaposlenog {0} i mjesec
 DocType: Job Opening,"Job profile, qualifications required etc.","Profil posla , kvalifikacijama i sl."
 DocType: Journal Entry Account,Account Balance,Bilans konta
 apps/erpnext/erpnext/config/accounts.py +112,Tax Rule for transactions.,Porez pravilo za transakcije.
 DocType: Rename Tool,Type of document to rename.,Vrsta dokumenta za promjenu naziva.
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +630,We buy this Item,Kupili smo ovaj artikal
+apps/erpnext/erpnext/public/js/setup_wizard.js +366,We buy this Item,Kupili smo ovaj artikal
 DocType: Address,Billing,Naplata
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +77,Flanging,Hitas
 DocType: Bulk Email,Not Sent,Ne šalje
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +73,Explosive forming,Eksplozivna formiranje
 DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),Ukupno Porezi i naknade (Društvo valuta)
 DocType: Shipping Rule,Shipping Account,Konto transporta
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +43,Scheduled to send to {0} recipients,Planirano za slanje na {0} primaoca
 DocType: Quality Inspection,Readings,Očitavanja
 DocType: Stock Entry,Total Additional Costs,Ukupno dodatnih troškova
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Sub Assemblies,pod skupštine
+apps/erpnext/erpnext/public/js/setup_wizard.js +359,Sub Assemblies,pod skupštine
 DocType: Shipping Rule Condition,To Value,Za vrijednost
 DocType: Supplier,Stock Manager,Stock Manager
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +143,Source warehouse is mandatory for row {0},Izvor skladište je obvezno za redom {0}
@@ -1274,44 +1233,42 @@
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Uvoz nije uspio!
 apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,No adresu dodao još.
 DocType: Workstation Working Hour,Workstation Working Hour,Workstation Radno vrijeme
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +83,Analyst,analitičar
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +202,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Row {0}: {1} Izdvojena iznos mora biti manji od ili jednak JV iznos {2}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Analyst,analitičar
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +149,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Row {0}: {1} Izdvojena iznos mora biti manji od ili jednak JV iznos {2}
 DocType: Item,Inventory,Inventar
 DocType: Features Setup,"To enable ""Point of Sale"" view",Da biste omogućili &quot;Point of Sale&quot; pogled
 apps/erpnext/erpnext/public/js/pos/pos.js +402,Payment cannot be made for empty cart,Plaćanje ne može biti za prazan košaricu
 DocType: Item,Sales Details,Prodajni detalji
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +149,Pinning,Prikačuju
 DocType: Opportunity,With Items,Sa stavkama
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,u kol
 DocType: Notification Control,Expense Claim Rejected,Rashodi Zahtjev odbijen
 DocType: Sales Invoice,"The date on which next invoice will be generated. It is generated on submit.
 ",Datuma na koji će biti generiran pored fakture. Ona se stvara na dostavi.
 DocType: Item Attribute,Item Attribute,Stavka Atributi
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +105,Government,Vlada
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Government,Vlada
 apps/erpnext/erpnext/config/stock.py +268,Item Variants,Stavka Varijante
 DocType: Company,Services,Usluge
 apps/erpnext/erpnext/accounts/report/financial_statements.py +147,Total ({0}),Ukupno ({0})
 DocType: Cost Center,Parent Cost Center,Roditelj troška
 DocType: Sales Invoice,Source,Izvor
 DocType: Leave Type,Is Leave Without Pay,Ostavi se bez plate
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +186,No records found in the Payment table,Nisu pronađeni u tablici plaćanja
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +405,Financial Year Start Date,Financijska godina Start Date
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +133,No records found in the Payment table,Nisu pronađeni u tablici plaćanja
+apps/erpnext/erpnext/public/js/setup_wizard.js +153,Financial Year Start Date,Financijska godina Start Date
 DocType: Employee External Work History,Total Experience,Ukupno Iskustvo
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +100,Countersinking,Upuštanje
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +271,Packing Slip(s) cancelled,Pakiranje proklizavanja ( s) otkazan
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +276,Packing Slip(s) cancelled,Pakiranje proklizavanja ( s) otkazan
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,Teretni i Forwarding Optužbe
 DocType: Material Request Item,Sales Order No,Narudžba kupca br
 DocType: Item Group,Item Group Name,Naziv grupe artikla
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +50,Taken,Taken
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,Taken
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +66,Transfer Materials for Manufacture,Transfer Materijali za Proizvodnja
 DocType: Pricing Rule,For Price List,Za Cjeniku
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +27,Executive Search,Executive Search
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,Executive Search
 apps/erpnext/erpnext/stock/stock_ledger.py +405,"Purchase rate for item: {0} not found, which is required to book accounting entry (expense). Please mention item price against a buying price list.","Stopa Kupovina za stavku: {0} nije pronađena, koja je potrebna za rezervaciju računovodstvo unos (rashodi). Navedite stavke cijenu protiv otkupna cijena liste."
 DocType: Maintenance Schedule,Schedules,Rasporedi
 DocType: Purchase Invoice Item,Net Amount,Neto iznos
 DocType: Purchase Order Item Supplied,BOM Detail No,BOM detalji - broj
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),Dodatni popust Iznos (Company valuta)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +537,Error: {0} > {1},Pogreška : {0} > {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +541,Error: {0} > {1},Pogreška : {0} > {1}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,Molimo stvoriti novi račun iz kontnog plana .
 DocType: Maintenance Visit,Maintenance Visit,Održavanje Posjetite
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer > Customer Group > Territory,Kupac> Korisnička Group> Regija
@@ -1322,7 +1279,6 @@
 DocType: Event,Tuesday,Utorak
 DocType: Leave Block List,Block Holidays on important days.,Blok Holidays o važnim dana.
 ,Accounts Receivable Summary,Potraživanja Pregled
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +43,Leaves for type {0} already allocated for Employee {1} for period {2} - {3},Ostavlja za tip {0} već izdvojeno za zaposlenog {1} {2} za razdoblje - {3}
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +187,Please set User ID field in an Employee record to set Employee Role,Molimo postavite korisniku ID polja u rekord zaposlenog da postavite uloga zaposlenih
 DocType: UOM,UOM Name,UOM Ime
 DocType: Top Bar Item,Target,Meta
@@ -1334,15 +1290,14 @@
 DocType: ToDo,Due Date,Datum dospijeća
 DocType: Sales Invoice Item,Brand Name,Naziv brenda
 DocType: Purchase Receipt,Transporter Details,Transporter Detalji
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Box,Kutija
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +389,The Organization,Organizacija
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Box,Kutija
+apps/erpnext/erpnext/public/js/setup_wizard.js +137,The Organization,Organizacija
 DocType: Monthly Distribution,Monthly Distribution,Mjesečni Distribucija
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,Receiver Lista je prazna . Molimo stvoriti Receiver Popis
 DocType: Production Plan Sales Order,Production Plan Sales Order,Proizvodnja plan prodajnog naloga
 DocType: Sales Partner,Sales Partner Target,Prodaja partner Target
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},{1}: knjiženju za {0} može se vršiti samo u valuti
 DocType: Pricing Rule,Pricing Rule,cijene Pravilo
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +58,Notching,Zaseka
 apps/erpnext/erpnext/config/learn.py +167,Material Request to Purchase Order,Materijal Zahtjev za narudžbenice
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +74,Row # {0}: Returned Item {1} does not exists in {2} {3},Row # {0}: {1} Returned Stavka ne postoji u {2} {3}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,Bankovni računi
@@ -1359,20 +1314,19 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Amounts not reflected in bank,Iznosi ne ogleda u banci
 DocType: Quality Inspection Reading,Reading 4,Čitanje 4
 apps/erpnext/erpnext/config/hr.py +23,Claims for company expense.,Potraživanja za tvrtke trošak.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +8,Centrifugal casting,Centrifugalne casting
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +119,Magnetic field-assisted finishing,Magnetno polje uz pomoć Završeno
 DocType: Company,Default Holiday List,Uobičajeno Holiday List
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +165,Stock Liabilities,Stock Obveze
 DocType: Purchase Receipt,Supplier Warehouse,Dobavljač galerija
 DocType: Opportunity,Contact Mobile No,Kontak GSM
 DocType: Production Planning Tool,Select Sales Orders,Odaberite narudžbe kupca
 ,Material Requests for which Supplier Quotations are not created,Materijalni Zahtjevi za koje Supplier Citati nisu stvorene
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +117,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,Dan (e) na koje se prijavljujete za odmor su praznici. Vi ne trebate podnijeti zahtjev za dozvolu.
 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.,Za praćenje stavki pomoću barkod. Vi ćete biti u mogućnosti da unesete stavke u otpremnici i prodaje Računa skeniranjem barkod stavke.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +477,Mark as Delivered,Mark kao Isporučena
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +497,Mark as Delivered,Mark kao Isporučena
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +34,Make Quotation,Make ponudu
 DocType: Dependent Task,Dependent Task,Zavisna Task
-apps/erpnext/erpnext/stock/doctype/item/item.py +306,Conversion factor for default Unit of Measure must be 1 in row {0},Faktor pretvorbe za zadani jedinica mjere mora biti jedan u nizu {0}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,Leave of type {0} cannot be longer than {1},Ostavite tipa {0} ne može biti duži od {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +310,Conversion factor for default Unit of Measure must be 1 in row {0},Faktor pretvorbe za zadani jedinica mjere mora biti jedan u nizu {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +155,Leave of type {0} cannot be longer than {1},Ostavite tipa {0} ne može biti duži od {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Pokušajte planiraju operacije za X dana unaprijed.
 DocType: HR Settings,Stop Birthday Reminders,Zaustavi Rođendan Podsjetnici
 DocType: SMS Center,Receiver List,Prijemnik Popis
@@ -1380,15 +1334,14 @@
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Consumed Iznos
 apps/erpnext/erpnext/public/js/pos/pos.js +491,{0} View,{0} Pogledaj
 DocType: Salary Structure Deduction,Salary Structure Deduction,Plaća Struktura Odbitak
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +158,Selective laser sintering,Selektivno lasersko sinteriranje
-apps/erpnext/erpnext/stock/doctype/item/item.py +301,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Jedinica mjere {0} je ušao više od jednom u konverzije Factor tablici
+apps/erpnext/erpnext/stock/doctype/item/item.py +305,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Jedinica mjere {0} je ušao više od jednom u konverzije Factor tablici
 apps/frappe/frappe/core/page/data_import_tool/data_import_tool.js +108,Import Successful!,Uvoz uspješan!
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Troškovi Izdata Predmeti
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +185,Quantity must not be more than {0},Količina ne smije biti više od {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +41,Age (Days),Starost (dani)
 DocType: Quotation Item,Quotation Item,Artikl iz ponude
 DocType: Account,Account Name,Naziv konta
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +41,From Date cannot be greater than To Date,Od datuma ne može biti veća od To Date
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +34,From Date cannot be greater than To Date,Od datuma ne može biti veća od To Date
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +194,Serial No {0} quantity {1} cannot be a fraction,Serijski Ne {0} {1} količina ne može bitidio
 apps/erpnext/erpnext/config/buying.py +59,Supplier Type master.,Dobavljač Vrsta majstor .
 DocType: Purchase Order Item,Supplier Part Number,Dobavljač Broj dijela
@@ -1397,14 +1350,14 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +247,{0} {1} is cancelled or stopped,{0} {1} je otkazan ili zaustavljen
 DocType: Accounts Settings,Credit Controller,Kreditne kontroler
 DocType: Delivery Note,Vehicle Dispatch Date,Vozilo Dispatch Datum
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +197,Purchase Receipt {0} is not submitted,Račun kupnje {0} nije podnesen
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +198,Purchase Receipt {0} is not submitted,Račun kupnje {0} nije podnesen
 DocType: Company,Default Payable Account,Uobičajeno računa se plaća
 apps/erpnext/erpnext/config/website.py +13,"Settings for online shopping cart such as shipping rules, price list etc.","Postavke za online kupovinu košaricu poput shipping pravila, cjenik i sl"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +660,Setup Complete,Podešavanje je okončano
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +124,Setup Complete,Podešavanje je okončano
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +65,{0}% Billed,{0}% Fakturisana
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +17,Reserved Qty,Rezervirano Kol
 DocType: Party Account,Party Account,Party račun
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +74,Human Resources,Ljudski resursi
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +74,Human Resources,Ljudski resursi
 DocType: Lead,Upper Income,Gornja Prihodi
 DocType: Journal Entry Account,Debit in Company Currency,Debit u Company valuta
 apps/erpnext/erpnext/support/doctype/issue/issue.py +58,My Issues,Moja pitanja
@@ -1413,11 +1366,9 @@
 DocType: Company,Default Values,Default vrijednosti
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +236,Row {0}: Payment amount can not be negative,Row {0}: iznos plaćanja ne može biti negativna
 DocType: Expense Claim,Total Amount Reimbursed,Ukupan iznos nadoknađeni
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +152,Press fitting,Press montažu
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +64,Against Supplier Invoice {0} dated {1},Protiv Dobavljač fakture {0} od {1}
 DocType: Customer,Default Price List,Zadani cjenik
 DocType: Payment Reconciliation,Payments,Plaćanja
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +24,Hot isostatic pressing,Hot izostatska pritiskom
 DocType: ToDo,Medium,Srednji
 DocType: Budget Detail,Budget Allocated,Dodijeljeni proračun
 DocType: Journal Entry,Entry Type,Entry Tip
@@ -1430,9 +1381,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +56,None of the items have any change in quantity or value.,Nijedan od stavki imaju bilo kakve promjene u količini ili vrijednosti.
 DocType: Warranty Claim,Warranty Claim,Jamstvo potraživanje
 ,Lead Details,Detalji potenciajalnog kupca
-DocType: Authorization Rule,Approving User,Odobravanje korisnika
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +37,Forging,Kovanje
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +126,Plating,Pozlaćivanje
 DocType: Purchase Invoice,End date of current invoice's period,Kraj datum tekućeg razdoblja dostavnice
 DocType: Pricing Rule,Applicable For,primjenjivo za
 DocType: Bank Reconciliation,From Date,Od datuma
@@ -1454,31 +1402,29 @@
 DocType: Sales Invoice,Paid Amount (Company Currency),Uplaćeni iznos (poduzeća Valuta)
 DocType: Purchase Invoice,Additional Discount,Dodatni popust
 DocType: Selling Settings,Selling Settings,Podešavanja prodaje
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +39,Online Auctions,Online aukcije
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,Online aukcije
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +94,Please specify either Quantity or Valuation Rate or both,Navedite ili količini ili vrednovanja Ocijenite ili oboje
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +50,"Company, Month and Fiscal Year is mandatory","Tvrtka , Mjesec i Fiskalna godina je obvezno"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Marketing Expenses,Troškovi marketinga
 ,Item Shortage Report,Nedostatak izvješća za artikal
-apps/erpnext/erpnext/stock/doctype/item/item.js +183,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Težina se spominje, \n Navedite ""Težina UOM"" previše"
+apps/erpnext/erpnext/stock/doctype/item/item.js +185,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Težina se spominje, \n Navedite ""Težina UOM"" previše"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,Materijal Zahtjev se koristi da bi se ova Stock unos
 apps/erpnext/erpnext/config/support.py +43,Single unit of an Item.,Jedna jedinica stavku.
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +212,Time Log Batch {0} must be 'Submitted',"Vrijeme Log Batch {0} mora biti "" Postavio '"
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,Provjerite knjiženje za svaki burzi pokreta
 DocType: Leave Allocation,Total Leaves Allocated,Ukupno Lišće Dodijeljeni
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +384,Warehouse required at Row No {0},Skladište potrebno na red No {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +386,Warehouse required at Row No {0},Skladište potrebno na red No {0}
 DocType: Employee,Date Of Retirement,Datum odlaska u mirovinu
 DocType: Upload Attendance,Get Template,Kreiraj predložak
 DocType: Address,Postal,Poštanski
 DocType: Item,Weightage,Weightage
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +159,Mining,Rudarstvo
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +17,Resin casting,Smola casting
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,Grupa kupaca sa istim nazivom već postoji. Promijenite naziv kupca ili promijenite naziv grupe kupaca.
 apps/erpnext/erpnext/public/js/pos/pos.js +147,Please select {0} first.,Odaberite {0} na prvom mjestu.
 apps/erpnext/erpnext/templates/pages/order.html +57,text {0},text {0}
 DocType: Territory,Parent Territory,Roditelj Regija
 DocType: Quality Inspection Reading,Reading 2,Čitanje 2
 DocType: Stock Entry,Material Receipt,Materijal Potvrda
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +622,Products,Proizvodi
+apps/erpnext/erpnext/public/js/setup_wizard.js +358,Products,Proizvodi
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +47,Party Type and Party is required for Receivable / Payable account {0},Party Tip i stranka je potreban za potraživanja / računa plaćaju {0}
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.","Ako ova stavka ima varijante, onda ne može biti izabran u prodaji naloge itd"
 DocType: Lead,Next Contact By,Sljedeća Kontakt Do
@@ -1488,13 +1434,13 @@
 DocType: Purchase Invoice,Notification Email Address,Obavijest E-mail adresa
 DocType: Payment Tool,Find Invoices to Match,Pronađite Fakture da odgovara
 ,Item-wise Sales Register,Stavka-mudri prodaja registar
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +399,"e.g. ""XYZ National Bank""","npr ""XYZ Narodne banke """
+apps/erpnext/erpnext/public/js/setup_wizard.js +147,"e.g. ""XYZ National Bank""","npr ""XYZ Narodne banke """
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,Je li ovo pristojba uključena u osnovne stope?
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +57,Total Target,Ukupna ciljna
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Target,Ukupna ciljna
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.js +22,Shopping Cart is enabled,Košarica je omogućeno
 DocType: Job Applicant,Applicant for a Job,Kandidat za posao
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +173,No Production Orders created,Nema Radni nalozi stvoreni
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +131,Salary Slip of employee {0} already created for this month,Plaća Slip zaposlenika {0} već stvorena za ovaj mjesec
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +140,Salary Slip of employee {0} already created for this month,Plaća Slip zaposlenika {0} već stvorena za ovaj mjesec
 DocType: Stock Reconciliation,Reconciliation JSON,Pomirenje JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Previše stupovi. Izvesti izvješće i ispisati pomoću aplikacije za proračunske tablice.
 DocType: Sales Invoice Item,Batch No,Broj serije
@@ -1504,14 +1450,14 @@
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +13,Variant,Varijanta
 apps/frappe/frappe/public/js/frappe/form/toolbar.js +165,New {0},Nova {0}
 DocType: Naming Series,Set prefix for numbering series on your transactions,Postavite prefiks za numeriranje niza na svoje transakcije
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +169,Stopped order cannot be cancelled. Unstop to cancel.,Zaustavljen nalog ne može prekinuti. Otpušiti otkazati .
-apps/erpnext/erpnext/stock/doctype/item/item.py +323,Default BOM ({0}) must be active for this item or its template,Uobičajeno BOM ({0}) mora biti aktivna za ovu stavku ili njegove predložak
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +164,Stopped order cannot be cancelled. Unstop to cancel.,Zaustavljen nalog ne može prekinuti. Otpušiti otkazati .
+apps/erpnext/erpnext/stock/doctype/item/item.py +327,Default BOM ({0}) must be active for this item or its template,Uobičajeno BOM ({0}) mora biti aktivna za ovu stavku ili njegove predložak
 DocType: Employee,Leave Encashed?,Ostavite Encashed?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Opportunity Od polje je obavezno
 DocType: Item,Variants,Varijante
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +458,Make Purchase Order,Provjerite narudžbenice
 DocType: SMS Center,Send To,Pošalji na adresu
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +111,There is not enough leave balance for Leave Type {0},Nema dovoljno ravnotežu dopust za dozvolu tipa {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +127,There is not enough leave balance for Leave Type {0},Nema dovoljno ravnotežu dopust za dozvolu tipa {0}
 DocType: Sales Team,Contribution to Net Total,Doprinos neto Ukupno
 DocType: Sales Invoice Item,Customer's Item Code,Kupca Stavka Šifra
 DocType: Stock Reconciliation,Stock Reconciliation,Kataloški pomirenje
@@ -1548,11 +1494,11 @@
 DocType: Sales Order Item,Actual Qty,Stvarna kol
 DocType: Sales Invoice Item,References,Reference
 DocType: Quality Inspection Reading,Reading 10,Čitanje 10
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +612,"List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start.",Popis svoje proizvode ili usluge koje kupuju ili prodaju .
+apps/erpnext/erpnext/public/js/setup_wizard.js +348,"List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start.",Popis svoje proizvode ili usluge koje kupuju ili prodaju .
 DocType: Hub Settings,Hub Node,Hub Node
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,Unijeli duple stavke . Molimo ispraviti i pokušajte ponovno .
 apps/erpnext/erpnext/controllers/item_variant.py +65,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values,Vrijednost {0} za Atributi {1} ne postoji u listu važećih Stavka Atributi vrijednosti
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +87,Associate,Pomoćnik
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Associate,Pomoćnik
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +46,Item {0} is not a serialized Item,Stavka {0} nijeserijaliziranom predmeta
 DocType: SMS Center,Create Receiver List,Stvaranje Receiver popis
 apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +5,Expired,Istekla
@@ -1561,7 +1507,7 @@
 DocType: Warranty Claim,Issue Date,Datum izdavanja
 DocType: Activity Cost,Activity Cost,Aktivnost troškova
 DocType: Purchase Receipt Item Supplied,Consumed Qty,Potrošeno Kol
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +52,Telecommunications,telekomunikacija
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +52,Telecommunications,telekomunikacija
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),Ukazuje da je paket je dio ove isporuke (samo nacrti)
 DocType: Payment Tool,Make Payment Entry,Napravite unos Plaćanje
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +119,Quantity for Item {0} must be less than {1},Količina za točku {0} mora biti manji od {1}
@@ -1578,10 +1524,8 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +37,"Selling must be checked, if Applicable For is selected as {0}","Prodaje se mora provjeriti, ako je primjenjivo za odabrano kao {0}"
 DocType: Purchase Order Item,Supplier Quotation Item,Dobavljač ponudu artikla
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +27,Make Salary Structure,Provjerite Plaća Struktura
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +54,Shearing,Smicanje
 DocType: Item,Has Variants,Ima Varijante
 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.,Kliknite na &quot;Make prodaje Račun &#39;gumb za stvaranje nove prodaje fakture.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +166,Packaging and labeling,Pakiranje i označavanje
 DocType: Monthly Distribution,Name of the Monthly Distribution,Naziv Mjesečni distribucije
 DocType: Sales Person,Parent Sales Person,Roditelj Prodaja Osoba
 apps/erpnext/erpnext/setup/utils.py +14,Please specify Default Currency in Company Master and Global Defaults,Navedite zadanu valutu u tvrtki Global Master i zadane
@@ -1592,19 +1536,18 @@
 DocType: Budget Detail,Fiscal Year,Fiskalna godina
 DocType: Cost Center,Budget,Budžet
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +41,"Budget cannot be assigned against {0}, as it's not an Income or Expense account","Budžet se ne može dodijeliti protiv {0}, jer to nije prihod ili rashod račun"
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Achieved,Ostvareni
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,Ostvareni
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +65,Territory / Customer,Teritorij / Customer
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,e.g. 5,na primjer 5
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +207,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},Row {0}: {1} Izdvojena iznos mora biti manji od ili jednak naplatiti preostali iznos {2}
+apps/erpnext/erpnext/public/js/setup_wizard.js +294,e.g. 5,na primjer 5
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},Row {0}: {1} Izdvojena iznos mora biti manji od ili jednak naplatiti preostali iznos {2}
 DocType: Sales Invoice,In Words will be visible once you save the Sales Invoice.,U riječi će biti vidljiv nakon što spremite prodaje fakture.
 DocType: Item,Is Sales Item,Je artikl namijenjen prodaji
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,Raspodjela grupe artikala
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,"Stavka {0} nije dobro postavljen za gospodara , serijski brojevi Provjera"
 DocType: Maintenance Visit,Maintenance Time,Održavanje Vrijeme
 ,Amount to Deliver,Iznose Deliver
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +620,A Product or Service,Proizvod ili usluga
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +158,There were errors.,Bilo je grešaka .
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +101,Tapping,Kuckanje
+apps/erpnext/erpnext/public/js/setup_wizard.js +356,A Product or Service,Proizvod ili usluga
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +146,There were errors.,Bilo je grešaka .
 DocType: Naming Series,Current Value,Trenutna vrijednost
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +171,{0} created,{0} stvorio
 DocType: Delivery Note Item,Against Sales Order,Protiv prodajnog naloga
@@ -1619,7 +1562,7 @@
 apps/erpnext/erpnext/accounts/party.py +275,Due Date cannot be before Posting Date,Datum dospijeća ne može biti prije datuma objavljivanja
 DocType: Website Item Group,Website Item Group,Web stranica artikla Grupa
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Duties and Taxes,Carine i porezi
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Please enter Reference date,Unesite Referentni datum
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +312,Please enter Reference date,Unesite Referentni datum
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} unosa isplate ne može biti filtrirani po {1}
 DocType: Item Website Specification,Table for Item that will be shown in Web Site,Sto za stavku koja će se prikazati u Web Site
 DocType: Purchase Order Item Supplied,Supplied Qty,Isporučeni Količina
@@ -1627,7 +1570,7 @@
 apps/erpnext/erpnext/config/stock.py +103,Tree of Item Groups.,Tree stavke skupina .
 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,Ne mogu se odnositi broj retka veći ili jednak trenutnom broju red za ovu vrstu Charge
 ,Item-wise Purchase History,Stavka-mudar Kupnja Povijest
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +152,Red,Crven
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Red,Crven
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +228,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},"Molimo kliknite na ""Generiraj raspored ' dohvatiti Serial No dodao je za točku {0}"
 DocType: Account,Frozen,Zaleđeni
 ,Open Production Orders,Otvoreni radni nalozi
@@ -1642,7 +1585,7 @@
 DocType: Item Attribute,Attribute Name,Atributi Ime
 apps/erpnext/erpnext/controllers/selling_controller.py +236,Item {0} must be Sales or Service Item in {1},Stavka {0} mora biti Prodaja ili usluga artikla u {1}
 DocType: Item Group,Show In Website,Pokaži Na web stranice
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +621,Group,Grupa
+apps/erpnext/erpnext/public/js/setup_wizard.js +357,Group,Grupa
 DocType: Task,Expected Time (in hours),Očekivano trajanje (u satima)
 ,Qty to Order,Količina za narudžbu
 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","Pratiti brendom u sljedećim dokumentima otpremnica, Prilika, Industrijska Zahtjev, tačka, narudžbenica, Kupovina vaučer, Kupac prijem, citat, prodaje fakture, proizvoda Bundle, naloga prodaje, serijski broj"
@@ -1652,6 +1595,7 @@
 DocType: Features Setup,Brands,Brendovi
 DocType: C-Form Invoice Detail,Invoice No,Račun br
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +480,From Purchase Order,Od narudžbenice
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +92,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Ostavite ne može se primijeniti / otkazan prije nego {0}, kao odsustvo ravnoteža je već carry-proslijeđen u budućnosti rekord raspodjeli odsustvo {1}"
 DocType: Activity Cost,Costing Rate,Costing Rate
 ,Customer Addresses And Contacts,Kupac adrese i kontakti
 DocType: Employee,Resignation Letter Date,Ostavka Pismo Datum
@@ -1659,35 +1603,31 @@
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +137,Not Set,ne Set
 DocType: Communication,Date,Datum
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,Ponovite Customer prihoda
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +651,Sit tight while your system is being setup. This may take a few moments.,"Sjedi čvrsto , dok je vaš sustav se postava . To može potrajati nekoliko trenutaka ."
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +115,Sit tight while your system is being setup. This may take a few moments.,"Sjedi čvrsto , dok je vaš sustav se postava . To može potrajati nekoliko trenutaka ."
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +51,{0} ({1}) must have role 'Expense Approver',{0} ({1}) mora imati ulogu 'Rashodi Approver'
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Pair,Par
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Pair,Par
 DocType: Bank Reconciliation Detail,Against Account,Protiv računa
 DocType: Maintenance Schedule Detail,Actual Date,Stvarni datum
 DocType: Item,Has Batch No,Je Hrpa Ne
 DocType: Delivery Note,Excise Page Number,Trošarina Broj stranice
 DocType: Employee,Personal Details,Osobni podaci
 ,Maintenance Schedules,Održavanje Raspored
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +44,Embossing,Utiskivanje
 ,Quotation Trends,Trendovi ponude
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +139,Item Group not mentioned in item master for item {0},Stavka artikla se ne spominje u master artiklu za artikal {0}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +302,Debit To account must be a Receivable account,Debit na račun mora biti potraživanja računa
-apps/erpnext/erpnext/stock/doctype/item/item.py +310,"As Production Order can be made for this item, it must be a stock item.","Kao Production Order može biti za tu stavku , to mora bitipredmet dionica ."
 DocType: Shipping Rule Condition,Shipping Amount,Iznos transporta
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +140,Joining,Spajanje
-DocType: Authorization Rule,Above Value,Iznad vrijednosti
 ,Pending Amount,Iznos na čekanju
 DocType: Purchase Invoice Item,Conversion Factor,Konverzijski faktor
 DocType: Purchase Order,Delivered,Isporučeno
 apps/erpnext/erpnext/config/hr.py +160,Setup incoming server for jobs email id. (e.g. jobs@example.com),Postavljanje dolazni poslužitelj za poslove e-ID . ( npr. jobs@example.com )
 DocType: Purchase Receipt,Vehicle Number,Broj vozila
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,Datum na koji se ponavlja faktura će se zaustaviti
+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,Ukupno izdvojene lišće {0} ne može biti manja od već odobrenih lišće {1} za period
 DocType: Journal Entry,Accounts Receivable,Konto potraživanja
 ,Supplier-Wise Sales Analytics,Supplier -mudar prodaje Analytics
 DocType: Address Template,This format is used if country specific format is not found,Ovaj format se koristi ako država specifičan format nije pronađena
 DocType: Custom Field,Custom,Običaj
 DocType: Production Order,Use Multi-Level BOM,Koristite multi-level BOM
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +26,Injection molding,Brizganje
 DocType: Bank Reconciliation,Include Reconciled Entries,Uključi pomirio objave
 apps/erpnext/erpnext/config/accounts.py +41,Tree of finanial accounts.,Drvo finanial račune .
 DocType: Leave Control Panel,Leave blank if considered for all employee types,Ostavite prazno ako smatra za sve tipove zaposlenika
@@ -1697,30 +1637,28 @@
 apps/frappe/frappe/config/setup.py +130,Printing,Štampanje
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +114,Expense Claim is pending approval. Only the Expense Approver can update status.,Rashodi Tužba se čeka odobrenje . SamoRashodi Odobritelj može ažurirati status .
 DocType: Purchase Invoice,Additional Discount Amount,Dodatni popust Iznos
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +99,The day(s) on which you are applying for leave are holiday. You need not apply for leave.,Dan (a ) na koji se prijavljujete za dopust su odmor . Ne trebaju podnijeti zahtjev za dopust .
 apps/frappe/frappe/public/js/frappe/misc/utils.js +110,and,i
 DocType: Leave Block List Allow,Leave Block List Allow,Ostavite Blok Popis Dopustite
 apps/erpnext/erpnext/setup/doctype/company/company.py +236,Abbr can not be blank or space,Skraćeno ne može biti prazan ili prostora
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +50,Sports,sportovi
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,sportovi
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Actual,Ukupno Actual
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Unit,jedinica
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Unit,jedinica
 apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.py +182,Please set Dropbox access keys in your site config,Molimo postaviti Dropbox pristupnih tipki u vašem web config
 apps/erpnext/erpnext/stock/get_item_details.py +113,Please specify Company,Navedite tvrtke
 ,Customer Acquisition and Loyalty,Stjecanje kupaca i lojalnost
 DocType: Purchase Receipt,Warehouse where you are maintaining stock of rejected items,Skladište gdje ste održavanju zaliha odbijenih stavki
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +408,Your financial year ends on,Vaša financijska godina završava
+apps/erpnext/erpnext/public/js/setup_wizard.js +156,Your financial year ends on,Vaša financijska godina završava
 DocType: POS Profile,Price List,Cjenik
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +20,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0} je sadazadana Fiskalna godina . Osvježite svoj preglednik za promjene stupiti na snagu.
 apps/erpnext/erpnext/projects/doctype/project/project.js +47,Expense Claims,Trošak potraživanja
 DocType: Issue,Support,Podrška
-DocType: Authorization Rule,Approving Role,Odobravanje ulogu
 ,BOM Search,BOM pretraga
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +176,Closing (Opening + Totals),Zatvaranje (Otvaranje + Ukupno)
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +26,Please specify currency in Company,Navedite valuta u Company
 DocType: Workstation,Wages per hour,Plaće po satu
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},Stock balans u Batch {0} će postati negativan {1} {2} za tačka na skladištu {3}
 apps/erpnext/erpnext/config/setup.py +83,"Show / Hide features like Serial Nos, POS etc.","Show / Hide značajke kao što su serijski brojevima , POS i sl."
-apps/erpnext/erpnext/controllers/accounts_controller.py +236,Account {0} is invalid. Account Currency must be {1},Račun {0} je nevažeća. Račun valuta mora biti {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +237,Account {0} is invalid. Account Currency must be {1},Račun {0} je nevažeća. Račun valuta mora biti {1}
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +34,UOM Conversion factor is required in row {0},Faktor UOM pretvorbe je potrebno u redu {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +53,Clearance date cannot be before check date in row {0},Datum rasprodaja ne može biti prije datuma check u redu {0}
 DocType: Salary Slip,Deduction,Odbitak
@@ -1739,13 +1677,13 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +82,Item {0} has already been returned,Artikal {0} je već vraćen
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** Fiskalna godina ** predstavlja finansijske godine. Svi računovodstvene stavke i drugih većih transakcija se prate protiv ** Fiskalna godina **.
 DocType: Opportunity,Customer / Lead Address,Kupac / Olovo Adresa
+apps/erpnext/erpnext/stock/doctype/item/item.py +112,Warning: Invalid SSL certificate on attachment {0},Upozorenje: Invalid SSL certifikat o prilogu {0}
 DocType: Production Order Operation,Actual Operation Time,Stvarni Operation Time
 DocType: Authorization Rule,Applicable To (User),Odnosi se na (Upute)
 DocType: Purchase Taxes and Charges,Deduct,Odbiti
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +170,Job Description,Opis posla
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +170,Job Description,Opis posla
 DocType: Purchase Order Item,Qty as per Stock UOM,Količina po burzi UOM
 apps/frappe/frappe/model/rename_doc.py +343,Please select a valid csv file with data,Odaberite valjanu CSV datoteku s podacima
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +92,Coating,Premazivanje
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +126,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Specijalni znakovi osim ""-"" ""."", ""#"", i ""/"" nije dozvoljeno u imenovanju serije"
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Pratite prodajne akcije. Pratite Leads, Citati, naloga prodaje itd iz Kampanje procijeniti povrat investicije. "
 DocType: Expense Claim,Approver,Odobritelj
@@ -1755,12 +1693,11 @@
 DocType: Supplier Quotation,Manufacturing Manager,Proizvodnja Manager
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},Serijski Ne {0} je pod jamstvom upto {1}
 apps/erpnext/erpnext/config/stock.py +69,Split Delivery Note into packages.,Split otpremnici u paketima.
-apps/erpnext/erpnext/hooks.py +84,Shipments,Pošiljke
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +29,Dip molding,Dip lajsne
+apps/erpnext/erpnext/hooks.py +68,Shipments,Pošiljke
 DocType: Purchase Order,To be delivered to customer,Dostaviti kupcu
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,Vrijeme Log Status moraju biti dostavljeni.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,Serijski broj {0} ne pripada nijednoj Skladište
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +650,Setting Up,Postavljanje
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +114,Setting Up,Postavljanje
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,Row # ,Row #
 DocType: Purchase Invoice,In Words (Company Currency),Riječima (valuta tvrtke)
 DocType: Pricing Rule,Supplier,Dobavljači
@@ -1768,7 +1705,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +105,Miscellaneous Expenses,Razni troškovi
 DocType: Global Defaults,Default Company,Zadana tvrtka
 apps/erpnext/erpnext/controllers/stock_controller.py +166,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,Rashodi ili razlika račun je obvezna za točke {0} jer utječe na ukupnu vrijednost dionica
-apps/erpnext/erpnext/controllers/accounts_controller.py +354,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","Ne mogu overbill za Stavka {0} {1} u redu više od {2}. Da bi se omogućilo overbilling, molimo vas postaviti u Stock Settings"
+apps/erpnext/erpnext/controllers/accounts_controller.py +355,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","Ne mogu overbill za Stavka {0} {1} u redu više od {2}. Da bi se omogućilo overbilling, molimo vas postaviti u Stock Settings"
 DocType: Employee,Bank Name,Naziv banke
 apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +27,-Above,Iznad
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +135,User {0} is disabled,Korisnik {0} je onemogućen
@@ -1781,27 +1718,26 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,{0} is mandatory for Item {1},{0} je obavezno za točku {1}
 DocType: Currency Exchange,From Currency,Od novca
 DocType: DocField,Name,Ime
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +211,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Molimo odaberite Izdvojena količina, vrsta fakture i fakture Broj u atleast jednom redu"
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +104,Sales Order required for Item {0},Prodajnog naloga potrebna za točke {0}
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +158,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Molimo odaberite Izdvojena količina, vrsta fakture i fakture Broj u atleast jednom redu"
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +107,Sales Order required for Item {0},Prodajnog naloga potrebna za točke {0}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +43,Amounts not reflected in system,Iznosi ne ogleda u sustav
 DocType: Purchase Invoice Item,Rate (Company Currency),Ocijeni (Društvo valuta)
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +40,Others,Drugi
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +40,Others,Drugi
 apps/erpnext/erpnext/templates/includes/product_page.js +80,Cannot find a matching Item. Please select some other value for {0}.,Ne možete pronaći stavku koja se podudara. Molimo odaberite neki drugi vrijednost za {0}.
 DocType: POS Profile,Taxes and Charges,Porezi i naknade
 DocType: Item,"A Product or a Service that is bought, sold or kept in stock.","Proizvoda ili usluge koja je kupio, prodati ili držati u čoporu."
 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,"Ne možete odabrati vrstu naboja kao ' na prethodnim Row Iznos ""ili"" u odnosu na prethodnu Row Ukupno ""za prvi red"
 apps/frappe/frappe/core/doctype/doctype/boilerplate/controller_list.html +31,Completed,Dovršen
 DocType: Web Form,Select DocType,Odaberite DocType
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +104,Broaching,Provlačenje
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +12,Banking,Bankarstvo
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,Bankarstvo
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +38,Please click on 'Generate Schedule' to get schedule,"Molimo kliknite na ""Generiraj raspored ' kako bi dobili raspored"
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +283,New Cost Center,Novi trošak
 DocType: Bin,Ordered Quantity,Naručena količina
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +397,"e.g. ""Build tools for builders""","na primjer "" Izgraditi alate za graditelje """
+apps/erpnext/erpnext/public/js/setup_wizard.js +145,"e.g. ""Build tools for builders""","na primjer "" Izgraditi alate za graditelje """
 DocType: Quality Inspection,In Process,U procesu
 DocType: Authorization Rule,Itemwise Discount,Itemwise Popust
 DocType: Purchase Order Item,Reference Document Type,Referentni dokument Tip
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +318,{0} against Sales Order {1},{0} protiv naloga prodaje {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +320,{0} against Sales Order {1},{0} protiv naloga prodaje {1}
 DocType: Account,Fixed Asset,Dugotrajne imovine
 apps/erpnext/erpnext/config/stock.py +283,Serialized Inventory,Serijalizovanoj zaliha
 DocType: Activity Type,Default Billing Rate,Uobičajeno Billing Rate
@@ -1816,14 +1752,13 @@
 DocType: Purchase Invoice Item,Page Break,Prijelom stranice
 DocType: Production Order Operation,Pending,Čekanju
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,Korisnici koji može odobriti odsustvo aplikacije određenu zaposlenog
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +33,You cannot change default UOM of Variant. To change default UOM for Variant change default UOM of the Template,Ne možete promijeniti zadani UOM varijante. Za promjenu default UOM za varijantu promjenu default UOM od Template
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +50,Office Equipments,uredske opreme
 DocType: Purchase Invoice Item,Qty,Kol
 DocType: Fiscal Year,Companies,Companies
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +24,Electronics,Elektronika
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +24,Electronics,Elektronika
 DocType: Stock Settings,Raise Material Request when stock reaches re-order level,Podignite Materijal Zahtjev kad dionica dosegne ponovno poredak razinu
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +18,From Maintenance Schedule,Od održavanje rasporeda
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +56,Full-time,Puno radno vrijeme
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +56,Full-time,Puno radno vrijeme
 DocType: Purchase Invoice,Contact Details,Kontakt podaci
 DocType: C-Form,Received Date,Datum pozicija
 DocType: Delivery Note,"If you have created a standard template in Sales Taxes and Charges Template, select one and click on the button below.","Ako ste kreirali standardni obrazac u prodaji poreza i naknada Template, odaberite jednu i kliknite na dugme ispod."
@@ -1835,11 +1770,12 @@
 DocType: Job Applicant,Job Opening,Posao Otvaranje
 DocType: Payment Reconciliation,Payment Reconciliation,Pomirenje plaćanja
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +154,Please select Incharge Person's name,Odaberite incharge ime osobe
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +51,Technology,tehnologija
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,tehnologija
 DocType: Offer Letter,Offer Letter,Ponuda Pismo
 apps/erpnext/erpnext/config/manufacturing.py +51,Generate Material Requests (MRP) and Production Orders.,Generirajte Materijal Upiti (MRP) i radne naloge.
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +68,Total Invoiced Amt,Ukupno Fakturisana Amt
 DocType: Time Log,To Time,Za vrijeme
+DocType: Authorization Rule,Approving Role (above authorized value),Odobravanje ulogu (iznad ovlašteni vrijednost)
 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.","Da biste dodali djece čvorova , istražiti stablo i kliknite na čvoru pod kojima želite dodati više čvorova ."
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +102,Credit To account must be a Payable account,Credit na račun mora biti računa se plaćaju
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +233,BOM recursion: {0} cannot be parent or child of {2},BOM rekurzija : {0} ne može biti roditelj ili dijete od {2}
@@ -1852,10 +1788,8 @@
 DocType: Item,Customer Item Codes,Customer Stavka Codes
 DocType: Opportunity,Lost Reason,Razlog gubitka
 apps/erpnext/erpnext/config/accounts.py +68,Create Payment Entries against Orders or Invoices.,Kreirajte plaćanja unosi protiv naloga ili faktura.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +141,Welding,Zavarivanje
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +40,New Stock UOM is required,Novi Stock UOM je potrebno
 DocType: Quality Inspection,Sample Size,Veličina uzorka
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +443,All items have already been invoiced,Svi artikli su već fakturisani
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +446,All items have already been invoiced,Svi artikli su već fakturisani
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',Navedite važeću &#39;iz Predmet br&#39;
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +287,Further cost centers can be made under Groups but entries can be made against non-Groups,"Dalje troška mogu biti pod Grupe, ali unosa može biti protiv ne-Grupe"
 DocType: Project,External,Vanjski
@@ -1867,8 +1801,7 @@
 DocType: Bin,Actual Quantity,Stvarna količina
 DocType: Shipping Rule,example: Next Day Shipping,Primjer: Sljedeći dan Dostava
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,Serial No {0} nije pronađena
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +563,Your Customers,Vaši klijenti
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +27,Compression molding,Compression lajsne
+apps/erpnext/erpnext/public/js/setup_wizard.js +303,Your Customers,Vaši klijenti
 DocType: Leave Block List Date,Block Date,Blok Datum
 DocType: Sales Order,Not Delivered,Ne Isporučeno
 ,Bank Clearance Summary,Razmak banka Sažetak
@@ -1889,10 +1822,10 @@
 DocType: SMS Log,Sent To,Poslati
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +28,Make Sales Invoice,Ostvariti prodaju fakturu
 DocType: Company,For Reference Only.,Za referencu samo.
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +29,Invalid {0}: {1},{1}: Invalid {0}
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +49,Invalid {0}: {1},{1}: Invalid {0}
 DocType: Sales Invoice Advance,Advance Amount,Iznos avansa
 DocType: Manufacturing Settings,Capacity Planning,Planiranje kapaciteta
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +49,'From Date' is required,' Od datuma ' je potrebno
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +43,'From Date' is required,' Od datuma ' je potrebno
 DocType: Journal Entry,Reference Number,Referentni broj
 DocType: Employee,Employment Details,Zapošljavanje Detalji
 DocType: Employee,New Workplace,Novi radnom mjestu
@@ -1907,7 +1840,7 @@
 DocType: Serial No,Delivery Time,Vrijeme isporuke
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Starenje temelju On
 DocType: Item,End of Life,Kraj života
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +41,Travel,putovanje
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +41,Travel,putovanje
 DocType: Leave Block List,Allow Users,Omogućiti korisnicima
 DocType: Purchase Order,Customer Mobile No,Customer mobilnom Ne
 DocType: Sales Invoice,Recurring,Ponavlja
@@ -1921,7 +1854,7 @@
 DocType: Naming Series,User must always select,Korisničko uvijek mora odabrati
 DocType: Stock Settings,Allow Negative Stock,Dopustite negativnu zalihu
 DocType: Installation Note,Installation Note,Napomena instalacije
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +541,Add Taxes,Dodaj poreze
+apps/erpnext/erpnext/public/js/setup_wizard.js +283,Add Taxes,Dodaj poreze
 ,Financial Analytics,Financijski Analytics
 DocType: Quality Inspection,Verified By,Ovjeren od strane
 DocType: Address,Subsidiary,Podružnica
@@ -1931,7 +1864,6 @@
 DocType: System Settings,In Hours,U sati
 DocType: Process Payroll,Create Salary Slip,Stvaranje plaće Slip
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Expected balance as per bank,Očekivani Stanje po banci
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +115,Buffing,Polirajuća
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Source of Funds (Liabilities),Izvor sredstava ( pasiva)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +347,Quantity in row {0} ({1}) must be same as manufactured quantity {2},Količina u redu {0} ( {1} ) mora biti isti kao proizvedena količina {2}
 DocType: Appraisal,Employee,Zaposlenik
@@ -1948,11 +1880,11 @@
 DocType: Rename Tool,File to Rename,File da biste preimenovali
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +176,Purchse Order number required for Item {0},Broj Purchse Order potrebno za točke {0}
 apps/erpnext/erpnext/public/js/controllers/transaction.js +136,Show Payments,Pokaži Plaćanja
-apps/erpnext/erpnext/controllers/buying_controller.py +245,Specified BOM {0} does not exist for Item {1},Navedene BOM {0} ne postoji za Stavka {1}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +202,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Raspored održavanja {0} mora biti otkazana prije poništenja ovu prodajnog naloga
+apps/erpnext/erpnext/controllers/buying_controller.py +236,Specified BOM {0} does not exist for Item {1},Navedene BOM {0} ne postoji za Stavka {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Raspored održavanja {0} mora biti otkazana prije poništenja ovu prodajnog naloga
 apps/frappe/frappe/desk/page/backups/backups.html +13,Size,Veličina
 DocType: Notification Control,Expense Claim Approved,Rashodi Zahtjev odobren
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +113,Pharmaceutical,farmaceutski
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Pharmaceutical,farmaceutski
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,Troškovi Kupljene stavke
 DocType: Selling Settings,Sales Order Required,Prodajnog naloga Obvezno
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +30,Create Customer,Kreiraj novog kupca
@@ -1962,7 +1894,6 @@
 DocType: Quality Inspection Reading,Reading 9,Čitanje 9
 DocType: Supplier,Is Frozen,Je zamrznut
 DocType: Buying Settings,Buying Settings,Podešavanja nabavke
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +122,Mass finishing,Mass završna obrada
 DocType: Stock Entry Detail,BOM No. for a Finished Good Item,BOM broj za Gotovi Dobar točki
 DocType: Upload Attendance,Attendance To Date,Gledatelja do danas
 apps/erpnext/erpnext/config/selling.py +158,Setup incoming server for sales email id. (e.g. sales@example.com),Postavljanje dolazni poslužitelj za id prodaja e-mail . ( npr. sales@example.com )
@@ -1970,7 +1901,7 @@
 DocType: Payment Tool,Payment Account,Plaćanje računa
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +713,Please specify Company to proceed,Navedite Tvrtka postupiti
 apps/frappe/frappe/public/js/frappe/model/indicator.js +30,Draft,Nepotvrđeno
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +46,Compensatory Off,kompenzacijski Off
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Compensatory Off,kompenzacijski Off
 DocType: Quality Inspection Reading,Accepted,Prihvaćeno
 DocType: User,Female,Ženski
 DocType: Journal Entry Account,Debit in Account Currency,Debit u računu valuta
@@ -1982,7 +1913,7 @@
 DocType: Shipping Rule,Shipping Rule Label,Naziv pravila transporta
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +209,Raw Materials cannot be blank.,Sirovine ne može biti prazan.
 DocType: Newsletter,Test,Test
-apps/erpnext/erpnext/stock/doctype/item/item.py +364,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +368,"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'","Kao što postoje postojećih zaliha transakcije za ovu stavku, \ ne možete promijeniti vrijednosti &#39;Ima Serial Ne&#39;, &#39;Ima serijski br&#39;, &#39;Je li Stock Stavka&#39; i &#39;Vrednovanje metoda&#39;"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +448,Quick Journal Entry,Brzi unos u dnevniku
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +92,You can not change rate if BOM mentioned agianst any item,Ne možete promijeniti brzinu ako BOM spomenuo agianst bilo predmet
@@ -1993,13 +1924,14 @@
 apps/erpnext/erpnext/config/stock.py +18,Requests for items.,Zahtjevi za stavke.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,Poseban proizvodnja kako će biti izrađen za svakog gotovog dobrom stavke.
 DocType: Purchase Invoice,Terms and Conditions1,Odredbe i Conditions1
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +18,Complete Setup,kompletan Setup
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard_page.html +18,Complete Setup,kompletan Setup
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","Knjiženje zamrznuta do tog datuma, nitko ne može učiniti / mijenjati ulazak, osim uloge naveden u nastavku."
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +121,Please save the document before generating maintenance schedule,Molimo spremite dokument prije stvaranja raspored za održavanje
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,Status projekta
 DocType: UOM,Check this to disallow fractions. (for Nos),Provjerite to da ne dopušta frakcija. (Za br)
 apps/erpnext/erpnext/config/crm.py +96,Newsletter Mailing List,Newsletter Mailing lista
 DocType: Delivery Note,Transporter Name,Transporter Ime
+DocType: Authorization Rule,Authorized Value,Ovlašteni Vrijednost
 DocType: Contact,Enter department to which this Contact belongs,Unesite odjel na koji se ovaj Kontakt pripada
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Absent,Ukupno Odsutan
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +746,Item or Warehouse for row {0} does not match Material Request,Artikal ili skladište za redak {0} ne odgovara Zahtjevu za materijalom
@@ -2024,16 +1956,15 @@
 DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),Basic Rate (kao po akciji UOM)
 DocType: SMS Log,No of Requested SMS,Nema traženih SMS
 DocType: Campaign,Campaign-.####,Kampanja-.####
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +55,Piercing,Prodoran
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,Sljedeći koraci
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +117,Contract End Date must be greater than Date of Joining,Ugovor Datum završetka mora biti veći od dana ulaska u
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,A treće strane distributera / trgovca / komisije agent / affiliate / prodavače koji prodaje kompanije proizvoda za proviziju.
 DocType: Customer Group,Has Child Node,Je li čvor dijete
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{0} against Purchase Order {1},{0} protiv narudžbenicu {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +332,{0} against Purchase Order {1},{0} protiv narudžbenicu {1}
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","Unesite statičke parametre URL ovdje (npr. pošiljatelj = ERPNext, username = ERPNext, lozinkom = 1234 itd.)"
 apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,{0} {1} ni na koji aktivno fiskalne godine. Za više detalja provjerite {2}.
-apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,Ovo je primjer web stranica automatski generira iz ERPNext
+apps/erpnext/erpnext/setup/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,Ovo je primjer web stranica automatski generira iz ERPNext
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +37,Ageing Range 1,Starenje Range 1
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +110,Photochemical machining,Fotohemijskog mašinsku obradu
 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.
 
 #### Note
@@ -2079,7 +2010,7 @@
 DocType: Purchase Receipt Item,Recd Quantity,RecD Količina
 DocType: Email Account,Email Ids,E-mail Ids
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},Ne može proizvesti više predmeta {0} od prodajnog naloga količina {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +471,Stock Entry {0} is not submitted,Stock upis {0} nije podnesen
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +473,Stock Entry {0} is not submitted,Stock upis {0} nije podnesen
 DocType: Payment Reconciliation,Bank / Cash Account,Banka / Cash račun
 DocType: Tax Rule,Billing City,Billing Grad
 DocType: Global Defaults,Hide Currency Symbol,Sakrij simbol valute
@@ -2095,7 +2026,7 @@
 DocType: Purchase Invoice,Currency and Price List,Valuta i cjenik
 DocType: Opportunity,Customer / Lead Name,Kupac / Ime osobe
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +63,Clearance Date not mentioned,Razmak Datum nije spomenuo
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +71,Production,proizvodnja
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Production,proizvodnja
 DocType: Item,Allow Production Order,Dopustite proizvodni nalog
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +60,Row {0}:Start Date must be before End Date,Red {0} : Datum početka mora biti prije datuma završetka
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Ukupno (Qty)
@@ -2108,7 +2039,7 @@
 apps/erpnext/erpnext/utilities/doctype/address/address.py +113,My Addresses,Moj Adrese
 DocType: Stock Ledger Entry,Outgoing Rate,Odlazni Rate
 apps/erpnext/erpnext/config/hr.py +100,Organization branch master.,Organizacija grana majstor .
-apps/erpnext/erpnext/controllers/accounts_controller.py +237, or ,ili
+apps/erpnext/erpnext/controllers/accounts_controller.py +238, or ,ili
 DocType: Sales Order,Billing Status,Status naplate
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Utility Expenses,komunalna Troškovi
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,90-Above,90-Above
@@ -2135,6 +2066,7 @@
 DocType: Stock Entry Detail,Serial No / Batch,Serijski Ne / Batch
 DocType: Product Bundle,Parent Item,Roditelj artikla
 DocType: Account,Account Type,Vrsta konta
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +113,Leave Type {0} cannot be carry-forwarded,Ostavite Tip {0} se ne može nositi-proslijeđen
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +213,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',"Raspored održavanja ne stvara za sve stavke . Molimo kliknite na ""Generiraj raspored '"
 ,To Produce,proizvoditi
 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","Za red {0} u {1}. Uključiti {2} u tačka stope, redova {3} mora biti uključena"
@@ -2142,10 +2074,7 @@
 DocType: Bin,Reserved Quantity,Rezervirano Količina
 DocType: Landed Cost Voucher,Purchase Receipt Items,Primka proizvoda
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,Prilagođavanje Obrasci
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +62,Cutting,Rezanje
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +69,Flattening,Ravnanje
 DocType: Account,Income Account,Konto prihoda
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +22,Molding,Oblikovanje
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +632,Delivery,Isporuka
 DocType: Stock Reconciliation Item,Current Qty,Trenutno Količina
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",Pogledajte &quot;stopa materijali na temelju troškova&quot; u odjeljak
@@ -2155,20 +2084,19 @@
 apps/frappe/frappe/desk/moduleview.py +61,Documents,Dokumenti
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +17,Ref,Ref.
 DocType: Cost Center,Cost Center,Troška
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.js +48,Voucher #,bon #
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +36,Voucher #,bon #
 DocType: Notification Control,Purchase Order Message,Poruka narudžbenice
 DocType: Tax Rule,Shipping Country,Dostava Country
 DocType: Upload Attendance,Upload HTML,Prenesi HTML
-apps/erpnext/erpnext/controllers/accounts_controller.py +391,"Total advance ({0}) against Order {1} cannot be greater \
+apps/erpnext/erpnext/controllers/accounts_controller.py +392,"Total advance ({0}) against Order {1} cannot be greater \
 				than the Grand Total ({2})","Ukupno unaprijed ({0}) protiv Order {1} ne može biti veći od Grand \
  Ukupno ({2})"
 DocType: Employee,Relieving Date,Rasterećenje Datum
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +12,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.","Cijene Pravilo je napravljen prebrisati Cjenik / definirati postotak popusta, na temelju nekih kriterija."
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,Skladište se može mijenjati samo preko Stock Stupanje / Dostavnica / kupiti primitka
 DocType: Employee Education,Class / Percentage,Klasa / Postotak
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +92,Head of Marketing and Sales,Voditelj marketinga i prodaje
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +31,Income Tax,Porez na dohodak
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +157,Laser engineered net shaping,Laser engineered net oblikovanje
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Head of Marketing and Sales,Voditelj marketinga i prodaje
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +31,Income Tax,Porez na dohodak
 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.","Ako je odabrano cijene Pravilo je napravljen za 'Cijena', to će prepisati cijenu s liste. Pravilnik o cenama cijena konačnu cijenu, tako da nema daljnje popust treba primijeniti. Stoga, u transakcijama poput naloga prodaje, narudžbenice itd, to će biti učitani u 'Rate' na terenu, nego 'Cijena List Rate ""na terenu."
 apps/erpnext/erpnext/config/selling.py +163,Track Leads by Industry Type.,Trag vodi prema tip industrije .
 DocType: Item Supplier,Item Supplier,Dobavljač artikla
@@ -2191,31 +2119,28 @@
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Stvarna količina nakon transakcije
 ,Pending SO Items For Purchase Request,Otvorena SO Proizvodi za zahtjev za kupnju
 DocType: Supplier,Billing Currency,Billing valuta
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +148,Extra Large,Ekstra veliki
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,Extra Large,Ekstra veliki
 ,Profit and Loss Statement,Račun dobiti i gubitka
 DocType: Bank Reconciliation Detail,Cheque Number,Broj čeka
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +43,Pressing,Pritiskom
 DocType: Payment Tool Detail,Payment Tool Detail,Alat plaćanja Detail
 ,Sales Browser,prodaja preglednik
 DocType: Journal Entry,Total Credit,Ukupna kreditna
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +474,Warning: Another {0} # {1} exists against stock entry {2},Upozorenje: Još {0} {1} # postoji protiv ulaska zaliha {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +459,Local,Lokalno
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +476,Warning: Another {0} # {1} exists against stock entry {2},Upozorenje: Još {0} {1} # postoji protiv ulaska zaliha {2}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +397,Local,Lokalno
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),Zajmovi i predujmovi (aktiva)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,Dužnici
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +147,Large,Veliki
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +23,No employee found!,Niti jedan zaposlenik našao !
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Large,Veliki
 DocType: C-Form Invoice Detail,Territory,Teritorija
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,Molimo spomenuti nema posjeta potrebnih
 DocType: Purchase Order,Customer Address Display,Customer Adresa Display
 DocType: Stock Settings,Default Valuation Method,Zadana metoda vrednovanja
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +127,Polishing,Poliranje
 DocType: Production Order Operation,Planned Start Time,Planirani Start Time
 apps/erpnext/erpnext/config/accounts.py +63,Close Balance Sheet and book Profit or Loss.,Zatvori bilanca i knjiga dobit ili gubitak .
-apps/erpnext/erpnext/stock/doctype/item/item.py +661,"Default Unit of Measure for Item {0} cannot be changed directly because \
+apps/erpnext/erpnext/stock/doctype/item/item.py +665,"Default Unit of Measure for Item {0} cannot be changed directly because \
 			you have already made some transaction(s) with another UOM. To change default UOM, \
 			use 'UOM Replace Utility' tool under Stock module.","Uobičajeno mjerna jedinica za artikl {0} se ne može mijenjati, jer direktno \ ste već napravili neke transakcije (e) sa drugim UOM. Da biste promijenili zadani UOM, \ upotreba &#39;UOM Zamijenite Utility &quot;alata pod Stock modul."
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,Odredite Exchange Rate pretvoriti jedne valute u drugu
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +146,Quotation {0} is cancelled,Ponuda {0} je otkazana
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +141,Quotation {0} is cancelled,Ponuda {0} je otkazana
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,Ukupno preostali iznos
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} was on leave on {1}. Cannot mark attendance.,Zaposlenik {0} je bio na odmoru na {1} . Ne možete označiti dolazak .
 DocType: Sales Partner,Targets,Mete
@@ -2226,7 +2151,6 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +158,Please create Customer from Lead {0},Molimo stvoriti kupac iz Olovo {0}
 DocType: Price List,Applicable for Countries,Za zemlje u
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Computers,Računari
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +112,Electro-chemical grinding,Elektro-kemijske brušenje
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +14,This is a root customer group and cannot be edited.,To jekorijen skupini kupaca i ne može se mijenjati .
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +39,Please setup your chart of accounts before you start Accounting Entries,Molim postaviti svoj kontni plan prije nego što počnete računovodstvenih unosa
 DocType: Purchase Invoice,Ignore Pricing Rule,Ignorirajte Cijene pravilo
@@ -2284,7 +2208,6 @@
 DocType: Maintenance Visit,Purposes,Namjene
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +103,Atleast one item should be entered with negative quantity in return document,Atleast jednu stavku treba upisati s negativnim količine za uzvrat dokumentu
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +67,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","Operacija {0} više od bilo koje dostupne radnog vremena u radnu stanicu {1}, razbijaju rad u više operacija"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +134,Electrochemical machining,Elektrokemijske mašinsku obradu
 ,Requested,Tražena
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +66,No Remarks,No Napomene
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +13,Overdue,Istekao
@@ -2293,7 +2216,7 @@
 DocType: Monthly Distribution,Distribution Name,Naziv distribucije
 DocType: Features Setup,Sales and Purchase,Prodaja i nabavka
 DocType: Supplier Quotation Item,Material Request No,Materijal Zahtjev Ne
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +218,Quality Inspection required for Item {0},Provera kvaliteta potrebna za točke {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +221,Quality Inspection required for Item {0},Provera kvaliteta potrebna za točke {0}
 DocType: Quotation,Rate at which customer's currency is converted to company's base currency,Stopa po kojoj se valuta klijenta se pretvaraju u tvrtke bazne valute
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +107,{0} has been successfully unsubscribed from this list.,{0} uspješno je odjavljen sa ove liste.
 DocType: Purchase Invoice Item,Net Rate (Company Currency),Neto stopa (Company valuta)
@@ -2311,9 +2234,8 @@
 apps/erpnext/erpnext/accounts/report/financial_statements.py +16,Fiscal Year {0} not found.,Fiskalna godina {0} nije pronađen.
 DocType: Bank Reconciliation,Get Relevant Entries,Kreiraj relevantne ulaze
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +407,Accounting Entry for Stock,Računovodstvo Entry za Stock
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +64,Coining,Kovanja
 DocType: Sales Invoice,Sales Team1,Prodaja Team1
-apps/erpnext/erpnext/stock/doctype/item/item.py +412,Item {0} does not exist,Artikal {0} ne postoji
+apps/erpnext/erpnext/stock/doctype/item/item.py +416,Item {0} does not exist,Artikal {0} ne postoji
 DocType: Sales Invoice,Customer Address,Kupac Adresa
 apps/frappe/frappe/desk/query_report.py +136,Total,Ukupno
 DocType: Purchase Invoice,Apply Additional Discount On,Nanesite dodatni popust na
@@ -2325,14 +2247,13 @@
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),Iznos PDV-a Nakon Popust Iznos (Company valuta)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +149,Target warehouse is mandatory for row {0},Target skladište je obvezno za redom {0}
 DocType: Quality Inspection,Quality Inspection,Provjera kvalitete
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +144,Extra Small,Extra Small
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +20,Spray forming,Spray formiranje
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Extra Small,Extra Small
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +458,Warning: Material Requested Qty is less than Minimum Order Qty,Upozorenje : Materijal tražena količina manja nego minimalna narudžba kol
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +191,Account {0} is frozen,Konto {0} je zamrznut
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Pravna osoba / Podružnica sa zasebnim kontnom pripadaju Organizacije.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +29,"Food, Beverage & Tobacco","Hrana , piće i duhan"
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","Hrana , piće i duhan"
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +20,PL or BS,PL ili BS
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,Can only make payment against unbilled {0},Mogu samo napraviti uplatu protiv nenaplaćenu {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +531,Can only make payment against unbilled {0},Mogu samo napraviti uplatu protiv nenaplaćenu {0}
 apps/erpnext/erpnext/controllers/selling_controller.py +122,Commission rate cannot be greater than 100,Proviziju ne može biti veća od 100
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Minimum Inventory Level,Minimum Inventar Level
 DocType: Stock Entry,Subcontract,Podugovor
@@ -2343,19 +2264,18 @@
 DocType: Item,Manufacturer Part Number,Proizvođač Broj dijela
 DocType: Production Order Operation,Estimated Time and Cost,Procijenjena vremena i troškova
 DocType: Bin,Bin,Kanta
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +50,Nosing,Njuškanje
 DocType: SMS Log,No of Sent SMS,Ne poslanih SMS
 DocType: Account,Company,Preduzeće
 DocType: Account,Expense Account,Rashodi račun
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +49,Software,Software
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +151,Colour,Boja
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +49,Software,Software
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Colour,Boja
 DocType: Maintenance Visit,Scheduled,Planirano
 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","Molimo odaberite Stavka u kojoj &quot;Je Stock Stavka&quot; je &quot;ne&quot; i &quot;Da li je prodaja Stavka&quot; je &quot;Da&quot;, a nema drugog Bundle proizvoda"
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,Odaberite Mjesečni Distribucija nejednako distribuirati mete širom mjeseci.
 DocType: Purchase Invoice Item,Valuation Rate,Vrednovanje Stopa
 apps/erpnext/erpnext/stock/get_item_details.py +281,Price List Currency not selected,Cjenik valuta ne bira
 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,Stavka Row {0}: {1} Kupovina Prijem ne postoji u gore 'Kupovina Primici' stol
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +134,Employee {0} has already applied for {1} between {2} and {3},Zaposlenik {0} već podnijela zahtjev za {1} od {2} i {3}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +145,Employee {0} has already applied for {1} between {2} and {3},Zaposlenik {0} već podnijela zahtjev za {1} od {2} i {3}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Projekt datum početka
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +8,Until,Do
 DocType: Rename Tool,Rename Log,Preimenovanje Prijavite
@@ -2365,7 +2285,7 @@
 apps/erpnext/erpnext/controllers/recurring_document.py +162,Please select {0},Odaberite {0}
 DocType: C-Form,C-Form No,C-Obrazac br
 DocType: BOM,Exploded_items,Exploded_items
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +95,Researcher,istraživač
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Researcher,istraživač
 apps/frappe/frappe/custom/doctype/customize_form/customize_form.js +88,Update,Ažurirati
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +78,Please save the Newsletter before sending,Molimo spremite Newsletter prije slanja
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +23,Name or Email is mandatory,Ime ili e-obavezno
@@ -2374,11 +2294,10 @@
 DocType: Employee,Exit,Izlaz
 apps/erpnext/erpnext/accounts/doctype/account/account.py +134,Root Type is mandatory,Korijen Tip je obvezno
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +295,Serial No {0} created,Serijski Ne {0} stvorio
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +125,Vibratory finishing,Vibratory Završeno
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","Za praktičnost kupaca, te kodovi mogu se koristiti u tiskanim formata kao što su fakture i otpremnice"
 DocType: Employee,You can enter any date manually,Možete unijeti bilo koji datum ručno
 DocType: Sales Invoice,Advertisement,Oglas
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +165,Probationary Period,Probni rad
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Probationary Period,Probni rad
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Samo leaf čvorovi su dozvoljeni u transakciji
 DocType: Expense Claim,Expense Approver,Rashodi Approver
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,Kupnja Prijem artikla Isporuka
@@ -2386,19 +2305,16 @@
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +17,To Datetime,To datuma i vremena
 DocType: SMS Settings,SMS Gateway URL,SMS Gateway URL
 apps/erpnext/erpnext/config/crm.py +53,Logs for maintaining sms delivery status,Dnevnici za održavanje sms statusa isporuke
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +137,Grinding,Mljevenje
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +34,Shrink wrapping,Shrink umotavanja
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +36,Pending Activities,Aktivnostima na čekanju
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,Confirmed,Potvrđen
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier > Supplier Type,Dobavljač> proizvođač tip
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +127,Please enter relieving date.,Unesite olakšavanja datum .
 apps/erpnext/erpnext/controllers/trends.py +137,Amt,Amt
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' can be submitted,"Ostavite samo one prijave sa statusom "" Odobreno"" može se podnijeti"
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +51,Only Leave Applications with status 'Approved' can be submitted,"Ostavite samo one prijave sa statusom "" Odobreno"" može se podnijeti"
 apps/erpnext/erpnext/utilities/doctype/address/address.py +21,Address Title is mandatory.,Naziv adrese je obavezan.
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,"Unesite naziv kampanje, ako je izvor upit je kampanja"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +38,Newspaper Publishers,novinski izdavači
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +38,Newspaper Publishers,novinski izdavači
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,Odaberite Fiskalna godina
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +88,Smelting,Topljenje
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Ponovno red Level
 DocType: Attendance,Attendance Date,Gledatelja Datum
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,Plaća raspada temelju zarađivati ​​i odbitka.
@@ -2413,16 +2329,15 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +414,[Error],[Error]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,U riječi će biti vidljiv nakon što spremite prodajnog naloga.
 ,Employee Birthday,Zaposlenik Rođendan
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +55,Venture Capital,venture Capital
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,venture Capital
 DocType: UOM,Must be Whole Number,Mora biti cijeli broj
 DocType: Leave Control Panel,New Leaves Allocated (In Days),Novi Lišće alociran (u danima)
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +51,Serial No {0} does not exist,Serijski Ne {0} ne postoji
 DocType: Pricing Rule,Discount Percentage,Postotak rabata
 DocType: Payment Reconciliation Invoice,Invoice Number,Račun broj
-apps/erpnext/erpnext/hooks.py +70,Orders,Narudžbe
+apps/erpnext/erpnext/hooks.py +54,Orders,Narudžbe
 DocType: Leave Control Panel,Employee Type,Zaposlenik Tip
 DocType: Employee Leave Approver,Leave Approver,Ostavite odobravatelju
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +70,Swaging,Savijanje
 DocType: Manufacturing Settings,Material Transferred for Manufacture,Materijal za Preneseni Proizvodnja
 DocType: Expense Claim,"A user with ""Expense Approver"" role","Korisnik sa ""Rashodi Approver"" ulogu"
 ,Issued Items Against Production Order,Izdana Proizvodi prema proizvodnji Reda
@@ -2434,7 +2349,6 @@
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +62,Cost Center with existing transactions can not be converted to group,Troška s postojećim transakcija ne može se prevesti u skupini
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Depreciation,Amortizacija
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Dobavljač (s)
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +29,Invalid period,Invalid period
 DocType: Customer,Credit Limit,Kreditni limit
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,Odaberite vrstu transakcije
 DocType: GL Entry,Voucher No,Bon Ne
@@ -2444,9 +2358,9 @@
 DocType: Customer,Address and Contact,Adresa i kontakt
 DocType: Customer,Last Day of the Next Month,Zadnji dan narednog mjeseca
 DocType: Employee,Feedback,Povratna veza
+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}","Ostavite se ne može dodijeliti prije {0}, kao odsustvo ravnoteža je već carry-proslijeđen u budućnosti rekord raspodjeli odsustvo {1}"
 apps/erpnext/erpnext/accounts/party.py +284,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Napomena: Zbog / Reference Datum premašuje dozvoljeni dana kreditnu kupca {0} dan (a)
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +621,Maint. Schedule,Maint. Raspored
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +108,Abrasive jet machining,Abrazivne jet mašinsku obradu
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +632,Maint. Schedule,Maint. Raspored
 DocType: Stock Settings,Freeze Stock Entries,Zamrzavanje Stock Unosi
 DocType: Website Settings,Website Settings,Website Postavke
 DocType: Item,Reorder level based on Warehouse,Nivo Ponovno red zasnovan na Skladište
@@ -2463,7 +2377,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +75,Show Stock Entries,Show Stock unosi
 ,Is Primary Address,Je primarna adresa
 DocType: Production Order,Work-in-Progress Warehouse,Rad u tijeku Warehouse
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +308,Reference #{0} dated {1},Reference # {0} od {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Reference #{0} dated {1},Reference # {0} od {1}
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +13,Manage Addresses,Upravljanje Adrese
 DocType: Pricing Rule,Item Code,Šifra artikla
 DocType: Production Planning Tool,Create Production Orders,Stvaranje radne naloge
@@ -2472,7 +2386,7 @@
 DocType: Lead,Market Segment,Tržišni segment
 DocType: Communication,Phone,Telefon
 DocType: Employee Internal Work History,Employee Internal Work History,Zaposlenik Unutarnji Rad Povijest
-apps/erpnext/erpnext/public/js/account_tree_grid.js +50,Closing (Dr),Zatvaranje (Dr)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +221,Closing (Dr),Zatvaranje (Dr)
 DocType: Contact,Passive,Pasiva
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,Serijski Ne {0} nije u dioničko
 apps/erpnext/erpnext/config/selling.py +127,Tax template for selling transactions.,Porezna predložak za prodaju transakcije .
@@ -2488,8 +2402,8 @@
 ,Billed Amount,Naplaćeni iznos
 DocType: Bank Reconciliation,Bank Reconciliation,Banka pomirenje
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +9,Get Updates,Get Updates
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +129,Material Request {0} is cancelled or stopped,Materijal Zahtjev {0} je otkazan ili zaustavljen
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +641,Add a few sample records,Dodati nekoliko uzorku zapisa
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +133,Material Request {0} is cancelled or stopped,Materijal Zahtjev {0} je otkazan ili zaustavljen
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Add a few sample records,Dodati nekoliko uzorku zapisa
 apps/erpnext/erpnext/config/hr.py +210,Leave Management,Ostavite Management
 DocType: Event,Groups,Grupe
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,Grupa po računu
@@ -2502,38 +2416,34 @@
 DocType: Features Setup,Sales Extras,Prodajni dodaci
 apps/erpnext/erpnext/accounts/utils.py +344,{0} budget for Account {1} against Cost Center {2} will exceed by {3},{0} proračun za račun {1} od troška {2} premašit će po {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +236,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Razlika račun mora biti tip imovine / odgovornošću obzir, jer je to Stock Pomirenje je otvor za ulaz"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +138,Purchase Order number required for Item {0},Broj narudžbenice kupnje je potreban za artikal {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Order number required for Item {0},Broj narudžbenice kupnje je potreban za artikal {0}
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',"' Od datuma ' mora biti poslije ' To Date """
 ,Stock Projected Qty,Stock Projekcija Kol
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +147,Customer {0} does not belong to project {1},Korisnik {0} ne pripada projicirati {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +150,Customer {0} does not belong to project {1},Korisnik {0} ne pripada projicirati {1}
 DocType: Sales Order,Customer's Purchase Order,Narudžbenica kupca
 DocType: Warranty Claim,From Company,Iz Društva
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,"Vrijednost, ili kol"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Minute,Minuta
+apps/erpnext/erpnext/public/js/setup_wizard.js +363,Minute,Minuta
 DocType: Purchase Invoice,Purchase Taxes and Charges,Kupnja Porezi i naknade
 ,Qty to Receive,Količina za primanje
 DocType: Leave Block List,Leave Block List Allowed,Ostavite Block List dopuštenih
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +61,Conversion factor cannot be in fractions,Faktor pretvorbe ne može biti u frakcijama
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +358,You will use it to Login,Vi ćete ga koristiti za prijavu
+apps/erpnext/erpnext/public/js/setup_wizard.js +108,You will use it to Login,Vi ćete ga koristiti za prijavu
 DocType: Sales Partner,Retailer,Prodavač na malo
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +99,Credit To account must be a Balance Sheet account,Kredit na račun mora biti bilans stanja računa
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,Sve vrste dobavljača
 apps/erpnext/erpnext/stock/doctype/item/item.py +37,Item Code is mandatory because Item is not automatically numbered,Kod artikla je obvezan jer artikli nisu automatski numerirani
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +99,Quotation {0} not of type {1},Ponuda {0} nije tip {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +93,Quotation {0} not of type {1},Ponuda {0} nije tip {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,Održavanje Raspored predmeta
 DocType: Sales Order,%  Delivered,Isporučena%
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,Bank Overdraft Account,Bank Prekoračenje računa
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +15,Make Salary Slip,Provjerite plaće slip
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +18,Browse BOM,Browse BOM
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +175,Secured Loans,osigurani krediti
-apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +3,Awesome Products,Nevjerovatni proizvodi
+apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +3,Awesome Products,Nevjerovatni proizvodi
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +189,Opening Balance Equity,Početno stanje Equity
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +80,Cannot approve leave as you are not authorized to approve leaves on Block Dates,Ne može odobriti dopust kako niste ovlašteni za odobravanje lišće o skupnom datume
 DocType: Appraisal,Appraisal,Procjena
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +13,Lost-foam casting,Lost-pjene casting
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +47,Drawing,Crtanje
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +22,Date is repeated,Datum se ponavlja
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +148,Leave approver must be one of {0},Ostavite odobritelj mora biti jedan od {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +162,Leave approver must be one of {0},Ostavite odobritelj mora biti jedan od {0}
 DocType: Hub Settings,Seller Email,Prodavač-mail
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Ukupno TROŠKA (preko fakturi)
 DocType: Workstation Working Hour,Start Time,Start Time
@@ -2547,7 +2457,7 @@
 DocType: Purchase Invoice Item,Net Amount (Company Currency),Neto iznos (Company valuta)
 DocType: BOM Operation,Hour Rate,Cijena sata
 DocType: Stock Settings,Item Naming By,Artikal imenovan po
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +642,From Quotation,od kotaciju
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +655,From Quotation,od kotaciju
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},Drugi period Zatvaranje Stupanje {0} je postignut nakon {1}
 DocType: Production Order,Material Transferred for Manufacturing,Materijal Prebačen za izradu
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +29,Account {0} does not exists,Račun {0} ne postoji
@@ -2561,21 +2471,19 @@
 DocType: Purchase Invoice Item,PR Detail,PR Detalj
 DocType: Sales Order,Fully Billed,Potpuno Naplaćeno
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +20,Cash In Hand,Novac u blagajni
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +72,Delivery warehouse required for stock item {0},Isporuka skladište potrebno za zaliha stavku {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +119,Delivery warehouse required for stock item {0},Isporuka skladište potrebno za zaliha stavku {0}
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),Bruto težina paketa. Obično neto težina + ambalaža težina. (Za tisak)
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Korisnici s ovom ulogom smiju postaviti zamrznute račune i izradu / izmjenu računovodstvenih unosa protiv zamrznutih računa
 DocType: Serial No,Is Cancelled,Je otkazan
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +281,My Shipments,Moj Pošiljke
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +286,My Shipments,Moj Pošiljke
 DocType: Journal Entry,Bill Date,Datum računa
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +43,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","Čak i ako postoji više Cijene pravila s najvišim prioritetom, onda sljedeći interni prioriteti primjenjuje se:"
 DocType: Supplier,Supplier Details,Dobavljač Detalji
 DocType: Communication,Recipients,Primatelji
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +146,Screwing,Jebe
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +96,Knurling,Knurling
 DocType: Expense Claim,Approval Status,Status odobrenja
 DocType: Hub Settings,Publish Items to Hub,Objavite Stavke za Hub
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +44,From value must be less than to value in row {0},Od vrijednosti mora biti manje nego vrijednosti u redu {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +133,Wire Transfer,Wire Transfer
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +133,Wire Transfer,Wire Transfer
 apps/erpnext/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py +25,Please select Bank Account,Odaberite bankovni račun
 DocType: Newsletter,Create and Send Newsletters,Kreiranje i slanje newsletter
 apps/frappe/frappe/public/js/frappe/views/reports/grid_report.js +305,From Date must be before To Date,Od datuma mora biti prije do danas
@@ -2583,14 +2491,14 @@
 DocType: Company,Default Income Account,Zadani račun prihoda
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,Kupac Group / kupaca
 DocType: Item Group,Check this if you want to show in website,Označite ovo ako želite pokazati u web
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +190,Welcome to ERPNext,Dobrodošli na ERPNext
+,Welcome to ERPNext,Dobrodošli na ERPNext
 DocType: Payment Reconciliation Payment,Voucher Detail Number,Bon Detalj broj
 apps/erpnext/erpnext/config/crm.py +146,Lead to Quotation,Dovesti do ponudu
 DocType: Lead,From Customer,Od kupca
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +37,Calls,Pozivi
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Calls,Pozivi
 DocType: Project,Total Costing Amount (via Time Logs),Ukupan iznos Costing (putem Time Dnevnici)
 DocType: Purchase Order Item Supplied,Stock UOM,Kataloški UOM
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Purchase Order {0} is not submitted,Narudžbenicu {0} nije podnesen
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +194,Purchase Order {0} is not submitted,Narudžbenicu {0} nije podnesen
 ,Projected,projektiran
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},Serijski Ne {0} ne pripada Warehouse {1}
 apps/erpnext/erpnext/controllers/status_updater.py +136,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Napomena : Sustav neće provjeravati pretjerano isporuke i više - booking za točku {0} kao količinu ili vrijednost je 0
@@ -2598,7 +2506,6 @@
 DocType: Issue,Opening Date,Otvaranje Datum
 DocType: Journal Entry,Remark,Primjedba
 DocType: Purchase Receipt Item,Rate and Amount,Kamatna stopa i iznos
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +95,Boring,Dosadan
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +667,From Sales Order,Od prodajnog naloga
 DocType: Blog Category,Parent Website Route,Roditelj Web Route
 DocType: Sales Order,Not Billed,Ne Naplaćeno
@@ -2612,19 +2519,17 @@
 apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount Amount,Iznos rabata
 DocType: Purchase Invoice,Return Against Purchase Invoice,Vratiti protiv fakturi
 DocType: Item,Warranty Period (in days),Jamstveni period (u danima)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +550,e.g. VAT,na primjer PDV
+apps/erpnext/erpnext/public/js/setup_wizard.js +292,e.g. VAT,na primjer PDV
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,Stavka 4
 DocType: Journal Entry Account,Journal Entry Account,Journal Entry račun
 DocType: Shopping Cart Settings,Quotation Series,Citat serije
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +52,"An item exists with same name ({0}), please change the item group name or rename the item","Stavka postoji s istim imenom ( {0} ) , molimo promijenite ime stavku grupe ili preimenovati stavku"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +82,Hot metal gas forming,Hot metal plina oblikovanje
 DocType: Sales Order Item,Sales Order Date,Datum narudžbe kupca
 DocType: Sales Invoice Item,Delivered Qty,Isporučena količina
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +63,Warehouse {0}: Company is mandatory,Skladište {0}: Kompanija je obvezna
 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.",Idi na odgovarajuću grupu (obično izvor sredstava&gt; Trenutno Obaveze&gt; poreza i carina i stvoriti novi nalog (klikom na Dodaj djeteta) tipa &quot;porez&quot; i raditi spomenuti Stopa poreza.
 ,Payment Period Based On Invoice Date,Razdoblje za naplatu po Datum fakture
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +50,Missing Currency Exchange Rates for {0},Nedostaje Valuta Tečaj za {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +135,Laser cutting,Lasersko rezanje
 DocType: Event,Monday,Ponedjeljak
 DocType: Journal Entry,Stock Entry,Kataloški Stupanje
 DocType: Account,Payable,Plativ
@@ -2657,7 +2562,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +111,Date Of Retirement must be greater than Date of Joining,Datum umirovljenja mora biti veći od datuma pristupa
 DocType: Sales Invoice,Against Income Account,Protiv računu dohotka
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +69,{0}% Delivered,{0}% Isporučena
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +78,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Stavka {0}: {1} Naručena količina ne može biti manji od minimalnog bi Količina {2} (iz točke).
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Stavka {0}: {1} Naručena količina ne može biti manji od minimalnog bi Količina {2} (iz točke).
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Mjesečni Distribucija Postotak
 DocType: Territory,Territory Targets,Teritorij Mete
 DocType: Delivery Note,Transporter Info,Transporter Info
@@ -2666,7 +2571,6 @@
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,Naslovi za ispis predložaka pr Predračuna.
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +140,Valuation type charges can not marked as Inclusive,Prijava tip vrednovanja ne može označiti kao Inclusive
 DocType: POS Profile,Update Stock,Ažurirajte Stock
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +128,Superfinishing,Plazmom
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,Različite mjerne jedinice proizvoda će dovesti do ukupne pogrešne neto težine. Budite sigurni da je neto težina svakog proizvoda u istoj mjernoj jedinici.
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM Rate
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +85,Please pull items from Delivery Note,Molimo povucite stavke iz Dostavnica
@@ -2681,7 +2585,6 @@
 ,Purchase Analytics,Kupnja Analytics
 DocType: Sales Invoice Item,Delivery Note Item,Stavka otpremnice
 DocType: Expense Claim,Task,Zadatak
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +57,Shaving,Brijanje
 DocType: Purchase Taxes and Charges,Reference Row #,Reference Row #
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},Batch broj je obavezno za Stavka {0}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js +14,This is a root sales person and cannot be edited.,To jekorijen prodavač i ne može se mijenjati .
@@ -2693,13 +2596,11 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +74,Purpose must be one of {0},Svrha mora biti jedan od {0}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +108,Fill the form and save it,Ispunite obrazac i spremite ga
 DocType: Production Planning Tool,Download a report containing all raw materials with their latest inventory status,Preuzmite izvješće koje sadrži sve sirovine sa svojim najnovijim statusom inventara
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +94,Facing,Suočavanje
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,Community Forum
 DocType: Leave Application,Leave Balance Before Application,Ostavite Balance Prije primjene
 DocType: SMS Center,Send SMS,Pošalji SMS
 DocType: Company,Default Letter Head,Uobičajeno Letter Head
 DocType: Time Log,Billable,Naplativo
-DocType: Authorization Rule,This will be used for setting rule in HR module,To će se koristiti za postavljanje pravilu u HR modula
 DocType: Account,Rate at which this tax is applied,Stopa po kojoj je taj porez se primjenjuje
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reorder Qty,Ponovno red Qty
 DocType: Company,Stock Adjustment Account,Stock Adjustment račun
@@ -2726,16 +2627,15 @@
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,Postotak izdvajanja trebala bi biti jednaka 100 %
 DocType: Serial No,Out of AMC,Od AMC
 DocType: Purchase Order Item,Material Request Detail No,Materijal Zahtjev Detalj Ne
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +97,Hard turning,Hard okretanja
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +33,Make Maintenance Visit,Provjerite održavanja Posjetite
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +187,Please contact to the user who have Sales Master Manager {0} role,Molimo kontaktirajte za korisnike koji imaju Sales Manager Master {0} ulogu
 DocType: Company,Default Cash Account,Zadani novčani račun
 apps/erpnext/erpnext/config/accounts.py +79,Company (not Customer or Supplier) master.,Društvo ( ne kupaca i dobavljača ) majstor .
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +106,Please enter 'Expected Delivery Date',Unesite ' Očekivani datum isporuke '
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +187,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Otpremnica {0} mora biti otkazana prije poništenja ove narudžbenice
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +100,Please enter 'Expected Delivery Date',Unesite ' Očekivani datum isporuke '
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +182,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Otpremnica {0} mora biti otkazana prije poništenja ove narudžbenice
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +373,Paid amount + Write Off Amount can not be greater than Grand Total,Uplaćeni iznos + otpis iznos ne može biti veći od SVEUKUPNO
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} nije ispravan broj serije za točku {1}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,Note: There is not enough leave balance for Leave Type {0},Napomena : Nema dovoljno ravnotežu dopust za dozvolu tipa {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +124,Note: There is not enough leave balance for Leave Type {0},Napomena : Nema dovoljno ravnotežu dopust za dozvolu tipa {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.","Napomena: Ako se plaćanje ne vrši protiv bilo koje reference, ručno napraviti Journal Entry."
 DocType: Item,Supplier Items,Dobavljač Predmeti
 DocType: Opportunity,Opportunity Type,Prilika Tip
@@ -2747,7 +2647,7 @@
 DocType: Hub Settings,Publish Availability,Objavite Dostupnost
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +105,Date of Birth cannot be greater than today.,Datum rođenja ne može biti veći nego što je danas.
 ,Stock Ageing,Kataloški Starenje
-apps/erpnext/erpnext/controllers/accounts_controller.py +200,{0} '{1}' is disabled,{0} '{1}' je onemogućena
+apps/erpnext/erpnext/controllers/accounts_controller.py +201,{0} '{1}' is disabled,{0} '{1}' je onemogućena
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Postavi kao Open
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Pošaljite e-poštu automatski da Kontakti na podnošenje transakcija.
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +232,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
@@ -2756,44 +2656,38 @@
 DocType: Purchase Order,Customer Contact Email,Customer Contact mail
 DocType: Event,Sunday,Nedjelja
 DocType: Sales Team,Contribution (%),Doprinos (%)
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +455,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,Napomena : Stupanje Plaćanje neće biti izrađen od ' Gotovina ili bankovni račun ' nije naveden
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +171,Responsibilities,Odgovornosti
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +457,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,Napomena : Stupanje Plaćanje neće biti izrađen od ' Gotovina ili bankovni račun ' nije naveden
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +171,Responsibilities,Odgovornosti
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Template,Predložak
 DocType: Sales Person,Sales Person Name,Ime referenta prodaje
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,Unesite atleast jedan račun u tablici
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +511,Add Users,Dodaj Korisnici
+apps/erpnext/erpnext/public/js/setup_wizard.js +255,Add Users,Dodaj Korisnici
 DocType: Pricing Rule,Item Group,Grupa artikla
 DocType: Task,Actual Start Date (via Time Logs),Stvarni datum Start (putem Time Dnevnici)
 DocType: Stock Reconciliation Item,Before reconciliation,Prije nego pomirenje
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +12,To {0},Za {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Porezi i naknade uvrštenja (Društvo valuta)
-apps/erpnext/erpnext/stock/doctype/item/item.py +340,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Stavka Porezna Row {0} mora imati račun tipa poreza ili prihoda i rashoda ili naplativ
+apps/erpnext/erpnext/stock/doctype/item/item.py +344,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Stavka Porezna Row {0} mora imati račun tipa poreza ili prihoda i rashoda ili naplativ
 DocType: Sales Order,Partly Billed,Djelomično Naplaćeno
 DocType: Item,Default BOM,Zadani BOM
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +79,Decambering,Decambering
 apps/erpnext/erpnext/setup/doctype/company/company.js +22,Please re-type company name to confirm,Molimo vas da ponovno tipa naziv firme za potvrdu
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,Ukupno Outstanding Amt
 DocType: Time Log Batch,Total Hours,Ukupno vrijeme
 DocType: Journal Entry,Printing Settings,Printing Settings
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +268,Total Debit must be equal to Total Credit. The difference is {0},Ukupno zaduženje mora biti jednak ukupnom kreditnom .
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +11,Automotive,Automobilska industrija
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +37,Item is required,Artikal je potreban
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +25,Metal injection molding,Metal brizganje
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +258,Total Debit must be equal to Total Credit. The difference is {0},Ukupno zaduženje mora biti jednak ukupnom kreditnom .
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,Automobilska industrija
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +684,From Delivery Note,Od otpremnici
 DocType: Time Log,From Time,S vremena
 DocType: Notification Control,Custom Message,Prilagođena poruka
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +33,Investment Banking,Investicijsko bankarstvo
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +261,"Select your Country, Time Zone and Currency","Izaberite svoju zemlju, vremensku zonu i valuta"
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,Investicijsko bankarstvo
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +316,"Select your Country, Time Zone and Currency","Izaberite svoju zemlju, vremensku zonu i valuta"
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +369,Cash or Bank Account is mandatory for making payment entry,Novac ili bankovni račun je obvezna za izradu ulazak plaćanje
 DocType: Purchase Invoice,Price List Exchange Rate,Cjenik tečajna
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +91,Pickling,Stavljanje u turšiju
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +18,Sand casting,Sand casting
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +117,Electroplating,Galvanizacija
 DocType: Purchase Invoice Item,Rate,VPC
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +62,Intern,stažista
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Intern,stažista
 DocType: Newsletter,A Lead with this email id should exist,Kontakt sa ovim e-mailom bi trebao postojati
 DocType: Stock Entry,From BOM,Iz BOM
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +34,Basic,Osnovni
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +34,Basic,Osnovni
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,Stock transakcije prije {0} se zamrznut
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +217,Please click on 'Generate Schedule',"Molimo kliknite na ""Generiraj raspored '"
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +61,To Date should be same as From Date for Half Day leave,Za datum bi trebao biti isti kao i od datuma za poludnevni dopust
@@ -2801,11 +2695,11 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +96,Reference No is mandatory if you entered Reference Date,Reference Ne obvezno ako ušao referentnog datuma
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +108,Date of Joining must be greater than Date of Birth,Datum pristupa mora biti veći od datuma rođenja
 DocType: Salary Structure,Salary Structure,Plaća Struktura
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +242,"Multiple Price Rule exists with same criteria, please resolve \
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +246,"Multiple Price Rule exists with same criteria, please resolve \
 			conflict by assigning priority. Price Rules: {0}","Višestruki Cijena pravilo postoji sa istim kriterijima, molimo Vas da riješe sukob \
  dodjeljivanjem prioriteta. Cijena Pravila: {0}"
 DocType: Account,Bank,Banka
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +9,Airline,Aviokompanija
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,Aviokompanija
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +493,Issue Material,Izdanje materijala
 DocType: Material Request Item,For Warehouse,Za galeriju
 DocType: Employee,Offer Date,ponuda Datum
@@ -2815,29 +2709,24 @@
 DocType: Item,Is Fixed Asset Item,Je fiksne imovine stavku
 DocType: Stock Entry,Including items for sub assemblies,Uključujući i stavke za pod sklopova
 DocType: Features Setup,"If you have long print formats, this feature can be used to split the page to be printed on multiple pages with all headers and footers on each page","Ako ste dugo ispis formata, ova značajka može se koristiti za podijeliti stranicu na koju se ispisuje više stranica sa svim zaglavljima i podnožjima na svakoj stranici"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +131,Hobbing,Hobbing
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +98,All Territories,Sve teritorije
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +98,All Territories,Sve teritorije
 DocType: Purchase Invoice,Items,Artikli
 DocType: Fiscal Year,Year Name,Naziv godine
 DocType: Process Payroll,Process Payroll,Proces plaće
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +59,There are more holidays than working days this month.,Postoji više odmor nego radnih dana ovog mjeseca .
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +68,There are more holidays than working days this month.,Postoji više odmor nego radnih dana ovog mjeseca .
 DocType: Product Bundle Item,Product Bundle Item,Proizvod Bundle Stavka
 DocType: Sales Partner,Sales Partner Name,Prodaja Ime partnera
 DocType: Purchase Invoice Item,Image View,Prikaz slike
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +113,Finishing & industrial finishing,Završeno &amp; industrijske Završeno
 DocType: Issue,Opening Time,Radno vrijeme
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,Od i Do datuma zahtijevanih
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +46,Securities & Commodity Exchanges,Vrijednosni papiri i robne razmjene
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Vrijednosni papiri i robne razmjene
 DocType: Shipping Rule,Calculate Based On,Izračun zasnovan na
 DocType: Delivery Note Item,From Warehouse,Od Skladište
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +98,Drilling,Bušenje
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +28,Blow molding,Duvanjem
 DocType: Purchase Taxes and Charges,Valuation and Total,Vrednovanje i Total
 DocType: Tax Rule,Shipping City,Dostava City
 apps/erpnext/erpnext/stock/doctype/item/item.js +43,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,"Ovaj proizvod varijanta {0} (Template). Atributi će se kopirati preko iz predloška, ​​osim 'Ne Copy ""je postavljena"
 DocType: Account,Purchase User,Kupovina korisnika
 DocType: Notification Control,Customize the Notification,Prilagodite Obavijest
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +87,Hammering,Zakucavanje
 DocType: Web Page,Slideshow,Slideshow
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +24,Default Address Template cannot be deleted,Zadani predložak adrese ne može se izbrisati
 DocType: Sales Invoice,Shipping Rule,Pravilo transporta
@@ -2846,9 +2735,8 @@
 DocType: Workflow State,Search,Pretraga
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +54,Total cannot be zero,Ukupna ne može biti nula
 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,' Dani od posljednjeg reda ' mora biti veći ili jednak nuli
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +142,Brazing,Lemljenje
 DocType: C-Form,Amended From,Izmijenjena Od
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Raw Material,sirovine
+apps/erpnext/erpnext/public/js/setup_wizard.js +359,Raw Material,sirovine
 DocType: Leave Application,Follow via Email,Slijedite putem e-maila
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Iznos poreza Nakon iznosa popusta
 apps/erpnext/erpnext/accounts/doctype/account/account.py +174,Child account exists for this account. You can not delete this account.,Dijete računa postoji za taj račun . Ne možete izbrisati ovaj račun .
@@ -2862,10 +2750,10 @@
 ,Produced,Proizvedeno
 DocType: Item,Item Code for Suppliers,Šifra za dobavljače
 DocType: Issue,Raised By (Email),Povišena Do (e)
-apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +72,General,Opšti
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +495,Attach Letterhead,Priložiti zaglavlje
+apps/erpnext/erpnext/setup/setup_wizard/default_website.py +72,General,Opšti
+apps/erpnext/erpnext/public/js/setup_wizard.js +241,Attach Letterhead,Priložiti zaglavlje
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +272,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',"Ne mogu odbiti kada kategorija je "" vrednovanje "" ili "" Vrednovanje i Total '"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +542,"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.","List poreza glave (npr PDV-a, carina itd, oni treba da imaju jedinstvena imena), a njihov standard stope. Ovo će stvoriti standardni obrazac koji možete uređivati ​​i dodati još kasnije."
+apps/erpnext/erpnext/public/js/setup_wizard.js +284,"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.","List poreza glave (npr PDV-a, carina itd, oni treba da imaju jedinstvena imena), a njihov standard stope. Ovo će stvoriti standardni obrazac koji možete uređivati ​​i dodati još kasnije."
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial Nos Required for Serialized Item {0},Serijski Nos potrebna za serijaliziranom točke {0}
 DocType: Journal Entry,Bank Entry,Bank Entry
 DocType: Authorization Rule,Applicable To (Designation),Odnosi se na (Oznaka)
@@ -2874,33 +2762,32 @@
 apps/erpnext/erpnext/config/accounts.py +143,Enable / disable currencies.,Omogućiti / onemogućiti valute .
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Postal Expenses,Poštanski troškovi
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Ukupno (Amt)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +26,Entertainment & Leisure,Zabava i slobodno vrijeme
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,Zabava i slobodno vrijeme
 DocType: Purchase Order,The date on which recurring order will be stop,Datum na koji se ponavlja kako će se zaustaviti
 DocType: Quality Inspection,Item Serial No,Serijski broj artikla
 apps/erpnext/erpnext/controllers/status_updater.py +142,{0} must be reduced by {1} or you should increase overflow tolerance,{0} mora biti smanjena za {1} ili bi trebali povećati overflow toleranciju
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Present,Ukupno Present
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Hour,Sat
+apps/erpnext/erpnext/public/js/setup_wizard.js +363,Hour,Sat
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +138,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation","Serijalizovani Stavka {0} ne može se ažurirati \
  koristeći Stock pomirenje"
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +488,Transfer Material to Supplier,Transfera Materijal dobavljaču
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +513,Transfer Material to Supplier,Transfera Materijal dobavljaču
 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,Novi serijski broj ne može imati skladište. Skladište mora biti postavljen od strane burze upisu ili kupiti primitka
 DocType: Lead,Lead Type,Tip potencijalnog kupca
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +82,Create Quotation,stvaranje citata
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +306,All these items have already been invoiced,Svi ovi artikli su već fakturisani
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,You are not authorized to approve leaves on Block Dates,Niste ovlašteni za odobravanje lišće na bloku Termini
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +311,All these items have already been invoiced,Svi ovi artikli su već fakturisani
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},Može biti odobren od strane {0}
 DocType: Shipping Rule,Shipping Rule Conditions,Uslovi pravila transporta
 DocType: BOM Replace Tool,The new BOM after replacement,Novi BOM nakon zamjene
 DocType: Features Setup,Point of Sale,Point of Sale
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +83,Curling,Kovrđžast
 DocType: Account,Tax,Porez
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +28,Row {0}: {1} is not a valid {2},Row {0}: {1} nije važeći {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +89,Refining,Refining
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +37,Row {0}: {1} is not a valid {2},Row {0}: {1} nije važeći {2}
 DocType: Production Planning Tool,Production Planning Tool,Planiranje proizvodnje alat
 DocType: Quality Inspection,Report Date,Prijavi Datum
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +130,Routing,Routing
 DocType: C-Form,Invoices,Fakture
 DocType: Job Opening,Job Title,Titula
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +54,{0} already allocated for Employee {1} for period {2} - {3},{0} već izdvojeno za zaposlenog {1} {2} za razdoblje - {3}
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +80,{0} Recipients,{0} Primatelji
 DocType: Features Setup,Item Groups in Details,Grupe artikala u detaljima
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +335,Quantity to Manufacture must be greater than 0.,Količina za proizvodnju mora biti veći od 0.
@@ -2918,14 +2805,13 @@
 DocType: DocType,Setup,Podešavanje
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,Ne postoji ništa za uređivanje .
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +108,Summary for this month and pending activities,Sažetak za ovaj mjesec i aktivnostima na čekanju
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +39,Cold rolling,Hladno valjanje
 DocType: Customer Group,Customer Group Name,Kupac Grupa Ime
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +408,Please remove this Invoice {0} from C-Form {1},Molimo vas da uklonite ovu fakture {0} iz C-Form {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +410,Please remove this Invoice {0} from C-Form {1},Molimo vas da uklonite ovu fakture {0} iz C-Form {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,Molimo odaberite prenositi ako želite uključiti prethodnoj fiskalnoj godini je ravnoteža ostavlja na ovoj fiskalnoj godini
 DocType: GL Entry,Against Voucher Type,Protiv voucher vrsti
 DocType: Item,Attributes,Atributi
 DocType: Packing Slip,Get Items,Kreiraj proizvode
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +186,Please enter Write Off Account,Unesite otpis račun
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +187,Please enter Write Off Account,Unesite otpis račun
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +71,Last Order Date,Last Order Datum
 DocType: DocField,Image,Slika
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +179,Make Excise Invoice,Provjerite trošarinske fakturu
@@ -2935,7 +2821,7 @@
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +146,Operation ID not set,Operacija ID nije postavljen
 DocType: Production Order,Planned Start Date,Planirani Ozljede Datum
 DocType: Serial No,Creation Document Type,Tip stvaranje dokumenata
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +620,Maint. Visit,Maint. Posjeti
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +631,Maint. Visit,Maint. Posjeti
 DocType: Leave Type,Is Encash,Je li unovčiti
 DocType: Purchase Invoice,Mobile No,Mobitel Nema
 DocType: Payment Tool,Make Journal Entry,Make Journal Entry
@@ -2943,35 +2829,31 @@
 apps/erpnext/erpnext/controllers/trends.py +257,Project-wise data is not available for Quotation,Projekt - mudar podaci nisu dostupni za ponudu
 DocType: Project,Expected End Date,Očekivani Datum završetka
 DocType: Appraisal Template,Appraisal Template Title,Procjena Predložak Naslov
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +440,Commercial,trgovački
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +378,Commercial,trgovački
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +23,Parent Item {0} must not be a Stock Item,Roditelj Stavka {0} ne smije biti Stock Item
 DocType: Cost Center,Distribution Id,ID distribucije
-apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +14,Awesome Services,Nevjerovatne usluge
+apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +14,Awesome Services,Nevjerovatne usluge
 apps/erpnext/erpnext/config/manufacturing.py +29,All Products or Services.,Svi proizvodi i usluge.
 DocType: Purchase Invoice,Supplier Address,Dobavljač Adresa
 DocType: Contact Us Settings,Address Line 2,Adresa - linija 2
 DocType: ToDo,Reference,Upućivanje
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +59,Perforating,Perforiranje
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,Od kol
 apps/erpnext/erpnext/config/accounts.py +128,Rules to calculate shipping amount for a sale,Pravila za izračun shipping iznos za prodaju
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +29,Series is mandatory,Serija je obvezno
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +28,Financial Services,financijske usluge
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,financijske usluge
 apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3},Vrijednost za Atributi {0} mora biti u rasponu od {1} {2} da u koracima od {3}
 DocType: Tax Rule,Sales,Prodaja
 DocType: Stock Entry Detail,Basic Amount,Osnovni iznos
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +173,Warehouse required for stock Item {0},Skladište je potrebno za skladišne proizvode {0}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +178,Warehouse required for stock Item {0},Skladište je potrebno za skladišne proizvode {0}
 DocType: Leave Allocation,Unused leaves,Neiskorišteni lišće
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,Cr
 DocType: Customer,Default Receivable Accounts,Uobičajeno Potraživanja Računi
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +102,Sawing,Testerisanje
 DocType: Tax Rule,Billing State,State billing
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +32,Laminating,Kaširanje
 DocType: Item Reorder,Transfer,Prijenos
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +549,Fetch exploded BOM (including sub-assemblies),Fetch eksplodirala BOM (uključujući i podsklopova )
 DocType: Authorization Rule,Applicable To (Employee),Odnosi se na (Radnik)
 apps/erpnext/erpnext/controllers/accounts_controller.py +101,Due Date is mandatory,Due Date je obavezno
 apps/erpnext/erpnext/controllers/item_variant.py +51,Increment for Attribute {0} cannot be 0,Prirast za Atributi {0} ne može biti 0
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +143,Sintering,Sinteriranje
 DocType: Journal Entry,Pay To / Recd From,Platiti Da / RecD Od
 DocType: Naming Series,Setup Series,Postavljanje Serija
 DocType: Supplier,Contact HTML,Kontakt HTML
@@ -2984,7 +2866,6 @@
 DocType: Attendance,Absent,Odsutan
 DocType: Product Bundle,Product Bundle,Bundle proizvoda
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +180,Row {0}: Invalid reference {1},Red {0}: Invalid referentni {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +165,Crushing,Porazan
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Kupiti poreza i naknada Template
 DocType: Upload Attendance,Download Template,Preuzmite predložak
 DocType: GL Entry,Remarks,Primjedbe
@@ -2992,14 +2873,12 @@
 DocType: Journal Entry,Write Off Based On,Otpis na temelju
 DocType: Features Setup,POS View,POS Pogledaj
 apps/erpnext/erpnext/config/stock.py +38,Installation record for a Serial No.,Instalacijski zapis za serijski broj
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +9,Continuous casting,Kontinuirano lijevanje
 apps/erpnext/erpnext/public/js/queries.js +39,Please specify a,Navedite
 DocType: Offer Letter,Awaiting Response,Čeka se odgovor
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +53,Above,Iznad
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +80,Cold sizing,Cold Sizing
 DocType: Salary Slip,Earning & Deduction,Zarada &amp; Odbitak
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +76,Account {0} cannot be a Group,Konto {0} ne može biti grupa konta
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +259,Region,Regija
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +314,Region,Regija
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +213,Optional. This setting will be used to filter in various transactions.,Izborni . Ova postavka će se koristiti za filtriranje u raznim transakcijama .
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +104,Negative Valuation Rate is not allowed,Negativna stopa vrijednovanja nije dopuštena
 DocType: Holiday List,Weekly Off,Tjedni Off
@@ -3017,7 +2896,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,Account {0} is inactive,Konto {0} nije aktivan
 DocType: GL Entry,Is Advance,Je avans
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,Gledatelja Od datuma i posjećenost do sada je obvezno
-apps/erpnext/erpnext/controllers/buying_controller.py +131,Please enter 'Is Subcontracted' as Yes or No,Unesite ' Je podugovoren ' kao da ili ne
+apps/erpnext/erpnext/controllers/buying_controller.py +122,Please enter 'Is Subcontracted' as Yes or No,Unesite ' Je podugovoren ' kao da ili ne
 DocType: Sales Team,Contact No.,Kontakt broj
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,'Profit and Loss' type account {0} not allowed in Opening Entry,' Račun dobiti i gubitka ' vrsta računa {0} nije dopuštena u otvor za
 DocType: Workflow State,Time,Vrijeme
@@ -3026,14 +2905,13 @@
 DocType: Authorization Rule,Authorization Rule,Autorizacija Pravilo
 DocType: Sales Invoice,Terms and Conditions Details,Uvjeti Detalji
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,Prodaja poreza i naknada Template
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +10,Apparel & Accessories,Odjeća i modni dodaci
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,Odjeća i modni dodaci
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +67,Number of Order,Broj Order
 DocType: Item Group,HTML / Banner that will show on the top of product list.,HTML / baner koji će se prikazivati ​​na vrhu liste proizvoda.
 DocType: Shipping Rule,Specify conditions to calculate shipping amount,Odredite uvjete za izračunavanje iznosa shipping
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +121,Add Child,Dodaj podređenu stavku
 DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,Uloga Dozvoljena Set Frozen Accounts & Frozen Edit unosi
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +52,Cannot convert Cost Center to ledger as it has child nodes,"Ne može se pretvoriti troška za knjigu , kao da ima djece čvorova"
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +47,Conversion Factor is required,Faktor pretvorbe je potrebno
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +37,Serial #,Serial #
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +87,Commission on Sales,Komisija za prodaju
 DocType: Offer Letter Term,Value / Description,Vrijednost / Opis
@@ -3041,10 +2919,8 @@
 ,Customers Not Buying Since Long Time,Kupci ne kupuju jer dugo vremena
 DocType: Production Order,Expected Delivery Date,Očekivani rok isporuke
 apps/erpnext/erpnext/accounts/general_ledger.py +121,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Debitne i kreditne nije jednaka za {0} {1} #. Razlika je u tome {2}.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +48,Bulging,Ispupčen
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +11,Evaporative-pattern casting,Evaporativni-obrazac casting
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Entertainment Expenses,Zabava Troškovi
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +195,Sales Invoice {0} must be cancelled before cancelling this Sales Order,Prodaja Račun {0} mora biti otkazana prije poništenja ovu prodajnog naloga
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +190,Sales Invoice {0} must be cancelled before cancelling this Sales Order,Prodaja Račun {0} mora biti otkazana prije poništenja ovu prodajnog naloga
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +61,Age,Starost
 DocType: Time Log,Billing Amount,Billing Iznos
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +84,Invalid quantity specified for item {0}. Quantity should be greater than 0.,Navedena je pogrešna količina za proizvod {0}. Količina treba biti veći od 0.
@@ -3063,26 +2939,24 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,New Customer prihoda
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Travel Expenses,putni troškovi
 DocType: Maintenance Visit,Breakdown,Slom
-apps/erpnext/erpnext/controllers/accounts_controller.py +241,Account: {0} with currency: {1} can not be selected,Račun: {0} s valutnom: {1} se ne mogu odabrati
+apps/erpnext/erpnext/controllers/accounts_controller.py +242,Account: {0} with currency: {1} can not be selected,Račun: {0} s valutnom: {1} se ne mogu odabrati
 DocType: Bank Reconciliation Detail,Cheque Date,Datum čeka
 apps/erpnext/erpnext/accounts/doctype/account/account.py +47,Account {0}: Parent account {1} does not belong to company: {2},Konto {0}: Nadređeni konto {1} ne pripada preduzeću: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted all transactions related to this company!,Uspješno obrisane sve transakcije koje se odnose na ove kompanije!
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,Kao i na datum
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +111,Honing,Honovanje
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +58,Probation,Probni rad
-apps/erpnext/erpnext/stock/doctype/item/item.py +264,Default Warehouse is mandatory for stock Item.,Glavno skladište je obvezno za skladišni proizvod.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Probation,Probni rad
+apps/erpnext/erpnext/stock/doctype/item/item.py +268,Default Warehouse is mandatory for stock Item.,Glavno skladište je obvezno za skladišni proizvod.
 DocType: Feed,Full Name,Ime i prezime
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +148,Clinching,Vrstog
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +191,Payment of salary for the month {0} and year {1},Isplata plaće za mjesec {0} i godina {1}
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +173,Payment of salary for the month {0} and year {1},Isplata plaće za mjesec {0} i godina {1}
 DocType: Stock Settings,Auto insert Price List rate if missing,Auto umetak Cjenik stopa ako nedostaje
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,Ukupno uplaćeni iznos
 ,Transferred Qty,prebačen Kol
 apps/erpnext/erpnext/config/learn.py +11,Navigating,Navigacija
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +137,Planning,planiranje
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +137,Planning,planiranje
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +9,Make Time Log Batch,Nađite vremena Prijavite Hrpa
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Issued,Izdao
 DocType: Project,Total Billing Amount (via Time Logs),Ukupan iznos naplate (putem Time Dnevnici)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +629,We sell this Item,Prodajemo ovaj artikal
+apps/erpnext/erpnext/public/js/setup_wizard.js +365,We sell this Item,Prodajemo ovaj artikal
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +65,Supplier Id,Dobavljač Id
 DocType: Journal Entry,Cash Entry,Cash Entry
 DocType: Sales Partner,Contact Desc,Kontakt ukratko
@@ -3091,18 +2965,16 @@
 DocType: Brand,Item Manager,Stavka Manager
 DocType: Cost Center,Add rows to set annual budgets on Accounts.,Dodaj redak za izračun godišnjeg proračuna.
 DocType: Buying Settings,Default Supplier Type,Zadani tip dobavljača
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +160,Quarrying,Vađenje
 DocType: Production Order,Total Operating Cost,Ukupni trošak
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +160,Note: Item {0} entered multiple times,Napomena : Stavka {0} upisan je više puta
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +163,Note: Item {0} entered multiple times,Napomena : Stavka {0} upisan je više puta
 apps/erpnext/erpnext/config/crm.py +27,All Contacts.,Svi kontakti.
 DocType: Newsletter,Test Email Id,Test E-mail ID
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +394,Company Abbreviation,Skraćeni naziv preduzeća
+apps/erpnext/erpnext/public/js/setup_wizard.js +142,Company Abbreviation,Skraćeni naziv preduzeća
 DocType: Features Setup,If you follow Quality Inspection. Enables Item QA Required and QA No in Purchase Receipt,Ako slijedite kvalitete . Omogućuje predmet QA potrebno i QA Ne u Račun kupnje
 DocType: GL Entry,Party Type,Party Tip
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +68,Raw material cannot be same as main Item,Sirovina ne mogu biti isti kao glavni predmet
 DocType: Item Attribute Value,Abbreviation,Skraćenica
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,Ne authroized od {0} prelazi granice
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +30,Rotational molding,Rotacije lajsne
 apps/erpnext/erpnext/config/hr.py +115,Salary template master.,Plaća predložak majstor .
 DocType: Leave Type,Max Days Leave Allowed,Max Dani Ostavite dopuštenih
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +55,Set Tax Rule for shopping cart,Set poreza Pravilo za košarica
@@ -3116,15 +2988,15 @@
 apps/erpnext/erpnext/config/selling.py +18,Quotes to Leads or Customers.,Ponude za kupce ili potencijalne kupce.
 DocType: Stock Settings,Role Allowed to edit frozen stock,Uloga dopuštenih urediti smrznute zalihe
 ,Territory Target Variance Item Group-Wise,Teritorij Target varijance artikla Group - Wise
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +101,All Customer Groups,Sve grupe kupaca
-apps/erpnext/erpnext/controllers/accounts_controller.py +474,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} je obavezno. Možda Mjenjačnica zapis nije stvoren za {1} na {2}.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +101,All Customer Groups,Sve grupe kupaca
+apps/erpnext/erpnext/controllers/accounts_controller.py +475,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} je obavezno. Možda Mjenjačnica zapis nije stvoren za {1} na {2}.
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +37,Tax Template is mandatory.,Porez Template je obavezno.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +41,Account {0}: Parent account {1} does not exist,Konto {0}: Nadređeni konto {1} ne postoji
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Cjenik stopa (Društvo valuta)
 DocType: Account,Temporary,Privremen
 DocType: Address,Preferred Billing Address,Željena adresa za naplatu
 DocType: Monthly Distribution Percentage,Percentage Allocation,Postotak Raspodjela
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +86,Secretary,Sekretarica
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Secretary,Sekretarica
 DocType: Serial No,Distinct unit of an Item,Različite jedinice strane jedinice
 DocType: Pricing Rule,Buying,Nabavka
 DocType: HR Settings,Employee Records to be created by,Zaposlenik Records bi se stvorili
@@ -3137,9 +3009,8 @@
 ,Item-wise Price List Rate,Stavka - mudar Cjenovnik Ocijenite
 DocType: Purchase Order Item,Supplier Quotation,Dobavljač Ponuda
 DocType: Quotation,In Words will be visible once you save the Quotation.,U riječi će biti vidljiv nakon što spremite ponudu.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +68,Ironing,Peglanje
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is stopped,{0} {1} je zaustavljen
-apps/erpnext/erpnext/stock/doctype/item/item.py +352,Barcode {0} already used in Item {1},Barkod {0} se već koristi u artiklu {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +356,Barcode {0} already used in Item {1},Barkod {0} se već koristi u artiklu {1}
 DocType: Lead,Add to calendar on this date,Dodaj u kalendar na ovaj datum
 apps/erpnext/erpnext/config/selling.py +132,Rules for adding shipping costs.,Pravila za dodavanjem troškove prijevoza .
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,Najave događaja
@@ -3148,13 +3019,12 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +27,Quick Entry,Brzo uvođenje
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0} je obavezno za povratak
 DocType: Purchase Order,To Receive,Da Primite
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +33,Shrink fitting,Shrink montažu
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +522,user@example.com,user@example.com
+apps/erpnext/erpnext/public/js/setup_wizard.js +266,user@example.com,user@example.com
 DocType: Email Digest,Income / Expense,Prihodi / rashodi
 DocType: Employee,Personal Email,Osobni e
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +58,Total Variance,Ukupno Varijansa
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +62,Total Variance,Ukupno Varijansa
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.","Ako je omogućeno, sustav će objaviti računovodstvene stavke za popis automatski."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +15,Brokerage,posredništvo
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +15,Brokerage,posredništvo
 DocType: Address,Postal Code,Poštanski broj
 DocType: Production Order Operation,"in Minutes
 Updated via 'Time Log'","u minutama 
@@ -3162,14 +3032,13 @@
 DocType: Customer,From Lead,Od Olovo
 apps/erpnext/erpnext/config/manufacturing.py +19,Orders released for production.,Narudžbe objavljen za proizvodnju.
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +42,Select Fiscal Year...,Odaberite fiskalnu godinu ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +442,POS Profile required to make POS Entry,POS Profil potrebno da bi POS upis
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +444,POS Profile required to make POS Entry,POS Profil potrebno da bi POS upis
 DocType: Hub Settings,Name Token,Ime Token
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +106,Planing,Planiranje
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Selling,Standardna prodaja
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +120,Standard Selling,Standardna prodaja
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +137,Atleast one warehouse is mandatory,Atleast jednom skladištu je obavezno
 DocType: Serial No,Out of Warranty,Od jamstvo
 DocType: BOM Replace Tool,Replace,Zamijeniti
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +314,{0} against Sales Invoice {1},{0} protiv prodaje fakture {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +316,{0} against Sales Invoice {1},{0} protiv prodaje fakture {1}
 apps/erpnext/erpnext/stock/doctype/item/item.py +49,Please enter default Unit of Measure,Unesite zadanu jedinicu mjere
 DocType: Purchase Invoice Item,Project Name,Naziv projekta
 DocType: Supplier,Mention if non-standard receivable account,Spomenuti ako nestandardni potraživanja račun
@@ -3185,9 +3054,8 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,Journal Entry {0} does not have account {1} or already matched against other voucher,Journal Entry {0} nema obzir {1} ili su već usklađene protiv drugih vaučer
 DocType: Item,Moving Average,Moving Average
 DocType: BOM Replace Tool,The BOM which will be replaced,BOM koji će biti zamijenjen
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +43,New Stock UOM must be different from current stock UOM,Novi Stock UOM mora biti različita od trenutne zalihe UOM
 DocType: Account,Debit,Zaduženje
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +34,Leaves must be allocated in multiples of 0.5,"Listovi moraju biti dodijeljeno u COMBI 0,5"
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +44,Leaves must be allocated in multiples of 0.5,"Listovi moraju biti dodijeljeno u COMBI 0,5"
 DocType: Production Order,Operation Cost,Operacija Cost
 apps/erpnext/erpnext/config/hr.py +71,Upload attendance from a .csv file,Prenesi dolazak iz. Csv datoteku
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,Izvanredna Amt
@@ -3205,8 +3073,7 @@
 DocType: Employee,Internal Work History,Interni History Work
 DocType: DocField,Column Break,Kolona Break
 DocType: Event,Thursday,Četvrtak
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +42,Private Equity,Private Equity
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +93,Turning,Skretanje
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,Private Equity
 DocType: Maintenance Visit,Customer Feedback,Kupac Ocjena
 DocType: Account,Expense,rashod
 DocType: Sales Invoice,Exhibition,Izložba
@@ -3219,19 +3086,19 @@
 DocType: Employee,Held On,Održanoj
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +33,Production Item,Proizvodnja Item
 ,Employee Information,Zaposlenik informacije
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,Rate (%),Stopa ( % )
+apps/erpnext/erpnext/public/js/setup_wizard.js +294,Rate (%),Stopa ( % )
 DocType: Stock Entry Detail,Additional Cost,Dodatni trošak
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +407,Financial Year End Date,Financijska godina End Date
+apps/erpnext/erpnext/public/js/setup_wizard.js +155,Financial Year End Date,Financijska godina End Date
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Voucher No, if grouped by Voucher","Ne možete filtrirati na temelju vaučer No , ako grupirani po vaučer"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +484,Make Supplier Quotation,Provjerite Supplier kotaciji
 DocType: Quality Inspection,Incoming,Dolazni
 DocType: BOM,Materials Required (Exploded),Materijali Obavezno (eksplodirala)
 DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),Smanjenje plaća za ostaviti bez plaće (lwp)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +512,"Add users to your organization, other than yourself","Dodaj korisnika u vašoj organizaciji, osim sebe"
+apps/erpnext/erpnext/public/js/setup_wizard.js +256,"Add users to your organization, other than yourself","Dodaj korisnika u vašoj organizaciji, osim sebe"
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No {1} does not match with {2} {3},Row # {0}: {1} Serial No ne odgovara {2} {3}
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +44,Casual Leave,Casual dopust
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +44,Casual Leave,Casual dopust
 DocType: Batch,Batch ID,ID serije
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +334,Note: {0},Napomena : {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +336,Note: {0},Napomena : {0}
 ,Delivery Note Trends,Trendovi otpremnica
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +104,This Week's Summary,Ovonedeljnom Pregled
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +74,{0} must be a Purchased or Sub-Contracted Item in row {1},{0} mora bitikupljen ili pod-ugovori stavka u nizu {1}
@@ -3243,7 +3110,7 @@
 DocType: Purchase Receipt,Return Against Purchase Receipt,Vratiti protiv Kupovina prijem
 DocType: Purchase Order,To Bill,To Bill
 DocType: Material Request,% Ordered,% Sređene
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +61,Piecework,rad plaćen na akord
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Piecework,rad plaćen na akord
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +64,Avg. Buying Rate,Prosj. Buying Rate
 DocType: Task,Actual Time (in Hours),Stvarno vrijeme (u satima)
 DocType: Employee,History In Company,Povijest tvrtke
@@ -3260,13 +3127,13 @@
 DocType: Opportunity,To Discuss,Za Raspravljajte
 DocType: SMS Settings,SMS Settings,Podešavanja SMS-a
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +60,Temporary Accounts,Privremeni računi
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +155,Black,Crn
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Black,Crn
 DocType: BOM Explosion Item,BOM Explosion Item,BOM eksplozije artikla
 DocType: Account,Auditor,Revizor
 DocType: Purchase Order,End date of current order's period,Datum završetka perioda trenutne Reda
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +17,Make Offer Letter,Make Ponuda Pismo
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +10,Return,Povratak
-apps/erpnext/erpnext/stock/doctype/item/item.py +503,Default Unit of Measure for Variant must be same as Template,Uobičajeno mjerna jedinica za varijantu mora biti isti kao predložak
+apps/erpnext/erpnext/stock/doctype/item/item.py +507,Default Unit of Measure for Variant must be same as Template,Uobičajeno mjerna jedinica za varijantu mora biti isti kao predložak
 DocType: DocField,Fold,Saviti
 DocType: Production Order Operation,Production Order Operation,Proizvodnja Order Operation
 DocType: Pricing Rule,Disable,Ugasiti
@@ -3277,13 +3144,12 @@
 DocType: Page,Page Name,Ime stranice
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +110,To Time must be greater than From Time,Vrijeme da mora biti veći od s vremena
 DocType: Journal Entry Account,Exchange Rate,Tečaj
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +465,Sales Order {0} is not submitted,Prodajnog naloga {0} nije podnesen
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +467,Sales Order {0} is not submitted,Prodajnog naloga {0} nije podnesen
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0}: Parent account {1} does not bolong to the company {2},Skladište {0}: Parent račun {1} ne Bolong tvrtki {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +124,Spindle finishing,Vretena Završeno
 DocType: BOM,Last Purchase Rate,Zadnja kupovna cijena
 DocType: Account,Asset,Asset
 DocType: Project Task,Task ID,Zadatak ID
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +395,"e.g. ""MC""","na primjer ""MC"""
+apps/erpnext/erpnext/public/js/setup_wizard.js +143,"e.g. ""MC""","na primjer ""MC"""
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,Stock cannot exist for Item {0} since has variants,Stock ne može postojati za Stavka {0} od ima varijante
 ,Sales Person-wise Transaction Summary,Prodaja Osobne mudar Transakcija Sažetak
 DocType: System Settings,Time Zone,Time Zone
@@ -3292,9 +3158,7 @@
 DocType: Monthly Distribution,Monthly Distribution Percentages,Mjesečni Distribucija Procenat
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +16,The selected item cannot have Batch,Izabrana stavka ne može imati Batch
 DocType: Delivery Note,% of materials delivered against this Delivery Note,% Materijala dostavljenih protiv ove otpremnici
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +151,Stapling,Strojna
 DocType: Customer,Customer Details,Korisnički podaci
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +105,Shaping,Oblikovanje
 DocType: Employee,Reports to,Izvješća
 DocType: SMS Settings,Enter url parameter for receiver nos,Unesite URL parametar za prijemnike br
 DocType: Sales Invoice,Paid Amount,Plaćeni iznos
@@ -3303,13 +3167,13 @@
 DocType: Item Variant,Item Variant,Stavka Variant
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +15,Setting this Address Template as default as there is no other default,"Postavljanje Ova adresa predloška kao zadano, jer nema drugog zadano"
 apps/erpnext/erpnext/accounts/doctype/account/account.py +89,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Stanje računa već u zaduženje, ne smiju postaviti 'ravnoteža se mora' kao 'kreditne'"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +76,Quality Management,upravljanja kvalitetom
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Quality Management,upravljanja kvalitetom
 DocType: Production Planning Tool,Filter based on customer,Filter temelji se na kupca
 DocType: Payment Tool Detail,Against Voucher No,Protiv vaučera Nema
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +47,Please enter quantity for Item {0},Molimo unesite količinu za točku {0}
 DocType: Employee External Work History,Employee External Work History,Zaposlenik Vanjski Rad Povijest
 DocType: Tax Rule,Purchase,Kupiti
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +34,Balance Qty,Bilans kol
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Balance Qty,Bilans kol
 DocType: Item Group,Parent Item Group,Roditelj artikla Grupa
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +21,{0} for {1},{0} {1} za
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +96,Cost Centers,Troška
@@ -3319,12 +3183,12 @@
 DocType: Opportunity,Next Contact,Sljedeći Kontakt
 DocType: Employee,Employment Type,Zapošljavanje Tip
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,Dugotrajna imovina
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +84,Application period cannot be across two alocation records,Period aplikacija ne može biti na dva alocation Records
 DocType: Item Group,Default Expense Account,Zadani račun rashoda
 DocType: Employee,Notice (days),Obavijest (dani )
 DocType: Page,Yes,Da
 DocType: Tax Rule,Sales Tax Template,Porez na promet Template
 DocType: Employee,Encashment Date,Encashment Datum
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +74,Electroforming,Galvanizacije
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +179,"Against Voucher Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Protiv vaučera Tip mora biti jedan od narudžbenice, fakturi ili Journal Entry"
 DocType: Account,Stock Adjustment,Stock Podešavanje
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +34,Default Activity Cost exists for Activity Type - {0},Uobičajeno aktivnosti Troškovi postoji aktivnost Tip - {0}
@@ -3360,12 +3224,12 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,"Skladište se ne može izbrisati , kao entry stock knjiga postoji za to skladište ."
 DocType: Company,Distribution,Distribucija
 apps/erpnext/erpnext/public/js/pos/pos.html +36,Amount Paid,Plaćeni iznos
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +91,Project Manager,Voditelj projekta
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +72,Dispatch,Otpremanje
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Project Manager,Voditelj projekta
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +72,Dispatch,Otpremanje
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,Maksimalni popust dopušteno za predmet: {0} je {1}%
 DocType: Customer,Default Taxes and Charges,Uobičajeno Porezi i naknadama
 DocType: Account,Receivable,potraživanja
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +268,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,Row # {0}: Nije dozvoljeno da se promijeniti dobavljača kao narudžbenicu već postoji
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +263,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,Row # {0}: Nije dozvoljeno da se promijeniti dobavljača kao narudžbenicu već postoji
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,Uloga koja je dopušteno podnijeti transakcije koje premašuju kreditnih ograničenja postavljena.
 DocType: Sales Invoice,Supplier Reference,Dobavljač Referenca
 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.","Ako je označeno, BOM za pod-zbor stavke će biti uzeti u obzir za dobivanje sirovine. Inače, sve pod-montaža stavke će biti tretirani kao sirovinu."
@@ -3373,8 +3237,8 @@
 DocType: Hub Settings,Seller Description,Prodavač Opis
 DocType: Employee Education,Qualification,Kvalifikacija
 DocType: Item Price,Item Price,Cijena artikla
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +48,Soap & Detergent,Sapun i deterdžent
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +36,Motion Picture & Video,Motion Picture & Video
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +48,Soap & Detergent,Sapun i deterdžent
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +36,Motion Picture & Video,Motion Picture & Video
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Naručeno
 DocType: Warehouse,Warehouse Name,Naziv skladišta
 DocType: Naming Series,Select Transaction,Odaberite transakciju
@@ -3383,7 +3247,6 @@
 DocType: BOM,Rate Of Materials Based On,Stopa materijali na temelju
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,Analitike podrške
 apps/erpnext/erpnext/accounts/doctype/accounts_settings/accounts_settings.py +27,Company is missing in warehouses {0},Tvrtka je nestalo u skladištima {0}
-DocType: Stock UOM Replace Utility,Stock UOM Replace Utility,Kataloški UOM Zamjena Utility
 DocType: POS Profile,Terms and Conditions,Odredbe i uvjeti
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,To Date should be within the Fiscal Year. Assuming To Date = {0},Za datum mora biti unutar fiskalne godine. Pod pretpostavkom da bi datum = {0}
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","Ovdje možete održavati visina, težina, alergije, medicinske brige itd."
@@ -3395,7 +3258,7 @@
 DocType: Sales Order Item,For Production,Za proizvodnju
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +103,Please enter sales order in the above table,Unesite prodajnog naloga u gornjoj tablici
 DocType: Project Task,View Task,Pogledaj Task
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +406,Your financial year begins on,Vaša financijska godina počinje
+apps/erpnext/erpnext/public/js/setup_wizard.js +154,Your financial year begins on,Vaša financijska godina počinje
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +46,Please enter Purchase Receipts,Unesite Kupovina Primici
 DocType: Sales Invoice,Get Advances Received,Kreiraj avansno primanje
 DocType: Email Digest,Add/Remove Recipients,Dodaj / ukloni primaoce
@@ -3403,16 +3266,14 @@
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","Za postavljanje ove fiskalne godine kao zadano , kliknite na "" Set as Default '"
 apps/erpnext/erpnext/config/support.py +54,Setup incoming server for support email id. (e.g. support@example.com),Postavljanje dolazni poslužitelj za podršku e-mail ID . ( npr. support@example.com )
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,Nedostatak Qty
-apps/erpnext/erpnext/stock/doctype/item/item.py +528,Item variant {0} exists with same attributes,Stavka varijanta {0} postoji sa istim atributima
+apps/erpnext/erpnext/stock/doctype/item/item.py +532,Item variant {0} exists with same attributes,Stavka varijanta {0} postoji sa istim atributima
 DocType: Salary Slip,Salary Slip,Plaća proklizavanja
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +116,Burnishing,Satiniranje
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +54,'To Date' is required,' To Date ' je potrebno
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,' To Date ' je potrebno
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","Generirajte pakovanje Slips za pakete dostaviti. Koristi se za obavijesti paket broja, sadržaj paket i njegove težine."
 DocType: Sales Invoice Item,Sales Order Item,Stavka narudžbe kupca
 DocType: Salary Slip,Payment Days,Plaćanja Dana
 DocType: BOM,Manage cost of operations,Upravljanje troškove poslovanja
 DocType: Features Setup,Item Advanced,Artikal - napredna
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +40,Hot rolling,Vruće valjanje
 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.","Kada bilo koji od provjerenih transakcija &quot;Postavio&quot;, e-mail pop-up automatski otvorio poslati e-mail na povezane &quot;Kontakt&quot; u toj transakciji, s transakcijom u privitku. Korisnik može ili ne može poslati e-mail."
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,Globalne postavke
 DocType: Employee Education,Employee Education,Zaposlenik Obrazovanje
@@ -3425,25 +3286,23 @@
 DocType: Customer,Sales Team Details,Prodaja Team Detalji
 DocType: Expense Claim,Total Claimed Amount,Ukupno Zatražio Iznos
 apps/erpnext/erpnext/config/crm.py +22,Potential opportunities for selling.,Potencijalni mogućnosti za prodaju.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +48,Sick Leave,Bolovanje
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +174,Invalid {0},Invalid {0}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +48,Sick Leave,Bolovanje
 DocType: Email Digest,Email Digest,E-pošta
 DocType: Delivery Note,Billing Address Name,Naziv adrese za naplatu
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +22,Department Stores,Robne kuće
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,Robne kuće
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +40,System Balance,System Balance
 DocType: Workflow,Is Active,Je aktivan
 apps/erpnext/erpnext/controllers/stock_controller.py +71,No accounting entries for the following warehouses,Nema računovodstvene unosi za sljedeće skladišta
 apps/erpnext/erpnext/projects/doctype/project/project.js +22,Save the document first.,Spremite dokument prvi.
 DocType: Account,Chargeable,Naplativ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +121,Linishing,Linishing
 DocType: Company,Change Abbreviation,Promijeni Skraćenica
 DocType: Workflow State,Primary,Osnovni
 DocType: Expense Claim Detail,Expense Date,Rashodi Datum
 DocType: Item,Max Discount (%),Max rabat (%)
 DocType: Communication,More Information,Više informacija
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +70,Last Order Amount,Last Order Iznos
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +161,Blasting,Miniranja
 DocType: Company,Warn,Upozoriti
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +111,Item valuation updated,Vrednovanje artikla je izmijenjeno
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Bilo koji drugi primjedbe, napomenuti napor koji treba da ide u evidenciji."
 DocType: BOM,Manufacturing User,Proizvodnja korisnika
 DocType: Purchase Order,Raw Materials Supplied,Sirovine nabavlja
@@ -3453,7 +3312,7 @@
 DocType: Appraisal,Appraisal Template,Procjena Predložak
 DocType: Communication,Email,E-mail
 DocType: Item Group,Item Classification,Stavka Klasifikacija
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +89,Business Development Manager,Business Development Manager
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Business Development Manager,Business Development Manager
 DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,Održavanje Posjetite Namjena
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.js +15,Period,Period
 ,General Ledger,Glavna knjiga
@@ -3463,9 +3322,7 @@
 ,Itemwise Recommended Reorder Level,Itemwise Preporučio redoslijeda Level
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +264,Please select {0} first,Odaberite {0} Prvi
 DocType: Features Setup,To get Item Group in details table,Da biste dobili predmeta Group u tablici pojedinosti
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +67,Redrawing,Prekrajanje
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +112,Batch {0} of Item {1} has expired.,Batch {0} od {1} Stavka je istekla.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +120,Etching,Gravura
 DocType: Sales Invoice,Commission,Provizija
 DocType: Address Template,"<h4>Default Template</h4>
 <p>Uses <a href=""http://jinja.pocoo.org/docs/templates/"">Jinja Templating</a> and all the fields of Address (including Custom Fields if any) will be available</p>
@@ -3510,7 +3367,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +340,Operation Time must be greater than 0 for Operation {0},Vrijeme rada mora biti veći od 0 za rad {0}
 DocType: Supplier,Address and Contacts,Adresa i kontakti
 DocType: UOM Conversion Detail,UOM Conversion Detail,UOM pretvorbe Detalj
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +496,Keep it web friendly 900px (w) by 100px (h),Držite ga prijateljski web 900px ( w ) by 100px ( h )
+apps/erpnext/erpnext/public/js/setup_wizard.js +242,Keep it web friendly 900px (w) by 100px (h),Držite ga prijateljski web 900px ( w ) by 100px ( h )
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +329,Production Order cannot be raised against a Item Template,Proizvodnja Nalog ne može biti podignuta protiv Item Template
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +44,Charges are updated in Purchase Receipt against each item,Naknade se ažuriraju u Kupovina Prijem protiv svaku stavku
 DocType: Payment Tool,Get Outstanding Vouchers,Get Outstanding Vaučeri
@@ -3526,54 +3383,49 @@
 DocType: Item,Average time taken by the supplier to deliver,Prosječno vrijeme koje je dobavljač isporuči
 DocType: Time Log,Hours,Sati
 DocType: Project,Expected Start Date,Očekivani datum početka
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +38,Rolling,Rolling
 DocType: ToDo,Priority,Prioritet
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +41,Remove item if charges is not applicable to that item,Uklonite stavku ako naknada nije primjenjiv na tu stavku
 DocType: Dropbox Backup,Dropbox Access Allowed,Dozvoljen pristup Dropboxu
 DocType: Dropbox Backup,Weekly,Tjedni
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,Npr.. smsgateway.com / api / send_sms.cgi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +485,Receive,Primiti
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +510,Receive,Primiti
 DocType: Maintenance Visit,Fully Completed,Potpuno Završeni
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% Complete
 DocType: Employee,Educational Qualification,Obrazovne kvalifikacije
 DocType: Workstation,Operating Costs,Operativni troškovi
 DocType: Employee Leave Approver,Employee Leave Approver,Zaposlenik dopust Odobritelj
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,{0} has been successfully added to our Newsletter list.,{0} je uspješno dodan u newsletter listu.
-apps/erpnext/erpnext/stock/doctype/item/item.py +383,Row {0}: An Reorder entry already exists for this warehouse {1},Row {0}: Unos Ponovno red već postoji za to skladište {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +387,Row {0}: An Reorder entry already exists for this warehouse {1},Row {0}: Unos Ponovno red već postoji za to skladište {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +67,"Cannot declare as lost, because Quotation has been made.","Ne može proglasiti izgubili , jer citat je napravio ."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +133,Electron beam machining,Electron obradni zrak
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Kupovina Master Manager
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +424,Production Order {0} must be submitted,Proizvodnja Red {0} mora biti podnesen
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +150,Please select Start Date and End Date for Item {0},Molimo odaberite datum početka i datum završetka za točke {0}
 apps/erpnext/erpnext/config/stock.py +141,Main Reports,Glavni izvještaji
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +102,Stock Ledger entries balances updated,Stock unose u knjigu salda ažurirane
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,Do danas ne može biti prije od datuma
 DocType: Purchase Receipt Item,Prevdoc DocType,Prevdoc DOCTYPE
-apps/erpnext/erpnext/stock/doctype/item/item.js +176,Add / Edit Prices,Dodaj / Uredi cijene
+apps/erpnext/erpnext/stock/doctype/item/item.js +178,Add / Edit Prices,Dodaj / Uredi cijene
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +53,Chart of Cost Centers,Grafikon troškovnih centara
 ,Requested Items To Be Ordered,Traženi Proizvodi se mogu naručiti
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +298,My Orders,Moje narudžbe
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +293,My Orders,Moje narudžbe
 DocType: Price List,Price List Name,Cjenik Ime
 DocType: Time Log,For Manufacturing,Za proizvodnju
-apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +70,Totals,Ukupan rezultat
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +174,Totals,Ukupan rezultat
 DocType: BOM,Manufacturing,Proizvodnja
 ,Ordered Items To Be Delivered,Naručeni proizvodi za dostavu
 DocType: Account,Income,Prihod
 ,Setup Wizard,Čarobnjak za postavljanje
 DocType: Industry Type,Industry Type,Industrija Tip
 apps/erpnext/erpnext/templates/includes/cart.js +137,Something went wrong!,Nešto nije bilo u redu!
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +68,Warning: Leave application contains following block dates,Upozorenje: Ostavite program sadrži sljedeće blok datume
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +251,Sales Invoice {0} has already been submitted,Prodajni računi {0} su već potvrđeni
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +100,Warning: Leave application contains following block dates,Upozorenje: Ostavite program sadrži sljedeće blok datume
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +256,Sales Invoice {0} has already been submitted,Prodajni računi {0} su već potvrđeni
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,Završetak Datum
 DocType: Purchase Invoice Item,Amount (Company Currency),Iznos (valuta preduzeća)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +10,Die casting,Die casting
 DocType: Email Alert,Reference Date,Referentni datum
 apps/erpnext/erpnext/config/hr.py +105,Organization unit (department) master.,Organizacija jedinica ( odjela ) majstor .
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +25,Please enter valid mobile nos,Unesite valjane mobilne br
 DocType: Budget Detail,Budget Detail,Proračun Detalj
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +75,Please enter message before sending,Unesite poruku prije slanja
 DocType: Async Task,Status,Status
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +65,Stock UOM updated for Item {0},Stock UOM ažurirati za Stavka {0}
 DocType: Company History,Year,Godina
 apps/erpnext/erpnext/config/accounts.py +127,Point-of-Sale Profile,Point-of-prodaju profil
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +68,Please Update SMS Settings,Obnovite SMS Settings
@@ -3587,12 +3439,12 @@
 ,Serial No Service Contract Expiry,Serijski Bez isteka Ugovor o pružanju usluga
 DocType: Item,Unit of Measure Conversion,Jedinica mjere pretvorbe
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +86,Employee can not be changed,Zaposleni se ne može mijenjati
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +259,You cannot credit and debit same account at the same time,Ne možete kreditnim i debitnim isti račun u isto vrijeme
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,You cannot credit and debit same account at the same time,Ne možete kreditnim i debitnim isti račun u isto vrijeme
 DocType: Naming Series,Help HTML,HTML pomoć
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},Ukupno bi trebalo biti dodijeljena weightage 100 % . To je {0}
 apps/erpnext/erpnext/controllers/status_updater.py +140,Allowance for over-{0} crossed for Item {1},Dodatak za prekomjerno {0} prešao za točku {1}
 DocType: Address,Name of person or organization that this address belongs to.,Ime osobe ili organizacije kojoj ova adresa pripada.
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +587,Your Suppliers,Vaši dobavljači
+apps/erpnext/erpnext/public/js/setup_wizard.js +325,Your Suppliers,Vaši dobavljači
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,Ne mogu se postaviti kao izgubljen kao prodajnog naloga je napravio .
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +65,Another Salary Structure {0} is active for employee {1}. Please make its status 'Inactive' to proceed.,Drugi strukture plata {0} je aktivna zaposlenika {1}. Molimo vas da svoj status 'Inactive' za nastavak.
 DocType: Purchase Invoice,Contact,Kontakt
@@ -3602,35 +3454,33 @@
 DocType: Employee,Date of Issue,Datum izdavanja
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +16,{0}: From {0} for {1},{0}: Od {0} {1} za
 DocType: Issue,Content Type,Vrsta sadržaja
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +17,Computer,Računar
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,Računar
 DocType: Item,List this Item in multiple groups on the website.,Popis ovaj predmet u više grupa na web stranici.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +283,Please check Multi Currency option to allow accounts with other currency,Molimo provjerite Multi opciju valuta kako bi se omogućilo račune sa drugoj valuti
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +285,Please check Multi Currency option to allow accounts with other currency,Molimo provjerite Multi opciju valuta kako bi se omogućilo račune sa drugoj valuti
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +62,Item: {0} does not exist in the system,Detaljnije: {0} ne postoji u sustavu
 apps/erpnext/erpnext/accounts/doctype/account/account.py +81,You are not authorized to set Frozen value,Niste ovlašteni za postavljanje Frozen vrijednost
 DocType: Payment Reconciliation,Get Unreconciled Entries,Kreiraj neusklađene ulaze
 DocType: Cost Center,Budgets,Budžeti
 apps/frappe/frappe/core/page/modules_setup/modules_setup.py +11,Updated,Obnovljeno
 DocType: Employee,Emergency Contact Details,Hitna Kontaktni podaci
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +396,What does it do?,Što učiniti ?
+apps/erpnext/erpnext/public/js/setup_wizard.js +144,What does it do?,Što učiniti ?
 DocType: Delivery Note,To Warehouse,Za skladište
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +45,Account {0} has been entered more than once for fiscal year {1},Konto {0} je upisan više od jednom za fiskalnu godinu {1}
 ,Average Commission Rate,Prosječna stopa komisija
-apps/erpnext/erpnext/stock/doctype/item/item.py +313,'Has Serial No' can not be 'Yes' for non-stock item,' Je rednim brojem ' ne može biti ' Da ' za ne - stock stavke
+apps/erpnext/erpnext/stock/doctype/item/item.py +317,'Has Serial No' can not be 'Yes' for non-stock item,' Je rednim brojem ' ne može biti ' Da ' za ne - stock stavke
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Attendance can not be marked for future dates,Gledatelji ne može biti označena za budući datum
 DocType: Pricing Rule,Pricing Rule Help,Cijene Pravilo Pomoć
 DocType: Purchase Taxes and Charges,Account Head,Zaglavlje konta
 apps/erpnext/erpnext/config/stock.py +79,Update additional costs to calculate landed cost of items,Update dodatne troškove za izračun troškova spustio stavki
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +111,Electrical,Električna
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +111,Electrical,Električna
 DocType: Stock Entry,Total Value Difference (Out - In),Ukupna vrijednost Razlika (Out - In)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +302,Row {0}: Exchange Rate is mandatory,Red {0}: kursa obavezna
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +304,Row {0}: Exchange Rate is mandatory,Red {0}: kursa obavezna
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},Korisnik ID nije postavljen za zaposlenika {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +72,Peening,Utiskivanje
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,From Warranty Claim,Od garantnom roku
 DocType: Stock Entry,Default Source Warehouse,Zadano izvorno skladište
 DocType: Item,Customer Code,Kupac Šifra
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +212,Birthday Reminder for {0},Rođendan Podsjetnik za {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +163,Lapping,Zapljuskuje
-apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.js +8,Days Since Last Order,Dana od posljednje narudžbe
+apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +72,Days Since Last Order,Dana od posljednje narudžbe
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +299,Debit To account must be a Balance Sheet account,Zaduženja na račun mora biti bilans stanja računa
 DocType: Buying Settings,Naming Series,Imenovanje serije
 DocType: Leave Block List,Leave Block List Name,Ostavite popis imena Block
@@ -3644,7 +3494,7 @@
 DocType: Notification Control,Sales Invoice Message,Poruka prodajnog  računa
 DocType: Authorization Rule,Based On,Na osnovu
 DocType: Sales Order Item,Ordered Qty,Naručena kol
-apps/erpnext/erpnext/stock/doctype/item/item.py +539,Item {0} is disabled,Stavka {0} je onemogućeno
+apps/erpnext/erpnext/stock/doctype/item/item.py +543,Item {0} is disabled,Stavka {0} je onemogućeno
 DocType: Stock Settings,Stock Frozen Upto,Kataloški Frozen Upto
 apps/erpnext/erpnext/controllers/recurring_document.py +166,Period From and Period To dates mandatory for recurring {0},Period od perioda i datumima obavezno ponavljaju {0}
 apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,Projekt aktivnost / zadatak.
@@ -3654,7 +3504,6 @@
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,Rabatt mora biti manji od 100
 DocType: ToDo,Low,Nisko
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Otpis Iznos (poduzeća Valuta)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +71,Spinning,Predenje
 DocType: Landed Cost Voucher,Landed Cost Voucher,Sleteo Cost vaučera
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +55,Please set {0},Molimo postavite {0}
 DocType: Purchase Invoice,Repeat on Day of Month,Ponovite na dan u mjesecu
@@ -3676,7 +3525,6 @@
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +37,Campaign Name is required,Potreban je naziv kampanje
 DocType: Maintenance Visit,Maintenance Date,Održavanje Datum
 DocType: Purchase Receipt Item,Rejected Serial No,Odbijen Serijski br
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +51,Deep drawing,Duboko uzdisanje
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +40,New Newsletter,New Newsletter
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +157,Start date should be less than end date for Item {0},Početak bi trebao biti manji od krajnjeg datuma za točke {0}
 apps/erpnext/erpnext/stock/doctype/item/item.js +17,Show Balance,Show Balance
@@ -3687,7 +3535,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +119,BOM and Manufacturing Quantity are required,BOM i proizvodnja Količina su potrebne
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Starenje Range 2
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +450,Amount,Iznos
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +147,Riveting,Zakivanje
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,BOM zamijenjeno
 ,Sales Analytics,Prodajna analitika
 DocType: Manufacturing Settings,Manufacturing Settings,Proizvodnja Settings
@@ -3699,20 +3546,19 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +207,New Account Name,Naziv novog računa
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,Sirovine Isporuka Troškovi
 DocType: Selling Settings,Settings for Selling Module,Postavke za prodaju modul
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +73,Customer Service,Služba za korisnike
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Customer Service,Služba za korisnike
 DocType: Item,Thumbnail,Thumbnail
 DocType: Item Customer Detail,Item Customer Detail,Artikal - detalji kupca
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +147,Confirm Your Email,Potvrdi Vaš e-mail
 apps/erpnext/erpnext/config/hr.py +53,Offer candidate a Job.,Ponuda kandidata posao.
 DocType: Notification Control,Prompt for Email on Submission of,Pitaj za e-poštu na podnošenje
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +81,Total allocated leaves are more than days in the period,Ukupno izdvojene Listovi su više od nekoliko dana u razdoblju
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +70,Item {0} must be a stock Item,Stavka {0} mora bitistock Stavka
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,Uobičajeno Work in Progress Skladište
 apps/erpnext/erpnext/config/accounts.py +107,Default settings for accounting transactions.,Zadane postavke za računovodstvene poslove.
 apps/frappe/frappe/model/naming.py +40,{0} is required,{0} je potrebno
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +21,Vacuum molding,Vakuum lajsne
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,Očekivani datum ne može biti prije Materijal Zahtjev Datum
 DocType: Contact Us Settings,City,Grad
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +132,Ultrasonic machining,Ultrazvučno mašinsku obradu
 apps/frappe/frappe/templates/base.html +137,Error: Not a valid id?,Greška: Ne važeći id?
 apps/erpnext/erpnext/stock/get_item_details.py +125,Item {0} must be a Sales Item,Stavka {0} mora bitiProdaja artikla
 DocType: Naming Series,Update Series Number,Update serije Broj
@@ -3720,7 +3566,7 @@
 DocType: Sales Order,Printing Details,Printing Detalji
 DocType: Task,Closing Date,Datum zatvaranja
 DocType: Sales Order Item,Produced Quantity,Proizvedena količina
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +84,Engineer,inženjer
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Engineer,inženjer
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,Traži Sub skupština
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +379,Item Code required at Row No {0},Kod artikla je potreban u redu broj {0}
 DocType: Sales Partner,Partner Type,Partner Tip
@@ -3728,7 +3574,7 @@
 DocType: Authorization Rule,Customerwise Discount,Customerwise Popust
 DocType: Purchase Invoice,Against Expense Account,Protiv Rashodi račun
 DocType: Production Order,Production Order,Proizvodnja Red
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +258,Installation Note {0} has already been submitted,Napomena instalacije {0} je već potvrđena
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +263,Installation Note {0} has already been submitted,Napomena instalacije {0} je već potvrđena
 DocType: Quotation Item,Against Docname,Protiv Docname
 DocType: SMS Center,All Employee (Active),Svi zaposleni (aktivni)
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,Pregled Sada
@@ -3737,19 +3583,19 @@
 DocType: Item,Re-Order Level,Re-order Level
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,Unesite stavke i planirani Količina za koje želite povećati proizvodne naloge ili preuzimanje sirovine za analizu.
 apps/frappe/frappe/public/js/frappe/views/ganttview.js +45,Gantt Chart,Gantogram
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +57,Part-time,Part - time
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,Part-time,Part - time
 DocType: Employee,Applicable Holiday List,Primjenjivo odmor Popis
 DocType: Employee,Cheque,Ček
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,Serija Updated
 apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Report Type is mandatory,Vrsta izvješća je obvezno
 DocType: Item,Serial Number Series,Serijski broj serije
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},Skladište je obvezno za skladišne proizvode {0} u redu {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +45,Retail & Wholesale,Trgovina na veliko i
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,Trgovina na veliko i
 DocType: Issue,First Responded On,Prvo Odgovorili Na
 DocType: Website Item Group,Cross Listing of Item in multiple groups,Cross Oglas tačke u više grupa
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +351,The First User: You,Prvo Korisnik : Vi
+apps/erpnext/erpnext/public/js/setup_wizard.js +101,The First User: You,Prvo Korisnik : Vi
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +48,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},Fiskalna godina Datum početka i datum završetka fiskalne godine već su postavljeni u fiskalnoj godini {0}
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +172,Successfully Reconciled,Uspješno Pomirio
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +119,Successfully Reconciled,Uspješno Pomirio
 DocType: Production Order,Planned End Date,Planirani Završni datum
 apps/erpnext/erpnext/config/stock.py +43,Where items are stored.,Gdje predmeti su pohranjeni.
 DocType: Tax Rule,Validity,Punovažnost
@@ -3769,39 +3615,36 @@
 DocType: DocPerm,Level,Nivo
 DocType: Purchase Taxes and Charges,On Net Total,Na Net Total
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +160,Target warehouse in row {0} must be same as Production Order,Target skladište u redu {0} mora biti ista kao Production Order
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +59,No permission to use Payment Tool,No dozvolu za korištenje alat za plaćanje
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +97,No permission to use Payment Tool,No dozvolu za korištenje alat za plaćanje
 apps/erpnext/erpnext/controllers/recurring_document.py +192,'Notification Email Addresses' not specified for recurring %s,'Obavijest E-mail adrese' nije specificirano ponavljaju% s
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +86,Milling,Glodanje
 apps/erpnext/erpnext/accounts/doctype/account/account.py +99,Currency can not be changed after making entries using some other currency,Valuta ne mogu se mijenjati nakon što unose preko neke druge valute
 DocType: Company,Round Off Account,Zaokružiti račun
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +60,Nibbling,Gricka
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,Administrativni troškovi
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +18,Consulting,savjetodavni
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +18,Consulting,savjetodavni
 DocType: Customer Group,Parent Customer Group,Roditelj Kupac Grupa
 apps/erpnext/erpnext/public/js/pos/pos.js +429,Change,Promjena
 DocType: Purchase Invoice,Contact Email,Kontakt email
 DocType: Appraisal Goal,Score Earned,Ocjena Zarađeni
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +393,"e.g. ""My Company LLC""","na primjer ""Moja tvrtka LLC"""
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +173,Notice Period,Otkazni rok
+apps/erpnext/erpnext/public/js/setup_wizard.js +141,"e.g. ""My Company LLC""","na primjer ""Moja tvrtka LLC"""
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +173,Notice Period,Otkazni rok
 DocType: Bank Reconciliation Detail,Voucher ID,Bon ID
 apps/erpnext/erpnext/setup/doctype/territory/territory.js +14,This is a root territory and cannot be edited.,To jekorijen teritorij i ne može se mijenjati .
 DocType: Packing Slip,Gross Weight UOM,Bruto težina UOM
 DocType: Email Digest,Receivables / Payables,Potraživanja / obveze
 DocType: Delivery Note Item,Against Sales Invoice,Protiv prodaje fakture
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +63,Stamping,Žigosanje
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +457,Credit Account,Kreditni račun
 DocType: Landed Cost Item,Landed Cost Item,Sletio Troškovi artikla
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +56,Show zero values,Pokazati nultu vrijednosti
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,Količina predmeta dobije nakon proizvodnju / pakiranje od navedenih količina sirovina
 DocType: Payment Reconciliation,Receivable / Payable Account,Potraživanja / Account plaćaju
 DocType: Delivery Note Item,Against Sales Order Item,Protiv naloga prodaje Item
-apps/erpnext/erpnext/stock/doctype/item/item.py +521,Please specify Attribute Value for attribute {0},Molimo navedite vrijednost atributa za atribut {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +525,Please specify Attribute Value for attribute {0},Molimo navedite vrijednost atributa za atribut {0}
 DocType: Item,Default Warehouse,Glavno skladište
 DocType: Task,Actual End Date (via Time Logs),Stvarni Završni datum (via vrijeme Dnevnici)
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +37,Budget cannot be assigned against Group Account {0},Budžet se ne može dodijeliti protiv grupe računa {0}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +23,Please enter parent cost center,Unesite roditelj troška
 DocType: Delivery Note,Print Without Amount,Ispis Bez visini
-apps/erpnext/erpnext/controllers/buying_controller.py +69,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,Porezna Kategorija ne može biti ' Procjena ' ili ' Procjena i Total ' kao i svi proizvodi bez zaliha predmeta
+apps/erpnext/erpnext/controllers/buying_controller.py +60,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,Porezna Kategorija ne može biti ' Procjena ' ili ' Procjena i Total ' kao i svi proizvodi bez zaliha predmeta
 DocType: User,Last Name,Prezime
 DocType: Web Page,Left,Lijevo
 DocType: Event,All Day,Cijeli dan
@@ -3809,7 +3652,7 @@
 DocType: Appraisal,Total Score (Out of 5),Ukupna ocjena (od 5)
 DocType: Contact Us Settings,State,Država
 DocType: Batch,Batch,Serija
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +51,Balance,Ravnoteža
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +28,Balance,Ravnoteža
 DocType: Project,Total Expense Claim (via Expense Claims),Ukupni rashodi potraživanja (preko rashodi potraživanja)
 DocType: User,Gender,Rod
 DocType: Journal Entry,Debit Note,Rashodi - napomena
@@ -3839,8 +3682,7 @@
 DocType: Purchase Order,Get Last Purchase Rate,Kreiraj zadnju nabavnu cijenu
 DocType: Time Log,Billing Rate based on Activity Type (per hour),Billing brzine na osnovu aktivnosti Tip (po satu)
 DocType: Company,Company Info,Podaci o preduzeću
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +76,Seaming,Seaming
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +197,"Company Email ID not found, hence mail not sent","E-mail nije poslan, preduzeće nema definisan e-mail"
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +206,"Company Email ID not found, hence mail not sent","E-mail nije poslan, preduzeće nema definisan e-mail"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Primjena sredstava ( aktiva )
 DocType: Production Planning Tool,Filter based on item,Filtrirati na temelju točki
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +451,Debit Account,Zaduži račun
@@ -3852,17 +3694,16 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +95,{0} {1} has been modified. Please refresh.,{0} {1} je izmijenjen . Osvježite.
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,Prestani korisnike od izrade ostaviti aplikacija na sljedećim danima.
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +591,From Opportunity,od Opportunity
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +46,Blanking,Slepi
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +166,Employee Benefits,Primanja zaposlenih
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,Employee Benefits,Primanja zaposlenih
 DocType: Sales Invoice,Is POS,Je POS
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +240,Packed quantity must equal quantity for Item {0} in row {1},Prepuna količina mora biti jednaka količina za točku {0} je u redu {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +245,Packed quantity must equal quantity for Item {0} in row {1},Prepuna količina mora biti jednaka količina za točku {0} je u redu {1}
 DocType: Production Order,Manufactured Qty,Proizvedeno Kol
 DocType: Purchase Receipt Item,Accepted Quantity,Prihvaćena količina
 apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} ne postoji
 apps/erpnext/erpnext/config/accounts.py +18,Bills raised to Customers.,Mjenice podignuta na kupce.
 DocType: DocField,Default,Podrazumjevano
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Project Id
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +466,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},No red {0}: Iznos ne može biti veći od čekanju Iznos protiv rashodi potraživanje {1}. Na čekanju iznos je {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +468,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},No red {0}: Iznos ne može biti veći od čekanju Iznos protiv rashodi potraživanje {1}. Na čekanju iznos je {2}
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +40,{0} subscribers added,{0} pretplatnika dodao
 DocType: Maintenance Schedule,Schedule,Raspored
 DocType: Cost Center,"Define Budget for this Cost Center. To set budget action, see ""Company List""","Definirati budžeta za ovu troškova Centra. Za postavljanje budžet akciju, pogledajte &quot;Lista preduzeća&quot;"
@@ -3873,7 +3714,7 @@
 apps/erpnext/erpnext/public/js/pos/pos.js +91,Price List not found or disabled,Cjenik nije pronađena ili invaliditetom
 DocType: Expense Claim,Approved,Odobreno
 DocType: Pricing Rule,Price,Cijena
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +79,Employee relieved on {0} must be set as 'Left',Zaposlenik razriješen na {0} mora biti postavljen kao 'lijevo '
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +88,Employee relieved on {0} must be set as 'Left',Zaposlenik razriješen na {0} mora biti postavljen kao 'lijevo '
 DocType: Item,"Selecting ""Yes"" will give a unique identity to each entity of this item which can be viewed in the Serial No master.",Odabir &quot;Da&quot; će dati jedinstveni identitet svakog entiteta ove točke koja se može vidjeti u rednim brojem učitelja.
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +39,Appraisal {0} created for Employee {1} in the given date range,Procjena {0} stvorena za zaposlenika {1} u određenom razdoblju
 DocType: Employee,Education,Obrazovanje
@@ -3884,7 +3725,7 @@
 apps/frappe/frappe/desk/moduleview.py +67,Standard Reports,Standardni Izvješća
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,Računovodstvene stavke
 DocType: Delivery Note Item,Available Qty at From Warehouse,Dostupno Količina na Od Skladište
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +209,Please select Employee Record first.,Molimo odaberite zaposlenih Record prvi.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +224,Please select Employee Record first.,Molimo odaberite zaposlenih Record prvi.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Red {0}: Party / računa ne odgovara {1} / {2} u {3} {4}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +35,To create a Tax Account,Za stvaranje porezno
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +233,Please enter Expense Account,Unesite trošak računa
@@ -3897,46 +3738,43 @@
 DocType: Sales Order,Track this Sales Order against any Project,Prati ovu prodajni nalog protiv bilo Projekta
 DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,Povucite prodajne naloge (na čekanju za isporuku) na temelju navedenih kriterija
 DocType: DocShare,Document Type,Tip dokumenta
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +565,From Supplier Quotation,Od dobavljača kotaciju
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +588,From Supplier Quotation,Od dobavljača kotaciju
 DocType: Deduction Type,Deduction Type,Tip odbitka
 DocType: Attendance,Half Day,Pola dana
 DocType: Pricing Rule,Min Qty,Min kol
 DocType: Features Setup,"To track items in sales and purchase documents with batch nos. ""Preferred Industry: Chemicals""",Za praćenje predmeta prodaje i otkupa dokumente serije br. &quot;Željena Industrija: Kemikalije&quot;
 DocType: GL Entry,Transaction Date,Transakcija Datum
 DocType: Production Plan Item,Planned Qty,Planirani Kol
-apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +91,Total Tax,Ukupno porez
+apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +93,Total Tax,Ukupno porez
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +178,For Quantity (Manufactured Qty) is mandatory,Za Količina (Proizvedeno Qty) je obavezno
 DocType: Stock Entry,Default Target Warehouse,Centralno skladište
 DocType: Purchase Invoice,Net Total (Company Currency),Neto Ukupno (Društvo valuta)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +79,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Red {0}: Party Tip i stranka je primjenjiv samo protiv potraživanja / računa dobavljača
 DocType: Notification Control,Purchase Receipt Message,Poruka primke
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +95,Total allocated leaves are more than period,Ukupno izdvojene Listovi su više nego razdoblje
 DocType: Production Order,Actual Start Date,Stvarni datum početka
 DocType: Sales Order,% of materials delivered against this Sales Order,% Materijala dostavljenih od ovog prodajnog naloga
 apps/erpnext/erpnext/config/stock.py +23,Record item movement.,Zabilježite stavku pokret.
 DocType: Newsletter List Subscriber,Newsletter List Subscriber,Newsletter Lista pretplatnika
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +164,Morticing,Dubljenje
 DocType: Email Account,Service,Usluga
 DocType: Hub Settings,Hub Settings,Hub Settings
 DocType: Project,Gross Margin %,Bruto marža %
 DocType: BOM,With Operations,Uz operacije
 apps/erpnext/erpnext/accounts/party.py +232,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Računovodstvo stavke su već učinjeni u valuti {0} {1} za firmu. Molimo odaberite potraživanja ili platiti račun s valutnom {0}.
 ,Monthly Salary Register,Mjesečna plaća Registracija
-apps/frappe/frappe/website/template.py +140,Next,Sljedeći
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard_page.html +17,Next,Sljedeći
 DocType: Warranty Claim,If different than customer address,Ako se razlikuje od kupaca adresu
 DocType: BOM Operation,BOM Operation,BOM operacija
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +118,Electropolishing,Elektromaterijal
 DocType: Purchase Taxes and Charges,On Previous Row Amount,Na prethodnu Row visini
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +24,Please enter Payment Amount in atleast one row,Unesite plaćanja Iznos u atleast jednom redu
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +33,Please enter Payment Amount in atleast one row,Unesite plaćanja Iznos u atleast jednom redu
 DocType: POS Profile,POS Profile,POS profil
 apps/erpnext/erpnext/config/accounts.py +153,"Seasonality for setting budgets, targets etc.","Sezonski za postavljanje budžeta, ciljeva itd"
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +238,Row {0}: Payment Amount cannot be greater than Outstanding Amount,Row {0}: Plaćanje iznosu koji ne može biti veći od preostali iznos
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +46,Total Unpaid,Ukupno Neplaćeni
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +21,Time Log is not billable,Vrijeme Log nije naplatnih
 apps/erpnext/erpnext/stock/get_item_details.py +128,"Item {0} is a template, please select one of its variants","Stavka {0} je predložak, odaberite jednu od njegovih varijanti"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +528,Purchaser,Kupac
+apps/erpnext/erpnext/public/js/setup_wizard.js +272,Purchaser,Kupac
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +81,Net pay cannot be negative,Neto plaća ne može biti negativna
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +71,Please enter the Against Vouchers manually,Molimo vas da unesete ručno protiv vaučera
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +107,Please enter the Against Vouchers manually,Molimo vas da unesete ručno protiv vaučera
 DocType: SMS Settings,Static Parameters,Statički parametri
 DocType: Purchase Order,Advance Paid,Advance Paid
 DocType: Item,Item Tax,Porez artikla
@@ -3945,14 +3783,12 @@
 apps/erpnext/erpnext/config/crm.py +48,Send mass SMS to your contacts,Pošalji masovne SMS poruke svojim kontaktima
 DocType: Purchase Taxes and Charges,Consider Tax or Charge for,Razmislite poreza ili pristojbi za
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,Stvarni Qty je obavezno
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +42,Cross-rolling,Cross-valjanje
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +132,Credit Card,kreditna kartica
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +132,Credit Card,kreditna kartica
 DocType: BOM,Item to be manufactured or repacked,Artikal će biti proizveden ili prepakiran
 apps/erpnext/erpnext/config/stock.py +95,Default settings for stock transactions.,Zadane postavke za burzovne transakcije.
 DocType: Purchase Invoice,Next Date,Sljedeći datum
 DocType: Employee Education,Major/Optional Subjects,Glavni / Izborni predmeti
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +49,Please enter Taxes and Charges,Unesite poreza i naknada
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +85,Machining,Strojna obrada
 DocType: Sales Invoice Item,Drop Ship,Drop Ship
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","Ovdje možete održavati obiteljske pojedinosti kao što su ime i okupacije roditelja, supružnika i djecu"
 DocType: Hub Settings,Seller Name,Ime Prodavač
@@ -3962,7 +3798,7 @@
 DocType: Stock Entry,Repack,Prepakovati
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +6,You must Save the form before proceeding,Morate spremiti obrazac prije nastavka
 DocType: Item Attribute,Numeric Values,Brojčane vrijednosti
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +500,Attach Logo,Priložiti logo
+apps/erpnext/erpnext/public/js/setup_wizard.js +246,Attach Logo,Priložiti logo
 DocType: Customer,Commission Rate,Komisija Stopa
 apps/erpnext/erpnext/stock/doctype/item/item.js +38,Make Variant,Make Variant
 apps/erpnext/erpnext/config/hr.py +145,Block leave applications by department.,Blok ostaviti aplikacija odjelu.
@@ -3977,19 +3813,19 @@
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +105,Please select a csv file,Odaberite CSV datoteku
 DocType: Dropbox Backup,Send Backups to Dropbox,Pošalji Backup na Dropbox
 DocType: Purchase Order,To Receive and Bill,Da primi i Bill
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +94,Designer,Imenovatelj
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Designer,Imenovatelj
 apps/erpnext/erpnext/config/selling.py +121,Terms and Conditions Template,Uvjeti predloška
 DocType: Serial No,Delivery Details,Detalji isporuke
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +383,Cost Center is required in row {0} in Taxes table for type {1},Troška potrebno je u redu {0} poreza stolom za vrstu {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +386,Cost Center is required in row {0} in Taxes table for type {1},Troška potrebno je u redu {0} poreza stolom za vrstu {1}
 DocType: Item,Automatically create Material Request if quantity falls below this level,Automatski kreirati Materijal Zahtjev ako količina padne ispod tog nivoa
 ,Item-wise Purchase Register,Stavka-mudar Kupnja Registracija
 DocType: Batch,Expiry Date,Datum isteka
-apps/erpnext/erpnext/stock/doctype/item/item.py +375,"To set reorder level, item must be a Purchase Item or Manufacturing Item","Da biste postavili Ponovno redj nivo, stavka mora biti kupovine stavke ili Proizvodnja artikla"
+apps/erpnext/erpnext/stock/doctype/item/item.py +379,"To set reorder level, item must be a Purchase Item or Manufacturing Item","Da biste postavili Ponovno redj nivo, stavka mora biti kupovine stavke ili Proizvodnja artikla"
 ,Supplier Addresses and Contacts,Supplier Adrese i kontakti
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,Molimo odaberite kategoriju prvi
 apps/erpnext/erpnext/config/projects.py +18,Project master.,Projekt majstor.
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,Ne pokazati nikakav simbol poput $ iza valute.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +330, (Half Day),(Pola dana)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +374, (Half Day),(Pola dana)
 DocType: Supplier,Credit Days,Kreditne Dani
 DocType: Leave Type,Is Carry Forward,Je Carry Naprijed
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +478,Get Items from BOM,Kreiraj proizvode od sastavnica (BOM)
@@ -3997,7 +3833,7 @@
 apps/erpnext/erpnext/config/manufacturing.py +120,Bill of Materials,Bill of Materials
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +77,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Red {0}: Party Tip i stranka je potreban za potraživanja / računa plaćaju {1}
 DocType: Dropbox Backup,Send Notifications To,Pošalji obavještenje na adresu
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html +26,Ref Date,Ref: Datum
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +54,Ref Date,Ref: Datum
 DocType: Employee,Reason for Leaving,Razlog za odlazak
 DocType: Expense Claim Detail,Sanctioned Amount,Iznos kažnjeni
 DocType: GL Entry,Is Opening,Je Otvaranje
@@ -4005,4 +3841,3 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +188,Account {0} does not exist,Konto {0} ne postoji
 DocType: Account,Cash,Gotovina
 DocType: Employee,Short biography for website and other publications.,Kratka biografija za web stranice i druge publikacije.
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +31,Please create Salary Structure for employee {0},Molimo stvoriti Plaća Struktura za zaposlenika {0}
diff --git a/erpnext/translations/ca.csv b/erpnext/translations/ca.csv
index 7983a9a..ffb20d6 100644
--- a/erpnext/translations/ca.csv
+++ b/erpnext/translations/ca.csv
@@ -1,13 +1,12 @@
 DocType: Employee,Salary Mode,Salary Mode
 DocType: Cost Center,"Select Monthly Distribution, if you want to track based on seasonality.","Seleccioneu Distribució mensual, si voleu fer un seguiment basat en l'estacionalitat."
 DocType: Employee,Divorced,Divorciat
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +86,Warning: Same item has been entered multiple times.,Advertència: El mateix article s&#39;ha introduït diverses vegades.
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +80,Warning: Same item has been entered multiple times.,Advertència: El mateix article s&#39;ha introduït diverses vegades.
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +96,Items already synced,Productes ja sincronitzen
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,Permetre article a afegir diverses vegades en una transacció
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,Cancel·la material Visita {0} abans de cancel·lar aquest reclam de garantia
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +19,Consumer Products,Productes de Consum
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,Productes de Consum
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +68,Please select Party Type first,Seleccioneu Partit Tipus primer
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +90,Annealing,Recuit
 DocType: Item,Customer Items,Articles de clients
 apps/erpnext/erpnext/accounts/doctype/account/account.py +45,Account {0}: Parent account {1} can not be a ledger,Compte {0}: compte pare {1} no pot ser un llibre de comptabilitat
 DocType: Item,Publish Item to hub.erpnext.com,Publicar article a hub.erpnext.com
@@ -20,15 +19,14 @@
 DocType: About Us Settings,Website,Lloc web
 DocType: POS Profile,Applicable for User,Aplicable per a l&#39;usuari
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +169,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Detingut ordre de producció no es pot cancel·lar, unstop primer per cancel·lar"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +23,Compaction plus sintering,Compactació més sinterització
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,Currency is required for Price List {0},Informa de la divisa pera la Llista de preus {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Es calcularà en la transacció.
 DocType: Purchase Order,Customer Contact,Client Contacte
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +549,From Material Request,De Sol·licituds de materials
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +572,From Material Request,De Sol·licituds de materials
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} Arbre
 DocType: Job Applicant,Job Applicant,Job Applicant
 apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,No hi ha més resultats.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +78,Legal,Legal
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +34,Legal,Legal
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +114,Actual type tax cannot be included in Item rate in row {0},Impost de tipus real no pot ser inclòs en el preu de l&#39;article a la fila {0}
 DocType: C-Form,Customer,Client
 DocType: Purchase Receipt Item,Required By,Requerit per
@@ -43,7 +41,6 @@
 DocType: Manufacturing Settings,Default 10 mins,Per defecte 10 minuts
 DocType: Leave Type,Leave Type Name,Deixa Tipus Nom
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +148,Series Updated Successfully,Sèrie actualitzat correctament
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +150,Stitching,Puntades
 DocType: Pricing Rule,Apply On,Aplicar a
 DocType: Item Price,Multiple Item prices.,Múltiples Preus d'articles
 ,Purchase Order Items To Be Received,Articles a rebre de l'ordre de compra
@@ -51,8 +48,8 @@
 DocType: Quality Inspection Reading,Parameter,Paràmetre
 apps/erpnext/erpnext/projects/doctype/project/project.py +43,Expected End Date can not be less than Expected Start Date,Esperat Data de finalització no pot ser inferior a Data prevista d&#39;inici
 apps/erpnext/erpnext/utilities/transaction_base.py +104,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Fila # {0}: Taxa ha de ser el mateix que {1}: {2} ({3} / {4})
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +189,New Leave Application,Nova aplicació Deixar
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +134,Bank Draft,Lletra bancària
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +204,New Leave Application,Nova aplicació Deixar
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +134,Bank Draft,Lletra bancària
 DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,1. Utilitza aquesta opció per mantenir el codi de l'article del client i incloure'l en les cerques en base al seu codi
 DocType: Mode of Payment Account,Mode of Payment Account,Mode de Compte de Pagament
 apps/erpnext/erpnext/stock/doctype/item/item.js +34,Show Variants,Mostra variants
@@ -64,25 +61,23 @@
 DocType: Production Plan Item,Production Plan Item,Pla de Producció d'articles
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +141,User {0} is already assigned to Employee {1},L'usuari {0} ja està assignat a l'Empleat {1}
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +13,Make new POS Profile,Fes el teu nou perfil de POS
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +31,Health Care,Sanitari
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,Sanitari
 DocType: Purchase Invoice,Monthly,Mensual
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +66,Delay in payment (Days),Retard en el pagament (dies)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +494,Invoice,Factura
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +519,Invoice,Factura
 DocType: Maintenance Schedule Item,Periodicity,Periodicitat
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +357,Email Address,Adreça de correu electrònic
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +21,Defense,Defensa
+apps/erpnext/erpnext/public/js/setup_wizard.js +107,Email Address,Adreça de correu electrònic
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,Defensa
 DocType: Company,Abbr,Abbr
 DocType: Appraisal Goal,Score (0-5),Puntuació (0-5)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +193,Row {0}: {1} {2} does not match with {3},Fila {0}: {1} {2} no coincideix amb {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +67,Row # {0}:,Fila # {0}: 
 DocType: Delivery Note,Vehicle No,Vehicle n
 apps/erpnext/erpnext/public/js/pos/pos.js +528,Please select Price List,Seleccionla llista de preus
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +162,Woodworking,Tractament de la fusta
 DocType: Production Order Operation,Work In Progress,Treball en curs
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +153,3D printing,La impressió 3D
 DocType: Employee,Holiday List,Llista de vacances
 DocType: Time Log,Time Log,Hora de registre
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +530,Accountant,Accountant
+apps/erpnext/erpnext/public/js/setup_wizard.js +274,Accountant,Accountant
 DocType: Cost Center,Stock User,Fotografia de l&#39;usuari
 DocType: Company,Phone No,Telèfon No
 DocType: Time Log,"Log of Activities performed by users against Tasks that can be used for tracking time, billing.","Bloc d'activitats realitzades pels usuaris durant les feines que es poden utilitzar per al seguiment del temps, facturació."
@@ -98,18 +93,19 @@
 DocType: Bin,Quantity Requested for Purchase,Quantitat sol·licitada per a la compra
 DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name","Adjunta el fitxer .csv amb dues columnes, una per al nom antic i un altre per al nou nom"
 DocType: Packed Item,Parent Detail docname,Docname Detall de Pares
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Kg,Kg
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Kg,Kg
 apps/erpnext/erpnext/config/hr.py +48,Opening for a Job.,L'obertura per a una ocupació.
 DocType: Item Attribute,Increment,Increment
 apps/erpnext/erpnext/public/js/stock_analytics.js +63,Select Warehouse...,Seleccioneu Magatzem ...
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +6,Advertising,Publicitat
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,Publicitat
+apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,Igual Company s&#39;introdueix més d&#39;una vegada
 DocType: Employee,Married,Casat
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +389,Stock cannot be updated against Delivery Note {0},L'estoc no es pot actualitzar contra la Nota de Lliurament {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +391,Stock cannot be updated against Delivery Note {0},L'estoc no es pot actualitzar contra la Nota de Lliurament {0}
 DocType: Payment Reconciliation,Reconcile,Conciliar
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +30,Grocery,Botiga
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,Botiga
 DocType: Quality Inspection Reading,Reading 1,Lectura 1
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Make Bank Entry,Feu entrada del banc
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +40,Pension Funds,Fons de Pensions
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,Fons de Pensions
 apps/erpnext/erpnext/accounts/doctype/account/account.py +142,Warehouse is mandatory if account type is Warehouse,Warehouse és obligatori si el tipus de compte és Magatzem
 DocType: SMS Center,All Sales Person,Tot el personal de vendes
 DocType: Lead,Person Name,Nom de la Persona
@@ -131,7 +127,7 @@
 DocType: Quality Inspection,Get Specification Details,Obtenir Detalls d'Especificacions
 DocType: Lead,Interested,Interessat
 apps/erpnext/erpnext/config/manufacturing.py +14,Bill of Material,Llista de materials (BOM)
-apps/erpnext/erpnext/public/js/stock_analytics.js +45,Opening,Obertura
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +158,Opening,Obertura
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},Des {0} a {1}
 DocType: Item,Copy From Item Group,Copiar del Grup d'Articles
 DocType: Journal Entry,Opening Entry,Entrada Obertura
@@ -145,23 +141,22 @@
 DocType: Employee Education,Under Graduate,Baix de Postgrau
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +22,Target On,Target On
 DocType: BOM,Total Cost,Cost total
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +99,Reaming,Mandrinatge
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +9,Activity Log:,Registre d'activitat:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +199,Item {0} does not exist in the system or has expired,L'Article {0} no existeix en el sistema o ha caducat
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +44,Real Estate,Real Estate
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +44,Real Estate,Real Estate
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +4,Statement of Account,Estat de compte
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +41,Pharmaceuticals,Farmacèutics
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,Farmacèutics
 DocType: Expense Claim Detail,Claim Amount,Reclamació Import
 DocType: Employee,Mr,Sr
 DocType: Custom Script,Client,Client
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,Tipus de Proveïdor / distribuïdor
 DocType: Naming Series,Prefix,Prefix
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Consumable,Consumible
+apps/erpnext/erpnext/public/js/setup_wizard.js +359,Consumable,Consumible
 DocType: Upload Attendance,Import Log,Importa registre
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.js +19,Send,Enviar
 DocType: Sales Invoice Item,Delivered By Supplier,Lliurat per proveïdor
 DocType: SMS Center,All Contact,Tots els contactes
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +164,Annual Salary,Salari Anual
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +164,Annual Salary,Salari Anual
 DocType: Period Closing Voucher,Closing Fiscal Year,Tancant l'Any Fiscal
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +69,Stock Expenses,Despeses d'estoc
 DocType: Newsletter,Email Sent?,Email Sent?
@@ -169,7 +164,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +92,Show Time Logs,Mostrar Registres Temps
 DocType: Journal Entry Account,Credit in Company Currency,Crèdit en moneda Companyia
 DocType: Delivery Note,Installation Status,Estat d'instal·lació
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +115,Accepted + Rejected Qty must be equal to Received quantity for Item {0},+ Acceptat Rebutjat Quantitat ha de ser igual a la quantitat rebuda per article {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +118,Accepted + Rejected Qty must be equal to Received quantity for Item {0},+ Acceptat Rebutjat Quantitat ha de ser igual a la quantitat rebuda per article {0}
 DocType: Item,Supply Raw Materials for Purchase,Materials Subministrament primeres per a la Compra
 apps/erpnext/erpnext/stock/get_item_details.py +133,Item {0} must be a Purchase Item,L'Article {0} ha de ser un article de compra
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
@@ -177,19 +172,17 @@
  Totes les dates i empleat combinació en el període seleccionat vindrà a la plantilla, amb els registres d'assistència existents"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +446,Item {0} is not active or end of life has been reached,L'article {0} no està actiu o ha arribat al final de la seva vida
 DocType: Time Log Batch,Will be updated after Sales Invoice is Submitted.,S'actualitzarà després de la presentació de la factura de venda.
-apps/erpnext/erpnext/controllers/accounts_controller.py +493,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Per incloure l'impost a la fila {0} en la tarifa d'article, els impostos a les files {1} també han de ser inclosos"
+apps/erpnext/erpnext/controllers/accounts_controller.py +494,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Per incloure l'impost a la fila {0} en la tarifa d'article, els impostos a les files {1} també han de ser inclosos"
 apps/erpnext/erpnext/config/hr.py +90,Settings for HR Module,Ajustaments per al Mòdul de Recursos Humans
 DocType: SMS Center,SMS Center,Centre d'SMS
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +78,Straightening,Redreçar
 DocType: BOM Replace Tool,New BOM,Nova llista de materials
 apps/erpnext/erpnext/config/projects.py +28,Batch Time Logs for billing.,Lot Registres de temps per a la facturació.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +15,Countergravity casting,Colada per contra
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +30,Newsletter has already been sent,El Newsletter ja s'ha enviat
 DocType: Lead,Request Type,Tipus de sol·licitud
 DocType: Leave Application,Reason,Raó
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +14,Broadcasting,Radiodifusió
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +140,Execution,Execució
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +364,The first user will become the System Manager (you can change this later).,El primer usuari es convertirà en l'Administrador del sistema (que pot canviar això més endavant).
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,Radiodifusió
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +140,Execution,Execució
+apps/erpnext/erpnext/public/js/setup_wizard.js +114,The first user will become the System Manager (you can change this later).,El primer usuari es convertirà en l'Administrador del sistema (que pot canviar això més endavant).
 apps/erpnext/erpnext/config/manufacturing.py +39,Details of the operations carried out.,Els detalls de les operacions realitzades.
 DocType: Serial No,Maintenance Status,Estat de manteniment
 apps/erpnext/erpnext/config/stock.py +263,Items and Pricing,Articles i preus
@@ -206,7 +199,6 @@
 DocType: Pricing Rule,Discount on Price List Rate (%),Descompte Preu de llista Taxa (%)
 apps/frappe/frappe/public/js/frappe/form/print.js +96,Start,Començar
 DocType: User,First Name,Nom De Pila
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +12,Full-mold casting,Fosa de motlle complet
 DocType: Offer Letter,Select Terms and Conditions,Selecciona Termes i Condicions
 DocType: Production Planning Tool,Sales Orders,Ordres de venda
 DocType: Purchase Taxes and Charges,Valuation,Valoració
@@ -218,8 +210,7 @@
 DocType: Bank Reconciliation,Bank Account,Compte Bancari
 DocType: Leave Type,Allow Negative Balance,Permetre balanç negatiu
 DocType: Selling Settings,Default Territory,Territori per defecte
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +53,Television,Televisió
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +138,Gashing,Gashing
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,Televisió
 DocType: Production Order Operation,Updated via 'Time Log',Actualitzat a través de 'Hora de registre'
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +82,Account {0} does not belong to Company {1},El compte {0} no pertany a l'empresa {1}
 DocType: Naming Series,Series List for this Transaction,Llista de Sèries per a aquesta transacció
@@ -234,14 +225,13 @@
 DocType: Leave Allocation,Add unused leaves from previous allocations,Afegir les fulles no utilitzats de les assignacions anteriors
 apps/erpnext/erpnext/controllers/recurring_document.py +206,Next Recurring {0} will be created on {1},Següent Recurrent {0} es crearà a {1}
 DocType: Newsletter List,Total Subscribers,Els subscriptors totals
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +575,Contact Name,Nom de Contacte
+,Contact Name,Nom de Contacte
 DocType: Production Plan Item,SO Pending Qty,SO Pendent Quantitat
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Crea nòmina per als criteris abans esmentats.
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,Sol·licitud de venda.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +107,Double housing,Habitatge Doble
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +156,Only the selected Leave Approver can submit this Leave Application,Només l'aprovador d'absències seleccionat pot presentar aquesta sol·licitud
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +171,Only the selected Leave Approver can submit this Leave Application,Només l'aprovador d'absències seleccionat pot presentar aquesta sol·licitud
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,Alleujar data ha de ser major que la data de Unir
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +172,Leaves per Year,Deixa per any
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +172,Leaves per Year,Deixa per any
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup > Settings > Naming Series,"Si us plau, estableix Naming Sèries per {0} a través de Configuració&gt; Configuració&gt; Sèrie Naming"
 DocType: Time Log,Will be updated when batched.,Will be updated when batched.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +104,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,"Fila {0}: Si us plau, vegeu ""És Avanç 'contra el Compte {1} si es tracta d'una entrada amb antelació."
@@ -250,25 +240,24 @@
 DocType: Item Website Specification,Item Website Specification,Especificacions d'article al Web
 DocType: Dropbox Backup,Dropbox Access Key,Dropbox Access Key
 DocType: Payment Tool,Reference No,Referència número
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +348,Leave Blocked,Absència bloquejada
-apps/erpnext/erpnext/stock/doctype/item/item.py +535,Item {0} has reached its end of life on {1},Article {0} ha arribat a la seva fi de vida del {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +392,Leave Blocked,Absència bloquejada
+apps/erpnext/erpnext/stock/doctype/item/item.py +539,Item {0} has reached its end of life on {1},Article {0} ha arribat a la seva fi de vida del {1}
 apps/erpnext/erpnext/accounts/utils.py +339,Annual,Anual
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Estoc Reconciliació article
 DocType: Stock Entry,Sales Invoice No,Factura No
 DocType: Material Request Item,Min Order Qty,Quantitat de comanda mínima
 DocType: Lead,Do Not Contact,No entri en contacte
 DocType: Sales Invoice,The unique id for tracking all recurring invoices. It is generated on submit.,L'identificador únic per al seguiment de totes les factures recurrents. Es genera a enviar.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +93,Software Developer,Desenvolupador de Programari
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +93,Software Developer,Desenvolupador de Programari
 DocType: Item,Minimum Order Qty,Quantitat de comanda mínima
 DocType: Pricing Rule,Supplier Type,Tipus de Proveïdor
 DocType: Item,Publish in Hub,Publicar en el Hub
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +555,Item {0} is cancelled,L'article {0} està cancel·lat
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +598,Material Request,Sol·licitud de materials
+apps/erpnext/erpnext/stock/doctype/item/item.py +559,Item {0} is cancelled,L'article {0} està cancel·lat
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +607,Material Request,Sol·licitud de materials
 DocType: Bank Reconciliation,Update Clearance Date,Actualització Data Liquidació
 DocType: Item,Purchase Details,Informació de compra
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +323,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},Article {0} no es troba en &#39;matèries primeres subministrades&#39; taula en l&#39;Ordre de Compra {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +129,Wire brushing,Raspall de filferro
 DocType: Employee,Relation,Relació
 DocType: Shipping Rule,Worldwide Shipping,Enviament mundial
 apps/erpnext/erpnext/config/selling.py +23,Confirmed orders from Customers.,Comandes en ferm dels clients.
@@ -284,12 +273,11 @@
 DocType: Supplier,Address HTML,Adreça HTML
 DocType: Lead,Mobile No.,No mòbil
 DocType: Maintenance Schedule,Generate Schedule,Generar Calendari
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +81,Hubbing,Hubbing
 DocType: Purchase Invoice Item,Expense Head,Cap de despeses
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +86,Please select Charge Type first,Seleccioneu Tipus de Càrrec primer
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,Més recent
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +395,Max 5 characters,Max 5 caràcters
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +195,Select Your Language,Selecciona el teu idioma
+apps/erpnext/erpnext/public/js/setup_wizard.js +143,Max 5 characters,Max 5 caràcters
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +245,Select Your Language,Selecciona el teu idioma
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,El primer aprovadorde d'absències de la llista s'establirà com a predeterminat
 DocType: Manufacturing Settings,"Disables creation of time logs against Production Orders.
 Operations shall not be tracked against Production Order",Desactiva la creació de registres de temps en contra de les ordres de fabricació. Les operacions no seran objecte de seguiment contra l&#39;Ordre de Producció
@@ -301,8 +289,6 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +34,Item {0} must be Service Item,Article {0} ha de ser Servei d'articles
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +303,Completed Qty can not be greater than 'Qty to Manufacture',Completat Quantitat no pot ser major que 'Cant de Fabricació'
 DocType: DocType,Administrator,Administrador
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +136,Laser drilling,Perforació per làser
-DocType: Stock UOM Replace Utility,New Stock UOM,Nova UDM d'existències
 DocType: Period Closing Voucher,Closing Account Head,Tancant el Compte principal
 DocType: Employee,External Work History,Historial de treball extern
 apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,Referència Circular Error
@@ -311,18 +297,15 @@
 DocType: Lead,Industry,Indústria
 DocType: Employee,Job Profile,Perfil Laboral
 DocType: Newsletter,Newsletter,Newsletter
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +84,Hydroforming,Hydroforming
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +49,Necking,Petoneig
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Notificació per correu electrònic a la creació de la Sol·licitud de materials automàtica
 DocType: Journal Entry,Multi Currency,Multi moneda
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +51,Item is updated,L'article s'ha actualitzat
 DocType: Async Task,System Manager,Administrador del sistema
 DocType: Payment Reconciliation Invoice,Invoice Type,Tipus de Factura
 DocType: Sales Invoice Item,Delivery Note,Nota de lliurament
 DocType: Dropbox Backup,Allow Dropbox Access,Allow Dropbox Access
 apps/erpnext/erpnext/config/learn.py +72,Setting up Taxes,Configuració d&#39;Impostos
 apps/erpnext/erpnext/accounts/utils.py +189,Payment Entry has been modified after you pulled it. Please pull it again.,"Entrada de pagament ha estat modificat després es va tirar d'ell. Si us plau, tiri d'ella de nou."
-apps/erpnext/erpnext/stock/doctype/item/item.py +343,{0} entered twice in Item Tax,{0} entrat dues vegades en l'Impost d'article
+apps/erpnext/erpnext/stock/doctype/item/item.py +347,{0} entered twice in Item Tax,{0} entrat dues vegades en l'Impost d'article
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +105,Summary for this week and pending activities,Resum per a aquesta setmana i activitats pendents
 DocType: Workstation,Rent Cost,Cost de lloguer
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +74,Please select month and year,Selecciona el mes i l'any
@@ -339,24 +322,22 @@
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,Canvi al qual la divisa del client es converteix la moneda base del client
 DocType: Features Setup,"Available in BOM, Delivery Note, Purchase Invoice, Production Order, Purchase Order, Purchase Receipt, Sales Invoice, Sales Order, Stock Entry, Timesheet","Disponible a la llista de materials, nota de lliurament, factura de compra, ordre de producció, ordres de compra, rebut de compra, factura de venda, ordres de venda, entrada d'estoc, fulla d'hores"
 DocType: Item Tax,Tax Rate,Tax Rate
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Select Item,Seleccioneu Producte
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +540,Select Item,Seleccioneu Producte
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +143,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","Article: {0} gestionat per lots, no pot conciliar l'ús \
  Stock Reconciliació, en lloc d'utilitzar l'entrada Stock"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +259,Purchase Invoice {0} is already submitted,La Factura de compra {0} ja està Presentada
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +262,Purchase Invoice {0} is already submitted,La Factura de compra {0} ja està Presentada
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Batch No must be same as {1} {2},Fila # {0}: Lot No ha de ser igual a {1} {2}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Convert to non-Group,Convertir la no-Group
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +55,Purchase Receipt must be submitted,Rebut de compra s'ha de presentar
-DocType: Stock UOM Replace Utility,Current Stock UOM,Estoc actual UOM
 apps/erpnext/erpnext/config/stock.py +53,Batch (lot) of an Item.,Lots (lot) d'un element.
 DocType: C-Form Invoice Detail,Invoice Date,Data de la factura
 DocType: GL Entry,Debit Amount,Suma Dèbit
 apps/erpnext/erpnext/accounts/party.py +223,There can only be 1 Account per Company in {0} {1},Només pot haver 1 compte per l&#39;empresa en {0} {1}
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Your email address,La seva adreça de correu electrònic
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +194,Please see attachment,"Si us plau, vegeu el document adjunt"
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +203,Please see attachment,"Si us plau, vegeu el document adjunt"
 DocType: Purchase Order,% Received,% Rebut
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +109,Water jet cutting,Tall per raig d&#39;aigua
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +24,Setup Already Complete!!,Configuració acabada !!
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +20,Setup Already Complete!!,Configuració acabada !!
 ,Finished Goods,Béns Acabats
 DocType: Delivery Note,Instructions,Instruccions
 DocType: Quality Inspection,Inspected By,Inspeccionat per
@@ -371,6 +352,7 @@
 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.,"Si us plau, no crear comptes de clients i proveïdors. Es creen directament dels mestres al client / proveïdor."
 DocType: Currency Exchange,Currency Exchange,Valor de Canvi de divisa
 DocType: Purchase Invoice Item,Item Name,Nom de l'article
+DocType: Authorization Rule,Approving User  (above authorized value),L&#39;aprovació de l&#39;usuari (per sobre del valor autoritzat)
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Credit Balance,Saldo creditor
 DocType: Employee,Widowed,Vidu
 DocType: Production Planning Tool,"Items to be requested which are ""Out of Stock"" considering all warehouses based on projected qty and minimum order qty","Els productes que es sol·licitaran i que estan ""Esgotat"", considerant tots els magatzems basat en Quantitat projectada i quantitat mínima de comanda"
@@ -380,11 +362,10 @@
 ,Purchase Register,Compra de Registre
 DocType: Landed Cost Item,Applicable Charges,Càrrecs aplicables
 DocType: Workstation,Consumable Cost,Cost de consumibles
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,{0} ({1}) must have role 'Leave Approver',{0} ({1}) ha de tenir paper 'Deixar aprovador'
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +167,{0} ({1}) must have role 'Leave Approver',{0} ({1}) ha de tenir paper 'Deixar aprovador'
 DocType: Purchase Receipt,Vehicle Date,Data de Vehicles
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +39,Medical,Metge
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +39,Medical,Metge
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,Motiu de pèrdua
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +36,Tube beading,Abaloris Tub
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},Estació de treball està tancada en les següents dates segons Llista de vacances: {0}
 DocType: Employee,Single,Solter
 DocType: Issue,Attachment,Accessori
@@ -405,10 +386,8 @@
 DocType: Account,Is Group,És el Grup
 DocType: Stock Settings,Automatically Set Serial Nos based on FIFO,Ajusta automàticament els números de sèrie basat en FIFO
 DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,Comprovar Proveïdor Nombre de factura Singularitat
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +31,Thermoforming,Termoformat
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +66,Slitting,De tall longitudinal
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +57,'To Case No.' cannot be less than 'From Case No.',"""Per al cas núm ' no pot ser inferior a 'De Cas No.'"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +104,Non Profit,Sense ànim de lucre
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +104,Non Profit,Sense ànim de lucre
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_list.js +7,Not Started,Sense començar
 DocType: Lead,Channel Partner,Partner de Canal
 DocType: Account,Old Parent,Antic Pare
@@ -417,13 +396,12 @@
 apps/erpnext/erpnext/config/manufacturing.py +74,Global settings for all manufacturing processes.,La configuració global per a tots els processos de fabricació.
 DocType: Accounts Settings,Accounts Frozen Upto,Comptes bloquejats fins a
 DocType: SMS Log,Sent On,Enviar on
-apps/erpnext/erpnext/stock/doctype/item/item.py +512,Attribute {0} selected multiple times in Attributes Table,Atribut {0} seleccionat diverses vegades en la taula Atributs
+apps/erpnext/erpnext/stock/doctype/item/item.py +516,Attribute {0} selected multiple times in Attributes Table,Atribut {0} seleccionat diverses vegades en la taula Atributs
 DocType: Sales Order,Not Applicable,No Aplicable
 apps/erpnext/erpnext/config/hr.py +140,Holiday master.,Mestre de vacances.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +19,Shell molding,Emmotllament Shell
 DocType: Material Request Item,Required Date,Data Requerit
 DocType: Delivery Note,Billing Address,Direcció De Enviament
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +644,Please enter Item Code.,"Si us plau, introduïu el codi d'article."
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +648,Please enter Item Code.,"Si us plau, introduïu el codi d'article."
 DocType: BOM,Costing,Costejament
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount","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,Quantitat total
@@ -433,7 +411,7 @@
 DocType: Item Attribute,To Range,Per Abast
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Valors i Dipòsits
 DocType: Features Setup,Imports,Importacions
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +144,Adhesive bonding,La unió adhesiva
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +77,Total leaves allocated is mandatory,Fulles totals assignats és obligatori
 DocType: Job Opening,Description of a Job Opening,Descripció d'una oferta de treball
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +102,Pending activities for today,Activitats pendents per avui
 apps/erpnext/erpnext/config/hr.py +28,Attendance record.,Registre d'assistència.
@@ -441,26 +419,25 @@
 DocType: Sales Order Item,Used for Production Plan,S'utilitza per al Pla de Producció
 DocType: System Settings,Loading...,Carregant ...
 DocType: DocField,Password,Contrasenya
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +155,Fused deposition modeling,Modelat per deposició fosa
 DocType: Manufacturing Settings,Time Between Operations (in mins),Temps entre operacions (en minuts)
 DocType: Customer,Buyer of Goods and Services.,Compradors de Productes i Serveis.
 DocType: Journal Entry,Accounts Payable,Comptes Per Pagar
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +24,Add Subscribers,Afegir Subscriptors
 apps/erpnext/erpnext/public/js/feature_setup.js +220,""" does not exists",""" no existeix"
 DocType: Pricing Rule,Valid Upto,Vàlid Fins
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +564,List a few of your customers. They could be organizations or individuals.,Enumerar alguns dels seus clients. Podrien ser les organitzacions o individus.
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,List a few of your customers. They could be organizations or individuals.,Enumerar alguns dels seus clients. Podrien ser les organitzacions o individus.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Direct Income,Ingrés Directe
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +33,"Can not filter based on Account, if grouped by Account","No es pot filtrar en funció del compte, si agrupats per Compte"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +88,Administrative Officer,Oficial Administratiu
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Administrative Officer,Oficial Administratiu
 DocType: Payment Tool,Received Or Paid,Rebut o pagat
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +318,Please select Company,Seleccioneu de l&#39;empresa
 DocType: Stock Entry,Difference Account,Compte de diferències
 apps/erpnext/erpnext/projects/doctype/task/task.py +44,Cannot close task as its dependant task {0} is not closed.,No es pot tancar tasca com no tanca la seva tasca depèn {0}.
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +305,Please enter Warehouse for which Material Request will be raised,Si us plau indica el Magatzem en què es faràa la Sol·licitud de materials
 DocType: Production Order,Additional Operating Cost,Cost addicional de funcionament
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +20,Cosmetics,Productes cosmètics
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,Productes cosmètics
 DocType: DocField,Type,Tipus
-apps/erpnext/erpnext/stock/doctype/item/item.py +417,"To merge, following properties must be same for both items","Per fusionar, propietats han de ser el mateix per a tots dos articles"
+apps/erpnext/erpnext/stock/doctype/item/item.py +421,"To merge, following properties must be same for both items","Per fusionar, propietats han de ser el mateix per a tots dos articles"
 DocType: Communication,Subject,Subjecte
 DocType: Shipping Rule,Net Weight,Pes Net
 DocType: Employee,Emergency Phone,Telèfon d'Emergència
@@ -470,7 +447,6 @@
 DocType: Journal Entry,Difference (Dr - Cr),Diferència (Dr - Cr)
 DocType: Account,Profit and Loss,Pèrdues i Guanys
 apps/erpnext/erpnext/config/stock.py +293,Managing Subcontracting,Subcontractació Gestió
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +58,New UOM must NOT be of type Whole Number,La nova UDM no pot ser de tipus Número sencer
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Furniture and Fixture,Mobles
 DocType: Quotation,Rate at which Price list currency is converted to company's base currency,Valor pel qual la divisa de la llista de preus es converteix a la moneda base de la companyia
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Account {0} does not belong to company: {1},Compte {0} no pertany a la companyia: {1}
@@ -490,14 +466,14 @@
 DocType: Purchase Invoice,Supplier Invoice No,Número de Factura de Proveïdor
 DocType: Territory,For reference,Per referència
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +154,"Cannot delete Serial No {0}, as it is used in stock transactions","No es pot eliminar de sèrie n {0}, ja que s&#39;utilitza en les transaccions de valors"
-apps/erpnext/erpnext/public/js/account_tree_grid.js +52,Closing (Cr),Tancament (Cr)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +227,Closing (Cr),Tancament (Cr)
 DocType: Serial No,Warranty Period (Days),Període de garantia (Dies)
 DocType: Installation Note Item,Installation Note Item,Nota d'instal·lació de l'article
 ,Pending Qty,Pendent Quantitat
 DocType: Job Applicant,Thread HTML,Thread HTML
 DocType: Company,Ignore,Ignorar
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +86,SMS sent to following numbers: {0},SMS enviat als telèfons: {0}
-apps/erpnext/erpnext/controllers/buying_controller.py +135,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Magatzem obligatori per rebut de compra de subcontractació de proveïdors
+apps/erpnext/erpnext/controllers/buying_controller.py +126,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Magatzem obligatori per rebut de compra de subcontractació de proveïdors
 DocType: Pricing Rule,Valid From,Vàlid des
 DocType: Sales Invoice,Total Commission,Total Comissió
 DocType: Pricing Rule,Sales Partner,Soci de vendes
@@ -507,7 +483,7 @@
 To distribute a budget using this distribution, set this **Monthly Distribution** in the **Cost Center**","** Distribució Mensual ** l'ajuda a distribuir el seu pressupost a través de mesos si té l'estacionalitat del seu negoci.
 
  Per distribuir un pressupost utilitzant aquesta distribució, establir aquesta distribució mensual ** ** ** al centre de costos **"
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +183,No records found in the Invoice table,No es troben en la taula de registres de factures
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +130,No records found in the Invoice table,No es troben en la taula de registres de factures
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +20,Please select Company and Party Type first,Seleccioneu de l'empresa i el Partit Tipus primer
 apps/erpnext/erpnext/config/accounts.py +84,Financial / accounting year.,Exercici comptabilitat /.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","Ho sentim, els números de sèrie no es poden combinar"
@@ -523,25 +499,25 @@
 DocType: Sales Order,Billing and Delivery Status,Facturació i Lliurament Estat
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Repetiu els Clients
 DocType: Leave Control Panel,Allocate,Assignar
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +16,Previous,Anterior
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard_page.html +16,Previous,Anterior
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +620,Sales Return,Devolucions de vendes
 DocType: Production Planning Tool,Select Sales Orders from which you want to create Production Orders.,Seleccioneu ordres de venda a partir del qual vol crear ordres de producció.
 DocType: Item,Delivered by Supplier (Drop Ship),Lliurat pel proveïdor (nau)
 apps/erpnext/erpnext/config/hr.py +120,Salary components.,Components salarials.
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,Base de dades de clients potencials.
+DocType: Authorization Rule,Customer or Item,Client o article
 apps/erpnext/erpnext/config/crm.py +17,Customer database.,Base de dades de clients.
 DocType: Quotation,Quotation To,Oferta per
 DocType: Lead,Middle Income,Ingrés Mig
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),Obertura (Cr)
 apps/erpnext/erpnext/accounts/utils.py +193,Allocated amount can not be negative,Suma assignat no pot ser negatiu
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +123,Tumbling,Tumbling
 DocType: Purchase Order Item,Billed Amt,Quantitat facturada
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,Un Magatzem lògic contra el qual es fan les entrades en existències.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +92,Reference No & Reference Date is required for {0},No de referència i obres de consulta Data es requereix per {0}
 DocType: Event,Wednesday,Dimecres
 DocType: Sales Invoice,Customer's Vendor,Venedor del Client
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +214,Production Order is Mandatory,Ordre de Producció és obligatori
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +139,Proposal Writing,Redacció de propostes
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,Proposal Writing,Redacció de propostes
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,Hi ha una altra Sales Person {0} amb el mateix ID d&#39;empleat
 apps/erpnext/erpnext/stock/stock_ledger.py +336,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},Negatiu Stock Error ({6}) per al punt {0} a Magatzem {1} a {2} {3} a {4} {5}
 DocType: Fiscal Year Company,Fiscal Year Company,Any fiscal Companyia
@@ -564,7 +540,7 @@
 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.","Llavors Tarifes de Preu es filtren sobre la base de client, grup de clients, Territori, Proveïdor, Tipus Proveïdor, Campanya, soci de vendes, etc."
 apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.py +179,Please install dropbox python module,"Si us plau, instal leu el mòdul python dropbox"
 DocType: Employee,Passport Number,Nombre de Passaport
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +82,Manager,Gerent
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Manager,Gerent
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +494,From Purchase Receipt,Des rebut de compra
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +219,Same item has been entered multiple times.,El mateix article s'ha introduït diverses vegades.
 DocType: SMS Settings,Receiver Parameter,Paràmetre de Receptor
@@ -572,10 +548,9 @@
 DocType: Sales Person,Sales Person Targets,Objectius persona de vendes
 apps/frappe/frappe/public/js/frappe/form/workflow.js +116,To,A
 apps/frappe/frappe/templates/base.html +145,Please enter email address,Introduïu l'adreça de correu electrònic
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +35,End tube forming,Fi tub formant
 DocType: Production Order Operation,In minutes,En qüestió de minuts
 DocType: Issue,Resolution Date,Resolució Data
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +635,Please set default Cash or Bank account in Mode of Payment {0},"Si us plau, estableix pagament en efectiu o Compte bancari predeterminat a la Forma de pagament {0}"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +637,Please set default Cash or Bank account in Mode of Payment {0},"Si us plau, estableix pagament en efectiu o Compte bancari predeterminat a la Forma de pagament {0}"
 DocType: Selling Settings,Customer Naming By,Customer Naming By
 apps/erpnext/erpnext/accounts/doctype/account/account.js +67,Convert to Group,Convertir el Grup
 DocType: Activity Cost,Activity Type,Tipus d'activitat
@@ -583,12 +558,12 @@
 DocType: Customer,Fixed Days,Dies Fixos
 DocType: Sales Invoice,Packing List,Llista De Embalatge
 apps/erpnext/erpnext/config/buying.py +28,Purchase Orders given to Suppliers.,Ordres de compra donades a Proveïdors.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +43,Publishing,Publicant
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +43,Publishing,Publicant
 DocType: Activity Cost,Projects User,Usuari de Projectes
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Consumed,Consumit
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +198,{0}: {1} not found in Invoice Details table,{0}: {1} no es troba a Detalls de la factura taula
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,{0}: {1} not found in Invoice Details table,{0}: {1} no es troba a Detalls de la factura taula
 DocType: Company,Round Off Cost Center,Completen centres de cost
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +208,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Manteniment Visita {0} ha de ser cancel·lat abans de cancel·lar aquesta comanda de vendes
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +203,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Manteniment Visita {0} ha de ser cancel·lat abans de cancel·lar aquesta comanda de vendes
 DocType: Material Request,Material Transfer,Transferència de material
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +56,Opening (Dr),Obertura (Dr)
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},Data i hora d'enviament ha de ser posterior a {0}
@@ -600,7 +575,6 @@
 DocType: Pricing Rule,Sales Manager,Gerent De Vendes
 apps/frappe/frappe/public/js/frappe/model/model.js +492,Rename,Canviar el nom
 DocType: Journal Entry,Write Off Amount,Anota la quantitat
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +52,Bending,Doblegat
 apps/frappe/frappe/core/page/user_permissions/user_permissions.js +246,Allow User,Permetre a l'usuari
 DocType: Journal Entry,Bill No,Factura Número
 DocType: Purchase Invoice,Quarterly,Trimestral
@@ -610,17 +584,16 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Please enter item details,Entra els detalls de l'article
 DocType: Purchase Receipt,Other Details,Altres detalls
 DocType: Account,Accounts,Comptes
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +67,Marketing,Màrqueting
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +65,Straight shearing,Esquila Recta
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +67,Marketing,Màrqueting
 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.,Per realitzar el seguiment de l'article en vendes i documents de compra en base als seus números de sèrie. Aquest és també pugui utilitzat per rastrejar informació sobre la garantia del producte.
 DocType: Purchase Receipt Item Supplied,Current Stock,Estoc actual
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +99,Rejected Warehouse is mandatory against regected item,Cal indicar el magatzem de no conformitats per la partida rebutjada
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +102,Rejected Warehouse is mandatory against regected item,Cal indicar el magatzem de no conformitats per la partida rebutjada
 DocType: Account,Expenses Included In Valuation,Despeses incloses en la valoració
 DocType: Employee,Provide email id registered in company,Provide email id registered in company
 DocType: Hub Settings,Seller City,Ciutat del venedor
 DocType: Email Digest,Next email will be sent on:,El següent correu electrònic s'enviarà a:
 DocType: Offer Letter Term,Offer Letter Term,Present Carta Termini
-apps/erpnext/erpnext/stock/doctype/item/item.py +492,Item has variants.,L&#39;article té variants.
+apps/erpnext/erpnext/stock/doctype/item/item.py +496,Item has variants.,L&#39;article té variants.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Article {0} no trobat
 DocType: Bin,Stock Value,Estoc Valor
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,Tipus Arbre
@@ -629,10 +602,9 @@
 DocType: Material Request Item,Quantity and Warehouse,Quantitat i Magatzem
 DocType: Sales Invoice,Commission Rate (%),Comissió (%)
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +172,"Against Voucher Type must be one of Sales Order, Sales Invoice or Journal Entry","Contra val Type ha de ser un comandes de venda, factura de venda o entrada de diari"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +139,Biomachining,Biomachining
 apps/erpnext/erpnext/setup/utils.py +89,Unable to find exchange rate,No es pot trobar el tipus de canvi
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +7,Aerospace,Aeroespacial
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +19,Welcome,Benvinguda
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +7,Aerospace,Aeroespacial
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +40,Welcome,Benvinguda
 DocType: Journal Entry,Credit Card Entry,Introducció d'una targeta de crèdit
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +18,Task Subject,Tasca Assumpte
 apps/erpnext/erpnext/config/stock.py +33,Goods received from Suppliers.,Productes rebuts de proveïdors.
@@ -655,19 +627,19 @@
 DocType: Employee,Cell Number,Número de cel·la
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Perdut
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +120,You can not enter current voucher in 'Against Journal Entry' column,Vostè no pot entrar bo actual a 'Contra entrada de diari' columna
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +25,Energy,Energia
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,Energia
 DocType: Opportunity,Opportunity From,Oportunitat De
 apps/erpnext/erpnext/config/hr.py +33,Monthly salary statement.,Nòmina mensual.
 DocType: Item Group,Website Specifications,Especificacions del lloc web
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +205,New Account,Nou Compte
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +21,{0}: From {0} of type {1},{0}: Des {0} de tipus {1}
-apps/erpnext/erpnext/controllers/buying_controller.py +283,Row {0}: Conversion Factor is mandatory,Fila {0}: el factor de conversió és obligatori
+apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,Fila {0}: el factor de conversió és obligatori
 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.,Entrades de Comptabilitat es poden fer en contra de nodes fulla. No es permeten els comentaris en contra dels grups.
 DocType: ToDo,High,Alt
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +361,Cannot deactivate or cancel BOM as it is linked with other BOMs,No es pot desactivar o cancel·lar BOM ja que està vinculat amb altres llistes de materials
 DocType: Opportunity,Maintenance,Manteniment
 DocType: User,Male,Home
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +182,Purchase Receipt number required for Item {0},Nombre de recepció de compra d'articles requerits per {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +183,Purchase Receipt number required for Item {0},Nombre de recepció de compra d'articles requerits per {0}
 DocType: Item Attribute Value,Item Attribute Value,Element Atribut Valor
 apps/erpnext/erpnext/config/crm.py +64,Sales campaigns.,Campanyes de venda.
 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.
@@ -715,10 +687,9 @@
 DocType: Address,Personal,Personal
 DocType: Expense Claim Detail,Expense Claim Type,Expense Claim Type
 DocType: Shopping Cart Settings,Default settings for Shopping Cart,Ajustos predeterminats del Carro de Compres
-apps/erpnext/erpnext/controllers/accounts_controller.py +324,"Journal Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Seient {0} està enllaçat amb l'Ordre {1}, comproveu si ha de tirar com avançament en aquesta factura."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +13,Biotechnology,Biotecnologia
+apps/erpnext/erpnext/controllers/accounts_controller.py +325,"Journal Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Seient {0} està enllaçat amb l'Ordre {1}, comproveu si ha de tirar com avançament en aquesta factura."
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +13,Biotechnology,Biotecnologia
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Office Maintenance Expenses,Despeses de manteniment d'oficines
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +53,Hemming,Hemming
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +66,Please enter Item first,Si us plau entra primer l'article
 DocType: Account,Liability,Responsabilitat
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +62,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Import sancionat no pot ser major que la reclamació Quantitat a la fila {0}.
@@ -731,10 +702,10 @@
 DocType: Company,Default Bank Account,Compte bancari per defecte
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +47,"To filter based on Party, select Party Type first","Per filtrar la base de la festa, seleccioneu Partit Escrigui primer"
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},&quot;Actualització de la &#39;no es pot comprovar perquè els articles no es lliuren a través de {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Nos,Ens
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Nos,Ens
 DocType: Item,Items with higher weightage will be shown higher,Els productes amb major coeficient de ponderació se li apareixen més alta
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Detall Conciliació Bancària
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +627,My Invoices,Els meus Factures
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +629,My Invoices,Els meus Factures
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,No s'ha trobat cap empeat
 DocType: Purchase Order,Stopped,Detingut
 DocType: Item,If subcontracted to a vendor,Si subcontractat a un proveïdor
@@ -753,35 +724,33 @@
 DocType: Features Setup,"To enable ""Point of Sale"" features",Per habilitar les característiques de &quot;Punt de Venda&quot;
 DocType: Bin,Moving Average Rate,Moving Average Rate
 DocType: Production Planning Tool,Select Items,Seleccionar elements
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,{0} against Bill {1} dated {2},{0} contra Bill {1} ​​{2} de data
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +328,{0} against Bill {1} dated {2},{0} contra Bill {1} ​​{2} de data
 DocType: Comment,Reference Name,Referència Nom
 DocType: Maintenance Visit,Completion Status,Estat de finalització
 DocType: Sales Invoice Item,Target Warehouse,Magatzem destí
 DocType: Item,Allow over delivery or receipt upto this percent,Permetre sobre el lliurament o recepció fins aquest percentatge
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +49,Expected Delivery Date cannot be before Sales Order Date,Data prevista de lliurament no pot ser abans de la data de l'ordres de venda
 DocType: Upload Attendance,Import Attendance,Importa Assistència
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +17,All Item Groups,Tots els grups d'articles
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +17,All Item Groups,Tots els grups d'articles
 DocType: Process Payroll,Activity Log,Registre d'activitat
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +30,Net Profit / Loss,Guany/Pèrdua neta
 apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,Compondre automàticament el missatge en la presentació de les transaccions.
 DocType: Production Order,Item To Manufacture,Article a fabricar
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +16,Permanent mold casting,Fosa de motlle permanent
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} Estat és {2}
 apps/erpnext/erpnext/config/learn.py +172,Purchase Order to Payment,Ordre de compra de Pagament
 DocType: Sales Order Item,Projected Qty,Quantitat projectada
 DocType: Sales Invoice,Payment Due Date,Data de pagament
 DocType: Newsletter,Newsletter Manager,Butlletí Administrador
-apps/erpnext/erpnext/stock/doctype/item/item.js +229,Item Variant {0} already exists with same attributes,Article Variant {0} ja existeix amb els mateixos atributs
+apps/erpnext/erpnext/stock/doctype/item/item.js +231,Item Variant {0} already exists with same attributes,Article Variant {0} ja existeix amb els mateixos atributs
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening',&#39;Obertura&#39;
 DocType: Notification Control,Delivery Note Message,Missatge de la Nota de lliurament
 DocType: Expense Claim,Expenses,Despeses
 DocType: Item Variant Attribute,Item Variant Attribute,Article Variant Atribut
 ,Purchase Receipt Trends,Purchase Receipt Trends
 DocType: Appraisal,Select template from which you want to get the Goals,Seleccioneu la plantilla de la qual vol aconseguir els Objectius de
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +77,Research & Development,Investigació i Desenvolupament
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Research & Development,Investigació i Desenvolupament
 ,Amount to Bill,La quantitat a Bill
 DocType: Company,Registration Details,Detalls de registre
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +75,Staking,Replanteig
 DocType: Item,Re-Order Qty,Re-Quantitat
 DocType: Leave Block List Date,Leave Block List Date,Deixa Llista de bloqueig Data
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +25,Scheduled to send to {0},Programat per enviar a {0}
@@ -792,18 +761,16 @@
 DocType: Sales Invoice Item,Stock Details,Estoc detalls
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Valor de Projecte
 apps/erpnext/erpnext/config/selling.py +304,Point-of-Sale,Punt de venda
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,Cannot carry forward {0},No es pot tirar endavant {0}
 apps/erpnext/erpnext/accounts/doctype/account/account.py +91,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","El saldo del compte ja està en crèdit, no tens permisos per establir-lo com 'El balanç ha de ser ""com ""Dèbit """
 DocType: Account,Balance must be,El balanç ha de ser
 DocType: Hub Settings,Publish Pricing,Publicar preus
 DocType: Notification Control,Expense Claim Rejected Message,Missatge de rebuig de petició de despeses
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +145,Nailing,Clavat
 ,Available Qty,Disponible Quantitat
 DocType: Purchase Taxes and Charges,On Previous Row Total,Total fila anterior
 DocType: Salary Slip,Working Days,Dies feiners
 DocType: Serial No,Incoming Rate,Incoming Rate
 DocType: Packing Slip,Gross Weight,Pes Brut
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +410,The name of your company for which you are setting up this system.,El nom de la teva empresa per a la qual està creant aquest sistema.
+apps/erpnext/erpnext/public/js/setup_wizard.js +158,The name of your company for which you are setting up this system.,El nom de la teva empresa per a la qual està creant aquest sistema.
 DocType: HR Settings,Include holidays in Total no. of Working Days,Inclou vacances en el número total de dies laborables
 DocType: Job Applicant,Hold,Mantenir
 DocType: Employee,Date of Joining,Data d'ingrés
@@ -813,7 +780,6 @@
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +3,View Subscribers,Veure Subscriptors
 DocType: Purchase Invoice Item,Purchase Receipt,Albarà de compra
 ,Received Items To Be Billed,Articles rebuts per a facturar
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +114,Abrasive blasting,Sorrejat abrasiu
 DocType: Employee,Ms,Sra
 apps/erpnext/erpnext/config/accounts.py +148,Currency exchange rate master.,Tipus de canvi principal.
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +253,Unable to find Time Slot in the next {0} days for Operation {1},Incapaç de trobar la ranura de temps en els pròxims {0} dies per a l&#39;operació {1}
@@ -825,7 +791,7 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +209,Serial No {0} does not belong to Item {1},El número de Sèrie {0} no pertany a l'article {1}
 DocType: Purchase Receipt Item Supplied,Required Qty,Quantitat necessària
 DocType: Bank Reconciliation,Total Amount,Quantitat total
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +32,Internet Publishing,Publicant a Internet
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,Publicant a Internet
 DocType: Production Planning Tool,Production Orders,Ordres de Producció
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +35,Balance Value,Valor Saldo
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,Llista de preus de venda
@@ -836,7 +802,7 @@
 DocType: Supplier,Default Payable Accounts,Comptes per Pagar per defecte
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,L'Empleat {0} no està actiu o no existeix
 DocType: Features Setup,Item Barcode,Codi de barres d'article
-apps/erpnext/erpnext/stock/doctype/item/item.py +487,Item Variants {0} updated,Article Variants {0} actualitza
+apps/erpnext/erpnext/stock/doctype/item/item.py +491,Item Variants {0} updated,Article Variants {0} actualitza
 DocType: Quality Inspection Reading,Reading 6,Lectura 6
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Factura de compra anticipada
 DocType: Address,Shop,Botiga
@@ -845,7 +811,7 @@
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,El compte bancs/efectiu predeterminat s'actualitzarà automàticament a les factures de TPV quan es selecciona aquest.
 DocType: Employee,Permanent Address Is,Adreça permanent
 DocType: Production Order Operation,Operation completed for how many finished goods?,L'operació es va realitzar per la quantitat de productes acabats?
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +491,The Brand,La Marca
+apps/erpnext/erpnext/public/js/setup_wizard.js +237,The Brand,La Marca
 apps/erpnext/erpnext/controllers/status_updater.py +163,Allowance for over-{0} crossed for Item {1}.,Provisió per superar {0} creuat per Punt {1}.
 DocType: Employee,Exit Interview Details,Detalls de l'entrevista final
 DocType: Item,Is Purchase Item,És Compra d'articles
@@ -865,16 +831,16 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Indirect Income,Ingressos Indirectes
 DocType: Payment Tool,Set Payment Amount = Outstanding Amount,Establir Import Pagament = Suma Pendent
 DocType: Contact Us Settings,Address Line 1,Adreça Línia 1
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Variance,Desacord
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +392,Company Name,Nom de l'Empresa
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +53,Variance,Desacord
+,Company Name,Nom de l'Empresa
 DocType: SMS Center,Total Message(s),Total Missatge(s)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +515,Select Item for Transfer,Seleccionar element de Transferència
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +538,Select Item for Transfer,Seleccionar element de Transferència
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,Veure una llista de tots els vídeos d&#39;ajuda
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,Seleccioneu cap compte del banc on xec va ser dipositat.
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,Permetre a l'usuari editar la Llista de Preus de Tarifa en transaccions
 DocType: Pricing Rule,Max Qty,Quantitat màxima
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +106,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Fila {0}: El pagament contra Vendes / Ordre de Compra sempre ha d'estar marcat com a pagamet anticipat (bestreta)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +16,Chemical,Químic
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,Químic
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +693,All items have already been transferred for this Production Order.,Tots els articles ja han estat transferits per aquesta ordre de producció.
 DocType: Process Payroll,Select Payroll Year and Month,Seleccioneu nòmina Any i Mes
 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""",Anar al grup apropiat (generalment Aplicació de Fons&gt; Actiu Circulant&gt; Comptes Bancàries i crear un nou compte (fent clic a Afegeix nen) de tipus &quot;Banc&quot;
@@ -885,12 +851,12 @@
 DocType: Item,Inspection Criteria,Criteris d'Inspecció
 apps/erpnext/erpnext/config/accounts.py +101,Tree of finanial Cost Centers.,Arbre de Centres de Cost finanial.
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,Transferit
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +492,Upload your letter head and logo. (you can edit them later).,Puja el teu cap lletra i logotip. (Pots editar més tard).
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +156,White,Blanc
+apps/erpnext/erpnext/public/js/setup_wizard.js +238,Upload your letter head and logo. (you can edit them later).,Puja el teu cap lletra i logotip. (Pots editar més tard).
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,White,Blanc
 DocType: SMS Center,All Lead (Open),Tots els clients potencials (Obert)
 DocType: Purchase Invoice,Get Advances Paid,Obtenir bestretes pagades
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +362,Attach Your Picture,Adjunta la teva imatge
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Make ,Fer 
+apps/erpnext/erpnext/public/js/setup_wizard.js +112,Attach Your Picture,Adjunta la teva imatge
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +540,Make ,Fer 
 DocType: Journal Entry,Total Amount in Words,Suma total en Paraules
 DocType: Workflow State,Stop,Aturi
 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.,"S'ha produït un error. Una raó probable podria ser que no ha guardat el formulari. Si us plau, poseu-vos en contacte amb support@erpnext.com si el problema persisteix."
@@ -899,14 +865,13 @@
 DocType: Lead,Next Contact Date,Data del següent contacte
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,Quantitat d'obertura
 DocType: Holiday List,Holiday List Name,Nom de la Llista de vacances
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +168,Stock Options,Opcions sobre accions
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +168,Stock Options,Opcions sobre accions
 DocType: Journal Entry Account,Expense Claim,Compte de despeses
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +181,Qty for {0},Quantitat de {0}
 DocType: Leave Application,Leave Application,Deixar Aplicació
 apps/erpnext/erpnext/config/hr.py +77,Leave Allocation Tool,Deixa Eina d'Assignació
 DocType: Leave Block List,Leave Block List Dates,Deixa llista de blocs dates
 DocType: Company,If Monthly Budget Exceeded (for expense account),Si Pressupost Mensual excedit (per compte de despeses)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +56,Trimming,Guarnició
 DocType: Workstation,Net Hour Rate,Hora taxa neta
 DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,Landed Cost rebut de compra
 DocType: Company,Default Terms,Termes predeterminats
@@ -914,10 +879,9 @@
 DocType: POS Profile,Cash/Bank Account,Compte de Caixa / Banc
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,Removed items with no change in quantity or value.,Elements retirats sense canvi en la quantitat o el valor.
 DocType: Delivery Note,Delivery To,Lliurar a
-apps/erpnext/erpnext/stock/doctype/item/item.py +509,Attribute table is mandatory,Taula d&#39;atributs és obligatori
+apps/erpnext/erpnext/stock/doctype/item/item.py +513,Attribute table is mandatory,Taula d&#39;atributs és obligatori
 DocType: Production Planning Tool,Get Sales Orders,Rep ordres de venda
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} no pot ser negatiu
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +103,Filing,Presentació
 apps/erpnext/erpnext/templates/form_grid/item_grid.html +72,Discount,Descompte
 DocType: Features Setup,Purchase Discounts,Compra Descomptes
 DocType: Workstation,Wages,Salari
@@ -934,6 +898,7 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +112,You are the Expense Approver for this record. Please Update the 'Status' and Save,"Ets l'aprovador de despeses per a aquest registre. Actualitza l '""Estat"" i Desa"
 DocType: Serial No,Creation Document No,Creació document nº
 DocType: Issue,Issue,Incidència
+apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account does not match with Company,Compte no coincideix amb la Companyia
 apps/erpnext/erpnext/config/stock.py +136,"Attributes for Item Variants. e.g Size, Color etc.","Atributs per Punt variants. per exemple, mida, color, etc."
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +39,WIP Warehouse,WIP Magatzem
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +194,Serial No {0} is under maintenance contract upto {1},Serial No {0} està sota contracte de manteniment fins {1}
@@ -942,7 +907,7 @@
 DocType: Tax Rule,Shipping State,Estat de l&#39;enviament
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,L'article ha de ser afegit usant 'Obtenir elements de rebuts de compra' botó
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,Despeses de venda
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Buying,Compra Standard
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +120,Standard Buying,Compra Standard
 DocType: GL Entry,Against,Contra
 DocType: Item,Default Selling Cost Center,Per defecte Centre de Cost de Venda
 DocType: Sales Partner,Implementation Partner,Soci d'Aplicació
@@ -963,29 +928,29 @@
 DocType: Time Log Batch,updated via Time Logs,actualitzada a través dels registres de temps
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,Edat mitjana
 DocType: Opportunity,Your sales person who will contact the customer in future,La seva persona de vendes que es comunicarà amb el client en el futur
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +588,List a few of your suppliers. They could be organizations or individuals.,Enumera alguns de les teves proveïdors. Poden ser les organitzacions o individuals.
+apps/erpnext/erpnext/public/js/setup_wizard.js +326,List a few of your suppliers. They could be organizations or individuals.,Enumera alguns de les teves proveïdors. Poden ser les organitzacions o individuals.
 DocType: Company,Default Currency,Moneda per defecte
 DocType: Contact,Enter designation of this Contact,Introduïu designació d'aquest contacte
 DocType: Contact Us Settings,Address,Adreça
 DocType: Expense Claim,From Employee,D'Empleat
-apps/erpnext/erpnext/controllers/accounts_controller.py +338,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Advertència: El sistema no comprovarà sobrefacturació si la quantitat de l'article {0} a {1} és zero
+apps/erpnext/erpnext/controllers/accounts_controller.py +339,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Advertència: El sistema no comprovarà sobrefacturació si la quantitat de l'article {0} a {1} és zero
 DocType: Journal Entry,Make Difference Entry,Feu Entrada Diferència
 DocType: Upload Attendance,Attendance From Date,Assistència des de data
 DocType: Appraisal Template Goal,Key Performance Area,Àrea Clau d'Acompliment
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +54,Transportation,Transports
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +54,Transportation,Transports
 apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +67, and year: ,i l'any: 
 DocType: Email Digest,Annual Expense,Despesa anual
 DocType: SMS Center,Total Characters,Personatges totals
-apps/erpnext/erpnext/controllers/buying_controller.py +139,Please select BOM in BOM field for Item {0},Seleccioneu la llista de materials en el camp de llista de materials per al punt {0}
+apps/erpnext/erpnext/controllers/buying_controller.py +130,Please select BOM in BOM field for Item {0},Seleccioneu la llista de materials en el camp de llista de materials per al punt {0}
 DocType: C-Form Invoice Detail,C-Form Invoice Detail,C-Form Invoice Detail
 DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,Factura de Pagament de Reconciliació
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +32,Contribution %,Contribució%
 DocType: Item,website page link,website page link
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +192,Let's prepare the system for first use.,Anem a preparar el sistema per al primer ús.
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +242,Let's prepare the system for first use.,Anem a preparar el sistema per al primer ús.
 DocType: Company,Company registration numbers for your reference. Tax numbers etc.,"Els números de registre de l'empresa per la seva referència. Nombres d'impostos, etc."
 DocType: Sales Partner,Distributor,Distribuïdor
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Regles d'enviament de la cistella de lacompra
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +214,Production Order {0} must be cancelled before cancelling this Sales Order,Ordre de Producció {0} ha de ser cancel·lat abans de cancel·lar aquesta comanda de vendes
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +209,Production Order {0} must be cancelled before cancelling this Sales Order,Ordre de Producció {0} ha de ser cancel·lat abans de cancel·lar aquesta comanda de vendes
 ,Ordered Items To Be Billed,Els articles comandes a facturar
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +24,From Range has to be less than To Range,De Gamma ha de ser menor que en la nostra gamma
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +21,Select Time Logs and Submit to create a new Sales Invoice.,Selecciona Registres de temps i Presenta per a crear una nova factura de venda.
@@ -1005,14 +970,13 @@
 DocType: Sales Invoice Advance,Sales Invoice Advance,Factura proforma
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +398,Nothing to request,Res per sol·licitar
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date',La 'Data d'Inici Real' no pot ser major que la 'Data de Finalització Real'
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +75,Management,Administració
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +75,Management,Administració
 apps/erpnext/erpnext/config/projects.py +33,Types of activities for Time Sheets,Tipus d'activitats per a les fitxes de Temps
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +14,Investment casting,Fosa de precisió
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +51,Either debit or credit amount is required for {0},Es requereix ja sigui quantitat de dèbit o crèdit per {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""","Això s'afegeix al Codi de l'article de la variant. Per exemple, si la seva abreviatura és ""SM"", i el codi de l'article és ""samarreta"", el codi de l'article de la variant serà ""SAMARRETA-SM"""
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,El sou net (en paraules) serà visible un cop que es guardi la nòmina.
 apps/frappe/frappe/core/doctype/user/user_list.js +12,Active,Actiu
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +154,Blue,Blau
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +154,Blue,Blau
 DocType: Purchase Invoice,Is Return,És la tornada
 DocType: Price List Country,Price List Country,Preu de llista País
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +123,Further nodes can be only created under 'Group' type nodes,Només es poden crear més nodes amb el tipus 'Grup'
@@ -1022,18 +986,16 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +22,POS Profile {0} already created for user: {1} and company {2},POS Perfil {0} ja creat per a l&#39;usuari: {1} i companyia {2}
 DocType: Purchase Order Item,UOM Conversion Factor,UOM factor de conversió
 DocType: Stock Settings,Default Item Group,Grup d'articles predeterminat
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +156,Laminated object manufacturing,Fabricació d&#39;objectes laminat
 apps/erpnext/erpnext/config/buying.py +13,Supplier database.,Base de dades de proveïdors.
 DocType: Account,Balance Sheet,Balanç
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +561,Cost Center For Item with Item Code ',Centre de cost per l'article amb Codi d'article '
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +45,Stretch forming,Formant Stretch
 DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,La seva persona de vendes es posarà un avís en aquesta data per posar-se en contacte amb el client
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +210,"Further accounts can be made under Groups, but entries can be made against non-Groups","Altres comptes es poden fer en grups, però les entrades es poden fer contra els no Grups"
 apps/erpnext/erpnext/config/hr.py +125,Tax and other salary deductions.,Impostos i altres deduccions salarials.
 DocType: Lead,Lead,Client potencial
 DocType: Email Digest,Payables,Comptes per Pagar
 DocType: Account,Warehouse,Magatzem
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +90,Row #{0}: Rejected Qty can not be entered in Purchase Return,Fila # {0}: No aprovat Quantitat no es pot introduir en la Compra de Retorn
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +93,Row #{0}: Rejected Qty can not be entered in Purchase Return,Fila # {0}: No aprovat Quantitat no es pot introduir en la Compra de Retorn
 ,Purchase Order Items To Be Billed,Ordre de Compra articles a facturar
 DocType: Purchase Invoice Item,Net Rate,Taxa neta
 DocType: Purchase Invoice Item,Purchase Invoice Item,Compra Factura article
@@ -1048,13 +1010,13 @@
 DocType: Global Defaults,Current Fiscal Year,Any fiscal actual
 DocType: Global Defaults,Disable Rounded Total,Desactivar total arrodonit
 DocType: Lead,Call,Truca
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +384,'Entries' cannot be empty,'Entrades' no pot estar buit
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +386,'Entries' cannot be empty,'Entrades' no pot estar buit
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},Duplicar fila {0} amb el mateix {1}
 ,Trial Balance,Balanç provisional
 apps/erpnext/erpnext/config/hr.py +205,Setting up Employees,Configuració d&#39;Empleats
 apps/erpnext/erpnext/public/js/feature_setup.js +220,"Grid ""","Grid """
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +150,Please select prefix first,Seleccioneu el prefix primer
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +138,Research,Recerca
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +138,Research,Recerca
 DocType: Maintenance Visit Purpose,Work Done,Treballs Realitzats
 apps/erpnext/erpnext/controllers/item_variant.py +25,Please specify at least one attribute in the Attributes table,"Si us plau, especifiqui almenys un atribut a la taula d&#39;atributs"
 DocType: Contact,User ID,ID d'usuari
@@ -1062,10 +1024,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +57,View Ledger,Veure Ledger
 DocType: File,Lft,LFT
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Earliest
-apps/erpnext/erpnext/stock/doctype/item/item.py +394,"An Item Group exists with same name, please change the item name or rename the item group","Hi ha un grup d'articles amb el mateix nom, si us plau, canvieu el nom de l'article o del grup d'articles"
+apps/erpnext/erpnext/stock/doctype/item/item.py +398,"An Item Group exists with same name, please change the item name or rename the item group","Hi ha un grup d'articles amb el mateix nom, si us plau, canvieu el nom de l'article o del grup d'articles"
 DocType: Communication,Delivery Status,Estat de l'enviament
 DocType: Production Order,Manufacture against Sales Order,Fabricació contra ordre de vendes
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +517,Rest Of The World,Resta del món
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +455,Rest Of The World,Resta del món
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,L'article {0} no pot tenir per lots
 ,Budget Variance Report,Pressupost Variància Reportar
 DocType: Salary Slip,Gross Pay,Sou brut
@@ -1076,13 +1038,11 @@
 DocType: BOM Item,Item Description,Descripció de l'Article
 DocType: Payment Tool,Payment Mode,Mètode de pagament
 DocType: Purchase Invoice,Is Recurring,És recurrent
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +154,Direct metal laser sintering,De metall sinteritzat per làser directe
 DocType: Purchase Order,Supplied Items,Articles subministrats
 DocType: Production Order,Qty To Manufacture,Quantitat a fabricar
 DocType: Buying Settings,Maintain same rate throughout purchase cycle,Mantenir mateix ritme durant tot el cicle de compra
 DocType: Opportunity Item,Opportunity Item,Opportunity Item
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +61,Temporary Opening,Obertura Temporal
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +41,Cryorolling,Cryorolling
 ,Employee Leave Balance,Balanç d'absències d'empleat
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +128,Balance for Account {0} must always be {1},Balanç per compte {0} ha de ser sempre {1}
 DocType: Address,Address Type,Tipus d'adreça
@@ -1098,23 +1058,23 @@
 DocType: Journal Entry,Get Outstanding Invoices,Rep les factures pendents
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,Vendes Sol·licitar {0} no és vàlid
 apps/erpnext/erpnext/setup/doctype/company/company.py +172,"Sorry, companies cannot be merged","Ho sentim, les empreses no poden fusionar-"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +145,Small,Petit
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Small,Petit
 DocType: Employee,Employee Number,Número d'empleat
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},Cas No (s) ja en ús. Intenta Cas n {0}
 ,Invoiced Amount (Exculsive Tax),Quantitat facturada (Impost exculsive)
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,Article 2
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +59,Account head {0} created,Compte cap {0} creat
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +153,Green,Verd
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Green,Verd
 DocType: Item,Auto re-order,Acte reordenar
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +57,Total Achieved,Total Aconseguit
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +59,Total Achieved,Total Aconseguit
 DocType: Employee,Place of Issue,Lloc de la incidència
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +59,Contract,Contracte
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Contract,Contracte
 DocType: Report,Disabled,Deshabilitat
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +490,UOM coversion factor required for UOM: {0} in Item: {1},Es necessita un factor de coversió per la UDM: {0} per l'article: {1}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +83,Indirect Expenses,Despeses Indirectes
 apps/erpnext/erpnext/controllers/selling_controller.py +163,Row {0}: Qty is mandatory,Fila {0}: Quantitat és obligatori
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +8,Agriculture,Agricultura
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +611,Your Products or Services,Els Productes o Serveis de la teva companyia
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,Agricultura
+apps/erpnext/erpnext/public/js/setup_wizard.js +347,Your Products or Services,Els Productes o Serveis de la teva companyia
 DocType: Mode of Payment,Mode of Payment,Forma de pagament
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,This is a root item group and cannot be edited.
 DocType: Journal Entry Account,Purchase Order,Ordre De Compra
@@ -1126,7 +1086,7 @@
 DocType: Serial No,Serial No Details,Serial No Detalls
 DocType: Purchase Invoice Item,Item Tax Rate,Element Tipus impositiu
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +113,"For {0}, only credit accounts can be linked against another debit entry","Per {0}, només els comptes de crèdit es poden vincular amb un altre seient de dèbit"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Delivery Note {0} is not submitted,La Nota de lliurament {0} no està presentada
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +470,Delivery Note {0} is not submitted,La Nota de lliurament {0} no està presentada
 apps/erpnext/erpnext/stock/get_item_details.py +136,Item {0} must be a Sub-contracted Item,Article {0} ha de ser un subcontractada article
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,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.","Regla preus es selecciona per primera basada en 'Aplicar On' camp, que pot ser d'article, grup d'articles o Marca."
@@ -1136,7 +1096,7 @@
 DocType: Appraisal Goal,Goal,Meta
 DocType: Sales Invoice Item,Edit Description,Descripció
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +318,Expected Delivery Date is lesser than Planned Start Date.,Data prevista de lliurament és menor que la data d&#39;inici prevista.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +579,For Supplier,Per Proveïdor
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +602,For Supplier,Per Proveïdor
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,Configurar el Tipus de compte ajuda en la selecció d'aquest compte en les transaccions.
 DocType: Purchase Invoice,Grand Total (Company Currency),Total (En la moneda de la companyia)
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,Sortint total
@@ -1162,10 +1122,10 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +74,"Total {0} for all items is zero, may you should change 'Distribute Charges Based On'","Total d&#39;{0} per a tots els elements és zero, pot ser que vostè ha de canviar &#39;Distribuir els càrrecs basats en&#39;"
 DocType: Purchase Invoice,Taxes and Charges Calculation,Impostos i Càrrecs Càlcul
 DocType: BOM Operation,Workstation,Lloc de treball
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +112,Hardware,Maquinari
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +112,Hardware,Maquinari
 DocType: Attendance,HR Manager,Gerent de Recursos Humans
 apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,Seleccioneu una Empresa
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +50,Privilege Leave,Privilege Leave
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +50,Privilege Leave,Privilege Leave
 DocType: Purchase Invoice,Supplier Invoice Date,Data Factura Proveïdor
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +79,You need to enable Shopping Cart,Has d'habilitar el carro de la compra
 apps/frappe/frappe/public/js/frappe/form/grid_body.html +6,No Data,No hi ha dades
@@ -1178,7 +1138,7 @@
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +81,Overlapping conditions found between:,La superposició de les condicions trobades entre:
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +168,Against Journal Entry {0} is already adjusted against some other voucher,Contra Diari entrada {0} ja s'ajusta contra algun altre bo
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +68,Total Order Value,Valor Total de la comanda
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +38,Food,Menjar
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +38,Food,Menjar
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Rang 3 Envelliment
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +139,You can make a time log only against a submitted production order,Vostè pot fer un registre de temps només contra una ordre de producció presentat
 DocType: Maintenance Schedule Item,No of Visits,Número de Visites
@@ -1198,6 +1158,7 @@
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,View Offer Letter,Veure oferta Carta
 DocType: Communication,Communication,Comunicació
 DocType: Item,Is Service Item,És un servei
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +81,Application period cannot be outside leave allocation period,Període d&#39;aplicació no pot ser període d&#39;assignació llicència fos
 DocType: Activity Cost,Projects,Projectes
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +31,Please select Fiscal Year,Seleccioneu l'any fiscal
 apps/erpnext/erpnext/controllers/buying_controller.py +23,From {0} | {1} {2},Des {0} | {1} {2}
@@ -1216,7 +1177,7 @@
 DocType: Item,Maintain Stock,Mantenir Stock
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +213,Stock Entries already created for Production Order ,Imatges de entrades ja creades per Ordre de Producció 
 DocType: Leave Control Panel,Leave blank if considered for all designations,Deixar en blanc si es considera per a totes les designacions
-apps/erpnext/erpnext/controllers/accounts_controller.py +499,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Càrrec del tipus 'real' a la fila {0} no pot ser inclòs en la partida Rate
+apps/erpnext/erpnext/controllers/accounts_controller.py +500,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Càrrec del tipus 'real' a la fila {0} no pot ser inclòs en la partida Rate
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,Max: {0},Max: {0}
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +16,From Datetime,A partir de data i hora
 DocType: Email Digest,For Company,Per a l'empresa
@@ -1226,7 +1187,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +50,Chart of Accounts,Pla General de Comptabilitat
 DocType: Material Request,Terms and Conditions Content,Contingut de Termes i Condicions
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +471,cannot be greater than 100,no pot ser major que 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +546,Item {0} is not a stock Item,Article {0} no és un article d'estoc
+apps/erpnext/erpnext/stock/doctype/item/item.py +550,Item {0} is not a stock Item,Article {0} no és un article d'estoc
 DocType: Maintenance Visit,Unscheduled,No programada
 DocType: Employee,Owned,Propietat de
 DocType: Salary Slip Deduction,Depends on Leave Without Pay,Depèn de la llicència sense sou
@@ -1240,31 +1201,29 @@
 DocType: HR Settings,Employee Settings,Configuració dels empleats
 ,Batch-Wise Balance History,Batch-Wise Balance History
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +72,To Do List,Per fer la llista
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +63,Apprentice,Aprenent
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Apprentice,Aprenent
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +99,Negative Quantity is not allowed,No s'admenten quantitats negatives
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
 Used for Taxes and Charges","Impost taula de detalls descarregui de mestre d'articles com una cadena i emmagatzemada en aquest camp.
  S'utilitza per a les taxes i càrrecs"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +61,Lancing,Lancing
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +151,Employee cannot report to himself.,Empleat no pot informar-se a si mateix.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Si el compte està bloquejat, només es permeten entrades alguns usuaris."
 DocType: Email Digest,Bank Balance,Balanç de Banc
-apps/erpnext/erpnext/controllers/accounts_controller.py +435,Accounting Entry for {0}: {1} can only be made in currency: {2},Entrada de Comptabilitat per a {0}: {1} només pot fer-se en moneda: {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +436,Accounting Entry for {0}: {1} can only be made in currency: {2},Entrada de Comptabilitat per a {0}: {1} només pot fer-se en moneda: {2}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +38,No active Salary Structure found for employee {0} and the month,No Estructura Salarial actiu que es troba per a l&#39;empleat {0} i el mes
 DocType: Job Opening,"Job profile, qualifications required etc.","Perfil del lloc, formació necessària, etc."
 DocType: Journal Entry Account,Account Balance,Saldo del compte
 apps/erpnext/erpnext/config/accounts.py +112,Tax Rule for transactions.,Regla fiscal per a les transaccions.
 DocType: Rename Tool,Type of document to rename.,Tipus de document per canviar el nom.
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +630,We buy this Item,Comprem aquest article
+apps/erpnext/erpnext/public/js/setup_wizard.js +366,We buy this Item,Comprem aquest article
 DocType: Address,Billing,Facturació
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +77,Flanging,Flanger
 DocType: Bulk Email,Not Sent,No Enviat
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +73,Explosive forming,Explosiu formació
 DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),Total Impostos i càrrecs (En la moneda de la Companyia)
 DocType: Shipping Rule,Shipping Account,Compte d'Enviaments
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +43,Scheduled to send to {0} recipients,Programat per enviar a {0} destinataris
 DocType: Quality Inspection,Readings,Lectures
 DocType: Stock Entry,Total Additional Costs,Total de despeses addicionals
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Sub Assemblies,Sub Assemblies
+apps/erpnext/erpnext/public/js/setup_wizard.js +359,Sub Assemblies,Sub Assemblies
 DocType: Shipping Rule Condition,To Value,Per Valor
 DocType: Supplier,Stock Manager,Gerent
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +143,Source warehouse is mandatory for row {0},Magatzem d'origen obligatori per a la fila {0}
@@ -1274,44 +1233,42 @@
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Error en importar!
 apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,Sense direcció no afegeix encara.
 DocType: Workstation Working Hour,Workstation Working Hour,Estació de treball Hores de Treball
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +83,Analyst,Analista
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +202,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Fila {0}: quantitat assignada {1} ha de ser menor o igual a l'import JV {2}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Analyst,Analista
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +149,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Fila {0}: quantitat assignada {1} ha de ser menor o igual a l'import JV {2}
 DocType: Item,Inventory,Inventari
 DocType: Features Setup,"To enable ""Point of Sale"" view",Per habilitar &quot;Punt de Venda&quot; vista
 apps/erpnext/erpnext/public/js/pos/pos.js +402,Payment cannot be made for empty cart,El pagament no es pot fer per al carro buit
 DocType: Item,Sales Details,Detalls de venda
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +149,Pinning,Fixació
 DocType: Opportunity,With Items,Amb articles
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,En Quantitat
 DocType: Notification Control,Expense Claim Rejected,Compte de despeses Rebutjat
 DocType: Sales Invoice,"The date on which next invoice will be generated. It is generated on submit.
 ",La data en què es generarà propera factura. Es genera en enviar.
 DocType: Item Attribute,Item Attribute,Element Atribut
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +105,Government,Govern
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Government,Govern
 apps/erpnext/erpnext/config/stock.py +268,Item Variants,Variants de l&#39;article
 DocType: Company,Services,Serveis
 apps/erpnext/erpnext/accounts/report/financial_statements.py +147,Total ({0}),Total ({0})
 DocType: Cost Center,Parent Cost Center,Centre de Cost de Pares
 DocType: Sales Invoice,Source,Font
 DocType: Leave Type,Is Leave Without Pay,Es llicencia sense sou
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +186,No records found in the Payment table,No hi ha registres a la taula de Pagaments
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +405,Financial Year Start Date,Data d'Inici de l'Exercici fiscal
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +133,No records found in the Payment table,No hi ha registres a la taula de Pagaments
+apps/erpnext/erpnext/public/js/setup_wizard.js +153,Financial Year Start Date,Data d'Inici de l'Exercici fiscal
 DocType: Employee External Work History,Total Experience,Experiència total
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +100,Countersinking,Avellanat
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +271,Packing Slip(s) cancelled,Fulla(s) d'embalatge cancel·lat
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +276,Packing Slip(s) cancelled,Fulla(s) d'embalatge cancel·lat
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,Freight and Forwarding Charges
 DocType: Material Request Item,Sales Order No,Ordre de Venda No
 DocType: Item Group,Item Group Name,Nom del Grup d'Articles
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +50,Taken,Pres
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,Pres
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +66,Transfer Materials for Manufacture,Materials de transferència per Fabricació
 DocType: Pricing Rule,For Price List,Per Preu
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +27,Executive Search,Cerca d'Executius
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,Cerca d'Executius
 apps/erpnext/erpnext/stock/stock_ledger.py +405,"Purchase rate for item: {0} not found, which is required to book accounting entry (expense). Please mention item price against a buying price list.","Tarifa de compra per l'article: {0} no es troba, el que es requereix per reservar l'entrada comptable (despeses). Si us plau, esmentar el preu de l'article contra una llista de preus de compra."
 DocType: Maintenance Schedule,Schedules,Horaris
 DocType: Purchase Invoice Item,Net Amount,Import Net
 DocType: Purchase Order Item Supplied,BOM Detail No,Detall del BOM No
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),Import addicional de descompte (moneda Company)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +537,Error: {0} > {1},Error: {0}> {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +541,Error: {0} > {1},Error: {0}> {1}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,"Si us plau, creu un nou compte de Pla de Comptes."
 DocType: Maintenance Visit,Maintenance Visit,Manteniment Visita
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer > Customer Group > Territory,Client> Grup de Clients> Territori
@@ -1322,7 +1279,6 @@
 DocType: Event,Tuesday,Dimarts
 DocType: Leave Block List,Block Holidays on important days.,Vacances de Bloc en dies importants.
 ,Accounts Receivable Summary,Comptes per Cobrar Resum
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +43,Leaves for type {0} already allocated for Employee {1} for period {2} - {3},Fulles per al tipus {0} ja assignat per Empleat {1} per al període {2} - {3}
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +187,Please set User ID field in an Employee record to set Employee Role,"Si us plau, estableix camp ID d'usuari en un registre d'empleat per establir Rol d'empleat"
 DocType: UOM,UOM Name,Nom UDM
 DocType: Top Bar Item,Target,Objectiu
@@ -1334,15 +1290,14 @@
 DocType: ToDo,Due Date,Data De Venciment
 DocType: Sales Invoice Item,Brand Name,Marca
 DocType: Purchase Receipt,Transporter Details,Detalls Transporter
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Box,Caixa
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +389,The Organization,L'Organització
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Box,Caixa
+apps/erpnext/erpnext/public/js/setup_wizard.js +137,The Organization,L'Organització
 DocType: Monthly Distribution,Monthly Distribution,Distribució Mensual
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,"La llista de receptors és buida. Si us plau, crea la Llista de receptors"
 DocType: Production Plan Sales Order,Production Plan Sales Order,Pla de Producció d'ordres de venda
 DocType: Sales Partner,Sales Partner Target,Sales Partner Target
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},Entrada de Comptabilitat per a {0} només es pot fer en moneda: {1}
 DocType: Pricing Rule,Pricing Rule,Regla preus
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +58,Notching,Osques
 apps/erpnext/erpnext/config/learn.py +167,Material Request to Purchase Order,Sol·licitud de materials d&#39;Ordre de Compra
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +74,Row # {0}: Returned Item {1} does not exists in {2} {3},Fila # {0}: L&#39;article tornat {1} no existeix en {2} {3}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,Comptes bancaris
@@ -1359,20 +1314,19 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Amounts not reflected in bank,Les quantitats no es reflecteixen en el banc
 DocType: Quality Inspection Reading,Reading 4,Reading 4
 apps/erpnext/erpnext/config/hr.py +23,Claims for company expense.,Les reclamacions per compte de l'empresa.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +8,Centrifugal casting,La fosa centrífuga
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +119,Magnetic field-assisted finishing,Acabat assistida per camp magnètic
 DocType: Company,Default Holiday List,Per defecte Llista de vacances
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +165,Stock Liabilities,Stock Liabilities
 DocType: Purchase Receipt,Supplier Warehouse,Magatzem Proveïdor
 DocType: Opportunity,Contact Mobile No,Contacte Mòbil No
 DocType: Production Planning Tool,Select Sales Orders,Seleccionar comandes de client
 ,Material Requests for which Supplier Quotations are not created,Les sol·licituds de material per als quals no es creen Ofertes de Proveïdor
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +117,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,El dia (s) en el qual està sol·licitant la llicència són els dies festius. Vostè no necessita sol·licitar l&#39;excedència.
 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.,Per realitzar un seguiment d'elements mitjançant codi de barres. Vostè serà capaç d'entrar en els elements de la nota de lliurament i la factura de venda mitjançant l'escaneig de codi de barres de l'article.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +477,Mark as Delivered,Marcar com Lliurat
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +497,Mark as Delivered,Marcar com Lliurat
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +34,Make Quotation,Fer Cita
 DocType: Dependent Task,Dependent Task,Tasca dependent
-apps/erpnext/erpnext/stock/doctype/item/item.py +306,Conversion factor for default Unit of Measure must be 1 in row {0},Factor de conversió per a la unitat de mesura per defecte ha de ser d'1 a la fila {0}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,Leave of type {0} cannot be longer than {1},Una absència del tipus {0} no pot ser de més de {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +310,Conversion factor for default Unit of Measure must be 1 in row {0},Factor de conversió per a la unitat de mesura per defecte ha de ser d'1 a la fila {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +155,Leave of type {0} cannot be longer than {1},Una absència del tipus {0} no pot ser de més de {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Intenta operacions per a la planificació de X dies d&#39;antelació.
 DocType: HR Settings,Stop Birthday Reminders,Aturar recordatoris d'aniversari
 DocType: SMS Center,Receiver List,Llista de receptors
@@ -1380,15 +1334,14 @@
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Quantitat consumida
 apps/erpnext/erpnext/public/js/pos/pos.js +491,{0} View,{0} Veure
 DocType: Salary Structure Deduction,Salary Structure Deduction,Salary Structure Deduction
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +158,Selective laser sintering,Sinterització selectiva per làser
-apps/erpnext/erpnext/stock/doctype/item/item.py +301,Unit of Measure {0} has been entered more than once in Conversion Factor Table,La unitat de mesura {0} s'ha introduït més d'una vegada a la taula de valors de conversió
+apps/erpnext/erpnext/stock/doctype/item/item.py +305,Unit of Measure {0} has been entered more than once in Conversion Factor Table,La unitat de mesura {0} s'ha introduït més d'una vegada a la taula de valors de conversió
 apps/frappe/frappe/core/page/data_import_tool/data_import_tool.js +108,Import Successful!,Importació correcta!
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Cost d'articles Emeses
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +185,Quantity must not be more than {0},La quantitat no ha de ser més de {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +41,Age (Days),Edat (dies)
 DocType: Quotation Item,Quotation Item,Cita d'article
 DocType: Account,Account Name,Nom del Compte
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +41,From Date cannot be greater than To Date,De la data no pot ser més gran que A Data
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +34,From Date cannot be greater than To Date,De la data no pot ser més gran que A Data
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +194,Serial No {0} quantity {1} cannot be a fraction,Número de sèrie {0} quantitat {1} no pot ser una fracció
 apps/erpnext/erpnext/config/buying.py +59,Supplier Type master.,Taula mestre de tipus de proveïdor
 DocType: Purchase Order Item,Supplier Part Number,PartNumber del proveïdor
@@ -1397,14 +1350,14 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +247,{0} {1} is cancelled or stopped,{0} {1} és cancel·lat o detingut
 DocType: Accounts Settings,Credit Controller,Credit Controller
 DocType: Delivery Note,Vehicle Dispatch Date,Vehicle Dispatch Date
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +197,Purchase Receipt {0} is not submitted,El rebut de compra {0} no està presentat
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +198,Purchase Receipt {0} is not submitted,El rebut de compra {0} no està presentat
 DocType: Company,Default Payable Account,Compte per Pagar per defecte
 apps/erpnext/erpnext/config/website.py +13,"Settings for online shopping cart such as shipping rules, price list etc.","Ajustaments per a la compra en línia, com les normes d'enviament, llista de preus, etc."
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +660,Setup Complete,Instal·lació completa
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +124,Setup Complete,Instal·lació completa
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +65,{0}% Billed,{0}% Anunciat
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +17,Reserved Qty,Reservats Quantitat
 DocType: Party Account,Party Account,Compte Partit
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +74,Human Resources,Recursos Humans
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +74,Human Resources,Recursos Humans
 DocType: Lead,Upper Income,Ingrés Alt
 DocType: Journal Entry Account,Debit in Company Currency,Dèbit a Companyia moneda
 apps/erpnext/erpnext/support/doctype/issue/issue.py +58,My Issues,Els meus Qüestions
@@ -1413,11 +1366,9 @@
 DocType: Company,Default Values,Valors Predeterminats
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +236,Row {0}: Payment amount can not be negative,Fila {0}: Quantitat de pagament no pot ser negatiu
 DocType: Expense Claim,Total Amount Reimbursed,Suma total reemborsat
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +152,Press fitting,Press apropiat
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +64,Against Supplier Invoice {0} dated {1},Contra Proveïdor Factura {0} {1} datat
 DocType: Customer,Default Price List,Llista de preus per defecte
 DocType: Payment Reconciliation,Payments,Pagaments
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +24,Hot isostatic pressing,Premsat isostàtic en calent
 DocType: ToDo,Medium,Medium
 DocType: Budget Detail,Budget Allocated,Pressupost assignat
 DocType: Journal Entry,Entry Type,Tipus d&#39;entrada
@@ -1430,9 +1381,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +56,None of the items have any change in quantity or value.,Cap dels articles tenen qualsevol canvi en la quantitat o el valor.
 DocType: Warranty Claim,Warranty Claim,Reclamació de la Garantia
 ,Lead Details,Detalls del client potencial
-DocType: Authorization Rule,Approving User,Usuari aprovador
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +37,Forging,Forjant
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +126,Plating,Enchapado
 DocType: Purchase Invoice,End date of current invoice's period,Data de finalització del període de facturació actual
 DocType: Pricing Rule,Applicable For,Aplicable per
 DocType: Bank Reconciliation,From Date,Des de la data
@@ -1454,31 +1402,29 @@
 DocType: Sales Invoice,Paid Amount (Company Currency),Suma Pagat (Companyia moneda)
 DocType: Purchase Invoice,Additional Discount,Descompte addicional
 DocType: Selling Settings,Selling Settings,La venda d'Ajustaments
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +39,Online Auctions,Subhastes en línia
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,Subhastes en línia
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +94,Please specify either Quantity or Valuation Rate or both,Si us plau especificar Quantitat o valoració de tipus o ambdós
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +50,"Company, Month and Fiscal Year is mandatory","Empresa, mes i de l'any fiscal és obligatòri"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Marketing Expenses,Despeses de Màrqueting
 ,Item Shortage Report,Informe d'escassetat d'articles
-apps/erpnext/erpnext/stock/doctype/item/item.js +183,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","S'esmenta Pes, \n Si us plau, ""Pes UOM"" massa"
+apps/erpnext/erpnext/stock/doctype/item/item.js +185,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","S'esmenta Pes, \n Si us plau, ""Pes UOM"" massa"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,Sol·licitud de material utilitzat per fer aquesta entrada Stock
 apps/erpnext/erpnext/config/support.py +43,Single unit of an Item.,Unitat individual d'un article
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +212,Time Log Batch {0} must be 'Submitted',S'ha de 'Presentar' el registre de temps {0}
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,Feu Entrada Comptabilitat Per Cada moviment d'estoc
 DocType: Leave Allocation,Total Leaves Allocated,Absències totals assignades
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +384,Warehouse required at Row No {0},Magatzem requerit a la fila n {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +386,Warehouse required at Row No {0},Magatzem requerit a la fila n {0}
 DocType: Employee,Date Of Retirement,Data de la jubilació
 DocType: Upload Attendance,Get Template,Aconsegueix Plantilla
 DocType: Address,Postal,Postal
 DocType: Item,Weightage,Weightage
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +159,Mining,Mineria
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +17,Resin casting,Resina de colada
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"Hi ha un grup de clients amb el mateix nom, si us plau canvia el nom del client o el nom del Grup de Clients"
 apps/erpnext/erpnext/public/js/pos/pos.js +147,Please select {0} first.,Seleccioneu {0} primer.
 apps/erpnext/erpnext/templates/pages/order.html +57,text {0},text {0}
 DocType: Territory,Parent Territory,Parent Territory
 DocType: Quality Inspection Reading,Reading 2,Lectura 2
 DocType: Stock Entry,Material Receipt,Recepció de materials
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +622,Products,Productes
+apps/erpnext/erpnext/public/js/setup_wizard.js +358,Products,Productes
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +47,Party Type and Party is required for Receivable / Payable account {0},Partit Tipus i Partit es requereix per al compte per cobrar / pagar {0}
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.","Si aquest article té variants, llavors no pot ser seleccionada en les comandes de venda, etc."
 DocType: Lead,Next Contact By,Següent Contactar Per
@@ -1488,13 +1434,13 @@
 DocType: Purchase Invoice,Notification Email Address,Dir Adreça de correu electrònic per notificacions
 DocType: Payment Tool,Find Invoices to Match,Troba factures perquè coincideixi
 ,Item-wise Sales Register,Tema-savi Vendes Registre
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +399,"e.g. ""XYZ National Bank""","per exemple ""XYZ Banc Nacional """
+apps/erpnext/erpnext/public/js/setup_wizard.js +147,"e.g. ""XYZ National Bank""","per exemple ""XYZ Banc Nacional """
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,Aqeust impost està inclòs a la tarifa bàsica?
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +57,Total Target,Totals de l'objectiu
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Target,Totals de l'objectiu
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.js +22,Shopping Cart is enabled,Cistella de la compra està habilitat
 DocType: Job Applicant,Applicant for a Job,Sol·licitant d'ocupació
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +173,No Production Orders created,No hi ha ordres de fabricació creades
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +131,Salary Slip of employee {0} already created for this month,Nòmina d'empleat {0} ja creat per a aquest mes
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +140,Salary Slip of employee {0} already created for this month,Nòmina d'empleat {0} ja creat per a aquest mes
 DocType: Stock Reconciliation,Reconciliation JSON,Reconciliació JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Massa columnes. Exporta l'informe i utilitza una aplicació de full de càlcul.
 DocType: Sales Invoice Item,Batch No,Lot número
@@ -1504,14 +1450,14 @@
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +13,Variant,Variant
 apps/frappe/frappe/public/js/frappe/form/toolbar.js +165,New {0},Nova {0}
 DocType: Naming Series,Set prefix for numbering series on your transactions,Establir prefix de numeracions seriades a les transaccions
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +169,Stopped order cannot be cancelled. Unstop to cancel.,Detingut ordre no es pot cancel·lar. Unstop per cancel·lar.
-apps/erpnext/erpnext/stock/doctype/item/item.py +323,Default BOM ({0}) must be active for this item or its template,Per defecte la llista de materials ({0}) ha d&#39;estar actiu per aquest material o la seva plantilla
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +164,Stopped order cannot be cancelled. Unstop to cancel.,Detingut ordre no es pot cancel·lar. Unstop per cancel·lar.
+apps/erpnext/erpnext/stock/doctype/item/item.py +327,Default BOM ({0}) must be active for this item or its template,Per defecte la llista de materials ({0}) ha d&#39;estar actiu per aquest material o la seva plantilla
 DocType: Employee,Leave Encashed?,Leave Encashed?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Oportunitat de camp és obligatori
 DocType: Item,Variants,Variants
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +458,Make Purchase Order,Feu l'Ordre de Compra
 DocType: SMS Center,Send To,Enviar a
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +111,There is not enough leave balance for Leave Type {0},There is not enough leave balance for Leave Type {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +127,There is not enough leave balance for Leave Type {0},There is not enough leave balance for Leave Type {0}
 DocType: Sales Team,Contribution to Net Total,Contribució neta total
 DocType: Sales Invoice Item,Customer's Item Code,Del client Codi de l'article
 DocType: Stock Reconciliation,Stock Reconciliation,Reconciliació d'Estoc
@@ -1548,11 +1494,11 @@
 DocType: Sales Order Item,Actual Qty,Actual Quantitat
 DocType: Sales Invoice Item,References,Referències
 DocType: Quality Inspection Reading,Reading 10,Reading 10
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +612,"List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start.","Publica els teus productes o serveis de compra o venda Assegura't de revisar el Grup d'articles, unitat de mesura i altres propietats quan comencis"
+apps/erpnext/erpnext/public/js/setup_wizard.js +348,"List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start.","Publica els teus productes o serveis de compra o venda Assegura't de revisar el Grup d'articles, unitat de mesura i altres propietats quan comencis"
 DocType: Hub Settings,Hub Node,Node Hub
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,"Has introduït articles duplicats. Si us plau, rectifica-ho i torna a intentar-ho."
 apps/erpnext/erpnext/controllers/item_variant.py +65,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values,Valor {0} per a l&#39;atribut {1} no existeix a la llista d&#39;article vàlida Atribut Valors
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +87,Associate,Associat
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Associate,Associat
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +46,Item {0} is not a serialized Item,Article {0} no és un article serialitzat
 DocType: SMS Center,Create Receiver List,Crear Llista de receptors
 apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +5,Expired,Caducat
@@ -1561,7 +1507,7 @@
 DocType: Warranty Claim,Issue Date,Data De Assumpte
 DocType: Activity Cost,Activity Cost,Cost Activitat
 DocType: Purchase Receipt Item Supplied,Consumed Qty,Quantitat utilitzada
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +52,Telecommunications,Telecomunicacions
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +52,Telecommunications,Telecomunicacions
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),Indica que el paquet és una part d'aquest lliurament (Només Projecte)
 DocType: Payment Tool,Make Payment Entry,Feu Entrada Pagament
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +119,Quantity for Item {0} must be less than {1},Quantitat d'articles per {0} ha de ser menor de {1}
@@ -1578,10 +1524,8 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +37,"Selling must be checked, if Applicable For is selected as {0}","Venda de comprovar, si es selecciona aplicable Perquè {0}"
 DocType: Purchase Order Item,Supplier Quotation Item,Oferta del proveïdor d'article
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +27,Make Salary Structure,Feu Estructura Salarial
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +54,Shearing,Cisallament
 DocType: Item,Has Variants,Té 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.,"Feu clic al botó 'Make factura de venda ""per crear una nova factura de venda."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +166,Packaging and labeling,Envasament i etiquetatge
 DocType: Monthly Distribution,Name of the Monthly Distribution,Nom de la Distribució Mensual
 DocType: Sales Person,Parent Sales Person,Parent Sales Person
 apps/erpnext/erpnext/setup/utils.py +14,Please specify Default Currency in Company Master and Global Defaults,"Si us plau, especifiqui Moneda per defecte a l'empresa Mestre i predeterminats globals"
@@ -1592,19 +1536,18 @@
 DocType: Budget Detail,Fiscal Year,Any Fiscal
 DocType: Cost Center,Budget,Pressupost
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +41,"Budget cannot be assigned against {0}, as it's not an Income or Expense account","Pressupost no es pot assignar en contra {0}, ja que no és un compte d&#39;ingressos o despeses"
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Achieved,Aconseguit
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,Aconseguit
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +65,Territory / Customer,Localitat / Client
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,e.g. 5,per exemple 5
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +207,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},Fila {0}: quantitat assignada {1} ha de ser menor o igual a quantitat pendent de facturar {2}
+apps/erpnext/erpnext/public/js/setup_wizard.js +294,e.g. 5,per exemple 5
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},Fila {0}: quantitat assignada {1} ha de ser menor o igual a quantitat pendent de facturar {2}
 DocType: Sales Invoice,In Words will be visible once you save the Sales Invoice.,En paraules seran visibles un cop que guardi la factura de venda.
 DocType: Item,Is Sales Item,És article de venda
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,Arbre de grups d'article
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,L'Article {0} no està configurat per a números de sèrie. Comprova la configuració d'articles
 DocType: Maintenance Visit,Maintenance Time,Temps de manteniment
 ,Amount to Deliver,La quantitat a Deliver
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +620,A Product or Service,Un producte o servei
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +158,There were errors.,Hi han hagut errors.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +101,Tapping,Tapping
+apps/erpnext/erpnext/public/js/setup_wizard.js +356,A Product or Service,Un producte o servei
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +146,There were errors.,Hi han hagut errors.
 DocType: Naming Series,Current Value,Valor actual
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +171,{0} created,{0} creat
 DocType: Delivery Note Item,Against Sales Order,Contra l'Ordre de Venda
@@ -1619,7 +1562,7 @@
 apps/erpnext/erpnext/accounts/party.py +275,Due Date cannot be before Posting Date,Data de venciment no pot ser anterior Data de comptabilització
 DocType: Website Item Group,Website Item Group,Lloc web Grup d'articles
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Duties and Taxes,Taxes i impostos
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Please enter Reference date,"Si us plau, introduïu la data de referència"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +312,Please enter Reference date,"Si us plau, introduïu la data de referència"
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} entrades de pagament no es poden filtrar per {1}
 DocType: Item Website Specification,Table for Item that will be shown in Web Site,Taula d'article que es mostra en el lloc web
 DocType: Purchase Order Item Supplied,Supplied Qty,Subministrat Quantitat
@@ -1627,7 +1570,7 @@
 apps/erpnext/erpnext/config/stock.py +103,Tree of Item Groups.,Arbre dels grups d'articles.
 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,No es pot fer referència número de la fila superior o igual al nombre de fila actual d'aquest tipus de càrrega
 ,Item-wise Purchase History,Historial de compres d'articles
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +152,Red,Vermell
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Red,Vermell
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +228,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},"Si us plau, feu clic a ""Generar Planificació 'per reservar números de sèrie per l'article {0}"
 DocType: Account,Frozen,Bloquejat
 ,Open Production Orders,Obertes les ordres de producció
@@ -1642,7 +1585,7 @@
 DocType: Item Attribute,Attribute Name,Nom del Atribut
 apps/erpnext/erpnext/controllers/selling_controller.py +236,Item {0} must be Sales or Service Item in {1},Article {0} ha de ser Vendes o Servei d'articles en {1}
 DocType: Item Group,Show In Website,Mostra en el lloc web
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +621,Group,Grup
+apps/erpnext/erpnext/public/js/setup_wizard.js +357,Group,Grup
 DocType: Task,Expected Time (in hours),Temps esperat (en hores)
 ,Qty to Order,Quantitat de comanda
 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","Per fer el seguiment de marca en el següent documentació Nota de lliurament, Oportunitat, sol·licitud de materials, d&#39;articles, d&#39;ordres de compra, compra val, Rebut comprador, la cita, la factura de venda, producte Bundle, ordres de venda, de sèrie"
@@ -1652,6 +1595,7 @@
 DocType: Features Setup,Brands,Marques
 DocType: C-Form Invoice Detail,Invoice No,Número de Factura
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +480,From Purchase Order,De l'Ordre de Compra
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +92,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Deixa no pot aplicar / cancel·lada abans de {0}, com a balanç de la llicència ja ha estat remès equipatge al futur registre d&#39;assignació de permís {1}"
 DocType: Activity Cost,Costing Rate,Pago Rate
 ,Customer Addresses And Contacts,Adreces de clients i contactes
 DocType: Employee,Resignation Letter Date,Carta de renúncia Data
@@ -1659,35 +1603,31 @@
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +137,Not Set,No Configurat
 DocType: Communication,Date,Data
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,Repetiu els ingressos dels clients
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +651,Sit tight while your system is being setup. This may take a few moments.,"Si us plau, espera mentre el sistema està essent configurat. Aquest procés pot trigar una estona."
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +115,Sit tight while your system is being setup. This may take a few moments.,"Si us plau, espera mentre el sistema està essent configurat. Aquest procés pot trigar una estona."
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +51,{0} ({1}) must have role 'Expense Approver',{0} ({1}) ha de tenir rol 'aprovador de despeses'
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Pair,Parell
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Pair,Parell
 DocType: Bank Reconciliation Detail,Against Account,Contra Compte
 DocType: Maintenance Schedule Detail,Actual Date,Data actual
 DocType: Item,Has Batch No,Té número de lot
 DocType: Delivery Note,Excise Page Number,Excise Page Number
 DocType: Employee,Personal Details,Dades Personals
 ,Maintenance Schedules,Programes de manteniment
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +44,Embossing,Repujat
 ,Quotation Trends,Quotation Trends
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +139,Item Group not mentioned in item master for item {0},Grup L'article no esmenta en mestre d'articles per a l'article {0}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +302,Debit To account must be a Receivable account,Dèbit al compte ha de ser un compte per cobrar
-apps/erpnext/erpnext/stock/doctype/item/item.py +310,"As Production Order can be made for this item, it must be a stock item.",Per a poder fer aquest article Ordre de Producció cal designar-lo com a article d'estoc
 DocType: Shipping Rule Condition,Shipping Amount,Total de l'enviament
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +140,Joining,Unió
-DocType: Authorization Rule,Above Value,Per sobre de Valor
 ,Pending Amount,A l'espera de l'Import
 DocType: Purchase Invoice Item,Conversion Factor,Factor de conversió
 DocType: Purchase Order,Delivered,Alliberat
 apps/erpnext/erpnext/config/hr.py +160,Setup incoming server for jobs email id. (e.g. jobs@example.com),Setup incoming server for jobs email id. (e.g. jobs@example.com)
 DocType: Purchase Receipt,Vehicle Number,Nombre de vehicles
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,La data en què s'atura la factura recurrent
+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,Total de fulls assignades {0} no pot ser inferior a les fulles ja aprovats {1} per al període
 DocType: Journal Entry,Accounts Receivable,Comptes Per Cobrar
 ,Supplier-Wise Sales Analytics,Proveïdor-Wise Vendes Analytics
 DocType: Address Template,This format is used if country specific format is not found,Aquest format s'utilitza si no hi ha el format específic de cada país
 DocType: Custom Field,Custom,A mida
 DocType: Production Order,Use Multi-Level BOM,Utilitzeu Multi-Nivell BOM
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +26,Injection molding,Injecció de plàstics
 DocType: Bank Reconciliation,Include Reconciled Entries,Inclogui els comentaris conciliades
 apps/erpnext/erpnext/config/accounts.py +41,Tree of finanial accounts.,Arbre dels comptes financers
 DocType: Leave Control Panel,Leave blank if considered for all employee types,Deixar en blanc si es considera per a tot tipus d'empleats
@@ -1697,30 +1637,28 @@
 apps/frappe/frappe/config/setup.py +130,Printing,Impressió
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +114,Expense Claim is pending approval. Only the Expense Approver can update status.,El compte de despeses està pendent d'aprovació. Només l'aprovador de despeses pot actualitzar l'estat.
 DocType: Purchase Invoice,Additional Discount Amount,Import addicional de descompte
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +99,The day(s) on which you are applying for leave are holiday. You need not apply for leave.,El dia (s) en el qual està sol·licitant el permís són vacances. Vostè no necessita sol·licitar l'excedència.
 apps/frappe/frappe/public/js/frappe/misc/utils.js +110,and,i
 DocType: Leave Block List Allow,Leave Block List Allow,Leave Block List Allow
 apps/erpnext/erpnext/setup/doctype/company/company.py +236,Abbr can not be blank or space,Abbr no pot estar en blanc o l&#39;espai
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +50,Sports,Esports
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,Esports
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Actual,Actual total
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Unit,Unitat
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Unit,Unitat
 apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.py +182,Please set Dropbox access keys in your site config,Please set Dropbox access keys in your site config
 apps/erpnext/erpnext/stock/get_item_details.py +113,Please specify Company,"Si us plau, especifiqui l'empresa"
 ,Customer Acquisition and Loyalty,Captació i Fidelització
 DocType: Purchase Receipt,Warehouse where you are maintaining stock of rejected items,Magatzem en què es desen les existències dels articles rebutjats
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +408,Your financial year ends on,El seu exercici acaba el
+apps/erpnext/erpnext/public/js/setup_wizard.js +156,Your financial year ends on,El seu exercici acaba el
 DocType: POS Profile,Price List,Llista de preus
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +20,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,"{0} és ara l'Any Fiscal.oer defecte Si us plau, actualitzi el seu navegador perquè el canvi tingui efecte."
 apps/erpnext/erpnext/projects/doctype/project/project.js +47,Expense Claims,Les reclamacions de despeses
 DocType: Issue,Support,Suport
-DocType: Authorization Rule,Approving Role,Aprovar Rol
 ,BOM Search,BOM Cercar
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +176,Closing (Opening + Totals),Tancament (Obertura + totals)
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +26,Please specify currency in Company,"Si us plau, especifiqui la moneda a l'empresa"
 DocType: Workstation,Wages per hour,Els salaris per hora
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},Estoc equilibri en Lot {0} es convertirà en negativa {1} per a la partida {2} a Magatzem {3}
 apps/erpnext/erpnext/config/setup.py +83,"Show / Hide features like Serial Nos, POS etc.","Mostra / Amaga característiques com Nº de Sèrie, TPV etc."
-apps/erpnext/erpnext/controllers/accounts_controller.py +236,Account {0} is invalid. Account Currency must be {1},Compte {0} no és vàlid. Compte moneda ha de ser {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +237,Account {0} is invalid. Account Currency must be {1},Compte {0} no és vàlid. Compte moneda ha de ser {1}
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +34,UOM Conversion factor is required in row {0},Es requereix el factor de conversió de la UOM a la fila {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +53,Clearance date cannot be before check date in row {0},La data de liquidació no pot ser anterior a la data de verificació a la fila {0}
 DocType: Salary Slip,Deduction,Deducció
@@ -1739,13 +1677,13 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +82,Item {0} has already been returned,Article {0} ja s'ha tornat
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** Any Fiscal ** representa un exercici financer. Els assentaments comptables i altres transaccions importants es segueixen contra ** Any Fiscal **.
 DocType: Opportunity,Customer / Lead Address,Client / Direcció Plom
+apps/erpnext/erpnext/stock/doctype/item/item.py +112,Warning: Invalid SSL certificate on attachment {0},Avís: certificat SSL no vàlid en la inclinació {0}
 DocType: Production Order Operation,Actual Operation Time,Temps real de funcionament
 DocType: Authorization Rule,Applicable To (User),Aplicable a (Usuari)
 DocType: Purchase Taxes and Charges,Deduct,Deduir
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +170,Job Description,Descripció del Treball
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +170,Job Description,Descripció del Treball
 DocType: Purchase Order Item,Qty as per Stock UOM,La quantitat d'existències ha d'estar expresada en la UDM
 apps/frappe/frappe/model/rename_doc.py +343,Please select a valid csv file with data,Seleccioneu un arxiu csv vàlids amb dades
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +92,Coating,Revestiment
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +126,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Caràcters especials excepte ""-"" ""."", ""#"", i ""/"" no permès en el nomenament de sèrie"
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Porteu un registre de les campanyes de venda. Porteu un registre de conductors, Cites, comandes de venda, etc de Campanyes per mesurar retorn de la inversió. "
 DocType: Expense Claim,Approver,Aprovador
@@ -1755,12 +1693,11 @@
 DocType: Supplier Quotation,Manufacturing Manager,Gerent de Fàbrica
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},El número de sèrie {0} està en garantia fins {1}
 apps/erpnext/erpnext/config/stock.py +69,Split Delivery Note into packages.,Dividir nota de lliurament en paquets.
-apps/erpnext/erpnext/hooks.py +84,Shipments,Els enviaments
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +29,Dip molding,Emmotllament per immersió
+apps/erpnext/erpnext/hooks.py +68,Shipments,Els enviaments
 DocType: Purchase Order,To be delivered to customer,Per ser lliurat al client
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,Hora de registre d'estat ha de ser presentada.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,Número de sèrie {0} no pertany a cap magatzem
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +650,Setting Up,Configuració
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +114,Setting Up,Configuració
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,Row # ,Fila # 
 DocType: Purchase Invoice,In Words (Company Currency),En paraules (Divisa de la Companyia)
 DocType: Pricing Rule,Supplier,Proveïdor
@@ -1768,7 +1705,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +105,Miscellaneous Expenses,Despeses diverses
 DocType: Global Defaults,Default Company,Companyia defecte
 apps/erpnext/erpnext/controllers/stock_controller.py +166,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,Despesa o compte Diferència és obligatori per Punt {0} ja que afecta el valor de valors en general
-apps/erpnext/erpnext/controllers/accounts_controller.py +354,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","No es pot sobrefacturar l'element {0} a la fila {1} més de {2}. Per permetre la sobrefacturació, configura-ho a configuració d'existències"
+apps/erpnext/erpnext/controllers/accounts_controller.py +355,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","No es pot sobrefacturar l'element {0} a la fila {1} més de {2}. Per permetre la sobrefacturació, configura-ho a configuració d'existències"
 DocType: Employee,Bank Name,Nom del banc
 apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +27,-Above,-Sobre
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +135,User {0} is disabled,L'usuari {0} està deshabilitat
@@ -1781,27 +1718,26 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,{0} is mandatory for Item {1},{0} és obligatori per l'article {1}
 DocType: Currency Exchange,From Currency,De la divisa
 DocType: DocField,Name,Nom
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +211,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Seleccioneu suma assignat, Tipus factura i número de factura en almenys una fila"
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +104,Sales Order required for Item {0},Ordres de venda requerides per l'article {0}
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +158,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Seleccioneu suma assignat, Tipus factura i número de factura en almenys una fila"
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +107,Sales Order required for Item {0},Ordres de venda requerides per l'article {0}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +43,Amounts not reflected in system,Les quantitats no es reflecteix en el sistema
 DocType: Purchase Invoice Item,Rate (Company Currency),Rate (Companyia moneda)
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +40,Others,Altres
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +40,Others,Altres
 apps/erpnext/erpnext/templates/includes/product_page.js +80,Cannot find a matching Item. Please select some other value for {0}.,Si no troba un article a joc. Si us plau seleccioni un altre valor per {0}.
 DocType: POS Profile,Taxes and Charges,Impostos i càrrecs
 DocType: Item,"A Product or a Service that is bought, sold or kept in stock.","Un producte o un servei que es compra, es ven o es manté en estoc."
 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,No es pot seleccionar el tipus de càrrega com 'Suma de la fila anterior' o 'Total de la fila anterior' per la primera fila
 apps/frappe/frappe/core/doctype/doctype/boilerplate/controller_list.html +31,Completed,Acabat
 DocType: Web Form,Select DocType,Seleccioneu doctype
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +104,Broaching,Brotxatge
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +12,Banking,Banca
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,Banca
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +38,Please click on 'Generate Schedule' to get schedule,"Si us plau, feu clic a ""Generar la Llista d'aconseguir horari"
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +283,New Cost Center,Nou Centre de Cost
 DocType: Bin,Ordered Quantity,Quantitat demanada
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +397,"e.g. ""Build tools for builders""","per exemple ""Construir eines per als constructors """
+apps/erpnext/erpnext/public/js/setup_wizard.js +145,"e.g. ""Build tools for builders""","per exemple ""Construir eines per als constructors """
 DocType: Quality Inspection,In Process,En procés
 DocType: Authorization Rule,Itemwise Discount,Descompte d'articles
 DocType: Purchase Order Item,Reference Document Type,Referència Tipus de document
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +318,{0} against Sales Order {1},{0} en contra d'ordres de venda {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +320,{0} against Sales Order {1},{0} en contra d'ordres de venda {1}
 DocType: Account,Fixed Asset,Actius Fixos
 apps/erpnext/erpnext/config/stock.py +283,Serialized Inventory,Inventari serialitzat
 DocType: Activity Type,Default Billing Rate,Per defecte Facturació Tarifa
@@ -1816,14 +1752,13 @@
 DocType: Purchase Invoice Item,Page Break,Salt de pàgina
 DocType: Production Order Operation,Pending,Pendent
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,Els usuaris que poden aprovar les sol·licituds de llicència d'un empleat específic
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +33,You cannot change default UOM of Variant. To change default UOM for Variant change default UOM of the Template,No es pot canviar UOM per defecte de Variant. Per canviar UOM predeterminat per a la variant UOM canvi predeterminat de la plantilla
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +50,Office Equipments,Material d'oficina
 DocType: Purchase Invoice Item,Qty,Quantitat
 DocType: Fiscal Year,Companies,Empreses
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +24,Electronics,Electrònica
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +24,Electronics,Electrònica
 DocType: Stock Settings,Raise Material Request when stock reaches re-order level,Llevant Sol·licitud de material quan l'acció arriba al nivell de re-ordre
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +18,From Maintenance Schedule,Des Programa de manteniment
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +56,Full-time,Temps complet
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +56,Full-time,Temps complet
 DocType: Purchase Invoice,Contact Details,Detalls de contacte
 DocType: C-Form,Received Date,Data de recepció
 DocType: Delivery Note,"If you have created a standard template in Sales Taxes and Charges Template, select one and click on the button below.","Si ha creat una plantilla estàndard de les taxes i càrrecs de venda de plantilla, escollir un i feu clic al botó de sota."
@@ -1835,11 +1770,12 @@
 DocType: Job Applicant,Job Opening,Obertura de treball
 DocType: Payment Reconciliation,Payment Reconciliation,Reconciliació de Pagaments
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +154,Please select Incharge Person's name,"Si us plau, seleccioneu el nom de la persona al càrrec"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +51,Technology,Tecnologia
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,Tecnologia
 DocType: Offer Letter,Offer Letter,Carta De Oferta
 apps/erpnext/erpnext/config/manufacturing.py +51,Generate Material Requests (MRP) and Production Orders.,Generar sol·licituds de materials (MRP) i ordres de producció.
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +68,Total Invoiced Amt,Total facturat Amt
 DocType: Time Log,To Time,Per Temps
+DocType: Authorization Rule,Approving Role (above authorized value),Aprovar Rol (per sobre del valor autoritzat)
 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.","Per afegir nodes secundaris, explora arbre i feu clic al node en el qual voleu afegir més nodes."
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +102,Credit To account must be a Payable account,Crèdit al compte ha de ser un compte per pagar
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +233,BOM recursion: {0} cannot be parent or child of {2},BOM recursiu: {0} no pot ser pare o fill de {2}
@@ -1852,10 +1788,8 @@
 DocType: Item,Customer Item Codes,Codis dels clients
 DocType: Opportunity,Lost Reason,Raó Perdut
 apps/erpnext/erpnext/config/accounts.py +68,Create Payment Entries against Orders or Invoices.,Crear entrades de pagament contra ordres o factures.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +141,Welding,Soldadura
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +40,New Stock UOM is required,Es requereix nou Stock UOM
 DocType: Quality Inspection,Sample Size,Mida de la mostra
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +443,All items have already been invoiced,S'han facturat tots els articles
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +446,All items have already been invoiced,S'han facturat tots els articles
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',"Si us plau, especifica un 'Des del Cas Número' vàlid"
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +287,Further cost centers can be made under Groups but entries can be made against non-Groups,"Centres de costos addicionals es poden fer en grups, però les entrades es poden fer contra els no Grups"
 DocType: Project,External,Extern
@@ -1867,8 +1801,7 @@
 DocType: Bin,Actual Quantity,Quantitat real
 DocType: Shipping Rule,example: Next Day Shipping,exemple: Enviament Dia següent
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,Serial No {0} no trobat
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +563,Your Customers,Els teus Clients
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +27,Compression molding,El modelo per compressió
+apps/erpnext/erpnext/public/js/setup_wizard.js +303,Your Customers,Els teus Clients
 DocType: Leave Block List Date,Block Date,Bloquejar Data
 DocType: Sales Order,Not Delivered,No Lliurat
 ,Bank Clearance Summary,Resum Liquidació del Banc
@@ -1889,10 +1822,10 @@
 DocType: SMS Log,Sent To,Enviat A
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +28,Make Sales Invoice,Fer Factura Vendes
 DocType: Company,For Reference Only.,Només de referència.
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +29,Invalid {0}: {1},No vàlida {0}: {1}
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +49,Invalid {0}: {1},No vàlida {0}: {1}
 DocType: Sales Invoice Advance,Advance Amount,Quantitat Anticipada
 DocType: Manufacturing Settings,Capacity Planning,Planificació de la capacitat
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +49,'From Date' is required,'Des de la data' és obligatori
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +43,'From Date' is required,'Des de la data' és obligatori
 DocType: Journal Entry,Reference Number,Número de referència
 DocType: Employee,Employment Details,Detalls d'Ocupació
 DocType: Employee,New Workplace,Nou lloc de treball
@@ -1907,7 +1840,7 @@
 DocType: Serial No,Delivery Time,Temps de Lliurament
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Envelliment basat en
 DocType: Item,End of Life,Final de la Vida
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +41,Travel,Viatges
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +41,Travel,Viatges
 DocType: Leave Block List,Allow Users,Permetre que usuaris
 DocType: Purchase Order,Customer Mobile No,Client Mòbil No
 DocType: Sales Invoice,Recurring,Periódico
@@ -1921,7 +1854,7 @@
 DocType: Naming Series,User must always select,Usuari sempre ha de seleccionar
 DocType: Stock Settings,Allow Negative Stock,Permetre existències negatives
 DocType: Installation Note,Installation Note,Nota d'instal·lació
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +541,Add Taxes,Afegir Impostos
+apps/erpnext/erpnext/public/js/setup_wizard.js +283,Add Taxes,Afegir Impostos
 ,Financial Analytics,Comptabilitat analítica
 DocType: Quality Inspection,Verified By,Verified Per
 DocType: Address,Subsidiary,Filial
@@ -1931,7 +1864,6 @@
 DocType: System Settings,In Hours,En Hores
 DocType: Process Payroll,Create Salary Slip,Crear fulla de nòmina
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Expected balance as per bank,Import pendent de rebre com per banc
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +115,Buffing,Polit
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Source of Funds (Liabilities),Font dels fons (Passius)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +347,Quantity in row {0} ({1}) must be same as manufactured quantity {2},Quantitat a la fila {0} ({1}) ha de ser igual que la quantitat fabricada {2}
 DocType: Appraisal,Employee,Empleat
@@ -1948,11 +1880,11 @@
 DocType: Rename Tool,File to Rename,Arxiu per canviar el nom de
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +176,Purchse Order number required for Item {0},Nombre de comanda purchse requerit per Punt {0}
 apps/erpnext/erpnext/public/js/controllers/transaction.js +136,Show Payments,Mostrar Pagaments
-apps/erpnext/erpnext/controllers/buying_controller.py +245,Specified BOM {0} does not exist for Item {1},BOM especificat {0} no existeix la partida {1}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +202,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Programa de manteniment {0} ha de ser cancel·lat abans de cancel·lar aquesta comanda de vendes
+apps/erpnext/erpnext/controllers/buying_controller.py +236,Specified BOM {0} does not exist for Item {1},BOM especificat {0} no existeix la partida {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Programa de manteniment {0} ha de ser cancel·lat abans de cancel·lar aquesta comanda de vendes
 apps/frappe/frappe/desk/page/backups/backups.html +13,Size,Mida
 DocType: Notification Control,Expense Claim Approved,Compte de despeses Aprovat
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +113,Pharmaceutical,Farmacèutic
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Pharmaceutical,Farmacèutic
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,El cost d'articles comprats
 DocType: Selling Settings,Sales Order Required,Ordres de venda Obligatori
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +30,Create Customer,Crear Client
@@ -1962,7 +1894,6 @@
 DocType: Quality Inspection Reading,Reading 9,Lectura 9
 DocType: Supplier,Is Frozen,Està Congelat
 DocType: Buying Settings,Buying Settings,Ajustaments de compra
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +122,Mass finishing,Acabat en massa
 DocType: Stock Entry Detail,BOM No. for a Finished Good Item,BOM No. de producte acabat d'article
 DocType: Upload Attendance,Attendance To Date,Assistència fins a la Data
 apps/erpnext/erpnext/config/selling.py +158,Setup incoming server for sales email id. (e.g. sales@example.com),Configuració del servidor d'entrada de correu electrònic d'identificació de les vendes. (Per exemple sales@example.com)
@@ -1970,7 +1901,7 @@
 DocType: Payment Tool,Payment Account,Compte de Pagament
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +713,Please specify Company to proceed,"Si us plau, especifiqui l'empresa per a procedir"
 apps/frappe/frappe/public/js/frappe/model/indicator.js +30,Draft,Esborrany
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +46,Compensatory Off,Compensatori
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Compensatory Off,Compensatori
 DocType: Quality Inspection Reading,Accepted,Acceptat
 DocType: User,Female,Dona
 DocType: Journal Entry Account,Debit in Account Currency,Dèbit en Compte moneda
@@ -1982,7 +1913,7 @@
 DocType: Shipping Rule,Shipping Rule Label,Regla Etiqueta d'enviament
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +209,Raw Materials cannot be blank.,Matèries primeres no poden estar en blanc.
 DocType: Newsletter,Test,Prova
-apps/erpnext/erpnext/stock/doctype/item/item.py +364,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +368,"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'","Com que hi ha transaccions d&#39;accions existents per aquest concepte, \ no pot canviar els valors de &#39;no té de sèrie&#39;, &#39;Té lot n&#39;, &#39;És de la Element &quot;i&quot; Mètode de valoració&#39;"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +448,Quick Journal Entry,Seient Ràpida
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +92,You can not change rate if BOM mentioned agianst any item,No es pot canviar la tarifa si el BOM va cap a un article
@@ -1993,13 +1924,14 @@
 apps/erpnext/erpnext/config/stock.py +18,Requests for items.,Sol·licituds d'articles.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,Per a la producció per separat es crearà per a cada bon article acabat.
 DocType: Purchase Invoice,Terms and Conditions1,Termes i Condicions 1
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +18,Complete Setup,Instal·lació completa
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard_page.html +18,Complete Setup,Instal·lació completa
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","Assentament comptable congelat fins ara, ningú pot fer / modificar entrada excepte paper s'especifica a continuació."
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +121,Please save the document before generating maintenance schedule,"Si us plau, guardi el document abans de generar el programa de manteniment"
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,Estat del Projecte
 DocType: UOM,Check this to disallow fractions. (for Nos),Habiliteu aquesta opció per no permetre fraccions. (Per números)
 apps/erpnext/erpnext/config/crm.py +96,Newsletter Mailing List,Butlletí de la llista de correu
 DocType: Delivery Note,Transporter Name,Nom Transportista
+DocType: Authorization Rule,Authorized Value,Valor Autoritzat
 DocType: Contact,Enter department to which this Contact belongs,Introduïu departament al qual pertany aquest contacte
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Absent,Total Absent
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +746,Item or Warehouse for row {0} does not match Material Request,Article o magatzem per a la fila {0} no coincideix Sol·licitud de materials
@@ -2024,16 +1956,15 @@
 DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),Taxa Bàsica (segons de la UOM)
 DocType: SMS Log,No of Requested SMS,No de SMS sol·licitada
 DocType: Campaign,Campaign-.####,Campanya-.####
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +55,Piercing,Perforació
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,Propers passos
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +117,Contract End Date must be greater than Date of Joining,La Data de finalització del contracte ha de ser major que la data d'inici
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,Un distribuïdor de tercers / distribuïdor / comissió de l'agent / de la filial / distribuïdor que ven els productes de les empreses d'una comissió.
 DocType: Customer Group,Has Child Node,Té Node Nen
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{0} against Purchase Order {1},{0} contra l'Ordre de Compra {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +332,{0} against Purchase Order {1},{0} contra l'Ordre de Compra {1}
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","Introduïu els paràmetres d'URL estàtiques aquí (Ex. Remitent = ERPNext, nom d'usuari = ERPNext, password = 1234 etc.)"
 apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,{0} {1} no en qualsevol any fiscal activa. Per a més detalls de verificació {2}.
-apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,Aquest és un lloc web d'exemple d'auto-generada a partir ERPNext
+apps/erpnext/erpnext/setup/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,Aquest és un lloc web d'exemple d'auto-generada a partir ERPNext
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +37,Ageing Range 1,Rang Envelliment 1
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +110,Photochemical machining,Mecanitzat fotoquímic
 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.
 
 #### Note
@@ -2079,7 +2010,7 @@
 DocType: Purchase Receipt Item,Recd Quantity,Recd Quantitat
 DocType: Email Account,Email Ids,E-mail Ids
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},No es pot produir més Article {0} que en la quantitat de comandes de client {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +471,Stock Entry {0} is not submitted,Entrada de la {0} no es presenta
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +473,Stock Entry {0} is not submitted,Entrada de la {0} no es presenta
 DocType: Payment Reconciliation,Bank / Cash Account,Compte Bancari / Efectiu
 DocType: Tax Rule,Billing City,Facturació Ciutat
 DocType: Global Defaults,Hide Currency Symbol,Amaga Símbol de moneda
@@ -2095,7 +2026,7 @@
 DocType: Purchase Invoice,Currency and Price List,Moneda i Preus
 DocType: Opportunity,Customer / Lead Name,nom del Client/Client Potencial
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +63,Clearance Date not mentioned,No s'esmenta l'espai de dates
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +71,Production,Producció
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Production,Producció
 DocType: Item,Allow Production Order,Permetre Ordre de Producció
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +60,Row {0}:Start Date must be before End Date,Fila {0}: Data d'inici ha de ser anterior Data de finalització
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Total (Quantitat)
@@ -2108,7 +2039,7 @@
 apps/erpnext/erpnext/utilities/doctype/address/address.py +113,My Addresses,Els meus Direccions
 DocType: Stock Ledger Entry,Outgoing Rate,Sortint Rate
 apps/erpnext/erpnext/config/hr.py +100,Organization branch master.,Organization branch master.
-apps/erpnext/erpnext/controllers/accounts_controller.py +237, or ,o
+apps/erpnext/erpnext/controllers/accounts_controller.py +238, or ,o
 DocType: Sales Order,Billing Status,Estat de facturació
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Utility Expenses,Despeses de serveis públics
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,90-Above,Per sobre de 90-
@@ -2135,6 +2066,7 @@
 DocType: Stock Entry Detail,Serial No / Batch,Número de sèrie / lot
 DocType: Product Bundle,Parent Item,Article Pare
 DocType: Account,Account Type,Tipus de compte
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +113,Leave Type {0} cannot be carry-forwarded,Deixar tipus {0} no es poden enviar-portar
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +213,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',"El programa de manteniment no es genera per a tots els articles Si us plau, feu clic a ""Generar Planificació"""
 ,To Produce,Per a Produir
 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","Per a la fila {0} a {1}. Per incloure {2} en la taxa d&#39;article, files {3} també han de ser inclosos"
@@ -2142,10 +2074,7 @@
 DocType: Bin,Reserved Quantity,Quantitat reservades
 DocType: Landed Cost Voucher,Purchase Receipt Items,Rebut de compra d'articles
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,Formes Personalització
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +62,Cutting,Tall
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +69,Flattening,Aixafament
 DocType: Account,Income Account,Compte d'ingressos
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +22,Molding,Motllura
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +632,Delivery,Lliurament
 DocType: Stock Reconciliation Item,Current Qty,Quantitat actual
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section","Vegeu ""Taxa de materials basats en"" a la Secció Costea"
@@ -2155,20 +2084,19 @@
 apps/frappe/frappe/desk/moduleview.py +61,Documents,Documents
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +17,Ref,Àrbitre
 DocType: Cost Center,Cost Center,Centre de Cost
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.js +48,Voucher #,Comprovant #
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +36,Voucher #,Comprovant #
 DocType: Notification Control,Purchase Order Message,Missatge de les Ordres de Compra
 DocType: Tax Rule,Shipping Country,País d&#39;enviament
 DocType: Upload Attendance,Upload HTML,Pujar HTML
-apps/erpnext/erpnext/controllers/accounts_controller.py +391,"Total advance ({0}) against Order {1} cannot be greater \
+apps/erpnext/erpnext/controllers/accounts_controller.py +392,"Total advance ({0}) against Order {1} cannot be greater \
 				than the Grand Total ({2})","Avanç total ({0}) en contra de l'ordre {1} no pot ser major \
  que el Gran Total ({2})"
 DocType: Employee,Relieving Date,Data Alleujar
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +12,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.","Regla de preus està feta per a sobreescriure la llista de preus/defineix percentatge de descompte, en base a algun criteri."
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,Magatzem només es pot canviar a través d'entrada d'estoc / Nota de lliurament / recepció de compra
 DocType: Employee Education,Class / Percentage,Classe / Percentatge
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +92,Head of Marketing and Sales,Director de Màrqueting i Vendes
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +31,Income Tax,Impost sobre els guanys
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +157,Laser engineered net shaping,Làser dissenyat conformació neta
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Head of Marketing and Sales,Director de Màrqueting i Vendes
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +31,Income Tax,Impost sobre els guanys
 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.","Si Regla preus seleccionada està fet per a 'Preu', sobreescriurà Llista de Preus. Regla preu El preu és el preu final, així que no hi ha descompte addicional s'ha d'aplicar. Per tant, en les transaccions com comandes de venda, ordres de compra, etc, es va anar a buscar al camp ""Rate"", en lloc de camp 'Preu de llista Rate'."
 apps/erpnext/erpnext/config/selling.py +163,Track Leads by Industry Type.,Seguiment dels clients potencials per tipus d'indústria.
 DocType: Item Supplier,Item Supplier,Article Proveïdor
@@ -2191,31 +2119,28 @@
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Actual Quantitat Després de Transacció
 ,Pending SO Items For Purchase Request,A l'espera dels Articles de la SO per la sol·licitud de compra
 DocType: Supplier,Billing Currency,Facturació moneda
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +148,Extra Large,Extra gran
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,Extra Large,Extra gran
 ,Profit and Loss Statement,Guanys i Pèrdues
 DocType: Bank Reconciliation Detail,Cheque Number,Número de Xec
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +43,Pressing,Premsat
 DocType: Payment Tool Detail,Payment Tool Detail,Detall mitjà de Pagament
 ,Sales Browser,Analista de Vendes
 DocType: Journal Entry,Total Credit,Crèdit Total
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +474,Warning: Another {0} # {1} exists against stock entry {2},Hi ha un altre {0} # {1} contra l&#39;entrada de població {2}: Són els
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +459,Local,Local
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +476,Warning: Another {0} # {1} exists against stock entry {2},Hi ha un altre {0} # {1} contra l&#39;entrada de població {2}: Són els
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +397,Local,Local
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),Préstecs i bestretes (Actius)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,Deutors
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +147,Large,Gran
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +23,No employee found!,No s'ha trobat cap empleat!
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Large,Gran
 DocType: C-Form Invoice Detail,Territory,Territori
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,"Si us plau, no de visites requerides"
 DocType: Purchase Order,Customer Address Display,Direcció del client Pantalla
 DocType: Stock Settings,Default Valuation Method,Mètode de valoració predeterminat
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +127,Polishing,Polit
 DocType: Production Order Operation,Planned Start Time,Planificació de l'hora d'inici
 apps/erpnext/erpnext/config/accounts.py +63,Close Balance Sheet and book Profit or Loss.,Tancar Balanç i llibre Guany o Pèrdua.
-apps/erpnext/erpnext/stock/doctype/item/item.py +661,"Default Unit of Measure for Item {0} cannot be changed directly because \
+apps/erpnext/erpnext/stock/doctype/item/item.py +665,"Default Unit of Measure for Item {0} cannot be changed directly because \
 			you have already made some transaction(s) with another UOM. To change default UOM, \
 			use 'UOM Replace Utility' tool under Stock module.","Unitat de mesura per defecte per a l&#39;article {0} no es pot canviar directament perquè \ ja ha realitzat alguna transacció (s) amb una altra UOM. Per canviar UOM defecte, \ ús &#39;UOM Substituir Utilitat&#39; eina de baix mòdul d&#39;Stock."
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,Especificar Tipus de canvi per convertir una moneda en una altra
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +146,Quotation {0} is cancelled,L'annotació {0} està cancel·lada
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +141,Quotation {0} is cancelled,L'annotació {0} està cancel·lada
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,Total Monto Pendent
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} was on leave on {1}. Cannot mark attendance.,Empleat {0} estava de llicència a {1}. No es pot marcar l'assistència.
 DocType: Sales Partner,Targets,Blancs
@@ -2226,7 +2151,6 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +158,Please create Customer from Lead {0},"Si us plau, crea Client a partir del client potencial {0}"
 DocType: Price List,Applicable for Countries,Aplicable per als Països
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Computers,Ordinadors
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +112,Electro-chemical grinding,Electro-química de mòlta
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +14,This is a root customer group and cannot be edited.,Es tracta d'un grup de clients de l'arrel i no es pot editar.
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +39,Please setup your chart of accounts before you start Accounting Entries,"Si us plau, configura el teu pla de comptes abans de començar els assentaments comptables"
 DocType: Purchase Invoice,Ignore Pricing Rule,Ignorar Regla preus
@@ -2284,7 +2208,6 @@
 DocType: Maintenance Visit,Purposes,Propòsits
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +103,Atleast one item should be entered with negative quantity in return document,Almenys un element ha de introduir-se amb quantitat negativa en el document de devolució
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +67,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","Operació {0} ja que qualsevol temps de treball disponibles a l&#39;estació de treball {1}, trencar l&#39;operació en múltiples operacions"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +134,Electrochemical machining,Mecanitzat electroquímic
 ,Requested,Comanda
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +66,No Remarks,Sense Observacions
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +13,Overdue,Endarrerit
@@ -2293,7 +2216,7 @@
 DocType: Monthly Distribution,Distribution Name,Distribution Name
 DocType: Features Setup,Sales and Purchase,Compra i Venda
 DocType: Supplier Quotation Item,Material Request No,Número de sol·licitud de Material
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +218,Quality Inspection required for Item {0},Inspecció de qualitat requerida per a l'article {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +221,Quality Inspection required for Item {0},Inspecció de qualitat requerida per a l'article {0}
 DocType: Quotation,Rate at which customer's currency is converted to company's base currency,Rati a la qual es converteix la divisa del client es converteix en la moneda base de la companyia
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +107,{0} has been successfully unsubscribed from this list.,{0} ha estat èxit de baixa d&#39;aquesta llista.
 DocType: Purchase Invoice Item,Net Rate (Company Currency),Taxa neta (Companyia moneda)
@@ -2311,9 +2234,8 @@
 apps/erpnext/erpnext/accounts/report/financial_statements.py +16,Fiscal Year {0} not found.,Any fiscal {0} no es troba.
 DocType: Bank Reconciliation,Get Relevant Entries,Obtenir assentaments corresponents
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +407,Accounting Entry for Stock,Entrada Comptabilitat de Stock
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +64,Coining,Encunyant
 DocType: Sales Invoice,Sales Team1,Equip de Vendes 1
-apps/erpnext/erpnext/stock/doctype/item/item.py +412,Item {0} does not exist,Article {0} no existeix
+apps/erpnext/erpnext/stock/doctype/item/item.py +416,Item {0} does not exist,Article {0} no existeix
 DocType: Sales Invoice,Customer Address,Direcció del client
 apps/frappe/frappe/desk/query_report.py +136,Total,Total
 DocType: Purchase Invoice,Apply Additional Discount On,Aplicar addicional de descompte en les
@@ -2325,14 +2247,13 @@
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),Suma d&#39;impostos Després Quantitat de Descompte (Companyia moneda)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +149,Target warehouse is mandatory for row {0},Magatzem destí obligatori per a la fila {0}
 DocType: Quality Inspection,Quality Inspection,Inspecció de Qualitat
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +144,Extra Small,Extra Petit
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +20,Spray forming,Ruixeu la formació
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Extra Small,Extra Petit
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +458,Warning: Material Requested Qty is less than Minimum Order Qty,Advertència: La quantitat de Material sol·licitada és inferior a la Quantitat mínima
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +191,Account {0} is frozen,El compte {0} està bloquejat
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Entitat Legal / Subsidiari amb un gràfic separat de comptes que pertanyen a l'Organització.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +29,"Food, Beverage & Tobacco","Alimentació, begudes i tabac"
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","Alimentació, begudes i tabac"
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +20,PL or BS,PL o BS
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,Can only make payment against unbilled {0},Només es pot fer el pagament contra facturats {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +531,Can only make payment against unbilled {0},Només es pot fer el pagament contra facturats {0}
 apps/erpnext/erpnext/controllers/selling_controller.py +122,Commission rate cannot be greater than 100,La Comissió no pot ser major que 100
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Minimum Inventory Level,Nivell d'inventari mínim
 DocType: Stock Entry,Subcontract,Subcontracte
@@ -2343,19 +2264,18 @@
 DocType: Item,Manufacturer Part Number,PartNumber del fabricant
 DocType: Production Order Operation,Estimated Time and Cost,Temps estimat i cost
 DocType: Bin,Bin,Paperera
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +50,Nosing,Sospita
 DocType: SMS Log,No of Sent SMS,No d'SMS enviats
 DocType: Account,Company,Empresa
 DocType: Account,Expense Account,Compte de Despeses
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +49,Software,Programari
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +151,Colour,Color
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +49,Software,Programari
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Colour,Color
 DocType: Maintenance Visit,Scheduled,Programat
 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","Seleccioneu l&#39;ítem on &quot;És de la Element&quot; és &quot;No&quot; i &quot;És d&#39;articles de venda&quot; és &quot;Sí&quot;, i no hi ha un altre paquet de producte"
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,Seleccioneu Distribució Mensual de distribuir de manera desigual a través d'objectius mesos.
 DocType: Purchase Invoice Item,Valuation Rate,Tarifa de Valoració
 apps/erpnext/erpnext/stock/get_item_details.py +281,Price List Currency not selected,No s'ha escollit una divisa per la llista de preus
 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,Article Fila {0}: Compra de Recepció {1} no existeix a la taulat 'Rebuts de compra'
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +134,Employee {0} has already applied for {1} between {2} and {3},L'Empleat {0} ja ha sol·licitat {1} entre {2} i {3}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +145,Employee {0} has already applied for {1} between {2} and {3},L'Empleat {0} ja ha sol·licitat {1} entre {2} i {3}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Projecte Data d'Inici
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +8,Until,Fins
 DocType: Rename Tool,Rename Log,Canviar el nom de registre
@@ -2365,7 +2285,7 @@
 apps/erpnext/erpnext/controllers/recurring_document.py +162,Please select {0},Seleccioneu {0}
 DocType: C-Form,C-Form No,C-Form No
 DocType: BOM,Exploded_items,Exploded_items
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +95,Researcher,Investigador
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Researcher,Investigador
 apps/frappe/frappe/custom/doctype/customize_form/customize_form.js +88,Update,Actualització
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +78,Please save the Newsletter before sending,"Si us plau, guardi el butlletí abans d'enviar-"
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +23,Name or Email is mandatory,Nom o Email és obligatori
@@ -2374,11 +2294,10 @@
 DocType: Employee,Exit,Sortida
 apps/erpnext/erpnext/accounts/doctype/account/account.py +134,Root Type is mandatory,Root Type is mandatory
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +295,Serial No {0} created,Serial No {0} creat
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +125,Vibratory finishing,Acabat vibratori
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","Per comoditat dels clients, aquests codis es poden utilitzar en formats d'impressió, com factures i albarans"
 DocType: Employee,You can enter any date manually,Podeu introduir qualsevol data manualment
 DocType: Sales Invoice,Advertisement,Anunci
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +165,Probationary Period,Període De Prova
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Probationary Period,Període De Prova
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Només els nodes fulla es permet l'entrada de transaccions
 DocType: Expense Claim,Expense Approver,Aprovador de despeses
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,Rebut de compra dels articles subministrats
@@ -2386,19 +2305,16 @@
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +17,To Datetime,To Datetime
 DocType: SMS Settings,SMS Gateway URL,SMS Gateway URL
 apps/erpnext/erpnext/config/crm.py +53,Logs for maintaining sms delivery status,Registres per mantenir l&#39;estat de lliurament de sms
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +137,Grinding,Mòlta
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +34,Shrink wrapping,Retractilat
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +36,Pending Activities,Activitats pendents
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,Confirmed,Confirmat
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier > Supplier Type,Proveïdor > Tipus Proveïdor
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +127,Please enter relieving date.,Please enter relieving date.
 apps/erpnext/erpnext/controllers/trends.py +137,Amt,Amt
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' can be submitted,"Només es poden presentar les Aplicacions d'absència amb estat ""Aprovat"""
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +51,Only Leave Applications with status 'Approved' can be submitted,"Només es poden presentar les Aplicacions d'absència amb estat ""Aprovat"""
 apps/erpnext/erpnext/utilities/doctype/address/address.py +21,Address Title is mandatory.,Títol d'adreça obligatori.
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,Introduïu el nom de la campanya si la font de la investigació és la campanya
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +38,Newspaper Publishers,Editors de Newspapers
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +38,Newspaper Publishers,Editors de Newspapers
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,Seleccioneu l'any fiscal
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +88,Smelting,Fosa
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Nivell de Reabastecimiento
 DocType: Attendance,Attendance Date,Assistència Data
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,Salary breakup based on Earning and Deduction.
@@ -2413,16 +2329,15 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +414,[Error],[Error]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,En paraules seran visibles un cop que es guarda la comanda de vendes.
 ,Employee Birthday,Aniversari d'Empleat
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +55,Venture Capital,Venture Capital
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,Venture Capital
 DocType: UOM,Must be Whole Number,Ha de ser nombre enter
 DocType: Leave Control Panel,New Leaves Allocated (In Days),Noves Fulles Assignats (en dies)
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +51,Serial No {0} does not exist,El número de sèrie {0} no existeix
 DocType: Pricing Rule,Discount Percentage,%Descompte
 DocType: Payment Reconciliation Invoice,Invoice Number,Número de factura
-apps/erpnext/erpnext/hooks.py +70,Orders,Ordres
+apps/erpnext/erpnext/hooks.py +54,Orders,Ordres
 DocType: Leave Control Panel,Employee Type,Tipus d'ocupació
 DocType: Employee Leave Approver,Leave Approver,Aprovador d'absències
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +70,Swaging,Recalcat
 DocType: Manufacturing Settings,Material Transferred for Manufacture,Material transferit per a la Fabricació
 DocType: Expense Claim,"A user with ""Expense Approver"" role","Un usuari amb rol de ""Aprovador de despeses"""
 ,Issued Items Against Production Order,Articles emesa contra ordre de producció
@@ -2434,7 +2349,6 @@
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +62,Cost Center with existing transactions can not be converted to group,Un Centre de costos amb transaccions existents no es pot convertir en grup
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Depreciation,Depreciació
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Proveïdor (s)
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +29,Invalid period,Període invàlid
 DocType: Customer,Credit Limit,Límit de Crèdit
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,Seleccioneu el tipus de transacció
 DocType: GL Entry,Voucher No,Número de comprovant
@@ -2444,9 +2358,9 @@
 DocType: Customer,Address and Contact,Direcció i Contacte
 DocType: Customer,Last Day of the Next Month,Últim dia del mes
 DocType: Employee,Feedback,Resposta
+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}","Deixi no poden ser distribuïdes abans {0}, com a balanç de la llicència ja ha estat remès equipatge al futur registre d&#39;assignació de permís {1}"
 apps/erpnext/erpnext/accounts/party.py +284,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Nota: A causa / Data de referència supera permesos dies de crèdit de clients per {0} dia (es)
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +621,Maint. Schedule,Maint. Horari
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +108,Abrasive jet machining,Mecanitzat per raig abrasiu
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +632,Maint. Schedule,Maint. Horari
 DocType: Stock Settings,Freeze Stock Entries,Freeze Imatges entrades
 DocType: Website Settings,Website Settings,Configuració del lloc web
 DocType: Item,Reorder level based on Warehouse,Nivell de comanda basat en Magatzem
@@ -2463,7 +2377,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +75,Show Stock Entries,Mostra Imatges d'entrades
 ,Is Primary Address,És Direcció Primària
 DocType: Production Order,Work-in-Progress Warehouse,Magatzem de treballs en procés
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +308,Reference #{0} dated {1},Referència #{0} amb data {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Reference #{0} dated {1},Referència #{0} amb data {1}
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +13,Manage Addresses,Administrar Direccions
 DocType: Pricing Rule,Item Code,Codi de l'article
 DocType: Production Planning Tool,Create Production Orders,Crear ordres de producció
@@ -2472,7 +2386,7 @@
 DocType: Lead,Market Segment,Sector de mercat
 DocType: Communication,Phone,Telèfon
 DocType: Employee Internal Work History,Employee Internal Work History,Historial de treball intern de l'empleat
-apps/erpnext/erpnext/public/js/account_tree_grid.js +50,Closing (Dr),Tancament (Dr)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +221,Closing (Dr),Tancament (Dr)
 DocType: Contact,Passive,Passiu
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,El número de sèrie {0} no està en estoc
 apps/erpnext/erpnext/config/selling.py +127,Tax template for selling transactions.,Plantilla d'Impostos per a la venda de les transaccions.
@@ -2488,8 +2402,8 @@
 ,Billed Amount,Quantitat facturada
 DocType: Bank Reconciliation,Bank Reconciliation,Conciliació bancària
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +9,Get Updates,Obtenir actualitzacions
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +129,Material Request {0} is cancelled or stopped,Material de Sol·licitud {0} es cancel·la o s'atura
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +641,Add a few sample records,Afegir uns registres d&#39;exemple
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +133,Material Request {0} is cancelled or stopped,Material de Sol·licitud {0} es cancel·la o s'atura
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Add a few sample records,Afegir uns registres d&#39;exemple
 apps/erpnext/erpnext/config/hr.py +210,Leave Management,Deixa Gestió
 DocType: Event,Groups,Grups
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,Agrupa Per Comptes
@@ -2502,38 +2416,34 @@
 DocType: Features Setup,Sales Extras,Extres de venda
 apps/erpnext/erpnext/accounts/utils.py +344,{0} budget for Account {1} against Cost Center {2} will exceed by {3},{0} pressupost per al compte {1} contra Centre de Cost {2} superarà per {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +236,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Compte diferència ha de ser un tipus de compte d&#39;Actius / Passius, ja que aquest arxiu reconciliació és una entrada d&#39;Obertura"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +138,Purchase Order number required for Item {0},Número d'ordre de Compra per {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Order number required for Item {0},Número d'ordre de Compra per {0}
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date','Des de la data' ha de ser després de 'A data'
 ,Stock Projected Qty,Quantitat d'estoc previst
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +147,Customer {0} does not belong to project {1},Client {0} no pertany a projectar {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +150,Customer {0} does not belong to project {1},Client {0} no pertany a projectar {1}
 DocType: Sales Order,Customer's Purchase Order,Àrea de clients Ordre de Compra
 DocType: Warranty Claim,From Company,Des de l'empresa
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,Valor o Quantitat
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Minute,Minut
+apps/erpnext/erpnext/public/js/setup_wizard.js +363,Minute,Minut
 DocType: Purchase Invoice,Purchase Taxes and Charges,Compra Impostos i Càrrecs
 ,Qty to Receive,Quantitat a Rebre
 DocType: Leave Block List,Leave Block List Allowed,Llista d'absències permeses bloquejades
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +61,Conversion factor cannot be in fractions,Factor de conversió no pot estar en fraccions
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +358,You will use it to Login,El utilitzarà per iniciar sessió
+apps/erpnext/erpnext/public/js/setup_wizard.js +108,You will use it to Login,El utilitzarà per iniciar sessió
 DocType: Sales Partner,Retailer,Detallista
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +99,Credit To account must be a Balance Sheet account,Crèdit al compte ha de ser un compte de Balanç
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,Tots els tipus de proveïdors
 apps/erpnext/erpnext/stock/doctype/item/item.py +37,Item Code is mandatory because Item is not automatically numbered,El codi de l'article és obligatori perquè no s'havia numerat automàticament
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +99,Quotation {0} not of type {1},Cita {0} no del tipus {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +93,Quotation {0} not of type {1},Cita {0} no del tipus {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,Programa de manteniment d'articles
 DocType: Sales Order,%  Delivered,% Lliurat
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,Bank Overdraft Account,Bank Overdraft Account
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +15,Make Salary Slip,Feu nòmina
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +18,Browse BOM,Navegar per llista de materials
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +175,Secured Loans,Préstecs Garantits
-apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +3,Awesome Products,Productes impressionants
+apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +3,Awesome Products,Productes impressionants
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +189,Opening Balance Equity,Saldo inicial Equitat
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +80,Cannot approve leave as you are not authorized to approve leaves on Block Dates,No es pot aprovar l'absència perquè no estàs autoritzat per aprovar-les en dates bloquejades
 DocType: Appraisal,Appraisal,Avaluació
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +13,Lost-foam casting,Fosa a l&#39;escuma perduda
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +47,Drawing,Dibuix
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +22,Date is repeated,Data repetida
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +148,Leave approver must be one of {0},L'aprovador d'absències ha de ser un de {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +162,Leave approver must be one of {0},L'aprovador d'absències ha de ser un de {0}
 DocType: Hub Settings,Seller Email,Electrònic
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Cost total de compra (mitjançant compra de la factura)
 DocType: Workstation Working Hour,Start Time,Hora d'inici
@@ -2547,7 +2457,7 @@
 DocType: Purchase Invoice Item,Net Amount (Company Currency),Import net (Companyia moneda)
 DocType: BOM Operation,Hour Rate,Hour Rate
 DocType: Stock Settings,Item Naming By,Article Naming Per
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +642,From Quotation,Des de l'oferta
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +655,From Quotation,Des de l'oferta
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},Una altra entrada Període de Tancament {0} s'ha fet després de {1}
 DocType: Production Order,Material Transferred for Manufacturing,Material transferit per a la Fabricació
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +29,Account {0} does not exists,{0} no existeix Compte
@@ -2561,21 +2471,19 @@
 DocType: Purchase Invoice Item,PR Detail,Detall PR
 DocType: Sales Order,Fully Billed,Totalment Anunciat
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +20,Cash In Hand,Efectiu disponible
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +72,Delivery warehouse required for stock item {0},Magatzem de lliurament requerit per tema de valors {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +119,Delivery warehouse required for stock item {0},Magatzem de lliurament requerit per tema de valors {0}
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),"El pes brut del paquet. En general, el pes net + embalatge pes del material. (Per imprimir)"
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Els usuaris amb aquest rol poden establir comptes bloquejats i crear/modificar els assentaments comptables contra els comptes bloquejats
 DocType: Serial No,Is Cancelled,Està cancel·lat
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +281,My Shipments,Els meus enviaments
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +286,My Shipments,Els meus enviaments
 DocType: Journal Entry,Bill Date,Data de la factura
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +43,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","Fins i tot si hi ha diverses regles de preus amb major prioritat, s'apliquen prioritats internes:"
 DocType: Supplier,Supplier Details,Detalls del proveïdor
 DocType: Communication,Recipients,Destinataris
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +146,Screwing,Cargolar
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +96,Knurling,Moleteado
 DocType: Expense Claim,Approval Status,Estat d'aprovació
 DocType: Hub Settings,Publish Items to Hub,Publicar articles a Hub
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +44,From value must be less than to value in row {0},De valor ha de ser inferior al valor de la fila {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +133,Wire Transfer,Transferència Bancària
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +133,Wire Transfer,Transferència Bancària
 apps/erpnext/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py +25,Please select Bank Account,Seleccioneu el compte bancari
 DocType: Newsletter,Create and Send Newsletters,Crear i enviar butlletins de notícies
 apps/frappe/frappe/public/js/frappe/views/reports/grid_report.js +305,From Date must be before To Date,A partir de la data ha de ser abans Per Data
@@ -2583,14 +2491,14 @@
 DocType: Company,Default Income Account,Compte d'Ingressos predeterminat
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,Grup de Clients / Client
 DocType: Item Group,Check this if you want to show in website,Seleccioneu aquesta opció si voleu que aparegui en el lloc web
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +190,Welcome to ERPNext,Benvingut a ERPNext
+,Welcome to ERPNext,Benvingut a ERPNext
 DocType: Payment Reconciliation Payment,Voucher Detail Number,Voucher Detail Number
 apps/erpnext/erpnext/config/crm.py +146,Lead to Quotation,El plom a la Petició
 DocType: Lead,From Customer,De Client
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +37,Calls,Trucades
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Calls,Trucades
 DocType: Project,Total Costing Amount (via Time Logs),Suma total del càlcul del cost (a través dels registres de temps)
 DocType: Purchase Order Item Supplied,Stock UOM,UDM de l'Estoc
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Purchase Order {0} is not submitted,Ordre de Compra {0} no es presenta
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +194,Purchase Order {0} is not submitted,Ordre de Compra {0} no es presenta
 ,Projected,Projectat
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},Serial No {0} no pertany al Magatzem {1}
 apps/erpnext/erpnext/controllers/status_updater.py +136,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Nota: El sistema no verificarà el lliurament excessiva i l'excés de reserves per Punt {0} com la quantitat o la quantitat és 0
@@ -2598,7 +2506,6 @@
 DocType: Issue,Opening Date,Data d'obertura
 DocType: Journal Entry,Remark,Observació
 DocType: Purchase Receipt Item,Rate and Amount,Taxa i Quantitat
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +95,Boring,Avorrit
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +667,From Sales Order,A partir d'ordres de venda
 DocType: Blog Category,Parent Website Route,Parent Website Route
 DocType: Sales Order,Not Billed,No Anunciat
@@ -2612,19 +2519,17 @@
 apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount Amount,Quantitat de Descompte
 DocType: Purchase Invoice,Return Against Purchase Invoice,Retorn Contra Compra Factura
 DocType: Item,Warranty Period (in days),Període de garantia (en dies)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +550,e.g. VAT,"per exemple, l'IVA"
+apps/erpnext/erpnext/public/js/setup_wizard.js +292,e.g. VAT,"per exemple, l'IVA"
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,Article 4
 DocType: Journal Entry Account,Journal Entry Account,Compte entrada de diari
 DocType: Shopping Cart Settings,Quotation Series,Sèrie Cotització
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +52,"An item exists with same name ({0}), please change the item group name or rename the item","Hi ha un element amb el mateix nom ({0}), canvieu el nom de grup d'articles o canviar el nom de l'element"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +82,Hot metal gas forming,Formant gas de metall calent
 DocType: Sales Order Item,Sales Order Date,Sol·licitar Sales Data
 DocType: Sales Invoice Item,Delivered Qty,Quantitat lliurada
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +63,Warehouse {0}: Company is mandatory,Magatzem {0}: Empresa és obligatori
 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.",Anar al grup apropiat (en general Font dels fons&gt; Passius Corrents&gt; Impostos i drets i crear un nou compte (fent clic a Afegeix nen) de tipus &quot;impostos&quot; i fer parlar de la taxa d&#39;impostos.
 ,Payment Period Based On Invoice Date,Període de pagament basat en Data de la factura
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +50,Missing Currency Exchange Rates for {0},Manca de canvi de moneda per {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +135,Laser cutting,Tall per làser
 DocType: Event,Monday,Dilluns
 DocType: Journal Entry,Stock Entry,Entrada estoc
 DocType: Account,Payable,Pagador
@@ -2657,7 +2562,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +111,Date Of Retirement must be greater than Date of Joining,Data de la jubilació ha de ser major que la data del contracte
 DocType: Sales Invoice,Against Income Account,Contra el Compte d'Ingressos
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +69,{0}% Delivered,{0}% Lliurat
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +78,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Article {0}: Quantitat ordenada {1} no pot ser menor que el qty comanda mínima {2} (definit en l&#39;article).
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Article {0}: Quantitat ordenada {1} no pot ser menor que el qty comanda mínima {2} (definit en l&#39;article).
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Mensual Distribució percentual
 DocType: Territory,Territory Targets,Objectius Territori
 DocType: Delivery Note,Transporter Info,Informació del transportista
@@ -2666,7 +2571,6 @@
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,"Títols per a plantilles d'impressió, per exemple, factura proforma."
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +140,Valuation type charges can not marked as Inclusive,Càrrecs de tipus de valoració no poden marcat com Inclòs
 DocType: POS Profile,Update Stock,Actualització de Stock
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +128,Superfinishing,Superfinishing
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,UDMs diferents per als articles provocarà pesos nets (Total) erronis. Assegureu-vos que pes net de cada article és de la mateixa UDM.
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM Rate
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +85,Please pull items from Delivery Note,"Si us plau, tiri d'articles de lliurament Nota"
@@ -2681,7 +2585,6 @@
 ,Purchase Analytics,Anàlisi de Compres
 DocType: Sales Invoice Item,Delivery Note Item,Nota de lliurament d'articles
 DocType: Expense Claim,Task,Tasca
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +57,Shaving,Afeitat
 DocType: Purchase Taxes and Charges,Reference Row #,Referència Fila #
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},Nombre de lot és obligatori per Punt {0}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js +14,This is a root sales person and cannot be edited.,Es tracta d'una persona de les vendes de l'arrel i no es pot editar.
@@ -2693,13 +2596,11 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +74,Purpose must be one of {0},Propòsit ha de ser un de {0}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +108,Fill the form and save it,Ompliu el formulari i deseu
 DocType: Production Planning Tool,Download a report containing all raw materials with their latest inventory status,Descarrega un informe amb totes les matèries primeres amb el seu estat últim inventari
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +94,Facing,Davant
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,Fòrum de la comunitat
 DocType: Leave Application,Leave Balance Before Application,Leave Balance Before Application
 DocType: SMS Center,Send SMS,Enviar SMS
 DocType: Company,Default Letter Head,Per defecte Cap de la lletra
 DocType: Time Log,Billable,Facturable
-DocType: Authorization Rule,This will be used for setting rule in HR module,Això s'utilitza per ajustar la regla en el mòdul HR
 DocType: Account,Rate at which this tax is applied,Rati a la qual s'aplica aquest impost
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reorder Qty,Quantitat per a generar comanda
 DocType: Company,Stock Adjustment Account,Compte d'Ajust d'estocs
@@ -2726,16 +2627,15 @@
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,Percentatge d'assignació ha de ser igual a 100%
 DocType: Serial No,Out of AMC,Fora d'AMC
 DocType: Purchase Order Item,Material Request Detail No,Número de detall de petició de material
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +97,Hard turning,Tornejat dur
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +33,Make Maintenance Visit,Feu Manteniment Visita
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +187,Please contact to the user who have Sales Master Manager {0} role,"Si us plau, poseu-vos en contacte amb l'usuari que té vendes Mestre Director de {0} paper"
 DocType: Company,Default Cash Account,Compte de Tresoreria predeterminat
 apps/erpnext/erpnext/config/accounts.py +79,Company (not Customer or Supplier) master.,Companyia (no client o proveïdor) mestre.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +106,Please enter 'Expected Delivery Date',"Si us plau, introdueixi 'la data prevista de lliurament'"
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +187,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Albarans {0} ha de ser cancel·lat abans de cancel·lar aquesta comanda de vendes
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +100,Please enter 'Expected Delivery Date',"Si us plau, introdueixi 'la data prevista de lliurament'"
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +182,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Albarans {0} ha de ser cancel·lat abans de cancel·lar aquesta comanda de vendes
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +373,Paid amount + Write Off Amount can not be greater than Grand Total,Quantitat pagada + s'amortitza La quantitat no pot ser més gran que la Gran Total
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} no és un nombre de lot vàlida per Punt {1}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,Note: There is not enough leave balance for Leave Type {0},Note: There is not enough leave balance for Leave Type {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +124,Note: There is not enough leave balance for Leave Type {0},Note: There is not enough leave balance for Leave Type {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.","Nota: Si el pagament no es fa en contra de qualsevol referència, fer entrada de diari manualment."
 DocType: Item,Supplier Items,Articles Proveïdor
 DocType: Opportunity,Opportunity Type,Tipus d'Oportunitats
@@ -2747,7 +2647,7 @@
 DocType: Hub Settings,Publish Availability,Publicar disponibilitat
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +105,Date of Birth cannot be greater than today.,Data de naixement no pot ser més gran que l&#39;actual.
 ,Stock Ageing,Estoc Envelliment
-apps/erpnext/erpnext/controllers/accounts_controller.py +200,{0} '{1}' is disabled,{0} '{1}' es desactiva
+apps/erpnext/erpnext/controllers/accounts_controller.py +201,{0} '{1}' is disabled,{0} '{1}' es desactiva
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Posar com a obert
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Enviar correus electrònics automàtics als Contactes al Presentar les transaccions
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +232,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
@@ -2757,45 +2657,39 @@
 DocType: Purchase Order,Customer Contact Email,Client de correu electrònic de contacte
 DocType: Event,Sunday,Diumenge
 DocType: Sales Team,Contribution (%),Contribució (%)
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +455,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,"Nota: L'entrada de pagament no es crearà perquè no s'ha especificat 'Caixa o compte bancari"""
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +171,Responsibilities,Responsabilitats
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +457,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,"Nota: L'entrada de pagament no es crearà perquè no s'ha especificat 'Caixa o compte bancari"""
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +171,Responsibilities,Responsabilitats
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Template,Plantilla
 DocType: Sales Person,Sales Person Name,Nom del venedor
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,"Si us plau, introdueixi almenys 1 factura a la taula"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +511,Add Users,Afegir usuaris
+apps/erpnext/erpnext/public/js/setup_wizard.js +255,Add Users,Afegir usuaris
 DocType: Pricing Rule,Item Group,Grup d'articles
 DocType: Task,Actual Start Date (via Time Logs),Data d&#39;inici real (a través dels registres de temps)
 DocType: Stock Reconciliation Item,Before reconciliation,Abans de la reconciliació
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +12,To {0},Per {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Impostos i Càrrecs Afegits (Divisa de la Companyia)
-apps/erpnext/erpnext/stock/doctype/item/item.py +340,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,La fila de l'impost d'article {0} ha de tenir en compte el tipus d'impostos o ingressos o despeses o imposable
+apps/erpnext/erpnext/stock/doctype/item/item.py +344,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,La fila de l'impost d'article {0} ha de tenir en compte el tipus d'impostos o ingressos o despeses o imposable
 DocType: Sales Order,Partly Billed,Parcialment Facturat
 DocType: Item,Default BOM,BOM predeterminat
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +79,Decambering,Decambering
 apps/erpnext/erpnext/setup/doctype/company/company.js +22,Please re-type company name to confirm,"Si us plau, torneu a escriure nom de l&#39;empresa per confirmar"
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,Viu total Amt
 DocType: Time Log Batch,Total Hours,Total d'hores
 DocType: Journal Entry,Printing Settings,Paràmetres d&#39;impressió
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +268,Total Debit must be equal to Total Credit. The difference is {0},Dèbit total ha de ser igual al total de crèdit. La diferència és {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +11,Automotive,Automòbil
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +37,Item is required,Es requereix un article
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +25,Metal injection molding,Emmotllament per injecció de metall
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +258,Total Debit must be equal to Total Credit. The difference is {0},Dèbit total ha de ser igual al total de crèdit. La diferència és {0}
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,Automòbil
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +684,From Delivery Note,De la nota de lliurament
 DocType: Time Log,From Time,From Time
 DocType: Notification Control,Custom Message,Missatge personalitzat
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +33,Investment Banking,Banca d'Inversió
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +261,"Select your Country, Time Zone and Currency","Seleccioni el seu País, Zona horària i moneda"
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,Banca d'Inversió
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +316,"Select your Country, Time Zone and Currency","Seleccioni el seu País, Zona horària i moneda"
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +369,Cash or Bank Account is mandatory for making payment entry,Diners en efectiu o compte bancari és obligatòria per a realitzar el registre de pagaments
 DocType: Purchase Invoice,Price List Exchange Rate,Tipus de canvi per a la llista de preus
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +91,Pickling,Decapat
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +18,Sand casting,Fosa de sorra
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +117,Electroplating,Galvanoplàstia
 DocType: Purchase Invoice Item,Rate,Tarifa
 DocType: Purchase Invoice Item,Rate,Tarifa
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +62,Intern,Intern
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Intern,Intern
 DocType: Newsletter,A Lead with this email id should exist,Hauria d'haver-hi un client potencial amb aquest correu electrònic
 DocType: Stock Entry,From BOM,A partir de la llista de materials
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +34,Basic,Bàsic
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +34,Basic,Bàsic
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,Operacions borsàries abans de {0} es congelen
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +217,Please click on 'Generate Schedule',"Si us plau, feu clic a ""Generar Planificació"""
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +61,To Date should be same as From Date for Half Day leave,Per a la data ha de ser igual a partir de la data d'autorització de Medi Dia
@@ -2803,11 +2697,11 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +96,Reference No is mandatory if you entered Reference Date,Reference No és obligatori si introduir Data de Referència
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +108,Date of Joining must be greater than Date of Birth,Data d'ingrés ha de ser major que la data de naixement
 DocType: Salary Structure,Salary Structure,Estructura salarial
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +242,"Multiple Price Rule exists with same criteria, please resolve \
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +246,"Multiple Price Rule exists with same criteria, please resolve \
 			conflict by assigning priority. Price Rules: {0}","Múltiple Preu Regla existeix amb els mateixos criteris, si us plau resoldre \
  conflicte mitjançant l'assignació de prioritat. Regles Preu: {0}"
 DocType: Account,Bank,Banc
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +9,Airline,Aerolínia
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,Aerolínia
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +493,Issue Material,Material Issue
 DocType: Material Request Item,For Warehouse,Per Magatzem
 DocType: Employee,Offer Date,Data d'Oferta
@@ -2817,29 +2711,24 @@
 DocType: Item,Is Fixed Asset Item,És la partida de l'actiu fix
 DocType: Stock Entry,Including items for sub assemblies,Incloent articles per subconjunts
 DocType: Features Setup,"If you have long print formats, this feature can be used to split the page to be printed on multiple pages with all headers and footers on each page","Si vostè té formats d'impressió llargs, aquesta característica pot ser utilitzada per dividir la pàgina que s'imprimirà en diverses pàgines amb tots els encapçalaments i peus de pàgina en cada pàgina"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +131,Hobbing,Hobbing
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +98,All Territories,Tots els territoris
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +98,All Territories,Tots els territoris
 DocType: Purchase Invoice,Items,Articles
 DocType: Fiscal Year,Year Name,Nom Any
 DocType: Process Payroll,Process Payroll,Process Payroll
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +59,There are more holidays than working days this month.,Hi ha més vacances que els dies de treball aquest mes.
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +68,There are more holidays than working days this month.,Hi ha més vacances que els dies de treball aquest mes.
 DocType: Product Bundle Item,Product Bundle Item,Producte Bundle article
 DocType: Sales Partner,Sales Partner Name,Nom del revenedor
 DocType: Purchase Invoice Item,Image View,Veure imatges
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +113,Finishing & industrial finishing,Acabat i acabat industrial
 DocType: Issue,Opening Time,Temps d'obertura
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,Des i Fins a la data sol·licitada
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +46,Securities & Commodity Exchanges,Securities & Commodity Exchanges
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Securities & Commodity Exchanges
 DocType: Shipping Rule,Calculate Based On,Calcula a causa del
 DocType: Delivery Note Item,From Warehouse,De Magatzem
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +98,Drilling,Perforació
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +28,Blow molding,L&#39;emmotllament per bufat
 DocType: Purchase Taxes and Charges,Valuation and Total,Valoració i total
 DocType: Tax Rule,Shipping City,Enviaments City
 apps/erpnext/erpnext/stock/doctype/item/item.js +43,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,Aquest article és una variant de {0} (plantilla). Els atributs es copiaran de la plantilla llevat que 'No Copy' es fixa
 DocType: Account,Purchase User,Usuari de compres
 DocType: Notification Control,Customize the Notification,Personalitza la Notificació
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +87,Hammering,Martelleig
 DocType: Web Page,Slideshow,Slideshow
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +24,Default Address Template cannot be deleted,La Plantilla de la direcció predeterminada no es pot eliminar
 DocType: Sales Invoice,Shipping Rule,Regla d'enviament
@@ -2848,9 +2737,8 @@
 DocType: Workflow State,Search,cerca
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +54,Total cannot be zero,El total no pot ser 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,'Dies Des de la Darrera Comanda' ha de ser més gran que o igual a zero
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +142,Brazing,Soldadura
 DocType: C-Form,Amended From,Modificada Des de
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Raw Material,Matèria Primera
+apps/erpnext/erpnext/public/js/setup_wizard.js +359,Raw Material,Matèria Primera
 DocType: Leave Application,Follow via Email,Seguiu per correu electrònic
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Suma d'impostos Després del Descompte
 apps/erpnext/erpnext/accounts/doctype/account/account.py +174,Child account exists for this account. You can not delete this account.,Compte Nen existeix per aquest compte. No es pot eliminar aquest compte.
@@ -2864,10 +2752,10 @@
 ,Produced,Produït
 DocType: Item,Item Code for Suppliers,Codi de l&#39;article per Proveïdors
 DocType: Issue,Raised By (Email),Raised By (Email)
-apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +72,General,General
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +495,Attach Letterhead,Afegir capçalera de carta
+apps/erpnext/erpnext/setup/setup_wizard/default_website.py +72,General,General
+apps/erpnext/erpnext/public/js/setup_wizard.js +241,Attach Letterhead,Afegir capçalera de carta
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +272,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',No es pot deduir quan categoria és per a 'Valoració' o 'Valoració i Total'
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +542,"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.","Enumereu els seus caps fiscals (per exemple, l&#39;IVA, duanes, etc., sinó que han de tenir noms únics) i les seves tarifes estàndard. Això crearà una plantilla estàndard, que pot editar i afegir més tard."
+apps/erpnext/erpnext/public/js/setup_wizard.js +284,"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.","Enumereu els seus caps fiscals (per exemple, l&#39;IVA, duanes, etc., sinó que han de tenir noms únics) i les seves tarifes estàndard. Això crearà una plantilla estàndard, que pot editar i afegir més tard."
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial Nos Required for Serialized Item {0},Nº de Sèrie Necessari per article serialitzat {0}
 DocType: Journal Entry,Bank Entry,Entrada Banc
 DocType: Authorization Rule,Applicable To (Designation),Aplicable a (Designació)
@@ -2876,33 +2764,32 @@
 apps/erpnext/erpnext/config/accounts.py +143,Enable / disable currencies.,Activar / desactivar les divises.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Postal Expenses,Despeses postals
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Total (Amt)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +26,Entertainment & Leisure,Entreteniment i Oci
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,Entreteniment i Oci
 DocType: Purchase Order,The date on which recurring order will be stop,La data en què s'aturarà la comanda recurrent
 DocType: Quality Inspection,Item Serial No,Número de sèrie d'article
 apps/erpnext/erpnext/controllers/status_updater.py +142,{0} must be reduced by {1} or you should increase overflow tolerance,{0} ha de ser reduït per {1} o s'ha d'augmentar la tolerància de desbordament
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Present,Present total
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Hour,Hora
+apps/erpnext/erpnext/public/js/setup_wizard.js +363,Hour,Hora
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +138,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation","Serialitzat article {0} no es pot actualitzar utilitzant \
  Stock Reconciliació"
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +488,Transfer Material to Supplier,Transferència de material a proveïdor
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +513,Transfer Material to Supplier,Transferència de material a proveïdor
 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,Nou Nombre de sèrie no pot tenir Warehouse. Magatzem ha de ser ajustat per Stock entrada o rebut de compra
 DocType: Lead,Lead Type,Tipus de client potencial
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +82,Create Quotation,Crear Cotització
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +306,All these items have already been invoiced,Tots aquests elements ja s'han facturat
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,You are not authorized to approve leaves on Block Dates,No està autoritzat per aprovar els fulls de bloquejar les dates
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +311,All these items have already been invoiced,Tots aquests elements ja s'han facturat
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},Pot ser aprovat per {0}
 DocType: Shipping Rule,Shipping Rule Conditions,Condicions d'enviament
 DocType: BOM Replace Tool,The new BOM after replacement,La nova llista de materials després del reemplaçament
 DocType: Features Setup,Point of Sale,Punt de Venda
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +83,Curling,Curling
 DocType: Account,Tax,Impost
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +28,Row {0}: {1} is not a valid {2},La fila {0}: {1} no és vàlida per {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +89,Refining,Refinació
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +37,Row {0}: {1} is not a valid {2},La fila {0}: {1} no és vàlida per {2}
 DocType: Production Planning Tool,Production Planning Tool,Eina de Planificació de la producció
 DocType: Quality Inspection,Report Date,Data de l'informe
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +130,Routing,Encaminament
 DocType: C-Form,Invoices,Factures
 DocType: Job Opening,Job Title,Títol Professional
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +54,{0} already allocated for Employee {1} for period {2} - {3},{0} ja assignat per Empleat {1} per al període {2} - {3}
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +80,{0} Recipients,{0} Destinataris
 DocType: Features Setup,Item Groups in Details,Els grups d'articles en detalls
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +335,Quantity to Manufacture must be greater than 0.,Quantitat de Fabricació ha de ser major que 0.
@@ -2920,14 +2807,13 @@
 DocType: DocType,Setup,Ajustos
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,No hi ha res a editar.
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +108,Summary for this month and pending activities,Resum per a aquest mes i activitats pendents
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +39,Cold rolling,Laminació en fred
 DocType: Customer Group,Customer Group Name,Nom del grup al Client
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +408,Please remove this Invoice {0} from C-Form {1},"Si us plau, elimini aquest Factura {0} de C-Form {1}"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +410,Please remove this Invoice {0} from C-Form {1},"Si us plau, elimini aquest Factura {0} de C-Form {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,Seleccioneu Carry Forward si també voleu incloure el balanç de l'any fiscal anterior deixa a aquest any fiscal
 DocType: GL Entry,Against Voucher Type,Contra el val tipus
 DocType: Item,Attributes,Atributs
 DocType: Packing Slip,Get Items,Obtenir elements
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +186,Please enter Write Off Account,Si us plau indica el Compte d'annotació
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +187,Please enter Write Off Account,Si us plau indica el Compte d'annotació
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +71,Last Order Date,Darrera Data de comanda
 DocType: DocField,Image,Imatge
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +179,Make Excise Invoice,Feu Factura impostos especials
@@ -2937,7 +2823,7 @@
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +146,Operation ID not set,ID Operació no estableix
 DocType: Production Order,Planned Start Date,Data d'inici prevista
 DocType: Serial No,Creation Document Type,Creació de tipus de document
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +620,Maint. Visit,Maint. Visita
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +631,Maint. Visit,Maint. Visita
 DocType: Leave Type,Is Encash,És convertirà en efectiu
 DocType: Purchase Invoice,Mobile No,Número de Mòbil
 DocType: Payment Tool,Make Journal Entry,Feu entrada de diari
@@ -2945,35 +2831,31 @@
 apps/erpnext/erpnext/controllers/trends.py +257,Project-wise data is not available for Quotation,Dades-Project savi no està disponible per a la cita
 DocType: Project,Expected End Date,Esperat Data de finalització
 DocType: Appraisal Template,Appraisal Template Title,Títol de plantilla d'avaluació
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +440,Commercial,Comercial
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +378,Commercial,Comercial
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +23,Parent Item {0} must not be a Stock Item,Article Pare {0} no ha de ser un arxiu d&#39;articles
 DocType: Cost Center,Distribution Id,ID de Distribució
-apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +14,Awesome Services,Serveis impressionants
+apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +14,Awesome Services,Serveis impressionants
 apps/erpnext/erpnext/config/manufacturing.py +29,All Products or Services.,Tots els Productes o Serveis.
 DocType: Purchase Invoice,Supplier Address,Adreça del Proveïdor
 DocType: Contact Us Settings,Address Line 2,Adreça Línia 2
 DocType: ToDo,Reference,referència
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +59,Perforating,Perforat
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,Quantitat de sortida
 apps/erpnext/erpnext/config/accounts.py +128,Rules to calculate shipping amount for a sale,Regles per calcular l'import d'enviament per a una venda
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +29,Series is mandatory,Sèries és obligatori
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +28,Financial Services,Serveis Financers
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,Serveis Financers
 apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3},Valor de l&#39;atribut {0} ha d&#39;estar dins del rang de {1} a {2} en els increments de {3}
 DocType: Tax Rule,Sales,Venda
 DocType: Stock Entry Detail,Basic Amount,Suma Bàsic
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +173,Warehouse required for stock Item {0},Magatzem necessari per a l'article d'estoc {0}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +178,Warehouse required for stock Item {0},Magatzem necessari per a l'article d'estoc {0}
 DocType: Leave Allocation,Unused leaves,Fulles no utilitzades
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,Cr
 DocType: Customer,Default Receivable Accounts,Per defecte Comptes per cobrar
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +102,Sawing,Serrar
 DocType: Tax Rule,Billing State,Estat de facturació
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +32,Laminating,Laminació
 DocType: Item Reorder,Transfer,Transferència
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +549,Fetch exploded BOM (including sub-assemblies),Fetch exploded BOM (including sub-assemblies)
 DocType: Authorization Rule,Applicable To (Employee),Aplicable a (Empleat)
 apps/erpnext/erpnext/controllers/accounts_controller.py +101,Due Date is mandatory,Data de venciment és obligatori
 apps/erpnext/erpnext/controllers/item_variant.py +51,Increment for Attribute {0} cannot be 0,Increment de Atribut {0} no pot ser 0
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +143,Sintering,La sinterització
 DocType: Journal Entry,Pay To / Recd From,Pagar a/Rebut de
 DocType: Naming Series,Setup Series,Sèrie d'instal·lació
 DocType: Supplier,Contact HTML,Contacte HTML
@@ -2986,7 +2868,6 @@
 DocType: Attendance,Absent,Absent
 DocType: Product Bundle,Product Bundle,Bundle Producte
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +180,Row {0}: Invalid reference {1},Fila {0}: Referència no vàlida {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +165,Crushing,Aclaparadora
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Compra les taxes i càrrecs Plantilla
 DocType: Upload Attendance,Download Template,Descarregar plantilla
 DocType: GL Entry,Remarks,Observacions
@@ -2994,14 +2875,12 @@
 DocType: Journal Entry,Write Off Based On,Anotació basada en
 DocType: Features Setup,POS View,POS Veure
 apps/erpnext/erpnext/config/stock.py +38,Installation record for a Serial No.,Registre d'instal·lació per a un nº de sèrie
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +9,Continuous casting,La colada contínua
 apps/erpnext/erpnext/public/js/queries.js +39,Please specify a,"Si us plau, especifiqueu un"
 DocType: Offer Letter,Awaiting Response,Espera de la resposta
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +53,Above,Per sobre de
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +80,Cold sizing,Dimensionament Freda
 DocType: Salary Slip,Earning & Deduction,Guanyar i Deducció
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +76,Account {0} cannot be a Group,El Compte {0} no pot ser un grup
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +259,Region,Regió
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +314,Region,Regió
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +213,Optional. This setting will be used to filter in various transactions.,Opcional. Aquest ajust s'utilitza per filtrar en diverses transaccions.
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +104,Negative Valuation Rate is not allowed,No es permeten els ràtios de valoració negatius
 DocType: Holiday List,Weekly Off,Setmanal Off
@@ -3019,7 +2898,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,Account {0} is inactive,Compte {0} està inactiu
 DocType: GL Entry,Is Advance,És Avanç
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,Assistència Des de la data i Assistència a la data és obligatori
-apps/erpnext/erpnext/controllers/buying_controller.py +131,Please enter 'Is Subcontracted' as Yes or No,"Si us plau, introdueixi 'subcontractació' com Sí o No"
+apps/erpnext/erpnext/controllers/buying_controller.py +122,Please enter 'Is Subcontracted' as Yes or No,"Si us plau, introdueixi 'subcontractació' com Sí o No"
 DocType: Sales Team,Contact No.,Número de Contacte
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,'Profit and Loss' type account {0} not allowed in Opening Entry,"""Pèrdues i Guanys"" tipus de compte {0} no es permet l'entrada amb obertura"
 DocType: Workflow State,Time,temps
@@ -3028,14 +2907,13 @@
 DocType: Authorization Rule,Authorization Rule,Regla d'Autorització
 DocType: Sales Invoice,Terms and Conditions Details,Termes i Condicions Detalls
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,Impostos i càrrecs de venda de plantilla
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +10,Apparel & Accessories,Roba i Accessoris
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,Roba i Accessoris
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +67,Number of Order,Número d'ordre
 DocType: Item Group,HTML / Banner that will show on the top of product list.,HTML / Banner que apareixerà a la part superior de la llista de productes.
 DocType: Shipping Rule,Specify conditions to calculate shipping amount,Especifica les condicions d'enviament per calcular l'import del transport
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +121,Add Child,Afegir Nen
 DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,Paper deixa forjar congelats Comptes i editar les entrades congelades
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +52,Cannot convert Cost Center to ledger as it has child nodes,"No es pot convertir de centres de cost per al llibre major, ja que té nodes secundaris"
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +47,Conversion Factor is required,Es requereix el factor de conversió
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +37,Serial #,Serial #
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +87,Commission on Sales,Comissió de Vendes
 DocType: Offer Letter Term,Value / Description,Valor / Descripció
@@ -3043,10 +2921,8 @@
 ,Customers Not Buying Since Long Time,Els clients no comprar des de fa molt temps
 DocType: Production Order,Expected Delivery Date,Data de lliurament esperada
 apps/erpnext/erpnext/accounts/general_ledger.py +121,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Dèbit i Crèdit no és igual per a {0} # {1}. La diferència és {2}.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +48,Bulging,Voluminós
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +11,Evaporative-pattern casting,Evaporatiu-model de fosa
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Entertainment Expenses,Despeses d'Entreteniment
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +195,Sales Invoice {0} must be cancelled before cancelling this Sales Order,La factura {0} ha de ser cancel·lada abans de cancel·lar aquesta comanda de vendes
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +190,Sales Invoice {0} must be cancelled before cancelling this Sales Order,La factura {0} ha de ser cancel·lada abans de cancel·lar aquesta comanda de vendes
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +61,Age,Edat
 DocType: Time Log,Billing Amount,Facturació Monto
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +84,Invalid quantity specified for item {0}. Quantity should be greater than 0.,Quantitat no vàlid per a l'aricle {0}. Quantitat ha de ser major que 0.
@@ -3065,26 +2941,24 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,Nous ingressos al Client
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Travel Expenses,Despeses de viatge
 DocType: Maintenance Visit,Breakdown,Breakdown
-apps/erpnext/erpnext/controllers/accounts_controller.py +241,Account: {0} with currency: {1} can not be selected,Compte: {0} amb la divisa: {1} no es pot seleccionar
+apps/erpnext/erpnext/controllers/accounts_controller.py +242,Account: {0} with currency: {1} can not be selected,Compte: {0} amb la divisa: {1} no es pot seleccionar
 DocType: Bank Reconciliation Detail,Cheque Date,Data Xec
 apps/erpnext/erpnext/accounts/doctype/account/account.py +47,Account {0}: Parent account {1} does not belong to company: {2},Compte {0}: el compte Pare {1} no pertany a la companyia: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted all transactions related to this company!,Eliminat correctament totes les transaccions relacionades amb aquesta empresa!
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,Com en la data
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +111,Honing,Esmolant
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +58,Probation,Probation
-apps/erpnext/erpnext/stock/doctype/item/item.py +264,Default Warehouse is mandatory for stock Item.,El magatzem predeterminat és obligatòria pels articles d'estoc
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Probation,Probation
+apps/erpnext/erpnext/stock/doctype/item/item.py +268,Default Warehouse is mandatory for stock Item.,El magatzem predeterminat és obligatòria pels articles d'estoc
 DocType: Feed,Full Name,Nom complet
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +148,Clinching,Reblat
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +191,Payment of salary for the month {0} and year {1},El pagament del salari corresponent al mes {0} i {1} anys
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +173,Payment of salary for the month {0} and year {1},El pagament del salari corresponent al mes {0} i {1} anys
 DocType: Stock Settings,Auto insert Price List rate if missing,Acte inserit taxa Llista de Preus si falta
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,Suma total de pagament
 ,Transferred Qty,Quantitat Transferida
 apps/erpnext/erpnext/config/learn.py +11,Navigating,Navegació
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +137,Planning,Planificació
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +137,Planning,Planificació
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +9,Make Time Log Batch,Fer un registre de temps
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Issued,Emès
 DocType: Project,Total Billing Amount (via Time Logs),Suma total de facturació (a través dels registres de temps)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +629,We sell this Item,Venem aquest article
+apps/erpnext/erpnext/public/js/setup_wizard.js +365,We sell this Item,Venem aquest article
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +65,Supplier Id,Identificador de Proveïdor
 DocType: Journal Entry,Cash Entry,Entrada Efectiu
 DocType: Sales Partner,Contact Desc,Descripció del Contacte
@@ -3093,18 +2967,16 @@
 DocType: Brand,Item Manager,Administració d&#39;elements
 DocType: Cost Center,Add rows to set annual budgets on Accounts.,Afegir files per establir els pressupostos anuals de Comptes.
 DocType: Buying Settings,Default Supplier Type,Tipus predeterminat de Proveïdor
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +160,Quarrying,Extracció
 DocType: Production Order,Total Operating Cost,Cost total de funcionament
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +160,Note: Item {0} entered multiple times,Nota: L'article {0} entrat diverses vegades
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +163,Note: Item {0} entered multiple times,Nota: L'article {0} entrat diverses vegades
 apps/erpnext/erpnext/config/crm.py +27,All Contacts.,Tots els contactes.
 DocType: Newsletter,Test Email Id,Test Email Id
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +394,Company Abbreviation,Abreviatura de l'empresa
+apps/erpnext/erpnext/public/js/setup_wizard.js +142,Company Abbreviation,Abreviatura de l'empresa
 DocType: Features Setup,If you follow Quality Inspection. Enables Item QA Required and QA No in Purchase Receipt,Si vostè segueix la inspecció de qualitat. Permet article QA Obligatori i QA No en rebut de compra
 DocType: GL Entry,Party Type,Tipus Partit
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +68,Raw material cannot be same as main Item,La matèria primera no pot ser la mateixa que article principal
 DocType: Item Attribute Value,Abbreviation,Abreviatura
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,No distribuïdor oficial autoritzat des {0} excedeix els límits
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +30,Rotational molding,El modelo rotacional
 apps/erpnext/erpnext/config/hr.py +115,Salary template master.,Salary template master.
 DocType: Leave Type,Max Days Leave Allowed,Màxim de dies d'absència permesos
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +55,Set Tax Rule for shopping cart,Estableixi la regla fiscal de carret de la compra
@@ -3118,15 +2990,15 @@
 apps/erpnext/erpnext/config/selling.py +18,Quotes to Leads or Customers.,Cotitzacions a clients potencials o a clients.
 DocType: Stock Settings,Role Allowed to edit frozen stock,Paper animals d'editar estoc congelat
 ,Territory Target Variance Item Group-Wise,Territori de destinació Variància element de grup-Wise
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +101,All Customer Groups,Tots els Grups de clients
-apps/erpnext/erpnext/controllers/accounts_controller.py +474,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} és obligatori. Potser el registre de canvi de divisa no es crea per {1} a {2}.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +101,All Customer Groups,Tots els Grups de clients
+apps/erpnext/erpnext/controllers/accounts_controller.py +475,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} és obligatori. Potser el registre de canvi de divisa no es crea per {1} a {2}.
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +37,Tax Template is mandatory.,Plantilla d&#39;impostos és obligatori.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +41,Account {0}: Parent account {1} does not exist,Compte {0}: el compte superior {1} no existeix
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Tarifa de preus (en la moneda de la companyia)
 DocType: Account,Temporary,Temporal
 DocType: Address,Preferred Billing Address,Preferit Direcció de facturació
 DocType: Monthly Distribution Percentage,Percentage Allocation,Percentatge d'Assignació
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +86,Secretary,Secretari
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Secretary,Secretari
 DocType: Serial No,Distinct unit of an Item,Unitat diferent d'un article
 DocType: Pricing Rule,Buying,Compra
 DocType: HR Settings,Employee Records to be created by,Registres d'empleats a ser creats per
@@ -3139,9 +3011,8 @@
 ,Item-wise Price List Rate,Llista de Preus de tarifa d'article
 DocType: Purchase Order Item,Supplier Quotation,Cita Proveïdor
 DocType: Quotation,In Words will be visible once you save the Quotation.,En paraules seran visibles un cop que es guarda la Cotització.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +68,Ironing,Planxat
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is stopped,{0} {1} està aturat
-apps/erpnext/erpnext/stock/doctype/item/item.py +352,Barcode {0} already used in Item {1},Barcode {0} ja utilitzat en el punt {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +356,Barcode {0} already used in Item {1},Barcode {0} ja utilitzat en el punt {1}
 DocType: Lead,Add to calendar on this date,Afegir al calendari en aquesta data
 apps/erpnext/erpnext/config/selling.py +132,Rules for adding shipping costs.,Regles per afegir les despeses d'enviament.
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,Pròxims esdeveniments
@@ -3150,13 +3021,12 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +27,Quick Entry,Entrada ràpida
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0} és obligatori per a la Tornada
 DocType: Purchase Order,To Receive,Rebre
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +33,Shrink fitting,Shrink apropiat
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +522,user@example.com,user@example.com
+apps/erpnext/erpnext/public/js/setup_wizard.js +266,user@example.com,user@example.com
 DocType: Email Digest,Income / Expense,Ingressos / despeses
 DocType: Employee,Personal Email,Email Personal
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +58,Total Variance,Variància total
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +62,Total Variance,Variància total
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.","Si està activat, el sistema comptabilitza els assentaments comptables per a l'inventari automàticament."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +15,Brokerage,Corretatge
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +15,Brokerage,Corretatge
 DocType: Address,Postal Code,Codi Postal
 DocType: Production Order Operation,"in Minutes
 Updated via 'Time Log'","en minuts 
@@ -3164,14 +3034,13 @@
 DocType: Customer,From Lead,De client potencial
 apps/erpnext/erpnext/config/manufacturing.py +19,Orders released for production.,Comandes llançades per a la producció.
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +42,Select Fiscal Year...,Seleccioneu l'Any Fiscal ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +442,POS Profile required to make POS Entry,POS perfil requerit per fer l&#39;entrada POS
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +444,POS Profile required to make POS Entry,POS perfil requerit per fer l&#39;entrada POS
 DocType: Hub Settings,Name Token,Nom Token
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +106,Planing,Raspallat
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Selling,Standard Selling
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +120,Standard Selling,Standard Selling
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +137,Atleast one warehouse is mandatory,Almenys un magatzem és obligatori
 DocType: Serial No,Out of Warranty,Fora de la Garantia
 DocType: BOM Replace Tool,Replace,Reemplaçar
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +314,{0} against Sales Invoice {1},{0} contra factura Vendes {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +316,{0} against Sales Invoice {1},{0} contra factura Vendes {1}
 apps/erpnext/erpnext/stock/doctype/item/item.py +49,Please enter default Unit of Measure,Si us plau ingressi Unitat de mesura per defecte
 DocType: Purchase Invoice Item,Project Name,Nom del projecte
 DocType: Supplier,Mention if non-standard receivable account,Esmenteu si compta per cobrar no estàndard
@@ -3187,9 +3056,8 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,Journal Entry {0} does not have account {1} or already matched against other voucher,Seient {0} no té compte {1} o ja compara amb un altre bo
 DocType: Item,Moving Average,Mitjana Mòbil
 DocType: BOM Replace Tool,The BOM which will be replaced,Llista de materials que serà substituïda
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +43,New Stock UOM must be different from current stock UOM,Nou Stock UOM ha de ser diferent de l'actual de les accions UOM
 DocType: Account,Debit,Dèbit
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +34,Leaves must be allocated in multiples of 0.5,"Les fulles han de ser assignats en múltiples de 0,5"
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +44,Leaves must be allocated in multiples of 0.5,"Les fulles han de ser assignats en múltiples de 0,5"
 DocType: Production Order,Operation Cost,Cost d'operació
 apps/erpnext/erpnext/config/hr.py +71,Upload attendance from a .csv file,Puja l'assistència d'un arxiu .csv
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,Excel·lent Amt
@@ -3207,8 +3075,7 @@
 DocType: Employee,Internal Work History,Historial de treball intern
 DocType: DocField,Column Break,Salt de columna
 DocType: Event,Thursday,Dijous
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +42,Private Equity,Private Equity
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +93,Turning,Tornejat
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,Private Equity
 DocType: Maintenance Visit,Customer Feedback,Comentaris del client
 DocType: Account,Expense,Despesa
 DocType: Sales Invoice,Exhibition,Exposició
@@ -3221,19 +3088,19 @@
 DocType: Employee,Held On,Held On
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +33,Production Item,Element Producció
 ,Employee Information,Informació de l'empleat
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,Rate (%),Tarifa (%)
+apps/erpnext/erpnext/public/js/setup_wizard.js +294,Rate (%),Tarifa (%)
 DocType: Stock Entry Detail,Additional Cost,Cost addicional
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +407,Financial Year End Date,Data de finalització de l'exercici fiscal
+apps/erpnext/erpnext/public/js/setup_wizard.js +155,Financial Year End Date,Data de finalització de l'exercici fiscal
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Voucher No, if grouped by Voucher","Can not filter based on Voucher No, if grouped by Voucher"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +484,Make Supplier Quotation,Fer Oferta de Proveïdor
 DocType: Quality Inspection,Incoming,Entrant
 DocType: BOM,Materials Required (Exploded),Materials necessaris (explotat)
 DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),Reduir el guany per absències sense sou (LWP)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +512,"Add users to your organization, other than yourself","Afegir usuaris a la seva organització, que no sigui vostè"
+apps/erpnext/erpnext/public/js/setup_wizard.js +256,"Add users to your organization, other than yourself","Afegir usuaris a la seva organització, que no sigui vostè"
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No {1} does not match with {2} {3},Fila # {0}: Nombre de sèrie {1} no coincideix amb {2} {3}
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +44,Casual Leave,Deixar Casual
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +44,Casual Leave,Deixar Casual
 DocType: Batch,Batch ID,Identificació de lots
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +334,Note: {0},Nota: {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +336,Note: {0},Nota: {0}
 ,Delivery Note Trends,Nota de lliurament Trends
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +104,This Week's Summary,Resum de la setmana
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +74,{0} must be a Purchased or Sub-Contracted Item in row {1},{0} ha de ser un article de compra o de subcontractació a la fila {1}
@@ -3245,7 +3112,7 @@
 DocType: Purchase Receipt,Return Against Purchase Receipt,Retorn Contra Compra Rebut
 DocType: Purchase Order,To Bill,Per Bill
 DocType: Material Request,% Ordered,Demanem%
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +61,Piecework,Treball a preu fet
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Piecework,Treball a preu fet
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +64,Avg. Buying Rate,Quota de compra mitja
 DocType: Task,Actual Time (in Hours),Temps real (en hores)
 DocType: Employee,History In Company,Història a la Companyia
@@ -3262,13 +3129,13 @@
 DocType: Opportunity,To Discuss,Per Discutir
 DocType: SMS Settings,SMS Settings,Ajustaments de SMS
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +60,Temporary Accounts,Comptes temporals
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +155,Black,Negre
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Black,Negre
 DocType: BOM Explosion Item,BOM Explosion Item,Explosió de BOM d'article
 DocType: Account,Auditor,Auditor
 DocType: Purchase Order,End date of current order's period,Data de finalització del període de l'ordre actual
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +17,Make Offer Letter,Fer una Oferta Carta
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +10,Return,Retorn
-apps/erpnext/erpnext/stock/doctype/item/item.py +503,Default Unit of Measure for Variant must be same as Template,Unitat de mesura per defecte per a la variant ha de ser la mateixa que la plantilla
+apps/erpnext/erpnext/stock/doctype/item/item.py +507,Default Unit of Measure for Variant must be same as Template,Unitat de mesura per defecte per a la variant ha de ser la mateixa que la plantilla
 DocType: DocField,Fold,fold
 DocType: Production Order Operation,Production Order Operation,Ordre de Producció Operació
 DocType: Pricing Rule,Disable,Desactiva
@@ -3279,13 +3146,12 @@
 DocType: Page,Page Name,Nom de pàgina
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +110,To Time must be greater than From Time,Per Temps ha de ser més gran que From Time
 DocType: Journal Entry Account,Exchange Rate,Tipus De Canvi
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +465,Sales Order {0} is not submitted,Comanda de client {0} no es presenta
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +467,Sales Order {0} is not submitted,Comanda de client {0} no es presenta
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0}: Parent account {1} does not bolong to the company {2},Magatzem {0}: compte de Pares {1} no Bolong a l'empresa {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +124,Spindle finishing,Acabat cargol
 DocType: BOM,Last Purchase Rate,Darrera Compra Rate
 DocType: Account,Asset,Basa
 DocType: Project Task,Task ID,Tasca ID
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +395,"e.g. ""MC""","per exemple ""MC """
+apps/erpnext/erpnext/public/js/setup_wizard.js +143,"e.g. ""MC""","per exemple ""MC """
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,Stock cannot exist for Item {0} since has variants,Estoc no pot existir per al punt {0} ja té variants
 ,Sales Person-wise Transaction Summary,Resum de transaccions de vendes Persona-savi
 DocType: System Settings,Time Zone,Fus horari
@@ -3294,9 +3160,7 @@
 DocType: Monthly Distribution,Monthly Distribution Percentages,Els percentatges de distribució mensuals
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +16,The selected item cannot have Batch,L'element seleccionat no pot tenir per lots
 DocType: Delivery Note,% of materials delivered against this Delivery Note,% de materials lliurats d'aquesta Nota de Lliurament
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +151,Stapling,Grapat
 DocType: Customer,Customer Details,Dades del client
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +105,Shaping,Shaping
 DocType: Employee,Reports to,Informes a
 DocType: SMS Settings,Enter url parameter for receiver nos,Introdueix els paràmetres URL per als receptors
 DocType: Sales Invoice,Paid Amount,Quantitat pagada
@@ -3305,13 +3169,13 @@
 DocType: Item Variant,Item Variant,Article Variant
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +15,Setting this Address Template as default as there is no other default,En establir aquesta plantilla de direcció per defecte ja que no hi ha altre defecte
 apps/erpnext/erpnext/accounts/doctype/account/account.py +89,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Saldo del compte ja en dèbit, no se li permet establir ""El balanç ha de ser"" com ""crèdit"""
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +76,Quality Management,Gestió de la Qualitat
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Quality Management,Gestió de la Qualitat
 DocType: Production Planning Tool,Filter based on customer,Filtre basat en el client
 DocType: Payment Tool Detail,Against Voucher No,Contra el comprovant número
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +47,Please enter quantity for Item {0},Introduïu la quantitat d'articles per {0}
 DocType: Employee External Work History,Employee External Work History,Historial de treball d'Empleat extern
 DocType: Tax Rule,Purchase,Compra
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +34,Balance Qty,Saldo Quantitat
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Balance Qty,Saldo Quantitat
 DocType: Item Group,Parent Item Group,Grup d'articles pare
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +21,{0} for {1},{0} de {1}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +96,Cost Centers,Centres de costos
@@ -3321,12 +3185,12 @@
 DocType: Opportunity,Next Contact,Següent Contacte
 DocType: Employee,Employment Type,Tipus d'Ocupació
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,Actius Fixos
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +84,Application period cannot be across two alocation records,Període d&#39;aplicació no pot ser a través de dos registres alocation
 DocType: Item Group,Default Expense Account,Compte de Despeses predeterminat
 DocType: Employee,Notice (days),Avís (dies)
 DocType: Page,Yes,Sí
 DocType: Tax Rule,Sales Tax Template,Plantilla d&#39;Impost a les Vendes
 DocType: Employee,Encashment Date,Data Cobrament
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +74,Electroforming,Electroformado
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +179,"Against Voucher Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Contra val Type ha de ser un ordre de compra, factura de compra o entrada de diari"
 DocType: Account,Stock Adjustment,Ajust d'estoc
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +34,Default Activity Cost exists for Activity Type - {0},Hi Cost per defecte per al tipus d&#39;activitat Activitat - {0}
@@ -3362,12 +3226,12 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,El Magatzem no es pot eliminar perquè hi ha entrades al llibre major d'existències d'aquest magatzem.
 DocType: Company,Distribution,Distribució
 apps/erpnext/erpnext/public/js/pos/pos.html +36,Amount Paid,Quantitat pagada
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +91,Project Manager,Gerent De Projecte
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +72,Dispatch,Despatx
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Project Manager,Gerent De Projecte
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +72,Dispatch,Despatx
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,Descompte màxim permès per l'article: {0} és {1}%
 DocType: Customer,Default Taxes and Charges,Impostos i Càrrecs per defecte
 DocType: Account,Receivable,Compte per cobrar
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +268,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,Fila # {0}: No es permet canviar de proveïdors com l&#39;Ordre de Compra ja existeix
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +263,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,Fila # {0}: No es permet canviar de proveïdors com l&#39;Ordre de Compra ja existeix
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,Rol al que es permet presentar les transaccions que excedeixin els límits de crèdit establerts.
 DocType: Sales Invoice,Supplier Reference,Referència Proveïdor
 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.","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."
@@ -3375,8 +3239,8 @@
 DocType: Hub Settings,Seller Description,Venedor Descripció
 DocType: Employee Education,Qualification,Qualificació
 DocType: Item Price,Item Price,Preu d'article
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +48,Soap & Detergent,Sabó i Detergent
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +36,Motion Picture & Video,Cinema i vídeo
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +48,Soap & Detergent,Sabó i Detergent
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +36,Motion Picture & Video,Cinema i vídeo
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Ordenat
 DocType: Warehouse,Warehouse Name,Nom Magatzem
 DocType: Naming Series,Select Transaction,Seleccionar Transacció
@@ -3385,7 +3249,6 @@
 DocType: BOM,Rate Of Materials Based On,Tarifa de materials basats en
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,Analtyics Suport
 apps/erpnext/erpnext/accounts/doctype/accounts_settings/accounts_settings.py +27,Company is missing in warehouses {0},Falta Empresa als magatzems {0}
-DocType: Stock UOM Replace Utility,Stock UOM Replace Utility,Utilitat de susbtitució de les UDM de l'estoc
 DocType: POS Profile,Terms and Conditions,Condicions
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,To Date should be within the Fiscal Year. Assuming To Date = {0},Per a la data ha d'estar dins de l'any fiscal. Suposant Per Data = {0}
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","Aquí pot actualitzar l'alçada, el pes, al·lèrgies, problemes mèdics, etc."
@@ -3397,7 +3260,7 @@
 DocType: Sales Order Item,For Production,Per Producció
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +103,Please enter sales order in the above table,Introduïu l'ordre de venda a la taula anterior
 DocType: Project Task,View Task,Vista de tasques
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +406,Your financial year begins on,El seu exercici comença el
+apps/erpnext/erpnext/public/js/setup_wizard.js +154,Your financial year begins on,El seu exercici comença el
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +46,Please enter Purchase Receipts,Si us plau ingressi rebuts de compra
 DocType: Sales Invoice,Get Advances Received,Obtenir les bestretes rebudes
 DocType: Email Digest,Add/Remove Recipients,Afegir / Treure Destinataris
@@ -3405,16 +3268,14 @@
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","Per establir aquest any fiscal predeterminat, feu clic a ""Estableix com a predeterminat"""
 apps/erpnext/erpnext/config/support.py +54,Setup incoming server for support email id. (e.g. support@example.com),Configuració del servidor d'entrada per l'id de suport per correu electrònic. (Per exemple support@example.com)
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,Quantitat escassetat
-apps/erpnext/erpnext/stock/doctype/item/item.py +528,Item variant {0} exists with same attributes,Hi ha la variant d&#39;article {0} amb mateixos atributs
+apps/erpnext/erpnext/stock/doctype/item/item.py +532,Item variant {0} exists with same attributes,Hi ha la variant d&#39;article {0} amb mateixos atributs
 DocType: Salary Slip,Salary Slip,Slip Salari
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +116,Burnishing,Brunyit
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +54,'To Date' is required,'Per Dóna't' es requereix
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,'Per Dóna't' es requereix
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","Generar albarans paquets que es lliuraran. S'utilitza per notificar el nombre de paquets, el contingut del paquet i el seu pes."
 DocType: Sales Invoice Item,Sales Order Item,Sol·licitar Sales Item
 DocType: Salary Slip,Payment Days,Dies de pagament
 DocType: BOM,Manage cost of operations,Administrar cost de les operacions
 DocType: Features Setup,Item Advanced,Article Avançat
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +40,Hot rolling,Laminació en calent
 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.","Quan es ""Presenta"" alguna de les operacions marcades, s'obre automàticament un correu electrònic emergent per enviar un correu electrònic al ""Contacte"" associat a aquesta transacció, amb la transacció com un arxiu adjunt. L'usuari pot decidir enviar, o no, el correu electrònic."
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,Configuració global
 DocType: Employee Education,Employee Education,Formació Empleat
@@ -3427,25 +3288,23 @@
 DocType: Customer,Sales Team Details,Detalls de l'Equip de Vendes
 DocType: Expense Claim,Total Claimed Amount,Suma total del Reclamat
 apps/erpnext/erpnext/config/crm.py +22,Potential opportunities for selling.,Els possibles oportunitats de venda.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +48,Sick Leave,Baixa per malaltia
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +174,Invalid {0},No vàlida {0}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +48,Sick Leave,Baixa per malaltia
 DocType: Email Digest,Email Digest,Butlletí per correu electrònic
 DocType: Delivery Note,Billing Address Name,Nom de l'adressa de facturació
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +22,Department Stores,Grans Magatzems
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,Grans Magatzems
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +40,System Balance,Balanç de Sistema
 DocType: Workflow,Is Active,Està actiu
 apps/erpnext/erpnext/controllers/stock_controller.py +71,No accounting entries for the following warehouses,No hi ha assentaments comptables per als següents magatzems
 apps/erpnext/erpnext/projects/doctype/project/project.js +22,Save the document first.,Deseu el document primer.
 DocType: Account,Chargeable,Facturable
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +121,Linishing,Desbarbatge
 DocType: Company,Change Abbreviation,Canvi Abreviatura
 DocType: Workflow State,Primary,Primari
 DocType: Expense Claim Detail,Expense Date,Data de la Despesa
 DocType: Item,Max Discount (%),Descompte màxim (%)
 DocType: Communication,More Information,Més informació
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +70,Last Order Amount,Darrera Quantitat de l'ordre
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +161,Blasting,Voladura
 DocType: Company,Warn,Advertir
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +111,Item valuation updated,Valoració Article actualitzat
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Altres observacions, esforç notable que ha d&#39;anar en els registres."
 DocType: BOM,Manufacturing User,Usuari de fabricació
 DocType: Purchase Order,Raw Materials Supplied,Matèries primeres subministrades
@@ -3455,7 +3314,7 @@
 DocType: Appraisal,Appraisal Template,Plantilla d'Avaluació
 DocType: Communication,Email,Correu electrònic
 DocType: Item Group,Item Classification,Classificació d'articles
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +89,Business Development Manager,Gerent de Desenvolupament de Negocis
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Business Development Manager,Gerent de Desenvolupament de Negocis
 DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,Manteniment Motiu de visita
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.js +15,Period,Període
 ,General Ledger,Comptabilitat General
@@ -3465,9 +3324,7 @@
 ,Itemwise Recommended Reorder Level,Nivell d'articles recomanat per a tornar a passar comanda
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +264,Please select {0} first,Seleccioneu {0} primer
 DocType: Features Setup,To get Item Group in details table,Per obtenir Grup d'articles a la taula detalls
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +67,Redrawing,Redibuixar
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +112,Batch {0} of Item {1} has expired.,Lot {0} de {1} article ha expirat.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +120,Etching,Aiguafort
 DocType: Sales Invoice,Commission,Comissió
 DocType: Address Template,"<h4>Default Template</h4>
 <p>Uses <a href=""http://jinja.pocoo.org/docs/templates/"">Jinja Templating</a> and all the fields of Address (including Custom Fields if any) will be available</p>
@@ -3512,7 +3369,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +340,Operation Time must be greater than 0 for Operation {0},Temps de funcionament ha de ser major que 0 per a l&#39;operació {0}
 DocType: Supplier,Address and Contacts,Direcció i contactes
 DocType: UOM Conversion Detail,UOM Conversion Detail,Detall UOM Conversió
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +496,Keep it web friendly 900px (w) by 100px (h),Manteniu 900px web amigable (w) per 100px (h)
+apps/erpnext/erpnext/public/js/setup_wizard.js +242,Keep it web friendly 900px (w) by 100px (h),Manteniu 900px web amigable (w) per 100px (h)
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +329,Production Order cannot be raised against a Item Template,Ordre de fabricació no es pot aixecar en contra d&#39;una plantilla d&#39;article
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +44,Charges are updated in Purchase Receipt against each item,Els càrrecs s'actualitzen amb els rebuts de compra contra cada un dels articles
 DocType: Payment Tool,Get Outstanding Vouchers,Get Outstanding Vouchers
@@ -3528,54 +3385,49 @@
 DocType: Item,Average time taken by the supplier to deliver,Temps mitjà pel proveïdor per lliurar
 DocType: Time Log,Hours,hores
 DocType: Project,Expected Start Date,Data prevista d'inici
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +38,Rolling,Rodant
 DocType: ToDo,Priority,Prioritat
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +41,Remove item if charges is not applicable to that item,Treure article si els càrrecs no és aplicable a aquest
 DocType: Dropbox Backup,Dropbox Access Allowed,Dropbox Access Allowed
 DocType: Dropbox Backup,Weekly,Setmanal
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,Ex. smsgateway.com/api/send_sms.cgi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +485,Receive,Rebre
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +510,Receive,Rebre
 DocType: Maintenance Visit,Fully Completed,Totalment Acabat
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% Complet
 DocType: Employee,Educational Qualification,Capacitació per a l'Educació
 DocType: Workstation,Operating Costs,Costos Operatius
 DocType: Employee Leave Approver,Employee Leave Approver,Empleat Deixar aprovador
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,{0} has been successfully added to our Newsletter list.,{0} ha estat afegit amb èxit al llistat de Newsletter.
-apps/erpnext/erpnext/stock/doctype/item/item.py +383,Row {0}: An Reorder entry already exists for this warehouse {1},Fila {0}: Una entrada Reordenar ja existeix per aquest magatzem {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +387,Row {0}: An Reorder entry already exists for this warehouse {1},Fila {0}: Una entrada Reordenar ja existeix per aquest magatzem {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +67,"Cannot declare as lost, because Quotation has been made.","No es pot declarar com perdut, perquè s'han fet ofertes"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +133,Electron beam machining,Mecanitzat per feix d&#39;electrons
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Administraodr principal de compres
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +424,Production Order {0} must be submitted,L'Ordre de Producció {0} ha d'estar Presentada
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +150,Please select Start Date and End Date for Item {0},Seleccioneu data d'inici i data de finalització per a l'article {0}
 apps/erpnext/erpnext/config/stock.py +141,Main Reports,Informes principals
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +102,Stock Ledger entries balances updated,Saldos d'entrades de moviments d'estocs actualitzats
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,Fins a la data no pot ser anterior a partir de la data
 DocType: Purchase Receipt Item,Prevdoc DocType,Prevdoc Doctype
-apps/erpnext/erpnext/stock/doctype/item/item.js +176,Add / Edit Prices,Afegeix / Edita Preus
+apps/erpnext/erpnext/stock/doctype/item/item.js +178,Add / Edit Prices,Afegeix / Edita Preus
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +53,Chart of Cost Centers,Gràfic de centres de cost
 ,Requested Items To Be Ordered,Articles sol·licitats serà condemnada
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +298,My Orders,Les meves comandes
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +293,My Orders,Les meves comandes
 DocType: Price List,Price List Name,nom de la llista de preus
 DocType: Time Log,For Manufacturing,Per Manufactura
-apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +70,Totals,Totals
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +174,Totals,Totals
 DocType: BOM,Manufacturing,Fabricació
 ,Ordered Items To Be Delivered,Els articles demanats per ser lliurats
 DocType: Account,Income,Ingressos
 ,Setup Wizard,Assistent de configuració
 DocType: Industry Type,Industry Type,Tipus d'Indústria
 apps/erpnext/erpnext/templates/includes/cart.js +137,Something went wrong!,Quelcom ha fallat!
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +68,Warning: Leave application contains following block dates,Advertència: Deixa aplicació conté dates bloc
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +251,Sales Invoice {0} has already been submitted,Factura {0} ja s'ha presentat
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +100,Warning: Leave application contains following block dates,Advertència: Deixa aplicació conté dates bloc
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +256,Sales Invoice {0} has already been submitted,Factura {0} ja s'ha presentat
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,Data d'acabament
 DocType: Purchase Invoice Item,Amount (Company Currency),Import (Companyia moneda)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +10,Die casting,Fosa a pressió
 DocType: Email Alert,Reference Date,Data de Referència
 apps/erpnext/erpnext/config/hr.py +105,Organization unit (department) master.,Unitat d'Organització (departament) mestre.
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +25,Please enter valid mobile nos,Entra números de mòbil vàlids
 DocType: Budget Detail,Budget Detail,Detall del Pressupost
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +75,Please enter message before sending,"Si us plau, escriviu el missatge abans d'enviar-"
 DocType: Async Task,Status,Estat
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +65,Stock UOM updated for Item {0},Estoc UOM actualitza per al punt {0}
 DocType: Company History,Year,Any
 apps/erpnext/erpnext/config/accounts.py +127,Point-of-Sale Profile,Punt de Venda Perfil
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +68,Please Update SMS Settings,Actualitza Ajustaments SMS
@@ -3589,12 +3441,12 @@
 ,Serial No Service Contract Expiry,Número de sèrie del contracte de venciment del servei
 DocType: Item,Unit of Measure Conversion,Unitat de conversió de la mesura
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +86,Employee can not be changed,Empleat no es pot canviar
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +259,You cannot credit and debit same account at the same time,No es pot configurar el mateix compte com crèdit i dèbit a la vegada
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,You cannot credit and debit same account at the same time,No es pot configurar el mateix compte com crèdit i dèbit a la vegada
 DocType: Naming Series,Help HTML,Ajuda HTML
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},El pes total assignat ha de ser 100%. És {0}
 apps/erpnext/erpnext/controllers/status_updater.py +140,Allowance for over-{0} crossed for Item {1},Permissió de superació {0} superat per l'article {1}
 DocType: Address,Name of person or organization that this address belongs to.,Nom de la persona o organització a la que pertany aquesta direcció.
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +587,Your Suppliers,Els seus Proveïdors
+apps/erpnext/erpnext/public/js/setup_wizard.js +325,Your Suppliers,Els seus Proveïdors
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,No es pot establir tan perdut com està feta d'ordres de venda.
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +65,Another Salary Structure {0} is active for employee {1}. Please make its status 'Inactive' to proceed.,"Una altra estructura salarial {0} està activa per l'empleat {1}. Si us plau, passeu el seu estat a 'inactiu' per seguir."
 DocType: Purchase Invoice,Contact,Contacte
@@ -3603,37 +3455,35 @@
 DocType: Item,Has Serial No,No té de sèrie
 DocType: Employee,Date of Issue,Data d'emissió
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +16,{0}: From {0} for {1},{0}: Des {0} de {1}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +154,Row #{0}: Set Supplier for item {1},Fila # {0}: Conjunt de Proveïdors per a l&#39;element {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +149,Row #{0}: Set Supplier for item {1},Fila # {0}: Conjunt de Proveïdors per a l&#39;element {1}
 DocType: Issue,Content Type,Tipus de Contingut
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +17,Computer,Ordinador
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,Ordinador
 DocType: Item,List this Item in multiple groups on the website.,Fes una llista d'articles en diversos grups en el lloc web.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +283,Please check Multi Currency option to allow accounts with other currency,"Si us plau, consulti l&#39;opció Multi moneda per permetre comptes amb una altra moneda"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +285,Please check Multi Currency option to allow accounts with other currency,"Si us plau, consulti l&#39;opció Multi moneda per permetre comptes amb una altra moneda"
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +62,Item: {0} does not exist in the system,Article: {0} no existeix en el sistema
 apps/erpnext/erpnext/accounts/doctype/account/account.py +81,You are not authorized to set Frozen value,No estàs autoritzat per establir el valor bloquejat
 DocType: Payment Reconciliation,Get Unreconciled Entries,Aconsegueix entrades no reconciliades
 DocType: Cost Center,Budgets,Pressupostos
 apps/frappe/frappe/core/page/modules_setup/modules_setup.py +11,Updated,Actualitzat
 DocType: Employee,Emergency Contact Details,Detalls de Contacte d'Emergència
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +396,What does it do?,Què fa?
+apps/erpnext/erpnext/public/js/setup_wizard.js +144,What does it do?,Què fa?
 DocType: Delivery Note,To Warehouse,Magatzem destí
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +45,Account {0} has been entered more than once for fiscal year {1},Compte {0} s'ha introduït més d'una vegada per a l'any fiscal {1}
 ,Average Commission Rate,Comissió de Tarifes mitjana
-apps/erpnext/erpnext/stock/doctype/item/item.py +313,'Has Serial No' can not be 'Yes' for non-stock item,'Té Num de Sèrie' no pot ser 'Sí' per a items que no estan a l'estoc
+apps/erpnext/erpnext/stock/doctype/item/item.py +317,'Has Serial No' can not be 'Yes' for non-stock item,'Té Num de Sèrie' no pot ser 'Sí' per a items que no estan a l'estoc
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Attendance can not be marked for future dates,No es poden entrar assistències per dates futures
 DocType: Pricing Rule,Pricing Rule Help,Ajuda de la Regla de preus
 DocType: Purchase Taxes and Charges,Account Head,Cap Compte
 apps/erpnext/erpnext/config/stock.py +79,Update additional costs to calculate landed cost of items,Actualització dels costos addicionals per al càlcul del preu al desembarcament d'articles
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +111,Electrical,Elèctric
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +111,Electrical,Elèctric
 DocType: Stock Entry,Total Value Difference (Out - In),Diferència Total Valor (Out - En)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +302,Row {0}: Exchange Rate is mandatory,Fila {0}: Tipus de canvi és obligatori
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +304,Row {0}: Exchange Rate is mandatory,Fila {0}: Tipus de canvi és obligatori
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},ID d'usuari no entrat per l'Empleat {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +72,Peening,Peening
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,From Warranty Claim,De reclam de garantia
 DocType: Stock Entry,Default Source Warehouse,Magatzem d'origen predeterminat
 DocType: Item,Customer Code,Codi de Client
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +212,Birthday Reminder for {0},Recordatori d'aniversari per {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +163,Lapping,Polit
-apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.js +8,Days Since Last Order,Dies des de l'última comanda
+apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +72,Days Since Last Order,Dies des de l'última comanda
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +299,Debit To account must be a Balance Sheet account,Dèbit al compte ha de ser un compte de Balanç
 DocType: Buying Settings,Naming Series,Sèrie de nomenclatura
 DocType: Leave Block List,Leave Block List Name,Deixa Nom Llista de bloqueig
@@ -3647,7 +3497,7 @@
 DocType: Notification Control,Sales Invoice Message,Missatge de Factura de vendes
 DocType: Authorization Rule,Based On,Basat en
 DocType: Sales Order Item,Ordered Qty,Quantitat demanada
-apps/erpnext/erpnext/stock/doctype/item/item.py +539,Item {0} is disabled,Article {0} està deshabilitat
+apps/erpnext/erpnext/stock/doctype/item/item.py +543,Item {0} is disabled,Article {0} està deshabilitat
 DocType: Stock Settings,Stock Frozen Upto,Estoc bloquejat fins a
 apps/erpnext/erpnext/controllers/recurring_document.py +166,Period From and Period To dates mandatory for recurring {0},Període Des i Període Per dates obligatòries per als recurrents {0}
 apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,Activitat del projecte / tasca.
@@ -3657,7 +3507,6 @@
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,Descompte ha de ser inferior a 100
 DocType: ToDo,Low,Sota
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Escriu Off Import (Companyia moneda)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +71,Spinning,Filat
 DocType: Landed Cost Voucher,Landed Cost Voucher,Val Landed Cost
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +55,Please set {0},"Si us plau, estableix {0}"
 DocType: Purchase Invoice,Repeat on Day of Month,Repetiu el Dia del Mes
@@ -3679,7 +3528,6 @@
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +37,Campaign Name is required,Cal un nom de Campanya
 DocType: Maintenance Visit,Maintenance Date,Manteniment Data
 DocType: Purchase Receipt Item,Rejected Serial No,Número de sèrie Rebutjat
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +51,Deep drawing,Embotició profunda
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +40,New Newsletter,Nou Butlletí
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +157,Start date should be less than end date for Item {0},La data d'inici ha de ser anterior a la data de finalització per l'article {0}
 apps/erpnext/erpnext/stock/doctype/item/item.js +17,Show Balance,Mostra Equilibri
@@ -3690,7 +3538,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +119,BOM and Manufacturing Quantity are required,Llista de materials i de fabricació es requereixen Quantitat
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Rang 2 Envelliment
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +450,Amount,Quantitat
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +147,Riveting,Reblat
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,BOM reemplaçat
 ,Sales Analytics,Analytics de venda
 DocType: Manufacturing Settings,Manufacturing Settings,Ajustaments de Manufactura
@@ -3702,20 +3549,19 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +207,New Account Name,Nou Nom de compte
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,Cost matèries primeres subministrades
 DocType: Selling Settings,Settings for Selling Module,Ajustos Mòdul de vendes
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +73,Customer Service,Servei Al Client
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Customer Service,Servei Al Client
 DocType: Item,Thumbnail,Ungla del polze
 DocType: Item Customer Detail,Item Customer Detail,Item Customer Detail
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +147,Confirm Your Email,Confirma teu email
 apps/erpnext/erpnext/config/hr.py +53,Offer candidate a Job.,Oferta candidat a Job.
 DocType: Notification Control,Prompt for Email on Submission of,Demana el correu electrònic al Presentar
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +81,Total allocated leaves are more than days in the period,Total de fulles assignats més de dia en el període
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +70,Item {0} must be a stock Item,Article {0} ha de ser un d'article de l'estoc
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,Per defecte Work In Progress Magatzem
 apps/erpnext/erpnext/config/accounts.py +107,Default settings for accounting transactions.,Ajustos predeterminats per a les operacions comptables.
 apps/frappe/frappe/model/naming.py +40,{0} is required,{0} és necessari
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +21,Vacuum molding,Emmotllament per buit
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,Data prevista no pot ser anterior material Data de sol·licitud
 DocType: Contact Us Settings,City,Ciutat
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +132,Ultrasonic machining,Mecanitzat per ultrasons
 apps/frappe/frappe/templates/base.html +137,Error: Not a valid id?,Error: No és un document d&#39;identitat vàlid?
 apps/erpnext/erpnext/stock/get_item_details.py +125,Item {0} must be a Sales Item,L'Article {0} ha de ser un article de Vendes
 DocType: Naming Series,Update Series Number,Actualització Nombre Sèries
@@ -3723,7 +3569,7 @@
 DocType: Sales Order,Printing Details,Impressió Detalls
 DocType: Task,Closing Date,Data de tancament
 DocType: Sales Order Item,Produced Quantity,Quantitat produïda
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +84,Engineer,Enginyer
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Engineer,Enginyer
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,Assemblees Cercar Sub
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +379,Item Code required at Row No {0},Codi de l'article necessari a la fila n {0}
 DocType: Sales Partner,Partner Type,Tipus de Partner
@@ -3731,7 +3577,7 @@
 DocType: Authorization Rule,Customerwise Discount,Customerwise Descompte
 DocType: Purchase Invoice,Against Expense Account,Contra el Compte de Despeses
 DocType: Production Order,Production Order,Ordre de Producció
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +258,Installation Note {0} has already been submitted,La Nota d'Instal·lació {0} ja s'ha presentat
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +263,Installation Note {0} has already been submitted,La Nota d'Instal·lació {0} ja s'ha presentat
 DocType: Quotation Item,Against Docname,Contra DocName
 DocType: SMS Center,All Employee (Active),Tot Empleat (Actiu)
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,Veure ara
@@ -3740,19 +3586,19 @@
 DocType: Item,Re-Order Level,Re-Order Nivell
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,Introduïu articles i Quantitat prevista per a les que desitja elevar les ordres de producció o descàrrega de matèries primeres per a la seva anàlisi.
 apps/frappe/frappe/public/js/frappe/views/ganttview.js +45,Gantt Chart,Diagrama de Gantt
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +57,Part-time,Temps parcial
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,Part-time,Temps parcial
 DocType: Employee,Applicable Holiday List,Llista de vacances aplicable
 DocType: Employee,Cheque,Xec
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,Sèries Actualitzat
 apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Report Type is mandatory,Tipus d'informe és obligatori
 DocType: Item,Serial Number Series,Nombre de sèrie de la sèrie
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},El magatzem és obligatòria per l'article d'estoc {0} a la fila {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +45,Retail & Wholesale,Al detall i a l'engròs
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,Al detall i a l'engròs
 DocType: Issue,First Responded On,Primer respost el
 DocType: Website Item Group,Cross Listing of Item in multiple groups,Creu Fitxa d'article en diversos grups
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +351,The First User: You,La Primera Usuari:
+apps/erpnext/erpnext/public/js/setup_wizard.js +101,The First User: You,La Primera Usuari:
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +48,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},Any fiscal Data d'Inici i Final de l'exercici fiscal data ja es troben en l'Any Fiscal {0}
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +172,Successfully Reconciled,Reconciliats amb èxit
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +119,Successfully Reconciled,Reconciliats amb èxit
 DocType: Production Order,Planned End Date,Planejat Data de finalització
 apps/erpnext/erpnext/config/stock.py +43,Where items are stored.,Lloc d'emmagatzematge dels articles.
 DocType: Tax Rule,Validity,Validesa
@@ -3772,39 +3618,36 @@
 DocType: DocPerm,Level,Nivell
 DocType: Purchase Taxes and Charges,On Net Total,En total net
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +160,Target warehouse in row {0} must be same as Production Order,El magatzem de destinació de la fila {0} ha de ser igual que l'Ordre de Producció
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +59,No permission to use Payment Tool,No té permís per utilitzar l'eina de Pagament
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +97,No permission to use Payment Tool,No té permís per utilitzar l'eina de Pagament
 apps/erpnext/erpnext/controllers/recurring_document.py +192,'Notification Email Addresses' not specified for recurring %s,«Notificació adreces de correu electrònic 'no especificats per recurrent% s
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +86,Milling,Mòlta
 apps/erpnext/erpnext/accounts/doctype/account/account.py +99,Currency can not be changed after making entries using some other currency,Moneda no es pot canviar després de fer entrades utilitzant alguna altra moneda
 DocType: Company,Round Off Account,Per arrodonir el compte
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +60,Nibbling,Rosegant
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,Despeses d'Administració
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +18,Consulting,Consulting
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +18,Consulting,Consulting
 DocType: Customer Group,Parent Customer Group,Pares Grup de Clients
 apps/erpnext/erpnext/public/js/pos/pos.js +429,Change,Canvi
 DocType: Purchase Invoice,Contact Email,Correu electrònic de contacte
 DocType: Appraisal Goal,Score Earned,Score Earned
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +393,"e.g. ""My Company LLC""","per exemple ""El meu Company LLC """
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +173,Notice Period,Període de Notificació
+apps/erpnext/erpnext/public/js/setup_wizard.js +141,"e.g. ""My Company LLC""","per exemple ""El meu Company LLC """
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +173,Notice Period,Període de Notificació
 DocType: Bank Reconciliation Detail,Voucher ID,Val ID
 apps/erpnext/erpnext/setup/doctype/territory/territory.js +14,This is a root territory and cannot be edited.,This is a root territory and cannot be edited.
 DocType: Packing Slip,Gross Weight UOM,Pes brut UDM
 DocType: Email Digest,Receivables / Payables,Cobrar / pagar
 DocType: Delivery Note Item,Against Sales Invoice,Contra la factura de venda
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +63,Stamping,Estampat
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +457,Credit Account,Compte de Crèdit
 DocType: Landed Cost Item,Landed Cost Item,Landed Cost article
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +56,Show zero values,Mostra valors zero
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,Quantitat de punt obtingut després de la fabricació / reempaque de determinades quantitats de matèries primeres
 DocType: Payment Reconciliation,Receivable / Payable Account,Compte de cobrament / pagament
 DocType: Delivery Note Item,Against Sales Order Item,Contra l'Ordre de Venda d'articles
-apps/erpnext/erpnext/stock/doctype/item/item.py +521,Please specify Attribute Value for attribute {0},"Si us plau, especifiqui Atribut Valor de l&#39;atribut {0}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +525,Please specify Attribute Value for attribute {0},"Si us plau, especifiqui Atribut Valor de l&#39;atribut {0}"
 DocType: Item,Default Warehouse,Magatzem predeterminat
 DocType: Task,Actual End Date (via Time Logs),Actual Data de finalització (a través dels registres de temps)
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +37,Budget cannot be assigned against Group Account {0},Pressupost no es pot assignar contra comptes de grup {0}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +23,Please enter parent cost center,"Si us plau, introduïu el centre de cost dels pares"
 DocType: Delivery Note,Print Without Amount,Imprimir Sense Monto
-apps/erpnext/erpnext/controllers/buying_controller.py +69,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,"Categoria d'impostos no poden 'Valoració' o 'Valoració i Total ""com tots els articles no siguin disponible articles"
+apps/erpnext/erpnext/controllers/buying_controller.py +60,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,"Categoria d'impostos no poden 'Valoració' o 'Valoració i Total ""com tots els articles no siguin disponible articles"
 DocType: User,Last Name,Cognoms
 DocType: Web Page,Left,Esquerra
 DocType: Event,All Day,Tot el dia
@@ -3812,7 +3655,7 @@
 DocType: Appraisal,Total Score (Out of 5),Puntuació total (de 5)
 DocType: Contact Us Settings,State,Estat
 DocType: Batch,Batch,Lot
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +51,Balance,Equilibri
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +28,Balance,Equilibri
 DocType: Project,Total Expense Claim (via Expense Claims),Reclamació de Despeses totals (a través de reclamacions de despeses)
 DocType: User,Gender,Gènere
 DocType: Journal Entry,Debit Note,Nota de Dèbit
@@ -3842,8 +3685,7 @@
 DocType: Purchase Order,Get Last Purchase Rate,Obtenir Darrera Tarifa de compra
 DocType: Time Log,Billing Rate based on Activity Type (per hour),Facturació Tarifa basada en Tipus d&#39;activitat (per hora)
 DocType: Company,Company Info,Qui Som
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +76,Seaming,Seaming
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +197,"Company Email ID not found, hence mail not sent","ID de correu electrònic de l'empresa no trobat, per tant, no s'ha enviat el correu"
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +206,"Company Email ID not found, hence mail not sent","ID de correu electrònic de l'empresa no trobat, per tant, no s'ha enviat el correu"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Aplicació de Fons (Actius)
 DocType: Production Planning Tool,Filter based on item,Filtre basada en l'apartat
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +451,Debit Account,Compte Dèbit
@@ -3855,17 +3697,16 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +95,{0} {1} has been modified. Please refresh.,"{0} {1} ha estat modificat. Si us plau, actualitzia"
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,No permetis que els usuaris realitzin Aplicacions d'absències els següents dies.
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +591,From Opportunity,De Oportunitat
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +46,Blanking,Supressió
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +166,Employee Benefits,Beneficis als empleats
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,Employee Benefits,Beneficis als empleats
 DocType: Sales Invoice,Is POS,És TPV
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +240,Packed quantity must equal quantity for Item {0} in row {1},Quantitat embalada ha de ser igual a la quantitat d'articles per {0} a la fila {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +245,Packed quantity must equal quantity for Item {0} in row {1},Quantitat embalada ha de ser igual a la quantitat d'articles per {0} a la fila {1}
 DocType: Production Order,Manufactured Qty,Quantitat fabricada
 DocType: Purchase Receipt Item,Accepted Quantity,Quantitat Acceptada
 apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} no existeix
 apps/erpnext/erpnext/config/accounts.py +18,Bills raised to Customers.,Factures enviades als clients.
 DocType: DocField,Default,Defecte
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Identificació del projecte
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +466,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Fila n {0}: Munto no pot ser major que l&#39;espera Monto al Compte de despeses de {1}. A l&#39;espera de Monto és {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +468,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Fila n {0}: Munto no pot ser major que l&#39;espera Monto al Compte de despeses de {1}. A l&#39;espera de Monto és {2}
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +40,{0} subscribers added,{0} abonats afegir
 DocType: Maintenance Schedule,Schedule,Horari
 DocType: Cost Center,"Define Budget for this Cost Center. To set budget action, see ""Company List""","Definir Pressupost per a aquest centre de cost. Per configurar l&#39;acció de pressupost, vegeu &quot;Llista de l&#39;Empresa&quot;"
@@ -3876,7 +3717,7 @@
 apps/erpnext/erpnext/public/js/pos/pos.js +91,Price List not found or disabled,La llista de preus no existeix o està deshabilitada
 DocType: Expense Claim,Approved,Aprovat
 DocType: Pricing Rule,Price,Preu
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +79,Employee relieved on {0} must be set as 'Left',Empleat rellevat en {0} ha de ser establert com 'Esquerra'
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +88,Employee relieved on {0} must be set as 'Left',Empleat rellevat en {0} ha de ser establert com 'Esquerra'
 DocType: Item,"Selecting ""Yes"" will give a unique identity to each entity of this item which can be viewed in the Serial No master.","En seleccionar ""Sí"" li donarà una identitat única a cada entitat d'aquest article que es pot veure a la taula mestre de Números de sèrie"
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +39,Appraisal {0} created for Employee {1} in the given date range,Appraisal {0} creat per Empleat {1} en l'interval de dates determinat
 DocType: Employee,Education,Educació
@@ -3887,7 +3728,7 @@
 apps/frappe/frappe/desk/moduleview.py +67,Standard Reports,Informes estàndard
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,Entrades de diari de Comptabilitat.
 DocType: Delivery Note Item,Available Qty at From Warehouse,Disponible Quantitat a partir de Magatzem
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +209,Please select Employee Record first.,Seleccioneu Employee Record primer.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +224,Please select Employee Record first.,Seleccioneu Employee Record primer.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Fila {0}: Festa / Compte no coincideix amb {1} / {2} en {3} {4}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +35,To create a Tax Account,Per crear un compte d'impostos
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +233,Please enter Expense Account,Si us plau ingressi Compte de Despeses
@@ -3900,46 +3741,43 @@
 DocType: Sales Order,Track this Sales Order against any Project,Seguir aquesta Ordre Vendes cap algun projecte
 DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,Ordres de venda i halar (pendent d'entregar) basat en els criteris anteriors
 DocType: DocShare,Document Type,Tipus de document
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +565,From Supplier Quotation,Oferta de Proveïdor
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +588,From Supplier Quotation,Oferta de Proveïdor
 DocType: Deduction Type,Deduction Type,Tipus Deducció
 DocType: Attendance,Half Day,Medi Dia
 DocType: Pricing Rule,Min Qty,Quantitat mínima
 DocType: Features Setup,"To track items in sales and purchase documents with batch nos. ""Preferred Industry: Chemicals""",Per realitzar un seguiment d&#39;articles en vendes i documents de compra amb els números de lot. &quot;Indústria Preferida: Químics&quot;
 DocType: GL Entry,Transaction Date,Data de Transacció
 DocType: Production Plan Item,Planned Qty,Planificada Quantitat
-apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +91,Total Tax,Impost Total
+apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +93,Total Tax,Impost Total
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +178,For Quantity (Manufactured Qty) is mandatory,Per Quantitat (Fabricat Quantitat) és obligatori
 DocType: Stock Entry,Default Target Warehouse,Magatzem de destí predeterminat
 DocType: Purchase Invoice,Net Total (Company Currency),Net Total (En la moneda de la Companyia)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +79,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Fila {0}: Partit Tipus i Partit és aplicable únicament contra el compte de cobrament / pagament
 DocType: Notification Control,Purchase Receipt Message,Rebut de Compra Missatge
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +95,Total allocated leaves are more than period,Total de fulles assignats més de període
 DocType: Production Order,Actual Start Date,Data d'inici real
 DocType: Sales Order,% of materials delivered against this Sales Order,% de materials lliurats d'aquesta Ordre de Venda
 apps/erpnext/erpnext/config/stock.py +23,Record item movement.,Desa el Moviment d'article
 DocType: Newsletter List Subscriber,Newsletter List Subscriber,Llista de subscriptors al butlletí
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +164,Morticing,Mortajar
 DocType: Email Account,Service,Servei
 DocType: Hub Settings,Hub Settings,Ajustaments Hub
 DocType: Project,Gross Margin %,Marge Brut%
 DocType: BOM,With Operations,Amb Operacions
 apps/erpnext/erpnext/accounts/party.py +232,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Assentaments comptables ja s&#39;han fet en moneda {0} per a la companyia de {1}. Seleccioneu un compte per cobrar o per pagar amb la moneda {0}.
 ,Monthly Salary Register,Registre de Salari mensual
-apps/frappe/frappe/website/template.py +140,Next,Següent
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard_page.html +17,Next,Següent
 DocType: Warranty Claim,If different than customer address,Si és diferent de la direcció del client
 DocType: BOM Operation,BOM Operation,BOM Operació
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +118,Electropolishing,El electropolit
 DocType: Purchase Taxes and Charges,On Previous Row Amount,A limport de la fila anterior
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +24,Please enter Payment Amount in atleast one row,"Si us plau, introduïu la suma del pagament en almenys una fila"
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +33,Please enter Payment Amount in atleast one row,"Si us plau, introduïu la suma del pagament en almenys una fila"
 DocType: POS Profile,POS Profile,POS Perfil
 apps/erpnext/erpnext/config/accounts.py +153,"Seasonality for setting budgets, targets etc.","L'estacionalitat d'establir pressupostos, objectius, etc."
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +238,Row {0}: Payment Amount cannot be greater than Outstanding Amount,Fila {0}: Quantitat de pagament no pot ser superior a quantitat lliurada
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +46,Total Unpaid,Total no pagat
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +21,Time Log is not billable,Registre d'hores no facturable
 apps/erpnext/erpnext/stock/get_item_details.py +128,"Item {0} is a template, please select one of its variants","Article {0} és una plantilla, per favor seleccioni una de les seves variants"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +528,Purchaser,Comprador
+apps/erpnext/erpnext/public/js/setup_wizard.js +272,Purchaser,Comprador
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +81,Net pay cannot be negative,Salari net no pot ser negatiu
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +71,Please enter the Against Vouchers manually,Introduïu manualment la partida dels comprovants
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +107,Please enter the Against Vouchers manually,Introduïu manualment la partida dels comprovants
 DocType: SMS Settings,Static Parameters,Paràmetres estàtics
 DocType: Purchase Order,Advance Paid,Bestreta pagada
 DocType: Item,Item Tax,Impost d'article
@@ -3948,14 +3786,12 @@
 apps/erpnext/erpnext/config/crm.py +48,Send mass SMS to your contacts,Enviar SMS massiu als seus contactes
 DocType: Purchase Taxes and Charges,Consider Tax or Charge for,Consider Tax or Charge for
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,La quantitat actual és obligatòria
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +42,Cross-rolling,Cross-balanceig
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +132,Credit Card,Targeta De Crèdit
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +132,Credit Card,Targeta De Crèdit
 DocType: BOM,Item to be manufactured or repacked,Article que es fabricarà o embalarà de nou
 apps/erpnext/erpnext/config/stock.py +95,Default settings for stock transactions.,Ajustos per defecte per a les transaccions de valors.
 DocType: Purchase Invoice,Next Date,Següent Data
 DocType: Employee Education,Major/Optional Subjects,Major/Optional Subjects
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +49,Please enter Taxes and Charges,Entra les taxes i càrrecs
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +85,Machining,Conreu
 DocType: Sales Invoice Item,Drop Ship,Nau de la gota
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","Aquí pot mantenir els detalls de la família com el nom i ocupació dels pares, cònjuge i fills"
 DocType: Hub Settings,Seller Name,Nom del venedor
@@ -3965,7 +3801,7 @@
 DocType: Stock Entry,Repack,Torneu a embalar
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +6,You must Save the form before proceeding,Has de desar el formulari abans de continuar
 DocType: Item Attribute,Numeric Values,Els valors numèrics
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +500,Attach Logo,Adjuntar Logo
+apps/erpnext/erpnext/public/js/setup_wizard.js +246,Attach Logo,Adjuntar Logo
 DocType: Customer,Commission Rate,Percentatge de comissió
 apps/erpnext/erpnext/stock/doctype/item/item.js +38,Make Variant,Fer Variant
 apps/erpnext/erpnext/config/hr.py +145,Block leave applications by department.,Bloquejar sol·licituds d'absències per departament.
@@ -3980,19 +3816,19 @@
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +105,Please select a csv file,Seleccioneu un arxiu csv
 DocType: Dropbox Backup,Send Backups to Dropbox,Enviar còpies de seguretat de Dropbox
 DocType: Purchase Order,To Receive and Bill,Per Rebre i Bill
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +94,Designer,Dissenyador
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Designer,Dissenyador
 apps/erpnext/erpnext/config/selling.py +121,Terms and Conditions Template,Plantilla de Termes i Condicions
 DocType: Serial No,Delivery Details,Detalls del lliurament
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +383,Cost Center is required in row {0} in Taxes table for type {1},Es requereix de centres de cost a la fila {0} en Impostos taula per al tipus {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +386,Cost Center is required in row {0} in Taxes table for type {1},Es requereix de centres de cost a la fila {0} en Impostos taula per al tipus {1}
 DocType: Item,Automatically create Material Request if quantity falls below this level,Creació automàtica de sol·licitud de materials si la quantitat és inferior a aquest nivell
 ,Item-wise Purchase Register,Registre de compra d'articles
 DocType: Batch,Expiry Date,Data De Caducitat
-apps/erpnext/erpnext/stock/doctype/item/item.py +375,"To set reorder level, item must be a Purchase Item or Manufacturing Item","Per establir el nivell de comanda, article ha de ser un article de compra o fabricació d&#39;articles"
+apps/erpnext/erpnext/stock/doctype/item/item.py +379,"To set reorder level, item must be a Purchase Item or Manufacturing Item","Per establir el nivell de comanda, article ha de ser un article de compra o fabricació d&#39;articles"
 ,Supplier Addresses and Contacts,Adreces i contactes dels proveïdors
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,"Si us plau, Selecciona primer la Categoria"
 apps/erpnext/erpnext/config/projects.py +18,Project master.,Projecte mestre.
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,No mostrar qualsevol símbol com $ etc costat de monedes.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +330, (Half Day),(Mig dia)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +374, (Half Day),(Mig dia)
 DocType: Supplier,Credit Days,Dies de Crèdit
 DocType: Leave Type,Is Carry Forward,Is Carry Forward
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +478,Get Items from BOM,Obtenir elements de la llista de materials
@@ -4000,7 +3836,7 @@
 apps/erpnext/erpnext/config/manufacturing.py +120,Bill of Materials,Llista de materials
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +77,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Fila {0}: Partit Tipus i Partit es requereix per al compte per cobrar / pagar {1}
 DocType: Dropbox Backup,Send Notifications To,Enviar notificacions a
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html +26,Ref Date,Ref Data
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +54,Ref Date,Ref Data
 DocType: Employee,Reason for Leaving,Raons per deixar el
 DocType: Expense Claim Detail,Sanctioned Amount,Sanctioned Amount
 DocType: GL Entry,Is Opening,Està obrint
@@ -4008,4 +3844,3 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +188,Account {0} does not exist,El compte {0} no existeix
 DocType: Account,Cash,Efectiu
 DocType: Employee,Short biography for website and other publications.,Breu biografia de la pàgina web i altres publicacions.
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +31,Please create Salary Structure for employee {0},"Si us plau, creu Estructura salarial per als empleats {0}"
diff --git a/erpnext/translations/cs.csv b/erpnext/translations/cs.csv
index bf47be7..638d913 100644
--- a/erpnext/translations/cs.csv
+++ b/erpnext/translations/cs.csv
@@ -1,13 +1,12 @@
 DocType: Employee,Salary Mode,Mode Plat
 DocType: Cost Center,"Select Monthly Distribution, if you want to track based on seasonality.","Vyberte měsíční výplatou, pokud chcete sledovat na základě sezónnosti."
 DocType: Employee,Divorced,Rozvedený
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +86,Warning: Same item has been entered multiple times.,Upozornění: Stejné položky byl zadán vícekrát.
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +80,Warning: Same item has been entered multiple times.,Upozornění: Stejné položky byl zadán vícekrát.
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +96,Items already synced,Položky již synchronizovat
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,"Povolit položky, které se přidávají vícekrát v transakci"
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,Materiál Navštivte {0} před zrušením této záruční reklamaci Zrušit
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +19,Consumer Products,Spotřební zboží
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,Spotřební zboží
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +68,Please select Party Type first,"Prosím, vyberte typ Party první"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +90,Annealing,Žíhání
 DocType: Item,Customer Items,Zákazník položky
 apps/erpnext/erpnext/accounts/doctype/account/account.py +45,Account {0}: Parent account {1} can not be a ledger,Účet {0}: Nadřazený účet {1} nemůže být hlavní kniha
 DocType: Item,Publish Item to hub.erpnext.com,Publikování položku do hub.erpnext.com
@@ -20,15 +19,14 @@
 DocType: About Us Settings,Website,Stránky
 DocType: POS Profile,Applicable for User,Použitelné pro Uživatele
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +169,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Zastavil výrobu Objednat nelze zrušit, uvolnit ho nejprve zrušit"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +23,Compaction plus sintering,Zhutňování a spékání
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,Currency is required for Price List {0},Měna je vyžadováno pro Ceníku {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Bude se vypočítá v transakci.
 DocType: Purchase Order,Customer Contact,Kontakt se zákazníky
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +549,From Material Request,Z materiálu Poptávka
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +572,From Material Request,Z materiálu Poptávka
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} Strom
 DocType: Job Applicant,Job Applicant,Job Žadatel
 apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,Žádné další výsledky.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +78,Legal,Právní
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +34,Legal,Právní
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +114,Actual type tax cannot be included in Item rate in row {0},Aktuální typ daň nemůže být zahrnutý v ceně Položka v řádku {0}
 DocType: C-Form,Customer,Zákazník
 DocType: Purchase Receipt Item,Required By,Vyžadováno
@@ -43,7 +41,6 @@
 DocType: Manufacturing Settings,Default 10 mins,Výchozí 10 min
 DocType: Leave Type,Leave Type Name,Jméno typu absence
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +148,Series Updated Successfully,Řada Aktualizováno Úspěšně
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +150,Stitching,Šití
 DocType: Pricing Rule,Apply On,Naneste na
 DocType: Item Price,Multiple Item prices.,Více ceny položku.
 ,Purchase Order Items To Be Received,Položky vydané objednávky k přijetí
@@ -51,8 +48,8 @@
 DocType: Quality Inspection Reading,Parameter,Parametr
 apps/erpnext/erpnext/projects/doctype/project/project.py +43,Expected End Date can not be less than Expected Start Date,"Očekávané Datum ukončení nemůže být nižší, než se očekávalo data zahájení"
 apps/erpnext/erpnext/utilities/transaction_base.py +104,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,"Řádek # {0}: Cena musí být stejné, jako {1}: {2} ({3} / {4})"
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +189,New Leave Application,New Leave Application
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +134,Bank Draft,Bank Návrh
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +204,New Leave Application,New Leave Application
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +134,Bank Draft,Bank Návrh
 DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,"1.Chcete-li zachovat zákazníkovo produktové číslo a také podle něj vyhledávat, použijte tuto možnost"
 DocType: Mode of Payment Account,Mode of Payment Account,Způsob platby účtu
 apps/erpnext/erpnext/stock/doctype/item/item.js +34,Show Variants,Zobrazit Varianty
@@ -64,25 +61,23 @@
 DocType: Production Plan Item,Production Plan Item,Výrobní program Item
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +141,User {0} is already assigned to Employee {1},Uživatel {0} je již přiřazena k Employee {1}
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +13,Make new POS Profile,Proveďte nové POS profil
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +31,Health Care,Péče o zdraví
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,Péče o zdraví
 DocType: Purchase Invoice,Monthly,Měsíčně
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +66,Delay in payment (Days),Zpoždění s platbou (dny)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +494,Invoice,Faktura
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +519,Invoice,Faktura
 DocType: Maintenance Schedule Item,Periodicity,Periodicita
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +357,Email Address,E-mailová adresa
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +21,Defense,Obrana
+apps/erpnext/erpnext/public/js/setup_wizard.js +107,Email Address,E-mailová adresa
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,Obrana
 DocType: Company,Abbr,Zkr
 DocType: Appraisal Goal,Score (0-5),Score (0-5)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +193,Row {0}: {1} {2} does not match with {3},Řádek {0}: {1} {2} se neshoduje s {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +67,Row # {0}:,Řádek č. {0}:
 DocType: Delivery Note,Vehicle No,Vozidle
 apps/erpnext/erpnext/public/js/pos/pos.js +528,Please select Price List,"Prosím, vyberte Ceník"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +162,Woodworking,Zpracování dřeva
 DocType: Production Order Operation,Work In Progress,Work in Progress
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +153,3D printing,3D tisk
 DocType: Employee,Holiday List,Dovolená Seznam
 DocType: Time Log,Time Log,Time Log
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +530,Accountant,Účetní
+apps/erpnext/erpnext/public/js/setup_wizard.js +274,Accountant,Účetní
 DocType: Cost Center,Stock User,Sklad Uživatel
 DocType: Company,Phone No,Telefon
 DocType: Time Log,"Log of Activities performed by users against Tasks that can be used for tracking time, billing.","Log činností vykonávaných uživateli proti úkoly, které mohou být použity pro sledování času, fakturaci."
@@ -98,18 +93,19 @@
 DocType: Bin,Quantity Requested for Purchase,Požadovaného množství na nákup
 DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name","Připojit CSV soubor se dvěma sloupci, jeden pro starý název a jeden pro nový název"
 DocType: Packed Item,Parent Detail docname,Parent Detail docname
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Kg,Kg
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Kg,Kg
 apps/erpnext/erpnext/config/hr.py +48,Opening for a Job.,Otevření o zaměstnání.
 DocType: Item Attribute,Increment,Přírůstek
 apps/erpnext/erpnext/public/js/stock_analytics.js +63,Select Warehouse...,Vyberte Warehouse ...
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +6,Advertising,Reklama
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,Reklama
+apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,Stejný Společnost je zapsána více než jednou
 DocType: Employee,Married,Ženatý
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +389,Stock cannot be updated against Delivery Note {0},Sklad nelze aktualizovat na dodací list {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +391,Stock cannot be updated against Delivery Note {0},Sklad nelze aktualizovat na dodací list {0}
 DocType: Payment Reconciliation,Reconcile,Srovnat
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +30,Grocery,Potraviny
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,Potraviny
 DocType: Quality Inspection Reading,Reading 1,Čtení 1
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Make Bank Entry,Proveďte Bank Vstup
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +40,Pension Funds,Penzijní fondy
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,Penzijní fondy
 apps/erpnext/erpnext/accounts/doctype/account/account.py +142,Warehouse is mandatory if account type is Warehouse,"Sklad je povinné, pokud typ účtu je Warehouse"
 DocType: SMS Center,All Sales Person,Všichni obchodní zástupci
 DocType: Lead,Person Name,Osoba Jméno
@@ -131,7 +127,7 @@
 DocType: Quality Inspection,Get Specification Details,Získat Specifikace Podrobnosti
 DocType: Lead,Interested,Zájemci
 apps/erpnext/erpnext/config/manufacturing.py +14,Bill of Material,Bill of materiálu
-apps/erpnext/erpnext/public/js/stock_analytics.js +45,Opening,Otvor
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +158,Opening,Otvor
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},Od {0} do {1}
 DocType: Item,Copy From Item Group,Kopírovat z bodu Group
 DocType: Journal Entry,Opening Entry,Otevření Entry
@@ -145,23 +141,22 @@
 DocType: Employee Education,Under Graduate,Za absolventa
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +22,Target On,Target On
 DocType: BOM,Total Cost,Celkové náklady
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +99,Reaming,Vystružování
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +9,Activity Log:,Aktivita Log:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +199,Item {0} does not exist in the system or has expired,Bod {0} neexistuje v systému nebo vypršela
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +44,Real Estate,Nemovitost
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +44,Real Estate,Nemovitost
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +4,Statement of Account,Výpis z účtu
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +41,Pharmaceuticals,Farmaceutické
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,Farmaceutické
 DocType: Expense Claim Detail,Claim Amount,Nárok Částka
 DocType: Employee,Mr,Pan
 DocType: Custom Script,Client,Klient
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,Dodavatel Typ / dovozce
 DocType: Naming Series,Prefix,Prefix
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Consumable,Spotřební
+apps/erpnext/erpnext/public/js/setup_wizard.js +359,Consumable,Spotřební
 DocType: Upload Attendance,Import Log,Záznam importu
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.js +19,Send,Odeslat
 DocType: Sales Invoice Item,Delivered By Supplier,Dodává se podle dodavatele
 DocType: SMS Center,All Contact,Vše Kontakt
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +164,Annual Salary,Roční Plat
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +164,Annual Salary,Roční Plat
 DocType: Period Closing Voucher,Closing Fiscal Year,Uzavření fiskálního roku
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +69,Stock Expenses,Stock Náklady
 DocType: Newsletter,Email Sent?,E-mail odeslán?
@@ -169,7 +164,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +92,Show Time Logs,Show Time Záznamy
 DocType: Journal Entry Account,Credit in Company Currency,Úvěrové společnosti v měně
 DocType: Delivery Note,Installation Status,Stav instalace
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +115,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Schválené + Zamítnuté množství se musí rovnat množství Přijaté u položky {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +118,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Schválené + Zamítnuté množství se musí rovnat množství Přijaté u položky {0}
 DocType: Item,Supply Raw Materials for Purchase,Dodávky suroviny pro nákup
 apps/erpnext/erpnext/stock/get_item_details.py +133,Item {0} must be a Purchase Item,Bod {0} musí být Nákup položky
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
@@ -177,19 +172,17 @@
  Všechny termíny a zaměstnanec kombinaci ve zvoleném období přijde v šabloně, se stávajícími evidence docházky"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +446,Item {0} is not active or end of life has been reached,"Bod {0} není aktivní, nebo byl dosažen konec života"
 DocType: Time Log Batch,Will be updated after Sales Invoice is Submitted.,Bude aktualizováno po odeslání faktury.
-apps/erpnext/erpnext/controllers/accounts_controller.py +493,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Chcete-li zahrnout daně na řádku v poměru Položka {0}, daně v řádcích {1} musí být zahrnuty"
+apps/erpnext/erpnext/controllers/accounts_controller.py +494,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Chcete-li zahrnout daně na řádku v poměru Položka {0}, daně v řádcích {1} musí být zahrnuty"
 apps/erpnext/erpnext/config/hr.py +90,Settings for HR Module,Nastavení pro HR modul
 DocType: SMS Center,SMS Center,SMS centrum
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +78,Straightening,Rovnací
 DocType: BOM Replace Tool,New BOM,New BOM
 apps/erpnext/erpnext/config/projects.py +28,Batch Time Logs for billing.,Batch čas Záznamy pro fakturaci.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +15,Countergravity casting,Countergravity lití
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +30,Newsletter has already been sent,Newsletter již byla odeslána
 DocType: Lead,Request Type,Typ požadavku
 DocType: Leave Application,Reason,Důvod
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +14,Broadcasting,Vysílání
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +140,Execution,Provedení
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +364,The first user will become the System Manager (you can change this later).,První uživatel bude System Manager (lze později změnit).
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,Vysílání
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +140,Execution,Provedení
+apps/erpnext/erpnext/public/js/setup_wizard.js +114,The first user will become the System Manager (you can change this later).,První uživatel bude System Manager (lze později změnit).
 apps/erpnext/erpnext/config/manufacturing.py +39,Details of the operations carried out.,Podrobnosti o prováděných operací.
 DocType: Serial No,Maintenance Status,Status Maintenance
 apps/erpnext/erpnext/config/stock.py +263,Items and Pricing,Položky a Ceny
@@ -206,7 +199,6 @@
 DocType: Pricing Rule,Discount on Price List Rate (%),Sleva na Ceník Rate (%)
 apps/frappe/frappe/public/js/frappe/form/print.js +96,Start,Start
 DocType: User,First Name,Křestní jméno
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +12,Full-mold casting,Lití Full-forma
 DocType: Offer Letter,Select Terms and Conditions,Vyberte Podmínky
 DocType: Production Planning Tool,Sales Orders,Prodejní objednávky
 DocType: Purchase Taxes and Charges,Valuation,Ocenění
@@ -218,8 +210,7 @@
 DocType: Bank Reconciliation,Bank Account,Bankovní účet
 DocType: Leave Type,Allow Negative Balance,Povolit záporný zůstatek
 DocType: Selling Settings,Default Territory,Výchozí Territory
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +53,Television,Televize
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +138,Gashing,Rozsekne
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,Televize
 DocType: Production Order Operation,Updated via 'Time Log',"Aktualizováno přes ""Time Log"""
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +82,Account {0} does not belong to Company {1},Účet {0} nepatří do společnosti {1}
 DocType: Naming Series,Series List for this Transaction,Řada seznam pro tuto transakci
@@ -234,14 +225,13 @@
 DocType: Leave Allocation,Add unused leaves from previous allocations,Přidat nevyužité listy z předchozích přídělů
 apps/erpnext/erpnext/controllers/recurring_document.py +206,Next Recurring {0} will be created on {1},Další Opakující {0} bude vytvořen na {1}
 DocType: Newsletter List,Total Subscribers,Celkem Odběratelé
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +575,Contact Name,Kontakt Jméno
+,Contact Name,Kontakt Jméno
 DocType: Production Plan Item,SO Pending Qty,SO Pending Množství
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Vytvoří výplatní pásku na výše uvedených kritérií.
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,Žádost o koupi.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +107,Double housing,Double bydlení
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +156,Only the selected Leave Approver can submit this Leave Application,Pouze vybraný Leave schvalovač může podat této dovolené aplikaci
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +171,Only the selected Leave Approver can submit this Leave Application,Pouze vybraný Leave schvalovač může podat této dovolené aplikaci
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,Uvolnění Datum musí být větší než Datum spojování
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +172,Leaves per Year,Dovolených za rok
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +172,Leaves per Year,Dovolených za rok
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup > Settings > Naming Series,Prosím nastavte Pojmenování Series pro {0} přes Nastavení&gt; Nastavení&gt; Naming Série
 DocType: Time Log,Will be updated when batched.,Bude aktualizována při dávkově.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +104,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,"Row {0}: Zkontrolujte ""Je Advance"" proti účtu {1}, pokud je to záloha záznam."
@@ -250,25 +240,24 @@
 DocType: Item Website Specification,Item Website Specification,Položka webových stránek Specifikace
 DocType: Dropbox Backup,Dropbox Access Key,Dropbox Access Key
 DocType: Payment Tool,Reference No,Referenční číslo
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +348,Leave Blocked,Absence blokována
-apps/erpnext/erpnext/stock/doctype/item/item.py +535,Item {0} has reached its end of life on {1},Položka {0} dosáhla konce své životnosti na {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +392,Leave Blocked,Absence blokována
+apps/erpnext/erpnext/stock/doctype/item/item.py +539,Item {0} has reached its end of life on {1},Položka {0} dosáhla konce své životnosti na {1}
 apps/erpnext/erpnext/accounts/utils.py +339,Annual,Roční
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Reklamní Odsouhlasení Item
 DocType: Stock Entry,Sales Invoice No,Prodejní faktuře č
 DocType: Material Request Item,Min Order Qty,Min Objednané množství
 DocType: Lead,Do Not Contact,Nekontaktujte
 DocType: Sales Invoice,The unique id for tracking all recurring invoices. It is generated on submit.,Unikátní ID pro sledování všech opakující faktury. To je generován na odeslat.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +93,Software Developer,Software Developer
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +93,Software Developer,Software Developer
 DocType: Item,Minimum Order Qty,Minimální objednávka Množství
 DocType: Pricing Rule,Supplier Type,Dodavatel Type
 DocType: Item,Publish in Hub,Publikovat v Hub
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +555,Item {0} is cancelled,Položka {0} je zrušen
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +598,Material Request,Požadavek na materiál
+apps/erpnext/erpnext/stock/doctype/item/item.py +559,Item {0} is cancelled,Položka {0} je zrušen
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +607,Material Request,Požadavek na materiál
 DocType: Bank Reconciliation,Update Clearance Date,Aktualizace Výprodej Datum
 DocType: Item,Purchase Details,Nákup Podrobnosti
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +323,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},Položka {0} nebyl nalezen v &quot;suroviny dodané&quot; tabulky v objednávce {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +129,Wire brushing,Wire kartáčování
 DocType: Employee,Relation,Vztah
 DocType: Shipping Rule,Worldwide Shipping,Celosvětově doprava
 apps/erpnext/erpnext/config/selling.py +23,Confirmed orders from Customers.,Potvrzené objednávky od zákazníků.
@@ -284,12 +273,11 @@
 DocType: Supplier,Address HTML,Adresa HTML
 DocType: Lead,Mobile No.,Mobile No.
 DocType: Maintenance Schedule,Generate Schedule,Generování plán
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +81,Hubbing,Hubbing
 DocType: Purchase Invoice Item,Expense Head,Náklady Head
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +86,Please select Charge Type first,"Prosím, vyberte druh tarifu první"
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,Nejnovější
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +395,Max 5 characters,Max 5 znaků
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +195,Select Your Language,Zvolit jazyk
+apps/erpnext/erpnext/public/js/setup_wizard.js +143,Max 5 characters,Max 5 znaků
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +245,Select Your Language,Zvolit jazyk
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,První Leave schvalovač v seznamu bude nastaven jako výchozí Leave schvalujícího
 DocType: Manufacturing Settings,"Disables creation of time logs against Production Orders.
 Operations shall not be tracked against Production Order",Zakáže vytváření časových protokolů proti výrobní zakázky. Operace nesmějí být sledována proti výrobní zakázky
@@ -301,8 +289,6 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +34,Item {0} must be Service Item,Položka {0} musí být Service Item
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +303,Completed Qty can not be greater than 'Qty to Manufacture',"Dokončené množství nemůže být větší než ""Množství do výroby"""
 DocType: DocType,Administrator,Správce
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +136,Laser drilling,Laserové vrtání
-DocType: Stock UOM Replace Utility,New Stock UOM,Nových akcií UOM
 DocType: Period Closing Voucher,Closing Account Head,Závěrečný účet hlava
 DocType: Employee,External Work History,Vnější práce History
 apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,Kruhové Referenční Chyba
@@ -311,18 +297,15 @@
 DocType: Lead,Industry,Průmysl
 DocType: Employee,Job Profile,Job Profile
 DocType: Newsletter,Newsletter,Newsletter
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +84,Hydroforming,Hydroforming
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +49,Necking,Zúžení
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Upozornit e-mailem na tvorbu automatických Materiál Poptávka
 DocType: Journal Entry,Multi Currency,Více měn
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +51,Item is updated,Položka je aktualizována
 DocType: Async Task,System Manager,Správce systému
 DocType: Payment Reconciliation Invoice,Invoice Type,Typ faktury
 DocType: Sales Invoice Item,Delivery Note,Dodací list
 DocType: Dropbox Backup,Allow Dropbox Access,Povolit přístup Dropbox
 apps/erpnext/erpnext/config/learn.py +72,Setting up Taxes,Nastavení Daně
 apps/erpnext/erpnext/accounts/utils.py +189,Payment Entry has been modified after you pulled it. Please pull it again.,"Vstup Platba byla změněna poté, co ji vytáhl. Prosím, vytáhněte ji znovu."
-apps/erpnext/erpnext/stock/doctype/item/item.py +343,{0} entered twice in Item Tax,{0} vloženo dvakrát v Daňové Položce
+apps/erpnext/erpnext/stock/doctype/item/item.py +347,{0} entered twice in Item Tax,{0} vloženo dvakrát v Daňové Položce
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +105,Summary for this week and pending activities,Shrnutí pro tento týden a probíhajícím činnostem
 DocType: Workstation,Rent Cost,Rent Cost
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +74,Please select month and year,Vyberte měsíc a rok
@@ -339,24 +322,22 @@
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,"Sazba, za kterou je měna zákazníka převedena na základní měnu zákazníka"
 DocType: Features Setup,"Available in BOM, Delivery Note, Purchase Invoice, Production Order, Purchase Order, Purchase Receipt, Sales Invoice, Sales Order, Stock Entry, Timesheet","K dispozici v BOM, dodací list, fakturu, výrobní zakázky, objednávky, doklad o koupi, prodejní faktury odběratele, Stock vstupu, časový rozvrh"
 DocType: Item Tax,Tax Rate,Tax Rate
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Select Item,Select Položka
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +540,Select Item,Select Položka
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +143,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","Item: {0} podařilo dávkové, nemůže být v souladu s použitím \
  Stock usmíření, použijte Reklamní Entry"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +259,Purchase Invoice {0} is already submitted,Přijatá faktura {0} je již odeslána
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +262,Purchase Invoice {0} is already submitted,Přijatá faktura {0} je již odeslána
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Batch No must be same as {1} {2},"Row # {0}: Batch No musí být stejné, jako {1} {2}"
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Convert to non-Group,Převést na non-Group
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +55,Purchase Receipt must be submitted,Příjmka musí být odeslána
-DocType: Stock UOM Replace Utility,Current Stock UOM,Current Reklamní UOM
 apps/erpnext/erpnext/config/stock.py +53,Batch (lot) of an Item.,Batch (lot) položky.
 DocType: C-Form Invoice Detail,Invoice Date,Datum Fakturace
 DocType: GL Entry,Debit Amount,Debetní Částka
 apps/erpnext/erpnext/accounts/party.py +223,There can only be 1 Account per Company in {0} {1},Tam může být pouze 1 účet na společnosti v {0} {1}
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Your email address,Vaše e-mailová adresa
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +194,Please see attachment,"Prosím, viz příloha"
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +203,Please see attachment,"Prosím, viz příloha"
 DocType: Purchase Order,% Received,% Přijaté
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +109,Water jet cutting,Řezání vodním paprskem
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +24,Setup Already Complete!!,Setup již dokončen !!
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +20,Setup Already Complete!!,Setup již dokončen !!
 ,Finished Goods,Hotové zboží
 DocType: Delivery Note,Instructions,Instrukce
 DocType: Quality Inspection,Inspected By,Zkontrolován
@@ -371,6 +352,7 @@
 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.,"Prosím, ne vytvářet účty pro zákazníky a dodavateli. Jsou vytvořeny přímo od zákazníka / dodavatele mistrů."
 DocType: Currency Exchange,Currency Exchange,Směnárna
 DocType: Purchase Invoice Item,Item Name,Název položky
+DocType: Authorization Rule,Approving User  (above authorized value),Schválení uživatele (nad oprávněné hodnoty)
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Credit Balance,Credit Balance
 DocType: Employee,Widowed,Ovdovělý
 DocType: Production Planning Tool,"Items to be requested which are ""Out of Stock"" considering all warehouses based on projected qty and minimum order qty","Položky, které je třeba požádat, které jsou ""Není skladem"" s ohledem na veškeré sklady na základě předpokládaného Množství a minimální Objednané množství"
@@ -380,11 +362,10 @@
 ,Purchase Register,Nákup Register
 DocType: Landed Cost Item,Applicable Charges,Použitelné Poplatky
 DocType: Workstation,Consumable Cost,Spotřební Cost
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,{0} ({1}) must have role 'Leave Approver',"{0} ({1}), musí mít roli ""Schvalovatel dovolených"""
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +167,{0} ({1}) must have role 'Leave Approver',"{0} ({1}), musí mít roli ""Schvalovatel dovolených"""
 DocType: Purchase Receipt,Vehicle Date,Datum Vehicle
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +39,Medical,Lékařský
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +39,Medical,Lékařský
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,Důvod ztráty
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +36,Tube beading,Tube navlékání korálků
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},Workstation je uzavřena v následujících dnech podle Prázdninový Seznam: {0}
 DocType: Employee,Single,Jednolůžkový
 DocType: Issue,Attachment,Příloha
@@ -405,10 +386,8 @@
 DocType: Account,Is Group,Is Group
 DocType: Stock Settings,Automatically Set Serial Nos based on FIFO,Automaticky nastavit sériových čísel na základě FIFO
 DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,"Zkontrolujte, zda dodavatelské faktury Počet Jedinečnost"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +31,Thermoforming,Tvarování
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +66,Slitting,Kotoučová
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +57,'To Case No.' cannot be less than 'From Case No.',"""DO Případu č.' nesmí být menší než ""Od Případu č.'"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +104,Non Profit,Non Profit
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +104,Non Profit,Non Profit
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_list.js +7,Not Started,Nezahájeno
 DocType: Lead,Channel Partner,Channel Partner
 DocType: Account,Old Parent,Staré nadřazené
@@ -417,13 +396,12 @@
 apps/erpnext/erpnext/config/manufacturing.py +74,Global settings for all manufacturing processes.,Globální nastavení pro všechny výrobní procesy.
 DocType: Accounts Settings,Accounts Frozen Upto,Účty Frozen aľ
 DocType: SMS Log,Sent On,Poslán na
-apps/erpnext/erpnext/stock/doctype/item/item.py +512,Attribute {0} selected multiple times in Attributes Table,Atribut {0} vybraný několikrát v atributech tabulce
+apps/erpnext/erpnext/stock/doctype/item/item.py +516,Attribute {0} selected multiple times in Attributes Table,Atribut {0} vybraný několikrát v atributech tabulce
 DocType: Sales Order,Not Applicable,Nehodí se
 apps/erpnext/erpnext/config/hr.py +140,Holiday master.,Holiday master.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +19,Shell molding,Shell lití
 DocType: Material Request Item,Required Date,Požadovaná data
 DocType: Delivery Note,Billing Address,Fakturační adresa
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +644,Please enter Item Code.,"Prosím, zadejte kód položky."
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +648,Please enter Item Code.,"Prosím, zadejte kód položky."
 DocType: BOM,Costing,Rozpočet
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount","Je-li zaškrtnuto, bude částka daně považovat za již zahrnuty v tisku Rate / Tisk Částka"
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,Celkem Množství
@@ -433,7 +411,7 @@
 DocType: Item Attribute,To Range,K Rozsah
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Cenné papíry a vklady
 DocType: Features Setup,Imports,Importy
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +144,Adhesive bonding,Lepení
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +77,Total leaves allocated is mandatory,Celkem listy přidělené je povinné
 DocType: Job Opening,Description of a Job Opening,Popis jednoho volných pozic
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +102,Pending activities for today,Nevyřízené aktivity pro dnešek
 apps/erpnext/erpnext/config/hr.py +28,Attendance record.,Účast rekord.
@@ -441,26 +419,25 @@
 DocType: Sales Order Item,Used for Production Plan,Používá se pro výrobní plán
 DocType: System Settings,Loading...,Nahrávám...
 DocType: DocField,Password,Heslo
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +155,Fused deposition modeling,Nánosový modelování depozice
 DocType: Manufacturing Settings,Time Between Operations (in mins),Doba mezi operací (v min)
 DocType: Customer,Buyer of Goods and Services.,Kupující zboží a služeb.
 DocType: Journal Entry,Accounts Payable,Účty za úplatu
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +24,Add Subscribers,Přidat předplatitelé
 apps/erpnext/erpnext/public/js/feature_setup.js +220,""" does not exists",""" Neexistuje"
 DocType: Pricing Rule,Valid Upto,Valid aľ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +564,List a few of your customers. They could be organizations or individuals.,Seznam několik svých zákazníků. Ty by mohly být organizace nebo jednotlivci.
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,List a few of your customers. They could be organizations or individuals.,Seznam několik svých zákazníků. Ty by mohly být organizace nebo jednotlivci.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Direct Income,Přímý příjmů
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +33,"Can not filter based on Account, if grouped by Account","Nelze filtrovat na základě účtu, pokud seskupeny podle účtu"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +88,Administrative Officer,Správní ředitel
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Administrative Officer,Správní ředitel
 DocType: Payment Tool,Received Or Paid,Přijaté nebo placené
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +318,Please select Company,"Prosím, vyberte Company"
 DocType: Stock Entry,Difference Account,Rozdíl účtu
 apps/erpnext/erpnext/projects/doctype/task/task.py +44,Cannot close task as its dependant task {0} is not closed.,"Nelze zavřít úkol, jak jeho závislý úkol {0} není uzavřen."
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +305,Please enter Warehouse for which Material Request will be raised,"Prosím, zadejte sklad, který bude materiál žádosti předložené"
 DocType: Production Order,Additional Operating Cost,Další provozní náklady
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +20,Cosmetics,Kosmetika
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,Kosmetika
 DocType: DocField,Type,Typ
-apps/erpnext/erpnext/stock/doctype/item/item.py +417,"To merge, following properties must be same for both items","Chcete-li sloučit, tyto vlastnosti musí být stejné pro obě položky"
+apps/erpnext/erpnext/stock/doctype/item/item.py +421,"To merge, following properties must be same for both items","Chcete-li sloučit, tyto vlastnosti musí být stejné pro obě položky"
 DocType: Communication,Subject,Předmět
 DocType: Shipping Rule,Net Weight,Hmotnost
 DocType: Employee,Emergency Phone,Nouzový telefon
@@ -470,7 +447,6 @@
 DocType: Journal Entry,Difference (Dr - Cr),Rozdíl (Dr - Cr)
 DocType: Account,Profit and Loss,Zisky a ztráty
 apps/erpnext/erpnext/config/stock.py +293,Managing Subcontracting,Správa Subdodávky
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +58,New UOM must NOT be of type Whole Number,New UOM NESMÍ být typu celé číslo
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Furniture and Fixture,Nábytek
 DocType: Quotation,Rate at which Price list currency is converted to company's base currency,"Sazba, za kterou je ceníková měna převedena na základní měnu společnosti "
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Account {0} does not belong to company: {1},Účet {0} nepatří k firmě: {1}
@@ -490,14 +466,14 @@
 DocType: Purchase Invoice,Supplier Invoice No,Dodavatelské faktury č
 DocType: Territory,For reference,Pro srovnání
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +154,"Cannot delete Serial No {0}, as it is used in stock transactions","Nelze odstranit Pořadové číslo {0}, který se používá na skladě transakcích"
-apps/erpnext/erpnext/public/js/account_tree_grid.js +52,Closing (Cr),Uzavření (Cr)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +227,Closing (Cr),Uzavření (Cr)
 DocType: Serial No,Warranty Period (Days),Záruční doba (dny)
 DocType: Installation Note Item,Installation Note Item,Poznámka k instalaci bod
 ,Pending Qty,Čekající Množství
 DocType: Job Applicant,Thread HTML,Thread HTML
 DocType: Company,Ignore,Ignorovat
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +86,SMS sent to following numbers: {0},SMS poslal do následujících čísel: {0}
-apps/erpnext/erpnext/controllers/buying_controller.py +135,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Dodavatel Warehouse povinné pro subdodavatelskou doklad o zakoupení
+apps/erpnext/erpnext/controllers/buying_controller.py +126,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Dodavatel Warehouse povinné pro subdodavatelskou doklad o zakoupení
 DocType: Pricing Rule,Valid From,Platnost od
 DocType: Sales Invoice,Total Commission,Celkem Komise
 DocType: Pricing Rule,Sales Partner,Sales Partner
@@ -507,7 +483,7 @@
 To distribute a budget using this distribution, set this **Monthly Distribution** in the **Cost Center**","** Měsíční rozložení** vám pomůže váš rozpočet distribuovat do více měsíců, pokud Vaše podnikání ovlivňuje sezónnost.
 
  Chcete-li distribuovat rozpočet pomocí tohoto rozdělení, nastavte toto ** měsíční rozložení ** v ** nákladovém středisku **"
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +183,No records found in the Invoice table,Nalezené v tabulce faktury Žádné záznamy
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +130,No records found in the Invoice table,Nalezené v tabulce faktury Žádné záznamy
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +20,Please select Company and Party Type first,Vyberte první společnost a Party Typ
 apps/erpnext/erpnext/config/accounts.py +84,Financial / accounting year.,Finanční / Účetní rok.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","Je nám líto, sériových čísel nelze sloučit"
@@ -523,25 +499,25 @@
 DocType: Sales Order,Billing and Delivery Status,Fakturace a Delivery Status
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Opakujte zákazníci
 DocType: Leave Control Panel,Allocate,Přidělit
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +16,Previous,Předchozí
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard_page.html +16,Previous,Předchozí
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +620,Sales Return,Sales Return
 DocType: Production Planning Tool,Select Sales Orders from which you want to create Production Orders.,"Vyberte prodejní objednávky, ze kterého chcete vytvořit výrobní zakázky."
 DocType: Item,Delivered by Supplier (Drop Ship),Dodává Dodavatelem (Drop Ship)
 apps/erpnext/erpnext/config/hr.py +120,Salary components.,Mzdové složky.
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,Databáze potenciálních zákazníků.
+DocType: Authorization Rule,Customer or Item,Zákazník nebo položka
 apps/erpnext/erpnext/config/crm.py +17,Customer database.,Databáze zákazníků.
 DocType: Quotation,Quotation To,Nabídka k
 DocType: Lead,Middle Income,Středními příjmy
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),Otvor (Cr)
 apps/erpnext/erpnext/accounts/utils.py +193,Allocated amount can not be negative,Přidělená částka nemůže být záporná
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +123,Tumbling,Tumbling
 DocType: Purchase Order Item,Billed Amt,Účtovaného Amt
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,"Logická Warehouse na položky, které mohou být vyrobeny."
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +92,Reference No & Reference Date is required for {0},Referenční číslo a referenční datum je nutné pro {0}
 DocType: Event,Wednesday,Středa
 DocType: Sales Invoice,Customer's Vendor,Prodejce zákazníka
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +214,Production Order is Mandatory,Výrobní zakázka je povinné
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +139,Proposal Writing,Návrh Psaní
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,Proposal Writing,Návrh Psaní
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,Další prodeje osoba {0} existuje se stejným id zaměstnance
 apps/erpnext/erpnext/stock/stock_ledger.py +336,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},Negativní Sklad Error ({6}) k bodu {0} ve skladu {1} na {2} {3} v {4} {5}
 DocType: Fiscal Year Company,Fiscal Year Company,Fiskální rok Společnosti
@@ -564,7 +540,7 @@
 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.","Pak se pravidla pro tvorbu cen jsou odfiltrovány založeny na zákazníka, skupiny zákazníků, území, dodavatel, dodavatel typ, kampaň, obchodní partner atd"
 apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.py +179,Please install dropbox python module,"Prosím, nainstalujte dropbox python modul"
 DocType: Employee,Passport Number,Číslo pasu
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +82,Manager,Manažer
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Manager,Manažer
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +494,From Purchase Receipt,Z příjemky
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +219,Same item has been entered multiple times.,Stejný bod byl zadán vícekrát.
 DocType: SMS Settings,Receiver Parameter,Přijímač parametrů
@@ -572,10 +548,9 @@
 DocType: Sales Person,Sales Person Targets,Obchodník cíle
 apps/frappe/frappe/public/js/frappe/form/workflow.js +116,To,na
 apps/frappe/frappe/templates/base.html +145,Please enter email address,Zadejte e-mailovou adresu
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +35,End tube forming,Konec trubice tvořící
 DocType: Production Order Operation,In minutes,V minutách
 DocType: Issue,Resolution Date,Rozlišení Datum
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +635,Please set default Cash or Bank account in Mode of Payment {0},Prosím nastavte výchozí v hotovosti nebo bankovním účtu v způsob platby {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +637,Please set default Cash or Bank account in Mode of Payment {0},Prosím nastavte výchozí v hotovosti nebo bankovním účtu v způsob platby {0}
 DocType: Selling Settings,Customer Naming By,Zákazník Pojmenování By
 apps/erpnext/erpnext/accounts/doctype/account/account.js +67,Convert to Group,Převést do skupiny
 DocType: Activity Cost,Activity Type,Druh činnosti
@@ -583,12 +558,12 @@
 DocType: Customer,Fixed Days,Pevné Dny
 DocType: Sales Invoice,Packing List,Balení Seznam
 apps/erpnext/erpnext/config/buying.py +28,Purchase Orders given to Suppliers.,Nákupní Objednávky odeslané Dodavatelům.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +43,Publishing,Publikování
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +43,Publishing,Publikování
 DocType: Activity Cost,Projects User,Projekty uživatele
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Consumed,Spotřeba
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +198,{0}: {1} not found in Invoice Details table,{0}: {1} nebyla nalezena v tabulce Podrobnosti Faktury
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,{0}: {1} not found in Invoice Details table,{0}: {1} nebyla nalezena v tabulce Podrobnosti Faktury
 DocType: Company,Round Off Cost Center,Zaokrouhlovací nákladové středisko
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +208,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Údržba Navštivte {0} musí být zrušena před zrušením této prodejní objednávky
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +203,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Údržba Navštivte {0} musí být zrušena před zrušením této prodejní objednávky
 DocType: Material Request,Material Transfer,Přesun materiálu
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +56,Opening (Dr),Opening (Dr)
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},Časová značka zadání musí být po {0}
@@ -600,7 +575,6 @@
 DocType: Pricing Rule,Sales Manager,Manažer prodeje
 apps/frappe/frappe/public/js/frappe/model/model.js +492,Rename,Přejmenovat
 DocType: Journal Entry,Write Off Amount,Odepsat Částka
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +52,Bending,Ohýbání
 apps/frappe/frappe/core/page/user_permissions/user_permissions.js +246,Allow User,Umožňuje uživateli
 DocType: Journal Entry,Bill No,Bill No
 DocType: Purchase Invoice,Quarterly,Čtvrtletně
@@ -610,17 +584,16 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Please enter item details,"Prosím, zadejte podrobnosti položky"
 DocType: Purchase Receipt,Other Details,Další podrobnosti
 DocType: Account,Accounts,Účty
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +67,Marketing,Marketing
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +65,Straight shearing,Straight stříhání
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +67,Marketing,Marketing
 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.,Chcete-li sledovat položky v oblasti prodeje a nákupu dokumentů na základě jejich sériových čísel. To je možné také použít ke sledování detailů produktu záruční.
 DocType: Purchase Receipt Item Supplied,Current Stock,Current skladem
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +99,Rejected Warehouse is mandatory against regected item,Zamítnuto Warehouse je povinná proti regected položky
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +102,Rejected Warehouse is mandatory against regected item,Zamítnuto Warehouse je povinná proti regected položky
 DocType: Account,Expenses Included In Valuation,Náklady ceně oceňování
 DocType: Employee,Provide email id registered in company,Poskytnout e-mail id zapsané ve firmě
 DocType: Hub Settings,Seller City,Prodejce City
 DocType: Email Digest,Next email will be sent on:,Další e-mail bude odeslán dne:
 DocType: Offer Letter Term,Offer Letter Term,Nabídka Letter Term
-apps/erpnext/erpnext/stock/doctype/item/item.py +492,Item has variants.,Položka má varianty.
+apps/erpnext/erpnext/stock/doctype/item/item.py +496,Item has variants.,Položka má varianty.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Položka {0} nebyl nalezen
 DocType: Bin,Stock Value,Reklamní Value
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,Tree Type
@@ -629,10 +602,9 @@
 DocType: Material Request Item,Quantity and Warehouse,Množství a sklad
 DocType: Sales Invoice,Commission Rate (%),Výše provize (%)
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +172,"Against Voucher Type must be one of Sales Order, Sales Invoice or Journal Entry","Proti poukazu Type musí být jedním z prodejní objednávky, prodejní faktury nebo Journal Entry"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +139,Biomachining,Biomachining
 apps/erpnext/erpnext/setup/utils.py +89,Unable to find exchange rate,Nepodařilo se najít kurz
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +7,Aerospace,Aerospace
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +19,Welcome,Vítejte
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +7,Aerospace,Aerospace
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +40,Welcome,Vítejte
 DocType: Journal Entry,Credit Card Entry,Vstup Kreditní karta
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +18,Task Subject,Úkol Předmět
 apps/erpnext/erpnext/config/stock.py +33,Goods received from Suppliers.,Zboží od dodavatelů.
@@ -655,19 +627,19 @@
 DocType: Employee,Cell Number,Číslo buňky
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Ztracený
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +120,You can not enter current voucher in 'Against Journal Entry' column,"Nelze zadat aktuální poukaz v ""Proti Zápis do deníku"" sloupci"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +25,Energy,Energie
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,Energie
 DocType: Opportunity,Opportunity From,Příležitost Z
 apps/erpnext/erpnext/config/hr.py +33,Monthly salary statement.,Měsíční plat prohlášení.
 DocType: Item Group,Website Specifications,Webových stránek Specifikace
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +205,New Account,Nový účet
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +21,{0}: From {0} of type {1},{0}: Od {0} typu {1}
-apps/erpnext/erpnext/controllers/buying_controller.py +283,Row {0}: Conversion Factor is mandatory,Row {0}: Konverzní faktor je povinné
+apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,Row {0}: Konverzní faktor je povinné
 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.,Účetní Přihlášky lze proti koncové uzly. Záznamy proti skupinám nejsou povoleny.
 DocType: ToDo,High,Vysoké
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +361,Cannot deactivate or cancel BOM as it is linked with other BOMs,"Nelze deaktivovat nebo zrušit BOM, jak to souvisí s ostatními kusovníky"
 DocType: Opportunity,Maintenance,Údržba
 DocType: User,Male,Muž
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +182,Purchase Receipt number required for Item {0},Číslo příjmky je potřeba pro položku {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +183,Purchase Receipt number required for Item {0},Číslo příjmky je potřeba pro položku {0}
 DocType: Item Attribute Value,Item Attribute Value,Položka Hodnota atributu
 apps/erpnext/erpnext/config/crm.py +64,Sales campaigns.,Prodej kampaně.
 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.
@@ -715,10 +687,9 @@
 DocType: Address,Personal,Osobní
 DocType: Expense Claim Detail,Expense Claim Type,Náklady na pojistná Type
 DocType: Shopping Cart Settings,Default settings for Shopping Cart,Výchozí nastavení Košík
-apps/erpnext/erpnext/controllers/accounts_controller.py +324,"Journal Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Zápis do deníku {0} je spojen proti řádu {1}, zkontrolujte, zda by měl být tažen za pokrok v této faktuře."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +13,Biotechnology,Biotechnologie
+apps/erpnext/erpnext/controllers/accounts_controller.py +325,"Journal Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Zápis do deníku {0} je spojen proti řádu {1}, zkontrolujte, zda by měl být tažen za pokrok v této faktuře."
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +13,Biotechnology,Biotechnologie
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Office Maintenance Expenses,Náklady Office údržby
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +53,Hemming,Hemming
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +66,Please enter Item first,"Prosím, nejdřív zadejte položku"
 DocType: Account,Liability,Odpovědnost
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +62,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Sankcionována Částka nemůže být větší než reklamace Částka v řádku {0}.
@@ -731,10 +702,10 @@
 DocType: Company,Default Bank Account,Výchozí Bankovní účet
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +47,"To filter based on Party, select Party Type first","Chcete-li filtrovat na základě Party, vyberte typ Party první"
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},"""Aktualizovat sklad' nemůže být zaškrtnuto, protože položky nejsou dodány přes {0}"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Nos,Nos
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Nos,Nos
 DocType: Item,Items with higher weightage will be shown higher,Položky s vyšším weightage budou zobrazeny vyšší
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Bank Odsouhlasení Detail
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +627,My Invoices,Moje Faktury
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +629,My Invoices,Moje Faktury
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,Žádný zaměstnanec nalezeno
 DocType: Purchase Order,Stopped,Zastaveno
 DocType: Item,If subcontracted to a vendor,Pokud se subdodávky na dodavatele
@@ -753,35 +724,33 @@
 DocType: Features Setup,"To enable ""Point of Sale"" features",Chcete-li povolit &quot;Point of Sale&quot; představuje
 DocType: Bin,Moving Average Rate,Klouzavý průměr
 DocType: Production Planning Tool,Select Items,Vyberte položky
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,{0} against Bill {1} dated {2},{0} proti účtence {1} ze dne {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +328,{0} against Bill {1} dated {2},{0} proti účtence {1} ze dne {2}
 DocType: Comment,Reference Name,Název reference
 DocType: Maintenance Visit,Completion Status,Dokončení Status
 DocType: Sales Invoice Item,Target Warehouse,Target Warehouse
 DocType: Item,Allow over delivery or receipt upto this percent,Nechte přes dodávku nebo příjem aľ tohoto procenta
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +49,Expected Delivery Date cannot be before Sales Order Date,"Očekávané datum dodání, nemůže být před Sales pořadí Datum"
 DocType: Upload Attendance,Import Attendance,Importovat Docházku
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +17,All Item Groups,Všechny skupiny položek
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +17,All Item Groups,Všechny skupiny položek
 DocType: Process Payroll,Activity Log,Aktivita Log
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +30,Net Profit / Loss,Čistý zisk / ztráta
 apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,Automaticky napsat vzkaz na předkládání transakcí.
 DocType: Production Order,Item To Manufacture,Bod K výrobě
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +16,Permanent mold casting,Trvalé odlévání forem
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} je stav {2}
 apps/erpnext/erpnext/config/learn.py +172,Purchase Order to Payment,Objednávka na platební
 DocType: Sales Order Item,Projected Qty,Předpokládané množství
 DocType: Sales Invoice,Payment Due Date,Splatno dne
 DocType: Newsletter,Newsletter Manager,Newsletter Manažer
-apps/erpnext/erpnext/stock/doctype/item/item.js +229,Item Variant {0} already exists with same attributes,Bod Variant {0} již existuje se stejnými vlastnostmi
+apps/erpnext/erpnext/stock/doctype/item/item.js +231,Item Variant {0} already exists with same attributes,Bod Variant {0} již existuje se stejnými vlastnostmi
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening',&quot;Otevření&quot;
 DocType: Notification Control,Delivery Note Message,Delivery Note Message
 DocType: Expense Claim,Expenses,Výdaje
 DocType: Item Variant Attribute,Item Variant Attribute,Položka Variant Atribut
 ,Purchase Receipt Trends,Doklad o koupi Trendy
 DocType: Appraisal,Select template from which you want to get the Goals,"Vyberte šablonu, ze kterého chcete získat cílů"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +77,Research & Development,Výzkum a vývoj
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Research & Development,Výzkum a vývoj
 ,Amount to Bill,Částka k Fakturaci
 DocType: Company,Registration Details,Registrace Podrobnosti
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +75,Staking,Sázet
 DocType: Item,Re-Order Qty,Re-Order Množství
 DocType: Leave Block List Date,Leave Block List Date,Nechte Block List Datum
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +25,Scheduled to send to {0},Plánované poslat na {0}
@@ -792,18 +761,16 @@
 DocType: Sales Invoice Item,Stock Details,Sklad Podrobnosti
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Hodnota projektu
 apps/erpnext/erpnext/config/selling.py +304,Point-of-Sale,Místě prodeje
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,Cannot carry forward {0},Nelze převést {0}
 apps/erpnext/erpnext/accounts/doctype/account/account.py +91,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","Zůstatek na účtu již v Credit, není dovoleno stanovit ""Balance musí být"" jako ""debet"""
 DocType: Account,Balance must be,Zůstatek musí být
 DocType: Hub Settings,Publish Pricing,Publikovat Ceník
 DocType: Notification Control,Expense Claim Rejected Message,Zpráva o zamítnutí úhrady výdajů
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +145,Nailing,Báječný
 ,Available Qty,Množství k dispozici
 DocType: Purchase Taxes and Charges,On Previous Row Total,Na předchozí řady Celkem
 DocType: Salary Slip,Working Days,Pracovní dny
 DocType: Serial No,Incoming Rate,Příchozí Rate
 DocType: Packing Slip,Gross Weight,Hrubá hmotnost
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +410,The name of your company for which you are setting up this system.,"Název vaší společnosti, pro kterou nastavení tohoto systému."
+apps/erpnext/erpnext/public/js/setup_wizard.js +158,The name of your company for which you are setting up this system.,"Název vaší společnosti, pro kterou nastavení tohoto systému."
 DocType: HR Settings,Include holidays in Total no. of Working Days,Zahrnout dovolenou v celkovém. pracovních dní
 DocType: Job Applicant,Hold,Držet
 DocType: Employee,Date of Joining,Datum přistoupení
@@ -813,7 +780,6 @@
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +3,View Subscribers,Zobrazit Odběratelé
 DocType: Purchase Invoice Item,Purchase Receipt,Příjemka
 ,Received Items To Be Billed,"Přijaté položek, které mají být účtovány"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +114,Abrasive blasting,Abrazivní tryskání
 DocType: Employee,Ms,Paní
 apps/erpnext/erpnext/config/accounts.py +148,Currency exchange rate master.,Devizový kurz master.
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +253,Unable to find Time Slot in the next {0} days for Operation {1},Nelze najít časový úsek v příštích {0} dní k provozu {1}
@@ -825,7 +791,7 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +209,Serial No {0} does not belong to Item {1},Pořadové číslo {0} nepatří k bodu {1}
 DocType: Purchase Receipt Item Supplied,Required Qty,Požadované množství
 DocType: Bank Reconciliation,Total Amount,Celková částka
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +32,Internet Publishing,Internet Publishing
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,Internet Publishing
 DocType: Production Planning Tool,Production Orders,Výrobní Objednávky
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +35,Balance Value,Zůstatek Hodnota
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,Sales Ceník
@@ -836,7 +802,7 @@
 DocType: Supplier,Default Payable Accounts,Výchozí úplatu účty
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,Zaměstnanec {0} není aktivní nebo neexistuje
 DocType: Features Setup,Item Barcode,Položka Barcode
-apps/erpnext/erpnext/stock/doctype/item/item.py +487,Item Variants {0} updated,Bod Varianty {0} aktualizováno
+apps/erpnext/erpnext/stock/doctype/item/item.py +491,Item Variants {0} updated,Bod Varianty {0} aktualizováno
 DocType: Quality Inspection Reading,Reading 6,Čtení 6
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Záloha přijaté faktury
 DocType: Address,Shop,Obchod
@@ -845,7 +811,7 @@
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,"Výchozí účet Bank / Cash budou automaticky aktualizovány v POS faktury, pokud je zvolen tento režim."
 DocType: Employee,Permanent Address Is,Trvalé bydliště je
 DocType: Production Order Operation,Operation completed for how many finished goods?,Provoz dokončeno kolika hotových výrobků?
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +491,The Brand,Brand
+apps/erpnext/erpnext/public/js/setup_wizard.js +237,The Brand,Brand
 apps/erpnext/erpnext/controllers/status_updater.py +163,Allowance for over-{0} crossed for Item {1}.,Příspěvek na nadměrné {0} přešel k bodu {1}.
 DocType: Employee,Exit Interview Details,Exit Rozhovor Podrobnosti
 DocType: Item,Is Purchase Item,je Nákupní Položka
@@ -865,16 +831,16 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Indirect Income,Nepřímé příjmy
 DocType: Payment Tool,Set Payment Amount = Outstanding Amount,Set Částka platby = dlužné částky
 DocType: Contact Us Settings,Address Line 1,Adresní řádek 1
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Variance,Odchylka
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +392,Company Name,Název společnosti
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +53,Variance,Odchylka
+,Company Name,Název společnosti
 DocType: SMS Center,Total Message(s),Celkem zpráv (y)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +515,Select Item for Transfer,Vybrat položku pro převod
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +538,Select Item for Transfer,Vybrat položku pro převod
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,Zobrazit seznam všech nápovědy videí
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,"Vyberte účet šéf banky, kde byla uložena kontrola."
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,Povolit uživateli upravovat Ceník Cena při transakcích
 DocType: Pricing Rule,Max Qty,Max Množství
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +106,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Row {0}: Platba na prodejní / nákupní objednávce by měly být vždy označeny jako předem
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +16,Chemical,Chemický
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,Chemický
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +693,All items have already been transferred for this Production Order.,Všechny položky již byly převedeny na výrobu tohoto řádu.
 DocType: Process Payroll,Select Payroll Year and Month,Vyberte Payroll rok a měsíc
 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""",Přejděte na příslušné skupiny (obvykle využití finančních prostředků&gt; oběžných aktiv&gt; bankovních účtů a vytvořit nový účet (kliknutím na Přidat dítě) typu &quot;Bank&quot;
@@ -885,12 +851,12 @@
 DocType: Item,Inspection Criteria,Inspekční Kritéria
 apps/erpnext/erpnext/config/accounts.py +101,Tree of finanial Cost Centers.,Strom finanial nákladových středisek.
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,Převedené
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +492,Upload your letter head and logo. (you can edit them later).,Nahrajte svůj dopis hlavu a logo. (Můžete je upravit později).
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +156,White,Bílá
+apps/erpnext/erpnext/public/js/setup_wizard.js +238,Upload your letter head and logo. (you can edit them later).,Nahrajte svůj dopis hlavu a logo. (Můžete je upravit později).
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,White,Bílá
 DocType: SMS Center,All Lead (Open),Všechny Lead (Otevřeny)
 DocType: Purchase Invoice,Get Advances Paid,Získejte zaplacené zálohy
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +362,Attach Your Picture,Připojit svůj obrázek
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Make ,Dělat 
+apps/erpnext/erpnext/public/js/setup_wizard.js +112,Attach Your Picture,Připojit svůj obrázek
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +540,Make ,Dělat 
 DocType: Journal Entry,Total Amount in Words,Celková částka slovy
 DocType: Workflow State,Stop,Stop
 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.,"Došlo k chybě. Jedním z důvodů by mohlo být pravděpodobné, že jste uložili formulář. Obraťte se prosím na support@erpnext.com Pokud problém přetrvává."
@@ -899,14 +865,13 @@
 DocType: Lead,Next Contact Date,Další Kontakt Datum
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,Otevření POČET
 DocType: Holiday List,Holiday List Name,Jméno Holiday Seznam
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +168,Stock Options,Akciové opce
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +168,Stock Options,Akciové opce
 DocType: Journal Entry Account,Expense Claim,Hrazení nákladů
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +181,Qty for {0},Množství pro {0}
 DocType: Leave Application,Leave Application,Požadavek na absenci
 apps/erpnext/erpnext/config/hr.py +77,Leave Allocation Tool,Nástroj pro přidělování dovolených
 DocType: Leave Block List,Leave Block List Dates,Nechte Block List termíny
 DocType: Company,If Monthly Budget Exceeded (for expense account),Pokud Měsíční rozpočet překročen (pro výdajového účtu)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +56,Trimming,Ořezávání
 DocType: Workstation,Net Hour Rate,Net Hour Rate
 DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,Přistál Náklady doklad o koupi
 DocType: Company,Default Terms,Výchozí podmínky
@@ -914,10 +879,9 @@
 DocType: POS Profile,Cash/Bank Account,Hotovostní / Bankovní účet
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,Removed items with no change in quantity or value.,Odstraněné položky bez změny množství nebo hodnoty.
 DocType: Delivery Note,Delivery To,Doručení do
-apps/erpnext/erpnext/stock/doctype/item/item.py +509,Attribute table is mandatory,Atribut tabulka je povinné
+apps/erpnext/erpnext/stock/doctype/item/item.py +513,Attribute table is mandatory,Atribut tabulka je povinné
 DocType: Production Planning Tool,Get Sales Orders,Získat Prodejní objednávky
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} nemůže být negativní
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +103,Filing,Podání
 apps/erpnext/erpnext/templates/form_grid/item_grid.html +72,Discount,Sleva
 DocType: Features Setup,Purchase Discounts,Nákup Slevy
 DocType: Workstation,Wages,Mzdy
@@ -934,6 +898,7 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +112,You are the Expense Approver for this record. Please Update the 'Status' and Save,"Jste Expense schvalujícím pro tento záznam. Prosím aktualizujte ""stavu"" a Uložit"
 DocType: Serial No,Creation Document No,Tvorba dokument č
 DocType: Issue,Issue,Problém
+apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account does not match with Company,Účet neodpovídá Company
 apps/erpnext/erpnext/config/stock.py +136,"Attributes for Item Variants. e.g Size, Color etc.","Atributy pro položky varianty. například velikost, barva atd."
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +39,WIP Warehouse,WIP Warehouse
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +194,Serial No {0} is under maintenance contract upto {1},Pořadové číslo {0} je na základě smlouvy o údržbě aľ {1}
@@ -942,7 +907,7 @@
 DocType: Tax Rule,Shipping State,Přepravní 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,"Položka musí být přidány pomocí ""získat předměty z kupní příjmy"" tlačítkem"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,Prodejní náklady
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Buying,Standardní Nakupování
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +120,Standard Buying,Standardní Nakupování
 DocType: GL Entry,Against,Proti
 DocType: Item,Default Selling Cost Center,Výchozí Center Prodejní cena
 DocType: Sales Partner,Implementation Partner,Implementačního partnera
@@ -963,29 +928,29 @@
 DocType: Time Log Batch,updated via Time Logs,aktualizovat přes čas Záznamy
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,Průměrný věk
 DocType: Opportunity,Your sales person who will contact the customer in future,"Váš obchodní zástupce, který bude kontaktovat zákazníka v budoucnu"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +588,List a few of your suppliers. They could be organizations or individuals.,Seznam několik svých dodavatelů. Ty by mohly být organizace nebo jednotlivci.
+apps/erpnext/erpnext/public/js/setup_wizard.js +326,List a few of your suppliers. They could be organizations or individuals.,Seznam několik svých dodavatelů. Ty by mohly být organizace nebo jednotlivci.
 DocType: Company,Default Currency,Výchozí měna
 DocType: Contact,Enter designation of this Contact,Zadejte označení této Kontakt
 DocType: Contact Us Settings,Address,Adresa
 DocType: Expense Claim,From Employee,Od Zaměstnance
-apps/erpnext/erpnext/controllers/accounts_controller.py +338,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,"Upozornění: Systém nebude kontrolovat nadfakturace, protože částka za položku na {1} je nula {0}"
+apps/erpnext/erpnext/controllers/accounts_controller.py +339,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,"Upozornění: Systém nebude kontrolovat nadfakturace, protože částka za položku na {1} je nula {0}"
 DocType: Journal Entry,Make Difference Entry,Učinit vstup Rozdíl
 DocType: Upload Attendance,Attendance From Date,Účast Datum od
 DocType: Appraisal Template Goal,Key Performance Area,Key Performance Area
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +54,Transportation,Doprava
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +54,Transportation,Doprava
 apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +67, and year: ,a rok: 
 DocType: Email Digest,Annual Expense,Roční Expense
 DocType: SMS Center,Total Characters,Celkový počet znaků
-apps/erpnext/erpnext/controllers/buying_controller.py +139,Please select BOM in BOM field for Item {0},Vyberte kusovník Bom oblasti k bodu {0}
+apps/erpnext/erpnext/controllers/buying_controller.py +130,Please select BOM in BOM field for Item {0},Vyberte kusovník Bom oblasti k bodu {0}
 DocType: C-Form Invoice Detail,C-Form Invoice Detail,C-Form Faktura Detail
 DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,Platba Odsouhlasení faktury
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +32,Contribution %,Příspěvek%
 DocType: Item,website page link,webové stránky odkaz na stránku
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +192,Let's prepare the system for first use.,Pojďme připravit systém pro první použití.
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +242,Let's prepare the system for first use.,Pojďme připravit systém pro první použití.
 DocType: Company,Company registration numbers for your reference. Tax numbers etc.,Registrace firmy čísla pro váš odkaz. Daňové čísla atd
 DocType: Sales Partner,Distributor,Distributor
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Nákupní košík Shipping Rule
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +214,Production Order {0} must be cancelled before cancelling this Sales Order,Výrobní zakázka {0} musí být zrušena před zrušením této prodejní objednávky
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +209,Production Order {0} must be cancelled before cancelling this Sales Order,Výrobní zakázka {0} musí být zrušena před zrušením této prodejní objednávky
 ,Ordered Items To Be Billed,Objednané zboží fakturovaných
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +24,From Range has to be less than To Range,"Z rozsahu, musí být nižší než na 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.,Vyberte Time protokolů a předložit k vytvoření nové prodejní faktury.
@@ -1005,14 +970,13 @@
 DocType: Sales Invoice Advance,Sales Invoice Advance,Prodejní faktury Advance
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +398,Nothing to request,Nic požadovat
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date',"""Skutečné datum zahájení"" nemůže být větší než ""Skutečné datum ukončení"""
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +75,Management,Řízení
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +75,Management,Řízení
 apps/erpnext/erpnext/config/projects.py +33,Types of activities for Time Sheets,Typy činností pro Time listy
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +14,Investment casting,Investiční lití
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +51,Either debit or credit amount is required for {0},Buď debetní nebo kreditní částka je vyžadována pro {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""","To bude připojen na položku zákoníku varianty. Například, pokud vaše zkratka je ""SM"", a položka je kód ""T-SHIRT"", položka kód varianty bude ""T-SHIRT-SM"""
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,"Čistá Pay (slovy) budou viditelné, jakmile uložíte výplatní pásce."
 apps/frappe/frappe/core/doctype/user/user_list.js +12,Active,Aktivní
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +154,Blue,Modrý
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +154,Blue,Modrý
 DocType: Purchase Invoice,Is Return,Je Return
 DocType: Price List Country,Price List Country,Ceník Země
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +123,Further nodes can be only created under 'Group' type nodes,"Další uzly mohou být pouze vytvořena v uzlech typu ""skupiny"""
@@ -1022,18 +986,16 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +22,POS Profile {0} already created for user: {1} and company {2},POS Profile {0} již vytvořili pro uživatele: {1} a společnost {2}
 DocType: Purchase Order Item,UOM Conversion Factor,UOM Conversion Factor
 DocType: Stock Settings,Default Item Group,Výchozí bod Group
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +156,Laminated object manufacturing,Výroba laminovaných předmětů
 apps/erpnext/erpnext/config/buying.py +13,Supplier database.,Databáze dodavatelů.
 DocType: Account,Balance Sheet,Rozvaha
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +561,Cost Center For Item with Item Code ',"Nákladové středisko u položky s Kód položky """
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +45,Stretch forming,Stretch tváření
 DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,"Váš obchodní zástupce dostane upomínku na tento den, aby kontaktoval zákazníka"
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +210,"Further accounts can be made under Groups, but entries can be made against non-Groups","Další účty mohou být vyrobeny v rámci skupiny, ale údaje lze proti non-skupin"
 apps/erpnext/erpnext/config/hr.py +125,Tax and other salary deductions.,Daňové a jiné platové srážky.
 DocType: Lead,Lead,Lead
 DocType: Email Digest,Payables,Závazky
 DocType: Account,Warehouse,Sklad
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +90,Row #{0}: Rejected Qty can not be entered in Purchase Return,Řádek # {0}: Zamítnutí Množství nemůže být zapsán do kupní Návrat
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +93,Row #{0}: Rejected Qty can not be entered in Purchase Return,Řádek # {0}: Zamítnutí Množství nemůže být zapsán do kupní Návrat
 ,Purchase Order Items To Be Billed,Položky vydané objednávky k fakturaci
 DocType: Purchase Invoice Item,Net Rate,Čistá míra
 DocType: Purchase Invoice Item,Purchase Invoice Item,Položka přijaté faktury
@@ -1048,13 +1010,13 @@
 DocType: Global Defaults,Current Fiscal Year,Aktuální fiskální rok
 DocType: Global Defaults,Disable Rounded Total,Zakázat Zaoblený Celkem
 DocType: Lead,Call,Volání
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +384,'Entries' cannot be empty,"""Záznamy"" nemohou být prázdné"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +386,'Entries' cannot be empty,"""Záznamy"" nemohou být prázdné"
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},Duplicitní řádek {0} se stejným {1}
 ,Trial Balance,Trial Balance
 apps/erpnext/erpnext/config/hr.py +205,Setting up Employees,Nastavení Zaměstnanci
 apps/erpnext/erpnext/public/js/feature_setup.js +220,"Grid ""","Grid """
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +150,Please select prefix first,"Prosím, vyberte první prefix"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +138,Research,Výzkum
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +138,Research,Výzkum
 DocType: Maintenance Visit Purpose,Work Done,Odvedenou práci
 apps/erpnext/erpnext/controllers/item_variant.py +25,Please specify at least one attribute in the Attributes table,Uveďte prosím alespoň jeden atribut v tabulce atributy
 DocType: Contact,User ID,User ID
@@ -1062,10 +1024,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +57,View Ledger,View Ledger
 DocType: File,Lft,LFT
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Nejstarší
-apps/erpnext/erpnext/stock/doctype/item/item.py +394,"An Item Group exists with same name, please change the item name or rename the item group","Položka Group existuje se stejným názvem, prosím, změnit název položky nebo přejmenovat skupinu položek"
+apps/erpnext/erpnext/stock/doctype/item/item.py +398,"An Item Group exists with same name, please change the item name or rename the item group","Položka Group existuje se stejným názvem, prosím, změnit název položky nebo přejmenovat skupinu položek"
 DocType: Communication,Delivery Status,Delivery Status
 DocType: Production Order,Manufacture against Sales Order,Výroba na odběratele
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +517,Rest Of The World,Zbytek světa
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +455,Rest Of The World,Zbytek světa
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,Položka {0} nemůže mít dávku
 ,Budget Variance Report,Rozpočet Odchylka Report
 DocType: Salary Slip,Gross Pay,Hrubé mzdy
@@ -1076,13 +1038,11 @@
 DocType: BOM Item,Item Description,Položka Popis
 DocType: Payment Tool,Payment Mode,Způsob platby
 DocType: Purchase Invoice,Is Recurring,Je Opakující
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +154,Direct metal laser sintering,Přímý plechu laserem spékání
 DocType: Purchase Order,Supplied Items,Dodávané položky
 DocType: Production Order,Qty To Manufacture,Množství K výrobě
 DocType: Buying Settings,Maintain same rate throughout purchase cycle,Udržovat stejnou sazbu po celou kupní cyklu
 DocType: Opportunity Item,Opportunity Item,Položka Příležitosti
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +61,Temporary Opening,Dočasné Otevření
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +41,Cryorolling,Cryorolling
 ,Employee Leave Balance,Zaměstnanec Leave Balance
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +128,Balance for Account {0} must always be {1},Zůstatek na účtě {0} musí být vždy {1}
 DocType: Address,Address Type,Typ adresy
@@ -1098,23 +1058,23 @@
 DocType: Journal Entry,Get Outstanding Invoices,Získat neuhrazených faktur
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,Prodejní objednávky {0} není platný
 apps/erpnext/erpnext/setup/doctype/company/company.py +172,"Sorry, companies cannot be merged","Je nám líto, společnosti nemohou být sloučeny"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +145,Small,Malý
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Small,Malý
 DocType: Employee,Employee Number,Počet zaměstnanců
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},Případ číslo (čísla) již v provozu. Zkuste se věc č {0}
 ,Invoiced Amount (Exculsive Tax),Fakturovaná částka (bez daně)
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,Položka 2
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +59,Account head {0} created,Hlava účtu {0} vytvořil
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +153,Green,Zelená
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Green,Zelená
 DocType: Item,Auto re-order,Auto re-order
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +57,Total Achieved,Celkem Dosažená
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +59,Total Achieved,Celkem Dosažená
 DocType: Employee,Place of Issue,Místo vydání
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +59,Contract,Smlouva
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Contract,Smlouva
 DocType: Report,Disabled,Vypnuto
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +490,UOM coversion factor required for UOM: {0} in Item: {1},UOM coversion faktor potřebný k nerozpuštěných: {0} v bodě: {1}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +83,Indirect Expenses,Nepřímé náklady
 apps/erpnext/erpnext/controllers/selling_controller.py +163,Row {0}: Qty is mandatory,Row {0}: Množství je povinný
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +8,Agriculture,Zemědělství
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +611,Your Products or Services,Vaše Produkty nebo Služby
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,Zemědělství
+apps/erpnext/erpnext/public/js/setup_wizard.js +347,Your Products or Services,Vaše Produkty nebo Služby
 DocType: Mode of Payment,Mode of Payment,Způsob platby
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,Jedná se o skupinu kořen položky a nelze upravovat.
 DocType: Journal Entry Account,Purchase Order,Vydaná objednávka
@@ -1126,7 +1086,7 @@
 DocType: Serial No,Serial No Details,Serial No Podrobnosti
 DocType: Purchase Invoice Item,Item Tax Rate,Sazba daně položky
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +113,"For {0}, only credit accounts can be linked against another debit entry","Pro {0}, tak úvěrové účty mohou být propojeny na jinou položku debetní"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Delivery Note {0} is not submitted,Delivery Note {0} není předložena
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +470,Delivery Note {0} is not submitted,Delivery Note {0} není předložena
 apps/erpnext/erpnext/stock/get_item_details.py +136,Item {0} must be a Sub-contracted Item,Položka {0} musí být Subdodavatelské Item
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,Kapitálové Vybavení
 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.","Ceny Pravidlo je nejprve vybrána na základě ""Použít na"" oblasti, které mohou být položky, položky skupiny nebo značky."
@@ -1136,7 +1096,7 @@
 DocType: Appraisal Goal,Goal,Cíl
 DocType: Sales Invoice Item,Edit Description,Upravit popis
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +318,Expected Delivery Date is lesser than Planned Start Date.,Očekávané datum dodání je menší než plánované datum zahájení.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +579,For Supplier,Pro Dodavatele
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +602,For Supplier,Pro Dodavatele
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,Nastavení typu účtu pomáhá při výběru tohoto účtu v transakcích.
 DocType: Purchase Invoice,Grand Total (Company Currency),Celkový součet (Měna společnosti)
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,Celkem Odchozí
@@ -1162,10 +1122,10 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +74,"Total {0} for all items is zero, may you should change 'Distribute Charges Based On'","Celkem {0} pro všechny položky je nula, můžete měli změnit &quot;Distribuovat poplatků na základě&quot;"
 DocType: Purchase Invoice,Taxes and Charges Calculation,Daně a poplatky výpočet
 DocType: BOM Operation,Workstation,pracovna stanica
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +112,Hardware,Technické vybavení
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +112,Hardware,Technické vybavení
 DocType: Attendance,HR Manager,HR Manager
 apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,Vyberte společnost
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +50,Privilege Leave,Privilege Leave
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +50,Privilege Leave,Privilege Leave
 DocType: Purchase Invoice,Supplier Invoice Date,Dodavatelské faktury Datum
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +79,You need to enable Shopping Cart,Musíte povolit Nákupní košík
 apps/frappe/frappe/public/js/frappe/form/grid_body.html +6,No Data,No Data
@@ -1178,7 +1138,7 @@
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +81,Overlapping conditions found between:,Překrývající podmínky nalezeno mezi:
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +168,Against Journal Entry {0} is already adjusted against some other voucher,Proti věstníku Entry {0} je již nastavena proti jiným poukaz
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +68,Total Order Value,Celková hodnota objednávky
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +38,Food,Jídlo
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +38,Food,Jídlo
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Stárnutí Rozsah 3
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +139,You can make a time log only against a submitted production order,Můžete udělat časový záznam pouze proti předložené výrobní objednávce
 DocType: Maintenance Schedule Item,No of Visits,Počet návštěv
@@ -1198,6 +1158,7 @@
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,View Offer Letter,View Nabídka Dopis
 DocType: Communication,Communication,Komunikace
 DocType: Item,Is Service Item,Je Service Item
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +81,Application period cannot be outside leave allocation period,Období pro podávání žádostí nemůže být alokační období venku volno
 DocType: Activity Cost,Projects,Projekty
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +31,Please select Fiscal Year,"Prosím, vyberte Fiskální rok"
 apps/erpnext/erpnext/controllers/buying_controller.py +23,From {0} | {1} {2},Od {0} | {1} {2}
@@ -1216,7 +1177,7 @@
 DocType: Item,Maintain Stock,Udržovat Stock
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +213,Stock Entries already created for Production Order ,Fotky Položky již vytvořené pro výrobní zakázku
 DocType: Leave Control Panel,Leave blank if considered for all designations,"Ponechte prázdné, pokud se to považuje za všechny označení"
-apps/erpnext/erpnext/controllers/accounts_controller.py +499,Charge of type 'Actual' in row {0} cannot be included in Item Rate,"Obvinění z typu ""Aktuální"" v řádku {0} nemůže být zařazena do položky Rate"
+apps/erpnext/erpnext/controllers/accounts_controller.py +500,Charge of type 'Actual' in row {0} cannot be included in Item Rate,"Obvinění z typu ""Aktuální"" v řádku {0} nemůže být zařazena do položky Rate"
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,Max: {0},Max: {0}
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +16,From Datetime,Od datetime
 DocType: Email Digest,For Company,Pro Společnost
@@ -1226,7 +1187,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +50,Chart of Accounts,Diagram účtů
 DocType: Material Request,Terms and Conditions Content,Podmínky Content
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +471,cannot be greater than 100,nemůže být větší než 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +546,Item {0} is not a stock Item,Položka {0} není skladem
+apps/erpnext/erpnext/stock/doctype/item/item.py +550,Item {0} is not a stock Item,Položka {0} není skladem
 DocType: Maintenance Visit,Unscheduled,Neplánovaná
 DocType: Employee,Owned,Vlastník
 DocType: Salary Slip Deduction,Depends on Leave Without Pay,Závisí na dovolené bez nároku na mzdu
@@ -1240,31 +1201,29 @@
 DocType: HR Settings,Employee Settings,Nastavení zaměstnanců
 ,Batch-Wise Balance History,Batch-Wise Balance History
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +72,To Do List,Do List
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +63,Apprentice,Učeň
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Apprentice,Učeň
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +99,Negative Quantity is not allowed,Negativní množství není dovoleno
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
 Used for Taxes and Charges","Tax detail tabulka staženy z položky pána jako řetězec a uložené v této oblasti.
  Používá se daní a poplatků"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +61,Lancing,Lancing
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +151,Employee cannot report to himself.,Zaměstnanec nemůže odpovídat sám sobě.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","V případě, že účet je zamrzlý, položky mohou omezeným uživatelům."
 DocType: Email Digest,Bank Balance,Bank Balance
-apps/erpnext/erpnext/controllers/accounts_controller.py +435,Accounting Entry for {0}: {1} can only be made in currency: {2},Účetní záznam pro {0}: {1} mohou být prováděny pouze v měně: {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +436,Accounting Entry for {0}: {1} can only be made in currency: {2},Účetní záznam pro {0}: {1} mohou být prováděny pouze v měně: {2}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +38,No active Salary Structure found for employee {0} and the month,Žádný aktivní Struktura Plat nalezených pro zaměstnance {0} a měsíc
 DocType: Job Opening,"Job profile, qualifications required etc.","Profil Job, požadované kvalifikace atd."
 DocType: Journal Entry Account,Account Balance,Zůstatek na účtu
 apps/erpnext/erpnext/config/accounts.py +112,Tax Rule for transactions.,Daňové Pravidlo pro transakce.
 DocType: Rename Tool,Type of document to rename.,Typ dokumentu přejmenovat.
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +630,We buy this Item,Vykupujeme tuto položku
+apps/erpnext/erpnext/public/js/setup_wizard.js +366,We buy this Item,Vykupujeme tuto položku
 DocType: Address,Billing,Fakturace
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +77,Flanging,Obrubování
 DocType: Bulk Email,Not Sent,Neodesláno
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +73,Explosive forming,Výbušné tváření
 DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),Celkem Daně a poplatky (Company Měnové)
 DocType: Shipping Rule,Shipping Account,Přepravní účtu
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +43,Scheduled to send to {0} recipients,Plánované poslat na {0} příjemci
 DocType: Quality Inspection,Readings,Čtení
 DocType: Stock Entry,Total Additional Costs,Celkem Dodatečné náklady
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Sub Assemblies,Podsestavy
+apps/erpnext/erpnext/public/js/setup_wizard.js +359,Sub Assemblies,Podsestavy
 DocType: Shipping Rule Condition,To Value,Chcete-li hodnota
 DocType: Supplier,Stock Manager,Reklamní manažer
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +143,Source warehouse is mandatory for row {0},Source sklad je povinná pro řadu {0}
@@ -1274,44 +1233,42 @@
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Import se nezdařil!
 apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,Žádná adresa přidán dosud.
 DocType: Workstation Working Hour,Workstation Working Hour,Pracovní stanice Pracovní Hour
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +83,Analyst,Analytik
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +202,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},"Řádek {0}: přidělené množství {1}, musí být menší než nebo se rovná hodnotě JV {2}"
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Analyst,Analytik
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +149,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},"Řádek {0}: přidělené množství {1}, musí být menší než nebo se rovná hodnotě JV {2}"
 DocType: Item,Inventory,Inventář
 DocType: Features Setup,"To enable ""Point of Sale"" view",Chcete-li povolit &quot;Point of Sale&quot; pohledu
 apps/erpnext/erpnext/public/js/pos/pos.js +402,Payment cannot be made for empty cart,Platba nemůže být pro prázdný košík
 DocType: Item,Sales Details,Prodejní Podrobnosti
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +149,Pinning,Připne
 DocType: Opportunity,With Items,S položkami
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,V Množství
 DocType: Notification Control,Expense Claim Rejected,Uhrazení výdajů zamítnuto
 DocType: Sales Invoice,"The date on which next invoice will be generated. It is generated on submit.
 ","Datum, kdy bude vygenerován příští faktury. To je generován na odeslat."
 DocType: Item Attribute,Item Attribute,Položka Atribut
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +105,Government,Vláda
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Government,Vláda
 apps/erpnext/erpnext/config/stock.py +268,Item Variants,Položka Varianty
 DocType: Company,Services,Služby
 apps/erpnext/erpnext/accounts/report/financial_statements.py +147,Total ({0}),Celkem ({0})
 DocType: Cost Center,Parent Cost Center,Nadřazené Nákladové středisko
 DocType: Sales Invoice,Source,Zdroj
 DocType: Leave Type,Is Leave Without Pay,Je odejít bez Pay
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +186,No records found in the Payment table,Nalezené v tabulce platby Žádné záznamy
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +405,Financial Year Start Date,Finanční rok Datum zahájení
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +133,No records found in the Payment table,Nalezené v tabulce platby Žádné záznamy
+apps/erpnext/erpnext/public/js/setup_wizard.js +153,Financial Year Start Date,Finanční rok Datum zahájení
 DocType: Employee External Work History,Total Experience,Celková zkušenost
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +100,Countersinking,Zahlubování
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +271,Packing Slip(s) cancelled,Balení Slip (y) zrušeno
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +276,Packing Slip(s) cancelled,Balení Slip (y) zrušeno
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,Nákladní a Spediční Poplatky
 DocType: Material Request Item,Sales Order No,Prodejní objednávky No
 DocType: Item Group,Item Group Name,Položka Název skupiny
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +50,Taken,Zaujatý
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,Zaujatý
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +66,Transfer Materials for Manufacture,Přenos Materiály pro výrobu
 DocType: Pricing Rule,For Price List,Pro Ceník
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +27,Executive Search,Executive Search
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,Executive Search
 apps/erpnext/erpnext/stock/stock_ledger.py +405,"Purchase rate for item: {0} not found, which is required to book accounting entry (expense). Please mention item price against a buying price list.","Cena při platbě za položku: {0} nebyl nalezen, který je povinen si účetní položka (náklady). Prosím, uveďte zboží Cena podle seznamu kupní cenou."
 DocType: Maintenance Schedule,Schedules,Plány
 DocType: Purchase Invoice Item,Net Amount,Čistá částka
 DocType: Purchase Order Item Supplied,BOM Detail No,BOM Detail No
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),Dodatečná sleva Částka (Měna Company)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +537,Error: {0} > {1},Chyba: {0}> {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +541,Error: {0} > {1},Chyba: {0}> {1}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,"Prosím, vytvořte nový účet z grafu účtů."
 DocType: Maintenance Visit,Maintenance Visit,Maintenance Visit
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer > Customer Group > Territory,Zákazník> Zákazník Group> Territory
@@ -1322,7 +1279,6 @@
 DocType: Event,Tuesday,Úterý
 DocType: Leave Block List,Block Holidays on important days.,Blokové Dovolená na významných dnů.
 ,Accounts Receivable Summary,Pohledávky Shrnutí
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +43,Leaves for type {0} already allocated for Employee {1} for period {2} - {3},Dovolená typu {0} je již přidělena pro zaměstnance {1} na období {2} - {3}
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +187,Please set User ID field in an Employee record to set Employee Role,Prosím nastavte uživatelské ID pole v záznamu zaměstnanců nastavit role zaměstnance
 DocType: UOM,UOM Name,UOM Name
 DocType: Top Bar Item,Target,Cíl
@@ -1334,15 +1290,14 @@
 DocType: ToDo,Due Date,Datum splatnosti
 DocType: Sales Invoice Item,Brand Name,Jméno značky
 DocType: Purchase Receipt,Transporter Details,Transporter Podrobnosti
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Box,Krabice
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +389,The Organization,Organizace
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Box,Krabice
+apps/erpnext/erpnext/public/js/setup_wizard.js +137,The Organization,Organizace
 DocType: Monthly Distribution,Monthly Distribution,Měsíční Distribution
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,Přijímač Seznam je prázdný. Prosím vytvořte přijímače Seznam
 DocType: Production Plan Sales Order,Production Plan Sales Order,Výrobní program prodejní objednávky
 DocType: Sales Partner,Sales Partner Target,Sales Partner Target
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},Účetní záznam pro {0} lze provádět pouze v měně: {1}
 DocType: Pricing Rule,Pricing Rule,Ceny Pravidlo
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +58,Notching,Vystřihování
 apps/erpnext/erpnext/config/learn.py +167,Material Request to Purchase Order,Materiál Žádost o příkazu k nákupu
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +74,Row # {0}: Returned Item {1} does not exists in {2} {3},Řádek # {0}: vrácené položky {1} neexistuje v {2} {3}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,Bankovní účty
@@ -1359,20 +1314,19 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Amounts not reflected in bank,Částky nezohledněny v bance
 DocType: Quality Inspection Reading,Reading 4,Čtení 4
 apps/erpnext/erpnext/config/hr.py +23,Claims for company expense.,Nároky na náklady firmy.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +8,Centrifugal casting,Odstředivé lití
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +119,Magnetic field-assisted finishing,Magnetické pole-assisted dokončování
 DocType: Company,Default Holiday List,Výchozí Holiday Seznam
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +165,Stock Liabilities,Stock Závazky
 DocType: Purchase Receipt,Supplier Warehouse,Dodavatel Warehouse
 DocType: Opportunity,Contact Mobile No,Kontakt Mobil
 DocType: Production Planning Tool,Select Sales Orders,Vyberte Prodejní objednávky
 ,Material Requests for which Supplier Quotations are not created,Materiál Žádosti o které Dodavatel citace nejsou vytvořeny
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +117,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,"V den, kdy (y), na které žádáte o povolení jsou prázdniny. Nemusíte požádat o volno."
 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.,Chcete-li sledovat položky pomocí čárového kódu. Budete mít možnost zadat položky dodacího listu a prodejní faktury snímáním čárového kódu položky.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +477,Mark as Delivered,Označit jako Dodává
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +497,Mark as Delivered,Označit jako Dodává
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +34,Make Quotation,Vytvořit nabídku
 DocType: Dependent Task,Dependent Task,Závislý Task
-apps/erpnext/erpnext/stock/doctype/item/item.py +306,Conversion factor for default Unit of Measure must be 1 in row {0},"Konverzní faktor pro výchozí měrnou jednotku, musí být 1 v řádku {0}"
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,Leave of type {0} cannot be longer than {1},Absence typu {0} nemůže být delší než {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +310,Conversion factor for default Unit of Measure must be 1 in row {0},"Konverzní faktor pro výchozí měrnou jednotku, musí být 1 v řádku {0}"
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +155,Leave of type {0} cannot be longer than {1},Absence typu {0} nemůže být delší než {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Zkuste plánování operací pro X dní předem.
 DocType: HR Settings,Stop Birthday Reminders,Zastavit připomenutí narozenin
 DocType: SMS Center,Receiver List,Přijímač Seznam
@@ -1380,15 +1334,14 @@
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Spotřebovaném množství
 apps/erpnext/erpnext/public/js/pos/pos.js +491,{0} View,{0} Zobrazit
 DocType: Salary Structure Deduction,Salary Structure Deduction,Plat Struktura Odpočet
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +158,Selective laser sintering,Selektivní laserové spékání
-apps/erpnext/erpnext/stock/doctype/item/item.py +301,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Měrná jednotka {0} byl zadán více než jednou v konverzním faktorem tabulce
+apps/erpnext/erpnext/stock/doctype/item/item.py +305,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Měrná jednotka {0} byl zadán více než jednou v konverzním faktorem tabulce
 apps/frappe/frappe/core/page/data_import_tool/data_import_tool.js +108,Import Successful!,Import byl úspěšný!
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Náklady na vydaných položek
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +185,Quantity must not be more than {0},Množství nesmí být větší než {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +41,Age (Days),Stáří (dny)
 DocType: Quotation Item,Quotation Item,Položka Nabídky
 DocType: Account,Account Name,Název účtu
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +41,From Date cannot be greater than To Date,Datum OD nemůže být vetší než datum DO
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +34,From Date cannot be greater than To Date,Datum OD nemůže být vetší než datum DO
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +194,Serial No {0} quantity {1} cannot be a fraction,Pořadové číslo {0} {1} množství nemůže být zlomek
 apps/erpnext/erpnext/config/buying.py +59,Supplier Type master.,Dodavatel Type master.
 DocType: Purchase Order Item,Supplier Part Number,Dodavatel Číslo dílu
@@ -1397,14 +1350,14 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +247,{0} {1} is cancelled or stopped,{0} {1} je zrušena nebo zastavena
 DocType: Accounts Settings,Credit Controller,Credit Controller
 DocType: Delivery Note,Vehicle Dispatch Date,Vozidlo Dispatch Datum
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +197,Purchase Receipt {0} is not submitted,Doklad o koupi {0} není předložena
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +198,Purchase Receipt {0} is not submitted,Doklad o koupi {0} není předložena
 DocType: Company,Default Payable Account,Výchozí Splatnost účtu
 apps/erpnext/erpnext/config/website.py +13,"Settings for online shopping cart such as shipping rules, price list etc.","Nastavení pro on-line nákupního košíku, jako jsou pravidla dopravu, ceník atd"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +660,Setup Complete,Setup Complete
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +124,Setup Complete,Setup Complete
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +65,{0}% Billed,{0}% účtovano
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +17,Reserved Qty,Reserved Množství
 DocType: Party Account,Party Account,Party účtu
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +74,Human Resources,Lidské zdroje
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +74,Human Resources,Lidské zdroje
 DocType: Lead,Upper Income,Horní příjmů
 DocType: Journal Entry Account,Debit in Company Currency,Debetní ve společnosti Měna
 apps/erpnext/erpnext/support/doctype/issue/issue.py +58,My Issues,Moje problémy
@@ -1413,11 +1366,9 @@
 DocType: Company,Default Values,Výchozí hodnoty
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +236,Row {0}: Payment amount can not be negative,Row {0}: Částka platby nemůže být záporný
 DocType: Expense Claim,Total Amount Reimbursed,Celkové částky proplacené
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +152,Press fitting,Tisková kování
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +64,Against Supplier Invoice {0} dated {1},Proti faktuře dodavatele {0} ze dne {1}
 DocType: Customer,Default Price List,Výchozí Ceník
 DocType: Payment Reconciliation,Payments,Platby
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +24,Hot isostatic pressing,Izostatické lisování
 DocType: ToDo,Medium,Střední
 DocType: Budget Detail,Budget Allocated,Přidělený Rozpočet
 DocType: Journal Entry,Entry Type,Entry Type
@@ -1430,9 +1381,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +56,None of the items have any change in quantity or value.,Žádný z těchto položek má žádnou změnu v množství nebo hodnotě.
 DocType: Warranty Claim,Warranty Claim,Záruční reklamace
 ,Lead Details,Detaily leadu
-DocType: Authorization Rule,Approving User,Schvalování Uživatel
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +37,Forging,Kování
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +126,Plating,Pokovování
 DocType: Purchase Invoice,End date of current invoice's period,Datum ukončení doby aktuální faktury je
 DocType: Pricing Rule,Applicable For,Použitelné pro
 DocType: Bank Reconciliation,From Date,Od data
@@ -1454,31 +1402,29 @@
 DocType: Sales Invoice,Paid Amount (Company Currency),Zaplacená částka (Company měny)
 DocType: Purchase Invoice,Additional Discount,Další slevy
 DocType: Selling Settings,Selling Settings,Prodejní Nastavení
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +39,Online Auctions,Aukce online
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,Aukce online
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +94,Please specify either Quantity or Valuation Rate or both,"Uveďte prosím buď Množství nebo ocenění Cena, nebo obojí"
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +50,"Company, Month and Fiscal Year is mandatory","Společnost, měsíc a fiskální rok je povinný"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Marketing Expenses,Marketingové náklady
 ,Item Shortage Report,Položka Nedostatek Report
-apps/erpnext/erpnext/stock/doctype/item/item.js +183,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Hmotnost je uvedeno, \n uveďte prosím ""váha UOM"" příliš"
+apps/erpnext/erpnext/stock/doctype/item/item.js +185,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Hmotnost je uvedeno, \n uveďte prosím ""váha UOM"" příliš"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,Materiál Žádost používá k výrobě této populace Entry
 apps/erpnext/erpnext/config/support.py +43,Single unit of an Item.,Single jednotka položky.
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +212,Time Log Batch {0} must be 'Submitted',"Time Log Batch {0} musí být ""Odesláno"""
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,Ujistěte se účetní položka pro každý pohyb zásob
 DocType: Leave Allocation,Total Leaves Allocated,Celkem Leaves Přidělené
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +384,Warehouse required at Row No {0},Warehouse vyžadováno při Row No {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +386,Warehouse required at Row No {0},Warehouse vyžadováno při Row No {0}
 DocType: Employee,Date Of Retirement,Datum odchodu do důchodu
 DocType: Upload Attendance,Get Template,Získat šablonu
 DocType: Address,Postal,Poštovní
 DocType: Item,Weightage,Weightage
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +159,Mining,Hornictví
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +17,Resin casting,Resin lití
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"Zákaznická Skupina existuje se stejným názvem, prosím změnit název zákazníka nebo přejmenujte skupinu zákazníků"
 apps/erpnext/erpnext/public/js/pos/pos.js +147,Please select {0} first.,"Prosím, vyberte {0} jako první."
 apps/erpnext/erpnext/templates/pages/order.html +57,text {0},Text {0}
 DocType: Territory,Parent Territory,Parent Territory
 DocType: Quality Inspection Reading,Reading 2,Čtení 2
 DocType: Stock Entry,Material Receipt,Příjem materiálu
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +622,Products,Výrobky
+apps/erpnext/erpnext/public/js/setup_wizard.js +358,Products,Výrobky
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +47,Party Type and Party is required for Receivable / Payable account {0},Zadejte Party Party a je nutné pro pohledávky / závazky na účtu {0}
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.","Pokud je tato položka má varianty, pak to nemůže být vybrána v prodejních objednávek atd"
 DocType: Lead,Next Contact By,Další Kontakt By
@@ -1488,13 +1434,13 @@
 DocType: Purchase Invoice,Notification Email Address,Oznámení e-mailová adresa
 DocType: Payment Tool,Find Invoices to Match,Najít faktury zápas
 ,Item-wise Sales Register,Item-moudrý Sales Register
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +399,"e.g. ""XYZ National Bank""","např ""XYZ Národní Banka"""
+apps/erpnext/erpnext/public/js/setup_wizard.js +147,"e.g. ""XYZ National Bank""","např ""XYZ Národní Banka"""
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,Je to poplatek v ceně základní sazbě?
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +57,Total Target,Celkem Target
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Target,Celkem Target
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.js +22,Shopping Cart is enabled,Nákupní košík je povoleno
 DocType: Job Applicant,Applicant for a Job,Žadatel o zaměstnání
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +173,No Production Orders created,Žádné výrobní zakázky vytvořené
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +131,Salary Slip of employee {0} already created for this month,Plat Slip of zaměstnance {0} již vytvořili pro tento měsíc
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +140,Salary Slip of employee {0} already created for this month,Plat Slip of zaměstnance {0} již vytvořili pro tento měsíc
 DocType: Stock Reconciliation,Reconciliation JSON,Odsouhlasení JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Příliš mnoho sloupců. Export zprávu a vytiskněte jej pomocí aplikace tabulky.
 DocType: Sales Invoice Item,Batch No,Č. šarže
@@ -1504,14 +1450,14 @@
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +13,Variant,Varianta
 apps/frappe/frappe/public/js/frappe/form/toolbar.js +165,New {0},Nový: {0}
 DocType: Naming Series,Set prefix for numbering series on your transactions,Nastavit prefix pro číslování série na vašich transakcí
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +169,Stopped order cannot be cancelled. Unstop to cancel.,Zastaveno příkaz nelze zrušit. Uvolnit zrušit.
-apps/erpnext/erpnext/stock/doctype/item/item.py +323,Default BOM ({0}) must be active for this item or its template,Výchozí BOM ({0}) musí být aktivní pro tuto položku nebo jeho šablony
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +164,Stopped order cannot be cancelled. Unstop to cancel.,Zastaveno příkaz nelze zrušit. Uvolnit zrušit.
+apps/erpnext/erpnext/stock/doctype/item/item.py +327,Default BOM ({0}) must be active for this item or its template,Výchozí BOM ({0}) musí být aktivní pro tuto položku nebo jeho šablony
 DocType: Employee,Leave Encashed?,Dovolená proplacena?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Opportunity Ze hřiště je povinné
 DocType: Item,Variants,Varianty
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +458,Make Purchase Order,Proveďte objednávky
 DocType: SMS Center,Send To,Odeslat
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +111,There is not enough leave balance for Leave Type {0},Není dost bilance dovolenou na vstup typ {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +127,There is not enough leave balance for Leave Type {0},Není dost bilance dovolenou na vstup typ {0}
 DocType: Sales Team,Contribution to Net Total,Příspěvek na celkových čistých
 DocType: Sales Invoice Item,Customer's Item Code,Zákazníka Kód položky
 DocType: Stock Reconciliation,Stock Reconciliation,Reklamní Odsouhlasení
@@ -1548,11 +1494,11 @@
 DocType: Sales Order Item,Actual Qty,Skutečné Množství
 DocType: Sales Invoice Item,References,Reference
 DocType: Quality Inspection Reading,Reading 10,Čtení 10
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +612,"List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start.","Seznam vaše produkty nebo služby, které jste koupit nebo prodat. Ujistěte se, že zkontrolovat položky Group, měrná jednotka a dalších vlastností při spuštění."
+apps/erpnext/erpnext/public/js/setup_wizard.js +348,"List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start.","Seznam vaše produkty nebo služby, které jste koupit nebo prodat. Ujistěte se, že zkontrolovat položky Group, měrná jednotka a dalších vlastností při spuštění."
 DocType: Hub Settings,Hub Node,Hub Node
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,"Zadali jste duplicitní položky. Prosím, opravu a zkuste to znovu."
 apps/erpnext/erpnext/controllers/item_variant.py +65,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values,Hodnota {0} pro atribut {1} neexistuje v seznamu platného bodu Hodnoty atributů
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +87,Associate,Spolupracovník
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Associate,Spolupracovník
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +46,Item {0} is not a serialized Item,Položka {0} není serializovat položky
 DocType: SMS Center,Create Receiver List,Vytvořit přijímače seznam
 apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +5,Expired,Vypršela
@@ -1561,7 +1507,7 @@
 DocType: Warranty Claim,Issue Date,Datum vydání
 DocType: Activity Cost,Activity Cost,Náklady Aktivita
 DocType: Purchase Receipt Item Supplied,Consumed Qty,Spotřeba Množství
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +52,Telecommunications,Telekomunikace
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +52,Telecommunications,Telekomunikace
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),"Označuje, že balíček je součástí této dodávky (Pouze návrhu)"
 DocType: Payment Tool,Make Payment Entry,Učinit vstup platby
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +119,Quantity for Item {0} must be less than {1},Množství k bodu {0} musí být menší než {1}
@@ -1578,10 +1524,8 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +37,"Selling must be checked, if Applicable For is selected as {0}","Prodej musí být zkontrolováno, v případě potřeby pro vybrán jako {0}"
 DocType: Purchase Order Item,Supplier Quotation Item,Dodavatel Nabídka Položka
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +27,Make Salary Structure,Proveďte platovou strukturu
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +54,Shearing,Stříhání
 DocType: Item,Has Variants,Má varianty
 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.,"Klikněte na tlačítko "", aby se prodej na faktuře"" vytvořit nový prodejní faktury."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +166,Packaging and labeling,Balení a označování
 DocType: Monthly Distribution,Name of the Monthly Distribution,Název měsíční výplatou
 DocType: Sales Person,Parent Sales Person,Parent obchodník
 apps/erpnext/erpnext/setup/utils.py +14,Please specify Default Currency in Company Master and Global Defaults,"Uveďte prosím výchozí měnu, ve společnosti Master and Global výchozí"
@@ -1592,19 +1536,18 @@
 DocType: Budget Detail,Fiscal Year,Fiskální rok
 DocType: Cost Center,Budget,Rozpočet
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +41,"Budget cannot be assigned against {0}, as it's not an Income or Expense account","Rozpočet nelze přiřadit proti {0}, protože to není výnos nebo náklad účet"
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Achieved,Dosažená
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,Dosažená
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +65,Territory / Customer,Territory / Customer
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,e.g. 5,např. 5
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +207,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},Row {0}: Přidělená částka {1} musí být menší než nebo se rovná fakturovat dlužné částky {2}
+apps/erpnext/erpnext/public/js/setup_wizard.js +294,e.g. 5,např. 5
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},Row {0}: Přidělená částka {1} musí být menší než nebo se rovná fakturovat dlužné částky {2}
 DocType: Sales Invoice,In Words will be visible once you save the Sales Invoice.,"Ve slovech budou viditelné, jakmile uložíte prodejní faktury."
 DocType: Item,Is Sales Item,Je Sales Item
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,Položka Group Tree
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,"Položka {0} není nastavení pro Serial č. Zkontrolujte, zda master položku"
 DocType: Maintenance Visit,Maintenance Time,Údržba Time
 ,Amount to Deliver,"Částka, která má dodávat"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +620,A Product or Service,Produkt nebo Služba
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +158,There were errors.,Byly tam chyby.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +101,Tapping,Výčepní
+apps/erpnext/erpnext/public/js/setup_wizard.js +356,A Product or Service,Produkt nebo Služba
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +146,There were errors.,Byly tam chyby.
 DocType: Naming Series,Current Value,Current Value
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +171,{0} created,{0} vytvořil
 DocType: Delivery Note Item,Against Sales Order,Proti přijaté objednávce
@@ -1619,7 +1562,7 @@
 apps/erpnext/erpnext/accounts/party.py +275,Due Date cannot be before Posting Date,Datum splatnosti nesmí být před odesláním Datum
 DocType: Website Item Group,Website Item Group,Website Item Group
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Duties and Taxes,Odvody a daně
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Please enter Reference date,"Prosím, zadejte Referenční den"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +312,Please enter Reference date,"Prosím, zadejte Referenční den"
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} platební položky mohou není možné filtrovat {1}
 DocType: Item Website Specification,Table for Item that will be shown in Web Site,"Tabulka k bodu, který se zobrazí na webových stránkách"
 DocType: Purchase Order Item Supplied,Supplied Qty,Dodávané Množství
@@ -1627,7 +1570,7 @@
 apps/erpnext/erpnext/config/stock.py +103,Tree of Item Groups.,Strom skupiny položek.
 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,Nelze odkazovat číslo řádku větší nebo rovnou aktuální číslo řádku pro tento typ Charge
 ,Item-wise Purchase History,Item-moudrý Historie nákupů
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +152,Red,Červená
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Red,Červená
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +228,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},"Prosím, klikněte na ""Generovat Schedule"", aby přinesla Pořadové číslo přidán k bodu {0}"
 DocType: Account,Frozen,Zmražený
 ,Open Production Orders,Otevřené výrobní zakázky
@@ -1642,7 +1585,7 @@
 DocType: Item Attribute,Attribute Name,Název atributu
 apps/erpnext/erpnext/controllers/selling_controller.py +236,Item {0} must be Sales or Service Item in {1},Položka {0} musí být prodej či servis položku v {1}
 DocType: Item Group,Show In Website,Show pro webové stránky
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +621,Group,Skupina
+apps/erpnext/erpnext/public/js/setup_wizard.js +357,Group,Skupina
 DocType: Task,Expected Time (in hours),Předpokládaná doba (v hodinách)
 ,Qty to Order,Množství k objednávce
 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","Chcete-li sledovat značku v následujících dokumentech dodacím listě Opportunity, materiál Request, položka, objednávce, kupní poukazu, nakupují stvrzenka, cenovou nabídku, prodejní faktury, Product Bundle, prodejní objednávky, pořadové číslo"
@@ -1652,6 +1595,7 @@
 DocType: Features Setup,Brands,Značky
 DocType: C-Form Invoice Detail,Invoice No,Faktura č
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +480,From Purchase Order,Z vydané objednávky
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +92,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Nechte nelze aplikovat / zrušena před {0}, protože rovnováha dovolené již bylo carry-předávány v budoucí přidělení dovolenou záznamu {1}"
 DocType: Activity Cost,Costing Rate,Kalkulace Rate
 ,Customer Addresses And Contacts,Adresy zákazníků a kontakty
 DocType: Employee,Resignation Letter Date,Rezignace Letter Datum
@@ -1659,35 +1603,31 @@
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +137,Not Set,Není nastaveno
 DocType: Communication,Date,Datum
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,Repeat Customer Příjmy
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +651,Sit tight while your system is being setup. This may take a few moments.,"Drž se, když váš systém je nastavení. To může trvat několik okamžiků."
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +115,Sit tight while your system is being setup. This may take a few moments.,"Drž se, když váš systém je nastavení. To může trvat několik okamžiků."
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +51,{0} ({1}) must have role 'Expense Approver',"{0} ({1}), musí mít roli ""Schvalovatel výdajů"""
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Pair,Pár
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Pair,Pár
 DocType: Bank Reconciliation Detail,Against Account,Proti účet
 DocType: Maintenance Schedule Detail,Actual Date,Skutečné datum
 DocType: Item,Has Batch No,Má číslo šarže
 DocType: Delivery Note,Excise Page Number,Spotřební Číslo stránky
 DocType: Employee,Personal Details,Osobní data
 ,Maintenance Schedules,Plány údržby
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +44,Embossing,Ražba
 ,Quotation Trends,Uvozovky Trendy
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +139,Item Group not mentioned in item master for item {0},Položka Group není uvedeno v položce mistra na položku {0}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +302,Debit To account must be a Receivable account,"Debetní Chcete-li v úvahu, musí být pohledávka účet"
-apps/erpnext/erpnext/stock/doctype/item/item.py +310,"As Production Order can be made for this item, it must be a stock item.","Jako výrobní objednávce lze provést za tuto položku, musí být skladem."
 DocType: Shipping Rule Condition,Shipping Amount,Přepravní Částka
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +140,Joining,Spojování
-DocType: Authorization Rule,Above Value,Výše uvedená hodnota
 ,Pending Amount,Čeká Částka
 DocType: Purchase Invoice Item,Conversion Factor,Konverzní faktor
 DocType: Purchase Order,Delivered,Dodává
 apps/erpnext/erpnext/config/hr.py +160,Setup incoming server for jobs email id. (e.g. jobs@example.com),Nastavení příchozí server pro úlohy e-mailovou id. (Např jobs@example.com)
 DocType: Purchase Receipt,Vehicle Number,Číslo vozidla
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,"Datum, kdy opakující se faktura bude zastaví"
+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,Celkové přidělené listy {0} nemůže být nižší než již schválených listy {1} pro období
 DocType: Journal Entry,Accounts Receivable,Pohledávky
 ,Supplier-Wise Sales Analytics,Dodavatel-Wise Prodej Analytics
 DocType: Address Template,This format is used if country specific format is not found,"Tento formát se používá, když specifický formát země není nalezen"
 DocType: Custom Field,Custom,Zvyk
 DocType: Production Order,Use Multi-Level BOM,Použijte Multi-Level BOM
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +26,Injection molding,Vstřikování
 DocType: Bank Reconciliation,Include Reconciled Entries,Zahrnout odsouhlasené zápisy
 apps/erpnext/erpnext/config/accounts.py +41,Tree of finanial accounts.,Strom finanial účtů.
 DocType: Leave Control Panel,Leave blank if considered for all employee types,"Ponechte prázdné, pokud se to považuje za ubytování ve všech typech zaměstnanců"
@@ -1697,30 +1637,28 @@
 apps/frappe/frappe/config/setup.py +130,Printing,Tisk
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +114,Expense Claim is pending approval. Only the Expense Approver can update status.,Úhrada výdajů čeká na schválení. Pouze schalovatel výdajů může aktualizovat stav.
 DocType: Purchase Invoice,Additional Discount Amount,Dodatečná sleva Částka
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +99,The day(s) on which you are applying for leave are holiday. You need not apply for leave.,"Den (y), na které žádáte o dovolené jsou dovolenou. Potřebujete nevztahuje na dovolenou."
 apps/frappe/frappe/public/js/frappe/misc/utils.js +110,and,a
 DocType: Leave Block List Allow,Leave Block List Allow,Nechte Block List Povolit
 apps/erpnext/erpnext/setup/doctype/company/company.py +236,Abbr can not be blank or space,Zkrácená nemůže být prázdné nebo prostor
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +50,Sports,Sportovní
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,Sportovní
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Actual,Celkem Aktuální
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Unit,Jednotka
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Unit,Jednotka
 apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.py +182,Please set Dropbox access keys in your site config,"Prosím, nastavení přístupových klíčů Dropbox ve vašem webu config"
 apps/erpnext/erpnext/stock/get_item_details.py +113,Please specify Company,"Uveďte prosím, firmu"
 ,Customer Acquisition and Loyalty,Zákazník Akvizice a loajality
 DocType: Purchase Receipt,Warehouse where you are maintaining stock of rejected items,"Sklad, kde se udržují zásoby odmítnutých položek"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +408,Your financial year ends on,Váš finanční rok končí
+apps/erpnext/erpnext/public/js/setup_wizard.js +156,Your financial year ends on,Váš finanční rok končí
 DocType: POS Profile,Price List,Ceník
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +20,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0} je nyní výchozí fiskální rok. Prosím aktualizujte svůj prohlížeč aby se změny projevily.
 apps/erpnext/erpnext/projects/doctype/project/project.js +47,Expense Claims,Nákladové Pohledávky
 DocType: Issue,Support,Podpora
-DocType: Authorization Rule,Approving Role,Schvalování roli
 ,BOM Search,BOM Search
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +176,Closing (Opening + Totals),Uzavření (Otevření + součty)
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +26,Please specify currency in Company,"Uveďte prosím měnu, ve společnosti"
 DocType: Workstation,Wages per hour,Mzda za hodinu
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},Sklad bilance v dávce {0} se zhorší {1} k bodu {2} ve skladu {3}
 apps/erpnext/erpnext/config/setup.py +83,"Show / Hide features like Serial Nos, POS etc.","Zobrazit / skrýt funkce, jako pořadová čísla, POS atd"
-apps/erpnext/erpnext/controllers/accounts_controller.py +236,Account {0} is invalid. Account Currency must be {1},Účet {0} je neplatná. Měna účtu musí být {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +237,Account {0} is invalid. Account Currency must be {1},Účet {0} je neplatná. Měna účtu musí být {1}
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +34,UOM Conversion factor is required in row {0},UOM Konverzní faktor je nutné v řadě {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +53,Clearance date cannot be before check date in row {0},Datum vůle nemůže být před přihlášením dnem v řadě {0}
 DocType: Salary Slip,Deduction,Dedukce
@@ -1739,13 +1677,13 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +82,Item {0} has already been returned,Bod {0} již byla vrácena
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** Fiskální rok ** představuje finanční rok. Veškeré účetní záznamy a další významné transakce jsou sledovány proti ** fiskální rok **.
 DocType: Opportunity,Customer / Lead Address,Zákazník / Lead Address
+apps/erpnext/erpnext/stock/doctype/item/item.py +112,Warning: Invalid SSL certificate on attachment {0},Varování: Neplatný certifikát SSL na přílohu {0}
 DocType: Production Order Operation,Actual Operation Time,Aktuální Provozní doba
 DocType: Authorization Rule,Applicable To (User),Vztahující se na (Uživatel)
 DocType: Purchase Taxes and Charges,Deduct,Odečíst
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +170,Job Description,Popis Práce
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +170,Job Description,Popis Práce
 DocType: Purchase Order Item,Qty as per Stock UOM,Množství podle Stock nerozpuštěných
 apps/frappe/frappe/model/rename_doc.py +343,Please select a valid csv file with data,Vyberte prosím platný CSV soubor s daty
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +92,Coating,Nátěr
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +126,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Speciální znaky kromě ""-"". """", ""#"", a ""/"" není povoleno v pojmenování řady"
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Mějte přehled o prodejních kampaní. Mějte přehled o Leads, citace, prodejní objednávky atd z kampaně, aby zjistily, návratnost investic. "
 DocType: Expense Claim,Approver,Schvalovatel
@@ -1755,12 +1693,11 @@
 DocType: Supplier Quotation,Manufacturing Manager,Výrobní ředitel
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},Pořadové číslo {0} je v záruce aľ {1}
 apps/erpnext/erpnext/config/stock.py +69,Split Delivery Note into packages.,Rozdělit dodací list do balíčků.
-apps/erpnext/erpnext/hooks.py +84,Shipments,Zásilky
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +29,Dip molding,Dip lití
+apps/erpnext/erpnext/hooks.py +68,Shipments,Zásilky
 DocType: Purchase Order,To be delivered to customer,Chcete-li být doručeno zákazníkovi
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,Time Log Status musí být předloženy.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,"Pořadové číslo {0} nepatří do skladu,"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +650,Setting Up,Nastavení
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +114,Setting Up,Nastavení
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,Row # ,Řádek č.
 DocType: Purchase Invoice,In Words (Company Currency),Slovy (měna společnosti)
 DocType: Pricing Rule,Supplier,Dodavatel
@@ -1768,7 +1705,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +105,Miscellaneous Expenses,Různé výdaje
 DocType: Global Defaults,Default Company,Výchozí Company
 apps/erpnext/erpnext/controllers/stock_controller.py +166,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,Náklady nebo Rozdíl účet je povinné k bodu {0} jako budou mít dopad na celkovou hodnotu zásob
-apps/erpnext/erpnext/controllers/accounts_controller.py +354,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","Nelze overbill k bodu {0} v řadě {1} více než {2}. Chcete-li povolit nadfakturace, prosím nastavte na skladě Nastavení"
+apps/erpnext/erpnext/controllers/accounts_controller.py +355,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","Nelze overbill k bodu {0} v řadě {1} více než {2}. Chcete-li povolit nadfakturace, prosím nastavte na skladě Nastavení"
 DocType: Employee,Bank Name,Název banky
 apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +27,-Above,-Nad
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +135,User {0} is disabled,Uživatel {0} je zakázána
@@ -1781,27 +1718,26 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,{0} is mandatory for Item {1},{0} je povinná k položce {1}
 DocType: Currency Exchange,From Currency,Od Měny
 DocType: DocField,Name,Jméno
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +211,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Prosím, vyberte alokovaná částka, typ faktury a číslo faktury v aspoň jedné řadě"
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +104,Sales Order required for Item {0},Prodejní objednávky potřebný k bodu {0}
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +158,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Prosím, vyberte alokovaná částka, typ faktury a číslo faktury v aspoň jedné řadě"
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +107,Sales Order required for Item {0},Prodejní objednávky potřebný k bodu {0}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +43,Amounts not reflected in system,Částky nejsou zohledněny v systému
 DocType: Purchase Invoice Item,Rate (Company Currency),Cena (Měna Společnosti)
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +40,Others,Ostatní
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +40,Others,Ostatní
 apps/erpnext/erpnext/templates/includes/product_page.js +80,Cannot find a matching Item. Please select some other value for {0}.,Nelze najít odpovídající položku. Vyberte nějakou jinou hodnotu pro {0}.
 DocType: POS Profile,Taxes and Charges,Daně a poplatky
 DocType: Item,"A Product or a Service that is bought, sold or kept in stock.","Produkt nebo služba, která se Nakupuje, Prodává nebo Skladuje."
 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,"Nelze vybrat druh náboje jako ""On předchozí řady Částka"" nebo ""On předchozí řady Celkem"" pro první řadu"
 apps/frappe/frappe/core/doctype/doctype/boilerplate/controller_list.html +31,Completed,Dokončeno
 DocType: Web Form,Select DocType,Zvolte DocType
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +104,Broaching,Protahování
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +12,Banking,Bankovnictví
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,Bankovnictví
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +38,Please click on 'Generate Schedule' to get schedule,"Prosím, klikněte na ""Generovat Schedule"", aby se plán"
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +283,New Cost Center,Nové Nákladové Středisko
 DocType: Bin,Ordered Quantity,Objednané množství
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +397,"e.g. ""Build tools for builders""","např ""Stavět nástroje pro stavitele """
+apps/erpnext/erpnext/public/js/setup_wizard.js +145,"e.g. ""Build tools for builders""","např ""Stavět nástroje pro stavitele """
 DocType: Quality Inspection,In Process,V procesu
 DocType: Authorization Rule,Itemwise Discount,Itemwise Sleva
 DocType: Purchase Order Item,Reference Document Type,Referenční Typ dokumentu
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +318,{0} against Sales Order {1},{0} proti Prodejní objednávce {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +320,{0} against Sales Order {1},{0} proti Prodejní objednávce {1}
 DocType: Account,Fixed Asset,Základní Jmění
 apps/erpnext/erpnext/config/stock.py +283,Serialized Inventory,Serialized Zásoby
 DocType: Activity Type,Default Billing Rate,Výchozí fakturace Rate
@@ -1816,14 +1752,13 @@
 DocType: Purchase Invoice Item,Page Break,Zalomení stránky
 DocType: Production Order Operation,Pending,Až do
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,"Uživatelé, kteří si vyhoví žádosti konkrétního zaměstnance volno"
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +33,You cannot change default UOM of Variant. To change default UOM for Variant change default UOM of the Template,Nemůžete změnit výchozí UOM variantních. Chcete-li změnit výchozí UOM pro Variant změna výchozí nerozpuštěných šablony
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +50,Office Equipments,Kancelářské Vybavení
 DocType: Purchase Invoice Item,Qty,Množství
 DocType: Fiscal Year,Companies,Společnosti
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +24,Electronics,Elektronika
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +24,Electronics,Elektronika
 DocType: Stock Settings,Raise Material Request when stock reaches re-order level,Zvýšit Materiál vyžádání při stock dosáhne úrovně re-order
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +18,From Maintenance Schedule,Z plánu údržby
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +56,Full-time,Na plný úvazek
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +56,Full-time,Na plný úvazek
 DocType: Purchase Invoice,Contact Details,Kontaktní údaje
 DocType: C-Form,Received Date,Datum přijetí
 DocType: Delivery Note,"If you have created a standard template in Sales Taxes and Charges Template, select one and click on the button below.","Pokud jste vytvořili standardní šablonu v prodeji daní a poplatků šablony, vyberte jednu a klikněte na tlačítko níže."
@@ -1835,11 +1770,12 @@
 DocType: Job Applicant,Job Opening,Job Zahájení
 DocType: Payment Reconciliation,Payment Reconciliation,Platba Odsouhlasení
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +154,Please select Incharge Person's name,"Prosím, vyberte incharge jméno osoby"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +51,Technology,Technologie
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,Technologie
 DocType: Offer Letter,Offer Letter,Nabídka Letter
 apps/erpnext/erpnext/config/manufacturing.py +51,Generate Material Requests (MRP) and Production Orders.,Generování materiálu Požadavky (MRP) a výrobní zakázky.
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +68,Total Invoiced Amt,Celkové fakturované Amt
 DocType: Time Log,To Time,Chcete-li čas
+DocType: Authorization Rule,Approving Role (above authorized value),Schválení role (nad oprávněné hodnoty)
 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.","Chcete-li přidat podřízené uzly, prozkoumat stromu a klepněte na položku, pod kterou chcete přidat více uzlů."
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +102,Credit To account must be a Payable account,Připsat na účet musí být Splatnost účet
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +233,BOM recursion: {0} cannot be parent or child of {2},BOM rekurze: {0} nemůže být rodič nebo dítě {2}
@@ -1852,10 +1788,8 @@
 DocType: Item,Customer Item Codes,Zákazník Položka Kódy
 DocType: Opportunity,Lost Reason,Důvod ztráty
 apps/erpnext/erpnext/config/accounts.py +68,Create Payment Entries against Orders or Invoices.,Vytvořte Platební záznamy proti objednávky nebo faktury.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +141,Welding,Svařování
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +40,New Stock UOM is required,Je zapotřebí nové Reklamní UOM
 DocType: Quality Inspection,Sample Size,Velikost vzorku
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +443,All items have already been invoiced,Všechny položky již byly fakturovány
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +446,All items have already been invoiced,Všechny položky již byly fakturovány
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',"Uveďte prosím platný ""Od věci č '"
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +287,Further cost centers can be made under Groups but entries can be made against non-Groups,"Další nákladová střediska mohou být vyrobeny v rámci skupiny, ale položky mohou být provedeny proti non-skupin"
 DocType: Project,External,Externí
@@ -1867,8 +1801,7 @@
 DocType: Bin,Actual Quantity,Skutečné Množství
 DocType: Shipping Rule,example: Next Day Shipping,Příklad: Next Day Shipping
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,Pořadové číslo {0} nebyl nalezen
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +563,Your Customers,Vaši Zákazníci
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +27,Compression molding,Lisování
+apps/erpnext/erpnext/public/js/setup_wizard.js +303,Your Customers,Vaši Zákazníci
 DocType: Leave Block List Date,Block Date,Block Datum
 DocType: Sales Order,Not Delivered,Ne vyhlášeno
 ,Bank Clearance Summary,Souhrn bankovního zúčtování
@@ -1889,10 +1822,10 @@
 DocType: SMS Log,Sent To,Odeslána
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +28,Make Sales Invoice,Proveďte prodejní faktuře
 DocType: Company,For Reference Only.,Pouze orientační.
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +29,Invalid {0}: {1},Neplatný {0}: {1}
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +49,Invalid {0}: {1},Neplatný {0}: {1}
 DocType: Sales Invoice Advance,Advance Amount,Záloha ve výši
 DocType: Manufacturing Settings,Capacity Planning,Plánování kapacit
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +49,'From Date' is required,"""Datum od"" je povinné"
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +43,'From Date' is required,"""Datum od"" je povinné"
 DocType: Journal Entry,Reference Number,Referenční číslo
 DocType: Employee,Employment Details,Informace o zaměstnání
 DocType: Employee,New Workplace,Nové pracoviště
@@ -1907,7 +1840,7 @@
 DocType: Serial No,Delivery Time,Dodací lhůta
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Stárnutí dle
 DocType: Item,End of Life,Konec životnosti
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +41,Travel,Cestování
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +41,Travel,Cestování
 DocType: Leave Block List,Allow Users,Povolit uživatele
 DocType: Purchase Order,Customer Mobile No,Zákazník Mobile Žádné
 DocType: Sales Invoice,Recurring,Opakující se
@@ -1921,7 +1854,7 @@
 DocType: Naming Series,User must always select,Uživatel musí vždy vybrat
 DocType: Stock Settings,Allow Negative Stock,Povolit Negativní Sklad
 DocType: Installation Note,Installation Note,Poznámka k instalaci
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +541,Add Taxes,Přidejte daně
+apps/erpnext/erpnext/public/js/setup_wizard.js +283,Add Taxes,Přidejte daně
 ,Financial Analytics,Finanční Analýza
 DocType: Quality Inspection,Verified By,Verified By
 DocType: Address,Subsidiary,Dceřiný
@@ -1931,7 +1864,6 @@
 DocType: System Settings,In Hours,V hodinách
 DocType: Process Payroll,Create Salary Slip,Vytvořit výplatní pásce
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Expected balance as per bank,Očekávaný zůstatek podle banky
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +115,Buffing,Leštění
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Source of Funds (Liabilities),Zdrojem finančních prostředků (závazků)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +347,Quantity in row {0} ({1}) must be same as manufactured quantity {2},"Množství v řadě {0} ({1}), musí být stejné jako množství vyrobené {2}"
 DocType: Appraisal,Employee,Zaměstnanec
@@ -1948,11 +1880,11 @@
 DocType: Rename Tool,File to Rename,Soubor přejmenovat
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +176,Purchse Order number required for Item {0},Purchse Objednací číslo potřebný k bodu {0}
 apps/erpnext/erpnext/public/js/controllers/transaction.js +136,Show Payments,Zobrazit Platby
-apps/erpnext/erpnext/controllers/buying_controller.py +245,Specified BOM {0} does not exist for Item {1},Stanovená BOM {0} neexistuje k bodu {1}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +202,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Plán údržby {0} musí být zrušena před zrušením této prodejní objednávky
+apps/erpnext/erpnext/controllers/buying_controller.py +236,Specified BOM {0} does not exist for Item {1},Stanovená BOM {0} neexistuje k bodu {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Plán údržby {0} musí být zrušena před zrušením této prodejní objednávky
 apps/frappe/frappe/desk/page/backups/backups.html +13,Size,Velikost
 DocType: Notification Control,Expense Claim Approved,Uhrazení výdajů schváleno
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +113,Pharmaceutical,Farmaceutické
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Pharmaceutical,Farmaceutické
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,Náklady na zakoupené zboží
 DocType: Selling Settings,Sales Order Required,Prodejní objednávky Povinné
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +30,Create Customer,Vytvořit zákazníka
@@ -1962,7 +1894,6 @@
 DocType: Quality Inspection Reading,Reading 9,Čtení 9
 DocType: Supplier,Is Frozen,Je Frozen
 DocType: Buying Settings,Buying Settings,Nákup Nastavení
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +122,Mass finishing,Mass dokončovací
 DocType: Stock Entry Detail,BOM No. for a Finished Good Item,BOM Ne pro hotový dobré položce
 DocType: Upload Attendance,Attendance To Date,Účast na data
 apps/erpnext/erpnext/config/selling.py +158,Setup incoming server for sales email id. (e.g. sales@example.com),Nastavení příchozí server pro prodej e-mailovou id. (Např sales@example.com)
@@ -1970,7 +1901,7 @@
 DocType: Payment Tool,Payment Account,Platební účet
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +713,Please specify Company to proceed,Uveďte prosím společnost pokračovat
 apps/frappe/frappe/public/js/frappe/model/indicator.js +30,Draft,Návrh
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +46,Compensatory Off,Vyrovnávací Off
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Compensatory Off,Vyrovnávací Off
 DocType: Quality Inspection Reading,Accepted,Přijato
 DocType: User,Female,Žena
 DocType: Journal Entry Account,Debit in Account Currency,Debetní v měně účtu
@@ -1982,7 +1913,7 @@
 DocType: Shipping Rule,Shipping Rule Label,Přepravní Pravidlo Label
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +209,Raw Materials cannot be blank.,Suroviny nemůže být prázdný.
 DocType: Newsletter,Test,Test
-apps/erpnext/erpnext/stock/doctype/item/item.py +364,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +368,"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'","Jak tam jsou stávající skladové transakce pro tuto položku, \ nemůžete změnit hodnoty &quot;Má sériové číslo&quot;, &quot;má Batch Ne&quot;, &quot;Je skladem&quot; a &quot;ocenění Method&quot;"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +448,Quick Journal Entry,Rychlý vstup Journal
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +92,You can not change rate if BOM mentioned agianst any item,"Nemůžete změnit sazbu, kdyby BOM zmínil agianst libovolné položky"
@@ -1993,13 +1924,14 @@
 apps/erpnext/erpnext/config/stock.py +18,Requests for items.,Žádosti o položky.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,Samostatná výroba objednávka bude vytvořena pro každého hotového dobrou položku.
 DocType: Purchase Invoice,Terms and Conditions1,Podmínky a podmínek1
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +18,Complete Setup,Kompletní nastavení
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard_page.html +18,Complete Setup,Kompletní nastavení
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","Účetní záznam zmrazeny až do tohoto data, nikdo nemůže dělat / upravit položku kromě role uvedeno níže."
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +121,Please save the document before generating maintenance schedule,"Prosím, uložit dokument před generováním plán údržby"
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,Stav projektu
 DocType: UOM,Check this to disallow fractions. (for Nos),"Zkontrolujte, zda to zakázat frakce. (U č)"
 apps/erpnext/erpnext/config/crm.py +96,Newsletter Mailing List,Newsletter adresář
 DocType: Delivery Note,Transporter Name,Přepravce Název
+DocType: Authorization Rule,Authorized Value,Autorizovaný Hodnota
 DocType: Contact,Enter department to which this Contact belongs,"Zadejte útvar, který tento kontaktní patří"
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Absent,Celkem Absent
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +746,Item or Warehouse for row {0} does not match Material Request,Položka nebo Warehouse na řádku {0} neodpovídá Materiál Poptávka
@@ -2024,16 +1956,15 @@
 DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),Základní sazba (dle Stock nerozpuštěných)
 DocType: SMS Log,No of Requested SMS,Počet žádaným SMS
 DocType: Campaign,Campaign-.####,Kampaň-.####
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +55,Piercing,Pronikavý
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,Další kroky
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +117,Contract End Date must be greater than Date of Joining,Smlouva Datum ukončení musí být větší než Datum spojování
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,"Distributor / dealer / jednatel / partner / prodejce, který prodává produkty společnosti za provizi."
 DocType: Customer Group,Has Child Node,Má děti Node
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{0} against Purchase Order {1},{0} proti nákupní objednávce {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +332,{0} against Purchase Order {1},{0} proti nákupní objednávce {1}
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","Zadejte statické parametry url zde (Např odesílatel = ERPNext, username = ERPNext, password. = 1234 atd.),"
 apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,{0} {1} není v žádném aktivním fiskálním roce. Pro více informací zkontrolujte {2}.
-apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,To je příklad webové stránky automaticky generované z ERPNext
+apps/erpnext/erpnext/setup/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,To je příklad webové stránky automaticky generované z ERPNext
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +37,Ageing Range 1,Stárnutí Rozsah 1
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +110,Photochemical machining,Fotochemický obrábění
 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.
 
 #### Note
@@ -2079,7 +2010,7 @@
 DocType: Purchase Receipt Item,Recd Quantity,Recd Množství
 DocType: Email Account,Email Ids,Email IDS
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},Nelze produkují více položku {0} než prodejní objednávky množství {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +471,Stock Entry {0} is not submitted,Sklad Entry {0} není předložena
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +473,Stock Entry {0} is not submitted,Sklad Entry {0} není předložena
 DocType: Payment Reconciliation,Bank / Cash Account,Bank / Peněžní účet
 DocType: Tax Rule,Billing City,Fakturace City
 DocType: Global Defaults,Hide Currency Symbol,Skrýt symbol měny
@@ -2095,7 +2026,7 @@
 DocType: Purchase Invoice,Currency and Price List,Měna a ceník
 DocType: Opportunity,Customer / Lead Name,Zákazník / Lead Name
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +63,Clearance Date not mentioned,Výprodej Datum není uvedeno
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +71,Production,Výroba
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Production,Výroba
 DocType: Item,Allow Production Order,Povolit výrobní objednávky
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +60,Row {0}:Start Date must be before End Date,"Row {0}: datum zahájení, musí být před koncem roku Datum"
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Total (ks)
@@ -2108,7 +2039,7 @@
 apps/erpnext/erpnext/utilities/doctype/address/address.py +113,My Addresses,Moje Adresy
 DocType: Stock Ledger Entry,Outgoing Rate,Odchozí Rate
 apps/erpnext/erpnext/config/hr.py +100,Organization branch master.,Organizace větev master.
-apps/erpnext/erpnext/controllers/accounts_controller.py +237, or ,nebo
+apps/erpnext/erpnext/controllers/accounts_controller.py +238, or ,nebo
 DocType: Sales Order,Billing Status,Status Fakturace
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Utility Expenses,Utility Náklady
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,90-Above,90 Nad
@@ -2135,6 +2066,7 @@
 DocType: Stock Entry Detail,Serial No / Batch,Výrobní číslo / Batch
 DocType: Product Bundle,Parent Item,Nadřazená položka
 DocType: Account,Account Type,Typ účtu
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +113,Leave Type {0} cannot be carry-forwarded,Nechte typ {0} nelze provádět předávány
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +213,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',"Plán údržby není generován pro všechny položky. Prosím, klikněte na ""Generovat Schedule"""
 ,To Produce,K výrobě
 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","Pro řádek {0} v {1}. Chcete-li v rychlosti položku jsou {2}, řádky {3} musí být také zahrnuty"
@@ -2142,10 +2074,7 @@
 DocType: Bin,Reserved Quantity,Vyhrazeno Množství
 DocType: Landed Cost Voucher,Purchase Receipt Items,Položky příjemky
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,Přizpůsobení Formuláře
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +62,Cutting,Výstřižek
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +69,Flattening,Zploštění
 DocType: Account,Income Account,Účet příjmů
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +22,Molding,Lití
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +632,Delivery,Dodávka
 DocType: Stock Reconciliation Item,Current Qty,Aktuální Množství
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section","Viz ""Hodnotit materiálů na bázi"" v kapitole Costing"
@@ -2155,20 +2084,19 @@
 apps/frappe/frappe/desk/moduleview.py +61,Documents,Dokumenty
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +17,Ref,Ref
 DocType: Cost Center,Cost Center,Nákladové středisko
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.js +48,Voucher #,Voucher #
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +36,Voucher #,Voucher #
 DocType: Notification Control,Purchase Order Message,Zprávy vydané objenávky
 DocType: Tax Rule,Shipping Country,Přepravní Země
 DocType: Upload Attendance,Upload HTML,Nahrát HTML
-apps/erpnext/erpnext/controllers/accounts_controller.py +391,"Total advance ({0}) against Order {1} cannot be greater \
+apps/erpnext/erpnext/controllers/accounts_controller.py +392,"Total advance ({0}) against Order {1} cannot be greater \
 				than the Grand Total ({2})","Celkem předem ({0}) na objednávku {1} nemůže být větší než \
  celkovém součtu ({2})"
 DocType: Employee,Relieving Date,Uvolnění Datum
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +12,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.","Ceny Pravidlo je vyrobena přepsat Ceník / definovat slevy procenta, na základě určitých kritérií."
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,Sklad je možné provést pouze prostřednictvím Burzy Entry / dodací list / doklad o zakoupení
 DocType: Employee Education,Class / Percentage,Třída / Procento
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +92,Head of Marketing and Sales,Vedoucí marketingu a prodeje
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +31,Income Tax,Daň z příjmů
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +157,Laser engineered net shaping,Laser technicky čisté tvarování
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Head of Marketing and Sales,Vedoucí marketingu a prodeje
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +31,Income Tax,Daň z příjmů
 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.","Je-li zvolena Ceny pravidlo je určen pro ""Cena"", přepíše ceníku. Ceny Pravidlo cena je konečná cena, a proto by měla být použita žádná další sleva. Proto, v transakcích, jako odběratele, objednávky atd, bude stažen v oboru ""sazbou"", spíše než poli ""Ceník sazby""."
 apps/erpnext/erpnext/config/selling.py +163,Track Leads by Industry Type.,Trasa vede od průmyslu typu.
 DocType: Item Supplier,Item Supplier,Položka Dodavatel
@@ -2191,31 +2119,28 @@
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Skutečné Množství Po transakci
 ,Pending SO Items For Purchase Request,"Do doby, než SO položky k nákupu Poptávka"
 DocType: Supplier,Billing Currency,Fakturace Měna
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +148,Extra Large,Extra Velké
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,Extra Large,Extra Velké
 ,Profit and Loss Statement,Výkaz zisků a ztrát
 DocType: Bank Reconciliation Detail,Cheque Number,Šek číslo
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +43,Pressing,Stisknutí
 DocType: Payment Tool Detail,Payment Tool Detail,Detail platební nástroj
 ,Sales Browser,Sales Browser
 DocType: Journal Entry,Total Credit,Celkový Credit
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +474,Warning: Another {0} # {1} exists against stock entry {2},Upozornění: dalším {0} č. {1} existuje proti pohybu skladu {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +459,Local,Místní
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +476,Warning: Another {0} # {1} exists against stock entry {2},Upozornění: dalším {0} č. {1} existuje proti pohybu skladu {2}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +397,Local,Místní
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),Úvěry a zálohy (aktiva)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,Dlužníci
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +147,Large,Velký
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +23,No employee found!,Žádný zaměstnanec našel!
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Large,Velký
 DocType: C-Form Invoice Detail,Territory,Území
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,"Prosím, uveďte počet požadovaných návštěv"
 DocType: Purchase Order,Customer Address Display,Customer Address Display
 DocType: Stock Settings,Default Valuation Method,Výchozí metoda ocenění
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +127,Polishing,Leštění
 DocType: Production Order Operation,Planned Start Time,Plánované Start Time
 apps/erpnext/erpnext/config/accounts.py +63,Close Balance Sheet and book Profit or Loss.,Zavřete Rozvahu a zapiš účetní zisk nebo ztrátu.
-apps/erpnext/erpnext/stock/doctype/item/item.py +661,"Default Unit of Measure for Item {0} cannot be changed directly because \
+apps/erpnext/erpnext/stock/doctype/item/item.py +665,"Default Unit of Measure for Item {0} cannot be changed directly because \
 			you have already made some transaction(s) with another UOM. To change default UOM, \
 			use 'UOM Replace Utility' tool under Stock module.","Výchozí měrná jednotka bodu {0} nemůže být změněna přímo, protože \ jste již nějaké transakce (y) s jiným nerozpuštěných. Chcete-li změnit výchozí UOM, \ používání &quot;UOM Nahraďte Utility&quot; nástroj pod Stock modulu."
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,Zadejte Exchange Rate převést jednu měnu na jinou
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +146,Quotation {0} is cancelled,Nabídka {0} je zrušena
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +141,Quotation {0} is cancelled,Nabídka {0} je zrušena
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,Celková dlužná částka
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} was on leave on {1}. Cannot mark attendance.,Zaměstnanec {0} byl na dovolené na {1}. Nelze označit účast.
 DocType: Sales Partner,Targets,Cíle
@@ -2226,7 +2151,6 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +158,Please create Customer from Lead {0},Prosím vytvořte Zákazník z olova {0}
 DocType: Price List,Applicable for Countries,Pro země
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Computers,Počítače
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +112,Electro-chemical grinding,Electro-chemické broušení
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +14,This is a root customer group and cannot be edited.,"To je kořen skupiny zákazníků, a nelze upravovat."
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +39,Please setup your chart of accounts before you start Accounting Entries,"Prosím, nastavit svůj účtový rozvrh, než začnete účetních zápisů"
 DocType: Purchase Invoice,Ignore Pricing Rule,Ignorovat Ceny pravidlo
@@ -2284,7 +2208,6 @@
 DocType: Maintenance Visit,Purposes,Cíle
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +103,Atleast one item should be entered with negative quantity in return document,Aspoň jedna položka by měla být zadána s negativním množství ve vratném dokumentu
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +67,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","Provoz {0} déle, než všech dostupných pracovních hodin v pracovní stanici {1}, rozložit provoz do několika operací"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +134,Electrochemical machining,Elektrochemické obrábění
 ,Requested,Požadované
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +66,No Remarks,Žádné poznámky
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +13,Overdue,Zpožděný
@@ -2293,7 +2216,7 @@
 DocType: Monthly Distribution,Distribution Name,Distribuce Name
 DocType: Features Setup,Sales and Purchase,Prodej a nákup
 DocType: Supplier Quotation Item,Material Request No,Materiál Poptávka No
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +218,Quality Inspection required for Item {0},Kontrola kvality potřebný k bodu {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +221,Quality Inspection required for Item {0},Kontrola kvality potřebný k bodu {0}
 DocType: Quotation,Rate at which customer's currency is converted to company's base currency,"Sazba, za kterou je měna zákazníka převedena na základní měnu společnosti"
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +107,{0} has been successfully unsubscribed from this list.,{0} byl úspěšně odhlášen z tohoto seznamu.
 DocType: Purchase Invoice Item,Net Rate (Company Currency),Čistý Rate (Company měny)
@@ -2311,9 +2234,8 @@
 apps/erpnext/erpnext/accounts/report/financial_statements.py +16,Fiscal Year {0} not found.,Fiskální rok {0} nebyl nalezen.
 DocType: Bank Reconciliation,Get Relevant Entries,Získat příslušné zápisy
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +407,Accounting Entry for Stock,Účetní položka na skladě
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +64,Coining,Ražení
 DocType: Sales Invoice,Sales Team1,Sales Team1
-apps/erpnext/erpnext/stock/doctype/item/item.py +412,Item {0} does not exist,Bod {0} neexistuje
+apps/erpnext/erpnext/stock/doctype/item/item.py +416,Item {0} does not exist,Bod {0} neexistuje
 DocType: Sales Invoice,Customer Address,Zákazník Address
 apps/frappe/frappe/desk/query_report.py +136,Total,Celkem
 DocType: Purchase Invoice,Apply Additional Discount On,Použít dodatečné Sleva na
@@ -2325,14 +2247,13 @@
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),Částka daně po slevě Částka (Company měny)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +149,Target warehouse is mandatory for row {0},Target sklad je povinná pro řadu {0}
 DocType: Quality Inspection,Quality Inspection,Kontrola kvality
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +144,Extra Small,Extra Malé
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +20,Spray forming,Spray tváření
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Extra Small,Extra Malé
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +458,Warning: Material Requested Qty is less than Minimum Order Qty,Upozornění: Materiál Požadované množství je menší než minimální objednávka Množství
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +191,Account {0} is frozen,Účet {0} je zmrazen
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,"Právní subjekt / dceřiná společnost s oddělenou Graf účtů, které patří do organizace."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +29,"Food, Beverage & Tobacco","Potraviny, nápoje a tabák"
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","Potraviny, nápoje a tabák"
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +20,PL or BS,PL nebo BS
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,Can only make payment against unbilled {0},Lze provést pouze platbu proti nevyfakturované {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +531,Can only make payment against unbilled {0},Lze provést pouze platbu proti nevyfakturované {0}
 apps/erpnext/erpnext/controllers/selling_controller.py +122,Commission rate cannot be greater than 100,Rychlost Komise nemůže být větší než 100
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Minimum Inventory Level,Minimální úroveň zásob
 DocType: Stock Entry,Subcontract,Subdodávka
@@ -2343,19 +2264,18 @@
 DocType: Item,Manufacturer Part Number,Typové označení
 DocType: Production Order Operation,Estimated Time and Cost,Odhadovná doba a náklady
 DocType: Bin,Bin,Popelnice
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +50,Nosing,Zaoblená hrana
 DocType: SMS Log,No of Sent SMS,Počet odeslaných SMS
 DocType: Account,Company,Společnost
 DocType: Account,Expense Account,Účtet nákladů
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +49,Software,Software
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +151,Colour,Barevné
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +49,Software,Software
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Colour,Barevné
 DocType: Maintenance Visit,Scheduled,Plánované
 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","Prosím, vyberte položku, kde &quot;Je skladem,&quot; je &quot;Ne&quot; a &quot;je Sales Item&quot; &quot;Ano&quot; a není tam žádný jiný produkt Bundle"
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,Vyberte měsíční výplatou na nerovnoměrně distribuovat cílů napříč měsíců.
 DocType: Purchase Invoice Item,Valuation Rate,Ocenění Rate
 apps/erpnext/erpnext/stock/get_item_details.py +281,Price List Currency not selected,Ceníková Měna není zvolena
 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,"Bod Row {0}: doklad o koupi, {1} neexistuje v tabulce ""kupní příjmy"""
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +134,Employee {0} has already applied for {1} between {2} and {3},Zaměstnanec {0} již požádal o {1} mezi {2} a {3}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +145,Employee {0} has already applied for {1} between {2} and {3},Zaměstnanec {0} již požádal o {1} mezi {2} a {3}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Datum zahájení projektu
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +8,Until,Dokud
 DocType: Rename Tool,Rename Log,Přejmenovat Přihlásit
@@ -2365,7 +2285,7 @@
 apps/erpnext/erpnext/controllers/recurring_document.py +162,Please select {0},"Prosím, vyberte {0}"
 DocType: C-Form,C-Form No,C-Form No
 DocType: BOM,Exploded_items,Exploded_items
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +95,Researcher,Výzkumník
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Researcher,Výzkumník
 apps/frappe/frappe/custom/doctype/customize_form/customize_form.js +88,Update,Aktualizovat
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +78,Please save the Newsletter before sending,Uložte Newsletter před odesláním
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +23,Name or Email is mandatory,Jméno nebo e-mail je povinné
@@ -2374,11 +2294,10 @@
 DocType: Employee,Exit,Východ
 apps/erpnext/erpnext/accounts/doctype/account/account.py +134,Root Type is mandatory,Root Type je povinné
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +295,Serial No {0} created,Pořadové číslo {0} vytvořil
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +125,Vibratory finishing,Vibrační dokončovací
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","Pro pohodlí zákazníků, tyto kódy mohou být použity v tiskových formátech, jako na fakturách a dodacích listech"
 DocType: Employee,You can enter any date manually,Můžete zadat datum ručně
 DocType: Sales Invoice,Advertisement,Reklama
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +165,Probationary Period,Zkušební doba
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Probationary Period,Zkušební doba
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Pouze koncové uzly jsou povoleny v transakci
 DocType: Expense Claim,Expense Approver,Schvalovatel výdajů
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,Doklad o koupi Item Dodávané
@@ -2386,19 +2305,16 @@
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +17,To Datetime,Chcete-li datetime
 DocType: SMS Settings,SMS Gateway URL,SMS brána URL
 apps/erpnext/erpnext/config/crm.py +53,Logs for maintaining sms delivery status,Protokoly pro udržení stavu doručení sms
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +137,Grinding,Broušení
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +34,Shrink wrapping,Zmenšit balení
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +36,Pending Activities,Nevyřízené Aktivity
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,Confirmed,Potvrzeno
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier > Supplier Type,Dodavatel> Dodavatel Type
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +127,Please enter relieving date.,Zadejte zmírnění datum.
 apps/erpnext/erpnext/controllers/trends.py +137,Amt,Amt
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' can be submitted,"Nechte pouze aplikace s status ""schváleno"" může být předloženy"
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +51,Only Leave Applications with status 'Approved' can be submitted,"Nechte pouze aplikace s status ""schváleno"" může být předloženy"
 apps/erpnext/erpnext/utilities/doctype/address/address.py +21,Address Title is mandatory.,Adresa Název je povinný.
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,"Zadejte název kampaně, pokud zdroj šetření je kampaň"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +38,Newspaper Publishers,Vydavatelé novin
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +38,Newspaper Publishers,Vydavatelé novin
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,Vyberte Fiskální rok
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +88,Smelting,Tavba rudy
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Změna pořadí Level
 DocType: Attendance,Attendance Date,Účast Datum
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,Plat rozpad na základě Zisk a dedukce.
@@ -2413,16 +2329,15 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +414,[Error],[Chyba]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,"Ve slovech budou viditelné, jakmile uložíte prodejní objednávky."
 ,Employee Birthday,Narozeniny zaměstnance
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +55,Venture Capital,Venture Capital
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,Venture Capital
 DocType: UOM,Must be Whole Number,Musí být celé číslo
 DocType: Leave Control Panel,New Leaves Allocated (In Days),Nové Listy Přidělené (ve dnech)
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +51,Serial No {0} does not exist,Pořadové číslo {0} neexistuje
 DocType: Pricing Rule,Discount Percentage,Sleva v procentech
 DocType: Payment Reconciliation Invoice,Invoice Number,Číslo faktury
-apps/erpnext/erpnext/hooks.py +70,Orders,Objednávky
+apps/erpnext/erpnext/hooks.py +54,Orders,Objednávky
 DocType: Leave Control Panel,Employee Type,Type zaměstnanců
 DocType: Employee Leave Approver,Leave Approver,Schvalovatel absenece
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +70,Swaging,Zužování
 DocType: Manufacturing Settings,Material Transferred for Manufacture,Převádí jaderný materiál pro Výroba
 DocType: Expense Claim,"A user with ""Expense Approver"" role","Uživatel s rolí ""Schvalovatel výdajů"""
 ,Issued Items Against Production Order,Vydané předmětů proti výrobní zakázky
@@ -2434,7 +2349,6 @@
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +62,Cost Center with existing transactions can not be converted to group,Nákladové středisko se stávajícími transakcemi nelze převést do skupiny
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Depreciation,Znehodnocení
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Dodavatel (é)
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +29,Invalid period,Neplatné období
 DocType: Customer,Credit Limit,Úvěrový limit
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,Vyberte typ transakce
 DocType: GL Entry,Voucher No,Voucher No
@@ -2444,9 +2358,9 @@
 DocType: Customer,Address and Contact,Adresa a Kontakt
 DocType: Customer,Last Day of the Next Month,Poslední den následujícího měsíce
 DocType: Employee,Feedback,Zpětná vazba
+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}","Dovolená nemůže být přiděleny před {0}, protože rovnováha dovolené již bylo carry-předávány v budoucí přidělení dovolenou záznamu {1}"
 apps/erpnext/erpnext/accounts/party.py +284,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Poznámka: Z důvodu / Referenční datum překračuje povolené zákazníků úvěrové dní od {0} den (s)
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +621,Maint. Schedule,Maint. Časový plán
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +108,Abrasive jet machining,Brusné jet obrábění
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +632,Maint. Schedule,Maint. Časový plán
 DocType: Stock Settings,Freeze Stock Entries,Freeze Stock Příspěvky
 DocType: Website Settings,Website Settings,Nastavení www stránky
 DocType: Item,Reorder level based on Warehouse,Úroveň Změna pořadí na základě Warehouse
@@ -2463,7 +2377,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +75,Show Stock Entries,Zobrazit Stock Příspěvky
 ,Is Primary Address,Je Hlavní adresa
 DocType: Production Order,Work-in-Progress Warehouse,Work-in-Progress sklad
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +308,Reference #{0} dated {1},Reference # {0} ze dne {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Reference #{0} dated {1},Reference # {0} ze dne {1}
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +13,Manage Addresses,Správa adres
 DocType: Pricing Rule,Item Code,Kód položky
 DocType: Production Planning Tool,Create Production Orders,Vytvoření výrobní zakázky
@@ -2472,7 +2386,7 @@
 DocType: Lead,Market Segment,Segment trhu
 DocType: Communication,Phone,Telefon
 DocType: Employee Internal Work History,Employee Internal Work History,Interní historie práce zaměstnance
-apps/erpnext/erpnext/public/js/account_tree_grid.js +50,Closing (Dr),Uzavření (Dr)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +221,Closing (Dr),Uzavření (Dr)
 DocType: Contact,Passive,Pasivní
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,Pořadové číslo {0} není skladem
 apps/erpnext/erpnext/config/selling.py +127,Tax template for selling transactions.,Daňové šablona na prodej transakce.
@@ -2488,8 +2402,8 @@
 ,Billed Amount,Fakturovaná částka
 DocType: Bank Reconciliation,Bank Reconciliation,Bank Odsouhlasení
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +9,Get Updates,Získat aktualizace
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +129,Material Request {0} is cancelled or stopped,Materiál Request {0} je zrušena nebo zastavena
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +641,Add a few sample records,Přidat několik ukázkových záznamů
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +133,Material Request {0} is cancelled or stopped,Materiál Request {0} je zrušena nebo zastavena
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Add a few sample records,Přidat několik ukázkových záznamů
 apps/erpnext/erpnext/config/hr.py +210,Leave Management,Správa absencí
 DocType: Event,Groups,Skupiny
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,Seskupit podle účtu
@@ -2502,38 +2416,34 @@
 DocType: Features Setup,Sales Extras,Prodejní Extras
 apps/erpnext/erpnext/accounts/utils.py +344,{0} budget for Account {1} against Cost Center {2} will exceed by {3},{0} rozpočet na účet {1} proti nákladovému středisku {2} bude překročen o {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +236,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Rozdíl účet musí být typu aktiv / Odpovědnost účet, protože to Reklamní Smíření je Entry Otevření"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +138,Purchase Order number required for Item {0},Číslo vydané objednávky je potřebné k položce {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Order number required for Item {0},Číslo vydané objednávky je potřebné k položce {0}
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',"""Datum DO"" musí být po ""Datum OD"""
 ,Stock Projected Qty,Reklamní Plánovaná POČET
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +147,Customer {0} does not belong to project {1},Zákazník {0} nepatří k projektu {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +150,Customer {0} does not belong to project {1},Zákazník {0} nepatří k projektu {1}
 DocType: Sales Order,Customer's Purchase Order,Zákazníka Objednávka
 DocType: Warranty Claim,From Company,Od Společnosti
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,Hodnota nebo Množství
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Minute,Minuta
+apps/erpnext/erpnext/public/js/setup_wizard.js +363,Minute,Minuta
 DocType: Purchase Invoice,Purchase Taxes and Charges,Nákup Daně a poplatky
 ,Qty to Receive,Množství pro příjem
 DocType: Leave Block List,Leave Block List Allowed,Nechte Block List povolena
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +61,Conversion factor cannot be in fractions,Konverzní faktor nemůže být ve zlomcích
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +358,You will use it to Login,Budete ho používat k přihlášení
+apps/erpnext/erpnext/public/js/setup_wizard.js +108,You will use it to Login,Budete ho používat k přihlášení
 DocType: Sales Partner,Retailer,Maloobchodník
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +99,Credit To account must be a Balance Sheet account,Připsat na účet musí být účtu Rozvaha
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,Všechny typy Dodavatele
 apps/erpnext/erpnext/stock/doctype/item/item.py +37,Item Code is mandatory because Item is not automatically numbered,"Kód položky je povinné, protože položka není automaticky číslovány"
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +99,Quotation {0} not of type {1},Nabídka {0} není typu {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +93,Quotation {0} not of type {1},Nabídka {0} není typu {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,Plán údržby Item
 DocType: Sales Order,%  Delivered,% Dodáno
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,Bank Overdraft Account,Kontokorentní úvěr na účtu
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +15,Make Salary Slip,Vytvořit výplatní pásku
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +18,Browse BOM,Procházet BOM
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +175,Secured Loans,Zajištěné úvěry
-apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +3,Awesome Products,Skvělé produkty
+apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +3,Awesome Products,Skvělé produkty
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +189,Opening Balance Equity,Počáteční stav Equity
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +80,Cannot approve leave as you are not authorized to approve leaves on Block Dates,Nelze schválit dovolenou si nejste oprávněna schvalovat listy na blok Termíny
 DocType: Appraisal,Appraisal,Ocenění
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +13,Lost-foam casting,Lost-pěna lití
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +47,Drawing,Výkres
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +22,Date is repeated,Datum se opakuje
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +148,Leave approver must be one of {0},Schvalovatel absence musí být jedním z {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +162,Leave approver must be one of {0},Schvalovatel absence musí být jedním z {0}
 DocType: Hub Settings,Seller Email,Prodávající E-mail
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Celkové pořizovací náklady (přes nákupní faktury)
 DocType: Workstation Working Hour,Start Time,Start Time
@@ -2547,7 +2457,7 @@
 DocType: Purchase Invoice Item,Net Amount (Company Currency),Čistá částka (Company Měna)
 DocType: BOM Operation,Hour Rate,Hour Rate
 DocType: Stock Settings,Item Naming By,Položka Pojmenování By
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +642,From Quotation,Z nabídky
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +655,From Quotation,Z nabídky
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},Další období Uzávěrka Entry {0} byla podána po {1}
 DocType: Production Order,Material Transferred for Manufacturing,Materiál Přenesená pro výrobu
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +29,Account {0} does not exists,Účet {0} neexistuje
@@ -2561,21 +2471,19 @@
 DocType: Purchase Invoice Item,PR Detail,PR Detail
 DocType: Sales Order,Fully Billed,Plně Fakturovaný
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +20,Cash In Hand,Pokladní hotovost
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +72,Delivery warehouse required for stock item {0},Dodávka sklad potřebný pro živočišnou položku {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +119,Delivery warehouse required for stock item {0},Dodávka sklad potřebný pro živočišnou položku {0}
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),Celková hmotnost balení. Obvykle se čistá hmotnost + obalového materiálu hmotnosti. (Pro tisk)
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Uživatelé s touto rolí se mohou nastavit na zmrazené účty a vytvořit / upravit účetní zápisy proti zmrazených účtů
 DocType: Serial No,Is Cancelled,Je Zrušeno
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +281,My Shipments,Moje dodávky
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +286,My Shipments,Moje dodávky
 DocType: Journal Entry,Bill Date,Bill Datum
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +43,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","I když existuje více pravidla pro tvorbu cen s nejvyšší prioritou, pak následující interní priority jsou použity:"
 DocType: Supplier,Supplier Details,Dodavatele Podrobnosti
 DocType: Communication,Recipients,Příjemci
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +146,Screwing,Šroubování
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +96,Knurling,Vroubkování
 DocType: Expense Claim,Approval Status,Stav schválení
 DocType: Hub Settings,Publish Items to Hub,Publikování položky do Hub
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +44,From value must be less than to value in row {0},Z hodnota musí být menší než hodnota v řadě {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +133,Wire Transfer,Bankovní převod
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +133,Wire Transfer,Bankovní převod
 apps/erpnext/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py +25,Please select Bank Account,"Prosím, vyberte bankovní účet"
 DocType: Newsletter,Create and Send Newsletters,Vytvoření a odeslání Zpravodaje
 apps/frappe/frappe/public/js/frappe/views/reports/grid_report.js +305,From Date must be before To Date,Datum od musí být dříve než datum do
@@ -2583,14 +2491,14 @@
 DocType: Company,Default Income Account,Účet Default příjmů
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,Zákazník Group / Customer
 DocType: Item Group,Check this if you want to show in website,"Zaškrtněte, pokud chcete zobrazit v webové stránky"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +190,Welcome to ERPNext,Vítejte na ERPNext
+,Welcome to ERPNext,Vítejte na ERPNext
 DocType: Payment Reconciliation Payment,Voucher Detail Number,Voucher Detail Počet
 apps/erpnext/erpnext/config/crm.py +146,Lead to Quotation,Lead na nabídku
 DocType: Lead,From Customer,Od Zákazníka
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +37,Calls,Volá
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Calls,Volá
 DocType: Project,Total Costing Amount (via Time Logs),Celková kalkulace Částka (přes Time Záznamy)
 DocType: Purchase Order Item Supplied,Stock UOM,Reklamní UOM
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Purchase Order {0} is not submitted,Vydaná objednávka {0} není odeslána
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +194,Purchase Order {0} is not submitted,Vydaná objednávka {0} není odeslána
 ,Projected,Plánovaná
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},Pořadové číslo {0} nepatří do skladu {1}
 apps/erpnext/erpnext/controllers/status_updater.py +136,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Poznámka: Systém nebude kontrolovat přes dobírku a over-rezervace pro item {0} jako množství nebo částka je 0
@@ -2598,7 +2506,6 @@
 DocType: Issue,Opening Date,Datum otevření
 DocType: Journal Entry,Remark,Poznámka
 DocType: Purchase Receipt Item,Rate and Amount,Cena a částka
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +95,Boring,Nudný
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +667,From Sales Order,Z přijaté objednávky
 DocType: Blog Category,Parent Website Route,nadřazená cesta internetové stránky
 DocType: Sales Order,Not Billed,Ne Účtovaný
@@ -2612,19 +2519,17 @@
 apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount Amount,Částka slevy
 DocType: Purchase Invoice,Return Against Purchase Invoice,Návrat proti nákupní faktury
 DocType: Item,Warranty Period (in days),Záruční doba (ve dnech)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +550,e.g. VAT,např. DPH
+apps/erpnext/erpnext/public/js/setup_wizard.js +292,e.g. VAT,např. DPH
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,Bod 4
 DocType: Journal Entry Account,Journal Entry Account,Zápis do deníku Účet
 DocType: Shopping Cart Settings,Quotation Series,Číselná řada nabídek
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +52,"An item exists with same name ({0}), please change the item group name or rename the item","Položka existuje se stejným názvem ({0}), prosím, změnit název skupiny položky nebo přejmenovat položku"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +82,Hot metal gas forming,Tváření Hot metal plyn
 DocType: Sales Order Item,Sales Order Date,Prodejní objednávky Datum
 DocType: Sales Invoice Item,Delivered Qty,Dodává Množství
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +63,Warehouse {0}: Company is mandatory,Sklad {0}: Společnost je povinná
 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.",Přejděte na příslušné skupiny (obvykle zdrojem finančních prostředků&gt; krátkodobých závazků&gt; daní a poplatků a vytvořit nový účet (kliknutím na Přidat dítě) typu &quot;daně&quot; a to nemluvím o daňovou sazbu.
 ,Payment Period Based On Invoice Date,Platební období na základě data vystavení faktury
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +50,Missing Currency Exchange Rates for {0},Chybí Směnárna Kurzy pro {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +135,Laser cutting,Laserové řezání
 DocType: Event,Monday,Pondělí
 DocType: Journal Entry,Stock Entry,Reklamní Entry
 DocType: Account,Payable,Splatný
@@ -2657,7 +2562,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +111,Date Of Retirement must be greater than Date of Joining,"Datum odchodu do důchodu, musí být větší než Datum spojování"
 DocType: Sales Invoice,Against Income Account,Proti účet příjmů
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +69,{0}% Delivered,{0}% dodávno
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +78,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Položka {0}: Objednané množství {1} nemůže být nižší než minimální Objednané množství {2} (definované v bodu).
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Položka {0}: Objednané množství {1} nemůže být nižší než minimální Objednané množství {2} (definované v bodu).
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Měsíční Distribution Procento
 DocType: Territory,Territory Targets,Území Cíle
 DocType: Delivery Note,Transporter Info,Transporter Info
@@ -2666,7 +2571,6 @@
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,"Tituly na tiskových šablon, např zálohové faktury."
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +140,Valuation type charges can not marked as Inclusive,Poplatky typu ocenění může není označen jako Inclusive
 DocType: POS Profile,Update Stock,Aktualizace skladem
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +128,Superfinishing,Superfinišování
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,"Různé UOM položky povede k nesprávné (celkem) Čistá hmotnost hodnoty. Ujistěte se, že čistá hmotnost každé položky je ve stejném nerozpuštěných."
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM Rate
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +85,Please pull items from Delivery Note,"Prosím, vytáhněte položky z dodací list"
@@ -2681,7 +2585,6 @@
 ,Purchase Analytics,Nákup Analytika
 DocType: Sales Invoice Item,Delivery Note Item,Delivery Note Item
 DocType: Expense Claim,Task,Úkol
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +57,Shaving,Holení
 DocType: Purchase Taxes and Charges,Reference Row #,Referenční Row #
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},Číslo šarže je povinné pro položku {0}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js +14,This is a root sales person and cannot be edited.,To je kořen prodejní člověk a nelze upravovat.
@@ -2693,13 +2596,11 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +74,Purpose must be one of {0},Cíl musí být jedním z {0}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +108,Fill the form and save it,Vyplňte formulář a uložte jej
 DocType: Production Planning Tool,Download a report containing all raw materials with their latest inventory status,"Stáhněte si zprávu, která obsahuje všechny suroviny s jejich aktuální stav zásob"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +94,Facing,Obložení
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,Forum Community
 DocType: Leave Application,Leave Balance Before Application,Stav absencí před požadavkem
 DocType: SMS Center,Send SMS,Pošlete SMS
 DocType: Company,Default Letter Head,Výchozí hlavičkový
 DocType: Time Log,Billable,Zúčtovatelná
-DocType: Authorization Rule,This will be used for setting rule in HR module,Tato adresa bude použita pro nastavení pravidlo HR modul
 DocType: Account,Rate at which this tax is applied,"Sazba, při které se používá tato daň"
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reorder Qty,Změna pořadí Množství
 DocType: Company,Stock Adjustment Account,Reklamní Nastavení účtu
@@ -2726,16 +2627,15 @@
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,Podíl alokace by měla být ve výši 100%
 DocType: Serial No,Out of AMC,Out of AMC
 DocType: Purchase Order Item,Material Request Detail No,Materiál Poptávka Detail No
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +97,Hard turning,Hard soustružení
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +33,Make Maintenance Visit,Proveďte návštěv údržby
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +187,Please contact to the user who have Sales Master Manager {0} role,"Prosím, kontaktujte pro uživatele, kteří mají obchodní manažer ve skupině Master {0} roli"
 DocType: Company,Default Cash Account,Výchozí Peněžní účet
 apps/erpnext/erpnext/config/accounts.py +79,Company (not Customer or Supplier) master.,Company (nikoliv zákazník nebo dodavatel) master.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +106,Please enter 'Expected Delivery Date',"Prosím, zadejte ""Očekávaná Datum dodání"""
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +187,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Dodací listy {0} musí být zrušena před zrušením této prodejní objednávky
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +100,Please enter 'Expected Delivery Date',"Prosím, zadejte ""Očekávaná Datum dodání"""
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +182,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Dodací listy {0} musí být zrušena před zrušením této prodejní objednávky
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +373,Paid amount + Write Off Amount can not be greater than Grand Total,Placená částka + odepsat Částka nesmí být větší než Grand Total
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} není platná Šarže pro Položku {1}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,Note: There is not enough leave balance for Leave Type {0},Poznámka: Není k dispozici dostatek zůstatek dovolené dovolená za kalendářní typ {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +124,Note: There is not enough leave balance for Leave Type {0},Poznámka: Není k dispozici dostatek zůstatek dovolené dovolená za kalendářní typ {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.","Poznámka: Není-li platba provedena proti jakémukoli rozhodnutí, jak položka deníku ručně."
 DocType: Item,Supplier Items,Dodavatele položky
 DocType: Opportunity,Opportunity Type,Typ Příležitosti
@@ -2747,7 +2647,7 @@
 DocType: Hub Settings,Publish Availability,Publikování Dostupnost
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +105,Date of Birth cannot be greater than today.,Datum narození nemůže být větší než dnes.
 ,Stock Ageing,Reklamní Stárnutí
-apps/erpnext/erpnext/controllers/accounts_controller.py +200,{0} '{1}' is disabled,{0} '{1}' je vypnuté
+apps/erpnext/erpnext/controllers/accounts_controller.py +201,{0} '{1}' is disabled,{0} '{1}' je vypnuté
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Nastavit jako Otevřít
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Posílat automatické e-maily na Kontakty na předložení transakcí.
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +232,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
@@ -2757,44 +2657,38 @@
 DocType: Purchase Order,Customer Contact Email,Zákazník Kontaktní e-mail
 DocType: Event,Sunday,Neděle
 DocType: Sales Team,Contribution (%),Příspěvek (%)
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +455,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,"Poznámka: Položka Platba nebude vytvořili, protože ""v hotovosti nebo bankovním účtu"" nebyl zadán"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +171,Responsibilities,Odpovědnost
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +457,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,"Poznámka: Položka Platba nebude vytvořili, protože ""v hotovosti nebo bankovním účtu"" nebyl zadán"
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +171,Responsibilities,Odpovědnost
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Template,Šablona
 DocType: Sales Person,Sales Person Name,Prodej Osoba Name
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,Zadejte prosím aspoň 1 fakturu v tabulce
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +511,Add Users,Přidat uživatele
+apps/erpnext/erpnext/public/js/setup_wizard.js +255,Add Users,Přidat uživatele
 DocType: Pricing Rule,Item Group,Položka Group
 DocType: Task,Actual Start Date (via Time Logs),Skutečné datum Start (přes Time Záznamy)
 DocType: Stock Reconciliation Item,Before reconciliation,Před smíření
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +12,To {0},Chcete-li {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Daně a poplatky Přidal (Company měna)
-apps/erpnext/erpnext/stock/doctype/item/item.py +340,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,"Položka Tax Row {0} musí mít účet typu daní či výnosů nebo nákladů, nebo Vyměřovací"
+apps/erpnext/erpnext/stock/doctype/item/item.py +344,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,"Položka Tax Row {0} musí mít účet typu daní či výnosů nebo nákladů, nebo Vyměřovací"
 DocType: Sales Order,Partly Billed,Částečně Účtovaný
 DocType: Item,Default BOM,Výchozí BOM
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +79,Decambering,Decambering
 apps/erpnext/erpnext/setup/doctype/company/company.js +22,Please re-type company name to confirm,Prosím re-typ název společnosti na potvrzení
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,Celkem Vynikající Amt
 DocType: Time Log Batch,Total Hours,Celkem hodin
 DocType: Journal Entry,Printing Settings,Tisk Nastavení
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +268,Total Debit must be equal to Total Credit. The difference is {0},Celkové inkaso musí rovnat do celkového kreditu. Rozdíl je {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +11,Automotive,Automobilový
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +37,Item is required,Položka je povinná
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +25,Metal injection molding,Kovové vstřikování
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +258,Total Debit must be equal to Total Credit. The difference is {0},Celkové inkaso musí rovnat do celkového kreditu. Rozdíl je {0}
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,Automobilový
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +684,From Delivery Note,Z Dodacího Listu
 DocType: Time Log,From Time,Času od
 DocType: Notification Control,Custom Message,Custom Message
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +33,Investment Banking,Investiční bankovnictví
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +261,"Select your Country, Time Zone and Currency","Vyberte svou zemi, časové pásmo a měnu"
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,Investiční bankovnictví
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +316,"Select your Country, Time Zone and Currency","Vyberte svou zemi, časové pásmo a měnu"
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +369,Cash or Bank Account is mandatory for making payment entry,V hotovosti nebo bankovním účtu je povinný pro výrobu zadání platebního
 DocType: Purchase Invoice,Price List Exchange Rate,Katalogová cena Exchange Rate
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +91,Pickling,Moření
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +18,Sand casting,Lití do písku
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +117,Electroplating,Electroplating
 DocType: Purchase Invoice Item,Rate,Cena
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +62,Intern,Internovat
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Intern,Internovat
 DocType: Newsletter,A Lead with this email id should exist,Lead s touto e-mailovou id by měla již existovat
 DocType: Stock Entry,From BOM,Od BOM
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +34,Basic,Základní
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +34,Basic,Základní
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,Fotky transakce před {0} jsou zmrazeny
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +217,Please click on 'Generate Schedule',"Prosím, klikněte na ""Generovat Schedule"""
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +61,To Date should be same as From Date for Half Day leave,Chcete-li data by měla být stejná jako u Datum od půl dne volno
@@ -2802,11 +2696,11 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +96,Reference No is mandatory if you entered Reference Date,"Referenční číslo je povinné, pokud jste zadali k rozhodnému dni"
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +108,Date of Joining must be greater than Date of Birth,Datum přistoupení musí být větší než Datum narození
 DocType: Salary Structure,Salary Structure,Plat struktura
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +242,"Multiple Price Rule exists with same criteria, please resolve \
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +246,"Multiple Price Rule exists with same criteria, please resolve \
 			conflict by assigning priority. Price Rules: {0}","Multiple Cena existuje pravidlo se stejnými kritérii, prosím vyřešit \
  konflikt přiřazením prioritu. Cena Pravidla: {0}"
 DocType: Account,Bank,Banka
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +9,Airline,Letecká linka
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,Letecká linka
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +493,Issue Material,Vydání Material
 DocType: Material Request Item,For Warehouse,Pro Sklad
 DocType: Employee,Offer Date,Nabídka Date
@@ -2816,29 +2710,24 @@
 DocType: Item,Is Fixed Asset Item,Je dlouhodobého majetku Item
 DocType: Stock Entry,Including items for sub assemblies,Včetně položek pro podsestav
 DocType: Features Setup,"If you have long print formats, this feature can be used to split the page to be printed on multiple pages with all headers and footers on each page","Máte-li dlouhé formáty tisku, tato funkce může být použita k rozdělení stránku se bude tisknout na více stránek se všemi záhlaví a zápatí na každé straně"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +131,Hobbing,Odvalovací
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +98,All Territories,Všechny území
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +98,All Territories,Všechny území
 DocType: Purchase Invoice,Items,Položky
 DocType: Fiscal Year,Year Name,Jméno roku
 DocType: Process Payroll,Process Payroll,Proces Payroll
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +59,There are more holidays than working days this month.,Existují další svátky než pracovních dnů tento měsíc.
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +68,There are more holidays than working days this month.,Existují další svátky než pracovních dnů tento měsíc.
 DocType: Product Bundle Item,Product Bundle Item,Product Bundle Item
 DocType: Sales Partner,Sales Partner Name,Sales Partner Name
 DocType: Purchase Invoice Item,Image View,Image View
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +113,Finishing & industrial finishing,Povrchová úprava a průmyslového zpracování
 DocType: Issue,Opening Time,Otevírací doba
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,Data OD a DO jsou vyžadována
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +46,Securities & Commodity Exchanges,Cenné papíry a komoditních burzách
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Cenné papíry a komoditních burzách
 DocType: Shipping Rule,Calculate Based On,Vypočítat založené na
 DocType: Delivery Note Item,From Warehouse,Ze skladu
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +98,Drilling,Vrtání
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +28,Blow molding,Vyfukování
 DocType: Purchase Taxes and Charges,Valuation and Total,Oceňování a Total
 DocType: Tax Rule,Shipping City,Přepravní City
 apps/erpnext/erpnext/stock/doctype/item/item.js +43,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,"Tento bod je varianta {0} (šablony). Atributy budou zkopírovány z šablony, pokud je nastaveno ""No Copy"""
 DocType: Account,Purchase User,Nákup Uživatel
 DocType: Notification Control,Customize the Notification,Přizpůsobit oznámení
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +87,Hammering,Vyklepání
 DocType: Web Page,Slideshow,Promítání obrázků
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +24,Default Address Template cannot be deleted,Výchozí šablony adresy nemůže být smazán
 DocType: Sales Invoice,Shipping Rule,Přepravní Pravidlo
@@ -2847,9 +2736,8 @@
 DocType: Workflow State,Search,Hledat
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +54,Total cannot be zero,Celkem nemůže být nula
 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,"""Dnů od poslední objednávky"" musí být větší nebo rovno nule"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +142,Brazing,Pájení
 DocType: C-Form,Amended From,Platném znění
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Raw Material,Surovina
+apps/erpnext/erpnext/public/js/setup_wizard.js +359,Raw Material,Surovina
 DocType: Leave Application,Follow via Email,Sledovat e-mailem
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Částka daně po slevě Částka
 apps/erpnext/erpnext/accounts/doctype/account/account.py +174,Child account exists for this account. You can not delete this account.,Dětské konto existuje pro tento účet. Nemůžete smazat tento účet.
@@ -2863,10 +2751,10 @@
 ,Produced,Produkoval
 DocType: Item,Item Code for Suppliers,Položka Kód pro dodavatele
 DocType: Issue,Raised By (Email),Vznesené (e-mail)
-apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +72,General,Obecný
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +495,Attach Letterhead,Připojit Hlavičkový
+apps/erpnext/erpnext/setup/setup_wizard/default_website.py +72,General,Obecný
+apps/erpnext/erpnext/public/js/setup_wizard.js +241,Attach Letterhead,Připojit Hlavičkový
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +272,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',"Nelze odečíst, pokud kategorie je určena pro ""ocenění"" nebo ""oceňování a celkový"""
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +542,"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.","Seznam vaše daňové hlavy (např DPH, cel atd, by měli mít jedinečné názvy) a jejich standardní sazby. Tím se vytvoří standardní šablonu, kterou můžete upravit a přidat další později."
+apps/erpnext/erpnext/public/js/setup_wizard.js +284,"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.","Seznam vaše daňové hlavy (např DPH, cel atd, by měli mít jedinečné názvy) a jejich standardní sazby. Tím se vytvoří standardní šablonu, kterou můžete upravit a přidat další později."
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial Nos Required for Serialized Item {0},Serial Nos Požadováno pro serializovaném bodu {0}
 DocType: Journal Entry,Bank Entry,Bank Entry
 DocType: Authorization Rule,Applicable To (Designation),Vztahující se na (označení)
@@ -2875,33 +2763,32 @@
 apps/erpnext/erpnext/config/accounts.py +143,Enable / disable currencies.,Povolit / zakázat měny.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Postal Expenses,Poštovní náklady
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Total (Amt)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +26,Entertainment & Leisure,Entertainment & Leisure
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,Entertainment & Leisure
 DocType: Purchase Order,The date on which recurring order will be stop,"Datum, ke kterému se opakující objednávka bude zastaví"
 DocType: Quality Inspection,Item Serial No,Položka Výrobní číslo
 apps/erpnext/erpnext/controllers/status_updater.py +142,{0} must be reduced by {1} or you should increase overflow tolerance,{0} musí být sníženy o {1} nebo byste měli zvýšit toleranci přesahu
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Present,Celkem Present
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Hour,Hodina
+apps/erpnext/erpnext/public/js/setup_wizard.js +363,Hour,Hodina
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +138,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation","Serialized Položka {0} nelze aktualizovat \
  pomocí Reklamní Odsouhlasení"
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +488,Transfer Material to Supplier,Přeneste materiál Dodavateli
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +513,Transfer Material to Supplier,Přeneste materiál Dodavateli
 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,"New Pořadové číslo nemůže mít Warehouse. Warehouse musí být nastaveny Stock vstupním nebo doklad o koupi,"
 DocType: Lead,Lead Type,Typ leadu
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +82,Create Quotation,Vytvořit Citace
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +306,All these items have already been invoiced,Všechny tyto položky již byly fakturovány
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,You are not authorized to approve leaves on Block Dates,Nejste oprávněni schvalovat listí na bloku Termíny
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +311,All these items have already been invoiced,Všechny tyto položky již byly fakturovány
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},Může být schválena {0}
 DocType: Shipping Rule,Shipping Rule Conditions,Přepravní Článek Podmínky
 DocType: BOM Replace Tool,The new BOM after replacement,Nový BOM po výměně
 DocType: Features Setup,Point of Sale,Místo Prodeje
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +83,Curling,Metaná
 DocType: Account,Tax,Daň
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +28,Row {0}: {1} is not a valid {2},Řádek {0}: {1} není platný {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +89,Refining,Rafinace
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +37,Row {0}: {1} is not a valid {2},Řádek {0}: {1} není platný {2}
 DocType: Production Planning Tool,Production Planning Tool,Plánování výroby Tool
 DocType: Quality Inspection,Report Date,Datum Reportu
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +130,Routing,Směrování
 DocType: C-Form,Invoices,Faktury
 DocType: Job Opening,Job Title,Název pozice
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +54,{0} already allocated for Employee {1} for period {2} - {3},{0} již přidělené pro zaměstnance {1} na dobu {2} - {3}
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +80,{0} Recipients,{0} příjemci
 DocType: Features Setup,Item Groups in Details,Položka skupiny v detailech
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +335,Quantity to Manufacture must be greater than 0.,"Množství, které má výroba musí být větší než 0 ° C."
@@ -2919,14 +2806,13 @@
 DocType: DocType,Setup,Nastavení
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,Není nic upravovat.
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +108,Summary for this month and pending activities,Shrnutí pro tento měsíc a probíhajícím činnostem
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +39,Cold rolling,Válcování za studena
 DocType: Customer Group,Customer Group Name,Zákazník Group Name
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +408,Please remove this Invoice {0} from C-Form {1},Odeberte Tato faktura {0} z C-Form {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +410,Please remove this Invoice {0} from C-Form {1},Odeberte Tato faktura {0} z C-Form {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,"Prosím, vyberte převádět pokud chcete také zahrnout uplynulý fiskální rok bilance listy tohoto fiskálního roku"
 DocType: GL Entry,Against Voucher Type,Proti poukazu typu
 DocType: Item,Attributes,Atributy
 DocType: Packing Slip,Get Items,Získat položky
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +186,Please enter Write Off Account,"Prosím, zadejte odepsat účet"
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +187,Please enter Write Off Account,"Prosím, zadejte odepsat účet"
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +71,Last Order Date,Datum poslední objednávky
 DocType: DocField,Image,Obrázek
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +179,Make Excise Invoice,Proveďte Spotřební faktury
@@ -2936,7 +2822,7 @@
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +146,Operation ID not set,Provoz ID není nastaveno
 DocType: Production Order,Planned Start Date,Plánované datum zahájení
 DocType: Serial No,Creation Document Type,Tvorba Typ dokumentu
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +620,Maint. Visit,Maint. Návštěva
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +631,Maint. Visit,Maint. Návštěva
 DocType: Leave Type,Is Encash,Je inkasovat
 DocType: Purchase Invoice,Mobile No,Mobile No
 DocType: Payment Tool,Make Journal Entry,Proveďte položka deníku
@@ -2944,35 +2830,31 @@
 apps/erpnext/erpnext/controllers/trends.py +257,Project-wise data is not available for Quotation,Data dle projektu nejsou k dispozici pro nabídku
 DocType: Project,Expected End Date,Očekávané datum ukončení
 DocType: Appraisal Template,Appraisal Template Title,Posouzení Template Název
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +440,Commercial,Obchodní
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +378,Commercial,Obchodní
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +23,Parent Item {0} must not be a Stock Item,Parent Item {0} nesmí být skladem
 DocType: Cost Center,Distribution Id,Distribuce Id
-apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +14,Awesome Services,Skvělé služby
+apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +14,Awesome Services,Skvělé služby
 apps/erpnext/erpnext/config/manufacturing.py +29,All Products or Services.,Všechny výrobky nebo služby.
 DocType: Purchase Invoice,Supplier Address,Dodavatel Address
 DocType: Contact Us Settings,Address Line 2,Adresní řádek 2
 DocType: ToDo,Reference,reference
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +59,Perforating,Perforující
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,Out Množství
 apps/erpnext/erpnext/config/accounts.py +128,Rules to calculate shipping amount for a sale,Pravidla pro výpočet výše přepravní na prodej
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +29,Series is mandatory,Série je povinné
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +28,Financial Services,Finanční služby
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,Finanční služby
 apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3},Poměr atribut {0} musí být v rozmezí od {1} až {2} v krocích po {3}
 DocType: Tax Rule,Sales,Prodej
 DocType: Stock Entry Detail,Basic Amount,Základní částka
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +173,Warehouse required for stock Item {0},Sklad je vyžadován pro skladovou položku {0}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +178,Warehouse required for stock Item {0},Sklad je vyžadován pro skladovou položku {0}
 DocType: Leave Allocation,Unused leaves,Nepoužité listy
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,Cr
 DocType: Customer,Default Receivable Accounts,Výchozí pohledávka účty
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +102,Sawing,Řezání
 DocType: Tax Rule,Billing State,Fakturace State
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +32,Laminating,Laminování
 DocType: Item Reorder,Transfer,Převod
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +549,Fetch exploded BOM (including sub-assemblies),Fetch explodovala kusovníku (včetně montážních podskupin)
 DocType: Authorization Rule,Applicable To (Employee),Vztahující se na (Employee)
 apps/erpnext/erpnext/controllers/accounts_controller.py +101,Due Date is mandatory,Datum splatnosti je povinné
 apps/erpnext/erpnext/controllers/item_variant.py +51,Increment for Attribute {0} cannot be 0,Přírůstek pro atribut {0} nemůže být 0
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +143,Sintering,Spékání
 DocType: Journal Entry,Pay To / Recd From,Platit K / Recd Z
 DocType: Naming Series,Setup Series,Řada Setup
 DocType: Supplier,Contact HTML,Kontakt HTML
@@ -2985,7 +2867,6 @@
 DocType: Attendance,Absent,Nepřítomný
 DocType: Product Bundle,Product Bundle,Bundle Product
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +180,Row {0}: Invalid reference {1},Řádek {0}: Neplatná reference {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +165,Crushing,Zdrcující
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Kupte Daně a poplatky šablony
 DocType: Upload Attendance,Download Template,Stáhnout šablonu
 DocType: GL Entry,Remarks,Poznámky
@@ -2993,14 +2874,12 @@
 DocType: Journal Entry,Write Off Based On,Odepsat založené na
 DocType: Features Setup,POS View,Zobrazení POS
 apps/erpnext/erpnext/config/stock.py +38,Installation record for a Serial No.,Instalace rekord pro sériové číslo
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +9,Continuous casting,Kontinuální lití
 apps/erpnext/erpnext/public/js/queries.js +39,Please specify a,Uveďte prosím
 DocType: Offer Letter,Awaiting Response,Čeká odpověď
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +53,Above,Výše
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +80,Cold sizing,Cold velikosti
 DocType: Salary Slip,Earning & Deduction,Výdělek a dedukce
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +76,Account {0} cannot be a Group,Účet {0} nemůže být skupina
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +259,Region,Kraj
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +314,Region,Kraj
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +213,Optional. This setting will be used to filter in various transactions.,Volitelné. Toto nastavení bude použito k filtrování v různých transakcí.
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +104,Negative Valuation Rate is not allowed,Negativní ocenění Rate není povoleno
 DocType: Holiday List,Weekly Off,Týdenní Off
@@ -3018,7 +2897,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,Account {0} is inactive,Účet {0} je neaktivní
 DocType: GL Entry,Is Advance,Je Zálohová
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,Účast Datum od a docházky do dnešního dne je povinná
-apps/erpnext/erpnext/controllers/buying_controller.py +131,Please enter 'Is Subcontracted' as Yes or No,"Prosím, zadejte ""subdodavatelům"" jako Ano nebo Ne"
+apps/erpnext/erpnext/controllers/buying_controller.py +122,Please enter 'Is Subcontracted' as Yes or No,"Prosím, zadejte ""subdodavatelům"" jako Ano nebo Ne"
 DocType: Sales Team,Contact No.,Kontakt Číslo
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,'Profit and Loss' type account {0} not allowed in Opening Entry,"""Výkaz zisku a ztráty"" typ účtu {0} není povoleno pro Vstupní Údaj"
 DocType: Workflow State,Time,Čas
@@ -3027,14 +2906,13 @@
 DocType: Authorization Rule,Authorization Rule,Autorizační pravidlo
 DocType: Sales Invoice,Terms and Conditions Details,Podmínky podrobnosti
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,Prodej Daně a poplatky šablony
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +10,Apparel & Accessories,Oblečení a doplňky
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,Oblečení a doplňky
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +67,Number of Order,Číslo objednávky
 DocType: Item Group,HTML / Banner that will show on the top of product list.,"HTML / Banner, které se zobrazí na první místo v seznamu výrobků."
 DocType: Shipping Rule,Specify conditions to calculate shipping amount,Stanovení podmínek pro vypočítat výši poštovného
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +121,Add Child,Přidat dítě
 DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,Role povoleno nastavit zmrazené účty a upravit Mražené Příspěvky
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +52,Cannot convert Cost Center to ledger as it has child nodes,"Nelze převést nákladového střediska na knihy, protože má podřízené uzly"
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +47,Conversion Factor is required,Je nutná konverzní faktor
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +37,Serial #,Serial #
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +87,Commission on Sales,Provize z prodeje
 DocType: Offer Letter Term,Value / Description,Hodnota / Popis
@@ -3042,10 +2920,8 @@
 ,Customers Not Buying Since Long Time,Zákazníci nekupujete Po dlouhou dobu
 DocType: Production Order,Expected Delivery Date,Očekávané datum dodání
 apps/erpnext/erpnext/accounts/general_ledger.py +121,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Debetní a kreditní nerovná za {0} # {1}. Rozdíl je v tom {2}.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +48,Bulging,Vyboulený
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +11,Evaporative-pattern casting,Lití Evaporative-pattern
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Entertainment Expenses,Výdaje na reprezentaci
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +195,Sales Invoice {0} must be cancelled before cancelling this Sales Order,Prodejní faktury {0} musí být zrušena před zrušením této prodejní objednávky
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +190,Sales Invoice {0} must be cancelled before cancelling this Sales Order,Prodejní faktury {0} musí být zrušena před zrušením této prodejní objednávky
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +61,Age,Věk
 DocType: Time Log,Billing Amount,Fakturace Částka
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +84,Invalid quantity specified for item {0}. Quantity should be greater than 0.,Neplatný množství uvedené na položku {0}. Množství by mělo být větší než 0.
@@ -3064,26 +2940,24 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,Nový zákazník Příjmy
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Travel Expenses,Cestovní výdaje
 DocType: Maintenance Visit,Breakdown,Rozbor
-apps/erpnext/erpnext/controllers/accounts_controller.py +241,Account: {0} with currency: {1} can not be selected,Účet: {0} s měnou: {1} nelze vybrat
+apps/erpnext/erpnext/controllers/accounts_controller.py +242,Account: {0} with currency: {1} can not be selected,Účet: {0} s měnou: {1} nelze vybrat
 DocType: Bank Reconciliation Detail,Cheque Date,Šek Datum
 apps/erpnext/erpnext/accounts/doctype/account/account.py +47,Account {0}: Parent account {1} does not belong to company: {2},Účet {0}: Nadřazený účet {1} nepatří ke společnosti: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted all transactions related to this company!,Úspěšně vypouští všechny transakce související s tímto společnosti!
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,Stejně jako u Date
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +111,Honing,Honování
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +58,Probation,Zkouška
-apps/erpnext/erpnext/stock/doctype/item/item.py +264,Default Warehouse is mandatory for stock Item.,Výchozí Sklad je povinný pro živočišnou položky.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Probation,Zkouška
+apps/erpnext/erpnext/stock/doctype/item/item.py +268,Default Warehouse is mandatory for stock Item.,Výchozí Sklad je povinný pro živočišnou položky.
 DocType: Feed,Full Name,Celé jméno/název
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +148,Clinching,Clinching
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +191,Payment of salary for the month {0} and year {1},Platba platu za měsíc {0} a rok {1}
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +173,Payment of salary for the month {0} and year {1},Platba platu za měsíc {0} a rok {1}
 DocType: Stock Settings,Auto insert Price List rate if missing,"Auto vložka Ceník sazba, pokud chybí"
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,Celkem uhrazené částky
 ,Transferred Qty,Přenesená Množství
 apps/erpnext/erpnext/config/learn.py +11,Navigating,Navigace
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +137,Planning,Plánování
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +137,Planning,Plánování
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +9,Make Time Log Batch,Udělejte si čas Log Batch
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Issued,Vydáno
 DocType: Project,Total Billing Amount (via Time Logs),Celkem Billing Částka (přes Time Záznamy)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +629,We sell this Item,Nabízíme k prodeji tuto položku
+apps/erpnext/erpnext/public/js/setup_wizard.js +365,We sell this Item,Nabízíme k prodeji tuto položku
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +65,Supplier Id,Dodavatel Id
 DocType: Journal Entry,Cash Entry,Cash Entry
 DocType: Sales Partner,Contact Desc,Kontakt Popis
@@ -3092,18 +2966,16 @@
 DocType: Brand,Item Manager,Manažer Položka
 DocType: Cost Center,Add rows to set annual budgets on Accounts.,Přidat řádky stanovit roční rozpočty na účtech.
 DocType: Buying Settings,Default Supplier Type,Výchozí typ Dodavatel
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +160,Quarrying,Těžba
 DocType: Production Order,Total Operating Cost,Celkové provozní náklady
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +160,Note: Item {0} entered multiple times,Poznámka: Položka {0} vstoupil vícekrát
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +163,Note: Item {0} entered multiple times,Poznámka: Položka {0} vstoupil vícekrát
 apps/erpnext/erpnext/config/crm.py +27,All Contacts.,Všechny kontakty.
 DocType: Newsletter,Test Email Id,Testovací Email Id
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +394,Company Abbreviation,Zkratka Company
+apps/erpnext/erpnext/public/js/setup_wizard.js +142,Company Abbreviation,Zkratka Company
 DocType: Features Setup,If you follow Quality Inspection. Enables Item QA Required and QA No in Purchase Receipt,"Pokud se budete řídit kontroly jakosti. Umožňuje položky QA požadovány, a QA No v dokladu o koupi"
 DocType: GL Entry,Party Type,Typ Party
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +68,Raw material cannot be same as main Item,Surovina nemůže být stejný jako hlavní bod
 DocType: Item Attribute Value,Abbreviation,Zkratka
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,Není authroized od {0} překročí limity
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +30,Rotational molding,Rotační tváření
 apps/erpnext/erpnext/config/hr.py +115,Salary template master.,Plat master šablona.
 DocType: Leave Type,Max Days Leave Allowed,Max Days Leave povolena
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +55,Set Tax Rule for shopping cart,Sada Daňové Pravidlo pro nákupního košíku
@@ -3117,15 +2989,15 @@
 apps/erpnext/erpnext/config/selling.py +18,Quotes to Leads or Customers.,Nabídka pro Lead nebo pro Zákazníka
 DocType: Stock Settings,Role Allowed to edit frozen stock,Role povoleno upravovat zmrazené zásoby
 ,Territory Target Variance Item Group-Wise,Území Cílová Odchylka Item Group-Wise
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +101,All Customer Groups,Všechny skupiny zákazníků
-apps/erpnext/erpnext/controllers/accounts_controller.py +474,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} je povinné. Možná není vytvořen záznam směnného kurzu pro {1} na {2}.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +101,All Customer Groups,Všechny skupiny zákazníků
+apps/erpnext/erpnext/controllers/accounts_controller.py +475,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} je povinné. Možná není vytvořen záznam směnného kurzu pro {1} na {2}.
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +37,Tax Template is mandatory.,Daňová šablona je povinné.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +41,Account {0}: Parent account {1} does not exist,Účet {0}: Nadřazený účet {1} neexistuje
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Ceník Rate (Company měny)
 DocType: Account,Temporary,Dočasný
 DocType: Address,Preferred Billing Address,Preferovaná Fakturační Adresa
 DocType: Monthly Distribution Percentage,Percentage Allocation,Procento přidělení
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +86,Secretary,Sekretářka
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Secretary,Sekretářka
 DocType: Serial No,Distinct unit of an Item,Samostatnou jednotku z položky
 DocType: Pricing Rule,Buying,Nákupy
 DocType: HR Settings,Employee Records to be created by,"Zaměstnanec Záznamy, které vytvořil"
@@ -3138,9 +3010,8 @@
 ,Item-wise Price List Rate,Item-moudrý Ceník Rate
 DocType: Purchase Order Item,Supplier Quotation,Dodavatel Nabídka
 DocType: Quotation,In Words will be visible once you save the Quotation.,"Ve slovech budou viditelné, jakmile uložíte nabídku."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +68,Ironing,Žehlení
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is stopped,{0} {1} je zastaven
-apps/erpnext/erpnext/stock/doctype/item/item.py +352,Barcode {0} already used in Item {1},Čárový kód {0} již použit u položky {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +356,Barcode {0} already used in Item {1},Čárový kód {0} již použit u položky {1}
 DocType: Lead,Add to calendar on this date,Přidat do kalendáře k tomuto datu
 apps/erpnext/erpnext/config/selling.py +132,Rules for adding shipping costs.,Pravidla pro přidávání náklady na dopravu.
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,Připravované akce
@@ -3149,13 +3020,12 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +27,Quick Entry,Rychlý vstup
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0} je povinné pro návrat
 DocType: Purchase Order,To Receive,Obdržet
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +33,Shrink fitting,Zmenšit kování
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +522,user@example.com,user@example.com
+apps/erpnext/erpnext/public/js/setup_wizard.js +266,user@example.com,user@example.com
 DocType: Email Digest,Income / Expense,Výnosy / náklady
 DocType: Employee,Personal Email,Osobní e-mail
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +58,Total Variance,Celkový rozptyl
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +62,Total Variance,Celkový rozptyl
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.","Pokud je povoleno, bude systém odesílat účetní položky k zásobám automaticky."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +15,Brokerage,Makléřská
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +15,Brokerage,Makléřská
 DocType: Address,Postal Code,PSČ
 DocType: Production Order Operation,"in Minutes
 Updated via 'Time Log'","v minutách 
@@ -3163,14 +3033,13 @@
 DocType: Customer,From Lead,Od Leadu
 apps/erpnext/erpnext/config/manufacturing.py +19,Orders released for production.,Objednávky uvolněna pro výrobu.
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +42,Select Fiscal Year...,Vyberte fiskálního roku ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +442,POS Profile required to make POS Entry,"POS Profile požadováno, aby POS Vstup"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +444,POS Profile required to make POS Entry,"POS Profile požadováno, aby POS Vstup"
 DocType: Hub Settings,Name Token,Jméno Token
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +106,Planing,Hoblování
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Selling,Standardní prodejní
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +120,Standard Selling,Standardní prodejní
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +137,Atleast one warehouse is mandatory,Alespoň jeden sklad je povinný
 DocType: Serial No,Out of Warranty,Out of záruky
 DocType: BOM Replace Tool,Replace,Vyměnit
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +314,{0} against Sales Invoice {1},{0} proti vystavené faktuře {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +316,{0} against Sales Invoice {1},{0} proti vystavené faktuře {1}
 apps/erpnext/erpnext/stock/doctype/item/item.py +49,Please enter default Unit of Measure,"Prosím, zadejte výchozí měrnou jednotku"
 DocType: Purchase Invoice Item,Project Name,Název projektu
 DocType: Supplier,Mention if non-standard receivable account,Zmínka v případě nestandardní pohledávky účet
@@ -3186,9 +3055,8 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,Journal Entry {0} does not have account {1} or already matched against other voucher,Zápis do deníku {0} nemá účet {1} nebo již uzavřeno proti ostatním poukaz
 DocType: Item,Moving Average,Klouzavý průměr
 DocType: BOM Replace Tool,The BOM which will be replaced,"BOM, který bude nahrazen"
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +43,New Stock UOM must be different from current stock UOM,New Sklad UOM musí být odlišný od běžného akciové nerozpuštěných
 DocType: Account,Debit,Debet
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +34,Leaves must be allocated in multiples of 0.5,"Dovolené musí být přiděleny v násobcích 0,5"
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +44,Leaves must be allocated in multiples of 0.5,"Dovolené musí být přiděleny v násobcích 0,5"
 DocType: Production Order,Operation Cost,Provozní náklady
 apps/erpnext/erpnext/config/hr.py +71,Upload attendance from a .csv file,Nahrajte účast ze souboru CSV
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,Vynikající Amt
@@ -3206,8 +3074,7 @@
 DocType: Employee,Internal Work History,Vnitřní práce History
 DocType: DocField,Column Break,Zalomení sloupce
 DocType: Event,Thursday,Čtvrtek
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +42,Private Equity,Private Equity
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +93,Turning,Turning
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,Private Equity
 DocType: Maintenance Visit,Customer Feedback,Zpětná vazba od zákazníků
 DocType: Account,Expense,Výdaj
 DocType: Sales Invoice,Exhibition,Výstava
@@ -3220,19 +3087,19 @@
 DocType: Employee,Held On,Které se konalo dne
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +33,Production Item,Výrobní položka
 ,Employee Information,Informace o zaměstnanci
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,Rate (%),Rate (%)
+apps/erpnext/erpnext/public/js/setup_wizard.js +294,Rate (%),Rate (%)
 DocType: Stock Entry Detail,Additional Cost,Dodatečné náklady
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +407,Financial Year End Date,Finanční rok Datum ukončení
+apps/erpnext/erpnext/public/js/setup_wizard.js +155,Financial Year End Date,Finanční rok Datum ukončení
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Voucher No, if grouped by Voucher","Nelze filtrovat na základě poukazu ne, pokud seskupeny podle poukazu"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +484,Make Supplier Quotation,Vytvořit nabídku dodavatele
 DocType: Quality Inspection,Incoming,Přicházející
 DocType: BOM,Materials Required (Exploded),Potřebný materiál (Rozložený)
 DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),Snížit Zisk na vstup bez nároku na mzdu (LWP)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +512,"Add users to your organization, other than yourself","Přidání uživatelů do vaší organizace, jiné než vy"
+apps/erpnext/erpnext/public/js/setup_wizard.js +256,"Add users to your organization, other than yourself","Přidání uživatelů do vaší organizace, jiné než vy"
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No {1} does not match with {2} {3},Řádek # {0}: Výrobní číslo {1} neodpovídá {2} {3}
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +44,Casual Leave,Casual Leave
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +44,Casual Leave,Casual Leave
 DocType: Batch,Batch ID,Šarže ID
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +334,Note: {0},Poznámka: {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +336,Note: {0},Poznámka: {0}
 ,Delivery Note Trends,Dodací list Trendy
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +104,This Week's Summary,Tento týden Shrnutí
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +74,{0} must be a Purchased or Sub-Contracted Item in row {1},"{0} musí být Zakoupená, nebo Subdodavatelská položka v řádku {1}"
@@ -3244,7 +3111,7 @@
 DocType: Purchase Receipt,Return Against Purchase Receipt,Návrat Proti doklad o koupi
 DocType: Purchase Order,To Bill,Billa
 DocType: Material Request,% Ordered,% objednáno
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +61,Piecework,Úkolová práce
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Piecework,Úkolová práce
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +64,Avg. Buying Rate,Avg. Nákup Rate
 DocType: Task,Actual Time (in Hours),Skutečná doba (v hodinách)
 DocType: Employee,History In Company,Historie ve Společnosti
@@ -3261,13 +3128,13 @@
 DocType: Opportunity,To Discuss,K projednání
 DocType: SMS Settings,SMS Settings,Nastavení SMS
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +60,Temporary Accounts,Dočasné Účty
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +155,Black,Černá
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Black,Černá
 DocType: BOM Explosion Item,BOM Explosion Item,BOM Explosion Item
 DocType: Account,Auditor,Auditor
 DocType: Purchase Order,End date of current order's period,Datum ukončení doby aktuální objednávky
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +17,Make Offer Letter,Vytvořte nabídku Letter
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +10,Return,Zpáteční
-apps/erpnext/erpnext/stock/doctype/item/item.py +503,Default Unit of Measure for Variant must be same as Template,Výchozí měrná jednotka varianty musí být stejné jako šablonu
+apps/erpnext/erpnext/stock/doctype/item/item.py +507,Default Unit of Measure for Variant must be same as Template,Výchozí měrná jednotka varianty musí být stejné jako šablonu
 DocType: DocField,Fold,Fold
 DocType: Production Order Operation,Production Order Operation,Výrobní zakázka Operace
 DocType: Pricing Rule,Disable,Zakázat
@@ -3278,13 +3145,12 @@
 DocType: Page,Page Name,Název stránky
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +110,To Time must be greater than From Time,Chcete-li čas musí být větší než From Time
 DocType: Journal Entry Account,Exchange Rate,Exchange Rate
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +465,Sales Order {0} is not submitted,Prodejní objednávky {0} není předložena
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +467,Sales Order {0} is not submitted,Prodejní objednávky {0} není předložena
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0}: Parent account {1} does not bolong to the company {2},Sklad {0}: Nadřazený účet {1} napatří společnosti {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +124,Spindle finishing,Úprava vřetena
 DocType: BOM,Last Purchase Rate,Poslední nákupní sazba
 DocType: Account,Asset,Majetek
 DocType: Project Task,Task ID,Task ID
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +395,"e.g. ""MC""","např ""MC """
+apps/erpnext/erpnext/public/js/setup_wizard.js +143,"e.g. ""MC""","např ""MC """
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,Stock cannot exist for Item {0} since has variants,"Sklad nemůže existovat k bodu {0}, protože má varianty"
 ,Sales Person-wise Transaction Summary,Prodej Person-moudrý Shrnutí transakce
 DocType: System Settings,Time Zone,Časové pásmo
@@ -3293,9 +3159,7 @@
 DocType: Monthly Distribution,Monthly Distribution Percentages,Měsíční Distribuční Procenta
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +16,The selected item cannot have Batch,Vybraná položka nemůže mít dávku
 DocType: Delivery Note,% of materials delivered against this Delivery Note,% Materiálů doručeno proti tomuto dodacímu listu
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +151,Stapling,Sešívání
 DocType: Customer,Customer Details,Podrobnosti zákazníků
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +105,Shaping,Tvarování
 DocType: Employee,Reports to,Zprávy
 DocType: SMS Settings,Enter url parameter for receiver nos,Zadejte url parametr pro přijímače nos
 DocType: Sales Invoice,Paid Amount,Uhrazené částky
@@ -3304,13 +3168,13 @@
 DocType: Item Variant,Item Variant,Položka Variant
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +15,Setting this Address Template as default as there is no other default,"Nastavení Tato adresa šablonu jako výchozí, protože není jiná výchozí"
 apps/erpnext/erpnext/accounts/doctype/account/account.py +89,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Zůstatek na účtu již v inkasa, není dovoleno stanovit ""Balance musí být"" jako ""úvěru"""
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +76,Quality Management,Řízení kvality
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Quality Management,Řízení kvality
 DocType: Production Planning Tool,Filter based on customer,Filtr dle zákazníka
 DocType: Payment Tool Detail,Against Voucher No,Proti poukaz č
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +47,Please enter quantity for Item {0},"Zadejte prosím množství produktů, bod {0}"
 DocType: Employee External Work History,Employee External Work History,Zaměstnanec vnější práce History
 DocType: Tax Rule,Purchase,Nákup
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +34,Balance Qty,Zůstatek Množství
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Balance Qty,Zůstatek Množství
 DocType: Item Group,Parent Item Group,Parent Item Group
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +21,{0} for {1},{0} pro {1}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +96,Cost Centers,Nákladové středisko
@@ -3320,12 +3184,12 @@
 DocType: Opportunity,Next Contact,Následující Kontakt
 DocType: Employee,Employment Type,Typ zaměstnání
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,Dlouhodobý majetek
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +84,Application period cannot be across two alocation records,Období pro podávání žádostí nemůže být na dvou alokace záznamy
 DocType: Item Group,Default Expense Account,Výchozí výdajového účtu
 DocType: Employee,Notice (days),Oznámení (dny)
 DocType: Page,Yes,Ano
 DocType: Tax Rule,Sales Tax Template,Daň z prodeje Template
 DocType: Employee,Encashment Date,Inkaso Datum
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +74,Electroforming,Electroforming
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +179,"Against Voucher Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Proti poukazu Type musí být jedním z objednávky, faktury nebo Journal Entry"
 DocType: Account,Stock Adjustment,Reklamní Nastavení
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +34,Default Activity Cost exists for Activity Type - {0},Existuje Náklady Výchozí aktivity pro Typ aktivity - {0}
@@ -3361,12 +3225,12 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,"Warehouse nelze vypustit, neboť existuje zásob, kniha pro tento sklad."
 DocType: Company,Distribution,Distribuce
 apps/erpnext/erpnext/public/js/pos/pos.html +36,Amount Paid,Zaplacené částky
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +91,Project Manager,Project Manager
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +72,Dispatch,Odeslání
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Project Manager,Project Manager
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +72,Dispatch,Odeslání
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,Max sleva povoleno položku: {0} {1}%
 DocType: Customer,Default Taxes and Charges,Výchozí Daně a poplatky
 DocType: Account,Receivable,Pohledávky
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +268,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,"Řádek # {0}: Není povoleno měnit dodavatele, objednávky již existuje"
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +263,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,"Řádek # {0}: Není povoleno měnit dodavatele, objednávky již existuje"
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,"Role, která se nechá podat transakcí, které přesahují úvěrové limity."
 DocType: Sales Invoice,Supplier Reference,Dodavatel Označení
 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.","Je-li zaškrtnuto, bude BOM pro sub-montážní položky považují pro získání surovin. V opačném případě budou všechny sub-montážní položky být zacházeno jako surovinu."
@@ -3374,8 +3238,8 @@
 DocType: Hub Settings,Seller Description,Prodejce Popis
 DocType: Employee Education,Qualification,Kvalifikace
 DocType: Item Price,Item Price,Položka Cena
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +48,Soap & Detergent,Soap & Detergent
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +36,Motion Picture & Video,Motion Picture & Video
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +48,Soap & Detergent,Soap & Detergent
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +36,Motion Picture & Video,Motion Picture & Video
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Objednáno
 DocType: Warehouse,Warehouse Name,Název Skladu
 DocType: Naming Series,Select Transaction,Vybrat Transaction
@@ -3384,7 +3248,6 @@
 DocType: BOM,Rate Of Materials Based On,Hodnotit materiálů na bázi
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,Podpora Analtyics
 apps/erpnext/erpnext/accounts/doctype/accounts_settings/accounts_settings.py +27,Company is missing in warehouses {0},Společnost chybí ve skladech {0}
-DocType: Stock UOM Replace Utility,Stock UOM Replace Utility,Sklad UOM Nahradit Utility
 DocType: POS Profile,Terms and Conditions,Podmínky
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,To Date should be within the Fiscal Year. Assuming To Date = {0},"Chcete-li data by měla být v rámci fiskálního roku. Za předpokladu, že To Date = {0}"
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","Zde si můžete udržet výšku, váhu, alergie, zdravotní problémy atd"
@@ -3396,7 +3259,7 @@
 DocType: Sales Order Item,For Production,Pro Výrobu
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +103,Please enter sales order in the above table,"Prosím, zadejte prodejní objednávky v tabulce výše"
 DocType: Project Task,View Task,Zobrazit Task
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +406,Your financial year begins on,Váš finanční rok začíná
+apps/erpnext/erpnext/public/js/setup_wizard.js +154,Your financial year begins on,Váš finanční rok začíná
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +46,Please enter Purchase Receipts,"Prosím, zadejte Nákup Příjmy"
 DocType: Sales Invoice,Get Advances Received,Získat přijaté zálohy
 DocType: Email Digest,Add/Remove Recipients,Přidat / Odebrat příjemce
@@ -3404,16 +3267,14 @@
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","Chcete-li nastavit tento fiskální rok jako výchozí, klikněte na tlačítko ""Nastavit jako výchozí"""
 apps/erpnext/erpnext/config/support.py +54,Setup incoming server for support email id. (e.g. support@example.com),Nastavení příchozí server pro podporu e-mailovou id. (Např support@example.com)
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,Nedostatek Množství
-apps/erpnext/erpnext/stock/doctype/item/item.py +528,Item variant {0} exists with same attributes,Bod varianta {0} existuje s stejné atributy
+apps/erpnext/erpnext/stock/doctype/item/item.py +532,Item variant {0} exists with same attributes,Bod varianta {0} existuje s stejné atributy
 DocType: Salary Slip,Salary Slip,Plat Slip
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +116,Burnishing,Leštění
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +54,'To Date' is required,"""Datum DO"" je povinné"
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,"""Datum DO"" je povinné"
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","Generování balení pásky pro obaly mají být dodány. Používá se k oznámit číslo balíku, obsah balení a jeho hmotnost."
 DocType: Sales Invoice Item,Sales Order Item,Prodejní objednávky Item
 DocType: Salary Slip,Payment Days,Platební dny
 DocType: BOM,Manage cost of operations,Správa nákladů na provoz
 DocType: Features Setup,Item Advanced,Položka Advanced
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +40,Hot rolling,Válcování
 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.","Když některý z kontrolovaných operací je ""Odesláno"", email pop-up automaticky otevřeny poslat e-mail na přidružené ""Kontakt"" v této transakci, s transakcí jako přílohu. Uživatel může, ale nemusí odeslat e-mail."
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,Globální nastavení
 DocType: Employee Education,Employee Education,Vzdělávání zaměstnanců
@@ -3426,25 +3287,23 @@
 DocType: Customer,Sales Team Details,Podrobnosti prodejní tým
 DocType: Expense Claim,Total Claimed Amount,Celkem žalované částky
 apps/erpnext/erpnext/config/crm.py +22,Potential opportunities for selling.,Potenciální příležitosti pro prodej.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +48,Sick Leave,Zdravotní dovolená
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +174,Invalid {0},Neplatný {0}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +48,Sick Leave,Zdravotní dovolená
 DocType: Email Digest,Email Digest,Email Digest
 DocType: Delivery Note,Billing Address Name,Jméno Fakturační adresy
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +22,Department Stores,Obchodní domy
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,Obchodní domy
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +40,System Balance,System Balance
 DocType: Workflow,Is Active,Je Aktivní
 apps/erpnext/erpnext/controllers/stock_controller.py +71,No accounting entries for the following warehouses,Žádné účetní záznamy pro následující sklady
 apps/erpnext/erpnext/projects/doctype/project/project.js +22,Save the document first.,Uložte dokument jako první.
 DocType: Account,Chargeable,Vyměřovací
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +121,Linishing,Linishing
 DocType: Company,Change Abbreviation,Změna Zkratky
 DocType: Workflow State,Primary,Primární
 DocType: Expense Claim Detail,Expense Date,Datum výdaje
 DocType: Item,Max Discount (%),Max sleva (%)
 DocType: Communication,More Information,Víc informací
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +70,Last Order Amount,Částka poslední objednávky
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +161,Blasting,Odstřel
 DocType: Company,Warn,Varovat
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +111,Item valuation updated,Ocenění Item aktualizováno
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Jakékoli jiné poznámky, pozoruhodné úsilí, které by měly jít v záznamech."
 DocType: BOM,Manufacturing User,Výroba Uživatel
 DocType: Purchase Order,Raw Materials Supplied,Dodává suroviny
@@ -3454,7 +3313,7 @@
 DocType: Appraisal,Appraisal Template,Posouzení Template
 DocType: Communication,Email,Email
 DocType: Item Group,Item Classification,Položka Klasifikace
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +89,Business Development Manager,Business Development Manager
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Business Development Manager,Business Development Manager
 DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,Maintenance Visit Účel
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.js +15,Period,Období
 ,General Ledger,Hlavní Účetní Kniha
@@ -3464,9 +3323,7 @@
 ,Itemwise Recommended Reorder Level,Itemwise Doporučené Změna pořadí Level
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +264,Please select {0} first,"Prosím, nejprve vyberte {0} "
 DocType: Features Setup,To get Item Group in details table,Chcete-li získat položku Group v tabulce Rozpis
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +67,Redrawing,Překreslení
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +112,Batch {0} of Item {1} has expired.,Batch {0} z {1} bodu vypršela.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +120,Etching,Lept
 DocType: Sales Invoice,Commission,Provize
 DocType: Address Template,"<h4>Default Template</h4>
 <p>Uses <a href=""http://jinja.pocoo.org/docs/templates/"">Jinja Templating</a> and all the fields of Address (including Custom Fields if any) will be available</p>
@@ -3511,7 +3368,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +340,Operation Time must be greater than 0 for Operation {0},Provozní doba musí být větší než 0 pro provoz {0}
 DocType: Supplier,Address and Contacts,Adresa a kontakty
 DocType: UOM Conversion Detail,UOM Conversion Detail,UOM konverze Detail
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +496,Keep it web friendly 900px (w) by 100px (h),Keep It webové přátelské 900px (w) o 100px (h)
+apps/erpnext/erpnext/public/js/setup_wizard.js +242,Keep it web friendly 900px (w) by 100px (h),Keep It webové přátelské 900px (w) o 100px (h)
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +329,Production Order cannot be raised against a Item Template,Výrobní zakázka nemůže být vznesena proti šablony položky
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +44,Charges are updated in Purchase Receipt against each item,Poplatky jsou aktualizovány v dokladu o koupi na každou položku
 DocType: Payment Tool,Get Outstanding Vouchers,Získejte Vynikající poukazy
@@ -3527,54 +3384,49 @@
 DocType: Item,Average time taken by the supplier to deliver,Průměrná doba pořízena dodavatelem dodat
 DocType: Time Log,Hours,Hodiny
 DocType: Project,Expected Start Date,Očekávané datum zahájení
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +38,Rolling,Rolling
 DocType: ToDo,Priority,Priorita
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +41,Remove item if charges is not applicable to that item,Odebrat pokud poplatků není pro tuto položku
 DocType: Dropbox Backup,Dropbox Access Allowed,Dropbox Přístup povolen
 DocType: Dropbox Backup,Weekly,Týdenní
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,Např. smsgateway.com/api/send-sms.cgi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +485,Receive,Příjem
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +510,Receive,Příjem
 DocType: Maintenance Visit,Fully Completed,Plně Dokončeno
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% hotovo
 DocType: Employee,Educational Qualification,Vzdělávací Kvalifikace
 DocType: Workstation,Operating Costs,Provozní náklady
 DocType: Employee Leave Approver,Employee Leave Approver,Zaměstnanec Leave schvalovač
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,{0} has been successfully added to our Newsletter list.,{0} byl úspěšně přidán do našeho seznamu novinek.
-apps/erpnext/erpnext/stock/doctype/item/item.py +383,Row {0}: An Reorder entry already exists for this warehouse {1},Row {0}: Položka Změna pořadí již pro tento sklad existuje {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +387,Row {0}: An Reorder entry already exists for this warehouse {1},Row {0}: Položka Změna pořadí již pro tento sklad existuje {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +67,"Cannot declare as lost, because Quotation has been made.","Nelze prohlásit za ztracený, protože citace byla provedena."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +133,Electron beam machining,Paprsek obrábění Electron
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Nákup Hlavní manažer
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +424,Production Order {0} must be submitted,Výrobní zakázka {0} musí být předloženy
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +150,Please select Start Date and End Date for Item {0},"Prosím, vyberte Počáteční datum a koncové datum pro položku {0}"
 apps/erpnext/erpnext/config/stock.py +141,Main Reports,Hlavní zprávy
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +102,Stock Ledger entries balances updated,Sklad Ledger položky bilancí aktualizováno
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,K dnešnímu dni nemůže být dříve od data
 DocType: Purchase Receipt Item,Prevdoc DocType,Prevdoc DOCTYPE
-apps/erpnext/erpnext/stock/doctype/item/item.js +176,Add / Edit Prices,Přidat / Upravit ceny
+apps/erpnext/erpnext/stock/doctype/item/item.js +178,Add / Edit Prices,Přidat / Upravit ceny
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +53,Chart of Cost Centers,Diagram nákladových středisek
 ,Requested Items To Be Ordered,Požadované položky je třeba objednat
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +298,My Orders,Moje objednávky
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +293,My Orders,Moje objednávky
 DocType: Price List,Price List Name,Ceník Jméno
 DocType: Time Log,For Manufacturing,Pro výrobu
-apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +70,Totals,Součty
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +174,Totals,Součty
 DocType: BOM,Manufacturing,Výroba
 ,Ordered Items To Be Delivered,"Objednané zboží, které mají být dodány"
 DocType: Account,Income,Příjem
 ,Setup Wizard,Průvodce nastavením
 DocType: Industry Type,Industry Type,Typ Průmyslu
 apps/erpnext/erpnext/templates/includes/cart.js +137,Something went wrong!,Něco se pokazilo!
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +68,Warning: Leave application contains following block dates,Upozornění: Nechte Aplikace obsahuje následující data bloku
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +251,Sales Invoice {0} has already been submitted,Prodejní faktury {0} již byla odeslána
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +100,Warning: Leave application contains following block dates,Upozornění: Nechte Aplikace obsahuje následující data bloku
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +256,Sales Invoice {0} has already been submitted,Prodejní faktury {0} již byla odeslána
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,Dokončení Datum
 DocType: Purchase Invoice Item,Amount (Company Currency),Částka (Měna Společnosti)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +10,Die casting,Die lití
 DocType: Email Alert,Reference Date,Referenční datum
 apps/erpnext/erpnext/config/hr.py +105,Organization unit (department) master.,Organizace jednotka (departement) master.
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +25,Please enter valid mobile nos,Zadejte platné mobilní nos
 DocType: Budget Detail,Budget Detail,Detail Rozpočtu
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +75,Please enter message before sending,"Prosím, zadejte zprávu před odesláním"
 DocType: Async Task,Status,Stav
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +65,Stock UOM updated for Item {0},Sklad UOM aktualizovaný k bodu {0}
 DocType: Company History,Year,Rok
 apps/erpnext/erpnext/config/accounts.py +127,Point-of-Sale Profile,Point-of-Sale Profil
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +68,Please Update SMS Settings,Aktualizujte prosím nastavení SMS
@@ -3588,12 +3440,12 @@
 ,Serial No Service Contract Expiry,Pořadové číslo Servisní smlouva vypršení platnosti
 DocType: Item,Unit of Measure Conversion,Jednotka míry konverze
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +86,Employee can not be changed,Zaměstnanec nemůže být změněn
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +259,You cannot credit and debit same account at the same time,Nemůžete dělat kreditní a debetní záznam na stejný účet ve stejnou dobu.
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,You cannot credit and debit same account at the same time,Nemůžete dělat kreditní a debetní záznam na stejný účet ve stejnou dobu.
 DocType: Naming Series,Help HTML,Nápověda HTML
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},Celková weightage přiřazen by měla být 100%. Je {0}
 apps/erpnext/erpnext/controllers/status_updater.py +140,Allowance for over-{0} crossed for Item {1},Příspěvek na nadměrné {0} přešel k bodu {1}
 DocType: Address,Name of person or organization that this address belongs to.,"Jméno osoby nebo organizace, která tato adresa patří."
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +587,Your Suppliers,Vaši Dodavatelé
+apps/erpnext/erpnext/public/js/setup_wizard.js +325,Your Suppliers,Vaši Dodavatelé
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,"Nelze nastavit jako Ztraceno, protože je přijata objednávka."
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +65,Another Salary Structure {0} is active for employee {1}. Please make its status 'Inactive' to proceed.,"Další platovou strukturu {0} je aktivní pro zaměstnance {1}. Prosím, aby jeho stav ""neaktivní"" pokračovat."
 DocType: Purchase Invoice,Contact,Kontakt
@@ -3602,37 +3454,35 @@
 DocType: Item,Has Serial No,Má Sériové číslo
 DocType: Employee,Date of Issue,Datum vydání
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +16,{0}: From {0} for {1},{0}: Od {0} do {1}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +154,Row #{0}: Set Supplier for item {1},Řádek # {0}: Nastavte Dodavatel pro položku {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +149,Row #{0}: Set Supplier for item {1},Řádek # {0}: Nastavte Dodavatel pro položku {1}
 DocType: Issue,Content Type,Typ obsahu
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +17,Computer,Počítač
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,Počítač
 DocType: Item,List this Item in multiple groups on the website.,Seznam tuto položku ve více skupinách na internetových stránkách.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +283,Please check Multi Currency option to allow accounts with other currency,"Prosím, zkontrolujte více měn možnost povolit účty s jinou měnu"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +285,Please check Multi Currency option to allow accounts with other currency,"Prosím, zkontrolujte více měn možnost povolit účty s jinou měnu"
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +62,Item: {0} does not exist in the system,Položka: {0} neexistuje v systému
 apps/erpnext/erpnext/accounts/doctype/account/account.py +81,You are not authorized to set Frozen value,Nejste oprávněni stanovit hodnotu Zmražení
 DocType: Payment Reconciliation,Get Unreconciled Entries,Získat smířit záznamů
 DocType: Cost Center,Budgets,Rozpočty
 apps/frappe/frappe/core/page/modules_setup/modules_setup.py +11,Updated,Aktualizováno
 DocType: Employee,Emergency Contact Details,Nouzové kontaktní údaje
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +396,What does it do?,Co to dělá?
+apps/erpnext/erpnext/public/js/setup_wizard.js +144,What does it do?,Co to dělá?
 DocType: Delivery Note,To Warehouse,Do skladu
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +45,Account {0} has been entered more than once for fiscal year {1},Účet {0} byl zadán více než jednou za fiskální rok {1}
 ,Average Commission Rate,Průměrná cena Komise
-apps/erpnext/erpnext/stock/doctype/item/item.py +313,'Has Serial No' can not be 'Yes' for non-stock item,"""Má sériové číslo"", nemůže být ""Ano"" pro neskladové zboží"
+apps/erpnext/erpnext/stock/doctype/item/item.py +317,'Has Serial No' can not be 'Yes' for non-stock item,"""Má sériové číslo"", nemůže být ""Ano"" pro neskladové zboží"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Attendance can not be marked for future dates,Účast nemůže být označen pro budoucí data
 DocType: Pricing Rule,Pricing Rule Help,Ceny Pravidlo Help
 DocType: Purchase Taxes and Charges,Account Head,Účet Head
 apps/erpnext/erpnext/config/stock.py +79,Update additional costs to calculate landed cost of items,Aktualizace dodatečné náklady pro výpočet vyložené náklady položek
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +111,Electrical,Elektrický
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +111,Electrical,Elektrický
 DocType: Stock Entry,Total Value Difference (Out - In),Celková hodnota Rozdíl (Out - In)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +302,Row {0}: Exchange Rate is mandatory,Řádek {0}: Exchange Rate je povinné
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +304,Row {0}: Exchange Rate is mandatory,Řádek {0}: Exchange Rate je povinné
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},User ID není nastavena pro zaměstnance {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +72,Peening,Peening
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,From Warranty Claim,Od reklamačnímu
 DocType: Stock Entry,Default Source Warehouse,Výchozí zdroj Warehouse
 DocType: Item,Customer Code,Code zákazníků
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +212,Birthday Reminder for {0},Narozeninová připomínka pro {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +163,Lapping,Zabrušovací
-apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.js +8,Days Since Last Order,Počet dnů od poslední objednávky
+apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +72,Days Since Last Order,Počet dnů od poslední objednávky
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +299,Debit To account must be a Balance Sheet account,Debetní Na účet musí být účtu Rozvaha
 DocType: Buying Settings,Naming Series,Číselné řady
 DocType: Leave Block List,Leave Block List Name,Nechte Jméno Block List
@@ -3646,7 +3496,7 @@
 DocType: Notification Control,Sales Invoice Message,Prodejní faktury Message
 DocType: Authorization Rule,Based On,Založeno na
 DocType: Sales Order Item,Ordered Qty,Objednáno Množství
-apps/erpnext/erpnext/stock/doctype/item/item.py +539,Item {0} is disabled,Položka {0} je zakázána
+apps/erpnext/erpnext/stock/doctype/item/item.py +543,Item {0} is disabled,Položka {0} je zakázána
 DocType: Stock Settings,Stock Frozen Upto,Reklamní Frozen aľ
 apps/erpnext/erpnext/controllers/recurring_document.py +166,Period From and Period To dates mandatory for recurring {0},"Období od a období, k datům povinné pro opakované {0}"
 apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,Projektová činnost / úkol.
@@ -3656,7 +3506,6 @@
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,Sleva musí být menší než 100
 DocType: ToDo,Low,Nízké
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Odepsat Částka (Company měny)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +71,Spinning,Spinning
 DocType: Landed Cost Voucher,Landed Cost Voucher,Přistálo Náklady Voucher
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +55,Please set {0},Prosím nastavte {0}
 DocType: Purchase Invoice,Repeat on Day of Month,Opakujte na den v měsíci
@@ -3678,7 +3527,6 @@
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +37,Campaign Name is required,Je zapotřebí Název kampaně
 DocType: Maintenance Visit,Maintenance Date,Datum údržby
 DocType: Purchase Receipt Item,Rejected Serial No,Odmítnuté sériové číslo
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +51,Deep drawing,Hluboké tažení
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +40,New Newsletter,New Newsletter
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +157,Start date should be less than end date for Item {0},Datum zahájení by měla být menší než konečné datum pro bod {0}
 apps/erpnext/erpnext/stock/doctype/item/item.js +17,Show Balance,Show Balance
@@ -3689,7 +3537,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +119,BOM and Manufacturing Quantity are required,BOM a výroba množství jsou povinné
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Stárnutí rozsah 2
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +450,Amount,Částka
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +147,Riveting,Nýtování
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,BOM nahradil
 ,Sales Analytics,Prodejní Analytics
 DocType: Manufacturing Settings,Manufacturing Settings,Výrobní nastavení
@@ -3701,20 +3548,19 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +207,New Account Name,Nový název účtu
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,Dodává se nákladů na suroviny
 DocType: Selling Settings,Settings for Selling Module,Nastavení pro prodej Module
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +73,Customer Service,Služby zákazníkům
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Customer Service,Služby zákazníkům
 DocType: Item,Thumbnail,Thumbnail
 DocType: Item Customer Detail,Item Customer Detail,Položka Detail Zákazník
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +147,Confirm Your Email,Potvrdit Váš e-mail
 apps/erpnext/erpnext/config/hr.py +53,Offer candidate a Job.,Nabídka kandidát Job.
 DocType: Notification Control,Prompt for Email on Submission of,Výzva pro e-mail na předkládání
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +81,Total allocated leaves are more than days in the period,Celkové přidělené listy jsou více než dnů v období
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +70,Item {0} must be a stock Item,Položka {0} musí být skladem
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,Výchozí práci ve skladu Progress
 apps/erpnext/erpnext/config/accounts.py +107,Default settings for accounting transactions.,Výchozí nastavení účetních transakcí.
 apps/frappe/frappe/model/naming.py +40,{0} is required,{0} je vyžadováno
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +21,Vacuum molding,Vakuové tváření
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,Očekávané datum nemůže být před Materiál Poptávka Datum
 DocType: Contact Us Settings,City,Město
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +132,Ultrasonic machining,Ultrazvukové obrábění
 apps/frappe/frappe/templates/base.html +137,Error: Not a valid id?,Chyba: Není platný id?
 apps/erpnext/erpnext/stock/get_item_details.py +125,Item {0} must be a Sales Item,Bod {0} musí být prodejní položky
 DocType: Naming Series,Update Series Number,Aktualizace Series Number
@@ -3722,7 +3568,7 @@
 DocType: Sales Order,Printing Details,Tisk detailů
 DocType: Task,Closing Date,Uzávěrka Datum
 DocType: Sales Order Item,Produced Quantity,Produkoval Množství
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +84,Engineer,Inženýr
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Engineer,Inženýr
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,Vyhledávání Sub Assemblies
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +379,Item Code required at Row No {0},Kód položky třeba na řádku č {0}
 DocType: Sales Partner,Partner Type,Partner Type
@@ -3730,7 +3576,7 @@
 DocType: Authorization Rule,Customerwise Discount,Sleva podle zákazníka
 DocType: Purchase Invoice,Against Expense Account,Proti výdajového účtu
 DocType: Production Order,Production Order,Výrobní Objednávka
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +258,Installation Note {0} has already been submitted,Poznámka k instalaci {0} již byla odeslána
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +263,Installation Note {0} has already been submitted,Poznámka k instalaci {0} již byla odeslána
 DocType: Quotation Item,Against Docname,Proti Docname
 DocType: SMS Center,All Employee (Active),Všichni zaměstnanci (Aktivní)
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,Zobrazit nyní
@@ -3739,19 +3585,19 @@
 DocType: Item,Re-Order Level,Re-Order Level
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,"Zadejte položky a plánované ks, pro které chcete získat zakázky na výrobu, nebo stáhnout suroviny pro analýzu."
 apps/frappe/frappe/public/js/frappe/views/ganttview.js +45,Gantt Chart,Pruhový diagram
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +57,Part-time,Part-time
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,Part-time,Part-time
 DocType: Employee,Applicable Holiday List,Použitelný Seznam Svátků
 DocType: Employee,Cheque,Šek
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,Řada Aktualizováno
 apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Report Type is mandatory,Report Type je povinné
 DocType: Item,Serial Number Series,Sériové číslo Series
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},Sklad je povinný pro skladovou položku {0} na řádku {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +45,Retail & Wholesale,Maloobchod a velkoobchod
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,Maloobchod a velkoobchod
 DocType: Issue,First Responded On,Prvně odpovězeno dne
 DocType: Website Item Group,Cross Listing of Item in multiple groups,Cross Výpis zboží v několika skupinách
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +351,The First User: You,První Uživatel: Vy
+apps/erpnext/erpnext/public/js/setup_wizard.js +101,The First User: You,První Uživatel: Vy
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +48,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},Datum zahájení a  Datum ukončení Fiskálního roku jsou již stanoveny ve fiskálním roce {0}
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +172,Successfully Reconciled,Úspěšně smířeni
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +119,Successfully Reconciled,Úspěšně smířeni
 DocType: Production Order,Planned End Date,Plánované datum ukončení
 apps/erpnext/erpnext/config/stock.py +43,Where items are stored.,"Tam, kde jsou uloženy předměty."
 DocType: Tax Rule,Validity,Doba platnosti
@@ -3771,39 +3617,36 @@
 DocType: DocPerm,Level,Úroveň
 DocType: Purchase Taxes and Charges,On Net Total,On Net Celkem
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +160,Target warehouse in row {0} must be same as Production Order,Target sklad v řádku {0} musí být stejná jako výrobní zakázky
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +59,No permission to use Payment Tool,Nemáte oprávnění k použití platební nástroj
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +97,No permission to use Payment Tool,Nemáte oprávnění k použití platební nástroj
 apps/erpnext/erpnext/controllers/recurring_document.py +192,'Notification Email Addresses' not specified for recurring %s,"""E-mailové adresy pro oznámení"" nejsou uvedeny pro opakující se %s"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +86,Milling,Frézování
 apps/erpnext/erpnext/accounts/doctype/account/account.py +99,Currency can not be changed after making entries using some other currency,Měna nemůže být změněn po provedení položky pomocí jiné měně
 DocType: Company,Round Off Account,Zaokrouhlovací účet
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +60,Nibbling,Okusování
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,Administrativní náklady
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +18,Consulting,Consulting
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +18,Consulting,Consulting
 DocType: Customer Group,Parent Customer Group,Parent Customer Group
 apps/erpnext/erpnext/public/js/pos/pos.js +429,Change,Změna
 DocType: Purchase Invoice,Contact Email,Kontaktní e-mail
 DocType: Appraisal Goal,Score Earned,Skóre Zasloužené
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +393,"e.g. ""My Company LLC""","např ""My Company LLC """
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +173,Notice Period,Výpovědní Lhůta
+apps/erpnext/erpnext/public/js/setup_wizard.js +141,"e.g. ""My Company LLC""","např ""My Company LLC """
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +173,Notice Period,Výpovědní Lhůta
 DocType: Bank Reconciliation Detail,Voucher ID,Voucher ID
 apps/erpnext/erpnext/setup/doctype/territory/territory.js +14,This is a root territory and cannot be edited.,To je kořen území a nelze upravovat.
 DocType: Packing Slip,Gross Weight UOM,Hrubá Hmotnost UOM
 DocType: Email Digest,Receivables / Payables,Pohledávky / Závazky
 DocType: Delivery Note Item,Against Sales Invoice,Proti prodejní faktuře
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +63,Stamping,Lisování
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +457,Credit Account,Úvěrový účet
 DocType: Landed Cost Item,Landed Cost Item,Přistálo nákladovou položkou
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +56,Show zero values,Ukázat nulové hodnoty
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,Množství položky získané po výrobě / přebalení z daných množství surovin
 DocType: Payment Reconciliation,Receivable / Payable Account,Pohledávky / závazky účet
 DocType: Delivery Note Item,Against Sales Order Item,Proti položce přijaté objednávky
-apps/erpnext/erpnext/stock/doctype/item/item.py +521,Please specify Attribute Value for attribute {0},Uveďte prosím atributu Hodnota atributu {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +525,Please specify Attribute Value for attribute {0},Uveďte prosím atributu Hodnota atributu {0}
 DocType: Item,Default Warehouse,Výchozí Warehouse
 DocType: Task,Actual End Date (via Time Logs),Skutečné Datum ukončení (přes Time Záznamy)
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +37,Budget cannot be assigned against Group Account {0},Rozpočet nemůže být přiřazena na skupinový účet {0}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +23,Please enter parent cost center,"Prosím, zadejte nákladové středisko mateřský"
 DocType: Delivery Note,Print Without Amount,Tisknout bez Částka
-apps/erpnext/erpnext/controllers/buying_controller.py +69,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,"Daň z kategorie nemůže být ""Ocenění"" nebo ""Ocenění a celkový"", protože všechny položky jsou běžně skladem"
+apps/erpnext/erpnext/controllers/buying_controller.py +60,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,"Daň z kategorie nemůže být ""Ocenění"" nebo ""Ocenění a celkový"", protože všechny položky jsou běžně skladem"
 DocType: User,Last Name,Příjmení
 DocType: Web Page,Left,Zbývá
 DocType: Event,All Day,Celý den
@@ -3811,7 +3654,7 @@
 DocType: Appraisal,Total Score (Out of 5),Celkové skóre (Out of 5)
 DocType: Contact Us Settings,State,Stav
 DocType: Batch,Batch,Šarže
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +51,Balance,Zůstatek
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +28,Balance,Zůstatek
 DocType: Project,Total Expense Claim (via Expense Claims),Total Expense Claim (via Expense nároků)
 DocType: User,Gender,Pohlaví
 DocType: Journal Entry,Debit Note,Debit Note
@@ -3841,8 +3684,7 @@
 DocType: Purchase Order,Get Last Purchase Rate,Získejte posledního nákupu Cena
 DocType: Time Log,Billing Rate based on Activity Type (per hour),Účtovaná sazba založená na typ aktivity (za hodinu)
 DocType: Company,Company Info,Společnost info
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +76,Seaming,Sešívání
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +197,"Company Email ID not found, hence mail not sent","Společnost E-mail ID nebyl nalezen, proto pošta neodeslána"
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +206,"Company Email ID not found, hence mail not sent","Společnost E-mail ID nebyl nalezen, proto pošta neodeslána"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Aplikace fondů (aktiv)
 DocType: Production Planning Tool,Filter based on item,Filtr dle položek
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +451,Debit Account,Debetní účet
@@ -3854,17 +3696,16 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +95,{0} {1} has been modified. Please refresh.,{0} {1} byl změněn. Prosím aktualizujte.
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,Přestaňte uživatelům provádět Nechat aplikací v následujících dnech.
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +591,From Opportunity,Od Opportunity
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +46,Blanking,Zaclonění
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +166,Employee Benefits,Zaměstnanecké benefity
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,Employee Benefits,Zaměstnanecké benefity
 DocType: Sales Invoice,Is POS,Je POS
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +240,Packed quantity must equal quantity for Item {0} in row {1},Balíčky množství se musí rovnat množství pro položku {0} v řadě {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +245,Packed quantity must equal quantity for Item {0} in row {1},Balíčky množství se musí rovnat množství pro položku {0} v řadě {1}
 DocType: Production Order,Manufactured Qty,Vyrobeno Množství
 DocType: Purchase Receipt Item,Accepted Quantity,Schválené Množství
 apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} neexistuje
 apps/erpnext/erpnext/config/accounts.py +18,Bills raised to Customers.,Směnky vznesené zákazníkům.
 DocType: DocField,Default,Výchozí
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,ID projektu
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +466,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},"Řádek č {0}: Částka nemůže být větší než Čekající Částka proti Expense nároku {1}. Do doby, než množství je {2}"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +468,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},"Řádek č {0}: Částka nemůže být větší než Čekající Částka proti Expense nároku {1}. Do doby, než množství je {2}"
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +40,{0} subscribers added,{0} odběratelé přidáni
 DocType: Maintenance Schedule,Schedule,Plán
 DocType: Cost Center,"Define Budget for this Cost Center. To set budget action, see ""Company List""","Definovat rozpočtu pro tento nákladového střediska. Chcete-li nastavit rozpočet akce, viz &quot;Seznam firem&quot;"
@@ -3875,7 +3716,7 @@
 apps/erpnext/erpnext/public/js/pos/pos.js +91,Price List not found or disabled,Ceník nebyl nalezen nebo zakázán
 DocType: Expense Claim,Approved,Schválený
 DocType: Pricing Rule,Price,Cena
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +79,Employee relieved on {0} must be set as 'Left',"Zaměstnanec úlevu na {0} musí být nastaven jako ""Left"""
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +88,Employee relieved on {0} must be set as 'Left',"Zaměstnanec úlevu na {0} musí být nastaven jako ""Left"""
 DocType: Item,"Selecting ""Yes"" will give a unique identity to each entity of this item which can be viewed in the Serial No master.","Výběrem ""Yes"" dá jedinečnou identitu každého subjektu této položky, které lze zobrazit v sériové číslo mistra."
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +39,Appraisal {0} created for Employee {1} in the given date range,Posouzení {0} vytvořil pro zaměstnance {1} v daném časovém období
 DocType: Employee,Education,Vzdělání
@@ -3886,7 +3727,7 @@
 apps/frappe/frappe/desk/moduleview.py +67,Standard Reports,Standardní výpisy
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,Zápisy v účetním deníku.
 DocType: Delivery Note Item,Available Qty at From Warehouse,K dispozici Množství na Od Warehouse
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +209,Please select Employee Record first.,"Prosím, vyberte zaměstnance záznam první."
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +224,Please select Employee Record first.,"Prosím, vyberte zaměstnance záznam první."
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Řádek {0}: Party / Account neshoduje s {1} / {2} do {3} {4}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +35,To create a Tax Account,Chcete-li vytvořit daňovém účtu
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +233,Please enter Expense Account,"Prosím, zadejte výdajového účtu"
@@ -3899,46 +3740,43 @@
 DocType: Sales Order,Track this Sales Order against any Project,Sledovat tento prodejní objednávky na jakýkoli projekt
 DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,"Prodejní Pull zakázky (čeká dodat), na základě výše uvedených kritérií"
 DocType: DocShare,Document Type,Typ dokumentu
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +565,From Supplier Quotation,Z nabídky dodavatele
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +588,From Supplier Quotation,Z nabídky dodavatele
 DocType: Deduction Type,Deduction Type,Odpočet Type
 DocType: Attendance,Half Day,Půl den
 DocType: Pricing Rule,Min Qty,Min Množství
 DocType: Features Setup,"To track items in sales and purchase documents with batch nos. ""Preferred Industry: Chemicals""",Chcete-li sledovat položky v oblasti prodeje a nákupních dokladech s čísly šarží. &quot;Výhodné Průmysl: Chemicals&quot;
 DocType: GL Entry,Transaction Date,Transakce Datum
 DocType: Production Plan Item,Planned Qty,Plánované Množství
-apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +91,Total Tax,Total Tax
+apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +93,Total Tax,Total Tax
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +178,For Quantity (Manufactured Qty) is mandatory,Pro Množství (Vyrobeno ks) je povinné
 DocType: Stock Entry,Default Target Warehouse,Výchozí Target Warehouse
 DocType: Purchase Invoice,Net Total (Company Currency),Net Total (Company Měna)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +79,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Řádek {0}: Typ Party Party a je použitelná pouze proti pohledávky / závazky účtu
 DocType: Notification Control,Purchase Receipt Message,Zpráva příjemky
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +95,Total allocated leaves are more than period,Celkem přidělené listy jsou více než období
 DocType: Production Order,Actual Start Date,Skutečné datum zahájení
 DocType: Sales Order,% of materials delivered against this Sales Order,% materiálů doručeno proti této prodejní objednávce
 apps/erpnext/erpnext/config/stock.py +23,Record item movement.,Záznam pohybu položka.
 DocType: Newsletter List Subscriber,Newsletter List Subscriber,Newsletter seznamu účastníků
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +164,Morticing,Dlabačky
 DocType: Email Account,Service,Služba
 DocType: Hub Settings,Hub Settings,Nastavení Hub
 DocType: Project,Gross Margin %,Hrubá Marže %
 DocType: BOM,With Operations,S operacemi
 apps/erpnext/erpnext/accounts/party.py +232,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,"Položky účetnictví již byly provedeny v měně, {0} pro firmu {1}. Vyberte pohledávky a závazku účet s měnou {0}."
 ,Monthly Salary Register,Měsíční plat Register
-apps/frappe/frappe/website/template.py +140,Next,Další
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard_page.html +17,Next,Další
 DocType: Warranty Claim,If different than customer address,Pokud se liší od adresy zákazníka
 DocType: BOM Operation,BOM Operation,BOM Operation
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +118,Electropolishing,Elektrolytické
 DocType: Purchase Taxes and Charges,On Previous Row Amount,Na předchozí řady Částka
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +24,Please enter Payment Amount in atleast one row,"Prosím, zadejte částku platby aspoň jedné řadě"
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +33,Please enter Payment Amount in atleast one row,"Prosím, zadejte částku platby aspoň jedné řadě"
 DocType: POS Profile,POS Profile,POS Profile
 apps/erpnext/erpnext/config/accounts.py +153,"Seasonality for setting budgets, targets etc.","Sezónnost pro nastavení rozpočtů, cíle atd."
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +238,Row {0}: Payment Amount cannot be greater than Outstanding Amount,Row {0}: Platba Částka nesmí být vyšší než dlužná částka
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +46,Total Unpaid,Celkem Neplacené
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +21,Time Log is not billable,Time Log není zúčtovatelné
 apps/erpnext/erpnext/stock/get_item_details.py +128,"Item {0} is a template, please select one of its variants","Položka {0} je šablona, ​​prosím vyberte jednu z jeho variant"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +528,Purchaser,Kupec
+apps/erpnext/erpnext/public/js/setup_wizard.js +272,Purchaser,Kupec
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +81,Net pay cannot be negative,Net plat nemůže být záporný
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +71,Please enter the Against Vouchers manually,Zadejte prosím podle dokladů ručně
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +107,Please enter the Against Vouchers manually,Zadejte prosím podle dokladů ručně
 DocType: SMS Settings,Static Parameters,Statické parametry
 DocType: Purchase Order,Advance Paid,Vyplacené zálohy
 DocType: Item,Item Tax,Daň Položky
@@ -3947,14 +3785,12 @@
 apps/erpnext/erpnext/config/crm.py +48,Send mass SMS to your contacts,Posílat hromadné SMS vašim kontaktům
 DocType: Purchase Taxes and Charges,Consider Tax or Charge for,Zvažte daň či poplatek za
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,Skutečné Množství je povinné
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +42,Cross-rolling,Cross-válcování
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +132,Credit Card,Kreditní karta
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +132,Credit Card,Kreditní karta
 DocType: BOM,Item to be manufactured or repacked,Položka být vyráběn nebo znovu zabalena
 apps/erpnext/erpnext/config/stock.py +95,Default settings for stock transactions.,Výchozí nastavení pro akciových transakcí.
 DocType: Purchase Invoice,Next Date,Další data
 DocType: Employee Education,Major/Optional Subjects,Hlavní / Volitelné předměty
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +49,Please enter Taxes and Charges,"Prosím, zadejte Daně a poplatky"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +85,Machining,Obrábění
 DocType: Sales Invoice Item,Drop Ship,Drop Loď
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","Zde si můžete udržovat rodinné detailů, jako jsou jméno a povolání rodičem, manželem a dětmi"
 DocType: Hub Settings,Seller Name,Prodejce Name
@@ -3964,7 +3800,7 @@
 DocType: Stock Entry,Repack,Přebalit
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +6,You must Save the form before proceeding,Musíte Uložte formulář před pokračováním
 DocType: Item Attribute,Numeric Values,Číselné hodnoty
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +500,Attach Logo,Připojit Logo
+apps/erpnext/erpnext/public/js/setup_wizard.js +246,Attach Logo,Připojit Logo
 DocType: Customer,Commission Rate,Výše provize
 apps/erpnext/erpnext/stock/doctype/item/item.js +38,Make Variant,Udělat Variant
 apps/erpnext/erpnext/config/hr.py +145,Block leave applications by department.,Aplikace Block dovolené podle oddělení.
@@ -3979,19 +3815,19 @@
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +105,Please select a csv file,Vyberte soubor csv
 DocType: Dropbox Backup,Send Backups to Dropbox,Poslat zálohy na Dropbox
 DocType: Purchase Order,To Receive and Bill,Přijímat a Bill
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +94,Designer,Návrhář
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Designer,Návrhář
 apps/erpnext/erpnext/config/selling.py +121,Terms and Conditions Template,Podmínky Template
 DocType: Serial No,Delivery Details,Zasílání
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +383,Cost Center is required in row {0} in Taxes table for type {1},Nákladové středisko je nutné v řadě {0} na daních tabulka typu {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +386,Cost Center is required in row {0} in Taxes table for type {1},Nákladové středisko je nutné v řadě {0} na daních tabulka typu {1}
 DocType: Item,Automatically create Material Request if quantity falls below this level,"Automatické vytvoření Materiál žádosti, pokud množství klesne pod tuto úroveň"
 ,Item-wise Purchase Register,Item-moudrý Nákup Register
 DocType: Batch,Expiry Date,Datum vypršení platnosti
-apps/erpnext/erpnext/stock/doctype/item/item.py +375,"To set reorder level, item must be a Purchase Item or Manufacturing Item","Chcete-li nastavit úroveň objednací, položka musí být Nákup položka nebo výrobní položky"
+apps/erpnext/erpnext/stock/doctype/item/item.py +379,"To set reorder level, item must be a Purchase Item or Manufacturing Item","Chcete-li nastavit úroveň objednací, položka musí být Nákup položka nebo výrobní položky"
 ,Supplier Addresses and Contacts,Dodavatel Adresy a kontakty
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,Nejdřív vyberte kategorii
 apps/erpnext/erpnext/config/projects.py +18,Project master.,Master Project.
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,Nevykazují žádný symbol jako $ atd vedle měnám.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +330, (Half Day),(půlden)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +374, (Half Day),(půlden)
 DocType: Supplier,Credit Days,Úvěrové dny
 DocType: Leave Type,Is Carry Forward,Je převádět
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +478,Get Items from BOM,Získat předměty z BOM
@@ -3999,7 +3835,7 @@
 apps/erpnext/erpnext/config/manufacturing.py +120,Bill of Materials,Kusovník
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +77,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Řádek {0}: Typ Party Party a je nutné pro pohledávky / závazky na účtu {1}
 DocType: Dropbox Backup,Send Notifications To,Odeslat upozornění
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html +26,Ref Date,Ref Datum
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +54,Ref Date,Ref Datum
 DocType: Employee,Reason for Leaving,Důvod Leaving
 DocType: Expense Claim Detail,Sanctioned Amount,Sankcionována Částka
 DocType: GL Entry,Is Opening,Se otevírá
@@ -4007,4 +3843,3 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +188,Account {0} does not exist,Účet {0} neexistuje
 DocType: Account,Cash,V hotovosti
 DocType: Employee,Short biography for website and other publications.,Krátký životopis na internetové stránky a dalších publikací.
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +31,Please create Salary Structure for employee {0},Prosím vytvořte platovou strukturu pro zaměstnance {0}
diff --git a/erpnext/translations/da-DK.csv b/erpnext/translations/da-DK.csv
index a80e4ca..1e92a92 100644
--- a/erpnext/translations/da-DK.csv
+++ b/erpnext/translations/da-DK.csv
@@ -1,631 +1,76 @@
-DocType: Employee,Salary Mode,Løn-tilstand
-DocType: Cost Center,"Select Monthly Distribution, if you want to track based on seasonality.","Vælg Månedlig Distribution, hvis du ønsker at spore baseret på sæsonudsving."
-DocType: Employee,Divorced,Skilt
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +86,Warning: Same item has been entered multiple times.,Advarsel: Samme element er indtastet flere gange.
-apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +96,Items already synced,Varer allerede synkroniseret
-apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,"Annuller Materiale Besøg {0}, før den annullerer denne garanti krav"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +19,Consumer Products,Forbrugerprodukter
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +68,Please select Party Type first,Vælg Party Type først
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +90,Annealing,Annealing
-DocType: Item,Customer Items,Kunde Varer
-apps/erpnext/erpnext/accounts/doctype/account/account.py +45,Account {0}: Parent account {1} can not be a ledger,Konto {0}: Forældre-konto {1} kan ikke være en finanskonto
-DocType: Item,Publish Item to hub.erpnext.com,Udgive Vare til hub.erpnext.com
-apps/erpnext/erpnext/config/setup.py +93,Email Notifications,E-mail-meddelelser
-DocType: Item,Default Unit of Measure,Standard Måleenhed
-DocType: SMS Center,All Sales Partner Contact,Alle Sales Partner Kontakt
-DocType: Employee,Leave Approvers,Lad godkendere
-DocType: Sales Partner,Dealer,Forhandler
-DocType: Employee,Rented,Lejet
-DocType: About Us Settings,Website,Websted
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +23,Compaction plus sintering,Komprimering plus sintring
-apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,Currency is required for Price List {0},Valuta er nødvendig for prisliste {0}
-DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Vil blive beregnet i transaktionen.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +549,From Material Request,Fra Material Request
-apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} Tree
-DocType: Job Applicant,Job Applicant,Job Ansøger
-apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,Ikke flere resultater.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +78,Legal,Juridisk
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +114,Actual type tax cannot be included in Item rate in row {0},"Faktiske type skat, kan ikke indgå i Item sats i række {0}"
-DocType: C-Form,Customer,Kunde
-DocType: Purchase Receipt Item,Required By,Kræves By
-DocType: Delivery Note,Return Against Delivery Note,Retur Against følgeseddel
-DocType: Department,Department,Afdeling
-DocType: Purchase Order,% Billed,% Billed
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate must be same as {0} {1} ({2}),Exchange Rate skal være samme som {0} {1} ({2})
-DocType: Sales Invoice,Customer Name,Customer Name
-DocType: Features Setup,"All export related fields like currency, conversion rate, export total, export grand total etc are available in Delivery Note, POS, Quotation, Sales Invoice, Sales Order etc.","Alle eksport relaterede områder som valuta, konverteringsfrekvens, eksport i alt, eksport grand total etc er tilgængelige i Delivery Note, POS, Citat, Sales Invoice, Sales Order etc."
-DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,Hoveder (eller grupper) mod hvilken regnskabsposter er lavet og balancer opretholdes.
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +177,Outstanding for {0} cannot be less than zero ({1}),Enestående for {0} kan ikke være mindre end nul ({1})
-DocType: Manufacturing Settings,Default 10 mins,Standard 10 min
-DocType: Leave Type,Leave Type Name,Lad Type Navn
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +148,Series Updated Successfully,Series opdateret
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +150,Stitching,Syning
-DocType: Pricing Rule,Apply On,Påfør On
-DocType: Item Price,Multiple Item prices.,Flere Item priser.
-,Purchase Order Items To Be Received,"Købsordre, der modtages"
-DocType: SMS Center,All Supplier Contact,Alle Leverandør Kontakt
-DocType: Quality Inspection Reading,Parameter,Parameter
-apps/erpnext/erpnext/projects/doctype/project/project.py +43,Expected End Date can not be less than Expected Start Date,Forventet Slutdato kan ikke være mindre end forventet startdato
-apps/erpnext/erpnext/utilities/transaction_base.py +104,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Row # {0}: Pris skal være samme som {1}: {2} ({3} / {4})
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +189,New Leave Application,Ny Leave Application
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +134,Bank Draft,Bank Draft
-DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,1. For at bevare kunden kloge post kode og gøre dem søgbare baseret på deres kode brug denne mulighed
-DocType: Mode of Payment Account,Mode of Payment Account,Mode Betalingskonto
-apps/erpnext/erpnext/stock/doctype/item/item.js +34,Show Variants,Vis varianter
-DocType: Sales Invoice Item,Quantity,Mængde
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),Lån (passiver)
-DocType: Employee Education,Year of Passing,År for Passing
-apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,På lager
-DocType: Designation,Designation,Betegnelse
-DocType: Production Plan Item,Production Plan Item,Produktion Plan Vare
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +141,User {0} is already assigned to Employee {1},Bruger {0} er allerede tildelt Medarbejder {1}
-apps/erpnext/erpnext/accounts/page/pos/pos_page.html +13,Make new POS Profile,Foretag ny POS profil
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +31,Health Care,Health Care
-DocType: Purchase Invoice,Monthly,Månedlig
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +494,Invoice,Faktura
-DocType: Maintenance Schedule Item,Periodicity,Hyppighed
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +357,Email Address,E-mail-adresse
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +21,Defense,Forsvar
-DocType: Company,Abbr,Fork
-DocType: Appraisal Goal,Score (0-5),Score (0-5)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +193,Row {0}: {1} {2} does not match with {3},Række {0}: {1} {2} ikke passer med {3}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +67,Row # {0}:,Row # {0}:
-DocType: Delivery Note,Vehicle No,Vehicle Ingen
-apps/erpnext/erpnext/public/js/pos/pos.js +528,Please select Price List,Vælg venligst prislisten
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +162,Woodworking,Træbearbejdning
-DocType: Production Order Operation,Work In Progress,Work In Progress
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +153,3D printing,3D-print
-DocType: Employee,Holiday List,Holiday List
-DocType: Time Log,Time Log,Time Log
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +530,Accountant,Revisor
-DocType: Cost Center,Stock User,Stock Bruger
-DocType: Company,Phone No,Telefon Nej
-DocType: Time Log,"Log of Activities performed by users against Tasks that can be used for tracking time, billing.","Log af aktiviteter udført af brugere mod Opgaver, der kan bruges til sporing af tid, fakturering."
-apps/erpnext/erpnext/controllers/recurring_document.py +127,New {0}: #{1},Ny {0}: # {1}
-,Sales Partners Commission,Salg Partners Kommissionen
-apps/erpnext/erpnext/setup/doctype/company/company.py +32,Abbreviation cannot have more than 5 characters,Forkortelse kan ikke have mere end 5 tegn
-DocType: Print Settings,Classic,Klassisk
-apps/erpnext/erpnext/accounts/doctype/account/account.js +27,This is a root account and cannot be edited.,Dette er en rod-konto og kan ikke redigeres.
-DocType: BOM,Operations,Operationer
-apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +38,Cannot set authorization on basis of Discount for {0},Kan ikke sætte godkendelse på grundlag af Rabat for {0}
-DocType: Bin,Quantity Requested for Purchase,"Mængde, der ansøges for Indkøb"
-DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name","Vedhæfte .csv fil med to kolonner, en for det gamle navn og et til det nye navn"
-DocType: Packed Item,Parent Detail docname,Parent Detail docname
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Kg,Kg
-apps/erpnext/erpnext/config/hr.py +48,Opening for a Job.,Åbning for et job.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +6,Advertising,Reklame
-DocType: Employee,Married,Gift
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +389,Stock cannot be updated against Delivery Note {0},Stock kan ikke opdateres mod følgeseddel {0}
-DocType: Payment Reconciliation,Reconcile,Forene
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +30,Grocery,Købmand
-DocType: Quality Inspection Reading,Reading 1,Læsning 1
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Make Bank Entry,Make Bank indtastning
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +40,Pension Funds,Pensionskasserne
-apps/erpnext/erpnext/accounts/doctype/account/account.py +142,Warehouse is mandatory if account type is Warehouse,"Warehouse er obligatorisk, hvis kontotype er Warehouse"
-DocType: SMS Center,All Sales Person,Alle Sales Person
-DocType: Lead,Person Name,Person Name
-DocType: Sales Order,"Check if recurring order, uncheck to stop recurring or put proper End Date","Kontroller, om tilbagevendende orden, skal du fjerne markeringen for at stoppe tilbagevendende eller sætte ordentlig Slutdato"
-DocType: Sales Invoice Item,Sales Invoice Item,Salg Faktura Vare
-DocType: Account,Credit,Credit
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +25,Please setup Employee Naming System in Human Resource > HR Settings,Venligst setup Medarbejder navnesystem i Human Resource&gt; HR-indstillinger
-DocType: POS Profile,Write Off Cost Center,Skriv Off Cost center
-DocType: Warehouse,Warehouse Detail,Warehouse Detail
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +181,Credit limit has been crossed for customer {0} {1}/{2},Credit grænsen er krydset for kunde {0} {1} / {2}
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +141,You are not authorized to add or update entries before {0},Du er ikke autoriseret til at tilføje eller opdatere poster før {0}
-DocType: Item,Item Image (if not slideshow),Item Billede (hvis ikke lysbilledshow)
-apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,En Kunden eksisterer med samme navn
-DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(Timesats / 60) * TidsforbrugIMinutter
-DocType: SMS Log,SMS Log,SMS Log
-apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,Omkostninger ved Leverede varer
-DocType: Blog Post,Guest,Gæst
-DocType: Quality Inspection,Get Specification Details,Få Specifikation Detaljer
-DocType: Lead,Interested,Interesseret
-apps/erpnext/erpnext/config/manufacturing.py +14,Bill of Material,Bill of Material
-apps/erpnext/erpnext/public/js/stock_analytics.js +45,Opening,Åbning
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},Fra {0} til {1}
-DocType: Item,Copy From Item Group,Kopier fra Item Group
-DocType: Journal Entry,Opening Entry,Åbning indtastning
-apps/frappe/frappe/email/doctype/email_account/email_account.py +58,{0} is mandatory,{0} er obligatorisk
-apps/erpnext/erpnext/accounts/doctype/account/account.py +113,Account with existing transaction can not be converted to group.,Konto med eksisterende transaktion kan ikke konverteres til gruppen.
-DocType: Lead,Product Enquiry,Produkt Forespørgsel
-DocType: Standard Reply,Owner,Ejer
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +13,Please enter company first,Indtast venligst selskab først
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Company first,Vælg venligst Company først
-DocType: Employee Education,Under Graduate,Under Graduate
-apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +22,Target On,Target On
-DocType: BOM,Total Cost,Total Cost
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +99,Reaming,Rivning
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +9,Activity Log:,Aktivitet Log:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +199,Item {0} does not exist in the system or has expired,Vare {0} findes ikke i systemet eller er udløbet
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +44,Real Estate,Real Estate
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +4,Statement of Account,Kontoudtog
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +41,Pharmaceuticals,Lægemidler
-DocType: Expense Claim Detail,Claim Amount,Krav Beløb
-DocType: Employee,Mr,Hr
-DocType: Custom Script,Client,Klient
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,Leverandør Type / leverandør
-DocType: Naming Series,Prefix,Præfiks
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Consumable,Forbrugsmaterialer
-DocType: Upload Attendance,Import Log,Import Log
-apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.js +19,Send,Sende
-DocType: SMS Center,All Contact,Alle Kontakt
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +164,Annual Salary,Årsløn
-DocType: Period Closing Voucher,Closing Fiscal Year,Lukning regnskabsår
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +69,Stock Expenses,Stock Udgifter
-DocType: Newsletter,Email Sent?,E-mail Sendt?
-DocType: Journal Entry,Contra Entry,Contra indtastning
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +92,Show Time Logs,Vis Time Logs
-DocType: Delivery Note,Installation Status,Installation status
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +115,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Accepteret + Afvist skal være lig med Modtaget mængde for vare {0}
-DocType: Item,Supply Raw Materials for Purchase,Supply råstoffer til Indkøb
-apps/erpnext/erpnext/stock/get_item_details.py +133,Item {0} must be a Purchase Item,Vare {0} skal være et køb Vare
-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","Download skabelon, fylde relevante data og vedhæfte den ændrede fil. Alle datoer og medarbejder kombination i den valgte periode vil komme i skabelonen, med eksisterende fremmøde optegnelser"
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +446,Item {0} is not active or end of life has been reached,Vare {0} er ikke aktiv eller slutningen af ​​livet er nået
-DocType: Time Log Batch,Will be updated after Sales Invoice is Submitted.,Vil blive opdateret efter Sales Invoice er indgivet.
-apps/erpnext/erpnext/controllers/accounts_controller.py +493,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Hvis du vil medtage skat i række {0} i Item sats, skatter i rækker {1} skal også medtages"
-apps/erpnext/erpnext/config/hr.py +90,Settings for HR Module,Indstillinger for HR modul
-DocType: SMS Center,SMS Center,SMS-center
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +78,Straightening,Opretning
-DocType: BOM Replace Tool,New BOM,Ny BOM
-apps/erpnext/erpnext/config/projects.py +28,Batch Time Logs for billing.,Batch Time Logs for fakturering.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +15,Countergravity casting,Countergravity støbning
-apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +30,Newsletter has already been sent,Nyhedsbrev er allerede blevet sendt
-DocType: Lead,Request Type,Anmodning Type
-DocType: Leave Application,Reason,Årsag
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +14,Broadcasting,Broadcasting
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +140,Execution,Udførelse
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +364,The first user will become the System Manager (you can change this later).,Den første bruger bliver System Manager (du kan ændre dette senere).
-apps/erpnext/erpnext/config/manufacturing.py +39,Details of the operations carried out.,Oplysninger om de gennemførte transaktioner.
-DocType: Serial No,Maintenance Status,Vedligeholdelse status
-apps/erpnext/erpnext/config/stock.py +263,Items and Pricing,Varer og Priser
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +37,From Date should be within the Fiscal Year. Assuming From Date = {0},Fra dato skal være inden regnskabsåret. Antages Fra dato = {0}
-DocType: Appraisal,Select the Employee for whom you are creating the Appraisal.,"Vælg Medarbejder, for hvem du opretter Vurdering."
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,Cost Center {0} does not belong to Company {1},Omkostningssted {0} ikke tilhører selskabet {1}
-DocType: Customer,Individual,Individuel
-apps/erpnext/erpnext/config/support.py +23,Plan for maintenance visits.,Plan for vedligeholdelse besøg.
-DocType: SMS Settings,Enter url parameter for message,Indtast url parameter for besked
-apps/erpnext/erpnext/config/selling.py +148,Rules for applying pricing and discount.,Regler for anvendelse af priser og rabat.
-apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +81,This Time Log conflicts with {0} for {1} {2},Denne tidslog konflikter med {0} for {1} {2}
-apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,Prisliste skal være gældende for at købe eller sælge
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +81,Installation date cannot be before delivery date for Item {0},Installation dato kan ikke være før leveringsdato for Item {0}
-DocType: Pricing Rule,Discount on Price List Rate (%),Rabat på prisliste Rate (%)
-apps/frappe/frappe/public/js/frappe/form/print.js +96,Start,Start
-DocType: User,First Name,Fornavn
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +12,Full-mold casting,Fuld formstøbning
-DocType: Offer Letter,Select Terms and Conditions,Vælg Betingelser
-DocType: Production Planning Tool,Sales Orders,Salgsordrer
-DocType: Purchase Taxes and Charges,Valuation,Værdiansættelse
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +17,Set as Default,Indstil som standard
-,Purchase Order Trends,Indkøbsordre Trends
-apps/erpnext/erpnext/config/hr.py +78,Allocate leaves for the year.,Afsætte blade for året.
-DocType: Earning Type,Earning Type,Optjening Type
-DocType: Manufacturing Settings,Disable Capacity Planning and Time Tracking,Deaktiver kapacitetsplanlægning og tidsregistrering
-DocType: Bank Reconciliation,Bank Account,Bankkonto
-DocType: Leave Type,Allow Negative Balance,Tillad Negativ Balance
-DocType: Selling Settings,Default Territory,Standard Territory
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +53,Television,Fjernsyn
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +138,Gashing,Gashing
-DocType: Production Order Operation,Updated via 'Time Log',Opdateret via &#39;Time Log&#39;
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +82,Account {0} does not belong to Company {1},Konto {0} tilhører ikke virksomheden {1}
-DocType: Naming Series,Series List for this Transaction,Serie Liste for denne transaktion
-DocType: Sales Invoice,Is Opening Entry,Åbner post
-DocType: Customer Group,Mention if non-standard receivable account applicable,"Nævne, hvis ikke-standard tilgodehavende konto gældende"
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +154,For Warehouse is required before Submit,"For Warehouse er nødvendig, før Indsend"
-DocType: Sales Partner,Reseller,Forhandler
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +41,Please enter Company,Indtast Company
-DocType: Delivery Note Item,Against Sales Invoice Item,Mod Sales Invoice Item
-,Production Orders in Progress,Produktionsordrer i Progress
-DocType: Lead,Address & Contact,Adresse og kontakt
-apps/erpnext/erpnext/controllers/recurring_document.py +206,Next Recurring {0} will be created on {1},Næste Tilbagevendende {0} vil blive oprettet på {1}
-DocType: Newsletter List,Total Subscribers,Total Abonnenter
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +575,Contact Name,Kontakt Navn
-DocType: Production Plan Item,SO Pending Qty,SO Afventer Antal
-DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Opretter lønseddel for ovennævnte kriterier.
-apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,Anmodning om køb.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +107,Double housing,Dobbelt hus
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +156,Only the selected Leave Approver can submit this Leave Application,Kun den valgte Leave Godkender kan indsende denne Leave Application
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,Lindre Dato skal være større end Dato for Sammenføjning
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +172,Leaves per Year,Blade pr år
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup > Settings > Naming Series,Du indstille Navngivning Series for {0} via Opsætning&gt; Indstillinger&gt; Navngivning Series
-DocType: Time Log,Will be updated when batched.,"Vil blive opdateret, når batched."
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +104,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,"Række {0}: Tjek venligst &quot;Er Advance &#39;mod konto {1}, hvis dette er et forskud post."
-apps/erpnext/erpnext/stock/utils.py +174,Warehouse {0} does not belong to company {1},Warehouse {0} ikke hører til virksomheden {1}
-DocType: Bulk Email,Message,Besked
-DocType: Item Website Specification,Item Website Specification,Item Website Specification
-DocType: Dropbox Backup,Dropbox Access Key,Dropbox adgangsnøgle
-DocType: Payment Tool,Reference No,Referencenummer
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +348,Leave Blocked,Lad Blokeret
-apps/erpnext/erpnext/stock/doctype/item/item.py +535,Item {0} has reached its end of life on {1},Vare {0} har nået slutningen af ​​sin levetid på {1}
-apps/erpnext/erpnext/accounts/utils.py +339,Annual,Årligt
-DocType: Stock Reconciliation Item,Stock Reconciliation Item,Stock Afstemning Item
-DocType: Stock Entry,Sales Invoice No,Salg faktura nr
-DocType: Material Request Item,Min Order Qty,Min prisen evt
-DocType: Lead,Do Not Contact,Må ikke komme i kontakt
-DocType: Sales Invoice,The unique id for tracking all recurring invoices. It is generated on submit.,Den unikke id til at spore alle tilbagevendende fakturaer. Det genereres på send.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +93,Software Developer,Software Developer
-DocType: Item,Minimum Order Qty,Minimum Antal
-DocType: Pricing Rule,Supplier Type,Leverandør Type
-DocType: Item,Publish in Hub,Offentliggør i Hub
-,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +555,Item {0} is cancelled,Vare {0} er aflyst
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +598,Material Request,Materiale Request
-DocType: Bank Reconciliation,Update Clearance Date,Opdatering Clearance Dato
-DocType: Item,Purchase Details,Køb Detaljer
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +323,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},Vare {0} ikke fundet i &quot;Raw Materials Leveres &#39;bord i Indkøbsordre {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +129,Wire brushing,Stålbørstning
-DocType: Employee,Relation,Relation
-apps/erpnext/erpnext/config/selling.py +23,Confirmed orders from Customers.,Bekræftede ordrer fra kunder.
-DocType: Purchase Receipt Item,Rejected Quantity,Afvist Mængde
-DocType: Features Setup,"Field available in Delivery Note, Quotation, Sales Invoice, Sales Order","Felt fås i Delivery Note, Citat, Sales Invoice, Sales Order"
-DocType: SMS Settings,SMS Sender Name,SMS Sender Name
-DocType: Contact,Is Primary Contact,Er Primær Kontaktperson
-DocType: Notification Control,Notification Control,Meddelelse Kontrol
-DocType: Lead,Suggestions,Forslag
-DocType: Territory,Set Item Group-wise budgets on this Territory. You can also include seasonality by setting the Distribution.,Set varegruppe-wise budgetter på denne Territory. Du kan også medtage sæsonudsving ved at indstille Distribution.
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +72,Please enter parent account group for warehouse {0},Indtast venligst forælder konto gruppe for lager {0}
-DocType: Supplier,Address HTML,Adresse HTML
-DocType: Lead,Mobile No.,Mobil No.
-DocType: Maintenance Schedule,Generate Schedule,Generer Schedule
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +81,Hubbing,Sænksmedning
-DocType: Purchase Invoice Item,Expense Head,Expense Hoved
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +86,Please select Charge Type first,Vælg Charge Type først
-apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,Seneste
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +395,Max 5 characters,Max 5 tegn
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +195,Select Your Language,Vælg dit sprog
-DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,"Den første Lad Godkender i listen, vil blive indstillet som standard Forlad Godkender"
-DocType: Manufacturing Settings,"Disables creation of time logs against Production Orders.
-Operations shall not be tracked against Production Order",Deaktiverer oprettelsen af ​​tid logs mod produktionsordrer. Operationer må ikke spores mod produktionsordre
-DocType: Accounts Settings,Settings for Accounts,Indstillinger for konti
-apps/erpnext/erpnext/config/crm.py +90,Manage Sales Person Tree.,Administrer Sales Person Tree.
-DocType: Item,Synced With Hub,Synkroniseret med Hub
-apps/erpnext/erpnext/setup/doctype/company/company.js +41,Wrong Password,Forkert Adgangskode
-DocType: Item,Variant Of,Variant af
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +34,Item {0} must be Service Item,Vare {0} skal være service Item
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +303,Completed Qty can not be greater than 'Qty to Manufacture',Afsluttet Antal kan ikke være større end &#39;antal til Fremstilling&#39;
-DocType: DocType,Administrator,Administrator
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +136,Laser drilling,Laserboring
-DocType: Stock UOM Replace Utility,New Stock UOM,New Stock UOM
-DocType: Period Closing Voucher,Closing Account Head,Lukning konto Hoved
-DocType: Employee,External Work History,Ekstern Work History
-apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,Cirkulær reference Fejl
-DocType: Communication,Closed,Lukket
-DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,"I Words (eksport) vil være synlig, når du gemmer følgesedlen."
-DocType: Lead,Industry,Industri
-DocType: Employee,Job Profile,Job profil
-DocType: Newsletter,Newsletter,Nyhedsbrev
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +84,Hydroforming,Hydroformning
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +49,Necking,Necking
-DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Give besked på mail om oprettelse af automatiske Materiale Request
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +51,Item is updated,Element er opdateret
-DocType: Async Task,System Manager,System Manager
-DocType: Payment Reconciliation Invoice,Invoice Type,Faktura type
-DocType: Sales Invoice Item,Delivery Note,Følgeseddel
-DocType: Dropbox Backup,Allow Dropbox Access,Tillad Dropbox Access
-apps/erpnext/erpnext/config/learn.py +72,Setting up Taxes,Opsætning Skatter
-apps/erpnext/erpnext/accounts/utils.py +189,Payment Entry has been modified after you pulled it. Please pull it again.,"Betaling indtastning er blevet ændret, efter at du trak det. Venligst trække det igen."
-apps/erpnext/erpnext/stock/doctype/item/item.py +343,{0} entered twice in Item Tax,{0} indtastet to gange i vareafgift
-DocType: Workstation,Rent Cost,Leje Omkostninger
-apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +74,Please select month and year,Vælg måned og år
-DocType: Purchase Invoice,"Enter email id separated by commas, invoice will be mailed automatically on particular date","Indtast email id adskilt af kommaer, vil faktura blive sendt automatisk på bestemt dato"
-DocType: Employee,Company Email,Firma Email
-DocType: Workflow State,Refresh,Opdater
-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.","Alle import- relaterede områder som valuta, konverteringsfrekvens, samlede import, import grand total etc er tilgængelige i købskvittering, leverandør Citat, købsfaktura, Indkøbsordre etc."
-apps/erpnext/erpnext/stock/doctype/item/item.js +33,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,"Dette element er en skabelon, og kan ikke anvendes i transaktioner. Item attributter kopieres over i varianterne medmindre &#39;Ingen Copy &quot;er indstillet"
-apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +69,Total Order Considered,Samlet Order Anses
-apps/erpnext/erpnext/config/hr.py +110,"Employee designation (e.g. CEO, Director etc.).","Medarbejder betegnelse (f.eks CEO, direktør osv.)"
-apps/erpnext/erpnext/controllers/recurring_document.py +199,Please enter 'Repeat on Day of Month' field value,Indtast &#39;Gentag på dag i måneden »felt værdi
-DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,"Hastighed, hvormed kunden Valuta omdannes til kundens basisvaluta"
-DocType: Features Setup,"Available in BOM, Delivery Note, Purchase Invoice, Production Order, Purchase Order, Purchase Receipt, Sales Invoice, Sales Order, Stock Entry, Timesheet","Fås i BOM, følgeseddel, købsfaktura, produktionsordre, Indkøbsordre, kvittering, Sales Invoice, Sales Order, Stock indtastning, Timesheet"
-DocType: Item Tax,Tax Rate,Skat
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Select Item,Vælg Item
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +143,"Item: {0} managed batch-wise, can not be reconciled using \
-					Stock Reconciliation, instead use Stock Entry","Emne: {0} lykkedes batchvis, kan ikke forenes ved hjælp af \ Stock Forsoning, i stedet bruge Stock indtastning"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +259,Purchase Invoice {0} is already submitted,Købsfaktura {0} er allerede indsendt
-apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Convert to non-Group,Konverter til ikke-Group
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +55,Purchase Receipt must be submitted,Kvittering skal indsendes
-DocType: Stock UOM Replace Utility,Current Stock UOM,Aktuel Stock UOM
-apps/erpnext/erpnext/config/stock.py +53,Batch (lot) of an Item.,Batch (parti) af et element.
-DocType: C-Form Invoice Detail,Invoice Date,Faktura Dato
-apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Your email address,Din e-mail-adresse
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +194,Please see attachment,Se venligst vedhæftede
-DocType: Purchase Order,% Received,% Modtaget
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +109,Water jet cutting,Vandstråleskæring
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +24,Setup Already Complete!!,Opsætning Allerede Complete !!
-,Finished Goods,Færdigvarer
-DocType: Delivery Note,Instructions,Instruktioner
-DocType: Quality Inspection,Inspected By,Inspiceres af
-DocType: Maintenance Visit,Maintenance Type,Vedligeholdelse Type
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +61,Serial No {0} does not belong to Delivery Note {1},Løbenummer {0} ikke hører til følgeseddel {1}
-DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,Item Quality Inspection Parameter
-DocType: Leave Application,Leave Approver Name,Lad Godkender Navn
+apps/erpnext/erpnext/stock/get_item_details.py +281,Price List Currency not selected,Pris List Valuta ikke valgt
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +238,Row {0}: Payment Amount cannot be greater than Outstanding Amount,Række {0}: Betaling Beløb kan ikke være større end udestående beløb
+DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,"Indtast navnet på kampagne, hvis kilden undersøgelsesudvalg er kampagne"
 ,Schedule Date,Tidsplan Dato
-DocType: Packed Item,Packed Item,Pakket Vare
-apps/erpnext/erpnext/config/buying.py +54,Default settings for buying transactions.,Standardindstillinger for at købe transaktioner.
-apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +29,Activity Cost exists for Employee {0} against Activity Type - {1},Aktivitet Omkostninger eksisterer for Medarbejder {0} mod Activity Type - {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.,Tøv ikke oprette konti for kunder og leverandører. De er skabt direkte fra kunden / Leverandør mestre.
-DocType: Currency Exchange,Currency Exchange,Valutaveksling
-DocType: Purchase Invoice Item,Item Name,Item Name
-apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Credit Balance,Credit Balance
-DocType: Employee,Widowed,Enke
-DocType: Production Planning Tool,"Items to be requested which are ""Out of Stock"" considering all warehouses based on projected qty and minimum order qty",Varer der skal ansøges som er &quot;på lager&quot; i betragtning af alle lagre baseret på forventede qty og mindste bestilling qty
-DocType: Workstation,Working Hours,Arbejdstider
-DocType: Naming Series,Change the starting / current sequence number of an existing series.,Skift start / aktuelle sekvensnummer af en eksisterende serie.
-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.","Hvis flere Priser Regler fortsat gældende, er brugerne bedt om at indstille prioritet manuelt for at løse konflikter."
-,Purchase Register,Indkøb Register
-DocType: Landed Cost Item,Applicable Charges,Gældende gebyrer
-DocType: Workstation,Consumable Cost,Forbrugsmaterialer Cost
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,{0} ({1}) must have role 'Leave Approver',"{0} ({1}), skal have rollen 'Godkendelse af fravær'"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +39,Medical,Medicinsk
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,Årsag til at miste
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +36,Tube beading,Tube beading
-apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},Workstation er lukket på følgende datoer som pr Holiday List: {0}
-DocType: Employee,Single,Enkeltværelse
-DocType: Issue,Attachment,Attachment
-apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +29,Budget cannot be set for Group Cost Center,Budget kan ikke indstilles for gruppe Cost center
-DocType: Account,Cost of Goods Sold,Vareforbrug
-DocType: Purchase Invoice,Yearly,Årlig
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +223,Please enter Cost Center,Indtast Cost center
-DocType: Journal Entry Account,Sales Order,Sales Order
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +63,Avg. Selling Rate,Gns. Salgskurs
-DocType: Purchase Order,Start date of current order's period,Startdato for nuværende ordres periode
-apps/erpnext/erpnext/utilities/transaction_base.py +128,Quantity cannot be a fraction in row {0},Mængde kan ikke være en del i række {0}
-DocType: Purchase Invoice Item,Quantity and Rate,Mængde og Pris
-DocType: Delivery Note,% Installed,% Installeret
-apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +59,Please enter company name first,Indtast venligst firmanavn først
-DocType: BOM,Item Desription,Item desription
-DocType: Purchase Invoice,Supplier Name,Leverandør Navn
-DocType: Account,Is Group,Is Group
-DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,Check Leverandør Fakturanummer Entydighed
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +31,Thermoforming,Termoformning
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +66,Slitting,Langskæring
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +57,'To Case No.' cannot be less than 'From Case No.','Til sag nr.' kan ikke være mindre end 'Fra sag nr.'
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +104,Non Profit,Non Profit
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_list.js +7,Not Started,Ikke i gang
-DocType: Lead,Channel Partner,Channel Partner
-DocType: Account,Old Parent,Gammel Parent
-DocType: Notification Control,Customize the introductory text that goes as a part of that email. Each transaction has a separate introductory text.,"Tilpas den indledende tekst, der går som en del af denne e-mail. Hver transaktion har en separat indledende tekst."
-DocType: Sales Taxes and Charges Template,Sales Master Manager,Salg Master manager
-apps/erpnext/erpnext/config/manufacturing.py +74,Global settings for all manufacturing processes.,Globale indstillinger for alle produktionsprocesser.
-DocType: Accounts Settings,Accounts Frozen Upto,Regnskab Frozen Op
-DocType: SMS Log,Sent On,Sendt On
-DocType: Sales Order,Not Applicable,Gælder ikke
-apps/erpnext/erpnext/config/hr.py +140,Holiday master.,Ferie mester.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +19,Shell molding,Skalstøbning
-DocType: Material Request Item,Required Date,Nødvendig Dato
-DocType: Delivery Note,Billing Address,Faktureringsadresse
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +644,Please enter Item Code.,Indtast venligst Item Code.
-DocType: BOM,Costing,Koster
-DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount","Hvis markeret, vil momsbeløbet blive betragtet som allerede er inkluderet i Print Rate / Print Beløb"
-apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,Antal Total
-DocType: Employee,Health Concerns,Sundhedsmæssige betænkeligheder
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +15,Unpaid,Ulønnet
-DocType: Packing Slip,From Package No.,Fra pakken No.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Værdipapirer og Indlån
-DocType: Features Setup,Imports,Import
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +144,Adhesive bonding,Limning
-DocType: Job Opening,Description of a Job Opening,Beskrivelse af et job Åbning
-apps/erpnext/erpnext/config/hr.py +28,Attendance record.,Fremmøde rekord.
-DocType: Bank Reconciliation,Journal Entries,Journaloptegnelser
-DocType: Sales Order Item,Used for Production Plan,Bruges til Produktionsplan
-DocType: System Settings,Loading...,Indlæser ...
-DocType: DocField,Password,Adgangskode
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +155,Fused deposition modeling,Fused deposition modeling
-DocType: Manufacturing Settings,Time Between Operations (in mins),Time Between Operations (i minutter)
-DocType: Customer,Buyer of Goods and Services.,Køber af varer og tjenesteydelser.
-DocType: Journal Entry,Accounts Payable,Kreditor
-apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +24,Add Subscribers,Tilføj Abonnenter
-apps/erpnext/erpnext/public/js/feature_setup.js +220,""" does not exists",' findes ikke
-DocType: Pricing Rule,Valid Upto,Gyldig Op
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +564,List a few of your customers. They could be organizations or individuals.,Nævne et par af dine kunder. De kunne være organisationer eller enkeltpersoner.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Direct Income,Direkte Indkomst
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +33,"Can not filter based on Account, if grouped by Account","Kan ikke filtrere baseret på konto, hvis grupperet efter konto"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +88,Administrative Officer,Kontorfuldmægtig
-DocType: Payment Tool,Received Or Paid,Modtaget eller betalt
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +318,Please select Company,Vælg Firma
-DocType: Stock Entry,Difference Account,Forskel konto
-apps/erpnext/erpnext/projects/doctype/task/task.py +44,Cannot close task as its dependant task {0} is not closed.,Kan ikke lukke opgave som sin afhængige opgave {0} ikke er lukket.
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +305,Please enter Warehouse for which Material Request will be raised,Indtast venligst Warehouse for hvilke Materiale Request vil blive rejst
-DocType: Production Order,Additional Operating Cost,Yderligere driftsomkostninger
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +20,Cosmetics,Kosmetik
-DocType: DocField,Type,Type
-apps/erpnext/erpnext/stock/doctype/item/item.py +417,"To merge, following properties must be same for both items","At fusionere, skal følgende egenskaber være ens for begge poster"
-DocType: Communication,Subject,Emne
-DocType: Shipping Rule,Net Weight,Vægt
-DocType: Employee,Emergency Phone,Emergency Phone
-,Serial No Warranty Expiry,Seriel Ingen garanti Udløb
-DocType: Sales Order,To Deliver,Til at levere
-DocType: Purchase Invoice Item,Item,Vare
-DocType: Journal Entry,Difference (Dr - Cr),Difference (Dr - Cr)
-DocType: Account,Profit and Loss,Resultatopgørelse
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +58,New UOM must NOT be of type Whole Number,Ny UOM må IKKE være af typen heltal
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Furniture and Fixture,Møbler og Fixture
-DocType: Quotation,Rate at which Price list currency is converted to company's base currency,"Hastighed, hvormed Prisliste valuta omregnes til virksomhedens basisvaluta"
-apps/erpnext/erpnext/setup/doctype/company/company.py +47,Account {0} does not belong to company: {1},Konto {0} tilhører ikke virksomheden: {1}
-DocType: Selling Settings,Default Customer Group,Standard Customer Group
-DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction","Hvis deaktivere, &#39;Afrundet Total&#39; felt, vil ikke være synlig i enhver transaktion"
-DocType: BOM,Operating Cost,Driftsomkostninger
-,Gross Profit,Gross Profit
-DocType: Production Planning Tool,Material Requirement,Material Requirement
-DocType: Company,Delete Company Transactions,Slet Company Transaktioner
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +85,Item {0} is not Purchase Item,Vare {0} er ikke Indkøb Vare
-apps/erpnext/erpnext/controllers/recurring_document.py +188,"{0} is an invalid email address in 'Notification \
-					Email Address'","{0} er en ugyldig e-mail-adresse i ""Notification \ e-mail adresse'"
-apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +44,Total Billing This Year:,Samlet fakturering Dette år:
-DocType: Purchase Receipt,Add / Edit Taxes and Charges,Tilføj / rediger Skatter og Afgifter
-DocType: Purchase Invoice,Supplier Invoice No,Leverandør faktura nr
-DocType: Territory,For reference,For reference
-apps/erpnext/erpnext/public/js/account_tree_grid.js +52,Closing (Cr),Lukning (Cr)
-DocType: Serial No,Warranty Period (Days),Garantiperiode (dage)
-DocType: Installation Note Item,Installation Note Item,Installation Bemærk Vare
-DocType: Job Applicant,Thread HTML,Tråd HTML
-DocType: Company,Ignore,Ignorer
-apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +86,SMS sent to following numbers: {0},SMS sendt til følgende numre: {0}
-apps/erpnext/erpnext/controllers/buying_controller.py +135,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Leverandør Warehouse obligatorisk for underentreprise kvittering
-DocType: Pricing Rule,Valid From,Gyldig fra
-DocType: Sales Invoice,Total Commission,Samlet Kommissionen
-DocType: Pricing Rule,Sales Partner,Salg Partner
-DocType: Buying Settings,Purchase Receipt Required,Kvittering Nødvendig
-DocType: Monthly Distribution,"**Monthly Distribution** helps you distribute your budget across months if you have seasonality in your business.
-
-To distribute a budget using this distribution, set this **Monthly Distribution** in the **Cost Center**","** Månedlig Distribution ** hjælper du distribuerer dit budget tværs måneder, hvis du har sæsonudsving i din virksomhed. At distribuere et budget ved hjælp af denne fordeling, skal du indstille dette ** Månedlig Distribution ** i ** Cost Center **"
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +183,No records found in the Invoice table,Ingen resultater i Invoice tabellen
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +20,Please select Company and Party Type first,Vælg Company og Party Type først
-apps/erpnext/erpnext/config/accounts.py +84,Financial / accounting year.,Finansiel / regnskabsår.
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","Beklager, kan Serial Nos ikke blive slået sammen"
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +581,Make Sales Order,Make kundeordre
-DocType: Project Task,Project Task,Project Task
-,Lead Id,Bly Id
-DocType: C-Form Invoice Detail,Grand Total,Grand Total
-DocType: About Us Settings,Website Manager,Website manager
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +34,Fiscal Year Start Date should not be greater than Fiscal Year End Date,Regnskabsår Startdato må ikke være større end Skatteårsafslutning Dato
-DocType: Warranty Claim,Resolution,Opløsning
-apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +66,Payable Account,Betales konto
-apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Gentag Kunder
-DocType: Leave Control Panel,Allocate,Tildele
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +16,Previous,Forrige
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +620,Sales Return,Salg Return
-DocType: Production Planning Tool,Select Sales Orders from which you want to create Production Orders.,"Vælg salgsordrer, som du ønsker at skabe produktionsordrer."
-apps/erpnext/erpnext/config/hr.py +120,Salary components.,Løn komponenter.
-apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,Database over potentielle kunder.
-apps/erpnext/erpnext/config/crm.py +17,Customer database.,Kundedatabase.
-DocType: Quotation,Quotation To,Citat Til
-DocType: Lead,Middle Income,Midterste indkomst
-apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),Åbning (Cr)
-apps/erpnext/erpnext/accounts/utils.py +193,Allocated amount can not be negative,Tildelte beløb kan ikke være negativ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +123,Tumbling,Tumbling
-DocType: Purchase Order Item,Billed Amt,Billed Amt
-DocType: Warehouse,A logical Warehouse against which stock entries are made.,Et logisk varelager hvor lagerændringer foretages.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +92,Reference No & Reference Date is required for {0},Referencenummer &amp; Reference Dato er nødvendig for {0}
-DocType: Event,Wednesday,Onsdag
-DocType: Sales Invoice,Customer's Vendor,Kundens Vendor
-apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +214,Production Order is Mandatory,Produktionsordre er Obligatorisk
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +139,Proposal Writing,Forslag Skrivning
-apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,En anden Sales Person {0} eksisterer med samme Medarbejder id
-apps/erpnext/erpnext/stock/stock_ledger.py +336,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},Negativ Stock Error ({6}) for Item {0} i Warehouse {1} på {2} {3} i {4} {5}
-DocType: Fiscal Year Company,Fiscal Year Company,Fiscal År Company
-DocType: Packing Slip Item,DN Detail,DN Detail
-DocType: Time Log,Billed,Billed
-DocType: Batch,Batch Description,Batch Beskrivelse
-DocType: Delivery Note,Time at which items were delivered from warehouse,"Tidspunkt, hvor varerne blev leveret fra lageret"
-DocType: Sales Invoice,Sales Taxes and Charges,Salg Skatter og Afgifter
-DocType: Employee,Organization Profile,Organisation profil
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +90,Please setup numbering series for Attendance via Setup > Numbering Series,Venligst setup nummerering serie for Deltagelse via Setup&gt; Nummerering Series
-DocType: Employee,Reason for Resignation,Årsag til Udmeldelse
+DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,Landed Cost kvittering
 apps/erpnext/erpnext/config/hr.py +150,Template for performance appraisals.,Skabelon til præstationsvurderinger.
-DocType: Payment Reconciliation,Invoice/Journal Entry Details,Faktura / Kassekladde Detaljer
-apps/erpnext/erpnext/accounts/utils.py +53,{0} '{1}' not in Fiscal Year {2},{0} &#39;{1}&#39; ikke i regnskabsåret {2}
-DocType: Buying Settings,Settings for Buying Module,Indstillinger til køb modul
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +62,Please enter Purchase Receipt first,Indtast venligst kvittering først
-DocType: Buying Settings,Supplier Naming By,Leverandør Navngivning Af
-DocType: Maintenance Schedule,Maintenance Schedule,Vedligeholdelse Skema
-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.","Så Priser Regler filtreres ud baseret på kunden, Kunde Group, Territory, leverandør, leverandør Type, Kampagne, Sales Partner etc."
-apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.py +179,Please install dropbox python module,Du installere dropbox python-modul
-DocType: Employee,Passport Number,Passport Number
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +82,Manager,Leder
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +494,From Purchase Receipt,Fra kvittering
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +219,Same item has been entered multiple times.,Samme element er indtastet flere gange.
-DocType: SMS Settings,Receiver Parameter,Modtager Parameter
-apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,'Baseret på' og 'Grupper efter' ikke kan være samme
-DocType: Sales Person,Sales Person Targets,Salg person Mål
-apps/frappe/frappe/public/js/frappe/form/workflow.js +116,To,Til
-apps/frappe/frappe/templates/base.html +145,Please enter email address,Indtast e-mail-adresse
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +35,End tube forming,Ende rør danner
-DocType: Production Order Operation,In minutes,I minutter
-DocType: Issue,Resolution Date,Opløsning Dato
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +635,Please set default Cash or Bank account in Mode of Payment {0},Indstil standard Kontant eller bank konto i mode for betaling {0}
-DocType: Selling Settings,Customer Naming By,Customer Navngivning Af
-apps/erpnext/erpnext/accounts/doctype/account/account.js +67,Convert to Group,Konverter til Group
-DocType: Activity Cost,Activity Type,Aktivitet Type
-apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +47,Delivered Amount,Leveres Beløb
-DocType: Customer,Fixed Days,Faste dage
-DocType: Sales Invoice,Packing List,Pakning List
-apps/erpnext/erpnext/config/buying.py +28,Purchase Orders given to Suppliers.,Indkøbsordrer givet til leverandører.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +43,Publishing,Publishing
-DocType: Activity Cost,Projects User,Projekter Bruger
-apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Consumed,Forbrugt
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +198,{0}: {1} not found in Invoice Details table,{0}: {1} blev ikke fundet i Invoice Detaljer tabel
-DocType: Company,Round Off Cost Center,Afrunde Cost center
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +208,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,"Vedligeholdelse Besøg {0} skal annulleres, før den annullerer denne Sales Order"
-DocType: Material Request,Material Transfer,Materiale Transfer
-apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +56,Opening (Dr),Åbning (dr)
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},Udstationering tidsstempel skal være efter {0}
-apps/frappe/frappe/config/setup.py +59,Settings,Indstillinger
-DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,Landede Cost Skatter og Afgifter
-DocType: Production Order Operation,Actual Start Time,Faktiske Start Time
-DocType: BOM Operation,Operation Time,Operation Time
-apps/frappe/frappe/public/js/frappe/views/module/module_section.html +27,More,Mere
-DocType: Pricing Rule,Sales Manager,Salgschef
-apps/frappe/frappe/public/js/frappe/model/model.js +492,Rename,Omdøb
-DocType: Journal Entry,Write Off Amount,Skriv Off Beløb
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +52,Bending,Bøjning
-apps/frappe/frappe/core/page/user_permissions/user_permissions.js +246,Allow User,Tillad Bruger
-DocType: Journal Entry,Bill No,Bill Ingen
-DocType: Purchase Invoice,Quarterly,Kvartalsvis
-DocType: Selling Settings,Delivery Note Required,Følgeseddel Nødvendig
-DocType: Sales Order Item,Basic Rate (Company Currency),Basic Rate (Company Valuta)
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Please enter item details,Indtast venligst item detaljer
-DocType: Purchase Receipt,Other Details,Andre detaljer
-DocType: Account,Accounts,Konti
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +67,Marketing,Marketing
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +65,Straight shearing,Lige klipning
-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.,At spore post i salgs- og købsdokumenter baseret på deres løbenr. Dette er også bruges til at spore garantiforpligtelser detaljer af produktet.
-DocType: Purchase Receipt Item Supplied,Current Stock,Aktuel Stock
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +99,Rejected Warehouse is mandatory against regected item,Afvist Warehouse er obligatorisk mod regected post
-DocType: Account,Expenses Included In Valuation,Udgifter inkluderet i Værdiansættelse
-DocType: Employee,Provide email id registered in company,Giv email id er registreret i selskab
-DocType: Hub Settings,Seller City,Sælger By
-DocType: Email Digest,Next email will be sent on:,Næste email vil blive sendt på:
-DocType: Offer Letter Term,Offer Letter Term,Tilbyd Letter Term
-apps/erpnext/erpnext/stock/doctype/item/item.py +492,Item has variants.,Element har varianter.
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Vare {0} ikke fundet
-DocType: Bin,Stock Value,Stock Value
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,Tree Type
-DocType: BOM Explosion Item,Qty Consumed Per Unit,Antal Consumed Per Unit
-DocType: Serial No,Warranty Expiry Date,Garanti Udløbsdato
-DocType: Material Request Item,Quantity and Warehouse,Mængde og Warehouse
-DocType: Sales Invoice,Commission Rate (%),Kommissionen Rate (%)
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +172,"Against Voucher Type must be one of Sales Order, Sales Invoice or Journal Entry","Imod Voucher type skal være en af ​​kundeordre, Salg Faktura eller Kassekladde"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +139,Biomachining,Biomachining
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +7,Aerospace,Aerospace
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +19,Welcome,Velkommen
-DocType: Journal Entry,Credit Card Entry,Credit Card indtastning
+DocType: Hub Settings,Hub Settings,Hub Indstillinger
+apps/frappe/frappe/public/js/frappe/model/indicator.js +43,Submitted,Indsendt
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +18,Task Subject,Task Emne
-apps/erpnext/erpnext/config/stock.py +33,Goods received from Suppliers.,Varer modtaget fra leverandører.
-DocType: Communication,Open,Åbent
-DocType: Lead,Campaign Name,Kampagne Navn
-,Reserved,Reserveret
-DocType: Purchase Order,Supply Raw Materials,Supply råstoffer
-DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,"Den dato, hvor næste faktura vil blive genereret. Det genereres på send."
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,Omsætningsaktiver
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +92,{0} is not a stock Item,{0} er ikke et lager Vare
-DocType: Mode of Payment Account,Default Account,Standard-konto
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +157,Lead must be set if Opportunity is made from Lead,"Bly skal indstilles, hvis Opportunity er lavet af Lead"
-DocType: Contact Us Settings,Address Title,Adresse Titel
-apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +33,Please select weekly off day,Vælg ugentlige off dag
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} er ikke en gyldig Batchnummer for Item {1}
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),Lån (passiver)
+DocType: Features Setup,Quality,Kvalitet
+DocType: Pricing Rule,Sales Partner,Salg Partner
+DocType: Workstation,Electricity Cost,Elektricitet Omkostninger
+DocType: Journal Entry,Total Credit,Total Credit
+DocType: Purchase Receipt,Rate at which supplier's currency is converted to company's base currency,"Hastighed, hvormed leverandørens valuta omregnes til virksomhedens basisvaluta"
+DocType: Sales Invoice,Source,Kilde
+apps/erpnext/erpnext/config/accounts.py +153,"Seasonality for setting budgets, targets etc.","Sæsonudsving til indstilling budgetter, mål etc."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +312,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,Konto {0} skal være af typen 'Anlægskonto' da enheden {1} er et aktiv
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +312,Please enter Reference date,Indtast Referencedato
+apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +14,Awesome Services,Awesome Services
+apps/erpnext/erpnext/public/js/setup_wizard.js +154,Your financial year begins on,Din regnskabsår begynder på
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +242,Create New,Opret ny
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +141,Set as Lost,Sæt som Lost
+DocType: Sales Order,Recurring Order,Tilbagevendende Order
+DocType: Global Defaults,Disable Rounded Total,Deaktiver Afrundet Total
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +57,Investments,Investeringer
 DocType: Production Order Operation,Planned End Time,Planned Sluttid
-,Sales Person Target Variance Item Group-Wise,Salg Person Target Variance Item Group-Wise
-DocType: Dropbox Backup,Daily,Daglig
-apps/erpnext/erpnext/accounts/doctype/account/account.py +105,Account with existing transaction cannot be converted to ledger,Konto med eksisterende transaktion kan ikke konverteres til finans
-DocType: Delivery Note,Customer's Purchase Order No,Kundens Indkøbsordre Nej
-DocType: Employee,Cell Number,Cell Antal
-apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Tabt
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +120,You can not enter current voucher in 'Against Journal Entry' column,Du kan ikke indtaste aktuelle kupon i &quot;Mod Kassekladde &#39;kolonne
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +25,Energy,Energi
-DocType: Opportunity,Opportunity From,Mulighed Fra
-apps/erpnext/erpnext/config/hr.py +33,Monthly salary statement.,Månedlige lønseddel.
-DocType: Item Group,Website Specifications,Website Specifikationer
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +205,New Account,Ny konto
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +21,{0}: From {0} of type {1},{0}: Fra {0} af typen {1}
-apps/erpnext/erpnext/controllers/buying_controller.py +283,Row {0}: Conversion Factor is mandatory,Række {0}: Konvertering Factor er obligatorisk
-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.,Bogføring kan foretages mod blad noder. Poster mod grupper er ikke tilladt.
-DocType: ToDo,High,Høj
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +361,Cannot deactivate or cancel BOM as it is linked with other BOMs,"Kan ikke deaktivere eller annullere BOM, som det er forbundet med andre styklister"
-DocType: Opportunity,Maintenance,Vedligeholdelse
-DocType: User,Male,Mand
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +182,Purchase Receipt number required for Item {0},Kvittering nummer kræves for Item {0}
-DocType: Item Attribute Value,Item Attribute Value,Item Attribut Værdi
-apps/erpnext/erpnext/config/crm.py +64,Sales campaigns.,Salgskampagner.
+DocType: Upload Attendance,Get Template,Få skabelon
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +85,Please pull items from Delivery Note,Venligst trække elementer fra følgeseddel
+,Available Qty,Tilgængelig Antal
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Værdipapirer og Indlån
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +199,Item {0} does not exist in the system or has expired,Vare {0} findes ikke i systemet eller er udløbet
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +581,Make Sales Order,Make kundeordre
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +450,Amount,Beløb
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +97,No permission to use Payment Tool,Ingen tilladelse til at bruge Betaling Tool
+DocType: Stock Settings,Default Stock UOM,Standard Stock UOM
+DocType: Purchase Invoice,In Words (Company Currency),I Words (Company Valuta)
+DocType: Serial No,Delivery Time,Leveringstid
+DocType: Mode of Payment Account,Default Account,Standard-konto
+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.,"Der opstod en fejl. En sandsynlig årsag kan være, at du ikke har gemt formularen. Kontakt venligst support@erpnext.com hvis problemet fortsætter."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +561,Cost Center For Item with Item Code ',Cost Center For Item med Item Code &#39;
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +47,"To filter based on Party, select Party Type first","Hvis du vil filtrere baseret på Party, skal du vælge Party Type først"
+DocType: Lead,Next Contact By,Næste Kontakt By
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +519,Invoice,Faktura
+DocType: Bin,Actual Quantity,Faktiske Mængde
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,Investment Banking
+DocType: Stock Entry,Subcontract,Underleverance
+DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,Angiv Exchange Rate til at konvertere en valuta til en anden
+,Welcome to ERPNext,Velkommen til ERPNext
+DocType: Maintenance Schedule Detail,Scheduled Date,Planlagt dato
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +37,From Date should be within the Fiscal Year. Assuming From Date = {0},Fra dato skal være inden regnskabsåret. Antages Fra dato = {0}
+DocType: Purchase Taxes and Charges,Account Head,Konto hoved
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +157,Start date should be less than end date for Item {0},Start dato bør være mindre end slutdato for Item {0}
+apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,"Annuller Materiale Besøg {0}, før den annullerer denne garanti krav"
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Target,Samlet Target
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +478,Get Items from BOM,Få elementer fra BOM
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +124,Note: There is not enough leave balance for Leave Type {0},Bemærk: Der er ikke nok orlov balance for Leave Type {0}
+DocType: Purchase Invoice,Total (Company Currency),I alt (Company Valuta)
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Mulighed Fra feltet er obligatorisk
+DocType: Naming Series,Series List for this Transaction,Serie Liste for denne transaktion
+DocType: Purchase Invoice Item,Price List Rate,Prisliste Rate
+DocType: Payment Reconciliation Invoice,Outstanding Amount,Udestående beløb
+apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +56,Opening (Dr),Åbning (dr)
+DocType: Account,Accounts User,Regnskab Bruger
+DocType: Rename Tool,Rename Tool,Omdøb Tool
+DocType: Delivery Note,Print Without Amount,Print uden Beløb
+DocType: C-Form,Invoices,Fakturaer
+DocType: Item Attribute,Item Attribute,Item Attribut
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +213,Today is {0}'s birthday!,I dag er {0} &#39;s fødselsdag!
+DocType: Deduction Type,Deduction Type,Fradrag Type
+DocType: Expense Claim,Total Amount Reimbursed,Samlede godtgjorte beløb
+DocType: Stock Settings,Item Naming By,Item Navngivning By
 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
@@ -646,1249 +91,3293 @@
 7. Total: Cumulative total to this point.
 8. Enter Row: If based on ""Previous Row Total"" you can select the row number which will be taken as a base for this calculation (default is the previous row).
 9. Is this Tax included in Basic Rate?: If you check this, it means that this tax will not be shown below the item table, but will be included in the Basic Rate in your main item table. This is useful where you want give a flat price (inclusive of all taxes) price to customers.","Standard skat skabelon, der kan anvendes på alle salgstransaktioner. Denne skabelon kan indeholde liste over skatte- hoveder og også andre udgifter / indtægter hoveder som &quot;Shipping&quot;, &quot;forsikring&quot;, &quot;Håndtering&quot; osv #### Bemærk Skatteprocenten du definerer her, vil være standard skattesats for alle ** Varer **. Hvis der er ** Varer **, der har forskellige satser, skal de tilsættes i ** Item Skat ** bord i ** Item ** mester. #### Beskrivelse af kolonner 1. Beregning Type: - Dette kan være på ** Net Total ** (dvs. summen af ​​grundbeløb). - ** På Forrige Row Total / Beløb ** (for kumulative skatter eller afgifter). Hvis du vælger denne mulighed, vil skatten blive anvendt som en procentdel af den forrige række (på skatteområdet tabel) beløb eller total. - ** Faktisk ** (som nævnt). 2. Konto Hoved: Account Finans hvorunder denne afgift vil være reserveret 3. Cost Center: Hvis skatten / afgiften er en indtægt (som shipping) eller omkostninger det skal reserveres mod en Cost Center. 4. Beskrivelse: Beskrivelse af skat (som vil blive trykt i fakturaer / citater). 5. Pris: Skatteprocent. 6. Beløb: Skat beløb. 7. Samlet: Kumulativ total til dette punkt. 8. Indtast Række: Hvis baseret på &quot;Forrige Row alt&quot; kan du vælge den række nummer, som vil blive taget som en base for denne beregning (standard er den forrige række). 9. Er det Tax inkluderet i Basic Rate ?: Hvis du markerer dette, betyder det, at denne skat ikke vil blive vist under elementet bordet, men vil indgå i Basic Rate i din vigtigste punkt bordet. Dette er nyttigt, når du ønsker at give en flad pris (inklusive alle afgifter) pris til kunderne."
-DocType: Employee,Bank A/C No.,Bank A / C No.
-DocType: Expense Claim,Project,Projekt
-DocType: Quality Inspection Reading,Reading 7,Reading 7
-DocType: Address,Personal,Personlig
-DocType: Expense Claim Detail,Expense Claim Type,Expense krav Type
-DocType: Shopping Cart Settings,Default settings for Shopping Cart,Standardindstillinger for Indkøbskurv
-apps/erpnext/erpnext/controllers/accounts_controller.py +324,"Journal Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Kassekladde {0} er forbundet mod Order {1}, kontrollere, om det skal trækkes forhånd i denne faktura."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +13,Biotechnology,Bioteknologi
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Office Maintenance Expenses,Office vedligeholdelsesudgifter
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +53,Hemming,Hemming
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +66,Please enter Item first,Indtast Vare først
-DocType: Account,Liability,Ansvar
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +62,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Sanktioneret Beløb kan ikke være større end krav Beløb i Row {0}.
-DocType: Company,Default Cost of Goods Sold Account,Standard vareforbrug konto
-apps/erpnext/erpnext/stock/get_item_details.py +262,Price List not selected,Prisliste ikke valgt
-DocType: Employee,Family Background,Familie Baggrund
-DocType: Process Payroll,Send Email,Send Email
-apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +88,No Permission,Ingen Tilladelse
-DocType: Company,Default Bank Account,Standard bankkonto
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +47,"To filter based on Party, select Party Type first","Hvis du vil filtrere baseret på Party, skal du vælge Party Type først"
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},"'Opdater lager' kan ikke markeres, varerne ikke leveres via {0}"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Nos,Nos
-DocType: Item,Items with higher weightage will be shown higher,Elementer med højere weightage vises højere
-DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Bank Afstemning Detail
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +627,My Invoices,Mine Fakturaer
-apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,Ingen medarbejder fundet
-DocType: Purchase Order,Stopped,Stoppet
-DocType: Item,If subcontracted to a vendor,Hvis underentreprise til en sælger
-apps/erpnext/erpnext/manufacturing/page/bom_browser/bom_browser.js +17,Select BOM to start,Vælg BOM at starte
-DocType: SMS Center,All Customer Contact,Alle Customer Kontakt
-apps/erpnext/erpnext/config/stock.py +64,Upload stock balance via csv.,Upload lager balance via csv.
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,Send nu
-,Support Analytics,Support Analytics
-DocType: Item,Website Warehouse,Website Warehouse
-DocType: Sales Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","Den dag i den måned, hvor auto faktura vil blive genereret f.eks 05, 28 osv"
-apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,Score skal være mindre end eller lig med 5
-apps/erpnext/erpnext/config/accounts.py +169,C-Form records,C-Form optegnelser
-apps/erpnext/erpnext/config/selling.py +294,Customer and Supplier,Kunde og leverandør
-DocType: Email Digest,Email Digest Settings,E-mail-Digest-indstillinger
-apps/erpnext/erpnext/config/support.py +13,Support queries from customers.,Support forespørgsler fra kunder.
-DocType: Bin,Moving Average Rate,Glidende gennemsnit Rate
-DocType: Production Planning Tool,Select Items,Vælg emner
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,{0} against Bill {1} dated {2},{0} mod regning {1} ​​dateret {2}
-DocType: Comment,Reference Name,Henvisning Navn
-DocType: Maintenance Visit,Completion Status,Afslutning status
-DocType: Sales Invoice Item,Target Warehouse,Target Warehouse
-DocType: Item,Allow over delivery or receipt upto this percent,Tillad løbet levering eller modtagelse op denne procent
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +49,Expected Delivery Date cannot be before Sales Order Date,"Forventet leveringsdato kan ikke være, før Sales Order Date"
-DocType: Upload Attendance,Import Attendance,Import Fremmøde
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +17,All Item Groups,Alle varegrupper
-DocType: Process Payroll,Activity Log,Activity Log
-apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +30,Net Profit / Loss,Netto Resultat / Loss
-apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,Automatisk skrive besked på indsendelse af transaktioner.
-DocType: Production Order,Item To Manufacture,Item Til Fremstilling
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +16,Permanent mold casting,Permanent formstøbning
-DocType: Sales Order Item,Projected Qty,Projiceret Antal
-DocType: Sales Invoice,Payment Due Date,Betaling Due Date
-DocType: Newsletter,Newsletter Manager,Nyhedsbrev manager
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening','Åbning'
-DocType: Notification Control,Delivery Note Message,Levering Note Message
-DocType: Expense Claim,Expenses,Udgifter
-,Purchase Receipt Trends,Kvittering Tendenser
-DocType: Appraisal,Select template from which you want to get the Goals,"Vælg skabelon, hvorfra du ønsker at få de mål"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +77,Research & Development,Forskning &amp; Udvikling
-,Amount to Bill,Beløb til Bill
-DocType: Company,Registration Details,Registrering Detaljer
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +75,Staking,Satsningen
-DocType: Item,Re-Order Qty,Re-prisen evt
-DocType: Leave Block List Date,Leave Block List Date,Lad Block List Dato
-apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +25,Scheduled to send to {0},Planlagt at sende til {0}
-DocType: Pricing Rule,Price or Discount,Pris eller rabat
-DocType: Sales Team,Incentives,Incitamenter
-DocType: SMS Log,Requested Numbers,Anmodet Numbers
-apps/erpnext/erpnext/config/hr.py +38,Performance appraisal.,Præstationsvurdering.
-apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Projekt Value
-apps/erpnext/erpnext/config/selling.py +304,Point-of-Sale,Point-of-Sale
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,Cannot carry forward {0},Kan ikke fortsætte {0}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +91,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","Konto balance er kredit, Du har ikke lov at ændre 'Balancetype' til 'debit'"
-DocType: Account,Balance must be,Balance skal være
-DocType: Hub Settings,Publish Pricing,Offentliggøre Pricing
-DocType: Notification Control,Expense Claim Rejected Message,Expense krav Afvist Message
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +145,Nailing,Sømning
-,Available Qty,Tilgængelig Antal
-DocType: Purchase Taxes and Charges,On Previous Row Total,På Forrige Row Total
-DocType: Salary Slip,Working Days,Arbejdsdage
-DocType: Serial No,Incoming Rate,Indgående Rate
-DocType: Packing Slip,Gross Weight,Bruttovægt
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +410,The name of your company for which you are setting up this system.,"Navnet på din virksomhed, som du oprette dette system."
-DocType: HR Settings,Include holidays in Total no. of Working Days,Medtag helligdage i alt nej. Arbejdsdage
-DocType: Job Applicant,Hold,Hold
-DocType: Employee,Date of Joining,Dato for Sammenføjning
-DocType: Naming Series,Update Series,Opdatering Series
-DocType: Supplier Quotation,Is Subcontracted,Underentreprise
-DocType: Item Attribute,Item Attribute Values,Item Egenskab Værdier
-apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +3,View Subscribers,Se Abonnenter
-DocType: Purchase Invoice Item,Purchase Receipt,Kvittering
-,Received Items To Be Billed,Modtagne varer skal faktureres
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +114,Abrasive blasting,Sandblæsning
-DocType: Employee,Ms,Ms
-apps/erpnext/erpnext/config/accounts.py +148,Currency exchange rate master.,Valutakursen mester.
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +253,Unable to find Time Slot in the next {0} days for Operation {1},Kan ikke finde Time Slot i de næste {0} dage til Operation {1}
-DocType: Production Order,Plan material for sub-assemblies,Plan materiale til sub-enheder
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +426,BOM {0} must be active,BOM {0} skal være aktiv
-apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +26,Please select the document type first,Vælg dokumenttypen først
-apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,"Annuller Materiale Besøg {0}, før den annullerer denne vedligeholdelse Besøg"
-DocType: Salary Slip,Leave Encashment Amount,Lad Indløsning Beløb
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +209,Serial No {0} does not belong to Item {1},Løbenummer {0} ikke hører til Vare {1}
-DocType: Purchase Receipt Item Supplied,Required Qty,Nødvendigt antal
-DocType: Bank Reconciliation,Total Amount,Samlet beløb
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +32,Internet Publishing,Internet Publishing
-DocType: Production Planning Tool,Production Orders,Produktionsordrer
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +35,Balance Value,Balance Value
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,Salg prisliste
-apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +69,Publish to sync items,Udgive synkronisere emner
-apps/erpnext/erpnext/accounts/general_ledger.py +131,Please mention Round Off Account in Company,Henvis Round Off-konto i selskabet
-DocType: Purchase Receipt,Range,Range
-DocType: Supplier,Default Payable Accounts,Standard betales Konti
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,Medarbejder {0} er ikke aktiv eller findes ikke
-DocType: Features Setup,Item Barcode,Item Barcode
-apps/erpnext/erpnext/stock/doctype/item/item.py +487,Item Variants {0} updated,Item Varianter {0} opdateret
-DocType: Quality Inspection Reading,Reading 6,Læsning 6
-DocType: Purchase Invoice Advance,Purchase Invoice Advance,Købsfaktura Advance
-DocType: Address,Shop,Butik
-DocType: Hub Settings,Sync Now,Synkroniser nu
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +167,Row {0}: Credit entry can not be linked with a {1},Række {0}: Kredit indgang ikke kan knyttes med en {1}
-DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,"Standard Bank / Cash-konto vil automatisk blive opdateret i POS faktura, når denne tilstand er valgt."
-DocType: Employee,Permanent Address Is,Faste adresse
-DocType: Production Order Operation,Operation completed for how many finished goods?,Operation afsluttet for hvor mange færdigvarer?
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +491,The Brand,Brand
-apps/erpnext/erpnext/controllers/status_updater.py +163,Allowance for over-{0} crossed for Item {1}.,Fradrag for over- {0} krydsede for Item {1}.
-DocType: Employee,Exit Interview Details,Exit Interview Detaljer
-DocType: Item,Is Purchase Item,Er Indkøb Item
-DocType: Journal Entry Account,Purchase Invoice,Indkøb Faktura
-DocType: Stock Ledger Entry,Voucher Detail No,Voucher Detail Nej
-DocType: Stock Entry,Total Outgoing Value,Samlet Udgående Value
-DocType: Lead,Request for Information,Anmodning om information
-DocType: Payment Tool,Paid,Betalt
-DocType: Salary Slip,Total in words,I alt i ord
-DocType: Material Request Item,Lead Time Date,Leveringstid Dato
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +111,Row #{0}: Please specify Serial No for Item {1},Row # {0}: Angiv Serial Nej for Item {1}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +538,"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.","For &#39;Product Bundle&#39; elementer, Warehouse, Serial No og Batch Ingen vil blive betragtet fra &quot;Packing List &#39;bord. Hvis Warehouse og Batch Ingen er ens for alle emballage poster for enhver &quot;Product Bundle &#39;post, kan indtastes disse værdier i de vigtigste element tabellen, vil værdierne blive kopieret til&quot; Packing List&#39; bord."
-apps/erpnext/erpnext/config/stock.py +28,Shipments to customers.,Forsendelser til kunderne.
-DocType: Purchase Invoice Item,Purchase Order Item,Indkøbsordre Item
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Indirect Income,Indirekte Indkomst
-DocType: Contact Us Settings,Address Line 1,Adresse Line 1
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Variance,Varians
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +392,Company Name,Firmaets navn
-DocType: SMS Center,Total Message(s),Total Besked (r)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +515,Select Item for Transfer,Vælg Item for Transfer
-DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,"Vælg højde leder af den bank, hvor checken blev deponeret."
-DocType: Selling Settings,Allow user to edit Price List Rate in transactions,Tillad brugeren at redigere Prisliste Rate i transaktioner
-DocType: Pricing Rule,Max Qty,Max Antal
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +106,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Række {0}: Betaling mod Salg / Indkøbsordre bør altid blive markeret som forskud
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +16,Chemical,Kemisk
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +693,All items have already been transferred for this Production Order.,Alle elementer er allerede blevet overført til denne produktionsordre.
-DocType: Process Payroll,Select Payroll Year and Month,Vælg Payroll År og Måned
-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""",Gå til den relevante gruppe (som regel Anvendelse af fondene&gt; Omsætningsaktiver&gt; bankkonti og oprette en ny konto (ved at klikke på Tilføj barn) af typen &quot;Bank&quot;
-DocType: Workstation,Electricity Cost,Elektricitet Omkostninger
-DocType: HR Settings,Don't send Employee Birthday Reminders,Send ikke Medarbejder Fødselsdag Påmindelser
-DocType: Comment,Unsubscribed,Afmeldt
-DocType: Opportunity,Walk In,Walk In
-DocType: Item,Inspection Criteria,Inspektion Kriterier
-apps/erpnext/erpnext/config/accounts.py +101,Tree of finanial Cost Centers.,Tree of finanial Cost Centers.
-apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,Overført
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +492,Upload your letter head and logo. (you can edit them later).,Upload dit brev hoved og logo. (Du kan redigere dem senere).
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +156,White,Hvid
-DocType: SMS Center,All Lead (Open),Alle Bly (Open)
-DocType: Purchase Invoice,Get Advances Paid,Få forskud
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +362,Attach Your Picture,Vedhæft dit billede
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Make ,Lave
-DocType: Journal Entry,Total Amount in Words,Samlet beløb i Words
-DocType: Workflow State,Stop,Stands
-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.,"Der opstod en fejl. En sandsynlig årsag kan være, at du ikke har gemt formularen. Kontakt venligst support@erpnext.com hvis problemet fortsætter."
-apps/erpnext/erpnext/controllers/selling_controller.py +150,Order Type must be one of {0},Bestil type skal være en af ​​{0}
-DocType: Lead,Next Contact Date,Næste Kontakt Dato
-apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,Åbning Antal
-DocType: Holiday List,Holiday List Name,Holiday listenavn
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +168,Stock Options,Aktieoptioner
-DocType: Journal Entry Account,Expense Claim,Expense krav
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +181,Qty for {0},Antal for {0}
-DocType: Leave Application,Leave Application,Forlad Application
-apps/erpnext/erpnext/config/hr.py +77,Leave Allocation Tool,Lad Tildeling Tool
-DocType: Leave Block List,Leave Block List Dates,Lad Block List Datoer
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +56,Trimming,Trimning
-DocType: Workstation,Net Hour Rate,Net Hour Rate
-DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,Landed Cost kvittering
-DocType: Company,Default Terms,Standard Vilkår
-DocType: Packing Slip Item,Packing Slip Item,Packing Slip Vare
-DocType: POS Profile,Cash/Bank Account,Kontant / Bankkonto
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,Removed items with no change in quantity or value.,Fjernede elementer uden nogen ændringer i mængde eller værdi.
-DocType: Delivery Note,Delivery To,Levering Til
-DocType: Production Planning Tool,Get Sales Orders,Få salgsordrer
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} kan ikke være negativ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +103,Filing,Arkivering
-apps/erpnext/erpnext/templates/form_grid/item_grid.html +72,Discount,Rabat
-DocType: Features Setup,Purchase Discounts,Køb Rabatter
-DocType: Workstation,Wages,Løn
-DocType: Time Log,Will be updated only if Time Log is 'Billable',"Vil kun blive opdateret, hvis Time Log er &quot;faktureres&quot;"
-DocType: Project,Internal,Intern
-DocType: Task,Urgent,Urgent
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +97,Please specify a valid Row ID for row {0} in table {1},Angiv en gyldig Row ID for rækken {0} i tabel {1}
-DocType: Item,Manufacturer,Producent
-DocType: Landed Cost Item,Purchase Receipt Item,Kvittering Vare
-DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,Reserveret Warehouse i kundeordre / færdigvarer Warehouse
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +65,Selling Amount,Selling Beløb
-apps/erpnext/erpnext/projects/doctype/project/project.js +40,Time Logs,Time Logs
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +112,You are the Expense Approver for this record. Please Update the 'Status' and Save,Du er bekostning Godkender til denne oplysning. Venligst Opdater &quot;Status&quot; og Gem
-DocType: Serial No,Creation Document No,Creation dokument nr
-DocType: Issue,Issue,Issue
-apps/erpnext/erpnext/config/stock.py +136,"Attributes for Item Variants. e.g Size, Color etc.","Attributter for Item Varianter. f.eks størrelse, farve etc."
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +39,WIP Warehouse,WIP Warehouse
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +194,Serial No {0} is under maintenance contract upto {1},Løbenummer {0} er under vedligeholdelse kontrakt op {1}
-DocType: BOM Operation,Operation,Operation
-DocType: Lead,Organization Name,Organisationens navn
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,Konto suppleres ved hjælp af &quot;Find varer fra Køb Kvitteringer &#39;knappen
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,Salgsomkostninger
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Buying,Standard Buying
-DocType: GL Entry,Against,Imod
-DocType: Item,Default Selling Cost Center,Standard Selling Cost center
-DocType: Sales Partner,Implementation Partner,Implementering Partner
-DocType: Opportunity,Contact Info,Kontakt Info
-DocType: Packing Slip,Net Weight UOM,Nettovægt UOM
-DocType: Item,Default Supplier,Standard Leverandør
-DocType: Manufacturing Settings,Over Production Allowance Percentage,Over Produktion GODTGØRELSESPROCENT
-DocType: Shipping Rule Condition,Shipping Rule Condition,Forsendelse Rule Betingelse
-DocType: Features Setup,Miscelleneous,Miscelleneous
-DocType: Holiday List,Get Weekly Off Dates,Få ugentlige Off Datoer
-apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +30,End Date can not be less than Start Date,Slutdato kan ikke være mindre end Startdato
-DocType: Sales Person,Select company name first.,Vælg firmanavn først.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Dr,Dr
-apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,Citater modtaget fra leverandører.
-apps/erpnext/erpnext/controllers/selling_controller.py +21,To {0} | {1} {2},Til {0} | {1} {2}
-DocType: Time Log Batch,updated via Time Logs,opdateret via Time Logs
-apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,Gennemsnitlig alder
-DocType: Opportunity,Your sales person who will contact the customer in future,"Dit salg person, som vil kontakte kunden i fremtiden"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +588,List a few of your suppliers. They could be organizations or individuals.,Nævne et par af dine leverandører. De kunne være organisationer eller enkeltpersoner.
-DocType: Company,Default Currency,Standard Valuta
-DocType: Contact,Enter designation of this Contact,Indtast udpegelsen af ​​denne Kontakt
-DocType: Contact Us Settings,Address,Adresse
-DocType: Expense Claim,From Employee,Fra Medarbejder
-apps/erpnext/erpnext/controllers/accounts_controller.py +338,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,"Advarsel: Systemet vil ikke tjekke overfakturering, da beløbet til konto {0} i {1} er nul"
-DocType: Journal Entry,Make Difference Entry,Make Difference indtastning
-DocType: Upload Attendance,Attendance From Date,Fremmøde Fra dato
-DocType: Appraisal Template Goal,Key Performance Area,Key Performance Area
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +54,Transportation,Transport
-apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +67, and year: ,og år:
-DocType: SMS Center,Total Characters,Total tegn
-apps/erpnext/erpnext/controllers/buying_controller.py +139,Please select BOM in BOM field for Item {0},Vælg BOM i BOM vilkår for Item {0}
-DocType: C-Form Invoice Detail,C-Form Invoice Detail,C-Form Faktura Detail
-DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,Betaling Afstemning Faktura
-apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +32,Contribution %,Bidrag%
-DocType: Item,website page link,webside link
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +192,Let's prepare the system for first use.,Lad os forberede systemet til første brug.
-DocType: Company,Company registration numbers for your reference. Tax numbers etc.,Firma registreringsnumre til din reference. Skat numre etc.
-DocType: Sales Partner,Distributor,Distributør
-DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Indkøbskurv Shipping Rule
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +214,Production Order {0} must be cancelled before cancelling this Sales Order,"Produktionsordre {0} skal annulleres, før den annullerer denne Sales Order"
-,Ordered Items To Be Billed,Bestilte varer at blive faktureret
-apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +21,Select Time Logs and Submit to create a new Sales Invoice.,Vælg Time Logs og Send for at oprette en ny Sales Invoice.
-DocType: Global Defaults,Global Defaults,Globale standarder
-DocType: Salary Slip,Deductions,Fradrag
-DocType: Purchase Invoice,Start date of current invoice's period,Startdato for nuværende faktura menstruation
-apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +23,This Time Log Batch has been billed.,This Time Log Batch er blevet faktureret.
-apps/erpnext/erpnext/crm/doctype/lead/lead.js +32,Create Opportunity,Opret Opportunity
-DocType: Salary Slip,Leave Without Pay,Lad uden løn
-DocType: Supplier,Communications,Kommunikation
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +287,Capacity Planning Error,Capacity Planning Fejl
-DocType: Lead,Consultant,Konsulent
-DocType: Salary Slip,Earnings,Indtjening
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +357,Finished Item {0} must be entered for Manufacture type entry,Færdig element {0} skal indtastes for Fremstilling typen post
-apps/erpnext/erpnext/config/learn.py +77,Opening Accounting Balance,Åbning Regnskab Balance
-DocType: Sales Invoice Advance,Sales Invoice Advance,Salg Faktura Advance
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +398,Nothing to request,Intet at anmode
-apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date','Faktisk startdato' kan ikke være større end 'Faktisk slutdato'
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +75,Management,Ledelse
-apps/erpnext/erpnext/config/projects.py +33,Types of activities for Time Sheets,Typer af aktiviteter for Time Sheets
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +14,Investment casting,Investeringer støbning
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +51,Either debit or credit amount is required for {0},Enten kredit- eller beløb er påkrævet for {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""","Dette vil blive føjet til Item Code af varianten. For eksempel, hvis dit forkortelse er &quot;SM&quot;, og punktet koden er &quot;T-SHIRT&quot;, punktet koden for den variant, vil være &quot;T-SHIRT-SM&quot;"
-DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,"Nettoløn (i ord) vil være synlig, når du gemmer lønsedlen."
-apps/frappe/frappe/core/doctype/user/user_list.js +12,Active,Aktiv
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +154,Blue,Blå
-DocType: Purchase Invoice,Is Return,Er Return
-apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +123,Further nodes can be only created under 'Group' type nodes,Yderligere noder kan kun oprettes under &#39;koncernens typen noder
-DocType: Item,UOMs,UOMs
-apps/erpnext/erpnext/stock/utils.py +167,{0} valid serial nos for Item {1},{0} gyldige løbenr for Item {1}
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +57,Item Code cannot be changed for Serial No.,Item Code kan ikke ændres 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 Profil {0} allerede oprettet for bruger: {1} og selskab {2}
-DocType: Purchase Order Item,UOM Conversion Factor,UOM Conversion Factor
-DocType: Stock Settings,Default Item Group,Standard Punkt Group
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +156,Laminated object manufacturing,Lamineret objekt fremstillingsvirksomhed
-apps/erpnext/erpnext/config/buying.py +13,Supplier database.,Leverandør database.
-DocType: Account,Balance Sheet,Balance
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +561,Cost Center For Item with Item Code ',Cost Center For Item med Item Code &#39;
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +45,Stretch forming,Stretch danner
-DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,Dit salg person vil få en påmindelse på denne dato for at kontakte kunden
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +210,"Further accounts can be made under Groups, but entries can be made against non-Groups","Kan gøres yderligere konti under grupper, men oplysningerne kan gøres mod ikke-grupper"
-apps/erpnext/erpnext/config/hr.py +125,Tax and other salary deductions.,Skat og andre løn fradrag.
-DocType: Lead,Lead,Bly
-DocType: Email Digest,Payables,Gæld
-DocType: Account,Warehouse,Warehouse
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +90,Row #{0}: Rejected Qty can not be entered in Purchase Return,Row # {0}: Afvist Antal kan ikke indtastes i Indkøb Return
-,Purchase Order Items To Be Billed,Købsordre Varer at blive faktureret
-DocType: Purchase Invoice Item,Net Rate,Net Rate
-DocType: Purchase Invoice Item,Purchase Invoice Item,Købsfaktura Item
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +50,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,Stock Poster og GL Entries er reposted for de valgte Køb Kvitteringer
-apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +8,Item 1,Punkt 1
-DocType: Holiday,Holiday,Holiday
-DocType: Event,Saturday,Lørdag
-DocType: Leave Control Panel,Leave blank if considered for all branches,Lad stå tomt hvis det anses for alle brancher
-,Daily Time Log Summary,Daglig Time Log Summary
-DocType: DocField,Label,Label
-DocType: Payment Reconciliation,Unreconciled Payment Details,Ikke-afstemte Betalingsoplysninger
+apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted all transactions related to this company!,Succesfuld slettet alle transaktioner i forbindelse med dette selskab!
+DocType: Material Request Item,Required Date,Nødvendig Dato
+apps/erpnext/erpnext/controllers/trends.py +36,Fiscal Year: {0} does not exists,Fiscal År: {0} ikke eksisterer
+,Supplier-Wise Sales Analytics,Forhandler-Wise Sales Analytics
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +572,From Material Request,Fra Material Request
+,Customers Not Buying Since Long Time,Kunder Ikke købe siden lang tid
+DocType: Purchase Receipt Item,Recd Quantity,RECD Mængde
+apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +39,Time Log {0} must be 'Submitted',Time Log {0} skal være »Tilmeldt &#39;
+DocType: Opportunity,Potential Sales Deal,Potentielle Sales Deal
+DocType: Production Planning Tool,"Items to be requested which are ""Out of Stock"" considering all warehouses based on projected qty and minimum order qty",Varer der skal ansøges som er &quot;på lager&quot; i betragtning af alle lagre baseret på forventede qty og mindste bestilling qty
+DocType: Hub Settings,Hub Node,Hub Node
+DocType: Communication,Rejected,Afvist
+DocType: Employee,Personal Details,Personlige oplysninger
 DocType: Global Defaults,Current Fiscal Year,Indeværende finansår
-DocType: Global Defaults,Disable Rounded Total,Deaktiver Afrundet Total
-DocType: Lead,Call,Opkald
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +384,'Entries' cannot be empty,'Indlæg' kan ikke være tomt
-apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},Duplicate række {0} med samme {1}
-,Trial Balance,Trial Balance
-apps/erpnext/erpnext/config/hr.py +205,Setting up Employees,Opsætning af Medarbejdere
-apps/erpnext/erpnext/public/js/feature_setup.js +220,"Grid """,Grid &quot;
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +150,Please select prefix first,Vælg venligst præfiks først
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +138,Research,Forskning
-DocType: Maintenance Visit Purpose,Work Done,Arbejde Udført
-DocType: Contact,User ID,Bruger-id
-DocType: Communication,Sent,Sent
-apps/erpnext/erpnext/accounts/doctype/account/account.js +57,View Ledger,Vis Ledger
-DocType: File,Lft,LFT
-apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Tidligste
-apps/erpnext/erpnext/stock/doctype/item/item.py +394,"An Item Group exists with same name, please change the item name or rename the item group","Findes et Element Group med samme navn, skal du ændre elementet navn eller omdøbe varegruppe"
-DocType: Communication,Delivery Status,Levering status
-DocType: Production Order,Manufacture against Sales Order,Fremstilling mod kundeordre
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +517,Rest Of The World,Resten af ​​verden
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,Item {0} kan ikke have Batch
-,Budget Variance Report,Budget Variance Report
-DocType: Salary Slip,Gross Pay,Gross Pay
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +186,Dividends Paid,Betalt udbytte
-DocType: Stock Reconciliation,Difference Amount,Forskel Beløb
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +192,Retained Earnings,Overført overskud
-DocType: BOM Item,Item Description,Punkt Beskrivelse
-DocType: Payment Tool,Payment Mode,Betaling tilstand
-DocType: Purchase Invoice,Is Recurring,Er Tilbagevendende
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +154,Direct metal laser sintering,Direkte metal lasersintring
-DocType: Purchase Order,Supplied Items,Medfølgende varer
-DocType: Production Order,Qty To Manufacture,Antal Til Fremstilling
-DocType: Buying Settings,Maintain same rate throughout purchase cycle,Bevar samme sats i hele køb cyklus
-DocType: Opportunity Item,Opportunity Item,Opportunity Vare
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +61,Temporary Opening,Midlertidig Åbning
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +41,Cryorolling,Cryorolling
-,Employee Leave Balance,Medarbejder Leave Balance
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +128,Balance for Account {0} must always be {1},Balance for konto {0} skal altid være {1}
-DocType: Address,Address Type,Adressetype
-DocType: Purchase Receipt,Rejected Warehouse,Afvist Warehouse
-DocType: GL Entry,Against Voucher,Mod Voucher
-DocType: Item,Default Buying Cost Center,Standard købsomkostninger center
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +38,Item {0} must be Sales Item,Vare {0} skal være Sales Item
-DocType: Item,Lead Time in days,Lead Time i dage
-,Accounts Payable Summary,Kreditorer Resumé
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +193,Not authorized to edit frozen Account {0},Ikke autoriseret til at redigere frosne konto {0}
-DocType: Journal Entry,Get Outstanding Invoices,Få udestående fakturaer
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,Sales Order {0} er ikke gyldig
-apps/erpnext/erpnext/setup/doctype/company/company.py +172,"Sorry, companies cannot be merged","Beklager, kan virksomhederne ikke slås sammen"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +145,Small,Lille
-DocType: Employee,Employee Number,Medarbejder nummer
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},"(E), der allerede er i brug Case Ingen. Prøv fra sag {0}"
-,Invoiced Amount (Exculsive Tax),Faktureret beløb (exculsive Tax)
-apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,Punkt 2
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +59,Account head {0} created,Konto head {0} oprettet
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +153,Green,Grøn
-DocType: Item,Auto re-order,Auto re-ordre
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +57,Total Achieved,Total Opnået
+DocType: Purchase Invoice,Total Advance,Samlet Advance
+DocType: Production Order,Actual Start Date,Faktiske startdato
 DocType: Employee,Place of Issue,Sted for Issue
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +59,Contract,Kontrakt
-DocType: Report,Disabled,Handicappet
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +490,UOM coversion factor required for UOM: {0} in Item: {1},UOM coversion faktor kræves for Pakke: {0} i Konto: {1}
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +83,Indirect Expenses,Indirekte udgifter
-apps/erpnext/erpnext/controllers/selling_controller.py +163,Row {0}: Qty is mandatory,Række {0}: Antal er obligatorisk
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +8,Agriculture,Landbrug
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +611,Your Products or Services,Dine produkter eller tjenester
-DocType: Mode of Payment,Mode of Payment,Mode Betaling
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,Dette er en rod varegruppe og kan ikke redigeres.
-DocType: Journal Entry Account,Purchase Order,Indkøbsordre
-DocType: Warehouse,Warehouse Contact Info,Lager Kontakt Info
-apps/frappe/frappe/public/js/frappe/form/save.js +78,Name is required,Navn er påkrævet
-DocType: Purchase Invoice,Recurring Type,Tilbagevendende Type
-DocType: Address,City/Town,By / Town
-DocType: Serial No,Serial No Details,Serial Ingen Oplysninger
-DocType: Purchase Invoice Item,Item Tax Rate,Item Skat
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +113,"For {0}, only credit accounts can be linked against another debit entry",For {0} kan kun kredit konti knyttes mod en anden debet post
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Delivery Note {0} is not submitted,Levering Note {0} er ikke indsendt
-apps/erpnext/erpnext/stock/get_item_details.py +136,Item {0} must be a Sub-contracted Item,Vare {0} skal være en underentreprise Vare
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,Capital Udstyr
-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.","Prisfastsættelse Regel først valgt baseret på &quot;Apply On &#39;felt, som kan være Item, punkt Group eller Brand."
-DocType: Hub Settings,Seller Website,Sælger Website
-apps/erpnext/erpnext/controllers/selling_controller.py +143,Total allocated percentage for sales team should be 100,Samlede fordelte procentdel for salgsteam bør være 100
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +111,Production Order status is {0},Produktionsordre status er {0}
-DocType: Appraisal Goal,Goal,Goal
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +318,Expected Delivery Date is lesser than Planned Start Date.,Forventet leveringsdato er mindre end planlagt startdato.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +579,For Supplier,For Leverandøren
-DocType: Account,Setting Account Type helps in selecting this Account in transactions.,Indstilling Kontotype hjælper med at vælge denne konto i transaktioner.
-DocType: Purchase Invoice,Grand Total (Company Currency),Grand Total (Company Valuta)
-apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,Samlet Udgående
-apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +48,"There can only be one Shipping Rule Condition with 0 or blank value for ""To Value""",Der kan kun være én Forsendelse Rule Condition med 0 eller blank værdi for &quot;til værdi&quot;
-DocType: Authorization Rule,Transaction,Transaktion
-apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +45,Note: This Cost Center is a Group. Cannot make accounting entries against groups.,Bemærk: Denne Cost Center er en gruppe. Kan ikke gøre regnskabsposter mod grupper.
-apps/frappe/frappe/config/desk.py +7,Tools,Værktøj
-DocType: Item,Website Item Groups,Website varegrupper
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +174,Production order number is mandatory for stock entry purpose manufacture,Produktion ordrenummer er obligatorisk for lager post fremstilling formål
-DocType: Purchase Invoice,Total (Company Currency),I alt (Company Valuta)
-apps/erpnext/erpnext/stock/utils.py +162,Serial number {0} entered more than once,Serienummer {0} indtastet mere end én gang
-DocType: Journal Entry,Journal Entry,Kassekladde
-DocType: Workstation,Workstation Name,Workstation Navn
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,Email Digest:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +432,BOM {0} does not belong to Item {1},BOM {0} ikke hører til Vare {1}
-DocType: Sales Partner,Target Distribution,Target Distribution
-apps/frappe/frappe/public/js/frappe/model/model.js +25,Comments,Kommentarer
-DocType: Salary Slip,Bank Account No.,Bankkonto No.
-DocType: Naming Series,This is the number of the last created transaction with this prefix,Dette er antallet af sidste skabte transaktionen med dette præfiks
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +172,Valuation Rate required for Item {0},Værdiansættelse Rate kræves for Item {0}
-DocType: Quality Inspection Reading,Reading 8,Reading 8
-DocType: Sales Partner,Agent,Agent
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +74,"Total {0} for all items is zero, may you should change 'Distribute Charges Based On'","Total {0} for alle poster er nul, kan du skal ændre &#39;Fordel afgifter baseret på&#39;"
-DocType: Purchase Invoice,Taxes and Charges Calculation,Skatter og Afgifter Beregning
-DocType: BOM Operation,Workstation,Arbejdsstation
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +112,Hardware,Hardware
-DocType: Attendance,HR Manager,HR Manager
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +50,Privilege Leave,Privilege Forlad
-DocType: Purchase Invoice,Supplier Invoice Date,Leverandør Faktura Dato
-apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +79,You need to enable Shopping Cart,Du skal aktivere Indkøbskurv
-apps/frappe/frappe/public/js/frappe/form/grid_body.html +6,No Data,Ingen data
-DocType: Appraisal Template Goal,Appraisal Template Goal,Vurdering Template Goal
-DocType: Salary Slip,Earning,Optjening
-,BOM Browser,BOM Browser
-DocType: Purchase Taxes and Charges,Add or Deduct,Tilføje eller fratrække
-apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +81,Overlapping conditions found between:,Overlappende betingelser fundet mellem:
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +168,Against Journal Entry {0} is already adjusted against some other voucher,Mod Kassekladde {0} er allerede justeret mod en anden kupon
-apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +68,Total Order Value,Samlet ordreværdi
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +38,Food,Mad
-apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Ageing Range 3
-apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +139,You can make a time log only against a submitted production order,Du kan lave en tid log kun mod en indsendt produktionsordre
-DocType: Maintenance Schedule Item,No of Visits,Ingen af ​​besøg
-DocType: File,old_parent,old_parent
-apps/erpnext/erpnext/config/support.py +33,"Newsletters to contacts, leads.","Nyhedsbreve til kontakter, fører."
-apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},Sum af point for alle mål skal være 100. Det er {0}
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +365,Operations cannot be left blank.,Operationer kan ikke være tomt.
-,Delivered Items To Be Billed,Leverede varer at blive faktureret
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,Warehouse kan ikke ændres for Serial No.
-DocType: DocField,Description,Beskrivelse
-DocType: Authorization Rule,Average Discount,Gennemsnitlig rabat
-DocType: Letter Head,Is Default,Er Standard
-DocType: Address,Utilities,Forsyningsvirksomheder
-DocType: Purchase Invoice Item,Accounting,Regnskab
-DocType: Features Setup,Features Setup,Features Setup
-apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,View Offer Letter,Se tilbud Letter
-DocType: Communication,Communication,Kommunikation
-DocType: Item,Is Service Item,Er service Item
-DocType: Activity Cost,Projects,Projekter
-apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +31,Please select Fiscal Year,Vælg venligst regnskabsår
-apps/erpnext/erpnext/controllers/buying_controller.py +23,From {0} | {1} {2},Fra {0} | {1} {2}
-DocType: BOM Operation,Operation Description,Operation Beskrivelse
-DocType: Item,Will also apply to variants,Vil også gælde for varianter
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +30,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,Kan ikke ændre regnskabsår Start Dato og Skatteårsafslutning Dato når regnskabsår er gemt.
-DocType: Quotation,Shopping Cart,Indkøbskurv
-apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Avg Daily Outgoing,Gennemsnitlig Daily Udgående
-DocType: Pricing Rule,Campaign,Kampagne
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +30,Approval Status must be 'Approved' or 'Rejected',Godkendelsesstatus skal &quot;Godkendt&quot; eller &quot;Afvist&quot;
-DocType: Purchase Invoice,Contact Person,Kontakt Person
-apps/erpnext/erpnext/projects/doctype/task/task.py +35,'Expected Start Date' can not be greater than 'Expected End Date','Forventet startdato' kan ikke være større end 'Forventet slutdato '
-DocType: Holiday List,Holidays,Helligdage
-DocType: Sales Order Item,Planned Quantity,Planlagt Mængde
-DocType: Purchase Invoice Item,Item Tax Amount,Item Skat Beløb
-DocType: Item,Maintain Stock,Vedligehold Stock
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +213,Stock Entries already created for Production Order ,Stock Entries allerede skabt til produktionsordre
-DocType: Leave Control Panel,Leave blank if considered for all designations,Lad stå tomt hvis det anses for alle betegnelser
-apps/erpnext/erpnext/controllers/accounts_controller.py +499,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Afgift af typen &#39;Actual &quot;i rækken {0} kan ikke indgå i Item Rate
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,Max: {0},Max: {0}
-apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +16,From Datetime,Fra datotid
-DocType: Email Digest,For Company,For Company
-apps/erpnext/erpnext/config/support.py +38,Communication log.,Kommunikation log.
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +66,Buying Amount,Køb Beløb
-DocType: Sales Invoice,Shipping Address Name,Forsendelse Adresse Navn
-apps/erpnext/erpnext/accounts/doctype/account/account.js +50,Chart of Accounts,Kontoplan
-DocType: Material Request,Terms and Conditions Content,Vilkår og betingelser Indhold
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +471,cannot be greater than 100,må ikke være større end 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +546,Item {0} is not a stock Item,Vare {0} er ikke et lager Vare
-DocType: Maintenance Visit,Unscheduled,Uplanlagt
-DocType: Employee,Owned,Ejet
-DocType: Salary Slip Deduction,Depends on Leave Without Pay,Afhænger Leave uden løn
-DocType: Pricing Rule,"Higher the number, higher the priority","Højere tallet er, jo højere prioritet"
-,Purchase Invoice Trends,Købsfaktura Trends
-DocType: Employee,Better Prospects,Bedre udsigter
-DocType: Appraisal,Goals,Mål
-DocType: Warranty Claim,Warranty / AMC Status,Garanti / AMC status
-,Accounts Browser,Konti Browser
-DocType: GL Entry,GL Entry,GL indtastning
-DocType: HR Settings,Employee Settings,Medarbejder Indstillinger
-,Batch-Wise Balance History,Batch-Wise Balance History
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +72,To Do List,To Do List
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +63,Apprentice,Lærling
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +99,Negative Quantity is not allowed,Negative Mængde er ikke tilladt
-DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
-Used for Taxes and Charges",Skat detalje tabel hentes fra post mester som en streng og opbevares i dette område. Bruges til skatter og afgifter
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +61,Lancing,Lancing
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +151,Employee cannot report to himself.,Medarbejder kan ikke rapportere til ham selv.
-DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Hvis kontoen er frossen, er poster lov til begrænsede brugere."
-DocType: Job Opening,"Job profile, qualifications required etc.","Jobprofil, kvalifikationer kræves etc."
-DocType: Journal Entry Account,Account Balance,Kontosaldo
-DocType: Rename Tool,Type of document to rename.,Type dokument omdøbe.
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +630,We buy this Item,Vi køber denne vare
-DocType: Address,Billing,Fakturering
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +77,Flanging,Flanger
-DocType: Bulk Email,Not Sent,Ikke Sent
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +73,Explosive forming,Eksplosiv danner
-DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),Total Skatter og Afgifter (Company valuta)
-DocType: Shipping Rule,Shipping Account,Forsendelse konto
-apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +43,Scheduled to send to {0} recipients,Planlagt at sende til {0} modtagere
+apps/erpnext/erpnext/config/accounts.py +148,Currency exchange rate master.,Valutakursen mester.
+DocType: Appraisal,For Employee,For Medarbejder
+DocType: Leave Block List,Leave Block List Allowed,Lad Block List tilladt
+apps/erpnext/erpnext/stock/doctype/item/item.py +317,'Has Serial No' can not be 'Yes' for non-stock item,'Har serienummer' kan ikke være 'Ja' for ikke-lagervare
+DocType: Job Applicant,Applicant Name,Ansøger Navn
 DocType: Quality Inspection,Readings,Aflæsninger
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Sub Assemblies,Sub forsamlinger
-DocType: Shipping Rule Condition,To Value,Til Value
-DocType: Supplier,Stock Manager,Stock manager
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +143,Source warehouse is mandatory for row {0},Kilde lageret er obligatorisk for rækken {0}
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +581,Packing Slip,Packing Slip
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,Kontorleje
-apps/erpnext/erpnext/config/setup.py +110,Setup SMS gateway settings,Opsætning SMS gateway-indstillinger
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Import mislykkedes!
+DocType: Pricing Rule,Pricing Rule Help,Prisfastsættelse Rule Hjælp
+apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +8,Import Subscribers,Import Abonnenter
+apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +137,Please verify your email id,Skal du bekræfte din e-mail-id
+apps/erpnext/erpnext/stock/get_item_details.py +128,"Item {0} is a template, please select one of its variants","Vare {0} er en skabelon, skal du vælge en af ​​dens varianter"
+DocType: Features Setup,POS View,POS View
+DocType: Sales Order Item,Produced Quantity,Produceret Mængde
+DocType: Sales Partner,Sales Partner Target,Salg Partner Target
+DocType: Journal Entry Account,Sales Order,Sales Order
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Source of Funds (Liabilities),Finansieringskilde (Passiver)
+apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,Procentdel Tildeling bør være lig med 100%
+DocType: Account,Accounts Manager,Accounts Manager
+apps/erpnext/erpnext/public/js/setup_wizard.js +142,Company Abbreviation,Firma Forkortelse
+apps/erpnext/erpnext/utilities/transaction_base.py +104,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Row # {0}: Pris skal være samme som {1}: {2} ({3} / {4})
+DocType: Issue,Resolution Date,Opløsning Dato
+DocType: Maintenance Schedule Item,No of Visits,Ingen af ​​besøg
+DocType: Employee,Ms,Ms
+apps/erpnext/erpnext/config/crm.py +64,Sales campaigns.,Salgskampagner.
+DocType: Expense Claim,"A user with ""Expense Approver"" role",En bruger med 'Godkend udgifter' rolle
+DocType: Sales Order Item,Sales Order Date,Sales Order Date
+DocType: Production Order Operation,In minutes,I minutter
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Vare {0} ikke fundet
+apps/erpnext/erpnext/projects/doctype/task/task.py +35,'Expected Start Date' can not be greater than 'Expected End Date','Forventet startdato' kan ikke være større end 'Forventet slutdato '
+DocType: Supplier,Default Payable Accounts,Standard betales Konti
+DocType: Quality Inspection Reading,Reading 7,Reading 7
+DocType: Communication,Delivery Status,Levering status
+DocType: Event,Wednesday,Onsdag
+apps/erpnext/erpnext/setup/doctype/company/company.js +44,Delete all the Transactions for this Company,Slette alle transaktioner for denne Company
+apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +30,Newsletter has already been sent,Nyhedsbrev er allerede blevet sendt
+apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),I alt (Antal)
+DocType: Manufacturing Settings,Manufacturing Settings,Manufacturing Indstillinger
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +170,Job Description,Jobbeskrivelse
+apps/erpnext/erpnext/accounts/party.py +284,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Bemærk: På grund / reference Date overstiger tilladte kunde kredit dage efter {0} dag (e)
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +81,Installation date cannot be before delivery date for Item {0},Installation dato kan ikke være før leveringsdato for Item {0}
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,Health Care
+DocType: Notification Control,Notification Control,Meddelelse Kontrol
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +121,Please save the document before generating maintenance schedule,"Gem venligst dokumentet, før generere vedligeholdelsesplan"
+DocType: Purchase Invoice Advance,Purchase Invoice Advance,Købsfaktura Advance
+apps/erpnext/erpnext/public/js/setup_wizard.js +237,The Brand,Brand
+apps/erpnext/erpnext/stock/get_item_details.py +449,No default BOM exists for Item {0},Ingen standard BOM eksisterer for Item {0}
+DocType: Employee,Salary Mode,Løn-tilstand
+,Sales Analytics,Salg Analytics
+apps/erpnext/erpnext/config/hr.py +120,Salary components.,Løn komponenter.
+DocType: Supplier,Communications,Kommunikation
+apps/erpnext/erpnext/config/manufacturing.py +29,All Products or Services.,Alle produkter eller tjenesteydelser.
+DocType: Bank Reconciliation,Get Relevant Entries,Få relevante oplysninger
+apps/erpnext/erpnext/public/js/setup_wizard.js +283,Add Taxes,Tilføj Skatter
+DocType: Delivery Note Item,Against Sales Order Item,Mod Sales Order Item
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +311,All these items have already been invoiced,Alle disse punkter er allerede blevet faktureret
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening','Åbning'
+apps/erpnext/erpnext/stock/doctype/item/item.py +559,Item {0} is cancelled,Vare {0} er aflyst
+apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +9,Make Time Log Batch,Make Time Log Batch
+DocType: Serial No,Out of Warranty,Ud af garanti
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +67,Row # {0}:,Row # {0}:
+apps/erpnext/erpnext/config/setup.py +93,Email Notifications,E-mail-meddelelser
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +33,Make Maintenance Visit,Make Vedligeholdelse Besøg
+DocType: Warehouse,Warehouse Contact Info,Lager Kontakt Info
+DocType: Account,Setting Account Type helps in selecting this Account in transactions.,Indstilling Kontotype hjælper med at vælge denne konto i transaktioner.
+DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,"I Words (eksport) vil være synlig, når du gemmer følgesedlen."
+DocType: Employee,Offer Date,Offer Dato
+DocType: Stock Ledger Entry,Stock Queue (FIFO),Stock kø (FIFO)
+DocType: Sales Order,Delivery Date,Leveringsdato
+DocType: Sales Order,Billing Status,Fakturering status
+apps/frappe/frappe/core/doctype/doctype/doctype.py +106,Series {0} already used in {1},Serien {0} allerede anvendes i {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +480,From Purchase Order,Fra indkøbsordre
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +101,Not allowed to update stock transactions older than {0},Ikke lov til at opdatere lagertransaktioner ældre end {0}
+apps/erpnext/erpnext/public/js/setup_wizard.js +238,Upload your letter head and logo. (you can edit them later).,Upload dit brev hoved og logo. (Du kan redigere dem senere).
+apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +52,"An item exists with same name ({0}), please change the item group name or rename the item","Et element eksisterer med samme navn ({0}), skal du ændre navnet elementet gruppe eller omdøbe elementet"
+,Customer Acquisition and Loyalty,Customer Acquisition og Loyalitet
+DocType: C-Form Invoice Detail,Grand Total,Grand Total
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +396,Material Requests {0} created,Materiale Anmodning {0} skabt
+DocType: System Settings,In Hours,I Hours
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +86,Opportunity Lost,Opportunity Lost
+DocType: Customer,From Lead,Fra Lead
+DocType: Supplier,Credit Days,Credit Dage
+DocType: Operation,Default Workstation,Standard Workstation
+DocType: Purchase Receipt,Return Against Purchase Receipt,Retur Against kvittering
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,Sales Order {0} er ikke gyldig
+DocType: Supplier,Contact HTML,Kontakt HTML
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +120,Standard Buying,Standard Buying
+DocType: Purchase Taxes and Charges,Actual,Faktiske
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +36,Voucher #,Voucher #
+DocType: Sales Team,Contribution (%),Bidrag (%)
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +65,Another Salary Structure {0} is active for employee {1}. Please make its status 'Inactive' to proceed.,En anden Løn Struktur {0} er aktiv for medarbejder {1}. Venligst gøre sin status &quot;Inaktiv&quot; for at fortsætte.
+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.,At spore post i salgs- og købsdokumenter baseret på deres løbenr. Dette er også bruges til at spore garantiforpligtelser detaljer af produktet.
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,Warehouse kan ikke ændres for Serial No.
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +70,Item {0} must be a stock Item,Vare {0} skal være en bestand Vare
+DocType: Customer,Credit Days Based On,Credit Dage Baseret på
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +137,Not Set,Ikke Sæt
+DocType: Naming Series,Set prefix for numbering series on your transactions,Sæt præfiks for nummerering serie om dine transaktioner
+DocType: Contact,Enter department to which this Contact belongs,"Indtast afdeling, som denne Kontakt hører"
+DocType: Company,Abbr,Fork
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard_page.html +17,Next,Næste
+apps/erpnext/erpnext/setup/setup_wizard/default_website.py +72,General,Generelt
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,Taget
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +17,Set as Default,Indstil som standard
+DocType: Supplier,Is Frozen,Er Frozen
+DocType: Employee External Work History,Total Experience,Total Experience
+,Amount to Bill,Beløb til Bill
+,Item-wise Price List Rate,Item-wise Prisliste Rate
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +76,Account {0} cannot be a Group,Konto {0} kan ikke være en gruppe
+DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,Warehouse kan kun ændres via Stock indtastning / følgeseddel / kvittering
+,Pending Amount,Afventer Beløb
+DocType: Newsletter,Test Email Id,Test Email Id
+DocType: Production Planning Tool,Select Sales Orders from which you want to create Production Orders.,"Vælg salgsordrer, som du ønsker at skabe produktionsordrer."
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +365,Operations cannot be left blank.,Operationer kan ikke være tomt.
+DocType: Packing Slip,Gross Weight UOM,Gross Weight UOM
+apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +29,Activity Cost exists for Employee {0} against Activity Type - {1},Aktivitet Omkostninger eksisterer for Medarbejder {0} mod Activity Type - {1}
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},Række {0}: Allokeret mængde {1} skal være mindre end eller lig med at fakturere udestående beløb {2}
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,Computer
+apps/erpnext/erpnext/config/selling.py +294,Customer and Supplier,Kunde og leverandør
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,Fremmøde Fra Dato og fremmøde til dato er obligatorisk
+apps/erpnext/erpnext/setup/doctype/company/company.py +47,Account {0} does not belong to company: {1},Konto {0} tilhører ikke virksomheden: {1}
+DocType: SMS Center,All Sales Partner Contact,Alle Sales Partner Kontakt
+DocType: Bin,Moving Average Rate,Glidende gennemsnit Rate
+apps/erpnext/erpnext/public/js/setup_wizard.js +303,Your Customers,Dine kunder
+,Produced,Produceret
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Red,Rød
+DocType: Quality Inspection Reading,Reading 8,Reading 8
+DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,"Hastighed, hvormed kunden Valuta omdannes til kundens basisvaluta"
+apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +81,Overlapping conditions found between:,Overlappende betingelser fundet mellem:
+apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Absent,Total Fraværende
+,Customer Credit Balance,Customer Credit Balance
+DocType: Journal Entry,Stock Entry,Stock indtastning
+DocType: Customer Group,Only leaf nodes are allowed in transaction,Kun blade noder er tilladt i transaktionen
+DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,Du må ikke vise nogen symbol ligesom $ etc siden valutaer.
+DocType: GL Entry,Against Voucher Type,Mod Voucher Type
+DocType: Journal Entry Account,Party Balance,Party Balance
+DocType: Authorization Control,Authorization Control,Authorization Kontrol
+apps/erpnext/erpnext/config/accounts.py +127,Point-of-Sale Profile,Point-of-Sale profil
+DocType: Monthly Distribution,Name of the Monthly Distribution,Navnet på den månedlige Distribution
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +47,Party Type and Party is required for Receivable / Payable account {0},Party Type og parti er nødvendig for Tilgodehavende / Betales konto {0}
+DocType: Lead,Campaign Name,Kampagne Navn
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +17,Ref,Ref
+DocType: Activity Cost,Billing Rate,Fakturering Rate
+DocType: Account,Chargeable,Gebyr
+DocType: Lead,Request for Information,Anmodning om information
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +38,Newspaper Publishers,Dagblades
+DocType: Buying Settings,Naming Series,Navngivning Series
+DocType: Account,Cost of Goods Sold,Vareforbrug
+apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,Punkt 3
+DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,"Den første Lad Godkender i listen, vil blive indstillet som standard Forlad Godkender"
+apps/erpnext/erpnext/public/js/pos/pos.js +343,Pay,Betale
+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},Materiale Request af maksimum {0} kan gøres for Item {1} mod Sales Order {2}
+DocType: Journal Entry,Accounts Payable,Kreditor
+DocType: Sales Partner,Dealer,Forhandler
+DocType: Purchase Invoice,Monthly,Månedlig
+apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +3,Awesome Products,Awesome Products
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +108,Fill the form and save it,Udfyld formularen og gemme det
+DocType: Global Defaults,Global Defaults,Globale standarder
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +34,Fiscal Year Start Date should not be greater than Fiscal Year End Date,Regnskabsår Startdato må ikke være større end Skatteårsafslutning Dato
+apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +67, and year: ,og år:
+DocType: Purchase Invoice,Items,Varer
+DocType: Leave Type,Allow Negative Balance,Tillad Negativ Balance
 apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,Ingen adresse tilføjet endnu.
-DocType: Workstation Working Hour,Workstation Working Hour,Workstation Working Hour
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +83,Analyst,Analytiker
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +202,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Række {0}: Allokeret mængde {1} skal være mindre end eller lig med JV beløb {2}
-DocType: Item,Inventory,Inventory
-apps/erpnext/erpnext/public/js/pos/pos.js +402,Payment cannot be made for empty cart,Betaling kan ikke ske for tomme vogn
-DocType: Item,Sales Details,Salg Detaljer
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +149,Pinning,Pinning
-DocType: Opportunity,With Items,Med Varer
+DocType: Appraisal Goal,Goal,Goal
+apps/erpnext/erpnext/config/support.py +13,Support queries from customers.,Support forespørgsler fra kunder.
+apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +36,Select Company...,Vælg Company ...
+DocType: Pricing Rule,Price or Discount,Pris eller rabat
+DocType: Global Defaults,Hide Currency Symbol,Skjul Valuta Symbol
+DocType: Pricing Rule,Valid Upto,Gyldig Op
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,Detail &amp; Wholesale
+DocType: Sales Invoice,Commission,Kommissionen
+DocType: Purchase Invoice,Return Against Purchase Invoice,Retur Against købsfaktura
+DocType: Workflow State,Stop,Stands
+DocType: Authorization Rule,Applicable To (Role),Gælder for (Rolle)
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +256,Sales Invoice {0} has already been submitted,Salg Faktura {0} er allerede blevet indsendt
+DocType: Pricing Rule,Supplier,Leverandør
+DocType: DocField,Password,Adgangskode
+DocType: Account,Expense,Expense
+DocType: Journal Entry,Remark,Bemærkning
+apps/erpnext/erpnext/public/js/setup_wizard.js +325,Your Suppliers,Dine Leverandører
+apps/erpnext/erpnext/controllers/accounts_controller.py +392,"Total advance ({0}) against Order {1} cannot be greater \
+				than the Grand Total ({2})",Total forhånd ({0}) mod Order {1} kan ikke være større \ end Grand Total ({2})
+DocType: Purchase Invoice,The date on which recurring invoice will be stop,"Den dato, hvor tilbagevendende faktura vil blive stoppe"
+DocType: Production Order Operation,Updated via 'Time Log',Opdateret via &#39;Time Log&#39;
+DocType: Lead,Fax,Fax
+,Profit and Loss Statement,Resultatopgørelse
+DocType: Lead,Lead,Bly
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +391,Stock cannot be updated against Delivery Note {0},Stock kan ikke opdateres mod følgeseddel {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +236,Item {0} must be Sales or Service Item in {1},Vare {0} skal være Salg eller service Item i {1}
+apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +121,New {0} Name,Ny {0} Navn
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +53,Variance,Varians
+DocType: Leave Block List,Leave Block List Name,Lad Block List Name
+DocType: Email Digest,Receivables / Payables,Tilgodehavender / Gæld
+DocType: Purchase Order,Ref SQ,Ref SQ
+DocType: SMS Settings,Receiver Parameter,Modtager Parameter
+DocType: C-Form,Customer,Kunde
+DocType: Serial No,Purchase / Manufacture Details,Køb / Fremstilling Detaljer
+DocType: SMS Center,SMS Center,SMS-center
+DocType: Manufacturing Settings,Allow Production on Holidays,Tillad Produktion på helligdage
+DocType: Quality Inspection Reading,Reading 9,Reading 9
+DocType: Event,Sunday,Søndag
+apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},Duplicate række {0} med samme {1}
+DocType: SMS Center,All Employee (Active),Alle Medarbejder (Active)
+DocType: Pricing Rule,Price,Pris
+DocType: Naming Series,Update Series,Opdatering Series
+apps/erpnext/erpnext/stock/utils.py +174,Warehouse {0} does not belong to company {1},Warehouse {0} ikke hører til virksomheden {1}
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +63,Avg. Selling Rate,Gns. Salgskurs
+DocType: Journal Entry Account,Purchase Invoice,Indkøb Faktura
+DocType: Maintenance Schedule,Generate Schedule,Generer Schedule
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +9,"Note: If payment is not made against any reference, make Journal Entry manually.","Bemærk: Hvis betaling ikke sker mod nogen reference, gør Kassekladde manuelt."
+apps/erpnext/erpnext/accounts/page/pos/pos_page.html +13,Make new POS Profile,Foretag ny POS profil
+DocType: Sales Partner,Sales Partner Name,Salg Partner Navn
+DocType: Packing Slip,If more than one package of the same type (for print),Hvis mere end én pakke af samme type (til print)
+DocType: Appraisal Template Goal,Key Performance Area,Key Performance Area
+DocType: Address Template,"<h4>Default Template</h4>
+<p>Uses <a href=""http://jinja.pocoo.org/docs/templates/"">Jinja Templating</a> and all the fields of Address (including Custom Fields if any) will be available</p>
+<pre><code>{{ address_line1 }}&lt;br&gt;
+{% if address_line2 %}{{ address_line2 }}&lt;br&gt;{% endif -%}
+{{ city }}&lt;br&gt;
+{% if state %}{{ state }}&lt;br&gt;{% endif -%}
+{% if pincode %} PIN:  {{ pincode }}&lt;br&gt;{% endif -%}
+{{ country }}&lt;br&gt;
+{% if phone %}Phone: {{ phone }}&lt;br&gt;{% endif -%}
+{% if fax %}Fax: {{ fax }}&lt;br&gt;{% endif -%}
+{% if email_id %}Email: {{ email_id }}&lt;br&gt;{% endif -%}
+</code></pre>","<h4> Standardskabelon </h4><p> Bruger <a href=""http://jinja.pocoo.org/docs/templates/"">Jinja Templatering</a> og alle områderne adresse (herunder brugerdefinerede felter hvis nogen) vil være til rådighed </p><pre> <code>{{ address_line1 }}&lt;br&gt; {% if address_line2 %}{{ address_line2 }}&lt;br&gt;{% endif -%} {{ city }}&lt;br&gt; {% if state %}{{ state }}&lt;br&gt;{% endif -%} {% if pincode %} PIN: {{ pincode }}&lt;br&gt;{% endif -%} {{ country }}&lt;br&gt; {% if phone %}Phone: {{ phone }}&lt;br&gt;{% endif -%} {% if fax %}Fax: {{ fax }}&lt;br&gt;{% endif -%} {% if email_id %}Email: {{ email_id }}&lt;br&gt;{% endif -%}</code> </pre>"
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +245,Select Your Language,Vælg dit sprog
+DocType: Employee,Owned,Ejet
+apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,Ny kunde Omsætning
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +179,Make Excise Invoice,Make Excise Faktura
+DocType: Purchase Order,Get Last Purchase Rate,Få Sidste Purchase Rate
+apps/erpnext/erpnext/hooks.py +54,Orders,Ordrer
+apps/erpnext/erpnext/config/accounts.py +164,"e.g. Bank, Cash, Credit Card","fx Bank, Kontant, Kreditkort"
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Tabt
+DocType: Leave Control Panel,Leave blank if considered for all departments,Lad stå tomt hvis det anses for alle afdelinger
+DocType: Stock Settings,Raise Material Request when stock reaches re-order level,Hæv Materiale Request når bestanden når re-order-niveau
+DocType: POS Profile,[Select],[Vælg]
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +16,The selected item cannot have Batch,Det valgte emne kan ikke have Batch
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +198,Maintenance start date can not be before delivery date for Serial No {0},Vedligeholdelse startdato kan ikke være før leveringsdato for Serial Nej {0}
+DocType: Batch,Batch,Batch
+apps/erpnext/erpnext/accounts/party.py +287,Due / Reference Date cannot be after {0},Due / reference Dato kan ikke være efter {0}
+DocType: Leave Application,Total Leave Days,Total feriedage
+apps/erpnext/erpnext/config/hr.py +18,Applications for leave.,Ansøgning om orlov.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +47,Account {0}: Parent account {1} does not belong to company: {2},Konto {0}: Forældre-konto {1} tilhører ikke virksomheden: {2}
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +114,Setting Up,Opsætning
+DocType: Employee,Short biography for website and other publications.,Kort biografi for hjemmesiden og andre publikationer.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Black,Sort
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +95,{0} {1} has already been submitted,{0} {1} er allerede indsendt
+DocType: Time Log,Operation ID,Operation ID
+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","At spore mærke i følgende dokumenter Delivery Note, Opportunity, Material Request, punkt, Indkøbsordre, Indkøb Gavekort, køber Modtagelse, Citat, Sales Faktura, Produkt Bundle, salgsordre, Løbenummer"
+DocType: Production Order,Operation Cost,Operation Cost
+apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,Titler til print skabeloner f.eks Proforma Invoice.
+DocType: Expense Claim Detail,Sanctioned Amount,Sanktioneret Beløb
+DocType: Landed Cost Voucher,Landed Cost Help,Landed Cost Hjælp
+DocType: Communication,Closed,Lukket
+DocType: Quotation,Term Details,Term Detaljer
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +4,Statement of Account,Kontoudtog
+apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,Brev hoveder for print skabeloner.
+DocType: Features Setup,"All export related fields like currency, conversion rate, export total, export grand total etc are available in Delivery Note, POS, Quotation, Sales Invoice, Sales Order etc.","Alle eksport relaterede områder som valuta, konverteringsfrekvens, eksport i alt, eksport grand total etc er tilgængelige i Delivery Note, POS, Citat, Sales Invoice, Sales Order etc."
+DocType: Production Order,Qty To Manufacture,Antal Til Fremstilling
+apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,Dette er en rod varegruppe og kan ikke redigeres.
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,Faktiske Antal er obligatorisk
+DocType: Packing Slip,Gross Weight,Bruttovægt
+DocType: Communication,Email,Email
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +285,New Cost Center Name,Ny Cost center navn
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +34,From Date cannot be greater than To Date,Fra dato ikke kan være større end til dato
+DocType: Purchase Invoice,Recurring Print Format,Tilbagevendende Print Format
+DocType: Hub Settings,Seller City,Sælger By
+DocType: Material Request,Material Issue,Materiale Issue
+,Ordered Items To Be Delivered,"Bestilte varer, der skal leveres"
+DocType: Journal Entry,Total Amount in Words,Samlet beløb i Words
+DocType: Purchase Order Item,Qty as per Stock UOM,Antal pr Stock UOM
+DocType: Purchase Invoice,Select the period when the invoice will be generated automatically,"Vælg den periode, hvor fakturaen vil blive genereret automatisk"
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +15,Unpaid,Ulønnet
+DocType: DocField,Fold,Fold
+DocType: Process Payroll,Check if you want to send salary slip in mail to each employee while submitting salary slip,"Kontroller, om du vil sende lønseddel i e-mail til den enkelte medarbejder, samtidig indsende lønseddel"
+DocType: Purchase Taxes and Charges,Valuation and Total,Værdiansættelse og Total
+apps/frappe/frappe/email/doctype/email_account/email_account.py +58,{0} is mandatory,{0} er obligatorisk
+DocType: SMS Settings,Enter url parameter for message,Indtast url parameter for besked
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +159,Current Liabilities,Kortfristede forpligtelser
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +34,Basic,Grundlæggende
+DocType: Selling Settings,Default Customer Group,Standard Customer Group
+DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),Nettovægten af ​​denne pakke. (Beregnes automatisk som summen af ​​nettovægt på poster)
+DocType: Shipping Rule,Calculate Based On,Beregn baseret på
+apps/erpnext/erpnext/config/accounts.py +84,Financial / accounting year.,Finansiel / regnskabsår.
+DocType: BOM,Costing,Koster
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,Stock transaktioner før {0} er frosset
+DocType: Bin,Ordered Quantity,Bestilt Mængde
+,Purchase Order Items To Be Billed,Købsordre Varer at blive faktureret
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +540,Select Item,Vælg Item
+apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},Status skal være en af ​​{0}
+DocType: Sales Invoice,"Check if recurring invoice, uncheck to stop recurring or put proper End Date","Kontroller, om tilbagevendende faktura, skal du fjerne markeringen for at stoppe tilbagevendende eller sætte ordentlig Slutdato"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +105,Account with existing transaction cannot be converted to ledger,Konto med eksisterende transaktion kan ikke konverteres til finans
+DocType: Sales Order,"The day of the month on which auto order will be generated e.g. 05, 28 etc","Den dag i den måned, hvor auto ordre vil blive genereret f.eks 05, 28 osv"
+DocType: SMS Center,All Sales Person,Alle Sales Person
+DocType: Account,Auditor,Revisor
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,Varehuse
+DocType: Dropbox Backup,Dropbox Access Secret,Dropbox Access Secret
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +69,Total Paid Amt,Total Betalt Amt
+DocType: Item,Valuation Method,Værdiansættelsesmetode
+DocType: BOM Item,BOM Item,BOM Item
+DocType: Sales Invoice,Mass Mailing,Mass Mailing
+,Bank Reconciliation Statement,Bank Saldoopgørelsen
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +17,All Item Groups,Alle varegrupper
+DocType: Custom Field,Custom,Brugerdefineret
+DocType: Opportunity,Maintenance,Vedligeholdelse
+DocType: Item,Customer Items,Kunde Varer
+DocType: Lead,Industry,Industri
+apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +59,Please enter company name first,Indtast venligst firmanavn først
+DocType: Journal Entry Account,Journal Entry Account,Kassekladde konto
+DocType: Company,For Reference Only.,Kun til reference.
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +397,Local,Lokal
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +173,Payment of salary for the month {0} and year {1},Udbetaling af løn for måneden {0} og år {1}
+DocType: Lead,Middle Income,Midterste indkomst
+DocType: Purchase Receipt,Rejected Warehouse,Afvist Warehouse
+apps/erpnext/erpnext/config/accounts.py +79,Company (not Customer or Supplier) master.,Company (ikke kunde eller leverandør) herre.
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,Debitorer
+apps/erpnext/erpnext/config/crm.py +96,Newsletter Mailing List,Nyhedsbrev Mailing List
+DocType: Production Order Operation,Work In Progress,Work In Progress
+DocType: Bank Reconciliation Detail,Clearance Date,Clearance Dato
+apps/erpnext/erpnext/stock/doctype/item/item.py +49,Please enter default Unit of Measure,Indtast venligst standard Måleenhed
+DocType: Sales Order Item,For Production,For Produktion
+,Billed Amount,Faktureret beløb
+DocType: Production Planning Tool,Get Sales Orders,Få salgsordrer
+DocType: Landed Cost Voucher,Distribute Charges Based On,Distribuere afgifter baseret på
+apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +53,Chart of Cost Centers,Diagram af Cost Centers
+DocType: Shopping Cart Settings,Shopping Cart Settings,Indkøbskurv Indstillinger
+apps/frappe/frappe/public/js/frappe/model/model.js +25,Comments,Kommentarer
+apps/erpnext/erpnext/config/selling.py +70,Default settings for selling transactions.,Standardindstillinger for at sælge transaktioner.
+DocType: Accounts Settings,Credit Controller,Credit Controller
+DocType: Bank Reconciliation Detail,Voucher ID,Voucher ID
+DocType: Email Account,Service,Service
+DocType: Purchase Taxes and Charges,Deduct,Fratrække
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +90,Please enter default currency in Company Master,Indtast standard valuta i Company Master
+,Financial Analytics,Finansielle Analytics
+DocType: Lead,Call,Opkald
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +541,Error: {0} > {1},Fejl: {0}&gt; {1}
+DocType: Purchase Receipt Item,Landed Cost Voucher Amount,Landed Cost Voucher Beløb
+apps/erpnext/erpnext/public/js/setup_wizard.js +246,Attach Logo,Vedhæft Logo
+DocType: Page,All,Alle
+DocType: Production Order,Additional Operating Cost,Yderligere driftsomkostninger
+DocType: Company,Retail,Retail
+DocType: Sales Invoice Item,Time Log Batch,Time Log Batch
+DocType: Shipping Rule Condition,From Value,Fra Value
+DocType: Quality Inspection,Purchase Receipt No,Kvittering Nej
+apps/erpnext/erpnext/controllers/website_list_for_contact.py +65,{0}% Billed,{0}% Billed
+,Qty to Order,Antal til ordre
+DocType: Purchase Invoice,Price List Exchange Rate,Prisliste Exchange Rate
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +92,{0} is not a stock Item,{0} er ikke et lager Vare
+apps/erpnext/erpnext/projects/doctype/project/project.js +22,Save the document first.,Gem dokumentet først.
+apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,Automatisk skrive besked på indsendelse af transaktioner.
+apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +40,New Newsletter,Ny Nyhedsbrev
+DocType: Stock Settings,Default Item Group,Standard Punkt Group
+DocType: Stock Reconciliation,Reconciliation JSON,Afstemning JSON
+apps/erpnext/erpnext/public/js/queries.js +39,Please specify a,Angiv en
+apps/erpnext/erpnext/stock/doctype/item/item.py +491,Item Variants {0} updated,Item Varianter {0} opdateret
+DocType: Mode of Payment Account,Mode of Payment Account,Mode Betalingskonto
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,Løbenummer {0} ikke er på lager
+DocType: Delivery Note,In Words will be visible once you save the Delivery Note.,"I Ord vil være synlig, når du gemmer følgesedlen."
+DocType: Sales Invoice,Terms and Conditions Details,Betingelser Detaljer
+DocType: Time Log,Projects Manager,Projekter manager
+apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Nødvendig On
+DocType: Item Supplier,Item Supplier,Vare Leverandør
+DocType: Employee,Previous Work Experience,Tidligere erhvervserfaring
+DocType: Product Bundle Item,Product Bundle Item,Produkt Bundle Item
+apps/frappe/frappe/core/doctype/user/user_list.js +12,Active,Aktiv
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +188,Item {0} is not setup for Serial Nos. Column must be blank,Vare {0} er ikke setup for Serial nr. Kolonne skal være tomt
+DocType: Offer Letter,Offer Letter Terms,Tilbyd Letter Betingelser
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +56,Full-time,Fuld tid
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,Kontorleje
+apps/erpnext/erpnext/accounts/doctype/account/account.py +172,Account with existing transaction can not be deleted,Konto med eksisterende transaktion kan ikke slettes
+DocType: Purchase Invoice,Total Taxes and Charges,Total Skatter og Afgifter
+DocType: Employee External Work History,Salary,Løn
+DocType: Employee,Bank Name,Bank navn
+apps/erpnext/erpnext/accounts/doctype/account/account.js +50,Chart of Accounts,Kontoplan
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +236,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Forskel Der skal være en Asset / Liability typen konto, da dette Stock Forsoning er en åbning indtastning"
+DocType: Payment Tool,Set Matching Amounts,Set matchende Beløb
+DocType: Accounts Settings,Accounts Settings,Konti Indstillinger
+apps/erpnext/erpnext/config/selling.py +121,Terms and Conditions Template,Vilkår og betingelser Skabelon
+apps/erpnext/erpnext/controllers/buying_controller.py +122,Please enter 'Is Subcontracted' as Yes or No,Indtast &quot;underentreprise&quot; som Ja eller Nej
+DocType: Attendance,Absent,Fraværende
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +540,Make ,Lave
+DocType: Stock Entry,Material Transfer for Manufacture,Materiale Transfer til Fremstilling
+DocType: File,old_parent,old_parent
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +328,Please enter Item Code to get batch no,Indtast venligst Item Code for at få batchnr
+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.","Alle import- relaterede områder som valuta, konverteringsfrekvens, samlede import, import grand total etc er tilgængelige i købskvittering, leverandør Citat, købsfaktura, Indkøbsordre etc."
+DocType: Web Page,Left,Venstre
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +54,Expected Delivery Date cannot be before Purchase Order Date,"Forventet leveringsdato kan ikke være, før indkøbsordre Dato"
+DocType: DocField,Image,Billede
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +248,Warehouse is required,Warehouse kræves
+DocType: SMS Center,All Supplier Contact,Alle Leverandør Kontakt
+DocType: Purchase Invoice,Half-yearly,Halvårligt
+DocType: Lead,Interested,Interesseret
+DocType: Salary Structure Earning,Salary Structure Earning,Løn Struktur Earning
+apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,Overført
+apps/erpnext/erpnext/projects/doctype/project/project.py +43,Expected End Date can not be less than Expected Start Date,Forventet Slutdato kan ikke være mindre end forventet startdato
+DocType: Project,Expected End Date,Forventet Slutdato
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js +28,Payment Type,Betaling Type
+DocType: Salary Slip Deduction,Depends on Leave Without Pay,Afhænger Leave uden løn
+DocType: Production Planning Tool,Create Production Orders,Opret produktionsordrer
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +316,{0} against Sales Invoice {1},{0} mod salgsfaktura {1}
+DocType: Fiscal Year,"For e.g. 2012, 2012-13","Til fx 2012, 2012-13"
+apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +54,Total cannot be zero,Samlede kan ikke være nul
+apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,Godkendelse Rolle kan ikke være det samme som rolle reglen gælder for
+DocType: Event,Saturday,Lørdag
+DocType: Production Planning Tool,Production Planning Tool,Produktionsplanlægning Tool
+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.","Hvis du vil tilføje barn noder, udforske træet og klik på noden, hvorunder du ønsker at tilføje flere noder."
+DocType: Item,Manufacturer,Producent
+DocType: Budget Detail,Fiscal Year,Regnskabsår
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +128,Balance for Account {0} must always be {1},Balance for konto {0} skal altid være {1}
+,Qty to Receive,Antal til Modtag
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +314,Region,Region
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +177,Outstanding for {0} cannot be less than zero ({1}),Enestående for {0} kan ikke være mindre end nul ({1})
+DocType: HR Settings,Payroll Settings,Payroll Indstillinger
+apps/erpnext/erpnext/controllers/recurring_document.py +162,Please select {0},Vælg {0}
+DocType: Sales Taxes and Charges Template,Sales Master Manager,Salg Master manager
+DocType: Appraisal,Appraisal,Vurdering
+DocType: Item,Average time taken by the supplier to deliver,Gennemsnitlig tid taget af leverandøren til at levere
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +655,From Quotation,Fra tilbudsgivning
+DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction","Hvis deaktivere, &#39;Afrundet Total&#39; felt, vil ikke være synlig i enhver transaktion"
+DocType: Item,Is Service Item,Er service Item
+DocType: HR Settings,Don't send Employee Birthday Reminders,Send ikke Medarbejder Fødselsdag Påmindelser
+DocType: Production Plan Sales Order,SO Date,SO Dato
+DocType: Authorization Rule,Transaction,Transaktion
+,Finished Goods,Færdigvarer
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +43,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","Selv hvis der er flere Priser Regler med højeste prioritet, derefter følgende interne prioriteringer anvendt:"
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +272,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',"Ikke kan fradrage, når kategorien er for &quot;Værdiansættelse&quot; eller &quot;Værdiansættelse og Total &#39;"
+DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,Opret Bank Punktet om den samlede løn for de ovenfor valgte kriterier
+DocType: Pricing Rule,Brand,Brand
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +138,Research,Forskning
+apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +23,This Time Log Batch has been billed.,This Time Log Batch er blevet faktureret.
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +36,Message Sent,Besked sendt
+apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Minimum Inventory Level,Minimum Inventory Level
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +295,Serial No {0} created,Løbenummer {0} oprettet
+DocType: Maintenance Schedule,Schedules,Tidsplaner
+apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Gentag Kunder
+DocType: Payment Reconciliation,Get Unreconciled Entries,Få ikke-afstemte Entries
+,Budget Variance Report,Budget Variance Report
+DocType: Monthly Distribution,Distribution Name,Distribution Name
+DocType: Production Planning Tool,Download a report containing all raw materials with their latest inventory status,Download en rapport med alle råvarer med deres seneste opgørelse status
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +233,Please enter Expense Account,Indtast venligst udgiftskonto
+apps/erpnext/erpnext/accounts/doctype/account/account.py +115,Cannot covert to Group because Account Type is selected.,"Kan ikke skjult til gruppen, fordi Kontotype er valgt."
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +263,Installation Note {0} has already been submitted,Installation Bemærk {0} er allerede blevet indsendt
+DocType: Authorization Rule,Applicable To (Designation),Gælder for (Betegnelse)
+DocType: Item,"Show ""In Stock"" or ""Not in Stock"" based on stock available in this warehouse.",Vis &quot;På lager&quot; eller &quot;Ikke på lager&quot; baseret på lager til rådighed i dette lager.
+apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +40,{0} subscribers added,{0} abonnenter tilføjet
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +15,Brokerage,Brokerage
+apps/erpnext/erpnext/stock/doctype/item/item.py +344,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Item Skat Row {0} skal have højde for typen Skat eller indtægt eller omkostning eller Afgiftspligtens
+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.","Når nogen af ​​de kontrollerede transaktioner er &quot;Indsendt&quot;, en e-pop-up automatisk åbnet til at sende en e-mail til den tilknyttede &quot;Kontakt&quot; i denne transaktion, med transaktionen som en vedhæftet fil. Brugeren kan eller ikke kan sende e-mailen."
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +193,Row {0}: {1} {2} does not match with {3},Række {0}: {1} {2} ikke passer med {3}
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +22,Target On,Target On
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +66,No Remarks,Ingen Bemærkninger
+DocType: Purchase Invoice,Is Recurring,Er Tilbagevendende
+DocType: Purchase Invoice Item,Image View,Billede View
+DocType: Naming Series,Prefix,Præfiks
+DocType: Payment Tool,Get Outstanding Vouchers,Få Udestående Vouchers
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.js +15,Period,Periode
+DocType: Sales Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","Den dag i den måned, hvor auto faktura vil blive genereret f.eks 05, 28 osv"
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},Batchnummer er obligatorisk for Item {0}
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,"Warehouse kan ikke slettes, da der eksisterer lager hovedbog post for dette lager."
+DocType: Sales Invoice,Rounded Total,Afrundet alt
+apps/erpnext/erpnext/projects/doctype/project/project.js +40,Time Logs,Time Logs
+DocType: Sales Team,Contact No.,Kontakt No.
+DocType: Installation Note Item,Installation Note Item,Installation Bemærk Vare
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +13,Biotechnology,Bioteknologi
+apps/erpnext/erpnext/config/selling.py +132,Rules for adding shipping costs.,Regler for at tilføje forsendelsesomkostninger.
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +746,Item or Warehouse for row {0} does not match Material Request,Element eller Warehouse for række {0} matcher ikke Materiale Request
+DocType: Leave Allocation,New Leaves Allocated,Nye Blade Allokeret
+,Purchase Order Trends,Indkøbsordre Trends
+DocType: Leave Application,Apply / Approve Leaves,Anvend / Godkend Blade
+DocType: Payment Reconciliation,Payments,Betalinger
+DocType: Serial No,Creation Date,Oprettelsesdato
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +37,Row {0}: {1} is not a valid {2},Række {0}: {1} er ikke en gyldig {2}
+DocType: Leave Application,Leave Balance Before Application,Lad Balance Før Application
+DocType: Workflow State,Edit,Edit
+apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Aldring Baseret på
+,Bank Clearance Summary,Bank Clearance Summary
+DocType: Notification Control,Sales Invoice Message,Salg Faktura Message
+DocType: Employee,Leave Encashed?,Efterlad indkasseres?
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,I Antal
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +81,Net pay cannot be negative,Nettoløn kan ikke være negativ
+DocType: Time Log,Time Log,Time Log
+DocType: Purchase Invoice Item,Net Rate (Company Currency),Net Rate (Company Valuta)
+DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Juridisk enhed / Datterselskab med en separat Kontoplan tilhører organisationen.
+DocType: Stock Entry Detail,Actual Qty (at source/target),Faktiske Antal (ved kilden / mål)
+DocType: Lead,Organization Name,Organisationens navn
+apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},Bruger-id ikke indstillet til Medarbejder {0}
+DocType: Manufacturing Settings,Over Production Allowance Percentage,Over Produktion GODTGØRELSESPROCENT
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +64,Against Supplier Invoice {0} dated {1},Imod Leverandør Faktura {0} dateret {1}
+DocType: Sales Invoice Item,Delivered Qty,Leveres Antal
+DocType: Appraisal,Start Date,Startdato
+DocType: Bin,Stock Value,Stock Value
+apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +25,Please enter valid mobile nos,Indtast venligst gyldige mobile nos
+DocType: Employee,Holiday List,Holiday List
+DocType: SMS Log,Requested Numbers,Anmodet Numbers
+DocType: Expense Claim,Approver,Godkender
+apps/erpnext/erpnext/controllers/accounts_controller.py +500,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Afgift af typen &#39;Actual &quot;i rækken {0} kan ikke indgå i Item Rate
+DocType: Opportunity,Contact Info,Kontakt Info
+DocType: Website Item Group,Cross Listing of Item in multiple groups,Cross Notering af Item i flere grupper
+DocType: Maintenance Schedule Item,Maintenance Schedule Item,Vedligeholdelse Skema Vare
+DocType: Holiday List,Holidays,Helligdage
+DocType: Workflow State,Tasks,Opgaver
+apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} Tree
+apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,Citater modtaget fra leverandører.
+DocType: Item Attribute Value,Attribute Value,Attribut Værdi
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Customer Service,Kundeservice
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +20,Please select Company and Party Type first,Vælg Company og Party Type først
+DocType: Purchase Invoice,Repeat on Day of Month,Gentag på Dag Måned
+DocType: DocField,Type,Type
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Expected balance as per bank,Forventet balance pr bank
+DocType: Cost Center,Add rows to set annual budgets on Accounts.,Tilføj rækker til at fastsætte årlige budgetter på Konti.
+apps/erpnext/erpnext/setup/doctype/company/delete_company_transactions.py +17,Transactions can only be deleted by the creator of the Company,Transaktioner kan kun slettes af skaberen af ​​selskabet
+DocType: Batch,Expiry Date,Udløbsdato
+apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Forbrugt Mængde
+DocType: User,Gender,Køn
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +183,Capital Stock,Capital Stock
+DocType: Production Planning Tool,Select Items,Vælg emner
+apps/erpnext/erpnext/projects/doctype/task/task.py +44,Cannot close task as its dependant task {0} is not closed.,Kan ikke lukke opgave som sin afhængige opgave {0} ikke er lukket.
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +137,Against Journal Entry {0} does not have any unmatched {1} entry,Mod Kassekladde {0} har ikke nogen uovertruffen {1} indgang
+DocType: Upload Attendance,Download Template,Hent skabelon
+DocType: POS Profile,Write Off Cost Center,Skriv Off Cost center
+DocType: Production Order Operation,Actual Start Time,Faktiske Start Time
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,"Henvis ikke af besøg, der kræves"
+apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +75,Please enter message before sending,"Indtast venligst besked, før du sender"
+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,Kan ikke henvise rækken tal større end eller lig med aktuelle række nummer til denne Charge typen
+DocType: Material Request Item,Sales Order No,Salg bekendtgørelse nr
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +165,Stock Liabilities,Stock Passiver
+,Employee Information,Medarbejder Information
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +336,Note: {0},Bemærk: {0}
+DocType: Dropbox Backup,Allow Dropbox Access,Tillad Dropbox Access
+apps/erpnext/erpnext/controllers/accounts_controller.py +475,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} er obligatorisk. Måske Valutaveksling record er ikke skabt for {1} til {2}.
+DocType: Production Planning Tool,Download Materials Required,Hent Påkrævede materialer
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Stock Assets
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +149,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Række {0}: Allokeret mængde {1} skal være mindre end eller lig med JV beløb {2}
+DocType: Stock Entry,As per Stock UOM,Pr Stock UOM
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Anvendelse af midler (Assets)
+apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,Currency is required for Price List {0},Valuta er nødvendig for prisliste {0}
+DocType: Purchase Order,Delivered,Leveret
+DocType: Serial No,Out of AMC,Ud af AMC
+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","For rækken {0} i {1}. For at inkludere {2} i Item sats, rækker {3} skal også medtages"
+DocType: Project,Internal,Intern
+DocType: Authorization Rule,Based On,Baseret på
+DocType: Opportunity,Customer / Lead Address,Kunde / Lead Adresse
+apps/erpnext/erpnext/hr/doctype/employee/employee.js +27,Make Salary Structure,Foretag Løn Struktur
+apps/erpnext/erpnext/public/js/feature_setup.js +220,"Grid """,Grid &quot;
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +39,Medical,Medicinsk
+DocType: Item,"Allow in Sales Order of type ""Service""",Tillad i kundeordre af typen &quot;Service&quot;
+DocType: Item,Is Sales Item,Er Sales Item
+DocType: Warranty Claim,Raised By,Rejst af
+DocType: Sales Order,% Amount Billed,% Beløb Billed
+DocType: Account,Expense Account,Udgiftskonto
+apps/frappe/frappe/core/page/data_import_tool/data_import_tool.js +108,Import Successful!,Import Vellykket!
+apps/erpnext/erpnext/setup/doctype/territory/territory.js +14,This is a root territory and cannot be edited.,Dette er en rod territorium og kan ikke redigeres.
+apps/erpnext/erpnext/stock/get_item_details.py +122,Item {0} must be a Service Item.,Vare {0} skal være en service Item.
+DocType: Leave Type,Is Carry Forward,Er Carry Forward
+DocType: Employee,History In Company,Historie I Company
+,Received Items To Be Billed,Modtagne varer skal faktureres
+DocType: Sales Team,Contribution to Net Total,Bidrag til Net Total
+apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +7,Not Expired,Ikke er udløbet
+DocType: Features Setup,Sales Extras,Salg Extras
+DocType: Sales Invoice,Supplier Reference,Leverandør reference
+DocType: Item,Has Variants,Har Varianter
+DocType: Material Request Item,Lead Time Date,Leveringstid Dato
+DocType: Task,Actual End Date (via Time Logs),Faktiske Slutdato (via Time Logs)
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +66,Transfer Materials for Manufacture,Overfør Materialer til Fremstilling
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +213,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',Vedligeholdelsesplan ikke genereret for alle poster. Klik på &quot;Generer Schedule &#39;
+DocType: BOM,Manufacturing,Produktion
+DocType: Note,Note,Bemærk
+DocType: Stock Entry,Total Incoming Value,Samlet Indgående Value
+DocType: Delivery Note,Return Against Delivery Note,Retur Against følgeseddel
+DocType: Account,Is Group,Is Group
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +118,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Accepteret + Afvist skal være lig med Modtaget mængde for vare {0}
+DocType: Expense Claim,Project,Projekt
+DocType: Stock Entry Detail,Serial No / Batch,Løbenummer / Batch
+,Available Stock for Packing Items,Tilgængelig Stock til Emballerings- Varer
+DocType: Leave Block List Date,Block Date,Block Dato
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,Kosmetik
+DocType: Leave Block List,Block Days,Bloker dage
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,Sport
+DocType: Purchase Invoice Item,PR Detail,PR Detail
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Intern,Intern
+DocType: Employee,Bank A/C No.,Bank A / C No.
+DocType: Serial No,Distinct unit of an Item,Særskilt enhed af et element
+apps/erpnext/erpnext/config/stock.py +263,Items and Pricing,Varer og Priser
+DocType: Upload Attendance,Import Attendance,Import Fremmøde
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +100,Please enter 'Expected Delivery Date',Indtast &#39;Forventet leveringsdato&#39;
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +93,Row #{0}: Rejected Qty can not be entered in Purchase Return,Row # {0}: Afvist Antal kan ikke indtastes i Indkøb Return
+DocType: Territory,Territory Manager,Territory manager
+apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +15,Setting this Address Template as default as there is no other default,"Angivelse af denne adresse skabelon som standard, da der ikke er nogen anden standard"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +104,Negative Valuation Rate is not allowed,Negative Værdiansættelse Rate er ikke tilladt
+apps/erpnext/erpnext/config/accounts.py +101,Tree of finanial Cost Centers.,Tree of finanial Cost Centers.
+apps/erpnext/erpnext/public/js/setup_wizard.js +358,Products,Produkter
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +15,Make Salary Slip,Foretag lønseddel
+DocType: Product Bundle,List items that form the package.,"Listeelementer, der danner pakken."
+DocType: Event,All Day,All Day
+DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","Hvis ikke afkrydset, vil listen skal lægges til hver afdeling, hvor det skal anvendes."
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +74,Purpose must be one of {0},Formålet skal være en af ​​{0}
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +47,Item valuation rate is recalculated considering landed cost voucher amount,Item værdiansættelse sats genberegnes overvejer landede omkostninger kupon beløb
+apps/erpnext/erpnext/config/stock.py +268,Item Variants,Item Varianter
+DocType: Task,Urgent,Urgent
+DocType: ToDo,Priority,Prioritet
+DocType: BOM Explosion Item,Qty Consumed Per Unit,Antal Consumed Per Unit
+DocType: Quality Inspection,Get Specification Details,Få Specifikation Detaljer
+,Qty to Transfer,Antal til Transfer
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +318,Please select Company,Vælg Firma
+DocType: Item,Quality Parameters,Kvalitetsparametre
+apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +12,To {0},Til {0}
+DocType: BOM,Last Purchase Rate,Sidste Purchase Rate
+DocType: Notification Control,Expense Claim Approved,Expense krav Godkendt
+DocType: Sales Invoice,Existing Customer,Eksisterende kunde
+DocType: Item Customer Detail,Ref Code,Ref Code
+DocType: Quality Inspection Reading,Parameter,Parameter
+DocType: Task,Actual Start Date (via Time Logs),Faktiske startdato (via Time Logs)
+DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,Planlæg tid logs uden Workstation arbejdstid.
+DocType: Maintenance Schedule Detail,Actual Date,Faktiske dato
+DocType: Hub Settings,Publish Items to Hub,Udgive varer i Hub
+apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Convert to non-Group,Konverter til ikke-Group
+DocType: Target Detail,Target Qty,Target Antal
+DocType: Payment Reconciliation,Unreconciled Payment Details,Ikke-afstemte Betalingsoplysninger
+DocType: Leave Block List,Applies to Company,Gælder for Company
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,Fragt og Forwarding Afgifter
+DocType: Contact,Passive,Passiv
+DocType: Payment Tool,Total Payment Amount,Samlet Betaling Beløb
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","Beklager, kan Serial Nos ikke blive slået sammen"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +45,Account {0}: Parent account {1} can not be a ledger,Konto {0}: Forældre-konto {1} kan ikke være en finanskonto
+DocType: Sales Partner,Targets,Mål
+DocType: Contact Us Settings,State,Stat
+DocType: Payment Reconciliation,Bank / Cash Account,Bank / kontantautomat konto
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +175,Cannot cancel because submitted Stock Entry {0} exists,Kan ikke annullere fordi indsendt Stock indtastning {0} eksisterer
+apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,Gennemsnitlig alder
+DocType: Employee,Relation,Relation
+DocType: Workstation,Operating Costs,Drifts- omkostninger
+DocType: Item,Manufacturer Part Number,Producentens varenummer
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,Banking
+DocType: Quotation,Maintenance User,Vedligeholdelse Bruger
+apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +17,Make Offer Letter,Kom med et tilbud Letter
+DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Skat Beløb Efter Discount Beløb
+DocType: Warranty Claim,Issue Date,Udstedelsesdagen
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +93,Quotation {0} not of type {1},Notering {0} ikke af typen {1}
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +61,Serial No {0} does not belong to Delivery Note {1},Løbenummer {0} ikke hører til følgeseddel {1}
+DocType: Period Closing Voucher,"The account head under Liability, in which Profit/Loss will be booked","Kontoen hoved under ansvar, hvor gevinst / tab vil være reserveret"
+DocType: Sales Partner,Implementation Partner,Implementering Partner
+apps/frappe/frappe/public/js/frappe/form/print.js +96,Start,Start
+DocType: Event,Thursday,Torsdag
+DocType: Leave Block List Allow,Leave Block List Allow,Lad Block List Tillad
+DocType: Item,Publish in Hub,Offentliggør i Hub
+DocType: Territory,Parent Territory,Parent Territory
+DocType: Item,Sales Details,Salg Detaljer
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +93,{0} Items synced,synkroniseret {0} Varer
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +19,Invoiced Amount,Fakturerede beløb
+DocType: Notification Control,Customize the introductory text that goes as a part of that email. Each transaction has a separate introductory text.,"Tilpas den indledende tekst, der går som en del af denne e-mail. Hver transaktion har en separat indledende tekst."
+DocType: Maintenance Schedule Detail,Maintenance Schedule Detail,Vedligeholdelse Skema Detail
+DocType: Purchase Invoice Item,Purchase Order Item,Indkøbsordre Item
+apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +16,From Datetime,Fra datotid
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +207,New Account Name,Ny Kontonavn
+DocType: Purchase Invoice,Contact Person,Kontakt Person
+DocType: Communication,Other,Andre
+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.,"Procentdel, du får lov til at modtage eller levere mere mod den bestilte mængde. For eksempel: Hvis du har bestilt 100 enheder. og din Allowance er 10%, så du får lov til at modtage 110 enheder."
+DocType: Email Alert,Reference Date,Henvisning Dato
+DocType: Authorization Rule,Average Discount,Gennemsnitlig rabat
+DocType: DocField,Label,Label
+DocType: Item,Automatically create Material Request if quantity falls below this level,Automatisk oprette Materiale Request hvis mængde falder under dette niveau
+DocType: Upload Attendance,Upload HTML,Upload HTML
+DocType: Project Task,Pending Review,Afventer anmeldelse
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +457,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,Bemærk: Betaling indtastning vil ikke blive oprettet siden &#39;Kontant eller bank konto&#39; er ikke angivet
+DocType: Async Task,Status,Status
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,Gruppe af konto
+apps/erpnext/erpnext/setup/doctype/company/company.js +22,Please re-type company name to confirm,Prøv venligst igen typen firmanavn for at bekræfte
+apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Projekt startdato
+DocType: Quality Inspection Reading,Reading 5,Reading 5
+DocType: Item,Publish Item to hub.erpnext.com,Udgive Vare til hub.erpnext.com
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +150,Customer {0} does not belong to project {1},Kunden {0} ikke hører til projekt {1}
+DocType: Lead,Person Name,Person Name
+apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,Række {0}: Konvertering Factor er obligatorisk
+apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,Regnskab journaloptegnelser.
+DocType: Maintenance Visit,Partially Completed,Delvist Afsluttet
+apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +37,{0} does not belong to Company {1},{0} ikke tilhører selskabet {1}
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +115,Sit tight while your system is being setup. This may take a few moments.,"Sidde stramt, mens dit system bliver setup. Dette kan tage et øjeblik."
+apps/erpnext/erpnext/stock/doctype/item/item.js +33,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,"Dette element er en skabelon, og kan ikke anvendes i transaktioner. Item attributter kopieres over i varianterne medmindre &#39;Ingen Copy &quot;er indstillet"
+DocType: Purchase Receipt Item,Required By,Kræves By
+DocType: Item Tax,Tax Rate,Skat
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,Reklame
+DocType: Time Log,From Time,Fra Time
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +489,Transfer Material,Transfer Materiale
+DocType: Selling Settings,Maintain Same Rate Throughout Sales Cycle,Oprethold Samme Rate Gennem Sales Cycle
+DocType: Purchase Invoice,Recurring Id,Tilbagevendende Id
+DocType: Journal Entry,Credit Note,Kreditnota
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +35,To create a Tax Account,Sådan opretter du en Tax-konto
+DocType: Email Digest,Add/Remove Recipients,Tilføj / fjern modtagere
+apps/erpnext/erpnext/config/hr.py +125,Tax and other salary deductions.,Skat og andre løn fradrag.
+apps/erpnext/erpnext/stock/get_item_details.py +260,Price List {0} is disabled,Prisliste {0} er deaktiveret
+DocType: Production Order,Use Multi-Level BOM,Brug Multi-Level BOM
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +77,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Række {0}: Party Type og part er nødvendig for Tilgodehavende / Betales konto {1}
+DocType: Address,Plant,Plant
+DocType: Item,Supply Raw Materials for Purchase,Supply råstoffer til Indkøb
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Head of Marketing and Sales,Chef for Marketing og Salg
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +223,Please enter Cost Center,Indtast Cost center
+apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,Antal Total
+apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +52,Cannot convert Cost Center to ledger as it has child nodes,"Kan ikke konvertere Cost Center til hovedbog, som det har barneknudepunkter"
+apps/erpnext/erpnext/config/hr.py +65,Generate Salary Slips,Generer lønsedler
+DocType: Purchase Receipt Item Supplied,Consumed Qty,Forbrugt Antal
+DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,Indkøbsordre Item Leveres
+DocType: Newsletter List,Total Subscribers,Total Abonnenter
+DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,Mængde post opnået efter fremstilling / ompakning fra givne mængde råvarer
+DocType: Purchase Order,% Billed,% Billed
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +48,Soap & Detergent,Sæbe &amp; Vaskemiddel
+DocType: Event,Groups,Grupper
+DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Bank Afstemning Detail
+apps/erpnext/erpnext/public/js/setup_wizard.js +144,What does it do?,Hvad gør det?
+,Lead Id,Bly Id
+apps/erpnext/erpnext/public/js/setup_wizard.js +145,"e.g. ""Build tools for builders""",fx &quot;Byg værktøjer til bygherrer&quot;
+DocType: Lead,From Customer,Fra kunde
+DocType: Sales Partner,Partner Type,Partner Type
+DocType: Employee Education,Year of Passing,År for Passing
+apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +13,Please select Time Logs.,Vælg Time Logs.
+DocType: Customer,Customer Details,Kunde Detaljer
+DocType: Address,Utilities,Forsyningsvirksomheder
+apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +48,"There can only be one Shipping Rule Condition with 0 or blank value for ""To Value""",Der kan kun være én Forsendelse Rule Condition med 0 eller blank værdi for &quot;til værdi&quot;
+apps/frappe/frappe/desk/page/backups/backups.html +13,Size,Størrelse
+apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,Support Analtyics
+apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,Import i bulk
+apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,From Warranty Claim,Fra garanti krav
+apps/erpnext/erpnext/config/crm.py +27,All Contacts.,Alle kontakter.
+DocType: Company,Default Bank Account,Standard bankkonto
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +446,Item {0} is not active or end of life has been reached,Vare {0} er ikke aktiv eller slutningen af ​​livet er nået
+DocType: Address,Shipping,Forsendelse
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,Omsætningsaktiver
+apps/frappe/frappe/core/page/permission_manager/permission_manager.js +379,Add,Tilføje
+apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,Salg prisliste
+DocType: Employee External Work History,Employee External Work History,Medarbejder Ekstern Work History
+,Accounts Browser,Konti Browser
+apps/erpnext/erpnext/config/support.py +23,Plan for maintenance visits.,Plan for vedligeholdelse besøg.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Green,Grøn
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Direct Income,Direkte Indkomst
+apps/erpnext/erpnext/config/projects.py +28,Batch Time Logs for billing.,Batch Time Logs for fakturering.
+DocType: Purchase Invoice,Ignore Pricing Rule,Ignorer Prisfastsættelse Rule
+DocType: Item,Max Discount (%),Max Rabat (%)
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +470,Delivery Note {0} is not submitted,Levering Note {0} er ikke indsendt
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,Åbning Antal
+apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},En anden Periode Lukning indtastning {0} er blevet foretaget efter {1}
+DocType: Sales Order,Not Billed,Ikke Billed
+DocType: Account,Company,Firma
+DocType: Lead,Blog Subscriber,Blog Subscriber
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,Kan ikke indstilles som Lost som Sales Order er foretaget.
+DocType: Item Variant,Item Variant,Item Variant
+DocType: Holiday List,Weekly Off,Ugentlig Off
+DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Brugere med denne rolle får lov til at sætte indefrosne konti og oprette / ændre regnskabsposter mod indefrosne konti
+DocType: Purchase Order Item Supplied,Stock UOM,Stock UOM
+DocType: Account,Payable,Betales
+DocType: Serial No,Delivery Document Type,Levering Dokumenttype
+DocType: Sales Invoice,C-Form Applicable,C-anvendelig
+DocType: Page,No,Ingen
+apps/erpnext/erpnext/config/stock.py +33,Goods received from Suppliers.,Varer modtaget fra leverandører.
+DocType: Maintenance Visit Purpose,Work Done,Arbejde Udført
+DocType: Packed Item,Packed Item,Pakket Vare
+DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),Skat Beløb Efter Discount Beløb (Company Valuta)
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +286,My Shipments,Mine forsendelser
+DocType: Workstation,Consumable Cost,Forbrugsmaterialer Cost
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +552,Manufacturing Quantity is mandatory,Produktion Mængde er obligatorisk
+,Serial No Status,Løbenummer status
+DocType: Opportunity Item,Basic Rate,Grundlæggende Rate
+apps/frappe/frappe/core/doctype/doctype/boilerplate/controller_list.html +31,Completed,Afsluttet
+apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},Samlet weightage tildelt skulle være 100%. Det er {0}
+DocType: Item,Weight UOM,Vægt UOM
+DocType: Purchase Invoice,Contact,Kontakt
+DocType: HR Settings,Include holidays in Total no. of Working Days,Medtag helligdage i alt nej. Arbejdsdage
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',Angiv en gyldig &quot;Fra sag nr &#39;
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,Cost Center {0} does not belong to Company {1},Omkostningssted {0} ikke tilhører selskabet {1}
+DocType: Time Log,Will be updated when batched.,"Vil blive opdateret, når batched."
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Serial No is mandatory for Item {0},Løbenummer er obligatorisk for Item {0}
+DocType: Leave Type,Is Encash,Er indløse
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +117,Contract End Date must be greater than Date of Joining,Kontrakt Slutdato skal være større end Dato for Sammenføjning
+DocType: Lead,Mobile No.,Mobil No.
+DocType: Employee,Date Of Retirement,Dato for pensionering
+DocType: Batch,Batch Description,Batch Beskrivelse
+apps/frappe/frappe/public/js/frappe/views/module/module_section.html +27,More,Mere
+apps/erpnext/erpnext/public/js/setup_wizard.js +272,Purchaser,Køber
+DocType: Sales Invoice Item,Target Warehouse,Target Warehouse
+apps/erpnext/erpnext/manufacturing/page/bom_browser/bom_browser.js +17,Select BOM to start,Vælg BOM at starte
+DocType: Purchase Order Item,Received Qty,Modtaget Antal
+DocType: SMS Center,Receiver List,Modtager liste
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +108,Customer {0} does not exist,Kunde {0} eksisterer ikke
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,Lægemidler
+DocType: DocShare,Document Type,Dokumenttype
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_list.js +7,Not Started,Ikke i gang
+,Purchase Register,Indkøb Register
+apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Projekt Value
+DocType: Pricing Rule,Supplier Type,Leverandør Type
+apps/frappe/frappe/public/js/frappe/form/grid_body.html +6,No Data,Ingen data
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +191,Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Production Order # {3}. Please update operation status via Time Logs,Row # {0}: Operation {1} er ikke afsluttet for {2} qty af færdigvarer i produktionsordre # {3}. Du opdatere driftsstatus via Time Logs
+DocType: BOM Item,BOM No,BOM Ingen
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +17,Set as Closed,Angiv som Lukket
+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.","Hvis markeret, vil BOM for sub-montage elementer overvejes for at få råvarer. Ellers vil alle sub-montage poster behandles som et råstof."
+apps/erpnext/erpnext/stock/get_item_details.py +133,Item {0} must be a Purchase Item,Vare {0} skal være et køb Vare
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +34,Item {0} must be Service Item,Vare {0} skal være service Item
+DocType: Purchase Taxes and Charges,Reference Row #,Henvisning Row #
+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.,Tøv ikke oprette konti for kunder og leverandører. De er skabt direkte fra kunden / Leverandør mestre.
+DocType: Item,Synced With Hub,Synkroniseret med Hub
+DocType: Employee,Applicable Holiday List,Gældende Holiday List
+DocType: Dependent Task,Dependent Task,Afhængig Opgave
+DocType: Manufacturing Settings,Default 10 mins,Standard 10 min
+DocType: Cost Center,Budgets,Budgetter
+apps/erpnext/erpnext/stock/doctype/item/item.py +268,Default Warehouse is mandatory for stock Item.,Standard Warehouse er obligatorisk for lager Item.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +105,Date of Birth cannot be greater than today.,Fødselsdato kan ikke være større end i dag.
+DocType: Authorization Rule,Applicable To (Employee),Gælder for (Medarbejder)
+DocType: Journal Entry,Cash Entry,Cash indtastning
+DocType: Leave Control Panel,New Leaves Allocated (In Days),Nye blade Tildelte (i dage)
+DocType: Account,Stock,Lager
+DocType: Sales Invoice Item,Serial No,Løbenummer
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +84,Row # {0}: Cannot return more than {1} for Item {2},Row # {0}: Kan ikke returnere mere end {1} for Item {2}
+DocType: Production Order,Warehouses,Pakhuse
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Creditors,Kreditorer
+apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount Amount,Rabat Beløb
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +133,Material Request {0} is cancelled or stopped,Materiale Request {0} er aflyst eller stoppet
+DocType: Quality Inspection,Verified By,Verified by
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},Løbenummer {0} ikke hører til Warehouse {1}
+apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,Enestående Amt
+DocType: Global Defaults,Default Company,Standard Company
+DocType: BOM,Manage cost of operations,Administrer udgifter til operationer
+DocType: Naming Series,Change the starting / current sequence number of an existing series.,Skift start / aktuelle sekvensnummer af en eksisterende serie.
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +199,Select a group node first.,Vælg en gruppe node først.
+apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,Time Log status skal indsendes.
+DocType: Purchase Invoice,Additional Discount Amount (Company Currency),Yderligere Discount Beløb (Company Valuta)
+DocType: Department,Department,Afdeling
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +66,Please enter Item first,Indtast Vare først
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +245,Packed quantity must equal quantity for Item {0} in row {1},Pakket mængde skal være lig mængde for Item {0} i række {1}
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,Case No. ikke være 0
+DocType: Project,Default Cost Center,Standard Cost center
+DocType: BOM,Item UOM,Item UOM
+DocType: Sales Person,Parent Sales Person,Parent Sales Person
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +107,Both Warehouse must belong to same Company,Både Warehouse skal tilhøre samme firma
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +82,Item {0} has already been returned,Element {0} er allerede blevet returneret
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +40,Welcome,Velkommen
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +538,"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.","For &#39;Product Bundle&#39; elementer, Warehouse, Serial No og Batch Ingen vil blive betragtet fra &quot;Packing List &#39;bord. Hvis Warehouse og Batch Ingen er ens for alle emballage poster for enhver &quot;Product Bundle &#39;post, kan indtastes disse værdier i de vigtigste element tabellen, vil værdierne blive kopieret til&quot; Packing List&#39; bord."
+DocType: Upload Attendance,Attendance To Date,Fremmøde til dato
+DocType: Project,Total Expense Claim (via Expense Claims),Total Expense krav (via Expense krav)
+DocType: Sales Partner,Target Distribution,Target Distribution
+DocType: Delivery Note,Required only for sample item.,Kræves kun for prøve element.
+apps/erpnext/erpnext/config/selling.py +304,Point-of-Sale,Point-of-Sale
+apps/erpnext/erpnext/config/hr.py +205,Setting up Employees,Opsætning af Medarbejdere
+DocType: Production Plan Item,Planned Qty,Planned Antal
+DocType: Company,Default Letter Head,Standard Letter hoved
+DocType: Maintenance Schedule Item,Periodicity,Hyppighed
+DocType: Leave Application,Follow via Email,Følg via e-mail
+DocType: Employee,Contract End Date,Kontrakt Slutdato
+DocType: Purchase Order,Supply Raw Materials,Supply råstoffer
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +68,Raw material cannot be same as main Item,Råvarer kan ikke være samme som vigtigste element
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +602,For Supplier,For Leverandøren
+DocType: Price List,Price List Name,Pris List Name
+DocType: Stock Reconciliation Item,Leave blank if no change,"Efterlad tom, hvis ingen ændring"
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,Alle Leverandør Typer
+apps/erpnext/erpnext/controllers/accounts_controller.py +325,"Journal Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Kassekladde {0} er forbundet mod Order {1}, kontrollere, om det skal trækkes forhånd i denne faktura."
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +326,Item is not allowed to have Production Order.,Varen er ikke tilladt at have produktionsordre.
+DocType: Item,"Selecting ""Yes"" will give a unique identity to each entity of this item which can be viewed in the Serial No master.","Hvis du vælger &quot;Ja&quot; vil give en unik identitet til hver enhed i denne post, som kan ses i Serial Ingen mester."
+DocType: Shipping Rule Condition,To Value,Til Value
+apps/erpnext/erpnext/accounts/doctype/account/account.py +194,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Sammenlægning er kun muligt, hvis følgende egenskaber er ens i begge poster. Er koncernens, Root Type, Firma"
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Duties and Taxes,Told og afgifter
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Pharmaceutical,Farmaceutiske
+apps/frappe/frappe/model/rename_doc.py +343,Please select a valid csv file with data,Vælg en gyldig csv fil med data
+DocType: Sales Invoice Item,Brand Name,Brandnavn
+DocType: Company,Registration Details,Registrering Detaljer
+DocType: BOM Operation,Hour Rate,Hour Rate
+DocType: Job Applicant,Job Applicant,Job Ansøger
+DocType: Features Setup,Purchase Discounts,Køb Rabatter
+apps/erpnext/erpnext/shopping_cart/utils.py +33,Cart,Kurv
+DocType: Journal Entry,Accounting Entries,Bogføring
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +219,Same item has been entered multiple times.,Samme element er indtastet flere gange.
+DocType: Bank Reconciliation,Total Amount,Samlet beløb
+DocType: Journal Entry,Bank Entry,Bank indtastning
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +41,"Buying must be checked, if Applicable For is selected as {0}","Opkøb skal kontrolleres, om nødvendigt er valgt som {0}"
+apps/erpnext/erpnext/controllers/selling_controller.py +21,To {0} | {1} {2},Til {0} | {1} {2}
+DocType: Serial No,Serial No Details,Serial Ingen Oplysninger
+,Sales Funnel,Salg Tragt
+DocType: Newsletter,Test,Prøve
+apps/frappe/frappe/public/js/frappe/model/indicator.js +30,Draft,Udkast
+DocType: Customer,Buyer of Goods and Services.,Køber af varer og tjenesteydelser.
+DocType: Purchase Taxes and Charges,On Previous Row Amount,På Forrige Row Beløb
+apps/erpnext/erpnext/stock/doctype/item/item.py +37,Item Code is mandatory because Item is not automatically numbered,"Item Code er obligatorisk, fordi Varen er ikke automatisk nummereret"
+DocType: Activity Cost,Costing Rate,Costing Rate
+DocType: Blog Post,Blog Post,Blog-indlæg
+DocType: Employee,Rented,Lejet
+DocType: Installation Note Item,Against Document Detail No,Imod Dokument Detail Nej
+DocType: Leave Type,Leave Type Name,Lad Type Navn
+DocType: Bank Reconciliation,Journal Entries,Journaloptegnelser
+apps/erpnext/erpnext/config/selling.py +122,Template of terms or contract.,Skabelon af vilkår eller kontrakt.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +127,Please enter relieving date.,Indtast lindre dato.
+DocType: Job Applicant,Thread HTML,Tråd HTML
+DocType: Letter Head,Is Default,Er Standard
+apps/erpnext/erpnext/stock/doctype/item/item.py +496,Item has variants.,Element har varianter.
+DocType: SMS Log,No of Requested SMS,Ingen af ​​Anmodet SMS
+DocType: Issue,Opening Time,Åbning tid
+apps/erpnext/erpnext/config/hr.py +77,Leave Allocation Tool,Lad Tildeling Tool
+DocType: Upload Attendance,Import Log,Import Log
+DocType: Purchase Invoice,In Words,I Words
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,Stock cannot exist for Item {0} since has variants,Stock kan ikke eksistere for Item {0} da har varianter
+apps/erpnext/erpnext/accounts/doctype/account/account.py +188,Account {0} does not exist,Konto {0} findes ikke
+apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Template,Skabelon
+DocType: Manufacturing Settings,Disable Capacity Planning and Time Tracking,Deaktiver kapacitetsplanlægning og tidsregistrering
+DocType: Project Task,View Task,View Opgave
+DocType: GL Entry,Against Voucher,Mod Voucher
+DocType: Purchase Receipt,Other Details,Andre detaljer
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +203,Please see attachment,Se venligst vedhæftede
+DocType: C-Form,Quarter,Kvarter
+DocType: Holiday List,Holiday List Name,Holiday listenavn
+apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +21,Time Log is not billable,Time Log ikke fakturerbare
+DocType: Lead,Add to calendar on this date,Føj til kalender på denne dato
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +40,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.","Hvis to eller flere Priser Regler er fundet på grundlag af de ovennævnte betingelser, er Priority anvendt. Prioritet er et tal mellem 0 og 20, mens Standardværdien er nul (blank). Højere antal betyder, at det vil have forrang, hvis der er flere Priser Regler med samme betingelser."
+apps/erpnext/erpnext/config/stock.py +110,"e.g. Kg, Unit, Nos, m","f.eks Kg, Unit, Nos, m"
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +429,BOM {0} must be submitted,BOM {0} skal indsendes
+apps/erpnext/erpnext/public/js/setup_wizard.js +141,"e.g. ""My Company LLC""",fx &quot;My Company LLC&quot;
+apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,Enten target qty eller målbeløbet er obligatorisk
+DocType: Item Group,Show In Website,Vis I Website
+apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +45,Note: This Cost Center is a Group. Cannot make accounting entries against groups.,Bemærk: Denne Cost Center er en gruppe. Kan ikke gøre regnskabsposter mod grupper.
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +67,"Cannot declare as lost, because Quotation has been made.","Kan ikke erklære så tabt, fordi Citat er blevet gjort."
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Utility Expenses,Utility Udgifter
+apps/erpnext/erpnext/accounts/doctype/account/account.py +134,Root Type is mandatory,Root Typen er obligatorisk
+DocType: Bank Reconciliation Detail,Cheque Date,Check Dato
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +194,Serial No {0} is under maintenance contract upto {1},Løbenummer {0} er under vedligeholdelse kontrakt op {1}
+DocType: Item Price,Item Price,Item Pris
+apps/erpnext/erpnext/stock/get_item_details.py +136,Item {0} must be a Sub-contracted Item,Vare {0} skal være en underentreprise Vare
+DocType: Maintenance Visit,Maintenance Visit,Vedligeholdelse Besøg
+DocType: SMS Parameter,SMS Parameter,SMS Parameter
+DocType: Account,Frozen,Frosne
+DocType: Holiday List,Clear Table,Klar Table
+DocType: Lead,Upper Income,Upper Indkomst
+apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,Projekt status
+DocType: SMS Log,No of Sent SMS,Ingen af ​​Sent SMS
+apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +34,Default Activity Cost exists for Activity Type - {0},Standard Activity Omkostninger findes for Activity Type - {0}
+,Trial Balance,Trial Balance
+apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +66,No salary slip found for month:,Ingen lønseddel fundet for måned:
+apps/erpnext/erpnext/config/selling.py +158,Setup incoming server for sales email id. (e.g. sales@example.com),Opsætning indgående server til salg email id. (F.eks sales@example.com)
+DocType: Purchase Invoice Item,Rate (Company Currency),Rate (Company Valuta)
+DocType: Communication,Received,Modtaget
+apps/erpnext/erpnext/public/js/setup_wizard.js +347,Your Products or Services,Dine produkter eller tjenester
+DocType: DocType,Administrator,Administrator
+DocType: POS Profile,POS Profile,POS profil
+DocType: Production Order Operation,Actual Time and Cost,Aktuel leveringstid og omkostninger
+DocType: Buying Settings,Settings for Buying Module,Indstillinger til køb modul
+apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,Omkostninger ved Leverede varer
+DocType: Sales Invoice,Return Against Sales Invoice,Retur Against Sales Invoice
+,To Produce,At producere
+apps/erpnext/erpnext/config/accounts.py +23,Bills raised by Suppliers.,Regninger rejst af leverandører.
+,Serial No Service Contract Expiry,Løbenummer Service Kontrakt udløb
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +206,"Company Email ID not found, hence mail not sent","Firma Email ID ikke fundet, dermed mail ikke sendt"
+DocType: Sales Order,Not Applicable,Gælder ikke
+apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +54,Cost Center with existing transactions can not be converted to ledger,Cost Center med eksisterende transaktioner kan ikke konverteres til finans
+DocType: Employee,Leave Approvers,Lad godkendere
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +90,Please setup numbering series for Attendance via Setup > Numbering Series,Venligst setup nummerering serie for Deltagelse via Setup&gt; Nummerering Series
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Administrative Officer,Kontorfuldmægtig
+apps/erpnext/erpnext/config/crm.py +90,Manage Sales Person Tree.,Administrer Sales Person Tree.
+DocType: Sales Invoice,Posting Time,Udstationering Time
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial Nos Required for Serialized Item {0},Seriel Nos Nødvendig for Serialized Item {0}
+DocType: Journal Entry,Credit Card Entry,Credit Card indtastning
+apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +67,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","Betjening {0} længere end alle tilgængelige arbejdstimer i arbejdsstation {1}, nedbryde driften i flere operationer"
+DocType: Shipping Rule Condition,Shipping Rule Condition,Forsendelse Rule Betingelse
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code > Item Group > Brand,Item Code&gt; Vare Gruppe&gt; Brand
+apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +123,Further nodes can be only created under 'Group' type nodes,Yderligere noder kan kun oprettes under &#39;koncernens typen noder
+DocType: Address,Name of person or organization that this address belongs to.,"Navn på den person eller organisation, der denne adresse tilhører."
+DocType: Item Attribute Value,Abbreviation,Forkortelse
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Reference #{0} dated {1},Henvisning # {0} dateret {1}
+apps/erpnext/erpnext/config/stock.py +23,Record item movement.,Optag element bevægelse.
+DocType: Expense Claim,Employees Email Id,Medarbejdere Email Id
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +87,Commission on Sales,Provision på salg
+DocType: Quality Inspection Reading,Accepted,Accepteret
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +316,"Select your Country, Time Zone and Currency","Vælg dit land, tidszone og valuta"
+apps/erpnext/erpnext/config/accounts.py +53,Update bank payment dates with journals.,Opdater bank terminer med tidsskrifter.
+DocType: Accounts Settings,Accounts Frozen Upto,Regnskab Frozen Op
+apps/erpnext/erpnext/config/support.py +33,"Newsletters to contacts, leads.","Nyhedsbreve til kontakter, fører."
+DocType: Account,Root Type,Root Type
+DocType: User,Male,Mand
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +50,"Company, Month and Fiscal Year is mandatory","Company, Måned og regnskabsår er obligatorisk"
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +103,Please enter sales order in the above table,Indtast salgsordre i ovenstående tabel
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Travel Expenses,Rejser Udgifter
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +262,Purchase Invoice {0} is already submitted,Købsfaktura {0} er allerede indsendt
+DocType: Employee,Exit,Udgang
+DocType: Bulk Email,Not Sent,Ikke Sent
+DocType: Website Settings,Website Settings,Website Settings
+DocType: Purchase Order Item,Material Request Detail No,Materiale Request Detail Nej
+DocType: Item Price,Multiple Item prices.,Flere Item priser.
+DocType: Purchase Receipt Item,Received and Accepted,Modtaget og accepteret
+DocType: Address,Billing,Fakturering
+apps/erpnext/erpnext/controllers/selling_controller.py +157,Maxiumm discount for Item {0} is {1}%,Maxiumm rabat for Item {0} er {1}%
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +242,Let's prepare the system for first use.,Lad os forberede systemet til første brug.
+DocType: Employee,Date of Birth,Fødselsdato
+apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +5,Expired,Udløbet
+DocType: Lead,Next Contact Date,Næste Kontakt Dato
+apps/erpnext/erpnext/public/js/setup_wizard.js +326,List a few of your suppliers. They could be organizations or individuals.,Nævne et par af dine leverandører. De kunne være organisationer eller enkeltpersoner.
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +92,Conversion rate cannot be 0 or 1,Omregningskurs kan ikke være 0 eller 1
+DocType: Features Setup,Sales Discounts,Salg Rabatter
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +99,Negative Quantity is not allowed,Negative Mængde er ikke tilladt
+DocType: Journal Entry Account,Exchange Rate,Exchange Rate
+DocType: Stock Entry,Total Outgoing Value,Samlet Udgående Value
+DocType: Cost Center,Parent Cost Center,Parent Cost center
+DocType: Warranty Claim,If different than customer address,Hvis anderledes end kunde adresse
+DocType: Shopping Cart Settings,Quotation Series,Citat Series
+,Batch-Wise Balance History,Batch-Wise Balance History
+DocType: Production Order,Actual Operating Cost,Faktiske driftsomkostninger
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","Mad, drikke og tobak"
+DocType: Brand,Item Manager,Item manager
+DocType: Customer,Last Day of the Next Month,Sidste dag i den næste måned
+DocType: Purchase Invoice Item,Valuation Rate,Værdiansættelse Rate
+DocType: Sales Order Item,Projected Qty,Projiceret Antal
+DocType: SMS Log,SMS Log,SMS Log
+DocType: Customer,Commission Rate,Kommissionens Rate
+DocType: C-Form Invoice Detail,Net Total,Net Total
+apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,{0} {1} ikke i noget aktiv regnskabsår. For flere detaljer tjek {2}.
+,Sales Register,Salg Register
+DocType: Company,Stock Settings,Stock Indstillinger
+DocType: Company,Company Info,Firma Info
+DocType: Manufacturing Settings,Capacity Planning,Capacity Planning
+DocType: Item,Item Code for Suppliers,Item Code for leverandører
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +79,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Række {0}: Party Type og Party gælder kun mod Tilgodehavende / Betales konto
+DocType: Salary Slip,Bank Account No.,Bankkonto No.
+DocType: Cost Center,Cost Center Name,Cost center Navn
+apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +33,Contribution Amount,Bidrag Beløb
+,Gross Profit,Gross Profit
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +410,Please remove this Invoice {0} from C-Form {1},Fjern denne faktura {0} fra C-Form {1}
+DocType: Account,Accounts,Konti
+DocType: Payment Tool,Against Vouchers,Mod Vouchers
+DocType: Account,Parent Account,Parent Konto
+apps/erpnext/erpnext/config/stock.py +38,Installation record for a Serial No.,Installation rekord for en Serial No.
+DocType: Workflow State,Refresh,Opdater
+DocType: Expense Claim Detail,Claim Amount,Krav Beløb
+DocType: Item,UOMs,UOMs
+DocType: Journal Entry,Bill Date,Bill Dato
+DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,Hoveder (eller grupper) mod hvilken regnskabsposter er lavet og balancer opretholdes.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +132,Credit Card,Credit Card
+apps/erpnext/erpnext/stock/get_item_details.py +107,No Item with Serial No {0},Ingen Vare med Serial Nej {0}
+apps/erpnext/erpnext/config/projects.py +51,Gantt chart of all tasks.,Gantt-diagram af alle opgaver.
+DocType: Production Planning Tool,Material Requirement,Material Requirement
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Engineer,Ingeniør
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Compensatory Off,Kompenserende Off
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +167,Row {0}: Credit entry can not be linked with a {1},Række {0}: Kredit indgang ikke kan knyttes med en {1}
+DocType: DocPerm,Level,Level
+DocType: Naming Series,Update Series Number,Opdatering Series Number
+DocType: Production Order,Production Order,Produktionsordre
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +232,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
+					Available Qty: {4}, Transfer Qty: {5}","Række {0}: Antal ikke avalable i lageret {1} på {2} {3}. Tilgængelig Antal: {4}, Transfer Antal: {5}"
+,Quotation Trends,Citat Trends
+apps/erpnext/erpnext/config/support.py +43,Single unit of an Item.,Enkelt enhed af et element.
+DocType: Employee,Health Details,Sundhed Detaljer
+apps/erpnext/erpnext/controllers/selling_controller.py +143,Total allocated percentage for sales team should be 100,Samlede fordelte procentdel for salgsteam bør være 100
+DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,Lav Regnskab indtastning For hver Stock Movement
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +44,Leaves must be allocated in multiples of 0.5,"Blade skal afsættes i multipla af 0,5"
+,Production Orders in Progress,Produktionsordrer i Progress
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +329,Production Order cannot be raised against a Item Template,Produktionsordre kan ikke rejses mod en Vare skabelon
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +33,"Can not filter based on Account, if grouped by Account","Kan ikke filtrere baseret på konto, hvis grupperet efter konto"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +444,POS Profile required to make POS Entry,POS profil kræves for at gøre POS indtastning
+apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +81,This Time Log conflicts with {0} for {1} {2},Denne tidslog konflikter med {0} for {1} {2}
+apps/erpnext/erpnext/accounts/page/pos/pos.js +15,Billing (Sales Invoice),Billing (Sales Invoice)
+DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,"Nettoløn (i ord) vil være synlig, når du gemmer lønsedlen."
+DocType: Attendance,Attendance,Fremmøde
+DocType: Features Setup,Item Serial Nos,Vare Serial Nos
+DocType: Employee,Organization Profile,Organisation profil
+apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +33,Item {0} appears multiple times in Price List {1},Vare {0} forekommer flere gange i prisliste {1}
+DocType: Item,website page link,webside link
+DocType: Lead,Lower Income,Lavere indkomst
+DocType: Salary Structure,Monthly Earning & Deduction,Månedlige Earning &amp; Fradrag
+DocType: BOM Operation,Operation Time,Operation Time
+DocType: Payment Reconciliation,Invoice/Journal Entry Details,Faktura / Kassekladde Detaljer
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +187,Please set User ID field in an Employee record to set Employee Role,Indstil Bruger-id feltet i en Medarbejder rekord at indstille Medarbejder Rolle
+DocType: Salary Slip,Arrear Amount,Bagud Beløb
+,Qty to Deliver,Antal til Deliver
+apps/erpnext/erpnext/stock/utils.py +89,Item {0} ignored since it is not a stock item,Element {0} ignoreres da det ikke er en lagervare
+DocType: BOM,Operating Cost,Driftsomkostninger
+apps/frappe/frappe/core/page/modules_setup/modules_setup.py +11,Updated,Opdateret
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +458,Warning: Material Requested Qty is less than Minimum Order Qty,Advarsel: Materiale Anmodet Antal er mindre end Minimum Antal
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +318,Expected Delivery Date is lesser than Planned Start Date.,Forventet leveringsdato er mindre end planlagt startdato.
+DocType: Naming Series,User must always select,Brugeren skal altid vælge
+DocType: Project,Gross Margin %,Gross Margin%
+DocType: Attendance,Attendance Date,Fremmøde Dato
+DocType: Item,List this Item in multiple groups on the website.,Liste denne vare i flere grupper på hjemmesiden.
+apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,Ikke flere resultater.
+DocType: Buying Settings,Default Supplier Type,Standard Leverandør Type
+DocType: Quality Inspection,Item Serial No,Vare Løbenummer
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +287,Capacity Planning Error,Capacity Planning Fejl
+DocType: Packing Slip,Get Items,Få Varer
+apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,Seneste
+DocType: Task Depends On,Task Depends On,Task Afhænger On
+apps/erpnext/erpnext/public/js/setup_wizard.js +242,Keep it web friendly 900px (w) by 100px (h),Hold det web venlige 900px (w) ved 100px (h)
+DocType: SMS Center,All Contact,Alle Kontakt
+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""",Gå til den relevante gruppe (som regel Anvendelse af fondene&gt; Omsætningsaktiver&gt; bankkonti og oprette en ny konto (ved at klikke på Tilføj barn) af typen &quot;Bank&quot;
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +221,Quality Inspection required for Item {0},Inspektion kvalitet kræves for Item {0}
+apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,På lager
+apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,Data import og eksport
+DocType: Issue,Support,Support
+DocType: Stock Settings,Freeze Stocks Older Than [Days],Frys Stocks Ældre end [dage]
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +21,{0}: From {0} of type {1},{0}: Fra {0} af typen {1}
+apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,'Baseret på' og 'Grupper efter' ikke kan være samme
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +172,"Against Voucher Type must be one of Sales Order, Sales Invoice or Journal Entry","Imod Voucher type skal være en af ​​kundeordre, Salg Faktura eller Kassekladde"
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +66,Buying Amount,Køb Beløb
+DocType: Supplier,Statutory info and other general information about your Supplier,Lovpligtig info og andre generelle oplysninger om din leverandør
+DocType: Production Plan Item,Production Plan Item,Produktion Plan Vare
+DocType: Sales Order,In Words will be visible once you save the Sales Order.,"I Ord vil være synlig, når du gemmer Sales Order."
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,Executive Search
+apps/erpnext/erpnext/utilities/doctype/address/address.py +113,My Addresses,Mine Adresser
+DocType: Quotation,Shopping Cart,Indkøbskurv
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +398,Nothing to request,Intet at anmode
+,Download Backups,Hent Backups
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,Kemisk
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,Total Enestående Amt
+DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,Landede Cost Skatter og Afgifter
+DocType: Email Digest,Income / Expense,Indtægter / Expense
+apps/erpnext/erpnext/config/crm.py +22,Potential opportunities for selling.,Potentielle muligheder for at sælge.
+DocType: Opportunity,Contact Mobile No,Kontakt Mobile Ingen
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +143,Source warehouse is mandatory for row {0},Kilde lageret er obligatorisk for rækken {0}
+DocType: Appraisal,Select the Employee for whom you are creating the Appraisal.,"Vælg Medarbejder, for hvem du opretter Vurdering."
+apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +25,Scheduled to send to {0},Planlagt at sende til {0}
+DocType: Designation,Designation,Betegnelse
+apps/erpnext/erpnext/config/setup.py +88,Create rules to restrict transactions based on values.,Oprette regler til at begrænse transaktioner baseret på værdier.
+apps/erpnext/erpnext/config/stock.py +69,Split Delivery Note into packages.,Split følgeseddel i pakker.
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +192,Retained Earnings,Overført overskud
+apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +128,Please enter Employee Id of this sales person,Indtast venligst Medarbejder Id dette salg person
+DocType: Appraisal,Employee,Medarbejder
+DocType: Sales Order Item,Delivery Warehouse,Levering Warehouse
+DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,Salg Skatter og Afgifter Skabelon
+apps/erpnext/erpnext/config/stock.py +43,Where items are stored.,Hvor emner er gemt.
+DocType: Process Payroll,Submit Salary Slip,Indsend lønseddel
+apps/erpnext/erpnext/setup/doctype/company/company.py +172,"Sorry, companies cannot be merged","Beklager, kan virksomhederne ikke slås sammen"
+DocType: Item Group,Item Classification,Item Klassifikation
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +513,Transfer Material to Supplier,Overførsel Materiale til Leverandøren
+DocType: Sales Invoice Item,Available Qty at Warehouse,Tilgængelig Antal på Warehouse
+apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +107,{0} has been successfully unsubscribed from this list.,{0} er blevet afmeldt fra denne liste.
+DocType: Activity Cost,Projects User,Projekter Bruger
+,Stock Analytics,Stock Analytics
+DocType: Pricing Rule,Max Qty,Max Antal
+DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,"Alt salg Transaktioner kan mærkes mod flere ** Sales Personer **, så du kan indstille og overvåge mål."
+DocType: Serial No,Under Warranty,Under Garanti
+DocType: Selling Settings,Allow user to edit Price List Rate in transactions,Tillad brugeren at redigere Prisliste Rate i transaktioner
+DocType: Email Digest,Receivables,Tilgodehavender
+DocType: Purchase Receipt,Time at which materials were received,"Tidspunkt, hvor materialer blev modtaget"
+DocType: Time Log,Hours,Timer
+,Purchase Order Items To Be Received,"Købsordre, der modtages"
+apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +47,Delivered Amount,Leveres Beløb
+DocType: Purchase Order Item,Warehouse and Reference,Warehouse og reference
+DocType: Employee,Permanent Address Is,Faste adresse
+DocType: Purchase Receipt,Add / Edit Taxes and Charges,Tilføj / rediger Skatter og Afgifter
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +302,Debit To account must be a Receivable account,Betalingskort Til konto skal være et tilgodehavende konto
+DocType: GL Entry,Against,Imod
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} betalingssystemer poster ikke kan filtreres af {1}
+DocType: Delivery Note,Delivery To,Levering Til
+apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.js +19,Send,Sende
+DocType: Stock Settings,Allowance Percent,Godtgørelse Procent
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,Landbrug
+DocType: Employee,Passport Number,Passport Number
+apps/erpnext/erpnext/crm/doctype/lead/lead.js +30,Create Customer,Opret kunde
+DocType: Purchase Invoice Item,Amount (Company Currency),Beløb (Company Valuta)
+apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +30,Net Profit / Loss,Netto Resultat / Loss
+DocType: Hub Settings,Publish Pricing,Offentliggøre Pricing
+,Ordered Items To Be Billed,Bestilte varer at blive faktureret
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +173,Notice Period,Opsigelsesperiode
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +684,From Delivery Note,Fra følgeseddel
+DocType: Communication,Phone,Telefon
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +493,Issue Material,Issue Materiale
+DocType: Quality Inspection,Inspection Type,Inspektion Type
+apps/erpnext/erpnext/config/manufacturing.py +120,Bill of Materials,Bill of Materials
+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,Kan ikke vælge charge type som &#39;On Forrige Row Beløb&#39; eller &#39;On Forrige Row alt &quot;for første række
+DocType: Landed Cost Item,Landed Cost Item,Landed Cost Vare
+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.","Prisfastsættelse Regel først valgt baseret på &quot;Apply On &#39;felt, som kan være Item, punkt Group eller Brand."
+DocType: Print Settings,Classic,Klassisk
+DocType: Employee,Encashment Date,Indløsning Dato
+DocType: SMS Settings,SMS Settings,SMS-indstillinger
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Kg,Kg
+,Monthly Attendance Sheet,Månedlig Deltagelse Sheet
+DocType: Salary Slip,Total Deduction,Samlet Fradrag
+apps/erpnext/erpnext/controllers/accounts_controller.py +101,Due Date is mandatory,Forfaldsdato er obligatorisk
+DocType: Production Order Operation,Estimated Time and Cost,Estimeret tid og omkostninger
+DocType: SMS Log,Sent To,Sendt Til
+DocType: Stock Reconciliation,Stock Reconciliation,Stock Afstemning
+apps/erpnext/erpnext/stock/doctype/item/item.py +550,Item {0} is not a stock Item,Vare {0} er ikke et lager Vare
+DocType: Time Log,Will be updated only if Time Log is 'Billable',"Vil kun blive opdateret, hvis Time Log er &quot;faktureres&quot;"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Report Type is mandatory,Rapporttype er obligatorisk
+DocType: Payment Tool,Payment Account,Betaling konto
+DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,Vælg Carry Forward hvis du også ønsker at inkludere foregående regnskabsår balance blade til indeværende regnskabsår
+DocType: Quotation,Order Type,Bestil Type
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +140,Execution,Udførelse
+apps/frappe/frappe/public/js/frappe/model/indicator.js +34,Cancelled,Annulleret
+DocType: GL Entry,Transaction Date,Transaktion Dato
+DocType: Item Attribute,Item Attribute Values,Item Egenskab Værdier
+DocType: Selling Settings,Selling Settings,Salg af indstillinger
+DocType: Purchase Invoice,Start date of current invoice's period,Startdato for nuværende faktura menstruation
+apps/frappe/frappe/core/page/user_permissions/user_permissions.js +246,Allow User,Tillad Bruger
+apps/erpnext/erpnext/config/crm.py +72,Manage Customer Group Tree.,Administrer Customer Group Tree.
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +91,From Date in Salary Structure cannot be lesser than Employee Joining Date.,Fra dato i Løn Structure ikke kan være mindre end Medarbejder Sammenføjning Dato.
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,Pensionskasserne
+DocType: Purchase Invoice,Next Date,Næste dato
+apps/erpnext/erpnext/accounts/general_ledger.py +21,Incorrect number of General Ledger Entries found. You might have selected a wrong Account in the transaction.,Forkert antal finansposter fundet. Du har muligvis valgt et forkert konto i transaktionen.
+DocType: Email Digest,Email Digest,Email Digest
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Attendance can not be marked for future dates,Fremmøde kan ikke markeres for fremtidige datoer
+apps/erpnext/erpnext/public/js/pos/pos.js +147,Please select {0} first.,Vælg {0} først.
+DocType: Purchase Invoice Advance,Journal Entry Detail No,Kassekladde Detail Nej
+,POS,POS
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +44,Real Estate,Real Estate
+DocType: Salary Structure,Total Earning,Samlet Earning
+DocType: Sales Invoice,Sales Team1,Salg TEAM1
+DocType: Delivery Note,Vehicle No,Vehicle Ingen
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,Part-time,Deltid
+DocType: Sales Invoice,Customer's Vendor,Kundens Vendor
+DocType: Employee,Notice (days),Varsel (dage)
+DocType: Cost Center,Budget,Budget
+DocType: Maintenance Visit,Scheduled,Planlagt
+DocType: Bank Reconciliation Detail,Against Account,Mod konto
+apps/erpnext/erpnext/config/selling.py +153,Bundle items at time of sale.,Bundle elementer på salgstidspunktet.
+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,Item Row {0}: kvittering {1} findes ikke i ovenstående &#39;Køb Kvitteringer&#39; bord
+apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,Mangel Antal
+DocType: Employee,Provide email id registered in company,Giv email id er registreret i selskab
+DocType: SMS Center,All Customer Contact,Alle Customer Kontakt
+apps/erpnext/erpnext/config/hr.py +135,"Type of leaves like casual, sick etc.","Type blade som afslappet, syge etc."
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +176,Closing (Opening + Totals),Lukning (Åbning + Totals)
+apps/frappe/frappe/public/js/frappe/form/workflow.js +116,To,Til
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +137,Planning,Planlægning
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +171,Only the selected Leave Approver can submit this Leave Application,Kun den valgte Leave Godkender kan indsende denne Leave Application
+DocType: Selling Settings,Delivery Note Required,Følgeseddel Nødvendig
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +172,Leaves per Year,Blade pr år
+DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Hold styr på salgskampagner. Hold styr på Leads, Citater, Sales Order osv fra kampagner til at måle Return on Investment."
+DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Angiv operationer, driftsomkostninger og giver en unik Operation nej til dine operationer."
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,Private Equity
+,S.O. No.,SÅ No.
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +68,Total Invoiced Amt,Samlede fakturerede Amt
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +20,Setup Already Complete!!,Opsætning Allerede Complete !!
+DocType: Notification Control,Purchase Order Message,Indkøbsordre Message
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +215,Quantity required for Item {0} in row {1},"Mængde, der kræves for Item {0} i række {1}"
+apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +17,Reserved Qty,Reserveret Antal
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,Out Antal
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +95,{0} {1} has been modified. Please refresh.,{0} {1} er blevet ændret. Venligst opdater.
+DocType: Payment Tool Detail,Payment Amount,Betaling Beløb
+DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,Rolle Tilladt til Indstil Frosne Konti og Rediger Frosne Entries
+apps/erpnext/erpnext/config/support.py +18,Warranty Claim against Serial No.,Garanti krav mod Serial No.
+apps/erpnext/erpnext/stock/doctype/item/item.py +305,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Måleenhed {0} er indtastet mere end én gang i Conversion Factor Table
+,Reserved,Reserveret
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} has already been received,Løbenummer {0} er allerede blevet modtaget
+apps/erpnext/erpnext/config/buying.py +59,Supplier Type master.,Leverandør Type mester.
+DocType: Journal Entry,Pay To / Recd From,Betal Til / RECD Fra
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +467,Sales Order {0} is not submitted,Sales Order {0} er ikke indsendt
+DocType: Journal Entry,Reference Number,Referencenummer
+apps/frappe/frappe/config/setup.py +59,Settings,Indstillinger
+apps/erpnext/erpnext/accounts/doctype/account/account.py +142,Warehouse is mandatory if account type is Warehouse,"Warehouse er obligatorisk, hvis kontotype er Warehouse"
+DocType: Account,Profit and Loss,Resultatopgørelse
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +65,Selling Amount,Selling Beløb
+apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +45,Account {0} has been entered more than once for fiscal year {1},Konto {0} er indtastet mere end en gang for regnskabsåret {1}
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +205,New Account,Ny konto
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +157,Lead must be set if Opportunity is made from Lead,"Bly skal indstilles, hvis Opportunity er lavet af Lead"
+apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +30,Please enter Approving Role or Approving User,Indtast Godkendelse Rolle eller godkender Bruger
+DocType: Delivery Note,Billing Address,Faktureringsadresse
+DocType: Warranty Claim,"To assign this issue, use the ""Assign"" button in the sidebar.",For at tildele problemet ved at bruge knappen &quot;Tildel&quot; i indholdsoversigten.
+DocType: Production Order,Expected Delivery Date,Forventet leveringsdato
+DocType: Company,Round Off Account,Afrunde konto
+DocType: Purchase Invoice,Yearly,Årlig
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +76,Max 100 rows for Stock Reconciliation.,Max 100 rækker for Stock Afstemning.
+DocType: BOM,Item to be manufactured or repacked,"Element, der skal fremstilles eller forarbejdes"
+DocType: Employee,Blood Group,Blood Group
+apps/erpnext/erpnext/stock/utils.py +162,Serial number {0} entered more than once,Serienummer {0} indtastet mere end én gang
+DocType: Account,Temporary,Midlertidig
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +39,WIP Warehouse,WIP Warehouse
+DocType: Serial No,Creation Time,Creation Time
+DocType: Contact Us Settings,Address Line 1,Adresse Line 1
+DocType: Page,Yes,Ja
+apps/erpnext/erpnext/accounts/general_ledger.py +106,Account: {0} can only be updated via Stock Transactions,Konto: {0} kan kun opdateres via Stock Transaktioner
+DocType: Purchase Receipt Item Supplied,Current Stock,Aktuel Stock
+DocType: Purchase Invoice,Quarterly,Kvartalsvis
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +38,Food,Mad
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +56,Cost Center is required for 'Profit and Loss' account {0},Cost center er nødvendig for &quot;Resultatopgørelsen&quot; konto {0}
+apps/erpnext/erpnext/accounts/doctype/account/account.py +113,Account with existing transaction can not be converted to group.,Konto med eksisterende transaktion kan ikke konverteres til gruppen.
+DocType: Lead,Address & Contact,Adresse og kontakt
+DocType: UOM,Check this to disallow fractions. (for Nos),Markér dette for at forbyde fraktioner. (For NOS)
+DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Hvis kontoen er frossen, er poster lov til begrænsede brugere."
+,Employee Birthday,Medarbejder Fødselsdag
+DocType: Purchase Order Item Supplied,Supplied Qty,Medfølgende Antal
+DocType: Packing Slip Item,DN Detail,DN Detail
+,Terretory,Terretory
+DocType: Workstation,Working Hours,Arbejdstider
+,Stock Ageing,Stock Ageing
+DocType: Employee Education,Graduate,Graduate
+DocType: Features Setup,After Sale Installations,Efter salg Installationer
+DocType: Purchase Invoice,End date of current invoice's period,Slutdato for aktuelle faktura menstruation
+apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,Punkt 2
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +43,'From Date' is required,'Fra dato' er nødvendig
+DocType: System Settings,Loading...,Indlæser ...
+DocType: Lead,Consultant,Konsulent
+DocType: Stock Entry,Repack,Pakke
+apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,Projektaktivitet / opgave.
+apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,Brugere og tilladelser
+,Setup Wizard,Setup Wizard
+apps/erpnext/erpnext/config/buying.py +13,Supplier database.,Leverandør database.
+apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +79,You need to enable Shopping Cart,Du skal aktivere Indkøbskurv
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Calls,Opkald
+DocType: Production Plan Sales Order,Production Plan Sales Order,Produktion Plan kundeordre
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,Se nu
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +253,Unable to find Time Slot in the next {0} days for Operation {1},Kan ikke finde Time Slot i de næste {0} dage til Operation {1}
+DocType: Sales Invoice,Paid Amount,Betalt Beløb
+apps/erpnext/erpnext/stock/stock_ledger.py +336,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},Negativ Stock Error ({6}) for Item {0} i Warehouse {1} på {2} {3} i {4} {5}
+DocType: Item,Is Fixed Asset Item,Er Fast aktivpost
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +54,Transportation,Transport
+DocType: Maintenance Visit,Customer Feedback,Kundefeedback
+DocType: Fiscal Year,Year Name,År Navn
+,Territory Target Variance Item Group-Wise,Territory Target Variance Item Group-Wise
+apps/erpnext/erpnext/config/stock.py +120,Brand master.,Brand mester.
+DocType: Manufacturing Settings,Capacity Planning For (Days),Kapacitet Planlægning For (dage)
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +92,Reference No & Reference Date is required for {0},Referencenummer &amp; Reference Dato er nødvendig for {0}
+DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Købe Skatter og Afgifter Skabelon
+DocType: Monthly Distribution,Monthly Distribution,Månedlig Distribution
+apps/erpnext/erpnext/controllers/accounts_controller.py +494,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Hvis du vil medtage skat i række {0} i Item sats, skatter i rækker {1} skal også medtages"
+DocType: Stock Entry Detail,Source Warehouse,Kilde Warehouse
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Postal Expenses,Postale Udgifter
+DocType: Leave Block List Date,Leave Block List Date,Lad Block List Dato
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,&#39;Til dato&#39; er nødvendig
+DocType: Monthly Distribution,"**Monthly Distribution** helps you distribute your budget across months if you have seasonality in your business.
+
+To distribute a budget using this distribution, set this **Monthly Distribution** in the **Cost Center**","** Månedlig Distribution ** hjælper du distribuerer dit budget tværs måneder, hvis du har sæsonudsving i din virksomhed. At distribuere et budget ved hjælp af denne fordeling, skal du indstille dette ** Månedlig Distribution ** i ** Cost Center **"
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +378,Commercial,Kommerciel
+apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,"Annuller Materiale Besøg {0}, før den annullerer denne vedligeholdelse Besøg"
+DocType: SMS Center,Create Receiver List,Opret Modtager liste
+apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +69,Total Order Considered,Samlet Order Anses
+apps/erpnext/erpnext/public/js/setup_wizard.js +366,We buy this Item,Vi køber denne vare
+DocType: Appraisal Goal,Score (0-5),Score (0-5)
+apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +29,Budget cannot be set for Group Cost Center,Budget kan ikke indstilles for gruppe Cost center
+DocType: Dropbox Backup,Dropbox Access Key,Dropbox adgangsnøgle
+apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,Nye kunder
+apps/erpnext/erpnext/config/accounts.py +58,Match non-linked Invoices and Payments.,Match ikke-forbundne fakturaer og betalinger.
+DocType: Appraisal Goal,Appraisal Goal,Vurdering Goal
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +160,Target warehouse in row {0} must be same as Production Order,Target lager i rækken {0} skal være samme som produktionsordre
+DocType: Holiday,Holiday,Holiday
+DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","For nemheds af kunder, kan disse koder bruges i trykte formater som fakturaer og følgesedler"
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +18,Consulting,Rådgivning
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +107,Sales Order required for Item {0},Sales Order kræves for Item {0}
+DocType: Item,Default Selling Cost Center,Standard Selling Cost center
+DocType: Expense Claim Detail,Expense Date,Expense Dato
+DocType: Employee,You can enter any date manually,Du kan indtaste et hvilket som helst tidspunkt manuelt
+DocType: Leave Control Panel,Employee Type,Medarbejder Type
+apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM Rate
+DocType: Purchase Invoice,Additional Discount Amount,Yderligere Discount Beløb
+DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount","Hvis markeret, vil momsbeløbet blive betragtet som allerede er inkluderet i Print Rate / Print Beløb"
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +357,Finished Item {0} must be entered for Manufacture type entry,Færdig element {0} skal indtastes for Fremstilling typen post
+DocType: Time Log,Billing Amount,Fakturering Beløb
+DocType: GL Entry,GL Entry,GL indtastning
+DocType: Project Task,Working,Working
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +183,Purchase Receipt number required for Item {0},Kvittering nummer kræves for Item {0}
+apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +31,Please select Fiscal Year,Vælg venligst regnskabsår
+DocType: Bank Reconciliation Detail,Cheque Number,Check Number
+apps/erpnext/erpnext/controllers/trends.py +137,Amt,Amt
+DocType: Contact Us Settings,Introduction,Introduktion
+,Average Commission Rate,Gennemsnitlig Kommissionens Rate
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +23,Quick Help,Hurtig hjælp
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +30,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,Kan ikke ændre regnskabsår Start Dato og Skatteårsafslutning Dato når regnskabsår er gemt.
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +173,No Production Orders created,Ingen produktionsordrer oprettet
+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","Hvis varen er en variant af et andet element derefter beskrivelse, billede, prissætning, skatter mv vil blive fastsat fra skabelonen medmindre det udtrykkeligt er angivet"
+DocType: Purchase Invoice,Apply Additional Discount On,Påfør Yderligere Rabat på
+DocType: Stock Entry,Manufacture,Fremstilling
+DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,Fastsatte mål Item Group-wise for denne Sales Person.
+DocType: Stock Reconciliation Item,Current Qty,Aktuel Antal
+DocType: Packing Slip Item,Packing Slip Item,Packing Slip Vare
+DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Indkøbskurv Shipping Rule
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +46,Please enter Purchase Receipts,Indtast venligst Køb Kvitteringer
+apps/frappe/frappe/public/js/frappe/form/save.js +78,Name is required,Navn er påkrævet
+apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +24,This Time Log Batch has been cancelled.,This Time Log Batch er blevet annulleret.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,Opdatering Omkostninger
+DocType: Address,Shop,Butik
+DocType: SMS Center,Send To,Send til
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +168,Source and target warehouse cannot be same for row {0},Kilde og mål lageret ikke kan være ens for rækken {0}
+DocType: Features Setup,Exports,Eksport
+DocType: C-Form,C-Form,C-Form
+DocType: Web Form,Select DocType,Vælg DocType
+DocType: Item,Taxes,Skatter
+DocType: Leave Control Panel,Allocate,Tildele
+DocType: Expense Claim,Total Claimed Amount,Total krævede beløb
+DocType: Employee,Exit Interview Details,Exit Interview Detaljer
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +114,Actual type tax cannot be included in Item rate in row {0},"Faktiske type skat, kan ikke indgå i Item sats i række {0}"
+apps/erpnext/erpnext/config/manufacturing.py +19,Orders released for production.,Ordrer frigives til produktion.
+,Employee Leave Balance,Medarbejder Leave Balance
+apps/erpnext/erpnext/config/projects.py +79,Managing Projects,Håndtering af Projekter
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +591,From Opportunity,Fra Opportunity
+apps/erpnext/erpnext/config/stock.py +74,Incoming quality inspection.,Inspektion indkommende kvalitet.
+apps/erpnext/erpnext/config/stock.py +273,Opening Stock Balance,Åbning Stock Balance
+apps/frappe/frappe/model/rename_doc.py +348,Maximum {0} rows allowed,Maksimum {0} rækker tilladt
+DocType: Campaign,Campaign-.####,Kampagne -. ####
+apps/erpnext/erpnext/public/js/setup_wizard.js +348,"List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start.","Liste dine produkter eller tjenester, som du købe eller sælge. Sørg for at kontrollere Item Group, måleenhed og andre egenskaber, når du starter."
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,Employee Benefits,Personaleydelser
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +51,Either debit or credit amount is required for {0},Enten kredit- eller beløb er påkrævet for {0}
+apps/frappe/frappe/templates/base.html +145,Please enter email address,Indtast e-mail-adresse
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +287,Further cost centers can be made under Groups but entries can be made against non-Groups,Yderligere omkostninger centre kan foretages under Grupper men indtastninger kan foretages mod ikke-grupper
+DocType: Quality Inspection Reading,Acceptance Criteria,Acceptkriterier
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +90,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',"Kan henvise rækken, hvis gebyret type er &#39;On Forrige Row Beløb &quot;eller&quot; Forrige Row alt&#39;"
+DocType: Sales Invoice Item,Sales Invoice Item,Salg Faktura Vare
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,Tree Type
+apps/erpnext/erpnext/config/crm.py +146,Lead to Quotation,Føre til Citat
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,Internet Publishing
+apps/erpnext/erpnext/config/hr.py +33,Monthly salary statement.,Månedlige lønseddel.
+DocType: Purchase Invoice,Taxes and Charges Added,Skatter og Afgifter Tilføjet
+DocType: Time Log,Costing Amount,Koster Beløb
+apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Omkostninger ved Udstedte Varer
+DocType: Stock Settings,Auto Material Request,Auto Materiale Request
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,Samlet indbetalte beløb
+DocType: Salary Slip,Leave Encashment Amount,Lad Indløsning Beløb
+DocType: Project,Total Purchase Cost (via Purchase Invoice),Samlet anskaffelsespris (via købsfaktura)
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +43,Amounts not reflected in system,"Beløb, der ikke afspejles i systemet"
+DocType: Process Payroll,Process Payroll,Proces Payroll
+apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,Indtast venligst mindst 1 faktura i tabellen
+apps/erpnext/erpnext/public/js/setup_wizard.js +255,Add Users,Tilføj Brugere
+DocType: Warranty Claim,Resolved By,Løst Af
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +33,Please enter Payment Amount in atleast one row,Indtast Betaling Beløb i mindst én række
+apps/erpnext/erpnext/config/buying.py +28,Purchase Orders given to Suppliers.,Indkøbsordrer givet til leverandører.
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,90-Above,90-Above
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +74,Row # {0}: Returned Item {1} does not exists in {2} {3},Row # {0}: returnerede vare {1} ikke eksisterer i {2} {3}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +187,Please contact to the user who have Sales Master Manager {0} role,"Kontakt venligst til den bruger, der har Sales Master manager {0} rolle"
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +96,Items already synced,Varer allerede synkroniseret
+apps/erpnext/erpnext/public/js/utils.js +57,Add Serial No,Tilføj Løbenummer
+DocType: Communication,Communication,Kommunikation
+apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Leverandør (er)
+apps/erpnext/erpnext/accounts/utils.py +193,Allocated amount can not be negative,Tildelte beløb kan ikke være negativ
+DocType: Account,Stock Received But Not Billed,Stock Modtaget men ikke faktureret
+DocType: Item Group,Parent Item Group,Moderselskab Item Group
+DocType: Quality Inspection,In Process,I Process
+DocType: Time Log Batch,updated via Time Logs,opdateret via Time Logs
+DocType: Naming Series,Current Value,Aktuel værdi
+DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Opretter lønseddel for ovennævnte kriterier.
+apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,Punkt 4
+DocType: Lead,Product Enquiry,Produkt Forespørgsel
+apps/erpnext/erpnext/public/js/setup_wizard.js +107,Email Address,E-mail-adresse
+apps/erpnext/erpnext/hooks.py +68,Shipments,Forsendelser
+DocType: Employee Education,Major/Optional Subjects,Større / Valgfag
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +210,"Further accounts can be made under Groups, but entries can be made against non-Groups","Kan gøres yderligere konti under grupper, men oplysningerne kan gøres mod ikke-grupper"
+DocType: Employee,Employment Type,Beskæftigelse type
+apps/erpnext/erpnext/config/selling.py +98,Manage Sales Partners.,Administrer Sales Partners.
+DocType: Sales Invoice Advance,Advance Amount,Advance Beløb
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +37,Serial #,Serial #
+apps/erpnext/erpnext/public/js/setup_wizard.js +143,"e.g. ""MC""",fx &quot;MC&quot;
+apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +86,SMS sent to following numbers: {0},SMS sendt til følgende numre: {0}
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard_page.html +16,Previous,Forrige
+DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,Beskeder større end 160 tegn vil blive opdelt i flere meddelelser
+DocType: Serial No,Creation Document Type,Creation Dokumenttype
+apps/erpnext/erpnext/stock/doctype/item/item.py +421,"To merge, following properties must be same for both items","At fusionere, skal følgende egenskaber være ens for begge poster"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier > Supplier Type,Leverandør&gt; Leverandør type
+DocType: Naming Series,Select Transaction,Vælg Transaktion
+DocType: Department,Days for which Holidays are blocked for this department.,"Dage, som Holidays er blokeret for denne afdeling."
+apps/erpnext/erpnext/public/js/setup_wizard.js +294,e.g. 5,f.eks 5
+apps/erpnext/erpnext/config/hr.py +105,Organization unit (department) master.,Organisation enhed (departement) herre.
+DocType: Employee,Job Profile,Job profil
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +373,Paid amount + Write Off Amount can not be greater than Grand Total,Betalt beløb + Skriv Off Beløb kan ikke være større end Grand Total
+DocType: Purchase Order,Advance Paid,Advance Betalt
+DocType: Sales Partner,Logo,Logo
+,Itemwise Recommended Reorder Level,Itemwise Anbefalet genbestillings Level
+DocType: Bin,Quantity Requested for Purchase,"Mængde, der ansøges for Indkøb"
+DocType: Purchase Receipt,Get Current Stock,Få Aktuel Stock
+DocType: Account,Income,Indkomst
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Amounts not reflected in bank,"Beløb, der ikke afspejles i bank"
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +194,Purchase Order {0} is not submitted,Indkøbsordre {0} er ikke indsendt
+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.","Hvis flere Priser Regler fortsat gældende, er brugerne bedt om at indstille prioritet manuelt for at løse konflikter."
+apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date','Fra dato' skal være efter 'Til dato'
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +60,Temporary Accounts,Midlertidige Konti
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +57,Item Code cannot be changed for Serial No.,Item Code kan ikke ændres for Serial No.
+DocType: Account,Sales User,Salg Bruger
+DocType: Item Reorder,Transfer,Transfer
+,Item-wise Purchase History,Vare-wise Købshistorik
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +361,Cannot deactivate or cancel BOM as it is linked with other BOMs,"Kan ikke deaktivere eller annullere BOM, som det er forbundet med andre styklister"
+apps/erpnext/erpnext/stock/get_item_details.py +103,No Item with Barcode {0},Ingen Vare med Barcode {0}
+apps/erpnext/erpnext/accounts/party.py +275,Due Date cannot be before Posting Date,"Forfaldsdato kan ikke være, før Udstationering Dato"
+DocType: Landed Cost Item,Purchase Receipt Item,Kvittering Vare
+apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +36,{0} must appear only once,{0} må kun optræde én gang
+apps/erpnext/erpnext/controllers/recurring_document.py +199,Please enter 'Repeat on Day of Month' field value,Indtast &#39;Gentag på dag i måneden »felt værdi
+DocType: Material Request,Requested For,Anmodet om
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +60,Row {0}:Start Date must be before End Date,Række {0}: Start dato skal være før slutdato
+DocType: Payment Tool,Paid,Betalt
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Entertainment Expenses,Repræsentationsudgifter
+DocType: Contact Us Settings,Address,Adresse
+apps/erpnext/erpnext/controllers/status_updater.py +136,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Bemærk: Systemet vil ikke kontrollere over-levering og over-booking for Item {0} som mængde eller beløb er 0
+apps/frappe/frappe/workflow/doctype/workflow/workflow_list.js +7,Not active,Ikke aktiv
+,Accounts Payable Summary,Kreditorer Resumé
+DocType: Features Setup,Item Groups in Details,Varegrupper i Detaljer
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Production,Produktion
+apps/erpnext/erpnext/public/js/setup_wizard.js +114,The first user will become the System Manager (you can change this later).,Den første bruger bliver System Manager (du kan ændre dette senere).
+DocType: Issue,Attachment,Attachment
+,Purchase Receipt Trends,Kvittering Tendenser
+DocType: Opportunity,Walk In,Walk In
+DocType: Sales Invoice,Sales Team,Salgsteam
+DocType: Hub Settings,Seller Name,Sælger Navn
+DocType: Purchase Order,End date of current order's period,Slutdato for aktuelle ordres periode
+DocType: Quotation,Maintenance Manager,Vedligeholdelse manager
+DocType: Installation Note Item,Against Document No,Mod dokument nr
+apps/erpnext/erpnext/config/selling.py +23,Confirmed orders from Customers.,Bekræftede ordrer fra kunder.
+DocType: Pricing Rule,Selling,Selling
+DocType: Pricing Rule,Disable,Deaktiver
+DocType: Salary Slip,Salary Slip,Lønseddel
+DocType: Purchase Invoice Item,Expense Head,Expense Hoved
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +191,Account {0} is frozen,Konto {0} er spærret
+apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +10,Import Email From,Import Email Fra
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},Fra {0} til {1}
+DocType: Authorization Rule,Applicable To (User),Gælder for (Bruger)
+apps/erpnext/erpnext/setup/utils.py +14,Please specify Default Currency in Company Master and Global Defaults,Angiv venligst Standard Valuta i Company Master og Globale standardindstillinger
+DocType: Leave Control Panel,Leave blank if considered for all employee types,Lad stå tomt hvis det anses for alle typer medarbejderaktier
+DocType: Hub Settings,Publish Availability,Offentliggøre Tilgængelighed
+DocType: Authorization Rule,Customerwise Discount,Customerwise Discount
+DocType: Purchase Invoice,Supplier Name,Leverandør Navn
+DocType: UOM,Must be Whole Number,Skal være hele tal
+apps/erpnext/erpnext/public/js/setup_wizard.js +359,Sub Assemblies,Sub forsamlinger
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +181,Qty for {0},Antal for {0}
+DocType: Holiday List,Get Weekly Off Dates,Få ugentlige Off Datoer
+DocType: BOM Explosion Item,BOM Explosion Item,BOM Explosion Vare
+DocType: Appraisal,Calculate Total Score,Beregn Total Score
+DocType: Purchase Order,Supplied Items,Medfølgende varer
+DocType: Email Digest,Send regular summary reports via Email.,Send regelmæssige sammenfattende rapporter via e-mail.
+DocType: Pricing Rule,Sales Manager,Salgschef
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +224,Please select Employee Record first.,Vælg Medarbejder Record først.
+apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +37,Time Log {0} already billed,Time Log {0} allerede faktureret
+DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,"I Ord vil være synlig, når du gemmer indkøbsordre."
+DocType: Item,Re-Order Level,Re-Order Level
+apps/erpnext/erpnext/public/js/setup_wizard.js +294,Rate (%),Sats (%)
+apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +16,No record found,Ingen post fundet
+DocType: Stock Settings,Default Valuation Method,Standard værdiansættelsesmetode
+DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",Se &quot;Rate Of Materials Based On&quot; i Costing afsnit
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +119,Successfully Reconciled,Succesfuld Afstemt
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,Item {0} kan ikke have Batch
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +179,"Against Voucher Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Imod Voucher type skal være en af ​​indkøbsordre, købsfaktura eller Kassekladde"
+DocType: Stock Entry,Default Target Warehouse,Standard Target Warehouse
+DocType: Sales Invoice,The unique id for tracking all recurring invoices. It is generated on submit.,Den unikke id til at spore alle tilbagevendende fakturaer. Det genereres på send.
+DocType: Quality Inspection,Report Date,Report Date
+DocType: Salary Slip,Payment Days,Betalings Dage
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +140,Salary Slip of employee {0} already created for this month,Løn Slip af medarbejder {0} allerede skabt for denne måned
+DocType: Maintenance Schedule,Schedule,Køreplan
+apps/erpnext/erpnext/accounts/doctype/account/account.py +81,You are not authorized to set Frozen value,Du er ikke autoriseret til at fastsætte Frozen værdi
+DocType: Purchase Receipt Item,Purchase Order Item No,Indkøbsordre Konto nr
+apps/erpnext/erpnext/public/js/feature_setup.js +220,""" does not exists",' findes ikke
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +92,You can not change rate if BOM mentioned agianst any item,"Du kan ikke ændre kurs, hvis BOM nævnt agianst ethvert element"
+DocType: Territory,Territory Name,Territory Navn
+apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,{0} has been successfully added to our Newsletter list.,{0} er blevet føjet til vores nyhedsliste.
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +86,Employee can not be changed,Medarbejder kan ikke ændres
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Print and Stationary,Print og Stationær
+DocType: Delivery Note,"If you have created a standard template in Sales Taxes and Charges Template, select one and click on the button below.","Hvis du har oprettet en standard skabelon i Salg Skatter og Afgifter Skabelon, skal du vælge en, og klik på knappen nedenfor."
+DocType: Purchase Invoice,Recurring Invoice,Tilbagevendende Faktura
+apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +22,Date is repeated,Dato gentages
+DocType: Attendance,Employee Name,Medarbejder Navn
+DocType: Project,Total Costing Amount (via Time Logs),Total Costing Beløb (via Time Logs)
+DocType: Production Order,Planned End Date,Planlagt Slutdato
+apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +32,Item 5,Punkt 5
+apps/erpnext/erpnext/accounts/page/pos/pos.js +4,Start Point-of-Sale (POS),Start Point-of-Sale (POS)
+apps/erpnext/erpnext/config/accounts.py +68,Create Payment Entries against Orders or Invoices.,Opret Betaling Entries mod ordrer eller fakturaer.
+DocType: Account,Liability,Ansvar
+apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,Rabat skal være mindre end 100
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +98,All Territories,Alle områder
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,Forbrugerprodukter
+DocType: Manufacturing Settings,Allow Overtime,Tillad Overarbejde
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0} er obligatorisk for Return
+DocType: Customer Group,Mention if non-standard receivable account applicable,"Nævne, hvis ikke-standard tilgodehavende konto gældende"
+DocType: Leave Application,Reason,Årsag
+DocType: Sales Invoice Advance,Sales Invoice Advance,Salg Faktura Advance
+DocType: BOM Operation,Operation,Operation
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +27,How Pricing Rule is applied?,Hvordan Prisfastsættelse Regel anvendes?
+DocType: Sales Person,Select company name first.,Vælg firmanavn først.
+DocType: Leave Block List,Block Holidays on important days.,Bloker Ferie på vigtige dage.
+DocType: Stock Ledger Entry,Stock Ledger Entry,Stock Ledger indtastning
+apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +23,Name or Email is mandatory,Navn eller E-mail er obligatorisk
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +111,Electrical,Elektrisk
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +212,Time Log Batch {0} must be 'Submitted',Time Log Batch {0} skal være »Tilmeldt &#39;
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Pair,Par
+DocType: Purchase Order,Raw Materials Supplied,Raw Materials Leveres
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +112,Batch {0} of Item {1} has expired.,Batch {0} af Item {1} er udløbet.
+DocType: Quality Inspection Reading,Reading 4,Reading 4
+apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","Indstil standardværdier som Company, Valuta, indeværende finansår, etc."
+DocType: Shipping Rule,Specify conditions to calculate shipping amount,Angiv betingelser for at beregne forsendelse beløb
+DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Indkøb Master manager
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Order number required for Item {0},Indkøbsordre nummer kræves for Item {0}
+DocType: Purchase Invoice,Recurring Type,Tilbagevendende Type
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +164,Annual Salary,Årsløn
+DocType: Item Group,General Settings,Generelle indstillinger
+DocType: Sales Invoice,Product Bundle Help,Produkt Bundle Hjælp
+DocType: Employee,Divorced,Skilt
 DocType: Notification Control,Expense Claim Rejected,Expense krav Afvist
+DocType: Leave Block List,Allow the following users to approve Leave Applications for block days.,Lad følgende brugere til at godkende Udfyld Ansøgninger om blok dage.
+DocType: Account,Account Type,Kontotype
+DocType: Fiscal Year,Companies,Virksomheder
+DocType: Time Log,Billed,Billed
+apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,Prisliste skal være gældende for at købe eller sælge
+DocType: Serial No,Is Cancelled,Er Annulleret
+DocType: Sales Invoice,Write Off Outstanding Amount,Skriv Off Udestående beløb
+DocType: Warranty Claim,Warranty Claim,Garanti krav
+DocType: Employee,Confirmation Date,Bekræftelse Dato
+apps/erpnext/erpnext/public/js/setup_wizard.js +363,Hour,Time
+DocType: Opportunity,Customer / Lead Name,Kunde / Lead navn
+DocType: Cost Center,"Select Monthly Distribution, if you want to track based on seasonality.","Vælg Månedlig Distribution, hvis du ønsker at spore baseret på sæsonudsving."
+DocType: Leave Type,Is Leave Without Pay,Er Lad uden løn
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +185,Quantity must not be more than {0},Mængde må ikke være mere end {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +637,Please set default Cash or Bank account in Mode of Payment {0},Indstil standard Kontant eller bank konto i mode for betaling {0}
+DocType: Hub Settings,Access Token,Access Token
+DocType: Project,Estimated Costing,Anslået Costing
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +126,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Specialtegn undtagen &quot;-&quot; &quot;.&quot;, &quot;#&quot;, og &quot;/&quot; ikke tilladt i navngivning serie"
+DocType: Company,Default Holiday List,Standard Holiday List
+DocType: Production Order Operation,Completed Qty,Afsluttet Antal
+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.",Gå til den relevante gruppe (som regel finansieringskilde&gt; Aktuelle Passiver&gt; Skatter og Afgifter og oprette en ny konto (ved at klikke på Tilføj barn) af typen &quot;Skat&quot; og gøre nævne Skatteprocent.
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +68,There are more holidays than working days this month.,Der er flere helligdage end arbejdsdage i denne måned.
+DocType: Stock Entry Detail,BOM No. for a Finished Good Item,BOM No. for en Færdig god Item
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},Kan ikke producere mere Item {0} end Sales Order mængde {1}
+DocType: ToDo,Reference,Henvisning
+DocType: Process Payroll,Activity Log,Activity Log
+DocType: Time Log,For Manufacturing,For Manufacturing
+apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,Samlet Udgående
+apps/erpnext/erpnext/config/accounts.py +41,Tree of finanial accounts.,Tree of finanial konti.
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +33,Atleast one of the Selling or Buying must be selected,Mindst en af ​​salg eller køb skal vælges
+apps/erpnext/erpnext/config/crm.py +53,Logs for maintaining sms delivery status,Logs for opretholdelse sms leveringsstatus
+DocType: Landed Cost Voucher,Purchase Receipts,Køb Kvitteringer
+apps/erpnext/erpnext/config/support.py +54,Setup incoming server for support email id. (e.g. support@example.com),Opsætning indgående server til support email id. (F.eks support@example.com)
+DocType: Purchase Order Item,Supplier Quotation,Leverandør Citat
+apps/erpnext/erpnext/config/setup.py +56,Setting up Email,Opsætning af E-mail
+DocType: Quality Inspection,Quality Inspection,Quality Inspection
+DocType: SMS Settings,SMS Gateway URL,SMS Gateway URL
+DocType: Journal Entry,Total Debit,Samlet Debit
+apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +18,From Maintenance Schedule,Fra vedligeholdelsesplan
+DocType: Terms and Conditions,"Standard Terms and Conditions that can be added to Sales and Purchases.
+
+Examples:
+
+1. Validity of the offer.
+1. Payment Terms (In Advance, On Credit, part advance etc).
+1. What is extra (or payable by the Customer).
+1. Safety / usage warning.
+1. Warranty if any.
+1. Returns Policy.
+1. Terms of shipping, if applicable.
+1. Ways of addressing disputes, indemnity, liability, etc.
+1. Address and Contact of your Company.","Standard vilkår og betingelser, der kan føjes til salg og køb. Eksempler: 1. gyldighed tilbuddet. 1. Betalingsbetingelser (i forvejen, på kredit, del forhånd osv). 1. Hvad er ekstra (eller skulle betales af Kunden). 1. Sikkerhed / forbrug advarsel. 1. Garanti hvis nogen. 1. Retur Politik. 1. Betingelser for skibsfart, hvis relevant. 1. Måder adressering tvister, erstatning, ansvar mv 1. Adresse og Kontakt i din virksomhed."
+DocType: Salary Slip,Gross Pay,Gross Pay
+DocType: Employee,Emergency Contact Details,Emergency Kontaktoplysning
+DocType: Item Group,HTML / Banner that will show on the top of product list.,"HTML / Banner, der vil vise på toppen af ​​produktliste."
+apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,Kunden er nødvendig
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +164,Row {0}: Debit entry can not be linked with a {1},Række {0}: Debit indgang ikke kan knyttes med en {1}
+apps/erpnext/erpnext/config/manufacturing.py +63,Tree of Bill of Materials,Tree of Bill of Materials
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,Leverandør Type / leverandør
+DocType: Purchase Invoice,Advances,Forskud
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +51,Serial No {0} does not exist,Løbenummer {0} eksisterer ikke
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +143,"Item: {0} managed batch-wise, can not be reconciled using \
+					Stock Reconciliation, instead use Stock Entry","Emne: {0} lykkedes batchvis, kan ikke forenes ved hjælp af \ Stock Forsoning, i stedet bruge Stock indtastning"
+DocType: Item,Supplier Items,Leverandør Varer
+DocType: Purchase Invoice Item,Item,Vare
+apps/erpnext/erpnext/config/hr.py +100,Organization branch master.,Organisation gren mester.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +152,Work-in-Progress Warehouse is required before Submit,"Work-in-Progress Warehouse er nødvendig, før Indsend"
+DocType: Material Request,Terms and Conditions Content,Vilkår og betingelser Indhold
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +34,UOM Conversion factor is required in row {0},UOM Omregningsfaktor kræves i række {0}
+DocType: Purchase Invoice Item,Accounting,Regnskab
+,Sales Invoice Trends,Salgsfaktura Trends
+apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),Åbning (Cr)
+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},Vil du virkelig ønsker at indsende alle lønseddel for måned {0} og år {1}
+DocType: Purchase Order,To Receive and Bill,Til at modtage og Bill
+DocType: Production Planning Tool,Sales Orders,Salgsordrer
+DocType: Notification Control,Customize the Notification,Tilpas Underretning
+DocType: Event,Monday,Mandag
+apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Issued,Udstedt
+DocType: Sales Order Item,Actual Qty,Faktiske Antal
+DocType: Communication,Subject,Emne
+DocType: Employee,Permanent Address,Permanent adresse
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +171,{0} created,{0} oprettet
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Unit,Enhed
+DocType: Packing Slip,To Package No.,At pakke No.
+DocType: Employee,Single,Enkeltværelse
+DocType: Purchase Taxes and Charges,Item Wise Tax Detail,Item Wise Tax Detail
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Legal Expenses,Juridiske Udgifter
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +39,Please setup your chart of accounts before you start Accounting Entries,"Venligst opsætning din kontoplan, før du starter bogføring"
+,Projected,Projiceret
+DocType: Payment Reconciliation,Maximum Amount,Maksimumbeløb
+apps/erpnext/erpnext/stock/doctype/item/item.py +356,Barcode {0} already used in Item {1},Stregkode {0} allerede brugt i Item {1}
+apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +214,Production Order is Mandatory,Produktionsordre er Obligatorisk
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +476,Warning: Another {0} # {1} exists against stock entry {2},Advarsel: En anden {0} # {1} eksisterer mod lager post {2}
+DocType: User,Female,Kvinde
+DocType: UOM,UOM Name,UOM Navn
+DocType: Employee,Personal Email,Personlig Email
+apps/erpnext/erpnext/public/js/setup_wizard.js +359,Consumable,Forbrugsmaterialer
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,Entertainment &amp; Leisure
+DocType: Newsletter,Create and Send Newsletters,Opret og send nyhedsbreve
+DocType: Maintenance Visit,Maintenance Time,Vedligeholdelse Time
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +209,Raw Materials cannot be blank.,Raw Materials kan ikke være tom.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Manager,Leder
+apps/erpnext/erpnext/config/hr.py +90,Settings for HR Module,Indstillinger for HR modul
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +51,Only Leave Applications with status 'Approved' can be submitted,Kun Lad Applikationer med status &quot;Godkendt&quot; kan indsendes
+DocType: Sales Invoice,Shipping Address Name,Forsendelse Adresse Navn
+DocType: Material Request Item,Min Order Qty,Min prisen evt
+apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,Item Group Tree
+DocType: Account,Rate at which this tax is applied,"Hastighed, hvormed denne afgift anvendes"
+DocType: Sales Partner,Agent,Agent
+DocType: Currency Exchange,Currency Exchange,Valutaveksling
+DocType: Purchase Taxes and Charges,Parenttype,Parenttype
+DocType: Sales Partner,Reseller,Forhandler
+apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,Der er intet at redigere.
+apps/erpnext/erpnext/controllers/recurring_document.py +188,"{0} is an invalid email address in 'Notification \
+					Email Address'","{0} er en ugyldig e-mail-adresse i ""Notification \ e-mail adresse'"
+DocType: Employee,Cheque,Cheque
+DocType: Stock Entry,Material Receipt,Materiale Kvittering
+DocType: Stock Entry Detail,Material Request used to make this Stock Entry,Materiale Request bruges til at gøre dette Stock indtastning
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +484,Make Supplier Quotation,Foretag Leverandør Citat
+apps/erpnext/erpnext/config/accounts.py +143,Enable / disable currencies.,Aktivere / deaktivere valutaer.
+DocType: Stock Entry,Difference Account,Forskel konto
+DocType: Company,Ignore,Ignorer
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +648,Please enter Item Code.,Indtast venligst Item Code.
+DocType: Fiscal Year,Year End Date,År Slutdato
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +154,For Warehouse is required before Submit,"For Warehouse er nødvendig, før Indsend"
+DocType: Workstation,Wages,Løn
+DocType: Journal Entry,Get Outstanding Invoices,Få udestående fakturaer
+DocType: Pricing Rule,Purchase Manager,Indkøb manager
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +80,{0} Recipients,{0} Modtagere
+DocType: Employee,New Workplace,Ny Arbejdsplads
+DocType: Bank Reconciliation,Bank Account,Bankkonto
+DocType: Purchase Receipt Item,Rejected Serial No,Afvist Løbenummer
+DocType: GL Entry,Party,Selskab
+DocType: Account,Fixed Asset,Fast Asset
+DocType: BOM,Operations,Operationer
+DocType: Sales Invoice,Shipping Rule,Forsendelse Rule
+DocType: Employee,Employee Number,Medarbejder nummer
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,Beklædning og tilbehør
+DocType: Bank Reconciliation,From Date,Fra dato
+apps/erpnext/erpnext/config/manufacturing.py +51,Generate Material Requests (MRP) and Production Orders.,Generer Materiale Anmodning (MRP) og produktionsordrer.
+DocType: Notification Control,Delivery Note Message,Levering Note Message
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup > Settings > Naming Series,Du indstille Navngivning Series for {0} via Opsætning&gt; Indstillinger&gt; Navngivning Series
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} kan ikke være negativ
+DocType: Employee Education,Qualification,Kvalifikation
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,Account {0} is inactive,Konto {0} er inaktiv
+apps/erpnext/erpnext/config/stock.py +109,Unit of Measure,Måleenhed
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +75,Management,Ledelse
+apps/erpnext/erpnext/config/projects.py +33,Types of activities for Time Sheets,Typer af aktiviteter for Time Sheets
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +145,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) kan ikke være større end planlagt antal ({2}) på produktionsordre {3}
+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,Hvis du har salgsteam og salg Partners (Channel Partners) de kan mærkes og vedligeholde deres bidrag i salget aktivitet
+apps/erpnext/erpnext/public/js/templates/contact_list.html +31,No contacts added yet.,Ingen kontakter tilføjet endnu.
+apps/erpnext/erpnext/config/manufacturing.py +24,Time Logs for manufacturing.,Time Logs til produktion.
+DocType: Period Closing Voucher,Closing Fiscal Year,Lukning regnskabsår
+apps/erpnext/erpnext/public/js/pos/pos.js +491,{0} View,{0} Vis
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,Max: {0},Max: {0}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +148,Please select item code,Vælg emne kode
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Make Bank Entry,Make Bank indtastning
+apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,Tilpasning Forms
+DocType: Employee,Resignation Letter Date,Udmeldelse Brev Dato
+DocType: Item,Customer Code,Customer Kode
+DocType: Purchase Receipt Item,Rate and Amount,Sats og Beløb
+DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Skatter og Afgifter Tilføjet (Company Valuta)
+DocType: Purchase Order Item Supplied,Raw Material Item Code,Raw Material Item Code
+DocType: Item Website Specification,Item Website Specification,Item Website Specification
+DocType: BOM,Rate Of Materials Based On,Rate Of materialer baseret på
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,Teknologi
+DocType: BOM Replace Tool,The new BOM after replacement,Den nye BOM efter udskiftning
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +713,Please specify Company to proceed,Angiv venligst Company for at fortsætte
+apps/erpnext/erpnext/config/stock.py +103,Tree of Item Groups.,Tree of varegrupper.
+DocType: Purchase Invoice,Net Total (Company Currency),Net alt (Company Valuta)
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +44,Total Billing This Year:,Samlet fakturering Dette år:
+DocType: Opportunity,Opportunity Type,Opportunity Type
+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.","Hvis valgte Prisfastsættelse Regel er lavet til &quot;pris&quot;, vil det overskrive prislisten. Prisfastsættelse Regel prisen er den endelige pris, så ingen yderligere rabat bør anvendes. Derfor i transaktioner som Sales Order, Indkøbsordre osv, det vil blive hentet i &quot;Rate &#39;felt, snarere end&#39; Prisliste Rate &#39;område."
+DocType: Email Digest,Next email will be sent on:,Næste email vil blive sendt på:
+DocType: Sales Invoice,Sales Taxes and Charges,Salg Skatter og Afgifter
+DocType: Employee,Reports to,Rapporter til
+DocType: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,Gross Pay + bagud Beløb + Indløsning Beløb - Total Fradrag
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +194,Serial No {0} quantity {1} cannot be a fraction,Løbenummer {0} mængde {1} kan ikke være en brøkdel
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +187,Please enter Write Off Account,Indtast venligst Skriv Off konto
+apps/erpnext/erpnext/config/stock.py +136,"Attributes for Item Variants. e.g Size, Color etc.","Attributter for Item Varianter. f.eks størrelse, farve etc."
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +75,Group by Voucher,Gruppe af Voucher
+DocType: Customer Group,Customer Group Name,Customer Group Name
+apps/erpnext/erpnext/stock/doctype/item/item.js +17,Show Balance,Vis Balance
+apps/frappe/frappe/custom/doctype/customize_form/customize_form.js +88,Update,Opdatering
+DocType: Expense Claim,Approval Status,Godkendelsesstatus
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +145,Employee {0} has already applied for {1} between {2} and {3},Medarbejder {0} har allerede ansøgt om {1} mellem {2} og {3}
+apps/frappe/frappe/public/js/frappe/form/link_selector.js +21,Value,Value
+DocType: Maintenance Visit,Unscheduled,Uplanlagt
+DocType: Workstation Working Hour,End Time,End Time
+DocType: Quality Inspection Reading,Quality Inspection Reading,Quality Inspection Reading
+DocType: Purchase Order Item,Billed Amt,Billed Amt
+DocType: Shipping Rule,Shipping Rule Label,Forsendelse Rule Label
+DocType: Employee Education,Under Graduate,Under Graduate
+DocType: Appraisal Goal,Score Earned,Score tjent
+apps/erpnext/erpnext/config/hr.py +38,Performance appraisal.,Præstationsvurdering.
+DocType: Sales Order,%  Delivered,% Leveres
+apps/erpnext/erpnext/accounts/general_ledger.py +134,Please mention Round Off Cost Center in Company,Henvis afrunde Cost Center i selskabet
+DocType: Item,End of Life,End of Life
 DocType: Sales Invoice,"The date on which next invoice will be generated. It is generated on submit.
 ","Den dato, hvor næste faktura vil blive genereret. Det genereres på send."
-DocType: Item Attribute,Item Attribute,Item Attribut
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +105,Government,Regeringen
-apps/erpnext/erpnext/config/stock.py +268,Item Variants,Item Varianter
-DocType: Company,Services,Tjenester
-apps/erpnext/erpnext/accounts/report/financial_statements.py +147,Total ({0}),I alt ({0})
-DocType: Cost Center,Parent Cost Center,Parent Cost center
-DocType: Sales Invoice,Source,Kilde
-DocType: Leave Type,Is Leave Without Pay,Er Lad uden løn
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +186,No records found in the Payment table,Ingen resultater i Payment tabellen
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +405,Financial Year Start Date,Regnskabsår Startdato
-DocType: Employee External Work History,Total Experience,Total Experience
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +100,Countersinking,Undersænkning
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +271,Packing Slip(s) cancelled,Packing Slip (r) annulleret
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,Fragt og Forwarding Afgifter
-DocType: Material Request Item,Sales Order No,Salg bekendtgørelse nr
-DocType: Item Group,Item Group Name,Item Group Name
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +50,Taken,Taget
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +66,Transfer Materials for Manufacture,Overfør Materialer til Fremstilling
-DocType: Pricing Rule,For Price List,For prisliste
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +27,Executive Search,Executive Search
-apps/erpnext/erpnext/stock/stock_ledger.py +405,"Purchase rate for item: {0} not found, which is required to book accounting entry (expense). Please mention item price against a buying price list.","Købskurs for vare: {0} ikke fundet, som er nødvendig for at booke regnskabsmæssig post (udgift). Nævne venligst vare pris mod en købskurs listen."
-DocType: Maintenance Schedule,Schedules,Tidsplaner
+DocType: Quotation,In Words will be visible once you save the Quotation.,"I Ord vil være synlig, når du gemmer tilbuddet."
+DocType: Workflow,Is Active,Er Aktiv
 DocType: Purchase Invoice Item,Net Amount,Nettobeløb
-DocType: Purchase Order Item Supplied,BOM Detail No,BOM Detail Nej
-DocType: Purchase Invoice,Additional Discount Amount (Company Currency),Yderligere Discount Beløb (Company Valuta)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +537,Error: {0} > {1},Fejl: {0}&gt; {1}
-apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,Opret ny konto fra kontoplanen.
-DocType: Maintenance Visit,Maintenance Visit,Vedligeholdelse Besøg
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer > Customer Group > Territory,Kunde&gt; Customer Group&gt; Territory
-DocType: Sales Invoice Item,Available Batch Qty at Warehouse,Tilgængelig Batch Antal på Warehouse
-DocType: Time Log Batch Detail,Time Log Batch Detail,Time Log Batch Detail
-DocType: Workflow State,Tasks,Opgaver
-DocType: Landed Cost Voucher,Landed Cost Help,Landed Cost Hjælp
-DocType: Event,Tuesday,Tirsdag
-DocType: Leave Block List,Block Holidays on important days.,Bloker Ferie på vigtige dage.
-,Accounts Receivable Summary,Debitor Resumé
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +187,Please set User ID field in an Employee record to set Employee Role,Indstil Bruger-id feltet i en Medarbejder rekord at indstille Medarbejder Rolle
-DocType: UOM,UOM Name,UOM Navn
-DocType: Top Bar Item,Target,Target
-apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +33,Contribution Amount,Bidrag Beløb
-DocType: Sales Invoice,Shipping Address,Forsendelse Adresse
-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.,Dette værktøj hjælper dig med at opdatere eller fastsætte mængden og værdiansættelse på lager i systemet. Det bruges typisk til at synkronisere systemets værdier og hvad der rent faktisk eksisterer i dine lagre.
-DocType: Delivery Note,In Words will be visible once you save the Delivery Note.,"I Ord vil være synlig, når du gemmer følgesedlen."
-apps/erpnext/erpnext/config/stock.py +120,Brand master.,Brand mester.
-DocType: ToDo,Due Date,Due Date
-DocType: Sales Invoice Item,Brand Name,Brandnavn
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Box,Kasse
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +389,The Organization,Organisationen
-DocType: Monthly Distribution,Monthly Distribution,Månedlig Distribution
-apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,Modtager List er tom. Opret Modtager liste
-DocType: Production Plan Sales Order,Production Plan Sales Order,Produktion Plan kundeordre
-DocType: Sales Partner,Sales Partner Target,Salg Partner Target
-DocType: Pricing Rule,Pricing Rule,Prisfastsættelse Rule
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +58,Notching,Udhugning
-apps/erpnext/erpnext/config/learn.py +167,Material Request to Purchase Order,Materiale Anmodning om at Indkøbsordre
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +74,Row # {0}: Returned Item {1} does not exists in {2} {3},Row # {0}: returnerede vare {1} ikke eksisterer i {2} {3}
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,Bankkonti
-,Bank Reconciliation Statement,Bank Saldoopgørelsen
-DocType: Address,Lead Name,Bly navn
-,POS,POS
-apps/erpnext/erpnext/config/stock.py +273,Opening Stock Balance,Åbning Stock Balance
-apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +36,{0} must appear only once,{0} må kun optræde én gang
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +334,Not allowed to tranfer more {0} than {1} against Purchase Order {2},Ikke lov til at overdragelsessteder mere {0} end {1} mod indkøbsordre {2}
-apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +62,Leaves Allocated Successfully for {0},Blade Tildelt Succesfuld for {0}
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,Ingen varer at pakke
-DocType: Shipping Rule Condition,From Value,Fra Value
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +552,Manufacturing Quantity is mandatory,Produktion Mængde er obligatorisk
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Amounts not reflected in bank,"Beløb, der ikke afspejles i bank"
-DocType: Quality Inspection Reading,Reading 4,Reading 4
-apps/erpnext/erpnext/config/hr.py +23,Claims for company expense.,Krav om selskabets regning.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +8,Centrifugal casting,Centrifugal casting
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +119,Magnetic field-assisted finishing,Magnetfelt-assisteret efterbehandling
-DocType: Company,Default Holiday List,Standard Holiday List
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +165,Stock Liabilities,Stock Passiver
-DocType: Purchase Receipt,Supplier Warehouse,Leverandør Warehouse
-DocType: Opportunity,Contact Mobile No,Kontakt Mobile Ingen
-DocType: Production Planning Tool,Select Sales Orders,Vælg salgsordrer
-,Material Requests for which Supplier Quotations are not created,Materielle Anmodning om hvilke Leverandør Citater ikke er skabt
-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.,At spore elementer ved hjælp af stregkode. Du vil være i stand til at indtaste poster i følgeseddel og salgsfaktura ved at scanne stregkoden på varen.
-apps/erpnext/erpnext/crm/doctype/lead/lead.js +34,Make Quotation,Make Citat
-DocType: Dependent Task,Dependent Task,Afhængig Opgave
-apps/erpnext/erpnext/stock/doctype/item/item.py +306,Conversion factor for default Unit of Measure must be 1 in row {0},Omregningsfaktor for standard Måleenhed skal være 1 i række {0}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,Leave of type {0} cannot be longer than {1},Ferie af typen {0} må ikke være længere end {1}
-DocType: Manufacturing Settings,Try planning operations for X days in advance.,Prøv at planlægge operationer for X dage i forvejen.
-DocType: HR Settings,Stop Birthday Reminders,Stop Fødselsdag Påmindelser
-DocType: SMS Center,Receiver List,Modtager liste
-DocType: Payment Tool Detail,Payment Amount,Betaling Beløb
-apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Forbrugt Mængde
-apps/erpnext/erpnext/public/js/pos/pos.js +491,{0} View,{0} Vis
-DocType: Salary Structure Deduction,Salary Structure Deduction,Løn Struktur Fradrag
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +158,Selective laser sintering,Selektiv lasersintring
-apps/erpnext/erpnext/stock/doctype/item/item.py +301,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Måleenhed {0} er indtastet mere end én gang i Conversion Factor Table
-apps/frappe/frappe/core/page/data_import_tool/data_import_tool.js +108,Import Successful!,Import Vellykket!
-apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Omkostninger ved Udstedte Varer
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +185,Quantity must not be more than {0},Mængde må ikke være mere end {0}
-DocType: Quotation Item,Quotation Item,Citat Vare
-DocType: Account,Account Name,Kontonavn
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +41,From Date cannot be greater than To Date,Fra dato ikke kan være større end til dato
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +194,Serial No {0} quantity {1} cannot be a fraction,Løbenummer {0} mængde {1} kan ikke være en brøkdel
-apps/erpnext/erpnext/config/buying.py +59,Supplier Type master.,Leverandør Type mester.
-DocType: Purchase Order Item,Supplier Part Number,Leverandør Part Number
-apps/frappe/frappe/core/page/permission_manager/permission_manager.js +379,Add,Tilføje
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +92,Conversion rate cannot be 0 or 1,Omregningskurs kan ikke være 0 eller 1
-DocType: Accounts Settings,Credit Controller,Credit Controller
-DocType: Delivery Note,Vehicle Dispatch Date,Køretøj Dispatch Dato
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +197,Purchase Receipt {0} is not submitted,Kvittering {0} er ikke indsendt
-DocType: Company,Default Payable Account,Standard Betales konto
-apps/erpnext/erpnext/config/website.py +13,"Settings for online shopping cart such as shipping rules, price list etc.","Indstillinger for online indkøbskurv, såsom skibsfart regler, prisliste mv"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +660,Setup Complete,Setup Complete
-apps/erpnext/erpnext/controllers/website_list_for_contact.py +65,{0}% Billed,{0}% Billed
-apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +17,Reserved Qty,Reserveret Antal
-DocType: Party Account,Party Account,Party Account
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +74,Human Resources,Human Resources
-DocType: Lead,Upper Income,Upper Indkomst
-apps/erpnext/erpnext/support/doctype/issue/issue.py +58,My Issues,Mine Issues
-DocType: BOM Item,BOM Item,BOM Item
-DocType: Appraisal,For Employee,For Medarbejder
-DocType: Company,Default Values,Standardværdier
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +236,Row {0}: Payment amount can not be negative,Række {0}: Betaling beløb kan ikke være negativ
-DocType: Expense Claim,Total Amount Reimbursed,Samlede godtgjorte beløb
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +152,Press fitting,Tryk fitting
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +64,Against Supplier Invoice {0} dated {1},Imod Leverandør Faktura {0} dateret {1}
-DocType: Customer,Default Price List,Standard prisliste
-DocType: Payment Reconciliation,Payments,Betalinger
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +24,Hot isostatic pressing,Varm isostatisk presning
-DocType: ToDo,Medium,Medium
-DocType: Budget Detail,Budget Allocated,Budgettet
-,Customer Credit Balance,Customer Credit Balance
-apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +137,Please verify your email id,Skal du bekræfte din e-mail-id
-apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +42,Customer required for 'Customerwise Discount',Kunden kræves for &#39;Customerwise Discount&#39;
-apps/erpnext/erpnext/config/accounts.py +53,Update bank payment dates with journals.,Opdater bank terminer med tidsskrifter.
-DocType: Quotation,Term Details,Term Detaljer
-DocType: Manufacturing Settings,Capacity Planning For (Days),Kapacitet Planlægning For (dage)
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +56,None of the items have any change in quantity or value.,Ingen af ​​elementerne har nogen ændring i mængde eller værdi.
-DocType: Warranty Claim,Warranty Claim,Garanti krav
-,Lead Details,Bly Detaljer
-DocType: Authorization Rule,Approving User,Godkendelse Bruger
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +37,Forging,Smedning
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +126,Plating,Plating
-DocType: Purchase Invoice,End date of current invoice's period,Slutdato for aktuelle faktura menstruation
-DocType: Pricing Rule,Applicable For,Gældende For
-DocType: Bank Reconciliation,From Date,Fra dato
-DocType: Maintenance Visit,Partially Completed,Delvist Afsluttet
-DocType: Leave Type,Include holidays within leaves as leaves,Medtag helligdage inden blade som blade
-DocType: Sales Invoice,Packed Items,Pakket Varer
-apps/erpnext/erpnext/config/support.py +18,Warranty Claim against Serial No.,Garanti krav mod 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","Udskift en bestemt BOM i alle andre styklister, hvor det bruges. Det vil erstatte den gamle BOM linket, opdatere omkostninger og regenerere &quot;BOM Explosion Item&quot; tabel som pr ny BOM"
-DocType: Shopping Cart Settings,Enable Shopping Cart,Aktiver Indkøbskurv
-DocType: Employee,Permanent Address,Permanent adresse
-apps/erpnext/erpnext/stock/get_item_details.py +122,Item {0} must be a Service Item.,Vare {0} skal være en service Item.
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +148,Please select item code,Vælg emne kode
-DocType: Salary Structure Deduction,Reduce Deduction for Leave Without Pay (LWP),Reducer Fradrag for Leave uden løn (LWP)
-DocType: Territory,Territory Manager,Territory manager
-DocType: Selling Settings,Selling Settings,Salg af indstillinger
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +39,Online Auctions,Online Auktioner
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +94,Please specify either Quantity or Valuation Rate or both,Angiv venligst enten mængde eller Værdiansættelse Rate eller begge
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +50,"Company, Month and Fiscal Year is mandatory","Company, Måned og regnskabsår er obligatorisk"
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Marketing Expenses,Markedsføringsomkostninger
-,Item Shortage Report,Item Mangel Rapport
-apps/erpnext/erpnext/stock/doctype/item/item.js +183,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Vægt er nævnt, \ nVenligst nævne &quot;Weight UOM&quot; for"
-DocType: Stock Entry Detail,Material Request used to make this Stock Entry,Materiale Request bruges til at gøre dette Stock indtastning
-apps/erpnext/erpnext/config/support.py +43,Single unit of an Item.,Enkelt enhed af et element.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +212,Time Log Batch {0} must be 'Submitted',Time Log Batch {0} skal være »Tilmeldt &#39;
-DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,Lav Regnskab indtastning For hver Stock Movement
-DocType: Leave Allocation,Total Leaves Allocated,Total Blade Allokeret
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +384,Warehouse required at Row No {0},Warehouse kræves på Row Nej {0}
-DocType: Employee,Date Of Retirement,Dato for pensionering
-DocType: Upload Attendance,Get Template,Få skabelon
-DocType: Address,Postal,Postal
-DocType: Item,Weightage,Weightage
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +159,Mining,Minedrift
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +17,Resin casting,Harpiks støbning
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,En kundegruppe med samme navn findes. Ret Kundens navn eller omdøb kundegruppen
-apps/erpnext/erpnext/public/js/pos/pos.js +147,Please select {0} first.,Vælg {0} først.
-DocType: Territory,Parent Territory,Parent Territory
-DocType: Quality Inspection Reading,Reading 2,Reading 2
-DocType: Stock Entry,Material Receipt,Materiale Kvittering
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +622,Products,Produkter
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +47,Party Type and Party is required for Receivable / Payable account {0},Party Type og parti er nødvendig for Tilgodehavende / Betales konto {0}
-DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.","Hvis denne vare har varianter, så det kan ikke vælges i salgsordrer mv"
-DocType: Lead,Next Contact By,Næste Kontakt By
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +215,Quantity required for Item {0} in row {1},"Mængde, der kræves for Item {0} i række {1}"
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +85,Warehouse {0} can not be deleted as quantity exists for Item {1},"Warehouse {0} kan ikke slettes, da mængden findes for Item {1}"
-DocType: Quotation,Order Type,Bestil Type
-DocType: Purchase Invoice,Notification Email Address,Meddelelse E-mailadresse
-DocType: Payment Tool,Find Invoices to Match,Find fakturaer til Match
-,Item-wise Sales Register,Vare-wise Sales Register
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +399,"e.g. ""XYZ National Bank""",fx &quot;XYZ National Bank&quot;
-DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,Er denne Tax inkluderet i Basic Rate?
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +57,Total Target,Samlet Target
-DocType: Job Applicant,Applicant for a Job,Ansøger om et job
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +173,No Production Orders created,Ingen produktionsordrer oprettet
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +131,Salary Slip of employee {0} already created for this month,Løn Slip af medarbejder {0} allerede skabt for denne måned
-DocType: Stock Reconciliation,Reconciliation JSON,Afstemning JSON
-apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Alt for mange kolonner. Eksportere rapporten og udskrive det ved hjælp af en regnearksprogram.
-DocType: Sales Invoice Item,Batch No,Batch Nej
-apps/erpnext/erpnext/setup/doctype/company/company.py +152,Main,Main
-DocType: DocPerm,Delete,Slet
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +44,Casual Leave,Casual Leave
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +140,Please enter Production Item first,Indtast venligst Produktion Vare først
+DocType: Contact Us Settings,Pincode,Pinkode
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +193,Not authorized to edit frozen Account {0},Ikke autoriseret til at redigere frosne konto {0}
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +13,Variant,Variant
-apps/frappe/frappe/public/js/frappe/form/toolbar.js +165,New {0},Ny {0}
-DocType: Naming Series,Set prefix for numbering series on your transactions,Sæt præfiks for nummerering serie om dine transaktioner
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +169,Stopped order cannot be cancelled. Unstop to cancel.,Stoppet ordre kan ikke annulleres. Unstop at annullere.
-apps/erpnext/erpnext/stock/doctype/item/item.py +323,Default BOM ({0}) must be active for this item or its template,Standard BOM ({0}) skal være aktiv for dette element eller dens skabelon
-DocType: Employee,Leave Encashed?,Efterlad indkasseres?
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Mulighed Fra feltet er obligatorisk
-DocType: Item,Variants,Varianter
-apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +458,Make Purchase Order,Make indkøbsordre
-DocType: SMS Center,Send To,Send til
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +111,There is not enough leave balance for Leave Type {0},Der er ikke nok orlov balance for Leave Type {0}
-DocType: Sales Team,Contribution to Net Total,Bidrag til Net Total
-DocType: Sales Invoice Item,Customer's Item Code,Kundens Item Code
-DocType: Stock Reconciliation,Stock Reconciliation,Stock Afstemning
-DocType: Territory,Territory Name,Territory Navn
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +152,Work-in-Progress Warehouse is required before Submit,"Work-in-Progress Warehouse er nødvendig, før Indsend"
-apps/erpnext/erpnext/config/hr.py +43,Applicant for a Job.,Ansøger om et job.
-DocType: Purchase Order Item,Warehouse and Reference,Warehouse og reference
-DocType: Supplier,Statutory info and other general information about your Supplier,Lovpligtig info og andre generelle oplysninger om din leverandør
-DocType: Country,Country,Land
-apps/erpnext/erpnext/shopping_cart/utils.py +47,Addresses,Adresser
-DocType: Communication,Received,Modtaget
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +137,Against Journal Entry {0} does not have any unmatched {1} entry,Mod Kassekladde {0} har ikke nogen uovertruffen {1} indgang
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},Duplicate Løbenummer indtastet for Item {0}
-DocType: Shipping Rule Condition,A condition for a Shipping Rule,Betingelse for en forsendelsesregel
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +326,Item is not allowed to have Production Order.,Varen er ikke tilladt at have produktionsordre.
-DocType: DocField,Attach Image,Vedhæft billede
-DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),Nettovægten af ​​denne pakke. (Beregnes automatisk som summen af ​​nettovægt på poster)
-DocType: Stock Reconciliation Item,Leave blank if no change,"Efterlad tom, hvis ingen ændring"
-DocType: Sales Order,To Deliver and Bill,At levere og Bill
-apps/erpnext/erpnext/config/manufacturing.py +24,Time Logs for manufacturing.,Time Logs til produktion.
-DocType: Item,Apply Warehouse-wise Reorder Level,Påfør Warehouse-wise Omarranger Level
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +429,BOM {0} must be submitted,BOM {0} skal indsendes
-DocType: Authorization Control,Authorization Control,Authorization Kontrol
-apps/erpnext/erpnext/config/projects.py +23,Time Log for tasks.,Tid Log til opgaver.
-DocType: Production Order Operation,Actual Time and Cost,Aktuel leveringstid og omkostninger
-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},Materiale Request af maksimum {0} kan gøres for Item {1} mod Sales Order {2}
-DocType: Employee,Salutation,Salutation
-DocType: Communication,Rejected,Afvist
-DocType: Pricing Rule,Brand,Brand
-DocType: Item,Will also apply for variants,Vil også gælde for varianter
-apps/erpnext/erpnext/config/selling.py +153,Bundle items at time of sale.,Bundle elementer på salgstidspunktet.
-DocType: Sales Order Item,Actual Qty,Faktiske Antal
-DocType: Quality Inspection Reading,Reading 10,Reading 10
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +612,"List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start.","Liste dine produkter eller tjenester, som du købe eller sælge. Sørg for at kontrollere Item Group, måleenhed og andre egenskaber, når du starter."
-DocType: Hub Settings,Hub Node,Hub Node
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,"Du har indtastet dubletter. Venligst rette, og prøv igen."
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +87,Associate,Associate
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +46,Item {0} is not a serialized Item,Vare {0} er ikke en føljeton Item
-DocType: SMS Center,Create Receiver List,Opret Modtager liste
-apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +5,Expired,Udløbet
-DocType: Packing Slip,To Package No.,At pakke No.
-DocType: DocType,System,System
-DocType: Warranty Claim,Issue Date,Udstedelsesdagen
-DocType: Activity Cost,Activity Cost,Aktivitet Omkostninger
-DocType: Purchase Receipt Item Supplied,Consumed Qty,Forbrugt Antal
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +52,Telecommunications,Telekommunikation
-DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),"Angiver, at pakken er en del af denne leverance (Kun Udkast)"
-DocType: Payment Tool,Make Payment Entry,Foretag indbetaling indtastning
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +119,Quantity for Item {0} must be less than {1},Mængde for Item {0} skal være mindre end {1}
-,Sales Invoice Trends,Salgsfaktura Trends
-DocType: Leave Application,Apply / Approve Leaves,Anvend / Godkend Blade
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +90,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',"Kan henvise rækken, hvis gebyret type er &#39;On Forrige Row Beløb &quot;eller&quot; Forrige Row alt&#39;"
-DocType: Sales Order Item,Delivery Warehouse,Levering Warehouse
-DocType: Stock Settings,Allowance Percent,Godtgørelse Procent
-DocType: SMS Settings,Message Parameter,Besked Parameter
-DocType: Serial No,Delivery Document No,Levering dokument nr
-DocType: Landed Cost Voucher,Get Items From Purchase Receipts,Få elementer fra køb Kvitteringer
-DocType: Serial No,Creation Date,Oprettelsesdato
-apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +33,Item {0} appears multiple times in Price List {1},Vare {0} forekommer flere gange i prisliste {1}
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +37,"Selling must be checked, if Applicable For is selected as {0}","Selling skal kontrolleres, om nødvendigt er valgt som {0}"
-DocType: Purchase Order Item,Supplier Quotation Item,Leverandør Citat Vare
-apps/erpnext/erpnext/hr/doctype/employee/employee.js +27,Make Salary Structure,Foretag Løn Struktur
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +54,Shearing,Shearing
-DocType: Item,Has Variants,Har Varianter
-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.,Klik på &#39;Make Salg Faktura&#39; knappen for at oprette en ny Sales Invoice.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +166,Packaging and labeling,Emballering og etikettering
-DocType: Monthly Distribution,Name of the Monthly Distribution,Navnet på den månedlige Distribution
-DocType: Sales Person,Parent Sales Person,Parent Sales Person
-apps/erpnext/erpnext/setup/utils.py +14,Please specify Default Currency in Company Master and Global Defaults,Angiv venligst Standard Valuta i Company Master og Globale standardindstillinger
-DocType: Dropbox Backup,Dropbox Access Secret,Dropbox Access Secret
-DocType: Purchase Invoice,Recurring Invoice,Tilbagevendende Faktura
-apps/erpnext/erpnext/config/projects.py +79,Managing Projects,Håndtering af Projekter
-DocType: Supplier,Supplier of Goods or Services.,Leverandør af varer eller tjenesteydelser.
-DocType: Budget Detail,Fiscal Year,Regnskabsår
-DocType: Cost Center,Budget,Budget
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Achieved,Opnået
+DocType: Workflow State,Time,Tid
+DocType: Sales Invoice,Cold Calling,Telefonsalg
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +134,Bank Draft,Bank Draft
+DocType: Selling Settings,Campaign Naming By,Kampagne Navngivning Af
+DocType: Opportunity,To Discuss,Til Diskuter
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,Medarbejder {0} er ikke aktiv eller findes ikke
+DocType: Payment Reconciliation Payment,Voucher Detail Number,Voucher Detail Number
+,Maintenance Schedules,Vedligeholdelsesplaner
+DocType: Lead,Lead Owner,Bly Owner
+DocType: Customer,Default Receivable Accounts,Standard kan modtages Konti
+apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +68,Please Update SMS Settings,Opdatér venligst SMS-indstillinger
+,Requested Qty,Anmodet Antal
+DocType: Employee Education,Post Graduate,Post Graduate
+apps/erpnext/erpnext/accounts/doctype/account/account.py +103,Account with child nodes cannot be converted to ledger,Konto med barneknudepunkter kan ikke konverteres til finans
+apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +71,Last Order Date,Sidste Ordredato
+DocType: Production Plan Item,SO Pending Qty,SO Afventer Antal
+DocType: Process Payroll,Select Payroll Year and Month,Vælg Payroll År og Måned
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard_page.html +18,Complete Setup,Komplet opsætning
+DocType: Blog Post,Guest,Gæst
+apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,Modtager List er tom. Opret Modtager liste
+apps/erpnext/erpnext/public/js/setup_wizard.js +356,A Product or Service,En vare eller tjenesteydelse
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +271,Time Logs created:,Time Logs oprettet:
+apps/erpnext/erpnext/projects/doctype/project/project.js +47,Expense Claims,Expense Krav
+apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +21,Select Time Logs and Submit to create a new Sales Invoice.,Vælg Time Logs og Send for at oprette en ny Sales Invoice.
+DocType: Communication,Recipients,Modtagere
+DocType: Customer,Credit Limit,Kreditgrænse
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,En kundegruppe med samme navn findes. Ret Kundens navn eller omdøb kundegruppen
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +21,"To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled.","Hvis du ikke vil anvende Prisfastsættelse Regel i en bestemt transaktion, bør alle gældende Priser Regler deaktiveres."
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +63,Warehouse {0}: Company is mandatory,Warehouse {0}: Selskabet er obligatorisk
+DocType: Item,Warranty Period (in days),Garantiperiode (i dage)
+DocType: Stock Settings,Allow Negative Stock,Tillad Negativ Stock
+DocType: Territory,Territory Targets,Territory Mål
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +65,Territory / Customer,Område / kunde
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,e.g. 5,f.eks 5
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +207,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},Række {0}: Allokeret mængde {1} skal være mindre end eller lig med at fakturere udestående beløb {2}
-DocType: Sales Invoice,In Words will be visible once you save the Sales Invoice.,"I Ord vil være synlig, når du gemmer salgsfakturaen."
-DocType: Item,Is Sales Item,Er Sales Item
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,Item Group Tree
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,Vare {0} er ikke setup for Serial nr. Check Item mester
-DocType: Maintenance Visit,Maintenance Time,Vedligeholdelse Time
-,Amount to Deliver,"Beløb, Deliver"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +620,A Product or Service,En vare eller tjenesteydelse
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +158,There were errors.,Der var fejl.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +101,Tapping,Aflytning
-DocType: Naming Series,Current Value,Aktuel værdi
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +171,{0} created,{0} oprettet
+apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,Opret ny konto fra kontoplanen.
+apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +27,-Above,-over
+apps/erpnext/erpnext/stock/doctype/item/item.py +310,Conversion factor for default Unit of Measure must be 1 in row {0},Omregningsfaktor for standard Måleenhed skal være 1 i række {0}
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,{0}: {1} not found in Invoice Details table,{0}: {1} blev ikke fundet i Invoice Detaljer tabel
+DocType: SMS Settings,SMS Sender Name,SMS Sender Name
+DocType: Task,Total Expense Claim (via Expense Claim),Total Expense krav (via Expense krav)
+DocType: Sales Order,Fully Billed,Fuldt Billed
+apps/erpnext/erpnext/controllers/accounts_controller.py +201,{0} '{1}' is disabled,{0} &#39;{1}&#39; er deaktiveret
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +158,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Vælg tildelte beløb, Faktura Type og Fakturanummer i mindst én række"
+DocType: C-Form Invoice Detail,Invoice No,Faktura Nej
+DocType: Item,Item Image (if not slideshow),Item Billede (hvis ikke lysbilledshow)
+apps/erpnext/erpnext/public/js/setup_wizard.js +137,The Organization,Organisationen
+DocType: Features Setup,Imports,Import
+DocType: Task,depends_on,depends_on
+apps/erpnext/erpnext/controllers/buying_controller.py +23,From {0} | {1} {2},Fra {0} | {1} {2}
+DocType: Address Template,This format is used if country specific format is not found,"Dette format bruges, hvis landespecifikke format ikke findes"
+DocType: Sales Invoice,Commission Rate (%),Kommissionen Rate (%)
+apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,En anden Sales Person {0} eksisterer med samme Medarbejder id
+apps/erpnext/erpnext/stock/utils.py +167,{0} valid serial nos for Item {1},{0} gyldige løbenr for Item {1}
 DocType: Delivery Note Item,Against Sales Order,Mod kundeordre
-,Serial No Status,Løbenummer status
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +382,Item table can not be blank,Item tabel kan ikke være tom
+DocType: Opportunity,Quotation,Citat
+DocType: Item,Has Batch No,Har Batch Nej
+DocType: Purchase Receipt,Warehouse where you are maintaining stock of rejected items,"Lager, hvor du vedligeholder lager af afviste emner"
+DocType: Job Applicant,Applicant for a Job,Ansøger om et job
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +61,Age,Alder
+DocType: Employee,Date of Issue,Udstedelsesdato
+DocType: Offer Letter Term,Offer Term,Offer Term
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +146,There were errors.,Der var fejl.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +89,Warehouse not found in the system,Warehouse ikke fundet i systemet
+DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,Kvittering Vare Leveres
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +162,Leave approver must be one of {0},Lad godkender skal være en af ​​{0}
+DocType: Top Bar Item,Target,Target
+DocType: ToDo,Due Date,Due Date
+DocType: Payment Tool,Make Payment Entry,Foretag indbetaling indtastning
+apps/erpnext/erpnext/controllers/stock_controller.py +175,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Udgiftområde er obligatorisk for varen {2}
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +38,"Charges will be distributed proportionately based on item qty or amount, as per your selection","Afgifter vil blive fordelt forholdsmæssigt baseret på post qty eller mængden, som pr dit valg"
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +426,BOM {0} must be active,BOM {0} skal være aktiv
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,Cr
+DocType: Purchase Invoice,Supplier Address,Leverandør Adresse
+DocType: Item Group,Website Specifications,Website Specifikationer
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +55,Please set {0},Indstil {0}
+DocType: Delivery Note,Installation Status,Installation status
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +154,Blue,Blå
+DocType: Delivery Note Item,Against Sales Invoice,Mod Salg Faktura
+DocType: Item,Inventory,Inventory
+DocType: BOM Replace Tool,The BOM which will be replaced,Den BOM som vil blive erstattet
+DocType: Production Order Operation,Planned Start Time,Planlagt Start Time
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +56,None of the items have any change in quantity or value.,Ingen af ​​elementerne har nogen ændring i mængde eller værdi.
+DocType: Workstation,Rent Cost,Leje Omkostninger
+apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,BOM erstattet
+DocType: Sales Partner,Contact Desc,Kontakt Desc
+DocType: Leave Block List,Leave Block List Dates,Lad Block List Datoer
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +538,Select Item for Transfer,Vælg Item for Transfer
+DocType: Email Digest,Note: Email will not be sent to disabled users,Bemærk: E-mail vil ikke blive sendt til handicappede brugere
+DocType: Territory,Set Item Group-wise budgets on this Territory. You can also include seasonality by setting the Distribution.,Set varegruppe-wise budgetter på denne Territory. Du kan også medtage sæsonudsving ved at indstille Distribution.
+DocType: Supplier Quotation,Is Subcontracted,Underentreprise
+DocType: Employee,Current Address,Nuværende adresse
+apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +62,Leaves Allocated Successfully for {0},Blade Tildelt Succesfuld for {0}
+apps/erpnext/erpnext/shopping_cart/utils.py +47,Addresses,Adresser
+apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,Standard kontraktvilkår for Salg eller Indkøb.
+DocType: Issue,Opening Date,Åbning Dato
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +41,Please enter Company,Indtast Company
+DocType: Job Opening,"Job profile, qualifications required etc.","Jobprofil, kvalifikationer kræves etc."
+DocType: UOM Conversion Detail,UOM Conversion Detail,UOM Konvertering Detail
+DocType: Workflow State,User,Bruger
+DocType: Sales Invoice Item,Delivery Note Item,Levering Note Vare
+DocType: Purchase Invoice Item,Net Amount (Company Currency),Nettobeløb (Company Valuta)
+DocType: Supplier,Address HTML,Adresse HTML
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +49,Software,Software
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +16,{0}: From {0} for {1},{0}: Fra {0} for {1}
+DocType: Sales Person,Sales Person Targets,Salg person Mål
+DocType: Installation Note,Installation Time,Installation Time
+apps/erpnext/erpnext/config/support.py +38,Communication log.,Kommunikation log.
+DocType: Salary Slip Deduction,Default Amount,Standard Mængde
+DocType: Delivery Note,Track this Delivery Note against any Project,Spor dette Delivery Note mod enhver Project
+DocType: Purchase Receipt Item Supplied,Required Qty,Nødvendigt antal
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +50,Period Closing Entry,Periode Lukning indtastning
+DocType: DocType,Setup,Opsætning
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +217,Please click on 'Generate Schedule',Klik på &quot;Generer Schedule &#39;
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Box,Kasse
+DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","Her kan du vedligeholde højde, vægt, allergier, medicinske problemer osv"
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +155,Leave of type {0} cannot be longer than {1},Ferie af typen {0} må ikke være længere end {1}
+DocType: Sales Order Item,Planned Quantity,Planlagt Mængde
+apps/erpnext/erpnext/accounts/doctype/accounts_settings/accounts_settings.py +27,Company is missing in warehouses {0},Virksomheden mangler i pakhuse {0}
+apps/erpnext/erpnext/stock/get_item_details.py +113,Please specify Company,Angiv venligst Company
+apps/erpnext/erpnext/config/selling.py +127,Tax template for selling transactions.,Skat skabelon til at sælge transaktioner.
+apps/erpnext/erpnext/config/hr.py +23,Claims for company expense.,Krav om selskabets regning.
+DocType: Features Setup,Item Advanced,Item Avanceret
+apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +93,Total Tax,I alt Skat
+apps/erpnext/erpnext/config/hr.py +13,Employee records.,Medarbejder Records.
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Computers,Computere
+apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Alt for mange kolonner. Eksportere rapporten og udskrive det ved hjælp af en regnearksprogram.
+apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +21,{0} for {1},{0} for {1}
+DocType: BOM Replace Tool,New BOM,Ny BOM
+DocType: Sales Invoice,Advertisement,Annonce
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Associate,Associate
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +49,Please enter Taxes and Charges,Indtast Skatter og Afgifter
+apps/erpnext/erpnext/stock/doctype/item/item.py +398,"An Item Group exists with same name, please change the item name or rename the item group","Findes et Element Group med samme navn, skal du ændre elementet navn eller omdøbe varegruppe"
+DocType: Leave Type,Max Days Leave Allowed,Max Dage Leave tilladt
+DocType: Hub Settings,Seller Website,Sælger Website
+DocType: Company,Default Cost of Goods Sold Account,Standard vareforbrug konto
+apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +47,Receivable Account,Tilgodehavende konto
+apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +22,POS Profile {0} already created for user: {1} and company {2},POS Profil {0} allerede oprettet for bruger: {1} og selskab {2}
+apps/erpnext/erpnext/config/setup.py +110,Setup SMS gateway settings,Opsætning SMS gateway-indstillinger
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +468,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Række Nej {0}: Beløb kan ikke være større end Afventer Beløb mod Expense krav {1}. Afventer Beløb er {2}
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,Automotive
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +36,Tax Assets,Skatteaktiver
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +40,System Balance,System Balance
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +104,Warehouse {0} does not exist,Oplag {0} eksisterer ikke
+DocType: Item,Items with higher weightage will be shown higher,Elementer med højere weightage vises højere
+DocType: Purchase Invoice,Taxes and Charges Deducted,Skatter og Afgifter Fratrukket
+DocType: GL Entry,Is Advance,Er Advance
+DocType: Payment Tool,Received Or Paid,Modtaget eller betalt
+apps/frappe/frappe/public/js/frappe/misc/utils.js +110,and,og
+DocType: Sales Order Item,Basic Rate (Company Currency),Basic Rate (Company Valuta)
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,'Profit and Loss' type account {0} not allowed in Opening Entry,'Resultatopgørelsen' konto {0} ikke tilladt i 'Åbning balance'
+DocType: C-Form,Received Date,Modtaget Dato
+DocType: Address,Address Type,Adressetype
+apps/erpnext/erpnext/config/learn.py +11,Navigating,Navigering
+apps/erpnext/erpnext/controllers/buying_controller.py +60,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,Skat Kategori kan ikke være &quot;Værdiansættelse&quot; eller &quot;Værdiansættelse og Total&quot; som alle elementer er ikke-lagervarer
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +74,"Total {0} for all items is zero, may you should change 'Distribute Charges Based On'","Total {0} for alle poster er nul, kan du skal ændre &#39;Fordel afgifter baseret på&#39;"
+apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +122,Group Node,Gruppe Node
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +102,Rejected Warehouse is mandatory against regected item,Afvist Warehouse er obligatorisk mod regected post
+DocType: Item Customer Detail,Item Customer Detail,Item Customer Detail
+DocType: Serial No,Under AMC,Under AMC
+apps/erpnext/erpnext/utilities/doctype/address/address.py +90,No default Address Template found. Please create a new one from Setup > Printing and Branding > Address Template.,Ingen standard Adresse Skabelon fundet. Opret en ny en fra Setup&gt; Trykning og Branding&gt; Adresse skabelon.
+DocType: Sales Order Item,Ordered Qty,Bestilt Antal
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +172,Valuation Rate required for Item {0},Værdiansættelse Rate kræves for Item {0}
+DocType: Purchase Invoice Item,Net Rate,Net Rate
+DocType: Features Setup,Sales and Purchase,Salg og Indkøb
+DocType: SMS Log,Sent On,Sendt On
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +414,[Error],[Fejl]
+apps/erpnext/erpnext/stock/get_item_details.py +125,Item {0} must be a Sales Item,Vare {0} skal være en Sales Item
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,Konto suppleres ved hjælp af &quot;Find varer fra Køb Kvitteringer &#39;knappen
+DocType: DocPerm,Delete,Slet
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +332,{0} against Purchase Order {1},{0} mod indkøbsordre {1}
+,General Ledger,General Ledger
+DocType: Notification Control,Sales Order Message,Sales Order Message
+DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Månedlig Distribution Procent
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +72,Dispatch,Dispatch
+apps/erpnext/erpnext/controllers/selling_controller.py +150,Order Type must be one of {0},Bestil type skal være en af ​​{0}
+apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Tidligste
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +10,Return,Retur
+DocType: Address,Postal,Postal
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +85,Warehouse {0} can not be deleted as quantity exists for Item {1},"Warehouse {0} kan ikke slettes, da mængden findes for Item {1}"
+DocType: Purchase Invoice,Get Advances Paid,Få forskud
+DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Sende automatiske e-mails til Kontakter på Indsendelse transaktioner.
+DocType: Sales Order,Fully Delivered,Fuldt Leveres
+apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,Trykning og Branding
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +334,Not allowed to tranfer more {0} than {1} against Purchase Order {2},Ikke lov til at overdragelsessteder mere {0} end {1} mod indkøbsordre {2}
+DocType: Expense Claim,Expenses,Udgifter
+apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,Database over potentielle kunder.
+DocType: Item Group,Item Group Name,Item Group Name
+DocType: Quotation,Rate at which Price list currency is converted to company's base currency,"Hastighed, hvormed Prisliste valuta omregnes til virksomhedens basisvaluta"
+DocType: Employee,Cell Number,Cell Antal
+DocType: Company,Default Payable Account,Standard Betales konto
+apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +42,Customer required for 'Customerwise Discount',Kunden kræves for &#39;Customerwise Discount&#39;
+DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,Konto for lageret (Perpetual Inventory) vil blive oprettet under denne konto.
+apps/erpnext/erpnext/setup/doctype/company/company.py +32,Abbreviation cannot have more than 5 characters,Forkortelse kan ikke have mere end 5 tegn
+DocType: Rename Tool,File to Rename,Fil til Omdøb
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +83,Indirect Expenses,Indirekte udgifter
+DocType: Project,% Tasks Completed,% Opgaver Afsluttet
+DocType: Maintenance Schedule,Maintenance Schedule,Vedligeholdelse Skema
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +150,Please select Start Date and End Date for Item {0},Vælg Start og slutdato for Item {0}
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +13,Please enter company first,Indtast venligst selskab først
+apps/erpnext/erpnext/config/buying.py +79,Tax template for buying transactions.,Skat skabelon til at købe transaktioner.
+DocType: Sales Partner,Partner's Website,Partner s hjemmeside
+,Support Analytics,Support Analytics
+DocType: Item,Is Purchase Item,Er Indkøb Item
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +629,My Invoices,Mine Fakturaer
+DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,Pull salgsordrer (afventer at levere) baseret på ovenstående kriterier
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Piecework,Akkordarbejde
+apps/erpnext/erpnext/config/support.py +28,Visit report for maintenance call.,Besøg rapport til vedligeholdelse opkald.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +67,Marketing,Marketing
+DocType: Shipping Rule Condition,Shipping Amount,Forsendelse Mængde
+,Contact Name,Kontakt Navn
+apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,Cirkulær reference Fejl
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +85,Item {0} is not Purchase Item,Vare {0} er ikke Indkøb Vare
+DocType: Salary Slip,Deductions,Fradrag
+apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,Vælg regnskabsår
+apps/erpnext/erpnext/accounts/doctype/account/account.js +27,This is a root account and cannot be edited.,Dette er en rod-konto og kan ikke redigeres.
+DocType: Account,Purchase User,Køb Bruger
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +137,Atleast one warehouse is mandatory,Mindst én lageret er obligatorisk
+DocType: Buying Settings,Maintain same rate throughout purchase cycle,Bevar samme sats i hele køb cyklus
+DocType: Maintenance Visit,Maintenance Date,Vedligeholdelse Dato
+apps/erpnext/erpnext/controllers/buying_controller.py +236,Specified BOM {0} does not exist for Item {1},Specificeret BOM {0} findes ikke til konto {1}
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,Værdi eller Antal
+apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,Afslutning Dato
+DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,Vedligeholdelse Besøg Formål
+DocType: Serial No,Warranty Period (Days),Garantiperiode (dage)
+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","Download skabelon, fylde relevante data og vedhæfte den ændrede fil. Alle datoer og medarbejder kombination i den valgte periode vil komme i skabelonen, med eksisterende fremmøde optegnelser"
+DocType: Leave Control Panel,Leave Control Panel,Lad Kontrolpanel
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +18,Discount Percentage can be applied either against a Price List or for all Price List.,Rabat Procent kan anvendes enten mod en prisliste eller for alle prisliste.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +101,All Customer Groups,Alle kundegrupper
+apps/erpnext/erpnext/config/crm.py +81,Manage Territory Tree.,Administrer Territory Tree.
+DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(Timesats / 60) * TidsforbrugIMinutter
+DocType: Leave Block List,Stop users from making Leave Applications on following days.,Stop brugere fra at Udfyld Programmer på følgende dage.
+DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),Skatter og Afgifter Fratrukket (Company Valuta)
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +48,Sick Leave,Sygefravær
+DocType: Purchase Receipt Item,Accepted Warehouse,Accepteret varelager
+DocType: Notification Control,Quotation Message,Citat Message
+apps/erpnext/erpnext/public/js/setup_wizard.js +155,Financial Year End Date,Regnskabsår Slutdato
+apps/erpnext/erpnext/config/setup.py +105,"Create and manage daily, weekly and monthly email digests.","Oprette og administrere de daglige, ugentlige og månedlige email fordøjer."
+DocType: Project,Expected Start Date,Forventet startdato
+,Transferred Qty,Overført Antal
+DocType: Purchase Invoice,Purchase Taxes and Charges,Købe Skatter og Afgifter
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +29,Series is mandatory,Serien er obligatorisk
+apps/erpnext/erpnext/config/setup.py +14,Global Settings,Globale indstillinger
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,Løbenummer {0} ikke fundet
+DocType: Stock Ledger Entry,Outgoing Rate,Udgående Rate
+DocType: Production Order Operation,Actual End Time,Faktiske Sluttid
+DocType: GL Entry,Remarks,Bemærkninger
+apps/erpnext/erpnext/config/hr.py +53,Offer candidate a Job.,Offer kandidat et job.
+DocType: Issue,Issue,Issue
+DocType: Communication,Sent,Sent
+DocType: Customer,Individual,Individuel
+DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,"Den dato, hvor næste faktura vil blive genereret. Det genereres på send."
+DocType: Item,Purchase Details,Køb Detaljer
+apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +24,Add Subscribers,Tilføj Abonnenter
+DocType: Purchase Invoice Item,Page Break,Side Break
+apps/erpnext/erpnext/config/accounts.py +63,Close Balance Sheet and book Profit or Loss.,Luk Balance og book resultatopgørelsen.
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +105,Miscellaneous Expenses,Diverse udgifter
+,Sales Browser,Salg Browser
+apps/erpnext/erpnext/config/manufacturing.py +74,Global settings for all manufacturing processes.,Globale indstillinger for alle produktionsprocesser.
+apps/erpnext/erpnext/shopping_cart/utils.py +46,Issues,Spørgsmål
+DocType: Purchase Invoice Item,Raw Materials Supplied Cost,Raw Materials Leveres Cost
+DocType: Journal Entry Account,Sales Invoice,Salg Faktura
+apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.py +182,Please set Dropbox access keys in your site config,Venligst sæt Dropbox genvejstaster i dit site config
+apps/erpnext/erpnext/setup/doctype/company/company.py +236,Abbr can not be blank or space,Forkortelsen kan ikke være tom eller bestå af mellemrum
+DocType: Web Page,Slideshow,Slideshow
+DocType: Item,Will also apply to variants,Vil også gælde for varianter
+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.","Så Priser Regler filtreres ud baseret på kunden, Kunde Group, Territory, leverandør, leverandør Type, Kampagne, Sales Partner etc."
+DocType: Payment Tool,Payment Mode,Betaling tilstand
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Business Development Manager,Business Development Manager
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +620,Sales Return,Salg Return
+apps/erpnext/erpnext/public/js/setup_wizard.js +156,Your financial year ends on,Din regnskabsår slutter den
+DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,"Standard Bank / Cash-konto vil automatisk blive opdateret i POS faktura, når denne tilstand er valgt."
+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""","Dette vil blive føjet til Item Code af varianten. For eksempel, hvis dit forkortelse er &quot;SM&quot;, og punktet koden er &quot;T-SHIRT&quot;, punktet koden for den variant, vil være &quot;T-SHIRT-SM&quot;"
+DocType: Event,Friday,Fredag
+,Accounts Receivable Summary,Debitor Resumé
+,Pending SO Items For Purchase Request,Afventer SO Varer til Indkøb Request
+DocType: Journal Entry,Excise Entry,Excise indtastning
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +20,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0} er nu standard regnskabsår. Opdater venligst din browser for at ændringen træder i kraft.
+DocType: Employee Internal Work History,Employee Internal Work History,Medarbejder Intern Arbejde Historie
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0}: Parent account {1} does not bolong to the company {2},Warehouse {0}: Forældre-konto {1} ikke Bolong til virksomheden {2}
+apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Credit Balance,Credit Balance
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +135,User {0} is disabled,Bruger {0} er deaktiveret
+DocType: HR Settings,Stop Birthday Reminders,Stop Fødselsdag Påmindelser
+apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Avg Daily Outgoing,Gennemsnitlig Daily Udgående
+DocType: Sales Invoice Item,Batch No,Batch Nej
+DocType: Salary Slip,Earning,Optjening
+apps/erpnext/erpnext/accounts/doctype/account/account.py +43,Account {0}: You can not assign itself as parent account,Konto {0}: Konto kan ikke samtidig være forældre-konto
+DocType: Employee,Company Email,Firma Email
+DocType: Salary Slip,Earning & Deduction,Earning &amp; Fradrag
+DocType: Production Order,Manufactured Qty,Fremstillet Antal
+DocType: Quality Inspection Reading,Reading 3,Reading 3
+DocType: Party Account,Party Account,Party Account
+DocType: Company,Warn,Advar
+DocType: Journal Entry,Journal Entry,Kassekladde
+DocType: Installation Note,Installation Date,Installation Dato
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Note {0} must not be submitted,Levering Note {0} må ikke indsendes
+DocType: Customer Group,Has Child Node,Har Child Node
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +305,Please enter Warehouse for which Material Request will be raised,Indtast venligst Warehouse for hvilke Materiale Request vil blive rejst
+DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","Hvis markeret, Total nej. af Arbejdsdage vil omfatte helligdage, og dette vil reducere værdien af ​​Løn Per Day"
+DocType: Company,Delete Company Transactions,Slet Company Transaktioner
+DocType: Sales Order,Customer's Purchase Order Date,Kundens Indkøbsordre Dato
+DocType: Appraisal Goal,Weightage (%),Weightage (%)
+apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +146,Operation ID not set,Operation ID ikke indstillet
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +54,Ref Date,Ref Dato
+apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js +14,This is a root sales person and cannot be edited.,Dette er en rod salg person og kan ikke redigeres.
+DocType: Stock Entry,Sales Invoice No,Salg faktura nr
+DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,F.eks. smsgateway.com/api/send_sms.cgi
+DocType: Production Planning Tool,Material Request For Warehouse,Materiale Request For Warehouse
+apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +50,Missing Currency Exchange Rates for {0},Manglende Valutakurser for {0}
+DocType: Installation Note,Installation Note,Installation Bemærk
+DocType: Salary Structure Deduction,Salary Structure Deduction,Løn Struktur Fradrag
+DocType: Item,Default Unit of Measure,Standard Måleenhed
+DocType: Purchase Invoice Item,Item Name,Item Name
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +407,Accounting Entry for Stock,Regnskab Punktet om Stock
+DocType: BOM Replace Tool,Replace,Udskifte
+DocType: Item,Inspection Criteria,Inspektion Kriterier
+DocType: Offer Letter Term,Value / Description,/ Beskrivelse
+DocType: Stock Entry,Purpose,Formål
+DocType: Purchase Order Item,Supplier Quotation Item,Leverandør Citat Vare
+DocType: Opportunity Item,Opportunity Item,Opportunity Vare
+DocType: Sales Order,Track this Sales Order against any Project,Spor denne salgsordre mod enhver Project
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Sales Person,Salg Person
+DocType: Employee,Relieving Date,Lindre Dato
+DocType: Employee Leave Approver,Employee Leave Approver,Medarbejder Leave Godkender
+apps/erpnext/erpnext/config/accounts.py +128,Rules to calculate shipping amount for a sale,Regler til at beregne forsendelse beløb for et salg
+DocType: C-Form,C-Form No,C-Form Ingen
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +24,Electronics,Elektronik
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +386,'Entries' cannot be empty,'Indlæg' kan ikke være tomt
+DocType: Communication,Open,Åbent
+DocType: Stock Ledger Entry,Voucher Detail No,Voucher Detail Nej
+DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,"Vælg højde leder af den bank, hvor checken blev deponeret."
+DocType: HR Settings,Employee Records to be created by,Medarbejder Records at være skabt af
+DocType: Activity Cost,Projects,Projekter
+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,Ny Løbenummer kan ikke have Warehouse. Warehouse skal indstilles af Stock indtastning eller kvittering
+DocType: Sales Invoice,Exhibition,Udstilling
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +13,Overdue,Forfaldne
+apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),I alt (Amt)
+apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +67,Number of Order,Antal Order
+,BOM Search,BOM Søg
+DocType: Notification Control,Purchase Receipt Message,Kvittering Message
+DocType: Quotation,Rate at which customer's currency is converted to company's base currency,"Hastighed, hvormed kundens valuta omregnes til virksomhedens basisvaluta"
+apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +437,Please select Apply Discount On,Vælg Anvend Rabat på
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,{0} is mandatory for Item {1},{0} er obligatorisk for Item {1}
+DocType: ToDo,High,Høj
+apps/erpnext/erpnext/config/selling.py +18,Quotes to Leads or Customers.,Citater til Leads eller kunder.
+DocType: Sales Invoice,Shipping Address,Forsendelse Adresse
+DocType: Quotation Item,Quotation Item,Citat Vare
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +178,For Quantity (Manufactured Qty) is mandatory,For Mængde (Fremstillet Antal) er obligatorisk
+DocType: Item,Serial Number Series,Serial Number Series
+DocType: Time Log Batch,Will be updated after Sales Invoice is Submitted.,Vil blive opdateret efter Sales Invoice er indgivet.
+DocType: Authorization Rule,Authorization Rule,Autorisation Rule
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +190,Sales Invoice {0} must be cancelled before cancelling this Sales Order,"Salg Faktura {0} skal annulleres, før den annullerer denne Sales Order"
+DocType: Serial No,Warranty Expiry Date,Garanti Udløbsdato
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +141,Quotation {0} is cancelled,Citat {0} er aflyst
+apps/erpnext/erpnext/stock/doctype/item/item.js +34,Show Variants,Vis varianter
+DocType: Stock Ledger Entry,Actual Qty After Transaction,Aktuel Antal Efter Transaktion
+DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Vil blive beregnet i transaktionen.
+apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +25,Current BOM and New BOM can not be same,Nuværende BOM og New BOM må ikke være samme
+apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +53,Clearance date cannot be before check date in row {0},Clearance dato kan ikke være før check dato i række {0}
+apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +26,Please select the document type first,Vælg dokumenttypen først
+DocType: Item Group,Show this slideshow at the top of the page,Vis denne slideshow øverst på siden
+apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +25,Root cannot have a parent cost center,Root kan ikke have en forælder cost center
+DocType: Page,Page Name,Side Navn
+DocType: Account,Expenses Included In Valuation,Udgifter inkluderet i Værdiansættelse
+DocType: Expense Claim,Task,Opgave
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +56,Show zero values,Vis nul værdier
+apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +65,Supplier Id,Leverandør id
+DocType: Landed Cost Voucher,Landed Cost Voucher,Landed Cost Voucher
+apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,Vælg type transaktion
+DocType: Sales Invoice,Payment Due Date,Betaling Due Date
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +30,Approval Status must be 'Approved' or 'Rejected',Godkendelsesstatus skal &quot;Godkendt&quot; eller &quot;Afvist&quot;
+DocType: Production Order,Total Operating Cost,Samlede driftsomkostninger
+DocType: Purchase Invoice,Is Return,Er Return
+DocType: Opportunity,Lost Reason,Tabt Årsag
+apps/erpnext/erpnext/public/js/setup_wizard.js +266,user@example.com,user@example.com
+DocType: Sales Order Item,Used for Production Plan,Bruges til Produktionsplan
+apps/erpnext/erpnext/accounts/doctype/account/account.py +169,Root account can not be deleted,Root-konto kan ikke slettes
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +81,Duplicate entry,Duplicate entry
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +31,To create a Bank Account,For at oprette en bankkonto
+DocType: Item,Unit of Measure Conversion,Måleenhed Conversion
+DocType: Production Order,Material Transferred for Manufacturing,Materiale Overført til Manufacturing
+DocType: Sales Order,% of materials billed against this Sales Order,% Af materialer faktureret mod denne Sales Order
+DocType: Pricing Rule,Apply On,Påfør On
+DocType: Salary Structure,Salary breakup based on Earning and Deduction.,Løn breakup baseret på Optjening og fradrag.
+DocType: Stock Entry,Total Value Difference (Out - In),Samlet værdi Difference (Out - In)
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,Bank Overdraft Account,Bank kassekredit
+DocType: Product Bundle,"Aggregate group of **Items** into another **Item**. This is useful if you are bundling a certain **Items** into a package and you maintain stock of the packed **Items** and not the aggregate **Item**. 
+
+The package **Item** will have ""Is Stock Item"" as ""No"" and ""Is Sales Item"" as ""Yes"".
+
+For Example: If you are selling Laptops and Backpacks separately and have a special price if the customer buys both, then the Laptop + Backpack will be a new Product Bundle Item.
+
+Note: BOM = Bill of Materials","Samlede gruppe af ** Varer ** i anden ** Item **. Dette er nyttigt, hvis du bundling en bestemt ** Varer ** i en pakke, og du kan bevare status over de pakkede ** Varer ** og ikke den samlede ** Item **. Pakken ** Item ** vil have &quot;Er Stock Item&quot; som &quot;Nej&quot; og &quot;Er Sales Item&quot; som &quot;Ja&quot;. For eksempel: Hvis du sælger Laptops og Rygsække separat og har en særlig pris, hvis kunden køber både, så Laptop + Rygsæk vil være en ny Product Bundle Item. Bemærk: BOM = Bill of Materials"
+apps/erpnext/erpnext/accounts/utils.py +344,{0} budget for Account {1} against Cost Center {2} will exceed by {3},{0} budget for konto {1} mod udgiftsområde {2} vil blive overskredet med {3}
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,Fremmøde til medarbejder {0} er allerede markeret
+DocType: Item,"Example: ABCD.#####
+If series is set and Serial No is not mentioned in transactions, then automatic serial number will be created based on this series. If you always want to explicitly mention Serial Nos for this item. leave this blank.","Eksempel:. ABCD ##### Hvis serien er indstillet, og Løbenummer nævnes ikke i transaktioner, så automatisk serienummer vil blive oprettet på grundlag af denne serie. Hvis du altid ønsker at eksplicit nævne Serial Nos for dette element. lader dette være blankt."
+DocType: Company,Default Terms,Standard Vilkår
+DocType: Company,Default Income Account,Standard Indkomst konto
+,Sales Partners Commission,Salg Partners Kommissionen
+DocType: Item Variant Attribute,Attribute,Attribut
+apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Present,Samlet Present
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +61,To Date should be same as From Date for Half Day leave,Til dato skal være samme som fra dato for Half Day orlov
+apps/erpnext/erpnext/accounts/doctype/account/account.py +89,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'",Konto balance er debit. Du har ikke lov til at ændre 'Balancetype' til 'kredit'
+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","Udskift en bestemt BOM i alle andre styklister, hvor det bruges. Det vil erstatte den gamle BOM linket, opdatere omkostninger og regenerere &quot;BOM Explosion Item&quot; tabel som pr ny BOM"
+apps/erpnext/erpnext/config/hr.py +71,Upload attendance from a .csv file,Upload fremmøde fra en .csv-fil
+DocType: Quality Inspection,Sample Size,Sample Size
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +92,Show Time Logs,Vis Time Logs
+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.,Dette værktøj hjælper dig med at opdatere eller fastsætte mængden og værdiansættelse på lager i systemet. Det bruges typisk til at synkronisere systemets værdier og hvad der rent faktisk eksisterer i dine lagre.
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +427,Transaction not allowed against stopped Production Order {0},Transaktion ikke tilladt mod stoppet produktionsordre {0}
+DocType: Workstation,per hour,per time
+apps/erpnext/erpnext/config/buying.py +54,Default settings for buying transactions.,Standardindstillinger for at købe transaktioner.
+DocType: Sales Order,"Check if recurring order, uncheck to stop recurring or put proper End Date","Kontroller, om tilbagevendende orden, skal du fjerne markeringen for at stoppe tilbagevendende eller sætte ordentlig Slutdato"
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,Administrationsomkostninger
+DocType: Purchase Invoice Item,Project Name,Projektnavn
+DocType: Opportunity,Opportunity From,Mulighed Fra
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +228,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},Klik på &quot;Generer Schedule &#39;at hente Løbenummer tilføjet for Item {0}
+DocType: Selling Settings,Customer Naming By,Customer Navngivning Af
+apps/erpnext/erpnext/public/js/setup_wizard.js +359,Raw Material,Raw Material
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,Samlede udestående beløb
+apps/frappe/frappe/templates/base.html +137,Error: Not a valid id?,Fejl: Ikke et gyldigt id?
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +46,Total Unpaid,Total Ulønnet
+apps/erpnext/erpnext/accounts/doctype/account/account.js +67,Convert to Group,Konverter til Group
+apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +25,Global POS Profile {0} already created for company {1},Global POS Profil {0} allerede skabt til selskab {1}
+DocType: Purchase Receipt Item,Prevdoc DocType,Prevdoc DocType
+DocType: Notification Control,Custom Message,Tilpasset Message
+apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,Ikke authroized da {0} overskrider grænser
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +164,Expense account is mandatory for item {0},Udgiftskonto er obligatorisk for element {0}
+DocType: C-Form Invoice Detail,Territory,Territory
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Indirect Income,Indirekte Indkomst
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Small,Lille
+DocType: Newsletter,Email Sent?,E-mail Sendt?
+DocType: Budget Detail,Budget Allocated,Budgettet
+apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,View Offer Letter,Se tilbud Letter
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +386,Warehouse required at Row No {0},Warehouse kræves på Row Nej {0}
+apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date','Faktisk startdato' kan ikke være større end 'Faktisk slutdato'
+apps/erpnext/erpnext/config/stock.py +64,Upload stock balance via csv.,Upload lager balance via csv.
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,Broadcasting
+DocType: Item,Apply Warehouse-wise Reorder Level,Påfør Warehouse-wise Omarranger Level
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +28,Balance,Balance
+apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +39,Appraisal {0} created for Employee {1} in the given date range,Vurdering {0} skabt til Medarbejder {1} i givet datointerval
+DocType: Task,Closing Date,Closing Dato
+DocType: Sales Order,Not Delivered,Ikke leveret
+DocType: Attendance,Present,Present
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +103,Atleast one item should be entered with negative quantity in return document,Mindst ét ​​element skal indtastes med negativt mængde gengæld dokument
+apps/erpnext/erpnext/setup/doctype/currency_exchange/currency_exchange.py +19,From Currency and To Currency cannot be same,Fra Valuta og Til valuta ikke kan være samme
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,Energi
+DocType: Purchase Invoice,Supplier Invoice No,Leverandør faktura nr
+apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +23,Please enter parent cost center,Indtast forælder omkostningssted
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +8,Until,Indtil
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +455,Rest Of The World,Resten af ​​verden
+DocType: Authorization Rule,Itemwise Discount,Itemwise Discount
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +52,Telecommunications,Telekommunikation
+DocType: Features Setup,Item Barcode,Item Barcode
+DocType: Communication,Date,Dato
+DocType: Offer Letter,Select Terms and Conditions,Vælg Betingelser
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Værdipapirer og Commodity Exchanges
+,Purchase Analytics,Køb Analytics
+DocType: Purchase Invoice Item,Purchase Invoice Item,Købsfaktura Item
+apps/erpnext/erpnext/config/accounts.py +169,C-Form records,C-Form optegnelser
+DocType: BOM,Total Cost,Total Cost
+DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** Regnskabsår ** repræsenterer et regnskabsår. Alle regnskabsposteringer og andre større transaktioner spores mod ** regnskabsår **.
+DocType: SMS Center,All Lead (Open),Alle Bly (Open)
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,Capital Udstyr
+apps/erpnext/erpnext/stock/doctype/item/item.py +416,Item {0} does not exist,Element {0} eksisterer ikke
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +46,Min Qty can not be greater than Max Qty,Min Antal kan ikke være større end Max Antal
+DocType: Item,Weightage,Weightage
+DocType: Quality Inspection,Inspected By,Inspiceres af
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +303,Completed Qty can not be greater than 'Qty to Manufacture',Afsluttet Antal kan ikke være større end &#39;antal til Fremstilling&#39;
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +141,You are not authorized to add or update entries before {0},Du er ikke autoriseret til at tilføje eller opdatere poster før {0}
+DocType: Lead,Do Not Contact,Må ikke komme i kontakt
+DocType: GL Entry,Voucher Type,Voucher Type
+DocType: Bank Reconciliation,Bank Reconciliation,Bank Afstemning
+apps/frappe/frappe/public/js/frappe/views/ganttview.js +45,Gantt Chart,Gantt Chart
+DocType: Employee,Reason for Resignation,Årsag til Udmeldelse
+DocType: BOM Replace Tool,Current BOM,Aktuel BOM
+DocType: Sales Invoice,Is Opening Entry,Åbner post
+DocType: Payment Tool,Make Journal Entry,Make Kassekladde
+DocType: SMS Center,Total Message(s),Total Besked (r)
+DocType: Employee,Salutation,Salutation
+DocType: Feed,Full Name,Fulde navn
+DocType: Fiscal Year Company,Fiscal Year Company,Fiscal År Company
+DocType: Item,Variant Of,Variant af
+DocType: Bin,FCFS Rate,FCFS Rate
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +111,Production Order status is {0},Produktionsordre status er {0}
+DocType: Print Settings,Modern,Moderne
+apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +9,Get Updates,Hent opdateringer
+DocType: Payment Tool Detail,Payment Tool Detail,Betaling Tool Detail
+apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +36,Row #{0}: Timings conflicts with row {1},Row # {0}: tider konflikter med rækken {1}
+apps/erpnext/erpnext/public/js/setup_wizard.js +365,We sell this Item,Vi sælger denne Vare
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Import mislykkedes!
+DocType: Item,Default Supplier,Standard Leverandør
+DocType: BOM,Item Desription,Item desription
+DocType: Employee Education,Class / Percentage,Klasse / Procent
+DocType: Sales Invoice,Debit To,Betalingskort Til
+DocType: Bank Reconciliation,To Date,Til dato
+DocType: Sales Partner,Retailer,Forhandler
+DocType: Comment,Reference Name,Henvisning Navn
+DocType: Purchase Invoice Item,Quantity and Rate,Mængde og Pris
+DocType: Period Closing Voucher,Period Closing Voucher,Periode Lukning Voucher
+DocType: Expense Claim,Approved,Godkendt
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,Earnest Money
+DocType: Account,Equity,Egenkapital
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +69,Publish to sync items,Udgive synkronisere emner
+apps/erpnext/erpnext/accounts/doctype/account/account.js +57,View Ledger,Vis Ledger
+DocType: Pricing Rule,Buying,Køb
+DocType: Territory,For reference,For reference
+apps/erpnext/erpnext/config/learn.py +77,Opening Accounting Balance,Åbning Regnskab Balance
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +432,BOM {0} does not belong to Item {1},BOM {0} ikke hører til Vare {1}
+DocType: Features Setup,Point of Sale,Point of Sale
+DocType: Payment Reconciliation Invoice,Invoice Number,Fakturanummer
+DocType: Landed Cost Item,Applicable Charges,Gældende gebyrer
+DocType: Stock Reconciliation Item,Stock Reconciliation Item,Stock Afstemning Item
+apps/erpnext/erpnext/config/hr.py +28,Attendance record.,Fremmøde rekord.
+DocType: Quality Inspection Reading,Reading 6,Læsning 6
+DocType: Currency Exchange,From Currency,Fra Valuta
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +112,You are the Expense Approver for this record. Please Update the 'Status' and Save,Du er bekostning Godkender til denne oplysning. Venligst Opdater &quot;Status&quot; og Gem
+DocType: Buying Settings,Buying Settings,Opkøb Indstillinger
+apps/erpnext/erpnext/public/js/setup_wizard.js +143,Max 5 characters,Max 5 tegn
+DocType: Job Opening,Job Title,Jobtitel
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +33,Production Item,Produktion Vare
+DocType: Notification Control,Prompt for Email on Submission of,Spørg til Email på Indsendelse af
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,Proposal Writing,Forslag Skrivning
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +80,Warning: Same item has been entered multiple times.,Advarsel: Samme element er indtastet flere gange.
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +49,Expected Delivery Date cannot be before Sales Order Date,"Forventet leveringsdato kan ikke være, før Sales Order Date"
+DocType: Pricing Rule,Min Qty,Min Antal
+,Sales Order Trends,Salg Order Trends
+DocType: Delivery Note,Instructions,Instruktioner
+DocType: Item Price,Bulk Import Help,Bulk Import Hjælp
+DocType: Customer Group,Parent Customer Group,Overordnet kunde Group
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +29,Submit this Production Order for further processing.,Indsend denne produktionsordre til videre forarbejdning.
+DocType: Purchase Invoice Item,Purchase Receipt,Kvittering
+DocType: Delivery Note Item,Against Sales Invoice Item,Mod Sales Invoice Item
+DocType: Expense Claim,From Employee,Fra Medarbejder
+DocType: Features Setup,To get Item Group in details table,At få Item Group i detaljer tabel
+DocType: Appraisal Template,Appraisal Template Title,Vurdering Template Titel
+apps/erpnext/erpnext/config/hr.py +43,Applicant for a Job.,Ansøger om et job.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Government,Regeringen
+apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +14,This is a root customer group and cannot be edited.,Dette er en rod kundegruppe og kan ikke redigeres.
+DocType: Time Log,"Log of Activities performed by users against Tasks that can be used for tracking time, billing.","Log af aktiviteter udført af brugere mod Opgaver, der kan bruges til sporing af tid, fakturering."
+DocType: Branch,Branch,Branch
+apps/erpnext/erpnext/utilities/doctype/address/address.py +21,Address Title is mandatory.,Adresse Titel er obligatorisk.
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +276,Packing Slip(s) cancelled,Packing Slip (r) annulleret
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +203,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,"Vedligeholdelse Besøg {0} skal annulleres, før den annullerer denne Sales Order"
+DocType: Stock Reconciliation Item,Before reconciliation,Før forsoning
+,Item Shortage Report,Item Mangel Rapport
+DocType: Stock Settings,Stock Frozen Upto,Stock Frozen Op
+DocType: Purchase Invoice Item,Item Tax Rate,Item Skat
+DocType: Bin,Bin,Bin
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is stopped,{0} {1} er stoppet
+DocType: Production Order,Manufacture against Sales Order,Fremstilling mod kundeordre
+DocType: Leave Control Panel,Carry Forward,Carry Forward
+DocType: Item,Moving Average,Glidende gennemsnit
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +12,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.","Prisfastsættelse Regel er lavet til at overskrive Prisliste / definere rabatprocent, baseret på nogle kriterier."
+,Company Name,Firmaets navn
+DocType: Price List,Price List Master,Prisliste Master
+apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Indkøb prisliste
+apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +62,Cost Center with existing transactions can not be converted to group,Cost Center med eksisterende transaktioner kan ikke konverteres til gruppe
+DocType: Stock Entry Detail,Stock Entry Detail,Stock indtastning Detail
+apps/erpnext/erpnext/setup/doctype/company/company.py +55,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","Kan ikke ændre virksomhedens standard valuta, fordi der er eksisterende transaktioner. Transaktioner skal annulleres for at ændre standard valuta."
+DocType: Pricing Rule,Item Group,Item Group
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,Lindre Dato skal være større end Dato for Sammenføjning
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +124,Setup Complete,Setup Complete
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +221,Closing (Dr),Lukning (dr)
+DocType: Item Group,Default Expense Account,Standard udgiftskonto
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Company first,Vælg venligst Company først
+DocType: BOM Operation,Workstation,Arbejdsstation
+DocType: Newsletter,Newsletter List,Nyhedsbrev List
+DocType: Features Setup,Brands,Mærker
+DocType: Quality Inspection Reading,Reading 10,Reading 10
+apps/frappe/frappe/core/page/permission_manager/permission_manager.js +428,Set,Sæt
+apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +30,End Date can not be less than Start Date,Slutdato kan ikke være mindre end Startdato
+apps/erpnext/erpnext/controllers/recurring_document.py +128,Please find attached {0} #{1},Vedlagt {0} # {1}
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Office Maintenance Expenses,Office vedligeholdelsesudgifter
+apps/erpnext/erpnext/config/website.py +13,"Settings for online shopping cart such as shipping rules, price list etc.","Indstillinger for online indkøbskurv, såsom skibsfart regler, prisliste mv"
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,Bankkonti
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +166,Maintenance Schedule {0} exists against {0},Vedligeholdelsesplan {0} eksisterer imod {0}
+DocType: Fiscal Year,Year Start Date,År Startdato
+DocType: Item,If subcontracted to a vendor,Hvis underentreprise til en sælger
+apps/erpnext/erpnext/config/manufacturing.py +39,Details of the operations carried out.,Oplysninger om de gennemførte transaktioner.
+DocType: Hub Settings,Name Token,Navn Token
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +588,From Supplier Quotation,Fra Leverandør Citat
+DocType: Delivery Note,Customer's Purchase Order No,Kundens Indkøbsordre Nej
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Analyst,Analytiker
+DocType: Company,Round Off Cost Center,Afrunde Cost center
+DocType: Purchase Invoice,End Date,Slutdato
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +93,Software Developer,Software Developer
+apps/erpnext/erpnext/config/setup.py +83,"Show / Hide features like Serial Nos, POS etc.","Vis / Skjul funktioner som Serial Nos, POS mv"
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +236,Row {0}: Payment amount can not be negative,Række {0}: Betaling beløb kan ikke være negativ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +50,Privilege Leave,Privilege Forlad
+DocType: Journal Entry,Write Off Based On,Skriv Off baseret på
+DocType: Bulk Email,Message,Besked
+DocType: Email Digest,Email Digest Settings,E-mail-Digest-indstillinger
+DocType: Sales Invoice,Customer Address,Kunde Adresse
+DocType: Custom Script,Client,Klient
+DocType: Task,Review Date,Anmeldelse Dato
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Actual,Samlede faktiske
+DocType: Item,Variants,Varianter
+DocType: Quotation Item,Against Docname,Mod Docname
+DocType: Naming Series,This is the number of the last created transaction with this prefix,Dette er antallet af sidste skabte transaktionen med dette præfiks
+DocType: Journal Entry Account,Expense Claim,Expense krav
+DocType: Workflow State,Search,Søg
+apps/erpnext/erpnext/accounts/general_ledger.py +131,Please mention Round Off Account in Company,Henvis Round Off-konto i selskabet
+DocType: Journal Entry,Accounts Receivable,Tilgodehavender
+DocType: Packed Item,Parent Detail docname,Parent Detail docname
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +69,Stock Expenses,Stock Udgifter
+DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),"Angiver, at pakken er en del af denne leverance (Kun Udkast)"
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Probation,Kriminalforsorgen
+apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +72,Days Since Last Order,Dage siden sidste ordre
+DocType: Employee,Married,Gift
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +158,Opening,Åbning
+apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +32,Approving User cannot be same as user the rule is Applicable To,Godkendelse Brugeren kan ikke være det samme som brugeren er reglen gælder for
+apps/erpnext/erpnext/setup/doctype/company/company.py +152,Main,Main
+DocType: Product Bundle,Product Bundle,Produkt Bundle
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,To Date should be within the Fiscal Year. Assuming To Date = {0},Til dato bør være inden regnskabsåret. Antages Til dato = {0}
+DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),Reducer Optjening for Leave uden løn (LWP)
+apps/erpnext/erpnext/config/stock.py +53,Batch (lot) of an Item.,Batch (parti) af et element.
+DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,Reserveret Warehouse i kundeordre / færdigvarer Warehouse
+DocType: Features Setup,Miscelleneous,Miscelleneous
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +154,Please select Incharge Person's name,Vælg Incharge Person navn
+apps/erpnext/erpnext/public/js/setup_wizard.js +147,"e.g. ""XYZ National Bank""",fx &quot;XYZ National Bank&quot;
+DocType: Lead,Lead Type,Lead Type
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +149,Target warehouse is mandatory for row {0},Target lageret er obligatorisk for rækken {0}
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},Duplicate Løbenummer indtastet for Item {0}
+DocType: Account,Cash,Kontanter
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +62,Item: {0} does not exist in the system,Item: {0} findes ikke i systemet
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +133,No records found in the Payment table,Ingen resultater i Payment tabellen
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +168,Stock Options,Aktieoptioner
+DocType: Journal Entry,Opening Entry,Åbning indtastning
+DocType: Appraisal,Appraisal Template,Vurdering skabelon
+DocType: Salary Slip Earning,Salary Slip Earning,Lønseddel Earning
+DocType: POS Profile,Write Off Account,Skriv Off konto
+apps/erpnext/erpnext/controllers/recurring_document.py +206,Next Recurring {0} will be created on {1},Næste Tilbagevendende {0} vil blive oprettet på {1}
+DocType: DocType,System,System
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +471,cannot be greater than 100,må ikke være større end 100
+DocType: Pricing Rule,Campaign,Kampagne
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +258,Total Debit must be equal to Total Credit. The difference is {0},Samlet Debit skal være lig med Total Credit. Forskellen er {0}
+DocType: Appraisal,Select template from which you want to get the Goals,"Vælg skabelon, hvorfra du ønsker at få de mål"
+DocType: Purchase Taxes and Charges,Consider Tax or Charge for,Overvej Skat eller Gebyr for
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +74,{0} must be a Purchased or Sub-Contracted Item in row {1},{0} skal være en Købt eller underentreprise element i række {1}
+DocType: Lead,Request Type,Anmodning Type
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,Journal Entry {0} does not have account {1} or already matched against other voucher,Kassekladde {0} har ikke konto {1} eller allerede matchet mod andre kupon
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,Gruppér efter
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Colour,Farve
+DocType: BOM,Materials Required (Exploded),Nødvendige materialer (Sprængskitse)
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +138,"Row {0}: To set {1} periodicity, difference between from and to date \
 						must be greater than or equal to {2}","Række {0}: For at indstille {1} periodicitet, skal forskellen mellem fra og til dato \ være større end eller lig med {2}"
-DocType: Pricing Rule,Selling,Selling
-DocType: Employee,Salary Information,Løn Information
-DocType: Sales Person,Name and Employee ID,Navn og Medarbejder ID
-apps/erpnext/erpnext/accounts/party.py +275,Due Date cannot be before Posting Date,"Forfaldsdato kan ikke være, før Udstationering Dato"
-DocType: Website Item Group,Website Item Group,Website Item Group
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Duties and Taxes,Told og afgifter
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Please enter Reference date,Indtast Referencedato
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} betalingssystemer poster ikke kan filtreres af {1}
-DocType: Item Website Specification,Table for Item that will be shown in Web Site,"Tabel til Vare, der vil blive vist i Web Site"
-DocType: Purchase Order Item Supplied,Supplied Qty,Medfølgende Antal
-DocType: Material Request Item,Material Request Item,Materiale Request Vare
-apps/erpnext/erpnext/config/stock.py +103,Tree of Item Groups.,Tree of varegrupper.
-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,Kan ikke henvise rækken tal større end eller lig med aktuelle række nummer til denne Charge typen
-,Item-wise Purchase History,Vare-wise Købshistorik
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +152,Red,Rød
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +228,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},Klik på &quot;Generer Schedule &#39;at hente Løbenummer tilføjet for Item {0}
-DocType: Account,Frozen,Frosne
-,Open Production Orders,Åbne produktionsordrer
-DocType: Installation Note,Installation Time,Installation Time
-apps/erpnext/erpnext/setup/doctype/company/company.js +44,Delete all the Transactions for this Company,Slette alle transaktioner for denne Company
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +191,Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Production Order # {3}. Please update operation status via Time Logs,Row # {0}: Operation {1} er ikke afsluttet for {2} qty af færdigvarer i produktionsordre # {3}. Du opdatere driftsstatus via Time Logs
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +57,Investments,Investeringer
-DocType: Issue,Resolution Details,Opløsning Detaljer
-apps/erpnext/erpnext/config/stock.py +84,Change UOM for an Item.,Skift UOM for et element.
-DocType: Quality Inspection Reading,Acceptance Criteria,Acceptkriterier
-DocType: Item Attribute,Attribute Name,Attribut Navn
-apps/erpnext/erpnext/controllers/selling_controller.py +236,Item {0} must be Sales or Service Item in {1},Vare {0} skal være Salg eller service Item i {1}
-DocType: Item Group,Show In Website,Vis I Website
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +621,Group,Gruppe
-DocType: Task,Expected Time (in hours),Forventet tid (i timer)
-,Qty to Order,Antal til ordre
-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","At spore mærke i følgende dokumenter Delivery Note, Opportunity, Material Request, punkt, Indkøbsordre, Indkøb Gavekort, køber Modtagelse, Citat, Sales Faktura, Produkt Bundle, salgsordre, Løbenummer"
-apps/erpnext/erpnext/config/projects.py +51,Gantt chart of all tasks.,Gantt-diagram af alle opgaver.
-DocType: Appraisal,For Employee Name,For Medarbejder Navn
-DocType: Holiday List,Clear Table,Klar Table
-DocType: Features Setup,Brands,Mærker
-DocType: C-Form Invoice Detail,Invoice No,Faktura Nej
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +480,From Purchase Order,Fra indkøbsordre
-DocType: Activity Cost,Costing Rate,Costing Rate
-DocType: Employee,Resignation Letter Date,Udmeldelse Brev Dato
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +37,Pricing Rules are further filtered based on quantity.,Priser Regler er yderligere filtreret baseret på mængde.
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +137,Not Set,Ikke Sæt
-DocType: Communication,Date,Dato
-apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,Gentag Kunde Omsætning
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +651,Sit tight while your system is being setup. This may take a few moments.,"Sidde stramt, mens dit system bliver setup. Dette kan tage et øjeblik."
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +51,{0} ({1}) must have role 'Expense Approver',"{0} ({1}), skal have rollen 'Godkendelse af udgifter'"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Pair,Par
-DocType: Bank Reconciliation Detail,Against Account,Mod konto
-DocType: Maintenance Schedule Detail,Actual Date,Faktiske dato
-DocType: Item,Has Batch No,Har Batch Nej
-DocType: Delivery Note,Excise Page Number,Excise Sidetal
-DocType: Employee,Personal Details,Personlige oplysninger
-,Maintenance Schedules,Vedligeholdelsesplaner
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +44,Embossing,Prægning
-,Quotation Trends,Citat Trends
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +139,Item Group not mentioned in item master for item {0},Item Group ikke er nævnt i punkt master for element {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +302,Debit To account must be a Receivable account,Betalingskort Til konto skal være et tilgodehavende konto
-apps/erpnext/erpnext/stock/doctype/item/item.py +310,"As Production Order can be made for this item, it must be a stock item.","Som kan Produktionsordre gøres for denne post, skal det være en lagervare."
-DocType: Shipping Rule Condition,Shipping Amount,Forsendelse Mængde
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +140,Joining,Vær med
-DocType: Authorization Rule,Above Value,Over værdi
-,Pending Amount,Afventer Beløb
-DocType: Purchase Invoice Item,Conversion Factor,Konvertering Factor
-DocType: Purchase Order,Delivered,Leveret
-apps/erpnext/erpnext/config/hr.py +160,Setup incoming server for jobs email id. (e.g. jobs@example.com),Opsætning indgående server for job email id. (F.eks jobs@example.com)
-DocType: Purchase Invoice,The date on which recurring invoice will be stop,"Den dato, hvor tilbagevendende faktura vil blive stoppe"
-DocType: Journal Entry,Accounts Receivable,Tilgodehavender
-,Supplier-Wise Sales Analytics,Forhandler-Wise Sales Analytics
-DocType: Address Template,This format is used if country specific format is not found,"Dette format bruges, hvis landespecifikke format ikke findes"
-DocType: Custom Field,Custom,Brugerdefineret
-DocType: Production Order,Use Multi-Level BOM,Brug Multi-Level BOM
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +26,Injection molding,Sprøjtestøbning
-DocType: Bank Reconciliation,Include Reconciled Entries,Medtag Afstemt Angivelser
-apps/erpnext/erpnext/config/accounts.py +41,Tree of finanial accounts.,Tree of finanial konti.
-DocType: Leave Control Panel,Leave blank if considered for all employee types,Lad stå tomt hvis det anses for alle typer medarbejderaktier
-DocType: Landed Cost Voucher,Distribute Charges Based On,Distribuere afgifter baseret på
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +312,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,Konto {0} skal være af typen 'Anlægskonto' da enheden {1} er et aktiv
-DocType: HR Settings,HR Settings,HR-indstillinger
 apps/frappe/frappe/config/setup.py +130,Printing,Udskrivning
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +114,Expense Claim is pending approval. Only the Expense Approver can update status.,Expense krav afventer godkendelse. Kun Expense Godkender kan opdatere status.
-DocType: Purchase Invoice,Additional Discount Amount,Yderligere Discount Beløb
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +99,The day(s) on which you are applying for leave are holiday. You need not apply for leave.,"Den dag (e), hvor du ansøger om orlov er ferie. Du har brug for ikke søge om orlov."
-apps/frappe/frappe/public/js/frappe/misc/utils.js +110,and,og
-DocType: Leave Block List Allow,Leave Block List Allow,Lad Block List Tillad
-apps/erpnext/erpnext/setup/doctype/company/company.py +236,Abbr can not be blank or space,Forkortelsen kan ikke være tom eller bestå af mellemrum
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +50,Sports,Sport
-apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Actual,Samlede faktiske
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Unit,Enhed
-apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.py +182,Please set Dropbox access keys in your site config,Venligst sæt Dropbox genvejstaster i dit site config
-apps/erpnext/erpnext/stock/get_item_details.py +113,Please specify Company,Angiv venligst Company
-,Customer Acquisition and Loyalty,Customer Acquisition og Loyalitet
-DocType: Purchase Receipt,Warehouse where you are maintaining stock of rejected items,"Lager, hvor du vedligeholder lager af afviste emner"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +408,Your financial year ends on,Din regnskabsår slutter den
-DocType: POS Profile,Price List,Pris List
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +20,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0} er nu standard regnskabsår. Opdater venligst din browser for at ændringen træder i kraft.
-apps/erpnext/erpnext/projects/doctype/project/project.js +47,Expense Claims,Expense Krav
-DocType: Issue,Support,Support
-DocType: Authorization Rule,Approving Role,Godkendelse Rolle
-,BOM Search,BOM Søg
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +176,Closing (Opening + Totals),Lukning (Åbning + Totals)
-apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +26,Please specify currency in Company,Angiv venligst valuta i selskabet
-DocType: Workstation,Wages per hour,Lønningerne i timen
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},Stock balance i Batch {0} vil blive negativ {1} for Item {2} på Warehouse {3}
-apps/erpnext/erpnext/config/setup.py +83,"Show / Hide features like Serial Nos, POS etc.","Vis / Skjul funktioner som Serial Nos, POS mv"
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +34,UOM Conversion factor is required in row {0},UOM Omregningsfaktor kræves i række {0}
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +53,Clearance date cannot be before check date in row {0},Clearance dato kan ikke være før check dato i række {0}
-DocType: Salary Slip,Deduction,Fradrag
-DocType: Address Template,Address Template,Adresse Skabelon
-apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +128,Please enter Employee Id of this sales person,Indtast venligst Medarbejder Id dette salg person
-DocType: Territory,Classification of Customers by region,Klassifikation af kunder efter region
-DocType: Project,% Tasks Completed,% Opgaver Afsluttet
-DocType: Project,Gross Margin,Gross Margin
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +140,Please enter Production Item first,Indtast venligst Produktion Vare først
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +72,disabled user,handicappet bruger
-DocType: Opportunity,Quotation,Citat
-DocType: Salary Slip,Total Deduction,Samlet Fradrag
-DocType: Quotation,Maintenance User,Vedligeholdelse Bruger
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +144,Cost Updated,Omkostninger Opdateret
-DocType: Employee,Date of Birth,Fødselsdato
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +82,Item {0} has already been returned,Element {0} er allerede blevet returneret
-DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** Regnskabsår ** repræsenterer et regnskabsår. Alle regnskabsposteringer og andre større transaktioner spores mod ** regnskabsår **.
-DocType: Opportunity,Customer / Lead Address,Kunde / Lead Adresse
-DocType: Production Order Operation,Actual Operation Time,Faktiske Operation Time
-DocType: Authorization Rule,Applicable To (User),Gælder for (Bruger)
-DocType: Purchase Taxes and Charges,Deduct,Fratrække
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +170,Job Description,Jobbeskrivelse
-DocType: Purchase Order Item,Qty as per Stock UOM,Antal pr Stock UOM
-apps/frappe/frappe/model/rename_doc.py +343,Please select a valid csv file with data,Vælg en gyldig csv fil med data
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +92,Coating,Belægning
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +126,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Specialtegn undtagen &quot;-&quot; &quot;.&quot;, &quot;#&quot;, og &quot;/&quot; ikke tilladt i navngivning serie"
-DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Hold styr på salgskampagner. Hold styr på Leads, Citater, Sales Order osv fra kampagner til at måle Return on Investment."
-DocType: Expense Claim,Approver,Godkender
-,SO Qty,SO Antal
-apps/erpnext/erpnext/accounts/doctype/account/account.py +155,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","Lagertilgang eksisterer mod lageret {0}, og derfor kan du ikke re-tildele eller ændre Warehouse"
-DocType: Appraisal,Calculate Total Score,Beregn Total Score
-DocType: Supplier Quotation,Manufacturing Manager,Produktion manager
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},Løbenummer {0} er under garanti op {1}
-apps/erpnext/erpnext/config/stock.py +69,Split Delivery Note into packages.,Split følgeseddel i pakker.
-apps/erpnext/erpnext/hooks.py +84,Shipments,Forsendelser
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +29,Dip molding,Dyppestøbning
-apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,Time Log status skal indsendes.
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +650,Setting Up,Opsætning
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,Row # ,Row #
-DocType: Purchase Invoice,In Words (Company Currency),I Words (Company Valuta)
-DocType: Pricing Rule,Supplier,Leverandør
-DocType: C-Form,Quarter,Kvarter
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +105,Miscellaneous Expenses,Diverse udgifter
-DocType: Global Defaults,Default Company,Standard Company
-apps/erpnext/erpnext/controllers/stock_controller.py +166,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,"Udgift eller Forskel konto er obligatorisk for Item {0}, da det påvirker den samlede lagerværdi"
-apps/erpnext/erpnext/controllers/accounts_controller.py +354,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","Kan ikke overbill for Item {0} i række {1} mere end {2}. For at tillade overfakturering, skal du indstille i Stock-indstillinger"
-DocType: Employee,Bank Name,Bank navn
-apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +27,-Above,-over
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +135,User {0} is disabled,Bruger {0} er deaktiveret
-DocType: Leave Application,Total Leave Days,Total feriedage
-DocType: Email Digest,Note: Email will not be sent to disabled users,Bemærk: E-mail vil ikke blive sendt til handicappede brugere
-apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +36,Select Company...,Vælg Company ...
-DocType: Leave Control Panel,Leave blank if considered for all departments,Lad stå tomt hvis det anses for alle afdelinger
-apps/erpnext/erpnext/config/hr.py +95,"Types of employment (permanent, contract, intern etc.).","Typer af beskæftigelse (permanent, kontrakt, praktikant osv)."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,{0} is mandatory for Item {1},{0} er obligatorisk for Item {1}
-DocType: Currency Exchange,From Currency,Fra Valuta
-DocType: DocField,Name,Navn
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +211,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Vælg tildelte beløb, Faktura Type og Fakturanummer i mindst én række"
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +104,Sales Order required for Item {0},Sales Order kræves for Item {0}
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +43,Amounts not reflected in system,"Beløb, der ikke afspejles i systemet"
-DocType: Purchase Invoice Item,Rate (Company Currency),Rate (Company Valuta)
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +40,Others,Andre
-DocType: POS Profile,Taxes and Charges,Skatter og Afgifter
-DocType: Item,"A Product or a Service that is bought, sold or kept in stock.","En vare eller tjenesteydelse, der købes, sælges eller opbevares på lager."
-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,Kan ikke vælge charge type som &#39;On Forrige Row Beløb&#39; eller &#39;On Forrige Row alt &quot;for første række
-apps/frappe/frappe/core/doctype/doctype/boilerplate/controller_list.html +31,Completed,Afsluttet
-DocType: Web Form,Select DocType,Vælg DocType
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +104,Broaching,Rømning
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +12,Banking,Banking
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +38,Please click on 'Generate Schedule' to get schedule,Klik på &quot;Generer Schedule &#39;for at få tidsplan
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +283,New Cost Center,Ny Cost center
-DocType: Bin,Ordered Quantity,Bestilt Mængde
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +397,"e.g. ""Build tools for builders""",fx &quot;Byg værktøjer til bygherrer&quot;
-DocType: Quality Inspection,In Process,I Process
-DocType: Authorization Rule,Itemwise Discount,Itemwise Discount
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +318,{0} against Sales Order {1},{0} mod salgsordre {1}
-DocType: Account,Fixed Asset,Fast Asset
-DocType: Time Log Batch,Total Billing Amount,Samlet Billing Beløb
-apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +47,Receivable Account,Tilgodehavende konto
-,Stock Balance,Stock Balance
-apps/erpnext/erpnext/config/selling.py +299,Sales Order to Payment,Sales Order til Betaling
-DocType: Expense Claim Detail,Expense Claim Detail,Expense krav Detail
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +271,Time Logs created:,Time Logs oprettet:
-DocType: Item,Weight UOM,Vægt UOM
-DocType: Employee,Blood Group,Blood Group
-DocType: Purchase Invoice Item,Page Break,Side Break
-DocType: Production Order Operation,Pending,Afventer
-DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,"Brugere, der kan godkende en bestemt medarbejders orlov applikationer"
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +50,Office Equipments,Kontor udstyr
-DocType: Purchase Invoice Item,Qty,Antal
-DocType: Fiscal Year,Companies,Virksomheder
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +24,Electronics,Elektronik
-DocType: Stock Settings,Raise Material Request when stock reaches re-order level,Hæv Materiale Request når bestanden når re-order-niveau
-apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +18,From Maintenance Schedule,Fra vedligeholdelsesplan
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +56,Full-time,Fuld tid
-DocType: Purchase Invoice,Contact Details,Kontaktoplysninger
-DocType: C-Form,Received Date,Modtaget Dato
-DocType: Delivery Note,"If you have created a standard template in Sales Taxes and Charges Template, select one and click on the button below.","Hvis du har oprettet en standard skabelon i Salg Skatter og Afgifter Skabelon, skal du vælge en, og klik på knappen nedenfor."
-DocType: Stock Entry,Total Incoming Value,Samlet Indgående Value
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Indkøb prisliste
-DocType: Offer Letter Term,Offer Term,Offer Term
-DocType: Quality Inspection,Quality Manager,Kvalitetschef
-DocType: Job Applicant,Job Opening,Job Åbning
-DocType: Payment Reconciliation,Payment Reconciliation,Betaling Afstemning
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +154,Please select Incharge Person's name,Vælg Incharge Person navn
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +51,Technology,Teknologi
-DocType: Offer Letter,Offer Letter,Tilbyd Letter
-apps/erpnext/erpnext/config/manufacturing.py +51,Generate Material Requests (MRP) and Production Orders.,Generer Materiale Anmodning (MRP) og produktionsordrer.
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +68,Total Invoiced Amt,Samlede fakturerede Amt
-DocType: Time Log,To Time,Til Time
-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.","Hvis du vil tilføje barn noder, udforske træet og klik på noden, hvorunder du ønsker at tilføje flere noder."
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +102,Credit To account must be a Payable account,Kredit til konto skal være en Betales konto
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +233,BOM recursion: {0} cannot be parent or child of {2},BOM rekursion: {0} kan ikke være forælder eller barn af {2}
-DocType: Production Order Operation,Completed Qty,Afsluttet Antal
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +116,"For {0}, only debit accounts can be linked against another credit entry",For {0} kan kun betalingskort konti knyttes mod en anden kredit post
-apps/erpnext/erpnext/stock/get_item_details.py +260,Price List {0} is disabled,Prisliste {0} er deaktiveret
-DocType: Manufacturing Settings,Allow Overtime,Tillad Overarbejde
-DocType: Stock Reconciliation Item,Current Valuation Rate,Aktuel Værdiansættelse Rate
-DocType: Item,Customer Item Codes,Kunde Item Koder
-DocType: Opportunity,Lost Reason,Tabt Årsag
-apps/erpnext/erpnext/config/accounts.py +68,Create Payment Entries against Orders or Invoices.,Opret Betaling Entries mod ordrer eller fakturaer.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +141,Welding,Svejsning
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +40,New Stock UOM is required,New Stock UOM kræves
-DocType: Quality Inspection,Sample Size,Sample Size
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +443,All items have already been invoiced,Alle elementer er allerede blevet faktureret
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',Angiv en gyldig &quot;Fra sag nr &#39;
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +287,Further cost centers can be made under Groups but entries can be made against non-Groups,Yderligere omkostninger centre kan foretages under Grupper men indtastninger kan foretages mod ikke-grupper
-DocType: Project,External,Ekstern
-DocType: Features Setup,Item Serial Nos,Vare Serial Nos
-apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,Brugere og tilladelser
-DocType: Branch,Branch,Branch
-apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,Trykning og Branding
-apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +66,No salary slip found for month:,Ingen lønseddel fundet for måned:
-DocType: Bin,Actual Quantity,Faktiske Mængde
-DocType: Shipping Rule,example: Next Day Shipping,eksempel: Næste dages levering
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,Løbenummer {0} ikke fundet
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +563,Your Customers,Dine kunder
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +27,Compression molding,Kompressionsstøbning
-DocType: Leave Block List Date,Block Date,Block Dato
-DocType: Sales Order,Not Delivered,Ikke leveret
-,Bank Clearance Summary,Bank Clearance Summary
-apps/erpnext/erpnext/config/setup.py +105,"Create and manage daily, weekly and monthly email digests.","Oprette og administrere de daglige, ugentlige og månedlige email fordøjer."
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code > Item Group > Brand,Item Code&gt; Vare Gruppe&gt; Brand
-DocType: Appraisal Goal,Appraisal Goal,Vurdering Goal
-DocType: Event,Friday,Fredag
-DocType: Time Log,Costing Amount,Koster Beløb
-DocType: Process Payroll,Submit Salary Slip,Indsend lønseddel
-DocType: Salary Structure,Monthly Earning & Deduction,Månedlige Earning &amp; Fradrag
-apps/erpnext/erpnext/controllers/selling_controller.py +157,Maxiumm discount for Item {0} is {1}%,Maxiumm rabat for Item {0} er {1}%
-apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,Import i bulk
-DocType: Sales Partner,Address & Contacts,Adresse &amp; Contacts
-DocType: SMS Log,Sender Name,Sender Name
-DocType: Page,Title,Titel
-apps/frappe/frappe/public/js/frappe/list/doclistview.js +418,Customize,Tilpas
-DocType: POS Profile,[Select],[Vælg]
-DocType: SMS Log,Sent To,Sendt Til
-apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +28,Make Sales Invoice,Make Sales Invoice
-DocType: Company,For Reference Only.,Kun til reference.
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +29,Invalid {0}: {1},Ugyldig {0}: {1}
-DocType: Sales Invoice Advance,Advance Amount,Advance Beløb
-DocType: Manufacturing Settings,Capacity Planning,Capacity Planning
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +49,'From Date' is required,'Fra dato' er nødvendig
-DocType: Journal Entry,Reference Number,Referencenummer
-DocType: Employee,Employment Details,Beskæftigelse Detaljer
-DocType: Employee,New Workplace,Ny Arbejdsplads
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +17,Set as Closed,Angiv som Lukket
-apps/erpnext/erpnext/stock/get_item_details.py +103,No Item with Barcode {0},Ingen Vare med Barcode {0}
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,Case No. ikke være 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,Hvis du har salgsteam og salg Partners (Channel Partners) de kan mærkes og vedligeholde deres bidrag i salget aktivitet
-DocType: Item,Show a slideshow at the top of the page,Vis et diasshow på toppen af ​​siden
-DocType: Item,"Allow in Sales Order of type ""Service""",Tillad i kundeordre af typen &quot;Service&quot;
-apps/erpnext/erpnext/setup/doctype/company/company.py +80,Stores,Butikker
-DocType: Time Log,Projects Manager,Projekter manager
-DocType: Serial No,Delivery Time,Leveringstid
-apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Aldring Baseret på
-DocType: Item,End of Life,End of Life
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +41,Travel,Rejser
-DocType: Leave Block List,Allow Users,Tillad brugere
-DocType: Sales Invoice,Recurring,Tilbagevendende
-DocType: Cost Center,Track separate Income and Expense for product verticals or divisions.,Spor separat indtægter og omkostninger for produkt- vertikaler eller afdelinger.
-DocType: Rename Tool,Rename Tool,Omdøb Tool
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,Opdatering Omkostninger
-DocType: Item Reorder,Item Reorder,Item Genbestil
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +489,Transfer Material,Transfer Materiale
-DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Angiv operationer, driftsomkostninger og giver en unik Operation nej til dine operationer."
-DocType: Purchase Invoice,Price List Currency,Pris List Valuta
-DocType: Naming Series,User must always select,Brugeren skal altid vælge
-DocType: Stock Settings,Allow Negative Stock,Tillad Negativ Stock
-DocType: Installation Note,Installation Note,Installation Bemærk
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +541,Add Taxes,Tilføj Skatter
-,Financial Analytics,Finansielle Analytics
-DocType: Quality Inspection,Verified By,Verified by
-DocType: Address,Subsidiary,Datterselskab
-apps/erpnext/erpnext/setup/doctype/company/company.py +55,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","Kan ikke ændre virksomhedens standard valuta, fordi der er eksisterende transaktioner. Transaktioner skal annulleres for at ændre standard valuta."
-DocType: Quality Inspection,Purchase Receipt No,Kvittering Nej
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,Earnest Money
-DocType: System Settings,In Hours,I Hours
-DocType: Process Payroll,Create Salary Slip,Opret lønseddel
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Expected balance as per bank,Forventet balance pr bank
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +115,Buffing,Polering
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Source of Funds (Liabilities),Finansieringskilde (Passiver)
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +347,Quantity in row {0} ({1}) must be same as manufactured quantity {2},"Mængde i række {0} ({1}), skal være det samme som fremstillede mængde {2}"
-DocType: Appraisal,Employee,Medarbejder
-apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +10,Import Email From,Import Email Fra
-DocType: Features Setup,After Sale Installations,Efter salg Installationer
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,{0} {1} is fully billed,{0} {1} er fuldt faktureret
-DocType: Workstation Working Hour,End Time,End Time
-apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,Standard kontraktvilkår for Salg eller Indkøb.
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +75,Group by Voucher,Gruppe af Voucher
-apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Nødvendig On
-DocType: Sales Invoice,Mass Mailing,Mass Mailing
-DocType: Page,Standard,Standard
-DocType: Rename Tool,File to Rename,Fil til Omdøb
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +176,Purchse Order number required for Item {0},Purchse Ordrenummer kræves for Item {0}
-apps/erpnext/erpnext/controllers/buying_controller.py +245,Specified BOM {0} does not exist for Item {1},Specificeret BOM {0} findes ikke til konto {1}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +202,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,"Vedligeholdelsesplan {0} skal annulleres, før den annullerer denne Sales Order"
-apps/frappe/frappe/desk/page/backups/backups.html +13,Size,Størrelse
-DocType: Notification Control,Expense Claim Approved,Expense krav Godkendt
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +113,Pharmaceutical,Farmaceutiske
-apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,Omkostninger ved Købte varer
-DocType: Selling Settings,Sales Order Required,Sales Order Påkrævet
-apps/erpnext/erpnext/crm/doctype/lead/lead.js +30,Create Customer,Opret kunde
-DocType: Purchase Invoice,Credit To,Credit Til
-DocType: Employee Education,Post Graduate,Post Graduate
-DocType: Maintenance Schedule Detail,Maintenance Schedule Detail,Vedligeholdelse Skema Detail
-DocType: Quality Inspection Reading,Reading 9,Reading 9
-DocType: Supplier,Is Frozen,Er Frozen
-DocType: Buying Settings,Buying Settings,Opkøb Indstillinger
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +122,Mass finishing,Masse efterbehandling
-DocType: Stock Entry Detail,BOM No. for a Finished Good Item,BOM No. for en Færdig god Item
-DocType: Upload Attendance,Attendance To Date,Fremmøde til dato
-apps/erpnext/erpnext/config/selling.py +158,Setup incoming server for sales email id. (e.g. sales@example.com),Opsætning indgående server til salg email id. (F.eks sales@example.com)
-DocType: Warranty Claim,Raised By,Rejst af
-DocType: Payment Tool,Payment Account,Betaling konto
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +713,Please specify Company to proceed,Angiv venligst Company for at fortsætte
-apps/frappe/frappe/public/js/frappe/model/indicator.js +30,Draft,Udkast
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +46,Compensatory Off,Kompenserende Off
-DocType: Quality Inspection Reading,Accepted,Accepteret
-DocType: User,Female,Kvinde
-apps/erpnext/erpnext/setup/doctype/company/company.js +24,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,"Kontroller, at du virkelig ønsker at slette alle transaktioner for dette selskab. Dine stamdata vil forblive som den er. Denne handling kan ikke fortrydes."
-DocType: Print Settings,Modern,Moderne
-DocType: Communication,Replied,Svarede
-DocType: Payment Tool,Total Payment Amount,Samlet Betaling Beløb
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +145,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) kan ikke være større end planlagt antal ({2}) på produktionsordre {3}
-DocType: Shipping Rule,Shipping Rule Label,Forsendelse Rule Label
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +209,Raw Materials cannot be blank.,Raw Materials kan ikke være tom.
-DocType: Newsletter,Test,Prøve
-apps/erpnext/erpnext/stock/doctype/item/item.py +364,"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'","Da der er eksisterende lagertransaktioner til denne vare, \ du ikke kan ændre værdierne af &quot;Har Serial Nej &#39;,&#39; Har Batch Nej &#39;,&#39; Er Stock Item&quot; og &quot;værdiansættelsesmetode &#39;"
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +92,You can not change rate if BOM mentioned agianst any item,"Du kan ikke ændre kurs, hvis BOM nævnt agianst ethvert element"
-DocType: Employee,Previous Work Experience,Tidligere erhvervserfaring
 DocType: Stock Entry,For Quantity,For Mængde
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +157,Please enter Planned Qty for Item {0} at row {1},Indtast venligst Planned Antal for Item {0} på rækken {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +211,{0} {1} is not submitted,{0} {1} er ikke indsendt
-apps/erpnext/erpnext/config/stock.py +18,Requests for items.,Anmodning om.
-DocType: Production Planning Tool,Separate production order will be created for each finished good item.,"Vil blive oprettet separat produktion, for hver færdigvare god element."
-DocType: Purchase Invoice,Terms and Conditions1,Vilkår og forhold1
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +18,Complete Setup,Komplet opsætning
-DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","Kontering frosset op til denne dato, kan ingen gøre / ændre post undtagen rolle angivet nedenfor."
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +121,Please save the document before generating maintenance schedule,"Gem venligst dokumentet, før generere vedligeholdelsesplan"
-apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,Projekt status
-DocType: UOM,Check this to disallow fractions. (for Nos),Markér dette for at forbyde fraktioner. (For NOS)
-apps/erpnext/erpnext/config/crm.py +96,Newsletter Mailing List,Nyhedsbrev Mailing List
-DocType: Delivery Note,Transporter Name,Transporter Navn
-DocType: Contact,Enter department to which this Contact belongs,"Indtast afdeling, som denne Kontakt hører"
-apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Absent,Total Fraværende
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +746,Item or Warehouse for row {0} does not match Material Request,Element eller Warehouse for række {0} matcher ikke Materiale Request
-apps/erpnext/erpnext/config/stock.py +109,Unit of Measure,Måleenhed
-DocType: Fiscal Year,Year End Date,År Slutdato
-DocType: Task Depends On,Task Depends On,Task Afhænger On
-DocType: Lead,Opportunity,Mulighed
-DocType: Salary Structure Earning,Salary Structure Earning,Løn Struktur Earning
-,Completed Production Orders,Afsluttede produktionsordrer
-DocType: Operation,Default Workstation,Standard Workstation
-DocType: Notification Control,Expense Claim Approved Message,Expense krav Godkendt Message
+apps/erpnext/erpnext/controllers/buying_controller.py +130,Please select BOM in BOM field for Item {0},Vælg BOM i BOM vilkår for Item {0}
+DocType: Warehouse,A logical Warehouse against which stock entries are made.,Et logisk varelager hvor lagerændringer foretages.
+apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +66,Payable Account,Betales konto
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +130,No records found in the Invoice table,Ingen resultater i Invoice tabellen
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Voucher No, if grouped by Voucher","Kan ikke filtrere baseret på blad nr, hvis grupperet efter Voucher"
+DocType: Leave Type,Include holidays within leaves as leaves,Medtag helligdage inden blade som blade
+DocType: Item Attribute Value,Item Attribute Value,Item Attribut Værdi
+apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},Sum af point for alle mål skal være 100. Det er {0}
+DocType: Production Order,Item To Manufacture,Item Til Fremstilling
+DocType: Purchase Invoice,Price List Currency,Pris List Valuta
+DocType: Address,Subsidiary,Datterselskab
+DocType: Contact Us Settings,Address Title,Adresse Titel
+DocType: Purchase Invoice Item,Qty,Antal
+apps/erpnext/erpnext/stock/get_item_details.py +262,Price List not selected,Prisliste ikke valgt
+DocType: Company History,Year,År
+DocType: Sales Order,% of materials delivered against this Sales Order,% Af materialer leveret mod denne Sales Order
+DocType: Journal Entry,Write Off,Skriv Off
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +446,All items have already been invoiced,Alle elementer er allerede blevet faktureret
+DocType: Buying Settings,Purchase Receipt Required,Kvittering Nødvendig
+apps/erpnext/erpnext/config/hr.py +210,Leave Management,Lad Management
+DocType: BOM,Materials,Materialer
+DocType: Payment Tool,Reference No,Referencenummer
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +62,Please enter Purchase Receipt first,Indtast venligst kvittering først
+DocType: Sales Partner,Distributor,Distributør
+apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,Land klogt standardadresse Skabeloner
+apps/erpnext/erpnext/utilities/transaction_base.py +128,Quantity cannot be a fraction in row {0},Mængde kan ikke være en del i række {0}
+DocType: Standard Reply,Owner,Ejer
+DocType: Task,Expected Time (in hours),Forventet tid (i timer)
+apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +38,Cannot set authorization on basis of Discount for {0},Kan ikke sætte godkendelse på grundlag af Rabat for {0}
+DocType: Project,Total Billing Amount (via Time Logs),Total Billing Beløb (via Time Logs)
+apps/erpnext/erpnext/config/hr.py +155,Types of Expense Claim.,Typer af Expense krav.
+DocType: Upload Attendance,Attendance From Date,Fremmøde Fra dato
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,Forsvar
+DocType: Employee,Family Background,Familie Baggrund
+DocType: Sales Order,Partly Billed,Delvist Billed
+DocType: Stock Reconciliation Item,Current Valuation Rate,Aktuel Værdiansættelse Rate
+DocType: About Us Settings,Website,Websted
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +43,Publishing,Publishing
 DocType: Email Digest,How frequently?,Hvor ofte?
-DocType: Purchase Receipt,Get Current Stock,Få Aktuel Stock
-apps/erpnext/erpnext/config/manufacturing.py +63,Tree of Bill of Materials,Tree of Bill of Materials
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +198,Maintenance start date can not be before delivery date for Serial No {0},Vedligeholdelse startdato kan ikke være før leveringsdato for Serial Nej {0}
-DocType: Production Order,Actual End Date,Faktiske Slutdato
-DocType: Authorization Rule,Applicable To (Role),Gælder for (Rolle)
-DocType: Stock Entry,Purpose,Formål
-DocType: Item,Will also apply for variants unless overrridden,"Vil også gælde for varianter, medmindre overrridden"
-DocType: Purchase Invoice,Advances,Forskud
-apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +32,Approving User cannot be same as user the rule is Applicable To,Godkendelse Brugeren kan ikke være det samme som brugeren er reglen gælder for
-DocType: SMS Log,No of Requested SMS,Ingen af ​​Anmodet SMS
-DocType: Campaign,Campaign-.####,Kampagne -. ####
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +55,Piercing,Piercing
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +117,Contract End Date must be greater than Date of Joining,Kontrakt Slutdato skal være større end Dato for Sammenføjning
-DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,"En tredjepart, distributør/forhandler/sælger/affiliate/butik der, der sælger selskabernes varer/tjenesteydelser mod provision."
-DocType: Customer Group,Has Child Node,Har Child Node
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{0} against Purchase Order {1},{0} mod indkøbsordre {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,"Vedligeholdelsesplan {0} skal annulleres, før den annullerer denne Sales Order"
+DocType: Purchase Order,% Received,% Modtaget
+DocType: Workstation Working Hour,Workstation Working Hour,Workstation Working Hour
+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.,At spore elementer ved hjælp af stregkode. Du vil være i stand til at indtaste poster i følgeseddel og salgsfaktura ved at scanne stregkoden på varen.
+DocType: Time Log Batch Detail,Time Log Batch Detail,Time Log Batch Detail
+DocType: SMS Center,Send SMS,Send SMS
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +293,My Orders,Mine ordrer
+DocType: Item,Default BOM,Standard BOM
+DocType: Sales Order,To Deliver and Bill,At levere og Bill
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +53,Plant and Machinery,Anlæg og maskiner
+DocType: Warehouse,Warehouse Name,Warehouse Navn
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},"'Opdater lager' kan ikke markeres, varerne ikke leveres via {0}"
+apps/erpnext/erpnext/public/js/setup_wizard.js +158,The name of your company for which you are setting up this system.,"Navnet på din virksomhed, som du oprette dette system."
+apps/erpnext/erpnext/public/js/pos/pos.js +91,Price List not found or disabled,Prisliste ikke fundet eller handicappede
+apps/erpnext/erpnext/config/crm.py +48,Send mass SMS to your contacts,Send masse SMS til dine kontakter
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +382,Item table can not be blank,Item tabel kan ikke være tom
+DocType: Material Request Item,Quantity and Warehouse,Mængde og Warehouse
+DocType: Company,Default Receivable Account,Standard Tilgodehavende konto
+apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +28,Make Sales Invoice,Make Sales Invoice
+apps/frappe/frappe/config/desk.py +7,Tools,Værktøj
+DocType: Appraisal Goal,Key Responsibility Area,Key Responsibility Area
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +182,Delivery Notes {0} must be cancelled before cancelling this Sales Order,"Følgesedler {0} skal annulleres, før den annullerer denne Sales Order"
+DocType: File,Lft,LFT
+apps/erpnext/erpnext/setup/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,Dette er et eksempel website auto-genereret fra ERPNext
+DocType: Purchase Order,To Receive,At Modtage
+apps/erpnext/erpnext/config/stock.py +125,Price List master.,Pris List mester.
+DocType: Quality Inspection,Quality Manager,Kvalitetschef
+apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},Workstation er lukket på følgende datoer som pr Holiday List: {0}
+,Issued Items Against Production Order,Udstedte Varer Against produktionsordre
+DocType: Production Planning Tool,Get Items From Sales Orders,Få elementer fra salgsordrer
+apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +62,Total Revenue,Total Revenue
+apps/erpnext/erpnext/config/manufacturing.py +14,Bill of Material,Bill of Material
+DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,"Indtast poster og planlagt qty, som du ønsker at hæve produktionsordrer eller downloade råvarer til analyse."
+DocType: Shipping Rule,Shipping Rule Conditions,Forsendelse Regel Betingelser
+apps/erpnext/erpnext/public/js/setup_wizard.js +101,The First User: You,Den første bruger: Du
+apps/erpnext/erpnext/accounts/report/sales_register/sales_register.py +66,Customer Id,Kunde-id
+DocType: Salary Slip,Deduction,Fradrag
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +120,Standard Selling,Standard Selling
+DocType: Packing Slip,Package Weight Details,Pakke vægt detaljer
+DocType: Employee,Held On,Held On
+DocType: Address,Personal,Personlig
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,Årsag til at miste
+apps/erpnext/erpnext/config/hr.py +48,Opening for a Job.,Åbning for et job.
+apps/erpnext/erpnext/setup/doctype/company/company.js +41,Wrong Password,Forkert Adgangskode
+DocType: Payment Reconciliation,Reconcile,Forene
+DocType: Sales Invoice Item,Delivery Note,Følgeseddel
+DocType: Sales Person,Name and Employee ID,Navn og Medarbejder ID
+,Requested Items To Be Ordered,Anmodet Varer skal bestilles
+DocType: Supplier,Supplier of Goods or Services.,Leverandør af varer eller tjenesteydelser.
+apps/erpnext/erpnext/controllers/stock_controller.py +71,No accounting entries for the following warehouses,Ingen bogføring for følgende lagre
+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.,Klik på &#39;Make Salg Faktura&#39; knappen for at oprette en ny Sales Invoice.
+DocType: Payment Tool Detail,Against Voucher No,Mod blad nr
+DocType: Async Task,System Manager,System Manager
+DocType: Maintenance Visit,Completion Status,Afslutning status
+apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Your email address,Din e-mail-adresse
+apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,En Kunden eksisterer med samme navn
+DocType: Project,Project Type,Projekt type
+DocType: Communication,Series,Series
+DocType: Territory,Classification of Customers by region,Klassifikation af kunder efter region
+DocType: Production Planning Tool,Filter based on item,Filter baseret på emne
+DocType: Offer Letter,Offer Letter,Tilbyd Letter
+DocType: Project,External,Ekstern
+DocType: Workstation,Workstation Name,Workstation Navn
+DocType: Employee,Emergency Phone,Emergency Phone
+DocType: Journal Entry,Write Off Amount,Skriv Off Beløb
+DocType: Employee,Educational Qualification,Pædagogisk Kvalifikation
+DocType: DocField,Name,Navn
+DocType: Workstation Working Hour,Start Time,Start Time
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +139,Item Group not mentioned in item master for item {0},Item Group ikke er nævnt i punkt master for element {0}
+DocType: Item Reorder,Material Request Type,Materiale Request Type
+apps/erpnext/erpnext/config/crm.py +17,Customer database.,Kundedatabase.
+DocType: POS Profile,Cash/Bank Account,Kontant / Bankkonto
+DocType: Sales Invoice,Packed Items,Pakket Varer
+DocType: Employee,Health Concerns,Sundhedsmæssige betænkeligheder
+apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +3,View Subscribers,Se Abonnenter
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +458,Make Purchase Order,Make indkøbsordre
+DocType: Features Setup,"Available in BOM, Delivery Note, Purchase Invoice, Production Order, Purchase Order, Purchase Receipt, Sales Invoice, Sales Order, Stock Entry, Timesheet","Fås i BOM, følgeseddel, købsfaktura, produktionsordre, Indkøbsordre, kvittering, Sales Invoice, Sales Order, Stock indtastning, Timesheet"
+apps/erpnext/erpnext/setup/doctype/company/company.py +80,Stores,Butikker
+DocType: Account,Balance Sheet,Balance
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +82,Account {0} does not belong to Company {1},Konto {0} tilhører ikke virksomheden {1}
+DocType: Production Planning Tool,Separate production order will be created for each finished good item.,"Vil blive oprettet separat produktion, for hver færdigvare god element."
+apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% Complete
+DocType: Stock Entry,From BOM,Fra BOM
+DocType: Purchase Order Item,UOM Conversion Factor,UOM Conversion Factor
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","Indtast statiske url parametre her (F.eks. Afsender = ERPNext, brugernavn = ERPNext, password = 1234 mm)"
-apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,{0} {1} ikke i noget aktiv regnskabsår. For flere detaljer tjek {2}.
-apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,Dette er et eksempel website auto-genereret fra ERPNext
-apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +37,Ageing Range 1,Ageing Range 1
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +110,Photochemical machining,Fotokemisk bearbejdning
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +116,"For {0}, only debit accounts can be linked against another credit entry",For {0} kan kun betalingskort konti knyttes mod en anden kredit post
+DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),Bruttovægt af pakken. Normalt nettovægt + emballagemateriale vægt. (Til print)
+apps/frappe/frappe/desk/moduleview.py +61,Documents,Dokumenter
+DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,"Rolle, som får lov til at indsende transaktioner, der overstiger kredit grænser."
+DocType: Hub Settings,Seller Country,Sælger Land
+DocType: Account,Old Parent,Gammel Parent
+DocType: Purchase Order,Stopped,Stoppet
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +212,Birthday Reminder for {0},Birthday Reminder for {0}
+DocType: Shipping Rule,example: Next Day Shipping,eksempel: Næste dages levering
+DocType: Packing Slip,From Package No.,Fra pakken No.
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +178,Warehouse required for stock Item {0},Warehouse kræves for lager Vare {0}
+DocType: Item,Show a slideshow at the top of the page,Vis et diasshow på toppen af ​​siden
+apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +136,Thank you for your interest in subscribing to our updates,Tak for din interesse i at abonnere på vores opdateringer
+DocType: Account,Warehouse,Warehouse
+DocType: Pricing Rule,Valid From,Gyldig fra
+DocType: Comment,Unsubscribed,Afmeldt
+DocType: Pricing Rule,Discount Percentage,Discount Procent
+apps/erpnext/erpnext/support/doctype/issue/issue.py +58,My Issues,Mine Issues
+DocType: Buying Settings,Supplier Naming By,Leverandør Navngivning Af
+DocType: Purchase Invoice Item,Conversion Factor,Konvertering Factor
+DocType: Sales Invoice,Total Commission,Samlet Kommissionen
+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.,Bogføring kan foretages mod blad noder. Poster mod grupper er ikke tilladt.
+DocType: ToDo,Medium,Medium
+apps/erpnext/erpnext/stock/stock_ledger.py +405,"Purchase rate for item: {0} not found, which is required to book accounting entry (expense). Please mention item price against a buying price list.","Købskurs for vare: {0} ikke fundet, som er nødvendig for at booke regnskabsmæssig post (udgift). Nævne venligst vare pris mod en købskurs listen."
+apps/erpnext/erpnext/public/js/setup_wizard.js +256,"Add users to your organization, other than yourself","Tilføj brugere til din organisation, andre end dig selv"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +473,Stock Entry {0} is not submitted,Stock indtastning {0} er ikke indsendt
+DocType: Purchase Invoice,Terms and Conditions1,Vilkår og forhold1
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +320,{0} against Sales Order {1},{0} mod salgsordre {1}
+apps/erpnext/erpnext/config/stock.py +95,Default settings for stock transactions.,Standardindstillinger for lager transaktioner.
+DocType: Quality Inspection Reading,Reading 2,Reading 2
+,Lead Details,Bly Detaljer
+DocType: Company,Domain,Domæne
+DocType: Employee,Internal Work History,Intern Arbejde Historie
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,Vælg Kategori først
+DocType: Serial No,Incoming Rate,Indgående Rate
+apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Projekt-id
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +75,Show Stock Entries,Vis Stock Entries
+DocType: Lead,Address Desc,Adresse Desc
+DocType: Journal Entry Account,If Income or Expense,Hvis indtægter og omkostninger
+DocType: Activity Cost,Activity Cost,Aktivitet Omkostninger
+apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +32,Provisional Profit / Loss (Credit),Foreløbig Profit / Loss (Credit)
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +424,Production Order {0} must be submitted,Produktionsordre {0} skal indsendes
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +36,Motion Picture & Video,Motion Picture &amp; Video
+DocType: Production Planning Tool,Create Material Requests,Opret Materiale Anmodning
+apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +37,Budget cannot be assigned against Group Account {0},Budget kan ikke tildeles mod Group konto {0}
+DocType: Expense Claim Detail,Expense Claim Detail,Expense krav Detail
+DocType: Company,Default Cash Account,Standard Kontant konto
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,"Forskellige UOM for elementer vil føre til forkert (Total) Vægt værdi. Sørg for, at Nettovægt for hvert punkt er i den samme UOM."
+DocType: Supplier Quotation Item,Material Request No,Materiale Request Nej
+DocType: Time Log,Billable,Faktureres
+apps/erpnext/erpnext/stock/doctype/item/item.js +185,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Vægt er nævnt, \ nVenligst nævne &quot;Weight UOM&quot; for"
+DocType: Salary Structure Deduction,Reduce Deduction for Leave Without Pay (LWP),Reducer Fradrag for Leave uden løn (LWP)
+apps/erpnext/erpnext/controllers/buying_controller.py +126,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Leverandør Warehouse obligatorisk for underentreprise kvittering
+DocType: Issue,First Responded On,Først svarede den
+apps/erpnext/erpnext/templates/includes/cart.js +137,Something went wrong!,Noget gik galt!
+DocType: Job Applicant,Job Opening,Job Åbning
+apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +17,To Datetime,Til datotid
+DocType: Appraisal,Goals,Mål
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +9,Activity Log:,Aktivitet Log:
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,Extra Large,Extra Large
+apps/erpnext/erpnext/config/hr.py +95,"Types of employment (permanent, contract, intern etc.).","Typer af beskæftigelse (permanent, kontrakt, praktikant osv)."
+DocType: Leave Control Panel,Leave blank if considered for all branches,Lad stå tomt hvis det anses for alle brancher
+DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,Item Quality Inspection Parameter
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Apprentice,Lærling
+DocType: POS Profile,Terms and Conditions,Betingelser
+apps/frappe/frappe/public/js/frappe/form/toolbar.js +165,New {0},Ny {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +157,Please enter Planned Qty for Item {0} at row {1},Indtast venligst Planned Antal for Item {0} på rækken {1}
+DocType: Item,Has Serial No,Har Løbenummer
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +120,You can not enter current voucher in 'Against Journal Entry' column,Du kan ikke indtaste aktuelle kupon i &quot;Mod Kassekladde &#39;kolonne
+apps/frappe/frappe/public/js/frappe/views/reports/grid_report.js +305,From Date must be before To Date,Fra dato skal være før til dato
+DocType: Purchase Taxes and Charges,On Net Total,On Net Total
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","For at indstille dette regnskabsår som standard, skal du klikke på &#39;Vælg som standard&#39;"
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +50,Office Equipments,Kontor udstyr
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +18,Browse BOM,Gennemse BOM
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +181,Credit limit has been crossed for customer {0} {1}/{2},Credit grænsen er krydset for kunde {0} {1} / {2}
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,Fjernsyn
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +164,Stopped order cannot be cancelled. Unstop to cancel.,Stoppet ordre kan ikke annulleres. Unstop at annullere.
+DocType: Company,Services,Tjenester
+DocType: Journal Entry,Make Difference Entry,Make Difference indtastning
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},Stock balance i Batch {0} vil blive negativ {1} for Item {2} på Warehouse {3}
+DocType: Delivery Note,Time at which items were delivered from warehouse,"Tidspunkt, hvor varerne blev leveret fra lageret"
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +40,Others,Andre
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +167,{0} ({1}) must have role 'Leave Approver',"{0} ({1}), skal have rollen 'Godkendelse af fravær'"
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +148,Series Updated Successfully,Series opdateret
+DocType: Cost Center,Track separate Income and Expense for product verticals or divisions.,Spor separat indtægter og omkostninger for produkt- vertikaler eller afdelinger.
+DocType: Expense Claim Detail,Expense Claim Type,Expense krav Type
+apps/erpnext/erpnext/public/js/pos/pos.js +402,Payment cannot be made for empty cart,Betaling kan ikke ske for tomme vogn
+DocType: Address,City/Town,By / Town
+DocType: Material Request Item,Material Request Item,Materiale Request Vare
+DocType: Material Request,Material Transfer,Materiale Transfer
+,Supplier Addresses and Contacts,Leverandør Adresser og kontaktpersoner
+DocType: Item,Re-Order Qty,Re-prisen evt
+DocType: Payment Tool,Find Invoices to Match,Find fakturaer til Match
+apps/erpnext/erpnext/accounts/utils.py +195,Allocated amount can not greater than unadusted amount,Tildelte beløb kan ikke er større end unadusted beløb
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,Financial Services
+,Payment Period Based On Invoice Date,Betaling Periode Baseret på Fakturadato
+apps/erpnext/erpnext/config/selling.py +148,Rules for applying pricing and discount.,Regler for anvendelse af priser og rabat.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +59,Account head {0} created,Konto head {0} oprettet
+DocType: Account,Round Off,Afrunde
+DocType: Leave Application,Leave Approver Name,Lad Godkender Navn
+apps/erpnext/erpnext/public/js/setup_wizard.js +153,Financial Year Start Date,Regnskabsår Startdato
+DocType: Account,Credit,Credit
+DocType: Sales Invoice,Is POS,Er POS
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +59,Total Achieved,Total Opnået
+apps/erpnext/erpnext/config/accounts.py +107,Default settings for accounting transactions.,Standardindstillinger regnskabsmæssige transaktioner.
+DocType: Item,Customer Item Codes,Kunde Item Koder
+DocType: Project Task,Project Task,Project Task
+apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},Kan godkendes af {0}
+DocType: Purchase Invoice,Grand Total (Company Currency),Grand Total (Company Valuta)
+DocType: Purchase Invoice,Mobile No,Mobile Ingen
+DocType: Account,Debit,Betalingskort
+DocType: BOM Item,Scrap %,Skrot%
+DocType: Payment Tool,Payment Tool,Betaling Tool
+DocType: Event,Tuesday,Tirsdag
+apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +43,Scheduled to send to {0} recipients,Planlagt at sende til {0} modtagere
+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,'Dage siden sidste ordre' skal være større end eller lig med nul
+,Stock Projected Qty,Stock Forventet Antal
+DocType: Supplier,Stock Manager,Stock manager
+apps/erpnext/erpnext/public/js/pos/pos.js +528,Please select Price List,Vælg venligst prislisten
+apps/erpnext/erpnext/accounts/utils.py +53,{0} '{1}' not in Fiscal Year {2},{0} &#39;{1}&#39; ikke i regnskabsåret {2}
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +246,"Multiple Price Rule exists with same criteria, please resolve \
+			conflict by assigning priority. Price Rules: {0}","Multiple Pris Regel eksisterer med samme kriterier, skal du løse \ konflikten ved at tildele prioritet. Pris Regler: {0}"
+DocType: BOM,Manufacturing User,Manufacturing Bruger
+DocType: Production Planning Tool,Production Orders,Produktionsordrer
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +189,Opening Balance Equity,Åbning Balance Egenkapital
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +204,New Leave Application,Ny Leave Application
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,Ingen varer at pakke
+apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +32,Contribution %,Bidrag%
+DocType: Purchase Receipt Item,Rejected Quantity,Afvist Mængde
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +111,Row #{0}: Please specify Serial No for Item {1},Row # {0}: Angiv Serial Nej for Item {1}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +114,Expense Claim is pending approval. Only the Expense Approver can update status.,Expense krav afventer godkendelse. Kun Expense Godkender kan opdatere status.
+apps/frappe/frappe/core/doctype/user/user.js +130,Loading,Loading
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},Udstationering tidsstempel skal være efter {0}
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +105,Please select a csv file,Vælg en CSV-fil
+DocType: Sales Invoice Item,Customer's Item Code,Kundens Item Code
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +227,Closing (Cr),Lukning (Cr)
+DocType: Sales Invoice,Customer Name,Customer Name
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Secretary,Sekretær
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +144,Cost Updated,Omkostninger Opdateret
+DocType: BOM Operation,Operation Description,Operation Beskrivelse
+DocType: Sales Person,Sales Person Name,Salg Person Name
+apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Consumed,Forbrugt
+apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +74,Please select month and year,Vælg måned og år
+DocType: Process Payroll,Select Employees,Vælg Medarbejdere
+,Sales Person Target Variance Item Group-Wise,Salg Person Target Variance Item Group-Wise
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +379,Item Code required at Row No {0},Item Code kræves på Row Nej {0}
+DocType: Item,Allow over delivery or receipt upto this percent,Tillad løbet levering eller modtagelse op denne procent
+apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,Til dato kan ikke være før fra dato
+DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),Total Skatter og Afgifter (Company valuta)
+,Project wise Stock Tracking,Projekt klogt Stock Tracking
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +37,"Selling must be checked, if Applicable For is selected as {0}","Selling skal kontrolleres, om nødvendigt er valgt som {0}"
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +112,Hardware,Hardware
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +68,Gross Profit %,Gross Profit%
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +213,Optional. This setting will be used to filter in various transactions.,Valgfri. Denne indstilling vil blive brugt til at filtrere i forskellige transaktioner.
+DocType: Features Setup,Item Batch Nos,Item Batch nr
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +44,Charges are updated in Purchase Receipt against each item,Afgifter er opdateret i kvittering mod hvert punkt
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +62,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Sanktioneret Beløb kan ikke være større end krav Beløb i Row {0}.
+DocType: Journal Entry,Bill No,Bill Ingen
+apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,Gentag Kunde Omsætning
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +323,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},Vare {0} ikke fundet i &quot;Raw Materials Leveres &#39;bord i Indkøbsordre {1}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Researcher,Forsker
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +140,Valuation type charges can not marked as Inclusive,Værdiansættelse typen omkostninger ikke er markeret som Inclusive
+DocType: BOM,Exploded_items,Exploded_items
+DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,Vælg Månedlig Distribution til ujævnt distribuere mål på tværs måneder.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +41,Account {0}: Parent account {1} does not exist,Konto {0}: Forældre-konto {1} findes ikke
+DocType: Workstation,Wages per hour,Lønningerne i timen
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +62,Total Variance,Samlet Varians
+DocType: Time Log Batch,Total Hours,Total Hours
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +494,From Purchase Receipt,Fra kvittering
+apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,Ingen medarbejder fundet
+DocType: Account,Balance must be,Balance skal være
+DocType: Issue,Raised By (Email),Rejst af (E-mail)
+DocType: Supplier Quotation,Manufacturing Manager,Produktion manager
+DocType: Cost Center,Cost Center,Cost center
+apps/erpnext/erpnext/templates/form_grid/item_grid.html +72,Discount,Rabat
+DocType: Purchase Order Item,Supplier Part Number,Leverandør Part Number
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +133,Wire Transfer,Bankoverførsel
+DocType: Item,Default Warehouse,Standard Warehouse
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +88,No Permission,Ingen Tilladelse
+,Invoiced Amount (Exculsive Tax),Faktureret beløb (exculsive Tax)
+apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +68,Total Order Value,Samlet ordreværdi
+DocType: Opportunity,With Items,Med Varer
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +37,Campaign Name is required,Kampagne navn er påkrævet
+DocType: DocField,Currency,Valuta
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Designer,Designer
+DocType: Employee,Emergency Contact,Emergency Kontakt
+apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +33,Please select weekly off day,Vælg ugentlige off dag
+DocType: Offer Letter Term,Offer Letter Term,Tilbyd Letter Term
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,Venture Capital
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +26,`Freeze Stocks Older Than` should be smaller than %d days.,`Frys lager ældre end` skal være mindre end %d dage.
+DocType: Industry Type,Industry Type,Industri Type
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +37,Pricing Rules are further filtered based on quantity.,Priser Regler er yderligere filtreret baseret på mængde.
+apps/erpnext/erpnext/config/manufacturing.py +56,Replace Item / BOM in all BOMs,Udskift Item / BOM i alle styklister
+DocType: DocField,Description,Beskrivelse
+DocType: Stock Settings,Freeze Stock Entries,Frys Stock Entries
+DocType: Account,Stock Adjustment,Stock Justering
+apps/erpnext/erpnext/public/js/setup_wizard.js +357,Group,Gruppe
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +138,"Serialized Item {0} cannot be updated \
+					using Stock Reconciliation",Føljeton Item {0} kan ikke opdateres \ hjælp Stock Afstemning
+DocType: Delivery Note,Vehicle Dispatch Date,Køretøj Dispatch Dato
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +186,Dividends Paid,Betalt udbytte
+DocType: Sales Invoice Item,Available Batch Qty at Warehouse,Tilgængelig Batch Antal på Warehouse
+DocType: Lead,Suggestions,Forslag
+DocType: Opportunity,Your sales person who will contact the customer in future,"Dit salg person, som vil kontakte kunden i fremtiden"
+DocType: ToDo,Low,Lav
+DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,"En tredjepart, distributør/forhandler/sælger/affiliate/butik der, der sælger selskabernes varer/tjenesteydelser mod provision."
+DocType: Monthly Distribution,Monthly Distribution Percentages,Månedlige Distribution Procenter
+,Delivery Note Trends,Følgeseddel Tendenser
+apps/erpnext/erpnext/controllers/selling_controller.py +122,Commission rate cannot be greater than 100,Provisionssats kan ikke være større end 100
+DocType: Purchase Receipt,Range,Range
+DocType: Account,Receivable,Tilgodehavende
+DocType: Purchase Invoice,Contact Details,Kontaktoplysninger
+apps/frappe/frappe/desk/moduleview.py +67,Standard Reports,Standard rapporter
+apps/erpnext/erpnext/controllers/status_updater.py +163,Allowance for over-{0} crossed for Item {1}.,Fradrag for over- {0} krydsede for Item {1}.
+apps/erpnext/erpnext/accounts/utils.py +339,Annual,Årligt
+DocType: Journal Entry,Write Off Entry,Skriv Off indtastning
+apps/erpnext/erpnext/controllers/stock_controller.py +166,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,"Udgift eller Forskel konto er obligatorisk for Item {0}, da det påvirker den samlede lagerværdi"
+DocType: Lead,Channel Partner,Channel Partner
+DocType: Communication,Replied,Svarede
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +176,Purchse Order number required for Item {0},Purchse Ordrenummer kræves for Item {0}
+DocType: Item,Lead Time in days,Lead Time i dage
+DocType: Journal Entry,Debit Note,Debetnota
+DocType: Payment Reconciliation Invoice,Invoice Type,Faktura type
+apps/erpnext/erpnext/controllers/status_updater.py +140,Allowance for over-{0} crossed for Item {1},Fradrag for over- {0} krydsede for Item {1}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +38,Please click on 'Generate Schedule' to get schedule,Klik på &quot;Generer Schedule &#39;for at få tidsplan
+DocType: Appraisal,For Employee Name,For Medarbejder Navn
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +174,Totals,Totaler
+apps/erpnext/erpnext/selling/doctype/campaign/campaign.js +10,View Leads,Se Leads
+DocType: Item Group,Check this if you want to show in website,Markér dette hvis du ønsker at vise i website
+DocType: Newsletter List Subscriber,Newsletter List Subscriber,Nyhedsbrev List Subscriber
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,White,Hvid
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Marketing Expenses,Markedsføringsomkostninger
+DocType: Journal Entry,User Remark,Bruger Bemærkning
+DocType: Sales Order,Partly Delivered,Delvist Delivered
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Project Manager,Projektleder
+DocType: Purchase Invoice,Credit To,Credit Til
+apps/frappe/frappe/public/js/frappe/list/doclistview.js +418,Customize,Tilpas
+apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +26,Please specify currency in Company,Angiv venligst valuta i selskabet
+DocType: Purchase Invoice,Taxes and Charges Calculation,Skatter og Afgifter Beregning
+DocType: Sales Invoice,In Words will be visible once you save the Sales Invoice.,"I Ord vil være synlig, når du gemmer salgsfakturaen."
+apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,Customer Group / kunde
+DocType: Naming Series,Setup Series,Opsætning Series
+apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +44,From value must be less than to value in row {0},Fra værdi skal være mindre end at værdien i række {0}
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Nos,Nos
+DocType: Purchase Invoice Item,Rate,Rate
+apps/erpnext/erpnext/config/stock.py +79,Update additional costs to calculate landed cost of items,Opdater yderligere omkostninger til at beregne landede udgifter til poster
+DocType: Sales Invoice,Get Advances Received,Få forskud
+DocType: Leave Control Panel,Leave blank if considered for all designations,Lad stå tomt hvis det anses for alle betegnelser
+apps/erpnext/erpnext/public/js/setup_wizard.js +363,Minute,Minut
+apps/erpnext/erpnext/public/js/pos/pos.html +36,Amount Paid,Beløb betalt
+DocType: Company,Phone No,Telefon Nej
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,"Du har indtastet dubletter. Venligst rette, og prøv igen."
+DocType: Rename Tool,Type of document to rename.,Type dokument omdøbe.
+DocType: Purchase Invoice,Terms,Betingelser
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +111,Date Of Retirement must be greater than Date of Joining,Dato for pensionering skal være større end Dato for Sammenføjning
+DocType: Process Payroll,Send Email,Send Email
+apps/erpnext/erpnext/config/hr.py +140,Holiday master.,Ferie mester.
+DocType: Features Setup,If you involve in manufacturing activity. Enables Item 'Is Manufactured',Hvis du inddrage i fremstillingsindustrien aktivitet. Aktiverer Item &#39;Er Fremstillet&#39;
+DocType: Contact Us Settings,City,By
+DocType: Hub Settings,Seller Description,Sælger Beskrivelse
+apps/erpnext/erpnext/controllers/accounts_controller.py +339,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,"Advarsel: Systemet vil ikke tjekke overfakturering, da beløbet til konto {0} i {1} er nul"
+apps/erpnext/erpnext/config/projects.py +38,Cost of various activities,Omkostninger ved forskellige aktiviteter
+DocType: Tax Rule,Sales,Salg
+DocType: Salary Structure,Salary Structure,Løn Struktur
+DocType: BOM Operation,BOM Operation,BOM Operation
+DocType: Warranty Claim,Resolution,Opløsning
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,Forventet dato kan ikke være før Material Request Dato
+apps/frappe/frappe/public/js/frappe/model/model.js +18,Created By,Lavet af
+apps/erpnext/erpnext/config/hr.py +115,Salary template master.,Løn skabelon mester.
+,Monthly Salary Register,Månedlig Løn Tilmeld
+apps/erpnext/erpnext/controllers/trends.py +257,Project-wise data is not available for Quotation,Projekt-wise data er ikke tilgængelig for Citat
+DocType: Purchase Invoice,Contact Email,Kontakt E-mail
+DocType: SMS Settings,Message Parameter,Besked Parameter
+DocType: C-Form Invoice Detail,Invoice Date,Faktura Dato
+DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,Betaling Afstemning Faktura
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +643,Please select a value for {0} quotation_to {1},Vælg en værdi for {0} quotation_to {1}
+DocType: Pricing Rule,"Higher the number, higher the priority","Højere tallet er, jo højere prioritet"
+apps/erpnext/erpnext/config/accounts.py +18,Bills raised to Customers.,Regninger rejst til kunder.
+DocType: Newsletter,A Lead with this email id should exist,Et emne med dette e-mail-id skal være oprettet.
+DocType: Notification Control,Expense Claim Rejected Message,Expense krav Afvist Message
+DocType: Time Log,Will be updated when billed.,"Vil blive opdateret, når faktureret."
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},Løbenummer {0} er under garanti op {1}
+DocType: Time Log Batch,Total Billing Amount,Samlet Billing Beløb
+DocType: POS Profile,Update Stock,Opdatering Stock
+DocType: Manufacturing Settings,"Disables creation of time logs against Production Orders.
+Operations shall not be tracked against Production Order",Deaktiverer oprettelsen af ​​tid logs mod produktionsordrer. Operationer må ikke spores mod produktionsordre
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +209,Production Order {0} must be cancelled before cancelling this Sales Order,"Produktionsordre {0} skal annulleres, før den annullerer denne Sales Order"
+DocType: Serial No,Delivery Details,Levering Detaljer
+DocType: Hub Settings,Sync Now,Synkroniser nu
+DocType: Dropbox Backup,Daily,Daglig
+apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}: Fra {1}
+apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,Søg Sub Assemblies
+,Requested Items To Be Transferred,"Anmodet Varer, der skal overføres"
+DocType: Features Setup,"If you have long print formats, this feature can be used to split the page to be printed on multiple pages with all headers and footers on each page","Hvis du har lange trykte formater, kan denne funktion bruges til at opdele side, der skal udskrives på flere sider med alle sidehoveder og sidefødder på hver side"
+DocType: Mode of Payment,Mode of Payment,Mode Betaling
+apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +52,Plot,Plot
+DocType: Stock Reconciliation,Difference Amount,Forskel Beløb
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Add a few sample records,Tilføj et par prøve optegnelser
+apps/erpnext/erpnext/controllers/accounts_controller.py +355,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","Kan ikke overbill for Item {0} i række {1} mere end {2}. For at tillade overfakturering, skal du indstille i Stock-indstillinger"
+DocType: Item,Item Tax,Item Skat
+DocType: Leave Block List,Allow Users,Tillad brugere
+DocType: Cost Center,Stock User,Stock Bruger
+DocType: Period Closing Voucher,Closing Account Head,Lukning konto Hoved
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +74,Human Resources,Human Resources
+DocType: Delivery Note,Transporter Name,Transporter Navn
+DocType: Production Order Operation,Operation completed for how many finished goods?,Operation afsluttet for hvor mange færdigvarer?
+DocType: Company,Distribution,Distribution
+DocType: Pricing Rule,Applicable For,Gældende For
+DocType: Account,Account,Konto
+apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +147,Confirm Your Email,Bekræft din e-mail
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,{0} {1} is fully billed,{0} {1} er fuldt faktureret
+DocType: Workstation,Net Hour Rate,Net Hour Rate
+apps/erpnext/erpnext/config/learn.py +204,Human Resource,Menneskelige Ressourcer
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +61,Temporary Opening,Midlertidig Åbning
+DocType: Production Order,Planned Operating Cost,Planlagt driftsomkostninger
+DocType: Job Opening,Description of a Job Opening,Beskrivelse af et job Åbning
+DocType: Country,Country,Land
+apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,Fra og Til dato kræves
+,Amount to Deliver,"Beløb, Deliver"
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,Opnået
+DocType: Lead,Opportunity,Mulighed
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +151,Employee cannot report to himself.,Medarbejder kan ikke rapportere til ham selv.
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +144,Please enter Maintaince Details first,Indtast venligst Maintaince Detaljer først
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,Series Opdateret
+DocType: Appraisal,HR User,HR Bruger
+DocType: Selling Settings,Settings for Selling Module,Indstillinger for Selling modul
+DocType: Quotation Item,Against Doctype,Mod DOCTYPE
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +96,Cost Centers,Omkostninger Centers
+DocType: Salary Slip Deduction,Salary Slip Deduction,Lønseddel Fradrag
+DocType: Upload Attendance,Upload Attendance,Upload Fremmøde
+DocType: Item,Auto re-order,Auto re-ordre
+DocType: GL Entry,Voucher No,Blad nr
+DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,Dit salg person vil få en påmindelse på denne dato for at kontakte kunden
+DocType: Delivery Note,% of materials delivered against this Delivery Note,% Af materialer leveret mod denne følgeseddel
+DocType: Warranty Claim,Service Address,Tjeneste Adresse
+DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Give besked på mail om oprettelse af automatiske Materiale Request
+DocType: Batch,Batch ID,Batch-id
+apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reorder Qty,Genbestil Antal
+apps/erpnext/erpnext/controllers/stock_controller.py +172,Expense / Difference account ({0}) must be a 'Profit or Loss' account,Udgift / Difference konto ({0}) skal være en »resultatet« konto
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +65,"Email id must be unique, already exists for {0}","Email id skal være unikt, der allerede eksisterer for {0}"
+apps/erpnext/erpnext/config/hr.py +160,Setup incoming server for jobs email id. (e.g. jobs@example.com),Opsætning indgående server for job email id. (F.eks jobs@example.com)
+DocType: Employee,External Work History,Ekstern Work History
+DocType: Production Order,Planned Start Date,Planlagt startdato
+DocType: Features Setup,To track any installation or commissioning related work after sales,At spore enhver installation eller idriftsættelse relateret arbejde eftersalgsservice
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,Salgsomkostninger
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +211,{0} {1} is not submitted,{0} {1} er ikke indsendt
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +29,Account {0} does not exists,Konto {0} findes ikke
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +119,BOM and Manufacturing Quantity are required,BOM and Manufacturing Mængde kræves
+DocType: Dropbox Backup,Send Notifications To,Send meddelelser til
+DocType: Employee,Mr,Hr
+,Hub,Hub
+DocType: Item Reorder,Item Reorder,Item Genbestil
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +264,Please select {0} first,Vælg {0} først
+DocType: Leave Allocation,Total Leaves Allocated,Total Blade Allokeret
+DocType: Journal Entry Account,Purchase Order,Indkøbsordre
+DocType: Landed Cost Voucher,Purchase Receipt Items,Kvittering Varer
+apps/erpnext/erpnext/accounts/utils.py +189,Payment Entry has been modified after you pulled it. Please pull it again.,"Betaling indtastning er blevet ændret, efter at du trak det. Venligst trække det igen."
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +150,Please select prefix first,Vælg venligst præfiks først
+apps/frappe/frappe/templates/base.html +134,Added,Tilføjet
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +50,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,Stock Poster og GL Entries er reposted for de valgte Køb Kvitteringer
+DocType: Employee,Salary Information,Løn Information
+apps/erpnext/erpnext/stock/doctype/item/item.py +327,Default BOM ({0}) must be active for this item or its template,Standard BOM ({0}) skal være aktiv for dette element eller dens skabelon
+DocType: Item,Allow Production Order,Tillad produktionsordre
+DocType: Authorization Rule,Customer / Item Name,Kunde / Item Name
+DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,1. For at bevare kunden kloge post kode og gøre dem søgbare baseret på deres kode brug denne mulighed
+DocType: Appraisal Template Goal,Appraisal Template Goal,Vurdering Template Goal
+DocType: Expense Claim,Total Sanctioned Amount,Total Sanktioneret Beløb
+apps/erpnext/erpnext/config/selling.py +299,Sales Order to Payment,Sales Order til Betaling
+DocType: Job Applicant,Hold,Hold
+DocType: Letter Head,Letter Head,Brev hoved
+DocType: Item,Website Description,Website Beskrivelse
+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","Vælg Item hvor &quot;Er Stock Item&quot; er &quot;Nej&quot; og &quot;Er Sales Item&quot; er &quot;Ja&quot;, og der er ingen anden Product Bundle"
+DocType: Newsletter,Newsletter,Nyhedsbrev
+DocType: Buying Settings,Default Buying Price List,Standard Opkøb prisliste
+apps/erpnext/erpnext/accounts/utils.py +268,Journal Entries {0} are un-linked,Journaloptegnelser {0} er un-forbundet
+DocType: Purchase Invoice,"Enter email id separated by commas, invoice will be mailed automatically on particular date","Indtast email id adskilt af kommaer, vil faktura blive sendt automatisk på bestemt dato"
+DocType: Item,Website Warehouse,Website Warehouse
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +47,Please enter quantity for Item {0},Indtast mængde for Item {0}
+apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,Omkostninger ved Købte varer
+DocType: Features Setup,Features Setup,Features Setup
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +88,Employee relieved on {0} must be set as 'Left',Medarbejder lettet på {0} skal indstilles som &quot;Left&quot;
+DocType: Maintenance Visit,Breakdown,Sammenbrud
+apps/erpnext/erpnext/config/manufacturing.py +13,Bill of Materials (BOM),Bill of Materials (BOM)
+DocType: Report,Report Type,Rapporttype
+apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +139,Click here to verify,Klik her for at verificere
+DocType: Installation Note Item,Installed Qty,Antal installeret
+apps/erpnext/erpnext/config/hr.py +145,Block leave applications by department.,Blok orlov ansøgninger fra afdelingen.
+DocType: Website Item Group,Website Item Group,Website Item Group
+DocType: BOM Item,Item Description,Punkt Beskrivelse
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,Anlægsaktiver
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +107,Please enter the Against Vouchers manually,Indtast Against Vouchers manuelt
+apps/erpnext/erpnext/stock/doctype/item/item.py +387,Row {0}: An Reorder entry already exists for this warehouse {1},Række {0}: En Genbestil indgang findes allerede for dette lager {1}
+DocType: Item,Default Buying Cost Center,Standard købsomkostninger center
+DocType: Employee,Education,Uddannelse
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +198,Purchase Receipt {0} is not submitted,Kvittering {0} er ikke indsendt
+DocType: User,Bio,Bio
+DocType: Address,Lead Name,Bly navn
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +283,New Cost Center,Ny Cost center
+DocType: Bin,Reserved Quantity,Reserveret Mængde
+DocType: Attendance,Half Day,Half Day
+DocType: Email Digest,For Company,For Company
+DocType: Features Setup,"Field available in Delivery Note, Quotation, Sales Invoice, Sales Order","Felt fås i Delivery Note, Citat, Sales Invoice, Sales Order"
+,Open Production Orders,Åbne produktionsordrer
+DocType: Account,Bank,Bank
+DocType: Monthly Distribution Percentage,Month,Måned
+DocType: Project Task,Task ID,Opgave-id
+DocType: About Us Settings,Website Manager,Website manager
+DocType: SMS Settings,Static Parameters,Statiske parametre
+apps/erpnext/erpnext/public/js/setup_wizard.js +241,Attach Letterhead,Vedhæft Brevpapir
+,Material Requests for which Supplier Quotations are not created,Materielle Anmodning om hvilke Leverandør Citater ikke er skabt
+apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +39,Account {0} does not belongs to company {1},Konto {0} ikke hører til virksomheden {1}
+DocType: Item,Will also apply for variants unless overrridden,"Vil også gælde for varianter, medmindre overrridden"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +71,Update Finished Goods,Opdater færdigvarer
+DocType: Dropbox Backup,Dropbox Access Allowed,Dropbox Adgang tilladt
+DocType: Production Order Operation,Actual Operation Time,Faktiske Operation Time
+DocType: Item Attribute,Attribute Name,Attribut Navn
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +20,Cash In Hand,Kassebeholdning
+DocType: Contact,User ID,Bruger-id
+DocType: User,Last Name,Efternavn
+apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.py +179,Please install dropbox python module,Du installere dropbox python-modul
+DocType: Salary Slip,Net Pay,Nettoløn
+DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,Er denne Tax inkluderet i Basic Rate?
+apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,Enten target qty eller målbeløbet er obligatorisk.
+DocType: Customer,Fixed Days,Faste dage
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +51,{0} ({1}) must have role 'Expense Approver',"{0} ({1}), skal have rollen 'Godkendelse af udgifter'"
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +49,Invalid {0}: {1},Ugyldig {0}: {1}
+DocType: Serial No,AMC Expiry Date,AMC Udløbsdato
+DocType: Rename Tool,Rename Log,Omdøbe Log
+DocType: Quality Inspection,Outgoing,Udgående
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +106,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Række {0}: Betaling mod Salg / Indkøbsordre bør altid blive markeret som forskud
+DocType: Hub Settings,Seller Email,Sælger Email
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,Email Digest:
+apps/erpnext/erpnext/config/projects.py +18,Project master.,Projekt mester.
+apps/erpnext/erpnext/stock/doctype/item/item.py +347,{0} entered twice in Item Tax,{0} indtastet to gange i vareafgift
+DocType: Workflow State,Primary,Primær
+DocType: Employee,Marital Status,Civilstand
+apps/erpnext/erpnext/public/js/setup_wizard.js +108,You will use it to Login,Du vil bruge det til login
+apps/erpnext/erpnext/controllers/recurring_document.py +192,'Notification Email Addresses' not specified for recurring %s,'Notification Email Adresser' er ikke angivet for tilbagevendende %s
+DocType: C-Form,Amended From,Ændret Fra
+DocType: Pricing Rule,For Price List,For prisliste
+apps/erpnext/erpnext/accounts/report/financial_statements.py +147,Total ({0}),I alt ({0})
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +42,New Company,Ny Company
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +100,Warning: Leave application contains following block dates,Advarsel: Lad ansøgning indeholder følgende blok datoer
+DocType: Bank Reconciliation Detail,Posting Date,Udstationering Dato
+DocType: Product Bundle,Parent Item,Parent Item
+,Item-wise Sales History,Vare-wise Sales History
+DocType: Contact,Enter designation of this Contact,Indtast udpegelsen af ​​denne Kontakt
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +119,Quantity for Item {0} must be less than {1},Mængde for Item {0} skal være mindre end {1}
+DocType: HR Settings,Employee Settings,Medarbejder Indstillinger
+DocType: Cost Center,Distribution Id,Distribution Id
+DocType: Quotation,Quotation Lost Reason,Citat Lost Årsag
+DocType: Issue,Resolution Details,Opløsning Detaljer
+,Serial No Warranty Expiry,Seriel Ingen garanti Udløb
+DocType: Salary Slip,Leave Without Pay,Lad uden løn
+DocType: SMS Settings,Enter url parameter for receiver nos,Indtast url parameter for receiver nos
+DocType: System Settings,System Settings,Systemindstillinger
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +667,From Sales Order,Fra kundeordre
+DocType: Address Template,Address Template,Adresse Skabelon
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,Removed items with no change in quantity or value.,Fjernede elementer uden nogen ændringer i mængde eller værdi.
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Depreciation,Afskrivninger
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer > Customer Group > Territory,Kunde&gt; Customer Group&gt; Territory
+DocType: Purchase Taxes and Charges,Valuation,Værdiansættelse
+DocType: Customer,Default Price List,Standard prisliste
+DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
+Used for Taxes and Charges",Skat detalje tabel hentes fra post mester som en streng og opbevares i dette område. Bruges til skatter og afgifter
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +48,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},Regnskabsår Start Dato og Skatteårsafslutning Dato allerede sat i regnskabsåret {0}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +25,Please setup Employee Naming System in Human Resource > HR Settings,Venligst setup Medarbejder navnesystem i Human Resource&gt; HR-indstillinger
+DocType: Employee,Employment Details,Beskæftigelse Detaljer
+apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,Tilmeld dig ERPNext Hub
+DocType: Contact Us Settings,Address Line 2,Adresse Linje 2
+DocType: Purchase Receipt Item,Accepted Quantity,Accepteret Mængde
+DocType: Process Payroll,Create Salary Slip,Opret lønseddel
+DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Alle andre bemærkninger, bemærkelsesværdigt indsats, skal gå i registrene."
+DocType: Shipping Rule Condition,A condition for a Shipping Rule,Betingelse for en forsendelsesregel
+DocType: Process Payroll,Submit all salary slips for the above selected criteria,Indsend alle lønsedler for de ovenfor valgte kriterier
+DocType: Naming Series,Help HTML,Hjælp HTML
+apps/frappe/frappe/public/js/frappe/form/footer/timeline_item.html +39,Details,Detaljer
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +127,There is not enough leave balance for Leave Type {0},Der er ikke nok orlov balance for Leave Type {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +213,Stock Entries already created for Production Order ,Stock Entries allerede skabt til produktionsordre
+DocType: Shopping Cart Settings,Enable Shopping Cart,Aktiver Indkøbskurv
+DocType: Monthly Distribution Percentage,Percentage Allocation,Procentvise fordeling
+apps/erpnext/erpnext/controllers/website_list_for_contact.py +69,{0}% Delivered,{0}% Delivered
+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.,"Markér dette hvis du ønsker at tvinge brugeren til at vælge en serie før du gemmer. Der vil ikke være standard, hvis du markerer dette."
+DocType: Production Order,Actual End Date,Faktiske Slutdato
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Please enter item details,Indtast venligst item detaljer
+DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,Check Leverandør Fakturanummer Entydighed
+apps/erpnext/erpnext/config/stock.py +115,Warehouses.,Pakhuse.
+DocType: Quality Inspection,Incoming,Indgående
+DocType: Department,Leave Block List,Lad Block List
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +97,Please specify a valid Row ID for row {0} in table {1},Angiv en gyldig Row ID for rækken {0} i tabel {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +200,Select Quantity,Vælg antal
+apps/erpnext/erpnext/config/manufacturing.py +34,Where manufacturing operations are carried.,Hvor fremstillingsprocesser gennemføres.
+DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.","Hvis denne vare har varianter, så det kan ikke vælges i salgsordrer mv"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +328,{0} against Bill {1} dated {2},{0} mod regning {1} ​​dateret {2}
+apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +24,Default Address Template cannot be deleted,Standard Adresse Skabelon kan ikke slettes
+DocType: Employee,"System User (login) ID. If set, it will become default for all HR forms.","System Bruger (login) ID. Hvis sat, vil det blive standard for alle HR-formularer."
+DocType: Salary Slip,Working Days,Arbejdsdage
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +108,Date of Joining must be greater than Date of Birth,Dato for Sammenføjning skal være større end Fødselsdato
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate must be same as {0} {1} ({2}),Exchange Rate skal være samme som {0} {1} ({2})
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +392,Leave Blocked,Lad Blokeret
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +46,Item {0} is not a serialized Item,Vare {0} er ikke en føljeton Item
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Sæt som Open
+apps/erpnext/erpnext/crm/doctype/lead/lead.js +34,Make Quotation,Make Citat
+DocType: Employee,Current Address Is,Nuværende adresse er
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Bestilt
+apps/erpnext/erpnext/public/js/setup_wizard.js +274,Accountant,Revisor
+apps/erpnext/erpnext/config/hr.py +110,"Employee designation (e.g. CEO, Director etc.).","Medarbejder betegnelse (f.eks CEO, direktør osv.)"
+DocType: Stock Ledger Entry,Stock Value Difference,Stock Value Forskel
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Research & Development,Forskning &amp; Udvikling
+DocType: Item,Website Item Groups,Website varegrupper
+DocType: Page,Standard,Standard
+DocType: Target Detail,Target Detail,Target Detail
+DocType: Quotation,Quotation To,Citat Til
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Large,Large
+apps/erpnext/erpnext/accounts/doctype/account/account.py +174,Child account exists for this account. You can not delete this account.,Eksisterer barn konto til denne konto. Du kan ikke slette denne konto.
+DocType: Delivery Note,Transporter Info,Transporter Info
+apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +139,You can make a time log only against a submitted production order,Du kan lave en tid log kun mod en indsendt produktionsordre
+DocType: Serial No,Delivery Document No,Levering dokument nr
+DocType: Purchase Common,Purchase Common,Indkøb Common
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +581,Packing Slip,Packing Slip
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +163,Note: Item {0} entered multiple times,Bemærk: Konto {0} indtastet flere gange
+DocType: Employee Education,School/University,Skole / Universitet
+DocType: Purchase Order,To Bill,Til Bill
+DocType: Stock Settings,Role Allowed to edit frozen stock,Rolle Tilladt at redigere frosne lager
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,Send nu
+DocType: Task,Actual Time (in Hours),Faktiske tid (i timer)
+apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +110,To Time must be greater than From Time,Til Time skal være større end From Time
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,Flyselskab
+DocType: Delivery Note,Excise Page Number,Excise Sidetal
+DocType: Delivery Note,To Warehouse,Til Warehouse
+DocType: Production Planning Tool,Select Sales Orders,Vælg salgsordrer
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Telephone Expenses,Telefon Udgifter
+,Requested,Anmodet
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +55,Purchase Receipt must be submitted,Kvittering skal indsendes
+DocType: Lead,Market Segment,Market Segment
+DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","Her kan du opretholde familiens detaljer som navn og besættelse af forældre, ægtefælle og børn"
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Probationary Period,Prøvetid
+apps/erpnext/erpnext/accounts/doctype/account/account.py +91,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","Konto balance er kredit, Du har ikke lov at ændre 'Balancetype' til 'debit'"
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),Udlån (aktiver)
+apps/erpnext/erpnext/controllers/status_updater.py +142,{0} must be reduced by {1} or you should increase overflow tolerance,"{0} skal reduceres med {1}, eller du bør øge overflow tolerance"
+DocType: HR Settings,HR Settings,HR-indstillinger
+DocType: Sales Team,Incentives,Incitamenter
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +102,Credit To account must be a Payable account,Kredit til konto skal være en Betales konto
+DocType: C-Form,Total Invoiced Amount,Total Faktureret beløb
+DocType: C-Form Invoice Detail,C-Form Invoice Detail,C-Form Faktura Detail
+DocType: Features Setup,"Check if you need automatic recurring invoices. After submitting any sales invoice, Recurring section will be visible.","Kontroller, om du har brug for automatiske tilbagevendende fakturaer. Når du har indsendt nogen faktura, vil Tilbagevendende sektion være synlige."
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,You cannot credit and debit same account at the same time,Du kan ikke kreditere og debitere samme konto på samme tid
+DocType: Leave Application,Leave Application,Forlad Application
+apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +42,Select Fiscal Year...,Vælg regnskabsår ...
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +41,Travel,Rejser
+DocType: Manufacturing Settings,Try planning operations for X days in advance.,Prøv at planlægge operationer for X dage i forvejen.
+DocType: Stock Entry,Default Source Warehouse,Standardkilde Warehouse
+apps/erpnext/erpnext/accounts/doctype/account/account.py +73,Root cannot be edited.,Root kan ikke redigeres.
+apps/erpnext/erpnext/stock/doctype/item/item.js +178,Add / Edit Prices,Tilføj / rediger Priser
+DocType: Selling Settings,Sales Order Required,Sales Order Påkrævet
+DocType: Employee,Widowed,Enke
+DocType: Buying Settings,Purchase Order Required,Indkøbsordre Påkrævet
+apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Ageing Range 3
+DocType: Production Order,Plan material for sub-assemblies,Plan materiale til sub-enheder
+DocType: Employee,Reason for Leaving,Årsag til Leaving
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} was on leave on {1}. Cannot mark attendance.,Medarbejder {0} var på orlov på {1}. Kan ikke markere fremmøde.
+apps/erpnext/erpnext/stock/doctype/item/item.js +43,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,"Dette element er en Variant af {0} (skabelon). Attributter vil blive kopieret over fra skabelonen, medmindre &#39;Ingen Copy &quot;er indstillet"
+DocType: BOM Replace Tool,BOM Replace Tool,BOM Erstat Værktøj
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +176,Unsecured Loans,Usikrede lån
+apps/erpnext/erpnext/config/learn.py +72,Setting up Taxes,Opsætning Skatter
+DocType: Sales Invoice Item,Sales Order Item,Sales Order Vare
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +171,Responsibilities,Ansvar
+apps/frappe/frappe/desk/doctype/note/note_list.js +3,Notes,Noter
+apps/erpnext/erpnext/config/stock.py +18,Requests for items.,Anmodning om.
+DocType: Item,Minimum Order Qty,Minimum Antal
+DocType: Target Detail,Target  Amount,Målbeløbet
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Vare {0}: Bestilte qty {1} kan ikke være mindre end minimum ordreantal {2} (defineret i punkt).
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +68,Direct Expenses,Direkte udgifter
+apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +70,Last Order Amount,Sidste ordrebeløb
+DocType: Company,Stock Adjustment Account,Stock Justering konto
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +104,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,"Række {0}: Tjek venligst &quot;Er Advance &#39;mod konto {1}, hvis dette er et forskud post."
+DocType: Purchase Taxes and Charges,Add or Deduct,Tilføje eller fratrække
+DocType: Warranty Claim,Warranty / AMC Status,Garanti / AMC status
+DocType: GL Entry,Party Type,Party Type
+DocType: Purchase Receipt,Supplier Warehouse,Leverandør Warehouse
+DocType: Sales Invoice,Packing List,Pakning List
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Quality Management,Quality Management
+DocType: Shipping Rule,Net Weight,Vægt
+DocType: Issue,Support Team,Support Team
+DocType: Address,Preferred Shipping Address,Foretrukne Forsendelsesadresse
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +113,"For {0}, only credit accounts can be linked against another debit entry",For {0} kan kun kredit konti knyttes mod en anden debet post
+DocType: Item,Attributes,Attributter
+DocType: Account,Tax,Skat
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +490,UOM coversion factor required for UOM: {0} in Item: {1},UOM coversion faktor kræves for Pakke: {0} i Konto: {1}
+apps/erpnext/erpnext/controllers/selling_controller.py +163,Row {0}: Qty is mandatory,Række {0}: Antal er obligatorisk
+DocType: Company,Change Abbreviation,Skift Forkortelse
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +104,Non Profit,Non Profit
+DocType: Purchase Invoice,Supplier Invoice Date,Leverandør Faktura Dato
+apps/erpnext/erpnext/config/stock.py +141,Main Reports,Vigtigste Reports
+DocType: Delivery Note,% Installed,% Installeret
+DocType: Shipping Rule,Shipping Account,Forsendelse konto
+DocType: Features Setup,If you follow Quality Inspection. Enables Item QA Required and QA No in Purchase Receipt,Hvis du følger kvalitetskontrol. Aktiverer Item QA Nødvendig og QA Ingen i kvittering
+DocType: Email Account,Email Ids,Email Ids
+DocType: Features Setup,"Discount Fields will be available in Purchase Order, Purchase Receipt, Purchase Invoice","Discount Fields vil være tilgængelig i Indkøbsordre, kvittering, købsfaktura"
+DocType: Item,"A Product or a Service that is bought, sold or kept in stock.","En vare eller tjenesteydelse, der købes, sælges eller opbevares på lager."
+DocType: Landed Cost Voucher,Get Items From Purchase Receipts,Få elementer fra køb Kvitteringer
+DocType: Budget Detail,Budget Detail,Budget Detail
+apps/erpnext/erpnext/accounts/report/financial_statements.py +16,Fiscal Year {0} not found.,Regnskabsår {0} ikke fundet.
+DocType: Production Order Operation,Make Time Log,Make Time Log
+DocType: Item,Will also apply for variants,Vil også gælde for varianter
+DocType: Email Digest,Payables,Gæld
+DocType: Pricing Rule,Customer Group,Customer Group
+apps/frappe/frappe/public/js/frappe/model/model.js +492,Rename,Omdøb
+apps/erpnext/erpnext/accounts/utils.py +276,Please set default value {0} in Company {1},Indstil standard værdi {0} i Company {1}
+DocType: User,First Name,Fornavn
+DocType: Company,Company registration numbers for your reference. Tax numbers etc.,Firma registreringsnumre til din reference. Skat numre etc.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +72,Please enter parent account group for warehouse {0},Indtast venligst forælder konto gruppe for lager {0}
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,Købmand
+apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} eksisterer ikke
+apps/erpnext/erpnext/public/js/pos/pos.js +429,Change,Ændring
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Extra Small,Extra Small
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Contract,Kontrakt
+apps/erpnext/erpnext/accounts/general_ledger.py +121,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Debet og Credit ikke ens for {0} # {1}. Forskellen er {2}.
+DocType: Pricing Rule,Discount on Price List Rate (%),Rabat på prisliste Rate (%)
+DocType: Time Log,To Time,Til Time
+DocType: Pricing Rule,Item Code,Item Code
+DocType: Sales Invoice,Recurring,Tilbagevendende
+,BOM Browser,BOM Browser
+,Completed Production Orders,Afsluttede produktionsordrer
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +607,Material Request,Materiale Request
+apps/erpnext/erpnext/config/projects.py +23,Time Log for tasks.,Tid Log til opgaver.
+apps/erpnext/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py +25,Please select Bank Account,Vælg Bankkonto
+apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,Score skal være mindre end eller lig med 5
+DocType: Production Order Operation,"in Minutes
+Updated via 'Time Log'",i minutter Opdateret via &#39;Time Log&#39;
+DocType: Offer Letter,Awaiting Response,Afventer svar
+,Stock Ledger,Stock Ledger
+DocType: POS Profile,Taxes and Charges,Skatter og Afgifter
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +96,Reference No is mandatory if you entered Reference Date,"Referencenummer er obligatorisk, hvis du har indtastet reference Dato"
+DocType: Employee Leave Approver,Leave Approver,Lad Godkender
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +35,Balance Value,Balance Value
+apps/erpnext/erpnext/config/stock.py +28,Shipments to customers.,Forsendelser til kunderne.
+DocType: Appraisal,Total Score (Out of 5),Total Score (ud af 5)
+DocType: Purchase Taxes and Charges,On Previous Row Total,På Forrige Row Total
+DocType: Accounts Settings,Settings for Accounts,Indstillinger for konti
+DocType: Employee,Date of Joining,Dato for Sammenføjning
+DocType: BOM,With Operations,Med Operations
+DocType: System Settings,Time Zone,Time Zone
+DocType: Item,Inspection Required,Inspection Nødvendig
+DocType: Company,Default Currency,Standard Valuta
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +549,Fetch exploded BOM (including sub-assemblies),Hent eksploderede BOM (herunder underenheder)
+,Daily Time Log Summary,Daglig Time Log Summary
+DocType: POS Profile,Price List,Pris List
+DocType: Payment Reconciliation,Minimum Amount,Minimumsbeløb
+DocType: Time Log,Batched for Billing,Batched for fakturering
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,Max rabat tilladt for vare: {0} er {1}%
+DocType: Maintenance Visit,Maintenance Type,Vedligeholdelse Type
+DocType: Blog Category,Parent Website Route,Parent Website Route
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +233,BOM recursion: {0} cannot be parent or child of {2},BOM rekursion: {0} kan ikke være forælder eller barn af {2}
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +121,Add Child,Tilføj Child
+apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +63,Clearance Date not mentioned,Clearance Dato ikke nævnt
+DocType: Production Order Operation,Production Order Operation,Produktionsordre Operation
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +41,Remove item if charges is not applicable to that item,"Fjern element, hvis afgifter ikke finder anvendelse på denne post"
+DocType: Production Planning Tool,Filter based on customer,Filter baseret på kundernes
+DocType: Bank Reconciliation,Update Clearance Date,Opdatering Clearance Dato
+apps/erpnext/erpnext/config/selling.py +163,Track Leads by Industry Type.,Spor fører af Industry Type.
+apps/frappe/frappe/utils/__init__.py +79,{0} is not a valid email id,{0} er ikke en gyldig e-mail-id
+,Item-wise Purchase Register,Vare-wise Purchase Tilmeld
+,SO Qty,SO Antal
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,Online Auktioner
+DocType: Payment Reconciliation,Receivable / Payable Account,Tilgodehavende / Betales konto
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +209,Serial No {0} does not belong to Item {1},Løbenummer {0} ikke hører til Vare {1}
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +72,To Do List,To Do List
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +13,Please Delivery Note first,Venligst følgeseddel først
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +520,Posting date and posting time is mandatory,Udstationering dato og udstationering tid er obligatorisk
+apps/erpnext/erpnext/setup/doctype/company/company.js +24,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,"Kontroller, at du virkelig ønsker at slette alle transaktioner for dette selskab. Dine stamdata vil forblive som den er. Denne handling kan ikke fortrydes."
+DocType: DocField,Column Break,Kolonne Break
+DocType: Project,Gross Margin,Gross Margin
+DocType: Purchase Order Item Supplied,BOM Detail No,BOM Detail Nej
+apps/erpnext/erpnext/controllers/recurring_document.py +127,New {0}: #{1},Ny {0}: # {1}
+DocType: Attendance,HR Manager,HR Manager
+DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,"Brugere, der kan godkende en bestemt medarbejders orlov applikationer"
+DocType: DocField,Attach Image,Vedhæft billede
+,Delivered Items To Be Billed,Leverede varer at blive faktureret
+,Item-wise Sales Register,Vare-wise Sales Register
+DocType: Warranty Claim,From Company,Fra Company
+DocType: SMS Center,Total Characters,Total tegn
+apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Ageing Range 2
+apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +20,PL or BS,PL eller BS
+apps/erpnext/erpnext/public/js/setup_wizard.js +292,e.g. VAT,fx moms
+DocType: Sales Invoice,Rounded Total (Company Currency),Afrundet alt (Company Valuta)
+DocType: Expense Claim,Expense Approver,Expense Godkender
+DocType: Packing Slip,Net Weight UOM,Nettovægt UOM
+apps/erpnext/erpnext/config/selling.py +33,All Addresses.,Alle adresser.
+DocType: Maintenance Schedule Item,Half Yearly,Halvdelen Årlig
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +141,User {0} is already assigned to Employee {1},Bruger {0} er allerede tildelt Medarbejder {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +374, (Half Day),(Halv dag)
+DocType: Bank Reconciliation,Include Reconciled Entries,Medtag Afstemt Angivelser
+DocType: Employee,Better Prospects,Bedre udsigter
+apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +78,Please save the Newsletter before sending,Gem nyhedsbrevet før afsendelse
+apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +24,Duplicate Entry. Please check Authorization Rule {0},Duplicate indtastning. Forhør Authorization Rule {0}
+DocType: Quality Inspection,Delivery Note No,Levering Note Nej
+apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +221,Completed Qty cannot be more than {0} for operation {1},Afsluttet Antal kan ikke være mere end {0} til drift {1}
+DocType: Report,Disabled,Handicappet
+DocType: Purchase Invoice Item,Price List Rate (Company Currency),Prisliste Rate (Company Valuta)
+DocType: GL Entry,Is Opening,Er Åbning
+DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.","Hvis aktiveret, vil systemet sende bogføring for opgørelse automatisk."
+DocType: Payment Reconciliation,Payment Reconciliation,Betaling Afstemning
+DocType: Quality Inspection Reading,Reading 1,Læsning 1
+apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,Anmodning om køb.
+DocType: Journal Entry,Contra Entry,Contra indtastning
+apps/erpnext/erpnext/stock/doctype/item/item.py +539,Item {0} has reached its end of life on {1},Vare {0} har nået slutningen af ​​sin levetid på {1}
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +6,You must Save the form before proceeding,"Du skal gemme formularen, før du fortsætter"
+DocType: Manufacturing Settings,Time Between Operations (in mins),Time Between Operations (i minutter)
+DocType: Leave Allocation,Leave Allocation,Lad Tildeling
+DocType: Tax Rule,Purchase,Købe
+DocType: Account,Income Account,Indkomst konto
+DocType: Stock Entry,Including items for sub assemblies,Herunder elementer til sub forsamlinger
+DocType: Packing Slip,Identification of the package for the delivery (for print),Identifikation af emballagen for levering (til print)
+DocType: Employee,Feedback,Feedback
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +57,'To Case No.' cannot be less than 'From Case No.','Til sag nr.' kan ikke være mindre end 'Fra sag nr.'
+DocType: Serial No,Creation Document No,Creation dokument nr
+DocType: Account,Account Name,Kontonavn
+DocType: Earning Type,Earning Type,Optjening Type
+DocType: Production Order Operation,Pending,Afventer
+DocType: Pricing Rule,Pricing Rule,Prisfastsættelse Rule
+DocType: Customer,Sales Team Details,Salg Team Detaljer
+DocType: Sales Partner,Address & Contacts,Adresse &amp; Contacts
+,Stock Balance,Stock Balance
+DocType: Lead,Converted,Konverteret
+DocType: Supplier,Supplier Details,Leverandør Detaljer
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +34,Legal,Juridisk
 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.
 
 #### Note
@@ -1910,1775 +3399,104 @@
 8. Enter Row: If based on ""Previous Row Total"" you can select the row number which will be taken as a base for this calculation (default is the previous row).
 9. Consider Tax or Charge for: In this section you can specify if the tax / charge is only for valuation (not a part of total) or only for total (does not add value to the item) or for both.
 10. Add or Deduct: Whether you want to add or deduct the tax.","Standard skat skabelon, der kan anvendes på alle købstransaktioner. Denne skabelon kan indeholde liste over skatte- hoveder og også andre bekostning hoveder som &quot;Shipping&quot;, &quot;forsikring&quot;, &quot;Håndtering&quot; osv #### Bemærk Skatteprocenten du definerer her, vil være standard skattesats for alle ** Varer * *. Hvis der er ** Varer **, der har forskellige satser, skal de tilsættes i ** Item Skat ** bord i ** Item ** mester. #### Beskrivelse af kolonner 1. Beregning Type: - Dette kan være på ** Net Total ** (dvs. summen af ​​grundbeløb). - ** På Forrige Row Total / Beløb ** (for kumulative skatter eller afgifter). Hvis du vælger denne mulighed, vil skatten blive anvendt som en procentdel af den forrige række (på skatteområdet tabel) beløb eller total. - ** Faktisk ** (som nævnt). 2. Konto Hoved: Account Finans hvorunder denne afgift vil være reserveret 3. Cost Center: Hvis skatten / afgiften er en indtægt (som shipping) eller omkostninger det skal reserveres mod en Cost Center. 4. Beskrivelse: Beskrivelse af skat (som vil blive trykt i fakturaer / citater). 5. Pris: Skatteprocent. 6. Beløb: Skat beløb. 7. Samlet: Kumulativ total til dette punkt. 8. Indtast Række: Hvis baseret på &quot;Forrige Row alt&quot; kan du vælge den række nummer, som vil blive taget som en base for denne beregning (standard er den forrige række). 9. Overvej Skat eller Gebyr for: I dette afsnit kan du angive, om skatten / afgiften er kun for værdiansættelse (ikke en del af det samlede) eller kun for total (ikke tilføre værdi til emnet) eller til begge. 10. Tilføj eller fratrække: Uanset om du ønsker at tilføje eller fratrække afgiften."
-DocType: Note,Note,Bemærk
-DocType: Purchase Receipt Item,Recd Quantity,RECD Mængde
-DocType: Email Account,Email Ids,Email Ids
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},Kan ikke producere mere Item {0} end Sales Order mængde {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +471,Stock Entry {0} is not submitted,Stock indtastning {0} er ikke indsendt
-DocType: Payment Reconciliation,Bank / Cash Account,Bank / kontantautomat konto
-DocType: Global Defaults,Hide Currency Symbol,Skjul Valuta Symbol
-apps/erpnext/erpnext/config/accounts.py +164,"e.g. Bank, Cash, Credit Card","fx Bank, Kontant, Kreditkort"
-DocType: Journal Entry,Credit Note,Kreditnota
-apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +221,Completed Qty cannot be more than {0} for operation {1},Afsluttet Antal kan ikke være mere end {0} til drift {1}
-DocType: Features Setup,Quality,Kvalitet
-DocType: Contact Us Settings,Introduction,Introduktion
-DocType: Warranty Claim,Service Address,Tjeneste Adresse
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +76,Max 100 rows for Stock Reconciliation.,Max 100 rækker for Stock Afstemning.
-DocType: Stock Entry,Manufacture,Fremstilling
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +13,Please Delivery Note first,Venligst følgeseddel først
-DocType: Opportunity,Customer / Lead Name,Kunde / Lead navn
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +63,Clearance Date not mentioned,Clearance Dato ikke nævnt
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +71,Production,Produktion
-DocType: Item,Allow Production Order,Tillad produktionsordre
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +60,Row {0}:Start Date must be before End Date,Række {0}: Start dato skal være før slutdato
-apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),I alt (Antal)
-DocType: Installation Note Item,Installed Qty,Antal installeret
-DocType: Lead,Fax,Fax
-DocType: Purchase Taxes and Charges,Parenttype,Parenttype
-apps/frappe/frappe/public/js/frappe/model/indicator.js +43,Submitted,Indsendt
-DocType: Salary Structure,Total Earning,Samlet Earning
-DocType: Purchase Receipt,Time at which materials were received,"Tidspunkt, hvor materialer blev modtaget"
-apps/erpnext/erpnext/utilities/doctype/address/address.py +113,My Addresses,Mine Adresser
-DocType: Stock Ledger Entry,Outgoing Rate,Udgående Rate
-apps/erpnext/erpnext/config/hr.py +100,Organization branch master.,Organisation gren mester.
-DocType: Sales Order,Billing Status,Fakturering status
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Utility Expenses,Utility Udgifter
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,90-Above,90-Above
-DocType: Buying Settings,Default Buying Price List,Standard Opkøb prisliste
-,Download Backups,Hent Backups
-DocType: Notification Control,Sales Order Message,Sales Order Message
-apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","Indstil standardværdier som Company, Valuta, indeværende finansår, etc."
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js +28,Payment Type,Betaling Type
-DocType: Process Payroll,Select Employees,Vælg Medarbejdere
-DocType: Bank Reconciliation,To Date,Til dato
-DocType: Opportunity,Potential Sales Deal,Potentielle Sales Deal
-apps/frappe/frappe/public/js/frappe/form/footer/timeline_item.html +39,Details,Detaljer
-DocType: Purchase Invoice,Total Taxes and Charges,Total Skatter og Afgifter
-DocType: Employee,Emergency Contact,Emergency Kontakt
-DocType: Item,Quality Parameters,Kvalitetsparametre
-DocType: Target Detail,Target  Amount,Målbeløbet
-DocType: Shopping Cart Settings,Shopping Cart Settings,Indkøbskurv Indstillinger
-DocType: Journal Entry,Accounting Entries,Bogføring
-apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +24,Duplicate Entry. Please check Authorization Rule {0},Duplicate indtastning. Forhør Authorization Rule {0}
-apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +25,Global POS Profile {0} already created for company {1},Global POS Profil {0} allerede skabt til selskab {1}
-DocType: Purchase Order,Ref SQ,Ref SQ
-apps/erpnext/erpnext/config/manufacturing.py +56,Replace Item / BOM in all BOMs,Udskift Item / BOM i alle styklister
-DocType: Purchase Order Item,Received Qty,Modtaget Antal
-DocType: Stock Entry Detail,Serial No / Batch,Løbenummer / Batch
-DocType: Product Bundle,Parent Item,Parent Item
-DocType: Account,Account Type,Kontotype
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +213,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',Vedligeholdelsesplan ikke genereret for alle poster. Klik på &quot;Generer Schedule &#39;
-,To Produce,At producere
-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","For rækken {0} i {1}. For at inkludere {2} i Item sats, rækker {3} skal også medtages"
-DocType: Packing Slip,Identification of the package for the delivery (for print),Identifikation af emballagen for levering (til print)
-DocType: Bin,Reserved Quantity,Reserveret Mængde
-DocType: Landed Cost Voucher,Purchase Receipt Items,Kvittering Varer
-apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,Tilpasning Forms
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +62,Cutting,Skæring
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +69,Flattening,Udfladning
-DocType: Account,Income Account,Indkomst konto
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +22,Molding,Molding
-DocType: Stock Reconciliation Item,Current Qty,Aktuel Antal
-DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",Se &quot;Rate Of Materials Based On&quot; i Costing afsnit
-DocType: Appraisal Goal,Key Responsibility Area,Key Responsibility Area
-DocType: Item Reorder,Material Request Type,Materiale Request Type
-apps/frappe/frappe/desk/moduleview.py +61,Documents,Dokumenter
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +17,Ref,Ref
-DocType: Cost Center,Cost Center,Cost center
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.js +48,Voucher #,Voucher #
-DocType: Notification Control,Purchase Order Message,Indkøbsordre Message
-DocType: Upload Attendance,Upload HTML,Upload HTML
-apps/erpnext/erpnext/controllers/accounts_controller.py +391,"Total advance ({0}) against Order {1} cannot be greater \
-				than the Grand Total ({2})",Total forhånd ({0}) mod Order {1} kan ikke være større \ end Grand Total ({2})
-DocType: Employee,Relieving Date,Lindre Dato
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +12,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.","Prisfastsættelse Regel er lavet til at overskrive Prisliste / definere rabatprocent, baseret på nogle kriterier."
-DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,Warehouse kan kun ændres via Stock indtastning / følgeseddel / kvittering
-DocType: Employee Education,Class / Percentage,Klasse / Procent
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +92,Head of Marketing and Sales,Chef for Marketing og Salg
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +31,Income Tax,Indkomstskat
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +157,Laser engineered net shaping,Laser manipuleret netto formgivning
-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.","Hvis valgte Prisfastsættelse Regel er lavet til &quot;pris&quot;, vil det overskrive prislisten. Prisfastsættelse Regel prisen er den endelige pris, så ingen yderligere rabat bør anvendes. Derfor i transaktioner som Sales Order, Indkøbsordre osv, det vil blive hentet i &quot;Rate &#39;felt, snarere end&#39; Prisliste Rate &#39;område."
-apps/erpnext/erpnext/config/selling.py +163,Track Leads by Industry Type.,Spor fører af Industry Type.
-DocType: Item Supplier,Item Supplier,Vare Leverandør
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +328,Please enter Item Code to get batch no,Indtast venligst Item Code for at få batchnr
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +643,Please select a value for {0} quotation_to {1},Vælg en værdi for {0} quotation_to {1}
-apps/erpnext/erpnext/config/selling.py +33,All Addresses.,Alle adresser.
-DocType: Company,Stock Settings,Stock Indstillinger
-DocType: User,Bio,Bio
-apps/erpnext/erpnext/accounts/doctype/account/account.py +194,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Sammenlægning er kun muligt, hvis følgende egenskaber er ens i begge poster. Er koncernens, Root Type, Firma"
-apps/erpnext/erpnext/config/crm.py +72,Manage Customer Group Tree.,Administrer Customer Group Tree.
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +285,New Cost Center Name,Ny Cost center navn
-DocType: Leave Control Panel,Leave Control Panel,Lad Kontrolpanel
-apps/erpnext/erpnext/utilities/doctype/address/address.py +90,No default Address Template found. Please create a new one from Setup > Printing and Branding > Address Template.,Ingen standard Adresse Skabelon fundet. Opret en ny en fra Setup&gt; Trykning og Branding&gt; Adresse skabelon.
-DocType: Appraisal,HR User,HR Bruger
-DocType: Purchase Invoice,Taxes and Charges Deducted,Skatter og Afgifter Fratrukket
-apps/erpnext/erpnext/shopping_cart/utils.py +46,Issues,Spørgsmål
-apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},Status skal være en af ​​{0}
-DocType: Sales Invoice,Debit To,Betalingskort Til
-DocType: Delivery Note,Required only for sample item.,Kræves kun for prøve element.
-DocType: Stock Ledger Entry,Actual Qty After Transaction,Aktuel Antal Efter Transaktion
-,Pending SO Items For Purchase Request,Afventer SO Varer til Indkøb Request
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +148,Extra Large,Extra Large
-,Profit and Loss Statement,Resultatopgørelse
-DocType: Bank Reconciliation Detail,Cheque Number,Check Number
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +43,Pressing,Ved at trykke
-DocType: Payment Tool Detail,Payment Tool Detail,Betaling Tool Detail
-,Sales Browser,Salg Browser
-DocType: Journal Entry,Total Credit,Total Credit
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +474,Warning: Another {0} # {1} exists against stock entry {2},Advarsel: En anden {0} # {1} eksisterer mod lager post {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +459,Local,Lokal
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),Udlån (aktiver)
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,Debitorer
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +147,Large,Large
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +23,No employee found!,Ingen medarbejder fundet!
-DocType: C-Form Invoice Detail,Territory,Territory
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,"Henvis ikke af besøg, der kræves"
-DocType: Stock Settings,Default Valuation Method,Standard værdiansættelsesmetode
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +127,Polishing,Polering
-DocType: Production Order Operation,Planned Start Time,Planlagt Start Time
-apps/erpnext/erpnext/config/accounts.py +63,Close Balance Sheet and book Profit or Loss.,Luk Balance og book resultatopgørelsen.
-DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,Angiv Exchange Rate til at konvertere en valuta til en anden
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +146,Quotation {0} is cancelled,Citat {0} er aflyst
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,Samlede udestående beløb
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} was on leave on {1}. Cannot mark attendance.,Medarbejder {0} var på orlov på {1}. Kan ikke markere fremmøde.
-DocType: Sales Partner,Targets,Mål
-DocType: Price List,Price List Master,Prisliste Master
-DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,"Alt salg Transaktioner kan mærkes mod flere ** Sales Personer **, så du kan indstille og overvåge mål."
-,S.O. No.,SÅ No.
-DocType: Production Order Operation,Make Time Log,Make Time Log
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +158,Please create Customer from Lead {0},Opret Kunden fra Lead {0}
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Computers,Computere
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +112,Electro-chemical grinding,Elektrokemisk slibning
-apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +14,This is a root customer group and cannot be edited.,Dette er en rod kundegruppe og kan ikke redigeres.
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +39,Please setup your chart of accounts before you start Accounting Entries,"Venligst opsætning din kontoplan, før du starter bogføring"
-DocType: Purchase Invoice,Ignore Pricing Rule,Ignorer Prisfastsættelse Rule
-apps/frappe/frappe/public/js/frappe/model/indicator.js +34,Cancelled,Annulleret
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +91,From Date in Salary Structure cannot be lesser than Employee Joining Date.,Fra dato i Løn Structure ikke kan være mindre end Medarbejder Sammenføjning Dato.
-DocType: Employee Education,Graduate,Graduate
-DocType: Leave Block List,Block Days,Bloker dage
-DocType: Journal Entry,Excise Entry,Excise indtastning
-DocType: Terms and Conditions,"Standard Terms and Conditions that can be added to Sales and Purchases.
-
-Examples:
-
-1. Validity of the offer.
-1. Payment Terms (In Advance, On Credit, part advance etc).
-1. What is extra (or payable by the Customer).
-1. Safety / usage warning.
-1. Warranty if any.
-1. Returns Policy.
-1. Terms of shipping, if applicable.
-1. Ways of addressing disputes, indemnity, liability, etc.
-1. Address and Contact of your Company.","Standard vilkår og betingelser, der kan føjes til salg og køb. Eksempler: 1. gyldighed tilbuddet. 1. Betalingsbetingelser (i forvejen, på kredit, del forhånd osv). 1. Hvad er ekstra (eller skulle betales af Kunden). 1. Sikkerhed / forbrug advarsel. 1. Garanti hvis nogen. 1. Retur Politik. 1. Betingelser for skibsfart, hvis relevant. 1. Måder adressering tvister, erstatning, ansvar mv 1. Adresse og Kontakt i din virksomhed."
-DocType: Attendance,Leave Type,Forlad Type
-apps/erpnext/erpnext/controllers/stock_controller.py +172,Expense / Difference account ({0}) must be a 'Profit or Loss' account,Udgift / Difference konto ({0}) skal være en »resultatet« konto
-DocType: Account,Accounts User,Regnskab Bruger
-DocType: Sales Invoice,"Check if recurring invoice, uncheck to stop recurring or put proper End Date","Kontroller, om tilbagevendende faktura, skal du fjerne markeringen for at stoppe tilbagevendende eller sætte ordentlig Slutdato"
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,Fremmøde til medarbejder {0} er allerede markeret
-DocType: Packing Slip,If more than one package of the same type (for print),Hvis mere end én pakke af samme type (til print)
-apps/frappe/frappe/model/rename_doc.py +348,Maximum {0} rows allowed,Maksimum {0} rækker tilladt
-DocType: C-Form Invoice Detail,Net Total,Net Total
-DocType: Bin,FCFS Rate,FCFS Rate
-apps/erpnext/erpnext/accounts/page/pos/pos.js +15,Billing (Sales Invoice),Billing (Sales Invoice)
-DocType: Payment Reconciliation Invoice,Outstanding Amount,Udestående beløb
-DocType: Project Task,Working,Working
-DocType: Stock Ledger Entry,Stock Queue (FIFO),Stock kø (FIFO)
-apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +13,Please select Time Logs.,Vælg Time Logs.
-apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +37,{0} does not belong to Company {1},{0} ikke tilhører selskabet {1}
-DocType: Account,Round Off,Afrunde
-,Requested Qty,Anmodet Antal
-DocType: BOM Item,Scrap %,Skrot%
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +38,"Charges will be distributed proportionately based on item qty or amount, as per your selection","Afgifter vil blive fordelt forholdsmæssigt baseret på post qty eller mængden, som pr dit valg"
-DocType: Maintenance Visit,Purposes,Formål
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +103,Atleast one item should be entered with negative quantity in return document,Mindst ét ​​element skal indtastes med negativt mængde gengæld dokument
-apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +67,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","Betjening {0} længere end alle tilgængelige arbejdstimer i arbejdsstation {1}, nedbryde driften i flere operationer"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +134,Electrochemical machining,Elektrokemisk bearbejdning
-,Requested,Anmodet
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +66,No Remarks,Ingen Bemærkninger
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +13,Overdue,Forfaldne
-DocType: Account,Stock Received But Not Billed,Stock Modtaget men ikke faktureret
-DocType: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,Gross Pay + bagud Beløb + Indløsning Beløb - Total Fradrag
-DocType: Monthly Distribution,Distribution Name,Distribution Name
-DocType: Features Setup,Sales and Purchase,Salg og Indkøb
-DocType: Supplier Quotation Item,Material Request No,Materiale Request Nej
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +218,Quality Inspection required for Item {0},Inspektion kvalitet kræves for Item {0}
-DocType: Quotation,Rate at which customer's currency is converted to company's base currency,"Hastighed, hvormed kundens valuta omregnes til virksomhedens basisvaluta"
-apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +107,{0} has been successfully unsubscribed from this list.,{0} er blevet afmeldt fra denne liste.
-DocType: Purchase Invoice Item,Net Rate (Company Currency),Net Rate (Company Valuta)
-apps/frappe/frappe/templates/base.html +134,Added,Tilføjet
-apps/erpnext/erpnext/config/crm.py +81,Manage Territory Tree.,Administrer Territory Tree.
-DocType: Journal Entry Account,Sales Invoice,Salg Faktura
-DocType: Journal Entry Account,Party Balance,Party Balance
-DocType: Sales Invoice Item,Time Log Batch,Time Log Batch
-apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +437,Please select Apply Discount On,Vælg Anvend Rabat på
-DocType: Company,Default Receivable Account,Standard Tilgodehavende konto
-DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,Opret Bank Punktet om den samlede løn for de ovenfor valgte kriterier
-DocType: Stock Entry,Material Transfer for Manufacture,Materiale Transfer til Fremstilling
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +18,Discount Percentage can be applied either against a Price List or for all Price List.,Rabat Procent kan anvendes enten mod en prisliste eller for alle prisliste.
-DocType: Purchase Invoice,Half-yearly,Halvårligt
-apps/erpnext/erpnext/accounts/report/financial_statements.py +16,Fiscal Year {0} not found.,Regnskabsår {0} ikke fundet.
-DocType: Bank Reconciliation,Get Relevant Entries,Få relevante oplysninger
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +407,Accounting Entry for Stock,Regnskab Punktet om Stock
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +64,Coining,Opfandt
-DocType: Sales Invoice,Sales Team1,Salg TEAM1
-apps/erpnext/erpnext/stock/doctype/item/item.py +412,Item {0} does not exist,Element {0} eksisterer ikke
-DocType: Sales Invoice,Customer Address,Kunde Adresse
-apps/frappe/frappe/desk/query_report.py +136,Total,Total
-DocType: Purchase Invoice,Apply Additional Discount On,Påfør Yderligere Rabat på
-DocType: Account,Root Type,Root Type
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +84,Row # {0}: Cannot return more than {1} for Item {2},Row # {0}: Kan ikke returnere mere end {1} for Item {2}
-apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +52,Plot,Plot
-DocType: Item Group,Show this slideshow at the top of the page,Vis denne slideshow øverst på siden
-DocType: BOM,Item UOM,Item UOM
-DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),Skat Beløb Efter Discount Beløb (Company Valuta)
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +149,Target warehouse is mandatory for row {0},Target lageret er obligatorisk for rækken {0}
-DocType: Quality Inspection,Quality Inspection,Quality Inspection
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +144,Extra Small,Extra Small
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +20,Spray forming,Spray danner
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +458,Warning: Material Requested Qty is less than Minimum Order Qty,Advarsel: Materiale Anmodet Antal er mindre end Minimum Antal
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +191,Account {0} is frozen,Konto {0} er spærret
-DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Juridisk enhed / Datterselskab med en separat Kontoplan tilhører organisationen.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +29,"Food, Beverage & Tobacco","Mad, drikke og tobak"
-apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +20,PL or BS,PL eller BS
-apps/erpnext/erpnext/controllers/selling_controller.py +122,Commission rate cannot be greater than 100,Provisionssats kan ikke være større end 100
-apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Minimum Inventory Level,Minimum Inventory Level
-DocType: Stock Entry,Subcontract,Underleverance
-DocType: Production Planning Tool,Get Items From Sales Orders,Få elementer fra salgsordrer
-DocType: Production Order Operation,Actual End Time,Faktiske Sluttid
-DocType: Production Planning Tool,Download Materials Required,Hent Påkrævede materialer
-DocType: Item,Manufacturer Part Number,Producentens varenummer
-DocType: Production Order Operation,Estimated Time and Cost,Estimeret tid og omkostninger
-DocType: Bin,Bin,Bin
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +50,Nosing,Forkant
-DocType: SMS Log,No of Sent SMS,Ingen af ​​Sent SMS
-DocType: Account,Company,Firma
-DocType: Account,Expense Account,Udgiftskonto
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +49,Software,Software
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +151,Colour,Farve
-DocType: Maintenance Visit,Scheduled,Planlagt
-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","Vælg Item hvor &quot;Er Stock Item&quot; er &quot;Nej&quot; og &quot;Er Sales Item&quot; er &quot;Ja&quot;, og der er ingen anden Product Bundle"
-DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,Vælg Månedlig Distribution til ujævnt distribuere mål på tværs måneder.
-DocType: Purchase Invoice Item,Valuation Rate,Værdiansættelse Rate
-apps/erpnext/erpnext/stock/get_item_details.py +281,Price List Currency not selected,Pris List Valuta ikke valgt
-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,Item Row {0}: kvittering {1} findes ikke i ovenstående &#39;Køb Kvitteringer&#39; bord
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +134,Employee {0} has already applied for {1} between {2} and {3},Medarbejder {0} har allerede ansøgt om {1} mellem {2} og {3}
-apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Projekt startdato
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +8,Until,Indtil
-DocType: Rename Tool,Rename Log,Omdøbe Log
-DocType: Installation Note Item,Against Document No,Mod dokument nr
-apps/erpnext/erpnext/config/selling.py +98,Manage Sales Partners.,Administrer Sales Partners.
-DocType: Quality Inspection,Inspection Type,Inspektion Type
-apps/erpnext/erpnext/controllers/recurring_document.py +162,Please select {0},Vælg {0}
-DocType: C-Form,C-Form No,C-Form Ingen
-DocType: BOM,Exploded_items,Exploded_items
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +95,Researcher,Forsker
-apps/frappe/frappe/custom/doctype/customize_form/customize_form.js +88,Update,Opdatering
-apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +78,Please save the Newsletter before sending,Gem nyhedsbrevet før afsendelse
-apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +23,Name or Email is mandatory,Navn eller E-mail er obligatorisk
-apps/erpnext/erpnext/config/stock.py +74,Incoming quality inspection.,Inspektion indkommende kvalitet.
-DocType: Employee,Exit,Udgang
-apps/erpnext/erpnext/accounts/doctype/account/account.py +134,Root Type is mandatory,Root Typen er obligatorisk
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +295,Serial No {0} created,Løbenummer {0} oprettet
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +125,Vibratory finishing,Vibrerende efterbehandling
-DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","For nemheds af kunder, kan disse koder bruges i trykte formater som fakturaer og følgesedler"
-DocType: Employee,You can enter any date manually,Du kan indtaste et hvilket som helst tidspunkt manuelt
-DocType: Sales Invoice,Advertisement,Annonce
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +165,Probationary Period,Prøvetid
-DocType: Customer Group,Only leaf nodes are allowed in transaction,Kun blade noder er tilladt i transaktionen
-DocType: Expense Claim,Expense Approver,Expense Godkender
-DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,Kvittering Vare Leveres
-apps/erpnext/erpnext/public/js/pos/pos.js +343,Pay,Betale
-apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +17,To Datetime,Til datotid
-DocType: SMS Settings,SMS Gateway URL,SMS Gateway URL
-apps/erpnext/erpnext/config/crm.py +53,Logs for maintaining sms delivery status,Logs for opretholdelse sms leveringsstatus
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +137,Grinding,Slibning
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +34,Shrink wrapping,Shrink indpakning
-apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,Confirmed,Bekræftet
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier > Supplier Type,Leverandør&gt; Leverandør type
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +127,Please enter relieving date.,Indtast lindre dato.
-apps/erpnext/erpnext/controllers/trends.py +137,Amt,Amt
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' can be submitted,Kun Lad Applikationer med status &quot;Godkendt&quot; kan indsendes
-apps/erpnext/erpnext/utilities/doctype/address/address.py +21,Address Title is mandatory.,Adresse Titel er obligatorisk.
-DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,"Indtast navnet på kampagne, hvis kilden undersøgelsesudvalg er kampagne"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +38,Newspaper Publishers,Dagblades
-apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,Vælg regnskabsår
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +88,Smelting,Smeltning
-apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Genbestil Level
-DocType: Attendance,Attendance Date,Fremmøde Dato
-DocType: Salary Structure,Salary breakup based on Earning and Deduction.,Løn breakup baseret på Optjening og fradrag.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +103,Account with child nodes cannot be converted to ledger,Konto med barneknudepunkter kan ikke konverteres til finans
-DocType: Address,Preferred Shipping Address,Foretrukne Forsendelsesadresse
-DocType: Purchase Receipt Item,Accepted Warehouse,Accepteret varelager
-DocType: Bank Reconciliation Detail,Posting Date,Udstationering Dato
-DocType: Item,Valuation Method,Værdiansættelsesmetode
-DocType: Sales Invoice,Sales Team,Salgsteam
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +81,Duplicate entry,Duplicate entry
-DocType: Serial No,Under Warranty,Under Garanti
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +414,[Error],[Fejl]
-DocType: Sales Order,In Words will be visible once you save the Sales Order.,"I Ord vil være synlig, når du gemmer Sales Order."
-,Employee Birthday,Medarbejder Fødselsdag
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +55,Venture Capital,Venture Capital
-DocType: UOM,Must be Whole Number,Skal være hele tal
-DocType: Leave Control Panel,New Leaves Allocated (In Days),Nye blade Tildelte (i dage)
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +51,Serial No {0} does not exist,Løbenummer {0} eksisterer ikke
-DocType: Pricing Rule,Discount Percentage,Discount Procent
-DocType: Payment Reconciliation Invoice,Invoice Number,Fakturanummer
-apps/erpnext/erpnext/hooks.py +70,Orders,Ordrer
-DocType: Leave Control Panel,Employee Type,Medarbejder Type
-DocType: Employee Leave Approver,Leave Approver,Lad Godkender
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +70,Swaging,Sænksmedning
-DocType: Expense Claim,"A user with ""Expense Approver"" role",En bruger med 'Godkend udgifter' rolle
-,Issued Items Against Production Order,Udstedte Varer Against produktionsordre
-DocType: Pricing Rule,Purchase Manager,Indkøb manager
-DocType: Payment Tool,Payment Tool,Betaling Tool
-DocType: Target Detail,Target Detail,Target Detail
-DocType: Sales Order,% of materials billed against this Sales Order,% Af materialer faktureret mod denne Sales Order
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +50,Period Closing Entry,Periode Lukning indtastning
-apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +62,Cost Center with existing transactions can not be converted to group,Cost Center med eksisterende transaktioner kan ikke konverteres til gruppe
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Depreciation,Afskrivninger
-apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Leverandør (er)
-DocType: Customer,Credit Limit,Kreditgrænse
-apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,Vælg type transaktion
-DocType: GL Entry,Voucher No,Blad nr
-DocType: Leave Allocation,Leave Allocation,Lad Tildeling
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +396,Material Requests {0} created,Materiale Anmodning {0} skabt
-apps/erpnext/erpnext/config/selling.py +122,Template of terms or contract.,Skabelon af vilkår eller kontrakt.
-DocType: Customer,Last Day of the Next Month,Sidste dag i den næste måned
-DocType: Employee,Feedback,Feedback
-apps/erpnext/erpnext/accounts/party.py +284,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Bemærk: På grund / reference Date overstiger tilladte kunde kredit dage efter {0} dag (e)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +108,Abrasive jet machining,Sandblæsnings udstyr
-DocType: Stock Settings,Freeze Stock Entries,Frys Stock Entries
-DocType: Website Settings,Website Settings,Website Settings
-DocType: Activity Cost,Billing Rate,Fakturering Rate
-,Qty to Deliver,Antal til Deliver
-DocType: Monthly Distribution Percentage,Month,Måned
-,Stock Analytics,Stock Analytics
-DocType: Installation Note Item,Against Document Detail No,Imod Dokument Detail Nej
-DocType: Quality Inspection,Outgoing,Udgående
-DocType: Material Request,Requested For,Anmodet om
-DocType: Quotation Item,Against Doctype,Mod DOCTYPE
-DocType: Delivery Note,Track this Delivery Note against any Project,Spor dette Delivery Note mod enhver Project
-apps/erpnext/erpnext/accounts/doctype/account/account.py +169,Root account can not be deleted,Root-konto kan ikke slettes
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +75,Show Stock Entries,Vis Stock Entries
-DocType: Production Order,Work-in-Progress Warehouse,Work-in-Progress Warehouse
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +308,Reference #{0} dated {1},Henvisning # {0} dateret {1}
-DocType: Pricing Rule,Item Code,Item Code
-DocType: Production Planning Tool,Create Production Orders,Opret produktionsordrer
-DocType: Serial No,Warranty / AMC Details,Garanti / AMC Detaljer
-DocType: Journal Entry,User Remark,Bruger Bemærkning
-DocType: Lead,Market Segment,Market Segment
-DocType: Communication,Phone,Telefon
-DocType: Employee Internal Work History,Employee Internal Work History,Medarbejder Intern Arbejde Historie
-apps/erpnext/erpnext/public/js/account_tree_grid.js +50,Closing (Dr),Lukning (dr)
-DocType: Contact,Passive,Passiv
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,Løbenummer {0} ikke er på lager
-apps/erpnext/erpnext/config/selling.py +127,Tax template for selling transactions.,Skat skabelon til at sælge transaktioner.
-DocType: Sales Invoice,Write Off Outstanding Amount,Skriv Off Udestående beløb
-DocType: Features Setup,"Check if you need automatic recurring invoices. After submitting any sales invoice, Recurring section will be visible.","Kontroller, om du har brug for automatiske tilbagevendende fakturaer. Når du har indsendt nogen faktura, vil Tilbagevendende sektion være synlige."
-DocType: Account,Accounts Manager,Accounts Manager
-apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +39,Time Log {0} must be 'Submitted',Time Log {0} skal være »Tilmeldt &#39;
-DocType: Stock Settings,Default Stock UOM,Standard Stock UOM
-DocType: Production Planning Tool,Create Material Requests,Opret Materiale Anmodning
-DocType: Employee Education,School/University,Skole / Universitet
-DocType: Sales Invoice Item,Available Qty at Warehouse,Tilgængelig Antal på Warehouse
-,Billed Amount,Faktureret beløb
-DocType: Bank Reconciliation,Bank Reconciliation,Bank Afstemning
-apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +9,Get Updates,Hent opdateringer
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +129,Material Request {0} is cancelled or stopped,Materiale Request {0} er aflyst eller stoppet
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +641,Add a few sample records,Tilføj et par prøve optegnelser
-apps/erpnext/erpnext/config/hr.py +210,Leave Management,Lad Management
-DocType: Event,Groups,Grupper
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,Gruppe af konto
-DocType: Sales Order,Fully Delivered,Fuldt Leveres
-DocType: Lead,Lower Income,Lavere indkomst
-DocType: Period Closing Voucher,"The account head under Liability, in which Profit/Loss will be booked","Kontoen hoved under ansvar, hvor gevinst / tab vil være reserveret"
-DocType: Payment Tool,Against Vouchers,Mod Vouchers
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +23,Quick Help,Hurtig hjælp
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +168,Source and target warehouse cannot be same for row {0},Kilde og mål lageret ikke kan være ens for rækken {0}
-DocType: Features Setup,Sales Extras,Salg Extras
-apps/erpnext/erpnext/accounts/utils.py +344,{0} budget for Account {1} against Cost Center {2} will exceed by {3},{0} budget for konto {1} mod udgiftsområde {2} vil blive overskredet med {3}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +236,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Forskel Der skal være en Asset / Liability typen konto, da dette Stock Forsoning er en åbning indtastning"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +138,Purchase Order number required for Item {0},Indkøbsordre nummer kræves for Item {0}
-apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date','Fra dato' skal være efter 'Til dato'
-,Stock Projected Qty,Stock Forventet Antal
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +147,Customer {0} does not belong to project {1},Kunden {0} ikke hører til projekt {1}
-DocType: Warranty Claim,From Company,Fra Company
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,Værdi eller Antal
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Minute,Minut
-DocType: Purchase Invoice,Purchase Taxes and Charges,Købe Skatter og Afgifter
-,Qty to Receive,Antal til Modtag
-DocType: Leave Block List,Leave Block List Allowed,Lad Block List tilladt
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +61,Conversion factor cannot be in fractions,Omregningsfaktor kan ikke være i fraktioner
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +358,You will use it to Login,Du vil bruge det til login
-DocType: Sales Partner,Retailer,Forhandler
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,Alle Leverandør Typer
-apps/erpnext/erpnext/stock/doctype/item/item.py +37,Item Code is mandatory because Item is not automatically numbered,"Item Code er obligatorisk, fordi Varen er ikke automatisk nummereret"
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +99,Quotation {0} not of type {1},Notering {0} ikke af typen {1}
-DocType: Maintenance Schedule Item,Maintenance Schedule Item,Vedligeholdelse Skema Vare
-DocType: Sales Order,%  Delivered,% Leveres
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,Bank Overdraft Account,Bank kassekredit
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +15,Make Salary Slip,Foretag lønseddel
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +18,Browse BOM,Gennemse BOM
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +175,Secured Loans,Sikrede lån
-apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +3,Awesome Products,Awesome Products
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +189,Opening Balance Equity,Åbning Balance Egenkapital
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +80,Cannot approve leave as you are not authorized to approve leaves on Block Dates,"Kan ikke godkende orlov, som du ikke har tilladelse til at godkende blade på Block Datoer"
-DocType: Appraisal,Appraisal,Vurdering
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +13,Lost-foam casting,Lost-skum støbning
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +47,Drawing,Tegning
-apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +22,Date is repeated,Dato gentages
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +148,Leave approver must be one of {0},Lad godkender skal være en af ​​{0}
-DocType: Hub Settings,Seller Email,Sælger Email
-DocType: Project,Total Purchase Cost (via Purchase Invoice),Samlet anskaffelsespris (via købsfaktura)
-DocType: Workstation Working Hour,Start Time,Start Time
-DocType: Item Price,Bulk Import Help,Bulk Import Hjælp
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +200,Select Quantity,Vælg antal
-apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,Godkendelse Rolle kan ikke være det samme som rolle reglen gælder for
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +36,Message Sent,Besked sendt
-DocType: Production Plan Sales Order,SO Date,SO Dato
-DocType: Sales Invoice,Rate at which Price list currency is converted to customer's base currency,"Hastighed, hvormed Prisliste valuta omregnes til kundens basisvaluta"
-DocType: Purchase Invoice Item,Net Amount (Company Currency),Nettobeløb (Company Valuta)
-DocType: BOM Operation,Hour Rate,Hour Rate
-DocType: Stock Settings,Item Naming By,Item Navngivning By
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +642,From Quotation,Fra tilbudsgivning
-apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},En anden Periode Lukning indtastning {0} er blevet foretaget efter {1}
-DocType: Production Order,Material Transferred for Manufacturing,Materiale Overført til Manufacturing
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +29,Account {0} does not exists,Konto {0} findes ikke
-DocType: Purchase Receipt Item,Purchase Order Item No,Indkøbsordre Konto nr
-DocType: System Settings,System Settings,Systemindstillinger
-DocType: Project,Project Type,Projekt type
-apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,Enten target qty eller målbeløbet er obligatorisk.
-apps/erpnext/erpnext/config/projects.py +38,Cost of various activities,Omkostninger ved forskellige aktiviteter
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +101,Not allowed to update stock transactions older than {0},Ikke lov til at opdatere lagertransaktioner ældre end {0}
-DocType: Item,Inspection Required,Inspection Nødvendig
-DocType: Purchase Invoice Item,PR Detail,PR Detail
-DocType: Sales Order,Fully Billed,Fuldt Billed
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +20,Cash In Hand,Kassebeholdning
-DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),Bruttovægt af pakken. Normalt nettovægt + emballagemateriale vægt. (Til print)
-DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Brugere med denne rolle får lov til at sætte indefrosne konti og oprette / ændre regnskabsposter mod indefrosne konti
-DocType: Serial No,Is Cancelled,Er Annulleret
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +281,My Shipments,Mine forsendelser
-DocType: Journal Entry,Bill Date,Bill Dato
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +43,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","Selv hvis der er flere Priser Regler med højeste prioritet, derefter følgende interne prioriteringer anvendt:"
-DocType: Supplier,Supplier Details,Leverandør Detaljer
-DocType: Communication,Recipients,Modtagere
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +146,Screwing,Skruning
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +96,Knurling,Rifling
-DocType: Expense Claim,Approval Status,Godkendelsesstatus
-DocType: Hub Settings,Publish Items to Hub,Udgive varer i Hub
-apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +44,From value must be less than to value in row {0},Fra værdi skal være mindre end at værdien i række {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +133,Wire Transfer,Bankoverførsel
-apps/erpnext/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py +25,Please select Bank Account,Vælg Bankkonto
-DocType: Newsletter,Create and Send Newsletters,Opret og send nyhedsbreve
-apps/frappe/frappe/public/js/frappe/views/reports/grid_report.js +305,From Date must be before To Date,Fra dato skal være før til dato
-DocType: Sales Order,Recurring Order,Tilbagevendende Order
-DocType: Company,Default Income Account,Standard Indkomst konto
-apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,Customer Group / kunde
-DocType: Item Group,Check this if you want to show in website,Markér dette hvis du ønsker at vise i website
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +190,Welcome to ERPNext,Velkommen til ERPNext
-DocType: Payment Reconciliation Payment,Voucher Detail Number,Voucher Detail Number
-apps/erpnext/erpnext/config/crm.py +146,Lead to Quotation,Føre til Citat
-DocType: Lead,From Customer,Fra kunde
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +37,Calls,Opkald
-DocType: Project,Total Costing Amount (via Time Logs),Total Costing Beløb (via Time Logs)
-DocType: Purchase Order Item Supplied,Stock UOM,Stock UOM
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Purchase Order {0} is not submitted,Indkøbsordre {0} er ikke indsendt
-,Projected,Projiceret
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},Løbenummer {0} ikke hører til Warehouse {1}
-apps/erpnext/erpnext/controllers/status_updater.py +136,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Bemærk: Systemet vil ikke kontrollere over-levering og over-booking for Item {0} som mængde eller beløb er 0
-DocType: Notification Control,Quotation Message,Citat Message
-DocType: Issue,Opening Date,Åbning Dato
-DocType: Journal Entry,Remark,Bemærkning
-DocType: Purchase Receipt Item,Rate and Amount,Sats og Beløb
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +95,Boring,Boring
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +667,From Sales Order,Fra kundeordre
-DocType: Blog Category,Parent Website Route,Parent Website Route
-DocType: Sales Order,Not Billed,Ikke Billed
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +107,Both Warehouse must belong to same Company,Både Warehouse skal tilhøre samme firma
-apps/erpnext/erpnext/public/js/templates/contact_list.html +31,No contacts added yet.,Ingen kontakter tilføjet endnu.
-apps/frappe/frappe/workflow/doctype/workflow/workflow_list.js +7,Not active,Ikke aktiv
-DocType: Purchase Receipt Item,Landed Cost Voucher Amount,Landed Cost Voucher Beløb
-DocType: Time Log,Batched for Billing,Batched for fakturering
-apps/erpnext/erpnext/config/accounts.py +23,Bills raised by Suppliers.,Regninger rejst af leverandører.
-DocType: POS Profile,Write Off Account,Skriv Off konto
-apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount Amount,Rabat Beløb
-DocType: Purchase Invoice,Return Against Purchase Invoice,Retur Against købsfaktura
-DocType: Item,Warranty Period (in days),Garantiperiode (i dage)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +550,e.g. VAT,fx moms
-apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,Punkt 4
-DocType: Journal Entry Account,Journal Entry Account,Kassekladde konto
-DocType: Shopping Cart Settings,Quotation Series,Citat Series
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +52,"An item exists with same name ({0}), please change the item group name or rename the item","Et element eksisterer med samme navn ({0}), skal du ændre navnet elementet gruppe eller omdøbe elementet"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +82,Hot metal gas forming,Hot metal gas danner
-DocType: Sales Order Item,Sales Order Date,Sales Order Date
-DocType: Sales Invoice Item,Delivered Qty,Leveres Antal
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +63,Warehouse {0}: Company is mandatory,Warehouse {0}: Selskabet er obligatorisk
-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.",Gå til den relevante gruppe (som regel finansieringskilde&gt; Aktuelle Passiver&gt; Skatter og Afgifter og oprette en ny konto (ved at klikke på Tilføj barn) af typen &quot;Skat&quot; og gøre nævne Skatteprocent.
-,Payment Period Based On Invoice Date,Betaling Periode Baseret på Fakturadato
-apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +50,Missing Currency Exchange Rates for {0},Manglende Valutakurser for {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +135,Laser cutting,Laserskæring
-DocType: Event,Monday,Mandag
-DocType: Journal Entry,Stock Entry,Stock indtastning
-DocType: Account,Payable,Betales
-DocType: Salary Slip,Arrear Amount,Bagud Beløb
-apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,Nye kunder
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +68,Gross Profit %,Gross Profit%
-DocType: Appraisal Goal,Weightage (%),Weightage (%)
-DocType: Bank Reconciliation Detail,Clearance Date,Clearance Dato
-DocType: Newsletter,Newsletter List,Nyhedsbrev List
-DocType: Process Payroll,Check if you want to send salary slip in mail to each employee while submitting salary slip,"Kontroller, om du vil sende lønseddel i e-mail til den enkelte medarbejder, samtidig indsende lønseddel"
-DocType: Lead,Address Desc,Adresse Desc
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +33,Atleast one of the Selling or Buying must be selected,Mindst en af ​​salg eller køb skal vælges
-apps/erpnext/erpnext/config/manufacturing.py +34,Where manufacturing operations are carried.,Hvor fremstillingsprocesser gennemføres.
-DocType: Page,All,Alle
-DocType: Stock Entry Detail,Source Warehouse,Kilde Warehouse
-DocType: Installation Note,Installation Date,Installation Dato
-DocType: Employee,Confirmation Date,Bekræftelse Dato
-DocType: C-Form,Total Invoiced Amount,Total Faktureret beløb
-DocType: Account,Sales User,Salg Bruger
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +46,Min Qty can not be greater than Max Qty,Min Antal kan ikke være større end Max Antal
-apps/frappe/frappe/core/page/permission_manager/permission_manager.js +428,Set,Sæt
-DocType: Lead,Lead Owner,Bly Owner
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +248,Warehouse is required,Warehouse kræves
-DocType: Employee,Marital Status,Civilstand
-DocType: Stock Settings,Auto Material Request,Auto Materiale Request
-DocType: Time Log,Will be updated when billed.,"Vil blive opdateret, når faktureret."
-apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +25,Current BOM and New BOM can not be same,Nuværende BOM og New BOM må ikke være samme
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +111,Date Of Retirement must be greater than Date of Joining,Dato for pensionering skal være større end Dato for Sammenføjning
-DocType: Sales Invoice,Against Income Account,Mod Indkomst konto
-apps/erpnext/erpnext/controllers/website_list_for_contact.py +69,{0}% Delivered,{0}% Delivered
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +78,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Vare {0}: Bestilte qty {1} kan ikke være mindre end minimum ordreantal {2} (defineret i punkt).
-DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Månedlig Distribution Procent
-DocType: Territory,Territory Targets,Territory Mål
-DocType: Delivery Note,Transporter Info,Transporter Info
-DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,Indkøbsordre Item Leveres
-apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,Brev hoveder for print skabeloner.
-apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,Titler til print skabeloner f.eks Proforma Invoice.
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +140,Valuation type charges can not marked as Inclusive,Værdiansættelse typen omkostninger ikke er markeret som Inclusive
-DocType: POS Profile,Update Stock,Opdatering Stock
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +128,Superfinishing,Superfinishing
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,"Forskellige UOM for elementer vil føre til forkert (Total) Vægt værdi. Sørg for, at Nettovægt for hvert punkt er i den samme UOM."
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM Rate
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +85,Please pull items from Delivery Note,Venligst trække elementer fra følgeseddel
-apps/erpnext/erpnext/accounts/utils.py +268,Journal Entries {0} are un-linked,Journaloptegnelser {0} er un-forbundet
-apps/erpnext/erpnext/accounts/general_ledger.py +134,Please mention Round Off Cost Center in Company,Henvis afrunde Cost Center i selskabet
-DocType: Purchase Invoice,Terms,Betingelser
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +242,Create New,Opret ny
-DocType: Buying Settings,Purchase Order Required,Indkøbsordre Påkrævet
-,Item-wise Sales History,Vare-wise Sales History
-DocType: Expense Claim,Total Sanctioned Amount,Total Sanktioneret Beløb
-,Purchase Analytics,Køb Analytics
-DocType: Sales Invoice Item,Delivery Note Item,Levering Note Vare
-DocType: Expense Claim,Task,Opgave
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +57,Shaving,Barbering
-DocType: Purchase Taxes and Charges,Reference Row #,Henvisning Row #
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},Batchnummer er obligatorisk for Item {0}
-apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js +14,This is a root sales person and cannot be edited.,Dette er en rod salg person og kan ikke redigeres.
-,Stock Ledger,Stock Ledger
-DocType: Salary Slip Deduction,Salary Slip Deduction,Lønseddel Fradrag
-apps/frappe/frappe/desk/doctype/note/note_list.js +3,Notes,Noter
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +199,Select a group node first.,Vælg en gruppe node først.
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +74,Purpose must be one of {0},Formålet skal være en af ​​{0}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +108,Fill the form and save it,Udfyld formularen og gemme det
-DocType: Production Planning Tool,Download a report containing all raw materials with their latest inventory status,Download en rapport med alle råvarer med deres seneste opgørelse status
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +94,Facing,Facing
-DocType: Leave Application,Leave Balance Before Application,Lad Balance Før Application
-DocType: SMS Center,Send SMS,Send SMS
-DocType: Company,Default Letter Head,Standard Letter hoved
-DocType: Time Log,Billable,Faktureres
-DocType: Authorization Rule,This will be used for setting rule in HR module,Dette vil blive brugt til at indstille regel i HR-modulet
-DocType: Account,Rate at which this tax is applied,"Hastighed, hvormed denne afgift anvendes"
-apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reorder Qty,Genbestil Antal
-DocType: Company,Stock Adjustment Account,Stock Justering konto
-DocType: Journal Entry,Write Off,Skriv Off
-DocType: Time Log,Operation ID,Operation ID
-DocType: Employee,"System User (login) ID. If set, it will become default for all HR forms.","System Bruger (login) ID. Hvis sat, vil det blive standard for alle HR-formularer."
-apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}: Fra {1}
-DocType: Task,depends_on,depends_on
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +86,Opportunity Lost,Opportunity Lost
-DocType: Features Setup,"Discount Fields will be available in Purchase Order, Purchase Receipt, Purchase Invoice","Discount Fields vil være tilgængelig i Indkøbsordre, kvittering, købsfaktura"
-DocType: Report,Report Type,Rapporttype
-apps/frappe/frappe/core/doctype/user/user.js +130,Loading,Loading
-DocType: BOM Replace Tool,BOM Replace Tool,BOM Erstat Værktøj
-apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,Land klogt standardadresse Skabeloner
-apps/erpnext/erpnext/accounts/party.py +287,Due / Reference Date cannot be after {0},Due / reference Dato kan ikke være efter {0}
-apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,Data import og eksport
-DocType: Features Setup,If you involve in manufacturing activity. Enables Item 'Is Manufactured',Hvis du inddrage i fremstillingsindustrien aktivitet. Aktiverer Item &#39;Er Fremstillet&#39;
-DocType: Sales Invoice,Rounded Total,Afrundet alt
-DocType: Product Bundle,List items that form the package.,"Listeelementer, der danner pakken."
-apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,Procentdel Tildeling bør være lig med 100%
-DocType: Serial No,Out of AMC,Ud af AMC
-DocType: Purchase Order Item,Material Request Detail No,Materiale Request Detail Nej
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +97,Hard turning,Hård drejning
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +33,Make Maintenance Visit,Make Vedligeholdelse Besøg
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +187,Please contact to the user who have Sales Master Manager {0} role,"Kontakt venligst til den bruger, der har Sales Master manager {0} rolle"
-DocType: Company,Default Cash Account,Standard Kontant konto
-apps/erpnext/erpnext/config/accounts.py +79,Company (not Customer or Supplier) master.,Company (ikke kunde eller leverandør) herre.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +106,Please enter 'Expected Delivery Date',Indtast &#39;Forventet leveringsdato&#39;
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +187,Delivery Notes {0} must be cancelled before cancelling this Sales Order,"Følgesedler {0} skal annulleres, før den annullerer denne Sales Order"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +373,Paid amount + Write Off Amount can not be greater than Grand Total,Betalt beløb + Skriv Off Beløb kan ikke være større end Grand Total
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} er ikke en gyldig Batchnummer for Item {1}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,Note: There is not enough leave balance for Leave Type {0},Bemærk: Der er ikke nok orlov balance for Leave Type {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.","Bemærk: Hvis betaling ikke sker mod nogen reference, gør Kassekladde manuelt."
-DocType: Item,Supplier Items,Leverandør Varer
-DocType: Opportunity,Opportunity Type,Opportunity Type
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +42,New Company,Ny Company
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +56,Cost Center is required for 'Profit and Loss' account {0},Cost center er nødvendig for &quot;Resultatopgørelsen&quot; konto {0}
-apps/erpnext/erpnext/setup/doctype/company/delete_company_transactions.py +17,Transactions can only be deleted by the creator of the Company,Transaktioner kan kun slettes af skaberen af ​​selskabet
-apps/erpnext/erpnext/accounts/general_ledger.py +21,Incorrect number of General Ledger Entries found. You might have selected a wrong Account in the transaction.,Forkert antal finansposter fundet. Du har muligvis valgt et forkert konto i transaktionen.
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +31,To create a Bank Account,For at oprette en bankkonto
-DocType: Hub Settings,Publish Availability,Offentliggøre Tilgængelighed
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +105,Date of Birth cannot be greater than today.,Fødselsdato kan ikke være større end i dag.
-,Stock Ageing,Stock Ageing
-apps/erpnext/erpnext/controllers/accounts_controller.py +200,{0} '{1}' is disabled,{0} &#39;{1}&#39; er deaktiveret
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Sæt som Open
-DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Sende automatiske e-mails til Kontakter på Indsendelse transaktioner.
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +232,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
-					Available Qty: {4}, Transfer Qty: {5}","Række {0}: Antal ikke avalable i lageret {1} på {2} {3}. Tilgængelig Antal: {4}, Transfer Antal: {5}"
-apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,Punkt 3
-DocType: Event,Sunday,Søndag
-DocType: Sales Team,Contribution (%),Bidrag (%)
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +455,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,Bemærk: Betaling indtastning vil ikke blive oprettet siden &#39;Kontant eller bank konto&#39; er ikke angivet
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +171,Responsibilities,Ansvar
-apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Template,Skabelon
-DocType: Sales Person,Sales Person Name,Salg Person Name
-apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,Indtast venligst mindst 1 faktura i tabellen
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +511,Add Users,Tilføj Brugere
-DocType: Pricing Rule,Item Group,Item Group
-DocType: Task,Actual Start Date (via Time Logs),Faktiske startdato (via Time Logs)
-DocType: Stock Reconciliation Item,Before reconciliation,Før forsoning
-apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +12,To {0},Til {0}
-DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Skatter og Afgifter Tilføjet (Company Valuta)
-apps/erpnext/erpnext/stock/doctype/item/item.py +340,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Item Skat Row {0} skal have højde for typen Skat eller indtægt eller omkostning eller Afgiftspligtens
-DocType: Sales Order,Partly Billed,Delvist Billed
-DocType: Item,Default BOM,Standard BOM
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +79,Decambering,Decambering
-apps/erpnext/erpnext/setup/doctype/company/company.js +22,Please re-type company name to confirm,Prøv venligst igen typen firmanavn for at bekræfte
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,Total Enestående Amt
-DocType: Time Log Batch,Total Hours,Total Hours
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +268,Total Debit must be equal to Total Credit. The difference is {0},Samlet Debit skal være lig med Total Credit. Forskellen er {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +11,Automotive,Automotive
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +37,Item is required,Element er påkrævet
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +25,Metal injection molding,Metal sprøjtestøbning
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +684,From Delivery Note,Fra følgeseddel
-DocType: Time Log,From Time,Fra Time
-DocType: Notification Control,Custom Message,Tilpasset Message
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +33,Investment Banking,Investment Banking
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +261,"Select your Country, Time Zone and Currency","Vælg dit land, tidszone og valuta"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +369,Cash or Bank Account is mandatory for making payment entry,Kontant eller bankkonto er obligatorisk for betalingen post
-DocType: Purchase Invoice,Price List Exchange Rate,Prisliste Exchange Rate
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +91,Pickling,Bejdsning
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +18,Sand casting,Sandstøbning
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +117,Electroplating,Galvanisering
-DocType: Purchase Invoice Item,Rate,Rate
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +62,Intern,Intern
-DocType: Newsletter,A Lead with this email id should exist,Et emne med dette e-mail-id skal være oprettet.
-DocType: Stock Entry,From BOM,Fra BOM
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +34,Basic,Grundlæggende
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,Stock transaktioner før {0} er frosset
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +217,Please click on 'Generate Schedule',Klik på &quot;Generer Schedule &#39;
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +61,To Date should be same as From Date for Half Day leave,Til dato skal være samme som fra dato for Half Day orlov
-apps/erpnext/erpnext/config/stock.py +110,"e.g. Kg, Unit, Nos, m","f.eks Kg, Unit, Nos, m"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +96,Reference No is mandatory if you entered Reference Date,"Referencenummer er obligatorisk, hvis du har indtastet reference Dato"
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +108,Date of Joining must be greater than Date of Birth,Dato for Sammenføjning skal være større end Fødselsdato
-DocType: Salary Structure,Salary Structure,Løn Struktur
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +242,"Multiple Price Rule exists with same criteria, please resolve \
-			conflict by assigning priority. Price Rules: {0}","Multiple Pris Regel eksisterer med samme kriterier, skal du løse \ konflikten ved at tildele prioritet. Pris Regler: {0}"
-DocType: Account,Bank,Bank
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +9,Airline,Flyselskab
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +493,Issue Material,Issue Materiale
-DocType: Material Request Item,For Warehouse,For Warehouse
-DocType: Employee,Offer Date,Offer Dato
-DocType: Hub Settings,Access Token,Access Token
-DocType: Sales Invoice Item,Serial No,Løbenummer
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +144,Please enter Maintaince Details first,Indtast venligst Maintaince Detaljer først
-DocType: Item,Is Fixed Asset Item,Er Fast aktivpost
-DocType: Stock Entry,Including items for sub assemblies,Herunder elementer til sub forsamlinger
-DocType: Features Setup,"If you have long print formats, this feature can be used to split the page to be printed on multiple pages with all headers and footers on each page","Hvis du har lange trykte formater, kan denne funktion bruges til at opdele side, der skal udskrives på flere sider med alle sidehoveder og sidefødder på hver side"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +131,Hobbing,Hobbing
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +98,All Territories,Alle områder
-DocType: Purchase Invoice,Items,Varer
-DocType: Fiscal Year,Year Name,År Navn
-DocType: Process Payroll,Process Payroll,Proces Payroll
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +59,There are more holidays than working days this month.,Der er flere helligdage end arbejdsdage i denne måned.
-DocType: Product Bundle Item,Product Bundle Item,Produkt Bundle Item
-DocType: Sales Partner,Sales Partner Name,Salg Partner Navn
-DocType: Purchase Invoice Item,Image View,Billede View
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +113,Finishing & industrial finishing,Efterbehandling &amp; industriel efterbehandling
-DocType: Issue,Opening Time,Åbning tid
-apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,Fra og Til dato kræves
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +46,Securities & Commodity Exchanges,Værdipapirer og Commodity Exchanges
-DocType: Shipping Rule,Calculate Based On,Beregn baseret på
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +98,Drilling,Boring
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +28,Blow molding,Blæsestøbning
-DocType: Purchase Taxes and Charges,Valuation and Total,Værdiansættelse og Total
-apps/erpnext/erpnext/stock/doctype/item/item.js +43,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,"Dette element er en Variant af {0} (skabelon). Attributter vil blive kopieret over fra skabelonen, medmindre &#39;Ingen Copy &quot;er indstillet"
-DocType: Account,Purchase User,Køb Bruger
-DocType: Notification Control,Customize the Notification,Tilpas Underretning
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +87,Hammering,Hamring
-DocType: Web Page,Slideshow,Slideshow
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +24,Default Address Template cannot be deleted,Standard Adresse Skabelon kan ikke slettes
-DocType: Sales Invoice,Shipping Rule,Forsendelse Rule
-DocType: Journal Entry,Print Heading,Print Overskrift
-DocType: Quotation,Maintenance Manager,Vedligeholdelse manager
-DocType: Workflow State,Search,Søg
-apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +54,Total cannot be zero,Samlede kan ikke være nul
-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,'Dage siden sidste ordre' skal være større end eller lig med nul
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +142,Brazing,Lodning
-DocType: C-Form,Amended From,Ændret Fra
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Raw Material,Raw Material
-DocType: Leave Application,Follow via Email,Følg via e-mail
-DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Skat Beløb Efter Discount Beløb
-apps/erpnext/erpnext/accounts/doctype/account/account.py +174,Child account exists for this account. You can not delete this account.,Eksisterer barn konto til denne konto. Du kan ikke slette denne konto.
-apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,Enten target qty eller målbeløbet er obligatorisk
-apps/erpnext/erpnext/stock/get_item_details.py +449,No default BOM exists for Item {0},Ingen standard BOM eksisterer for Item {0}
-DocType: Leave Control Panel,Carry Forward,Carry Forward
-apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +54,Cost Center with existing transactions can not be converted to ledger,Cost Center med eksisterende transaktioner kan ikke konverteres til finans
-DocType: Department,Days for which Holidays are blocked for this department.,"Dage, som Holidays er blokeret for denne afdeling."
-,Produced,Produceret
-DocType: Item,Item Code for Suppliers,Item Code for leverandører
-DocType: Issue,Raised By (Email),Rejst af (E-mail)
-apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +72,General,Generelt
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +495,Attach Letterhead,Vedhæft Brevpapir
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +272,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',"Ikke kan fradrage, når kategorien er for &quot;Værdiansættelse&quot; eller &quot;Værdiansættelse og Total &#39;"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +542,"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.","Liste dine skattemæssige hoveder (f.eks moms, Told osv de skal have entydige navne) og deres faste satser. Dette vil skabe en standard skabelon, som du kan redigere og tilføje mere senere."
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial Nos Required for Serialized Item {0},Seriel Nos Nødvendig for Serialized Item {0}
-DocType: Journal Entry,Bank Entry,Bank indtastning
-DocType: Authorization Rule,Applicable To (Designation),Gælder for (Betegnelse)
-DocType: Blog Post,Blog Post,Blog-indlæg
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,Gruppér efter
-apps/erpnext/erpnext/config/accounts.py +143,Enable / disable currencies.,Aktivere / deaktivere valutaer.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Postal Expenses,Postale Udgifter
-apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),I alt (Amt)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +26,Entertainment & Leisure,Entertainment &amp; Leisure
-DocType: Purchase Order,The date on which recurring order will be stop,"Den dato, hvor tilbagevendende ordre vil blive stoppe"
-DocType: Quality Inspection,Item Serial No,Vare Løbenummer
-apps/erpnext/erpnext/controllers/status_updater.py +142,{0} must be reduced by {1} or you should increase overflow tolerance,"{0} skal reduceres med {1}, eller du bør øge overflow tolerance"
-apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Present,Samlet Present
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Hour,Time
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +138,"Serialized Item {0} cannot be updated \
-					using Stock Reconciliation",Føljeton Item {0} kan ikke opdateres \ hjælp Stock Afstemning
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +488,Transfer Material to Supplier,Overførsel Materiale til Leverandøren
-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,Ny Løbenummer kan ikke have Warehouse. Warehouse skal indstilles af Stock indtastning eller kvittering
-DocType: Lead,Lead Type,Lead Type
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +82,Create Quotation,Opret Citat
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +306,All these items have already been invoiced,Alle disse punkter er allerede blevet faktureret
-apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},Kan godkendes af {0}
-DocType: Shipping Rule,Shipping Rule Conditions,Forsendelse Regel Betingelser
-DocType: BOM Replace Tool,The new BOM after replacement,Den nye BOM efter udskiftning
-DocType: Features Setup,Point of Sale,Point of Sale
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +83,Curling,Curling
-DocType: Account,Tax,Skat
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +28,Row {0}: {1} is not a valid {2},Række {0}: {1} er ikke en gyldig {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +89,Refining,Raffinering
-DocType: Production Planning Tool,Production Planning Tool,Produktionsplanlægning Tool
-DocType: Quality Inspection,Report Date,Report Date
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +130,Routing,Routing
-DocType: C-Form,Invoices,Fakturaer
-DocType: Job Opening,Job Title,Jobtitel
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +80,{0} Recipients,{0} Modtagere
-DocType: Features Setup,Item Groups in Details,Varegrupper i Detaljer
-apps/erpnext/erpnext/accounts/page/pos/pos.js +4,Start Point-of-Sale (POS),Start Point-of-Sale (POS)
-apps/erpnext/erpnext/config/support.py +28,Visit report for maintenance call.,Besøg rapport til vedligeholdelse opkald.
-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.,"Procentdel, du får lov til at modtage eller levere mere mod den bestilte mængde. For eksempel: Hvis du har bestilt 100 enheder. og din Allowance er 10%, så du får lov til at modtage 110 enheder."
-DocType: Pricing Rule,Customer Group,Customer Group
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +164,Expense account is mandatory for item {0},Udgiftskonto er obligatorisk for element {0}
-DocType: Item,Website Description,Website Beskrivelse
-DocType: Serial No,AMC Expiry Date,AMC Udløbsdato
-,Sales Register,Salg Register
-DocType: Quotation,Quotation Lost Reason,Citat Lost Årsag
-DocType: Address,Plant,Plant
-DocType: DocType,Setup,Opsætning
-apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,Der er intet at redigere.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +39,Cold rolling,Koldvalsning
-DocType: Customer Group,Customer Group Name,Customer Group Name
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +408,Please remove this Invoice {0} from C-Form {1},Fjern denne faktura {0} fra C-Form {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,Vælg Carry Forward hvis du også ønsker at inkludere foregående regnskabsår balance blade til indeværende regnskabsår
-DocType: GL Entry,Against Voucher Type,Mod Voucher Type
-DocType: Item,Attributes,Attributter
-DocType: Packing Slip,Get Items,Få Varer
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +186,Please enter Write Off Account,Indtast venligst Skriv Off konto
-apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +71,Last Order Date,Sidste Ordredato
-DocType: DocField,Image,Billede
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +179,Make Excise Invoice,Make Excise Faktura
-apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +39,Account {0} does not belongs to company {1},Konto {0} ikke hører til virksomheden {1}
-DocType: Communication,Other,Andre
-DocType: C-Form,C-Form,C-Form
-apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +146,Operation ID not set,Operation ID ikke indstillet
-DocType: Production Order,Planned Start Date,Planlagt startdato
-DocType: Serial No,Creation Document Type,Creation Dokumenttype
-DocType: Leave Type,Is Encash,Er indløse
-DocType: Purchase Invoice,Mobile No,Mobile Ingen
-DocType: Payment Tool,Make Journal Entry,Make Kassekladde
-DocType: Leave Allocation,New Leaves Allocated,Nye Blade Allokeret
-apps/erpnext/erpnext/controllers/trends.py +257,Project-wise data is not available for Quotation,Projekt-wise data er ikke tilgængelig for Citat
-DocType: Project,Expected End Date,Forventet Slutdato
-DocType: Appraisal Template,Appraisal Template Title,Vurdering Template Titel
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +440,Commercial,Kommerciel
-DocType: Cost Center,Distribution Id,Distribution Id
-apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +14,Awesome Services,Awesome Services
-apps/erpnext/erpnext/config/manufacturing.py +29,All Products or Services.,Alle produkter eller tjenesteydelser.
-DocType: Purchase Invoice,Supplier Address,Leverandør Adresse
-DocType: Contact Us Settings,Address Line 2,Adresse Linje 2
-DocType: ToDo,Reference,Henvisning
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +59,Perforating,Perforering
-apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,Out Antal
-apps/erpnext/erpnext/config/accounts.py +128,Rules to calculate shipping amount for a sale,Regler til at beregne forsendelse beløb for et salg
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +29,Series is mandatory,Serien er obligatorisk
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +28,Financial Services,Financial Services
-DocType: Tax Rule,Sales,Salg
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +173,Warehouse required for stock Item {0},Warehouse kræves for lager Vare {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,Cr
-DocType: Customer,Default Receivable Accounts,Standard kan modtages Konti
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +102,Sawing,Savning
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +32,Laminating,Laminering
-DocType: Item Reorder,Transfer,Transfer
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +549,Fetch exploded BOM (including sub-assemblies),Hent eksploderede BOM (herunder underenheder)
-DocType: Authorization Rule,Applicable To (Employee),Gælder for (Medarbejder)
-apps/erpnext/erpnext/controllers/accounts_controller.py +101,Due Date is mandatory,Forfaldsdato er obligatorisk
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +143,Sintering,Sintring
-DocType: Journal Entry,Pay To / Recd From,Betal Til / RECD Fra
-DocType: Naming Series,Setup Series,Opsætning Series
-DocType: Supplier,Contact HTML,Kontakt HTML
-DocType: Landed Cost Voucher,Purchase Receipts,Køb Kvitteringer
-DocType: Payment Reconciliation,Maximum Amount,Maksimumbeløb
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +27,How Pricing Rule is applied?,Hvordan Prisfastsættelse Regel anvendes?
-DocType: Quality Inspection,Delivery Note No,Levering Note Nej
-DocType: Company,Retail,Retail
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +108,Customer {0} does not exist,Kunde {0} eksisterer ikke
-DocType: Attendance,Absent,Fraværende
-DocType: Product Bundle,Product Bundle,Produkt Bundle
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +165,Crushing,Knusning
-DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Købe Skatter og Afgifter Skabelon
-DocType: Upload Attendance,Download Template,Hent skabelon
-DocType: GL Entry,Remarks,Bemærkninger
-DocType: Purchase Order Item Supplied,Raw Material Item Code,Raw Material Item Code
-DocType: Journal Entry,Write Off Based On,Skriv Off baseret på
-DocType: Features Setup,POS View,POS View
-apps/erpnext/erpnext/config/stock.py +38,Installation record for a Serial No.,Installation rekord for en Serial No.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +9,Continuous casting,Kontinuerlig støbning
-apps/erpnext/erpnext/public/js/queries.js +39,Please specify a,Angiv en
-DocType: Offer Letter,Awaiting Response,Afventer svar
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +80,Cold sizing,Kolde dimensionering
-DocType: Salary Slip,Earning & Deduction,Earning &amp; Fradrag
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +76,Account {0} cannot be a Group,Konto {0} kan ikke være en gruppe
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +259,Region,Region
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +213,Optional. This setting will be used to filter in various transactions.,Valgfri. Denne indstilling vil blive brugt til at filtrere i forskellige transaktioner.
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +104,Negative Valuation Rate is not allowed,Negative Værdiansættelse Rate er ikke tilladt
-DocType: Holiday List,Weekly Off,Ugentlig Off
-DocType: Fiscal Year,"For e.g. 2012, 2012-13","Til fx 2012, 2012-13"
-apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +32,Provisional Profit / Loss (Credit),Foreløbig Profit / Loss (Credit)
-DocType: Sales Invoice,Return Against Sales Invoice,Retur Against Sales Invoice
-apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +32,Item 5,Punkt 5
-apps/erpnext/erpnext/accounts/utils.py +276,Please set default value {0} in Company {1},Indstil standard værdi {0} i Company {1}
-DocType: Serial No,Creation Time,Creation Time
-apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +62,Total Revenue,Total Revenue
-DocType: Sales Invoice,Product Bundle Help,Produkt Bundle Hjælp
-,Monthly Attendance Sheet,Månedlig Deltagelse Sheet
-apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +16,No record found,Ingen post fundet
-apps/erpnext/erpnext/controllers/stock_controller.py +175,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Udgiftområde er obligatorisk for varen {2}
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,Account {0} is inactive,Konto {0} er inaktiv
-DocType: GL Entry,Is Advance,Er Advance
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,Fremmøde Fra Dato og fremmøde til dato er obligatorisk
-apps/erpnext/erpnext/controllers/buying_controller.py +131,Please enter 'Is Subcontracted' as Yes or No,Indtast &quot;underentreprise&quot; som Ja eller Nej
-DocType: Sales Team,Contact No.,Kontakt No.
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,'Profit and Loss' type account {0} not allowed in Opening Entry,'Resultatopgørelsen' konto {0} ikke tilladt i 'Åbning balance'
-DocType: Workflow State,Time,Tid
-DocType: Features Setup,Sales Discounts,Salg Rabatter
-DocType: Hub Settings,Seller Country,Sælger Land
-DocType: Authorization Rule,Authorization Rule,Autorisation Rule
-DocType: Sales Invoice,Terms and Conditions Details,Betingelser Detaljer
-DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,Salg Skatter og Afgifter Skabelon
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +10,Apparel & Accessories,Beklædning og tilbehør
-apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +67,Number of Order,Antal Order
-DocType: Item Group,HTML / Banner that will show on the top of product list.,"HTML / Banner, der vil vise på toppen af ​​produktliste."
-DocType: Shipping Rule,Specify conditions to calculate shipping amount,Angiv betingelser for at beregne forsendelse beløb
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +121,Add Child,Tilføj Child
-DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,Rolle Tilladt til Indstil Frosne Konti og Rediger Frosne Entries
-apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +52,Cannot convert Cost Center to ledger as it has child nodes,"Kan ikke konvertere Cost Center til hovedbog, som det har barneknudepunkter"
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +47,Conversion Factor is required,Konvertering Factor er nødvendig
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +37,Serial #,Serial #
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +87,Commission on Sales,Provision på salg
-DocType: Offer Letter Term,Value / Description,/ Beskrivelse
-,Customers Not Buying Since Long Time,Kunder Ikke købe siden lang tid
-DocType: Production Order,Expected Delivery Date,Forventet leveringsdato
-apps/erpnext/erpnext/accounts/general_ledger.py +121,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Debet og Credit ikke ens for {0} # {1}. Forskellen er {2}.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +48,Bulging,Svulmende
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +11,Evaporative-pattern casting,Fordampningsemissioner-mønster støbning
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Entertainment Expenses,Repræsentationsudgifter
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +195,Sales Invoice {0} must be cancelled before cancelling this Sales Order,"Salg Faktura {0} skal annulleres, før den annullerer denne Sales Order"
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +61,Age,Alder
-DocType: Time Log,Billing Amount,Fakturering Beløb
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +84,Invalid quantity specified for item {0}. Quantity should be greater than 0.,Ugyldig mængde angivet for element {0}. Mængde bør være større end 0.
-apps/erpnext/erpnext/config/hr.py +18,Applications for leave.,Ansøgning om orlov.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +172,Account with existing transaction can not be deleted,Konto med eksisterende transaktion kan ikke slettes
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Legal Expenses,Juridiske Udgifter
-DocType: Sales Order,"The day of the month on which auto order will be generated e.g. 05, 28 etc","Den dag i den måned, hvor auto ordre vil blive genereret f.eks 05, 28 osv"
-DocType: Sales Invoice,Posting Time,Udstationering Time
-DocType: Sales Order,% Amount Billed,% Beløb Billed
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Telephone Expenses,Telefon Udgifter
-DocType: Sales Partner,Logo,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.,"Markér dette hvis du ønsker at tvinge brugeren til at vælge en serie før du gemmer. Der vil ikke være standard, hvis du markerer dette."
-apps/erpnext/erpnext/stock/get_item_details.py +107,No Item with Serial No {0},Ingen Vare med Serial Nej {0}
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +68,Direct Expenses,Direkte udgifter
-apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,Ny kunde Omsætning
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Travel Expenses,Rejser Udgifter
-DocType: Maintenance Visit,Breakdown,Sammenbrud
-DocType: Bank Reconciliation Detail,Cheque Date,Check Dato
-apps/erpnext/erpnext/accounts/doctype/account/account.py +47,Account {0}: Parent account {1} does not belong to company: {2},Konto {0}: Forældre-konto {1} tilhører ikke virksomheden: {2}
-apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted all transactions related to this company!,Succesfuld slettet alle transaktioner i forbindelse med dette selskab!
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +111,Honing,Honing
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +58,Probation,Kriminalforsorgen
-apps/erpnext/erpnext/stock/doctype/item/item.py +264,Default Warehouse is mandatory for stock Item.,Standard Warehouse er obligatorisk for lager Item.
-DocType: Feed,Full Name,Fulde navn
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +148,Clinching,Clinching
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +191,Payment of salary for the month {0} and year {1},Udbetaling af løn for måneden {0} og år {1}
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,Samlet indbetalte beløb
-,Transferred Qty,Overført Antal
-apps/erpnext/erpnext/config/learn.py +11,Navigating,Navigering
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +137,Planning,Planlægning
-apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +9,Make Time Log Batch,Make Time Log Batch
-apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Issued,Udstedt
-DocType: Project,Total Billing Amount (via Time Logs),Total Billing Beløb (via Time Logs)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +629,We sell this Item,Vi sælger denne Vare
-apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +65,Supplier Id,Leverandør id
-DocType: Journal Entry,Cash Entry,Cash indtastning
-DocType: Sales Partner,Contact Desc,Kontakt Desc
-apps/erpnext/erpnext/config/hr.py +135,"Type of leaves like casual, sick etc.","Type blade som afslappet, syge etc."
-DocType: Email Digest,Send regular summary reports via Email.,Send regelmæssige sammenfattende rapporter via e-mail.
-DocType: Brand,Item Manager,Item manager
-DocType: Cost Center,Add rows to set annual budgets on Accounts.,Tilføj rækker til at fastsætte årlige budgetter på Konti.
-DocType: Buying Settings,Default Supplier Type,Standard Leverandør Type
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +160,Quarrying,Stenbrud
-DocType: Production Order,Total Operating Cost,Samlede driftsomkostninger
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +160,Note: Item {0} entered multiple times,Bemærk: Konto {0} indtastet flere gange
-apps/erpnext/erpnext/config/crm.py +27,All Contacts.,Alle kontakter.
-DocType: Newsletter,Test Email Id,Test Email Id
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +394,Company Abbreviation,Firma Forkortelse
-DocType: Features Setup,If you follow Quality Inspection. Enables Item QA Required and QA No in Purchase Receipt,Hvis du følger kvalitetskontrol. Aktiverer Item QA Nødvendig og QA Ingen i kvittering
-DocType: GL Entry,Party Type,Party Type
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +68,Raw material cannot be same as main Item,Råvarer kan ikke være samme som vigtigste element
-DocType: Item Attribute Value,Abbreviation,Forkortelse
-apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,Ikke authroized da {0} overskrider grænser
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +30,Rotational molding,Rotationsstøbning
-apps/erpnext/erpnext/config/hr.py +115,Salary template master.,Løn skabelon mester.
-DocType: Leave Type,Max Days Leave Allowed,Max Dage Leave tilladt
-DocType: Payment Tool,Set Matching Amounts,Set matchende Beløb
-DocType: Purchase Invoice,Taxes and Charges Added,Skatter og Afgifter Tilføjet
-,Sales Funnel,Salg Tragt
-apps/erpnext/erpnext/shopping_cart/utils.py +33,Cart,Kurv
-apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +136,Thank you for your interest in subscribing to our updates,Tak for din interesse i at abonnere på vores opdateringer
-,Qty to Transfer,Antal til Transfer
-apps/erpnext/erpnext/config/selling.py +18,Quotes to Leads or Customers.,Citater til Leads eller kunder.
-DocType: Stock Settings,Role Allowed to edit frozen stock,Rolle Tilladt at redigere frosne lager
-,Territory Target Variance Item Group-Wise,Territory Target Variance Item Group-Wise
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +101,All Customer Groups,Alle kundegrupper
-apps/erpnext/erpnext/controllers/accounts_controller.py +474,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} er obligatorisk. Måske Valutaveksling record er ikke skabt for {1} til {2}.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +41,Account {0}: Parent account {1} does not exist,Konto {0}: Forældre-konto {1} findes ikke
-DocType: Purchase Invoice Item,Price List Rate (Company Currency),Prisliste Rate (Company Valuta)
-DocType: Account,Temporary,Midlertidig
-DocType: Address,Preferred Billing Address,Foretrukne Faktureringsadresse
-DocType: Monthly Distribution Percentage,Percentage Allocation,Procentvise fordeling
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +86,Secretary,Sekretær
-DocType: Serial No,Distinct unit of an Item,Særskilt enhed af et element
-DocType: Pricing Rule,Buying,Køb
-DocType: HR Settings,Employee Records to be created by,Medarbejder Records at være skabt af
-apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +24,This Time Log Batch has been cancelled.,This Time Log Batch er blevet annulleret.
-DocType: Salary Slip Earning,Salary Slip Earning,Lønseddel Earning
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Creditors,Kreditorer
-DocType: Purchase Taxes and Charges,Item Wise Tax Detail,Item Wise Tax Detail
-,Item-wise Price List Rate,Item-wise Prisliste Rate
-DocType: Purchase Order Item,Supplier Quotation,Leverandør Citat
-DocType: Quotation,In Words will be visible once you save the Quotation.,"I Ord vil være synlig, når du gemmer tilbuddet."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +68,Ironing,Strygning
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is stopped,{0} {1} er stoppet
-apps/erpnext/erpnext/stock/doctype/item/item.py +352,Barcode {0} already used in Item {1},Stregkode {0} allerede brugt i Item {1}
-DocType: Lead,Add to calendar on this date,Føj til kalender på denne dato
-apps/erpnext/erpnext/config/selling.py +132,Rules for adding shipping costs.,Regler for at tilføje forsendelsesomkostninger.
-apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,Kunden er nødvendig
-DocType: Letter Head,Letter Head,Brev hoved
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0} er obligatorisk for Return
-DocType: Purchase Order,To Receive,At Modtage
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +33,Shrink fitting,Shrink fitting
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +522,user@example.com,user@example.com
-DocType: Email Digest,Income / Expense,Indtægter / Expense
-DocType: Employee,Personal Email,Personlig Email
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +58,Total Variance,Samlet Varians
-DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.","Hvis aktiveret, vil systemet sende bogføring for opgørelse automatisk."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +15,Brokerage,Brokerage
-DocType: Production Order Operation,"in Minutes
-Updated via 'Time Log'",i minutter Opdateret via &#39;Time Log&#39;
-DocType: Customer,From Lead,Fra Lead
-apps/erpnext/erpnext/config/manufacturing.py +19,Orders released for production.,Ordrer frigives til produktion.
-apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +42,Select Fiscal Year...,Vælg regnskabsår ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +442,POS Profile required to make POS Entry,POS profil kræves for at gøre POS indtastning
-DocType: Hub Settings,Name Token,Navn Token
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +106,Planing,Planing
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Selling,Standard Selling
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +137,Atleast one warehouse is mandatory,Mindst én lageret er obligatorisk
-DocType: Serial No,Out of Warranty,Ud af garanti
-DocType: BOM Replace Tool,Replace,Udskifte
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +314,{0} against Sales Invoice {1},{0} mod salgsfaktura {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +49,Please enter default Unit of Measure,Indtast venligst standard Måleenhed
-DocType: Purchase Invoice Item,Project Name,Projektnavn
-DocType: Workflow State,Edit,Edit
-DocType: Journal Entry Account,If Income or Expense,Hvis indtægter og omkostninger
-DocType: Features Setup,Item Batch Nos,Item Batch nr
-DocType: Stock Ledger Entry,Stock Value Difference,Stock Value Forskel
-apps/erpnext/erpnext/config/learn.py +204,Human Resource,Menneskelige Ressourcer
-DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,Betaling Afstemning Betaling
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +36,Tax Assets,Skatteaktiver
-DocType: BOM Item,BOM No,BOM Ingen
-DocType: Contact Us Settings,Pincode,Pinkode
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,Journal Entry {0} does not have account {1} or already matched against other voucher,Kassekladde {0} har ikke konto {1} eller allerede matchet mod andre kupon
-DocType: Item,Moving Average,Glidende gennemsnit
-DocType: BOM Replace Tool,The BOM which will be replaced,Den BOM som vil blive erstattet
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +43,New Stock UOM must be different from current stock UOM,New Stock UOM skal være forskellig fra nuværende bestand UOM
-DocType: Account,Debit,Betalingskort
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +34,Leaves must be allocated in multiples of 0.5,"Blade skal afsættes i multipla af 0,5"
-DocType: Production Order,Operation Cost,Operation Cost
-apps/erpnext/erpnext/config/hr.py +71,Upload attendance from a .csv file,Upload fremmøde fra en .csv-fil
-apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,Enestående Amt
-DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,Fastsatte mål Item Group-wise for denne Sales Person.
-DocType: Warranty Claim,"To assign this issue, use the ""Assign"" button in the sidebar.",For at tildele problemet ved at bruge knappen &quot;Tildel&quot; i indholdsoversigten.
-DocType: Stock Settings,Freeze Stocks Older Than [Days],Frys Stocks Ældre end [dage]
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +40,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.","Hvis to eller flere Priser Regler er fundet på grundlag af de ovennævnte betingelser, er Priority anvendt. Prioritet er et tal mellem 0 og 20, mens Standardværdien er nul (blank). Højere antal betyder, at det vil have forrang, hvis der er flere Priser Regler med samme betingelser."
-apps/erpnext/erpnext/controllers/trends.py +36,Fiscal Year: {0} does not exists,Fiscal År: {0} ikke eksisterer
 DocType: Currency Exchange,To Currency,Til Valuta
-DocType: Leave Block List,Allow the following users to approve Leave Applications for block days.,Lad følgende brugere til at godkende Udfyld Ansøgninger om blok dage.
-apps/erpnext/erpnext/config/hr.py +155,Types of Expense Claim.,Typer af Expense krav.
-DocType: Item,Taxes,Skatter
-DocType: Project,Default Cost Center,Standard Cost center
-DocType: Purchase Invoice,End Date,Slutdato
-DocType: Employee,Internal Work History,Intern Arbejde Historie
-DocType: DocField,Column Break,Kolonne Break
-DocType: Event,Thursday,Torsdag
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +42,Private Equity,Private Equity
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +93,Turning,Drejning
-DocType: Maintenance Visit,Customer Feedback,Kundefeedback
-DocType: Account,Expense,Expense
-DocType: Sales Invoice,Exhibition,Udstilling
-apps/erpnext/erpnext/stock/utils.py +89,Item {0} ignored since it is not a stock item,Element {0} ignoreres da det ikke er en lagervare
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +29,Submit this Production Order for further processing.,Indsend denne produktionsordre til videre forarbejdning.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +21,"To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled.","Hvis du ikke vil anvende Prisfastsættelse Regel i en bestemt transaktion, bør alle gældende Priser Regler deaktiveres."
-DocType: Company,Domain,Domæne
-,Sales Order Trends,Salg Order Trends
-DocType: Employee,Held On,Held On
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +33,Production Item,Produktion Vare
-,Employee Information,Medarbejder Information
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,Rate (%),Sats (%)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +407,Financial Year End Date,Regnskabsår Slutdato
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Voucher No, if grouped by Voucher","Kan ikke filtrere baseret på blad nr, hvis grupperet efter Voucher"
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +484,Make Supplier Quotation,Foretag Leverandør Citat
-DocType: Quality Inspection,Incoming,Indgående
-DocType: BOM,Materials Required (Exploded),Nødvendige materialer (Sprængskitse)
-DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),Reducer Optjening for Leave uden løn (LWP)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +512,"Add users to your organization, other than yourself","Tilføj brugere til din organisation, andre end dig selv"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +44,Casual Leave,Casual Leave
-DocType: Batch,Batch ID,Batch-id
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +334,Note: {0},Bemærk: {0}
-,Delivery Note Trends,Følgeseddel Tendenser
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +74,{0} must be a Purchased or Sub-Contracted Item in row {1},{0} skal være en Købt eller underentreprise element i række {1}
-apps/erpnext/erpnext/accounts/general_ledger.py +106,Account: {0} can only be updated via Stock Transactions,Konto: {0} kan kun opdateres via Stock Transaktioner
-DocType: GL Entry,Party,Selskab
-DocType: Sales Order,Delivery Date,Leveringsdato
-DocType: DocField,Currency,Valuta
-DocType: Opportunity,Opportunity Date,Opportunity Dato
-DocType: Purchase Receipt,Return Against Purchase Receipt,Retur Against kvittering
-DocType: Purchase Order,To Bill,Til Bill
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +61,Piecework,Akkordarbejde
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +64,Avg. Buying Rate,Gns. Køb Rate
-DocType: Task,Actual Time (in Hours),Faktiske tid (i timer)
-DocType: Employee,History In Company,Historie I Company
-DocType: Address,Shipping,Forsendelse
-DocType: Stock Ledger Entry,Stock Ledger Entry,Stock Ledger indtastning
-DocType: Department,Leave Block List,Lad Block List
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +188,Item {0} is not setup for Serial Nos. Column must be blank,Vare {0} er ikke setup for Serial nr. Kolonne skal være tomt
-DocType: Accounts Settings,Accounts Settings,Konti Indstillinger
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +53,Plant and Machinery,Anlæg og maskiner
-DocType: Sales Partner,Partner's Website,Partner s hjemmeside
-DocType: Opportunity,To Discuss,Til Diskuter
-DocType: SMS Settings,SMS Settings,SMS-indstillinger
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +60,Temporary Accounts,Midlertidige Konti
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +155,Black,Sort
-DocType: BOM Explosion Item,BOM Explosion Item,BOM Explosion Vare
-DocType: Account,Auditor,Revisor
-DocType: Purchase Order,End date of current order's period,Slutdato for aktuelle ordres periode
-apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +17,Make Offer Letter,Kom med et tilbud Letter
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +10,Return,Retur
-DocType: DocField,Fold,Fold
-DocType: Production Order Operation,Production Order Operation,Produktionsordre Operation
-DocType: Pricing Rule,Disable,Deaktiver
-DocType: Project Task,Pending Review,Afventer anmeldelse
-apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.js +12,Please specify,Angiv venligst
-DocType: Task,Total Expense Claim (via Expense Claim),Total Expense krav (via Expense krav)
-apps/erpnext/erpnext/accounts/report/sales_register/sales_register.py +66,Customer Id,Kunde-id
-DocType: Page,Page Name,Side Navn
-apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +110,To Time must be greater than From Time,Til Time skal være større end From Time
-DocType: Journal Entry Account,Exchange Rate,Exchange Rate
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +465,Sales Order {0} is not submitted,Sales Order {0} er ikke indsendt
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0}: Parent account {1} does not bolong to the company {2},Warehouse {0}: Forældre-konto {1} ikke Bolong til virksomheden {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +124,Spindle finishing,Spindel efterbehandling
-DocType: BOM,Last Purchase Rate,Sidste Purchase Rate
-DocType: Account,Asset,Asset
-DocType: Project Task,Task ID,Opgave-id
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +395,"e.g. ""MC""",fx &quot;MC&quot;
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,Stock cannot exist for Item {0} since has variants,Stock kan ikke eksistere for Item {0} da har varianter
-,Sales Person-wise Transaction Summary,Salg Person-wise Transaktion Summary
-DocType: System Settings,Time Zone,Time Zone
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +104,Warehouse {0} does not exist,Oplag {0} eksisterer ikke
-apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,Tilmeld dig ERPNext Hub
-DocType: Monthly Distribution,Monthly Distribution Percentages,Månedlige Distribution Procenter
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +16,The selected item cannot have Batch,Det valgte emne kan ikke have Batch
-DocType: Delivery Note,% of materials delivered against this Delivery Note,% Af materialer leveret mod denne følgeseddel
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +151,Stapling,Hæftning
-DocType: Customer,Customer Details,Kunde Detaljer
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +105,Shaping,Shaping
-DocType: Employee,Reports to,Rapporter til
-DocType: SMS Settings,Enter url parameter for receiver nos,Indtast url parameter for receiver nos
-DocType: Sales Invoice,Paid Amount,Betalt Beløb
-apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type 'Liability',Lukning Konto {0} skal være af typen &#39;ansvar&#39;
-,Available Stock for Packing Items,Tilgængelig Stock til Emballerings- Varer
-DocType: Item Variant,Item Variant,Item Variant
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +15,Setting this Address Template as default as there is no other default,"Angivelse af denne adresse skabelon som standard, da der ikke er nogen anden standard"
-apps/erpnext/erpnext/accounts/doctype/account/account.py +89,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'",Konto balance er debit. Du har ikke lov til at ændre 'Balancetype' til 'kredit'
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +76,Quality Management,Quality Management
-DocType: Production Planning Tool,Filter based on customer,Filter baseret på kundernes
-DocType: Payment Tool Detail,Against Voucher No,Mod blad nr
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +47,Please enter quantity for Item {0},Indtast mængde for Item {0}
-DocType: Employee External Work History,Employee External Work History,Medarbejder Ekstern Work History
-DocType: Tax Rule,Purchase,Købe
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +34,Balance Qty,Balance Antal
-DocType: Item Group,Parent Item Group,Moderselskab Item Group
-apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +21,{0} for {1},{0} for {1}
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +96,Cost Centers,Omkostninger Centers
-apps/erpnext/erpnext/config/stock.py +115,Warehouses.,Pakhuse.
-DocType: Purchase Receipt,Rate at which supplier's currency is converted to company's base currency,"Hastighed, hvormed leverandørens valuta omregnes til virksomhedens basisvaluta"
-apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +36,Row #{0}: Timings conflicts with row {1},Row # {0}: tider konflikter med rækken {1}
-DocType: Employee,Employment Type,Beskæftigelse type
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,Anlægsaktiver
-DocType: Item Group,Default Expense Account,Standard udgiftskonto
-DocType: Employee,Notice (days),Varsel (dage)
-DocType: Page,Yes,Ja
-DocType: Employee,Encashment Date,Indløsning Dato
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +74,Electroforming,Electroforming
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +179,"Against Voucher Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Imod Voucher type skal være en af ​​indkøbsordre, købsfaktura eller Kassekladde"
-DocType: Account,Stock Adjustment,Stock Justering
-apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +34,Default Activity Cost exists for Activity Type - {0},Standard Activity Omkostninger findes for Activity Type - {0}
-DocType: Production Order,Planned Operating Cost,Planlagt driftsomkostninger
-apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +121,New {0} Name,Ny {0} Navn
-apps/erpnext/erpnext/controllers/recurring_document.py +128,Please find attached {0} #{1},Vedlagt {0} # {1}
-DocType: Job Applicant,Applicant Name,Ansøger Navn
-DocType: Authorization Rule,Customer / Item Name,Kunde / Item Name
-DocType: Product Bundle,"Aggregate group of **Items** into another **Item**. This is useful if you are bundling a certain **Items** into a package and you maintain stock of the packed **Items** and not the aggregate **Item**. 
-
-The package **Item** will have ""Is Stock Item"" as ""No"" and ""Is Sales Item"" as ""Yes"".
-
-For Example: If you are selling Laptops and Backpacks separately and have a special price if the customer buys both, then the Laptop + Backpack will be a new Product Bundle Item.
-
-Note: BOM = Bill of Materials","Samlede gruppe af ** Varer ** i anden ** Item **. Dette er nyttigt, hvis du bundling en bestemt ** Varer ** i en pakke, og du kan bevare status over de pakkede ** Varer ** og ikke den samlede ** Item **. Pakken ** Item ** vil have &quot;Er Stock Item&quot; som &quot;Nej&quot; og &quot;Er Sales Item&quot; som &quot;Ja&quot;. For eksempel: Hvis du sælger Laptops og Rygsække separat og har en særlig pris, hvis kunden køber både, så Laptop + Rygsæk vil være en ny Product Bundle Item. Bemærk: BOM = Bill of Materials"
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Serial No is mandatory for Item {0},Løbenummer er obligatorisk for Item {0}
-DocType: Item Variant Attribute,Attribute,Attribut
-apps/frappe/frappe/public/js/frappe/model/model.js +18,Created By,Lavet af
-DocType: Serial No,Under AMC,Under AMC
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +47,Item valuation rate is recalculated considering landed cost voucher amount,Item værdiansættelse sats genberegnes overvejer landede omkostninger kupon beløb
-apps/erpnext/erpnext/config/selling.py +70,Default settings for selling transactions.,Standardindstillinger for at sælge transaktioner.
-DocType: BOM Replace Tool,Current BOM,Aktuel BOM
-apps/erpnext/erpnext/public/js/utils.js +57,Add Serial No,Tilføj Løbenummer
-DocType: Production Order,Warehouses,Pakhuse
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Print and Stationary,Print og Stationær
-apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +122,Group Node,Gruppe Node
-DocType: Payment Reconciliation,Minimum Amount,Minimumsbeløb
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +71,Update Finished Goods,Opdater færdigvarer
-DocType: Workstation,per hour,per time
-apps/frappe/frappe/core/doctype/doctype/doctype.py +106,Series {0} already used in {1},Serien {0} allerede anvendes i {1}
-DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,Konto for lageret (Perpetual Inventory) vil blive oprettet under denne konto.
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,"Warehouse kan ikke slettes, da der eksisterer lager hovedbog post for dette lager."
-DocType: Company,Distribution,Distribution
-apps/erpnext/erpnext/public/js/pos/pos.html +36,Amount Paid,Beløb betalt
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +91,Project Manager,Projektleder
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +72,Dispatch,Dispatch
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,Max rabat tilladt for vare: {0} er {1}%
-DocType: Account,Receivable,Tilgodehavende
-DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,"Rolle, som får lov til at indsende transaktioner, der overstiger kredit grænser."
-DocType: Sales Invoice,Supplier Reference,Leverandør 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.","Hvis markeret, vil BOM for sub-montage elementer overvejes for at få råvarer. Ellers vil alle sub-montage poster behandles som et råstof."
-DocType: Material Request,Material Issue,Materiale Issue
-DocType: Hub Settings,Seller Description,Sælger Beskrivelse
-DocType: Employee Education,Qualification,Kvalifikation
-DocType: Item Price,Item Price,Item Pris
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +48,Soap & Detergent,Sæbe &amp; Vaskemiddel
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +36,Motion Picture & Video,Motion Picture &amp; Video
-apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Bestilt
-DocType: Warehouse,Warehouse Name,Warehouse Navn
-DocType: Naming Series,Select Transaction,Vælg Transaktion
-apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +30,Please enter Approving Role or Approving User,Indtast Godkendelse Rolle eller godkender Bruger
-DocType: Journal Entry,Write Off Entry,Skriv Off indtastning
-DocType: BOM,Rate Of Materials Based On,Rate Of materialer baseret på
-apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,Support Analtyics
-apps/erpnext/erpnext/accounts/doctype/accounts_settings/accounts_settings.py +27,Company is missing in warehouses {0},Virksomheden mangler i pakhuse {0}
-DocType: Stock UOM Replace Utility,Stock UOM Replace Utility,Stock UOM Udskift Utility
-DocType: POS Profile,Terms and Conditions,Betingelser
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,To Date should be within the Fiscal Year. Assuming To Date = {0},Til dato bør være inden regnskabsåret. Antages Til dato = {0}
-DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","Her kan du vedligeholde højde, vægt, allergier, medicinske problemer osv"
-DocType: Leave Block List,Applies to Company,Gælder for Company
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +175,Cannot cancel because submitted Stock Entry {0} exists,Kan ikke annullere fordi indsendt Stock indtastning {0} eksisterer
-DocType: Purchase Invoice,In Words,I Words
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +213,Today is {0}'s birthday!,I dag er {0} &#39;s fødselsdag!
-DocType: Production Planning Tool,Material Request For Warehouse,Materiale Request For Warehouse
-DocType: Sales Order Item,For Production,For Produktion
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +103,Please enter sales order in the above table,Indtast salgsordre i ovenstående tabel
-DocType: Project Task,View Task,View Opgave
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +406,Your financial year begins on,Din regnskabsår begynder på
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +46,Please enter Purchase Receipts,Indtast venligst Køb Kvitteringer
-DocType: Sales Invoice,Get Advances Received,Få forskud
-DocType: Email Digest,Add/Remove Recipients,Tilføj / fjern modtagere
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +427,Transaction not allowed against stopped Production Order {0},Transaktion ikke tilladt mod stoppet produktionsordre {0}
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","For at indstille dette regnskabsår som standard, skal du klikke på &#39;Vælg som standard&#39;"
-apps/erpnext/erpnext/config/support.py +54,Setup incoming server for support email id. (e.g. support@example.com),Opsætning indgående server til support email id. (F.eks support@example.com)
-apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,Mangel Antal
-DocType: Salary Slip,Salary Slip,Lønseddel
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +116,Burnishing,Brunering
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +54,'To Date' is required,&#39;Til dato&#39; er nødvendig
-DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","Generer pakkesedler for pakker, der skal leveres. Bruges til at anmelde pakke nummer, pakkens indhold og dens vægt."
-DocType: Sales Invoice Item,Sales Order Item,Sales Order Vare
-DocType: Salary Slip,Payment Days,Betalings Dage
-DocType: BOM,Manage cost of operations,Administrer udgifter til operationer
-DocType: Features Setup,Item Advanced,Item Avanceret
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +40,Hot rolling,Varmvalsning
-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.","Når nogen af ​​de kontrollerede transaktioner er &quot;Indsendt&quot;, en e-pop-up automatisk åbnet til at sende en e-mail til den tilknyttede &quot;Kontakt&quot; i denne transaktion, med transaktionen som en vedhæftet fil. Brugeren kan eller ikke kan sende e-mailen."
-apps/erpnext/erpnext/config/setup.py +14,Global Settings,Globale indstillinger
-DocType: Employee Education,Employee Education,Medarbejder Uddannelse
-DocType: Salary Slip,Net Pay,Nettoløn
-DocType: Account,Account,Konto
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} has already been received,Løbenummer {0} er allerede blevet modtaget
-,Requested Items To Be Transferred,"Anmodet Varer, der skal overføres"
-DocType: Purchase Invoice,Recurring Id,Tilbagevendende Id
-DocType: Customer,Sales Team Details,Salg Team Detaljer
-DocType: Expense Claim,Total Claimed Amount,Total krævede beløb
-apps/erpnext/erpnext/config/crm.py +22,Potential opportunities for selling.,Potentielle muligheder for at sælge.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +48,Sick Leave,Sygefravær
-DocType: Email Digest,Email Digest,Email Digest
-DocType: Delivery Note,Billing Address Name,Fakturering Adresse Navn
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +22,Department Stores,Varehuse
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +40,System Balance,System Balance
-DocType: Workflow,Is Active,Er Aktiv
-apps/erpnext/erpnext/controllers/stock_controller.py +71,No accounting entries for the following warehouses,Ingen bogføring for følgende lagre
-apps/erpnext/erpnext/projects/doctype/project/project.js +22,Save the document first.,Gem dokumentet først.
-DocType: Account,Chargeable,Gebyr
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +121,Linishing,Linishing
-DocType: Company,Change Abbreviation,Skift Forkortelse
-DocType: Workflow State,Primary,Primær
-DocType: Expense Claim Detail,Expense Date,Expense Dato
-DocType: Item,Max Discount (%),Max Rabat (%)
-apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +70,Last Order Amount,Sidste ordrebeløb
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +161,Blasting,Sprængning
-DocType: Company,Warn,Advar
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +111,Item valuation updated,Item værdiansættelse opdateret
-DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Alle andre bemærkninger, bemærkelsesværdigt indsats, skal gå i registrene."
-DocType: BOM,Manufacturing User,Manufacturing Bruger
-DocType: Purchase Order,Raw Materials Supplied,Raw Materials Leveres
-DocType: Purchase Invoice,Recurring Print Format,Tilbagevendende Print Format
-DocType: Communication,Series,Series
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +54,Expected Delivery Date cannot be before Purchase Order Date,"Forventet leveringsdato kan ikke være, før indkøbsordre Dato"
-DocType: Appraisal,Appraisal Template,Vurdering skabelon
-DocType: Communication,Email,Email
-DocType: Item Group,Item Classification,Item Klassifikation
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +89,Business Development Manager,Business Development Manager
-DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,Vedligeholdelse Besøg Formål
-apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.js +15,Period,Periode
-,General Ledger,General Ledger
-apps/erpnext/erpnext/selling/doctype/campaign/campaign.js +10,View Leads,Se Leads
-DocType: Item Attribute Value,Attribute Value,Attribut Værdi
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +65,"Email id must be unique, already exists for {0}","Email id skal være unikt, der allerede eksisterer for {0}"
-,Itemwise Recommended Reorder Level,Itemwise Anbefalet genbestillings Level
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +264,Please select {0} first,Vælg {0} først
-DocType: Features Setup,To get Item Group in details table,At få Item Group i detaljer tabel
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +67,Redrawing,Gentegning
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +112,Batch {0} of Item {1} has expired.,Batch {0} af Item {1} er udløbet.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +120,Etching,Ætsning
-DocType: Sales Invoice,Commission,Kommissionen
-DocType: Address Template,"<h4>Default Template</h4>
-<p>Uses <a href=""http://jinja.pocoo.org/docs/templates/"">Jinja Templating</a> and all the fields of Address (including Custom Fields if any) will be available</p>
-<pre><code>{{ address_line1 }}&lt;br&gt;
-{% if address_line2 %}{{ address_line2 }}&lt;br&gt;{% endif -%}
-{{ city }}&lt;br&gt;
-{% if state %}{{ state }}&lt;br&gt;{% endif -%}
-{% if pincode %} PIN:  {{ pincode }}&lt;br&gt;{% endif -%}
-{{ country }}&lt;br&gt;
-{% if phone %}Phone: {{ phone }}&lt;br&gt;{% endif -%}
-{% if fax %}Fax: {{ fax }}&lt;br&gt;{% endif -%}
-{% if email_id %}Email: {{ email_id }}&lt;br&gt;{% endif -%}
-</code></pre>","<h4> Standardskabelon </h4><p> Bruger <a href=""http://jinja.pocoo.org/docs/templates/"">Jinja Templatering</a> og alle områderne adresse (herunder brugerdefinerede felter hvis nogen) vil være til rådighed </p><pre> <code>{{ address_line1 }}&lt;br&gt; {% if address_line2 %}{{ address_line2 }}&lt;br&gt;{% endif -%} {{ city }}&lt;br&gt; {% if state %}{{ state }}&lt;br&gt;{% endif -%} {% if pincode %} PIN: {{ pincode }}&lt;br&gt;{% endif -%} {{ country }}&lt;br&gt; {% if phone %}Phone: {{ phone }}&lt;br&gt;{% endif -%} {% if fax %}Fax: {{ fax }}&lt;br&gt;{% endif -%} {% if email_id %}Email: {{ email_id }}&lt;br&gt;{% endif -%}</code> </pre>"
-DocType: Salary Slip Deduction,Default Amount,Standard Mængde
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +89,Warehouse not found in the system,Warehouse ikke fundet i systemet
-DocType: Quality Inspection Reading,Quality Inspection Reading,Quality Inspection Reading
-apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +26,`Freeze Stocks Older Than` should be smaller than %d days.,`Frys lager ældre end` skal være mindre end %d dage.
-,Project wise Stock Tracking,Projekt klogt Stock Tracking
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +166,Maintenance Schedule {0} exists against {0},Vedligeholdelsesplan {0} eksisterer imod {0}
-DocType: Stock Entry Detail,Actual Qty (at source/target),Faktiske Antal (ved kilden / mål)
-DocType: Item Customer Detail,Ref Code,Ref Code
-apps/erpnext/erpnext/config/hr.py +13,Employee records.,Medarbejder Records.
-DocType: HR Settings,Payroll Settings,Payroll Indstillinger
-apps/erpnext/erpnext/config/accounts.py +58,Match non-linked Invoices and Payments.,Match ikke-forbundne fakturaer og betalinger.
-apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +25,Root cannot have a parent cost center,Root kan ikke have en forælder cost center
-DocType: Sales Invoice,C-Form Applicable,C-anvendelig
-DocType: UOM Conversion Detail,UOM Conversion Detail,UOM Konvertering Detail
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +496,Keep it web friendly 900px (w) by 100px (h),Hold det web venlige 900px (w) ved 100px (h)
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +329,Production Order cannot be raised against a Item Template,Produktionsordre kan ikke rejses mod en Vare skabelon
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +44,Charges are updated in Purchase Receipt against each item,Afgifter er opdateret i kvittering mod hvert punkt
-DocType: Payment Tool,Get Outstanding Vouchers,Få Udestående Vouchers
-DocType: Warranty Claim,Resolved By,Løst Af
-DocType: Appraisal,Start Date,Startdato
-apps/frappe/frappe/public/js/frappe/form/link_selector.js +21,Value,Value
-apps/erpnext/erpnext/config/hr.py +130,Allocate leaves for a period.,Afsætte blade i en periode.
-apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +139,Click here to verify,Klik her for at verificere
-apps/erpnext/erpnext/accounts/doctype/account/account.py +43,Account {0}: You can not assign itself as parent account,Konto {0}: Konto kan ikke samtidig være forældre-konto
-DocType: Purchase Invoice Item,Price List Rate,Prisliste Rate
-DocType: Item,"Show ""In Stock"" or ""Not in Stock"" based on stock available in this warehouse.",Vis &quot;På lager&quot; eller &quot;Ikke på lager&quot; baseret på lager til rådighed i dette lager.
-apps/erpnext/erpnext/config/manufacturing.py +13,Bill of Materials (BOM),Bill of Materials (BOM)
-DocType: Item,Average time taken by the supplier to deliver,Gennemsnitlig tid taget af leverandøren til at levere
-DocType: Time Log,Hours,Timer
-DocType: Project,Expected Start Date,Forventet startdato
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +38,Rolling,Rullende
-DocType: ToDo,Priority,Prioritet
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +41,Remove item if charges is not applicable to that item,"Fjern element, hvis afgifter ikke finder anvendelse på denne post"
-DocType: Dropbox Backup,Dropbox Access Allowed,Dropbox Adgang tilladt
-DocType: Dropbox Backup,Weekly,Ugentlig
-DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,F.eks. smsgateway.com/api/send_sms.cgi
-DocType: Maintenance Visit,Fully Completed,Fuldt Afsluttet
-apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% Complete
-DocType: Employee,Educational Qualification,Pædagogisk Kvalifikation
-DocType: Workstation,Operating Costs,Drifts- omkostninger
-DocType: Employee Leave Approver,Employee Leave Approver,Medarbejder Leave Godkender
-apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,{0} has been successfully added to our Newsletter list.,{0} er blevet føjet til vores nyhedsliste.
-apps/erpnext/erpnext/stock/doctype/item/item.py +383,Row {0}: An Reorder entry already exists for this warehouse {1},Række {0}: En Genbestil indgang findes allerede for dette lager {1}
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +67,"Cannot declare as lost, because Quotation has been made.","Kan ikke erklære så tabt, fordi Citat er blevet gjort."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +133,Electron beam machining,Elektronstråle bearbejdning
-DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Indkøb Master manager
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +424,Production Order {0} must be submitted,Produktionsordre {0} skal indsendes
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +150,Please select Start Date and End Date for Item {0},Vælg Start og slutdato for Item {0}
-apps/erpnext/erpnext/config/stock.py +141,Main Reports,Vigtigste Reports
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +102,Stock Ledger entries balances updated,Stock Ledger poster saldi opdateret
-apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,Til dato kan ikke være før fra dato
-DocType: Purchase Receipt Item,Prevdoc DocType,Prevdoc DocType
-apps/erpnext/erpnext/stock/doctype/item/item.js +176,Add / Edit Prices,Tilføj / rediger Priser
-apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +53,Chart of Cost Centers,Diagram af Cost Centers
-,Requested Items To Be Ordered,Anmodet Varer skal bestilles
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +298,My Orders,Mine ordrer
-DocType: Price List,Price List Name,Pris List Name
-DocType: Time Log,For Manufacturing,For Manufacturing
-apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +70,Totals,Totaler
-DocType: BOM,Manufacturing,Produktion
-,Ordered Items To Be Delivered,"Bestilte varer, der skal leveres"
-DocType: Account,Income,Indkomst
-,Setup Wizard,Setup Wizard
-DocType: Industry Type,Industry Type,Industri Type
-apps/erpnext/erpnext/templates/includes/cart.js +137,Something went wrong!,Noget gik galt!
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +68,Warning: Leave application contains following block dates,Advarsel: Lad ansøgning indeholder følgende blok datoer
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +251,Sales Invoice {0} has already been submitted,Salg Faktura {0} er allerede blevet indsendt
-apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,Afslutning Dato
-DocType: Purchase Invoice Item,Amount (Company Currency),Beløb (Company Valuta)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +10,Die casting,Trykstøbning
-DocType: Email Alert,Reference Date,Henvisning Dato
-apps/erpnext/erpnext/config/hr.py +105,Organization unit (department) master.,Organisation enhed (departement) herre.
-apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +25,Please enter valid mobile nos,Indtast venligst gyldige mobile nos
-DocType: Budget Detail,Budget Detail,Budget Detail
-apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +75,Please enter message before sending,"Indtast venligst besked, før du sender"
-DocType: Async Task,Status,Status
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +65,Stock UOM updated for Item {0},Stock UOM opdateret for Item {0}
-DocType: Company History,Year,År
-apps/erpnext/erpnext/config/accounts.py +127,Point-of-Sale Profile,Point-of-Sale profil
-apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +68,Please Update SMS Settings,Opdatér venligst SMS-indstillinger
-apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +37,Time Log {0} already billed,Time Log {0} allerede faktureret
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +176,Unsecured Loans,Usikrede lån
-DocType: Cost Center,Cost Center Name,Cost center Navn
-DocType: Maintenance Schedule Detail,Scheduled Date,Planlagt dato
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +69,Total Paid Amt,Total Betalt Amt
-DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,Beskeder større end 160 tegn vil blive opdelt i flere meddelelser
-DocType: Purchase Receipt Item,Received and Accepted,Modtaget og accepteret
-,Serial No Service Contract Expiry,Løbenummer Service Kontrakt udløb
-DocType: Item,Unit of Measure Conversion,Måleenhed Conversion
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +86,Employee can not be changed,Medarbejder kan ikke ændres
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +259,You cannot credit and debit same account at the same time,Du kan ikke kreditere og debitere samme konto på samme tid
-DocType: Naming Series,Help HTML,Hjælp HTML
-apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},Samlet weightage tildelt skulle være 100%. Det er {0}
-apps/erpnext/erpnext/controllers/status_updater.py +140,Allowance for over-{0} crossed for Item {1},Fradrag for over- {0} krydsede for Item {1}
-DocType: Address,Name of person or organization that this address belongs to.,"Navn på den person eller organisation, der denne adresse tilhører."
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +587,Your Suppliers,Dine Leverandører
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,Kan ikke indstilles som Lost som Sales Order er foretaget.
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +65,Another Salary Structure {0} is active for employee {1}. Please make its status 'Inactive' to proceed.,En anden Løn Struktur {0} er aktiv for medarbejder {1}. Venligst gøre sin status &quot;Inaktiv&quot; for at fortsætte.
-DocType: Purchase Invoice,Contact,Kontakt
-DocType: Features Setup,Exports,Eksport
-DocType: Lead,Converted,Konverteret
-DocType: Item,Has Serial No,Har Løbenummer
-DocType: Employee,Date of Issue,Udstedelsesdato
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +16,{0}: From {0} for {1},{0}: Fra {0} for {1}
-DocType: Issue,Content Type,Indholdstype
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +17,Computer,Computer
-DocType: Item,List this Item in multiple groups on the website.,Liste denne vare i flere grupper på hjemmesiden.
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +62,Item: {0} does not exist in the system,Item: {0} findes ikke i systemet
-apps/erpnext/erpnext/accounts/doctype/account/account.py +81,You are not authorized to set Frozen value,Du er ikke autoriseret til at fastsætte Frozen værdi
-DocType: Payment Reconciliation,Get Unreconciled Entries,Få ikke-afstemte Entries
-DocType: Cost Center,Budgets,Budgetter
-apps/frappe/frappe/core/page/modules_setup/modules_setup.py +11,Updated,Opdateret
-DocType: Employee,Emergency Contact Details,Emergency Kontaktoplysning
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +396,What does it do?,Hvad gør det?
-DocType: Delivery Note,To Warehouse,Til Warehouse
-apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +45,Account {0} has been entered more than once for fiscal year {1},Konto {0} er indtastet mere end en gang for regnskabsåret {1}
-,Average Commission Rate,Gennemsnitlig Kommissionens Rate
-apps/erpnext/erpnext/stock/doctype/item/item.py +313,'Has Serial No' can not be 'Yes' for non-stock item,'Har serienummer' kan ikke være 'Ja' for ikke-lagervare
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Attendance can not be marked for future dates,Fremmøde kan ikke markeres for fremtidige datoer
-DocType: Pricing Rule,Pricing Rule Help,Prisfastsættelse Rule Hjælp
-DocType: Purchase Taxes and Charges,Account Head,Konto hoved
-apps/erpnext/erpnext/config/stock.py +79,Update additional costs to calculate landed cost of items,Opdater yderligere omkostninger til at beregne landede udgifter til poster
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +111,Electrical,Elektrisk
-DocType: Stock Entry,Total Value Difference (Out - In),Samlet værdi Difference (Out - In)
-apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},Bruger-id ikke indstillet til Medarbejder {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +72,Peening,Peening
-apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,From Warranty Claim,Fra garanti krav
-DocType: Stock Entry,Default Source Warehouse,Standardkilde Warehouse
-DocType: Item,Customer Code,Customer Kode
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +212,Birthday Reminder for {0},Birthday Reminder for {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +163,Lapping,Lapning
-apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.js +8,Days Since Last Order,Dage siden sidste ordre
-DocType: Buying Settings,Naming Series,Navngivning Series
-DocType: Leave Block List,Leave Block List Name,Lad Block List Name
-DocType: User,Enabled,Aktiveret
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,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},Vil du virkelig ønsker at indsende alle lønseddel for måned {0} og år {1}
-apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +8,Import Subscribers,Import Abonnenter
-DocType: Target Detail,Target Qty,Target Antal
-DocType: Attendance,Present,Present
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Note {0} must not be submitted,Levering Note {0} må ikke indsendes
-DocType: Notification Control,Sales Invoice Message,Salg Faktura Message
-DocType: Authorization Rule,Based On,Baseret på
-DocType: Sales Order Item,Ordered Qty,Bestilt Antal
-DocType: Stock Settings,Stock Frozen Upto,Stock Frozen Op
-apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,Projektaktivitet / opgave.
-apps/erpnext/erpnext/config/hr.py +65,Generate Salary Slips,Generer lønsedler
-apps/frappe/frappe/utils/__init__.py +79,{0} is not a valid email id,{0} er ikke en gyldig e-mail-id
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +41,"Buying must be checked, if Applicable For is selected as {0}","Opkøb skal kontrolleres, om nødvendigt er valgt som {0}"
-apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,Rabat skal være mindre end 100
-DocType: ToDo,Low,Lav
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +71,Spinning,Spinning
-DocType: Landed Cost Voucher,Landed Cost Voucher,Landed Cost Voucher
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +55,Please set {0},Indstil {0}
-DocType: Purchase Invoice,Repeat on Day of Month,Gentag på Dag Måned
-DocType: Employee,Health Details,Sundhed Detaljer
-DocType: Offer Letter,Offer Letter Terms,Tilbyd Letter Betingelser
-DocType: Features Setup,To track any installation or commissioning related work after sales,At spore enhver installation eller idriftsættelse relateret arbejde eftersalgsservice
-DocType: Project,Estimated Costing,Anslået Costing
-DocType: Purchase Invoice Advance,Journal Entry Detail No,Kassekladde Detail Nej
-DocType: Employee External Work History,Salary,Løn
-DocType: Serial No,Delivery Document Type,Levering Dokumenttype
-DocType: Process Payroll,Submit all salary slips for the above selected criteria,Indsend alle lønsedler for de ovenfor valgte kriterier
-apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +93,{0} Items synced,synkroniseret {0} Varer
-DocType: Sales Order,Partly Delivered,Delvist Delivered
-DocType: Sales Invoice,Existing Customer,Eksisterende kunde
-DocType: Email Digest,Receivables,Tilgodehavender
-DocType: Quality Inspection Reading,Reading 5,Reading 5
-DocType: Purchase Order,"Enter email id separated by commas, order will be mailed automatically on particular date","Indtast email id adskilt af kommaer, vil ordren blive sendt automatisk på bestemt dato"
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +37,Campaign Name is required,Kampagne navn er påkrævet
-DocType: Maintenance Visit,Maintenance Date,Vedligeholdelse Dato
-DocType: Purchase Receipt Item,Rejected Serial No,Afvist Løbenummer
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +51,Deep drawing,Dybtrækning
-apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +40,New Newsletter,Ny Nyhedsbrev
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +157,Start date should be less than end date for Item {0},Start dato bør være mindre end slutdato for Item {0}
-apps/erpnext/erpnext/stock/doctype/item/item.js +17,Show Balance,Vis Balance
-DocType: Item,"Example: ABCD.#####
-If series is set and Serial No is not mentioned in transactions, then automatic serial number will be created based on this series. If you always want to explicitly mention Serial Nos for this item. leave this blank.","Eksempel:. ABCD ##### Hvis serien er indstillet, og Løbenummer nævnes ikke i transaktioner, så automatisk serienummer vil blive oprettet på grundlag af denne serie. Hvis du altid ønsker at eksplicit nævne Serial Nos for dette element. lader dette være blankt."
-DocType: Upload Attendance,Upload Attendance,Upload Fremmøde
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +119,BOM and Manufacturing Quantity are required,BOM and Manufacturing Mængde kræves
-apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Ageing Range 2
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +450,Amount,Beløb
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +147,Riveting,Nitning
-apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,BOM erstattet
-,Sales Analytics,Salg Analytics
-DocType: Manufacturing Settings,Manufacturing Settings,Manufacturing Indstillinger
-apps/erpnext/erpnext/config/setup.py +56,Setting up Email,Opsætning af E-mail
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +90,Please enter default currency in Company Master,Indtast standard valuta i Company Master
-DocType: Stock Entry Detail,Stock Entry Detail,Stock indtastning Detail
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +207,New Account Name,Ny Kontonavn
-DocType: Purchase Invoice Item,Raw Materials Supplied Cost,Raw Materials Leveres Cost
-DocType: Selling Settings,Settings for Selling Module,Indstillinger for Selling modul
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +73,Customer Service,Kundeservice
-DocType: Item Customer Detail,Item Customer Detail,Item Customer Detail
-apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +147,Confirm Your Email,Bekræft din e-mail
-apps/erpnext/erpnext/config/hr.py +53,Offer candidate a Job.,Offer kandidat et job.
-DocType: Notification Control,Prompt for Email on Submission of,Spørg til Email på Indsendelse af
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +70,Item {0} must be a stock Item,Vare {0} skal være en bestand Vare
-apps/erpnext/erpnext/config/accounts.py +107,Default settings for accounting transactions.,Standardindstillinger regnskabsmæssige transaktioner.
+DocType: Newsletter,Newsletter Manager,Nyhedsbrev manager
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Balance Qty,Balance Antal
+DocType: Material Request Item,For Warehouse,For Warehouse
+apps/erpnext/erpnext/public/js/setup_wizard.js +112,Attach Your Picture,Vedhæft dit billede
 apps/frappe/frappe/model/naming.py +40,{0} is required,{0} er påkrævet
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +21,Vacuum molding,Vakuum støbning
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,Forventet dato kan ikke være før Material Request Dato
-DocType: Contact Us Settings,City,By
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +132,Ultrasonic machining,Ultrasonic bearbejdning
-apps/frappe/frappe/templates/base.html +137,Error: Not a valid id?,Fejl: Ikke et gyldigt id?
-apps/erpnext/erpnext/stock/get_item_details.py +125,Item {0} must be a Sales Item,Vare {0} skal være en Sales Item
-DocType: Naming Series,Update Series Number,Opdatering Series Number
-DocType: Account,Equity,Egenkapital
-DocType: Task,Closing Date,Closing Dato
-DocType: Sales Order Item,Produced Quantity,Produceret Mængde
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +84,Engineer,Ingeniør
-apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,Søg Sub Assemblies
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +379,Item Code required at Row No {0},Item Code kræves på Row Nej {0}
-DocType: Sales Partner,Partner Type,Partner Type
-DocType: Purchase Taxes and Charges,Actual,Faktiske
-DocType: Authorization Rule,Customerwise Discount,Customerwise Discount
-DocType: Purchase Invoice,Against Expense Account,Mod udgiftskonto
-DocType: Production Order,Production Order,Produktionsordre
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +258,Installation Note {0} has already been submitted,Installation Bemærk {0} er allerede blevet indsendt
-DocType: Quotation Item,Against Docname,Mod Docname
-DocType: SMS Center,All Employee (Active),Alle Medarbejder (Active)
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,Se nu
-DocType: Purchase Invoice,Select the period when the invoice will be generated automatically,"Vælg den periode, hvor fakturaen vil blive genereret automatisk"
+DocType: Purchase Invoice Item,Item Tax Amount,Item Skat Beløb
+DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","Kontering frosset op til denne dato, kan ingen gøre / ændre post undtagen rolle angivet nedenfor."
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},"(E), der allerede er i brug Case Ingen. Prøv fra sag {0}"
+apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type 'Liability',Lukning Konto {0} skal være af typen &#39;ansvar&#39;
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +693,All items have already been transferred for this Production Order.,Alle elementer er allerede blevet overført til denne produktionsordre.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +386,Cost Center is required in row {0} in Taxes table for type {1},Cost Center kræves i række {0} i Skatter tabellen for type {1}
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +7,Aerospace,Aerospace
+apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +37,Ageing Range 1,Ageing Range 1
 DocType: BOM,Raw Material Cost,Raw Material Omkostninger
-DocType: Item,Re-Order Level,Re-Order Level
-DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,"Indtast poster og planlagt qty, som du ønsker at hæve produktionsordrer eller downloade råvarer til analyse."
-apps/frappe/frappe/public/js/frappe/views/ganttview.js +45,Gantt Chart,Gantt Chart
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +57,Part-time,Deltid
-DocType: Employee,Applicable Holiday List,Gældende Holiday List
-DocType: Employee,Cheque,Cheque
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,Series Opdateret
-apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Report Type is mandatory,Rapporttype er obligatorisk
-DocType: Item,Serial Number Series,Serial Number Series
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},Warehouse er obligatorisk for lager Vare {0} i række {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +45,Retail & Wholesale,Detail &amp; Wholesale
-DocType: Issue,First Responded On,Først svarede den
-DocType: Website Item Group,Cross Listing of Item in multiple groups,Cross Notering af Item i flere grupper
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +351,The First User: You,Den første bruger: Du
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +48,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},Regnskabsår Start Dato og Skatteårsafslutning Dato allerede sat i regnskabsåret {0}
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +172,Successfully Reconciled,Succesfuld Afstemt
-DocType: Production Order,Planned End Date,Planlagt Slutdato
-apps/erpnext/erpnext/config/stock.py +43,Where items are stored.,Hvor emner er gemt.
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +19,Invoiced Amount,Fakturerede beløb
-DocType: Attendance,Attendance,Fremmøde
-DocType: Page,No,Ingen
-DocType: BOM,Materials,Materialer
-DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","Hvis ikke afkrydset, vil listen skal lægges til hver afdeling, hvor det skal anvendes."
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +520,Posting date and posting time is mandatory,Udstationering dato og udstationering tid er obligatorisk
-apps/erpnext/erpnext/config/buying.py +79,Tax template for buying transactions.,Skat skabelon til at købe transaktioner.
-,Item Prices,Item Priser
-DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,"I Ord vil være synlig, når du gemmer indkøbsordre."
-DocType: Period Closing Voucher,Period Closing Voucher,Periode Lukning Voucher
-apps/erpnext/erpnext/config/stock.py +125,Price List master.,Pris List mester.
-DocType: Task,Review Date,Anmeldelse Dato
-DocType: DocPerm,Level,Level
-DocType: Purchase Taxes and Charges,On Net Total,On Net Total
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +160,Target warehouse in row {0} must be same as Production Order,Target lager i rækken {0} skal være samme som produktionsordre
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +59,No permission to use Payment Tool,Ingen tilladelse til at bruge Betaling Tool
-apps/erpnext/erpnext/controllers/recurring_document.py +192,'Notification Email Addresses' not specified for recurring %s,'Notification Email Adresser' er ikke angivet for tilbagevendende %s
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +86,Milling,Milling
-DocType: Company,Round Off Account,Afrunde konto
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +60,Nibbling,Gnave
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,Administrationsomkostninger
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +18,Consulting,Rådgivning
-DocType: Customer Group,Parent Customer Group,Overordnet kunde Group
-apps/erpnext/erpnext/public/js/pos/pos.js +429,Change,Ændring
-DocType: Purchase Invoice,Contact Email,Kontakt E-mail
-DocType: Appraisal Goal,Score Earned,Score tjent
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +393,"e.g. ""My Company LLC""",fx &quot;My Company LLC&quot;
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +173,Notice Period,Opsigelsesperiode
-DocType: Bank Reconciliation Detail,Voucher ID,Voucher ID
-apps/erpnext/erpnext/setup/doctype/territory/territory.js +14,This is a root territory and cannot be edited.,Dette er en rod territorium og kan ikke redigeres.
-DocType: Packing Slip,Gross Weight UOM,Gross Weight UOM
-DocType: Email Digest,Receivables / Payables,Tilgodehavender / Gæld
-DocType: Delivery Note Item,Against Sales Invoice,Mod Salg Faktura
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +63,Stamping,Stempling
-DocType: Landed Cost Item,Landed Cost Item,Landed Cost Vare
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +56,Show zero values,Vis nul værdier
-DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,Mængde post opnået efter fremstilling / ompakning fra givne mængde råvarer
-DocType: Payment Reconciliation,Receivable / Payable Account,Tilgodehavende / Betales konto
-DocType: Delivery Note Item,Against Sales Order Item,Mod Sales Order Item
-DocType: Item,Default Warehouse,Standard Warehouse
-DocType: Task,Actual End Date (via Time Logs),Faktiske Slutdato (via Time Logs)
-apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +37,Budget cannot be assigned against Group Account {0},Budget kan ikke tildeles mod Group konto {0}
-apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +23,Please enter parent cost center,Indtast forælder omkostningssted
-DocType: Delivery Note,Print Without Amount,Print uden Beløb
-apps/erpnext/erpnext/controllers/buying_controller.py +69,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,Skat Kategori kan ikke være &quot;Værdiansættelse&quot; eller &quot;Værdiansættelse og Total&quot; som alle elementer er ikke-lagervarer
-DocType: User,Last Name,Efternavn
-DocType: Web Page,Left,Venstre
-DocType: Event,All Day,All Day
-DocType: Issue,Support Team,Support Team
-DocType: Appraisal,Total Score (Out of 5),Total Score (ud af 5)
-DocType: Contact Us Settings,State,Stat
-DocType: Batch,Batch,Batch
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +51,Balance,Balance
-DocType: Project,Total Expense Claim (via Expense Claims),Total Expense krav (via Expense krav)
-DocType: User,Gender,Køn
-DocType: Journal Entry,Debit Note,Debetnota
-DocType: Stock Entry,As per Stock UOM,Pr Stock UOM
-apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +7,Not Expired,Ikke er udløbet
-DocType: Journal Entry,Total Debit,Samlet Debit
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Sales Person,Salg Person
-DocType: Sales Invoice,Cold Calling,Telefonsalg
-DocType: SMS Parameter,SMS Parameter,SMS Parameter
-DocType: Maintenance Schedule Item,Half Yearly,Halvdelen Årlig
-DocType: Lead,Blog Subscriber,Blog Subscriber
-apps/erpnext/erpnext/config/setup.py +88,Create rules to restrict transactions based on values.,Oprette regler til at begrænse transaktioner baseret på værdier.
-DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","Hvis markeret, Total nej. af Arbejdsdage vil omfatte helligdage, og dette vil reducere værdien af ​​Løn Per Day"
-DocType: Purchase Invoice,Total Advance,Samlet Advance
-DocType: Workflow State,User,Bruger
-DocType: Opportunity Item,Basic Rate,Grundlæggende Rate
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +141,Set as Lost,Sæt som Lost
-DocType: Customer,Credit Days Based On,Credit Dage Baseret på
-DocType: Selling Settings,Maintain Same Rate Throughout Sales Cycle,Oprethold Samme Rate Gennem Sales Cycle
-DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,Planlæg tid logs uden Workstation arbejdstid.
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +95,{0} {1} has already been submitted,{0} {1} er allerede indsendt
-,Items To Be Requested,Varer skal ansøges
-DocType: Purchase Order,Get Last Purchase Rate,Få Sidste Purchase Rate
-DocType: Company,Company Info,Firma Info
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +76,Seaming,Falsning
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +197,"Company Email ID not found, hence mail not sent","Firma Email ID ikke fundet, dermed mail ikke sendt"
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Anvendelse af midler (Assets)
-DocType: Production Planning Tool,Filter based on item,Filter baseret på emne
-DocType: Fiscal Year,Year Start Date,År Startdato
-DocType: Attendance,Employee Name,Medarbejder Navn
-DocType: Sales Invoice,Rounded Total (Company Currency),Afrundet alt (Company Valuta)
-apps/erpnext/erpnext/accounts/doctype/account/account.py +115,Cannot covert to Group because Account Type is selected.,"Kan ikke skjult til gruppen, fordi Kontotype er valgt."
-DocType: Purchase Common,Purchase Common,Indkøb Common
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +95,{0} {1} has been modified. Please refresh.,{0} {1} er blevet ændret. Venligst opdater.
-DocType: Leave Block List,Stop users from making Leave Applications on following days.,Stop brugere fra at Udfyld Programmer på følgende dage.
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +591,From Opportunity,Fra Opportunity
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +46,Blanking,Blanking
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +166,Employee Benefits,Personaleydelser
-DocType: Sales Invoice,Is POS,Er POS
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +240,Packed quantity must equal quantity for Item {0} in row {1},Pakket mængde skal være lig mængde for Item {0} i række {1}
-DocType: Production Order,Manufactured Qty,Fremstillet Antal
-DocType: Purchase Receipt Item,Accepted Quantity,Accepteret Mængde
-apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} eksisterer ikke
-apps/erpnext/erpnext/config/accounts.py +18,Bills raised to Customers.,Regninger rejst til kunder.
-DocType: DocField,Default,Standard
-apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Projekt-id
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +466,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Række Nej {0}: Beløb kan ikke være større end Afventer Beløb mod Expense krav {1}. Afventer Beløb er {2}
-apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +40,{0} subscribers added,{0} abonnenter tilføjet
-DocType: Maintenance Schedule,Schedule,Køreplan
-DocType: Account,Parent Account,Parent Konto
-DocType: Quality Inspection Reading,Reading 3,Reading 3
-,Hub,Hub
-DocType: GL Entry,Voucher Type,Voucher Type
-apps/erpnext/erpnext/public/js/pos/pos.js +91,Price List not found or disabled,Prisliste ikke fundet eller handicappede
-DocType: Expense Claim,Approved,Godkendt
-DocType: Pricing Rule,Price,Pris
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +79,Employee relieved on {0} must be set as 'Left',Medarbejder lettet på {0} skal indstilles som &quot;Left&quot;
-DocType: Item,"Selecting ""Yes"" will give a unique identity to each entity of this item which can be viewed in the Serial No master.","Hvis du vælger &quot;Ja&quot; vil give en unik identitet til hver enhed i denne post, som kan ses i Serial Ingen mester."
-apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +39,Appraisal {0} created for Employee {1} in the given date range,Vurdering {0} skabt til Medarbejder {1} i givet datointerval
-DocType: Employee,Education,Uddannelse
-DocType: Selling Settings,Campaign Naming By,Kampagne Navngivning Af
-DocType: Employee,Current Address Is,Nuværende adresse er
-DocType: Address,Office,Kontor
-apps/frappe/frappe/desk/moduleview.py +67,Standard Reports,Standard rapporter
-apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,Regnskab journaloptegnelser.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +209,Please select Employee Record first.,Vælg Medarbejder Record først.
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +35,To create a Tax Account,Sådan opretter du en Tax-konto
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +233,Please enter Expense Account,Indtast venligst udgiftskonto
-DocType: Account,Stock,Lager
-DocType: Employee,Current Address,Nuværende adresse
-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","Hvis varen er en variant af et andet element derefter beskrivelse, billede, prissætning, skatter mv vil blive fastsat fra skabelonen medmindre det udtrykkeligt er angivet"
-DocType: Serial No,Purchase / Manufacture Details,Køb / Fremstilling Detaljer
-DocType: Employee,Contract End Date,Kontrakt Slutdato
-DocType: Sales Order,Track this Sales Order against any Project,Spor denne salgsordre mod enhver Project
-DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,Pull salgsordrer (afventer at levere) baseret på ovenstående kriterier
-DocType: DocShare,Document Type,Dokumenttype
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +565,From Supplier Quotation,Fra Leverandør Citat
-DocType: Deduction Type,Deduction Type,Fradrag Type
-DocType: Attendance,Half Day,Half Day
-DocType: Pricing Rule,Min Qty,Min Antal
-DocType: GL Entry,Transaction Date,Transaktion Dato
-DocType: Production Plan Item,Planned Qty,Planned Antal
-apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +91,Total Tax,I alt Skat
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +178,For Quantity (Manufactured Qty) is mandatory,For Mængde (Fremstillet Antal) er obligatorisk
-DocType: Stock Entry,Default Target Warehouse,Standard Target Warehouse
-DocType: Purchase Invoice,Net Total (Company Currency),Net alt (Company Valuta)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +79,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Række {0}: Party Type og Party gælder kun mod Tilgodehavende / Betales konto
-DocType: Notification Control,Purchase Receipt Message,Kvittering Message
-DocType: Production Order,Actual Start Date,Faktiske startdato
-DocType: Sales Order,% of materials delivered against this Sales Order,% Af materialer leveret mod denne Sales Order
-apps/erpnext/erpnext/config/stock.py +23,Record item movement.,Optag element bevægelse.
-DocType: Newsletter List Subscriber,Newsletter List Subscriber,Nyhedsbrev List Subscriber
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +164,Morticing,Stemmemaskiner
-DocType: Email Account,Service,Service
-DocType: Hub Settings,Hub Settings,Hub Indstillinger
-DocType: Project,Gross Margin %,Gross Margin%
-DocType: BOM,With Operations,Med Operations
-,Monthly Salary Register,Månedlig Løn Tilmeld
-apps/frappe/frappe/website/template.py +140,Next,Næste
-DocType: Warranty Claim,If different than customer address,Hvis anderledes end kunde adresse
-DocType: BOM Operation,BOM Operation,BOM Operation
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +118,Electropolishing,Elektropolering
-DocType: Purchase Taxes and Charges,On Previous Row Amount,På Forrige Row Beløb
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +24,Please enter Payment Amount in atleast one row,Indtast Betaling Beløb i mindst én række
-DocType: POS Profile,POS Profile,POS profil
-apps/erpnext/erpnext/config/accounts.py +153,"Seasonality for setting budgets, targets etc.","Sæsonudsving til indstilling budgetter, mål etc."
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +238,Row {0}: Payment Amount cannot be greater than Outstanding Amount,Række {0}: Betaling Beløb kan ikke være større end udestående beløb
-apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +46,Total Unpaid,Total Ulønnet
-apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +21,Time Log is not billable,Time Log ikke fakturerbare
-apps/erpnext/erpnext/stock/get_item_details.py +128,"Item {0} is a template, please select one of its variants","Vare {0} er en skabelon, skal du vælge en af ​​dens varianter"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +528,Purchaser,Køber
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +81,Net pay cannot be negative,Nettoløn kan ikke være negativ
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +71,Please enter the Against Vouchers manually,Indtast Against Vouchers manuelt
-DocType: SMS Settings,Static Parameters,Statiske parametre
-DocType: Purchase Order,Advance Paid,Advance Betalt
-DocType: Item,Item Tax,Item Skat
-DocType: Expense Claim,Employees Email Id,Medarbejdere Email Id
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +159,Current Liabilities,Kortfristede forpligtelser
-apps/erpnext/erpnext/config/crm.py +48,Send mass SMS to your contacts,Send masse SMS til dine kontakter
-DocType: Purchase Taxes and Charges,Consider Tax or Charge for,Overvej Skat eller Gebyr for
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,Faktiske Antal er obligatorisk
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +42,Cross-rolling,Cross-rulning
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +132,Credit Card,Credit Card
-DocType: BOM,Item to be manufactured or repacked,"Element, der skal fremstilles eller forarbejdes"
-apps/erpnext/erpnext/config/stock.py +95,Default settings for stock transactions.,Standardindstillinger for lager transaktioner.
-DocType: Purchase Invoice,Next Date,Næste dato
-DocType: Employee Education,Major/Optional Subjects,Større / Valgfag
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +49,Please enter Taxes and Charges,Indtast Skatter og Afgifter
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +85,Machining,Bearbejdning
-DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","Her kan du opretholde familiens detaljer som navn og besættelse af forældre, ægtefælle og børn"
-DocType: Hub Settings,Seller Name,Sælger Navn
-DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),Skatter og Afgifter Fratrukket (Company Valuta)
-DocType: Item Group,General Settings,Generelle indstillinger
-apps/erpnext/erpnext/setup/doctype/currency_exchange/currency_exchange.py +19,From Currency and To Currency cannot be same,Fra Valuta og Til valuta ikke kan være samme
-DocType: Stock Entry,Repack,Pakke
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +6,You must Save the form before proceeding,"Du skal gemme formularen, før du fortsætter"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +500,Attach Logo,Vedhæft Logo
-DocType: Customer,Commission Rate,Kommissionens Rate
-apps/erpnext/erpnext/config/hr.py +145,Block leave applications by department.,Blok orlov ansøgninger fra afdelingen.
-DocType: Production Order,Actual Operating Cost,Faktiske driftsomkostninger
-apps/erpnext/erpnext/accounts/doctype/account/account.py +73,Root cannot be edited.,Root kan ikke redigeres.
-apps/erpnext/erpnext/accounts/utils.py +195,Allocated amount can not greater than unadusted amount,Tildelte beløb kan ikke er større end unadusted beløb
-DocType: Manufacturing Settings,Allow Production on Holidays,Tillad Produktion på helligdage
-DocType: Sales Order,Customer's Purchase Order Date,Kundens Indkøbsordre Dato
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +183,Capital Stock,Capital Stock
-DocType: Packing Slip,Package Weight Details,Pakke vægt detaljer
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +105,Please select a csv file,Vælg en CSV-fil
-DocType: Dropbox Backup,Send Backups to Dropbox,Send Backups til Dropbox
-DocType: Purchase Order,To Receive and Bill,Til at modtage og Bill
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +94,Designer,Designer
-apps/erpnext/erpnext/config/selling.py +121,Terms and Conditions Template,Vilkår og betingelser Skabelon
-DocType: Serial No,Delivery Details,Levering Detaljer
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +383,Cost Center is required in row {0} in Taxes table for type {1},Cost Center kræves i række {0} i Skatter tabellen for type {1}
-DocType: Item,Automatically create Material Request if quantity falls below this level,Automatisk oprette Materiale Request hvis mængde falder under dette niveau
-,Item-wise Purchase Register,Vare-wise Purchase Tilmeld
-DocType: Batch,Expiry Date,Udløbsdato
-,Supplier Addresses and Contacts,Leverandør Adresser og kontaktpersoner
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,Vælg Kategori først
-apps/erpnext/erpnext/config/projects.py +18,Project master.,Projekt mester.
-DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,Du må ikke vise nogen symbol ligesom $ etc siden valutaer.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +330, (Half Day),(Halv dag)
-DocType: Supplier,Credit Days,Credit Dage
-DocType: Leave Type,Is Carry Forward,Er Carry Forward
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +478,Get Items from BOM,Få elementer fra BOM
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Lead Time dage
-apps/erpnext/erpnext/config/manufacturing.py +120,Bill of Materials,Bill of Materials
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +77,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Række {0}: Party Type og part er nødvendig for Tilgodehavende / Betales konto {1}
-DocType: Dropbox Backup,Send Notifications To,Send meddelelser til
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html +26,Ref Date,Ref Dato
-DocType: Employee,Reason for Leaving,Årsag til Leaving
-DocType: Expense Claim Detail,Sanctioned Amount,Sanktioneret Beløb
-DocType: GL Entry,Is Opening,Er Åbning
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +164,Row {0}: Debit entry can not be linked with a {1},Række {0}: Debit indgang ikke kan knyttes med en {1}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +188,Account {0} does not exist,Konto {0} findes ikke
-DocType: Account,Cash,Kontanter
-DocType: Employee,Short biography for website and other publications.,Kort biografi for hjemmesiden og andre publikationer.
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +31,Please create Salary Structure for employee {0},Opret Løn Struktur for medarbejder {0}
+apps/erpnext/erpnext/crm/doctype/lead/lead.js +32,Create Opportunity,Opret Opportunity
+DocType: DocField,Default,Standard
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +174,Production order number is mandatory for stock entry purpose manufacture,Produktion ordrenummer er obligatorisk for lager post fremstilling formål
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +68,Please select Party Type first,Vælg Party Type først
+DocType: Dropbox Backup,Send Backups to Dropbox,Send Backups til Dropbox
+DocType: Address,Preferred Billing Address,Foretrukne Faktureringsadresse
+DocType: Journal Entry Account,Account Balance,Kontosaldo
+DocType: Shopping Cart Settings,Default settings for Shopping Cart,Standardindstillinger for Indkøbskurv
+DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,Betaling Afstemning Betaling
+DocType: Delivery Note,Billing Address Name,Fakturering Adresse Navn
+DocType: Page,Title,Titel
+DocType: Company,Default Values,Standardværdier
+DocType: Opportunity,Opportunity Date,Opportunity Dato
+,Item Prices,Item Priser
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,Row # ,Row #
+,Purchase Invoice Trends,Købsfaktura Trends
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Furniture and Fixture,Møbler og Fixture
+DocType: Item,Copy From Item Group,Kopier fra Item Group
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +94,Please specify either Quantity or Valuation Rate or both,Angiv venligst enten mængde eller Værdiansættelse Rate eller begge
+DocType: SMS Log,Sender Name,Sender Name
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +158,Please create Customer from Lead {0},Opret Kunden fra Lead {0}
+DocType: Sales Order,To Deliver,Til at levere
+DocType: Sales Invoice Item,Quantity,Mængde
+apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Genbestil Level
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +64,Avg. Buying Rate,Gns. Køb Rate
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +175,Secured Loans,Sikrede lån
+DocType: Employee Education,Employee Education,Medarbejder Uddannelse
+apps/erpnext/erpnext/config/learn.py +167,Material Request to Purchase Order,Materiale Anmodning om at Indkøbsordre
+,Items To Be Requested,Varer skal ansøges
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +82,Create Quotation,Opret Citat
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +168,Against Journal Entry {0} is already adjusted against some other voucher,Mod Kassekladde {0} er allerede justeret mod en anden kupon
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,Vare {0} er ikke setup for Serial nr. Check Item mester
+DocType: Purchase Order,The date on which recurring order will be stop,"Den dato, hvor tilbagevendende ordre vil blive stoppe"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Dr,Dr
+DocType: Sales Invoice,Rate at which Price list currency is converted to customer's base currency,"Hastighed, hvormed Prisliste valuta omregnes til kundens basisvaluta"
+DocType: Item Website Specification,Table for Item that will be shown in Web Site,"Tabel til Vare, der vil blive vist i Web Site"
+DocType: Purchase Invoice,Notification Email Address,Meddelelse E-mailadresse
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,List a few of your customers. They could be organizations or individuals.,Nævne et par af dine kunder. De kunne være organisationer eller enkeltpersoner.
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +84,Invalid quantity specified for item {0}. Quantity should be greater than 0.,Ugyldig mængde angivet for element {0}. Mængde bør være større end 0.
+DocType: Serial No,Warranty / AMC Details,Garanti / AMC Detaljer
+DocType: Notification Control,Expense Claim Approved Message,Expense krav Godkendt Message
+,Sales Person-wise Transaction Summary,Salg Person-wise Transaktion Summary
+DocType: Activity Cost,Activity Type,Aktivitet Type
+apps/erpnext/erpnext/config/hr.py +78,Allocate leaves for the year.,Afsætte blade for året.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +369,Cash or Bank Account is mandatory for making payment entry,Kontant eller bankkonto er obligatorisk for betalingen post
+DocType: Journal Entry,Difference (Dr - Cr),Difference (Dr - Cr)
+apps/erpnext/erpnext/config/stock.py +84,Change UOM for an Item.,Skift UOM for et element.
+DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","Generer pakkesedler for pakker, der skal leveres. Bruges til at anmelde pakke nummer, pakkens indhold og dens vægt."
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +347,Quantity in row {0} ({1}) must be same as manufactured quantity {2},"Mængde i række {0} ({1}), skal være det samme som fremstillede mængde {2}"
+DocType: Production Order,Work-in-Progress Warehouse,Work-in-Progress Warehouse
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +86,Please select Charge Type first,Vælg Charge Type først
+apps/erpnext/erpnext/public/js/setup_wizard.js +284,"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.","Liste dine skattemæssige hoveder (f.eks moms, Told osv de skal have entydige navne) og deres faste satser. Dette vil skabe en standard skabelon, som du kan redigere og tilføje mere senere."
+apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,Confirmed,Bekræftet
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +38,Item {0} must be Sales Item,Vare {0} skal være Sales Item
+apps/erpnext/erpnext/stock/doctype/item/item.py +368,"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'","Da der er eksisterende lagertransaktioner til denne vare, \ du ikke kan ændre værdierne af &quot;Har Serial Nej &#39;,&#39; Har Batch Nej &#39;,&#39; Er Stock Item&quot; og &quot;værdiansættelsesmetode &#39;"
+DocType: Journal Entry,Print Heading,Print Overskrift
+apps/erpnext/erpnext/config/hr.py +130,Allocate leaves for a period.,Afsætte blade i en periode.
+apps/frappe/frappe/desk/query_report.py +136,Total,Total
+DocType: Serial No,Maintenance Status,Vedligeholdelse status
+apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.js +12,Please specify,Angiv venligst
+DocType: Dropbox Backup,Weekly,Ugentlig
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},Warehouse er obligatorisk for lager Vare {0} i række {1}
+DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name","Vedhæfte .csv fil med to kolonner, en for det gamle navn og et til det nye navn"
+DocType: Item,Maintain Stock,Vedligehold Stock
+apps/erpnext/erpnext/accounts/doctype/account/account.py +155,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","Lagertilgang eksisterer mod lageret {0}, og derfor kan du ikke re-tildele eller ændre Warehouse"
+DocType: Account,Asset,Asset
+DocType: Salary Slip,Earnings,Indtjening
+DocType: Sales Invoice,Against Income Account,Mod Indkomst konto
+DocType: Selling Settings,Default Territory,Standard Territory
+DocType: Purchase Order,Start date of current order's period,Startdato for nuværende ordres periode
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +72,disabled user,handicappet bruger
+DocType: Maintenance Visit,Purposes,Formål
+DocType: Contact,Is Primary Contact,Er Primær Kontaktperson
+DocType: Maintenance Visit,Fully Completed,Fuldt Afsluttet
+DocType: Address,Office,Kontor
+DocType: Attendance,Leave Type,Forlad Type
+DocType: Purchase Invoice,Against Expense Account,Mod udgiftskonto
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +31,Income Tax,Indkomstskat
+DocType: Issue,Content Type,Indholdstype
+DocType: Salary Slip,Total in words,I alt i ord
+DocType: Purchase Order,"Enter email id separated by commas, order will be mailed automatically on particular date","Indtast email id adskilt af kommaer, vil ordren blive sendt automatisk på bestemt dato"
+apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +8,Item 1,Punkt 1
+DocType: User,Enabled,Aktiveret
+DocType: Warehouse,Warehouse Detail,Warehouse Detail
diff --git a/erpnext/translations/da.csv b/erpnext/translations/da.csv
index 8562f5b..bc209cf 100644
--- a/erpnext/translations/da.csv
+++ b/erpnext/translations/da.csv
@@ -1,13 +1,12 @@
 DocType: Employee,Salary Mode,Løn-tilstand
 DocType: Cost Center,"Select Monthly Distribution, if you want to track based on seasonality.","Vælg Månedlig Distribution, hvis du ønsker at spore baseret på sæsonudsving."
 DocType: Employee,Divorced,Skilt
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +86,Warning: Same item has been entered multiple times.,Advarsel: Samme element er indtastet flere gange.
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +80,Warning: Same item has been entered multiple times.,Advarsel: Samme element er indtastet flere gange.
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +96,Items already synced,Varer allerede synkroniseret
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,Tillad Vare der skal tilføjes flere gange i en transaktion
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,"Annuller Materiale Besøg {0}, før den annullerer denne garanti krav"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +19,Consumer Products,Forbrugerprodukter
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,Forbrugerprodukter
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +68,Please select Party Type first,Vælg Party Type først
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +90,Annealing,Annealing
 DocType: Item,Customer Items,Kunde Varer
 apps/erpnext/erpnext/accounts/doctype/account/account.py +45,Account {0}: Parent account {1} can not be a ledger,Konto {0}: Forældre-konto {1} kan ikke være en finanskonto
 DocType: Item,Publish Item to hub.erpnext.com,Udgive Vare til hub.erpnext.com
@@ -20,15 +19,14 @@
 DocType: About Us Settings,Website,Websted
 DocType: POS Profile,Applicable for User,Gældende for Bruger
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +169,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Stoppet produktionsordre kan ikke annulleres, Unstop det første til at annullere"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +23,Compaction plus sintering,Komprimering plus sintring
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,Currency is required for Price List {0},Valuta er nødvendig for prisliste {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Vil blive beregnet i transaktionen.
 DocType: Purchase Order,Customer Contact,Kundeservice Kontakt
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +549,From Material Request,Fra Material Request
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +572,From Material Request,Fra Material Request
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} Tree
 DocType: Job Applicant,Job Applicant,Job Ansøger
 apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,Ikke flere resultater.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +78,Legal,Juridisk
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +34,Legal,Juridisk
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +114,Actual type tax cannot be included in Item rate in row {0},"Faktiske type skat, kan ikke indgå i Item sats i række {0}"
 DocType: C-Form,Customer,Kunde
 DocType: Purchase Receipt Item,Required By,Kræves By
@@ -43,7 +41,6 @@
 DocType: Manufacturing Settings,Default 10 mins,Standard 10 min
 DocType: Leave Type,Leave Type Name,Lad Type Navn
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +148,Series Updated Successfully,Series opdateret
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +150,Stitching,Syning
 DocType: Pricing Rule,Apply On,Påfør On
 DocType: Item Price,Multiple Item prices.,Flere Item priser.
 ,Purchase Order Items To Be Received,"Købsordre, der modtages"
@@ -51,8 +48,8 @@
 DocType: Quality Inspection Reading,Parameter,Parameter
 apps/erpnext/erpnext/projects/doctype/project/project.py +43,Expected End Date can not be less than Expected Start Date,Forventet Slutdato kan ikke være mindre end forventet startdato
 apps/erpnext/erpnext/utilities/transaction_base.py +104,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Row # {0}: Pris skal være samme som {1}: {2} ({3} / {4})
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +189,New Leave Application,Ny Leave Application
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +134,Bank Draft,Bank Draft
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +204,New Leave Application,Ny Leave Application
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +134,Bank Draft,Bank Draft
 DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,1. For at bevare kunden kloge post kode og gøre dem søgbare baseret på deres kode brug denne mulighed
 DocType: Mode of Payment Account,Mode of Payment Account,Mode Betalingskonto
 apps/erpnext/erpnext/stock/doctype/item/item.js +34,Show Variants,Vis varianter
@@ -64,25 +61,23 @@
 DocType: Production Plan Item,Production Plan Item,Produktion Plan Vare
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +141,User {0} is already assigned to Employee {1},Bruger {0} er allerede tildelt Medarbejder {1}
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +13,Make new POS Profile,Foretag ny POS profil
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +31,Health Care,Health Care
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,Health Care
 DocType: Purchase Invoice,Monthly,Månedlig
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +66,Delay in payment (Days),Forsinket betaling (dage)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +494,Invoice,Faktura
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +519,Invoice,Faktura
 DocType: Maintenance Schedule Item,Periodicity,Hyppighed
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +357,Email Address,E-mail-adresse
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +21,Defense,Forsvar
+apps/erpnext/erpnext/public/js/setup_wizard.js +107,Email Address,E-mail-adresse
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,Forsvar
 DocType: Company,Abbr,Fork
 DocType: Appraisal Goal,Score (0-5),Score (0-5)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +193,Row {0}: {1} {2} does not match with {3},Række {0}: {1} {2} ikke passer med {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +67,Row # {0}:,Row # {0}:
 DocType: Delivery Note,Vehicle No,Vehicle Ingen
 apps/erpnext/erpnext/public/js/pos/pos.js +528,Please select Price List,Vælg venligst prislisten
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +162,Woodworking,Træbearbejdning
 DocType: Production Order Operation,Work In Progress,Work In Progress
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +153,3D printing,3D-print
 DocType: Employee,Holiday List,Holiday List
 DocType: Time Log,Time Log,Time Log
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +530,Accountant,Revisor
+apps/erpnext/erpnext/public/js/setup_wizard.js +274,Accountant,Revisor
 DocType: Cost Center,Stock User,Stock Bruger
 DocType: Company,Phone No,Telefon Nej
 DocType: Time Log,"Log of Activities performed by users against Tasks that can be used for tracking time, billing.","Log af aktiviteter udført af brugere mod Opgaver, der kan bruges til sporing af tid, fakturering."
@@ -98,18 +93,19 @@
 DocType: Bin,Quantity Requested for Purchase,"Mængde, der ansøges for Indkøb"
 DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name","Vedhæfte .csv fil med to kolonner, en for det gamle navn og et til det nye navn"
 DocType: Packed Item,Parent Detail docname,Parent Detail docname
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Kg,Kg
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Kg,Kg
 apps/erpnext/erpnext/config/hr.py +48,Opening for a Job.,Åbning for et job.
 DocType: Item Attribute,Increment,Tilvækst
 apps/erpnext/erpnext/public/js/stock_analytics.js +63,Select Warehouse...,Vælg Warehouse ...
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +6,Advertising,Reklame
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,Reklame
+apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,Samme Company indtastes mere end én gang
 DocType: Employee,Married,Gift
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +389,Stock cannot be updated against Delivery Note {0},Stock kan ikke opdateres mod følgeseddel {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +391,Stock cannot be updated against Delivery Note {0},Stock kan ikke opdateres mod følgeseddel {0}
 DocType: Payment Reconciliation,Reconcile,Forene
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +30,Grocery,Købmand
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,Købmand
 DocType: Quality Inspection Reading,Reading 1,Læsning 1
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Make Bank Entry,Make Bank indtastning
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +40,Pension Funds,Pensionskasserne
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,Pensionskasserne
 apps/erpnext/erpnext/accounts/doctype/account/account.py +142,Warehouse is mandatory if account type is Warehouse,"Warehouse er obligatorisk, hvis kontotype er Warehouse"
 DocType: SMS Center,All Sales Person,Alle Sales Person
 DocType: Lead,Person Name,Person Name
@@ -131,7 +127,7 @@
 DocType: Quality Inspection,Get Specification Details,Få Specifikation Detaljer
 DocType: Lead,Interested,Interesseret
 apps/erpnext/erpnext/config/manufacturing.py +14,Bill of Material,Bill of Material
-apps/erpnext/erpnext/public/js/stock_analytics.js +45,Opening,Åbning
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +158,Opening,Åbning
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},Fra {0} til {1}
 DocType: Item,Copy From Item Group,Kopier fra Item Group
 DocType: Journal Entry,Opening Entry,Åbning indtastning
@@ -145,23 +141,22 @@
 DocType: Employee Education,Under Graduate,Under Graduate
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +22,Target On,Target On
 DocType: BOM,Total Cost,Total Cost
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +99,Reaming,Rivning
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +9,Activity Log:,Aktivitet Log:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +199,Item {0} does not exist in the system or has expired,Vare {0} findes ikke i systemet eller er udløbet
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +44,Real Estate,Real Estate
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +44,Real Estate,Real Estate
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +4,Statement of Account,Kontoudtog
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +41,Pharmaceuticals,Lægemidler
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,Lægemidler
 DocType: Expense Claim Detail,Claim Amount,Krav Beløb
 DocType: Employee,Mr,Hr
 DocType: Custom Script,Client,Klient
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,Leverandør Type / leverandør
 DocType: Naming Series,Prefix,Præfiks
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Consumable,Forbrugsmaterialer
+apps/erpnext/erpnext/public/js/setup_wizard.js +359,Consumable,Forbrugsmaterialer
 DocType: Upload Attendance,Import Log,Import Log
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.js +19,Send,Sende
 DocType: Sales Invoice Item,Delivered By Supplier,Leveret af Leverandøren
 DocType: SMS Center,All Contact,Alle Kontakt
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +164,Annual Salary,Årsløn
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +164,Annual Salary,Årsløn
 DocType: Period Closing Voucher,Closing Fiscal Year,Lukning regnskabsår
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +69,Stock Expenses,Stock Udgifter
 DocType: Newsletter,Email Sent?,E-mail Sendt?
@@ -169,26 +164,24 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +92,Show Time Logs,Vis Time Logs
 DocType: Journal Entry Account,Credit in Company Currency,Kredit i Company Valuta
 DocType: Delivery Note,Installation Status,Installation status
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +115,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Accepteret + Afvist skal være lig med Modtaget mængde for vare {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +118,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Accepteret + Afvist skal være lig med Modtaget mængde for vare {0}
 DocType: Item,Supply Raw Materials for Purchase,Supply råstoffer til Indkøb
 apps/erpnext/erpnext/stock/get_item_details.py +133,Item {0} must be a Purchase Item,Vare {0} skal være et køb Vare
 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","Download skabelon, fylde relevante data og vedhæfte den ændrede fil. Alle datoer og medarbejder kombination i den valgte periode vil komme i skabelonen, med eksisterende fremmøde optegnelser"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +446,Item {0} is not active or end of life has been reached,Vare {0} er ikke aktiv eller slutningen af ​​livet er nået
 DocType: Time Log Batch,Will be updated after Sales Invoice is Submitted.,Vil blive opdateret efter Sales Invoice er indgivet.
-apps/erpnext/erpnext/controllers/accounts_controller.py +493,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Hvis du vil medtage skat i række {0} i Item sats, skatter i rækker {1} skal også medtages"
+apps/erpnext/erpnext/controllers/accounts_controller.py +494,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Hvis du vil medtage skat i række {0} i Item sats, skatter i rækker {1} skal også medtages"
 apps/erpnext/erpnext/config/hr.py +90,Settings for HR Module,Indstillinger for HR modul
 DocType: SMS Center,SMS Center,SMS-center
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +78,Straightening,Opretning
 DocType: BOM Replace Tool,New BOM,Ny BOM
 apps/erpnext/erpnext/config/projects.py +28,Batch Time Logs for billing.,Batch Time Logs for fakturering.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +15,Countergravity casting,Countergravity støbning
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +30,Newsletter has already been sent,Nyhedsbrev er allerede blevet sendt
 DocType: Lead,Request Type,Anmodning Type
 DocType: Leave Application,Reason,Årsag
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +14,Broadcasting,Broadcasting
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +140,Execution,Udførelse
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +364,The first user will become the System Manager (you can change this later).,Den første bruger bliver System Manager (du kan ændre dette senere).
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,Broadcasting
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +140,Execution,Udførelse
+apps/erpnext/erpnext/public/js/setup_wizard.js +114,The first user will become the System Manager (you can change this later).,Den første bruger bliver System Manager (du kan ændre dette senere).
 apps/erpnext/erpnext/config/manufacturing.py +39,Details of the operations carried out.,Oplysninger om de gennemførte transaktioner.
 DocType: Serial No,Maintenance Status,Vedligeholdelse status
 apps/erpnext/erpnext/config/stock.py +263,Items and Pricing,Varer og Priser
@@ -205,7 +198,6 @@
 DocType: Pricing Rule,Discount on Price List Rate (%),Rabat på prisliste Rate (%)
 apps/frappe/frappe/public/js/frappe/form/print.js +96,Start,Start
 DocType: User,First Name,Fornavn
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +12,Full-mold casting,Fuld formstøbning
 DocType: Offer Letter,Select Terms and Conditions,Vælg Betingelser
 DocType: Production Planning Tool,Sales Orders,Salgsordrer
 DocType: Purchase Taxes and Charges,Valuation,Værdiansættelse
@@ -217,8 +209,7 @@
 DocType: Bank Reconciliation,Bank Account,Bankkonto
 DocType: Leave Type,Allow Negative Balance,Tillad Negativ Balance
 DocType: Selling Settings,Default Territory,Standard Territory
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +53,Television,Fjernsyn
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +138,Gashing,Gashing
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,Fjernsyn
 DocType: Production Order Operation,Updated via 'Time Log',Opdateret via &#39;Time Log&#39;
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +82,Account {0} does not belong to Company {1},Konto {0} tilhører ikke virksomheden {1}
 DocType: Naming Series,Series List for this Transaction,Serie Liste for denne transaktion
@@ -233,14 +224,13 @@
 DocType: Leave Allocation,Add unused leaves from previous allocations,Tilføj ubrugte blade fra tidligere tildelinger
 apps/erpnext/erpnext/controllers/recurring_document.py +206,Next Recurring {0} will be created on {1},Næste Tilbagevendende {0} vil blive oprettet på {1}
 DocType: Newsletter List,Total Subscribers,Total Abonnenter
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +575,Contact Name,Kontakt Navn
+,Contact Name,Kontakt Navn
 DocType: Production Plan Item,SO Pending Qty,SO Afventer Antal
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Opretter lønseddel for ovennævnte kriterier.
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,Anmodning om køb.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +107,Double housing,Dobbelt hus
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +156,Only the selected Leave Approver can submit this Leave Application,Kun den valgte Leave Godkender kan indsende denne Leave Application
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +171,Only the selected Leave Approver can submit this Leave Application,Kun den valgte Leave Godkender kan indsende denne Leave Application
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,Lindre Dato skal være større end Dato for Sammenføjning
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +172,Leaves per Year,Blade pr år
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +172,Leaves per Year,Blade pr år
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup > Settings > Naming Series,Du indstille Navngivning Series for {0} via Opsætning&gt; Indstillinger&gt; Navngivning Series
 DocType: Time Log,Will be updated when batched.,"Vil blive opdateret, når batched."
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +104,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,"Række {0}: Tjek venligst &quot;Er Advance &#39;mod konto {1}, hvis dette er et forskud post."
@@ -249,25 +239,24 @@
 DocType: Item Website Specification,Item Website Specification,Item Website Specification
 DocType: Dropbox Backup,Dropbox Access Key,Dropbox adgangsnøgle
 DocType: Payment Tool,Reference No,Referencenummer
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +348,Leave Blocked,Lad Blokeret
-apps/erpnext/erpnext/stock/doctype/item/item.py +535,Item {0} has reached its end of life on {1},Vare {0} har nået slutningen af ​​sin levetid på {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +392,Leave Blocked,Lad Blokeret
+apps/erpnext/erpnext/stock/doctype/item/item.py +539,Item {0} has reached its end of life on {1},Vare {0} har nået slutningen af ​​sin levetid på {1}
 apps/erpnext/erpnext/accounts/utils.py +339,Annual,Årligt
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Stock Afstemning Item
 DocType: Stock Entry,Sales Invoice No,Salg faktura nr
 DocType: Material Request Item,Min Order Qty,Min prisen evt
 DocType: Lead,Do Not Contact,Må ikke komme i kontakt
 DocType: Sales Invoice,The unique id for tracking all recurring invoices. It is generated on submit.,Den unikke id til at spore alle tilbagevendende fakturaer. Det genereres på send.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +93,Software Developer,Software Developer
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +93,Software Developer,Software Developer
 DocType: Item,Minimum Order Qty,Minimum Antal
 DocType: Pricing Rule,Supplier Type,Leverandør Type
 DocType: Item,Publish in Hub,Offentliggør i Hub
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +555,Item {0} is cancelled,Vare {0} er aflyst
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +598,Material Request,Materiale Request
+apps/erpnext/erpnext/stock/doctype/item/item.py +559,Item {0} is cancelled,Vare {0} er aflyst
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +607,Material Request,Materiale Request
 DocType: Bank Reconciliation,Update Clearance Date,Opdatering Clearance Dato
 DocType: Item,Purchase Details,Køb Detaljer
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +323,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},Vare {0} ikke fundet i &quot;Raw Materials Leveres &#39;bord i Indkøbsordre {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +129,Wire brushing,Stålbørstning
 DocType: Employee,Relation,Relation
 DocType: Shipping Rule,Worldwide Shipping,Worldwide Shipping
 apps/erpnext/erpnext/config/selling.py +23,Confirmed orders from Customers.,Bekræftede ordrer fra kunder.
@@ -283,12 +272,11 @@
 DocType: Supplier,Address HTML,Adresse HTML
 DocType: Lead,Mobile No.,Mobil No.
 DocType: Maintenance Schedule,Generate Schedule,Generer Schedule
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +81,Hubbing,Sænksmedning
 DocType: Purchase Invoice Item,Expense Head,Expense Hoved
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +86,Please select Charge Type first,Vælg Charge Type først
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,Seneste
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +395,Max 5 characters,Max 5 tegn
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +195,Select Your Language,Vælg dit sprog
+apps/erpnext/erpnext/public/js/setup_wizard.js +143,Max 5 characters,Max 5 tegn
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +245,Select Your Language,Vælg dit sprog
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,"Den første Lad Godkender i listen, vil blive indstillet som standard Forlad Godkender"
 DocType: Manufacturing Settings,"Disables creation of time logs against Production Orders.
 Operations shall not be tracked against Production Order",Deaktiverer oprettelsen af ​​tid logs mod produktionsordrer. Operationer må ikke spores mod produktionsordre
@@ -300,8 +288,6 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +34,Item {0} must be Service Item,Vare {0} skal være service Item
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +303,Completed Qty can not be greater than 'Qty to Manufacture',Afsluttet Antal kan ikke være større end &#39;antal til Fremstilling&#39;
 DocType: DocType,Administrator,Administrator
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +136,Laser drilling,Laserboring
-DocType: Stock UOM Replace Utility,New Stock UOM,New Stock UOM
 DocType: Period Closing Voucher,Closing Account Head,Lukning konto Hoved
 DocType: Employee,External Work History,Ekstern Work History
 apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,Cirkulær reference Fejl
@@ -310,18 +296,15 @@
 DocType: Lead,Industry,Industri
 DocType: Employee,Job Profile,Job profil
 DocType: Newsletter,Newsletter,Nyhedsbrev
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +84,Hydroforming,Hydroformning
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +49,Necking,Necking
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Give besked på mail om oprettelse af automatiske Materiale Request
 DocType: Journal Entry,Multi Currency,Multi Valuta
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +51,Item is updated,Element er opdateret
 DocType: Async Task,System Manager,System Manager
 DocType: Payment Reconciliation Invoice,Invoice Type,Faktura type
 DocType: Sales Invoice Item,Delivery Note,Følgeseddel
 DocType: Dropbox Backup,Allow Dropbox Access,Tillad Dropbox Access
 apps/erpnext/erpnext/config/learn.py +72,Setting up Taxes,Opsætning Skatter
 apps/erpnext/erpnext/accounts/utils.py +189,Payment Entry has been modified after you pulled it. Please pull it again.,"Betaling indtastning er blevet ændret, efter at du trak det. Venligst trække det igen."
-apps/erpnext/erpnext/stock/doctype/item/item.py +343,{0} entered twice in Item Tax,{0} indtastet to gange i vareafgift
+apps/erpnext/erpnext/stock/doctype/item/item.py +347,{0} entered twice in Item Tax,{0} indtastet to gange i vareafgift
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +105,Summary for this week and pending activities,Resumé for denne uge og verserende aktiviteter
 DocType: Workstation,Rent Cost,Leje Omkostninger
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +74,Please select month and year,Vælg måned og år
@@ -338,23 +321,21 @@
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,"Hastighed, hvormed kunden Valuta omdannes til kundens basisvaluta"
 DocType: Features Setup,"Available in BOM, Delivery Note, Purchase Invoice, Production Order, Purchase Order, Purchase Receipt, Sales Invoice, Sales Order, Stock Entry, Timesheet","Fås i BOM, følgeseddel, købsfaktura, produktionsordre, Indkøbsordre, kvittering, Sales Invoice, Sales Order, Stock indtastning, Timesheet"
 DocType: Item Tax,Tax Rate,Skat
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Select Item,Vælg Item
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +540,Select Item,Vælg Item
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +143,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","Emne: {0} lykkedes batchvis, kan ikke forenes ved hjælp af \ Stock Forsoning, i stedet bruge Stock indtastning"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +259,Purchase Invoice {0} is already submitted,Købsfaktura {0} er allerede indsendt
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +262,Purchase Invoice {0} is already submitted,Købsfaktura {0} er allerede indsendt
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Batch No must be same as {1} {2},Row # {0}: Batch nr skal være det samme som {1} {2}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Convert to non-Group,Konverter til ikke-Group
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +55,Purchase Receipt must be submitted,Kvittering skal indsendes
-DocType: Stock UOM Replace Utility,Current Stock UOM,Aktuel Stock UOM
 apps/erpnext/erpnext/config/stock.py +53,Batch (lot) of an Item.,Batch (parti) af et element.
 DocType: C-Form Invoice Detail,Invoice Date,Faktura Dato
 DocType: GL Entry,Debit Amount,Debit Beløb
 apps/erpnext/erpnext/accounts/party.py +223,There can only be 1 Account per Company in {0} {1},Der kan kun være 1 konto pr Company i {0} {1}
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Your email address,Din e-mail-adresse
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +194,Please see attachment,Se venligst vedhæftede
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +203,Please see attachment,Se venligst vedhæftede
 DocType: Purchase Order,% Received,% Modtaget
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +109,Water jet cutting,Vandstråleskæring
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +24,Setup Already Complete!!,Opsætning Allerede Complete !!
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +20,Setup Already Complete!!,Opsætning Allerede Complete !!
 ,Finished Goods,Færdigvarer
 DocType: Delivery Note,Instructions,Instruktioner
 DocType: Quality Inspection,Inspected By,Inspiceres af
@@ -369,6 +350,7 @@
 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.,Tøv ikke oprette konti for kunder og leverandører. De er skabt direkte fra kunden / Leverandør mestre.
 DocType: Currency Exchange,Currency Exchange,Valutaveksling
 DocType: Purchase Invoice Item,Item Name,Item Name
+DocType: Authorization Rule,Approving User  (above authorized value),Godkendelse Bruger (over autoriserede værdi)
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Credit Balance,Credit Balance
 DocType: Employee,Widowed,Enke
 DocType: Production Planning Tool,"Items to be requested which are ""Out of Stock"" considering all warehouses based on projected qty and minimum order qty",Varer der skal ansøges som er &quot;på lager&quot; i betragtning af alle lagre baseret på forventede qty og mindste bestilling qty
@@ -378,11 +360,10 @@
 ,Purchase Register,Indkøb Register
 DocType: Landed Cost Item,Applicable Charges,Gældende gebyrer
 DocType: Workstation,Consumable Cost,Forbrugsmaterialer Cost
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,{0} ({1}) must have role 'Leave Approver',"{0} ({1}), skal have rollen 'Godkendelse af fravær'"
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +167,{0} ({1}) must have role 'Leave Approver',"{0} ({1}), skal have rollen 'Godkendelse af fravær'"
 DocType: Purchase Receipt,Vehicle Date,Køretøj Dato
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +39,Medical,Medicinsk
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +39,Medical,Medicinsk
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,Årsag til at miste
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +36,Tube beading,Tube beading
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},Workstation er lukket på følgende datoer som pr Holiday List: {0}
 DocType: Employee,Single,Enkeltværelse
 DocType: Issue,Attachment,Attachment
@@ -403,10 +384,8 @@
 DocType: Account,Is Group,Is Group
 DocType: Stock Settings,Automatically Set Serial Nos based on FIFO,Automatisk Serial nr baseret på FIFO
 DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,Check Leverandør Fakturanummer Entydighed
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +31,Thermoforming,Termoformning
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +66,Slitting,Langskæring
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +57,'To Case No.' cannot be less than 'From Case No.','Til sag nr.' kan ikke være mindre end 'Fra sag nr.'
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +104,Non Profit,Non Profit
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +104,Non Profit,Non Profit
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_list.js +7,Not Started,Ikke i gang
 DocType: Lead,Channel Partner,Channel Partner
 DocType: Account,Old Parent,Gammel Parent
@@ -415,13 +394,12 @@
 apps/erpnext/erpnext/config/manufacturing.py +74,Global settings for all manufacturing processes.,Globale indstillinger for alle produktionsprocesser.
 DocType: Accounts Settings,Accounts Frozen Upto,Regnskab Frozen Op
 DocType: SMS Log,Sent On,Sendt On
-apps/erpnext/erpnext/stock/doctype/item/item.py +512,Attribute {0} selected multiple times in Attributes Table,Attribut {0} valgt flere gange i attributter Tabel
+apps/erpnext/erpnext/stock/doctype/item/item.py +516,Attribute {0} selected multiple times in Attributes Table,Attribut {0} valgt flere gange i attributter Tabel
 DocType: Sales Order,Not Applicable,Gælder ikke
 apps/erpnext/erpnext/config/hr.py +140,Holiday master.,Ferie mester.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +19,Shell molding,Skalstøbning
 DocType: Material Request Item,Required Date,Nødvendig Dato
 DocType: Delivery Note,Billing Address,Faktureringsadresse
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +644,Please enter Item Code.,Indtast venligst Item Code.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +648,Please enter Item Code.,Indtast venligst Item Code.
 DocType: BOM,Costing,Koster
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount","Hvis markeret, vil momsbeløbet blive betragtet som allerede er inkluderet i Print Rate / Print Beløb"
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,Antal Total
@@ -431,7 +409,7 @@
 DocType: Item Attribute,To Range,At Rækkevidde
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Værdipapirer og Indlån
 DocType: Features Setup,Imports,Import
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +144,Adhesive bonding,Limning
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +77,Total leaves allocated is mandatory,Total blade tildelte er obligatorisk
 DocType: Job Opening,Description of a Job Opening,Beskrivelse af et job Åbning
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +102,Pending activities for today,Ventende aktiviteter for dag
 apps/erpnext/erpnext/config/hr.py +28,Attendance record.,Fremmøde rekord.
@@ -439,26 +417,25 @@
 DocType: Sales Order Item,Used for Production Plan,Bruges til Produktionsplan
 DocType: System Settings,Loading...,Indlæser ...
 DocType: DocField,Password,Adgangskode
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +155,Fused deposition modeling,Fused deposition modeling
 DocType: Manufacturing Settings,Time Between Operations (in mins),Time Between Operations (i minutter)
 DocType: Customer,Buyer of Goods and Services.,Køber af varer og tjenesteydelser.
 DocType: Journal Entry,Accounts Payable,Kreditor
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +24,Add Subscribers,Tilføj Abonnenter
 apps/erpnext/erpnext/public/js/feature_setup.js +220,""" does not exists",' findes ikke
 DocType: Pricing Rule,Valid Upto,Gyldig Op
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +564,List a few of your customers. They could be organizations or individuals.,Nævne et par af dine kunder. De kunne være organisationer eller enkeltpersoner.
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,List a few of your customers. They could be organizations or individuals.,Nævne et par af dine kunder. De kunne være organisationer eller enkeltpersoner.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Direct Income,Direkte Indkomst
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +33,"Can not filter based on Account, if grouped by Account","Kan ikke filtrere baseret på konto, hvis grupperet efter konto"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +88,Administrative Officer,Kontorfuldmægtig
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Administrative Officer,Kontorfuldmægtig
 DocType: Payment Tool,Received Or Paid,Modtaget eller betalt
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +318,Please select Company,Vælg Firma
 DocType: Stock Entry,Difference Account,Forskel konto
 apps/erpnext/erpnext/projects/doctype/task/task.py +44,Cannot close task as its dependant task {0} is not closed.,Kan ikke lukke opgave som sin afhængige opgave {0} ikke er lukket.
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +305,Please enter Warehouse for which Material Request will be raised,Indtast venligst Warehouse for hvilke Materiale Request vil blive rejst
 DocType: Production Order,Additional Operating Cost,Yderligere driftsomkostninger
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +20,Cosmetics,Kosmetik
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,Kosmetik
 DocType: DocField,Type,Type
-apps/erpnext/erpnext/stock/doctype/item/item.py +417,"To merge, following properties must be same for both items","At fusionere, skal følgende egenskaber være ens for begge poster"
+apps/erpnext/erpnext/stock/doctype/item/item.py +421,"To merge, following properties must be same for both items","At fusionere, skal følgende egenskaber være ens for begge poster"
 DocType: Communication,Subject,Emne
 DocType: Shipping Rule,Net Weight,Vægt
 DocType: Employee,Emergency Phone,Emergency Phone
@@ -468,7 +445,6 @@
 DocType: Journal Entry,Difference (Dr - Cr),Difference (Dr - Cr)
 DocType: Account,Profit and Loss,Resultatopgørelse
 apps/erpnext/erpnext/config/stock.py +293,Managing Subcontracting,Håndtering af underleverancer
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +58,New UOM must NOT be of type Whole Number,Ny UOM må IKKE være af typen heltal
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Furniture and Fixture,Møbler og Fixture
 DocType: Quotation,Rate at which Price list currency is converted to company's base currency,"Hastighed, hvormed Prisliste valuta omregnes til virksomhedens basisvaluta"
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Account {0} does not belong to company: {1},Konto {0} tilhører ikke virksomheden: {1}
@@ -487,14 +463,14 @@
 DocType: Purchase Invoice,Supplier Invoice No,Leverandør faktura nr
 DocType: Territory,For reference,For reference
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +154,"Cannot delete Serial No {0}, as it is used in stock transactions","Kan ikke slette Løbenummer {0}, som det bruges på lager transaktioner"
-apps/erpnext/erpnext/public/js/account_tree_grid.js +52,Closing (Cr),Lukning (Cr)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +227,Closing (Cr),Lukning (Cr)
 DocType: Serial No,Warranty Period (Days),Garantiperiode (dage)
 DocType: Installation Note Item,Installation Note Item,Installation Bemærk Vare
 ,Pending Qty,Afventer Antal
 DocType: Job Applicant,Thread HTML,Tråd HTML
 DocType: Company,Ignore,Ignorer
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +86,SMS sent to following numbers: {0},SMS sendt til følgende numre: {0}
-apps/erpnext/erpnext/controllers/buying_controller.py +135,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Leverandør Warehouse obligatorisk for underentreprise kvittering
+apps/erpnext/erpnext/controllers/buying_controller.py +126,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Leverandør Warehouse obligatorisk for underentreprise kvittering
 DocType: Pricing Rule,Valid From,Gyldig fra
 DocType: Sales Invoice,Total Commission,Samlet Kommissionen
 DocType: Pricing Rule,Sales Partner,Salg Partner
@@ -502,7 +478,7 @@
 DocType: Monthly Distribution,"**Monthly Distribution** helps you distribute your budget across months if you have seasonality in your business.
 
 To distribute a budget using this distribution, set this **Monthly Distribution** in the **Cost Center**","** Månedlig Distribution ** hjælper du distribuerer dit budget tværs måneder, hvis du har sæsonudsving i din virksomhed. At distribuere et budget ved hjælp af denne fordeling, skal du indstille dette ** Månedlig Distribution ** i ** Cost Center **"
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +183,No records found in the Invoice table,Ingen resultater i Invoice tabellen
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +130,No records found in the Invoice table,Ingen resultater i Invoice tabellen
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +20,Please select Company and Party Type first,Vælg Company og Party Type først
 apps/erpnext/erpnext/config/accounts.py +84,Financial / accounting year.,Finansiel / regnskabsår.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","Beklager, kan Serial Nos ikke blive slået sammen"
@@ -518,25 +494,25 @@
 DocType: Sales Order,Billing and Delivery Status,Fakturering og levering status
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Gentag Kunder
 DocType: Leave Control Panel,Allocate,Tildele
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +16,Previous,Forrige
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard_page.html +16,Previous,Forrige
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +620,Sales Return,Salg Return
 DocType: Production Planning Tool,Select Sales Orders from which you want to create Production Orders.,"Vælg salgsordrer, som du ønsker at skabe produktionsordrer."
 DocType: Item,Delivered by Supplier (Drop Ship),Leveret af Leverandøren (Drop Ship)
 apps/erpnext/erpnext/config/hr.py +120,Salary components.,Løn komponenter.
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,Database over potentielle kunder.
+DocType: Authorization Rule,Customer or Item,Kunden eller emne
 apps/erpnext/erpnext/config/crm.py +17,Customer database.,Kundedatabase.
 DocType: Quotation,Quotation To,Citat Til
 DocType: Lead,Middle Income,Midterste indkomst
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),Åbning (Cr)
 apps/erpnext/erpnext/accounts/utils.py +193,Allocated amount can not be negative,Tildelte beløb kan ikke være negativ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +123,Tumbling,Tumbling
 DocType: Purchase Order Item,Billed Amt,Billed Amt
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,Et logisk varelager hvor lagerændringer foretages.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +92,Reference No & Reference Date is required for {0},Referencenummer &amp; Reference Dato er nødvendig for {0}
 DocType: Event,Wednesday,Onsdag
 DocType: Sales Invoice,Customer's Vendor,Kundens Vendor
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +214,Production Order is Mandatory,Produktionsordre er Obligatorisk
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +139,Proposal Writing,Forslag Skrivning
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,Proposal Writing,Forslag Skrivning
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,En anden Sales Person {0} eksisterer med samme Medarbejder id
 apps/erpnext/erpnext/stock/stock_ledger.py +336,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},Negativ Stock Error ({6}) for Item {0} i Warehouse {1} på {2} {3} i {4} {5}
 DocType: Fiscal Year Company,Fiscal Year Company,Fiscal År Company
@@ -559,7 +535,7 @@
 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.","Så Priser Regler filtreres ud baseret på kunden, Kunde Group, Territory, leverandør, leverandør Type, Kampagne, Sales Partner etc."
 apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.py +179,Please install dropbox python module,Du installere dropbox python-modul
 DocType: Employee,Passport Number,Passport Number
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +82,Manager,Leder
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Manager,Leder
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +494,From Purchase Receipt,Fra kvittering
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +219,Same item has been entered multiple times.,Samme element er indtastet flere gange.
 DocType: SMS Settings,Receiver Parameter,Modtager Parameter
@@ -567,10 +543,9 @@
 DocType: Sales Person,Sales Person Targets,Salg person Mål
 apps/frappe/frappe/public/js/frappe/form/workflow.js +116,To,Til
 apps/frappe/frappe/templates/base.html +145,Please enter email address,Indtast e-mail-adresse
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +35,End tube forming,Ende rør danner
 DocType: Production Order Operation,In minutes,I minutter
 DocType: Issue,Resolution Date,Opløsning Dato
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +635,Please set default Cash or Bank account in Mode of Payment {0},Indstil standard Kontant eller bank konto i mode for betaling {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +637,Please set default Cash or Bank account in Mode of Payment {0},Indstil standard Kontant eller bank konto i mode for betaling {0}
 DocType: Selling Settings,Customer Naming By,Customer Navngivning Af
 apps/erpnext/erpnext/accounts/doctype/account/account.js +67,Convert to Group,Konverter til Group
 DocType: Activity Cost,Activity Type,Aktivitet Type
@@ -578,12 +553,12 @@
 DocType: Customer,Fixed Days,Faste dage
 DocType: Sales Invoice,Packing List,Pakning List
 apps/erpnext/erpnext/config/buying.py +28,Purchase Orders given to Suppliers.,Indkøbsordrer givet til leverandører.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +43,Publishing,Publishing
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +43,Publishing,Publishing
 DocType: Activity Cost,Projects User,Projekter Bruger
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Consumed,Forbrugt
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +198,{0}: {1} not found in Invoice Details table,{0}: {1} blev ikke fundet i Invoice Detaljer tabel
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,{0}: {1} not found in Invoice Details table,{0}: {1} blev ikke fundet i Invoice Detaljer tabel
 DocType: Company,Round Off Cost Center,Afrunde Cost center
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +208,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,"Vedligeholdelse Besøg {0} skal annulleres, før den annullerer denne Sales Order"
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +203,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,"Vedligeholdelse Besøg {0} skal annulleres, før den annullerer denne Sales Order"
 DocType: Material Request,Material Transfer,Materiale Transfer
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +56,Opening (Dr),Åbning (dr)
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},Udstationering tidsstempel skal være efter {0}
@@ -595,7 +570,6 @@
 DocType: Pricing Rule,Sales Manager,Salgschef
 apps/frappe/frappe/public/js/frappe/model/model.js +492,Rename,Omdøb
 DocType: Journal Entry,Write Off Amount,Skriv Off Beløb
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +52,Bending,Bøjning
 apps/frappe/frappe/core/page/user_permissions/user_permissions.js +246,Allow User,Tillad Bruger
 DocType: Journal Entry,Bill No,Bill Ingen
 DocType: Purchase Invoice,Quarterly,Kvartalsvis
@@ -605,17 +579,16 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Please enter item details,Indtast venligst item detaljer
 DocType: Purchase Receipt,Other Details,Andre detaljer
 DocType: Account,Accounts,Konti
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +67,Marketing,Marketing
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +65,Straight shearing,Lige klipning
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +67,Marketing,Marketing
 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.,At spore post i salgs- og købsdokumenter baseret på deres løbenr. Dette er også bruges til at spore garantiforpligtelser detaljer af produktet.
 DocType: Purchase Receipt Item Supplied,Current Stock,Aktuel Stock
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +99,Rejected Warehouse is mandatory against regected item,Afvist Warehouse er obligatorisk mod regected post
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +102,Rejected Warehouse is mandatory against regected item,Afvist Warehouse er obligatorisk mod regected post
 DocType: Account,Expenses Included In Valuation,Udgifter inkluderet i Værdiansættelse
 DocType: Employee,Provide email id registered in company,Giv email id er registreret i selskab
 DocType: Hub Settings,Seller City,Sælger By
 DocType: Email Digest,Next email will be sent on:,Næste email vil blive sendt på:
 DocType: Offer Letter Term,Offer Letter Term,Tilbyd Letter Term
-apps/erpnext/erpnext/stock/doctype/item/item.py +492,Item has variants.,Element har varianter.
+apps/erpnext/erpnext/stock/doctype/item/item.py +496,Item has variants.,Element har varianter.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Vare {0} ikke fundet
 DocType: Bin,Stock Value,Stock Value
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,Tree Type
@@ -624,10 +597,9 @@
 DocType: Material Request Item,Quantity and Warehouse,Mængde og Warehouse
 DocType: Sales Invoice,Commission Rate (%),Kommissionen Rate (%)
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +172,"Against Voucher Type must be one of Sales Order, Sales Invoice or Journal Entry","Imod Voucher type skal være en af ​​kundeordre, Salg Faktura eller Kassekladde"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +139,Biomachining,Biomachining
 apps/erpnext/erpnext/setup/utils.py +89,Unable to find exchange rate,Kan ikke finde valutakurs
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +7,Aerospace,Aerospace
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +19,Welcome,Velkommen
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +7,Aerospace,Aerospace
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +40,Welcome,Velkommen
 DocType: Journal Entry,Credit Card Entry,Credit Card indtastning
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +18,Task Subject,Task Emne
 apps/erpnext/erpnext/config/stock.py +33,Goods received from Suppliers.,Varer modtaget fra leverandører.
@@ -650,19 +622,19 @@
 DocType: Employee,Cell Number,Cell Antal
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Tabt
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +120,You can not enter current voucher in 'Against Journal Entry' column,Du kan ikke indtaste aktuelle kupon i &quot;Mod Kassekladde &#39;kolonne
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +25,Energy,Energi
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,Energi
 DocType: Opportunity,Opportunity From,Mulighed Fra
 apps/erpnext/erpnext/config/hr.py +33,Monthly salary statement.,Månedlige lønseddel.
 DocType: Item Group,Website Specifications,Website Specifikationer
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +205,New Account,Ny konto
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +21,{0}: From {0} of type {1},{0}: Fra {0} af typen {1}
-apps/erpnext/erpnext/controllers/buying_controller.py +283,Row {0}: Conversion Factor is mandatory,Række {0}: Konvertering Factor er obligatorisk
+apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,Række {0}: Konvertering Factor er obligatorisk
 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.,Bogføring kan foretages mod blad noder. Poster mod grupper er ikke tilladt.
 DocType: ToDo,High,Høj
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +361,Cannot deactivate or cancel BOM as it is linked with other BOMs,"Kan ikke deaktivere eller annullere BOM, som det er forbundet med andre styklister"
 DocType: Opportunity,Maintenance,Vedligeholdelse
 DocType: User,Male,Mand
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +182,Purchase Receipt number required for Item {0},Kvittering nummer kræves for Item {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +183,Purchase Receipt number required for Item {0},Kvittering nummer kræves for Item {0}
 DocType: Item Attribute Value,Item Attribute Value,Item Attribut Værdi
 apps/erpnext/erpnext/config/crm.py +64,Sales campaigns.,Salgskampagner.
 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.
@@ -691,10 +663,9 @@
 DocType: Address,Personal,Personlig
 DocType: Expense Claim Detail,Expense Claim Type,Expense krav Type
 DocType: Shopping Cart Settings,Default settings for Shopping Cart,Standardindstillinger for Indkøbskurv
-apps/erpnext/erpnext/controllers/accounts_controller.py +324,"Journal Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Kassekladde {0} er forbundet mod Order {1}, kontrollere, om det skal trækkes forhånd i denne faktura."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +13,Biotechnology,Bioteknologi
+apps/erpnext/erpnext/controllers/accounts_controller.py +325,"Journal Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Kassekladde {0} er forbundet mod Order {1}, kontrollere, om det skal trækkes forhånd i denne faktura."
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +13,Biotechnology,Bioteknologi
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Office Maintenance Expenses,Office vedligeholdelsesudgifter
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +53,Hemming,Hemming
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +66,Please enter Item first,Indtast Vare først
 DocType: Account,Liability,Ansvar
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +62,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Sanktioneret Beløb kan ikke være større end krav Beløb i Row {0}.
@@ -707,10 +678,10 @@
 DocType: Company,Default Bank Account,Standard bankkonto
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +47,"To filter based on Party, select Party Type first","Hvis du vil filtrere baseret på Party, skal du vælge Party Type først"
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},"'Opdater lager' kan ikke markeres, varerne ikke leveres via {0}"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Nos,Nos
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Nos,Nos
 DocType: Item,Items with higher weightage will be shown higher,Elementer med højere weightage vises højere
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Bank Afstemning Detail
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +627,My Invoices,Mine Fakturaer
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +629,My Invoices,Mine Fakturaer
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,Ingen medarbejder fundet
 DocType: Purchase Order,Stopped,Stoppet
 DocType: Item,If subcontracted to a vendor,Hvis underentreprise til en sælger
@@ -729,35 +700,33 @@
 DocType: Features Setup,"To enable ""Point of Sale"" features",For at aktivere &quot;Point of Sale&quot; funktioner
 DocType: Bin,Moving Average Rate,Glidende gennemsnit Rate
 DocType: Production Planning Tool,Select Items,Vælg emner
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,{0} against Bill {1} dated {2},{0} mod regning {1} ​​dateret {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +328,{0} against Bill {1} dated {2},{0} mod regning {1} ​​dateret {2}
 DocType: Comment,Reference Name,Henvisning Navn
 DocType: Maintenance Visit,Completion Status,Afslutning status
 DocType: Sales Invoice Item,Target Warehouse,Target Warehouse
 DocType: Item,Allow over delivery or receipt upto this percent,Tillad løbet levering eller modtagelse op denne procent
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +49,Expected Delivery Date cannot be before Sales Order Date,"Forventet leveringsdato kan ikke være, før Sales Order Date"
 DocType: Upload Attendance,Import Attendance,Import Fremmøde
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +17,All Item Groups,Alle varegrupper
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +17,All Item Groups,Alle varegrupper
 DocType: Process Payroll,Activity Log,Activity Log
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +30,Net Profit / Loss,Netto Resultat / Loss
 apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,Automatisk skrive besked på indsendelse af transaktioner.
 DocType: Production Order,Item To Manufacture,Item Til Fremstilling
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +16,Permanent mold casting,Permanent formstøbning
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} status er {2}
 apps/erpnext/erpnext/config/learn.py +172,Purchase Order to Payment,Indkøbsordre til betaling
 DocType: Sales Order Item,Projected Qty,Projiceret Antal
 DocType: Sales Invoice,Payment Due Date,Betaling Due Date
 DocType: Newsletter,Newsletter Manager,Nyhedsbrev manager
-apps/erpnext/erpnext/stock/doctype/item/item.js +229,Item Variant {0} already exists with same attributes,Item Variant {0} findes allerede med samme attributter
+apps/erpnext/erpnext/stock/doctype/item/item.js +231,Item Variant {0} already exists with same attributes,Item Variant {0} findes allerede med samme attributter
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening','Åbning'
 DocType: Notification Control,Delivery Note Message,Levering Note Message
 DocType: Expense Claim,Expenses,Udgifter
 DocType: Item Variant Attribute,Item Variant Attribute,Item Variant Attribut
 ,Purchase Receipt Trends,Kvittering Tendenser
 DocType: Appraisal,Select template from which you want to get the Goals,"Vælg skabelon, hvorfra du ønsker at få de mål"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +77,Research & Development,Forskning &amp; Udvikling
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Research & Development,Forskning &amp; Udvikling
 ,Amount to Bill,Beløb til Bill
 DocType: Company,Registration Details,Registrering Detaljer
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +75,Staking,Satsningen
 DocType: Item,Re-Order Qty,Re-prisen evt
 DocType: Leave Block List Date,Leave Block List Date,Lad Block List Dato
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +25,Scheduled to send to {0},Planlagt at sende til {0}
@@ -768,18 +737,16 @@
 DocType: Sales Invoice Item,Stock Details,Stock Detaljer
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Projekt Value
 apps/erpnext/erpnext/config/selling.py +304,Point-of-Sale,Point-of-Sale
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,Cannot carry forward {0},Kan ikke fortsætte {0}
 apps/erpnext/erpnext/accounts/doctype/account/account.py +91,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","Konto balance er kredit, Du har ikke lov at ændre 'Balancetype' til 'debit'"
 DocType: Account,Balance must be,Balance skal være
 DocType: Hub Settings,Publish Pricing,Offentliggøre Pricing
 DocType: Notification Control,Expense Claim Rejected Message,Expense krav Afvist Message
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +145,Nailing,Sømning
 ,Available Qty,Tilgængelig Antal
 DocType: Purchase Taxes and Charges,On Previous Row Total,På Forrige Row Total
 DocType: Salary Slip,Working Days,Arbejdsdage
 DocType: Serial No,Incoming Rate,Indgående Rate
 DocType: Packing Slip,Gross Weight,Bruttovægt
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +410,The name of your company for which you are setting up this system.,"Navnet på din virksomhed, som du oprette dette system."
+apps/erpnext/erpnext/public/js/setup_wizard.js +158,The name of your company for which you are setting up this system.,"Navnet på din virksomhed, som du oprette dette system."
 DocType: HR Settings,Include holidays in Total no. of Working Days,Medtag helligdage i alt nej. Arbejdsdage
 DocType: Job Applicant,Hold,Hold
 DocType: Employee,Date of Joining,Dato for Sammenføjning
@@ -789,7 +756,6 @@
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +3,View Subscribers,Se Abonnenter
 DocType: Purchase Invoice Item,Purchase Receipt,Kvittering
 ,Received Items To Be Billed,Modtagne varer skal faktureres
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +114,Abrasive blasting,Sandblæsning
 DocType: Employee,Ms,Ms
 apps/erpnext/erpnext/config/accounts.py +148,Currency exchange rate master.,Valutakursen mester.
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +253,Unable to find Time Slot in the next {0} days for Operation {1},Kan ikke finde Time Slot i de næste {0} dage til Operation {1}
@@ -801,7 +767,7 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +209,Serial No {0} does not belong to Item {1},Løbenummer {0} ikke hører til Vare {1}
 DocType: Purchase Receipt Item Supplied,Required Qty,Nødvendigt antal
 DocType: Bank Reconciliation,Total Amount,Samlet beløb
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +32,Internet Publishing,Internet Publishing
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,Internet Publishing
 DocType: Production Planning Tool,Production Orders,Produktionsordrer
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +35,Balance Value,Balance Value
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,Salg prisliste
@@ -812,7 +778,7 @@
 DocType: Supplier,Default Payable Accounts,Standard betales Konti
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,Medarbejder {0} er ikke aktiv eller findes ikke
 DocType: Features Setup,Item Barcode,Item Barcode
-apps/erpnext/erpnext/stock/doctype/item/item.py +487,Item Variants {0} updated,Item Varianter {0} opdateret
+apps/erpnext/erpnext/stock/doctype/item/item.py +491,Item Variants {0} updated,Item Varianter {0} opdateret
 DocType: Quality Inspection Reading,Reading 6,Læsning 6
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Købsfaktura Advance
 DocType: Address,Shop,Butik
@@ -821,7 +787,7 @@
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,"Standard Bank / Cash-konto vil automatisk blive opdateret i POS faktura, når denne tilstand er valgt."
 DocType: Employee,Permanent Address Is,Faste adresse
 DocType: Production Order Operation,Operation completed for how many finished goods?,Operation afsluttet for hvor mange færdigvarer?
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +491,The Brand,Brand
+apps/erpnext/erpnext/public/js/setup_wizard.js +237,The Brand,Brand
 apps/erpnext/erpnext/controllers/status_updater.py +163,Allowance for over-{0} crossed for Item {1}.,Fradrag for over- {0} krydsede for Item {1}.
 DocType: Employee,Exit Interview Details,Exit Interview Detaljer
 DocType: Item,Is Purchase Item,Er Indkøb Item
@@ -841,16 +807,16 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Indirect Income,Indirekte Indkomst
 DocType: Payment Tool,Set Payment Amount = Outstanding Amount,Set Betaling Beløb = udestående beløb
 DocType: Contact Us Settings,Address Line 1,Adresse Line 1
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Variance,Varians
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +392,Company Name,Firmaets navn
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +53,Variance,Varians
+,Company Name,Firmaets navn
 DocType: SMS Center,Total Message(s),Total Besked (r)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +515,Select Item for Transfer,Vælg Item for Transfer
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +538,Select Item for Transfer,Vælg Item for Transfer
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,Se en liste over alle de hjælpevideoer
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,"Vælg højde leder af den bank, hvor checken blev deponeret."
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,Tillad brugeren at redigere Prisliste Rate i transaktioner
 DocType: Pricing Rule,Max Qty,Max Antal
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +106,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Række {0}: Betaling mod Salg / Indkøbsordre bør altid blive markeret som forskud
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +16,Chemical,Kemisk
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,Kemisk
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +693,All items have already been transferred for this Production Order.,Alle elementer er allerede blevet overført til denne produktionsordre.
 DocType: Process Payroll,Select Payroll Year and Month,Vælg Payroll År og Måned
 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""",Gå til den relevante gruppe (som regel Anvendelse af fondene&gt; Omsætningsaktiver&gt; bankkonti og oprette en ny konto (ved at klikke på Tilføj barn) af typen &quot;Bank&quot;
@@ -861,12 +827,12 @@
 DocType: Item,Inspection Criteria,Inspektion Kriterier
 apps/erpnext/erpnext/config/accounts.py +101,Tree of finanial Cost Centers.,Tree of finanial Cost Centers.
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,Overført
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +492,Upload your letter head and logo. (you can edit them later).,Upload dit brev hoved og logo. (Du kan redigere dem senere).
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +156,White,Hvid
+apps/erpnext/erpnext/public/js/setup_wizard.js +238,Upload your letter head and logo. (you can edit them later).,Upload dit brev hoved og logo. (Du kan redigere dem senere).
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,White,Hvid
 DocType: SMS Center,All Lead (Open),Alle Bly (Open)
 DocType: Purchase Invoice,Get Advances Paid,Få forskud
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +362,Attach Your Picture,Vedhæft dit billede
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Make ,Lave
+apps/erpnext/erpnext/public/js/setup_wizard.js +112,Attach Your Picture,Vedhæft dit billede
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +540,Make ,Lave
 DocType: Journal Entry,Total Amount in Words,Samlet beløb i Words
 DocType: Workflow State,Stop,Stands
 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.,"Der opstod en fejl. En sandsynlig årsag kan være, at du ikke har gemt formularen. Kontakt venligst support@erpnext.com hvis problemet fortsætter."
@@ -875,14 +841,13 @@
 DocType: Lead,Next Contact Date,Næste Kontakt Dato
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,Åbning Antal
 DocType: Holiday List,Holiday List Name,Holiday listenavn
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +168,Stock Options,Aktieoptioner
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +168,Stock Options,Aktieoptioner
 DocType: Journal Entry Account,Expense Claim,Expense krav
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +181,Qty for {0},Antal for {0}
 DocType: Leave Application,Leave Application,Forlad Application
 apps/erpnext/erpnext/config/hr.py +77,Leave Allocation Tool,Lad Tildeling Tool
 DocType: Leave Block List,Leave Block List Dates,Lad Block List Datoer
 DocType: Company,If Monthly Budget Exceeded (for expense account),Hvis Månedligt budget overskredet (for udgiftskonto)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +56,Trimming,Trimning
 DocType: Workstation,Net Hour Rate,Net Hour Rate
 DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,Landed Cost kvittering
 DocType: Company,Default Terms,Standard Vilkår
@@ -890,10 +855,9 @@
 DocType: POS Profile,Cash/Bank Account,Kontant / Bankkonto
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,Removed items with no change in quantity or value.,Fjernede elementer uden nogen ændringer i mængde eller værdi.
 DocType: Delivery Note,Delivery To,Levering Til
-apps/erpnext/erpnext/stock/doctype/item/item.py +509,Attribute table is mandatory,Attributtabellen er obligatorisk
+apps/erpnext/erpnext/stock/doctype/item/item.py +513,Attribute table is mandatory,Attributtabellen er obligatorisk
 DocType: Production Planning Tool,Get Sales Orders,Få salgsordrer
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} kan ikke være negativ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +103,Filing,Arkivering
 apps/erpnext/erpnext/templates/form_grid/item_grid.html +72,Discount,Rabat
 DocType: Features Setup,Purchase Discounts,Køb Rabatter
 DocType: Workstation,Wages,Løn
@@ -910,6 +874,7 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +112,You are the Expense Approver for this record. Please Update the 'Status' and Save,Du er bekostning Godkender til denne oplysning. Venligst Opdater &quot;Status&quot; og Gem
 DocType: Serial No,Creation Document No,Creation dokument nr
 DocType: Issue,Issue,Issue
+apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account does not match with Company,Konto stemmer ikke overens med Firma
 apps/erpnext/erpnext/config/stock.py +136,"Attributes for Item Variants. e.g Size, Color etc.","Attributter for Item Varianter. f.eks størrelse, farve etc."
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +39,WIP Warehouse,WIP Warehouse
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +194,Serial No {0} is under maintenance contract upto {1},Løbenummer {0} er under vedligeholdelse kontrakt op {1}
@@ -918,7 +883,7 @@
 DocType: Tax Rule,Shipping State,Forsendelse stat
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,Konto suppleres ved hjælp af &quot;Find varer fra Køb Kvitteringer &#39;knappen
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,Salgsomkostninger
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Buying,Standard Buying
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +120,Standard Buying,Standard Buying
 DocType: GL Entry,Against,Imod
 DocType: Item,Default Selling Cost Center,Standard Selling Cost center
 DocType: Sales Partner,Implementation Partner,Implementering Partner
@@ -939,29 +904,29 @@
 DocType: Time Log Batch,updated via Time Logs,opdateret via Time Logs
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,Gennemsnitlig alder
 DocType: Opportunity,Your sales person who will contact the customer in future,"Dit salg person, som vil kontakte kunden i fremtiden"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +588,List a few of your suppliers. They could be organizations or individuals.,Nævne et par af dine leverandører. De kunne være organisationer eller enkeltpersoner.
+apps/erpnext/erpnext/public/js/setup_wizard.js +326,List a few of your suppliers. They could be organizations or individuals.,Nævne et par af dine leverandører. De kunne være organisationer eller enkeltpersoner.
 DocType: Company,Default Currency,Standard Valuta
 DocType: Contact,Enter designation of this Contact,Indtast udpegelsen af ​​denne Kontakt
 DocType: Contact Us Settings,Address,Adresse
 DocType: Expense Claim,From Employee,Fra Medarbejder
-apps/erpnext/erpnext/controllers/accounts_controller.py +338,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,"Advarsel: Systemet vil ikke tjekke overfakturering, da beløbet til konto {0} i {1} er nul"
+apps/erpnext/erpnext/controllers/accounts_controller.py +339,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,"Advarsel: Systemet vil ikke tjekke overfakturering, da beløbet til konto {0} i {1} er nul"
 DocType: Journal Entry,Make Difference Entry,Make Difference indtastning
 DocType: Upload Attendance,Attendance From Date,Fremmøde Fra dato
 DocType: Appraisal Template Goal,Key Performance Area,Key Performance Area
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +54,Transportation,Transport
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +54,Transportation,Transport
 apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +67, and year: ,og år:
 DocType: Email Digest,Annual Expense,Årlig Udgift
 DocType: SMS Center,Total Characters,Total tegn
-apps/erpnext/erpnext/controllers/buying_controller.py +139,Please select BOM in BOM field for Item {0},Vælg BOM i BOM vilkår for Item {0}
+apps/erpnext/erpnext/controllers/buying_controller.py +130,Please select BOM in BOM field for Item {0},Vælg BOM i BOM vilkår for Item {0}
 DocType: C-Form Invoice Detail,C-Form Invoice Detail,C-Form Faktura Detail
 DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,Betaling Afstemning Faktura
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +32,Contribution %,Bidrag%
 DocType: Item,website page link,webside link
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +192,Let's prepare the system for first use.,Lad os forberede systemet til første brug.
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +242,Let's prepare the system for first use.,Lad os forberede systemet til første brug.
 DocType: Company,Company registration numbers for your reference. Tax numbers etc.,Firma registreringsnumre til din reference. Skat numre etc.
 DocType: Sales Partner,Distributor,Distributør
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Indkøbskurv Shipping Rule
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +214,Production Order {0} must be cancelled before cancelling this Sales Order,"Produktionsordre {0} skal annulleres, før den annullerer denne Sales Order"
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +209,Production Order {0} must be cancelled before cancelling this Sales Order,"Produktionsordre {0} skal annulleres, før den annullerer denne Sales Order"
 ,Ordered Items To Be Billed,Bestilte varer at blive faktureret
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +24,From Range has to be less than To Range,Fra Range skal være mindre end at ligge
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +21,Select Time Logs and Submit to create a new Sales Invoice.,Vælg Time Logs og Send for at oprette en ny Sales Invoice.
@@ -981,14 +946,13 @@
 DocType: Sales Invoice Advance,Sales Invoice Advance,Salg Faktura Advance
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +398,Nothing to request,Intet at anmode
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date','Faktisk startdato' kan ikke være større end 'Faktisk slutdato'
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +75,Management,Ledelse
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +75,Management,Ledelse
 apps/erpnext/erpnext/config/projects.py +33,Types of activities for Time Sheets,Typer af aktiviteter for Time Sheets
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +14,Investment casting,Investeringer støbning
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +51,Either debit or credit amount is required for {0},Enten kredit- eller beløb er påkrævet for {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""","Dette vil blive føjet til Item Code af varianten. For eksempel, hvis dit forkortelse er &quot;SM&quot;, og punktet koden er &quot;T-SHIRT&quot;, punktet koden for den variant, vil være &quot;T-SHIRT-SM&quot;"
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,"Nettoløn (i ord) vil være synlig, når du gemmer lønsedlen."
 apps/frappe/frappe/core/doctype/user/user_list.js +12,Active,Aktiv
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +154,Blue,Blå
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +154,Blue,Blå
 DocType: Purchase Invoice,Is Return,Er Return
 DocType: Price List Country,Price List Country,Prisliste Land
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +123,Further nodes can be only created under 'Group' type nodes,Yderligere noder kan kun oprettes under &#39;koncernens typen noder
@@ -998,18 +962,16 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +22,POS Profile {0} already created for user: {1} and company {2},POS Profil {0} allerede oprettet for bruger: {1} og selskab {2}
 DocType: Purchase Order Item,UOM Conversion Factor,UOM Conversion Factor
 DocType: Stock Settings,Default Item Group,Standard Punkt Group
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +156,Laminated object manufacturing,Lamineret objekt fremstillingsvirksomhed
 apps/erpnext/erpnext/config/buying.py +13,Supplier database.,Leverandør database.
 DocType: Account,Balance Sheet,Balance
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +561,Cost Center For Item with Item Code ',Cost Center For Item med Item Code &#39;
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +45,Stretch forming,Stretch danner
 DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,Dit salg person vil få en påmindelse på denne dato for at kontakte kunden
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +210,"Further accounts can be made under Groups, but entries can be made against non-Groups","Kan gøres yderligere konti under grupper, men oplysningerne kan gøres mod ikke-grupper"
 apps/erpnext/erpnext/config/hr.py +125,Tax and other salary deductions.,Skat og andre løn fradrag.
 DocType: Lead,Lead,Bly
 DocType: Email Digest,Payables,Gæld
 DocType: Account,Warehouse,Warehouse
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +90,Row #{0}: Rejected Qty can not be entered in Purchase Return,Row # {0}: Afvist Antal kan ikke indtastes i Indkøb Return
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +93,Row #{0}: Rejected Qty can not be entered in Purchase Return,Row # {0}: Afvist Antal kan ikke indtastes i Indkøb Return
 ,Purchase Order Items To Be Billed,Købsordre Varer at blive faktureret
 DocType: Purchase Invoice Item,Net Rate,Net Rate
 DocType: Purchase Invoice Item,Purchase Invoice Item,Købsfaktura Item
@@ -1024,13 +986,13 @@
 DocType: Global Defaults,Current Fiscal Year,Indeværende finansår
 DocType: Global Defaults,Disable Rounded Total,Deaktiver Afrundet Total
 DocType: Lead,Call,Opkald
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +384,'Entries' cannot be empty,'Indlæg' kan ikke være tomt
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +386,'Entries' cannot be empty,'Indlæg' kan ikke være tomt
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},Duplicate række {0} med samme {1}
 ,Trial Balance,Trial Balance
 apps/erpnext/erpnext/config/hr.py +205,Setting up Employees,Opsætning af Medarbejdere
 apps/erpnext/erpnext/public/js/feature_setup.js +220,"Grid """,Grid &quot;
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +150,Please select prefix first,Vælg venligst præfiks først
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +138,Research,Forskning
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +138,Research,Forskning
 DocType: Maintenance Visit Purpose,Work Done,Arbejde Udført
 apps/erpnext/erpnext/controllers/item_variant.py +25,Please specify at least one attribute in the Attributes table,Angiv mindst én attribut i Attributter tabellen
 DocType: Contact,User ID,Bruger-id
@@ -1038,10 +1000,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +57,View Ledger,Vis Ledger
 DocType: File,Lft,LFT
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Tidligste
-apps/erpnext/erpnext/stock/doctype/item/item.py +394,"An Item Group exists with same name, please change the item name or rename the item group","Findes et Element Group med samme navn, skal du ændre elementet navn eller omdøbe varegruppe"
+apps/erpnext/erpnext/stock/doctype/item/item.py +398,"An Item Group exists with same name, please change the item name or rename the item group","Findes et Element Group med samme navn, skal du ændre elementet navn eller omdøbe varegruppe"
 DocType: Communication,Delivery Status,Levering status
 DocType: Production Order,Manufacture against Sales Order,Fremstilling mod kundeordre
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +517,Rest Of The World,Resten af ​​verden
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +455,Rest Of The World,Resten af ​​verden
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,Item {0} kan ikke have Batch
 ,Budget Variance Report,Budget Variance Report
 DocType: Salary Slip,Gross Pay,Gross Pay
@@ -1052,13 +1014,11 @@
 DocType: BOM Item,Item Description,Punkt Beskrivelse
 DocType: Payment Tool,Payment Mode,Betaling tilstand
 DocType: Purchase Invoice,Is Recurring,Er Tilbagevendende
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +154,Direct metal laser sintering,Direkte metal lasersintring
 DocType: Purchase Order,Supplied Items,Medfølgende varer
 DocType: Production Order,Qty To Manufacture,Antal Til Fremstilling
 DocType: Buying Settings,Maintain same rate throughout purchase cycle,Bevar samme sats i hele køb cyklus
 DocType: Opportunity Item,Opportunity Item,Opportunity Vare
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +61,Temporary Opening,Midlertidig Åbning
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +41,Cryorolling,Cryorolling
 ,Employee Leave Balance,Medarbejder Leave Balance
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +128,Balance for Account {0} must always be {1},Balance for konto {0} skal altid være {1}
 DocType: Address,Address Type,Adressetype
@@ -1074,23 +1034,23 @@
 DocType: Journal Entry,Get Outstanding Invoices,Få udestående fakturaer
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,Sales Order {0} er ikke gyldig
 apps/erpnext/erpnext/setup/doctype/company/company.py +172,"Sorry, companies cannot be merged","Beklager, kan virksomhederne ikke slås sammen"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +145,Small,Lille
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Small,Lille
 DocType: Employee,Employee Number,Medarbejder nummer
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},"(E), der allerede er i brug Case Ingen. Prøv fra sag {0}"
 ,Invoiced Amount (Exculsive Tax),Faktureret beløb (exculsive Tax)
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,Punkt 2
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +59,Account head {0} created,Konto head {0} oprettet
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +153,Green,Grøn
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Green,Grøn
 DocType: Item,Auto re-order,Auto re-ordre
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +57,Total Achieved,Total Opnået
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +59,Total Achieved,Total Opnået
 DocType: Employee,Place of Issue,Sted for Issue
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +59,Contract,Kontrakt
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Contract,Kontrakt
 DocType: Report,Disabled,Handicappet
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +490,UOM coversion factor required for UOM: {0} in Item: {1},UOM coversion faktor kræves for Pakke: {0} i Konto: {1}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +83,Indirect Expenses,Indirekte udgifter
 apps/erpnext/erpnext/controllers/selling_controller.py +163,Row {0}: Qty is mandatory,Række {0}: Antal er obligatorisk
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +8,Agriculture,Landbrug
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +611,Your Products or Services,Dine produkter eller tjenester
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,Landbrug
+apps/erpnext/erpnext/public/js/setup_wizard.js +347,Your Products or Services,Dine produkter eller tjenester
 DocType: Mode of Payment,Mode of Payment,Mode Betaling
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,Dette er en rod varegruppe og kan ikke redigeres.
 DocType: Journal Entry Account,Purchase Order,Indkøbsordre
@@ -1102,7 +1062,7 @@
 DocType: Serial No,Serial No Details,Serial Ingen Oplysninger
 DocType: Purchase Invoice Item,Item Tax Rate,Item Skat
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +113,"For {0}, only credit accounts can be linked against another debit entry",For {0} kan kun kredit konti knyttes mod en anden debet post
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Delivery Note {0} is not submitted,Levering Note {0} er ikke indsendt
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +470,Delivery Note {0} is not submitted,Levering Note {0} er ikke indsendt
 apps/erpnext/erpnext/stock/get_item_details.py +136,Item {0} must be a Sub-contracted Item,Vare {0} skal være en underentreprise Vare
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,Capital Udstyr
 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.","Prisfastsættelse Regel først valgt baseret på &quot;Apply On &#39;felt, som kan være Item, punkt Group eller Brand."
@@ -1112,7 +1072,7 @@
 DocType: Appraisal Goal,Goal,Goal
 DocType: Sales Invoice Item,Edit Description,Edit Beskrivelse
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +318,Expected Delivery Date is lesser than Planned Start Date.,Forventet leveringsdato er mindre end planlagt startdato.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +579,For Supplier,For Leverandøren
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +602,For Supplier,For Leverandøren
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,Indstilling Kontotype hjælper med at vælge denne konto i transaktioner.
 DocType: Purchase Invoice,Grand Total (Company Currency),Grand Total (Company Valuta)
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,Samlet Udgående
@@ -1138,10 +1098,10 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +74,"Total {0} for all items is zero, may you should change 'Distribute Charges Based On'","Total {0} for alle poster er nul, kan du skal ændre &#39;Fordel afgifter baseret på&#39;"
 DocType: Purchase Invoice,Taxes and Charges Calculation,Skatter og Afgifter Beregning
 DocType: BOM Operation,Workstation,Arbejdsstation
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +112,Hardware,Hardware
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +112,Hardware,Hardware
 DocType: Attendance,HR Manager,HR Manager
 apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,Vælg Firma
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +50,Privilege Leave,Privilege Forlad
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +50,Privilege Leave,Privilege Forlad
 DocType: Purchase Invoice,Supplier Invoice Date,Leverandør Faktura Dato
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +79,You need to enable Shopping Cart,Du skal aktivere Indkøbskurv
 apps/frappe/frappe/public/js/frappe/form/grid_body.html +6,No Data,Ingen data
@@ -1154,7 +1114,7 @@
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +81,Overlapping conditions found between:,Overlappende betingelser fundet mellem:
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +168,Against Journal Entry {0} is already adjusted against some other voucher,Mod Kassekladde {0} er allerede justeret mod en anden kupon
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +68,Total Order Value,Samlet ordreværdi
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +38,Food,Mad
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +38,Food,Mad
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Ageing Range 3
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +139,You can make a time log only against a submitted production order,Du kan lave en tid log kun mod en indsendt produktionsordre
 DocType: Maintenance Schedule Item,No of Visits,Ingen af ​​besøg
@@ -1174,6 +1134,7 @@
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,View Offer Letter,Se tilbud Letter
 DocType: Communication,Communication,Kommunikation
 DocType: Item,Is Service Item,Er service Item
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +81,Application period cannot be outside leave allocation period,Ansøgningsperiode kan ikke være uden for orlov tildelingsperiode
 DocType: Activity Cost,Projects,Projekter
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +31,Please select Fiscal Year,Vælg venligst regnskabsår
 apps/erpnext/erpnext/controllers/buying_controller.py +23,From {0} | {1} {2},Fra {0} | {1} {2}
@@ -1192,7 +1153,7 @@
 DocType: Item,Maintain Stock,Vedligehold Stock
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +213,Stock Entries already created for Production Order ,Stock Entries allerede skabt til produktionsordre
 DocType: Leave Control Panel,Leave blank if considered for all designations,Lad stå tomt hvis det anses for alle betegnelser
-apps/erpnext/erpnext/controllers/accounts_controller.py +499,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Afgift af typen &#39;Actual &quot;i rækken {0} kan ikke indgå i Item Rate
+apps/erpnext/erpnext/controllers/accounts_controller.py +500,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Afgift af typen &#39;Actual &quot;i rækken {0} kan ikke indgå i Item Rate
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,Max: {0},Max: {0}
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +16,From Datetime,Fra datotid
 DocType: Email Digest,For Company,For Company
@@ -1202,7 +1163,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +50,Chart of Accounts,Kontoplan
 DocType: Material Request,Terms and Conditions Content,Vilkår og betingelser Indhold
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +471,cannot be greater than 100,må ikke være større end 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +546,Item {0} is not a stock Item,Vare {0} er ikke et lager Vare
+apps/erpnext/erpnext/stock/doctype/item/item.py +550,Item {0} is not a stock Item,Vare {0} er ikke et lager Vare
 DocType: Maintenance Visit,Unscheduled,Uplanlagt
 DocType: Employee,Owned,Ejet
 DocType: Salary Slip Deduction,Depends on Leave Without Pay,Afhænger Leave uden løn
@@ -1216,30 +1177,28 @@
 DocType: HR Settings,Employee Settings,Medarbejder Indstillinger
 ,Batch-Wise Balance History,Batch-Wise Balance History
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +72,To Do List,To Do List
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +63,Apprentice,Lærling
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Apprentice,Lærling
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +99,Negative Quantity is not allowed,Negative Mængde er ikke tilladt
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
 Used for Taxes and Charges",Skat detalje tabel hentes fra post mester som en streng og opbevares i dette område. Bruges til skatter og afgifter
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +61,Lancing,Lancing
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +151,Employee cannot report to himself.,Medarbejder kan ikke rapportere til ham selv.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Hvis kontoen er frossen, er poster lov til begrænsede brugere."
 DocType: Email Digest,Bank Balance,Bank Balance
-apps/erpnext/erpnext/controllers/accounts_controller.py +435,Accounting Entry for {0}: {1} can only be made in currency: {2},Regnskab Punktet om {0}: {1} kan kun foretages i valuta: {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +436,Accounting Entry for {0}: {1} can only be made in currency: {2},Regnskab Punktet om {0}: {1} kan kun foretages i valuta: {2}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +38,No active Salary Structure found for employee {0} and the month,Ingen aktive Løn Struktur fundet for medarbejder {0} og måned
 DocType: Job Opening,"Job profile, qualifications required etc.","Jobprofil, kvalifikationer kræves etc."
 DocType: Journal Entry Account,Account Balance,Kontosaldo
 apps/erpnext/erpnext/config/accounts.py +112,Tax Rule for transactions.,Skat Regel for transaktioner.
 DocType: Rename Tool,Type of document to rename.,Type dokument omdøbe.
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +630,We buy this Item,Vi køber denne vare
+apps/erpnext/erpnext/public/js/setup_wizard.js +366,We buy this Item,Vi køber denne vare
 DocType: Address,Billing,Fakturering
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +77,Flanging,Flanger
 DocType: Bulk Email,Not Sent,Ikke Sent
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +73,Explosive forming,Eksplosiv danner
 DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),Total Skatter og Afgifter (Company valuta)
 DocType: Shipping Rule,Shipping Account,Forsendelse konto
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +43,Scheduled to send to {0} recipients,Planlagt at sende til {0} modtagere
 DocType: Quality Inspection,Readings,Aflæsninger
 DocType: Stock Entry,Total Additional Costs,Total Yderligere omkostninger
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Sub Assemblies,Sub forsamlinger
+apps/erpnext/erpnext/public/js/setup_wizard.js +359,Sub Assemblies,Sub forsamlinger
 DocType: Shipping Rule Condition,To Value,Til Value
 DocType: Supplier,Stock Manager,Stock manager
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +143,Source warehouse is mandatory for row {0},Kilde lageret er obligatorisk for rækken {0}
@@ -1249,44 +1208,42 @@
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Import mislykkedes!
 apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,Ingen adresse tilføjet endnu.
 DocType: Workstation Working Hour,Workstation Working Hour,Workstation Working Hour
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +83,Analyst,Analytiker
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +202,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Række {0}: Allokeret mængde {1} skal være mindre end eller lig med JV beløb {2}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Analyst,Analytiker
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +149,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Række {0}: Allokeret mængde {1} skal være mindre end eller lig med JV beløb {2}
 DocType: Item,Inventory,Inventory
 DocType: Features Setup,"To enable ""Point of Sale"" view",For at aktivere &quot;Point of Sale&quot; view
 apps/erpnext/erpnext/public/js/pos/pos.js +402,Payment cannot be made for empty cart,Betaling kan ikke ske for tomme vogn
 DocType: Item,Sales Details,Salg Detaljer
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +149,Pinning,Pinning
 DocType: Opportunity,With Items,Med Varer
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,I Antal
 DocType: Notification Control,Expense Claim Rejected,Expense krav Afvist
 DocType: Sales Invoice,"The date on which next invoice will be generated. It is generated on submit.
 ","Den dato, hvor næste faktura vil blive genereret. Det genereres på send."
 DocType: Item Attribute,Item Attribute,Item Attribut
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +105,Government,Regeringen
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Government,Regeringen
 apps/erpnext/erpnext/config/stock.py +268,Item Variants,Item Varianter
 DocType: Company,Services,Tjenester
 apps/erpnext/erpnext/accounts/report/financial_statements.py +147,Total ({0}),I alt ({0})
 DocType: Cost Center,Parent Cost Center,Parent Cost center
 DocType: Sales Invoice,Source,Kilde
 DocType: Leave Type,Is Leave Without Pay,Er Lad uden løn
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +186,No records found in the Payment table,Ingen resultater i Payment tabellen
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +405,Financial Year Start Date,Regnskabsår Startdato
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +133,No records found in the Payment table,Ingen resultater i Payment tabellen
+apps/erpnext/erpnext/public/js/setup_wizard.js +153,Financial Year Start Date,Regnskabsår Startdato
 DocType: Employee External Work History,Total Experience,Total Experience
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +100,Countersinking,Undersænkning
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +271,Packing Slip(s) cancelled,Packing Slip (r) annulleret
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +276,Packing Slip(s) cancelled,Packing Slip (r) annulleret
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,Fragt og Forwarding Afgifter
 DocType: Material Request Item,Sales Order No,Salg bekendtgørelse nr
 DocType: Item Group,Item Group Name,Item Group Name
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +50,Taken,Taget
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,Taget
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +66,Transfer Materials for Manufacture,Overfør Materialer til Fremstilling
 DocType: Pricing Rule,For Price List,For prisliste
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +27,Executive Search,Executive Search
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,Executive Search
 apps/erpnext/erpnext/stock/stock_ledger.py +405,"Purchase rate for item: {0} not found, which is required to book accounting entry (expense). Please mention item price against a buying price list.","Købskurs for vare: {0} ikke fundet, som er nødvendig for at booke regnskabsmæssig post (udgift). Nævne venligst vare pris mod en købskurs listen."
 DocType: Maintenance Schedule,Schedules,Tidsplaner
 DocType: Purchase Invoice Item,Net Amount,Nettobeløb
 DocType: Purchase Order Item Supplied,BOM Detail No,BOM Detail Nej
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),Yderligere Discount Beløb (Company Valuta)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +537,Error: {0} > {1},Fejl: {0}&gt; {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +541,Error: {0} > {1},Fejl: {0}&gt; {1}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,Opret ny konto fra kontoplanen.
 DocType: Maintenance Visit,Maintenance Visit,Vedligeholdelse Besøg
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer > Customer Group > Territory,Kunde&gt; Customer Group&gt; Territory
@@ -1297,7 +1254,6 @@
 DocType: Event,Tuesday,Tirsdag
 DocType: Leave Block List,Block Holidays on important days.,Bloker Ferie på vigtige dage.
 ,Accounts Receivable Summary,Debitor Resumé
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +43,Leaves for type {0} already allocated for Employee {1} for period {2} - {3},Blade for type {0} allerede afsat til Medarbejder {1} for perioden {2} - {3}
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +187,Please set User ID field in an Employee record to set Employee Role,Indstil Bruger-id feltet i en Medarbejder rekord at indstille Medarbejder Rolle
 DocType: UOM,UOM Name,UOM Navn
 DocType: Top Bar Item,Target,Target
@@ -1309,15 +1265,14 @@
 DocType: ToDo,Due Date,Due Date
 DocType: Sales Invoice Item,Brand Name,Brandnavn
 DocType: Purchase Receipt,Transporter Details,Transporter Detaljer
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Box,Kasse
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +389,The Organization,Organisationen
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Box,Kasse
+apps/erpnext/erpnext/public/js/setup_wizard.js +137,The Organization,Organisationen
 DocType: Monthly Distribution,Monthly Distribution,Månedlig Distribution
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,Modtager List er tom. Opret Modtager liste
 DocType: Production Plan Sales Order,Production Plan Sales Order,Produktion Plan kundeordre
 DocType: Sales Partner,Sales Partner Target,Salg Partner Target
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},Regnskab Punktet om {0} kan kun foretages i valuta: {1}
 DocType: Pricing Rule,Pricing Rule,Prisfastsættelse Rule
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +58,Notching,Udhugning
 apps/erpnext/erpnext/config/learn.py +167,Material Request to Purchase Order,Materiale Anmodning om at Indkøbsordre
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +74,Row # {0}: Returned Item {1} does not exists in {2} {3},Row # {0}: returnerede vare {1} ikke eksisterer i {2} {3}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,Bankkonti
@@ -1334,20 +1289,19 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Amounts not reflected in bank,"Beløb, der ikke afspejles i bank"
 DocType: Quality Inspection Reading,Reading 4,Reading 4
 apps/erpnext/erpnext/config/hr.py +23,Claims for company expense.,Krav om selskabets regning.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +8,Centrifugal casting,Centrifugal casting
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +119,Magnetic field-assisted finishing,Magnetfelt-assisteret efterbehandling
 DocType: Company,Default Holiday List,Standard Holiday List
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +165,Stock Liabilities,Stock Passiver
 DocType: Purchase Receipt,Supplier Warehouse,Leverandør Warehouse
 DocType: Opportunity,Contact Mobile No,Kontakt Mobile Ingen
 DocType: Production Planning Tool,Select Sales Orders,Vælg salgsordrer
 ,Material Requests for which Supplier Quotations are not created,Materielle Anmodning om hvilke Leverandør Citater ikke er skabt
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +117,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,"Den dag (e), som du ansøger om orlov er helligdage. Du har brug for ikke søge om orlov."
 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.,At spore elementer ved hjælp af stregkode. Du vil være i stand til at indtaste poster i følgeseddel og salgsfaktura ved at scanne stregkoden på varen.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +477,Mark as Delivered,Markér som Delivered
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +497,Mark as Delivered,Markér som Delivered
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +34,Make Quotation,Make Citat
 DocType: Dependent Task,Dependent Task,Afhængig Opgave
-apps/erpnext/erpnext/stock/doctype/item/item.py +306,Conversion factor for default Unit of Measure must be 1 in row {0},Omregningsfaktor for standard Måleenhed skal være 1 i række {0}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,Leave of type {0} cannot be longer than {1},Ferie af typen {0} må ikke være længere end {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +310,Conversion factor for default Unit of Measure must be 1 in row {0},Omregningsfaktor for standard Måleenhed skal være 1 i række {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +155,Leave of type {0} cannot be longer than {1},Ferie af typen {0} må ikke være længere end {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Prøv at planlægge operationer for X dage i forvejen.
 DocType: HR Settings,Stop Birthday Reminders,Stop Fødselsdag Påmindelser
 DocType: SMS Center,Receiver List,Modtager liste
@@ -1355,15 +1309,14 @@
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Forbrugt Mængde
 apps/erpnext/erpnext/public/js/pos/pos.js +491,{0} View,{0} Vis
 DocType: Salary Structure Deduction,Salary Structure Deduction,Løn Struktur Fradrag
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +158,Selective laser sintering,Selektiv lasersintring
-apps/erpnext/erpnext/stock/doctype/item/item.py +301,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Måleenhed {0} er indtastet mere end én gang i Conversion Factor Table
+apps/erpnext/erpnext/stock/doctype/item/item.py +305,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Måleenhed {0} er indtastet mere end én gang i Conversion Factor Table
 apps/frappe/frappe/core/page/data_import_tool/data_import_tool.js +108,Import Successful!,Import Vellykket!
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Omkostninger ved Udstedte Varer
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +185,Quantity must not be more than {0},Mængde må ikke være mere end {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +41,Age (Days),Alder (dage)
 DocType: Quotation Item,Quotation Item,Citat Vare
 DocType: Account,Account Name,Kontonavn
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +41,From Date cannot be greater than To Date,Fra dato ikke kan være større end til dato
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +34,From Date cannot be greater than To Date,Fra dato ikke kan være større end til dato
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +194,Serial No {0} quantity {1} cannot be a fraction,Løbenummer {0} mængde {1} kan ikke være en brøkdel
 apps/erpnext/erpnext/config/buying.py +59,Supplier Type master.,Leverandør Type mester.
 DocType: Purchase Order Item,Supplier Part Number,Leverandør Part Number
@@ -1372,14 +1325,14 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +247,{0} {1} is cancelled or stopped,{0} {1} er aflyst eller stoppet
 DocType: Accounts Settings,Credit Controller,Credit Controller
 DocType: Delivery Note,Vehicle Dispatch Date,Køretøj Dispatch Dato
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +197,Purchase Receipt {0} is not submitted,Kvittering {0} er ikke indsendt
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +198,Purchase Receipt {0} is not submitted,Kvittering {0} er ikke indsendt
 DocType: Company,Default Payable Account,Standard Betales konto
 apps/erpnext/erpnext/config/website.py +13,"Settings for online shopping cart such as shipping rules, price list etc.","Indstillinger for online indkøbskurv, såsom skibsfart regler, prisliste mv"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +660,Setup Complete,Setup Complete
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +124,Setup Complete,Setup Complete
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +65,{0}% Billed,{0}% Billed
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +17,Reserved Qty,Reserveret Antal
 DocType: Party Account,Party Account,Party Account
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +74,Human Resources,Human Resources
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +74,Human Resources,Human Resources
 DocType: Lead,Upper Income,Upper Indkomst
 DocType: Journal Entry Account,Debit in Company Currency,Betalingskort i Company Valuta
 apps/erpnext/erpnext/support/doctype/issue/issue.py +58,My Issues,Mine Issues
@@ -1388,11 +1341,9 @@
 DocType: Company,Default Values,Standardværdier
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +236,Row {0}: Payment amount can not be negative,Række {0}: Betaling beløb kan ikke være negativ
 DocType: Expense Claim,Total Amount Reimbursed,Samlede godtgjorte beløb
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +152,Press fitting,Tryk fitting
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +64,Against Supplier Invoice {0} dated {1},Imod Leverandør Faktura {0} dateret {1}
 DocType: Customer,Default Price List,Standard prisliste
 DocType: Payment Reconciliation,Payments,Betalinger
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +24,Hot isostatic pressing,Varm isostatisk presning
 DocType: ToDo,Medium,Medium
 DocType: Budget Detail,Budget Allocated,Budgettet
 DocType: Journal Entry,Entry Type,Posttype
@@ -1405,9 +1356,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +56,None of the items have any change in quantity or value.,Ingen af ​​elementerne har nogen ændring i mængde eller værdi.
 DocType: Warranty Claim,Warranty Claim,Garanti krav
 ,Lead Details,Bly Detaljer
-DocType: Authorization Rule,Approving User,Godkendelse Bruger
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +37,Forging,Smedning
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +126,Plating,Plating
 DocType: Purchase Invoice,End date of current invoice's period,Slutdato for aktuelle faktura menstruation
 DocType: Pricing Rule,Applicable For,Gældende For
 DocType: Bank Reconciliation,From Date,Fra dato
@@ -1429,31 +1377,29 @@
 DocType: Sales Invoice,Paid Amount (Company Currency),Betalt beløb (Company Valuta)
 DocType: Purchase Invoice,Additional Discount,Ekstra Rabat
 DocType: Selling Settings,Selling Settings,Salg af indstillinger
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +39,Online Auctions,Online Auktioner
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,Online Auktioner
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +94,Please specify either Quantity or Valuation Rate or both,Angiv venligst enten mængde eller Værdiansættelse Rate eller begge
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +50,"Company, Month and Fiscal Year is mandatory","Company, Måned og regnskabsår er obligatorisk"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Marketing Expenses,Markedsføringsomkostninger
 ,Item Shortage Report,Item Mangel Rapport
-apps/erpnext/erpnext/stock/doctype/item/item.js +183,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Vægt er nævnt, \ nVenligst nævne &quot;Weight UOM&quot; for"
+apps/erpnext/erpnext/stock/doctype/item/item.js +185,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Vægt er nævnt, \ nVenligst nævne &quot;Weight UOM&quot; for"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,Materiale Request bruges til at gøre dette Stock indtastning
 apps/erpnext/erpnext/config/support.py +43,Single unit of an Item.,Enkelt enhed af et element.
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +212,Time Log Batch {0} must be 'Submitted',Time Log Batch {0} skal være »Tilmeldt &#39;
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,Lav Regnskab indtastning For hver Stock Movement
 DocType: Leave Allocation,Total Leaves Allocated,Total Blade Allokeret
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +384,Warehouse required at Row No {0},Warehouse kræves på Row Nej {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +386,Warehouse required at Row No {0},Warehouse kræves på Row Nej {0}
 DocType: Employee,Date Of Retirement,Dato for pensionering
 DocType: Upload Attendance,Get Template,Få skabelon
 DocType: Address,Postal,Postal
 DocType: Item,Weightage,Weightage
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +159,Mining,Minedrift
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +17,Resin casting,Harpiks støbning
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,En kundegruppe med samme navn findes. Ret Kundens navn eller omdøb kundegruppen
 apps/erpnext/erpnext/public/js/pos/pos.js +147,Please select {0} first.,Vælg {0} først.
 apps/erpnext/erpnext/templates/pages/order.html +57,text {0},tekst {0}
 DocType: Territory,Parent Territory,Parent Territory
 DocType: Quality Inspection Reading,Reading 2,Reading 2
 DocType: Stock Entry,Material Receipt,Materiale Kvittering
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +622,Products,Produkter
+apps/erpnext/erpnext/public/js/setup_wizard.js +358,Products,Produkter
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +47,Party Type and Party is required for Receivable / Payable account {0},Party Type og parti er nødvendig for Tilgodehavende / Betales konto {0}
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.","Hvis denne vare har varianter, så det kan ikke vælges i salgsordrer mv"
 DocType: Lead,Next Contact By,Næste Kontakt By
@@ -1463,13 +1409,13 @@
 DocType: Purchase Invoice,Notification Email Address,Meddelelse E-mailadresse
 DocType: Payment Tool,Find Invoices to Match,Find fakturaer til Match
 ,Item-wise Sales Register,Vare-wise Sales Register
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +399,"e.g. ""XYZ National Bank""",fx &quot;XYZ National Bank&quot;
+apps/erpnext/erpnext/public/js/setup_wizard.js +147,"e.g. ""XYZ National Bank""",fx &quot;XYZ National Bank&quot;
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,Er denne Tax inkluderet i Basic Rate?
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +57,Total Target,Samlet Target
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Target,Samlet Target
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.js +22,Shopping Cart is enabled,Indkøbskurv er aktiveret
 DocType: Job Applicant,Applicant for a Job,Ansøger om et job
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +173,No Production Orders created,Ingen produktionsordrer oprettet
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +131,Salary Slip of employee {0} already created for this month,Løn Slip af medarbejder {0} allerede skabt for denne måned
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +140,Salary Slip of employee {0} already created for this month,Løn Slip af medarbejder {0} allerede skabt for denne måned
 DocType: Stock Reconciliation,Reconciliation JSON,Afstemning JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Alt for mange kolonner. Eksportere rapporten og udskrive det ved hjælp af en regnearksprogram.
 DocType: Sales Invoice Item,Batch No,Batch Nej
@@ -1479,14 +1425,14 @@
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +13,Variant,Variant
 apps/frappe/frappe/public/js/frappe/form/toolbar.js +165,New {0},Ny {0}
 DocType: Naming Series,Set prefix for numbering series on your transactions,Sæt præfiks for nummerering serie om dine transaktioner
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +169,Stopped order cannot be cancelled. Unstop to cancel.,Stoppet ordre kan ikke annulleres. Unstop at annullere.
-apps/erpnext/erpnext/stock/doctype/item/item.py +323,Default BOM ({0}) must be active for this item or its template,Standard BOM ({0}) skal være aktiv for dette element eller dens skabelon
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +164,Stopped order cannot be cancelled. Unstop to cancel.,Stoppet ordre kan ikke annulleres. Unstop at annullere.
+apps/erpnext/erpnext/stock/doctype/item/item.py +327,Default BOM ({0}) must be active for this item or its template,Standard BOM ({0}) skal være aktiv for dette element eller dens skabelon
 DocType: Employee,Leave Encashed?,Efterlad indkasseres?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Mulighed Fra feltet er obligatorisk
 DocType: Item,Variants,Varianter
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +458,Make Purchase Order,Make indkøbsordre
 DocType: SMS Center,Send To,Send til
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +111,There is not enough leave balance for Leave Type {0},Der er ikke nok orlov balance for Leave Type {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +127,There is not enough leave balance for Leave Type {0},Der er ikke nok orlov balance for Leave Type {0}
 DocType: Sales Team,Contribution to Net Total,Bidrag til Net Total
 DocType: Sales Invoice Item,Customer's Item Code,Kundens Item Code
 DocType: Stock Reconciliation,Stock Reconciliation,Stock Afstemning
@@ -1523,11 +1469,11 @@
 DocType: Sales Order Item,Actual Qty,Faktiske Antal
 DocType: Sales Invoice Item,References,Referencer
 DocType: Quality Inspection Reading,Reading 10,Reading 10
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +612,"List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start.","Liste dine produkter eller tjenester, som du købe eller sælge. Sørg for at kontrollere Item Group, måleenhed og andre egenskaber, når du starter."
+apps/erpnext/erpnext/public/js/setup_wizard.js +348,"List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start.","Liste dine produkter eller tjenester, som du købe eller sælge. Sørg for at kontrollere Item Group, måleenhed og andre egenskaber, når du starter."
 DocType: Hub Settings,Hub Node,Hub Node
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,"Du har indtastet dubletter. Venligst rette, og prøv igen."
 apps/erpnext/erpnext/controllers/item_variant.py +65,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values,Værdi {0} til Attribut {1} findes ikke i listen over gyldige Item Attribut Værdier
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +87,Associate,Associate
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Associate,Associate
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +46,Item {0} is not a serialized Item,Vare {0} er ikke en føljeton Item
 DocType: SMS Center,Create Receiver List,Opret Modtager liste
 apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +5,Expired,Udløbet
@@ -1536,7 +1482,7 @@
 DocType: Warranty Claim,Issue Date,Udstedelsesdagen
 DocType: Activity Cost,Activity Cost,Aktivitet Omkostninger
 DocType: Purchase Receipt Item Supplied,Consumed Qty,Forbrugt Antal
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +52,Telecommunications,Telekommunikation
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +52,Telecommunications,Telekommunikation
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),"Angiver, at pakken er en del af denne leverance (Kun Udkast)"
 DocType: Payment Tool,Make Payment Entry,Foretag indbetaling indtastning
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +119,Quantity for Item {0} must be less than {1},Mængde for Item {0} skal være mindre end {1}
@@ -1553,10 +1499,8 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +37,"Selling must be checked, if Applicable For is selected as {0}","Selling skal kontrolleres, om nødvendigt er valgt som {0}"
 DocType: Purchase Order Item,Supplier Quotation Item,Leverandør Citat Vare
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +27,Make Salary Structure,Foretag Løn Struktur
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +54,Shearing,Shearing
 DocType: Item,Has Variants,Har Varianter
 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.,Klik på &#39;Make Salg Faktura&#39; knappen for at oprette en ny Sales Invoice.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +166,Packaging and labeling,Emballering og etikettering
 DocType: Monthly Distribution,Name of the Monthly Distribution,Navnet på den månedlige Distribution
 DocType: Sales Person,Parent Sales Person,Parent Sales Person
 apps/erpnext/erpnext/setup/utils.py +14,Please specify Default Currency in Company Master and Global Defaults,Angiv venligst Standard Valuta i Company Master og Globale standardindstillinger
@@ -1567,19 +1511,18 @@
 DocType: Budget Detail,Fiscal Year,Regnskabsår
 DocType: Cost Center,Budget,Budget
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +41,"Budget cannot be assigned against {0}, as it's not an Income or Expense account","Budget kan ikke tildeles mod {0}, da det ikke er en indtægt eller omkostning konto"
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Achieved,Opnået
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,Opnået
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +65,Territory / Customer,Område / kunde
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,e.g. 5,f.eks 5
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +207,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},Række {0}: Allokeret mængde {1} skal være mindre end eller lig med at fakturere udestående beløb {2}
+apps/erpnext/erpnext/public/js/setup_wizard.js +294,e.g. 5,f.eks 5
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},Række {0}: Allokeret mængde {1} skal være mindre end eller lig med at fakturere udestående beløb {2}
 DocType: Sales Invoice,In Words will be visible once you save the Sales Invoice.,"I Ord vil være synlig, når du gemmer salgsfakturaen."
 DocType: Item,Is Sales Item,Er Sales Item
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,Item Group Tree
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,Vare {0} er ikke setup for Serial nr. Check Item mester
 DocType: Maintenance Visit,Maintenance Time,Vedligeholdelse Time
 ,Amount to Deliver,"Beløb, Deliver"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +620,A Product or Service,En vare eller tjenesteydelse
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +158,There were errors.,Der var fejl.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +101,Tapping,Aflytning
+apps/erpnext/erpnext/public/js/setup_wizard.js +356,A Product or Service,En vare eller tjenesteydelse
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +146,There were errors.,Der var fejl.
 DocType: Naming Series,Current Value,Aktuel værdi
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +171,{0} created,{0} oprettet
 DocType: Delivery Note Item,Against Sales Order,Mod kundeordre
@@ -1593,7 +1536,7 @@
 apps/erpnext/erpnext/accounts/party.py +275,Due Date cannot be before Posting Date,"Forfaldsdato kan ikke være, før Udstationering Dato"
 DocType: Website Item Group,Website Item Group,Website Item Group
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Duties and Taxes,Told og afgifter
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Please enter Reference date,Indtast Referencedato
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +312,Please enter Reference date,Indtast Referencedato
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} betalingssystemer poster ikke kan filtreres af {1}
 DocType: Item Website Specification,Table for Item that will be shown in Web Site,"Tabel til Vare, der vil blive vist i Web Site"
 DocType: Purchase Order Item Supplied,Supplied Qty,Medfølgende Antal
@@ -1601,7 +1544,7 @@
 apps/erpnext/erpnext/config/stock.py +103,Tree of Item Groups.,Tree of varegrupper.
 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,Kan ikke henvise rækken tal større end eller lig med aktuelle række nummer til denne Charge typen
 ,Item-wise Purchase History,Vare-wise Købshistorik
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +152,Red,Rød
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Red,Rød
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +228,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},Klik på &quot;Generer Schedule &#39;at hente Løbenummer tilføjet for Item {0}
 DocType: Account,Frozen,Frosne
 ,Open Production Orders,Åbne produktionsordrer
@@ -1616,7 +1559,7 @@
 DocType: Item Attribute,Attribute Name,Attribut Navn
 apps/erpnext/erpnext/controllers/selling_controller.py +236,Item {0} must be Sales or Service Item in {1},Vare {0} skal være Salg eller service Item i {1}
 DocType: Item Group,Show In Website,Vis I Website
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +621,Group,Gruppe
+apps/erpnext/erpnext/public/js/setup_wizard.js +357,Group,Gruppe
 DocType: Task,Expected Time (in hours),Forventet tid (i timer)
 ,Qty to Order,Antal til ordre
 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","At spore mærke i følgende dokumenter Delivery Note, Opportunity, Material Request, punkt, Indkøbsordre, Indkøb Gavekort, køber Modtagelse, Citat, Sales Faktura, Produkt Bundle, salgsordre, Løbenummer"
@@ -1626,6 +1569,7 @@
 DocType: Features Setup,Brands,Mærker
 DocType: C-Form Invoice Detail,Invoice No,Faktura Nej
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +480,From Purchase Order,Fra indkøbsordre
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +92,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Lad ikke kan anvendes / annulleres, før {0}, da orlov balance allerede har været carry-fremsendt i fremtiden orlov tildeling rekord {1}"
 DocType: Activity Cost,Costing Rate,Costing Rate
 ,Customer Addresses And Contacts,Kunde Adresser og kontakter
 DocType: Employee,Resignation Letter Date,Udmeldelse Brev Dato
@@ -1633,35 +1577,31 @@
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +137,Not Set,Ikke Sæt
 DocType: Communication,Date,Dato
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,Gentag Kunde Omsætning
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +651,Sit tight while your system is being setup. This may take a few moments.,"Sidde stramt, mens dit system bliver setup. Dette kan tage et øjeblik."
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +115,Sit tight while your system is being setup. This may take a few moments.,"Sidde stramt, mens dit system bliver setup. Dette kan tage et øjeblik."
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +51,{0} ({1}) must have role 'Expense Approver',"{0} ({1}), skal have rollen 'Godkendelse af udgifter'"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Pair,Par
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Pair,Par
 DocType: Bank Reconciliation Detail,Against Account,Mod konto
 DocType: Maintenance Schedule Detail,Actual Date,Faktiske dato
 DocType: Item,Has Batch No,Har Batch Nej
 DocType: Delivery Note,Excise Page Number,Excise Sidetal
 DocType: Employee,Personal Details,Personlige oplysninger
 ,Maintenance Schedules,Vedligeholdelsesplaner
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +44,Embossing,Prægning
 ,Quotation Trends,Citat Trends
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +139,Item Group not mentioned in item master for item {0},Item Group ikke er nævnt i punkt master for element {0}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +302,Debit To account must be a Receivable account,Betalingskort Til konto skal være et tilgodehavende konto
-apps/erpnext/erpnext/stock/doctype/item/item.py +310,"As Production Order can be made for this item, it must be a stock item.","Som kan Produktionsordre gøres for denne post, skal det være en lagervare."
 DocType: Shipping Rule Condition,Shipping Amount,Forsendelse Mængde
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +140,Joining,Vær med
-DocType: Authorization Rule,Above Value,Over værdi
 ,Pending Amount,Afventer Beløb
 DocType: Purchase Invoice Item,Conversion Factor,Konvertering Factor
 DocType: Purchase Order,Delivered,Leveret
 apps/erpnext/erpnext/config/hr.py +160,Setup incoming server for jobs email id. (e.g. jobs@example.com),Opsætning indgående server for job email id. (F.eks jobs@example.com)
 DocType: Purchase Receipt,Vehicle Number,Køretøjsnummer
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,"Den dato, hvor tilbagevendende faktura vil blive stoppe"
+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,Samlede fordelte blade {0} kan ikke være mindre end allerede godkendte blade {1} for perioden
 DocType: Journal Entry,Accounts Receivable,Tilgodehavender
 ,Supplier-Wise Sales Analytics,Forhandler-Wise Sales Analytics
 DocType: Address Template,This format is used if country specific format is not found,"Dette format bruges, hvis landespecifikke format ikke findes"
 DocType: Custom Field,Custom,Brugerdefineret
 DocType: Production Order,Use Multi-Level BOM,Brug Multi-Level BOM
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +26,Injection molding,Sprøjtestøbning
 DocType: Bank Reconciliation,Include Reconciled Entries,Medtag Afstemt Angivelser
 apps/erpnext/erpnext/config/accounts.py +41,Tree of finanial accounts.,Tree of finanial konti.
 DocType: Leave Control Panel,Leave blank if considered for all employee types,Lad stå tomt hvis det anses for alle typer medarbejderaktier
@@ -1671,30 +1611,28 @@
 apps/frappe/frappe/config/setup.py +130,Printing,Udskrivning
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +114,Expense Claim is pending approval. Only the Expense Approver can update status.,Expense krav afventer godkendelse. Kun Expense Godkender kan opdatere status.
 DocType: Purchase Invoice,Additional Discount Amount,Yderligere Discount Beløb
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +99,The day(s) on which you are applying for leave are holiday. You need not apply for leave.,"Den dag (e), hvor du ansøger om orlov er ferie. Du har brug for ikke søge om orlov."
 apps/frappe/frappe/public/js/frappe/misc/utils.js +110,and,og
 DocType: Leave Block List Allow,Leave Block List Allow,Lad Block List Tillad
 apps/erpnext/erpnext/setup/doctype/company/company.py +236,Abbr can not be blank or space,Forkortelsen kan ikke være tom eller bestå af mellemrum
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +50,Sports,Sport
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,Sport
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Actual,Samlede faktiske
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Unit,Enhed
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Unit,Enhed
 apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.py +182,Please set Dropbox access keys in your site config,Venligst sæt Dropbox genvejstaster i dit site config
 apps/erpnext/erpnext/stock/get_item_details.py +113,Please specify Company,Angiv venligst Company
 ,Customer Acquisition and Loyalty,Customer Acquisition og Loyalitet
 DocType: Purchase Receipt,Warehouse where you are maintaining stock of rejected items,"Lager, hvor du vedligeholder lager af afviste emner"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +408,Your financial year ends on,Din regnskabsår slutter den
+apps/erpnext/erpnext/public/js/setup_wizard.js +156,Your financial year ends on,Din regnskabsår slutter den
 DocType: POS Profile,Price List,Pris List
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +20,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0} er nu standard regnskabsår. Opdater venligst din browser for at ændringen træder i kraft.
 apps/erpnext/erpnext/projects/doctype/project/project.js +47,Expense Claims,Expense Krav
 DocType: Issue,Support,Support
-DocType: Authorization Rule,Approving Role,Godkendelse Rolle
 ,BOM Search,BOM Søg
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +176,Closing (Opening + Totals),Lukning (Åbning + Totals)
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +26,Please specify currency in Company,Angiv venligst valuta i selskabet
 DocType: Workstation,Wages per hour,Lønningerne i timen
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},Stock balance i Batch {0} vil blive negativ {1} for Item {2} på Warehouse {3}
 apps/erpnext/erpnext/config/setup.py +83,"Show / Hide features like Serial Nos, POS etc.","Vis / Skjul funktioner som Serial Nos, POS mv"
-apps/erpnext/erpnext/controllers/accounts_controller.py +236,Account {0} is invalid. Account Currency must be {1},Konto {0} er ugyldig. Konto Valuta skal være {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +237,Account {0} is invalid. Account Currency must be {1},Konto {0} er ugyldig. Konto Valuta skal være {1}
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +34,UOM Conversion factor is required in row {0},UOM Omregningsfaktor kræves i række {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +53,Clearance date cannot be before check date in row {0},Clearance dato kan ikke være før check dato i række {0}
 DocType: Salary Slip,Deduction,Fradrag
@@ -1713,13 +1651,13 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +82,Item {0} has already been returned,Element {0} er allerede blevet returneret
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** Regnskabsår ** repræsenterer et regnskabsår. Alle regnskabsposteringer og andre større transaktioner spores mod ** regnskabsår **.
 DocType: Opportunity,Customer / Lead Address,Kunde / Lead Adresse
+apps/erpnext/erpnext/stock/doctype/item/item.py +112,Warning: Invalid SSL certificate on attachment {0},Advarsel: Ugyldig SSL certifikat på vedhæftet fil {0}
 DocType: Production Order Operation,Actual Operation Time,Faktiske Operation Time
 DocType: Authorization Rule,Applicable To (User),Gælder for (Bruger)
 DocType: Purchase Taxes and Charges,Deduct,Fratrække
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +170,Job Description,Jobbeskrivelse
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +170,Job Description,Jobbeskrivelse
 DocType: Purchase Order Item,Qty as per Stock UOM,Antal pr Stock UOM
 apps/frappe/frappe/model/rename_doc.py +343,Please select a valid csv file with data,Vælg en gyldig csv fil med data
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +92,Coating,Belægning
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +126,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Specialtegn undtagen &quot;-&quot; &quot;.&quot;, &quot;#&quot;, og &quot;/&quot; ikke tilladt i navngivning serie"
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Hold styr på salgskampagner. Hold styr på Leads, Citater, Sales Order osv fra kampagner til at måle Return on Investment."
 DocType: Expense Claim,Approver,Godkender
@@ -1729,12 +1667,11 @@
 DocType: Supplier Quotation,Manufacturing Manager,Produktion manager
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},Løbenummer {0} er under garanti op {1}
 apps/erpnext/erpnext/config/stock.py +69,Split Delivery Note into packages.,Split følgeseddel i pakker.
-apps/erpnext/erpnext/hooks.py +84,Shipments,Forsendelser
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +29,Dip molding,Dyppestøbning
+apps/erpnext/erpnext/hooks.py +68,Shipments,Forsendelser
 DocType: Purchase Order,To be delivered to customer,Der skal leveres til kunden
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,Time Log status skal indsendes.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,Løbenummer {0} tilhører ikke nogen Warehouse
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +650,Setting Up,Opsætning
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +114,Setting Up,Opsætning
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,Row # ,Row #
 DocType: Purchase Invoice,In Words (Company Currency),I Words (Company Valuta)
 DocType: Pricing Rule,Supplier,Leverandør
@@ -1742,7 +1679,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +105,Miscellaneous Expenses,Diverse udgifter
 DocType: Global Defaults,Default Company,Standard Company
 apps/erpnext/erpnext/controllers/stock_controller.py +166,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,"Udgift eller Forskel konto er obligatorisk for Item {0}, da det påvirker den samlede lagerværdi"
-apps/erpnext/erpnext/controllers/accounts_controller.py +354,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","Kan ikke overbill for Item {0} i række {1} mere end {2}. For at tillade overfakturering, skal du indstille i Stock-indstillinger"
+apps/erpnext/erpnext/controllers/accounts_controller.py +355,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","Kan ikke overbill for Item {0} i række {1} mere end {2}. For at tillade overfakturering, skal du indstille i Stock-indstillinger"
 DocType: Employee,Bank Name,Bank navn
 apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +27,-Above,-over
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +135,User {0} is disabled,Bruger {0} er deaktiveret
@@ -1755,27 +1692,26 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,{0} is mandatory for Item {1},{0} er obligatorisk for Item {1}
 DocType: Currency Exchange,From Currency,Fra Valuta
 DocType: DocField,Name,Navn
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +211,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Vælg tildelte beløb, Faktura Type og Fakturanummer i mindst én række"
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +104,Sales Order required for Item {0},Sales Order kræves for Item {0}
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +158,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Vælg tildelte beløb, Faktura Type og Fakturanummer i mindst én række"
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +107,Sales Order required for Item {0},Sales Order kræves for Item {0}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +43,Amounts not reflected in system,"Beløb, der ikke afspejles i systemet"
 DocType: Purchase Invoice Item,Rate (Company Currency),Rate (Company Valuta)
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +40,Others,Andre
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +40,Others,Andre
 apps/erpnext/erpnext/templates/includes/product_page.js +80,Cannot find a matching Item. Please select some other value for {0}.,Kan ikke finde en matchende Item. Vælg en anden værdi for {0}.
 DocType: POS Profile,Taxes and Charges,Skatter og Afgifter
 DocType: Item,"A Product or a Service that is bought, sold or kept in stock.","En vare eller tjenesteydelse, der købes, sælges eller opbevares på lager."
 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,Kan ikke vælge charge type som &#39;On Forrige Row Beløb&#39; eller &#39;On Forrige Row alt &quot;for første række
 apps/frappe/frappe/core/doctype/doctype/boilerplate/controller_list.html +31,Completed,Afsluttet
 DocType: Web Form,Select DocType,Vælg DocType
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +104,Broaching,Rømning
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +12,Banking,Banking
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,Banking
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +38,Please click on 'Generate Schedule' to get schedule,Klik på &quot;Generer Schedule &#39;for at få tidsplan
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +283,New Cost Center,Ny Cost center
 DocType: Bin,Ordered Quantity,Bestilt Mængde
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +397,"e.g. ""Build tools for builders""",fx &quot;Byg værktøjer til bygherrer&quot;
+apps/erpnext/erpnext/public/js/setup_wizard.js +145,"e.g. ""Build tools for builders""",fx &quot;Byg værktøjer til bygherrer&quot;
 DocType: Quality Inspection,In Process,I Process
 DocType: Authorization Rule,Itemwise Discount,Itemwise Discount
 DocType: Purchase Order Item,Reference Document Type,Referencedokument type
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +318,{0} against Sales Order {1},{0} mod salgsordre {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +320,{0} against Sales Order {1},{0} mod salgsordre {1}
 DocType: Account,Fixed Asset,Fast Asset
 apps/erpnext/erpnext/config/stock.py +283,Serialized Inventory,Føljeton Inventory
 DocType: Activity Type,Default Billing Rate,Standard Billing Rate
@@ -1790,14 +1726,13 @@
 DocType: Purchase Invoice Item,Page Break,Side Break
 DocType: Production Order Operation,Pending,Afventer
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,"Brugere, der kan godkende en bestemt medarbejders orlov applikationer"
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +33,You cannot change default UOM of Variant. To change default UOM for Variant change default UOM of the Template,Du kan ikke ændre standard UOM af Variant. Hvis du vil ændre standard UOM for Variant ændre standard UOM af skabelon
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +50,Office Equipments,Kontor udstyr
 DocType: Purchase Invoice Item,Qty,Antal
 DocType: Fiscal Year,Companies,Virksomheder
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +24,Electronics,Elektronik
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +24,Electronics,Elektronik
 DocType: Stock Settings,Raise Material Request when stock reaches re-order level,Hæv Materiale Request når bestanden når re-order-niveau
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +18,From Maintenance Schedule,Fra vedligeholdelsesplan
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +56,Full-time,Fuld tid
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +56,Full-time,Fuld tid
 DocType: Purchase Invoice,Contact Details,Kontaktoplysninger
 DocType: C-Form,Received Date,Modtaget Dato
 DocType: Delivery Note,"If you have created a standard template in Sales Taxes and Charges Template, select one and click on the button below.","Hvis du har oprettet en standard skabelon i Salg Skatter og Afgifter Skabelon, skal du vælge en, og klik på knappen nedenfor."
@@ -1809,11 +1744,12 @@
 DocType: Job Applicant,Job Opening,Job Åbning
 DocType: Payment Reconciliation,Payment Reconciliation,Betaling Afstemning
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +154,Please select Incharge Person's name,Vælg Incharge Person navn
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +51,Technology,Teknologi
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,Teknologi
 DocType: Offer Letter,Offer Letter,Tilbyd Letter
 apps/erpnext/erpnext/config/manufacturing.py +51,Generate Material Requests (MRP) and Production Orders.,Generer Materiale Anmodning (MRP) og produktionsordrer.
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +68,Total Invoiced Amt,Samlede fakturerede Amt
 DocType: Time Log,To Time,Til Time
+DocType: Authorization Rule,Approving Role (above authorized value),Godkendelse (over autoriserede værdi) Rolle
 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.","Hvis du vil tilføje barn noder, udforske træet og klik på noden, hvorunder du ønsker at tilføje flere noder."
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +102,Credit To account must be a Payable account,Kredit til konto skal være en Betales konto
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +233,BOM recursion: {0} cannot be parent or child of {2},BOM rekursion: {0} kan ikke være forælder eller barn af {2}
@@ -1826,10 +1762,8 @@
 DocType: Item,Customer Item Codes,Kunde Item Koder
 DocType: Opportunity,Lost Reason,Tabt Årsag
 apps/erpnext/erpnext/config/accounts.py +68,Create Payment Entries against Orders or Invoices.,Opret Betaling Entries mod ordrer eller fakturaer.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +141,Welding,Svejsning
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +40,New Stock UOM is required,New Stock UOM kræves
 DocType: Quality Inspection,Sample Size,Sample Size
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +443,All items have already been invoiced,Alle elementer er allerede blevet faktureret
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +446,All items have already been invoiced,Alle elementer er allerede blevet faktureret
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',Angiv en gyldig &quot;Fra sag nr &#39;
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +287,Further cost centers can be made under Groups but entries can be made against non-Groups,Yderligere omkostninger centre kan foretages under Grupper men indtastninger kan foretages mod ikke-grupper
 DocType: Project,External,Ekstern
@@ -1841,8 +1775,7 @@
 DocType: Bin,Actual Quantity,Faktiske Mængde
 DocType: Shipping Rule,example: Next Day Shipping,eksempel: Næste dages levering
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,Løbenummer {0} ikke fundet
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +563,Your Customers,Dine kunder
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +27,Compression molding,Kompressionsstøbning
+apps/erpnext/erpnext/public/js/setup_wizard.js +303,Your Customers,Dine kunder
 DocType: Leave Block List Date,Block Date,Block Dato
 DocType: Sales Order,Not Delivered,Ikke leveret
 ,Bank Clearance Summary,Bank Clearance Summary
@@ -1863,10 +1796,10 @@
 DocType: SMS Log,Sent To,Sendt Til
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +28,Make Sales Invoice,Make Sales Invoice
 DocType: Company,For Reference Only.,Kun til reference.
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +29,Invalid {0}: {1},Ugyldig {0}: {1}
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +49,Invalid {0}: {1},Ugyldig {0}: {1}
 DocType: Sales Invoice Advance,Advance Amount,Advance Beløb
 DocType: Manufacturing Settings,Capacity Planning,Capacity Planning
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +49,'From Date' is required,'Fra dato' er nødvendig
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +43,'From Date' is required,'Fra dato' er nødvendig
 DocType: Journal Entry,Reference Number,Referencenummer
 DocType: Employee,Employment Details,Beskæftigelse Detaljer
 DocType: Employee,New Workplace,Ny Arbejdsplads
@@ -1881,7 +1814,7 @@
 DocType: Serial No,Delivery Time,Leveringstid
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Aldring Baseret på
 DocType: Item,End of Life,End of Life
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +41,Travel,Rejser
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +41,Travel,Rejser
 DocType: Leave Block List,Allow Users,Tillad brugere
 DocType: Purchase Order,Customer Mobile No,Kunden Mobile Ingen
 DocType: Sales Invoice,Recurring,Tilbagevendende
@@ -1895,7 +1828,7 @@
 DocType: Naming Series,User must always select,Brugeren skal altid vælge
 DocType: Stock Settings,Allow Negative Stock,Tillad Negativ Stock
 DocType: Installation Note,Installation Note,Installation Bemærk
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +541,Add Taxes,Tilføj Skatter
+apps/erpnext/erpnext/public/js/setup_wizard.js +283,Add Taxes,Tilføj Skatter
 ,Financial Analytics,Finansielle Analytics
 DocType: Quality Inspection,Verified By,Verified by
 DocType: Address,Subsidiary,Datterselskab
@@ -1905,7 +1838,6 @@
 DocType: System Settings,In Hours,I Hours
 DocType: Process Payroll,Create Salary Slip,Opret lønseddel
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Expected balance as per bank,Forventet balance pr bank
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +115,Buffing,Polering
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Source of Funds (Liabilities),Finansieringskilde (Passiver)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +347,Quantity in row {0} ({1}) must be same as manufactured quantity {2},"Mængde i række {0} ({1}), skal være det samme som fremstillede mængde {2}"
 DocType: Appraisal,Employee,Medarbejder
@@ -1922,11 +1854,11 @@
 DocType: Rename Tool,File to Rename,Fil til Omdøb
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +176,Purchse Order number required for Item {0},Purchse Ordrenummer kræves for Item {0}
 apps/erpnext/erpnext/public/js/controllers/transaction.js +136,Show Payments,Vis Betalinger
-apps/erpnext/erpnext/controllers/buying_controller.py +245,Specified BOM {0} does not exist for Item {1},Specificeret BOM {0} findes ikke til konto {1}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +202,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,"Vedligeholdelsesplan {0} skal annulleres, før den annullerer denne Sales Order"
+apps/erpnext/erpnext/controllers/buying_controller.py +236,Specified BOM {0} does not exist for Item {1},Specificeret BOM {0} findes ikke til konto {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,"Vedligeholdelsesplan {0} skal annulleres, før den annullerer denne Sales Order"
 apps/frappe/frappe/desk/page/backups/backups.html +13,Size,Størrelse
 DocType: Notification Control,Expense Claim Approved,Expense krav Godkendt
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +113,Pharmaceutical,Farmaceutiske
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Pharmaceutical,Farmaceutiske
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,Omkostninger ved Købte varer
 DocType: Selling Settings,Sales Order Required,Sales Order Påkrævet
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +30,Create Customer,Opret kunde
@@ -1936,7 +1868,6 @@
 DocType: Quality Inspection Reading,Reading 9,Reading 9
 DocType: Supplier,Is Frozen,Er Frozen
 DocType: Buying Settings,Buying Settings,Opkøb Indstillinger
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +122,Mass finishing,Masse efterbehandling
 DocType: Stock Entry Detail,BOM No. for a Finished Good Item,BOM No. for en Færdig god Item
 DocType: Upload Attendance,Attendance To Date,Fremmøde til dato
 apps/erpnext/erpnext/config/selling.py +158,Setup incoming server for sales email id. (e.g. sales@example.com),Opsætning indgående server til salg email id. (F.eks sales@example.com)
@@ -1944,7 +1875,7 @@
 DocType: Payment Tool,Payment Account,Betaling konto
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +713,Please specify Company to proceed,Angiv venligst Company for at fortsætte
 apps/frappe/frappe/public/js/frappe/model/indicator.js +30,Draft,Udkast
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +46,Compensatory Off,Kompenserende Off
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Compensatory Off,Kompenserende Off
 DocType: Quality Inspection Reading,Accepted,Accepteret
 DocType: User,Female,Kvinde
 DocType: Journal Entry Account,Debit in Account Currency,Debet i Konto Valuta
@@ -1956,7 +1887,7 @@
 DocType: Shipping Rule,Shipping Rule Label,Forsendelse Rule Label
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +209,Raw Materials cannot be blank.,Raw Materials kan ikke være tom.
 DocType: Newsletter,Test,Prøve
-apps/erpnext/erpnext/stock/doctype/item/item.py +364,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +368,"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'","Da der er eksisterende lagertransaktioner til denne vare, \ du ikke kan ændre værdierne af &quot;Har Serial Nej &#39;,&#39; Har Batch Nej &#39;,&#39; Er Stock Item&quot; og &quot;værdiansættelsesmetode &#39;"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +448,Quick Journal Entry,Hurtig Kassekladde
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +92,You can not change rate if BOM mentioned agianst any item,"Du kan ikke ændre kurs, hvis BOM nævnt agianst ethvert element"
@@ -1967,13 +1898,14 @@
 apps/erpnext/erpnext/config/stock.py +18,Requests for items.,Anmodning om.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,"Vil blive oprettet separat produktion, for hver færdigvare god element."
 DocType: Purchase Invoice,Terms and Conditions1,Vilkår og forhold1
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +18,Complete Setup,Komplet opsætning
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard_page.html +18,Complete Setup,Komplet opsætning
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","Kontering frosset op til denne dato, kan ingen gøre / ændre post undtagen rolle angivet nedenfor."
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +121,Please save the document before generating maintenance schedule,"Gem venligst dokumentet, før generere vedligeholdelsesplan"
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,Projekt status
 DocType: UOM,Check this to disallow fractions. (for Nos),Markér dette for at forbyde fraktioner. (For NOS)
 apps/erpnext/erpnext/config/crm.py +96,Newsletter Mailing List,Nyhedsbrev Mailing List
 DocType: Delivery Note,Transporter Name,Transporter Navn
+DocType: Authorization Rule,Authorized Value,Autoriseret Værdi
 DocType: Contact,Enter department to which this Contact belongs,"Indtast afdeling, som denne Kontakt hører"
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Absent,Total Fraværende
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +746,Item or Warehouse for row {0} does not match Material Request,Element eller Warehouse for række {0} matcher ikke Materiale Request
@@ -1998,16 +1930,15 @@
 DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),Grundlæggende Rate (som pr Stock UOM)
 DocType: SMS Log,No of Requested SMS,Ingen af ​​Anmodet SMS
 DocType: Campaign,Campaign-.####,Kampagne -. ####
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +55,Piercing,Piercing
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,Næste skridt
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +117,Contract End Date must be greater than Date of Joining,Kontrakt Slutdato skal være større end Dato for Sammenføjning
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,"En tredjepart, distributør/forhandler/sælger/affiliate/butik der, der sælger selskabernes varer/tjenesteydelser mod provision."
 DocType: Customer Group,Has Child Node,Har Child Node
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{0} against Purchase Order {1},{0} mod indkøbsordre {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +332,{0} against Purchase Order {1},{0} mod indkøbsordre {1}
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","Indtast statiske url parametre her (F.eks. Afsender = ERPNext, brugernavn = ERPNext, password = 1234 mm)"
 apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,{0} {1} ikke i noget aktiv regnskabsår. For flere detaljer tjek {2}.
-apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,Dette er et eksempel website auto-genereret fra ERPNext
+apps/erpnext/erpnext/setup/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,Dette er et eksempel website auto-genereret fra ERPNext
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +37,Ageing Range 1,Ageing Range 1
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +110,Photochemical machining,Fotokemisk bearbejdning
 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.
 
 #### Note
@@ -2033,7 +1964,7 @@
 DocType: Purchase Receipt Item,Recd Quantity,RECD Mængde
 DocType: Email Account,Email Ids,Email Ids
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},Kan ikke producere mere Item {0} end Sales Order mængde {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +471,Stock Entry {0} is not submitted,Stock indtastning {0} er ikke indsendt
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +473,Stock Entry {0} is not submitted,Stock indtastning {0} er ikke indsendt
 DocType: Payment Reconciliation,Bank / Cash Account,Bank / kontantautomat konto
 DocType: Tax Rule,Billing City,Fakturering By
 DocType: Global Defaults,Hide Currency Symbol,Skjul Valuta Symbol
@@ -2049,7 +1980,7 @@
 DocType: Purchase Invoice,Currency and Price List,Valuta og prisliste
 DocType: Opportunity,Customer / Lead Name,Kunde / Lead navn
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +63,Clearance Date not mentioned,Clearance Dato ikke nævnt
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +71,Production,Produktion
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Production,Produktion
 DocType: Item,Allow Production Order,Tillad produktionsordre
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +60,Row {0}:Start Date must be before End Date,Række {0}: Start dato skal være før slutdato
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),I alt (Antal)
@@ -2062,7 +1993,7 @@
 apps/erpnext/erpnext/utilities/doctype/address/address.py +113,My Addresses,Mine Adresser
 DocType: Stock Ledger Entry,Outgoing Rate,Udgående Rate
 apps/erpnext/erpnext/config/hr.py +100,Organization branch master.,Organisation gren mester.
-apps/erpnext/erpnext/controllers/accounts_controller.py +237, or ,eller
+apps/erpnext/erpnext/controllers/accounts_controller.py +238, or ,eller
 DocType: Sales Order,Billing Status,Fakturering status
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Utility Expenses,Utility Udgifter
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,90-Above,90-Above
@@ -2089,6 +2020,7 @@
 DocType: Stock Entry Detail,Serial No / Batch,Løbenummer / Batch
 DocType: Product Bundle,Parent Item,Parent Item
 DocType: Account,Account Type,Kontotype
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +113,Leave Type {0} cannot be carry-forwarded,Lad type {0} kan ikke bære-videresendes
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +213,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',Vedligeholdelsesplan ikke genereret for alle poster. Klik på &quot;Generer Schedule &#39;
 ,To Produce,At producere
 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","For rækken {0} i {1}. For at inkludere {2} i Item sats, rækker {3} skal også medtages"
@@ -2096,10 +2028,7 @@
 DocType: Bin,Reserved Quantity,Reserveret Mængde
 DocType: Landed Cost Voucher,Purchase Receipt Items,Kvittering Varer
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,Tilpasning Forms
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +62,Cutting,Skæring
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +69,Flattening,Udfladning
 DocType: Account,Income Account,Indkomst konto
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +22,Molding,Molding
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +632,Delivery,Levering
 DocType: Stock Reconciliation Item,Current Qty,Aktuel Antal
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",Se &quot;Rate Of Materials Based On&quot; i Costing afsnit
@@ -2109,19 +2038,18 @@
 apps/frappe/frappe/desk/moduleview.py +61,Documents,Dokumenter
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +17,Ref,Ref
 DocType: Cost Center,Cost Center,Cost center
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.js +48,Voucher #,Voucher #
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +36,Voucher #,Voucher #
 DocType: Notification Control,Purchase Order Message,Indkøbsordre Message
 DocType: Tax Rule,Shipping Country,Forsendelse Land
 DocType: Upload Attendance,Upload HTML,Upload HTML
-apps/erpnext/erpnext/controllers/accounts_controller.py +391,"Total advance ({0}) against Order {1} cannot be greater \
+apps/erpnext/erpnext/controllers/accounts_controller.py +392,"Total advance ({0}) against Order {1} cannot be greater \
 				than the Grand Total ({2})",Total forhånd ({0}) mod Order {1} kan ikke være større \ end Grand Total ({2})
 DocType: Employee,Relieving Date,Lindre Dato
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +12,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.","Prisfastsættelse Regel er lavet til at overskrive Prisliste / definere rabatprocent, baseret på nogle kriterier."
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,Warehouse kan kun ændres via Stock indtastning / følgeseddel / kvittering
 DocType: Employee Education,Class / Percentage,Klasse / Procent
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +92,Head of Marketing and Sales,Chef for Marketing og Salg
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +31,Income Tax,Indkomstskat
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +157,Laser engineered net shaping,Laser manipuleret netto formgivning
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Head of Marketing and Sales,Chef for Marketing og Salg
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +31,Income Tax,Indkomstskat
 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.","Hvis valgte Prisfastsættelse Regel er lavet til &quot;pris&quot;, vil det overskrive prislisten. Prisfastsættelse Regel prisen er den endelige pris, så ingen yderligere rabat bør anvendes. Derfor i transaktioner som Sales Order, Indkøbsordre osv, det vil blive hentet i &quot;Rate &#39;felt, snarere end&#39; Prisliste Rate &#39;område."
 apps/erpnext/erpnext/config/selling.py +163,Track Leads by Industry Type.,Spor fører af Industry Type.
 DocType: Item Supplier,Item Supplier,Vare Leverandør
@@ -2144,31 +2072,28 @@
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Aktuel Antal Efter Transaktion
 ,Pending SO Items For Purchase Request,Afventer SO Varer til Indkøb Request
 DocType: Supplier,Billing Currency,Fakturering Valuta
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +148,Extra Large,Extra Large
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,Extra Large,Extra Large
 ,Profit and Loss Statement,Resultatopgørelse
 DocType: Bank Reconciliation Detail,Cheque Number,Check Number
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +43,Pressing,Ved at trykke
 DocType: Payment Tool Detail,Payment Tool Detail,Betaling Tool Detail
 ,Sales Browser,Salg Browser
 DocType: Journal Entry,Total Credit,Total Credit
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +474,Warning: Another {0} # {1} exists against stock entry {2},Advarsel: En anden {0} # {1} eksisterer mod lager post {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +459,Local,Lokal
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +476,Warning: Another {0} # {1} exists against stock entry {2},Advarsel: En anden {0} # {1} eksisterer mod lager post {2}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +397,Local,Lokal
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),Udlån (aktiver)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,Debitorer
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +147,Large,Large
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +23,No employee found!,Ingen medarbejder fundet!
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Large,Large
 DocType: C-Form Invoice Detail,Territory,Territory
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,"Henvis ikke af besøg, der kræves"
 DocType: Purchase Order,Customer Address Display,Kunden Adresse Display
 DocType: Stock Settings,Default Valuation Method,Standard værdiansættelsesmetode
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +127,Polishing,Polering
 DocType: Production Order Operation,Planned Start Time,Planlagt Start Time
 apps/erpnext/erpnext/config/accounts.py +63,Close Balance Sheet and book Profit or Loss.,Luk Balance og book resultatopgørelsen.
-apps/erpnext/erpnext/stock/doctype/item/item.py +661,"Default Unit of Measure for Item {0} cannot be changed directly because \
+apps/erpnext/erpnext/stock/doctype/item/item.py +665,"Default Unit of Measure for Item {0} cannot be changed directly because \
 			you have already made some transaction(s) with another UOM. To change default UOM, \
 			use 'UOM Replace Utility' tool under Stock module.","Standard måleenhed for Item {0} kan ikke ændres direkte, fordi \ du allerede har gjort nogle transaktion (er) med en anden UOM. Hvis du vil ændre standard UOM, \ brug «UOM Erstat Utility &#39;værktøj under Lager modul."
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,Angiv Exchange Rate til at konvertere en valuta til en anden
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +146,Quotation {0} is cancelled,Citat {0} er aflyst
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +141,Quotation {0} is cancelled,Citat {0} er aflyst
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,Samlede udestående beløb
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} was on leave on {1}. Cannot mark attendance.,Medarbejder {0} var på orlov på {1}. Kan ikke markere fremmøde.
 DocType: Sales Partner,Targets,Mål
@@ -2179,7 +2104,6 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +158,Please create Customer from Lead {0},Opret Kunden fra Lead {0}
 DocType: Price List,Applicable for Countries,Gældende for lande
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Computers,Computere
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +112,Electro-chemical grinding,Elektrokemisk slibning
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +14,This is a root customer group and cannot be edited.,Dette er en rod kundegruppe og kan ikke redigeres.
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +39,Please setup your chart of accounts before you start Accounting Entries,"Venligst opsætning din kontoplan, før du starter bogføring"
 DocType: Purchase Invoice,Ignore Pricing Rule,Ignorer Prisfastsættelse Rule
@@ -2225,7 +2149,6 @@
 DocType: Maintenance Visit,Purposes,Formål
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +103,Atleast one item should be entered with negative quantity in return document,Mindst ét ​​element skal indtastes med negativt mængde gengæld dokument
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +67,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","Betjening {0} længere end alle tilgængelige arbejdstimer i arbejdsstation {1}, nedbryde driften i flere operationer"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +134,Electrochemical machining,Elektrokemisk bearbejdning
 ,Requested,Anmodet
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +66,No Remarks,Ingen Bemærkninger
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +13,Overdue,Forfaldne
@@ -2234,7 +2157,7 @@
 DocType: Monthly Distribution,Distribution Name,Distribution Name
 DocType: Features Setup,Sales and Purchase,Salg og Indkøb
 DocType: Supplier Quotation Item,Material Request No,Materiale Request Nej
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +218,Quality Inspection required for Item {0},Inspektion kvalitet kræves for Item {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +221,Quality Inspection required for Item {0},Inspektion kvalitet kræves for Item {0}
 DocType: Quotation,Rate at which customer's currency is converted to company's base currency,"Hastighed, hvormed kundens valuta omregnes til virksomhedens basisvaluta"
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +107,{0} has been successfully unsubscribed from this list.,{0} er blevet afmeldt fra denne liste.
 DocType: Purchase Invoice Item,Net Rate (Company Currency),Net Rate (Company Valuta)
@@ -2252,9 +2175,8 @@
 apps/erpnext/erpnext/accounts/report/financial_statements.py +16,Fiscal Year {0} not found.,Regnskabsår {0} ikke fundet.
 DocType: Bank Reconciliation,Get Relevant Entries,Få relevante oplysninger
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +407,Accounting Entry for Stock,Regnskab Punktet om Stock
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +64,Coining,Opfandt
 DocType: Sales Invoice,Sales Team1,Salg TEAM1
-apps/erpnext/erpnext/stock/doctype/item/item.py +412,Item {0} does not exist,Element {0} eksisterer ikke
+apps/erpnext/erpnext/stock/doctype/item/item.py +416,Item {0} does not exist,Element {0} eksisterer ikke
 DocType: Sales Invoice,Customer Address,Kunde Adresse
 apps/frappe/frappe/desk/query_report.py +136,Total,Total
 DocType: Purchase Invoice,Apply Additional Discount On,Påfør Yderligere Rabat på
@@ -2266,14 +2188,13 @@
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),Skat Beløb Efter Discount Beløb (Company Valuta)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +149,Target warehouse is mandatory for row {0},Target lageret er obligatorisk for rækken {0}
 DocType: Quality Inspection,Quality Inspection,Quality Inspection
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +144,Extra Small,Extra Small
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +20,Spray forming,Spray danner
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Extra Small,Extra Small
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +458,Warning: Material Requested Qty is less than Minimum Order Qty,Advarsel: Materiale Anmodet Antal er mindre end Minimum Antal
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +191,Account {0} is frozen,Konto {0} er spærret
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Juridisk enhed / Datterselskab med en separat Kontoplan tilhører organisationen.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +29,"Food, Beverage & Tobacco","Mad, drikke og tobak"
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","Mad, drikke og tobak"
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +20,PL or BS,PL eller BS
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,Can only make payment against unbilled {0},Kan kun gøre betaling mod faktureret {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +531,Can only make payment against unbilled {0},Kan kun gøre betaling mod faktureret {0}
 apps/erpnext/erpnext/controllers/selling_controller.py +122,Commission rate cannot be greater than 100,Provisionssats kan ikke være større end 100
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Minimum Inventory Level,Minimum Inventory Level
 DocType: Stock Entry,Subcontract,Underleverance
@@ -2284,19 +2205,18 @@
 DocType: Item,Manufacturer Part Number,Producentens varenummer
 DocType: Production Order Operation,Estimated Time and Cost,Estimeret tid og omkostninger
 DocType: Bin,Bin,Bin
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +50,Nosing,Forkant
 DocType: SMS Log,No of Sent SMS,Ingen af ​​Sent SMS
 DocType: Account,Company,Firma
 DocType: Account,Expense Account,Udgiftskonto
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +49,Software,Software
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +151,Colour,Farve
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +49,Software,Software
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Colour,Farve
 DocType: Maintenance Visit,Scheduled,Planlagt
 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","Vælg Item hvor &quot;Er Stock Item&quot; er &quot;Nej&quot; og &quot;Er Sales Item&quot; er &quot;Ja&quot;, og der er ingen anden Product Bundle"
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,Vælg Månedlig Distribution til ujævnt distribuere mål på tværs måneder.
 DocType: Purchase Invoice Item,Valuation Rate,Værdiansættelse Rate
 apps/erpnext/erpnext/stock/get_item_details.py +281,Price List Currency not selected,Pris List Valuta ikke valgt
 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,Item Row {0}: kvittering {1} findes ikke i ovenstående &#39;Køb Kvitteringer&#39; bord
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +134,Employee {0} has already applied for {1} between {2} and {3},Medarbejder {0} har allerede ansøgt om {1} mellem {2} og {3}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +145,Employee {0} has already applied for {1} between {2} and {3},Medarbejder {0} har allerede ansøgt om {1} mellem {2} og {3}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Projekt startdato
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +8,Until,Indtil
 DocType: Rename Tool,Rename Log,Omdøbe Log
@@ -2306,7 +2226,7 @@
 apps/erpnext/erpnext/controllers/recurring_document.py +162,Please select {0},Vælg {0}
 DocType: C-Form,C-Form No,C-Form Ingen
 DocType: BOM,Exploded_items,Exploded_items
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +95,Researcher,Forsker
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Researcher,Forsker
 apps/frappe/frappe/custom/doctype/customize_form/customize_form.js +88,Update,Opdatering
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +78,Please save the Newsletter before sending,Gem nyhedsbrevet før afsendelse
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +23,Name or Email is mandatory,Navn eller E-mail er obligatorisk
@@ -2315,11 +2235,10 @@
 DocType: Employee,Exit,Udgang
 apps/erpnext/erpnext/accounts/doctype/account/account.py +134,Root Type is mandatory,Root Typen er obligatorisk
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +295,Serial No {0} created,Løbenummer {0} oprettet
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +125,Vibratory finishing,Vibrerende efterbehandling
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","For nemheds af kunder, kan disse koder bruges i trykte formater som fakturaer og følgesedler"
 DocType: Employee,You can enter any date manually,Du kan indtaste et hvilket som helst tidspunkt manuelt
 DocType: Sales Invoice,Advertisement,Annonce
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +165,Probationary Period,Prøvetid
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Probationary Period,Prøvetid
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Kun blade noder er tilladt i transaktionen
 DocType: Expense Claim,Expense Approver,Expense Godkender
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,Kvittering Vare Leveres
@@ -2327,19 +2246,16 @@
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +17,To Datetime,Til datotid
 DocType: SMS Settings,SMS Gateway URL,SMS Gateway URL
 apps/erpnext/erpnext/config/crm.py +53,Logs for maintaining sms delivery status,Logs for opretholdelse sms leveringsstatus
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +137,Grinding,Slibning
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +34,Shrink wrapping,Shrink indpakning
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +36,Pending Activities,Ventende Aktiviteter
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,Confirmed,Bekræftet
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier > Supplier Type,Leverandør&gt; Leverandør type
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +127,Please enter relieving date.,Indtast lindre dato.
 apps/erpnext/erpnext/controllers/trends.py +137,Amt,Amt
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' can be submitted,Kun Lad Applikationer med status &quot;Godkendt&quot; kan indsendes
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +51,Only Leave Applications with status 'Approved' can be submitted,Kun Lad Applikationer med status &quot;Godkendt&quot; kan indsendes
 apps/erpnext/erpnext/utilities/doctype/address/address.py +21,Address Title is mandatory.,Adresse Titel er obligatorisk.
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,"Indtast navnet på kampagne, hvis kilden undersøgelsesudvalg er kampagne"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +38,Newspaper Publishers,Dagblades
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +38,Newspaper Publishers,Dagblades
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,Vælg regnskabsår
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +88,Smelting,Smeltning
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Genbestil Level
 DocType: Attendance,Attendance Date,Fremmøde Dato
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,Løn breakup baseret på Optjening og fradrag.
@@ -2354,16 +2270,15 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +414,[Error],[Fejl]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,"I Ord vil være synlig, når du gemmer Sales Order."
 ,Employee Birthday,Medarbejder Fødselsdag
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +55,Venture Capital,Venture Capital
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,Venture Capital
 DocType: UOM,Must be Whole Number,Skal være hele tal
 DocType: Leave Control Panel,New Leaves Allocated (In Days),Nye blade Tildelte (i dage)
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +51,Serial No {0} does not exist,Løbenummer {0} eksisterer ikke
 DocType: Pricing Rule,Discount Percentage,Discount Procent
 DocType: Payment Reconciliation Invoice,Invoice Number,Fakturanummer
-apps/erpnext/erpnext/hooks.py +70,Orders,Ordrer
+apps/erpnext/erpnext/hooks.py +54,Orders,Ordrer
 DocType: Leave Control Panel,Employee Type,Medarbejder Type
 DocType: Employee Leave Approver,Leave Approver,Lad Godkender
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +70,Swaging,Sænksmedning
 DocType: Manufacturing Settings,Material Transferred for Manufacture,Materiale Overført til Fremstilling
 DocType: Expense Claim,"A user with ""Expense Approver"" role",En bruger med 'Godkend udgifter' rolle
 ,Issued Items Against Production Order,Udstedte Varer Against produktionsordre
@@ -2375,7 +2290,6 @@
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +62,Cost Center with existing transactions can not be converted to group,Cost Center med eksisterende transaktioner kan ikke konverteres til gruppe
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Depreciation,Afskrivninger
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Leverandør (er)
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +29,Invalid period,Ugyldig periode
 DocType: Customer,Credit Limit,Kreditgrænse
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,Vælg type transaktion
 DocType: GL Entry,Voucher No,Blad nr
@@ -2385,9 +2299,9 @@
 DocType: Customer,Address and Contact,Adresse og kontakt
 DocType: Customer,Last Day of the Next Month,Sidste dag i den næste måned
 DocType: Employee,Feedback,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}","Efterlad ikke kan fordeles inden {0}, da orlov balance allerede har været carry-fremsendt i fremtiden orlov tildeling rekord {1}"
 apps/erpnext/erpnext/accounts/party.py +284,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Bemærk: På grund / reference Date overstiger tilladte kunde kredit dage efter {0} dag (e)
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +621,Maint. Schedule,Maint. Tidsplan
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +108,Abrasive jet machining,Sandblæsnings udstyr
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +632,Maint. Schedule,Maint. Tidsplan
 DocType: Stock Settings,Freeze Stock Entries,Frys Stock Entries
 DocType: Website Settings,Website Settings,Website Settings
 DocType: Item,Reorder level based on Warehouse,Genbestil niveau baseret på Warehouse
@@ -2404,7 +2318,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +75,Show Stock Entries,Vis Stock Entries
 ,Is Primary Address,Er primære adresse
 DocType: Production Order,Work-in-Progress Warehouse,Work-in-Progress Warehouse
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +308,Reference #{0} dated {1},Henvisning # {0} dateret {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Reference #{0} dated {1},Henvisning # {0} dateret {1}
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +13,Manage Addresses,Administrer Adresser
 DocType: Pricing Rule,Item Code,Item Code
 DocType: Production Planning Tool,Create Production Orders,Opret produktionsordrer
@@ -2413,7 +2327,7 @@
 DocType: Lead,Market Segment,Market Segment
 DocType: Communication,Phone,Telefon
 DocType: Employee Internal Work History,Employee Internal Work History,Medarbejder Intern Arbejde Historie
-apps/erpnext/erpnext/public/js/account_tree_grid.js +50,Closing (Dr),Lukning (dr)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +221,Closing (Dr),Lukning (dr)
 DocType: Contact,Passive,Passiv
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,Løbenummer {0} ikke er på lager
 apps/erpnext/erpnext/config/selling.py +127,Tax template for selling transactions.,Skat skabelon til at sælge transaktioner.
@@ -2429,8 +2343,8 @@
 ,Billed Amount,Faktureret beløb
 DocType: Bank Reconciliation,Bank Reconciliation,Bank Afstemning
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +9,Get Updates,Hent opdateringer
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +129,Material Request {0} is cancelled or stopped,Materiale Request {0} er aflyst eller stoppet
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +641,Add a few sample records,Tilføj et par prøve optegnelser
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +133,Material Request {0} is cancelled or stopped,Materiale Request {0} er aflyst eller stoppet
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Add a few sample records,Tilføj et par prøve optegnelser
 apps/erpnext/erpnext/config/hr.py +210,Leave Management,Lad Management
 DocType: Event,Groups,Grupper
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,Gruppe af konto
@@ -2443,38 +2357,34 @@
 DocType: Features Setup,Sales Extras,Salg Extras
 apps/erpnext/erpnext/accounts/utils.py +344,{0} budget for Account {1} against Cost Center {2} will exceed by {3},{0} budget for konto {1} mod udgiftsområde {2} vil blive overskredet med {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +236,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Forskel Der skal være en Asset / Liability typen konto, da dette Stock Forsoning er en åbning indtastning"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +138,Purchase Order number required for Item {0},Indkøbsordre nummer kræves for Item {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Order number required for Item {0},Indkøbsordre nummer kræves for Item {0}
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date','Fra dato' skal være efter 'Til dato'
 ,Stock Projected Qty,Stock Forventet Antal
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +147,Customer {0} does not belong to project {1},Kunden {0} ikke hører til projekt {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +150,Customer {0} does not belong to project {1},Kunden {0} ikke hører til projekt {1}
 DocType: Sales Order,Customer's Purchase Order,Kundens Indkøbsordre
 DocType: Warranty Claim,From Company,Fra Company
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,Værdi eller Antal
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Minute,Minut
+apps/erpnext/erpnext/public/js/setup_wizard.js +363,Minute,Minut
 DocType: Purchase Invoice,Purchase Taxes and Charges,Købe Skatter og Afgifter
 ,Qty to Receive,Antal til Modtag
 DocType: Leave Block List,Leave Block List Allowed,Lad Block List tilladt
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +61,Conversion factor cannot be in fractions,Omregningsfaktor kan ikke være i fraktioner
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +358,You will use it to Login,Du vil bruge det til login
+apps/erpnext/erpnext/public/js/setup_wizard.js +108,You will use it to Login,Du vil bruge det til login
 DocType: Sales Partner,Retailer,Forhandler
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +99,Credit To account must be a Balance Sheet account,Kredit til konto skal være en balance konto
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,Alle Leverandør Typer
 apps/erpnext/erpnext/stock/doctype/item/item.py +37,Item Code is mandatory because Item is not automatically numbered,"Item Code er obligatorisk, fordi Varen er ikke automatisk nummereret"
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +99,Quotation {0} not of type {1},Notering {0} ikke af typen {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +93,Quotation {0} not of type {1},Notering {0} ikke af typen {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,Vedligeholdelse Skema Vare
 DocType: Sales Order,%  Delivered,% Leveres
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,Bank Overdraft Account,Bank kassekredit
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +15,Make Salary Slip,Foretag lønseddel
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +18,Browse BOM,Gennemse BOM
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +175,Secured Loans,Sikrede lån
-apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +3,Awesome Products,Awesome Products
+apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +3,Awesome Products,Awesome Products
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +189,Opening Balance Equity,Åbning Balance Egenkapital
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +80,Cannot approve leave as you are not authorized to approve leaves on Block Dates,"Kan ikke godkende orlov, som du ikke har tilladelse til at godkende blade på Block Datoer"
 DocType: Appraisal,Appraisal,Vurdering
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +13,Lost-foam casting,Lost-skum støbning
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +47,Drawing,Tegning
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +22,Date is repeated,Dato gentages
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +148,Leave approver must be one of {0},Lad godkender skal være en af ​​{0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +162,Leave approver must be one of {0},Lad godkender skal være en af ​​{0}
 DocType: Hub Settings,Seller Email,Sælger Email
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Samlet anskaffelsespris (via købsfaktura)
 DocType: Workstation Working Hour,Start Time,Start Time
@@ -2488,7 +2398,7 @@
 DocType: Purchase Invoice Item,Net Amount (Company Currency),Nettobeløb (Company Valuta)
 DocType: BOM Operation,Hour Rate,Hour Rate
 DocType: Stock Settings,Item Naming By,Item Navngivning By
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +642,From Quotation,Fra tilbudsgivning
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +655,From Quotation,Fra tilbudsgivning
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},En anden Periode Lukning indtastning {0} er blevet foretaget efter {1}
 DocType: Production Order,Material Transferred for Manufacturing,Materiale Overført til Manufacturing
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +29,Account {0} does not exists,Konto {0} findes ikke
@@ -2502,21 +2412,19 @@
 DocType: Purchase Invoice Item,PR Detail,PR Detail
 DocType: Sales Order,Fully Billed,Fuldt Billed
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +20,Cash In Hand,Kassebeholdning
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +72,Delivery warehouse required for stock item {0},Levering lager kræves for lagervare {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +119,Delivery warehouse required for stock item {0},Levering lager kræves for lagervare {0}
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),Bruttovægt af pakken. Normalt nettovægt + emballagemateriale vægt. (Til print)
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Brugere med denne rolle får lov til at sætte indefrosne konti og oprette / ændre regnskabsposter mod indefrosne konti
 DocType: Serial No,Is Cancelled,Er Annulleret
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +281,My Shipments,Mine forsendelser
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +286,My Shipments,Mine forsendelser
 DocType: Journal Entry,Bill Date,Bill Dato
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +43,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","Selv hvis der er flere Priser Regler med højeste prioritet, derefter følgende interne prioriteringer anvendt:"
 DocType: Supplier,Supplier Details,Leverandør Detaljer
 DocType: Communication,Recipients,Modtagere
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +146,Screwing,Skruning
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +96,Knurling,Rifling
 DocType: Expense Claim,Approval Status,Godkendelsesstatus
 DocType: Hub Settings,Publish Items to Hub,Udgive varer i Hub
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +44,From value must be less than to value in row {0},Fra værdi skal være mindre end at værdien i række {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +133,Wire Transfer,Bankoverførsel
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +133,Wire Transfer,Bankoverførsel
 apps/erpnext/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py +25,Please select Bank Account,Vælg Bankkonto
 DocType: Newsletter,Create and Send Newsletters,Opret og send nyhedsbreve
 apps/frappe/frappe/public/js/frappe/views/reports/grid_report.js +305,From Date must be before To Date,Fra dato skal være før til dato
@@ -2524,14 +2432,14 @@
 DocType: Company,Default Income Account,Standard Indkomst konto
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,Customer Group / kunde
 DocType: Item Group,Check this if you want to show in website,Markér dette hvis du ønsker at vise i website
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +190,Welcome to ERPNext,Velkommen til ERPNext
+,Welcome to ERPNext,Velkommen til ERPNext
 DocType: Payment Reconciliation Payment,Voucher Detail Number,Voucher Detail Number
 apps/erpnext/erpnext/config/crm.py +146,Lead to Quotation,Føre til Citat
 DocType: Lead,From Customer,Fra kunde
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +37,Calls,Opkald
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Calls,Opkald
 DocType: Project,Total Costing Amount (via Time Logs),Total Costing Beløb (via Time Logs)
 DocType: Purchase Order Item Supplied,Stock UOM,Stock UOM
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Purchase Order {0} is not submitted,Indkøbsordre {0} er ikke indsendt
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +194,Purchase Order {0} is not submitted,Indkøbsordre {0} er ikke indsendt
 ,Projected,Projiceret
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},Løbenummer {0} ikke hører til Warehouse {1}
 apps/erpnext/erpnext/controllers/status_updater.py +136,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Bemærk: Systemet vil ikke kontrollere over-levering og over-booking for Item {0} som mængde eller beløb er 0
@@ -2539,7 +2447,6 @@
 DocType: Issue,Opening Date,Åbning Dato
 DocType: Journal Entry,Remark,Bemærkning
 DocType: Purchase Receipt Item,Rate and Amount,Sats og Beløb
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +95,Boring,Boring
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +667,From Sales Order,Fra kundeordre
 DocType: Blog Category,Parent Website Route,Parent Website Route
 DocType: Sales Order,Not Billed,Ikke Billed
@@ -2553,19 +2460,17 @@
 apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount Amount,Rabat Beløb
 DocType: Purchase Invoice,Return Against Purchase Invoice,Retur Against købsfaktura
 DocType: Item,Warranty Period (in days),Garantiperiode (i dage)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +550,e.g. VAT,fx moms
+apps/erpnext/erpnext/public/js/setup_wizard.js +292,e.g. VAT,fx moms
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,Punkt 4
 DocType: Journal Entry Account,Journal Entry Account,Kassekladde konto
 DocType: Shopping Cart Settings,Quotation Series,Citat Series
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +52,"An item exists with same name ({0}), please change the item group name or rename the item","Et element eksisterer med samme navn ({0}), skal du ændre navnet elementet gruppe eller omdøbe elementet"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +82,Hot metal gas forming,Hot metal gas danner
 DocType: Sales Order Item,Sales Order Date,Sales Order Date
 DocType: Sales Invoice Item,Delivered Qty,Leveres Antal
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +63,Warehouse {0}: Company is mandatory,Warehouse {0}: Selskabet er obligatorisk
 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.",Gå til den relevante gruppe (som regel finansieringskilde&gt; Aktuelle Passiver&gt; Skatter og Afgifter og oprette en ny konto (ved at klikke på Tilføj barn) af typen &quot;Skat&quot; og gøre nævne Skatteprocent.
 ,Payment Period Based On Invoice Date,Betaling Periode Baseret på Fakturadato
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +50,Missing Currency Exchange Rates for {0},Manglende Valutakurser for {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +135,Laser cutting,Laserskæring
 DocType: Event,Monday,Mandag
 DocType: Journal Entry,Stock Entry,Stock indtastning
 DocType: Account,Payable,Betales
@@ -2598,7 +2503,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +111,Date Of Retirement must be greater than Date of Joining,Dato for pensionering skal være større end Dato for Sammenføjning
 DocType: Sales Invoice,Against Income Account,Mod Indkomst konto
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +69,{0}% Delivered,{0}% Delivered
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +78,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Vare {0}: Bestilte qty {1} kan ikke være mindre end minimum ordreantal {2} (defineret i punkt).
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Vare {0}: Bestilte qty {1} kan ikke være mindre end minimum ordreantal {2} (defineret i punkt).
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Månedlig Distribution Procent
 DocType: Territory,Territory Targets,Territory Mål
 DocType: Delivery Note,Transporter Info,Transporter Info
@@ -2607,7 +2512,6 @@
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,Titler til print skabeloner f.eks Proforma Invoice.
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +140,Valuation type charges can not marked as Inclusive,Værdiansættelse typen omkostninger ikke er markeret som Inclusive
 DocType: POS Profile,Update Stock,Opdatering Stock
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +128,Superfinishing,Superfinishing
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,"Forskellige UOM for elementer vil føre til forkert (Total) Vægt værdi. Sørg for, at Nettovægt for hvert punkt er i den samme UOM."
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM Rate
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +85,Please pull items from Delivery Note,Venligst trække elementer fra følgeseddel
@@ -2622,7 +2526,6 @@
 ,Purchase Analytics,Køb Analytics
 DocType: Sales Invoice Item,Delivery Note Item,Levering Note Vare
 DocType: Expense Claim,Task,Opgave
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +57,Shaving,Barbering
 DocType: Purchase Taxes and Charges,Reference Row #,Henvisning Row #
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},Batchnummer er obligatorisk for Item {0}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js +14,This is a root sales person and cannot be edited.,Dette er en rod salg person og kan ikke redigeres.
@@ -2634,13 +2537,11 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +74,Purpose must be one of {0},Formålet skal være en af ​​{0}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +108,Fill the form and save it,Udfyld formularen og gemme det
 DocType: Production Planning Tool,Download a report containing all raw materials with their latest inventory status,Download en rapport med alle råvarer med deres seneste opgørelse status
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +94,Facing,Facing
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,Fællesskab Forum
 DocType: Leave Application,Leave Balance Before Application,Lad Balance Før Application
 DocType: SMS Center,Send SMS,Send SMS
 DocType: Company,Default Letter Head,Standard Letter hoved
 DocType: Time Log,Billable,Faktureres
-DocType: Authorization Rule,This will be used for setting rule in HR module,Dette vil blive brugt til at indstille regel i HR-modulet
 DocType: Account,Rate at which this tax is applied,"Hastighed, hvormed denne afgift anvendes"
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reorder Qty,Genbestil Antal
 DocType: Company,Stock Adjustment Account,Stock Justering konto
@@ -2667,16 +2568,15 @@
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,Procentdel Tildeling bør være lig med 100%
 DocType: Serial No,Out of AMC,Ud af AMC
 DocType: Purchase Order Item,Material Request Detail No,Materiale Request Detail Nej
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +97,Hard turning,Hård drejning
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +33,Make Maintenance Visit,Make Vedligeholdelse Besøg
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +187,Please contact to the user who have Sales Master Manager {0} role,"Kontakt venligst til den bruger, der har Sales Master manager {0} rolle"
 DocType: Company,Default Cash Account,Standard Kontant konto
 apps/erpnext/erpnext/config/accounts.py +79,Company (not Customer or Supplier) master.,Company (ikke kunde eller leverandør) herre.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +106,Please enter 'Expected Delivery Date',Indtast &#39;Forventet leveringsdato&#39;
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +187,Delivery Notes {0} must be cancelled before cancelling this Sales Order,"Følgesedler {0} skal annulleres, før den annullerer denne Sales Order"
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +100,Please enter 'Expected Delivery Date',Indtast &#39;Forventet leveringsdato&#39;
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +182,Delivery Notes {0} must be cancelled before cancelling this Sales Order,"Følgesedler {0} skal annulleres, før den annullerer denne Sales Order"
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +373,Paid amount + Write Off Amount can not be greater than Grand Total,Betalt beløb + Skriv Off Beløb kan ikke være større end Grand Total
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} er ikke en gyldig Batchnummer for Item {1}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,Note: There is not enough leave balance for Leave Type {0},Bemærk: Der er ikke nok orlov balance for Leave Type {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +124,Note: There is not enough leave balance for Leave Type {0},Bemærk: Der er ikke nok orlov balance for Leave Type {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.","Bemærk: Hvis betaling ikke sker mod nogen reference, gør Kassekladde manuelt."
 DocType: Item,Supplier Items,Leverandør Varer
 DocType: Opportunity,Opportunity Type,Opportunity Type
@@ -2688,7 +2588,7 @@
 DocType: Hub Settings,Publish Availability,Offentliggøre Tilgængelighed
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +105,Date of Birth cannot be greater than today.,Fødselsdato kan ikke være større end i dag.
 ,Stock Ageing,Stock Ageing
-apps/erpnext/erpnext/controllers/accounts_controller.py +200,{0} '{1}' is disabled,{0} &#39;{1}&#39; er deaktiveret
+apps/erpnext/erpnext/controllers/accounts_controller.py +201,{0} '{1}' is disabled,{0} &#39;{1}&#39; er deaktiveret
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Sæt som Open
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Sende automatiske e-mails til Kontakter på Indsendelse transaktioner.
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +232,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
@@ -2697,44 +2597,38 @@
 DocType: Purchase Order,Customer Contact Email,Kundeservice Kontakt E-mail
 DocType: Event,Sunday,Søndag
 DocType: Sales Team,Contribution (%),Bidrag (%)
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +455,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,Bemærk: Betaling indtastning vil ikke blive oprettet siden &#39;Kontant eller bank konto&#39; er ikke angivet
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +171,Responsibilities,Ansvar
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +457,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,Bemærk: Betaling indtastning vil ikke blive oprettet siden &#39;Kontant eller bank konto&#39; er ikke angivet
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +171,Responsibilities,Ansvar
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Template,Skabelon
 DocType: Sales Person,Sales Person Name,Salg Person Name
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,Indtast venligst mindst 1 faktura i tabellen
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +511,Add Users,Tilføj Brugere
+apps/erpnext/erpnext/public/js/setup_wizard.js +255,Add Users,Tilføj Brugere
 DocType: Pricing Rule,Item Group,Item Group
 DocType: Task,Actual Start Date (via Time Logs),Faktiske startdato (via Time Logs)
 DocType: Stock Reconciliation Item,Before reconciliation,Før forsoning
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +12,To {0},Til {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Skatter og Afgifter Tilføjet (Company Valuta)
-apps/erpnext/erpnext/stock/doctype/item/item.py +340,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Item Skat Row {0} skal have højde for typen Skat eller indtægt eller omkostning eller Afgiftspligtens
+apps/erpnext/erpnext/stock/doctype/item/item.py +344,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Item Skat Row {0} skal have højde for typen Skat eller indtægt eller omkostning eller Afgiftspligtens
 DocType: Sales Order,Partly Billed,Delvist Billed
 DocType: Item,Default BOM,Standard BOM
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +79,Decambering,Decambering
 apps/erpnext/erpnext/setup/doctype/company/company.js +22,Please re-type company name to confirm,Prøv venligst igen typen firmanavn for at bekræfte
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,Total Enestående Amt
 DocType: Time Log Batch,Total Hours,Total Hours
 DocType: Journal Entry,Printing Settings,Udskrivning Indstillinger
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +268,Total Debit must be equal to Total Credit. The difference is {0},Samlet Debit skal være lig med Total Credit. Forskellen er {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +11,Automotive,Automotive
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +37,Item is required,Element er påkrævet
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +25,Metal injection molding,Metal sprøjtestøbning
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +258,Total Debit must be equal to Total Credit. The difference is {0},Samlet Debit skal være lig med Total Credit. Forskellen er {0}
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,Automotive
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +684,From Delivery Note,Fra følgeseddel
 DocType: Time Log,From Time,Fra Time
 DocType: Notification Control,Custom Message,Tilpasset Message
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +33,Investment Banking,Investment Banking
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +261,"Select your Country, Time Zone and Currency","Vælg dit land, tidszone og valuta"
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,Investment Banking
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +316,"Select your Country, Time Zone and Currency","Vælg dit land, tidszone og valuta"
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +369,Cash or Bank Account is mandatory for making payment entry,Kontant eller bankkonto er obligatorisk for betalingen post
 DocType: Purchase Invoice,Price List Exchange Rate,Prisliste Exchange Rate
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +91,Pickling,Bejdsning
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +18,Sand casting,Sandstøbning
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +117,Electroplating,Galvanisering
 DocType: Purchase Invoice Item,Rate,Rate
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +62,Intern,Intern
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Intern,Intern
 DocType: Newsletter,A Lead with this email id should exist,Et emne med dette e-mail-id skal være oprettet.
 DocType: Stock Entry,From BOM,Fra BOM
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +34,Basic,Grundlæggende
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +34,Basic,Grundlæggende
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,Stock transaktioner før {0} er frosset
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +217,Please click on 'Generate Schedule',Klik på &quot;Generer Schedule &#39;
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +61,To Date should be same as From Date for Half Day leave,Til dato skal være samme som fra dato for Half Day orlov
@@ -2742,10 +2636,10 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +96,Reference No is mandatory if you entered Reference Date,"Referencenummer er obligatorisk, hvis du har indtastet reference Dato"
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +108,Date of Joining must be greater than Date of Birth,Dato for Sammenføjning skal være større end Fødselsdato
 DocType: Salary Structure,Salary Structure,Løn Struktur
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +242,"Multiple Price Rule exists with same criteria, please resolve \
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +246,"Multiple Price Rule exists with same criteria, please resolve \
 			conflict by assigning priority. Price Rules: {0}","Multiple Pris Regel eksisterer med samme kriterier, skal du løse \ konflikten ved at tildele prioritet. Pris Regler: {0}"
 DocType: Account,Bank,Bank
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +9,Airline,Flyselskab
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,Flyselskab
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +493,Issue Material,Issue Materiale
 DocType: Material Request Item,For Warehouse,For Warehouse
 DocType: Employee,Offer Date,Offer Dato
@@ -2755,29 +2649,24 @@
 DocType: Item,Is Fixed Asset Item,Er Fast aktivpost
 DocType: Stock Entry,Including items for sub assemblies,Herunder elementer til sub forsamlinger
 DocType: Features Setup,"If you have long print formats, this feature can be used to split the page to be printed on multiple pages with all headers and footers on each page","Hvis du har lange trykte formater, kan denne funktion bruges til at opdele side, der skal udskrives på flere sider med alle sidehoveder og sidefødder på hver side"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +131,Hobbing,Hobbing
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +98,All Territories,Alle områder
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +98,All Territories,Alle områder
 DocType: Purchase Invoice,Items,Varer
 DocType: Fiscal Year,Year Name,År Navn
 DocType: Process Payroll,Process Payroll,Proces Payroll
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +59,There are more holidays than working days this month.,Der er flere helligdage end arbejdsdage i denne måned.
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +68,There are more holidays than working days this month.,Der er flere helligdage end arbejdsdage i denne måned.
 DocType: Product Bundle Item,Product Bundle Item,Produkt Bundle Item
 DocType: Sales Partner,Sales Partner Name,Salg Partner Navn
 DocType: Purchase Invoice Item,Image View,Billede View
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +113,Finishing & industrial finishing,Efterbehandling &amp; industriel efterbehandling
 DocType: Issue,Opening Time,Åbning tid
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,Fra og Til dato kræves
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +46,Securities & Commodity Exchanges,Værdipapirer og Commodity Exchanges
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Værdipapirer og Commodity Exchanges
 DocType: Shipping Rule,Calculate Based On,Beregn baseret på
 DocType: Delivery Note Item,From Warehouse,Fra Warehouse
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +98,Drilling,Boring
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +28,Blow molding,Blæsestøbning
 DocType: Purchase Taxes and Charges,Valuation and Total,Værdiansættelse og Total
 DocType: Tax Rule,Shipping City,Forsendelse By
 apps/erpnext/erpnext/stock/doctype/item/item.js +43,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,"Dette element er en Variant af {0} (skabelon). Attributter vil blive kopieret over fra skabelonen, medmindre &#39;Ingen Copy &quot;er indstillet"
 DocType: Account,Purchase User,Køb Bruger
 DocType: Notification Control,Customize the Notification,Tilpas Underretning
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +87,Hammering,Hamring
 DocType: Web Page,Slideshow,Slideshow
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +24,Default Address Template cannot be deleted,Standard Adresse Skabelon kan ikke slettes
 DocType: Sales Invoice,Shipping Rule,Forsendelse Rule
@@ -2786,9 +2675,8 @@
 DocType: Workflow State,Search,Søg
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +54,Total cannot be zero,Samlede kan ikke være nul
 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,'Dage siden sidste ordre' skal være større end eller lig med nul
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +142,Brazing,Lodning
 DocType: C-Form,Amended From,Ændret Fra
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Raw Material,Raw Material
+apps/erpnext/erpnext/public/js/setup_wizard.js +359,Raw Material,Raw Material
 DocType: Leave Application,Follow via Email,Følg via e-mail
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Skat Beløb Efter Discount Beløb
 apps/erpnext/erpnext/accounts/doctype/account/account.py +174,Child account exists for this account. You can not delete this account.,Eksisterer barn konto til denne konto. Du kan ikke slette denne konto.
@@ -2802,10 +2690,10 @@
 ,Produced,Produceret
 DocType: Item,Item Code for Suppliers,Item Code for leverandører
 DocType: Issue,Raised By (Email),Rejst af (E-mail)
-apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +72,General,Generelt
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +495,Attach Letterhead,Vedhæft Brevpapir
+apps/erpnext/erpnext/setup/setup_wizard/default_website.py +72,General,Generelt
+apps/erpnext/erpnext/public/js/setup_wizard.js +241,Attach Letterhead,Vedhæft Brevpapir
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +272,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',"Ikke kan fradrage, når kategorien er for &quot;Værdiansættelse&quot; eller &quot;Værdiansættelse og Total &#39;"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +542,"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.","Liste dine skattemæssige hoveder (f.eks moms, Told osv de skal have entydige navne) og deres faste satser. Dette vil skabe en standard skabelon, som du kan redigere og tilføje mere senere."
+apps/erpnext/erpnext/public/js/setup_wizard.js +284,"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.","Liste dine skattemæssige hoveder (f.eks moms, Told osv de skal have entydige navne) og deres faste satser. Dette vil skabe en standard skabelon, som du kan redigere og tilføje mere senere."
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial Nos Required for Serialized Item {0},Seriel Nos Nødvendig for Serialized Item {0}
 DocType: Journal Entry,Bank Entry,Bank indtastning
 DocType: Authorization Rule,Applicable To (Designation),Gælder for (Betegnelse)
@@ -2814,32 +2702,31 @@
 apps/erpnext/erpnext/config/accounts.py +143,Enable / disable currencies.,Aktivere / deaktivere valutaer.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Postal Expenses,Postale Udgifter
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),I alt (Amt)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +26,Entertainment & Leisure,Entertainment &amp; Leisure
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,Entertainment &amp; Leisure
 DocType: Purchase Order,The date on which recurring order will be stop,"Den dato, hvor tilbagevendende ordre vil blive stoppe"
 DocType: Quality Inspection,Item Serial No,Vare Løbenummer
 apps/erpnext/erpnext/controllers/status_updater.py +142,{0} must be reduced by {1} or you should increase overflow tolerance,"{0} skal reduceres med {1}, eller du bør øge overflow tolerance"
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Present,Samlet Present
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Hour,Time
+apps/erpnext/erpnext/public/js/setup_wizard.js +363,Hour,Time
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +138,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation",Føljeton Item {0} kan ikke opdateres \ hjælp Stock Afstemning
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +488,Transfer Material to Supplier,Overførsel Materiale til Leverandøren
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +513,Transfer Material to Supplier,Overførsel Materiale til Leverandøren
 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,Ny Løbenummer kan ikke have Warehouse. Warehouse skal indstilles af Stock indtastning eller kvittering
 DocType: Lead,Lead Type,Lead Type
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +82,Create Quotation,Opret Citat
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +306,All these items have already been invoiced,Alle disse punkter er allerede blevet faktureret
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,You are not authorized to approve leaves on Block Dates,Du er ikke autoriseret til at godkende blade på Block Datoer
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +311,All these items have already been invoiced,Alle disse punkter er allerede blevet faktureret
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},Kan godkendes af {0}
 DocType: Shipping Rule,Shipping Rule Conditions,Forsendelse Regel Betingelser
 DocType: BOM Replace Tool,The new BOM after replacement,Den nye BOM efter udskiftning
 DocType: Features Setup,Point of Sale,Point of Sale
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +83,Curling,Curling
 DocType: Account,Tax,Skat
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +28,Row {0}: {1} is not a valid {2},Række {0}: {1} er ikke en gyldig {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +89,Refining,Raffinering
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +37,Row {0}: {1} is not a valid {2},Række {0}: {1} er ikke en gyldig {2}
 DocType: Production Planning Tool,Production Planning Tool,Produktionsplanlægning Tool
 DocType: Quality Inspection,Report Date,Report Date
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +130,Routing,Routing
 DocType: C-Form,Invoices,Fakturaer
 DocType: Job Opening,Job Title,Jobtitel
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +54,{0} already allocated for Employee {1} for period {2} - {3},{0} allerede afsat til Medarbejder {1} for perioden {2} - {3}
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +80,{0} Recipients,{0} Modtagere
 DocType: Features Setup,Item Groups in Details,Varegrupper i Detaljer
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +335,Quantity to Manufacture must be greater than 0.,Mængde til Fremstilling skal være større end 0.
@@ -2857,14 +2744,13 @@
 DocType: DocType,Setup,Opsætning
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,Der er intet at redigere.
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +108,Summary for this month and pending activities,Resumé for denne måned og verserende aktiviteter
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +39,Cold rolling,Koldvalsning
 DocType: Customer Group,Customer Group Name,Customer Group Name
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +408,Please remove this Invoice {0} from C-Form {1},Fjern denne faktura {0} fra C-Form {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +410,Please remove this Invoice {0} from C-Form {1},Fjern denne faktura {0} fra C-Form {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,Vælg Carry Forward hvis du også ønsker at inkludere foregående regnskabsår balance blade til indeværende regnskabsår
 DocType: GL Entry,Against Voucher Type,Mod Voucher Type
 DocType: Item,Attributes,Attributter
 DocType: Packing Slip,Get Items,Få Varer
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +186,Please enter Write Off Account,Indtast venligst Skriv Off konto
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +187,Please enter Write Off Account,Indtast venligst Skriv Off konto
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +71,Last Order Date,Sidste Ordredato
 DocType: DocField,Image,Billede
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +179,Make Excise Invoice,Make Excise Faktura
@@ -2874,7 +2760,7 @@
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +146,Operation ID not set,Operation ID ikke indstillet
 DocType: Production Order,Planned Start Date,Planlagt startdato
 DocType: Serial No,Creation Document Type,Creation Dokumenttype
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +620,Maint. Visit,Maint. Besøg
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +631,Maint. Visit,Maint. Besøg
 DocType: Leave Type,Is Encash,Er indløse
 DocType: Purchase Invoice,Mobile No,Mobile Ingen
 DocType: Payment Tool,Make Journal Entry,Make Kassekladde
@@ -2882,35 +2768,31 @@
 apps/erpnext/erpnext/controllers/trends.py +257,Project-wise data is not available for Quotation,Projekt-wise data er ikke tilgængelig for Citat
 DocType: Project,Expected End Date,Forventet Slutdato
 DocType: Appraisal Template,Appraisal Template Title,Vurdering Template Titel
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +440,Commercial,Kommerciel
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +378,Commercial,Kommerciel
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +23,Parent Item {0} must not be a Stock Item,Parent Item {0} må ikke være en lagervare
 DocType: Cost Center,Distribution Id,Distribution Id
-apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +14,Awesome Services,Awesome Services
+apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +14,Awesome Services,Awesome Services
 apps/erpnext/erpnext/config/manufacturing.py +29,All Products or Services.,Alle produkter eller tjenesteydelser.
 DocType: Purchase Invoice,Supplier Address,Leverandør Adresse
 DocType: Contact Us Settings,Address Line 2,Adresse Linje 2
 DocType: ToDo,Reference,Henvisning
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +59,Perforating,Perforering
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,Out Antal
 apps/erpnext/erpnext/config/accounts.py +128,Rules to calculate shipping amount for a sale,Regler til at beregne forsendelse beløb for et salg
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +29,Series is mandatory,Serien er obligatorisk
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +28,Financial Services,Financial Services
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,Financial Services
 apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3},Værdi for Egenskab {0} skal være inden for området af {1} til {2} i intervaller på {3}
 DocType: Tax Rule,Sales,Salg
 DocType: Stock Entry Detail,Basic Amount,Grundbeløb
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +173,Warehouse required for stock Item {0},Warehouse kræves for lager Vare {0}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +178,Warehouse required for stock Item {0},Warehouse kræves for lager Vare {0}
 DocType: Leave Allocation,Unused leaves,Ubrugte blade
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,Cr
 DocType: Customer,Default Receivable Accounts,Standard kan modtages Konti
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +102,Sawing,Savning
 DocType: Tax Rule,Billing State,Fakturering stat
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +32,Laminating,Laminering
 DocType: Item Reorder,Transfer,Transfer
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +549,Fetch exploded BOM (including sub-assemblies),Hent eksploderede BOM (herunder underenheder)
 DocType: Authorization Rule,Applicable To (Employee),Gælder for (Medarbejder)
 apps/erpnext/erpnext/controllers/accounts_controller.py +101,Due Date is mandatory,Forfaldsdato er obligatorisk
 apps/erpnext/erpnext/controllers/item_variant.py +51,Increment for Attribute {0} cannot be 0,Tilvækst til Attribut {0} kan ikke være 0
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +143,Sintering,Sintring
 DocType: Journal Entry,Pay To / Recd From,Betal Til / RECD Fra
 DocType: Naming Series,Setup Series,Opsætning Series
 DocType: Supplier,Contact HTML,Kontakt HTML
@@ -2923,7 +2805,6 @@
 DocType: Attendance,Absent,Fraværende
 DocType: Product Bundle,Product Bundle,Produkt Bundle
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +180,Row {0}: Invalid reference {1},Række {0}: Ugyldig henvisning {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +165,Crushing,Knusning
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Købe Skatter og Afgifter Skabelon
 DocType: Upload Attendance,Download Template,Hent skabelon
 DocType: GL Entry,Remarks,Bemærkninger
@@ -2931,14 +2812,12 @@
 DocType: Journal Entry,Write Off Based On,Skriv Off baseret på
 DocType: Features Setup,POS View,POS View
 apps/erpnext/erpnext/config/stock.py +38,Installation record for a Serial No.,Installation rekord for en Serial No.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +9,Continuous casting,Kontinuerlig støbning
 apps/erpnext/erpnext/public/js/queries.js +39,Please specify a,Angiv en
 DocType: Offer Letter,Awaiting Response,Afventer svar
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +53,Above,Frem
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +80,Cold sizing,Kolde dimensionering
 DocType: Salary Slip,Earning & Deduction,Earning &amp; Fradrag
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +76,Account {0} cannot be a Group,Konto {0} kan ikke være en gruppe
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +259,Region,Region
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +314,Region,Region
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +213,Optional. This setting will be used to filter in various transactions.,Valgfri. Denne indstilling vil blive brugt til at filtrere i forskellige transaktioner.
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +104,Negative Valuation Rate is not allowed,Negative Værdiansættelse Rate er ikke tilladt
 DocType: Holiday List,Weekly Off,Ugentlig Off
@@ -2956,7 +2835,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,Account {0} is inactive,Konto {0} er inaktiv
 DocType: GL Entry,Is Advance,Er Advance
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,Fremmøde Fra Dato og fremmøde til dato er obligatorisk
-apps/erpnext/erpnext/controllers/buying_controller.py +131,Please enter 'Is Subcontracted' as Yes or No,Indtast &quot;underentreprise&quot; som Ja eller Nej
+apps/erpnext/erpnext/controllers/buying_controller.py +122,Please enter 'Is Subcontracted' as Yes or No,Indtast &quot;underentreprise&quot; som Ja eller Nej
 DocType: Sales Team,Contact No.,Kontakt No.
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,'Profit and Loss' type account {0} not allowed in Opening Entry,'Resultatopgørelsen' konto {0} ikke tilladt i 'Åbning balance'
 DocType: Workflow State,Time,Tid
@@ -2965,14 +2844,13 @@
 DocType: Authorization Rule,Authorization Rule,Autorisation Rule
 DocType: Sales Invoice,Terms and Conditions Details,Betingelser Detaljer
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,Salg Skatter og Afgifter Skabelon
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +10,Apparel & Accessories,Beklædning og tilbehør
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,Beklædning og tilbehør
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +67,Number of Order,Antal Order
 DocType: Item Group,HTML / Banner that will show on the top of product list.,"HTML / Banner, der vil vise på toppen af ​​produktliste."
 DocType: Shipping Rule,Specify conditions to calculate shipping amount,Angiv betingelser for at beregne forsendelse beløb
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +121,Add Child,Tilføj Child
 DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,Rolle Tilladt til Indstil Frosne Konti og Rediger Frosne Entries
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +52,Cannot convert Cost Center to ledger as it has child nodes,"Kan ikke konvertere Cost Center til hovedbog, som det har barneknudepunkter"
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +47,Conversion Factor is required,Konvertering Factor er nødvendig
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +37,Serial #,Serial #
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +87,Commission on Sales,Provision på salg
 DocType: Offer Letter Term,Value / Description,/ Beskrivelse
@@ -2980,10 +2858,8 @@
 ,Customers Not Buying Since Long Time,Kunder Ikke købe siden lang tid
 DocType: Production Order,Expected Delivery Date,Forventet leveringsdato
 apps/erpnext/erpnext/accounts/general_ledger.py +121,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Debet og Credit ikke ens for {0} # {1}. Forskellen er {2}.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +48,Bulging,Svulmende
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +11,Evaporative-pattern casting,Fordampningsemissioner-mønster støbning
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Entertainment Expenses,Repræsentationsudgifter
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +195,Sales Invoice {0} must be cancelled before cancelling this Sales Order,"Salg Faktura {0} skal annulleres, før den annullerer denne Sales Order"
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +190,Sales Invoice {0} must be cancelled before cancelling this Sales Order,"Salg Faktura {0} skal annulleres, før den annullerer denne Sales Order"
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +61,Age,Alder
 DocType: Time Log,Billing Amount,Fakturering Beløb
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +84,Invalid quantity specified for item {0}. Quantity should be greater than 0.,Ugyldig mængde angivet for element {0}. Mængde bør være større end 0.
@@ -3002,26 +2878,24 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,Ny kunde Omsætning
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Travel Expenses,Rejser Udgifter
 DocType: Maintenance Visit,Breakdown,Sammenbrud
-apps/erpnext/erpnext/controllers/accounts_controller.py +241,Account: {0} with currency: {1} can not be selected,Konto: {0} med valuta: kan ikke vælges {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +242,Account: {0} with currency: {1} can not be selected,Konto: {0} med valuta: kan ikke vælges {1}
 DocType: Bank Reconciliation Detail,Cheque Date,Check Dato
 apps/erpnext/erpnext/accounts/doctype/account/account.py +47,Account {0}: Parent account {1} does not belong to company: {2},Konto {0}: Forældre-konto {1} tilhører ikke virksomheden: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted all transactions related to this company!,Succesfuld slettet alle transaktioner i forbindelse med dette selskab!
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,Som på dato
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +111,Honing,Honing
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +58,Probation,Kriminalforsorgen
-apps/erpnext/erpnext/stock/doctype/item/item.py +264,Default Warehouse is mandatory for stock Item.,Standard Warehouse er obligatorisk for lager Item.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Probation,Kriminalforsorgen
+apps/erpnext/erpnext/stock/doctype/item/item.py +268,Default Warehouse is mandatory for stock Item.,Standard Warehouse er obligatorisk for lager Item.
 DocType: Feed,Full Name,Fulde navn
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +148,Clinching,Clinching
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +191,Payment of salary for the month {0} and year {1},Udbetaling af løn for måneden {0} og år {1}
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +173,Payment of salary for the month {0} and year {1},Udbetaling af løn for måneden {0} og år {1}
 DocType: Stock Settings,Auto insert Price List rate if missing,"Auto insert Prisliste sats, hvis der mangler"
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,Samlet indbetalte beløb
 ,Transferred Qty,Overført Antal
 apps/erpnext/erpnext/config/learn.py +11,Navigating,Navigering
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +137,Planning,Planlægning
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +137,Planning,Planlægning
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +9,Make Time Log Batch,Make Time Log Batch
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Issued,Udstedt
 DocType: Project,Total Billing Amount (via Time Logs),Total Billing Beløb (via Time Logs)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +629,We sell this Item,Vi sælger denne Vare
+apps/erpnext/erpnext/public/js/setup_wizard.js +365,We sell this Item,Vi sælger denne Vare
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +65,Supplier Id,Leverandør id
 DocType: Journal Entry,Cash Entry,Cash indtastning
 DocType: Sales Partner,Contact Desc,Kontakt Desc
@@ -3030,18 +2904,16 @@
 DocType: Brand,Item Manager,Item manager
 DocType: Cost Center,Add rows to set annual budgets on Accounts.,Tilføj rækker til at fastsætte årlige budgetter på Konti.
 DocType: Buying Settings,Default Supplier Type,Standard Leverandør Type
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +160,Quarrying,Stenbrud
 DocType: Production Order,Total Operating Cost,Samlede driftsomkostninger
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +160,Note: Item {0} entered multiple times,Bemærk: Konto {0} indtastet flere gange
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +163,Note: Item {0} entered multiple times,Bemærk: Konto {0} indtastet flere gange
 apps/erpnext/erpnext/config/crm.py +27,All Contacts.,Alle kontakter.
 DocType: Newsletter,Test Email Id,Test Email Id
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +394,Company Abbreviation,Firma Forkortelse
+apps/erpnext/erpnext/public/js/setup_wizard.js +142,Company Abbreviation,Firma Forkortelse
 DocType: Features Setup,If you follow Quality Inspection. Enables Item QA Required and QA No in Purchase Receipt,Hvis du følger kvalitetskontrol. Aktiverer Item QA Nødvendig og QA Ingen i kvittering
 DocType: GL Entry,Party Type,Party Type
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +68,Raw material cannot be same as main Item,Råvarer kan ikke være samme som vigtigste element
 DocType: Item Attribute Value,Abbreviation,Forkortelse
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,Ikke authroized da {0} overskrider grænser
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +30,Rotational molding,Rotationsstøbning
 apps/erpnext/erpnext/config/hr.py +115,Salary template master.,Løn skabelon mester.
 DocType: Leave Type,Max Days Leave Allowed,Max Dage Leave tilladt
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +55,Set Tax Rule for shopping cart,Sæt Skat Regel for indkøbskurv
@@ -3055,15 +2927,15 @@
 apps/erpnext/erpnext/config/selling.py +18,Quotes to Leads or Customers.,Citater til Leads eller kunder.
 DocType: Stock Settings,Role Allowed to edit frozen stock,Rolle Tilladt at redigere frosne lager
 ,Territory Target Variance Item Group-Wise,Territory Target Variance Item Group-Wise
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +101,All Customer Groups,Alle kundegrupper
-apps/erpnext/erpnext/controllers/accounts_controller.py +474,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} er obligatorisk. Måske Valutaveksling record er ikke skabt for {1} til {2}.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +101,All Customer Groups,Alle kundegrupper
+apps/erpnext/erpnext/controllers/accounts_controller.py +475,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} er obligatorisk. Måske Valutaveksling record er ikke skabt for {1} til {2}.
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +37,Tax Template is mandatory.,Skat Skabelon er obligatorisk.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +41,Account {0}: Parent account {1} does not exist,Konto {0}: Forældre-konto {1} findes ikke
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Prisliste Rate (Company Valuta)
 DocType: Account,Temporary,Midlertidig
 DocType: Address,Preferred Billing Address,Foretrukne Faktureringsadresse
 DocType: Monthly Distribution Percentage,Percentage Allocation,Procentvise fordeling
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +86,Secretary,Sekretær
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Secretary,Sekretær
 DocType: Serial No,Distinct unit of an Item,Særskilt enhed af et element
 DocType: Pricing Rule,Buying,Køb
 DocType: HR Settings,Employee Records to be created by,Medarbejder Records at være skabt af
@@ -3076,9 +2948,8 @@
 ,Item-wise Price List Rate,Item-wise Prisliste Rate
 DocType: Purchase Order Item,Supplier Quotation,Leverandør Citat
 DocType: Quotation,In Words will be visible once you save the Quotation.,"I Ord vil være synlig, når du gemmer tilbuddet."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +68,Ironing,Strygning
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is stopped,{0} {1} er stoppet
-apps/erpnext/erpnext/stock/doctype/item/item.py +352,Barcode {0} already used in Item {1},Stregkode {0} allerede brugt i Item {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +356,Barcode {0} already used in Item {1},Stregkode {0} allerede brugt i Item {1}
 DocType: Lead,Add to calendar on this date,Føj til kalender på denne dato
 apps/erpnext/erpnext/config/selling.py +132,Rules for adding shipping costs.,Regler for at tilføje forsendelsesomkostninger.
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,Kommende begivenheder
@@ -3087,27 +2958,25 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +27,Quick Entry,Hurtig indtastning
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0} er obligatorisk for Return
 DocType: Purchase Order,To Receive,At Modtage
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +33,Shrink fitting,Shrink fitting
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +522,user@example.com,user@example.com
+apps/erpnext/erpnext/public/js/setup_wizard.js +266,user@example.com,user@example.com
 DocType: Email Digest,Income / Expense,Indtægter / Expense
 DocType: Employee,Personal Email,Personlig Email
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +58,Total Variance,Samlet Varians
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +62,Total Variance,Samlet Varians
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.","Hvis aktiveret, vil systemet sende bogføring for opgørelse automatisk."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +15,Brokerage,Brokerage
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +15,Brokerage,Brokerage
 DocType: Address,Postal Code,postnummer
 DocType: Production Order Operation,"in Minutes
 Updated via 'Time Log'",i minutter Opdateret via &#39;Time Log&#39;
 DocType: Customer,From Lead,Fra Lead
 apps/erpnext/erpnext/config/manufacturing.py +19,Orders released for production.,Ordrer frigives til produktion.
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +42,Select Fiscal Year...,Vælg regnskabsår ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +442,POS Profile required to make POS Entry,POS profil kræves for at gøre POS indtastning
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +444,POS Profile required to make POS Entry,POS profil kræves for at gøre POS indtastning
 DocType: Hub Settings,Name Token,Navn Token
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +106,Planing,Planing
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Selling,Standard Selling
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +120,Standard Selling,Standard Selling
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +137,Atleast one warehouse is mandatory,Mindst én lageret er obligatorisk
 DocType: Serial No,Out of Warranty,Ud af garanti
 DocType: BOM Replace Tool,Replace,Udskifte
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +314,{0} against Sales Invoice {1},{0} mod salgsfaktura {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +316,{0} against Sales Invoice {1},{0} mod salgsfaktura {1}
 apps/erpnext/erpnext/stock/doctype/item/item.py +49,Please enter default Unit of Measure,Indtast venligst standard Måleenhed
 DocType: Purchase Invoice Item,Project Name,Projektnavn
 DocType: Supplier,Mention if non-standard receivable account,"Nævne, hvis ikke-standard tilgodehavende konto"
@@ -3123,9 +2992,8 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,Journal Entry {0} does not have account {1} or already matched against other voucher,Kassekladde {0} har ikke konto {1} eller allerede matchet mod andre kupon
 DocType: Item,Moving Average,Glidende gennemsnit
 DocType: BOM Replace Tool,The BOM which will be replaced,Den BOM som vil blive erstattet
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +43,New Stock UOM must be different from current stock UOM,New Stock UOM skal være forskellig fra nuværende bestand UOM
 DocType: Account,Debit,Betalingskort
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +34,Leaves must be allocated in multiples of 0.5,"Blade skal afsættes i multipla af 0,5"
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +44,Leaves must be allocated in multiples of 0.5,"Blade skal afsættes i multipla af 0,5"
 DocType: Production Order,Operation Cost,Operation Cost
 apps/erpnext/erpnext/config/hr.py +71,Upload attendance from a .csv file,Upload fremmøde fra en .csv-fil
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,Enestående Amt
@@ -3143,8 +3011,7 @@
 DocType: Employee,Internal Work History,Intern Arbejde Historie
 DocType: DocField,Column Break,Kolonne Break
 DocType: Event,Thursday,Torsdag
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +42,Private Equity,Private Equity
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +93,Turning,Drejning
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,Private Equity
 DocType: Maintenance Visit,Customer Feedback,Kundefeedback
 DocType: Account,Expense,Expense
 DocType: Sales Invoice,Exhibition,Udstilling
@@ -3157,19 +3024,19 @@
 DocType: Employee,Held On,Held On
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +33,Production Item,Produktion Vare
 ,Employee Information,Medarbejder Information
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,Rate (%),Sats (%)
+apps/erpnext/erpnext/public/js/setup_wizard.js +294,Rate (%),Sats (%)
 DocType: Stock Entry Detail,Additional Cost,Yderligere omkostninger
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +407,Financial Year End Date,Regnskabsår Slutdato
+apps/erpnext/erpnext/public/js/setup_wizard.js +155,Financial Year End Date,Regnskabsår Slutdato
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Voucher No, if grouped by Voucher","Kan ikke filtrere baseret på blad nr, hvis grupperet efter Voucher"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +484,Make Supplier Quotation,Foretag Leverandør Citat
 DocType: Quality Inspection,Incoming,Indgående
 DocType: BOM,Materials Required (Exploded),Nødvendige materialer (Sprængskitse)
 DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),Reducer Optjening for Leave uden løn (LWP)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +512,"Add users to your organization, other than yourself","Tilføj brugere til din organisation, andre end dig selv"
+apps/erpnext/erpnext/public/js/setup_wizard.js +256,"Add users to your organization, other than yourself","Tilføj brugere til din organisation, andre end dig selv"
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No {1} does not match with {2} {3},Række # {0}: Løbenummer {1} matcher ikke med {2} {3}
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +44,Casual Leave,Casual Leave
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +44,Casual Leave,Casual Leave
 DocType: Batch,Batch ID,Batch-id
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +334,Note: {0},Bemærk: {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +336,Note: {0},Bemærk: {0}
 ,Delivery Note Trends,Følgeseddel Tendenser
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +104,This Week's Summary,Denne uges Summary
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +74,{0} must be a Purchased or Sub-Contracted Item in row {1},{0} skal være en Købt eller underentreprise element i række {1}
@@ -3181,7 +3048,7 @@
 DocType: Purchase Receipt,Return Against Purchase Receipt,Retur Against kvittering
 DocType: Purchase Order,To Bill,Til Bill
 DocType: Material Request,% Ordered,% Bestilt
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +61,Piecework,Akkordarbejde
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Piecework,Akkordarbejde
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +64,Avg. Buying Rate,Gns. Køb Rate
 DocType: Task,Actual Time (in Hours),Faktiske tid (i timer)
 DocType: Employee,History In Company,Historie I Company
@@ -3198,13 +3065,13 @@
 DocType: Opportunity,To Discuss,Til Diskuter
 DocType: SMS Settings,SMS Settings,SMS-indstillinger
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +60,Temporary Accounts,Midlertidige Konti
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +155,Black,Sort
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Black,Sort
 DocType: BOM Explosion Item,BOM Explosion Item,BOM Explosion Vare
 DocType: Account,Auditor,Revisor
 DocType: Purchase Order,End date of current order's period,Slutdato for aktuelle ordres periode
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +17,Make Offer Letter,Kom med et tilbud Letter
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +10,Return,Retur
-apps/erpnext/erpnext/stock/doctype/item/item.py +503,Default Unit of Measure for Variant must be same as Template,Standard måleenhed for Variant skal være samme som skabelon
+apps/erpnext/erpnext/stock/doctype/item/item.py +507,Default Unit of Measure for Variant must be same as Template,Standard måleenhed for Variant skal være samme som skabelon
 DocType: DocField,Fold,Fold
 DocType: Production Order Operation,Production Order Operation,Produktionsordre Operation
 DocType: Pricing Rule,Disable,Deaktiver
@@ -3215,13 +3082,12 @@
 DocType: Page,Page Name,Side Navn
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +110,To Time must be greater than From Time,Til Time skal være større end From Time
 DocType: Journal Entry Account,Exchange Rate,Exchange Rate
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +465,Sales Order {0} is not submitted,Sales Order {0} er ikke indsendt
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +467,Sales Order {0} is not submitted,Sales Order {0} er ikke indsendt
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0}: Parent account {1} does not bolong to the company {2},Warehouse {0}: Forældre-konto {1} ikke Bolong til virksomheden {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +124,Spindle finishing,Spindel efterbehandling
 DocType: BOM,Last Purchase Rate,Sidste Purchase Rate
 DocType: Account,Asset,Asset
 DocType: Project Task,Task ID,Opgave-id
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +395,"e.g. ""MC""",fx &quot;MC&quot;
+apps/erpnext/erpnext/public/js/setup_wizard.js +143,"e.g. ""MC""",fx &quot;MC&quot;
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,Stock cannot exist for Item {0} since has variants,Stock kan ikke eksistere for Item {0} da har varianter
 ,Sales Person-wise Transaction Summary,Salg Person-wise Transaktion Summary
 DocType: System Settings,Time Zone,Time Zone
@@ -3230,9 +3096,7 @@
 DocType: Monthly Distribution,Monthly Distribution Percentages,Månedlige Distribution Procenter
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +16,The selected item cannot have Batch,Det valgte emne kan ikke have Batch
 DocType: Delivery Note,% of materials delivered against this Delivery Note,% Af materialer leveret mod denne følgeseddel
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +151,Stapling,Hæftning
 DocType: Customer,Customer Details,Kunde Detaljer
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +105,Shaping,Shaping
 DocType: Employee,Reports to,Rapporter til
 DocType: SMS Settings,Enter url parameter for receiver nos,Indtast url parameter for receiver nos
 DocType: Sales Invoice,Paid Amount,Betalt Beløb
@@ -3241,13 +3105,13 @@
 DocType: Item Variant,Item Variant,Item Variant
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +15,Setting this Address Template as default as there is no other default,"Angivelse af denne adresse skabelon som standard, da der ikke er nogen anden standard"
 apps/erpnext/erpnext/accounts/doctype/account/account.py +89,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'",Konto balance er debit. Du har ikke lov til at ændre 'Balancetype' til 'kredit'
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +76,Quality Management,Quality Management
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Quality Management,Quality Management
 DocType: Production Planning Tool,Filter based on customer,Filter baseret på kundernes
 DocType: Payment Tool Detail,Against Voucher No,Mod blad nr
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +47,Please enter quantity for Item {0},Indtast mængde for Item {0}
 DocType: Employee External Work History,Employee External Work History,Medarbejder Ekstern Work History
 DocType: Tax Rule,Purchase,Købe
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +34,Balance Qty,Balance Antal
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Balance Qty,Balance Antal
 DocType: Item Group,Parent Item Group,Moderselskab Item Group
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +21,{0} for {1},{0} for {1}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +96,Cost Centers,Omkostninger Centers
@@ -3257,12 +3121,12 @@
 DocType: Opportunity,Next Contact,Næste Kontakt
 DocType: Employee,Employment Type,Beskæftigelse type
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,Anlægsaktiver
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +84,Application period cannot be across two alocation records,Ansøgningsperiode kan ikke være på tværs af to alocation optegnelser
 DocType: Item Group,Default Expense Account,Standard udgiftskonto
 DocType: Employee,Notice (days),Varsel (dage)
 DocType: Page,Yes,Ja
 DocType: Tax Rule,Sales Tax Template,Sales Tax Skabelon
 DocType: Employee,Encashment Date,Indløsning Dato
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +74,Electroforming,Electroforming
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +179,"Against Voucher Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Imod Voucher type skal være en af ​​indkøbsordre, købsfaktura eller Kassekladde"
 DocType: Account,Stock Adjustment,Stock Justering
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +34,Default Activity Cost exists for Activity Type - {0},Standard Activity Omkostninger findes for Activity Type - {0}
@@ -3298,12 +3162,12 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,"Warehouse kan ikke slettes, da der eksisterer lager hovedbog post for dette lager."
 DocType: Company,Distribution,Distribution
 apps/erpnext/erpnext/public/js/pos/pos.html +36,Amount Paid,Beløb betalt
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +91,Project Manager,Projektleder
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +72,Dispatch,Dispatch
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Project Manager,Projektleder
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +72,Dispatch,Dispatch
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,Max rabat tilladt for vare: {0} er {1}%
 DocType: Customer,Default Taxes and Charges,Standard Skatter og Afgifter
 DocType: Account,Receivable,Tilgodehavende
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +268,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,"Række # {0}: Ikke tilladt at skifte leverandør, da indkøbsordre allerede findes"
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +263,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,"Række # {0}: Ikke tilladt at skifte leverandør, da indkøbsordre allerede findes"
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,"Rolle, som får lov til at indsende transaktioner, der overstiger kredit grænser."
 DocType: Sales Invoice,Supplier Reference,Leverandør 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.","Hvis markeret, vil BOM for sub-montage elementer overvejes for at få råvarer. Ellers vil alle sub-montage poster behandles som et råstof."
@@ -3311,8 +3175,8 @@
 DocType: Hub Settings,Seller Description,Sælger Beskrivelse
 DocType: Employee Education,Qualification,Kvalifikation
 DocType: Item Price,Item Price,Item Pris
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +48,Soap & Detergent,Sæbe &amp; Vaskemiddel
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +36,Motion Picture & Video,Motion Picture &amp; Video
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +48,Soap & Detergent,Sæbe &amp; Vaskemiddel
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +36,Motion Picture & Video,Motion Picture &amp; Video
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Bestilt
 DocType: Warehouse,Warehouse Name,Warehouse Navn
 DocType: Naming Series,Select Transaction,Vælg Transaktion
@@ -3321,7 +3185,6 @@
 DocType: BOM,Rate Of Materials Based On,Rate Of materialer baseret på
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,Support Analtyics
 apps/erpnext/erpnext/accounts/doctype/accounts_settings/accounts_settings.py +27,Company is missing in warehouses {0},Virksomheden mangler i pakhuse {0}
-DocType: Stock UOM Replace Utility,Stock UOM Replace Utility,Stock UOM Udskift Utility
 DocType: POS Profile,Terms and Conditions,Betingelser
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,To Date should be within the Fiscal Year. Assuming To Date = {0},Til dato bør være inden regnskabsåret. Antages Til dato = {0}
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","Her kan du vedligeholde højde, vægt, allergier, medicinske problemer osv"
@@ -3333,7 +3196,7 @@
 DocType: Sales Order Item,For Production,For Produktion
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +103,Please enter sales order in the above table,Indtast salgsordre i ovenstående tabel
 DocType: Project Task,View Task,View Opgave
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +406,Your financial year begins on,Din regnskabsår begynder på
+apps/erpnext/erpnext/public/js/setup_wizard.js +154,Your financial year begins on,Din regnskabsår begynder på
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +46,Please enter Purchase Receipts,Indtast venligst Køb Kvitteringer
 DocType: Sales Invoice,Get Advances Received,Få forskud
 DocType: Email Digest,Add/Remove Recipients,Tilføj / fjern modtagere
@@ -3341,16 +3204,14 @@
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","For at indstille dette regnskabsår som standard, skal du klikke på &#39;Vælg som standard&#39;"
 apps/erpnext/erpnext/config/support.py +54,Setup incoming server for support email id. (e.g. support@example.com),Opsætning indgående server til support email id. (F.eks support@example.com)
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,Mangel Antal
-apps/erpnext/erpnext/stock/doctype/item/item.py +528,Item variant {0} exists with same attributes,Vare variant {0} eksisterer med samme attributter
+apps/erpnext/erpnext/stock/doctype/item/item.py +532,Item variant {0} exists with same attributes,Vare variant {0} eksisterer med samme attributter
 DocType: Salary Slip,Salary Slip,Lønseddel
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +116,Burnishing,Brunering
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +54,'To Date' is required,&#39;Til dato&#39; er nødvendig
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,&#39;Til dato&#39; er nødvendig
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","Generer pakkesedler for pakker, der skal leveres. Bruges til at anmelde pakke nummer, pakkens indhold og dens vægt."
 DocType: Sales Invoice Item,Sales Order Item,Sales Order Vare
 DocType: Salary Slip,Payment Days,Betalings Dage
 DocType: BOM,Manage cost of operations,Administrer udgifter til operationer
 DocType: Features Setup,Item Advanced,Item Avanceret
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +40,Hot rolling,Varmvalsning
 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.","Når nogen af ​​de kontrollerede transaktioner er &quot;Indsendt&quot;, en e-pop-up automatisk åbnet til at sende en e-mail til den tilknyttede &quot;Kontakt&quot; i denne transaktion, med transaktionen som en vedhæftet fil. Brugeren kan eller ikke kan sende e-mailen."
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,Globale indstillinger
 DocType: Employee Education,Employee Education,Medarbejder Uddannelse
@@ -3363,25 +3224,23 @@
 DocType: Customer,Sales Team Details,Salg Team Detaljer
 DocType: Expense Claim,Total Claimed Amount,Total krævede beløb
 apps/erpnext/erpnext/config/crm.py +22,Potential opportunities for selling.,Potentielle muligheder for at sælge.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +48,Sick Leave,Sygefravær
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +174,Invalid {0},Ugyldig {0}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +48,Sick Leave,Sygefravær
 DocType: Email Digest,Email Digest,Email Digest
 DocType: Delivery Note,Billing Address Name,Fakturering Adresse Navn
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +22,Department Stores,Varehuse
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,Varehuse
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +40,System Balance,System Balance
 DocType: Workflow,Is Active,Er Aktiv
 apps/erpnext/erpnext/controllers/stock_controller.py +71,No accounting entries for the following warehouses,Ingen bogføring for følgende lagre
 apps/erpnext/erpnext/projects/doctype/project/project.js +22,Save the document first.,Gem dokumentet først.
 DocType: Account,Chargeable,Gebyr
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +121,Linishing,Linishing
 DocType: Company,Change Abbreviation,Skift Forkortelse
 DocType: Workflow State,Primary,Primær
 DocType: Expense Claim Detail,Expense Date,Expense Dato
 DocType: Item,Max Discount (%),Max Rabat (%)
 DocType: Communication,More Information,Mere information
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +70,Last Order Amount,Sidste ordrebeløb
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +161,Blasting,Sprængning
 DocType: Company,Warn,Advar
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +111,Item valuation updated,Item værdiansættelse opdateret
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Alle andre bemærkninger, bemærkelsesværdigt indsats, skal gå i registrene."
 DocType: BOM,Manufacturing User,Manufacturing Bruger
 DocType: Purchase Order,Raw Materials Supplied,Raw Materials Leveres
@@ -3391,7 +3250,7 @@
 DocType: Appraisal,Appraisal Template,Vurdering skabelon
 DocType: Communication,Email,Email
 DocType: Item Group,Item Classification,Item Klassifikation
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +89,Business Development Manager,Business Development Manager
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Business Development Manager,Business Development Manager
 DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,Vedligeholdelse Besøg Formål
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.js +15,Period,Periode
 ,General Ledger,General Ledger
@@ -3401,9 +3260,7 @@
 ,Itemwise Recommended Reorder Level,Itemwise Anbefalet genbestillings Level
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +264,Please select {0} first,Vælg {0} først
 DocType: Features Setup,To get Item Group in details table,At få Item Group i detaljer tabel
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +67,Redrawing,Gentegning
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +112,Batch {0} of Item {1} has expired.,Batch {0} af Item {1} er udløbet.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +120,Etching,Ætsning
 DocType: Sales Invoice,Commission,Kommissionen
 DocType: Address Template,"<h4>Default Template</h4>
 <p>Uses <a href=""http://jinja.pocoo.org/docs/templates/"">Jinja Templating</a> and all the fields of Address (including Custom Fields if any) will be available</p>
@@ -3437,7 +3294,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +340,Operation Time must be greater than 0 for Operation {0},Driftstid skal være større end 0 til drift {0}
 DocType: Supplier,Address and Contacts,Adresse og kontaktpersoner
 DocType: UOM Conversion Detail,UOM Conversion Detail,UOM Konvertering Detail
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +496,Keep it web friendly 900px (w) by 100px (h),Hold det web venlige 900px (w) ved 100px (h)
+apps/erpnext/erpnext/public/js/setup_wizard.js +242,Keep it web friendly 900px (w) by 100px (h),Hold det web venlige 900px (w) ved 100px (h)
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +329,Production Order cannot be raised against a Item Template,Produktionsordre kan ikke rejses mod en Vare skabelon
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +44,Charges are updated in Purchase Receipt against each item,Afgifter er opdateret i kvittering mod hvert punkt
 DocType: Payment Tool,Get Outstanding Vouchers,Få Udestående Vouchers
@@ -3453,54 +3310,49 @@
 DocType: Item,Average time taken by the supplier to deliver,Gennemsnitlig tid taget af leverandøren til at levere
 DocType: Time Log,Hours,Timer
 DocType: Project,Expected Start Date,Forventet startdato
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +38,Rolling,Rullende
 DocType: ToDo,Priority,Prioritet
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +41,Remove item if charges is not applicable to that item,"Fjern element, hvis afgifter ikke finder anvendelse på denne post"
 DocType: Dropbox Backup,Dropbox Access Allowed,Dropbox Adgang tilladt
 DocType: Dropbox Backup,Weekly,Ugentlig
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,F.eks. smsgateway.com/api/send_sms.cgi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +485,Receive,Modtag
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +510,Receive,Modtag
 DocType: Maintenance Visit,Fully Completed,Fuldt Afsluttet
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% Complete
 DocType: Employee,Educational Qualification,Pædagogisk Kvalifikation
 DocType: Workstation,Operating Costs,Drifts- omkostninger
 DocType: Employee Leave Approver,Employee Leave Approver,Medarbejder Leave Godkender
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,{0} has been successfully added to our Newsletter list.,{0} er blevet føjet til vores nyhedsliste.
-apps/erpnext/erpnext/stock/doctype/item/item.py +383,Row {0}: An Reorder entry already exists for this warehouse {1},Række {0}: En Genbestil indgang findes allerede for dette lager {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +387,Row {0}: An Reorder entry already exists for this warehouse {1},Række {0}: En Genbestil indgang findes allerede for dette lager {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +67,"Cannot declare as lost, because Quotation has been made.","Kan ikke erklære så tabt, fordi Citat er blevet gjort."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +133,Electron beam machining,Elektronstråle bearbejdning
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Indkøb Master manager
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +424,Production Order {0} must be submitted,Produktionsordre {0} skal indsendes
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +150,Please select Start Date and End Date for Item {0},Vælg Start og slutdato for Item {0}
 apps/erpnext/erpnext/config/stock.py +141,Main Reports,Vigtigste Reports
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +102,Stock Ledger entries balances updated,Stock Ledger poster saldi opdateret
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,Til dato kan ikke være før fra dato
 DocType: Purchase Receipt Item,Prevdoc DocType,Prevdoc DocType
-apps/erpnext/erpnext/stock/doctype/item/item.js +176,Add / Edit Prices,Tilføj / rediger Priser
+apps/erpnext/erpnext/stock/doctype/item/item.js +178,Add / Edit Prices,Tilføj / rediger Priser
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +53,Chart of Cost Centers,Diagram af Cost Centers
 ,Requested Items To Be Ordered,Anmodet Varer skal bestilles
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +298,My Orders,Mine ordrer
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +293,My Orders,Mine ordrer
 DocType: Price List,Price List Name,Pris List Name
 DocType: Time Log,For Manufacturing,For Manufacturing
-apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +70,Totals,Totaler
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +174,Totals,Totaler
 DocType: BOM,Manufacturing,Produktion
 ,Ordered Items To Be Delivered,"Bestilte varer, der skal leveres"
 DocType: Account,Income,Indkomst
 ,Setup Wizard,Setup Wizard
 DocType: Industry Type,Industry Type,Industri Type
 apps/erpnext/erpnext/templates/includes/cart.js +137,Something went wrong!,Noget gik galt!
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +68,Warning: Leave application contains following block dates,Advarsel: Lad ansøgning indeholder følgende blok datoer
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +251,Sales Invoice {0} has already been submitted,Salg Faktura {0} er allerede blevet indsendt
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +100,Warning: Leave application contains following block dates,Advarsel: Lad ansøgning indeholder følgende blok datoer
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +256,Sales Invoice {0} has already been submitted,Salg Faktura {0} er allerede blevet indsendt
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,Afslutning Dato
 DocType: Purchase Invoice Item,Amount (Company Currency),Beløb (Company Valuta)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +10,Die casting,Trykstøbning
 DocType: Email Alert,Reference Date,Henvisning Dato
 apps/erpnext/erpnext/config/hr.py +105,Organization unit (department) master.,Organisation enhed (departement) herre.
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +25,Please enter valid mobile nos,Indtast venligst gyldige mobile nos
 DocType: Budget Detail,Budget Detail,Budget Detail
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +75,Please enter message before sending,"Indtast venligst besked, før du sender"
 DocType: Async Task,Status,Status
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +65,Stock UOM updated for Item {0},Stock UOM opdateret for Item {0}
 DocType: Company History,Year,År
 apps/erpnext/erpnext/config/accounts.py +127,Point-of-Sale Profile,Point-of-Sale profil
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +68,Please Update SMS Settings,Opdatér venligst SMS-indstillinger
@@ -3514,12 +3366,12 @@
 ,Serial No Service Contract Expiry,Løbenummer Service Kontrakt udløb
 DocType: Item,Unit of Measure Conversion,Måleenhed Conversion
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +86,Employee can not be changed,Medarbejder kan ikke ændres
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +259,You cannot credit and debit same account at the same time,Du kan ikke kreditere og debitere samme konto på samme tid
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,You cannot credit and debit same account at the same time,Du kan ikke kreditere og debitere samme konto på samme tid
 DocType: Naming Series,Help HTML,Hjælp HTML
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},Samlet weightage tildelt skulle være 100%. Det er {0}
 apps/erpnext/erpnext/controllers/status_updater.py +140,Allowance for over-{0} crossed for Item {1},Fradrag for over- {0} krydsede for Item {1}
 DocType: Address,Name of person or organization that this address belongs to.,"Navn på den person eller organisation, der denne adresse tilhører."
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +587,Your Suppliers,Dine Leverandører
+apps/erpnext/erpnext/public/js/setup_wizard.js +325,Your Suppliers,Dine Leverandører
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,Kan ikke indstilles som Lost som Sales Order er foretaget.
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +65,Another Salary Structure {0} is active for employee {1}. Please make its status 'Inactive' to proceed.,En anden Løn Struktur {0} er aktiv for medarbejder {1}. Venligst gøre sin status &quot;Inaktiv&quot; for at fortsætte.
 DocType: Purchase Invoice,Contact,Kontakt
@@ -3528,37 +3380,35 @@
 DocType: Item,Has Serial No,Har Løbenummer
 DocType: Employee,Date of Issue,Udstedelsesdato
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +16,{0}: From {0} for {1},{0}: Fra {0} for {1}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +154,Row #{0}: Set Supplier for item {1},Række # {0}: Indstil Leverandør for vare {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +149,Row #{0}: Set Supplier for item {1},Række # {0}: Indstil Leverandør for vare {1}
 DocType: Issue,Content Type,Indholdstype
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +17,Computer,Computer
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,Computer
 DocType: Item,List this Item in multiple groups on the website.,Liste denne vare i flere grupper på hjemmesiden.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +283,Please check Multi Currency option to allow accounts with other currency,Kontroller venligst Multi Valuta indstilling for at tillade konti med anden valuta
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +285,Please check Multi Currency option to allow accounts with other currency,Kontroller venligst Multi Valuta indstilling for at tillade konti med anden valuta
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +62,Item: {0} does not exist in the system,Item: {0} findes ikke i systemet
 apps/erpnext/erpnext/accounts/doctype/account/account.py +81,You are not authorized to set Frozen value,Du er ikke autoriseret til at fastsætte Frozen værdi
 DocType: Payment Reconciliation,Get Unreconciled Entries,Få ikke-afstemte Entries
 DocType: Cost Center,Budgets,Budgetter
 apps/frappe/frappe/core/page/modules_setup/modules_setup.py +11,Updated,Opdateret
 DocType: Employee,Emergency Contact Details,Emergency Kontaktoplysning
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +396,What does it do?,Hvad gør det?
+apps/erpnext/erpnext/public/js/setup_wizard.js +144,What does it do?,Hvad gør det?
 DocType: Delivery Note,To Warehouse,Til Warehouse
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +45,Account {0} has been entered more than once for fiscal year {1},Konto {0} er indtastet mere end en gang for regnskabsåret {1}
 ,Average Commission Rate,Gennemsnitlig Kommissionens Rate
-apps/erpnext/erpnext/stock/doctype/item/item.py +313,'Has Serial No' can not be 'Yes' for non-stock item,'Har serienummer' kan ikke være 'Ja' for ikke-lagervare
+apps/erpnext/erpnext/stock/doctype/item/item.py +317,'Has Serial No' can not be 'Yes' for non-stock item,'Har serienummer' kan ikke være 'Ja' for ikke-lagervare
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Attendance can not be marked for future dates,Fremmøde kan ikke markeres for fremtidige datoer
 DocType: Pricing Rule,Pricing Rule Help,Prisfastsættelse Rule Hjælp
 DocType: Purchase Taxes and Charges,Account Head,Konto hoved
 apps/erpnext/erpnext/config/stock.py +79,Update additional costs to calculate landed cost of items,Opdater yderligere omkostninger til at beregne landede udgifter til poster
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +111,Electrical,Elektrisk
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +111,Electrical,Elektrisk
 DocType: Stock Entry,Total Value Difference (Out - In),Samlet værdi Difference (Out - In)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +302,Row {0}: Exchange Rate is mandatory,Række {0}: Valutakursen er obligatorisk
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +304,Row {0}: Exchange Rate is mandatory,Række {0}: Valutakursen er obligatorisk
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},Bruger-id ikke indstillet til Medarbejder {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +72,Peening,Peening
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,From Warranty Claim,Fra garanti krav
 DocType: Stock Entry,Default Source Warehouse,Standardkilde Warehouse
 DocType: Item,Customer Code,Customer Kode
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +212,Birthday Reminder for {0},Birthday Reminder for {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +163,Lapping,Lapning
-apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.js +8,Days Since Last Order,Dage siden sidste ordre
+apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +72,Days Since Last Order,Dage siden sidste ordre
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +299,Debit To account must be a Balance Sheet account,Betalingskort Til konto skal være en balance konto
 DocType: Buying Settings,Naming Series,Navngivning Series
 DocType: Leave Block List,Leave Block List Name,Lad Block List Name
@@ -3572,7 +3422,7 @@
 DocType: Notification Control,Sales Invoice Message,Salg Faktura Message
 DocType: Authorization Rule,Based On,Baseret på
 DocType: Sales Order Item,Ordered Qty,Bestilt Antal
-apps/erpnext/erpnext/stock/doctype/item/item.py +539,Item {0} is disabled,Konto {0} er deaktiveret
+apps/erpnext/erpnext/stock/doctype/item/item.py +543,Item {0} is disabled,Konto {0} er deaktiveret
 DocType: Stock Settings,Stock Frozen Upto,Stock Frozen Op
 apps/erpnext/erpnext/controllers/recurring_document.py +166,Period From and Period To dates mandatory for recurring {0},Periode fra og periode datoer obligatorisk for tilbagevendende {0}
 apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,Projektaktivitet / opgave.
@@ -3582,7 +3432,6 @@
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,Rabat skal være mindre end 100
 DocType: ToDo,Low,Lav
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Skriv Off Beløb (Company Valuta)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +71,Spinning,Spinning
 DocType: Landed Cost Voucher,Landed Cost Voucher,Landed Cost Voucher
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +55,Please set {0},Indstil {0}
 DocType: Purchase Invoice,Repeat on Day of Month,Gentag på Dag Måned
@@ -3604,7 +3453,6 @@
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +37,Campaign Name is required,Kampagne navn er påkrævet
 DocType: Maintenance Visit,Maintenance Date,Vedligeholdelse Dato
 DocType: Purchase Receipt Item,Rejected Serial No,Afvist Løbenummer
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +51,Deep drawing,Dybtrækning
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +40,New Newsletter,Ny Nyhedsbrev
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +157,Start date should be less than end date for Item {0},Start dato bør være mindre end slutdato for Item {0}
 apps/erpnext/erpnext/stock/doctype/item/item.js +17,Show Balance,Vis Balance
@@ -3614,7 +3462,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +119,BOM and Manufacturing Quantity are required,BOM and Manufacturing Mængde kræves
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Ageing Range 2
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +450,Amount,Beløb
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +147,Riveting,Nitning
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,BOM erstattet
 ,Sales Analytics,Salg Analytics
 DocType: Manufacturing Settings,Manufacturing Settings,Manufacturing Indstillinger
@@ -3626,20 +3473,19 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +207,New Account Name,Ny Kontonavn
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,Raw Materials Leveres Cost
 DocType: Selling Settings,Settings for Selling Module,Indstillinger for Selling modul
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +73,Customer Service,Kundeservice
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Customer Service,Kundeservice
 DocType: Item,Thumbnail,Thumbnail
 DocType: Item Customer Detail,Item Customer Detail,Item Customer Detail
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +147,Confirm Your Email,Bekræft din e-mail
 apps/erpnext/erpnext/config/hr.py +53,Offer candidate a Job.,Offer kandidat et job.
 DocType: Notification Control,Prompt for Email on Submission of,Spørg til Email på Indsendelse af
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +81,Total allocated leaves are more than days in the period,Samlede fordelte blade er mere end dage i perioden
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +70,Item {0} must be a stock Item,Vare {0} skal være en bestand Vare
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,Standard Work In Progress Warehouse
 apps/erpnext/erpnext/config/accounts.py +107,Default settings for accounting transactions.,Standardindstillinger regnskabsmæssige transaktioner.
 apps/frappe/frappe/model/naming.py +40,{0} is required,{0} er påkrævet
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +21,Vacuum molding,Vakuum støbning
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,Forventet dato kan ikke være før Material Request Dato
 DocType: Contact Us Settings,City,By
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +132,Ultrasonic machining,Ultrasonic bearbejdning
 apps/frappe/frappe/templates/base.html +137,Error: Not a valid id?,Fejl: Ikke et gyldigt id?
 apps/erpnext/erpnext/stock/get_item_details.py +125,Item {0} must be a Sales Item,Vare {0} skal være en Sales Item
 DocType: Naming Series,Update Series Number,Opdatering Series Number
@@ -3647,7 +3493,7 @@
 DocType: Sales Order,Printing Details,Udskrivning Detaljer
 DocType: Task,Closing Date,Closing Dato
 DocType: Sales Order Item,Produced Quantity,Produceret Mængde
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +84,Engineer,Ingeniør
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Engineer,Ingeniør
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,Søg Sub Assemblies
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +379,Item Code required at Row No {0},Item Code kræves på Row Nej {0}
 DocType: Sales Partner,Partner Type,Partner Type
@@ -3655,7 +3501,7 @@
 DocType: Authorization Rule,Customerwise Discount,Customerwise Discount
 DocType: Purchase Invoice,Against Expense Account,Mod udgiftskonto
 DocType: Production Order,Production Order,Produktionsordre
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +258,Installation Note {0} has already been submitted,Installation Bemærk {0} er allerede blevet indsendt
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +263,Installation Note {0} has already been submitted,Installation Bemærk {0} er allerede blevet indsendt
 DocType: Quotation Item,Against Docname,Mod Docname
 DocType: SMS Center,All Employee (Active),Alle Medarbejder (Active)
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,Se nu
@@ -3664,19 +3510,19 @@
 DocType: Item,Re-Order Level,Re-Order Level
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,"Indtast poster og planlagt qty, som du ønsker at hæve produktionsordrer eller downloade råvarer til analyse."
 apps/frappe/frappe/public/js/frappe/views/ganttview.js +45,Gantt Chart,Gantt Chart
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +57,Part-time,Deltid
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,Part-time,Deltid
 DocType: Employee,Applicable Holiday List,Gældende Holiday List
 DocType: Employee,Cheque,Cheque
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,Series Opdateret
 apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Report Type is mandatory,Rapporttype er obligatorisk
 DocType: Item,Serial Number Series,Serial Number Series
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},Warehouse er obligatorisk for lager Vare {0} i række {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +45,Retail & Wholesale,Detail &amp; Wholesale
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,Detail &amp; Wholesale
 DocType: Issue,First Responded On,Først svarede den
 DocType: Website Item Group,Cross Listing of Item in multiple groups,Cross Notering af Item i flere grupper
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +351,The First User: You,Den første bruger: Du
+apps/erpnext/erpnext/public/js/setup_wizard.js +101,The First User: You,Den første bruger: Du
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +48,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},Regnskabsår Start Dato og Skatteårsafslutning Dato allerede sat i regnskabsåret {0}
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +172,Successfully Reconciled,Succesfuld Afstemt
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +119,Successfully Reconciled,Succesfuld Afstemt
 DocType: Production Order,Planned End Date,Planlagt Slutdato
 apps/erpnext/erpnext/config/stock.py +43,Where items are stored.,Hvor emner er gemt.
 DocType: Tax Rule,Validity,Gyldighed
@@ -3696,39 +3542,36 @@
 DocType: DocPerm,Level,Level
 DocType: Purchase Taxes and Charges,On Net Total,On Net Total
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +160,Target warehouse in row {0} must be same as Production Order,Target lager i rækken {0} skal være samme som produktionsordre
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +59,No permission to use Payment Tool,Ingen tilladelse til at bruge Betaling Tool
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +97,No permission to use Payment Tool,Ingen tilladelse til at bruge Betaling Tool
 apps/erpnext/erpnext/controllers/recurring_document.py +192,'Notification Email Addresses' not specified for recurring %s,'Notification Email Adresser' er ikke angivet for tilbagevendende %s
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +86,Milling,Milling
 apps/erpnext/erpnext/accounts/doctype/account/account.py +99,Currency can not be changed after making entries using some other currency,Valuta kan ikke ændres efter at poster ved hjælp af nogle anden valuta
 DocType: Company,Round Off Account,Afrunde konto
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +60,Nibbling,Gnave
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,Administrationsomkostninger
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +18,Consulting,Rådgivning
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +18,Consulting,Rådgivning
 DocType: Customer Group,Parent Customer Group,Overordnet kunde Group
 apps/erpnext/erpnext/public/js/pos/pos.js +429,Change,Ændring
 DocType: Purchase Invoice,Contact Email,Kontakt E-mail
 DocType: Appraisal Goal,Score Earned,Score tjent
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +393,"e.g. ""My Company LLC""",fx &quot;My Company LLC&quot;
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +173,Notice Period,Opsigelsesperiode
+apps/erpnext/erpnext/public/js/setup_wizard.js +141,"e.g. ""My Company LLC""",fx &quot;My Company LLC&quot;
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +173,Notice Period,Opsigelsesperiode
 DocType: Bank Reconciliation Detail,Voucher ID,Voucher ID
 apps/erpnext/erpnext/setup/doctype/territory/territory.js +14,This is a root territory and cannot be edited.,Dette er en rod territorium og kan ikke redigeres.
 DocType: Packing Slip,Gross Weight UOM,Gross Weight UOM
 DocType: Email Digest,Receivables / Payables,Tilgodehavender / Gæld
 DocType: Delivery Note Item,Against Sales Invoice,Mod Salg Faktura
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +63,Stamping,Stempling
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +457,Credit Account,Credit konto
 DocType: Landed Cost Item,Landed Cost Item,Landed Cost Vare
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +56,Show zero values,Vis nul værdier
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,Mængde post opnået efter fremstilling / ompakning fra givne mængde råvarer
 DocType: Payment Reconciliation,Receivable / Payable Account,Tilgodehavende / Betales konto
 DocType: Delivery Note Item,Against Sales Order Item,Mod Sales Order Item
-apps/erpnext/erpnext/stock/doctype/item/item.py +521,Please specify Attribute Value for attribute {0},Angiv Attribut Værdi for attribut {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +525,Please specify Attribute Value for attribute {0},Angiv Attribut Værdi for attribut {0}
 DocType: Item,Default Warehouse,Standard Warehouse
 DocType: Task,Actual End Date (via Time Logs),Faktiske Slutdato (via Time Logs)
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +37,Budget cannot be assigned against Group Account {0},Budget kan ikke tildeles mod Group konto {0}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +23,Please enter parent cost center,Indtast forælder omkostningssted
 DocType: Delivery Note,Print Without Amount,Print uden Beløb
-apps/erpnext/erpnext/controllers/buying_controller.py +69,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,Skat Kategori kan ikke være &quot;Værdiansættelse&quot; eller &quot;Værdiansættelse og Total&quot; som alle elementer er ikke-lagervarer
+apps/erpnext/erpnext/controllers/buying_controller.py +60,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,Skat Kategori kan ikke være &quot;Værdiansættelse&quot; eller &quot;Værdiansættelse og Total&quot; som alle elementer er ikke-lagervarer
 DocType: User,Last Name,Efternavn
 DocType: Web Page,Left,Venstre
 DocType: Event,All Day,All Day
@@ -3736,7 +3579,7 @@
 DocType: Appraisal,Total Score (Out of 5),Total Score (ud af 5)
 DocType: Contact Us Settings,State,Stat
 DocType: Batch,Batch,Batch
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +51,Balance,Balance
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +28,Balance,Balance
 DocType: Project,Total Expense Claim (via Expense Claims),Total Expense krav (via Expense krav)
 DocType: User,Gender,Køn
 DocType: Journal Entry,Debit Note,Debetnota
@@ -3766,8 +3609,7 @@
 DocType: Purchase Order,Get Last Purchase Rate,Få Sidste Purchase Rate
 DocType: Time Log,Billing Rate based on Activity Type (per hour),Fakturering Pris baseret på Activity type (i timen)
 DocType: Company,Company Info,Firma Info
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +76,Seaming,Falsning
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +197,"Company Email ID not found, hence mail not sent","Firma Email ID ikke fundet, dermed mail ikke sendt"
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +206,"Company Email ID not found, hence mail not sent","Firma Email ID ikke fundet, dermed mail ikke sendt"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Anvendelse af midler (Assets)
 DocType: Production Planning Tool,Filter based on item,Filter baseret på emne
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +451,Debit Account,Debet konto
@@ -3779,17 +3621,16 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +95,{0} {1} has been modified. Please refresh.,{0} {1} er blevet ændret. Venligst opdater.
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,Stop brugere fra at Udfyld Programmer på følgende dage.
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +591,From Opportunity,Fra Opportunity
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +46,Blanking,Blanking
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +166,Employee Benefits,Personaleydelser
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,Employee Benefits,Personaleydelser
 DocType: Sales Invoice,Is POS,Er POS
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +240,Packed quantity must equal quantity for Item {0} in row {1},Pakket mængde skal være lig mængde for Item {0} i række {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +245,Packed quantity must equal quantity for Item {0} in row {1},Pakket mængde skal være lig mængde for Item {0} i række {1}
 DocType: Production Order,Manufactured Qty,Fremstillet Antal
 DocType: Purchase Receipt Item,Accepted Quantity,Accepteret Mængde
 apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} eksisterer ikke
 apps/erpnext/erpnext/config/accounts.py +18,Bills raised to Customers.,Regninger rejst til kunder.
 DocType: DocField,Default,Standard
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Projekt-id
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +466,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Række Nej {0}: Beløb kan ikke være større end Afventer Beløb mod Expense krav {1}. Afventer Beløb er {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +468,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Række Nej {0}: Beløb kan ikke være større end Afventer Beløb mod Expense krav {1}. Afventer Beløb er {2}
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +40,{0} subscribers added,{0} abonnenter tilføjet
 DocType: Maintenance Schedule,Schedule,Køreplan
 DocType: Cost Center,"Define Budget for this Cost Center. To set budget action, see ""Company List""","Definer budget for denne Cost Center. For at indstille budgettet handling, se &quot;Company List&quot;"
@@ -3800,7 +3641,7 @@
 apps/erpnext/erpnext/public/js/pos/pos.js +91,Price List not found or disabled,Prisliste ikke fundet eller handicappede
 DocType: Expense Claim,Approved,Godkendt
 DocType: Pricing Rule,Price,Pris
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +79,Employee relieved on {0} must be set as 'Left',Medarbejder lettet på {0} skal indstilles som &quot;Left&quot;
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +88,Employee relieved on {0} must be set as 'Left',Medarbejder lettet på {0} skal indstilles som &quot;Left&quot;
 DocType: Item,"Selecting ""Yes"" will give a unique identity to each entity of this item which can be viewed in the Serial No master.","Hvis du vælger &quot;Ja&quot; vil give en unik identitet til hver enhed i denne post, som kan ses i Serial Ingen mester."
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +39,Appraisal {0} created for Employee {1} in the given date range,Vurdering {0} skabt til Medarbejder {1} i givet datointerval
 DocType: Employee,Education,Uddannelse
@@ -3811,7 +3652,7 @@
 apps/frappe/frappe/desk/moduleview.py +67,Standard Reports,Standard rapporter
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,Regnskab journaloptegnelser.
 DocType: Delivery Note Item,Available Qty at From Warehouse,Tilgængelige Antal ved fra vores varelager
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +209,Please select Employee Record first.,Vælg Medarbejder Record først.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +224,Please select Employee Record first.,Vælg Medarbejder Record først.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Række {0}: Party / Konto matcher ikke med {1} / {2} i {3} {4}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +35,To create a Tax Account,Sådan opretter du en Tax-konto
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +233,Please enter Expense Account,Indtast venligst udgiftskonto
@@ -3824,46 +3665,43 @@
 DocType: Sales Order,Track this Sales Order against any Project,Spor denne salgsordre mod enhver Project
 DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,Pull salgsordrer (afventer at levere) baseret på ovenstående kriterier
 DocType: DocShare,Document Type,Dokumenttype
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +565,From Supplier Quotation,Fra Leverandør Citat
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +588,From Supplier Quotation,Fra Leverandør Citat
 DocType: Deduction Type,Deduction Type,Fradrag Type
 DocType: Attendance,Half Day,Half Day
 DocType: Pricing Rule,Min Qty,Min Antal
 DocType: Features Setup,"To track items in sales and purchase documents with batch nos. ""Preferred Industry: Chemicals""",For at spore elementer i salgs- og købsdokumenter med batch nr. &quot;Foretrukne Branche: Kemikalier&quot;
 DocType: GL Entry,Transaction Date,Transaktion Dato
 DocType: Production Plan Item,Planned Qty,Planned Antal
-apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +91,Total Tax,I alt Skat
+apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +93,Total Tax,I alt Skat
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +178,For Quantity (Manufactured Qty) is mandatory,For Mængde (Fremstillet Antal) er obligatorisk
 DocType: Stock Entry,Default Target Warehouse,Standard Target Warehouse
 DocType: Purchase Invoice,Net Total (Company Currency),Net alt (Company Valuta)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +79,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Række {0}: Party Type og Party gælder kun mod Tilgodehavende / Betales konto
 DocType: Notification Control,Purchase Receipt Message,Kvittering Message
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +95,Total allocated leaves are more than period,Samlede fordelte blade er mere end periode
 DocType: Production Order,Actual Start Date,Faktiske startdato
 DocType: Sales Order,% of materials delivered against this Sales Order,% Af materialer leveret mod denne Sales Order
 apps/erpnext/erpnext/config/stock.py +23,Record item movement.,Optag element bevægelse.
 DocType: Newsletter List Subscriber,Newsletter List Subscriber,Nyhedsbrev List Subscriber
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +164,Morticing,Stemmemaskiner
 DocType: Email Account,Service,Service
 DocType: Hub Settings,Hub Settings,Hub Indstillinger
 DocType: Project,Gross Margin %,Gross Margin%
 DocType: BOM,With Operations,Med Operations
 apps/erpnext/erpnext/accounts/party.py +232,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Regnskabsposteringer er allerede foretaget i valuta {0} for virksomheden {1}. Vælg tilgodehavendets eller gældens konto med valuta {0}.
 ,Monthly Salary Register,Månedlig Løn Tilmeld
-apps/frappe/frappe/website/template.py +140,Next,Næste
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard_page.html +17,Next,Næste
 DocType: Warranty Claim,If different than customer address,Hvis anderledes end kunde adresse
 DocType: BOM Operation,BOM Operation,BOM Operation
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +118,Electropolishing,Elektropolering
 DocType: Purchase Taxes and Charges,On Previous Row Amount,På Forrige Row Beløb
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +24,Please enter Payment Amount in atleast one row,Indtast Betaling Beløb i mindst én række
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +33,Please enter Payment Amount in atleast one row,Indtast Betaling Beløb i mindst én række
 DocType: POS Profile,POS Profile,POS profil
 apps/erpnext/erpnext/config/accounts.py +153,"Seasonality for setting budgets, targets etc.","Sæsonudsving til indstilling budgetter, mål etc."
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +238,Row {0}: Payment Amount cannot be greater than Outstanding Amount,Række {0}: Betaling Beløb kan ikke være større end udestående beløb
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +46,Total Unpaid,Total Ulønnet
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +21,Time Log is not billable,Time Log ikke fakturerbare
 apps/erpnext/erpnext/stock/get_item_details.py +128,"Item {0} is a template, please select one of its variants","Vare {0} er en skabelon, skal du vælge en af ​​dens varianter"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +528,Purchaser,Køber
+apps/erpnext/erpnext/public/js/setup_wizard.js +272,Purchaser,Køber
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +81,Net pay cannot be negative,Nettoløn kan ikke være negativ
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +71,Please enter the Against Vouchers manually,Indtast Against Vouchers manuelt
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +107,Please enter the Against Vouchers manually,Indtast Against Vouchers manuelt
 DocType: SMS Settings,Static Parameters,Statiske parametre
 DocType: Purchase Order,Advance Paid,Advance Betalt
 DocType: Item,Item Tax,Item Skat
@@ -3872,14 +3710,12 @@
 apps/erpnext/erpnext/config/crm.py +48,Send mass SMS to your contacts,Send masse SMS til dine kontakter
 DocType: Purchase Taxes and Charges,Consider Tax or Charge for,Overvej Skat eller Gebyr for
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,Faktiske Antal er obligatorisk
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +42,Cross-rolling,Cross-rulning
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +132,Credit Card,Credit Card
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +132,Credit Card,Credit Card
 DocType: BOM,Item to be manufactured or repacked,"Element, der skal fremstilles eller forarbejdes"
 apps/erpnext/erpnext/config/stock.py +95,Default settings for stock transactions.,Standardindstillinger for lager transaktioner.
 DocType: Purchase Invoice,Next Date,Næste dato
 DocType: Employee Education,Major/Optional Subjects,Større / Valgfag
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +49,Please enter Taxes and Charges,Indtast Skatter og Afgifter
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +85,Machining,Bearbejdning
 DocType: Sales Invoice Item,Drop Ship,Drop Ship
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","Her kan du opretholde familiens detaljer som navn og besættelse af forældre, ægtefælle og børn"
 DocType: Hub Settings,Seller Name,Sælger Navn
@@ -3889,7 +3725,7 @@
 DocType: Stock Entry,Repack,Pakke
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +6,You must Save the form before proceeding,"Du skal gemme formularen, før du fortsætter"
 DocType: Item Attribute,Numeric Values,Numeriske værdier
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +500,Attach Logo,Vedhæft Logo
+apps/erpnext/erpnext/public/js/setup_wizard.js +246,Attach Logo,Vedhæft Logo
 DocType: Customer,Commission Rate,Kommissionens Rate
 apps/erpnext/erpnext/stock/doctype/item/item.js +38,Make Variant,Make Variant
 apps/erpnext/erpnext/config/hr.py +145,Block leave applications by department.,Blok orlov ansøgninger fra afdelingen.
@@ -3904,19 +3740,19 @@
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +105,Please select a csv file,Vælg en CSV-fil
 DocType: Dropbox Backup,Send Backups to Dropbox,Send Backups til Dropbox
 DocType: Purchase Order,To Receive and Bill,Til at modtage og Bill
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +94,Designer,Designer
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Designer,Designer
 apps/erpnext/erpnext/config/selling.py +121,Terms and Conditions Template,Vilkår og betingelser Skabelon
 DocType: Serial No,Delivery Details,Levering Detaljer
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +383,Cost Center is required in row {0} in Taxes table for type {1},Cost Center kræves i række {0} i Skatter tabellen for type {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +386,Cost Center is required in row {0} in Taxes table for type {1},Cost Center kræves i række {0} i Skatter tabellen for type {1}
 DocType: Item,Automatically create Material Request if quantity falls below this level,Automatisk oprette Materiale Request hvis mængde falder under dette niveau
 ,Item-wise Purchase Register,Vare-wise Purchase Tilmeld
 DocType: Batch,Expiry Date,Udløbsdato
-apps/erpnext/erpnext/stock/doctype/item/item.py +375,"To set reorder level, item must be a Purchase Item or Manufacturing Item","For at indstille genbestille niveau, skal post være et køb Item eller Manufacturing Vare"
+apps/erpnext/erpnext/stock/doctype/item/item.py +379,"To set reorder level, item must be a Purchase Item or Manufacturing Item","For at indstille genbestille niveau, skal post være et køb Item eller Manufacturing Vare"
 ,Supplier Addresses and Contacts,Leverandør Adresser og kontaktpersoner
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,Vælg Kategori først
 apps/erpnext/erpnext/config/projects.py +18,Project master.,Projekt mester.
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,Du må ikke vise nogen symbol ligesom $ etc siden valutaer.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +330, (Half Day),(Halv dag)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +374, (Half Day),(Halv dag)
 DocType: Supplier,Credit Days,Credit Dage
 DocType: Leave Type,Is Carry Forward,Er Carry Forward
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +478,Get Items from BOM,Få elementer fra BOM
@@ -3924,7 +3760,7 @@
 apps/erpnext/erpnext/config/manufacturing.py +120,Bill of Materials,Bill of Materials
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +77,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Række {0}: Party Type og part er nødvendig for Tilgodehavende / Betales konto {1}
 DocType: Dropbox Backup,Send Notifications To,Send meddelelser til
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html +26,Ref Date,Ref Dato
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +54,Ref Date,Ref Dato
 DocType: Employee,Reason for Leaving,Årsag til Leaving
 DocType: Expense Claim Detail,Sanctioned Amount,Sanktioneret Beløb
 DocType: GL Entry,Is Opening,Er Åbning
@@ -3932,4 +3768,3 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +188,Account {0} does not exist,Konto {0} findes ikke
 DocType: Account,Cash,Kontanter
 DocType: Employee,Short biography for website and other publications.,Kort biografi for hjemmesiden og andre publikationer.
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +31,Please create Salary Structure for employee {0},Opret Løn Struktur for medarbejder {0}
diff --git a/erpnext/translations/de.csv b/erpnext/translations/de.csv
index b048baf..25932b6 100644
--- a/erpnext/translations/de.csv
+++ b/erpnext/translations/de.csv
@@ -1,13 +1,12 @@
 DocType: Employee,Salary Mode,Gehaltsmodus
 DocType: Cost Center,"Select Monthly Distribution, if you want to track based on seasonality.","Bitte ""Monatsweise Verteilung"" wählen, wenn saisonbedingt aufgezeichnet werden soll."
 DocType: Employee,Divorced,Geschieden
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +86,Warning: Same item has been entered multiple times.,Warnung: Gleicher Artikel wurde mehrfach eingegeben.
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +80,Warning: Same item has been entered multiple times.,Warnung: Gleicher Artikel wurde mehrfach eingegeben.
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +96,Items already synced,Artikel sind bereits synchronisiert
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,"Zulassen, dass ein Artikel mehrfach in einer Transaktion hinzugefügt werden kann"
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,Materialkontrolle {0} stornieren vor Abbruch dieses Garantieantrags
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +19,Consumer Products,Verbrauchsgüter
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,Verbrauchsgüter
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +68,Please select Party Type first,Bitte zuerst Gruppentyp auswählen
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +90,Annealing,Glühen
 DocType: Item,Customer Items,Kunden-Artikel
 apps/erpnext/erpnext/accounts/doctype/account/account.py +45,Account {0}: Parent account {1} can not be a ledger,Konto {0}: Übergeordnetes Konto {1} kann kein Kontenblatt sein
 DocType: Item,Publish Item to hub.erpnext.com,Artikel über hub.erpnext.com veröffentlichen
@@ -20,15 +19,14 @@
 DocType: About Us Settings,Website,Webseite
 DocType: POS Profile,Applicable for User,Anwendbar für Benutzer
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +169,"Stopped Production Order cannot be cancelled, Unstop it first to cancel",Angehaltener Fertigungsauftrag kann nicht storniert werden. Bitte zuerst den Fertigungsauftrag fortsetzen um ihn dann zu stornieren
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +23,Compaction plus sintering,Verdichtung und Sintern
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,Currency is required for Price List {0},Währung für Preisliste {0} erforderlich
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Wird in der Transaktion berechnet.
 DocType: Purchase Order,Customer Contact,Kundenkontakt
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +549,From Material Request,Von Materialanfrage
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +572,From Material Request,Von Materialanfrage
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} Baumstruktur
 DocType: Job Applicant,Job Applicant,Bewerber
 apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,Keine weiteren Ergebnisse.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +78,Legal,Rechtswesen
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +34,Legal,Rechtswesen
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +114,Actual type tax cannot be included in Item rate in row {0},Tatsächliche Steuerart kann nicht im Artikelpreis in Zeile {0} beinhaltet sein
 DocType: C-Form,Customer,Kunde
 DocType: Purchase Receipt Item,Required By,Benötigt von
@@ -43,16 +41,15 @@
 DocType: Manufacturing Settings,Default 10 mins,Standard 10 Minuten
 DocType: Leave Type,Leave Type Name,Bezeichnung der Abwesenheit
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +148,Series Updated Successfully,Serie erfolgreich aktualisiert
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +150,Stitching,Nähverfahren
 DocType: Pricing Rule,Apply On,Anwenden auf
-DocType: Item Price,Multiple Item prices.,Mehrfach-Artikelpreise.
+DocType: Item Price,Multiple Item prices.,Mehrere verschiedene Artikelpreise
 ,Purchase Order Items To Be Received,Eingehende Lieferantenauftrags-Artikel
 DocType: SMS Center,All Supplier Contact,Alle Lieferantenkontakte
 DocType: Quality Inspection Reading,Parameter,Parameter
 apps/erpnext/erpnext/projects/doctype/project/project.py +43,Expected End Date can not be less than Expected Start Date,Voraussichtliches Enddatum kann nicht vor dem voraussichtlichen Startdatum liegen
 apps/erpnext/erpnext/utilities/transaction_base.py +104,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Zeile #{0}: Preis muss derselbe wie {1}: {2} ({3} / {4}) sein
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +189,New Leave Application,Neuer Urlaubsantrag
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +134,Bank Draft,Bankwechsel
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +204,New Leave Application,Neuer Urlaubsantrag
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +134,Bank Draft,Bankwechsel
 DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,"Diese Option wird verwendet, um die kundenspezifische Artikelnummer zu erhalten und den Artikel aufgrund der Artikelnummer auffindbar zu machen"
 DocType: Mode of Payment Account,Mode of Payment Account,Art des Zahlungskontos
 apps/erpnext/erpnext/stock/doctype/item/item.js +34,Show Variants,Varianten anzeigen
@@ -64,26 +61,24 @@
 DocType: Production Plan Item,Production Plan Item,Artikel auf dem Produktionsplan
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +141,User {0} is already assigned to Employee {1},Benutzer {0} ist bereits Mitarbeiter {1} zugewiesen 
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +13,Make new POS Profile,Neues POS-Profil erstellen
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +31,Health Care,Gesundheitswesen
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,Gesundheitswesen
 DocType: Purchase Invoice,Monthly,Monatlich
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +66,Delay in payment (Days),Zahlungsverzug (Tage)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +494,Invoice,Rechnung
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +519,Invoice,Rechnung
 DocType: Maintenance Schedule Item,Periodicity,Periodizität
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +357,Email Address,E-Mail-Addresse
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +21,Defense,Verteidigung
+apps/erpnext/erpnext/public/js/setup_wizard.js +107,Email Address,E-Mail-Addresse
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,Verteidigung
 DocType: Company,Abbr,Kürzel
 DocType: Appraisal Goal,Score (0-5),Punktzahl (0-5)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +193,Row {0}: {1} {2} does not match with {3},Zeile {0}: {1} {2} stimmt nicht mit {3} überein
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +67,Row # {0}:,Zeile # {0}:
 DocType: Delivery Note,Vehicle No,Fahrzeug-Nr.
 apps/erpnext/erpnext/public/js/pos/pos.js +528,Please select Price List,Bitte eine Preisliste auswählen
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +162,Woodworking,Holzbearbeitung
 DocType: Production Order Operation,Work In Progress,Laufende Arbeit/-en
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +153,3D printing,3D-Druck
-DocType: Employee,Holiday List,Ferienplaner
+DocType: Employee,Holiday List,Urlaubsübersicht
 DocType: Time Log,Time Log,Zeitprotokoll
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +530,Accountant,Buchhalter 
-DocType: Cost Center,Stock User,Lager-Benutzer
+apps/erpnext/erpnext/public/js/setup_wizard.js +274,Accountant,Buchhalter 
+DocType: Cost Center,Stock User,Benutzer Lager
 DocType: Company,Phone No,Telefonnummer
 DocType: Time Log,"Log of Activities performed by users against Tasks that can be used for tracking time, billing.","Protokoll der von Benutzern durchgeführten Aktivitäten bei Aufgaben, die zum Protokollieren von Zeit und zur Rechnungslegung verwendet werden."
 apps/erpnext/erpnext/controllers/recurring_document.py +127,New {0}: #{1},Neu {0}: #{1}
@@ -98,18 +93,19 @@
 DocType: Bin,Quantity Requested for Purchase,Für eine Bestellung angefragte Menge
 DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name",".csv-Datei mit zwei Zeilen, eine für den alten und eine für den neuen Namen, anhängen"
 DocType: Packed Item,Parent Detail docname,Übergeordnetes Detail Dokumentenname
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Kg,kg
-apps/erpnext/erpnext/config/hr.py +48,Opening for a Job.,Stellenausschreibung.
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Kg,kg
+apps/erpnext/erpnext/config/hr.py +48,Opening for a Job.,Stellenausschreibung
 DocType: Item Attribute,Increment,Schrittweite
 apps/erpnext/erpnext/public/js/stock_analytics.js +63,Select Warehouse...,Lager auswählen ...
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +6,Advertising,Werbung
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,Werbung
+apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,Gleichen Firma mehr als einmal eingegeben
 DocType: Employee,Married,Verheiratet
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +389,Stock cannot be updated against Delivery Note {0},Lager kann nicht mit Lieferschein {0} aktualisiert werden
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +391,Stock cannot be updated against Delivery Note {0},Lager kann nicht mit Lieferschein {0} aktualisiert werden
 DocType: Payment Reconciliation,Reconcile,Abgleichen
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +30,Grocery,Lebensmittelgeschäft
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,Lebensmittelgeschäft
 DocType: Quality Inspection Reading,Reading 1,Ablesung 1
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Make Bank Entry,Bankbuchung erstellen
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +40,Pension Funds,Pensionsfonds
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,Pensionsfonds
 apps/erpnext/erpnext/accounts/doctype/account/account.py +142,Warehouse is mandatory if account type is Warehouse,"Angabe des Lagers ist zwingend erforderlich, wenn der Kontotyp ""Lager"" ist"
 DocType: SMS Center,All Sales Person,Alle Vertriebsmitarbeiter
 DocType: Lead,Person Name,Name der Person
@@ -131,7 +127,7 @@
 DocType: Quality Inspection,Get Specification Details,Spezifikationsdetails aufrufen
 DocType: Lead,Interested,Interessiert
 apps/erpnext/erpnext/config/manufacturing.py +14,Bill of Material,Stückliste
-apps/erpnext/erpnext/public/js/stock_analytics.js +45,Opening,Eröffnung
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +158,Opening,Eröffnung
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},Von {0} bis {1}
 DocType: Item,Copy From Item Group,Von Artikelgruppe kopieren
 DocType: Journal Entry,Opening Entry,Eröffnungsbuchung
@@ -145,23 +141,22 @@
 DocType: Employee Education,Under Graduate,Schulabgänger
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +22,Target On,Ziel auf
 DocType: BOM,Total Cost,Gesamtkosten
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +99,Reaming,Gewindeschneiden
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +9,Activity Log:,Aktivitätsprotokoll:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +199,Item {0} does not exist in the system or has expired,Artikel {0} ist nicht im System vorhanden oder abgelaufen
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +44,Real Estate,Immobilien
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +44,Real Estate,Immobilien
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +4,Statement of Account,Kontoauszug
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +41,Pharmaceuticals,Pharmaprodukte
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,Pharmaprodukte
 DocType: Expense Claim Detail,Claim Amount,Betrag einfordern
 DocType: Employee,Mr,Hr.
 DocType: Custom Script,Client,Kunde
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,Lieferantentyp / Lieferant
 DocType: Naming Series,Prefix,Präfix
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Consumable,Verbrauchsgut
+apps/erpnext/erpnext/public/js/setup_wizard.js +359,Consumable,Verbrauchsgut
 DocType: Upload Attendance,Import Log,Importprotokoll
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.js +19,Send,Absenden
 DocType: Sales Invoice Item,Delivered By Supplier,Geliefert von Lieferant
 DocType: SMS Center,All Contact,Alle Kontakte
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +164,Annual Salary,Jahresgehalt
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +164,Annual Salary,Jahresgehalt
 DocType: Period Closing Voucher,Closing Fiscal Year,Abschluss des Geschäftsjahres
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +69,Stock Expenses,Lagerkosten
 DocType: Newsletter,Email Sent?,Wurde die E-Mail abgesendet?
@@ -169,27 +164,25 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +92,Show Time Logs,Zeitprotokolle anzeigen
 DocType: Journal Entry Account,Credit in Company Currency,(Gut)Haben in Unternehmenswährung
 DocType: Delivery Note,Installation Status,Installationsstatus
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +115,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Akzeptierte + abgelehnte Menge muss für diese Position {0} gleich der erhaltenen Menge sein
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +118,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Akzeptierte + abgelehnte Menge muss für diese Position {0} gleich der erhaltenen Menge sein
 DocType: Item,Supply Raw Materials for Purchase,Rohmaterial für Einkauf bereitstellen
 apps/erpnext/erpnext/stock/get_item_details.py +133,Item {0} must be a Purchase Item,Artikel {0} muss ein Kaufartikel sein
 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","Vorlage herunterladen, passende Daten eintragen und geänderte Datei anfügen. Alle Termine und Mitarbeiter-Kombinationen im gewählten Zeitraum werden in die Vorlage übernommen, inklusive der bestehenden Anwesenheitslisten"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +446,Item {0} is not active or end of life has been reached,Artikel {0} ist nicht aktiv oder hat das Ende der Lebensdauer erreicht
-DocType: Time Log Batch,Will be updated after Sales Invoice is Submitted.,"Wird aktualisiert, wenn die Ausgangsrechnung versendet wurde."
-apps/erpnext/erpnext/controllers/accounts_controller.py +493,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Um Steuern im Artikelpreis in Zeile {0} einzubeziehen, müssen Steuern in den Zeilen {1} ebenfalls einbezogen sein"
+DocType: Time Log Batch,Will be updated after Sales Invoice is Submitted.,"Wird aktualisiert, wenn die Ausgangsrechnung übertragen wurde."
+apps/erpnext/erpnext/controllers/accounts_controller.py +494,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Um Steuern im Artikelpreis in Zeile {0} einzubeziehen, müssen Steuern in den Zeilen {1} ebenfalls einbezogen sein"
 apps/erpnext/erpnext/config/hr.py +90,Settings for HR Module,Einstellungen für das Personal-Modul
 DocType: SMS Center,SMS Center,SMS-Center
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +78,Straightening,Begradigung
 DocType: BOM Replace Tool,New BOM,Neue Stückliste
-apps/erpnext/erpnext/config/projects.py +28,Batch Time Logs for billing.,Zeitprotokolle für die Abrechnung bündeln.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +15,Countergravity casting,Gegengravitationsgussverfahren
+apps/erpnext/erpnext/config/projects.py +28,Batch Time Logs for billing.,Zeitprotokolle für die Abrechnung bündeln
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +30,Newsletter has already been sent,Newsletter wurde bereits gesendet
 DocType: Lead,Request Type,Anfragetyp
 DocType: Leave Application,Reason,Grund
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +14,Broadcasting,Rundfunk
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +140,Execution,Ausführung
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +364,The first user will become the System Manager (you can change this later).,Der erste Benutzer wird zum System-Manager (kann später noch geändert werden).
-apps/erpnext/erpnext/config/manufacturing.py +39,Details of the operations carried out.,Details der durchgeführten Arbeitsgänge.
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,Rundfunk
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +140,Execution,Ausführung
+apps/erpnext/erpnext/public/js/setup_wizard.js +114,The first user will become the System Manager (you can change this later).,Der erste Benutzer wird zum System-Manager (kann später noch geändert werden).
+apps/erpnext/erpnext/config/manufacturing.py +39,Details of the operations carried out.,Details der durchgeführten Arbeitsgänge
 DocType: Serial No,Maintenance Status,Wartungsstatus
 apps/erpnext/erpnext/config/stock.py +263,Items and Pricing,Artikel und Preise
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +37,From Date should be within the Fiscal Year. Assuming From Date = {0},"Von-Datum sollte im Geschäftsjahr liegen. Unter der Annahme, Von-Datum = {0}"
@@ -198,33 +191,31 @@
 DocType: Customer,Individual,Einzelperson
 apps/erpnext/erpnext/config/support.py +23,Plan for maintenance visits.,Plan für Wartungsbesuche
 DocType: SMS Settings,Enter url parameter for message,URL-Parameter für Nachricht eingeben
-apps/erpnext/erpnext/config/selling.py +148,Rules for applying pricing and discount.,Regeln für die Anwendung von Preisen und Rabatten.
+apps/erpnext/erpnext/config/selling.py +148,Rules for applying pricing and discount.,Regeln für die Anwendung von Preisen und Rabatten
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +81,This Time Log conflicts with {0} for {1} {2},Dieses Zeitprotokoll steht im Widerspruch mit {0} für {1} {2}
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,Preisliste muss für Einkauf oder Vertrieb gültig sein
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +81,Installation date cannot be before delivery date for Item {0},Installationsdatum kann nicht vor dem Liefertermin für Artikel {0} liegen
 DocType: Pricing Rule,Discount on Price List Rate (%),Rabatt auf die Preisliste (%)
 apps/frappe/frappe/public/js/frappe/form/print.js +96,Start,Start
 DocType: User,First Name,Vorname
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +12,Full-mold casting,Vollformguß
 DocType: Offer Letter,Select Terms and Conditions,Bitte Geschäftsbedingungen auswählen
 DocType: Production Planning Tool,Sales Orders,Kundenaufträge
 DocType: Purchase Taxes and Charges,Valuation,Bewertung
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +17,Set as Default,Als Standard festlegen
 ,Purchase Order Trends,Entwicklung Lieferantenaufträge
-apps/erpnext/erpnext/config/hr.py +78,Allocate leaves for the year.,Urlaube für ein Jahr zuordnen.
+apps/erpnext/erpnext/config/hr.py +78,Allocate leaves for the year.,Urlaube für ein Jahr zuordnen
 DocType: Earning Type,Earning Type,Einkommensart
 DocType: Manufacturing Settings,Disable Capacity Planning and Time Tracking,Kapazitätsplanung und Zeiterfassung deaktivieren
 DocType: Bank Reconciliation,Bank Account,Bankkonto 
 DocType: Leave Type,Allow Negative Balance,Negativen Saldo zulassen
 DocType: Selling Settings,Default Territory,Standardregion
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +53,Television,Fernsehen
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +138,Gashing,Schnitt
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,Fernsehen
 DocType: Production Order Operation,Updated via 'Time Log',"Aktualisiert über ""Zeitprotokoll"""
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +82,Account {0} does not belong to Company {1},Konto {0} gehört nicht zu Firma {1}
 DocType: Naming Series,Series List for this Transaction,Serienliste für diese Transaktion
 DocType: Sales Invoice,Is Opening Entry,Ist Eröffnungsbuchung
 DocType: Customer Group,Mention if non-standard receivable account applicable,"Vermerken, wenn kein Standard-Forderungskonto zutreffend ist"
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +154,For Warehouse is required before Submit,"""Für Lager"" wird vor dem Abschicken benötigt"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +154,For Warehouse is required before Submit,"""Für Lager"" wird vor dem Übertragen benötigt"
 DocType: Sales Partner,Reseller,Wiederverkäufer
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +41,Please enter Company,Bitte Firmenname angeben
 DocType: Delivery Note Item,Against Sales Invoice Item,Zu Ausgangsrechnungs-Position
@@ -233,14 +224,13 @@
 DocType: Leave Allocation,Add unused leaves from previous allocations,Ungenutzten Urlaub von vorherigen Zuteilungen hinzufügen
 apps/erpnext/erpnext/controllers/recurring_document.py +206,Next Recurring {0} will be created on {1},Nächste Wiederholung {0} wird erstellt am {1}
 DocType: Newsletter List,Total Subscribers,Gesamtanzahl der Abonnenten
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +575,Contact Name,Ansprechpartner
-DocType: Production Plan Item,SO Pending Qty,SO Ausstehende Menge
+,Contact Name,Ansprechpartner
+DocType: Production Plan Item,SO Pending Qty,Ausstehende Menge des Auftrags
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Erstellt eine Gehaltsabrechnung gemäß der oben getroffenen Auswahl.
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,Einkaufsanfrage
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +107,Double housing,Doppelgehäuse
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +156,Only the selected Leave Approver can submit this Leave Application,Nur der ausgewählte Urlaubsgenehmiger kann Urlaubsgenehmigungen versenden
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,Entlassungsdatum muss nach dem Einstandsdatum liegen
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +172,Leaves per Year,Abwesenheiten pro Jahr
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +171,Only the selected Leave Approver can submit this Leave Application,Nur der ausgewählte Urlaubsgenehmiger kann Urlaubsgenehmigungen übertragen
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,Freitstellungsdatum muss nach dem Eintrittsdatum liegen
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +172,Leaves per Year,Abwesenheiten pro Jahr
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup > Settings > Naming Series,Bitte die Serienbezeichnung für {0} über Setup > Einstellungen > Serien benamen eingeben
 DocType: Time Log,Will be updated when batched.,"Wird aktualisiert, wenn Stapel erstellt werden."
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +104,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,"Zeile {0}: Wenn es sich um eine Vorkasse-Buchung handelt, bitte ""Ist Vorkasse"" zu Konto {1} anklicken, ."
@@ -249,25 +239,24 @@
 DocType: Item Website Specification,Item Website Specification,Artikel-Webseitenspezifikation
 DocType: Dropbox Backup,Dropbox Access Key,Dropbox-Zugangsschlüssel
 DocType: Payment Tool,Reference No,Referenznr.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +348,Leave Blocked,Urlaub gesperrt
-apps/erpnext/erpnext/stock/doctype/item/item.py +535,Item {0} has reached its end of life on {1},Artikel {0} hat das Ende seiner Lebensdauer erreicht zum Datum {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +392,Leave Blocked,Urlaub gesperrt
+apps/erpnext/erpnext/stock/doctype/item/item.py +539,Item {0} has reached its end of life on {1},Artikel {0} hat das Ende seiner Lebensdauer erreicht zum Datum {1}
 apps/erpnext/erpnext/accounts/utils.py +339,Annual,Jährlich
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Bestandsabgleich-Artikel
 DocType: Stock Entry,Sales Invoice No,Ausgangsrechnungs-Nr.
 DocType: Material Request Item,Min Order Qty,Mindestbestellmenge
 DocType: Lead,Do Not Contact,Nicht Kontakt aufnehmen
-DocType: Sales Invoice,The unique id for tracking all recurring invoices. It is generated on submit.,Die eindeutige ID für die Nachverfolgung aller wiederkehrenden Rechnungen. Wird beim Versand erstellt.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +93,Software Developer,Software-Entwickler
+DocType: Sales Invoice,The unique id for tracking all recurring invoices. It is generated on submit.,Die eindeutige ID für die Nachverfolgung aller wiederkehrenden Rechnungen. Wird beim Übertragen erstellt.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +93,Software Developer,Software-Entwickler
 DocType: Item,Minimum Order Qty,Mindestbestellmenge
 DocType: Pricing Rule,Supplier Type,Lieferantentyp
 DocType: Item,Publish in Hub,Im Hub veröffentlichen
 ,Terretory,Region
-apps/erpnext/erpnext/stock/doctype/item/item.py +555,Item {0} is cancelled,Artikel {0} wird storniert
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +598,Material Request,Materialanfrage
+apps/erpnext/erpnext/stock/doctype/item/item.py +559,Item {0} is cancelled,Artikel {0} wird storniert
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +607,Material Request,Materialanfrage
 DocType: Bank Reconciliation,Update Clearance Date,Tilgungsdatum aktualisieren
 DocType: Item,Purchase Details,Kaufinformationen
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +323,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},"Artikel {0} in Tabelle ""Rohmaterialien geliefert"" der Einkaufsbestellung {1} nicht gefunden"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +129,Wire brushing,Drahtbürsten
 DocType: Employee,Relation,Beziehung
 DocType: Shipping Rule,Worldwide Shipping,Weltweiter Versand
 apps/erpnext/erpnext/config/selling.py +23,Confirmed orders from Customers.,Bestätigte Aufträge von Kunden.
@@ -283,25 +272,22 @@
 DocType: Supplier,Address HTML,Adresse im HTML-Format
 DocType: Lead,Mobile No.,Mobilfunknr.
 DocType: Maintenance Schedule,Generate Schedule,Zeitplan generieren
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +81,Hubbing,Hubbing
 DocType: Purchase Invoice Item,Expense Head,Ausgabenbezeichnung
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +86,Please select Charge Type first,Bitte zuerst Chargentyp auswählen
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,Neueste(r/s)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +395,Max 5 characters,Max 5 Zeichen
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +195,Select Your Language,Bitte Sprache auswählen
+apps/erpnext/erpnext/public/js/setup_wizard.js +143,Max 5 characters,Max 5 Zeichen
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +245,Select Your Language,Bitte Sprache auswählen
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,Der erste Urlaubsgenehmiger auf der Liste wird als standardmäßiger Urlaubsgenehmiger festgesetzt
 DocType: Manufacturing Settings,"Disables creation of time logs against Production Orders.
 Operations shall not be tracked against Production Order",Deaktiviert die Erstellung von Zeitprotokollen für Fertigungsaufträge. Arbeitsgänge sollen nicht für den Fertigungsauftrag mitverfolgt werden.
 DocType: Accounts Settings,Settings for Accounts,Konteneinstellungen
-apps/erpnext/erpnext/config/crm.py +90,Manage Sales Person Tree.,Baumstruktur der Vertriebsmitarbeiter verwalten.
+apps/erpnext/erpnext/config/crm.py +90,Manage Sales Person Tree.,Baumstruktur der Vertriebsmitarbeiter verwalten
 DocType: Item,Synced With Hub,Synchronisiert mit Hub
 apps/erpnext/erpnext/setup/doctype/company/company.js +41,Wrong Password,Falsches Passwort
 DocType: Item,Variant Of,Variante von
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +34,Item {0} must be Service Item,Artikel {0} muss ein Dienstleistungsartikel sein
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +303,Completed Qty can not be greater than 'Qty to Manufacture',"Gefertigte Menge kann nicht größer sein als ""Menge für Herstellung"""
 DocType: DocType,Administrator,Administrator
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +136,Laser drilling,Laserbohren
-DocType: Stock UOM Replace Utility,New Stock UOM,Neue Lagermaßeinheit
 DocType: Period Closing Voucher,Closing Account Head,Bezeichnung des Abschlusskontos
 DocType: Employee,External Work History,Externe Arbeits-Historie
 apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,Zirkelschluss-Fehler
@@ -310,18 +296,15 @@
 DocType: Lead,Industry,Industrie
 DocType: Employee,Job Profile,Stellenbeschreibung
 DocType: Newsletter,Newsletter,Newsletter
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +84,Hydroforming,Hydroformverfahren
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +49,Necking,Querschnittsverminderung
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Bei Erstellung einer automatischen Materialanfrage per E-Mail benachrichtigen
 DocType: Journal Entry,Multi Currency,Mehrfachwährung
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +51,Item is updated,Artikel wird aktualisiert
-DocType: Async Task,System Manager,System-Verantwortlicher
+DocType: Async Task,System Manager,System-Manager
 DocType: Payment Reconciliation Invoice,Invoice Type,Rechnungstyp
 DocType: Sales Invoice Item,Delivery Note,Lieferschein
 DocType: Dropbox Backup,Allow Dropbox Access,Dropbox-Zugang zulassen
 apps/erpnext/erpnext/config/learn.py +72,Setting up Taxes,Steuern einrichten
 apps/erpnext/erpnext/accounts/utils.py +189,Payment Entry has been modified after you pulled it. Please pull it again.,"Zahlungsbuchung wurde geändert, nachdem sie abgerufen wurde. Bitte erneut abrufen."
-apps/erpnext/erpnext/stock/doctype/item/item.py +343,{0} entered twice in Item Tax,{0} in Artikelsteuer doppelt eingegeben 
+apps/erpnext/erpnext/stock/doctype/item/item.py +347,{0} entered twice in Item Tax,{0} in Artikelsteuer doppelt eingegeben 
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +105,Summary for this week and pending activities,Zusammenfassung für diese Woche und anstehende Aktivitäten
 DocType: Workstation,Rent Cost,Mietkosten
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +74,Please select month and year,Bitte Monat und Jahr auswählen
@@ -333,28 +316,26 @@
 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.","Alle mit dem Import verknüpften Felder (wie z. B. Währung, Wechselkurs, Summe Import, Gesamtsumme Import usw.) sind in Kaufbeleg, Lieferantenangebot, Eingangsrechnung, Auftrag usw. verfügbar"
 apps/erpnext/erpnext/stock/doctype/item/item.js +33,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,"Dieser Artikel ist eine Vorlage und kann nicht in Transaktionen verwendet werden. Artikelattribute werden in die Varianten kopiert, es sein denn es wurde ""nicht kopieren"" ausgewählt"
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +69,Total Order Considered,Geschätzte Summe der Bestellungen
-apps/erpnext/erpnext/config/hr.py +110,"Employee designation (e.g. CEO, Director etc.).","Mitarbeiterbezeichnung (z. B. Geschäftsführer, Direktor etc.)."
+apps/erpnext/erpnext/config/hr.py +110,"Employee designation (e.g. CEO, Director etc.).","Mitarbeiterbezeichnung (z. B. Geschäftsführer, Direktor etc.)"
 apps/erpnext/erpnext/controllers/recurring_document.py +199,Please enter 'Repeat on Day of Month' field value,"Bitte Feldwert ""Wiederholung an Tag von Monat"" eingeben"
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,"Kurs, zu dem die Kundenwährung in die Basiswährung des Kunden umgerechnet wird"
 DocType: Features Setup,"Available in BOM, Delivery Note, Purchase Invoice, Production Order, Purchase Order, Purchase Receipt, Sales Invoice, Sales Order, Stock Entry, Timesheet","Verfügbar in Stückliste, Lieferschein, Eingangsrechnung, Fertigungsauftrag, Einkaufsauftrag, Kaufbeleg, Ausgangsrechnung, Kundenauftrag, Lagerbuchung, Zeiterfassung"
 DocType: Item Tax,Tax Rate,Steuersatz
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Select Item,Artikel auswählen
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +540,Select Item,Artikel auswählen
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +143,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry",Der chargenweise verwaltete Artikel: {0} kann nicht mit dem Lager abgeglichen werden. Stattdessen Lagerbuchung verwenden
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +259,Purchase Invoice {0} is already submitted,Eingangsrechnung {0} ist bereits versendet
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +262,Purchase Invoice {0} is already submitted,Eingangsrechnung {0} wurde bereits übertragen
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Batch No must be same as {1} {2},Zeile # {0}: Chargennummer muss dieselbe sein wie {1} {2}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Convert to non-Group,In nicht-Gruppe umwandeln
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +55,Purchase Receipt must be submitted,Kaufbeleg muss versendet werden
-DocType: Stock UOM Replace Utility,Current Stock UOM,Aktuelle Lagermaßeinheit
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +55,Purchase Receipt must be submitted,Kaufbeleg muss übertragen werden
 apps/erpnext/erpnext/config/stock.py +53,Batch (lot) of an Item.,Charge (Los) eines Artikels.
 DocType: C-Form Invoice Detail,Invoice Date,Rechnungsdatum
 DocType: GL Entry,Debit Amount,Soll-Betrag
 apps/erpnext/erpnext/accounts/party.py +223,There can only be 1 Account per Company in {0} {1},Es kann nur EIN Konto pro Unternehmen in {0} {1} geben
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Your email address,Ihre E-Mail-Adresse
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +194,Please see attachment,Bitte Anhang beachten
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +203,Please see attachment,Bitte Anhang beachten
 DocType: Purchase Order,% Received,% erhalten
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +109,Water jet cutting,Wasserstrahlschneideverfahren
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +24,Setup Already Complete!!,Einrichtungsvorgang bereits abgeschlossen!!
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +20,Setup Already Complete!!,Einrichtungsvorgang bereits abgeschlossen!!
 ,Finished Goods,Fertigerzeugnisse
 DocType: Delivery Note,Instructions,Anweisungen
 DocType: Quality Inspection,Inspected By,Geprüft von
@@ -364,11 +345,12 @@
 DocType: Leave Application,Leave Approver Name,Name des Urlaubsgenehmigers
 ,Schedule Date,Geplantes Datum
 DocType: Packed Item,Packed Item,Verpackter Artikel
-apps/erpnext/erpnext/config/buying.py +54,Default settings for buying transactions.,Standardeinstellungen für Einkaufstransaktionen.
-apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +29,Activity Cost exists for Employee {0} against Activity Type - {1},Handlungskosten bestehen für Arbeitnehmer {0} zur Aktivitätsart {1}
+apps/erpnext/erpnext/config/buying.py +54,Default settings for buying transactions.,Standardeinstellungen für Einkaufstransaktionen
+apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +29,Activity Cost exists for Employee {0} against Activity Type - {1},Aktivitätskosten bestehen für Arbeitnehmer {0} zur Aktivitätsart {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.,Bitte KEINE Konten für Kunden und Lieferanten erstellen. Diese werden direkt aus dem Kunden-/Lieferantenstamm erstellt.
 DocType: Currency Exchange,Currency Exchange,Währungs-Umrechnung
 DocType: Purchase Invoice Item,Item Name,Artikelname
+DocType: Authorization Rule,Approving User  (above authorized value),Genehmigen Benutzer (über autorisierte Wert)
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Credit Balance,Guthabenüberschuss
 DocType: Employee,Widowed,Verwitwet
 DocType: Production Planning Tool,"Items to be requested which are ""Out of Stock"" considering all warehouses based on projected qty and minimum order qty","Anzufragende Artikel, die in keinem Lager vorrätig sind, ermittelt auf Basis der prognostizierten und der Mindestbestellmenge"
@@ -378,11 +360,10 @@
 ,Purchase Register,Übersicht über Einkäufe
 DocType: Landed Cost Item,Applicable Charges,Anfallende Gebühren
 DocType: Workstation,Consumable Cost,Verbrauchskosten
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,{0} ({1}) must have role 'Leave Approver',"{0} ({1}) muss die Rolle ""Urlaubsgenehmiger"" haben"
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +167,{0} ({1}) must have role 'Leave Approver',"{0} ({1}) muss die Rolle ""Urlaubsgenehmiger"" haben"
 DocType: Purchase Receipt,Vehicle Date,Fahrzeug-Datum
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +39,Medical,Medizinisch
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +39,Medical,Medizinisch
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,Grund für das Verlieren
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +36,Tube beading,Rohrbiegen
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},Arbeitsplatz ist an folgenden Tagen gemäß der Urlaubsliste geschlossen: {0}
 DocType: Employee,Single,Einzeln
 DocType: Issue,Attachment,Anhang
@@ -403,10 +384,8 @@
 DocType: Account,Is Group,Ist Gruppe
 DocType: Stock Settings,Automatically Set Serial Nos based on FIFO,Automatisch Seriennummern auf Basis FIFO einstellen
 DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,"Aktivieren, damit dieselbe Lieferantenrechnungsnummer nur einmal vorkommen kann"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +31,Thermoforming,Thermoformverfahren
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +66,Slitting,Längstreffverfahren (Schlitzen)
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +57,'To Case No.' cannot be less than 'From Case No.',"""Bis Fall Nr."" kann nicht kleiner als ""Von Fall Nr."" sein"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +104,Non Profit,Gemeinnützig
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +104,Non Profit,Gemeinnützig
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_list.js +7,Not Started,Nicht begonnen
 DocType: Lead,Channel Partner,Vertriebspartner
 DocType: Account,Old Parent,Alte übergeordnetes Element
@@ -415,13 +394,12 @@
 apps/erpnext/erpnext/config/manufacturing.py +74,Global settings for all manufacturing processes.,Allgemeine Einstellungen für alle Fertigungsprozesse.
 DocType: Accounts Settings,Accounts Frozen Upto,Konten gesperrt bis
 DocType: SMS Log,Sent On,Gesendet am
-apps/erpnext/erpnext/stock/doctype/item/item.py +512,Attribute {0} selected multiple times in Attributes Table,Attribut {0} mehrfach in Attributetabelle ausgewäht
+apps/erpnext/erpnext/stock/doctype/item/item.py +516,Attribute {0} selected multiple times in Attributes Table,Attribut {0} mehrfach in Attributetabelle ausgewäht
 DocType: Sales Order,Not Applicable,Nicht anwendbar
-apps/erpnext/erpnext/config/hr.py +140,Holiday master.,Stammdaten zum Urlaub.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +19,Shell molding,Maskenformverfahren
+apps/erpnext/erpnext/config/hr.py +140,Holiday master.,Stammdaten zum Urlaub
 DocType: Material Request Item,Required Date,Angefragtes Datum
 DocType: Delivery Note,Billing Address,Rechnungsadresse 
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +644,Please enter Item Code.,Bitte die Artikelnummer eingeben
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +648,Please enter Item Code.,Bitte die Artikelnummer eingeben
 DocType: BOM,Costing,Kalkulation
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount","Wenn aktiviert, wird der Steuerbetrag als bereits in den Druckkosten enthalten erachtet."
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,Gesamtmenge
@@ -431,7 +409,7 @@
 DocType: Item Attribute,To Range,Bis-Bereich
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Wertpapiere und Einlagen
 DocType: Features Setup,Imports,Importe
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +144,Adhesive bonding,Kleben
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +77,Total leaves allocated is mandatory,Blättern Gesamt zugeordnet ist obligatorisch
 DocType: Job Opening,Description of a Job Opening,Beschreibung eines Stellenangebot
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +102,Pending activities for today,Ausstehende Aktivitäten für heute
 apps/erpnext/erpnext/config/hr.py +28,Attendance record.,Anwesenheitsnachweis 
@@ -439,17 +417,16 @@
 DocType: Sales Order Item,Used for Production Plan,Wird für den Produktionsplan verwendet
 DocType: System Settings,Loading...,Wird geladen ...
 DocType: DocField,Password,Passwort
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +155,Fused deposition modeling,Schmelzschichtung
 DocType: Manufacturing Settings,Time Between Operations (in mins),Zeit zwischen den Arbeitsgängen (in Minuten)
 DocType: Customer,Buyer of Goods and Services.,Käufer von Waren und Dienstleistungen.
 DocType: Journal Entry,Accounts Payable,Verbindlichkeiten
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +24,Add Subscribers,Abonnenten hinzufügen
 apps/erpnext/erpnext/public/js/feature_setup.js +220,""" does not exists",""" Existiert nicht"
 DocType: Pricing Rule,Valid Upto,Gültig bis
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +564,List a few of your customers. They could be organizations or individuals.,Bitte ein paar Kunden angeben. Dies können Firmen oder Einzelpersonen sein.
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,List a few of your customers. They could be organizations or individuals.,Bitte ein paar Kunden angeben. Dies können Firmen oder Einzelpersonen sein.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Direct Income,Direkte Erträge
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +33,"Can not filter based on Account, if grouped by Account","Wenn nach Konto gruppiert wurde, kann nicht auf Grundlage des Kontos gefiltert werden."
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +88,Administrative Officer,"Administrativer Benutzer
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Administrative Officer,"Administrativer Benutzer
 "
 DocType: Payment Tool,Received Or Paid,Erhalten oder bezahlt
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +318,Please select Company,Bitte Firma auswählen
@@ -457,9 +434,9 @@
 apps/erpnext/erpnext/projects/doctype/task/task.py +44,Cannot close task as its dependant task {0} is not closed.,"Aufgabe kann nicht geschlossen werden, da die von ihr abhängige Aufgabe {0} nicht geschlossen ist."
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +305,Please enter Warehouse for which Material Request will be raised,"Bitte das Lager eingeben, für das eine Materialanfrage erhoben wird"
 DocType: Production Order,Additional Operating Cost,Zusätzliche Betriebskosten
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +20,Cosmetics,Kosmetika
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,Kosmetika
 DocType: DocField,Type,Typ
-apps/erpnext/erpnext/stock/doctype/item/item.py +417,"To merge, following properties must be same for both items","Um zwei Produkte zusammenzuführen, müssen folgende Eigenschaften für beide Produkte gleich sein"
+apps/erpnext/erpnext/stock/doctype/item/item.py +421,"To merge, following properties must be same for both items","Um zwei Produkte zusammenzuführen, müssen folgende Eigenschaften für beide Produkte gleich sein"
 DocType: Communication,Subject,Betreff
 DocType: Shipping Rule,Net Weight,Nettogewicht
 DocType: Employee,Emergency Phone,Notruf
@@ -469,7 +446,6 @@
 DocType: Journal Entry,Difference (Dr - Cr),Differenz (Soll - Haben)
 DocType: Account,Profit and Loss,Gewinn und Verlust
 apps/erpnext/erpnext/config/stock.py +293,Managing Subcontracting,Unterbeauftragung verwalten
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +58,New UOM must NOT be of type Whole Number,Neue Maßeinheit darf NICHT vom Typ ganze Zahl sein
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Furniture and Fixture,Möbel und Anbauteile
 DocType: Quotation,Rate at which Price list currency is converted to company's base currency,"Kurs, zu dem die Währung der Preisliste in die Basiswährung des Unternehmens umgerechnet wird"
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Account {0} does not belong to company: {1},Konto {0} gehört nicht zu Firma: {1}
@@ -489,14 +465,14 @@
 DocType: Purchase Invoice,Supplier Invoice No,Lieferantenrechnungsnr.
 DocType: Territory,For reference,Zu Referenzzwecken
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +154,"Cannot delete Serial No {0}, as it is used in stock transactions","Die Seriennummer {0} kann nicht gelöscht werden, da sie in Lagertransaktionen verwendet wird"
-apps/erpnext/erpnext/public/js/account_tree_grid.js +52,Closing (Cr),Schlußstand (Haben)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +227,Closing (Cr),Schlußstand (Haben)
 DocType: Serial No,Warranty Period (Days),Gewährleistungsfrist (Tage)
 DocType: Installation Note Item,Installation Note Item,Bestandteil des Installationshinweises
 ,Pending Qty,Ausstehend Menge
 DocType: Job Applicant,Thread HTML,Thread HTML
 DocType: Company,Ignore,Ignorieren
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +86,SMS sent to following numbers: {0},SMS an folgende Nummern versendet: {0} 
-apps/erpnext/erpnext/controllers/buying_controller.py +135,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Lieferantenlager notwendig für Kaufbeleg aus Unteraufträgen
+apps/erpnext/erpnext/controllers/buying_controller.py +126,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Lieferantenlager notwendig für Kaufbeleg aus Unteraufträgen
 DocType: Pricing Rule,Valid From,Gültig ab
 DocType: Sales Invoice,Total Commission,Gesamtprovision
 DocType: Pricing Rule,Sales Partner,Vertriebspartner
@@ -505,7 +481,7 @@
 
 To distribute a budget using this distribution, set this **Monthly Distribution** in the **Cost Center**","""Monatsweise Verteilung"" hilft dabei das Budget über Monate zu verteilen, wenn es im Unternehmen saisonale Einflüsse gibt.
 Um ein Budget auf diese Art zu verteilen, ""monatsweise Verteilung"" bei ""Kostenstelle"" einstellen"
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +183,No records found in the Invoice table,Keine Datensätze in der Rechnungstabelle gefunden
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +130,No records found in the Invoice table,Keine Datensätze in der Rechnungstabelle gefunden
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +20,Please select Company and Party Type first,Bitte zuerst Firma und Gruppentyp auswählen
 apps/erpnext/erpnext/config/accounts.py +84,Financial / accounting year.,Finanz-/Rechnungsjahr
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","Verzeihung! Seriennummern können nicht zusammengeführt werden,"
@@ -515,31 +491,31 @@
 DocType: C-Form Invoice Detail,Grand Total,Gesamtbetrag
 DocType: About Us Settings,Website Manager,Webseiten-Administrator
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +34,Fiscal Year Start Date should not be greater than Fiscal Year End Date,Das Startdatum des Geschäftsjahres sollte nicht nach dem Enddatum des Gschäftsjahres liegen
-DocType: Warranty Claim,Resolution,Auflösung
+DocType: Warranty Claim,Resolution,Beschluss
 apps/erpnext/erpnext/templates/pages/order.html +51,Delivered: {0},Geliefert: {0}
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +66,Payable Account,Verbindlichkeiten-Konto
 DocType: Sales Order,Billing and Delivery Status,Abrechnungs- und Lieferstatus
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Kunden wiederholen
 DocType: Leave Control Panel,Allocate,Zuweisen
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +16,Previous,Vorhergehende
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard_page.html +16,Previous,Vorhergehende
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +620,Sales Return,Umsatzrendite
 DocType: Production Planning Tool,Select Sales Orders from which you want to create Production Orders.,"Kundenaufträge auswählen, aus denen Fertigungsaufträge erstellt werden sollen."
 DocType: Item,Delivered by Supplier (Drop Ship),Geliefert von Lieferant (Direktlieferung)
 apps/erpnext/erpnext/config/hr.py +120,Salary components.,Gehaltskomponenten
-apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,Datenbank von potentiellen Kunden.
+apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,Datenbank von potentiellen Kunden
+DocType: Authorization Rule,Customer or Item,Kunden- oder Artikel
 apps/erpnext/erpnext/config/crm.py +17,Customer database.,Kundendatenbank
 DocType: Quotation,Quotation To,Angebot für
 DocType: Lead,Middle Income,Mittleres Einkommen
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),Anfangssstand (Haben)
 apps/erpnext/erpnext/accounts/utils.py +193,Allocated amount can not be negative,Zugewiesene Menge kann nicht negativ sein
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +123,Tumbling,Stürzen
 DocType: Purchase Order Item,Billed Amt,Rechnungsbetrag 
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,Ein logisches Lager zu dem Lagerbuchungen gemacht werden.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +92,Reference No & Reference Date is required for {0},Referenznr. & Referenz-Tag sind erforderlich für {0}
 DocType: Event,Wednesday,Mittwoch
 DocType: Sales Invoice,Customer's Vendor,Kundenlieferant
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +214,Production Order is Mandatory,Fertigungsauftrag ist zwingend erforderlich
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +139,Proposal Writing,Verfassen von Angeboten
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,Proposal Writing,Verfassen von Angeboten
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,Ein weiterer Vertriebsmitarbeiter {0} existiert bereits mit der gleichen Mitarbeiter ID
 apps/erpnext/erpnext/stock/stock_ledger.py +336,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},Fehler aufgrund negativen Lagerbestands ({6}) für Artikel {0} im Lager {1} auf {2} {3} in {4} {5}
 DocType: Fiscal Year Company,Fiscal Year Company,Geschäftsjahr Firma
@@ -551,7 +527,7 @@
 DocType: Employee,Organization Profile,Firmenprofil
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +90,Please setup numbering series for Attendance via Setup > Numbering Series,Bitte Seriennummerierung für Anwesenheiten über Setup > Seriennummerierung einstellen
 DocType: Employee,Reason for Resignation,Kündigungsgrund
-apps/erpnext/erpnext/config/hr.py +150,Template for performance appraisals.,Vorlage für Mitarbeiterbeurteilungen.
+apps/erpnext/erpnext/config/hr.py +150,Template for performance appraisals.,Vorlage für Mitarbeiterbeurteilungen
 DocType: Payment Reconciliation,Invoice/Journal Entry Details,Einzelheiten zu Rechnungs-/Journalbuchungen
 apps/erpnext/erpnext/accounts/utils.py +53,{0} '{1}' not in Fiscal Year {2},{0} ' {1}' nicht im Geschäftsjahr {2}
 DocType: Buying Settings,Settings for Buying Module,Einstellungen für Einkaufsmodul
@@ -562,7 +538,7 @@
 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.","Dann werden Preisregeln bezogen auf Kunde, Kundengruppe, Region, Lieferant, Lieferantentyp, Kampagne, Vertriebspartner usw. ausgefiltert"
 apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.py +179,Please install dropbox python module,Bitte das Dropbox-Python-Modul installieren
 DocType: Employee,Passport Number,Passnummer
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +82,Manager,Leiter
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Manager,Leiter
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +494,From Purchase Receipt,Von Kaufbeleg
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +219,Same item has been entered multiple times.,Gleicher Artikel wurde mehrfach eingetragen.
 DocType: SMS Settings,Receiver Parameter,Empfängerparameter
@@ -570,23 +546,22 @@
 DocType: Sales Person,Sales Person Targets,Ziele für Vertriebsmitarbeiter
 apps/frappe/frappe/public/js/frappe/form/workflow.js +116,To,An
 apps/frappe/frappe/templates/base.html +145,Please enter email address,Bitte eine E-Mail-Adresse angeben
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +35,End tube forming,Abschliessende Rohrbearbeitung
 DocType: Production Order Operation,In minutes,In Minuten
 DocType: Issue,Resolution Date,Beschluss-Datum
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +635,Please set default Cash or Bank account in Mode of Payment {0},"Bitte Standardeinstellungen für Kassen- oder Bankkonto in ""Zahlungsart"" {0} setzen"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +637,Please set default Cash or Bank account in Mode of Payment {0},"Bitte Standardeinstellungen für Kassen- oder Bankkonto in ""Zahlungsart"" {0} setzen"
 DocType: Selling Settings,Customer Naming By,Benennung der Kunden nach
 apps/erpnext/erpnext/accounts/doctype/account/account.js +67,Convert to Group,In Gruppe umwandeln
 DocType: Activity Cost,Activity Type,Aktivitätsart
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +47,Delivered Amount,Gelieferte Menge
 DocType: Customer,Fixed Days,Stichtage
 DocType: Sales Invoice,Packing List,Packliste
-apps/erpnext/erpnext/config/buying.py +28,Purchase Orders given to Suppliers.,An Lieferanten weitergegebene Lieferantenaufträge.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +43,Publishing,Veröffentlichung
-DocType: Activity Cost,Projects User,Projektanwender
+apps/erpnext/erpnext/config/buying.py +28,Purchase Orders given to Suppliers.,An Lieferanten erteilte Lieferantenaufträge
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +43,Publishing,Veröffentlichung
+DocType: Activity Cost,Projects User,Nutzer Projekt
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Consumed,Verbraucht
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +198,{0}: {1} not found in Invoice Details table,{0}: {1} nicht in der Rechnungs-Details-Tabelle gefunden
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,{0}: {1} not found in Invoice Details table,{0}: {1} nicht in der Rechnungs-Details-Tabelle gefunden
 DocType: Company,Round Off Cost Center,Abschluss-Kostenstelle
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +208,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Wartungsbesuch {0} muss vor Stornierung dieses Kundenauftrages abgebrochen werden
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +203,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Wartungsbesuch {0} muss vor Stornierung dieses Kundenauftrages abgebrochen werden
 DocType: Material Request,Material Transfer,Materialübertrag
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +56,Opening (Dr),Anfangsstand (Soll)
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},Buchungszeitstempel muss nach {0} liegen
@@ -598,7 +573,6 @@
 DocType: Pricing Rule,Sales Manager,Vertriebsleiter
 apps/frappe/frappe/public/js/frappe/model/model.js +492,Rename,Umbenennen
 DocType: Journal Entry,Write Off Amount,Abschreibungs-Betrag
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +52,Bending,Beugung
 apps/frappe/frappe/core/page/user_permissions/user_permissions.js +246,Allow User,Benutzer zulassen
 DocType: Journal Entry,Bill No,Rechnungsnr. 
 DocType: Purchase Invoice,Quarterly,Quartalsweise
@@ -608,17 +582,16 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Please enter item details,Bitte Artikel-Details angeben
 DocType: Purchase Receipt,Other Details,Sonstige Einzelheiten
 DocType: Account,Accounts,Rechnungswesen 
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +67,Marketing,Marketing
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +65,Straight shearing,Direktscheren
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +67,Marketing,Marketing
 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.,"Wird verwendet, um einen Artikel in Einkaufs-und Verkaufsdokumenten auf der Grundlage ihrer Seriennummern nachzuverfolgen. Diese Funktion kann auch verwendet werden, um die Einzelheiten zum Garantiefall des Produktes mit zu protokollieren."
 DocType: Purchase Receipt Item Supplied,Current Stock,Aktueller Lagerbestand
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +99,Rejected Warehouse is mandatory against regected item,Ausschusslager ist zwingend erfoderlich für Ausschuss-Artikel
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +102,Rejected Warehouse is mandatory against regected item,Ausschusslager ist zwingend erfoderlich für Ausschuss-Artikel
 DocType: Account,Expenses Included In Valuation,In der Bewertung enthaltene Aufwendungen
 DocType: Employee,Provide email id registered in company,Geben Sie die in der Firma registrierte E-Mail-ID an
 DocType: Hub Settings,Seller City,Stadt des Verkäufers
 DocType: Email Digest,Next email will be sent on:,Nächste E-Mail wird gesendet am:
 DocType: Offer Letter Term,Offer Letter Term,Gültigkeit des Angebotsschreibens
-apps/erpnext/erpnext/stock/doctype/item/item.py +492,Item has variants.,Artikel hat Varianten.
+apps/erpnext/erpnext/stock/doctype/item/item.py +496,Item has variants.,Artikel hat Varianten.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Artikel {0} nicht gefunden
 DocType: Bin,Stock Value,Lagerwert
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,Struktur-Typ
@@ -627,10 +600,9 @@
 DocType: Material Request Item,Quantity and Warehouse,Menge und Lager
 DocType: Sales Invoice,Commission Rate (%),Provisionssatz (%)
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +172,"Against Voucher Type must be one of Sales Order, Sales Invoice or Journal Entry","""Gegenbeleg"" muss entweder ein Kundenauftrag, eine Einkaufsrechnung oder eine Journalbuchung sein"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +139,Biomachining,Biologische Bearbeitung
 apps/erpnext/erpnext/setup/utils.py +89,Unable to find exchange rate,Nicht in der Lage Wechselkurs finden
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +7,Aerospace,Luft- und Raumfahrt
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +19,Welcome,Willkommen
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +7,Aerospace,Luft- und Raumfahrt
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +40,Welcome,Willkommen
 DocType: Journal Entry,Credit Card Entry,Kreditkarten-Buchung
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +18,Task Subject,Aufgaben-Betreff
 apps/erpnext/erpnext/config/stock.py +33,Goods received from Suppliers.,Von Lieferanten erhaltene Ware.
@@ -638,7 +610,7 @@
 DocType: Lead,Campaign Name,Kampagnenname
 ,Reserved,Reserviert
 DocType: Purchase Order,Supply Raw Materials,Rohmaterial bereitstellen
-DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,"Das Datum, an dem die nächste Rechnung erstellt wird. Erstellung erfolgt beim Versand."
+DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,"Das Datum, an dem die nächste Rechnung erstellt wird. Erstellung erfolgt beim Übertragen."
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,Umlaufvermögen
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +92,{0} is not a stock Item,{0} ist kein Lagerartikel
 DocType: Mode of Payment Account,Default Account,Standardkonto
@@ -653,21 +625,21 @@
 DocType: Employee,Cell Number,Mobiltelefonnummer
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Verloren
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +120,You can not enter current voucher in 'Against Journal Entry' column,"Momentan können keine Belege in die Spalte ""Zu Journalbuchung"" eingegeben werden"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +25,Energy,Energie
-DocType: Opportunity,Opportunity From,Möglichkeit von
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,Energie
+DocType: Opportunity,Opportunity From,Opportunity von
 apps/erpnext/erpnext/config/hr.py +33,Monthly salary statement.,Monatliche Gehaltsabrechnung
 DocType: Item Group,Website Specifications,Webseiten-Spezifikationen
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +205,New Account,Neues Konto
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +21,{0}: From {0} of type {1},{0}: Von {0} vom Typ {1}
-apps/erpnext/erpnext/controllers/buying_controller.py +283,Row {0}: Conversion Factor is mandatory,Row {0}: Umrechnungsfaktor ist zwingend erfoderlich
+apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,Row {0}: Umrechnungsfaktor ist zwingend erfoderlich
 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.,Buchungen können zu Unterknoten erfolgen. Buchungen zu Gruppen sind nicht erlaubt.
 DocType: ToDo,High,Hoch
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +361,Cannot deactivate or cancel BOM as it is linked with other BOMs,"Stückliste kann nicht deaktiviert oder storniert werden, weil sie mit anderen Stücklisten verknüpft ist"
 DocType: Opportunity,Maintenance,Wartung
 DocType: User,Male,Männlich
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +182,Purchase Receipt number required for Item {0},Kaufbelegnummer ist für Artikel {0} erforderlich
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +183,Purchase Receipt number required for Item {0},Kaufbelegnummer ist für Artikel {0} erforderlich
 DocType: Item Attribute Value,Item Attribute Value,Attributwert des Artikels
-apps/erpnext/erpnext/config/crm.py +64,Sales campaigns.,Vertriebskampagnen.
+apps/erpnext/erpnext/config/crm.py +64,Sales campaigns.,Vertriebskampagnen
 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
@@ -713,10 +685,9 @@
 DocType: Address,Personal,Persönlich
 DocType: Expense Claim Detail,Expense Claim Type,Art der Aufwandsabrechnung
 DocType: Shopping Cart Settings,Default settings for Shopping Cart,Standardeinstellungen für den Warenkorb
-apps/erpnext/erpnext/controllers/accounts_controller.py +324,"Journal Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Journalbuchung {0} ist mit Bestellung {1} verknüpft. Bitte prüfen, ob in dieser Rechnung ""Vorkasse"" angedruckt werden soll."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +13,Biotechnology,Biotechnologie
+apps/erpnext/erpnext/controllers/accounts_controller.py +325,"Journal Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Journalbuchung {0} ist mit Bestellung {1} verknüpft. Bitte prüfen, ob in dieser Rechnung ""Vorkasse"" angedruckt werden soll."
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +13,Biotechnology,Biotechnologie
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Office Maintenance Expenses,Büro-Wartungskosten
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +53,Hemming,Säumen
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +66,Please enter Item first,Bitte zuerst den Artikel angeben
 DocType: Account,Liability,Haftung
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +62,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Genehmigter Betrag kann nicht größer als geforderter Betrag in Zeile {0} sein.
@@ -729,10 +700,10 @@
 DocType: Company,Default Bank Account,Standardbankkonto
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +47,"To filter based on Party, select Party Type first","Um auf der Grundlage von Gruppen zu filtern, bitte zuerst den Gruppentyp wählen"
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},"""Lager aktualisieren"" kann nicht ausgewählt werden, da Artikel nicht über {0} geliefert wurden"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Nos,Stk
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Nos,Stk
 DocType: Item,Items with higher weightage will be shown higher,Artikel mit höherem Gewicht werden weiter oben angezeigt
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Ausführlicher Kontenabgleich
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +627,My Invoices,Meine Rechnungen
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +629,My Invoices,Meine Rechnungen
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,Kein Mitarbeiter gefunden
 DocType: Purchase Order,Stopped,Angehalten
 DocType: Item,If subcontracted to a vendor,Wenn an einen Zulieferer untervergeben
@@ -751,35 +722,33 @@
 DocType: Features Setup,"To enable ""Point of Sale"" features","Um ""Point of Sale""-Funktionen zu aktivieren"
 DocType: Bin,Moving Average Rate,Wert für den Gleitenden Durchschnitt
 DocType: Production Planning Tool,Select Items,Artikel auswählen
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,{0} against Bill {1} dated {2},{0} zu Rechnung {1} ​​vom {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +328,{0} against Bill {1} dated {2},{0} zu Rechnung {1} ​​vom {2}
 DocType: Comment,Reference Name,Referenzname
 DocType: Maintenance Visit,Completion Status,Fertigstellungsstatus
 DocType: Sales Invoice Item,Target Warehouse,Eingangslager
 DocType: Item,Allow over delivery or receipt upto this percent,Überlieferung bis zu diesem Prozentsatz zulassen
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +49,Expected Delivery Date cannot be before Sales Order Date,Voraussichtlicher Liefertermin kann nicht vor dem Datum des Kundenauftrags liegen
 DocType: Upload Attendance,Import Attendance,Import von Anwesenheiten
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +17,All Item Groups,Alle Artikelgruppen
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +17,All Item Groups,Alle Artikelgruppen
 DocType: Process Payroll,Activity Log,Aktivitätsprotokoll
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +30,Net Profit / Loss,Nettogewinn/-verlust
 apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,Automatisch beim Versand von Transaktionen Mitteilung verfassen.
 DocType: Production Order,Item To Manufacture,Zu fertigender Artikel
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +16,Permanent mold casting,Kokillengussverfahren
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} Status ist {2}
 apps/erpnext/erpnext/config/learn.py +172,Purchase Order to Payment,Bestellung an Zahlungs
 DocType: Sales Order Item,Projected Qty,Voraussichtliche Menge
 DocType: Sales Invoice,Payment Due Date,Zahlungsstichtag
 DocType: Newsletter,Newsletter Manager,Newsletter-Manager
-apps/erpnext/erpnext/stock/doctype/item/item.js +229,Item Variant {0} already exists with same attributes,Artikelvariante {0} mit denselben Attributen existiert bereits
+apps/erpnext/erpnext/stock/doctype/item/item.js +231,Item Variant {0} already exists with same attributes,Artikelvariante {0} mit denselben Attributen existiert bereits
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening',"""Eröffnung"""
 DocType: Notification Control,Delivery Note Message,Lieferschein-Nachricht
 DocType: Expense Claim,Expenses,Ausgaben
 DocType: Item Variant Attribute,Item Variant Attribute,Artikelvariantenattribut
 ,Purchase Receipt Trends,Trandanalyse Kaufbelege
 DocType: Appraisal,Select template from which you want to get the Goals,"Vorlage auswählen, von der Sie die Ziele abrufen möchten"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +77,Research & Development,Forschung & Entwicklung
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Research & Development,Forschung & Entwicklung
 ,Amount to Bill,Rechnungsbetrag
 DocType: Company,Registration Details,Details zur Registrierung
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +75,Staking,Absteckung
 DocType: Item,Re-Order Qty,Nachbestellmenge
 DocType: Leave Block List Date,Leave Block List Date,Urlaubssperrenliste Datum
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +25,Scheduled to send to {0},Geplant zum Versand an {0}
@@ -790,18 +759,16 @@
 DocType: Sales Invoice Item,Stock Details,Lagerinformationen
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Projektwert
 apps/erpnext/erpnext/config/selling.py +304,Point-of-Sale,Verkaufsstelle
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,Cannot carry forward {0},{0} kann nicht fortgeschrieben werden
 apps/erpnext/erpnext/accounts/doctype/account/account.py +91,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","Konto bereits im Haben, es ist nicht mehr möglich das Konto als Sollkonto festzulegen "
 DocType: Account,Balance must be,Saldo muss sein
 DocType: Hub Settings,Publish Pricing,Preise veröffentlichen
 DocType: Notification Control,Expense Claim Rejected Message,Benachrichtigung über abgelehnte Aufwandsabrechnung
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +145,Nailing,Nagelung
 ,Available Qty,Verfügbare Menge 
 DocType: Purchase Taxes and Charges,On Previous Row Total,Auf vorherige Zeilensumme
 DocType: Salary Slip,Working Days,Arbeitstage
 DocType: Serial No,Incoming Rate,Eingangsbewertung
 DocType: Packing Slip,Gross Weight,Bruttogewicht
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +410,The name of your company for which you are setting up this system.,"Name der Firma, für die dieses System eingerichtet wird."
+apps/erpnext/erpnext/public/js/setup_wizard.js +158,The name of your company for which you are setting up this system.,"Name der Firma, für die dieses System eingerichtet wird."
 DocType: HR Settings,Include holidays in Total no. of Working Days,Urlaub in die Gesamtzahl der Arbeitstage mit einbeziehen
 DocType: Job Applicant,Hold,Anhalten
 DocType: Employee,Date of Joining,Eintrittsdatum
@@ -811,9 +778,8 @@
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +3,View Subscribers,Abonnenten anzeigen
 DocType: Purchase Invoice Item,Purchase Receipt,Kaufbeleg
 ,Received Items To Be Billed,"Empfangene Artikel, die in Rechnung gestellt werden"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +114,Abrasive blasting,Schleifstrahlen
 DocType: Employee,Ms,Fr.
-apps/erpnext/erpnext/config/accounts.py +148,Currency exchange rate master.,Stammdaten zur Währungsumrechnung.
+apps/erpnext/erpnext/config/accounts.py +148,Currency exchange rate master.,Stammdaten zur Währungsumrechnung
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +253,Unable to find Time Slot in the next {0} days for Operation {1},In den nächsten {0} Tagen kann für den Arbeitsgang {1} kein Zeitfenster gefunden werden
 DocType: Production Order,Plan material for sub-assemblies,Materialplanung für Unterbaugruppen
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +426,BOM {0} must be active,Stückliste {0} muss aktiv sein
@@ -823,7 +789,7 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +209,Serial No {0} does not belong to Item {1},Seriennummer {0} gehört nicht zu Artikel {1}
 DocType: Purchase Receipt Item Supplied,Required Qty,Erforderliche Anzahl
 DocType: Bank Reconciliation,Total Amount,Gesamtsumme
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +32,Internet Publishing,Veröffentlichung im Internet
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,Veröffentlichung im Internet
 DocType: Production Planning Tool,Production Orders,Fertigungsaufträge
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +35,Balance Value,Bilanzwert
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,Verkaufspreisliste
@@ -834,7 +800,7 @@
 DocType: Supplier,Default Payable Accounts,Standard-Verbindlichkeitenkonten
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,Mitarbeiter {0} ist nicht aktiv oder existiert nicht
 DocType: Features Setup,Item Barcode,Artikelstrichcode
-apps/erpnext/erpnext/stock/doctype/item/item.py +487,Item Variants {0} updated,Artikelvarianten {0} aktualisiert
+apps/erpnext/erpnext/stock/doctype/item/item.py +491,Item Variants {0} updated,Artikelvarianten {0} aktualisiert
 DocType: Quality Inspection Reading,Reading 6,Ablesung 6
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Eingangsrechnung Vorkasse
 DocType: Address,Shop,Laden
@@ -843,9 +809,9 @@
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,"Standard Bank-/Geldkonto wird automatisch in Kassenbon aktualisiert, wenn dieser Modus ausgewählt ist."
 DocType: Employee,Permanent Address Is,Feste Adresse ist
 DocType: Production Order Operation,Operation completed for how many finished goods?,Für wie viele fertige Erzeugnisse wurde der Arbeitsgang abgeschlossen?
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +491,The Brand,Die Marke
+apps/erpnext/erpnext/public/js/setup_wizard.js +237,The Brand,Die Marke
 apps/erpnext/erpnext/controllers/status_updater.py +163,Allowance for over-{0} crossed for Item {1}.,Zustimmung für Artikel {1} bei Überschreitung von {0}.
-DocType: Employee,Exit Interview Details,Befragungs-Details verlassen
+DocType: Employee,Exit Interview Details,Details zum Austrittsgespräch
 DocType: Item,Is Purchase Item,Ist Einkaufsartikel
 DocType: Journal Entry Account,Purchase Invoice,Eingangsrechnung
 DocType: Stock Ledger Entry,Voucher Detail No,Belegdetail-Nr.
@@ -863,16 +829,16 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Indirect Income,Indirekte Erträge
 DocType: Payment Tool,Set Payment Amount = Outstanding Amount,"""Zahlungsbetrag = Ausstehender Betrag"" setzen"
 DocType: Contact Us Settings,Address Line 1,Adresse Zeile 1
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Variance,Abweichung
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +392,Company Name,Firmenname
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +53,Variance,Abweichung
+,Company Name,Firmenname
 DocType: SMS Center,Total Message(s),Summe Nachricht(en)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +515,Select Item for Transfer,Artikel für Übertrag auswählen
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +538,Select Item for Transfer,Artikel für Übertrag auswählen
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,Sehen Sie eine Liste aller Hilfe-Videos
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,"Bezeichnung des Kontos bei der Bank, bei der der Scheck eingereicht wurde, auswählen."
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,"Benutzer erlauben, die Preisliste in Transaktionen zu bearbeiten"
 DocType: Pricing Rule,Max Qty,Max Menge
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +106,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,"Zeile {0}: ""Zahlung zu Verkaufs-/Einkaufs-Bestellung"" sollte immer als ""Vorkasse"" eingestellt werden"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +16,Chemical,Chemische Industrie
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,Chemische Industrie
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +693,All items have already been transferred for this Production Order.,Alle Artikel wurden schon für diesen Fertigungsauftrag übernommen.
 DocType: Process Payroll,Select Payroll Year and Month,Jahr und Monat der Gehaltsabrechnung auswählen
 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""","Zur entsprechenden Gruppe gehen (normalerweise ""Mittelverwendung"" > ""Umlaufvermögen""  > ""Bankkonten"") und durck Klicken auf ""Unterpunkt hinzufügen"" ein neues Konto vom Typ ""Bank"" erstellen"
@@ -883,12 +849,12 @@
 DocType: Item,Inspection Criteria,Prüfkriterien
 apps/erpnext/erpnext/config/accounts.py +101,Tree of finanial Cost Centers.,Finanz-Kostenstellen-Struktur
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,Übergeben
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +492,Upload your letter head and logo. (you can edit them later).,Briefkopf und Logo hochladen. (Beides kann später noch bearbeitet werden.)
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +156,White,Weiß
+apps/erpnext/erpnext/public/js/setup_wizard.js +238,Upload your letter head and logo. (you can edit them later).,Briefkopf und Logo hochladen. (Beides kann später noch bearbeitet werden.)
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,White,Weiß
 DocType: SMS Center,All Lead (Open),Alle Leads (offen)
 DocType: Purchase Invoice,Get Advances Paid,Gezahlte Anzahlungen aufrufen
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +362,Attach Your Picture,Eigenes Bild anhängen
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Make ,Erstellen
+apps/erpnext/erpnext/public/js/setup_wizard.js +112,Attach Your Picture,Eigenes Bild anhängen
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +540,Make ,Erstellen
 DocType: Journal Entry,Total Amount in Words,Gesamtsumme in Worten
 DocType: Workflow State,Stop,Anhalten
 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.,"Es ist ein Fehler aufgetreten. Ein möglicher Grund könnte sein, dass Sie das Formular nicht gespeichert haben. Bitte kontaktieren Sie support@erpnext.com wenn das Problem weiterhin besteht."
@@ -897,14 +863,13 @@
 DocType: Lead,Next Contact Date,Nächstes Kontaktdatum
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,Anfangsmenge
 DocType: Holiday List,Holiday List Name,Urlaubslistenname
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +168,Stock Options,Lager-Optionen
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +168,Stock Options,Lager-Optionen
 DocType: Journal Entry Account,Expense Claim,Aufwandsabrechnung
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +181,Qty for {0},Menge für {0}
 DocType: Leave Application,Leave Application,Abwesenheitsantrag
 apps/erpnext/erpnext/config/hr.py +77,Leave Allocation Tool,Urlaubszuordnungs-Werkzeug
 DocType: Leave Block List,Leave Block List Dates,Urlaubssperrenliste Termine
 DocType: Company,If Monthly Budget Exceeded (for expense account),Wenn das monatliche Budget überschritten ist (für Aufwandskonto)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +56,Trimming,Zuschnitt
 DocType: Workstation,Net Hour Rate,Nettostundensatz
 DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,Einstandspreis-Kaufbeleg
 DocType: Company,Default Terms,Standardbedingungen
@@ -912,10 +877,9 @@
 DocType: POS Profile,Cash/Bank Account,Kassen-/Bankkonto
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,Removed items with no change in quantity or value.,Artikel wurden ohne Veränderung der Menge oder des Wertes entfernt.
 DocType: Delivery Note,Delivery To,Lieferung an
-apps/erpnext/erpnext/stock/doctype/item/item.py +509,Attribute table is mandatory,Attributtabelle ist zwingend erforderlich
+apps/erpnext/erpnext/stock/doctype/item/item.py +513,Attribute table is mandatory,Attributtabelle ist zwingend erforderlich
 DocType: Production Planning Tool,Get Sales Orders,Kundenaufträge aufrufen
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} kann nicht negativ sein
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +103,Filing,Feilen
 apps/erpnext/erpnext/templates/form_grid/item_grid.html +72,Discount,Rabatt
 DocType: Features Setup,Purchase Discounts,Einkaufsrabatte
 DocType: Workstation,Wages,Lohn
@@ -932,6 +896,7 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +112,You are the Expense Approver for this record. Please Update the 'Status' and Save,"Sie sind der Ausgabenbewilliger für diesen Datensatz. Bitte aktualisieren Sie den ""Status"" und speichern Sie ihn ab"
 DocType: Serial No,Creation Document No,Belegerstellungs-Nr.
 DocType: Issue,Issue,Anfrage
+apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account does not match with Company,Konto nicht mit Unternehmen passen
 apps/erpnext/erpnext/config/stock.py +136,"Attributes for Item Variants. e.g Size, Color etc.","Attribute für Artikelvarianten, z. B. Größe, Farbe usw."
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +39,WIP Warehouse,Fertigungslager
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +194,Serial No {0} is under maintenance contract upto {1},Seriennummer {0} ist mit Wartungsvertrag versehen bis {1}
@@ -940,7 +905,7 @@
 DocType: Tax Rule,Shipping State,Versandstatus
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,"Artikel müssen über die Schaltfläche ""Artikel von Kaufbeleg übernehmen"" hinzugefügt werden"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,Vertriebskosten
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Buying,Standard-Kauf
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +120,Standard Buying,Standard-Kauf
 DocType: GL Entry,Against,Zu
 DocType: Item,Default Selling Cost Center,Standard-Vertriebskostenstelle
 DocType: Sales Partner,Implementation Partner,Umsetzungspartner
@@ -961,32 +926,32 @@
 DocType: Time Log Batch,updated via Time Logs,Aktualisiert über Zeitprotokolle
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,Durchschnittsalter 
 DocType: Opportunity,Your sales person who will contact the customer in future,"Ihr Vertriebsmitarbeiter, der den Kunden in Zukunft kontaktiert"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +588,List a few of your suppliers. They could be organizations or individuals.,Bitte ein paar Lieferanten angeben. Diese können Firmen oder Einzelpersonen sein.
+apps/erpnext/erpnext/public/js/setup_wizard.js +326,List a few of your suppliers. They could be organizations or individuals.,Bitte ein paar Lieferanten angeben. Diese können Firmen oder Einzelpersonen sein.
 DocType: Company,Default Currency,Standardwährung
 DocType: Contact,Enter designation of this Contact,Bezeichnung dieses Kontakts eingeben
 DocType: Contact Us Settings,Address,Adresse
 DocType: Expense Claim,From Employee,Von Mitarbeiter
-apps/erpnext/erpnext/controllers/accounts_controller.py +338,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,"Achtung: Das System erkennt keine überhöhten Rechnungen, da der Betrag für Artikel {0} in {1} gleich Null ist"
+apps/erpnext/erpnext/controllers/accounts_controller.py +339,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,"Achtung: Das System erkennt keine überhöhten Rechnungen, da der Betrag für Artikel {0} in {1} gleich Null ist"
 DocType: Journal Entry,Make Difference Entry,Differenzbuchung erstellen
 DocType: Upload Attendance,Attendance From Date,Anwesenheit von Datum
 DocType: Appraisal Template Goal,Key Performance Area,Wichtigster Leistungsbereich
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +54,Transportation,Transport
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +54,Transportation,Transport
 apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +67, and year: ,und Jahr:
 DocType: Email Digest,Annual Expense,Jährliche Kosten
 DocType: SMS Center,Total Characters,Gesamtanzahl Zeichen
-apps/erpnext/erpnext/controllers/buying_controller.py +139,Please select BOM in BOM field for Item {0},Bitte aus dem Stücklistenfeld eine Stückliste für Artikel {0} auswählen
+apps/erpnext/erpnext/controllers/buying_controller.py +130,Please select BOM in BOM field for Item {0},Bitte aus dem Stücklistenfeld eine Stückliste für Artikel {0} auswählen
 DocType: C-Form Invoice Detail,C-Form Invoice Detail,Kontakt-Formular Rechnungsdetail
 DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,Rechnung zum Zahlungsabgleich
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +32,Contribution %,Beitrag in %
 DocType: Item,website page link,Webseiten-Verknüpfung
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +192,Let's prepare the system for first use.,Lassen Sie uns das System für die erste Nutzung vorbereiten.
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +242,Let's prepare the system for first use.,Lassen Sie uns das System für die erste Nutzung vorbereiten.
 DocType: Company,Company registration numbers for your reference. Tax numbers etc.,Meldenummern des Unternehmens für Ihre Unterlagen. Steuernummern usw.
 DocType: Sales Partner,Distributor,Lieferant
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Warenkorb-Versandregel
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +214,Production Order {0} must be cancelled before cancelling this Sales Order,Fertigungsauftrag {0} muss vor Stornierung dieses Kundenauftages abgebrochen werden
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +209,Production Order {0} must be cancelled before cancelling this Sales Order,Fertigungsauftrag {0} muss vor Stornierung dieses Kundenauftages abgebrochen werden
 ,Ordered Items To Be Billed,"Bestellte Artikel, die abgerechnet werden müssen"
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +24,From Range has to be less than To Range,Von-Bereich muss kleiner sein als Bis-Bereich
-apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +21,Select Time Logs and Submit to create a new Sales Invoice.,"Bitte Zeitprotokolle auswählen und versenden, um eine neue Ausgangsrechnung zu erstellen."
+apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +21,Select Time Logs and Submit to create a new Sales Invoice.,"Bitte Zeitprotokolle auswählen und übertragen, um eine neue Ausgangsrechnung zu erstellen."
 DocType: Global Defaults,Global Defaults,Allgemeine Voreinstellungen
 DocType: Salary Slip,Deductions,Abzüge
 DocType: Purchase Invoice,Start date of current invoice's period,Startdatum der laufenden Rechnungsperiode
@@ -1003,14 +968,13 @@
 DocType: Sales Invoice Advance,Sales Invoice Advance,Anzahlung auf Ausgangsrechnung
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +398,Nothing to request,Nichts anzufragen
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date',"Das ""Tatsächliche Startdatum"" kann nicht nach dem  ""Tatsächlichen Enddatum"" liegen"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +75,Management,Verwaltung
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +75,Management,Verwaltung
 apps/erpnext/erpnext/config/projects.py +33,Types of activities for Time Sheets,Arten der Aktivitäten für Tätigkeitsnachweise
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +14,Investment casting,Feinguss
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +51,Either debit or credit amount is required for {0},Für {0} ist entweder ein Haben- oder Sollbetrag erforderlich
 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""","Dies wird an den Artikelcode der Variante angehängt. Beispiel: Wenn Ihre Abkürzung ""SM"" und der Artikelcode ""T-SHIRT"" sind, so ist der Artikelcode der Variante ""T-SHIRT-SM"""
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,"Nettolohn (in Worten) wird angezeigt, sobald Sie die Gehaltsabrechnung speichern."
 apps/frappe/frappe/core/doctype/user/user_list.js +12,Active,Aktiv
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +154,Blue,Blau
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +154,Blue,Blau
 DocType: Purchase Invoice,Is Return,Ist Rückgabe
 DocType: Price List Country,Price List Country,Preisliste Land
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +123,Further nodes can be only created under 'Group' type nodes,"Weitere Knoten können nur unter Knoten vom Typ ""Gruppe"" erstellt werden"
@@ -1020,18 +984,16 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +22,POS Profile {0} already created for user: {1} and company {2},Verkaufsstellen-Profil {0} bereits für Benutzer: {1} und Firma {2} angelegt
 DocType: Purchase Order Item,UOM Conversion Factor,Maßeinheit-Umrechnungsfaktor
 DocType: Stock Settings,Default Item Group,Standard-Artikelgruppe
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +156,Laminated object manufacturing,Laminated Object Manufacturing-Verfahren
 apps/erpnext/erpnext/config/buying.py +13,Supplier database.,Lieferantendatenbank
 DocType: Account,Balance Sheet,Bilanz
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +561,Cost Center For Item with Item Code ',Kostenstelle für den Artikel mit der Artikel-Nr
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +45,Stretch forming,Streckziehen
 DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,"Ihr Vertriebsmitarbeiter erhält an diesem Datum eine Erinnerung, den Kunden zu kontaktieren"
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +210,"Further accounts can be made under Groups, but entries can be made against non-Groups","Weitere Konten können unter Gruppen angelegt werden, aber Buchungen können zu nicht-Gruppen erstellt werden"
 apps/erpnext/erpnext/config/hr.py +125,Tax and other salary deductions.,Steuer und sonstige Gehaltsabzüge
 DocType: Lead,Lead,Lead
 DocType: Email Digest,Payables,Verbindlichkeiten
 DocType: Account,Warehouse,Lager
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +90,Row #{0}: Rejected Qty can not be entered in Purchase Return,Zeile #{0}: Abgelehnte Menge kann nicht in Kaufrückgabe eingegeben werden
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +93,Row #{0}: Rejected Qty can not be entered in Purchase Return,Zeile #{0}: Abgelehnte Menge kann nicht in Kaufrückgabe eingegeben werden
 ,Purchase Order Items To Be Billed,Abzurechnende Lieferantenauftrags-Artikel
 DocType: Purchase Invoice Item,Net Rate,Nettopreis
 DocType: Purchase Invoice Item,Purchase Invoice Item,Eingangsrechnungs-Artikel
@@ -1046,24 +1008,24 @@
 DocType: Global Defaults,Current Fiscal Year,Laufendes Geschäftsjahr
 DocType: Global Defaults,Disable Rounded Total,Gerundete Gesamtsumme deaktivieren
 DocType: Lead,Call,Anruf
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +384,'Entries' cannot be empty,"""Buchungen"" kann nicht leer sein"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +386,'Entries' cannot be empty,"""Buchungen"" kann nicht leer sein"
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},Doppelte Zeile {0} mit dem gleichen {1}
 ,Trial Balance,Probebilanz
 apps/erpnext/erpnext/config/hr.py +205,Setting up Employees,Mitarbeiter einrichten
 apps/erpnext/erpnext/public/js/feature_setup.js +220,"Grid ""","Verzeichnis """
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +150,Please select prefix first,Bitte zuerstPräfix auswählen
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +138,Research,Forschung
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +138,Research,Forschung
 DocType: Maintenance Visit Purpose,Work Done,Arbeit erledigt
 apps/erpnext/erpnext/controllers/item_variant.py +25,Please specify at least one attribute in the Attributes table,Bitte geben Sie mindestens ein Attribut in der Attributtabelle ein
 DocType: Contact,User ID,Benutzer-ID
-DocType: Communication,Sent,Verschickt
+DocType: Communication,Sent,Gesendet
 apps/erpnext/erpnext/accounts/doctype/account/account.js +57,View Ledger,Hauptbuch anzeigen
 DocType: File,Lft,lft
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Frühestens
-apps/erpnext/erpnext/stock/doctype/item/item.py +394,"An Item Group exists with same name, please change the item name or rename the item group",Eine Artikelgruppe mit dem gleichen Namen existiert bereits. Bitte den Artikelnamen ändern oder die Artikelgruppe umbenennen
+apps/erpnext/erpnext/stock/doctype/item/item.py +398,"An Item Group exists with same name, please change the item name or rename the item group",Eine Artikelgruppe mit dem gleichen Namen existiert bereits. Bitte den Artikelnamen ändern oder die Artikelgruppe umbenennen
 DocType: Communication,Delivery Status,Lieferstatus
 DocType: Production Order,Manufacture against Sales Order,Auftragsfertigung
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +517,Rest Of The World,Rest der Welt
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +455,Rest Of The World,Rest der Welt
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,Der Artikel {0} kann keine Charge haben
 ,Budget Variance Report,Budget-Abweichungsbericht
 DocType: Salary Slip,Gross Pay,Bruttolohn
@@ -1074,13 +1036,11 @@
 DocType: BOM Item,Item Description,Artikelbeschreibung
 DocType: Payment Tool,Payment Mode,Zahlungsweise
 DocType: Purchase Invoice,Is Recurring,ist wiederkehrend
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +154,Direct metal laser sintering,Direktes Metall-Lasersintern
 DocType: Purchase Order,Supplied Items,Gelieferte Artikel
 DocType: Production Order,Qty To Manufacture,Herzustellende Menge
 DocType: Buying Settings,Maintain same rate throughout purchase cycle,Gleiche Preise während des gesamten Einkaufszyklus beibehalten
-DocType: Opportunity Item,Opportunity Item,Möglichkeits-Artikel
+DocType: Opportunity Item,Opportunity Item,Opportunity-Artikel
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +61,Temporary Opening,Temporäre Eröffnungskonten
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +41,Cryorolling,Cryogenwalzen
 ,Employee Leave Balance,Mitarbeiter-Urlaubskonto
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +128,Balance for Account {0} must always be {1},Saldo für Konto {0} muss immer {1} sein 
 DocType: Address,Address Type,Adresstyp
@@ -1096,23 +1056,23 @@
 DocType: Journal Entry,Get Outstanding Invoices,Ausstehende Rechnungen aufrufen
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,Kundenauftrag {0} ist nicht gültig
 apps/erpnext/erpnext/setup/doctype/company/company.py +172,"Sorry, companies cannot be merged",Verzeihung! Firmen können nicht zusammengeführt werden
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +145,Small,Klein
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Small,Klein
 DocType: Employee,Employee Number,Mitarbeiternummer
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},Fall-Nr. (n) bereits in Verwendung. Versuchen Sie eine Fall-Nr. ab {0}
 ,Invoiced Amount (Exculsive Tax),Rechnungsbetrag (ohne MwSt.)
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,Artikel 2
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +59,Account head {0} created,Kontobezeichnung {0} erstellt
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +153,Green,Grün
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Green,Grün
 DocType: Item,Auto re-order,Automatische Nachbestellung 
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +57,Total Achieved,Gesamtsumme erreicht
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +59,Total Achieved,Gesamtsumme erreicht
 DocType: Employee,Place of Issue,Ausstellungsort
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +59,Contract,Vertrag
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Contract,Vertrag
 DocType: Report,Disabled,Deaktiviert
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +490,UOM coversion factor required for UOM: {0} in Item: {1},Maßeinheit-Umrechnungsfaktor ist erforderlich für Maßeinheit: {0} bei Artikel: {1}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +83,Indirect Expenses,Indirekte Aufwendungen
 apps/erpnext/erpnext/controllers/selling_controller.py +163,Row {0}: Qty is mandatory,Zeile {0}: Menge ist zwingend erforderlich
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +8,Agriculture,Landwirtschaft
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +611,Your Products or Services,Ihre Produkte oder Dienstleistungen
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,Landwirtschaft
+apps/erpnext/erpnext/public/js/setup_wizard.js +347,Your Products or Services,Ihre Produkte oder Dienstleistungen
 DocType: Mode of Payment,Mode of Payment,Zahlungsweise
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,Dies ist eine Root-Artikelgruppe und kann nicht bearbeitet werden.
 DocType: Journal Entry Account,Purchase Order,Lieferantenauftrag
@@ -1124,7 +1084,7 @@
 DocType: Serial No,Serial No Details,Details zur Seriennummer
 DocType: Purchase Invoice Item,Item Tax Rate,Artikelsteuersatz
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +113,"For {0}, only credit accounts can be linked against another debit entry",Für {0} können nur Habenkonten mit einer weiteren Sollbuchung verknüpft werden
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Delivery Note {0} is not submitted,Lieferschein {0} wurde nicht versendet
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +470,Delivery Note {0} is not submitted,Lieferschein {0} wurde nicht übertragen
 apps/erpnext/erpnext/stock/get_item_details.py +136,Item {0} must be a Sub-contracted Item,Artikel {0} muss ein unterbeauftragter Artikel sein
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,Betriebsvermögen
 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.","Die Preisregel wird zunächst basierend auf dem Feld ""Anwenden auf"" ausgewählt. Dieses kann ein Artikel, eine Artikelgruppe oder eine Marke sein."
@@ -1134,7 +1094,7 @@
 DocType: Appraisal Goal,Goal,Ziel
 DocType: Sales Invoice Item,Edit Description,Beschreibung bearbeiten
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +318,Expected Delivery Date is lesser than Planned Start Date.,Voraussichtlicher Liefertermin liegt vor dem geplanten Starttermin.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +579,For Supplier,Für Lieferant
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +602,For Supplier,Für Lieferant
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,Das Festlegen des Kontotyps hilft bei der Auswahl dieses Kontos bei Transaktionen.
 DocType: Purchase Invoice,Grand Total (Company Currency),Gesamtbetrag (Firmenwährung)
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,Summe Auslieferungen
@@ -1160,10 +1120,10 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +74,"Total {0} for all items is zero, may you should change 'Distribute Charges Based On'","Gesamtsumme {0} für alle Positionen ist Null. Vielleicht sollte ""Verteilen der  Gebühren auf Grundlage von"" geändert werden."
 DocType: Purchase Invoice,Taxes and Charges Calculation,Berechnung der Steuern und Gebühren
 DocType: BOM Operation,Workstation,Arbeitsplatz
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +112,Hardware,Hardware
-DocType: Attendance,HR Manager,Personalleiter
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +112,Hardware,Hardware
+DocType: Attendance,HR Manager,Leiter der Personalabteilung
 apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,Bitte wählen Sie ein Unternehmen
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +50,Privilege Leave,Bevorzugter Urlaub
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +50,Privilege Leave,Bevorzugter Urlaub
 DocType: Purchase Invoice,Supplier Invoice Date,Lieferantenrechnungsdatum
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +79,You need to enable Shopping Cart,Sie müssen Ihren Einkaufswagen aktivieren.
 apps/frappe/frappe/public/js/frappe/form/grid_body.html +6,No Data,Keine Daten
@@ -1176,12 +1136,12 @@
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +81,Overlapping conditions found between:,Überlagernde Bedingungen gefunden zwischen:
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +168,Against Journal Entry {0} is already adjusted against some other voucher,"""Zu Journalbuchung"" {0} ist bereits mit einem anderen Beleg abgeglichen"
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +68,Total Order Value,Gesamtbestellwert
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +38,Food,Lebensmittel
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +38,Food,Lebensmittel
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Alter Bereich 3
-apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +139,You can make a time log only against a submitted production order,Ein Zeitprotokoll kann nur zu einem versendeten Fertigungsauftrag erstellt werden
+apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +139,You can make a time log only against a submitted production order,Ein Zeitprotokoll kann nur zu einem übertragenen Fertigungsauftrag erstellt werden
 DocType: Maintenance Schedule Item,No of Visits,Anzahl der Besuche
 DocType: File,old_parent,Altes übergeordnetes Element
-apps/erpnext/erpnext/config/support.py +33,"Newsletters to contacts, leads.",Newsletter an Kontakte und Leads.
+apps/erpnext/erpnext/config/support.py +33,"Newsletters to contacts, leads.",Newsletter an Kontakte und Leads
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},Die Währung des Abschlusskontos muss {0} sein
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},Summe der Punkte für alle Ziele sollte 100 sein. Aktueller Stand {0}
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +365,Operations cannot be left blank.,"""Arbeitsvorbereitung"" kann nicht leer sein."
@@ -1196,6 +1156,7 @@
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,View Offer Letter,Angebotsschreiben anzeigen
 DocType: Communication,Communication,Kommunikation
 DocType: Item,Is Service Item,Ist Dienstleistung
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +81,Application period cannot be outside leave allocation period,Bewerbungszeitraum kann nicht außerhalb Urlaub Zuteilungsperiode sein
 DocType: Activity Cost,Projects,Projekte
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +31,Please select Fiscal Year,Bitte Geschäftsjahr auswählen
 apps/erpnext/erpnext/controllers/buying_controller.py +23,From {0} | {1} {2},Von {0} | {1} {2}
@@ -1214,9 +1175,9 @@
 DocType: Item,Maintain Stock,Lager verwalten
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +213,Stock Entries already created for Production Order ,Es wurden bereits Lagerbuchungen zum Fertigungsauftrag erstellt
 DocType: Leave Control Panel,Leave blank if considered for all designations,"Freilassen, wenn für alle Einstufungen gültig"
-apps/erpnext/erpnext/controllers/accounts_controller.py +499,Charge of type 'Actual' in row {0} cannot be included in Item Rate,"Kosten für den Typ ""real"" in Zeile {0} können nicht in den Artikelpreis mit eingeschlossen werden"
+apps/erpnext/erpnext/controllers/accounts_controller.py +500,Charge of type 'Actual' in row {0} cannot be included in Item Rate,"Kosten für den Typ ""real"" in Zeile {0} können nicht in den Artikelpreis mit eingeschlossen werden"
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,Max: {0},Max: {0}
-apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +16,From Datetime,Von Datetime
+apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +16,From Datetime,Von Datum und Uhrzeit
 DocType: Email Digest,For Company,Für Firma
 apps/erpnext/erpnext/config/support.py +38,Communication log.,Kommunikationsprotokoll
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +66,Buying Amount,Einkaufsbetrag
@@ -1224,7 +1185,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +50,Chart of Accounts,Kontenplan
 DocType: Material Request,Terms and Conditions Content,Allgemeine Geschäftsbedingungen Inhalt
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +471,cannot be greater than 100,Kann nicht größer als 100 sein
-apps/erpnext/erpnext/stock/doctype/item/item.py +546,Item {0} is not a stock Item,Artikel {0} ist kein Lagerartikel
+apps/erpnext/erpnext/stock/doctype/item/item.py +550,Item {0} is not a stock Item,Artikel {0} ist kein Lagerartikel
 DocType: Maintenance Visit,Unscheduled,Außerplanmäßig
 DocType: Employee,Owned,Im Besitz von
 DocType: Salary Slip Deduction,Depends on Leave Without Pay,Hängt von unbezahltem Urlaub ab
@@ -1238,32 +1199,30 @@
 DocType: HR Settings,Employee Settings,Mitarbeitereinstellungen
 ,Batch-Wise Balance History,Stapelweise Kontostands-Historie
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +72,To Do List,Aufgabenliste
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +63,Apprentice,Auszubildende(r)
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Apprentice,Auszubildende(r)
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +99,Negative Quantity is not allowed,Negative Menge ist nicht erlaubt
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
 Used for Taxes and Charges",Die Tabelle Steuerdetails wird aus dem Artikelstamm als Zeichenfolge entnommen und in diesem Feld gespeichert. Wird verwendet für Steuern und Abgaben
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +61,Lancing,Aufstechen
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +151,Employee cannot report to himself.,Mitarbeiter können nicht an sich selbst Bericht erstatten
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Wenn das Konto gesperrt ist, sind einem eingeschränkten Benutzerkreis Buchungen erlaubt."
 DocType: Email Digest,Bank Balance,Kontostand
-apps/erpnext/erpnext/controllers/accounts_controller.py +435,Accounting Entry for {0}: {1} can only be made in currency: {2},Eine Buchung für {0}: {1} kann nur in der Währung: {2} vorgenommen werden
+apps/erpnext/erpnext/controllers/accounts_controller.py +436,Accounting Entry for {0}: {1} can only be made in currency: {2},Eine Buchung für {0}: {1} kann nur in der Währung: {2} vorgenommen werden
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +38,No active Salary Structure found for employee {0} and the month,Keine aktive Gehaltsstruktur für Mitarbeiter {0} und dem Monat gefunden
 DocType: Job Opening,"Job profile, qualifications required etc.","Stellenbeschreibung, erforderliche Qualifikationen usw."
 DocType: Journal Entry Account,Account Balance,Kontostand 
-apps/erpnext/erpnext/config/accounts.py +112,Tax Rule for transactions.,Steuerregel für Transaktionen.
+apps/erpnext/erpnext/config/accounts.py +112,Tax Rule for transactions.,Steuerregel für Transaktionen
 DocType: Rename Tool,Type of document to rename.,Typ des Dokuments umbenennen.
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +630,We buy this Item,Wir kaufen diesen Artikel
+apps/erpnext/erpnext/public/js/setup_wizard.js +366,We buy this Item,Wir kaufen diesen Artikel
 DocType: Address,Billing,Abrechnung 
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +77,Flanging,Bördelung
 DocType: Bulk Email,Not Sent,Nicht versendet
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +73,Explosive forming,Explosivumformen
 DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),Gesamte Steuern und Gebühren (Firmenwährung)
 DocType: Shipping Rule,Shipping Account,Versandkonto
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +43,Scheduled to send to {0} recipients,Geplant zum Versand an {0} Empfänger
 DocType: Quality Inspection,Readings,Ablesungen
 DocType: Stock Entry,Total Additional Costs,Gesamte Zusatzkosten
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Sub Assemblies,Unterbaugruppen
+apps/erpnext/erpnext/public/js/setup_wizard.js +359,Sub Assemblies,Unterbaugruppen
 DocType: Shipping Rule Condition,To Value,Bis-Wert
-DocType: Supplier,Stock Manager,Cheflagerist
+DocType: Supplier,Stock Manager,Leitung Lager
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +143,Source warehouse is mandatory for row {0},Ausgangslager ist für Zeile {0} zwingend erforderlich
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +581,Packing Slip,Packzettel
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,Büromiete
@@ -1271,44 +1230,42 @@
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Import fehlgeschlagen !
 apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,Noch keine Adresse hinzugefügt.
 DocType: Workstation Working Hour,Workstation Working Hour,Arbeitsplatz-Arbeitsstunde
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +83,Analyst,Analytiker
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +202,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Zeile {0}: Zugeteilte Menge {1} muss kleiner als oder gleich zu JV Menge {2} sein
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Analyst,Analytiker
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +149,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Zeile {0}: Zugeteilte Menge {1} muss kleiner als oder gleich zu JV Menge {2} sein
 DocType: Item,Inventory,Lagerbestand
 DocType: Features Setup,"To enable ""Point of Sale"" view","Um die ""Point of Sale""-Ansicht zu aktivieren"
 apps/erpnext/erpnext/public/js/pos/pos.js +402,Payment cannot be made for empty cart,Für einen leeren Einkaufswagen kann keine Zahlung getätigt werden
 DocType: Item,Sales Details,Verkaufsdetails
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +149,Pinning,Pinning-Verfahren
 DocType: Opportunity,With Items,Mit Artikeln
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,In Menge
 DocType: Notification Control,Expense Claim Rejected,Aufwandsabrechnung abgelehnt
 DocType: Sales Invoice,"The date on which next invoice will be generated. It is generated on submit.
-","Das Datum, an dem die nächste Rechnung erstellt wird. Erstellung erfolgt beim Versand."
+","Das Datum, an dem die nächste Rechnung erstellt wird. Erstellung erfolgt beim Übertragen"
 DocType: Item Attribute,Item Attribute,Artikelattribut
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +105,Government,Regierung
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Government,Regierung
 apps/erpnext/erpnext/config/stock.py +268,Item Variants,Artikelvarianten
 DocType: Company,Services,Services
 apps/erpnext/erpnext/accounts/report/financial_statements.py +147,Total ({0}),Gesamtsumme ({0})
 DocType: Cost Center,Parent Cost Center,Übergeordnete Kostenstelle
 DocType: Sales Invoice,Source,Quelle
 DocType: Leave Type,Is Leave Without Pay,Ist unbezahlter Urlaub
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +186,No records found in the Payment table,"Keine Datensätze in der Tabelle ""Zahlungen"" gefunden"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +405,Financial Year Start Date,Startdatum des Geschäftsjahres
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +133,No records found in the Payment table,"Keine Datensätze in der Tabelle ""Zahlungen"" gefunden"
+apps/erpnext/erpnext/public/js/setup_wizard.js +153,Financial Year Start Date,Startdatum des Geschäftsjahres
 DocType: Employee External Work History,Total Experience,Gesamterfahrung
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +100,Countersinking,Senken
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +271,Packing Slip(s) cancelled,Packzettel storniert
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +276,Packing Slip(s) cancelled,Packzettel storniert
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,Fracht- und Versandkosten
 DocType: Material Request Item,Sales Order No,Kundenauftrags-Nr.
 DocType: Item Group,Item Group Name,Name der Artikelgruppe
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +50,Taken,Vorgenommen
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,Vorgenommen
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +66,Transfer Materials for Manufacture,Material der Fertigung übergeben
 DocType: Pricing Rule,For Price List,Für Preisliste
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +27,Executive Search,Direktsuche
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,Direktsuche
 apps/erpnext/erpnext/stock/stock_ledger.py +405,"Purchase rate for item: {0} not found, which is required to book accounting entry (expense). Please mention item price against a buying price list.","Es wurde kein Einkaufspreis für Artikel: {0} gefunden. Er ist jedoch zwingend erforderlich, um Buchungssätze (Aufwendungen) zu buchen. Bitte Artikelpreis in einer Einkaufspreisliste hinterlegen."
 DocType: Maintenance Schedule,Schedules,Zeitablaufpläne
 DocType: Purchase Invoice Item,Net Amount,Nettobetrag
 DocType: Purchase Order Item Supplied,BOM Detail No,Stückliste Detailnr. 
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),Zusätzlicher Rabatt (Firmenwährung)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +537,Error: {0} > {1},Fehler: {0} > {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +541,Error: {0} > {1},Fehler: {0} > {1}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,Bitte neues Konto aus dem Kontenplan erstellen.
 DocType: Maintenance Visit,Maintenance Visit,Wartungsbesuch
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer > Customer Group > Territory,Kunde > Kundengruppe > Region
@@ -1319,7 +1276,6 @@
 DocType: Event,Tuesday,Dienstag
 DocType: Leave Block List,Block Holidays on important days.,Urlaub an wichtigen Tagen sperren. 
 ,Accounts Receivable Summary,Übersicht der Forderungen
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +43,Leaves for type {0} already allocated for Employee {1} for period {2} - {3},Abwesenheiten für Typ {0} wurden dem Mitarbeiter {1} für den Zeitraum {2} - {3} bereits zugeordnet
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +187,Please set User ID field in an Employee record to set Employee Role,"Bitte in einem Mitarbeiterdatensatz das Feld Nutzer-ID setzen, um die Rolle Mitarbeiter zuzuweisen"
 DocType: UOM,UOM Name,Maßeinheit-Name
 DocType: Top Bar Item,Target,Ziel
@@ -1331,15 +1287,14 @@
 DocType: ToDo,Due Date,Fälligkeitsdatum
 DocType: Sales Invoice Item,Brand Name,Bezeichnung der Marke
 DocType: Purchase Receipt,Transporter Details,Informationen zum Transporteur
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Box,Kiste 
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +389,The Organization,Die Firma
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Box,Kiste 
+apps/erpnext/erpnext/public/js/setup_wizard.js +137,The Organization,Die Firma
 DocType: Monthly Distribution,Monthly Distribution,Monatsbezogene Verteilung
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,Empfängerliste ist leer. Bitte eine Empfängerliste erstellen
 DocType: Production Plan Sales Order,Production Plan Sales Order,Produktionsplan Kundenauftrag
 DocType: Sales Partner,Sales Partner Target,Vertriebspartner-Ziel
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},Eine Buchung für {0} kann nur in der Währung: {1} vorgenommen werden
 DocType: Pricing Rule,Pricing Rule,Preisregel
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +58,Notching,Kerbung
 apps/erpnext/erpnext/config/learn.py +167,Material Request to Purchase Order,Materialanfrage für Kaufauftrag
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +74,Row # {0}: Returned Item {1} does not exists in {2} {3},Zeile # {0}: Zurückgegebener Artikel {1} existiert nicht in {2} {3}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,Bankkonten 
@@ -1356,21 +1311,20 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +552,Manufacturing Quantity is mandatory,Eingabe einer Fertigungsmenge ist erforderlich
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Amounts not reflected in bank,Bei der Bank nicht berücksichtigte Beträge
 DocType: Quality Inspection Reading,Reading 4,Ablesung 4
-apps/erpnext/erpnext/config/hr.py +23,Claims for company expense.,Ansprüche auf Kostenübernahme durch das Unternehmen.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +8,Centrifugal casting,Schleuderguss
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +119,Magnetic field-assisted finishing,Magnetfeld-unterstützte Verarbeitung
+apps/erpnext/erpnext/config/hr.py +23,Claims for company expense.,Ansprüche auf Kostenübernahme durch das Unternehmen
 DocType: Company,Default Holiday List,Standard-Urlaubsliste
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +165,Stock Liabilities,Lager-Verbindlichkeiten
 DocType: Purchase Receipt,Supplier Warehouse,Lieferantenlager
 DocType: Opportunity,Contact Mobile No,Kontakt-Mobiltelefonnummer
 DocType: Production Planning Tool,Select Sales Orders,Kundenaufträge auswählen
 ,Material Requests for which Supplier Quotations are not created,"Materialanfragen, für die keine Lieferantenangebote erstellt werden"
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +117,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,"Der Tag (e), auf dem Sie auf Zulassung beantragen sind Ferien. Sie müssen keine Anwendung auf Zulassung."
 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.,"Wird verwendet, um Artikel über den Barcode nachzuverfolgen. Durch das Scannen des Artikel-Barcodes können Artikel in einen Lieferschein und eine Ausgangsrechnung eingegeben werden."
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +477,Mark as Delivered,Als geliefert kennzeichnen
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +497,Mark as Delivered,Als geliefert kennzeichnen
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +34,Make Quotation,Angebot erstellen
 DocType: Dependent Task,Dependent Task,Abhängige Aufgabe
-apps/erpnext/erpnext/stock/doctype/item/item.py +306,Conversion factor for default Unit of Measure must be 1 in row {0},Umrechnungsfaktor für Standardmaßeinheit muss in Zeile {0} 1 sein
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,Leave of type {0} cannot be longer than {1},Abwesenheit vom Typ {0} kann nicht länger sein als {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +310,Conversion factor for default Unit of Measure must be 1 in row {0},Umrechnungsfaktor für Standardmaßeinheit muss in Zeile {0} 1 sein
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +155,Leave of type {0} cannot be longer than {1},Abwesenheit vom Typ {0} kann nicht länger sein als {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Arbeitsgänge für X Tage im Voraus planen.
 DocType: HR Settings,Stop Birthday Reminders,Geburtstagserinnerungen ausschalten
 DocType: SMS Center,Receiver List,Empfängerliste
@@ -1378,31 +1332,30 @@
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Verbrauchte Menge
 apps/erpnext/erpnext/public/js/pos/pos.js +491,{0} View,{0} Anzeigen
 DocType: Salary Structure Deduction,Salary Structure Deduction,Gehaltsstruktur-Abzug
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +158,Selective laser sintering,Selektives Lasersintern
-apps/erpnext/erpnext/stock/doctype/item/item.py +301,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Mengeneinheit {0} wurde mehr als einmal in die Umrechnungsfaktor-Tabelle eingetragen
+apps/erpnext/erpnext/stock/doctype/item/item.py +305,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Mengeneinheit {0} wurde mehr als einmal in die Umrechnungsfaktor-Tabelle eingetragen
 apps/frappe/frappe/core/page/data_import_tool/data_import_tool.js +108,Import Successful!,Importvorgang erfolgreich!
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Aufwendungen für in Umlauf gebrachte Artikel
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +185,Quantity must not be more than {0},Menge darf nicht mehr als {0} sein
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +41,Age (Days),Alter (Tage)
 DocType: Quotation Item,Quotation Item,Angebotsposition
 DocType: Account,Account Name,Kontenname 
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +41,From Date cannot be greater than To Date,Von-Datum kann später liegen als Bis-Datum
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +34,From Date cannot be greater than To Date,Von-Datum kann später liegen als Bis-Datum
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +194,Serial No {0} quantity {1} cannot be a fraction,Seriennummer {0} mit Menge {1} kann nicht eine Teilmenge sein
-apps/erpnext/erpnext/config/buying.py +59,Supplier Type master.,Stammdaten zum Lieferantentyp.
+apps/erpnext/erpnext/config/buying.py +59,Supplier Type master.,Stammdaten zum Lieferantentyp
 DocType: Purchase Order Item,Supplier Part Number,Artikelnummer Lieferant
 apps/frappe/frappe/core/page/permission_manager/permission_manager.js +379,Add,Hinzufügen 
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +92,Conversion rate cannot be 0 or 1,Umrechnungskurs kann nicht 0 oder 1 sein
 apps/erpnext/erpnext/controllers/stock_controller.py +247,{0} {1} is cancelled or stopped,{0} {1} wird abgebrochen oder gestoppt
 DocType: Accounts Settings,Credit Controller,Kredit-Controller
 DocType: Delivery Note,Vehicle Dispatch Date,Datum des Versands mit dem Fahrzeug
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +197,Purchase Receipt {0} is not submitted,Kaufbeleg {0} wurde nicht versendet
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +198,Purchase Receipt {0} is not submitted,Kaufbeleg {0} wurde nicht übertragen
 DocType: Company,Default Payable Account,Standard-Verbindlichkeitenkonto
 apps/erpnext/erpnext/config/website.py +13,"Settings for online shopping cart such as shipping rules, price list etc.","Einstellungen für Online-Warenkorb, wie Versandregeln, Preisliste usw."
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +660,Setup Complete,Einrichtung abgeschlossen
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +124,Setup Complete,Einrichtung abgeschlossen
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +65,{0}% Billed,{0}% berechnet
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +17,Reserved Qty,Reservierte Menge
 DocType: Party Account,Party Account,Gruppenkonto
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +74,Human Resources,Personalwesen
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +74,Human Resources,Personalwesen
 DocType: Lead,Upper Income,Gehobenes Einkommen
 DocType: Journal Entry Account,Debit in Company Currency,Soll in Unternehmenswährung
 apps/erpnext/erpnext/support/doctype/issue/issue.py +58,My Issues,Meine Fragen
@@ -1411,26 +1364,21 @@
 DocType: Company,Default Values,Standardwerte
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +236,Row {0}: Payment amount can not be negative,Zeile {0}: Zahlungsbetrag kann nicht negativ sein
 DocType: Expense Claim,Total Amount Reimbursed,Gesamterstattungsbetrag
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +152,Press fitting,Einpressen
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +64,Against Supplier Invoice {0} dated {1},Zu Eingangsrechnung {0} vom {1}
 DocType: Customer,Default Price List,Standardpreisliste
 DocType: Payment Reconciliation,Payments,Zahlungen
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +24,Hot isostatic pressing,Isostatisches Heißpressen
 DocType: ToDo,Medium,Mittel
 DocType: Budget Detail,Budget Allocated,Zugewiesenes Budget 
 DocType: Journal Entry,Entry Type,Buchungstyp
 ,Customer Credit Balance,Kunden-Kreditlinie
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +137,Please verify your email id,Bitte E-Mail-ID überprüfen
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +42,Customer required for 'Customerwise Discount',"Kunde erforderlich für ""Kundenbezogener Rabatt"""
-apps/erpnext/erpnext/config/accounts.py +53,Update bank payment dates with journals.,Zahlungstermine anhand der Journale aktualisieren.
+apps/erpnext/erpnext/config/accounts.py +53,Update bank payment dates with journals.,Zahlungstermine anhand der Journale aktualisieren
 DocType: Quotation,Term Details,Details der Geschäftsbedingungen
 DocType: Manufacturing Settings,Capacity Planning For (Days),Kapazitätsplanung für (Tage)
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +56,None of the items have any change in quantity or value.,Keiner der Artikel hat irgendeine Änderung bei Mengen oder Kosten.
 DocType: Warranty Claim,Warranty Claim,Garantieantrag
 ,Lead Details,Einzelheiten zum Lead
-DocType: Authorization Rule,Approving User,Genehmigender Benutzer
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +37,Forging,Schmiedearbeit
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +126,Plating,Überzug
 DocType: Purchase Invoice,End date of current invoice's period,Schlußdatum der laufenden Eingangsrechnungsperiode
 DocType: Pricing Rule,Applicable For,Anwendbar für
 DocType: Bank Reconciliation,From Date,Von-Datum
@@ -1452,31 +1400,29 @@
 DocType: Sales Invoice,Paid Amount (Company Currency),Gezahlter Betrag (Firmenwährung)
 DocType: Purchase Invoice,Additional Discount,Zusätzlicher Rabatt
 DocType: Selling Settings,Selling Settings,Vertriebseinstellungen
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +39,Online Auctions,Online-Auktionen
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,Online-Auktionen
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +94,Please specify either Quantity or Valuation Rate or both,Bitte entweder die Menge oder den Wertansatz oder beides eingeben
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +50,"Company, Month and Fiscal Year is mandatory","Firma, Monat und Geschäftsjahr sind zwingend erforderlich"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Marketing Expenses,Marketingkosten
 ,Item Shortage Report,Artikelengpass-Bericht
-apps/erpnext/erpnext/stock/doctype/item/item.js +183,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Gewicht ist angegeben, bitte auch ""Gewichts-Maßeinheit"" angeben"
+apps/erpnext/erpnext/stock/doctype/item/item.js +185,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Gewicht ist angegeben, bitte auch ""Gewichts-Maßeinheit"" angeben"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,Materialanfrage wurde für die Erstellung dieser Lagerbuchung verwendet
 apps/erpnext/erpnext/config/support.py +43,Single unit of an Item.,Einzelnes Element eines Artikels.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +212,Time Log Batch {0} must be 'Submitted',"Zeitprotokollstapel {0} muss ""versendet"" sein"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +212,Time Log Batch {0} must be 'Submitted',"Zeitprotokollstapel {0} muss ""übertragen"" sein"
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,Eine Buchung für jede Lagerbewegung erstellen
 DocType: Leave Allocation,Total Leaves Allocated,Insgesamt zugewiesene Urlaubstage
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +384,Warehouse required at Row No {0},Angabe des Lagers ist in Zeile {0} erforderlich
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +386,Warehouse required at Row No {0},Angabe des Lagers ist in Zeile {0} erforderlich
 DocType: Employee,Date Of Retirement,Zeitpunkt der Pensionierung
 DocType: Upload Attendance,Get Template,Vorlage aufrufen
 DocType: Address,Postal,Post
 DocType: Item,Weightage,Gewichtung
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +159,Mining,Bergbau
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +17,Resin casting,Gießharzverfahren
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,Eine Kundengruppe mit dem gleichen Namen existiert bereits. Bitte den Kundennamen ändern oder die Kundengruppe umbenennen
 apps/erpnext/erpnext/public/js/pos/pos.js +147,Please select {0} first.,Bitte zuerst {0} auswählen.
 apps/erpnext/erpnext/templates/pages/order.html +57,text {0},text {0}
 DocType: Territory,Parent Territory,Übergeordnete Region
 DocType: Quality Inspection Reading,Reading 2,Ablesung 2
 DocType: Stock Entry,Material Receipt,Materialannahme
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +622,Products,Produkte
+apps/erpnext/erpnext/public/js/setup_wizard.js +358,Products,Produkte
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +47,Party Type and Party is required for Receivable / Payable account {0},"""Gruppen-Typ"" und die ""Gruppe"" werden für das Konto ""Forderungen / Verbindlichkeiten"" {0} gebraucht"
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.","Wenn dieser Artikel Varianten hat, dann kann er bei den Kundenaufträgen, etc. nicht ausgewählt werden"
 DocType: Lead,Next Contact By,Nächster Kontakt durch
@@ -1486,13 +1432,13 @@
 DocType: Purchase Invoice,Notification Email Address,Benachrichtigungs-E-Mail-Adresse
 DocType: Payment Tool,Find Invoices to Match,Passende Rechnungen finden
 ,Item-wise Sales Register,Artikelbezogene Übersicht der Verkäufe
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +399,"e.g. ""XYZ National Bank""","z. B. ""XYZ Nationalbank"""
+apps/erpnext/erpnext/public/js/setup_wizard.js +147,"e.g. ""XYZ National Bank""","z. B. ""XYZ Nationalbank"""
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,Ist diese Steuer im Basispreis enthalten?
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +57,Total Target,Summe Vorgabe
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Target,Summe Vorgabe
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.js +22,Shopping Cart is enabled,Warenkorb aktiviert
 DocType: Job Applicant,Applicant for a Job,Bewerber für einen Job
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +173,No Production Orders created,Keine Fertigungsaufträge erstellt
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +131,Salary Slip of employee {0} already created for this month,Gehaltsabrechnung für Mitarbeiter {0} wurde bereits für diesen Monat erstellt
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +140,Salary Slip of employee {0} already created for this month,Gehaltsabrechnung für Mitarbeiter {0} wurde bereits für diesen Monat erstellt
 DocType: Stock Reconciliation,Reconciliation JSON,Abgleich JSON (JavaScript Object Notation)
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Zu viele Spalten. Exportieren Sie den Bericht und drucken Sie ihn mit einem Tabellenkalkulationsprogramm aus.
 DocType: Sales Invoice Item,Batch No,Chargennummer
@@ -1502,25 +1448,25 @@
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +13,Variant,Variante
 apps/frappe/frappe/public/js/frappe/form/toolbar.js +165,New {0},Neu {0}
 DocType: Naming Series,Set prefix for numbering series on your transactions,Präfix für die Seriennummerierung Ihrer Transaktionen festlegen
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +169,Stopped order cannot be cancelled. Unstop to cancel.,"Angehaltener Auftrag kann nicht abgebrochen werden. Bitte zuerst fortsetzen, um dann abzubrechen."
-apps/erpnext/erpnext/stock/doctype/item/item.py +323,Default BOM ({0}) must be active for this item or its template,Standardstückliste ({0}) muss für diesen Artikel oder dessen Vorlage aktiv sein
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +164,Stopped order cannot be cancelled. Unstop to cancel.,"Angehaltener Auftrag kann nicht abgebrochen werden. Bitte zuerst fortsetzen, um dann abzubrechen."
+apps/erpnext/erpnext/stock/doctype/item/item.py +327,Default BOM ({0}) must be active for this item or its template,Standardstückliste ({0}) muss für diesen Artikel oder dessen Vorlage aktiv sein
 DocType: Employee,Leave Encashed?,Urlaub eingelöst?
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,"Feld ""Möglichkeit von"" ist zwingend erforderlich"
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,"Feld ""Opportunity von"" ist zwingend erforderlich"
 DocType: Item,Variants,Varianten
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +458,Make Purchase Order,Einkaufsbestellung erstellen
 DocType: SMS Center,Send To,Senden an
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +111,There is not enough leave balance for Leave Type {0},Es gibt nicht genügend verfügbaren Urlaub für Urlaubstyp {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +127,There is not enough leave balance for Leave Type {0},Es gibt nicht genügend verfügbaren Urlaub für Urlaubstyp {0}
 DocType: Sales Team,Contribution to Net Total,Beitrag zum Gesamtnetto
 DocType: Sales Invoice Item,Customer's Item Code,Kunden-Artikel-Nr
 DocType: Stock Reconciliation,Stock Reconciliation,Bestandsabgleich
 DocType: Territory,Territory Name,Name der Region
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +152,Work-in-Progress Warehouse is required before Submit,Fertigungslager wird vor dem Versand benötigt
-apps/erpnext/erpnext/config/hr.py +43,Applicant for a Job.,Bewerber für einen Job.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +152,Work-in-Progress Warehouse is required before Submit,Fertigungslager wird vor dem Übertragen benötigt
+apps/erpnext/erpnext/config/hr.py +43,Applicant for a Job.,Bewerber für einen Job
 DocType: Purchase Order Item,Warehouse and Reference,Lager und Referenz
 DocType: Supplier,Statutory info and other general information about your Supplier,Rechtlich notwendige und andere allgemeine Informationen über Ihren Lieferanten
 DocType: Country,Country,Land
 apps/erpnext/erpnext/shopping_cart/utils.py +47,Addresses,Adressen
-DocType: Communication,Received,Erhalten
+DocType: Communication,Received,Empfangen
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +137,Against Journal Entry {0} does not have any unmatched {1} entry,"""Zu Journalbuchung"" {0} hat nur abgeglichene {1} Buchungen"
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},Doppelte Seriennummer für Posten {0} eingegeben
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,Bedingung für eine Versandregel
@@ -1530,11 +1476,11 @@
 DocType: Stock Reconciliation Item,Leave blank if no change,"Freilassen, wenn es keine Änderung gibt"
 DocType: Sales Order,To Deliver and Bill,Auszuliefern und Abzurechnen
 DocType: GL Entry,Credit Amount in Account Currency,(Gut)Haben-Betrag in Kontowährung
-apps/erpnext/erpnext/config/manufacturing.py +24,Time Logs for manufacturing.,Zeitprotokolle für die Fertigung.
+apps/erpnext/erpnext/config/manufacturing.py +24,Time Logs for manufacturing.,Zeitprotokolle für die Fertigung
 DocType: Item,Apply Warehouse-wise Reorder Level,Anwenden des lagerbezogenen Meldebestands
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +429,BOM {0} must be submitted,Stückliste {0} muss versendet werden
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +429,BOM {0} must be submitted,Stückliste {0} muss übertragen werden
 DocType: Authorization Control,Authorization Control,Berechtigungskontrolle 
-apps/erpnext/erpnext/config/projects.py +23,Time Log for tasks.,Zeitprotokoll für Aufgaben.
+apps/erpnext/erpnext/config/projects.py +23,Time Log for tasks.,Zeitprotokoll für Aufgaben
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +474,Payment,Bezahlung
 DocType: Production Order Operation,Actual Time and Cost,Tatsächliche Laufzeit und Kosten
 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},Materialanfrage von maximal {0} kann für Artikel {1} zum Kundenauftrag {2} gemacht werden
@@ -1546,20 +1492,20 @@
 DocType: Sales Order Item,Actual Qty,Tatsächliche Anzahl 
 DocType: Sales Invoice Item,References,Referenzen
 DocType: Quality Inspection Reading,Reading 10,Ablesung 10
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +612,"List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start.","Produkte oder Dienstleistungen auflisten, die gekauft oder verkauft werden. Sicher stellen, dass beim Start die Artikelgruppe, die Standardeinheit und andere Einstellungen überprüft werden."
+apps/erpnext/erpnext/public/js/setup_wizard.js +348,"List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start.","Produkte oder Dienstleistungen auflisten, die gekauft oder verkauft werden. Sicher stellen, dass beim Start die Artikelgruppe, die Standardeinheit und andere Einstellungen überprüft werden."
 DocType: Hub Settings,Hub Node,Hub-Knoten
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,Sie haben ein Duplikat eines Artikels eingetragen. Bitte korrigieren und erneut versuchen.
 apps/erpnext/erpnext/controllers/item_variant.py +65,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values,Wert {0} für Attribut {1} gibt es nicht in der Liste der gültigen Artikel-Attributwerte
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +87,Associate,Mitarbeiterin 
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Associate,Mitarbeiterin 
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +46,Item {0} is not a serialized Item,Artikel {0} ist kein Fortsetzungsartikel
 DocType: SMS Center,Create Receiver List,Empfängerliste erstellen
 apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +5,Expired,Verfallen
 DocType: Packing Slip,To Package No.,Bis Paket Nr.
 DocType: DocType,System,System
 DocType: Warranty Claim,Issue Date,Ausstellungsdatum
-DocType: Activity Cost,Activity Cost,Handlungskosten
+DocType: Activity Cost,Activity Cost,Aktivitätskosten
 DocType: Purchase Receipt Item Supplied,Consumed Qty,Verbrauchte Anzahl
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +52,Telecommunications,Telekommunikation
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +52,Telecommunications,Telekommunikation
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),"Zeigt an, dass das Paket ein Teil dieser Lieferung ist (nur Entwurf)"
 DocType: Payment Tool,Make Payment Entry,Zahlungsbuchung erstellen
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +119,Quantity for Item {0} must be less than {1},Menge für Artikel {0} muss kleiner sein als {1}
@@ -1576,10 +1522,8 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +37,"Selling must be checked, if Applicable For is selected as {0}","Vertrieb muss aktiviert werden, wenn ""Anwendbar auf"" ausgewählt ist bei {0}"
 DocType: Purchase Order Item,Supplier Quotation Item,Angebotsposition Lieferant
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +27,Make Salary Structure,Gehaltsübersicht erstellen
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +54,Shearing,Scherverfahren
 DocType: Item,Has Variants,Hat Varianten
 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.,"Auf ""Ausgangsrechnung erstellen"" klicken, um eine neue Ausgangsrechnung zu erstellen."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +166,Packaging and labeling,Verpackung und Kennzeichnung
 DocType: Monthly Distribution,Name of the Monthly Distribution,Bezeichnung der monatsweisen Verteilung
 DocType: Sales Person,Parent Sales Person,Übergeordneter Vertriebsmitarbeiter
 apps/erpnext/erpnext/setup/utils.py +14,Please specify Default Currency in Company Master and Global Defaults,Bitte Standardwährung in den Unternehmensstammdaten und den allgemeinen Voreinstellungen angeben
@@ -1590,19 +1534,18 @@
 DocType: Budget Detail,Fiscal Year,Geschäftsjahr
 DocType: Cost Center,Budget,Budget 
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +41,"Budget cannot be assigned against {0}, as it's not an Income or Expense account","Budget kann {0} nicht zugewiesen werden, da es kein Ertrags- oder Aufwandskonto ist"
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Achieved,Erreicht
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,Erreicht
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +65,Territory / Customer,Region / Kunde
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,e.g. 5,z. B. 5
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +207,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},Zeile {0}: Zugeteilte Menge {1} muss kleiner als oder gleich dem ausstehenden Betrag in Rechnung {2} sein
+apps/erpnext/erpnext/public/js/setup_wizard.js +294,e.g. 5,z. B. 5
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},Zeile {0}: Zugeteilte Menge {1} muss kleiner als oder gleich dem ausstehenden Betrag in Rechnung {2} sein
 DocType: Sales Invoice,In Words will be visible once you save the Sales Invoice.,"""In Worten"" wird sichtbar, sobald Sie die Ausgangsrechnung speichern."
 DocType: Item,Is Sales Item,Ist Verkaufsartikel
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,Artikelgruppenstruktur
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,Artikel {0} ist nicht für Seriennummern eingerichtet. Artikelstamm prüfen
 DocType: Maintenance Visit,Maintenance Time,Wartungszeit
 ,Amount to Deliver,Menge zu liefern
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +620,A Product or Service,Ein Produkt oder eine Dienstleistung
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +158,There were errors.,Es sind Fehler aufgetreten.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +101,Tapping,Gewindebohren
+apps/erpnext/erpnext/public/js/setup_wizard.js +356,A Product or Service,Ein Produkt oder eine Dienstleistung
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +146,There were errors.,Es sind Fehler aufgetreten.
 DocType: Naming Series,Current Value,Aktueller Wert
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +171,{0} created,{0} erstellt
 DocType: Delivery Note Item,Against Sales Order,Zu Kundenauftrag
@@ -1616,7 +1559,7 @@
 apps/erpnext/erpnext/accounts/party.py +275,Due Date cannot be before Posting Date,Fälligkeitsdatum kann nicht vor dem Buchungsdatum liegen
 DocType: Website Item Group,Website Item Group,Webseiten-Artikelgruppe
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Duties and Taxes,Zölle und Steuern
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Please enter Reference date,Bitte den Stichtag eingeben
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +312,Please enter Reference date,Bitte den Stichtag eingeben
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} Zahlungsbuchungen können nicht nach {1} gefiltert werden
 DocType: Item Website Specification,Table for Item that will be shown in Web Site,"Tabelle für Artikel, der auf der Webseite angezeigt wird"
 DocType: Purchase Order Item Supplied,Supplied Qty,Gelieferte Anzahl
@@ -1624,10 +1567,10 @@
 apps/erpnext/erpnext/config/stock.py +103,Tree of Item Groups.,Artikelgruppenstruktur
 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,"Für diese Berechnungsart kann keine Zeilennummern zugeschrieben werden, die größer oder gleich der aktuellen Zeilennummer ist"
 ,Item-wise Purchase History,Artikelbezogene Einkaufshistorie
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +152,Red,Rot
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Red,Rot
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +228,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},"Bitte auf ""Zeitplan generieren"" klicken, um die Seriennummer für Artikel {0} abzurufen"
 DocType: Account,Frozen,Gesperrt
-,Open Production Orders,Fertigungsaufträge öffnen
+,Open Production Orders,Offene Fertigungsaufträge
 DocType: Installation Note,Installation Time,Installationszeit
 DocType: Sales Invoice,Accounting Details,Buchhaltungs-Details
 apps/erpnext/erpnext/setup/doctype/company/company.js +44,Delete all the Transactions for this Company,Löschen aller Transaktionen dieser Firma
@@ -1639,7 +1582,7 @@
 DocType: Item Attribute,Attribute Name,Attributname
 apps/erpnext/erpnext/controllers/selling_controller.py +236,Item {0} must be Sales or Service Item in {1},Artikel {0} muss ein Verkaufs- oder Dienstleistungsartikel sein in {1}
 DocType: Item Group,Show In Website,Auf der Webseite anzeigen
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +621,Group,Gruppe
+apps/erpnext/erpnext/public/js/setup_wizard.js +357,Group,Gruppe
 DocType: Task,Expected Time (in hours),Voraussichtliche Zeit (in Stunden)
 ,Qty to Order,Zu bestellende Menge
 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","Um Markennamen in den folgenden Dokumenten nachzuverfolgen: Lieferschein, Opportunity, Materialanfrage, Artikel, Bestellung, Kaufbeleg, Kaufquittung, Angebot, Ausgangsrechnung, Produkt-Bundle, Kundenauftrag, Seriennummer"
@@ -1649,75 +1592,70 @@
 DocType: Features Setup,Brands,Marken
 DocType: C-Form Invoice Detail,Invoice No,Rechnungs-Nr.
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +480,From Purchase Order,Von Lieferantenauftrag
-DocType: Activity Cost,Costing Rate,Kalkulationssatz
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +92,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Hinterlassen Sie können nicht an / vor {0} gelöscht werden, wie Urlaubsbilanz wurde bereits Trag weitergeleitet in der Zukunft verlassen Allokation Rekord {1}"
+DocType: Activity Cost,Costing Rate,Kalkulationsbetrag
 ,Customer Addresses And Contacts,Kundenadressen und Ansprechpartner
 DocType: Employee,Resignation Letter Date,Datum des Kündigungsschreibens
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +37,Pricing Rules are further filtered based on quantity.,Preisregeln werden zudem nach Menge angewandt.
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +137,Not Set,Nicht festgelegt
 DocType: Communication,Date,Datum
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,Kundenumsatz wiederholen
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +651,Sit tight while your system is being setup. This may take a few moments.,"Bitte warten Sie, während Ihr System eingerichtet wird. Dies kann einige Zeit dauern."
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +115,Sit tight while your system is being setup. This may take a few moments.,"Bitte warten Sie, während Ihr System eingerichtet wird. Dies kann einige Zeit dauern."
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +51,{0} ({1}) must have role 'Expense Approver',"{0} ({1}) muss die Rolle ""Ausgabengenehmiger"" haben"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Pair,Paar
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Pair,Paar
 DocType: Bank Reconciliation Detail,Against Account,Gegenkonto
 DocType: Maintenance Schedule Detail,Actual Date,Tatsächliches Datum
 DocType: Item,Has Batch No,Hat Chargen-Nr.
 DocType: Delivery Note,Excise Page Number,Seitenzahl entfernen
 DocType: Employee,Personal Details,Persönliche Daten
 ,Maintenance Schedules,Wartungspläne
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +44,Embossing,Prägung
 ,Quotation Trends,Trendanalyse Angebote
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +139,Item Group not mentioned in item master for item {0},Artikelgruppe ist im Artikelstamm für Artikel {0} nicht erwähnt
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +302,Debit To account must be a Receivable account,Sollkonto muss ein Forderungskonto sein
-apps/erpnext/erpnext/stock/doctype/item/item.py +310,"As Production Order can be made for this item, it must be a stock item.","Damit ein Fertigungsauftrag für diesen Artikel gemacht werden kann, muss es sich um einen Lagerartikel handeln."
 DocType: Shipping Rule Condition,Shipping Amount,Versandbetrag
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +140,Joining,Eintritt
-DocType: Authorization Rule,Above Value,Über Wert
 ,Pending Amount,Ausstehender Betrag
 DocType: Purchase Invoice Item,Conversion Factor,Umrechnungsfaktor
 DocType: Purchase Order,Delivered,Geliefert
 apps/erpnext/erpnext/config/hr.py +160,Setup incoming server for jobs email id. (e.g. jobs@example.com),E-Mail-Adresse für Bewerbungen einrichten. (z.B. jobs@example.com)
 DocType: Purchase Receipt,Vehicle Number,Fahrzeugnummer
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,"Das Datum, an dem wiederkehrende Rechnungen angehalten werden"
+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,Aufteilbaren Gesamt leaves {0} kann nicht kleiner sein als die bereits zugelassenen leaves {1} für den Zeitraum
 DocType: Journal Entry,Accounts Receivable,Forderungen
 ,Supplier-Wise Sales Analytics,Analyse lieferantenbezogener Verkäufe
 DocType: Address Template,This format is used if country specific format is not found,"Dieses Format wird verwendet, wenn ein länderspezifischens Format nicht gefunden werden kann"
 DocType: Custom Field,Custom,Benutzerdefiniert
 DocType: Production Order,Use Multi-Level BOM,Mehrstufige Stückliste verwenden
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +26,Injection molding,Spritzguß
 DocType: Bank Reconciliation,Include Reconciled Entries,Abgeglichene Buchungen einbeziehen
 apps/erpnext/erpnext/config/accounts.py +41,Tree of finanial accounts.,Finanzkontenstruktur
 DocType: Leave Control Panel,Leave blank if considered for all employee types,"Freilassen, wenn für alle Mitarbeitertypen gültig"
 DocType: Landed Cost Voucher,Distribute Charges Based On,Kosten auf folgender Grundlage verteilen
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +312,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,"Konto {0} muss vom Typ ""Anlagegut"" sein, weil der Artikel {1} ein Anlagegut ist"
-DocType: HR Settings,HR Settings,Personaleinstellungen
+DocType: HR Settings,HR Settings,Einstellungen zum Modul Personalwesen
 apps/frappe/frappe/config/setup.py +130,Printing,Druck
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +114,Expense Claim is pending approval. Only the Expense Approver can update status.,Aufwandsabrechnung wartet auf Bewilligung. Nur der Ausgabenbewilliger kann den Status aktualisieren.
 DocType: Purchase Invoice,Additional Discount Amount,Zusätzlicher Rabatt
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +99,The day(s) on which you are applying for leave are holiday. You need not apply for leave.,"Der/Die Tag(e), für den/die Urlaub beantragt wird, sind Feiertage. Hierfür muss kein Urlaub beantragen werden."
 apps/frappe/frappe/public/js/frappe/misc/utils.js +110,and,und
 DocType: Leave Block List Allow,Leave Block List Allow,Urlaubssperrenliste zulassen
 apps/erpnext/erpnext/setup/doctype/company/company.py +236,Abbr can not be blank or space,"""Abbr"" kann nicht leer oder Space sein"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +50,Sports,Sport
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,Sport
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Actual,Summe Tatsächlich
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Unit,Einheit
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Unit,Einheit
 apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.py +182,Please set Dropbox access keys in your site config,Bitte Dropbox-Zugriffsdaten in den Einstellungen der Seite setzen
 apps/erpnext/erpnext/stock/get_item_details.py +113,Please specify Company,Bitte Firma angeben
 ,Customer Acquisition and Loyalty,Kundengewinnung und -bindung
 DocType: Purchase Receipt,Warehouse where you are maintaining stock of rejected items,"Lager, in dem zurückerhaltene Artikel aufbewahrt werden"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +408,Your financial year ends on,Ihr Geschäftsjahr endet am
+apps/erpnext/erpnext/public/js/setup_wizard.js +156,Your financial year ends on,Ihr Geschäftsjahr endet am
 DocType: POS Profile,Price List,Preisliste
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +20,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,"{0} ist jetzt das Standardgeschäftsjahr. Bitte aktualisieren Sie Ihren Browser, damit die Änderungen wirksam werden."
 apps/erpnext/erpnext/projects/doctype/project/project.js +47,Expense Claims,Aufwandsabrechnungen
 DocType: Issue,Support,Support
-DocType: Authorization Rule,Approving Role,Genehmigende Rolle
 ,BOM Search,Stücklisten-Suche
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +176,Closing (Opening + Totals),Schlußstand (Anfangsstand + Summen)
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +26,Please specify currency in Company,Bitte die Firmenwährung angeben
 DocType: Workstation,Wages per hour,Lohn pro Stunde
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},Lagerbestand in Charge {0} wird für Artikel {2} im Lager {3} negativ {1}
 apps/erpnext/erpnext/config/setup.py +83,"Show / Hide features like Serial Nos, POS etc.","Funktionen wie Seriennummern, POS, etc. anzeigen / ausblenden"
-apps/erpnext/erpnext/controllers/accounts_controller.py +236,Account {0} is invalid. Account Currency must be {1},Konto {0} ist ungültig. Währung muss {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +237,Account {0} is invalid. Account Currency must be {1},Konto {0} ist ungültig. Währung muss {1}
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +34,UOM Conversion factor is required in row {0},Maßeinheit-Umrechnungsfaktor ist erforderlich in der Zeile {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +53,Clearance date cannot be before check date in row {0},Einlösungsdatum kann nicht vor dem Ausstellungsdatum in Zeile {0} liegen
 DocType: Salary Slip,Deduction,Abzug
@@ -1730,19 +1668,19 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +72,disabled user,deaktivierter Benutzer
 DocType: Opportunity,Quotation,Angebot
 DocType: Salary Slip,Total Deduction,Gesamtabzug
-DocType: Quotation,Maintenance User,Mitarbeiter für die Wartung
+DocType: Quotation,Maintenance User,Nutzer Instandhaltung
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +144,Cost Updated,Kosten aktualisiert
 DocType: Employee,Date of Birth,Geburtsdatum
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +82,Item {0} has already been returned,Artikel {0} wurde bereits zurück gegeben
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,"""Geschäftsjahr"" steht für ein Finazgeschäftsjahr. Alle Buchungen und anderen größeren Transaktionen werden mit dem ""Geschäftsjahr"" verglichen."
 DocType: Opportunity,Customer / Lead Address,Kunden/Lead-Adresse
+apps/erpnext/erpnext/stock/doctype/item/item.py +112,Warning: Invalid SSL certificate on attachment {0},Warnung: Ungültige SSL-Zertifikat auf Befestigungs {0}
 DocType: Production Order Operation,Actual Operation Time,Tatsächliche Betriebszeit 
 DocType: Authorization Rule,Applicable To (User),Anwendbar auf (Benutzer)
 DocType: Purchase Taxes and Charges,Deduct,Abziehen
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +170,Job Description,Tätigkeitsbeschreibung
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +170,Job Description,Tätigkeitsbeschreibung
 DocType: Purchase Order Item,Qty as per Stock UOM,Menge in Lagermaßeinheit
 apps/frappe/frappe/model/rename_doc.py +343,Please select a valid csv file with data,Bitte eine gültige CSV-Datei mit Daten auswählen
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +92,Coating,Beschichtung
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +126,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Sonderzeichen außer ""-"", ""#"", ""."" und ""/"" sind in der Serienbezeichnung nicht erlaubt"
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Verkaufskampagne verfolgen. Leads, Angebote, Kundenaufträge usw. von Kampagnen beobachten um die Kapitalverzinsung (RoI) zu messen."
 DocType: Expense Claim,Approver,Genehmigender
@@ -1750,14 +1688,13 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +155,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","Es gibt Lagerbuchungen zum Lager {0}, daher kann das Lager nicht umbenannt oder verändert werden"
 DocType: Appraisal,Calculate Total Score,Gesamtwertung berechnen
 DocType: Supplier Quotation,Manufacturing Manager,Fertigungsleiter
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},Seriennummer {0} ist unter Garantie bis {1}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},Seriennummer {0} ist innerhalb der Garantie bis {1}
 apps/erpnext/erpnext/config/stock.py +69,Split Delivery Note into packages.,Lieferschein in Pakete aufteilen.
-apps/erpnext/erpnext/hooks.py +84,Shipments,Lieferungen
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +29,Dip molding,Tauchformverfahren
+apps/erpnext/erpnext/hooks.py +68,Shipments,Lieferungen
 DocType: Purchase Order,To be delivered to customer,Zur Auslieferung an den Kunden
-apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,"Status des Zeitprotokolls muss ""versendet"" sein"
+apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,"Status des Zeitprotokolls muss ""übertragen"" sein"
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,Seriennummer {0} gehört zu keinem Lager
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +650,Setting Up,Einrichten
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +114,Setting Up,Einrichten
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,Row # ,Zeile #
 DocType: Purchase Invoice,In Words (Company Currency),In Worten (Firmenwährung)
 DocType: Pricing Rule,Supplier,Lieferant
@@ -1765,7 +1702,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +105,Miscellaneous Expenses,Sonstige Aufwendungen
 DocType: Global Defaults,Default Company,Standardfirma
 apps/erpnext/erpnext/controllers/stock_controller.py +166,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,"Ausgaben- oder Differenz-Konto ist Pflicht für Artikel {0}, da es Auswirkungen auf den gesamten Lagerwert hat"
-apps/erpnext/erpnext/controllers/accounts_controller.py +354,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","Artikel {0} in Zeile {1} kann nicht mehr überberechnet werden als {2}. Um Überberechnung zu erlauben, bitte entsprechend in den Lagereinstellungen einstellen"
+apps/erpnext/erpnext/controllers/accounts_controller.py +355,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","Artikel {0} in Zeile {1} kann nicht mehr überberechnet werden als {2}. Um Überberechnung zu erlauben, bitte entsprechend in den Lagereinstellungen einstellen"
 DocType: Employee,Bank Name,Name der Bank 
 apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +27,-Above,-Über
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +135,User {0} is disabled,Benutzer {0} ist deaktiviert
@@ -1774,31 +1711,30 @@
 DocType: Email Digest,Note: Email will not be sent to disabled users,Hinweis: E-Mail wird nicht an gesperrte Nutzer gesendet
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +36,Select Company...,Firma auswählen...
 DocType: Leave Control Panel,Leave blank if considered for all departments,"Freilassen, wenn für alle Abteilungen gültig"
-apps/erpnext/erpnext/config/hr.py +95,"Types of employment (permanent, contract, intern etc.).","Art der Beschäftigung (Unbefristeter Vertrag, befristeter Vertrag, Praktikum etc.)."
+apps/erpnext/erpnext/config/hr.py +95,"Types of employment (permanent, contract, intern etc.).","Art der Beschäftigung (Unbefristeter Vertrag, befristeter Vertrag, Praktikum etc.)"
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,{0} is mandatory for Item {1},{0} Artikel ist zwingend erfoderlich für {1}
 DocType: Currency Exchange,From Currency,Von Währung
 DocType: DocField,Name,Name
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +211,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Bitte zugewiesenen Betrag, Rechnungsart und Rechnungsnummer in mindestens einer Zeile auswählen"
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +104,Sales Order required for Item {0},Kundenauftrag für den Artikel {0} erforderlich
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +158,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Bitte zugewiesenen Betrag, Rechnungsart und Rechnungsnummer in mindestens einer Zeile auswählen"
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +107,Sales Order required for Item {0},Kundenauftrag für den Artikel {0} erforderlich
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +43,Amounts not reflected in system,Im System nicht berücksichtigte Beträge
 DocType: Purchase Invoice Item,Rate (Company Currency),Preis (Firmenwährung)
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +40,Others,Andere
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +40,Others,Andere
 apps/erpnext/erpnext/templates/includes/product_page.js +80,Cannot find a matching Item. Please select some other value for {0}.,Ein passender Artikel kann nicht gefunden werden. Bitte einen anderen Wert für {0} auswählen.
 DocType: POS Profile,Taxes and Charges,Steuern und Gebühren
 DocType: Item,"A Product or a Service that is bought, sold or kept in stock.","Produkt oder Dienstleistung, die gekauft, verkauft oder auf Lager gehalten wird. "
 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,"Die Berechnungsart kann für die erste Zeile nicht auf ""bezogen auf Menge der vorhergenden Zeile"" oder auf ""bezogen auf Gesamtmenge der vorhergenden Zeile"" gesetzt werden"
 apps/frappe/frappe/core/doctype/doctype/boilerplate/controller_list.html +31,Completed,Abgeschlossen
 DocType: Web Form,Select DocType,Dokumenttyp auswählen
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +104,Broaching,Anstich
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +12,Banking,Bankwesen
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,Bankwesen
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +38,Please click on 'Generate Schedule' to get schedule,"Bitte auf ""Zeitplan generieren"" klicken, um den Zeitplan zu erhalten"
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +283,New Cost Center,Neue Kostenstelle
 DocType: Bin,Ordered Quantity,Bestellte Menge
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +397,"e.g. ""Build tools for builders""","z. B. ""Fertigungs-Werkzeuge für Hersteller"""
+apps/erpnext/erpnext/public/js/setup_wizard.js +145,"e.g. ""Build tools for builders""","z. B. ""Fertigungs-Werkzeuge für Hersteller"""
 DocType: Quality Inspection,In Process,In Bearbeitung
 DocType: Authorization Rule,Itemwise Discount,Artikelbezogener Rabatt
 DocType: Purchase Order Item,Reference Document Type,Referenz-Dokumententyp
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +318,{0} against Sales Order {1},{0} zu Kundenauftrag{1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +320,{0} against Sales Order {1},{0} zu Kundenauftrag{1}
 DocType: Account,Fixed Asset,Anlagevermögen
 apps/erpnext/erpnext/config/stock.py +283,Serialized Inventory,Serialisierter Lagerbestand
 DocType: Activity Type,Default Billing Rate,Standard-Rechnungspreis
@@ -1813,14 +1749,13 @@
 DocType: Purchase Invoice Item,Page Break,Seitenumbruch
 DocType: Production Order Operation,Pending,Ausstehend
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,"Benutzer, die die Urlaubsanträge eines bestimmten Mitarbeiters genehmigen können"
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +33,You cannot change default UOM of Variant. To change default UOM for Variant change default UOM of the Template,"Sie können die Standard-Maßeinheit der Variante nicht direkt ändern. Um die Standard-Maßeinheit für die Variante zu ändern, ändern Sie die Standard-Maßeinheit der Vorlage"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +50,Office Equipments,Büroausstattung
 DocType: Purchase Invoice Item,Qty,Menge
 DocType: Fiscal Year,Companies,Unternehmen
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +24,Electronics,Elektronik
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +24,Electronics,Elektronik
 DocType: Stock Settings,Raise Material Request when stock reaches re-order level,"Materialanfrage erstellen, wenn der Lagerbestand unter einen Wert sinkt"
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +18,From Maintenance Schedule,Vom Wartungsplan
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +56,Full-time,Vollzeit
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +56,Full-time,Vollzeit
 DocType: Purchase Invoice,Contact Details,Kontakt-Details
 DocType: C-Form,Received Date,Empfangsdatum
 DocType: Delivery Note,"If you have created a standard template in Sales Taxes and Charges Template, select one and click on the button below.","Wenn eine Standardvorlage unter den Vorlagen ""Steuern und Abgaben beim Verkauf"" erstellt wurde, bitte eine Vorlage auswählen und auf die Schaltfläche unten klicken."
@@ -1828,15 +1763,16 @@
 DocType: Stock Entry,Total Incoming Value,Summe der Einnahmen
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Einkaufspreisliste
 DocType: Offer Letter Term,Offer Term,Angebotsfrist
-DocType: Quality Inspection,Quality Manager,Qualitätsbeauftragter
+DocType: Quality Inspection,Quality Manager,Qualitätsmanager
 DocType: Job Applicant,Job Opening,Offene Stellen
 DocType: Payment Reconciliation,Payment Reconciliation,Zahlungsabgleich
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +154,Please select Incharge Person's name,Bitte den Namen der verantwortlichen Person auswählen
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +51,Technology,Technologie
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,Technologie
 DocType: Offer Letter,Offer Letter,Angebotsschreiben
-apps/erpnext/erpnext/config/manufacturing.py +51,Generate Material Requests (MRP) and Production Orders.,Materialanfragen (MAF) und Fertigungsaufträge generieren.
+apps/erpnext/erpnext/config/manufacturing.py +51,Generate Material Requests (MRP) and Production Orders.,Materialanfragen (MAF) und Fertigungsaufträge generieren
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +68,Total Invoiced Amt,Gesamtrechnungsbetrag
 DocType: Time Log,To Time,Bis-Zeit
+DocType: Authorization Rule,Approving Role (above authorized value),Genehmigung Rolle (über autorisierte Wert)
 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.","Um Unterknoten hinzuzufügen, klicken Sie in der Baumstruktur auf den Knoten, unter dem Sie weitere Knoten hinzufügen möchten."
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +102,Credit To account must be a Payable account,Habenkonto muss ein Verbindlichkeitenkonto sein
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +233,BOM recursion: {0} cannot be parent or child of {2},Stücklisten-Rekursion: {0} kann nicht übergeordnetes Element oder Unterpunkt von {2} sein
@@ -1848,11 +1784,9 @@
 DocType: Stock Reconciliation Item,Current Valuation Rate,Aktueller Wertansatz
 DocType: Item,Customer Item Codes,Kundenartikelnummern
 DocType: Opportunity,Lost Reason,Verlustgrund
-apps/erpnext/erpnext/config/accounts.py +68,Create Payment Entries against Orders or Invoices.,Neue Zahlungsbuchungen zu Aufträgen oder Rechnungen erstellen.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +141,Welding,Schweißen
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +40,New Stock UOM is required,Neue Lagermaßeinheit ist erforderlich
+apps/erpnext/erpnext/config/accounts.py +68,Create Payment Entries against Orders or Invoices.,Neue Zahlungsbuchungen zu Aufträgen oder Rechnungen erstellen
 DocType: Quality Inspection,Sample Size,Stichprobenumfang
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +443,All items have already been invoiced,Alle Artikel sind bereits abgerechnet
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +446,All items have already been invoiced,Alle Artikel sind bereits abgerechnet
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',"Bitte eine eine gültige ""Von Fall Nr."" angeben"
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +287,Further cost centers can be made under Groups but entries can be made against non-Groups,"Weitere Kostenstellen können unter Gruppen angelegt werden, aber Buchungen können zu nicht-Gruppen erstellt werden"
 DocType: Project,External,Extern
@@ -1864,8 +1798,7 @@
 DocType: Bin,Actual Quantity,Tatsächlicher Bestand
 DocType: Shipping Rule,example: Next Day Shipping,Beispiel: Versand am nächsten Tag
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,Seriennummer {0} wurde nicht gefunden
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +563,Your Customers,Ihre Kunden
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +27,Compression molding,Formpressen
+apps/erpnext/erpnext/public/js/setup_wizard.js +303,Your Customers,Ihre Kunden
 DocType: Leave Block List Date,Block Date,Datum sperren 
 DocType: Sales Order,Not Delivered,Nicht geliefert
 ,Bank Clearance Summary,Zusammenfassung Bankabwicklungen
@@ -1874,7 +1807,7 @@
 DocType: Appraisal Goal,Appraisal Goal,Bewertungsziel
 DocType: Event,Friday,Freitag
 DocType: Time Log,Costing Amount,Kalkulationsbetrag
-DocType: Process Payroll,Submit Salary Slip,Gehaltsabrechnung absenden
+DocType: Process Payroll,Submit Salary Slip,Gehaltsabrechnung übertragen
 DocType: Salary Structure,Monthly Earning & Deduction,Monatliches Einkommen & Abzüge
 apps/erpnext/erpnext/controllers/selling_controller.py +157,Maxiumm discount for Item {0} is {1}%,Maximaler Rabatt für Artikel {0} beträgt {1}%
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,Mengenimport
@@ -1886,10 +1819,10 @@
 DocType: SMS Log,Sent To,Gesendet An
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +28,Make Sales Invoice,Verkaufsrechnung erstellen
 DocType: Company,For Reference Only.,Nur zu Referenzzwecken.
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +29,Invalid {0}: {1},Ungültige(r/s) {0}: {1}
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +49,Invalid {0}: {1},Ungültige(r/s) {0}: {1}
 DocType: Sales Invoice Advance,Advance Amount,Vorauskasse
 DocType: Manufacturing Settings,Capacity Planning,Kapazitätsplanung
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +49,'From Date' is required,"""Von-Datum"" ist erforderlich,"
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +43,'From Date' is required,"""Von-Datum"" ist erforderlich,"
 DocType: Journal Entry,Reference Number,Referenznummer
 DocType: Employee,Employment Details,Beschäftigungsdetails
 DocType: Employee,New Workplace,Neuer Arbeitsplatz
@@ -1904,7 +1837,7 @@
 DocType: Serial No,Delivery Time,Lieferzeit
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Alter basierend auf
 DocType: Item,End of Life,Lebensdauer
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +41,Travel,Reise
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +41,Travel,Reise
 DocType: Leave Block List,Allow Users,Benutzer zulassen
 DocType: Purchase Order,Customer Mobile No,Mobilnummer des Kunden
 DocType: Sales Invoice,Recurring,Wiederkehrend
@@ -1918,7 +1851,7 @@
 DocType: Naming Series,User must always select,Benutzer muss immer auswählen
 DocType: Stock Settings,Allow Negative Stock,Negativen Lagerbestand zulassen
 DocType: Installation Note,Installation Note,Installationshinweis
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +541,Add Taxes,Steuern hinzufügen
+apps/erpnext/erpnext/public/js/setup_wizard.js +283,Add Taxes,Steuern hinzufügen
 ,Financial Analytics,Finanzanalyse
 DocType: Quality Inspection,Verified By,Geprüft durch
 DocType: Address,Subsidiary,Tochtergesellschaft
@@ -1928,7 +1861,6 @@
 DocType: System Settings,In Hours,In Stunden
 DocType: Process Payroll,Create Salary Slip,Gehaltsabrechnung erstellen
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Expected balance as per bank,Voraussichtlicher Kontostand laut Bank
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +115,Buffing,Polieren
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Source of Funds (Liabilities),Mittelherkunft ( Passiva)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +347,Quantity in row {0} ({1}) must be same as manufactured quantity {2},Menge in Zeile {0} ({1}) muss die gleiche sein wie die hergestellte Menge {2}
 DocType: Appraisal,Employee,Mitarbeiter
@@ -1945,11 +1877,11 @@
 DocType: Rename Tool,File to Rename,"Datei, die umbenannt werden soll"
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +176,Purchse Order number required for Item {0},Lieferantenbestellnummer ist für Artikel {0} erforderlich
 apps/erpnext/erpnext/public/js/controllers/transaction.js +136,Show Payments,Zahlungen anzeigen
-apps/erpnext/erpnext/controllers/buying_controller.py +245,Specified BOM {0} does not exist for Item {1},Angegebene Stückliste {0} gibt es nicht für Artikel {1}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +202,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Wartungsplan {0} muss vor Stornierung dieses Kundenauftrages aufgehoben werden
+apps/erpnext/erpnext/controllers/buying_controller.py +236,Specified BOM {0} does not exist for Item {1},Angegebene Stückliste {0} gibt es nicht für Artikel {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Wartungsplan {0} muss vor Stornierung dieses Kundenauftrages aufgehoben werden
 apps/frappe/frappe/desk/page/backups/backups.html +13,Size,Größe
 DocType: Notification Control,Expense Claim Approved,Aufwandsabrechnung genehmigt
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +113,Pharmaceutical,Arzneimittel
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Pharmaceutical,Arzneimittel
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,Aufwendungen für bezogene Artikel
 DocType: Selling Settings,Sales Order Required,Kundenauftrag erforderlich
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +30,Create Customer,Neuen Kunden erstellen
@@ -1959,7 +1891,6 @@
 DocType: Quality Inspection Reading,Reading 9,Ablesung 9
 DocType: Supplier,Is Frozen,Ist gesperrt
 DocType: Buying Settings,Buying Settings,Einkaufs-Einstellungen
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +122,Mass finishing,Massenverarbeitung
 DocType: Stock Entry Detail,BOM No. for a Finished Good Item,Stücklisten-Nr. für einen fertigen Artikel
 DocType: Upload Attendance,Attendance To Date,Anwesenheit bis Datum
 apps/erpnext/erpnext/config/selling.py +158,Setup incoming server for sales email id. (e.g. sales@example.com),E-Mail-Adresse für den Vertrieb einrichten. (z. B. sales@example.com)
@@ -1967,7 +1898,7 @@
 DocType: Payment Tool,Payment Account,Zahlungskonto
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +713,Please specify Company to proceed,Bitte Firma angeben um fortzufahren
 apps/frappe/frappe/public/js/frappe/model/indicator.js +30,Draft,Entwurf
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +46,Compensatory Off,Ausgleich für
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Compensatory Off,Ausgleich für
 DocType: Quality Inspection Reading,Accepted,Genehmigt
 DocType: User,Female,Weiblich
 DocType: Journal Entry Account,Debit in Account Currency,Soll in Kontowährung
@@ -1979,31 +1910,32 @@
 DocType: Shipping Rule,Shipping Rule Label,Bezeichnung der Versandregel
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +209,Raw Materials cannot be blank.,Rohmaterial kann nicht leer sein
 DocType: Newsletter,Test,Test
-apps/erpnext/erpnext/stock/doctype/item/item.py +364,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +368,"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'","Da es bestehende Lagertransaktionen für diesen Artikel gibt, können die Werte von ""Hat Seriennummer"", ""Hat Losnummer"", ""Ist Lagerartikel"" und ""Bewertungsmethode"" nicht geändert werden"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +448,Quick Journal Entry,Schnellbuchung
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +92,You can not change rate if BOM mentioned agianst any item,"Sie können den Preis nicht ändern, wenn eine Stückliste für einen Artikel aufgeführt ist"
 DocType: Employee,Previous Work Experience,Vorherige Berufserfahrung
 DocType: Stock Entry,For Quantity,Für Menge
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +157,Please enter Planned Qty for Item {0} at row {1},Bitte die geplante Menge für Artikel {0} in Zeile {1} eingeben
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +211,{0} {1} is not submitted,{0} {1} wurde nicht versendet
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +211,{0} {1} is not submitted,{0} {1} wurde nicht übertragen
 apps/erpnext/erpnext/config/stock.py +18,Requests for items.,Artikelanfragen
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,Für jeden zu fertigenden Artikel wird ein separater Fertigungsauftrag erstellt.
 DocType: Purchase Invoice,Terms and Conditions1,Allgemeine Geschäftsbedingungen1
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +18,Complete Setup,Einrichtung abschliessen
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard_page.html +18,Complete Setup,Einrichtung abschliessen
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.",Buchung wurde bis zu folgendem Zeitpunkt gesperrt. Bearbeiten oder ändern kann nur die Person in unten stehender Rolle.
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +121,Please save the document before generating maintenance schedule,Bitte das Dokument vor dem Erstellen eines Wartungsplans abspeichern
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,Projektstatus
 DocType: UOM,Check this to disallow fractions. (for Nos),"Hier aktivieren, um keine Bruchteile zuzulassen. (für Nr.)"
 apps/erpnext/erpnext/config/crm.py +96,Newsletter Mailing List,Newsletter-Versandliste
 DocType: Delivery Note,Transporter Name,Name des Transportunternehmers
+DocType: Authorization Rule,Authorized Value,Autorisierte Wert
 DocType: Contact,Enter department to which this Contact belongs,"Abteilung eingeben, zu der dieser Kontakt gehört"
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Absent,Summe Abwesenheit
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +746,Item or Warehouse for row {0} does not match Material Request,Artikel oder Lager in Zeile {0} stimmen nicht mit Materialanfrage überein
 apps/erpnext/erpnext/config/stock.py +109,Unit of Measure,Mengeneinheit
 DocType: Fiscal Year,Year End Date,Enddatum des Geschäftsjahres
 DocType: Task Depends On,Task Depends On,Aufgabe hängt davon ab
-DocType: Lead,Opportunity,Möglichkeit
+DocType: Lead,Opportunity,Opportunity
 DocType: Salary Structure Earning,Salary Structure Earning,Gehaltsstruktur-Verdienst
 ,Completed Production Orders,Abgeschlossene Fertigungsaufträge
 DocType: Operation,Default Workstation,Standard-Arbeitsplatz
@@ -2021,16 +1953,15 @@
 DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),Grundbetrag (nach Lagermaßeinheit)
 DocType: SMS Log,No of Requested SMS,Anzahl angeforderter SMS
 DocType: Campaign,Campaign-.####,Kampagne-.####
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +55,Piercing,Stechverfahren
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,Nächste Schritte
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +117,Contract End Date must be greater than Date of Joining,Vertragsende muss weiter in der Zukunft liegen als Eintrittsdatum sein
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,"Ein Drittanbieter/Händler/Kommissionär/verbundenes Unternehmen/Wiederverkäufer, der die Produkte auf Provisionsbasis verkauft."
 DocType: Customer Group,Has Child Node,Unterknoten vorhanden
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{0} against Purchase Order {1},{0} zu Bestellung {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +332,{0} against Purchase Order {1},{0} zu Bestellung {1}
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","Statische URL-Parameter hier eingeben (z. B. Absender=ERPNext, Benutzername=ERPNext, Passwort=1234 usw.)"
 apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,"{0} {1} ist in keinem aktiven Geschäftsjahr. Für weitere Details, bitte {2} prüfen."
-apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,"Dies ist eine Beispiel-Webseite, von ERPNext automatisch generiert"
+apps/erpnext/erpnext/setup/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,"Dies ist eine Beispiel-Webseite, von ERPNext automatisch generiert"
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +37,Ageing Range 1,Alter Bereich 1
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +110,Photochemical machining,Photochemische Bearbeitung
 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.
 
 #### Note
@@ -2076,7 +2007,7 @@
 DocType: Purchase Receipt Item,Recd Quantity,Zurückgegebene Menge
 DocType: Email Account,Email Ids,E-Mail-IDs
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},"Es können nicht mehr Artikel {0} produziert werden, als die über Kundenaufträge bestellte Stückzahl {1}"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +471,Stock Entry {0} is not submitted,Lagerbuchung {0} wurde nicht versendet
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +473,Stock Entry {0} is not submitted,Lagerbuchung {0} wurde nicht übertragen
 DocType: Payment Reconciliation,Bank / Cash Account,Bank / Geldkonto 
 DocType: Tax Rule,Billing City,Stadt laut Rechnungsadresse
 DocType: Global Defaults,Hide Currency Symbol,Währungssymbol ausblenden
@@ -2089,23 +2020,23 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +76,Max 100 rows for Stock Reconciliation.,Max 100 Zeilen für Lagerabgleich.
 DocType: Stock Entry,Manufacture,Herstellung
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +13,Please Delivery Note first,Bitte Lieferschein zuerst
-DocType: Purchase Invoice,Currency and Price List,Währung und Preisliste
+DocType: Purchase Invoice,Currency and Price List,Währungs- und Preisliste
 DocType: Opportunity,Customer / Lead Name,Kunden/Lead-Name
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +63,Clearance Date not mentioned,Einlösungsdatum nicht benannt
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +71,Production,Produktion
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Production,Produktion
 DocType: Item,Allow Production Order,Fertigungsauftrag zulassen
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +60,Row {0}:Start Date must be before End Date,Row {0}: Startdatum muss vor dem Enddatum liegen
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Summe (Anzahl)
 DocType: Installation Note Item,Installed Qty,Installierte Anzahl
 DocType: Lead,Fax,Telefax
 DocType: Purchase Taxes and Charges,Parenttype,Typ des übergeordneten Elements
-apps/frappe/frappe/public/js/frappe/model/indicator.js +43,Submitted,Versendet
+apps/frappe/frappe/public/js/frappe/model/indicator.js +43,Submitted,Übertragen
 DocType: Salary Structure,Total Earning,Gesamteinnahmen
 DocType: Purchase Receipt,Time at which materials were received,"Zeitpunkt, zu dem Materialien empfangen wurden"
 apps/erpnext/erpnext/utilities/doctype/address/address.py +113,My Addresses,Meine Adressen
 DocType: Stock Ledger Entry,Outgoing Rate,Verkaufspreis
-apps/erpnext/erpnext/config/hr.py +100,Organization branch master.,Stammdaten zu Unternehmensfilialen.
-apps/erpnext/erpnext/controllers/accounts_controller.py +237, or ,oder
+apps/erpnext/erpnext/config/hr.py +100,Organization branch master.,Stammdaten zu Unternehmensfilialen
+apps/erpnext/erpnext/controllers/accounts_controller.py +238, or ,oder
 DocType: Sales Order,Billing Status,Abrechnungsstatus 
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Utility Expenses,Versorgungsaufwendungen
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,90-Above,Über 90
@@ -2132,6 +2063,7 @@
 DocType: Stock Entry Detail,Serial No / Batch,Seriennummer / Charge
 DocType: Product Bundle,Parent Item,Übergeordneter Artikel
 DocType: Account,Account Type,Kontentyp 
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +113,Leave Type {0} cannot be carry-forwarded,"Lassen Typ {0} kann nicht tragen, weitergeleitet werden"
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +213,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',"Wartungsplan wird nicht für alle Elemente erzeugt. Bitte klicken Sie auf ""Zeitplan generieren"""
 ,To Produce,Zu produzieren
 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","Für Zeile {0} in {1}. Um {2} in die Artikel-Bewertung mit einzubeziehen, muss auch Zeile {3} mit enthalten sein"
@@ -2139,46 +2071,42 @@
 DocType: Bin,Reserved Quantity,Reservierte Menge
 DocType: Landed Cost Voucher,Purchase Receipt Items,Kaufbeleg-Artikel
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,Formulare anpassen
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +62,Cutting,Zuschnitt
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +69,Flattening,Abflachung
 DocType: Account,Income Account,Ertragskonto
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +22,Molding,Guss
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +632,Delivery,Auslieferung
 DocType: Stock Reconciliation Item,Current Qty,Aktuelle Anzahl
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",Siehe „Anteil der zu Grunde liegenden Materialien“ im Abschnitt Kalkulation
 DocType: Appraisal Goal,Key Responsibility Area,Wichtigster Verantwortungsbereich
 DocType: Item Reorder,Material Request Type,Materialanfragetyp
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +84,Row {0}: UOM Conversion Factor is mandatory,Zeile {0}: UOM Umrechnungsfaktor ist obligatorisch
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +84,Row {0}: UOM Conversion Factor is mandatory,Zeile {0}: Umrechnungsfaktor für Maßeinheit ist zwingend erforderlich
 apps/frappe/frappe/desk/moduleview.py +61,Documents,Dokumente
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +17,Ref,Ref.
 DocType: Cost Center,Cost Center,Kostenstelle
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.js +48,Voucher #,Beleg #
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +36,Voucher #,Beleg #
 DocType: Notification Control,Purchase Order Message,Lieferantenauftrags-Nachricht
 DocType: Tax Rule,Shipping Country,Zielland der Lieferung
 DocType: Upload Attendance,Upload HTML,HTML hochladen
-apps/erpnext/erpnext/controllers/accounts_controller.py +391,"Total advance ({0}) against Order {1} cannot be greater \
+apps/erpnext/erpnext/controllers/accounts_controller.py +392,"Total advance ({0}) against Order {1} cannot be greater \
 				than the Grand Total ({2})",Summe der Anzahlungen ({0}) zu Bestellung {1} kann nicht größer sein  als die Gesamtsumme ({2})
-DocType: Employee,Relieving Date,Entlassungsdatum
+DocType: Employee,Relieving Date,Freistellungsdatum
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +12,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.",Die Preisregel überschreibt die Preisliste. Bitte einen Rabattsatz aufgrund bestimmter Kriterien definieren.
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,Lager kann nur über Lagerbuchung / Lieferschein / Kaufbeleg geändert werden
 DocType: Employee Education,Class / Percentage,Klasse / Anteil
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +92,Head of Marketing and Sales,Leiter Marketing und Vertrieb
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +31,Income Tax,Einkommensteuer
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +157,Laser engineered net shaping,Lasertechnikbasierende Netzformung
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Head of Marketing and Sales,Leiter Marketing und Vertrieb
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +31,Income Tax,Einkommensteuer
 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.","Wenn für ""Preis"" eine Preisregel ausgewählt wurde, wird die Preisliste überschrieben. Der Preis aus der Preisregel ist der endgültige Preis, es sollte also kein weiterer Rabatt gewährt werden. Daher wird er in Transaktionen wie Kundenauftrag, Bestellung etc., vorrangig aus dem Feld ""Preis"" gezogen, und dann erst aus dem Feld ""Preisliste""."
 apps/erpnext/erpnext/config/selling.py +163,Track Leads by Industry Type.,Leads nach Branchentyp nachverfolgen.
 DocType: Item Supplier,Item Supplier,Artikellieferant
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +328,Please enter Item Code to get batch no,Bitte die Artikelnummer eingeben um die Chargennummer zu erhalten
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +643,Please select a value for {0} quotation_to {1},Bitte einen Wert für {0} Angebot an {1} auswählen
-apps/erpnext/erpnext/config/selling.py +33,All Addresses.,Alle Adressen.
+apps/erpnext/erpnext/config/selling.py +33,All Addresses.,Alle Adressen
 DocType: Company,Stock Settings,Lager-Voreinstellungen
 DocType: User,Bio,Lebenslauf
 apps/erpnext/erpnext/accounts/doctype/account/account.py +194,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Zusammenführung ist nur möglich, wenn folgende Eigenschaften in beiden Datensätzen identisch sind:  Gruppe, Root-Typ, Firma"
-apps/erpnext/erpnext/config/crm.py +72,Manage Customer Group Tree.,Baumstruktur der Kundengruppen verwalten.
+apps/erpnext/erpnext/config/crm.py +72,Manage Customer Group Tree.,Baumstruktur der Kundengruppen verwalten
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +285,New Cost Center Name,Neuer Kostenstellenname
 DocType: Leave Control Panel,Leave Control Panel,Urlaubsverwaltung
 apps/erpnext/erpnext/utilities/doctype/address/address.py +90,No default Address Template found. Please create a new one from Setup > Printing and Branding > Address Template.,Keine Standard-Adressvorlage gefunden. Bitte eine neue unter Setup > Druck und Branding > Adressvorlage erstellen.
-DocType: Appraisal,HR User,Personalbenutzer
+DocType: Appraisal,HR User,Nutzer Personalabteilung
 DocType: Purchase Invoice,Taxes and Charges Deducted,Steuern und Gebühren abgezogen
 apps/erpnext/erpnext/shopping_cart/utils.py +46,Issues,Fragen
 apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},Status muss einer aus {0} sein
@@ -2187,31 +2115,28 @@
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Tatsächliche Anzahl nach Transaktionen
 ,Pending SO Items For Purchase Request,Ausstehende Artikel aus Kundenaufträgen für Einkaufsanfrage
 DocType: Supplier,Billing Currency,Abrechnungswährung
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +148,Extra Large,Besonders groß
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,Extra Large,Besonders groß
 ,Profit and Loss Statement,Gewinn- und Verlustrechnung
 DocType: Bank Reconciliation Detail,Cheque Number,Schecknummer
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +43,Pressing,Drücken
 DocType: Payment Tool Detail,Payment Tool Detail,Zahlungsabgleichs-Werkzeug-Details
 ,Sales Browser,Vertriebs-Browser
 DocType: Journal Entry,Total Credit,Gesamt-Haben
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +474,Warning: Another {0} # {1} exists against stock entry {2},Achtung: Zu Lagerbuchung {2} gibt es eine andere Gegenbuchung {0} # {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +459,Local,Lokal
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +476,Warning: Another {0} # {1} exists against stock entry {2},Achtung: Zu Lagerbuchung {2} gibt es eine andere Gegenbuchung {0} # {1}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +397,Local,Lokal
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),Darlehen und Anzahlungen (Aktiva)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,Schuldner
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +147,Large,Groß
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +23,No employee found!,Kein Mitarbeiter gefunden!
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Large,Groß
 DocType: C-Form Invoice Detail,Territory,Region
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,"Bitte bei ""Besuche erforderlich"" NEIN angeben"
 DocType: Purchase Order,Customer Address Display,Anzeige der Kundenadresse
 DocType: Stock Settings,Default Valuation Method,Standard-Bewertungsmethode
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +127,Polishing,Polieren
 DocType: Production Order Operation,Planned Start Time,Geplante Startzeit
-apps/erpnext/erpnext/config/accounts.py +63,Close Balance Sheet and book Profit or Loss.,Bilanz schliessen und in die Gewinn und Verlustrechnung übernehmen.
-apps/erpnext/erpnext/stock/doctype/item/item.py +661,"Default Unit of Measure for Item {0} cannot be changed directly because \
+apps/erpnext/erpnext/config/accounts.py +63,Close Balance Sheet and book Profit or Loss.,Bilanz schliessen und in die Gewinn und Verlustrechnung übernehmen
+apps/erpnext/erpnext/stock/doctype/item/item.py +665,"Default Unit of Measure for Item {0} cannot be changed directly because \
 			you have already made some transaction(s) with another UOM. To change default UOM, \
 			use 'UOM Replace Utility' tool under Stock module.","Standard-Maßeinheit für Artikel {0} kann nicht direkt geändert werden, weil bereits einige Transaktion(en) mit einer anderen Standard-Maßeinheit gemacht wurden. Bitte das Maßeinheit-Ersetzungswerkzeug im Lagermodul verwenden."
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,Wechselkurs zum Umrechnen einer Währung in eine andere angeben
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +146,Quotation {0} is cancelled,Angebot {0} wird storniert
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +141,Quotation {0} is cancelled,Angebot {0} wird storniert
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,Offener Gesamtbetrag
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} was on leave on {1}. Cannot mark attendance.,"Mitarbeiter {0} war am {1} im Urlaub. Er kann nicht auf ""anwesend"" gesetzt werden."
 DocType: Sales Partner,Targets,Ziele
@@ -2222,7 +2147,6 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +158,Please create Customer from Lead {0},Bitte Kunden aus Lead {0} erstellen
 DocType: Price List,Applicable for Countries,Anwendbar für Länder
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Computers,Rechner
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +112,Electro-chemical grinding,Elektrochemisches Schleifen
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +14,This is a root customer group and cannot be edited.,Dies ist eine Root-Kundengruppe und kann nicht bearbeitet werden.
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +39,Please setup your chart of accounts before you start Accounting Entries,"Bitte zunächst Kontenplan einrichten, bevor Buchungen vorgenommen werden"
 DocType: Purchase Invoice,Ignore Pricing Rule,Preisregel ignorieren
@@ -2280,7 +2204,6 @@
 DocType: Maintenance Visit,Purposes,Zweck
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +103,Atleast one item should be entered with negative quantity in return document,Mindestens ein Artikel sollte mit negativer Menge in das Rückgabedokument eingegeben werden
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +67,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations",Arbeitsgang {0} ist länger als alle verfügbaren Arbeitszeiten am Arbeitsplatz {1}. Bitte den Vorgang in mehrere Teilarbeitsgänge aufteilen.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +134,Electrochemical machining,Elektrochemische Bearbeitung
 ,Requested,Angefordert
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +66,No Remarks,Keine Anmerkungen
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +13,Overdue,Überfällig
@@ -2289,12 +2212,12 @@
 DocType: Monthly Distribution,Distribution Name,Bezeichnung des Großhandels
 DocType: Features Setup,Sales and Purchase,Vertrieb und Einkauf
 DocType: Supplier Quotation Item,Material Request No,Materialanfragenr.
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +218,Quality Inspection required for Item {0},Qualitätsprüfung für den Posten erforderlich {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +221,Quality Inspection required for Item {0},Qualitätsprüfung für den Posten erforderlich {0}
 DocType: Quotation,Rate at which customer's currency is converted to company's base currency,"Kurs, zu dem die Währung des Kunden in die Basiswährung des Unternehmens umgerechnet wird"
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +107,{0} has been successfully unsubscribed from this list.,{0} wurde erfolgreich aus dieser Liste ausgetragen.
 DocType: Purchase Invoice Item,Net Rate (Company Currency),Nettopreis (Firmenwährung)
 apps/frappe/frappe/templates/base.html +134,Added,Hinzugefügt
-apps/erpnext/erpnext/config/crm.py +81,Manage Territory Tree.,Baumstruktur der Region verwalten.
+apps/erpnext/erpnext/config/crm.py +81,Manage Territory Tree.,Baumstruktur der Region verwalten
 DocType: Journal Entry Account,Sales Invoice,Ausgangsrechnung
 DocType: Journal Entry Account,Party Balance,Gruppen-Saldo
 DocType: Sales Invoice Item,Time Log Batch,Zeitprotokollstapel
@@ -2307,9 +2230,8 @@
 apps/erpnext/erpnext/accounts/report/financial_statements.py +16,Fiscal Year {0} not found.,Geschäftsjahr {0} nicht gefunden.
 DocType: Bank Reconciliation,Get Relevant Entries,Zutreffende Buchungen aufrufen
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +407,Accounting Entry for Stock,Lagerbuchung
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +64,Coining,Prägung
 DocType: Sales Invoice,Sales Team1,Verkaufsteam1
-apps/erpnext/erpnext/stock/doctype/item/item.py +412,Item {0} does not exist,Artikel {0} existiert nicht
+apps/erpnext/erpnext/stock/doctype/item/item.py +416,Item {0} does not exist,Artikel {0} existiert nicht
 DocType: Sales Invoice,Customer Address,Kundenadresse
 apps/frappe/frappe/desk/query_report.py +136,Total,Summe
 DocType: Purchase Invoice,Apply Additional Discount On,Zusätzlichen Rabatt gewähren auf
@@ -2321,14 +2243,13 @@
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),Steuerbetrag nach Abzug von Rabatt (Firmenwährung)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +149,Target warehouse is mandatory for row {0},Eingangslager ist für Zeile {0} zwingend erforderlich
 DocType: Quality Inspection,Quality Inspection,Qualitätsprüfung
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +144,Extra Small,Besonders klein
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +20,Spray forming,Sprühformverfahren
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Extra Small,Besonders klein
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +458,Warning: Material Requested Qty is less than Minimum Order Qty,Achtung : Materialanfragemenge ist geringer als die Mindestbestellmenge
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +191,Account {0} is frozen,Konto {0} ist gesperrt 
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,"Juristische Person/Niederlassung mit einem separaten Kontenplan, die zum Unternehmen gehört."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +29,"Food, Beverage & Tobacco","Lebensmittel, Getränke und Tabak"
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","Lebensmittel, Getränke und Tabak"
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +20,PL or BS,PL oder BS
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,Can only make payment against unbilled {0},Zahlung kann nur zu einer noch nicht abgerechneten {0} erstellt werden
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +531,Can only make payment against unbilled {0},Zahlung kann nur zu einer noch nicht abgerechneten {0} erstellt werden
 apps/erpnext/erpnext/controllers/selling_controller.py +122,Commission rate cannot be greater than 100,Provisionssatz kann nicht größer als 100 sein
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Minimum Inventory Level,Mindestbestandshöhe
 DocType: Stock Entry,Subcontract,Zulieferer
@@ -2339,19 +2260,18 @@
 DocType: Item,Manufacturer Part Number,Hersteller-Teilenummer
 DocType: Production Order Operation,Estimated Time and Cost,Geschätzte Zeit und Kosten
 DocType: Bin,Bin,Lagerfach
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +50,Nosing,Nosing
 DocType: SMS Log,No of Sent SMS,Anzahl abgesendeter SMS
 DocType: Account,Company,Firma
 DocType: Account,Expense Account,Aufwandskonto
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +49,Software,Software
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +151,Colour,Farbe
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +49,Software,Software
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Colour,Farbe
 DocType: Maintenance Visit,Scheduled,Geplant
 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","Bitte einen Artikel auswählen, bei dem ""Ist Lagerartikel"" mit ""Nein"" und ""Ist Verkaufsartikel"" mit ""Ja"" bezeichnet ist, und es kein anderes Produkt-Bundle gibt"
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,"Bitte ""Monatsweise Verteilung"" wählen, um Ziele ungleichmäßig über Monate zu verteilen."
 DocType: Purchase Invoice Item,Valuation Rate,Wertansatz
 apps/erpnext/erpnext/stock/get_item_details.py +281,Price List Currency not selected,Preislistenwährung nicht ausgewählt
 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,"Artikel Zeile {0}: Kaufbeleg {1} existiert nicht in der obigen Tabelle ""Eingangslieferscheine"""
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +134,Employee {0} has already applied for {1} between {2} and {3},Mitarbeiter {0} hat sich bereits für {1} zwischen {2} und {3} beworben
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +145,Employee {0} has already applied for {1} between {2} and {3},Mitarbeiter {0} hat sich bereits für {1} zwischen {2} und {3} beworben
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Projektstartdatum
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +8,Until,Bis
 DocType: Rename Tool,Rename Log,Protokoll umbenennen
@@ -2361,7 +2281,7 @@
 apps/erpnext/erpnext/controllers/recurring_document.py +162,Please select {0},Bitte {0} auswählen
 DocType: C-Form,C-Form No,Kontakt-Formular-Nr.
 DocType: BOM,Exploded_items,Exploded_items
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +95,Researcher,Wissenschaftler
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Researcher,Wissenschaftler
 apps/frappe/frappe/custom/doctype/customize_form/customize_form.js +88,Update,Aktualisieren
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +78,Please save the Newsletter before sending,Bitte den Newsletter vor dem Senden speichern
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +23,Name or Email is mandatory,Name oder E-Mail-Adresse ist zwingend erforderlich
@@ -2370,31 +2290,27 @@
 DocType: Employee,Exit,Beenden
 apps/erpnext/erpnext/accounts/doctype/account/account.py +134,Root Type is mandatory,Root-Typ ist zwingend erforderlich
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +295,Serial No {0} created,Seriennummer {0} erstellt
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +125,Vibratory finishing,Gleitschleifen
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","Zum Vorteil für die Kunden, können diese Kodes in Druckformaten wie Rechnungen und Lieferscheinen verwendet werden"
 DocType: Employee,You can enter any date manually,Sie können jedes Datum manuell eingeben
 DocType: Sales Invoice,Advertisement,Werbung
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +165,Probationary Period,Probezeit
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Probationary Period,Probezeit
 DocType: Customer Group,Only leaf nodes are allowed in transaction,In dieser Transaktion sind nur Unterknoten erlaubt
 DocType: Expense Claim,Expense Approver,Ausgabenbewilliger
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,Kaufbeleg-Artikel geliefert
 apps/erpnext/erpnext/public/js/pos/pos.js +343,Pay,Zahlen
-apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +17,To Datetime,Um Datetime
+apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +17,To Datetime,Bis Datum und Uhrzeit
 DocType: SMS Settings,SMS Gateway URL,SMS-Gateway-URL
 apps/erpnext/erpnext/config/crm.py +53,Logs for maintaining sms delivery status,Protokolle über den SMS-Versand
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +137,Grinding,Schliff
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +34,Shrink wrapping,Einschweißtechnik
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +36,Pending Activities,Ausstehende Aktivitäten
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,Confirmed,Bestätigt
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier > Supplier Type,Lieferant > Lieferantentyp
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +127,Please enter relieving date.,Bitte Entlassungsdatum eingeben.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +127,Please enter relieving date.,Bitte Freistellungsdatum eingeben.
 apps/erpnext/erpnext/controllers/trends.py +137,Amt,Menge
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' can be submitted,"Nur Urlaubsanträge mit dem Status ""Genehmigt"" können versendet werden"
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +51,Only Leave Applications with status 'Approved' can be submitted,"Nur Urlaubsanträge mit dem Status ""Genehmigt"" können übertragen werden"
 apps/erpnext/erpnext/utilities/doctype/address/address.py +21,Address Title is mandatory.,Adressbezeichnung muss zwingend angegeben werden.
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,"Namen der Kampagne eingeben, wenn der Ursprung der Anfrage eine Kampagne ist"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +38,Newspaper Publishers,Zeitungsverleger
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +38,Newspaper Publishers,Zeitungsverleger
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,Geschäftsjahr auswählen
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +88,Smelting,Verhüttung
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Meldebestand
 DocType: Attendance,Attendance Date,Anwesenheitsdatum
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,Gehaltsaufteilung nach Einkommen und Abzügen.
@@ -2405,20 +2321,19 @@
 DocType: Item,Valuation Method,Bewertungsmethode
 DocType: Sales Invoice,Sales Team,Verkaufsteam
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +81,Duplicate entry,Doppelter Eintrag/doppelte Buchung
-DocType: Serial No,Under Warranty,Unter Garantie
+DocType: Serial No,Under Warranty,Innerhalb der Garantie
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +414,[Error],[Fehler]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,"""In Worten"" wird sichtbar, sobald Sie den Kundenauftrag speichern."
 ,Employee Birthday,Mitarbeiter-Geburtstag
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +55,Venture Capital,Risikokapital
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,Risikokapital
 DocType: UOM,Must be Whole Number,Muss eine ganze Zahl sein
 DocType: Leave Control Panel,New Leaves Allocated (In Days),Neue Urlaubszuordnung (in Tagen)
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +51,Serial No {0} does not exist,Seriennummer {0} existiert nicht
 DocType: Pricing Rule,Discount Percentage,Rabatt in Prozent
 DocType: Payment Reconciliation Invoice,Invoice Number,Rechnungsnummer
-apps/erpnext/erpnext/hooks.py +70,Orders,Bestellungen
+apps/erpnext/erpnext/hooks.py +54,Orders,Bestellungen
 DocType: Leave Control Panel,Employee Type,Mitarbeitertyp
 DocType: Employee Leave Approver,Leave Approver,Urlaubsgenehmiger
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +70,Swaging,Gesenkschmieden
 DocType: Manufacturing Settings,Material Transferred for Manufacture,Material zur Herstellung übertragen
 DocType: Expense Claim,"A user with ""Expense Approver"" role","Ein Benutzer mit der Rolle ""Ausgabengenehmiger"""
 ,Issued Items Against Production Order,Zu Fertigungsauftrag ausgegebene Artikel
@@ -2430,23 +2345,22 @@
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +62,Cost Center with existing transactions can not be converted to group,Kostenstelle mit bestehenden Transaktionen kann nicht in eine Gruppe umgewandelt werden
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Depreciation,Abschreibung
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Lieferant(en)
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +29,Invalid period,Ungültiger Zeitraum
 DocType: Customer,Credit Limit,Kreditlimit
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,Bitte Transaktionstyp auswählen
 DocType: GL Entry,Voucher No,Belegnr.
 DocType: Leave Allocation,Leave Allocation,Urlaubszuordnung
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +396,Material Requests {0} created,Materialanfrage {0} erstellt
-apps/erpnext/erpnext/config/selling.py +122,Template of terms or contract.,Vorlage für Geschäftsbedingungen oder Vertrag.
+apps/erpnext/erpnext/config/selling.py +122,Template of terms or contract.,Vorlage für Geschäftsbedingungen oder Vertrag
 DocType: Customer,Address and Contact,Adresse und Kontakt
 DocType: Customer,Last Day of the Next Month,Letzter Tag des nächsten Monats
 DocType: Employee,Feedback,Rückmeldung
+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}","Schreib kann nicht zugeordnet werden, bevor {0}, so Urlaub Bilanz wurde bereits Trag weitergeleitet in der Zukunft verlassen Allokation Rekord {1}"
 apps/erpnext/erpnext/accounts/party.py +284,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Hinweis: Stichtag übersteigt das vereinbarte Zahlungsziel um {0} Tag(e)
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +621,Maint. Schedule,Wartungsplan
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +108,Abrasive jet machining,Schleifmittelstrahlbearbeitung
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +632,Maint. Schedule,Wartungsplan
 DocType: Stock Settings,Freeze Stock Entries,Lagerbuchungen sperren
 DocType: Website Settings,Website Settings,Webseiten-Einstellungen
 DocType: Item,Reorder level based on Warehouse,Meldebestand auf Basis von Warehouse
-DocType: Activity Cost,Billing Rate,Abrechnungssatz
+DocType: Activity Cost,Billing Rate,Abrechnungsbetrag
 ,Qty to Deliver,Zu liefernde Menge
 DocType: Monthly Distribution Percentage,Month,Monat
 ,Stock Analytics,Bestandsanalyse
@@ -2459,7 +2373,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +75,Show Stock Entries,Lagerbuchungen anzeigen
 ,Is Primary Address,Ist Hauptadresse
 DocType: Production Order,Work-in-Progress Warehouse,Fertigungslager
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +308,Reference #{0} dated {1},Referenz #{0} vom {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Reference #{0} dated {1},Referenz #{0} vom {1}
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +13,Manage Addresses,Adressen verwalten
 DocType: Pricing Rule,Item Code,Artikelnummer
 DocType: Production Planning Tool,Create Production Orders,Fertigungsaufträge erstellen
@@ -2468,25 +2382,25 @@
 DocType: Lead,Market Segment,Marktsegment
 DocType: Communication,Phone,Telefon
 DocType: Employee Internal Work History,Employee Internal Work History,Interne Berufserfahrung des Mitarbeiters
-apps/erpnext/erpnext/public/js/account_tree_grid.js +50,Closing (Dr),Schlußstand (Soll)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +221,Closing (Dr),Schlußstand (Soll)
 DocType: Contact,Passive,Passiv
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,Seriennummer {0} ist nicht auf Lager
-apps/erpnext/erpnext/config/selling.py +127,Tax template for selling transactions.,Steuer-Vorlage für Verkaufstransaktionen.
+apps/erpnext/erpnext/config/selling.py +127,Tax template for selling transactions.,Steuer-Vorlage für Verkaufstransaktionen
 DocType: Sales Invoice,Write Off Outstanding Amount,Abschreibung auf offene Forderungen
-DocType: Features Setup,"Check if you need automatic recurring invoices. After submitting any sales invoice, Recurring section will be visible.","Aktivieren, wenn Sie automatisch wiederkehrende Ausgangsrechnungen benötigen. Nach dem Absenden einer Ausgangsrechnung wird der Bereich für wiederkehrende Ausgangsrechnungen angezeigt."
+DocType: Features Setup,"Check if you need automatic recurring invoices. After submitting any sales invoice, Recurring section will be visible.","Aktivieren, wenn Sie automatisch wiederkehrende Ausgangsrechnungen benötigen. Nach dem Übertragen einer Ausgangsrechnung wird der Bereich für wiederkehrende Ausgangsrechnungen angezeigt."
 DocType: Account,Accounts Manager,Kontenmanager
-apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +39,Time Log {0} must be 'Submitted',"Zeitprotokoll {0} muss ""versendet"" sein"
+apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +39,Time Log {0} must be 'Submitted',"Zeitprotokoll {0} muss ""übertragen"" sein"
 DocType: Stock Settings,Default Stock UOM,Standardlagermaßeinheit
-DocType: Time Log,Costing Rate based on Activity Type (per hour),Kalkulationspreis basierend auf Aktivitätsart (pro Stunde)
+DocType: Time Log,Costing Rate based on Activity Type (per hour),Kalkulationsbetrag basierend auf Aktivitätsart (pro Stunde)
 DocType: Production Planning Tool,Create Material Requests,Materialanfragen erstellen
 DocType: Employee Education,School/University,Schule/Universität
 DocType: Sales Invoice Item,Available Qty at Warehouse,Verfügbarer Lagerbestand 
 ,Billed Amount,Rechnungsbetrag 
 DocType: Bank Reconciliation,Bank Reconciliation,Kontenabgleich
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +9,Get Updates,Updates abholen
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +129,Material Request {0} is cancelled or stopped,Materialanfrage {0} wird storniert oder gestoppt
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +641,Add a few sample records,Ein paar Beispieldatensätze hinzufügen
-apps/erpnext/erpnext/config/hr.py +210,Leave Management,Lassen Verwaltung
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +133,Material Request {0} is cancelled or stopped,Materialanfrage {0} wird storniert oder gestoppt
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Add a few sample records,Ein paar Beispieldatensätze hinzufügen
+apps/erpnext/erpnext/config/hr.py +210,Leave Management,Urlaubsverwaltung
 DocType: Event,Groups,Gruppen
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,Gruppieren nach Konto
 DocType: Sales Order,Fully Delivered,Komplett geliefert
@@ -2498,38 +2412,34 @@
 DocType: Features Setup,Sales Extras,Vertriebsextras
 apps/erpnext/erpnext/accounts/utils.py +344,{0} budget for Account {1} against Cost Center {2} will exceed by {3},{0} Budget für Konto {1} zu Kostenstelle {2} wird um {3} überschritten
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +236,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Differenzkonto muss ein Vermögens-/Verbindlichkeiten-Konto sein, da dieser Lagerabgleich eine Eröffnungsbuchung ist"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +138,Purchase Order number required for Item {0},Lieferantenauftragsnummer ist für den Artikel {0} erforderlich
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Order number required for Item {0},Lieferantenauftragsnummer ist für den Artikel {0} erforderlich
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',"""Von-Datum"" muss nach ""Bis-Datum"" liegen"
 ,Stock Projected Qty,Geplanter Lagerbestand
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +147,Customer {0} does not belong to project {1},Customer {0} gehört nicht zum Projekt {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +150,Customer {0} does not belong to project {1},Customer {0} gehört nicht zum Projekt {1}
 DocType: Sales Order,Customer's Purchase Order,Kunden-Bestellung
 DocType: Warranty Claim,From Company,Von Firma
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,Wert oder Menge
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Minute,Minute
+apps/erpnext/erpnext/public/js/setup_wizard.js +363,Minute,Minute
 DocType: Purchase Invoice,Purchase Taxes and Charges,Einkaufsteuern und -gebühren
 ,Qty to Receive,Anzunehmende Menge
 DocType: Leave Block List,Leave Block List Allowed,Urlaubssperrenliste zugelassen
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +61,Conversion factor cannot be in fractions,Umrechnungsfaktor kann nicht ein Bruchteil sein
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +358,You will use it to Login,"Sie brauchen das, um sich anzumelden."
+apps/erpnext/erpnext/public/js/setup_wizard.js +108,You will use it to Login,"Sie brauchen das, um sich anzumelden."
 DocType: Sales Partner,Retailer,Einzelhändler
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +99,Credit To account must be a Balance Sheet account,Habenkonto muss ein Bilanzkonto sein
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,Alle Lieferantentypen
 apps/erpnext/erpnext/stock/doctype/item/item.py +37,Item Code is mandatory because Item is not automatically numbered,"Artikelnummer ist zwingend erforderlich, da der Artikel nicht automatisch nummeriert wird"
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +99,Quotation {0} not of type {1},Angebot {0} nicht vom Typ {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +93,Quotation {0} not of type {1},Angebot {0} nicht vom Typ {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,Wartungsplanposition
 DocType: Sales Order,%  Delivered,%  geliefert
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,Bank Overdraft Account,Kontokorrentkredit Konto 
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +15,Make Salary Slip,Gehaltsabrechnung erstellen
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +18,Browse BOM,Stückliste durchsuchen
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +175,Secured Loans,Gedeckte Kredite
-apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +3,Awesome Products,Beeindruckende Produkte
+apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +3,Awesome Products,Beeindruckende Produkte
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +189,Opening Balance Equity,Anfangsstand Eigenkapital
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +80,Cannot approve leave as you are not authorized to approve leaves on Block Dates,"Diese Abwesenheit kann nicht genehmigt werden, da Sie nicht über die Berechtigung zur Genehmigung von Block-Abwesenheiten verfügen."
 DocType: Appraisal,Appraisal,Bewertung
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +13,Lost-foam casting,Schaumstoffguß
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +47,Drawing,Zeichnung
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +22,Date is repeated,Ereignis wiederholen
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +148,Leave approver must be one of {0},Urlaube und Abwesenheiten müssen von jemandem aus {0} genehmigt werden.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +162,Leave approver must be one of {0},Urlaube und Abwesenheiten müssen von jemandem aus {0} genehmigt werden.
 DocType: Hub Settings,Seller Email,E-Mail-Adresse des Verkäufers
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Summe Einkaufskosten (über Einkaufsrechnung)
 DocType: Workstation Working Hour,Start Time,Startzeit
@@ -2538,12 +2448,12 @@
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,"Genehmigende Rolle kann nicht dieselbe Rolle sein wie diejenige mit der Regel ""Ist anwendbar auf"""
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +66,Unsubscribe from this Email Digest,Abmelden von diesem E-Mail-Digest
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +36,Message Sent,Mitteilung gesendet
-DocType: Production Plan Sales Order,SO Date,SO-Datum
+DocType: Production Plan Sales Order,SO Date,Auftragsdatum
 DocType: Sales Invoice,Rate at which Price list currency is converted to customer's base currency,"Kurs, zu dem die Währung der Preisliste in die Basiswährung des Kunden umgerechnet wird"
 DocType: Purchase Invoice Item,Net Amount (Company Currency),Nettobetrag (Firmenwährung)
 DocType: BOM Operation,Hour Rate,Stundensatz
 DocType: Stock Settings,Item Naming By,Artikelbezeichnung nach
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +642,From Quotation,Von Angebot
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +655,From Quotation,Von Angebot
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},Eine weitere Periodenabschlussbuchung {0} wurde nach {1} erstellt
 DocType: Production Order,Material Transferred for Manufacturing,Material zur Herstellung übertragen
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +29,Account {0} does not exists,Konto {0} existiert nicht 
@@ -2557,21 +2467,19 @@
 DocType: Purchase Invoice Item,PR Detail,PR-Detail
 DocType: Sales Order,Fully Billed,Voll berechnet
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +20,Cash In Hand,Barmittel
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +72,Delivery warehouse required for stock item {0},Auslieferungslager für Lagerartikel {0} erforderlich
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +119,Delivery warehouse required for stock item {0},Auslieferungslager für Lagerartikel {0} erforderlich
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),Das Bruttogewicht des Pakets. Normalerweise Nettogewicht + Gewicht des Verpackungsmaterials (Für den Ausdruck)
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Benutzer mit dieser Rolle sind berechtigt Konten zu sperren und  Buchungen zu gesperrten Konten zu erstellen/verändern
 DocType: Serial No,Is Cancelled,Ist storniert
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +281,My Shipments,Meine Lieferungen
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +286,My Shipments,Meine Lieferungen
 DocType: Journal Entry,Bill Date,Rechnungsdatum 
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +43,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","Wenn es mehrere Preisregeln mit der höchsten Priorität gibt, werden folgende interne Prioritäten angewandt:"
 DocType: Supplier,Supplier Details,Lieferantendetails
 DocType: Communication,Recipients,Empfänger
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +146,Screwing,Verschraubung
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +96,Knurling,Rändelung
 DocType: Expense Claim,Approval Status,Genehmigungsstatus
 DocType: Hub Settings,Publish Items to Hub,Artikel über den Hub veröffentlichen
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +44,From value must be less than to value in row {0},Von-Wert muss weniger sein als Bis-Wert in Zeile {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +133,Wire Transfer,Überweisung
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +133,Wire Transfer,Überweisung
 apps/erpnext/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py +25,Please select Bank Account,Bitte ein Bankkonto auswählen
 DocType: Newsletter,Create and Send Newsletters,Newsletter erstellen und senden
 apps/frappe/frappe/public/js/frappe/views/reports/grid_report.js +305,From Date must be before To Date,Von-Datum muss vor dem Bis-Datum liegen
@@ -2579,22 +2487,21 @@
 DocType: Company,Default Income Account,Standard-Ertragskonto
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,Kundengruppe / Kunde
 DocType: Item Group,Check this if you want to show in website,"Aktivieren, wenn der Inhalt auf der Webseite angezeigt werden soll"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +190,Welcome to ERPNext,Willkommen bei ERPNext
+,Welcome to ERPNext,Willkommen bei ERPNext
 DocType: Payment Reconciliation Payment,Voucher Detail Number,Belegdetail-Nummer
 apps/erpnext/erpnext/config/crm.py +146,Lead to Quotation,Führt zu Angebot
 DocType: Lead,From Customer,Von Kunden
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +37,Calls,Anrufe
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Calls,Anrufe
 DocType: Project,Total Costing Amount (via Time Logs),Gesamtkostenbetrag (über Zeitprotokolle)
 DocType: Purchase Order Item Supplied,Stock UOM,Lagermaßeinheit
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Purchase Order {0} is not submitted,Bestellung {0} wurde nicht versendet
-,Projected,projektiert
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +194,Purchase Order {0} is not submitted,Bestellung {0} wurde nicht übertragen
+,Projected,Geplant
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},Seriennummer {0} gehört nicht zu Lager {1}
 apps/erpnext/erpnext/controllers/status_updater.py +136,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Hinweis: Das System überprüft Überlieferungen und Überbuchungen zu Artikel {0} nicht da Stückzahl oder Menge 0 sind
 DocType: Notification Control,Quotation Message,Angebotsmitteilung
 DocType: Issue,Opening Date,Eröffnungsdatum
 DocType: Journal Entry,Remark,Bemerkung
 DocType: Purchase Receipt Item,Rate and Amount,Preis und Menge
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +95,Boring,Langweilig
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +667,From Sales Order,Aus Kundenauftrag
 DocType: Blog Category,Parent Website Route,Pfad zur übergeordneten Webseite
 DocType: Sales Order,Not Billed,Nicht abgerechnet
@@ -2608,19 +2515,17 @@
 apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount Amount,Rabattbetrag
 DocType: Purchase Invoice,Return Against Purchase Invoice,Zurück zur Einkaufsrechnung
 DocType: Item,Warranty Period (in days),Gewährleistungsfrist (in Tagen)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +550,e.g. VAT,z. B. Mehrwertsteuer
+apps/erpnext/erpnext/public/js/setup_wizard.js +292,e.g. VAT,z. B. Mehrwertsteuer
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,Punkt 4
 DocType: Journal Entry Account,Journal Entry Account,Journalbuchungskonto
-DocType: Shopping Cart Settings,Quotation Series,Serienbezeichnung der Angebote
+DocType: Shopping Cart Settings,Quotation Series,Nummernkreis für Angebote
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +52,"An item exists with same name ({0}), please change the item group name or rename the item",Ein Artikel mit dem gleichen Namen existiert bereits ({0} ). Bitte den Namen der Artikelgruppe ändern oder den Artikel umbenennen
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +82,Hot metal gas forming,Bleigasformen
 DocType: Sales Order Item,Sales Order Date,Kundenauftrags-Datum
 DocType: Sales Invoice Item,Delivered Qty,Gelieferte Stückzahl
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +63,Warehouse {0}: Company is mandatory,Lager {0}: Firma ist zwingend erforderlich
 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.","Zur entsprechende Gruppe gehen (normalerweise ""Mittelherkunft"" > ""Kurzfristige Verbindlichkeiten"" > ""Zölle und Steuern"" und durch Klicken auf ""Unterpunkt hinzufügen"" ein neues Konto vom Typ ""Steuern"" erstellen"
 ,Payment Period Based On Invoice Date,Zahlungszeitraum basierend auf Rechnungsdatum
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +50,Missing Currency Exchange Rates for {0},Fehlende Wechselkurse für {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +135,Laser cutting,Laserschneiden
 DocType: Event,Monday,Montag
 DocType: Journal Entry,Stock Entry,Lagerbuchung
 DocType: Account,Payable,Zahlbar
@@ -2630,16 +2535,16 @@
 DocType: Appraisal Goal,Weightage (%),Gewichtung (%)
 DocType: Bank Reconciliation Detail,Clearance Date,Einlösungsdatum
 DocType: Newsletter,Newsletter List,Newsletter-Empfängerliste
-DocType: Process Payroll,Check if you want to send salary slip in mail to each employee while submitting salary slip,"Aktivieren, wenn Sie die Gehaltsabrechnung per Post an jeden Mitarbeiter senden möchten."
+DocType: Process Payroll,Check if you want to send salary slip in mail to each employee while submitting salary slip,"Aktivieren, wenn Sie die Gehaltsabrechnung per E-Mail an jeden Mitarbeiter senden möchten während Sie sie übertragen."
 DocType: Lead,Address Desc,Adresszusatz
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +33,Atleast one of the Selling or Buying must be selected,Mindestens ein Eintrag aus Vertrieb oder Einkauf muss ausgewählt werden
-apps/erpnext/erpnext/config/manufacturing.py +34,Where manufacturing operations are carried.,Ort an dem Arbeitsgänge der Fertigung ablaufen.
+apps/erpnext/erpnext/config/manufacturing.py +34,Where manufacturing operations are carried.,Ort an dem Arbeitsgänge der Fertigung ablaufen
 DocType: Page,All,Alle
 DocType: Stock Entry Detail,Source Warehouse,Ausgangslager
 DocType: Installation Note,Installation Date,Datum der Installation
 DocType: Employee,Confirmation Date,Datum bestätigen
 DocType: C-Form,Total Invoiced Amount,Gesamtrechnungsbetrag
-DocType: Account,Sales User,Verkaufsmitarbeiter
+DocType: Account,Sales User,Nutzer Vertrieb
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +46,Min Qty can not be greater than Max Qty,Mindestmenge kann nicht größer als Maximalmenge sein
 DocType: Stock Entry,Customer or Supplier Details,Kunden- oder Lieferanten-Details
 apps/frappe/frappe/core/page/permission_manager/permission_manager.js +428,Set,Einstellen
@@ -2653,7 +2558,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +111,Date Of Retirement must be greater than Date of Joining,Zeitpunkt der Pensionierung muss nach dem Eintrittsdatum liegen
 DocType: Sales Invoice,Against Income Account,Zu Ertragskonto
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +69,{0}% Delivered,{0}% geliefert
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +78,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Artikel {0}: Bestellmenge {1} kann nicht weniger als Mindestbestellmenge {2} (im Artikel definiert) sein.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Artikel {0}: Bestellmenge {1} kann nicht weniger als Mindestbestellmenge {2} (im Artikel definiert) sein.
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Prozentuale Aufteilung der monatsweisen Verteilung
 DocType: Territory,Territory Targets,Ziele für die Region
 DocType: Delivery Note,Transporter Info,Informationen zum Transportunternehmer
@@ -2662,12 +2567,11 @@
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,"Bezeichnungen für Druckvorlagen, z. B. Proforma-Rechnung."
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +140,Valuation type charges can not marked as Inclusive,"Bewertungsart Gebühren kann nicht als ""inklusive"" markiert werden"
 DocType: POS Profile,Update Stock,Lagerbestand aktualisieren
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +128,Superfinishing,Feinstbearbeitung
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,"Unterschiedliche Maßeinheiten für Artikel führen zu falschen Werten für das (Gesamt-)Nettogewicht. Es muss sicher gestellt sein, dass das Nettogewicht jedes einzelnen Artikels in der gleichen Maßeinheit angegeben ist."
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,Stückpreis
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +85,Please pull items from Delivery Note,Bitte Artikel vom Lieferschein nehmen
 apps/erpnext/erpnext/accounts/utils.py +268,Journal Entries {0} are un-linked,Journalbuchungen {0} sind entknüpft
-apps/erpnext/erpnext/config/crm.py +37,"Record of all communications of type email, phone, chat, visit, etc.","Aufzeichnung aller Kommunikations vom Typ Email, Telefon, Chat, Besuch usw."
+apps/erpnext/erpnext/config/crm.py +37,"Record of all communications of type email, phone, chat, visit, etc.","Aufzeichnung jeglicher Kommunikation vom Typ Email, Telefon, Chat, Besuch usw."
 apps/erpnext/erpnext/accounts/general_ledger.py +134,Please mention Round Off Cost Center in Company,Bitte Abschlusskostenstelle in Firma vermerken
 DocType: Purchase Invoice,Terms,Geschäftsbedingungen
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +242,Create New,Neuen Eintrag erstellen
@@ -2677,7 +2581,6 @@
 ,Purchase Analytics,Einkaufsanalyse
 DocType: Sales Invoice Item,Delivery Note Item,Lieferschein-Artikel
 DocType: Expense Claim,Task,Aufgabe
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +57,Shaving,Rasieren
 DocType: Purchase Taxes and Charges,Reference Row #,Referenz-Spalte #
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},Chargennummer ist zwingend erforderlich für Artikel {0}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js +14,This is a root sales person and cannot be edited.,Dies ist ein Root-Vertriebsmitarbeiter und kann nicht bearbeitet werden.
@@ -2689,13 +2592,11 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +74,Purpose must be one of {0},Zweck muss einer von diesen sein: {0}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +108,Fill the form and save it,Formular ausfüllen und speichern
 DocType: Production Planning Tool,Download a report containing all raw materials with their latest inventory status,"Einen Bericht herunterladen, der das gesamte Rohmaterial mit seinem neuesten Bestandsstatus angibt"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +94,Facing,Zugewandt
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,Community-Forum
 DocType: Leave Application,Leave Balance Before Application,Urlaubskonto vor Anwendung
 DocType: SMS Center,Send SMS,SMS senden
 DocType: Company,Default Letter Head,Standardbriefkopf
 DocType: Time Log,Billable,Abrechenbar 
-DocType: Authorization Rule,This will be used for setting rule in HR module,Dies wird für die Festlegung der Regel im Personal-Modul verwendet
 DocType: Account,Rate at which this tax is applied,"Kurs, zu dem dieser Steuersatz angewandt wird"
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reorder Qty,Nachbestellmenge
 DocType: Company,Stock Adjustment Account,Bestandskorrektur-Konto
@@ -2704,7 +2605,7 @@
 DocType: Employee,"System User (login) ID. If set, it will become default for all HR forms.","Systembenutzer-ID (Anmeldung). Wenn gesetzt, wird sie standardmäßig für alle HR-Formulare verwendet."
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}: von {1}
 DocType: Task,depends_on,hängt ab von
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +86,Opportunity Lost,Möglichkeit verloren
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +86,Opportunity Lost,Opportunity verloren
 DocType: Features Setup,"Discount Fields will be available in Purchase Order, Purchase Receipt, Purchase Invoice","Rabattfelder stehen in  Lieferantenauftrag, Kaufbeleg und in der Eingangsrechnung zur Verfügung"
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +208,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,Name des neuen Kontos. Hinweis: Bitte keine Konten für Kunden und Lieferanten erstellen
 DocType: Report,Report Type,Berichtstyp
@@ -2715,26 +2616,25 @@
 apps/erpnext/erpnext/public/js/controllers/transaction.js +726,Show tax break-up,Steuerverteilung anzeigen
 apps/erpnext/erpnext/accounts/party.py +287,Due / Reference Date cannot be after {0},Fälligkeits-/Stichdatum kann nicht nach {0} liegen
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,Daten-Import und -Export
-DocType: Features Setup,If you involve in manufacturing activity. Enables Item 'Is Manufactured',"Bei eigener Beteiligung an den  Fertigungshandlungen, ""Eigenfertigung"" aktivieren."
+DocType: Features Setup,If you involve in manufacturing activity. Enables Item 'Is Manufactured',"Bei eigener Beteiligung an den  Fertigungsaktivitäten, ""Eigenfertigung"" aktivieren."
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +54,Invoice Posting Date,Rechnungsbuchungsdatum
 DocType: Sales Invoice,Rounded Total,Gerundete Gesamtsumme
 DocType: Product Bundle,List items that form the package.,"Die Artikel auflisten, die das Paket bilden."
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,Prozentuale Aufteilung sollte gleich 100% sein
 DocType: Serial No,Out of AMC,Außerhalb des jährlichen Wartungsvertrags
 DocType: Purchase Order Item,Material Request Detail No,Detailnr. der Materialanfrage
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +97,Hard turning,Hartdrehen
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +33,Make Maintenance Visit,Wartungsbesuch erstellen
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +187,Please contact to the user who have Sales Master Manager {0} role,"Bitte den Benutzer kontaktieren, der die Vertriebsleiter {0}-Rolle inne hat"
 DocType: Company,Default Cash Account,Standardkassenkonto
 apps/erpnext/erpnext/config/accounts.py +79,Company (not Customer or Supplier) master.,Unternehmensstammdaten (nicht Kunde oder Lieferant)
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +106,Please enter 'Expected Delivery Date',"Bitte ""voraussichtlichen Liefertermin"" eingeben"
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +187,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Lieferscheine {0} müssen vor Löschung dieser Kundenaufträge storniert werden
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +100,Please enter 'Expected Delivery Date',"Bitte ""voraussichtlichen Liefertermin"" eingeben"
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +182,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Lieferscheine {0} müssen vor Löschung dieser Kundenaufträge storniert werden
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +373,Paid amount + Write Off Amount can not be greater than Grand Total,Summe aus gezahltem Betrag + Abschreibungsbetrag kann nicht größer als Gesamtsumme sein
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} ist keine gültige Chargennummer für Artikel {1}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,Note: There is not enough leave balance for Leave Type {0},Hinweis: Es gibt nicht genügend Urlaubsguthaben für Abwesenheitstyp {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +124,Note: There is not enough leave balance for Leave Type {0},Hinweis: Es gibt nicht genügend Urlaubsguthaben für Abwesenheitstyp {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.","Hinweis: Wenn die Zahlung nicht mit einer Referenz abgeglichen werden kann, bitte Journalbuchung manuell erstellen."
 DocType: Item,Supplier Items,Lieferantenartikel
-DocType: Opportunity,Opportunity Type,Möglichkeits-Typ
+DocType: Opportunity,Opportunity Type,Opportunity-Typ
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +42,New Company,Neue Firma
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +56,Cost Center is required for 'Profit and Loss' account {0},"Kostenstelle wird für ""Gewinn- und Verlust""-Konto {0} benötigt"
 apps/erpnext/erpnext/setup/doctype/company/delete_company_transactions.py +17,Transactions can only be deleted by the creator of the Company,Transaktionen können nur durch den Ersteller der Firma gelöscht werden
@@ -2743,53 +2643,47 @@
 DocType: Hub Settings,Publish Availability,Verfügbarkeit veröffentlichen
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +105,Date of Birth cannot be greater than today.,Geburtsdatum kann nicht später liegen als heute.
 ,Stock Ageing,Lager-Abschreibungen
-apps/erpnext/erpnext/controllers/accounts_controller.py +200,{0} '{1}' is disabled,{0} '{1}' ist deaktiviert
+apps/erpnext/erpnext/controllers/accounts_controller.py +201,{0} '{1}' is disabled,{0} '{1}' ist deaktiviert
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,"Als ""geöffnet"" markieren"
-DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Beim Versenden von Transaktionen automatisch E-Mails an Kontakte senden.
+DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Beim Übertragen von Transaktionen automatisch E-Mails an Kontakte senden.
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +232,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
 					Available Qty: {4}, Transfer Qty: {5}","Zeile {0}: Menge nicht im Lager {1} auf {2} {3} verfügbar. Verfügbare Menge: {4}, Übertragsmenge: {5}"
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,Artikel 3
 DocType: Purchase Order,Customer Contact Email,Kontakt-E-Mail des Kunden
 DocType: Event,Sunday,Sonntag
 DocType: Sales Team,Contribution (%),Beitrag (%)
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +455,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,"Hinweis: Zahlungsbuchung wird nicht erstellt, da kein ""Kassen- oder Bankkonto"" angegeben wurde"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +171,Responsibilities,Verantwortung
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +457,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,"Hinweis: Zahlungsbuchung wird nicht erstellt, da kein ""Kassen- oder Bankkonto"" angegeben wurde"
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +171,Responsibilities,Verantwortung
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Template,Vorlage
 DocType: Sales Person,Sales Person Name,Name des Vertriebsmitarbeiters
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,Bitte mindestens eine Rechnung in die Tabelle eingeben
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +511,Add Users,Benutzer hinzufügen
+apps/erpnext/erpnext/public/js/setup_wizard.js +255,Add Users,Benutzer hinzufügen
 DocType: Pricing Rule,Item Group,Artikelgruppe
 DocType: Task,Actual Start Date (via Time Logs),Tatsächliches Start-Datum (über Zeitprotokoll)
 DocType: Stock Reconciliation Item,Before reconciliation,Vor Ausgleich
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +12,To {0},An {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Steuern und Gebühren hinzugerechnet (Firmenwährung)
-apps/erpnext/erpnext/stock/doctype/item/item.py +340,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,"Artikelsteuer Zeile {0} muss ein Konto vom Typ ""Steuer"" oder ""Erträge"" oder ""Aufwendungen"" oder ""Besteuerbar"" haben"
+apps/erpnext/erpnext/stock/doctype/item/item.py +344,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,"Artikelsteuer Zeile {0} muss ein Konto vom Typ ""Steuer"" oder ""Erträge"" oder ""Aufwendungen"" oder ""Besteuerbar"" haben"
 DocType: Sales Order,Partly Billed,Teilweise abgerechnet
 DocType: Item,Default BOM,Standardstückliste
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +79,Decambering,Decambern
 apps/erpnext/erpnext/setup/doctype/company/company.js +22,Please re-type company name to confirm,Bitte zum Bestätigen Firmenname erneut eingeben
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,Offener Gesamtbetrag
 DocType: Time Log Batch,Total Hours,Summe der Stunden
 DocType: Journal Entry,Printing Settings,Druckeinstellungen
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +268,Total Debit must be equal to Total Credit. The difference is {0},Gesamt-Soll muss gleich Gesamt-Haben sein. Die Differenz ist {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +11,Automotive,Fahrzeugbau
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +37,Item is required,Artikel erforderlich
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +25,Metal injection molding,Metallspritzguss
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +258,Total Debit must be equal to Total Credit. The difference is {0},Gesamt-Soll muss gleich Gesamt-Haben sein. Die Differenz ist {0}
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,Fahrzeugbau
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +684,From Delivery Note,Von Lieferschein
-DocType: Time Log,From Time,Von Zeit
+DocType: Time Log,From Time,Von-Zeit
 DocType: Notification Control,Custom Message,Benutzerdefinierte Mitteilung
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +33,Investment Banking,Investment-Banking
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +261,"Select your Country, Time Zone and Currency","Bitte Land, Zeitzone und Währung auswählen"
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,Investment-Banking
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +316,"Select your Country, Time Zone and Currency","Bitte Land, Zeitzone und Währung auswählen"
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +369,Cash or Bank Account is mandatory for making payment entry,Kassen- oder Bankkonto ist zwingend notwendig  um eine Zahlungsbuchung zu erstellen
 DocType: Purchase Invoice,Price List Exchange Rate,Preislisten-Wechselkurs
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +91,Pickling,Beizen
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +18,Sand casting,Sandguss
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +117,Electroplating,Galvanisierung
 DocType: Purchase Invoice Item,Rate,Preis
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +62,Intern,Praktikant
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Intern,Praktikant
 DocType: Newsletter,A Lead with this email id should exist,Ein Lead mit dieser E-Mail-Kennung sollte existieren
 DocType: Stock Entry,From BOM,Von Stückliste
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +34,Basic,Grundeinkommen
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +34,Basic,Grundeinkommen
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,Lagertransaktionen vor {0} werden gesperrt
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +217,Please click on 'Generate Schedule',"Bitte auf ""Zeitplan generieren"" klicken"
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +61,To Date should be same as From Date for Half Day leave,Für halbe Urlaubstage sollten Von-Datum und Bis-Datum gleich sein
@@ -2797,10 +2691,10 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +96,Reference No is mandatory if you entered Reference Date,"Referenznr. ist zwingend erforderlich, wenn Referenz-Tag eingegeben wurde"
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +108,Date of Joining must be greater than Date of Birth,Eintrittsdatum muss nach dem Geburtsdatum liegen
 DocType: Salary Structure,Salary Structure,Gehaltsstruktur
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +242,"Multiple Price Rule exists with same criteria, please resolve \
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +246,"Multiple Price Rule exists with same criteria, please resolve \
 			conflict by assigning priority. Price Rules: {0}",Es existieren mehrere Preisregeln mit denselben Kriterien. Bitte diesen Konflikt durch Vergabe von Vorrangregelungen lösen. Preisregeln: {0}
 DocType: Account,Bank,Bank 
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +9,Airline,Fluggesellschaft
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,Fluggesellschaft
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +493,Issue Material,Ausgabe-Material
 DocType: Material Request Item,For Warehouse,Für Lager
 DocType: Employee,Offer Date,Angebotsdatum
@@ -2810,40 +2704,34 @@
 DocType: Item,Is Fixed Asset Item,Ist Posten des Anlagevermögens
 DocType: Stock Entry,Including items for sub assemblies,Einschließlich der Artikel für Unterbaugruppen
 DocType: Features Setup,"If you have long print formats, this feature can be used to split the page to be printed on multiple pages with all headers and footers on each page","Wenn lange Druckformate auftreten, kann diese Funktion verwendet werden, um die Seite so aufzuteilen, dass sie auf mehreren Seiten mit jeweils allen Kopf- und Fußzeilen ausgedruckt wird"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +131,Hobbing,Wälzfräsen
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +98,All Territories,Alle Regionen
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +98,All Territories,Alle Regionen
 DocType: Purchase Invoice,Items,Artikel
 DocType: Fiscal Year,Year Name,Name des Jahrs
 DocType: Process Payroll,Process Payroll,Gehaltsabrechnung bearbeiten
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +59,There are more holidays than working days this month.,Es gibt mehr Feiertage als Arbeitstage in diesem Monat.
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +68,There are more holidays than working days this month.,Es gibt mehr Feiertage als Arbeitstage in diesem Monat.
 DocType: Product Bundle Item,Product Bundle Item,Produkt-Bundle-Artikel
 DocType: Sales Partner,Sales Partner Name,Name des Vertriebspartners
 DocType: Purchase Invoice Item,Image View,Bildansicht
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +113,Finishing & industrial finishing,Endbearbeitung & industrielle Veredelung
 DocType: Issue,Opening Time,Öffnungszeit
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,Von- und Bis-Daten erforderlich
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +46,Securities & Commodity Exchanges,Wertpapier- & Rohstoffbörsen
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Wertpapier- & Rohstoffbörsen
 DocType: Shipping Rule,Calculate Based On,Berechnen auf Grundlage von
 DocType: Delivery Note Item,From Warehouse,Ab Lager
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +98,Drilling,Bohrung
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +28,Blow molding,Blasformen
 DocType: Purchase Taxes and Charges,Valuation and Total,Bewertung und Summe
 DocType: Tax Rule,Shipping City,Zielstadt der Lieferung
 apps/erpnext/erpnext/stock/doctype/item/item.js +43,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,"Dieser Artikel ist eine Variante von {0} (Vorlage). Attribute werden von der Vorlage übernommen, ausser es wurde ""Nicht kopieren"" ausgewählt."
-DocType: Account,Purchase User,Einkaufs-Benutzer
+DocType: Account,Purchase User,Nutzer Einkauf
 DocType: Notification Control,Customize the Notification,Mitteilungstext anpassen
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +87,Hammering,Hämmern
 DocType: Web Page,Slideshow,Diaschau
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +24,Default Address Template cannot be deleted,Standard-Adressvorlage kann nicht gelöscht werden
 DocType: Sales Invoice,Shipping Rule,Versandregel
 DocType: Journal Entry,Print Heading,Briefkopf drucken
-DocType: Quotation,Maintenance Manager,Wartungsleiter
+DocType: Quotation,Maintenance Manager,Leiter der Instandhaltung
 DocType: Workflow State,Search,Suchen
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +54,Total cannot be zero,Summe kann nicht Null sein
 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,"""Tage seit dem letzten Auftrag"" muss größer oder gleich Null sein"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +142,Brazing,Löten
 DocType: C-Form,Amended From,Abgeändert von
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Raw Material,Rohmaterial
+apps/erpnext/erpnext/public/js/setup_wizard.js +359,Raw Material,Rohmaterial
 DocType: Leave Application,Follow via Email,Per E-Mail nachverfolgen
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Steuerbetrag nach Abzug von Rabatt
 apps/erpnext/erpnext/accounts/doctype/account/account.py +174,Child account exists for this account. You can not delete this account.,Für dieses Konto existiert ein Unterkonto. Sie können dieses Konto nicht löschen.
@@ -2857,10 +2745,10 @@
 ,Produced,Produziert
 DocType: Item,Item Code for Suppliers,Artikelnummer für Lieferanten
 DocType: Issue,Raised By (Email),Gemeldet von (E-Mail)
-apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +72,General,Allgemein
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +495,Attach Letterhead,Briefkopf anhängen 
+apps/erpnext/erpnext/setup/setup_wizard/default_website.py +72,General,Allgemein
+apps/erpnext/erpnext/public/js/setup_wizard.js +241,Attach Letterhead,Briefkopf anhängen 
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +272,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',"Abzug nicht möglich, wenn Kategorie ""Bewertung"" oder ""Bewertung und Summe"" ist"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +542,"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.","Steuern (z. B. Mehrwertsteuer, Zoll, usw.; bitte möglichst eindeutige Bezeichnungen vergeben) und die zugehörigen Steuersätze auflisten. Dies erstellt eine Standardvorlage, die bearbeitet und später erweitert werden kann."
+apps/erpnext/erpnext/public/js/setup_wizard.js +284,"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.","Steuern (z. B. Mehrwertsteuer, Zoll, usw.; bitte möglichst eindeutige Bezeichnungen vergeben) und die zugehörigen Steuersätze auflisten. Dies erstellt eine Standardvorlage, die bearbeitet und später erweitert werden kann."
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial Nos Required for Serialized Item {0},Seriennummern sind erforderlich für den Artikel mit Seriennummer {0}
 DocType: Journal Entry,Bank Entry,Bankbuchung
 DocType: Authorization Rule,Applicable To (Designation),Anwendbar auf (Bestimmung)
@@ -2869,32 +2757,31 @@
 apps/erpnext/erpnext/config/accounts.py +143,Enable / disable currencies.,Aktivieren / Deaktivieren der Währungen.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Postal Expenses,Portoaufwendungen
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Gesamtsumme
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +26,Entertainment & Leisure,Unterhaltung & Freizeit
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,Unterhaltung & Freizeit
 DocType: Purchase Order,The date on which recurring order will be stop,Das Datum an dem die sich wiederholende Bestellung endet
 DocType: Quality Inspection,Item Serial No,Artikel-Seriennummer
 apps/erpnext/erpnext/controllers/status_updater.py +142,{0} must be reduced by {1} or you should increase overflow tolerance,"{0} muss um {1} reduziert werden, oder die Überlauftoleranz sollte erhöht werden"
-apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Present,Summe Gegenwartswerte
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Hour,Stunde
+apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Present,Summe Anwesend
+apps/erpnext/erpnext/public/js/setup_wizard.js +363,Hour,Stunde
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +138,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation",Serienartikel {0} kann nicht über einen Lagerabgleich aktualisiert werden
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +488,Transfer Material to Supplier,Material dem Lieferanten übergeben
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +513,Transfer Material to Supplier,Material dem Lieferanten übergeben
 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,"""Neue Seriennummer"" kann keine Lagerangabe enthalten. Lagerangaben müssen durch eine Lagerbuchung oder einen Kaufbeleg erstellt werden"
 DocType: Lead,Lead Type,Typ des Leads
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +82,Create Quotation,Angebot erstellen
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +306,All these items have already been invoiced,Alle diese Artikel sind bereits in Rechnung gestellt
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,You are not authorized to approve leaves on Block Dates,"Sie sind nicht berechtigt, Blätter auf Block-Daten zu genehmigen"
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +311,All these items have already been invoiced,Alle diese Artikel sind bereits in Rechnung gestellt
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},Kann von {0} genehmigt werden
 DocType: Shipping Rule,Shipping Rule Conditions,Versandbedingungen
 DocType: BOM Replace Tool,The new BOM after replacement,Die neue Stückliste nach dem Austausch
 DocType: Features Setup,Point of Sale,Verkaufsstelle
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +83,Curling,Einrollen
 DocType: Account,Tax,Steuer
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +28,Row {0}: {1} is not a valid {2},Zeile {0}: {1} ist keine gültige {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +89,Refining,Veredelung
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +37,Row {0}: {1} is not a valid {2},Zeile {0}: {1} ist keine gültige {2}
 DocType: Production Planning Tool,Production Planning Tool,Werkzeug zur Fertigungsplanung
 DocType: Quality Inspection,Report Date,Berichtsdatum
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +130,Routing,Routing
 DocType: C-Form,Invoices,Rechnungen
 DocType: Job Opening,Job Title,Stellenbezeichnung
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +54,{0} already allocated for Employee {1} for period {2} - {3},{0} bereits für Employee {1} für Zeitraum zugeteilt {2} - {3}
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +80,{0} Recipients,{0} Empfänger
 DocType: Features Setup,Item Groups in Details,Detaillierte Artikelgruppen
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +335,Quantity to Manufacture must be greater than 0.,Menge Herstellung muss größer als 0 sein.
@@ -2912,14 +2799,13 @@
 DocType: DocType,Setup,Einstellungen
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,Es gibt nichts zu bearbeiten.
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +108,Summary for this month and pending activities,Zusammenfassung für diesen Monat und anstehende Aktivitäten
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +39,Cold rolling,Kaltwalzen
 DocType: Customer Group,Customer Group Name,Kundengruppenname
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +408,Please remove this Invoice {0} from C-Form {1},Bitte diese Rechnung {0} vom Kontaktformular {1} entfernen
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +410,Please remove this Invoice {0} from C-Form {1},Bitte diese Rechnung {0} vom Kontaktformular {1} entfernen
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,"Bitte auf ""Übertrag"" klicken, wenn auch die Abwesenheitskonten des vorangegangenen Geschäftsjahrs in dieses Geschäftsjahr einbezogen werden sollen"
 DocType: GL Entry,Against Voucher Type,Gegenbeleg-Art
 DocType: Item,Attributes,Attribute
 DocType: Packing Slip,Get Items,Artikel aufrufen
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +186,Please enter Write Off Account,Bitte Abschreibungskonto eingeben
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +187,Please enter Write Off Account,Bitte Abschreibungskonto eingeben
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +71,Last Order Date,Letztes Bestelldatum
 DocType: DocField,Image,Bild
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +179,Make Excise Invoice,Verbrauchssteuerrechnung erstellen
@@ -2929,7 +2815,7 @@
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +146,Operation ID not set,Arbeitsgang-ID nicht gesetzt
 DocType: Production Order,Planned Start Date,Geplanter Starttermin
 DocType: Serial No,Creation Document Type,Belegerstellungs-Typ
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +620,Maint. Visit,Wartungsbesuch
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +631,Maint. Visit,Wartungsbesuch
 DocType: Leave Type,Is Encash,Ist Inkasso
 DocType: Purchase Invoice,Mobile No,Mobilfunknummer
 DocType: Payment Tool,Make Journal Entry,Journalbuchung erstellen
@@ -2937,35 +2823,31 @@
 apps/erpnext/erpnext/controllers/trends.py +257,Project-wise data is not available for Quotation,Projektbezogene Daten sind für das Angebot nicht verfügbar
 DocType: Project,Expected End Date,Voraussichtliches Enddatum
 DocType: Appraisal Template,Appraisal Template Title,Bezeichnung der Bewertungsvorlage
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +440,Commercial,Werbung
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +378,Commercial,Werbung
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +23,Parent Item {0} must not be a Stock Item,Übergeordneter Artikel {0} darf kein Lagerartikel sein
 DocType: Cost Center,Distribution Id,Verteilungs-ID
-apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +14,Awesome Services,Beeindruckende Dienstleistungen
-apps/erpnext/erpnext/config/manufacturing.py +29,All Products or Services.,Alle Produkte oder Dienstleistungen.
+apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +14,Awesome Services,Beeindruckende Dienstleistungen
+apps/erpnext/erpnext/config/manufacturing.py +29,All Products or Services.,Alle Produkte oder Dienstleistungen
 DocType: Purchase Invoice,Supplier Address,Lieferantenadresse
 DocType: Contact Us Settings,Address Line 2,Adresse Zeile 2
 DocType: ToDo,Reference,Referenz
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +59,Perforating,Perforieren
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,Ausgabe-Menge
 apps/erpnext/erpnext/config/accounts.py +128,Rules to calculate shipping amount for a sale,Regeln zum Berechnen des Versandbetrags für einen Verkauf
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +29,Series is mandatory,Serie ist zwingend erforderlich
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +28,Financial Services,Finanzdienstleistungen
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,Finanzdienstleistungen
 apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3},Wert des Attributs {0} muss innerhalb des Bereichs von {1} bis {2} mit Schrittweite {3} liegen
 DocType: Tax Rule,Sales,Vertrieb
 DocType: Stock Entry Detail,Basic Amount,Grundbetrag
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +173,Warehouse required for stock Item {0},Angabe des Lagers ist für den Lagerartikel {0} erforderlich
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +178,Warehouse required for stock Item {0},Angabe des Lagers ist für den Lagerartikel {0} erforderlich
 DocType: Leave Allocation,Unused leaves,Ungenutzter Urlaub
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,Cr
 DocType: Customer,Default Receivable Accounts,Standard-Forderungskonten
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +102,Sawing,Sägearbeiten
 DocType: Tax Rule,Billing State,Verwaltungsbezirk laut Rechnungsadresse
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +32,Laminating,Laminieren
 DocType: Item Reorder,Transfer,Übertragung
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +549,Fetch exploded BOM (including sub-assemblies),Abruf der aufgelösten Stückliste (einschließlich der Unterbaugruppen)
 DocType: Authorization Rule,Applicable To (Employee),Anwendbar auf (Mitarbeiter)
 apps/erpnext/erpnext/controllers/accounts_controller.py +101,Due Date is mandatory,Fälligkeitsdatum wird zwingend vorausgesetzt
 apps/erpnext/erpnext/controllers/item_variant.py +51,Increment for Attribute {0} cannot be 0,Schrittweite für Attribut {0} kann nicht 0 sein
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +143,Sintering,Sinterverfahren
 DocType: Journal Entry,Pay To / Recd From,Zahlen an/Erhalten von
 DocType: Naming Series,Setup Series,Serie bearbeiten
 DocType: Supplier,Contact HTML,Kontakt-HTML
@@ -2978,7 +2860,6 @@
 DocType: Attendance,Absent,Abwesend
 DocType: Product Bundle,Product Bundle,Produkt-Bundle
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +180,Row {0}: Invalid reference {1},Zeile {0}: Ungültige Referenz {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +165,Crushing,Zerkleinerung
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Vorlage für Einkaufssteuern und -gebühren
 DocType: Upload Attendance,Download Template,Vorlage herunterladen
 DocType: GL Entry,Remarks,Bemerkungen
@@ -2986,14 +2867,12 @@
 DocType: Journal Entry,Write Off Based On,Abschreibung basierend auf
 DocType: Features Setup,POS View,Verkaufsstellen-Ansicht
 apps/erpnext/erpnext/config/stock.py +38,Installation record for a Serial No.,Installationsdatensatz für eine Seriennummer
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +9,Continuous casting,Strangguss
 apps/erpnext/erpnext/public/js/queries.js +39,Please specify a,Bitte angeben
 DocType: Offer Letter,Awaiting Response,Warte auf Antwort 
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +53,Above,Über
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +80,Cold sizing,Kaltschlicht-Verfahren
 DocType: Salary Slip,Earning & Deduction,Einkünfte & Abzüge
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +76,Account {0} cannot be a Group,Konto {0} kann keine Gruppe sein 
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +259,Region,Region
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +314,Region,Region
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +213,Optional. This setting will be used to filter in various transactions.,"Optional. Diese Einstellung wird verwendet, um in verschiedenen Transaktionen zu filtern."
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +104,Negative Valuation Rate is not allowed,Negative Bewertung ist nicht erlaubt
 DocType: Holiday List,Weekly Off,Wöchentlich frei
@@ -3011,7 +2890,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,Account {0} is inactive,Konto {0} ist inaktiv 
 DocType: GL Entry,Is Advance,Ist Vorkasse
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,"""Anwesenheit ab Datum"" und ""Anwesenheit bis Datum"" sind zwingend"
-apps/erpnext/erpnext/controllers/buying_controller.py +131,Please enter 'Is Subcontracted' as Yes or No,"Bitte bei ""Untervergeben"" JA oder NEIN eingeben"
+apps/erpnext/erpnext/controllers/buying_controller.py +122,Please enter 'Is Subcontracted' as Yes or No,"Bitte bei ""Untervergeben"" JA oder NEIN eingeben"
 DocType: Sales Team,Contact No.,Kontakt-Nr.
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,'Profit and Loss' type account {0} not allowed in Opening Entry,"Konto vom Typ ""Gewinn und Verlust"" {0} ist in einer Eröffnungsbuchung nicht erlaubt"
 DocType: Workflow State,Time,Zeit
@@ -3020,14 +2899,13 @@
 DocType: Authorization Rule,Authorization Rule,Autorisierungsregel 
 DocType: Sales Invoice,Terms and Conditions Details,Allgemeine Geschäftsbedingungen Details
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,Vorlage für Verkaufssteuern und -gebühren
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +10,Apparel & Accessories,Kleidung & Zubehör
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,Kleidung & Zubehör
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +67,Number of Order,Nummer der Bestellung
 DocType: Item Group,HTML / Banner that will show on the top of product list.,"HTML/Banner, das oben auf der Produktliste angezeigt wird."
 DocType: Shipping Rule,Specify conditions to calculate shipping amount,Bedingungen zur Berechnung der Versandkosten angeben
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +121,Add Child,Unterpunkt hinzufügen
 DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,Rolle darf Konten sperren und gesperrte Buchungen bearbeiten
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +52,Cannot convert Cost Center to ledger as it has child nodes,"Kostenstelle kann nicht in ein Kontenblatt umgewandelt werden, da sie Unterknoten hat"
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +47,Conversion Factor is required,Umrechnungsfaktor wird benötigt
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +37,Serial #,Serien #
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +87,Commission on Sales,Provision auf den Umsatz
 DocType: Offer Letter Term,Value / Description,Wert / Beschreibung
@@ -3035,10 +2913,8 @@
 ,Customers Not Buying Since Long Time,"Kunden, die seit langer Zeit nichts gekauft haben"
 DocType: Production Order,Expected Delivery Date,Voraussichtlicher Liefertermin
 apps/erpnext/erpnext/accounts/general_ledger.py +121,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Soll und Haben nicht gleich für {0} #{1}. Unterschied ist {2}.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +48,Bulging,Prall
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +11,Evaporative-pattern casting,Vollformgießen
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Entertainment Expenses,Bewirtungskosten
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +195,Sales Invoice {0} must be cancelled before cancelling this Sales Order,Ausgangsrechnung {0} muss vor Stornierung dieses Kundenauftrags abgebrochen werden
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +190,Sales Invoice {0} must be cancelled before cancelling this Sales Order,Ausgangsrechnung {0} muss vor Stornierung dieses Kundenauftrags abgebrochen werden
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +61,Age,Alter
 DocType: Time Log,Billing Amount,Rechnungsbetrag 
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +84,Invalid quantity specified for item {0}. Quantity should be greater than 0.,Ungültzige Anzahl für Artikel {0} angegeben. Anzahl sollte größer als 0 sein.
@@ -3056,27 +2932,25 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +68,Direct Expenses,Direkte Aufwendungen
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,Neuer Kundenumsatz
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Travel Expenses,Reisekosten
-DocType: Maintenance Visit,Breakdown,Übersicht
-apps/erpnext/erpnext/controllers/accounts_controller.py +241,Account: {0} with currency: {1} can not be selected,Konto: {0} mit Währung: {1} kann nicht ausgewählt werden
+DocType: Maintenance Visit,Breakdown,Ausfall
+apps/erpnext/erpnext/controllers/accounts_controller.py +242,Account: {0} with currency: {1} can not be selected,Konto: {0} mit Währung: {1} kann nicht ausgewählt werden
 DocType: Bank Reconciliation Detail,Cheque Date,Scheckdatum
 apps/erpnext/erpnext/accounts/doctype/account/account.py +47,Account {0}: Parent account {1} does not belong to company: {2},Konto {0}: Über-Konto {1} gehört nicht zur Firma: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted all transactions related to this company!,Alle Transaktionen dieser Firma wurden erfolgreich gelöscht!
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,Zum
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +111,Honing,Ziehschleifen
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +58,Probation,Probezeit
-apps/erpnext/erpnext/stock/doctype/item/item.py +264,Default Warehouse is mandatory for stock Item.,Standard-Lager ist für Lagerartikel zwingend notwendig.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Probation,Probezeit
+apps/erpnext/erpnext/stock/doctype/item/item.py +268,Default Warehouse is mandatory for stock Item.,Standard-Lager ist für Lagerartikel zwingend notwendig.
 DocType: Feed,Full Name,Vollständiger Name
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +148,Clinching,Falzen
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +191,Payment of salary for the month {0} and year {1},Zahlung des Gehalts für Monat {0} und Jahre {1}
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +173,Payment of salary for the month {0} and year {1},Zahlung des Gehalts für Monat {0} und Jahre {1}
 DocType: Stock Settings,Auto insert Price List rate if missing,"Preisliste automatisch einfügen, wenn sie fehlt "
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,Summe gezahlte Beträge
 ,Transferred Qty,Übergebene Menge
 apps/erpnext/erpnext/config/learn.py +11,Navigating,Navigieren
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +137,Planning,Planung
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +137,Planning,Planung
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +9,Make Time Log Batch,Zeitprotokollstapel erstellen
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Issued,Ausgestellt
 DocType: Project,Total Billing Amount (via Time Logs),Gesamtrechnungsbetrag (über Zeitprotokolle)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +629,We sell this Item,Wir verkaufen diesen Artikel
+apps/erpnext/erpnext/public/js/setup_wizard.js +365,We sell this Item,Wir verkaufen diesen Artikel
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +65,Supplier Id,Lieferanten-ID
 DocType: Journal Entry,Cash Entry,Kassenbuchung
 DocType: Sales Partner,Contact Desc,Kontakt-Beschr.
@@ -3085,19 +2959,17 @@
 DocType: Brand,Item Manager,Artikel-Manager
 DocType: Cost Center,Add rows to set annual budgets on Accounts.,Zeilen hinzufügen um Jahresbudgets in Konten festzulegen.
 DocType: Buying Settings,Default Supplier Type,Standardlieferantentyp
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +160,Quarrying,Abbau
 DocType: Production Order,Total Operating Cost,Gesamtbetriebskosten
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +160,Note: Item {0} entered multiple times,Hinweis: Artikel {0} mehrfach eingegeben
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +163,Note: Item {0} entered multiple times,Hinweis: Artikel {0} mehrfach eingegeben
 apps/erpnext/erpnext/config/crm.py +27,All Contacts.,Alle Kontakte
 DocType: Newsletter,Test Email Id,E-Mail-ID testen
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +394,Company Abbreviation,Firmenkürzel
+apps/erpnext/erpnext/public/js/setup_wizard.js +142,Company Abbreviation,Firmenkürzel
 DocType: Features Setup,If you follow Quality Inspection. Enables Item QA Required and QA No in Purchase Receipt,"Wenn eine Qualitätskontrolle durchgeführt werden soll, werden im Kaufbeleg die Punkte ""Qualitätssicherung benötigt"" und ""Qualitätssicherung Nr."" aktiviert"
 DocType: GL Entry,Party Type,Gruppen-Typ
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +68,Raw material cannot be same as main Item,Rohmaterial kann nicht dasselbe sein wie der Hauptartikel
 DocType: Item Attribute Value,Abbreviation,Abkürzung 
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,Keine Berechtigung da {0} die Höchstgrenzen überschreitet
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +30,Rotational molding,Rotationsformverfahren
-apps/erpnext/erpnext/config/hr.py +115,Salary template master.,Stammdaten zur Gehaltsvorlage.
+apps/erpnext/erpnext/config/hr.py +115,Salary template master.,Stammdaten zur Gehaltsvorlage
 DocType: Leave Type,Max Days Leave Allowed,Maximal zulässige Urlaubstage
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +55,Set Tax Rule for shopping cart,Set Steuerregel für Einkaufswagen
 DocType: Payment Tool,Set Matching Amounts,Passende Beträge einstellen
@@ -3110,15 +2982,15 @@
 apps/erpnext/erpnext/config/selling.py +18,Quotes to Leads or Customers.,Angebote an Leads oder Kunden.
 DocType: Stock Settings,Role Allowed to edit frozen stock,Rolle darf gesperrten Bestand bearbeiten
 ,Territory Target Variance Item Group-Wise,Artikelgruppenbezogene regionale Zielabweichung
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +101,All Customer Groups,Alle Kundengruppen
-apps/erpnext/erpnext/controllers/accounts_controller.py +474,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} ist zwingend erforderlich. Möglicherweise wurde der Datensatz für die Währungsumrechung für {1} bis {2} nicht erstellt.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +101,All Customer Groups,Alle Kundengruppen
+apps/erpnext/erpnext/controllers/accounts_controller.py +475,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} ist zwingend erforderlich. Möglicherweise wurde der Datensatz für die Währungsumrechung für {1} bis {2} nicht erstellt.
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +37,Tax Template is mandatory.,Steuer-Vorlage ist erforderlich.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +41,Account {0}: Parent account {1} does not exist,Konto {0}: Eltern-Konto {1} existiert nicht 
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Preisliste (Firmenwährung)
 DocType: Account,Temporary,Temporär
 DocType: Address,Preferred Billing Address,Bevorzugte Rechnungsadresse
 DocType: Monthly Distribution Percentage,Percentage Allocation,Prozentuale Aufteilung
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +86,Secretary,Sekretärin
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Secretary,Sekretärin
 DocType: Serial No,Distinct unit of an Item,Eindeutige Einheit eines Artikels
 DocType: Pricing Rule,Buying,Einkauf
 DocType: HR Settings,Employee Records to be created by,Mitarbeiter-Datensätze werden erstellt nach
@@ -3131,38 +3003,35 @@
 ,Item-wise Price List Rate,Artikelbezogene Preisliste
 DocType: Purchase Order Item,Supplier Quotation,Lieferantenangebot
 DocType: Quotation,In Words will be visible once you save the Quotation.,"""In Worten"" wird sichtbar, sobald Sie das Angebot speichern."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +68,Ironing,Bügeln
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is stopped,{0} {1} ist beendet
-apps/erpnext/erpnext/stock/doctype/item/item.py +352,Barcode {0} already used in Item {1},Barcode {0} wird bereits für Artikel {1} verwendet
+apps/erpnext/erpnext/stock/doctype/item/item.py +356,Barcode {0} already used in Item {1},Barcode {0} wird bereits für Artikel {1} verwendet
 DocType: Lead,Add to calendar on this date,Zu diesem Datum in Kalender einfügen
-apps/erpnext/erpnext/config/selling.py +132,Rules for adding shipping costs.,Regeln für das Hinzufügen von Versandkosten.
+apps/erpnext/erpnext/config/selling.py +132,Rules for adding shipping costs.,Regeln für das Hinzufügen von Versandkosten
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,Kommende Veranstaltungen
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,Kunde ist verpflichtet
 DocType: Letter Head,Letter Head,Briefkopf
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +27,Quick Entry,Schnelleingabe
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,"{0} ist zwingend für ""Zurück"""
 DocType: Purchase Order,To Receive,Um zu empfangen
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +33,Shrink fitting,Schrumpftechnik
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +522,user@example.com,user@example.com
+apps/erpnext/erpnext/public/js/setup_wizard.js +266,user@example.com,user@example.com
 DocType: Email Digest,Income / Expense,Einnahmen/Ausgaben
 DocType: Employee,Personal Email,Persönliche E-Mail
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +58,Total Variance,Gesamtabweichung
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +62,Total Variance,Gesamtabweichung
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.","Wenn aktiviert, bucht das System Bestandsbuchungen automatisch."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +15,Brokerage,Maklerprovision
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +15,Brokerage,Maklerprovision
 DocType: Address,Postal Code,Postleitzahl
 DocType: Production Order Operation,"in Minutes
 Updated via 'Time Log'","""In Minuten"" über 'Zeitprotokoll' aktualisiert"
 DocType: Customer,From Lead,Von Lead
-apps/erpnext/erpnext/config/manufacturing.py +19,Orders released for production.,Für die Produktion freigegebene Bestellungen.
+apps/erpnext/erpnext/config/manufacturing.py +19,Orders released for production.,Für die Produktion freigegebene Bestellungen
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +42,Select Fiscal Year...,Geschäftsjahr auswählen ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +442,POS Profile required to make POS Entry,"Verkaufsstellen-Profil benötigt, um Verkaufsstellen-Buchung zu erstellen"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +444,POS Profile required to make POS Entry,"Verkaufsstellen-Profil benötigt, um Verkaufsstellen-Buchung zu erstellen"
 DocType: Hub Settings,Name Token,Kürzel benennen
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +106,Planing,Hobeln
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Selling,Standard-Vertrieb
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +120,Standard Selling,Standard-Vertrieb
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +137,Atleast one warehouse is mandatory,Mindestens ein Lager ist zwingend erforderlich
 DocType: Serial No,Out of Warranty,Außerhalb der Garantie
 DocType: BOM Replace Tool,Replace,Ersetzen
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +314,{0} against Sales Invoice {1},{0} zu Verkaufsrechnung {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +316,{0} against Sales Invoice {1},{0} zu Verkaufsrechnung {1}
 apps/erpnext/erpnext/stock/doctype/item/item.py +49,Please enter default Unit of Measure,Bitte die Standardmaßeinheit eingeben
 DocType: Purchase Invoice Item,Project Name,Projektname
 DocType: Supplier,Mention if non-standard receivable account,"Vermerken, wenn es sich um kein Standard-Forderungskonto handelt"
@@ -3178,14 +3047,13 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,Journal Entry {0} does not have account {1} or already matched against other voucher,Journalbuchung {0} gehört nicht zu Konto {1} oder ist bereits mit einem anderen Beleg abgeglichen
 DocType: Item,Moving Average,Gleitender Durchschnitt
 DocType: BOM Replace Tool,The BOM which will be replaced,"Die Stückliste, die ersetzt wird"
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +43,New Stock UOM must be different from current stock UOM,Neue Lagermaßeinheit muss sich von aktueller Lagermaßeinheit unterscheiden
 DocType: Account,Debit,Soll
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +34,Leaves must be allocated in multiples of 0.5,"Abwesenheiten müssen ein Vielfaches von 0,5 sein"
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +44,Leaves must be allocated in multiples of 0.5,"Abwesenheiten müssen ein Vielfaches von 0,5 sein"
 DocType: Production Order,Operation Cost,Kosten eines Arbeitsgangs
 apps/erpnext/erpnext/config/hr.py +71,Upload attendance from a .csv file,Anwesenheiten aus einer CSV-Datei hochladen
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,Offener Betrag
 DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,Ziele artikelgruppenbezogen für diesen Vertriebsmitarbeiter festlegen.
-DocType: Warranty Claim,"To assign this issue, use the ""Assign"" button in the sidebar.","Um diese Anfrage zuzuweisen, bitte die Schaltfläche ""Zuweisen"" auf der Seitenleiste verwenden."
+DocType: Warranty Claim,"To assign this issue, use the ""Assign"" button in the sidebar.","Um diesen Fall zuzuweisen, bitte die Schaltfläche ""Zuweisen"" auf der Seitenleiste verwenden."
 DocType: Stock Settings,Freeze Stocks Older Than [Days],Bestände älter als [Tage] sperren
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +40,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.","Wenn zwei oder mehrere Preisregeln basierend auf den oben genannten Bedingungen gefunden werden, wird eine Vorrangregelung angewandt. Priorität ist eine Zahl zwischen 0 und 20, wobei der Standardwert Null (leer) ist. Die höhere Zahl hat  Vorrang, wenn es mehrere Preisregeln zu den gleichen Bedingungen gibt."
 apps/erpnext/erpnext/controllers/trends.py +36,Fiscal Year: {0} does not exists,Geschäftsjahr: {0} existiert nicht
@@ -3198,33 +3066,32 @@
 DocType: Employee,Internal Work History,Interne Arbeits-Historie
 DocType: DocField,Column Break,Spaltenumbruch
 DocType: Event,Thursday,Donnerstag
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +42,Private Equity,Kapitalbeteiligungsgesellschaft
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +93,Turning,Drehen
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,Kapitalbeteiligungsgesellschaft
 DocType: Maintenance Visit,Customer Feedback,Kundenrückmeldung
 DocType: Account,Expense,Ausgabe
 DocType: Sales Invoice,Exhibition,Messe
 DocType: Item Attribute,From Range,Von-Bereich
 apps/erpnext/erpnext/stock/utils.py +89,Item {0} ignored since it is not a stock item,"Artikel {0} ignoriert, da es sich nicht um einen Lagerartikel handelt"
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +29,Submit this Production Order for further processing.,Diesen Fertigungsauftrag für die weitere Verarbeitung absenden.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +29,Submit this Production Order for further processing.,Diesen Fertigungsauftrag für die weitere Verarbeitung übertragen.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +21,"To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled.","Um Preisregeln in einer bestimmten Transaktion nicht zu verwenden, sollten alle geltenden Preisregeln deaktiviert sein."
 DocType: Company,Domain,Domäne
 ,Sales Order Trends,Verkaufsauftragstrends
 DocType: Employee,Held On,Festgehalten am
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +33,Production Item,Produktions-Artikel
 ,Employee Information,Mitarbeiterinformationen
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,Rate (%),Preis (%)
+apps/erpnext/erpnext/public/js/setup_wizard.js +294,Rate (%),Preis (%)
 DocType: Stock Entry Detail,Additional Cost,Zusätzliche Kosten
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +407,Financial Year End Date,Enddatum des Geschäftsjahres
+apps/erpnext/erpnext/public/js/setup_wizard.js +155,Financial Year End Date,Enddatum des Geschäftsjahres
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Voucher No, if grouped by Voucher","Wenn nach Beleg gruppiert wurde, kann nicht auf Grundlage von Belegen gefiltert werden."
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +484,Make Supplier Quotation,Lieferantenangebot erstellen
 DocType: Quality Inspection,Incoming,Eingehend
 DocType: BOM,Materials Required (Exploded),Benötigte Materialien (erweitert)
 DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),Verdienst für unbezahlten Urlaub (LWP) vermindern
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +512,"Add users to your organization, other than yourself","Benutzer, außer Ihnen, zu Ihrer Firma hinzufügen"
+apps/erpnext/erpnext/public/js/setup_wizard.js +256,"Add users to your organization, other than yourself","Benutzer, außer Ihnen, zu Ihrer Firma hinzufügen"
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No {1} does not match with {2} {3},Row # {0}: Seriennummer {1} nicht mit übereinstimmen {2} {3}
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +44,Casual Leave,Ungeplante Abwesenheit
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +44,Casual Leave,Ungeplante Abwesenheit
 DocType: Batch,Batch ID,Chargen-ID
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +334,Note: {0},Hinweis: {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +336,Note: {0},Hinweis: {0}
 ,Delivery Note Trends,Entwicklung Lieferscheine
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +104,This Week's Summary,Zusammenfassung dieser Woche
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +74,{0} must be a Purchased or Sub-Contracted Item in row {1},{0} muss ein gekaufter oder unterbeauftragter Artikel in Zeile {1} sein
@@ -3232,11 +3099,11 @@
 DocType: GL Entry,Party,Gruppe
 DocType: Sales Order,Delivery Date,Liefertermin
 DocType: DocField,Currency,Währung
-DocType: Opportunity,Opportunity Date,Datum der Möglichkeit
+DocType: Opportunity,Opportunity Date,Datum der Opportunity
 DocType: Purchase Receipt,Return Against Purchase Receipt,Zurück zum Kaufbeleg
 DocType: Purchase Order,To Bill,Abrechnen
 DocType: Material Request,% Ordered,% Bestellt
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +61,Piecework,Akkordarbeit
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Piecework,Akkordarbeit
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +64,Avg. Buying Rate,Durchschnittlicher Einkaufspreis
 DocType: Task,Actual Time (in Hours),Tatsächliche Zeit (in Stunden)
 DocType: Employee,History In Company,Historie im Unternehmen
@@ -3253,13 +3120,13 @@
 DocType: Opportunity,To Discuss,Zur Diskussion
 DocType: SMS Settings,SMS Settings,SMS-Einstellungen
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +60,Temporary Accounts,Temporäre Konten
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +155,Black,Schwarz
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Black,Schwarz
 DocType: BOM Explosion Item,BOM Explosion Item,Position der Stücklistenauflösung 
 DocType: Account,Auditor,Prüfer 
 DocType: Purchase Order,End date of current order's period,Schlußdatum der laufenden Bestellperiode
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +17,Make Offer Letter,Angebotsschreiben erstellen
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +10,Return,Zurück
-apps/erpnext/erpnext/stock/doctype/item/item.py +503,Default Unit of Measure for Variant must be same as Template,Standard-Maßeinheit muss für eine Variante die gleiche wie für eine Vorlage sein
+apps/erpnext/erpnext/stock/doctype/item/item.py +507,Default Unit of Measure for Variant must be same as Template,Standard-Maßeinheit muss für eine Variante die gleiche wie für eine Vorlage sein
 DocType: DocField,Fold,Falz
 DocType: Production Order Operation,Production Order Operation,Arbeitsgang im Fertigungsauftrag
 DocType: Pricing Rule,Disable,Deaktivieren
@@ -3270,13 +3137,12 @@
 DocType: Page,Page Name,Seitenname
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +110,To Time must be greater than From Time,Bis-Zeit muss nach Von-Zeit liegen
 DocType: Journal Entry Account,Exchange Rate,Wechselkurs
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +465,Sales Order {0} is not submitted,Kundenauftrag {0} wurde nicht versendet
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +467,Sales Order {0} is not submitted,Kundenauftrag {0} wurde nicht übertragen
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0}: Parent account {1} does not bolong to the company {2},Lager {0}: Übergeordnetes Konto {1} gehört nicht zu Firma {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +124,Spindle finishing,Spindelverarbeitung
 DocType: BOM,Last Purchase Rate,Letzter Anschaffungspreis
 DocType: Account,Asset,Vermögenswert 
 DocType: Project Task,Task ID,Aufgaben-ID
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +395,"e.g. ""MC""","z. B. ""MC"""
+apps/erpnext/erpnext/public/js/setup_wizard.js +143,"e.g. ""MC""","z. B. ""MC"""
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,Stock cannot exist for Item {0} since has variants,"Für Artikel {0} kann es kein Lager geben, da es Varianten gibt"
 ,Sales Person-wise Transaction Summary,Vertriebsmitarbeiterbezogene Zusammenfassung der Transaktionen
 DocType: System Settings,Time Zone,Zeitzone
@@ -3285,9 +3151,7 @@
 DocType: Monthly Distribution,Monthly Distribution Percentages,Prozentuale Aufteilungen der monatsweisen Verteilung
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +16,The selected item cannot have Batch,Der ausgewählte Artikel kann keine Charge haben
 DocType: Delivery Note,% of materials delivered against this Delivery Note,% der für diesen Lieferschein gelieferten Materialien
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +151,Stapling,Heften
 DocType: Customer,Customer Details,Kundendaten
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +105,Shaping,Gestaltung
 DocType: Employee,Reports to,Berichte an
 DocType: SMS Settings,Enter url parameter for receiver nos,URL-Parameter für Empfängernummern eingeben
 DocType: Sales Invoice,Paid Amount,Gezahlter Betrag
@@ -3296,13 +3160,13 @@
 DocType: Item Variant,Item Variant,Artikelvariante
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +15,Setting this Address Template as default as there is no other default,"Diese Adressvorlage als Standard einstellen, da es keinen anderen Standard gibt"
 apps/erpnext/erpnext/accounts/doctype/account/account.py +89,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Konto bereits im Soll, es ist nicht mehr möglich das Konto als Habenkonto festzulegen "
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +76,Quality Management,Qualitätsmanagement
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Quality Management,Qualitätsmanagement
 DocType: Production Planning Tool,Filter based on customer,Filtern nach Kunden
 DocType: Payment Tool Detail,Against Voucher No,Gegenbeleg-Nr.
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +47,Please enter quantity for Item {0},Bitte die Menge für Artikel {0} eingeben
 DocType: Employee External Work History,Employee External Work History,Externe Berufserfahrung des Mitarbeiters
 DocType: Tax Rule,Purchase,Einkauf
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +34,Balance Qty,Bilanzmenge
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Balance Qty,Bilanzmenge
 DocType: Item Group,Parent Item Group,Übergeordnete Artikelgruppe
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +21,{0} for {1},{0} für {1}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +96,Cost Centers,Kostenstellen
@@ -3312,12 +3176,12 @@
 DocType: Opportunity,Next Contact,Nächster Kontakt
 DocType: Employee,Employment Type,Art der Beschäftigung
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,Anlagevermögen
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +84,Application period cannot be across two alocation records,Bewerbungszeitraum kann nicht über zwei alocation Datensätze sein
 DocType: Item Group,Default Expense Account,Standardaufwandskonto
 DocType: Employee,Notice (days),Meldung(s)(-Tage)
 DocType: Page,Yes,Ja
 DocType: Tax Rule,Sales Tax Template,Umsatzsteuer-Vorlage
 DocType: Employee,Encashment Date,Inkassodatum
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +74,Electroforming,Galvanotechnik
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +179,"Against Voucher Type must be one of Purchase Order, Purchase Invoice or Journal Entry","""Gegenbeleg"" muss entweder eine Bestellung, eine Einkaufsrechnung oder eine Journalbuchung sein"
 DocType: Account,Stock Adjustment,Bestandskorrektur
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +34,Default Activity Cost exists for Activity Type - {0},Es gibt Standard-Aktivitätskosten für Aktivitätsart - {0}
@@ -3337,9 +3201,9 @@
 DocType: Item Variant Attribute,Attribute,Attribut
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +21,Please specify from/to range,Bitte Von-/Bis-Bereich genau angeben
 apps/frappe/frappe/public/js/frappe/model/model.js +18,Created By,Erstellt von
-DocType: Serial No,Under AMC,Unter jährlichem Wartungsvertrag
+DocType: Serial No,Under AMC,Innerhalb des jährlichen Wartungsvertrags
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +47,Item valuation rate is recalculated considering landed cost voucher amount,Artikelpreis wird unter Einbezug von Belegen über den Einstandspreis neu berechnet
-apps/erpnext/erpnext/config/selling.py +70,Default settings for selling transactions.,Standardeinstellungen für Vertriebstransaktionen.
+apps/erpnext/erpnext/config/selling.py +70,Default settings for selling transactions.,Standardeinstellungen für Vertriebstransaktionen
 DocType: BOM Replace Tool,Current BOM,Aktuelle Stückliste
 apps/erpnext/erpnext/public/js/utils.js +57,Add Serial No,Seriennummer hinzufügen
 DocType: Production Order,Warehouses,Lager
@@ -3353,21 +3217,21 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,"Lager kann nicht gelöscht werden, da es Buchungen im Lagerbuch gibt."
 DocType: Company,Distribution,Großhandel
 apps/erpnext/erpnext/public/js/pos/pos.html +36,Amount Paid,Zahlbetrag
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +91,Project Manager,Projektleiter
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +72,Dispatch,Versand
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Project Manager,Projektleiter
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +72,Dispatch,Versand
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,Max erlaubter Rabatt für Artikel: {0} ist {1}%
 DocType: Customer,Default Taxes and Charges,Standard-Steuern und -Abgaben
 DocType: Account,Receivable,Forderung
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +268,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,"Zeile #{0}: Es ist nicht erlaubt den Lieferanten zu wechseln, da bereits eine Bestellung vorhanden ist"
-DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,"Rolle, die Zahlungen, die das gesetzte Kreditlimit überschreiten, durchführen darf."
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +263,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,"Zeile #{0}: Es ist nicht erlaubt den Lieferanten zu wechseln, da bereits eine Bestellung vorhanden ist"
+DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,"Rolle, welche Transaktionen, die das gesetzte Kreditlimit überschreiten, übertragen darf."
 DocType: Sales Invoice,Supplier Reference,Referenznummer des Lieferanten
 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.","Wenn aktiviert, wird die Stückliste für Unterbaugruppen-Artikel berücksichtigt, um Rohmaterialien zu bekommen. Andernfalls werden alle Unterbaugruppen-Artikel als Rohmaterial behandelt."
 DocType: Material Request,Material Issue,Materialentnahme
 DocType: Hub Settings,Seller Description,Beschreibung des Verkäufers
 DocType: Employee Education,Qualification,Qualifikation
 DocType: Item Price,Item Price,Artikelpreis
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +48,Soap & Detergent,Reinigungsmittel
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +36,Motion Picture & Video,Film & Fernsehen
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +48,Soap & Detergent,Reinigungsmittel
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +36,Motion Picture & Video,Film & Fernsehen
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Bestellt
 DocType: Warehouse,Warehouse Name,Lagername
 DocType: Naming Series,Select Transaction,Bitte Transaktionen auswählen
@@ -3376,19 +3240,18 @@
 DocType: BOM,Rate Of Materials Based On,Anteil der zu Grunde liegenden Materialien
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,Support-Analyse
 apps/erpnext/erpnext/accounts/doctype/accounts_settings/accounts_settings.py +27,Company is missing in warehouses {0},Firma fehlt in Lägern {0}
-DocType: Stock UOM Replace Utility,Stock UOM Replace Utility,Werkzeug zum Ersetzen der Lagermaßeinheit
 DocType: POS Profile,Terms and Conditions,Allgemeine Geschäftsbedingungen
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,To Date should be within the Fiscal Year. Assuming To Date = {0},"Bis-Datum sollte im Geschäftsjahr liegen. Unter der Annahme, dass Bis-Datum = {0} ist"
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","Hier können Sie Größe, Gewicht, Allergien, medizinische Belange usw. pflegen"
 DocType: Leave Block List,Applies to Company,Gilt für Firma
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +175,Cannot cancel because submitted Stock Entry {0} exists,"Stornierung nicht möglich, weil versandte Lagerbuchung {0} existiert"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +175,Cannot cancel because submitted Stock Entry {0} exists,"Stornierung nicht möglich, weil übertragene Lagerbuchung {0} existiert"
 DocType: Purchase Invoice,In Words,In Worten
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +213,Today is {0}'s birthday!,Heute hat {0} Geburtstag!
 DocType: Production Planning Tool,Material Request For Warehouse,Materialanfrage für Lager
 DocType: Sales Order Item,For Production,Für die Produktion
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +103,Please enter sales order in the above table,Bitte den Kundenauftrag in die obige Tabelle eingeben
 DocType: Project Task,View Task,Aufgabe anzeigen
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +406,Your financial year begins on,Ihr Geschäftsjahr beginnt am
+apps/erpnext/erpnext/public/js/setup_wizard.js +154,Your financial year begins on,Ihr Geschäftsjahr beginnt am
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +46,Please enter Purchase Receipts,Bitte Kaufbelege eingeben
 DocType: Sales Invoice,Get Advances Received,Erhaltene Anzahlungen aufrufen
 DocType: Email Digest,Add/Remove Recipients,Empfänger hinzufügen/entfernen
@@ -3396,17 +3259,15 @@
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","Um dieses Geschäftsjahr als Standard festzulegen, auf ""Als Standard festlegen"" anklicken"
 apps/erpnext/erpnext/config/support.py +54,Setup incoming server for support email id. (e.g. support@example.com),E-Mail-Adresse für den Support einrichten. (z. B. support@example.com)
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,Engpassmenge
-apps/erpnext/erpnext/stock/doctype/item/item.py +528,Item variant {0} exists with same attributes,Artikelvariante {0} mit denselben Attributen existiert
+apps/erpnext/erpnext/stock/doctype/item/item.py +532,Item variant {0} exists with same attributes,Artikelvariante {0} mit denselben Attributen existiert
 DocType: Salary Slip,Salary Slip,Gehaltsabrechnung
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +116,Burnishing,Polieren
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +54,'To Date' is required,"""Bis-Datum"" ist erforderlich,"
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,"""Bis-Datum"" ist erforderlich,"
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","Packzettel für zu liefernde Pakete generieren. Wird verwendet, um Paketnummer, Packungsinhalt und das Gewicht zu dokumentieren."
 DocType: Sales Invoice Item,Sales Order Item,Kundenauftrags-Artikel
 DocType: Salary Slip,Payment Days,Zahlungsziel
 DocType: BOM,Manage cost of operations,Arbeitsgangkosten verwalten
 DocType: Features Setup,Item Advanced,Erweiterter Artikel
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +40,Hot rolling,Warmwalzen
-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.","Wenn eine der ausgewählten Transaktionen den Status ""versendet"" erreicht hat, geht automatisch ein E-Mail-Fenster auf, so dass eine E-Mail an die mit dieser Transaktion verknüpften Kontaktdaten gesendet wird, mit der Transaktion als Anhang.  Der Benutzer kann auswählen, ob er diese E-Mail absenden will."
+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.","Wenn eine der ausgewählten Transaktionen den Status ""übertragen"" erreicht hat, geht automatisch ein E-Mail-Fenster auf, so dass eine E-Mail an die mit dieser Transaktion verknüpften Kontaktdaten gesendet wird, mit der Transaktion als Anhang.  Der Benutzer kann auswählen, ob er diese E-Mail absenden will."
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,Allgemeine Einstellungen
 DocType: Employee Education,Employee Education,Mitarbeiterschulung
 apps/erpnext/erpnext/public/js/controllers/transaction.js +742,It is needed to fetch Item Details.,"Wird gebraucht, um Artikeldetails abzurufen"
@@ -3417,28 +3278,26 @@
 DocType: Purchase Invoice,Recurring Id,Wiederkehrende ID
 DocType: Customer,Sales Team Details,Verkaufsteamdetails
 DocType: Expense Claim,Total Claimed Amount,Summe des geforderten Betrags
-apps/erpnext/erpnext/config/crm.py +22,Potential opportunities for selling.,Mögliche Opportunities für den Vertrieb.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +48,Sick Leave,Krankheitsbedingte Abwesenheit
+apps/erpnext/erpnext/config/crm.py +22,Potential opportunities for selling.,Mögliche Opportunities für den Vertrieb
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +174,Invalid {0},Ungültige {0}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +48,Sick Leave,Krankheitsbedingte Abwesenheit
 DocType: Email Digest,Email Digest,Täglicher E-Mail-Bericht
 DocType: Delivery Note,Billing Address Name,Name der Rechnungsadresse 
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +22,Department Stores,Kaufhäuser
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,Kaufhäuser
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +40,System Balance,System-Bilanz
 DocType: Workflow,Is Active,Ist aktiv(iert)
 apps/erpnext/erpnext/controllers/stock_controller.py +71,No accounting entries for the following warehouses,Keine Buchungen für die folgenden Lager
 apps/erpnext/erpnext/projects/doctype/project/project.js +22,Save the document first.,Speichern Sie das Dokument zuerst.
 DocType: Account,Chargeable,Gebührenpflichtig
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +121,Linishing,Verschleifen
 DocType: Company,Change Abbreviation,Abkürzung ändern
 DocType: Workflow State,Primary,Primär
 DocType: Expense Claim Detail,Expense Date,Datum der Aufwendung
 DocType: Item,Max Discount (%),Maximaler Rabatt (%)
 DocType: Communication,More Information,Mehr Informationen
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +70,Last Order Amount,Letzter Bestellbetrag
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +161,Blasting,Abstrahlen
 DocType: Company,Warn,Warnen
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +111,Item valuation updated,Artikelbewertung aktualisiert
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Sonstige wichtige Anmerkungen, die in die Datensätze aufgenommen werden sollten."
-DocType: BOM,Manufacturing User,Fertigungs-Benutzer
+DocType: BOM,Manufacturing User,Nutzer Fertigung
 DocType: Purchase Order,Raw Materials Supplied,Gelieferte Rohmaterialien
 DocType: Purchase Invoice,Recurring Print Format,Wiederkehrendes Druckformat
 DocType: Communication,Series,Serie
@@ -3446,7 +3305,7 @@
 DocType: Appraisal,Appraisal Template,Bewertungsvorlage
 DocType: Communication,Email,E-Mail
 DocType: Item Group,Item Classification,Artikeleinteilung
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +89,Business Development Manager,Leiter der kaufmännischen Abteilung
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Business Development Manager,Leiter der kaufmännischen Abteilung
 DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,Zweck des Wartungsbesuchs
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.js +15,Period,Periode
 ,General Ledger,Hauptbuch
@@ -3456,9 +3315,7 @@
 ,Itemwise Recommended Reorder Level,Vorgeschlagener artikelbezogener Meldebestand
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +264,Please select {0} first,Bitte zuerst {0} auswählen
 DocType: Features Setup,To get Item Group in details table,Wird verwendet um eine detaillierte Tabelle der Artikelgruppe zu erhalten
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +67,Redrawing,Neuzeichnen
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +112,Batch {0} of Item {1} has expired.,Charge {0} von Artikel {1} ist abgelaufen.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +120,Etching,Ätztechnik
 DocType: Sales Invoice,Commission,Provision
 DocType: Address Template,"<h4>Default Template</h4>
 <p>Uses <a href=""http://jinja.pocoo.org/docs/templates/"">Jinja Templating</a> and all the fields of Address (including Custom Fields if any) will be available</p>
@@ -3493,9 +3350,9 @@
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +166,Maintenance Schedule {0} exists against {0},Wartungsplan {0} gegen {0} zu
 DocType: Stock Entry Detail,Actual Qty (at source/target),Tatsächliche Anzahl (am Ursprung/Ziel) 
 DocType: Item Customer Detail,Ref Code,Ref-Kode
-apps/erpnext/erpnext/config/hr.py +13,Employee records.,Mitarbeiterdatensätze.
+apps/erpnext/erpnext/config/hr.py +13,Employee records.,Mitarbeiterdatensätze
 DocType: HR Settings,Payroll Settings,Einstellungen zur Gehaltsabrechnung
-apps/erpnext/erpnext/config/accounts.py +58,Match non-linked Invoices and Payments.,Nicht verknüpfte Rechnungen und Zahlungen verknüpfen.
+apps/erpnext/erpnext/config/accounts.py +58,Match non-linked Invoices and Payments.,Nicht verknüpfte Rechnungen und Zahlungen verknüpfen
 apps/erpnext/erpnext/templates/pages/cart.html +13,Place Order,Bestellung aufgeben
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +25,Root cannot have a parent cost center,Root kann keine übergeordnete Kostenstelle haben
 apps/erpnext/erpnext/public/js/stock_analytics.js +59,Select Brand...,Marke auswählen ...
@@ -3503,14 +3360,14 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +340,Operation Time must be greater than 0 for Operation {0},Betriebszeit muss größer als 0 für die Operation {0}
 DocType: Supplier,Address and Contacts,Adresse und Kontaktinformationen
 DocType: UOM Conversion Detail,UOM Conversion Detail,Maßeinheit-Umrechnungs-Detail
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +496,Keep it web friendly 900px (w) by 100px (h),Webfreundlich halten: 900px (breit) zu 100px (hoch)
+apps/erpnext/erpnext/public/js/setup_wizard.js +242,Keep it web friendly 900px (w) by 100px (h),Webfreundlich halten: 900px (breit) zu 100px (hoch)
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +329,Production Order cannot be raised against a Item Template,Ein Fertigungsauftrag kann nicht zu einer Artikel-Vorlage gemacht werden
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +44,Charges are updated in Purchase Receipt against each item,Kosten werden im Kaufbeleg für jeden Artikel aktualisiert
 DocType: Payment Tool,Get Outstanding Vouchers,Offene Posten aufrufen
-DocType: Warranty Claim,Resolved By,Gelöst von
+DocType: Warranty Claim,Resolved By,Beschlossen von
 DocType: Appraisal,Start Date,Startdatum
 apps/frappe/frappe/public/js/frappe/form/link_selector.js +21,Value,Wert
-apps/erpnext/erpnext/config/hr.py +130,Allocate leaves for a period.,Urlaube für einen Zeitraum zuordnen.
+apps/erpnext/erpnext/config/hr.py +130,Allocate leaves for a period.,Urlaube für einen Zeitraum zuordnen
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +139,Click here to verify,Hier klicken um die Richtigkeit zu bestätigen
 apps/erpnext/erpnext/accounts/doctype/account/account.py +43,Account {0}: You can not assign itself as parent account,Konto {0}: Sie können dieses Konto sich selbst nicht als Über-Konto zuweisen
 DocType: Purchase Invoice Item,Price List Rate,Preisliste
@@ -3519,54 +3376,49 @@
 DocType: Item,Average time taken by the supplier to deliver,Durchschnittliche Lieferzeit des Lieferanten
 DocType: Time Log,Hours,Stunden
 DocType: Project,Expected Start Date,Voraussichtliches Startdatum
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +38,Rolling,Walzen
 DocType: ToDo,Priority,Priorität
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +41,Remove item if charges is not applicable to that item,"Artikel entfernen, wenn keine Gebühren angerechtet werden können"
 DocType: Dropbox Backup,Dropbox Access Allowed,Dropbox-Zugang erlaubt
 DocType: Dropbox Backup,Weekly,Wöchentlich
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,z. B. smsgateway.com/api/send_sms.cgi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +485,Receive,Erhalten
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +510,Receive,Empfangen
 DocType: Maintenance Visit,Fully Completed,Vollständig abgeschlossen
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% abgeschlossen
 DocType: Employee,Educational Qualification,Schulische Qualifikation
 DocType: Workstation,Operating Costs,Betriebskosten
 DocType: Employee Leave Approver,Employee Leave Approver,Urlaubsgenehmiger des Mitarbeiters
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,{0} has been successfully added to our Newsletter list.,{0} wurde erfolgreich zu unserer Newsletter-Liste hinzugefügt.
-apps/erpnext/erpnext/stock/doctype/item/item.py +383,Row {0}: An Reorder entry already exists for this warehouse {1},Zeile {0}: Es gibt bereits eine Nachbestellungsbuchung für dieses Lager {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +387,Row {0}: An Reorder entry already exists for this warehouse {1},Zeile {0}: Es gibt bereits eine Nachbestellungsbuchung für dieses Lager {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +67,"Cannot declare as lost, because Quotation has been made.","Kann nicht als verloren deklariert werden, da bereits ein Angebot erstellt wurde."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +133,Electron beam machining,Elektronenstrahlbearbeitung
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Einkaufsstammdaten-Manager
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +424,Production Order {0} must be submitted,Fertigungsauftrag {0} muss versendet werden
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +424,Production Order {0} must be submitted,Fertigungsauftrag {0} muss übertragen werden
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +150,Please select Start Date and End Date for Item {0},Bitte Start -und Enddatum für den Artikel {0} auswählen
 apps/erpnext/erpnext/config/stock.py +141,Main Reports,Hauptberichte
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +102,Stock Ledger entries balances updated,Buchungen auf Konten des Lagerbuchs wurden aktualisiert
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,Bis-Datum kann nicht vor Von-Datum liegen
 DocType: Purchase Receipt Item,Prevdoc DocType,Prevdoc DocType
-apps/erpnext/erpnext/stock/doctype/item/item.js +176,Add / Edit Prices,Preise hinzufügen / bearbeiten
+apps/erpnext/erpnext/stock/doctype/item/item.js +178,Add / Edit Prices,Preise hinzufügen / bearbeiten
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +53,Chart of Cost Centers,Übersicht der Kostenstellen
 ,Requested Items To Be Ordered,"Angeforderte Artikel, die bestellt werden sollen"
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +298,My Orders,Meine Bestellungen
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +293,My Orders,Meine Bestellungen
 DocType: Price List,Price List Name,Preislistenname
 DocType: Time Log,For Manufacturing,Für die Herstellung
-apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +70,Totals,Summen
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +174,Totals,Summen
 DocType: BOM,Manufacturing,Fertigung
 ,Ordered Items To Be Delivered,"Bestellte Artikel, die geliefert werden müssen"
 DocType: Account,Income,Einkommen
 ,Setup Wizard,Setup-Assistent
 DocType: Industry Type,Industry Type,Wirtschaftsbranche
 apps/erpnext/erpnext/templates/includes/cart.js +137,Something went wrong!,Etwas ist schiefgelaufen!
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +68,Warning: Leave application contains following block dates,Achtung: Die Urlaubsverwaltung enthält die folgenden gesperrten Daten
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +251,Sales Invoice {0} has already been submitted,Ausgangsrechnung {0} wurde bereits versendet
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +100,Warning: Leave application contains following block dates,Achtung: Die Urlaubsverwaltung enthält die folgenden gesperrten Daten
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +256,Sales Invoice {0} has already been submitted,Ausgangsrechnung {0} wurde bereits übertragen
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,Fertigstellungstermin
 DocType: Purchase Invoice Item,Amount (Company Currency),Betrag (Firmenwährung)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +10,Die casting,Druckguss
 DocType: Email Alert,Reference Date,Referenzdatum
-apps/erpnext/erpnext/config/hr.py +105,Organization unit (department) master.,Stammdaten der Organisationseinheit (Abteilung).
+apps/erpnext/erpnext/config/hr.py +105,Organization unit (department) master.,Stammdaten der Organisationseinheit (Abteilung)
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +25,Please enter valid mobile nos,Bitte gültige Mobilnummern eingeben
 DocType: Budget Detail,Budget Detail,Budget-Detail
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +75,Please enter message before sending,Bitte eine Nachricht vor dem Versenden eingeben
 DocType: Async Task,Status,Status
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +65,Stock UOM updated for Item {0},Lagermaßeinheit für Artikel {0} aktualisiert
 DocType: Company History,Year,Jahr
 apps/erpnext/erpnext/config/accounts.py +127,Point-of-Sale Profile,Verkaufsstellen-Profil
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +68,Please Update SMS Settings,Bitte SMS-Einstellungen aktualisieren
@@ -3580,12 +3432,12 @@
 ,Serial No Service Contract Expiry,Ablaufdatum des Wartungsvertrags zur Seriennummer
 DocType: Item,Unit of Measure Conversion,Maßeinheit-Konvertierung
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +86,Employee can not be changed,Mitarbeiter kann nicht verändert werden
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +259,You cannot credit and debit same account at the same time,Sie können ein Konto nicht gleichzeitig be- und entlasten
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,You cannot credit and debit same account at the same time,Sie können ein Konto nicht gleichzeitig be- und entlasten
 DocType: Naming Series,Help HTML,HTML-Hilfe
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},Summe der zugeordneten Gewichtungen sollte 100% sein. Sie ist {0}
 apps/erpnext/erpnext/controllers/status_updater.py +140,Allowance for over-{0} crossed for Item {1},Zustimmung für Artikel {1} bei Überschreitung von {0}
 DocType: Address,Name of person or organization that this address belongs to.,"Name der Person oder des Unternehmens, zu dem diese Adresse gehört."
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +587,Your Suppliers,Ihre Lieferanten
+apps/erpnext/erpnext/public/js/setup_wizard.js +325,Your Suppliers,Ihre Lieferanten
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,"Kann nicht als verloren gekennzeichnet werden, da ein Kundenauftrag dazu existiert."
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +65,Another Salary Structure {0} is active for employee {1}. Please make its status 'Inactive' to proceed.,"Eine andere Gehaltsstruktur {0} ist für diesen Mitarbeiter {1} aktiv. Bitte setzen Sie dessen Status auf ""inaktiv"" um fortzufahren."
 DocType: Purchase Invoice,Contact,Kontakt
@@ -3594,61 +3446,58 @@
 DocType: Item,Has Serial No,Seriennummer vorhanden
 DocType: Employee,Date of Issue,Ausstellungsdatum
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +16,{0}: From {0} for {1},{0}: Von {0} für {1}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +154,Row #{0}: Set Supplier for item {1},Zeile #{0}: Lieferanten für Artikel {1} einstellen
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +149,Row #{0}: Set Supplier for item {1},Zeile #{0}: Lieferanten für Artikel {1} einstellen
 DocType: Issue,Content Type,Inhaltstyp
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +17,Computer,Rechner
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,Rechner
 DocType: Item,List this Item in multiple groups on the website.,Diesen Artikel in mehreren Gruppen auf der Webseite auflisten.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +283,Please check Multi Currency option to allow accounts with other currency,Bitte die Option Mehrfachwährung aktivieren um Konten mit anderen Währungen zu erlauben
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +285,Please check Multi Currency option to allow accounts with other currency,Bitte die Option Mehrfachwährung aktivieren um Konten mit anderen Währungen zu erlauben
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +62,Item: {0} does not exist in the system,Artikel: {0} ist nicht im System vorhanden
 apps/erpnext/erpnext/accounts/doctype/account/account.py +81,You are not authorized to set Frozen value,Sie haben keine Berechtigung gesperrte Werte zu setzen
 DocType: Payment Reconciliation,Get Unreconciled Entries,Nicht zugeordnete Buchungen aufrufen
 DocType: Cost Center,Budgets,Budgets
 apps/frappe/frappe/core/page/modules_setup/modules_setup.py +11,Updated,Aktualisiert
 DocType: Employee,Emergency Contact Details,Notfallkontaktdaten
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +396,What does it do?,Unternehmenszweck
+apps/erpnext/erpnext/public/js/setup_wizard.js +144,What does it do?,Unternehmenszweck
 DocType: Delivery Note,To Warehouse,An Lager
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +45,Account {0} has been entered more than once for fiscal year {1},Konto {0} wurde mehr als einmal für das Geschäftsjahr {1} erfasst 
 ,Average Commission Rate,Durchschnittlicher Provisionssatz
-apps/erpnext/erpnext/stock/doctype/item/item.py +313,'Has Serial No' can not be 'Yes' for non-stock item,"""Hat Seriennummer"" kann bei Nicht-Lagerartikeln nicht ""Ja"" sein"
+apps/erpnext/erpnext/stock/doctype/item/item.py +317,'Has Serial No' can not be 'Yes' for non-stock item,"""Hat Seriennummer"" kann bei Nicht-Lagerartikeln nicht ""Ja"" sein"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Attendance can not be marked for future dates,Die Anwesenheit kann nicht für zukünftige Termine markiert werden
 DocType: Pricing Rule,Pricing Rule Help,Hilfe zur Preisregel
 DocType: Purchase Taxes and Charges,Account Head,Kontobezeichnung
 apps/erpnext/erpnext/config/stock.py +79,Update additional costs to calculate landed cost of items,Zusatzkosten aktualisieren um die Einstandskosten des Artikels zu kalkulieren
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +111,Electrical,Elektro
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +111,Electrical,Elektro
 DocType: Stock Entry,Total Value Difference (Out - In),Gesamt-Wertdifferenz (Aus - Ein)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +302,Row {0}: Exchange Rate is mandatory,Row {0}: Wechselkurs ist obligatorisch
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +304,Row {0}: Exchange Rate is mandatory,Row {0}: Wechselkurs ist obligatorisch
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},Benutzer-ID ist für Mitarbeiter {0} nicht eingegeben
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +72,Peening,Strahlverfahren
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,From Warranty Claim,Von Garantieantrag
 DocType: Stock Entry,Default Source Warehouse,Standard-Ausgangslager
 DocType: Item,Customer Code,Kunden-Nr.
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +212,Birthday Reminder for {0},Geburtstagserinnerung für {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +163,Lapping,Läppen
-apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.js +8,Days Since Last Order,Tage seit dem letzten Auftrag
+apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +72,Days Since Last Order,Tage seit dem letzten Auftrag
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +299,Debit To account must be a Balance Sheet account,Sollkonto muss ein Bilanzkonto sein
 DocType: Buying Settings,Naming Series,Nummernkreis
 DocType: Leave Block List,Leave Block List Name,Urlaubssperrenliste Name
 DocType: User,Enabled,Aktiviert
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Wertpapiere
-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},Wollen Sie wirklich alle Gehaltsabrechnungen für den Monat {0} im Jahr {1} versenden
+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},Wollen Sie wirklich alle Gehaltsabrechnungen für den Monat {0} im Jahr {1} übertragen
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +8,Import Subscribers,Import-Abonnenten
 DocType: Target Detail,Target Qty,Zielmenge
-DocType: Attendance,Present,Gegenwart
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Note {0} must not be submitted,Lieferschein {0} darf nicht versendet werden
+DocType: Attendance,Present,Anwesend
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Note {0} must not be submitted,Lieferschein {0} darf nicht übertragen werden
 DocType: Notification Control,Sales Invoice Message,Mitteilung zur Ausgangsrechnung
 DocType: Authorization Rule,Based On,Beruht auf
 DocType: Sales Order Item,Ordered Qty,Bestellte Menge
-apps/erpnext/erpnext/stock/doctype/item/item.py +539,Item {0} is disabled,Artikel {0} ist deaktiviert
+apps/erpnext/erpnext/stock/doctype/item/item.py +543,Item {0} is disabled,Artikel {0} ist deaktiviert
 DocType: Stock Settings,Stock Frozen Upto,Bestand gesperrt bis
 apps/erpnext/erpnext/controllers/recurring_document.py +166,Period From and Period To dates mandatory for recurring {0},Ab-Zeitraum und Bis-Zeitraum sind zwingend erforderlich für wiederkehrende {0}
-apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,Projekthandlung/Aufgabe
+apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,Projektaktivität/Aufgabe
 apps/erpnext/erpnext/config/hr.py +65,Generate Salary Slips,Gehaltsabrechnungen generieren
 apps/frappe/frappe/utils/__init__.py +79,{0} is not a valid email id,{0} ist keine gültige E-Mail-Kennung
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +41,"Buying must be checked, if Applicable For is selected as {0}","Einkauf muss überprüft werden, wenn ""Anwendbar auf"" auf {0} gesetzt wurde"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,Discount muss kleiner als 100 sein
 DocType: ToDo,Low,Niedrig
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Abschreibungs-Betrag (Firmenwährung)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +71,Spinning,Spinnverfahren
 DocType: Landed Cost Voucher,Landed Cost Voucher,Beleg über Einstandskosten
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +55,Please set {0},Bitte {0} setzen
 DocType: Purchase Invoice,Repeat on Day of Month,Wiederholen an Tag des Monats
@@ -3659,7 +3508,7 @@
 DocType: Purchase Invoice Advance,Journal Entry Detail No,Journalbuchungsdetail-Nr.
 DocType: Employee External Work History,Salary,Gehalt
 DocType: Serial No,Delivery Document Type,Lieferbelegtyp
-DocType: Process Payroll,Submit all salary slips for the above selected criteria,Alle Gehaltsabrechnungen für die oben gewählten Kriterien absenden
+DocType: Process Payroll,Submit all salary slips for the above selected criteria,Alle Gehaltsabrechnungen für die oben gewählten Kriterien übertragen
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +93,{0} Items synced,{0} Artikel synchronisiert
 DocType: Sales Order,Partly Delivered,Teilweise geliefert
 DocType: Sales Invoice,Existing Customer,Bestehender Kunde
@@ -3670,7 +3519,6 @@
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +37,Campaign Name is required,Kampagnenname ist erforderlich
 DocType: Maintenance Visit,Maintenance Date,Wartungsdatum
 DocType: Purchase Receipt Item,Rejected Serial No,Abgelehnte Seriennummer
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +51,Deep drawing,Tiefziehverfahren
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +40,New Newsletter,Neuer Newsletter
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +157,Start date should be less than end date for Item {0},Startdatum sollte für den Artikel {0} vor dem Enddatum liegen
 apps/erpnext/erpnext/stock/doctype/item/item.js +17,Show Balance,Saldo anzeigen
@@ -3681,7 +3529,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +119,BOM and Manufacturing Quantity are required,Stückliste und Fertigungsmenge werden benötigt
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Alter Bereich 2
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +450,Amount,Betrag
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +147,Riveting,Nieten
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,Stückliste ersetzt
 ,Sales Analytics,Vertriebsanalyse
 DocType: Manufacturing Settings,Manufacturing Settings,Fertigungseinstellungen
@@ -3693,20 +3540,19 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +207,New Account Name,Neuer Kontoname
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,Kosten gelieferter Rohmaterialien
 DocType: Selling Settings,Settings for Selling Module,Einstellungen für das Vertriebsmodul
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +73,Customer Service,Kundenservice
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Customer Service,Kundenservice
 DocType: Item,Thumbnail,Thumbnail
 DocType: Item Customer Detail,Item Customer Detail,kundenspezifisches Artikeldetail
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +147,Confirm Your Email,Email-Adresse bestätigen
-apps/erpnext/erpnext/config/hr.py +53,Offer candidate a Job.,Einem Bewerber einen Arbeitsplatz anbieten.
+apps/erpnext/erpnext/config/hr.py +53,Offer candidate a Job.,Einem Bewerber einen Arbeitsplatz anbieten
 DocType: Notification Control,Prompt for Email on Submission of,E-Mail anregen beim Versand von
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +81,Total allocated leaves are more than days in the period,Aufteilbaren Gesamt Blätter sind mehr als Tage in der Periode
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +70,Item {0} must be a stock Item,Artikel {0} muss ein Lagerartikel sein
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,Standard-Fertigungslager
-apps/erpnext/erpnext/config/accounts.py +107,Default settings for accounting transactions.,Standardeinstellungen für Buchhaltungstransaktionen.
+apps/erpnext/erpnext/config/accounts.py +107,Default settings for accounting transactions.,Standardeinstellungen für Buchhaltungstransaktionen
 apps/frappe/frappe/model/naming.py +40,{0} is required,{0} ist erforderlich
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +21,Vacuum molding,Vakuumformen
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,Voraussichtliches Datum kann nicht vor dem Datum der Materialanfrage liegen
 DocType: Contact Us Settings,City,Stadt
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +132,Ultrasonic machining,Ultraschallbearbeitung
 apps/frappe/frappe/templates/base.html +137,Error: Not a valid id?,Fehler: Keine gültige ID?
 apps/erpnext/erpnext/stock/get_item_details.py +125,Item {0} must be a Sales Item,Artikel {0} muss ein Verkaufsartikel sein
 DocType: Naming Series,Update Series Number,Seriennummer aktualisieren
@@ -3714,7 +3560,7 @@
 DocType: Sales Order,Printing Details,Druckdetails
 DocType: Task,Closing Date,Abschlussdatum
 DocType: Sales Order Item,Produced Quantity,Produzierte Menge
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +84,Engineer,Ingenieur
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Engineer,Ingenieur
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,Unterbaugruppen suchen
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +379,Item Code required at Row No {0},Artikelnummer wird in Zeile {0} benötigt
 DocType: Sales Partner,Partner Type,Partnertyp
@@ -3722,7 +3568,7 @@
 DocType: Authorization Rule,Customerwise Discount,Kundenspezifischer Rabatt
 DocType: Purchase Invoice,Against Expense Account,Zu Aufwandskonto
 DocType: Production Order,Production Order,Fertigungsauftrag
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +258,Installation Note {0} has already been submitted,Installationshinweis {0} wurde bereits versendet
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +263,Installation Note {0} has already been submitted,Installationshinweis {0} wurde bereits übertragen
 DocType: Quotation Item,Against Docname,Zu Dokumentenname
 DocType: SMS Center,All Employee (Active),Alle Mitarbeiter (Aktiv)
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,Jetzt ansehen
@@ -3731,19 +3577,19 @@
 DocType: Item,Re-Order Level,Meldebestand
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,"Geben Sie die Posten und die geplante Menge ein, für die Sie Fertigungsaufträge erstellen möchten, oder laden Sie die Rohmaterialien für die Analyse herunter."
 apps/frappe/frappe/public/js/frappe/views/ganttview.js +45,Gantt Chart,Gantt-Diagramm
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +57,Part-time,Teilzeit
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,Part-time,Teilzeit
 DocType: Employee,Applicable Holiday List,Geltende Urlaubsliste
 DocType: Employee,Cheque,Scheck
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,Serie aktualisiert
 apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Report Type is mandatory,Berichtstyp ist zwingend erforderlich
 DocType: Item,Serial Number Series,Serie der Seriennummer
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},Angabe des Lagers ist für Lagerartikel {0} in Zeile {1} zwingend erfoderlich
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +45,Retail & Wholesale,Einzel- & Großhandel
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,Einzel- & Großhandel
 DocType: Issue,First Responded On,Zuerst geantwortet auf
 DocType: Website Item Group,Cross Listing of Item in multiple groups,Kreuzweise Auflistung des Artikels in mehreren Gruppen
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +351,The First User: You,Der erste Benutzer: Sie selbst!
+apps/erpnext/erpnext/public/js/setup_wizard.js +101,The First User: You,Der erste Benutzer: Sie selbst!
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +48,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},Start- und Enddatum des Geschäftsjahres sind für das Geschäftsjahr {0} bereits gesetzt
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +172,Successfully Reconciled,Erfolgreich abgestimmt
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +119,Successfully Reconciled,Erfolgreich abgestimmt
 DocType: Production Order,Planned End Date,Geplantes Enddatum
 apps/erpnext/erpnext/config/stock.py +43,Where items are stored.,Ort an dem Artikel gelagert werden.
 DocType: Tax Rule,Validity,Gültigkeit
@@ -3753,57 +3599,54 @@
 DocType: BOM,Materials,Materialien
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","Wenn deaktiviert, muss die Liste zu jeder Abteilung, für die sie gelten soll, hinzugefügt werden."
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +520,Posting date and posting time is mandatory,Buchungsdatum und Buchungszeit sind zwingend erfoderlich
-apps/erpnext/erpnext/config/buying.py +79,Tax template for buying transactions.,Steuer-Vorlage für Einkaufstransaktionen.
+apps/erpnext/erpnext/config/buying.py +79,Tax template for buying transactions.,Steuer-Vorlage für Einkaufstransaktionen
 ,Item Prices,Artikelpreise
 DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,"""In Worten"" wird sichtbar, sobald Sie den Lieferantenauftrag speichern."
 DocType: Period Closing Voucher,Period Closing Voucher,Periodenabschlussbeleg
-apps/erpnext/erpnext/config/stock.py +125,Price List master.,Preislisten-Stammdaten.
+apps/erpnext/erpnext/config/stock.py +125,Price List master.,Preislisten-Stammdaten
 DocType: Task,Review Date,Überprüfungsdatum
 DocType: Purchase Invoice,Advance Payments,Anzahlungen
 DocType: DocPerm,Level,Ebene
 DocType: Purchase Taxes and Charges,On Net Total,Auf Nettosumme
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +160,Target warehouse in row {0} must be same as Production Order,Eingangslager in Zeile {0} muss dem Fertigungsauftrag entsprechen
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +59,No permission to use Payment Tool,"Keine Berechtigung, das Zahlungsabgleichs-Werkzeug zu benutzen"
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +97,No permission to use Payment Tool,"Keine Berechtigung, das Zahlungsabgleichs-Werkzeug zu benutzen"
 apps/erpnext/erpnext/controllers/recurring_document.py +192,'Notification Email Addresses' not specified for recurring %s,"""Benachrichtigungs-E-Mail-Adresse"" nicht angegeben für das wiederkehrende Ereignis %s"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +86,Milling,Mahlen
 apps/erpnext/erpnext/accounts/doctype/account/account.py +99,Currency can not be changed after making entries using some other currency,"Die Währung kann nicht geändert werden, wenn Buchungen in einer anderen Währung getätigt wurden"
 DocType: Company,Round Off Account,Abschlusskonto
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +60,Nibbling,Nibbeln
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,Verwaltungskosten
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +18,Consulting,Beratung
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +18,Consulting,Beratung
 DocType: Customer Group,Parent Customer Group,Übergeordnete Kundengruppe
 apps/erpnext/erpnext/public/js/pos/pos.js +429,Change,Ändern
 DocType: Purchase Invoice,Contact Email,Kontakt-E-Mail
 DocType: Appraisal Goal,Score Earned,Erreichte Punktzahl
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +393,"e.g. ""My Company LLC""","z. B. ""Meine Firma GmbH"""
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +173,Notice Period,Mitteilungsfrist
+apps/erpnext/erpnext/public/js/setup_wizard.js +141,"e.g. ""My Company LLC""","z. B. ""Meine Firma GmbH"""
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +173,Notice Period,Mitteilungsfrist
 DocType: Bank Reconciliation Detail,Voucher ID,Beleg-ID
 apps/erpnext/erpnext/setup/doctype/territory/territory.js +14,This is a root territory and cannot be edited.,Dies ist ein Root-Gebiet und kann nicht bearbeitet werden.
 DocType: Packing Slip,Gross Weight UOM,Bruttogewicht-Maßeinheit
 DocType: Email Digest,Receivables / Payables,Forderungen/Verbindlichkeiten
 DocType: Delivery Note Item,Against Sales Invoice,Zu Ausgangsrechnung
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +63,Stamping,Stempeln
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +457,Credit Account,Guthabenkonto
 DocType: Landed Cost Item,Landed Cost Item,Einstandspreis-Artikel
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +56,Show zero values,Nullwerte anzeigen
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,Menge eines Artikels nach der Herstellung/dem Umpacken auf Basis vorgegebener Mengen von Rohmaterial
 DocType: Payment Reconciliation,Receivable / Payable Account,Forderungen-/Verbindlichkeiten-Konto
 DocType: Delivery Note Item,Against Sales Order Item,Zu Kundenauftrags-Position
-apps/erpnext/erpnext/stock/doctype/item/item.py +521,Please specify Attribute Value for attribute {0},Bitte Attributwert für Attribut {0} angeben
+apps/erpnext/erpnext/stock/doctype/item/item.py +525,Please specify Attribute Value for attribute {0},Bitte Attributwert für Attribut {0} angeben
 DocType: Item,Default Warehouse,Standardlager
 DocType: Task,Actual End Date (via Time Logs),Tatsächliches Enddatum (über Zeitprotokoll)
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +37,Budget cannot be assigned against Group Account {0},Budget kann nicht einem Gruppenkonto {0} zugeordnet werden
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +23,Please enter parent cost center,Bitte übergeordnete Kostenstelle eingeben
 DocType: Delivery Note,Print Without Amount,Drucken ohne Betrag
-apps/erpnext/erpnext/controllers/buying_controller.py +69,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,"Steuerkategorie kann nicht ""Wertberichtigung"" oder ""Wertberichtigung und Gesamtsumme"" sein, da keiner der Artikel ein Lagerartikel ist"
+apps/erpnext/erpnext/controllers/buying_controller.py +60,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,"Steuerkategorie kann nicht ""Wertberichtigung"" oder ""Wertberichtigung und Gesamtsumme"" sein, da keiner der Artikel ein Lagerartikel ist"
 DocType: User,Last Name,Familienname
 DocType: Web Page,Left,Links
 DocType: Event,All Day,Ganzer Tag
 DocType: Issue,Support Team,Support-Team
 DocType: Appraisal,Total Score (Out of 5),Gesamtwertung (max 5)
-DocType: Contact Us Settings,State,Bundesland/ Kanton
+DocType: Contact Us Settings,State,Bundesland/Kanton
 DocType: Batch,Batch,Charge
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +51,Balance,Saldo
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +28,Balance,Saldo
 DocType: Project,Total Expense Claim (via Expense Claims),Gesamtbetrag der Aufwandsabrechnung (über Aufwandsabrechnungen)
 DocType: User,Gender,Geschlecht
 DocType: Journal Entry,Debit Note,Lastschrift
@@ -3828,13 +3671,12 @@
 DocType: Tax Rule,Tax Rule,Steuer-Regel
 DocType: Selling Settings,Maintain Same Rate Throughout Sales Cycle,Gleiche Preise während des gesamten Verkaufszyklus beibehalten
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,Zeiten außerhalb der normalen Arbeitszeiten am Arbeitsplatz zulassen.
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +95,{0} {1} has already been submitted,{0} {1} wurde bereits gesendet
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +95,{0} {1} has already been submitted,{0} {1} wurde bereits übertragen
 ,Items To Be Requested,Anzufragende Artikel
 DocType: Purchase Order,Get Last Purchase Rate,Letzten Einkaufspreis aufrufen
-DocType: Time Log,Billing Rate based on Activity Type (per hour),Preis basierend auf Aktivitätsart (pro Stunde)
+DocType: Time Log,Billing Rate based on Activity Type (per hour),Rechnungsbetrag basierend auf Aktivitätsart (pro Stunde)
 DocType: Company,Company Info,Informationen über das Unternehmen
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +76,Seaming,Nähverfahren
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +197,"Company Email ID not found, hence mail not sent","ID der Firmen-E-Mail-Adresse wurde nicht gefunden, deshalb wird die E-Mail nicht gesendet"
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +206,"Company Email ID not found, hence mail not sent","ID der Firmen-E-Mail-Adresse wurde nicht gefunden, deshalb wird die E-Mail nicht gesendet"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Mittelverwendung (Aktiva)
 DocType: Production Planning Tool,Filter based on item,Filtern nach Artikeln
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +451,Debit Account,Sollkonto
@@ -3846,17 +3688,16 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +95,{0} {1} has been modified. Please refresh.,{0} {1} wurde geändert. Bitte aktualisieren.
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,"Benutzer davon abhalten, Urlaubsanträge für folgende Tage zu machen."
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +591,From Opportunity,Von Opportunity
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +46,Blanking,Stanzen
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +166,Employee Benefits,Vergünstigungen an Mitarbeiter
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,Employee Benefits,Vergünstigungen an Mitarbeiter
 DocType: Sales Invoice,Is POS,Ist POS (Point of Sales)
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +240,Packed quantity must equal quantity for Item {0} in row {1},Verpackte Menge muss gleich der Menge des Artikel {0} in Zeile {1} sein
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +245,Packed quantity must equal quantity for Item {0} in row {1},Verpackte Menge muss gleich der Menge des Artikel {0} in Zeile {1} sein
 DocType: Production Order,Manufactured Qty,Hergestellte Menge
 DocType: Purchase Receipt Item,Accepted Quantity,Angenommene Menge
 apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} existiert nicht
 apps/erpnext/erpnext/config/accounts.py +18,Bills raised to Customers.,Rechnungen an Kunden
 DocType: DocField,Default,Standard
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Projekt-ID
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +466,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Zeile Nr. {0}: Betrag kann nicht größer als der ausstehende Betrag zur Aufwandsabrechnung {1} sein. Ausstehender Betrag ist {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +468,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Zeile Nr. {0}: Betrag kann nicht größer als der ausstehende Betrag zur Aufwandsabrechnung {1} sein. Ausstehender Betrag ist {2}
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +40,{0} subscribers added,{0} Empfänger hinzugefügt
 DocType: Maintenance Schedule,Schedule,Zeitplan
 DocType: Cost Center,"Define Budget for this Cost Center. To set budget action, see ""Company List""","Budget für diese Kostenstelle definieren. Um das Budget wirksam werden zu lassen, bitte Unternehmensliste anschauen"
@@ -3867,7 +3708,7 @@
 apps/erpnext/erpnext/public/js/pos/pos.js +91,Price List not found or disabled,Preisliste nicht gefunden oder deaktiviert
 DocType: Expense Claim,Approved,Genehmigt
 DocType: Pricing Rule,Price,Preis
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +79,Employee relieved on {0} must be set as 'Left',"Freigestellter Angestellter {0} muss als ""entlassen"" gekennzeichnet werden"
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +88,Employee relieved on {0} must be set as 'Left',"Freigestellter Angestellter {0} muss als ""entlassen"" gekennzeichnet werden"
 DocType: Item,"Selecting ""Yes"" will give a unique identity to each entity of this item which can be viewed in the Serial No master.","Wenn Sie „Ja“ auswählen, wird jeder Instanz dieses Artikels eine eindeutige Identität zugeteilt, die in den Stammdaten der Seriennummern eingesehen werden kann."
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +39,Appraisal {0} created for Employee {1} in the given date range,Bewertung {0} für Mitarbeiter {1} im angegebenen Datumsbereich erstellt
 DocType: Employee,Education,Bildung
@@ -3878,7 +3719,7 @@
 apps/frappe/frappe/desk/moduleview.py +67,Standard Reports,Standardberichte
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,Journalbuchungen
 DocType: Delivery Note Item,Available Qty at From Warehouse,Verfügbare Stückzahl im Ausgangslager
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +209,Please select Employee Record first.,Bitte zuerst Mitarbeiterdatensatz auswählen.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +224,Please select Employee Record first.,Bitte zuerst Mitarbeiterdatensatz auswählen.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Row {0}: Party / Konto nicht mit übereinstimmen {1} / {2} in {3} {4}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +35,To create a Tax Account,Um ein Steuerkonto erstellen
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +233,Please enter Expense Account,Bitte das Aufwandskonto angeben
@@ -3891,46 +3732,43 @@
 DocType: Sales Order,Track this Sales Order against any Project,Diesen Kundenauftrag in jedem Projekt nachverfolgen
 DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,Aufträge (deren Lieferung aussteht) entsprechend der oben genannten Kriterien abrufen
 DocType: DocShare,Document Type,Dokumententyp
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +565,From Supplier Quotation,Von Lieferantenangebot
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +588,From Supplier Quotation,Von Lieferantenangebot
 DocType: Deduction Type,Deduction Type,Abzugsart
 DocType: Attendance,Half Day,Halbtags
 DocType: Pricing Rule,Min Qty,Mindestmenge
 DocType: Features Setup,"To track items in sales and purchase documents with batch nos. ""Preferred Industry: Chemicals""","Um Artikel in Verkaufs- und Einkaufsdokumenten mit Chargennummern zu verfolgen. ""Bevorzugte Branche: Chemische Produkte"""
 DocType: GL Entry,Transaction Date,Transaktionsdatum
 DocType: Production Plan Item,Planned Qty,Geplante Menge
-apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +91,Total Tax,Summe Steuern
+apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +93,Total Tax,Summe Steuern
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +178,For Quantity (Manufactured Qty) is mandatory,Für Menge (hergestellte Menge) ist zwingend erforderlich
 DocType: Stock Entry,Default Target Warehouse,Standard-Eingangslager
 DocType: Purchase Invoice,Net Total (Company Currency),Nettosumme (Firmenwährung)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +79,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Zeile {0}: Gruppen-Typ und Gruppe sind nur auf Forderungen-/Verbindlichkeiten-Konto anwendbar
 DocType: Notification Control,Purchase Receipt Message,Kaufbeleg-Nachricht
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +95,Total allocated leaves are more than period,Die Gesamtmenge des gewährten Urlaubes übersteigt den Zeitraum
 DocType: Production Order,Actual Start Date,Tatsächliches Startdatum 
 DocType: Sales Order,% of materials delivered against this Sales Order,% der für diesen Kundenauftrag gelieferten Materialien
 apps/erpnext/erpnext/config/stock.py +23,Record item movement.,Lagerbewegung aufzeichnen.
 DocType: Newsletter List Subscriber,Newsletter List Subscriber,Newsletter-Abonnentenliste
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +164,Morticing,Einstemmen
 DocType: Email Account,Service,Service
 DocType: Hub Settings,Hub Settings,Hub-Einstellungen
 DocType: Project,Gross Margin %,Handelsspanne %
 DocType: BOM,With Operations,Mit Arbeitsgängen
 apps/erpnext/erpnext/accounts/party.py +232,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Es wurden bereits Buchungen in der Währung {0} für Firma {1} vorgenommen. Bitte ein Forderungs- oder Verbindlichkeiten-Konto mit Währung {0} wählen.
 ,Monthly Salary Register,Übersicht monatliche Gehälter
-apps/frappe/frappe/website/template.py +140,Next,Weiter
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard_page.html +17,Next,Weiter
 DocType: Warranty Claim,If different than customer address,Wenn anders als Kundenadresse
 DocType: BOM Operation,BOM Operation,Stücklisten-Vorgang
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +118,Electropolishing,Elektropolieren
 DocType: Purchase Taxes and Charges,On Previous Row Amount,Auf vorherigen Zeilenbetrag
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +24,Please enter Payment Amount in atleast one row,Bitte in mindestens eine Zeile einen Zahlungsbetrag eingeben
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +33,Please enter Payment Amount in atleast one row,Bitte in mindestens eine Zeile einen Zahlungsbetrag eingeben
 DocType: POS Profile,POS Profile,Verkaufsstellen-Profil
 apps/erpnext/erpnext/config/accounts.py +153,"Seasonality for setting budgets, targets etc.","Saisonbedingte Besonderheiten zu Budgets, Zielen usw."
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +238,Row {0}: Payment Amount cannot be greater than Outstanding Amount,Zeile {0}: Zahlungsbetrag kann nicht größer als Ausstehender Betrag sein
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +46,Total Unpaid,Summe unbezahlt
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +21,Time Log is not billable,Zeitprotokoll ist nicht abrechenbar
 apps/erpnext/erpnext/stock/get_item_details.py +128,"Item {0} is a template, please select one of its variants","Artikel {0} ist eine Vorlage, bitte eine seiner Varianten wählen"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +528,Purchaser,Käufer
+apps/erpnext/erpnext/public/js/setup_wizard.js +272,Purchaser,Käufer
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +81,Net pay cannot be negative,Nettolohn kann nicht negativ sein
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +71,Please enter the Against Vouchers manually,Bitte die Gegenbelege manuell eingeben
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +107,Please enter the Against Vouchers manually,Bitte die Gegenbelege manuell eingeben
 DocType: SMS Settings,Static Parameters,Statische Parameter
 DocType: Purchase Order,Advance Paid,Voraus bezahlt
 DocType: Item,Item Tax,Artikelsteuer
@@ -3939,14 +3777,12 @@
 apps/erpnext/erpnext/config/crm.py +48,Send mass SMS to your contacts,Massen-SMS an Kontakte versenden
 DocType: Purchase Taxes and Charges,Consider Tax or Charge for,Steuern oder Gebühren berücksichtigen für
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,Die tatsächliche Menge ist zwingend erforderlich
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +42,Cross-rolling,Schrägwalz
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +132,Credit Card,Kreditkarte
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +132,Credit Card,Kreditkarte
 DocType: BOM,Item to be manufactured or repacked,Zu fertigender oder umzupackender Artikel
-apps/erpnext/erpnext/config/stock.py +95,Default settings for stock transactions.,Standardeinstellungen für Lagertransaktionen.
+apps/erpnext/erpnext/config/stock.py +95,Default settings for stock transactions.,Standardeinstellungen für Lagertransaktionen
 DocType: Purchase Invoice,Next Date,Nächster Termin
 DocType: Employee Education,Major/Optional Subjects,Wichtiger/wahlweiser Betreff
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +49,Please enter Taxes and Charges,Bitte Steuern und Gebühren eingeben
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +85,Machining,Maschinelle Bearbeitung
 DocType: Sales Invoice Item,Drop Ship,Direktlieferung
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","Hier können Sie Familiendetails wie Namen und Beruf der Eltern, Ehepartner und Kinder pflegen"
 DocType: Hub Settings,Seller Name,Name des Verkäufers
@@ -3956,10 +3792,10 @@
 DocType: Stock Entry,Repack,Umpacken
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +6,You must Save the form before proceeding,Sie müssen das Formular speichern um fortzufahren 
 DocType: Item Attribute,Numeric Values,Numerische Werte
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +500,Attach Logo,Logo anhängen 
+apps/erpnext/erpnext/public/js/setup_wizard.js +246,Attach Logo,Logo anhängen 
 DocType: Customer,Commission Rate,Provisionssatz
 apps/erpnext/erpnext/stock/doctype/item/item.js +38,Make Variant,Variante erstellen
-apps/erpnext/erpnext/config/hr.py +145,Block leave applications by department.,Urlaubsanträge pro Abteilung sperren.
+apps/erpnext/erpnext/config/hr.py +145,Block leave applications by department.,Urlaubsanträge pro Abteilung sperren
 apps/erpnext/erpnext/templates/pages/cart.html +42,Cart is Empty,Der Warenkorb ist leer
 DocType: Production Order,Actual Operating Cost,Tatsächliche Betriebskosten
 apps/erpnext/erpnext/accounts/doctype/account/account.py +73,Root cannot be edited.,Root kann nicht bearbeitet werden.
@@ -3971,19 +3807,19 @@
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +105,Please select a csv file,Bitte eine CSV-Datei auswählen.
 DocType: Dropbox Backup,Send Backups to Dropbox,Datensicherungen zur Dropbox senden
 DocType: Purchase Order,To Receive and Bill,Um zu empfangen und abzurechnen
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +94,Designer,Konstrukteur
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Designer,Konstrukteur
 apps/erpnext/erpnext/config/selling.py +121,Terms and Conditions Template,Vorlage für Allgemeine Geschäftsbedingungen
 DocType: Serial No,Delivery Details,Lieferdetails
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +383,Cost Center is required in row {0} in Taxes table for type {1},Kostenstelle wird in Zeile {0} der Steuertabelle für Typ {1} gebraucht
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +386,Cost Center is required in row {0} in Taxes table for type {1},Kostenstelle wird in Zeile {0} der Steuertabelle für Typ {1} gebraucht
 DocType: Item,Automatically create Material Request if quantity falls below this level,"Automatisch Materialfrage erstellen, wenn die Menge unter diesen Wert fällt"
 ,Item-wise Purchase Register,Artikelbezogene Übersicht der Einkäufe
 DocType: Batch,Expiry Date,Verfalldatum
-apps/erpnext/erpnext/stock/doctype/item/item.py +375,"To set reorder level, item must be a Purchase Item or Manufacturing Item","Um den Meldebestand festzulegen, muss der Artikel ein Einkaufsartikel oder ein Fertigungsartiel sein"
+apps/erpnext/erpnext/stock/doctype/item/item.py +379,"To set reorder level, item must be a Purchase Item or Manufacturing Item","Um den Meldebestand festzulegen, muss der Artikel ein Einkaufsartikel oder ein Fertigungsartiel sein"
 ,Supplier Addresses and Contacts,Lieferanten-Adressen und Kontaktdaten
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,Bitte zuerst Kategorie auswählen
 apps/erpnext/erpnext/config/projects.py +18,Project master.,Projekt-Stammdaten
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,Kein Symbol wie $ usw. neben Währungen anzeigen.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +330, (Half Day),(Halbtags)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +374, (Half Day),(Halbtags)
 DocType: Supplier,Credit Days,Zahlungsziel
 DocType: Leave Type,Is Carry Forward,Ist Übertrag
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +478,Get Items from BOM,Artikel aus der Stückliste holen
@@ -3991,12 +3827,11 @@
 apps/erpnext/erpnext/config/manufacturing.py +120,Bill of Materials,Stückliste
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +77,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Zeile {0}: Gruppen-Typ und Gruppe sind für Forderungen-/Verbindlichkeiten-Konto {1} zwingend erforderlich
 DocType: Dropbox Backup,Send Notifications To,Benachrichtigungen senden an
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html +26,Ref Date,Ref-Datum
-DocType: Employee,Reason for Leaving,Grund für das Verlassen
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +54,Ref Date,Ref-Datum
+DocType: Employee,Reason for Leaving,Grund für den Austritt
 DocType: Expense Claim Detail,Sanctioned Amount,Genehmigter Betrag
 DocType: GL Entry,Is Opening,Ist Eröffnung
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +164,Row {0}: Debit entry can not be linked with a {1},Zeile {0}: Sollbuchung kann nicht mit ein(em) {1} verknüpft werden
 apps/erpnext/erpnext/accounts/doctype/account/account.py +188,Account {0} does not exist,Konto {0} existiert nicht 
 DocType: Account,Cash,Bargeld
 DocType: Employee,Short biography for website and other publications.,Kurzbiographie für die Webseite und andere Publikationen.
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +31,Please create Salary Structure for employee {0},Bitte Gehaltsstruktur für Mitarbeiter {0} erstellen
diff --git a/erpnext/translations/el.csv b/erpnext/translations/el.csv
index b5bdf4b..06f88b7 100644
--- a/erpnext/translations/el.csv
+++ b/erpnext/translations/el.csv
@@ -1,13 +1,12 @@
 DocType: Employee,Salary Mode,Λειτουργία Μισθός
 DocType: Cost Center,"Select Monthly Distribution, if you want to track based on seasonality.","Επιλέξτε μηνιαίας κατανομή, αν θέλετε να παρακολουθείτε με βάση την εποχικότητα."
 DocType: Employee,Divorced,Διαζευγμένος
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +86,Warning: Same item has been entered multiple times.,Προσοχή: Το ίδιο το στοιχείο έχει εισαχθεί πολλές φορές.
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +80,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,Επιτρέψτε στοιχείου να προστεθούν πολλές φορές σε μια συναλλαγή
 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/page/setup_wizard/fixtures/industry_type.py +19,Consumer Products,Καταναλωτικά προϊόντα
+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,Επιλέξτε Τύπος Πάρτυ πρώτη
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +90,Annealing,Ανόπτηση
 DocType: Item,Customer Items,Είδη πελάτη
 apps/erpnext/erpnext/accounts/doctype/account/account.py +45,Account {0}: Parent account {1} can not be a ledger,Ο λογαριασμός {0}: γονικός λογαριασμός {1} δεν μπορεί να είναι καθολικός
 DocType: Item,Publish Item to hub.erpnext.com,Δημοσίευση είδους στο hub.erpnext.com
@@ -20,15 +19,14 @@
 DocType: About Us Settings,Website,Δικτυακός τόπος
 DocType: POS Profile,Applicable for User,Ισχύει για χρήστη
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +169,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Σταμάτησε Παραγγελία παραγωγή δεν μπορεί να ακυρωθεί, θα ξεβουλώνω πρώτα να ακυρώσετε"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +23,Compaction plus sintering,Συμπίεση συν συσσωμάτωσης
 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.,* Θα υπολογίζεται στη συναλλαγή.
 DocType: Purchase Order,Customer Contact,Επικοινωνία Πελατών
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +549,From Material Request,Από αίτηση υλικού
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +572,From Material Request,Από αίτηση υλικού
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} Δέντρο
 DocType: Job Applicant,Job Applicant,Αιτών εργασία
 apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,Δεν υπάρχουν άλλα αποτελέσματα.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +78,Legal,Νομικός
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +34,Legal,Νομικός
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +114,Actual type tax cannot be included in Item rate in row {0},Πραγματική φορολογική του τύπου δεν μπορεί να περιλαμβάνεται στην τιμή Θέση στη γραμμή {0}
 DocType: C-Form,Customer,Πελάτης
 DocType: Purchase Receipt Item,Required By,Απαιτείται από
@@ -43,7 +41,6 @@
 DocType: Manufacturing Settings,Default 10 mins,Προεπιλογή 10 λεπτά
 DocType: Leave Type,Leave Type Name,Όνομα τύπου άδειας 
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +148,Series Updated Successfully,Η σειρά ενημερώθηκε με επιτυχία
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +150,Stitching,Ράψιμο
 DocType: Pricing Rule,Apply On,Εφάρμοσε σε
 DocType: Item Price,Multiple Item prices.,Πολλαπλές τιμές είδους.
 ,Purchase Order Items To Be Received,Είδη παραγγελίας αγοράς για παραλαβή
@@ -51,8 +48,8 @@
 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 +104,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 +189,New Leave Application,Νέα αίτηση άδειας
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +134,Bank Draft,Τραπεζική επιταγή
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +204,New Leave Application,Νέα αίτηση άδειας
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +134,Bank Draft,Τραπεζική επιταγή
 DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,"1. Για να διατηρήσετε τον πελατοκεντρικό κωδικό είδους και να καταστούν προσβάσιμα με βάση τον κωδικό τους, χρησιμοποιήστε αυτή την επιλογή"
 DocType: Mode of Payment Account,Mode of Payment Account,Λογαριασμός τρόπου πληρωμής
 apps/erpnext/erpnext/stock/doctype/item/item.js +34,Show Variants,Προβολή παραλλαγών
@@ -64,25 +61,23 @@
 DocType: Production Plan Item,Production Plan Item,Είδος σχεδίου παραγωγής
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +141,User {0} is already assigned to Employee {1},Ο χρήστης {0} έχει ήδη ανατεθεί στον εργαζομένο {1}
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +13,Make new POS Profile,Κάνε νέα POS Προφίλ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +31,Health Care,Υγειονομική περίθαλψη
+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 +494,Invoice,Τιμολόγιο
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +519,Invoice,Τιμολόγιο
 DocType: Maintenance Schedule Item,Periodicity,Περιοδικότητα
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +357,Email Address,Διεύθυνση ηλεκτρονικού ταχυδρομείου
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +21,Defense,Άμυνα
+apps/erpnext/erpnext/public/js/setup_wizard.js +107,Email Address,Διεύθυνση ηλεκτρονικού ταχυδρομείου
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,Άμυνα
 DocType: Company,Abbr,Συντ.
 DocType: Appraisal Goal,Score (0-5),Αποτέλεσμα (0-5)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +193,Row {0}: {1} {2} does not match with {3},Γραμμή {0}: {1} {2} δεν ταιριάζει με το {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +67,Row # {0}:,Γραμμή # {0}:
 DocType: Delivery Note,Vehicle No,Αρ. οχήματος
 apps/erpnext/erpnext/public/js/pos/pos.js +528,Please select Price List,Παρακαλώ επιλέξτε τιμοκατάλογο
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +162,Woodworking,Ξυλουργική
 DocType: Production Order Operation,Work In Progress,Εργασία σε εξέλιξη
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +153,3D printing,3D εκτύπωση
 DocType: Employee,Holiday List,Λίστα αργιών
 DocType: Time Log,Time Log,Αρχείο καταγραφής χρονολογίου
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +530,Accountant,Λογιστής
+apps/erpnext/erpnext/public/js/setup_wizard.js +274,Accountant,Λογιστής
 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.",Αρχείο καταγραφής των δραστηριοτήτων που εκτελούνται από τους χρήστες που μπορούν να χρησιμοποιηθούν για την παρακολούθηση χρόνου και την τιμολόγηση
@@ -98,18 +93,19 @@
 DocType: Bin,Quantity Requested for Purchase,Αιτούμενη ποσότητα για αγορά
 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,Όνομα αρχείου γονικής λεπτομέρεια 
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Kg,Kg
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Kg,Kg
 apps/erpnext/erpnext/config/hr.py +48,Opening for a Job.,Άνοιγμα θέσης εργασίας.
 DocType: Item Attribute,Increment,Προσαύξηση
 apps/erpnext/erpnext/public/js/stock_analytics.js +63,Select Warehouse...,Επιλέξτε Αποθήκη ...
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +6,Advertising,Διαφήμιση
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,Διαφήμιση
+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/doctype/sales_invoice/sales_invoice.py +389,Stock cannot be updated against Delivery Note {0},Το απόθεμα δεν μπορεί να ανανεωθεί σύμφωνα με το δελτίο αποστολής {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +391,Stock cannot be updated against Delivery Note {0},Το απόθεμα δεν μπορεί να ανανεωθεί σύμφωνα με το δελτίο αποστολής {0}
 DocType: Payment Reconciliation,Reconcile,Συμφωνήστε
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +30,Grocery,Παντοπωλείο
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,Παντοπωλείο
 DocType: Quality Inspection Reading,Reading 1,Μέτρηση 1
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Make Bank Entry,Δημιούργησε εγγυητική τραπέζης
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +40,Pension Funds,Ιδιωτικά ταμεία συντάξεων
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,Ιδιωτικά ταμεία συντάξεων
 apps/erpnext/erpnext/accounts/doctype/account/account.py +142,Warehouse is mandatory if account type is Warehouse,Η αποθήκη είναι απαραίτητη αν ο τύπος του λογαριασμού είναι 'Αποθήκη'
 DocType: SMS Center,All Sales Person,Όλοι οι πωλητές
 DocType: Lead,Person Name,Όνομα Πρόσωπο
@@ -131,7 +127,7 @@
 DocType: Quality Inspection,Get Specification Details,Βρες λεπτομέρειες προδιαγραφών
 DocType: Lead,Interested,Ενδιαφερόμενος
 apps/erpnext/erpnext/config/manufacturing.py +14,Bill of Material,Λίστα υλικών
-apps/erpnext/erpnext/public/js/stock_analytics.js +45,Opening,Άνοιγμα
+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,Αντιγραφή από ομάδα ειδών
 DocType: Journal Entry,Opening Entry,Αρχική καταχώρηση
@@ -145,23 +141,22 @@
 DocType: Employee Education,Under Graduate,Τελειόφοιτος
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +22,Target On,Στόχος στις
 DocType: BOM,Total Cost,Συνολικό κόστος
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +99,Reaming,Εκγλυφάνσεως
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +9,Activity Log:,Αρχείο καταγραφής δραστηριότητας:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +199,Item {0} does not exist in the system or has expired,Το είδος {0} δεν υπάρχει στο σύστημα ή έχει λήξει
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +44,Real Estate,Ακίνητα
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +44,Real Estate,Ακίνητα
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +4,Statement of Account,Κατάσταση λογαριασμού
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +41,Pharmaceuticals,Φαρμακευτική
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,Φαρμακευτική
 DocType: Expense Claim Detail,Claim Amount,Ποσό απαίτησης
 DocType: Employee,Mr,Κ
 DocType: Custom Script,Client,Πελάτης
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,Τύπος προμηθευτή / προμηθευτής
 DocType: Naming Series,Prefix,Πρόθεμα
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Consumable,Αναλώσιμα
+apps/erpnext/erpnext/public/js/setup_wizard.js +359,Consumable,Αναλώσιμα
 DocType: Upload Attendance,Import Log,Αρχείο καταγραφής εισαγωγής
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.js +19,Send,Αποστολή
 DocType: Sales Invoice Item,Delivered By Supplier,Παραδίδονται από τον προμηθευτή
 DocType: SMS Center,All Contact,Όλες οι επαφές
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +164,Annual Salary,Ετήσιος Μισθός
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +164,Annual Salary,Ετήσιος Μισθός
 DocType: Period Closing Voucher,Closing Fiscal Year,Κλείσιμο χρήσης
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +69,Stock Expenses,Έξοδα αποθέματος
 DocType: Newsletter,Email Sent?,Εστάλη μήνυμα email;
@@ -169,26 +164,24 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +92,Show Time Logs,Εμφάνιση χρόνος Καταγράφει
 DocType: Journal Entry Account,Credit in Company Currency,Πιστωτικές στην Εταιρεία Νόμισμα
 DocType: Delivery Note,Installation Status,Κατάσταση εγκατάστασης
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +115,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Η αποδεκτή + η απορριπτέα ποσότητα πρέπει να είναι ίση με την ληφθείσα ποσότητα για το είδος {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +118,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 +133,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 +493,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Για να περιληφθούν οι φόροι στη γραμμή {0} της τιμής είδους, οι φόροι στις γραμμές {1} πρέπει επίσης να συμπεριληφθούν"
+apps/erpnext/erpnext/controllers/accounts_controller.py +494,"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 +90,Settings for HR Module,Ρυθμίσεις για τη λειτουργική μονάδα HR
 DocType: SMS Center,SMS Center,Κέντρο SMS 
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +78,Straightening,Ίσιωμα
 DocType: BOM Replace Tool,New BOM,Νέα Λ.Υ.
 apps/erpnext/erpnext/config/projects.py +28,Batch Time Logs for billing.,Ημερολόγια Παρτίδας για την τιμολόγηση.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +15,Countergravity casting,Countergravity χύτευσης
 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/setup/page/setup_wizard/fixtures/industry_type.py +14,Broadcasting,Εκπομπή
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +140,Execution,Εκτέλεση
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +364,The first user will become the System Manager (you can change this later).,Ο πρώτος χρήστης θα γίνει ο διαχειριστής του συστήματος ( μπορείτε να το αλλάξετε αυτό αργότερα ).
+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/public/js/setup_wizard.js +114,The first user will become the System Manager (you can change this later).,Ο πρώτος χρήστης θα γίνει ο διαχειριστής του συστήματος ( μπορείτε να το αλλάξετε αυτό αργότερα ).
 apps/erpnext/erpnext/config/manufacturing.py +39,Details of the operations carried out.,Λεπτομέρειες σχετικά με τις λειτουργίες που πραγματοποιούνται.
 DocType: Serial No,Maintenance Status,Κατάσταση συντήρησης
 apps/erpnext/erpnext/config/stock.py +263,Items and Pricing,Προϊόντα και Τιμολόγηση
@@ -205,7 +198,6 @@
 DocType: Pricing Rule,Discount on Price List Rate (%),Έκπτωση στις Τιμοκατάλογος Ποσοστό (%)
 apps/frappe/frappe/public/js/frappe/form/print.js +96,Start,Αρχή
 DocType: User,First Name,Όνομα
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +12,Full-mold casting,Πλήρη φόρμα χύτευση
 DocType: Offer Letter,Select Terms and Conditions,Επιλέξτε Όροι και Προϋποθέσεις
 DocType: Production Planning Tool,Sales Orders,Παραγγελίες πωλήσεων
 DocType: Purchase Taxes and Charges,Valuation,Αποτίμηση
@@ -217,8 +209,7 @@
 DocType: Bank Reconciliation,Bank Account,Τραπεζικός λογαριασμό
 DocType: Leave Type,Allow Negative Balance,Επίτρεψε αρνητικό ισοζύγιο
 DocType: Selling Settings,Default Territory,Προεπιλεγμένη περιοχή
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +53,Television,Τηλεόραση
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +138,Gashing,Εκβιάζουμε
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,Τηλεόραση
 DocType: Production Order Operation,Updated via 'Time Log',Ενημέρωση μέσω 'αρχείου καταγραφής χρονολογίου'
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +82,Account {0} does not belong to Company {1},Ο λογαριασμός {0} δεν ανήκει στη εταιρεία {1}
 DocType: Naming Series,Series List for this Transaction,Λίστα σειράς για αυτή τη συναλλαγή
@@ -233,14 +224,13 @@
 DocType: Leave Allocation,Add unused leaves from previous allocations,Προσθήκη αχρησιμοποίητα φύλλα από προηγούμενες κατανομές
 apps/erpnext/erpnext/controllers/recurring_document.py +206,Next Recurring {0} will be created on {1},Το επόμενο επαναλαμβανόμενο {0} θα δημιουργηθεί στις {1}
 DocType: Newsletter List,Total Subscribers,Σύνολο Συνδρομητές
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +575,Contact Name,Όνομα επαφής
+,Contact Name,Όνομα επαφής
 DocType: Production Plan Item,SO Pending Qty,Εκκρεμής ποσότητα παρ. πώλησης
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Δημιουργεί βεβαίωση αποδοχών για τα προαναφερόμενα κριτήρια.
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,Αίτηση αγοράς.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +107,Double housing,Διπλό περίβλημα
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +156,Only the selected Leave Approver can submit this Leave Application,Μόνο ο επιλεγμένος υπεύθυνος έγκρισης άδειας μπορεί να υποβάλλει αυτήν την αίτηση άδειας
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +171,Only the selected Leave Approver can submit this Leave Application,Μόνο ο επιλεγμένος υπεύθυνος έγκρισης άδειας μπορεί να υποβάλλει αυτήν την αίτηση άδειας
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,Η ημερομηνία απαλλαγής πρέπει να είναι μεταγενέστερη από την ημερομηνία ένταξης
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +172,Leaves per Year,Αφήνει ανά έτος
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +172,Leaves per Year,Αφήνει ανά έτος
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup > Settings > Naming Series,Παρακαλώ ορίστε Ονομασία σειράς για {0} μέσω Ρύθμιση&gt; Ρυθμίσεις&gt; Ονομασία σειράς
 DocType: Time Log,Will be updated when batched.,Θα ενημερωθεί με την παρτίδα.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +104,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,Γραμμή {0}: παρακαλώ επιλέξτε το «είναι προκαταβολή» έναντι του λογαριασμού {1} αν αυτό είναι μια καταχώρηση προκαταβολής.
@@ -249,25 +239,24 @@
 DocType: Item Website Specification,Item Website Specification,Προδιαγραφή ιστότοπου για το είδος
 DocType: Dropbox Backup,Dropbox Access Key,Dropbox access key
 DocType: Payment Tool,Reference No,Αριθμός αναφοράς
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +348,Leave Blocked,Η άδεια εμποδίστηκε
-apps/erpnext/erpnext/stock/doctype/item/item.py +535,Item {0} has reached its end of life on {1},Το είδος {0} έχει φτάσει στο τέλος της διάρκειας ζωής του στο {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +392,Leave Blocked,Η άδεια εμποδίστηκε
+apps/erpnext/erpnext/stock/doctype/item/item.py +539,Item {0} has reached its end of life on {1},Το είδος {0} έχει φτάσει στο τέλος της διάρκειας ζωής του στο {1}
 apps/erpnext/erpnext/accounts/utils.py +339,Annual,Ετήσιος
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Είδος συμφωνίας αποθέματος
 DocType: Stock Entry,Sales Invoice No,Αρ. Τιμολογίου πώλησης
 DocType: Material Request Item,Min Order Qty,Ελάχιστη ποσότητα παραγγελίας
 DocType: Lead,Do Not Contact,Μην επικοινωνείτε
 DocType: Sales Invoice,The unique id for tracking all recurring invoices. It is generated on submit.,Το μοναδικό αναγνωριστικό για την παρακολούθηση όλων των επαναλαμβανόμενων τιμολογίων. Παράγεται με την υποβολή.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +93,Software Developer,Προγραμματιστής
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +93,Software Developer,Προγραμματιστής
 DocType: Item,Minimum Order Qty,Ελάχιστη ποσότητα παραγγελίας
 DocType: Pricing Rule,Supplier Type,Τύπος προμηθευτή
 DocType: Item,Publish in Hub,Δημοσίευση στο hub
 ,Terretory,Περιοχή
-apps/erpnext/erpnext/stock/doctype/item/item.py +555,Item {0} is cancelled,Το είδος {0} είναι ακυρωμένο
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +598,Material Request,Αίτηση υλικού
+apps/erpnext/erpnext/stock/doctype/item/item.py +559,Item {0} is cancelled,Το είδος {0} είναι ακυρωμένο
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +607,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}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +129,Wire brushing,Συρματόβουρτσας
 DocType: Employee,Relation,Σχέση
 DocType: Shipping Rule,Worldwide Shipping,Παγκόσμια ναυτιλία
 apps/erpnext/erpnext/config/selling.py +23,Confirmed orders from Customers.,Επιβεβαιωμένες παραγγελίες από πελάτες.
@@ -283,12 +272,11 @@
 DocType: Supplier,Address HTML,Διεύθυνση ΗΤΜΛ
 DocType: Lead,Mobile No.,Αρ. Κινητού
 DocType: Maintenance Schedule,Generate Schedule,Δημιούργησε πρόγραμμα
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +81,Hubbing,Εμβύθιση
 DocType: Purchase Invoice Item,Expense Head,Κύρια εγγραφή δαπανών
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +86,Please select Charge Type first,Παρακαλώ επιλέξτε πρώτα τύπο επιβάρυνσης
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,Το πιο πρόσφατο
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +395,Max 5 characters,Μέγιστο 5 χαρακτήρες
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +195,Select Your Language,Επιλέξτε τη γλώσσα σας
+apps/erpnext/erpnext/public/js/setup_wizard.js +143,Max 5 characters,Μέγιστο 5 χαρακτήρες
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +245,Select Your Language,Επιλέξτε τη γλώσσα σας
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,Ο πρώτος υπεύθυνος αδειών στον κατάλογο θα οριστεί ως ο προεπιλεγμένος υπεύθυνος αδειών
 DocType: Manufacturing Settings,"Disables creation of time logs against Production Orders.
 Operations shall not be tracked against Production Order",Απενεργοποιεί τη δημιουργία του χρόνου κορμών κατά Εντολές Παραγωγής. Οι πράξεις δεν θα πρέπει να παρακολουθούνται κατά την παραγωγή διαταγής
@@ -300,8 +288,6 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +34,Item {0} must be Service Item,Το είδος {0} πρέπει να είναι υπηρεσία
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +303,Completed Qty can not be greater than 'Qty to Manufacture',Η ολοκληρωμένη ποσότητα δεν μπορεί να είναι μεγαλύτερη από την «ποσότητα για κατασκευή»
 DocType: DocType,Administrator,Διαχειριστής
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +136,Laser drilling,Διάτρηση με λέιζερ
-DocType: Stock UOM Replace Utility,New Stock UOM,Νέα Μ.Μ.Αποθέματος
 DocType: Period Closing Voucher,Closing Account Head,Κλείσιμο κύριας εγγραφής λογαριασμού
 DocType: Employee,External Work History,Ιστορικό εξωτερικής εργασίας
 apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,Κυκλικού λάθους Αναφορά
@@ -310,18 +296,15 @@
 DocType: Lead,Industry,Βιομηχανία
 DocType: Employee,Job Profile,Προφίλ εργασίας
 DocType: Newsletter,Newsletter,Ενημερωτικό δελτίο
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +84,Hydroforming,Υδρομορφοποίηση
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +49,Necking,Necking
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Ειδοποίηση μέσω email σχετικά με την αυτόματη δημιουργία αιτήσης υλικού
 DocType: Journal Entry,Multi Currency,Πολλαπλό Νόμισμα
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +51,Item is updated,Το είδος ενημερώθηκε.
 DocType: Async Task,System Manager,Διαχειριστής συστήματος
 DocType: Payment Reconciliation Invoice,Invoice Type,Τύπος τιμολογίου
 DocType: Sales Invoice Item,Delivery Note,Δελτίο αποστολής
 DocType: Dropbox Backup,Allow Dropbox Access,Επίτρεψε πρόσβαση στο dropbox
 apps/erpnext/erpnext/config/learn.py +72,Setting up Taxes,Ρύθμιση Φόροι
 apps/erpnext/erpnext/accounts/utils.py +189,Payment Entry has been modified after you pulled it. Please pull it again.,Η καταχώηρση πληρωμής έχει τροποποιηθεί μετά την λήψη της. Παρακαλώ επαναλάβετε τη λήψη.
-apps/erpnext/erpnext/stock/doctype/item/item.py +343,{0} entered twice in Item Tax,Το {0} εισήχθηκε δύο φορές στο φόρο είδους
+apps/erpnext/erpnext/stock/doctype/item/item.py +347,{0} entered twice in Item Tax,Το {0} εισήχθηκε δύο φορές στο φόρο είδους
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +105,Summary for this week and pending activities,Περίληψη για αυτή την εβδομάδα και εν αναμονή δραστηριότητες
 DocType: Workstation,Rent Cost,Κόστος ενοικίασης
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +74,Please select month and year,Παρακαλώ επιλέξτε μήνα και έτος
@@ -338,23 +321,21 @@
 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/buying/doctype/purchase_order/purchase_order.js +517,Select Item,Επιλέξτε Προϊόν
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +540,Select Item,Επιλέξτε Προϊόν
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +143,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","Το είδος: {0} όσον αφορά παρτίδες, δεν μπορεί να συμφωνηθεί με τη χρήση \ συμφωνιών αποθέματος, χρησιμοποιήστε καταχωρήσεις αποθέματος"""
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +259,Purchase Invoice {0} is already submitted,Το τιμολογίου αγοράς {0} έχει ήδη υποβληθεί
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +262,Purchase Invoice {0} is already submitted,Το τιμολογίου αγοράς {0} έχει ήδη υποβληθεί
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Batch No must be same as {1} {2},Σειρά # {0}: Παρτίδα Δεν πρέπει να είναι ίδιο με το {1} {2}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Convert to non-Group,Μετατροπή σε μη-Group
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +55,Purchase Receipt must be submitted,Το αποδεικτικό παραλαβής αγοράς πρέπει να υποβληθεί
-DocType: Stock UOM Replace Utility,Current Stock UOM,Τρέχουσα Μ.Μ. Αποθέματος
 apps/erpnext/erpnext/config/stock.py +53,Batch (lot) of an Item.,Παρτίδας (lot) ενός είδους.
 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}
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Your email address,Η διεύθυνση email σας
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +194,Please see attachment,Παρακαλώ δείτε συνημμένο
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +203,Please see attachment,Παρακαλώ δείτε συνημμένο
 DocType: Purchase Order,% Received,% Παραλήφθηκε
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +109,Water jet cutting,Υδροκοπη
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +24,Setup Already Complete!!,Η εγκατάσταση έχει ήδη ολοκληρωθεί!
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +20,Setup Already Complete!!,Η εγκατάσταση έχει ήδη ολοκληρωθεί!
 ,Finished Goods,Έτοιμα προϊόντα
 DocType: Delivery Note,Instructions,Οδηγίες
 DocType: Quality Inspection,Inspected By,Επιθεωρήθηκε από
@@ -369,6 +350,7 @@
 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,Ανταλλαγή συναλλάγματος
 DocType: Purchase Invoice Item,Item Name,Όνομα είδους
+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",Είδη που θα ζητηθούν τα οποία είναι εκτός αποθέματος εξετάζοντας όλες τις αποθήκες με βάση την προβλεπόμενη ποσότητα και την ελάχιστη ποσότητα παραγγελιών
@@ -378,11 +360,10 @@
 ,Purchase Register,Ταμείο αγορών
 DocType: Landed Cost Item,Applicable Charges,Ισχύουσες χρεώσεις
 DocType: Workstation,Consumable Cost,Κόστος αναλώσιμων
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,{0} ({1}) must have role 'Leave Approver',{0} ({1}) Πρέπει να έχει ρόλο «υπεύθυνος έγκρισης αδειών»
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +167,{0} ({1}) must have role 'Leave Approver',{0} ({1}) Πρέπει να έχει ρόλο «υπεύθυνος έγκρισης αδειών»
 DocType: Purchase Receipt,Vehicle Date,Όχημα Ημερομηνία
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +39,Medical,Ιατρικός
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +39,Medical,Ιατρικός
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,Αιτιολογία απώλειας
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +36,Tube beading,Tube beading
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},Ο σταθμός εργασίας είναι κλειστός κατά τις ακόλουθες ημερομηνίες σύμφωνα με τη λίστα αργιών: {0}
 DocType: Employee,Single,Μονό
 DocType: Issue,Attachment,Κατάσχεση
@@ -403,10 +384,8 @@
 DocType: Account,Is Group,Είναι η ομάδα
 DocType: Stock Settings,Automatically Set Serial Nos based on FIFO,Αυτόματη Ρύθμιση αύξοντες αριθμούς με βάση FIFO
 DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,Ελέγξτε Προμηθευτής Αριθμός Τιμολογίου Μοναδικότητα
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +31,Thermoforming,Θερμοδιαμορφωτικές
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +66,Slitting,Κοπής
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +57,'To Case No.' cannot be less than 'From Case No.',Το πεδίο έως αριθμό υπόθεσης δεν μπορεί να είναι μικρότερο του πεδίου από αριθμό υπόθεσης
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +104,Non Profit,Μη κερδοσκοπικός
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +104,Non Profit,Μη κερδοσκοπικός
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_list.js +7,Not Started,Δεν έχει ξεκινήσει
 DocType: Lead,Channel Partner,Συνεργάτης καναλιού
 DocType: Account,Old Parent,Παλαιός γονέας
@@ -415,13 +394,12 @@
 apps/erpnext/erpnext/config/manufacturing.py +74,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 +512,Attribute {0} selected multiple times in Attributes Table,Χαρακτηριστικό {0} πολλές φορές σε πίνακα Χαρακτηριστικά
+apps/erpnext/erpnext/stock/doctype/item/item.py +516,Attribute {0} selected multiple times in Attributes Table,Χαρακτηριστικό {0} πολλές φορές σε πίνακα Χαρακτηριστικά
 DocType: Sales Order,Not Applicable,Μη εφαρμόσιμο
 apps/erpnext/erpnext/config/hr.py +140,Holiday master.,Κύρια εγγραφή αργιών.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +19,Shell molding,Χύτευση κέλυφος
 DocType: Material Request Item,Required Date,Απαιτούμενη ημερομηνία
 DocType: Delivery Note,Billing Address,Διεύθυνση χρέωσης
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +644,Please enter Item Code.,Παρακαλώ εισάγετε κωδικό είδους.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +648,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,Συνολική ποσότητα
@@ -431,7 +409,7 @@
 DocType: Item Attribute,To Range,Να Σειρά
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Κινητές αξίες και καταθέσεις
 DocType: Features Setup,Imports,Εισαγωγές
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +144,Adhesive bonding,Συγκολλήσεις
+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.,Καταχωρήσεις προσέλευσης.
@@ -439,26 +417,25 @@
 DocType: Sales Order Item,Used for Production Plan,Χρησιμοποιείται για το σχέδιο παραγωγής
 DocType: System Settings,Loading...,Φόρτωση...
 DocType: DocField,Password,Κωδικός
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +155,Fused deposition modeling,Συντηγμένο μοντελοποίηση εναπόθεσης
 DocType: Manufacturing Settings,Time Between Operations (in mins),Χρόνου μεταξύ των λειτουργιών (σε λεπτά)
 DocType: Customer,Buyer of Goods and Services.,Αγοραστής αγαθών και υπηρεσιών.
 DocType: Journal Entry,Accounts Payable,Πληρωτέοι λογαριασμοί 
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +24,Add Subscribers,Προσθήκη Συνδρομητές
 apps/erpnext/erpnext/public/js/feature_setup.js +220,""" does not exists",""" Δεν υπάρχει"
 DocType: Pricing Rule,Valid Upto,Ισχύει μέχρι
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +564,List a few of your customers. They could be organizations or individuals.,Απαριθμήστε μερικούς από τους πελάτες σας. Θα μπορούσαν να είναι φορείς ή ιδιώτες.
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,List a few of your customers. They could be organizations or individuals.,Απαριθμήστε μερικούς από τους πελάτες σας. Θα μπορούσαν να είναι φορείς ή ιδιώτες.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Direct Income,Άμεσα έσοδα
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +33,"Can not filter based on Account, if grouped by Account","Δεν μπορείτε να φιλτράρετε με βάση λογαριασμό, εάν είναι ομαδοποιημένες ανά λογαριασμό"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +88,Administrative Officer,Διοικητικός λειτουργός
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Administrative Officer,Διοικητικός λειτουργός
 DocType: Payment Tool,Received Or Paid,Παραληφθέντα ή πληρωθέντα
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +318,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 +305,Please enter Warehouse for which Material Request will be raised,Παρακαλώ εισάγετε αποθήκη για την οποία θα δημιουργηθεί η αίτηση υλικού
 DocType: Production Order,Additional Operating Cost,Πρόσθετο λειτουργικό κόστος
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +20,Cosmetics,Καλλυντικά
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,Καλλυντικά
 DocType: DocField,Type,Τύπος
-apps/erpnext/erpnext/stock/doctype/item/item.py +417,"To merge, following properties must be same for both items","Για τη συγχώνευση, οι ακόλουθες ιδιότητες πρέπει να είναι ίδιες για τα δύο είδη"
+apps/erpnext/erpnext/stock/doctype/item/item.py +421,"To merge, following properties must be same for both items","Για τη συγχώνευση, οι ακόλουθες ιδιότητες πρέπει να είναι ίδιες για τα δύο είδη"
 DocType: Communication,Subject,Θέμα
 DocType: Shipping Rule,Net Weight,Καθαρό βάρος
 DocType: Employee,Emergency Phone,Τηλέφωνο έκτακτης ανάγκης
@@ -468,7 +445,6 @@
 DocType: Journal Entry,Difference (Dr - Cr),Διαφορά ( dr - cr )
 DocType: Account,Profit and Loss,Κέρδη και ζημιές
 apps/erpnext/erpnext/config/stock.py +293,Managing Subcontracting,Διαχείριση της υπεργολαβίας
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +58,New UOM must NOT be of type Whole Number,Η νέα Μ.Μ. δεν πρέπει να είναι του τύπου ακέραιος αριθμός
 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 +47,Account {0} does not belong to company: {1},Ο λογαριασμός {0} δεν ανήκει στην εταιρεία: {1}
@@ -487,14 +463,14 @@
 DocType: Purchase Invoice,Supplier Invoice No,Αρ. τιμολογίου του προμηθευτή
 DocType: Territory,For reference,Για αναφορά
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +154,"Cannot delete Serial No {0}, as it is used in stock transactions","Δεν μπορείτε να διαγράψετε Αύξων αριθμός {0}, όπως χρησιμοποιείται στις συναλλαγές μετοχών"
-apps/erpnext/erpnext/public/js/account_tree_grid.js +52,Closing (Cr),Κλείσιμο (cr)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +227,Closing (Cr),Κλείσιμο (cr)
 DocType: Serial No,Warranty Period (Days),Περίοδος εγγύησης (ημέρες)
 DocType: Installation Note Item,Installation Note Item,Είδος σημείωσης εγκατάστασης
 ,Pending Qty,Εν αναμονή Ποσότητα
 DocType: Job Applicant,Thread HTML,Νήμα HTML
 DocType: Company,Ignore,Αγνοήστε
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +86,SMS sent to following numbers: {0},SMS αποστέλλονται στην παρακάτω αριθμούς: {0}
-apps/erpnext/erpnext/controllers/buying_controller.py +135,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Η αποθήκη προμηθευτή είναι απαραίτητη για το δελτίο παραλαβής από υπερεργολάβο
+apps/erpnext/erpnext/controllers/buying_controller.py +126,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Η αποθήκη προμηθευτή είναι απαραίτητη για το δελτίο παραλαβής από υπερεργολάβο
 DocType: Pricing Rule,Valid From,Ισχύει από
 DocType: Sales Invoice,Total Commission,Συνολική προμήθεια
 DocType: Pricing Rule,Sales Partner,Συνεργάτης πωλήσεων
@@ -504,7 +480,7 @@
 To distribute a budget using this distribution, set this **Monthly Distribution** in the **Cost Center**","** Η μηνιαία κατανομή ** σας βοηθά να διανείμετε τον προϋπολογισμό σας σε μήνες, αν έχετε εποχικότητα στην επιχείρησή σας.
 
  Για να κατανέμετε τον προϋπολογισμό χρησιμοποιώντας αυτή την κατανομή ορίστε αυτή την ** μηνιαία κατανομή ** στο ** κέντρο κόστους **"
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +183,No records found in the Invoice table,Δεν βρέθηκαν εγγραφές στον πίνακα τιμολογίων
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +130,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 +84,Financial / accounting year.,Οικονομικό / λογιστικό έτος.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","Λυπούμαστε, οι σειριακοί αρ. δεν μπορούν να συγχωνευθούν"
@@ -520,25 +496,25 @@
 DocType: Sales Order,Billing and Delivery Status,Χρέωση και Παράδοσης Κατάσταση
 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/setup/page/setup_wizard/setup_wizard_page.html +16,Previous,Προηγούμενο
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard_page.html +16,Previous,Προηγούμενο
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +620,Sales Return,Επιστροφή πωλήσεων
 DocType: Production Planning Tool,Select Sales Orders from which you want to create Production Orders.,Επιλέξτε παραγγελίες πώλησης από τις οποίες θέλετε να δημιουργήσετε εντολές παραγωγής.
 DocType: Item,Delivered by Supplier (Drop Ship),Δημοσιεύθηκε από τον Προμηθευτή (Drop Ship)
 apps/erpnext/erpnext/config/hr.py +120,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.,Βάση δεδομένων των πελατών.
 DocType: Quotation,Quotation To,Προσφορά προς
 DocType: Lead,Middle Income,Μέσα έσοδα
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),Άνοιγμα ( cr )
 apps/erpnext/erpnext/accounts/utils.py +193,Allocated amount can not be negative,Το χορηγούμενο ποσό δεν μπορεί να είναι αρνητικό
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +123,Tumbling,Η ανατροπή
 DocType: Purchase Order Item,Billed Amt,Χρεωμένο ποσό
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,Μια λογική αποθήκη στην οποία θα γίνονται οι καταχωρήσεις αποθέματος
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +92,Reference No & Reference Date is required for {0},Ο αρ. αναφοράς & η ημερομηνία αναφοράς για {0} είναι απαραίτητες.
 DocType: Event,Wednesday,Τετάρτη
 DocType: Sales Invoice,Customer's Vendor,Πωλητής πελάτη
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +214,Production Order is Mandatory,Η εντολή παραγωγής είναι υποχρεωτική
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +139,Proposal Writing,Συγγραφή πρότασης
+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} υπάρχει με την ίδια ταυτότητα υπαλλήλου
 apps/erpnext/erpnext/stock/stock_ledger.py +336,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},Σφάλμα αρνητικού αποθέματος ({6}) για το είδος {0} στην αποθήκη {1} στο {2} {3} σε {4} {5}
 DocType: Fiscal Year Company,Fiscal Year Company,Εταιρεία χρήσης
@@ -561,7 +537,7 @@
 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/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.py +179,Please install dropbox python module,Παρακαλώ εγκαταστήστε το dropbox module της python 
 DocType: Employee,Passport Number,Αριθμός διαβατηρίου
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +82,Manager,Προϊστάμενος
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Manager,Προϊστάμενος
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +494,From Purchase Receipt,Από το αποδεικτικό παραλαβής αγοράς
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +219,Same item has been entered multiple times.,Το ίδιο είδος έχει εισαχθεί πολλές φορές.
 DocType: SMS Settings,Receiver Parameter,Παράμετρος παραλήπτη
@@ -569,10 +545,9 @@
 DocType: Sales Person,Sales Person Targets,Στόχοι πωλητή
 apps/frappe/frappe/public/js/frappe/form/workflow.js +116,To,Έως
 apps/frappe/frappe/templates/base.html +145,Please enter email address,Παρακαλώ εισάγετε τη διεύθυνση email
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +35,End tube forming,Άκρο του σωλήνα που σχηματίζουν
 DocType: Production Order Operation,In minutes,Σε λεπτά
 DocType: Issue,Resolution Date,Ημερομηνία επίλυσης
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +635,Please set default Cash or Bank account in Mode of Payment {0},Παρακαλώ ορίστε τον προεπιλεγμένο λογιαριασμό μετρητών ή τραπέζης στον τρόπο πληρωμής {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +637,Please set default Cash or Bank account in Mode of Payment {0},Παρακαλώ ορίστε τον προεπιλεγμένο λογιαριασμό μετρητών ή τραπέζης στον τρόπο πληρωμής {0}
 DocType: Selling Settings,Customer Naming By,Ονομασία πελάτη από
 apps/erpnext/erpnext/accounts/doctype/account/account.js +67,Convert to Group,Μετατροπή σε ομάδα
 DocType: Activity Cost,Activity Type,Τύπος δραστηριότητας
@@ -580,12 +555,12 @@
 DocType: Customer,Fixed Days,Σταθερή Ημέρες
 DocType: Sales Invoice,Packing List,Λίστα συσκευασίας
 apps/erpnext/erpnext/config/buying.py +28,Purchase Orders given to Suppliers.,Παραγγελίες αγοράς που δόθηκαν σε προμηθευτές.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +43,Publishing,Δημοσίευση
+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 +198,{0}: {1} not found in Invoice Details table,{0}: {1} Δεν βρέθηκε στον πίνακα στοιχείων τιμολογίου
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,{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 +208,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Η επίσκεψη συντήρησης {0} πρέπει να ακυρωθεί πριν από την ακύρωση αυτής της παραγγελίας πώλησης
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +203,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}
@@ -597,7 +572,6 @@
 DocType: Pricing Rule,Sales Manager,Διευθυντής πωλήσεων
 apps/frappe/frappe/public/js/frappe/model/model.js +492,Rename,Μετονομασία
 DocType: Journal Entry,Write Off Amount,Διαγραφή ποσού
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +52,Bending,Κάμψη
 apps/frappe/frappe/core/page/user_permissions/user_permissions.js +246,Allow User,Επίτρεψε χρήστη
 DocType: Journal Entry,Bill No,Αρ. Χρέωσης
 DocType: Purchase Invoice,Quarterly,Τριμηνιαίος
@@ -607,17 +581,16 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Please enter item details,Παρακαλώ εισάγετε τα στοιχεία του είδους
 DocType: Purchase Receipt,Other Details,Άλλες λεπτομέρειες
 DocType: Account,Accounts,Λογαριασμοί
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +67,Marketing,Marketing
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +65,Straight shearing,Ευθεία διάτμηση
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +67,Marketing,Marketing
 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/stock/doctype/purchase_receipt/purchase_receipt.py +99,Rejected Warehouse is mandatory against regected item,Η αποθήκη απορριφθέντων είναι απαραίτητη για το είδος που απορρίφθηκε
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +102,Rejected Warehouse is mandatory against regected item,Η αποθήκη απορριφθέντων είναι απαραίτητη για το είδος που απορρίφθηκε
 DocType: Account,Expenses Included In Valuation,Δαπάνες που περιλαμβάνονται στην αποτίμηση
 DocType: Employee,Provide email id registered in company,Παρέχετε ένα email ID εγγεγραμμένο στην εταιρεία
 DocType: Hub Settings,Seller City,Πόλη πωλητή
 DocType: Email Digest,Next email will be sent on:,Το επόμενο μήνυμα email θα αποσταλεί στις:
 DocType: Offer Letter Term,Offer Letter Term,Προσφορά Επιστολή Όρος
-apps/erpnext/erpnext/stock/doctype/item/item.py +492,Item has variants.,Στοιχείο έχει παραλλαγές.
+apps/erpnext/erpnext/stock/doctype/item/item.py +496,Item has variants.,Στοιχείο έχει παραλλαγές.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Το είδος {0} δεν βρέθηκε
 DocType: Bin,Stock Value,Αξία των αποθεμάτων
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,Τύπος δέντρου
@@ -626,10 +599,9 @@
 DocType: Material Request Item,Quantity and Warehouse,Ποσότητα και αποθήκη
 DocType: Sales Invoice,Commission Rate (%),Ποσοστό (%) προμήθειας
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +172,"Against Voucher Type must be one of Sales Order, Sales Invoice or Journal Entry","Κατά τον τύπο του αποδεικτικού πρέπει να είναι παραγγελία πώλησης, τιμολόγιο πώλησης ή ημερολογιακή εγγραφή "
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +139,Biomachining,Biomachining
 apps/erpnext/erpnext/setup/utils.py +89,Unable to find exchange rate,Ανίκανος να βρει συναλλαγματική ισοτιμία
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +7,Aerospace,Αεροδιάστημα
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +19,Welcome,Καλωσόρισμα
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +7,Aerospace,Αεροδιάστημα
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +40,Welcome,Καλωσόρισμα
 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.,Τα εμπορεύματα παραλήφθηκαν από τους προμηθευτές.
@@ -652,19 +624,19 @@
 DocType: Employee,Cell Number,Αριθμός κινητού
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Απολεσθέν
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +120,You can not enter current voucher in 'Against Journal Entry' column,Δεν μπορείτε να εισάγετε την τρέχουσα εγγυητική στη στήλη 'κατά λογιστική εγγραφή'
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +25,Energy,Ενέργεια
+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.,Μηνιαία κατάσταση μισθοδοσίας.
 DocType: Item Group,Website Specifications,Προδιαγραφές δικτυακού τόπου
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +205,New Account,Νέος λογαριασμός
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +21,{0}: From {0} of type {1},{0}: Από {0} του τύπου {1}
-apps/erpnext/erpnext/controllers/buying_controller.py +283,Row {0}: Conversion Factor is mandatory,Γραμμή {0}: ο συντελεστής μετατροπής είναι υποχρεωτικός
+apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,Γραμμή {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.,Οι λογιστικές εγγραφές μπορούν να γίνουν με την κόμβους. Ενδείξεις κατά ομάδες δεν επιτρέπονται.
 DocType: ToDo,High,Υψηλός
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +361,Cannot deactivate or cancel BOM as it is linked with other BOMs,Δεν είναι δυνατή η απενεργοποίηση ή ακύρωση της Λ.Υ. γιατί συνδέεται με άλλες Λ.Υ.
 DocType: Opportunity,Maintenance,Συντήρηση
 DocType: User,Male,Άντρας
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +182,Purchase Receipt number required for Item {0},Ο αριθμός αποδεικτικού παραλαβής αγοράς για το είδος {0} είναι απαραίτητος
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +183,Purchase Receipt number required for Item {0},Ο αριθμός αποδεικτικού παραλαβής αγοράς για το είδος {0} είναι απαραίτητος
 DocType: Item Attribute Value,Item Attribute Value,Τιμή χαρακτηριστικού είδους
 apps/erpnext/erpnext/config/crm.py +64,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.
@@ -713,10 +685,9 @@
 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 +324,"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/page/setup_wizard/fixtures/industry_type.py +13,Biotechnology,Βιοτεχνολογία
+apps/erpnext/erpnext/controllers/accounts_controller.py +325,"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,Δαπάνες συντήρησης γραφείου
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +53,Hemming,Στρήφωμα
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +66,Please enter Item first,Παρακαλώ εισάγετε πρώτα το είδος
 DocType: Account,Liability,Υποχρέωση
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +62,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Κυρώσεις Το ποσό δεν μπορεί να είναι μεγαλύτερη από την αξίωση Ποσό στη σειρά {0}.
@@ -729,10 +700,10 @@
 DocType: Company,Default Bank Account,Προεπιλεγμένος τραπεζικός λογαριασμός
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +47,"To filter based on Party, select Party Type first","Για να φιλτράρετε με βάση Κόμμα, επιλέξτε Τύπος Πάρτυ πρώτα"
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},"«Ενημέρωση Χρηματιστήριο» δεν μπορεί να ελεγχθεί, διότι τα στοιχεία δεν παραδίδονται μέσω {0}"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Nos,Αριθμοί
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Nos,Αριθμοί
 DocType: Item,Items with higher weightage will be shown higher,Τα στοιχεία με υψηλότερες weightage θα δείξει υψηλότερη
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Λεπτομέρειες συμφωνίας τραπεζικού λογαριασμού
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +627,My Invoices,Τιμολόγια μου
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +629,My Invoices,Τιμολόγια μου
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,Δεν βρέθηκε υπάλληλος
 DocType: Purchase Order,Stopped,Σταματημένη
 DocType: Item,If subcontracted to a vendor,Αν υπεργολαβία σε έναν πωλητή
@@ -751,35 +722,33 @@
 DocType: Features Setup,"To enable ""Point of Sale"" features",Για να ενεργοποιήσετε το &quot;Point of Sale&quot; χαρακτηριστικά
 DocType: Bin,Moving Average Rate,Κινητή μέση τιμή
 DocType: Production Planning Tool,Select Items,Επιλέξτε είδη
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,{0} against Bill {1} dated {2},{0} κατά τη χρέωση {1} ​​της {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +328,{0} against Bill {1} dated {2},{0} κατά τη χρέωση {1} ​​της {2}
 DocType: Comment,Reference Name,Όνομα αναφοράς
 DocType: Maintenance Visit,Completion Status,Κατάσταση ολοκλήρωσης
 DocType: Sales Invoice Item,Target Warehouse,Αποθήκη προορισμού
 DocType: Item,Allow over delivery or receipt upto this percent,Επιτρέψτε πάνω από την παράδοση ή την παραλαβή μέχρι αυτή τη τοις εκατό
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +49,Expected Delivery Date cannot be before Sales Order Date,Η αναμενόμενη ημερομηνία παράδοσης δεν μπορεί να είναι προγενέστερη της ημερομηνίας παραγγελίας πωλήσεων
 DocType: Upload Attendance,Import Attendance,Εισαγωγή συμμετοχών
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +17,All Item Groups,Όλες οι ομάδες ειδών
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +17,All Item Groups,Όλες οι ομάδες ειδών
 DocType: Process Payroll,Activity Log,Αρχείο καταγραφής δραστηριότητας
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +30,Net Profit / Loss,Καθαρά κέρδη / ζημίες
 apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,Αυτόματη σύνθεση μηνύματος για την υποβολή συναλλαγών .
 DocType: Production Order,Item To Manufacture,Είδος προς κατασκευή
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +16,Permanent mold casting,Μόνιμη καλούπι
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} κατάσταση είναι {2}
 apps/erpnext/erpnext/config/learn.py +172,Purchase Order to Payment,Εντολή Αγοράς για Πληρωμή
 DocType: Sales Order Item,Projected Qty,Προβλεπόμενη ποσότητα
 DocType: Sales Invoice,Payment Due Date,Ημερομηνία λήξης προθεσμίας πληρωμής
 DocType: Newsletter,Newsletter Manager,Ενημερωτικό Δελτίο Διευθυντής
-apps/erpnext/erpnext/stock/doctype/item/item.js +229,Item Variant {0} already exists with same attributes,Θέση Παραλλαγή {0} υπάρχει ήδη με ίδια χαρακτηριστικά
+apps/erpnext/erpnext/stock/doctype/item/item.js +231,Item Variant {0} already exists with same attributes,Θέση Παραλλαγή {0} υπάρχει ήδη με ίδια χαρακτηριστικά
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening',«Άνοιγμα»
 DocType: Notification Control,Delivery Note Message,Μήνυμα δελτίου αποστολής
 DocType: Expense Claim,Expenses,Δαπάνες
 DocType: Item Variant Attribute,Item Variant Attribute,Παραλλαγή Στοιχείο Χαρακτηριστικό
 ,Purchase Receipt Trends,Τάσεις αποδεικτικού παραλαβής αγοράς
 DocType: Appraisal,Select template from which you want to get the Goals,Επιλέξτε το πρότυπο από το οποίο θέλετε να πάρετε τους στόχους
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +77,Research & Development,Έρευνα & ανάπτυξη
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Research & Development,Έρευνα & ανάπτυξη
 ,Amount to Bill,Ποσό χρέωσης
 DocType: Company,Registration Details,Στοιχεία εγγραφής
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +75,Staking,Χάραξη
 DocType: Item,Re-Order Qty,Ποσότητα επαναπαραγγελίας
 DocType: Leave Block List Date,Leave Block List Date,Ημερομηνία λίστας αποκλεισμού ημερών άδειας 
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +25,Scheduled to send to {0},Προγραμματισμένη για να αποσταλεί σε {0}
@@ -790,18 +759,16 @@
 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,Point-of-Sale
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,Cannot carry forward {0},Δεν είναι δυνατή η μεταφορά προς τα εμπρός {0}
 apps/erpnext/erpnext/accounts/doctype/account/account.py +91,"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,Μήνυμα απόρριψης αξίωσης δαπανών
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +145,Nailing,Κάρφωμα
 ,Available Qty,Διαθέσιμη ποσότητα
 DocType: Purchase Taxes and Charges,On Previous Row Total,Στο σύνολο της προηγούμενης γραμμής
 DocType: Salary Slip,Working Days,Εργάσιμες ημέρες
 DocType: Serial No,Incoming Rate,Ρυθμός εισερχομένων
 DocType: Packing Slip,Gross Weight,Μικτό βάρος
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +410,The name of your company for which you are setting up this system.,Το όνομα της εταιρείας σας για την οποία εγκαθιστάτε αυτό το σύστημα.
+apps/erpnext/erpnext/public/js/setup_wizard.js +158,The name of your company for which you are setting up this system.,Το όνομα της εταιρείας σας για την οποία εγκαθιστάτε αυτό το σύστημα.
 DocType: HR Settings,Include holidays in Total no. of Working Days,Συμπεριέλαβε αργίες στον συνολικό αριθμό των εργάσιμων ημερών
 DocType: Job Applicant,Hold,Αναμονή
 DocType: Employee,Date of Joining,Ημερομηνία πρόσληψης
@@ -811,7 +778,6 @@
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +3,View Subscribers,Προβολή Συνδρομητές
 DocType: Purchase Invoice Item,Purchase Receipt,Αποδεικτικό παραλαβής αγοράς
 ,Received Items To Be Billed,Είδη που παραλήφθηκαν και πρέπει να τιμολογηθούν
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +114,Abrasive blasting,Λειαντικά ανατινάξεις
 DocType: Employee,Ms,Κα
 apps/erpnext/erpnext/config/accounts.py +148,Currency exchange rate master.,Κύρια εγγραφή συναλλαγματικής ισοτιμίας.
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +253,Unable to find Time Slot in the next {0} days for Operation {1},Ανίκανος να βρει χρονοθυρίδα στα επόμενα {0} ημέρες για τη λειτουργία {1}
@@ -823,7 +789,7 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +209,Serial No {0} does not belong to Item {1},Ο σειριακός αριθμός {0} δεν ανήκει στο είδος {1}
 DocType: Purchase Receipt Item Supplied,Required Qty,Απαιτούμενη ποσότητα
 DocType: Bank Reconciliation,Total Amount,Συνολικό ποσό
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +32,Internet Publishing,Δημοσίευση στο διαδίκτυο
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,Δημοσίευση στο διαδίκτυο
 DocType: Production Planning Tool,Production Orders,Εντολές παραγωγής
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +35,Balance Value,Αξία ισολογισμού
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,Τιμοκατάλογος πωλήσεων
@@ -834,7 +800,7 @@
 DocType: Supplier,Default Payable Accounts,Προεπιλεγμένοι λογαριασμοί πληρωτέων
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,Ο υπάλληλος {0} δεν είναι ενεργός ή δεν υπάρχει
 DocType: Features Setup,Item Barcode,Barcode είδους
-apps/erpnext/erpnext/stock/doctype/item/item.py +487,Item Variants {0} updated,Οι παραλλαγές είδους {0} ενημερώθηκαν
+apps/erpnext/erpnext/stock/doctype/item/item.py +491,Item Variants {0} updated,Οι παραλλαγές είδους {0} ενημερώθηκαν
 DocType: Quality Inspection Reading,Reading 6,Μέτρηση 6
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Προκαταβολή τιμολογίου αγοράς 
 DocType: Address,Shop,Κατάστημα
@@ -843,7 +809,7 @@
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,"Ο προεπιλεγμένος λογαριασμός τραπέζης / μετρητών θα ενημερώνεται αυτόματα στην έκδοση τιμολογίου POS, όταν επιλέγεται αυτός ο τρόπος."
 DocType: Employee,Permanent Address Is,Η μόνιμη διεύθυνση είναι
 DocType: Production Order Operation,Operation completed for how many finished goods?,Για πόσα τελικά προϊόντα ολοκληρώθηκε η λειτουργία;
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +491,The Brand,Το εμπορικό σήμα
+apps/erpnext/erpnext/public/js/setup_wizard.js +237,The Brand,Το εμπορικό σήμα
 apps/erpnext/erpnext/controllers/status_updater.py +163,Allowance for over-{0} crossed for Item {1}.,Επίδομα πάνω-{0} ξεπεράστηκε για το είδος {1}.
 DocType: Employee,Exit Interview Details,Λεπτομέρειες συνέντευξης εξόδου 
 DocType: Item,Is Purchase Item,Είναι είδος αγοράς
@@ -863,16 +829,16 @@
 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,Καθορίστε το ποσό πληρωμής = οφειλόμενο ποσό
 DocType: Contact Us Settings,Address Line 1,Γραμμή διεύθυνσης 1
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Variance,Διακύμανση
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +392,Company Name,Όνομα εταιρείας
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +53,Variance,Διακύμανση
+,Company Name,Όνομα εταιρείας
 DocType: SMS Center,Total Message(s),Σύνολο μηνυμάτων
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +515,Select Item for Transfer,Επιλογή στοιχείου για μεταφορά
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +538,Select Item for Transfer,Επιλογή στοιχείου για μεταφορά
 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.,Επιλέξτε την κύρια εγγραφή λογαριασμού της τράπεζας όπου κατατέθηκε η επιταγή.
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,Επίτρεψε στο χρήστη να επεξεργάζεται τιμές τιμοκατάλογου στις συναλλαγές
 DocType: Pricing Rule,Max Qty,Μέγιστη ποσότητα
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +106,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Γραμμή {0}:η πληρωμή έναντι πωλήσεων / παραγγελιών αγοράς θα πρέπει πάντα να επισημαίνεται ως προκαταβολή
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +16,Chemical,Χημικό
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,Χημικό
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +693,All items have already been transferred for this Production Order.,Όλα τα είδη έχουν ήδη μεταφερθεί για αυτήν την εντολή παραγωγής.
 DocType: Process Payroll,Select Payroll Year and Month,Επιλέξτε Μισθοδοσίας Έτος και Μήνας
 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""",Πηγαίνετε στην κατάλληλη ομάδα (συνήθως Εφαρμογή των Ταμείων&gt; Κυκλοφορούν Ενεργητικό&gt; τραπεζικούς λογαριασμούς και να δημιουργήσετε ένα νέο λογαριασμό (κάνοντας κλικ στην επιλογή Προσθήκη Παιδί) του τύπου &quot;Τράπεζα&quot;
@@ -883,12 +849,12 @@
 DocType: Item,Inspection Criteria,Κριτήρια ελέγχου
 apps/erpnext/erpnext/config/accounts.py +101,Tree of finanial Cost Centers.,Δέντρο οικονομικών κεντρών κόστους.
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,Μεταφέρονται
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +492,Upload your letter head and logo. (you can edit them later).,Ανεβάστε την κεφαλίδα επιστολόχαρτου και το λογότυπό σας. (Μπορείτε να τα επεξεργαστείτε αργότερα).
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +156,White,Λευκό
+apps/erpnext/erpnext/public/js/setup_wizard.js +238,Upload your letter head and logo. (you can edit them later).,Ανεβάστε την κεφαλίδα επιστολόχαρτου και το λογότυπό σας. (Μπορείτε να τα επεξεργαστείτε αργότερα).
+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/setup/page/setup_wizard/setup_wizard.js +362,Attach Your Picture,Επισύναψη της εικόνα σας
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Make ,Δημιούργησε
+apps/erpnext/erpnext/public/js/setup_wizard.js +112,Attach Your Picture,Επισύναψη της εικόνα σας
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +540,Make ,Δημιούργησε
 DocType: Journal Entry,Total Amount in Words,Συνολικό ποσό ολογράφως
 DocType: Workflow State,Stop,Διακοπή
 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 εάν το πρόβλημα παραμένει.
@@ -897,14 +863,13 @@
 DocType: Lead,Next Contact Date,Ημερομηνία επόμενης επικοινωνίας
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,Αρχική ποσότητα
 DocType: Holiday List,Holiday List Name,Όνομα λίστας αργιών
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +168,Stock Options,Δικαιώματα Προαίρεσης
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +168,Stock Options,Δικαιώματα Προαίρεσης
 DocType: Journal Entry Account,Expense Claim,Αξίωση δαπανών
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +181,Qty for {0},Ποσότητα για {0}
 DocType: Leave Application,Leave Application,Αίτηση άδειας
 apps/erpnext/erpnext/config/hr.py +77,Leave Allocation Tool,Εργαλείο κατανομής αδειών
 DocType: Leave Block List,Leave Block List Dates,Ημερομηνίες λίστας αποκλεισμού ημερών άδειας
 DocType: Company,If Monthly Budget Exceeded (for expense account),Αν Μηνιαίος Προϋπολογισμός Υπέρβαση (για λογαριασμό εξόδων)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +56,Trimming,Κοπή
 DocType: Workstation,Net Hour Rate,Καθαρή τιμή ώρας
 DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,Αποδεικτικό αγοράς κόστους αποστολής εμπορευμάτων
 DocType: Company,Default Terms,Προεπιλογή Όροι
@@ -912,10 +877,9 @@
 DocType: POS Profile,Cash/Bank Account,Λογαριασμός μετρητών/τραπέζης
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,Removed items with no change in quantity or value.,Που αφαιρούνται χωρίς καμία αλλαγή στην ποσότητα ή την αξία.
 DocType: Delivery Note,Delivery To,Παράδοση προς
-apps/erpnext/erpnext/stock/doctype/item/item.py +509,Attribute table is mandatory,Τραπέζι χαρακτηριστικό γνώρισμα είναι υποχρεωτικό
+apps/erpnext/erpnext/stock/doctype/item/item.py +513,Attribute table is mandatory,Τραπέζι χαρακτηριστικό γνώρισμα είναι υποχρεωτικό
 DocType: Production Planning Tool,Get Sales Orders,Βρες παραγγελίες πώλησης
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,Η {0} δεν μπορεί να είναι αρνητική
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +103,Filing,Υποβολή
 apps/erpnext/erpnext/templates/form_grid/item_grid.html +72,Discount,Έκπτωση
 DocType: Features Setup,Purchase Discounts,Εκπτώσεις αγοράς
 DocType: Workstation,Wages,Μισθοί
@@ -932,6 +896,7 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +112,You are the Expense Approver for this record. Please Update the 'Status' and Save,Είστε ο υπεύθυνος έγκρισης δαπανών για αυτή την εγγραφή. Ενημερώστε την κατάσταση και αποθηκεύστε
 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 +136,"Attributes for Item Variants. e.g Size, Color etc.","Χαρακτηριστικά για τις διαμορφώσεις του είδους. Π.Χ. Μέγεθος, χρώμα κ.λ.π."
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +39,WIP Warehouse,Αποθήκη εργασιών σε εξέλιξη
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +194,Serial No {0} is under maintenance contract upto {1},Ο σειριακός αριθμός {0} έχει σύμβαση συντήρησης σε ισχύ μέχρι {1}
@@ -940,7 +905,7 @@
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,Έξοδα πωλήσεων
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Buying,Πρότυπες αγορές
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +120,Standard Buying,Πρότυπες αγορές
 DocType: GL Entry,Against,Κατά
 DocType: Item,Default Selling Cost Center,Προεπιλεγμένο κέντρο κόστους πωλήσεων
 DocType: Sales Partner,Implementation Partner,Συνεργάτης υλοποίησης
@@ -961,29 +926,29 @@
 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/setup/page/setup_wizard/setup_wizard.js +588,List a few of your suppliers. They could be organizations or individuals.,Απαριθμήστε μερικούς από τους προμηθευτές σας. Θα μπορούσαν να είναι φορείς ή ιδιώτες.
+apps/erpnext/erpnext/public/js/setup_wizard.js +326,List a few of your suppliers. They could be organizations or individuals.,Απαριθμήστε μερικούς από τους προμηθευτές σας. Θα μπορούσαν να είναι φορείς ή ιδιώτες.
 DocType: Company,Default Currency,Προεπιλεγμένο νόμισμα
 DocType: Contact,Enter designation of this Contact,Εισάγετε ονομασία αυτής της επαφής
 DocType: Contact Us Settings,Address,Διεύθυνση
 DocType: Expense Claim,From Employee,Από υπάλληλο
-apps/erpnext/erpnext/controllers/accounts_controller.py +338,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Προσοχή : το σύστημα δεν θα ελέγξει για υπερτιμολογήσεις εφόσον το ποσό για το είδος {0} {1} είναι μηδέν
+apps/erpnext/erpnext/controllers/accounts_controller.py +339,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,Βασικός τομέας επιδόσεων
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +54,Transportation,Μεταφορά
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +54,Transportation,Μεταφορά
 apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +67, and year: ,και το έτος:
 DocType: Email Digest,Annual Expense,Ετήσια Δαπάνη
 DocType: SMS Center,Total Characters,Σύνολο χαρακτήρων
-apps/erpnext/erpnext/controllers/buying_controller.py +139,Please select BOM in BOM field for Item {0},Παρακαλώ επιλέξτε Λ.Υ. στο πεδίο της Λ.Υ. για το είδος {0}
+apps/erpnext/erpnext/controllers/buying_controller.py +130,Please select BOM in BOM field for Item {0},Παρακαλώ επιλέξτε Λ.Υ. στο πεδίο της Λ.Υ. για το είδος {0}
 DocType: C-Form Invoice Detail,C-Form Invoice Detail,Λεπτομέρειες τιμολογίου C-form 
 DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,Τιμολόγιο συμφωνίας πληρωμής 
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +32,Contribution %,Συμβολή (%)
 DocType: Item,website page link,Σύνδεσμος ιστοσελίδας
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +192,Let's prepare the system for first use.,Ας προετοιμαστεί το σύστημα για την πρώτη χρήση.
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +242,Let's prepare the system for first use.,Ας προετοιμαστεί το σύστημα για την πρώτη χρήση.
 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 +214,Production Order {0} must be cancelled before cancelling this Sales Order,Η εντολή παραγωγής {0} πρέπει να ακυρωθεί πριν από την ακύρωση αυτής της παραγγελίας πώλησης
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +209,Production Order {0} must be cancelled before cancelling this Sales Order,Η εντολή παραγωγής {0} πρέπει να ακυρωθεί πριν από την ακύρωση αυτής της παραγγελίας πώλησης
 ,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.,Επιλέξτε αρχεία καταγραφής χρονολογίου και πατήστε υποβολή για να δημιουργηθεί ένα νέο τιμολόγιο πώλησης
@@ -1003,14 +968,13 @@
 DocType: Sales Invoice Advance,Sales Invoice Advance,Προκαταβολή τιμολογίου πώλησης
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +398,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/page/setup_wizard/install_fixtures.py +75,Management,Διαχείριση
+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/setup/page/setup_wizard/fixtures/operations.py +14,Investment casting,Χύτευση των επενδύσεων
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +51,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.,Οι καθαρές αποδοχές (ολογράφως) θα είναι ορατές τη στιγμή που θα αποθηκεύσετε τη βεβαίωση αποδοχών
 apps/frappe/frappe/core/doctype/user/user_list.js +12,Active,Ενεργός
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +154,Blue,Μπλε
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +154,Blue,Μπλε
 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,Περαιτέρω κόμβοι μπορούν να δημιουργηθούν μόνο σε κόμβους τύπου ομάδα 
@@ -1020,18 +984,16 @@
 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/setup/page/setup_wizard/fixtures/operations.py +156,Laminated object manufacturing,Απανωτές στρώσεις κατασκευής αντικείμενο
 apps/erpnext/erpnext/config/buying.py +13,Supplier database.,Βάση δεδομένων προμηθευτών.
 DocType: Account,Balance Sheet,Ισολογισμός
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +561,Cost Center For Item with Item Code ',Κέντρο κόστους για το είδος με το κωδικό είδους '
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +45,Stretch forming,Τεντώστε το σχηματισμό
 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 +210,"Further accounts can be made under Groups, but entries can be made against non-Groups","Περαιτέρω λογαριασμών μπορούν να γίνουν στις ομάδες, αλλά εγγραφές μπορούν να γίνουν με την μη Ομάδες"
 apps/erpnext/erpnext/config/hr.py +125,Tax and other salary deductions.,Φορολογικές και άλλες κρατήσεις μισθών.
 DocType: Lead,Lead,Επαφή
 DocType: Email Digest,Payables,Υποχρεώσεις
 DocType: Account,Warehouse,Αποθήκη
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +90,Row #{0}: Rejected Qty can not be entered in Purchase Return,Σειρά # {0}: Απορρίφθηκε Ποσότητα δεν μπορούν να εισαχθούν στην Αγορά Επιστροφή
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +93,Row #{0}: Rejected Qty can not be entered in Purchase Return,Σειρά # {0}: Απορρίφθηκε Ποσότητα δεν μπορούν να εισαχθούν στην Αγορά Επιστροφή
 ,Purchase Order Items To Be Billed,Είδη παραγγελίας αγοράς προς χρέωση
 DocType: Purchase Invoice Item,Net Rate,Καθαρή Τιμή
 DocType: Purchase Invoice Item,Purchase Invoice Item,Είδος τιμολογίου αγοράς 
@@ -1046,13 +1008,13 @@
 DocType: Global Defaults,Current Fiscal Year,Τρέχουσα χρήση
 DocType: Global Defaults,Disable Rounded Total,Απενεργοποίηση στρογγυλοποίησης συνόλου
 DocType: Lead,Call,Κλήση
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +384,'Entries' cannot be empty,Οι καταχωρήσεις δεν μπορεί να είναι κενές
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +386,'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 +205,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/page/setup_wizard/install_fixtures.py +138,Research,Έρευνα
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +138,Research,Έρευνα
 DocType: Maintenance Visit Purpose,Work Done,Η εργασία ολοκληρώθηκε
 apps/erpnext/erpnext/controllers/item_variant.py +25,Please specify at least one attribute in the Attributes table,Παρακαλείστε να προσδιορίσετε τουλάχιστον ένα χαρακτηριστικό στον πίνακα Χαρακτηριστικά
 DocType: Contact,User ID,ID χρήστη
@@ -1060,10 +1022,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +57,View Ledger,Προβολή καθολικού
 DocType: File,Lft,Lft
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Η πιο παλιά
-apps/erpnext/erpnext/stock/doctype/item/item.py +394,"An Item Group exists with same name, please change the item name or rename the item group","Μια ομάδα ειδών υπάρχει με το ίδιο όνομα, μπορείτε να αλλάξετε το όνομα του είδους ή να μετονομάσετε την ομάδα ειδών"
+apps/erpnext/erpnext/stock/doctype/item/item.py +398,"An Item Group exists with same name, please change the item name or rename the item group","Μια ομάδα ειδών υπάρχει με το ίδιο όνομα, μπορείτε να αλλάξετε το όνομα του είδους ή να μετονομάσετε την ομάδα ειδών"
 DocType: Communication,Delivery Status,Κατάσταση παράδοσης
 DocType: Production Order,Manufacture against Sales Order,Παραγωγή κατά παραγγελία πώλησης
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +517,Rest Of The World,Τρίτες χώρες
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +455,Rest Of The World,Τρίτες χώρες
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,Το είδος {0} δεν μπορεί να έχει παρτίδα
 ,Budget Variance Report,Έκθεση διακύμανσης του προϋπολογισμού
 DocType: Salary Slip,Gross Pay,Ακαθάριστες αποδοχές
@@ -1074,13 +1036,11 @@
 DocType: BOM Item,Item Description,Περιγραφή είδους
 DocType: Payment Tool,Payment Mode,Τρόπος πληρωμής
 DocType: Purchase Invoice,Is Recurring,Είναι επαναλαμβανόμενo
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +154,Direct metal laser sintering,Άμεση μέταλλο πυροσυσσωμάτωσης με λέιζερ
 DocType: Purchase Order,Supplied Items,Προμηθευόμενα είδη
 DocType: Production Order,Qty To Manufacture,Ποσότητα για κατασκευή
 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,Προσωρινό άνοιγμα
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +41,Cryorolling,Cryorolling
 ,Employee Leave Balance,Υπόλοιπο αδείας υπαλλήλου
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +128,Balance for Account {0} must always be {1},Το υπόλοιπο λογαριασμού {0} πρέπει να είναι πάντα {1}
 DocType: Address,Address Type,Τύπος διεύθυνσης
@@ -1096,23 +1056,23 @@
 DocType: Journal Entry,Get Outstanding Invoices,Βρες εκκρεμή τιμολόγια
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,Η παραγγελία πώλησης {0} δεν είναι έγκυρη
 apps/erpnext/erpnext/setup/doctype/company/company.py +172,"Sorry, companies cannot be merged","Δυστυχώς, οι εταιρείες δεν μπορούν να συγχωνευθούν"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +145,Small,Μικρό
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Small,Μικρό
 DocType: Employee,Employee Number,Αριθμός υπαλλήλων
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},Ο αρ. υπόθεσης χρησιμοποιείται ήδη. Δοκιμάστε από τον αρ. υπόθεσης {0}
 ,Invoiced Amount (Exculsive Tax),Ποσό τιμολόγησης (χωρίς φπα)
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,Στοιχείο 2
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +59,Account head {0} created,Η κύρια εγγραφή λογαριασμού {0} δημιουργήθηκε
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +153,Green,Πράσινος
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Green,Πράσινος
 DocType: Item,Auto re-order,Αυτόματη εκ νέου προκειμένου
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +57,Total Achieved,Σύνολο που επιτεύχθηκε
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +59,Total Achieved,Σύνολο που επιτεύχθηκε
 DocType: Employee,Place of Issue,Τόπος έκδοσης
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +59,Contract,Συμβόλαιο
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Contract,Συμβόλαιο
 DocType: Report,Disabled,Απενεργοποιημένο
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +490,UOM coversion factor required for UOM: {0} in Item: {1},Ο παράγοντας μετατροπής Μ.Μ. απαιτείται για τη Μ.Μ.: {0} στο είδος: {1}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +83,Indirect Expenses,Έμμεσες δαπάνες
 apps/erpnext/erpnext/controllers/selling_controller.py +163,Row {0}: Qty is mandatory,Γραμμή {0}: η ποσότητα είναι απαραίτητη
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +8,Agriculture,Γεωργία
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +611,Your Products or Services,Τα προϊόντα ή οι υπηρεσίες σας
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,Γεωργία
+apps/erpnext/erpnext/public/js/setup_wizard.js +347,Your Products or Services,Τα προϊόντα ή οι υπηρεσίες σας
 DocType: Mode of Payment,Mode of Payment,Τρόπος πληρωμής
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,Αυτή είναι μια κύρια ομάδα ειδών και δεν μπορεί να επεξεργαστεί.
 DocType: Journal Entry Account,Purchase Order,Παραγγελία αγοράς
@@ -1124,7 +1084,7 @@
 DocType: Serial No,Serial No Details,Λεπτομέρειες σειριακού αρ.
 DocType: Purchase Invoice Item,Item Tax Rate,Φορολογικός συντελεστής είδους 
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +113,"For {0}, only credit accounts can be linked against another debit entry","Για {0}, μόνο πιστωτικοί λογαριασμοί μπορούν να συνδέονται με άλλες καταχωρήσεις χρέωσης"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Delivery Note {0} is not submitted,Το δελτίο αποστολής {0} δεν έχει υποβληθεί
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +470,Delivery Note {0} is not submitted,Το δελτίο αποστολής {0} δεν έχει υποβληθεί
 apps/erpnext/erpnext/stock/get_item_details.py +136,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.","Ο κανόνας τιμολόγησης πρώτα επιλέγεται με βάση το πεδίο 'εφαρμογή στο', το οποίο μπορεί να είναι είδος, ομάδα ειδών ή εμπορικό σήμα"
@@ -1134,7 +1094,7 @@
 DocType: Appraisal Goal,Goal,Στόχος
 DocType: Sales Invoice Item,Edit Description,Επεξεργασία Περιγραφή
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +318,Expected Delivery Date is lesser than Planned Start Date.,Αναμενόμενη ημερομηνία τοκετού είναι μικρότερο από το προβλεπόμενο Ημερομηνία Έναρξης.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +579,For Supplier,Για προμηθευτή
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +602,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,Συνολική εξερχόμενη
@@ -1160,10 +1120,10 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +74,"Total {0} for all items is zero, may you should change 'Distribute Charges Based On'","Σύνολο {0} για όλα τα στοιχεία είναι μηδέν, μπορεί να πρέπει να αλλάξει »Μοιράστε τελών βάσει του»"
 DocType: Purchase Invoice,Taxes and Charges Calculation,Υπολογισμός φόρων και επιβαρύνσεων
 DocType: BOM Operation,Workstation,Σταθμός εργασίας
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +112,Hardware,Hardware
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +112,Hardware,Hardware
 DocType: Attendance,HR Manager,Υπεύθυνος ανθρωπίνου δυναμικού
 apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,Παρακαλώ επιλέξτε ένα Εταιρείας
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +50,Privilege Leave,Άδεια μετ' αποδοχών
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +50,Privilege Leave,Άδεια μετ' αποδοχών
 DocType: Purchase Invoice,Supplier Invoice Date,Ημερομηνία τιμολογίου του προμηθευτή
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +79,You need to enable Shopping Cart,Χρειάζεται να ενεργοποιήσετε το καλάθι αγορών
 apps/frappe/frappe/public/js/frappe/form/grid_body.html +6,No Data,Δεν υπάρχουν δεδομένα
@@ -1176,7 +1136,7 @@
 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 +168,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/setup/page/setup_wizard/install_fixtures.py +38,Food,Τροφή
+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,Eύρος γήρανσης 3
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +139,You can make a time log only against a submitted production order,Μπορείτε να δημιουργήσετε ένα αρχείο καταγραφής χρονολογίου μόνο για μια εντολή παραγωγής που έχει υποβληθεί
 DocType: Maintenance Schedule Item,No of Visits,Αρ. επισκέψεων
@@ -1196,6 +1156,7 @@
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,View Offer Letter,Προβολή επιστολή προσφοράς
 DocType: Communication,Communication,Επικοινωνία
 DocType: Item,Is Service Item,Είναι υπηρεσία
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +81,Application period cannot be outside leave allocation period,Περίοδος υποβολής των αιτήσεων δεν μπορεί να είναι περίοδος κατανομής έξω άδειας
 DocType: Activity Cost,Projects,Έργα
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +31,Please select Fiscal Year,Παρακαλώ επιλέξτε χρήση
 apps/erpnext/erpnext/controllers/buying_controller.py +23,From {0} | {1} {2},Από {0} | {1} {2}
@@ -1214,7 +1175,7 @@
 DocType: Item,Maintain Stock,Διατηρήστε Χρηματιστήριο
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +213,Stock Entries already created for Production Order ,Έχουν ήδη δημιουργηθεί καταχωρήσεις αποθέματος για την εντολή παραγωγής
 DocType: Leave Control Panel,Leave blank if considered for all designations,Άφησε το κενό αν ισχύει για όλες τις ονομασίες
-apps/erpnext/erpnext/controllers/accounts_controller.py +499,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Η επιβάρυνση του τύπου 'πραγματική' στη γραμμή {0} δεν μπορεί να συμπεριληφθεί στην τιμή είδους
+apps/erpnext/erpnext/controllers/accounts_controller.py +500,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Η επιβάρυνση του τύπου 'πραγματική' στη γραμμή {0} δεν μπορεί να συμπεριληφθεί στην τιμή είδους
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,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,Για την εταιρεία
@@ -1224,7 +1185,7 @@
 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 +471,cannot be greater than 100,Δεν μπορεί να είναι μεγαλύτερη από 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +546,Item {0} is not a stock Item,Το είδος {0} δεν είναι ένα αποθηκεύσιμο είδος
+apps/erpnext/erpnext/stock/doctype/item/item.py +550,Item {0} is not a stock Item,Το είδος {0} δεν είναι ένα αποθηκεύσιμο είδος
 DocType: Maintenance Visit,Unscheduled,Έκτακτες
 DocType: Employee,Owned,Ανήκουν
 DocType: Salary Slip Deduction,Depends on Leave Without Pay,Εξαρτάται από άδειας άνευ αποδοχών
@@ -1238,30 +1199,28 @@
 DocType: HR Settings,Employee Settings,Ρυθμίσεις των υπαλλήλων
 ,Batch-Wise Balance History,Ιστορικό υπολοίπων παρτίδας
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +72,To Do List,Λίστα εκκρεμών εργασιών
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +63,Apprentice,Μαθητευόμενος
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Apprentice,Μαθητευόμενος
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +99,Negative Quantity is not allowed,Δεν επιτρέπεται αρνητική ποσότητα 
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
 Used for Taxes and Charges",Ο πίνακας λεπτομερειών φόρου υπολογίζεται από την κύρια εγγραφή του είδους σαν αλφαριθμητικό και αποθηκεύεται σε αυτό το πεδίο. Χρησιμοποιείται για φόρους και τέλη
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +61,Lancing,Ανοίγοντας με μαχαίρι
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +151,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 +435,Accounting Entry for {0}: {1} can only be made in currency: {2},Λογιστική καταχώριση για {0}: {1} μπορεί να γίνει μόνο στο νόμισμα: {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +436,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 +38,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 +112,Tax Rule for transactions.,Φορολογικές Κανόνας για τις συναλλαγές.
 DocType: Rename Tool,Type of document to rename.,Τύπος του εγγράφου για να μετονομάσετε.
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +630,We buy this Item,Αγοράζουμε αυτό το είδος
+apps/erpnext/erpnext/public/js/setup_wizard.js +366,We buy this Item,Αγοράζουμε αυτό το είδος
 DocType: Address,Billing,Χρέωση
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +77,Flanging,Flanging
 DocType: Bulk Email,Not Sent,Δεν απεστάλη
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +73,Explosive forming,Εκρηκτικές σχηματίζουν
 DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),Σύνολο φόρων και επιβαρύνσεων (στο νόμισμα της εταιρείας)
 DocType: Shipping Rule,Shipping Account,Λογαριασμός αποστολών
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +43,Scheduled to send to {0} recipients,Προγραμματισμένη για να αποσταλεί σε {0} αποδέκτες
 DocType: Quality Inspection,Readings,Μετρήσεις
 DocType: Stock Entry,Total Additional Costs,Συνολικό πρόσθετο κόστος
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Sub Assemblies,Υποσυστήματα
+apps/erpnext/erpnext/public/js/setup_wizard.js +359,Sub Assemblies,Υποσυστήματα
 DocType: Shipping Rule Condition,To Value,Έως αξία
 DocType: Supplier,Stock Manager,Διευθυντής Χρηματιστήριο
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +143,Source warehouse is mandatory for row {0},Η αποθήκη προέλευσης είναι απαραίτητη για τη σειρά {0}
@@ -1271,44 +1230,42 @@
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Η εισαγωγή απέτυχε!
 apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,Δεν δημιουργήθηκαν διευθύνσεις
 DocType: Workstation Working Hour,Workstation Working Hour,Ώρες εργαασίας σταθμού εργασίας
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +83,Analyst,Αναλυτής
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +202,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Γραμμή {0}: Το ποσό που διατίθεται {1} πρέπει να είναι μικρότερο ή ίσο με το ποσό κε {2}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Analyst,Αναλυτής
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +149,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Γραμμή {0}: Το ποσό που διατίθεται {1} πρέπει να είναι μικρότερο ή ίσο με το ποσό κε {2}
 DocType: Item,Inventory,Απογραφή
 DocType: Features Setup,"To enable ""Point of Sale"" view",Για να ενεργοποιήσετε το &quot;Point of Sale&quot; προβολή
 apps/erpnext/erpnext/public/js/pos/pos.js +402,Payment cannot be made for empty cart,Η πληρωμή δεν μπορεί να γίνει για άδειο καλάθι
 DocType: Item,Sales Details,Λεπτομέρειες πωλήσεων
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +149,Pinning,Καρφίτσωμα
 DocType: Opportunity,With Items,Με Αντικείμενα
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,Στην ποσότητα
 DocType: Notification Control,Expense Claim Rejected,Η αξίωσης δαπανών απορρίφθηκε
 DocType: Sales Invoice,"The date on which next invoice will be generated. It is generated on submit.
 ",Η ημερομηνία κατά την οποία θα δημιουργηθεί το επόμενο τιμολόγιο. Παράγεται σε υποβάλει.
 DocType: Item Attribute,Item Attribute,Χαρακτηριστικό είδους
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +105,Government,Κυβέρνηση
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Government,Κυβέρνηση
 apps/erpnext/erpnext/config/stock.py +268,Item Variants,Παραλλαγές του Είδους
 DocType: Company,Services,Υπηρεσίες
 apps/erpnext/erpnext/accounts/report/financial_statements.py +147,Total ({0}),Σύνολο ({0})
 DocType: Cost Center,Parent Cost Center,Γονικό κέντρο κόστους
 DocType: Sales Invoice,Source,Πηγή
 DocType: Leave Type,Is Leave Without Pay,Είναι άδειας άνευ αποδοχών
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +186,No records found in the Payment table,Δεν βρέθηκαν εγγραφές στον πίνακα πληρωμών
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +405,Financial Year Start Date,Ημερομηνία έναρξης για τη χρήση 
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +133,No records found in the Payment table,Δεν βρέθηκαν εγγραφές στον πίνακα πληρωμών
+apps/erpnext/erpnext/public/js/setup_wizard.js +153,Financial Year Start Date,Ημερομηνία έναρξης για τη χρήση 
 DocType: Employee External Work History,Total Experience,Συνολική εμπειρία
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +100,Countersinking,Εκβάθυνσης
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +271,Packing Slip(s) cancelled,Το(α) δελτίο(α) συσκευασίας ακυρώθηκε(αν)
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +276,Packing Slip(s) cancelled,Το(α) δελτίο(α) συσκευασίας ακυρώθηκε(αν)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,Χρεώσεις μεταφοράς και προώθησης
 DocType: Material Request Item,Sales Order No,Αρ. παραγγελίας πώλησης 
 DocType: Item Group,Item Group Name,Όνομα ομάδας ειδών
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +50,Taken,Πάρθηκε
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,Πάρθηκε
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +66,Transfer Materials for Manufacture,Μεταφορά υλικών για μεταποίηση
 DocType: Pricing Rule,For Price List,Για τιμοκατάλογο
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +27,Executive Search,Αναζήτησης εκτελεστικού στελέχους
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,Αναζήτησης εκτελεστικού στελέχους
 apps/erpnext/erpnext/stock/stock_ledger.py +405,"Purchase rate for item: {0} not found, which is required to book accounting entry (expense). Please mention item price against a buying price list.","Η τιμή αγοράς για το είδος: {0} δεν βρέθηκε, η οποία είναι απαραίτητη για την λογιστική εγγραφή (δαπάνη). Παρακαλώ να αναφέρετε την τιμή του είδους με βάση κάποιο τιμοκατάλογο αγοράς."
 DocType: Maintenance Schedule,Schedules,Χρονοδιαγράμματα
 DocType: Purchase Invoice Item,Net Amount,Καθαρό Ποσό
 DocType: Purchase Order Item Supplied,BOM Detail No,Αρ. Λεπτομερειών Λ.Υ. 
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),Πρόσθετες ποσό έκπτωσης (Εταιρεία νομίσματος)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +537,Error: {0} > {1},Σφάλμα: {0} > {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +541,Error: {0} > {1},Σφάλμα: {0} > {1}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,Παρακαλώ να δημιουργήσετε νέο λογαριασμό από το λογιστικό σχέδιο.
 DocType: Maintenance Visit,Maintenance Visit,Επίσκεψη συντήρησης
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer > Customer Group > Territory,Πελάτης> ομάδα πελατών > περιοχή
@@ -1319,7 +1276,6 @@
 DocType: Event,Tuesday,Τρίτη
 DocType: Leave Block List,Block Holidays on important days.,Αποκλεισμός αδειών στις σημαντικές ημέρες.
 ,Accounts Receivable Summary,Σύνοψη εισπρακτέων λογαριασμών 
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +43,Leaves for type {0} already allocated for Employee {1} for period {2} - {3},Φύλλα για τον τύπο {0} έχει ήδη διατεθεί υπάλληλου {1} για χρονικό διάστημα {2} - {3}
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +187,Please set User ID field in an Employee record to set Employee Role,Παρακαλώ ορίστε το πεδίο ID χρήστη σε μια εγγραφή υπαλλήλου για να ρυθμίσετε το ρόλο του υπαλλήλου
 DocType: UOM,UOM Name,Όνομα Μ.Μ.
 DocType: Top Bar Item,Target,Στόχος
@@ -1331,15 +1287,14 @@
 DocType: ToDo,Due Date,Ημερομηνία λήξης προθεσμίας
 DocType: Sales Invoice Item,Brand Name,Εμπορική επωνυμία
 DocType: Purchase Receipt,Transporter Details,Λεπτομέρειες Transporter
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Box,Κουτί
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +389,The Organization,Ο οργανισμός
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Box,Κουτί
+apps/erpnext/erpnext/public/js/setup_wizard.js +137,The Organization,Ο οργανισμός
 DocType: Monthly Distribution,Monthly Distribution,Μηνιαία διανομή
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,Η λίστα παραλήπτη είναι άδεια. Παρακαλώ δημιουργήστε λίστα παραλήπτη
 DocType: Production Plan Sales Order,Production Plan Sales Order,Παραγγελία πώλησης σχεδίου παραγωγής
 DocType: Sales Partner,Sales Partner Target,Στόχος συνεργάτη πωλήσεων
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},Λογιστική καταχώριση για {0} μπορεί να γίνει μόνο στο νόμισμα: {1}
 DocType: Pricing Rule,Pricing Rule,Κανόνας τιμολόγησης
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +58,Notching,Σκάλισμα
 apps/erpnext/erpnext/config/learn.py +167,Material Request to Purchase Order,Υλικό αίτηση για αγορά Παραγγελία
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +74,Row # {0}: Returned Item {1} does not exists in {2} {3},Σειρά # {0}: επιστρεφόμενο στοιχείο {1} δεν υπάρχει σε {2} {3}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,Τραπεζικοί λογαριασμοί
@@ -1356,20 +1311,19 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Amounts not reflected in bank,Τα ποσά που δεν αντικατοπτρίζονται στην τράπεζα
 DocType: Quality Inspection Reading,Reading 4,Μέτρηση 4
 apps/erpnext/erpnext/config/hr.py +23,Claims for company expense.,Απαιτήσεις εις βάρος της εταιρείας.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +8,Centrifugal casting,Φυγοκεντρική χύτευση
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +119,Magnetic field-assisted finishing,Το μαγνητικό πεδίο με τη βοήθεια φινίρισμα
 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,Αριθμός κινητού επαφής
 DocType: Production Planning Tool,Select Sales Orders,Επιλέξτε παραγγελίες πώλησης
 ,Material Requests for which Supplier Quotations are not created,Αιτήσεις υλικού για τις οποίες δεν έχουν δημιουργηθεί προσφορές προμηθευτή
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +117,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,Η ημέρα (ες) για την οποία υποβάλλετε αίτηση για άδεια είναι αργίες. Δεν χρειάζεται να ζητήσει άδεια.
 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.,Παρακολούθηση ειδών με barcode. Είναι δυνατή η εισαγωγή ειδών στο δελτίο αποστολής και στο τιμολόγιο πώλησης με σάρωση του barcode των ειδών.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +477,Mark as Delivered,Επισήμανση ως Δημοσιεύθηκε
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +497,Mark as Delivered,Επισήμανση ως Δημοσιεύθηκε
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +34,Make Quotation,Κάντε Προσφορά
 DocType: Dependent Task,Dependent Task,Εξαρτημένη Εργασία
-apps/erpnext/erpnext/stock/doctype/item/item.py +306,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 +141,Leave of type {0} cannot be longer than {1},Η άδεια του τύπου {0} δεν μπορεί να είναι μεγαλύτερη από {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +310,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 +155,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,Λίστα παραλήπτη
@@ -1377,15 +1331,14 @@
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Ποσό που καταναλώθηκε
 apps/erpnext/erpnext/public/js/pos/pos.js +491,{0} View,{0} Προβολή
 DocType: Salary Structure Deduction,Salary Structure Deduction,Παρακρατήσεις στο μισθολόγιο
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +158,Selective laser sintering,Επιλεκτική πυροσυσσωμάτωση λέιζερ
-apps/erpnext/erpnext/stock/doctype/item/item.py +301,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Η μονάδα μέτρησης {0} έχει εισαχθεί περισσότερες από μία φορές στον πίνακας παραγόντων μετατροπής
+apps/erpnext/erpnext/stock/doctype/item/item.py +305,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Η μονάδα μέτρησης {0} έχει εισαχθεί περισσότερες από μία φορές στον πίνακας παραγόντων μετατροπής
 apps/frappe/frappe/core/page/data_import_tool/data_import_tool.js +108,Import Successful!,Εισαγωγή επιτυχής!
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Κόστος ειδών που εκδόθηκαν
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +185,Quantity must not be more than {0},Η ποσότητα δεν πρέπει να είναι μεγαλύτερη από {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +41,Age (Days),Ηλικία (ημέρες)
 DocType: Quotation Item,Quotation Item,Είδος προσφοράς
 DocType: Account,Account Name,Όνομα λογαριασμού
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +41,From Date cannot be greater than To Date,Από την ημερομηνία αυτή δεν μπορεί να είναι μεταγενέστερη από την έως ημερομηνία
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +34,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.,Κύρια εγγραφή τύπου προμηθευτή.
 DocType: Purchase Order Item,Supplier Part Number,Αριθμός εξαρτήματος του προμηθευτή
@@ -1394,14 +1347,14 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +247,{0} {1} is cancelled or stopped,{0} {1} ακυρωθεί ή σταματήσει
 DocType: Accounts Settings,Credit Controller,Ελεγκτής πίστωσης
 DocType: Delivery Note,Vehicle Dispatch Date,Ημερομηνία κίνησης οχήματος
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +197,Purchase Receipt {0} is not submitted,Το αποδεικτικό παραλαβής αγοράς {0} δεν έχει υποβληθεί
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +198,Purchase Receipt {0} is not submitted,Το αποδεικτικό παραλαβής αγοράς {0} δεν έχει υποβληθεί
 DocType: Company,Default Payable Account,Προεπιλεγμένος λογαριασμός πληρωτέων
 apps/erpnext/erpnext/config/website.py +13,"Settings for online shopping cart such as shipping rules, price list etc.","Ρυθμίσεις για το online καλάθι αγορών, όπως οι κανόνες αποστολής, ο τιμοκατάλογος κλπ"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +660,Setup Complete,Η εγκατάσταση ολοκληρώθηκε
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +124,Setup Complete,Η εγκατάσταση ολοκληρώθηκε
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +65,{0}% Billed,{0}% Χρεώθηκαν
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +17,Reserved Qty,Δεσμευμένη ποσότητα 
 DocType: Party Account,Party Account,Λογαριασμός συμβαλλόμενου
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +74,Human Resources,Ανθρώπινοι πόροι
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +74,Human Resources,Ανθρώπινοι πόροι
 DocType: Lead,Upper Income,Άνω εισοδήματος
 DocType: Journal Entry Account,Debit in Company Currency,Χρεωστικές στην Εταιρεία Νόμισμα
 apps/erpnext/erpnext/support/doctype/issue/issue.py +58,My Issues,Θέματα Μου
@@ -1410,11 +1363,9 @@
 DocType: Company,Default Values,Προεπιλεγμένες Τιμές
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +236,Row {0}: Payment amount can not be negative,Γραμμή {0}:το ποσό πληρωμής δεν μπορεί να είναι αρνητικό
 DocType: Expense Claim,Total Amount Reimbursed,Συνολικού ποσού που αποδόθηκε
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +152,Press fitting,Πατήστε τοποθέτηση
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +64,Against Supplier Invoice {0} dated {1},Κατά το τιμολόγιο προμηθευτή {0} της {1}
 DocType: Customer,Default Price List,Προεπιλεγμένος τιμοκατάλογος
 DocType: Payment Reconciliation,Payments,Πληρωμές
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +24,Hot isostatic pressing,Hot ισοστατική συμπίεση
 DocType: ToDo,Medium,Μέσο
 DocType: Budget Detail,Budget Allocated,Προϋπολογισμός που διατέθηκε
 DocType: Journal Entry,Entry Type,Τύπος εισόδου
@@ -1427,9 +1378,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +56,None of the items have any change in quantity or value.,Κανένα από τα στοιχεία που έχουν οποιαδήποτε μεταβολή στην ποσότητα ή την αξία.
 DocType: Warranty Claim,Warranty Claim,Αξίωση εγγύησης
 ,Lead Details,Λεπτομέρειες επαφής
-DocType: Authorization Rule,Approving User,Εγκρίνων χρήστης
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +37,Forging,Σφυρηλάτηση
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +126,Plating,Επιμετάλλωση
 DocType: Purchase Invoice,End date of current invoice's period,Ημερομηνία λήξης της περιόδου του τρέχοντος τιμολογίου
 DocType: Pricing Rule,Applicable For,Εφαρμοστέο για
 DocType: Bank Reconciliation,From Date,Από ημερομηνία
@@ -1451,31 +1399,29 @@
 DocType: Sales Invoice,Paid Amount (Company Currency),Ποσού που καταβλήθηκε (Εταιρεία νομίσματος)
 DocType: Purchase Invoice,Additional Discount,Επιπλέον έκπτωση
 DocType: Selling Settings,Selling Settings,Ρυθμίσεις πώλησης
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +39,Online Auctions,Online δημοπρασίες
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,Online δημοπρασίες
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +94,Please specify either Quantity or Valuation Rate or both,Παρακαλώ ορίστε είτε ποσότητα ή τιμή αποτίμησης ή και τα δύο
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +50,"Company, Month and Fiscal Year is mandatory","Η εταιρεία, ο μήνας και η χρήση είναι απαραίτητα"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Marketing Expenses,Δαπάνες marketing
 ,Item Shortage Report,Αναφορά έλλειψης είδους 
-apps/erpnext/erpnext/stock/doctype/item/item.js +183,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Το βάρος αναφέρεται, \nπαρακαλώ, αναφέρετε επίσης και τη μονάδα μέτρησης βάρους'"
+apps/erpnext/erpnext/stock/doctype/item/item.js +185,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Το βάρος αναφέρεται, \nπαρακαλώ, αναφέρετε επίσης και τη μονάδα μέτρησης βάρους'"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,Αίτηση υλικού που χρησιμοποιείται για να γίνει αυτήν η καταχώρnση αποθέματος
 apps/erpnext/erpnext/config/support.py +43,Single unit of an Item.,Μία μονάδα ενός είδους
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +212,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 +384,Warehouse required at Row No {0},Αποθήκη απαιτείται κατά Row Όχι {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +386,Warehouse required at Row No {0},Αποθήκη απαιτείται κατά Row Όχι {0}
 DocType: Employee,Date Of Retirement,Ημερομηνία συνταξιοδότησης
 DocType: Upload Attendance,Get Template,Βρες πρότυπο
 DocType: Address,Postal,Ταχυδρομικός
 DocType: Item,Weightage,Ζύγισμα
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +159,Mining,Εξόρυξη
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +17,Resin casting,Ρητίνη χύτευσης
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,Μια ομάδα πελατών υπάρχει με το ίδιο όνομα παρακαλώ να αλλάξετε το όνομα του πελάτη ή να μετονομάσετε την ομάδα πελατών 
 apps/erpnext/erpnext/public/js/pos/pos.js +147,Please select {0} first.,Παρακαλώ επιλέξτε {0} πρώτα 
 apps/erpnext/erpnext/templates/pages/order.html +57,text {0},κειμένου {0}
 DocType: Territory,Parent Territory,Έδαφος μητρική
 DocType: Quality Inspection Reading,Reading 2,Μέτρηση 2
 DocType: Stock Entry,Material Receipt,Παραλαβή υλικού
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +622,Products,Προϊόντα
+apps/erpnext/erpnext/public/js/setup_wizard.js +358,Products,Προϊόντα
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +47,Party Type and Party is required for Receivable / Payable account {0},Ο τύπος συμβαλλομένου και ο συμβαλλόμενος είναι απαραίτητα για τον λογαριασμό εισπρακτέων / πληρωτέων {0}
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.","Εάν αυτό το στοιχείο έχει παραλλαγές, τότε δεν μπορεί να επιλεγεί σε εντολές πώλησης κ.λπ."
 DocType: Lead,Next Contact By,Επόμενη επικοινωνία από
@@ -1485,13 +1431,13 @@
 DocType: Purchase Invoice,Notification Email Address,Διεύθυνση email ενημερώσεων
 DocType: Payment Tool,Find Invoices to Match,Βρείτε τιμολόγια Match
 ,Item-wise Sales Register,Ταμείο πωλήσεων ανά είδος
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +399,"e.g. ""XYZ National Bank""","Π.Χ. ""Xyz εθνική τράπεζα """
+apps/erpnext/erpnext/public/js/setup_wizard.js +147,"e.g. ""XYZ National Bank""","Π.Χ. ""Xyz εθνική τράπεζα """
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,Ο φόρος αυτός περιλαμβάνεται στη βασική τιμή;
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +57,Total Target,Σύνολο στόχου
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Target,Σύνολο στόχου
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.js +22,Shopping Cart is enabled,Καλάθι Αγορών είναι ενεργοποιημένη
 DocType: Job Applicant,Applicant for a Job,Αιτών εργασία
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +173,No Production Orders created,Δεν δημιουργήθηκαν εντολές παραγωγής
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +131,Salary Slip of employee {0} already created for this month,Η βεβαίωση αποδοχών του υπαλλήλου {0} έχει ήδη δημιουργηθεί για αυτό το μήνα
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +140,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.,Πάρα πολλές στήλες. Εξάγετε την έκθεση για να την εκτυπώσετε χρησιμοποιώντας μια εφαρμογή λογιστικών φύλλων.
 DocType: Sales Invoice Item,Batch No,Αρ. Παρτίδας
@@ -1501,14 +1447,14 @@
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +13,Variant,Παραλλαγή
 apps/frappe/frappe/public/js/frappe/form/toolbar.js +165,New {0},Νέο {0}
 DocType: Naming Series,Set prefix for numbering series on your transactions,Ορίστε πρόθεμα για τη σειρά αρίθμησης για τις συναλλαγές σας
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +169,Stopped order cannot be cancelled. Unstop to cancel.,Μια σταματημένη παραγγελία δεν μπορεί να ακυρωθεί. Συνεχίστε την προκειμένου να την ακυρώσετε.
-apps/erpnext/erpnext/stock/doctype/item/item.py +323,Default BOM ({0}) must be active for this item or its template,Προεπιλογή BOM ({0}) πρέπει να είναι ενεργή για αυτό το στοιχείο ή το πρότυπο της
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +164,Stopped order cannot be cancelled. Unstop to cancel.,Μια σταματημένη παραγγελία δεν μπορεί να ακυρωθεί. Συνεχίστε την προκειμένου να την ακυρώσετε.
+apps/erpnext/erpnext/stock/doctype/item/item.py +327,Default BOM ({0}) must be active for this item or its template,Προεπιλογή BOM ({0}) πρέπει να είναι ενεργή για αυτό το στοιχείο ή το πρότυπο της
 DocType: Employee,Leave Encashed?,Η άδεια εισπράχθηκε;
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Το πεδίο 'ευκαιρία από' είναι υποχρεωτικό
 DocType: Item,Variants,Παραλλαγές
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +458,Make Purchase Order,Δημιούργησε παραγγελία αγοράς
 DocType: SMS Center,Send To,Αποστολή προς
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +111,There is not enough leave balance for Leave Type {0},Δεν υπάρχει αρκετό υπόλοιπο άδειας για άδειες τύπου {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +127,There is not enough leave balance for Leave Type {0},Δεν υπάρχει αρκετό υπόλοιπο άδειας για άδειες τύπου {0}
 DocType: Sales Team,Contribution to Net Total,Συμβολή στο καθαρό σύνολο
 DocType: Sales Invoice Item,Customer's Item Code,Κωδικός είδους πελάτη
 DocType: Stock Reconciliation,Stock Reconciliation,Συμφωνία αποθέματος
@@ -1545,11 +1491,11 @@
 DocType: Sales Order Item,Actual Qty,Πραγματική ποσότητα
 DocType: Sales Invoice Item,References,Παραπομπές
 DocType: Quality Inspection Reading,Reading 10,Μέτρηση 10
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +612,"List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start.","Απαριθμήστε προϊόντα ή υπηρεσίες που αγοράζετε ή πουλάτε. Σιγουρέψτε πως έχει επιλεγεί η ομάδα εϊδους, η μονάδα μέτρησης και οι άλλες ιδιότητες όταν ξεκινάτε. "
+apps/erpnext/erpnext/public/js/setup_wizard.js +348,"List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start.","Απαριθμήστε προϊόντα ή υπηρεσίες που αγοράζετε ή πουλάτε. Σιγουρέψτε πως έχει επιλεγεί η ομάδα εϊδους, η μονάδα μέτρησης και οι άλλες ιδιότητες όταν ξεκινάτε. "
 DocType: Hub Settings,Hub Node,Κόμβος Hub 
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,Έχετε εισάγει διπλότυπα στοιχεία. Παρακαλώ διορθώστε και δοκιμάστε ξανά.
 apps/erpnext/erpnext/controllers/item_variant.py +65,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values,Αξία {0} για Χαρακτηριστικό {1} δεν υπάρχει στη λίστα των έγκυρων τιμές παραμέτρων στοιχείου
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +87,Associate,Συνεργάτης
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Associate,Συνεργάτης
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +46,Item {0} is not a serialized Item,Το είδος {0} δεν είναι είδος μίας σειράς
 DocType: SMS Center,Create Receiver List,Δημιουργία λίστας παραλήπτη
 apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +5,Expired,Έληξε
@@ -1558,7 +1504,7 @@
 DocType: Warranty Claim,Issue Date,Ημερομηνία έκδοσης
 DocType: Activity Cost,Activity Cost,Δραστηριότητα Κόστους
 DocType: Purchase Receipt Item Supplied,Consumed Qty,Ποσότητα που καταναλώθηκε
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +52,Telecommunications,Τηλεπικοινωνίες
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +52,Telecommunications,Τηλεπικοινωνίες
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),Δηλώνει ότι το συσκευασία είναι ένα μέρος αυτής της παράδοσης (μόνο πρόχειρο)
 DocType: Payment Tool,Make Payment Entry,Δημιούργησε καταχώηρση πληρωμής
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +119,Quantity for Item {0} must be less than {1},Η ποσότητα για το είδος {0} πρέπει να είναι λιγότερη από {1}
@@ -1575,10 +1521,8 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +37,"Selling must be checked, if Applicable For is selected as {0}","Η πώληση πρέπει να επιλεγεί, αν είναι το πεδίο 'εφαρμοστέα για' έχει οριστεί ως {0}"
 DocType: Purchase Order Item,Supplier Quotation Item,Είδος της προσφοράς του προμηθευτή
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +27,Make Salary Structure,Δημιούργησε μισθολόγιο
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +54,Shearing,Κουρά
 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.,Κάντε κλικ στο δημιούργησε τιμολόγιο πώλησης για να δημιουργηθεί ένα νέο τιμολόγιο πώλησης.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +166,Packaging and labeling,Συσκευασία και επισήμανση
 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,Παρακαλώ ορίστε προεπιλεγμένο νόμισμα στην κύρια εγγραφή εταιρείας και τις γενικές προεπιλογές
@@ -1589,19 +1533,18 @@
 DocType: Budget Detail,Fiscal Year,Χρήση
 DocType: Cost Center,Budget,Προϋπολογισμός
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +41,"Budget cannot be assigned against {0}, as it's not an Income or Expense account","Ο προϋπολογισμός δεν μπορεί να αποδοθεί κατά {0}, δεδομένου ότι δεν είναι ένας λογαριασμός έσοδα ή έξοδα"
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Achieved,Επιτεύχθηκε
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,Επιτεύχθηκε
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +65,Territory / Customer,Περιοχή / πελάτης
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,e.g. 5,Π.Χ. 5
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +207,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},Γραμμή {0}: Το ποσό που διατίθεται {1} πρέπει να είναι μικρότερο ή ίσο με το οφειλόμενο ποσό του τιμολογίου {2}
+apps/erpnext/erpnext/public/js/setup_wizard.js +294,e.g. 5,Π.Χ. 5
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},Γραμμή {0}: Το ποσό που διατίθεται {1} πρέπει να είναι μικρότερο ή ίσο με το οφειλόμενο ποσό του τιμολογίου {2}
 DocType: Sales Invoice,In Words will be visible once you save the Sales Invoice.,Με λόγια θα είναι ορατά αφού αποθηκεύσετε το τιμολόγιο πώλησης.
 DocType: Item,Is Sales Item,Είναι είδος πώλησης
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,Δέντρο ομάδων ειδών
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,Το είδος {0} δεν είναι στημένο για σειριακούς αριθμούς. Ελέγξτε την κύρια εγγραφή είδους
 DocType: Maintenance Visit,Maintenance Time,Ώρα συντήρησης
 ,Amount to Deliver,Ποσό Παράδοση
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +620,A Product or Service,Ένα προϊόν ή υπηρεσία
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +158,There were errors.,Υπήρχαν σφάλματα.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +101,Tapping,Τρύπημα
+apps/erpnext/erpnext/public/js/setup_wizard.js +356,A Product or Service,Ένα προϊόν ή υπηρεσία
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +146,There were errors.,Υπήρχαν σφάλματα.
 DocType: Naming Series,Current Value,Τρέχουσα αξία
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +171,{0} created,{0} Δημιουργήθηκε
 DocType: Delivery Note Item,Against Sales Order,Κατά την παραγγελία πώλησης
@@ -1615,7 +1558,7 @@
 apps/erpnext/erpnext/accounts/party.py +275,Due Date cannot be before Posting Date,Η ημερομηνία λήξης προθεσμίας δεν μπορεί να είναι πριν από την ημερομηνία αποστολής
 DocType: Website Item Group,Website Item Group,Ομάδα ειδών δικτυακού τόπου 
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Duties and Taxes,Δασμοί και φόροι
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Please enter Reference date,Παρακαλώ εισάγετε την ημερομηνία αναφοράς
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +312,Please enter Reference date,Παρακαλώ εισάγετε την ημερομηνία αναφοράς
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} εγγραφές πληρωμών δεν μπορεί να φιλτράρεται από {1}
 DocType: Item Website Specification,Table for Item that will be shown in Web Site,Πίνακας για το είδος που θα εμφανιστεί στην ιστοσελίδα
 DocType: Purchase Order Item Supplied,Supplied Qty,Παρεχόμενα Ποσότητα
@@ -1623,7 +1566,7 @@
 apps/erpnext/erpnext/config/stock.py +103,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,Ιστορικό αγορών ανά είδος 
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +152,Red,Κόκκινος
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Red,Κόκκινος
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +228,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},Παρακαλώ κάντε κλικ στο 'δημιουργία χρονοδιαγράμματος' για να δείτε τον σειριακό αριθμό που προστέθηκε για το είδος {0}
 DocType: Account,Frozen,Παγωμένα
 ,Open Production Orders,Ανοιχτές εντολές παραγωγής
@@ -1638,7 +1581,7 @@
 DocType: Item Attribute,Attribute Name,Χαρακτηριστικό όνομα
 apps/erpnext/erpnext/controllers/selling_controller.py +236,Item {0} must be Sales or Service Item in {1},Το είδος {0} πρέπει να είναι είδος πώλησης ή υπηρεσία στο {1}
 DocType: Item Group,Show In Website,Εμφάνιση στην ιστοσελίδα
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +621,Group,Ομάδα
+apps/erpnext/erpnext/public/js/setup_wizard.js +357,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","Για να παρακολουθήσετε brand name στην παρακάτω έγγραφα Δελτίου Αποστολής, το Opportunity, Αίτηση Υλικού, σημείο, παραγγελίας, αγοράς δελτίων, Αγοραστή Παραλαβή, Προσφορά, Τιμολόγιο Πώλησης, προϊόντων Bundle, Πωλήσεις Τάξης, Αύξων αριθμός"
@@ -1648,6 +1591,7 @@
 DocType: Features Setup,Brands,Εμπορικά σήματα
 DocType: C-Form Invoice Detail,Invoice No,Αρ. Τιμολογίου
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +480,From Purchase Order,Από παραγγελία αγοράς
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +92,"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,Ημερομηνία επιστολής παραίτησης
@@ -1655,35 +1599,31 @@
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +137,Not Set,Δεν έχει οριστεί
 DocType: Communication,Date,Ημερομηνία
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,Έσοδα επαναλαμβανόμενων πελατών
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +651,Sit tight while your system is being setup. This may take a few moments.,"Καθίστε ήρεμα, ενώ το σύστημά σας εγκαθίσταται. Αυτό μπορεί να διαρκέσει μερικά λεπτά."
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +115,Sit tight while your system is being setup. This may take a few moments.,"Καθίστε ήρεμα, ενώ το σύστημά σας εγκαθίσταται. Αυτό μπορεί να διαρκέσει μερικά λεπτά."
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +51,{0} ({1}) must have role 'Expense Approver',{0} ({1}) Πρέπει να έχει ρόλο «υπεύθυνος έγκρισης δαπανών»
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Pair,Ζεύγος
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Pair,Ζεύγος
 DocType: Bank Reconciliation Detail,Against Account,Κατά τον λογαριασμό
 DocType: Maintenance Schedule Detail,Actual Date,Πραγματική ημερομηνία
 DocType: Item,Has Batch No,Έχει αρ. Παρτίδας
 DocType: Delivery Note,Excise Page Number,Αριθμός σελίδας έμμεσης εσωτερικής φορολογίας 
 DocType: Employee,Personal Details,Προσωπικά στοιχεία
 ,Maintenance Schedules,Χρονοδιαγράμματα συντήρησης
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +44,Embossing,Ανάγλυφη
 ,Quotation Trends,Τάσεις προσφορών
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +139,Item Group not mentioned in item master for item {0},Η ομάδα είδους δεν αναφέρεται στην κύρια εγγραφή είδους για το είδος {0}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +302,Debit To account must be a Receivable account,Ο 'λογαριασμός χρέωσης προς' Χρέωση του λογαριασμού πρέπει να είναι λογαριασμός απαιτήσεων
-apps/erpnext/erpnext/stock/doctype/item/item.py +310,"As Production Order can be made for this item, it must be a stock item.","Εφόσον μπορεί να γίνει παραγωγής παραγγελίας για το συγκεκριμένο προϊόν, θα πρέπει να είναι ένα είδος αποθέματος."
 DocType: Shipping Rule Condition,Shipping Amount,Κόστος αποστολής
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +140,Joining,Συμμετοχή
-DocType: Authorization Rule,Above Value,Παραπάνω Αξία 
 ,Pending Amount,Ποσό που εκκρεμεί
 DocType: Purchase Invoice Item,Conversion Factor,Συντελεστής μετατροπής
 DocType: Purchase Order,Delivered,Παραδόθηκε
 apps/erpnext/erpnext/config/hr.py +160,Setup incoming server for jobs email id. (e.g. jobs@example.com),Ρύθμιση διακομιστή εισερχομένων για το email ID θέσης εργασίας. ( Π.Χ. Jobs@example.Com )
 DocType: Purchase Receipt,Vehicle Number,Αριθμός Οχημάτων
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,Η ημερομηνία κατά την οποία το επαναλαμβανόμενο τιμολόγιο θα σταματήσει
+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,Εισπρακτέοι λογαριασμοί
 ,Supplier-Wise Sales Analytics,Αναφορές πωλήσεων ανά προμηθευτή
 DocType: Address Template,This format is used if country specific format is not found,Αυτή η μορφοποίηση χρησιμοποιείται εάν δεν βρεθεί ειδική μορφοποίηση χώρας
 DocType: Custom Field,Custom,Προσαρμοσμένο
 DocType: Production Order,Use Multi-Level BOM,Χρησιμοποιήστε Λ.Υ. πολλαπλών επιπέδων.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +26,Injection molding,Έγχυση πλαστικού
 DocType: Bank Reconciliation,Include Reconciled Entries,Συμπεριέλαβε συμφωνημένες καταχωρήσεις
 apps/erpnext/erpnext/config/accounts.py +41,Tree of finanial accounts.,Δέντρο οικονομικών λογαριασμών.
 DocType: Leave Control Panel,Leave blank if considered for all employee types,Άφησε το κενό αν ισχύει για όλους τους τύπους των υπαλλήλων
@@ -1693,30 +1633,28 @@
 apps/frappe/frappe/config/setup.py +130,Printing,Εκτύπωση
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +114,Expense Claim is pending approval. Only the Expense Approver can update status.,Η αξίωση δαπανών είναι εν αναμονή έγκρισης. Μόνο ο υπεύθυνος έγκρισης δαπανών να ενημερώσει την κατάστασή της.
 DocType: Purchase Invoice,Additional Discount Amount,Πρόσθετες ποσό έκπτωσης
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +99,The day(s) on which you are applying for leave are holiday. You need not apply for leave.,Η μέρα ( ες) για την οποία(ες) υποβάλλεται αίτηση για άδεια είναι αργίες. Δεν χρειάζεται να υποβληθεί αίτηση για άδεια.
 apps/frappe/frappe/public/js/frappe/misc/utils.js +110,and,Και
 DocType: Leave Block List Allow,Leave Block List Allow,Επίτρεψε λίστα αποκλεισμού ημερών άδειας
 apps/erpnext/erpnext/setup/doctype/company/company.py +236,Abbr can not be blank or space,Συντ δεν μπορεί να είναι κενό ή χώρος
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +50,Sports,Αθλητισμός
+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/setup/page/setup_wizard/setup_wizard.js +626,Unit,Μονάδα
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Unit,Μονάδα
 apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.py +182,Please set Dropbox access keys in your site config,Παρακαλώ ορίστε τα κλειδιά πρόσβασης dropbox στις ρυθμίσεις του site σας
 apps/erpnext/erpnext/stock/get_item_details.py +113,Please specify Company,Παρακαλώ ορίστε εταιρεία
 ,Customer Acquisition and Loyalty,Απόκτηση πελατών και πίστη
 DocType: Purchase Receipt,Warehouse where you are maintaining stock of rejected items,Αποθήκη όπου θα γίνεται διατήρηση αποθέματος για απορριφθέντα στοιχεία
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +408,Your financial year ends on,Το οικονομικό έτος σας τελειώνει στις
+apps/erpnext/erpnext/public/js/setup_wizard.js +156,Your financial year ends on,Το οικονομικό έτος σας τελειώνει στις
 DocType: POS Profile,Price List,Τιμοκατάλογος
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +20,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0} Είναι τώρα η προεπιλεγμένη χρήση. Παρακαλώ ανανεώστε το πρόγραμμα περιήγησής σας για να τεθεί σε ισχύ η αλλαγή.
 apps/erpnext/erpnext/projects/doctype/project/project.js +47,Expense Claims,Απαιτήσεις Εξόδων
 DocType: Issue,Support,Υποστήριξη
-DocType: Authorization Rule,Approving Role,Εγκρίνων ρόλος
 ,BOM Search,BOM Αναζήτηση
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +176,Closing (Opening + Totals),Κλείσιμο (Άνοιγμα + Σύνολα)
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +26,Please specify currency in Company,Παρακαλώ ορίστε το νόμισμα στην εταιρεία
 DocType: Workstation,Wages per hour,Μισθοί ανά ώρα
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,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/controllers/accounts_controller.py +236,Account {0} is invalid. Account Currency must be {1},Ο Λογαριασμός {0} δεν είναι έγκυρη. Ο Λογαριασμός νομίσματος πρέπει να είναι {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +237,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}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +53,Clearance date cannot be before check date in row {0},Η ημερομηνία εκκαθάρισης δεν μπορεί να είναι πριν από την ημερομηνία ελέγχου στη γραμμή {0}
 DocType: Salary Slip,Deduction,Κρατήση
@@ -1735,13 +1673,13 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +82,Item {0} has already been returned,Το είδος {0} έχει ήδη επιστραφεί
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** Η χρήση ** αντιπροσωπεύει ένα οικονομικό έτος. Όλες οι λογιστικές εγγραφές και άλλες σημαντικές συναλλαγές παρακολουθούνται ανά ** χρήση **.
 DocType: Opportunity,Customer / Lead Address,Πελάτης / διεύθυνση επαφής
+apps/erpnext/erpnext/stock/doctype/item/item.py +112,Warning: Invalid SSL certificate on attachment {0},Προειδοποίηση: Μη έγκυρο πιστοποιητικό SSL στο συνημμένο {0}
 DocType: Production Order Operation,Actual Operation Time,Πραγματικός χρόνος λειτουργίας
 DocType: Authorization Rule,Applicable To (User),Εφαρμοστέα σε (user)
 DocType: Purchase Taxes and Charges,Deduct,Αφαίρεσε
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +170,Job Description,Περιγραφή Δουλειάς
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +170,Job Description,Περιγραφή Δουλειάς
 DocType: Purchase Order Item,Qty as per Stock UOM,Ποσότητα σύμφωνα με τη Μ.Μ. Αποθέματος
 apps/frappe/frappe/model/rename_doc.py +343,Please select a valid csv file with data,Παρακαλώ επιλέξτε ένα έγκυρο αρχείο csv με τα δεδομένα
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +92,Coating,Επένδυση
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +126,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Ειδικοί χαρακτήρες εκτός από ""-"", ""#"", ""."" and ""/"" δεν επιτρέπονται στην σειρά ονομασίας"
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Παρακολουθήστε εκστρατείες προώθησης των πωλήσεων. Παρακολουθήστε επαφές, προσφορές, παραγγελίες πωλήσεων κλπ από τις εκστρατείες στις οποίες πρέπει να γίνει μέτρηση της απόδοσης των επενδύσεων. "
 DocType: Expense Claim,Approver,Ο εγκρίνων
@@ -1751,12 +1689,11 @@
 DocType: Supplier Quotation,Manufacturing Manager,Υπεύθυνος παραγωγής
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +191,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/hooks.py +84,Shipments,Αποστολές
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +29,Dip molding,Βουτιά χύτευση
+apps/erpnext/erpnext/hooks.py +68,Shipments,Αποστολές
 DocType: Purchase Order,To be delivered to customer,Να παραδοθεί στον πελάτη
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,Η κατάσταση του αρχείου καταγραφής χρονολογίου πρέπει να υποβληθεί.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,Αύξων αριθμός {0} δεν ανήκουν σε καμία αποθήκη
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +650,Setting Up,Ρύθμιση...
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +114,Setting Up,Ρύθμιση...
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,Row # ,Γραμμή #
 DocType: Purchase Invoice,In Words (Company Currency),Με λόγια (νόμισμα της εταιρείας)
 DocType: Pricing Rule,Supplier,Προμηθευτής
@@ -1764,7 +1701,7 @@
 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 +166,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,"Ο λογαριασμός δαπάνης ή ποσό διαφοράς είναι απαραίτητος για το είδος {0}, καθώς επηρεάζουν τη συνολική αξία των αποθεμάτων"
-apps/erpnext/erpnext/controllers/accounts_controller.py +354,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","Δεν είναι δυνατή η υπερτιμολόγηση για το είδος {0} στη γραμμή {0} περισσότερο από {1}. Για να καταστεί δυνατή υπερτιμολογήσεων, ορίστε το στις ρυθμίσεις αποθέματος"
+apps/erpnext/erpnext/controllers/accounts_controller.py +355,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","Δεν είναι δυνατή η υπερτιμολόγηση για το είδος {0} στη γραμμή {0} περισσότερο από {1}. Για να καταστεί δυνατή υπερτιμολογήσεων, ορίστε το στις ρυθμίσεις αποθέματος"
 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 +135,User {0} is disabled,Ο χρήστης {0} είναι απενεργοποιημένος
@@ -1777,27 +1714,26 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,{0} is mandatory for Item {1},Η {0} είναι απαραίτητη για το είδος {1}
 DocType: Currency Exchange,From Currency,Από το νόμισμα
 DocType: DocField,Name,Όνομα
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +211,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Παρακαλώ επιλέξτε χορηγούμενο ποσό, τύπο τιμολογίου και αριθμό τιμολογίου σε τουλάχιστον μία σειρά"
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +104,Sales Order required for Item {0},Η παραγγελία πώλησης για το είδος {0} είναι απαραίτητη
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +158,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Παρακαλώ επιλέξτε χορηγούμενο ποσό, τύπο τιμολογίου και αριθμό τιμολογίου σε τουλάχιστον μία σειρά"
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +107,Sales Order required for Item {0},Η παραγγελία πώλησης για το είδος {0} είναι απαραίτητη
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +43,Amounts not reflected in system,Τα ποσά που δεν αντικατοπτρίζονται στο σύστημα
 DocType: Purchase Invoice Item,Rate (Company Currency),Τιμή (νόμισμα της εταιρείας)
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +40,Others,Άλλα
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +40,Others,Άλλα
 apps/erpnext/erpnext/templates/includes/product_page.js +80,Cannot find a matching Item. Please select some other value for {0}.,Δεν μπορείτε να βρείτε μια αντίστοιχη Θέση. Παρακαλούμε επιλέξτε κάποια άλλη τιμή για το {0}.
 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/frappe/frappe/core/doctype/doctype/boilerplate/controller_list.html +31,Completed,Ολοκληρώθηκε
 DocType: Web Form,Select DocType,Επιλέξτε τύπο εγγράφου
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +104,Broaching,Διάνοιξη
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +12,Banking,Κατάθεση
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,Κατάθεση
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +38,Please click on 'Generate Schedule' to get schedule,Παρακαλώ κάντε κλικ στο 'δημιουργία χρονοδιαγράμματος' για να δείτε το πρόγραμμα
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +283,New Cost Center,Νέο κέντρο κόστους
 DocType: Bin,Ordered Quantity,Παραγγελθείσα ποσότητα
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +397,"e.g. ""Build tools for builders""",Π.Χ. Χτίστε εργαλεία για τους κατασκευαστές '
+apps/erpnext/erpnext/public/js/setup_wizard.js +145,"e.g. ""Build tools for builders""",Π.Χ. Χτίστε εργαλεία για τους κατασκευαστές '
 DocType: Quality Inspection,In Process,Σε επεξεργασία
 DocType: Authorization Rule,Itemwise Discount,Έκπτωση ανά είδος
 DocType: Purchase Order Item,Reference Document Type,Αναφορά Τύπος εγγράφου
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +318,{0} against Sales Order {1},{0} κατά την παραγγελία πώλησης {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +320,{0} against Sales Order {1},{0} κατά την παραγγελία πώλησης {1}
 DocType: Account,Fixed Asset,Πάγιο
 apps/erpnext/erpnext/config/stock.py +283,Serialized Inventory,Απογραφή συνέχειες
 DocType: Activity Type,Default Billing Rate,Επιτόκιο Υπερημερίας Τιμολόγησης
@@ -1812,14 +1748,13 @@
 DocType: Purchase Invoice Item,Page Break,Αλλαγή σελίδας
 DocType: Production Order Operation,Pending,Εκκρεμής
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,Χρήστες που μπορούν να εγκρίνουν αιτήσεις για έναν συγκεκριμένο εργαζόμενο
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +33,You cannot change default UOM of Variant. To change default UOM for Variant change default UOM of the Template,Δεν μπορείτε να αλλάξετε το προεπιλεγμένο UOM της παραλλαγής. Για να αλλάξετε τις προεπιλεγμένες UOM για την παραλλαγή προεπιλογή αλλαγή UOM του προτύπου
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +50,Office Equipments,Εξοπλισμός γραφείου
 DocType: Purchase Invoice Item,Qty,Ποσότητα
 DocType: Fiscal Year,Companies,Εταιρείες
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +24,Electronics,Ηλεκτρονικά 
+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/support/doctype/maintenance_visit/maintenance_visit.js +18,From Maintenance Schedule,Από το πρόγραμμα συντήρησης
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +56,Full-time,Πλήρης απασχόληση
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +56,Full-time,Πλήρης απασχόληση
 DocType: Purchase Invoice,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.","Αν έχετε δημιουργήσει ένα πρότυπο πρότυπο στη φόροι επί των πωλήσεων και επιβαρύνσεις Πρότυπο, επιλέξτε ένα και κάντε κλικ στο κουμπί παρακάτω."
@@ -1831,11 +1766,12 @@
 DocType: Job Applicant,Job Opening,Άνοιγμα θέσης εργασίας
 DocType: Payment Reconciliation,Payment Reconciliation,Συμφωνία πληρωμής
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +154,Please select Incharge Person's name,Παρακαλώ επιλέξτε το όνομα υπευθύνου
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +51,Technology,Τεχνολογία
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,Τεχνολογία
 DocType: Offer Letter,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,Συνολικό ποσό που τιμολογήθηκε
 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.","Για να προσθέσετε θυγατρικούς κόμβους, εξερευνήστε το δέντρο και κάντε κλικ στο κόμβο κάτω από τον οποίο θέλετε να προσθέσετε περισσότερους κόμβους."
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +102,Credit To account must be a Payable account,Ο λογαριασμός πίστωσης πρέπει να είναι πληρωτέος λογαριασμός
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +233,BOM recursion: {0} cannot be parent or child of {2},Αναδρομή Λ.Υ.: {0} δεν μπορεί να είναι γονέας ή τέκνο της {2}
@@ -1848,10 +1784,8 @@
 DocType: Item,Customer Item Codes,Θέση Πελάτη Κώδικες
 DocType: Opportunity,Lost Reason,Αιτιολογία απώλειας
 apps/erpnext/erpnext/config/accounts.py +68,Create Payment Entries against Orders or Invoices.,Δημιουργήστε καταχωρήσεις πληρωμή κατά παραγγελίες ή τιμολόγια.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +141,Welding,Συγκόλλησης
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +40,New Stock UOM is required,Απαιτείται νέα Μ.Μ.Αποθέματος 
 DocType: Quality Inspection,Sample Size,Μέγεθος δείγματος
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +443,All items have already been invoiced,Όλα τα είδη έχουν ήδη τιμολογηθεί
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +446,All items have already been invoiced,Όλα τα είδη έχουν ήδη τιμολογηθεί
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',Καθορίστε μια έγκυρη τιμή στο πεδίο 'από τον αρ. Υπόθεσης' 
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +287,Further cost centers can be made under Groups but entries can be made against non-Groups,"Περαιτέρω κέντρα κόστους μπορεί να γίνει κάτω από ομάδες, αλλά εγγραφές μπορούν να γίνουν με την μη Ομάδες"
 DocType: Project,External,Εξωτερικός
@@ -1863,8 +1797,7 @@
 DocType: Bin,Actual Quantity,Πραγματική ποσότητα
 DocType: Shipping Rule,example: Next Day Shipping,Παράδειγμα: αποστολή την επόμενη μέρα
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,Ο σειριακός αριθμός {0} δεν βρέθηκε
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +563,Your Customers,Οι πελάτες σας
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +27,Compression molding,Χύτευση με συμπίεση
+apps/erpnext/erpnext/public/js/setup_wizard.js +303,Your Customers,Οι πελάτες σας
 DocType: Leave Block List Date,Block Date,Αποκλεισμός ημερομηνίας
 DocType: Sales Order,Not Delivered,Δεν έχει παραδοθεί
 ,Bank Clearance Summary,Περίληψη εκκαθάρισης τράπεζας
@@ -1885,10 +1818,10 @@
 DocType: SMS Log,Sent To,Αποστέλλονται
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +28,Make Sales Invoice,Δημιούργησε τιμολόγιο πώλησης
 DocType: Company,For Reference Only.,Για αναφορά μόνο.
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +29,Invalid {0}: {1},Άκυρη {0}: {1}
+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,Σχεδιασμός Χωρητικότητα
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +49,'From Date' is required,"To πεδίο ""από ημερομηνία"" είναι απαραίτητο."
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +43,'From Date' is required,"To πεδίο ""από ημερομηνία"" είναι απαραίτητο."
 DocType: Journal Entry,Reference Number,Αριθμός αναφοράς
 DocType: Employee,Employment Details,Λεπτομέρειες απασχόλησης
 DocType: Employee,New Workplace,Νέος χώρος εργασίας
@@ -1903,7 +1836,7 @@
 DocType: Serial No,Delivery Time,Χρόνος παράδοσης
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Γήρανση με βάση την
 DocType: Item,End of Life,Τέλος της ζωής
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +41,Travel,Ταξίδι
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +41,Travel,Ταξίδι
 DocType: Leave Block List,Allow Users,Επίστρεψε χρήστες
 DocType: Purchase Order,Customer Mobile No,Κινητό αριθ Πελατών
 DocType: Sales Invoice,Recurring,Επαναλαμβανόμενες
@@ -1917,7 +1850,7 @@
 DocType: Naming Series,User must always select,Ο χρήστης πρέπει πάντα να επιλέγει
 DocType: Stock Settings,Allow Negative Stock,Επίτρεψε αρνητικό απόθεμα
 DocType: Installation Note,Installation Note,Σημείωση εγκατάστασης
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +541,Add Taxes,Προσθήκη φόρων
+apps/erpnext/erpnext/public/js/setup_wizard.js +283,Add Taxes,Προσθήκη φόρων
 ,Financial Analytics,Χρηματοοικονομικές αναφορές
 DocType: Quality Inspection,Verified By,Πιστοποιημένο από
 DocType: Address,Subsidiary,Θυγατρική
@@ -1927,7 +1860,6 @@
 DocType: System Settings,In Hours,Σε ώρες
 DocType: Process Payroll,Create Salary Slip,Δημιουργία βεβαίωσης αποδοχών
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Expected balance as per bank,Αναμενόμενο υπόλοιπο κατά τράπεζα
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +115,Buffing,Buffing
 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,Υπάλληλος
@@ -1944,11 +1876,11 @@
 DocType: Rename Tool,File to Rename,Αρχείο μετονομασίας
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +176,Purchse Order number required for Item {0},Ο αριθμός παραγγελίας αγοράς για το είδος {0} είναι απαραίτητος
 apps/erpnext/erpnext/public/js/controllers/transaction.js +136,Show Payments,Εμφάνιση Πληρωμές
-apps/erpnext/erpnext/controllers/buying_controller.py +245,Specified BOM {0} does not exist for Item {1},Η συγκεκριμμένη Λ.Υ. {0} δεν υπάρχει για το είδος {1}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +202,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Το χρονοδιάγραμμα συντήρησης {0} πρέπει να ακυρωθεί πριν από την ακύρωση αυτής της παραγγελίας πώλησης
+apps/erpnext/erpnext/controllers/buying_controller.py +236,Specified BOM {0} does not exist for Item {1},Η συγκεκριμμένη Λ.Υ. {0} δεν υπάρχει για το είδος {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Το χρονοδιάγραμμα συντήρησης {0} πρέπει να ακυρωθεί πριν από την ακύρωση αυτής της παραγγελίας πώλησης
 apps/frappe/frappe/desk/page/backups/backups.html +13,Size,Μέγεθος
 DocType: Notification Control,Expense Claim Approved,Εγκρίθηκε η αξίωση δαπανών 
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +113,Pharmaceutical,Φαρμακευτικός
+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,Η παραγγελία πώλησης είναι απαραίτητη
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +30,Create Customer,Δημιουργία πελάτη
@@ -1958,7 +1890,6 @@
 DocType: Quality Inspection Reading,Reading 9,Μέτρηση 9
 DocType: Supplier,Is Frozen,Είναι Κατεψυγμένα
 DocType: Buying Settings,Buying Settings,Ρυθμίσεις αγοράς
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +122,Mass finishing,Μαζικού τελειώματος
 DocType: Stock Entry Detail,BOM No. for a Finished Good Item,Αρ. Λ.Υ. Για ένα τελικό καλό είδος
 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),Ρύθμιση διακομιστή εισερχομένων για το email ID πωλήσεων. ( Π.Χ. Sales@example.Com )
@@ -1966,7 +1897,7 @@
 DocType: Payment Tool,Payment Account,Λογαριασμός πληρωμών
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +713,Please specify Company to proceed,Παρακαλώ ορίστε εταιρεία για να προχωρήσετε
 apps/frappe/frappe/public/js/frappe/model/indicator.js +30,Draft,Προσχέδιο
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +46,Compensatory Off,Αντισταθμιστικά απενεργοποιημένα
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Compensatory Off,Αντισταθμιστικά απενεργοποιημένα
 DocType: Quality Inspection Reading,Accepted,Αποδεκτό
 DocType: User,Female,Γυναίκα
 DocType: Journal Entry Account,Debit in Account Currency,Χρέωση του λογαριασμού Νόμισμα
@@ -1978,7 +1909,7 @@
 DocType: Shipping Rule,Shipping Rule Label,Ετικέτα κανόνα αποστολής
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +209,Raw Materials cannot be blank.,Το πεδίο πρώτων ύλών δεν μπορεί να είναι κενό.
 DocType: Newsletter,Test,Δοκιμή
-apps/erpnext/erpnext/stock/doctype/item/item.py +364,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +368,"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'","Δεδομένου ότι υπάρχουν χρηματιστηριακές συναλλαγές για αυτό το προϊόν, \ δεν μπορείτε να αλλάξετε τις τιμές των «Έχει Αύξων αριθμός», «Έχει Παρτίδα No», «Είναι αναντικατάστατο» και «Μέθοδος αποτίμησης»"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +448,Quick Journal Entry,Γρήγορη Εφημερίδα Είσοδος
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +92,You can not change rate if BOM mentioned agianst any item,"Δεν μπορείτε να αλλάξετε τιμοκατάλογο, αν η λίστα υλικών αναφέρεται σε οποιουδήποτε είδος"
@@ -1989,13 +1920,14 @@
 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.,Μια ξεχωριστή εντολή παραγωγής θα δημιουργηθεί για κάθε τελικό καλό είδος.
 DocType: Purchase Invoice,Terms and Conditions1,Όροι και προϋποθέσεις 1
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +18,Complete Setup,Ολοκλήρωση της εγκατάστασης
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard_page.html +18,Complete Setup,Ολοκλήρωση της εγκατάστασης
 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),Επιλέξτε αυτό για να απαγορεύσετε κλάσματα. (Όσον αφορά τους αριθμούς)
 apps/erpnext/erpnext/config/crm.py +96,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 +57,Total Absent,Σύνολο απόντων
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +746,Item or Warehouse for row {0} does not match Material Request,Το είδος ή η αποθήκη για την γραμμή {0} δεν ταιριάζει στην αίτηση υλικού
@@ -2020,16 +1952,15 @@
 DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),Βασική Τιμή (σύμφωνα Χρηματιστήριο UOM)
 DocType: SMS Log,No of Requested SMS,Αρ. SMS που ζητήθηκαν
 DocType: Campaign,Campaign-.####,Εκστρατεία-.####
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +55,Piercing,Διάτρηση
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,Επόμενα βήματα
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +117,Contract End Date must be greater than Date of Joining,"Η ημερομηνία λήξης της σύμβασης πρέπει να είναι μεγαλύτερη από ό, τι ημερομηνία ενώνουμε"
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,"Ένα τρίτο μέρος διανομέας / αντιπρόσωπος / πράκτορας με προμήθεια / affiliate / μεταπωλητής, ο οποίος πωλεί τα προϊόντα της εταιρείας για μια προμήθεια."
 DocType: Customer Group,Has Child Node,Έχει θυγατρικό κόμβο
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{0} against Purchase Order {1},{0} κατά την παραγγελία αγορών {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +332,{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, password = 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/page/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,Eύρος γήρανσης 1
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +110,Photochemical machining,Φωτοχημική κατεργασία
 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.
 
 #### Note
@@ -2075,7 +2006,7 @@
 DocType: Purchase Receipt Item,Recd Quantity,Ποσότητα που παραλήφθηκε
 DocType: Email Account,Email Ids,Email ταυτότητες
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},Δεν γίνεται να παραχθούν είδη {0} περισσότερα από την ποσότητα παραγγελίας πώλησης {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +471,Stock Entry {0} is not submitted,Χρηματιστήριο Έναρξη {0} δεν έχει υποβληθεί
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +473,Stock Entry {0} is not submitted,Χρηματιστήριο Έναρξη {0} δεν έχει υποβληθεί
 DocType: Payment Reconciliation,Bank / Cash Account,Λογαριασμός καταθέσεων σε τράπεζα / μετρητών
 DocType: Tax Rule,Billing City,Πόλη Τιμολόγησης
 DocType: Global Defaults,Hide Currency Symbol,Απόκρυψη συμβόλου νομίσματος
@@ -2091,7 +2022,7 @@
 DocType: Purchase Invoice,Currency and Price List,Νόμισμα και τιμοκατάλογος
 DocType: Opportunity,Customer / Lead Name,Πελάτης / όνομα επαφής
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +63,Clearance Date not mentioned,Δεν αναφέρεται ημερομηνία εκκαθάρισης
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +71,Production,Παραγωγή
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Production,Παραγωγή
 DocType: Item,Allow Production Order,Επίτρεψε εντολής παραγωγής
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +60,Row {0}:Start Date must be before End Date,Γραμμή {0} : η ημερομηνία έναρξης πρέπει να είναι προγενέστερη της ημερομηνίας λήξης
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Σύνολο (ποσότητα)
@@ -2104,7 +2035,7 @@
 apps/erpnext/erpnext/utilities/doctype/address/address.py +113,My Addresses,Διευθύνσεις μου
 DocType: Stock Ledger Entry,Outgoing Rate,Ο απερχόμενος Τιμή
 apps/erpnext/erpnext/config/hr.py +100,Organization branch master.,Κύρια εγγραφή κλάδου οργανισμού.
-apps/erpnext/erpnext/controllers/accounts_controller.py +237, or ,ή
+apps/erpnext/erpnext/controllers/accounts_controller.py +238, 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-Παραπάνω
@@ -2131,6 +2062,7 @@
 DocType: Stock Entry Detail,Serial No / Batch,Σειριακός αριθμός / παρτίδα
 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 +213,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',Το χρονοδιάγραμμα συντήρησης δεν έχει δημιουργηθεί για όλα τα είδη. Παρακαλώ κάντε κλικ στο δημιουργία χρονοδιαγράμματος
 ,To Produce,Για παραγωγή
 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} πρέπει επίσης να συμπεριληφθούν"
@@ -2138,10 +2070,7 @@
 DocType: Bin,Reserved Quantity,Δεσμευμένη ποσότητα 
 DocType: Landed Cost Voucher,Purchase Receipt Items,Είδη αποδεικτικού παραλαβής αγοράς
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,Έντυπα Προσαρμογή
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +62,Cutting,Κοπή
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +69,Flattening,Flattening
 DocType: Account,Income Account,Λογαριασμός εσόδων
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +22,Molding,Καλούπι
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +632,Delivery,Παράδοση
 DocType: Stock Reconciliation Item,Current Qty,Τρέχουσα Ποσότητα
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",Ανατρέξτε στην ενότητα κοστολόγησης την 'τιμή υλικών με βάση'
@@ -2151,20 +2080,19 @@
 apps/frappe/frappe/desk/moduleview.py +61,Documents,Έγγραφα
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +17,Ref,Αναφορά
 DocType: Cost Center,Cost Center,Κέντρο κόστους
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.js +48,Voucher #,Αποδεικτικό #
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +36,Voucher #,Αποδεικτικό #
 DocType: Notification Control,Purchase Order Message,Μήνυμα παραγγελίας αγοράς
 DocType: Tax Rule,Shipping Country,Αποστολές Χώρα
 DocType: Upload Attendance,Upload HTML,Ανεβάστε ΗΤΜΛ
-apps/erpnext/erpnext/controllers/accounts_controller.py +391,"Total advance ({0}) against Order {1} cannot be greater \
+apps/erpnext/erpnext/controllers/accounts_controller.py +392,"Total advance ({0}) against Order {1} cannot be greater \
 				than the Grand Total ({2})","Το σύνολο προκαταβολών ({0}) για την παραγγελία {1} δεν μπορεί να είναι μεγαλύτερο \
  από το γενικό σύνολο ({2})"
 DocType: Employee,Relieving Date,Ημερομηνία απαλλαγής
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +12,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.",Ο κανόνας τιμολόγησης γίνεται για να αντικατασταθεί ο τιμοκατάλογος / να καθοριστεί ποσοστό έκπτωσης με βάση ορισμένα κριτήρια.
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,Η αποθήκη μπορεί να αλλάξει μόνο μέσω καταχώρησης αποθέματος / σημειώματος παράδοσης / αποδεικτικού παραλαβής αγοράς
 DocType: Employee Education,Class / Percentage,Κλάση / ποσοστό
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +92,Head of Marketing and Sales,Κύρια εγγραφή του marketing και των πωλήσεων
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +31,Income Tax,Φόρος εισοδήματος
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +157,Laser engineered net shaping,Λέιζερ μηχανικής καθαρή διαμόρφωση
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Head of Marketing and Sales,Κύρια εγγραφή του marketing και των πωλήσεων
+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.,Παρακολούθηση επαφών με βάση τον τύπο βιομηχανίας.
 DocType: Item Supplier,Item Supplier,Προμηθευτής είδους
@@ -2187,31 +2115,28 @@
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Πραγματική ποσότητα μετά την συναλλαγή
 ,Pending SO Items For Purchase Request,Εκκρεμή είδη παραγγελίας πωλήσεων για αίτημα αγοράς
 DocType: Supplier,Billing Currency,Νόμισμα Τιμολόγησης
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +148,Extra Large,Πολύ Μεγάλο
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,Extra Large,Πολύ Μεγάλο
 ,Profit and Loss Statement,Έκθεση αποτελέσματος χρήσης
 DocType: Bank Reconciliation Detail,Cheque Number,Αριθμός επιταγής
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +43,Pressing,Πατώντας
 DocType: Payment Tool Detail,Payment Tool Detail,Λεπτομέρειες εργαλείου πληρωμής 
 ,Sales Browser,Περιηγητής πωλήσεων
 DocType: Journal Entry,Total Credit,Συνολική πίστωση
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +474,Warning: Another {0} # {1} exists against stock entry {2},Προειδοποίηση: Ένας άλλος {0} # {1} υπάρχει κατά την έναρξη αποθέματος {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +459,Local,Τοπικός
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +476,Warning: Another {0} # {1} exists against stock entry {2},Προειδοποίηση: Ένας άλλος {0} # {1} υπάρχει κατά την έναρξη αποθέματος {2}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +397,Local,Τοπικός
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),Δάνεια και προκαταβολές ( ενεργητικό )
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,Χρεώστες
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +147,Large,Μεγάλο
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +23,No employee found!,Δεν βρέθηκε υπάλληλος
+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 +152,Please mention no of visits required,Παρακαλώ να αναφέρετε τον αριθμό των επισκέψεων που απαιτούνται
 DocType: Purchase Order,Customer Address Display,Διεύθυνση Πελατών Οθόνη
 DocType: Stock Settings,Default Valuation Method,Προεπιλεγμένη μέθοδος αποτίμησης
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +127,Polishing,Στίλβωσης
 DocType: Production Order Operation,Planned Start Time,Προγραμματισμένη ώρα έναρξης
 apps/erpnext/erpnext/config/accounts.py +63,Close Balance Sheet and book Profit or Loss.,Κλείσιμο ισολογισμού και καταγραφή κέρδους ή ζημίας
-apps/erpnext/erpnext/stock/doctype/item/item.py +661,"Default Unit of Measure for Item {0} cannot be changed directly because \
+apps/erpnext/erpnext/stock/doctype/item/item.py +665,"Default Unit of Measure for Item {0} cannot be changed directly because \
 			you have already made some transaction(s) with another UOM. To change default UOM, \
 			use 'UOM Replace Utility' tool under Stock module.","Προεπιλεγμένη μονάδα μέτρησης για τη θέση {0} δεν μπορεί να αλλάξει άμεσα, διότι \ έχετε ήδη κάνει κάποια συναλλαγή (ες) με μια άλλη UOM. Για να αλλάξετε την προεπιλεγμένη UOM, \ χρήση »UOM αντικατάστασης χρησιμότητα» εργαλείο στο πλαίσιο της μονάδας Χρηματιστήριο."
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,Καθορίστε την ισοτιμία να μετατραπεί ένα νόμισμα σε ένα άλλο
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +146,Quotation {0} is cancelled,Η προσφορά {0} είναι ακυρωμένη
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +141,Quotation {0} is cancelled,Η προσφορά {0} είναι ακυρωμένη
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,Συνολικού ανεξόφλητου υπολοίπου
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} was on leave on {1}. Cannot mark attendance.,Ο υπάλληλος {0} ήταν σε άδεια στις {1}. Δεν γίνεται να σημειωθεί παρουσία.
 DocType: Sales Partner,Targets,Στόχοι
@@ -2222,7 +2147,6 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +158,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,Υπολογιστές
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +112,Electro-chemical grinding,Ηλεκτρο-χημική λείανση
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +14,This is a root customer group and cannot be edited.,Αυτή είναι μια κύρια ομάδα πελατών ρίζα και δεν μπορεί να επεξεργαστεί.
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +39,Please setup your chart of accounts before you start Accounting Entries,Παρακαλώ ρυθμίστε το λογιστικό σχέδιο πριν ξεκινήσετε λογιστικές εγγραφές
 DocType: Purchase Invoice,Ignore Pricing Rule,Αγνοήστε τον κανόνα τιμολόγησης
@@ -2280,7 +2204,6 @@
 DocType: Maintenance Visit,Purposes,Σκοποί
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +103,Atleast one item should be entered with negative quantity in return document,Atleast ένα στοιχείο πρέπει να αναγράφεται με αρνητική ποσότητα στο έγγραφο επιστροφής
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +67,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","Λειτουργία {0} περισσότερο από οποιαδήποτε διαθέσιμη ώρα εργασίας σε θέση εργασίας {1}, αναλύονται η λειτουργία σε πολλαπλές λειτουργίες"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +134,Electrochemical machining,Ηλεκτροχημική κατεργασία
 ,Requested,Ζητήθηκαν
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +66,No Remarks,Δεν βρέθηκαν παρατηρήσεις
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +13,Overdue,Εκπρόθεσμες
@@ -2289,7 +2212,7 @@
 DocType: Monthly Distribution,Distribution Name,Όνομα διανομής
 DocType: Features Setup,Sales and Purchase,Πωλήσεις και αγορές
 DocType: Supplier Quotation Item,Material Request No,Αρ. Αίτησης υλικού
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +218,Quality Inspection required for Item {0},Ο έλεγχος ποιότητας για το είδος {0} είναι απαραίτητος
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +221,Quality Inspection required for Item {0},Ο έλεγχος ποιότητας για το είδος {0} είναι απαραίτητος
 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),Καθαρό ποσοστό (Εταιρεία νομίσματος)
@@ -2307,9 +2230,8 @@
 apps/erpnext/erpnext/accounts/report/financial_statements.py +16,Fiscal Year {0} not found.,Η χρήση {0} δεν βρέθηκε.
 DocType: Bank Reconciliation,Get Relevant Entries,Βρες σχετικές καταχωρήσεις
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +407,Accounting Entry for Stock,Λογιστική εγγραφή για απόθεμα
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +64,Coining,Νομισματοκοπίας
 DocType: Sales Invoice,Sales Team1,Ομάδα πωλήσεων 1
-apps/erpnext/erpnext/stock/doctype/item/item.py +412,Item {0} does not exist,Το είδος {0} δεν υπάρχει
+apps/erpnext/erpnext/stock/doctype/item/item.py +416,Item {0} does not exist,Το είδος {0} δεν υπάρχει
 DocType: Sales Invoice,Customer Address,Διεύθυνση πελάτη
 apps/frappe/frappe/desk/query_report.py +136,Total,Σύνολο
 DocType: Purchase Invoice,Apply Additional Discount On,Εφαρμόστε επιπλέον έκπτωση On
@@ -2321,14 +2243,13 @@
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),Ποσό Φόρου Μετά Ποσό έκπτωσης (Εταιρεία νομίσματος)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +149,Target warehouse is mandatory for row {0},Η αποθήκη προορισμού είναι απαραίτητη για τη γραμμή {0}
 DocType: Quality Inspection,Quality Inspection,Επιθεώρηση ποιότητας
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +144,Extra Small,Extra Small
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +20,Spray forming,Ψεκάστε σχηματίζοντας
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Extra Small,Extra Small
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +458,Warning: Material Requested Qty is less than Minimum Order Qty,Προειδοποίηση : ζητήθηκε ποσότητα υλικού που είναι μικρότερη από την ελάχιστη ποσότητα παραγγελίας
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +191,Account {0} is frozen,Ο λογαριασμός {0} έχει παγώσει
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Νομικό πρόσωπο / θυγατρικές εταιρείες με ξεχωριστό λογιστικό σχέδιο που ανήκουν στον οργανισμό.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +29,"Food, Beverage & Tobacco","Τρόφιμα, ποτά και καπνός"
+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 or BS
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,Can only make payment against unbilled {0},Μπορούν να πληρώνουν κατά unbilled {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +531,Can only make payment against unbilled {0},Μπορούν να πληρώνουν κατά unbilled {0}
 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,Υπεργολαβία
@@ -2339,19 +2260,18 @@
 DocType: Item,Manufacturer Part Number,Αριθμός είδους κατασκευαστή
 DocType: Production Order Operation,Estimated Time and Cost,Εκτιμώμενος χρόνος και κόστος
 DocType: Bin,Bin,Bin
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +50,Nosing,Nosing
 DocType: SMS Log,No of Sent SMS,Αρ. Απεσταλμένων SMS
 DocType: Account,Company,Εταιρεία
 DocType: Account,Expense Account,Λογαριασμός δαπανών
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +49,Software,Λογισμικό
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +151,Colour,Χρώμα
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +49,Software,Λογισμικό
+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",Παρακαλώ επιλέξτε το στοιχείο στο οποίο «Είναι αναντικατάστατο&quot; είναι &quot;Όχι&quot; και &quot;είναι οι πωλήσεις Θέση&quot; είναι &quot;ναι&quot; και δεν υπάρχει άλλος Bundle Προϊόν
 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 +281,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 +134,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 +145,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,Αρχείο καταγραφής μετονομασίας
@@ -2361,7 +2281,7 @@
 apps/erpnext/erpnext/controllers/recurring_document.py +162,Please select {0},Παρακαλώ επιλέξτε {0}
 DocType: C-Form,C-Form No,Αρ. C-Form
 DocType: BOM,Exploded_items,Είδη αναλυτικά
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +95,Researcher,Ερευνητής
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Researcher,Ερευνητής
 apps/frappe/frappe/custom/doctype/customize_form/customize_form.js +88,Update,Ενημέρωση
 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 +23,Name or Email is mandatory,Όνομα ή Email είναι υποχρεωτικό
@@ -2370,11 +2290,10 @@
 DocType: Employee,Exit,Έξοδος
 apps/erpnext/erpnext/accounts/doctype/account/account.py +134,Root Type is mandatory,Ο τύπος ρίζας είναι υποχρεωτικός
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +295,Serial No {0} created,Ο σειριακός αριθμός {0} δημιουργήθηκε
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +125,Vibratory finishing,Δονητικές φινιρίσματος
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","Για την εξυπηρέτηση των πελατών, οι κωδικοί αυτοί μπορούν να χρησιμοποιηθούν σε μορφές εκτύπωσης, όπως τιμολόγια και δελτία παράδοσης"
 DocType: Employee,You can enter any date manually,Μπορείτε να εισάγετε οποιαδήποτε ημερομηνία με το χέρι
 DocType: Sales Invoice,Advertisement,Διαφήμιση
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +165,Probationary Period,Δοκιμαστική περίοδος
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Probationary Period,Δοκιμαστική περίοδος
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Μόνο οι κόμβοι-φύλλα επιτρέπονται σε μία συναλλαγή
 DocType: Expense Claim,Expense Approver,Υπεύθυνος έγκρισης δαπανών
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,Το είδος στο αποδεικτικό παραλαβής αγοράς έχει προμηθευτεί
@@ -2382,19 +2301,16 @@
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +17,To Datetime,Έως ημερομηνία και ώρα
 DocType: SMS Settings,SMS Gateway URL,SMS gateway URL
 apps/erpnext/erpnext/config/crm.py +53,Logs for maintaining sms delivery status,Logs για τη διατήρηση της κατάστασης παράδοσης sms
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +137,Grinding,Άλεση
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +34,Shrink wrapping,Συρρίκνωση περιτυλίγματος
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +36,Pending Activities,Εν αναμονή Δραστηριότητες
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,Confirmed,Επιβεβαιώθηκε
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier > Supplier Type,Προμηθευτής> Τύπος προμηθευτή
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +127,Please enter relieving date.,Παρακαλώ εισάγετε την ημερομηνία απαλλαγής
 apps/erpnext/erpnext/controllers/trends.py +137,Amt,Ποσό
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' can be submitted,Μόνο αιτήσεις άδειας με κατάσταση 'εγκρίθηκε' μπορούν να υποβληθούν
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +51,Only Leave Applications with status 'Approved' can be submitted,Μόνο αιτήσεις άδειας με κατάσταση 'εγκρίθηκε' μπορούν να υποβληθούν
 apps/erpnext/erpnext/utilities/doctype/address/address.py +21,Address Title is mandatory.,Ο τίτλος της διεύθυνσης είναι υποχρεωτικός.
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,Πληκτρολογήστε το όνομα της εκστρατείας εάν η πηγή της έρευνας είναι εκστρατεία
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +38,Newspaper Publishers,Εκδότες εφημερίδων
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +38,Newspaper Publishers,Εκδότες εφημερίδων
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,Επιλέξτε οικονομικό έτος
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +88,Smelting,Smelting
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Αναδιάταξη επιπέδου
 DocType: Attendance,Attendance Date,Ημερομηνία συμμετοχής
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,Ανάλυση μισθού με βάση τις αποδοχές και τις παρακρατήσεις.
@@ -2409,16 +2325,15 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +414,[Error],[Σφάλμα]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,Με λόγια θα είναι ορατά αφού αποθηκεύσετε την παραγγελία πώλησης.
 ,Employee Birthday,Γενέθλια υπαλλήλων
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +55,Venture Capital,Αρχικό κεφάλαιο
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,Αρχικό κεφάλαιο
 DocType: UOM,Must be Whole Number,Πρέπει να είναι ακέραιος αριθμός
 DocType: Leave Control Panel,New Leaves Allocated (In Days),Νέες άδειες που κατανεμήθηκαν (σε ​​ημέρες)
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +51,Serial No {0} does not exist,Ο σειριακός αριθμός {0} δεν υπάρχει
 DocType: Pricing Rule,Discount Percentage,Ποσοστό έκπτωσης
 DocType: Payment Reconciliation Invoice,Invoice Number,Αριθμός τιμολογίου
-apps/erpnext/erpnext/hooks.py +70,Orders,Παραγγελίες
+apps/erpnext/erpnext/hooks.py +54,Orders,Παραγγελίες
 DocType: Leave Control Panel,Employee Type,Τύπος υπαλλήλου
 DocType: Employee Leave Approver,Leave Approver,Υπεύθυνος έγκρισης άδειας
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +70,Swaging,Αποτύπωσης
 DocType: Manufacturing Settings,Material Transferred for Manufacture,Υλικό το οποίο μεταφέρεται για την Κατασκευή
 DocType: Expense Claim,"A user with ""Expense Approver"" role",Ένας χρήστης με ρόλο «υπεύθυνος έγκρισης δαπανών» 
 ,Issued Items Against Production Order,Είδη που εκδόθηκαν κατά την εντολή παραγωγής
@@ -2430,7 +2345,6 @@
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +62,Cost Center with existing transactions can not be converted to group,Ένα κέντρο κόστους με υπάρχουσες συναλλαγές δεν μπορεί να μετατραπεί σε ομάδα
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Depreciation,Απόσβεση
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Προμηθευτής(-ές)
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +29,Invalid period,Άκυρη περίοδο
 DocType: Customer,Credit Limit,Πιστωτικό όριο
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,Επιλέξτε τον τύπο της συναλλαγής
 DocType: GL Entry,Voucher No,Αρ. αποδεικτικού
@@ -2440,9 +2354,9 @@
 DocType: Customer,Address and Contact,Διεύθυνση και Επικοινωνία
 DocType: Customer,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}"
 apps/erpnext/erpnext/accounts/party.py +284,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Σημείωση : η ημερομηνία λήξης προθεσμίας υπερβαίνει τις επιτρεπόμενες ημέρες πίστωσης κατά {0} ημέρα ( ες )
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +621,Maint. Schedule,Συντήρηση. Πρόγραμμα
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +108,Abrasive jet machining,Μηχανική κατεργασία Λειαντικά jet
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +632,Maint. Schedule,Συντήρηση. Πρόγραμμα
 DocType: Stock Settings,Freeze Stock Entries,Πάγωμα καταχωρήσεων αποθέματος
 DocType: Website Settings,Website Settings,Ρυθμίσεις δικτυακού τόπου
 DocType: Item,Reorder level based on Warehouse,Αναδιάταξη επίπεδο με βάση Αποθήκης
@@ -2459,7 +2373,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +75,Show Stock Entries,Προβολή καταχωρήσεων αποθέματος
 ,Is Primary Address,Είναι Πρωτοβάθμια Διεύθυνση
 DocType: Production Order,Work-in-Progress Warehouse,Αποθήκη εργασιών σε εξέλιξη
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +308,Reference #{0} dated {1},Αναφορά # {0} της {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Reference #{0} dated {1},Αναφορά # {0} της {1}
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +13,Manage Addresses,Διαχειριστείτε Διευθύνσεις
 DocType: Pricing Rule,Item Code,Κωδικός είδους
 DocType: Production Planning Tool,Create Production Orders,Δημιουργία εντολών παραγωγής
@@ -2468,7 +2382,7 @@
 DocType: Lead,Market Segment,Τομέας της αγοράς
 DocType: Communication,Phone,Τηλέφωνο
 DocType: Employee Internal Work History,Employee Internal Work History,Ιστορικό εσωτερικών εργασιών υπαλλήλου
-apps/erpnext/erpnext/public/js/account_tree_grid.js +50,Closing (Dr),Κλείσιμο (dr)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +221,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.,Φορολογικό πρότυπο για συναλλαγές πώλησης.
@@ -2484,8 +2398,8 @@
 ,Billed Amount,Χρεωμένο ποσό
 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 +129,Material Request {0} is cancelled or stopped,H αίτηση υλικού {0} έχει ακυρωθεί ή διακοπεί
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +641,Add a few sample records,Προσθέστε μερικά αρχεία του δείγματος
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +133,Material Request {0} is cancelled or stopped,H αίτηση υλικού {0} έχει ακυρωθεί ή διακοπεί
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Add a few sample records,Προσθέστε μερικά αρχεία του δείγματος
 apps/erpnext/erpnext/config/hr.py +210,Leave Management,Αφήστε Διαχείρισης
 DocType: Event,Groups,Ομάδες
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,Ομαδοποίηση κατά λογαριασμό
@@ -2498,38 +2412,34 @@
 DocType: Features Setup,Sales Extras,Πρόσθετα πωλήσεων
 apps/erpnext/erpnext/accounts/utils.py +344,{0} budget for Account {1} against Cost Center {2} will exceed by {3},{0} Ο προϋπολογισμός για τον λογαριασμό {1} για το κέντρο κόστους {2} θα ξεφύγει κατά {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +236,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Ο λογαριασμός διαφορά πρέπει να είναι λογαριασμός τύπου Περιουσιακών Στοιχείων / Υποχρεώσεων, δεδομένου ότι το εν λόγω απόθεμα συμφιλίωση είναι μια Έναρξη Έναρξη"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +138,Purchase Order number required for Item {0},Ο αριθμός παραγγελίας για το είδος {0} είναι απαραίτητος
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Order number required for Item {0},Ο αριθμός παραγγελίας για το είδος {0} είναι απαραίτητος
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',"Το πεδίο ""από ημερομηνία"" πρέπει να είναι μεταγενέστερο του πεδίο ""έως ημερομηνία"""
 ,Stock Projected Qty,Προβλεπόμενη ποσότητα αποθέματος
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +147,Customer {0} does not belong to project {1},Ο πελάτης {0} δεν ανήκει στο έργο {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +150,Customer {0} does not belong to project {1},Ο πελάτης {0} δεν ανήκει στο έργο {1}
 DocType: Sales Order,Customer's Purchase Order,Εντολή Αγοράς του Πελάτη
 DocType: Warranty Claim,From Company,Από την εταιρεία
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,Αξία ή ποσ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Minute,Λεπτό
+apps/erpnext/erpnext/public/js/setup_wizard.js +363,Minute,Λεπτό
 DocType: Purchase Invoice,Purchase Taxes and Charges,Φόροι και επιβαρύνσεις αγοράς 
 ,Qty to Receive,Ποσότητα για παραλαβή
 DocType: Leave Block List,Leave Block List Allowed,Η λίστα αποκλεισμού ημερών άδειας επετράπη
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +61,Conversion factor cannot be in fractions,Ο συντελεστής μετατροπής δεν μπορεί να είναι κλάσμα
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +358,You will use it to Login,Θα το χρησιμοποιήσετε για να συνδεθείτε
+apps/erpnext/erpnext/public/js/setup_wizard.js +108,You will use it to Login,Θα το χρησιμοποιήσετε για να συνδεθείτε
 DocType: Sales Partner,Retailer,Έμπορος λιανικής
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +99,Credit To account must be a Balance Sheet account,Πίστωση του λογαριασμού πρέπει να είναι ένα κονδύλι του Ισολογισμού
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,Όλοι οι τύποι προμηθευτή
 apps/erpnext/erpnext/stock/doctype/item/item.py +37,Item Code is mandatory because Item is not automatically numbered,Ο κωδικός είδους είναι απαραίτητος γιατί το είδος δεν αριθμείται αυτόματα
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +99,Quotation {0} not of type {1},Η προσφορά {0} δεν είναι του τύπου {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +93,Quotation {0} not of type {1},Η προσφορά {0} δεν είναι του τύπου {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,Είδος χρονοδιαγράμματος συντήρησης
 DocType: Sales Order,%  Delivered,Παραδόθηκε%
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,Bank Overdraft Account,Τραπεζικός λογαριασμός υπερανάληψης
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +15,Make Salary Slip,Δημιούργησε βεβαίωση αποδοχών
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +18,Browse BOM,Αναζήτηση BOM
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +175,Secured Loans,Εξασφαλισμένα δάνεια
-apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +3,Awesome Products,Εκπληκτικά προϊόντα
+apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +3,Awesome Products,Εκπληκτικά προϊόντα
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +189,Opening Balance Equity,Άνοιγμα Υπόλοιπο Ιδίων Κεφαλαίων
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +80,Cannot approve leave as you are not authorized to approve leaves on Block Dates,"Δεν μπορείτε να εγκρίνετε την άδεια, καθώς δεν έχετε το δικαίωμα έγκρισης αδειών σε αποκλεισμένες ημερομηνίες"
 DocType: Appraisal,Appraisal,Εκτίμηση
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +13,Lost-foam casting,Lost-χύτευση αφρό
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +47,Drawing,Σχέδιο
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +22,Date is repeated,Η ημερομηνία επαναλαμβάνεται
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +148,Leave approver must be one of {0},Ο υπεύθυνος έγκρισης άδειας πρέπει να είναι ένας από {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +162,Leave approver must be one of {0},Ο υπεύθυνος έγκρισης άδειας πρέπει να είναι ένας από {0}
 DocType: Hub Settings,Seller Email,Email πωλητή
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Συνολικό Κόστος Αγοράς (μέσω του τιμολογίου αγοράς)
 DocType: Workstation Working Hour,Start Time,Ώρα έναρξης
@@ -2543,7 +2453,7 @@
 DocType: Purchase Invoice Item,Net Amount (Company Currency),Καθαρό Ποσό (Εταιρεία νομίσματος)
 DocType: BOM Operation,Hour Rate,Χρέωση ανά ώρα
 DocType: Stock Settings,Item Naming By,Ονομασία είδους κατά
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +642,From Quotation,Από την προσφορά
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +655,From Quotation,Από την προσφορά
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},Μια ακόμη καταχώρηση κλεισίματος περιόδου {0} έχει γίνει μετά από {1}
 DocType: Production Order,Material Transferred for Manufacturing,Υλικό το οποίο μεταφέρεται για Βιομηχανία
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +29,Account {0} does not exists,Ο λογαριασμός {0} δεν υπάρχει
@@ -2557,21 +2467,19 @@
 DocType: Purchase Invoice Item,PR Detail,Λεπτομέρειες PR
 DocType: Sales Order,Fully Billed,Πλήρως χρεωμένο
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +20,Cash In Hand,Μετρητά στο χέρι
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +72,Delivery warehouse required for stock item {0},Παράδοση αποθήκη που απαιτούνται για τη θέση του αποθέματος {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +119,Delivery warehouse required for stock item {0},Παράδοση αποθήκη που απαιτούνται για τη θέση του αποθέματος {0}
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),Το μεικτό βάρος της συσκευασίας. Συνήθως καθαρό βάρος + βάρος υλικού συσκευασίας. (Για εκτύπωση)
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Οι χρήστες με αυτό το ρόλο μπορούν να καθορίζουν δεσμευμένους λογαριασμούς και τη δημιουργία / τροποποίηση των λογιστικών εγγραφών δεσμευμένων λογαριασμών
 DocType: Serial No,Is Cancelled,Είναι ακυρωμένο
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +281,My Shipments,Αποστολές μου
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +286,My Shipments,Αποστολές μου
 DocType: Journal Entry,Bill Date,Ημερομηνία χρέωσης
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +43,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","Ακόμα κι αν υπάρχουν πολλαπλοί κανόνες τιμολόγησης με την υψηλότερη προτεραιότητα, στη συνέχεια οι εσωτερικές προτεραιότητες θα εφαρμοστούν:"
 DocType: Supplier,Supplier Details,Στοιχεία προμηθευτή
 DocType: Communication,Recipients,Παραλήπτες
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +146,Screwing,Βίδωμα
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +96,Knurling,Ρίκνωση
 DocType: Expense Claim,Approval Status,Κατάσταση έγκρισης
 DocType: Hub Settings,Publish Items to Hub,Δημοσιεύστε είδη στο hub
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +44,From value must be less than to value in row {0},Η ΄από τιμή' πρέπει να είναι μικρότερη από την 'έως τιμή' στη γραμμή {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +133,Wire Transfer,Τραπεζικό έμβασμα
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +133,Wire Transfer,Τραπεζικό έμβασμα
 apps/erpnext/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py +25,Please select Bank Account,Παρακαλώ επιλέξτε τραπεζικό λογαριασμό
 DocType: Newsletter,Create and Send Newsletters,Δημιουργήστε και στείλτε τα ενημερωτικά δελτία
 apps/frappe/frappe/public/js/frappe/views/reports/grid_report.js +305,From Date must be before To Date,Το πεδίο Από την ημερομηνία πρέπει να είναι προγενέστερο του έως ημερομηνία
@@ -2579,14 +2487,14 @@
 DocType: Company,Default Income Account,Προεπιλεγμένος λογαριασμός εσόδων
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,Ομάδα πελατών / πελάτης
 DocType: Item Group,Check this if you want to show in website,"Ελέγξτε αυτό, αν θέλετε να εμφανίζεται στην ιστοσελίδα"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +190,Welcome to ERPNext,Καλώς ήλθατε στο erpnext
+,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/page/setup_wizard/install_fixtures.py +37,Calls,Κλήσεις
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Calls,Κλήσεις
 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 +193,Purchase Order {0} is not submitted,Η παραγγελία αγοράς {0} δεν έχει υποβληθεί
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +194,Purchase Order {0} is not submitted,Η παραγγελία αγοράς {0} δεν έχει υποβληθεί
 ,Projected,Προβλεπόμενη
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},Ο σειριακός αριθμός {0} δεν ανήκει στην αποθήκη {1}
 apps/erpnext/erpnext/controllers/status_updater.py +136,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Σημείωση : το σύστημα δεν θα ελέγχει για υπέρβαση ορίων παράδοσης και κράτησης για το είδος {0} καθώς η ποσότητα ή το ποσό είναι 0
@@ -2594,7 +2502,6 @@
 DocType: Issue,Opening Date,Ημερομηνία έναρξης
 DocType: Journal Entry,Remark,Παρατήρηση
 DocType: Purchase Receipt Item,Rate and Amount,Τιμή και ποσό
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +95,Boring,Βαρετό
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +667,From Sales Order,Από παραγγελία πώλησης
 DocType: Blog Category,Parent Website Route,Γονική διαδρομή ιστοσελίδας
 DocType: Sales Order,Not Billed,Μη τιμολογημένο
@@ -2608,19 +2515,17 @@
 apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount Amount,Ποσό έκπτωσης
 DocType: Purchase Invoice,Return Against Purchase Invoice,Επιστροφή Ενάντια Αγορά Τιμολόγιο
 DocType: Item,Warranty Period (in days),Περίοδος εγγύησης (σε ημέρες)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +550,e.g. VAT,Π.Χ. Φπα
+apps/erpnext/erpnext/public/js/setup_wizard.js +292,e.g. VAT,Π.Χ. Φπα
 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,Σειρά προσφορών
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +52,"An item exists with same name ({0}), please change the item group name or rename the item","Ένα είδος υπάρχει με το ίδιο όνομα ( {0} ), παρακαλώ να αλλάξετε το όνομα της ομάδας ειδών ή να μετονομάσετε το είδος"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +82,Hot metal gas forming,Hot αερίου μορφοποίησης μετάλλου
 DocType: Sales Order Item,Sales Order Date,Ημερομηνία παραγγελίας πώλησης 
 DocType: Sales Invoice Item,Delivered Qty,Ποσότητα που παραδόθηκε
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +63,Warehouse {0}: Company is mandatory,Αποθήκη {0}: η εταιρεία είναι απαραίτητη
 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.",Πηγαίνετε στην κατάλληλη ομάδα (συνήθως Πηγή Χρηματοδότησης&gt; Βραχυπρόθεσμες Υποχρεώσεις&gt; φόρους και δασμούς και να δημιουργήσετε ένα νέο λογαριασμό (κάνοντας κλικ στην επιλογή Προσθήκη Παιδί) του τύπου «φόρος» και δεν αναφέρουν το ποσοστό φόρου.
 ,Payment Period Based On Invoice Date,Περίοδος πληρωμής με βάση την ημερομηνία τιμολογίου
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +50,Missing Currency Exchange Rates for {0},Λείπει η ισοτιμία συναλλάγματος για {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +135,Laser cutting,Λέιζερ κοπή
 DocType: Event,Monday,Δευτέρα
 DocType: Journal Entry,Stock Entry,Καταχώρηση αποθέματος
 DocType: Account,Payable,Πληρωτέος
@@ -2653,7 +2558,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +111,Date Of Retirement must be greater than Date of Joining,Η ημερομηνία συνταξιοδότησης πρέπει να είναι μεταγενέστερη από την ημερομηνία πρόσληψης
 DocType: Sales Invoice,Against Income Account,Κατά τον λογαριασμό εσόδων
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +69,{0}% Delivered,{0}% Παραδόθηκαν
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +78,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Θέση {0}: Διέταξε ποσότητα {1} δεν μπορεί να είναι μικρότερη από την ελάχιστη ποσότητα προκειμένου {2} (ορίζεται στο σημείο).
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Θέση {0}: Διέταξε ποσότητα {1} δεν μπορεί να είναι μικρότερη από την ελάχιστη ποσότητα προκειμένου {2} (ορίζεται στο σημείο).
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Ποσοστό μηνιαίας διανομής
 DocType: Territory,Territory Targets,Στόχοι περιοχών
 DocType: Delivery Note,Transporter Info,Πληροφορίες μεταφορέα
@@ -2662,7 +2567,6 @@
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,"Τίτλοι για πρότυπα εκτύπωσης, π.Χ. Προτιμολόγιο."
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +140,Valuation type charges can not marked as Inclusive,Χρεώσεις τύπου αποτίμηση δεν μπορεί να χαρακτηρίζεται ως Inclusive
 DocType: POS Profile,Update Stock,Ενημέρωση αποθέματος
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +128,Superfinishing,Στίλβωσης
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,Διαφορετικές Μ.Μ.για τα είδη θα οδηγήσουν σε λανθασμένη τιμή ( σύνολο ) καθαρού βάρους. Βεβαιωθείτε ότι το καθαρό βάρος κάθε είδοςυ είναι στην ίδια Μ.Μ.
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,Τιμή Λ.Υ. 
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +85,Please pull items from Delivery Note,Παρακαλώ κάντε λήψη ειδών από το δελτίο αποστολής
@@ -2677,7 +2581,6 @@
 ,Purchase Analytics,Ανάλυση αγοράς
 DocType: Sales Invoice Item,Delivery Note Item,Είδος δελτίου αποστολής
 DocType: Expense Claim,Task,Έργασία
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +57,Shaving,Ξύρισμα
 DocType: Purchase Taxes and Charges,Reference Row #,Γραμμή αναφοράς #
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},Ο αριθμός παρτίδας είναι απαραίτητος για το είδος {0}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js +14,This is a root sales person and cannot be edited.,Αυτός είναι ένας κύριος πωλητής και δεν μπορεί να επεξεργαστεί.
@@ -2689,13 +2592,11 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +74,Purpose must be one of {0},Ο σκοπός πρέπει να είναι ένα από τα {0}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +108,Fill the form and save it,Συμπληρώστε τη φόρμα και αποθηκεύστε
 DocType: Production Planning Tool,Download a report containing all raw materials with their latest inventory status,Κατεβάστε μια έκθεση που περιέχει όλες τις πρώτες ύλες με την πιο πρόσφατη κατάσταση των αποθεμάτων τους
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +94,Facing,Αντιμετωπίζοντας
 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,Αποστολή SMS
 DocType: Company,Default Letter Head,Προεπιλογή κεφαλίδα επιστολόχαρτου
 DocType: Time Log,Billable,Χρεώσιμο
-DocType: Authorization Rule,This will be used for setting rule in HR module,Αυτό θα χρησιμοποιηθεί για την ρύθμιση κανόνα στην ενότητα hr
 DocType: Account,Rate at which this tax is applied,Ποσοστό με το οποίο επιβάλλεται ο φόρος αυτός
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reorder Qty,Αναδιάταξη ποσότητας
 DocType: Company,Stock Adjustment Account,Λογαριασμός διευθέτησης αποθέματος
@@ -2722,16 +2623,15 @@
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,Το ποσοστό κατανομής θα πρέπει να είναι ίσο με το 100 %
 DocType: Serial No,Out of AMC,Εκτός Ε.Σ.Υ.
 DocType: Purchase Order Item,Material Request Detail No,Αρ. Λεπτομερειών αίτησης υλικού
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +97,Hard turning,Σκληρό καμπής
 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 +79,Company (not Customer or Supplier) master.,Κύρια εγγραφή εταιρείας (δεν είναι πελάτης ή προμηθευτής).
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +106,Please enter 'Expected Delivery Date',Παρακαλώ εισάγετε 'αναμενόμενη ημερομηνία παράδοσης΄
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +187,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Τα δελτία παράδοσης {0} πρέπει να ακυρώνονται πριν από την ακύρωση της παραγγελίας πώλησης
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +100,Please enter 'Expected Delivery Date',Παρακαλώ εισάγετε 'αναμενόμενη ημερομηνία παράδοσης΄
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +182,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Τα δελτία παράδοσης {0} πρέπει να ακυρώνονται πριν από την ακύρωση της παραγγελίας πώλησης
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +373,Paid amount + Write Off Amount can not be greater than Grand Total,Το άθροισμα από το καταβληθέν ποσό και το ποσό που διαγράφηκε δεν μπορεί να είναι μεγαλύτερο από το γενικό σύνολο
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},Ο {0} δεν είναι έγκυρος αριθμός παρτίδας για το είδος {1}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,Note: There is not enough leave balance for Leave Type {0},Σημείωση : δεν υπάρχει αρκετό υπόλοιπο άδειας για τον τύπο άδειας {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +124,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,Τύπος ευκαιρίας
@@ -2743,7 +2643,7 @@
 DocType: Hub Settings,Publish Availability,Διαθεσιμότητα δημοσίευσης
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +105,Date of Birth cannot be greater than today.,"Ημερομηνία γέννησης δεν μπορεί να είναι μεγαλύτερη από ό, τι σήμερα."
 ,Stock Ageing,Γήρανση αποθέματος
-apps/erpnext/erpnext/controllers/accounts_controller.py +200,{0} '{1}' is disabled,{0} '{1}' Είναι απενεργοποιημένος
+apps/erpnext/erpnext/controllers/accounts_controller.py +201,{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.,Αυτόματη αποστολή email στις επαφές για την υποβολή των συναλλαγών.
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +232,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
@@ -2752,44 +2652,38 @@
 DocType: Purchase Order,Customer Contact Email,Πελατών Επικοινωνία Email
 DocType: Event,Sunday,Κυριακή
 DocType: Sales Team,Contribution (%),Συμβολή (%)
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +455,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,Σημείωση : η καταχώρηση πληρωμής δεν θα δημιουργηθεί γιατί δεν ορίστηκε λογαριασμός μετρητών ή τραπέζης
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +171,Responsibilities,Αρμοδιότητες
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +457,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 +11,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,Παρακαλώ εισάγετε τουλάχιστον 1 τιμολόγιο στον πίνακα
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +511,Add Users,Προσθήκη χρηστών
+apps/erpnext/erpnext/public/js/setup_wizard.js +255,Add Users,Προσθήκη χρηστών
 DocType: Pricing Rule,Item Group,Ομάδα ειδών
 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),Φόροι και επιβαρύνσεις που προστέθηκαν (νόμισμα της εταιρείας)
-apps/erpnext/erpnext/stock/doctype/item/item.py +340,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Η γραμμή φόρου είδους {0} πρέπει να έχει λογαριασμό τύπου φόρος ή έσοδα ή δαπάνη ή χρέωση
+apps/erpnext/erpnext/stock/doctype/item/item.py +344,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Η γραμμή φόρου είδους {0} πρέπει να έχει λογαριασμό τύπου φόρος ή έσοδα ή δαπάνη ή χρέωση
 DocType: Sales Order,Partly Billed,Μερικώς τιμολογημένος
 DocType: Item,Default BOM,Προεπιλεγμένη Λ.Υ. 
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +79,Decambering,Decambering
 apps/erpnext/erpnext/setup/doctype/company/company.js +22,Please re-type company name to confirm,Παρακαλώ πληκτρολογήστε ξανά το όνομα της εταιρείας για να επιβεβαιώσετε
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,Συνολικού ανεξόφλητου υπολοίπου
 DocType: Time Log Batch,Total Hours,Σύνολο ωρών
 DocType: Journal Entry,Printing Settings,Ρυθμίσεις εκτύπωσης
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +268,Total Debit must be equal to Total Credit. The difference is {0},Η συνολική χρέωση πρέπει να είναι ίση με τη συνολική πίστωση. Η διαφορά είναι {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +11,Automotive,Αυτοκίνητο
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +37,Item is required,Το είδος είναι απαραίτητο
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +25,Metal injection molding,Μεταλλικά ένεση γείσο
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +258,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/accounts/doctype/sales_invoice/sales_invoice.js +684,From Delivery Note,Από το δελτίο αποστολής
 DocType: Time Log,From Time,Από ώρα
 DocType: Notification Control,Custom Message,Προσαρμοσμένο μήνυμα
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +33,Investment Banking,Επενδυτική τραπεζική
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +261,"Select your Country, Time Zone and Currency",Επιλέξτε τη χώρα σας και ελέγξτε την ζώνη ώρας και το νόμισμα.
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,Επενδυτική τραπεζική
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +316,"Select your Country, Time Zone and Currency",Επιλέξτε τη χώρα σας και ελέγξτε την ζώνη ώρας και το νόμισμα.
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +369,Cash or Bank Account is mandatory for making payment entry,Ο λογαριασμός μετρητών/τραπέζης είναι απαραίτητος για την κατασκευή καταχωρήσεων πληρωμής
 DocType: Purchase Invoice,Price List Exchange Rate,Ισοτιμία τιμοκαταλόγου
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +91,Pickling,Αποξείδωση
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +18,Sand casting,Άμμος χύτευσης
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +117,Electroplating,Ηλεκτρολυτική
 DocType: Purchase Invoice Item,Rate,Τιμή
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +62,Intern,Εκπαιδευόμενος
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Intern,Εκπαιδευόμενος
 DocType: Newsletter,A Lead with this email id should exist,Μια επαφή με αυτή τη διεύθυνση email θα πρέπει να υπάρχει
 DocType: Stock Entry,From BOM,Από BOM
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +34,Basic,Βασικός
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +34,Basic,Βασικός
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,Οι μεταφορές αποθέματος πριν από τη {0} είναι παγωμένες
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +217,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,Η 'έως ημερομηνία' πρέπει να είναι η ίδια με την 'από ημερομηνία'΄για την άδεια μισής ημέρας
@@ -2797,10 +2691,10 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +96,Reference No is mandatory if you entered Reference Date,Ο αρ. αναφοράς είναι απαραίτητος εάν έχετε εισάγει ημερομηνία αναφοράς
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +108,Date of Joining must be greater than Date of Birth,"Η ημερομηνία της πρόσληψης πρέπει να είναι μεταγενέστερη από ό, τι η ημερομηνία γέννησης"
 DocType: Salary Structure,Salary Structure,Μισθολόγιο
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +242,"Multiple Price Rule exists with same criteria, please resolve \
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +246,"Multiple Price Rule exists with same criteria, please resolve \
 			conflict by assigning priority. Price Rules: {0}","Πολλαπλοί κανόνας τιμής υπάρχουν με τα ίδια κριτήρια, παρακαλώ να επιλύσετε την διένεξη \ σύγκρουση με τον ορισμό προτεραιότητας. Κανόνες τιμής: {0}"""
 DocType: Account,Bank,Τράπεζα
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +9,Airline,Αερογραμμή
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,Αερογραμμή
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +493,Issue Material,Υλικό έκδοσης
 DocType: Material Request Item,For Warehouse,Για αποθήκη
 DocType: Employee,Offer Date,Ημερομηνία προσφοράς
@@ -2810,29 +2704,24 @@
 DocType: Item,Is Fixed Asset Item,Είναι πάγιο στοιχείο 
 DocType: Stock Entry,Including items for sub assemblies,Συμπεριλαμβανομένων των στοιχείων για τις επιμέρους συνελεύσεις
 DocType: Features Setup,"If you have long print formats, this feature can be used to split the page to be printed on multiple pages with all headers and footers on each page","Αν έχετε μεγάλες μορφές εκτύπωσης, αυτό το χαρακτηριστικό μπορεί να χρησιμοποιηθεί για να χωρίσει τη σελίδα που θα εκτυπωθεί σε πολλές σελίδες με όλες τις κεφαλίδες και τα υποσέλιδα σε κάθε σελίδα"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +131,Hobbing,Hobbing
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +98,All Territories,Όλα τα εδάφη
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +98,All Territories,Όλα τα εδάφη
 DocType: Purchase Invoice,Items,Είδη
 DocType: Fiscal Year,Year Name,Όνομα έτους
 DocType: Process Payroll,Process Payroll,Επεξεργασία μισθοδοσίας 
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +59,There are more holidays than working days this month.,Υπάρχουν περισσότερες ημέρες αργιών από ότι εργάσιμες ημέρες αυτό το μήνα.
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +68,There are more holidays than working days this month.,Υπάρχουν περισσότερες ημέρες αργιών από ότι εργάσιμες ημέρες αυτό το μήνα.
 DocType: Product Bundle Item,Product Bundle Item,Προϊόν Bundle Προϊόν
 DocType: Sales Partner,Sales Partner Name,Όνομα συνεργάτη πωλήσεων
 DocType: Purchase Invoice Item,Image View,Προβολή εικόνας
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +113,Finishing & industrial finishing,Φινίρισμα και βιομηχανικές φινίρισμα
 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/page/setup_wizard/fixtures/industry_type.py +46,Securities & Commodity Exchanges,Κινητές αξίες & χρηματιστήρια εμπορευμάτων
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Κινητές αξίες & χρηματιστήρια εμπορευμάτων
 DocType: Shipping Rule,Calculate Based On,Υπολογισμός με βάση:
 DocType: Delivery Note Item,From Warehouse,Από Αποθήκης
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +98,Drilling,Γεώτρηση
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +28,Blow molding,Blow μορφοποίησης
 DocType: Purchase Taxes and Charges,Valuation and Total,Αποτίμηση και σύνολο
 DocType: Tax Rule,Shipping City,Αποστολές Σίτι
 apps/erpnext/erpnext/stock/doctype/item/item.js +43,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,"Αυτό το στοιχείο είναι μια παραλλαγή του {0} (προτύπου). Τα χαρακτηριστικά θα αντιγραφούν  από το πρότυπο, εκτός αν έχει οριστεί «όχι αντιγραφή '"
 DocType: Account,Purchase User,Χρήστης αγορών
 DocType: Notification Control,Customize the Notification,Προσαρμόστε την ενημέρωση
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +87,Hammering,Σφυρηλάτηση
 DocType: Web Page,Slideshow,Παρουσίαση
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +24,Default Address Template cannot be deleted,Το προεπιλεγμένο πρότυπο διεύθυνσης δεν μπορεί να διαγραφεί
 DocType: Sales Invoice,Shipping Rule,Κανόνας αποστολής
@@ -2841,9 +2730,8 @@
 DocType: Workflow State,Search,Αναζήτηση
 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,Οι 'ημέρες από την τελευταία παραγγελία' πρέπει να είναι περισσότερες από 0
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +142,Brazing,Μπρουτζοκόλληση
 DocType: C-Form,Amended From,Τροποποίηση από
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Raw Material,Πρώτη ύλη
+apps/erpnext/erpnext/public/js/setup_wizard.js +359,Raw Material,Πρώτη ύλη
 DocType: Leave Application,Follow via Email,Ακολουθήστε μέσω email
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Ποσό φόρου μετά ποσού έκπτωσης
 apps/erpnext/erpnext/accounts/doctype/account/account.py +174,Child account exists for this account. You can not delete this account.,Υπάρχει θυγατρικός λογαριασμός για αυτόν το λογαριασμό. Δεν μπορείτε να διαγράψετε αυτόν το λογαριασμό.
@@ -2857,10 +2745,10 @@
 ,Produced,Παράχθηκε
 DocType: Item,Item Code for Suppliers,Κώδικας στοιχείων για Προμηθευτές
 DocType: Issue,Raised By (Email),Δημιουργήθηκε από (email)
-apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +72,General,Γενικός
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +495,Attach Letterhead,Επισύναψη επιστολόχαρτου
+apps/erpnext/erpnext/setup/setup_wizard/default_website.py +72,General,Γενικός
+apps/erpnext/erpnext/public/js/setup_wizard.js +241,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/setup/page/setup_wizard/setup_wizard.js +542,"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.","Λίστα φορολογική σας κεφάλια (π.χ. ΦΠΑ, Τελωνεία κλπ? Θα πρέπει να έχουν μοναδικά ονόματα) και κατ &#39;αποκοπή συντελεστές τους. Αυτό θα δημιουργήσει ένα πρότυπο πρότυπο, το οποίο μπορείτε να επεξεργαστείτε και να προσθέσετε περισσότερο αργότερα."
+apps/erpnext/erpnext/public/js/setup_wizard.js +284,"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.","Λίστα φορολογική σας κεφάλια (π.χ. ΦΠΑ, Τελωνεία κλπ? Θα πρέπει να έχουν μοναδικά ονόματα) και κατ &#39;αποκοπή συντελεστές τους. Αυτό θα δημιουργήσει ένα πρότυπο πρότυπο, το οποίο μπορείτε να επεξεργαστείτε και να προσθέσετε περισσότερο αργότερα."
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial Nos Required for Serialized Item {0},Οι σειριακοί αριθμοί είναι απαραίτητοι για το είδος με σειρά {0}
 DocType: Journal Entry,Bank Entry,Καταχώρηση τράπεζας
 DocType: Authorization Rule,Applicable To (Designation),Εφαρμοστέα σε (ονομασία)
@@ -2869,32 +2757,31 @@
 apps/erpnext/erpnext/config/accounts.py +143,Enable / disable currencies.,Ενεργοποίηση / απενεργοποίηση νομισμάτων.
 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),Σύνολο (ποσό)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +26,Entertainment & Leisure,Διασκέδαση & ψυχαγωγία
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,Διασκέδαση & ψυχαγωγία
 DocType: Purchase Order,The date on which recurring order will be stop,Η ημερομηνία κατά την οποία η επαναλαμβανόμενη παραγγελία θα σταματήσει
 DocType: Quality Inspection,Item Serial No,Σειριακός αριθμός είδους
 apps/erpnext/erpnext/controllers/status_updater.py +142,{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 +57,Total Present,Σύνολο παρόντων
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Hour,Ώρα
+apps/erpnext/erpnext/public/js/setup_wizard.js +363,Hour,Ώρα
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +138,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation","Το είδος σειράς {0} δεν μπορεί να ενημερωθεί \ χρησιμοποιώντας συμφωνία αποθέματος"""
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +488,Transfer Material to Supplier,Μεταφορά Υλικού Προμηθευτή
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +513,Transfer Material to Supplier,Μεταφορά Υλικού Προμηθευτή
 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/crm/doctype/opportunity/opportunity.js +82,Create Quotation,Δημιουργία προσφοράς
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +306,All these items have already been invoiced,Όλα αυτά τα είδη έχουν ήδη τιμολογηθεί
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,You are not authorized to approve leaves on Block Dates,Δεν επιτρέπεται να εγκρίνει φύλλα στο Block Ημερομηνίες
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +311,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,Point of sale
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +83,Curling,Κέρλινγκ
 DocType: Account,Tax,Φόρος
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +28,Row {0}: {1} is not a valid {2},Γραμμή {0}: {1} δεν είναι έγκυρο {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +89,Refining,Διύλιση
+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,Εργαλείο σχεδιασμού παραγωγής
 DocType: Quality Inspection,Report Date,Ημερομηνία έκθεσης
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +130,Routing,Δρομολόγηση
 DocType: C-Form,Invoices,Τιμολόγια
 DocType: Job Opening,Job Title,Τίτλος εργασίας
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +54,{0} already allocated for Employee {1} for period {2} - {3},{0} έχει ήδη διατεθεί υπάλληλου {1} για χρονικό διάστημα {2} - {3}
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +80,{0} Recipients,{0} Παραλήπτες
 DocType: Features Setup,Item Groups in Details,Ομάδες ειδών στις λεπτομέρειες
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +335,Quantity to Manufacture must be greater than 0.,Ποσότητα Παρασκευή πρέπει να είναι μεγαλύτερη από 0.
@@ -2912,14 +2799,13 @@
 DocType: DocType,Setup,Εγκατάσταση
 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,Περίληψη για το μήνα αυτό και εν αναμονή δραστηριότητες
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +39,Cold rolling,Ψυχρή έλαση
 DocType: Customer Group,Customer Group Name,Όνομα ομάδας πελατών
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +408,Please remove this Invoice {0} from C-Form {1},Παρακαλώ αφαιρέστε αυτό το τιμολόγιο {0} από τη c-form {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +410,Please remove this Invoice {0} from C-Form {1},Παρακαλώ αφαιρέστε αυτό το τιμολόγιο {0} από τη c-form {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,Γνωρίσματα
 DocType: Packing Slip,Get Items,Βρες είδη
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +186,Please enter Write Off Account,Παρακαλώ εισάγετε λογαριασμό διαγραφών
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +187,Please enter Write Off Account,Παρακαλώ εισάγετε λογαριασμό διαγραφών
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +71,Last Order Date,Τελευταία ημερομηνία παραγγελίας
 DocType: DocField,Image,Εικόνα
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +179,Make Excise Invoice,Δημιούργησε τιμολόγιο έμμεσης εσωτερικής φορολογίας 
@@ -2929,7 +2815,7 @@
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +146,Operation ID not set,Αναγνωριστικό λειτουργίας δεν έχει οριστεί
 DocType: Production Order,Planned Start Date,Προγραμματισμένη ημερομηνία έναρξης
 DocType: Serial No,Creation Document Type,Τύπος εγγράφου δημιουργίας
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +620,Maint. Visit,Συντήρηση. Επίσκεψη
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +631,Maint. Visit,Συντήρηση. Επίσκεψη
 DocType: Leave Type,Is Encash,Είναι είσπραξη
 DocType: Purchase Invoice,Mobile No,Αρ. Κινητού
 DocType: Payment Tool,Make Journal Entry,Δημιούργησε λογιστική εγγραφή
@@ -2937,35 +2823,31 @@
 apps/erpnext/erpnext/controllers/trends.py +257,Project-wise data is not available for Quotation,Τα στοιχεία με βάση το έργο δεν είναι διαθέσιμα στοιχεία για προσφορά
 DocType: Project,Expected End Date,Αναμενόμενη ημερομηνία λήξης
 DocType: Appraisal Template,Appraisal Template Title,Τίτλος προτύπου αξιολόγησης
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +440,Commercial,Εμπορικός
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +378,Commercial,Εμπορικός
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +23,Parent Item {0} must not be a Stock Item,Μητρική Θέση {0} δεν πρέπει να είναι ένα αναντικατάστατο
 DocType: Cost Center,Distribution Id,ID διανομής
-apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +14,Awesome Services,Εκπληκτικές υπηρεσίες
+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,Διεύθυνση προμηθευτή
 DocType: Contact Us Settings,Address Line 2,Γραμμή διεύθυνσης 2
 DocType: ToDo,Reference,Αναφορά
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +59,Perforating,Διάτρηση
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,Ποσότητα εκτός
 apps/erpnext/erpnext/config/accounts.py +128,Rules to calculate shipping amount for a sale,Κανόνες για τον υπολογισμό του ποσού αποστολής για την πώληση
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +29,Series is mandatory,Η σειρά είναι απαραίτητη
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +28,Financial Services,Χρηματοοικονομικές υπηρεσίες
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,Χρηματοοικονομικές υπηρεσίες
 apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3},Σχέση Χαρακτηριστικό {0} πρέπει να είναι εντός του εύρους από {1} σε {2} σε προσαυξήσεις των {3}
 DocType: Tax Rule,Sales,Πωλήσεις
 DocType: Stock Entry Detail,Basic Amount,Βασικό Ποσό
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +173,Warehouse required for stock Item {0},Απαιτείται αποθήκη για το είδος αποθέματος {0}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +178,Warehouse required for stock Item {0},Απαιτείται αποθήκη για το είδος αποθέματος {0}
 DocType: Leave Allocation,Unused leaves,Αχρησιμοποίητα φύλλα
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,Cr
 DocType: Customer,Default Receivable Accounts,Προεπιλεγμένοι λογαριασμοί εισπρακτέων
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +102,Sawing,Πριόνισμα
 DocType: Tax Rule,Billing State,Μέλος χρέωσης
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +32,Laminating,Πλαστικοποίησης
 DocType: Item Reorder,Transfer,Μεταφορά
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +549,Fetch exploded BOM (including sub-assemblies),Φέρε αναλυτική Λ.Υ. ( Συμπεριλαμβανομένων των υποσυνόλων )
 DocType: Authorization Rule,Applicable To (Employee), Εφαρμοστέα σε (υπάλληλος)
 apps/erpnext/erpnext/controllers/accounts_controller.py +101,Due Date is mandatory,Due Date είναι υποχρεωτική
 apps/erpnext/erpnext/controllers/item_variant.py +51,Increment for Attribute {0} cannot be 0,Προσαύξηση για Χαρακτηριστικό {0} δεν μπορεί να είναι 0
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +143,Sintering,Πυροσυσσωμάτωση
 DocType: Journal Entry,Pay To / Recd From,Πληρωτέο προς / λήψη από
 DocType: Naming Series,Setup Series,Εγκατάσταση σειρών
 DocType: Supplier,Contact HTML,Επαφή ΗΤΜΛ
@@ -2978,7 +2860,6 @@
 DocType: Attendance,Absent,Απών
 DocType: Product Bundle,Product Bundle,Πακέτο προϊόντων
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +180,Row {0}: Invalid reference {1},Σειρά {0}: Άκυρη αναφορά {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +165,Crushing,Σύνθλιψη
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Αγοράστε φόροι και επιβαρύνσεις Πρότυπο
 DocType: Upload Attendance,Download Template,Κατεβάστε πρότυπο
 DocType: GL Entry,Remarks,Παρατηρήσεις
@@ -2986,14 +2867,12 @@
 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/setup/page/setup_wizard/fixtures/operations.py +9,Continuous casting,Συνεχής χύτευση
 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/setup/page/setup_wizard/fixtures/operations.py +80,Cold sizing,Κρύο μέγεθος
 DocType: Salary Slip,Earning & Deduction,Κέρδος και έκπτωση
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +76,Account {0} cannot be a Group,Ο λογαριασμός {0} δεν μπορεί να είναι ομάδα
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +259,Region,Περιοχή
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +314,Region,Περιοχή
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +213,Optional. This setting will be used to filter in various transactions.,Προαιρετικό. Αυτή η ρύθμιση θα χρησιμοποιηθεί για το φιλτράρισμα σε διάφορες συναλλαγές.
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +104,Negative Valuation Rate is not allowed,Δεν επιτρέπεται αρνητική τιμή αποτίμησης
 DocType: Holiday List,Weekly Off,Εβδομαδιαίες αργίες
@@ -3011,7 +2890,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,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,Η συμμετοχή από και μέχρι είναι απαραίτητη
-apps/erpnext/erpnext/controllers/buying_controller.py +131,Please enter 'Is Subcontracted' as Yes or No,Παρακαλώ εισάγετε τιμή στο πεδίο 'υπεργολαβία' ναι ή όχι
+apps/erpnext/erpnext/controllers/buying_controller.py +122,Please enter 'Is Subcontracted' as Yes or No,Παρακαλώ εισάγετε τιμή στο πεδίο 'υπεργολαβία' ναι ή όχι
 DocType: Sales Team,Contact No.,Αριθμός επαφής
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,'Profit and Loss' type account {0} not allowed in Opening Entry,"Ο τύπος λογαριασμού ""κέρδη και ζημίες"" {0} δεν επιτρέπετεαι στην αρχική καταχώρηση λογαριασμών"
 DocType: Workflow State,Time,Χρόνος
@@ -3020,14 +2899,13 @@
 DocType: Authorization Rule,Authorization Rule,Κανόνας εξουσιοδότησης
 DocType: Sales Invoice,Terms and Conditions Details,Λεπτομέρειες όρων και προϋποθέσεων
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,Φόρους επί των πωλήσεων και Χρεώσεις Πρότυπο
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +10,Apparel & Accessories,Ένδυση & αξεσουάρ
+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,Αριθμός παραγγελίας
 DocType: Item Group,HTML / Banner that will show on the top of product list.,ΗΤΜΛ / banner που θα εμφανιστούν στην κορυφή της λίστας των προϊόντων.
 DocType: Shipping Rule,Specify conditions to calculate shipping amount,Καθορίστε τις συνθήκες για τον υπολογισμό του κόστους αποστολής
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +121,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/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +47,Conversion Factor is required,Ο συντελεστής μετατροπής είναι απαραίτητος
 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,Αξία / Περιγραφή
@@ -3035,10 +2913,8 @@
 ,Customers Not Buying Since Long Time,Πελάτες που έχουν πολύ καιρό να αγοράσουν
 DocType: Production Order,Expected Delivery Date,Αναμενόμενη ημερομηνία παράδοσης
 apps/erpnext/erpnext/accounts/general_ledger.py +121,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Χρεωστικών και Πιστωτικών δεν είναι ίση για {0} # {1}. Η διαφορά είναι {2}.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +48,Bulging,Διογκώνοντας
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +11,Evaporative-pattern casting,Χύτευση Εξατμιστική-μοτίβο
 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 +195,Sales Invoice {0} must be cancelled before cancelling this Sales Order,Το τιμολόγιο πώλησης {0} πρέπει να ακυρωθεί πριν από την ακύρωση αυτής της παραγγελίας πώλησης
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +190,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.
@@ -3057,26 +2933,24 @@
 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 +241,Account: {0} with currency: {1} can not be selected,Ο λογαριασμός: {0} με το νόμισμα: {1} δεν μπορεί να επιλεγεί
+apps/erpnext/erpnext/controllers/accounts_controller.py +242,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 +47,Account {0}: Parent account {1} does not belong to company: {2},Ο λογαριασμός {0}: γονικός λογαριασμός {1} δεν ανήκει στην εταιρεία: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted all transactions related to this company!,Διαγράφηκε επιτυχώς όλες τις συναλλαγές που σχετίζονται με αυτή την εταιρεία!
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,Ως ημερομηνία για
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +111,Honing,Ακονίζοντας
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +58,Probation,Επιτήρηση
-apps/erpnext/erpnext/stock/doctype/item/item.py +264,Default Warehouse is mandatory for stock Item.,Η προεπιλεγμένη αποθήκη είναι απαραίτητη για αποθηκεύσιμα είδη.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Probation,Επιτήρηση
+apps/erpnext/erpnext/stock/doctype/item/item.py +268,Default Warehouse is mandatory for stock Item.,Η προεπιλεγμένη αποθήκη είναι απαραίτητη για αποθηκεύσιμα είδη.
 DocType: Feed,Full Name,Ονοματεπώνυμο
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +148,Clinching,Στερεώνοντας
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +191,Payment of salary for the month {0} and year {1},Πληρωμή του μισθού για τον μήνα {0} και έτος {1}
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +173,Payment of salary for the month {0} and year {1},Πληρωμή του μισθού για τον μήνα {0} και έτος {1}
 DocType: Stock Settings,Auto insert Price List rate if missing,Αυτόματη ένθετο ποσοστό Τιμοκατάλογος αν λείπει
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,Συνολικό καταβεβλημένο ποσό
 ,Transferred Qty,Μεταφερόμενη ποσότητα
 apps/erpnext/erpnext/config/learn.py +11,Navigating,Πλοήγηση
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +137,Planning,Προγραμματισμός
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +137,Planning,Προγραμματισμός
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +9,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),Συνολικό Ποσό Χρέωσης (μέσω χρόνος Καταγράφει)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +629,We sell this Item,Πουλάμε αυτό το είδος
+apps/erpnext/erpnext/public/js/setup_wizard.js +365,We sell this Item,Πουλάμε αυτό το είδος
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +65,Supplier Id,ID προμηθευτή
 DocType: Journal Entry,Cash Entry,Καταχώρηση μετρητών
 DocType: Sales Partner,Contact Desc,Περιγραφή επαφής
@@ -3085,18 +2959,16 @@
 DocType: Brand,Item Manager,Θέση Διευθυντή
 DocType: Cost Center,Add rows to set annual budgets on Accounts.,Προσθέστε γραμμές για να θέσουν ετήσιους προϋπολογισμούς σε λογαριασμούς.
 DocType: Buying Settings,Default Supplier Type,Προεπιλεγμένος τύπος προμηθευτής
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +160,Quarrying,Λατομεία
 DocType: Production Order,Total Operating Cost,Συνολικό κόστος λειτουργίας
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +160,Note: Item {0} entered multiple times,Σημείωση : το σημείο {0} εισήχθηκε πολλαπλές φορές
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +163,Note: Item {0} entered multiple times,Σημείωση : το σημείο {0} εισήχθηκε πολλαπλές φορές
 apps/erpnext/erpnext/config/crm.py +27,All Contacts.,Όλες οι επαφές.
 DocType: Newsletter,Test Email Id,Δοκιμαστικό email ID
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +394,Company Abbreviation,Συντομογραφία εταιρείας
+apps/erpnext/erpnext/public/js/setup_wizard.js +142,Company Abbreviation,Συντομογραφία εταιρείας
 DocType: Features Setup,If you follow Quality Inspection. Enables Item QA Required and QA No in Purchase Receipt,Αν ακολουθείτε έλεγχο ποιότητας. Επιτρέπει την επιλογή (εξασφάλιση ποιότητας) q.A. Απαιτείται και αρ. Δ.Π. στο αποδεικτικό παραλαβής αγοράς.
 DocType: GL Entry,Party Type,Τύπος συμβαλλόμενου
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +68,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/setup/page/setup_wizard/fixtures/operations.py +30,Rotational molding,Περιστροφική χύτευση
 apps/erpnext/erpnext/config/hr.py +115,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,Ορισμός φορολογική Κανόνας για το καλάθι αγορών
@@ -3110,15 +2982,15 @@
 apps/erpnext/erpnext/config/selling.py +18,Quotes to Leads or Customers.,Προσφορές σε επαφές ή πελάτες.
 DocType: Stock Settings,Role Allowed to edit frozen stock,Ο ρόλος έχει τη δυνατότητα επεξεργασίας παγωμένου απόθεματος
 ,Territory Target Variance Item Group-Wise,Εύρος στόχων περιοχής ανά ομάδα ειδών
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +101,All Customer Groups,Όλες οι ομάδες πελατών
-apps/erpnext/erpnext/controllers/accounts_controller.py +474,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,Η {0} είναι απαραίτητη. Ίσως δεν έχει δημιουργηθεί εγγραφή ισοτιμίας συναλλάγματος από {1} έως {2}.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +101,All Customer Groups,Όλες οι ομάδες πελατών
+apps/erpnext/erpnext/controllers/accounts_controller.py +475,{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 +41,Account {0}: Parent account {1} does not exist,Ο λογαριασμός {0}: γονικός λογαριασμός {1} δεν υπάρχει
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Τιμή τιμοκαταλόγου (νόμισμα της εταιρείας)
 DocType: Account,Temporary,Προσωρινός
 DocType: Address,Preferred Billing Address,Προτιμώμενη διεύθυνση χρέωσης
 DocType: Monthly Distribution Percentage,Percentage Allocation,Ποσοστό κατανομής
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +86,Secretary,Γραμματέας
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Secretary,Γραμματέας
 DocType: Serial No,Distinct unit of an Item,Διακριτή μονάδα ενός είδους
 DocType: Pricing Rule,Buying,Αγορά
 DocType: HR Settings,Employee Records to be created by,Εγγραφές των υπαλλήλων που πρόκειται να δημιουργηθούν από
@@ -3131,9 +3003,8 @@
 ,Item-wise Price List Rate,Τιμή τιμοκαταλόγου ανά είδος
 DocType: Purchase Order Item,Supplier Quotation,Προσφορά προμηθευτή
 DocType: Quotation,In Words will be visible once you save the Quotation.,Με λόγια θα είναι ορατά αφού αποθηκεύσετε το πρόσημο.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +68,Ironing,Σιδερώματος
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is stopped,{0} {1} Είναι σταματημένο
-apps/erpnext/erpnext/stock/doctype/item/item.py +352,Barcode {0} already used in Item {1},Το barcode {0} έχει ήδη χρησιμοποιηθεί στο είδος {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +356,Barcode {0} already used in Item {1},Το barcode {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/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,Ανερχόμενες εκδηλώσεις
@@ -3142,13 +3013,12 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +27,Quick Entry,Γρήγορη Έναρξη
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0} είναι υποχρεωτική για την Επιστροφή
 DocType: Purchase Order,To Receive,Να Λάβω
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +33,Shrink fitting,Συρρίκνωση τοποθέτηση
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +522,user@example.com,user@example.com
+apps/erpnext/erpnext/public/js/setup_wizard.js +266,user@example.com,user@example.com
 DocType: Email Digest,Income / Expense,Έσοδα / δαπάνες
 DocType: Employee,Personal Email,Προσωπικό email
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +58,Total Variance,Συνολική διακύμανση
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +62,Total Variance,Συνολική διακύμανση
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.","Εάν είναι ενεργοποιημένο, το σύστημα θα καταχωρεί λογιστικές εγγραφές για την απογραφή αυτόματα."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +15,Brokerage,Μεσιτεία
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +15,Brokerage,Μεσιτεία
 DocType: Address,Postal Code,Ταχυδρομικός Κώδικας
 DocType: Production Order Operation,"in Minutes
 Updated via 'Time Log'","Σε λεπτά 
@@ -3156,14 +3026,13 @@
 DocType: Customer,From Lead,Από επαφή
 apps/erpnext/erpnext/config/manufacturing.py +19,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 +442,POS Profile required to make POS Entry,POS Προφίλ απαιτούνται για να κάνουν POS Έναρξη
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +444,POS Profile required to make POS Entry,POS Προφίλ απαιτούνται για να κάνουν POS Έναρξη
 DocType: Hub Settings,Name Token,Name Token
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +106,Planing,Πλάνες
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Selling,Πρότυπες πωλήσεις
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +120,Standard Selling,Πρότυπες πωλήσεις
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +137,Atleast one warehouse is mandatory,Τουλάχιστον μια αποθήκη είναι απαραίτητη
 DocType: Serial No,Out of Warranty,Εκτός εγγύησης
 DocType: BOM Replace Tool,Replace,Αντικατάσταση
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +314,{0} against Sales Invoice {1},{0} κατά το τιμολόγιο πώλησης {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +316,{0} against Sales Invoice {1},{0} κατά το τιμολόγιο πώλησης {1}
 apps/erpnext/erpnext/stock/doctype/item/item.py +49,Please enter default Unit of Measure,Παρακαλώ εισάγετε προεπιλεγμένη μονάδα μέτρησης
 DocType: Purchase Invoice Item,Project Name,Όνομα έργου
 DocType: Supplier,Mention if non-standard receivable account,Αναφέρετε αν μη τυποποιημένα εισπρακτέα λογαριασμού
@@ -3179,9 +3048,8 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,Journal Entry {0} does not have account {1} or already matched against other voucher,Η λογιστική εγγραφή {0} δεν έχει λογαριασμό {1} ή έχει ήδη αντιπαραβληθεί με άλλο αποδεικτικό
 DocType: Item,Moving Average,Κινητός μέσος
 DocType: BOM Replace Tool,The BOM which will be replaced,Η Λ.Υ. που θα αντικατασταθεί
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +43,New Stock UOM must be different from current stock UOM,Η νέα Μ.Μ. Αποθέματος πρέπει να είναι διαφορετική από την τρέχουσα Μ.Μ.αποθέματος
 DocType: Account,Debit,Χρέωση
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +34,Leaves must be allocated in multiples of 0.5,"Οι άδειες πρέπει να κατανέμονται σαν πολλαπλάσια του 0, 5"
+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/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,Οφειλόμενο ποσό
@@ -3199,8 +3067,7 @@
 DocType: Employee,Internal Work History,Ιστορία εσωτερική εργασία
 DocType: DocField,Column Break,Αλλαγή στήλης
 DocType: Event,Thursday,Πέμπτη
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +42,Private Equity,Ιδιωτικά κεφάλαια
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +93,Turning,Στροφή
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,Ιδιωτικά κεφάλαια
 DocType: Maintenance Visit,Customer Feedback,Σχόλια πελατών
 DocType: Account,Expense,Δαπάνη
 DocType: Sales Invoice,Exhibition,Έκθεση
@@ -3213,19 +3080,19 @@
 DocType: Employee,Held On,Πραγματοποιήθηκε την
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +33,Production Item,Είδος παραγωγής
 ,Employee Information,Πληροφορίες υπαλλήλου
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,Rate (%),Ποσοστό ( % )
+apps/erpnext/erpnext/public/js/setup_wizard.js +294,Rate (%),Ποσοστό ( % )
 DocType: Stock Entry Detail,Additional Cost,Πρόσθετο κόστος
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +407,Financial Year End Date,Ημερομηνία λήξης για η χρήση 
+apps/erpnext/erpnext/public/js/setup_wizard.js +155,Financial Year End Date,Ημερομηνία λήξης για η χρήση 
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Voucher No, if grouped by Voucher","Δεν μπορείτε να φιλτράρετε με βάση αρ. αποδεικτικού, αν είναι ομαδοποιημένες ανά αποδεικτικό"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +484,Make Supplier Quotation,Δημιούργησε προσφορά προμηθευτή
 DocType: Quality Inspection,Incoming,Εισερχόμενος
 DocType: BOM,Materials Required (Exploded),Υλικά που απαιτούνται (αναλυτικά)
 DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),Μείωση κερδών για άδεια άνευ αποδοχών (Α.Α.Α.)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +512,"Add users to your organization, other than yourself","Προσθέστε χρήστες για τον οργανισμό σας, εκτός από τον εαυτό σας"
+apps/erpnext/erpnext/public/js/setup_wizard.js +256,"Add users to your organization, other than yourself","Προσθέστε χρήστες για τον οργανισμό σας, εκτός από τον εαυτό σας"
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No {1} does not match with {2} {3},Σειρά # {0}: Αύξων αριθμός {1} δεν ταιριάζει με το {2} {3}
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +44,Casual Leave,Περιστασιακή άδεια
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +44,Casual Leave,Περιστασιακή άδεια
 DocType: Batch,Batch ID,ID παρτίδας
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +334,Note: {0},Σημείωση : {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +336,Note: {0},Σημείωση : {0}
 ,Delivery Note Trends,Τάσεις δελτίου αποστολής
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +104,This Week's Summary,Περίληψη της Εβδομάδας
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +74,{0} must be a Purchased or Sub-Contracted Item in row {1},{0} Το είδος στη γραμμή {1} πρέπει να είναι αγορασμένο ή από υπεργολαβία
@@ -3237,7 +3104,7 @@
 DocType: Purchase Receipt,Return Against Purchase Receipt,Επιστροφή Ενάντια απόδειξη αγοράς
 DocType: Purchase Order,To Bill,Για τιμολόγηση
 DocType: Material Request,% Ordered,Διέταξε%
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +61,Piecework,Εργασία με το κομμάτι
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Piecework,Εργασία με το κομμάτι
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +64,Avg. Buying Rate,Μέση τιμή αγοράς
 DocType: Task,Actual Time (in Hours),Πραγματικός χρόνος (σε ώρες)
 DocType: Employee,History In Company,Ιστορικό στην εταιρεία
@@ -3254,13 +3121,13 @@
 DocType: Opportunity,To Discuss,Για συζήτηση
 DocType: SMS Settings,SMS Settings,Ρυθμίσεις SMS
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +60,Temporary Accounts,Προσωρινή Λογαριασμοί
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +155,Black,Μαύρος
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Black,Μαύρος
 DocType: BOM Explosion Item,BOM Explosion Item,Είδος ανάπτυξης Λ.Υ.
 DocType: Account,Auditor,Ελεγκτής
 DocType: Purchase Order,End date of current order's period,Ημερομηνία λήξης της περιόδου της τρέχουσας παραγγελίας
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +17,Make Offer Letter,Πραγματοποίηση προσφοράς Επιστολή
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +10,Return,Απόδοση
-apps/erpnext/erpnext/stock/doctype/item/item.py +503,Default Unit of Measure for Variant must be same as Template,Προεπιλεγμένη μονάδα μέτρησης για την παραλλαγή πρέπει να είναι ίδιο με το Πρότυπο
+apps/erpnext/erpnext/stock/doctype/item/item.py +507,Default Unit of Measure for Variant must be same as Template,Προεπιλεγμένη μονάδα μέτρησης για την παραλλαγή πρέπει να είναι ίδιο με το Πρότυπο
 DocType: DocField,Fold,Αναδίπλωση
 DocType: Production Order Operation,Production Order Operation,Λειτουργία παραγγελίας παραγωγής
 DocType: Pricing Rule,Disable,Απενεργοποίηση
@@ -3271,13 +3138,12 @@
 DocType: Page,Page Name,Όνομα σελίδας
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +110,To Time must be greater than From Time,"Σε καιρό πρέπει να είναι μεγαλύτερη από ό, τι από καιρό"
 DocType: Journal Entry Account,Exchange Rate,Ισοτιμία
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +465,Sales Order {0} is not submitted,Η παραγγελία πώλησης {0} δεν έχει υποβληθεί
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +467,Sales Order {0} is not submitted,Η παραγγελία πώλησης {0} δεν έχει υποβληθεί
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0}: Parent account {1} does not bolong to the company {2},Αποθήκη {0}:ο γονικός λογαριασμός {1} δεν ανήκει στην εταιρεία {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +124,Spindle finishing,Spindle φινίρισμα
 DocType: BOM,Last Purchase Rate,Τελευταία τιμή αγοράς
 DocType: Account,Asset,Περιουσιακό στοιχείο
 DocType: Project Task,Task ID,Task ID
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +395,"e.g. ""MC""","Π.Χ. "" Mc """
+apps/erpnext/erpnext/public/js/setup_wizard.js +143,"e.g. ""MC""","Π.Χ. "" Mc """
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,Stock cannot exist for Item {0} since has variants,Δεν μπορεί να υπάρχει απόθεμα για το είδος {0} γιατί έχει παραλλαγές
 ,Sales Person-wise Transaction Summary,Περίληψη συναλλαγών ανά πωλητή
 DocType: System Settings,Time Zone,Ζώνη ώρας
@@ -3286,9 +3152,7 @@
 DocType: Monthly Distribution,Monthly Distribution Percentages,Ποσοστά μηνιαίας διανομής
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +16,The selected item cannot have Batch,Το επιλεγμένο είδος δεν μπορεί να έχει παρτίδα
 DocType: Delivery Note,% of materials delivered against this Delivery Note,% Των υλικών που παραδίδονται σε αυτό το δελτίο αποστολής
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +151,Stapling,Συρραφή
 DocType: Customer,Customer Details,Στοιχεία πελάτη
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +105,Shaping,Διαμόρφωση
 DocType: Employee,Reports to,Εκθέσεις προς
 DocType: SMS Settings,Enter url parameter for receiver nos,Εισάγετε παράμετρο url για αριθμούς παραλήπτη
 DocType: Sales Invoice,Paid Amount,Καταβληθέν ποσό
@@ -3297,13 +3161,13 @@
 DocType: Item Variant,Item Variant,Παραλλαγή είδους
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +15,Setting this Address Template as default as there is no other default,"Αυτό το πρότυπο διεύθυνσης ορίστηκε ως προεπιλογή, καθώς δεν υπάρχει άλλη προεπιλογή."
 apps/erpnext/erpnext/accounts/doctype/account/account.py +89,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Το υπόλοιπο του λογαριασμού είναι ήδη χρεωστικό, δεν μπορείτε να ορίσετε την επιλογή το υπόλοιπο πρέπει να είναι 'πιστωτικό'"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +76,Quality Management,Διαχείριση ποιότητας
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Quality Management,Διαχείριση ποιότητας
 DocType: Production Planning Tool,Filter based on customer,Φιλτράρισμα με βάση τον πελάτη
 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}
 DocType: Employee External Work History,Employee External Work History,Ιστορικό εξωτερικών εργασιών υπαλλήλου
 DocType: Tax Rule,Purchase,Αγορά
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +34,Balance Qty,Ισολογισμός ποσότητας
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Balance Qty,Ισολογισμός ποσότητας
 DocType: Item Group,Parent Item Group,Ομάδα γονικού είδους
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +21,{0} for {1},{0} για {1}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +96,Cost Centers,Κέντρα κόστους
@@ -3313,12 +3177,12 @@
 DocType: Opportunity,Next Contact,Επόμενο Επικοινωνία
 DocType: Employee,Employment Type,Τύπος απασχόλησης
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,Πάγια
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +84,Application period cannot be across two alocation records,Περίοδος υποβολής των αιτήσεων δεν μπορεί να είναι σε δύο εγγραφές alocation
 DocType: Item Group,Default Expense Account,Προεπιλεγμένος λογαριασμός δαπανών
 DocType: Employee,Notice (days),Ειδοποίηση (ημέρες)
 DocType: Page,Yes,Ναι
 DocType: Tax Rule,Sales Tax Template,Φόρος επί των πωλήσεων Πρότυπο
 DocType: Employee,Encashment Date,Ημερομηνία εξαργύρωσης
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +74,Electroforming,Electroforming
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +179,"Against Voucher Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Κατά τον τύπο του αποδεικτικού πρέπει να είναι παραγγελία αγοράς, τιμολόγιο αγοράς ή ημερολογιακή εγγραφή "
 DocType: Account,Stock Adjustment,Διευθέτηση αποθέματος
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +34,Default Activity Cost exists for Activity Type - {0},Υπάρχει Προεπιλογή Δραστηριότητα κόστος για Τύπος Δραστηριότητα - {0}
@@ -3354,12 +3218,12 @@
 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,Διανομή
 apps/erpnext/erpnext/public/js/pos/pos.html +36,Amount Paid,Πληρωμένο Ποσό
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +91,Project Manager,Υπεύθυνος έργου
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +72,Dispatch,Αποστολή
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Project Manager,Υπεύθυνος έργου
+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: Customer,Default Taxes and Charges,Προεπιλογή Φόροι και τέλη
 DocType: Account,Receivable,Εισπρακτέος
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +268,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,"Σειρά # {0}: Δεν επιτρέπεται να αλλάξουν προμηθευτή, όπως υπάρχει ήδη παραγγελίας"
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +263,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.","Εάν είναι επιλεγμένο, οι Λ.Υ. Για τα εξαρτήματα θα ληφθούν υπόψη για να παρθούν οι πρώτες ύλες. Διαφορετικά, όλα τα υπο-συγκρότημα είδη θα πρέπει να αντιμετωπίζονται ως πρώτη ύλη."
@@ -3367,8 +3231,8 @@
 DocType: Hub Settings,Seller Description,Περιγραφή πωλητή
 DocType: Employee Education,Qualification,Προσόν
 DocType: Item Price,Item Price,Τιμή είδους
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +48,Soap & Detergent,Σαπούνι & απορρυπαντικά
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +36,Motion Picture & Video,Motion picture & βίντεο
+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,Motion picture & βίντεο
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Έχουν παραγγελθεί
 DocType: Warehouse,Warehouse Name,Όνομα αποθήκης
 DocType: Naming Series,Select Transaction,Επιλέξτε συναλλαγή
@@ -3377,7 +3241,6 @@
 DocType: BOM,Rate Of Materials Based On,Τιμή υλικών με βάση
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,Στατιστικά στοιχεία υποστήριξης
 apps/erpnext/erpnext/accounts/doctype/accounts_settings/accounts_settings.py +27,Company is missing in warehouses {0},Η εταιρεία λείπει στις αποθήκες {0}
-DocType: Stock UOM Replace Utility,Stock UOM Replace Utility,Εργαλείο αντικατάστασης Μ.Μ. για το απόθεμα
 DocType: POS Profile,Terms and Conditions,Όροι και προϋποθέσεις
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,To Date should be within the Fiscal Year. Assuming To Date = {0},Η 'εώς ημερομηνία' πρέπει να είναι εντός της χρήσης. Υποθέτοντας 'έως ημερομηνία' = {0}
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","Εδώ μπορείτε να διατηρήσετε το ύψος, το βάρος, τις αλλεργίες, ιατροφαρμακευτική περίθαλψη, κλπ. Ανησυχίες"
@@ -3389,7 +3252,7 @@
 DocType: Sales Order Item,For Production,Για την παραγωγή
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +103,Please enter sales order in the above table,Παρακαλώ εισάγετε την παραγγελία πώλησης στον παραπάνω πίνακα
 DocType: Project Task,View Task,Προβολή εργασιών
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +406,Your financial year begins on,Το οικονομικό έτος σας αρχίζει
+apps/erpnext/erpnext/public/js/setup_wizard.js +154,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: Email Digest,Add/Remove Recipients,Προσθήκη / αφαίρεση παραληπτών
@@ -3397,16 +3260,14 @@
 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),Ρύθμιση διακομιστή εισερχομένων για το email 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 +528,Item variant {0} exists with same attributes,Παραλλαγή Θέση {0} υπάρχει με ίδια χαρακτηριστικά
+apps/erpnext/erpnext/stock/doctype/item/item.py +532,Item variant {0} exists with same attributes,Παραλλαγή Θέση {0} υπάρχει με ίδια χαρακτηριστικά
 DocType: Salary Slip,Salary Slip,Βεβαίωση αποδοχών
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +116,Burnishing,Γυάλισμα
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +54,'To Date' is required,Το πεδίο 'έως ημερομηνία' είναι απαραίτητο.
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,Το πεδίο 'έως ημερομηνία' είναι απαραίτητο.
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","Δημιουργία δελτίων συσκευασίας για τα πακέτα που είναι να παραδοθούν. Χρησιμοποιείται για να ενημερώσει τον αριθμό πακέτου, το περιεχόμενο του πακέτου και το βάρος του."
 DocType: Sales Invoice Item,Sales Order Item,Είδος παραγγελίας πώλησης
 DocType: Salary Slip,Payment Days,Ημέρες πληρωμής
 DocType: BOM,Manage cost of operations,Διαχειριστείτε το κόστος των εργασιών
 DocType: Features Setup,Item Advanced,Στοιχεία είδους για προχωρημένους
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +40,Hot rolling,Θερμή έλαση
 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.","Όταν υποβληθεί οποιαδήποτε από τις επιλεγμένες συναλλαγές, θα ανοίξει αυτόματα ένα pop-up παράθυρο email ώστε αν θέλετε να στείλετε ένα μήνυμα email στη συσχετισμένη επαφή για την εν λόγω συναλλαγή, με τη συναλλαγή ως συνημμένη."
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,Καθολικές ρυθμίσεις
 DocType: Employee Education,Employee Education,Εκπαίδευση των υπαλλήλων
@@ -3419,25 +3280,23 @@
 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/setup/page/setup_wizard/install_fixtures.py +48,Sick Leave,Αναρρωτική άδεια
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +174,Invalid {0},Άκυρη {0}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +48,Sick Leave,Αναρρωτική άδεια
 DocType: Email Digest,Email Digest,Ενημερωτικό άρθρο email
 DocType: Delivery Note,Billing Address Name,Όνομα διεύθυνσης χρέωσης
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +22,Department Stores,Πολυκαταστήματα
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,Πολυκαταστήματα
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +40,System Balance,Ισοροπία συστήματος
 DocType: Workflow,Is Active,Είναι ενεργό
 apps/erpnext/erpnext/controllers/stock_controller.py +71,No accounting entries for the following warehouses,Δεν βρέθηκαν λογιστικές καταχωρήσεις για τις ακόλουθες αποθήκες
 apps/erpnext/erpnext/projects/doctype/project/project.js +22,Save the document first.,Αποθηκεύστε πρώτα το έγγραφο.
 DocType: Account,Chargeable,Χρεώσιμο
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +121,Linishing,Linishing
 DocType: Company,Change Abbreviation,Αλλαγή συντομογραφίας
 DocType: Workflow State,Primary,Πρωταρχικός
 DocType: Expense Claim Detail,Expense Date,Ημερομηνία δαπάνης
 DocType: Item,Max Discount (%),Μέγιστη έκπτωση (%)
 DocType: Communication,More Information,Περισσότερες πληροφορίες
 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/setup/page/setup_wizard/fixtures/operations.py +161,Blasting,Ανατίναξη
 DocType: Company,Warn,Προειδοποιώ
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +111,Item valuation updated,Η αποτίμηση είδους ενημερώθηκε
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Οποιεσδήποτε άλλες παρατηρήσεις, αξιοσημείωτη προσπάθεια που πρέπει να πάει στα αρχεία."
 DocType: BOM,Manufacturing User,Χρήστης παραγωγής
 DocType: Purchase Order,Raw Materials Supplied,Πρώτες ύλες που προμηθεύτηκαν
@@ -3447,7 +3306,7 @@
 DocType: Appraisal,Appraisal Template,Πρότυπο αξιολόγησης
 DocType: Communication,Email,Email
 DocType: Item Group,Item Classification,Ταξινόμηση είδους
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +89,Business Development Manager,Διαχειριστής ανάπτυξης επιχείρησης
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Business Development Manager,Διαχειριστής ανάπτυξης επιχείρησης
 DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,Σκοπός επίσκεψης συντήρησης
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.js +15,Period,Περίοδος
 ,General Ledger,Γενικό καθολικό
@@ -3457,9 +3316,7 @@
 ,Itemwise Recommended Reorder Level,Προτεινόμενο επίπεδο επαναπαραγγελίας ανά είδος
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +264,Please select {0} first,Παρακαλώ επιλέξτε {0} πρώτα
 DocType: Features Setup,To get Item Group in details table,Για λήψη της oμάδας ειδών σε πίνακα λεπτομερειών
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +67,Redrawing,Επαναχαράσσοντας
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +112,Batch {0} of Item {1} has expired.,Παρτίδα {0} του σημείου {1} έχει λήξει.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +120,Etching,Χαλκογραφία
 DocType: Sales Invoice,Commission,Προμήθεια
 DocType: Address Template,"<h4>Default Template</h4>
 <p>Uses <a href=""http://jinja.pocoo.org/docs/templates/"">Jinja Templating</a> and all the fields of Address (including Custom Fields if any) will be available</p>
@@ -3504,7 +3361,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +340,Operation Time must be greater than 0 for Operation {0},Χρόνος λειτουργίας πρέπει να είναι μεγαλύτερη από 0 για τη λειτουργία {0}
 DocType: Supplier,Address and Contacts,Διεύθυνση και Επικοινωνία
 DocType: UOM Conversion Detail,UOM Conversion Detail,Λεπτομέρειες μετατροπής Μ.Μ.
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +496,Keep it web friendly 900px (w) by 100px (h),Φροντίστε να είναι φιλικό προς το web 900px ( w ) με 100px ( h )
+apps/erpnext/erpnext/public/js/setup_wizard.js +242,Keep it web friendly 900px (w) by 100px (h),Φροντίστε να είναι φιλικό προς το web 900px ( w ) με 100px ( h )
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +329,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,Βρες εκκρεμή αποδεικτικά
@@ -3520,54 +3377,49 @@
 DocType: Item,Average time taken by the supplier to deliver,Μέσος χρόνος που απαιτείται από τον προμηθευτή να παραδώσει
 DocType: Time Log,Hours,Ώρες
 DocType: Project,Expected Start Date,Αναμενόμενη ημερομηνία έναρξης
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +38,Rolling,Τροχαίο
 DocType: ToDo,Priority,Προτεραιότητα
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +41,Remove item if charges is not applicable to that item,Αφαιρέστε το είδος εάν οι επιβαρύνσεις δεν ισχύουν για αυτό το είδος
 DocType: Dropbox Backup,Dropbox Access Allowed,Επιτρέπεται η πρόσβαση στο dropbox
 DocType: Dropbox Backup,Weekly,Εβδομαδιαίος
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,Π.Χ. SMSgateway.Com / api / send_SMS.Cgi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +485,Receive,Λήψη
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +510,Receive,Λήψη
 DocType: Maintenance Visit,Fully Completed,Πλήρως ολοκληρωμένο
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% ολοκληρωμένο
 DocType: Employee,Educational Qualification,Εκπαιδευτικά προσόντα
 DocType: Workstation,Operating Costs,Λειτουργικά έξοδα
 DocType: Employee Leave Approver,Employee Leave Approver,Υπεύθυνος έγκρισης αδειών υπαλλήλου
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,{0} has been successfully added to our Newsletter list.,{0} έχει προστεθεί με επιτυχία στην λίστα ενημερωτικών δελτίων μας.
-apps/erpnext/erpnext/stock/doctype/item/item.py +383,Row {0}: An Reorder entry already exists for this warehouse {1},Γραμμή {0}: μια καταχώρηση αναδιάταξης υπάρχει ήδη για αυτή την αποθήκη {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +387,Row {0}: An Reorder entry already exists for this warehouse {1},Γραμμή {0}: μια καταχώρηση αναδιάταξης υπάρχει ήδη για αυτή την αποθήκη {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +67,"Cannot declare as lost, because Quotation has been made.","Δεν μπορεί να δηλώθει ως απολεσθέν, επειδή έχει γίνει προσφορά."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +133,Electron beam machining,Μηχανουργική κατεργασία με δέσμη ηλεκτρονίων
 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 +150,Please select Start Date and End Date for Item {0},Παρακαλώ επιλέξτε ημερομηνία έναρξης και ημερομηνία λήξης για το είδος {0}
 apps/erpnext/erpnext/config/stock.py +141,Main Reports,Κύριες εκθέσεις
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +102,Stock Ledger entries balances updated,Ενημερώθηκαν τα υπόλοιπα για καθολικές καταχωρήσεις αποθέματος
 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,Τύπος εγγράφου του προηγούμενου εγγράφου
-apps/erpnext/erpnext/stock/doctype/item/item.js +176,Add / Edit Prices,Προσθήκη / επεξεργασία τιμών
+apps/erpnext/erpnext/stock/doctype/item/item.js +178,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 +298,My Orders,Οι παραγγελίες μου
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +293,My Orders,Οι παραγγελίες μου
 DocType: Price List,Price List Name,Όνομα τιμοκαταλόγου
 DocType: Time Log,For Manufacturing,Στον τομέα της Μεταποίησης
-apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +70,Totals,Σύνολα
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +174,Totals,Σύνολα
 DocType: BOM,Manufacturing,Παραγωγή
 ,Ordered Items To Be Delivered,Παραγγελθέντα είδη για παράδοση
 DocType: Account,Income,Έσοδα
 ,Setup Wizard,Οδηγός εγκατάστασης
 DocType: Industry Type,Industry Type,Τύπος βιομηχανίας
 apps/erpnext/erpnext/templates/includes/cart.js +137,Something went wrong!,Κάτι πήγε στραβά!
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +68,Warning: Leave application contains following block dates,Προσοχή: η αίτηση αδείας περιλαμβάνει τις εξής μπλοκαρισμένες ημερομηνίες
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +251,Sales Invoice {0} has already been submitted,Το τιμολόγιο πώλησης {0} έχει ήδη υποβληθεί
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +100,Warning: Leave application contains following block dates,Προσοχή: η αίτηση αδείας περιλαμβάνει τις εξής μπλοκαρισμένες ημερομηνίες
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +256,Sales Invoice {0} has already been submitted,Το τιμολόγιο πώλησης {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/setup/page/setup_wizard/fixtures/operations.py +10,Die casting,Die χύτευσης
 DocType: Email Alert,Reference Date,Ημερομηνία αναφοράς
 apps/erpnext/erpnext/config/hr.py +105,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,Παρακαλώ εισάγετε το μήνυμα πριν από την αποστολή
 DocType: Async Task,Status,Κατάσταση
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +65,Stock UOM updated for Item {0},Η Μ.Μ. ενημερώθηκε για το είδος {0}
 DocType: Company History,Year,Έτος
 apps/erpnext/erpnext/config/accounts.py +127,Point-of-Sale Profile,Point-of-Sale Προφίλ
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +68,Please Update SMS Settings,Παρακαλώ ενημερώστε τις ρυθμίσεις SMS
@@ -3581,12 +3433,12 @@
 ,Serial No Service Contract Expiry,Λήξη σύμβασης παροχής υπηρεσιών για τον σειριακό αριθμό
 DocType: Item,Unit of Measure Conversion,Μονάδα μετατροπής Μέτρου
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +86,Employee can not be changed,Υπάλληλος που δεν μπορεί να αλλάξει
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +259,You cannot credit and debit same account at the same time,Δεν μπορείτε να πιστώσετε και να χρεώσετε ταυτόχρονα τον ίδιο λογαριασμό
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,You cannot credit and debit same account at the same time,Δεν μπορείτε να πιστώσετε και να χρεώσετε ταυτόχρονα τον ίδιο λογαριασμό
 DocType: Naming Series,Help HTML,Βοήθεια ΗΤΜΛ
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},Το σύνολο βάρους πού έχει ανατεθεί έπρεπε να είναι 100 %. Είναι {0}
 apps/erpnext/erpnext/controllers/status_updater.py +140,Allowance for over-{0} crossed for Item {1},Επίδομα πάνω-{0} ξεπεράστηκε για το είδος {1}
 DocType: Address,Name of person or organization that this address belongs to.,Όνομα προσώπου ή οργανισμού που ανήκει αυτή η διεύθυνση.
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +587,Your Suppliers,Οι προμηθευτές σας
+apps/erpnext/erpnext/public/js/setup_wizard.js +325,Your Suppliers,Οι προμηθευτές σας
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,"Δεν μπορεί να οριστεί ως απολεσθέν, καθώς έχει γίνει παραγγελία πώλησης."
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +65,Another Salary Structure {0} is active for employee {1}. Please make its status 'Inactive' to proceed.,Ένα άλλο μισθολόγιο είναι {0} ενεργό για τον υπάλληλο {0}. Παρακαλώ ορίστε την κατάσταση του ως ανενεργό για να προχωρήσετε.
 DocType: Purchase Invoice,Contact,Επαφή
@@ -3595,37 +3447,35 @@
 DocType: Item,Has Serial No,Έχει σειριακό αριθμό
 DocType: Employee,Date of Issue,Ημερομηνία έκδοσης
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +16,{0}: From {0} for {1},{0}: Από {0} για {1}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +154,Row #{0}: Set Supplier for item {1},Σειρά # {0}: Ορισμός Προμηθευτή για το στοιχείο {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +149,Row #{0}: Set Supplier for item {1},Σειρά # {0}: Ορισμός Προμηθευτή για το στοιχείο {1}
 DocType: Issue,Content Type,Τύπος περιεχομένου
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +17,Computer,Ηλεκτρονικός υπολογιστής
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,Ηλεκτρονικός υπολογιστής
 DocType: Item,List this Item in multiple groups on the website.,Εμφάνισε το είδος σε πολλαπλές ομάδες στην ιστοσελίδα.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +283,Please check Multi Currency option to allow accounts with other currency,Παρακαλώ ελέγξτε Πολλαπλών επιλογή νομίσματος για να επιτρέψει τους λογαριασμούς με άλλο νόμισμα
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +285,Please check Multi Currency option to allow accounts with other currency,Παρακαλώ ελέγξτε Πολλαπλών επιλογή νομίσματος για να επιτρέψει τους λογαριασμούς με άλλο νόμισμα
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +62,Item: {0} does not exist in the system,Το είδος: {0} δεν υπάρχει στο σύστημα
 apps/erpnext/erpnext/accounts/doctype/account/account.py +81,You are not authorized to set Frozen value,Δεν επιτρέπεται να ορίσετε παγωμένη αξία
 DocType: Payment Reconciliation,Get Unreconciled Entries,Βρες καταχωρήσεις χωρίς συμφωνία 
 DocType: Cost Center,Budgets,Κατασκευή έκθεσης
 apps/frappe/frappe/core/page/modules_setup/modules_setup.py +11,Updated,Ενημέρωση
 DocType: Employee,Emergency Contact Details,Είδη επικοινωνίας έκτακτης ανάγκης
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +396,What does it do?,Τι κάνει;
+apps/erpnext/erpnext/public/js/setup_wizard.js +144,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,Μέσος συντελεστής προμήθειας
-apps/erpnext/erpnext/stock/doctype/item/item.py +313,'Has Serial No' can not be 'Yes' for non-stock item,"Το πεδίο ""έχει σειριακό αριθμό"" δεν μπορεί να είναι ""ναι"" για μη αποθηκεύσιμα είδη."
+apps/erpnext/erpnext/stock/doctype/item/item.py +317,'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/setup/page/setup_wizard/install_fixtures.py +111,Electrical,Ηλεκτρικός
+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 +302,Row {0}: Exchange Rate is mandatory,Σειρά {0}: συναλλαγματικής ισοτιμίας είναι υποχρεωτική
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +304,Row {0}: Exchange Rate is mandatory,Σειρά {0}: συναλλαγματικής ισοτιμίας είναι υποχρεωτική
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},Το ID χρήστη δεν έχει οριστεί για τον υπάλληλο {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +72,Peening,Peening
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,From Warranty Claim,Από αξίωση εγγύησης
 DocType: Stock Entry,Default Source Warehouse,Προεπιλεγμένη αποθήκη πηγής
 DocType: Item,Customer Code,Κωδικός πελάτη
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +212,Birthday Reminder for {0},Υπενθύμιση γενεθλίων για {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +163,Lapping,Λείανση
-apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.js +8,Days Since Last Order,Ημέρες από την τελευταία παραγγελία
+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 +299,Debit To account must be a Balance Sheet account,Χρέωση του λογαριασμού πρέπει να είναι ένα κονδύλι του Ισολογισμού
 DocType: Buying Settings,Naming Series,Σειρά ονομασίας
 DocType: Leave Block List,Leave Block List Name,Όνομα λίστας αποκλεισμού ημερών άδειας
@@ -3639,7 +3489,7 @@
 DocType: Notification Control,Sales Invoice Message,Μήνυμα τιμολογίου πώλησης
 DocType: Authorization Rule,Based On,Με βάση την
 DocType: Sales Order Item,Ordered Qty,Παραγγελθείσα ποσότητα
-apps/erpnext/erpnext/stock/doctype/item/item.py +539,Item {0} is disabled,Θέση {0} είναι απενεργοποιημένη
+apps/erpnext/erpnext/stock/doctype/item/item.py +543,Item {0} is disabled,Θέση {0} είναι απενεργοποιημένη
 DocType: Stock Settings,Stock Frozen Upto,Παγωμένο απόθεμα μέχρι 
 apps/erpnext/erpnext/controllers/recurring_document.py +166,Period From and Period To dates mandatory for recurring {0},Περίοδος Από και χρονική περίοδος ημερομηνίες υποχρεωτική για τις επαναλαμβανόμενες {0}
 apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,Δραστηριότητες / εργασίες έργου
@@ -3649,7 +3499,6 @@
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,Η έκπτωση πρέπει να είναι μικρότερη από 100
 DocType: ToDo,Low,Χαμηλός
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Γράψτε εφάπαξ ποσό (Εταιρεία νομίσματος)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +71,Spinning,Κλώση
 DocType: Landed Cost Voucher,Landed Cost Voucher,Αποδεικτικό κόστους αποστολής εμπορευμάτων
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +55,Please set {0},Παρακαλώ να ορίσετε {0}
 DocType: Purchase Invoice,Repeat on Day of Month,Επανάληψη την ημέρα του μήνα
@@ -3671,7 +3520,6 @@
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +37,Campaign Name is required,Το όνομα εκστρατείας είναι απαραίτητο
 DocType: Maintenance Visit,Maintenance Date,Ημερομηνία συντήρησης
 DocType: Purchase Receipt Item,Rejected Serial No,Σειριακός αριθμός που απορρίφθηκε
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +51,Deep drawing,Βαθιά σχεδίασης
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +40,New Newsletter,Νέα Ενημερωτικό Δελτίο
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +157,Start date should be less than end date for Item {0},Η ημερομηνία έναρξης θα πρέπει να είναι προγενέστερη της ημερομηνίας λήξης για το είδος {0}
 apps/erpnext/erpnext/stock/doctype/item/item.js +17,Show Balance,Προβολή υπόλοιπου
@@ -3681,7 +3529,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +119,BOM and Manufacturing Quantity are required,BOM και Βιομηχανία Ποσότητα απαιτούνται
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Eύρος γήρανσης 2
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +450,Amount,Ποσό
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +147,Riveting,Καθηλωτική
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,Η Λ.Υ. αντικαταστάθηκε
 ,Sales Analytics,Ανάλυση πωλήσεων
 DocType: Manufacturing Settings,Manufacturing Settings,Ρυθμίσεις παραγωγής
@@ -3693,20 +3540,19 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +207,New Account Name,Νέο όνομα λογαριασμού
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,Κόστος πρώτων υλών που προμηθεύτηκαν
 DocType: Selling Settings,Settings for Selling Module,Ρυθμίσεις για τη λειτουργική μονάδα πωλήσεων
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +73,Customer Service,Εξυπηρέτηση πελατών
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Customer Service,Εξυπηρέτηση πελατών
 DocType: Item,Thumbnail,Μικρογραφία
 DocType: Item Customer Detail,Item Customer Detail,Λεπτομέρειες πελατών είδους
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +147,Confirm Your Email,Επιβεβαίωση email σας
 apps/erpnext/erpnext/config/hr.py +53,Offer candidate a Job.,Προσφορά υποψήφιος δουλειά.
 DocType: Notification Control,Prompt for Email on Submission of,Ερώτηση για email κατά την υποβολή του
+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 +70,Item {0} must be a stock Item,Το είδος {0} πρέπει να είναι ένα αποθηκεύσιμο είδος
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,Προεπιλογή Work In Progress Αποθήκη
 apps/erpnext/erpnext/config/accounts.py +107,Default settings for accounting transactions.,Οι προεπιλεγμένες ρυθμίσεις για λογιστικές πράξεις.
 apps/frappe/frappe/model/naming.py +40,{0} is required,{0} Απαιτείται
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +21,Vacuum molding,Κενού χύτευση
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,Η αναμενόμενη ημερομηνία δεν μπορεί να είναι προγενέστερη της ημερομηνία αίτησης υλικού
 DocType: Contact Us Settings,City,Πόλη
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +132,Ultrasonic machining,Κατεργασία με υπερήχους
 apps/frappe/frappe/templates/base.html +137,Error: Not a valid id?,Σφάλμα: Δεν είναι ένα έγκυρο αναγνωριστικό;
 apps/erpnext/erpnext/stock/get_item_details.py +125,Item {0} must be a Sales Item,Το είδος {0} πρέπει να είναι ένα είδος πώλησης
 DocType: Naming Series,Update Series Number,Ενημέρωση αριθμού σειράς
@@ -3714,7 +3560,7 @@
 DocType: Sales Order,Printing Details,Λεπτομέρειες εκτύπωσης
 DocType: Task,Closing Date,Καταληκτική ημερομηνία
 DocType: Sales Order Item,Produced Quantity,Παραγόμενη ποσότητα
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +84,Engineer,Μηχανικός
+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,Συνελεύσεις Αναζήτηση Sub
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +379,Item Code required at Row No {0},Ο κωδικός είδους απαιτείται στην γραμμή νο. {0}
 DocType: Sales Partner,Partner Type,Τύπος συνεργάτη
@@ -3722,7 +3568,7 @@
 DocType: Authorization Rule,Customerwise Discount,Έκπτωση με βάση πελάτη
 DocType: Purchase Invoice,Against Expense Account,Κατά τον λογαριασμό δαπανών
 DocType: Production Order,Production Order,Εντολή παραγωγής
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +258,Installation Note {0} has already been submitted,Η σημείωση εγκατάστασης {0} έχει ήδη υποβληθεί
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +263,Installation Note {0} has already been submitted,Η σημείωση εγκατάστασης {0} έχει ήδη υποβληθεί
 DocType: Quotation Item,Against Docname,Κατά όνομα εγγράφου
 DocType: SMS Center,All Employee (Active),Όλοι οι υπάλληλοι (ενεργοί)
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,Δείτε τώρα
@@ -3731,19 +3577,19 @@
 DocType: Item,Re-Order Level,Επίπεδο επαναπαραγγελίας
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,Εισάγετε τα είδη και την προγραμματισμένη ποσότητα για την οποία θέλετε να δημιουργηθούν οι εντολές παραγωγής ή να κατεβάσετε τις πρώτες ύλες για την ανάλυση.
 apps/frappe/frappe/public/js/frappe/views/ganttview.js +45,Gantt Chart,Διάγραμμα gantt 
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +57,Part-time,Μερικής απασχόλησης
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,Part-time,Μερικής απασχόλησης
 DocType: Employee,Applicable Holiday List,Εφαρμοστέος κατάλογος διακοπών
 DocType: Employee,Cheque,Επιταγή
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,Η σειρά ενημερώθηκε
 apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Report Type is mandatory,Ο τύπος έκθεσης είναι υποχρεωτικός
 DocType: Item,Serial Number Series,Σειρά σειριακών αριθμών
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},Η αποθήκη είναι απαραίτητη για το απόθεμα του είδους {0} στη γραμμή {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +45,Retail & Wholesale,Λιανική & χονδρική πώληση
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,Λιανική & χονδρική πώληση
 DocType: Issue,First Responded On,Πρώτη απάντηση στις
 DocType: Website Item Group,Cross Listing of Item in multiple groups,Εμφάνιση του είδους σε πολλαπλές ομάδες
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +351,The First User: You,Ο πρώτος χρήστης : εσείς
+apps/erpnext/erpnext/public/js/setup_wizard.js +101,The First User: You,Ο πρώτος χρήστης : εσείς
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +48,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 +172,Successfully Reconciled,Επιτυχής συμφωνία
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +119,Successfully Reconciled,Επιτυχής συμφωνία
 DocType: Production Order,Planned End Date,Προγραμματισμένη ημερομηνία λήξης
 apps/erpnext/erpnext/config/stock.py +43,Where items are stored.,Πού αποθηκεύονται τα είδη
 DocType: Tax Rule,Validity,Εγκυρότητα
@@ -3763,39 +3609,36 @@
 DocType: DocPerm,Level,Επίπεδο
 DocType: Purchase Taxes and Charges,On Net Total,Στο καθαρό σύνολο
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +160,Target warehouse in row {0} must be same as Production Order,Η αποθήκη προορισμού στη γραμμή {0} πρέπει να είναι η ίδια όπως στη εντολή παραγωγής
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +59,No permission to use Payment Tool,Δεν έχετε άδεια να χρησιμοποιήσετε το εργαλείο πληρωμής
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +97,No permission to use Payment Tool,Δεν έχετε άδεια να χρησιμοποιήσετε το εργαλείο πληρωμής
 apps/erpnext/erpnext/controllers/recurring_document.py +192,'Notification Email Addresses' not specified for recurring %s,Οι διευθύνσεις email για επαναλαμβανόμενα %s δεν έχουν οριστεί
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +86,Milling,Άλεσμα
 apps/erpnext/erpnext/accounts/doctype/account/account.py +99,Currency can not be changed after making entries using some other currency,Νόμισμα δεν μπορεί να αλλάξει μετά την πραγματοποίηση εγγραφών χρησιμοποιώντας κάποιο άλλο νόμισμα
 DocType: Company,Round Off Account,Στρογγυλεύουν Λογαριασμού
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +60,Nibbling,Φάγωμα
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,Δαπάνες διοικήσεως
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +18,Consulting,Συμβουλή
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +18,Consulting,Συμβουλή
 DocType: Customer Group,Parent Customer Group,Γονική ομάδα πελατών
 apps/erpnext/erpnext/public/js/pos/pos.js +429,Change,Αλλαγή
 DocType: Purchase Invoice,Contact Email,Email επαφής
 DocType: Appraisal Goal,Score Earned,Αποτέλεσμα 
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +393,"e.g. ""My Company LLC""","Π.Χ. "" Η εταιρεία μου llc """
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +173,Notice Period,Ανακοίνωση Περίοδος
+apps/erpnext/erpnext/public/js/setup_wizard.js +141,"e.g. ""My Company LLC""","Π.Χ. "" Η εταιρεία μου llc """
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +173,Notice Period,Ανακοίνωση Περίοδος
 DocType: Bank Reconciliation Detail,Voucher ID,ID αποδεικτικού
 apps/erpnext/erpnext/setup/doctype/territory/territory.js +14,This is a root territory and cannot be edited.,Αυτή είναι μια κύρια περιοχή και δεν μπορεί να επεξεργαστεί.
 DocType: Packing Slip,Gross Weight UOM,Μ.Μ. Μικτού βάρους 
 DocType: Email Digest,Receivables / Payables,Απαιτήσεις / υποχρεώσεις
 DocType: Delivery Note Item,Against Sales Invoice,Κατά το τιμολόγιο πώλησης
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +63,Stamping,Σφράγιση
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +457,Credit Account,Λογαριασμός Πίστωσης
 DocType: Landed Cost Item,Landed Cost Item,Είδος κόστους αποστολής εμπορευμάτων
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +56,Show zero values,Προβολή μηδενικών τιμών
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,Ποσότητα του είδους που αποκτήθηκε μετά την παραγωγή / ανασυσκευασία από συγκεκριμένες ποσότητες πρώτων υλών
 DocType: Payment Reconciliation,Receivable / Payable Account,Εισπρακτέοι / πληρωτέοι λογαριασμού
 DocType: Delivery Note Item,Against Sales Order Item,Κατά το είδος στην παραγγελία πώλησης
-apps/erpnext/erpnext/stock/doctype/item/item.py +521,Please specify Attribute Value for attribute {0},Παρακαλείστε να αναφέρετε Χαρακτηριστικό γνώρισμα Σχέση {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +525,Please specify Attribute Value for attribute {0},Παρακαλείστε να αναφέρετε Χαρακτηριστικό γνώρισμα Σχέση {0}
 DocType: Item,Default Warehouse,Προεπιλεγμένη αποθήκη 
 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,Εκτυπώστε χωρίς ποσό
-apps/erpnext/erpnext/controllers/buying_controller.py +69,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,"Η φορολογική κατηγορία δεν μπορεί να είναι αποτίμηση ή αποτίμηση και σύνολο, γιατι τα είδη δεν είναι είδη αποθέματος"
+apps/erpnext/erpnext/controllers/buying_controller.py +60,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,"Η φορολογική κατηγορία δεν μπορεί να είναι αποτίμηση ή αποτίμηση και σύνολο, γιατι τα είδη δεν είναι είδη αποθέματος"
 DocType: User,Last Name,Επώνυμο
 DocType: Web Page,Left,Αριστερά
 DocType: Event,All Day,Ολοήμερο
@@ -3803,7 +3646,7 @@
 DocType: Appraisal,Total Score (Out of 5),Συνολική βαθμολογία (από 5)
 DocType: Contact Us Settings,State,Πολιτεία
 DocType: Batch,Batch,Παρτίδα
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +51,Balance,Υπόλοιπο
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +28,Balance,Υπόλοιπο
 DocType: Project,Total Expense Claim (via Expense Claims),Σύνολο αξίωση Εξόδων (μέσω αξιώσεις Εξόδων)
 DocType: User,Gender,Φύλο
 DocType: Journal Entry,Debit Note,Χρεωστικό σημείωμα
@@ -3833,8 +3676,7 @@
 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/setup/page/setup_wizard/fixtures/operations.py +76,Seaming,Ραφή
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +197,"Company Email ID not found, hence mail not sent","Το email ID της εταιρείας δεν βρέθηκε, ως εκ τούτου, δεν αποστέλλονται μηνύματα ταχυδρομείου "
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +206,"Company Email ID not found, hence mail not sent","Το email ID της εταιρείας δεν βρέθηκε, ως εκ τούτου, δεν αποστέλλονται μηνύματα ταχυδρομείου "
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Εφαρμογή πόρων (ενεργητικό)
 DocType: Production Planning Tool,Filter based on item,Φιλτράρισμα με βάση το είδος
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +451,Debit Account,Ο λογαριασμός Χρεωστικές
@@ -3846,17 +3688,16 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +95,{0} {1} has been modified. Please refresh.,{0} {1} Έχει τροποποιηθεί. Παρακαλώ ανανεώστε.
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,Σταματήστε τους χρήστες από το να κάνουν αιτήσεις αδειών για τις επόμενες ημέρες.
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +591,From Opportunity,Από ευκαιρία
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +46,Blanking,Τυφλές
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +166,Employee Benefits,Παροχές σε εργαζομένους
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,Employee Benefits,Παροχές σε εργαζομένους
 DocType: Sales Invoice,Is POS,Είναι POS
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +240,Packed quantity must equal quantity for Item {0} in row {1},Η συσκευασμένη ποσότητα πρέπει να ισούται με την ποσότητα για το είδος {0} στη γραμμή {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +245,Packed quantity must equal quantity for Item {0} in row {1},Η συσκευασμένη ποσότητα πρέπει να ισούται με την ποσότητα για το είδος {0} στη γραμμή {1}
 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.,Λογαριασμοί για πελάτες.
 DocType: DocField,Default,Προεπιλεγμένο
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Id έργου
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +466,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},"Σειρά Όχι {0}: Ποσό δεν μπορεί να είναι μεγαλύτερη από ό, τι εκκρεμές ποσό έναντι αιτημάτων εξόδων {1}. Εν αναμονή ποσό {2}"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +468,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} συνδρομητές προστέθηκαν
 DocType: Maintenance Schedule,Schedule,Χρονοδιάγραμμα
 DocType: Cost Center,"Define Budget for this Cost Center. To set budget action, see ""Company List""","Ορίστε τον προϋπολογισμό γι &#39;αυτό το Κέντρο Κόστους. Για να ρυθμίσετε δράση του προϋπολογισμού, ανατρέξτε στην ενότητα &quot;Εταιρεία Λίστα&quot;"
@@ -3867,7 +3708,7 @@
 apps/erpnext/erpnext/public/js/pos/pos.js +91,Price List not found or disabled,Τιμοκατάλογος δεν βρέθηκε ή άτομα με ειδικές ανάγκες
 DocType: Expense Claim,Approved,Εγκρίθηκε
 DocType: Pricing Rule,Price,Τιμή
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +79,Employee relieved on {0} must be set as 'Left',Υπάλληλος ελεύθερος για {0} πρέπει να οριστεί ως έχει φύγει
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +88,Employee relieved on {0} must be set as 'Left',Υπάλληλος ελεύθερος για {0} πρέπει να οριστεί ως έχει φύγει
 DocType: Item,"Selecting ""Yes"" will give a unique identity to each entity of this item which can be viewed in the Serial No master.",Επιλέγοντας 'ναι' θα δοθεί μια μοναδική ταυτότητα σε κάθε οντότητα αυτού του είδους που μπορεί να εμφανιστεί στην κύρια εγγραφή σειριακού αριθμού
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +39,Appraisal {0} created for Employee {1} in the given date range,Αξιολόγηση {0} δημιουργήθηκε για τον υπάλληλο {1} στο συγκεκριμένο εύρος ημερομηνιών
 DocType: Employee,Education,Εκπαίδευση
@@ -3878,7 +3719,7 @@
 apps/frappe/frappe/desk/moduleview.py +67,Standard Reports,Πρότυπες εκθέσεις
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,Λογιστικές ημερολογιακές εγγραφές.
 DocType: Delivery Note Item,Available Qty at From Warehouse,Διαθέσιμο Ποσότητα σε από την αποθήκη
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +209,Please select Employee Record first.,Παρακαλώ επιλέξτε πρώτα Εγγραφή Εργαζομένων.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +224,Please select Employee Record first.,Παρακαλώ επιλέξτε πρώτα Εγγραφή Εργαζομένων.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,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 +233,Please enter Expense Account,Παρακαλώ εισάγετε λογαριασμό δαπανών
@@ -3891,46 +3732,43 @@
 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,Εμφάνισε παραγγελίες πώλησης (εκκρεμεί παράδοση) με βάση τα ανωτέρω κριτήρια
 DocType: DocShare,Document Type,Τύπος εγγράφου
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +565,From Supplier Quotation,Από προσφορά προμηθευτή
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +588,From Supplier Quotation,Από προσφορά προμηθευτή
 DocType: Deduction Type,Deduction Type,Τύπος κράτησης
 DocType: Attendance,Half Day,Μισή ημέρα
 DocType: Pricing Rule,Min Qty,Ελάχιστη ποσότητα
 DocType: Features Setup,"To track items in sales and purchase documents with batch nos. ""Preferred Industry: Chemicals""",Για να παρακολουθείτε τα στοιχεία των πωλήσεων και παραστατικά αγοράς με αρ παρτίδα. &quot;Προτιμώμενα Βιομηχανία: Φάρμακα&quot;
 DocType: GL Entry,Transaction Date,Ημερομηνία συναλλαγής
 DocType: Production Plan Item,Planned Qty,Προγραμματισμένη ποσότητα
-apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +91,Total Tax,Σύνολο φόρου
+apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +93,Total Tax,Σύνολο φόρου
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +178,For Quantity (Manufactured Qty) is mandatory,Για Ποσότητα (Τεμ Κατασκευάζεται) είναι υποχρεωτικά
 DocType: Stock Entry,Default Target Warehouse,Προεπιλεγμένη αποθήκη προορισμού
 DocType: Purchase Invoice,Net Total (Company Currency),Καθαρό σύνολο (νόμισμα της εταιρείας)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +79,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Σειρά {0}: Τύπος Πάρτυ και το Κόμμα ισχύει μόνο κατά Εισπρακτέα / Πληρωτέα λογαριασμού
 DocType: Notification Control,Purchase Receipt Message,Μήνυμα αποδεικτικού παραλαβής αγοράς
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +95,Total allocated leaves are more than period,"Σύνολο των κατανεμημένων φύλλα είναι περισσότερο από ό, τι την περίοδο"
 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.,Καταγραφή κίνησης είδους
 DocType: Newsletter List Subscriber,Newsletter List Subscriber,Ενημερωτικό δελτίο Λίστα Συνδρομητής
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +164,Morticing,Morticing
 DocType: Email Account,Service,Υπηρεσία
 DocType: Hub Settings,Hub Settings,Ρυθμίσεις hub
 DocType: Project,Gross Margin %,Μικτό κέρδος (περιθώριο) %
 DocType: BOM,With Operations,Με λειτουργίες
 apps/erpnext/erpnext/accounts/party.py +232,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Οι λογιστικές εγγραφές έχουν ήδη γίνει στο νόμισμα {0} για την εταιρεία {1}. Παρακαλώ επιλέξτε ένα εισπρακτέο ή πληρωτέο λογαριασμό με το νόμισμα {0}.
 ,Monthly Salary Register,Μηνιαίο ταμείο μισθοδοσίας
-apps/frappe/frappe/website/template.py +140,Next,Επόμενος
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard_page.html +17,Next,Επόμενος
 DocType: Warranty Claim,If different than customer address,Αν είναι διαφορετική από τη διεύθυνση του πελάτη
 DocType: BOM Operation,BOM Operation,Λειτουργία Λ.Υ.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +118,Electropolishing,Electropolishing
 DocType: Purchase Taxes and Charges,On Previous Row Amount,Στο ποσό της προηγούμενης γραμμής
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +24,Please enter Payment Amount in atleast one row,Παρακαλώ εισάγετε ποσό πληρωμής σε τουλάχιστον μία σειρά
+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 Προφίλ
 apps/erpnext/erpnext/config/accounts.py +153,"Seasonality for setting budgets, targets etc.","Εποχικότητα για τον καθορισμό των προϋπολογισμών, στόχων κλπ"
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +238,Row {0}: Payment Amount cannot be greater than Outstanding Amount,"Γραμμή {0}:το ποσό πληρωμής δεν μπορεί να είναι μεγαλύτερο από ό,τι το οφειλόμενο ποσό"
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +46,Total Unpaid,Το σύνολο των απλήρωτων
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +21,Time Log is not billable,Το αρχείο καταγραφής χρονολογίου δεν είναι χρεώσιμο
 apps/erpnext/erpnext/stock/get_item_details.py +128,"Item {0} is a template, please select one of its variants","Θέση {0} είναι ένα πρότυπο, επιλέξτε μία από τις παραλλαγές του"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +528,Purchaser,Αγοραστής
+apps/erpnext/erpnext/public/js/setup_wizard.js +272,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 +71,Please enter the Against Vouchers manually,Παρακαλώ εισάγετε τα αποδεικτικά έναντι χειροκίνητα
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +107,Please enter the Against Vouchers manually,Παρακαλώ εισάγετε τα αποδεικτικά έναντι χειροκίνητα
 DocType: SMS Settings,Static Parameters,Στατικές παράμετροι
 DocType: Purchase Order,Advance Paid,Προκαταβολή που καταβλήθηκε
 DocType: Item,Item Tax,Φόρος είδους
@@ -3939,14 +3777,12 @@
 apps/erpnext/erpnext/config/crm.py +48,Send mass SMS to your contacts,Αποστολή μαζικών SMS στις επαφές σας
 DocType: Purchase Taxes and Charges,Consider Tax or Charge for,Σκεφτείτε φόρο ή επιβάρυνση για
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,Η πραγματική ποσότητα είναι υποχρεωτική
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +42,Cross-rolling,Cross-κύλισης
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +132,Credit Card,Πιστωτική κάρτα
+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 +95,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,Παρακαλώ εισάγετε φόρους και επιβαρύνσεις
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +85,Machining,Κατεργασίας
 DocType: Sales Invoice Item,Drop Ship,Drop Ship
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","Εδώ μπορείτε να διατηρήσετε τα στοιχεία της οικογένειας όπως το όνομα και η ιδιότητα του γονέα, σύζυγος και παιδιά"
 DocType: Hub Settings,Seller Name,Ονομα πωλητή
@@ -3956,7 +3792,7 @@
 DocType: Stock Entry,Repack,Επανασυσκευασία
 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/setup/page/setup_wizard/setup_wizard.js +500,Attach Logo,Επισύναψη logo
+apps/erpnext/erpnext/public/js/setup_wizard.js +246,Attach Logo,Επισύναψη logo
 DocType: Customer,Commission Rate,Ποσό προμήθειας
 apps/erpnext/erpnext/stock/doctype/item/item.js +38,Make Variant,Κάντε Παραλλαγή
 apps/erpnext/erpnext/config/hr.py +145,Block leave applications by department.,Αποκλεισμός αιτήσεων άδειας από το τμήμα
@@ -3971,19 +3807,19 @@
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +105,Please select a csv file,Επιλέξτε ένα αρχείο csv
 DocType: Dropbox Backup,Send Backups to Dropbox,Αποστολή αντίγραφα ασφαλείας σε Dropbox
 DocType: Purchase Order,To Receive and Bill,Για να λάβετε και Bill
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +94,Designer,Σχεδιαστής
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Designer,Σχεδιαστής
 apps/erpnext/erpnext/config/selling.py +121,Terms and Conditions Template,Πρότυπο όρων και προϋποθέσεων
 DocType: Serial No,Delivery Details,Λεπτομέρειες παράδοσης
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +383,Cost Center is required in row {0} in Taxes table for type {1},Το κέντρο κόστους απαιτείται στη γραμμή {0} στον πίνακα πίνακα φόρων για τον τύπο {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +386,Cost Center is required in row {0} in Taxes table for type {1},Το κέντρο κόστους απαιτείται στη γραμμή {0} στον πίνακα πίνακα φόρων για τον τύπο {1}
 DocType: Item,Automatically create Material Request if quantity falls below this level,Αυτόματη δημιουργία Υλικό Αίτημα εάν η ποσότητα πέσει κάτω από αυτό το επίπεδο
 ,Item-wise Purchase Register,Ταμείο αγορών ανά είδος
 DocType: Batch,Expiry Date,Ημερομηνία λήξης
-apps/erpnext/erpnext/stock/doctype/item/item.py +375,"To set reorder level, item must be a Purchase Item or Manufacturing Item","Για να ορίσετε το επίπεδο αναπαραγγελίας, στοιχείο πρέπει να είναι ένα στοιχείο αγοράς ή κατασκευής του Είδους"
+apps/erpnext/erpnext/stock/doctype/item/item.py +379,"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.,Κύρια εγγραφή έργου.
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,Να μην εμφανίζεται κανένα σύμβολο όπως $ κλπ δίπλα σε νομίσματα.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +330, (Half Day),(Μισή ημέρα)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +374, (Half Day),(Μισή ημέρα)
 DocType: Supplier,Credit Days,Ημέρες πίστωσης
 DocType: Leave Type,Is Carry Forward,Είναι μεταφορά σε άλλη χρήση
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +478,Get Items from BOM,Λήψη ειδών από Λ.Υ.
@@ -3991,7 +3827,7 @@
 apps/erpnext/erpnext/config/manufacturing.py +120,Bill of Materials,Bill Υλικών
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +77,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Σειρά {0}: Τύπος Πάρτυ και το Κόμμα απαιτείται για εισπρακτέοι / πληρωτέοι λογαριασμό {1}
 DocType: Dropbox Backup,Send Notifications To,Αποστολή ενημερώσεων σε
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html +26,Ref Date,Ημ. αναφοράς
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +54,Ref Date,Ημ. αναφοράς
 DocType: Employee,Reason for Leaving,Αιτιολογία αποχώρησης
 DocType: Expense Claim Detail,Sanctioned Amount,Ποσό κύρωσης
 DocType: GL Entry,Is Opening,Είναι άνοιγμα
@@ -3999,4 +3835,3 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +188,Account {0} does not exist,Ο λογαριασμός {0} δεν υπάρχει
 DocType: Account,Cash,Μετρητά
 DocType: Employee,Short biography for website and other publications.,Σύντομη βιογραφία για την ιστοσελίδα και άλλες δημοσιεύσεις.
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +31,Please create Salary Structure for employee {0},Παρακαλώ δημιουργήστε μισθολόγιο για τον υπάλληλο {0}
diff --git a/erpnext/translations/es-PE.csv b/erpnext/translations/es-PE.csv
index 199c0b6..2b65c4b 100644
--- a/erpnext/translations/es-PE.csv
+++ b/erpnext/translations/es-PE.csv
@@ -1,12 +1,11 @@
 DocType: Employee,Salary Mode,Modo de Salario
 DocType: Cost Center,"Select Monthly Distribution, if you want to track based on seasonality.","Seleccione Distribución mensual, si desea realizar un seguimiento basado en la estacionalidad."
 DocType: Employee,Divorced,Divorciado
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +86,Warning: Same item has been entered multiple times.,Advertencia: El mismo artículo se ha introducido varias veces.
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +80,Warning: Same item has been entered multiple times.,Advertencia: El mismo artículo se ha introducido varias veces.
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +96,Items already synced,Productos ya sincronizados
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,Cancelar visita {0} antes de cancelar este reclamo de garantía
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +19,Consumer Products,Productos de Consumo
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,Productos de Consumo
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +68,Please select Party Type first,"Por favor, seleccione primero el tipo de entidad"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +90,Annealing,Recocido
 DocType: Item,Customer Items,Artículos de clientes
 apps/erpnext/erpnext/accounts/doctype/account/account.py +45,Account {0}: Parent account {1} can not be a ledger,Cuenta {0}: Cuenta Padre {1} no puede ser una cuenta Mayor
 DocType: Item,Publish Item to hub.erpnext.com,Publicar artículo en hub.erpnext.com
@@ -17,14 +16,13 @@
 DocType: Sales Partner,Dealer,Distribuidor
 DocType: Employee,Rented,Alquilado
 DocType: About Us Settings,Website,Sitio Web
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +23,Compaction plus sintering,Compactación más sinterización
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,Currency is required for Price List {0},Se requiere de divisas para Lista de precios {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Será calculado en la transacción.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +549,From Material Request,Desde solicitud de material
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +572,From Material Request,Desde solicitud de material
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} Árbol
 DocType: Job Applicant,Job Applicant,Solicitante de empleo
 apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,No hay más resultados.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +78,Legal,Legal
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +34,Legal,Legal
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +114,Actual type tax cannot be included in Item rate in row {0},"El tipo de impuesto actual, no puede ser incluido en el precio del producto de la linea {0}"
 DocType: C-Form,Customer,Cliente
 DocType: Purchase Receipt Item,Required By,Requerido por
@@ -39,7 +37,6 @@
 DocType: Manufacturing Settings,Default 10 mins,Por defecto 10 minutos
 DocType: Leave Type,Leave Type Name,Nombre de Tipo de Vacaciones
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +148,Series Updated Successfully,Serie actualizado correctamente
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +150,Stitching,Puntadas
 DocType: Pricing Rule,Apply On,Aplique En
 DocType: Item Price,Multiple Item prices.,Configuración de múltiples precios para los productos
 ,Purchase Order Items To Be Received,Productos de la Orden de Compra a ser Recibidos
@@ -47,8 +44,8 @@
 DocType: Quality Inspection Reading,Parameter,Parámetro
 apps/erpnext/erpnext/projects/doctype/project/project.py +43,Expected End Date can not be less than Expected Start Date,La fecha prevista de finalización no puede ser inferior a la fecha de inicio
 apps/erpnext/erpnext/utilities/transaction_base.py +104,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Fila # {0}: Tasa debe ser el mismo que {1}: {2} ({3} / {4})
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +189,New Leave Application,Nueva Aplicación de Permiso
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +134,Bank Draft,Giro bancario
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +204,New Leave Application,Nueva Aplicación de Permiso
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +134,Bank Draft,Giro bancario
 DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,1 . Para mantener el código de artículo del cliente y para efectuar búsquedas en ellos en función de ese código use esta opción
 DocType: Mode of Payment Account,Mode of Payment Account,Modo de pago a cuenta
 apps/erpnext/erpnext/stock/doctype/item/item.js +34,Show Variants,Mostrar variantes
@@ -60,24 +57,22 @@
 DocType: Production Plan Item,Production Plan Item,Plan de producción de producto
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +141,User {0} is already assigned to Employee {1},El usuario {0} ya está asignado a Empleado {1}
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +13,Make new POS Profile,Crear un nuevo perfil de POS
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +31,Health Care,Cuidado de la Salud
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,Cuidado de la Salud
 DocType: Purchase Invoice,Monthly,Mensual
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +494,Invoice,Factura
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +519,Invoice,Factura
 DocType: Maintenance Schedule Item,Periodicity,Periodicidad
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +357,Email Address,Dirección De Correo Electrónico
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +21,Defense,Defensa
+apps/erpnext/erpnext/public/js/setup_wizard.js +107,Email Address,Dirección De Correo Electrónico
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,Defensa
 DocType: Company,Abbr,Abreviatura
 DocType: Appraisal Goal,Score (0-5),Puntuación ( 0-5)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +193,Row {0}: {1} {2} does not match with {3},Fila {0}: {1} {2} no coincide con {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +67,Row # {0}:,Fila # {0}:
 DocType: Delivery Note,Vehicle No,Vehículo No
 apps/erpnext/erpnext/public/js/pos/pos.js +528,Please select Price List,"Por favor, seleccione la lista de precios"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +162,Woodworking,Tratamiento de la madera
 DocType: Production Order Operation,Work In Progress,Trabajos en Curso
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +153,3D printing,Impresión 3D
 DocType: Employee,Holiday List,Lista de Feriados
 DocType: Time Log,Time Log,Hora de registro
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +530,Accountant,Contador
+apps/erpnext/erpnext/public/js/setup_wizard.js +274,Accountant,Contador
 DocType: Cost Center,Stock User,Foto del usuario
 DocType: Company,Phone No,Teléfono No
 DocType: Time Log,"Log of Activities performed by users against Tasks that can be used for tracking time, billing.",Bitácora de actividades realizadas por los usuarios en las tareas que se utilizan para el seguimiento del tiempo y la facturación.
@@ -91,16 +86,16 @@
 DocType: Bin,Quantity Requested for Purchase,Cantidad solicitada para la compra
 DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name","Adjuntar archivo .csv con dos columnas, una para el nombre antiguo y otro para el nombre nuevo"
 DocType: Packed Item,Parent Detail docname,Detalle Principal docname
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Kg,Kilogramo
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Kg,Kilogramo
 apps/erpnext/erpnext/config/hr.py +48,Opening for a Job.,Apertura de un Trabajo .
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +6,Advertising,Publicidad
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,Publicidad
 DocType: Employee,Married,Casado
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +389,Stock cannot be updated against Delivery Note {0},Inventario no puede actualizarse contra Nota de Envio {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +391,Stock cannot be updated against Delivery Note {0},Inventario no puede actualizarse contra Nota de Envio {0}
 DocType: Payment Reconciliation,Reconcile,Conciliar
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +30,Grocery,Abarrotes
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,Abarrotes
 DocType: Quality Inspection Reading,Reading 1,Lectura 1
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Make Bank Entry,Hacer Entrada del Banco
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +40,Pension Funds,Fondos de Pensiones
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,Fondos de Pensiones
 apps/erpnext/erpnext/accounts/doctype/account/account.py +142,Warehouse is mandatory if account type is Warehouse,Almacén o Bodega es obligatorio si el tipo de cuenta es Almacén
 DocType: SMS Center,All Sales Person,Todos Ventas de Ventas
 DocType: Lead,Person Name,Nombre de la persona
@@ -121,7 +116,7 @@
 DocType: Quality Inspection,Get Specification Details,Obtenga Especificación Detalles
 DocType: Lead,Interested,Interesado
 apps/erpnext/erpnext/config/manufacturing.py +14,Bill of Material,Lista de Materiales (LdM)
-apps/erpnext/erpnext/public/js/stock_analytics.js +45,Opening,Apertura
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +158,Opening,Apertura
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},Desde {0} a {1}
 DocType: Item,Copy From Item Group,Copiar de Grupo de Elementos
 DocType: Journal Entry,Opening Entry,Entrada de Apertura
@@ -134,29 +129,28 @@
 DocType: Employee Education,Under Graduate,Bajo Graduación
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +22,Target On,Objetivo On
 DocType: BOM,Total Cost,Coste total
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +99,Reaming,Escariado
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +9,Activity Log:,Registro de Actividad:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +199,Item {0} does not exist in the system or has expired,El elemento {0} no existe en el sistema o ha expirado
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +44,Real Estate,Bienes Raíces
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +44,Real Estate,Bienes Raíces
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +4,Statement of Account,Estado de cuenta
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +41,Pharmaceuticals,Productos farmacéuticos
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,Productos farmacéuticos
 DocType: Expense Claim Detail,Claim Amount,Importe del reembolso
 DocType: Employee,Mr,Sr.
 DocType: Custom Script,Client,Cliente
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,Tipo de Proveedor / Proveedor
 DocType: Naming Series,Prefix,Prefijo
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Consumable,Consumible
+apps/erpnext/erpnext/public/js/setup_wizard.js +359,Consumable,Consumible
 DocType: Upload Attendance,Import Log,Importar registro
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.js +19,Send,Enviar
 DocType: SMS Center,All Contact,Todos los Contactos
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +164,Annual Salary,Salario Anual
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +164,Annual Salary,Salario Anual
 DocType: Period Closing Voucher,Closing Fiscal Year,Cerrando el año fiscal
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +69,Stock Expenses,Inventario de Gastos
 DocType: Newsletter,Email Sent?,Enviar Email ?
 DocType: Journal Entry,Contra Entry,Entrada Contra
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +92,Show Time Logs,Mostrar Registros Tiempo
 DocType: Delivery Note,Installation Status,Estado de la instalación
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +115,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Cantidad Aceptada + Rechazada debe ser igual a la cantidad Recibida por el Artículo {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +118,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Cantidad Aceptada + Rechazada debe ser igual a la cantidad Recibida por el Artículo {0}
 DocType: Item,Supply Raw Materials for Purchase,Materiales Suministro primas para la Compra
 apps/erpnext/erpnext/stock/get_item_details.py +133,Item {0} must be a Purchase Item,El producto {0} debe ser un producto para la compra
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
@@ -164,19 +158,17 @@
  Todas las fechas y los empleados en el período seleccionado se adjuntara a la planilla, con los registros de asistencia existentes"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +446,Item {0} is not active or end of life has been reached,El producto {0} no está activo o ha llegado al final de la vida útil
 DocType: Time Log Batch,Will be updated after Sales Invoice is Submitted.,Se actualizará después de la factura de venta se considera enviada .
-apps/erpnext/erpnext/controllers/accounts_controller.py +493,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included",Para incluir el impuesto de la linea {0} los impuestos de las lineas {1} también deben ser incluidos
+apps/erpnext/erpnext/controllers/accounts_controller.py +494,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included",Para incluir el impuesto de la linea {0} los impuestos de las lineas {1} también deben ser incluidos
 apps/erpnext/erpnext/config/hr.py +90,Settings for HR Module,Ajustes para el Módulo de Recursos Humanos
 DocType: SMS Center,SMS Center,Centro SMS
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +78,Straightening,Enderezar
 DocType: BOM Replace Tool,New BOM,Nueva Solicitud de Materiales
 apps/erpnext/erpnext/config/projects.py +28,Batch Time Logs for billing.,Bitácora de Lotes para  facturación.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +15,Countergravity casting,Countergravity casting
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +30,Newsletter has already been sent,El boletín de noticias ya ha sido enviado
 DocType: Lead,Request Type,Tipo de solicitud
 DocType: Leave Application,Reason,Razón
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +14,Broadcasting,Difusión
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +140,Execution,Ejecución
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +364,The first user will become the System Manager (you can change this later).,El primer usuario se convertirá en el administrador del sistema (puede cambiar esto más adelante).
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,Difusión
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +140,Execution,Ejecución
+apps/erpnext/erpnext/public/js/setup_wizard.js +114,The first user will become the System Manager (you can change this later).,El primer usuario se convertirá en el administrador del sistema (puede cambiar esto más adelante).
 apps/erpnext/erpnext/config/manufacturing.py +39,Details of the operations carried out.,Los detalles de las operaciones realizadas.
 DocType: Serial No,Maintenance Status,Estado del Mantenimiento
 apps/erpnext/erpnext/config/stock.py +263,Items and Pricing,Productos y precios
@@ -193,7 +185,6 @@
 DocType: Pricing Rule,Discount on Price List Rate (%),Descuento sobre la tarifa del listado de precios (%)
 apps/frappe/frappe/public/js/frappe/form/print.js +96,Start,Iniciar
 DocType: User,First Name,Nombre
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +12,Full-mold casting,Fundición de molde completo
 DocType: Offer Letter,Select Terms and Conditions,Selecciona Términos y Condiciones
 DocType: Production Planning Tool,Sales Orders,Ordenes de Venta
 DocType: Purchase Taxes and Charges,Valuation,Valuación
@@ -205,8 +196,7 @@
 DocType: Bank Reconciliation,Bank Account,Cuenta Bancaria
 DocType: Leave Type,Allow Negative Balance,Permitir Saldo Negativo
 DocType: Selling Settings,Default Territory,Territorio Predeterminado
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +53,Television,Televisión
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +138,Gashing,Rechinar
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,Televisión
 DocType: Production Order Operation,Updated via 'Time Log',Actualizado a través de 'Hora de Registro'
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +82,Account {0} does not belong to Company {1},Cuenta {0} no pertenece a la Compañía {1}
 DocType: Naming Series,Series List for this Transaction,Lista de series para esta transacción
@@ -220,14 +210,13 @@
 DocType: Lead,Address & Contact,Dirección y Contacto
 apps/erpnext/erpnext/controllers/recurring_document.py +206,Next Recurring {0} will be created on {1},La próxima recurrencia {0} se creará el {1}
 DocType: Newsletter List,Total Subscribers,Los suscriptores totales
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +575,Contact Name,Nombre del Contacto
+,Contact Name,Nombre del Contacto
 DocType: Production Plan Item,SO Pending Qty,SO Pendiente Cantidad
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Crea nómina para los criterios antes mencionados.
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,Solicitudes de compra.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +107,Double housing,Vivienda Doble
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +156,Only the selected Leave Approver can submit this Leave Application,Sólo el Supervisor de Vacaciones seleccionado puede presentar esta solicitud de permiso
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +171,Only the selected Leave Approver can submit this Leave Application,Sólo el Supervisor de Vacaciones seleccionado puede presentar esta solicitud de permiso
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,La fecha de relevo debe ser mayor que la fecha de inicio
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +172,Leaves per Year,Ausencias por año
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +172,Leaves per Year,Ausencias por año
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup > Settings > Naming Series,"Por favor, establece Naming Series para {0} a través de Configuración&gt; Configuración&gt; Serie Naming"
 DocType: Time Log,Will be updated when batched.,Se actualizará al agruparse.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +104,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,"Fila {0}: Por favor, consulte ""¿Es Avance 'contra la Cuenta {1} si se trata de una entrada con antelación."
@@ -236,25 +225,24 @@
 DocType: Item Website Specification,Item Website Specification,Especificación del producto en la WEB
 DocType: Dropbox Backup,Dropbox Access Key,Clave de Acceso de Dropbox 
 DocType: Payment Tool,Reference No,Referencia No.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +348,Leave Blocked,Vacaciones Bloqueadas
-apps/erpnext/erpnext/stock/doctype/item/item.py +535,Item {0} has reached its end of life on {1},El producto {0} ha llegado al fin de la vida útil el {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +392,Leave Blocked,Vacaciones Bloqueadas
+apps/erpnext/erpnext/stock/doctype/item/item.py +539,Item {0} has reached its end of life on {1},El producto {0} ha llegado al fin de la vida útil el {1}
 apps/erpnext/erpnext/accounts/utils.py +339,Annual,Anual
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Articulo de Reconciliación de Inventario
 DocType: Stock Entry,Sales Invoice No,Factura de Venta No
 DocType: Material Request Item,Min Order Qty,Cantidad mínima de Pedido (MOQ)
 DocType: Lead,Do Not Contact,No contactar
 DocType: Sales Invoice,The unique id for tracking all recurring invoices. It is generated on submit.,El identificador único para el seguimiento de todas las facturas recurrentes. Se genera al enviar .
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +93,Software Developer,Desarrollador de Software
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +93,Software Developer,Desarrollador de Software
 DocType: Item,Minimum Order Qty,Cantidad mínima de la orden
 DocType: Pricing Rule,Supplier Type,Tipo de proveedor
 DocType: Item,Publish in Hub,Publicar en el Hub
 ,Terretory,Territorios
-apps/erpnext/erpnext/stock/doctype/item/item.py +555,Item {0} is cancelled,El producto {0} esta cancelado
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +598,Material Request,Solicitud de Materiales
+apps/erpnext/erpnext/stock/doctype/item/item.py +559,Item {0} is cancelled,El producto {0} esta cancelado
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +607,Material Request,Solicitud de Materiales
 DocType: Bank Reconciliation,Update Clearance Date,Actualizar fecha de liquidación
 DocType: Item,Purchase Details,Detalles de Compra
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +323,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},El elemento {0} no se encuentra en 'Materias Primas Suministradas' en la tabla de la órden de compra {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +129,Wire brushing,Cepillo de alambre
 DocType: Employee,Relation,Relación
 apps/erpnext/erpnext/config/selling.py +23,Confirmed orders from Customers.,Pedidos en firme de los clientes.
 DocType: Purchase Receipt Item,Rejected Quantity,Cantidad Rechazada
@@ -268,12 +256,11 @@
 DocType: Supplier,Address HTML,Dirección HTML
 DocType: Lead,Mobile No.,Número Móvil
 DocType: Maintenance Schedule,Generate Schedule,Generar Horario
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +81,Hubbing,Hubbing
 DocType: Purchase Invoice Item,Expense Head,Cuenta de Gastos
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +86,Please select Charge Type first,"Por favor, seleccione primero el tipo de cargo"
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,Más Reciente
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +395,Max 5 characters,Máximo 5 caracteres
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +195,Select Your Language,Seleccione su idioma
+apps/erpnext/erpnext/public/js/setup_wizard.js +143,Max 5 characters,Máximo 5 caracteres
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +245,Select Your Language,Seleccione su idioma
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,El primer Administrador de Vacaciones in la lista sera definido como el Administrador de Vacaciones predeterminado.
 DocType: Manufacturing Settings,"Disables creation of time logs against Production Orders.
 Operations shall not be tracked against Production Order",Desactiva la creación de bitácoras de tiempo para las órdenes de producción. Las operaciones ya no tendrán un seguimiento.
@@ -285,8 +272,6 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +34,Item {0} must be Service Item,El elemento {0} debe ser un servicio
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +303,Completed Qty can not be greater than 'Qty to Manufacture',La cantidad completada no puede ser mayor que la cantidad a producir
 DocType: DocType,Administrator,Administrador
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +136,Laser drilling,Perforación por láser
-DocType: Stock UOM Replace Utility,New Stock UOM,Unidad de Medida de Nuevo Inventario
 DocType: Period Closing Voucher,Closing Account Head,Cuenta de cierre principal
 DocType: Employee,External Work History,Historial de trabajos externos
 apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,Error de referencia circular
@@ -295,17 +280,14 @@
 DocType: Lead,Industry,Industria
 DocType: Employee,Job Profile,Perfil Laboral
 DocType: Newsletter,Newsletter,Boletín de Noticias
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +84,Hydroforming,Hydroforming
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +49,Necking,Besuqueo
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Notificarme por Email cuando se genere una nueva solicitud de materiales
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +51,Item is updated,El Artículo está Actualizado
 DocType: Async Task,System Manager,Administrador del Sistema
 DocType: Payment Reconciliation Invoice,Invoice Type,Tipo de Factura
 DocType: Sales Invoice Item,Delivery Note,Notas de Entrega
 DocType: Dropbox Backup,Allow Dropbox Access,Permitir Acceso a Dropbox
 apps/erpnext/erpnext/config/learn.py +72,Setting up Taxes,Configuración de Impuestos
 apps/erpnext/erpnext/accounts/utils.py +189,Payment Entry has been modified after you pulled it. Please pull it again.,"El registro del pago ha sido modificado antes de su modificación. Por favor, inténtelo de nuevo."
-apps/erpnext/erpnext/stock/doctype/item/item.py +343,{0} entered twice in Item Tax,{0} ingresado dos veces en el Impuesto del producto
+apps/erpnext/erpnext/stock/doctype/item/item.py +347,{0} entered twice in Item Tax,{0} ingresado dos veces en el Impuesto del producto
 DocType: Workstation,Rent Cost,Renta Costo
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +74,Please select month and year,Por favor seleccione el mes y el año
 DocType: Purchase Invoice,"Enter email id separated by commas, invoice will be mailed automatically on particular date","Introduzca ID de correo electrónico separados por comas, la factura será enviada automáticamente en una fecha determinada"
@@ -319,20 +301,18 @@
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,Tasa a la cual la Moneda del Cliente se convierte a la moneda base del cliente
 DocType: Features Setup,"Available in BOM, Delivery Note, Purchase Invoice, Production Order, Purchase Order, Purchase Receipt, Sales Invoice, Sales Order, Stock Entry, Timesheet","Disponible en la Solicitud de Materiales , Albarán, Factura de Compra , Orden de Produccuón , Orden de Compra , Fecibo de Compra , Factura de Venta Pedidos de Venta , Inventario de Entrada, Control de Horas"
 DocType: Item Tax,Tax Rate,Tasa de Impuesto
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Select Item,Seleccione Producto
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +540,Select Item,Seleccione Producto
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +143,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","El Producto: {0} gestionado por lotes, no se puede conciliar usando\ Reconciliación de Stock, se debe usar Entrada de Stock"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +259,Purchase Invoice {0} is already submitted,Factura de Compra {0} ya existe
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +262,Purchase Invoice {0} is already submitted,Factura de Compra {0} ya existe
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Convert to non-Group,Convertir a 'Sin-Grupo'
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +55,Purchase Receipt must be submitted,El recibo de compra debe presentarse
-DocType: Stock UOM Replace Utility,Current Stock UOM,Unidad de Medida de Inventario Actual
 apps/erpnext/erpnext/config/stock.py +53,Batch (lot) of an Item.,Listados de los lotes de los productos
 DocType: C-Form Invoice Detail,Invoice Date,Fecha de la factura
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Your email address,Su dirección de correo electrónico
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +194,Please see attachment,"Por favor, revise el documento adjunto"
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +203,Please see attachment,"Por favor, revise el documento adjunto"
 DocType: Purchase Order,% Received,% Recibido
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +109,Water jet cutting,Corte por chorro de agua
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +24,Setup Already Complete!!,Configuración completa !
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +20,Setup Already Complete!!,Configuración completa !
 ,Finished Goods,Productos terminados
 DocType: Delivery Note,Instructions,Instrucciones
 DocType: Quality Inspection,Inspected By,Inspección realizada por
@@ -356,10 +336,9 @@
 ,Purchase Register,Registro de Compras
 DocType: Landed Cost Item,Applicable Charges,Cargos Aplicables
 DocType: Workstation,Consumable Cost,Coste de consumibles
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,{0} ({1}) must have role 'Leave Approver',{0} ({1}) debe tener la función 'Supervisor de Ausencias'
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +39,Medical,Médico
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +167,{0} ({1}) must have role 'Leave Approver',{0} ({1}) debe tener la función 'Supervisor de Ausencias'
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +39,Medical,Médico
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,Razón de Pérdida
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +36,Tube beading,Abalorios Tubo
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},La estación de trabajo estará cerrada en las siguientes fechas según la lista de vacaciones: {0}
 DocType: Employee,Single,solo
 DocType: Issue,Attachment,Adjunto
@@ -379,10 +358,8 @@
 DocType: Purchase Invoice,Supplier Name,Nombre del Proveedor
 DocType: Account,Is Group,Es un grupo
 DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,Comprobar número de factura único por proveedor
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +31,Thermoforming,Termoformado
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +66,Slitting,De corte longitudinal
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +57,'To Case No.' cannot be less than 'From Case No.','Hasta Caso No.' no puede ser inferior a 'Desde el Caso No.'
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +104,Non Profit,Sin fines de lucro
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +104,Non Profit,Sin fines de lucro
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_list.js +7,Not Started,Sin comenzar
 DocType: Lead,Channel Partner,Canal de socio
 DocType: Account,Old Parent,Antiguo Padre
@@ -393,10 +370,9 @@
 DocType: SMS Log,Sent On,Enviado Por
 DocType: Sales Order,Not Applicable,No aplicable
 apps/erpnext/erpnext/config/hr.py +140,Holiday master.,Master de vacaciones .
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +19,Shell molding,Moldeo Shell
 DocType: Material Request Item,Required Date,Fecha Requerida
 DocType: Delivery Note,Billing Address,Dirección de Facturación
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +644,Please enter Item Code.,"Por favor, introduzca el código del producto."
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +648,Please enter Item Code.,"Por favor, introduzca el código del producto."
 DocType: BOM,Costing,Costeo
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount","Si se selecciona, el importe del impuesto se considerará como ya incluido en el Monto  a Imprimir"
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,Cantidad Total
@@ -405,33 +381,31 @@
 DocType: Packing Slip,From Package No.,Del Paquete N º 
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Valores y Depósitos
 DocType: Features Setup,Imports,Importaciones
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +144,Adhesive bonding,Union adhesiva
 DocType: Job Opening,Description of a Job Opening,Descripción de una oferta de trabajo
 apps/erpnext/erpnext/config/hr.py +28,Attendance record.,Registro de Asistencia .
 DocType: Bank Reconciliation,Journal Entries,Asientos contables
 DocType: Sales Order Item,Used for Production Plan,Se utiliza para el Plan de Producción
 DocType: System Settings,Loading...,Cargando ...
 DocType: DocField,Password,Contraseña
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +155,Fused deposition modeling,Modelado por deposición fundida
 DocType: Manufacturing Settings,Time Between Operations (in mins),Tiempo entre operaciones (en minutos)
 DocType: Customer,Buyer of Goods and Services.,Compradores de Productos y Servicios.
 DocType: Journal Entry,Accounts Payable,Cuentas por Pagar
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +24,Add Subscribers,Añadir Suscriptores
 apps/erpnext/erpnext/public/js/feature_setup.js +220,""" does not exists",""" no existe"
 DocType: Pricing Rule,Valid Upto,Válido hasta
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +564,List a few of your customers. They could be organizations or individuals.,Enumere algunos de sus clientes. Pueden ser organizaciones o individuos.
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,List a few of your customers. They could be organizations or individuals.,Enumere algunos de sus clientes. Pueden ser organizaciones o individuos.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Direct Income,Ingreso Directo
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +33,"Can not filter based on Account, if grouped by Account","No se puede filtrar en función de la cuenta , si se agrupan por cuenta"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +88,Administrative Officer,Oficial Administrativo
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Administrative Officer,Oficial Administrativo
 DocType: Payment Tool,Received Or Paid,Recibido o Pagado
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +318,Please select Company,"Por favor, seleccione la empresa"
 DocType: Stock Entry,Difference Account,Cuenta para la Diferencia
 apps/erpnext/erpnext/projects/doctype/task/task.py +44,Cannot close task as its dependant task {0} is not closed.,No se puede cerrar la tarea que depende de {0} ya que no está cerrada.
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +305,Please enter Warehouse for which Material Request will be raised,"Por favor, ingrese el almacén en el cual la requisición de materiales sera despachada"
 DocType: Production Order,Additional Operating Cost,Costos adicionales de operación
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +20,Cosmetics,Productos Cosméticos
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,Productos Cosméticos
 DocType: DocField,Type,Tipo
-apps/erpnext/erpnext/stock/doctype/item/item.py +417,"To merge, following properties must be same for both items","Para combinar, la siguientes propiedades deben ser las mismas para ambos artículos"
+apps/erpnext/erpnext/stock/doctype/item/item.py +421,"To merge, following properties must be same for both items","Para combinar, la siguientes propiedades deben ser las mismas para ambos artículos"
 DocType: Communication,Subject,Sujeto
 DocType: Shipping Rule,Net Weight,Peso neto
 DocType: Employee,Emergency Phone,Teléfono de Emergencia
@@ -440,7 +414,6 @@
 DocType: Purchase Invoice Item,Item,Productos
 DocType: Journal Entry,Difference (Dr - Cr),Diferencia (Deb - Cred)
 DocType: Account,Profit and Loss,Pérdidas y Ganancias
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +58,New UOM must NOT be of type Whole Number,Nueva Unidad de Medida NO debe ser de tipo Numero Entero
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Furniture and Fixture,Muebles y Fixture
 DocType: Quotation,Rate at which Price list currency is converted to company's base currency,Grado en el que la lista de precios en moneda se convierte en la moneda base de la compañía
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Account {0} does not belong to company: {1},Cuenta {0} no pertenece a la compañía: {1}
@@ -457,13 +430,13 @@
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Añadir / Editar Impuestos y Cargos
 DocType: Purchase Invoice,Supplier Invoice No,Factura del Proveedor No
 DocType: Territory,For reference,Por referencia
-apps/erpnext/erpnext/public/js/account_tree_grid.js +52,Closing (Cr),Cierre (Cred)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +227,Closing (Cr),Cierre (Cred)
 DocType: Serial No,Warranty Period (Days),Período de garantía ( Días)
 DocType: Installation Note Item,Installation Note Item,Nota de instalación de elementos
 DocType: Job Applicant,Thread HTML,Tema HTML
 DocType: Company,Ignore,Pasar por alto
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +86,SMS sent to following numbers: {0},SMS enviados a los teléfonos: {0}
-apps/erpnext/erpnext/controllers/buying_controller.py +135,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Almacén de Proveedor es necesario para recibos de compras sub contratadas 
+apps/erpnext/erpnext/controllers/buying_controller.py +126,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Almacén de Proveedor es necesario para recibos de compras sub contratadas 
 DocType: Pricing Rule,Valid From,Válido desde
 DocType: Sales Invoice,Total Commission,Comisión total
 DocType: Pricing Rule,Sales Partner,Socio de ventas
@@ -471,7 +444,7 @@
 DocType: Monthly Distribution,"**Monthly Distribution** helps you distribute your budget across months if you have seasonality in your business.
 
 To distribute a budget using this distribution, set this **Monthly Distribution** in the **Cost Center**","**Distribución Mensual** le ayuda a distribuir su presupuesto a través de meses si tiene periodos en su negocio.  Para distribuir un presupuesto utilizando esta distribución, establecer **Distribución Mensual** en el **Centro de Costos**"
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +183,No records found in the Invoice table,No se encontraron registros en la tabla de facturas
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +130,No records found in the Invoice table,No se encontraron registros en la tabla de facturas
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +20,Please select Company and Party Type first,"Por favor, seleccione la compañía y el tipo de entidad"
 apps/erpnext/erpnext/config/accounts.py +84,Financial / accounting year.,Finanzas / Ejercicio contable.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","Lo sentimos , Nos de serie no se puede fusionar"
@@ -485,7 +458,7 @@
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +66,Payable Account,Cuenta por Pagar
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Repita los Clientes
 DocType: Leave Control Panel,Allocate,Asignar
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +16,Previous,Anterior
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard_page.html +16,Previous,Anterior
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +620,Sales Return,Volver Ventas
 DocType: Production Planning Tool,Select Sales Orders from which you want to create Production Orders.,Seleccione órdenes de venta a partir del cual desea crear órdenes de producción.
 apps/erpnext/erpnext/config/hr.py +120,Salary components.,Componentes salariales.
@@ -495,14 +468,13 @@
 DocType: Lead,Middle Income,Ingresos Medio
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),Apertura (Cred)
 apps/erpnext/erpnext/accounts/utils.py +193,Allocated amount can not be negative,Monto asignado no puede ser negativo
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +123,Tumbling,Tumbling
 DocType: Purchase Order Item,Billed Amt,Monto Facturado
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,Un almacén lógico por el cual se hacen las entradas de existencia.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +92,Reference No & Reference Date is required for {0},Se requiere de No de Referencia y Fecha de Referencia para {0}
 DocType: Event,Wednesday,Miércoles
 DocType: Sales Invoice,Customer's Vendor,Vendedor del Cliente
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +214,Production Order is Mandatory,La orden de producción es obligatoria
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +139,Proposal Writing,Redacción de Propuestas
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,Proposal Writing,Redacción de Propuestas
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,Existe otro vendedor {0} con el mismo ID de empleado
 apps/erpnext/erpnext/stock/stock_ledger.py +336,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},Error de stock negativo ( {6} ) para el producto {0} en Almacén {1} en {2} {3} en {4} {5}
 DocType: Fiscal Year Company,Fiscal Year Company,Año fiscal de la compañía
@@ -524,7 +496,7 @@
 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.","Luego las reglas de precios son filtradas en base a Cliente, Categoría de cliente, Territorio, Proveedor, Tipo de Proveedor, Campaña, Socio de Ventas, etc"
 apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.py +179,Please install dropbox python module,"Por favor, instale el módulo python dropbox"
 DocType: Employee,Passport Number,Número de pasaporte
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +82,Manager,Gerente
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Manager,Gerente
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +494,From Purchase Receipt,Desde recibo de compra
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +219,Same item has been entered multiple times.,El mismo artículo se ha introducido varias veces.
 DocType: SMS Settings,Receiver Parameter,Configuración de receptor(es)
@@ -532,10 +504,9 @@
 DocType: Sales Person,Sales Person Targets,Metas de Vendedor
 apps/frappe/frappe/public/js/frappe/form/workflow.js +116,To,a
 apps/frappe/frappe/templates/base.html +145,Please enter email address,"Por favor, introduzca la dirección de correo electrónico"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +35,End tube forming,Fin tubo formando
 DocType: Production Order Operation,In minutes,En minutos
 DocType: Issue,Resolution Date,Fecha de Resolución
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +635,Please set default Cash or Bank account in Mode of Payment {0},"Por favor, defina la cuenta de bancos o caja predeterminados en el método de pago {0}"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +637,Please set default Cash or Bank account in Mode of Payment {0},"Por favor, defina la cuenta de bancos o caja predeterminados en el método de pago {0}"
 DocType: Selling Settings,Customer Naming By,Naming Cliente Por
 apps/erpnext/erpnext/accounts/doctype/account/account.js +67,Convert to Group,Convertir al Grupo
 DocType: Activity Cost,Activity Type,Tipo de Actividad
@@ -543,12 +514,12 @@
 DocType: Customer,Fixed Days,Días Fijos
 DocType: Sales Invoice,Packing List,Lista de Envío
 apps/erpnext/erpnext/config/buying.py +28,Purchase Orders given to Suppliers.,Órdenes de compra enviadas a los proveedores.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +43,Publishing,Publicación
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +43,Publishing,Publicación
 DocType: Activity Cost,Projects User,Usuario de proyectos
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Consumed,Consumido
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +198,{0}: {1} not found in Invoice Details table,{0}: {1} no se encuentra en el detalle de la factura
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,{0}: {1} not found in Invoice Details table,{0}: {1} no se encuentra en el detalle de la factura
 DocType: Company,Round Off Cost Center,Centro de costos por defecto (redondeo)
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +208,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Visita de Mantenimiento {0} debe ser cancelado antes de cancelar la Orden de Ventas
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +203,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Visita de Mantenimiento {0} debe ser cancelado antes de cancelar la Orden de Ventas
 DocType: Material Request,Material Transfer,Transferencia de Material
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +56,Opening (Dr),Apertura (Deb)
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},Fecha y hora de contabilización deberá ser posterior a {0}
@@ -560,7 +531,6 @@
 DocType: Pricing Rule,Sales Manager,Gerente De Ventas
 apps/frappe/frappe/public/js/frappe/model/model.js +492,Rename,Renombrar
 DocType: Journal Entry,Write Off Amount,Importe de desajuste
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +52,Bending,Doblado
 apps/frappe/frappe/core/page/user_permissions/user_permissions.js +246,Allow User,Permitir al usuario
 DocType: Journal Entry,Bill No,Factura No.
 DocType: Purchase Invoice,Quarterly,Trimestral
@@ -569,17 +539,16 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Please enter item details,"Por favor, ingrese los detalles del producto"
 DocType: Purchase Receipt,Other Details,Otros Datos
 DocType: Account,Accounts,Contabilidad
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +67,Marketing,Marketing
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +65,Straight shearing,Esquila Heterosexual
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +67,Marketing,Marketing
 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.,Para rastrear artículo en ventas y documentos de compra en base a sus nn serie. Esto se puede también utilizar para rastrear información sobre la garantía del producto.
 DocType: Purchase Receipt Item Supplied,Current Stock,Inventario Actual
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +99,Rejected Warehouse is mandatory against regected item,Almacén Rechazado es obligatorio contra Ítem rechazado
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +102,Rejected Warehouse is mandatory against regected item,Almacén Rechazado es obligatorio contra Ítem rechazado
 DocType: Account,Expenses Included In Valuation,Gastos dentro de la valoración
 DocType: Employee,Provide email id registered in company,Proporcionar correo electrónico de identificación registrado en la compañía
 DocType: Hub Settings,Seller City,Ciudad del vendedor
 DocType: Email Digest,Next email will be sent on:,Siguiente correo electrónico será enviado el:
 DocType: Offer Letter Term,Offer Letter Term,Término de carta de oferta
-apps/erpnext/erpnext/stock/doctype/item/item.py +492,Item has variants.,El producto tiene variantes.
+apps/erpnext/erpnext/stock/doctype/item/item.py +496,Item has variants.,El producto tiene variantes.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Elemento {0} no encontrado
 DocType: Bin,Stock Value,Valor de Inventario
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,Tipo de Árbol
@@ -588,9 +557,8 @@
 DocType: Material Request Item,Quantity and Warehouse,Cantidad y Almacén
 DocType: Sales Invoice,Commission Rate (%),Porcentaje de comisión (%)
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +172,"Against Voucher Type must be one of Sales Order, Sales Invoice or Journal Entry","Contra Tipo de Comprobante debe ser uno de Pedidos de Venta, Factura de Venta o Entrada de Diario"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +139,Biomachining,Biomachining
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +7,Aerospace,Aeroespacial
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +19,Welcome,Bienvenido
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +7,Aerospace,Aeroespacial
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +40,Welcome,Bienvenido
 DocType: Journal Entry,Credit Card Entry,Introducción de tarjetas de crédito
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +18,Task Subject,Asunto de la Tarea
 apps/erpnext/erpnext/config/stock.py +33,Goods received from Suppliers.,Productos recibidos de proveedores.
@@ -613,19 +581,19 @@
 DocType: Employee,Cell Number,Número de movil
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Perdido
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +120,You can not enter current voucher in 'Against Journal Entry' column,Usted no puede ingresar Comprobante Actual en la comumna 'Contra Contrada de Diario'
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +25,Energy,Energía
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,Energía
 DocType: Opportunity,Opportunity From,Oportunidad De
 apps/erpnext/erpnext/config/hr.py +33,Monthly salary statement.,Nómina Mensual.
 DocType: Item Group,Website Specifications,Especificaciones del Sitio Web
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +205,New Account,Nueva Cuenta
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +21,{0}: From {0} of type {1},{0}: Desde {0} del tipo {1}
-apps/erpnext/erpnext/controllers/buying_controller.py +283,Row {0}: Conversion Factor is mandatory,Fila {0}: Factor de conversión es obligatoria
+apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,Fila {0}: Factor de conversión es obligatoria
 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.,Los asientos contables se pueden hacer en contra de nodos hoja. No se permiten los comentarios en contra de los grupos.
 DocType: ToDo,High,Alto
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +361,Cannot deactivate or cancel BOM as it is linked with other BOMs,No se puede desactivar o cancelar la 'Lista de Materiales (LdM)' si esta vinculada con otras
 DocType: Opportunity,Maintenance,Mantenimiento
 DocType: User,Male,Masculino
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +182,Purchase Receipt number required for Item {0},Número de Recibo de Compra Requerido para el punto {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +183,Purchase Receipt number required for Item {0},Número de Recibo de Compra Requerido para el punto {0}
 DocType: Item Attribute Value,Item Attribute Value,Atributos del producto
 apps/erpnext/erpnext/config/crm.py +64,Sales campaigns.,Campañas de Ventas.
 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.
@@ -673,10 +641,9 @@
 DocType: Address,Personal,Personal
 DocType: Expense Claim Detail,Expense Claim Type,Tipo de gasto
 DocType: Shopping Cart Settings,Default settings for Shopping Cart,Ajustes por defecto para Compras
-apps/erpnext/erpnext/controllers/accounts_controller.py +324,"Journal Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","El asiento {0} está enlazado con la orden {1}, compruebe si debe obtenerlo por adelantado en esta factura."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +13,Biotechnology,Biotecnología
+apps/erpnext/erpnext/controllers/accounts_controller.py +325,"Journal Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","El asiento {0} está enlazado con la orden {1}, compruebe si debe obtenerlo por adelantado en esta factura."
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +13,Biotechnology,Biotecnología
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Office Maintenance Expenses,Gastos de Mantenimiento de Oficinas
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +53,Hemming,Hemming
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +66,Please enter Item first,"Por favor, introduzca primero un producto"
 DocType: Account,Liability,Obligaciones
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +62,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Importe sancionado no puede ser mayor que el importe del reclamo en la linea {0}.
@@ -688,10 +655,10 @@
 DocType: Company,Default Bank Account,Cuenta Bancaria por defecto
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +47,"To filter based on Party, select Party Type first","Para filtrar en base a la fiesta, seleccione Partido Escriba primero"
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},'Actualizar Stock' no se puede marcar porque los productos no se entregan a través de {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Nos,Números
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Nos,Números
 DocType: Item,Items with higher weightage will be shown higher,Los productos con mayor peso se mostraran arriba
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Detalle de Conciliación Bancaria
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +627,My Invoices,Mis facturas
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +629,My Invoices,Mis facturas
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,Empleado no encontrado
 DocType: Purchase Order,Stopped,Detenido
 DocType: Item,If subcontracted to a vendor,Si es sub-contratado a un vendedor
@@ -709,19 +676,18 @@
 apps/erpnext/erpnext/config/support.py +13,Support queries from customers.,Consultas de soporte de clientes .
 DocType: Bin,Moving Average Rate,Porcentaje de Promedio Movil
 DocType: Production Planning Tool,Select Items,Seleccione Artículos
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,{0} against Bill {1} dated {2},{0} contra Factura {1} de fecha ​​{2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +328,{0} against Bill {1} dated {2},{0} contra Factura {1} de fecha ​​{2}
 DocType: Comment,Reference Name,Nombre de referencia
 DocType: Maintenance Visit,Completion Status,Estado de finalización
 DocType: Sales Invoice Item,Target Warehouse,Inventario Objetivo
 DocType: Item,Allow over delivery or receipt upto this percent,Permitir hasta este porcentaje en la entrega y/o recepción
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +49,Expected Delivery Date cannot be before Sales Order Date,La fecha prevista de entrega no puede ser anterior a la fecha de la órden de venta
 DocType: Upload Attendance,Import Attendance,Asistente de importación
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +17,All Item Groups,Todos los Grupos de Artículos
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +17,All Item Groups,Todos los Grupos de Artículos
 DocType: Process Payroll,Activity Log,Registro de Actividad
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +30,Net Profit / Loss,Utilidad/Pérdida Neta
 apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,Componer automáticamente el mensaje en la presentación de las transacciones.
 DocType: Production Order,Item To Manufacture,Artículo Para Fabricación
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +16,Permanent mold casting,Molde para fundición
 DocType: Sales Order Item,Projected Qty,Cant. Proyectada
 DocType: Sales Invoice,Payment Due Date,Fecha de pago
 DocType: Newsletter,Newsletter Manager,Administrador de boletínes
@@ -730,10 +696,9 @@
 DocType: Expense Claim,Expenses,Gastos
 ,Purchase Receipt Trends,Tendencias de Recibos de Compra
 DocType: Appraisal,Select template from which you want to get the Goals,Seleccione la plantilla de la que usted desea conseguir los Objetivos de
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +77,Research & Development,Investigación y Desarrollo
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Research & Development,Investigación y Desarrollo
 ,Amount to Bill,Monto a Facturar
 DocType: Company,Registration Details,Detalles de Registro
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +75,Staking,Replanteo
 DocType: Item,Re-Order Qty,Reordenar Cantidad
 DocType: Leave Block List Date,Leave Block List Date,Fecha de Lista de Bloqueo de Vacaciones
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +25,Scheduled to send to {0},Programado para enviar a {0}
@@ -743,18 +708,16 @@
 apps/erpnext/erpnext/config/hr.py +38,Performance appraisal.,Evaluación del Desempeño .
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Valor del Proyecto
 apps/erpnext/erpnext/config/selling.py +304,Point-of-Sale,Punto de venta
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,Cannot carry forward {0},No se puede cargar {0}
 apps/erpnext/erpnext/accounts/doctype/account/account.py +91,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","Balance de la cuenta ya en Crédito, no le está permitido establecer 'Balance Debe Ser' como 'Débito'"
 DocType: Account,Balance must be,Balance debe ser
 DocType: Hub Settings,Publish Pricing,Publicar precios
 DocType: Notification Control,Expense Claim Rejected Message,Mensaje de reembolso de gastos rechazado
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +145,Nailing,Clavado
 ,Available Qty,Cantidad Disponible
 DocType: Purchase Taxes and Charges,On Previous Row Total,En la Anterior Fila Total
 DocType: Salary Slip,Working Days,Días de Trabajo
 DocType: Serial No,Incoming Rate,Tasa entrante
 DocType: Packing Slip,Gross Weight,Peso Bruto
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +410,The name of your company for which you are setting up this system.,El nombre de su empresa para la que va a configurar el sistema.
+apps/erpnext/erpnext/public/js/setup_wizard.js +158,The name of your company for which you are setting up this system.,El nombre de su empresa para la que va a configurar el sistema.
 DocType: HR Settings,Include holidays in Total no. of Working Days,Incluir vacaciones con el numero total de días laborables
 DocType: Job Applicant,Hold,Mantener
 DocType: Employee,Date of Joining,Fecha de ingreso
@@ -764,7 +727,6 @@
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +3,View Subscribers,Ver Suscriptores
 DocType: Purchase Invoice Item,Purchase Receipt,Recibos de Compra
 ,Received Items To Be Billed,Recepciones por Facturar
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +114,Abrasive blasting,Chorreo abrasivo
 DocType: Employee,Ms,Sra.
 apps/erpnext/erpnext/config/accounts.py +148,Currency exchange rate master.,Configuración principal para el cambio de divisas
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +253,Unable to find Time Slot in the next {0} days for Operation {1},Incapaz de encontrar la ranura de tiempo en los próximos {0} días para la operación {1}
@@ -776,7 +738,7 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +209,Serial No {0} does not belong to Item {1},Número de orden {0} no pertenece al elemento {1}
 DocType: Purchase Receipt Item Supplied,Required Qty,Cant. Necesaria
 DocType: Bank Reconciliation,Total Amount,Importe total
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +32,Internet Publishing,Publicación por internet
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,Publicación por internet
 DocType: Production Planning Tool,Production Orders,Órdenes de Producción
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +35,Balance Value,Valor de balance
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,Lista de precios para la venta
@@ -787,7 +749,7 @@
 DocType: Supplier,Default Payable Accounts,Cuentas por Pagar por defecto
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,Empleado {0} no está activo o no existe
 DocType: Features Setup,Item Barcode,Código de barras del producto
-apps/erpnext/erpnext/stock/doctype/item/item.py +487,Item Variants {0} updated,{0} variantes actualizadas del producto
+apps/erpnext/erpnext/stock/doctype/item/item.py +491,Item Variants {0} updated,{0} variantes actualizadas del producto
 DocType: Quality Inspection Reading,Reading 6,Lectura 6
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Factura de compra anticipada
 DocType: Address,Shop,Tienda
@@ -796,7 +758,7 @@
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,Cuenta de Banco / Efectivo por Defecto defecto se actualizará automáticamente en el punto de venta de facturas cuando se selecciona este modo .
 DocType: Employee,Permanent Address Is,Dirección permanente es
 DocType: Production Order Operation,Operation completed for how many finished goods?,La operación se realizó para la cantidad de productos terminados?
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +491,The Brand,La Marca
+apps/erpnext/erpnext/public/js/setup_wizard.js +237,The Brand,La Marca
 apps/erpnext/erpnext/controllers/status_updater.py +163,Allowance for over-{0} crossed for Item {1}.,Previsión por exceso de {0} cruzado para el punto {1}.
 DocType: Employee,Exit Interview Details,Detalles de Entrevista de Salida
 DocType: Item,Is Purchase Item,Es una compra de productos
@@ -813,15 +775,15 @@
 DocType: Purchase Invoice Item,Purchase Order Item,Articulos de la Orden de Compra
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Indirect Income,Ingresos Indirectos
 DocType: Contact Us Settings,Address Line 1,Dirección Línea 1
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Variance,Variación
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +392,Company Name,Nombre de Compañía
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +53,Variance,Variación
+,Company Name,Nombre de Compañía
 DocType: SMS Center,Total Message(s),Total Mensage(s)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +515,Select Item for Transfer,Seleccionar elemento de Transferencia
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +538,Select Item for Transfer,Seleccionar elemento de Transferencia
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,Seleccione la cuenta principal de banco donde los cheques fueron depositados.
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,Permitir al usuario editar Precio de Lista  en las transacciones
 DocType: Pricing Rule,Max Qty,Cantidad Máxima
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +106,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Fila {0}: El pago de Compra/Venta siempre debe estar marcado como anticipo
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +16,Chemical,Químico
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,Químico
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +693,All items have already been transferred for this Production Order.,Todos los artículos ya han sido transferidos para esta Orden de Producción.
 DocType: Process Payroll,Select Payroll Year and Month,Seleccione nómina Año y Mes
 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""","Ir al grupo apropiado, usualmente (Aplicación de Fondos> Activo Circulante> Cuentas Bancarias) y crear una nueva cuenta haciendo clic en Añadir hijo del tipo ""Banco"""
@@ -832,12 +794,12 @@
 DocType: Item,Inspection Criteria,Criterios de Inspección
 apps/erpnext/erpnext/config/accounts.py +101,Tree of finanial Cost Centers.,Árbol de Centros de Costos Financieros.
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,Transferido
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +492,Upload your letter head and logo. (you can edit them later).,Carge su membrete y su logotipo. (Puede editarlos más tarde).
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +156,White,Blanco
+apps/erpnext/erpnext/public/js/setup_wizard.js +238,Upload your letter head and logo. (you can edit them later).,Carge su membrete y su logotipo. (Puede editarlos más tarde).
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,White,Blanco
 DocType: SMS Center,All Lead (Open),Todas las Oportunidades (Abiertas)
 DocType: Purchase Invoice,Get Advances Paid,Obtener anticipos pagados
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +362,Attach Your Picture,Adjunte su Fotografía 
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Make ,Hacer
+apps/erpnext/erpnext/public/js/setup_wizard.js +112,Attach Your Picture,Adjunte su Fotografía 
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +540,Make ,Hacer
 DocType: Journal Entry,Total Amount in Words,Importe total en letras
 DocType: Workflow State,Stop,Detenerse
 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.,"Ha ocurrido un error . Una razón probable podría ser que usted no ha guardado el formulario. Por favor, póngase en contacto con support@erpnext.com si el problema persiste."
@@ -845,13 +807,12 @@
 DocType: Lead,Next Contact Date,Siguiente fecha de contacto
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,Cant. de Apertura
 DocType: Holiday List,Holiday List Name,Lista de nombres de vacaciones
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +168,Stock Options,Opciones sobre Acciones
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +168,Stock Options,Opciones sobre Acciones
 DocType: Journal Entry Account,Expense Claim,Reembolso de gastos
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +181,Qty for {0},Cantidad de {0}
 DocType: Leave Application,Leave Application,Solicitud de Vacaciones
 apps/erpnext/erpnext/config/hr.py +77,Leave Allocation Tool,Herramienta de Asignación de Vacaciones
 DocType: Leave Block List,Leave Block List Dates,Fechas de Lista de Bloqueo de Vacaciones
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +56,Trimming,Guarnición
 DocType: Workstation,Net Hour Rate,Tasa neta por hora
 DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,Recibo sobre costos de destino estimados
 DocType: Company,Default Terms,Términos / Condiciones predeterminados
@@ -861,7 +822,6 @@
 DocType: Delivery Note,Delivery To,Entregar a
 DocType: Production Planning Tool,Get Sales Orders,Recibe Órdenes de Venta
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} no puede ser negativo
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +103,Filing,Presentación
 apps/erpnext/erpnext/templates/form_grid/item_grid.html +72,Discount,Descuento
 DocType: Features Setup,Purchase Discounts,Descuentos sobre Compra
 DocType: Workstation,Wages,Salario
@@ -884,7 +844,7 @@
 DocType: Lead,Organization Name,Nombre de la Organización
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,El producto debe ser agregado utilizando el botón 'Obtener productos desde recibos de compra'
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,Gastos de Ventas
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Buying,Compra estándar
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +120,Standard Buying,Compra estándar
 DocType: GL Entry,Against,Contra
 DocType: Item,Default Selling Cost Center,Centros de coste por defecto
 DocType: Sales Partner,Implementation Partner,Socio de implementación
@@ -903,28 +863,28 @@
 DocType: Time Log Batch,updated via Time Logs,actualizada a través de los registros de tiempo
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,Edad Promedio
 DocType: Opportunity,Your sales person who will contact the customer in future,Su persona de ventas que va a ponerse en contacto con el cliente en el futuro
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +588,List a few of your suppliers. They could be organizations or individuals.,Enumere algunos de sus proveedores. Pueden ser organizaciones o individuos.
+apps/erpnext/erpnext/public/js/setup_wizard.js +326,List a few of your suppliers. They could be organizations or individuals.,Enumere algunos de sus proveedores. Pueden ser organizaciones o individuos.
 DocType: Company,Default Currency,Moneda Predeterminada
 DocType: Contact,Enter designation of this Contact,Introduzca designación de este contacto
 DocType: Contact Us Settings,Address,Direcciones
 DocType: Expense Claim,From Employee,Desde Empleado
-apps/erpnext/erpnext/controllers/accounts_controller.py +338,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Advertencia : El sistema no comprobará sobrefacturación desde monto para el punto {0} en {1} es cero
+apps/erpnext/erpnext/controllers/accounts_controller.py +339,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Advertencia : El sistema no comprobará sobrefacturación desde monto para el punto {0} en {1} es cero
 DocType: Journal Entry,Make Difference Entry,Hacer Entrada de Diferencia
 DocType: Upload Attendance,Attendance From Date,Asistencia De Fecha
 DocType: Appraisal Template Goal,Key Performance Area,Área Clave de Rendimiento
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +54,Transportation,Transporte
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +54,Transportation,Transporte
 apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +67, and year: ,y año:
 DocType: SMS Center,Total Characters,Total Caracteres 
-apps/erpnext/erpnext/controllers/buying_controller.py +139,Please select BOM in BOM field for Item {0},"Por favor, seleccione la Solicitud de Materiales en el campo de Solicitud de Materiales para el punto {0}"
+apps/erpnext/erpnext/controllers/buying_controller.py +130,Please select BOM in BOM field for Item {0},"Por favor, seleccione la Solicitud de Materiales en el campo de Solicitud de Materiales para el punto {0}"
 DocType: C-Form Invoice Detail,C-Form Invoice Detail,Detalle C -Form Factura
 DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,Factura para reconciliación de pago
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +32,Contribution %,Contribución %
 DocType: Item,website page link,el vínculo web
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +192,Let's prepare the system for first use.,Se esta preparando el sistema para el primer uso.
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +242,Let's prepare the system for first use.,Se esta preparando el sistema para el primer uso.
 DocType: Company,Company registration numbers for your reference. Tax numbers etc.,"Los números de registro de la compañía para su referencia. Números fiscales, etc"
 DocType: Sales Partner,Distributor,Distribuidor
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Compras Regla de envío
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +214,Production Order {0} must be cancelled before cancelling this Sales Order,La orden de producción {0} debe ser cancelada antes de cancelar esta orden ventas
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +209,Production Order {0} must be cancelled before cancelling this Sales Order,La orden de producción {0} debe ser cancelada antes de cancelar esta orden ventas
 ,Ordered Items To Be Billed,Ordenes por facturar
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +21,Select Time Logs and Submit to create a new Sales Invoice.,Seleccionar registros de tiempo e Presentar después de crear una nueva factura de venta .
 DocType: Global Defaults,Global Defaults,Predeterminados globales
@@ -942,14 +902,13 @@
 DocType: Sales Invoice Advance,Sales Invoice Advance,Factura Anticipadas
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +398,Nothing to request,Nada que solicitar
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date','Fecha de Inicio' no puede ser mayor que 'Fecha Final'
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +75,Management,Gerencia
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +75,Management,Gerencia
 apps/erpnext/erpnext/config/projects.py +33,Types of activities for Time Sheets,Tipos de actividades para las Fichas de Tiempo
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +14,Investment casting,Fundición de precisión
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +51,Either debit or credit amount is required for {0},Se requiere débito o crédito para la cantidad {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""","Esto se añade al Código del Artículo de la variante. Por ejemplo, si su abreviatura es ""SM"", y el código del artículo es ""CAMISETA"", el código de artículo de la variante será ""CAMISETA-SM"""
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,Pago neto (en palabras) será visible una vez que guarde la nómina.
 apps/frappe/frappe/core/doctype/user/user_list.js +12,Active,Activo
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +154,Blue,Azul
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +154,Blue,Azul
 DocType: Purchase Invoice,Is Return,Es un retorno
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +123,Further nodes can be only created under 'Group' type nodes,Sólo se pueden crear más nodos bajo nodos de tipo  ' Grupo '
 DocType: Item,UOMs,Unidades de Medida
@@ -958,18 +917,16 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +22,POS Profile {0} already created for user: {1} and company {2},Perfil de POS {0} ya esta creado para el usuario: {1} en la compañía {2}
 DocType: Purchase Order Item,UOM Conversion Factor,Factor de Conversión de Unidad de Medida
 DocType: Stock Settings,Default Item Group,Grupo de artículos predeterminado 
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +156,Laminated object manufacturing,Fabricación de objetos laminados
 apps/erpnext/erpnext/config/buying.py +13,Supplier database.,Base de datos de proveedores.
 DocType: Account,Balance Sheet,Hoja de Balance
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +561,Cost Center For Item with Item Code ',Centro de Costos para artículo con Código del artículo '
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +45,Stretch forming,Formando Stretch
 DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,Su persona de ventas recibirá un aviso con esta fecha para ponerse en contacto con el cliente
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +210,"Further accounts can be made under Groups, but entries can be made against non-Groups","Las futuras cuentas se pueden crear bajo grupos, pero las entradas se crearán dentro de las subcuentas."
 apps/erpnext/erpnext/config/hr.py +125,Tax and other salary deductions.,Impuestos y otras deducciones salariales.
 DocType: Lead,Lead,Iniciativas
 DocType: Email Digest,Payables,Cuentas por Pagar
 DocType: Account,Warehouse,Almacén
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +90,Row #{0}: Rejected Qty can not be entered in Purchase Return,Fila # {0}: Rechazado Cantidad no se puede introducir en la Compra de Retorno
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +93,Row #{0}: Rejected Qty can not be entered in Purchase Return,Fila # {0}: Rechazado Cantidad no se puede introducir en la Compra de Retorno
 ,Purchase Order Items To Be Billed,Ordenes de Compra por Facturar
 DocType: Purchase Invoice Item,Net Rate,Tasa neta
 DocType: Purchase Invoice Item,Purchase Invoice Item,Factura de Compra del artículo
@@ -984,23 +941,23 @@
 DocType: Global Defaults,Current Fiscal Year,Año Fiscal actual
 DocType: Global Defaults,Disable Rounded Total,Desactivar redondeo
 DocType: Lead,Call,Llamada
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +384,'Entries' cannot be empty,'Entradas' no puede estar vacío
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +386,'Entries' cannot be empty,'Entradas' no puede estar vacío
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},Duplicar fila {0} con el mismo {1}
 ,Trial Balance,Balanza de Comprobación
 apps/erpnext/erpnext/config/hr.py +205,Setting up Employees,Configuración de Empleados
 apps/erpnext/erpnext/public/js/feature_setup.js +220,"Grid ""","Matriz """
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +150,Please select prefix first,"Por favor, seleccione primero el prefijo"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +138,Research,Investigación
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +138,Research,Investigación
 DocType: Maintenance Visit Purpose,Work Done,Trabajo Realizado
 DocType: Contact,User ID,ID de usuario
 DocType: Communication,Sent,Enviado
 apps/erpnext/erpnext/accounts/doctype/account/account.js +57,View Ledger,Mostrar libro mayor
 DocType: File,Lft,Izquierda-
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Primeras
-apps/erpnext/erpnext/stock/doctype/item/item.py +394,"An Item Group exists with same name, please change the item name or rename the item group","Existe un grupo de elementos con el mismo nombre , por favor, cambie el nombre del artículo , o cambiar el nombre del grupo de artículos"
+apps/erpnext/erpnext/stock/doctype/item/item.py +398,"An Item Group exists with same name, please change the item name or rename the item group","Existe un grupo de elementos con el mismo nombre , por favor, cambie el nombre del artículo , o cambiar el nombre del grupo de artículos"
 DocType: Communication,Delivery Status,Estado del Envío
 DocType: Production Order,Manufacture against Sales Order,Fabricación contra Pedido de Ventas
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +517,Rest Of The World,Resto del mundo
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +455,Rest Of The World,Resto del mundo
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,El artículo {0} no puede tener lotes
 ,Budget Variance Report,Variación de Presupuesto
 DocType: Salary Slip,Gross Pay,Pago bruto
@@ -1010,13 +967,11 @@
 DocType: BOM Item,Item Description,Descripción del Artículo
 DocType: Payment Tool,Payment Mode,Método de pago
 DocType: Purchase Invoice,Is Recurring,Es recurrente
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +154,Direct metal laser sintering,De metal sinterizado por láser directo
 DocType: Purchase Order,Supplied Items,Artículos suministrados
 DocType: Production Order,Qty To Manufacture,Cantidad Para Fabricación
 DocType: Buying Settings,Maintain same rate throughout purchase cycle,Mantener los mismos precios durante el ciclo de compras
 DocType: Opportunity Item,Opportunity Item,Oportunidad Artículo
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +61,Temporary Opening,Apertura Temporal
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +41,Cryorolling,Cryorolling
 ,Employee Leave Balance,Balance de Vacaciones del Empleado
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +128,Balance for Account {0} must always be {1},Balance de cuenta {0} debe ser siempre {1}
 DocType: Address,Address Type,Tipo de dirección
@@ -1030,23 +985,23 @@
 DocType: Journal Entry,Get Outstanding Invoices,Verifique Facturas Pendientes
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,Orden de Venta {0} no es válida
 apps/erpnext/erpnext/setup/doctype/company/company.py +172,"Sorry, companies cannot be merged","Lo sentimos , las empresas no se pueden combinar"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +145,Small,Pequeño
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Small,Pequeño
 DocType: Employee,Employee Number,Número del Empleado
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},Nº de caso ya en uso. Intente Nº de caso {0}
 ,Invoiced Amount (Exculsive Tax),Cantidad facturada ( Impuesto exclusive )
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,Elemento 2
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +59,Account head {0} created,Cuenta matriz {0} creada
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +153,Green,Verde
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Green,Verde
 DocType: Item,Auto re-order,Ordenar automáticamente 
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +57,Total Achieved,Total Conseguido
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +59,Total Achieved,Total Conseguido
 DocType: Employee,Place of Issue,Lugar de emisión
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +59,Contract,Contrato
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Contract,Contrato
 DocType: Report,Disabled,Deshabilitado
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +490,UOM coversion factor required for UOM: {0} in Item: {1},Factor de conversion de la Unidad de Medida requerido para la Unidad de Medida {0} en el artículo: {1}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +83,Indirect Expenses,Egresos Indirectos
 apps/erpnext/erpnext/controllers/selling_controller.py +163,Row {0}: Qty is mandatory,Fila {0}: Cantidad es obligatorio
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +8,Agriculture,Agricultura
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +611,Your Products or Services,Sus productos o servicios
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,Agricultura
+apps/erpnext/erpnext/public/js/setup_wizard.js +347,Your Products or Services,Sus productos o servicios
 DocType: Mode of Payment,Mode of Payment,Método de pago
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,Se trata de un grupo de elementos raíz y no se puede editar .
 DocType: Journal Entry Account,Purchase Order,Órdenes de Compra
@@ -1057,7 +1012,7 @@
 DocType: Serial No,Serial No Details,Serial No Detalles
 DocType: Purchase Invoice Item,Item Tax Rate,Tasa de impuesto del producto
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +113,"For {0}, only credit accounts can be linked against another debit entry","Para {0}, sólo las cuentas de crédito se pueden vincular con un asiento de débito"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Delivery Note {0} is not submitted,Nota de Entrega {0} no está presentada
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +470,Delivery Note {0} is not submitted,Nota de Entrega {0} no está presentada
 apps/erpnext/erpnext/stock/get_item_details.py +136,Item {0} must be a Sub-contracted Item,El elemento {0} debe ser un producto sub-contratado
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,Maquinaria y Equipos
 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.","La 'regla precios' es seleccionada primero basada en el campo 'Aplicar En' que puede ser un artículo, grupo de artículos o marca."
@@ -1066,7 +1021,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +111,Production Order status is {0},El estado de la orden de producción es {0}
 DocType: Appraisal Goal,Goal,Meta/Objetivo
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +318,Expected Delivery Date is lesser than Planned Start Date.,La fecha prevista de entrega es menor que la fecha de inicio prevista.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +579,For Supplier,Por proveedor
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +602,For Supplier,Por proveedor
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,Ajuste del tipo de cuenta le ayuda en la selección de esta cuenta en las transacciones.
 DocType: Purchase Invoice,Grand Total (Company Currency),Suma total (Moneda Local)
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,Total Saliente
@@ -1092,9 +1047,9 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +74,"Total {0} for all items is zero, may you should change 'Distribute Charges Based On'","Total de {0} para todos los elementos es cero, puede que usted debe cambiar &#39;Distribuir los cargos basados ​​en&#39;"
 DocType: Purchase Invoice,Taxes and Charges Calculation,Cálculo de Impuestos y Cargos
 DocType: BOM Operation,Workstation,Puesto de Trabajo
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +112,Hardware,Hardware
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +112,Hardware,Hardware
 DocType: Attendance,HR Manager,Gerente de Recursos Humanos
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +50,Privilege Leave,Permiso con Privilegio
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +50,Privilege Leave,Permiso con Privilegio
 DocType: Purchase Invoice,Supplier Invoice Date,Fecha de la Factura de Proveedor 
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +79,You need to enable Shopping Cart,Necesita habilitar Carito de Compras
 apps/frappe/frappe/public/js/frappe/form/grid_body.html +6,No Data,No hay datos
@@ -1105,7 +1060,7 @@
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +81,Overlapping conditions found between:,Condiciones coincidentes encontradas entre :
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +168,Against Journal Entry {0} is already adjusted against some other voucher,Contra la Entrada de Diario entrada {0} ya se ajusta contra algún otro comprobante
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +68,Total Order Value,Valor Total del Pedido
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +38,Food,Comida
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +38,Food,Comida
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Rango de antigüedad 3
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +139,You can make a time log only against a submitted production order,Usted puede hacer un registro de tiempo sólo contra una orden de producción presentada
 DocType: Maintenance Schedule Item,No of Visits,No. de visitas
@@ -1142,7 +1097,7 @@
 DocType: Item,Maintain Stock,Mantener Stock
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +213,Stock Entries already created for Production Order ,Imagenes de entradas ya creadas por Orden de Producción
 DocType: Leave Control Panel,Leave blank if considered for all designations,Dejar en blanco si es considerada para todas las designaciones
-apps/erpnext/erpnext/controllers/accounts_controller.py +499,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Cambiar a tipo 'Actual' en la linea {0} no puede ser incluido en el precio
+apps/erpnext/erpnext/controllers/accounts_controller.py +500,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Cambiar a tipo 'Actual' en la linea {0} no puede ser incluido en el precio
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,Max: {0},Max: {0}
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +16,From Datetime,A partir de fecha y hora
 DocType: Email Digest,For Company,Para la empresa
@@ -1152,7 +1107,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +50,Chart of Accounts,Plan de cuentas
 DocType: Material Request,Terms and Conditions Content,Términos y Condiciones Contenido
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +471,cannot be greater than 100,No puede ser mayor que 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +546,Item {0} is not a stock Item,El producto {0} no es un producto de stock
+apps/erpnext/erpnext/stock/doctype/item/item.py +550,Item {0} is not a stock Item,El producto {0} no es un producto de stock
 DocType: Maintenance Visit,Unscheduled,No Programada
 DocType: Employee,Owned,Propiedad
 DocType: Salary Slip Deduction,Depends on Leave Without Pay,Depende de ausencia sin pago
@@ -1166,27 +1121,24 @@
 DocType: HR Settings,Employee Settings,Configuración del Empleado
 ,Batch-Wise Balance History,Historial de saldo por lotes
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +72,To Do List,Tareas por hacer
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +63,Apprentice,Aprendiz
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Apprentice,Aprendiz
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +99,Negative Quantity is not allowed,No se permiten cantidades negativas
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
 Used for Taxes and Charges","Tabla de detalle de Impuesto descargada de maestro de artículos como una cadena y almacenada en este campo.
  Se utiliza para las tasas y cargos"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +61,Lancing,Lancing
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +151,Employee cannot report to himself.,Empleado no puede informar a sí mismo.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Si la cuenta está congelada , las entradas se les permite a los usuarios restringidos."
 DocType: Job Opening,"Job profile, qualifications required etc.","Perfil laboral, las cualificaciones necesarias, etc"
 DocType: Journal Entry Account,Account Balance,Balance de la Cuenta
 DocType: Rename Tool,Type of document to rename.,Tipo de documento para cambiar el nombre.
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +630,We buy this Item,Compramos este artículo
+apps/erpnext/erpnext/public/js/setup_wizard.js +366,We buy this Item,Compramos este artículo
 DocType: Address,Billing,Facturación
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +77,Flanging,Flanger
 DocType: Bulk Email,Not Sent,No enviado
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +73,Explosive forming,Explosivo formación
 DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),Total Impuestos y Cargos (Moneda Local)
 DocType: Shipping Rule,Shipping Account,cuenta Envíos
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +43,Scheduled to send to {0} recipients,Programado para enviar a {0} destinatarios
 DocType: Quality Inspection,Readings,Lecturas
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Sub Assemblies,Sub-Ensamblajes
+apps/erpnext/erpnext/public/js/setup_wizard.js +359,Sub Assemblies,Sub-Ensamblajes
 DocType: Shipping Rule Condition,To Value,Para el valor
 DocType: Supplier,Stock Manager,Gerente
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +143,Source warehouse is mandatory for row {0},Almacén de origen es obligatoria para la fila {0}
@@ -1196,43 +1148,41 @@
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,¡Importación fallida!
 apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,No se ha añadido ninguna dirección todavía.
 DocType: Workstation Working Hour,Workstation Working Hour,Horario de la Estación de Trabajo
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +83,Analyst,Analista
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +202,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Fila {0}: cantidad asignada {1} debe ser menor o igual al importe en Comprobante de Diario {2}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Analyst,Analista
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +149,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Fila {0}: cantidad asignada {1} debe ser menor o igual al importe en Comprobante de Diario {2}
 DocType: Item,Inventory,inventario
 apps/erpnext/erpnext/public/js/pos/pos.js +402,Payment cannot be made for empty cart,No se puede realizar un pago con el carrito de compras vacío
 DocType: Item,Sales Details,Detalles de Ventas
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +149,Pinning,Fijación
 DocType: Opportunity,With Items,Con artículos
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,En Cantidad
 DocType: Notification Control,Expense Claim Rejected,Reembolso de gastos rechazado
 DocType: Sales Invoice,"The date on which next invoice will be generated. It is generated on submit.
 ",La fecha en que se generará próxima factura. Se genera en enviar.
 DocType: Item Attribute,Item Attribute,Atributos del producto
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +105,Government,Gobierno
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Government,Gobierno
 apps/erpnext/erpnext/config/stock.py +268,Item Variants,Variantes del producto
 DocType: Company,Services,Servicios
 apps/erpnext/erpnext/accounts/report/financial_statements.py +147,Total ({0}),Total ({0})
 DocType: Cost Center,Parent Cost Center,Centro de Costo Principal
 DocType: Sales Invoice,Source,Referencia
 DocType: Leave Type,Is Leave Without Pay,Es una ausencia sin goce de salario
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +186,No records found in the Payment table,No se encontraron registros en la tabla de pagos
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +405,Financial Year Start Date,Inicio del ejercicio contable
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +133,No records found in the Payment table,No se encontraron registros en la tabla de pagos
+apps/erpnext/erpnext/public/js/setup_wizard.js +153,Financial Year Start Date,Inicio del ejercicio contable
 DocType: Employee External Work History,Total Experience,Experiencia Total
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +100,Countersinking,Avellanado
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +271,Packing Slip(s) cancelled,Lista(s) de embalaje cancelada(s)
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +276,Packing Slip(s) cancelled,Lista(s) de embalaje cancelada(s)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,Cargos por transporte de mercancías y transito
 DocType: Material Request Item,Sales Order No,Orden de Venta No
 DocType: Item Group,Item Group Name,Nombre del grupo de artículos
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +50,Taken,Tomado
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,Tomado
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +66,Transfer Materials for Manufacture,Transferenca de Materiales para Fabricación
 DocType: Pricing Rule,For Price List,Por lista de precios
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +27,Executive Search,Búsqueda de Ejecutivos
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,Búsqueda de Ejecutivos
 apps/erpnext/erpnext/stock/stock_ledger.py +405,"Purchase rate for item: {0} not found, which is required to book accounting entry (expense). Please mention item price against a buying price list.","La tarifa de compra para el producto: {0} no se encuentra, este se requiere para reservar la entrada contable (gastos). Por favor, indique el precio del artículo en una 'lista de precios' de compra."
 DocType: Maintenance Schedule,Schedules,Horarios
 DocType: Purchase Invoice Item,Net Amount,Importe Neto
 DocType: Purchase Order Item Supplied,BOM Detail No,Detalles de Lista de materiales (LdM) No.
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),Monto adicional de descuento (Moneda de la compañía)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +537,Error: {0} > {1},Error: {0} > {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +541,Error: {0} > {1},Error: {0} > {1}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,"Por favor, cree una nueva cuenta en el Plan General de Contabilidad."
 DocType: Maintenance Visit,Maintenance Visit,Visita de Mantenimiento
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer > Customer Group > Territory,Cliente> Categoría de cliente> Territorio
@@ -1253,14 +1203,13 @@
 apps/erpnext/erpnext/config/stock.py +120,Brand master.,Marca principal
 DocType: ToDo,Due Date,Fecha de vencimiento
 DocType: Sales Invoice Item,Brand Name,Marca
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Box,Caja
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +389,The Organization,La Organización
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Box,Caja
+apps/erpnext/erpnext/public/js/setup_wizard.js +137,The Organization,La Organización
 DocType: Monthly Distribution,Monthly Distribution,Distribución Mensual
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,"Lista de receptores está vacía. Por favor, cree Lista de receptores"
 DocType: Production Plan Sales Order,Production Plan Sales Order,Plan de producción de la orden de ventas (OV)
 DocType: Sales Partner,Sales Partner Target,Socio de Ventas Objetivo
 DocType: Pricing Rule,Pricing Rule,Reglas de Precios
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +58,Notching,Muescas
 apps/erpnext/erpnext/config/learn.py +167,Material Request to Purchase Order,Requisición de materiales hacia la órden de compra
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +74,Row # {0}: Returned Item {1} does not exists in {2} {3},Fila # {0}: El artículo vuelto {1} no existe en {2} {3}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,Cuentas bancarias
@@ -1277,8 +1226,6 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Amounts not reflected in bank,Monto no reflejado en banco
 DocType: Quality Inspection Reading,Reading 4,Lectura 4
 apps/erpnext/erpnext/config/hr.py +23,Claims for company expense.,Peticiones para gastos de compañía
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +8,Centrifugal casting,Fundición centrífuga
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +119,Magnetic field-assisted finishing,Acabado asistido por campo magnético
 DocType: Company,Default Holiday List,Listado de vacaciones / feriados predeterminados
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +165,Stock Liabilities,Inventario de Pasivos
 DocType: Purchase Receipt,Supplier Warehouse,Almacén Proveedor
@@ -1288,8 +1235,8 @@
 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.,Para realizar un seguimiento de elementos mediante código de barras. Usted será capaz de entrar en los elementos de la nota de entrega y la factura de venta mediante el escaneo de código de barras del artículo.
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +34,Make Quotation,Crear una cotización
 DocType: Dependent Task,Dependent Task,Tarea dependiente
-apps/erpnext/erpnext/stock/doctype/item/item.py +306,Conversion factor for default Unit of Measure must be 1 in row {0},El factor de conversión de la unidad de medida (UdM) en la linea {0} debe ser 1
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,Leave of type {0} cannot be longer than {1},Permiso de tipo {0} no puede tener más de {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +310,Conversion factor for default Unit of Measure must be 1 in row {0},El factor de conversión de la unidad de medida (UdM) en la linea {0} debe ser 1
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +155,Leave of type {0} cannot be longer than {1},Permiso de tipo {0} no puede tener más de {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Trate de operaciones para la planificación de X días de antelación.
 DocType: HR Settings,Stop Birthday Reminders,Detener recordatorios de cumpleaños
 DocType: SMS Center,Receiver List,Lista de receptores
@@ -1297,14 +1244,13 @@
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Cantidad Consumida
 apps/erpnext/erpnext/public/js/pos/pos.js +491,{0} View,{0} Ver
 DocType: Salary Structure Deduction,Salary Structure Deduction,Estructura Salarial Deducción
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +158,Selective laser sintering,Sinterización selectiva por láser
-apps/erpnext/erpnext/stock/doctype/item/item.py +301,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Unidad de Medida {0} se ha introducido más de una vez en la Tabla de Factores de Conversión 
+apps/erpnext/erpnext/stock/doctype/item/item.py +305,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Unidad de Medida {0} se ha introducido más de una vez en la Tabla de Factores de Conversión 
 apps/frappe/frappe/core/page/data_import_tool/data_import_tool.js +108,Import Successful!,¡Importación Exitosa!
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Costo de Artículos Emitidas
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +185,Quantity must not be more than {0},La cantidad no debe ser más de {0}
 DocType: Quotation Item,Quotation Item,Cotización del artículo
 DocType: Account,Account Name,Nombre de la Cuenta
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +41,From Date cannot be greater than To Date,La fecha 'Desde' no puede ser mayor que la fecha 'Hasta'
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +34,From Date cannot be greater than To Date,La fecha 'Desde' no puede ser mayor que la fecha 'Hasta'
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +194,Serial No {0} quantity {1} cannot be a fraction,Número de orden {0} {1} cantidad no puede ser una fracción
 apps/erpnext/erpnext/config/buying.py +59,Supplier Type master.,Configuración de las categorías de proveedores.
 DocType: Purchase Order Item,Supplier Part Number,Número de pieza del proveedor
@@ -1312,14 +1258,14 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +92,Conversion rate cannot be 0 or 1,La tasa de conversión no puede ser 0 o 1
 DocType: Accounts Settings,Credit Controller,Credit Controller
 DocType: Delivery Note,Vehicle Dispatch Date,Fecha de despacho de vehículo
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +197,Purchase Receipt {0} is not submitted,Recibo de Compra {0} no se presenta
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +198,Purchase Receipt {0} is not submitted,Recibo de Compra {0} no se presenta
 DocType: Company,Default Payable Account,Cuenta por Pagar por defecto
 apps/erpnext/erpnext/config/website.py +13,"Settings for online shopping cart such as shipping rules, price list etc.","Ajustes para la compra online, como las normas de envío, lista de precios, etc."
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +660,Setup Complete,Configuración completa
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +124,Setup Complete,Configuración completa
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +65,{0}% Billed,{0}% Facturado
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +17,Reserved Qty,Cant. Reservada
 DocType: Party Account,Party Account,Cuenta asignada
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +74,Human Resources,Recursos Humanos
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +74,Human Resources,Recursos Humanos
 DocType: Lead,Upper Income,Ingresos Superior
 apps/erpnext/erpnext/support/doctype/issue/issue.py +58,My Issues,Mis asuntos
 DocType: BOM Item,BOM Item,Lista de materiales (LdM) del producto
@@ -1327,11 +1273,9 @@
 DocType: Company,Default Values,Valores Predeterminados
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +236,Row {0}: Payment amount can not be negative,Fila {0}: Cantidad de pago no puede ser negativo
 DocType: Expense Claim,Total Amount Reimbursed,Monto total reembolsado
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +152,Press fitting,Press apropiado
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +64,Against Supplier Invoice {0} dated {1},Contra Factura de Proveedor {0} con fecha{1}
 DocType: Customer,Default Price List,Lista de precios Por defecto 
 DocType: Payment Reconciliation,Payments,Pagos.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +24,Hot isostatic pressing,Prensado isostático en caliente
 DocType: ToDo,Medium,Medio
 DocType: Budget Detail,Budget Allocated,Presupuesto asignado
 ,Customer Credit Balance,Saldo de Clientes
@@ -1343,9 +1287,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +56,None of the items have any change in quantity or value.,Ninguno de los productos tiene cambios en el valor o en la existencias.
 DocType: Warranty Claim,Warranty Claim,Reclamación de garantía
 ,Lead Details,Iniciativas
-DocType: Authorization Rule,Approving User,Aprobar Usuario
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +37,Forging,Forjando
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +126,Plating,Enchapado
 DocType: Purchase Invoice,End date of current invoice's period,Fecha final del periodo de facturación actual
 DocType: Pricing Rule,Applicable For,Aplicable para
 DocType: Bank Reconciliation,From Date,Desde la fecha
@@ -1361,30 +1302,28 @@
 DocType: Salary Structure Deduction,Reduce Deduction for Leave Without Pay (LWP),Reducir Deducción por Licencia sin Sueldo ( LWP )
 DocType: Territory,Territory Manager,Gerente de Territorio
 DocType: Selling Settings,Selling Settings,Configuración de Ventas 
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +39,Online Auctions,Subastas en Línea
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,Subastas en Línea
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +94,Please specify either Quantity or Valuation Rate or both,"Por favor indique la Cantidad o el Tipo de Valoración, o ambos"
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +50,"Company, Month and Fiscal Year is mandatory","Compañía, mes y año fiscal son obligatorios"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Marketing Expenses,Gastos de Comercialización
 ,Item Shortage Report,Reportar carencia de producto
-apps/erpnext/erpnext/stock/doctype/item/item.js +183,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Se menciona Peso, \n ¡Por favor indique ""Peso Unidad de Medida"" también"
+apps/erpnext/erpnext/stock/doctype/item/item.js +185,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Se menciona Peso, \n ¡Por favor indique ""Peso Unidad de Medida"" también"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,Solicitud de Material utilizado para hacer esta Entrada de Inventario
 apps/erpnext/erpnext/config/support.py +43,Single unit of an Item.,Números de serie únicos para cada producto
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +212,Time Log Batch {0} must be 'Submitted',El Registro de Horas {0} tiene que ser ' Enviado '
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,Crear un asiento contable para cada movimiento de stock
 DocType: Leave Allocation,Total Leaves Allocated,Total Vacaciones Asignadas
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +384,Warehouse required at Row No {0},Almacén requerido en la fila n {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +386,Warehouse required at Row No {0},Almacén requerido en la fila n {0}
 DocType: Employee,Date Of Retirement,Fecha de la jubilación
 DocType: Upload Attendance,Get Template,Verificar Plantilla
 DocType: Address,Postal,Postal
 DocType: Item,Weightage,Coeficiente de Ponderación
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +159,Mining,Minería
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +17,Resin casting,Resina de colada
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"Existe una categoría de cliente con el mismo nombre, por favor cambie el nombre del cliente o cambie el nombre de la categoría"
 apps/erpnext/erpnext/public/js/pos/pos.js +147,Please select {0} first.,"Por favor, seleccione primero {0}"
 DocType: Territory,Parent Territory,Territorio Principal
 DocType: Quality Inspection Reading,Reading 2,Lectura 2
 DocType: Stock Entry,Material Receipt,Recepción de Materiales
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +622,Products,Productos
+apps/erpnext/erpnext/public/js/setup_wizard.js +358,Products,Productos
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +47,Party Type and Party is required for Receivable / Payable account {0},El tipo de entidad es requerida para las cuentas de Cobrar/Pagar {0}
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.","Si este artículo tiene variantes, entonces no podrá ser seleccionado en los pedidos de venta, etc."
 DocType: Lead,Next Contact By,Siguiente Contacto por
@@ -1394,12 +1333,12 @@
 DocType: Purchase Invoice,Notification Email Address,Email para las notificaciones.
 DocType: Payment Tool,Find Invoices to Match,Facturas a conciliar
 ,Item-wise Sales Register,Detalle de Ventas
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +399,"e.g. ""XYZ National Bank""","por ejemplo ""XYZ Banco Nacional """
+apps/erpnext/erpnext/public/js/setup_wizard.js +147,"e.g. ""XYZ National Bank""","por ejemplo ""XYZ Banco Nacional """
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,¿Está incluido este Impuesto en el precio base?
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +57,Total Target,Totales del Objetivo
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Target,Totales del Objetivo
 DocType: Job Applicant,Applicant for a Job,Solicitante de Empleo
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +173,No Production Orders created,No existen órdenes de producción
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +131,Salary Slip of employee {0} already created for this month,Planilla de empleado {0} ya creado para este mes
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +140,Salary Slip of employee {0} already created for this month,Planilla de empleado {0} ya creado para este mes
 DocType: Stock Reconciliation,Reconciliation JSON,Reconciliación JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Hay demasiadas columnas. Exportar el informe e imprimirlo mediante una aplicación de hoja de cálculo.
 DocType: Sales Invoice Item,Batch No,Lote No.
@@ -1408,14 +1347,14 @@
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +13,Variant,Variante
 apps/frappe/frappe/public/js/frappe/form/toolbar.js +165,New {0},Nuevo {0}
 DocType: Naming Series,Set prefix for numbering series on your transactions,Establezca los prefijos de sus transacciones
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +169,Stopped order cannot be cancelled. Unstop to cancel.,Orden detenida no puede ser cancelada . Continuar antes de Cancelar.
-apps/erpnext/erpnext/stock/doctype/item/item.py +323,Default BOM ({0}) must be active for this item or its template,La lista de materiales por defecto ({0}) debe estar activa para este producto o plantilla
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +164,Stopped order cannot be cancelled. Unstop to cancel.,Orden detenida no puede ser cancelada . Continuar antes de Cancelar.
+apps/erpnext/erpnext/stock/doctype/item/item.py +327,Default BOM ({0}) must be active for this item or its template,La lista de materiales por defecto ({0}) debe estar activa para este producto o plantilla
 DocType: Employee,Leave Encashed?,Vacaciones Descansadas?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,El campo 'Oportunidad de' es obligatorio
 DocType: Item,Variants,Variantes
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +458,Make Purchase Order,Crear órden de Compra
 DocType: SMS Center,Send To,Enviar a
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +111,There is not enough leave balance for Leave Type {0},No hay suficiente saldo para Tipo de Vacaciones {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +127,There is not enough leave balance for Leave Type {0},No hay suficiente saldo para Tipo de Vacaciones {0}
 DocType: Sales Team,Contribution to Net Total,Contribución Neta Total
 DocType: Sales Invoice Item,Customer's Item Code,Código de artículo del Cliente
 DocType: Stock Reconciliation,Stock Reconciliation,Reconciliación de Inventario
@@ -1449,10 +1388,10 @@
 apps/erpnext/erpnext/config/selling.py +153,Bundle items at time of sale.,Agrupe elementos al momento de la venta.
 DocType: Sales Order Item,Actual Qty,Cantidad Real
 DocType: Quality Inspection Reading,Reading 10,Lectura 10
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +612,"List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start.","Enumere algunos de los productos o servicios que usted compra o vende. asegúrese de revisar el 'Grupo' de los artículos, unidad de medida (UOM) y las demás propiedades."
+apps/erpnext/erpnext/public/js/setup_wizard.js +348,"List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start.","Enumere algunos de los productos o servicios que usted compra o vende. asegúrese de revisar el 'Grupo' de los artículos, unidad de medida (UOM) y las demás propiedades."
 DocType: Hub Settings,Hub Node,Nodo del centro de actividades
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,Ha introducido elementos duplicados . Por favor rectifique y vuelva a intentarlo .
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +87,Associate,Asociado
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Associate,Asociado
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +46,Item {0} is not a serialized Item,El producto {0} no es un producto serializado
 DocType: SMS Center,Create Receiver List,Crear Lista de Receptores
 apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +5,Expired,Expirado
@@ -1461,7 +1400,7 @@
 DocType: Warranty Claim,Issue Date,Fecha de Emisión
 DocType: Activity Cost,Activity Cost,Costo de Actividad
 DocType: Purchase Receipt Item Supplied,Consumed Qty,Cantidad Consumida
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +52,Telecommunications,Telecomunicaciones
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +52,Telecommunications,Telecomunicaciones
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),Indica que el paquete es una parte de esta entrega (Sólo borradores)
 DocType: Payment Tool,Make Payment Entry,Registrar pago
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +119,Quantity for Item {0} must be less than {1},Cantidad de elemento {0} debe ser menor de {1}
@@ -1478,10 +1417,8 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +37,"Selling must be checked, if Applicable For is selected as {0}","Ventas debe ser seleccionado, si se selecciona Aplicable Para como {0}"
 DocType: Purchase Order Item,Supplier Quotation Item,Articulo de la Cotización del Proveedor
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +27,Make Salary Structure,Hacer Estructura Salarial
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +54,Shearing,Cizallamiento
 DocType: Item,Has Variants,Tiene Variantes
 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.,"Clic en el botón ""Crear factura de venta"" para crearla."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +166,Packaging and labeling,Empacado y etiquetado
 DocType: Monthly Distribution,Name of the Monthly Distribution,Nombre de la Distribución Mensual
 DocType: Sales Person,Parent Sales Person,Contacto Principal de Ventas
 apps/erpnext/erpnext/setup/utils.py +14,Please specify Default Currency in Company Master and Global Defaults,"Por favor, especifíque la moneda predeterminada en la compañía principal y los valores predeterminados globales"
@@ -1491,19 +1428,18 @@
 DocType: Supplier,Supplier of Goods or Services.,Proveedor de Productos o Servicios.
 DocType: Budget Detail,Fiscal Year,Año fiscal
 DocType: Cost Center,Budget,Presupuesto
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Achieved,Alcanzado
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,Alcanzado
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +65,Territory / Customer,Localidad / Cliente
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,e.g. 5,por ejemplo 5
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +207,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},Fila {0}: cantidad asignada {1} debe ser menor o igual a cantidad pendiente a facturar {2}
+apps/erpnext/erpnext/public/js/setup_wizard.js +294,e.g. 5,por ejemplo 5
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},Fila {0}: cantidad asignada {1} debe ser menor o igual a cantidad pendiente a facturar {2}
 DocType: Sales Invoice,In Words will be visible once you save the Sales Invoice.,En palabras serán visibles una vez que guarde la factura de venta.
 DocType: Item,Is Sales Item,Es un producto para venta
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,Árbol de Productos
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,"El producto {0} no está configurado para utilizar Números de Serie, por favor revise el artículo maestro"
 DocType: Maintenance Visit,Maintenance Time,Tiempo de Mantenimiento
 ,Amount to Deliver,Cantidad para envío
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +620,A Product or Service,Un Producto o Servicio
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +158,There were errors.,Hubo errores .
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +101,Tapping,Tapping
+apps/erpnext/erpnext/public/js/setup_wizard.js +356,A Product or Service,Un Producto o Servicio
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +146,There were errors.,Hubo errores .
 DocType: Naming Series,Current Value,Valor actual
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +171,{0} created,{0} creado
 DocType: Delivery Note Item,Against Sales Order,Contra la Orden de Venta
@@ -1518,7 +1454,7 @@
 apps/erpnext/erpnext/accounts/party.py +275,Due Date cannot be before Posting Date,La fecha de vencimiento no puede ser anterior a la fecha de contabilización
 DocType: Website Item Group,Website Item Group,Grupo de Artículos del Sitio Web
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Duties and Taxes,Derechos e Impuestos
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Please enter Reference date,"Por favor, introduzca la fecha de referencia"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +312,Please enter Reference date,"Por favor, introduzca la fecha de referencia"
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} registros de pago no se pueden filtrar por {1}
 DocType: Item Website Specification,Table for Item that will be shown in Web Site,Tabla de Artículo que se muestra en el Sitio Web
 DocType: Purchase Order Item Supplied,Supplied Qty,Suministrado Cantidad
@@ -1526,7 +1462,7 @@
 apps/erpnext/erpnext/config/stock.py +103,Tree of Item Groups.,Árbol de las categorías de producto
 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,No se puede referenciar a una linea mayor o igual al numero de linea actual.
 ,Item-wise Purchase History,Historial de Compras
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +152,Red,Rojo
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Red,Rojo
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +228,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},"Por favor, haga clic en 'Generar planificación' para obtener el no. de serie del producto {0}"
 DocType: Account,Frozen,Congelado
 ,Open Production Orders,Abrir Ordenes de Producción
@@ -1541,7 +1477,7 @@
 DocType: Item Attribute,Attribute Name,Nombre del Atributo
 apps/erpnext/erpnext/controllers/selling_controller.py +236,Item {0} must be Sales or Service Item in {1},El producto {0} debe ser un servicio o producto para la venta {1}
 DocType: Item Group,Show In Website,Mostrar En Sitio Web
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +621,Group,Grupo
+apps/erpnext/erpnext/public/js/setup_wizard.js +357,Group,Grupo
 DocType: Task,Expected Time (in hours),Tiempo previsto (en horas)
 ,Qty to Order,Cantidad a Solicitar
 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","Para realizar el seguimiento de marca en el siguiente documentación Nota de entrega, Oportunidad, solicitud de materiales, de artículos, de órdenes de compra, compra vale, Recibo Comprador, la cita, la factura de venta, producto Bundle, órdenes de venta, de serie"
@@ -1558,23 +1494,19 @@
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +137,Not Set,No Especificado
 DocType: Communication,Date,Fecha
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,Repita los ingresos de los clientes
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +651,Sit tight while your system is being setup. This may take a few moments.,Tome asiento mientras el sistema está siendo configurado. Esto puede tomar un momento.
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +115,Sit tight while your system is being setup. This may take a few moments.,Tome asiento mientras el sistema está siendo configurado. Esto puede tomar un momento.
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +51,{0} ({1}) must have role 'Expense Approver',{0} ({1}) debe tener la función de 'Supervisor de Gastos'
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Pair,Par
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Pair,Par
 DocType: Bank Reconciliation Detail,Against Account,Contra la cuenta
 DocType: Maintenance Schedule Detail,Actual Date,Fecha Real
 DocType: Item,Has Batch No,Tiene lote No
 DocType: Delivery Note,Excise Page Number,Número Impuestos Especiales Página
 DocType: Employee,Personal Details,Datos Personales
 ,Maintenance Schedules,Programas de Mantenimiento
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +44,Embossing,Repujado
 ,Quotation Trends,Tendencias de Cotización
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +139,Item Group not mentioned in item master for item {0},El grupo del artículo no se menciona en producto maestro para el elemento {0}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +302,Debit To account must be a Receivable account,La cuenta para Débito debe ser una cuenta por cobrar
-apps/erpnext/erpnext/stock/doctype/item/item.py +310,"As Production Order can be made for this item, it must be a stock item.","Puede haber una Orden de Producción por este concepto , debe ser un elemento del Inventario."
 DocType: Shipping Rule Condition,Shipping Amount,Importe del envío
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +140,Joining,Unión
-DocType: Authorization Rule,Above Value,Valor Superior
 ,Pending Amount,Monto Pendiente
 DocType: Purchase Invoice Item,Conversion Factor,Factor de Conversión
 DocType: Purchase Order,Delivered,Enviado
@@ -1585,7 +1517,6 @@
 DocType: Address Template,This format is used if country specific format is not found,Este formato se utiliza si no se encuentra un formato específico del país
 DocType: Custom Field,Custom,Personalizar
 DocType: Production Order,Use Multi-Level BOM,Utilizar Lista de Materiales (LdM)  Multi-Nivel
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +26,Injection molding,Inyección de plásticos
 DocType: Bank Reconciliation,Include Reconciled Entries,Incluir las entradas conciliadas
 apps/erpnext/erpnext/config/accounts.py +41,Tree of finanial accounts.,Árbol de las cuentas financieras
 DocType: Leave Control Panel,Leave blank if considered for all employee types,Dejar en blanco si es considerada para todos los tipos de empleados
@@ -1595,23 +1526,21 @@
 apps/frappe/frappe/config/setup.py +130,Printing,Impresión
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +114,Expense Claim is pending approval. Only the Expense Approver can update status.,El reembolso de gastos está pendiente de aprobación. Sólo el supervisor de gastos puede actualizar el estado.
 DocType: Purchase Invoice,Additional Discount Amount,Monto adicional de descuento
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +99,The day(s) on which you are applying for leave are holiday. You need not apply for leave.,El día (s) sobre el cual está solicitando la licencia son vacaciones. Usted no tiene que solicitar la licencia .
 apps/frappe/frappe/public/js/frappe/misc/utils.js +110,and,y
 DocType: Leave Block List Allow,Leave Block List Allow,Permitir Lista de Bloqueo de Vacaciones
 apps/erpnext/erpnext/setup/doctype/company/company.py +236,Abbr can not be blank or space,La abreviatura no puede estar en blanco o usar espacios
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +50,Sports,deportes
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,deportes
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Actual,Total Actual
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Unit,Unidad
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Unit,Unidad
 apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.py +182,Please set Dropbox access keys in your site config,"Por favor, establezca las llaves de acceso de Dropbox en la configuración de su sistema"
 apps/erpnext/erpnext/stock/get_item_details.py +113,Please specify Company,"Por favor, especifique la compañía"
 ,Customer Acquisition and Loyalty,Compras y Lealtad de Clientes
 DocType: Purchase Receipt,Warehouse where you are maintaining stock of rejected items,Almacén en el que está manteniendo un balance de los artículos rechazados
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +408,Your financial year ends on,Su año Financiero termina en
+apps/erpnext/erpnext/public/js/setup_wizard.js +156,Your financial year ends on,Su año Financiero termina en
 DocType: POS Profile,Price List,Lista de precios
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +20,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,"{0} es ahora el año fiscal predeterminado. Por favor, actualice su navegador para que el cambio surta efecto."
 apps/erpnext/erpnext/projects/doctype/project/project.js +47,Expense Claims,Reembolsos de gastos
 DocType: Issue,Support,Soporte
-DocType: Authorization Rule,Approving Role,Aprobar Rol
 ,BOM Search,Buscar listas de materiales (LdM)
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +176,Closing (Opening + Totals),Cierre (Apertura + Totales)
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +26,Please specify currency in Company,"Por favor, especifique la moneda en la compañía"
@@ -1639,10 +1568,9 @@
 DocType: Production Order Operation,Actual Operation Time,Tiempo de operación actual
 DocType: Authorization Rule,Applicable To (User),Aplicable a (Usuario)
 DocType: Purchase Taxes and Charges,Deduct,Deducir
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +170,Job Description,Descripción del trabajo
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +170,Job Description,Descripción del trabajo
 DocType: Purchase Order Item,Qty as per Stock UOM,Cantidad de acuerdo a la Unidad de Medida del Inventario
 apps/frappe/frappe/model/rename_doc.py +343,Please select a valid csv file with data,"Por favor, seleccione un archivo csv con datos válidos"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +92,Coating,Revestimiento
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +126,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Caracteres especiales excepto ""-"" ""."", ""#"", y ""/"" no permitido en el nombramiento de serie"
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Lleve un registro de las campañas de venta. Lleve un registro de conductores, Citas, pedidos de venta, etc de Campañas para medir retorno de la inversión. "
 DocType: Expense Claim,Approver,Supervisor
@@ -1652,10 +1580,9 @@
 DocType: Supplier Quotation,Manufacturing Manager,Gerente de Manufactura
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},Número de orden {0} está en garantía hasta {1}
 apps/erpnext/erpnext/config/stock.py +69,Split Delivery Note into packages.,Dividir nota de entrega en paquetes .
-apps/erpnext/erpnext/hooks.py +84,Shipments,Los envíos
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +29,Dip molding,Moldeo por inmersión
+apps/erpnext/erpnext/hooks.py +68,Shipments,Los envíos
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,El Estado del Registro de Horas tiene que ser 'Enviado'.
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +650,Setting Up,Configuración
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +114,Setting Up,Configuración
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,Row # ,Fila #
 DocType: Purchase Invoice,In Words (Company Currency),En palabras (Moneda Local)
 DocType: Pricing Rule,Supplier,Proveedores
@@ -1663,7 +1590,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +105,Miscellaneous Expenses,Gastos Varios
 DocType: Global Defaults,Default Company,Compañía Predeterminada
 apps/erpnext/erpnext/controllers/stock_controller.py +166,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,"Cuenta de Gastos o Diferencia es obligatorio para el elemento {0} , ya que impacta el valor del stock"
-apps/erpnext/erpnext/controllers/accounts_controller.py +354,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","No se puede sobre-facturar el producto {0} más de {2} en la linea {1}. Para permitir la sobre-facturación, necesita configurarlo en las opciones de stock"
+apps/erpnext/erpnext/controllers/accounts_controller.py +355,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","No se puede sobre-facturar el producto {0} más de {2} en la linea {1}. Para permitir la sobre-facturación, necesita configurarlo en las opciones de stock"
 DocType: Employee,Bank Name,Nombre del Banco
 apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +27,-Above,-Mayor
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +135,User {0} is disabled,El usuario {0} está deshabilitado
@@ -1675,25 +1602,24 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,{0} is mandatory for Item {1},{0} es obligatorio para el producto {1}
 DocType: Currency Exchange,From Currency,Desde Moneda
 DocType: DocField,Name,Nombre
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +211,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Por favor seleccione el monto asignado, tipo de factura y número en una fila"
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +104,Sales Order required for Item {0},Orden de Venta requerida para el punto {0}
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +158,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Por favor seleccione el monto asignado, tipo de factura y número en una fila"
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +107,Sales Order required for Item {0},Orden de Venta requerida para el punto {0}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +43,Amounts not reflected in system,Monto no reflejado en el sistema
 DocType: Purchase Invoice Item,Rate (Company Currency),Precio (Moneda Local)
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +40,Others,Otros
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +40,Others,Otros
 DocType: POS Profile,Taxes and Charges,Impuestos y cargos
 DocType: Item,"A Product or a Service that is bought, sold or kept in stock.","Un producto o un servicio que se compra, se vende o se mantiene en 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,No se puede seleccionar el tipo de cargo como 'Importe de linea anterior' o ' Total de linea anterior' para la primera linea
 apps/frappe/frappe/core/doctype/doctype/boilerplate/controller_list.html +31,Completed,Completado
 DocType: Web Form,Select DocType,Seleccione tipo de documento
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +104,Broaching,Brochado
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +12,Banking,Banca
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,Banca
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +38,Please click on 'Generate Schedule' to get schedule,"Por favor, haga clic en 'Generar planificación' para obtener las tareas"
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +283,New Cost Center,Nuevo Centro de Costo
 DocType: Bin,Ordered Quantity,Cantidad Pedida
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +397,"e.g. ""Build tools for builders""","por ejemplo "" Herramientas para los Constructores """
+apps/erpnext/erpnext/public/js/setup_wizard.js +145,"e.g. ""Build tools for builders""","por ejemplo "" Herramientas para los Constructores """
 DocType: Quality Inspection,In Process,En proceso
 DocType: Authorization Rule,Itemwise Discount,Descuento de producto
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +318,{0} against Sales Order {1},{0} contra orden de venta {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +320,{0} against Sales Order {1},{0} contra orden de venta {1}
 DocType: Account,Fixed Asset,Activos Fijos
 DocType: Time Log Batch,Total Billing Amount,Monto total de facturación
 apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +47,Receivable Account,Cuenta por Cobrar
@@ -1709,10 +1635,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +50,Office Equipments,Equipos de Oficina
 DocType: Purchase Invoice Item,Qty,Cantidad
 DocType: Fiscal Year,Companies,Compañías
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +24,Electronics,Electrónica
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +24,Electronics,Electrónica
 DocType: Stock Settings,Raise Material Request when stock reaches re-order level,Enviar solicitud de materiales cuando se alcance un nivel bajo el stock
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +18,From Maintenance Schedule,Desde programa de mantenimiento
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +56,Full-time,Jornada Completa
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +56,Full-time,Jornada Completa
 DocType: Purchase Invoice,Contact Details,Datos del Contacto
 DocType: C-Form,Received Date,Fecha de Recepción
 DocType: Delivery Note,"If you have created a standard template in Sales Taxes and Charges Template, select one and click on the button below.","Si ha creado una plantilla estándar de los impuestos y cargos de venta, seleccione uno y haga clic en el botón de abajo."
@@ -1723,7 +1649,7 @@
 DocType: Job Applicant,Job Opening,Oportunidad de empleo
 DocType: Payment Reconciliation,Payment Reconciliation,Conciliación de Pagos
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +154,Please select Incharge Person's name,"Por favor, seleccione el nombre de la persona a cargo"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +51,Technology,Tecnología
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,Tecnología
 DocType: Offer Letter,Offer Letter,Carta De Oferta
 apps/erpnext/erpnext/config/manufacturing.py +51,Generate Material Requests (MRP) and Production Orders.,Generar Solicitudes de Material ( MRP ) y Órdenes de Producción .
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +68,Total Invoiced Amt,Total Monto Facturado
@@ -1739,10 +1665,8 @@
 DocType: Item,Customer Item Codes,Códigos de clientes
 DocType: Opportunity,Lost Reason,Razón de la pérdida
 apps/erpnext/erpnext/config/accounts.py +68,Create Payment Entries against Orders or Invoices.,Crear entradas de pago contra órdenes o facturas.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +141,Welding,Soldadura
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +40,New Stock UOM is required,Se requiere Unidad de Medida para Nuevo Inventario
 DocType: Quality Inspection,Sample Size,Tamaño de la muestra
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +443,All items have already been invoiced,Todos los artículos que ya se han facturado
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +446,All items have already been invoiced,Todos los artículos que ya se han facturado
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',"Por favor, especifique 'Desde el caso No.' válido"
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +287,Further cost centers can be made under Groups but entries can be made against non-Groups,"Los centros de costos se pueden crear bajo grupos, pero las entradas se crearán dentro de las subcuentas."
 DocType: Project,External,Externo
@@ -1754,8 +1678,7 @@
 DocType: Bin,Actual Quantity,Cantidad actual
 DocType: Shipping Rule,example: Next Day Shipping,ejemplo : Envío Día Siguiente
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,Serial No {0} no encontrado
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +563,Your Customers,Sus clientes
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +27,Compression molding,Moldeo por compresión
+apps/erpnext/erpnext/public/js/setup_wizard.js +303,Your Customers,Sus clientes
 DocType: Leave Block List Date,Block Date,Bloquear fecha
 DocType: Sales Order,Not Delivered,No Entregado
 ,Bank Clearance Summary,Liquidez Bancaria
@@ -1776,10 +1699,10 @@
 DocType: SMS Log,Sent To,Enviado A
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +28,Make Sales Invoice,Hacer Factura de Venta
 DocType: Company,For Reference Only.,Sólo para referencia.
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +29,Invalid {0}: {1},No válido {0}: {1}
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +49,Invalid {0}: {1},No válido {0}: {1}
 DocType: Sales Invoice Advance,Advance Amount,Importe Anticipado
 DocType: Manufacturing Settings,Capacity Planning,Planificación de capacidad
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +49,'From Date' is required,'Desde la fecha' es requerido
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +43,'From Date' is required,'Desde la fecha' es requerido
 DocType: Journal Entry,Reference Number,Número de referencia
 DocType: Employee,Employment Details,Detalles de Empleo
 DocType: Employee,New Workplace,Nuevo lugar de trabajo
@@ -1794,7 +1717,7 @@
 DocType: Serial No,Delivery Time,Tiempo de Entrega
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Antigüedad Basada en
 DocType: Item,End of Life,Final de la Vida
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +41,Travel,Viajes
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +41,Travel,Viajes
 DocType: Leave Block List,Allow Users,Permitir que los usuarios
 DocType: Sales Invoice,Recurring,Periódico
 DocType: Cost Center,Track separate Income and Expense for product verticals or divisions.,Seguimiento de Ingresos y Gastos por separado para las verticales de productos o divisiones.
@@ -1807,7 +1730,7 @@
 DocType: Naming Series,User must always select,Usuario elegirá siempre
 DocType: Stock Settings,Allow Negative Stock,Permitir Inventario Negativo
 DocType: Installation Note,Installation Note,Nota de Instalación
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +541,Add Taxes,Agregar impuestos
+apps/erpnext/erpnext/public/js/setup_wizard.js +283,Add Taxes,Agregar impuestos
 ,Financial Analytics,Análisis Financieros
 DocType: Quality Inspection,Verified By,Verificado por
 DocType: Address,Subsidiary,Filial
@@ -1817,7 +1740,6 @@
 DocType: System Settings,In Hours,Horas
 DocType: Process Payroll,Create Salary Slip,Crear Nómina
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Expected balance as per bank,Importe pendiente de banco
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +115,Buffing,Pulido
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Source of Funds (Liabilities),Fuente de los fondos ( Pasivo )
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +347,Quantity in row {0} ({1}) must be same as manufactured quantity {2},La cantidad en la linea {0} ({1}) debe ser la misma que la cantidad producida {2}
 DocType: Appraisal,Employee,Empleado
@@ -1832,11 +1754,11 @@
 DocType: Page,Standard,Estándar
 DocType: Rename Tool,File to Rename,Archivo a renombrar
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +176,Purchse Order number required for Item {0},Número de Orden de Compra se requiere para el elemento {0}
-apps/erpnext/erpnext/controllers/buying_controller.py +245,Specified BOM {0} does not exist for Item {1},Solicitud de Materiales especificado {0} no existe la partida {1}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +202,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Programa de mantenimiento {0} debe ser cancelado antes de cancelar esta orden de venta
+apps/erpnext/erpnext/controllers/buying_controller.py +236,Specified BOM {0} does not exist for Item {1},Solicitud de Materiales especificado {0} no existe la partida {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Programa de mantenimiento {0} debe ser cancelado antes de cancelar esta orden de venta
 apps/frappe/frappe/desk/page/backups/backups.html +13,Size,Tamaño
 DocType: Notification Control,Expense Claim Approved,Reembolso de gastos aprobado
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +113,Pharmaceutical,Farmacéutico
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Pharmaceutical,Farmacéutico
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,El costo de artículos comprados
 DocType: Selling Settings,Sales Order Required,Orden de Ventas Requerida
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +30,Create Customer,Crear cliente
@@ -1846,7 +1768,6 @@
 DocType: Quality Inspection Reading,Reading 9,Lectura 9
 DocType: Supplier,Is Frozen,Está Inactivo
 DocType: Buying Settings,Buying Settings,Configuración de Compras
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +122,Mass finishing,Acabado en masa
 DocType: Stock Entry Detail,BOM No. for a Finished Good Item,Lista de materiales (LdM) para el producto terminado
 DocType: Upload Attendance,Attendance To Date,Asistencia a la fecha
 apps/erpnext/erpnext/config/selling.py +158,Setup incoming server for sales email id. (e.g. sales@example.com),Configuración del servidor de correo entrante de correo electrónico de identificación de las ventas. (por ejemplo sales@example.com )
@@ -1854,7 +1775,7 @@
 DocType: Payment Tool,Payment Account,Pago a cuenta
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +713,Please specify Company to proceed,"Por favor, especifique la compañía para continuar"
 apps/frappe/frappe/public/js/frappe/model/indicator.js +30,Draft,Borrador.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +46,Compensatory Off,Compensatorio
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Compensatory Off,Compensatorio
 DocType: Quality Inspection Reading,Accepted,Aceptado
 DocType: User,Female,Femenino
 apps/erpnext/erpnext/setup/doctype/company/company.js +24,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,"Por favor, asegúrese que realmente desea borrar todas las transacciones de esta compañía. Sus datos maestros permanecerán intactos. Esta acción no se puede deshacer."
@@ -1865,7 +1786,7 @@
 DocType: Shipping Rule,Shipping Rule Label,Regla Etiqueta de envío
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +209,Raw Materials cannot be blank.,Materias primas no pueden estar en blanco.
 DocType: Newsletter,Test,Prueba
-apps/erpnext/erpnext/stock/doctype/item/item.py +364,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +368,"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'","Existen transacciones de stock para este producto, \ usted no puede cambiar los valores de 'Tiene No. de serie', 'Tiene No. de lote', 'Es un producto en stock' y 'Método de valoración'"
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +92,You can not change rate if BOM mentioned agianst any item,No se puede cambiar la tasa si hay una Solicitud de Materiales contra cualquier artículo
 DocType: Employee,Previous Work Experience,Experiencia laboral previa
@@ -1875,7 +1796,7 @@
 apps/erpnext/erpnext/config/stock.py +18,Requests for items.,Listado de solicitudes de productos
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,Para la producción por separado se crea para cada buen artículo terminado.
 DocType: Purchase Invoice,Terms and Conditions1,Términos y Condiciones 1
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +18,Complete Setup,Configuración completa
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard_page.html +18,Complete Setup,Configuración completa
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.",Asiento contable congelado actualmente ; nadie puede modificar el asiento  excepto el rol que se especifica a continuación .
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +121,Please save the document before generating maintenance schedule,"Por favor, guarde el documento antes de generar el programa de mantenimiento"
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,Estado del proyecto
@@ -1905,16 +1826,14 @@
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +32,Approving User cannot be same as user the rule is Applicable To,El usuario que aprueba no puede ser igual que el usuario para el que la regla es aplicable
 DocType: SMS Log,No of Requested SMS,No. de SMS solicitados
 DocType: Campaign,Campaign-.####,Campaña-.#### 
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +55,Piercing,Perforación
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +117,Contract End Date must be greater than Date of Joining,La Fecha de Finalización de Contrato debe ser mayor que la Fecha de la Firma
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,Terceros / proveedor / comisionista / afiliado / distribuidor que vende productos de empresas a cambio de una comisión.
 DocType: Customer Group,Has Child Node,Tiene Nodo Niño
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{0} against Purchase Order {1},{0} contra la Orden de Compra {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +332,{0} against Purchase Order {1},{0} contra la Orden de Compra {1}
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","Introduzca los parámetros de URL estáticas aquí (Ej. sender = ERPNext , nombre de usuario = ERPNext , contraseña = 1234 etc )"
 apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,{0} {1} no se encuentra en el año fiscal activo. Para más detalles verifique {2}.
-apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,Este es un sitio web ejemplo generado por automáticamente por ERPNext
+apps/erpnext/erpnext/setup/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,Este es un sitio web ejemplo generado por automáticamente por ERPNext
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +37,Ageing Range 1,Rango de antigüedad 1
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +110,Photochemical machining,Mecanizado fotoquímico
 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.
 
 #### Note
@@ -1960,7 +1879,7 @@
 DocType: Purchase Receipt Item,Recd Quantity,Recd Cantidad
 DocType: Email Account,Email Ids,IDs de Correo Electrónico
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},No se puede producir una cantidad mayor del producto {0} que lo requerido en el pedido de venta {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +471,Stock Entry {0} is not submitted,Entrada de la {0} no se presenta
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +473,Stock Entry {0} is not submitted,Entrada de la {0} no se presenta
 DocType: Payment Reconciliation,Bank / Cash Account,Cuenta de Banco / Efectivo
 DocType: Global Defaults,Hide Currency Symbol,Ocultar el símbolo de moneda
 apps/erpnext/erpnext/config/accounts.py +164,"e.g. Bank, Cash, Credit Card","por ejemplo Banco, Efectivo , Tarjeta de crédito"
@@ -1975,7 +1894,7 @@
 DocType: Purchase Invoice,Currency and Price List,Divisa y Lista de precios
 DocType: Opportunity,Customer / Lead Name,Cliente / Oportunidad
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +63,Clearance Date not mentioned,Fecha de liquidación no definida
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +71,Production,Producción
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Production,Producción
 DocType: Item,Allow Production Order,Permitir Orden de Producción
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +60,Row {0}:Start Date must be before End Date,Fila {0}: Fecha de inicio debe ser anterior Fecha de finalización
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Total (Cantidad)
@@ -2021,10 +1940,7 @@
 DocType: Bin,Reserved Quantity,Cantidad Reservada
 DocType: Landed Cost Voucher,Purchase Receipt Items,Artículos de Recibo de Compra
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,Formularios personalizados
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +62,Cutting,Corte
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +69,Flattening,Aplastamiento
 DocType: Account,Income Account,Cuenta de Ingresos
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +22,Molding,Moldura
 DocType: Stock Reconciliation Item,Current Qty,Cant. Actual
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section","Consulte "" Cambio de materiales a base On"" en la sección Cálculo del coste"
 DocType: Appraisal Goal,Key Responsibility Area,Área de Responsabilidad Clave
@@ -2032,19 +1948,18 @@
 apps/frappe/frappe/desk/moduleview.py +61,Documents,Documentos
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +17,Ref,Referencia
 DocType: Cost Center,Cost Center,Centro de Costos
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.js +48,Voucher #,Comprobante #
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +36,Voucher #,Comprobante #
 DocType: Notification Control,Purchase Order Message,Mensaje de la Orden de Compra
 DocType: Upload Attendance,Upload HTML,Subir HTML
-apps/erpnext/erpnext/controllers/accounts_controller.py +391,"Total advance ({0}) against Order {1} cannot be greater \
+apps/erpnext/erpnext/controllers/accounts_controller.py +392,"Total advance ({0}) against Order {1} cannot be greater \
 				than the Grand Total ({2})","Avance total ({0}) en contra de la orden {1} no puede ser mayor \
  que el Gran Total ({2})"
 DocType: Employee,Relieving Date,Fecha de relevo
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +12,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.","La regla de precios está hecha para sobrescribir la lista de precios y define un porcentaje de descuento, basado en algunos criterios."
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,Depósito sólo se puede cambiar a través de la Entrada de Almacén / Nota de Entrega / Recibo de Compra
 DocType: Employee Education,Class / Percentage,Clase / Porcentaje
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +92,Head of Marketing and Sales,Director de Marketing y Ventas
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +31,Income Tax,Impuesto sobre la renta
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +157,Laser engineered net shaping,Láser diseñado conformación neta
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Head of Marketing and Sales,Director de Marketing y Ventas
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +31,Income Tax,Impuesto sobre la renta
 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.","Si la regla de precios está hecha para 'Precio', sobrescribirá la lista de precios actual. La regla de precios sera el valor final definido, así que no podrá aplicarse algún descuento. Por lo tanto, en las transacciones como Pedidos de venta, órdenes de compra, etc. el campo sera traído en lugar de utilizar 'Lista de precios'"
 apps/erpnext/erpnext/config/selling.py +163,Track Leads by Industry Type.,Listar Oportunidades por Tipo de Industria
 DocType: Item Supplier,Item Supplier,Proveedor del Artículo
@@ -2066,27 +1981,24 @@
 DocType: Delivery Note,Required only for sample item.,Sólo es necesario para el artículo de muestra .
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Cantidad actual después de la transacción
 ,Pending SO Items For Purchase Request,A la espera de la Orden de Compra (OC) para crear Solicitud de Compra (SC)
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +148,Extra Large,Extra grande
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,Extra Large,Extra grande
 ,Profit and Loss Statement,Estado de Pérdidas y Ganancias
 DocType: Bank Reconciliation Detail,Cheque Number,Número de cheque
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +43,Pressing,Prensado
 DocType: Payment Tool Detail,Payment Tool Detail,Detalle de herramienta de pago
 ,Sales Browser,Navegador de Ventas
 DocType: Journal Entry,Total Credit,Crédito Total
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +474,Warning: Another {0} # {1} exists against stock entry {2},Existe otro {0} # {1} contra la entrada de población {2}: Advertencia
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +459,Local,Local
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +476,Warning: Another {0} # {1} exists against stock entry {2},Existe otro {0} # {1} contra la entrada de población {2}: Advertencia
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +397,Local,Local
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),Préstamos y anticipos (Activos)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,Deudores
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +147,Large,Grande
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +23,No employee found!,Ningún empleado encontrado!
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Large,Grande
 DocType: C-Form Invoice Detail,Territory,Territorio
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,"Por favor, indique el numero de visitas requeridas"
 DocType: Stock Settings,Default Valuation Method,Método predeterminado de Valoración
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +127,Polishing,Pulido
 DocType: Production Order Operation,Planned Start Time,Hora prevista de inicio
 apps/erpnext/erpnext/config/accounts.py +63,Close Balance Sheet and book Profit or Loss.,Cerrar balance general y el libro de pérdidas y ganancias.
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,Especificar Tipo de Cambio para convertir una moneda en otra
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +146,Quotation {0} is cancelled,Cotización {0} se cancela
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +141,Quotation {0} is cancelled,Cotización {0} se cancela
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,Total Monto Pendiente
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} was on leave on {1}. Cannot mark attendance.,Empleado {0} estaba de permiso en {1} . No se puede marcar la asistencia.
 DocType: Sales Partner,Targets,Objetivos
@@ -2096,7 +2008,6 @@
 DocType: Production Order Operation,Make Time Log,Hacer Registro de Tiempo
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +158,Please create Customer from Lead {0},"Por favor, cree Cliente de la Oportunidad {0}"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Computers,Computadoras
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +112,Electro-chemical grinding,Electro-química de molienda
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +14,This is a root customer group and cannot be edited.,Este es una categoría de cliente raíz y no se puede editar.
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +39,Please setup your chart of accounts before you start Accounting Entries,"Por favor, configure su plan de cuentas antes de empezar los registros de contabilidad"
 DocType: Purchase Invoice,Ignore Pricing Rule,Ignorar la regla precios
@@ -2152,7 +2063,6 @@
 DocType: Maintenance Visit,Purposes,Propósitos
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +103,Atleast one item should be entered with negative quantity in return document,Al menos un elemento debe introducirse con cantidad negativa en el documento de devolución
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +67,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","La operación {0} tomará mas tiempo que la capacidad de producción de la estación {1}, por favor divida la tarea en varias operaciones"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +134,Electrochemical machining,Mecanizado electroquímico
 ,Requested,Requerido
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +66,No Remarks,No hay observaciones
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +13,Overdue,Atrasado
@@ -2161,7 +2071,7 @@
 DocType: Monthly Distribution,Distribution Name,Nombre del Distribución
 DocType: Features Setup,Sales and Purchase,Ventas y Compras
 DocType: Supplier Quotation Item,Material Request No,Nº de Solicitud de Material
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +218,Quality Inspection required for Item {0},Inspección de la calidad requerida para el articulo {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +221,Quality Inspection required for Item {0},Inspección de la calidad requerida para el articulo {0}
 DocType: Quotation,Rate at which customer's currency is converted to company's base currency,Tasa a la cual la Moneda del Cliente se convierte a la moneda base de la compañía
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +107,{0} has been successfully unsubscribed from this list.,{0} se ha dado de baja correctamente de esta lista.
 DocType: Purchase Invoice Item,Net Rate (Company Currency),Tasa neta (Moneda Local)
@@ -2179,9 +2089,8 @@
 apps/erpnext/erpnext/accounts/report/financial_statements.py +16,Fiscal Year {0} not found.,El año fiscal {0} no se encuentra.
 DocType: Bank Reconciliation,Get Relevant Entries,Obtener registros relevantes
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +407,Accounting Entry for Stock,Asiento contable de inventario
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +64,Coining,Acuñando
 DocType: Sales Invoice,Sales Team1,Team1 Ventas
-apps/erpnext/erpnext/stock/doctype/item/item.py +412,Item {0} does not exist,El elemento {0} no existe
+apps/erpnext/erpnext/stock/doctype/item/item.py +416,Item {0} does not exist,El elemento {0} no existe
 DocType: Sales Invoice,Customer Address,Dirección del cliente
 apps/frappe/frappe/desk/query_report.py +136,Total,Total
 DocType: Purchase Invoice,Apply Additional Discount On,Aplicar descuento adicional en
@@ -2193,12 +2102,11 @@
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),Monto de impuestos Después Cantidad de Descuento (Compañía moneda)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +149,Target warehouse is mandatory for row {0},Almacenes de destino es obligatorio para la fila {0}
 DocType: Quality Inspection,Quality Inspection,Inspección de Calidad
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +144,Extra Small,Extra Pequeño
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +20,Spray forming,Rocíe la formación
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Extra Small,Extra Pequeño
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +458,Warning: Material Requested Qty is less than Minimum Order Qty,Advertencia: Cantidad de Material Solicitado es menor que Cantidad Mínima Establecida
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +191,Account {0} is frozen,Cuenta {0} está congelada
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Entidad Legal / Subsidiario con un Catalogo de Cuentas separado que pertenece a la Organización.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +29,"Food, Beverage & Tobacco","Alimentos, Bebidas y Tabaco"
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","Alimentos, Bebidas y Tabaco"
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +20,PL or BS,PL o BS
 apps/erpnext/erpnext/controllers/selling_controller.py +122,Commission rate cannot be greater than 100,El porcentaje de comisión no puede ser superior a 100
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Minimum Inventory Level,Nivel de inventario mínimo
@@ -2209,19 +2117,18 @@
 DocType: Item,Manufacturer Part Number,Número de Pieza del Fabricante
 DocType: Production Order Operation,Estimated Time and Cost,Tiempo estimado y costo
 DocType: Bin,Bin,Papelera
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +50,Nosing,Saliente
 DocType: SMS Log,No of Sent SMS,No. de SMS enviados
 DocType: Account,Company,Compañía(s)
 DocType: Account,Expense Account,Cuenta de gastos
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +49,Software,Software
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +151,Colour,Color
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +49,Software,Software
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Colour,Color
 DocType: Maintenance Visit,Scheduled,Programado
 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","Por favor, seleccione el ítem donde &quot;Es de la Elemento&quot; es &quot;No&quot; y &quot;¿Es de artículos de venta&quot; es &quot;Sí&quot;, y no hay otro paquete de producto"
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,Seleccione Distribución Mensual de distribuir de manera desigual a través de objetivos meses.
 DocType: Purchase Invoice Item,Valuation Rate,Tasa de Valoración
 apps/erpnext/erpnext/stock/get_item_details.py +281,Price List Currency not selected,El tipo de divisa para la lista de precios no ha sido seleccionado
 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,El elemento en la fila {0}: Recibo Compra {1} no existe en la tabla de 'Recibos de Compra'
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +134,Employee {0} has already applied for {1} between {2} and {3},Empleado {0} ya se ha aplicado para {1} entre {2} y {3}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +145,Employee {0} has already applied for {1} between {2} and {3},Empleado {0} ya se ha aplicado para {1} entre {2} y {3}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Fecha de inicio del Proyecto
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +8,Until,Hasta
 DocType: Rename Tool,Rename Log,Cambiar el Nombre de Sesión
@@ -2231,7 +2138,7 @@
 apps/erpnext/erpnext/controllers/recurring_document.py +162,Please select {0},"Por favor, seleccione {0}"
 DocType: C-Form,C-Form No,C -Form No
 DocType: BOM,Exploded_items,Vista detallada
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +95,Researcher,Investigador
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Researcher,Investigador
 apps/frappe/frappe/custom/doctype/customize_form/customize_form.js +88,Update,Actualizar
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +78,Please save the Newsletter before sending,"Por favor, guarde el boletín antes de enviarlo"
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +23,Name or Email is mandatory,Nombre o Email es obligatorio
@@ -2239,11 +2146,10 @@
 DocType: Employee,Exit,Salir
 apps/erpnext/erpnext/accounts/doctype/account/account.py +134,Root Type is mandatory,Tipo Root es obligatorio
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +295,Serial No {0} created,Número de orden {0} creado
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +125,Vibratory finishing,Acabado vibratorio
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","Para la comodidad de los clientes , estos códigos se pueden utilizar en formatos impresos como facturas y notas de entrega"
 DocType: Employee,You can enter any date manually,Puede introducir cualquier fecha manualmente
 DocType: Sales Invoice,Advertisement,Anuncio
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +165,Probationary Period,Período De Prueba
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Probationary Period,Período De Prueba
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Sólo las Cuentas de Detalle se permiten en una transacción
 DocType: Expense Claim,Expense Approver,Supervisor de Gastos
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,Recibo de Compra del Artículo Adquirido
@@ -2251,18 +2157,15 @@
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +17,To Datetime,Para Fecha y Hora
 DocType: SMS Settings,SMS Gateway URL,URL de pasarela SMS
 apps/erpnext/erpnext/config/crm.py +53,Logs for maintaining sms delivery status,Estatus de mensajes SMS entregados
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +137,Grinding,Molienda
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +34,Shrink wrapping,Retractilado
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,Confirmed,Confirmado
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier > Supplier Type,Proveedor> Tipo de Proveedor
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +127,Please enter relieving date.,"Por favor, introduzca la fecha de recepción."
 apps/erpnext/erpnext/controllers/trends.py +137,Amt,Monto
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' can be submitted,"Sólo Solicitudes de Vacaciones con estado ""Aprobado"" puede ser enviadas"
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +51,Only Leave Applications with status 'Approved' can be submitted,"Sólo Solicitudes de Vacaciones con estado ""Aprobado"" puede ser enviadas"
 apps/erpnext/erpnext/utilities/doctype/address/address.py +21,Address Title is mandatory.,La dirección principal es obligatoria
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,Introduzca el nombre de la campaña si el origen de la encuesta es una campaña
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +38,Newspaper Publishers,Editores de Periódicos
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +38,Newspaper Publishers,Editores de Periódicos
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,Seleccione el año fiscal
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +88,Smelting,Fundición
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Nivel de Reabastecimiento
 DocType: Attendance,Attendance Date,Fecha de Asistencia
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,Calculo de Salario basado en los Ingresos y la Deducción.
@@ -2277,16 +2180,15 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +414,[Error],[Error]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,En palabras serán visibles una vez que guarde el pedido de ventas.
 ,Employee Birthday,Cumpleaños del Empleado
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +55,Venture Capital,Capital de Riesgo
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,Capital de Riesgo
 DocType: UOM,Must be Whole Number,Debe ser un número entero
 DocType: Leave Control Panel,New Leaves Allocated (In Days),Nuevas Vacaciones Asignados (en días)
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +51,Serial No {0} does not exist,Número de orden {0} no existe
 DocType: Pricing Rule,Discount Percentage,Porcentaje de Descuento
 DocType: Payment Reconciliation Invoice,Invoice Number,Número de factura
-apps/erpnext/erpnext/hooks.py +70,Orders,Órdenes
+apps/erpnext/erpnext/hooks.py +54,Orders,Órdenes
 DocType: Leave Control Panel,Employee Type,Tipo de Empleado
 DocType: Employee Leave Approver,Leave Approver,Supervisor de Vacaciones
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +70,Swaging,Recalcado
 DocType: Expense Claim,"A user with ""Expense Approver"" role","Un usuario con rol de ""Supervisor de gastos"""
 ,Issued Items Against Production Order,Productos emitidos con una orden de producción
 DocType: Pricing Rule,Purchase Manager,Gerente de Compras
@@ -2306,7 +2208,6 @@
 DocType: Customer,Last Day of the Next Month,Último día del siguiente mes
 DocType: Employee,Feedback,Comentarios
 apps/erpnext/erpnext/accounts/party.py +284,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),"Nota: El Debido/Fecha de referencia, excede los días de créditos concedidos para el cliente por {0} día(s)"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +108,Abrasive jet machining,Chorreo abrasivo por maquina
 DocType: Stock Settings,Freeze Stock Entries,Congelar entradas de stock
 DocType: Website Settings,Website Settings,Configuración del Sitio Web
 DocType: Activity Cost,Billing Rate,Tasa de facturación
@@ -2321,7 +2222,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +169,Root account can not be deleted,Cuenta root no se puede borrar
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +75,Show Stock Entries,Mostrar Imagenes de entradas
 DocType: Production Order,Work-in-Progress Warehouse,Almacén de Trabajos en Proceso
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +308,Reference #{0} dated {1},Referencia # {0} de fecha {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Reference #{0} dated {1},Referencia # {0} de fecha {1}
 DocType: Pricing Rule,Item Code,Código del producto
 DocType: Production Planning Tool,Create Production Orders,Crear Órdenes de Producción
 DocType: Serial No,Warranty / AMC Details,Garantía / AMC Detalles
@@ -2329,7 +2230,7 @@
 DocType: Lead,Market Segment,Sector de Mercado
 DocType: Communication,Phone,Teléfono
 DocType: Employee Internal Work History,Employee Internal Work History,Historial de Trabajo Interno del Empleado
-apps/erpnext/erpnext/public/js/account_tree_grid.js +50,Closing (Dr),Cierre (Deb)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +221,Closing (Dr),Cierre (Deb)
 DocType: Contact,Passive,Pasivo
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,Número de orden {0} no está en stock
 apps/erpnext/erpnext/config/selling.py +127,Tax template for selling transactions.,Plantilla de Impuestos para las transacciones de venta.
@@ -2344,8 +2245,8 @@
 ,Billed Amount,Importe Facturado
 DocType: Bank Reconciliation,Bank Reconciliation,Conciliación Bancaria
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +9,Get Updates,Obtener actualizaciones
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +129,Material Request {0} is cancelled or stopped,Solicitud de Material {0} cancelada o detenida
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +641,Add a few sample records,Agregar algunos registros de muestra
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +133,Material Request {0} is cancelled or stopped,Solicitud de Material {0} cancelada o detenida
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Add a few sample records,Agregar algunos registros de muestra
 apps/erpnext/erpnext/config/hr.py +210,Leave Management,Gestión de ausencias
 DocType: Event,Groups,Grupos
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,Agrupar por cuenta
@@ -2358,36 +2259,32 @@
 DocType: Features Setup,Sales Extras,Extras Ventas
 apps/erpnext/erpnext/accounts/utils.py +344,{0} budget for Account {1} against Cost Center {2} will exceed by {3},El presupuesto {0} para la cuenta {1} contra el centro de costos {2} es mayor por {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +236,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Una cuenta distinta debe ser del tipo Activo / Pasivo, ya que la reconciliación del stock es una entrada de apertura"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +138,Purchase Order number required for Item {0},Número de la Orden de Compra se requiere para el elemento {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Order number required for Item {0},Número de la Orden de Compra se requiere para el elemento {0}
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date','Desde la fecha' debe ser después de 'Hasta Fecha'
 ,Stock Projected Qty,Cantidad de Inventario Proyectada
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +147,Customer {0} does not belong to project {1},Cliente {0} no pertenece a proyectar {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +150,Customer {0} does not belong to project {1},Cliente {0} no pertenece a proyectar {1}
 DocType: Warranty Claim,From Company,Desde Compañía
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,Valor o Cantidad
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Minute,Minuto
+apps/erpnext/erpnext/public/js/setup_wizard.js +363,Minute,Minuto
 DocType: Purchase Invoice,Purchase Taxes and Charges,Impuestos de Compra y Cargos
 ,Qty to Receive,Cantidad a Recibir
 DocType: Leave Block List,Leave Block List Allowed,Lista de Bloqueo de Vacaciones Permitida
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +61,Conversion factor cannot be in fractions,Factor de conversión no puede estar en fracciones
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +358,You will use it to Login,Lo utilizará para iniciar sesión
+apps/erpnext/erpnext/public/js/setup_wizard.js +108,You will use it to Login,Lo utilizará para iniciar sesión
 DocType: Sales Partner,Retailer,Detallista
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,Todos los proveedores
 apps/erpnext/erpnext/stock/doctype/item/item.py +37,Item Code is mandatory because Item is not automatically numbered,El código del artículo es obligatorio porque el producto no se enumera automáticamente
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +99,Quotation {0} not of type {1},Cotización {0} no es de tipo {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +93,Quotation {0} not of type {1},Cotización {0} no es de tipo {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,Programa de mantenimiento de artículos
 DocType: Sales Order,%  Delivered,% Entregado
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,Bank Overdraft Account,Cuenta de sobregiros
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +15,Make Salary Slip,Hacer Nómina
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +18,Browse BOM,Explorar la lista de materiales
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +175,Secured Loans,Préstamos Garantizados
-apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +3,Awesome Products,Productos Increíbles 
+apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +3,Awesome Products,Productos Increíbles 
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +189,Opening Balance Equity,Apertura de saldos de capital
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +80,Cannot approve leave as you are not authorized to approve leaves on Block Dates,"No se puede permitir la ausencia, ya que no está autorizado para aprobar sobre fechas bloqueadas"
 DocType: Appraisal,Appraisal,Evaluación
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +13,Lost-foam casting,Fundición a la espuma perdida
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +47,Drawing,Dibujar
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +22,Date is repeated,Fecha se repite
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +148,Leave approver must be one of {0},Supervisor de Vacaciones debe ser uno de {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +162,Leave approver must be one of {0},Supervisor de Vacaciones debe ser uno de {0}
 DocType: Hub Settings,Seller Email,Correo Electrónico del Vendedor
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Coste total de compra (mediante compra de la factura)
 DocType: Workstation Working Hour,Start Time,Hora de inicio
@@ -2400,7 +2297,7 @@
 DocType: Purchase Invoice Item,Net Amount (Company Currency),Importe neto (moneda de la compañía)
 DocType: BOM Operation,Hour Rate,Hora de Cambio
 DocType: Stock Settings,Item Naming By,Ordenar productos por
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +642,From Quotation,Desde cotización
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +655,From Quotation,Desde cotización
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},Otra entrada de Cierre de Período {0} se ha hecho después de {1}
 DocType: Production Order,Material Transferred for Manufacturing,Material transferido para fabricación
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +29,Account {0} does not exists,La cuenta {0} no existe
@@ -2417,17 +2314,15 @@
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),El peso bruto del paquete. Peso + embalaje Normalmente material neto . (para impresión)
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Los usuarios con esta función pueden establecer cuentas congeladas y crear / modificar los asientos contables contra las cuentas congeladas
 DocType: Serial No,Is Cancelled,CANCELADO
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +281,My Shipments,Mis envíos
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +286,My Shipments,Mis envíos
 DocType: Journal Entry,Bill Date,Fecha de factura
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +43,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","Incluso si hay varias reglas de precios con mayor prioridad, se aplican entonces siguientes prioridades internas:"
 DocType: Supplier,Supplier Details,Detalles del Proveedor
 DocType: Communication,Recipients,Destinatarios
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +146,Screwing,Atornillar
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +96,Knurling,Moleteado
 DocType: Expense Claim,Approval Status,Estado de Aprobación
 DocType: Hub Settings,Publish Items to Hub,Publicar artículos al Hub
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +44,From value must be less than to value in row {0},El valor debe ser menor que el valor de la linea {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +133,Wire Transfer,Transferencia Bancaria
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +133,Wire Transfer,Transferencia Bancaria
 apps/erpnext/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py +25,Please select Bank Account,"Por favor, seleccione la cuenta bancaria"
 DocType: Newsletter,Create and Send Newsletters,Crear y enviar boletines de noticias
 apps/frappe/frappe/public/js/frappe/views/reports/grid_report.js +305,From Date must be before To Date,La fecha 'Desde' tiene que ser menor de la fecha 'Hasta'
@@ -2435,14 +2330,14 @@
 DocType: Company,Default Income Account,Cuenta de Ingresos por defecto
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,Categoría de cliente / Cliente
 DocType: Item Group,Check this if you want to show in website,Seleccione esta opción si desea mostrarlo en el sitio web
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +190,Welcome to ERPNext,Bienvenido a ERPNext
+,Welcome to ERPNext,Bienvenido a ERPNext
 DocType: Payment Reconciliation Payment,Voucher Detail Number,Número de Detalle de Comprobante
 apps/erpnext/erpnext/config/crm.py +146,Lead to Quotation,Iniciativa a cotización
 DocType: Lead,From Customer,Desde cliente
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +37,Calls,Llamadas
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Calls,Llamadas
 DocType: Project,Total Costing Amount (via Time Logs),Monto total del cálculo del coste (a través de los registros de tiempo)
 DocType: Purchase Order Item Supplied,Stock UOM,Unidad de Media del Inventario
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Purchase Order {0} is not submitted,La órden de compra {0} no existe
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +194,Purchase Order {0} is not submitted,La órden de compra {0} no existe
 ,Projected,Proyectado
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},Número de orden {0} no pertenece al Almacén {1}
 apps/erpnext/erpnext/controllers/status_updater.py +136,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Nota : El sistema no verificará sobre-entregas y exceso de almacenamiento para el producto {0} ya que la cantidad es 0
@@ -2450,7 +2345,6 @@
 DocType: Issue,Opening Date,Fecha de Apertura
 DocType: Journal Entry,Remark,Observación
 DocType: Purchase Receipt Item,Rate and Amount,Tasa y Cantidad
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +95,Boring,Aburrido
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +667,From Sales Order,Desde órden de venta
 DocType: Blog Category,Parent Website Route,Ruta del Website Principal
 DocType: Sales Order,Not Billed,No facturado
@@ -2464,19 +2358,17 @@
 apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount Amount,Descuento
 DocType: Purchase Invoice,Return Against Purchase Invoice,Devolución contra factura de compra
 DocType: Item,Warranty Period (in days),Período de garantía ( en días)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +550,e.g. VAT,por ejemplo IVA
+apps/erpnext/erpnext/public/js/setup_wizard.js +292,e.g. VAT,por ejemplo IVA
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,Elemento 4
 DocType: Journal Entry Account,Journal Entry Account,Cuenta de asiento contable
 DocType: Shopping Cart Settings,Quotation Series,Serie Cotización
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +52,"An item exists with same name ({0}), please change the item group name or rename the item","Existe un elemento con el mismo nombre ({0} ) , cambie el nombre del grupo de artículos o cambiar el nombre del elemento"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +82,Hot metal gas forming,Formando gas de metal caliente
 DocType: Sales Order Item,Sales Order Date,Fecha de las Órdenes de Venta
 DocType: Sales Invoice Item,Delivered Qty,Cantidad Entregada
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +63,Warehouse {0}: Company is mandatory,Almacén {0}: Empresa es obligatoria
 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.","Ir al grupo apropiado, usualmente (Fuente de los fondos> Pasivos Corrientes> Impuestos y derechos) y crear una nueva cuenta, haciendo clic en Añadir hijo de tipo ""Impuestos"" y referir a la tasa de impuestos."
 ,Payment Period Based On Invoice Date,Periodos de pago según facturas
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +50,Missing Currency Exchange Rates for {0},Falta de Tipo de Cambio de moneda para {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +135,Laser cutting,Corte por láser
 DocType: Event,Monday,Lunes
 DocType: Journal Entry,Stock Entry,Entradas de Inventario
 DocType: Account,Payable,Pagadero
@@ -2507,7 +2399,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +111,Date Of Retirement must be greater than Date of Joining,Fecha de la jubilación debe ser mayor que Fecha de acceso
 DocType: Sales Invoice,Against Income Account,Contra cuenta de ingresos
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +69,{0}% Delivered,{0}% Entregado
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +78,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,El elemento {0}: Con la cantidad ordenada {1} no puede ser menor que el pedido mínimo {2} (definido en el producto).
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,El elemento {0}: Con la cantidad ordenada {1} no puede ser menor que el pedido mínimo {2} (definido en el producto).
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Distribución Mensual Porcentual
 DocType: Territory,Territory Targets,Territorios Objetivos 
 DocType: Delivery Note,Transporter Info,Información de Transportista
@@ -2516,7 +2408,6 @@
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,"Títulos para plantillas de impresión, por ejemplo, Factura Proforma."
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +140,Valuation type charges can not marked as Inclusive,Cargos de tipo de valoración no pueden marcado como Incluido
 DocType: POS Profile,Update Stock,Actualizar el Inventario
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +128,Superfinishing,Superfinishing
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,Unidad de Medida diferente para elementos dará lugar a Peso Neto (Total) incorrecto. Asegúrese de que el peso neto de cada artículo esté en la misma Unidad de Medida.
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,Coeficiente de la lista de materiales (LdM)
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +85,Please pull items from Delivery Note,"Por favor, extraiga los productos desde la nota de entrega--"
@@ -2530,7 +2421,6 @@
 ,Purchase Analytics,Analítico de Compras
 DocType: Sales Invoice Item,Delivery Note Item,Articulo de la Nota de Entrega
 DocType: Expense Claim,Task,Tarea
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +57,Shaving,Afeitado
 DocType: Purchase Taxes and Charges,Reference Row #,Referencia Fila #
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},Número de lote es obligatorio para el producto {0}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js +14,This is a root sales person and cannot be edited.,Se trata de una persona de las ventas raíz y no se puede editar .
@@ -2541,12 +2431,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +74,Purpose must be one of {0},Propósito debe ser uno de {0}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +108,Fill the form and save it,Llene el formulario y guárdelo
 DocType: Production Planning Tool,Download a report containing all raw materials with their latest inventory status,Descargar un informe con todas las materias primas y su inventario actual
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +94,Facing,Frente a
 DocType: Leave Application,Leave Balance Before Application,Vacaciones disponibles antes de la solicitud
 DocType: SMS Center,Send SMS,Enviar mensaje SMS
 DocType: Company,Default Letter Head,Encabezado predeterminado
 DocType: Time Log,Billable,Facturable
-DocType: Authorization Rule,This will be used for setting rule in HR module,Esto se utiliza para ajustar la regla en el módulo de Recursos Humanos
 DocType: Account,Rate at which this tax is applied,Velocidad a la que se aplica este impuesto
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reorder Qty,Reordenar Cantidad
 DocType: Company,Stock Adjustment Account,Cuenta de Ajuste de existencias
@@ -2569,16 +2457,15 @@
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,Porcentaje de asignación debe ser igual al 100 %
 DocType: Serial No,Out of AMC,Fuera de AMC
 DocType: Purchase Order Item,Material Request Detail No,Detalle de Solicitud de Materiales No
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +97,Hard turning,Torneado duro
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +33,Make Maintenance Visit,Hacer Visita de Mantenimiento
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +187,Please contact to the user who have Sales Master Manager {0} role,"Por favor, póngase en contacto con el usuario con función de Gerente de Ventas {0}"
 DocType: Company,Default Cash Account,Cuenta de efectivo por defecto
 apps/erpnext/erpnext/config/accounts.py +79,Company (not Customer or Supplier) master.,Configuración general del sistema.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +106,Please enter 'Expected Delivery Date',"Por favor, introduzca 'la fecha estimada de llegada'"
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +187,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Nota de Entrega {0} debe ser cancelado antes de cancelar esta Orden Ventas
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +100,Please enter 'Expected Delivery Date',"Por favor, introduzca 'la fecha estimada de llegada'"
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +182,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Nota de Entrega {0} debe ser cancelado antes de cancelar esta Orden Ventas
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +373,Paid amount + Write Off Amount can not be greater than Grand Total,"El total de la cantidad pagada + desajuste, no puede ser mayor que el gran total"
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} no es un número de lote válido para el producto {1}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,Note: There is not enough leave balance for Leave Type {0},Nota : No cuenta con suficientes días para la ausencia del tipo {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +124,Note: There is not enough leave balance for Leave Type {0},Nota : No cuenta con suficientes días para la ausencia del tipo {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.","Nota: Si el pago no se hace en con una  referencia, deberá hacer entrada al diario manualmente."
 DocType: Item,Supplier Items,Artículos del Proveedor
 DocType: Opportunity,Opportunity Type,Tipo de Oportunidad
@@ -2590,7 +2477,7 @@
 DocType: Hub Settings,Publish Availability,Publicar disponibilidad
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +105,Date of Birth cannot be greater than today.,La fecha de creación no puede ser mayor a la fecha de hoy.
 ,Stock Ageing,Antigüedad de existencias
-apps/erpnext/erpnext/controllers/accounts_controller.py +200,{0} '{1}' is disabled,{0} '{1}' está deshabilitado
+apps/erpnext/erpnext/controllers/accounts_controller.py +201,{0} '{1}' is disabled,{0} '{1}' está deshabilitado
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Establecer como abierto
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Enviar correos electrónicos automáticos a Contactos en transacciones SOMETER.
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +232,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
@@ -2598,43 +2485,37 @@
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,Elemento 3
 DocType: Event,Sunday,Domingo
 DocType: Sales Team,Contribution (%),Contribución (%)
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +455,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,Nota : El registro del pago no se creará hasta que la cuenta del tipo 'Banco o Cajas' sea definida
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +171,Responsibilities,Responsabilidades
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +457,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,Nota : El registro del pago no se creará hasta que la cuenta del tipo 'Banco o Cajas' sea definida
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +171,Responsibilities,Responsabilidades
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Template,Plantilla
 DocType: Sales Person,Sales Person Name,Nombre del Vendedor
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,"Por favor, introduzca al menos 1 factura en la tabla"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +511,Add Users,Agregar usuarios
+apps/erpnext/erpnext/public/js/setup_wizard.js +255,Add Users,Agregar usuarios
 DocType: Pricing Rule,Item Group,Grupo de artículos
 DocType: Task,Actual Start Date (via Time Logs),Fecha de inicio actual (Vía registros)
 DocType: Stock Reconciliation Item,Before reconciliation,Antes de reconciliación
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +12,To {0},Para {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Impuestos y Cargos Añadidos (Moneda Local)
-apps/erpnext/erpnext/stock/doctype/item/item.py +340,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,"Campo de impuesto del producto {0} debe tener un tipo de cuenta de impuestos, ingresos, cargos o gastos"
+apps/erpnext/erpnext/stock/doctype/item/item.py +344,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,"Campo de impuesto del producto {0} debe tener un tipo de cuenta de impuestos, ingresos, cargos o gastos"
 DocType: Sales Order,Partly Billed,Parcialmente Facturado
 DocType: Item,Default BOM,Solicitud de Materiales por Defecto
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +79,Decambering,Decambering
 apps/erpnext/erpnext/setup/doctype/company/company.js +22,Please re-type company name to confirm,"Por favor, vuelva a escribir nombre de la empresa para confirmar"
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,Monto Total Soprepasado
 DocType: Time Log Batch,Total Hours,Total de Horas
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +268,Total Debit must be equal to Total Credit. The difference is {0},El débito total debe ser igual al crédito. La diferencia es {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +11,Automotive,Automotor
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +37,Item is required,Un producto es requerido
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +25,Metal injection molding,Moldeo por inyección de metal
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +258,Total Debit must be equal to Total Credit. The difference is {0},El débito total debe ser igual al crédito. La diferencia es {0}
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,Automotor
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +684,From Delivery Note,Desde nota de entrega
 DocType: Time Log,From Time,Desde fecha
 DocType: Notification Control,Custom Message,Mensaje personalizado
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +33,Investment Banking,Banca de Inversión
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +261,"Select your Country, Time Zone and Currency","Seleccione su País, Zona Horaria y Moneda"
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,Banca de Inversión
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +316,"Select your Country, Time Zone and Currency","Seleccione su País, Zona Horaria y Moneda"
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +369,Cash or Bank Account is mandatory for making payment entry,'Cuenta de Efectivo' o 'Cuenta Bancaria' es obligatoria para hacer una entrada de pago
 DocType: Purchase Invoice,Price List Exchange Rate,Tipo de cambio para la lista de precios
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +91,Pickling,Decapado
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +18,Sand casting,Fundición de arena
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +117,Electroplating,Galvanoplastia
 DocType: Purchase Invoice Item,Rate,Precio
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +62,Intern,Interno
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Intern,Interno
 DocType: Newsletter,A Lead with this email id should exist,Una Iniciativa con este correo electrónico debería existir
 DocType: Stock Entry,From BOM,Desde lista de materiales (LdM)
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +34,Basic,Base
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +34,Basic,Base
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,Operaciones de Inventario antes de {0} se congelan
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +217,Please click on 'Generate Schedule',"Por favor, haga clic en 'Generar planificación'"
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +61,To Date should be same as From Date for Half Day leave,Hasta la fecha debe ser igual a Partir de la fecha para la licencia de medio día
@@ -2642,11 +2523,11 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +96,Reference No is mandatory if you entered Reference Date,Referencia No es obligatorio si introdujo Fecha de Referencia
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +108,Date of Joining must be greater than Date of Birth,Fecha de acceso debe ser mayor que Fecha de Nacimiento
 DocType: Salary Structure,Salary Structure,Estructura Salarial
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +242,"Multiple Price Rule exists with same criteria, please resolve \
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +246,"Multiple Price Rule exists with same criteria, please resolve \
 			conflict by assigning priority. Price Rules: {0}","Existe Regla de Múltiple Precio con los mismos criterios, por favor resolver \
  conflicto mediante la asignación de prioridad. Reglas de Precio: {0}"
 DocType: Account,Bank,Banco
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +9,Airline,Línea Aérea
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,Línea Aérea
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +493,Issue Material,Distribuir materiales
 DocType: Material Request Item,For Warehouse,Por almacén
 DocType: Employee,Offer Date,Fecha de Oferta
@@ -2656,27 +2537,22 @@
 DocType: Item,Is Fixed Asset Item,Son partidas de activo fijo
 DocType: Stock Entry,Including items for sub assemblies,Incluir productos para subconjuntos
 DocType: Features Setup,"If you have long print formats, this feature can be used to split the page to be printed on multiple pages with all headers and footers on each page","Si usted tiene formatos de impresión largos , esta característica puede ser utilizada para dividir la página que se imprimirá en varias hojas con todos los encabezados y pies de página en cada una"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +131,Hobbing,Hobbing
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +98,All Territories,Todos los Territorios
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +98,All Territories,Todos los Territorios
 DocType: Purchase Invoice,Items,Productos
 DocType: Fiscal Year,Year Name,Nombre del Año
 DocType: Process Payroll,Process Payroll,Nómina de Procesos
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +59,There are more holidays than working days this month.,Hay más vacaciones que días de trabajo este mes.
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +68,There are more holidays than working days this month.,Hay más vacaciones que días de trabajo este mes.
 DocType: Product Bundle Item,Product Bundle Item,Artículo del conjunto de productos
 DocType: Sales Partner,Sales Partner Name,Nombre de Socio de Ventas
 DocType: Purchase Invoice Item,Image View,Vista de imagen
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +113,Finishing & industrial finishing,Terminado y acabado industrial
 DocType: Issue,Opening Time,Tiempo de Apertura
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,Desde y Hasta la fecha solicitada
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +46,Securities & Commodity Exchanges,Valores y Bolsas de Productos
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Valores y Bolsas de Productos
 DocType: Shipping Rule,Calculate Based On,Calcular basado en
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +98,Drilling,Perforación
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +28,Blow molding,El moldeo por soplado
 DocType: Purchase Taxes and Charges,Valuation and Total,Valuación y Total
 apps/erpnext/erpnext/stock/doctype/item/item.js +43,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,Este Artículo es una Variante de {0} (Plantilla). Los atributos se copiarán de la plantilla a menos que 'No Copiar' esté seleccionado
 DocType: Account,Purchase User,Usuario de Compras
 DocType: Notification Control,Customize the Notification,Personalice la Notificación
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +87,Hammering,Martilleo
 DocType: Web Page,Slideshow,Presentación
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +24,Default Address Template cannot be deleted,Plantilla de la Direcciones Predeterminadas no puede eliminarse
 DocType: Sales Invoice,Shipping Rule,Regla de envío
@@ -2685,9 +2561,8 @@
 DocType: Workflow State,Search,Búsqueda
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +54,Total cannot be zero,Total no puede ser cero
 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,'Días desde el último pedido' debe ser mayor o igual a cero
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +142,Brazing,Soldadura
 DocType: C-Form,Amended From,Modificado Desde
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Raw Material,Materia Prima
+apps/erpnext/erpnext/public/js/setup_wizard.js +359,Raw Material,Materia Prima
 DocType: Leave Application,Follow via Email,Seguir a través de correo electronico
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Total de Impuestos Después Cantidad de Descuento
 apps/erpnext/erpnext/accounts/doctype/account/account.py +174,Child account exists for this account. You can not delete this account.,Cuenta secundaria existe para esta cuenta. No es posible eliminar esta cuenta.
@@ -2699,10 +2574,10 @@
 ,Produced,Producido
 DocType: Item,Item Code for Suppliers,Código del producto para Proveedores
 DocType: Issue,Raised By (Email),Propuesto por (Email)
-apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +72,General,General
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +495,Attach Letterhead,Adjuntar membrete
+apps/erpnext/erpnext/setup/setup_wizard/default_website.py +72,General,General
+apps/erpnext/erpnext/public/js/setup_wizard.js +241,Attach Letterhead,Adjuntar membrete
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +272,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',No se puede deducir cuando categoría es para ' Valoración ' o ' de Valoración y Total '
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +542,"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.","Enumere sus obligaciones fiscales (Ejemplo; IVA, aduanas, etc.) deben tener nombres únicos y sus tarifas por defecto. Esto creará una plantilla estándar, que podrá editar más tarde."
+apps/erpnext/erpnext/public/js/setup_wizard.js +284,"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.","Enumere sus obligaciones fiscales (Ejemplo; IVA, aduanas, etc.) deben tener nombres únicos y sus tarifas por defecto. Esto creará una plantilla estándar, que podrá editar más tarde."
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial Nos Required for Serialized Item {0},Serie n Necesario para artículo serializado {0}
 DocType: Journal Entry,Bank Entry,Registro de banco
 DocType: Authorization Rule,Applicable To (Designation),Aplicables a (Denominación )
@@ -2711,31 +2586,28 @@
 apps/erpnext/erpnext/config/accounts.py +143,Enable / disable currencies.,Habilitar / Deshabilitar el tipo de monedas
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Postal Expenses,Gastos Postales
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Total (Amt)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +26,Entertainment & Leisure,Entretenimiento y Ocio
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,Entretenimiento y Ocio
 DocType: Purchase Order,The date on which recurring order will be stop,La fecha en que se detiene el pedido recurrente
 DocType: Quality Inspection,Item Serial No,Nº de Serie del producto
 apps/erpnext/erpnext/controllers/status_updater.py +142,{0} must be reduced by {1} or you should increase overflow tolerance,{0} debe reducirse en {1} o se debe aumentar la tolerancia de desbordamiento
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Present,Total Presente
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Hour,Hora
+apps/erpnext/erpnext/public/js/setup_wizard.js +363,Hour,Hora
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +138,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation","Serializado artículo {0} no se puede actualizar utilizando \
  Stock Reconciliación"
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +488,Transfer Material to Supplier,Transferencia de material a proveedor
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +513,Transfer Material to Supplier,Transferencia de material a proveedor
 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,El numero de serie no tiene almacén. el almacén debe establecerse por entradas de stock o recibos de compra
 DocType: Lead,Lead Type,Tipo de Iniciativa
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +82,Create Quotation,Crear Cotización
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +306,All these items have already been invoiced,Todos estos elementos ya fueron facturados
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +311,All these items have already been invoiced,Todos estos elementos ya fueron facturados
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},Puede ser aprobado por {0}
 DocType: Shipping Rule,Shipping Rule Conditions,Regla envío Condiciones
 DocType: BOM Replace Tool,The new BOM after replacement,La nueva Solicitud de Materiales después de la sustitución
 DocType: Features Setup,Point of Sale,Punto de Venta
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +83,Curling,Curling
 DocType: Account,Tax,Impuesto
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +28,Row {0}: {1} is not a valid {2},Fila {0}: {1} no es un {2} válido 
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +89,Refining,Refinación
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +37,Row {0}: {1} is not a valid {2},Fila {0}: {1} no es un {2} válido 
 DocType: Production Planning Tool,Production Planning Tool,Herramienta de planificación de la producción
 DocType: Quality Inspection,Report Date,Fecha del Informe
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +130,Routing,Enrutamiento
 DocType: C-Form,Invoices,Facturas
 DocType: Job Opening,Job Title,Título del trabajo
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +80,{0} Recipients,{0} Destinatarios
@@ -2752,14 +2624,13 @@
 DocType: Address,Plant,Planta
 DocType: DocType,Setup,Configuración
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,No hay nada que modificar.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +39,Cold rolling,Laminación en frío
 DocType: Customer Group,Customer Group Name,Nombre de la categoría de cliente
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +408,Please remove this Invoice {0} from C-Form {1},"Por favor, elimine esta factura {0} de C-Form {1}"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +410,Please remove this Invoice {0} from C-Form {1},"Por favor, elimine esta factura {0} de C-Form {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,"Por favor seleccione trasladar, si usted desea incluir los saldos del año fiscal anterior a este año"
 DocType: GL Entry,Against Voucher Type,Tipo de comprobante
 DocType: Item,Attributes,Atributos
 DocType: Packing Slip,Get Items,Obtener Artículos
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +186,Please enter Write Off Account,"Por favor, ingrese la cuenta de desajuste"
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +187,Please enter Write Off Account,"Por favor, ingrese la cuenta de desajuste"
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +71,Last Order Date,Fecha del último pedido
 DocType: DocField,Image,Imagen
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +179,Make Excise Invoice,Hacer Impuestos Especiales de la Factura
@@ -2776,29 +2647,25 @@
 apps/erpnext/erpnext/controllers/trends.py +257,Project-wise data is not available for Quotation,El seguimiento preciso del proyecto no está disponible para la cotización--
 DocType: Project,Expected End Date,Fecha de finalización prevista
 DocType: Appraisal Template,Appraisal Template Title,Titulo de la Plantilla deEvaluación
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +440,Commercial,Comercial
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +378,Commercial,Comercial
 DocType: Cost Center,Distribution Id,Id de Distribución
-apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +14,Awesome Services,Servicios Impresionantes 
+apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +14,Awesome Services,Servicios Impresionantes 
 apps/erpnext/erpnext/config/manufacturing.py +29,All Products or Services.,Todos los productos o servicios.
 DocType: Purchase Invoice,Supplier Address,Dirección del proveedor
 DocType: Contact Us Settings,Address Line 2,Dirección Línea 2
 DocType: ToDo,Reference,Referencia
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +59,Perforating,Perforado
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,Salir Cant.
 apps/erpnext/erpnext/config/accounts.py +128,Rules to calculate shipping amount for a sale,Reglas para calcular el importe de envío en una venta
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +29,Series is mandatory,Serie es obligatorio
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +28,Financial Services,Servicios Financieros
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,Servicios Financieros
 DocType: Tax Rule,Sales,Venta
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +173,Warehouse required for stock Item {0},Almacén requerido para la acción del artículo {0}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +178,Warehouse required for stock Item {0},Almacén requerido para la acción del artículo {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,Cred
 DocType: Customer,Default Receivable Accounts,Cuentas por Cobrar Por Defecto 
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +102,Sawing,Serrar
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +32,Laminating,Laminación
 DocType: Item Reorder,Transfer,Transferencia
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +549,Fetch exploded BOM (including sub-assemblies),Mezclar Solicitud de Materiales (incluyendo subconjuntos )
 DocType: Authorization Rule,Applicable To (Employee),Aplicable a ( Empleado )
 apps/erpnext/erpnext/controllers/accounts_controller.py +101,Due Date is mandatory,La fecha de vencimiento es obligatorio
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +143,Sintering,La sinterización
 DocType: Journal Entry,Pay To / Recd From,Pagar a / Recibido de
 DocType: Naming Series,Setup Series,Serie de configuración
 DocType: Supplier,Contact HTML,"HTML del Contacto
@@ -2811,7 +2678,6 @@
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +108,Customer {0} does not exist,{0} no existe Cliente
 DocType: Attendance,Absent,Ausente
 DocType: Product Bundle,Product Bundle,Conjunto/Paquete de productos
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +165,Crushing,Aplastante
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Plantillas de Cargos e Impuestos
 DocType: Upload Attendance,Download Template,Descargar Plantilla
 DocType: GL Entry,Remarks,Observaciones
@@ -2819,13 +2685,11 @@
 DocType: Journal Entry,Write Off Based On,Desajuste basado en
 DocType: Features Setup,POS View,Vista POS
 apps/erpnext/erpnext/config/stock.py +38,Installation record for a Serial No.,El registro de la instalación para un número de serie
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +9,Continuous casting,Colada continua
 apps/erpnext/erpnext/public/js/queries.js +39,Please specify a,"Por favor, especifique un"
 DocType: Offer Letter,Awaiting Response,Esperando Respuesta
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +80,Cold sizing,Dimensionamiento en frío
 DocType: Salary Slip,Earning & Deduction,Ganancia y Descuento
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +76,Account {0} cannot be a Group,Cuenta {0} no puede ser un Grupo
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +259,Region,Región
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +314,Region,Región
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +213,Optional. This setting will be used to filter in various transactions.,Opcional. Esta configuración es utilizada para filtrar la cuenta de otras transacciones
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +104,Negative Valuation Rate is not allowed,La valoración negativa no está permitida
 DocType: Holiday List,Weekly Off,Semanal Desactivado
@@ -2843,7 +2707,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,Account {0} is inactive,Cuenta {0} está inactiva
 DocType: GL Entry,Is Advance,Es un anticipo
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,Asistencia Desde Fecha y Hasta Fecha de Asistencia es obligatoria
-apps/erpnext/erpnext/controllers/buying_controller.py +131,Please enter 'Is Subcontracted' as Yes or No,"Por favor, introduzca si 'Es Subcontratado' o no"
+apps/erpnext/erpnext/controllers/buying_controller.py +122,Please enter 'Is Subcontracted' as Yes or No,"Por favor, introduzca si 'Es Subcontratado' o no"
 DocType: Sales Team,Contact No.,Contacto No.
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,'Profit and Loss' type account {0} not allowed in Opening Entry,El tipo de cuenta 'Pérdidas y ganancias' {0} no esta permitida para el asiento de apertura
 DocType: Workflow State,Time,Tiempo
@@ -2852,24 +2716,21 @@
 DocType: Authorization Rule,Authorization Rule,Regla de Autorización
 DocType: Sales Invoice,Terms and Conditions Details,Detalle de Términos y Condiciones 
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,Plantilla de Cargos e Impuestos sobre Ventas
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +10,Apparel & Accessories,Ropa y Accesorios
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,Ropa y Accesorios
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +67,Number of Order,Número de Orden
 DocType: Item Group,HTML / Banner that will show on the top of product list.,HTML / Banner que aparecerá en la parte superior de la lista de productos.
 DocType: Shipping Rule,Specify conditions to calculate shipping amount,Especificar condiciones de calcular el importe de envío
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +121,Add Child,Agregar subcuenta
 DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,Función Permitida para Establecer Cuentas Congeladas y Editar Entradas Congeladas
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +52,Cannot convert Cost Center to ledger as it has child nodes,"No se puede convertir de 'Centros de Costos' a una cuenta del libro mayor, ya que tiene cuentas secundarias"
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +47,Conversion Factor is required,Se requiere el factor de conversión
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +37,Serial #,Serial #
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +87,Commission on Sales,Comisión de Ventas
 DocType: Offer Letter Term,Value / Description,Valor / Descripción
 ,Customers Not Buying Since Long Time,Clientes Ausentes
 DocType: Production Order,Expected Delivery Date,Fecha Esperada de Envio
 apps/erpnext/erpnext/accounts/general_ledger.py +121,Debit and Credit not equal for {0} #{1}. Difference is {2}.,El Débito y Crédito no es igual para {0} # {1}. La diferencia es {2}.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +48,Bulging,Abultado
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +11,Evaporative-pattern casting,Evaporativo-modelo de fundición
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Entertainment Expenses,Gastos de Entretenimiento
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +195,Sales Invoice {0} must be cancelled before cancelling this Sales Order,Factura {0} debe ser cancelado antes de cancelar esta Orden Ventas
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +190,Sales Invoice {0} must be cancelled before cancelling this Sales Order,Factura {0} debe ser cancelado antes de cancelar esta Orden Ventas
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +61,Age,Edad
 DocType: Time Log,Billing Amount,Monto de facturación
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +84,Invalid quantity specified for item {0}. Quantity should be greater than 0.,La cantidad especificada es inválida para el elemento {0}. La cantidad debe ser mayor que 0 .
@@ -2887,24 +2748,22 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,Ingresos de nuevo cliente
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Travel Expenses,Gastos de Viaje
 DocType: Maintenance Visit,Breakdown,Desglose
-apps/erpnext/erpnext/controllers/accounts_controller.py +241,Account: {0} with currency: {1} can not be selected,Cuenta: {0} con moneda: {1} no puede ser seleccionada
+apps/erpnext/erpnext/controllers/accounts_controller.py +242,Account: {0} with currency: {1} can not be selected,Cuenta: {0} con moneda: {1} no puede ser seleccionada
 DocType: Bank Reconciliation Detail,Cheque Date,Fecha del Cheque
 apps/erpnext/erpnext/accounts/doctype/account/account.py +47,Account {0}: Parent account {1} does not belong to company: {2},Cuenta {0}: Cuenta Padre {1} no pertenece a la compañía: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted all transactions related to this company!,Eliminado correctamente todas las transacciones relacionadas con esta empresa!
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +111,Honing,Afilando
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +58,Probation,Período de prueba
-apps/erpnext/erpnext/stock/doctype/item/item.py +264,Default Warehouse is mandatory for stock Item.,Almacén por defecto es obligatorio para un elemento en stock.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Probation,Período de prueba
+apps/erpnext/erpnext/stock/doctype/item/item.py +268,Default Warehouse is mandatory for stock Item.,Almacén por defecto es obligatorio para un elemento en stock.
 DocType: Feed,Full Name,Nombre Completo
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +148,Clinching,Remachado
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +191,Payment of salary for the month {0} and year {1},Pago del salario correspondiente al mes {0} y {1} años
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +173,Payment of salary for the month {0} and year {1},Pago del salario correspondiente al mes {0} y {1} años
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,Importe total pagado
 ,Transferred Qty,Cantidad Transferida
 apps/erpnext/erpnext/config/learn.py +11,Navigating,Navegación
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +137,Planning,Planificación
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +137,Planning,Planificación
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +9,Make Time Log Batch,Haga Registro de Tiempo de Lotes
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Issued,Emitido
 DocType: Project,Total Billing Amount (via Time Logs),Monto total de facturación (a través de los registros de tiempo)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +629,We sell this Item,Vendemos este artículo
+apps/erpnext/erpnext/public/js/setup_wizard.js +365,We sell this Item,Vendemos este artículo
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +65,Supplier Id,Proveedor Id
 DocType: Journal Entry,Cash Entry,Entrada de Efectivo
 DocType: Sales Partner,Contact Desc,Desc. de Contacto
@@ -2913,18 +2772,16 @@
 DocType: Brand,Item Manager,Administración de elementos
 DocType: Cost Center,Add rows to set annual budgets on Accounts.,Agregar lineas para establecer los presupuestos anuales de las cuentas.
 DocType: Buying Settings,Default Supplier Type,Tipos de Proveedores
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +160,Quarrying,Extracción
 DocType: Production Order,Total Operating Cost,Costo Total de Funcionamiento
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +160,Note: Item {0} entered multiple times,Nota : El producto {0} ha sido ingresado varias veces
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +163,Note: Item {0} entered multiple times,Nota : El producto {0} ha sido ingresado varias veces
 apps/erpnext/erpnext/config/crm.py +27,All Contacts.,Todos los Contactos.
 DocType: Newsletter,Test Email Id,Prueba de Identificación del email
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +394,Company Abbreviation,Abreviatura de la compañia
+apps/erpnext/erpnext/public/js/setup_wizard.js +142,Company Abbreviation,Abreviatura de la compañia
 DocType: Features Setup,If you follow Quality Inspection. Enables Item QA Required and QA No in Purchase Receipt,Si usted sigue la inspección de calidad. Habilitará el QA del artículo y el número de QA en el recibo de compra
 DocType: GL Entry,Party Type,Tipo de entidad
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +68,Raw material cannot be same as main Item,La materia prima no puede ser la misma que el artículo principal
 DocType: Item Attribute Value,Abbreviation,Abreviación
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,No autorizado desde {0} excede los límites
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +30,Rotational molding,El moldeo rotacional
 apps/erpnext/erpnext/config/hr.py +115,Salary template master.,Plantilla Maestra para Salario .
 DocType: Leave Type,Max Days Leave Allowed,Número Máximo de Días de Baja Permitidos
 DocType: Payment Tool,Set Matching Amounts,Coincidir pagos
@@ -2936,14 +2793,14 @@
 apps/erpnext/erpnext/config/selling.py +18,Quotes to Leads or Customers.,Cotizaciones a Oportunidades o Clientes
 DocType: Stock Settings,Role Allowed to edit frozen stock,Función Permitida para editar Inventario Congelado
 ,Territory Target Variance Item Group-Wise,Variación de Grupo por Territorio Objetivo 
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +101,All Customer Groups,Todas las categorías de clientes
-apps/erpnext/erpnext/controllers/accounts_controller.py +474,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} es obligatorio. Tal vez tipo de cambio no se ha creado para {1} en {2}.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +101,All Customer Groups,Todas las categorías de clientes
+apps/erpnext/erpnext/controllers/accounts_controller.py +475,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} es obligatorio. Tal vez tipo de cambio no se ha creado para {1} en {2}.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +41,Account {0}: Parent account {1} does not exist,Cuenta {0}: Cuenta Padre {1} no existe
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Tarifa de la lista de precios (Moneda Local)
 DocType: Account,Temporary,Temporal
 DocType: Address,Preferred Billing Address,Dirección de facturación preferida
 DocType: Monthly Distribution Percentage,Percentage Allocation,Porcentaje de asignación de
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +86,Secretary,Secretario
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Secretary,Secretario
 DocType: Serial No,Distinct unit of an Item,Unidad distinta del producto
 DocType: Pricing Rule,Buying,Compras
 DocType: HR Settings,Employee Records to be created by,Registros de empleados a ser creados por
@@ -2955,35 +2812,32 @@
 ,Item-wise Price List Rate,Detalle del Listado de Precios
 DocType: Purchase Order Item,Supplier Quotation,Cotizaciónes a Proveedores
 DocType: Quotation,In Words will be visible once you save the Quotation.,En palabras serán visibles una vez que guarde la cotización.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +68,Ironing,Planchado
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is stopped,{0} {1} esta detenido
-apps/erpnext/erpnext/stock/doctype/item/item.py +352,Barcode {0} already used in Item {1},El código de barras {0} ya se utiliza en el elemento {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +356,Barcode {0} already used in Item {1},El código de barras {0} ya se utiliza en el elemento {1}
 DocType: Lead,Add to calendar on this date,Añadir al calendario en esta fecha
 apps/erpnext/erpnext/config/selling.py +132,Rules for adding shipping costs.,Reglas para la adición de los gastos de envío .
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,Se requiere Cliente
 DocType: Letter Head,Letter Head,Membretes
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0} es obligatorio para su devolución
 DocType: Purchase Order,To Receive,Recibir
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +33,Shrink fitting,Shrink apropiado
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +522,user@example.com,user@example.com
+apps/erpnext/erpnext/public/js/setup_wizard.js +266,user@example.com,user@example.com
 DocType: Email Digest,Income / Expense,Ingresos / gastos
 DocType: Employee,Personal Email,Correo Electrónico Personal
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +58,Total Variance,Total Variacion
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +62,Total Variance,Total Variacion
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.","Si está habilitado, el sistema contabiliza los asientos contables para el inventario de forma automática."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +15,Brokerage,Brokerage
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +15,Brokerage,Brokerage
 DocType: Production Order Operation,"in Minutes
 Updated via 'Time Log'",En minutos actualizado a través de 'Bitácora de tiempo'
 DocType: Customer,From Lead,De la iniciativa
 apps/erpnext/erpnext/config/manufacturing.py +19,Orders released for production.,Las órdenes publicadas para la producción.
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +42,Select Fiscal Year...,Seleccione el año fiscal ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +442,POS Profile required to make POS Entry,Se requiere un perfil POS para crear entradas en el Punto-de-Venta
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +444,POS Profile required to make POS Entry,Se requiere un perfil POS para crear entradas en el Punto-de-Venta
 DocType: Hub Settings,Name Token,Nombre de Token
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +106,Planing,Planificar
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Selling,Venta estándar
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +120,Standard Selling,Venta estándar
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +137,Atleast one warehouse is mandatory,Al menos un almacén es obligatorio
 DocType: Serial No,Out of Warranty,Fuera de Garantía
 DocType: BOM Replace Tool,Replace,Reemplazar
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +314,{0} against Sales Invoice {1},{0} contra Factura de Ventas {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +316,{0} against Sales Invoice {1},{0} contra Factura de Ventas {1}
 apps/erpnext/erpnext/stock/doctype/item/item.py +49,Please enter default Unit of Measure,"Por favor, ingrese unidad de medida predeterminada"
 DocType: Purchase Invoice Item,Project Name,Nombre del proyecto
 DocType: Workflow State,Edit,Editar
@@ -2998,9 +2852,8 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,Journal Entry {0} does not have account {1} or already matched against other voucher,El asiento {0} no tiene cuenta de {1} o ya esta enlazado con otro comprobante
 DocType: Item,Moving Average,Promedio Movil
 DocType: BOM Replace Tool,The BOM which will be replaced,La Solicitud de Materiales que será sustituida
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +43,New Stock UOM must be different from current stock UOM,Nueva Unidad de Medida del Inventario debe ser diferente de la Unidad de Medida actual
 DocType: Account,Debit,Débito
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +34,Leaves must be allocated in multiples of 0.5,Vacaciones deben distribuirse en múltiplos de 0.5
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +44,Leaves must be allocated in multiples of 0.5,Vacaciones deben distribuirse en múltiplos de 0.5
 DocType: Production Order,Operation Cost,Costo de operación
 apps/erpnext/erpnext/config/hr.py +71,Upload attendance from a .csv file,Sube la asistencia de un archivo .csv
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,Monto Sobrepasado
@@ -3018,8 +2871,7 @@
 DocType: Employee,Internal Work History,Historial de trabajo interno
 DocType: DocField,Column Break,Salto de columna
 DocType: Event,Thursday,Jueves
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +42,Private Equity,Capital de riesgo
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +93,Turning,Torneado
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,Capital de riesgo
 DocType: Maintenance Visit,Customer Feedback,Comentarios del cliente
 DocType: Account,Expense,Gastos
 DocType: Sales Invoice,Exhibition,Exposición
@@ -3031,17 +2883,17 @@
 DocType: Employee,Held On,Retenida en
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +33,Production Item,Elemento de producción
 ,Employee Information,Información del Empleado
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,Rate (%),Procentaje (% )
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +407,Financial Year End Date,Fin del ejercicio contable
+apps/erpnext/erpnext/public/js/setup_wizard.js +294,Rate (%),Procentaje (% )
+apps/erpnext/erpnext/public/js/setup_wizard.js +155,Financial Year End Date,Fin del ejercicio contable
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Voucher No, if grouped by Voucher","No se puede filtrar en función al 'No. de comprobante', si esta agrupado por 'nombre'"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +484,Make Supplier Quotation,Crear cotización de proveedor
 DocType: Quality Inspection,Incoming,Entrante
 DocType: BOM,Materials Required (Exploded),Materiales necesarios ( despiece )
 DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),Reduzca la Ganancia por Licencia sin Sueldo ( LWP )
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +512,"Add users to your organization, other than yourself",Añadir otros usuarios a su organización
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +44,Casual Leave,Permiso ocacional
+apps/erpnext/erpnext/public/js/setup_wizard.js +256,"Add users to your organization, other than yourself",Añadir otros usuarios a su organización
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +44,Casual Leave,Permiso ocacional
 DocType: Batch,Batch ID,ID de lote
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +334,Note: {0},Nota: {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +336,Note: {0},Nota: {0}
 ,Delivery Note Trends,Tendencia de Notas de Entrega
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +74,{0} must be a Purchased or Sub-Contracted Item in row {1},{0} debe ser un producto para compra o sub-contratado en la linea {1}
 apps/erpnext/erpnext/accounts/general_ledger.py +106,Account: {0} can only be updated via Stock Transactions,La cuenta: {0} sólo puede ser actualizada a través de transacciones de inventario
@@ -3051,7 +2903,7 @@
 DocType: Opportunity,Opportunity Date,Oportunidad Fecha
 DocType: Purchase Receipt,Return Against Purchase Receipt,Devolución contra recibo compra
 DocType: Purchase Order,To Bill,A Facturar
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +61,Piecework,Pieza de trabajo
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Piecework,Pieza de trabajo
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +64,Avg. Buying Rate,Promedio de Compra
 DocType: Task,Actual Time (in Hours),Tiempo actual (En horas)
 DocType: Employee,History In Company,Historia en la Compañia
@@ -3065,7 +2917,7 @@
 DocType: Opportunity,To Discuss,Para Discusión
 DocType: SMS Settings,SMS Settings,Ajustes de SMS
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +60,Temporary Accounts,Cuentas Temporales
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +155,Black,Negro
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Black,Negro
 DocType: BOM Explosion Item,BOM Explosion Item,Desplegar lista de materiales (LdM) del producto
 DocType: Account,Auditor,Auditor
 DocType: Purchase Order,End date of current order's period,Fecha de finalización del período de orden actual
@@ -3081,13 +2933,12 @@
 DocType: Page,Page Name,Nombre de la Página
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +110,To Time must be greater than From Time,Para Tiempo debe ser mayor que From Time
 DocType: Journal Entry Account,Exchange Rate,Tipo de Cambio
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +465,Sales Order {0} is not submitted,Órden de Venta {0} no esta presentada
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +467,Sales Order {0} is not submitted,Órden de Venta {0} no esta presentada
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0}: Parent account {1} does not bolong to the company {2},Almacén {0}: Cuenta Padre{1} no pertenece a la empresa {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +124,Spindle finishing,Acabado husillo
 DocType: BOM,Last Purchase Rate,Tasa de Cambio de la Última Compra
 DocType: Account,Asset,Activo
 DocType: Project Task,Task ID,Tarea ID
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +395,"e.g. ""MC""","por ejemplo ""MC """
+apps/erpnext/erpnext/public/js/setup_wizard.js +143,"e.g. ""MC""","por ejemplo ""MC """
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,Stock cannot exist for Item {0} since has variants,Inventario no puede existir para el punto {0} ya tiene variantes
 ,Sales Person-wise Transaction Summary,Resumen de Transacción por Vendedor
 DocType: System Settings,Time Zone,Zona Horaria
@@ -3096,9 +2947,7 @@
 DocType: Monthly Distribution,Monthly Distribution Percentages,Los porcentajes de distribución mensuales
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +16,The selected item cannot have Batch,El elemento seleccionado no puede tener lotes
 DocType: Delivery Note,% of materials delivered against this Delivery Note,% de materiales entregados contra la nota de entrega
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +151,Stapling,Grapado
 DocType: Customer,Customer Details,Datos del Cliente
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +105,Shaping,Shaping
 DocType: Employee,Reports to,Informes al
 DocType: SMS Settings,Enter url parameter for receiver nos,Introduzca el parámetro url para el receptor no
 DocType: Sales Invoice,Paid Amount,Cantidad pagada
@@ -3107,13 +2956,13 @@
 DocType: Item Variant,Item Variant,Variante del producto
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +15,Setting this Address Template as default as there is no other default,Al establecer esta plantilla de dirección por defecto ya que no hay otra manera predeterminada
 apps/erpnext/erpnext/accounts/doctype/account/account.py +89,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Balance de la cuenta ya en Débito, no le está permitido establecer ""Balance Debe Ser"" como ""Crédito"""
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +76,Quality Management,Gestión de la Calidad
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Quality Management,Gestión de la Calidad
 DocType: Production Planning Tool,Filter based on customer,Filtro basado en cliente
 DocType: Payment Tool Detail,Against Voucher No,Comprobante No.
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +47,Please enter quantity for Item {0},"Por favor, ingrese la cantidad para el producto {0}"
 DocType: Employee External Work History,Employee External Work History,Historial de Trabajo Externo del Empleado
 DocType: Tax Rule,Purchase,Compra
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +34,Balance Qty,Can. en balance
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Balance Qty,Can. en balance
 DocType: Item Group,Parent Item Group,Grupo Principal de Artículos
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +21,{0} for {1},{0} de {1}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +96,Cost Centers,Centros de Costos
@@ -3126,7 +2975,6 @@
 DocType: Employee,Notice (days),Aviso (días)
 DocType: Page,Yes,Sí
 DocType: Employee,Encashment Date,Fecha de Cobro
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +74,Electroforming,Electroformado
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +179,"Against Voucher Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Contra Tipo de Comprobante debe ser uno de Orden de Compra, Factura de Compra o Comprobante de Diario"
 DocType: Account,Stock Adjustment,Ajuste de existencias
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +34,Default Activity Cost exists for Activity Type - {0},Existe una actividad de costo por defecto para la actividad del tipo - {0}
@@ -3161,8 +3009,8 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,Almacén no se puede suprimir porque hay una entrada en registro de inventario para este almacén.
 DocType: Company,Distribution,Distribución
 apps/erpnext/erpnext/public/js/pos/pos.html +36,Amount Paid,Total Pagado
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +91,Project Manager,Gerente de Proyectos
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +72,Dispatch,Despacho
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Project Manager,Gerente de Proyectos
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +72,Dispatch,Despacho
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,Descuento máximo permitido para cada elemento: {0} es {1}%
 DocType: Account,Receivable,Cuenta por Cobrar
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,Función que esta autorizada a presentar las transacciones que excedan los límites de crédito establecidos .
@@ -3172,8 +3020,8 @@
 DocType: Hub Settings,Seller Description, Descripción del Vendedor
 DocType: Employee Education,Qualification,Calificación
 DocType: Item Price,Item Price,Precios de Productos
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +48,Soap & Detergent,Jabón y Detergente
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +36,Motion Picture & Video,Imagén en Movimiento y Vídeo
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +48,Soap & Detergent,Jabón y Detergente
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +36,Motion Picture & Video,Imagén en Movimiento y Vídeo
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Ordenado
 DocType: Warehouse,Warehouse Name,Nombre del Almacén
 DocType: Naming Series,Select Transaction,Seleccione el tipo de transacción
@@ -3182,7 +3030,6 @@
 DocType: BOM,Rate Of Materials Based On,Cambio de materiales basados ​​en
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,Analitico de Soporte
 apps/erpnext/erpnext/accounts/doctype/accounts_settings/accounts_settings.py +27,Company is missing in warehouses {0},Compañía no se encuentra en los almacenes {0}
-DocType: Stock UOM Replace Utility,Stock UOM Replace Utility,Herramienta para cambiar Unidad de Medida
 DocType: POS Profile,Terms and Conditions,Términos y Condiciones
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,To Date should be within the Fiscal Year. Assuming To Date = {0},La fecha debe estar dentro del año fiscal. Asumiendo a la fecha = {0}
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","Aquí usted puede mantener la altura , el peso, alergias , problemas médicos , etc"
@@ -3194,7 +3041,7 @@
 DocType: Sales Order Item,For Production,Por producción
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +103,Please enter sales order in the above table,"Por favor, ingrese la Orden de Venta (OV) en la siguiente tabla"
 DocType: Project Task,View Task,Vista de tareas
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +406,Your financial year begins on,Su año Financiero inicia en
+apps/erpnext/erpnext/public/js/setup_wizard.js +154,Your financial year begins on,Su año Financiero inicia en
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +46,Please enter Purchase Receipts,"Por favor, ingrese los recibos de compra"
 DocType: Sales Invoice,Get Advances Received,Obtener anticipos recibidos
 DocType: Email Digest,Add/Remove Recipients,Añadir / Quitar Destinatarios
@@ -3203,14 +3050,12 @@
 apps/erpnext/erpnext/config/support.py +54,Setup incoming server for support email id. (e.g. support@example.com),Configuración del servidor de correo entrante para el apoyo de id de correo electrónico. (ej. support@example.com )
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,Escasez Cantidad
 DocType: Salary Slip,Salary Slip,Planilla
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +116,Burnishing,Bruñido
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +54,'To Date' is required,'Hasta la fecha' es requerido
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,'Hasta la fecha' es requerido
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","Generar etiquetas de embalaje, para los paquetes que serán entregados, usados para notificar el numero, contenido y peso del paquete, "
 DocType: Sales Invoice Item,Sales Order Item,Articulo de la Solicitud de Venta
 DocType: Salary Slip,Payment Days,Días de Pago
 DocType: BOM,Manage cost of operations,Administrar el costo de las operaciones
 DocType: Features Setup,Item Advanced,Producto anticipado
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +40,Hot rolling,Laminación en caliente
 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.","Cuando alguna de las operaciones comprobadas está en "" Enviado "" , una ventana emergente automáticamente se abre para enviar un correo electrónico al ""Contacto"" asociado en esa transacción , con la transacción como un archivo adjunto. El usuario puede o no puede enviar el correo electrónico."
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,Configuración global
 DocType: Employee Education,Employee Education,Educación del Empleado
@@ -3222,24 +3067,21 @@
 DocType: Customer,Sales Team Details,Detalles del equipo de ventas
 DocType: Expense Claim,Total Claimed Amount,Total reembolso
 apps/erpnext/erpnext/config/crm.py +22,Potential opportunities for selling.,Oportunidades de venta
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +48,Sick Leave,Permiso por Enfermedad
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +48,Sick Leave,Permiso por Enfermedad
 DocType: Email Digest,Email Digest,Boletín por Correo Electrónico
 DocType: Delivery Note,Billing Address Name,Nombre de la dirección de facturación
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +22,Department Stores,Tiendas por Departamento
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,Tiendas por Departamento
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +40,System Balance,Balance del Sistema
 DocType: Workflow,Is Active,Está Activo
 apps/erpnext/erpnext/controllers/stock_controller.py +71,No accounting entries for the following warehouses,No hay asientos contables para los siguientes almacenes
 apps/erpnext/erpnext/projects/doctype/project/project.js +22,Save the document first.,Guarde el documento primero.
 DocType: Account,Chargeable,Devengable
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +121,Linishing,Desbarbado
 DocType: Company,Change Abbreviation,Cambiar Abreviación
 DocType: Workflow State,Primary,Primario
 DocType: Expense Claim Detail,Expense Date,Fecha de Gasto
 DocType: Item,Max Discount (%),Descuento Máximo (%)
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +70,Last Order Amount,Monto de la última orden
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +161,Blasting,Voladura
 DocType: Company,Warn,Advertir
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +111,Item valuation updated,Valoración del producto actualizado
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Otras observaciones, que deben ir en los registros."
 DocType: BOM,Manufacturing User,Usuario de Manufactura
 DocType: Purchase Order,Raw Materials Supplied,Materias primas suministradas
@@ -3249,7 +3091,7 @@
 DocType: Appraisal,Appraisal Template,Plantilla de Evaluación
 DocType: Communication,Email,Correo electrónico
 DocType: Item Group,Item Classification,Clasificación de producto
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +89,Business Development Manager,Gerente de Desarrollo de Negocios
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Business Development Manager,Gerente de Desarrollo de Negocios
 DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,Propósito de la Visita de Mantenimiento
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.js +15,Period,Período
 ,General Ledger,Balance General
@@ -3259,9 +3101,7 @@
 ,Itemwise Recommended Reorder Level,Nivel recomendado de re-ordenamiento de producto
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +264,Please select {0} first,"Por favor, seleccione primero {0}"
 DocType: Features Setup,To get Item Group in details table,Para obtener Grupo de Artículo en la tabla detalles
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +67,Redrawing,Redibujar
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +112,Batch {0} of Item {1} has expired.,El lote {0} del producto {1} ha expirado.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +120,Etching,Aguafuerte
 DocType: Sales Invoice,Commission,Comisión
 DocType: Address Template,"<h4>Default Template</h4>
 <p>Uses <a href=""http://jinja.pocoo.org/docs/templates/"">Jinja Templating</a> and all the fields of Address (including Custom Fields if any) will be available</p>
@@ -3300,7 +3140,7 @@
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +25,Root cannot have a parent cost center,Raíz no puede tener un centro de costes de los padres
 DocType: Sales Invoice,C-Form Applicable,C -Forma Aplicable
 DocType: UOM Conversion Detail,UOM Conversion Detail,Detalle de Conversión de Unidad de Medida
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +496,Keep it web friendly 900px (w) by 100px (h),Manténgalo  adecuado para la web 900px ( w ) por 100px ( h )
+apps/erpnext/erpnext/public/js/setup_wizard.js +242,Keep it web friendly 900px (w) by 100px (h),Manténgalo  adecuado para la web 900px ( w ) por 100px ( h )
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +329,Production Order cannot be raised against a Item Template,La orden de producción no se puede asignar a una plantilla de producto
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +44,Charges are updated in Purchase Receipt against each item,Los cargos se actualizan en el recibo de compra  por cada producto
 DocType: Payment Tool,Get Outstanding Vouchers,Verificar Comprobantes Pendientes
@@ -3316,7 +3156,6 @@
 DocType: Item,Average time taken by the supplier to deliver,Tiempo estimado por el proveedor para la recepción
 DocType: Time Log,Hours,Horas
 DocType: Project,Expected Start Date,Fecha prevista de inicio
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +38,Rolling,Rodando
 DocType: ToDo,Priority,Prioridad
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +41,Remove item if charges is not applicable to that item,Eliminar el elemento si los cargos no son aplicables al mismo
 DocType: Dropbox Backup,Dropbox Access Allowed,Acceso a Dropbox Permitido
@@ -3328,41 +3167,37 @@
 DocType: Workstation,Operating Costs,Costos Operativos
 DocType: Employee Leave Approver,Employee Leave Approver,Supervisor de Vacaciones del Empleado
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,{0} has been successfully added to our Newsletter list.,{0} ha sido agregado con éxito a nuestra lista de Newsletter.
-apps/erpnext/erpnext/stock/doctype/item/item.py +383,Row {0}: An Reorder entry already exists for this warehouse {1},Fila {0}: Una entrada para reordenar ya existe para este almacén {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +387,Row {0}: An Reorder entry already exists for this warehouse {1},Fila {0}: Una entrada para reordenar ya existe para este almacén {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +67,"Cannot declare as lost, because Quotation has been made.","No se puede declarar como perdido , porque la cotización ha sido hecha."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +133,Electron beam machining,Mecanizado por haz de electrones
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Director de compras
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +424,Production Order {0} must be submitted,La orden de producción {0} debe ser enviada
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +150,Please select Start Date and End Date for Item {0},"Por favor, seleccione Fecha de inicio y Fecha de finalización para el elemento {0}"
 apps/erpnext/erpnext/config/stock.py +141,Main Reports,Informes Generales
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +102,Stock Ledger entries balances updated,Saldo de Apertura de Libro Mayor de Inventarios han sido actualizados
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,La fecha no puede ser anterior a la fecha actual
 DocType: Purchase Receipt Item,Prevdoc DocType,DocType Prevdoc
-apps/erpnext/erpnext/stock/doctype/item/item.js +176,Add / Edit Prices,Añadir / Editar Precios
+apps/erpnext/erpnext/stock/doctype/item/item.js +178,Add / Edit Prices,Añadir / Editar Precios
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +53,Chart of Cost Centers,Centros de costos
 ,Requested Items To Be Ordered,Solicitud de Productos Aprobados
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +298,My Orders,Mis pedidos
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +293,My Orders,Mis pedidos
 DocType: Price List,Price List Name,Nombre de la lista de precios
 DocType: Time Log,For Manufacturing,Por fabricación
-apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +70,Totals,Totales
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +174,Totals,Totales
 DocType: BOM,Manufacturing,Producción
 ,Ordered Items To Be Delivered,Artículos pedidos para ser entregados
 DocType: Account,Income,Ingresos
 ,Setup Wizard,Asistente de configuración
 DocType: Industry Type,Industry Type,Tipo de Industria
 apps/erpnext/erpnext/templates/includes/cart.js +137,Something went wrong!,Algo salió mal!
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +68,Warning: Leave application contains following block dates,Advertencia: Solicitud de Renuncia contiene las siguientes fechas bloquedas
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +251,Sales Invoice {0} has already been submitted,Factura {0} ya se ha presentado
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +100,Warning: Leave application contains following block dates,Advertencia: Solicitud de Renuncia contiene las siguientes fechas bloquedas
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +256,Sales Invoice {0} has already been submitted,Factura {0} ya se ha presentado
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,Fecha de  finalización
 DocType: Purchase Invoice Item,Amount (Company Currency),Importe (Moneda Local)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +10,Die casting,Fundición a presión
 DocType: Email Alert,Reference Date,Fecha de referencia
 apps/erpnext/erpnext/config/hr.py +105,Organization unit (department) master.,Unidad de Organización ( departamento) maestro.
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +25,Please enter valid mobile nos,"Por favor, ingrese un numero de móvil válido"
 DocType: Budget Detail,Budget Detail,Detalle del presupuesto
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +75,Please enter message before sending,"Por favor, ingrese el mensaje antes de enviarlo"
 DocType: Async Task,Status,Estado
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +65,Stock UOM updated for Item {0},Unidad de Medida Actualizado para el punto {0}
 DocType: Company History,Year,Año
 apps/erpnext/erpnext/config/accounts.py +127,Point-of-Sale Profile,Perfiles del Punto de Venta POS
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +68,Please Update SMS Settings,"Por favor, actualizar la configuración SMS"
@@ -3376,12 +3211,12 @@
 ,Serial No Service Contract Expiry,Número de orden de servicio Contrato de caducidad
 DocType: Item,Unit of Measure Conversion,Unidad de Conversión de la medida
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +86,Employee can not be changed,Empleado no se puede cambiar
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +259,You cannot credit and debit same account at the same time,No se pueden registrar Debitos y Creditos a la misma Cuenta al mismo tiempo
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,You cannot credit and debit same account at the same time,No se pueden registrar Debitos y Creditos a la misma Cuenta al mismo tiempo
 DocType: Naming Series,Help HTML,Ayuda HTML
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},Peso total asignado debe ser de 100 %. Es {0}
 apps/erpnext/erpnext/controllers/status_updater.py +140,Allowance for over-{0} crossed for Item {1},Previsión por exceso de {0} cruzados por artículo {1}
 DocType: Address,Name of person or organization that this address belongs to.,Nombre de la persona u organización a la que esta dirección pertenece.
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +587,Your Suppliers,Sus proveedores
+apps/erpnext/erpnext/public/js/setup_wizard.js +325,Your Suppliers,Sus proveedores
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,"No se puede definir como pérdida, cuando la orden de venta esta hecha."
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +65,Another Salary Structure {0} is active for employee {1}. Please make its status 'Inactive' to proceed.,"Otra estructura salarial {0} está activo para empleado {1}. Por favor, haga su estado 'Inactivo' para proceder."
 DocType: Purchase Invoice,Contact,Contacto
@@ -3391,7 +3226,7 @@
 DocType: Employee,Date of Issue,Fecha de emisión
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +16,{0}: From {0} for {1},{0}: Desde {0} hasta {1}
 DocType: Issue,Content Type,Tipo de Contenido
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +17,Computer,Computadora
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,Computadora
 DocType: Item,List this Item in multiple groups on the website.,Listar este producto en múltiples grupos del sitio web.
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +62,Item: {0} does not exist in the system,El producto: {0} no existe en el sistema
 apps/erpnext/erpnext/accounts/doctype/account/account.py +81,You are not authorized to set Frozen value,Usted no está autorizado para fijar el valor congelado
@@ -3399,25 +3234,23 @@
 DocType: Cost Center,Budgets,Presupuestos
 apps/frappe/frappe/core/page/modules_setup/modules_setup.py +11,Updated,Actualizado
 DocType: Employee,Emergency Contact Details,Detalles de Contacto de Emergencia
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +396,What does it do?,¿Qué hace?
+apps/erpnext/erpnext/public/js/setup_wizard.js +144,What does it do?,¿Qué hace?
 DocType: Delivery Note,To Warehouse,Para Almacén
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +45,Account {0} has been entered more than once for fiscal year {1},Cuenta {0} se ha introducido más de una vez para el año fiscal {1}
 ,Average Commission Rate,Tasa de Comisión Promedio
-apps/erpnext/erpnext/stock/doctype/item/item.py +313,'Has Serial No' can not be 'Yes' for non-stock item,"'Número de serie' no puede ser ""Sí"" para elementos que son de inventario"
+apps/erpnext/erpnext/stock/doctype/item/item.py +317,'Has Serial No' can not be 'Yes' for non-stock item,"'Número de serie' no puede ser ""Sí"" para elementos que son de inventario"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Attendance can not be marked for future dates,La asistencia no se puede marcar para fechas futuras
 DocType: Pricing Rule,Pricing Rule Help,Ayuda de Regla de Precios
 DocType: Purchase Taxes and Charges,Account Head,Cuenta matriz
 apps/erpnext/erpnext/config/stock.py +79,Update additional costs to calculate landed cost of items,Actualización de los costes adicionales para el cálculo del precio al desembarque de artículos
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +111,Electrical,Eléctrico
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +111,Electrical,Eléctrico
 DocType: Stock Entry,Total Value Difference (Out - In),Diferencia  (Salidas - Entradas)
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},ID de usuario no establecido para el empleado {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +72,Peening,Pendiente
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,From Warranty Claim,Desde reclamo de garantía
 DocType: Stock Entry,Default Source Warehouse,Origen predeterminado Almacén
 DocType: Item,Customer Code,Código de Cliente
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +212,Birthday Reminder for {0},Recordatorio de cumpleaños para {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +163,Lapping,Pulido
-apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.js +8,Days Since Last Order,Días desde el último pedido
+apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +72,Days Since Last Order,Días desde el último pedido
 DocType: Buying Settings,Naming Series,Secuencias e identificadores
 DocType: Leave Block List,Leave Block List Name,Nombre de la Lista de Bloqueo de Vacaciones
 DocType: User,Enabled,Habilitado
@@ -3437,7 +3270,6 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +41,"Buying must be checked, if Applicable For is selected as {0}","Compra debe comprobarse, si se selecciona Aplicable Para como {0}"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,El descuento debe ser inferior a 100
 DocType: ToDo,Low,Bajo
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +71,Spinning,Hilado
 DocType: Landed Cost Voucher,Landed Cost Voucher,Comprobante de costos de destino estimados
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +55,Please set {0},"Por favor, configure {0}"
 DocType: Purchase Invoice,Repeat on Day of Month,Repita el Día del mes
@@ -3458,7 +3290,6 @@
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +37,Campaign Name is required,Es necesario ingresar el nombre  de la Campaña 
 DocType: Maintenance Visit,Maintenance Date,Fecha de Mantenimiento
 DocType: Purchase Receipt Item,Rejected Serial No,Rechazado Serie No
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +51,Deep drawing,Embutición profunda
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +40,New Newsletter,Nuevo Boletín
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +157,Start date should be less than end date for Item {0},La fecha de inicio debe ser menor que la fecha de finalización para el punto {0}
 apps/erpnext/erpnext/stock/doctype/item/item.js +17,Show Balance,Mostrar Balance
@@ -3469,7 +3300,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +119,BOM and Manufacturing Quantity are required,Se requiere la lista de materiales (LdM) y cantidad a fabricar.
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Rango de antigüedad 2
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +450,Amount,Importe
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +147,Riveting,Remachado
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,Lista de materiales (LdM) reemplazada
 ,Sales Analytics,Análisis de Ventas
 DocType: Manufacturing Settings,Manufacturing Settings,Ajustes de Manufactura
@@ -3479,7 +3309,7 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +207,New Account Name,Nombre de nueva cuenta
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,Coste materias primas suministradas
 DocType: Selling Settings,Settings for Selling Module,Ajustes para vender Módulo
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +73,Customer Service,Servicio al Cliente
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Customer Service,Servicio al Cliente
 DocType: Item Customer Detail,Item Customer Detail,Detalle del producto para el cliente
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +147,Confirm Your Email,Confirme su Email
 apps/erpnext/erpnext/config/hr.py +53,Offer candidate a Job.,Ofrecer al candidato un empleo.
@@ -3487,17 +3317,15 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +70,Item {0} must be a stock Item,El producto {0} debe ser un producto en stock
 apps/erpnext/erpnext/config/accounts.py +107,Default settings for accounting transactions.,Los ajustes por defecto para las transacciones contables.
 apps/frappe/frappe/model/naming.py +40,{0} is required,{0} es necesario
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +21,Vacuum molding,Moldeo por vacío
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,Lanzamiento no puede ser anterior material Fecha de Solicitud
 DocType: Contact Us Settings,City,Ciudad
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +132,Ultrasonic machining,Mecanizado por ultrasonidos
 apps/frappe/frappe/templates/base.html +137,Error: Not a valid id?,Error: No es un ID válido?
 apps/erpnext/erpnext/stock/get_item_details.py +125,Item {0} must be a Sales Item,El producto {0} debe ser un producto para la venta
 DocType: Naming Series,Update Series Number,Actualizar número de serie
 DocType: Account,Equity,Patrimonio
 DocType: Task,Closing Date,Fecha de Cierre
 DocType: Sales Order Item,Produced Quantity,Cantidad producida
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +84,Engineer,Ingeniero
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Engineer,Ingeniero
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,Asambleas Buscar Sub
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +379,Item Code required at Row No {0},Código del producto requerido en la fila No. {0}
 DocType: Sales Partner,Partner Type,Tipo de Socio
@@ -3505,7 +3333,7 @@
 DocType: Authorization Rule,Customerwise Discount,Customerwise Descuento
 DocType: Purchase Invoice,Against Expense Account,Contra la Cuenta de Gastos
 DocType: Production Order,Production Order,Orden de Producción
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +258,Installation Note {0} has already been submitted,La nota de instalación {0} ya se ha presentado
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +263,Installation Note {0} has already been submitted,La nota de instalación {0} ya se ha presentado
 DocType: Quotation Item,Against Docname,Contra Docname
 DocType: SMS Center,All Employee (Active),Todos los Empleados (Activos)
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,Ver Ahora
@@ -3514,19 +3342,19 @@
 DocType: Item,Re-Order Level,Reordenar Nivel
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,Escriba artículos y Cantidad planificada para los que desea elevar las órdenes de producción o descargar la materia prima para su análisis.
 apps/frappe/frappe/public/js/frappe/views/ganttview.js +45,Gantt Chart,Diagrama de Gantt
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +57,Part-time,Tiempo Parcial
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,Part-time,Tiempo Parcial
 DocType: Employee,Applicable Holiday List,Lista de Días Feriados Aplicable
 DocType: Employee,Cheque,Cheque
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,Series Actualizado
 apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Report Type is mandatory,Tipo de informe es obligatorio
 DocType: Item,Serial Number Series,Número de Serie Serie
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},El almacén es obligatorio para el producto {0} en la linea {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +45,Retail & Wholesale,Venta al por menor y al por mayor
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,Venta al por menor y al por mayor
 DocType: Issue,First Responded On,Primera respuesta el
 DocType: Website Item Group,Cross Listing of Item in multiple groups,Cruz Ficha de artículo en varios grupos
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +351,The First User: You,El primer usuario: Usted
+apps/erpnext/erpnext/public/js/setup_wizard.js +101,The First User: You,El primer usuario: Usted
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +48,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},La fecha de inicio y la fecha final ya están establecidos en el año fiscal {0}
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +172,Successfully Reconciled,Reconciliado con éxito
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +119,Successfully Reconciled,Reconciliado con éxito
 DocType: Production Order,Planned End Date,Fecha de finalización planeada
 apps/erpnext/erpnext/config/stock.py +43,Where items are stored.,Dónde se almacenarán los productos
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +19,Invoiced Amount,Cantidad facturada
@@ -3544,25 +3372,22 @@
 DocType: DocPerm,Level,Nivel
 DocType: Purchase Taxes and Charges,On Net Total,En Total Neto
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +160,Target warehouse in row {0} must be same as Production Order,Almacenes de destino de la linea {0} deben ser los mismos para la orden de producción
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +59,No permission to use Payment Tool,No tiene permiso para utilizar la herramienta de pagos
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +97,No permission to use Payment Tool,No tiene permiso para utilizar la herramienta de pagos
 apps/erpnext/erpnext/controllers/recurring_document.py +192,'Notification Email Addresses' not specified for recurring %s,'Correo electrónico de notificación' no especificado para %s recurrentes
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +86,Milling,Molienda
 DocType: Company,Round Off Account,Cuenta de redondeo por defecto
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +60,Nibbling,Mordisqueando
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,Gastos de Administración
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +18,Consulting,Consuloría
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +18,Consulting,Consuloría
 DocType: Customer Group,Parent Customer Group,Categoría de cliente principal
 apps/erpnext/erpnext/public/js/pos/pos.js +429,Change,Cambio
 DocType: Purchase Invoice,Contact Email,Correo electrónico de contacto
 DocType: Appraisal Goal,Score Earned,Puntuación Obtenida
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +393,"e.g. ""My Company LLC""","por ejemplo ""Mi Company LLC """
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +173,Notice Period,Período de Notificación
+apps/erpnext/erpnext/public/js/setup_wizard.js +141,"e.g. ""My Company LLC""","por ejemplo ""Mi Company LLC """
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +173,Notice Period,Período de Notificación
 DocType: Bank Reconciliation Detail,Voucher ID,Comprobante ID
 apps/erpnext/erpnext/setup/doctype/territory/territory.js +14,This is a root territory and cannot be edited.,Este es un territorio raíz y no se puede editar .
 DocType: Packing Slip,Gross Weight UOM,Peso Bruto de la Unidad de Medida
 DocType: Email Digest,Receivables / Payables,Cobrables/ Pagables 
 DocType: Delivery Note Item,Against Sales Invoice,Contra la Factura de Venta
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +63,Stamping,Estampado
 DocType: Landed Cost Item,Landed Cost Item,Costos de destino estimados
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +56,Show zero values,Mostrar valores en cero
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,Cantidad del punto obtenido después de la fabricación / reempaque de cantidades determinadas de materias primas
@@ -3573,7 +3398,7 @@
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +37,Budget cannot be assigned against Group Account {0},El presupuesto no se puede asignar contra el grupo de cuentas {0}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +23,Please enter parent cost center,"Por favor, ingrese el centro de costos maestro"
 DocType: Delivery Note,Print Without Amount,Imprimir sin Importe
-apps/erpnext/erpnext/controllers/buying_controller.py +69,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,"Categoría de impuesto no puede ser 'Valoración ' o ""Valoración y Total"" como todos los artículos no elementos del inventario"
+apps/erpnext/erpnext/controllers/buying_controller.py +60,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,"Categoría de impuesto no puede ser 'Valoración ' o ""Valoración y Total"" como todos los artículos no elementos del inventario"
 DocType: User,Last Name,Apellido
 DocType: Web Page,Left,Izquierda
 DocType: Event,All Day,Todo el Día
@@ -3581,7 +3406,7 @@
 DocType: Appraisal,Total Score (Out of 5),Puntaje total (de 5 )
 DocType: Contact Us Settings,State,Estado
 DocType: Batch,Batch,Lotes de Producto
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +51,Balance,Balance
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +28,Balance,Balance
 DocType: Project,Total Expense Claim (via Expense Claims),Total reembolso (Vía reembolsos de gastos)
 DocType: User,Gender,Género
 DocType: Journal Entry,Debit Note,Nota de Débito
@@ -3606,8 +3431,7 @@
 ,Items To Be Requested,Solicitud de Productos
 DocType: Purchase Order,Get Last Purchase Rate,Obtenga último precio de compra
 DocType: Company,Company Info,Información de la compañía
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +76,Seaming,Seaming
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +197,"Company Email ID not found, hence mail not sent","Correo de la compañía no encontrado, por lo que el correo no ha sido enviado"
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +206,"Company Email ID not found, hence mail not sent","Correo de la compañía no encontrado, por lo que el correo no ha sido enviado"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Aplicación de Fondos (Activos )
 DocType: Production Planning Tool,Filter based on item,Filtro basado en producto
 DocType: Fiscal Year,Year Start Date,Fecha de Inicio
@@ -3618,17 +3442,16 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +95,{0} {1} has been modified. Please refresh.,{0} {1} ha sido modificado. Por favor actualizar.
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,Deje que los usuarios realicen Solicitudes de Vacaciones en los siguientes días .
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +591,From Opportunity,Desde oportunidades
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +46,Blanking,Supresión
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +166,Employee Benefits,Beneficios de Empleados
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,Employee Benefits,Beneficios de Empleados
 DocType: Sales Invoice,Is POS,Es POS
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +240,Packed quantity must equal quantity for Item {0} in row {1},La cantidad embalada debe ser igual a la del elemento {0} en la linea {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +245,Packed quantity must equal quantity for Item {0} in row {1},La cantidad embalada debe ser igual a la del elemento {0} en la linea {1}
 DocType: Production Order,Manufactured Qty,Cantidad Fabricada
 DocType: Purchase Receipt Item,Accepted Quantity,Cantidad Aceptada
 apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} no existe
 apps/erpnext/erpnext/config/accounts.py +18,Bills raised to Customers.,Listado de facturas emitidas a los clientes.
 DocType: DocField,Default,Defecto
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,ID del proyecto
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +466,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},linea No. {0}: El importe no puede ser mayor que el reembolso pendiente {1}. El importe pendiente es {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +468,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},linea No. {0}: El importe no puede ser mayor que el reembolso pendiente {1}. El importe pendiente es {2}
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +40,{0} subscribers added,{0} suscriptores añadidos
 DocType: Maintenance Schedule,Schedule,Horario
 DocType: Account,Parent Account,Cuenta Primaria
@@ -3638,7 +3461,7 @@
 apps/erpnext/erpnext/public/js/pos/pos.js +91,Price List not found or disabled,La lista de precios no existe o está deshabilitada.
 DocType: Expense Claim,Approved,Aprobado
 DocType: Pricing Rule,Price,Precio
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +79,Employee relieved on {0} must be set as 'Left',"Empleado relevado en {0} debe definirse como ""izquierda"""
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +88,Employee relieved on {0} must be set as 'Left',"Empleado relevado en {0} debe definirse como ""izquierda"""
 DocType: Item,"Selecting ""Yes"" will give a unique identity to each entity of this item which can be viewed in the Serial No master.","Al seleccionar "" Sí"" le dará una identidad única a cada elemento de este artículo que se puede ver en la máster de No de Serie."
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +39,Appraisal {0} created for Employee {1} in the given date range,Evaluación {0} creado por Empleado {1} en el rango de fechas determinado
 DocType: Employee,Education,Educación
@@ -3647,7 +3470,7 @@
 DocType: Address,Office,Oficina
 apps/frappe/frappe/desk/moduleview.py +67,Standard Reports,Informes Estándares
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,Entradas en el diario de contabilidad.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +209,Please select Employee Record first.,"Por favor, primero seleccione el registro del empleado."
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +224,Please select Employee Record first.,"Por favor, primero seleccione el registro del empleado."
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +35,To create a Tax Account,Para crear una Cuenta de impuestos
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +233,Please enter Expense Account,"Por favor, ingrese la Cuenta de Gastos"
 DocType: Account,Stock,Existencias
@@ -3658,13 +3481,13 @@
 DocType: Sales Order,Track this Sales Order against any Project,Seguir este de órdenes de venta en contra de cualquier proyecto
 DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,Obtener Ordenes de venta (pendientes de entrega) basados en los criterios anteriores
 DocType: DocShare,Document Type,Tipo de Documento
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +565,From Supplier Quotation,Desde cotización del proveedor
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +588,From Supplier Quotation,Desde cotización del proveedor
 DocType: Deduction Type,Deduction Type,Tipo de Deducción
 DocType: Attendance,Half Day,Medio Día
 DocType: Pricing Rule,Min Qty,Cantidad Mínima
 DocType: GL Entry,Transaction Date,Fecha de Transacción
 DocType: Production Plan Item,Planned Qty,Cantidad Planificada
-apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +91,Total Tax,Impuesto Total
+apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +93,Total Tax,Impuesto Total
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +178,For Quantity (Manufactured Qty) is mandatory,Por Cantidad (Cantidad fabricada) es obligatorio
 DocType: Stock Entry,Default Target Warehouse,Almacen de destino predeterminado
 DocType: Purchase Invoice,Net Total (Company Currency),Total neto (Moneda Local)
@@ -3674,27 +3497,25 @@
 DocType: Sales Order,% of materials delivered against this Sales Order,% de materiales entregados contra la orden de venta
 apps/erpnext/erpnext/config/stock.py +23,Record item movement.,Movimientos de inventario
 DocType: Newsletter List Subscriber,Newsletter List Subscriber,Lista de suscriptores al boletín
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +164,Morticing,Mortajar
 DocType: Email Account,Service,Servicio
 DocType: Hub Settings,Hub Settings,Ajustes del Centro de actividades
 DocType: Project,Gross Margin %,Margen Bruto %
 DocType: BOM,With Operations,Con operaciones
 ,Monthly Salary Register,Registar Salario Mensual
-apps/frappe/frappe/website/template.py +140,Next,Próximo
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard_page.html +17,Next,Próximo
 DocType: Warranty Claim,If different than customer address,Si es diferente a la dirección del cliente
 DocType: BOM Operation,BOM Operation,Operación de la lista de materiales (LdM)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +118,Electropolishing,El electropulido
 DocType: Purchase Taxes and Charges,On Previous Row Amount,En la Fila Anterior de Cantidad
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +24,Please enter Payment Amount in atleast one row,"Por favor, ingrese el importe pagado en una linea"
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +33,Please enter Payment Amount in atleast one row,"Por favor, ingrese el importe pagado en una linea"
 DocType: POS Profile,POS Profile,Perfiles POS
 apps/erpnext/erpnext/config/accounts.py +153,"Seasonality for setting budgets, targets etc.","Configuración general para establecer presupuestos, objetivos, etc."
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +238,Row {0}: Payment Amount cannot be greater than Outstanding Amount,Fila {0}: Cantidad de pago no puede ser superior a Monto Pendiente
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +46,Total Unpaid,Total no pagado
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +21,Time Log is not billable,Registro de Horas no es Facturable
 apps/erpnext/erpnext/stock/get_item_details.py +128,"Item {0} is a template, please select one of its variants","El producto {0} es una plantilla, por favor seleccione una de sus variantes"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +528,Purchaser,Comprador
+apps/erpnext/erpnext/public/js/setup_wizard.js +272,Purchaser,Comprador
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +81,Net pay cannot be negative,Salario neto no puede ser negativo
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +71,Please enter the Against Vouchers manually,"Por favor, ingrese los recibos correspondientes manualmente"
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +107,Please enter the Against Vouchers manually,"Por favor, ingrese los recibos correspondientes manualmente"
 DocType: SMS Settings,Static Parameters,Parámetros estáticos
 DocType: Purchase Order,Advance Paid,Pago Anticipado
 DocType: Item,Item Tax,Impuesto del artículo
@@ -3703,14 +3524,12 @@
 apps/erpnext/erpnext/config/crm.py +48,Send mass SMS to your contacts,Enviar mensajes SMS masivos a sus contactos
 DocType: Purchase Taxes and Charges,Consider Tax or Charge for,Considerar impuestos o cargos por
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,Cantidad actual es obligatoria
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +42,Cross-rolling,Cross-balanceo
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +132,Credit Card,Tarjeta de Crédito
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +132,Credit Card,Tarjeta de Crédito
 DocType: BOM,Item to be manufactured or repacked,Artículo a fabricar o embalados de nuevo
 apps/erpnext/erpnext/config/stock.py +95,Default settings for stock transactions.,Los ajustes por defecto para las transacciones de inventario.
 DocType: Purchase Invoice,Next Date,Siguiente fecha
 DocType: Employee Education,Major/Optional Subjects,Principales / Asignaturas Optativas
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +49,Please enter Taxes and Charges,"Por favor, introduzca los impuestos y cargos"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +85,Machining,Laboreo
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","Aquí usted puede mantener los detalles de la familia como el nombre y ocupación de los padres, cónyuge e hijos"
 DocType: Hub Settings,Seller Name,Nombre del Vendedor
 DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),Impuestos y Gastos Deducidos (Moneda Local)
@@ -3718,7 +3537,7 @@
 apps/erpnext/erpnext/setup/doctype/currency_exchange/currency_exchange.py +19,From Currency and To Currency cannot be same,'Desde Moneda' y 'A Moneda' no puede ser la misma
 DocType: Stock Entry,Repack,Vuelva a embalar
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +6,You must Save the form before proceeding,Debe guardar el formulario antes de proceder
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +500,Attach Logo,Adjuntar logo
+apps/erpnext/erpnext/public/js/setup_wizard.js +246,Attach Logo,Adjuntar logo
 DocType: Customer,Commission Rate,Comisión de ventas
 apps/erpnext/erpnext/config/hr.py +145,Block leave applications by department.,Bloquee solicitud de ausencias por departamento.
 DocType: Production Order,Actual Operating Cost,Costo de operación actual
@@ -3731,10 +3550,10 @@
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +105,Please select a csv file,"Por favor, seleccione un archivo csv"
 DocType: Dropbox Backup,Send Backups to Dropbox,Enviar copias de seguridad de Dropbox
 DocType: Purchase Order,To Receive and Bill,Para Recibir y pagar
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +94,Designer,Diseñador
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Designer,Diseñador
 apps/erpnext/erpnext/config/selling.py +121,Terms and Conditions Template,Plantillas de Términos y Condiciones
 DocType: Serial No,Delivery Details,Detalles de la entrega
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +383,Cost Center is required in row {0} in Taxes table for type {1},Centro de costos requerido para la linea {0} en la tabla Impuestos para el tipo {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +386,Cost Center is required in row {0} in Taxes table for type {1},Centro de costos requerido para la linea {0} en la tabla Impuestos para el tipo {1}
 DocType: Item,Automatically create Material Request if quantity falls below this level,Crear automáticamente una 'Solicitud de materiales' si la cantidad es inferior a este nivel
 ,Item-wise Purchase Register,Detalle de Compras
 DocType: Batch,Expiry Date,Fecha de caducidad
@@ -3742,7 +3561,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,"Por favor, seleccione primero la categoría"
 apps/erpnext/erpnext/config/projects.py +18,Project master.,Proyecto maestro
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,No volver a mostrar cualquier símbolo como $ u otro junto a las monedas.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +330, (Half Day),(Medio día)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +374, (Half Day),(Medio día)
 DocType: Supplier,Credit Days,Días de Crédito
 DocType: Leave Type,Is Carry Forward,Es llevar adelante
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +478,Get Items from BOM,Obtener elementos de la Solicitud de Materiales
@@ -3750,7 +3569,7 @@
 apps/erpnext/erpnext/config/manufacturing.py +120,Bill of Materials,Lista de materiales (LdM)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +77,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Fila {0}: el tipo de entidad se requiere para las cuentas por cobrar/pagar {1}
 DocType: Dropbox Backup,Send Notifications To,Enviar notificaciones a
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html +26,Ref Date,Fecha Ref
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +54,Ref Date,Fecha Ref
 DocType: Employee,Reason for Leaving,Razones de Renuncia 
 DocType: Expense Claim Detail,Sanctioned Amount,importe sancionado
 DocType: GL Entry,Is Opening,Es apertura
@@ -3758,4 +3577,3 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +188,Account {0} does not exist,Cuenta {0} no existe
 DocType: Account,Cash,Efectivo
 DocType: Employee,Short biography for website and other publications.,Breve biografía de la página web y otras publicaciones.
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +31,Please create Salary Structure for employee {0},"Por favor, cree una estructura salarial para el empleado {0}"
diff --git a/erpnext/translations/es.csv b/erpnext/translations/es.csv
index a3fb6f3..cf3b3df 100644
--- a/erpnext/translations/es.csv
+++ b/erpnext/translations/es.csv
@@ -1,13 +1,12 @@
 DocType: Employee,Salary Mode,Modo de pago
 DocType: Cost Center,"Select Monthly Distribution, if you want to track based on seasonality.","Seleccione la distribución mensual, si usted desea monitoreo de las temporadas"
 DocType: Employee,Divorced,Divorciado
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +86,Warning: Same item has been entered multiple times.,Advertencia: El mismo artículo se ha introducido varias veces.
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +80,Warning: Same item has been entered multiple times.,Advertencia: El mismo artículo se ha introducido varias veces.
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +96,Items already synced,Productos ya sincronizados
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,Permitir añadir el artículo varias veces en una transacción
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,Cancelar visita {0} antes de cancelar este reclamo de garantía
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +19,Consumer Products,Productos de consumo
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,Productos de consumo
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +68,Please select Party Type first,"Por favor, seleccione primero el tipo de entidad"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +90,Annealing,Recocido
 DocType: Item,Customer Items,Partidas de deudores
 apps/erpnext/erpnext/accounts/doctype/account/account.py +45,Account {0}: Parent account {1} can not be a ledger,Cuenta {0}: de cuenta padre {1} no puede ser una cuenta de libro mayor
 DocType: Item,Publish Item to hub.erpnext.com,Publicar artículo en hub.erpnext.com
@@ -20,15 +19,14 @@
 DocType: About Us Settings,Website,Sitio web
 DocType: POS Profile,Applicable for User,Aplicable para el usuario
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +169,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","La orden de producción detenida no puede ser cancelada, inicie de nuevo para cancelarla"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +23,Compaction plus sintering,Compactación más sinterización
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,Currency is required for Price List {0},La divisa/moneda es requerida para lista de precios {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Será calculado en la transacción.
 DocType: Purchase Order,Customer Contact,Contacto del cliente
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +549,From Material Request,Desde requisición de materiales
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +572,From Material Request,Desde requisición de materiales
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,Árbol: {0}
 DocType: Job Applicant,Job Applicant,Solicitante de empleo
 apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,No hay más resultados.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +78,Legal,Legal
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +34,Legal,Legal
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +114,Actual type tax cannot be included in Item rate in row {0},"El tipo de impuesto actual, no puede ser incluido en el precio del producto de la línea {0}"
 DocType: C-Form,Customer,Cliente
 DocType: Purchase Receipt Item,Required By,Solicitado por
@@ -43,7 +41,6 @@
 DocType: Manufacturing Settings,Default 10 mins,Por defecto 10 minutos
 DocType: Leave Type,Leave Type Name,Nombre del tipo de ausencia
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +148,Series Updated Successfully,Secuencia actualizada correctamente
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +150,Stitching,Puntadas
 DocType: Pricing Rule,Apply On,Aplicar en
 DocType: Item Price,Multiple Item prices.,Configuración de múltiples precios para los productos
 ,Purchase Order Items To Be Received,Productos por recibir desde orden de compra
@@ -51,8 +48,8 @@
 DocType: Quality Inspection Reading,Parameter,Parámetro
 apps/erpnext/erpnext/projects/doctype/project/project.py +43,Expected End Date can not be less than Expected Start Date,La fecha prevista de finalización no puede ser inferior a la fecha prevista de inicio
 apps/erpnext/erpnext/utilities/transaction_base.py +104,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Línea # {0}: El valor debe ser el mismo que {1}: {2} ({3} / {4})
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +189,New Leave Application,Nueva solicitud de ausencia
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +134,Bank Draft,Giro bancario
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +204,New Leave Application,Nueva solicitud de ausencia
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +134,Bank Draft,Giro bancario
 DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,"1 . Utilice esta opción para mantener el código del producto asignado por el cliente, de esta manera podrá encontrarlo en el buscador"
 DocType: Mode of Payment Account,Mode of Payment Account,Modo de pago a cuenta
 apps/erpnext/erpnext/stock/doctype/item/item.js +34,Show Variants,Mostrar variantes
@@ -62,27 +59,25 @@
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,En inventario
 DocType: Designation,Designation,Puesto
 DocType: Production Plan Item,Production Plan Item,Plan de producción de producto
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +141,User {0} is already assigned to Employee {1},El usuario {0} ya está asignado a Empleado {1}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +141,User {0} is already assigned to Employee {1},El usuario {0} ya está asignado al empleado {1}
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +13,Make new POS Profile,Crear un nuevo perfil de POS
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +31,Health Care,Asistencia médica
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,Asistencia médica
 DocType: Purchase Invoice,Monthly,Mensual
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +66,Delay in payment (Days),Retraso en el pago (días)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +494,Invoice,Factura
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +519,Invoice,Factura
 DocType: Maintenance Schedule Item,Periodicity,Periodo
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +357,Email Address,Dirección de correo electrónico
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +21,Defense,Defensa
+apps/erpnext/erpnext/public/js/setup_wizard.js +107,Email Address,Dirección de correo electrónico
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,Defensa
 DocType: Company,Abbr,Abreviatura
 DocType: Appraisal Goal,Score (0-5),Puntuación (0-5)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +193,Row {0}: {1} {2} does not match with {3},Línea {0}: {1} {2} no coincide con {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +67,Row # {0}:,Línea # {0}:
 DocType: Delivery Note,Vehicle No,Vehículo No.
 apps/erpnext/erpnext/public/js/pos/pos.js +528,Please select Price List,"Por favor, seleccione la lista de precios"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +162,Woodworking,Tratamiento de la madera
 DocType: Production Order Operation,Work In Progress,Trabajo en proceso
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +153,3D printing,Impresión 3D
 DocType: Employee,Holiday List,Lista de festividades
 DocType: Time Log,Time Log,Gestión de tiempos
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +530,Accountant,Contador
+apps/erpnext/erpnext/public/js/setup_wizard.js +274,Accountant,Contador
 DocType: Cost Center,Stock User,Usuario de almacén
 DocType: Company,Phone No,Teléfono No.
 DocType: Time Log,"Log of Activities performed by users against Tasks that can be used for tracking time, billing.",Bitácora de actividades realizadas por los usuarios en las tareas que se utilizan para el seguimiento del tiempo y la facturación.
@@ -98,19 +93,20 @@
 DocType: Bin,Quantity Requested for Purchase,Cantidad solicitada para la compra
 DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name","Adjuntar archivo .csv con dos columnas, una para el nombre antiguo y la otra para el nombre nuevo."
 DocType: Packed Item,Parent Detail docname,Detalle principal docname
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Kg,Kilogramo
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Kg,Kilogramo
 apps/erpnext/erpnext/config/hr.py +48,Opening for a Job.,Apertura de un puesto
 DocType: Item Attribute,Increment,Incremento
 apps/erpnext/erpnext/public/js/stock_analytics.js +63,Select Warehouse...,Seleccione Almacén ...
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +6,Advertising,Publicidad
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,Publicidad
+apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,Igual Company se introduce más de una vez
 DocType: Employee,Married,Casado
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +389,Stock cannot be updated against Delivery Note {0},Inventario no puede actualizarse contra la nota de envío {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +391,Stock cannot be updated against Delivery Note {0},Inventario no puede actualizarse contra la nota de envío {0}
 DocType: Payment Reconciliation,Reconcile,Conciliar
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +30,Grocery,Abarrotes
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,Abarrotes
 DocType: Quality Inspection Reading,Reading 1,Lectura 1
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Make Bank Entry,Crear entrada de banco
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +40,Pension Funds,Fondo de pensiones
-apps/erpnext/erpnext/accounts/doctype/account/account.py +142,Warehouse is mandatory if account type is Warehouse,Almacén o Bodega es obligatorio si el tipo de cuenta es Almacén
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,Fondo de pensiones
+apps/erpnext/erpnext/accounts/doctype/account/account.py +142,Warehouse is mandatory if account type is Warehouse,El almacén es obligatorio si el tipo de cuenta es 'almacén'
 DocType: SMS Center,All Sales Person,Todos los vendedores
 DocType: Lead,Person Name,Nombre de persona
 DocType: Sales Order,"Check if recurring order, uncheck to stop recurring or put proper End Date","Marque si es una orden recurrente, desmarque si quiere detenerla o definir una fecha final"
@@ -118,7 +114,7 @@
 DocType: Account,Credit,Haber
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +25,Please setup Employee Naming System in Human Resource > HR Settings,"Por favor, configure el sistema de Nombre de Empleados a través de: Recursos Humanos > Configuración de recursos humanos"
 DocType: POS Profile,Write Off Cost Center,Desajuste de centro de costos
-DocType: Warehouse,Warehouse Detail,Detalle de almacenes
+DocType: Warehouse,Warehouse Detail,Detalles de almacen
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +181,Credit limit has been crossed for customer {0} {1}/{2},Límite de crédito ha sido sobrepasado para el cliente {0} {1}/{2}
 DocType: Tax Rule,Tax Type,Tipo de impuestos
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +141,You are not authorized to add or update entries before {0},No tiene permisos para agregar o actualizar las entradas antes de {0}
@@ -131,7 +127,7 @@
 DocType: Quality Inspection,Get Specification Details,Obtener especificaciones
 DocType: Lead,Interested,Interesado
 apps/erpnext/erpnext/config/manufacturing.py +14,Bill of Material,Lista de Materiales (LdM)
-apps/erpnext/erpnext/public/js/stock_analytics.js +45,Opening,Apertura
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +158,Opening,Apertura
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},Desde {0} a {1}
 DocType: Item,Copy From Item Group,Copiar desde grupo
 DocType: Journal Entry,Opening Entry,Asiento de apertura
@@ -145,23 +141,22 @@
 DocType: Employee Education,Under Graduate,Estudiante
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +22,Target On,Objetivo en
 DocType: BOM,Total Cost,Coste total
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +99,Reaming,Escariado
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +9,Activity Log:,Registro de Actividad:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +199,Item {0} does not exist in the system or has expired,El elemento {0} no existe en el sistema o ha expirado
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +44,Real Estate,Bienes raíces
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +44,Real Estate,Bienes raíces
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +4,Statement of Account,Estado de cuenta
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +41,Pharmaceuticals,Productos farmacéuticos
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,Productos farmacéuticos
 DocType: Expense Claim Detail,Claim Amount,Importe del reembolso
 DocType: Employee,Mr,Sr.
 DocType: Custom Script,Client,Cliente
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,Proveedor / Tipo de proveedor
 DocType: Naming Series,Prefix,Prefijo
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Consumable,Consumible
+apps/erpnext/erpnext/public/js/setup_wizard.js +359,Consumable,Consumible
 DocType: Upload Attendance,Import Log,Importar registro
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.js +19,Send,Enviar.
 DocType: Sales Invoice Item,Delivered By Supplier,Entregado por proveedor
 DocType: SMS Center,All Contact,Todos los Contactos
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +164,Annual Salary,Salario Anual
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +164,Annual Salary,Salario Anual
 DocType: Period Closing Voucher,Closing Fiscal Year,Cerrando el año fiscal
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +69,Stock Expenses,Gastos sobre existencias
 DocType: Newsletter,Email Sent?,Enviar Email?
@@ -169,7 +164,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +92,Show Time Logs,Mostrar gestión de tiempos
 DocType: Journal Entry Account,Credit in Company Currency,Divisa por defecto de la cuenta de credito
 DocType: Delivery Note,Installation Status,Estado de la instalación
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +115,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Cantidad Aceptada + Rechazada debe ser igual a la cantidad Recibida por el Artículo {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +118,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Cantidad Aceptada + Rechazada debe ser igual a la cantidad Recibida por el Artículo {0}
 DocType: Item,Supply Raw Materials for Purchase,Suministro de materia prima para la compra
 apps/erpnext/erpnext/stock/get_item_details.py +133,Item {0} must be a Purchase Item,El producto {0} debe ser un producto para la compra
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
@@ -177,19 +172,17 @@
  Todas las fechas y los empleados en el período seleccionado se adjuntara a la planilla, con los registros de asistencia existentes."
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +446,Item {0} is not active or end of life has been reached,El producto {0} no está activo o ha llegado al final de la vida útil
 DocType: Time Log Batch,Will be updated after Sales Invoice is Submitted.,Se actualizará después de la factura de venta se considera validada.
-apps/erpnext/erpnext/controllers/accounts_controller.py +493,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included",Para incluir el impuesto en la línea {0} los impuestos de las lineas {1} tambien deben ser incluidos
+apps/erpnext/erpnext/controllers/accounts_controller.py +494,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included",Para incluir el impuesto en la línea {0} los impuestos de las lineas {1} tambien deben ser incluidos
 apps/erpnext/erpnext/config/hr.py +90,Settings for HR Module,Configuracion para módulo de recursos humanos (RRHH)
 DocType: SMS Center,SMS Center,Centro SMS
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +78,Straightening,Enderezado
 DocType: BOM Replace Tool,New BOM,Nueva solicitud de materiales
 apps/erpnext/erpnext/config/projects.py +28,Batch Time Logs for billing.,Lotes de gestión de tiempos para facturación.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +15,Countergravity casting,Countergravity casting
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +30,Newsletter has already been sent,El boletín de noticias ya ha sido enviado
 DocType: Lead,Request Type,Tipo de solicitud
 DocType: Leave Application,Reason,Razón
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +14,Broadcasting,Difusión
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +140,Execution,Ejecución
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +364,The first user will become the System Manager (you can change this later).,El primer usuario se convertirá en el administrador del sistema (puede cambiar esto más adelante).
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,Difusión
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +140,Execution,Ejecución
+apps/erpnext/erpnext/public/js/setup_wizard.js +114,The first user will become the System Manager (you can change this later).,El primer usuario se convertirá en el administrador del sistema (puede cambiar esto más adelante).
 apps/erpnext/erpnext/config/manufacturing.py +39,Details of the operations carried out.,Detalles de las operaciones realizadas.
 DocType: Serial No,Maintenance Status,Estado del mantenimiento
 apps/erpnext/erpnext/config/stock.py +263,Items and Pricing,Productos y precios
@@ -206,7 +199,6 @@
 DocType: Pricing Rule,Discount on Price List Rate (%),Descuento sobre la tarifa de la lista de precios (%)
 apps/frappe/frappe/public/js/frappe/form/print.js +96,Start,Iniciar
 DocType: User,First Name,Nombre
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +12,Full-mold casting,Fundición de molde completo
 DocType: Offer Letter,Select Terms and Conditions,Seleccione términos y condiciones
 DocType: Production Planning Tool,Sales Orders,Ordenes de venta
 DocType: Purchase Taxes and Charges,Valuation,Valuación
@@ -218,8 +210,7 @@
 DocType: Bank Reconciliation,Bank Account,Cuenta bancaria
 DocType: Leave Type,Allow Negative Balance,Permitir Saldo Negativo
 DocType: Selling Settings,Default Territory,Territorio predeterminado
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +53,Television,Televisión
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +138,Gashing,Rechinar
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,Televisión
 DocType: Production Order Operation,Updated via 'Time Log',Actualizado a través de la gestión de tiempos
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +82,Account {0} does not belong to Company {1},Cuenta {0} no pertenece a la Compañía {1}
 DocType: Naming Series,Series List for this Transaction,Lista de secuencias para esta transacción
@@ -234,41 +225,39 @@
 DocType: Leave Allocation,Add unused leaves from previous allocations,Añadir las hojas no utilizados de las asignaciones anteriores
 apps/erpnext/erpnext/controllers/recurring_document.py +206,Next Recurring {0} will be created on {1},La próxima recurrencia {0} se creará el {1}
 DocType: Newsletter List,Total Subscribers,Suscriptores totales
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +575,Contact Name,Nombre de contacto
+,Contact Name,Nombre de contacto
 DocType: Production Plan Item,SO Pending Qty,Cant. de OV pendientes
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Crear la nómina salarial con los criterios antes seleccionados.
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,Solicitudes de compra.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +107,Double housing,Vivienda Doble
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +156,Only the selected Leave Approver can submit this Leave Application,Sólo el supervisor de ausencias responsable puede validar esta solicitud de permiso
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +171,Only the selected Leave Approver can submit this Leave Application,Sólo el supervisor de ausencias responsable puede validar esta solicitud de permiso
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,La fecha de relevo debe ser mayor que la fecha de inicio
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +172,Leaves per Year,Ausencias por año
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +172,Leaves per Year,Ausencias por año
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup > Settings > Naming Series,"Por favor, las secuencias e identificadores para {0} a través de Configuración> Configuración> Secuencias e identificadores"
 DocType: Time Log,Will be updated when batched.,Se actualizará al agruparse.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +104,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,"Línea {0}: Por favor, verifique 'Es un anticipo' para la cuenta {1} si se trata de una entrada de pago anticipado."
-apps/erpnext/erpnext/stock/utils.py +174,Warehouse {0} does not belong to company {1},Almacén {0} no pertenece a la empresa {1}
+apps/erpnext/erpnext/stock/utils.py +174,Warehouse {0} does not belong to company {1},El almacén {0} no pertenece a la compañía {1}
 DocType: Bulk Email,Message,Mensaje
 DocType: Item Website Specification,Item Website Specification,Especificación del producto en la WEB
 DocType: Dropbox Backup,Dropbox Access Key,Clave de acceso a Dropbox
 DocType: Payment Tool,Reference No,Referencia No.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +348,Leave Blocked,Vacaciones Bloqueadas
-apps/erpnext/erpnext/stock/doctype/item/item.py +535,Item {0} has reached its end of life on {1},El producto {0} ha llegado al fin de la vida útil el {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +392,Leave Blocked,Vacaciones Bloqueadas
+apps/erpnext/erpnext/stock/doctype/item/item.py +539,Item {0} has reached its end of life on {1},El producto {0} ha llegado al fin de la vida útil el {1}
 apps/erpnext/erpnext/accounts/utils.py +339,Annual,Anual
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Elemento de reconciliación de inventarios
 DocType: Stock Entry,Sales Invoice No,Factura de venta No.
 DocType: Material Request Item,Min Order Qty,Cantidad mínima de Pedido
 DocType: Lead,Do Not Contact,No contactar
 DocType: Sales Invoice,The unique id for tracking all recurring invoices. It is generated on submit.,El ID único para el seguimiento de todas las facturas recurrentes. Este es generado al validar.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +93,Software Developer,Desarrollador de Software.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +93,Software Developer,Desarrollador de Software.
 DocType: Item,Minimum Order Qty,Cantidad mínima de la orden
 DocType: Pricing Rule,Supplier Type,Tipo de proveedor
 DocType: Item,Publish in Hub,Publicar en el Hub
 ,Terretory,Territorio
-apps/erpnext/erpnext/stock/doctype/item/item.py +555,Item {0} is cancelled,El producto {0} esta cancelado
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +598,Material Request,Requisición de materiales
+apps/erpnext/erpnext/stock/doctype/item/item.py +559,Item {0} is cancelled,El producto {0} esta cancelado
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +607,Material Request,Requisición de materiales
 DocType: Bank Reconciliation,Update Clearance Date,Actualizar fecha de liquidación
 DocType: Item,Purchase Details,Detalles de compra
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +323,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},El elemento {0} no se encuentra en 'Materias Primas Suministradas' en la tabla de la órden de compra {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +129,Wire brushing,Cepillo de alambre
 DocType: Employee,Relation,Relación
 DocType: Shipping Rule,Worldwide Shipping,Envío al mundo entero
 apps/erpnext/erpnext/config/selling.py +23,Confirmed orders from Customers.,Ordenes de clientes confirmadas.
@@ -284,25 +273,22 @@
 DocType: Supplier,Address HTML,Dirección HTML
 DocType: Lead,Mobile No.,Número móvil
 DocType: Maintenance Schedule,Generate Schedule,Generar planificación
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +81,Hubbing,Hubbing
 DocType: Purchase Invoice Item,Expense Head,Cuenta de gastos
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +86,Please select Charge Type first,"Por favor, seleccione primero el tipo de cargo"
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,Más reciente
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +395,Max 5 characters,Máximo 5 caractéres
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +195,Select Your Language,Seleccione su idioma.
+apps/erpnext/erpnext/public/js/setup_wizard.js +143,Max 5 characters,Máximo 5 caractéres
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +245,Select Your Language,Seleccione su idioma.
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,El primer supervisor de ausencias en la lista sera definido como el administrador de ausencias/vacaciones predeterminado.
 DocType: Manufacturing Settings,"Disables creation of time logs against Production Orders.
 Operations shall not be tracked against Production Order",Desactiva la creación de bitácoras (gestión de tiempos) para las órdenes de producción (OP). Las operaciones ya no tendrán un seguimiento.
 DocType: Accounts Settings,Settings for Accounts,Ajustes de contabilidad
 apps/erpnext/erpnext/config/crm.py +90,Manage Sales Person Tree.,Administrar las categoría de los socios de ventas
 DocType: Item,Synced With Hub,Sincronizado con Hub.
-apps/erpnext/erpnext/setup/doctype/company/company.js +41,Wrong Password,Contraseña Incorrecta
+apps/erpnext/erpnext/setup/doctype/company/company.js +41,Wrong Password,Contraseña incorrecta
 DocType: Item,Variant Of,Variante de
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +34,Item {0} must be Service Item,El elemento {0} debe ser un servicio
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +303,Completed Qty can not be greater than 'Qty to Manufacture',La cantidad completada no puede ser mayor que la cantidad a manufacturar.
 DocType: DocType,Administrator,Administrador
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +136,Laser drilling,Perforación por láser
-DocType: Stock UOM Replace Utility,New Stock UOM,Nueva unidad de medida (UdM)
 DocType: Period Closing Voucher,Closing Account Head,Cuenta principal de cierre
 DocType: Employee,External Work History,Historial de trabajos externos
 apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,Error de referencia circular
@@ -311,18 +297,15 @@
 DocType: Lead,Industry,Industria
 DocType: Employee,Job Profile,Perfil del puesto
 DocType: Newsletter,Newsletter,Boletín de noticias
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +84,Hydroforming,Hydroforming
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +49,Necking,Tapado / Sellado
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Notificarme por Email cuando se genere una nueva requisición de materiales
 DocType: Journal Entry,Multi Currency,Multi moneda
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +51,Item is updated,Se ha actualizado el producto
 DocType: Async Task,System Manager,Administrador del sistema
 DocType: Payment Reconciliation Invoice,Invoice Type,Tipo de factura
 DocType: Sales Invoice Item,Delivery Note,Nota de entrega
 DocType: Dropbox Backup,Allow Dropbox Access,Permitir Acceso a Dropbox
 apps/erpnext/erpnext/config/learn.py +72,Setting up Taxes,Configuración de Impuestos
 apps/erpnext/erpnext/accounts/utils.py +189,Payment Entry has been modified after you pulled it. Please pull it again.,"El registro del pago ha sido modificado antes de su modificación. Por favor, inténtelo de nuevo."
-apps/erpnext/erpnext/stock/doctype/item/item.py +343,{0} entered twice in Item Tax,{0} ingresado dos veces en el Impuesto del producto
+apps/erpnext/erpnext/stock/doctype/item/item.py +347,{0} entered twice in Item Tax,{0} ingresado dos veces en el Impuesto del producto
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +105,Summary for this week and pending activities,Resumen para esta semana y actividades pendientes
 DocType: Workstation,Rent Cost,Costo de arrendamiento
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +74,Please select month and year,Por favor seleccione el mes y el año
@@ -339,23 +322,21 @@
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,Tasa por la cual la divisa es convertida como moneda base del cliente
 DocType: Features Setup,"Available in BOM, Delivery Note, Purchase Invoice, Production Order, Purchase Order, Purchase Receipt, Sales Invoice, Sales Order, Stock Entry, Timesheet","Disponible en la Solicitud de Materiales , Albarán, Factura de Compra , Orden de Produccuón , Orden de Compra , Fecibo de Compra , Factura de Venta Pedidos de Venta , Inventario de Entrada, Control de Horas"
 DocType: Item Tax,Tax Rate,Procentaje del impuesto
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Select Item,Seleccione producto
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +540,Select Item,Seleccione producto
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +143,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","El Producto: {0} gestionado por lotes, no se puede conciliar usando\ Reconciliación de Stock, se debe usar Entrada de Stock"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +259,Purchase Invoice {0} is already submitted,La factura de compra {0} ya existe o se encuentra validada
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +262,Purchase Invoice {0} is already submitted,La factura de compra {0} ya existe o se encuentra validada
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Batch No must be same as {1} {2},Línea # {0}: El lote no puede ser igual a {1} {2}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Convert to non-Group,Convertir a 'Sin-Grupo'
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +55,Purchase Receipt must be submitted,El recibo de compra debe validarse
-DocType: Stock UOM Replace Utility,Current Stock UOM,Unidad de Medida de Inventario Actual
 apps/erpnext/erpnext/config/stock.py +53,Batch (lot) of an Item.,Listados de los lotes de los productos
 DocType: C-Form Invoice Detail,Invoice Date,Fecha de factura
 DocType: GL Entry,Debit Amount,Importe débitado
 apps/erpnext/erpnext/accounts/party.py +223,There can only be 1 Account per Company in {0} {1},Sólo puede existir una (1) cuenta por compañía en {0} {1}
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Your email address,Su dirección de correo electrónico
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +194,Please see attachment,"Por favor, revise el documento adjunto"
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +203,Please see attachment,"Por favor, revise el documento adjunto"
 DocType: Purchase Order,% Received,% Recibido
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +109,Water jet cutting,Corte por chorro de agua
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +24,Setup Already Complete!!,La configuración ya se ha completado!
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +20,Setup Already Complete!!,La configuración ya se ha completado!
 ,Finished Goods,Productos terminados
 DocType: Delivery Note,Instructions,Instrucciones
 DocType: Quality Inspection,Inspected By,Inspección realizada por
@@ -370,20 +351,20 @@
 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.,"Por favor, NO crear cuentas de clientes y/o proveedores. Estas son creadas en los maestros de clientes/proveedores."
 DocType: Currency Exchange,Currency Exchange,Cambio de divisas
 DocType: Purchase Invoice Item,Item Name,Nombre del producto
+DocType: Authorization Rule,Approving User  (above authorized value),La aprobación del usuario (por encima del valor autorizado)
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Credit Balance,Saldo Acreedor
 DocType: Employee,Widowed,Viudo
 DocType: Production Planning Tool,"Items to be requested which are ""Out of Stock"" considering all warehouses based on projected qty and minimum order qty","Elementos que deben exigirse que son "" Fuera de Stock "", considerando todos los almacenes basados ​​en Cantidad proyectada y pedido mínimo Cantidad"
-DocType: Workstation,Working Hours,Horas de Trabajo
+DocType: Workstation,Working Hours,Horas de trabajo
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,Defina el nuevo número de secuencia para esta transacción.
 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.","Si existen varias reglas de precios, se les pide a los usuarios que establezcan la prioridad manualmente para resolver el conflicto."
 ,Purchase Register,Registro de compras
 DocType: Landed Cost Item,Applicable Charges,Cargos Aplicables
 DocType: Workstation,Consumable Cost,Coste de consumibles
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,{0} ({1}) must have role 'Leave Approver',{0} ({1}) debe tener el rol de 'Supervisor de ausencias'
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +167,{0} ({1}) must have role 'Leave Approver',{0} ({1}) debe tener el rol de 'Supervisor de ausencias'
 DocType: Purchase Receipt,Vehicle Date,Fecha de Vehículos
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +39,Medical,Médico
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +39,Medical,Médico
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,Razón de pérdida
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +36,Tube beading,Abalorios Tubo
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},La estación de trabajo estará cerrada en las siguientes fechas según la lista de festividades: {0}
 DocType: Employee,Single,Soltero
 DocType: Issue,Attachment,Adjunto
@@ -405,10 +386,8 @@
 DocType: Account,Is Group,Es un grupo
 DocType: Stock Settings,Automatically Set Serial Nos based on FIFO,Ajusta automáticamente los números de serie basado en FIFO
 DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,Comprobar número de factura único por proveedor
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +31,Thermoforming,Termoformado
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +66,Slitting,Corte longitudinal
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +57,'To Case No.' cannot be less than 'From Case No.','Hasta caso No.' no puede ser inferior a 'desde el caso No.'
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +104,Non Profit,Sin fines de lucro
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +104,Non Profit,Sin fines de lucro
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_list.js +7,Not Started,No iniciado
 DocType: Lead,Channel Partner,Canal de socio
 DocType: Account,Old Parent,Antiguo Padre
@@ -417,13 +396,12 @@
 apps/erpnext/erpnext/config/manufacturing.py +74,Global settings for all manufacturing processes.,Configuración global para todos los procesos de producción
 DocType: Accounts Settings,Accounts Frozen Upto,Cuentas congeladas hasta
 DocType: SMS Log,Sent On,Enviado por
-apps/erpnext/erpnext/stock/doctype/item/item.py +512,Attribute {0} selected multiple times in Attributes Table,Atributo {0} seleccionado varias veces en la tabla Atributos
+apps/erpnext/erpnext/stock/doctype/item/item.py +516,Attribute {0} selected multiple times in Attributes Table,Atributo {0} seleccionado varias veces en la tabla Atributos
 DocType: Sales Order,Not Applicable,No aplicable
 apps/erpnext/erpnext/config/hr.py +140,Holiday master.,Master de vacaciones .
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +19,Shell molding,Shell molding
 DocType: Material Request Item,Required Date,Fecha de solicitud
 DocType: Delivery Note,Billing Address,Dirección de facturación
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +644,Please enter Item Code.,"Por favor, introduzca el código del producto."
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +648,Please enter Item Code.,"Por favor, introduzca el código del producto."
 DocType: BOM,Costing,Presupuesto
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount","Si se selecciona, el valor del impuesto se considerará como ya incluido en el importe"
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,Cantidad Total
@@ -433,34 +411,33 @@
 DocType: Item Attribute,To Range,A rango
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Valores y depósitos
 DocType: Features Setup,Imports,Importaciones
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +144,Adhesive bonding,Union adhesiva
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +77,Total leaves allocated is mandatory,Hojas totales asignados es obligatorio
 DocType: Job Opening,Description of a Job Opening,Descripción de la oferta de trabajo
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +102,Pending activities for today,Actividades pendientes para hoy
 apps/erpnext/erpnext/config/hr.py +28,Attendance record.,Registros de asistencias.
 DocType: Bank Reconciliation,Journal Entries,Asientos contables
-DocType: Sales Order Item,Used for Production Plan,Se utiliza para el Plan de Producción
+DocType: Sales Order Item,Used for Production Plan,Se utiliza para el plan de producción
 DocType: System Settings,Loading...,Cargando ...
 DocType: DocField,Password,Contraseña
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +155,Fused deposition modeling,Modelado por deposición fundida
 DocType: Manufacturing Settings,Time Between Operations (in mins),Tiempo entre operaciones (en minutos)
 DocType: Customer,Buyer of Goods and Services.,Consumidor de productos y servicios.
 DocType: Journal Entry,Accounts Payable,Cuentas por pagar
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +24,Add Subscribers,Añadir Suscriptores
 apps/erpnext/erpnext/public/js/feature_setup.js +220,""" does not exists",""" no existe"
 DocType: Pricing Rule,Valid Upto,Válido hasta
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +564,List a few of your customers. They could be organizations or individuals.,Enumere algunos de sus clientes. Pueden ser organizaciones o personas.
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,List a few of your customers. They could be organizations or individuals.,Enumere algunos de sus clientes. Pueden ser organizaciones o personas.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Direct Income,Ingreso directo
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +33,"Can not filter based on Account, if grouped by Account","No se puede filtrar en función de la cuenta , si se agrupan por cuenta"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +88,Administrative Officer,Funcionario administrativo
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Administrative Officer,Funcionario administrativo
 DocType: Payment Tool,Received Or Paid,Recibido o pagado
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +318,Please select Company,"Por favor, seleccione la empresa"
 DocType: Stock Entry,Difference Account,Cuenta para la Diferencia
 apps/erpnext/erpnext/projects/doctype/task/task.py +44,Cannot close task as its dependant task {0} is not closed.,No se puede cerrar la tarea que depende de {0} ya que no está cerrada.
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +305,Please enter Warehouse for which Material Request will be raised,"Por favor, ingrese el almacén en el cual la requisición de materiales sera despachada"
 DocType: Production Order,Additional Operating Cost,Costos adicionales de operación
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +20,Cosmetics,Productos cosméticos
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,Productos cosméticos
 DocType: DocField,Type,Tipo
-apps/erpnext/erpnext/stock/doctype/item/item.py +417,"To merge, following properties must be same for both items","Para fusionar, la siguientes propiedades deben ser las mismas en ambos productos"
+apps/erpnext/erpnext/stock/doctype/item/item.py +421,"To merge, following properties must be same for both items","Para fusionar, la siguientes propiedades deben ser las mismas en ambos productos"
 DocType: Communication,Subject,Asunto
 DocType: Shipping Rule,Net Weight,Peso neto
 DocType: Employee,Emergency Phone,Teléfono de emergencia
@@ -470,7 +447,6 @@
 DocType: Journal Entry,Difference (Dr - Cr),Diferencia (Deb - Cred)
 DocType: Account,Profit and Loss,Pérdidas y ganancias
 apps/erpnext/erpnext/config/stock.py +293,Managing Subcontracting,Gestión de sub-contrataciones
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +58,New UOM must NOT be of type Whole Number,La nueva unidad de medida no debe ser un entero
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Furniture and Fixture,MUEBLES Y ENSERES
 DocType: Quotation,Rate at which Price list currency is converted to company's base currency,Tasa por la cual la lista de precios es convertida como base de la compañía
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Account {0} does not belong to company: {1},Cuenta {0} no pertenece a la compañía: {1}
@@ -489,14 +465,14 @@
 DocType: Purchase Invoice,Supplier Invoice No,Factura de proveedor No.
 DocType: Territory,For reference,Para referencia
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +154,"Cannot delete Serial No {0}, as it is used in stock transactions","No se puede eliminar el No. de serie {0}, ya que esta siendo utilizado en transacciones de stock"
-apps/erpnext/erpnext/public/js/account_tree_grid.js +52,Closing (Cr),Cierre (Cred)
-DocType: Serial No,Warranty Period (Days),Período de garantía ( Días)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +227,Closing (Cr),Cierre (Cred)
+DocType: Serial No,Warranty Period (Days),Período de garantía (Días)
 DocType: Installation Note Item,Installation Note Item,Nota de instalación de elementos
 ,Pending Qty,Cantidad pendiente
 DocType: Job Applicant,Thread HTML,Hilo HTML
 DocType: Company,Ignore,Pasar por alto
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +86,SMS sent to following numbers: {0},SMS enviados a los teléfonos: {0}
-apps/erpnext/erpnext/controllers/buying_controller.py +135,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,El almacén del proveedor es necesario para compras sub-contratadas
+apps/erpnext/erpnext/controllers/buying_controller.py +126,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,El almacén del proveedor es necesario para compras sub-contratadas
 DocType: Pricing Rule,Valid From,Válido desde
 DocType: Sales Invoice,Total Commission,Comisión total
 DocType: Pricing Rule,Sales Partner,Socio de ventas
@@ -504,7 +480,7 @@
 DocType: Monthly Distribution,"**Monthly Distribution** helps you distribute your budget across months if you have seasonality in your business.
 
 To distribute a budget using this distribution, set this **Monthly Distribution** in the **Cost Center**","**Distribución Mensual** le ayuda a distribuir su presupuesto a través de meses si tiene periodos / temporadas en su negocio.  Para distribuir un presupuesto utilizando esta distribución, debe establecer **Distribución Mensual** en el **Centro de Costos**"
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +183,No records found in the Invoice table,No se encontraron registros en la tabla de facturas
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +130,No records found in the Invoice table,No se encontraron registros en la tabla de facturas
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +20,Please select Company and Party Type first,"Por favor, seleccione la compañía y el tipo de entidad"
 apps/erpnext/erpnext/config/accounts.py +84,Financial / accounting year.,Finanzas / Ejercicio contable.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","Lamentablemente, los numeros de serie no se puede fusionar"
@@ -512,7 +488,7 @@
 DocType: Project Task,Project Task,Tareas del proyecto
 ,Lead Id,ID de iniciativa
 DocType: C-Form Invoice Detail,Grand Total,Total
-DocType: About Us Settings,Website Manager,Administrador de Página Web
+DocType: About Us Settings,Website Manager,Administrar página web
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +34,Fiscal Year Start Date should not be greater than Fiscal Year End Date,La fecha de inicio no puede ser mayor que la fecha final del año fiscal
 DocType: Warranty Claim,Resolution,Resolución
 apps/erpnext/erpnext/templates/pages/order.html +51,Delivered: {0},Entregado: {0}
@@ -520,25 +496,25 @@
 DocType: Sales Order,Billing and Delivery Status,Estado de facturación y entrega
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Clientes recurrentes
 DocType: Leave Control Panel,Allocate,Asignar
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +16,Previous,Anterior
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard_page.html +16,Previous,Anterior
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +620,Sales Return,Devoluciones de ventas
 DocType: Production Planning Tool,Select Sales Orders from which you want to create Production Orders.,Seleccione las órdenes de venta con las cuales desea crear la orden de producción.
 DocType: Item,Delivered by Supplier (Drop Ship),Entregado por el Proveedor (nave)
 apps/erpnext/erpnext/config/hr.py +120,Salary components.,Componentes salariales
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,Base de datos de clientes potenciales.
+DocType: Authorization Rule,Customer or Item,Cliente o artículo
 apps/erpnext/erpnext/config/crm.py +17,Customer database.,Base de datos de clientes.
 DocType: Quotation,Quotation To,Cotización para
 DocType: Lead,Middle Income,Ingreso medio
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),Apertura (Cred)
 apps/erpnext/erpnext/accounts/utils.py +193,Allocated amount can not be negative,Monto asignado no puede ser negativo
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +123,Tumbling,Tumbling
 DocType: Purchase Order Item,Billed Amt,Monto facturado
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,Un almacén lógico por el cual se hacen las entradas de existencia.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +92,Reference No & Reference Date is required for {0},Se requiere de No. de referencia y fecha para {0}
 DocType: Event,Wednesday,Miércoles
 DocType: Sales Invoice,Customer's Vendor,Agente de ventas
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +214,Production Order is Mandatory,La orden de producción es obligatoria
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +139,Proposal Writing,Redacción de propuestas
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,Proposal Writing,Redacción de propuestas
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,Existe otro vendedor {0} con el mismo ID de empleado
 apps/erpnext/erpnext/stock/stock_ledger.py +336,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},Error de stock negativo ( {6} ) para el producto {0} en Almacén {1} en {2} {3} en {4} {5}
 DocType: Fiscal Year Company,Fiscal Year Company,Año fiscal de la compañía
@@ -561,7 +537,7 @@
 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.","Luego las reglas de precios son filtradas por cliente, categoría de cliente, territorio, proveedor, tipo de proveedor, campaña, socio de ventas, etc."
 apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.py +179,Please install dropbox python module,"Por favor, instale el módulo python dropbox"
 DocType: Employee,Passport Number,Número de pasaporte
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +82,Manager,Gerente
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Manager,Gerente
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +494,From Purchase Receipt,Desde recibo de compra
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +219,Same item has been entered multiple times.,Este artículo se ha introducido varias veces.
 DocType: SMS Settings,Receiver Parameter,Configuración de receptor(es)
@@ -569,10 +545,9 @@
 DocType: Sales Person,Sales Person Targets,Objetivos de ventas del vendedor
 apps/frappe/frappe/public/js/frappe/form/workflow.js +116,To,a
 apps/frappe/frappe/templates/base.html +145,Please enter email address,"Por favor, introduzca la dirección de correo electrónico (Email)"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +35,End tube forming,Fin tubo formando
 DocType: Production Order Operation,In minutes,En minutos
 DocType: Issue,Resolution Date,Fecha de resolución
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +635,Please set default Cash or Bank account in Mode of Payment {0},"Por favor, defina la cuenta de bancos o caja predeterminados en el método de pago {0}"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +637,Please set default Cash or Bank account in Mode of Payment {0},"Por favor, defina la cuenta de bancos o caja predeterminados en el método de pago {0}"
 DocType: Selling Settings,Customer Naming By,Ordenar cliente por
 apps/erpnext/erpnext/accounts/doctype/account/account.js +67,Convert to Group,Convertir a grupo
 DocType: Activity Cost,Activity Type,Tipo de Actividad
@@ -580,12 +555,12 @@
 DocType: Customer,Fixed Days,Días fijos
 DocType: Sales Invoice,Packing List,Lista de embalaje
 apps/erpnext/erpnext/config/buying.py +28,Purchase Orders given to Suppliers.,Órdenes de compra enviadas a los proveedores.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +43,Publishing,Publicación
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +43,Publishing,Publicación
 DocType: Activity Cost,Projects User,Usuario de proyectos
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Consumed,Consumido
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +198,{0}: {1} not found in Invoice Details table,{0}: {1} no se encuentra en el detalle de la factura
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,{0}: {1} not found in Invoice Details table,{0}: {1} no se encuentra en el detalle de la factura
 DocType: Company,Round Off Cost Center,Centro de costos por defecto (redondeo)
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +208,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,La visita de mantenimiento {0} debe ser cancelada antes de cancelar la orden de ventas
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +203,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,La visita de mantenimiento {0} debe ser cancelada antes de cancelar la orden de ventas
 DocType: Material Request,Material Transfer,Transferencia de material
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +56,Opening (Dr),Apertura (Deb)
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},Fecha y hora de contabilización deberá ser posterior a {0}
@@ -597,7 +572,6 @@
 DocType: Pricing Rule,Sales Manager,Gerente de ventas
 apps/frappe/frappe/public/js/frappe/model/model.js +492,Rename,Renombrar
 DocType: Journal Entry,Write Off Amount,Importe de desajuste
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +52,Bending,Doblado
 apps/frappe/frappe/core/page/user_permissions/user_permissions.js +246,Allow User,Permitir al usuario
 DocType: Journal Entry,Bill No,Factura No.
 DocType: Purchase Invoice,Quarterly,Trimestral
@@ -607,29 +581,27 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Please enter item details,"Por favor, ingrese los detalles del producto"
 DocType: Purchase Receipt,Other Details,Otros detalles
 DocType: Account,Accounts,Contabilidad
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +67,Marketing,Marketing
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +65,Straight shearing,Troquelado
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +67,Marketing,Marketing
 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.,Para rastrear artículo en ventas y documentos de compra en base a sus nn serie. Esto se puede también utilizar para rastrear información sobre la garantía del producto.
 DocType: Purchase Receipt Item Supplied,Current Stock,Inventario actual
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +99,Rejected Warehouse is mandatory against regected item,Almacén rechazado es obligatorio para el producto rechazado
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +102,Rejected Warehouse is mandatory against regected item,Almacén rechazado es obligatorio para el producto rechazado
 DocType: Account,Expenses Included In Valuation,GASTOS DE VALORACIÓN
 DocType: Employee,Provide email id registered in company,Proporcione el correo electrónico registrado en la compañía
 DocType: Hub Settings,Seller City,Ciudad de vendedor
 DocType: Email Digest,Next email will be sent on:,El siguiente correo electrónico será enviado el:
 DocType: Offer Letter Term,Offer Letter Term,Términos de carta de oferta
-apps/erpnext/erpnext/stock/doctype/item/item.py +492,Item has variants.,El producto tiene variantes.
+apps/erpnext/erpnext/stock/doctype/item/item.py +496,Item has variants.,El producto tiene variantes.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Elemento {0} no encontrado
 DocType: Bin,Stock Value,Valor de Inventarios
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,Tipo de árbol
 DocType: BOM Explosion Item,Qty Consumed Per Unit,Cantidad consumida por unidad
-DocType: Serial No,Warranty Expiry Date,Fecha de caducidad de la Garantía
+DocType: Serial No,Warranty Expiry Date,Fecha de caducidad de la garantía
 DocType: Material Request Item,Quantity and Warehouse,Cantidad y almacén
 DocType: Sales Invoice,Commission Rate (%),Porcentaje de comisión (%)
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +172,"Against Voucher Type must be one of Sales Order, Sales Invoice or Journal Entry","El tipo de comprobante debe pertenecer a orden de venta, factura de venta o registro de diario"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +139,Biomachining,Biomachining
 apps/erpnext/erpnext/setup/utils.py +89,Unable to find exchange rate,No se puede encontrar el tipo de cambio
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +7,Aerospace,Aeroespacial
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +19,Welcome,Bienvenido
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +7,Aerospace,Aeroespacial
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +40,Welcome,Bienvenido
 DocType: Journal Entry,Credit Card Entry,Ingreso de tarjeta de crédito
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +18,Task Subject,Asunto de tarea
 apps/erpnext/erpnext/config/stock.py +33,Goods received from Suppliers.,Productos recibidos de proveedores.
@@ -652,19 +624,19 @@
 DocType: Employee,Cell Number,Número de movil
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Perdído
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +120,You can not enter current voucher in 'Against Journal Entry' column,Usted no puede ingresar Comprobante Actual en la comumna 'Contra Contrada de Diario'
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +25,Energy,Energía
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,Energía
 DocType: Opportunity,Opportunity From,Oportunidad desde
 apps/erpnext/erpnext/config/hr.py +33,Monthly salary statement.,Nómina mensual.
 DocType: Item Group,Website Specifications,Especificaciones del sitio web
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +205,New Account,Nueva cuenta
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +21,{0}: From {0} of type {1},{0}: Desde {0} del tipo {1}
-apps/erpnext/erpnext/controllers/buying_controller.py +283,Row {0}: Conversion Factor is mandatory,Línea {0}: El factor de conversión es obligatorio
+apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,Línea {0}: El factor de conversión es obligatorio
 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.,Los asientos contables se deben crear en las subcuentas. los asientos en 'grupos' de cuentas no están permitidos.
 DocType: ToDo,High,Alto
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +361,Cannot deactivate or cancel BOM as it is linked with other BOMs,No se puede desactivar o cancelar la 'Lista de Materiales (LdM)' si esta vinculada con otras
 DocType: Opportunity,Maintenance,Mantenimiento
 DocType: User,Male,Masculino
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +182,Purchase Receipt number required for Item {0},Se requiere el numero de recibo para el producto {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +183,Purchase Receipt number required for Item {0},Se requiere el numero de recibo para el producto {0}
 DocType: Item Attribute Value,Item Attribute Value,Atributos del producto
 apps/erpnext/erpnext/config/crm.py +64,Sales campaigns.,Campañas de venta.
 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.
@@ -712,10 +684,9 @@
 DocType: Address,Personal,Personal
 DocType: Expense Claim Detail,Expense Claim Type,Tipo de gasto
 DocType: Shopping Cart Settings,Default settings for Shopping Cart,Ajustes por defecto para carrito de compras
-apps/erpnext/erpnext/controllers/accounts_controller.py +324,"Journal Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","El asiento {0} está enlazado con la orden {1}, compruebe si debe obtenerlo por adelantado en esta factura."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +13,Biotechnology,Biotecnología
+apps/erpnext/erpnext/controllers/accounts_controller.py +325,"Journal Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","El asiento {0} está enlazado con la orden {1}, compruebe si debe obtenerlo por adelantado en esta factura."
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +13,Biotechnology,Biotecnología
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Office Maintenance Expenses,GASTOS DE MANTENIMIENTO (OFICINA)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +53,Hemming,Hemming
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +66,Please enter Item first,"Por favor, introduzca primero un producto"
 DocType: Account,Liability,Obligaciones
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +62,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Importe sancionado no puede ser mayor que el importe del reclamo en la línea {0}.
@@ -723,15 +694,15 @@
 apps/erpnext/erpnext/stock/get_item_details.py +262,Price List not selected,No ha seleccionado una lista de precios
 DocType: Employee,Family Background,Antecedentes familiares
 DocType: Process Payroll,Send Email,Enviar correo electronico
-apps/erpnext/erpnext/stock/doctype/item/item.py +108,Warning: Invalid Attachment {0},Advertencia: no válida Adjunto {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +108,Warning: Invalid Attachment {0},Advertencia! archivo adjunto no valido: {0}
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +88,No Permission,Sin permiso
 DocType: Company,Default Bank Account,Cuenta bancaria por defecto
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +47,"To filter based on Party, select Party Type first","Para filtrar en base a terceros, seleccione el tipo de entidad"
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},'Actualizar Stock' no se puede marcar porque los productos no se entregan a través de {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Nos,Nos.
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Nos,Nos.
 DocType: Item,Items with higher weightage will be shown higher,Los productos con mayor ponderación se mostraran arriba
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Detalle de conciliación bancaria
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +627,My Invoices,Mis facturas
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +629,My Invoices,Mis facturas
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,Empleado no encontrado
 DocType: Purchase Order,Stopped,Detenido.
 DocType: Item,If subcontracted to a vendor,Si es sub-contratado a un proveedor
@@ -750,35 +721,33 @@
 DocType: Features Setup,"To enable ""Point of Sale"" features",Para habilitar las características de 'Punto de Venta'
 DocType: Bin,Moving Average Rate,Porcentaje de precio medio variable
 DocType: Production Planning Tool,Select Items,Seleccionar productos
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,{0} against Bill {1} dated {2},{0} contra factura {1} de fecha ​​{2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +328,{0} against Bill {1} dated {2},{0} contra factura {1} de fecha ​​{2}
 DocType: Comment,Reference Name,Nombre de referencia
 DocType: Maintenance Visit,Completion Status,Estado de finalización
 DocType: Sales Invoice Item,Target Warehouse,Inventario estimado
 DocType: Item,Allow over delivery or receipt upto this percent,Permitir hasta este porcentaje en la entrega y/o recepción
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +49,Expected Delivery Date cannot be before Sales Order Date,La fecha prevista de entrega no puede ser anterior a la fecha de la órden de venta
 DocType: Upload Attendance,Import Attendance,Asistente de importación
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +17,All Item Groups,Todos los Grupos de Artículos
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +17,All Item Groups,Todos los Grupos de Artículos
 DocType: Process Payroll,Activity Log,Registro de Actividad
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +30,Net Profit / Loss,Utilidad / Pérdida neta
 apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,Componer automáticamente el mensaje en la presentación de las transacciones.
 DocType: Production Order,Item To Manufacture,Producto para manufactura
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +16,Permanent mold casting,Molde para fundición
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} el estado es {2}
 apps/erpnext/erpnext/config/learn.py +172,Purchase Order to Payment,Orden de compra a pago
 DocType: Sales Order Item,Projected Qty,Cantidad proyectada
 DocType: Sales Invoice,Payment Due Date,Fecha de pago
 DocType: Newsletter,Newsletter Manager,Administrador de boletínes
-apps/erpnext/erpnext/stock/doctype/item/item.js +229,Item Variant {0} already exists with same attributes,Artículo Variant {0} ya existe con los mismos atributos
+apps/erpnext/erpnext/stock/doctype/item/item.js +231,Item Variant {0} already exists with same attributes,Artículo Variant {0} ya existe con los mismos atributos
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening',&#39;Apertura&#39;
 DocType: Notification Control,Delivery Note Message,Mensaje en nota de entrega
 DocType: Expense Claim,Expenses,Gastos
 DocType: Item Variant Attribute,Item Variant Attribute,Artículo Variant Atributo
 ,Purchase Receipt Trends,Tendencias de recibos de compra
 DocType: Appraisal,Select template from which you want to get the Goals,Seleccione la plantilla con la cual desea obtener los objetivos de ventas
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +77,Research & Development,Investigación y desarrollo
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Research & Development,Investigación y desarrollo
 ,Amount to Bill,Monto a Facturar
 DocType: Company,Registration Details,Detalles de registro
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +75,Staking,Staking
 DocType: Item,Re-Order Qty,Cantidad mínima para ordenar
 DocType: Leave Block List Date,Leave Block List Date,Fecha de Lista de Bloqueo de Vacaciones
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +25,Scheduled to send to {0},Programado para enviar a: {0}
@@ -789,18 +758,16 @@
 DocType: Sales Invoice Item,Stock Details,Detalles de almacén
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Valor del proyecto
 apps/erpnext/erpnext/config/selling.py +304,Point-of-Sale,Punto de venta (POS)
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,Cannot carry forward {0},No se puede trasladar {0}
 apps/erpnext/erpnext/accounts/doctype/account/account.py +91,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","Balance de la cuenta ya en Crédito, no le está permitido establecer 'Balance Debe Ser' como 'Débito'"
 DocType: Account,Balance must be,El balance debe ser
 DocType: Hub Settings,Publish Pricing,Publicar precios
 DocType: Notification Control,Expense Claim Rejected Message,Mensaje de reembolso de gastos rechazado
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +145,Nailing,Clavado
 ,Available Qty,Cantidad Disponible
 DocType: Purchase Taxes and Charges,On Previous Row Total,Sobre la línea anterior al total
 DocType: Salary Slip,Working Days,Días de trabajo
 DocType: Serial No,Incoming Rate,Tasa entrante
 DocType: Packing Slip,Gross Weight,Peso bruto
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +410,The name of your company for which you are setting up this system.,Ingrese el nombre de la compañía para configurar el sistema.
+apps/erpnext/erpnext/public/js/setup_wizard.js +158,The name of your company for which you are setting up this system.,Ingrese el nombre de la compañía para configurar el sistema.
 DocType: HR Settings,Include holidays in Total no. of Working Days,Incluir vacaciones con el numero total de días laborables
 DocType: Job Applicant,Hold,Mantener
 DocType: Employee,Date of Joining,Fecha de ingreso
@@ -810,7 +777,6 @@
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +3,View Subscribers,Ver Suscriptores
 DocType: Purchase Invoice Item,Purchase Receipt,Recibo de compra
 ,Received Items To Be Billed,Recepciones por facturar
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +114,Abrasive blasting,Chorro abrasivo
 DocType: Employee,Ms,Sra.
 apps/erpnext/erpnext/config/accounts.py +148,Currency exchange rate master.,Configuración principal para el cambio de divisas
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +253,Unable to find Time Slot in the next {0} days for Operation {1},Incapaz de encontrar la ranura de tiempo en los próximos {0} días para la operación {1}
@@ -822,7 +788,7 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +209,Serial No {0} does not belong to Item {1},Número de serie {0} no pertenece al producto {1}
 DocType: Purchase Receipt Item Supplied,Required Qty,Cant. Solicitada
 DocType: Bank Reconciliation,Total Amount,Importe total
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +32,Internet Publishing,Publicación por internet
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,Publicación por internet
 DocType: Production Planning Tool,Production Orders,Órdenes de producción
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +35,Balance Value,Valor de balance
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,Lista de precios para la venta
@@ -833,7 +799,7 @@
 DocType: Supplier,Default Payable Accounts,Cuentas por pagar por defecto
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,El empleado {0} no está activo o no existe
 DocType: Features Setup,Item Barcode,Código de barras del producto
-apps/erpnext/erpnext/stock/doctype/item/item.py +487,Item Variants {0} updated,{0} variantes actualizadas del producto
+apps/erpnext/erpnext/stock/doctype/item/item.py +491,Item Variants {0} updated,{0} variantes actualizadas del producto
 DocType: Quality Inspection Reading,Reading 6,Lectura 6
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Factura de compra anticipada
 DocType: Address,Shop,Tienda.
@@ -842,7 +808,7 @@
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,La cuenta de Banco / Efectivo por defecto se actualizará automáticamente en la factura del POS cuando seleccione este 'modelo'
 DocType: Employee,Permanent Address Is,La dirección permanente es
 DocType: Production Order Operation,Operation completed for how many finished goods?,Se completo la operación para la cantidad de productos terminados?
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +491,The Brand,La marca
+apps/erpnext/erpnext/public/js/setup_wizard.js +237,The Brand,La marca
 apps/erpnext/erpnext/controllers/status_updater.py +163,Allowance for over-{0} crossed for Item {1}.,Previsión por exceso de {0} cruzado para el punto {1}.
 DocType: Employee,Exit Interview Details,Detalles de Entrevista de Salida
 DocType: Item,Is Purchase Item,Es un producto para compra
@@ -862,16 +828,16 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Indirect Income,Ingresos indirectos
 DocType: Payment Tool,Set Payment Amount = Outstanding Amount,Establecer el importe de pago = pago pendiente
 DocType: Contact Us Settings,Address Line 1,Dirección línea 1
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Variance,Variación
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +392,Company Name,Nombre de compañía
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +53,Variance,Variación
+,Company Name,Nombre de compañía
 DocType: SMS Center,Total Message(s),Total Mensage(s)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +515,Select Item for Transfer,Seleccione el producto a transferir
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +538,Select Item for Transfer,Seleccione el producto a transferir
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,Ver una lista de todos los vídeos de ayuda
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,Seleccione la cuenta principal de banco donde los cheques fueron depositados.
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,Permitir al usuario editar la lista de precios en las transacciones
 DocType: Pricing Rule,Max Qty,Cantidad máxima
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +106,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Línea {0}: El pago para la compra/venta siempre debe estar marcado como anticipo
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +16,Chemical,Químico
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,Químico
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +693,All items have already been transferred for this Production Order.,Todos los artículos ya han sido transferidos para esta Orden de Producción.
 DocType: Process Payroll,Select Payroll Year and Month,"Seleccione la nómina, año y mes"
 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""","Ir al grupo apropiado, usualmente (Aplicación de Fondos> Activo Circulante> Cuentas Bancarias) y crear una nueva cuenta haciendo clic en Añadir hijo del tipo ""Banco"""
@@ -882,12 +848,12 @@
 DocType: Item,Inspection Criteria,Criterios de inspección
 apps/erpnext/erpnext/config/accounts.py +101,Tree of finanial Cost Centers.,Árbol de centros de costos financieros.
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,Transferido
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +492,Upload your letter head and logo. (you can edit them later).,Cargue su membrete y el logotipo. (Estos pueden editarse más tarde).
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +156,White,Blanco
+apps/erpnext/erpnext/public/js/setup_wizard.js +238,Upload your letter head and logo. (you can edit them later).,Cargue su membrete y el logotipo. (Estos pueden editarse más tarde).
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,White,Blanco
 DocType: SMS Center,All Lead (Open),Todas las Oportunidades (Abiertas)
 DocType: Purchase Invoice,Get Advances Paid,Obtener anticipos pagados
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +362,Attach Your Picture,Adjunte su fotografía
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Make ,Crear
+apps/erpnext/erpnext/public/js/setup_wizard.js +112,Attach Your Picture,Adjunte su fotografía
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +540,Make ,Crear
 DocType: Journal Entry,Total Amount in Words,Importe total en letras
 DocType: Workflow State,Stop,Detener
 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.,"Ha ocurrido un error. Una razón probable es que usted no ha guardado el formulario. Por favor, póngase en contacto con support@erpnext.com si el problema persiste."
@@ -896,14 +862,13 @@
 DocType: Lead,Next Contact Date,Siguiente fecha de contacto
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,Cant. de apertura
 DocType: Holiday List,Holiday List Name,Nombre de festividad
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +168,Stock Options,Opciones de stock
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +168,Stock Options,Opciones de stock
 DocType: Journal Entry Account,Expense Claim,Reembolso de gastos
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +181,Qty for {0},Cantidad de {0}
 DocType: Leave Application,Leave Application,Solicitud de ausencia
 apps/erpnext/erpnext/config/hr.py +77,Leave Allocation Tool,Herramienta de asignación de vacaciones
 DocType: Leave Block List,Leave Block List Dates,Fechas de Lista de Bloqueo de Vacaciones
 DocType: Company,If Monthly Budget Exceeded (for expense account),Si Presupuesto Mensual excedido (por cuenta de gastos)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +56,Trimming,Recortar
 DocType: Workstation,Net Hour Rate,Tasa neta por hora
 DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,Recibo sobre costos de destino estimados
 DocType: Company,Default Terms,Términos / Condiciones predeterminados
@@ -911,13 +876,12 @@
 DocType: POS Profile,Cash/Bank Account,Cuenta de caja / banco
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,Removed items with no change in quantity or value.,Elementos eliminados que no han sido afectados en cantidad y valor
 DocType: Delivery Note,Delivery To,Entregar a
-apps/erpnext/erpnext/stock/doctype/item/item.py +509,Attribute table is mandatory,Tabla de atributos es obligatorio
+apps/erpnext/erpnext/stock/doctype/item/item.py +513,Attribute table is mandatory,Tabla de atributos es obligatorio
 DocType: Production Planning Tool,Get Sales Orders,Obtener ordenes de venta
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} no puede ser negativo
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +103,Filing,Presentación
 apps/erpnext/erpnext/templates/form_grid/item_grid.html +72,Discount,Descuento
 DocType: Features Setup,Purchase Discounts,Descuento sobre compras
-DocType: Workstation,Wages,Salario.
+DocType: Workstation,Wages,Salario
 DocType: Time Log,Will be updated only if Time Log is 'Billable',Se actualizara solo si la gestión de tiempos puede facturarse
 DocType: Project,Internal,Interno
 DocType: Task,Urgent,Urgente
@@ -931,15 +895,16 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +112,You are the Expense Approver for this record. Please Update the 'Status' and Save,"Usted es el supervisor de gastos para este registro. Por favor, actualice el estado y guarde"
 DocType: Serial No,Creation Document No,Creación del documento No
 DocType: Issue,Issue,Asunto
+apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account does not match with Company,Cuenta no coincide con la Compañía
 apps/erpnext/erpnext/config/stock.py +136,"Attributes for Item Variants. e.g Size, Color etc.","Atributos para  Elementos variables. por ejemplo, tamaño, color, etc."
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +39,WIP Warehouse,WIP Almacén
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +39,WIP Warehouse,Almacén de trabajos en proceso
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +194,Serial No {0} is under maintenance contract upto {1},Número de serie {0} tiene un contrato de mantenimiento hasta {1}
 DocType: BOM Operation,Operation,Operación
 DocType: Lead,Organization Name,Nombre de la organización
 DocType: Tax Rule,Shipping State,Estado de envío
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,El producto debe ser agregado utilizando el botón 'Obtener productos desde recibos de compra'
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,Gastos de venta
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Buying,Compra estándar
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +120,Standard Buying,Compra estándar
 DocType: GL Entry,Against,Contra
 DocType: Item,Default Selling Cost Center,Centro de costos por defecto
 DocType: Sales Partner,Implementation Partner,Socio de implementación
@@ -960,29 +925,29 @@
 DocType: Time Log Batch,updated via Time Logs,actualizada a través de la gestión de tiempos
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,Edad Promedio
 DocType: Opportunity,Your sales person who will contact the customer in future,Indique la persona de ventas que se pondrá en contacto posteriormente con el cliente
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +588,List a few of your suppliers. They could be organizations or individuals.,Enumere algunos de sus proveedores. Pueden ser organizaciones o individuos.
+apps/erpnext/erpnext/public/js/setup_wizard.js +326,List a few of your suppliers. They could be organizations or individuals.,Enumere algunos de sus proveedores. Pueden ser organizaciones o individuos.
 DocType: Company,Default Currency,Divisa / modena predeterminada
 DocType: Contact,Enter designation of this Contact,Introduzca el puesto de este contacto
 DocType: Contact Us Settings,Address,Dirección
 DocType: Expense Claim,From Employee,Desde Empleado
-apps/erpnext/erpnext/controllers/accounts_controller.py +338,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Advertencia : El sistema no comprobará sobrefacturación desde monto para el punto {0} en {1} es cero
+apps/erpnext/erpnext/controllers/accounts_controller.py +339,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Advertencia: El sistema no comprobará la sobrefacturación si la cantidad del producto {0} en {1} es cero
 DocType: Journal Entry,Make Difference Entry,Crear una entrada con una diferencia
 DocType: Upload Attendance,Attendance From Date,Asistencia desde fecha
 DocType: Appraisal Template Goal,Key Performance Area,Área Clave de Rendimiento
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +54,Transportation,Transporte
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +54,Transportation,Transporte
 apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +67, and year: ,y año:
 DocType: Email Digest,Annual Expense,Gasto anual
 DocType: SMS Center,Total Characters,Total Caracteres 
-apps/erpnext/erpnext/controllers/buying_controller.py +139,Please select BOM in BOM field for Item {0},"Por favor, seleccione la lista de materiales (LdM) para el producto {0}"
+apps/erpnext/erpnext/controllers/buying_controller.py +130,Please select BOM in BOM field for Item {0},"Por favor, seleccione la lista de materiales (LdM) para el producto {0}"
 DocType: C-Form Invoice Detail,C-Form Invoice Detail,Detalle C -Form Factura
 DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,Factura para reconciliación de pago
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +32,Contribution %,Margen %
 DocType: Item,website page link,el vínculo web
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +192,Let's prepare the system for first use.,Se esta preparando el sistema para el primer uso.
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +242,Let's prepare the system for first use.,Se esta preparando el sistema para el primer uso.
 DocType: Company,Company registration numbers for your reference. Tax numbers etc.,"Los números de registro de la compañía para su referencia. Números fiscales, etc"
 DocType: Sales Partner,Distributor,Distribuidor
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Reglas de envio para el carrito de compras
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +214,Production Order {0} must be cancelled before cancelling this Sales Order,La orden de producción {0} debe ser cancelada antes de cancelar esta orden ventas
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +209,Production Order {0} must be cancelled before cancelling this Sales Order,La orden de producción {0} debe ser cancelada antes de cancelar esta orden ventas
 ,Ordered Items To Be Billed,Ordenes por facturar
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +24,From Range has to be less than To Range,De Gama tiene que ser menor que en nuestra gama
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +21,Select Time Logs and Submit to create a new Sales Invoice.,Seleccione la gestión de tiempos y valide para crear una nueva factura de ventas.
@@ -1002,35 +967,32 @@
 DocType: Sales Invoice Advance,Sales Invoice Advance,Factura de ventas anticipada
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +398,Nothing to request,Nada que solicitar
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date','Fecha de Inicio' no puede ser mayor que 'Fecha Final'
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +75,Management,Gerencia
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +75,Management,Gerencia
 apps/erpnext/erpnext/config/projects.py +33,Types of activities for Time Sheets,Tipos de actividades para las Fichas de Tiempo
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +14,Investment casting,Fundición de precisión
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +51,Either debit or credit amount is required for {0},Se requiere cuenta de débito o crédito para {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""","Esto se añade al código del producto y la variante. Por ejemplo, si su abreviatura es ""SM"", y el código del artículo es ""CAMISETA"", entonces el código de artículo de la variante será ""CAMISETA-SM"""
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,Pago neto (en palabras) será visible una vez que guarde la nómina salarial.
 apps/frappe/frappe/core/doctype/user/user_list.js +12,Active,Activo
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +154,Blue,Azul
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +154,Blue,Azul
 DocType: Purchase Invoice,Is Return,Es un retorno
 DocType: Price List Country,Price List Country,Lista de precios del país
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +123,Further nodes can be only created under 'Group' type nodes,Sólo se pueden crear más nodos bajo nodos de tipo  ' Grupo '
-DocType: Item,UOMs,Unidades de medida
+DocType: Item,UOMs,UdM
 apps/erpnext/erpnext/stock/utils.py +167,{0} valid serial nos for Item {1},{0} No. de serie válidos para el producto {1}
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +57,Item Code cannot be changed for Serial No.,El código del producto no se puede cambiar por un número de serie
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +22,POS Profile {0} already created for user: {1} and company {2},Perfil de POS {0} ya esta creado para el usuario: {1} en la compañía {2}
 DocType: Purchase Order Item,UOM Conversion Factor,Factor de Conversión de Unidad de Medida
 DocType: Stock Settings,Default Item Group,Grupo de artículos predeterminado 
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +156,Laminated object manufacturing,Fabricación de objetos laminados
 apps/erpnext/erpnext/config/buying.py +13,Supplier database.,Base de datos de proveedores.
 DocType: Account,Balance Sheet,Hoja de balance
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +561,Cost Center For Item with Item Code ',Centro de costos para el producto con código '
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +45,Stretch forming,Stretch forming
 DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,El vendedor recibirá un aviso en esta fecha para ponerse en contacto con el cliente
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +210,"Further accounts can be made under Groups, but entries can be made against non-Groups","Las futuras cuentas se pueden crear bajo grupos, pero las entradas se crearán dentro de las subcuentas."
 apps/erpnext/erpnext/config/hr.py +125,Tax and other salary deductions.,Impuestos y otras deducciones salariales
 DocType: Lead,Lead,Iniciativa
 DocType: Email Digest,Payables,Cuentas por pagar
 DocType: Account,Warehouse,Almacén
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +90,Row #{0}: Rejected Qty can not be entered in Purchase Return,Línea # {0}: La cantidad rechazada no se puede introducir en el campo 'retorno de compras'
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +93,Row #{0}: Rejected Qty can not be entered in Purchase Return,Línea # {0}: La cantidad rechazada no se puede introducir en el campo 'retorno de compras'
 ,Purchase Order Items To Be Billed,Ordenes de compra por pagar
 DocType: Purchase Invoice Item,Net Rate,Precio neto
 DocType: Purchase Invoice Item,Purchase Invoice Item,Factura de compra del producto
@@ -1045,24 +1007,24 @@
 DocType: Global Defaults,Current Fiscal Year,Año fiscal actual
 DocType: Global Defaults,Disable Rounded Total,Desactivar redondeo
 DocType: Lead,Call,Llamada
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +384,'Entries' cannot be empty,Las entradas no pueden estar vacías
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +386,'Entries' cannot be empty,Las entradas no pueden estar vacías
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},Línea {0} duplicada con igual {1}
 ,Trial Balance,Balanza de comprobación
 apps/erpnext/erpnext/config/hr.py +205,Setting up Employees,Configuración de empleados
 apps/erpnext/erpnext/public/js/feature_setup.js +220,"Grid ""","Matriz """
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +150,Please select prefix first,"Por favor, seleccione primero el prefijo"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +138,Research,Investigación
-DocType: Maintenance Visit Purpose,Work Done,Trabajo Realizado
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +138,Research,Investigación
+DocType: Maintenance Visit Purpose,Work Done,Trabajo realizado
 apps/erpnext/erpnext/controllers/item_variant.py +25,Please specify at least one attribute in the Attributes table,"Por favor, especifique al menos un atributo en la tabla"
 DocType: Contact,User ID,ID de usuario
 DocType: Communication,Sent,Enviado.
 apps/erpnext/erpnext/accounts/doctype/account/account.js +57,View Ledger,Mostrar libro mayor
 DocType: File,Lft,Izquierda-
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Primeras
-apps/erpnext/erpnext/stock/doctype/item/item.py +394,"An Item Group exists with same name, please change the item name or rename the item group","Existe un grupo de elementos con el mismo nombre , por favor, cambie el nombre del artículo , o cambiar el nombre del grupo de artículos"
+apps/erpnext/erpnext/stock/doctype/item/item.py +398,"An Item Group exists with same name, please change the item name or rename the item group","Existe un grupo de elementos con el mismo nombre , por favor, cambie el nombre del artículo , o cambiar el nombre del grupo de artículos"
 DocType: Communication,Delivery Status,Estado del envío
 DocType: Production Order,Manufacture against Sales Order,Manufacturar para pedido de ventas
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +517,Rest Of The World,Resto del mundo
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +455,Rest Of The World,Resto del mundo
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,El producto {0} no puede contener lotes
 ,Budget Variance Report,Variación de Presupuesto
 DocType: Salary Slip,Gross Pay,Pago bruto
@@ -1073,13 +1035,11 @@
 DocType: BOM Item,Item Description,Descripción del producto
 DocType: Payment Tool,Payment Mode,Método de pago
 DocType: Purchase Invoice,Is Recurring,Es recurrente
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +154,Direct metal laser sintering,De metal sinterizado por láser directo
 DocType: Purchase Order,Supplied Items,Productos suministrados
 DocType: Production Order,Qty To Manufacture,Cantidad para producción
 DocType: Buying Settings,Maintain same rate throughout purchase cycle,Mantener los mismos precios durante el ciclo de compras
 DocType: Opportunity Item,Opportunity Item,Oportunidad Artículo
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +61,Temporary Opening,Apertura temporal
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +41,Cryorolling,Cryorolling
 ,Employee Leave Balance,Balance de ausencias de empleado
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +128,Balance for Account {0} must always be {1},Balance de cuenta {0} debe ser siempre {1}
 DocType: Address,Address Type,Tipo de dirección
@@ -1095,23 +1055,23 @@
 DocType: Journal Entry,Get Outstanding Invoices,Obtener facturas pendientes de pago
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,Orden de venta {0} no es válida
 apps/erpnext/erpnext/setup/doctype/company/company.py +172,"Sorry, companies cannot be merged","Lamentablemente, las compañías no se pueden combinar"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +145,Small,Pequeño
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Small,Pequeño
 DocType: Employee,Employee Number,Número de empleado
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},El numero de caso ya se encuentra en uso. Intente {0}
 ,Invoiced Amount (Exculsive Tax),Cantidad facturada (Impuesto excluido)
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,Elemento 2
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +59,Account head {0} created,Cuenta matriz {0} creada
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +153,Green,Verde
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Green,Verde
 DocType: Item,Auto re-order,Ordenar automáticamente 
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +57,Total Achieved,Total Conseguido
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +59,Total Achieved,Total Conseguido
 DocType: Employee,Place of Issue,Lugar de emisión.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +59,Contract,Contrato
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Contract,Contrato
 DocType: Report,Disabled,Deshabilitado
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +490,UOM coversion factor required for UOM: {0} in Item: {1},Factor de conversion de la Unidad de Medida requerido para la Unidad de Medida {0} en el artículo: {1}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +83,Indirect Expenses,Egresos indirectos
 apps/erpnext/erpnext/controllers/selling_controller.py +163,Row {0}: Qty is mandatory,Línea {0}: La cantidad es obligatoria
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +8,Agriculture,Agricultura
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +611,Your Products or Services,Los productos o servicios
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,Agricultura
+apps/erpnext/erpnext/public/js/setup_wizard.js +347,Your Products or Services,Los productos o servicios
 DocType: Mode of Payment,Mode of Payment,Método de pago
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,Este es un grupo principal y no se puede editar.
 DocType: Journal Entry Account,Purchase Order,Órden de compra (OC)
@@ -1123,7 +1083,7 @@
 DocType: Serial No,Serial No Details,Detalles del numero de serie
 DocType: Purchase Invoice Item,Item Tax Rate,Tasa de impuesto del producto
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +113,"For {0}, only credit accounts can be linked against another debit entry","Para {0}, sólo las cuentas de crédito se pueden vincular con un asiento de débito"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Delivery Note {0} is not submitted,La nota de entrega {0} no está validada
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +470,Delivery Note {0} is not submitted,La nota de entrega {0} no está validada
 apps/erpnext/erpnext/stock/get_item_details.py +136,Item {0} must be a Sub-contracted Item,El elemento: {0} debe ser un producto sub-contratado
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,BIENES DE CAPITAL
 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.","La 'regla precios' es seleccionada primero basada en el campo 'Aplicar En' que puede ser un artículo, grupo de artículos o marca."
@@ -1133,7 +1093,7 @@
 DocType: Appraisal Goal,Goal,Meta/Objetivo
 DocType: Sales Invoice Item,Edit Description,Editar descripción
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +318,Expected Delivery Date is lesser than Planned Start Date.,La fecha prevista de entrega es menor que la fecha de inicio planeada.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +579,For Supplier,De proveedor
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +602,For Supplier,De proveedor
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,Al configurar el tipo de cuenta facilitará la seleccion de la misma en las transacciones
 DocType: Purchase Invoice,Grand Total (Company Currency),Suma total (Divisa por defecto)
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,Total Saliente
@@ -1146,7 +1106,7 @@
 DocType: Purchase Invoice,Total (Company Currency),Total (Divisa por defecto)
 apps/erpnext/erpnext/stock/utils.py +162,Serial number {0} entered more than once,Número de serie {0} ha sido ingresado mas de una vez
 DocType: Journal Entry,Journal Entry,Asiento contable
-DocType: Workstation,Workstation Name,Nombre de la Estación de Trabajo
+DocType: Workstation,Workstation Name,Nombre de la estación de trabajo
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,Enviar boletín:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +432,BOM {0} does not belong to Item {1},La lista de materiales (LdM) {0} no pertenece al producto {1}
 DocType: Sales Partner,Target Distribution,Distribución del objetivo
@@ -1158,11 +1118,11 @@
 DocType: Sales Partner,Agent,Agente
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +74,"Total {0} for all items is zero, may you should change 'Distribute Charges Based On'","El total de {0} productos es cero, usted debe cambiar la opción 'Distribuir cargos basados en'"
 DocType: Purchase Invoice,Taxes and Charges Calculation,Cálculo de impuestos y cargos
-DocType: BOM Operation,Workstation,Puesto de Trabajo
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +112,Hardware,Hardware
+DocType: BOM Operation,Workstation,Puesto de trabajo
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +112,Hardware,Hardware
 DocType: Attendance,HR Manager,Gerente de recursos humanos (RRHH)
 apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,"Por favor, seleccione la compañía"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +50,Privilege Leave,Vacaciones
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +50,Privilege Leave,Vacaciones
 DocType: Purchase Invoice,Supplier Invoice Date,Fecha de factura de proveedor
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +79,You need to enable Shopping Cart,Necesita habilitar el carito de compras
 apps/frappe/frappe/public/js/frappe/form/grid_body.html +6,No Data,No hay datos
@@ -1175,7 +1135,7 @@
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +81,Overlapping conditions found between:,Condiciones traslapadas entre:
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +168,Against Journal Entry {0} is already adjusted against some other voucher,El asiento contable {0} ya se encuentra ajustado contra el importe de otro comprobante
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +68,Total Order Value,Valor Total del Pedido
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +38,Food,Comida
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +38,Food,Comida
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Rango de antigüedad 3
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +139,You can make a time log only against a submitted production order,Usted puede crear una gestión de tiempos para una orden de producción
 DocType: Maintenance Schedule Item,No of Visits,No. de visitas
@@ -1195,6 +1155,7 @@
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,View Offer Letter,Ver oferta Carta
 DocType: Communication,Communication,Comunicaciones
 DocType: Item,Is Service Item,Es un servicio
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +81,Application period cannot be outside leave allocation period,Período de aplicación no puede ser período de asignación licencia fuera
 DocType: Activity Cost,Projects,Proyectos
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +31,Please select Fiscal Year,"Por favor, seleccione el año fiscal"
 apps/erpnext/erpnext/controllers/buying_controller.py +23,From {0} | {1} {2},Desde {0} | {1} {2}
@@ -1213,7 +1174,7 @@
 DocType: Item,Maintain Stock,Mantener stock
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +213,Stock Entries already created for Production Order ,Las entradas de stock ya fueron creadas para el numero de producción
 DocType: Leave Control Panel,Leave blank if considered for all designations,Dejar en blanco si es considerado para todos los puestos
-apps/erpnext/erpnext/controllers/accounts_controller.py +499,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Cambiar a tipo 'Actual' en la línea {0} no puede ser incluido en el precio
+apps/erpnext/erpnext/controllers/accounts_controller.py +500,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Cambiar a tipo 'Actual' en la línea {0} no puede ser incluido en el precio
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,Max: {0},Máximo: {0}
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +16,From Datetime,A partir de fecha y hora
 DocType: Email Digest,For Company,Para la empresa
@@ -1223,7 +1184,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +50,Chart of Accounts,Plan de cuentas
 DocType: Material Request,Terms and Conditions Content,Contenido de los términos y condiciones
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +471,cannot be greater than 100,No puede ser mayor de 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +546,Item {0} is not a stock Item,El producto {0} no es un producto de stock
+apps/erpnext/erpnext/stock/doctype/item/item.py +550,Item {0} is not a stock Item,El producto {0} no es un producto de stock
 DocType: Maintenance Visit,Unscheduled,Sin programación
 DocType: Employee,Owned,Propiedad
 DocType: Salary Slip Deduction,Depends on Leave Without Pay,Depende de licencia sin goce de salario
@@ -1231,36 +1192,34 @@
 ,Purchase Invoice Trends,Tendencias de compras
 DocType: Employee,Better Prospects,Mejores Prospectos
 DocType: Appraisal,Goals,Objetivos
-DocType: Warranty Claim,Warranty / AMC Status,Garantía / AMC Estado
+DocType: Warranty Claim,Warranty / AMC Status,Garantía / Estado de CMA
 ,Accounts Browser,Navegador de Cuentas
 DocType: GL Entry,GL Entry,Entrada GL
 DocType: HR Settings,Employee Settings,Configuración de empleado
 ,Batch-Wise Balance History,Historial de saldo por lotes
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +72,To Do List,Tareas por hacer
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +63,Apprentice,Aprendiz
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Apprentice,Aprendiz
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +99,Negative Quantity is not allowed,No se permiten cantidades negativas
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
 Used for Taxes and Charges","la tabla de detalle de impuestos se obtiene del producto principal como una cadena y es guardado en este campo, este es usado para los impuestos y cargos."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +61,Lancing,Lancing
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +151,Employee cannot report to himself.,El empleado no puede informar a sí mismo.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Si la cuenta está congelado, las entradas estarán permitidas a los usuarios restringidos."
 DocType: Email Digest,Bank Balance,Saldo bancario
-apps/erpnext/erpnext/controllers/accounts_controller.py +435,Accounting Entry for {0}: {1} can only be made in currency: {2},El asiento contable para {0}: {1} sólo puede hacerse con la divisa: {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +436,Accounting Entry for {0}: {1} can only be made in currency: {2},El asiento contable para {0}: {1} sólo puede hacerse con la divisa: {2}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +38,No active Salary Structure found for employee {0} and the month,No Estructura Salarial activo que se encuentra para el empleado {0} y el mes
 DocType: Job Opening,"Job profile, qualifications required etc.","Perfil laboral, las cualificaciones necesarias, etc"
 DocType: Journal Entry Account,Account Balance,Balance de la cuenta
 apps/erpnext/erpnext/config/accounts.py +112,Tax Rule for transactions.,Regla de impuestos para las transacciones.
 DocType: Rename Tool,Type of document to rename.,Indique el tipo de documento que desea cambiar de nombre.
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +630,We buy this Item,Compramos este artículo
+apps/erpnext/erpnext/public/js/setup_wizard.js +366,We buy this Item,Compramos este producto
 DocType: Address,Billing,Facturación
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +77,Flanging,Flanger
 DocType: Bulk Email,Not Sent,No enviado
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +73,Explosive forming,Formación explosiva
 DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),Total impuestos y cargos (Divisa por defecto)
 DocType: Shipping Rule,Shipping Account,Cuenta de envíos
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +43,Scheduled to send to {0} recipients,Programado para enviar a {0} destinatarios.
 DocType: Quality Inspection,Readings,Lecturas
 DocType: Stock Entry,Total Additional Costs,Total de costos adicionales
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Sub Assemblies,Sub-Ensamblajes
+apps/erpnext/erpnext/public/js/setup_wizard.js +359,Sub Assemblies,Sub-Ensamblajes
 DocType: Shipping Rule Condition,To Value,Para el valor
 DocType: Supplier,Stock Manager,Gerente de almacén
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +143,Source warehouse is mandatory for row {0},El almacén de origen es obligatorio para la línea {0}
@@ -1269,45 +1228,43 @@
 apps/erpnext/erpnext/config/setup.py +110,Setup SMS gateway settings,Configuración de pasarela SMS
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,¡Importación fallida!
 apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,No se ha añadido ninguna dirección
-DocType: Workstation Working Hour,Workstation Working Hour,Horario de la Estación de Trabajo
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +83,Analyst,Analista
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +202,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Línea {0}: La cantidad asignada {1} debe ser menor o igual al importe en comprobante de diario {2}
+DocType: Workstation Working Hour,Workstation Working Hour,Horario de la estación de trabajo
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Analyst,Analista
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +149,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Línea {0}: La cantidad asignada {1} debe ser menor o igual al importe en comprobante de diario {2}
 DocType: Item,Inventory,inventario
 DocType: Features Setup,"To enable ""Point of Sale"" view",Para habilitar la vista de 'Punto de Venta'
 apps/erpnext/erpnext/public/js/pos/pos.js +402,Payment cannot be made for empty cart,No se puede realizar un pago con el carrito de compras vacío
 DocType: Item,Sales Details,Detalles de ventas
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +149,Pinning,Fijación
 DocType: Opportunity,With Items,Con productos
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,En cantidad
 DocType: Notification Control,Expense Claim Rejected,Reembolso de gastos rechazado
 DocType: Sales Invoice,"The date on which next invoice will be generated. It is generated on submit.
 ",Fecha en que se generará próxima factura. Es generada al validar.
 DocType: Item Attribute,Item Attribute,Atributos del producto
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +105,Government,Gubernamental
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Government,Gubernamental
 apps/erpnext/erpnext/config/stock.py +268,Item Variants,Variantes del producto
 DocType: Company,Services,Servicios
 apps/erpnext/erpnext/accounts/report/financial_statements.py +147,Total ({0}),Total ({0})
 DocType: Cost Center,Parent Cost Center,Centro de costos principal
 DocType: Sales Invoice,Source,Referencia
 DocType: Leave Type,Is Leave Without Pay,Es una ausencia sin goce de salario
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +186,No records found in the Payment table,No se encontraron registros en la tabla de pagos
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +405,Financial Year Start Date,Inicio del ejercicio contable
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +133,No records found in the Payment table,No se encontraron registros en la tabla de pagos
+apps/erpnext/erpnext/public/js/setup_wizard.js +153,Financial Year Start Date,Inicio del ejercicio contable
 DocType: Employee External Work History,Total Experience,Experiencia total
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +100,Countersinking,Avellanado
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +271,Packing Slip(s) cancelled,Lista(s) de embalaje cancelada(s)
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +276,Packing Slip(s) cancelled,Lista(s) de embalaje cancelada(s)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,CARGOS DE TRANSITO Y TRANSPORTE
 DocType: Material Request Item,Sales Order No,Orden de venta No.
 DocType: Item Group,Item Group Name,Nombre del grupo de productos
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +50,Taken,Tomado
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,Tomado
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +66,Transfer Materials for Manufacture,Transferir materiales para producción
 DocType: Pricing Rule,For Price List,Por lista de precios
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +27,Executive Search,Búsqueda de ejecutivos
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,Búsqueda de ejecutivos
 apps/erpnext/erpnext/stock/stock_ledger.py +405,"Purchase rate for item: {0} not found, which is required to book accounting entry (expense). Please mention item price against a buying price list.","La tarifa de compra para el producto: {0} no se encuentra, este se requiere para reservar la entrada contable (gastos). Por favor, indique el precio del artículo en una 'lista de precios' de compra."
 DocType: Maintenance Schedule,Schedules,Programas
 DocType: Purchase Invoice Item,Net Amount,Importe Neto
 DocType: Purchase Order Item Supplied,BOM Detail No,Detalles de Lista de materiales (LdM) No.
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),Monto adicional de descuento (Divisa por defecto)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +537,Error: {0} > {1},Error: {0} > {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +541,Error: {0} > {1},Error: {0} > {1}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,"Por favor, cree una nueva cuenta en el plan general de contabilidad."
 DocType: Maintenance Visit,Maintenance Visit,Visita de mantenimiento
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer > Customer Group > Territory,Cliente> Categoría de cliente> Territorio
@@ -1318,7 +1275,6 @@
 DocType: Event,Tuesday,Martes
 DocType: Leave Block List,Block Holidays on important days.,Bloquear vacaciones en días importantes.
 ,Accounts Receivable Summary,Balance de cuentas por cobrar
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +43,Leaves for type {0} already allocated for Employee {1} for period {2} - {3},Hojas para el tipo {0} ya asignado para Empleado {1} para el período {2} - {3}
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +187,Please set User ID field in an Employee record to set Employee Role,"Por favor, seleccione el ID y el nombre del empleado para establecer el rol."
 DocType: UOM,UOM Name,Nombre de la unidad de medida (UdM)
 DocType: Top Bar Item,Target,Objetivo
@@ -1330,15 +1286,14 @@
 DocType: ToDo,Due Date,Fecha de vencimiento
 DocType: Sales Invoice Item,Brand Name,Marca
 DocType: Purchase Receipt,Transporter Details,Detalles de transporte
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Box,Caja
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +389,The Organization,Organización
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Box,Caja
+apps/erpnext/erpnext/public/js/setup_wizard.js +137,The Organization,Organización
 DocType: Monthly Distribution,Monthly Distribution,Distribución mensual
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,"La lista de receptores se encuentra vacía. Por favor, cree una lista de receptores"
 DocType: Production Plan Sales Order,Production Plan Sales Order,Plan de producción de ordenes de venta
 DocType: Sales Partner,Sales Partner Target,Metas de socio de ventas
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},El asiento contable para {0} sólo puede hacerse con la divisa: {1}
 DocType: Pricing Rule,Pricing Rule,Regla de precios
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +58,Notching,Muescas
 apps/erpnext/erpnext/config/learn.py +167,Material Request to Purchase Order,Requisición de materiales hacia órden de compra
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +74,Row # {0}: Returned Item {1} does not exists in {2} {3},Línea # {0}: El artículo devuelto {1} no existe en {2} {3}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,Bancos
@@ -1355,20 +1310,19 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Amounts not reflected in bank,Monto no reflejado en banco
 DocType: Quality Inspection Reading,Reading 4,Lectura 4
 apps/erpnext/erpnext/config/hr.py +23,Claims for company expense.,Peticiones para gastos de compañía
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +8,Centrifugal casting,Fundición centrífuga
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +119,Magnetic field-assisted finishing,Acabado asistido por campo magnético
 DocType: Company,Default Holiday List,Lista de vacaciones / festividades predeterminadas
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +165,Stock Liabilities,Inventarios por pagar
 DocType: Purchase Receipt,Supplier Warehouse,Almacén del proveedor
 DocType: Opportunity,Contact Mobile No,No. móvil de contacto
 DocType: Production Planning Tool,Select Sales Orders,Seleccione órdenes de ventas
 ,Material Requests for which Supplier Quotations are not created,Requisición de materiales sin documento de cotización
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +117,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,El día (s) en el que está solicitando la licencia son los días festivos. Usted no necesita solicitar la excedencia.
 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.,Para realizar un seguimiento de elementos mediante código de barras. Usted será capaz de entrar en los elementos de la nota de entrega y la factura de venta mediante el escaneo de código de barras del artículo.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +477,Mark as Delivered,Marcar como Entregado
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +497,Mark as Delivered,Marcar como Entregado
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +34,Make Quotation,Crear una cotización
 DocType: Dependent Task,Dependent Task,Tarea dependiente
-apps/erpnext/erpnext/stock/doctype/item/item.py +306,Conversion factor for default Unit of Measure must be 1 in row {0},El factor de conversión de la unidad de medida (UdM) en la línea {0} debe ser 1
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,Leave of type {0} cannot be longer than {1},Ausencia del tipo {0} no puede tener más de {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +310,Conversion factor for default Unit of Measure must be 1 in row {0},El factor de conversión de la unidad de medida (UdM) en la línea {0} debe ser 1
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +155,Leave of type {0} cannot be longer than {1},Ausencia del tipo {0} no puede tener más de {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Procure planear las operaciones con XX días de antelación.
 DocType: HR Settings,Stop Birthday Reminders,Detener recordatorios de cumpleaños.
 DocType: SMS Center,Receiver List,Lista de receptores
@@ -1376,15 +1330,14 @@
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Monto consumido
 apps/erpnext/erpnext/public/js/pos/pos.js +491,{0} View,Ver {0}
 DocType: Salary Structure Deduction,Salary Structure Deduction,Deducciones de la estructura salarial
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +158,Selective laser sintering,Sinterización selectiva por láser
-apps/erpnext/erpnext/stock/doctype/item/item.py +301,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Unidad de Medida (UdM) {0} se ha introducido más de una vez en la tabla de factores de conversión
+apps/erpnext/erpnext/stock/doctype/item/item.py +305,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Unidad de Medida (UdM) {0} se ha introducido más de una vez en la tabla de factores de conversión
 apps/frappe/frappe/core/page/data_import_tool/data_import_tool.js +108,Import Successful!,¡Importación Exitosa!
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Costo de productos entregados
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +185,Quantity must not be more than {0},La cantidad no debe ser más de {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +41,Age (Days),Edad (días)
 DocType: Quotation Item,Quotation Item,Cotización del producto
 DocType: Account,Account Name,Nombre de la Cuenta
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +41,From Date cannot be greater than To Date,La fecha 'Desde' no puede ser mayor que la fecha 'Hasta'
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +34,From Date cannot be greater than To Date,La fecha 'Desde' no puede ser mayor que la fecha 'Hasta'
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +194,Serial No {0} quantity {1} cannot be a fraction,"Número de serie {0}, la cantidad {1} no puede ser una fracción"
 apps/erpnext/erpnext/config/buying.py +59,Supplier Type master.,Categorías principales de proveedores.
 DocType: Purchase Order Item,Supplier Part Number,Número de pieza del proveedor.
@@ -1393,14 +1346,14 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +247,{0} {1} is cancelled or stopped,{0} {1} está cancelado o detenido
 DocType: Accounts Settings,Credit Controller,Controlador de créditos
 DocType: Delivery Note,Vehicle Dispatch Date,Fecha de despacho de vehículo
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +197,Purchase Receipt {0} is not submitted,El recibo de compra {0} no esta validado
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +198,Purchase Receipt {0} is not submitted,El recibo de compra {0} no esta validado
 DocType: Company,Default Payable Account,Cuenta por pagar por defecto
 apps/erpnext/erpnext/config/website.py +13,"Settings for online shopping cart such as shipping rules, price list etc.","Ajustes para las compras online, normas de envío, lista de precios, etc."
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +660,Setup Complete,Configuración completa.
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +124,Setup Complete,Configuración completa.
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +65,{0}% Billed,{0}% Facturado
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +17,Reserved Qty,Cant. Reservada
 DocType: Party Account,Party Account,Cuenta asignada
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +74,Human Resources,Recursos humanos
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +74,Human Resources,Recursos humanos
 DocType: Lead,Upper Income,Ingresos superior
 DocType: Journal Entry Account,Debit in Company Currency,Divisa por defecto de la cuenta de débito
 apps/erpnext/erpnext/support/doctype/issue/issue.py +58,My Issues,Mis asuntos
@@ -1409,11 +1362,9 @@
 DocType: Company,Default Values,Valores predeterminados
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +236,Row {0}: Payment amount can not be negative,Línea {0}: El importe pagado no puede ser negativo
 DocType: Expense Claim,Total Amount Reimbursed,Monto total reembolsado
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +152,Press fitting,Press apropiado
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +64,Against Supplier Invoice {0} dated {1},Contra factura de proveedor {0} con fecha{1}
 DocType: Customer,Default Price List,Lista de precios por defecto
 DocType: Payment Reconciliation,Payments,Pagos.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +24,Hot isostatic pressing,Prensado isostático en caliente
 DocType: ToDo,Medium,Medio
 DocType: Budget Detail,Budget Allocated,Presupuesto asignado
 DocType: Journal Entry,Entry Type,Tipo de entrada
@@ -1426,9 +1377,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +56,None of the items have any change in quantity or value.,Ninguno de los productos tiene cambios en el valor o en la existencias.
 DocType: Warranty Claim,Warranty Claim,Reclamación de garantía
 ,Lead Details,Detalle de Iniciativas
-DocType: Authorization Rule,Approving User,Usuario que permite aprobar
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +37,Forging,Forjando
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +126,Plating,Enchapado
 DocType: Purchase Invoice,End date of current invoice's period,Fecha final del periodo de facturación actual
 DocType: Pricing Rule,Applicable For,Aplicable para.
 DocType: Bank Reconciliation,From Date,Desde la fecha
@@ -1450,47 +1398,45 @@
 DocType: Sales Invoice,Paid Amount (Company Currency),Monto pagado (Divisa por defecto)
 DocType: Purchase Invoice,Additional Discount,Descuento adicional
 DocType: Selling Settings,Selling Settings,Configuración de ventas
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +39,Online Auctions,Subastas en línea
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,Subastas en línea
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +94,Please specify either Quantity or Valuation Rate or both,"Por favor indique la Cantidad o el Tipo de Valoración, o ambos"
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +50,"Company, Month and Fiscal Year is mandatory","Compañía, mes y año fiscal son obligatorios"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Marketing Expenses,GASTOS DE PUBLICIDAD
 ,Item Shortage Report,Reporte de productos con stock bajo
-apps/erpnext/erpnext/stock/doctype/item/item.js +183,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Se menciona Peso, \n ¡Por favor indique ""Peso Unidad de Medida"" también"
+apps/erpnext/erpnext/stock/doctype/item/item.js +185,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","El peso está definido,\nPor favor indique ""UDM Peso"" también"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,Requisición de materiales usados para crear este movimiento de inventario
 apps/erpnext/erpnext/config/support.py +43,Single unit of an Item.,Elemento de producto
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +212,Time Log Batch {0} must be 'Submitted',El lote de gestión de tiempos {0} debe estar validado
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,Crear un asiento contable para cada movimiento de stock
 DocType: Leave Allocation,Total Leaves Allocated,Total de ausencias asigandas
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +384,Warehouse required at Row No {0},Almacén requerido en la fila n {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +386,Warehouse required at Row No {0},El almacén es requerido en la línea # {0}
 DocType: Employee,Date Of Retirement,Fecha de jubilación
 DocType: Upload Attendance,Get Template,Obtener plantilla
 DocType: Address,Postal,Postal
-DocType: Item,Weightage,Coeficiente de ponderación
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +159,Mining,Minería
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +17,Resin casting,Resina de colada
+DocType: Item,Weightage,Asignación
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"Existe una categoría de cliente con el mismo nombre, por favor cambie el nombre del cliente o cambie el nombre de la categoría"
 apps/erpnext/erpnext/public/js/pos/pos.js +147,Please select {0} first.,"Por favor, seleccione primero {0}."
 apps/erpnext/erpnext/templates/pages/order.html +57,text {0},texto {0}
 DocType: Territory,Parent Territory,Territorio principal
 DocType: Quality Inspection Reading,Reading 2,Lectura 2
 DocType: Stock Entry,Material Receipt,Recepción de materiales
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +622,Products,Productos
+apps/erpnext/erpnext/public/js/setup_wizard.js +358,Products,Productos
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +47,Party Type and Party is required for Receivable / Payable account {0},El tipo de entidad y tercero/s son requeridos para las cuentas de cobrar/pagar {0}
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.","Si este producto tiene variantes, entonces no podrá ser seleccionado en los pedidos de venta, etc."
 DocType: Lead,Next Contact By,Siguiente contacto por
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +215,Quantity required for Item {0} in row {1},Cantidad requerida para el producto {0} en la línea {1}
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +85,Warehouse {0} can not be deleted as quantity exists for Item {1},Almacén {0} no se puede eliminar mientras exista cantidad de artículo {1}
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +85,Warehouse {0} can not be deleted as quantity exists for Item {1},El almacén {0} no se puede eliminar ya que existen elementos: {1}
 DocType: Quotation,Order Type,Tipo de orden
 DocType: Purchase Invoice,Notification Email Address,Email para las notificaciones.
 DocType: Payment Tool,Find Invoices to Match,Facturas a conciliar
 ,Item-wise Sales Register,Detalle de ventas
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +399,"e.g. ""XYZ National Bank""","por ejemplo ""Banco Nacional XYZ"""
+apps/erpnext/erpnext/public/js/setup_wizard.js +147,"e.g. ""XYZ National Bank""","por ejemplo ""Banco Nacional XYZ"""
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,¿Está incluido este impuesto en el precio base?
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +57,Total Target,Total meta / objetivo
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Target,Total meta / objetivo
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.js +22,Shopping Cart is enabled,Carrito de compras habilitado
 DocType: Job Applicant,Applicant for a Job,Solicitante de Empleo
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +173,No Production Orders created,No existen órdenes de producción (OP)
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +131,Salary Slip of employee {0} already created for this month,la nómina salarial para el empleado {0}  ya se ha creado para este mes
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +140,Salary Slip of employee {0} already created for this month,la nómina salarial para el empleado {0}  ya se ha creado para este mes
 DocType: Stock Reconciliation,Reconciliation JSON,Reconciliación JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Hay demasiadas columnas. Exportar el informe e imprimirlo mediante una aplicación de hoja de cálculo.
 DocType: Sales Invoice Item,Batch No,Lote No.
@@ -1500,19 +1446,19 @@
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +13,Variant,Variante
 apps/frappe/frappe/public/js/frappe/form/toolbar.js +165,New {0},Nuevo/a: {0}
 DocType: Naming Series,Set prefix for numbering series on your transactions,Establezca los prefijos de las numeraciones en sus transacciones
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +169,Stopped order cannot be cancelled. Unstop to cancel.,"Una orden detenida no puede ser cancelada, debe continuarla antes de cancelar."
-apps/erpnext/erpnext/stock/doctype/item/item.py +323,Default BOM ({0}) must be active for this item or its template,La lista de materiales (LdM) por defecto ({0}) debe estar activa para este producto o plantilla
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +164,Stopped order cannot be cancelled. Unstop to cancel.,"Una orden detenida no puede ser cancelada, debe continuarla antes de cancelar."
+apps/erpnext/erpnext/stock/doctype/item/item.py +327,Default BOM ({0}) must be active for this item or its template,La lista de materiales (LdM) por defecto ({0}) debe estar activa para este producto o plantilla
 DocType: Employee,Leave Encashed?,Vacaciones pagadas?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,El campo 'oportunidad desde' es obligatorio
 DocType: Item,Variants,Variantes
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +458,Make Purchase Order,Crear órden de Compra
 DocType: SMS Center,Send To,Enviar a.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +111,There is not enough leave balance for Leave Type {0},No hay suficiente días para las ausencias del tipo: {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +127,There is not enough leave balance for Leave Type {0},No hay suficiente días para las ausencias del tipo: {0}
 DocType: Sales Team,Contribution to Net Total,Contribución neta total
 DocType: Sales Invoice Item,Customer's Item Code,Código del producto para clientes
 DocType: Stock Reconciliation,Stock Reconciliation,Reconciliación de inventarios
 DocType: Territory,Territory Name,Nombre Territorio
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +152,Work-in-Progress Warehouse is required before Submit,Se requiere un Almacen de Trabajo en Proceso antes de Enviar
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +152,Work-in-Progress Warehouse is required before Submit,Se requiere un almacén de trabajos en proceso antes de validar
 apps/erpnext/erpnext/config/hr.py +43,Applicant for a Job.,Solicitante de empleo .
 DocType: Purchase Order Item,Warehouse and Reference,Almacén y referencias
 DocType: Supplier,Statutory info and other general information about your Supplier,Información legal u otra información general acerca de su proveedor
@@ -1544,11 +1490,11 @@
 DocType: Sales Order Item,Actual Qty,Cantidad Real
 DocType: Sales Invoice Item,References,Referencias
 DocType: Quality Inspection Reading,Reading 10,Lectura 10
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +612,"List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start.","Enumere algunos de los productos o servicios que usted compra y/o vende. Asegúrese de revisar el grupo del artículo, la unidad de medida (UdM) y demás propiedades."
+apps/erpnext/erpnext/public/js/setup_wizard.js +348,"List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start.","Enumere algunos de los productos o servicios que usted compra y/o vende. Asegúrese de revisar el grupo del artículo, la unidad de medida (UdM) y demás propiedades."
 DocType: Hub Settings,Hub Node,Nodo del centro de actividades
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,Ha introducido elementos duplicados . Por favor rectifique y vuelva a intentarlo .
 apps/erpnext/erpnext/controllers/item_variant.py +65,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values,Valor {0} para el atributo {1} no existe en la lista de artículo válida Atributo Valores
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +87,Associate,Asociado
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Associate,Asociado
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +46,Item {0} is not a serialized Item,El producto {0} no es un producto serializado
 DocType: SMS Center,Create Receiver List,Crear lista de receptores
 apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +5,Expired,Expirado
@@ -1557,7 +1503,7 @@
 DocType: Warranty Claim,Issue Date,Fecha de emisión
 DocType: Activity Cost,Activity Cost,Costo de Actividad
 DocType: Purchase Receipt Item Supplied,Consumed Qty,Cantidad consumida
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +52,Telecommunications,Telecomunicaciones
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +52,Telecommunications,Telecomunicaciones
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),Indica que el paquete es una parte de esta entrega (Sólo borradores)
 DocType: Payment Tool,Make Payment Entry,Registrar pago
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +119,Quantity for Item {0} must be less than {1},La cantidad del producto {0} debe ser menor que {1}
@@ -1574,10 +1520,8 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +37,"Selling must be checked, if Applicable For is selected as {0}","'Ventas' debe ser seleccionada, si la opción: 'Aplicable para' esta seleccionado como {0}"
 DocType: Purchase Order Item,Supplier Quotation Item,Producto de la cotización del proveedor
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +27,Make Salary Structure,Crear estructura salarial
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +54,Shearing,Esquilar
 DocType: Item,Has Variants,Posee variantes
 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.,"Clic en el botón ""Crear factura de venta"" para crearla."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +166,Packaging and labeling,Empacado y etiquetado
 DocType: Monthly Distribution,Name of the Monthly Distribution,Defina el nombre de la distribución mensual
 DocType: Sales Person,Parent Sales Person,Persona encargada de ventas
 apps/erpnext/erpnext/setup/utils.py +14,Please specify Default Currency in Company Master and Global Defaults,"Por favor, especifíque la divisa por defecto en la compañía principal y los valores predeterminados globales"
@@ -1588,19 +1532,18 @@
 DocType: Budget Detail,Fiscal Year,Año fiscal
 DocType: Cost Center,Budget,Presupuesto
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +41,"Budget cannot be assigned against {0}, as it's not an Income or Expense account","El presupuesto no se puede asignar contra {0}, ya que no es una cuenta de ingresos o gastos"
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Achieved,Alcanzado
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,Alcanzado
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +65,Territory / Customer,Localidad / Cliente
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,e.g. 5,por ejemplo 5
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +207,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},Línea {0}: la cantidad asignada {1} debe ser menor o igual al importe pendiente de factura {2}
+apps/erpnext/erpnext/public/js/setup_wizard.js +294,e.g. 5,por ejemplo 5
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},Línea {0}: la cantidad asignada {1} debe ser menor o igual al importe pendiente de factura {2}
 DocType: Sales Invoice,In Words will be visible once you save the Sales Invoice.,En palabras serán visibles una vez que guarde la factura de venta.
 DocType: Item,Is Sales Item,Es un producto para venta
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,Árbol de productos
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,"El producto {0} no está configurado para utilizar Números de Serie, por favor revise el artículo maestro"
 DocType: Maintenance Visit,Maintenance Time,Tiempo del mantenimiento
 ,Amount to Deliver,Cantidad para envío
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +620,A Product or Service,Un Producto o Servicio
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +158,There were errors.,Hubo errores .
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +101,Tapping,Tapping
+apps/erpnext/erpnext/public/js/setup_wizard.js +356,A Product or Service,Un Producto o Servicio
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +146,There were errors.,Hubo errores .
 DocType: Naming Series,Current Value,Valor actual
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +171,{0} created,{0} creado
 DocType: Delivery Note Item,Against Sales Order,Contra la orden de venta
@@ -1614,7 +1557,7 @@
 apps/erpnext/erpnext/accounts/party.py +275,Due Date cannot be before Posting Date,La fecha de vencimiento no puede ser anterior a la fecha de contabilización
 DocType: Website Item Group,Website Item Group,Grupo de productos en el sitio web
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Duties and Taxes,IMPUESTOS Y ARANCELES
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Please enter Reference date,"Por favor, introduzca la fecha de referencia"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +312,Please enter Reference date,"Por favor, introduzca la fecha de referencia"
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} registros de pago no se pueden filtrar por {1}
 DocType: Item Website Specification,Table for Item that will be shown in Web Site,la tabla del producto que se mosatrara en el sitio Web
 DocType: Purchase Order Item Supplied,Supplied Qty,Cant. Suministrada
@@ -1622,7 +1565,7 @@
 apps/erpnext/erpnext/config/stock.py +103,Tree of Item Groups.,Árbol de las categorías de producto
 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,No se puede referenciar a una línea mayor o igual al numero de línea actual.
 ,Item-wise Purchase History,Historial de Compras
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +152,Red,Rojo
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Red,Rojo
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +228,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},"Por favor, haga clic en 'Generar planificación' para obtener el no. de serie del producto {0}"
 DocType: Account,Frozen,Congelado(a)
 ,Open Production Orders,Ordenes de producción abiertas
@@ -1637,7 +1580,7 @@
 DocType: Item Attribute,Attribute Name,Nombre del Atributo
 apps/erpnext/erpnext/controllers/selling_controller.py +236,Item {0} must be Sales or Service Item in {1},El producto {0} debe ser un servicio o producto para la venta {1}
 DocType: Item Group,Show In Website,Mostrar en el sitio web
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +621,Group,Grupo
+apps/erpnext/erpnext/public/js/setup_wizard.js +357,Group,Grupo
 DocType: Task,Expected Time (in hours),Tiempo previsto (en horas)
 ,Qty to Order,Cantidad a solicitar
 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","Para realizar el seguimiento de la 'marca' en los documentos: nota de entrega, oportunidad, solicitud de materiales, productos, de órdenes de compra, recibo de compra, comprobante de compra, cotización, factura de venta, paquete de productos, órdenes de venta y número de serie."
@@ -1647,6 +1590,7 @@
 DocType: Features Setup,Brands,Marcas
 DocType: C-Form Invoice Detail,Invoice No,Factura No.
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +480,From Purchase Order,Desde órden de compra
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +92,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Deja no puede aplicarse / cancelada antes de {0}, como balance de la licencia ya ha sido remitido equipaje en el futuro registro de asignación de permiso {1}"
 DocType: Activity Cost,Costing Rate,Costo calculado
 ,Customer Addresses And Contacts,Direcciones de clientes y contactos
 DocType: Employee,Resignation Letter Date,Fecha de carta de renuncia
@@ -1654,35 +1598,31 @@
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +137,Not Set,No especificado
 DocType: Communication,Date,Fecha
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,Ingresos de clientes recurrentes
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +651,Sit tight while your system is being setup. This may take a few moments.,Tome asiento mientras el sistema está siendo configurado. Esto puede tomar unos minutos.
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +115,Sit tight while your system is being setup. This may take a few moments.,Tome asiento mientras el sistema está siendo configurado. Esto puede tomar unos minutos.
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +51,{0} ({1}) must have role 'Expense Approver',{0} ({1}) debe tener el rol de 'Supervisor de gastos'
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Pair,Par
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Pair,Par
 DocType: Bank Reconciliation Detail,Against Account,Contra la cuenta
 DocType: Maintenance Schedule Detail,Actual Date,Fecha Real
 DocType: Item,Has Batch No,Posee numero de lote
 DocType: Delivery Note,Excise Page Number,Número Impuestos Especiales Página
 DocType: Employee,Personal Details,Datos personales
 ,Maintenance Schedules,Programas de mantenimiento
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +44,Embossing,Troquelado
 ,Quotation Trends,Tendencias de cotizaciones
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +139,Item Group not mentioned in item master for item {0},El grupo del artículo no se menciona en producto maestro para el elemento {0}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +302,Debit To account must be a Receivable account,La cuenta 'Debitar a' debe ser una cuenta por cobrar
-apps/erpnext/erpnext/stock/doctype/item/item.py +310,"As Production Order can be made for this item, it must be a stock item.","Puede haber una Orden de Producción por este concepto , debe ser un elemento del Inventario."
 DocType: Shipping Rule Condition,Shipping Amount,Monto de envío
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +140,Joining,Unión
-DocType: Authorization Rule,Above Value,Valor máximo
 ,Pending Amount,Monto pendiente
 DocType: Purchase Invoice Item,Conversion Factor,Factor de conversión
 DocType: Purchase Order,Delivered,Enviado
 apps/erpnext/erpnext/config/hr.py +160,Setup incoming server for jobs email id. (e.g. jobs@example.com),Configuración del servidor de correo entrante corporativo. (por ejemplo jobs@example.com )
 DocType: Purchase Receipt,Vehicle Number,Número de vehículos
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,Fecha en que la factura recurrente es detenida
+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,Total de hojas asignadas {0} no puede ser inferior a las hojas ya aprobados {1} para el período
 DocType: Journal Entry,Accounts Receivable,Cuentas por cobrar
 ,Supplier-Wise Sales Analytics,Análisis de ventas (Proveedores)
 DocType: Address Template,This format is used if country specific format is not found,Este formato será utilizado para todos los documentos si no se encuentra un formato específico para el país.
 DocType: Custom Field,Custom,Personalizar
 DocType: Production Order,Use Multi-Level BOM,Utilizar Lista de Materiales (LdM)  Multi-Nivel
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +26,Injection molding,Inyección de plásticos
 DocType: Bank Reconciliation,Include Reconciled Entries,Incluir las entradas conciliadas
 apps/erpnext/erpnext/config/accounts.py +41,Tree of finanial accounts.,Árbol de cuentas financieras
 DocType: Leave Control Panel,Leave blank if considered for all employee types,Dejar en blanco si es considerada para todos los tipos de empleados
@@ -1692,30 +1632,28 @@
 apps/frappe/frappe/config/setup.py +130,Printing,Impresión
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +114,Expense Claim is pending approval. Only the Expense Approver can update status.,El reembolso de gastos estará pendiente de aprobación. Sólo el supervisor de gastos puede actualizar el estado.
 DocType: Purchase Invoice,Additional Discount Amount,Monto adicional de descuento
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +99,The day(s) on which you are applying for leave are holiday. You need not apply for leave.,"Los día(s) para los cuales usted esta aplicando la ausencia son días festivos, usted no necesita realizar una solicitud de permiso/vacaciones/ausencias."
 apps/frappe/frappe/public/js/frappe/misc/utils.js +110,and,y
 DocType: Leave Block List Allow,Leave Block List Allow,Permitir Lista de Bloqueo de Vacaciones
 apps/erpnext/erpnext/setup/doctype/company/company.py +236,Abbr can not be blank or space,La abreviatura no puede estar en blanco o usar espacios
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +50,Sports,Deportes
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,Deportes
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Actual,Total Actual
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Unit,Unidad(es)
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Unit,Unidad(es)
 apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.py +182,Please set Dropbox access keys in your site config,"Por favor, establezca las llaves de acceso de Dropbox en la configuración de su sistema"
 apps/erpnext/erpnext/stock/get_item_details.py +113,Please specify Company,"Por favor, especifique la compañía"
 ,Customer Acquisition and Loyalty,Compras y Lealtad de Clientes
-DocType: Purchase Receipt,Warehouse where you are maintaining stock of rejected items,Almacén en el que está manteniendo un balance de los artículos rechazados
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +408,Your financial year ends on,El año financiero finaliza el
+DocType: Purchase Receipt,Warehouse where you are maintaining stock of rejected items,Almacén en el cual se envian los productos rechazados
+apps/erpnext/erpnext/public/js/setup_wizard.js +156,Your financial year ends on,El año financiero finaliza el
 DocType: POS Profile,Price List,Lista de precios
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +20,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,"{0} es ahora el año fiscal predeterminado. Por favor, actualice su navegador para que el cambio surta efecto."
 apps/erpnext/erpnext/projects/doctype/project/project.js +47,Expense Claims,Reembolsos de gastos
 DocType: Issue,Support,Soporte
-DocType: Authorization Rule,Approving Role,Rol que permite aprobaciones
 ,BOM Search,Buscar listas de materiales (LdM)
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +176,Closing (Opening + Totals),Cierre (Apertura + Totales)
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +26,Please specify currency in Company,"Por favor, especifique la divisa en la compañía"
 DocType: Workstation,Wages per hour,Salarios por hora
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},El balance de Inventario en el lote {0} se convertirá en negativo {1} para el producto {2} en el almacén {3}
 apps/erpnext/erpnext/config/setup.py +83,"Show / Hide features like Serial Nos, POS etc.","Mostrar / Ocultar las características como numeros de serie, POS, etc"
-apps/erpnext/erpnext/controllers/accounts_controller.py +236,Account {0} is invalid. Account Currency must be {1},La cuenta {0} no es válida. la divisa debe ser {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +237,Account {0} is invalid. Account Currency must be {1},La cuenta {0} no es válida. la divisa debe ser {1}
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +34,UOM Conversion factor is required in row {0},El factor de conversión de la (UdM) es requerido en la línea {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +53,Clearance date cannot be before check date in row {0},"La fecha de liquidación no puede ser inferior a la fecha de verificación, línea {0}"
 DocType: Salary Slip,Deduction,Deducción
@@ -1734,13 +1672,13 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +82,Item {0} has already been returned,El producto {0} ya ha sido devuelto
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,**Año Fiscal** representa un 'Ejercicio Financiero'. Los asientos contables y otras transacciones importantes se registran aquí.
 DocType: Opportunity,Customer / Lead Address,Dirección de cliente / oportunidad
+apps/erpnext/erpnext/stock/doctype/item/item.py +112,Warning: Invalid SSL certificate on attachment {0},Advertencia: certificado SSL no válido en el apego {0}
 DocType: Production Order Operation,Actual Operation Time,Tiempo de operación actual
 DocType: Authorization Rule,Applicable To (User),Aplicable a (Usuario)
 DocType: Purchase Taxes and Charges,Deduct,Deducir
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +170,Job Description,Descripción del trabajo
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +170,Job Description,Descripción del trabajo
 DocType: Purchase Order Item,Qty as per Stock UOM,Cantidad de acuerdo a la unidad de medida (UdM) de stock
 apps/frappe/frappe/model/rename_doc.py +343,Please select a valid csv file with data,"Por favor, seleccione un archivo csv con datos válidos"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +92,Coating,Revestimiento
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +126,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series",Caracteres especiales excepto '-'  '.' '#' y '/' no permitido en las secuencias e identificadores
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Lleve un registro de las campañas de venta. Lleve un registro de conductores, Citas, pedidos de venta, etc de Campañas para medir retorno de la inversión. "
 DocType: Expense Claim,Approver,Supervisor
@@ -1750,12 +1688,11 @@
 DocType: Supplier Quotation,Manufacturing Manager,Gerente de producción
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},Número de serie {0} está en garantía hasta {1}
 apps/erpnext/erpnext/config/stock.py +69,Split Delivery Note into packages.,Dividir nota de entrega entre paquetes.
-apps/erpnext/erpnext/hooks.py +84,Shipments,Envíos
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +29,Dip molding,Moldeo por inmersión
+apps/erpnext/erpnext/hooks.py +68,Shipments,Envíos
 DocType: Purchase Order,To be delivered to customer,Para ser entregado al cliente
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,La gestión de tiempos debe estar validada.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,El número de serie {0} no pertenece a ningún almacén
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +650,Setting Up,Configurando
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +114,Setting Up,Configurando
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,Row # ,Línea #
 DocType: Purchase Invoice,In Words (Company Currency),En palabras (Divisa por defecto)
 DocType: Pricing Rule,Supplier,Proveedor
@@ -1763,7 +1700,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +105,Miscellaneous Expenses,GASTOS VARIOS
 DocType: Global Defaults,Default Company,Compañía predeterminada
 apps/erpnext/erpnext/controllers/stock_controller.py +166,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,"Una cuenta de gastos o de diiferencia es obligatoria para el producto: {0} , ya que impacta el valor del stock"
-apps/erpnext/erpnext/controllers/accounts_controller.py +354,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","No se puede sobre-facturar el producto {0} más de {2} en la línea {1}. Para permitir la sobre-facturación, necesita configurarlo en las opciones de stock"
+apps/erpnext/erpnext/controllers/accounts_controller.py +355,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","No se puede sobre-facturar el producto {0} más de {2} en la línea {1}. Para permitir la sobre-facturación, necesita configurarlo en las opciones de stock"
 DocType: Employee,Bank Name,Nombre del banco
 apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +27,-Above,-Arriba
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +135,User {0} is disabled,El usuario {0} está deshabilitado
@@ -1776,27 +1713,26 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,{0} is mandatory for Item {1},{0} es obligatorio para el producto {1}
 DocType: Currency Exchange,From Currency,Desde moneda
 DocType: DocField,Name,Nombre
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +211,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Por favor seleccione el monto asignado, tipo de factura y número en una fila"
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +104,Sales Order required for Item {0},Orden de venta requerida para el producto {0}
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +158,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Por favor seleccione el monto asignado, tipo de factura y número en una fila"
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +107,Sales Order required for Item {0},Orden de venta requerida para el producto {0}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +43,Amounts not reflected in system,Monto no reflejado en el sistema
 DocType: Purchase Invoice Item,Rate (Company Currency),Precio (Divisa por defecto)
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +40,Others,Otros
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +40,Others,Otros
 apps/erpnext/erpnext/templates/includes/product_page.js +80,Cannot find a matching Item. Please select some other value for {0}.,Si no encuentra un artículo a juego. Por favor seleccione otro valor para {0}.
 DocType: POS Profile,Taxes and Charges,Impuestos y cargos
 DocType: Item,"A Product or a Service that is bought, sold or kept in stock.","Un producto o un servicio que se compra, se vende o se mantiene en 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,No se puede seleccionar el tipo de cargo como 'Importe de línea anterior' o ' Total de línea anterior' para la primera linea
 apps/frappe/frappe/core/doctype/doctype/boilerplate/controller_list.html +31,Completed,Completado
 DocType: Web Form,Select DocType,Seleccione un 'DocType'
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +104,Broaching,Brochado
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +12,Banking,Banca
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,Banca
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +38,Please click on 'Generate Schedule' to get schedule,"Por favor, haga clic en 'Generar planificación' para obtener las tareas"
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +283,New Cost Center,Nuevo centro de costos
 DocType: Bin,Ordered Quantity,Cantidad ordenada
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +397,"e.g. ""Build tools for builders""",por ejemplo 'Herramientas para los constructores'
+apps/erpnext/erpnext/public/js/setup_wizard.js +145,"e.g. ""Build tools for builders""",por ejemplo 'Herramientas para los constructores'
 DocType: Quality Inspection,In Process,En proceso
 DocType: Authorization Rule,Itemwise Discount,Descuento de producto
 DocType: Purchase Order Item,Reference Document Type,Referencia Tipo de documento
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +318,{0} against Sales Order {1},{0} para orden de venta (OV) {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +320,{0} against Sales Order {1},{0} para orden de venta (OV) {1}
 DocType: Account,Fixed Asset,Activo Fijo
 apps/erpnext/erpnext/config/stock.py +283,Serialized Inventory,Inventario Serializado
 DocType: Activity Type,Default Billing Rate,Monto de facturación predeterminada
@@ -1811,14 +1747,13 @@
 DocType: Purchase Invoice Item,Page Break,Salto de página
 DocType: Production Order Operation,Pending,Pendiente
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,Usuarios que pueden aprobar las solicitudes de ausencia
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +33,You cannot change default UOM of Variant. To change default UOM for Variant change default UOM of the Template,"No se puede cambiar la  (UdM) por defecto de la variante. Para poder cambiarla, necesita hacerlo desde la plantilla"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +50,Office Equipments,EQUIPO DE OFICINA
 DocType: Purchase Invoice Item,Qty,Cantidad
 DocType: Fiscal Year,Companies,Compañías
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +24,Electronics,Electrónicos
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +24,Electronics,Electrónicos
 DocType: Stock Settings,Raise Material Request when stock reaches re-order level,Generar requisición de materiales cuando se alcance un nivel bajo el stock
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +18,From Maintenance Schedule,Desde programa de mantenimiento
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +56,Full-time,Jornada completa
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +56,Full-time,Jornada completa
 DocType: Purchase Invoice,Contact Details,Detalles de contacto
 DocType: C-Form,Received Date,Fecha de recepción
 DocType: Delivery Note,"If you have created a standard template in Sales Taxes and Charges Template, select one and click on the button below.","Si ha creado una plantilla estándar de los impuestos y cargos de venta, seleccione uno y haga clic en el botón de abajo."
@@ -1830,11 +1765,12 @@
 DocType: Job Applicant,Job Opening,Oportunidad de empleo
 DocType: Payment Reconciliation,Payment Reconciliation,Conciliación de pagos
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +154,Please select Incharge Person's name,"Por favor, seleccione el nombre de la persona a cargo"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +51,Technology,Tecnología
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,Tecnología
 DocType: Offer Letter,Offer Letter,Carta de oferta
 apps/erpnext/erpnext/config/manufacturing.py +51,Generate Material Requests (MRP) and Production Orders.,Generar requisición de materiales (MRP) y órdenes de producción.
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +68,Total Invoiced Amt,Monto total facturado
 DocType: Time Log,To Time,Hasta hora
+DocType: Authorization Rule,Approving Role (above authorized value),Aprobar Rol (por encima del valor autorizado)
 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.","Para agregar sub-grupos, examine el árbol y haga clic en el registro donde desea agregar los sub-registros"
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +102,Credit To account must be a Payable account,La cuenta de crédito debe pertenecer al grupo de cuentas por pagar
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +233,BOM recursion: {0} cannot be parent or child of {2},Recursividad de lista de materiales (LdM): {0} no puede ser padre o hijo de {2}
@@ -1847,10 +1783,8 @@
 DocType: Item,Customer Item Codes,Código del producto asignado por el cliente
 DocType: Opportunity,Lost Reason,Razón de la pérdida
 apps/erpnext/erpnext/config/accounts.py +68,Create Payment Entries against Orders or Invoices.,Crear entradas de pago para las órdenes o facturas.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +141,Welding,Soldadura
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +40,New Stock UOM is required,Se requiere nueva unidad de medida (UdM) para el inventario
 DocType: Quality Inspection,Sample Size,Tamaño de muestra
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +443,All items have already been invoiced,Todos los artículos que ya se han facturado
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +446,All items have already been invoiced,Todos los artículos que ya se han facturado
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',"Por favor, especifique un numero de caso válido"
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +287,Further cost centers can be made under Groups but entries can be made against non-Groups,"Los centros de costos se pueden crear bajo grupos, pero las entradas se crearán dentro de las subcuentas."
 DocType: Project,External,Externo
@@ -1862,8 +1796,7 @@
 DocType: Bin,Actual Quantity,Cantidad actual
 DocType: Shipping Rule,example: Next Day Shipping,ejemplo : Envío express
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,Numero de serie {0} no encontrado
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +563,Your Customers,Sus clientes
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +27,Compression molding,Moldeo por compresión
+apps/erpnext/erpnext/public/js/setup_wizard.js +303,Your Customers,Sus clientes
 DocType: Leave Block List Date,Block Date,Bloquear fecha
 DocType: Sales Order,Not Delivered,No entregado
 ,Bank Clearance Summary,Liquidez bancaria
@@ -1884,10 +1817,10 @@
 DocType: SMS Log,Sent To,Enviado a
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +28,Make Sales Invoice,Crear factura de venta
 DocType: Company,For Reference Only.,Sólo para referencia.
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +29,Invalid {0}: {1},No válido {0}: {1}
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +49,Invalid {0}: {1},No válido {0}: {1}
 DocType: Sales Invoice Advance,Advance Amount,Importe Anticipado
 DocType: Manufacturing Settings,Capacity Planning,Planificación de capacidad
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +49,'From Date' is required,'Desde la fecha' es requerido
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +43,'From Date' is required,'Desde la fecha' es requerido
 DocType: Journal Entry,Reference Number,Número de referencia
 DocType: Employee,Employment Details,Detalles del empleo
 DocType: Employee,New Workplace,Nuevo lugar de trabajo
@@ -1902,13 +1835,13 @@
 DocType: Serial No,Delivery Time,Tiempo de entrega
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Antigüedad basada en
 DocType: Item,End of Life,Final de vida útil
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +41,Travel,Viajes
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +41,Travel,Viajes
 DocType: Leave Block List,Allow Users,Permitir que los usuarios
 DocType: Purchase Order,Customer Mobile No,Numero de móvil de cliente
 DocType: Sales Invoice,Recurring,Recurrente
 DocType: Cost Center,Track separate Income and Expense for product verticals or divisions.,Seguimiento de Ingresos y Gastos por separado para las verticales de productos o divisiones.
 DocType: Rename Tool,Rename Tool,Herramienta para renombrar
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,Actualización de Costos
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,Actualizar costos
 DocType: Item Reorder,Item Reorder,Reabastecer producto
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +489,Transfer Material,Transferencia de Material
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Especificar las operaciones, el costo de operativo y definir un numero único de operación"
@@ -1916,7 +1849,7 @@
 DocType: Naming Series,User must always select,El usuario deberá elegir siempre
 DocType: Stock Settings,Allow Negative Stock,Permitir Inventario Negativo
 DocType: Installation Note,Installation Note,Nota de instalación
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +541,Add Taxes,Agregar impuestos
+apps/erpnext/erpnext/public/js/setup_wizard.js +283,Add Taxes,Agregar impuestos
 ,Financial Analytics,Análisis financiero
 DocType: Quality Inspection,Verified By,Verificado por
 DocType: Address,Subsidiary,Subsidiaria
@@ -1926,7 +1859,6 @@
 DocType: System Settings,In Hours,Horas
 DocType: Process Payroll,Create Salary Slip,Crear nómina salarial
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Expected balance as per bank,Importe previsto en banco
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +115,Buffing,Pulido
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Source of Funds (Liabilities),Origen de fondos (Pasivo)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +347,Quantity in row {0} ({1}) must be same as manufactured quantity {2},La cantidad en la línea {0} ({1}) debe ser la misma que la cantidad producida {2}
 DocType: Appraisal,Employee,Empleado
@@ -1943,11 +1875,11 @@
 DocType: Rename Tool,File to Rename,Archivo a renombrar
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +176,Purchse Order number required for Item {0},Se requiere el numero de orden para el producto {0}
 apps/erpnext/erpnext/public/js/controllers/transaction.js +136,Show Payments,Mostrar Pagos
-apps/erpnext/erpnext/controllers/buying_controller.py +245,Specified BOM {0} does not exist for Item {1},La solicitud de la lista de materiales (LdM) especificada: {0} no existe para el producto {1}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +202,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,El programa de mantenimiento {0} debe ser cancelado antes de cancelar esta orden de venta
+apps/erpnext/erpnext/controllers/buying_controller.py +236,Specified BOM {0} does not exist for Item {1},La solicitud de la lista de materiales (LdM) especificada: {0} no existe para el producto {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,El programa de mantenimiento {0} debe ser cancelado antes de cancelar esta orden de venta
 apps/frappe/frappe/desk/page/backups/backups.html +13,Size,Tamaño
 DocType: Notification Control,Expense Claim Approved,Reembolso de gastos aprobado
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +113,Pharmaceutical,Farmacéutico
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Pharmaceutical,Farmacéutico
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,Costo de productos comprados
 DocType: Selling Settings,Sales Order Required,Orden de venta requerida
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +30,Create Customer,Crear cliente
@@ -1957,7 +1889,6 @@
 DocType: Quality Inspection Reading,Reading 9,Lectura 9
 DocType: Supplier,Is Frozen,Se encuentra congelado(a)
 DocType: Buying Settings,Buying Settings,Configuración de compras
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +122,Mass finishing,Acabado en masa
 DocType: Stock Entry Detail,BOM No. for a Finished Good Item,Lista de materiales (LdM) para el producto terminado
 DocType: Upload Attendance,Attendance To Date,Asistencia a la fecha
 apps/erpnext/erpnext/config/selling.py +158,Setup incoming server for sales email id. (e.g. sales@example.com),Configuración del servidor de correo entrante corporativo de ventas. (por ejemplo sales@example.com )
@@ -1965,7 +1896,7 @@
 DocType: Payment Tool,Payment Account,Cuenta de pagos
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +713,Please specify Company to proceed,"Por favor, especifique la compañía para continuar"
 apps/frappe/frappe/public/js/frappe/model/indicator.js +30,Draft,Borrador
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +46,Compensatory Off,Compensatorio
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Compensatory Off,Compensatorio
 DocType: Quality Inspection Reading,Accepted,Aceptado
 DocType: User,Female,Femenino
 DocType: Journal Entry Account,Debit in Account Currency,Divisa de la cuenta de débito
@@ -1977,7 +1908,7 @@
 DocType: Shipping Rule,Shipping Rule Label,Etiqueta de regla de envío
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +209,Raw Materials cannot be blank.,'Materias primas' no puede estar en blanco.
 DocType: Newsletter,Test,Prueba
-apps/erpnext/erpnext/stock/doctype/item/item.py +364,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +368,"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'","Existen transacciones de stock para este producto, \ usted no puede cambiar los valores: 'Posee numero de serie', 'Posee numero de lote', 'Es un producto en stock' y 'Método de valoración'"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +448,Quick Journal Entry,Asiento Rápida
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +92,You can not change rate if BOM mentioned agianst any item,No se puede cambiar el precio si existe una Lista de materiales (LdM) en el producto
@@ -1988,13 +1919,14 @@
 apps/erpnext/erpnext/config/stock.py +18,Requests for items.,Listado de solicitudes de productos.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,Se crearan ordenes de producción separadas para cada producto terminado.
 DocType: Purchase Invoice,Terms and Conditions1,Términos y Condiciones
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +18,Complete Setup,Configuración completa
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard_page.html +18,Complete Setup,Configuración completa
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.",El asiento contable actualmente se encuentra congelado; nadie puede modificar este registro excepto el rol que se especifica a continuación.
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +121,Please save the document before generating maintenance schedule,"Por favor, guarde el documento antes de generar el programa de mantenimiento"
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,Estado del proyecto
 DocType: UOM,Check this to disallow fractions. (for Nos),Marque esta opción para deshabilitar las fracciones.
 apps/erpnext/erpnext/config/crm.py +96,Newsletter Mailing List,Lista de distribución del boletín informativo
 DocType: Delivery Note,Transporter Name,Nombre del Transportista
+DocType: Authorization Rule,Authorized Value,Valor Autorizado
 DocType: Contact,Enter department to which this Contact belongs,Introduzca departamento al que pertenece este contacto
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Absent,Total Ausente
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +746,Item or Warehouse for row {0} does not match Material Request,Artículo o almacén para la línea {0} no coincide con la requisición de materiales
@@ -2019,16 +1951,15 @@
 DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),Precio base (según la UdM)
 DocType: SMS Log,No of Requested SMS,No. de SMS solicitados
 DocType: Campaign,Campaign-.####,Campaña-.#### 
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +55,Piercing,Perforación
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,Próximos pasos
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +117,Contract End Date must be greater than Date of Joining,La fecha de finalización de contrato debe ser mayor que la fecha de ingreso
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,Terceros / proveedores / comisionistas / afiliados / distribuidores que venden productos de empresas a cambio de una comisión.
 DocType: Customer Group,Has Child Node,Posee Sub-grupo
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{0} against Purchase Order {1},{0} contra la orden de compra {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +332,{0} against Purchase Order {1},{0} contra la orden de compra {1}
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","Introduzca los parámetros de URL aquí (Ej. sender = ERPNext , nombre de usuario = ERPNext , contraseña = 1234 etc )"
 apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,{0} {1} no se encuentra en el año fiscal activo. Para más detalles verifique {2}.
-apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,Este es un sitio web ejemplo generado automáticamente por ERPNext
+apps/erpnext/erpnext/setup/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,Este es un sitio web ejemplo generado automáticamente por ERPNext
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +37,Ageing Range 1,Rango de antigüedad 1
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +110,Photochemical machining,Mecanizado fotoquímico
 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.
 
 #### Note
@@ -2074,7 +2005,7 @@
 DocType: Purchase Receipt Item,Recd Quantity,Cantidad recibida
 DocType: Email Account,Email Ids,IDs de Correo Electrónico
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},No se puede producir una cantidad mayor del producto {0} que lo requerido en el pedido de venta {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +471,Stock Entry {0} is not submitted,La entrada de stock {0} no esta validada
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +473,Stock Entry {0} is not submitted,La entrada de stock {0} no esta validada
 DocType: Payment Reconciliation,Bank / Cash Account,Cuenta de banco / efectivo
 DocType: Tax Rule,Billing City,Ciudad de facturación
 DocType: Global Defaults,Hide Currency Symbol,Ocultar el símbolo de moneda
@@ -2090,7 +2021,7 @@
 DocType: Purchase Invoice,Currency and Price List,Divisa y listas de precios
 DocType: Opportunity,Customer / Lead Name,Cliente / Oportunidad
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +63,Clearance Date not mentioned,Fecha de liquidación no definida
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +71,Production,Producción
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Production,Producción
 DocType: Item,Allow Production Order,Permitir orden de producción
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +60,Row {0}:Start Date must be before End Date,Línea {0}: La fecha de inicio debe ser anterior fecha de finalización
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Total (Cantidad)
@@ -2103,9 +2034,9 @@
 apps/erpnext/erpnext/utilities/doctype/address/address.py +113,My Addresses,Mis direcciones
 DocType: Stock Ledger Entry,Outgoing Rate,Tasa saliente
 apps/erpnext/erpnext/config/hr.py +100,Organization branch master.,Sucursal principal de la organización.
-apps/erpnext/erpnext/controllers/accounts_controller.py +237, or ,ó
+apps/erpnext/erpnext/controllers/accounts_controller.py +238, or ,ó
 DocType: Sales Order,Billing Status,Estado de facturación
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Utility Expenses,SERVICIOS PUBLICOS
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Utility Expenses,Servicios públicos
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,90-Above,90-Mayor
 DocType: Buying Settings,Default Buying Price List,Lista de precios por defecto
 ,Download Backups,Descargar Backups
@@ -2130,6 +2061,7 @@
 DocType: Stock Entry Detail,Serial No / Batch,No. de serie / lote
 DocType: Product Bundle,Parent Item,Producto padre / principal
 DocType: Account,Account Type,Tipo de cuenta
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +113,Leave Type {0} cannot be carry-forwarded,Deja tipo {0} no se pueden reenviar-llevar
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +213,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',"El programa de mantenimiento no se genera para todos los productos. Por favor, haga clic en 'Generar programación'"
 ,To Produce,Producir
 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","Para la línea {0} en {1}. incluir {2} en la tasa del producto, las lineas {3} también deben ser incluidas"
@@ -2137,10 +2069,7 @@
 DocType: Bin,Reserved Quantity,Cantidad Reservada
 DocType: Landed Cost Voucher,Purchase Receipt Items,Productos del recibo de compra
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,Formularios personalizados
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +62,Cutting,Corte
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +69,Flattening,Aplastamiento
 DocType: Account,Income Account,Cuenta de ingresos
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +22,Molding,Moldura
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +632,Delivery,Entregar
 DocType: Stock Reconciliation Item,Current Qty,Cant. Actual
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",Consulte 'tasa de materiales en base de' en la sección de costos
@@ -2150,20 +2079,19 @@
 apps/frappe/frappe/desk/moduleview.py +61,Documents,Documentos
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +17,Ref,Referencia
 DocType: Cost Center,Cost Center,Centro de costos
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.js +48,Voucher #,Comprobante #
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +36,Voucher #,Comprobante #
 DocType: Notification Control,Purchase Order Message,Mensaje en la orden de compra
 DocType: Tax Rule,Shipping Country,País de envío
 DocType: Upload Attendance,Upload HTML,Subir HTML
-apps/erpnext/erpnext/controllers/accounts_controller.py +391,"Total advance ({0}) against Order {1} cannot be greater \
+apps/erpnext/erpnext/controllers/accounts_controller.py +392,"Total advance ({0}) against Order {1} cannot be greater \
 				than the Grand Total ({2})","Avance total ({0}) en contra de la orden {1} no puede ser mayor \
  que el Gran Total ({2})"
 DocType: Employee,Relieving Date,Fecha de relevo
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +12,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.","La regla de precios está hecha para sobrescribir la lista de precios y define un porcentaje de descuento, basado en algunos criterios."
-DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,Depósito sólo se puede cambiar a través de la Entrada de Almacén / Nota de Entrega / Recibo de Compra
+DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,El almacen sólo se puede cambiar a través de: Entradas de inventario / Nota de entrega / Recibo de compra
 DocType: Employee Education,Class / Percentage,Clase / Porcentaje
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +92,Head of Marketing and Sales,Director de marketing y ventas
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +31,Income Tax,Impuesto sobre la renta
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +157,Laser engineered net shaping,Láser diseñado conformación neta
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Head of Marketing and Sales,Director de marketing y ventas
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +31,Income Tax,Impuesto sobre la renta
 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.","Si la regla de precios está hecha para 'Precio', sobrescribirá la lista de precios actual. La regla de precios sera el valor final definido, así que no podrá aplicarse algún descuento. Por lo tanto, en las transacciones como Pedidos de venta, órdenes de compra, etc. el campo sera traído en lugar de utilizar 'Lista de precios'"
 apps/erpnext/erpnext/config/selling.py +163,Track Leads by Industry Type.,Listar Oportunidades por Tipo de Industria
 DocType: Item Supplier,Item Supplier,Proveedor del producto
@@ -2186,31 +2114,28 @@
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Cantidad actual después de transacción
 ,Pending SO Items For Purchase Request,A la espera de la orden de compra (OC) para crear solicitud de compra (SC)
 DocType: Supplier,Billing Currency,Moneda de facturación
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +148,Extra Large,Extra grande
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,Extra Large,Extra grande
 ,Profit and Loss Statement,Cuenta de pérdidas y ganancias
 DocType: Bank Reconciliation Detail,Cheque Number,Número de cheque
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +43,Pressing,Prensado
 DocType: Payment Tool Detail,Payment Tool Detail,Detalle de herramienta de pago
 ,Sales Browser,Explorar ventas
 DocType: Journal Entry,Total Credit,Crédito Total
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +474,Warning: Another {0} # {1} exists against stock entry {2},Advertencia: existe otra {0} # {1} para la entrada de inventario {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +459,Local,Local
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +476,Warning: Another {0} # {1} exists against stock entry {2},Advertencia: Existe otra {0} # {1} para la entrada de inventario {2}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +397,Local,Local
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),INVERSIONES Y PRESTAMOS
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,DEUDORES VARIOS
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +147,Large,Grande
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +23,No employee found!,Ningún empleado encontrado!
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Large,Grande
 DocType: C-Form Invoice Detail,Territory,Territorio
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,"Por favor, indique el numero de visitas requeridas"
 DocType: Purchase Order,Customer Address Display,Dirección del cliente mostrada
 DocType: Stock Settings,Default Valuation Method,Método predeterminado de valoración
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +127,Polishing,Pulido
 DocType: Production Order Operation,Planned Start Time,Hora prevista de inicio
 apps/erpnext/erpnext/config/accounts.py +63,Close Balance Sheet and book Profit or Loss.,Cerrar balance general y el libro de pérdidas y ganancias.
-apps/erpnext/erpnext/stock/doctype/item/item.py +661,"Default Unit of Measure for Item {0} cannot be changed directly because \
+apps/erpnext/erpnext/stock/doctype/item/item.py +665,"Default Unit of Measure for Item {0} cannot be changed directly because \
 			you have already made some transaction(s) with another UOM. To change default UOM, \
 			use 'UOM Replace Utility' tool under Stock module.","Unidad de medida por defecto para el producto {0} no se puede cambiar directamente, porque ya se ha realizado alguna transacción(es) con otra UdM. Para cambiar la UdM por defecto, utilice la herramienta bajo el modulo de inventario"
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,Especificar el tipo de cambio para convertir una moneda a otra
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +146,Quotation {0} is cancelled,La cotización {0} esta cancelada
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +141,Quotation {0} is cancelled,La cotización {0} esta cancelada
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,Monto total pendiente
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} was on leave on {1}. Cannot mark attendance.,El empleado {0} estaba ausente el {1}. No se puede marcar la asistencia.
 DocType: Sales Partner,Targets,Objetivos
@@ -2221,7 +2146,6 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +158,Please create Customer from Lead {0},"Por favor, crear el cliente desde iniciativa {0}"
 DocType: Price List,Applicable for Countries,Aplicable para los Países
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Computers,Equipo de computo
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +112,Electro-chemical grinding,Esmerilado Electro-químico
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +14,This is a root customer group and cannot be edited.,Este es una categoría de cliente raíz (principal) y no se puede editar.
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +39,Please setup your chart of accounts before you start Accounting Entries,"Por favor, configure su plan de cuentas antes de comenzar los registros de contabilidad"
 DocType: Purchase Invoice,Ignore Pricing Rule,Ignorar la regla precios
@@ -2230,7 +2154,7 @@
 DocType: Employee Education,Graduate,Graduado
 DocType: Leave Block List,Block Days,Bloquear días
 DocType: Journal Entry,Excise Entry,Registro de impuestos especiales
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +62,Warning: Sales Order {0} already exists against Customer's Purchase Order {1},Advertencia: orden de venta {0} ya existe para la orden de compra {1} del cliente
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +62,Warning: Sales Order {0} already exists against Customer's Purchase Order {1},Advertencia: La orden de venta {0} ya existe para la orden de compra {1} del cliente
 DocType: Terms and Conditions,"Standard Terms and Conditions that can be added to Sales and Purchases.
 
 Examples:
@@ -2279,7 +2203,6 @@
 DocType: Maintenance Visit,Purposes,Propósitos
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +103,Atleast one item should be entered with negative quantity in return document,Al menos un elemento debe introducirse con cantidad negativa en el documento de devolución
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +67,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","La operación {0} tomará mas tiempo que la capacidad de producción de la estación {1}, por favor divida la tarea en varias operaciones"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +134,Electrochemical machining,Mecanizado Electro-químico
 ,Requested,Solicitado
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +66,No Remarks,No hay observaciones
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +13,Overdue,Atrasado
@@ -2288,7 +2211,7 @@
 DocType: Monthly Distribution,Distribution Name,Nombre de la distribución
 DocType: Features Setup,Sales and Purchase,Compras y ventas
 DocType: Supplier Quotation Item,Material Request No,Requisición de materiales Nº
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +218,Quality Inspection required for Item {0},Inspección de la calidad requerida para el producto {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +221,Quality Inspection required for Item {0},Inspección de la calidad requerida para el producto {0}
 DocType: Quotation,Rate at which customer's currency is converted to company's base currency,Tasa por la cual la divisa es convertida como moneda base de la compañía
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +107,{0} has been successfully unsubscribed from this list.,{0} se ha dado de baja correctamente de esta lista.
 DocType: Purchase Invoice Item,Net Rate (Company Currency),Tasa neta (Divisa por defecto)
@@ -2306,9 +2229,8 @@
 apps/erpnext/erpnext/accounts/report/financial_statements.py +16,Fiscal Year {0} not found.,El año fiscal {0} no se encuentra.
 DocType: Bank Reconciliation,Get Relevant Entries,Obtener registros relevantes
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +407,Accounting Entry for Stock,Asiento contable de inventario
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +64,Coining,Acuñando
 DocType: Sales Invoice,Sales Team1,Equipo de ventas 1
-apps/erpnext/erpnext/stock/doctype/item/item.py +412,Item {0} does not exist,El elemento {0} no existe
+apps/erpnext/erpnext/stock/doctype/item/item.py +416,Item {0} does not exist,El elemento {0} no existe
 DocType: Sales Invoice,Customer Address,Dirección del cliente
 apps/frappe/frappe/desk/query_report.py +136,Total,Total
 DocType: Purchase Invoice,Apply Additional Discount On,Aplicar descuento adicional en
@@ -2320,14 +2242,13 @@
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),Monto de impuestos después del descuento (Divisa por defecto)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +149,Target warehouse is mandatory for row {0},El almacén de destino es obligatorio para la línea {0}
 DocType: Quality Inspection,Quality Inspection,Inspección de calidad
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +144,Extra Small,Extra Pequeño
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +20,Spray forming,Spray forming
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Extra Small,Extra Pequeño
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +458,Warning: Material Requested Qty is less than Minimum Order Qty,Advertencia: La requisición de materiales es menor que la orden mínima establecida
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +191,Account {0} is frozen,La cuenta {0} se encuentra congelada
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Entidad Legal / Subsidiario con un Catalogo de Cuentas separado que pertenece a la Organización.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +29,"Food, Beverage & Tobacco","Alimentos, bebidas y tabaco"
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","Alimentos, bebidas y tabaco"
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +20,PL or BS,PL o BS
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,Can only make payment against unbilled {0},Sólo se puede crear el pago contra {0} impagado
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +531,Can only make payment against unbilled {0},Sólo se puede crear el pago contra {0} impagado
 apps/erpnext/erpnext/controllers/selling_controller.py +122,Commission rate cannot be greater than 100,El porcentaje de comisión no puede ser superior a 100
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Minimum Inventory Level,Nivel de inventario mínimo
 DocType: Stock Entry,Subcontract,Sub-contrato
@@ -2338,19 +2259,18 @@
 DocType: Item,Manufacturer Part Number,Número de componente del fabricante
 DocType: Production Order Operation,Estimated Time and Cost,Tiempo estimado y costo
 DocType: Bin,Bin,Papelera
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +50,Nosing,Saliente
 DocType: SMS Log,No of Sent SMS,No. de SMS enviados
 DocType: Account,Company,Compañía
 DocType: Account,Expense Account,Cuenta de costos
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +49,Software,Software.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +151,Colour,Color
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +49,Software,Software.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Colour,Color
 DocType: Maintenance Visit,Scheduled,Programado.
 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","Por favor, seleccione el ítem donde &quot;Es de la Elemento&quot; es &quot;No&quot; y &quot;¿Es de artículos de venta&quot; es &quot;Sí&quot;, y no hay otro paquete de producto"
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,"Seleccione la distribución mensual, para asignarla desigualmente en varios meses"
 DocType: Purchase Invoice Item,Valuation Rate,Tasa de Valoración
 apps/erpnext/erpnext/stock/get_item_details.py +281,Price List Currency not selected,El tipo de divisa para la lista de precios no ha sido seleccionado
 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,El elemento en la fila {0}: Recibo Compra {1} no existe en la tabla de 'Recibos de Compra'
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +134,Employee {0} has already applied for {1} between {2} and {3},El empleado {0} ya se ha aplicado para {1} entre {2} y {3}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +145,Employee {0} has already applied for {1} between {2} and {3},El empleado {0} ya se ha aplicado para {1} entre {2} y {3}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Fecha de inicio del proyecto
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +8,Until,Hasta
 DocType: Rename Tool,Rename Log,Cambiar el nombre de sesión
@@ -2360,7 +2280,7 @@
 apps/erpnext/erpnext/controllers/recurring_document.py +162,Please select {0},"Por favor, seleccione {0}"
 DocType: C-Form,C-Form No,C -Form No
 DocType: BOM,Exploded_items,Exploded_items
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +95,Researcher,Investigador
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Researcher,Investigador
 apps/frappe/frappe/custom/doctype/customize_form/customize_form.js +88,Update,Actualizar
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +78,Please save the Newsletter before sending,"Por favor, guarde el boletín antes de enviarlo"
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +23,Name or Email is mandatory,El nombre o E-mail es obligatorio
@@ -2369,11 +2289,10 @@
 DocType: Employee,Exit,Salir
 apps/erpnext/erpnext/accounts/doctype/account/account.py +134,Root Type is mandatory,tipo de root es obligatorio
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +295,Serial No {0} created,Número de serie {0} creado
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +125,Vibratory finishing,Acabado vibratorio
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","Para la comodidad de los clientes , estos códigos se pueden utilizar en formatos impresos como facturas y notas de entrega"
 DocType: Employee,You can enter any date manually,Puede introducir cualquier fecha manualmente
 DocType: Sales Invoice,Advertisement,Anuncio
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +165,Probationary Period,Período de prueba
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Probationary Period,Período de prueba
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Sólo las sub-cuentas son permitidas en una transacción
 DocType: Expense Claim,Expense Approver,Supervisor de gastos
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,Recibo de compra del producto suministrado
@@ -2381,19 +2300,16 @@
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +17,To Datetime,Para fecha y hora
 DocType: SMS Settings,SMS Gateway URL,URL de pasarela SMS
 apps/erpnext/erpnext/config/crm.py +53,Logs for maintaining sms delivery status,Estatus de mensajes SMS entregados
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +137,Grinding,Molienda
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +34,Shrink wrapping,Retractilado
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +36,Pending Activities,Actividades pendientes
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,Confirmed,Confirmado
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier > Supplier Type,Proveedor> Tipo de proveedor
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +127,Please enter relieving date.,"Por favor, introduzca la fecha de relevo"
 apps/erpnext/erpnext/controllers/trends.py +137,Amt,Monto
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' can be submitted,"Sólo las solicitudes de ausencia con estado ""Aprobado"" puede ser validadas"
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +51,Only Leave Applications with status 'Approved' can be submitted,"Sólo las solicitudes de ausencia con estado ""Aprobado"" puede ser validadas"
 apps/erpnext/erpnext/utilities/doctype/address/address.py +21,Address Title is mandatory.,La dirección principal es obligatoria
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,"Introduzca el nombre de la campaña, si la solicitud viene desde esta."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +38,Newspaper Publishers,Editores de periódicos
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +38,Newspaper Publishers,Editores de periódicos
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,Seleccione el año fiscal.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +88,Smelting,Fundición
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Nivel de reabastecimiento
 DocType: Attendance,Attendance Date,Fecha de Asistencia
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,Calculo de salario basado en los ingresos y deducciones
@@ -2404,20 +2320,19 @@
 DocType: Item,Valuation Method,Método de valoración
 DocType: Sales Invoice,Sales Team,Equipo de ventas
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +81,Duplicate entry,Entrada duplicada
-DocType: Serial No,Under Warranty,Bajo Garantía
+DocType: Serial No,Under Warranty,Bajo garantía
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +414,[Error],[Error]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,En palabras serán visibles una vez que guarde el pedido de ventas.
 ,Employee Birthday,Cumpleaños del empleado
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +55,Venture Capital,Capital de riesgo
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,Capital de riesgo
 DocType: UOM,Must be Whole Number,Debe ser un número entero
 DocType: Leave Control Panel,New Leaves Allocated (In Days),Nuevas vacaciones asignadas (en días)
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +51,Serial No {0} does not exist,El número de serie {0} no existe
 DocType: Pricing Rule,Discount Percentage,Porcentaje de descuento
 DocType: Payment Reconciliation Invoice,Invoice Number,Número de factura
-apps/erpnext/erpnext/hooks.py +70,Orders,Órdenes
+apps/erpnext/erpnext/hooks.py +54,Orders,Órdenes
 DocType: Leave Control Panel,Employee Type,Tipo de empleado
 DocType: Employee Leave Approver,Leave Approver,Supervisor de ausencias
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +70,Swaging,Recalcado
 DocType: Manufacturing Settings,Material Transferred for Manufacture,Material transferido para manufacturar
 DocType: Expense Claim,"A user with ""Expense Approver"" role","Un usuario con rol de ""Supervisor de gastos"""
 ,Issued Items Against Production Order,Productos entregados desde ordenes de producción 
@@ -2429,7 +2344,6 @@
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +62,Cost Center with existing transactions can not be converted to group,El centro de costos con transacciones existentes no se puede convertir a 'grupo'
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Depreciation,DEPRECIACIONES
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Proveedor(es)
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +29,Invalid period,Período inválido
 DocType: Customer,Credit Limit,Límite de crédito
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,Seleccione el tipo de transacción.
 DocType: GL Entry,Voucher No,Comprobante No.
@@ -2439,9 +2353,9 @@
 DocType: Customer,Address and Contact,Dirección y contacto
 DocType: Customer,Last Day of the Next Month,Último día del siguiente mes
 DocType: Employee,Feedback,Comentarios.
+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}","Deje no pueden ser distribuidas antes {0}, como balance de la licencia ya ha sido remitido equipaje en el futuro registro de asignación de permiso {1}"
 apps/erpnext/erpnext/accounts/party.py +284,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),"Nota: El Debido/Fecha de referencia, excede los días de créditos concedidos para el cliente por {0} día(s)"
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +621,Maint. Schedule,Horario de mantenimiento
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +108,Abrasive jet machining,Chorreo abrasivo por maquina
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +632,Maint. Schedule,Horario de mantenimiento
 DocType: Stock Settings,Freeze Stock Entries,Congelar entradas de stock
 DocType: Website Settings,Website Settings,Configuración del sitio web
 DocType: Item,Reorder level based on Warehouse,Nivel de reabastecimiento basado en almacén
@@ -2457,17 +2371,17 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +169,Root account can not be deleted,La cuenta root no se puede borrar
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +75,Show Stock Entries,Mostrar entradas de stock
 ,Is Primary Address,Es Dirección Primaria
-DocType: Production Order,Work-in-Progress Warehouse,Almacén de Trabajos en Proceso
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +308,Reference #{0} dated {1},Referencia # {0} de fecha {1}
+DocType: Production Order,Work-in-Progress Warehouse,Almacén de trabajos en proceso
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Reference #{0} dated {1},Referencia # {0} de fecha {1}
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +13,Manage Addresses,Administrar direcciones
 DocType: Pricing Rule,Item Code,Código del producto
 DocType: Production Planning Tool,Create Production Orders,Crear órdenes de producción
-DocType: Serial No,Warranty / AMC Details,Garantía / AMC Detalles
+DocType: Serial No,Warranty / AMC Details,Garantía / Detalles de CMA
 DocType: Journal Entry,User Remark,Observaciones
 DocType: Lead,Market Segment,Sector de mercado
 DocType: Communication,Phone,Teléfono
 DocType: Employee Internal Work History,Employee Internal Work History,Historial de trabajo del empleado
-apps/erpnext/erpnext/public/js/account_tree_grid.js +50,Closing (Dr),Cierre (Deb)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +221,Closing (Dr),Cierre (Deb)
 DocType: Contact,Passive,Pasivo
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,El número de serie {0} no se encuentra en stock
 apps/erpnext/erpnext/config/selling.py +127,Tax template for selling transactions.,Plantilla de Impuestos para las transacciones de venta
@@ -2483,8 +2397,8 @@
 ,Billed Amount,Importe facturado
 DocType: Bank Reconciliation,Bank Reconciliation,Conciliación bancaria
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +9,Get Updates,Obtener actualizaciones
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +129,Material Request {0} is cancelled or stopped,Requisición de materiales {0} cancelada o detenida
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +641,Add a few sample records,Agregar algunos registros de muestra
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +133,Material Request {0} is cancelled or stopped,Requisición de materiales {0} cancelada o detenida
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Add a few sample records,Agregar algunos registros de muestra
 apps/erpnext/erpnext/config/hr.py +210,Leave Management,Gestión de ausencias
 DocType: Event,Groups,Grupos
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,Agrupar por cuenta
@@ -2497,38 +2411,34 @@
 DocType: Features Setup,Sales Extras,Ventas extras
 apps/erpnext/erpnext/accounts/utils.py +344,{0} budget for Account {1} against Cost Center {2} will exceed by {3},El presupuesto {0} para la cuenta {1} en el centro de costos {2} es mayor por {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +236,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Una cuenta distinta debe ser del tipo Activo / Pasivo, ya que la reconciliación del stock es una entrada de apertura"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +138,Purchase Order number required for Item {0},Se requiere el numero de orden de compra para el producto {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Order number required for Item {0},Se requiere el numero de orden de compra para el producto {0}
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date','Desde la fecha' debe ser después de 'Hasta Fecha'
 ,Stock Projected Qty,Cantidad de inventario proyectado
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +147,Customer {0} does not belong to project {1},Cliente {0} no pertenece al proyecto {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +150,Customer {0} does not belong to project {1},Cliente {0} no pertenece al proyecto {1}
 DocType: Sales Order,Customer's Purchase Order,Ordenes de compra de clientes
 DocType: Warranty Claim,From Company,Desde Compañía
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,Valor o Cantidad
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Minute,Minuto
+apps/erpnext/erpnext/public/js/setup_wizard.js +363,Minute,Minuto
 DocType: Purchase Invoice,Purchase Taxes and Charges,Impuestos y cargos sobre compras
 ,Qty to Receive,Cantidad a recibir
 DocType: Leave Block List,Leave Block List Allowed,Lista de 'bloqueo de vacaciones / permisos' permitida
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +61,Conversion factor cannot be in fractions,No se pueden utilizar fracciones en el factor de conversión
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +358,You will use it to Login,Lo utilizará para iniciar sesión
+apps/erpnext/erpnext/public/js/setup_wizard.js +108,You will use it to Login,Lo utilizará para iniciar sesión
 DocType: Sales Partner,Retailer,Detallista
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +99,Credit To account must be a Balance Sheet account,La cuenta de crédito debe pertenecer a las cuentas de balance
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,Todos los proveedores
 apps/erpnext/erpnext/stock/doctype/item/item.py +37,Item Code is mandatory because Item is not automatically numbered,El código del producto es obligatorio porque no es enumerado automáticamente
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +99,Quotation {0} not of type {1},la cotización {0} no es del tipo {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +93,Quotation {0} not of type {1},la cotización {0} no es del tipo {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,Programa de mantenimiento de artículos
 DocType: Sales Order,%  Delivered,% Entregado
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,Bank Overdraft Account,Cuenta de sobre-giros
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +15,Make Salary Slip,Crear nómina salarial
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +18,Browse BOM,Explorar la lista de materiales
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +175,Secured Loans,Prestamos en garantía
-apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +3,Awesome Products,Productos Increíbles 
+apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +3,Awesome Products,Productos Increíbles 
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +189,Opening Balance Equity,APERTURA DE CAPITAL
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +80,Cannot approve leave as you are not authorized to approve leaves on Block Dates,"No se puede permitir la ausencia, ya que no está autorizado para aprobar sobre fechas bloqueadas"
 DocType: Appraisal,Appraisal,Evaluación
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +13,Lost-foam casting,Fundición a la espuma perdida
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +47,Drawing,Dibujar
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +22,Date is repeated,Repetir fecha
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +148,Leave approver must be one of {0},El supervisor de ausencias debe ser uno de {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +162,Leave approver must be one of {0},El supervisor de ausencias debe ser uno de {0}
 DocType: Hub Settings,Seller Email,Correo electrónico de vendedor
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Costo total de compra (vía facturas de compra)
 DocType: Workstation Working Hour,Start Time,Hora de inicio
@@ -2542,7 +2452,7 @@
 DocType: Purchase Invoice Item,Net Amount (Company Currency),Importe neto (Divisa por defecto)
 DocType: BOM Operation,Hour Rate,Salario por hora
 DocType: Stock Settings,Item Naming By,Ordenar productos por
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +642,From Quotation,Desde cotización
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +655,From Quotation,Desde cotización
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},Otra entrada de Cierre de Período {0} se ha hecho después de {1}
 DocType: Production Order,Material Transferred for Manufacturing,Material transferido para la producción
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +29,Account {0} does not exists,La cuenta {0} no existe
@@ -2556,21 +2466,19 @@
 DocType: Purchase Invoice Item,PR Detail,Detalle PR
 DocType: Sales Order,Fully Billed,Totalmente facturado
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +20,Cash In Hand,Efectivo en caja
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +72,Delivery warehouse required for stock item {0},Almacén de entrega requerido para el inventrio del producto {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +119,Delivery warehouse required for stock item {0},Almacén de entrega requerido para el inventrio del producto {0}
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),El peso bruto del paquete. Peso + embalaje Normalmente material neto . (para impresión)
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Los usuarios con este rol pueden establecer cuentas congeladas y crear / modificar los asientos contables para las mismas
 DocType: Serial No,Is Cancelled,CANCELADO
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +281,My Shipments,Mis envíos
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +286,My Shipments,Mis envíos
 DocType: Journal Entry,Bill Date,Fecha de factura
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +43,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","Incluso si hay varias reglas de precios con mayor prioridad, se aplican entonces siguientes prioridades internas:"
 DocType: Supplier,Supplier Details,Detalles del proveedor
 DocType: Communication,Recipients,Destinatarios
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +146,Screwing,Atornillado
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +96,Knurling,Moleteado
 DocType: Expense Claim,Approval Status,Estado de Aprobación
 DocType: Hub Settings,Publish Items to Hub,Publicar artículos al Hub
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +44,From value must be less than to value in row {0},El valor debe ser menor que el valor de la línea {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +133,Wire Transfer,Transferencia bancaria
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +133,Wire Transfer,Transferencia bancaria
 apps/erpnext/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py +25,Please select Bank Account,"Por favor, seleccione la cuenta bancaria"
 DocType: Newsletter,Create and Send Newsletters,Crear y enviar boletines de noticias
 apps/frappe/frappe/public/js/frappe/views/reports/grid_report.js +305,From Date must be before To Date,La fecha 'Desde' tiene que ser menor de la fecha 'Hasta'
@@ -2578,14 +2486,14 @@
 DocType: Company,Default Income Account,Cuenta de ingresos por defecto
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,Categoría de cliente / Cliente
 DocType: Item Group,Check this if you want to show in website,Seleccione esta opción si desea mostrarlo en el sitio web
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +190,Welcome to ERPNext,Bienvenido a ERPNext
+,Welcome to ERPNext,Bienvenido a ERPNext
 DocType: Payment Reconciliation Payment,Voucher Detail Number,Número de Detalle de Comprobante
 apps/erpnext/erpnext/config/crm.py +146,Lead to Quotation,Iniciativa a cotización
 DocType: Lead,From Customer,Desde cliente
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +37,Calls,Llamadas
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Calls,Llamadas
 DocType: Project,Total Costing Amount (via Time Logs),Importe total calculado (a través de la gestión de tiempos)
 DocType: Purchase Order Item Supplied,Stock UOM,Unidad de media utilizada en el almacen
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Purchase Order {0} is not submitted,La orden de compra {0} no se encuentra validada
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +194,Purchase Order {0} is not submitted,La orden de compra {0} no se encuentra validada
 ,Projected,Proyectado
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},Número de serie {0} no pertenece al Almacén {1}
 apps/erpnext/erpnext/controllers/status_updater.py +136,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Nota : El sistema no verificará sobre-entregas y exceso de almacenamiento para el producto {0} ya que la cantidad es 0
@@ -2593,7 +2501,6 @@
 DocType: Issue,Opening Date,Fecha de apertura
 DocType: Journal Entry,Remark,Observación
 DocType: Purchase Receipt Item,Rate and Amount,Tasa y cantidad
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +95,Boring,Aburrido
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +667,From Sales Order,Desde órden de venta (OV)
 DocType: Blog Category,Parent Website Route,Ruta de website principal
 DocType: Sales Order,Not Billed,No facturado
@@ -2607,19 +2514,17 @@
 apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount Amount,Descuento
 DocType: Purchase Invoice,Return Against Purchase Invoice,Devolución contra factura de compra
 DocType: Item,Warranty Period (in days),Período de garantía (en días)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +550,e.g. VAT,por ejemplo IVA
+apps/erpnext/erpnext/public/js/setup_wizard.js +292,e.g. VAT,por ejemplo IVA
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,Elemento 4
 DocType: Journal Entry Account,Journal Entry Account,Cuenta de asiento contable
 DocType: Shopping Cart Settings,Quotation Series,Series de cotizaciones
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +52,"An item exists with same name ({0}), please change the item group name or rename the item","Existe un elemento con el mismo nombre ({0} ) , cambie el nombre del grupo de artículos o cambiar el nombre del elemento"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +82,Hot metal gas forming,Formando gas de metal caliente
 DocType: Sales Order Item,Sales Order Date,Fecha de las órdenes de venta
 DocType: Sales Invoice Item,Delivered Qty,Cantidad entregada
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +63,Warehouse {0}: Company is mandatory,Almacén {0}: El nombre de la compañia es obligatoria
 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.","Ir al grupo apropiado, usualmente (Fuente de los fondos> Pasivos Corrientes> Impuestos y derechos) y crear una nueva cuenta, haciendo clic en Añadir hijo de tipo ""Impuestos"" y referir a la tasa de impuestos."
 ,Payment Period Based On Invoice Date,Periodos de pago según facturas
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +50,Missing Currency Exchange Rates for {0},Se requiere la tasa de cambio para {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +135,Laser cutting,Corte por láser
 DocType: Event,Monday,Lunes
 DocType: Journal Entry,Stock Entry,Entradas de inventario
 DocType: Account,Payable,Pagadero
@@ -2643,7 +2548,7 @@
 DocType: Stock Entry,Customer or Supplier Details, Detalle de cliente o proveedor
 apps/frappe/frappe/core/page/permission_manager/permission_manager.js +428,Set,Establecer
 DocType: Lead,Lead Owner,Propietario de la iniciativa
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +248,Warehouse is required,Se requiere Almacén
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +248,Warehouse is required,Se requiere el almacén
 DocType: Employee,Marital Status,Estado civil
 DocType: Stock Settings,Auto Material Request,Requisición de materiales automática
 DocType: Time Log,Will be updated when billed.,Se actualizará cuando se facture.
@@ -2652,7 +2557,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +111,Date Of Retirement must be greater than Date of Joining,La fecha de jubilación debe ser mayor que la fecha de ingreso
 DocType: Sales Invoice,Against Income Account,Contra cuenta de ingresos
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +69,{0}% Delivered,{0}% Entregado
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +78,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,El producto {0}: Con la cantidad ordenada {1} no puede ser menor que el pedido mínimo {2} (definido en el producto).
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,El producto {0}: Con la cantidad ordenada {1} no puede ser menor que el pedido mínimo {2} (definido en el producto).
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Distribución mensual porcentual
 DocType: Territory,Territory Targets,Metas de territorios
 DocType: Delivery Note,Transporter Info,Información de Transportista
@@ -2661,7 +2566,6 @@
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,"Títulos para las plantillas de impresión, por ejemplo, Factura proforma."
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +140,Valuation type charges can not marked as Inclusive,Cargos de tipo de valoración no pueden marcado como Incluido
 DocType: POS Profile,Update Stock,Actualizar el Inventario
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +128,Superfinishing,Superfinishing
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,Unidad de Medida diferente para elementos dará lugar a Peso Neto (Total) incorrecto. Asegúrese de que el peso neto de cada artículo esté en la misma Unidad de Medida.
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,Coeficiente de la lista de materiales (LdM)
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +85,Please pull items from Delivery Note,"Por favor, extraiga los productos de la nota de entrega"
@@ -2676,7 +2580,6 @@
 ,Purchase Analytics,Analítico de compras
 DocType: Sales Invoice Item,Delivery Note Item,Nota de entrega del producto
 DocType: Expense Claim,Task,Tarea
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +57,Shaving,Viruta
 DocType: Purchase Taxes and Charges,Reference Row #,Línea de referencia #
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},El número de lote es obligatorio para el producto {0}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js +14,This is a root sales person and cannot be edited.,Este es el vendedor principal y no se puede editar.
@@ -2688,13 +2591,11 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +74,Purpose must be one of {0},Propósito debe ser uno de {0}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +108,Fill the form and save it,Llene el formulario y guárdelo
 DocType: Production Planning Tool,Download a report containing all raw materials with their latest inventory status,Descargar un informe con todas las materias primas y su inventario actual
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +94,Facing,Frente a
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,Foro de la comunidad
 DocType: Leave Application,Leave Balance Before Application,Ausencias disponibles antes de la solicitud
 DocType: SMS Center,Send SMS,Enviar mensaje SMS
 DocType: Company,Default Letter Head,Encabezado predeterminado
 DocType: Time Log,Billable,Facturable
-DocType: Authorization Rule,This will be used for setting rule in HR module,Esto se utiliza para ajustar la regla en el módulo de recursos humanos (RRHH)
 DocType: Account,Rate at which this tax is applied,Valor por el cual el impuesto es aplicado
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reorder Qty,Cantidad a reabastecer
 DocType: Company,Stock Adjustment Account,Cuenta de ajuste de existencias
@@ -2719,18 +2620,17 @@
 DocType: Sales Invoice,Rounded Total,Total redondeado
 DocType: Product Bundle,List items that form the package.,Lista de tareas que forman el paquete .
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,El porcentaje de asignación debe ser igual al 100%
-DocType: Serial No,Out of AMC,Fuera de AMC
+DocType: Serial No,Out of AMC,Fuera de CMA (Contrato de mantenimiento anual)
 DocType: Purchase Order Item,Material Request Detail No,Detalle de requisición de materiales
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +97,Hard turning,Torneado duro
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +33,Make Maintenance Visit,Crear visita de mantenimiento
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +187,Please contact to the user who have Sales Master Manager {0} role,"Por favor, póngase en contacto con el usuario gerente de ventas {0}"
 DocType: Company,Default Cash Account,Cuenta de efectivo por defecto
 apps/erpnext/erpnext/config/accounts.py +79,Company (not Customer or Supplier) master.,Configuración general del sistema.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +106,Please enter 'Expected Delivery Date',"Por favor, introduzca 'la fecha prevista de entrega'"
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +187,Delivery Notes {0} must be cancelled before cancelling this Sales Order,La nota de entrega {0} debe ser cancelada antes de cancelar esta orden ventas
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +100,Please enter 'Expected Delivery Date',"Por favor, introduzca 'la fecha prevista de entrega'"
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +182,Delivery Notes {0} must be cancelled before cancelling this Sales Order,La nota de entrega {0} debe ser cancelada antes de cancelar esta orden ventas
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +373,Paid amount + Write Off Amount can not be greater than Grand Total,"El total de la cantidad pagada + desajuste, no puede ser mayor que el gran total"
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} no es un número de lote válido para el producto {1}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,Note: There is not enough leave balance for Leave Type {0},Nota : No cuenta con suficientes días para la ausencia del tipo {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +124,Note: There is not enough leave balance for Leave Type {0},Nota : No cuenta con suficientes días para la ausencia del tipo {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.","Nota: Si el pago no se hace en con una  referencia, deberá hacer entrada al diario manualmente."
 DocType: Item,Supplier Items,Artículos de proveedor
 DocType: Opportunity,Opportunity Type,Tipo de oportunidad
@@ -2742,7 +2642,7 @@
 DocType: Hub Settings,Publish Availability,Publicar disponibilidad
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +105,Date of Birth cannot be greater than today.,La fecha de nacimiento no puede ser mayor a la fecha de hoy.
 ,Stock Ageing,Antigüedad de existencias
-apps/erpnext/erpnext/controllers/accounts_controller.py +200,{0} '{1}' is disabled,{0} '{1}' está deshabilitado
+apps/erpnext/erpnext/controllers/accounts_controller.py +201,{0} '{1}' is disabled,{0} '{1}' está deshabilitado
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Establecer como abierto/a
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Enviar correos electrónicos automáticos a contactos al momento de registrase una transacción
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +232,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
@@ -2751,44 +2651,38 @@
 DocType: Purchase Order,Customer Contact Email,Correo electrónico de contacto de cliente
 DocType: Event,Sunday,Domingo.
 DocType: Sales Team,Contribution (%),Margen (%)
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +455,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,Nota : El registro del pago no se creará hasta que la cuenta del tipo 'Banco o Cajas' sea definida
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +171,Responsibilities,Responsabilidades
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +457,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,Nota : El registro del pago no se creará hasta que la cuenta del tipo 'Banco o Cajas' sea definida
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +171,Responsibilities,Responsabilidades
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Template,Plantilla
 DocType: Sales Person,Sales Person Name,Nombre de vendedor
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,"Por favor, introduzca al menos 1 factura en la tabla"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +511,Add Users,Agregar usuarios
+apps/erpnext/erpnext/public/js/setup_wizard.js +255,Add Users,Agregar usuarios
 DocType: Pricing Rule,Item Group,Grupo de productos
 DocType: Task,Actual Start Date (via Time Logs),Fecha de inicio actual (gestión de tiempos)
 DocType: Stock Reconciliation Item,Before reconciliation,Antes de reconciliación
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +12,To {0},Para {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Impuestos y cargos adicionales (Divisa por defecto)
-apps/erpnext/erpnext/stock/doctype/item/item.py +340,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,"El campo de impuesto del producto {0} debe tener un tipo de cuenta de impuestos, ingresos, cargos o gastos"
+apps/erpnext/erpnext/stock/doctype/item/item.py +344,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,"El campo de impuesto del producto {0} debe tener un tipo de cuenta de impuestos, ingresos, cargos o gastos"
 DocType: Sales Order,Partly Billed,Parcialmente facturado
 DocType: Item,Default BOM,Lista de Materiales (LdM) por defecto
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +79,Decambering,Decambering
 apps/erpnext/erpnext/setup/doctype/company/company.js +22,Please re-type company name to confirm,"Por favor, vuelva a escribir nombre de la empresa para confirmar"
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,Monto total pendiente
 DocType: Time Log Batch,Total Hours,Total de Horas
 DocType: Journal Entry,Printing Settings,Ajustes de impresión
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +268,Total Debit must be equal to Total Credit. The difference is {0},El débito total debe ser igual al crédito. La diferencia es {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +11,Automotive,Automotores
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +37,Item is required,Un producto es requerido
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +25,Metal injection molding,Moldeo por inyección de metal
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +258,Total Debit must be equal to Total Credit. The difference is {0},El débito total debe ser igual al crédito. La diferencia es {0}
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,Automotores
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +684,From Delivery Note,Desde nota de entrega
 DocType: Time Log,From Time,Desde hora
 DocType: Notification Control,Custom Message,Mensaje personalizado
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +33,Investment Banking,Inversión en la banca
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +261,"Select your Country, Time Zone and Currency","Seleccione su país, zona horaria y moneda"
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,Inversión en la banca
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +316,"Select your Country, Time Zone and Currency","Seleccione su país, zona horaria y moneda"
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +369,Cash or Bank Account is mandatory for making payment entry,'Cuenta de Efectivo' o 'Cuenta Bancaria' es obligatoria para hacer una entrada de pago
 DocType: Purchase Invoice,Price List Exchange Rate,Tipo de cambio para la lista de precios
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +91,Pickling,Decapado
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +18,Sand casting,Fundición de arena
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +117,Electroplating,Galvanoplastia
 DocType: Purchase Invoice Item,Rate,Precio
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +62,Intern,Interno
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Intern,Interno
 DocType: Newsletter,A Lead with this email id should exist,Debe existir un correo relacionado a esta Iniciativa.
 DocType: Stock Entry,From BOM,Desde lista de materiales (LdM)
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +34,Basic,Base
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +34,Basic,Base
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,Las operaciones de inventario antes de {0} se encuentran congeladas
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +217,Please click on 'Generate Schedule',"Por favor, haga clic en 'Generar planificación'"
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +61,To Date should be same as From Date for Half Day leave,'Hasta la fecha' debe ser igual a 'desde fecha' para una ausencia de medio día
@@ -2796,11 +2690,11 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +96,Reference No is mandatory if you entered Reference Date,El No. de referencia es obligatoria si usted introdujo la fecha
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +108,Date of Joining must be greater than Date of Birth,La fecha de ingreso debe ser mayor a la fecha de nacimiento
 DocType: Salary Structure,Salary Structure,Estructura salarial
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +242,"Multiple Price Rule exists with same criteria, please resolve \
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +246,"Multiple Price Rule exists with same criteria, please resolve \
 			conflict by assigning priority. Price Rules: {0}","Existe Regla de Múltiple Precio con los mismos criterios, por favor resolver \
  conflicto mediante la asignación de prioridad. Reglas de Precio: {0}"
 DocType: Account,Bank,Banco
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +9,Airline,Línea aérea
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,Línea aérea
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +493,Issue Material,Distribuir materiales
 DocType: Material Request Item,For Warehouse,Para el almacén
 DocType: Employee,Offer Date,Fecha de oferta
@@ -2810,29 +2704,24 @@
 DocType: Item,Is Fixed Asset Item,Es un activo fijo
 DocType: Stock Entry,Including items for sub assemblies,Incluir productos para subconjuntos
 DocType: Features Setup,"If you have long print formats, this feature can be used to split the page to be printed on multiple pages with all headers and footers on each page","Si usted tiene formatos de impresión largos , esta característica puede ser utilizada para dividir la página que se imprimirá en varias hojas con todos los encabezados y pies de página en cada una"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +131,Hobbing,Hobbing
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +98,All Territories,Todos los Territorios
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +98,All Territories,Todos los Territorios
 DocType: Purchase Invoice,Items,Productos
 DocType: Fiscal Year,Year Name,Nombre del año
 DocType: Process Payroll,Process Payroll,Procesar nómina
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +59,There are more holidays than working days this month.,Existen más vacaciones que días de trabajo en este mes.
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +68,There are more holidays than working days this month.,Existen más vacaciones que días de trabajo en este mes.
 DocType: Product Bundle Item,Product Bundle Item,Artículo del conjunto de productos
 DocType: Sales Partner,Sales Partner Name,Nombre de socio de ventas
 DocType: Purchase Invoice Item,Image View,Vista de imagen
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +113,Finishing & industrial finishing,Terminado y acabado industrial
 DocType: Issue,Opening Time,Hora de apertura
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,Desde y Hasta la fecha solicitada
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +46,Securities & Commodity Exchanges,Cambios de valores y bienes
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Cambios de valores y bienes
 DocType: Shipping Rule,Calculate Based On,Calculo basado en
 DocType: Delivery Note Item,From Warehouse,De Almacén
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +98,Drilling,Perforación
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +28,Blow molding,El moldeo por soplado
 DocType: Purchase Taxes and Charges,Valuation and Total,Valuación y total
 DocType: Tax Rule,Shipping City,Ciudad de envió
 apps/erpnext/erpnext/stock/doctype/item/item.js +43,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,Este producto es una variante de {0} (Plantilla). Los atributos se copiarán de la plantilla a menos que la opción 'No copiar' esté seleccionada
 DocType: Account,Purchase User,Usuario de compras
 DocType: Notification Control,Customize the Notification,Personalizar notificación
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +87,Hammering,Martilleo
 DocType: Web Page,Slideshow,Presentación.
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +24,Default Address Template cannot be deleted,La plantilla de direcciones por defecto no puede ser eliminada
 DocType: Sales Invoice,Shipping Rule,Regla de envío
@@ -2841,9 +2730,8 @@
 DocType: Workflow State,Search,Buscar
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +54,Total cannot be zero,Total no puede ser cero
 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,Los días desde el último pedido debe ser mayor o igual a cero
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +142,Brazing,Soldadura
 DocType: C-Form,Amended From,Modificado Desde
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Raw Material,Materia prima
+apps/erpnext/erpnext/public/js/setup_wizard.js +359,Raw Material,Materia prima
 DocType: Leave Application,Follow via Email,Seguir a través de correo electronico
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Total impuestos después del descuento
 apps/erpnext/erpnext/accounts/doctype/account/account.py +174,Child account exists for this account. You can not delete this account.,"No es posible eliminar esta cuenta, ya que existe una sub-cuenta"
@@ -2857,10 +2745,10 @@
 ,Produced,Producido
 DocType: Item,Item Code for Suppliers,Código del producto para proveedores
 DocType: Issue,Raised By (Email),Propuesto por (Email)
-apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +72,General,General
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +495,Attach Letterhead,Adjuntar membrete
+apps/erpnext/erpnext/setup/setup_wizard/default_website.py +72,General,General
+apps/erpnext/erpnext/public/js/setup_wizard.js +241,Attach Letterhead,Adjuntar membrete
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +272,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',No se puede deducir cuando categoría es para ' Valoración ' o ' de Valoración y Total '
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +542,"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.","Enumere sus obligaciones fiscales (Ejemplo; Impuestos, aduanas, etc.) deben tener nombres únicos y sus tarifas por defecto. Esto creará una plantilla estándar, que podrá editar más tarde."
+apps/erpnext/erpnext/public/js/setup_wizard.js +284,"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.","Enumere sus obligaciones fiscales (Ejemplo; Impuestos, aduanas, etc.) deben tener nombres únicos y sus tarifas por defecto. Esto creará una plantilla estándar, que podrá editar más tarde."
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial Nos Required for Serialized Item {0},Número de serie requerido para el producto serializado {0}
 DocType: Journal Entry,Bank Entry,Registro de banco
 DocType: Authorization Rule,Applicable To (Designation),Aplicables a (Puesto)
@@ -2869,32 +2757,31 @@
 apps/erpnext/erpnext/config/accounts.py +143,Enable / disable currencies.,Habilitar o deshabilitar el tipo de divisas
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Postal Expenses,GASTOS POSTALES
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Monto total
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +26,Entertainment & Leisure,Entretenimiento y ocio
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,Entretenimiento y ocio
 DocType: Purchase Order,The date on which recurring order will be stop,Fecha en que el pedido recurrente es detenido
 DocType: Quality Inspection,Item Serial No,Nº de Serie del producto
 apps/erpnext/erpnext/controllers/status_updater.py +142,{0} must be reduced by {1} or you should increase overflow tolerance,{0} debe reducirse en {1} o se debe aumentar la tolerancia de desbordamiento
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Present,Total Presente
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Hour,Hora
+apps/erpnext/erpnext/public/js/setup_wizard.js +363,Hour,Hora
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +138,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation",El producto serializado {0} no se puede actualizar / reconciliar stock
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +488,Transfer Material to Supplier,Transferir material a proveedor
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +513,Transfer Material to Supplier,Transferir material a proveedor
 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,El numero de serie no tiene almacén. el almacén debe establecerse por entradas de stock o recibos de compra
 DocType: Lead,Lead Type,Tipo de iniciativa
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +82,Create Quotation,Crear cotización
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +306,All these items have already been invoiced,Todos estos elementos ya fueron facturados
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,You are not authorized to approve leaves on Block Dates,Usted no está autorizado para aprobar las hojas de bloquear las fechas
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +311,All these items have already been invoiced,Todos estos elementos ya fueron facturados
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},Puede ser aprobado por {0}
 DocType: Shipping Rule,Shipping Rule Conditions,Condiciones de regla envío
 DocType: BOM Replace Tool,The new BOM after replacement,Nueva lista de materiales después de la sustitución
 DocType: Features Setup,Point of Sale,Punto de Venta
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +83,Curling,Curling
 DocType: Account,Tax,Impuesto
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +28,Row {0}: {1} is not a valid {2},Línea {0}: {1} no es un {2} válido
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +89,Refining,Refinación
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +37,Row {0}: {1} is not a valid {2},Línea {0}: {1} no es un {2} válido
 DocType: Production Planning Tool,Production Planning Tool,Planificar producción
 DocType: Quality Inspection,Report Date,Fecha del reporte
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +130,Routing,Enrutamiento
 DocType: C-Form,Invoices,Facturas
 DocType: Job Opening,Job Title,Título del trabajo
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +54,{0} already allocated for Employee {1} for period {2} - {3},{0} ya asignado para Empleado {1} para el período {2} - {3}
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +80,{0} Recipients,{0} Destinatarios
 DocType: Features Setup,Item Groups in Details,Detalles de grupos del producto
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +335,Quantity to Manufacture must be greater than 0.,La cantidad a producir debe ser mayor que 0.
@@ -2905,21 +2792,20 @@
 DocType: Pricing Rule,Customer Group,Categoría de cliente
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +164,Expense account is mandatory for item {0},La cuenta de gastos es obligatoria para el elemento {0}
 DocType: Item,Website Description,Descripción del sitio web
-DocType: Serial No,AMC Expiry Date,AMC Fecha de caducidad
+DocType: Serial No,AMC Expiry Date,Fecha de caducidad de CMA (Contrato de Mantenimiento Anual)
 ,Sales Register,Registro de ventas
 DocType: Quotation,Quotation Lost Reason,Razón de la pérdida
 DocType: Address,Plant,Planta
 DocType: DocType,Setup,Configuración
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,No hay nada que modificar.
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +108,Summary for this month and pending activities,Resumen para este mes y actividades pendientes
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +39,Cold rolling,Laminación en frío
 DocType: Customer Group,Customer Group Name,Nombre de la categoría de cliente
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +408,Please remove this Invoice {0} from C-Form {1},"Por favor, elimine esta factura {0} de C-Form {1}"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +410,Please remove this Invoice {0} from C-Form {1},"Por favor, elimine esta factura {0} de C-Form {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,Por favor seleccione 'trasladar' si usted desea incluir los saldos del año fiscal anterior a este año
 DocType: GL Entry,Against Voucher Type,Tipo de comprobante
 DocType: Item,Attributes,Atributos
 DocType: Packing Slip,Get Items,Obtener artículos
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +186,Please enter Write Off Account,"Por favor, ingrese la cuenta de desajuste"
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +187,Please enter Write Off Account,"Por favor, ingrese la cuenta de desajuste"
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +71,Last Order Date,Fecha del último pedido
 DocType: DocField,Image,Imagen
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +179,Make Excise Invoice,Crear una factura de 'impuestos especiales'
@@ -2929,7 +2815,7 @@
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +146,Operation ID not set,ID de Operación no definido
 DocType: Production Order,Planned Start Date,Fecha prevista de inicio
 DocType: Serial No,Creation Document Type,Creación de documento
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +620,Maint. Visit,Visita de mantenimiento
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +631,Maint. Visit,Visita de mantenimiento
 DocType: Leave Type,Is Encash,Se convertirá en efectivo
 DocType: Purchase Invoice,Mobile No,Nº Móvil
 DocType: Payment Tool,Make Journal Entry,Crear asiento contable
@@ -2937,35 +2823,31 @@
 apps/erpnext/erpnext/controllers/trends.py +257,Project-wise data is not available for Quotation,Los datos del proyecto no están disponibles para la cotización
 DocType: Project,Expected End Date,Fecha prevista de finalización
 DocType: Appraisal Template,Appraisal Template Title,Titulo de la plantilla de evaluación
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +440,Commercial,Comercial
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +378,Commercial,Comercial
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +23,Parent Item {0} must not be a Stock Item,El producto principal {0} no debe ser un artículo de stock
 DocType: Cost Center,Distribution Id,Id de Distribución
-apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +14,Awesome Services,Servicios Impresionantes 
+apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +14,Awesome Services,Servicios Impresionantes 
 apps/erpnext/erpnext/config/manufacturing.py +29,All Products or Services.,Todos los productos o servicios.
 DocType: Purchase Invoice,Supplier Address,Dirección de proveedor
 DocType: Contact Us Settings,Address Line 2,Dirección línea 2
 DocType: ToDo,Reference,Referencia
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +59,Perforating,Perforado
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,Cant. enviada
 apps/erpnext/erpnext/config/accounts.py +128,Rules to calculate shipping amount for a sale,Reglas para calcular el importe de envío en una venta
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +29,Series is mandatory,La secuencia es obligatoria
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +28,Financial Services,Servicios financieros
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,Servicios financieros
 apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3},Valor del atributo {0} debe estar dentro del rango de {1} a {2} en los incrementos de {3}
 DocType: Tax Rule,Sales,Ventas
 DocType: Stock Entry Detail,Basic Amount,Importe base
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +173,Warehouse required for stock Item {0},Almacén requerido para la acción del artículo {0}
-DocType: Leave Allocation,Unused leaves,Hojas no utilizadas
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +178,Warehouse required for stock Item {0},El almacén es requerido para el stock del producto {0}
+DocType: Leave Allocation,Unused leaves,Ausencias no utilizadas
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,Cred
 DocType: Customer,Default Receivable Accounts,Cuentas por cobrar predeterminadas
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +102,Sawing,Serrar
 DocType: Tax Rule,Billing State,Región de facturación
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +32,Laminating,Laminación
 DocType: Item Reorder,Transfer,Transferencia
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +549,Fetch exploded BOM (including sub-assemblies),Buscar lista de materiales (LdM) incluyendo subconjuntos
 DocType: Authorization Rule,Applicable To (Employee),Aplicable a ( Empleado )
 apps/erpnext/erpnext/controllers/accounts_controller.py +101,Due Date is mandatory,La fecha de vencimiento es obligatoria
 apps/erpnext/erpnext/controllers/item_variant.py +51,Increment for Attribute {0} cannot be 0,Incremento de Atributo {0} no puede ser 0
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +143,Sintering,Sinterización
 DocType: Journal Entry,Pay To / Recd From,Pagar a / Recibido de
 DocType: Naming Series,Setup Series,Configurar secuencias
 DocType: Supplier,Contact HTML,HTML de Contacto
@@ -2978,7 +2860,6 @@
 DocType: Attendance,Absent,Ausente
 DocType: Product Bundle,Product Bundle,Conjunto / paquete de productos
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +180,Row {0}: Invalid reference {1},Fila {0}: Referencia no válida {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +165,Crushing,Aplastante
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Plantilla de impuestos (compras)
 DocType: Upload Attendance,Download Template,Descargar plantilla
 DocType: GL Entry,Remarks,Observaciones
@@ -2986,14 +2867,12 @@
 DocType: Journal Entry,Write Off Based On,Desajuste basado en
 DocType: Features Setup,POS View,Vista POS
 apps/erpnext/erpnext/config/stock.py +38,Installation record for a Serial No.,El registro de la instalación para un número de serie
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +9,Continuous casting,Colada continua
 apps/erpnext/erpnext/public/js/queries.js +39,Please specify a,"Por favor, especifique un/a"
 DocType: Offer Letter,Awaiting Response,Esperando Respuesta
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +53,Above,Arriba
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +80,Cold sizing,Dimensionamiento en frío
 DocType: Salary Slip,Earning & Deduction,Ingresos y Deducciones
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +76,Account {0} cannot be a Group,Cuenta {0} no puede ser un Grupo
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +259,Region,Región
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +314,Region,Región
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +213,Optional. This setting will be used to filter in various transactions.,Opcional. Esta configuración es utilizada para filtrar la cuenta de otras transacciones
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +104,Negative Valuation Rate is not allowed,La valoración negativa no está permitida
 DocType: Holiday List,Weekly Off,Semanal Desactivado
@@ -3011,7 +2890,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,Account {0} is inactive,Cuenta {0} está inactiva
 DocType: GL Entry,Is Advance,Es un anticipo
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,Asistencia 'Desde fecha' y 'Hasta fecha' son obligatorias
-apps/erpnext/erpnext/controllers/buying_controller.py +131,Please enter 'Is Subcontracted' as Yes or No,"Por favor, introduzca si 'Es sub-contratado' o no"
+apps/erpnext/erpnext/controllers/buying_controller.py +122,Please enter 'Is Subcontracted' as Yes or No,"Por favor, introduzca si 'Es sub-contratado' o no"
 DocType: Sales Team,Contact No.,Contacto No.
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,'Profit and Loss' type account {0} not allowed in Opening Entry,El tipo de cuenta 'Pérdidas y ganancias' {0} no esta permitida para el asiento de apertura
 DocType: Workflow State,Time,Tiempo
@@ -3020,14 +2899,13 @@
 DocType: Authorization Rule,Authorization Rule,Regla de Autorización
 DocType: Sales Invoice,Terms and Conditions Details,Detalle de términos y condiciones
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,Plantilla de impuestos (ventas)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +10,Apparel & Accessories,Ropa y Accesorios
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,Ropa y Accesorios
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +67,Number of Order,Número de orden
 DocType: Item Group,HTML / Banner that will show on the top of product list.,HTML / Banner que aparecerá en la parte superior de la lista de productos.
 DocType: Shipping Rule,Specify conditions to calculate shipping amount,Especificar condiciones para calcular el monto del envío
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +121,Add Child,Agregar elemento
 DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,Rol que permite definir cuentas congeladas y editar asientos congelados
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +52,Cannot convert Cost Center to ledger as it has child nodes,"No se puede convertir de 'Centros de Costos' a una cuenta del libro mayor, ya que tiene sub-grupos"
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +47,Conversion Factor is required,Se requiere un factor de conversión
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +37,Serial #,Serial #.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +87,Commission on Sales,Comisiones sobre ventas
 DocType: Offer Letter Term,Value / Description,Valor / Descripción
@@ -3035,10 +2913,8 @@
 ,Customers Not Buying Since Long Time,Clientes Ausentes
 DocType: Production Order,Expected Delivery Date,Fecha prevista de entrega
 apps/erpnext/erpnext/accounts/general_ledger.py +121,Debit and Credit not equal for {0} #{1}. Difference is {2}.,El Débito y Crédito no es igual para {0} # {1}. La diferencia es {2}.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +48,Bulging,Abultado
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +11,Evaporative-pattern casting,Modelo de fundición evaporativo
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Entertainment Expenses,GASTOS DE ENTRETENIMIENTO
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +195,Sales Invoice {0} must be cancelled before cancelling this Sales Order,La factura {0} debe ser cancelada antes de cancelar esta orden ventas
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +190,Sales Invoice {0} must be cancelled before cancelling this Sales Order,La factura {0} debe ser cancelada antes de cancelar esta orden ventas
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +61,Age,Edad
 DocType: Time Log,Billing Amount,Monto de facturación
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +84,Invalid quantity specified for item {0}. Quantity should be greater than 0.,La cantidad especificada es inválida para el elemento {0}. La cantidad debe ser mayor que 0 .
@@ -3057,26 +2933,24 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,Ingresos de nuevo cliente
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Travel Expenses,Gastos de viaje
 DocType: Maintenance Visit,Breakdown,Desglose
-apps/erpnext/erpnext/controllers/accounts_controller.py +241,Account: {0} with currency: {1} can not be selected,La cuenta: {0} con la divisa: {1} no se puede seleccionar
+apps/erpnext/erpnext/controllers/accounts_controller.py +242,Account: {0} with currency: {1} can not be selected,La cuenta: {0} con la divisa: {1} no se puede seleccionar
 DocType: Bank Reconciliation Detail,Cheque Date,Fecha del cheque
 apps/erpnext/erpnext/accounts/doctype/account/account.py +47,Account {0}: Parent account {1} does not belong to company: {2},Cuenta {0}: desde cuenta padre {1} no pertenece a la compañía: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted all transactions related to this company!,Todas las transacciones relacionadas con esta compañía han sido eliminadas correctamente.
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,A la fecha
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +111,Honing,Afilando
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +58,Probation,Período de prueba
-apps/erpnext/erpnext/stock/doctype/item/item.py +264,Default Warehouse is mandatory for stock Item.,Almacén por defecto es obligatorio para un elemento en stock.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Probation,Período de prueba
+apps/erpnext/erpnext/stock/doctype/item/item.py +268,Default Warehouse is mandatory for stock Item.,Almacén por defecto es obligatorio para un elemento en stock.
 DocType: Feed,Full Name,Nombre completo
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +148,Clinching,Remachado
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +191,Payment of salary for the month {0} and year {1},Pago del salario correspondiente al mes {0} del año {1}
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +173,Payment of salary for the month {0} and year {1},Pago del salario correspondiente al mes {0} del año {1}
 DocType: Stock Settings,Auto insert Price List rate if missing,Auto inserto tasa Lista de Precios si falta
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,Importe total pagado
 ,Transferred Qty,Cantidad Transferida
 apps/erpnext/erpnext/config/learn.py +11,Navigating,Navegación
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +137,Planning,Planificación
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +137,Planning,Planificación
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +9,Make Time Log Batch,Crear lotes de gestión de tiempos
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Issued,Emitido
 DocType: Project,Total Billing Amount (via Time Logs),Importe total de facturación (a través de la gestión de tiempos)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +629,We sell this Item,Vendemos este artículo
+apps/erpnext/erpnext/public/js/setup_wizard.js +365,We sell this Item,Vendemos este producto
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +65,Supplier Id,ID de Proveedor
 DocType: Journal Entry,Cash Entry,Entrada de caja
 DocType: Sales Partner,Contact Desc,Desc. de Contacto
@@ -3085,18 +2959,16 @@
 DocType: Brand,Item Manager,Administración de elementos
 DocType: Cost Center,Add rows to set annual budgets on Accounts.,Agregar las lineas para establecer los presupuestos anuales.
 DocType: Buying Settings,Default Supplier Type,Tipos de Proveedores
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +160,Quarrying,Extracción
 DocType: Production Order,Total Operating Cost,Costo Total de Funcionamiento
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +160,Note: Item {0} entered multiple times,Nota : El producto {0} ha sido ingresado varias veces
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +163,Note: Item {0} entered multiple times,Nota : El producto {0} ha sido ingresado varias veces
 apps/erpnext/erpnext/config/crm.py +27,All Contacts.,Todos los Contactos.
 DocType: Newsletter,Test Email Id,Prueba de Email
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +394,Company Abbreviation,Abreviatura de la compañia
+apps/erpnext/erpnext/public/js/setup_wizard.js +142,Company Abbreviation,Abreviatura de la compañia
 DocType: Features Setup,If you follow Quality Inspection. Enables Item QA Required and QA No in Purchase Receipt,Si usted sigue la inspección de calidad. Habilitará el QA del artículo y el número de QA en el recibo de compra
 DocType: GL Entry,Party Type,Tipo de entidad
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +68,Raw material cannot be same as main Item,La materia prima no puede ser la misma que el producto principal
 DocType: Item Attribute Value,Abbreviation,Abreviación
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,No autorizado desde {0} excede los límites
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +30,Rotational molding,Moldeo rotacional
 apps/erpnext/erpnext/config/hr.py +115,Salary template master.,Plantilla maestra de nómina salarial
 DocType: Leave Type,Max Days Leave Allowed,Máximo de días de ausencia permitidos
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +55,Set Tax Rule for shopping cart,Establezca la regla fiscal (Impuestos) del carrito de compras
@@ -3110,15 +2982,15 @@
 apps/erpnext/erpnext/config/selling.py +18,Quotes to Leads or Customers.,Cotizaciones enviadas a los clientes u oportunidades de venta.
 DocType: Stock Settings,Role Allowed to edit frozen stock,Rol que permite editar inventario congelado
 ,Territory Target Variance Item Group-Wise,Territory Target Variance Item Group-Wise
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +101,All Customer Groups,Todas las categorías de clientes
-apps/erpnext/erpnext/controllers/accounts_controller.py +474,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} es obligatorio. posiblemente el tipo de cambio no se ha creado para {1} en {2}.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +101,All Customer Groups,Todas las categorías de clientes
+apps/erpnext/erpnext/controllers/accounts_controller.py +475,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} es obligatorio. posiblemente el tipo de cambio no se ha creado para {1} en {2}.
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +37,Tax Template is mandatory.,Plantilla de impuestos es obligatorio.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +41,Account {0}: Parent account {1} does not exist,Cuenta {0}: desde cuenta padre {1} no existe
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Tarifa de la lista de precios (Divisa por defecto)
 DocType: Account,Temporary,Temporal
 DocType: Address,Preferred Billing Address,Dirección de facturación preferida
 DocType: Monthly Distribution Percentage,Percentage Allocation,Porcentaje de asignación
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +86,Secretary,Secretaria
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Secretary,Secretaria
 DocType: Serial No,Distinct unit of an Item,Unidad distinta del producto
 DocType: Pricing Rule,Buying,Compras
 DocType: HR Settings,Employee Records to be created by,Los registros de empleados se crearán por
@@ -3131,38 +3003,35 @@
 ,Item-wise Price List Rate,Detalle del listado de precios
 DocType: Purchase Order Item,Supplier Quotation,Cotización de proveedor
 DocType: Quotation,In Words will be visible once you save the Quotation.,'En palabras' serán visibles una vez que guarde la cotización.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +68,Ironing,Planchado
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is stopped,{0} {1} esta detenido
-apps/erpnext/erpnext/stock/doctype/item/item.py +352,Barcode {0} already used in Item {1},El código de barras {0} ya se utiliza en el elemento {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +356,Barcode {0} already used in Item {1},El código de barras {0} ya se utiliza en el elemento {1}
 DocType: Lead,Add to calendar on this date,Añadir al calendario en esta fecha
 apps/erpnext/erpnext/config/selling.py +132,Rules for adding shipping costs.,Reglas para añadir los gastos de envío.
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,Próximos Eventos
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,Próximos eventos
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,Se requiere cliente
 DocType: Letter Head,Letter Head,Membrete
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +27,Quick Entry,Entrada rápida
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0} es obligatorio para su devolución
 DocType: Purchase Order,To Receive,Recibir
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +33,Shrink fitting,Retractilar
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +522,user@example.com,user@example.com
+apps/erpnext/erpnext/public/js/setup_wizard.js +266,user@example.com,usuario@ejemplo.com
 DocType: Email Digest,Income / Expense,Ingresos / gastos
 DocType: Employee,Personal Email,Correo electrónico personal
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +58,Total Variance,Total Variacion
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +62,Total Variance,Total Variacion
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.","Si está habilitado, el sistema contabiliza los asientos contables para el inventario de forma automática."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +15,Brokerage,Bolsa de valores
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +15,Brokerage,Bolsa de valores
 DocType: Address,Postal Code,Codigo postal
 DocType: Production Order Operation,"in Minutes
 Updated via 'Time Log'",en minutos actualizado a través de bitácora (gestión de tiempo)
 DocType: Customer,From Lead,Desde iniciativa
 apps/erpnext/erpnext/config/manufacturing.py +19,Orders released for production.,Las órdenes publicadas para la producción.
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +42,Select Fiscal Year...,Seleccione el año fiscal...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +442,POS Profile required to make POS Entry,Se requiere un perfil POS para crear entradas en el Punto-de-Venta
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +444,POS Profile required to make POS Entry,Se requiere un perfil POS para crear entradas en el Punto-de-Venta
 DocType: Hub Settings,Name Token,Nombre de Token
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +106,Planing,Planificar
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Selling,Venta estándar
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +120,Standard Selling,Venta estándar
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +137,Atleast one warehouse is mandatory,Al menos un almacén es obligatorio
 DocType: Serial No,Out of Warranty,Fuera de garantía
 DocType: BOM Replace Tool,Replace,Reemplazar
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +314,{0} against Sales Invoice {1},{0} contra factura de ventas {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +316,{0} against Sales Invoice {1},{0} contra factura de ventas {1}
 apps/erpnext/erpnext/stock/doctype/item/item.py +49,Please enter default Unit of Measure,"Por favor, ingrese unidad de medida (UdM) predeterminada"
 DocType: Purchase Invoice Item,Project Name,Nombre de proyecto
 DocType: Supplier,Mention if non-standard receivable account,Indique si utiliza una cuenta por cobrar distinta a la predeterminada
@@ -3178,9 +3047,8 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,Journal Entry {0} does not have account {1} or already matched against other voucher,El asiento {0} no tiene cuenta de {1} o ya esta enlazado con otro comprobante
 DocType: Item,Moving Average,Precio medio variable
 DocType: BOM Replace Tool,The BOM which will be replaced,La lista de materiales que será sustituida
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +43,New Stock UOM must be different from current stock UOM,La nueva unidad de medida (UdM) del Inventario debe ser diferente a la actual
 DocType: Account,Debit,Debe
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +34,Leaves must be allocated in multiples of 0.5,Vacaciones deben distribuirse en múltiplos de 0.5
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +44,Leaves must be allocated in multiples of 0.5,Vacaciones deben distribuirse en múltiplos de 0.5
 DocType: Production Order,Operation Cost,Costo de operación
 apps/erpnext/erpnext/config/hr.py +71,Upload attendance from a .csv file,Subir la asistencia desde un archivo .csv
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,Saldo pendiente
@@ -3198,8 +3066,7 @@
 DocType: Employee,Internal Work History,Historial de trabajo interno
 DocType: DocField,Column Break,Salto de columna
 DocType: Event,Thursday,Jueves
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +42,Private Equity,Capital de riesgo
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +93,Turning,Torneado
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,Capital de riesgo
 DocType: Maintenance Visit,Customer Feedback,Comentarios de cliente
 DocType: Account,Expense,Gastos
 DocType: Sales Invoice,Exhibition,Exposición
@@ -3212,19 +3079,19 @@
 DocType: Employee,Held On,Retenida en
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +33,Production Item,Elemento de producción
 ,Employee Information,Información del empleado
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,Rate (%),Porcentaje (%)
+apps/erpnext/erpnext/public/js/setup_wizard.js +294,Rate (%),Porcentaje (%)
 DocType: Stock Entry Detail,Additional Cost,Costo adicional
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +407,Financial Year End Date,Fin del ejercicio contable
+apps/erpnext/erpnext/public/js/setup_wizard.js +155,Financial Year End Date,Fin del ejercicio contable
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Voucher No, if grouped by Voucher","No se puede filtrar en función al 'No. de comprobante', si esta agrupado por el nombre"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +484,Make Supplier Quotation,Crear cotización de proveedor
 DocType: Quality Inspection,Incoming,Entrante
 DocType: BOM,Materials Required (Exploded),Materiales necesarios (despiece)
 DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),Reduzca la Ganancia por licencia sin goce de salario (LSS)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +512,"Add users to your organization, other than yourself",Añadir otros usuarios a su organización
+apps/erpnext/erpnext/public/js/setup_wizard.js +256,"Add users to your organization, other than yourself",Añadir otros usuarios a su organización
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No {1} does not match with {2} {3},Línea # {0}: Número de serie {1} no coincide con {2} {3}
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +44,Casual Leave,Permiso ocacional
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +44,Casual Leave,Permiso ocacional
 DocType: Batch,Batch ID,ID de lote
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +334,Note: {0},Nota: {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +336,Note: {0},Nota: {0}
 ,Delivery Note Trends,Evolución de las notas de entrega
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +104,This Week's Summary,Resumen de la semana.
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +74,{0} must be a Purchased or Sub-Contracted Item in row {1},{0} debe ser 'un producto para compra' o sub-contratado en la línea {1}
@@ -3236,7 +3103,7 @@
 DocType: Purchase Receipt,Return Against Purchase Receipt,Devolución contra recibo compra
 DocType: Purchase Order,To Bill,Por facturar
 DocType: Material Request,% Ordered,% Ordenado/a
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +61,Piecework,Trabajo por obra
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Piecework,Trabajo por obra
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +64,Avg. Buying Rate,Precio promedio de compra
 DocType: Task,Actual Time (in Hours),Tiempo actual (En horas)
 DocType: Employee,History In Company,Historia en la Compañia
@@ -3253,13 +3120,13 @@
 DocType: Opportunity,To Discuss,Para discusión
 DocType: SMS Settings,SMS Settings,Ajustes de SMS
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +60,Temporary Accounts,Cuentas temporales
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +155,Black,Negro
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Black,Negro
 DocType: BOM Explosion Item,BOM Explosion Item,Desplegar lista de materiales (LdM) del producto
 DocType: Account,Auditor,Auditor
 DocType: Purchase Order,End date of current order's period,Fecha de finalización del período de orden actual
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +17,Make Offer Letter,Crear una carta de oferta
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +10,Return,Retornar
-apps/erpnext/erpnext/stock/doctype/item/item.py +503,Default Unit of Measure for Variant must be same as Template,La unidad de medida (UdM) predeterminada para la variante debe ser la misma que la plantilla
+apps/erpnext/erpnext/stock/doctype/item/item.py +507,Default Unit of Measure for Variant must be same as Template,La unidad de medida (UdM) predeterminada para la variante debe ser la misma que la plantilla
 DocType: DocField,Fold,Plegar
 DocType: Production Order Operation,Production Order Operation,Operación en la orden de producción
 DocType: Pricing Rule,Disable,Desactivar
@@ -3270,24 +3137,21 @@
 DocType: Page,Page Name,Nombre de la página
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +110,To Time must be greater than From Time,'hasta hora' debe ser mayor que 'desde hora'
 DocType: Journal Entry Account,Exchange Rate,Tipo de cambio
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +465,Sales Order {0} is not submitted,La órden de venta {0} no esta validada
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +467,Sales Order {0} is not submitted,La órden de venta {0} no esta validada
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0}: Parent account {1} does not bolong to the company {2},Almacén {0}: La cuenta padre {1} no pertenece a la empresa {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +124,Spindle finishing,Spindle finishing
 DocType: BOM,Last Purchase Rate,Tasa de cambio de última compra
 DocType: Account,Asset,Activo
 DocType: Project Task,Task ID,Tarea ID
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +395,"e.g. ""MC""","por ejemplo ""MC"""
+apps/erpnext/erpnext/public/js/setup_wizard.js +143,"e.g. ""MC""","por ejemplo ""MC"""
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,Stock cannot exist for Item {0} since has variants,El inventario no puede existir para el pproducto {0} ya que tiene variantes
 ,Sales Person-wise Transaction Summary,Resumen de transacciones por vendedor
 DocType: System Settings,Time Zone,Zona Horaria
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +104,Warehouse {0} does not exist,Almacén {0} no existe
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +104,Warehouse {0} does not exist,El almacén {0} no existe
 apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,Registrarse en el Hub de ERPNext
 DocType: Monthly Distribution,Monthly Distribution Percentages,Porcentajes de distribución mensuales
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +16,The selected item cannot have Batch,El producto seleccionado no puede contener lotes
 DocType: Delivery Note,% of materials delivered against this Delivery Note,% de materiales entregados para esta nota de entrega
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +151,Stapling,Grapado
 DocType: Customer,Customer Details,Datos de cliente
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +105,Shaping,Formación
 DocType: Employee,Reports to,Enviar Informes a
 DocType: SMS Settings,Enter url parameter for receiver nos,Introduzca el parámetro url para los números de los receptores
 DocType: Sales Invoice,Paid Amount,Cantidad pagada
@@ -3296,13 +3160,13 @@
 DocType: Item Variant,Item Variant,Variante del producto
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +15,Setting this Address Template as default as there is no other default,Establecer esta plantilla de dirección por defecto ya que no existe una predeterminada
 apps/erpnext/erpnext/accounts/doctype/account/account.py +89,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Balance de la cuenta ya en Débito, no le está permitido establecer ""Balance Debe Ser"" como ""Crédito"""
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +76,Quality Management,Gestión de calidad
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Quality Management,Gestión de calidad
 DocType: Production Planning Tool,Filter based on customer,Filtro basado en cliente
 DocType: Payment Tool Detail,Against Voucher No,Comprobante No.
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +47,Please enter quantity for Item {0},"Por favor, ingrese la cantidad para el producto {0}"
 DocType: Employee External Work History,Employee External Work History,Historial de de trabajos anteriores
 DocType: Tax Rule,Purchase,Compra
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +34,Balance Qty,Balance
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Balance Qty,Balance
 DocType: Item Group,Parent Item Group,Grupo principal de productos
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +21,{0} for {1},{0} de {1}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +96,Cost Centers,Centros de costos
@@ -3312,12 +3176,12 @@
 DocType: Opportunity,Next Contact,Siguiente contacto
 DocType: Employee,Employment Type,Tipo de empleo
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,ACTIVOS FIJOS
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +84,Application period cannot be across two alocation records,Período de aplicación no puede ser a través de dos registros alocation
 DocType: Item Group,Default Expense Account,Cuenta de gastos por defecto
 DocType: Employee,Notice (days),Aviso (días)
 DocType: Page,Yes,Sí
 DocType: Tax Rule,Sales Tax Template,Plantilla de impuesto sobre ventas
 DocType: Employee,Encashment Date,Fecha de cobro
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +74,Electroforming,Electroformado
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +179,"Against Voucher Type must be one of Purchase Order, Purchase Invoice or Journal Entry","El tipo de comprobante debe pertenecer a orden de compra, factura de compra o registro de diario"
 DocType: Account,Stock Adjustment,Ajuste de existencias
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +34,Default Activity Cost exists for Activity Type - {0},Existe una actividad de costo por defecto para la actividad del tipo - {0}
@@ -3337,7 +3201,7 @@
 DocType: Item Variant Attribute,Attribute,Atributo
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +21,Please specify from/to range,"Por favor, especifique el rango (desde / hasta)"
 apps/frappe/frappe/public/js/frappe/model/model.js +18,Created By,Creado por
-DocType: Serial No,Under AMC,Bajo AMC
+DocType: Serial No,Under AMC,Bajo CMA (Contrato de mantenimiento anual)
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +47,Item valuation rate is recalculated considering landed cost voucher amount,La tasa de valorización del producto se vuelve a calcular considerando los costos adicionales del voucher
 apps/erpnext/erpnext/config/selling.py +70,Default settings for selling transactions.,Ajustes por defecto para las transacciones de venta.
 DocType: BOM Replace Tool,Current BOM,Lista de materiales (LdM) actual
@@ -3350,15 +3214,15 @@
 DocType: Workstation,per hour,por hora
 apps/frappe/frappe/core/doctype/doctype/doctype.py +106,Series {0} already used in {1},Secuencia {0} ya utilizada en {1}
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,Cuenta para el almacén ( Inventario Permanente ) se creará en esta Cuenta.
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,Almacén no se puede suprimir porque hay una entrada en registro de inventario para este almacén.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,"El almacén no se puede eliminar, porque existen registros de inventario para el mismo."
 DocType: Company,Distribution,Distribución
 apps/erpnext/erpnext/public/js/pos/pos.html +36,Amount Paid,Total Pagado
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +91,Project Manager,Gerente de proyectos
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +72,Dispatch,Despacho
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Project Manager,Gerente de proyectos
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +72,Dispatch,Despacho
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,Descuento máximo permitido para el producto: {0} es {1}%
 DocType: Customer,Default Taxes and Charges,Impuestos y cargos por defecto
 DocType: Account,Receivable,A cobrar
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +268,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,Fila # {0}: No se permite cambiar de proveedores como la Orden de Compra ya existe
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +263,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,Fila # {0}: No se permite cambiar de proveedores como la Orden de Compra ya existe
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,Rol autorizado para validar las transacciones que excedan los límites de crédito establecidos.
 DocType: Sales Invoice,Supplier Reference,Referencia de proveedor
 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.","Si se selecciona, la Solicitud de Materiales para los elementos de sub-ensamble será considerado para conseguir materias primas. De lo contrario , todos los elementos de sub-ensamble serán tratados como materia prima ."
@@ -3366,17 +3230,16 @@
 DocType: Hub Settings,Seller Description,Descripción del vendedor
 DocType: Employee Education,Qualification,Calificación
 DocType: Item Price,Item Price,Precio de productos
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +48,Soap & Detergent,Jabón y detergente
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +36,Motion Picture & Video,Imagén en movimiento y vídeo
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +48,Soap & Detergent,Jabón y detergente
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +36,Motion Picture & Video,Imagén en movimiento y vídeo
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Ordenado/a
-DocType: Warehouse,Warehouse Name,Nombre del Almacén
+DocType: Warehouse,Warehouse Name,Nombre del almacén
 DocType: Naming Series,Select Transaction,Seleccione el tipo de transacción
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +30,Please enter Approving Role or Approving User,"Por favor, introduzca 'Función para aprobar' o 'Usuario de aprobación'---"
 DocType: Journal Entry,Write Off Entry,Diferencia de desajuste
 DocType: BOM,Rate Of Materials Based On,Valor de materiales basado ​​en
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,Soporte analítico
 apps/erpnext/erpnext/accounts/doctype/accounts_settings/accounts_settings.py +27,Company is missing in warehouses {0},Defina la compañía en los almacenes {0}
-DocType: Stock UOM Replace Utility,Stock UOM Replace Utility,Herramienta para cambiar unidad de medida (UdM)
 DocType: POS Profile,Terms and Conditions,Términos y condiciones
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,To Date should be within the Fiscal Year. Assuming To Date = {0},La fecha debe estar dentro del año fiscal. Asumiendo a la fecha = {0}
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","Aquí usted puede ingresar la altura, el peso, alergias, problemas médicos, etc."
@@ -3388,7 +3251,7 @@
 DocType: Sales Order Item,For Production,Por producción
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +103,Please enter sales order in the above table,"Por favor, ingrese la Orden de Venta (OV) en la siguiente tabla"
 DocType: Project Task,View Task,Vista de tareas
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +406,Your financial year begins on,El año financiero inicia el
+apps/erpnext/erpnext/public/js/setup_wizard.js +154,Your financial year begins on,El año financiero inicia el
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +46,Please enter Purchase Receipts,"Por favor, ingrese los recibos de compra"
 DocType: Sales Invoice,Get Advances Received,Obtener anticipos recibidos
 DocType: Email Digest,Add/Remove Recipients,Agregar / Eliminar destinatarios
@@ -3396,16 +3259,14 @@
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","Para establecer este año fiscal por defecto, haga clic en 'Establecer como predeterminado'"
 apps/erpnext/erpnext/config/support.py +54,Setup incoming server for support email id. (e.g. support@example.com),Configuración del servidor de correo entrante corporativo de soporte técnico. (ej. support@example.com )
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,Cantidad faltante
-apps/erpnext/erpnext/stock/doctype/item/item.py +528,Item variant {0} exists with same attributes,Existe la variante de artículo {0} con mismos atributos
+apps/erpnext/erpnext/stock/doctype/item/item.py +532,Item variant {0} exists with same attributes,Existe la variante de artículo {0} con mismos atributos
 DocType: Salary Slip,Salary Slip,Nómina salarial
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +116,Burnishing,Bruñido
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +54,'To Date' is required,'Hasta la fecha' es requerido
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,'Hasta la fecha' es requerido
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","Generar etiquetas de embalaje, para los paquetes que serán entregados, usados para notificar el numero, contenido y peso del paquete, "
 DocType: Sales Invoice Item,Sales Order Item,Producto de la orden de venta
 DocType: Salary Slip,Payment Days,Días de pago
 DocType: BOM,Manage cost of operations,Administrar costo de las operaciones
 DocType: Features Setup,Item Advanced,Producto anticipado
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +40,Hot rolling,Laminación en caliente
 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.","Cuando alguna de las operaciones comprobadas está en "" Enviado "" , una ventana emergente automáticamente se abre para enviar un correo electrónico al ""Contacto"" asociado en esa transacción , con la transacción como un archivo adjunto. El usuario puede o no puede enviar el correo electrónico."
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,Configuración global
 DocType: Employee Education,Employee Education,Educación del empleado
@@ -3418,25 +3279,23 @@
 DocType: Customer,Sales Team Details,Detalles del equipo de ventas.
 DocType: Expense Claim,Total Claimed Amount,Total reembolso
 apps/erpnext/erpnext/config/crm.py +22,Potential opportunities for selling.,Oportunidades de venta.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +48,Sick Leave,Permiso por enfermedad
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +174,Invalid {0},No válida {0}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +48,Sick Leave,Permiso por enfermedad
 DocType: Email Digest,Email Digest,Boletín por correo electrónico
 DocType: Delivery Note,Billing Address Name,Nombre de la dirección de facturación
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +22,Department Stores,Tiendas por departamento
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,Tiendas por departamento
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +40,System Balance,Balance del sistema
 DocType: Workflow,Is Active,Está activo
 apps/erpnext/erpnext/controllers/stock_controller.py +71,No accounting entries for the following warehouses,No hay asientos contables para los siguientes almacenes
 apps/erpnext/erpnext/projects/doctype/project/project.js +22,Save the document first.,Guarde el documento primero.
 DocType: Account,Chargeable,Devengable
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +121,Linishing,Desbarbado
 DocType: Company,Change Abbreviation,Cambiar abreviación
 DocType: Workflow State,Primary,Primario
 DocType: Expense Claim Detail,Expense Date,Fecha de gasto
 DocType: Item,Max Discount (%),Descuento máximo (%)
 DocType: Communication,More Information,Mas información
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +70,Last Order Amount,Monto de la última orden
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +161,Blasting,Voladura
 DocType: Company,Warn,Advertir
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +111,Item valuation updated,Valoración del producto actualizado
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Otras observaciones, que deben ir en los registros."
 DocType: BOM,Manufacturing User,Usuario de producción
 DocType: Purchase Order,Raw Materials Supplied,Materias primas suministradas
@@ -3446,7 +3305,7 @@
 DocType: Appraisal,Appraisal Template,Plantilla de evaluación
 DocType: Communication,Email,Correo electrónico (Email)
 DocType: Item Group,Item Classification,Clasificación de producto
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +89,Business Development Manager,Gerente de desarrollo de negocios
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Business Development Manager,Gerente de desarrollo de negocios
 DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,Propósito de visita
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.js +15,Period,Período
 ,General Ledger,Balance general
@@ -3456,9 +3315,7 @@
 ,Itemwise Recommended Reorder Level,Nivel recomendado de reabastecimiento de producto
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +264,Please select {0} first,"Por favor, seleccione primero {0}"
 DocType: Features Setup,To get Item Group in details table,"Para obtener el grupo del producto, en detalles de tabla"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +67,Redrawing,Redibujar
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +112,Batch {0} of Item {1} has expired.,El lote {0} del producto {1} ha expirado.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +120,Etching,Grabado
 DocType: Sales Invoice,Commission,Comisión
 DocType: Address Template,"<h4>Default Template</h4>
 <p>Uses <a href=""http://jinja.pocoo.org/docs/templates/"">Jinja Templating</a> and all the fields of Address (including Custom Fields if any) will be available</p>
@@ -3484,7 +3341,7 @@
  {% if email_ID%} Email: {{email_ID}} & lt; br & gt ; {% endif -%} 
  </ code> </ pre>"
 DocType: Salary Slip Deduction,Default Amount,Importe por defecto
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +89,Warehouse not found in the system,Almacén no se encuentra en el sistema
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +89,Warehouse not found in the system,El almacén no se encuentra en el sistema
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +107,This Month's Summary,Resumen de este mes
 DocType: Quality Inspection Reading,Quality Inspection Reading,Lecturas de inspección de calidad
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +26,`Freeze Stocks Older Than` should be smaller than %d days.,'Congelar stock mayor a' debe ser menor a %d días.
@@ -3502,8 +3359,8 @@
 DocType: Sales Invoice,C-Form Applicable,C -Forma Aplicable
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +340,Operation Time must be greater than 0 for Operation {0},El tiempo de operación debe ser mayor que 0 para {0}
 DocType: Supplier,Address and Contacts,Dirección y contactos
-DocType: UOM Conversion Detail,UOM Conversion Detail,Detalle de Conversión de Unidad de Medida
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +496,Keep it web friendly 900px (w) by 100px (h),Debe Mantenerse adecuado para la web 900px (H) por 100px (V)
+DocType: UOM Conversion Detail,UOM Conversion Detail,Detalles de conversión de unidad de medida (UdM)
+apps/erpnext/erpnext/public/js/setup_wizard.js +242,Keep it web friendly 900px (w) by 100px (h),Debe Mantenerse adecuado para la web 900px (H) por 100px (V)
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +329,Production Order cannot be raised against a Item Template,La orden de producción no se puede asignar a una plantilla de producto
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +44,Charges are updated in Purchase Receipt against each item,Los cargos se actualizan en el recibo de compra  por cada producto
 DocType: Payment Tool,Get Outstanding Vouchers,Obtener comprobantes pendientes de pago
@@ -3519,59 +3376,54 @@
 DocType: Item,Average time taken by the supplier to deliver,Tiempo estimado por el proveedor para el envío 
 DocType: Time Log,Hours,Horas
 DocType: Project,Expected Start Date,Fecha prevista de inicio
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +38,Rolling,Rodado
 DocType: ToDo,Priority,Prioridad
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +41,Remove item if charges is not applicable to that item,Eliminar el elemento si los cargos no son aplicables al mismo
 DocType: Dropbox Backup,Dropbox Access Allowed,Acceso a Dropbox permitido
 DocType: Dropbox Backup,Weekly,Semanal
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,Eg . smsgateway.com / api / send_sms.cgi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +485,Receive,Recibir
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +510,Receive,Recibir
 DocType: Maintenance Visit,Fully Completed,Terminado completamente
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% Completado
 DocType: Employee,Educational Qualification,Formación académica
 DocType: Workstation,Operating Costs,Costos operativos
 DocType: Employee Leave Approver,Employee Leave Approver,Supervisor de ausencias de empleados
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,{0} has been successfully added to our Newsletter list.,{0} ha sido agregado con éxito a nuestro boletín de noticias
-apps/erpnext/erpnext/stock/doctype/item/item.py +383,Row {0}: An Reorder entry already exists for this warehouse {1},Línea {0}: Una entrada de abastecimiento ya existe para el almacén {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +387,Row {0}: An Reorder entry already exists for this warehouse {1},Línea {0}: Una entrada de abastecimiento ya existe para el almacén {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +67,"Cannot declare as lost, because Quotation has been made.","No se puede declarar como perdida, porque la cotización ha sido hecha."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +133,Electron beam machining,Mecanizado por haz de electrones
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Director de compras
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +424,Production Order {0} must be submitted,La orden de producción {0} debe ser validada
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +150,Please select Start Date and End Date for Item {0},"Por favor, seleccione Fecha de inicio y Fecha de finalización para el elemento {0}"
 apps/erpnext/erpnext/config/stock.py +141,Main Reports,Informes Generales
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +102,Stock Ledger entries balances updated,las entradas en el diario de existencias han sido actualizadas
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,La fecha no puede ser anterior a la fecha actual
 DocType: Purchase Receipt Item,Prevdoc DocType,DocType Previo
-apps/erpnext/erpnext/stock/doctype/item/item.js +176,Add / Edit Prices,Añadir / Editar Precios
+apps/erpnext/erpnext/stock/doctype/item/item.js +178,Add / Edit Prices,Añadir / Editar Precios
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +53,Chart of Cost Centers,Centros de costos
 ,Requested Items To Be Ordered,Requisiciones pendientes para ser ordenadas
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +298,My Orders,Mis pedidos
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +293,My Orders,Mis pedidos
 DocType: Price List,Price List Name,Nombre de la lista de precios
 DocType: Time Log,For Manufacturing,Para producción
-apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +70,Totals,Totales
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +174,Totals,Totales
 DocType: BOM,Manufacturing,Manufactura
 ,Ordered Items To Be Delivered,Ordenes pendientes de entrega
 DocType: Account,Income,Ingresos
 ,Setup Wizard,Asistente de configuración.
 DocType: Industry Type,Industry Type,Tipo de industria
 apps/erpnext/erpnext/templates/includes/cart.js +137,Something went wrong!,Algo salió mal!
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +68,Warning: Leave application contains following block dates,Advertencia: La solicitud de ausencia contiene las fechas bloqueadas
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +251,Sales Invoice {0} has already been submitted,La factura {0} ya ha sido validada
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +100,Warning: Leave application contains following block dates,Advertencia: La solicitud de ausencia contiene las siguientes fechas bloqueadas
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +256,Sales Invoice {0} has already been submitted,La factura {0} ya ha sido validada
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,Fecha de  finalización
 DocType: Purchase Invoice Item,Amount (Company Currency),Importe (Divisa por defecto)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +10,Die casting,Fundición a presión
 DocType: Email Alert,Reference Date,Fecha de referencia
 apps/erpnext/erpnext/config/hr.py +105,Organization unit (department) master.,Unidades de la organización (listado de departamentos.
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +25,Please enter valid mobile nos,"Por favor, ingrese un numero de móvil válido"
 DocType: Budget Detail,Budget Detail,Detalle del presupuesto
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +75,Please enter message before sending,"Por favor, ingrese el mensaje antes de enviarlo"
 DocType: Async Task,Status,Estado
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +65,Stock UOM updated for Item {0},Unidad de medida (UdM) actualizada para el producto {0}
 DocType: Company History,Year,Año
 apps/erpnext/erpnext/config/accounts.py +127,Point-of-Sale Profile,Perfiles de punto de venta (POS)
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +68,Please Update SMS Settings,"Por favor, actualizar la configuración SMS"
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +37,Time Log {0} already billed,La gestión de tiempos {0} ya se encuentra facturada
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +176,Unsecured Loans,PRESTAMOS SIN GARANTÍA
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +176,Unsecured Loans,Prestamos sin garantía
 DocType: Cost Center,Cost Center Name,Nombre del centro de costos
 DocType: Maintenance Schedule Detail,Scheduled Date,Fecha prevista.
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +69,Total Paid Amt,Monto total pagado
@@ -3580,12 +3432,12 @@
 ,Serial No Service Contract Expiry,Número de serie de expiracion del contrato de servicios
 DocType: Item,Unit of Measure Conversion,Conversión unidad de medida
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +86,Employee can not be changed,El empleado no se puede cambiar
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +259,You cannot credit and debit same account at the same time,No se pueden registrar Debitos y Creditos a la misma Cuenta al mismo tiempo
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,You cannot credit and debit same account at the same time,No se pueden registrar Debitos y Creditos a la misma Cuenta al mismo tiempo
 DocType: Naming Series,Help HTML,Ayuda 'HTML'
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},Peso total asignado debe ser de 100 %. Es {0}
 apps/erpnext/erpnext/controllers/status_updater.py +140,Allowance for over-{0} crossed for Item {1},Previsión por exceso de {0} cruzados por artículo {1}
 DocType: Address,Name of person or organization that this address belongs to.,Nombre de la persona u organización a la que esta dirección pertenece.
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +587,Your Suppliers,Sus proveedores
+apps/erpnext/erpnext/public/js/setup_wizard.js +325,Your Suppliers,Sus proveedores
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,"No se puede definir como pérdida, cuando la orden de venta esta hecha."
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +65,Another Salary Structure {0} is active for employee {1}. Please make its status 'Inactive' to proceed.,"Otra estructura salarial {0} está activo para empleado {1}. Por favor, haga su estado 'Inactivo' para proceder."
 DocType: Purchase Invoice,Contact,Contacto
@@ -3594,37 +3446,35 @@
 DocType: Item,Has Serial No,Posee numero de serie
 DocType: Employee,Date of Issue,Fecha de emisión.
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +16,{0}: From {0} for {1},{0}: Desde {0} hasta {1}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +154,Row #{0}: Set Supplier for item {1},Fila # {0}: Conjunto de Proveedores para el elemento {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +149,Row #{0}: Set Supplier for item {1},Fila # {0}: Conjunto de Proveedores para el elemento {1}
 DocType: Issue,Content Type,Tipo de contenido
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +17,Computer,Computadora
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,Computadora
 DocType: Item,List this Item in multiple groups on the website.,Listar este producto en múltiples grupos del sitio web.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +283,Please check Multi Currency option to allow accounts with other currency,"Por favor, consulte la opción Multi moneda para permitir cuentas con otra divisa"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +285,Please check Multi Currency option to allow accounts with other currency,"Por favor, consulte la opción Multi moneda para permitir cuentas con otra divisa"
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +62,Item: {0} does not exist in the system,El producto: {0} no existe en el sistema
 apps/erpnext/erpnext/accounts/doctype/account/account.py +81,You are not authorized to set Frozen value,Usted no está autorizado para definir el 'valor congelado'
 DocType: Payment Reconciliation,Get Unreconciled Entries,Verificar entradas no conciliadas
 DocType: Cost Center,Budgets,Presupuestos
 apps/frappe/frappe/core/page/modules_setup/modules_setup.py +11,Updated,Actualizado
 DocType: Employee,Emergency Contact Details,Detalles de contacto de emergencia
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +396,What does it do?,¿Qué hace?
+apps/erpnext/erpnext/public/js/setup_wizard.js +144,What does it do?,¿A qué se dedica? 
 DocType: Delivery Note,To Warehouse,Para Almacén
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +45,Account {0} has been entered more than once for fiscal year {1},Cuenta {0} se ha introducido más de una vez para el año fiscal {1}
 ,Average Commission Rate,Tasa de comisión promedio
-apps/erpnext/erpnext/stock/doctype/item/item.py +313,'Has Serial No' can not be 'Yes' for non-stock item,"'Posee numero de serie' no puede ser ""Sí"" para los productos que NO son de stock"
+apps/erpnext/erpnext/stock/doctype/item/item.py +317,'Has Serial No' can not be 'Yes' for non-stock item,"'Posee numero de serie' no puede ser ""Sí"" para los productos que NO son de stock"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Attendance can not be marked for future dates,La asistencia no se puede marcar para fechas futuras
 DocType: Pricing Rule,Pricing Rule Help,Ayuda de regla de precios
 DocType: Purchase Taxes and Charges,Account Head,Cuenta matriz
 apps/erpnext/erpnext/config/stock.py +79,Update additional costs to calculate landed cost of items,Actualización de los costes adicionales para el cálculo del precio al desembarque de artículos
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +111,Electrical,Eléctrico
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +111,Electrical,Eléctrico
 DocType: Stock Entry,Total Value Difference (Out - In),Total diferencia  (Salidas - Entradas)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +302,Row {0}: Exchange Rate is mandatory,Fila {0}: Tipo de cambio es obligatorio
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +304,Row {0}: Exchange Rate is mandatory,Fila {0}: Tipo de cambio es obligatorio
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},ID de usuario no establecido para el empleado {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +72,Peening,Pendiente
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,From Warranty Claim,Desde reclamo de garantía
 DocType: Stock Entry,Default Source Warehouse,Almacén de origen
 DocType: Item,Customer Code,Código de cliente
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +212,Birthday Reminder for {0},Recordatorio de cumpleaños para {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +163,Lapping,Pulido
-apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.js +8,Days Since Last Order,Días desde la última orden
+apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +72,Days Since Last Order,Días desde la última orden
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +299,Debit To account must be a Balance Sheet account,La cuenta de débito debe pertenecer a las cuentas de balance
 DocType: Buying Settings,Naming Series,Secuencias e identificadores
 DocType: Leave Block List,Leave Block List Name,Nombre de la Lista de Bloqueo de Vacaciones
@@ -3638,7 +3488,7 @@
 DocType: Notification Control,Sales Invoice Message,Mensaje de factura
 DocType: Authorization Rule,Based On,Basado en
 DocType: Sales Order Item,Ordered Qty,Cantidad ordenada
-apps/erpnext/erpnext/stock/doctype/item/item.py +539,Item {0} is disabled,Artículo {0} está deshabilitado
+apps/erpnext/erpnext/stock/doctype/item/item.py +543,Item {0} is disabled,Artículo {0} está deshabilitado
 DocType: Stock Settings,Stock Frozen Upto,Inventario congelado hasta
 apps/erpnext/erpnext/controllers/recurring_document.py +166,Period From and Period To dates mandatory for recurring {0},Periodo Desde y Período Para fechas obligatorias para los recurrentes {0}
 apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,Actividad del proyecto / tarea.
@@ -3648,7 +3498,6 @@
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,El descuento debe ser inferior a 100
 DocType: ToDo,Low,Bajo
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Saldo de perdidas y ganancias (Divisa por defecto)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +71,Spinning,Hilado
 DocType: Landed Cost Voucher,Landed Cost Voucher,Comprobante de costos de destino estimados
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +55,Please set {0},"Por favor, configure {0}"
 DocType: Purchase Invoice,Repeat on Day of Month,Repetir un día al mes
@@ -3670,7 +3519,6 @@
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +37,Campaign Name is required,Es necesario ingresar el nombre  de la campaña
 DocType: Maintenance Visit,Maintenance Date,Fecha de mantenimiento
 DocType: Purchase Receipt Item,Rejected Serial No,No. de serie rechazado
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +51,Deep drawing,Embutición profunda
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +40,New Newsletter,Nuevo boletín
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +157,Start date should be less than end date for Item {0},La fecha de inicio debe ser menor que la fecha de finalización para el producto {0}
 apps/erpnext/erpnext/stock/doctype/item/item.js +17,Show Balance,Mostrar balance
@@ -3681,7 +3529,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +119,BOM and Manufacturing Quantity are required,Se requiere la lista de materiales (LdM) y cantidad a manufacturar.
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Rango de antigüedad 2
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +450,Amount,Importe
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +147,Riveting,Remachado
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,Lista de materiales (LdM) reemplazada
 ,Sales Analytics,Análisis de ventas
 DocType: Manufacturing Settings,Manufacturing Settings,Ajustes de producción
@@ -3693,20 +3540,19 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +207,New Account Name,Nombre de nueva cuenta
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,Costo materias primas suministradas
 DocType: Selling Settings,Settings for Selling Module,Ajustes para módulo de ventas
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +73,Customer Service,Servicio al cliente
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Customer Service,Servicio al cliente
 DocType: Item,Thumbnail,Miniatura
 DocType: Item Customer Detail,Item Customer Detail,Detalle del producto para el cliente
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +147,Confirm Your Email,Confirme su Email
 apps/erpnext/erpnext/config/hr.py +53,Offer candidate a Job.,Ofrecer al candidato un empleo.
 DocType: Notification Control,Prompt for Email on Submission of,Consultar por el correo electrónico el envío de
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +81,Total allocated leaves are more than days in the period,Total de hojas asignados más de día en el período
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +70,Item {0} must be a stock Item,El producto {0} debe ser un producto en stock
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,Almacén predeterminado de trabajos en proceso
 apps/erpnext/erpnext/config/accounts.py +107,Default settings for accounting transactions.,Los ajustes por defecto para las transacciones contables.
 apps/frappe/frappe/model/naming.py +40,{0} is required,{0} es requerido
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +21,Vacuum molding,Moldeo por vacío
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,La fecha prevista no puede ser menor que la fecha de requisición de materiales
 DocType: Contact Us Settings,City,Ciudad
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +132,Ultrasonic machining,Mecanizado por ultrasonidos
 apps/frappe/frappe/templates/base.html +137,Error: Not a valid id?,Error: No es un ID válido?
 apps/erpnext/erpnext/stock/get_item_details.py +125,Item {0} must be a Sales Item,El producto {0} debe ser un producto para la venta
 DocType: Naming Series,Update Series Number,Actualizar número de serie
@@ -3714,7 +3560,7 @@
 DocType: Sales Order,Printing Details,Detalles de impresión
 DocType: Task,Closing Date,Fecha de cierre
 DocType: Sales Order Item,Produced Quantity,Cantidad producida
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +84,Engineer,Ingeniero
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Engineer,Ingeniero
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,Buscar Sub-ensamblajes
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +379,Item Code required at Row No {0},Código del producto requerido en la línea: {0}
 DocType: Sales Partner,Partner Type,Tipo de socio
@@ -3722,7 +3568,7 @@
 DocType: Authorization Rule,Customerwise Discount,Descuento de cliente
 DocType: Purchase Invoice,Against Expense Account,Contra la Cuenta de Gastos
 DocType: Production Order,Production Order,Orden de producción
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +258,Installation Note {0} has already been submitted,La nota de instalación {0} ya se ha validado
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +263,Installation Note {0} has already been submitted,La nota de instalación {0} ya se ha validado
 DocType: Quotation Item,Against Docname,Contra Docname
 DocType: SMS Center,All Employee (Active),Todos los Empleados (Activos)
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,Ver Ahora
@@ -3731,19 +3577,19 @@
 DocType: Item,Re-Order Level,Nivel mínimo de stock.
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,Escriba artículos y Cantidad planificada para los que desea elevar las órdenes de producción o descargar la materia prima para su análisis.
 apps/frappe/frappe/public/js/frappe/views/ganttview.js +45,Gantt Chart,Diagrama Gantt
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +57,Part-time,Tiempo parcial
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,Part-time,Tiempo parcial
 DocType: Employee,Applicable Holiday List,Lista de días festivos
 DocType: Employee,Cheque,Cheque
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,Secuencia actualizada
 apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Report Type is mandatory,El tipo de reporte es obligatorio
 DocType: Item,Serial Number Series,Secuencia del número de serie
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},El almacén es obligatorio para el producto {0} en la línea {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +45,Retail & Wholesale,Ventas al por menor y por mayor
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,Ventas al por menor y por mayor
 DocType: Issue,First Responded On,Primera respuesta el
 DocType: Website Item Group,Cross Listing of Item in multiple groups,Cruz Ficha de artículo en varios grupos
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +351,The First User: You,El primer usuario: Usted
+apps/erpnext/erpnext/public/js/setup_wizard.js +101,The First User: You,El primer usuario: Usted
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +48,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},La fecha de inicio y la fecha final ya están establecidos en el año fiscal {0}
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +172,Successfully Reconciled,Reconciliado exitosamente
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +119,Successfully Reconciled,Reconciliado exitosamente
 DocType: Production Order,Planned End Date,Fecha de finalización planeada
 apps/erpnext/erpnext/config/stock.py +43,Where items are stored.,Dónde se almacenarán los productos
 DocType: Tax Rule,Validity,Validez
@@ -3763,39 +3609,36 @@
 DocType: DocPerm,Level,Nivel
 DocType: Purchase Taxes and Charges,On Net Total,Sobre el total neto
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +160,Target warehouse in row {0} must be same as Production Order,Almacenes de destino de la línea {0} deben ser los mismos para la orden de producción
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +59,No permission to use Payment Tool,No tiene permiso para utilizar la herramienta de pagos
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +97,No permission to use Payment Tool,No tiene permiso para utilizar la herramienta de pagos
 apps/erpnext/erpnext/controllers/recurring_document.py +192,'Notification Email Addresses' not specified for recurring %s,'Email de notificación' no especificado para %s recurrentes
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +86,Milling,Molienda
 apps/erpnext/erpnext/accounts/doctype/account/account.py +99,Currency can not be changed after making entries using some other currency,El tipo de moneda/divisa no se puede cambiar después de crear la entrada contable
 DocType: Company,Round Off Account,Cuenta de redondeo por defecto
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +60,Nibbling,Mordisqueando
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,GASTOS DE ADMINISTRACIÓN
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +18,Consulting,Consuloría
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +18,Consulting,Consuloría
 DocType: Customer Group,Parent Customer Group,Categoría principal de cliente
 apps/erpnext/erpnext/public/js/pos/pos.js +429,Change,Cambio
 DocType: Purchase Invoice,Contact Email,Correo electrónico de contacto
 DocType: Appraisal Goal,Score Earned,Puntuación Obtenida.
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +393,"e.g. ""My Company LLC""","por ejemplo ""Mi Compañia LLC"""
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +173,Notice Period,Período de notificación
+apps/erpnext/erpnext/public/js/setup_wizard.js +141,"e.g. ""My Company LLC""","por ejemplo ""Mi Compañia LLC"""
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +173,Notice Period,Período de notificación
 DocType: Bank Reconciliation Detail,Voucher ID,Comprobante ID
 apps/erpnext/erpnext/setup/doctype/territory/territory.js +14,This is a root territory and cannot be edited.,Este es un territorio principal y no se puede editar.
 DocType: Packing Slip,Gross Weight UOM,Peso bruto de la unidad de medida (UdM)
 DocType: Email Digest,Receivables / Payables,Por cobrar / Por pagar
 DocType: Delivery Note Item,Against Sales Invoice,Contra la factura de venta
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +63,Stamping,Estampado
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +457,Credit Account,Cuenta de crédito
 DocType: Landed Cost Item,Landed Cost Item,Costos de destino estimados
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +56,Show zero values,Mostrar valores en cero
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,Cantidad del producto obtenido después de la fabricación / empaquetado desde las cantidades determinadas de materia prima
 DocType: Payment Reconciliation,Receivable / Payable Account,Cuenta por Cobrar / Pagar
 DocType: Delivery Note Item,Against Sales Order Item,Contra la orden de venta del producto
-apps/erpnext/erpnext/stock/doctype/item/item.py +521,Please specify Attribute Value for attribute {0},"Por favor, especifique el valor del atributo {0}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +525,Please specify Attribute Value for attribute {0},"Por favor, especifique el valor del atributo {0}"
 DocType: Item,Default Warehouse,Almacén por defecto
 DocType: Task,Actual End Date (via Time Logs),Fecha de finalización (gestión de tiempos)
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +37,Budget cannot be assigned against Group Account {0},El presupuesto no se puede asignar contra el grupo de cuentas {0}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +23,Please enter parent cost center,"Por favor, ingrese el centro de costos principal"
 DocType: Delivery Note,Print Without Amount,Imprimir sin importe
-apps/erpnext/erpnext/controllers/buying_controller.py +69,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,La categoría de impuestos no puede ser 'Valoración ' o 'Valoración y totales' ya que todos los productos no son elementos de inventario
+apps/erpnext/erpnext/controllers/buying_controller.py +60,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,La categoría de impuestos no puede ser 'Valoración ' o 'Valoración y totales' ya que todos los productos no son elementos de inventario
 DocType: User,Last Name,Apellido
 DocType: Web Page,Left,Inactivo/Fuera
 DocType: Event,All Day,Todo el Día
@@ -3803,7 +3646,7 @@
 DocType: Appraisal,Total Score (Out of 5),Puntaje total (de 5 )
 DocType: Contact Us Settings,State,Estado
 DocType: Batch,Batch,Lotes de producto
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +51,Balance,Balance
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +28,Balance,Balance
 DocType: Project,Total Expense Claim (via Expense Claims),Total reembolso (Vía reembolsos de gastos)
 DocType: User,Gender,Género
 DocType: Journal Entry,Debit Note,Nota de débito
@@ -3833,8 +3676,7 @@
 DocType: Purchase Order,Get Last Purchase Rate,Obtener último precio de compra
 DocType: Time Log,Billing Rate based on Activity Type (per hour),Monto de facturación basado en el tipo de actividad (por hora)
 DocType: Company,Company Info,Información de la compañía
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +76,Seaming,Seaming
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +197,"Company Email ID not found, hence mail not sent","Email de la compañía no encontrado, por lo que el correo no ha sido enviado"
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +206,"Company Email ID not found, hence mail not sent","Email de la compañía no encontrado, por lo que el correo no ha sido enviado"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),UTILIZACIÓN DE FONDOS (ACTIVOS)
 DocType: Production Planning Tool,Filter based on item,Filtro basado en producto
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +451,Debit Account,Cuenta de debito
@@ -3846,17 +3688,16 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +95,{0} {1} has been modified. Please refresh.,{0} {1} ha sido modificado. Por favor actualizar.
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,No permitir a los usuarios crear solicitudes de ausencia en los siguientes días.
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +591,From Opportunity,Desde oportunidades
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +46,Blanking,Supresión
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +166,Employee Benefits,Beneficios de empleados
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,Employee Benefits,Beneficios de empleados
 DocType: Sales Invoice,Is POS,Es POS
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +240,Packed quantity must equal quantity for Item {0} in row {1},La cantidad embalada debe ser igual a la del elemento {0} en la línea {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +245,Packed quantity must equal quantity for Item {0} in row {1},La cantidad embalada debe ser igual a la del elemento {0} en la línea {1}
 DocType: Production Order,Manufactured Qty,Cantidad producida
 DocType: Purchase Receipt Item,Accepted Quantity,Cantidad Aceptada
 apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} no existe
 apps/erpnext/erpnext/config/accounts.py +18,Bills raised to Customers.,Listado de facturas emitidas a los clientes.
 DocType: DocField,Default,Predeterminado
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,ID del proyecto
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +466,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Línea #{0}: El importe no puede ser mayor que el reembolso pendiente {1}. El importe pendiente es {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +468,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Línea #{0}: El importe no puede ser mayor que el reembolso pendiente {1}. El importe pendiente es {2}
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +40,{0} subscribers added,{0} suscriptores añadidos
 DocType: Maintenance Schedule,Schedule,Programa
 DocType: Cost Center,"Define Budget for this Cost Center. To set budget action, see ""Company List""","Defina el presupuesto para este centro de costos, puede configurarlo en 'Listado de compañía'"
@@ -3867,7 +3708,7 @@
 apps/erpnext/erpnext/public/js/pos/pos.js +91,Price List not found or disabled,La lista de precios no existe o está deshabilitada.
 DocType: Expense Claim,Approved,Aprobado
 DocType: Pricing Rule,Price,Precio
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +79,Employee relieved on {0} must be set as 'Left',"Empleado relevado en {0} debe definirse como ""izquierda"""
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +88,Employee relieved on {0} must be set as 'Left',"Empleado relevado en {0} debe definirse como ""izquierda"""
 DocType: Item,"Selecting ""Yes"" will give a unique identity to each entity of this item which can be viewed in the Serial No master.","Al seleccionar "" Sí"" le dará una identidad única a cada elemento de este producto que se podrá ver en el numero de serie principal"
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +39,Appraisal {0} created for Employee {1} in the given date range,La evaluación {0} creado para el empleado {1} en el rango de fechas determinado
 DocType: Employee,Education,Educación
@@ -3878,7 +3719,7 @@
 apps/frappe/frappe/desk/moduleview.py +67,Standard Reports,Informes Estándares
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,Entradas en el diario de contabilidad.
 DocType: Delivery Note Item,Available Qty at From Warehouse,Disponible Cantidad a partir de Almacén
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +209,Please select Employee Record first.,"Por favor, primero seleccione el registro del empleado."
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +224,Please select Employee Record first.,"Por favor, primero seleccione el registro del empleado."
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Línea {0}: Socio / Cuenta no coincide con {1} / {2} en {3} {4}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +35,To create a Tax Account,Para crear una cuenta de impuestos
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +233,Please enter Expense Account,"Por favor, ingrese la Cuenta de Gastos"
@@ -3891,46 +3732,43 @@
 DocType: Sales Order,Track this Sales Order against any Project,Monitorear esta órden de venta sobre cualquier proyecto
 DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,Obtener ordenes de venta (pendientes de entrega) basadas en los criterios anteriores
 DocType: DocShare,Document Type,Tipo de documento
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +565,From Supplier Quotation,Desde cotización de proveedor
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +588,From Supplier Quotation,Desde cotización de proveedor
 DocType: Deduction Type,Deduction Type,Tipo de deducción
 DocType: Attendance,Half Day,Medio Día
 DocType: Pricing Rule,Min Qty,Cantidad mínima
 DocType: Features Setup,"To track items in sales and purchase documents with batch nos. ""Preferred Industry: Chemicals""","Para realizar un seguimiento de los productos en los documentos de compra y venta, con los números de lote. 'Industria preferida: Químicos'"
 DocType: GL Entry,Transaction Date,Fecha de transacción
 DocType: Production Plan Item,Planned Qty,Cantidad planificada
-apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +91,Total Tax,Impuesto Total
+apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +93,Total Tax,Impuesto Total
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +178,For Quantity (Manufactured Qty) is mandatory,Por cantidad (cantidad fabricada) es obligatoria
 DocType: Stock Entry,Default Target Warehouse,Almacen de destino predeterminado
 DocType: Purchase Invoice,Net Total (Company Currency),Total neto (Divisa por defecto)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +79,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Línea {0}: el tipo de entidad es aplicable únicamente contra las cuentas de cobrar/pagar
 DocType: Notification Control,Purchase Receipt Message,Mensaje de recibo de compra
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +95,Total allocated leaves are more than period,Total de hojas asignados más de periodo
 DocType: Production Order,Actual Start Date,Fecha de inicio actual
 DocType: Sales Order,% of materials delivered against this Sales Order,% de materiales entregados para esta orden de venta
 apps/erpnext/erpnext/config/stock.py +23,Record item movement.,Listado de todos los movimientos de inventario.
 DocType: Newsletter List Subscriber,Newsletter List Subscriber,Lista de suscriptores al boletín
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +164,Morticing,Mortajar
 DocType: Email Account,Service,Servicios
 DocType: Hub Settings,Hub Settings,Ajustes del Centro de actividades
 DocType: Project,Gross Margin %,Margen bruto %
 DocType: BOM,With Operations,Con operaciones
 apps/erpnext/erpnext/accounts/party.py +232,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,"Asientos contables ya se han hecho en moneda {0} para la compañía de {1}. Por favor, seleccione una cuenta por cobrar o por pagar con la moneda {0}."
 ,Monthly Salary Register,Registar salario mensual
-apps/frappe/frappe/website/template.py +140,Next,Siguiente
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard_page.html +17,Next,Siguiente
 DocType: Warranty Claim,If different than customer address,Si es diferente a la dirección del cliente
 DocType: BOM Operation,BOM Operation,Operación de la lista de materiales (LdM)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +118,Electropolishing,Electropulido
 DocType: Purchase Taxes and Charges,On Previous Row Amount,Sobre la línea anterior
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +24,Please enter Payment Amount in atleast one row,"Por favor, ingrese el importe pagado en una línea"
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +33,Please enter Payment Amount in atleast one row,"Por favor, ingrese el importe pagado en una línea"
 DocType: POS Profile,POS Profile,Perfil de POS
 apps/erpnext/erpnext/config/accounts.py +153,"Seasonality for setting budgets, targets etc.","Configuración general para establecer presupuestos, objetivos, etc."
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +238,Row {0}: Payment Amount cannot be greater than Outstanding Amount,Línea {0}: El importe de pago no puede ser superior al monto pendiente de pago
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +46,Total Unpaid,Total impagado
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +21,Time Log is not billable,La gestión de tiempos no se puede facturar
 apps/erpnext/erpnext/stock/get_item_details.py +128,"Item {0} is a template, please select one of its variants","El producto {0} es una plantilla, por favor seleccione una de sus variantes"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +528,Purchaser,Comprador
+apps/erpnext/erpnext/public/js/setup_wizard.js +272,Purchaser,Comprador
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +81,Net pay cannot be negative,El salario neto no puede ser negativo
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +71,Please enter the Against Vouchers manually,"Por favor, ingrese los recibos correspondientes manualmente"
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +107,Please enter the Against Vouchers manually,"Por favor, ingrese los recibos correspondientes manualmente"
 DocType: SMS Settings,Static Parameters,Parámetros estáticos
 DocType: Purchase Order,Advance Paid,Pago Anticipado
 DocType: Item,Item Tax,Impuestos del producto
@@ -3939,14 +3777,12 @@
 apps/erpnext/erpnext/config/crm.py +48,Send mass SMS to your contacts,Enviar mensajes SMS masivos a sus contactos
 DocType: Purchase Taxes and Charges,Consider Tax or Charge for,Considerar impuestos o cargos por
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,Cantidad actual es obligatoria
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +42,Cross-rolling,Cross-balanceo
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +132,Credit Card,Tarjetas de credito
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +132,Credit Card,Tarjetas de credito
 DocType: BOM,Item to be manufactured or repacked,Producto a manufacturar o re-empacar
 apps/erpnext/erpnext/config/stock.py +95,Default settings for stock transactions.,Los ajustes por defecto para las transacciones de inventario.
 DocType: Purchase Invoice,Next Date,Siguiente fecha
 DocType: Employee Education,Major/Optional Subjects,Principales / Asignaturas Optativas
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +49,Please enter Taxes and Charges,"Por favor, introduzca los impuestos y cargos"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +85,Machining,Laboreo
 DocType: Sales Invoice Item,Drop Ship,Nave de la gota
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","Aquí usted puede ingresar los detalles de la familia como el nombre y ocupación de los padres, cónyuge e hijos"
 DocType: Hub Settings,Seller Name,Nombre de vendedor
@@ -3956,7 +3792,7 @@
 DocType: Stock Entry,Repack,Re-empacar
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +6,You must Save the form before proceeding,Debe guardar el formulario antes de proceder
 DocType: Item Attribute,Numeric Values,Valores numéricos
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +500,Attach Logo,Adjuntar logo
+apps/erpnext/erpnext/public/js/setup_wizard.js +246,Attach Logo,Adjuntar logo
 DocType: Customer,Commission Rate,Comisión de ventas
 apps/erpnext/erpnext/stock/doctype/item/item.js +38,Make Variant,Crear variante
 apps/erpnext/erpnext/config/hr.py +145,Block leave applications by department.,Bloquear solicitudes de ausencias por departamento.
@@ -3971,19 +3807,19 @@
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +105,Please select a csv file,"Por favor, seleccione un archivo csv"
 DocType: Dropbox Backup,Send Backups to Dropbox,Enviar copias de seguridad hacia Dropbox
 DocType: Purchase Order,To Receive and Bill,Para recibir y pagar
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +94,Designer,Diseñador
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Designer,Diseñador
 apps/erpnext/erpnext/config/selling.py +121,Terms and Conditions Template,Plantillas de términos y condiciones
 DocType: Serial No,Delivery Details,Detalles de la entrega
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +383,Cost Center is required in row {0} in Taxes table for type {1},Centro de costos requerido para la línea {0} en la tabla Impuestos para el tipo {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +386,Cost Center is required in row {0} in Taxes table for type {1},Centro de costos requerido para la línea {0} en la tabla Impuestos para el tipo {1}
 DocType: Item,Automatically create Material Request if quantity falls below this level,Crear automáticamente una 'requisición de materiales' si la cantidad es inferior a este nivel
 ,Item-wise Purchase Register,Detalle de compras
 DocType: Batch,Expiry Date,Fecha de caducidad
-apps/erpnext/erpnext/stock/doctype/item/item.py +375,"To set reorder level, item must be a Purchase Item or Manufacturing Item","Para establecer el nivel de reabastecimiento, el producto debe ser de 'compra' o un producto para fabricación"
+apps/erpnext/erpnext/stock/doctype/item/item.py +379,"To set reorder level, item must be a Purchase Item or Manufacturing Item","Para establecer el nivel de reabastecimiento, el producto debe ser de 'compra' o un producto para fabricación"
 ,Supplier Addresses and Contacts,Libreta de direcciones de proveedores
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,"Por favor, seleccione primero la categoría"
 apps/erpnext/erpnext/config/projects.py +18,Project master.,Listado de todos los proyectos.
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,No volver a mostrar cualquier símbolo como $ u otro junto a las monedas.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +330, (Half Day),(Medio día)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +374, (Half Day),(Medio día)
 DocType: Supplier,Credit Days,Días de crédito
 DocType: Leave Type,Is Carry Forward,Es un traslado
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +478,Get Items from BOM,Obtener productos desde lista de materiales (LdM)
@@ -3991,7 +3827,7 @@
 apps/erpnext/erpnext/config/manufacturing.py +120,Bill of Materials,Lista de materiales (LdM)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +77,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Línea {0}: el tipo de entidad se requiere para la cuenta por cobrar/pagar {1}
 DocType: Dropbox Backup,Send Notifications To,Enviar notificaciones a>
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html +26,Ref Date,Fecha Ref.
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +54,Ref Date,Fecha Ref.
 DocType: Employee,Reason for Leaving,Razones de renuncia
 DocType: Expense Claim Detail,Sanctioned Amount,Monto sancionado
 DocType: GL Entry,Is Opening,De apertura
@@ -3999,4 +3835,3 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +188,Account {0} does not exist,Cuenta {0} no existe
 DocType: Account,Cash,Efectivo
 DocType: Employee,Short biography for website and other publications.,Breve biografía para la página web y otras publicaciones.
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +31,Please create Salary Structure for employee {0},"Por favor, cree una estructura salarial para el empleado {0}"
diff --git a/erpnext/translations/fa.csv b/erpnext/translations/fa.csv
index 7dc09ca..e9cf5f9 100644
--- a/erpnext/translations/fa.csv
+++ b/erpnext/translations/fa.csv
@@ -1,13 +1,12 @@
 DocType: Employee,Salary Mode,حالت حقوق و دستمزد
 DocType: Cost Center,"Select Monthly Distribution, if you want to track based on seasonality.",انتخاب توزیع ماهانه، اگر شما می خواهید برای ردیابی بر اساس فصلی.
 DocType: Employee,Divorced,طلاق
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +86,Warning: Same item has been entered multiple times.,هشدار: همان مورد وارد شده است چندین بار.
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +80,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,اجازه می دهد مورد به چند بار در یک معامله اضافه شود
 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/page/setup_wizard/fixtures/industry_type.py +19,Consumer Products,محصولات قابل فروش
+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,لطفا ابتدا حزب نوع را انتخاب کنید
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +90,Annealing,آنیل
 DocType: Item,Customer Items,آیتم های مشتری
 apps/erpnext/erpnext/accounts/doctype/account/account.py +45,Account {0}: Parent account {1} can not be a ledger,حساب {0}: حساب مرجع {1} می تواند یک دفتر نمی
 DocType: Item,Publish Item to hub.erpnext.com,مورد انتشار hub.erpnext.com
@@ -20,15 +19,14 @@
 DocType: About Us Settings,Website,سایت اینترنتی
 DocType: POS Profile,Applicable for User,قابل استفاده برای کاربر
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +169,"Stopped Production Order cannot be cancelled, Unstop it first to cancel",متوقف سفارش تولید نمی تواند لغو شود، آن را اولین Unstop برای لغو
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +23,Compaction plus sintering,تراکم علاوه پخت
 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.,* * * * آیا می شود در معامله محاسبه می شود.
 DocType: Purchase Order,Customer Contact,مشتریان تماس با
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +549,From Material Request,از درخواست مواد
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +572,From Material Request,از درخواست مواد
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} درخت
 DocType: Job Applicant,Job Applicant,درخواستگر کار
 apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,نتایج بیشتری.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +78,Legal,حقوقی
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +34,Legal,حقوقی
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +114,Actual type tax cannot be included in Item rate in row {0},مالیات واقعی نوع می تواند در میزان مورد در ردیف شامل نمی شود {0}
 DocType: C-Form,Customer,مشتری
 DocType: Purchase Receipt Item,Required By,مورد نیاز
@@ -43,7 +41,6 @@
 DocType: Manufacturing Settings,Default 10 mins,پیش فرض 10 دقیقه
 DocType: Leave Type,Leave Type Name,ترک نام نوع
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +148,Series Updated Successfully,سری به روز رسانی با موفقیت
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +150,Stitching,دوخت
 DocType: Pricing Rule,Apply On,درخواست در
 DocType: Item Price,Multiple Item prices.,قیمت مورد چندگانه.
 ,Purchase Order Items To Be Received,سفارش خرید اقلام به دریافت
@@ -51,8 +48,8 @@
 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 +104,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 +189,New Leave Application,جدید مرخصی استفاده
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +134,Bank Draft,حواله بانکی
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +204,New Leave Application,جدید مرخصی استفاده
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +134,Bank Draft,حواله بانکی
 DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,1. برای حفظ مشتری کد عاقلانه مورد و به آنها جستجو بر اساس استفاده از کد خود را در این گزینه
 DocType: Mode of Payment Account,Mode of Payment Account,نحوه حساب پرداخت
 apps/erpnext/erpnext/stock/doctype/item/item.js +34,Show Variants,نمایش انواع
@@ -64,25 +61,23 @@
 DocType: Production Plan Item,Production Plan Item,تولید مورد طرح
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +141,User {0} is already assigned to Employee {1},کاربر {0} در حال حاضر به کارکنان اختصاص داده {1}
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +13,Make new POS Profile,را نمایش جدید POS
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +31,Health Care,بهداشت و درمان
+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 +494,Invoice,فاکتور
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +519,Invoice,فاکتور
 DocType: Maintenance Schedule Item,Periodicity,تناوب
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +357,Email Address,آدرس ایمیل
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +21,Defense,دفاع
+apps/erpnext/erpnext/public/js/setup_wizard.js +107,Email Address,آدرس ایمیل
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,دفاع
 DocType: Company,Abbr,مخفف
 DocType: Appraisal Goal,Score (0-5),امتیاز (0-5)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +193,Row {0}: {1} {2} does not match with {3},ردیف {0}: {1} {2} با مطابقت ندارد {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +67,Row # {0}:,ردیف # {0}:
 DocType: Delivery Note,Vehicle No,خودرو بدون
 apps/erpnext/erpnext/public/js/pos/pos.js +528,Please select Price List,لطفا لیست قیمت را انتخاب کنید
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +162,Woodworking,نجاری
 DocType: Production Order Operation,Work In Progress,کار در حال انجام
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +153,3D printing,چاپ سه بعدی
 DocType: Employee,Holiday List,فهرست تعطیلات
 DocType: Time Log,Time Log,زمان ورود
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +530,Accountant,حسابدار
+apps/erpnext/erpnext/public/js/setup_wizard.js +274,Accountant,حسابدار
 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.",ورود از فعالیت های انجام شده توسط کاربران در برابر وظایف است که می تواند برای ردیابی زمان، صدور صورت حساب استفاده می شود.
@@ -98,18 +93,19 @@
 DocType: Bin,Quantity Requested for Purchase,تعداد درخواست برای خرید
 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/setup/page/setup_wizard/setup_wizard.js +626,Kg,کیلوگرم
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Kg,کیلوگرم
 apps/erpnext/erpnext/config/hr.py +48,Opening for a Job.,باز کردن برای یک کار.
 DocType: Item Attribute,Increment,افزایش
 apps/erpnext/erpnext/public/js/stock_analytics.js +63,Select Warehouse...,انتخاب کنید ... انبار
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +6,Advertising,تبلیغات
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,تبلیغات
+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/doctype/sales_invoice/sales_invoice.py +389,Stock cannot be updated against Delivery Note {0},سهام می تواند در برابر تحویل توجه نمی شود به روز شده {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +391,Stock cannot be updated against Delivery Note {0},سهام می تواند در برابر تحویل توجه نمی شود به روز شده {0}
 DocType: Payment Reconciliation,Reconcile,وفق دادن
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +30,Grocery,خواربار
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,خواربار
 DocType: Quality Inspection Reading,Reading 1,خواندن 1
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Make Bank Entry,را بانک ورودی
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +40,Pension Funds,صندوق های بازنشستگی
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,صندوق های بازنشستگی
 apps/erpnext/erpnext/accounts/doctype/account/account.py +142,Warehouse is mandatory if account type is Warehouse,انبار اجباری است اگر نوع حساب انبار است
 DocType: SMS Center,All Sales Person,همه فرد از فروش
 DocType: Lead,Person Name,نام شخص
@@ -131,7 +127,7 @@
 DocType: Quality Inspection,Get Specification Details,دریافت اطلاعات بیشتر مشخصات
 DocType: Lead,Interested,علاقمند
 apps/erpnext/erpnext/config/manufacturing.py +14,Bill of Material,صورت مواد
-apps/erpnext/erpnext/public/js/stock_analytics.js +45,Opening,افتتاح
+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,کپی برداری از مورد گروه
 DocType: Journal Entry,Opening Entry,ورود افتتاح
@@ -145,23 +141,22 @@
 DocType: Employee Education,Under Graduate,مقطع
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +22,Target On,هدف در
 DocType: BOM,Total Cost,هزینه کل
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +99,Reaming,Reaming
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +9,Activity Log:,گزارش فعالیت:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +199,Item {0} does not exist in the system or has expired,مورد {0} در سیستم وجود ندارد و یا تمام شده است
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +44,Real Estate,عقار
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +44,Real Estate,عقار
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +4,Statement of Account,بیانیه ای از حساب
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +41,Pharmaceuticals,داروسازی
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,داروسازی
 DocType: Expense Claim Detail,Claim Amount,مقدار ادعا
 DocType: Employee,Mr,آقای
 DocType: Custom Script,Client,مشتری
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,نوع منبع / تامین کننده
 DocType: Naming Series,Prefix,پیشوند
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Consumable,مصرفی
+apps/erpnext/erpnext/public/js/setup_wizard.js +359,Consumable,مصرفی
 DocType: Upload Attendance,Import Log,واردات ورود
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.js +19,Send,ارسال
 DocType: Sales Invoice Item,Delivered By Supplier,تحویل داده شده توسط کننده
 DocType: SMS Center,All Contact,همه تماس
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +164,Annual Salary,حقوق سالانه
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +164,Annual Salary,حقوق سالانه
 DocType: Period Closing Voucher,Closing Fiscal Year,بستن سال مالی
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +69,Stock Expenses,هزینه سهام
 DocType: Newsletter,Email Sent?,ایمیل فرستاده شده است؟
@@ -169,26 +164,24 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +92,Show Time Logs,نمایش زمان گزارش ها
 DocType: Journal Entry Account,Credit in Company Currency,اعتبار در شرکت ارز
 DocType: Delivery Note,Installation Status,وضعیت نصب و راه اندازی
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +115,Accepted + Rejected Qty must be equal to Received quantity for Item {0},پذیرفته شده + رد تعداد باید به دریافت مقدار برابر برای مورد است {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +118,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 +133,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 +493,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included",شامل مالیات در ردیف {0} در مورد نرخ، مالیات در ردیف {1} باید گنجانده شود
+apps/erpnext/erpnext/controllers/accounts_controller.py +494,"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 +90,Settings for HR Module,تنظیمات برای ماژول HR
 DocType: SMS Center,SMS Center,مرکز SMS
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +78,Straightening,صاف
 DocType: BOM Replace Tool,New BOM,BOM جدید
 apps/erpnext/erpnext/config/projects.py +28,Batch Time Logs for billing.,دسته سیاههها زمان برای صدور صورت حساب.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +15,Countergravity casting,ریخته گری Countergravity
 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/setup/page/setup_wizard/fixtures/industry_type.py +14,Broadcasting,رادیو و تلویزیون
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +140,Execution,اعدام
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +364,The first user will become the System Manager (you can change this later).,اولین کاربر تبدیل خواهد شد مدیر سیستم (شما می توانید این تنظیمات را تغییر دهید).
+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/public/js/setup_wizard.js +114,The first user will become the System Manager (you can change this later).,اولین کاربر تبدیل خواهد شد مدیر سیستم (شما می توانید این تنظیمات را تغییر دهید).
 apps/erpnext/erpnext/config/manufacturing.py +39,Details of the operations carried out.,جزئیات عملیات انجام شده است.
 DocType: Serial No,Maintenance Status,وضعیت نگهداری 
 apps/erpnext/erpnext/config/stock.py +263,Items and Pricing,اقلام و قیمت گذاری
@@ -205,7 +198,6 @@
 DocType: Pricing Rule,Discount on Price List Rate (%),تخفیف در لیست قیمت نرخ (٪)
 apps/frappe/frappe/public/js/frappe/form/print.js +96,Start,شروع
 DocType: User,First Name,نام
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +12,Full-mold casting,ریخته گری کامل قالب
 DocType: Offer Letter,Select Terms and Conditions,انتخاب شرایط و ضوابط
 DocType: Production Planning Tool,Sales Orders,سفارشات فروش
 DocType: Purchase Taxes and Charges,Valuation,ارزیابی
@@ -217,8 +209,7 @@
 DocType: Bank Reconciliation,Bank Account,حساب بانکی
 DocType: Leave Type,Allow Negative Balance,اجازه می دهد تراز منفی
 DocType: Selling Settings,Default Territory,به طور پیش فرض سرزمین
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +53,Television,تلویزیون
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +138,Gashing,Gashing
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,تلویزیون
 DocType: Production Order Operation,Updated via 'Time Log',به روز شده از طریق &#39;زمان ورود &quot;
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +82,Account {0} does not belong to Company {1},حساب {0} به شرکت تعلق ندارد {1}
 DocType: Naming Series,Series List for this Transaction,فهرست سری ها برای این تراکنش
@@ -233,14 +224,13 @@
 DocType: Leave Allocation,Add unused leaves from previous allocations,اضافه کردن برگ های استفاده نشده از تخصیص قبلی
 apps/erpnext/erpnext/controllers/recurring_document.py +206,Next Recurring {0} will be created on {1},بعدی دوره ای {0} خواهد شد در ایجاد {1}
 DocType: Newsletter List,Total Subscribers,مجموع مشترکین
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +575,Contact Name,تماس با نام
+,Contact Name,تماس با نام
 DocType: Production Plan Item,SO Pending Qty,SO در انتظار تعداد
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,ایجاد لغزش حقوق و دستمزد برای معیارهای ذکر شده در بالا.
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,درخواست برای خرید.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +107,Double housing,مسکن دو
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +156,Only the selected Leave Approver can submit this Leave Application,فقط تصویب مرخصی انتخاب می توانید از این مرخصی استفاده کنید
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +171,Only the selected Leave Approver can submit this Leave Application,فقط تصویب مرخصی انتخاب می توانید از این مرخصی استفاده کنید
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,تسکین تاریخ باید بیشتر از تاریخ پیوستن شود
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +172,Leaves per Year,برگ در سال
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +172,Leaves per Year,برگ در سال
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup > Settings > Naming Series,لطفا نامگذاری سری برای {0} از طریق راه اندازی&gt; تنظیمات&gt; نامگذاری سری مجموعه
 DocType: Time Log,Will be updated when batched.,خواهد شد که بسته بندی های کوچک به روز شد.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +104,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,ردیف {0}: لطفا بررسی کنید آیا پیشرفته در برابر حساب {1} در صورتی که این یک ورودی پیش است.
@@ -249,25 +239,24 @@
 DocType: Item Website Specification,Item Website Specification,مشخصات مورد وب سایت
 DocType: Dropbox Backup,Dropbox Access Key,Dropbox به دسترسی های کلیدی
 DocType: Payment Tool,Reference No,مرجع بدون
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +348,Leave Blocked,ترک مسدود
-apps/erpnext/erpnext/stock/doctype/item/item.py +535,Item {0} has reached its end of life on {1},مورد {0} به پایان زندگی بر روی رسید {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +392,Leave Blocked,ترک مسدود
+apps/erpnext/erpnext/stock/doctype/item/item.py +539,Item {0} has reached its end of life on {1},مورد {0} به پایان زندگی بر روی رسید {1}
 apps/erpnext/erpnext/accounts/utils.py +339,Annual,سالیانه
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,مورد سهام آشتی
 DocType: Stock Entry,Sales Invoice No,فاکتور فروش بدون
 DocType: Material Request Item,Min Order Qty,حداقل تعداد سفارش
 DocType: Lead,Do Not Contact,آیا تماس با نه
 DocType: Sales Invoice,The unique id for tracking all recurring invoices. It is generated on submit.,شناسه منحصر به فرد برای ردیابی تمام فاکتورها در محدوده زمانی معین. این است که در ارائه تولید می شود.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +93,Software Developer,نرم افزار توسعه
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +93,Software Developer,نرم افزار توسعه
 DocType: Item,Minimum Order Qty,حداقل تعداد سفارش تعداد
 DocType: Pricing Rule,Supplier Type,نوع منبع
 DocType: Item,Publish in Hub,انتشار در توپی
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +555,Item {0} is cancelled,مورد {0} لغو شود
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +598,Material Request,درخواست مواد
+apps/erpnext/erpnext/stock/doctype/item/item.py +559,Item {0} is cancelled,مورد {0} لغو شود
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +607,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} در &#39;مواد اولیه عرضه شده جدول در سفارش خرید یافت نشد {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +129,Wire brushing,مسواک زدن سیم
 DocType: Employee,Relation,ارتباط
 DocType: Shipping Rule,Worldwide Shipping,حمل و نقل در سراسر جهان
 apps/erpnext/erpnext/config/selling.py +23,Confirmed orders from Customers.,تایید سفارشات از مشتریان.
@@ -283,12 +272,11 @@
 DocType: Supplier,Address HTML,آدرس HTML
 DocType: Lead,Mobile No.,شماره موبایل
 DocType: Maintenance Schedule,Generate Schedule,تولید برنامه
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +81,Hubbing,Hubbing
 DocType: Purchase Invoice Item,Expense Head,سر هزینه
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +86,Please select Charge Type first,لطفا ابتدا شارژ نوع را انتخاب کنید
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,آخرین
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +395,Max 5 characters,حداکثر 5 کاراکتر
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +195,Select Your Language,انتخاب زبان
+apps/erpnext/erpnext/public/js/setup_wizard.js +143,Max 5 characters,حداکثر 5 کاراکتر
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +245,Select Your Language,انتخاب زبان
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,اولین تصویب مرخصی در لیست خواهد شد به عنوان پیش فرض مرخصی تصویب مجموعه
 DocType: Manufacturing Settings,"Disables creation of time logs against Production Orders.
 Operations shall not be tracked against Production Order",غیر فعال ایجاد شده از سیاهههای مربوط در برابر سفارشات تولید. عملیات باید در برابر سفارش تولید ردیابی نمی
@@ -300,8 +288,6 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +34,Item {0} must be Service Item,مورد {0} باید مورد خدمات شود
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +303,Completed Qty can not be greater than 'Qty to Manufacture',تکمیل تعداد نمی تواند بیشتر از &#39;تعداد برای تولید&#39;
 DocType: DocType,Administrator,مدیر
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +136,Laser drilling,حفاری با لیزر
-DocType: Stock UOM Replace Utility,New Stock UOM,جدید بورس UOM
 DocType: Period Closing Voucher,Closing Account Head,بستن سر حساب
 DocType: Employee,External Work History,سابقه کار خارجی
 apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,خطا مرجع مدور
@@ -310,18 +296,15 @@
 DocType: Lead,Industry,صنعت
 DocType: Employee,Job Profile,نمایش شغلی
 DocType: Newsletter,Newsletter,عضویت در خبرنامه
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +84,Hydroforming,هیدروفرمینگ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +49,Necking,Necking
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,با رایانامه آگاه کن در ایجاد درخواست مواد اتوماتیک
 DocType: Journal Entry,Multi Currency,چند ارز
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +51,Item is updated,مورد به روز شده است
 DocType: Async Task,System Manager,سیستم مدیریت
 DocType: Payment Reconciliation Invoice,Invoice Type,فاکتور نوع
 DocType: Sales Invoice Item,Delivery Note,رسید
 DocType: Dropbox Backup,Allow Dropbox Access,اجازه دسترسی Dropbox به
 apps/erpnext/erpnext/config/learn.py +72,Setting up Taxes,راه اندازی مالیات
 apps/erpnext/erpnext/accounts/utils.py +189,Payment Entry has been modified after you pulled it. Please pull it again.,ورود پرداخت اصلاح شده است پس از آن کشیده شده است. لطفا آن را دوباره بکشید.
-apps/erpnext/erpnext/stock/doctype/item/item.py +343,{0} entered twice in Item Tax,{0} دو بار در مالیات وارد شده است
+apps/erpnext/erpnext/stock/doctype/item/item.py +347,{0} entered twice in Item Tax,{0} دو بار در مالیات وارد شده است
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +105,Summary for this week and pending activities,خلاصه برای این هفته و فعالیت های انتظار
 DocType: Workstation,Rent Cost,اجاره هزینه
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +74,Please select month and year,لطفا ماه و سال را انتخاب کنید
@@ -338,23 +321,21 @@
 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",موجود در BOM، تحویل توجه داشته باشید، خرید فاکتور، سفارش تولید، سفارش خرید، رسید خرید، فاکتور فروش، سفارش فروش، انبار ورودی، برنامه زمانی
 DocType: Item Tax,Tax Rate,نرخ مالیات
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Select Item,انتخاب مورد
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +540,Select Item,انتخاب مورد
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +143,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry",مورد: {0} موفق دسته ای و زرنگ، نمی تواند با استفاده از \ سهام آشتی، به جای استفاده از بورس ورود آشتی
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +259,Purchase Invoice {0} is already submitted,خرید فاکتور {0} در حال حاضر ارائه
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +262,Purchase Invoice {0} is already submitted,خرید فاکتور {0} در حال حاضر ارائه
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Batch No must be same as {1} {2},ردیف # {0}: دسته ای بدون باید همان باشد {1} {2}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Convert to non-Group,تبدیل به غیر گروه
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +55,Purchase Receipt must be submitted,رسید خرید باید ارائه شود
-DocType: Stock UOM Replace Utility,Current Stock UOM,در حال حاضر سهام UOM
 apps/erpnext/erpnext/config/stock.py +53,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}
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Your email address,آدرس ایمیل شما
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +194,Please see attachment,لطفا پیوست را ببینید
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +203,Please see attachment,لطفا پیوست را ببینید
 DocType: Purchase Order,% Received,٪ دریافتی
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +109,Water jet cutting,برش جت آب
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +24,Setup Already Complete!!,راه اندازی در حال حاضر کامل!
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +20,Setup Already Complete!!,راه اندازی در حال حاضر کامل!
 ,Finished Goods,محصولات تمام شده
 DocType: Delivery Note,Instructions,دستورالعمل
 DocType: Quality Inspection,Inspected By,بازرسی توسط
@@ -369,6 +350,7 @@
 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,صرافی
 DocType: Purchase Invoice Item,Item Name,نام آیتم
+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",آیتم را به درخواست شود که &quot;خارج از بورس&quot; با توجه به تمام انبارها بر اساس تعداد پیش بینی شده و حداقل تعداد سفارش
@@ -378,11 +360,10 @@
 ,Purchase Register,خرید ثبت نام
 DocType: Landed Cost Item,Applicable Charges,اتهامات قابل اجرا
 DocType: Workstation,Consumable Cost,هزینه مصرفی
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,{0} ({1}) must have role 'Leave Approver',{0} ({1}) باید اجازه 'تایید و امضا مرخصی' را داشته باشید
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +167,{0} ({1}) must have role 'Leave Approver',{0} ({1}) باید اجازه 'تایید و امضا مرخصی' را داشته باشید
 DocType: Purchase Receipt,Vehicle Date,خودرو تاریخ
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +39,Medical,پزشکی
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +39,Medical,پزشکی
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,دلیل برای از دست دادن
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +36,Tube beading,خم کن کاغذ لوله
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},ایستگاه های کاری در تاریخ زیر را به عنوان در هر فهرست تعطیلات بسته است: {0}
 DocType: Employee,Single,تک
 DocType: Issue,Attachment,دلبستگی
@@ -403,10 +384,8 @@
 DocType: Account,Is Group,گروه
 DocType: Stock Settings,Automatically Set Serial Nos based on FIFO,تنظیم به صورت خودکار سریال بر اساس شماره FIFO
 DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,بررسی تولید کننده فاکتور شماره منحصر به فرد
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +31,Thermoforming,ترمو
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +66,Slitting,اتاق های برش
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +57,'To Case No.' cannot be less than 'From Case No.','به شماره پرونده' نمی تواند کمتر از 'از شماره پرونده' باشد
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +104,Non Profit,غیر انتفاعی
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +104,Non Profit,غیر انتفاعی
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_list.js +7,Not Started,شروع نشده
 DocType: Lead,Channel Partner,کانال شریک
 DocType: Account,Old Parent,قدیمی مرجع
@@ -415,13 +394,12 @@
 apps/erpnext/erpnext/config/manufacturing.py +74,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 +512,Attribute {0} selected multiple times in Attributes Table,ویژگی {0} چند بار در صفات جدول انتخاب
+apps/erpnext/erpnext/stock/doctype/item/item.py +516,Attribute {0} selected multiple times in Attributes Table,ویژگی {0} چند بار در صفات جدول انتخاب
 DocType: Sales Order,Not Applicable,قابل اجرا نیست
 apps/erpnext/erpnext/config/hr.py +140,Holiday master.,کارشناسی ارشد تعطیلات.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +19,Shell molding,قالب ریزی و سازه پوسته
 DocType: Material Request Item,Required Date,تاریخ مورد نیاز
 DocType: Delivery Note,Billing Address,نشانی صورتحساب
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +644,Please enter Item Code.,لطفا کد مورد را وارد کنید.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +648,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,مجموع تعداد
@@ -431,7 +409,7 @@
 DocType: Item Attribute,To Range,به محدوده
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,اوراق بهادار و سپرده ها
 DocType: Features Setup,Imports,واردات
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +144,Adhesive bonding,باند
+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.,ثبت حضور و غیاب.
@@ -439,26 +417,25 @@
 DocType: Sales Order Item,Used for Production Plan,مورد استفاده برای طرح تولید
 DocType: System Settings,Loading...,در حال بارگذاری ...
 DocType: DocField,Password,رمز عبور
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +155,Fused deposition modeling,مدل سازی رسوب ذوب
 DocType: Manufacturing Settings,Time Between Operations (in mins),زمان بین عملیات (در دقیقه)
 DocType: Customer,Buyer of Goods and Services.,خریدار کالا و خدمات.
 DocType: Journal Entry,Accounts Payable,حساب های پرداختنی
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +24,Add Subscribers,اضافه کردن مشترکین
 apps/erpnext/erpnext/public/js/feature_setup.js +220,""" does not exists",وجود ندارد
 DocType: Pricing Rule,Valid Upto,معتبر تا حد
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +564,List a few of your customers. They could be organizations or individuals.,لیست تعداد کمی از مشتریان خود را. آنها می تواند سازمان ها یا افراد.
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,List a few of your customers. They could be organizations or individuals.,لیست تعداد کمی از مشتریان خود را. آنها می تواند سازمان ها یا افراد.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Direct Income,درآمد مستقیم
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +33,"Can not filter based on Account, if grouped by Account",می توانید بر روی حساب نمی فیلتر بر اساس، در صورتی که توسط حساب گروه بندی
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +88,Administrative Officer,افسر اداری
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Administrative Officer,افسر اداری
 DocType: Payment Tool,Received Or Paid,دریافت یا پرداخت
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +318,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 +305,Please enter Warehouse for which Material Request will be raised,لطفا انبار که درخواست مواد مطرح خواهد شد را وارد کنید
 DocType: Production Order,Additional Operating Cost,هزینه های عملیاتی اضافی
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +20,Cosmetics,آرایشی و بهداشتی
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,آرایشی و بهداشتی
 DocType: DocField,Type,نوع
-apps/erpnext/erpnext/stock/doctype/item/item.py +417,"To merge, following properties must be same for both items",به ادغام، خواص زیر باید همین کار را برای هر دو مورد می شود
+apps/erpnext/erpnext/stock/doctype/item/item.py +421,"To merge, following properties must be same for both items",به ادغام، خواص زیر باید همین کار را برای هر دو مورد می شود
 DocType: Communication,Subject,موضوع
 DocType: Shipping Rule,Net Weight,وزن خالص
 DocType: Employee,Emergency Phone,تلفن اضطراری
@@ -468,7 +445,6 @@
 DocType: Journal Entry,Difference (Dr - Cr),تفاوت (دکتر - کروم)
 DocType: Account,Profit and Loss,حساب سود و زیان
 apps/erpnext/erpnext/config/stock.py +293,Managing Subcontracting,مدیریت مقاطعه کاری فرعی
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +58,New UOM must NOT be of type Whole Number,جدید UOM NOT باید از نوع عدد صحیح است
 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 +47,Account {0} does not belong to company: {1},حساب {0} به شرکت تعلق ندارد: {1}
@@ -487,14 +463,14 @@
 DocType: Purchase Invoice,Supplier Invoice No,تامین کننده فاکتور بدون
 DocType: Territory,For reference,برای مرجع
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +154,"Cannot delete Serial No {0}, as it is used in stock transactions",نمی توانید حذف سریال نه {0}، آن را به عنوان در معاملات سهام مورد استفاده
-apps/erpnext/erpnext/public/js/account_tree_grid.js +52,Closing (Cr),بسته شدن (کروم)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +227,Closing (Cr),بسته شدن (کروم)
 DocType: Serial No,Warranty Period (Days),دوره گارانتی (روز)
 DocType: Installation Note Item,Installation Note Item,نصب و راه اندازی توجه داشته باشید مورد
 ,Pending Qty,انتظار تعداد
 DocType: Job Applicant,Thread HTML,HTML موضوع
 DocType: Company,Ignore,نادیده گرفتن
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +86,SMS sent to following numbers: {0},SMS با شماره های زیر ارسال گردید: {0}
-apps/erpnext/erpnext/controllers/buying_controller.py +135,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,انبار تامین کننده برای رسید خرید زیر قرارداد اجباری
+apps/erpnext/erpnext/controllers/buying_controller.py +126,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,انبار تامین کننده برای رسید خرید زیر قرارداد اجباری
 DocType: Pricing Rule,Valid From,معتبر از
 DocType: Sales Invoice,Total Commission,کمیسیون ها
 DocType: Pricing Rule,Sales Partner,شریک فروش
@@ -502,7 +478,7 @@
 DocType: Monthly Distribution,"**Monthly Distribution** helps you distribute your budget across months if you have seasonality in your business.
 
 To distribute a budget using this distribution, set this **Monthly Distribution** in the **Cost Center**",** توزیع ماهانه ** شما کمک می کند بودجه خود را توزیع در سراسر ماه اگر شما فصلی در کسب و کار شما. برای توزیع بودجه با استفاده از این توزیع، تنظیم این توزیع ماهانه ** ** ** در مرکز هزینه **
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +183,No records found in the Invoice table,هیچ ثبتی یافت نشد در جدول فاکتور
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +130,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 +84,Financial / accounting year.,مالی سال / حسابداری.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged",با عرض پوزش، سریال شماره نمی تواند با هم ادغام شدند
@@ -518,25 +494,25 @@
 DocType: Sales Order,Billing and Delivery Status,صدور صورت حساب و وضعیت تحویل
 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/setup/page/setup_wizard/setup_wizard_page.html +16,Previous,قبلی
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard_page.html +16,Previous,قبلی
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +620,Sales Return,بازگشت فروش
 DocType: Production Planning Tool,Select Sales Orders from which you want to create Production Orders.,سفارشات فروش که از آن شما می خواهید برای ایجاد سفارشات تولید را انتخاب کنید.
 DocType: Item,Delivered by Supplier (Drop Ship),تحویل داده شده توسط کننده (قطره کشتی)
 apps/erpnext/erpnext/config/hr.py +120,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.,پایگاه داده مشتری می باشد.
 DocType: Quotation,Quotation To,نقل قول برای
 DocType: Lead,Middle Income,با درآمد متوسط
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),افتتاح (CR)
 apps/erpnext/erpnext/accounts/utils.py +193,Allocated amount can not be negative,مقدار اختصاص داده شده نمی تونه منفی
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +123,Tumbling,غلت
 DocType: Purchase Order Item,Billed Amt,صورتحساب AMT
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,انبار منطقی که در برابر نوشته های سهام ساخته شده است.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +92,Reference No & Reference Date is required for {0},مرجع بدون مرجع و تاریخ مورد نیاز است برای {0}
 DocType: Event,Wednesday,چهار شنبه
 DocType: Sales Invoice,Customer's Vendor,فروشنده مشتری
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +214,Production Order is Mandatory,سفارش تولید الزامی است
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +139,Proposal Writing,نوشتن طرح های پیشنهادی
+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} با شناسه کارمند همان وجود دارد
 apps/erpnext/erpnext/stock/stock_ledger.py +336,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},خطا بورس منفی ({6}) برای مورد {0} در انبار {1} در {2} {3} در {4} {5}
 DocType: Fiscal Year Company,Fiscal Year Company,شرکت سال مالی
@@ -559,7 +535,7 @@
 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/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.py +179,Please install dropbox python module,لطفا Dropbox به ماژول پایتون نصب
 DocType: Employee,Passport Number,شماره پاسپورت
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +82,Manager,مدیر
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Manager,مدیر
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +494,From Purchase Receipt,از رسید خرید
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +219,Same item has been entered multiple times.,قلم دوم از اقلام مشابه وارد شده است چندین بار.
 DocType: SMS Settings,Receiver Parameter,گیرنده پارامتر
@@ -567,10 +543,9 @@
 DocType: Sales Person,Sales Person Targets,اهداف فرد از فروش
 apps/frappe/frappe/public/js/frappe/form/workflow.js +116,To,برای
 apps/frappe/frappe/templates/base.html +145,Please enter email address,لطفا آدرس ایمیل را وارد کنید
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +35,End tube forming,پایان لوله تشکیل
 DocType: Production Order Operation,In minutes,در دقیقهی
 DocType: Issue,Resolution Date,قطعنامه عضویت
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +635,Please set default Cash or Bank account in Mode of Payment {0},لطفا نقدی پیش فرض و یا حساب بانکی در نحوه پرداخت را تعیین {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +637,Please set default Cash or Bank account in Mode of Payment {0},لطفا نقدی پیش فرض و یا حساب بانکی در نحوه پرداخت را تعیین {0}
 DocType: Selling Settings,Customer Naming By,نامگذاری مشتری توسط
 apps/erpnext/erpnext/accounts/doctype/account/account.js +67,Convert to Group,تبدیل به گروه
 DocType: Activity Cost,Activity Type,نوع فعالیت
@@ -578,12 +553,12 @@
 DocType: Customer,Fixed Days,روز ثابت
 DocType: Sales Invoice,Packing List,فهرست بسته بندی
 apps/erpnext/erpnext/config/buying.py +28,Purchase Orders given to Suppliers.,سفارشات خرید به تولید کنندگان داده می شود.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +43,Publishing,انتشارات
+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 +198,{0}: {1} not found in Invoice Details table,{0}: {1} در فاکتور جزییات جدول یافت نشد
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,{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 +208,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,نگهداری و تعمیرات مشاهده {0} باید قبل از لغو این سفارش فروش لغو
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +203,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),افتتاح (دکتر)
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},مجوز های ارسال و زمان باید بعد {0}
@@ -595,7 +570,6 @@
 DocType: Pricing Rule,Sales Manager,مدیر فروش
 apps/frappe/frappe/public/js/frappe/model/model.js +492,Rename,تغییر نام
 DocType: Journal Entry,Write Off Amount,ارسال فعال مقدار
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +52,Bending,خم
 apps/frappe/frappe/core/page/user_permissions/user_permissions.js +246,Allow User,اجازه می دهد کاربر
 DocType: Journal Entry,Bill No,شماره صورتحساب
 DocType: Purchase Invoice,Quarterly,فصلنامه
@@ -605,17 +579,16 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Please enter item details,لطفا جزئیات آیتم را وارد کنید
 DocType: Purchase Receipt,Other Details,سایر مشخصات
 DocType: Account,Accounts,حسابها
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +67,Marketing,بازار یابی
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +65,Straight shearing,قیچی و برش مستقیم
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +67,Marketing,بازار یابی
 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.,برای پیگیری آیتم در فروش و خرید اسناد بر اساس NOS سریال خود را. این هم می تواند برای پیگیری جزئیات ضمانت محصول استفاده می شود.
 DocType: Purchase Receipt Item Supplied,Current Stock,سهام کنونی
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +99,Rejected Warehouse is mandatory against regected item,انبار را رد کرد مقابل آیتم regected الزامی است
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +102,Rejected Warehouse is mandatory against regected item,انبار را رد کرد مقابل آیتم regected الزامی است
 DocType: Account,Expenses Included In Valuation,هزینه های موجود در ارزش گذاری
 DocType: Employee,Provide email id registered in company,ارائه ایمیل شناسه ثبت شده در شرکت
 DocType: Hub Settings,Seller City,فروشنده شهر
 DocType: Email Digest,Next email will be sent on:,ایمیل بعدی خواهد شد در ارسال:
 DocType: Offer Letter Term,Offer Letter Term,ارائه نامه مدت
-apps/erpnext/erpnext/stock/doctype/item/item.py +492,Item has variants.,فقره انواع.
+apps/erpnext/erpnext/stock/doctype/item/item.py +496,Item has variants.,فقره انواع.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,مورد {0} یافت نشد
 DocType: Bin,Stock Value,سهام ارزش
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,نوع درخت
@@ -624,10 +597,9 @@
 DocType: Material Request Item,Quantity and Warehouse,مقدار و انبار
 DocType: Sales Invoice,Commission Rate (%),نرخ کمیسیون (٪)
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +172,"Against Voucher Type must be one of Sales Order, Sales Invoice or Journal Entry",علیه کوپن نوع باید یکی از سفارش فروش، فاکتور فروش و یا مجله ورودی است
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +139,Biomachining,Biomachining
 apps/erpnext/erpnext/setup/utils.py +89,Unable to find exchange rate,قادر به پیدا کردن نرخ ارز
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +7,Aerospace,جو زمین
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +19,Welcome,خوش آمد
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +7,Aerospace,جو زمین
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +40,Welcome,خوش آمد
 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.,محصولات از تولید کنندگان دریافت کرد.
@@ -650,19 +622,19 @@
 DocType: Employee,Cell Number,شماره همراه
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,از دست رفته
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +120,You can not enter current voucher in 'Against Journal Entry' column,شما می توانید کوپن در حال حاضر در &quot;علیه مجله ورودی&quot; ستون وارد کنید
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +25,Energy,انرژی
+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.,بیانیه حقوق ماهانه.
 DocType: Item Group,Website Specifications,مشخصات وب سایت
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +205,New Account,حساب جدید
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +21,{0}: From {0} of type {1},{0}: از {0} از نوع {1}
-apps/erpnext/erpnext/controllers/buying_controller.py +283,Row {0}: Conversion Factor is mandatory,ردیف {0}: عامل تبدیل الزامی است
+apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,ردیف {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.,مطالب حسابداری می تواند در مقابل برگ ساخته شده است. مطالب در برابر گروه امکان پذیر نیست.
 DocType: ToDo,High,زیاد
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +361,Cannot deactivate or cancel BOM as it is linked with other BOMs,نمی توانید غیر فعال کردن یا لغو BOM به عنوان آن را با دیگر BOMs مرتبط
 DocType: Opportunity,Maintenance,نگهداری
 DocType: User,Male,مرد
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +182,Purchase Receipt number required for Item {0},تعداد رسید خرید مورد نیاز برای مورد {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +183,Purchase Receipt number required for Item {0},تعداد رسید خرید مورد نیاز برای مورد {0}
 DocType: Item Attribute Value,Item Attribute Value,مورد موجودیت مقدار
 apps/erpnext/erpnext/config/crm.py +64,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.
@@ -691,10 +663,9 @@
 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 +324,"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/page/setup_wizard/fixtures/industry_type.py +13,Biotechnology,بیوتکنولوژی
+apps/erpnext/erpnext/controllers/accounts_controller.py +325,"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,هزینه نگهداری و تعمیرات دفتر
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +53,Hemming,Hemming
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +66,Please enter Item first,لطفا ابتدا آیتم را وارد کنید
 DocType: Account,Liability,مسئوليت
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +62,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,مقدار تحریم نیست می تواند بیشتر از مقدار ادعای در ردیف {0}.
@@ -707,10 +678,10 @@
 DocType: Company,Default Bank Account,به طور پیش فرض حساب بانکی
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +47,"To filter based on Party, select Party Type first",برای فیلتر کردن بر اساس حزب، حزب انتخاب نوع اول
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},&#39;به روز رسانی سهام&#39; بررسی نمی شود، زیرا موارد از طریق تحویل نمی {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Nos,شماره
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,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 +627,My Invoices,فاکتورها من
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +629,My Invoices,فاکتورها من
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,بدون کارمند یافت
 DocType: Purchase Order,Stopped,متوقف
 DocType: Item,If subcontracted to a vendor,اگر به یک فروشنده واگذار شده
@@ -729,35 +700,33 @@
 DocType: Features Setup,"To enable ""Point of Sale"" features",برای فعال کردن &quot;نقطه ای از فروش&quot; ویژگی های
 DocType: Bin,Moving Average Rate,میانگین متحرک نرخ
 DocType: Production Planning Tool,Select Items,انتخاب آیتم ها
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,{0} against Bill {1} dated {2},{0} در صورت حساب {1} تاریخ گذاری شده است به {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +328,{0} against Bill {1} dated {2},{0} در صورت حساب {1} تاریخ گذاری شده است به {2}
 DocType: Comment,Reference Name,نام مرجع
 DocType: Maintenance Visit,Completion Status,وضعیت تکمیل
 DocType: Sales Invoice Item,Target Warehouse,هدف انبار
 DocType: Item,Allow over delivery or receipt upto this percent,اجازه می دهد بیش از تحویل یا دریافت تا این درصد
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +49,Expected Delivery Date cannot be before Sales Order Date,انتظار می رود تاریخ تحویل نمی تواند قبل از سفارش فروش تاریخ است
 DocType: Upload Attendance,Import Attendance,واردات حضور و غیاب
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +17,All Item Groups,همه گروه مورد
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +17,All Item Groups,همه گروه مورد
 DocType: Process Payroll,Activity Log,گزارش فعالیت
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +30,Net Profit / Loss,سود خالص / از دست دادن
 apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,به طور خودکار نگارش پیام در ارائه معاملات.
 DocType: Production Order,Item To Manufacture,آیتم را ساخت
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +16,Permanent mold casting,ریخته گری قالب دائم
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} وضعیت {2}
 apps/erpnext/erpnext/config/learn.py +172,Purchase Order to Payment,سفارش خرید به پرداخت
 DocType: Sales Order Item,Projected Qty,پیش بینی تعداد
 DocType: Sales Invoice,Payment Due Date,پرداخت با توجه تاریخ
 DocType: Newsletter,Newsletter Manager,مدیر خبرنامه
-apps/erpnext/erpnext/stock/doctype/item/item.js +229,Item Variant {0} already exists with same attributes,مورد متغیر {0} در حال حاضر با ویژگی های همان وجود دارد
+apps/erpnext/erpnext/stock/doctype/item/item.js +231,Item Variant {0} already exists with same attributes,مورد متغیر {0} در حال حاضر با ویژگی های همان وجود دارد
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening',&#39;افتتاح&#39;
 DocType: Notification Control,Delivery Note Message,تحویل توجه داشته باشید پیام
 DocType: Expense Claim,Expenses,مخارج
 DocType: Item Variant Attribute,Item Variant Attribute,مورد متغیر ویژگی
 ,Purchase Receipt Trends,روند رسید خرید
 DocType: Appraisal,Select template from which you want to get the Goals,قالب را انتخاب که از آن شما می خواهید برای دریافت به اهداف
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +77,Research & Development,تحقیق و توسعه
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Research & Development,تحقیق و توسعه
 ,Amount to Bill,مقدار به بیل
 DocType: Company,Registration Details,جزییات ثبت نام
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +75,Staking,پوست بزرگ هستند
 DocType: Item,Re-Order Qty,تعداد نقطه سفارش
 DocType: Leave Block List Date,Leave Block List Date,ترک فهرست بلوک عضویت
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +25,Scheduled to send to {0},برنامه ریزی برای ارسال به {0}
@@ -768,18 +737,16 @@
 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/hr/doctype/leave_allocation/leave_allocation.py +71,Cannot carry forward {0},نمی تواند حمل به جلو {0}
 apps/erpnext/erpnext/accounts/doctype/account/account.py +91,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'",مانده حساب در حال حاضر در اعتبار، شما امکان پذیر نیست را به مجموعه &quot;تعادل باید&quot; را بعنوان &quot;اعتباری&quot;
 DocType: Account,Balance must be,موجودی باید
 DocType: Hub Settings,Publish Pricing,قیمت گذاری انتشار
 DocType: Notification Control,Expense Claim Rejected Message,پیام ادعای هزینه رد
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +145,Nailing,دقیقی ارایه
 ,Available Qty,در دسترس تعداد
 DocType: Purchase Taxes and Charges,On Previous Row Total,در ردیف قبلی مجموع
 DocType: Salary Slip,Working Days,روزهای کاری
 DocType: Serial No,Incoming Rate,نرخ ورودی
 DocType: Packing Slip,Gross Weight,وزن ناخالص
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +410,The name of your company for which you are setting up this system.,نام شرکت خود را که برای آن شما راه اندازی این سیستم.
+apps/erpnext/erpnext/public/js/setup_wizard.js +158,The name of your company for which you are setting up this system.,نام شرکت خود را که برای آن شما راه اندازی این سیستم.
 DocType: HR Settings,Include holidays in Total no. of Working Days,شامل تعطیلات در مجموع هیچ. از روز کاری
 DocType: Job Applicant,Hold,نگه داشتن
 DocType: Employee,Date of Joining,تاریخ پیوستن
@@ -789,7 +756,6 @@
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +3,View Subscribers,مشخصات مشترکین
 DocType: Purchase Invoice Item,Purchase Receipt,رسید خرید
 ,Received Items To Be Billed,دریافت گزینه هایی که صورتحساب
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +114,Abrasive blasting,شمشیرهای
 DocType: Employee,Ms,خانم
 apps/erpnext/erpnext/config/accounts.py +148,Currency exchange rate master.,نرخ ارز نرخ ارز استاد.
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +253,Unable to find Time Slot in the next {0} days for Operation {1},قادر به پیدا کردن شکاف زمان در آینده {0} روز برای عملیات {1}
@@ -801,7 +767,7 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +209,Serial No {0} does not belong to Item {1},سریال بدون {0} به مورد تعلق ندارد {1}
 DocType: Purchase Receipt Item Supplied,Required Qty,مورد نیاز تعداد
 DocType: Bank Reconciliation,Total Amount,مقدار کل
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +32,Internet Publishing,انتشارات اینترنت
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,انتشارات اینترنت
 DocType: Production Planning Tool,Production Orders,سفارشات تولید
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +35,Balance Value,ارزش موجودی
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,فهرست قیمت فروش
@@ -812,7 +778,7 @@
 DocType: Supplier,Default Payable Accounts,به طور پیش فرض حسابهای پرداختنی
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,کارمند {0} غیر فعال است و یا وجود ندارد
 DocType: Features Setup,Item Barcode,بارکد مورد
-apps/erpnext/erpnext/stock/doctype/item/item.py +487,Item Variants {0} updated,مورد انواع {0} به روز شده
+apps/erpnext/erpnext/stock/doctype/item/item.py +491,Item Variants {0} updated,مورد انواع {0} به روز شده
 DocType: Quality Inspection Reading,Reading 6,خواندن 6
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,خرید فاکتور پیشرفته
 DocType: Address,Shop,فروشگاه
@@ -821,7 +787,7 @@
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,به طور پیش فرض حساب بانک / نقدی به طور خودکار در POS فاکتور به روز شده در زمانی که این حالت انتخاب شده است.
 DocType: Employee,Permanent Address Is,آدرس دائمی است
 DocType: Production Order Operation,Operation completed for how many finished goods?,عملیات برای چند کالا به پایان رسید به پایان؟
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +491,The Brand,نام تجاری
+apps/erpnext/erpnext/public/js/setup_wizard.js +237,The Brand,نام تجاری
 apps/erpnext/erpnext/controllers/status_updater.py +163,Allowance for over-{0} crossed for Item {1}.,کمک هزینه برای بیش از {0} عبور برای مورد {1}.
 DocType: Employee,Exit Interview Details,جزییات خروج مصاحبه
 DocType: Item,Is Purchase Item,آیا مورد خرید
@@ -841,16 +807,16 @@
 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,تنظیم مقدار پرداخت = مقدار برجسته
 DocType: Contact Us Settings,Address Line 1,خط 1 آدرس
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Variance,واریانس
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +392,Company Name,نام شرکت
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +53,Variance,واریانس
+,Company Name,نام شرکت
 DocType: SMS Center,Total Message(s),پیام ها (بازدید کنندگان)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +515,Select Item for Transfer,انتخاب مورد انتقال
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +538,Select Item for Transfer,انتخاب مورد انتقال
 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.,انتخاب سر حساب بانکی است که چک نهشته شده است.
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,کاربر مجاز به ویرایش لیست قیمت نرخ در معاملات
 DocType: Pricing Rule,Max Qty,حداکثر تعداد
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +106,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,ردیف {0}: پرداخت در مقابل فروش / سفارش خرید همیشه باید به عنوان پیش مشخص شده باشد
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +16,Chemical,شیمیایی
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,شیمیایی
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +693,All items have already been transferred for this Production Order.,همه موارد قبلا برای این سفارش تولید منتقل می شود.
 DocType: Process Payroll,Select Payroll Year and Month,انتخاب سال و ماه حقوق و دستمزد
 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""",برو به گروه مناسب (معمولا استفاده از وجوه&gt; دارایی های نقد&gt; حساب های بانکی و ایجاد یک حساب جدید (با کلیک بر روی اضافه کردن کودکان) از نوع &quot;بانک&quot;
@@ -861,12 +827,12 @@
 DocType: Item,Inspection Criteria,معیار بازرسی
 apps/erpnext/erpnext/config/accounts.py +101,Tree of finanial Cost Centers.,درخت مراکز هزینه finanial.
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,انتقال
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +492,Upload your letter head and logo. (you can edit them later).,آپلود سر نامه و آرم خود را. (شما می توانید آنها را بعد از ویرایش).
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +156,White,سفید
+apps/erpnext/erpnext/public/js/setup_wizard.js +238,Upload your letter head and logo. (you can edit them later).,آپلود سر نامه و آرم خود را. (شما می توانید آنها را بعد از ویرایش).
+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/setup/page/setup_wizard/setup_wizard.js +362,Attach Your Picture,ضمیمه تصویر شما
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Make ,ساخت
+apps/erpnext/erpnext/public/js/setup_wizard.js +112,Attach Your Picture,ضمیمه تصویر شما
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +540,Make ,ساخت
 DocType: Journal Entry,Total Amount in Words,مقدار کل به عبارت
 DocType: Workflow State,Stop,توقف
 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 تماس بگیرید اگر مشکل همچنان ادامه دارد.
@@ -875,14 +841,13 @@
 DocType: Lead,Next Contact Date,تماس با آمار بعدی
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,باز کردن تعداد
 DocType: Holiday List,Holiday List Name,نام فهرست تعطیلات
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +168,Stock Options,گزینه های سهام
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +168,Stock Options,گزینه های سهام
 DocType: Journal Entry Account,Expense Claim,ادعای هزینه
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +181,Qty for {0},تعداد برای {0}
 DocType: Leave Application,Leave Application,مرخصی استفاده
 apps/erpnext/erpnext/config/hr.py +77,Leave Allocation Tool,ترک ابزار تخصیص
 DocType: Leave Block List,Leave Block List Dates,ترک فهرست بلوک خرما
 DocType: Company,If Monthly Budget Exceeded (for expense account),اگر بودجه ماهانه بیش از (برای حساب هزینه)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +56,Trimming,پیرایش
 DocType: Workstation,Net Hour Rate,خالص نرخ ساعت
 DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,هزینه فرود رسید خرید
 DocType: Company,Default Terms,به طور پیش فرض شرایط
@@ -890,10 +855,9 @@
 DocType: POS Profile,Cash/Bank Account,نقد / حساب بانکی
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,Removed items with no change in quantity or value.,موارد حذف شده بدون تغییر در مقدار یا ارزش.
 DocType: Delivery Note,Delivery To,تحویل به
-apps/erpnext/erpnext/stock/doctype/item/item.py +509,Attribute table is mandatory,جدول ویژگی الزامی است
+apps/erpnext/erpnext/stock/doctype/item/item.py +513,Attribute table is mandatory,جدول ویژگی الزامی است
 DocType: Production Planning Tool,Get Sales Orders,دریافت سفارشات فروش
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} نمی تواند منفی باشد
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +103,Filing,بایگانی
 apps/erpnext/erpnext/templates/form_grid/item_grid.html +72,Discount,تخفیف
 DocType: Features Setup,Purchase Discounts,تخفیف خرید
 DocType: Workstation,Wages,مزد
@@ -910,6 +874,7 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +112,You are the Expense Approver for this record. Please Update the 'Status' and Save,شما تصویب‌کننده هزینه برای این رکورد هستید. لطفاٌ 'وضعیت' را روزآمد و سپس ذخیره نمایید
 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 +136,"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 +194,Serial No {0} is under maintenance contract upto {1},سریال بدون {0} است تحت قرارداد تعمیر و نگهداری تا {1}
@@ -918,7 +883,7 @@
 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,مورد باید با استفاده از &#39;گرفتن اقلام از خرید رسید&#39; را فشار دهید اضافه شود
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,هزینه فروش
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Buying,خرید استاندارد
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +120,Standard Buying,خرید استاندارد
 DocType: GL Entry,Against,در برابر
 DocType: Item,Default Selling Cost Center,به طور پیش فرض مرکز فروش هزینه
 DocType: Sales Partner,Implementation Partner,شریک اجرای
@@ -939,29 +904,29 @@
 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/setup/page/setup_wizard/setup_wizard.js +588,List a few of your suppliers. They could be organizations or individuals.,لیست چند از تامین کنندگان خود را. آنها می تواند سازمان ها یا افراد.
+apps/erpnext/erpnext/public/js/setup_wizard.js +326,List a few of your suppliers. They could be organizations or individuals.,لیست چند از تامین کنندگان خود را. آنها می تواند سازمان ها یا افراد.
 DocType: Company,Default Currency,به طور پیش فرض ارز
 DocType: Contact,Enter designation of this Contact,تعیین این تماس را وارد کنید
 DocType: Contact Us Settings,Address,نشانی
 DocType: Expense Claim,From Employee,از کارمند
-apps/erpnext/erpnext/controllers/accounts_controller.py +338,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,هشدار: سیستم خواهد overbilling از مقدار برای مورد بررسی نمی {0} در {1} صفر است
+apps/erpnext/erpnext/controllers/accounts_controller.py +339,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,هشدار: سیستم خواهد overbilling از مقدار برای مورد بررسی نمی {0} در {1} صفر است
 DocType: Journal Entry,Make Difference Entry,ورود را تفاوت
 DocType: Upload Attendance,Attendance From Date,حضور و غیاب از تاریخ
 DocType: Appraisal Template Goal,Key Performance Area,منطقه کلیدی کارایی
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +54,Transportation,حمل و نقل
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +54,Transportation,حمل و نقل
 apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +67, and year: ,و سال:
 DocType: Email Digest,Annual Expense,هزینه سالانه
 DocType: SMS Center,Total Characters,مجموع شخصیت
-apps/erpnext/erpnext/controllers/buying_controller.py +139,Please select BOM in BOM field for Item {0},لطفا BOM BOM در زمینه برای مورد را انتخاب کنید {0}
+apps/erpnext/erpnext/controllers/buying_controller.py +130,Please select BOM in BOM field for Item {0},لطفا BOM BOM در زمینه برای مورد را انتخاب کنید {0}
 DocType: C-Form Invoice Detail,C-Form Invoice Detail,جزئیات C-فرم فاکتور
 DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,پرداخت آشتی فاکتور
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +32,Contribution %,سهم٪
 DocType: Item,website page link,لینک صفحه وب سایت
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +192,Let's prepare the system for first use.,اجازه دهید سیستم آماده برای استفاده است.
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +242,Let's prepare the system for first use.,اجازه دهید سیستم آماده برای استفاده است.
 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 +214,Production Order {0} must be cancelled before cancelling this Sales Order,سفارش تولید {0} باید قبل از لغو این سفارش فروش لغو
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +209,Production Order {0} must be cancelled before cancelling this Sales Order,سفارش تولید {0} باید قبل از لغو این سفارش فروش لغو
 ,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.,زمان ثبت را انتخاب کرده و ثبت برای ایجاد یک فاکتور فروش جدید.
@@ -981,14 +946,13 @@
 DocType: Sales Invoice Advance,Sales Invoice Advance,فاکتور فروش پیشرفته
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +398,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/page/setup_wizard/install_fixtures.py +75,Management,اداره
+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/setup/page/setup_wizard/fixtures/operations.py +14,Investment casting,ریخته گری سرمایه گذاری
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +51,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""",این خواهد شد به کد مورد از نوع اضافه خواهد شد. برای مثال، اگر شما مخفف &quot;SM&quot; است، و کد مورد است &quot;تی شرت&quot;، کد مورد از نوع خواهد بود &quot;تی شرت-SM&quot;
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,پرداخت خالص (به عبارت) قابل مشاهده خواهد بود یک بار شما را لغزش حقوق و دستمزد را نجات دهد.
 apps/frappe/frappe/core/doctype/user/user_list.js +12,Active,فعال
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +154,Blue,ابی
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +154,Blue,ابی
 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,گره علاوه بر این می تواند تنها تحت نوع گره &#39;گروه&#39; ایجاد
@@ -998,18 +962,16 @@
 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,UOM عامل تبدیل
 DocType: Stock Settings,Default Item Group,به طور پیش فرض مورد گروه
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +156,Laminated object manufacturing,تولید شی و روکش
 apps/erpnext/erpnext/config/buying.py +13,Supplier database.,پایگاه داده تامین کننده.
 DocType: Account,Balance Sheet,ترازنامه
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +561,Cost Center For Item with Item Code ',مرکز مورد با کد آیتم های هزینه
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +45,Stretch forming,تشکیل کشش
 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 +210,"Further accounts can be made under Groups, but entries can be made against non-Groups",حساب های بیشتر می تواند در زیر گروه ساخته شده، اما مطالب را می توان در برابر غیر گروه ساخته شده
 apps/erpnext/erpnext/config/hr.py +125,Tax and other salary deductions.,مالیاتی و دیگر کسورات حقوق و دستمزد.
 DocType: Lead,Lead,راهبر
 DocType: Email Digest,Payables,حساب های پرداختنی
 DocType: Account,Warehouse,مخزن
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +90,Row #{0}: Rejected Qty can not be entered in Purchase Return,ردیف # {0}: رد تعداد می توانید در خرید بازگشت نمی شود وارد
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +93,Row #{0}: Rejected Qty can not be entered in Purchase Return,ردیف # {0}: رد تعداد می توانید در خرید بازگشت نمی شود وارد
 ,Purchase Order Items To Be Billed,سفارش خرید گزینه هایی که صورتحساب
 DocType: Purchase Invoice Item,Net Rate,نرخ خالص
 DocType: Purchase Invoice Item,Purchase Invoice Item,خرید آیتم فاکتور
@@ -1024,13 +986,13 @@
 DocType: Global Defaults,Current Fiscal Year,سال مالی جاری
 DocType: Global Defaults,Disable Rounded Total,غیر فعال کردن گرد مجموع
 DocType: Lead,Call,دعوت
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +384,'Entries' cannot be empty,&#39;مطالب&#39; نمی تواند خالی باشد
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +386,'Entries' cannot be empty,&#39;مطالب&#39; نمی تواند خالی باشد
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},تکراری ردیف {0} را با همان {1}
 ,Trial Balance,آزمایش تعادل
 apps/erpnext/erpnext/config/hr.py +205,Setting up Employees,راه اندازی کارکنان
 apps/erpnext/erpnext/public/js/feature_setup.js +220,"Grid """,شبکه &quot;
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +150,Please select prefix first,لطفا ابتدا پیشوند انتخاب کنید
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +138,Research,پژوهش
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +138,Research,پژوهش
 DocType: Maintenance Visit Purpose,Work Done,کار تمام شد
 apps/erpnext/erpnext/controllers/item_variant.py +25,Please specify at least one attribute in the Attributes table,لطفا حداقل یک ویژگی در جدول صفات مشخص
 DocType: Contact,User ID,ID کاربر
@@ -1038,10 +1000,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +57,View Ledger,مشخصات لجر
 DocType: File,Lft,LFT
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,قدیمیترین
-apps/erpnext/erpnext/stock/doctype/item/item.py +394,"An Item Group exists with same name, please change the item name or rename the item group",گروه مورد با همین نام وجود دارد، لطفا نام مورد تغییر یا تغییر نام گروه مورد
+apps/erpnext/erpnext/stock/doctype/item/item.py +398,"An Item Group exists with same name, please change the item name or rename the item group",گروه مورد با همین نام وجود دارد، لطفا نام مورد تغییر یا تغییر نام گروه مورد
 DocType: Communication,Delivery Status,تحویل وضعیت
 DocType: Production Order,Manufacture against Sales Order,ساخت در برابر سفارش فروش
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +517,Rest Of The World,بقیه دنیا
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +455,Rest Of The World,بقیه دنیا
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,مورد {0} می تواند دسته ای ندارد
 ,Budget Variance Report,گزارش انحراف از بودجه
 DocType: Salary Slip,Gross Pay,پرداخت ناخالص
@@ -1052,13 +1014,11 @@
 DocType: BOM Item,Item Description,مورد توضیحات
 DocType: Payment Tool,Payment Mode,حالت پرداخت
 DocType: Purchase Invoice,Is Recurring,تکرارشونده است
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +154,Direct metal laser sintering,فلز مستقیم پخت لیزر
 DocType: Purchase Order,Supplied Items,اقلام عرضه
 DocType: Production Order,Qty To Manufacture,تعداد برای تولید
 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,افتتاح موقت
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +41,Cryorolling,Cryorolling
 ,Employee Leave Balance,کارمند مرخصی تعادل
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +128,Balance for Account {0} must always be {1},موجودی برای حساب {0} همیشه باید {1}
 DocType: Address,Address Type,نوع نشانی
@@ -1074,23 +1034,23 @@
 DocType: Journal Entry,Get Outstanding Invoices,دریافت فاکتورها برجسته
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,سفارش فروش {0} معتبر نیست
 apps/erpnext/erpnext/setup/doctype/company/company.py +172,"Sorry, companies cannot be merged",با عرض پوزش، شرکت ها نمی توانند با هم ادغام شدند
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +145,Small,کوچک
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Small,کوچک
 DocType: Employee,Employee Number,شماره کارمند
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},مورد هیچ (بازدید کنندگان) در حال حاضر در حال استفاده است. سعی کنید از مورد هیچ {0}
 ,Invoiced Amount (Exculsive Tax),مقدار صورتحساب (Exculsive مالیات)
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,آیتم 2
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +59,Account head {0} created,سر حساب {0} ایجاد
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +153,Green,سبز
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Green,سبز
 DocType: Item,Auto re-order,خودکار دوباره سفارش
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +57,Total Achieved,مجموع بهدستآمده
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +59,Total Achieved,مجموع بهدستآمده
 DocType: Employee,Place of Issue,محل صدور
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +59,Contract,قرارداد
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Contract,قرارداد
 DocType: Report,Disabled,غیر فعال
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +490,UOM coversion factor required for UOM: {0} in Item: {1},عامل coversion UOM مورد نیاز برای UOM: {0} در مورد: {1}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +83,Indirect Expenses,هزینه های غیر مستقیم
 apps/erpnext/erpnext/controllers/selling_controller.py +163,Row {0}: Qty is mandatory,ردیف {0}: تعداد الزامی است
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +8,Agriculture,کشاورزی
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +611,Your Products or Services,محصولات و یا خدمات شما
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,کشاورزی
+apps/erpnext/erpnext/public/js/setup_wizard.js +347,Your Products or Services,محصولات و یا خدمات شما
 DocType: Mode of Payment,Mode of Payment,نحوه پرداخت
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,این یک گروه مورد ریشه است و نمی تواند ویرایش شود.
 DocType: Journal Entry Account,Purchase Order,سفارش خرید
@@ -1102,7 +1062,7 @@
 DocType: Serial No,Serial No Details,سریال جزئیات
 DocType: Purchase Invoice Item,Item Tax Rate,مورد نرخ مالیات
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +113,"For {0}, only credit accounts can be linked against another debit entry",برای {0}، تنها حساب های اعتباری می تواند در مقابل ورود بدهی دیگر مرتبط
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Delivery Note {0} is not submitted,تحویل توجه داشته باشید {0} است ارسال نشده
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +470,Delivery Note {0} is not submitted,تحویل توجه داشته باشید {0} است ارسال نشده
 apps/erpnext/erpnext/stock/get_item_details.py +136,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.",قانون قیمت گذاری شده است برای اولین بار بر اساس انتخاب &#39;درخواست در&#39; درست است که می تواند مورد، مورد گروه و یا تجاری.
@@ -1112,7 +1072,7 @@
 DocType: Appraisal Goal,Goal,هدف
 DocType: Sales Invoice Item,Edit Description,ویرایش توضیحات
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +318,Expected Delivery Date is lesser than Planned Start Date.,انتظار می رود تاریخ تحویل کمتر از برنامه ریزی شده تاریخ شروع است.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +579,For Supplier,منبع
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +602,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,خروجی ها
@@ -1138,10 +1098,10 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +74,"Total {0} for all items is zero, may you should change 'Distribute Charges Based On'",مجموع {0} برای همه موارد صفر است، ممکن است شما را باید تغییر &#39;پخش اتهامات بر اساس &quot;
 DocType: Purchase Invoice,Taxes and Charges Calculation,مالیات و هزینه محاسبه
 DocType: BOM Operation,Workstation,ایستگاه های کاری
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +112,Hardware,سخت افزار
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +112,Hardware,سخت افزار
 DocType: Attendance,HR Manager,مدیریت منابع انسانی
 apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,لطفا یک شرکت را انتخاب کنید
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +50,Privilege Leave,امتیاز مرخصی
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +50,Privilege Leave,امتیاز مرخصی
 DocType: Purchase Invoice,Supplier Invoice Date,تامین کننده فاکتور عضویت
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +79,You need to enable Shopping Cart,شما نیاز به فعال کردن سبد خرید
 apps/frappe/frappe/public/js/frappe/form/grid_body.html +6,No Data,بدون اطلاعات
@@ -1154,7 +1114,7 @@
 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 +168,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/setup/page/setup_wizard/install_fixtures.py +38,Food,غذا
+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 +139,You can make a time log only against a submitted production order,شما می توانید ورود به سیستم زمان تنها در برابر یک سفارش تولید ارائه را
 DocType: Maintenance Schedule Item,No of Visits,تعداد بازدید ها
@@ -1174,6 +1134,7 @@
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,View Offer Letter,نمایش نامه پیشنهاد
 DocType: Communication,Communication,ارتباط
 DocType: Item,Is Service Item,آیا مورد خدمات
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +81,Application period cannot be outside leave allocation period,دوره نرم افزار می تواند دوره تخصیص مرخصی در خارج نیست
 DocType: Activity Cost,Projects,پروژه
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +31,Please select Fiscal Year,لطفا سال مالی انتخاب کنید
 apps/erpnext/erpnext/controllers/buying_controller.py +23,From {0} | {1} {2},از {0} | {1} {2}
@@ -1192,7 +1153,7 @@
 DocType: Item,Maintain Stock,حفظ سهام
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +213,Stock Entries already created for Production Order ,مطالب سهام در حال حاضر برای سفارش تولید ایجاد
 DocType: Leave Control Panel,Leave blank if considered for all designations,خالی بگذارید اگر برای همه در نظر گرفته نامگذاریهای
-apps/erpnext/erpnext/controllers/accounts_controller.py +499,Charge of type 'Actual' in row {0} cannot be included in Item Rate,شارژ از نوع &#39;واقعی&#39; در ردیف {0} نمی تواند در مورد نرخ شامل
+apps/erpnext/erpnext/controllers/accounts_controller.py +500,Charge of type 'Actual' in row {0} cannot be included in Item Rate,شارژ از نوع &#39;واقعی&#39; در ردیف {0} نمی تواند در مورد نرخ شامل
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,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,برای شرکت
@@ -1202,7 +1163,7 @@
 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 +471,cannot be greater than 100,نمی تواند بیشتر از ۱۰۰ باشد
-apps/erpnext/erpnext/stock/doctype/item/item.py +546,Item {0} is not a stock Item,مورد {0} است مورد سهام نمی
+apps/erpnext/erpnext/stock/doctype/item/item.py +550,Item {0} is not a stock Item,مورد {0} است مورد سهام نمی
 DocType: Maintenance Visit,Unscheduled,برنامه ریزی
 DocType: Employee,Owned,متعلق به
 DocType: Salary Slip Deduction,Depends on Leave Without Pay,بستگی به مرخصی بدون حقوق
@@ -1216,30 +1177,28 @@
 DocType: HR Settings,Employee Settings,تنظیمات کارمند
 ,Batch-Wise Balance History,دسته حکیم تاریخچه تعادل
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +72,To Do List,فهرست کارهای
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +63,Apprentice,شاگرد
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Apprentice,شاگرد
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +99,Negative Quantity is not allowed,تعداد منفی مجاز نیست
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
 Used for Taxes and Charges",مالیات جدول جزئیات ذهن از آیتم های کارشناسی ارشد به عنوان یک رشته و ذخیره شده در این زمینه. مورد استفاده برای مالیات و هزینه
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +61,Lancing,ضربت نیزه
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +151,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 +435,Accounting Entry for {0}: {1} can only be made in currency: {2},ثبت حسابداری برای {0}: {1} تنها می تواند در ارز ساخته شده است: {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +436,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 +38,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 +112,Tax Rule for transactions.,قانون مالیاتی برای معاملات.
 DocType: Rename Tool,Type of document to rename.,نوع سند به تغییر نام دهید.
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +630,We buy this Item,ما خرید این مورد
+apps/erpnext/erpnext/public/js/setup_wizard.js +366,We buy this Item,ما خرید این مورد
 DocType: Address,Billing,صدور صورت حساب
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +77,Flanging,Flanging
 DocType: Bulk Email,Not Sent,ارسال نشد
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +73,Explosive forming,تشکیل مواد منفجره
 DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),مجموع مالیات و هزینه (شرکت ارز)
 DocType: Shipping Rule,Shipping Account,حساب های حمل و نقل
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +43,Scheduled to send to {0} recipients,برنامه ریزی برای ارسال به {0} دریافت کنندگان
 DocType: Quality Inspection,Readings,خوانش
 DocType: Stock Entry,Total Additional Costs,مجموع هزینه های اضافی
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Sub Assemblies,مجامع زیر
+apps/erpnext/erpnext/public/js/setup_wizard.js +359,Sub Assemblies,مجامع زیر
 DocType: Shipping Rule Condition,To Value,به ارزش
 DocType: Supplier,Stock Manager,سهام مدیر
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +143,Source warehouse is mandatory for row {0},انبار منبع برای ردیف الزامی است {0}
@@ -1249,44 +1208,42 @@
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,واردات نشد!
 apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,بدون آدرس اضافه نشده است.
 DocType: Workstation Working Hour,Workstation Working Hour,ایستگاه های کاری کار یک ساعت
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +83,Analyst,روانکاو
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +202,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},ردیف {0}: اختصاص مقدار {1} باید کمتر از برابر می شود و یا به مقدار JV {2}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Analyst,روانکاو
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +149,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},ردیف {0}: اختصاص مقدار {1} باید کمتر از برابر می شود و یا به مقدار JV {2}
 DocType: Item,Inventory,فهرست
 DocType: Features Setup,"To enable ""Point of Sale"" view",برای فعال کردن &quot;نقطه ای از فروش&quot; مشاهده
 apps/erpnext/erpnext/public/js/pos/pos.js +402,Payment cannot be made for empty cart,پرداخت می توانید برای سبد خرید خالی نمی شود ساخته شده
 DocType: Item,Sales Details,جزییات فروش
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +149,Pinning,پین کردن
 DocType: Opportunity,With Items,با اقلام
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,در تعداد
 DocType: Notification Control,Expense Claim Rejected,ادعای هزینه رد
 DocType: Sales Invoice,"The date on which next invoice will be generated. It is generated on submit.
 ",از تاریخ فاکتور بعدی تولید خواهد شد. این است که در ارائه تولید می شود.
 DocType: Item Attribute,Item Attribute,صفت مورد
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +105,Government,دولت
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Government,دولت
 apps/erpnext/erpnext/config/stock.py +268,Item Variants,انواع آیتم
 DocType: Company,Services,خدمات
 apps/erpnext/erpnext/accounts/report/financial_statements.py +147,Total ({0}),مجموع ({0})
 DocType: Cost Center,Parent Cost Center,مرکز هزینه پدر و مادر
 DocType: Sales Invoice,Source,منبع
 DocType: Leave Type,Is Leave Without Pay,آیا ترک کنی بدون اینکه پرداخت
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +186,No records found in the Payment table,هیچ ثبتی یافت نشد در جدول پرداخت
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +405,Financial Year Start Date,مالی سال تاریخ شروع
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +133,No records found in the Payment table,هیچ ثبتی یافت نشد در جدول پرداخت
+apps/erpnext/erpnext/public/js/setup_wizard.js +153,Financial Year Start Date,مالی سال تاریخ شروع
 DocType: Employee External Work History,Total Experience,تجربه ها
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +100,Countersinking,Countersinking
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +271,Packing Slip(s) cancelled,بسته بندی لغزش (بازدید کنندگان) لغو
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +276,Packing Slip(s) cancelled,بسته بندی لغزش (بازدید کنندگان) لغو
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,حمل و نقل و حمل و نقل اتهامات
 DocType: Material Request Item,Sales Order No,سفارش فروش بدون
 DocType: Item Group,Item Group Name,مورد نام گروه
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +50,Taken,گرفته
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,گرفته
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +66,Transfer Materials for Manufacture,انتقال مواد برای تولید
 DocType: Pricing Rule,For Price List,برای اطلاع از قیمت
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +27,Executive Search,اجرایی جستجو
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,اجرایی جستجو
 apps/erpnext/erpnext/stock/stock_ledger.py +405,"Purchase rate for item: {0} not found, which is required to book accounting entry (expense). Please mention item price against a buying price list.",نرخ خرید برای آیتم: {0} یافت نشد، که لازم است به کتاب ثبت حسابداری (هزینه). لطفا قیمت مورد را با لیست قیمت خرید ذکر است.
 DocType: Maintenance Schedule,Schedules,برنامه
 DocType: Purchase Invoice Item,Net Amount,مقدار خالص
 DocType: Purchase Order Item Supplied,BOM Detail No,جزئیات BOM بدون
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),تخفیف اضافی مبلغ (ارز شرکت)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +537,Error: {0} > {1},خطا: {0}&gt; {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +541,Error: {0} > {1},خطا: {0}&gt; {1}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,لطفا حساب جدید را از نمودار از حساب ایجاد کنید.
 DocType: Maintenance Visit,Maintenance Visit,نگهداری و تعمیرات مشاهده
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer > Customer Group > Territory,مشتری&gt; مشتری گروه&gt; منطقه
@@ -1297,7 +1254,6 @@
 DocType: Event,Tuesday,سهشنبه
 DocType: Leave Block List,Block Holidays on important days.,تعطیلات بلوک در روز مهم است.
 ,Accounts Receivable Summary,خلاصه حسابهای دریافتنی
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +43,Leaves for type {0} already allocated for Employee {1} for period {2} - {3},برگ برای نوع {0} در حال حاضر برای کارمند {1} اختصاص داده شده برای دوره {2} - {3}
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +187,Please set User ID field in an Employee record to set Employee Role,لطفا درست ID کاربر در یک پرونده کارمند به مجموعه نقش کارمند تنظیم
 DocType: UOM,UOM Name,نام UOM
 DocType: Top Bar Item,Target,هدف
@@ -1309,15 +1265,14 @@
 DocType: ToDo,Due Date,تاریخ
 DocType: Sales Invoice Item,Brand Name,نام تجاری
 DocType: Purchase Receipt,Transporter Details,اطلاعات حمل و نقل
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Box,جعبه
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +389,The Organization,سازمان
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Box,جعبه
+apps/erpnext/erpnext/public/js/setup_wizard.js +137,The Organization,سازمان
 DocType: Monthly Distribution,Monthly Distribution,توزیع ماهانه
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,فهرست گیرنده خالی است. لطفا ایجاد فهرست گیرنده
 DocType: Production Plan Sales Order,Production Plan Sales Order,تولید برنامه سفارش فروش
 DocType: Sales Partner,Sales Partner Target,فروش شریک هدف
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},ثبت حسابداری برای {0} تنها می تواند در ارز ساخته شده است: {1}
 DocType: Pricing Rule,Pricing Rule,قانون قیمت گذاری
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +58,Notching,اهمیت حیاتی
 apps/erpnext/erpnext/config/learn.py +167,Material Request to Purchase Order,درخواست مواد به خرید سفارش
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +74,Row # {0}: Returned Item {1} does not exists in {2} {3},ردیف # {0}: برگشتی مورد {1} در وجود دارد نمی {2} {3}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,حساب های بانکی
@@ -1334,20 +1289,19 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Amounts not reflected in bank,مقدار به بانک منعکس نشده است
 DocType: Quality Inspection Reading,Reading 4,خواندن 4
 apps/erpnext/erpnext/config/hr.py +23,Claims for company expense.,ادعای هزینه شرکت.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +8,Centrifugal casting,ریخته گری گریز از
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +119,Magnetic field-assisted finishing,میدان مغناطیسی کمک به پایان رساندن
 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,تماس با موبایل بدون
 DocType: Production Planning Tool,Select Sales Orders,سفارشات فروش را انتخاب
 ,Material Requests for which Supplier Quotations are not created,درخواست مواد که نقل قول تامین کننده ایجاد نمی
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +117,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,روز (بازدید کنندگان) که در آن شما برای مرخصی استفاده از تعطیلات. شما نیاز به درخواست برای ترک نمی کند.
 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/buying/doctype/purchase_order/purchase_order.js +477,Mark as Delivered,علامت گذاری به عنوان تحویل
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +497,Mark as Delivered,علامت گذاری به عنوان تحویل
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +34,Make Quotation,را نقل قول
 DocType: Dependent Task,Dependent Task,وظیفه وابسته
-apps/erpnext/erpnext/stock/doctype/item/item.py +306,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 +141,Leave of type {0} cannot be longer than {1},مرخصی از نوع {0} نمی تواند بیش از {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +310,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 +155,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,فهرست گیرنده
@@ -1355,15 +1309,14 @@
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,مقدار مصرف
 apps/erpnext/erpnext/public/js/pos/pos.js +491,{0} View,{0} نمایش
 DocType: Salary Structure Deduction,Salary Structure Deduction,کسر ساختار حقوق و دستمزد
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +158,Selective laser sintering,پخت لیزر انتخابی
-apps/erpnext/erpnext/stock/doctype/item/item.py +301,Unit of Measure {0} has been entered more than once in Conversion Factor Table,واحد اندازه گیری {0} است بیش از یک بار در تبدیل فاکتور جدول وارد شده است
+apps/erpnext/erpnext/stock/doctype/item/item.py +305,Unit of Measure {0} has been entered more than once in Conversion Factor Table,واحد اندازه گیری {0} است بیش از یک بار در تبدیل فاکتور جدول وارد شده است
 apps/frappe/frappe/core/page/data_import_tool/data_import_tool.js +108,Import Successful!,واردات موفق!
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,هزینه اقلام صادر شده
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +185,Quantity must not be more than {0},تعداد نباید بیشتر از {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +41,Age (Days),سن (روز)
 DocType: Quotation Item,Quotation Item,مورد نقل قول
 DocType: Account,Account Name,نام حساب
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +41,From Date cannot be greater than To Date,از تاریخ نمی تواند بیشتر از به روز
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +34,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.,نوع منبع کارشناسی ارشد.
 DocType: Purchase Order Item,Supplier Part Number,تامین کننده شماره قسمت
@@ -1372,14 +1325,14 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +247,{0} {1} is cancelled or stopped,{0} {1} لغو و یا متوقف
 DocType: Accounts Settings,Credit Controller,کنترل اعتبار
 DocType: Delivery Note,Vehicle Dispatch Date,اعزام خودرو تاریخ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +197,Purchase Receipt {0} is not submitted,رسید خرید {0} است ارسال نشده
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +198,Purchase Receipt {0} is not submitted,رسید خرید {0} است ارسال نشده
 DocType: Company,Default Payable Account,به طور پیش فرض پرداختنی حساب
 apps/erpnext/erpnext/config/website.py +13,"Settings for online shopping cart such as shipping rules, price list etc.",تنظیمات برای سبد خرید آنلاین مانند قوانین حمل و نقل، لیست قیمت و غیره
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +660,Setup Complete,راه اندازی کامل
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +124,Setup Complete,راه اندازی کامل
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +65,{0}% Billed,{0}٪ صورتحساب
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +17,Reserved Qty,این سایت متعلق به تعداد
 DocType: Party Account,Party Account,حساب حزب
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +74,Human Resources,منابع انسانی
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +74,Human Resources,منابع انسانی
 DocType: Lead,Upper Income,درآمد بالاتر
 DocType: Journal Entry Account,Debit in Company Currency,بدهی شرکت در ارز
 apps/erpnext/erpnext/support/doctype/issue/issue.py +58,My Issues,مسائل مربوط به من
@@ -1388,11 +1341,9 @@
 DocType: Company,Default Values,مقادیر پیش فرض
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +236,Row {0}: Payment amount can not be negative,ردیف {0}: میزان پرداخت نمی تونه منفی
 DocType: Expense Claim,Total Amount Reimbursed,مقدار کل بازپرداخت
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +152,Press fitting,اتصالات مطبوعات
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +64,Against Supplier Invoice {0} dated {1},در برابر تامین کننده فاکتور {0} تاریخ {1}
 DocType: Customer,Default Price List,به طور پیش فرض لیست قیمت
 DocType: Payment Reconciliation,Payments,پرداخت
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +24,Hot isostatic pressing,با فشار دادن isostatic داغ
 DocType: ToDo,Medium,متوسط
 DocType: Budget Detail,Budget Allocated,بودجه اختصاص داده شده
 DocType: Journal Entry,Entry Type,نوع ورودی
@@ -1405,9 +1356,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +56,None of the items have any change in quantity or value.,هیچ یک از موارد هر گونه تغییر در مقدار یا ارزش.
 DocType: Warranty Claim,Warranty Claim,ادعای گارانتی
 ,Lead Details,مشخصات راهبر
-DocType: Authorization Rule,Approving User,تصویب کاربر
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +37,Forging,واحد فورج و
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +126,Plating,آبکاری
 DocType: Purchase Invoice,End date of current invoice's period,تاریخ پایان دوره صورتحساب فعلی
 DocType: Pricing Rule,Applicable For,قابل استفاده برای
 DocType: Bank Reconciliation,From Date,از تاریخ
@@ -1429,31 +1377,29 @@
 DocType: Sales Invoice,Paid Amount (Company Currency),مبلغ پرداخت شده (شرکت ارز)
 DocType: Purchase Invoice,Additional Discount,تخفیف اضافی
 DocType: Selling Settings,Selling Settings,فروش تنظیمات
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +39,Online Auctions,مزایده آنلاین
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,مزایده آنلاین
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +94,Please specify either Quantity or Valuation Rate or both,لطفا یا مقدار و یا نرخ گذاری و یا هر دو مشخص
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +50,"Company, Month and Fiscal Year is mandatory",شرکت، ماه و سال مالی الزامی است
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Marketing Expenses,هزینه های بازاریابی
 ,Item Shortage Report,مورد گزارش کمبود
-apps/erpnext/erpnext/stock/doctype/item/item.js +183,"Weight is mentioned,\nPlease mention ""Weight UOM"" too",وزن ذکر شده است، \ n لطفا ذکر &quot;وزن UOM&quot; بیش از حد
+apps/erpnext/erpnext/stock/doctype/item/item.js +185,"Weight is mentioned,\nPlease mention ""Weight UOM"" too",وزن ذکر شده است، \ n لطفا ذکر &quot;وزن UOM&quot; بیش از حد
 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 +212,Time Log Batch {0} must be 'Submitted',زمان ورود دسته ای {0} باید &#39;فرستاده&#39;
 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 +384,Warehouse required at Row No {0},انبار مورد نیاز در ردیف بدون {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +386,Warehouse required at Row No {0},انبار مورد نیاز در ردیف بدون {0}
 DocType: Employee,Date Of Retirement,تاریخ بازنشستگی
 DocType: Upload Attendance,Get Template,دریافت قالب
 DocType: Address,Postal,پستی
 DocType: Item,Weightage,بین وزنها
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +159,Mining,استخراج معدن
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +17,Resin casting,ریخته گری رزین
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,یک گروه مشتری با نام مشابهی وجود دارد. لطا نام مشتری را تغییر دهید یا نام گروه مشتری را اصلاح نمایید.
 apps/erpnext/erpnext/public/js/pos/pos.js +147,Please select {0} first.,لطفا {0} انتخاب کنید.
 apps/erpnext/erpnext/templates/pages/order.html +57,text {0},متن {0}
 DocType: Territory,Parent Territory,سرزمین پدر و مادر
 DocType: Quality Inspection Reading,Reading 2,خواندن 2
 DocType: Stock Entry,Material Receipt,دریافت مواد
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +622,Products,محصولات
+apps/erpnext/erpnext/public/js/setup_wizard.js +358,Products,محصولات
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +47,Party Type and Party is required for Receivable / Payable account {0},حزب نوع و حزب دریافتنی / حساب پرداختنی مورد نیاز است {0}
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.",اگر این فقره انواع، سپس آن را نمی تواند در سفارشات فروش و غیره انتخاب شود
 DocType: Lead,Next Contact By,بعد تماس با
@@ -1463,13 +1409,13 @@
 DocType: Purchase Invoice,Notification Email Address,هشدار از طریق ایمیل
 DocType: Payment Tool,Find Invoices to Match,یافتن فاکتورها به در نظر گرفتن
 ,Item-wise Sales Register,مورد عاقلانه فروش ثبت نام
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +399,"e.g. ""XYZ National Bank""",به عنوان مثال &quot;XYZ بانک ملی&quot;
+apps/erpnext/erpnext/public/js/setup_wizard.js +147,"e.g. ""XYZ National Bank""",به عنوان مثال &quot;XYZ بانک ملی&quot;
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,آیا این مالیات شامل در نرخ پایه؟
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +57,Total Target,مجموع هدف
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Target,مجموع هدف
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.js +22,Shopping Cart is enabled,سبد خرید فعال است
 DocType: Job Applicant,Applicant for a Job,متقاضی برای شغل
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +173,No Production Orders created,بدون سفارشات تولید ایجاد
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +131,Salary Slip of employee {0} already created for this month,لغزش حقوق و دستمزد کارکنان {0} در حال حاضر برای این ماه ایجاد
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +140,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.,ستون های بسیاری. صادرات این گزارش و با استفاده از یک برنامه صفحه گسترده آن را چاپ.
 DocType: Sales Invoice Item,Batch No,دسته بدون
@@ -1479,14 +1425,14 @@
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +13,Variant,نوع دیگر
 apps/frappe/frappe/public/js/frappe/form/toolbar.js +165,New {0},جدید {0}
 DocType: Naming Series,Set prefix for numbering series on your transactions,تنظیم پیشوند برای شماره سری در معاملات خود را
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +169,Stopped order cannot be cancelled. Unstop to cancel.,منظور متوقف نمی تواند لغو شود. Unstop برای لغو.
-apps/erpnext/erpnext/stock/doctype/item/item.py +323,Default BOM ({0}) must be active for this item or its template,به طور پیش فرض BOM ({0}) باید برای این آیتم به و یا قالب آن فعال باشد
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +164,Stopped order cannot be cancelled. Unstop to cancel.,منظور متوقف نمی تواند لغو شود. Unstop برای لغو.
+apps/erpnext/erpnext/stock/doctype/item/item.py +327,Default BOM ({0}) must be active for this item or its template,به طور پیش فرض BOM ({0}) باید برای این آیتم به و یا قالب آن فعال باشد
 DocType: Employee,Leave Encashed?,ترک نقد شدنی؟
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,فرصت از فیلد اجباری است
 DocType: Item,Variants,انواع
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +458,Make Purchase Order,را سفارش خرید
 DocType: SMS Center,Send To,فرستادن به
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +111,There is not enough leave balance for Leave Type {0},است تعادل مرخصی به اندازه کافی برای مرخصی نوع وجود ندارد {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +127,There is not enough leave balance for Leave Type {0},است تعادل مرخصی به اندازه کافی برای مرخصی نوع وجود ندارد {0}
 DocType: Sales Team,Contribution to Net Total,کمک به شبکه ها
 DocType: Sales Invoice Item,Customer's Item Code,کد مورد مشتری
 DocType: Stock Reconciliation,Stock Reconciliation,سهام آشتی
@@ -1523,11 +1469,11 @@
 DocType: Sales Order Item,Actual Qty,تعداد واقعی
 DocType: Sales Invoice Item,References,مراجع
 DocType: Quality Inspection Reading,Reading 10,خواندن 10
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +612,"List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start.",لیست محصولات و یا خدمات خود را که شما خرید و یا فروش. مطمئن شوید برای بررسی گروه مورد، واحد اندازه گیری و خواص دیگر زمانی که شما شروع می شود.
+apps/erpnext/erpnext/public/js/setup_wizard.js +348,"List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start.",لیست محصولات و یا خدمات خود را که شما خرید و یا فروش. مطمئن شوید برای بررسی گروه مورد، واحد اندازه گیری و خواص دیگر زمانی که شما شروع می شود.
 DocType: Hub Settings,Hub Node,مرکز گره
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,شما وارد آیتم های تکراری. لطفا اصلاح و دوباره سعی کنید.
 apps/erpnext/erpnext/controllers/item_variant.py +65,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values,ارزش {0} برای صفت {1} در لیست مورد معتبر وجود ندارد مقادیر ویژگی
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +87,Associate,وابسته
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Associate,وابسته
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +46,Item {0} is not a serialized Item,مورد {0} است مورد سریال نه
 DocType: SMS Center,Create Receiver List,ایجاد فهرست گیرنده
 apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +5,Expired,تمام شده
@@ -1536,7 +1482,7 @@
 DocType: Warranty Claim,Issue Date,تاریخ صدور
 DocType: Activity Cost,Activity Cost,هزینه فعالیت
 DocType: Purchase Receipt Item Supplied,Consumed Qty,مصرف تعداد
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +52,Telecommunications,ارتباطات
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +52,Telecommunications,ارتباطات
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),نشان می دهد که بسته به بخشی از این تحویل (فقط پیش نویس) است
 DocType: Payment Tool,Make Payment Entry,ورود را پرداخت
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +119,Quantity for Item {0} must be less than {1},تعداد برای مورد {0} باید کمتر از است {1}
@@ -1553,10 +1499,8 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +37,"Selling must be checked, if Applicable For is selected as {0}",فروش باید بررسی شود، اگر قابل استفاده برای عنوان انتخاب شده {0}
 DocType: Purchase Order Item,Supplier Quotation Item,تامین کننده مورد عبارت
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +27,Make Salary Structure,را ساختار حقوق و دستمزد
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +54,Shearing,موی مرا کوتاه کنید
 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.,در &#39;را فاکتور فروش&#39; را فشار دهید کلیک کنید برای ایجاد یک فاکتور فروش جدید.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +166,Packaging and labeling,بسته بندی و برچسب زدن
 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,لطفا پیش فرض ارز در شرکت استاد و به طور پیش فرض در جهان مشخص
@@ -1567,19 +1511,18 @@
 DocType: Budget Detail,Fiscal Year,سال مالی
 DocType: Cost Center,Budget,بودجه
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +41,"Budget cannot be assigned against {0}, as it's not an Income or Expense account",بودجه می توانید در برابر {0} اختصاص داده نمی شود، آن را به عنوان یک حساب کاربری درآمد یا هزینه نیست
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Achieved,به دست آورد
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,به دست آورد
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +65,Territory / Customer,منطقه / مشتریان
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,e.g. 5,به عنوان مثال 5
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +207,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},ردیف {0}: اختصاص مقدار {1} باید کمتر از برابر می شود و یا به فاکتور مقدار برجسته {2}
+apps/erpnext/erpnext/public/js/setup_wizard.js +294,e.g. 5,به عنوان مثال 5
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},ردیف {0}: اختصاص مقدار {1} باید کمتر از برابر می شود و یا به فاکتور مقدار برجسته {2}
 DocType: Sales Invoice,In Words will be visible once you save the Sales Invoice.,به عبارت قابل مشاهده خواهد بود زمانی که به فاکتور فروش را نجات دهد.
 DocType: Item,Is Sales Item,آیا مورد فروش
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,مورد گروه درخت
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,مورد {0} است راه اندازی برای سریال شماره ندارید. استاد مورد
 DocType: Maintenance Visit,Maintenance Time,زمان نگهداری 
 ,Amount to Deliver,مقدار برای ارائه
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +620,A Product or Service,یک محصول یا خدمت
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +158,There were errors.,خطاهایی وجود دارد.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +101,Tapping,بهره برداری
+apps/erpnext/erpnext/public/js/setup_wizard.js +356,A Product or Service,یک محصول یا خدمت
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +146,There were errors.,خطاهایی وجود دارد.
 DocType: Naming Series,Current Value,ارزش فعلی
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +171,{0} created,{0} ایجاد شد
 DocType: Delivery Note Item,Against Sales Order,علیه سفارش فروش
@@ -1593,7 +1536,7 @@
 apps/erpnext/erpnext/accounts/party.py +275,Due Date cannot be before Posting Date,تاریخ را نمی توان قبل از ارسال تاریخ
 DocType: Website Item Group,Website Item Group,وب سایت مورد گروه
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Duties and Taxes,وظایف و مالیات
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Please enter Reference date,لطفا تاریخ مرجع وارد
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +312,Please enter Reference date,لطفا تاریخ مرجع وارد
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} نوشته های پرداخت نمی تواند فیلتر {1}
 DocType: Item Website Specification,Table for Item that will be shown in Web Site,جدول برای مورد است که در وب سایت نشان داده خواهد شد
 DocType: Purchase Order Item Supplied,Supplied Qty,عرضه تعداد
@@ -1601,7 +1544,7 @@
 apps/erpnext/erpnext/config/stock.py +103,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,تاریخچه خرید مورد عاقلانه
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +152,Red,قرمز
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Red,قرمز
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +228,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},لطفا بر روی &#39;ایجاد برنامه &quot;کلیک کنید و به واکشی سریال بدون برای مورد اضافه شده است {0}
 DocType: Account,Frozen,یخ زده
 ,Open Production Orders,سفارشات تولید گسترش
@@ -1616,7 +1559,7 @@
 DocType: Item Attribute,Attribute Name,نام مشخصه
 apps/erpnext/erpnext/controllers/selling_controller.py +236,Item {0} must be Sales or Service Item in {1},مورد {0} باید به فروش و یا مورد خدمات می شود {1}
 DocType: Item Group,Show In Website,نمایش در وب سایت
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +621,Group,گروه
+apps/erpnext/erpnext/public/js/setup_wizard.js +357,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",برای پیگیری نام تجاری در مدارک زیر را تحویل توجه داشته باشید، فرصت، درخواست مواد، مورد، سفارش خرید، خرید کوپن، دریافت مشتری، نقل قول، فاکتور فروش، محصولات بسته نرم افزاری، سفارش فروش، سریال بدون
@@ -1626,6 +1569,7 @@
 DocType: Features Setup,Brands,علامت های تجاری
 DocType: C-Form Invoice Detail,Invoice No,شماره فاکتور
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +480,From Purchase Order,از سفارش خرید
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +92,"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,استعفای نامه تاریخ
@@ -1633,35 +1577,31 @@
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +137,Not Set,تنظیم نشده
 DocType: Communication,Date,تاریخ
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,تکرار درآمد و ضوابط
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +651,Sit tight while your system is being setup. This may take a few moments.,سفت و سخت در حالی که سیستم شما در حال راه اندازی. این ممکن است چند لحظه طول بکشد.
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +115,Sit tight while your system is being setup. This may take a few moments.,سفت و سخت در حالی که سیستم شما در حال راه اندازی. این ممکن است چند لحظه طول بکشد.
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +51,{0} ({1}) must have role 'Expense Approver',{0} ({1}) باید اجازه 'تاییدو امضا کننده هزینه' را داشته باشید
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Pair,جفت
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Pair,جفت
 DocType: Bank Reconciliation Detail,Against Account,به حساب
 DocType: Maintenance Schedule Detail,Actual Date,تاریخ واقعی
 DocType: Item,Has Batch No,دارای دسته ای بدون
 DocType: Delivery Note,Excise Page Number,مالیات کالاهای داخلی صفحه شماره
 DocType: Employee,Personal Details,اطلاعات شخصی
 ,Maintenance Schedules,برنامه های  نگهداری و تعمیرات
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +44,Embossing,ختم
 ,Quotation Trends,روند نقل قول
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +139,Item Group not mentioned in item master for item {0},مورد گروه در مورد استاد برای آیتم ذکر نشده {0}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +302,Debit To account must be a Receivable account,بدهی به حساب باید یک حساب کاربری دریافتنی است
-apps/erpnext/erpnext/stock/doctype/item/item.py +310,"As Production Order can be made for this item, it must be a stock item.",عنوان سفارش تولید می توان برای این آیتم به ساخته شده، آن را باید یک مورد سهام باشد.
 DocType: Shipping Rule Condition,Shipping Amount,مقدار حمل و نقل
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +140,Joining,پیوستن
-DocType: Authorization Rule,Above Value,بالاتر از ارزش 
 ,Pending Amount,در انتظار مقدار
 DocType: Purchase Invoice Item,Conversion Factor,عامل تبدیل
 DocType: Purchase Order,Delivered,تحویل
 apps/erpnext/erpnext/config/hr.py +160,Setup incoming server for jobs email id. (e.g. jobs@example.com),راه اندازی سرور های دریافتی برای شغل ایمیل ID. (به عنوان مثال jobs@example.com)
 DocType: Purchase Receipt,Vehicle Number,تعداد خودرو
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,از تاریخ تکرار می شود فاکتور را متوقف خواهد کرد
+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,حسابهای دریافتنی
 ,Supplier-Wise Sales Analytics,تامین کننده حکیم فروش تجزیه و تحلیل ترافیک
 DocType: Address Template,This format is used if country specific format is not found,این قالب استفاده شده است اگر قالب خاص کشور یافت نشد
 DocType: Custom Field,Custom,رسم
 DocType: Production Order,Use Multi-Level BOM,استفاده از چند سطح BOM
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +26,Injection molding,قالب گیری تزریقی
 DocType: Bank Reconciliation,Include Reconciled Entries,شامل مطالب آشتی
 apps/erpnext/erpnext/config/accounts.py +41,Tree of finanial accounts.,درخت حساب finanial.
 DocType: Leave Control Panel,Leave blank if considered for all employee types,خالی بگذارید اگر برای همه نوع کارمند در نظر گرفته
@@ -1671,30 +1611,28 @@
 apps/frappe/frappe/config/setup.py +130,Printing,چاپ
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +114,Expense Claim is pending approval. Only the Expense Approver can update status.,ادعای هزینه منتظر تأیید است. تنها تصویب هزینه می توانید وضعیت به روز رسانی.
 DocType: Purchase Invoice,Additional Discount Amount,تخفیف اضافی مبلغ
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +99,The day(s) on which you are applying for leave are holiday. You need not apply for leave.,روز (بازدید کنندگان) که در آن شما برای مرخصی استفاده می تعطیلات. شما نیاز به درخواست برای ترک نخواهد کرد.
 apps/frappe/frappe/public/js/frappe/misc/utils.js +110,and,و
 DocType: Leave Block List Allow,Leave Block List Allow,ترک فهرست بلوک اجازه
 apps/erpnext/erpnext/setup/doctype/company/company.py +236,Abbr can not be blank or space,مخفف نمیتواند خالی باشد یا فضای
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +50,Sports,ورزشی
+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/setup/page/setup_wizard/setup_wizard.js +626,Unit,واحد
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Unit,واحد
 apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.py +182,Please set Dropbox access keys in your site config,لطفا کلیدهای دسترسی Dropbox به پیکربندی در سایت خود تنظیم
 apps/erpnext/erpnext/stock/get_item_details.py +113,Please specify Company,لطفا شرکت مشخص
 ,Customer Acquisition and Loyalty,مشتری خرید و وفاداری
 DocType: Purchase Receipt,Warehouse where you are maintaining stock of rejected items,انبار که در آن شما می حفظ سهام از اقلام را رد کرد
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +408,Your financial year ends on,سال مالی خود را به پایان می رسد در
+apps/erpnext/erpnext/public/js/setup_wizard.js +156,Your financial year ends on,سال مالی خود را به پایان می رسد در
 DocType: POS Profile,Price List,لیست قیمت
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +20,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0} در حال حاضر به طور پیش فرض سال مالی. لطفا مرورگر خود را برای تغییر تاثیر گذار تازه کردن.
 apps/erpnext/erpnext/projects/doctype/project/project.js +47,Expense Claims,ادعاهای هزینه
 DocType: Issue,Support,پشتیبانی
-DocType: Authorization Rule,Approving Role,تصویب نقش
 ,BOM Search,BOM جستجو
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +176,Closing (Opening + Totals),بسته شدن (باز مجموع +)
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +26,Please specify currency in Company,لطفا ارز در شرکت مشخص
 DocType: Workstation,Wages per hour,دستمزد در ساعت
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,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/controllers/accounts_controller.py +236,Account {0} is invalid. Account Currency must be {1},حساب {0} نامعتبر است. حساب ارز باید {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +237,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},عامل UOM تبدیل در ردیف مورد نیاز است {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +53,Clearance date cannot be before check date in row {0},تاریخ ترخیص کالا از نمی تواند قبل از تاریخ چک در ردیف شود {0}
 DocType: Salary Slip,Deduction,کسر
@@ -1713,13 +1651,13 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +82,Item {0} has already been returned,مورد {0} در حال حاضر بازگشت شده است
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** ** سال مالی نشان دهنده یک سال مالی. تمام پست های حسابداری و دیگر معاملات عمده در برابر سال مالی ** ** ردیابی.
 DocType: Opportunity,Customer / Lead Address,مشتری / سرب آدرس
+apps/erpnext/erpnext/stock/doctype/item/item.py +112,Warning: Invalid SSL certificate on attachment {0},هشدار: گواهینامه SSL نامعتبر در پیوست {0}
 DocType: Production Order Operation,Actual Operation Time,عملیات واقعی زمان
 DocType: Authorization Rule,Applicable To (User),به قابل اجرا (کاربر)
 DocType: Purchase Taxes and Charges,Deduct,کسر کردن
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +170,Job Description,شرح شغل
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +170,Job Description,شرح شغل
 DocType: Purchase Order Item,Qty as per Stock UOM,تعداد در هر بورس UOM
 apps/frappe/frappe/model/rename_doc.py +343,Please select a valid csv file with data,لطفا یک فایل CSV معتبر با داده را انتخاب کنید
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +92,Coating,پوشش
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +126,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series",کاراکترهای خاص به جز &quot;-&quot; &quot;.&quot;، &quot;#&quot;، و &quot;/&quot; در نامگذاری سری مجاز نیست
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.",پیگیری فروش مبارزات نگه دارید. آهنگ از آگهی های نقل قول نگه دارید، سفارش فروش و غیره را از مبارزات برای ارزیابی بازگشت سرمایه گذاری.
 DocType: Expense Claim,Approver,تصویب
@@ -1729,12 +1667,11 @@
 DocType: Supplier Quotation,Manufacturing Manager,ساخت مدیر
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +191,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/hooks.py +84,Shipments,محموله
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +29,Dip molding,قالب ریزی و سازه شیب
+apps/erpnext/erpnext/hooks.py +68,Shipments,محموله
 DocType: Purchase Order,To be delivered to customer,به مشتری تحویل
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,زمان ورود وضعیت باید ارائه شود.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,سریال نه {0} به هیچ انبار تعلق ندارد
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +650,Setting Up,راه اندازی
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +114,Setting Up,راه اندازی
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,Row # ,ردیف #
 DocType: Purchase Invoice,In Words (Company Currency),به عبارت (شرکت ارز)
 DocType: Pricing Rule,Supplier,تامین کننده
@@ -1742,7 +1679,7 @@
 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 +166,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,هزینه و یا حساب تفاوت برای مورد {0} آن را به عنوان اثرات ارزش کلی سهام الزامی است
-apps/erpnext/erpnext/controllers/accounts_controller.py +354,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings",نمی تواند برای مورد {0} در ردیف overbill {1} ​​بیشتر از {2}. اجازه می دهد تا overbilling، لطفا در تنظیمات سهام
+apps/erpnext/erpnext/controllers/accounts_controller.py +355,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings",نمی تواند برای مورد {0} در ردیف overbill {1} ​​بیشتر از {2}. اجازه می دهد تا overbilling، لطفا در تنظیمات سهام
 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 +135,User {0} is disabled,کاربر {0} غیر فعال است
@@ -1755,27 +1692,26 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,{0} is mandatory for Item {1},{0} برای مورد الزامی است {1}
 DocType: Currency Exchange,From Currency,از ارز
 DocType: DocField,Name,نام
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +211,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row",لطفا مقدار اختصاص داده شده، نوع فاکتور و شماره فاکتور در حداقل یک سطر را انتخاب کنید
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +104,Sales Order required for Item {0},سفارش فروش مورد نیاز برای مورد {0}
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +158,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row",لطفا مقدار اختصاص داده شده، نوع فاکتور و شماره فاکتور در حداقل یک سطر را انتخاب کنید
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +107,Sales Order required for Item {0},سفارش فروش مورد نیاز برای مورد {0}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +43,Amounts not reflected in system,مقدار در سیستم منعکس نشده است
 DocType: Purchase Invoice Item,Rate (Company Currency),نرخ (شرکت ارز)
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +40,Others,دیگران
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +40,Others,دیگران
 apps/erpnext/erpnext/templates/includes/product_page.js +80,Cannot find a matching Item. Please select some other value for {0}.,می توانید یک آیتم تطبیق پیدا کند. لطفا برخی از ارزش های دیگر برای {0} را انتخاب کنید.
 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,می توانید نوع اتهام به عنوان &#39;در مقدار قبلی Row را انتخاب کنید و یا&#39; در ردیف قبلی مجموع برای سطر اول
 apps/frappe/frappe/core/doctype/doctype/boilerplate/controller_list.html +31,Completed,تکمیل شده
 DocType: Web Form,Select DocType,انتخاب DOCTYPE
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +104,Broaching,لنجرنج
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +12,Banking,بانکداری
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,بانکداری
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +38,Please click on 'Generate Schedule' to get schedule,لطفا بر روی &#39;ایجاد برنامه&#39; کلیک کنید برای دریافت برنامه
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +283,New Cost Center,مرکز هزینه جدید
 DocType: Bin,Ordered Quantity,تعداد دستور داد
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +397,"e.g. ""Build tools for builders""",به عنوان مثال &quot;ابزار برای سازندگان ساخت&quot;
+apps/erpnext/erpnext/public/js/setup_wizard.js +145,"e.g. ""Build tools for builders""",به عنوان مثال &quot;ابزار برای سازندگان ساخت&quot;
 DocType: Quality Inspection,In Process,در حال انجام
 DocType: Authorization Rule,Itemwise Discount,Itemwise تخفیف
 DocType: Purchase Order Item,Reference Document Type,مرجع نوع سند
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +318,{0} against Sales Order {1},{0} در برابر سفارش فروش {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +320,{0} against Sales Order {1},{0} در برابر سفارش فروش {1}
 DocType: Account,Fixed Asset,دارائی های ثابت
 apps/erpnext/erpnext/config/stock.py +283,Serialized Inventory,پرسشنامه سریال
 DocType: Activity Type,Default Billing Rate,به طور پیش فرض نرخ صدور صورت حساب
@@ -1790,14 +1726,13 @@
 DocType: Purchase Invoice Item,Page Break,شکست صفحه
 DocType: Production Order Operation,Pending,در انتظار
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,کاربرانی که می توانند برنامه های مرخصی یک کارمند خاص را تایید
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +33,You cannot change default UOM of Variant. To change default UOM for Variant change default UOM of the Template,شما می توانید به طور پیش فرض از نوع UOM را تغییر دهید. به تغییر پیش فرض UOM برای متغیر UOM تغییر پیش فرض از الگو
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +50,Office Equipments,تجهیزات اداری
 DocType: Purchase Invoice Item,Qty,تعداد
 DocType: Fiscal Year,Companies,شرکت های
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +24,Electronics,الکترونیک
+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/support/doctype/maintenance_visit/maintenance_visit.js +18,From Maintenance Schedule,از نگهداری برنامه
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +56,Full-time,تمام وقت
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +56,Full-time,تمام وقت
 DocType: Purchase Invoice,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.",اگر شما یک قالب استاندارد در مالیات فروش و اتهامات الگو ایجاد کرده اند، یکی را انتخاب کنید و کلیک بر روی دکمه زیر کلیک کنید.
@@ -1809,11 +1744,12 @@
 DocType: Job Applicant,Job Opening,افتتاح شغلی
 DocType: Payment Reconciliation,Payment Reconciliation,آشتی پرداخت
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +154,Please select Incharge Person's name,لطفا نام Incharge فرد را انتخاب کنید
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +51,Technology,تکنولوژی
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,تکنولوژی
 DocType: Offer Letter,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,مجموع صورتحساب 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.",برای اضافه کردن گره فرزند، کشف درخت و کلیک بر روی گره که در آن شما می خواهید برای اضافه کردن گره.
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +102,Credit To account must be a Payable account,اعتبار به حساب باید یک حساب کاربری پرداختنی شود
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +233,BOM recursion: {0} cannot be parent or child of {2},بازگشت BOM: {0} می تواند پدر و مادر یا فرزند نمی {2}
@@ -1826,10 +1762,8 @@
 DocType: Item,Customer Item Codes,کدهای مورد مشتری
 DocType: Opportunity,Lost Reason,از دست داده دلیل
 apps/erpnext/erpnext/config/accounts.py +68,Create Payment Entries against Orders or Invoices.,ایجاد مطالب پرداخت در برابر دستورات و یا فاکتورها.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +141,Welding,جوش
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +40,New Stock UOM is required,جدید بورس UOM مورد نیاز است
 DocType: Quality Inspection,Sample Size,اندازهی نمونه
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +443,All items have already been invoiced,همه موارد در حال حاضر صورتحساب شده است
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +446,All items have already been invoiced,همه موارد در حال حاضر صورتحساب شده است
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',لطفا یک معتبر را مشخص &#39;از مورد شماره&#39;
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +287,Further cost centers can be made under Groups but entries can be made against non-Groups,مراکز هزینه به علاوه می تواند در زیر گروه ساخته شده اما مطالب را می توان در برابر غیر گروه ساخته شده
 DocType: Project,External,خارجی
@@ -1841,8 +1775,7 @@
 DocType: Bin,Actual Quantity,تعداد واقعی
 DocType: Shipping Rule,example: Next Day Shipping,به عنوان مثال: حمل و نقل روز بعد
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,سریال بدون {0} یافت نشد
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +563,Your Customers,مشتریان شما
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +27,Compression molding,قالب ریزی و سازه های فشرده سازی
+apps/erpnext/erpnext/public/js/setup_wizard.js +303,Your Customers,مشتریان شما
 DocType: Leave Block List Date,Block Date,بلوک عضویت
 DocType: Sales Order,Not Delivered,تحویل داده است
 ,Bank Clearance Summary,بانک ترخیص کالا از خلاصه
@@ -1863,10 +1796,10 @@
 DocType: SMS Log,Sent To,فرستادن به
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +28,Make Sales Invoice,را فاکتور فروش
 DocType: Company,For Reference Only.,برای مرجع تنها.
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +29,Invalid {0}: {1},نامعتبر {0}: {1}
+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,برنامه ریزی ظرفیت
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +49,'From Date' is required,&#39;از تاریخ&#39; مورد نیاز است
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +43,'From Date' is required,&#39;از تاریخ&#39; مورد نیاز است
 DocType: Journal Entry,Reference Number,شماره مرجع
 DocType: Employee,Employment Details,جزییات استخدام
 DocType: Employee,New Workplace,جدید محل کار
@@ -1881,7 +1814,7 @@
 DocType: Serial No,Delivery Time,زمان تحویل
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,سالمندی بر اساس
 DocType: Item,End of Life,پایان زندگی
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +41,Travel,سفر
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +41,Travel,سفر
 DocType: Leave Block List,Allow Users,کاربران اجازه می دهد
 DocType: Purchase Order,Customer Mobile No,مشتری تلفن همراه بدون
 DocType: Sales Invoice,Recurring,در محدوده زمانی معین
@@ -1895,7 +1828,7 @@
 DocType: Naming Series,User must always select,کاربر همیشه باید انتخاب کنید
 DocType: Stock Settings,Allow Negative Stock,اجازه می دهد بورس منفی
 DocType: Installation Note,Installation Note,نصب و راه اندازی توجه داشته باشید
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +541,Add Taxes,اضافه کردن مالیات
+apps/erpnext/erpnext/public/js/setup_wizard.js +283,Add Taxes,اضافه کردن مالیات
 ,Financial Analytics,تجزیه و تحلیل ترافیک مالی
 DocType: Quality Inspection,Verified By,تایید شده توسط
 DocType: Address,Subsidiary,فرعی
@@ -1905,7 +1838,6 @@
 DocType: System Settings,In Hours,در ساعت
 DocType: Process Payroll,Create Salary Slip,ایجاد لغزش حقوق
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Expected balance as per bank,تعادل انتظار می رود به عنوان در هر بانکی
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +115,Buffing,سنباده
 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,کارمند
@@ -1922,11 +1854,11 @@
 DocType: Rename Tool,File to Rename,فایل برای تغییر نام
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +176,Purchse Order number required for Item {0},شماره سفارش Purchse مورد نیاز برای مورد {0}
 apps/erpnext/erpnext/public/js/controllers/transaction.js +136,Show Payments,نمایش پرداخت
-apps/erpnext/erpnext/controllers/buying_controller.py +245,Specified BOM {0} does not exist for Item {1},BOM تعیین {0} برای مورد وجود ندارد {1}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +202,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,نگهداری و تعمیرات برنامه {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 +197,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,نگهداری و تعمیرات برنامه {0} باید قبل از لغو این سفارش فروش لغو
 apps/frappe/frappe/desk/page/backups/backups.html +13,Size,اندازه
 DocType: Notification Control,Expense Claim Approved,ادعای هزینه تایید
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +113,Pharmaceutical,دارویی
+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,سفارش فروش مورد نیاز
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +30,Create Customer,ایجاد مشتری
@@ -1936,7 +1868,6 @@
 DocType: Quality Inspection Reading,Reading 9,خواندن 9
 DocType: Supplier,Is Frozen,آیا منجمد
 DocType: Buying Settings,Buying Settings,تنظیمات خرید
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +122,Mass finishing,به پایان رساندن توده
 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),راه اندازی سرور های دریافتی برای ایمیل فروش شناسه. (به عنوان مثال sales@example.com)
@@ -1944,7 +1875,7 @@
 DocType: Payment Tool,Payment Account,حساب پرداخت
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +713,Please specify Company to proceed,لطفا شرکت مشخص برای ادامه
 apps/frappe/frappe/public/js/frappe/model/indicator.js +30,Draft,پیش نویس
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +46,Compensatory Off,جبرانی فعال
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Compensatory Off,جبرانی فعال
 DocType: Quality Inspection Reading,Accepted,پذیرفته
 DocType: User,Female,زن
 DocType: Journal Entry Account,Debit in Account Currency,بدهی در حساب ارز
@@ -1956,7 +1887,7 @@
 DocType: Shipping Rule,Shipping Rule Label,قانون حمل و نقل برچسب
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +209,Raw Materials cannot be blank.,مواد اولیه نمی تواند خالی باشد.
 DocType: Newsletter,Test,تست
-apps/erpnext/erpnext/stock/doctype/item/item.py +364,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +368,"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'",همانطور که معاملات سهام موجود برای این آیتم به، \ شما می توانید مقادیر تغییر نمی کند ندارد سریال &#39;،&#39; دارای دسته ای بدون &#39;،&#39; آیا مورد سهام &quot;و&quot; روش های ارزش گذاری &#39;
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +448,Quick Journal Entry,سریع دانشگاه علوم پزشکی ورودی
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +92,You can not change rate if BOM mentioned agianst any item,شما می توانید نرخ تغییر اگر BOM agianst هر مورد ذکر شده
@@ -1967,13 +1898,14 @@
 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.,سفارش تولید جداگانه خواهد شد برای هر مورد خوب به پایان رسید ساخته شده است.
 DocType: Purchase Invoice,Terms and Conditions1,شرایط و Conditions1
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +18,Complete Setup,راه اندازی کامل
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard_page.html +18,Complete Setup,راه اندازی کامل
 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/config/crm.py +96,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 +57,Total Absent,مجموع غایب
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +746,Item or Warehouse for row {0} does not match Material Request,موردی یا انبار ردیف {0} مطابقت ندارد درخواست مواد
@@ -1998,16 +1930,15 @@
 DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),نرخ پایه (به عنوان در سهام UOM)
 DocType: SMS Log,No of Requested SMS,تعداد SMS درخواست شده
 DocType: Campaign,Campaign-.####,کمپین - ####
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +55,Piercing,پر سر و صدا
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,گام های بعدی
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +117,Contract End Date must be greater than Date of Joining,قرارداد تاریخ پایان باید از تاریخ پیوستن بیشتر
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,توزیع کننده شخص ثالث / فروشنده / نماینده کمیسیون / وابسته به / نمایندگی فروش که به فروش می رساند محصولات شرکت برای کمیسیون.
 DocType: Customer Group,Has Child Node,دارای گره فرزند
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{0} against Purchase Order {1},{0} در برابر سفارش خرید {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +332,{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/page/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
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +110,Photochemical machining,ماشینکاری فتوشیمیایی
 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.
 
 #### Note
@@ -2033,7 +1964,7 @@
 DocType: Purchase Receipt Item,Recd Quantity,Recd تعداد
 DocType: Email Account,Email Ids,ایمیل شناسه
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},می تواند مورد دیگر {0} از مقدار سفارش فروش تولید نمی {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +471,Stock Entry {0} is not submitted,سهام ورود {0} است ارسال نشده
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +473,Stock Entry {0} is not submitted,سهام ورود {0} است ارسال نشده
 DocType: Payment Reconciliation,Bank / Cash Account,حساب بانک / نقدی
 DocType: Tax Rule,Billing City,صدور صورت حساب شهر
 DocType: Global Defaults,Hide Currency Symbol,مخفی ارز نماد
@@ -2049,7 +1980,7 @@
 DocType: Purchase Invoice,Currency and Price List,نرخ ارز و لیست قیمت
 DocType: Opportunity,Customer / Lead Name,مشتری / نام سرب
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +63,Clearance Date not mentioned,ترخیص کالا از تاریخ ذکر نشده است
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +71,Production,تولید
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Production,تولید
 DocType: Item,Allow Production Order,اجازه سفارش تولید
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +60,Row {0}:Start Date must be before End Date,ردیف {0}: تاریخ شروع باید قبل از پایان تاریخ است
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),مجموع (تعداد)
@@ -2062,7 +1993,7 @@
 apps/erpnext/erpnext/utilities/doctype/address/address.py +113,My Addresses,آدرس من
 DocType: Stock Ledger Entry,Outgoing Rate,نرخ خروجی
 apps/erpnext/erpnext/config/hr.py +100,Organization branch master.,شاخه سازمان کارشناسی ارشد.
-apps/erpnext/erpnext/controllers/accounts_controller.py +237, or ,یا
+apps/erpnext/erpnext/controllers/accounts_controller.py +238, 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-بالاتر از
@@ -2089,6 +2020,7 @@
 DocType: Stock Entry Detail,Serial No / Batch,سریال بدون / دسته
 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 +213,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',نگهداری و تعمیرات برنامه برای تمام اقلام تولید شده نیست. لطفا بر روی &#39;ایجاد برنامه کلیک کنید
 ,To Produce,به تولید
 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} نیز باید گنجانده شود
@@ -2096,10 +2028,7 @@
 DocType: Bin,Reserved Quantity,تعداد محفوظ است
 DocType: Landed Cost Voucher,Purchase Receipt Items,آیتم ها رسید خرید
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,فرم سفارشی
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +62,Cutting,برش
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +69,Flattening,تنظیمات کوپن
 DocType: Account,Income Account,حساب درآمد
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +22,Molding,قالب ریزی
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +632,Delivery,تحویل
 DocType: Stock Reconciliation Item,Current Qty,تعداد کنونی
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",نگاه کنید به &quot;نرخ مواد بر اساس&quot; در هزینه یابی بخش
@@ -2109,19 +2038,18 @@
 apps/frappe/frappe/desk/moduleview.py +61,Documents,اسناد
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +17,Ref,کد عکس
 DocType: Cost Center,Cost Center,مرکز هزینه زا
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.js +48,Voucher #,کوپن #
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +36,Voucher #,کوپن #
 DocType: Notification Control,Purchase Order Message,خرید سفارش پیام
 DocType: Tax Rule,Shipping Country,حمل و نقل کشور
 DocType: Upload Attendance,Upload HTML,بارگذاری HTML
-apps/erpnext/erpnext/controllers/accounts_controller.py +391,"Total advance ({0}) against Order {1} cannot be greater \
+apps/erpnext/erpnext/controllers/accounts_controller.py +392,"Total advance ({0}) against Order {1} cannot be greater \
 				than the Grand Total ({2})",پیش مجموع ({0}) و مخالف نظم {1} نمی تواند بیشتر \ از جمع کل ({2})
 DocType: Employee,Relieving Date,تسکین عضویت
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +12,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.",قانون قیمت گذاری ساخته شده است به بازنویسی لیست قیمت / تعریف درصد تخفیف، بر اساس برخی معیارهای.
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,انبار تنها می تواند از طریق بورس ورودی تغییر / تحویل توجه / رسید خرید
 DocType: Employee Education,Class / Percentage,کلاس / درصد
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +92,Head of Marketing and Sales,رئیس بازاریابی و فروش
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +31,Income Tax,مالیات بر عایدات
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +157,Laser engineered net shaping,لیزر مهندسی شکل دادن خالص
+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.",اگر قانون قیمت گذاری انتخاب شده برای قیمت &quot;ساخته شده، آن را به لیست قیمت بازنویسی. قیمت قانون قیمت گذاری قیمت نهایی است، بنابراین هیچ تخفیف بیشتر قرار داشته باشد. از این رو، در معاملات مانند سفارش فروش، سفارش خرید و غیره، از آن خواهد شد در زمینه &#39;نرخ&#39; برداشته، به جای درست &quot;لیست قیمت نرخ.
 apps/erpnext/erpnext/config/selling.py +163,Track Leads by Industry Type.,آهنگ فرصت های نوع صنعت.
 DocType: Item Supplier,Item Supplier,تامین کننده مورد
@@ -2144,31 +2072,28 @@
 DocType: Stock Ledger Entry,Actual Qty After Transaction,تعداد واقعی بعد از تراکنش
 ,Pending SO Items For Purchase Request,در انتظار SO آیتم ها برای درخواست خرید
 DocType: Supplier,Billing Currency,صدور صورت حساب نرخ ارز
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +148,Extra Large,خیلی بزرگ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,Extra Large,خیلی بزرگ
 ,Profit and Loss Statement,بیانیه سود و زیان
 DocType: Bank Reconciliation Detail,Cheque Number,شماره چک
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +43,Pressing,فشار
 DocType: Payment Tool Detail,Payment Tool Detail,جزئیات ابزار پرداخت
 ,Sales Browser,مرورگر فروش
 DocType: Journal Entry,Total Credit,مجموع اعتباری
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +474,Warning: Another {0} # {1} exists against stock entry {2},هشدار: یکی دیگر از {0} # {1} در برابر ورود سهام وجود دارد {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +459,Local,محلی
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +476,Warning: Another {0} # {1} exists against stock entry {2},هشدار: یکی دیگر از {0} # {1} در برابر ورود سهام وجود دارد {2}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +397,Local,محلی
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),وام و پیشرفت (دارایی)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,بدهکاران
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +147,Large,بزرگ
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +23,No employee found!,بدون کارمند پیدا نشد!
+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 +152,Please mention no of visits required,لطفا از هیچ بازدیدکننده داشته است مورد نیاز ذکر
 DocType: Purchase Order,Customer Address Display,آدرس مشتری ها
 DocType: Stock Settings,Default Valuation Method,روش های ارزش گذاری پیش فرض
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +127,Polishing,پرداخت
 DocType: Production Order Operation,Planned Start Time,برنامه ریزی زمان شروع
 apps/erpnext/erpnext/config/accounts.py +63,Close Balance Sheet and book Profit or Loss.,بستن ترازنامه و سود کتاب یا از دست دادن.
-apps/erpnext/erpnext/stock/doctype/item/item.py +661,"Default Unit of Measure for Item {0} cannot be changed directly because \
+apps/erpnext/erpnext/stock/doctype/item/item.py +665,"Default Unit of Measure for Item {0} cannot be changed directly because \
 			you have already made some transaction(s) with another UOM. To change default UOM, \
 			use 'UOM Replace Utility' tool under Stock module.",واحد اندازه گیری پیش فرض برای مورد {0} نمی تواند مستقیما تغییر داد، زیرا \ شما در حال حاضر ساخته شده برخی از معامله (ها) با UOM است. به تغییر پیش فرض UOM، \ با استفاده از &quot;UOM جایگزین سودمند &#39;ابزار تحت ماژول انبار.
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,مشخص نرخ ارز برای تبدیل یک ارز به ارز را به یکی دیگر
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +146,Quotation {0} is cancelled,نقل قول {0} لغو
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +141,Quotation {0} is cancelled,نقل قول {0} لغو
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,مجموع مقدار برجسته
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} was on leave on {1}. Cannot mark attendance.,کارمند {0} در مرخصی بود {1}. آیا می توانم حضور علامت نیست.
 DocType: Sales Partner,Targets,اهداف
@@ -2179,7 +2104,6 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +158,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,کامپیوتر
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +112,Electro-chemical grinding,الکترو شیمیایی سنگ زنی
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +14,This is a root customer group and cannot be edited.,این یک گروه مشتری ریشه است و نمی تواند ویرایش شود.
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +39,Please setup your chart of accounts before you start Accounting Entries,لطفا راه اندازی نمودار خود را از حساب شما قبل از شروع مطالب حسابداری
 DocType: Purchase Invoice,Ignore Pricing Rule,نادیده گرفتن قانون قیمت گذاری
@@ -2225,7 +2149,6 @@
 DocType: Maintenance Visit,Purposes,اهداف
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +103,Atleast one item should be entered with negative quantity in return document,حداقل یک مورد باید با مقدار منفی در سند وارد بازگشت
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +67,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations",عملیات {0} طولانی تر از هر ساعت کار موجود در ایستگاه های کاری {1}، شکستن عملیات به عملیات های متعدد
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +134,Electrochemical machining,ماشینکاری الکتروشیمیایی
 ,Requested,خواسته
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +66,No Remarks,بدون شرح
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +13,Overdue,سر رسیده
@@ -2234,7 +2157,7 @@
 DocType: Monthly Distribution,Distribution Name,نام توزیع
 DocType: Features Setup,Sales and Purchase,فروش و خرید
 DocType: Supplier Quotation Item,Material Request No,درخواست مواد بدون
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +218,Quality Inspection required for Item {0},بازرسی کیفیت مورد نیاز برای مورد {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +221,Quality Inspection required for Item {0},بازرسی کیفیت مورد نیاز برای مورد {0}
 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),نرخ خالص (شرکت ارز)
@@ -2252,9 +2175,8 @@
 apps/erpnext/erpnext/accounts/report/financial_statements.py +16,Fiscal Year {0} not found.,سال مالی {0} یافت نشد.
 DocType: Bank Reconciliation,Get Relevant Entries,دریافت مطالب مرتبط
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +407,Accounting Entry for Stock,ثبت حسابداری برای انبار
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +64,Coining,ضرب
 DocType: Sales Invoice,Sales Team1,Team1 فروش
-apps/erpnext/erpnext/stock/doctype/item/item.py +412,Item {0} does not exist,مورد {0} وجود ندارد
+apps/erpnext/erpnext/stock/doctype/item/item.py +416,Item {0} does not exist,مورد {0} وجود ندارد
 DocType: Sales Invoice,Customer Address,آدرس مشتری
 apps/frappe/frappe/desk/query_report.py +136,Total,کل
 DocType: Purchase Invoice,Apply Additional Discount On,درخواست تخفیف اضافی
@@ -2266,14 +2188,13 @@
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),مبلغ مالیات پس از تخفیف مقدار (شرکت ارز)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +149,Target warehouse is mandatory for row {0},انبار هدف برای ردیف الزامی است {0}
 DocType: Quality Inspection,Quality Inspection,بازرسی کیفیت
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +144,Extra Small,بسیار کوچک
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +20,Spray forming,اسپری تشکیل
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Extra Small,بسیار کوچک
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +458,Warning: Material Requested Qty is less than Minimum Order Qty,هشدار: مواد درخواست شده تعداد کمتر از حداقل تعداد سفارش تعداد است
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +191,Account {0} is frozen,حساب {0} منجمد است
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,حقوقی نهاد / جانبی با نمودار جداگانه حساب متعلق به سازمان.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +29,"Food, Beverage & Tobacco",مواد غذایی، آشامیدنی و دخانیات
+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 +529,Can only make payment against unbilled {0},می توانید تنها پرداخت به را unbilled را {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +531,Can only make payment against unbilled {0},می توانید تنها پرداخت به را unbilled را {0}
 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,مقاطعه کاری فرعی
@@ -2284,19 +2205,18 @@
 DocType: Item,Manufacturer Part Number,تولید کننده شماره قسمت
 DocType: Production Order Operation,Estimated Time and Cost,برآورد زمان و هزینه
 DocType: Bin,Bin,صندوق
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +50,Nosing,Nosing
 DocType: SMS Log,No of Sent SMS,تعداد SMS های ارسال شده
 DocType: Account,Company,شرکت
 DocType: Account,Expense Account,حساب هزینه
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +49,Software,نرمافزار
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +151,Colour,رنگ
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +49,Software,نرمافزار
+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",لطفا آیتم را انتخاب کنید که در آن &quot;آیا مورد سهام&quot; است &quot;نه&quot; و &quot;آیا مورد فروش&quot; است &quot;بله&quot; است و هیچ بسته نرم افزاری محصولات دیگر وجود دارد
 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 +281,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} در جدول بالا &#39;خرید رسید&#39; وجود ندارد
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +134,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 +145,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,تغییر نام ورود
@@ -2306,7 +2226,7 @@
 apps/erpnext/erpnext/controllers/recurring_document.py +162,Please select {0},لطفا انتخاب کنید {0}
 DocType: C-Form,C-Form No,C-فرم بدون
 DocType: BOM,Exploded_items,Exploded_items
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +95,Researcher,پژوهشگر
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Researcher,پژوهشگر
 apps/frappe/frappe/custom/doctype/customize_form/customize_form.js +88,Update,به روز رسانی
 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 +23,Name or Email is mandatory,نام و نام خانوادگی پست الکترونیک و یا اجباری است
@@ -2315,11 +2235,10 @@
 DocType: Employee,Exit,خروج
 apps/erpnext/erpnext/accounts/doctype/account/account.py +134,Root Type is mandatory,نوع ریشه الزامی است
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +295,Serial No {0} created,سریال بدون {0} ایجاد
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +125,Vibratory finishing,به پایان رساندن سرند
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes",برای راحتی مشتریان، این کدها می توان در فرمت چاپ مانند فاکتورها و تحویل یادداشت استفاده می شود
 DocType: Employee,You can enter any date manually,شما می توانید هر روز دستی وارد کنید
 DocType: Sales Invoice,Advertisement,اعلان
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +165,Probationary Period,دوره وابسته به التزام
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Probationary Period,دوره وابسته به التزام
 DocType: Customer Group,Only leaf nodes are allowed in transaction,تنها برگ در معامله اجازه
 DocType: Expense Claim,Expense Approver,تصویب هزینه
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,مورد رسید خرید عرضه
@@ -2327,19 +2246,16 @@
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +17,To Datetime,به تاریخ ساعت
 DocType: SMS Settings,SMS Gateway URL,URL SMS دروازه
 apps/erpnext/erpnext/config/crm.py +53,Logs for maintaining sms delivery status,سیاهههای مربوط به حفظ وضعیت تحویل اس ام اس
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +137,Grinding,پر زحمت
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +34,Shrink wrapping,کوچک کردن کاغذ بسته بندی
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +36,Pending Activities,فعالیت در انتظار
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,Confirmed,تایید شده
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier > Supplier Type,تامین کننده&gt; تامین کننده نوع
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +127,Please enter relieving date.,لطفا تاریخ تسکین وارد کنید.
 apps/erpnext/erpnext/controllers/trends.py +137,Amt,AMT
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' can be submitted,فقط برنامه های کاربردی با وضعیت &quot;تایید&quot; را می توان ارائه بگذارید
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +51,Only Leave Applications with status 'Approved' can be submitted,فقط برنامه های کاربردی با وضعیت &quot;تایید&quot; را می توان ارائه بگذارید
 apps/erpnext/erpnext/utilities/doctype/address/address.py +21,Address Title is mandatory.,عنوان نشانی الزامی است.
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,نام کمپین را وارد کنید اگر منبع تحقیق مبارزات انتخاباتی است
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +38,Newspaper Publishers,روزنامه
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +38,Newspaper Publishers,روزنامه
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,انتخاب سال مالی
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +88,Smelting,قال
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,ترتیب مجدد سطح
 DocType: Attendance,Attendance Date,حضور و غیاب عضویت
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,فروپاشی حقوق و دستمزد بر اساس سود و کسر.
@@ -2354,16 +2270,15 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +414,[Error],[خطا]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,به عبارت قابل مشاهده خواهد بود هنگامی که شما سفارش فروش را نجات دهد.
 ,Employee Birthday,کارمند تولد
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +55,Venture Capital,سرمایه گذاری سرمایه
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,سرمایه گذاری سرمایه
 DocType: UOM,Must be Whole Number,باید عدد
 DocType: Leave Control Panel,New Leaves Allocated (In Days),برگ جدید اختصاص داده شده (در روز)
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +51,Serial No {0} does not exist,سریال بدون {0} وجود ندارد
 DocType: Pricing Rule,Discount Percentage,درصد تخفیف
 DocType: Payment Reconciliation Invoice,Invoice Number,شماره فاکتور
-apps/erpnext/erpnext/hooks.py +70,Orders,سفارشات
+apps/erpnext/erpnext/hooks.py +54,Orders,سفارشات
 DocType: Leave Control Panel,Employee Type,نوع کارمند
 DocType: Employee Leave Approver,Leave Approver,ترک تصویب
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +70,Swaging,سنبه کاری
 DocType: Manufacturing Settings,Material Transferred for Manufacture,مواد منتقل شده برای ساخت
 DocType: Expense Claim,"A user with ""Expense Approver"" role","یک کاربر با نقشه ""تایید کننده هزینه ها"""
 ,Issued Items Against Production Order,آیتم صادره علیه سفارش تولید
@@ -2375,7 +2290,6 @@
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +62,Cost Center with existing transactions can not be converted to group,مرکز هزینه با معاملات موجود می تواند به گروه تبدیل می شود
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Depreciation,استهلاک
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),تامین کننده (بازدید کنندگان)
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +29,Invalid period,دوره نامعتبر
 DocType: Customer,Credit Limit,محدودیت اعتبار
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,انتخاب نوع معامله
 DocType: GL Entry,Voucher No,کوپن بدون
@@ -2385,9 +2299,9 @@
 DocType: Customer,Address and Contact,آدرس و تماس با
 DocType: Customer,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}
 apps/erpnext/erpnext/accounts/party.py +284,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),نکته: با توجه / بیش از مرجع تاریخ اجازه روز اعتباری مشتری توسط {0} روز (بازدید کنندگان)
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +621,Maint. Schedule,نگهداری. برنامه
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +108,Abrasive jet machining,ماشینکاری جت ساینده
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +632,Maint. Schedule,نگهداری. برنامه
 DocType: Stock Settings,Freeze Stock Entries,یخ مطالب سهام
 DocType: Website Settings,Website Settings,تنظیمات وب سایت
 DocType: Item,Reorder level based on Warehouse,سطح تغییر مجدد ترتیب بر اساس انبار
@@ -2404,7 +2318,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +75,Show Stock Entries,نمایش مطالب سهام
 ,Is Primary Address,آدرس اولیه است
 DocType: Production Order,Work-in-Progress Warehouse,کار در حال پیشرفت انبار
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +308,Reference #{0} dated {1},مرجع # {0} تاریخ {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Reference #{0} dated {1},مرجع # {0} تاریخ {1}
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +13,Manage Addresses,مدیریت آدرس
 DocType: Pricing Rule,Item Code,کد مورد
 DocType: Production Planning Tool,Create Production Orders,ایجاد سفارشات تولید
@@ -2413,7 +2327,7 @@
 DocType: Lead,Market Segment,بخش بازار
 DocType: Communication,Phone,تلفن
 DocType: Employee Internal Work History,Employee Internal Work History,کارمند داخلی سابقه کار
-apps/erpnext/erpnext/public/js/account_tree_grid.js +50,Closing (Dr),بسته شدن (دکتر)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +221,Closing (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.,قالب های مالیاتی برای فروش معاملات.
@@ -2429,8 +2343,8 @@
 ,Billed Amount,مقدار فاکتور شده
 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 +129,Material Request {0} is cancelled or stopped,درخواست مواد {0} است لغو و یا متوقف
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +641,Add a few sample records,اضافه کردن چند پرونده نمونه
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +133,Material Request {0} is cancelled or stopped,درخواست مواد {0} است لغو و یا متوقف
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Add a few sample records,اضافه کردن چند پرونده نمونه
 apps/erpnext/erpnext/config/hr.py +210,Leave Management,ترک مدیریت
 DocType: Event,Groups,گروه
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,گروه های حساب
@@ -2443,38 +2357,34 @@
 DocType: Features Setup,Sales Extras,فروش افزودنیهای پیشنهاد شده
 apps/erpnext/erpnext/accounts/utils.py +344,{0} budget for Account {1} against Cost Center {2} will exceed by {3},{0} بودجه برای حساب {1} در برابر مرکز هزینه {2} خواهد تجاوز {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +236,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry",حساب تفاوت باید یک حساب کاربری نوع دارایی / مسئولیت باشد، زیرا این سهام آشتی ورود افتتاح است
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +138,Purchase Order number required for Item {0},خرید شماره سفارش مورد نیاز برای مورد {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Order number required for Item {0},خرید شماره سفارش مورد نیاز برای مورد {0}
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',"""از تاریخ"" باید پس از ""تا تاریخ"" باشد"
 ,Stock Projected Qty,سهام بینی تعداد
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +147,Customer {0} does not belong to project {1},مشتری {0} تعلق ندارد به پروژه {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +150,Customer {0} does not belong to project {1},مشتری {0} تعلق ندارد به پروژه {1}
 DocType: Sales Order,Customer's Purchase Order,سفارش خرید مشتری
 DocType: Warranty Claim,From Company,از شرکت
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,ارزش و یا تعداد
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Minute,دقیقه
+apps/erpnext/erpnext/public/js/setup_wizard.js +363,Minute,دقیقه
 DocType: Purchase Invoice,Purchase Taxes and Charges,خرید مالیات و هزینه
 ,Qty to Receive,تعداد دریافت
 DocType: Leave Block List,Leave Block List Allowed,ترک فهرست بلوک های مجاز
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +61,Conversion factor cannot be in fractions,عامل تبدیل نمی تواند در کسری شود
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +358,You will use it to Login,شما آن را برای ورود استفاده کنید
+apps/erpnext/erpnext/public/js/setup_wizard.js +108,You will use it to Login,شما آن را برای ورود استفاده کنید
 DocType: Sales Partner,Retailer,خرده فروش
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +99,Credit To account must be a Balance Sheet account,اعتباری به حساب باید یک حساب ترازنامه شود
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,انواع تامین کننده
 apps/erpnext/erpnext/stock/doctype/item/item.py +37,Item Code is mandatory because Item is not automatically numbered,کد مورد الزامی است زیرا مورد به طور خودکار شماره نه
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +99,Quotation {0} not of type {1},نقل قول {0} نمی از نوع {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +93,Quotation {0} not of type {1},نقل قول {0} نمی از نوع {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,نگهداری و تعمیرات برنامه مورد
 DocType: Sales Order,%  Delivered,٪ تحویل شده
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,Bank Overdraft Account,بانک حساب چک بی محل
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +15,Make Salary Slip,را لغزش حقوق
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +18,Browse BOM,مرور BOM
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +175,Secured Loans,وام
-apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +3,Awesome Products,محصولات عالی
+apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +3,Awesome Products,محصولات عالی
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +189,Opening Balance Equity,افتتاح حقوق صاحبان سهام تعادل
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +80,Cannot approve leave as you are not authorized to approve leaves on Block Dates,آیا می توانم مرخصی را تایید نمی که شما مجاز به تصویب برگ در تاریخهای بلوک
 DocType: Appraisal,Appraisal,ارزیابی
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +13,Lost-foam casting,ریخته گری را از دست داده-فوم
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +47,Drawing,نقشه کشی
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +22,Date is repeated,تاریخ تکرار شده است
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +148,Leave approver must be one of {0},ترک تصویب شود باید یکی از {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +162,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,زمان شروع
@@ -2488,7 +2398,7 @@
 DocType: Purchase Invoice Item,Net Amount (Company Currency),مبلغ خالص (شرکت ارز)
 DocType: BOM Operation,Hour Rate,یک ساعت یک نرخ
 DocType: Stock Settings,Item Naming By,مورد نامگذاری توسط
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +642,From Quotation,از عبارت
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +655,From Quotation,از عبارت
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},یکی دیگر از ورودی اختتامیه دوره {0} شده است پس از ساخته شده {1}
 DocType: Production Order,Material Transferred for Manufacturing,مواد منتقل ساخت
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +29,Account {0} does not exists,حساب {0} می کند وجود دارد نمی
@@ -2502,21 +2412,19 @@
 DocType: Purchase Invoice Item,PR Detail,PR جزئیات
 DocType: Sales Order,Fully Billed,به طور کامل صورتحساب
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +20,Cash In Hand,پول نقد در دست
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +72,Delivery warehouse required for stock item {0},انبار تحویل مورد نیاز برای سهام مورد {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +119,Delivery warehouse required for stock item {0},انبار تحویل مورد نیاز برای سهام مورد {0}
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),وزن ناخالص از بسته. معمولا وزن خالص + وزن مواد بسته بندی. (برای چاپ)
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,کاربران با این نقش ها اجازه تنظیم حساب های یخ زده و ایجاد / تغییر نوشته های حسابداری در برابر حساب منجمد
 DocType: Serial No,Is Cancelled,آیا لغو
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +281,My Shipments,محموله های من
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +286,My Shipments,محموله های من
 DocType: Journal Entry,Bill Date,تاریخ صورتحساب
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +43,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:",حتی اگر قوانین قیمت گذاری های متعدد را با بالاترین اولویت وجود دارد، سپس زیر اولویت های داخلی می شود:
 DocType: Supplier,Supplier Details,اطلاعات بیشتر تامین کننده
 DocType: Communication,Recipients,دریافت کنندگان
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +146,Screwing,از screwing
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +96,Knurling,Knurling
 DocType: Expense Claim,Approval Status,وضعیت تایید
 DocType: Hub Settings,Publish Items to Hub,انتشار مطلبی برای توپی
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +44,From value must be less than to value in row {0},از مقدار باید کمتر از ارزش در ردیف شود {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +133,Wire Transfer,انتقال سیم
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +133,Wire Transfer,انتقال سیم
 apps/erpnext/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py +25,Please select Bank Account,لطفا حساب بانکی را انتخاب کنید
 DocType: Newsletter,Create and Send Newsletters,ایجاد و ارسال خبرنامه
 apps/frappe/frappe/public/js/frappe/views/reports/grid_report.js +305,From Date must be before To Date,از تاریخ باید قبل از به روز می شود
@@ -2524,14 +2432,14 @@
 DocType: Company,Default Income Account,حساب پیش فرض درآمد
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,مشتری گروه / مشتریان
 DocType: Item Group,Check this if you want to show in website,بررسی این اگر شما می خواهید برای نشان دادن در وب سایت
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +190,Welcome to ERPNext,به ERPNext خوش آمدید
+,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/page/setup_wizard/install_fixtures.py +37,Calls,تماس
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Calls,تماس
 DocType: Project,Total Costing Amount (via Time Logs),کل مقدار هزینه یابی (از طریق زمان سیاههها)
 DocType: Purchase Order Item Supplied,Stock UOM,سهام UOM
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Purchase Order {0} is not submitted,خرید سفارش {0} است ارسال نشده
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +194,Purchase Order {0} is not submitted,خرید سفارش {0} است ارسال نشده
 ,Projected,بینی
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},سریال بدون {0} به انبار تعلق ندارد {1}
 apps/erpnext/erpnext/controllers/status_updater.py +136,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,توجه: سیستم نمی خواهد بیش از چک زایمان و بیش از رزرو مورد {0} به عنوان مقدار و یا مقدار 0 است
@@ -2539,7 +2447,6 @@
 DocType: Issue,Opening Date,افتتاح عضویت
 DocType: Journal Entry,Remark,اظهار
 DocType: Purchase Receipt Item,Rate and Amount,سرعت و مقدار
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +95,Boring,خسته کننده
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +667,From Sales Order,از سفارش فروش
 DocType: Blog Category,Parent Website Route,وب سایت مسیر پدر و مادر
 DocType: Sales Order,Not Billed,صورتحساب نه
@@ -2553,19 +2460,17 @@
 apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount Amount,مقدار تخفیف
 DocType: Purchase Invoice,Return Against Purchase Invoice,بازگشت علیه خرید فاکتور
 DocType: Item,Warranty Period (in days),دوره گارانتی (در روز)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +550,e.g. VAT,به عنوان مثال مالیات بر ارزش افزوده
+apps/erpnext/erpnext/public/js/setup_wizard.js +292,e.g. VAT,به عنوان مثال مالیات بر ارزش افزوده
 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,نقل قول سری
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +52,"An item exists with same name ({0}), please change the item group name or rename the item",یک مورد را با همین نام وجود دارد ({0})، لطفا نام گروه مورد تغییر یا تغییر نام آیتم
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +82,Hot metal gas forming,گاز گرم فلز تشکیل
 DocType: Sales Order Item,Sales Order Date,سفارش فروش تاریخ
 DocType: Sales Invoice Item,Delivered Qty,تحویل تعداد
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +63,Warehouse {0}: Company is mandatory,انبار {0}: شرکت الزامی است
 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.",برو به گروه مناسب (معمولا منابع درآمد&gt; بدهی های جاری&gt; مالیات و عوارض و ایجاد یک حساب جدید (با کلیک بر روی اضافه کردن کودکان) از نوع &quot;مالیات&quot; و انجام ذکر نرخ مالیات.
 ,Payment Period Based On Invoice Date,دوره پرداخت بر اساس فاکتور عضویت
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +50,Missing Currency Exchange Rates for {0},از دست رفته ارز نرخ ارز برای {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +135,Laser cutting,برش لیزری
 DocType: Event,Monday,دوشنبه
 DocType: Journal Entry,Stock Entry,سهام ورود
 DocType: Account,Payable,قابل پرداخت
@@ -2598,7 +2503,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +111,Date Of Retirement must be greater than Date of Joining,تاریخ بازنشستگی باید از تاریخ پیوستن بیشتر
 DocType: Sales Invoice,Against Income Account,به حساب درآمد
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +69,{0}% Delivered,{0}٪ تحویل داده شد
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +78,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,مورد {0}: تعداد مرتب {1} نمی تواند کمتر از حداقل تعداد سفارش {2} (تعریف شده در مورد).
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,مورد {0}: تعداد مرتب {1} نمی تواند کمتر از حداقل تعداد سفارش {2} (تعریف شده در مورد).
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,درصد ماهانه توزیع
 DocType: Territory,Territory Targets,اهداف منطقه
 DocType: Delivery Note,Transporter Info,حمل و نقل اطلاعات
@@ -2607,7 +2512,6 @@
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,عناوین برای قالب چاپ به عنوان مثال پروفرم فاکتور.
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +140,Valuation type charges can not marked as Inclusive,نوع گذاری اتهامات نمی تواند به عنوان فراگیر مشخص شده
 DocType: POS Profile,Update Stock,به روز رسانی سهام
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +128,Superfinishing,Superfinishing
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,UOM مختلف برای اقلام خواهد به نادرست (مجموع) خالص ارزش وزن منجر شود. مطمئن شوید که وزن خالص هر یک از آیتم است در UOM همان.
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM نرخ
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +85,Please pull items from Delivery Note,لطفا توجه داشته باشید تحویل اقلام از جلو
@@ -2622,7 +2526,6 @@
 ,Purchase Analytics,تجزیه و تحلیل ترافیک خرید
 DocType: Sales Invoice Item,Delivery Note Item,تحویل توجه داشته باشید مورد
 DocType: Expense Claim,Task,وظیفه
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +57,Shaving,اصلاح
 DocType: Purchase Taxes and Charges,Reference Row #,مرجع ردیف #
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},تعداد دسته برای مورد الزامی است {0}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js +14,This is a root sales person and cannot be edited.,این فرد از فروش ریشه است و نمی تواند ویرایش شود.
@@ -2634,13 +2537,11 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +74,Purpose must be one of {0},هدف باید یکی از است {0}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +108,Fill the form and save it,فرم را پر کنید و آن را ذخیره کنید
 DocType: Production Planning Tool,Download a report containing all raw materials with their latest inventory status,دانلود گزارش حاوی تمام مواد خام با آخرین وضعیت موجودی خود را
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +94,Facing,نما
 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: Time Log,Billable,قابل پرداخت
-DocType: Authorization Rule,This will be used for setting rule in HR module,این خواهد شد برای تنظیم قانون در ماژول HR استفاده
 DocType: Account,Rate at which this tax is applied,سرعت که در آن این مالیات اعمال می شود
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reorder Qty,ترتیب مجدد تعداد
 DocType: Company,Stock Adjustment Account,حساب تنظیم سهام
@@ -2667,16 +2568,15 @@
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,درصد تخصیص باید به 100٪ برابر باشد
 DocType: Serial No,Out of AMC,از AMC
 DocType: Purchase Order Item,Material Request Detail No,جزئیات درخواست مواد بدون
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +97,Hard turning,عطف سخت
 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 +79,Company (not Customer or Supplier) master.,شرکت (و نه مشتری و یا تامین کننده) استاد.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +106,Please enter 'Expected Delivery Date',لطفا &quot;انتظار تاریخ تحویل را وارد
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +187,Delivery Notes {0} must be cancelled before cancelling this Sales Order,یادداشت تحویل {0} باید قبل از لغو این سفارش فروش لغو
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +100,Please enter 'Expected Delivery Date',لطفا &quot;انتظار تاریخ تحویل را وارد
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +182,Delivery Notes {0} must be cancelled before cancelling this Sales Order,یادداشت تحویل {0} باید قبل از لغو این سفارش فروش لغو
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +373,Paid amount + Write Off Amount can not be greater than Grand Total,مبلغ پرداخت شده + نوشتن کردن مقدار نمی تواند بیشتر از جمع کل
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} است تعداد دسته معتبر برای مورد نمی {1}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,Note: There is not enough leave balance for Leave Type {0},نکته: تعادل مرخصی به اندازه کافی برای مرخصی نوع وجود ندارد {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +124,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,نوع فرصت
@@ -2688,7 +2588,7 @@
 DocType: Hub Settings,Publish Availability,در دسترس انتشار
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +105,Date of Birth cannot be greater than today.,تاریخ تولد نمی تواند بیشتر از امروز.
 ,Stock Ageing,سهام سالمندی
-apps/erpnext/erpnext/controllers/accounts_controller.py +200,{0} '{1}' is disabled,{0} '{1}'  غیر فعال است
+apps/erpnext/erpnext/controllers/accounts_controller.py +201,{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.,ارسال ایمیل خودکار به تماس در معاملات ارائه.
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +232,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
@@ -2697,44 +2597,38 @@
 DocType: Purchase Order,Customer Contact Email,مشتریان تماس با ایمیل
 DocType: Event,Sunday,یکشنبه
 DocType: Sales Team,Contribution (%),سهم (٪)
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +455,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,توجه: ورودی پرداخت خواهد از ایجاد شوند &quot;نقدی یا حساب بانکی &#39;مشخص نشده بود
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +171,Responsibilities,مسئولیت
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +457,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,توجه: ورودی پرداخت خواهد از ایجاد شوند &quot;نقدی یا حساب بانکی &#39;مشخص نشده بود
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +171,Responsibilities,مسئولیت
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,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,لطفا حداقل 1 فاکتور در جدول وارد کنید
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +511,Add Users,اضافه کردن کاربران
+apps/erpnext/erpnext/public/js/setup_wizard.js +255,Add Users,اضافه کردن کاربران
 DocType: Pricing Rule,Item Group,مورد گروه
 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),مالیات و هزینه اضافه شده (شرکت ارز)
-apps/erpnext/erpnext/stock/doctype/item/item.py +340,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,ردیف مالیاتی مورد {0} باید حساب از نوع مالیات یا درآمد یا هزینه یا شارژ داشته
+apps/erpnext/erpnext/stock/doctype/item/item.py +344,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,ردیف مالیاتی مورد {0} باید حساب از نوع مالیات یا درآمد یا هزینه یا شارژ داشته
 DocType: Sales Order,Partly Billed,تا حدودی صورتحساب
 DocType: Item,Default BOM,به طور پیش فرض BOM
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +79,Decambering,Decambering
 apps/erpnext/erpnext/setup/doctype/company/company.js +22,Please re-type company name to confirm,لطفا دوباره نوع نام شرکت برای تایید
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,مجموع برجسته AMT
 DocType: Time Log Batch,Total Hours,جمع ساعت
 DocType: Journal Entry,Printing Settings,تنظیمات چاپ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +268,Total Debit must be equal to Total Credit. The difference is {0},دبیت مجموع باید به مجموع اعتبار مساوی باشد. تفاوت در این است {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +11,Automotive,خودرو
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +37,Item is required,مورد نیاز است
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +25,Metal injection molding,قالب گیری تزریقی ساخته شده از فلز
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +258,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/accounts/doctype/sales_invoice/sales_invoice.js +684,From Delivery Note,از تحویل توجه داشته باشید
 DocType: Time Log,From Time,از زمان
 DocType: Notification Control,Custom Message,سفارشی پیام
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +33,Investment Banking,بانکداری سرمایه گذاری
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +261,"Select your Country, Time Zone and Currency",انتخاب کشور خود، منطقه زمانی و ارز
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,بانکداری سرمایه گذاری
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +316,"Select your Country, Time Zone and Currency",انتخاب کشور خود، منطقه زمانی و ارز
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +369,Cash or Bank Account is mandatory for making payment entry,نقدی یا حساب بانکی برای ساخت پرداخت ورود الزامی است
 DocType: Purchase Invoice,Price List Exchange Rate,لیست قیمت نرخ ارز
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +91,Pickling,ترشی
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +18,Sand casting,ریخته گری شن و ماسه
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +117,Electroplating,آبکاری
 DocType: Purchase Invoice Item,Rate,نرخ
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +62,Intern,انترن
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Intern,انترن
 DocType: Newsletter,A Lead with this email id should exist,سرب با این ایمیل ID باید وجود داشته باشد
 DocType: Stock Entry,From BOM,از BOM
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +34,Basic,پایه
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +34,Basic,پایه
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,معاملات سهام قبل از {0} منجمد
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +217,Please click on 'Generate Schedule',لطفا بر روی &#39;ایجاد برنامه کلیک کنید
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +61,To Date should be same as From Date for Half Day leave,به روز باید برای مرخصی نصف روز از همان تاریخ است
@@ -2742,10 +2636,10 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +96,Reference No is mandatory if you entered Reference Date,مرجع بدون اجباری است اگر شما وارد مرجع تاریخ
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +108,Date of Joining must be greater than Date of Birth,تاریخ پیوستن باید بیشتر از تاریخ تولد شود
 DocType: Salary Structure,Salary Structure,ساختار حقوق و دستمزد
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +242,"Multiple Price Rule exists with same criteria, please resolve \
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +246,"Multiple Price Rule exists with same criteria, please resolve \
 			conflict by assigning priority. Price Rules: {0}",قانون قیمت های متعدد را با معیارهای همان وجود دارد، لطفا \ درگیری با اختصاص اولویت حل و فصل. مشاهده قوانین قیمت: {0}
 DocType: Account,Bank,بانک
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +9,Airline,شرکت هواپیمایی
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,شرکت هواپیمایی
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +493,Issue Material,مواد شماره
 DocType: Material Request Item,For Warehouse,ذخیره سازی
 DocType: Employee,Offer Date,پیشنهاد عضویت
@@ -2755,29 +2649,24 @@
 DocType: Item,Is Fixed Asset Item,آیا مورد دارائی های ثابت
 DocType: Stock Entry,Including items for sub assemblies,از جمله موارد زیر را برای مجامع
 DocType: Features Setup,"If you have long print formats, this feature can be used to split the page to be printed on multiple pages with all headers and footers on each page",اگر شما فرمت چاپ طولانی، این ویژگی می تواند مورد استفاده قرار گیرد به تقسیم صفحه به چند صفحه با تمام Header ها و Footer در هر صفحه چاپ شود
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +131,Hobbing,Hobbing
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +98,All Territories,همه مناطق
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +98,All Territories,همه مناطق
 DocType: Purchase Invoice,Items,اقلام
 DocType: Fiscal Year,Year Name,نام سال
 DocType: Process Payroll,Process Payroll,حقوق و دستمزد فرآیند
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +59,There are more holidays than working days this month.,می تعطیلات بیشتر از روز کاری در این ماه وجود دارد.
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +68,There are more holidays than working days this month.,می تعطیلات بیشتر از روز کاری در این ماه وجود دارد.
 DocType: Product Bundle Item,Product Bundle Item,محصولات بسته نرم افزاری مورد
 DocType: Sales Partner,Sales Partner Name,نام شریک فروش
 DocType: Purchase Invoice Item,Image View,تصویر مشخصات
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +113,Finishing & industrial finishing,اختتامیه و به پایان رساندن صنعتی
 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/page/setup_wizard/fixtures/industry_type.py +46,Securities & Commodity Exchanges,اوراق بهادار و بورس کالا
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,اوراق بهادار و بورس کالا
 DocType: Shipping Rule,Calculate Based On,محاسبه بر اساس
 DocType: Delivery Note Item,From Warehouse,از انبار
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +98,Drilling,حفر
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +28,Blow molding,قالب گیری ضربه
 DocType: Purchase Taxes and Charges,Valuation and Total,ارزش گذاری و مجموع
 DocType: Tax Rule,Shipping City,حمل و نقل شهر
 apps/erpnext/erpnext/stock/doctype/item/item.js +43,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,این مورد یک نوع از {0} (الگو) است. ویژگی خواهد شد بیش از قالب کپی مگر اینکه &#39;هیچ نسخه&#39; تنظیم شده است
 DocType: Account,Purchase User,خرید کاربر
 DocType: Notification Control,Customize the Notification,سفارشی اطلاع رسانی
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +87,Hammering,چکش
 DocType: Web Page,Slideshow,نمایش به صورت اسلاید
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +24,Default Address Template cannot be deleted,به طور پیش فرض آدرس الگو نمی تواند حذف شود
 DocType: Sales Invoice,Shipping Rule,قانون حمل و نقل
@@ -2786,9 +2675,8 @@
 DocType: Workflow State,Search,جستجو
 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/setup/page/setup_wizard/fixtures/operations.py +142,Brazing,لحیم کاری
 DocType: C-Form,Amended From,اصلاح از
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Raw Material,مواد اولیه
+apps/erpnext/erpnext/public/js/setup_wizard.js +359,Raw Material,مواد اولیه
 DocType: Leave Application,Follow via Email,از طریق ایمیل دنبال کنید
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,مبلغ مالیات پس از تخفیف مبلغ
 apps/erpnext/erpnext/accounts/doctype/account/account.py +174,Child account exists for this account. You can not delete this account.,حساب کودک برای این حساب وجود دارد. شما می توانید این حساب را حذف کنید.
@@ -2802,10 +2690,10 @@
 ,Produced,ساخته
 DocType: Item,Item Code for Suppliers,کد مورد برای تولید کنندگان
 DocType: Issue,Raised By (Email),مطرح شده توسط (ایمیل)
-apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +72,General,عمومی
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +495,Attach Letterhead,ضمیمه سربرگ
+apps/erpnext/erpnext/setup/setup_wizard/default_website.py +72,General,عمومی
+apps/erpnext/erpnext/public/js/setup_wizard.js +241,Attach Letterhead,ضمیمه سربرگ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +272,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',نمی تواند کسر زمانی که دسته بندی است برای ارزش گذاری &quot;یا&quot; ارزش گذاری و مجموع &quot;
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +542,"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/public/js/setup_wizard.js +284,"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}
 DocType: Journal Entry,Bank Entry,بانک ورودی
 DocType: Authorization Rule,Applicable To (Designation),به (برای تعیین)
@@ -2814,32 +2702,31 @@
 apps/erpnext/erpnext/config/accounts.py +143,Enable / disable currencies.,فعال / غیر فعال کردن ارز.
 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)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +26,Entertainment & Leisure,سرگرمی و اوقات فراغت
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,سرگرمی و اوقات فراغت
 DocType: Purchase Order,The date on which recurring order will be stop,از تاریخ تکرار می شود منظور متوقف خواهد شد
 DocType: Quality Inspection,Item Serial No,مورد سریال بدون
 apps/erpnext/erpnext/controllers/status_updater.py +142,{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 +57,Total Present,در حال حاضر مجموع
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Hour,ساعت
+apps/erpnext/erpnext/public/js/setup_wizard.js +363,Hour,ساعت
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +138,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation",مورد سریال {0} می تواند \ با استفاده از بورس آشتی نمی شود به روز شده
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +488,Transfer Material to Supplier,انتقال مواد به تامین کننده
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +513,Transfer Material to Supplier,انتقال مواد به تامین کننده
 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/crm/doctype/opportunity/opportunity.js +82,Create Quotation,ایجاد استعلام
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +306,All these items have already been invoiced,همه این موارد در حال حاضر صورتحساب شده است
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,You are not authorized to approve leaves on Block Dates,شما مجاز به تصویب برگ در تاریخ بلوک
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +311,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,BOM جدید پس از تعویض
 DocType: Features Setup,Point of Sale,نقطه ای از فروش
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +83,Curling,پیچش یا حلقه زنی
 DocType: Account,Tax,مالیات
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +28,Row {0}: {1} is not a valid {2},ردیف {0}: {1} است معتبر نیست {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +89,Refining,پالایش
+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,تولید ابزار برنامه ریزی
 DocType: Quality Inspection,Report Date,گزارش تخلف
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +130,Routing,مسیریابی
 DocType: C-Form,Invoices,فاکتورها
 DocType: Job Opening,Job Title,عنوان شغلی
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +54,{0} already allocated for Employee {1} for period {2} - {3},{0} در حال حاضر برای کارمند {1} اختصاص داده شده برای دوره {2} - {3}
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +80,{0} Recipients,{0} دریافت کنندگان
 DocType: Features Setup,Item Groups in Details,گروه مورد در جزئیات
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +335,Quantity to Manufacture must be greater than 0.,تعداد برای تولید باید بیشتر از 0 باشد.
@@ -2857,14 +2744,13 @@
 DocType: DocType,Setup,برپایی
 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,خلاصه برای این ماه و فعالیت های انتظار
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +39,Cold rolling,نورد سرد
 DocType: Customer Group,Customer Group Name,نام مشتری گروه
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +408,Please remove this Invoice {0} from C-Form {1},لطفا این فاکتور {0} از C-فرم حذف {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +410,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,ویژگی های
 DocType: Packing Slip,Get Items,گرفتن اقلام
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +186,Please enter Write Off Account,لطفا وارد حساب فعال
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +187,Please enter Write Off Account,لطفا وارد حساب فعال
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +71,Last Order Date,تاریخ و زمان آخرین چینش تاریخ
 DocType: DocField,Image,تصویر
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +179,Make Excise Invoice,را فاکتور مالیات کالاهای داخلی
@@ -2874,7 +2760,7 @@
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +146,Operation ID not set,ID عملیات تنظیم نشده
 DocType: Production Order,Planned Start Date,برنامه ریزی تاریخ شروع
 DocType: Serial No,Creation Document Type,ایجاد نوع سند
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +620,Maint. Visit,نگهداری. دیدار
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +631,Maint. Visit,نگهداری. دیدار
 DocType: Leave Type,Is Encash,آیا Encash
 DocType: Purchase Invoice,Mobile No,موبایل بدون
 DocType: Payment Tool,Make Journal Entry,مجله را ورود
@@ -2882,35 +2768,31 @@
 apps/erpnext/erpnext/controllers/trends.py +257,Project-wise data is not available for Quotation,اطلاعات پروژه و زرنگ در دسترس برای عین نمی
 DocType: Project,Expected End Date,انتظار می رود تاریخ پایان
 DocType: Appraisal Template,Appraisal Template Title,ارزیابی الگو عنوان
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +440,Commercial,تجاری
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +378,Commercial,تجاری
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +23,Parent Item {0} must not be a Stock Item,مورد پدر و مادر {0} نباید آیتم سهام
 DocType: Cost Center,Distribution Id,توزیع کد
-apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +14,Awesome Services,خدمات عالی
+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,تامین کننده آدرس
 DocType: Contact Us Settings,Address Line 2,خط 2 آدرس
 DocType: ToDo,Reference,ارجاع
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +59,Perforating,سوراخ
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,از تعداد
 apps/erpnext/erpnext/config/accounts.py +128,Rules to calculate shipping amount for a sale,مشاهده قوانین برای محاسبه مقدار حمل و نقل برای فروش
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +29,Series is mandatory,سری الزامی است
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +28,Financial Services,خدمات مالی
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,خدمات مالی
 apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3},ارزش صفت {0} باید در طیف وسیعی از {1} به {2} در بازه {3}
 DocType: Tax Rule,Sales,فروش
 DocType: Stock Entry Detail,Basic Amount,مقدار اولیه
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +173,Warehouse required for stock Item {0},انبار مورد نیاز برای سهام مورد {0}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +178,Warehouse required for stock Item {0},انبار مورد نیاز برای سهام مورد {0}
 DocType: Leave Allocation,Unused leaves,برگ استفاده نشده
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,کروم
 DocType: Customer,Default Receivable Accounts,پیش فرض حسابهای دریافتنی
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +102,Sawing,اره
 DocType: Tax Rule,Billing State,دولت صدور صورت حساب
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +32,Laminating,ورقه ورقه
 DocType: Item Reorder,Transfer,انتقال
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +549,Fetch exploded BOM (including sub-assemblies),واکشی BOM منفجر شد (از جمله زیر مجموعه)
 DocType: Authorization Rule,Applicable To (Employee),به قابل اجرا (کارمند)
 apps/erpnext/erpnext/controllers/accounts_controller.py +101,Due Date is mandatory,تاریخ الزامی است
 apps/erpnext/erpnext/controllers/item_variant.py +51,Increment for Attribute {0} cannot be 0,افزایش برای صفت {0} نمی تواند 0
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +143,Sintering,پخت
 DocType: Journal Entry,Pay To / Recd From,پرداخت به / از Recd
 DocType: Naming Series,Setup Series,راه اندازی سری
 DocType: Supplier,Contact HTML,تماس با HTML
@@ -2923,7 +2805,6 @@
 DocType: Attendance,Absent,غایب
 DocType: Product Bundle,Product Bundle,بسته نرم افزاری محصولات
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +180,Row {0}: Invalid reference {1},ردیف {0}: مرجع نامعتبر {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +165,Crushing,خرد کن
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,خرید مالیات و هزینه الگو
 DocType: Upload Attendance,Download Template,دانلود الگو
 DocType: GL Entry,Remarks,سخنان
@@ -2931,14 +2812,12 @@
 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/setup/page/setup_wizard/fixtures/operations.py +9,Continuous casting,ریخته گری مداوم
 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/setup/page/setup_wizard/fixtures/operations.py +80,Cold sizing,اندازه سرد
 DocType: Salary Slip,Earning & Deduction,سود و کسر
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +76,Account {0} cannot be a Group,حساب {0} نمی تواند یک گروه
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +259,Region,منطقه
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +314,Region,منطقه
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +213,Optional. This setting will be used to filter in various transactions.,اختیاری است. این تنظیم استفاده می شود برای فیلتر کردن در معاملات مختلف است.
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +104,Negative Valuation Rate is not allowed,نرخ گذاری منفی مجاز نیست
 DocType: Holiday List,Weekly Off,فعال هفتگی
@@ -2956,7 +2835,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,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,حضور و غیاب حضور و غیاب از تاریخ و به روز الزامی است
-apps/erpnext/erpnext/controllers/buying_controller.py +131,Please enter 'Is Subcontracted' as Yes or No,لطفا وارد است واگذار شده به عنوان بله یا نه
+apps/erpnext/erpnext/controllers/buying_controller.py +122,Please enter 'Is Subcontracted' as Yes or No,لطفا وارد است واگذار شده به عنوان بله یا نه
 DocType: Sales Team,Contact No.,تماس با شماره
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,'Profit and Loss' type account {0} not allowed in Opening Entry,'سود و زیان' نوع حساب {0} در افتتاح ورودی مجاز نیست
 DocType: Workflow State,Time,زمان
@@ -2965,14 +2844,13 @@
 DocType: Authorization Rule,Authorization Rule,قانون مجوز
 DocType: Sales Invoice,Terms and Conditions Details,قوانین و مقررات جزئیات
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,مالیات فروش و اتهامات الگو
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +10,Apparel & Accessories,پوشاک و لوازم جانبی
+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,تعداد سفارش
 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 +121,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/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +47,Conversion Factor is required,عامل تبدیل مورد نیاز است
 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,ارزش / توضیحات
@@ -2980,10 +2858,8 @@
 ,Customers Not Buying Since Long Time,مشتریان خرید از آنجا که زمان طولانی
 DocType: Production Order,Expected Delivery Date,انتظار می رود تاریخ تحویل
 apps/erpnext/erpnext/accounts/general_ledger.py +121,Debit and Credit not equal for {0} #{1}. Difference is {2}.,بدهی و اعتباری برای {0} # برابر نیست {1}. تفاوت در این است {2}.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +48,Bulging,بر امده
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +11,Evaporative-pattern casting,ریخته گری تبخیری-الگوی
 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 +195,Sales Invoice {0} must be cancelled before cancelling this Sales Order,فاکتور فروش {0} باید لغو شود قبل از لغو این سفارش فروش
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +190,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 باشد.
@@ -3002,26 +2878,24 @@
 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 +241,Account: {0} with currency: {1} can not be selected,حساب: {0} با ارز: {1} نمی تواند انتخاب شود
+apps/erpnext/erpnext/controllers/accounts_controller.py +242,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 +47,Account {0}: Parent account {1} does not belong to company: {2},حساب {0}: حساب مرجع {1} به شرکت تعلق ندارد: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted all transactions related to this company!,با موفقیت حذف تمام معاملات مربوط به این شرکت!
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,همانطور که در تاریخ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +111,Honing,حد عالی رساندن
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +58,Probation,عفو مشروط
-apps/erpnext/erpnext/stock/doctype/item/item.py +264,Default Warehouse is mandatory for stock Item.,به طور پیش فرض انبار سهام مورد الزامی است.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Probation,عفو مشروط
+apps/erpnext/erpnext/stock/doctype/item/item.py +268,Default Warehouse is mandatory for stock Item.,به طور پیش فرض انبار سهام مورد الزامی است.
 DocType: Feed,Full Name,نام و نام خانوادگی
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +148,Clinching,عقد
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +191,Payment of salary for the month {0} and year {1},پرداخت حقوق و دستمزد برای ماه {0} و {1} سال
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +173,Payment of salary for the month {0} and year {1},پرداخت حقوق و دستمزد برای ماه {0} و {1} سال
 DocType: Stock Settings,Auto insert Price List rate if missing,درج خودرو نرخ لیست قیمت اگر از دست رفته
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,کل مقدار پرداخت
 ,Transferred Qty,انتقال تعداد
 apps/erpnext/erpnext/config/learn.py +11,Navigating,ناوبری
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +137,Planning,برنامه ریزی
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +137,Planning,برنامه ریزی
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +9,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),کل مقدار حسابداری (از طریق زمان سیاههها)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +629,We sell this Item,ما فروش این مورد
+apps/erpnext/erpnext/public/js/setup_wizard.js +365,We sell this Item,ما فروش این مورد
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +65,Supplier Id,تامین کننده کد
 DocType: Journal Entry,Cash Entry,نقدی ورودی
 DocType: Sales Partner,Contact Desc,تماس با محصول،
@@ -3030,18 +2904,16 @@
 DocType: Brand,Item Manager,مدیریت آیتم ها
 DocType: Cost Center,Add rows to set annual budgets on Accounts.,اضافه کردن ردیف به راه بودجه سالانه در حساب.
 DocType: Buying Settings,Default Supplier Type,به طور پیش فرض نوع تامین کننده
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +160,Quarrying,کانی های با ارزش
 DocType: Production Order,Total Operating Cost,مجموع هزینه های عملیاتی
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +160,Note: Item {0} entered multiple times,توجه: مورد {0} وارد چندین بار
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +163,Note: Item {0} entered multiple times,توجه: مورد {0} وارد چندین بار
 apps/erpnext/erpnext/config/crm.py +27,All Contacts.,همه اطلاعات تماس.
 DocType: Newsletter,Test Email Id,تست ایمیل کد
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +394,Company Abbreviation,مخفف شرکت
+apps/erpnext/erpnext/public/js/setup_wizard.js +142,Company Abbreviation,مخفف شرکت
 DocType: Features Setup,If you follow Quality Inspection. Enables Item QA Required and QA No in Purchase Receipt,اگر شما به دنبال بازرسی کیفیت. را قادر می سازد مورد QA مورد نیاز و QA بدون در رسید خرید
 DocType: GL Entry,Party Type,نوع حزب
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +68,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,authroized نه از {0} بیش از محدودیت
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +30,Rotational molding,قالب ریزی و سازه های گردان
 apps/erpnext/erpnext/config/hr.py +115,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,مجموعه قوانین مالیاتی برای سبد خرید
@@ -3055,15 +2927,15 @@
 apps/erpnext/erpnext/config/selling.py +18,Quotes to Leads or Customers.,به نقل از به آگهی یا مشتریان.
 DocType: Stock Settings,Role Allowed to edit frozen stock,نقش مجاز به ویرایش سهام منجمد
 ,Territory Target Variance Item Group-Wise,منطقه مورد هدف واریانس گروه حکیم
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +101,All Customer Groups,همه گروه های مشتری
-apps/erpnext/erpnext/controllers/accounts_controller.py +474,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} الزامی است. شاید رکورد ارز برای {1} به {2} ایجاد نمی شود.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +101,All Customer Groups,همه گروه های مشتری
+apps/erpnext/erpnext/controllers/accounts_controller.py +475,{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 +41,Account {0}: Parent account {1} does not exist,حساب {0}: حساب مرجع {1} وجود ندارد
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),لیست قیمت نرخ (شرکت ارز)
 DocType: Account,Temporary,موقت
 DocType: Address,Preferred Billing Address,ترجیح آدرس صورت حساب
 DocType: Monthly Distribution Percentage,Percentage Allocation,درصد تخصیص
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +86,Secretary,دبیر
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Secretary,دبیر
 DocType: Serial No,Distinct unit of an Item,واحد مجزا از یک آیتم
 DocType: Pricing Rule,Buying,خرید
 DocType: HR Settings,Employee Records to be created by,سوابق کارمند به ایجاد شود
@@ -3076,9 +2948,8 @@
 ,Item-wise Price List Rate,مورد عاقلانه لیست قیمت نرخ
 DocType: Purchase Order Item,Supplier Quotation,نقل قول تامین کننده
 DocType: Quotation,In Words will be visible once you save the Quotation.,به عبارت قابل مشاهده خواهد بود هنگامی که شما نقل قول را نجات دهد.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +68,Ironing,اتو
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is stopped,{0} {1} متوقف شده است
-apps/erpnext/erpnext/stock/doctype/item/item.py +352,Barcode {0} already used in Item {1},بارکد {0} در حال حاضر در مورد استفاده {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +356,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/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,رویدادهای نزدیک
@@ -3087,27 +2958,25 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +27,Quick Entry,ورود سریع
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0} برای بازگشت الزامی است
 DocType: Purchase Order,To Receive,برای دریافت
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +33,Shrink fitting,کوچک کردن اتصالات
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +522,user@example.com,user@example.com
+apps/erpnext/erpnext/public/js/setup_wizard.js +266,user@example.com,user@example.com
 DocType: Email Digest,Income / Expense,درآمد / هزینه
 DocType: Employee,Personal Email,ایمیل شخصی
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +58,Total Variance,واریانس ها
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +62,Total Variance,واریانس ها
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.",اگر فعال باشد، سیستم مطالب حسابداری برای موجودی ارسال به صورت خودکار.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +15,Brokerage,حق العمل
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +15,Brokerage,حق العمل
 DocType: Address,Postal Code,کد پستی
 DocType: Production Order Operation,"in Minutes
 Updated via 'Time Log'",در دقیقه به روز رسانی از طریق &#39;زمان ورود &quot;
 DocType: Customer,From Lead,از سرب
 apps/erpnext/erpnext/config/manufacturing.py +19,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 +442,POS Profile required to make POS Entry,نمایش POS مورد نیاز برای ایجاد POS ورود
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +444,POS Profile required to make POS Entry,نمایش POS مورد نیاز برای ایجاد POS ورود
 DocType: Hub Settings,Name Token,نام رمز
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +106,Planing,طرح و برنامه
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Selling,فروش استاندارد
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +120,Standard Selling,فروش استاندارد
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +137,Atleast one warehouse is mandatory,حداقل یک انبار الزامی است
 DocType: Serial No,Out of Warranty,خارج از ضمانت
 DocType: BOM Replace Tool,Replace,جایگزین کردن
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +314,{0} against Sales Invoice {1},{0} در برابر فاکتور فروش {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +316,{0} against Sales Invoice {1},{0} در برابر فاکتور فروش {1}
 apps/erpnext/erpnext/stock/doctype/item/item.py +49,Please enter default Unit of Measure,لطفا واحد به طور پیش فرض اندازه گیری وارد کنید
 DocType: Purchase Invoice Item,Project Name,نام پروژه
 DocType: Supplier,Mention if non-standard receivable account,ذکر است اگر حسابهای دریافتنی غیر استاندارد
@@ -3123,9 +2992,8 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,Journal Entry {0} does not have account {1} or already matched against other voucher,مجله ورودی {0} می کند حساب کاربری ندارید {1} یا در حال حاضر همسان در برابر دیگر کوپن
 DocType: Item,Moving Average,میانگین متحرک
 DocType: BOM Replace Tool,The BOM which will be replaced,BOM که جایگزین خواهد شد
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +43,New Stock UOM must be different from current stock UOM,جدید بورس UOM باید متفاوت از UOM سهام فعلی
 DocType: Account,Debit,بدهی
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +34,Leaves must be allocated in multiples of 0.5,برگ باید در تقسیم عددی بر مضرب 0.5 اختصاص داده
+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/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,برجسته AMT
@@ -3143,8 +3011,7 @@
 DocType: Employee,Internal Work History,تاریخچه کار داخلی
 DocType: DocField,Column Break,فرار از ستون
 DocType: Event,Thursday,پنج شنبه
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +42,Private Equity,سهام خصوصی
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +93,Turning,عطف
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,سهام خصوصی
 DocType: Maintenance Visit,Customer Feedback,نظرسنجی
 DocType: Account,Expense,هزینه
 DocType: Sales Invoice,Exhibition,نمایشگاه
@@ -3157,19 +3024,19 @@
 DocType: Employee,Held On,برگزار
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +33,Production Item,مورد تولید
 ,Employee Information,اطلاعات کارمند
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,Rate (%),نرخ (٪)
+apps/erpnext/erpnext/public/js/setup_wizard.js +294,Rate (%),نرخ (٪)
 DocType: Stock Entry Detail,Additional Cost,هزینه های اضافی
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +407,Financial Year End Date,مالی سال پایان تاریخ
+apps/erpnext/erpnext/public/js/setup_wizard.js +155,Financial Year End Date,مالی سال پایان تاریخ
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Voucher No, if grouped by Voucher",می توانید بر روی کوپن نه فیلتر بر اساس، در صورتی که توسط کوپن گروه بندی
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +484,Make Supplier Quotation,را عین تامین کننده
 DocType: Quality Inspection,Incoming,وارد شونده
 DocType: BOM,Materials Required (Exploded),مواد مورد نیاز (منفجر شد)
 DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),کاهش سود برای مرخصی بدون حقوق (LWP)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +512,"Add users to your organization, other than yourself",اضافه کردن کاربران به سازمان شما، به غیر از خودتان
+apps/erpnext/erpnext/public/js/setup_wizard.js +256,"Add users to your organization, other than yourself",اضافه کردن کاربران به سازمان شما، به غیر از خودتان
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No {1} does not match with {2} {3},ردیف # {0}: سریال نه {1} با مطابقت ندارد {2} {3}
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +44,Casual Leave,مرخصی گاه به گاه
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +44,Casual Leave,مرخصی گاه به گاه
 DocType: Batch,Batch ID,دسته ID
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +334,Note: {0},توجه: {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +336,Note: {0},توجه: {0}
 ,Delivery Note Trends,روند تحویل توجه داشته باشید
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +104,This Week's Summary,خلاصه این هفته
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +74,{0} must be a Purchased or Sub-Contracted Item in row {1},{0} باید مورد خریداری شده و یا زیر قرارداد را در ردیف شود {1}
@@ -3181,7 +3048,7 @@
 DocType: Purchase Receipt,Return Against Purchase Receipt,بازگشت علیه رسید خرید
 DocType: Purchase Order,To Bill,به بیل
 DocType: Material Request,% Ordered,مرتب٪
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +61,Piecework,کار از روی مقاطعه
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Piecework,کار از روی مقاطعه
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +64,Avg. Buying Rate,الان متوسط. نرخ خرید
 DocType: Task,Actual Time (in Hours),زمان واقعی (در ساعت)
 DocType: Employee,History In Company,تاریخچه در شرکت
@@ -3198,13 +3065,13 @@
 DocType: Opportunity,To Discuss,به بحث در مورد
 DocType: SMS Settings,SMS Settings,تنظیمات SMS
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +60,Temporary Accounts,حساب موقت
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +155,Black,سیاه
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Black,سیاه
 DocType: BOM Explosion Item,BOM Explosion Item,BOM مورد انفجار
 DocType: Account,Auditor,ممیز
 DocType: Purchase Order,End date of current order's period,تاریخ پایان دوره منظور فعلی
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +17,Make Offer Letter,را پیشنهاد نامه
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +10,Return,برگشت
-apps/erpnext/erpnext/stock/doctype/item/item.py +503,Default Unit of Measure for Variant must be same as Template,واحد اندازه گیری پیش فرض برای متغیر باید همان الگو باشد
+apps/erpnext/erpnext/stock/doctype/item/item.py +507,Default Unit of Measure for Variant must be same as Template,واحد اندازه گیری پیش فرض برای متغیر باید همان الگو باشد
 DocType: DocField,Fold,تاه
 DocType: Production Order Operation,Production Order Operation,ترتیب عملیات تولید
 DocType: Pricing Rule,Disable,از کار انداختن
@@ -3215,13 +3082,12 @@
 DocType: Page,Page Name,صفحه نام
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +110,To Time must be greater than From Time,به زمان باید بیشتر از از زمان است
 DocType: Journal Entry Account,Exchange Rate,مظنهء ارز
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +465,Sales Order {0} is not submitted,سفارش فروش {0} است ارسال نشده
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +467,Sales Order {0} is not submitted,سفارش فروش {0} است ارسال نشده
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0}: Parent account {1} does not bolong to the company {2},انبار {0}: حساب مرجع {1} به شرکت bolong نمی {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +124,Spindle finishing,به پایان رساندن اسپیندل
 DocType: BOM,Last Purchase Rate,تاریخ و زمان آخرین نرخ خرید
 DocType: Account,Asset,دارایی
 DocType: Project Task,Task ID,وظیفه ID
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +395,"e.g. ""MC""",به عنوان مثال &quot;MC&quot;
+apps/erpnext/erpnext/public/js/setup_wizard.js +143,"e.g. ""MC""",به عنوان مثال &quot;MC&quot;
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,Stock cannot exist for Item {0} since has variants,سهام نمی تواند برای مورد وجود داشته باشد {0} از انواع است
 ,Sales Person-wise Transaction Summary,فروش شخص عاقل خلاصه معامله
 DocType: System Settings,Time Zone,منطقه زمانی
@@ -3230,9 +3096,7 @@
 DocType: Monthly Distribution,Monthly Distribution Percentages,درصد ماهانه توزیع
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +16,The selected item cannot have Batch,آیتم انتخاب شده می تواند دسته ای ندارد
 DocType: Delivery Note,% of materials delivered against this Delivery Note,درصد از مواد در برابر این تحویل توجه تحویل
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +151,Stapling,صتبلرس
 DocType: Customer,Customer Details,اطلاعات مشتری
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +105,Shaping,شکل دهی
 DocType: Employee,Reports to,گزارش به
 DocType: SMS Settings,Enter url parameter for receiver nos,پارامتر آدرس را وارد کنید برای گیرنده NOS
 DocType: Sales Invoice,Paid Amount,مبلغ پرداخت
@@ -3241,13 +3105,13 @@
 DocType: Item Variant,Item Variant,مورد نوع
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +15,Setting this Address Template as default as there is no other default,تنظیم این آدرس الگو به عنوان پیش فرض به عنوان پیش فرض هیچ دیگر وجود دارد
 apps/erpnext/erpnext/accounts/doctype/account/account.py +89,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'",مانده حساب در حال حاضر در بدهی، شما امکان پذیر نیست را به مجموعه &quot;تعادل باید به عنوان&quot; اعتبار &quot;
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +76,Quality Management,مدیریت کیفیت
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Quality Management,مدیریت کیفیت
 DocType: Production Planning Tool,Filter based on customer,فیلتر بر اساس مشتری
 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}
 DocType: Employee External Work History,Employee External Work History,کارمند خارجی سابقه کار
 DocType: Tax Rule,Purchase,خرید
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +34,Balance Qty,تعداد موجودی
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Balance Qty,تعداد موجودی
 DocType: Item Group,Parent Item Group,مورد گروه پدر و مادر
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +21,{0} for {1},{0} برای {1}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +96,Cost Centers,مراکز هزینه
@@ -3257,12 +3121,12 @@
 DocType: Opportunity,Next Contact,بعد تماس
 DocType: Employee,Employment Type,نوع استخدام
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,دارایی های ثابت
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +84,Application period cannot be across two alocation records,دوره نرم افزار نمی تواند در سراسر دو رکورد alocation شود
 DocType: Item Group,Default Expense Account,حساب پیش فرض هزینه
 DocType: Employee,Notice (days),مقررات (روز)
 DocType: Page,Yes,بله
 DocType: Tax Rule,Sales Tax Template,قالب مالیات بر فروش
 DocType: Employee,Encashment Date,Encashment عضویت
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +74,Electroforming,Electroforming
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +179,"Against Voucher Type must be one of Purchase Order, Purchase Invoice or Journal Entry",علیه کوپن نوع باید یکی از سفارش خرید، خرید فاکتور یا مجله ورودی است
 DocType: Account,Stock Adjustment,تنظیم سهام
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +34,Default Activity Cost exists for Activity Type - {0},هزینه به طور پیش فرض برای فعالیت نوع فعالیت وجود دارد - {0}
@@ -3298,12 +3162,12 @@
 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,توزیع
 apps/erpnext/erpnext/public/js/pos/pos.html +36,Amount Paid,مبلغ پرداخت شده
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +91,Project Manager,مدیر پروژه
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +72,Dispatch,اعزام
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Project Manager,مدیر پروژه
+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: Customer,Default Taxes and Charges,مالیات به طور پیش فرض ها و اتهامات
 DocType: Account,Receivable,دریافتنی
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +268,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,ردیف # {0}: مجاز به تغییر به عنوان کننده سفارش خرید در حال حاضر وجود
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +263,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 برای اقلام زیر مونتاژ خواهد شد برای گرفتن مواد اولیه در نظر گرفته. در غیر این صورت، تمام آیتم های زیر مونتاژ خواهد شد به عنوان ماده خام درمان می شود.
@@ -3311,8 +3175,8 @@
 DocType: Hub Settings,Seller Description,فروشنده توضیحات
 DocType: Employee Education,Qualification,صلاحیت
 DocType: Item Price,Item Price,آیتم قیمت
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +48,Soap & Detergent,صابون و مواد شوینده
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +36,Motion Picture & Video,فیلم و ویدیو
+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,مرتب
 DocType: Warehouse,Warehouse Name,نام انبار
 DocType: Naming Series,Select Transaction,انتخاب معامله
@@ -3321,7 +3185,6 @@
 DocType: BOM,Rate Of Materials Based On,نرخ مواد بر اساس
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,Analtyics پشتیبانی
 apps/erpnext/erpnext/accounts/doctype/accounts_settings/accounts_settings.py +27,Company is missing in warehouses {0},شرکت در انبارها از دست رفته {0}
-DocType: Stock UOM Replace Utility,Stock UOM Replace Utility,سهام UOM جایگزین سودمند
 DocType: POS Profile,Terms and Conditions,شرایط و ضوابط
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,To Date should be within the Fiscal Year. Assuming To Date = {0},به روز باید در سال مالی باشد. با فرض به روز = {0}
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc",در اینجا شما می توانید قد، وزن، آلرژی ها، نگرانی های پزشکی و غیره حفظ
@@ -3333,7 +3196,7 @@
 DocType: Sales Order Item,For Production,برای تولید
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +103,Please enter sales order in the above table,لطفا سفارش فروش در جدول فوق را وارد کنید
 DocType: Project Task,View Task,مشخصات کار
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +406,Your financial year begins on,سال مالی شما آغاز می شود در
+apps/erpnext/erpnext/public/js/setup_wizard.js +154,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: Email Digest,Add/Remove Recipients,اضافه کردن / حذف دریافت کنندگان
@@ -3341,16 +3204,14 @@
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'",برای تنظیم این سال مالی به عنوان پیش فرض، بر روی &quot;تنظیم به عنوان پیش فرض &#39;
 apps/erpnext/erpnext/config/support.py +54,Setup incoming server for support email id. (e.g. support@example.com),راه اندازی سرور های دریافتی برای ایمیل پشتیبانی شناسه. (به عنوان مثال 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 +528,Item variant {0} exists with same attributes,نوع مورد {0} با ویژگی های مشابه وجود دارد
+apps/erpnext/erpnext/stock/doctype/item/item.py +532,Item variant {0} exists with same attributes,نوع مورد {0} با ویژگی های مشابه وجود دارد
 DocType: Salary Slip,Salary Slip,لغزش حقوق و دستمزد
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +116,Burnishing,چکش
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +54,'To Date' is required,'تا تاریخ' مورد نیاز است
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,'تا تاریخ' مورد نیاز است
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.",تولید بسته بندی ورقه برای بسته تحویل داده می شود. مورد استفاده به اطلاع تعداد بسته، محتویات بسته و وزن آن است.
 DocType: Sales Invoice Item,Sales Order Item,سفارش فروش مورد
 DocType: Salary Slip,Payment Days,روز پرداخت
 DocType: BOM,Manage cost of operations,مدیریت هزینه های عملیات
 DocType: Features Setup,Item Advanced,مورد و جوی پیشرفته
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +40,Hot rolling,نورد گرم
 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.",هنگامی که هر یک از معاملات چک می &quot;فرستاده&quot;، یک ایمیل پاپ آپ به طور خودکار باز برای ارسال یک ایمیل به همراه &quot;تماس&quot; در آن معامله، با معامله به عنوان یک پیوست. کاربر ممکن است یا ممکن است ایمیل ارسال کنید.
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,تنظیمات جهانی
 DocType: Employee Education,Employee Education,آموزش و پرورش کارمند
@@ -3363,25 +3224,23 @@
 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/setup/page/setup_wizard/install_fixtures.py +48,Sick Leave,مرخصی استعلاجی
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +174,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/page/setup_wizard/fixtures/industry_type.py +22,Department Stores,فروشگاه های گروه
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,فروشگاه های گروه
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +40,System Balance,تعادل سیستم
 DocType: Workflow,Is Active,فعال است
 apps/erpnext/erpnext/controllers/stock_controller.py +71,No accounting entries for the following warehouses,هیچ نوشته حسابداری برای انبار زیر
 apps/erpnext/erpnext/projects/doctype/project/project.js +22,Save the document first.,ذخیره سند اول است.
 DocType: Account,Chargeable,پرشدنی
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +121,Linishing,Linishing
 DocType: Company,Change Abbreviation,تغییر اختصار
 DocType: Workflow State,Primary,اولیه
 DocType: Expense Claim Detail,Expense Date,هزینه عضویت
 DocType: Item,Max Discount (%),حداکثر تخفیف (٪)
 DocType: Communication,More Information,اطلاعات بیشتر
 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/setup/page/setup_wizard/fixtures/operations.py +161,Blasting,سندبلاست
 DocType: Company,Warn,هشدار دادن
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +111,Item valuation updated,ارزیابی مورد به روز شده
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.",هر گونه اظهارات دیگر، تلاش قابل توجه است که باید در پرونده بروید.
 DocType: BOM,Manufacturing User,ساخت کاربری
 DocType: Purchase Order,Raw Materials Supplied,مواد اولیه عرضه شده
@@ -3391,7 +3250,7 @@
 DocType: Appraisal,Appraisal Template,ارزیابی الگو
 DocType: Communication,Email,ایمیل
 DocType: Item Group,Item Classification,طبقه بندی مورد
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +89,Business Development Manager,مدیر توسعه تجاری
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Business Development Manager,مدیر توسعه تجاری
 DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,هدف نگهداری سایت
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.js +15,Period,دوره
 ,General Ledger,لجر عمومی
@@ -3401,9 +3260,7 @@
 ,Itemwise Recommended Reorder Level,Itemwise توصیه ترتیب مجدد سطح
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +264,Please select {0} first,لطفا انتخاب کنید {0} برای اولین بار
 DocType: Features Setup,To get Item Group in details table,برای دریافت مورد گروه در جدول جزئیات
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +67,Redrawing,ترسیم مجدد
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +112,Batch {0} of Item {1} has expired.,دسته {0} از {1} مورد تمام شده است.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +120,Etching,قلم زنی
 DocType: Sales Invoice,Commission,کمیسیون
 DocType: Address Template,"<h4>Default Template</h4>
 <p>Uses <a href=""http://jinja.pocoo.org/docs/templates/"">Jinja Templating</a> and all the fields of Address (including Custom Fields if any) will be available</p>
@@ -3437,7 +3294,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +340,Operation Time must be greater than 0 for Operation {0},عملیات زمان باید بیشتر از 0 برای عملیات می شود {0}
 DocType: Supplier,Address and Contacts,آدرس و اطلاعات تماس
 DocType: UOM Conversion Detail,UOM Conversion Detail,جزئیات UOM تبدیل
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +496,Keep it web friendly 900px (w) by 100px (h),وب 900px دوستانه (W) توسط نگه داشتن آن را 100px (H)
+apps/erpnext/erpnext/public/js/setup_wizard.js +242,Keep it web friendly 900px (w) by 100px (h),وب 900px دوستانه (W) توسط نگه داشتن آن را 100px (H)
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +329,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,دریافت کوپن های برجسته
@@ -3453,54 +3310,49 @@
 DocType: Item,Average time taken by the supplier to deliver,میانگین زمان گرفته شده توسط منبع برای ارائه
 DocType: Time Log,Hours,ساعت
 DocType: Project,Expected Start Date,انتظار می رود تاریخ شروع
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +38,Rolling,نورد
 DocType: ToDo,Priority,اولویت
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +41,Remove item if charges is not applicable to that item,حذف آیتم اگر از اتهامات عنوان شده و قابل انطباق با آن قلم نمی
 DocType: Dropbox Backup,Dropbox Access Allowed,Dropbox به دسترسی مجاز
 DocType: Dropbox Backup,Weekly,هفتگی
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,به عنوان مثال. smsgateway.com/api/send_sms.cgi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +485,Receive,دريافت كردن
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +510,Receive,دريافت كردن
 DocType: Maintenance Visit,Fully Completed,طور کامل تکمیل شده
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}٪ کامل
 DocType: Employee,Educational Qualification,صلاحیت تحصیلی
 DocType: Workstation,Operating Costs,هزینه های عملیاتی
 DocType: Employee Leave Approver,Employee Leave Approver,کارمند مرخصی تصویب
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,{0} has been successfully added to our Newsletter list.,{0} با موفقیت به لیست خبرنامه اضافه شده است.
-apps/erpnext/erpnext/stock/doctype/item/item.py +383,Row {0}: An Reorder entry already exists for this warehouse {1},ردیف {0}: ورود ترتیب مجدد در حال حاضر برای این انبار وجود دارد {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +387,Row {0}: An Reorder entry already exists for this warehouse {1},ردیف {0}: ورود ترتیب مجدد در حال حاضر برای این انبار وجود دارد {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +67,"Cannot declare as lost, because Quotation has been made.",نمی تواند به عنوان از دست رفته اعلام، به دلیل عبارت ساخته شده است.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +133,Electron beam machining,ماشینکاری پرتو الکترونی
 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 +150,Please select Start Date and End Date for Item {0},لطفا تاریخ شروع و پایان تاریخ برای مورد را انتخاب کنید {0}
 apps/erpnext/erpnext/config/stock.py +141,Main Reports,گزارشهای اصلی
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +102,Stock Ledger entries balances updated,سهام لجر نوشته توازن به روز شده
 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,DOCTYPE Prevdoc
-apps/erpnext/erpnext/stock/doctype/item/item.js +176,Add / Edit Prices,افزودن / ویرایش قیمتها
+apps/erpnext/erpnext/stock/doctype/item/item.js +178,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 +298,My Orders,سفارشهای من
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +293,My Orders,سفارشهای من
 DocType: Price List,Price List Name,لیست قیمت نام
 DocType: Time Log,For Manufacturing,برای ساخت
-apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +70,Totals,مجموع
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +174,Totals,مجموع
 DocType: BOM,Manufacturing,ساخت
 ,Ordered Items To Be Delivered,آیتم ها دستور داد تا تحویل
 DocType: Account,Income,درامد
 ,Setup Wizard,راه اندازی جادوگر
 DocType: Industry Type,Industry Type,نوع صنعت
 apps/erpnext/erpnext/templates/includes/cart.js +137,Something went wrong!,مشکلی!
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +68,Warning: Leave application contains following block dates,هشدار: بگذارید برنامه شامل تاریخ های بلوک زیر
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +251,Sales Invoice {0} has already been submitted,فاکتور فروش {0} در حال حاضر ارائه شده است
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +100,Warning: Leave application contains following block dates,هشدار: بگذارید برنامه شامل تاریخ های بلوک زیر
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +256,Sales Invoice {0} has already been submitted,فاکتور فروش {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/setup/page/setup_wizard/fixtures/operations.py +10,Die casting,ریخته گری
 DocType: Email Alert,Reference Date,مرجع تاریخ
 apps/erpnext/erpnext/config/hr.py +105,Organization unit (department) master.,واحد سازمانی (گروه آموزشی) استاد.
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +25,Please enter valid mobile nos,لطفا NOS تلفن همراه معتبر وارد کنید
 DocType: Budget Detail,Budget Detail,جزئیات بودجه
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +75,Please enter message before sending,لطفا قبل از ارسال پیام را وارد کنید
 DocType: Async Task,Status,وضعیت
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +65,Stock UOM updated for Item {0},سهام UOM به روز شده برای مورد {0}
 DocType: Company History,Year,سال
 apps/erpnext/erpnext/config/accounts.py +127,Point-of-Sale Profile,نقطه از فروش مشخصات
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +68,Please Update SMS Settings,لطفا تنظیمات SMS به روز رسانی
@@ -3514,12 +3366,12 @@
 ,Serial No Service Contract Expiry,سریال بدون خدمات قرارداد انقضاء
 DocType: Item,Unit of Measure Conversion,واحد تبدیل اندازه گیری
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +86,Employee can not be changed,کارمند نمی تواند تغییر کند
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +259,You cannot credit and debit same account at the same time,شما نمی توانید اعتباری و بدهی همان حساب در همان زمان
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,You cannot credit and debit same account at the same time,شما نمی توانید اعتباری و بدهی همان حساب در همان زمان
 DocType: Naming Series,Help HTML,راهنما HTML
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},بین وزنها مجموع اختصاص داده باید 100٪ باشد. این {0}
 apps/erpnext/erpnext/controllers/status_updater.py +140,Allowance for over-{0} crossed for Item {1},کمک هزینه برای بیش از {0} عبور برای مورد {1}
 DocType: Address,Name of person or organization that this address belongs to.,نام و نام خانوادگی شخص و یا سازمانی که این آدرس متعلق به.
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +587,Your Suppliers,تامین کنندگان شما
+apps/erpnext/erpnext/public/js/setup_wizard.js +325,Your Suppliers,تامین کنندگان شما
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,می توانید مجموعه ای نه به عنوان از دست داده تا سفارش فروش ساخته شده است.
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +65,Another Salary Structure {0} is active for employee {1}. Please make its status 'Inactive' to proceed.,یکی دیگر از ساختار حقوق {0} برای کارکنان فعال است {1}. لطفا مطمئن وضعیت خود را غیر فعال &#39;به عنوان خوانده شده
 DocType: Purchase Invoice,Contact,تماس
@@ -3528,37 +3380,35 @@
 DocType: Item,Has Serial No,دارای سریال بدون
 DocType: Employee,Date of Issue,تاریخ صدور
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +16,{0}: From {0} for {1},{0}: از {0} برای {1}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +154,Row #{0}: Set Supplier for item {1},ردیف # {0}: تنظیم کننده برای آیتم {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +149,Row #{0}: Set Supplier for item {1},ردیف # {0}: تنظیم کننده برای آیتم {1}
 DocType: Issue,Content Type,نوع محتوا
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +17,Computer,کامپیوتر
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,کامپیوتر
 DocType: Item,List this Item in multiple groups on the website.,فهرست این مورد در گروه های متعدد بر روی وب سایت.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +283,Please check Multi Currency option to allow accounts with other currency,لطفا گزینه ارز چند اجازه می دهد تا حساب با ارز دیگر را بررسی کنید
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +285,Please check Multi Currency option to allow accounts with other currency,لطفا گزینه ارز چند اجازه می دهد تا حساب با ارز دیگر را بررسی کنید
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +62,Item: {0} does not exist in the system,مورد: {0} در سیستم وجود ندارد
 apps/erpnext/erpnext/accounts/doctype/account/account.py +81,You are not authorized to set Frozen value,شما مجاز به تنظیم مقدار ثابت شده نیستید
 DocType: Payment Reconciliation,Get Unreconciled Entries,دریافت Unreconciled مطالب
 DocType: Cost Center,Budgets,بودجه
 apps/frappe/frappe/core/page/modules_setup/modules_setup.py +11,Updated,به روز شده
 DocType: Employee,Emergency Contact Details,جزییات تماس اضطراری
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +396,What does it do?,چه کاری انجام میدهد؟
+apps/erpnext/erpnext/public/js/setup_wizard.js +144,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,متوسط ​​نرخ کمیسیون
-apps/erpnext/erpnext/stock/doctype/item/item.py +313,'Has Serial No' can not be 'Yes' for non-stock item,"""دارای شماره سریال""  برای موارد غیر انباری نمی تواند ""بله"" باشد"
+apps/erpnext/erpnext/stock/doctype/item/item.py +317,'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/setup/page/setup_wizard/install_fixtures.py +111,Electrical,برق
+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 +302,Row {0}: Exchange Rate is mandatory,ردیف {0}: نرخ ارز الزامی است
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +304,Row {0}: Exchange Rate is mandatory,ردیف {0}: نرخ ارز الزامی است
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},ID کاربر برای کارمند تنظیم نشده {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +72,Peening,عکاسی
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,From Warranty Claim,از ادعای گارانتی
 DocType: Stock Entry,Default Source Warehouse,به طور پیش فرض منبع انبار
 DocType: Item,Customer Code,کد مشتری
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +212,Birthday Reminder for {0},یادآوری تاریخ تولد برای {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +163,Lapping,لپینگ
-apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.js +8,Days Since Last Order,روز پس از آخرین سفارش
+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 +299,Debit To account must be a Balance Sheet account,بدهکاری به حساب کاربری باید یک حساب ترازنامه شود
 DocType: Buying Settings,Naming Series,نامگذاری سری
 DocType: Leave Block List,Leave Block List Name,ترک نام فهرست بلوک
@@ -3572,7 +3422,7 @@
 DocType: Notification Control,Sales Invoice Message,فاکتور فروش پیام
 DocType: Authorization Rule,Based On,بر اساس
 DocType: Sales Order Item,Ordered Qty,دستور داد تعداد
-apps/erpnext/erpnext/stock/doctype/item/item.py +539,Item {0} is disabled,مورد {0} غیر فعال است
+apps/erpnext/erpnext/stock/doctype/item/item.py +543,Item {0} is disabled,مورد {0} غیر فعال است
 DocType: Stock Settings,Stock Frozen Upto,سهام منجمد تا حد
 apps/erpnext/erpnext/controllers/recurring_document.py +166,Period From and Period To dates mandatory for recurring {0},دوره و دوره به تاریخ برای تکرار اجباری {0}
 apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,فعالیت پروژه / وظیفه.
@@ -3582,7 +3432,6 @@
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,تخفیف باید کمتر از 100 باشد
 DocType: ToDo,Low,کم
 DocType: Purchase Invoice,Write Off Amount (Company Currency),ارسال کردن مقدار (شرکت ارز)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +71,Spinning,نخ ریسی
 DocType: Landed Cost Voucher,Landed Cost Voucher,فرود کوپن هزینه
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +55,Please set {0},لطفا {0}
 DocType: Purchase Invoice,Repeat on Day of Month,تکرار در روز از ماه
@@ -3604,7 +3453,6 @@
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +37,Campaign Name is required,نام کمپین الزامی است
 DocType: Maintenance Visit,Maintenance Date,تاریخ نگهداری و تعمیرات 
 DocType: Purchase Receipt Item,Rejected Serial No,رد سریال
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +51,Deep drawing,کشش عمیق
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +40,New Newsletter,عضویت در خبرنامه جدید
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +157,Start date should be less than end date for Item {0},تاریخ شروع باید کمتر از تاریخ پایان برای مورد است {0}
 apps/erpnext/erpnext/stock/doctype/item/item.js +17,Show Balance,نمایش تعادل
@@ -3614,7 +3462,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +119,BOM and Manufacturing Quantity are required,BOM و ساخت تعداد مورد نیاز
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,محدوده سالمندی 2
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +450,Amount,مقدار
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +147,Riveting,پرچین
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,BOM جایگزین
 ,Sales Analytics,تجزیه و تحلیل ترافیک فروش
 DocType: Manufacturing Settings,Manufacturing Settings,تنظیمات ساخت
@@ -3626,20 +3473,19 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +207,New Account Name,نام حساب
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,هزینه مواد اولیه عرضه شده
 DocType: Selling Settings,Settings for Selling Module,تنظیمات برای فروش ماژول
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +73,Customer Service,خدمات مشتریان
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Customer Service,خدمات مشتریان
 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.,پیشنهاد نامزد یک کار.
 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 +70,Item {0} must be a stock Item,مورد {0} باید مورد سهام است
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,پیش فرض کار در انبار پیشرفت
 apps/erpnext/erpnext/config/accounts.py +107,Default settings for accounting transactions.,تنظیمات پیش فرض برای انجام معاملات حسابداری.
 apps/frappe/frappe/model/naming.py +40,{0} is required,{0} مورد نیاز است
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +21,Vacuum molding,قالب ریزی و سازه های خلاء
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,تاریخ انتظار نمی رود می تواند قبل از درخواست عضویت مواد است
 DocType: Contact Us Settings,City,شهرستان
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +132,Ultrasonic machining,ماشینکاری آلتراسونیک
 apps/frappe/frappe/templates/base.html +137,Error: Not a valid id?,خطا: نه یک شناسه معتبر است؟
 apps/erpnext/erpnext/stock/get_item_details.py +125,Item {0} must be a Sales Item,مورد {0} باید مورد فروش می شود
 DocType: Naming Series,Update Series Number,به روز رسانی سری شماره
@@ -3647,7 +3493,7 @@
 DocType: Sales Order,Printing Details,اطلاعات چاپ
 DocType: Task,Closing Date,اختتامیه عضویت
 DocType: Sales Order Item,Produced Quantity,مقدار زیاد تولید
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +84,Engineer,مهندس
+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 +379,Item Code required at Row No {0},کد مورد نیاز در ردیف بدون {0}
 DocType: Sales Partner,Partner Type,نوع شریک
@@ -3655,7 +3501,7 @@
 DocType: Authorization Rule,Customerwise Discount,Customerwise تخفیف
 DocType: Purchase Invoice,Against Expense Account,علیه صورتحساب
 DocType: Production Order,Production Order,سفارش تولید
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +258,Installation Note {0} has already been submitted,نصب و راه اندازی {0} توجه داشته باشید در حال حاضر ارائه شده است
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +263,Installation Note {0} has already been submitted,نصب و راه اندازی {0} توجه داشته باشید در حال حاضر ارائه شده است
 DocType: Quotation Item,Against Docname,علیه Docname
 DocType: SMS Center,All Employee (Active),همه کارکنان (فعال)
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,مشاهده در حال حاضر
@@ -3664,19 +3510,19 @@
 DocType: Item,Re-Order Level,ترتیب سطح
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,اقلام و تعداد برنامه ریزی شده که برای آن شما می خواهید به افزایش سفارشات تولید و یا دانلود کنید مواد خام برای تجزیه و تحلیل را وارد کنید.
 apps/frappe/frappe/public/js/frappe/views/ganttview.js +45,Gantt Chart,نمودار گانت
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +57,Part-time,پاره وقت
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,Part-time,پاره وقت
 DocType: Employee,Applicable Holiday List,فهرست تعطیلات قابل اجرا
 DocType: Employee,Cheque,چک
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,سری به روز رسانی
 apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Report Type is mandatory,نوع گزارش الزامی است
 DocType: Item,Serial Number Series,شماره سریال سری
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},انبار سهام مورد {0} در ردیف الزامی است {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +45,Retail & Wholesale,خرده فروشی و عمده فروشی
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,خرده فروشی و عمده فروشی
 DocType: Issue,First Responded On,اول پاسخ در
 DocType: Website Item Group,Cross Listing of Item in multiple groups,صلیب فهرست مورد در گروه های متعدد
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +351,The First User: You,اولین کاربر: شما
+apps/erpnext/erpnext/public/js/setup_wizard.js +101,The First User: You,اولین کاربر: شما
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +48,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 +172,Successfully Reconciled,موفقیت آشتی
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +119,Successfully Reconciled,موفقیت آشتی
 DocType: Production Order,Planned End Date,برنامه ریزی پایان تاریخ
 apps/erpnext/erpnext/config/stock.py +43,Where items are stored.,که در آن موارد ذخیره می شود.
 DocType: Tax Rule,Validity,اعتبار
@@ -3696,39 +3542,36 @@
 DocType: DocPerm,Level,سطح
 DocType: Purchase Taxes and Charges,On Net Total,در مجموع خالص
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +160,Target warehouse in row {0} must be same as Production Order,انبار هدف در ردیف {0} باید به همان ترتیب تولید می شود
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +59,No permission to use Payment Tool,بدون اجازه به استفاده از ابزار پرداخت
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +97,No permission to use Payment Tool,بدون اجازه به استفاده از ابزار پرداخت
 apps/erpnext/erpnext/controllers/recurring_document.py +192,'Notification Email Addresses' not specified for recurring %s,'هشدار از طریق آدرس ایمیل' برای دوره ی زمانی محدود %s مشخص نشده است
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +86,Milling,فرز
 apps/erpnext/erpnext/accounts/doctype/account/account.py +99,Currency can not be changed after making entries using some other currency,نرخ ارز می تواند پس از ساخت ورودی با استفاده از یک ارز دیگر، نمی توان تغییر داد
 DocType: Company,Round Off Account,دور کردن حساب
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +60,Nibbling,پر وعده
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,هزینه های اداری
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +18,Consulting,مشاور
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +18,Consulting,مشاور
 DocType: Customer Group,Parent Customer Group,مشتریان پدر و مادر گروه
 apps/erpnext/erpnext/public/js/pos/pos.js +429,Change,تغییر
 DocType: Purchase Invoice,Contact Email,تماس با ایمیل
 DocType: Appraisal Goal,Score Earned,امتیاز کسب
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +393,"e.g. ""My Company LLC""",به عنوان مثال &quot;من شرکت LLC&quot;
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +173,Notice Period,مقررات دوره
+apps/erpnext/erpnext/public/js/setup_wizard.js +141,"e.g. ""My Company LLC""",به عنوان مثال &quot;من شرکت LLC&quot;
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +173,Notice Period,مقررات دوره
 DocType: Bank Reconciliation Detail,Voucher ID,ID کوپن
 apps/erpnext/erpnext/setup/doctype/territory/territory.js +14,This is a root territory and cannot be edited.,این یک سرزمین ریشه است و نمی تواند ویرایش شود.
 DocType: Packing Slip,Gross Weight UOM,وزن UOM
 DocType: Email Digest,Receivables / Payables,مطالبات / بدهی
 DocType: Delivery Note Item,Against Sales Invoice,علیه فاکتور فروش
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +63,Stamping,مهر زنی
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +457,Credit Account,حساب اعتباری
 DocType: Landed Cost Item,Landed Cost Item,فرود از اقلام هزینه
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +56,Show zero values,نمایش صفر ارزش
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,تعداد آیتم به دست آمده پس از تولید / repacking از مقادیر داده شده از مواد خام
 DocType: Payment Reconciliation,Receivable / Payable Account,حساب دریافتنی / پرداختنی
 DocType: Delivery Note Item,Against Sales Order Item,علیه سفارش فروش مورد
-apps/erpnext/erpnext/stock/doctype/item/item.py +521,Please specify Attribute Value for attribute {0},لطفا موجودیت مقدار برای صفت مشخص {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +525,Please specify Attribute Value for attribute {0},لطفا موجودیت مقدار برای صفت مشخص {0}
 DocType: Item,Default Warehouse,به طور پیش فرض انبار
 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,چاپ بدون مقدار
-apps/erpnext/erpnext/controllers/buying_controller.py +69,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,مالیات رده می تواند &#39;گذاری &quot;یا&quot; ارزش گذاری و مجموع &quot;نه به عنوان همه موارد اقلام غیر سهام هستند
+apps/erpnext/erpnext/controllers/buying_controller.py +60,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,مالیات رده می تواند &#39;گذاری &quot;یا&quot; ارزش گذاری و مجموع &quot;نه به عنوان همه موارد اقلام غیر سهام هستند
 DocType: User,Last Name,نام خانوادگی
 DocType: Web Page,Left,چپ
 DocType: Event,All Day,تمام روز
@@ -3736,7 +3579,7 @@
 DocType: Appraisal,Total Score (Out of 5),نمره کل (از 5)
 DocType: Contact Us Settings,State,دولت
 DocType: Batch,Batch,دسته
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +51,Balance,تراز
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +28,Balance,تراز
 DocType: Project,Total Expense Claim (via Expense Claims),مجموع ادعای هزینه (از طریق ادعاهای هزینه)
 DocType: User,Gender,جنس
 DocType: Journal Entry,Debit Note,بدهی توجه داشته باشید
@@ -3766,8 +3609,7 @@
 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/setup/page/setup_wizard/fixtures/operations.py +76,Seaming,گذاری لبه کیسه
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +197,"Company Email ID not found, hence mail not sent",شرکت پست الکترونیک ID یافت نشد، از این رو پست الکترونیکی فرستاده نمی
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +206,"Company Email ID not found, hence mail not sent",شرکت پست الکترونیک ID یافت نشد، از این رو پست الکترونیکی فرستاده نمی
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),استفاده از وجوه (دارایی)
 DocType: Production Planning Tool,Filter based on item,فیلتر در مورد بر اساس
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +451,Debit Account,حساب بانکی
@@ -3779,17 +3621,16 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +95,{0} {1} has been modified. Please refresh.,{0} {1} اصلاح شده است. لطفا بازخوانی کنید.
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,توقف کاربران از ساخت نرم افزار مرخصی در روز بعد.
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +591,From Opportunity,از فرصت
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +46,Blanking,نبلرس
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +166,Employee Benefits,مزایای کارکنان
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,Employee Benefits,مزایای کارکنان
 DocType: Sales Invoice,Is POS,آیا POS
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +240,Packed quantity must equal quantity for Item {0} in row {1},مقدار بسته بندی شده، باید مقدار برای مورد {0} در ردیف برابر {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +245,Packed quantity must equal quantity for Item {0} in row {1},مقدار بسته بندی شده، باید مقدار برای مورد {0} در ردیف برابر {1}
 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.,لوایح مطرح شده به مشتریان.
 DocType: DocField,Default,پیش فرض
 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 +466,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},ردیف بدون {0}: مبلغ نمی تواند بیشتر از انتظار مقدار برابر هزینه ادعای {1}. در انتظار مقدار است {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +468,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} مشترک افزوده شد
 DocType: Maintenance Schedule,Schedule,برنامه
 DocType: Cost Center,"Define Budget for this Cost Center. To set budget action, see ""Company List""",تعریف بودجه برای این مرکز هزینه. برای تنظیم اقدام بودجه، نگاه کنید به &quot;فهرست شرکت&quot;
@@ -3800,7 +3641,7 @@
 apps/erpnext/erpnext/public/js/pos/pos.js +91,Price List not found or disabled,لیست قیمت یافت نشد یا از کار افتاده
 DocType: Expense Claim,Approved,تایید
 DocType: Pricing Rule,Price,قیمت
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +79,Employee relieved on {0} must be set as 'Left',کارمند رها در {0} باید تنظیم شود به عنوان چپ
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +88,Employee relieved on {0} must be set as 'Left',کارمند رها در {0} باید تنظیم شود به عنوان چپ
 DocType: Item,"Selecting ""Yes"" will give a unique identity to each entity of this item which can be viewed in the Serial No master.",انتخاب &quot;بله&quot; خواهد یک هویت منحصر به فرد به هر یک از موجودیت این مورد است که می تواند در سریال بدون استاد مشاهده دهد.
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +39,Appraisal {0} created for Employee {1} in the given date range,ارزیابی {0} برای کارمند {1} در محدوده تاریخ ایجاد شود
 DocType: Employee,Education,آموزش و پرورش
@@ -3811,7 +3652,7 @@
 apps/frappe/frappe/desk/moduleview.py +67,Standard Reports,گزارش استاندارد
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,مطالب مجله حسابداری.
 DocType: Delivery Note Item,Available Qty at From Warehouse,تعداد موجود در انبار از
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +209,Please select Employee Record first.,لطفا ابتدا کارمند ضبط را انتخاب کنید.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +224,Please select Employee Record first.,لطفا ابتدا کارمند ضبط را انتخاب کنید.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,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 +233,Please enter Expense Account,لطفا هزینه حساب وارد کنید
@@ -3824,46 +3665,43 @@
 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,سفارشات فروش کشش (در انتظار برای ارائه) بر اساس معیارهای فوق
 DocType: DocShare,Document Type,نوع سند
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +565,From Supplier Quotation,از عبارت تامین کننده
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +588,From Supplier Quotation,از عبارت تامین کننده
 DocType: Deduction Type,Deduction Type,نوع کسر
 DocType: Attendance,Half Day,نیم روز
 DocType: Pricing Rule,Min Qty,حداقل تعداد
 DocType: Features Setup,"To track items in sales and purchase documents with batch nos. ""Preferred Industry: Chemicals""",برای پیگیری موارد در فروش و اسناد خرید با NOS دسته ای. &quot;صنعت ترجیحی: مواد شیمیایی&quot;
 DocType: GL Entry,Transaction Date,تاریخ تراکنش
 DocType: Production Plan Item,Planned Qty,برنامه ریزی تعداد
-apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +91,Total Tax,مالیات ها
+apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +93,Total Tax,مالیات ها
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +178,For Quantity (Manufactured Qty) is mandatory,برای کمیت (تعداد تولیدی) الزامی است
 DocType: Stock Entry,Default Target Warehouse,به طور پیش فرض هدف انبار
 DocType: Purchase Invoice,Net Total (Company Currency),مجموع خالص (شرکت ارز)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +79,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,ردیف {0}: حزب نوع و حزب تنها در برابر دریافتنی / حساب پرداختنی قابل اجرا است
 DocType: Notification Control,Purchase Receipt Message,خرید دریافت پیام
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +95,Total allocated leaves are more than period,مجموع برگ اختصاص داده بیش از دوره
 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.,جنبش مورد سابقه بوده است.
 DocType: Newsletter List Subscriber,Newsletter List Subscriber,عضویت در خبرنامه لیست مشترک
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +164,Morticing,Morticing
 DocType: Email Account,Service,سرویس
 DocType: Hub Settings,Hub Settings,تنظیمات توپی
 DocType: Project,Gross Margin %,حاشیه ناخالص٪
 DocType: BOM,With Operations,با عملیات
 apps/erpnext/erpnext/accounts/party.py +232,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,نوشته حسابداری در حال حاضر در ارز ساخته شده {0} برای شرکت {1}. لطفا یک حساب دریافتنی و یا قابل پرداخت با ارز را انتخاب کنید {0}.
 ,Monthly Salary Register,ماهانه حقوق ثبت نام
-apps/frappe/frappe/website/template.py +140,Next,بعد
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard_page.html +17,Next,بعد
 DocType: Warranty Claim,If different than customer address,اگر متفاوت از آدرس مشتری
 DocType: BOM Operation,BOM Operation,عملیات BOM
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +118,Electropolishing,الکتروپولیش
 DocType: Purchase Taxes and Charges,On Previous Row Amount,در قبلی مقدار ردیف
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +24,Please enter Payment Amount in atleast one row,لطفا مقدار پرداخت در حداقل یک سطر وارد
+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
 apps/erpnext/erpnext/config/accounts.py +153,"Seasonality for setting budgets, targets etc.",فصلی برای تنظیم بودجه، اهداف و غیره
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +238,Row {0}: Payment Amount cannot be greater than Outstanding Amount,ردیف {0}: مبلغ پرداخت نمی تواند بیشتر از مقدار برجسته
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +46,Total Unpaid,مجموع پرداخت نشده
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +21,Time Log is not billable,زمان ورود است قابل پرداخت نیست
 apps/erpnext/erpnext/stock/get_item_details.py +128,"Item {0} is a template, please select one of its variants",مورد {0} یک قالب است، لطفا یکی از انواع آن را انتخاب کنید
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +528,Purchaser,خریدار
+apps/erpnext/erpnext/public/js/setup_wizard.js +272,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 +71,Please enter the Against Vouchers manually,لطفا علیه کوپن دستی وارد کنید
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +107,Please enter the Against Vouchers manually,لطفا علیه کوپن دستی وارد کنید
 DocType: SMS Settings,Static Parameters,پارامترهای استاتیک
 DocType: Purchase Order,Advance Paid,پیش پرداخت
 DocType: Item,Item Tax,مالیات مورد
@@ -3872,14 +3710,12 @@
 apps/erpnext/erpnext/config/crm.py +48,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 +57,Actual Qty is mandatory,تعداد واقعی الزامی است
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +42,Cross-rolling,کراس آلیاژها
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +132,Credit Card,کارت اعتباری
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +132,Credit Card,کارت اعتباری
 DocType: BOM,Item to be manufactured or repacked,آیتم به تولید و یا repacked
 apps/erpnext/erpnext/config/stock.py +95,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,لطفا مالیات و هزینه وارد
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +85,Machining,ماشینکاری
 DocType: Sales Invoice Item,Drop Ship,قطره کشتی
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children",در اینجا شما می توانید جزئیات خانواده مانند نام و شغل پدر و مادر، همسر و فرزندان حفظ
 DocType: Hub Settings,Seller Name,نام فروشنده
@@ -3889,7 +3725,7 @@
 DocType: Stock Entry,Repack,REPACK
 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/setup/page/setup_wizard/setup_wizard.js +500,Attach Logo,ضمیمه لوگو
+apps/erpnext/erpnext/public/js/setup_wizard.js +246,Attach Logo,ضمیمه لوگو
 DocType: Customer,Commission Rate,کمیسیون نرخ
 apps/erpnext/erpnext/stock/doctype/item/item.js +38,Make Variant,متغیر را
 apps/erpnext/erpnext/config/hr.py +145,Block leave applications by department.,برنامه بلوک مرخصی توسط بخش.
@@ -3904,19 +3740,19 @@
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +105,Please select a csv file,لطفا یک فایل CSV را انتخاب کنید
 DocType: Dropbox Backup,Send Backups to Dropbox,ارسال به پشتیبان گیری Dropbox به
 DocType: Purchase Order,To Receive and Bill,برای دریافت و بیل
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +94,Designer,طراح
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Designer,طراح
 apps/erpnext/erpnext/config/selling.py +121,Terms and Conditions Template,شرایط و ضوابط الگو
 DocType: Serial No,Delivery Details,جزئیات تحویل
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +383,Cost Center is required in row {0} in Taxes table for type {1},مرکز هزینه در ردیف مورد نیاز است {0} در مالیات جدول برای نوع {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +386,Cost Center is required in row {0} in Taxes table for type {1},مرکز هزینه در ردیف مورد نیاز است {0} در مالیات جدول برای نوع {1}
 DocType: Item,Automatically create Material Request if quantity falls below this level,به طور خودکار ایجاد درخواست مواد اگر مقدار می افتد در زیر این سطح
 ,Item-wise Purchase Register,مورد عاقلانه ثبت نام خرید
 DocType: Batch,Expiry Date,تاریخ انقضا
-apps/erpnext/erpnext/stock/doctype/item/item.py +375,"To set reorder level, item must be a Purchase Item or Manufacturing Item",برای تنظیم سطح دوباره سفارش دادن، مورد باید مورد خرید و یا مورد ساخت می باشد
+apps/erpnext/erpnext/stock/doctype/item/item.py +379,"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.,کارشناسی ارشد پروژه.
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,را نشان نمی مانند هر نماد $ و غیره در کنار ارزهای.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +330, (Half Day),(نیم روز)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +374, (Half Day),(نیم روز)
 DocType: Supplier,Credit Days,روز اعتباری
 DocType: Leave Type,Is Carry Forward,آیا حمل به جلو
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +478,Get Items from BOM,گرفتن اقلام از BOM
@@ -3924,7 +3760,7 @@
 apps/erpnext/erpnext/config/manufacturing.py +120,Bill of Materials,بیل از مواد
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +77,Row {0}: Party Type and Party is required for Receivable / Payable account {1},ردیف {0}: حزب نوع و حزب دریافتنی / حساب پرداختنی مورد نیاز است {1}
 DocType: Dropbox Backup,Send Notifications To,ارسال اعلانها به
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html +26,Ref Date,کد عکس تاریخ
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +54,Ref Date,کد عکس تاریخ
 DocType: Employee,Reason for Leaving,دلیلی برای ترک
 DocType: Expense Claim Detail,Sanctioned Amount,مقدار تحریم
 DocType: GL Entry,Is Opening,باز
@@ -3932,4 +3768,3 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +188,Account {0} does not exist,حساب {0} وجود ندارد
 DocType: Account,Cash,نقد
 DocType: Employee,Short biography for website and other publications.,بیوگرافی کوتاه برای وب سایت ها و نشریات دیگر.
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +31,Please create Salary Structure for employee {0},لطفا ساختار حقوق برای کارکنان ایجاد {0}
diff --git a/erpnext/translations/fi.csv b/erpnext/translations/fi.csv
index 39ea835..2493c76 100644
--- a/erpnext/translations/fi.csv
+++ b/erpnext/translations/fi.csv
@@ -1,13 +1,12 @@
 DocType: Employee,Salary Mode,palkan tila
 DocType: Cost Center,"Select Monthly Distribution, if you want to track based on seasonality.",valitse toimitusten kk jaksotus mikäli haluat kausiluonteisen seurannan
 DocType: Employee,Divorced,eronnut
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +86,Warning: Same item has been entered multiple times.,varoitus: sama tuote on syötetty useamman kerran
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +80,Warning: Same item has been entered multiple times.,varoitus: sama tuote on syötetty useamman kerran
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +96,Items already synced,tuotteet on jo synkronoitu
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,Salli Kohta lisätään useita kertoja liiketoimi
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,peruuta materiaalikäynti {0} ennen peruutat takuuvaatimuksen
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +19,Consumer Products,kuluttajatavarat
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,kuluttajatavarat
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +68,Please select Party Type first,valitse ensin osapuoli tyyppi
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +90,Annealing,Hehkutus
 DocType: Item,Customer Items,asiakkaan tuotteet
 apps/erpnext/erpnext/accounts/doctype/account/account.py +45,Account {0}: Parent account {1} can not be a ledger,tili {0}: emotili {1} ei voi tilikirja
 DocType: Item,Publish Item to hub.erpnext.com,Julkaise Tuote on hub.erpnext.com
@@ -20,15 +19,14 @@
 DocType: About Us Settings,Website,verkkosivusto
 DocType: POS Profile,Applicable for User,Sovelletaan Käyttäjä
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +169,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Pysäytetty Tuotantotilaus ei voi peruuttaa, Unstop se ensin peruuttaa"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +23,Compaction plus sintering,koonti plus sintraus
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,Currency is required for Price List {0},valuuttahinnasto vaaditaan {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* lasketaan tapahtumassa
 DocType: Purchase Order,Customer Contact,Asiakaspalvelu Yhteystiedot
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +549,From Material Request,materiaalipyynnöstä
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +572,From Material Request,materiaalipyynnöstä
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} puu
 DocType: Job Applicant,Job Applicant,Työnhakija
 apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,ei enempää tuloksia
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +78,Legal,Oikeudellinen
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +34,Legal,Oikeudellinen
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +114,Actual type tax cannot be included in Item rate in row {0},todellista veroa ei voi sisällyttää tuotteen tasoon rivillä {0}
 DocType: C-Form,Customer,asiakas
 DocType: Purchase Receipt Item,Required By,pyytäjä
@@ -43,7 +41,6 @@
 DocType: Manufacturing Settings,Default 10 mins,oletus 10 min
 DocType: Leave Type,Leave Type Name,"poistu, tyypin nimi"
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +148,Series Updated Successfully,sarja päivitetty onnistuneesti
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +150,Stitching,kutina
 DocType: Pricing Rule,Apply On,käytä
 DocType: Item Price,Multiple Item prices.,Useiden Item hinnat.
 ,Purchase Order Items To Be Received,Ostotilaus eriä olevan vastaanotettu
@@ -51,8 +48,8 @@
 DocType: Quality Inspection Reading,Parameter,parametri
 apps/erpnext/erpnext/projects/doctype/project/project.py +43,Expected End Date can not be less than Expected Start Date,odotettu päättymispäivä ei voi olla pienempi kuin odotettu aloituspäivä
 apps/erpnext/erpnext/utilities/transaction_base.py +104,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,rivi # {0}: taso tulee olla sama kuin {1}: {2} ({3} / {4})
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +189,New Leave Application,uusi poistumissovellus
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +134,Bank Draft,pankki sekki
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +204,New Leave Application,uusi poistumissovellus
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +134,Bank Draft,pankki sekki
 DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,1. käytä tätä vaihtoehtoa määritelläksesi hakukelpoisen asiakaskohtaisen tuotekoodin
 DocType: Mode of Payment Account,Mode of Payment Account,maksutilin tila
 apps/erpnext/erpnext/stock/doctype/item/item.js +34,Show Variants,näytä mallivaihtoehdot
@@ -64,25 +61,23 @@
 DocType: Production Plan Item,Production Plan Item,Tuotanto Plan Item
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +141,User {0} is already assigned to Employee {1},käyttäjä {0} on jo nimetty työsuhteeseen {1}
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +13,Make new POS Profile,Tee uusi POS Profile
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +31,Health Care,terveydenhuolto
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,terveydenhuolto
 DocType: Purchase Invoice,Monthly,Kuukausittain
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +66,Delay in payment (Days),Viivästyminen (päivää)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +494,Invoice,lasku
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +519,Invoice,lasku
 DocType: Maintenance Schedule Item,Periodicity,jaksotus
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +357,Email Address,sähköpostiosoite
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +21,Defense,puolustus
+apps/erpnext/erpnext/public/js/setup_wizard.js +107,Email Address,sähköpostiosoite
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,puolustus
 DocType: Company,Abbr,lyhenteet
 DocType: Appraisal Goal,Score (0-5),pisteet (0-5)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +193,Row {0}: {1} {2} does not match with {3},rivi {0}: {1} {2} ei täsmää {3} kanssa
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +67,Row # {0}:,Rivi # {0}:
 DocType: Delivery Note,Vehicle No,ajoneuvon nro
 apps/erpnext/erpnext/public/js/pos/pos.js +528,Please select Price List,Ole hyvä ja valitse hinnasto
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +162,Woodworking,puun työstö
 DocType: Production Order Operation,Work In Progress,työnalla
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +153,3D printing,3D-tulostus
 DocType: Employee,Holiday List,lomaluettelo
 DocType: Time Log,Time Log,aikaloki
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +530,Accountant,Kirjanpitäjä
+apps/erpnext/erpnext/public/js/setup_wizard.js +274,Accountant,Kirjanpitäjä
 DocType: Cost Center,Stock User,varasto käyttäjä
 DocType: Company,Phone No,Puhelin ei
 DocType: Time Log,"Log of Activities performed by users against Tasks that can be used for tracking time, billing.","lokiaktiviteetit kohdistettuna käyttäjien tehtäviin, joista aikaseuranta tai laskutus on mahdollista"
@@ -98,18 +93,19 @@
 DocType: Bin,Quantity Requested for Purchase,Määrä pyydetty ostoa
 DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name","Liitä .csv-tiedoston, jossa on kaksi saraketta, toinen vanha nimi ja yksi uusi nimi"
 DocType: Packed Item,Parent Detail docname,Parent Detail docname
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Kg,Kg
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Kg,Kg
 apps/erpnext/erpnext/config/hr.py +48,Opening for a Job.,Avaaminen ja työn.
 DocType: Item Attribute,Increment,Lisäys
 apps/erpnext/erpnext/public/js/stock_analytics.js +63,Select Warehouse...,Valitse Varasto ...
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +6,Advertising,mainonta
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,mainonta
+apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,Sama yhtiö on merkitty enemmän kuin kerran
 DocType: Employee,Married,Naimisissa
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +389,Stock cannot be updated against Delivery Note {0},varastoa ei voi päivittää lähetettä vastaan {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +391,Stock cannot be updated against Delivery Note {0},varastoa ei voi päivittää lähetettä vastaan {0}
 DocType: Payment Reconciliation,Reconcile,yhteensovitus
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +30,Grocery,päivittäistavara
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,päivittäistavara
 DocType: Quality Inspection Reading,Reading 1,Reading 1
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Make Bank Entry,tee pankkikirjaus
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +40,Pension Funds,eläkerahastot
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,eläkerahastot
 apps/erpnext/erpnext/accounts/doctype/account/account.py +142,Warehouse is mandatory if account type is Warehouse,varasto vaaditaan mikäli tilin tyyppi on varastotili
 DocType: SMS Center,All Sales Person,kaikki myyjät
 DocType: Lead,Person Name,henkilönimi
@@ -131,7 +127,7 @@
 DocType: Quality Inspection,Get Specification Details,hae tekniset lisätiedot
 DocType: Lead,Interested,kiinnostunut
 apps/erpnext/erpnext/config/manufacturing.py +14,Bill of Material,materiaalilasku
-apps/erpnext/erpnext/public/js/stock_analytics.js +45,Opening,Aukko
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +158,Opening,Aukko
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},alkaen {0} on {1}
 DocType: Item,Copy From Item Group,kopioi tuoteryhmästä
 DocType: Journal Entry,Opening Entry,avauskirjaus
@@ -145,23 +141,22 @@
 DocType: Employee Education,Under Graduate,valmistumisen alla
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +22,Target On,tavoitteeseen
 DocType: BOM,Total Cost,kokonaiskustannukset
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +99,Reaming,Väljentäminen
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +9,Activity Log:,aktiivisuus loki:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +199,Item {0} does not exist in the system or has expired,tuote {0} ei löydy tai se on vanhentunut
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +44,Real Estate,kiinteistöt
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +44,Real Estate,kiinteistöt
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +4,Statement of Account,tiliote
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +41,Pharmaceuticals,Pharmaceuticals
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,Pharmaceuticals
 DocType: Expense Claim Detail,Claim Amount,vaatimuksen arvomäärä
 DocType: Employee,Mr,Mr
 DocType: Custom Script,Client,asiakas
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,toimittaja tyyppi / toimittaja
 DocType: Naming Series,Prefix,Etuliite
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Consumable,käytettävä
+apps/erpnext/erpnext/public/js/setup_wizard.js +359,Consumable,käytettävä
 DocType: Upload Attendance,Import Log,tuo loki
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.js +19,Send,lähetä
 DocType: Sales Invoice Item,Delivered By Supplier,Toimitetaan Toimittaja
 DocType: SMS Center,All Contact,kaikki yhteystiedot
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +164,Annual Salary,vuosipalkka
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +164,Annual Salary,vuosipalkka
 DocType: Period Closing Voucher,Closing Fiscal Year,tilikauden sulkeminen
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +69,Stock Expenses,varaston kulut
 DocType: Newsletter,Email Sent?,sähköposti lähetetty?
@@ -169,26 +164,24 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +92,Show Time Logs,näytä aikalokit
 DocType: Journal Entry Account,Credit in Company Currency,Luotto Yritys Valuutta
 DocType: Delivery Note,Installation Status,asennus tila
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +115,Accepted + Rejected Qty must be equal to Received quantity for Item {0},hyväksyttyjen + hylättyjen yksikkömäärä on sama kuin tuotteiden vastaanotettu määrä {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +118,Accepted + Rejected Qty must be equal to Received quantity for Item {0},hyväksyttyjen + hylättyjen yksikkömäärä on sama kuin tuotteiden vastaanotettu määrä {0}
 DocType: Item,Supply Raw Materials for Purchase,toimita raaka-aineita ostoon
 apps/erpnext/erpnext/stock/get_item_details.py +133,Item {0} must be a Purchase Item,tuotteen {0} tulee olla ostotuote
 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","lataa mallipohja, täytä tarvittavat tiedot ja liitä muokattu tiedosto, kaikki päivämäärä- ja työntekijäyhdistelmät tulee malliin valitun kauden ja olemassaolevien osallistumistietueiden mukaan"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +446,Item {0} is not active or end of life has been reached,tuote {0} ei ole aktiivinen tai sen elinkaari loppu
 DocType: Time Log Batch,Will be updated after Sales Invoice is Submitted.,päivitetään kun myyntilasku on lähetetty
-apps/erpnext/erpnext/controllers/accounts_controller.py +493,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","sisällytä verorivi {0} tuotteen tasoon, verot riveillä {1} tulee myös sisällyttää"
+apps/erpnext/erpnext/controllers/accounts_controller.py +494,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","sisällytä verorivi {0} tuotteen tasoon, verot riveillä {1} tulee myös sisällyttää"
 apps/erpnext/erpnext/config/hr.py +90,Settings for HR Module,henkilöstömoduulin asetukset
 DocType: SMS Center,SMS Center,tekstiviesti keskus
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +78,Straightening,suoristus
 DocType: BOM Replace Tool,New BOM,uusi BOM
 apps/erpnext/erpnext/config/projects.py +28,Batch Time Logs for billing.,erän aikaloki laskutukseen
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +15,Countergravity casting,vastagravitaatio valu
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +30,Newsletter has already been sent,Uutiskirje on jo lähetetty
 DocType: Lead,Request Type,pyydä tyyppi
 DocType: Leave Application,Reason,syy
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +14,Broadcasting,julkaisu
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +140,Execution,suoritus
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +364,The first user will become the System Manager (you can change this later).,ensimmäisestä käyttäjästä tulee järjestelmänhallitsia (voit muuttaa asetusta myöhemmin)
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,julkaisu
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +140,Execution,suoritus
+apps/erpnext/erpnext/public/js/setup_wizard.js +114,The first user will become the System Manager (you can change this later).,ensimmäisestä käyttäjästä tulee järjestelmänhallitsia (voit muuttaa asetusta myöhemmin)
 apps/erpnext/erpnext/config/manufacturing.py +39,Details of the operations carried out.,toteutetuneiden toimien lisätiedot
 DocType: Serial No,Maintenance Status,"huolto, tila"
 apps/erpnext/erpnext/config/stock.py +263,Items and Pricing,tuotteet ja hinnoittelu
@@ -205,7 +198,6 @@
 DocType: Pricing Rule,Discount on Price List Rate (%),hinnaston alennus taso (%)
 apps/frappe/frappe/public/js/frappe/form/print.js +96,Start,alku
 DocType: User,First Name,etunimi
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +12,Full-mold casting,täysimuovaus valu
 DocType: Offer Letter,Select Terms and Conditions,valitse ehdot ja säännöt
 DocType: Production Planning Tool,Sales Orders,myyntitilaukset
 DocType: Purchase Taxes and Charges,Valuation,arvo
@@ -217,8 +209,7 @@
 DocType: Bank Reconciliation,Bank Account,pankkitili
 DocType: Leave Type,Allow Negative Balance,hyväksy negatiivinen tase 
 DocType: Selling Settings,Default Territory,oletus alue
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +53,Television,televisio
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +138,Gashing,hammasväli
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,televisio
 DocType: Production Order Operation,Updated via 'Time Log',päivitetty 'aikaloki' kautta
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +82,Account {0} does not belong to Company {1},tili {0} ei kuulu yritykselle {1}
 DocType: Naming Series,Series List for this Transaction,sarjalistaus tähän tapahtumaan
@@ -233,14 +224,13 @@
 DocType: Leave Allocation,Add unused leaves from previous allocations,Lisää käyttämättömät lähtee edellisestä määrärahoista
 apps/erpnext/erpnext/controllers/recurring_document.py +206,Next Recurring {0} will be created on {1},seuraava toistuva {0} tehdään {1}:n
 DocType: Newsletter List,Total Subscribers,alihankkijat yhteensä
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +575,Contact Name,"yhteystiedot, nimi"
+,Contact Name,"yhteystiedot, nimi"
 DocType: Production Plan Item,SO Pending Qty,odottavat myyntitilaukset yksikkömäärä
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,tee palkkalaskelma edellä mainittujen kriteerien mukaan
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,Pyydä ostaa.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +107,Double housing,tuplakotelointi
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +156,Only the selected Leave Approver can submit this Leave Application,vain valtuutettu käyttäjä voi hyväksyä tämän poistumissovelluksen
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +171,Only the selected Leave Approver can submit this Leave Application,vain valtuutettu käyttäjä voi hyväksyä tämän poistumissovelluksen
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,Lievittää Date on oltava suurempi kuin päivämäärä Liittymisen
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +172,Leaves per Year,poistumiset vuodessa
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +172,Leaves per Year,poistumiset vuodessa
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup > Settings > Naming Series,nimeä sarjat {0} määritykset> asetukset> nimeä sarjat
 DocType: Time Log,Will be updated when batched.,päivitetään keräilyssä
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +104,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,"rivi {0}: täppää 'ennakko' kohdistettu tilille {1}, mikäli tämä on ennakkokirjaus"
@@ -249,25 +239,24 @@
 DocType: Item Website Specification,Item Website Specification,tuote verkkosivujen asetukset
 DocType: Dropbox Backup,Dropbox Access Key,Dropbox pääsy tunnus
 DocType: Payment Tool,Reference No,Viitenumero
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +348,Leave Blocked,poistuminen estetty
-apps/erpnext/erpnext/stock/doctype/item/item.py +535,Item {0} has reached its end of life on {1},tuote {0} on saavuttanut elinkaaren lopun {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +392,Leave Blocked,poistuminen estetty
+apps/erpnext/erpnext/stock/doctype/item/item.py +539,Item {0} has reached its end of life on {1},tuote {0} on saavuttanut elinkaaren lopun {1}
 apps/erpnext/erpnext/accounts/utils.py +339,Annual,Vuotuinen
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,"varaston täsmäytys, tuote"
 DocType: Stock Entry,Sales Invoice No,"myyntilasku, nro"
 DocType: Material Request Item,Min Order Qty,min tilaus yksikkömäärä
 DocType: Lead,Do Not Contact,älä ota yhteyttä
 DocType: Sales Invoice,The unique id for tracking all recurring invoices. It is generated on submit.,uniikki tunnus toistuvan laskutuksen jäljittämiseen muodostetaan lähetettäessä
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +93,Software Developer,ohjelmistokehittäjä
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +93,Software Developer,ohjelmistokehittäjä
 DocType: Item,Minimum Order Qty,minimi tilaus yksikkömäärä
 DocType: Pricing Rule,Supplier Type,toimittaja tyyppi
 DocType: Item,Publish in Hub,Julkaista Hub
 ,Terretory,alue
-apps/erpnext/erpnext/stock/doctype/item/item.py +555,Item {0} is cancelled,tuote {0} on peruutettu
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +598,Material Request,materiaalipyyntö
+apps/erpnext/erpnext/stock/doctype/item/item.py +559,Item {0} is cancelled,tuote {0} on peruutettu
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +607,Material Request,materiaalipyyntö
 DocType: Bank Reconciliation,Update Clearance Date,päivitä tilityspäivä
 DocType: Item,Purchase Details,oston lisätiedot
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +323,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},tuotetta {0} ei löydy 'raaka-aineet toimitettu' ostotilaus taulukko {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +129,Wire brushing,johdotus harjaus
 DocType: Employee,Relation,Suhde
 DocType: Shipping Rule,Worldwide Shipping,Maailmanlaajuinen Toimitus
 apps/erpnext/erpnext/config/selling.py +23,Confirmed orders from Customers.,asiakkailta vahvistetut tilaukset
@@ -283,12 +272,11 @@
 DocType: Supplier,Address HTML,osoite HTML
 DocType: Lead,Mobile No.,Mobile No.
 DocType: Maintenance Schedule,Generate Schedule,muodosta aikataulu
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +81,Hubbing,upottava
 DocType: Purchase Invoice Item,Expense Head,"kulu, otsikko"
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +86,Please select Charge Type first,valitse ensin veloitus tyyppi
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,Viimeisin
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +395,Max 5 characters,Max 5 merkkiä
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +195,Select Your Language,valitse kieli
+apps/erpnext/erpnext/public/js/setup_wizard.js +143,Max 5 characters,Max 5 merkkiä
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +245,Select Your Language,valitse kieli
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,luettelon ensimmäinen poistumis hyväksyjä on oletushyväksyjä
 DocType: Manufacturing Settings,"Disables creation of time logs against Production Orders.
 Operations shall not be tracked against Production Order","poistaa käytöstä aikalokin kohdistuksen tuotannon tilaukseen, tapahtumat ei kohdistu tuotannon tilaukseen"
@@ -300,8 +288,6 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +34,Item {0} must be Service Item,tuote {0} tulee olla palvelutuote
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +303,Completed Qty can not be greater than 'Qty to Manufacture',"valmiit yksikkömäärä ei voi olla suurempi kuin ""tuotannon määrä"""
 DocType: DocType,Administrator,ylläpitäjä
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +136,Laser drilling,Laser poraus
-DocType: Stock UOM Replace Utility,New Stock UOM,uusi varasto UOM
 DocType: Period Closing Voucher,Closing Account Head,tilin otsikon sulkeminen
 DocType: Employee,External Work History,ulkoinen työhistoria
 apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,kiertoviite vihke
@@ -310,18 +296,15 @@
 DocType: Lead,Industry,teollisuus
 DocType: Employee,Job Profile,Job Profile
 DocType: Newsletter,Newsletter,Tiedote
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +84,Hydroforming,hydro muovaus
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +49,Necking,Necking
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,ilmoita automaattisen materiaalipyynnön luomisesta sähköpostitse
 DocType: Journal Entry,Multi Currency,Multi Valuutta
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +51,Item is updated,tuote päivitetty
 DocType: Async Task,System Manager,järjestelmähallinta
 DocType: Payment Reconciliation Invoice,Invoice Type,lasku tyyppi
 DocType: Sales Invoice Item,Delivery Note,lähete
 DocType: Dropbox Backup,Allow Dropbox Access,salli Dropbox pääsy
 apps/erpnext/erpnext/config/learn.py +72,Setting up Taxes,verojen perusmääritykset
 apps/erpnext/erpnext/accounts/utils.py +189,Payment Entry has been modified after you pulled it. Please pull it again.,"maksukirjausta on muutettu siirron jälkeen, siirrä se uudelleen"
-apps/erpnext/erpnext/stock/doctype/item/item.py +343,{0} entered twice in Item Tax,{0} vero on kirjattu kahdesti
+apps/erpnext/erpnext/stock/doctype/item/item.py +347,{0} entered twice in Item Tax,{0} vero on kirjattu kahdesti
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +105,Summary for this week and pending activities,Yhteenveto tällä viikolla ja keskeneräisten toimien
 DocType: Workstation,Rent Cost,vuokrakustannukset
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +74,Please select month and year,Ole hyvä ja valitse kuukausi ja vuosi
@@ -338,23 +321,21 @@
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,"taso, jolla asiakkaan valuutta muunnetaan asiakkaan käyttämäksi perusvaluutaksi"
 DocType: Features Setup,"Available in BOM, Delivery Note, Purchase Invoice, Production Order, Purchase Order, Purchase Receipt, Sales Invoice, Sales Order, Stock Entry, Timesheet","BOM on saatavana, lähetteessä, ostolaskussa, tuotannon tilauksessa, ostotilauksessa, ostokuitissa, myyntilaskussa, myyntilauksessa, varaston kirjauksessa ja aikataulukossa"
 DocType: Item Tax,Tax Rate,vero taso
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Select Item,valitse tuote
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +540,Select Item,valitse tuote
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +143,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","tuote: {0} hallinnoidaan eräkohtaisesti, eikä sitä voi päivittää käyttämällä varaston täsmäytystä, käytä varaston kirjausta"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +259,Purchase Invoice {0} is already submitted,ostolasku {0} on lähetetty
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +262,Purchase Invoice {0} is already submitted,ostolasku {0} on lähetetty
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Batch No must be same as {1} {2},Rivi # {0}: Erä on oltava sama kuin {1} {2}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Convert to non-Group,muunna pois ryhmästä
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +55,Purchase Receipt must be submitted,ostokuitti on lähetettävä
-DocType: Stock UOM Replace Utility,Current Stock UOM,nykyinen varasto UOM
 apps/erpnext/erpnext/config/stock.py +53,Batch (lot) of an Item.,erä (erä-tuote) tuotteesta
 DocType: C-Form Invoice Detail,Invoice Date,laskun päiväys
 DocType: GL Entry,Debit Amount,Debit Määrä
 apps/erpnext/erpnext/accounts/party.py +223,There can only be 1 Account per Company in {0} {1},Ei voi olla vain 1 tilini kohden Yhtiö {0} {1}
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Your email address,Sähköpostiosoitteesi
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +194,Please see attachment,katso liitetiedosto
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +203,Please see attachment,katso liitetiedosto
 DocType: Purchase Order,% Received,% vastaanotettu
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +109,Water jet cutting,vesisuihku leikkaus
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +24,Setup Already Complete!!,määritys on valmis
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +20,Setup Already Complete!!,määritys on valmis
 ,Finished Goods,valmiit tavarat
 DocType: Delivery Note,Instructions,ohjeet
 DocType: Quality Inspection,Inspected By,tarkastanut
@@ -369,6 +350,7 @@
 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.,"älä luo asiakas-, tai toimittajatilejä, ne laaditaan suoraan asiakas- / toimittaja valvonnassa"
 DocType: Currency Exchange,Currency Exchange,valuutanvaihto
 DocType: Purchase Invoice Item,Item Name,tuotteen nimi
+DocType: Authorization Rule,Approving User  (above authorized value),Hyväksymisestä User (edellä valtuutettu arvo)
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Credit Balance,"kredit, tase"
 DocType: Employee,Widowed,jäänyt leskeksi
 DocType: Production Planning Tool,"Items to be requested which are ""Out of Stock"" considering all warehouses based on projected qty and minimum order qty","pyydetyt tuotteet jotka ovat ""loppu"" kaikista varastoista ennustetun tuote yksikkömäärän ja minimi tilaus yksikkömäärän mukaan"
@@ -378,11 +360,10 @@
 ,Purchase Register,Osto Rekisteröidy
 DocType: Landed Cost Item,Applicable Charges,sovellettavat maksut
 DocType: Workstation,Consumable Cost,käytettävät kustannukset
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,{0} ({1}) must have role 'Leave Approver',{0} ({1}) tulee olla rooli 'poistumisen hyväksyjä'
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +167,{0} ({1}) must have role 'Leave Approver',{0} ({1}) tulee olla rooli 'poistumisen hyväksyjä'
 DocType: Purchase Receipt,Vehicle Date,Ajoneuvo Päivämäärä
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +39,Medical,Lääketieteellinen
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +39,Medical,Lääketieteellinen
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,häviön syy
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +36,Tube beading,putki saumaus
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},työasema on suljettu seuraavina päivinä lomapäivien {0} mukaan
 DocType: Employee,Single,yksittäinen
 DocType: Issue,Attachment,Liite
@@ -403,10 +384,8 @@
 DocType: Account,Is Group,on ryhmä
 DocType: Stock Settings,Automatically Set Serial Nos based on FIFO,Automaattisesti Serial nro perustuu FIFO
 DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,tarkista toimittajan laskunumeron yksilöllisyys
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +31,Thermoforming,lämpö muovaus
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +66,Slitting,halkaisu
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +57,'To Case No.' cannot be less than 'From Case No.','aloitustapahtuma nro' ei voi olla pienempi 'päättymistapahtuma nro'
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +104,Non Profit,nettotulos
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +104,Non Profit,nettotulos
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_list.js +7,Not Started,Ei aloitettu
 DocType: Lead,Channel Partner,välityskumppani
 DocType: Account,Old Parent,Vanha Parent
@@ -415,13 +394,12 @@
 apps/erpnext/erpnext/config/manufacturing.py +74,Global settings for all manufacturing processes.,yleiset asetukset valmistusprosesseille
 DocType: Accounts Settings,Accounts Frozen Upto,tilit jäädytetty toistaiseksi / asti
 DocType: SMS Log,Sent On,lähetetty
-apps/erpnext/erpnext/stock/doctype/item/item.py +512,Attribute {0} selected multiple times in Attributes Table,Taito {0} valittu useita kertoja määritteet taulukossa
+apps/erpnext/erpnext/stock/doctype/item/item.py +516,Attribute {0} selected multiple times in Attributes Table,Taito {0} valittu useita kertoja määritteet taulukossa
 DocType: Sales Order,Not Applicable,ei sovellettu
 apps/erpnext/erpnext/config/hr.py +140,Holiday master.,lomien valvonta
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +19,Shell molding,kuoren muovaus
 DocType: Material Request Item,Required Date,pyydetty päivä
 DocType: Delivery Note,Billing Address,laskutusosoite
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +644,Please enter Item Code.,syötä tuotekoodi
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +648,Please enter Item Code.,syötä tuotekoodi
 DocType: BOM,Costing,kustannuslaskenta
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount",täpättäessä veron arvomäärää pidetään jo sisällettynä tulostetasoon / tulostemäärään
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,yksikkömäärä yhteensä
@@ -431,7 +409,7 @@
 DocType: Item Attribute,To Range,Laitumelle
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,arvopaperit ja talletukset
 DocType: Features Setup,Imports,tuonnit
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +144,Adhesive bonding,pitävä sidos
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +77,Total leaves allocated is mandatory,Yhteensä lehdet jaetaan on pakollinen
 DocType: Job Opening,Description of a Job Opening,avoimen työn kuvaus
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +102,Pending activities for today,Vireillä toimintaa tänään
 apps/erpnext/erpnext/config/hr.py +28,Attendance record.,osallistumis tietue
@@ -439,26 +417,25 @@
 DocType: Sales Order Item,Used for Production Plan,käytetään tuotannon suunnitelmassa
 DocType: System Settings,Loading...,Ladataan ...
 DocType: DocField,Password,Salasana
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +155,Fused deposition modeling,sulautustallennus mallinnus
 DocType: Manufacturing Settings,Time Between Operations (in mins),toimintojen välinen aika (minuuteissa)
 DocType: Customer,Buyer of Goods and Services.,ostaja tavarat ja palvelut
 DocType: Journal Entry,Accounts Payable,maksettava tilit
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +24,Add Subscribers,lisätä tilaajia
 apps/erpnext/erpnext/public/js/feature_setup.js +220,""" does not exists",""" ei ole olemassa"
 DocType: Pricing Rule,Valid Upto,voimassa asti
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +564,List a few of your customers. They could be organizations or individuals.,Luetella muutamia asiakkaisiin. Ne voivat olla organisaatioita tai yksilöitä.
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,List a few of your customers. They could be organizations or individuals.,Luetella muutamia asiakkaisiin. Ne voivat olla organisaatioita tai yksilöitä.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Direct Income,suorat tulot
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +33,"Can not filter based on Account, if grouped by Account",ei voi suodattaa tileittäin mkäli ryhmitelty tileittäin
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +88,Administrative Officer,hallintovirkailija
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Administrative Officer,hallintovirkailija
 DocType: Payment Tool,Received Or Paid,Vastaanotettu tai maksettu
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +318,Please select Company,Ole hyvä ja valitse Company
 DocType: Stock Entry,Difference Account,erotili
 apps/erpnext/erpnext/projects/doctype/task/task.py +44,Cannot close task as its dependant task {0} is not closed.,"ei voi sulkea sillä se on toisesta riippuvainen tehtävä {0}, tehtävää ei ole suljettu"
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +305,Please enter Warehouse for which Material Request will be raised,syötä varasto jonne materiaalipyyntö ohjataan
 DocType: Production Order,Additional Operating Cost,lisätoimintokustannukset
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +20,Cosmetics,kosmetiikka
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,kosmetiikka
 DocType: DocField,Type,tyyppi
-apps/erpnext/erpnext/stock/doctype/item/item.py +417,"To merge, following properties must be same for both items",seuraavat ominaisuudet tulee olla samat molemmilla tuotteilla jotta ne voi sulauttaa
+apps/erpnext/erpnext/stock/doctype/item/item.py +421,"To merge, following properties must be same for both items",seuraavat ominaisuudet tulee olla samat molemmilla tuotteilla jotta ne voi sulauttaa
 DocType: Communication,Subject,aihe
 DocType: Shipping Rule,Net Weight,Netto
 DocType: Employee,Emergency Phone,hätänumero
@@ -468,7 +445,6 @@
 DocType: Journal Entry,Difference (Dr - Cr),erotus (€ - TV)
 DocType: Account,Profit and Loss,tuloslaskelma
 apps/erpnext/erpnext/config/stock.py +293,Managing Subcontracting,Toimitusjohtaja Alihankinta
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +58,New UOM must NOT be of type Whole Number,uusi UOM ei voi olla tyyppi kokonaisluku
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Furniture and Fixture,kalusteet ja tarvikkeet
 DocType: Quotation,Rate at which Price list currency is converted to company's base currency,"taso, jolla hinnasto valuutta muunnetaan yrityksen käyttämäksi perusvaluutaksi"
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Account {0} does not belong to company: {1},tili {0} ei kuulu yritykselle: {1}
@@ -487,14 +463,14 @@
 DocType: Purchase Invoice,Supplier Invoice No,toimittajan laskun nro
 DocType: Territory,For reference,viitteeseen
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +154,"Cannot delete Serial No {0}, as it is used in stock transactions","Voi poistaa Sarjanumero {0}, koska sitä käytetään varastotapahtumat"
-apps/erpnext/erpnext/public/js/account_tree_grid.js +52,Closing (Cr),sulku (cr)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +227,Closing (Cr),sulku (cr)
 DocType: Serial No,Warranty Period (Days),takuuaika (päivää)
 DocType: Installation Note Item,Installation Note Item,asennus huomautus tuote
 ,Pending Qty,Odottaa Kpl
 DocType: Job Applicant,Thread HTML,HTML säije
 DocType: Company,Ignore,ohita
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +86,SMS sent to following numbers: {0},tekstiviesti lähetetään seuraaviin numeroihin: {0}
-apps/erpnext/erpnext/controllers/buying_controller.py +135,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,toimittajan varasto pakollinen alihankinnan ostokuittin
+apps/erpnext/erpnext/controllers/buying_controller.py +126,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,toimittajan varasto pakollinen alihankinnan ostokuittin
 DocType: Pricing Rule,Valid From,voimassa alkaen
 DocType: Sales Invoice,Total Commission,provisio yhteensä
 DocType: Pricing Rule,Sales Partner,myyntikumppani
@@ -502,7 +478,7 @@
 DocType: Monthly Distribution,"**Monthly Distribution** helps you distribute your budget across months if you have seasonality in your business.
 
 To distribute a budget using this distribution, set this **Monthly Distribution** in the **Cost Center**","**toimitusten kk jaksotus** auttaa jakamaan budjettia eri kuukausille, jos on kausivaihtelua. **toimitusten kk jaksotus** otetaan **kustannuspaikka** kohdassa."
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +183,No records found in the Invoice table,tietuetta ei löydy laskutaulukosta
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +130,No records found in the Invoice table,tietuetta ei löydy laskutaulukosta
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +20,Please select Company and Party Type first,valitse ensin yritys ja osapuoli tyyppi
 apps/erpnext/erpnext/config/accounts.py +84,Financial / accounting year.,tili- / kirjanpitokausi
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged",sarjanumeroita ei voi yhdistää
@@ -518,25 +494,25 @@
 DocType: Sales Order,Billing and Delivery Status,Laskutus ja Toiminnan tila
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Toista asiakkaat
 DocType: Leave Control Panel,Allocate,Jakaa
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +16,Previous,Edellinen
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard_page.html +16,Previous,Edellinen
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +620,Sales Return,Myynti Return
 DocType: Production Planning Tool,Select Sales Orders from which you want to create Production Orders.,"valitse ne myyntitilaukset, josta haluat tehdä tuotannon tilauksen"
 DocType: Item,Delivered by Supplier (Drop Ship),Toimitetaan Toimittaja (Drop Ship)
 apps/erpnext/erpnext/config/hr.py +120,Salary components.,palkkakomponentteja
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,tietokanta potentiaalisista asiakkaista
+DocType: Authorization Rule,Customer or Item,Asiakas tai Tuote
 apps/erpnext/erpnext/config/crm.py +17,Customer database.,asiakasrekisteri
 DocType: Quotation,Quotation To,tarjoukseen
 DocType: Lead,Middle Income,keskitason tulo
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),Opening (Cr)
 apps/erpnext/erpnext/accounts/utils.py +193,Allocated amount can not be negative,kohdennettu arvomäärä ei voi olla negatiivinen
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +123,Tumbling,rumpuhionta
 DocType: Purchase Order Item,Billed Amt,"laskutettu, pankkipääte"
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,"perustettu varasto, minne ​varastokirjaukset tehdään"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +92,Reference No & Reference Date is required for {0},viitenumero ja viitepäivä vaaditaan{0}
 DocType: Event,Wednesday,keskiviikko
 DocType: Sales Invoice,Customer's Vendor,asiakkaan tosite
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +214,Production Order is Mandatory,tuotannon tilaus vaaditaan
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +139,Proposal Writing,Ehdotus Kirjoittaminen
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,Proposal Writing,Ehdotus Kirjoittaminen
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,toinen myyjä {0} on jo olemassa samalla työntekijä tunnuksella
 apps/erpnext/erpnext/stock/stock_ledger.py +336,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},negatiivisen varaston virhe ({6}) tuotteelle {0} varasto {1}:ssa {2} {3}:lla {4} {5}:ssa
 DocType: Fiscal Year Company,Fiscal Year Company,yrityksen tilikausi
@@ -559,7 +535,7 @@
 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.","hinnoittelusääntöjen perusteet suodatetaan asiakkaan, asiakasryhmän, alueen, toimittajan, toimittaja tyypin, myyntikumppanin jne mukaan"
 apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.py +179,Please install dropbox python module,asenna Dropbox python moduuli
 DocType: Employee,Passport Number,passin numero
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +82,Manager,hallinta
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Manager,hallinta
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +494,From Purchase Receipt,ostokuitista
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +219,Same item has been entered multiple times.,sama tuote on syötetty monta kertaa
 DocType: SMS Settings,Receiver Parameter,vastaanottoparametri
@@ -567,10 +543,9 @@
 DocType: Sales Person,Sales Person Targets,myyjän tavoitteet
 apps/frappe/frappe/public/js/frappe/form/workflow.js +116,To,(lle)
 apps/frappe/frappe/templates/base.html +145,Please enter email address,syötä sähköpostiosoite
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +35,End tube forming,putkenmuotoilun loppu
 DocType: Production Order Operation,In minutes,minuutteina
 DocType: Issue,Resolution Date,johtopäätös päivä
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +635,Please set default Cash or Bank account in Mode of Payment {0},valitse oletusmaksutapa kassa- tai pankkitili maksulle {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +637,Please set default Cash or Bank account in Mode of Payment {0},valitse oletusmaksutapa kassa- tai pankkitili maksulle {0}
 DocType: Selling Settings,Customer Naming By,asiakkaan nimennyt
 apps/erpnext/erpnext/accounts/doctype/account/account.js +67,Convert to Group,muunna ryhmäksi
 DocType: Activity Cost,Activity Type,aktiviteettimuoto
@@ -578,12 +553,12 @@
 DocType: Customer,Fixed Days,säädetyt päivät
 DocType: Sales Invoice,Packing List,pakkausluettelo
 apps/erpnext/erpnext/config/buying.py +28,Purchase Orders given to Suppliers.,Ostotilaukset annetaan Toimittajat.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +43,Publishing,Kustannustoiminta
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +43,Publishing,Kustannustoiminta
 DocType: Activity Cost,Projects User,Projektit Käyttäjä
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Consumed,käytetty
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +198,{0}: {1} not found in Invoice Details table,{0}: {1} ei löydy laskun lisätiedot taulukosta
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,{0}: {1} not found in Invoice Details table,{0}: {1} ei löydy laskun lisätiedot taulukosta
 DocType: Company,Round Off Cost Center,pyöristys kustannuspaikka
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +208,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,huoltokäynti {0} on peruttava ennen myyntitilauksen perumista
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +203,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,huoltokäynti {0} on peruttava ennen myyntitilauksen perumista
 DocType: Material Request,Material Transfer,materiaalisiirto
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +56,Opening (Dr),perustaminen (€)
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},Kirjoittamisen aikaleima on sen jälkeen {0}
@@ -595,7 +570,6 @@
 DocType: Pricing Rule,Sales Manager,myynninhallinta
 apps/frappe/frappe/public/js/frappe/model/model.js +492,Rename,Nimetä uudelleen
 DocType: Journal Entry,Write Off Amount,poiston arvomäärä
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +52,Bending,Taipuva
 apps/frappe/frappe/core/page/user_permissions/user_permissions.js +246,Allow User,Salli Käyttäjä
 DocType: Journal Entry,Bill No,Bill No
 DocType: Purchase Invoice,Quarterly,Neljännesvuosittain
@@ -605,17 +579,16 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Please enter item details,syötä tuotten lisätiedot
 DocType: Purchase Receipt,Other Details,muut lisätiedot
 DocType: Account,Accounts,tilit
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +67,Marketing,Markkinointi
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +65,Straight shearing,suora jako
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +67,Marketing,Markkinointi
 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.,"jäljitä tuotteen myynti- ja ostotositteet sarjanumeron mukaan, tätä käytetään myös tavaran takuutietojen jäljitykseen"
 DocType: Purchase Receipt Item Supplied,Current Stock,nykyinen varasto
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +99,Rejected Warehouse is mandatory against regected item,Hylätty Warehouse on pakollista vastaan ​​regected kohde
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +102,Rejected Warehouse is mandatory against regected item,Hylätty Warehouse on pakollista vastaan ​​regected kohde
 DocType: Account,Expenses Included In Valuation,"kulut, jotka sisältyy arvoon"
 DocType: Employee,Provide email id registered in company,tarkista sähköpostitunnuksen rekisteröinti yritykselle
 DocType: Hub Settings,Seller City,myyjä kaupunki
 DocType: Email Digest,Next email will be sent on:,Seuraava sähköpostiviesti lähetetään:
 DocType: Offer Letter Term,Offer Letter Term,Tarjoa Kirje Term
-apps/erpnext/erpnext/stock/doctype/item/item.py +492,Item has variants.,tuotteella on useampia malleja
+apps/erpnext/erpnext/stock/doctype/item/item.py +496,Item has variants.,tuotteella on useampia malleja
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,tuotetta {0} ei löydy
 DocType: Bin,Stock Value,varastoarvo
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,tyyppipuu
@@ -624,10 +597,9 @@
 DocType: Material Request Item,Quantity and Warehouse,Määrä ja Warehouse
 DocType: Sales Invoice,Commission Rate (%),provisio taso (%)
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +172,"Against Voucher Type must be one of Sales Order, Sales Invoice or Journal Entry","tositetyypin kirjaus tulee kohdistaa myyntitilaukseen, myyntilaskuun tai päiväkirjaan"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +139,Biomachining,Biomachining
 apps/erpnext/erpnext/setup/utils.py +89,Unable to find exchange rate,Ei löydy valuuttakurssi
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +7,Aerospace,ilmakehä
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +19,Welcome,tervetuloa
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +7,Aerospace,ilmakehä
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +40,Welcome,tervetuloa
 DocType: Journal Entry,Credit Card Entry,luottokorttikirjaus
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +18,Task Subject,tehtävän aihe
 apps/erpnext/erpnext/config/stock.py +33,Goods received from Suppliers.,tavarat tastaanotettu toimittajilta
@@ -650,19 +622,19 @@
 DocType: Employee,Cell Number,solunumero
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Menetetty
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +120,You can not enter current voucher in 'Against Journal Entry' column,kyseistä tositetta ei voi kohdistaa 'päiväkirjakirjaus' sarakkeessa
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +25,Energy,energia
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,energia
 DocType: Opportunity,Opportunity From,tilaisuuteen
 apps/erpnext/erpnext/config/hr.py +33,Monthly salary statement.,kuukausipalkka tosite
 DocType: Item Group,Website Specifications,Verkkosivujen tiedot
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +205,New Account,uusi tili
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +21,{0}: From {0} of type {1},{0}: valitse {0} tyypistä {1}
-apps/erpnext/erpnext/controllers/buying_controller.py +283,Row {0}: Conversion Factor is mandatory,Rivi {0}: Conversion Factor on pakollista
+apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,Rivi {0}: Conversion Factor on pakollista
 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.,"kirjanpidon kirjaukset voidaan kodistaa ​​jatkosidoksiin, kohdistus ryhmiin ei ole sallittu"
 DocType: ToDo,High,korkeus
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +361,Cannot deactivate or cancel BOM as it is linked with other BOMs,BOM:ia ei voi poistaa tai peruuttaa sillä muita BOM:ja on linkitettynä siihen
 DocType: Opportunity,Maintenance,huolto
 DocType: User,Male,Uros
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +182,Purchase Receipt number required for Item {0},ostokuitin numero vaaditaan tuotteelle {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +183,Purchase Receipt number required for Item {0},ostokuitin numero vaaditaan tuotteelle {0}
 DocType: Item Attribute Value,Item Attribute Value,"tuotetuntomerkki, arvo"
 apps/erpnext/erpnext/config/crm.py +64,Sales campaigns.,myynnin kampanjat
 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.
@@ -691,10 +663,9 @@
 DocType: Address,Personal,henkilökohtainen
 DocType: Expense Claim Detail,Expense Claim Type,kuluvaatimuksen tyyppi
 DocType: Shopping Cart Settings,Default settings for Shopping Cart,ostoskorin oletusasetukset
-apps/erpnext/erpnext/controllers/accounts_controller.py +324,"Journal Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","päiväkirjakirjaus {0} kohdistuu tilaukseen {1}, täppää mikäli se tulee siirtää etukäteen tähän laskuun"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +13,Biotechnology,Biotekniikka
+apps/erpnext/erpnext/controllers/accounts_controller.py +325,"Journal Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","päiväkirjakirjaus {0} kohdistuu tilaukseen {1}, täppää mikäli se tulee siirtää etukäteen tähän laskuun"
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +13,Biotechnology,Biotekniikka
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Office Maintenance Expenses,toimitilan huoltokulut
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +53,Hemming,hemming
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +66,Please enter Item first,Anna Kohta ensin
 DocType: Account,Liability,vastattavat
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +62,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,sanktioitujen arvomäärä ei voi olla suurempi kuin vaatimuksien arvomäärä rivillä {0}.
@@ -707,10 +678,10 @@
 DocType: Company,Default Bank Account,oletus pankkitili
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +47,"To filter based on Party, select Party Type first",valitse osapuoli tyyppi saadaksesi osapuolen mukaisen suodatuksen
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},'varastonpäivitys' täppyä ei voi käyttää tuotteita ei ole toimitettu {0} kautta
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Nos,Nos
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Nos,Nos
 DocType: Item,Items with higher weightage will be shown higher,tuotteet joilla on korkeampi painoarvo nätetään ylempänä
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,pankin täsmäytys lisätiedot
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +627,My Invoices,omat laskut
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +629,My Invoices,omat laskut
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,Yksikään työntekijä ei löytynyt
 DocType: Purchase Order,Stopped,pysäytetty
 DocType: Item,If subcontracted to a vendor,alihankinta toimittajalle
@@ -729,35 +700,33 @@
 DocType: Features Setup,"To enable ""Point of Sale"" features",Jotta &quot;Point of Sale&quot; ominaisuuksia
 DocType: Bin,Moving Average Rate,liukuva keskiarvo taso
 DocType: Production Planning Tool,Select Items,valitse tuotteet
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,{0} against Bill {1} dated {2},{0} kuittia vastaan {1} ​​päivätty {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +328,{0} against Bill {1} dated {2},{0} kuittia vastaan {1} ​​päivätty {2}
 DocType: Comment,Reference Name,Viite Name
 DocType: Maintenance Visit,Completion Status,katselmus tila
 DocType: Sales Invoice Item,Target Warehouse,tavoite varasto
 DocType: Item,Allow over delivery or receipt upto this percent,Salli yli toimitus- tai kuitti lähetettävään tähän prosenttia
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +49,Expected Delivery Date cannot be before Sales Order Date,odotettu toimituspäivä ei voi olla ennen myyntitilauksen päivää
 DocType: Upload Attendance,Import Attendance,tuo osallistuminen
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +17,All Item Groups,kaikki tuoteryhmät
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +17,All Item Groups,kaikki tuoteryhmät
 DocType: Process Payroll,Activity Log,aktiivisuus loki
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +30,Net Profit / Loss,netto voitto/tappio
 apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,muodosta automaattinen viesti toiminnon lähetyksessä
 DocType: Production Order,Item To Manufacture,tuote valmistukseen
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +16,Permanent mold casting,Pysyvä muotti valu
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} tila on {2}
 apps/erpnext/erpnext/config/learn.py +172,Purchase Order to Payment,Ostotilaus to Payment
 DocType: Sales Order Item,Projected Qty,ennustettu yksikkömäärä
 DocType: Sales Invoice,Payment Due Date,maksun eräpäivä
 DocType: Newsletter,Newsletter Manager,uutiskirjehallinta
-apps/erpnext/erpnext/stock/doctype/item/item.js +229,Item Variant {0} already exists with same attributes,Tuote Variant {0} on jo olemassa samoja ominaisuuksia
+apps/erpnext/erpnext/stock/doctype/item/item.js +231,Item Variant {0} already exists with same attributes,Tuote Variant {0} on jo olemassa samoja ominaisuuksia
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening','avautuu'
 DocType: Notification Control,Delivery Note Message,lähetteen vieti
 DocType: Expense Claim,Expenses,kulut
 DocType: Item Variant Attribute,Item Variant Attribute,Tuote Variant Taito
 ,Purchase Receipt Trends,Ostokuitti Trendit
 DocType: Appraisal,Select template from which you want to get the Goals,"valitse mallipohja, johon haluat asettaa tavoitteet"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +77,Research & Development,Tutkimus ja kehitys
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Research & Development,Tutkimus ja kehitys
 ,Amount to Bill,laskutettava arvomäärä
 DocType: Company,Registration Details,rekisteröinnin lisätiedot
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +75,Staking,ahtaus
 DocType: Item,Re-Order Qty,uudelleentilattava yksikkömäärä
 DocType: Leave Block List Date,Leave Block List Date,"poistu estoluettelo, päivä"
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +25,Scheduled to send to {0},aikataulutettu lähettämään {0}:lle
@@ -768,18 +737,16 @@
 DocType: Sales Invoice Item,Stock Details,Varastossa Tiedot
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Projekti Arvo
 apps/erpnext/erpnext/config/selling.py +304,Point-of-Sale,Point-of-Sale
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,Cannot carry forward {0},ei voi siirtää {0}
 apps/erpnext/erpnext/accounts/doctype/account/account.py +91,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","tilin tase on jo kredit, syötetyn arvon tulee olla 'tasapainossa' eli 'debet'"
 DocType: Account,Balance must be,taseen on oltava
 DocType: Hub Settings,Publish Pricing,Julkaise Hinnoittelu
 DocType: Notification Control,Expense Claim Rejected Message,kuluvaatimus hylätty viesti
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +145,Nailing,Naulaus
 ,Available Qty,saatava yksikkömäärä
 DocType: Purchase Taxes and Charges,On Previous Row Total,edellinen rivi yhteensä
 DocType: Salary Slip,Working Days,työpäivät
 DocType: Serial No,Incoming Rate,saapuva taso
 DocType: Packing Slip,Gross Weight,bruttopaino
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +410,The name of your company for which you are setting up this system.,"yrityksen nimi, jolle olet luomassa tätä järjestelmää"
+apps/erpnext/erpnext/public/js/setup_wizard.js +158,The name of your company for which you are setting up this system.,"yrityksen nimi, jolle olet luomassa tätä järjestelmää"
 DocType: HR Settings,Include holidays in Total no. of Working Days,"sisältää vapaapäiviä, työpäiviä yhteensä"
 DocType: Job Applicant,Hold,pidä
 DocType: Employee,Date of Joining,liittymispäivä
@@ -789,7 +756,6 @@
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +3,View Subscribers,näytä tilaajia
 DocType: Purchase Invoice Item,Purchase Receipt,Ostokuitti
 ,Received Items To Be Billed,Saivat kohteet laskuttamat
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +114,Abrasive blasting,räjäytys
 DocType: Employee,Ms,Ms
 apps/erpnext/erpnext/config/accounts.py +148,Currency exchange rate master.,valuuttataso valvonta
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +253,Unable to find Time Slot in the next {0} days for Operation {1},aika-aukkoa ei löydy seuraavaan {0} päivän toiminnolle {1}
@@ -801,7 +767,7 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +209,Serial No {0} does not belong to Item {1},sarjanumero {0} ei kuulu tuotteelle {1}
 DocType: Purchase Receipt Item Supplied,Required Qty,vaadittu yksikkömäärä
 DocType: Bank Reconciliation,Total Amount,kokonaisarvomäärä
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +32,Internet Publishing,internet julkaisu
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,internet julkaisu
 DocType: Production Planning Tool,Production Orders,tuotannon tilaukset
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +35,Balance Value,tase arvo
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,myyntihinnasto
@@ -812,7 +778,7 @@
 DocType: Supplier,Default Payable Accounts,oletus maksettava tilit
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,työntekijä {0} ei ole aktiivinen tai ei ole olemassa
 DocType: Features Setup,Item Barcode,tuote viivakoodi
-apps/erpnext/erpnext/stock/doctype/item/item.py +487,Item Variants {0} updated,tuotemallit {0} päivitetty
+apps/erpnext/erpnext/stock/doctype/item/item.py +491,Item Variants {0} updated,tuotemallit {0} päivitetty
 DocType: Quality Inspection Reading,Reading 6,Lukeminen 6
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,"ostolasku, edistynyt"
 DocType: Address,Shop,osta
@@ -821,7 +787,7 @@
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,"oletuspankki / rahatililleen päivittyy automaattisesti POS laskussa, kun tila on valittuna"
 DocType: Employee,Permanent Address Is,pysyvä osoite on
 DocType: Production Order Operation,Operation completed for how many finished goods?,Toiminto suoritettu kuinka monta valmiit tavarat?
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +491,The Brand,brändi
+apps/erpnext/erpnext/public/js/setup_wizard.js +237,The Brand,brändi
 apps/erpnext/erpnext/controllers/status_updater.py +163,Allowance for over-{0} crossed for Item {1}.,Avustus yli- {0} ristissä Kohta {1}.
 DocType: Employee,Exit Interview Details,poistu haastattelun lisätiedoista
 DocType: Item,Is Purchase Item,on ostotuote
@@ -841,16 +807,16 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Indirect Income,välilliset tulot
 DocType: Payment Tool,Set Payment Amount = Outstanding Amount,Aseta Maksusumma = jäljellä
 DocType: Contact Us Settings,Address Line 1,osoiterivi 1
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Variance,vaihtelu
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +392,Company Name,Yrityksen nimi
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +53,Variance,vaihtelu
+,Company Name,Yrityksen nimi
 DocType: SMS Center,Total Message(s),viestit yhteensä
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +515,Select Item for Transfer,talitse siirrettävä tuote
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +538,Select Item for Transfer,talitse siirrettävä tuote
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,Katso luettelo kaikista ohjevideot
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,"valitse pankin tilin otsikko, minne shekki/takaus talletetaan"
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,salli käyttäjän muokata hinnaston tasoa tapahtumissa
 DocType: Pricing Rule,Max Qty,max yksikkömäärä
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +106,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,rivi {0}: maksu kohdistettuna ​​myynti- / ostotilaukseen tulee aina merkitä ennakkomaksuksi
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +16,Chemical,kemiallinen
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,kemiallinen
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +693,All items have already been transferred for this Production Order.,kaikki tavarat on jo siirretty tuotantotilaukseen
 DocType: Process Payroll,Select Payroll Year and Month,valitse palkkaluettelo vuosi ja kuukausi
 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""","siirry kyseiseen ryhmään (yleensä kohteessa rahastot> lyhytaikaiset vastaavat> pankkitilit ja tee uusi tili (valitsemalla lisää alasidos) ""pankki"""
@@ -861,12 +827,12 @@
 DocType: Item,Inspection Criteria,tarkastuskriteerit
 apps/erpnext/erpnext/config/accounts.py +101,Tree of finanial Cost Centers.,kustannuspaikkapuu
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,siirretty
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +492,Upload your letter head and logo. (you can edit them later).,lataa kirjeen ylätunniste ja logo. (voit muokata niitä myöhemmin)
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +156,White,valkoinen
+apps/erpnext/erpnext/public/js/setup_wizard.js +238,Upload your letter head and logo. (you can edit them later).,lataa kirjeen ylätunniste ja logo. (voit muokata niitä myöhemmin)
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,White,valkoinen
 DocType: SMS Center,All Lead (Open),kaikki vihjeet (avoimet)
 DocType: Purchase Invoice,Get Advances Paid,hae maksetut ennakot
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +362,Attach Your Picture,Liitä Picture
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Make ,Tehdä
+apps/erpnext/erpnext/public/js/setup_wizard.js +112,Attach Your Picture,Liitä Picture
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +540,Make ,Tehdä
 DocType: Journal Entry,Total Amount in Words,sanat kokonaisarvomäärä
 DocType: Workflow State,Stop,pysäytä
 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.,"tapahui virhe: todennäköinen syy on ettet ole tallentanut lomakketta, mikäli ongelma jatkuu ota yhteyttä sähköpostiin support@erpnext.com"
@@ -875,14 +841,13 @@
 DocType: Lead,Next Contact Date,seuraava yhteydenottopvä
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,avaus yksikkömäärä
 DocType: Holiday List,Holiday List Name,lomaluettelo nimi
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +168,Stock Options,"varasto, vaihtoehdot"
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +168,Stock Options,"varasto, vaihtoehdot"
 DocType: Journal Entry Account,Expense Claim,kuluvaatimus
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +181,Qty for {0},yksikkömäärään {0}
 DocType: Leave Application,Leave Application,poistumissovellus
 apps/erpnext/erpnext/config/hr.py +77,Leave Allocation Tool,poistumiskohdistus työkalu
 DocType: Leave Block List,Leave Block List Dates,"poistu estoluettelo, päivät"
 DocType: Company,If Monthly Budget Exceeded (for expense account),Jos Kuukausibudjetti ylitetty (varten kululaskelma)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +56,Trimming,trimmaus
 DocType: Workstation,Net Hour Rate,netto tuntitaso
 DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,"kohdistetut kustannukset, ostokuitti"
 DocType: Company,Default Terms,oletus ehdot
@@ -890,10 +855,9 @@
 DocType: POS Profile,Cash/Bank Account,kassa- / pankkitili
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,Removed items with no change in quantity or value.,Poistettu kohteita ei muutu määrän tai arvon.
 DocType: Delivery Note,Delivery To,toimitus (lle)
-apps/erpnext/erpnext/stock/doctype/item/item.py +509,Attribute table is mandatory,Taito pöytä on pakollinen
+apps/erpnext/erpnext/stock/doctype/item/item.py +513,Attribute table is mandatory,Taito pöytä on pakollinen
 DocType: Production Planning Tool,Get Sales Orders,hae myyntitilaukset
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} ei voi olla negatiivinen
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +103,Filing,arkistointi
 apps/erpnext/erpnext/templates/form_grid/item_grid.html +72,Discount,alennus
 DocType: Features Setup,Purchase Discounts,Osto Alennukset
 DocType: Workstation,Wages,Palkat
@@ -910,6 +874,7 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +112,You are the Expense Approver for this record. Please Update the 'Status' and Save,"olet hyväksyjä tälle tietueelle, päivitä 'tila' ja tallenna"
 DocType: Serial No,Creation Document No,asiakirjan luonti nro
 DocType: Issue,Issue,aihe
+apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account does not match with Company,Tili ei vastaa Yritys
 apps/erpnext/erpnext/config/stock.py +136,"Attributes for Item Variants. e.g Size, Color etc.","määritä tuotemallien tuntomerkit, kuten koko, väri jne."
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +39,WIP Warehouse,WIP varasto
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +194,Serial No {0} is under maintenance contract upto {1},sarjanumero {0} on huoltokannassa {1} asti
@@ -918,7 +883,7 @@
 DocType: Tax Rule,Shipping State,Lähettävällä valtiolla
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,"tuote tulee lisätä ""hae kohteita ostokuitit"" painikella"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,myynnin kulut
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Buying,perusostaminen
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +120,Standard Buying,perusostaminen
 DocType: GL Entry,Against,kohdistus
 DocType: Item,Default Selling Cost Center,myyntien oletuskustannuspaikka
 DocType: Sales Partner,Implementation Partner,sovelluskumppani
@@ -939,29 +904,29 @@
 DocType: Time Log Batch,updated via Time Logs,päivitetty aikalokin kautta
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,Keskimääräinen ikä
 DocType: Opportunity,Your sales person who will contact the customer in future,"Myyjä, joka ottaa yhteyttä asiakkaaseen tulevaisuudessa"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +588,List a few of your suppliers. They could be organizations or individuals.,Luetella muutaman oman toimittajia. Ne voivat olla organisaatioita tai yksilöitä.
+apps/erpnext/erpnext/public/js/setup_wizard.js +326,List a few of your suppliers. They could be organizations or individuals.,Luetella muutaman oman toimittajia. Ne voivat olla organisaatioita tai yksilöitä.
 DocType: Company,Default Currency,oletusvaluutta
 DocType: Contact,Enter designation of this Contact,syötä yhteystiedon nimike
 DocType: Contact Us Settings,Address,Osoite
 DocType: Expense Claim,From Employee,työntekijästä
-apps/erpnext/erpnext/controllers/accounts_controller.py +338,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,varoitus: järjestelmä ei tarkista liikalaskutusta sillä tuotteen arvomäärä {0} on {1} nolla
+apps/erpnext/erpnext/controllers/accounts_controller.py +339,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,varoitus: järjestelmä ei tarkista liikalaskutusta sillä tuotteen arvomäärä {0} on {1} nolla
 DocType: Journal Entry,Make Difference Entry,tee erokirjaus
 DocType: Upload Attendance,Attendance From Date,osallistuminen päivästä
 DocType: Appraisal Template Goal,Key Performance Area,Key Performance Area
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +54,Transportation,kuljetus
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +54,Transportation,kuljetus
 apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +67, and year: ,ja vuosi:
 DocType: Email Digest,Annual Expense,Vuosikuluna
 DocType: SMS Center,Total Characters,henkilöt yhteensä
-apps/erpnext/erpnext/controllers/buying_controller.py +139,Please select BOM in BOM field for Item {0},valitse BOM tuotteelle BOM kentästä {0}
+apps/erpnext/erpnext/controllers/buying_controller.py +130,Please select BOM in BOM field for Item {0},valitse BOM tuotteelle BOM kentästä {0}
 DocType: C-Form Invoice Detail,C-Form Invoice Detail,C-muoto laskutus lisätiedot
 DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,maksun täsmäytys laskuun
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +32,Contribution %,panostus %
 DocType: Item,website page link,verkkosivusto sivulla linkki
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +192,Let's prepare the system for first use.,valmistellaan järjestelmän ensimmäiseen käyttökertaan
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +242,Let's prepare the system for first use.,valmistellaan järjestelmän ensimmäiseen käyttökertaan
 DocType: Company,Company registration numbers for your reference. Tax numbers etc.,"yrityksen rekisterinumero viitteeksi, vero numerot jne"
 DocType: Sales Partner,Distributor,jakelija
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,ostoskori toimitus sääntö
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +214,Production Order {0} must be cancelled before cancelling this Sales Order,tuotannon tilaus {0} tulee peruuttaa ennen myyntitilauksen peruutusta
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +209,Production Order {0} must be cancelled before cancelling this Sales Order,tuotannon tilaus {0} tulee peruuttaa ennen myyntitilauksen peruutusta
 ,Ordered Items To Be Billed,tilatut laskutettavat tuotteet
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +24,From Range has to be less than To Range,Vuodesta Range on oltava vähemmän kuin laitumelle
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +21,Select Time Logs and Submit to create a new Sales Invoice.,valitse aikaloki ja lähetä tehdäksesi uuden myyntilaskun
@@ -981,14 +946,13 @@
 DocType: Sales Invoice Advance,Sales Invoice Advance,"myyntilasku, ennakko"
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +398,Nothing to request,Mitään pyytää
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date','aloituspäivä' ei voi olla ennen 'päättymispäivää'
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +75,Management,hallinto
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +75,Management,hallinto
 apps/erpnext/erpnext/config/projects.py +33,Types of activities for Time Sheets,aikalomakkeen aktiviteetti tyyppit
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +14,Investment casting,sijoitukset valanta
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +51,Either debit or credit amount is required for {0},joko debet- tai kredit arvomäärä vaaditaan {0}:lle
 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""","tämä liitetään mallin tuotenumeroon esim, jos lyhenne on ""SM"" ja tuotekoodi on ""T-PAITA"", mallin tuotekoodi on ""T-PAITA-SM"""
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,"sanat näkyvät, kun tallennat palkkalaskelman, nettomaksu"
 apps/frappe/frappe/core/doctype/user/user_list.js +12,Active,Aktiivinen
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +154,Blue,sininen
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +154,Blue,sininen
 DocType: Purchase Invoice,Is Return,on palautus
 DocType: Price List Country,Price List Country,Hinnasto Maa
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +123,Further nodes can be only created under 'Group' type nodes,tulevat sidoket voi olla ainoastaan 'ryhmä' tyyppisiä sidoksia
@@ -998,18 +962,16 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +22,POS Profile {0} already created for user: {1} and company {2},POS Profiili {0} on jo luotu käyttäjälle: {1} ja yritykselle {2}
 DocType: Purchase Order Item,UOM Conversion Factor,UOM muuntokerroin
 DocType: Stock Settings,Default Item Group,oletus tuoteryhmä
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +156,Laminated object manufacturing,Laminoitu esine valmistus
 apps/erpnext/erpnext/config/buying.py +13,Supplier database.,toimittaja tietokanta
 DocType: Account,Balance Sheet,tasekirja
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +561,Cost Center For Item with Item Code ',tuotteen kustannuspaikka tuotekoodilla
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +45,Stretch forming,venytys muovaus
 DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,"myyjä, joka saa muistutuksen asiakkaan yhetdenotosta"
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +210,"Further accounts can be made under Groups, but entries can be made against non-Groups","lisätilejä voidaan tehdä kohdassa ryhmät, mutta kirjaukset toi suoraan tilille"
 apps/erpnext/erpnext/config/hr.py +125,Tax and other salary deductions.,verot- ja muut palkan vähennykset
 DocType: Lead,Lead,vihje
 DocType: Email Digest,Payables,maksettavat
 DocType: Account,Warehouse,Varasto
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +90,Row #{0}: Rejected Qty can not be entered in Purchase Return,rivi # {0}: hylättyä yksikkömäärää ei voi merkitä oston palautukseksi
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +93,Row #{0}: Rejected Qty can not be entered in Purchase Return,rivi # {0}: hylättyä yksikkömäärää ei voi merkitä oston palautukseksi
 ,Purchase Order Items To Be Billed,Ostotilaus Items laskuttamat
 DocType: Purchase Invoice Item,Net Rate,nettotaso
 DocType: Purchase Invoice Item,Purchase Invoice Item,"ostolasku, tuote"
@@ -1024,13 +986,13 @@
 DocType: Global Defaults,Current Fiscal Year,nykyinen tilikausi
 DocType: Global Defaults,Disable Rounded Total,poista 'pyöristys yhteensä' käytöstä
 DocType: Lead,Call,pyyntö
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +384,'Entries' cannot be empty,'kirjaukset' ei voi olla tyhjä
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +386,'Entries' cannot be empty,'kirjaukset' ei voi olla tyhjä
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},monista rivi {0} sama kuin {1}
 ,Trial Balance,tasekokeilu
 apps/erpnext/erpnext/config/hr.py +205,Setting up Employees,työntekijän perusmääritykset
 apps/erpnext/erpnext/public/js/feature_setup.js +220,"Grid ""","raja """
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +150,Please select prefix first,Ole hyvä ja valitse etuliite ensin
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +138,Research,Tutkimus
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +138,Research,Tutkimus
 DocType: Maintenance Visit Purpose,Work Done,työ tehty
 apps/erpnext/erpnext/controllers/item_variant.py +25,Please specify at least one attribute in the Attributes table,Ilmoitathan ainakin yksi määrite Määritteet taulukossa
 DocType: Contact,User ID,käyttäjätunnus
@@ -1038,10 +1000,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +57,View Ledger,näytä tilikirja
 DocType: File,Lft,Lft
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,aikaisintaan
-apps/erpnext/erpnext/stock/doctype/item/item.py +394,"An Item Group exists with same name, please change the item name or rename the item group","samanniminen tuoteryhmä on jo olemassa, vaihda tuotteen nimeä tai nimeä tuoteryhmä uudelleen"
+apps/erpnext/erpnext/stock/doctype/item/item.py +398,"An Item Group exists with same name, please change the item name or rename the item group","samanniminen tuoteryhmä on jo olemassa, vaihda tuotteen nimeä tai nimeä tuoteryhmä uudelleen"
 DocType: Communication,Delivery Status,toimituksen tila
 DocType: Production Order,Manufacture against Sales Order,valmistus kohdistus myyntitilaukseen
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +517,Rest Of The World,Rest Of The World
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +455,Rest Of The World,Rest Of The World
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,tuote {0} ei voi olla erä
 ,Budget Variance Report,budjettivaihtelu raportti
 DocType: Salary Slip,Gross Pay,bruttomaksu
@@ -1052,13 +1014,11 @@
 DocType: BOM Item,Item Description,tuotteen kuvaus
 DocType: Payment Tool,Payment Mode,maksutila
 DocType: Purchase Invoice,Is Recurring,on toistuva
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +154,Direct metal laser sintering,suora metalli lasersintraus
 DocType: Purchase Order,Supplied Items,tuotteet toimitettu
 DocType: Production Order,Qty To Manufacture,valmistettava yksikkömäärä
 DocType: Buying Settings,Maintain same rate throughout purchase cycle,ylläpidä samaa tasoa läpi ostosyklin
 DocType: Opportunity Item,Opportunity Item,"tilaisuus, tuote"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +61,Temporary Opening,tilapäinen avaus
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +41,Cryorolling,kryomuovaus
 ,Employee Leave Balance,työntekijän poistumistase
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +128,Balance for Account {0} must always be {1},tilin tase {0} on oltava {1}
 DocType: Address,Address Type,osoitteen tyyppi
@@ -1074,23 +1034,23 @@
 DocType: Journal Entry,Get Outstanding Invoices,hae odottavat laskut
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,myyntitilaus {0} ei ole kelvollinen
 apps/erpnext/erpnext/setup/doctype/company/company.py +172,"Sorry, companies cannot be merged",yhtiöitä ei voi yhdistää
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +145,Small,pieni
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Small,pieni
 DocType: Employee,Employee Number,työntekijän numero
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},"asianumero/numerot on jo käytössä, aloita asianumerosta {0}"
 ,Invoiced Amount (Exculsive Tax),laskutettu arvomäärä (sisältäen verot)
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,tuote 2
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +59,Account head {0} created,tilin otsikko {0} luotu
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +153,Green,vihreä
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Green,vihreä
 DocType: Item,Auto re-order,Auto re-order
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +57,Total Achieved,"yhteensä, saavutettu"
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +59,Total Achieved,"yhteensä, saavutettu"
 DocType: Employee,Place of Issue,aiheen alue
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +59,Contract,sopimus
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Contract,sopimus
 DocType: Report,Disabled,poistettu käytöstä
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +490,UOM coversion factor required for UOM: {0} in Item: {1},UOM muuntokerroin vaaditaan UOM {0}:lle tuotteessa: {1}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +83,Indirect Expenses,välilliset kulut
 apps/erpnext/erpnext/controllers/selling_controller.py +163,Row {0}: Qty is mandatory,rivi {0}: yksikkömäärä vaaditaan
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +8,Agriculture,Maatalous
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +611,Your Products or Services,Omat tavarat tai palvelut
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,Maatalous
+apps/erpnext/erpnext/public/js/setup_wizard.js +347,Your Products or Services,Omat tavarat tai palvelut
 DocType: Mode of Payment,Mode of Payment,maksutapa
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,tämä on kantatuoteryhmä eikä sitä voi muokata
 DocType: Journal Entry Account,Purchase Order,Ostotilaus
@@ -1102,7 +1062,7 @@
 DocType: Serial No,Serial No Details,sarjanumeron lisätiedot
 DocType: Purchase Invoice Item,Item Tax Rate,tuotteen verotaso
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +113,"For {0}, only credit accounts can be linked against another debit entry","{0}, vain kredit tili voidaan kohdistaa debet kirjaukseen"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Delivery Note {0} is not submitted,lähetettä {0} ei ole lähetetty
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +470,Delivery Note {0} is not submitted,lähetettä {0} ei ole lähetetty
 apps/erpnext/erpnext/stock/get_item_details.py +136,Item {0} must be a Sub-contracted Item,tuote {0} on alihankintatuote
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,käyttöomaisuuspääoma
 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.","hinnoittelusääntö tulee ensin valita  'käytä tässä' kentästä, joka voi olla tuote, tuoteryhmä tai brändi"
@@ -1112,7 +1072,7 @@
 DocType: Appraisal Goal,Goal,tavoite
 DocType: Sales Invoice Item,Edit Description,Muokkaa Kuvaus
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +318,Expected Delivery Date is lesser than Planned Start Date.,odotettu toimituspäivä on pienempi kuin suunniteltu aloituspäivä
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +579,For Supplier,toimittajalle
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +602,For Supplier,toimittajalle
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,tilityypin asetukset auttaa valitsemaan oikean tilin tapahtumaan
 DocType: Purchase Invoice,Grand Total (Company Currency),kokonaissumma (yrityksen valuutta)
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,lähtevät yhteensä
@@ -1138,10 +1098,10 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +74,"Total {0} for all items is zero, may you should change 'Distribute Charges Based On'","määrä {0} kaikkille tuotteille on nolla, ehkä tulisi muuttaa kontaa ""toimitusmaksu perusteet"""
 DocType: Purchase Invoice,Taxes and Charges Calculation,verot ja maksut laskelma
 DocType: BOM Operation,Workstation,työasema
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +112,Hardware,kova tavara
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +112,Hardware,kova tavara
 DocType: Attendance,HR Manager,henkilöstön hallinta
 apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,Valitse Yritys
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +50,Privilege Leave,poistumisoikeus
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +50,Privilege Leave,poistumisoikeus
 DocType: Purchase Invoice,Supplier Invoice Date,toimittajan laskun päiväys
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +79,You need to enable Shopping Cart,Sinun tulee aktivoida ostoskori
 apps/frappe/frappe/public/js/frappe/form/grid_body.html +6,No Data,No Data
@@ -1154,7 +1114,7 @@
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +81,Overlapping conditions found between:,Päällekkäiset olosuhteisiin välillä:
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +168,Against Journal Entry {0} is already adjusted against some other voucher,päiväkirjan kohdistettu kirjaus {0} on jo säädetty muuhun tositteeseen
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +68,Total Order Value,tilausten arvo yhteensä
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +38,Food,ruoka
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +38,Food,ruoka
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,vanhentumisen skaala 3
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +139,You can make a time log only against a submitted production order,voit kohdistaa aikalokin tuotannon tilaukseen
 DocType: Maintenance Schedule Item,No of Visits,Ei annettu Vierailut
@@ -1174,6 +1134,7 @@
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,View Offer Letter,näytä tarjouskirje
 DocType: Communication,Communication,viestintä
 DocType: Item,Is Service Item,on palvelutuote
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +81,Application period cannot be outside leave allocation period,Hakuaika ei voi ulkona loman jakokauteen
 DocType: Activity Cost,Projects,Projektit
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +31,Please select Fiscal Year,Ole hyvä ja valitse Tilikausi
 apps/erpnext/erpnext/controllers/buying_controller.py +23,From {0} | {1} {2},alkaen {0} | {1} {2}
@@ -1192,7 +1153,7 @@
 DocType: Item,Maintain Stock,huolla varastoa
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +213,Stock Entries already created for Production Order ,varaston kirjaukset on muodostettu tuotannon tilauksesta
 DocType: Leave Control Panel,Leave blank if considered for all designations,tyhjä mikäli se pidetään vihtoehtona kaikille nimityksille
-apps/erpnext/erpnext/controllers/accounts_controller.py +499,Charge of type 'Actual' in row {0} cannot be included in Item Rate,maksun tyyppiä 'todellinen' rivillä {0} ei voi sisällyttää tuotearvoon
+apps/erpnext/erpnext/controllers/accounts_controller.py +500,Charge of type 'Actual' in row {0} cannot be included in Item Rate,maksun tyyppiä 'todellinen' rivillä {0} ei voi sisällyttää tuotearvoon
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,Max: {0},Max: {0}
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +16,From Datetime,alkaen aikajana
 DocType: Email Digest,For Company,yritykselle
@@ -1202,7 +1163,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +50,Chart of Accounts,tilikartta
 DocType: Material Request,Terms and Conditions Content,ehdot ja säännöt sisältö
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +471,cannot be greater than 100,ei voi olla suurempi kuin 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +546,Item {0} is not a stock Item,tuote {0} ei ole varastotuote
+apps/erpnext/erpnext/stock/doctype/item/item.py +550,Item {0} is not a stock Item,tuote {0} ei ole varastotuote
 DocType: Maintenance Visit,Unscheduled,ei aikataulutettu
 DocType: Employee,Owned,Omistuksessa
 DocType: Salary Slip Deduction,Depends on Leave Without Pay,riippuu poistumisesta ilman palkkaa
@@ -1216,30 +1177,28 @@
 DocType: HR Settings,Employee Settings,työntekijän asetukset
 ,Batch-Wise Balance History,"erä työkalu, tasehistoria"
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +72,To Do List,To Do - tehtävät luettelo
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +63,Apprentice,opettelu
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Apprentice,opettelu
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +99,Negative Quantity is not allowed,Negatiivinen Määrä ei ole sallittua
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
 Used for Taxes and Charges","verotaulukkotiedot, jotka merkataan ja tallennetään tähän kenttään noudetaan tuote työkalusta, jota käytetään veroihin ja maksuihin"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +61,Lancing,Lancing
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +151,Employee cannot report to himself.,työntekijä ei voi raportoida itselleen
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","mikäli tili on jäädytetty, kirjaukset on rajattu tietyille käyttäjille"
 DocType: Email Digest,Bank Balance,Pankkitili
-apps/erpnext/erpnext/controllers/accounts_controller.py +435,Accounting Entry for {0}: {1} can only be made in currency: {2},Kirjaus {0}: {1} voidaan tehdä vain valuutassa: {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +436,Accounting Entry for {0}: {1} can only be made in currency: {2},Kirjaus {0}: {1} voidaan tehdä vain valuutassa: {2}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +38,No active Salary Structure found for employee {0} and the month,Ei aktiivisia Palkkarakenne löytynyt työntekijä {0} ja kuukausi
 DocType: Job Opening,"Job profile, qualifications required etc.","työprofiili, vaaditut pätevydet jne"
 DocType: Journal Entry Account,Account Balance,tilin tase
 apps/erpnext/erpnext/config/accounts.py +112,Tax Rule for transactions.,Verosääntöön liiketoimia.
 DocType: Rename Tool,Type of document to rename.,asiakirjan tyyppi uudelleenimeä
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +630,We buy this Item,ostamme tätä tuotetta
+apps/erpnext/erpnext/public/js/setup_wizard.js +366,We buy this Item,ostamme tätä tuotetta
 DocType: Address,Billing,Laskutus
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +77,Flanging,laipoitus
 DocType: Bulk Email,Not Sent,Ei lähetetty
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +73,Explosive forming,räjäytyksen muodostus
 DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),verot ja maksut yhteensä (yrityksen valuutta)
 DocType: Shipping Rule,Shipping Account,toimituskulutili
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +43,Scheduled to send to {0} recipients,aikataulutettu lähettämään vastaanottajille {0}
 DocType: Quality Inspection,Readings,Lukemat
 DocType: Stock Entry,Total Additional Costs,Lisäkustannusten kokonaismäärää
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Sub Assemblies,alikokoonpanot
+apps/erpnext/erpnext/public/js/setup_wizard.js +359,Sub Assemblies,alikokoonpanot
 DocType: Shipping Rule Condition,To Value,arvoon
 DocType: Supplier,Stock Manager,varastohallinta
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +143,Source warehouse is mandatory for row {0},lähde varasto on pakollinen rivin {0}
@@ -1249,44 +1208,42 @@
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,tuonti epäonnistui!
 apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,osoitetta ei ole vielä lisätty
 DocType: Workstation Working Hour,Workstation Working Hour,työaseman työaika
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +83,Analyst,Analyytikko
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +202,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},rivi {0}: kohdennettavan arvomäärä {1} on oltava suurempi tai yhtä suuri kuin tosite arvomäärä {2}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Analyst,Analyytikko
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +149,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},rivi {0}: kohdennettavan arvomäärä {1} on oltava suurempi tai yhtä suuri kuin tosite arvomäärä {2}
 DocType: Item,Inventory,inventaario
 DocType: Features Setup,"To enable ""Point of Sale"" view",Jotta &quot;Point of Sale&quot; näkymä
 apps/erpnext/erpnext/public/js/pos/pos.js +402,Payment cannot be made for empty cart,maksua ei voi tehdä tyhjällä ostoskorilla
 DocType: Item,Sales Details,myynnin lisätiedot
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +149,Pinning,Pinning
 DocType: Opportunity,With Items,tuotteilla
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,yksikkömääränä
 DocType: Notification Control,Expense Claim Rejected,kuluvaatimus hylätty
 DocType: Sales Invoice,"The date on which next invoice will be generated. It is generated on submit.
 ",laskun luontipäivä muodostuu lähettäessä
 DocType: Item Attribute,Item Attribute,tuotetuntomerkki
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +105,Government,hallinto
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Government,hallinto
 apps/erpnext/erpnext/config/stock.py +268,Item Variants,tuotemallit
 DocType: Company,Services,palvelut
 apps/erpnext/erpnext/accounts/report/financial_statements.py +147,Total ({0}),yhteensä ({0})
 DocType: Cost Center,Parent Cost Center,pääkustannuspaikka
 DocType: Sales Invoice,Source,lähde
 DocType: Leave Type,Is Leave Without Pay,on poistunut ilman palkkaa
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +186,No records found in the Payment table,tietuetta ei löydy maksutaulukosta
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +405,Financial Year Start Date,tilikauden aloituspäivä
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +133,No records found in the Payment table,tietuetta ei löydy maksutaulukosta
+apps/erpnext/erpnext/public/js/setup_wizard.js +153,Financial Year Start Date,tilikauden aloituspäivä
 DocType: Employee External Work History,Total Experience,kustannukset yhteensä
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +100,Countersinking,vastaupotus
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +271,Packing Slip(s) cancelled,pakkauslaput peruttu
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +276,Packing Slip(s) cancelled,pakkauslaput peruttu
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,rahdin ja huolinnan maksut
 DocType: Material Request Item,Sales Order No,"myyntitilaus, numero"
 DocType: Item Group,Item Group Name,"tuoteryhmä, nimi"
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +50,Taken,otettu
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,otettu
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +66,Transfer Materials for Manufacture,materiaalisiirto tuotantoon
 DocType: Pricing Rule,For Price List,hinnastoon
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +27,Executive Search,edistynyt haku
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,edistynyt haku
 apps/erpnext/erpnext/stock/stock_ledger.py +405,"Purchase rate for item: {0} not found, which is required to book accounting entry (expense). Please mention item price against a buying price list.","ostoarvoa tuotteelle: {0} ei löydy joka vaaditaan (kulu) kirjanpidon kirjauksessa, määritä tuotehinta ostohinnastossa"
 DocType: Maintenance Schedule,Schedules,aikataulut
 DocType: Purchase Invoice Item,Net Amount,netto arvomäärä
 DocType: Purchase Order Item Supplied,BOM Detail No,BOM yksittäisnumero
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),lisäalennuksen arvomäärä (yrityksen valuutta)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +537,Error: {0} > {1},virhe: {0}> {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +541,Error: {0} > {1},virhe: {0}> {1}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,"tee uusi tili, tilikartasta"
 DocType: Maintenance Visit,Maintenance Visit,"huolto, käynti"
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer > Customer Group > Territory,asiakas> asiakasryhmä> alue
@@ -1297,7 +1254,6 @@
 DocType: Event,Tuesday,tiistai
 DocType: Leave Block List,Block Holidays on important days.,estölomat tärkeinä päivinä
 ,Accounts Receivable Summary,saatava tilien yhteenveto
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +43,Leaves for type {0} already allocated for Employee {1} for period {2} - {3},Lehdet tyyppi {0} on jo myönnetty Työsuhde {1} kauden {2} - {3}
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +187,Please set User ID field in an Employee record to set Employee Role,kirjoita käyttäjätunnus työntekijä tietue kenttään  valitaksesi työntekijän roolin
 DocType: UOM,UOM Name,UOM nimi
 DocType: Top Bar Item,Target,tavoite
@@ -1309,15 +1265,14 @@
 DocType: ToDo,Due Date,eräpäivä
 DocType: Sales Invoice Item,Brand Name,brändin nimi
 DocType: Purchase Receipt,Transporter Details,Transporter Lisätiedot
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Box,pl
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +389,The Organization,organisaatio
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Box,pl
+apps/erpnext/erpnext/public/js/setup_wizard.js +137,The Organization,organisaatio
 DocType: Monthly Distribution,Monthly Distribution,toimitus kuukaudessa
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,"vastaanottajalista on tyhjä, tee vastaanottajalista"
 DocType: Production Plan Sales Order,Production Plan Sales Order,tuotantosuunnitelma myyntitilaukselle
 DocType: Sales Partner,Sales Partner Target,myyntikumppani tavoite
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},Kirjaus {0} voidaan tehdä vain valuutassa: {1}
 DocType: Pricing Rule,Pricing Rule,Hinnoittelu Rule
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +58,Notching,Kulminta
 apps/erpnext/erpnext/config/learn.py +167,Material Request to Purchase Order,ostotilaus materiaalipyynnöstä
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +74,Row # {0}: Returned Item {1} does not exists in {2} {3},rivi # {0}: palautettava tuote {1} ei löydy {2} {3}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,pankkitilit
@@ -1334,20 +1289,19 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Amounts not reflected in bank,arvomäärät eivät heijastu pankkiin
 DocType: Quality Inspection Reading,Reading 4,Reading 4
 apps/erpnext/erpnext/config/hr.py +23,Claims for company expense.,yrityksen kuluvaatimukset
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +8,Centrifugal casting,keskipako valanta
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +119,Magnetic field-assisted finishing,Magneettikenttä-avusteinen viimeistely
 DocType: Company,Default Holiday List,oletus lomaluettelo
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +165,Stock Liabilities,varasto vastattavat
 DocType: Purchase Receipt,Supplier Warehouse,toimittajan varasto
 DocType: Opportunity,Contact Mobile No,"yhteystiedot, puhelin"
 DocType: Production Planning Tool,Select Sales Orders,valitse myyntitilaukset
 ,Material Requests for which Supplier Quotations are not created,materiaalipyynnöt joita ei löydy toimittajan tarjouskyselyistä
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +117,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,"Päivä (t), johon haet lupaa ovat vapaapäiviä. Sinun ei tarvitse hakea lupaa."
 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.,"seuraa tuotteita viivakoodia käyttämällä, löydät tuotteet lähetteeltä ja myyntilaskulta skannaamalla tuotteen viivakoodin"
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +477,Mark as Delivered,Merkitse Toimitetaan
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +497,Mark as Delivered,Merkitse Toimitetaan
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +34,Make Quotation,tee tarjous
 DocType: Dependent Task,Dependent Task,riippuvainen tehtävä
-apps/erpnext/erpnext/stock/doctype/item/item.py +306,Conversion factor for default Unit of Measure must be 1 in row {0},muuntokerroin oletus mittayksikkön tulee olla 1 rivillä {0}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,Leave of type {0} cannot be longer than {1},poistumis tyyppi {0} ei voi olla pidempi kuin {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +310,Conversion factor for default Unit of Measure must be 1 in row {0},muuntokerroin oletus mittayksikkön tulee olla 1 rivillä {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +155,Leave of type {0} cannot be longer than {1},poistumis tyyppi {0} ei voi olla pidempi kuin {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,kokeile suunnitella toimia X päivää etukäteen
 DocType: HR Settings,Stop Birthday Reminders,lopeta syntymäpäivämuistutukset
 DocType: SMS Center,Receiver List,Vastaanotin List
@@ -1355,15 +1309,14 @@
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,käytetty arvomäärä
 apps/erpnext/erpnext/public/js/pos/pos.js +491,{0} View,{0} näytä
 DocType: Salary Structure Deduction,Salary Structure Deduction,"palkkarakenne, vähennys"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +158,Selective laser sintering,Valikoiva lasersintraus
-apps/erpnext/erpnext/stock/doctype/item/item.py +301,Unit of Measure {0} has been entered more than once in Conversion Factor Table,yksikköä {0} on kirjattu useammin kuin kerran muuntokerroin taulukossa
+apps/erpnext/erpnext/stock/doctype/item/item.py +305,Unit of Measure {0} has been entered more than once in Conversion Factor Table,yksikköä {0} on kirjattu useammin kuin kerran muuntokerroin taulukossa
 apps/frappe/frappe/core/page/data_import_tool/data_import_tool.js +108,Import Successful!,tuonti onnistunut!
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,aiheen tuotteiden kustannukset
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +185,Quantity must not be more than {0},Määrä saa olla enintään {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +41,Age (Days),Ikä (päivää)
 DocType: Quotation Item,Quotation Item,tarjous tuote
 DocType: Account,Account Name,Tilin nimi
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +41,From Date cannot be greater than To Date,alkaen päivä ei voi olla suurempi kuin päättymispäivä
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +34,From Date cannot be greater than To Date,alkaen päivä ei voi olla suurempi kuin päättymispäivä
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +194,Serial No {0} quantity {1} cannot be a fraction,sarjanumero {0} yksikkömäärä {1} ei voi olla murto-osa
 apps/erpnext/erpnext/config/buying.py +59,Supplier Type master.,toimittajatyypin valvonta
 DocType: Purchase Order Item,Supplier Part Number,toimittajan osanumero
@@ -1372,14 +1325,14 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +247,{0} {1} is cancelled or stopped,{0} {1} peruuntuu tai keskeytyy
 DocType: Accounts Settings,Credit Controller,kredit valvoja
 DocType: Delivery Note,Vehicle Dispatch Date,ajoneuvon toimituspäivä
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +197,Purchase Receipt {0} is not submitted,ostokuittia {0} ei ole lähetetty
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +198,Purchase Receipt {0} is not submitted,ostokuittia {0} ei ole lähetetty
 DocType: Company,Default Payable Account,oletus maksettava tili
 apps/erpnext/erpnext/config/website.py +13,"Settings for online shopping cart such as shipping rules, price list etc.","online-ostoskorin asetukset, kuten toimitustavat, hinnastot jne"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +660,Setup Complete,määritys valmis
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +124,Setup Complete,määritys valmis
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +65,{0}% Billed,{0}% laskutettu
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +17,Reserved Qty,varattu yksikkömäärä
 DocType: Party Account,Party Account,osapuolitili
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +74,Human Resources,henkilöstöresurssit
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +74,Human Resources,henkilöstöresurssit
 DocType: Lead,Upper Income,ylemmät tulot
 DocType: Journal Entry Account,Debit in Company Currency,Debit in Company Valuutta
 apps/erpnext/erpnext/support/doctype/issue/issue.py +58,My Issues,omat aiheet
@@ -1388,11 +1341,9 @@
 DocType: Company,Default Values,oletus arvot
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +236,Row {0}: Payment amount can not be negative,rivi {0}: maksun arvomäärä ei voi olla negatiivinen
 DocType: Expense Claim,Total Amount Reimbursed,hyvityksen kokonaisarvomäärä
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +152,Press fitting,puristussovitin
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +64,Against Supplier Invoice {0} dated {1},toimittajan ostolaskun kohdistus {0} päiväys {1}
 DocType: Customer,Default Price List,oletus hinnasto
 DocType: Payment Reconciliation,Payments,maksut
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +24,Hot isostatic pressing,kuumaisostaattinen prässi
 DocType: ToDo,Medium,Keskikokoinen
 DocType: Budget Detail,Budget Allocated,"budjetti, kohdennettu"
 DocType: Journal Entry,Entry Type,Entry Tyyppi
@@ -1405,9 +1356,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +56,None of the items have any change in quantity or value.,Mikään kohteita ovat muutoksia määrän tai arvon.
 DocType: Warranty Claim,Warranty Claim,takuuvaatimus
 ,Lead Details,"vihje, lisätiedot"
-DocType: Authorization Rule,Approving User,"hyväksyntä, käyttäjä"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +37,Forging,taonta
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +126,Plating,Pinnoitus
 DocType: Purchase Invoice,End date of current invoice's period,nykyisen laskukauden päättymispäivä
 DocType: Pricing Rule,Applicable For,sovellettavissa
 DocType: Bank Reconciliation,From Date,alkaen päivästä
@@ -1429,31 +1377,29 @@
 DocType: Sales Invoice,Paid Amount (Company Currency),Maksettu määrä (Yrityksen valuutta)
 DocType: Purchase Invoice,Additional Discount,Lisäalennuksen
 DocType: Selling Settings,Selling Settings,myynnin asetukset
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +39,Online Auctions,Online Auctions
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,Online Auctions
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +94,Please specify either Quantity or Valuation Rate or both,"määritä määrä, arvotaso tai molemmat"
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +50,"Company, Month and Fiscal Year is mandatory","yritys, kuukausi ja tilikausi vaaditaan"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Marketing Expenses,markkinointikulut
 ,Item Shortage Report,tuotteet vähissä raportti
-apps/erpnext/erpnext/stock/doctype/item/item.js +183,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","paino on mainittu, \ ssa mainitse  ""paino UOM"" myös"
+apps/erpnext/erpnext/stock/doctype/item/item.js +185,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","paino on mainittu, \ ssa mainitse  ""paino UOM"" myös"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,varaston kirjaus materiaalipyynnöstä
 apps/erpnext/erpnext/config/support.py +43,Single unit of an Item.,tuotteen yksittäisyksikkö
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +212,Time Log Batch {0} must be 'Submitted',"aikalokin erä {0} pitää ""lähettää"""
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,tee kirjanpidon kirjaus kaikille varastotapahtumille
 DocType: Leave Allocation,Total Leaves Allocated,"poistumisten yhteismäärä, kohdennettu"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +384,Warehouse required at Row No {0},varastolta vaaditaan rivi nro {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +386,Warehouse required at Row No {0},varastolta vaaditaan rivi nro {0}
 DocType: Employee,Date Of Retirement,eläkkepäivä
 DocType: Upload Attendance,Get Template,hae mallipohja
 DocType: Address,Postal,Posti-
 DocType: Item,Weightage,painoarvo
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +159,Mining,Kaivostoiminta
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +17,Resin casting,Resin valu
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"saman niminen asiakasryhmä on jo olemassa, vaihda asiakkaan nimi tai nimeä asiakasryhmä uudelleen"
 apps/erpnext/erpnext/public/js/pos/pos.js +147,Please select {0} first.,Ole hyvä ja valitse {0} ensin.
 apps/erpnext/erpnext/templates/pages/order.html +57,text {0},teksti {0}
 DocType: Territory,Parent Territory,Parent Territory
 DocType: Quality Inspection Reading,Reading 2,Reading 2
 DocType: Stock Entry,Material Receipt,materiaali kuitti
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +622,Products,tavarat
+apps/erpnext/erpnext/public/js/setup_wizard.js +358,Products,tavarat
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +47,Party Type and Party is required for Receivable / Payable account {0},osapuolitili sekä osapuoli vaaditaansaatava / maksettava tilille {0}
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.",mikäli tällä tuotteella on useita malleja sitä ei voi valita myyntitilaukseen yms
 DocType: Lead,Next Contact By,seuraava yhteydenottohlö
@@ -1463,13 +1409,13 @@
 DocType: Purchase Invoice,Notification Email Address,sähköpostiosoite ilmoituksille
 DocType: Payment Tool,Find Invoices to Match,etsi täsmäävät laskut
 ,Item-wise Sales Register,"tuote työkalu, myyntirekisteri"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +399,"e.g. ""XYZ National Bank""","esim, ""XYZ kansallinen pankki"""
+apps/erpnext/erpnext/public/js/setup_wizard.js +147,"e.g. ""XYZ National Bank""","esim, ""XYZ kansallinen pankki"""
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,kuuluuko tämä vero perustasoon?
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +57,Total Target,tavoite yhteensä
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Target,tavoite yhteensä
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.js +22,Shopping Cart is enabled,Ostoskori on käytössä
 DocType: Job Applicant,Applicant for a Job,työn hakija
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +173,No Production Orders created,tuotannon tilauksia ei ole tehty
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +131,Salary Slip of employee {0} already created for this month,työntekijöiden palkkalaskelma {0} on jo luotu tässä kuussa
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +140,Salary Slip of employee {0} already created for this month,työntekijöiden palkkalaskelma {0} on jo luotu tässä kuussa
 DocType: Stock Reconciliation,Reconciliation JSON,JSON täsmäytys
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,"liian monta saraketta, vie raportti taulukkolaskentaohjelman ja tulosta se siellä"
 DocType: Sales Invoice Item,Batch No,erän nro
@@ -1479,14 +1425,14 @@
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +13,Variant,malli
 apps/frappe/frappe/public/js/frappe/form/toolbar.js +165,New {0},Uusi {0}
 DocType: Naming Series,Set prefix for numbering series on your transactions,aseta sarjojen numeroinnin etuliite tapahtumiin
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +169,Stopped order cannot be cancelled. Unstop to cancel.,"pysäytettyä tilausta ei voi peruuttaa peruuttaa, käynnistä se jotta voit peruuttaa"
-apps/erpnext/erpnext/stock/doctype/item/item.py +323,Default BOM ({0}) must be active for this item or its template,oletus BOM ({0}) tulee olla aktiivinen tälle tuotteelle tai sen mallipohjalle
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +164,Stopped order cannot be cancelled. Unstop to cancel.,"pysäytettyä tilausta ei voi peruuttaa peruuttaa, käynnistä se jotta voit peruuttaa"
+apps/erpnext/erpnext/stock/doctype/item/item.py +327,Default BOM ({0}) must be active for this item or its template,oletus BOM ({0}) tulee olla aktiivinen tälle tuotteelle tai sen mallipohjalle
 DocType: Employee,Leave Encashed?,perintä?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,tilaisuuteen kenttä vaaditaan
 DocType: Item,Variants,mallit
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +458,Make Purchase Order,Tee Ostotilaus
 DocType: SMS Center,Send To,lähetä kenelle
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +111,There is not enough leave balance for Leave Type {0},jäännöstyypille {0} ei ole tarpeeksi vapaata jäännöstasetta
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +127,There is not enough leave balance for Leave Type {0},jäännöstyypille {0} ei ole tarpeeksi vapaata jäännöstasetta
 DocType: Sales Team,Contribution to Net Total,"panostus, netto yhteensä"
 DocType: Sales Invoice Item,Customer's Item Code,asiakkaan tuotekoodi
 DocType: Stock Reconciliation,Stock Reconciliation,varaston täsmäytys
@@ -1523,11 +1469,11 @@
 DocType: Sales Order Item,Actual Qty,todellinen yksikkömäärä
 DocType: Sales Invoice Item,References,Viitteet
 DocType: Quality Inspection Reading,Reading 10,Reading 10
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +612,"List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start.","luetteloi tavarat tai palvelut, joita ostat tai myyt, tarkista ensin tuoteryhmä, yksikkö ja muut ominaisuudet kun aloitat"
+apps/erpnext/erpnext/public/js/setup_wizard.js +348,"List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start.","luetteloi tavarat tai palvelut, joita ostat tai myyt, tarkista ensin tuoteryhmä, yksikkö ja muut ominaisuudet kun aloitat"
 DocType: Hub Settings,Hub Node,hubi sidos
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,Päällekkäisiä tuotteita on syötetty. Korjaa ja yritä uudelleen.
 apps/erpnext/erpnext/controllers/item_variant.py +65,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values,Arvo {0} varten Taito {1} ei ole luettelossa voimassa Tuote attribuuttiarvojen
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +87,Associate,kolleega
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Associate,kolleega
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +46,Item {0} is not a serialized Item,tuote {0} ei ole sarjoitettu tuote
 DocType: SMS Center,Create Receiver List,tee vastaanottajalista
 apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +5,Expired,vanhentunut
@@ -1536,7 +1482,7 @@
 DocType: Warranty Claim,Issue Date,aiheen päivä
 DocType: Activity Cost,Activity Cost,aktiviteettikustannukset
 DocType: Purchase Receipt Item Supplied,Consumed Qty,käytetty yksikkömäärä
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +52,Telecommunications,tietoliikenne
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +52,Telecommunications,tietoliikenne
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),"osoittaa, pakkaus on vain osa tätä toimitusta (luonnos)"
 DocType: Payment Tool,Make Payment Entry,tee maksukirjaus
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +119,Quantity for Item {0} must be less than {1},Määrä alamomentille {0} on oltava pienempi kuin {1}
@@ -1553,10 +1499,8 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +37,"Selling must be checked, if Applicable For is selected as {0}",myynnin tulee olla täpättynä mikäli saatavilla {0} on valittu
 DocType: Purchase Order Item,Supplier Quotation Item,"toimittajan tarjouskysely, tuote"
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +27,Make Salary Structure,tee palkkarakenne
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +54,Shearing,leikkauslujuus
 DocType: Item,Has Variants,on useita malleja
 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.,valitse 'tee myyntilasku' painike ja tee uusi myyntilasku
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +166,Packaging and labeling,pakkaukset ja merkinnät
 DocType: Monthly Distribution,Name of the Monthly Distribution,"toimitus kuukaudessa, nimi"
 DocType: Sales Person,Parent Sales Person,emomyyjä
 apps/erpnext/erpnext/setup/utils.py +14,Please specify Default Currency in Company Master and Global Defaults,syötä yrityksen oletusvaluutta kohdassa yrityksen valvonta ja yleiset oletusasetukset
@@ -1567,19 +1511,18 @@
 DocType: Budget Detail,Fiscal Year,tilikausi
 DocType: Cost Center,Budget,budjetti
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +41,"Budget cannot be assigned against {0}, as it's not an Income or Expense account","Talousarvio ei voi luovuttaa vastaan ​​{0}, koska se ei ole tuottoa tai kulua tili"
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Achieved,saavutettu
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,saavutettu
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +65,Territory / Customer,alueella / asiakas
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,e.g. 5,"esim, 5"
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +207,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},rivi {0}: kohdennettavan arvomäärän {1} on oltava pienempi tai yhtä suuri kuin odottava arvomäärä {2}
+apps/erpnext/erpnext/public/js/setup_wizard.js +294,e.g. 5,"esim, 5"
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},rivi {0}: kohdennettavan arvomäärän {1} on oltava pienempi tai yhtä suuri kuin odottava arvomäärä {2}
 DocType: Sales Invoice,In Words will be visible once you save the Sales Invoice.,"sanat näkyvät, kun tallennat myyntilaskun"
 DocType: Item,Is Sales Item,on myyntituote
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,tuoteryhmäpuu
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,"tuotteelle {0} ei määritetty sarjanumeroita, täppää tuote työkalu"
 DocType: Maintenance Visit,Maintenance Time,"huolto, aika"
 ,Amount to Deliver,toimitettava arvomäärä
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +620,A Product or Service,tavara tai palvelu
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +158,There were errors.,oli virheitä
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +101,Tapping,naputus
+apps/erpnext/erpnext/public/js/setup_wizard.js +356,A Product or Service,tavara tai palvelu
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +146,There were errors.,oli virheitä
 DocType: Naming Series,Current Value,nykyinen arvo
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +171,{0} created,tehnyt {0}
 DocType: Delivery Note Item,Against Sales Order,myyntitilauksen kohdistus
@@ -1593,7 +1536,7 @@
 apps/erpnext/erpnext/accounts/party.py +275,Due Date cannot be before Posting Date,eräpäivä voi olla ennen lähetyspäivää
 DocType: Website Item Group,Website Item Group,tuoteryhmän verkkosivu
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Duties and Taxes,tullit ja verot
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Please enter Reference date,Anna Viiteajankohta
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +312,Please enter Reference date,Anna Viiteajankohta
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} maksukirjauksia ei voida suodattaa {1}:lla
 DocType: Item Website Specification,Table for Item that will be shown in Web Site,verkkosivuilla näkyvien tuotteiden taulukko
 DocType: Purchase Order Item Supplied,Supplied Qty,yksikkömäärä toimitettu
@@ -1601,7 +1544,7 @@
 apps/erpnext/erpnext/config/stock.py +103,Tree of Item Groups.,tuoteryhmien puu
 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,"rivi ei voi viitata nykyistä suurempaan tai nykyisen rivin numeroon, vaihda maksun tyyppiä"
 ,Item-wise Purchase History,"tuote työkalu, ostohistoria"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +152,Red,punainen
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Red,punainen
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +228,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},"klikkaa ""muodosta aikataulu"" ja syötä tuotteen sarjanumero {0}"
 DocType: Account,Frozen,jäädytetty
 ,Open Production Orders,avoimet tuotannon tilausket
@@ -1616,7 +1559,7 @@
 DocType: Item Attribute,Attribute Name,"tuntomerkki, nimi"
 apps/erpnext/erpnext/controllers/selling_controller.py +236,Item {0} must be Sales or Service Item in {1},tuote {0} tulee olla myynti- tai palvelutuotteessa {1}
 DocType: Item Group,Show In Website,näytä verkkosivustossa
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +621,Group,ryhmä
+apps/erpnext/erpnext/public/js/setup_wizard.js +357,Group,ryhmä
 DocType: Task,Expected Time (in hours),odotettu aika (tunteina)
 ,Qty to Order,tilattava yksikkömäärä
 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","seuraa brändin nimeä seuraavissa asiakirjoissa: lähete, tilaisuus, materiaalipyyntö, tuote, ostotilaus, ostokuitti, tarjous, myyntilasku, tavarakokonaisuus, myyntitilaus ja sarjanumero"
@@ -1626,6 +1569,7 @@
 DocType: Features Setup,Brands,brändit
 DocType: C-Form Invoice Detail,Invoice No,laskun nro
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +480,From Purchase Order,ostotilauksesta
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +92,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Jätä ei voida soveltaa / peruuttaa ennen {0}, kun loman saldo on jo carry-välitti tulevaisuudessa loman jakamista ennätys {1}"
 DocType: Activity Cost,Costing Rate,"kustannuslaskenta, taso"
 ,Customer Addresses And Contacts,Asiakas osoitteet ja Yhteydet
 DocType: Employee,Resignation Letter Date,Eroaminen Letter Date
@@ -1633,35 +1577,31 @@
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +137,Not Set,Ei asetettu
 DocType: Communication,Date,päivä
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,Toista Asiakas Liikevaihto
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +651,Sit tight while your system is being setup. This may take a few moments.,"odota kunnes järjestelmä määritetty, tämä saattaa kestää hetken"
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +115,Sit tight while your system is being setup. This may take a few moments.,"odota kunnes järjestelmä määritetty, tämä saattaa kestää hetken"
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +51,{0} ({1}) must have role 'Expense Approver',{0} ({1}) tulee olla rooli 'kulujen hyväksyjä'
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Pair,Pari
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Pair,Pari
 DocType: Bank Reconciliation Detail,Against Account,tili kohdistus
 DocType: Maintenance Schedule Detail,Actual Date,todellinen päivä
 DocType: Item,Has Batch No,on erä nro
 DocType: Delivery Note,Excise Page Number,poisto sivunumero
 DocType: Employee,Personal Details,henkilökohtaiset lisätiedot
 ,Maintenance Schedules,huoltoaikataulut
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +44,Embossing,pakotus
 ,Quotation Trends,"tarjous, trendit"
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +139,Item Group not mentioned in item master for item {0},tuotteen {0} tuoteryhmää ei ole mainittu kohdassa tuote työkalu
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +302,Debit To account must be a Receivable account,tilin debet tulee olla saatava tili
-apps/erpnext/erpnext/stock/doctype/item/item.py +310,"As Production Order can be made for this item, it must be a stock item.",mikäli tälle tuotteelle sallitaan tuotannon tilaus sen tulee olla varastotuote
 DocType: Shipping Rule Condition,Shipping Amount,toimituskustannus arvomäärä
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +140,Joining,Liittyminen
-DocType: Authorization Rule,Above Value,yläarvo
 ,Pending Amount,odottaa arvomäärä
 DocType: Purchase Invoice Item,Conversion Factor,muuntokerroin
 DocType: Purchase Order,Delivered,toimitettu
 apps/erpnext/erpnext/config/hr.py +160,Setup incoming server for jobs email id. (e.g. jobs@example.com),määritä työpaikkahaun sähköpostin saapuvan palvelimen asetukset (esim ura@example.com)
 DocType: Purchase Receipt,Vehicle Number,Ajoneuvojen lukumäärä
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,päivä jolloin toistuva lasku lakkaa
+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,Yhteensä myönnetty lehdet {0} ei voi olla pienempi kuin jo hyväksytty lehdet {1} kaudeksi
 DocType: Journal Entry,Accounts Receivable,saatava tilit
 ,Supplier-Wise Sales Analytics,"toimittaja työkalu, myyntianalyysi"
 DocType: Address Template,This format is used if country specific format is not found,tätä muotoa käytetään ellei alueelle määriteltyä muotoa löydy
 DocType: Custom Field,Custom,oma
 DocType: Production Order,Use Multi-Level BOM,käytä useampi asteista BOM:ia
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +26,Injection molding,ruisku muovaus
 DocType: Bank Reconciliation,Include Reconciled Entries,sisällytä täsmätyt kirjaukset
 apps/erpnext/erpnext/config/accounts.py +41,Tree of finanial accounts.,tilipuu
 DocType: Leave Control Panel,Leave blank if considered for all employee types,tyhjä mikäli se pidetään vaihtoehtona  kaikissa työntekijä tyypeissä
@@ -1671,30 +1611,28 @@
 apps/frappe/frappe/config/setup.py +130,Printing,Painaminen
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +114,Expense Claim is pending approval. Only the Expense Approver can update status.,"kuluvaatimus odottaa hyväksyntää, vain kulujen hyväksyjä voi päivittää tilan"
 DocType: Purchase Invoice,Additional Discount Amount,lisäalennuksen arvomäärä
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +99,The day(s) on which you are applying for leave are holiday. You need not apply for leave.,"anotut poissaolopäivät lomapäiviä, sinun ei tarvitse anoa lupaa"
 apps/frappe/frappe/public/js/frappe/misc/utils.js +110,and,ja
 DocType: Leave Block List Allow,Leave Block List Allow,"poistu estoluettelo, salli"
 apps/erpnext/erpnext/setup/doctype/company/company.py +236,Abbr can not be blank or space,lyhenne ei voi olla tyhjä tai välilyönti
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +50,Sports,urheilu
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,urheilu
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Actual,"yhteensä, todellinen"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Unit,yksikkö
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Unit,yksikkö
 apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.py +182,Please set Dropbox access keys in your site config,määritä Dropbox pääsyn asetukset
 apps/erpnext/erpnext/stock/get_item_details.py +113,Please specify Company,Ilmoitathan Company
 ,Customer Acquisition and Loyalty,asiakashankinta ja suhteet
 DocType: Purchase Receipt,Warehouse where you are maintaining stock of rejected items,"varasto, jossä säilytetään hylätyt tuotteet"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +408,Your financial year ends on,Tilikautesi päättyy
+apps/erpnext/erpnext/public/js/setup_wizard.js +156,Your financial year ends on,Tilikautesi päättyy
 DocType: POS Profile,Price List,Hinnasto
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +20,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,"{0} nyt on oletustilikausi. päivitä selain, jotta muutos tulee voimaan."
 apps/erpnext/erpnext/projects/doctype/project/project.js +47,Expense Claims,kuluvaatimukset
 DocType: Issue,Support,tuki
-DocType: Authorization Rule,Approving Role,"hyväksyntä, rooli"
 ,BOM Search,BOM haku
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +176,Closing (Opening + Totals),sulku (avaus + summat)
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +26,Please specify currency in Company,määritä yrityksen valuutta
 DocType: Workstation,Wages per hour,Tuntipalkat
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},erän varastotase {0} muuttuu negatiiviseksi {1} tuotteelle {2} varastossa {3}
 apps/erpnext/erpnext/config/setup.py +83,"Show / Hide features like Serial Nos, POS etc.","näytä / piilota ominaisuuksia kuten sarjanumero, POS jne"
-apps/erpnext/erpnext/controllers/accounts_controller.py +236,Account {0} is invalid. Account Currency must be {1},Tili {0} ei kelpaa. Tilin valuutan on oltava {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +237,Account {0} is invalid. Account Currency must be {1},Tili {0} ei kelpaa. Tilin valuutan on oltava {1}
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +34,UOM Conversion factor is required in row {0},UOM muuntokerroin vaaditaan rivillä {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +53,Clearance date cannot be before check date in row {0},tilityspäivä ei voi olla ennen tarkistuspäivää rivillä {0}
 DocType: Salary Slip,Deduction,vähennys
@@ -1713,13 +1651,13 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +82,Item {0} has already been returned,tuote {0} on palautettu
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,**tilikausi** kaikki tilikauden kirjanpitoon kirjatut tositteet ja päätapahtumat on jäljitetty **tilikausi**
 DocType: Opportunity,Customer / Lead Address,asiakas / vihje osoite
+apps/erpnext/erpnext/stock/doctype/item/item.py +112,Warning: Invalid SSL certificate on attachment {0},Varoitus: Virheellinen SSL-varmenteen kiinnittymiseen {0}
 DocType: Production Order Operation,Actual Operation Time,todellinen toiminta-aika
 DocType: Authorization Rule,Applicable To (User),sovellettavissa (käyttäjä)
 DocType: Purchase Taxes and Charges,Deduct,vähentää
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +170,Job Description,työn kuvaus
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +170,Job Description,työn kuvaus
 DocType: Purchase Order Item,Qty as per Stock UOM,yksikkömäärä / varasto UOM
 apps/frappe/frappe/model/rename_doc.py +343,Please select a valid csv file with data,Valitse kelvollinen csv tiedoston tiedot
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +92,Coating,päällystetään
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +126,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","erikoismerkit ""-"", ""#"", ""."" ja ""/"" ei ole sallittuja sarjojen nimeämisessä"
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","seuraa myyntikampankoita, seuraa vihjeitä, -tarjouksia, myyntitilauksia ym mitataksesi kampanjaan sijoitetun pääoman tuoton"
 DocType: Expense Claim,Approver,hyväksyjä
@@ -1729,12 +1667,11 @@
 DocType: Supplier Quotation,Manufacturing Manager,valmistuksenhallinta
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},sarjanumerolla {0} on takuu {1} asti
 apps/erpnext/erpnext/config/stock.py +69,Split Delivery Note into packages.,jaa lähete pakkauksien kesken
-apps/erpnext/erpnext/hooks.py +84,Shipments,toimitukset
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +29,Dip molding,kastomuovaus
+apps/erpnext/erpnext/hooks.py +68,Shipments,toimitukset
 DocType: Purchase Order,To be delivered to customer,Toimitetaan asiakkaalle
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,aikalokin tila pitää lähettää
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,Sarjanumero {0} ei kuulu mihinkään Warehouse
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +650,Setting Up,perusmääritykset
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +114,Setting Up,perusmääritykset
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,Row # ,Rivi #
 DocType: Purchase Invoice,In Words (Company Currency),sanat (yrityksen valuutta)
 DocType: Pricing Rule,Supplier,toimittaja
@@ -1742,7 +1679,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +105,Miscellaneous Expenses,sekalaiset kulut
 DocType: Global Defaults,Default Company,oletus yritys
 apps/erpnext/erpnext/controllers/stock_controller.py +166,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,kulu- / erotili vaaditaan tuotteelle {0} sillä se vaikuttaa varastoarvoon
-apps/erpnext/erpnext/controllers/accounts_controller.py +354,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","tuotetta {0} ei voi ylilaskuttaa, rivillä {1} yli {2}, voit sallia ylilaskutuksen varaston asetuksista "
+apps/erpnext/erpnext/controllers/accounts_controller.py +355,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","tuotetta {0} ei voi ylilaskuttaa, rivillä {1} yli {2}, voit sallia ylilaskutuksen varaston asetuksista "
 DocType: Employee,Bank Name,pankin nimi
 apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +27,-Above,-yllä
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +135,User {0} is disabled,käyttäjä {0} on poistettu käytöstä
@@ -1755,27 +1692,26 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,{0} is mandatory for Item {1},{0} on pakollinen tuotteelle {1}
 DocType: Currency Exchange,From Currency,valuutasta
 DocType: DocField,Name,Nimi
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +211,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","valitse kohdennettava arvomäärä, laskun tyyppi ja laskun numero vähintään yhdelle riville"
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +104,Sales Order required for Item {0},myyntitilaus vaaditaan tuotteelle {0}
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +158,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","valitse kohdennettava arvomäärä, laskun tyyppi ja laskun numero vähintään yhdelle riville"
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +107,Sales Order required for Item {0},myyntitilaus vaaditaan tuotteelle {0}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +43,Amounts not reflected in system,arvomäärät eivät heijastu järjestelmässä
 DocType: Purchase Invoice Item,Rate (Company Currency),taso (yrityksen valuutta)
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +40,Others,Muut
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +40,Others,Muut
 apps/erpnext/erpnext/templates/includes/product_page.js +80,Cannot find a matching Item. Please select some other value for {0}.,Ei löydä vastaavia Tuote. Valitse jokin muu arvo {0}.
 DocType: POS Profile,Taxes and Charges,verot ja maksut
 DocType: Item,"A Product or a Service that is bought, sold or kept in stock.","tavara tai palvelu joka ostetaan, myydään tai varastoidaan"
 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,"ei voi valita maksun tyyppiä, kuten 'edellisen rivin arvomäärä' tai 'edellinen rivi yhteensä' ensimmäiseksi riviksi"
 apps/frappe/frappe/core/doctype/doctype/boilerplate/controller_list.html +31,Completed,valmistunut
 DocType: Web Form,Select DocType,valitse asiakirjatyyppi
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +104,Broaching,lähesty /avaa
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +12,Banking,pankkitoiminta
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,pankkitoiminta
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +38,Please click on 'Generate Schedule' to get schedule,"klikkaa ""muodosta aikataulu"" saadaksesi aikataulun"
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +283,New Cost Center,uusi kustannuspaikka
 DocType: Bin,Ordered Quantity,tilattu määrä
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +397,"e.g. ""Build tools for builders""","esim, ""rakenna työkaluja rakentajille"""
+apps/erpnext/erpnext/public/js/setup_wizard.js +145,"e.g. ""Build tools for builders""","esim, ""rakenna työkaluja rakentajille"""
 DocType: Quality Inspection,In Process,prosessissa
 DocType: Authorization Rule,Itemwise Discount,"tuote työkalu, alennus"
 DocType: Purchase Order Item,Reference Document Type,Viite Asiakirjan tyyppi
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +318,{0} against Sales Order {1},{0} myyntitilausta vastaan {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +320,{0} against Sales Order {1},{0} myyntitilausta vastaan {1}
 DocType: Account,Fixed Asset,pitkaikaiset vastaavat
 apps/erpnext/erpnext/config/stock.py +283,Serialized Inventory,Serialized Inventory
 DocType: Activity Type,Default Billing Rate,Oletus laskutustaksa
@@ -1790,14 +1726,13 @@
 DocType: Purchase Invoice Item,Page Break,Sivunvaihto
 DocType: Production Order Operation,Pending,odottaa
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,seuraavat käyttäjät voivat hyväksyä määriteltyjen työntekijöiden poistumissovellukset
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +33,You cannot change default UOM of Variant. To change default UOM for Variant change default UOM of the Template,Et voi muuttaa oletuksena UOM Variant. Oletusasetusten UOM muunnokseen muutos oletus UOM mallin
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +50,Office Equipments,Office Kalusto
 DocType: Purchase Invoice Item,Qty,yksikkömäärä
 DocType: Fiscal Year,Companies,Yritykset
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +24,Electronics,elektroniikka
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +24,Electronics,elektroniikka
 DocType: Stock Settings,Raise Material Request when stock reaches re-order level,korota materiaalipyyntö kun varastoarvo saavuttaa uuden ostotilauksen tason
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +18,From Maintenance Schedule,huoltoaikataulusta
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +56,Full-time,päätoiminen
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +56,Full-time,päätoiminen
 DocType: Purchase Invoice,Contact Details,"yhteystiedot, lisätiedot"
 DocType: C-Form,Received Date,Saivat 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.",mikäli olet tehnyt perusmallipohjan myyntiveroille ja maksumallin valitse se ja jatka alla olevalla painikella
@@ -1809,11 +1744,12 @@
 DocType: Job Applicant,Job Opening,Job Opening
 DocType: Payment Reconciliation,Payment Reconciliation,maksun täsmäytys
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +154,Please select Incharge Person's name,valitse vastuuhenkilön nimi
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +51,Technology,teknologia
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,teknologia
 DocType: Offer Letter,Offer Letter,Tarjoa Kirje
 apps/erpnext/erpnext/config/manufacturing.py +51,Generate Material Requests (MRP) and Production Orders.,muodosta materiaalipyymtö (MRP) ja tuotantotilaus
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +68,Total Invoiced Amt,"kokonaislaskutus, pankkipääte"
 DocType: Time Log,To Time,aikaan
+DocType: Authorization Rule,Approving Role (above authorized value),Hyväksymisestä Rooli (edellä valtuutettu arvo)
 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.",tutki puita ja lisää alasidoksia klikkaamalla sidosta johon haluat lisätä sidoksia
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +102,Credit To account must be a Payable account,kredit tilin tulee olla maksutili
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +233,BOM recursion: {0} cannot be parent or child of {2},BOM palautus: {0} ei voi pää tai alasidos {2}
@@ -1826,10 +1762,8 @@
 DocType: Item,Customer Item Codes,asiakkaan tuotekoodit
 DocType: Opportunity,Lost Reason,hävitty syy
 apps/erpnext/erpnext/config/accounts.py +68,Create Payment Entries against Orders or Invoices.,kohdista maksukirjaukset tilauksiin tai laskuihin
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +141,Welding,hitsata
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +40,New Stock UOM is required,uusi varasto UOM vaaditaan
 DocType: Quality Inspection,Sample Size,näytteen koko
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +443,All items have already been invoiced,kaikki tuotteet on jo laskutettu
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +446,All items have already been invoiced,kaikki tuotteet on jo laskutettu
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',Määritä kelvollinen &quot;Case No.&quot;
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +287,Further cost centers can be made under Groups but entries can be made against non-Groups,"lisää kustannuspaikkoja voidaan tehdä kohdassa ryhmät, mutta pelkät merkinnät voi kohdistaa ilman ryhmiä"
 DocType: Project,External,ulkoinen
@@ -1841,8 +1775,7 @@
 DocType: Bin,Actual Quantity,todellinen määrä
 DocType: Shipping Rule,example: Next Day Shipping,esimerkiksi: seuraavan päivän toimitus
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,sarjanumeroa {0} ei löydy
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +563,Your Customers,Omat asiakkaat
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +27,Compression molding,prässimuovaus
+apps/erpnext/erpnext/public/js/setup_wizard.js +303,Your Customers,Omat asiakkaat
 DocType: Leave Block List Date,Block Date,estopäivä
 DocType: Sales Order,Not Delivered,toimittamatta
 ,Bank Clearance Summary,pankin tilitysyhteenveto
@@ -1863,10 +1796,10 @@
 DocType: SMS Log,Sent To,lähetetty kenelle
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +28,Make Sales Invoice,tee myyntilasku
 DocType: Company,For Reference Only.,vain viitteeksi
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +29,Invalid {0}: {1},virheellinen {0}: {1}
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +49,Invalid {0}: {1},virheellinen {0}: {1}
 DocType: Sales Invoice Advance,Advance Amount,ennakko arvomäärä
 DocType: Manufacturing Settings,Capacity Planning,kapasiteetin suunnittelu
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +49,'From Date' is required,'aloituspäivä' vaaditaan
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +43,'From Date' is required,'aloituspäivä' vaaditaan
 DocType: Journal Entry,Reference Number,viitenumero
 DocType: Employee,Employment Details,"työsopimus, lisätiedot"
 DocType: Employee,New Workplace,Uusi Työpaikka
@@ -1881,7 +1814,7 @@
 DocType: Serial No,Delivery Time,toimitusaika
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,vanhentuminen perustuu
 DocType: Item,End of Life,elinkaaren loppu
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +41,Travel,matka
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +41,Travel,matka
 DocType: Leave Block List,Allow Users,Salli Käyttäjät
 DocType: Purchase Order,Customer Mobile No,Asiakas Mobile Ei
 DocType: Sales Invoice,Recurring,Toistuva
@@ -1895,7 +1828,7 @@
 DocType: Naming Series,User must always select,käyttäjän tulee aina valita
 DocType: Stock Settings,Allow Negative Stock,salli negatiivinen varastoarvo
 DocType: Installation Note,Installation Note,asennus huomautus
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +541,Add Taxes,lisää veroja
+apps/erpnext/erpnext/public/js/setup_wizard.js +283,Add Taxes,lisää veroja
 ,Financial Analytics,talousanalyysi
 DocType: Quality Inspection,Verified By,vahvistanut
 DocType: Address,Subsidiary,tytäryhtiö
@@ -1905,7 +1838,6 @@
 DocType: System Settings,In Hours,tunteina
 DocType: Process Payroll,Create Salary Slip,tee palkkalaskelma
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Expected balance as per bank,odotettu tase / pankki
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +115,Buffing,puskuroi
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Source of Funds (Liabilities),rahoituksen lähde (vieras pääoma)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +347,Quantity in row {0} ({1}) must be same as manufactured quantity {2},määrä rivillä {0} ({1}) tulee olla sama kuin valmistettu määrä {2}
 DocType: Appraisal,Employee,työntekijä
@@ -1922,11 +1854,11 @@
 DocType: Rename Tool,File to Rename,uudelleennimettävä tiedosto
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +176,Purchse Order number required for Item {0},ostotilauksen numero vaaditaan tuotteelle {0}
 apps/erpnext/erpnext/public/js/controllers/transaction.js +136,Show Payments,Näytä Maksut
-apps/erpnext/erpnext/controllers/buying_controller.py +245,Specified BOM {0} does not exist for Item {1},määriteltyä BOM:ia {0} ei löydy tuotteelle {1}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +202,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,huoltoaikataulu {0} on peruttava ennen myyntitilauksen perumista
+apps/erpnext/erpnext/controllers/buying_controller.py +236,Specified BOM {0} does not exist for Item {1},määriteltyä BOM:ia {0} ei löydy tuotteelle {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,huoltoaikataulu {0} on peruttava ennen myyntitilauksen perumista
 apps/frappe/frappe/desk/page/backups/backups.html +13,Size,koko
 DocType: Notification Control,Expense Claim Approved,kuluvaatimus hyväksytty
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +113,Pharmaceutical,Lääkealan
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Pharmaceutical,Lääkealan
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,ostettujen tuotteiden kustannukset
 DocType: Selling Settings,Sales Order Required,myyntitilaus vaaditaan
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +30,Create Customer,tee asiakas
@@ -1936,7 +1868,6 @@
 DocType: Quality Inspection Reading,Reading 9,Lukeminen 9
 DocType: Supplier,Is Frozen,on jäädytetty
 DocType: Buying Settings,Buying Settings,ostotoiminnan asetukset
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +122,Mass finishing,Mass viimeistely
 DocType: Stock Entry Detail,BOM No. for a Finished Good Item,BOM nro valmiille tuotteelle
 DocType: Upload Attendance,Attendance To Date,osallistuminen päivään
 apps/erpnext/erpnext/config/selling.py +158,Setup incoming server for sales email id. (e.g. sales@example.com),määritä myynnin sähköpostin saapuvan palvelimen asetukset (esim myynti@example.com)
@@ -1944,7 +1875,7 @@
 DocType: Payment Tool,Payment Account,maksutili
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +713,Please specify Company to proceed,Ilmoitathan Yritys jatkaa
 apps/frappe/frappe/public/js/frappe/model/indicator.js +30,Draft,luonnos
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +46,Compensatory Off,korvaava on pois
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Compensatory Off,korvaava on pois
 DocType: Quality Inspection Reading,Accepted,hyväksytyt
 DocType: User,Female,nainen
 DocType: Journal Entry Account,Debit in Account Currency,Debit Account Valuutta
@@ -1956,7 +1887,7 @@
 DocType: Shipping Rule,Shipping Rule Label,toimitus sääntö etiketti
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +209,Raw Materials cannot be blank.,raaka-aineet ei voi olla tyhjiä
 DocType: Newsletter,Test,testi
-apps/erpnext/erpnext/stock/doctype/item/item.py +364,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +368,"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'","tuotteella on varastotapahtumia \ ei voi muuttaa arvoja ""sarjanumero"", ""eränumero"", ""varastotuote"" ja ""arvomenetelmä"""
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +448,Quick Journal Entry,Nopea Päiväkirjakirjaus
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +92,You can not change rate if BOM mentioned agianst any item,"tasoa ei voi muuttaa, jos BOM liitetty johonkin tuotteeseen"
@@ -1967,13 +1898,14 @@
 apps/erpnext/erpnext/config/stock.py +18,Requests for items.,Pyynnöt kohteita.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,erillinen tuotannon tilaus luodaan jokaiselle valmistuneelle tuotteelle
 DocType: Purchase Invoice,Terms and Conditions1,ehdot ja säännöt 1
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +18,Complete Setup,määritykset suoritettu loppuun
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard_page.html +18,Complete Setup,määritykset suoritettu loppuun
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","kirjanpidon kirjaus on toistaiseksi jäädytetty, vain alla mainitussa roolissa voi tällä hetkellä kirjata / muokata tiliä"
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +121,Please save the document before generating maintenance schedule,tallenna asiakirja ennen huoltoaikataulun muodostusta
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,Projekti Status
 DocType: UOM,Check this to disallow fractions. (for Nos),täppää ellet halua murtolukuja (Nos:iin)
 apps/erpnext/erpnext/config/crm.py +96,Newsletter Mailing List,Uutiskirje Postituslista
 DocType: Delivery Note,Transporter Name,kuljetusyritys nimi
+DocType: Authorization Rule,Authorized Value,Valtuutettu Arvo
 DocType: Contact,Enter department to which this Contact belongs,"syötä osasto, johon tämä yhteystieto kuuluu"
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Absent,"yhteensä, puuttua"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +746,Item or Warehouse for row {0} does not match Material Request,tuote tai varastorivi {0} ei täsmää materiaalipyynnön kanssa
@@ -1998,16 +1930,15 @@
 DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),Basic Hinta (per Stock UOM)
 DocType: SMS Log,No of Requested SMS,Ei annettu Pyydetty SMS
 DocType: Campaign,Campaign-.####,kampanja -. ####
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +55,Piercing,Läpitunkeva
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,Seuraavat vaiheet
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +117,Contract End Date must be greater than Date of Joining,sopimuksen päättymispäivä tulee olla liittymispäivän jälkeen
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,"kolmas osapuoli kuten välittäjä / edustaja / agentti / jälleenmyyjä, joka myy tavaraa yrityksille provisiolla"
 DocType: Customer Group,Has Child Node,alasidoksessa
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{0} against Purchase Order {1},{0} ostotilausta vastaan {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +332,{0} against Purchase Order {1},{0} ostotilausta vastaan {1}
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","syötä staattiset url parametrit tähän (esim, lähettäjä = ERPNext, käyttäjätunnus = ERPNext, salasana = 1234 jne)"
 apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,"{0} {1} ei ole millään aktiivisella tilikaudella, täppää {2} saadaksesi lisätietoja"
-apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,"tämä on demo verkkosivu, joka on muodostettu automaattisesti ERPNext:ssä"
+apps/erpnext/erpnext/setup/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,"tämä on demo verkkosivu, joka on muodostettu automaattisesti ERPNext:ssä"
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +37,Ageing Range 1,vanhentumisen skaala 1
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +110,Photochemical machining,Fotokemiallinen koneistus
 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.
 
 #### Note
@@ -2033,7 +1964,7 @@
 DocType: Purchase Receipt Item,Recd Quantity,RECD Määrä
 DocType: Email Account,Email Ids,sähköpostitunnukset
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},ei voi valmistaa suurempaa määrää tuotteita {0} kuin myyntitilauksen määrä {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +471,Stock Entry {0} is not submitted,varaston kirjaus {0} ei ole lähetetty
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +473,Stock Entry {0} is not submitted,varaston kirjaus {0} ei ole lähetetty
 DocType: Payment Reconciliation,Bank / Cash Account,pankki / kassa
 DocType: Tax Rule,Billing City,Laskutus Kaupunki
 DocType: Global Defaults,Hide Currency Symbol,piilota valuuttasymbooli
@@ -2049,7 +1980,7 @@
 DocType: Purchase Invoice,Currency and Price List,Valuutta ja hinnasto
 DocType: Opportunity,Customer / Lead Name,asiakas / vihje nimi
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +63,Clearance Date not mentioned,tilityspäivää ei ole mainittu
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +71,Production,tuotanto
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Production,tuotanto
 DocType: Item,Allow Production Order,salli tuotannon tilaus
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +60,Row {0}:Start Date must be before End Date,Rivi {0}: Aloitus on ennen Päättymispäivä
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),yhteensä (yksikkömäärä)
@@ -2062,7 +1993,7 @@
 apps/erpnext/erpnext/utilities/doctype/address/address.py +113,My Addresses,omat osoitteet
 DocType: Stock Ledger Entry,Outgoing Rate,lähtevä taso
 apps/erpnext/erpnext/config/hr.py +100,Organization branch master.,"organisaatio, toimiala valvonta"
-apps/erpnext/erpnext/controllers/accounts_controller.py +237, or ,tai
+apps/erpnext/erpnext/controllers/accounts_controller.py +238, or ,tai
 DocType: Sales Order,Billing Status,Laskutus tila
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Utility Expenses,hyödykekulut
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,90-Above,90-yli
@@ -2089,6 +2020,7 @@
 DocType: Stock Entry Detail,Serial No / Batch,sarjanumero / erä
 DocType: Product Bundle,Parent Item,Parent Kohde
 DocType: Account,Account Type,Tilin tyyppi
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +113,Leave Type {0} cannot be carry-forwarded,"Jätä Tyyppi {0} ei voida tehdä, toimitetaan"
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +213,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',"huoltuaikataulua ei ole luotu kaikille tuotteille, klikkaa ""muodosta aikataulu"""
 ,To Produce,tuotantoon
 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","riviin {0}:ssa {1} sisällytä {2} tuotetasolle, rivit {3} tulee myös sisällyttää"
@@ -2096,10 +2028,7 @@
 DocType: Bin,Reserved Quantity,Varattu Määrä
 DocType: Landed Cost Voucher,Purchase Receipt Items,Ostokuitti Items
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,muotojen muokkaus
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +62,Cutting,leikkaus
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +69,Flattening,tasoitus
 DocType: Account,Income Account,tulotili
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +22,Molding,Reunus
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +632,Delivery,Toimitus
 DocType: Stock Reconciliation Item,Current Qty,nykyinen yksikkömäärä
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section","katso ""materiaaleihin perustuva arvo"" kustannuslaskenta osiossa"
@@ -2109,19 +2038,18 @@
 apps/frappe/frappe/desk/moduleview.py +61,Documents,asiakirjat
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +17,Ref,Viite
 DocType: Cost Center,Cost Center,kustannuspaikka
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.js +48,Voucher #,tosite #
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +36,Voucher #,tosite #
 DocType: Notification Control,Purchase Order Message,Ostotilaus Message
 DocType: Tax Rule,Shipping Country,Toimitusmaa
 DocType: Upload Attendance,Upload HTML,lataa HTML
-apps/erpnext/erpnext/controllers/accounts_controller.py +391,"Total advance ({0}) against Order {1} cannot be greater \
+apps/erpnext/erpnext/controllers/accounts_controller.py +392,"Total advance ({0}) against Order {1} cannot be greater \
 				than the Grand Total ({2})",ennakot yhteensä ({0}) kohdistettuna tilauksiin {1} ei voi olla suurempi \ kuin kokonaissumma ({2})
 DocType: Employee,Relieving Date,Lievittää Date
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +12,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.","hinnoittelu sääntö on tehty tämä korvaa hinnaston / määritä alennus, joka perustuu kriteereihin"
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,Varastoa voi muuttaa ainoastaan varaston Kirjauksella / Lähetteellä / Ostokuitilla
 DocType: Employee Education,Class / Percentage,luokka / prosenttia
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +92,Head of Marketing and Sales,markkinoinnin ja myynnin pää
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +31,Income Tax,tulovero
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +157,Laser engineered net shaping,verkkomuotoiluun suunniteltu laser
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Head of Marketing and Sales,markkinoinnin ja myynnin pää
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +31,Income Tax,tulovero
 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.","mikäli 'hinnalle' on tehty hinnoittelusääntö se korvaa hinnaston, hinnoittelusääntö on lopullinen hinta joten lisäalennusta ei voi antaa, näin myyntitilaus, ostotilaus ym tapahtumaissa tuote sijoittuu paremmin 'arvo' kenttään 'hinnaston arvo' kenttään"
 apps/erpnext/erpnext/config/selling.py +163,Track Leads by Industry Type.,jäljitä vihjeitä toimialan mukaan
 DocType: Item Supplier,Item Supplier,tuote toimittaja
@@ -2144,31 +2072,28 @@
 DocType: Stock Ledger Entry,Actual Qty After Transaction,todellinen yksikkömäärä tapahtuman jälkeen
 ,Pending SO Items For Purchase Request,"ostettavat pyyntö, odottavat myyntitilaukset"
 DocType: Supplier,Billing Currency,Laskutus Valuutta
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +148,Extra Large,erittäin suuri
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,Extra Large,erittäin suuri
 ,Profit and Loss Statement,tuloslaskelma selvitys
 DocType: Bank Reconciliation Detail,Cheque Number,takaus/shekki numero
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +43,Pressing,Painamalla
 DocType: Payment Tool Detail,Payment Tool Detail,maksutyökalu lisätiedot
 ,Sales Browser,myyntiselain
 DocType: Journal Entry,Total Credit,kredit yhteensä
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +474,Warning: Another {0} # {1} exists against stock entry {2},varoitus: toinen varaston kirjausksen kohdistus {0} # {1} on jo olemassa {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +459,Local,Paikallinen
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +476,Warning: Another {0} # {1} exists against stock entry {2},varoitus: toinen varaston kirjausksen kohdistus {0} # {1} on jo olemassa {2}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +397,Local,Paikallinen
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),lainat ja ennakot (vastaavat)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,velalliset
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +147,Large,Suuri
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +23,No employee found!,Yksikään työntekijä ei löytynyt!
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Large,Suuri
 DocType: C-Form Invoice Detail,Territory,alue
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,vierailujen määrä vaaditaan
 DocType: Purchase Order,Customer Address Display,Asiakkaan osoite Näyttö
 DocType: Stock Settings,Default Valuation Method,oletus arvomenetelmä
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +127,Polishing,Kiillotus
 DocType: Production Order Operation,Planned Start Time,Suunnitellut Start Time
 apps/erpnext/erpnext/config/accounts.py +63,Close Balance Sheet and book Profit or Loss.,sulje tase ja tuloslaskelma kirja
-apps/erpnext/erpnext/stock/doctype/item/item.py +661,"Default Unit of Measure for Item {0} cannot be changed directly because \
+apps/erpnext/erpnext/stock/doctype/item/item.py +665,"Default Unit of Measure for Item {0} cannot be changed directly because \
 			you have already made some transaction(s) with another UOM. To change default UOM, \
 			use 'UOM Replace Utility' tool under Stock module.","Oletus mittayksikkö Tuote {0} ei voi muuttaa suoraan, koska \ olet jo tehnyt joitakin tapahtuma (s) toisen UOM. Oletusasetusten UOM, \ käyttö &quot;UOM Vaihda Utility&quot; työkalu alla Stock moduuli."
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,määritä valuutan muunnostaso vaihtaaksesi valuutan toiseen
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +146,Quotation {0} is cancelled,tarjous {0} on peruttu
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +141,Quotation {0} is cancelled,tarjous {0} on peruttu
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,odottava arvomäärä yhteensä
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} was on leave on {1}. Cannot mark attendance.,"työntekijä {0} on poissa {1}, ei voi merkitä osallistumista"
 DocType: Sales Partner,Targets,tavoitteet
@@ -2179,7 +2104,6 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +158,Please create Customer from Lead {0},tee asiakasvihje {0}
 DocType: Price List,Applicable for Countries,Sovelletaan Maat
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Computers,tietokoneet
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +112,Electro-chemical grinding,sähkökemiallinen hionta
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +14,This is a root customer group and cannot be edited.,tämä on kanta-asiakasryhmä eikä sitä voi muokata
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +39,Please setup your chart of accounts before you start Accounting Entries,määritä tilikartta ennen kirjanpidon kirjausten aloittamista
 DocType: Purchase Invoice,Ignore Pricing Rule,ohita hinnoittelu sääntö
@@ -2225,7 +2149,6 @@
 DocType: Maintenance Visit,Purposes,Tarkoituksiin
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +103,Atleast one item should be entered with negative quantity in return document,vähintään yhdellä tuottella tulee olla negatiivinen määrä palautus asiakirjassa
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +67,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","tuote {0} kauemmin kuin mikään saatavillaoleva työaika työasemalla {1}, hajoavat toiminta useiksi toiminnoiksi"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +134,Electrochemical machining,sähkökemiallinen työstö
 ,Requested,Pyydetty
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +66,No Remarks,Ei Huomautuksia
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +13,Overdue,Myöhässä
@@ -2234,7 +2157,7 @@
 DocType: Monthly Distribution,Distribution Name,"toimitus, nimi"
 DocType: Features Setup,Sales and Purchase,myynti ja osto
 DocType: Supplier Quotation Item,Material Request No,materiaalipyyntö nro
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +218,Quality Inspection required for Item {0},tuotteelle {0} laatutarkistus
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +221,Quality Inspection required for Item {0},tuotteelle {0} laatutarkistus
 DocType: Quotation,Rate at which customer's currency is converted to company's base currency,"taso, jolla asiakkaan valuutta muunnetaan yrityksen käyttämäksi perusvaluutaksi"
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +107,{0} has been successfully unsubscribed from this list.,{0} on poistettu tästä luettelosta.
 DocType: Purchase Invoice Item,Net Rate (Company Currency),nettotaso (yrityksen valuutta)
@@ -2252,9 +2175,8 @@
 apps/erpnext/erpnext/accounts/report/financial_statements.py +16,Fiscal Year {0} not found.,tilikautta {0} ei löydy
 DocType: Bank Reconciliation,Get Relevant Entries,hae tarvittavat kirjaukset
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +407,Accounting Entry for Stock,kirjanpidon varaston kirjaus
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +64,Coining,lyönti
 DocType: Sales Invoice,Sales Team1,myyntitiimi 1
-apps/erpnext/erpnext/stock/doctype/item/item.py +412,Item {0} does not exist,tuotetta {0} ei ole olemassa
+apps/erpnext/erpnext/stock/doctype/item/item.py +416,Item {0} does not exist,tuotetta {0} ei ole olemassa
 DocType: Sales Invoice,Customer Address,asiakkaan osoite
 apps/frappe/frappe/desk/query_report.py +136,Total,yhteensä
 DocType: Purchase Invoice,Apply Additional Discount On,käytä lisäalennusta
@@ -2266,14 +2188,13 @@
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),veron arvomäärä alennusten jälkeen (yrityksen valuutta)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +149,Target warehouse is mandatory for row {0},tavoite varasto on pakollinen rivin {0}
 DocType: Quality Inspection,Quality Inspection,laatutarkistus
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +144,Extra Small,erittäin suuri
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +20,Spray forming,ruisku muovaaminen
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Extra Small,erittäin suuri
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +458,Warning: Material Requested Qty is less than Minimum Order Qty,varoitus: pyydetty materiaali yksikkömäärä on pienempi kuin vähimmäis ostotilausmäärä
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +191,Account {0} is frozen,tili {0} on jäädytetty
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,"juridinen hlö / tytäryhtiö, jolla on erillinen tilikartta kuuluu organisaatioon"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +29,"Food, Beverage & Tobacco","ruoka, juoma ja tupakka"
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","ruoka, juoma ja tupakka"
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +20,PL or BS,PL tai BS
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,Can only make payment against unbilled {0},Voi vain maksun vastaan ​​laskuttamattomia {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +531,Can only make payment against unbilled {0},Voi vain maksun vastaan ​​laskuttamattomia {0}
 apps/erpnext/erpnext/controllers/selling_controller.py +122,Commission rate cannot be greater than 100,provisio taso ei voi olla suurempi kuin 100
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Minimum Inventory Level,Pienin Inventory Level
 DocType: Stock Entry,Subcontract,alihankinta
@@ -2284,19 +2205,18 @@
 DocType: Item,Manufacturer Part Number,valmistajan osanumero
 DocType: Production Order Operation,Estimated Time and Cost,arvioitu aika ja kustannus
 DocType: Bin,Bin,Astia
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +50,Nosing,Nuuskia
 DocType: SMS Log,No of Sent SMS,Ei annettu Lähetetyt SMS
 DocType: Account,Company,Yritys
 DocType: Account,Expense Account,kulutili
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +49,Software,ohjelmisto
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +151,Colour,väritä
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +49,Software,ohjelmisto
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Colour,väritä
 DocType: Maintenance Visit,Scheduled,aikataulutettu
 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","valitse tuote joka ""varastotuote"", ""numero"" ja ""myyntituote"" valinnat täpätty kohtaan ""kyllä"", tuotteella ole muuta tavarakokonaisuutta"
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,valitse toimitusten kk jaksotus tehdäksesi kausiluonteiset toimitusttavoitteet
 DocType: Purchase Invoice Item,Valuation Rate,arvotaso
 apps/erpnext/erpnext/stock/get_item_details.py +281,Price List Currency not selected,"hinnasto, valuutta ole valittu"
 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,tuotetta rivillä {0}: ostokuittilla {1} ei ole olemassa ylläolevassa 'ostokuitit' taulukossa
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +134,Employee {0} has already applied for {1} between {2} and {3},työntekijällä {0} on jo {1} hakemus {2} ja {3} välilltä
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +145,Employee {0} has already applied for {1} between {2} and {3},työntekijällä {0} on jo {1} hakemus {2} ja {3} välilltä
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Projekti aloituspäivä
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +8,Until,asti
 DocType: Rename Tool,Rename Log,Nimeä Log
@@ -2306,7 +2226,7 @@
 apps/erpnext/erpnext/controllers/recurring_document.py +162,Please select {0},Ole hyvä ja valitse {0}
 DocType: C-Form,C-Form No,C-muoto nro
 DocType: BOM,Exploded_items,räjäytetyt_tuotteet
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +95,Researcher,Tutkija
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Researcher,Tutkija
 apps/frappe/frappe/custom/doctype/customize_form/customize_form.js +88,Update,päivitys
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +78,Please save the Newsletter before sending,Säilytä uutiskirje ennen lähettämistä
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +23,Name or Email is mandatory,Nimi tai Sähköposti on pakollinen
@@ -2315,11 +2235,10 @@
 DocType: Employee,Exit,poistu
 apps/erpnext/erpnext/accounts/doctype/account/account.py +134,Root Type is mandatory,kantatyyppi vaaditaan
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +295,Serial No {0} created,sarjanumeron on luonut {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +125,Vibratory finishing,tärytin viimeistely
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes",voit tulostaa nämä koodit tulostusmuodoissa asiakirjoihin kuten laskut ja lähetteet asiakkaiden työn helpottamiseksi
 DocType: Employee,You can enter any date manually,voit kirjoittaa minkä tahansa päivämäärän manuaalisesti
 DocType: Sales Invoice,Advertisement,mainos
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +165,Probationary Period,Koeaika
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Probationary Period,Koeaika
 DocType: Customer Group,Only leaf nodes are allowed in transaction,vain jatkosidokset ovat sallittuja tapahtumassa
 DocType: Expense Claim,Expense Approver,kulujen hyväksyjä
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,tuote ostokuitti toimitettu
@@ -2327,19 +2246,16 @@
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +17,To Datetime,aikajana
 DocType: SMS Settings,SMS Gateway URL,tekstiviesti reititin URL
 apps/erpnext/erpnext/config/crm.py +53,Logs for maintaining sms delivery status,Lokit ylläpitämiseksi sms toimituksen tila
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +137,Grinding,hionta
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +34,Shrink wrapping,kutistekalvopakkaus
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +36,Pending Activities,Odottaa Aktiviteetit
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,Confirmed,Vahvistettu
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier > Supplier Type,toimittaja> toimittaja tyyppi
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +127,Please enter relieving date.,Syötä lievittää päivämäärä.
 apps/erpnext/erpnext/controllers/trends.py +137,Amt,pankkipääte
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' can be submitted,vain 'hyväksytty' poistumissovellus voidaan lähettää
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +51,Only Leave Applications with status 'Approved' can be submitted,vain 'hyväksytty' poistumissovellus voidaan lähettää
 apps/erpnext/erpnext/utilities/doctype/address/address.py +21,Address Title is mandatory.,osoiteotsikko on pakollinen.
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,syötä kampanjan nimi jos kirjauksen lähde on kampanja
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +38,Newspaper Publishers,Newspaper Publishers
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +38,Newspaper Publishers,Newspaper Publishers
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,valitse tilikausi
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +88,Smelting,sulatus
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Reorder Level
 DocType: Attendance,Attendance Date,"osallistuminen, päivä"
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,palkkaerittelyn kohdistetut ansiot ja vähennykset
@@ -2354,16 +2270,15 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +414,[Error],[virhe]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,"sanat näkyvät, kun tallennat myyntitilauksen"
 ,Employee Birthday,työntekijän syntymäpäivä
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +55,Venture Capital,pääomasijoitus
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,pääomasijoitus
 DocType: UOM,Must be Whole Number,täytyy olla kokonaisluku
 DocType: Leave Control Panel,New Leaves Allocated (In Days),uusi poistumisten kohdennus (päiviä)
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +51,Serial No {0} does not exist,sarjanumeroa {0} ei ole olemassa
 DocType: Pricing Rule,Discount Percentage,alennusprosentti
 DocType: Payment Reconciliation Invoice,Invoice Number,laskun numero
-apps/erpnext/erpnext/hooks.py +70,Orders,Tilaukset
+apps/erpnext/erpnext/hooks.py +54,Orders,Tilaukset
 DocType: Leave Control Panel,Employee Type,työntekijä tyyppi
 DocType: Employee Leave Approver,Leave Approver,poistumis hyväksyjä
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +70,Swaging,rehvailu
 DocType: Manufacturing Settings,Material Transferred for Manufacture,Materiaali Siirretty valmistus
 DocType: Expense Claim,"A user with ""Expense Approver"" role","käyttäjä jolla on ""kulujen hyväksyjä"" rooli"
 ,Issued Items Against Production Order,merkityt tuotteet on liitetty tuotannon tilaukseen
@@ -2375,7 +2290,6 @@
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +62,Cost Center with existing transactions can not be converted to group,olemassaolevien tapahtumien kustannuspaikkaa ei voi muuttaa ryhmäksi
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Depreciation,arvonalennus
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),toimittaja/toimittajat
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +29,Invalid period,Virheellinen ajanjakso
 DocType: Customer,Credit Limit,luottoraja
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,valitse tapahtuman tyyppi
 DocType: GL Entry,Voucher No,tosite nro
@@ -2385,9 +2299,9 @@
 DocType: Customer,Address and Contact,Osoite ja yhteystiedot
 DocType: Customer,Last Day of the Next Month,Viimeinen päivä Seuraava kuukausi
 DocType: Employee,Feedback,palaute
+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}","Jätä ei voida myöntää ennen {0}, kun loman saldo on jo carry-välitti tulevaisuudessa loman jakamista ennätys {1}"
 apps/erpnext/erpnext/accounts/party.py +284,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),huom: viitepäivä huomioiden asiakkaan luottoraja ylittyy {0} päivää
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +621,Maint. Schedule,Maint. Aikataulu
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +108,Abrasive jet machining,koneellinen työstö
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +632,Maint. Schedule,Maint. Aikataulu
 DocType: Stock Settings,Freeze Stock Entries,jäädytä varaston kirjaukset
 DocType: Website Settings,Website Settings,verkkosivujen asetukset
 DocType: Item,Reorder level based on Warehouse,Järjestä taso perustuu Warehouse
@@ -2404,7 +2318,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +75,Show Stock Entries,näytä varaston kirjaukset
 ,Is Primary Address,On Ensisijainen osoite
 DocType: Production Order,Work-in-Progress Warehouse,työnalla varasto
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +308,Reference #{0} dated {1},Viite # {0} päivätty {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Reference #{0} dated {1},Viite # {0} päivätty {1}
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +13,Manage Addresses,Hallitse Osoitteet
 DocType: Pricing Rule,Item Code,tuotekoodi
 DocType: Production Planning Tool,Create Production Orders,tee tuotannon tilaus
@@ -2413,7 +2327,7 @@
 DocType: Lead,Market Segment,Market Segment
 DocType: Communication,Phone,Puhelin
 DocType: Employee Internal Work History,Employee Internal Work History,työntekijän sisäinen työhistoria
-apps/erpnext/erpnext/public/js/account_tree_grid.js +50,Closing (Dr),sulku (dr)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +221,Closing (Dr),sulku (dr)
 DocType: Contact,Passive,Passiivinen
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,sarjanumero {0} ei varastossa
 apps/erpnext/erpnext/config/selling.py +127,Tax template for selling transactions.,veromallipohja myyntitapahtumiin
@@ -2429,8 +2343,8 @@
 ,Billed Amount,laskutettu arvomäärä
 DocType: Bank Reconciliation,Bank Reconciliation,pankin täsmäytys
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +9,Get Updates,hae päivitykset
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +129,Material Request {0} is cancelled or stopped,materiaalipyyntö {0} on peruttu tai keskeytetty
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +641,Add a few sample records,Lisää muutama esimerkkitietue
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +133,Material Request {0} is cancelled or stopped,materiaalipyyntö {0} on peruttu tai keskeytetty
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Add a few sample records,Lisää muutama esimerkkitietue
 apps/erpnext/erpnext/config/hr.py +210,Leave Management,poistumishallinto
 DocType: Event,Groups,ryhmät
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,tilin ryhmä
@@ -2443,38 +2357,34 @@
 DocType: Features Setup,Sales Extras,myynnin ekstrat
 apps/erpnext/erpnext/accounts/utils.py +344,{0} budget for Account {1} against Cost Center {2} will exceed by {3},{0} tilin budjetti {1} kustannuspaikkaa kohtaan {2} ylittyy {3}:lla
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +236,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","erotilin tulee olla vastaavat/vastattavat tili huomioiden, että varaston täsmäytys vaatii aloituskirjauksen"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +138,Purchase Order number required for Item {0},ostotilauksen numero vaaditaan tuotteelle {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Order number required for Item {0},ostotilauksen numero vaaditaan tuotteelle {0}
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date','aloituspäivä' tulee olla ennen 'päättymispäivää'
 ,Stock Projected Qty,ennustettu varaston yksikkömäärä
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +147,Customer {0} does not belong to project {1},asiakas {0} ei kuulu projektiin {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +150,Customer {0} does not belong to project {1},asiakas {0} ei kuulu projektiin {1}
 DocType: Sales Order,Customer's Purchase Order,Asiakkaan Ostotilaus
 DocType: Warranty Claim,From Company,yrityksestä
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,arvo tai yksikkömäärä
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Minute,Minuutti
+apps/erpnext/erpnext/public/js/setup_wizard.js +363,Minute,Minuutti
 DocType: Purchase Invoice,Purchase Taxes and Charges,oston verot ja maksut
 ,Qty to Receive,vastaanotettava yksikkömäärä
 DocType: Leave Block List,Leave Block List Allowed,"poistu estoluettelo, sallittu"
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +61,Conversion factor cannot be in fractions,muuntokertoimella ei voi olla osia
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +358,You will use it to Login,Tulet käyttämään sitä sisäänkirjautumiseen
+apps/erpnext/erpnext/public/js/setup_wizard.js +108,You will use it to Login,Tulet käyttämään sitä sisäänkirjautumiseen
 DocType: Sales Partner,Retailer,Jälleenmyyjä
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +99,Credit To account must be a Balance Sheet account,Kiitos tilin on oltava Tase tili
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,kaikki toimittajatyypit
 apps/erpnext/erpnext/stock/doctype/item/item.py +37,Item Code is mandatory because Item is not automatically numbered,"tuotekoodi vaaditaan, sillä tuotetta ei numeroida automaattisesti"
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +99,Quotation {0} not of type {1},tarjous {0} ei ole tyyppiä {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +93,Quotation {0} not of type {1},tarjous {0} ei ole tyyppiä {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,"huoltoaikataulu, tuote"
 DocType: Sales Order,%  Delivered,% toimitettu
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,Bank Overdraft Account,pankin tilinylitystili
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +15,Make Salary Slip,tee palkkalaskelma
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +18,Browse BOM,selaa BOM:a
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +175,Secured Loans,taatut lainat
-apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +3,Awesome Products,hyvät tavarat
+apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +3,Awesome Products,hyvät tavarat
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +189,Opening Balance Equity,avaa oman pääoman tase
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +80,Cannot approve leave as you are not authorized to approve leaves on Block Dates,"ei voi hyväksyä, poistumista sillä sinulla ei ole oikeuksia hyväksyä lohkopäivämääriä"
 DocType: Appraisal,Appraisal,arviointi
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +13,Lost-foam casting,Kadonnut-vaahto valu
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +47,Drawing,piirto
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +22,Date is repeated,päivä toistetaan
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +148,Leave approver must be one of {0},poistumis hyväksyjä tulee olla {0}:sta
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +162,Leave approver must be one of {0},poistumis hyväksyjä tulee olla {0}:sta
 DocType: Hub Settings,Seller Email,myyjä sähköposti
 DocType: Project,Total Purchase Cost (via Purchase Invoice),hankintakustannusten kokonaismäärä (ostolaskuista)
 DocType: Workstation Working Hour,Start Time,aloitusaika
@@ -2488,7 +2398,7 @@
 DocType: Purchase Invoice Item,Net Amount (Company Currency),netto arvomäärä (yrityksen valuutta)
 DocType: BOM Operation,Hour Rate,tuntitaso
 DocType: Stock Settings,Item Naming By,tuotteen nimeäjä
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +642,From Quotation,tarjouksesta
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +655,From Quotation,tarjouksesta
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},toinen jakson sulkukirjaus {0} on tehty {1} jälkeen
 DocType: Production Order,Material Transferred for Manufacturing,materiaali siirretty tuotantoon
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +29,Account {0} does not exists,Tiliä {0} ei löydy
@@ -2502,21 +2412,19 @@
 DocType: Purchase Invoice Item,PR Detail,PR Detail
 DocType: Sales Order,Fully Billed,täysin laskutettu
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +20,Cash In Hand,käsirahat
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +72,Delivery warehouse required for stock item {0},Toimitus varasto tarvitaan varastonimike {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +119,Delivery warehouse required for stock item {0},Toimitus varasto tarvitaan varastonimike {0}
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),"pakkauksen bruttopaino, yleensä tuotteen nettopaino + pakkausmateriaalin paino  (tulostukseen)"
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,"roolin käyttäjät ei voi jäädyttää tilejä, tai luoda / muokata kirjanpidon kirjauksia jäädytettyillä tileillä"
 DocType: Serial No,Is Cancelled,on peruutettu
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +281,My Shipments,Omat lähetykset
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +286,My Shipments,Omat lähetykset
 DocType: Journal Entry,Bill Date,Bill Date
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +43,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:",vaikka useita hinnoittelusääntöjä on olemassa korkeimmalla prioriteetilla seuraavia sisäisiä prioriteettejä noudatetaan
 DocType: Supplier,Supplier Details,toimittajan lisätiedot
 DocType: Communication,Recipients,Vastaanottajat
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +146,Screwing,ruuvaamalla
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +96,Knurling,Knurling
 DocType: Expense Claim,Approval Status,hyväksynnän tila
 DocType: Hub Settings,Publish Items to Hub,Julkaise tuotteet Hub
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +44,From value must be less than to value in row {0},arvosta täytyy olla pienempi kuin arvo rivillä {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +133,Wire Transfer,johdotus siirto
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +133,Wire Transfer,johdotus siirto
 apps/erpnext/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py +25,Please select Bank Account,valitse pankkitili
 DocType: Newsletter,Create and Send Newsletters,tee ja lähetä uutiskirjeitä
 apps/frappe/frappe/public/js/frappe/views/reports/grid_report.js +305,From Date must be before To Date,alkaen päivä on ennen päättymispäivää
@@ -2524,14 +2432,14 @@
 DocType: Company,Default Income Account,oletus tulotili
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,asiakasryhmä / asiakas
 DocType: Item Group,Check this if you want to show in website,täppää mikäli haluat näyttää tämän verkkosivuilla
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +190,Welcome to ERPNext,tervetuloa ERPNext
+,Welcome to ERPNext,tervetuloa ERPNext
 DocType: Payment Reconciliation Payment,Voucher Detail Number,tosite lisätiedot numero
 apps/erpnext/erpnext/config/crm.py +146,Lead to Quotation,vihjeestä tarjous
 DocType: Lead,From Customer,asiakkaasta
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +37,Calls,pyynnöt
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Calls,pyynnöt
 DocType: Project,Total Costing Amount (via Time Logs),kustannuslaskenta arvomäärä yhteensä (aikaloki)
 DocType: Purchase Order Item Supplied,Stock UOM,varasto UOM
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Purchase Order {0} is not submitted,ostotilausta {0} ei ole lähetetty
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +194,Purchase Order {0} is not submitted,ostotilausta {0} ei ole lähetetty
 ,Projected,ennustus
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},sarjanumero {0} ei kuulu varastoon {1}
 apps/erpnext/erpnext/controllers/status_updater.py +136,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,huom: järjestelmä ei tarkista ylitoimitusta tai tuotteen ylivarausta {0} yksikkömääränä tai arvomäärän ollessa 0
@@ -2539,7 +2447,6 @@
 DocType: Issue,Opening Date,Opening Date
 DocType: Journal Entry,Remark,Huomautus
 DocType: Purchase Receipt Item,Rate and Amount,taso ja arvomäärä
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +95,Boring,Tylsä
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +667,From Sales Order,myyntitilauksesta
 DocType: Blog Category,Parent Website Route,Parent Verkkosivujen Route
 DocType: Sales Order,Not Billed,Ei laskuteta
@@ -2553,19 +2460,17 @@
 apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount Amount,alennus arvomäärä
 DocType: Purchase Invoice,Return Against Purchase Invoice,"ostolasku, palautuksen kohdistus"
 DocType: Item,Warranty Period (in days),takuuaika (päivinä)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +550,e.g. VAT,"esim, alv"
+apps/erpnext/erpnext/public/js/setup_wizard.js +292,e.g. VAT,"esim, alv"
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,tuote 4
 DocType: Journal Entry Account,Journal Entry Account,päiväkirjakirjaus tili
 DocType: Shopping Cart Settings,Quotation Series,"tarjous, sarjat"
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +52,"An item exists with same name ({0}), please change the item group name or rename the item","samanniminen tuote on jo olemassa ({0}), vaihda tuoteryhmän nimeä tai nimeä tuote uudelleen"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +82,Hot metal gas forming,kuuma metallikaasu muovaus
 DocType: Sales Order Item,Sales Order Date,"myyntitilaus, päivä"
 DocType: Sales Invoice Item,Delivered Qty,toimitettu yksikkömäärä
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +63,Warehouse {0}: Company is mandatory,Varasto {0}: Yritys on pakollinen
 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.","siirry kyseiseen ryhmään (yleensä rahoituksen lähde> lyhytaikaiset vastattavat> verot ja tullit ja tee uusi tili (valitsemalla lisää alasidos) ""vero"" muista mainita veroaste"
 ,Payment Period Based On Invoice Date,maksuaikaa perustuu laskun päiväykseen
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +50,Missing Currency Exchange Rates for {0},valuuttakurssi puuttuu {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +135,Laser cutting,Laserleikkaus
 DocType: Event,Monday,Maanantai
 DocType: Journal Entry,Stock Entry,varaston kirjaus
 DocType: Account,Payable,maksettava
@@ -2598,7 +2503,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +111,Date Of Retirement must be greater than Date of Joining,eläkkepäivän on oltava suurempi kuin liittymispäivä
 DocType: Sales Invoice,Against Income Account,tulotilin kodistus
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +69,{0}% Delivered,{0}% toimitettu
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +78,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,tuote {0}: tilattu yksikkömäärä {1} ​​ei voi olla pienempi kuin pienin tilaus yksikkömäärä {2} (määritellylle tuotteelle)
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,tuote {0}: tilattu yksikkömäärä {1} ​​ei voi olla pienempi kuin pienin tilaus yksikkömäärä {2} (määritellylle tuotteelle)
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,"toimitus kuukaudessa, prosenttiosuus"
 DocType: Territory,Territory Targets,aluetavoite
 DocType: Delivery Note,Transporter Info,kuljetuksen info
@@ -2607,7 +2512,6 @@
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,"tuolostus, mallipohjan otsikot esim, proformalaskuun"
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +140,Valuation type charges can not marked as Inclusive,arvotyypin maksuja ei voi sisällyttää
 DocType: POS Profile,Update Stock,päivitä varasto
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +128,Superfinishing,super viimeistely
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,"tuotteiden eri UOM johtaa virheellisiin (kokonais) painoarvon, varmista, että tuotteiden nettopainot on samassa UOM:ssa"
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM taso
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +85,Please pull items from Delivery Note,siirrä tuotteita lähetteeltä
@@ -2622,7 +2526,6 @@
 ,Purchase Analytics,Osto Analytics
 DocType: Sales Invoice Item,Delivery Note Item,lähetteen tuote
 DocType: Expense Claim,Task,tehtävä
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +57,Shaving,lastutus
 DocType: Purchase Taxes and Charges,Reference Row #,Viite Row #
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},eränumero on pakollinen tuotteelle {0}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js +14,This is a root sales person and cannot be edited.,tämä on kantamyyjä eikä niitä voi muokata
@@ -2634,13 +2537,11 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +74,Purpose must be one of {0},Tarkoitus on oltava yksi {0}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +108,Fill the form and save it,täytä muoto ja tallenna se
 DocType: Production Planning Tool,Download a report containing all raw materials with their latest inventory status,"lataa raportti, joka  sisältää kaikki raaka-aineet viimeisimmän varastotaseen mukaan"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +94,Facing,kohtaaminen
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,Yhteisön Forum
 DocType: Leave Application,Leave Balance Before Application,poistu taseesta ennen sovellusta
 DocType: SMS Center,Send SMS,lähetä tekstiviesti
 DocType: Company,Default Letter Head,oletus kirjeen otsikko
 DocType: Time Log,Billable,Laskutettava
-DocType: Authorization Rule,This will be used for setting rule in HR module,tätä käytetään sääntöjen asetuksissa henkilöstömoduulin
 DocType: Account,Rate at which this tax is applied,taso jolla tätä veroa sovelletaan
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reorder Qty,uudellentilattu yksikkömäärä
 DocType: Company,Stock Adjustment Account,varastonsäätötili
@@ -2667,16 +2568,15 @@
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,Prosenttiosuuden jako tulisi olla yhtä suuri 100%
 DocType: Serial No,Out of AMC,Out of AMC
 DocType: Purchase Order Item,Material Request Detail No,materiaalipyynnön yksilönro
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +97,Hard turning,vaikea kääntö
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +33,Make Maintenance Visit,tee huoltokäynti
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +187,Please contact to the user who have Sales Master Manager {0} role,"ota yhteyttä käyttäjään, jolla on myynninhallinnan valvojan rooli {0}"
 DocType: Company,Default Cash Account,oletus kassatili
 apps/erpnext/erpnext/config/accounts.py +79,Company (not Customer or Supplier) master.,yrityksen valvonta (ei asiakas tai toimittaja)
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +106,Please enter 'Expected Delivery Date',Anna &quot;Expected Delivery Date&quot;
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +187,Delivery Notes {0} must be cancelled before cancelling this Sales Order,lähete {0} tulee perua ennen myyntilauksen perumista
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +100,Please enter 'Expected Delivery Date',Anna &quot;Expected Delivery Date&quot;
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +182,Delivery Notes {0} must be cancelled before cancelling this Sales Order,lähete {0} tulee perua ennen myyntilauksen perumista
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +373,Paid amount + Write Off Amount can not be greater than Grand Total,maksettu arvomäärä + poistotilin summa ei voi olla suurempi kuin kokonaissumma
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} ei sallittu eränumero tuotteelle {1}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,Note: There is not enough leave balance for Leave Type {0},"huom, jäännöstyypille {0} ei ole tarpeeksi vapaata jäännöstasetta"
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +124,Note: There is not enough leave balance for Leave Type {0},"huom, jäännöstyypille {0} ei ole tarpeeksi vapaata jäännöstasetta"
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +9,"Note: If payment is not made against any reference, make Journal Entry manually.","huom: mikäli maksu suoritetaan ilman viitettä, tee päiväkirjakirjaus manuaalisesti"
 DocType: Item,Supplier Items,toimittajan tuotteet
 DocType: Opportunity,Opportunity Type,tilaisuus tyyppi
@@ -2688,7 +2588,7 @@
 DocType: Hub Settings,Publish Availability,Julkaise Saatavuus
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +105,Date of Birth cannot be greater than today.,syntymäpäivä ei voi olla tämän päivän jälkeen
 ,Stock Ageing,varaston vanheneminen
-apps/erpnext/erpnext/controllers/accounts_controller.py +200,{0} '{1}' is disabled,{0} '{1}' on poistettu käytöstä
+apps/erpnext/erpnext/controllers/accounts_controller.py +201,{0} '{1}' is disabled,{0} '{1}' on poistettu käytöstä
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,aseta avoimeksi
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,"lähetä sähköpostia automaattisesti yhteyshenkilöille kun tapahtuman ""lähetys"" tehdään"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +232,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
@@ -2697,44 +2597,38 @@
 DocType: Purchase Order,Customer Contact Email,Asiakas Sähköpostiosoite
 DocType: Event,Sunday,sunnuntai
 DocType: Sales Team,Contribution (%),panostus (%)
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +455,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,huom: maksukirjausta ei synny sillä 'kassa- tai pankkitiliä' ei ole määritetty
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +171,Responsibilities,Vastuut
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +457,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,huom: maksukirjausta ei synny sillä 'kassa- tai pankkitiliä' ei ole määritetty
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +171,Responsibilities,Vastuut
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Template,mallipohja
 DocType: Sales Person,Sales Person Name,myyjän nimi
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,syötä taulukkoon vähintään yksi lasku
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +511,Add Users,Lisää käyttäjiä
+apps/erpnext/erpnext/public/js/setup_wizard.js +255,Add Users,Lisää käyttäjiä
 DocType: Pricing Rule,Item Group,tuoteryhmä
 DocType: Task,Actual Start Date (via Time Logs),todellinen aloituspäivä (aikalokin mukaan)
 DocType: Stock Reconciliation Item,Before reconciliation,ennen täsmäytystä
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +12,To {0},(lle) {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),verot ja maksut lisätty (yrityksen valuutta)
-apps/erpnext/erpnext/stock/doctype/item/item.py +340,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,"tuotteen vero, rivi {0} veron tyyppi tulee määritellä (tulo, kulu, veloitettava)"
+apps/erpnext/erpnext/stock/doctype/item/item.py +344,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,"tuotteen vero, rivi {0} veron tyyppi tulee määritellä (tulo, kulu, veloitettava)"
 DocType: Sales Order,Partly Billed,Osittain Laskutetaan
 DocType: Item,Default BOM,oletus BOM
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +79,Decambering,kaareutuma
 apps/erpnext/erpnext/setup/doctype/company/company.js +22,Please re-type company name to confirm,kirjoita yrityksen nimi uudelleen vahvistukseksi
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,"odottaa, pankkipääte yhteensä"
 DocType: Time Log Batch,Total Hours,tunnit yhteensä
 DocType: Journal Entry,Printing Settings,Asetusten tulostaminen
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +268,Total Debit must be equal to Total Credit. The difference is {0},"debet yhteensä tulee olla sama kuin kredit yhteensä, ero on {0}"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +11,Automotive,Automotive
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +37,Item is required,tuote vaaditaan
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +25,Metal injection molding,Metal ruiskuvalu
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +258,Total Debit must be equal to Total Credit. The difference is {0},"debet yhteensä tulee olla sama kuin kredit yhteensä, ero on {0}"
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,Automotive
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +684,From Delivery Note,lähetteestä
 DocType: Time Log,From Time,ajasta
 DocType: Notification Control,Custom Message,oma viesti
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +33,Investment Banking,sijoitukset pankki
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +261,"Select your Country, Time Zone and Currency","valitse maa, aikavyöhyke ja valuutta"
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,sijoitukset pankki
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +316,"Select your Country, Time Zone and Currency","valitse maa, aikavyöhyke ja valuutta"
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +369,Cash or Bank Account is mandatory for making payment entry,kassa tai pankkitili vaaditaan maksujen kirjaukseen
 DocType: Purchase Invoice,Price List Exchange Rate,hinnasto vaihtotaso
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +91,Pickling,valinta
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +18,Sand casting,hiekka valu
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +117,Electroplating,galvanointi
 DocType: Purchase Invoice Item,Rate,taso
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +62,Intern,harjoitella
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Intern,harjoitella
 DocType: Newsletter,A Lead with this email id should exist,kyseisen sähköpostin tunnuksella löytyy kytketty markkinavihje
 DocType: Stock Entry,From BOM,BOM:sta
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +34,Basic,perustiedot
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +34,Basic,perustiedot
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,ennen {0} rekisteröidyt varastotapahtumat on jäädytetty
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +217,Please click on 'Generate Schedule',"klikkaa ""muodosta aikataulu"""
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +61,To Date should be same as From Date for Half Day leave,päivä tulee olla sama kuin 1/2 päivä poistumisessa
@@ -2742,10 +2636,10 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +96,Reference No is mandatory if you entered Reference Date,viitenumero vaaditaan mykäli viitepäivä on annettu
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +108,Date of Joining must be greater than Date of Birth,liittymispäivä tulee olla syntymäpäivän jälkeen
 DocType: Salary Structure,Salary Structure,palkkarakenne
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +242,"Multiple Price Rule exists with same criteria, please resolve \
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +246,"Multiple Price Rule exists with same criteria, please resolve \
 			conflict by assigning priority. Price Rules: {0}","useampi hintasääntö löytyy samoilla kriteereillä, selvitä \ konflikti antamalla prioriteett, hintasäännöt: {0}"
 DocType: Account,Bank,pankki
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +9,Airline,lentoyhtiö
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,lentoyhtiö
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +493,Issue Material,materiaali aihe
 DocType: Material Request Item,For Warehouse,varastoon
 DocType: Employee,Offer Date,Tarjous Date
@@ -2755,29 +2649,24 @@
 DocType: Item,Is Fixed Asset Item,on pitkaikaiset vastaavat tuote
 DocType: Stock Entry,Including items for sub assemblies,mukaanlukien alikokoonpanon tuotteet
 DocType: Features Setup,"If you have long print formats, this feature can be used to split the page to be printed on multiple pages with all headers and footers on each page",mikäli tulostusmuoto on pitka tätä toimitoa voidaan käyttää jaottelemaan tulostus useammalle sivulle ylä- ja alatunnistein
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +131,Hobbing,vierintä
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +98,All Territories,Kaikki alueet
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +98,All Territories,Kaikki alueet
 DocType: Purchase Invoice,Items,tuotteet
 DocType: Fiscal Year,Year Name,Vuoden nimi
 DocType: Process Payroll,Process Payroll,Process Palkanlaskenta
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +59,There are more holidays than working days this month.,tässä kuussa ei ole lomapäiviä työpäivinä
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +68,There are more holidays than working days this month.,tässä kuussa ei ole lomapäiviä työpäivinä
 DocType: Product Bundle Item,Product Bundle Item,tavarakokonaisuus tuote
 DocType: Sales Partner,Sales Partner Name,myyntikumppani nimi
 DocType: Purchase Invoice Item,Image View,kuvanäkymä
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +113,Finishing & industrial finishing,viimeistely & teollinen viimeistely
 DocType: Issue,Opening Time,Aukeamisaika
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,alkaen- ja päätyen päivä vaaditaan
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +46,Securities & Commodity Exchanges,arvopaperit & hyödykkeet vaihto
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,arvopaperit & hyödykkeet vaihto
 DocType: Shipping Rule,Calculate Based On,"laske, perusteet"
 DocType: Delivery Note Item,From Warehouse,Varastosta
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +98,Drilling,poraus
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +28,Blow molding,Puhallusmuovaus
 DocType: Purchase Taxes and Charges,Valuation and Total,arvo ja summa
 DocType: Tax Rule,Shipping City,Toimitus Kaupunki
 apps/erpnext/erpnext/stock/doctype/item/item.js +43,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,"tämä on malli tuotteesta {0} (mallipohja), tuotteen tuntomerkit kopioidaan ellei 'älä kopioi' ole aktivoitu"
 DocType: Account,Purchase User,Osto Käyttäjä
 DocType: Notification Control,Customize the Notification,muokkaa ilmoitusta
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +87,Hammering,vasarointi
 DocType: Web Page,Slideshow,diaesitys
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +24,Default Address Template cannot be deleted,"oletus osoite, mallipohjaa ei voi poistaa"
 DocType: Sales Invoice,Shipping Rule,toimitus sääntö
@@ -2786,9 +2675,8 @@
 DocType: Workflow State,Search,haku
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +54,Total cannot be zero,yhteensä ei voi olla nolla
 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,'päivää edellisestä tilauksesta' on oltava suurempi tai yhtäsuuri kuin nolla
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +142,Brazing,juotos
 DocType: C-Form,Amended From,muutettu mistä
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Raw Material,raaka-aine
+apps/erpnext/erpnext/public/js/setup_wizard.js +359,Raw Material,raaka-aine
 DocType: Leave Application,Follow via Email,seuraa sähköpostitse
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,veron arvomäärä alennuksen jälkeen
 apps/erpnext/erpnext/accounts/doctype/account/account.py +174,Child account exists for this account. You can not delete this account.,"tällä tilillä on alatili, et voi poistaa tätä tiliä"
@@ -2802,10 +2690,10 @@
 ,Produced,Valmistettu
 DocType: Item,Item Code for Suppliers,toimittajan tuotekoodi
 DocType: Issue,Raised By (Email),Raised By (sähköposti)
-apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +72,General,pää
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +495,Attach Letterhead,Kiinnitä Kirjelomake
+apps/erpnext/erpnext/setup/setup_wizard/default_website.py +72,General,pää
+apps/erpnext/erpnext/public/js/setup_wizard.js +241,Attach Letterhead,Kiinnitä Kirjelomake
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +272,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',vähennystä ei voi tehdä jos kategoria on  'arvo'  tai 'arvo ja summa'
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +542,"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.","luettelo verotapahtumista, kuten (alv, tulli, ym, ne tulee olla uniikkeja nimiä) ja vakioarvoin, tämä luo perusmallipohjan, jota muokata tai lisätä tarpeen mukaan myöhemmin"
+apps/erpnext/erpnext/public/js/setup_wizard.js +284,"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.","luettelo verotapahtumista, kuten (alv, tulli, ym, ne tulee olla uniikkeja nimiä) ja vakioarvoin, tämä luo perusmallipohjan, jota muokata tai lisätä tarpeen mukaan myöhemmin"
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial Nos Required for Serialized Item {0},sarjanumero edelyttää sarjoitettua tuotetta {0}
 DocType: Journal Entry,Bank Entry,pankkikirjaus
 DocType: Authorization Rule,Applicable To (Designation),sovellettavissa (nimi)
@@ -2814,32 +2702,31 @@
 apps/erpnext/erpnext/config/accounts.py +143,Enable / disable currencies.,"aktivoi / poista käytöstä, valuutat"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Postal Expenses,postituskulut
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),yhteensä (pankkipääte)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +26,Entertainment & Leisure,edustus & vapaa-aika
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,edustus & vapaa-aika
 DocType: Purchase Order,The date on which recurring order will be stop,päivä jolloin toistuva tilaus lakkaa
 DocType: Quality Inspection,Item Serial No,tuote sarjanumero
 apps/erpnext/erpnext/controllers/status_updater.py +142,{0} must be reduced by {1} or you should increase overflow tolerance,{0} on alennettava {1} tai määrittää suurempi virtaustoleranssiarvo
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Present,esillä yhteensä
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Hour,tunti
+apps/erpnext/erpnext/public/js/setup_wizard.js +363,Hour,tunti
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +138,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation",sarjanumerollista tuottetta {0} ei voi päivittää varaston täsmäytyksellä
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +488,Transfer Material to Supplier,materiaalisiirto toimittajalle
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +513,Transfer Material to Supplier,materiaalisiirto toimittajalle
 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,"uusi sarjanumero voi olla varastossa, sarjanumero muodoruu varaston kirjauksella tai ostokuitilla"
 DocType: Lead,Lead Type,vihjeen tyyppi
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +82,Create Quotation,tee tarjous
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +306,All these items have already been invoiced,Kaikki nämä asiat on jo laskutettu
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,You are not authorized to approve leaves on Block Dates,Sinulla ei ole lupa hyväksyä lehdet Block Päivämäärät
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +311,All these items have already been invoiced,Kaikki nämä asiat on jo laskutettu
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},hyväksyjä on {0}
 DocType: Shipping Rule,Shipping Rule Conditions,toimitus sääntö ehdot
 DocType: BOM Replace Tool,The new BOM after replacement,uusi BOM korvauksen jälkeen
 DocType: Features Setup,Point of Sale,Point of Sale
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +83,Curling,kiharrus
 DocType: Account,Tax,vero
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +28,Row {0}: {1} is not a valid {2},Rivi {0}: {1} ei ole kelvollinen {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +89,Refining,Öljynjalostus
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +37,Row {0}: {1} is not a valid {2},Rivi {0}: {1} ei ole kelvollinen {2}
 DocType: Production Planning Tool,Production Planning Tool,Tuotannon suunnittelu Tool
 DocType: Quality Inspection,Report Date,raporttipäivä
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +130,Routing,Reititys
 DocType: C-Form,Invoices,laskut
 DocType: Job Opening,Job Title,Työtehtävä
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +54,{0} already allocated for Employee {1} for period {2} - {3},{0} on jo myönnetty Työsuhde {1} kauden {2} - {3}
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +80,{0} Recipients,{0} vastaanottajat
 DocType: Features Setup,Item Groups in Details,"tuoteryhmä, lisätiedot"
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +335,Quantity to Manufacture must be greater than 0.,Määrä Valmistus on oltava suurempi kuin 0.
@@ -2858,14 +2745,13 @@
 DocType: DocType,Setup,määritykset
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,ei muokattavaa
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +108,Summary for this month and pending activities,Yhteenveto tässä kuussa ja keskeneräisten toimien
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +39,Cold rolling,kylmävalssaus
 DocType: Customer Group,Customer Group Name,asiakasryhmän nimi
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +408,Please remove this Invoice {0} from C-Form {1},poista lasku {0} C-kaaviosta {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +410,Please remove this Invoice {0} from C-Form {1},poista lasku {0} C-kaaviosta {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,valitse jatka eteenpäin mikäli haluat sisällyttää edellisen tilikauden taseen tälle tilikaudelle
 DocType: GL Entry,Against Voucher Type,tositteen tyyppi kohdistus
 DocType: Item,Attributes,tuntomerkkejä
 DocType: Packing Slip,Get Items,hae tuotteet
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +186,Please enter Write Off Account,syötä poistotili
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +187,Please enter Write Off Account,syötä poistotili
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +71,Last Order Date,Last Order Päivämäärä
 DocType: DocField,Image,kuva
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +179,Make Excise Invoice,tee poistolasku
@@ -2875,7 +2761,7 @@
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +146,Operation ID not set,Operation ID ei ole asetettu
 DocType: Production Order,Planned Start Date,Suunnitellut aloituspäivä
 DocType: Serial No,Creation Document Type,asiakirjantyypin luonti
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +620,Maint. Visit,Maint. Vierailu
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +631,Maint. Visit,Maint. Vierailu
 DocType: Leave Type,Is Encash,on perintä
 DocType: Purchase Invoice,Mobile No,Mobile No
 DocType: Payment Tool,Make Journal Entry,tee päiväkirjakirjaus
@@ -2883,35 +2769,31 @@
 apps/erpnext/erpnext/controllers/trends.py +257,Project-wise data is not available for Quotation,"projekti työkalu, tietoja ei ole saatavilla tarjousvaiheessa"
 DocType: Project,Expected End Date,odotettu päättymispäivä
 DocType: Appraisal Template,Appraisal Template Title,"arviointi, mallipohja otsikko"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +440,Commercial,kaupallinen
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +378,Commercial,kaupallinen
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +23,Parent Item {0} must not be a Stock Item,Parent Kohta {0} ei saa olla Kanta Tuote
 DocType: Cost Center,Distribution Id,"toimitus, tunnus"
-apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +14,Awesome Services,hyvät palvelut
+apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +14,Awesome Services,hyvät palvelut
 apps/erpnext/erpnext/config/manufacturing.py +29,All Products or Services.,kaikki tavarat tai palvelut
 DocType: Purchase Invoice,Supplier Address,toimittajan osoite
 DocType: Contact Us Settings,Address Line 2,osoiterivi 2
 DocType: ToDo,Reference,Viite
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +59,Perforating,Perforointi
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,ulkona yksikkömäärä
 apps/erpnext/erpnext/config/accounts.py +128,Rules to calculate shipping amount for a sale,sääntö laskee toimituskustannuksen arvomäärän myyntiin
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +29,Series is mandatory,sarjat ovat pakollisia
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +28,Financial Services,talouspalvelu
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,talouspalvelu
 apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3},Vastinetta Taito {0} on oltava alueella {1} ja {2} vuonna välein {3}
 DocType: Tax Rule,Sales,myynti
 DocType: Stock Entry Detail,Basic Amount,Perusmäärät
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +173,Warehouse required for stock Item {0},varastolta vaaditaan varastotuotteelle {0}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +178,Warehouse required for stock Item {0},varastolta vaaditaan varastotuotteelle {0}
 DocType: Leave Allocation,Unused leaves,Käyttämättömät lehdet
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,Cr
 DocType: Customer,Default Receivable Accounts,oletus saatava tilit
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +102,Sawing,sahaus
 DocType: Tax Rule,Billing State,Laskutus valtion
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +32,Laminating,Laminointi
 DocType: Item Reorder,Transfer,siirto
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +549,Fetch exploded BOM (including sub-assemblies),nouda BOM räjäytys (mukaan lukien alikokoonpanot)
 DocType: Authorization Rule,Applicable To (Employee),sovellettavissa (työntekijä)
 apps/erpnext/erpnext/controllers/accounts_controller.py +101,Due Date is mandatory,eräpäivä vaaditaan
 apps/erpnext/erpnext/controllers/item_variant.py +51,Increment for Attribute {0} cannot be 0,Puuston Taito {0} ei voi olla 0
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +143,Sintering,sintraus
 DocType: Journal Entry,Pay To / Recd From,Pay To / RECD Mistä
 DocType: Naming Series,Setup Series,sarjojen määritys
 DocType: Supplier,Contact HTML,"yhteystiedot, HTML"
@@ -2924,7 +2806,6 @@
 DocType: Attendance,Absent,puuttua
 DocType: Product Bundle,Product Bundle,tavarakokonaisuus
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +180,Row {0}: Invalid reference {1},Rivi {0}: Virheellinen viittaus {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +165,Crushing,murskaava
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,oston verojen ja maksujen mallipohja
 DocType: Upload Attendance,Download Template,lataa mallipohja
 DocType: GL Entry,Remarks,Huomautuksia
@@ -2932,14 +2813,12 @@
 DocType: Journal Entry,Write Off Based On,poisto perustuu
 DocType: Features Setup,POS View,POS View
 apps/erpnext/erpnext/config/stock.py +38,Installation record for a Serial No.,sarjanumeron asennustietue
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +9,Continuous casting,jatkuva osajako
 apps/erpnext/erpnext/public/js/queries.js +39,Please specify a,Ilmoitathan
 DocType: Offer Letter,Awaiting Response,Odottaa vastausta
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +53,Above,Yläpuolella
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +80,Cold sizing,kylmä mitoitus
 DocType: Salary Slip,Earning & Deduction,ansio & vähennys
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +76,Account {0} cannot be a Group,tili {0} ei voi ryhmä
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +259,Region,Alue
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +314,Region,Alue
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +213,Optional. This setting will be used to filter in various transactions.,"valinnainen, asetusta käytetään suodatettaessa eri tapahtumia"
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +104,Negative Valuation Rate is not allowed,negatiivinen arvotaso ei ole sallittu
 DocType: Holiday List,Weekly Off,viikottain pois
@@ -2957,7 +2836,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,Account {0} is inactive,tili {0} ei ole aktiivinen
 DocType: GL Entry,Is Advance,on ennakko
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,"osallistuminen päivästä, osallistuminen päivään To vaaditaan"
-apps/erpnext/erpnext/controllers/buying_controller.py +131,Please enter 'Is Subcontracted' as Yes or No,"syötä ""on alihankittu"" (kyllä ​​tai ei)"
+apps/erpnext/erpnext/controllers/buying_controller.py +122,Please enter 'Is Subcontracted' as Yes or No,"syötä ""on alihankittu"" (kyllä ​​tai ei)"
 DocType: Sales Team,Contact No.,yhteystiedot nro
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,'Profit and Loss' type account {0} not allowed in Opening Entry,'tuloslaskelma' tiliä {0} ei sallita avauskirjaukseen
 DocType: Workflow State,Time,aika
@@ -2966,14 +2845,13 @@
 DocType: Authorization Rule,Authorization Rule,Valtuutus Rule
 DocType: Sales Invoice,Terms and Conditions Details,ehdot ja säännöt lisätiedot
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,myynnin verojen ja maksujen mallipohja
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +10,Apparel & Accessories,asut ja tarvikkeet
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,asut ja tarvikkeet
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +67,Number of Order,tilausten lukumäärä
 DocType: Item Group,HTML / Banner that will show on the top of product list.,HTML / banneri joka näkyy tuoteluettelon päällä
 DocType: Shipping Rule,Specify conditions to calculate shipping amount,määritä toimituskustannus arvomäärälaskennan ehdot
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +121,Add Child,lisää alasidos
 DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,rooli voi jäädyttää- sekä muokata jäädytettyjä kirjauksia
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +52,Cannot convert Cost Center to ledger as it has child nodes,"kustannuspaikasta ei voi siirtää tilikirjaan, sillä kustannuspaikalla on alasidoksia"
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +47,Conversion Factor is required,muuntokerroin vaaditaan
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +37,Serial #,sarja #
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +87,Commission on Sales,provisio myynti
 DocType: Offer Letter Term,Value / Description,arvo / kuvaus
@@ -2981,10 +2859,8 @@
 ,Customers Not Buying Since Long Time,asiakkaat jotka ei ole ostaneet pitkään aikaan
 DocType: Production Order,Expected Delivery Date,odotettu toimituspäivä
 apps/erpnext/erpnext/accounts/general_ledger.py +121,Debit and Credit not equal for {0} #{1}. Difference is {2}.,debet ja kredit eivät täsmää {0} # {1}. ero on {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +48,Bulging,pullistua
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +11,Evaporative-pattern casting,haihduttava-rutiini valu
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Entertainment Expenses,edustuskulut
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +195,Sales Invoice {0} must be cancelled before cancelling this Sales Order,myyntilasku {0} tulee peruuttaa ennen myyntitilauksen perumista
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +190,Sales Invoice {0} must be cancelled before cancelling this Sales Order,myyntilasku {0} tulee peruuttaa ennen myyntitilauksen perumista
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +61,Age,ikä
 DocType: Time Log,Billing Amount,laskutuksen arvomäärä
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +84,Invalid quantity specified for item {0}. Quantity should be greater than 0.,virheellinen yksikkömäärä on määritetty tuotteelle {0} se tulee olla suurempi kuin 0
@@ -3003,26 +2879,24 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,Uusi asiakas Liikevaihto
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Travel Expenses,matkakulut
 DocType: Maintenance Visit,Breakdown,hajoitus
-apps/erpnext/erpnext/controllers/accounts_controller.py +241,Account: {0} with currency: {1} can not be selected,Tili: {0} kanssa valuutta: {1} ei voi valita
+apps/erpnext/erpnext/controllers/accounts_controller.py +242,Account: {0} with currency: {1} can not be selected,Tili: {0} kanssa valuutta: {1} ei voi valita
 DocType: Bank Reconciliation Detail,Cheque Date,takaus/shekki päivä
 apps/erpnext/erpnext/accounts/doctype/account/account.py +47,Account {0}: Parent account {1} does not belong to company: {2},tili {0}: emotili {1} ei kuulu yritykselle: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted all transactions related to this company!,kaikki tähän yritykseen liittyvät tapahtumat on poistettu
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,Kuin Päivämäärä
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +111,Honing,hoonaus
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +58,Probation,Koeaika
-apps/erpnext/erpnext/stock/doctype/item/item.py +264,Default Warehouse is mandatory for stock Item.,oletus Varasto vaaditaan varastotuotteelle
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Probation,Koeaika
+apps/erpnext/erpnext/stock/doctype/item/item.py +268,Default Warehouse is mandatory for stock Item.,oletus Varasto vaaditaan varastotuotteelle
 DocType: Feed,Full Name,kokonimi
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +148,Clinching,ratkaisija
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +191,Payment of salary for the month {0} and year {1},palkanmaksu kuukausi {0} vuosi {1}
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +173,Payment of salary for the month {0} and year {1},palkanmaksu kuukausi {0} vuosi {1}
 DocType: Stock Settings,Auto insert Price List rate if missing,"Automaattinen käynnistys Hinnasto korolla, jos puuttuu"
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,maksettu arvomäärä yhteensä
 ,Transferred Qty,siirretty yksikkömäärä
 apps/erpnext/erpnext/config/learn.py +11,Navigating,Liikkuminen
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +137,Planning,Suunnittelu
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +137,Planning,Suunnittelu
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +9,Make Time Log Batch,Tee Time Log Erä
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Issued,liitetty
 DocType: Project,Total Billing Amount (via Time Logs),laskutuksen kokomaisarvomäärä (aikaloki)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +629,We sell this Item,myymme tätä tuotetta
+apps/erpnext/erpnext/public/js/setup_wizard.js +365,We sell this Item,myymme tätä tuotetta
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +65,Supplier Id,toimittaja tunnus
 DocType: Journal Entry,Cash Entry,kassakirjaus
 DocType: Sales Partner,Contact Desc,"yhteystiedot, kuvailu"
@@ -3031,18 +2905,16 @@
 DocType: Brand,Item Manager,tuotehallinta
 DocType: Cost Center,Add rows to set annual budgets on Accounts.,lisää rivejä tilien vuosibudjetin tekoon
 DocType: Buying Settings,Default Supplier Type,oletus toimittajatyyppi
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +160,Quarrying,Louhinta
 DocType: Production Order,Total Operating Cost,käyttökustannukset yhteensä
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +160,Note: Item {0} entered multiple times,huom: tuote {0} kirjattu useampia kertoja
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +163,Note: Item {0} entered multiple times,huom: tuote {0} kirjattu useampia kertoja
 apps/erpnext/erpnext/config/crm.py +27,All Contacts.,kaikki yhteystiedot
 DocType: Newsletter,Test Email Id,testi sähköposti
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +394,Company Abbreviation,yrityksen lyhenne
+apps/erpnext/erpnext/public/js/setup_wizard.js +142,Company Abbreviation,yrityksen lyhenne
 DocType: Features Setup,If you follow Quality Inspection. Enables Item QA Required and QA No in Purchase Receipt,"laatutarkistus aktivoi tuotehyväksynnän vaatimuksen, sekä tuotehyväksyntänumeron ostokuitissa"
 DocType: GL Entry,Party Type,osapuoli tyyppi
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +68,Raw material cannot be same as main Item,raaka-aine ei voi olla päätuote
 DocType: Item Attribute Value,Abbreviation,Lyhenne
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,Ei authroized koska {0} ylittää rajat
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +30,Rotational molding,Rotaatiovalu
 apps/erpnext/erpnext/config/hr.py +115,Salary template master.,palkka mallipohja valvonta
 DocType: Leave Type,Max Days Leave Allowed,maksimi poistumispäivät sallittu
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +55,Set Tax Rule for shopping cart,Aseta Tax Rule ostoskoriin
@@ -3056,15 +2928,15 @@
 apps/erpnext/erpnext/config/selling.py +18,Quotes to Leads or Customers.,noteerauksesta vihjeeksi tai asiakkaaksi
 DocType: Stock Settings,Role Allowed to edit frozen stock,rooli saa muokata jäädytettyä varastoa
 ,Territory Target Variance Item Group-Wise,"aluetavoite vaihtelu, tuoteryhmä työkalu"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +101,All Customer Groups,kaikki asiakasryhmät
-apps/erpnext/erpnext/controllers/accounts_controller.py +474,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,"{0} on pakollinen, voi olla ettei valuutanvaihto tietuetta ei tehty {1}:stä {2}:n."
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +101,All Customer Groups,kaikki asiakasryhmät
+apps/erpnext/erpnext/controllers/accounts_controller.py +475,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,"{0} on pakollinen, voi olla ettei valuutanvaihto tietuetta ei tehty {1}:stä {2}:n."
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +37,Tax Template is mandatory.,Vero malli on pakollinen.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +41,Account {0}: Parent account {1} does not exist,tili {0}: emotili {1} ei ole olemassa
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),"hinnasto, taso (yrityksen valuutta)"
 DocType: Account,Temporary,väliaikainen
 DocType: Address,Preferred Billing Address,suositeltu laskutusosoite
 DocType: Monthly Distribution Percentage,Percentage Allocation,Prosentti Allocation
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +86,Secretary,sihteeri
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Secretary,sihteeri
 DocType: Serial No,Distinct unit of an Item,tuotteen erillisyksikkö
 DocType: Pricing Rule,Buying,ostaminen
 DocType: HR Settings,Employee Records to be created by,työntekijä tietue on tehtävä
@@ -3077,9 +2949,8 @@
 ,Item-wise Price List Rate,"tuote työkalu, hinnasto taso"
 DocType: Purchase Order Item,Supplier Quotation,toimittajan tarjouskysely
 DocType: Quotation,In Words will be visible once you save the Quotation.,"sanat näkyvät, kun tallennat tarjouksen"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +68,Ironing,silitys
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is stopped,{0} {1} on pysäytetty
-apps/erpnext/erpnext/stock/doctype/item/item.py +352,Barcode {0} already used in Item {1},viivakoodi {0} on jo käytössä tuotteella {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +356,Barcode {0} already used in Item {1},viivakoodi {0} on jo käytössä tuotteella {1}
 DocType: Lead,Add to calendar on this date,lisää kalenteriin (tämä päivä)
 apps/erpnext/erpnext/config/selling.py +132,Rules for adding shipping costs.,toimituskustannusten lisäys säännöt
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,Tulevat tapahtumat
@@ -3088,27 +2959,25 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +27,Quick Entry,Pikasyöttö
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0} on pakollinen palautukseen
 DocType: Purchase Order,To Receive,vastaanottoon
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +33,Shrink fitting,kutistekalvosovitus
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +522,user@example.com,user@example.com
+apps/erpnext/erpnext/public/js/setup_wizard.js +266,user@example.com,user@example.com
 DocType: Email Digest,Income / Expense,tuotot / kulut
 DocType: Employee,Personal Email,henkilökohtainen sähköposti
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +58,Total Variance,vaihtelu yhteensä
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +62,Total Variance,vaihtelu yhteensä
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.","mikäli aktiivinen, järjestelmä lähettää kirjanpidon kirjaukset automaattisesti"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +15,Brokerage,välityspalkkio
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +15,Brokerage,välityspalkkio
 DocType: Address,Postal Code,postikoodi
 DocType: Production Order Operation,"in Minutes
 Updated via 'Time Log'"," ""aikaloki"" päivitys minuuteissa"
 DocType: Customer,From Lead,vihjeestä
 apps/erpnext/erpnext/config/manufacturing.py +19,Orders released for production.,tuotantoon luovutetut tilaukset
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +42,Select Fiscal Year...,valitse tilikausi ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +442,POS Profile required to make POS Entry,POS profiili vaatii POS kirjauksen
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +444,POS Profile required to make POS Entry,POS profiili vaatii POS kirjauksen
 DocType: Hub Settings,Name Token,Name Token
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +106,Planing,Höylääminen
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Selling,perusmyynti
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +120,Standard Selling,perusmyynti
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +137,Atleast one warehouse is mandatory,Ainakin yksi varasto on pakollinen
 DocType: Serial No,Out of Warranty,Out of Takuu
 DocType: BOM Replace Tool,Replace,Korvata
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +314,{0} against Sales Invoice {1},{0} myyntilaskua vastaan ​{1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +316,{0} against Sales Invoice {1},{0} myyntilaskua vastaan ​{1}
 apps/erpnext/erpnext/stock/doctype/item/item.py +49,Please enter default Unit of Measure,syötä oletus mittayksikkö
 DocType: Purchase Invoice Item,Project Name,Hankkeen nimi
 DocType: Supplier,Mention if non-standard receivable account,Mainitse jos ei-standardi velalliset
@@ -3124,9 +2993,8 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,Journal Entry {0} does not have account {1} or already matched against other voucher,päiväkirjakirjauksella {0} ei ole tiliä {1} tai on täsmätty toiseen tositteeseen
 DocType: Item,Moving Average,Liukuva keskiarvo
 DocType: BOM Replace Tool,The BOM which will be replaced,korvattava BOM
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +43,New Stock UOM must be different from current stock UOM,uusi varasto UOM tulee olla eri kuin nykyinen varasto UOM
 DocType: Account,Debit,debet
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +34,Leaves must be allocated in multiples of 0.5,"poistumiset tulee kohdentaa luvun 0,5 kerrannaisina"
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +44,Leaves must be allocated in multiples of 0.5,"poistumiset tulee kohdentaa luvun 0,5 kerrannaisina"
 DocType: Production Order,Operation Cost,toiminnan kustannus
 apps/erpnext/erpnext/config/hr.py +71,Upload attendance from a .csv file,lataa osallistumislomake .csv-tiedostoon
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,"odottaa, pankkipääte"
@@ -3144,8 +3012,7 @@
 DocType: Employee,Internal Work History,sisäinen työhistoria
 DocType: DocField,Column Break,sarakkeenvaihto
 DocType: Event,Thursday,torstai
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +42,Private Equity,Private Equity
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +93,Turning,kääntö
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,Private Equity
 DocType: Maintenance Visit,Customer Feedback,asiakaspalaute
 DocType: Account,Expense,kulu
 DocType: Sales Invoice,Exhibition,näyttely
@@ -3158,19 +3025,19 @@
 DocType: Employee,Held On,järjesteltiin
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +33,Production Item,tuotanto tuote
 ,Employee Information,työntekijän tiedot
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,Rate (%),taso (%)
+apps/erpnext/erpnext/public/js/setup_wizard.js +294,Rate (%),taso (%)
 DocType: Stock Entry Detail,Additional Cost,Muita Kustannukset
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +407,Financial Year End Date,tilikauden lopetuspäivä
+apps/erpnext/erpnext/public/js/setup_wizard.js +155,Financial Year End Date,tilikauden lopetuspäivä
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Voucher No, if grouped by Voucher",ei voi suodattaa tositenumero pohjalta mikäli tosite on ryhmässä
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +484,Make Supplier Quotation,tee toimittajan tarjouskysely
 DocType: Quality Inspection,Incoming,saapuva
 DocType: BOM,Materials Required (Exploded),materiaalitarve (räjäytys)
 DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),pienennä ansiota poistuttaessa ilman palkkaa (LWP)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +512,"Add users to your organization, other than yourself",lisää toisia käyttäjiä organisaatiosi
+apps/erpnext/erpnext/public/js/setup_wizard.js +256,"Add users to your organization, other than yourself",lisää toisia käyttäjiä organisaatiosi
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No {1} does not match with {2} {3},Rivi # {0}: Sarjanumero {1} ei vastaa {2} {3}
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +44,Casual Leave,tavallinen poistuminen
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +44,Casual Leave,tavallinen poistuminen
 DocType: Batch,Batch ID,erän tunnus
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +334,Note: {0},Huomautus: {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +336,Note: {0},Huomautus: {0}
 ,Delivery Note Trends,lähete trendit
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +104,This Week's Summary,Viikon yhteenveto
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +74,{0} must be a Purchased or Sub-Contracted Item in row {1},{0} on ostettu tai alihankintatuotteena rivillä {1}
@@ -3182,7 +3049,7 @@
 DocType: Purchase Receipt,Return Against Purchase Receipt,palautus kohdistettuna ostokuittin
 DocType: Purchase Order,To Bill,laskutukseen
 DocType: Material Request,% Ordered,% Järjestetty
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +61,Piecework,Urakkatyö
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Piecework,Urakkatyö
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +64,Avg. Buying Rate,keskimääräinen ostamisen taso
 DocType: Task,Actual Time (in Hours),todellinen aika (tunneissa)
 DocType: Employee,History In Company,yrityksen historia
@@ -3199,13 +3066,13 @@
 DocType: Opportunity,To Discuss,keskusteluun
 DocType: SMS Settings,SMS Settings,tekstiviesti asetukset
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +60,Temporary Accounts,väliaikaiset tilit
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +155,Black,musta
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Black,musta
 DocType: BOM Explosion Item,BOM Explosion Item,BOM tuotteen räjäytys
 DocType: Account,Auditor,Tilintarkastaja
 DocType: Purchase Order,End date of current order's period,nykyisen tilauskauden päättymispäivä
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +17,Make Offer Letter,Tee tarjous Letter
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +10,Return,paluu
-apps/erpnext/erpnext/stock/doctype/item/item.py +503,Default Unit of Measure for Variant must be same as Template,Oletus mittayksikkö Variant on oltava sama kuin malli
+apps/erpnext/erpnext/stock/doctype/item/item.py +507,Default Unit of Measure for Variant must be same as Template,Oletus mittayksikkö Variant on oltava sama kuin malli
 DocType: DocField,Fold,taitos
 DocType: Production Order Operation,Production Order Operation,tuotannon tilauksen toimenpiteet
 DocType: Pricing Rule,Disable,poista käytöstä
@@ -3216,13 +3083,12 @@
 DocType: Page,Page Name,Sivun nimi
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +110,To Time must be greater than From Time,aikaan on oltava suurempi kuin aloitusaika
 DocType: Journal Entry Account,Exchange Rate,valuutta taso
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +465,Sales Order {0} is not submitted,myyntitilausta {0} ei ole lähetetty
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +467,Sales Order {0} is not submitted,myyntitilausta {0} ei ole lähetetty
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0}: Parent account {1} does not bolong to the company {2},Varasto {0}: Emotili {1} ei kuulu yritykselle {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +124,Spindle finishing,karan viimeistely
 DocType: BOM,Last Purchase Rate,viimeisin ostotaso
 DocType: Account,Asset,vastaavat
 DocType: Project Task,Task ID,tehtävätunnus
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +395,"e.g. ""MC""","esim, ""MC"""
+apps/erpnext/erpnext/public/js/setup_wizard.js +143,"e.g. ""MC""","esim, ""MC"""
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,Stock cannot exist for Item {0} since has variants,tälle tuotteelle ei ole varastopaikkaa {0} koska siitä on useita malleja
 ,Sales Person-wise Transaction Summary,"myyjän työkalu,  tapahtuma yhteenveto"
 DocType: System Settings,Time Zone,aikavyöhyke
@@ -3231,9 +3097,7 @@
 DocType: Monthly Distribution,Monthly Distribution Percentages,"toimitus kuukaudessa, prosenttiosuudet"
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +16,The selected item cannot have Batch,valittu tuote voi olla erä
 DocType: Delivery Note,% of materials delivered against this Delivery Note,% materiaaleja toimitettu tätä lähetettä vastaan
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +151,Stapling,nidonta
 DocType: Customer,Customer Details,"asiakas, lisätiedot"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +105,Shaping,muotoilu
 DocType: Employee,Reports to,raportoi
 DocType: SMS Settings,Enter url parameter for receiver nos,syötä url parametrin vastaanottonro
 DocType: Sales Invoice,Paid Amount,maksettu arvomäärä
@@ -3242,13 +3106,13 @@
 DocType: Item Variant,Item Variant,tuotemalli
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +15,Setting this Address Template as default as there is no other default,"tämä osoite mallipohjaa on asetettu oletukseksi, sillä muuta pohjaa ei ole valittu"
 apps/erpnext/erpnext/accounts/doctype/account/account.py +89,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","tilin tase on jo dedet, syötetyn arvon tulee olla 'tasapainossa' eli 'krebit'"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +76,Quality Management,määrähallinta
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Quality Management,määrähallinta
 DocType: Production Planning Tool,Filter based on customer,suodata asiakkaisiin perustuen
 DocType: Payment Tool Detail,Against Voucher No,kuitin nro kohdistus
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +47,Please enter quantity for Item {0},Kirjoita kpl määrä Tuote {0}
 DocType: Employee External Work History,Employee External Work History,työntekijän muu työkokemus
 DocType: Tax Rule,Purchase,Osto
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +34,Balance Qty,taseyksikkömäärä
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Balance Qty,taseyksikkömäärä
 DocType: Item Group,Parent Item Group,päätuoteryhmä
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +21,{0} for {1},{0} on {1}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +96,Cost Centers,kustannuspaikat
@@ -3258,12 +3122,12 @@
 DocType: Opportunity,Next Contact,Seuraava Yhteystiedot
 DocType: Employee,Employment Type,työsopimus tyyppi
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,pitkaikaiset vastaavat
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +84,Application period cannot be across two alocation records,Hakuaika ei voi yli kaksi alocation kirjaa
 DocType: Item Group,Default Expense Account,oletus kulutili
 DocType: Employee,Notice (days),Ilmoitus (päivää)
 DocType: Page,Yes,Kyllä
 DocType: Tax Rule,Sales Tax Template,Sales Tax Malline
 DocType: Employee,Encashment Date,perintä päivä
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +74,Electroforming,sähköinen muovaus
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +179,"Against Voucher Type must be one of Purchase Order, Purchase Invoice or Journal Entry","tositetyypin kirjaus tulee kohdistaa ostotilauksen, ostolaskuun tai päiväkirjaan"
 DocType: Account,Stock Adjustment,varastonsäätö
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +34,Default Activity Cost exists for Activity Type - {0},oletus aktiviteettikustannus aktiviteetin tyypille - {0}
@@ -3300,12 +3164,12 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,"Varastoa ei voi poistaa, sillä kohdistettuja varaston tilikirjan kirjauksia on olemassa."
 DocType: Company,Distribution,toimitus
 apps/erpnext/erpnext/public/js/pos/pos.html +36,Amount Paid,maksettu arvomäärä
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +91,Project Manager,projektihallinta
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +72,Dispatch,lähetys
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Project Manager,projektihallinta
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +72,Dispatch,lähetys
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,Max alennus sallittua item: {0} on {1}%
 DocType: Customer,Default Taxes and Charges,Oletus Verot ja maksut
 DocType: Account,Receivable,saatava
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +268,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,Rivi # {0}: Ei saa muuttaa Toimittaja kuten ostotilaus on jo olemassa
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +263,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,Rivi # {0}: Ei saa muuttaa Toimittaja kuten ostotilaus on jo olemassa
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,roolilla jolla voi lähettää tapamtumia pääsee luottoraja asetuksiin
 DocType: Sales Invoice,Supplier Reference,toimittajan viite
 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.","täpättynä alikokoonpanon BOM tuotteita pidetään raaka-ainehankinnoissa, muutoin kaikkia alikokoonpanon tuotteita käsitellään yhtenä raaka-aineena"
@@ -3313,8 +3177,8 @@
 DocType: Hub Settings,Seller Description,myyjän kuvaus
 DocType: Employee Education,Qualification,Pätevyys
 DocType: Item Price,Item Price,tuote hinta
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +48,Soap & Detergent,saippua & pesuaine
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +36,Motion Picture & Video,Motion Picture &amp; Video
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +48,Soap & Detergent,saippua & pesuaine
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +36,Motion Picture & Video,Motion Picture &amp; Video
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,tilattu
 DocType: Warehouse,Warehouse Name,varaston nimi
 DocType: Naming Series,Select Transaction,valitse tapahtuma
@@ -3323,7 +3187,6 @@
 DocType: BOM,Rate Of Materials Based On,materiaaliarvostelu perustuen
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,tuki Analtyics
 apps/erpnext/erpnext/accounts/doctype/accounts_settings/accounts_settings.py +27,Company is missing in warehouses {0},yritystä ei löydy varastoissa {0}
-DocType: Stock UOM Replace Utility,Stock UOM Replace Utility,varasto UOM vaihda yksikkö
 DocType: POS Profile,Terms and Conditions,ehdot ja säännöt 
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,To Date should be within the Fiscal Year. Assuming To Date = {0},"päivä tulee olla tällä tilikaudella, oletettu lopetuspäivä = {0}"
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","tässä voit ylläpitää terveystietoja, pituus, paino, allergiat, lääkkeet jne"
@@ -3335,7 +3198,7 @@
 DocType: Sales Order Item,For Production,tuotantoon
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +103,Please enter sales order in the above table,syötä myyntitilaus taulukon yläpuolelle
 DocType: Project Task,View Task,näytä tehtävä
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +406,Your financial year begins on,Tilikautesi alkaa
+apps/erpnext/erpnext/public/js/setup_wizard.js +154,Your financial year begins on,Tilikautesi alkaa
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +46,Please enter Purchase Receipts,Anna Osto Kuitit
 DocType: Sales Invoice,Get Advances Received,hae saadut ennakot
 DocType: Email Digest,Add/Remove Recipients,lisää / poista vastaanottajia
@@ -3343,16 +3206,14 @@
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","asettaaksesi tämän tilikaudenoletukseksi, klikkaa ""aseta oletukseksi"""
 apps/erpnext/erpnext/config/support.py +54,Setup incoming server for support email id. (e.g. support@example.com),määritä teknisen tuen sähköpostin saapuvan palvelimen asetukset (esim tekniikka@example.com)
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,yksikkömäärä vähissä
-apps/erpnext/erpnext/stock/doctype/item/item.py +528,Item variant {0} exists with same attributes,Tuote variantti {0} ovat olemassa samoja ominaisuuksia
+apps/erpnext/erpnext/stock/doctype/item/item.py +532,Item variant {0} exists with same attributes,Tuote variantti {0} ovat olemassa samoja ominaisuuksia
 DocType: Salary Slip,Salary Slip,palkkalaskelma
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +116,Burnishing,siivous
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +54,'To Date' is required,'päättymispäivä' vaaditaan
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,'päättymispäivä' vaaditaan
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","muodosta pakkausluetteloita toimitettaville pakkauksille, käytetään pakkausnumeron, -sisältö ja painon määritykseen"
 DocType: Sales Invoice Item,Sales Order Item,"myyntitilaus, tuote"
 DocType: Salary Slip,Payment Days,maksupäivää
 DocType: BOM,Manage cost of operations,hallitse toimien kustannuksia
 DocType: Features Setup,Item Advanced,"tuote, edistynyt"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +40,Hot rolling,kuuma valssaus
 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.","täpättäessä sähköposti-ikkuna avautuu välittömästi kun tapahtuma ""lähetetty"", oletus vastaanottajana on tapahtuman ""yhteyshenkilö"" ja tapahtuma liitteenä, voit valita lähetätkö tapahtuman sähköpostilla"
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,yleiset asetukset
 DocType: Employee Education,Employee Education,työntekijä koulutus
@@ -3365,25 +3226,23 @@
 DocType: Customer,Sales Team Details,myyntitiimin lisätiedot
 DocType: Expense Claim,Total Claimed Amount,vaatimukset arvomäärä yhteensä
 apps/erpnext/erpnext/config/crm.py +22,Potential opportunities for selling.,myynnin potentiaalisia tilaisuuksia
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +48,Sick Leave,sairaspoistuminen
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +174,Invalid {0},Virheellinen {0}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +48,Sick Leave,sairaspoistuminen
 DocType: Email Digest,Email Digest,sähköpostitiedote
 DocType: Delivery Note,Billing Address Name,laskutusosoite nimi
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +22,Department Stores,osasto kaupat
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,osasto kaupat
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +40,System Balance,järjestelmätase
 DocType: Workflow,Is Active,on aktiivinen
 apps/erpnext/erpnext/controllers/stock_controller.py +71,No accounting entries for the following warehouses,ei kirjanpidon kirjauksia seuraaviin varastoihin
 apps/erpnext/erpnext/projects/doctype/project/project.js +22,Save the document first.,tallenna ensimmäinen asiakirja
 DocType: Account,Chargeable,veloitettava
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +121,Linishing,Linishing
 DocType: Company,Change Abbreviation,muutos lyhennys
 DocType: Workflow State,Primary,Ensisijainen
 DocType: Expense Claim Detail,Expense Date,"kulu, päivä"
 DocType: Item,Max Discount (%),Max Alennus (%)
 DocType: Communication,More Information,Lisää tietoa
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +70,Last Order Amount,edellinen tilaus arvomäärä
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +161,Blasting,Räjäytystyöt
 DocType: Company,Warn,varoita
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +111,Item valuation updated,tuotteen arvo päivitetty
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","muut huomiot, huomioitavat asiat tulee laittaa tähän tietueeseen"
 DocType: BOM,Manufacturing User,Valmistus Käyttäjä
 DocType: Purchase Order,Raw Materials Supplied,raaka-aineet toimitettu
@@ -3393,7 +3252,7 @@
 DocType: Appraisal,Appraisal Template,"arviointi, mallipohja"
 DocType: Communication,Email,sähköposti
 DocType: Item Group,Item Classification,tuote luokittelu
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +89,Business Development Manager,myynninkehityshallinta
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Business Development Manager,myynninkehityshallinta
 DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,"huoltokäynti, tarkoitus"
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.js +15,Period,Aika
 ,General Ledger,päätilikirja
@@ -3403,9 +3262,7 @@
 ,Itemwise Recommended Reorder Level,"tuote työkalu, uuden ostotilauksen suositusarvo"
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +264,Please select {0} first,Ole hyvä ja valitse {0} Ensimmäinen
 DocType: Features Setup,To get Item Group in details table,saadaksesi tuoteryhmän lisätiedot taulukossa
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +67,Redrawing,uudelleenpiirto
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +112,Batch {0} of Item {1} has expired.,erä {0} tuotteesta {1} on vanhentunut
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +120,Etching,etsaus
 DocType: Sales Invoice,Commission,provisio
 DocType: Address Template,"<h4>Default Template</h4>
 <p>Uses <a href=""http://jinja.pocoo.org/docs/templates/"">Jinja Templating</a> and all the fields of Address (including Custom Fields if any) will be available</p>
@@ -3439,7 +3296,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +340,Operation Time must be greater than 0 for Operation {0},Toiminta-aika on oltava suurempi kuin 0 Toiminta {0}
 DocType: Supplier,Address and Contacts,Osoite ja yhteystiedot
 DocType: UOM Conversion Detail,UOM Conversion Detail,UOM muunto lisätiedot
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +496,Keep it web friendly 900px (w) by 100px (h),Pidä se web ystävällinen 900px (w) by 100px (h)
+apps/erpnext/erpnext/public/js/setup_wizard.js +242,Keep it web friendly 900px (w) by 100px (h),Pidä se web ystävällinen 900px (w) by 100px (h)
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +329,Production Order cannot be raised against a Item Template,tuotannon tilausta ei voi kohdistaa tuotteen mallipohjaan
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +44,Charges are updated in Purchase Receipt against each item,maksut on päivitetty ostokuitilla kondistettuna jokaiseen tuotteeseen
 DocType: Payment Tool,Get Outstanding Vouchers,hae odottavat tositteet
@@ -3455,54 +3312,49 @@
 DocType: Item,Average time taken by the supplier to deliver,Keskimääräinen aika toimittajan toimittamaan
 DocType: Time Log,Hours,tuntia
 DocType: Project,Expected Start Date,odotettu aloituspäivä
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +38,Rolling,Rolling
 DocType: ToDo,Priority,Prioriteetti
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +41,Remove item if charges is not applicable to that item,poista tuote mikäli maksuja ei voi soveltaa siihen
 DocType: Dropbox Backup,Dropbox Access Allowed,Dropbox pääsy sallittu
 DocType: Dropbox Backup,Weekly,viikoittain
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,"esim, smsgateway.com/api/send_sms.cgi"
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +485,Receive,Vastaanottaa
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +510,Receive,Vastaanottaa
 DocType: Maintenance Visit,Fully Completed,täysin valmis
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% valmis
 DocType: Employee,Educational Qualification,koulutusksen arviointi
 DocType: Workstation,Operating Costs,käyttökustannukset
 DocType: Employee Leave Approver,Employee Leave Approver,työntekijän poistumis hyväksyjä
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,{0} has been successfully added to our Newsletter list.,{0} on lisätty uutiskirje luetteloon.
-apps/erpnext/erpnext/stock/doctype/item/item.py +383,Row {0}: An Reorder entry already exists for this warehouse {1},rivi {0}: uusi tilaus on jo kirjattu tähän varastoon {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +387,Row {0}: An Reorder entry already exists for this warehouse {1},rivi {0}: uusi tilaus on jo kirjattu tähän varastoon {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +67,"Cannot declare as lost, because Quotation has been made.","ei voida vahvistaa hävityksi, sillä tarjous on tehty"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +133,Electron beam machining,elektronisädekoneistus
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,"ostojenhallinta, valvonta"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +424,Production Order {0} must be submitted,tuotannon tilaus {0} on lähetettävä
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +150,Please select Start Date and End Date for Item {0},Ole hyvä ja valitse alkamispäivä ja päättymispäivä Kohta {0}
 apps/erpnext/erpnext/config/stock.py +141,Main Reports,pääraportit
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +102,Stock Ledger entries balances updated,varaston tilikirjan kirjausten tase päivitetty
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,päivään ei voi olla ennen aloituspäivää
 DocType: Purchase Receipt Item,Prevdoc DocType,esihallitse asiakirjatyyppi
-apps/erpnext/erpnext/stock/doctype/item/item.js +176,Add / Edit Prices,Lisää / muokkaa hintoja
+apps/erpnext/erpnext/stock/doctype/item/item.js +178,Add / Edit Prices,Lisää / muokkaa hintoja
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +53,Chart of Cost Centers,kustannuspaikkakaavio
 ,Requested Items To Be Ordered,tilattavat pyydetyt tuotteet
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +298,My Orders,Omat tilaukset
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +293,My Orders,Omat tilaukset
 DocType: Price List,Price List Name,Hinnasto Name
 DocType: Time Log,For Manufacturing,valmistukseen
-apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +70,Totals,summat
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +174,Totals,summat
 DocType: BOM,Manufacturing,Valmistus
 ,Ordered Items To Be Delivered,toimitettavat tilatut tuotteet
 DocType: Account,Income,tulo
 ,Setup Wizard,määritys työkalu
 DocType: Industry Type,Industry Type,teollisuus tyyppi
 apps/erpnext/erpnext/templates/includes/cart.js +137,Something went wrong!,jokin meni pieleen!
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +68,Warning: Leave application contains following block dates,varoitus: poistumissovellus sisältää seuraavat estopäivät
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +251,Sales Invoice {0} has already been submitted,myyntilasku {0} on lähetetty
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +100,Warning: Leave application contains following block dates,varoitus: poistumissovellus sisältää seuraavat estopäivät
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +256,Sales Invoice {0} has already been submitted,myyntilasku {0} on lähetetty
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,katselmus päivä
 DocType: Purchase Invoice Item,Amount (Company Currency),arvomäärä (yrityksen valuutta)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +10,Die casting,die valu
 DocType: Email Alert,Reference Date,Viite Päivämäärä
 apps/erpnext/erpnext/config/hr.py +105,Organization unit (department) master.,"organisaatioyksikkö, osasto valvonta"
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +25,Please enter valid mobile nos,Anna kelvolliset mobiili nos
 DocType: Budget Detail,Budget Detail,budjetti yksityiskohdat
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +75,Please enter message before sending,Anna viestin ennen lähettämistä
 DocType: Async Task,Status,tila
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +65,Stock UOM updated for Item {0},varaston UOM päivitetty tuotteelle {0}
 DocType: Company History,Year,Vuosi
 apps/erpnext/erpnext/config/accounts.py +127,Point-of-Sale Profile,Point-of-Sale Profile
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +68,Please Update SMS Settings,päivitä teksiviestiasetukset
@@ -3516,12 +3368,12 @@
 ,Serial No Service Contract Expiry,palvelusopimuksen päättyminen sarjanumerolle
 DocType: Item,Unit of Measure Conversion,mittayksikön muunto
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +86,Employee can not be changed,työntekijää ei voi muuttaa
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +259,You cannot credit and debit same account at the same time,kredit / debet kirjausta ei voi tehdä samalle tilille yhtäaikaa
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,You cannot credit and debit same account at the same time,kredit / debet kirjausta ei voi tehdä samalle tilille yhtäaikaa
 DocType: Naming Series,Help HTML,"HTML, ohje"
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},nimetty painoarvo yhteensä tulee olla 100% nyt se on {0}
 apps/erpnext/erpnext/controllers/status_updater.py +140,Allowance for over-{0} crossed for Item {1},Avustus yli- {0} ristissä Kohta {1}
 DocType: Address,Name of person or organization that this address belongs to.,henkilön- tai organisaation nimi kenelle tämä osoite kuuluu
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +587,Your Suppliers,omat toimittajat
+apps/erpnext/erpnext/public/js/setup_wizard.js +325,Your Suppliers,omat toimittajat
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,ei voi asettaa hävityksi sillä myyntitilaus on tehty
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +65,Another Salary Structure {0} is active for employee {1}. Please make its status 'Inactive' to proceed.,toinen palkkarakenne {0} on aktiivinen työntekijälle {1}. päivitä tila 'passiiviseksi' jatkaaksesi
 DocType: Purchase Invoice,Contact,yhteystiedot
@@ -3530,37 +3382,35 @@
 DocType: Item,Has Serial No,on sarjanumero
 DocType: Employee,Date of Issue,aiheen päivä
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +16,{0}: From {0} for {1},{0}: valitse {0} on {1}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +154,Row #{0}: Set Supplier for item {1},Rivi # {0}: Aseta toimittaja kohteen {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +149,Row #{0}: Set Supplier for item {1},Rivi # {0}: Aseta toimittaja kohteen {1}
 DocType: Issue,Content Type,sisällön tyyppi
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +17,Computer,tietokone
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,tietokone
 DocType: Item,List this Item in multiple groups on the website.,Listaa tästä Kohta useisiin ryhmiin verkkosivuilla.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +283,Please check Multi Currency option to allow accounts with other currency,Tarkista usean valuutan mahdollisuuden sallia tilejä muu valuutta
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +285,Please check Multi Currency option to allow accounts with other currency,Tarkista usean valuutan mahdollisuuden sallia tilejä muu valuutta
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +62,Item: {0} does not exist in the system,tuote: {0} ei ole järjestelmässä
 apps/erpnext/erpnext/accounts/doctype/account/account.py +81,You are not authorized to set Frozen value,sinulla ei ole oikeutta asettaa jäätymis arva
 DocType: Payment Reconciliation,Get Unreconciled Entries,hae täsmäämättömät kirjaukset
 DocType: Cost Center,Budgets,budjetit
 apps/frappe/frappe/core/page/modules_setup/modules_setup.py +11,Updated,päivitetty
 DocType: Employee,Emergency Contact Details,hätäyhteydenoton lisätiedot
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +396,What does it do?,mitä tämä tekee?
+apps/erpnext/erpnext/public/js/setup_wizard.js +144,What does it do?,mitä tämä tekee?
 DocType: Delivery Note,To Warehouse,varastoon
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +45,Account {0} has been entered more than once for fiscal year {1},"tilillä {0} on useampi, kuin yksi kirjaus tilikaudella {1}"
 ,Average Commission Rate,keskimääräinen provisio taso
-apps/erpnext/erpnext/stock/doctype/item/item.py +313,'Has Serial No' can not be 'Yes' for non-stock item,'on sarjanumero' joka voi olla ainoastaan varastotuote
+apps/erpnext/erpnext/stock/doctype/item/item.py +317,'Has Serial No' can not be 'Yes' for non-stock item,'on sarjanumero' joka voi olla ainoastaan varastotuote
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Attendance can not be marked for future dates,osallistumisia ei voi merkitä tuleville päiville
 DocType: Pricing Rule,Pricing Rule Help,"hinnoittelusääntö, ohjeet"
 DocType: Purchase Taxes and Charges,Account Head,tilin otsikko
 apps/erpnext/erpnext/config/stock.py +79,Update additional costs to calculate landed cost of items,päivitä lisäkustannukset jotta tuotteisiin kohdistuneet kustannukset voidaan laskea
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +111,Electrical,sähköinen
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +111,Electrical,sähköinen
 DocType: Stock Entry,Total Value Difference (Out - In),arvoero (ulos-sisään) yhteensä
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +302,Row {0}: Exchange Rate is mandatory,Rivi {0}: Vaihtokurssi on pakollinen
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +304,Row {0}: Exchange Rate is mandatory,Rivi {0}: Vaihtokurssi on pakollinen
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},käyttäjätunnusta ei asetettu työntekijälle {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +72,Peening,Aineenpoistopuhalluksella
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,From Warranty Claim,takuuvaatimukseen
 DocType: Stock Entry,Default Source Warehouse,oletus lähde varasto
 DocType: Item,Customer Code,asiakkaan koodi
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +212,Birthday Reminder for {0},Syntymäpäivämuistutus {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +163,Lapping,Lappalainen
-apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.js +8,Days Since Last Order,päivää edellisestä tilauksesta
+apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +72,Days Since Last Order,päivää edellisestä tilauksesta
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +299,Debit To account must be a Balance Sheet account,Pankkikortti tilille on kuitenkin taseen tili
 DocType: Buying Settings,Naming Series,nimeä sarjat
 DocType: Leave Block List,Leave Block List Name,"poistu estoluettelo, nimi"
@@ -3574,7 +3424,7 @@
 DocType: Notification Control,Sales Invoice Message,"myyntilasku, viesti"
 DocType: Authorization Rule,Based On,perustuu
 DocType: Sales Order Item,Ordered Qty,tilattu yksikkömäärä
-apps/erpnext/erpnext/stock/doctype/item/item.py +539,Item {0} is disabled,Tuote {0} on poistettu käytöstä
+apps/erpnext/erpnext/stock/doctype/item/item.py +543,Item {0} is disabled,Tuote {0} on poistettu käytöstä
 DocType: Stock Settings,Stock Frozen Upto,varasto jäädytetty asti
 apps/erpnext/erpnext/controllers/recurring_document.py +166,Period From and Period To dates mandatory for recurring {0},Ajanjaksona ja AIKA Voit päivämäärät pakollinen toistuvia {0}
 apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,Hanketoimintaa / tehtävä.
@@ -3584,7 +3434,6 @@
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,alennus on oltava alle 100
 DocType: ToDo,Low,Alhainen
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Kirjoita Off Määrä (Yrityksen valuutta)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +71,Spinning,kehruu
 DocType: Landed Cost Voucher,Landed Cost Voucher,"kohdistetut kustannukset, tosite"
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +55,Please set {0},Aseta {0}
 DocType: Purchase Invoice,Repeat on Day of Month,Toista päivä Kuukausi
@@ -3606,7 +3455,6 @@
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +37,Campaign Name is required,kampanjan nimi vaaditaan
 DocType: Maintenance Visit,Maintenance Date,"huolto, päivä"
 DocType: Purchase Receipt Item,Rejected Serial No,Hylätty sarjanumero
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +51,Deep drawing,syväpiirto
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +40,New Newsletter,Uusi uutiskirje
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +157,Start date should be less than end date for Item {0},aloituspäivä tulee olla pienempi kuin päättymispäivä tuotteelle {0}
 apps/erpnext/erpnext/stock/doctype/item/item.js +17,Show Balance,näytä tase
@@ -3616,7 +3464,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +119,BOM and Manufacturing Quantity are required,BOM ja valmistusmäärä tarvitaan
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,vanhentumisen skaala 2
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +450,Amount,arvomäärä
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +147,Riveting,Mukaansatempaava
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,BOM korvattu
 ,Sales Analytics,myyntianalyysi
 DocType: Manufacturing Settings,Manufacturing Settings,valmistuksen asetukset
@@ -3628,20 +3475,19 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +207,New Account Name,nimeä uusi tili
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,raaka-aine toimitettu kustannus
 DocType: Selling Settings,Settings for Selling Module,myyntimoduulin asetukset
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +73,Customer Service,asiakaspalvelu
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Customer Service,asiakaspalvelu
 DocType: Item,Thumbnail,Thumbnail
 DocType: Item Customer Detail,Item Customer Detail,tuote asiakas lisätyedot
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +147,Confirm Your Email,vahvista sähköposti
 apps/erpnext/erpnext/config/hr.py +53,Offer candidate a Job.,Tarjous ehdokas Job.
 DocType: Notification Control,Prompt for Email on Submission of,Kysyy Sähköposti esitettäessä
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +81,Total allocated leaves are more than days in the period,Yhteensä myönnetty lehdet ovat enemmän kuin päivää kaudella
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +70,Item {0} must be a stock Item,tuote {0} tulee olla varastotuote
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,Oletus Work In Progress Warehouse
 apps/erpnext/erpnext/config/accounts.py +107,Default settings for accounting transactions.,kirjanpidon tapahtumien oletusasetukset
 apps/frappe/frappe/model/naming.py +40,{0} is required,{0} on pakollinen
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +21,Vacuum molding,vakuumi muovaus
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,odotettu päivä ei voi olla ennen materiaalipyynnön päiväystä
 DocType: Contact Us Settings,City,Kaupunki
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +132,Ultrasonic machining,ultraäänityöstö
 apps/frappe/frappe/templates/base.html +137,Error: Not a valid id?,virhe: tunnus ei ole kelvollinen
 apps/erpnext/erpnext/stock/get_item_details.py +125,Item {0} must be a Sales Item,tuotteen {0} tulee olla myyntituote
 DocType: Naming Series,Update Series Number,päivitä sarjanumerot
@@ -3649,7 +3495,7 @@
 DocType: Sales Order,Printing Details,Tulostus Lisätiedot
 DocType: Task,Closing Date,sulkupäivä
 DocType: Sales Order Item,Produced Quantity,Tuotettu Määrä
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +84,Engineer,insinööri
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Engineer,insinööri
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,haku alikokoonpanot
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +379,Item Code required at Row No {0},tuotekoodi vaaditaan riville {0}
 DocType: Sales Partner,Partner Type,kumppani tyyppi
@@ -3657,7 +3503,7 @@
 DocType: Authorization Rule,Customerwise Discount,asiakaskohtainen alennus
 DocType: Purchase Invoice,Against Expense Account,kulutilin kohdistus
 DocType: Production Order,Production Order,tuotannon tilaus
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +258,Installation Note {0} has already been submitted,asennus huomautus {0} on jo lähetetty
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +263,Installation Note {0} has already been submitted,asennus huomautus {0} on jo lähetetty
 DocType: Quotation Item,Against Docname,asiakirjan nimi kohdistus
 DocType: SMS Center,All Employee (Active),kaikki työntekijät (aktiiviset)
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,näytä nyt
@@ -3666,19 +3512,19 @@
 DocType: Item,Re-Order Level,Re-Order Level
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,"syötä tuotteet ja suunniteltu yksikkömäärä, joille haluat lisätä tuotantotilauksia tai joista haluat ladata raaka-aine analyysin"
 apps/frappe/frappe/public/js/frappe/views/ganttview.js +45,Gantt Chart,gantt kaavio
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +57,Part-time,Osa-aikainen
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,Part-time,Osa-aikainen
 DocType: Employee,Applicable Holiday List,sovellettava lomalista
 DocType: Employee,Cheque,takaus/shekki
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,sarja päivitetty
 apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Report Type is mandatory,raportin tyyppi vaaditaan
 DocType: Item,Serial Number Series,sarjanumero sarjat
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},varasto vaaditaan varastotuotteelle {0} rivillä {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +45,Retail & Wholesale,Vähittäismyynti &amp; Tukkukauppa
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,Vähittäismyynti &amp; Tukkukauppa
 DocType: Issue,First Responded On,ensimmäiset vastaavat
 DocType: Website Item Group,Cross Listing of Item in multiple groups,ristiluettelo tuotteille jotka on useammissa ryhmissä
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +351,The First User: You,ensimmäinen käyttäjä: sinä
+apps/erpnext/erpnext/public/js/setup_wizard.js +101,The First User: You,ensimmäinen käyttäjä: sinä
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +48,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},tilikauden alkamispäivä ja tilikauden päättymispäivä on asetettu tilikaudelle {0}
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +172,Successfully Reconciled,onnistuneesti täsmäytetty
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +119,Successfully Reconciled,onnistuneesti täsmäytetty
 DocType: Production Order,Planned End Date,Suunnitellut Päättymispäivä
 apps/erpnext/erpnext/config/stock.py +43,Where items are stored.,missä tuotteet varastoidaan
 DocType: Tax Rule,Validity,Voimassaolo
@@ -3698,39 +3544,36 @@
 DocType: DocPerm,Level,taso
 DocType: Purchase Taxes and Charges,On Net Total,netto yhteensä:ssä
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +160,Target warehouse in row {0} must be same as Production Order,tavoite varasto rivillä {0} on oltava yhtäsuuri kuin tuotannon tilaus
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +59,No permission to use Payment Tool,ei valtuutusta käyttää maksutyökalua
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +97,No permission to use Payment Tool,ei valtuutusta käyttää maksutyökalua
 apps/erpnext/erpnext/controllers/recurring_document.py +192,'Notification Email Addresses' not specified for recurring %s,'sähköposti-ilmoituksille' ei ole määritelty jatkuvaa %
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +86,Milling,Milling
 apps/erpnext/erpnext/accounts/doctype/account/account.py +99,Currency can not be changed after making entries using some other currency,Valuutta ei voi muuttaa tehtyään merkinnät jollakin toisella valuutta
 DocType: Company,Round Off Account,pyöristys tili
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +60,Nibbling,Nakerrus
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,hallinnolliset kulut
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +18,Consulting,konsultointi
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +18,Consulting,konsultointi
 DocType: Customer Group,Parent Customer Group,Parent Asiakasryhmä
 apps/erpnext/erpnext/public/js/pos/pos.js +429,Change,muutos
 DocType: Purchase Invoice,Contact Email,"yhteystiedot, sähköposti"
 DocType: Appraisal Goal,Score Earned,ansaitut pisteet
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +393,"e.g. ""My Company LLC""","esim, ""minunyritys LLC"""
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +173,Notice Period,Irtisanomisaika
+apps/erpnext/erpnext/public/js/setup_wizard.js +141,"e.g. ""My Company LLC""","esim, ""minunyritys LLC"""
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +173,Notice Period,Irtisanomisaika
 DocType: Bank Reconciliation Detail,Voucher ID,tosite tunnus
 apps/erpnext/erpnext/setup/doctype/territory/territory.js +14,This is a root territory and cannot be edited.,tämä on kanta-alue eikä sitä voi muokata
 DocType: Packing Slip,Gross Weight UOM,bruttopaino UOM
 DocType: Email Digest,Receivables / Payables,saatavat / maksettavat
 DocType: Delivery Note Item,Against Sales Invoice,​myyntilaskun kohdistus
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +63,Stamping,leimaus
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +457,Credit Account,Luottotili
 DocType: Landed Cost Item,Landed Cost Item,"kohdistetut kustannukset, tuote"
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +56,Show zero values,näytä nolla-arvot
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,tuotemääräarvio valmistuksen- / uudelleenpakkauksen jälkeen annetuista raaka-aineen määristä
 DocType: Payment Reconciliation,Receivable / Payable Account,saatava / maksettava tili
 DocType: Delivery Note Item,Against Sales Order Item,myyntitilauksen kohdistus / tuote
-apps/erpnext/erpnext/stock/doctype/item/item.py +521,Please specify Attribute Value for attribute {0},Ilmoitathan Taito Vastinetta määrite {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +525,Please specify Attribute Value for attribute {0},Ilmoitathan Taito Vastinetta määrite {0}
 DocType: Item,Default Warehouse,oletus varasto
 DocType: Task,Actual End Date (via Time Logs),todellinen päättymispäivä (aikalokin mukaan)
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +37,Budget cannot be assigned against Group Account {0},budjettia ei voi nimetä ryhmätiliin {0}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +23,Please enter parent cost center,syötä pääkustannuspaikka
 DocType: Delivery Note,Print Without Amount,tulosta ilman arvomäärää
-apps/erpnext/erpnext/controllers/buying_controller.py +69,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,veroluokka ei voi olla 'arvo' tai 'arvo ja summa'sillä kaikki tuotteet ovat ei-varasto tuotteita
+apps/erpnext/erpnext/controllers/buying_controller.py +60,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,veroluokka ei voi olla 'arvo' tai 'arvo ja summa'sillä kaikki tuotteet ovat ei-varasto tuotteita
 DocType: User,Last Name,Sukunimi
 DocType: Web Page,Left,Vasen
 DocType: Event,All Day,(1/1 päivä)
@@ -3738,7 +3581,7 @@
 DocType: Appraisal,Total Score (Out of 5),osumat (5:stä) yhteensä
 DocType: Contact Us Settings,State,asema
 DocType: Batch,Batch,erä
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +51,Balance,tase
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +28,Balance,tase
 DocType: Project,Total Expense Claim (via Expense Claims),kuluvaatimus yhteensä (kuluvaatimuksesta)
 DocType: User,Gender,sukupuoli
 DocType: Journal Entry,Debit Note,debet viesti
@@ -3768,8 +3611,7 @@
 DocType: Purchase Order,Get Last Purchase Rate,hae viimeisin ostotaso
 DocType: Time Log,Billing Rate based on Activity Type (per hour),Laskutus Hinta perustuu Toimintalaji (tunnissa)
 DocType: Company,Company Info,yrityksen tiedot
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +76,Seaming,saumaus
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +197,"Company Email ID not found, hence mail not sent",sähköpostia ei lähetetty sillä yrityksen sähköpostitunnusta ei löytyny
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +206,"Company Email ID not found, hence mail not sent",sähköpostia ei lähetetty sillä yrityksen sähköpostitunnusta ei löytyny
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),sovellus varat (vastaavat)
 DocType: Production Planning Tool,Filter based on item,suodata tuotteeseen perustuen
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +451,Debit Account,Luottotililtä
@@ -3781,17 +3623,16 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +95,{0} {1} has been modified. Please refresh.,"{0} {1} on muutettu, päivitä"
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,estä käyttäjiä tekemästä poistumissovelluksia seuraavina päivinä
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +591,From Opportunity,tilaisuudesta
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +46,Blanking,Sammutus
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +166,Employee Benefits,työntekijä etuudet
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,Employee Benefits,työntekijä etuudet
 DocType: Sales Invoice,Is POS,on POS
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +240,Packed quantity must equal quantity for Item {0} in row {1},pakattujen määrä tulee olla kuin tuotteen {0} määrä rivillä {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +245,Packed quantity must equal quantity for Item {0} in row {1},pakattujen määrä tulee olla kuin tuotteen {0} määrä rivillä {1}
 DocType: Production Order,Manufactured Qty,valmistettu yksikkömäärä
 DocType: Purchase Receipt Item,Accepted Quantity,hyväksytyt määrä
 apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} ei löydy
 apps/erpnext/erpnext/config/accounts.py +18,Bills raised to Customers.,Laskut nostetaan asiakkaille.
 DocType: DocField,Default,oletus
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Projekti Id
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +466,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},"rivi nro {0}: arvomäärä ei voi olla suurempi kuin odottava kuluvaatimus {1}, odottavien arvomäärä on {2}"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +468,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},"rivi nro {0}: arvomäärä ei voi olla suurempi kuin odottava kuluvaatimus {1}, odottavien arvomäärä on {2}"
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +40,{0} subscribers added,{0} luettelo lisätty
 DocType: Maintenance Schedule,Schedule,aikataulu
 DocType: Cost Center,"Define Budget for this Cost Center. To set budget action, see ""Company List""","Määritä budjetti tälle Kustannuspaikka. Asettaa budjetti toiminta, katso &quot;Yhtiö List&quot;"
@@ -3802,7 +3643,7 @@
 apps/erpnext/erpnext/public/js/pos/pos.js +91,Price List not found or disabled,hinnastoa ei löydy tai se on poistettu käytöstä
 DocType: Expense Claim,Approved,hyväksytty
 DocType: Pricing Rule,Price,Hinta
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +79,Employee relieved on {0} must be set as 'Left',"työntekijä vapautettu {0} tulee asettaa ""vasemmalla"""
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +88,Employee relieved on {0} must be set as 'Left',"työntekijä vapautettu {0} tulee asettaa ""vasemmalla"""
 DocType: Item,"Selecting ""Yes"" will give a unique identity to each entity of this item which can be viewed in the Serial No master.","valitsemalla ""kyllä"" tämän tuotteen varaston kirjaus antaa jokaiselle uniikin identiteetin joka näkyy sarjanumero valvonnassa"
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +39,Appraisal {0} created for Employee {1} in the given date range,työntekijälle {1} on tehty arviointi {0} ilmoitettuna päivänä
 DocType: Employee,Education,koulutus
@@ -3813,7 +3654,7 @@
 apps/frappe/frappe/desk/moduleview.py +67,Standard Reports,perusraportit
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,"kirjanpito, päiväkirjakirjaukset"
 DocType: Delivery Note Item,Available Qty at From Warehouse,Available Kpl at varastosta
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +209,Please select Employee Record first.,valitse työntekijä tietue ensin
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +224,Please select Employee Record first.,valitse työntekijä tietue ensin
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Rivi {0}: Party / Tili ei vastaa {1} / {2} ja {3} {4}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +35,To create a Tax Account,voit luoda verotilin
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +233,Please enter Expense Account,syötä kulutili
@@ -3826,46 +3667,43 @@
 DocType: Sales Order,Track this Sales Order against any Project,seuraa tätä myyntitilausta projektissa
 DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,siillä myyntitilaukset (odottaa toimitusta) perustuen kriteereihin yllä
 DocType: DocShare,Document Type,asiakirja tyyppi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +565,From Supplier Quotation,toimittajan tarjouksesta
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +588,From Supplier Quotation,toimittajan tarjouksesta
 DocType: Deduction Type,Deduction Type,vähennyksen tyyppi
 DocType: Attendance,Half Day,1/2 päivä
 DocType: Pricing Rule,Min Qty,min yksikkömäärä
 DocType: Features Setup,"To track items in sales and purchase documents with batch nos. ""Preferred Industry: Chemicals""",Seurata kohteita myynti- ja osto asiakirjat erän nos. &quot;Ensisijainen Teollisuus: Kemikaalit&quot;
 DocType: GL Entry,Transaction Date,tapahtuma päivä
 DocType: Production Plan Item,Planned Qty,suunniteltu yksikkömäärä
-apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +91,Total Tax,verot yhteensä
+apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +93,Total Tax,verot yhteensä
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +178,For Quantity (Manufactured Qty) is mandatory,yksikkömäärään (valmistettu yksikkömäärä) vaaditaan
 DocType: Stock Entry,Default Target Warehouse,oletus tavoite varasto
 DocType: Purchase Invoice,Net Total (Company Currency),netto yhteensä (yrityksen valuutta)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +79,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,rivi {0}: osapuolityyppi ja osapuoli on kohdistettavissa ​​saatava / maksettava tilille
 DocType: Notification Control,Purchase Receipt Message,Ostokuitti Message
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +95,Total allocated leaves are more than period,Yhteensä myönnetty lehdet ovat enemmän kuin kaudella
 DocType: Production Order,Actual Start Date,todellinen aloituspäivä
 DocType: Sales Order,% of materials delivered against this Sales Order,% materiaaleja toimitettu tätä myyntitilausta vastaan
 apps/erpnext/erpnext/config/stock.py +23,Record item movement.,tietueessa on tuotemuutoksia
 DocType: Newsletter List Subscriber,Newsletter List Subscriber,Uutiskirje List Subscriber
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +164,Morticing,Morticing
 DocType: Email Account,Service,palvelu
 DocType: Hub Settings,Hub Settings,hubi asetukset
 DocType: Project,Gross Margin %,bruttokate %
 DocType: BOM,With Operations,toiminnoilla
 apps/erpnext/erpnext/accounts/party.py +232,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Kirjaukset on jo tehty valuutassa {0} yhtiön {1}. Valitse saamisen tai maksettava tilille valuutta {0}.
 ,Monthly Salary Register,"kuukausipalkka, rekisteri"
-apps/frappe/frappe/website/template.py +140,Next,Seuraava
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard_page.html +17,Next,Seuraava
 DocType: Warranty Claim,If different than customer address,mikäli eri kuin asiakkan osoite
 DocType: BOM Operation,BOM Operation,BOM käyttö
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +118,Electropolishing,elektrolyyttisen
 DocType: Purchase Taxes and Charges,On Previous Row Amount,edellisen rivin arvomäärä
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +24,Please enter Payment Amount in atleast one row,syötä maksun arvomäärä ainakin yhdelle riville
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +33,Please enter Payment Amount in atleast one row,syötä maksun arvomäärä ainakin yhdelle riville
 DocType: POS Profile,POS Profile,POS Profile
 apps/erpnext/erpnext/config/accounts.py +153,"Seasonality for setting budgets, targets etc.","kausivaihtelu asetukset esim, budjettiin, tavoitteisiin jne"
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +238,Row {0}: Payment Amount cannot be greater than Outstanding Amount,rivi {0}: maksun summa ei voi olla suurempi kuin odottava arvomäärä
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +46,Total Unpaid,maksamattomat yhteensä
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +21,Time Log is not billable,aikaloki ei ole laskutettavissa
 apps/erpnext/erpnext/stock/get_item_details.py +128,"Item {0} is a template, please select one of its variants","tuote {0} on mallipohja, valitse yksi sen malleista"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +528,Purchaser,Ostaja
+apps/erpnext/erpnext/public/js/setup_wizard.js +272,Purchaser,Ostaja
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +81,Net pay cannot be negative,Net palkkaa ei voi olla negatiivinen
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +71,Please enter the Against Vouchers manually,Anna Against Lahjakortit manuaalisesti
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +107,Please enter the Against Vouchers manually,Anna Against Lahjakortit manuaalisesti
 DocType: SMS Settings,Static Parameters,staattinen parametri
 DocType: Purchase Order,Advance Paid,ennakkoon maksettu
 DocType: Item,Item Tax,tuote vero
@@ -3874,14 +3712,12 @@
 apps/erpnext/erpnext/config/crm.py +48,Send mass SMS to your contacts,lähetä massatekstiviesti yhteystiedoillesi
 DocType: Purchase Taxes and Charges,Consider Tax or Charge for,pidetään veroille tai maksuille
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,todellinen yksikkömäärä on pakollinen arvo
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +42,Cross-rolling,ristimuovaus
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +132,Credit Card,luottokortti
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +132,Credit Card,luottokortti
 DocType: BOM,Item to be manufactured or repacked,tuote joka valmistetaan- tai pakataan uudelleen
 apps/erpnext/erpnext/config/stock.py +95,Default settings for stock transactions.,varaston tapahtumien oletusasetukset
 DocType: Purchase Invoice,Next Date,Seuraava päivä
 DocType: Employee Education,Major/Optional Subjects,Major / Vapaaehtoinen Aiheet
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +49,Please enter Taxes and Charges,syötä verot ja maksut
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +85,Machining,Koneistus
 DocType: Sales Invoice Item,Drop Ship,Drop Ship
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","talleta tähän esim. perheen lisätiedot, kuten vanhempien nimi ja ammatti, puoliso ja lapset "
 DocType: Hub Settings,Seller Name,myyjä nimi
@@ -3891,7 +3727,7 @@
 DocType: Stock Entry,Repack,pakkaa uudelleen
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +6,You must Save the form before proceeding,Sinun tulee tallentaa lomake ennen kuin jatkat
 DocType: Item Attribute,Numeric Values,Numeroarvot
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +500,Attach Logo,Kiinnitä Logo
+apps/erpnext/erpnext/public/js/setup_wizard.js +246,Attach Logo,Kiinnitä Logo
 DocType: Customer,Commission Rate,provisio taso
 apps/erpnext/erpnext/stock/doctype/item/item.js +38,Make Variant,Tee Variant
 apps/erpnext/erpnext/config/hr.py +145,Block leave applications by department.,estä poistumissovellukset osastoittain
@@ -3906,19 +3742,19 @@
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +105,Please select a csv file,Valitse csv tiedosto
 DocType: Dropbox Backup,Send Backups to Dropbox,lähetä varmuuskopiot Dropbox:iin
 DocType: Purchase Order,To Receive and Bill,vastaanottoon ja laskutukseen
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +94,Designer,suunnittelija
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Designer,suunnittelija
 apps/erpnext/erpnext/config/selling.py +121,Terms and Conditions Template,ehdot ja säännöt mallipohja
 DocType: Serial No,Delivery Details,"toimitus, lisätiedot"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +383,Cost Center is required in row {0} in Taxes table for type {1},kustannuspaikka tarvitsee rivin {0} verokannan {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +386,Cost Center is required in row {0} in Taxes table for type {1},kustannuspaikka tarvitsee rivin {0} verokannan {1}
 DocType: Item,Automatically create Material Request if quantity falls below this level,tee materiaalipyyntö automaattisesti mikäli määrä laskee alle asetetun tason
 ,Item-wise Purchase Register,"tuote työkalu, ostorekisteri"
 DocType: Batch,Expiry Date,vanhenemis päivä
-apps/erpnext/erpnext/stock/doctype/item/item.py +375,"To set reorder level, item must be a Purchase Item or Manufacturing Item","Asettaa reorder tasolla, kohde on osto Tuote tai valmistus Tuote"
+apps/erpnext/erpnext/stock/doctype/item/item.py +379,"To set reorder level, item must be a Purchase Item or Manufacturing Item","Asettaa reorder tasolla, kohde on osto Tuote tai valmistus Tuote"
 ,Supplier Addresses and Contacts,toimittajien osoitteet ja yhteystiedot
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,Ole hyvä ja valitse Luokka ensin
 apps/erpnext/erpnext/config/projects.py +18,Project master.,projekti valvonta
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,"älä käytä symbooleita,  $ jne valuuttojen vieressä"
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +330, (Half Day),(1/2 päivä)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +374, (Half Day),(1/2 päivä)
 DocType: Supplier,Credit Days,kredit päivää
 DocType: Leave Type,Is Carry Forward,siirretääkö
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +478,Get Items from BOM,hae tuotteita BOM:sta
@@ -3926,7 +3762,7 @@
 apps/erpnext/erpnext/config/manufacturing.py +120,Bill of Materials,materiaalien lasku
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +77,Row {0}: Party Type and Party is required for Receivable / Payable account {1},rivi {0}: osapuolityyppi ja osapuoli vaaditaan ​​saatava / maksettava tilille {1}
 DocType: Dropbox Backup,Send Notifications To,lähetä ilmoituksia
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html +26,Ref Date,Ref Date
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +54,Ref Date,Ref Date
 DocType: Employee,Reason for Leaving,poistumisen syy
 DocType: Expense Claim Detail,Sanctioned Amount,sanktioitujen arvomäärä
 DocType: GL Entry,Is Opening,on avaus
@@ -3934,4 +3770,3 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +188,Account {0} does not exist,tiliä {0} ei löydy
 DocType: Account,Cash,Käteinen
 DocType: Employee,Short biography for website and other publications.,lyhyt historiikki verkkosivuille ja muihin julkaisuihin
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +31,Please create Salary Structure for employee {0},tee työntekijöille palkkarakenne {0}
diff --git a/erpnext/translations/fr.csv b/erpnext/translations/fr.csv
index a04ab1f..e5f9794 100644
--- a/erpnext/translations/fr.csv
+++ b/erpnext/translations/fr.csv
@@ -1,34 +1,32 @@
 DocType: Employee,Salary Mode,Mode de rémunération
 DocType: Cost Center,"Select Monthly Distribution, if you want to track based on seasonality.","Sélectionnez une distribution mensuelle, si vous voulez suivre basée sur la saisonnalité."
 DocType: Employee,Divorced,Divorcé
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +86,Warning: Same item has been entered multiple times.,Attention: même élément a été saisi plusieurs fois.
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +80,Warning: Same item has been entered multiple times.,Attention: même élément a été saisi plusieurs fois.
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +96,Items already synced,Articles déjà synchronisés
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,Autorisera à être ajouté à plusieurs reprises dans une transaction
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,Annuler Matériau Visitez {0} avant d'annuler cette revendication de garantie
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +19,Consumer Products,Produits de consommation
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,Produits de consommation
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +68,Please select Party Type first,S&#39;il vous plaît sélectionner partie Type premier
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +90,Annealing,Recuit
 DocType: Item,Customer Items,Articles de clients
 apps/erpnext/erpnext/accounts/doctype/account/account.py +45,Account {0}: Parent account {1} can not be a ledger,Compte {0}: Le Compte parent {1} ne peut pas être un grand livre
 DocType: Item,Publish Item to hub.erpnext.com,Publier un item au hub.erpnext.com
 apps/erpnext/erpnext/config/setup.py +93,Email Notifications,Notifications par courriel
 DocType: Item,Default Unit of Measure,Unité de mesure par défaut
 DocType: SMS Center,All Sales Partner Contact,Tous les contacts des partenaires commerciaux
-DocType: Employee,Leave Approvers,Laisser approbateurs
+DocType: Employee,Leave Approvers,Approbateurs d'absence
 DocType: Sales Partner,Dealer,Revendeur
 DocType: Employee,Rented,Loué
 DocType: About Us Settings,Website,Site Web
 DocType: POS Profile,Applicable for User,Applicable pour l&#39;utilisateur
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +169,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Arrêtée ordre de production ne peut pas être annulée, déboucher d&#39;abord annuler"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +23,Compaction plus sintering,Compactage ainsi frittage
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,Currency is required for Price List {0},Devise est nécessaire pour Liste de prix {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Sera calculé lors de la transaction.
 DocType: Purchase Order,Customer Contact,Contact client
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +549,From Material Request,De Demande de Matériel
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +572,From Material Request,De Demande de Matériel
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} Arbre
 DocType: Job Applicant,Job Applicant,Demandeur d&#39;emploi
 apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,Plus de résultats.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +78,Legal,juridique
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +34,Legal,juridique
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +114,Actual type tax cannot be included in Item rate in row {0},Le type de taxe réel ne peut pas être inclus dans le prix de l'article à la ligne {0}
 DocType: C-Form,Customer,Client
 DocType: Purchase Receipt Item,Required By,Requis par
@@ -43,7 +41,6 @@
 DocType: Manufacturing Settings,Default 10 mins,Par défaut 10 minutes
 DocType: Leave Type,Leave Type Name,Laisser Nom Type
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +148,Series Updated Successfully,prix règle
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +150,Stitching,Piqûre
 DocType: Pricing Rule,Apply On,Pas autorisé à modifier compte gelé {0}
 DocType: Item Price,Multiple Item prices.,Prix ​​des ouvrages multiples.
 ,Purchase Order Items To Be Received,Articles de bons de commande pour être reçu
@@ -51,8 +48,8 @@
 DocType: Quality Inspection Reading,Parameter,Paramètre
 apps/erpnext/erpnext/projects/doctype/project/project.py +43,Expected End Date can not be less than Expected Start Date,Date prévue de la fin ne peut être inférieure à Date de début prévue
 apps/erpnext/erpnext/utilities/transaction_base.py +104,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Row # {0}: Taux doit être le même que {1}: {2} ({3} / {4})
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +189,New Leave Application,Nouvelle demande d&#39;autorisation
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +134,Bank Draft,Projet de la Banque
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +204,New Leave Application,Nouvelle demande d&#39;autorisation
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +134,Bank Draft,Projet de la Banque
 DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,"1. Pour maintenir le code de référence du client et de les rendre consultables en fonction de leur code, utiliser cette option"
 DocType: Mode of Payment Account,Mode of Payment Account,Mode de compte de paiement
 apps/erpnext/erpnext/stock/doctype/item/item.js +34,Show Variants,Voir les variantes
@@ -64,25 +61,23 @@
 DocType: Production Plan Item,Production Plan Item,Élément du plan de production
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +141,User {0} is already assigned to Employee {1},Utilisateur {0} est déjà attribué à l'employé {1}
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +13,Make new POS Profile,Faites nouveau profil de POS
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +31,Health Care,soins de santé
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,soins de santé
 DocType: Purchase Invoice,Monthly,Mensuel
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +66,Delay in payment (Days),Retard de paiement (jours)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +494,Invoice,Facture
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +519,Invoice,Facture
 DocType: Maintenance Schedule Item,Periodicity,Périodicité
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +357,Email Address,Adresse E-mail
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +21,Defense,défense
+apps/erpnext/erpnext/public/js/setup_wizard.js +107,Email Address,Adresse E-mail
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,défense
 DocType: Company,Abbr,Abréviation
 DocType: Appraisal Goal,Score (0-5),Score (0-5)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +193,Row {0}: {1} {2} does not match with {3},Rangée {0}: {1} {2} ne correspond pas à {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +67,Row # {0}:,Row # {0}:
 DocType: Delivery Note,Vehicle No,No du véhicule
 apps/erpnext/erpnext/public/js/pos/pos.js +528,Please select Price List,S&#39;il vous plaît sélectionnez Liste des Prix
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +162,Woodworking,Travail du bois
 DocType: Production Order Operation,Work In Progress,Work In Progress
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +153,3D printing,Impression en 3D
 DocType: Employee,Holiday List,Liste de vacances
 DocType: Time Log,Time Log,Temps Connexion
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +530,Accountant,Comptable
+apps/erpnext/erpnext/public/js/setup_wizard.js +274,Accountant,Comptable
 DocType: Cost Center,Stock User,Stock utilisateur
 DocType: Company,Phone No,N ° de téléphone
 DocType: Time Log,"Log of Activities performed by users against Tasks that can be used for tracking time, billing.","Connexion des activités réalisées par les utilisateurs contre les tâches qui peuvent être utilisés pour le suivi du temps, de la facturation."
@@ -98,18 +93,19 @@
 DocType: Bin,Quantity Requested for Purchase,Quantité demandée pour l&#39;achat
 DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name","Attacher fichier .csv avec deux colonnes, une pour l&#39;ancien nom et un pour le nouveau nom"
 DocType: Packed Item,Parent Detail docname,DocName Détail Parent
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Kg,Kg
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Kg,Kg
 apps/erpnext/erpnext/config/hr.py +48,Opening for a Job.,Ouverture d&#39;un emploi.
 DocType: Item Attribute,Increment,Incrément
 apps/erpnext/erpnext/public/js/stock_analytics.js +63,Select Warehouse...,Sélectionnez Entrepôt ...
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +6,Advertising,publicité
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,publicité
+apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,Même Société a été inscrite plus d&#39;une fois
 DocType: Employee,Married,Marié
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +389,Stock cannot be updated against Delivery Note {0},désactiver
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +391,Stock cannot be updated against Delivery Note {0},désactiver
 DocType: Payment Reconciliation,Reconcile,réconcilier
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +30,Grocery,épicerie
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,épicerie
 DocType: Quality Inspection Reading,Reading 1,Lecture 1
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Make Bank Entry,Assurez accès des banques
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +40,Pension Funds,Les fonds de pension
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,Les fonds de pension
 apps/erpnext/erpnext/accounts/doctype/account/account.py +142,Warehouse is mandatory if account type is Warehouse,Entrepôt est obligatoire si le type de compte est Entrepôt
 DocType: SMS Center,All Sales Person,Tous les commerciaux
 DocType: Lead,Person Name,Nom Personne
@@ -131,7 +127,7 @@
 DocType: Quality Inspection,Get Specification Details,Obtenez les détails Spécification
 DocType: Lead,Interested,Intéressé
 apps/erpnext/erpnext/config/manufacturing.py +14,Bill of Material,De la valeur doit être inférieure à la valeur à la ligne {0}
-apps/erpnext/erpnext/public/js/stock_analytics.js +45,Opening,Ouverture
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +158,Opening,Ouverture
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},Du {0} au {1}
 DocType: Item,Copy From Item Group,Copy From Group article
 DocType: Journal Entry,Opening Entry,Entrée ouverture
@@ -145,23 +141,22 @@
 DocType: Employee Education,Under Graduate,Sous Graduate
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +22,Target On,cible sur
 DocType: BOM,Total Cost,Coût total
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +99,Reaming,Alésage
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +9,Activity Log:,Journal d'activité:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +199,Item {0} does not exist in the system or has expired,Point {0} n'existe pas dans le système ou a expiré
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +44,Real Estate,Immobilier
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +44,Real Estate,Immobilier
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +4,Statement of Account,Relevé de compte
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +41,Pharmaceuticals,médicaments
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,médicaments
 DocType: Expense Claim Detail,Claim Amount,Montant réclamé
 DocType: Employee,Mr,M.
 DocType: Custom Script,Client,Client
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,Fournisseur Type / Fournisseur
 DocType: Naming Series,Prefix,Préfixe
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Consumable,consommable
+apps/erpnext/erpnext/public/js/setup_wizard.js +359,Consumable,consommable
 DocType: Upload Attendance,Import Log,Importer Connexion
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.js +19,Send,Envoyer
 DocType: Sales Invoice Item,Delivered By Supplier,Livré Par Fournisseur
 DocType: SMS Center,All Contact,Tout contact
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +164,Annual Salary,Salaire Annuel
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +164,Annual Salary,Salaire Annuel
 DocType: Period Closing Voucher,Closing Fiscal Year,Clôture de l&#39;exercice
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +69,Stock Expenses,Facteur de conversion de l'unité de mesure par défaut doit être de 1 à la ligne {0}
 DocType: Newsletter,Email Sent?,Courriel envoyés?
@@ -169,7 +164,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +92,Show Time Logs,Show Time Logs
 DocType: Journal Entry Account,Credit in Company Currency,Crédit Entreprise Devise
 DocType: Delivery Note,Installation Status,Etat de l&#39;installation
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +115,Accepted + Rejected Qty must be equal to Received quantity for Item {0},La quantité acceptée + rejetée doit être égale à la quantité reçue pour l'Item {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +118,Accepted + Rejected Qty must be equal to Received quantity for Item {0},La quantité acceptée + rejetée doit être égale à la quantité reçue pour l'Item {0}
 DocType: Item,Supply Raw Materials for Purchase,Approvisionnement en matières premières pour l&#39;achat
 apps/erpnext/erpnext/stock/get_item_details.py +133,Item {0} must be a Purchase Item,Parent Site Route
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
@@ -177,19 +172,17 @@
  Toutes les dates et employé combinaison dans la période choisie viendra dans le modèle, avec des records de fréquentation existants"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +446,Item {0} is not active or end of life has been reached,« À jour» est nécessaire
 DocType: Time Log Batch,Will be updated after Sales Invoice is Submitted.,Sera mis à jour après la facture de vente est soumise.
-apps/erpnext/erpnext/controllers/accounts_controller.py +493,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","D'inclure la taxe dans la ligne {0} dans le prix de l'article , les impôts dans les lignes {1} doivent également être inclus"
+apps/erpnext/erpnext/controllers/accounts_controller.py +494,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","D'inclure la taxe dans la ligne {0} dans le prix de l'article , les impôts dans les lignes {1} doivent également être inclus"
 apps/erpnext/erpnext/config/hr.py +90,Settings for HR Module,Utilisateur {0} est désactivé
 DocType: SMS Center,SMS Center,Centre SMS
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +78,Straightening,Redressement
 DocType: BOM Replace Tool,New BOM,Nouvelle nomenclature
 apps/erpnext/erpnext/config/projects.py +28,Batch Time Logs for billing.,Batch Time Logs pour la facturation.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +15,Countergravity casting,", À contre coulée"
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +30,Newsletter has already been sent,Entrepôt requis pour stock Article {0}
 DocType: Lead,Request Type,Type de demande
 DocType: Leave Application,Reason,Raison
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +14,Broadcasting,Diffusion
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +140,Execution,exécution
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +364,The first user will become the System Manager (you can change this later).,Le premier utilisateur deviendra le System Manager (vous pouvez changer cela plus tard).
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,Diffusion
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +140,Execution,exécution
+apps/erpnext/erpnext/public/js/setup_wizard.js +114,The first user will become the System Manager (you can change this later).,Le premier utilisateur deviendra le System Manager (vous pouvez changer cela plus tard).
 apps/erpnext/erpnext/config/manufacturing.py +39,Details of the operations carried out.,Les détails des opérations effectuées.
 DocType: Serial No,Maintenance Status,Statut d&#39;entretien
 apps/erpnext/erpnext/config/stock.py +263,Items and Pricing,Articles et Prix
@@ -206,7 +199,6 @@
 DocType: Pricing Rule,Discount on Price List Rate (%),Remise sur la liste des prix Taux (%)
 apps/frappe/frappe/public/js/frappe/form/print.js +96,Start,Démarrer
 DocType: User,First Name,Prénom
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +12,Full-mold casting,Full-coulée en moule
 DocType: Offer Letter,Select Terms and Conditions,Sélectionnez Termes et Conditions
 DocType: Production Planning Tool,Sales Orders,Commandes clients
 DocType: Purchase Taxes and Charges,Valuation,Évaluation
@@ -218,8 +210,7 @@
 DocType: Bank Reconciliation,Bank Account,Compte bancaire
 DocType: Leave Type,Allow Negative Balance,Autoriser un solde négatif
 DocType: Selling Settings,Default Territory,Territoire défaut
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +53,Television,Télévision
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +138,Gashing,Tailladant
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,Télévision
 DocType: Production Order Operation,Updated via 'Time Log',Mise à jour via 'Log Time'
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +82,Account {0} does not belong to Company {1},Compte {0} n'appartient pas à la société {1}
 DocType: Naming Series,Series List for this Transaction,Liste série pour cette transaction
@@ -234,14 +225,13 @@
 DocType: Leave Allocation,Add unused leaves from previous allocations,Ajouter les feuilles inutilisées d&#39;attributions antérieures
 apps/erpnext/erpnext/controllers/recurring_document.py +206,Next Recurring {0} will be created on {1},Suivant récurrent {0} sera créé sur {1}
 DocType: Newsletter List,Total Subscribers,Nombre total d&#39;abonnés
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +575,Contact Name,Contact Nom
+,Contact Name,Contact Nom
 DocType: Production Plan Item,SO Pending Qty,SO attente Qté
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Crée le bulletin de salaire pour les critères mentionnés ci-dessus.
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,Demande d&#39;achat.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +107,Double housing,Double logement
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +156,Only the selected Leave Approver can submit this Leave Application,Seul le congé approbateur sélectionné peut soumettre cette demande de congé
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +171,Only the selected Leave Approver can submit this Leave Application,Seul le congé approbateur sélectionné peut soumettre cette demande de congé
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,Vous n'êtes pas autorisé à ajouter ou mettre à jour les entrées avant {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +172,Leaves per Year,De feuilles par année
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +172,Leaves per Year,De feuilles par année
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup > Settings > Naming Series,S&#39;il vous plaît mettre Naming série pour {0} via Configuration&gt; Paramètres&gt; Série Naming
 DocType: Time Log,Will be updated when batched.,Sera mis à jour lorsque lots.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +104,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,Row {0}: Se il vous plaît vérifier 'Est Advance' contre compte {1} si ce est une entrée avance.
@@ -250,25 +240,24 @@
 DocType: Item Website Specification,Item Website Specification,Spécification Site élément
 DocType: Dropbox Backup,Dropbox Access Key,Dropbox Clé d&#39;accès
 DocType: Payment Tool,Reference No,No de référence
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +348,Leave Blocked,Laisser Bloqué
-apps/erpnext/erpnext/stock/doctype/item/item.py +535,Item {0} has reached its end of life on {1},dépenses
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +392,Leave Blocked,Laisser Bloqué
+apps/erpnext/erpnext/stock/doctype/item/item.py +539,Item {0} has reached its end of life on {1},dépenses
 apps/erpnext/erpnext/accounts/utils.py +339,Annual,Annuel
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Stock réconciliation article
 DocType: Stock Entry,Sales Invoice No,Aucune facture de vente
 DocType: Material Request Item,Min Order Qty,Quantité de commande minimale
 DocType: Lead,Do Not Contact,Ne communiquez pas avec
 DocType: Sales Invoice,The unique id for tracking all recurring invoices. It is generated on submit.,L&#39;identifiant unique pour le suivi de toutes les factures récurrentes. Il est généré lors de la soumission.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +93,Software Developer,Software Developer
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +93,Software Developer,Software Developer
 DocType: Item,Minimum Order Qty,Quantité de commande minimum
 DocType: Pricing Rule,Supplier Type,Type de fournisseur
 DocType: Item,Publish in Hub,Publier dans Hub
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +555,Item {0} is cancelled,Nom de la campagne est nécessaire
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +598,Material Request,Demande de matériel
+apps/erpnext/erpnext/stock/doctype/item/item.py +559,Item {0} is cancelled,Nom de la campagne est nécessaire
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +607,Material Request,Demande de matériel
 DocType: Bank Reconciliation,Update Clearance Date,Mettre à jour Date de Garde
 DocType: Item,Purchase Details,Détails de l'achat
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +323,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},Article {0} introuvable dans 'matières premières Fournies' table dans la commande d'achat {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +129,Wire brushing,Le brossage
 DocType: Employee,Relation,Rapport
 DocType: Shipping Rule,Worldwide Shipping,Livraison internationale
 apps/erpnext/erpnext/config/selling.py +23,Confirmed orders from Customers.,Confirmé commandes provenant de clients.
@@ -284,12 +273,11 @@
 DocType: Supplier,Address HTML,Adresse HTML
 DocType: Lead,Mobile No.,N° mobile.
 DocType: Maintenance Schedule,Generate Schedule,Générer annexe
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +81,Hubbing,Hubbing
 DocType: Purchase Invoice Item,Expense Head,Chef des frais
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +86,Please select Charge Type first,S'il vous plaît sélectionnez le type de Facturation de la première
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,dernier
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +395,Max 5 characters,5 caractères maximum
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +195,Select Your Language,Sélectionnez votre langue
+apps/erpnext/erpnext/public/js/setup_wizard.js +143,Max 5 characters,5 caractères maximum
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +245,Select Your Language,Sélectionnez votre langue
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,Le premier congé approbateur dans la liste sera définie comme le congé approbateur de défaut
 DocType: Manufacturing Settings,"Disables creation of time logs against Production Orders.
 Operations shall not be tracked against Production Order",Désactive la création de registres de temps contre les ordres de fabrication. Opérations ne doivent pas être suivis contre ordre de fabrication
@@ -301,8 +289,6 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +34,Item {0} must be Service Item,Réglages pour le Module des ressources humaines
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +303,Completed Qty can not be greater than 'Qty to Manufacture',Terminé Quantité ne peut pas être supérieure à «Quantité de Fabrication '
 DocType: DocType,Administrator,Administrateur
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +136,Laser drilling,perçage laser
-DocType: Stock UOM Replace Utility,New Stock UOM,Nouveau stock UDM
 DocType: Period Closing Voucher,Closing Account Head,Fermeture chef Compte
 DocType: Employee,External Work History,Histoire de travail externe
 apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,Référence circulaire erreur
@@ -311,18 +297,15 @@
 DocType: Lead,Industry,Industrie
 DocType: Employee,Job Profile,Profil d'emploi
 DocType: Newsletter,Newsletter,Bulletin
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +84,Hydroforming,Hydroformage
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +49,Necking,Pelotage
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Notification par courriel lors de la création de la demande de matériel automatique
 DocType: Journal Entry,Multi Currency,Multi-devise
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +51,Item is updated,S'il vous plaît entrez prévue Quantité pour l'article {0} à la ligne {1}
 DocType: Async Task,System Manager,System Manager
 DocType: Payment Reconciliation Invoice,Invoice Type,Type de facture
 DocType: Sales Invoice Item,Delivery Note,Bon de livraison
 DocType: Dropbox Backup,Allow Dropbox Access,Autoriser l'accès au Dropbox
 apps/erpnext/erpnext/config/learn.py +72,Setting up Taxes,Mise en place d&#39;impôts
 apps/erpnext/erpnext/accounts/utils.py +189,Payment Entry has been modified after you pulled it. Please pull it again.,Paiement entrée a été modifié après que vous avez tiré il. Se il vous plaît tirez encore.
-apps/erpnext/erpnext/stock/doctype/item/item.py +343,{0} entered twice in Item Tax,{0} est entré deux fois dans la Taxe de l'Article
+apps/erpnext/erpnext/stock/doctype/item/item.py +347,{0} entered twice in Item Tax,{0} est entré deux fois dans la Taxe de l'Article
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +105,Summary for this week and pending activities,Résumé pour cette semaine et les activités en suspens
 DocType: Workstation,Rent Cost,louer coût
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +74,Please select month and year,S&#39;il vous plaît sélectionner le mois et l&#39;année
@@ -339,31 +322,29 @@
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,Vitesse à laquelle la devise du client est converti en devise de base du client
 DocType: Features Setup,"Available in BOM, Delivery Note, Purchase Invoice, Production Order, Purchase Order, Purchase Receipt, Sales Invoice, Sales Order, Stock Entry, Timesheet","Disponible en nomenclature , bon de livraison , facture d'achat , ordre de production, bon de commande , bon de réception , la facture de vente , Sales Order , Stock entrée , des feuilles de temps"
 DocType: Item Tax,Tax Rate,Taux d&#39;imposition
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Select Item,Sélectionner un élément
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +540,Select Item,Sélectionner un élément
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +143,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","Item: {0} discontinu, ne peut être conciliée utilisant \
  Stock réconciliation, utiliser à la place l'entrée en stock géré"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +259,Purchase Invoice {0} is already submitted,Voulez-vous vraiment de soumettre tout bulletin de salaire pour le mois {0} et {1} an
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +262,Purchase Invoice {0} is already submitted,Voulez-vous vraiment de soumettre tout bulletin de salaire pour le mois {0} et {1} an
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Batch No must be same as {1} {2},Row # {0}: N ° de lot doit être le même que {1} {2}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Convert to non-Group,Convertir en groupe non-
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +55,Purchase Receipt must be submitted,Reçu d'achat doit être présentée
-DocType: Stock UOM Replace Utility,Current Stock UOM,Emballage Stock actuel
 apps/erpnext/erpnext/config/stock.py +53,Batch (lot) of an Item.,Lot d'un article.
 DocType: C-Form Invoice Detail,Invoice Date,Date de la facture
 DocType: GL Entry,Debit Amount,Débit Montant
 apps/erpnext/erpnext/accounts/party.py +223,There can only be 1 Account per Company in {0} {1},Il ne peut y avoir 1 compte par la société dans {0} {1}
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Your email address,Votre adress email
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +194,Please see attachment,S'il vous plaît voir la pièce jointe
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +203,Please see attachment,S'il vous plaît voir la pièce jointe
 DocType: Purchase Order,% Received,% reçus
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +109,Water jet cutting,découpe au jet d&#39;eau
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +24,Setup Already Complete!!,Configuration déjà terminée !
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +20,Setup Already Complete!!,Configuration déjà terminée !
 ,Finished Goods,Produits finis
 DocType: Delivery Note,Instructions,Instructions
 DocType: Quality Inspection,Inspected By,Inspecté par
 DocType: Maintenance Visit,Maintenance Type,Type d&#39;entretien
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +61,Serial No {0} does not belong to Delivery Note {1},N ° de série {0} ne fait pas partie de la livraison Remarque {1}
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,Paramètre d&#39;inspection Article de qualité
-DocType: Leave Application,Leave Approver Name,Laissez Nom approbateur
+DocType: Leave Application,Leave Approver Name,Nom de l'approbateur d'absence
 ,Schedule Date,calendrier Date
 DocType: Packed Item,Packed Item,Article d&#39;emballage de livraison Note
 apps/erpnext/erpnext/config/buying.py +54,Default settings for buying transactions.,non Soumis
@@ -371,6 +352,7 @@
 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.,S&#39;il vous plaît ne créez pas de comptes pour les clients et les fournisseurs. Ils sont créés directement par les maîtres clients / fournisseurs.
 DocType: Currency Exchange,Currency Exchange,Change de devises
 DocType: Purchase Invoice Item,Item Name,Nom d&#39;article
+DocType: Authorization Rule,Approving User  (above authorized value),Approuver l&#39;utilisateur (valeur autorisée ci-dessus)
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Credit Balance,Solde de crédit
 DocType: Employee,Widowed,Veuf
 DocType: Production Planning Tool,"Items to be requested which are ""Out of Stock"" considering all warehouses based on projected qty and minimum order qty","Articles à être demandés, qui sont &quot;Out of Stock&quot; compte tenu de tous les entrepôts basés sur quantité projetée et qté minimum"
@@ -380,11 +362,10 @@
 ,Purchase Register,Achat S&#39;inscrire
 DocType: Landed Cost Item,Applicable Charges,Frais applicables
 DocType: Workstation,Consumable Cost,Coût de consommable
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,{0} ({1}) must have role 'Leave Approver',{0} ({1}) doit avoir le rôle «Approbateur de congé'
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +167,{0} ({1}) must have role 'Leave Approver',{0} ({1}) doit avoir le rôle «Approbateur de congé'
 DocType: Purchase Receipt,Vehicle Date,Date de véhicule
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +39,Medical,Numéro de référence est obligatoire si vous avez entré date de référence
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +39,Medical,Numéro de référence est obligatoire si vous avez entré date de référence
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,Raison pour perdre
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +36,Tube beading,Tube de perles
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},Workstation est fermé aux dates suivantes selon la liste de vacances: {0}
 DocType: Employee,Single,Unique
 DocType: Issue,Attachment,Pièce jointe
@@ -405,10 +386,8 @@
 DocType: Account,Is Group,Est un groupe
 DocType: Stock Settings,Automatically Set Serial Nos based on FIFO,Réglage automatique de série n ° basé sur FIFO
 DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,Vérifiez Fournisseur numéro de facture Unicité
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +31,Thermoforming,Thermoformage
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +66,Slitting,Refendage
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +57,'To Case No.' cannot be less than 'From Case No.',«Le cas No ' ne peut pas être inférieure à 'Du Cas No'
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +104,Non Profit,À but non lucratif
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +104,Non Profit,À but non lucratif
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_list.js +7,Not Started,Non commencé
 DocType: Lead,Channel Partner,Channel Partner
 DocType: Account,Old Parent,Parent Vieux
@@ -417,13 +396,12 @@
 apps/erpnext/erpnext/config/manufacturing.py +74,Global settings for all manufacturing processes.,Paramètres globaux pour tous les processus de fabrication.
 DocType: Accounts Settings,Accounts Frozen Upto,Comptes gelés jusqu'au
 DocType: SMS Log,Sent On,Sur envoyé
-apps/erpnext/erpnext/stock/doctype/item/item.py +512,Attribute {0} selected multiple times in Attributes Table,Attribut {0} sélectionnée à plusieurs reprises dans le tableau Attributs
+apps/erpnext/erpnext/stock/doctype/item/item.py +516,Attribute {0} selected multiple times in Attributes Table,Attribut {0} sélectionnée à plusieurs reprises dans le tableau Attributs
 DocType: Sales Order,Not Applicable,Non applicable
 apps/erpnext/erpnext/config/hr.py +140,Holiday master.,Débit doit être égal à crédit . La différence est {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +19,Shell molding,Moulage Shell
 DocType: Material Request Item,Required Date,Requis Date
 DocType: Delivery Note,Billing Address,Adresse de facturation
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +644,Please enter Item Code.,S'il vous plaît entrez le code d'article .
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +648,Please enter Item Code.,S'il vous plaît entrez le code d'article .
 DocType: BOM,Costing,Costing
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount","Si elle est cochée, le montant de la taxe sera considéré comme déjà inclus dans le tarif Imprimer / Print Montant"
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,Quantité totale
@@ -433,7 +411,7 @@
 DocType: Item Attribute,To Range,Se situer
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Titres et des dépôts
 DocType: Features Setup,Imports,Importations
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +144,Adhesive bonding,Collage
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +77,Total leaves allocated is mandatory,Nombre de feuilles alloués est obligatoire
 DocType: Job Opening,Description of a Job Opening,Description d'une ouverture d'emploi
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +102,Pending activities for today,Activités en suspens pour aujourd&#39;hui
 apps/erpnext/erpnext/config/hr.py +28,Attendance record.,Record de fréquentation.
@@ -441,26 +419,25 @@
 DocType: Sales Order Item,Used for Production Plan,Utilisé pour plan de production
 DocType: System Settings,Loading...,Chargement en cours ...
 DocType: DocField,Password,Mot de passe
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +155,Fused deposition modeling,Extrusion de fil
 DocType: Manufacturing Settings,Time Between Operations (in mins),Temps entre les opérations (en min)
 DocType: Customer,Buyer of Goods and Services.,Lors de votre achat des biens et services.
 DocType: Journal Entry,Accounts Payable,Comptes à payer
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +24,Add Subscribers,Ajouter abonnés
 apps/erpnext/erpnext/public/js/feature_setup.js +220,""" does not exists",""" N'existe pas"
 DocType: Pricing Rule,Valid Upto,Jusqu&#39;à valide
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +564,List a few of your customers. They could be organizations or individuals.,Énumérer quelques-unes de vos clients . Ils pourraient être des organisations ou des individus .
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,List a few of your customers. They could be organizations or individuals.,Énumérer quelques-unes de vos clients . Ils pourraient être des organisations ou des individus .
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Direct Income,Choisissez votre langue
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +33,"Can not filter based on Account, if grouped by Account","Impossible de filtrer sur les compte , si regroupées par compte"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +88,Administrative Officer,Agent administratif
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Administrative Officer,Agent administratif
 DocType: Payment Tool,Received Or Paid,Reçus ou payés
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +318,Please select Company,S&#39;il vous plaît sélectionnez Société
 DocType: Stock Entry,Difference Account,Compte de la différence
 apps/erpnext/erpnext/projects/doctype/task/task.py +44,Cannot close task as its dependant task {0} is not closed.,Impossible de fermer sa tâche en tant que tâche dépendante {0} est pas fermée.
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +305,Please enter Warehouse for which Material Request will be raised,S'il vous plaît entrer Entrepôt à qui demande de matériel sera porté
 DocType: Production Order,Additional Operating Cost,Coût de fonctionnement supplémentaires
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +20,Cosmetics,produits de beauté
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,produits de beauté
 DocType: DocField,Type,Type
-apps/erpnext/erpnext/stock/doctype/item/item.py +417,"To merge, following properties must be same for both items","Pour fusionner , les propriétés suivantes doivent être les mêmes pour les deux articles"
+apps/erpnext/erpnext/stock/doctype/item/item.py +421,"To merge, following properties must be same for both items","Pour fusionner , les propriétés suivantes doivent être les mêmes pour les deux articles"
 DocType: Communication,Subject,Sujet
 DocType: Shipping Rule,Net Weight,Poids net
 DocType: Employee,Emergency Phone,téléphone d'urgence
@@ -470,7 +447,6 @@
 DocType: Journal Entry,Difference (Dr - Cr),Différence (Dr - Cr )
 DocType: Account,Profit and Loss,Pertes et profits
 apps/erpnext/erpnext/config/stock.py +293,Managing Subcontracting,Gestion de la sous-traitance
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +58,New UOM must NOT be of type Whole Number,Nouveau UDM doit pas être de type entier Nombre
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Furniture and Fixture,Meubles et articles d'ameublement
 DocType: Quotation,Rate at which Price list currency is converted to company's base currency,Taux auquel la monnaie Liste de prix est converti en devise de base entreprise
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Account {0} does not belong to company: {1},Compte {0} n'appartient pas à la société : {1}
@@ -489,14 +465,14 @@
 DocType: Purchase Invoice,Supplier Invoice No,Fournisseur facture n
 DocType: Territory,For reference,Pour référence
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +154,"Cannot delete Serial No {0}, as it is used in stock transactions","Vous ne pouvez pas supprimer de série n {0}, tel qu&#39;il est utilisé dans les transactions d&#39;achat d&#39;actions"
-apps/erpnext/erpnext/public/js/account_tree_grid.js +52,Closing (Cr),Fermeture (Cr)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +227,Closing (Cr),Fermeture (Cr)
 DocType: Serial No,Warranty Period (Days),Période de garantie (jours)
 DocType: Installation Note Item,Installation Note Item,Article Remarque Installation
 ,Pending Qty,En attente Quantité
 DocType: Job Applicant,Thread HTML,Discussion HTML
 DocType: Company,Ignore,Ignorer
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +86,SMS sent to following numbers: {0},SMS envoyé aux numéros suivants: {0}
-apps/erpnext/erpnext/controllers/buying_controller.py +135,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Peut se référer ligne que si le type de charge est « Le précédent Montant de la ligne » ou « Précédent Row Total»
+apps/erpnext/erpnext/controllers/buying_controller.py +126,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Peut se référer ligne que si le type de charge est « Le précédent Montant de la ligne » ou « Précédent Row Total»
 DocType: Pricing Rule,Valid From,Aucun article avec Serial Non {0}
 DocType: Sales Invoice,Total Commission,Total de la Commission
 DocType: Pricing Rule,Sales Partner,Sales Partner
@@ -506,13 +482,13 @@
 To distribute a budget using this distribution, set this **Monthly Distribution** in the **Cost Center**","** Distribution mensuelle ** vous aide à distribuer votre budget à travers les mois si vous avez la saisonnalité dans votre entreprise.
 
  Pour distribuer un budget en utilisant cette distribution, réglez ce ** distribution mensuelle ** ** dans le centre de coûts **"
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +183,No records found in the Invoice table,Aucun documents trouvés dans le tableau de la facture
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +130,No records found in the Invoice table,Aucun documents trouvés dans le tableau de la facture
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +20,Please select Company and Party Type first,Se il vous plaît sélectionnez Société et partie Type premier
 apps/erpnext/erpnext/config/accounts.py +84,Financial / accounting year.,Point {0} a été saisi plusieurs fois contre une même opération
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","Désolé , série n ne peut pas être fusionné"
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +581,Make Sales Order,Assurez- Commande
 DocType: Project Task,Project Task,Groupe de Projet
-,Lead Id,Id plomb
+,Lead Id,Id prospect
 DocType: C-Form Invoice Detail,Grand Total,Grand Total
 DocType: About Us Settings,Website Manager,Gestionnaire de site Web
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +34,Fiscal Year Start Date should not be greater than Fiscal Year End Date,Exercice Date de début ne doit pas être supérieure à fin d'exercice Date de
@@ -522,25 +498,25 @@
 DocType: Sales Order,Billing and Delivery Status,Facturation et de livraison Statut
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Répéter les clients
 DocType: Leave Control Panel,Allocate,Allouer
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +16,Previous,Précedent
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard_page.html +16,Previous,Précedent
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +620,Sales Return,Retour de Ventes
 DocType: Production Planning Tool,Select Sales Orders from which you want to create Production Orders.,Sélectionnez les commandes clients à partir de laquelle vous souhaitez créer des ordres de fabrication.
 DocType: Item,Delivered by Supplier (Drop Ship),Livré par le Fournisseur (Drop Ship)
 apps/erpnext/erpnext/config/hr.py +120,Salary components.,Éléments du salaire.
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,Base de données de clients potentiels.
+DocType: Authorization Rule,Customer or Item,Client ou Point
 apps/erpnext/erpnext/config/crm.py +17,Customer database.,Base de données clients.
 DocType: Quotation,Quotation To,Devis Pour
 DocType: Lead,Middle Income,Revenu intermédiaire
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),Ouverture ( Cr )
 apps/erpnext/erpnext/accounts/utils.py +193,Allocated amount can not be negative,Le montant alloué ne peut être négatif
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +123,Tumbling,Tumbling
 DocType: Purchase Order Item,Billed Amt,Bec Amt
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,Un Entrepôt logique dans lequel les entrées en stocks sont faites.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +92,Reference No & Reference Date is required for {0},contacts
 DocType: Event,Wednesday,Mercredi
 DocType: Sales Invoice,Customer's Vendor,Client Fournisseur
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +214,Production Order is Mandatory,Ordre de fabrication est obligatoire
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +139,Proposal Writing,Rédaction de propositions
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,Proposal Writing,Rédaction de propositions
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,Un autre Sales Person {0} existe avec le même ID d&#39;employé
 apps/erpnext/erpnext/stock/stock_ledger.py +336,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},Facture de vente {0} doit être annulée avant d'annuler cette commande client
 DocType: Fiscal Year Company,Fiscal Year Company,Exercice Société
@@ -563,7 +539,7 @@
 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.","Ensuite, les règles de tarification sont filtrés sur la base de clientèle, par groupe de clients, Territoire, fournisseur, le type de fournisseur, campagne, etc Sales Partner"
 apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.py +179,Please install dropbox python module,S&#39;il vous plaît installer Dropbox module Python
 DocType: Employee,Passport Number,Numéro de passeport
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +82,Manager,directeur
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Manager,directeur
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +494,From Purchase Receipt,De ticket de caisse
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +219,Same item has been entered multiple times.,Même élément a été saisi plusieurs fois.
 DocType: SMS Settings,Receiver Parameter,Paramètre récepteur
@@ -571,10 +547,9 @@
 DocType: Sales Person,Sales Person Targets,Personne objectifs de vente
 apps/frappe/frappe/public/js/frappe/form/workflow.js +116,To,à
 apps/frappe/frappe/templates/base.html +145,Please enter email address,Veuillez entrer une adresse E-mail .
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +35,End tube forming,Le tube du bout formant
 DocType: Production Order Operation,In minutes,En quelques minutes
 DocType: Issue,Resolution Date,Date de Résolution
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +635,Please set default Cash or Bank account in Mode of Payment {0},Les frais de téléphone
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +637,Please set default Cash or Bank account in Mode of Payment {0},Les frais de téléphone
 DocType: Selling Settings,Customer Naming By,Client de nommage par
 apps/erpnext/erpnext/accounts/doctype/account/account.js +67,Convert to Group,Convertir en groupe
 DocType: Activity Cost,Activity Type,Type d&#39;activité
@@ -582,12 +557,12 @@
 DocType: Customer,Fixed Days,Jours fixes
 DocType: Sales Invoice,Packing List,Packing List
 apps/erpnext/erpnext/config/buying.py +28,Purchase Orders given to Suppliers.,Achetez commandes faites aux fournisseurs.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +43,Publishing,édition
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +43,Publishing,édition
 DocType: Activity Cost,Projects User,Projets utilisateur
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Consumed,Consommé
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +198,{0}: {1} not found in Invoice Details table,{0}: {1} introuvable pas dans les Détails de la facture
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,{0}: {1} not found in Invoice Details table,{0}: {1} introuvable pas dans les Détails de la facture
 DocType: Company,Round Off Cost Center,Arrondir Centre de coûts
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +208,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Doublons {0} avec la même {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +203,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Doublons {0} avec la même {1}
 DocType: Material Request,Material Transfer,De transfert de matériel
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +56,Opening (Dr),{0} doit être inférieur ou égal à {1}
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},Horodatage affichage doit être après {0}
@@ -599,7 +574,6 @@
 DocType: Pricing Rule,Sales Manager,Directeur des ventes
 apps/frappe/frappe/public/js/frappe/model/model.js +492,Rename,Renommer
 DocType: Journal Entry,Write Off Amount,Ecrire Off Montant
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +52,Bending,Fléchissement
 apps/frappe/frappe/core/page/user_permissions/user_permissions.js +246,Allow User,Permettre à l&#39;utilisateur
 DocType: Journal Entry,Bill No,Numéro de la facture
 DocType: Purchase Invoice,Quarterly,Trimestriel
@@ -609,17 +583,16 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Please enter item details,"Pour signaler un problème, passez à"
 DocType: Purchase Receipt,Other Details,Autres détails
 DocType: Account,Accounts,Comptes
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +67,Marketing,commercialisation
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +65,Straight shearing,Cisaillement droite
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +67,Marketing,commercialisation
 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.,Pour suivre pièce documents de vente et d&#39;achat en fonction de leurs numéros de série. Ce n&#39;est peut également être utilisé pour suivre les détails de la garantie du produit.
 DocType: Purchase Receipt Item Supplied,Current Stock,Stock actuel
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +99,Rejected Warehouse is mandatory against regected item,Entrepôt rejeté est obligatoire contre l'article regected
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +102,Rejected Warehouse is mandatory against regected item,Entrepôt rejeté est obligatoire contre l'article regected
 DocType: Account,Expenses Included In Valuation,Frais inclus dans l&#39;évaluation
 DocType: Employee,Provide email id registered in company,Fournir id e-mail enregistrée dans la société
 DocType: Hub Settings,Seller City,Vendeur Ville
 DocType: Email Digest,Next email will be sent on:,Email sera envoyé le:
 DocType: Offer Letter Term,Offer Letter Term,Offrez Lettre terme
-apps/erpnext/erpnext/stock/doctype/item/item.py +492,Item has variants.,Point a variantes.
+apps/erpnext/erpnext/stock/doctype/item/item.py +496,Item has variants.,Point a variantes.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Article {0} introuvable
 DocType: Bin,Stock Value,Valeur de l&#39;action
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,Type d' arbre
@@ -628,10 +601,9 @@
 DocType: Material Request Item,Quantity and Warehouse,Quantité et entrepôt
 DocType: Sales Invoice,Commission Rate (%),Taux de commission (%)
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +172,"Against Voucher Type must be one of Sales Order, Sales Invoice or Journal Entry","le type de bon doit être un ordre de vente, une facture de vente ou une entrée du journal"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +139,Biomachining,Biomachining
 apps/erpnext/erpnext/setup/utils.py +89,Unable to find exchange rate,Impossible de trouver le taux de change
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +7,Aerospace,aérospatial
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +19,Welcome,Bienvenue
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +7,Aerospace,aérospatial
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +40,Welcome,Bienvenue
 DocType: Journal Entry,Credit Card Entry,Entrée de carte de crédit
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +18,Task Subject,Tâche Objet
 apps/erpnext/erpnext/config/stock.py +33,Goods received from Suppliers.,Marchandises reçues des fournisseurs.
@@ -643,7 +615,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,Actif à court terme
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +92,{0} is not a stock Item,{0} n'est pas un article de stock
 DocType: Mode of Payment Account,Default Account,Compte par défaut
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +157,Lead must be set if Opportunity is made from Lead,Chef de file doit être réglée si l'occasion est composé de plomb
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +157,Lead must be set if Opportunity is made from Lead,Le prospect doit être réglée si l'occasion est créé à partir de ce prospect
 DocType: Contact Us Settings,Address Title,Titre de l'adresse
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +33,Please select weekly off day,Laissez uniquement les applications ayant le statut « Approuvé » peut être soumis
 DocType: Production Order Operation,Planned End Time,Fin planifiée Temps
@@ -654,19 +626,19 @@
 DocType: Employee,Cell Number,Nombre de cellules
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,perdu
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +120,You can not enter current voucher in 'Against Journal Entry' column,Vous ne pouvez pas entrer coupon courant dans «Contre Journal Entry 'colonne
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +25,Energy,énergie
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,énergie
 DocType: Opportunity,Opportunity From,De opportunité
 apps/erpnext/erpnext/config/hr.py +33,Monthly salary statement.,Fiche de salaire mensuel.
 DocType: Item Group,Website Specifications,Site Web Spécifications
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +205,New Account,nouveau compte
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +21,{0}: From {0} of type {1},{0}: Du {0} de type {1}
-apps/erpnext/erpnext/controllers/buying_controller.py +283,Row {0}: Conversion Factor is mandatory,Ligne {0}: facteur de conversion est obligatoire
+apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,Ligne {0}: facteur de conversion est obligatoire
 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.,Les écritures comptables ne peuvent être faites sur les nœuds feuilles. Les entrées dans les groupes ne sont pas autorisées.
 DocType: ToDo,High,Haut
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +361,Cannot deactivate or cancel BOM as it is linked with other BOMs,Vous ne pouvez pas désactiver ou annuler BOM car il est lié à d'autres nomenclatures
 DocType: Opportunity,Maintenance,Entretien
 DocType: User,Male,Masculin
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +182,Purchase Receipt number required for Item {0},Numéro du bon de réception requis pour objet {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +183,Purchase Receipt number required for Item {0},Numéro du bon de réception requis pour objet {0}
 DocType: Item Attribute Value,Item Attribute Value,Point Attribut Valeur
 apps/erpnext/erpnext/config/crm.py +64,Sales campaigns.,Campagnes de vente .
 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.
@@ -714,10 +686,9 @@
 DocType: Address,Personal,Personnel
 DocType: Expense Claim Detail,Expense Claim Type,Type de demande d&#39;indemnité
 DocType: Shopping Cart Settings,Default settings for Shopping Cart,Les paramètres par défaut pour Panier
-apps/erpnext/erpnext/controllers/accounts_controller.py +324,"Journal Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Journal entrée {0} est lié contre l'ordonnance {1}, vérifier si elle doit être tiré comme l'avance dans la présente facture."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +13,Biotechnology,biotechnologie
+apps/erpnext/erpnext/controllers/accounts_controller.py +325,"Journal Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Journal entrée {0} est lié contre l'ordonnance {1}, vérifier si elle doit être tiré comme l'avance dans la présente facture."
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +13,Biotechnology,biotechnologie
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Office Maintenance Expenses,Date d'adhésion doit être supérieure à Date de naissance
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +53,Hemming,Hemming
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +66,Please enter Item first,S'il vous plaît entrer article premier
 DocType: Account,Liability,responsabilité
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +62,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Montant sanctionné ne peut pas être supérieure à la revendication Montant en ligne {0}.
@@ -730,10 +701,10 @@
 DocType: Company,Default Bank Account,Compte bancaire
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +47,"To filter based on Party, select Party Type first","Pour filtrer sur la base du Parti, sélectionnez Parti premier type"
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},'Mettre à jour Stock' ne peut pas être vérifié parce que les articles ne sont pas livrés par {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Nos,Transaction non autorisée contre arrêté l'ordre de fabrication {0}
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Nos,Transaction non autorisée contre arrêté l'ordre de fabrication {0}
 DocType: Item,Items with higher weightage will be shown higher,Articles avec weightage supérieur seront affichés supérieur
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Détail du rapprochement bancaire
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +627,My Invoices,Mes factures
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +629,My Invoices,Mes factures
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,Aucun employé trouvé
 DocType: Purchase Order,Stopped,Arrêté
 DocType: Item,If subcontracted to a vendor,Si en sous-traitance à un fournisseur
@@ -752,35 +723,33 @@
 DocType: Features Setup,"To enable ""Point of Sale"" features",Pour activer &quot;Point de vente&quot; caractéristiques
 DocType: Bin,Moving Average Rate,Moving Prix moyen
 DocType: Production Planning Tool,Select Items,Sélectionner les objets
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,{0} against Bill {1} dated {2},{0} contre le projet de loi en date du {1} {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +328,{0} against Bill {1} dated {2},{0} contre le projet de loi en date du {1} {2}
 DocType: Comment,Reference Name,Nom de référence
 DocType: Maintenance Visit,Completion Status,L&#39;état d&#39;achèvement
 DocType: Sales Invoice Item,Target Warehouse,Cible d&#39;entrepôt
 DocType: Item,Allow over delivery or receipt upto this percent,autoriser plus de livraison ou de réception jusqu'à ce pour cent
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +49,Expected Delivery Date cannot be before Sales Order Date,"Stock réconciliation peut être utilisé pour mettre à jour le stock à une date donnée , généralement selon l'inventaire physique ."
 DocType: Upload Attendance,Import Attendance,Importer Participation
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +17,All Item Groups,Tous les groupes d'article
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +17,All Item Groups,Tous les groupes d'article
 DocType: Process Payroll,Activity Log,Journal d&#39;activité
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +30,Net Profit / Loss,Bénéfice net / perte nette
 apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,Composer automatiquement un message sur la soumission de transactions .
 DocType: Production Order,Item To Manufacture,Point à la fabrication de
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +16,Permanent mold casting,Coulée en moule permanent
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} statut est {2}
 apps/erpnext/erpnext/config/learn.py +172,Purchase Order to Payment,Achetez commande au paiement
 DocType: Sales Order Item,Projected Qty,Qté projeté
 DocType: Sales Invoice,Payment Due Date,Date d'échéance
 DocType: Newsletter,Newsletter Manager,Bulletin Gestionnaire
-apps/erpnext/erpnext/stock/doctype/item/item.js +229,Item Variant {0} already exists with same attributes,Point Variant {0} existe déjà avec les mêmes caractéristiques
+apps/erpnext/erpnext/stock/doctype/item/item.js +231,Item Variant {0} already exists with same attributes,Point Variant {0} existe déjà avec les mêmes caractéristiques
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening',&#39;Ouverture&#39;
 DocType: Notification Control,Delivery Note Message,Note Message de livraison
 DocType: Expense Claim,Expenses,Note: Ce centre de coûts est un groupe . Vous ne pouvez pas faire les écritures comptables contre des groupes .
 DocType: Item Variant Attribute,Item Variant Attribute,Point Variant Attribut
 ,Purchase Receipt Trends,Achat Tendances reçus
 DocType: Appraisal,Select template from which you want to get the Goals,Sélectionnez le modèle à partir duquel vous souhaitez obtenir des Objectifs
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +77,Research & Development,Recherche & Développement
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Research & Development,Recherche & Développement
 ,Amount to Bill,Montant à facturer
 DocType: Company,Registration Details,Détails de l&#39;enregistrement
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +75,Staking,Jalonnement
 DocType: Item,Re-Order Qty,Re-commande Quantité
 DocType: Leave Block List Date,Leave Block List Date,Laisser Date de Block List
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +25,Scheduled to send to {0},Prévu pour envoyer à {0}
@@ -791,18 +760,16 @@
 DocType: Sales Invoice Item,Stock Details,Stock Détails
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Valeur du projet
 apps/erpnext/erpnext/config/selling.py +304,Point-of-Sale,Point de vente
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,Cannot carry forward {0},Point {0} doit être un achat article
 apps/erpnext/erpnext/accounts/doctype/account/account.py +91,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","Le solde du compte est déjà en crédit, vous n'êtes pas autorisé à mettre en 'Doit être en équilibre' comme 'débit'"
 DocType: Account,Balance must be,Solde doit être
 DocType: Hub Settings,Publish Pricing,Publier Prix
 DocType: Notification Control,Expense Claim Rejected Message,Demande d&#39;indemnité rejeté le message
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +145,Nailing,Cloutage
 ,Available Qty,Quantité disponible 
 DocType: Purchase Taxes and Charges,On Previous Row Total,Le total de la rangée précédente
 DocType: Salary Slip,Working Days,Jours ouvrables
 DocType: Serial No,Incoming Rate,Taux d&#39;entrée
 DocType: Packing Slip,Gross Weight,Poids brut
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +410,The name of your company for which you are setting up this system.,Le nom de votre entreprise pour laquelle vous configurez ce système .
+apps/erpnext/erpnext/public/js/setup_wizard.js +158,The name of your company for which you are setting up this system.,Le nom de votre entreprise pour laquelle vous configurez ce système .
 DocType: HR Settings,Include holidays in Total no. of Working Days,Inclure les vacances en aucun totale. de jours de travail
 DocType: Job Applicant,Hold,Tenir
 DocType: Employee,Date of Joining,Date d&#39;adhésion
@@ -812,7 +779,6 @@
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +3,View Subscribers,Voir abonnés
 DocType: Purchase Invoice Item,Purchase Receipt,Achat Réception
 ,Received Items To Be Billed,Articles reçus à être facturé
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +114,Abrasive blasting,Grenaillage
 DocType: Employee,Ms,Mme
 apps/erpnext/erpnext/config/accounts.py +148,Currency exchange rate master.,Campagne . # # # #
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +253,Unable to find Time Slot in the next {0} days for Operation {1},Impossible de trouver slot Temps dans les prochaines {0} jours pour l&#39;opération {1}
@@ -824,7 +790,7 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +209,Serial No {0} does not belong to Item {1},compensatoire
 DocType: Purchase Receipt Item Supplied,Required Qty,Quantité requise
 DocType: Bank Reconciliation,Total Amount,Montant total
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +32,Internet Publishing,Publication Internet
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,Publication Internet
 DocType: Production Planning Tool,Production Orders,Ordres de fabrication
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +35,Balance Value,Valeur du solde
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,Liste de prix de vente
@@ -835,7 +801,7 @@
 DocType: Supplier,Default Payable Accounts,Comptes créditeurs par défaut
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,"Employé {0} n'est pas actif , ou n'existe pas"
 DocType: Features Setup,Item Barcode,Barcode article
-apps/erpnext/erpnext/stock/doctype/item/item.py +487,Item Variants {0} updated,Point variantes {0} mis à jour
+apps/erpnext/erpnext/stock/doctype/item/item.py +491,Item Variants {0} updated,Point variantes {0} mis à jour
 DocType: Quality Inspection Reading,Reading 6,Lecture 6
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Paiement à l&#39;avance Facture
 DocType: Address,Shop,Magasiner
@@ -844,7 +810,7 @@
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,Par défaut Banque / argent compte sera automatiquement mis à jour dans la facture POS lorsque ce mode est sélectionné.
 DocType: Employee,Permanent Address Is,Adresse permanente est
 DocType: Production Order Operation,Operation completed for how many finished goods?,Opération terminée pour combien de produits finis?
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +491,The Brand,La Marque
+apps/erpnext/erpnext/public/js/setup_wizard.js +237,The Brand,La Marque
 apps/erpnext/erpnext/controllers/status_updater.py +163,Allowance for over-{0} crossed for Item {1}.,Allocation pour les plus de {0} franchi pour objet {1}.
 DocType: Employee,Exit Interview Details,Quittez Détails Interview
 DocType: Item,Is Purchase Item,Est-Item
@@ -855,7 +821,7 @@
 DocType: Lead,Request for Information,Demande de renseignements
 DocType: Payment Tool,Paid,Payé
 DocType: Salary Slip,Total in words,Total en mots
-DocType: Material Request Item,Lead Time Date,Plomb Date Heure
+DocType: Material Request Item,Lead Time Date,Délai Date Heure
 apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +54, is mandatory. Maybe Currency Exchange record is not created for ,est obligatoire. Peut-être fiche de change est pas créé pour
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +111,Row #{0}: Please specify Serial No for Item {1},Ligne # {0}: S'il vous plaît spécifier Pas de série pour objet {1}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +538,"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.","Pour les articles, de stockage, de série et de lot »Aucun produit Bundle &#39;Aucune sera considérée comme de la table&quot; Packing List&#39;. Si Entrepôt et Batch Non sont les mêmes pour tous les éléments d&#39;emballage pour un objet quelconque &#39;Bundle produit&#39;, ces valeurs peuvent être saisies dans le tableau principal de l&#39;article, les valeurs seront copiés sur &quot;Packing List &#39;table."
@@ -864,16 +830,16 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Indirect Income,{0} {1} statut est débouchées
 DocType: Payment Tool,Set Payment Amount = Outstanding Amount,Réglez montant du paiement = Encours
 DocType: Contact Us Settings,Address Line 1,Adresse ligne 1
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Variance,Variance
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +392,Company Name,Nom de l'entreprise
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +53,Variance,Variance
+,Company Name,Nom de l'entreprise
 DocType: SMS Center,Total Message(s),Comptes temporaires ( actif)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +515,Select Item for Transfer,Sélectionner un élément de transfert
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +538,Select Item for Transfer,Sélectionner un élément de transfert
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,Afficher la liste de toutes les vidéos d&#39;aide
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,Sélectionnez tête compte de la banque où chèque a été déposé.
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,Permettre à l&#39;utilisateur d&#39;éditer Prix List Noter dans les transactions
 DocType: Pricing Rule,Max Qty,Qté Max
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +106,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Row {0}: Paiement contre Ventes / bon de commande doit toujours être marqué comme avance
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +16,Chemical,chimique
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,chimique
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +693,All items have already been transferred for this Production Order.,Tous les éléments ont déjà été transférés pour cet ordre de production.
 DocType: Process Payroll,Select Payroll Year and Month,Sélectionnez paie Année et mois
 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""",Aller au groupe approprié (généralement l&#39;utilisation des fonds&gt; Actif à court terme&gt; Comptes bancaires et de créer un nouveau compte (en cliquant sur Ajouter un enfant) de type «Banque»
@@ -884,12 +850,12 @@
 DocType: Item,Inspection Criteria,Critères d&#39;inspection
 apps/erpnext/erpnext/config/accounts.py +101,Tree of finanial Cost Centers.,Il ne faut pas mettre à jour les entrées de plus que {0}
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,Transféré
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +492,Upload your letter head and logo. (you can edit them later).,Téléchargez votre tête et le logo lettre. (Vous pouvez les modifier ultérieurement).
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +156,White,Blanc
+apps/erpnext/erpnext/public/js/setup_wizard.js +238,Upload your letter head and logo. (you can edit them later).,Téléchargez votre tête et le logo lettre. (Vous pouvez les modifier ultérieurement).
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,White,Blanc
 DocType: SMS Center,All Lead (Open),Toutes les pistes (Ouvertes)
 DocType: Purchase Invoice,Get Advances Paid,Obtenez Avances et acomptes versés
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +362,Attach Your Picture,Joindre votre photo
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Make ,Faire
+apps/erpnext/erpnext/public/js/setup_wizard.js +112,Attach Your Picture,Joindre votre photo
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +540,Make ,Faire
 DocType: Journal Entry,Total Amount in Words,Montant total en mots
 DocType: Workflow State,Stop,arrêtez
 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.,Il y avait une erreur . Une raison probable pourrait être que vous n'avez pas enregistré le formulaire. S'il vous plaît contacter support@erpnext.com si le problème persiste .
@@ -898,14 +864,13 @@
 DocType: Lead,Next Contact Date,Date Contact Suivant
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,Quantité d'ouverture
 DocType: Holiday List,Holiday List Name,Nom de la liste de vacances
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +168,Stock Options,Options sur actions
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +168,Stock Options,Options sur actions
 DocType: Journal Entry Account,Expense Claim,Demande d&#39;indemnité de
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +181,Qty for {0},Quantité pour {0}
 DocType: Leave Application,Leave Application,Demande de congés
-apps/erpnext/erpnext/config/hr.py +77,Leave Allocation Tool,Laisser outil de répartition
+apps/erpnext/erpnext/config/hr.py +77,Leave Allocation Tool,Absence outil de répartition
 DocType: Leave Block List,Leave Block List Dates,Laisser Dates de listes rouges d&#39;
 DocType: Company,If Monthly Budget Exceeded (for expense account),Si le budget mensuel dépassé (pour compte de dépenses)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +56,Trimming,Garniture
 DocType: Workstation,Net Hour Rate,Taux net de Hour
 DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,Landed Cost reçu d&#39;achat
 DocType: Company,Default Terms,Conditions défaut
@@ -913,10 +878,9 @@
 DocType: POS Profile,Cash/Bank Account,Trésorerie / Compte bancaire
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,Removed items with no change in quantity or value.,Les articles retirés avec aucun changement dans la quantité ou la valeur.
 DocType: Delivery Note,Delivery To,Livrer à
-apps/erpnext/erpnext/stock/doctype/item/item.py +509,Attribute table is mandatory,Table attribut est obligatoire
+apps/erpnext/erpnext/stock/doctype/item/item.py +513,Attribute table is mandatory,Table attribut est obligatoire
 DocType: Production Planning Tool,Get Sales Orders,Obtenez des commandes clients
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} ne peut pas être négatif
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +103,Filing,Dépôt
 apps/erpnext/erpnext/templates/form_grid/item_grid.html +72,Discount,Rabais
 DocType: Features Setup,Purchase Discounts,Rabais sur l&#39;achat
 DocType: Workstation,Wages,Salaires
@@ -933,6 +897,7 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +112,You are the Expense Approver for this record. Please Update the 'Status' and Save,Vous êtes l'approbateur de dépenses pour cet enregistrement . S'il vous plaît mettre à jour le «Status» et Save
 DocType: Serial No,Creation Document No,Création document n
 DocType: Issue,Issue,Question
+apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account does not match with Company,Compte ne correspond pas avec la Compagnie
 apps/erpnext/erpnext/config/stock.py +136,"Attributes for Item Variants. e.g Size, Color etc.","Attributs pour objet variantes. par exemple la taille, la couleur, etc."
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +39,WIP Warehouse,WIP Entrepôt
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +194,Serial No {0} is under maintenance contract upto {1},Budget ne peut être réglé pour les centres de coûts du Groupe
@@ -941,7 +906,7 @@
 DocType: Tax Rule,Shipping State,Etat de livraison
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,L'article doit être ajouté à l'aide 'obtenir des éléments de reçus d'achat de la touche
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,Fournisseur numéro de livraison en double dans {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Buying,achat standard
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +120,Standard Buying,achat standard
 DocType: GL Entry,Against,Contre
 DocType: Item,Default Selling Cost Center,Coût des marchandises vendues
 DocType: Sales Partner,Implementation Partner,Partenaire de mise en œuvre
@@ -962,29 +927,29 @@
 DocType: Time Log Batch,updated via Time Logs,mise à jour via Time Logs
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,âge moyen
 DocType: Opportunity,Your sales person who will contact the customer in future,Votre personne de ventes prendra contact avec le client dans le futur
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +588,List a few of your suppliers. They could be organizations or individuals.,Énumérer quelques-unes de vos fournisseurs . Ils pourraient être des organisations ou des individus .
+apps/erpnext/erpnext/public/js/setup_wizard.js +326,List a few of your suppliers. They could be organizations or individuals.,Énumérer quelques-unes de vos fournisseurs . Ils pourraient être des organisations ou des individus .
 DocType: Company,Default Currency,Devise par défaut
 DocType: Contact,Enter designation of this Contact,Entrez la désignation de ce contact
 DocType: Contact Us Settings,Address,Adresse
 DocType: Expense Claim,From Employee,De employés
-apps/erpnext/erpnext/controllers/accounts_controller.py +338,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Attention : Le système ne vérifie pas la surfacturation depuis montant pour objet {0} dans {1} est nulle
+apps/erpnext/erpnext/controllers/accounts_controller.py +339,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Attention : Le système ne vérifie pas la surfacturation depuis montant pour objet {0} dans {1} est nulle
 DocType: Journal Entry,Make Difference Entry,Assurez Entrée Différence
 DocType: Upload Attendance,Attendance From Date,Participation De Date
 DocType: Appraisal Template Goal,Key Performance Area,Section de performance clé
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +54,Transportation,transport
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +54,Transportation,transport
 apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +67, and year: ,et l&#39;année:
 DocType: Email Digest,Annual Expense,Dépense annuelle
 DocType: SMS Center,Total Characters,Nombre de caractères
-apps/erpnext/erpnext/controllers/buying_controller.py +139,Please select BOM in BOM field for Item {0},Se il vous plaît sélectionner dans le champ BOM BOM pour objet {0}
+apps/erpnext/erpnext/controllers/buying_controller.py +130,Please select BOM in BOM field for Item {0},Se il vous plaît sélectionner dans le champ BOM BOM pour objet {0}
 DocType: C-Form Invoice Detail,C-Form Invoice Detail,C-Form Détail Facture
 DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,Rapprochement des paiements de facture
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +32,Contribution %,Contribution%
 DocType: Item,website page link,Lien vers page web
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +192,Let's prepare the system for first use.,Préparons le système pour la première utilisation.
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +242,Let's prepare the system for first use.,Préparons le système pour la première utilisation.
 DocType: Company,Company registration numbers for your reference. Tax numbers etc.,"Numéros d'immatriculation de l’entreprise pour votre référence. Numéros de taxes, etc"
 DocType: Sales Partner,Distributor,Distributeur
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Panier Livraison règle
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +214,Production Order {0} must be cancelled before cancelling this Sales Order,Tous les groupes de clients
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +209,Production Order {0} must be cancelled before cancelling this Sales Order,Tous les groupes de clients
 ,Ordered Items To Be Billed,Articles commandés à facturer
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +24,From Range has to be less than To Range,De Gamme doit être inférieure à la gamme
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +21,Select Time Logs and Submit to create a new Sales Invoice.,Sélectionnez registres de temps et de soumettre à créer une nouvelle facture de vente.
@@ -1004,14 +969,13 @@
 DocType: Sales Invoice Advance,Sales Invoice Advance,Advance facture de vente
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +398,Nothing to request,Pas de requête à demander
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date',« Date de Début réel » ne peut être supérieur à ' Date réelle de fin »
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +75,Management,gestion
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +75,Management,gestion
 apps/erpnext/erpnext/config/projects.py +33,Types of activities for Time Sheets,Types d&#39;activités pour les feuilles de temps
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +14,Investment casting,Coulée de
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +51,Either debit or credit amount is required for {0},Soit de débit ou de montant de crédit est nécessaire pour {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""","Ce sera ajoutée au Code de la variante de l'article. Par exemple, si votre abréviation est «SM», et le code de l'article est ""T-SHIRT"", le code de l'article de la variante sera ""T-SHIRT-SM"""
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,Salaire net (en lettres) sera visible une fois que vous enregistrez le bulletin de salaire.
 apps/frappe/frappe/core/doctype/user/user_list.js +12,Active,Actif
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +154,Blue,Bleu
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +154,Blue,Bleu
 DocType: Purchase Invoice,Is Return,Est de retour
 DocType: Price List Country,Price List Country,Liste des Prix Pays
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +123,Further nodes can be only created under 'Group' type nodes,D'autres nœuds peuvent être créées que sous les nœuds de type 'Groupe'
@@ -1021,18 +985,16 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +22,POS Profile {0} already created for user: {1} and company {2},POS profil {0} déjà créé pour l&#39;utilisateur: {1} et {2} société
 DocType: Purchase Order Item,UOM Conversion Factor,Facteur de conversion Emballage
 DocType: Stock Settings,Default Item Group,Groupe d&#39;éléments par défaut
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +156,Laminated object manufacturing,La fabrication de l&#39;objet stratifié
 apps/erpnext/erpnext/config/buying.py +13,Supplier database.,Base de données fournisseurs.
 DocType: Account,Balance Sheet,Bilan
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +561,Cost Center For Item with Item Code ',Centre de coûts pour l'objet avec le code d'objet '
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +45,Stretch forming,Étirage
 DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,Votre personne de ventes recevera un rappel cette date pour contacter le client
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +210,"Further accounts can be made under Groups, but entries can be made against non-Groups","D&#39;autres comptes peuvent être faites dans les groupes, mais les entrées peuvent être faites contre les non-Groupes"
 apps/erpnext/erpnext/config/hr.py +125,Tax and other salary deductions.,De l&#39;impôt et autres déductions salariales.
-DocType: Lead,Lead,Conduire
+DocType: Lead,Lead,Prospect
 DocType: Email Digest,Payables,Dettes
 DocType: Account,Warehouse,entrepôt
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +90,Row #{0}: Rejected Qty can not be entered in Purchase Return,Row # {0}: Rejeté Quantité ne peut pas être entré en Achat retour
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +93,Row #{0}: Rejected Qty can not be entered in Purchase Return,Row # {0}: Rejeté Quantité ne peut pas être entré en Achat retour
 ,Purchase Order Items To Be Billed,Purchase Order articles qui lui seront facturées
 DocType: Purchase Invoice Item,Net Rate,Taux net
 DocType: Purchase Invoice Item,Purchase Invoice Item,Achat d&#39;article de facture
@@ -1047,13 +1009,13 @@
 DocType: Global Defaults,Current Fiscal Year,Exercice en cours
 DocType: Global Defaults,Disable Rounded Total,Désactiver totale arrondie
 DocType: Lead,Call,Appeler
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +384,'Entries' cannot be empty,'Les entrées' ne peuvent pas être vide
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +386,'Entries' cannot be empty,'Les entrées' ne peuvent pas être vide
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},Pièces de journal {0} sont non liée
 ,Trial Balance,Balance
 apps/erpnext/erpnext/config/hr.py +205,Setting up Employees,Mise en place d&#39;employés
 apps/erpnext/erpnext/public/js/feature_setup.js +220,"Grid ""","grille """
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +150,Please select prefix first,nourriture
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +138,Research,recherche
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +138,Research,recherche
 DocType: Maintenance Visit Purpose,Work Done,Travaux effectués
 apps/erpnext/erpnext/controllers/item_variant.py +25,Please specify at least one attribute in the Attributes table,S&#39;il vous plaît spécifier au moins un attribut dans le tableau Attributs
 DocType: Contact,User ID,ID utilisateur
@@ -1061,10 +1023,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +57,View Ledger,Voir Ledger
 DocType: File,Lft,LFT
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,plus tôt
-apps/erpnext/erpnext/stock/doctype/item/item.py +394,"An Item Group exists with same name, please change the item name or rename the item group","Un groupe d'article existe avec le même nom, changez le nom de l'article ou renommez le groupe d'article SVP"
+apps/erpnext/erpnext/stock/doctype/item/item.py +398,"An Item Group exists with same name, please change the item name or rename the item group","Un groupe d'article existe avec le même nom, changez le nom de l'article ou renommez le groupe d'article SVP"
 DocType: Communication,Delivery Status,Statut de la livraison
 DocType: Production Order,Manufacture against Sales Order,Fabrication à l&#39;encontre des commandes clients
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +517,Rest Of The World,revenu indirect
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +455,Rest Of The World,revenu indirect
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,Le Point {0} ne peut pas avoir lot
 ,Budget Variance Report,Rapport sur les écarts du budget
 DocType: Salary Slip,Gross Pay,Salaire brut
@@ -1075,13 +1037,11 @@
 DocType: BOM Item,Item Description,Description de l&#39;objet
 DocType: Payment Tool,Payment Mode,mode de paiement
 DocType: Purchase Invoice,Is Recurring,Est récurrent
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +154,Direct metal laser sintering,Frittage laser direct de métal
 DocType: Purchase Order,Supplied Items,Articles fournis
 DocType: Production Order,Qty To Manufacture,Quantité à fabriquer
 DocType: Buying Settings,Maintain same rate throughout purchase cycle,Maintenir le taux de même tout au long du cycle d&#39;achat
 DocType: Opportunity Item,Opportunity Item,Article occasion
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +61,Temporary Opening,Ouverture temporaire
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +41,Cryorolling,Cryorolling
 ,Employee Leave Balance,Congé employé Solde
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +128,Balance for Account {0} must always be {1},Solde pour le compte {0} doit toujours être {1}
 DocType: Address,Address Type,Type d&#39;adresse
@@ -1097,23 +1057,23 @@
 DocType: Journal Entry,Get Outstanding Invoices,Obtenez Factures en souffrance
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,Company ( pas client ou fournisseur ) maître .
 apps/erpnext/erpnext/setup/doctype/company/company.py +172,"Sorry, companies cannot be merged","Désolé , les entreprises ne peuvent pas être fusionnés"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +145,Small,Petit
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Small,Petit
 DocType: Employee,Employee Number,Numéro d&#39;employé
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},Entrées avant {0} sont gelés
 ,Invoiced Amount (Exculsive Tax),Montant facturé ( impôt Exculsive )
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,Point 2
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +59,Account head {0} created,Responsable du compte {0} a été crée
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +153,Green,Vert
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Green,Vert
 DocType: Item,Auto re-order,Auto re-commande
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +57,Total Achieved,Total obtenu
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +59,Total Achieved,Total obtenu
 DocType: Employee,Place of Issue,Lieu d&#39;émission
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +59,Contract,contrat
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Contract,contrat
 DocType: Report,Disabled,Desactivé
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +490,UOM coversion factor required for UOM: {0} in Item: {1},Facteur de coversion Emballage requis pour Emballage: {0} dans l'article: {1}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +83,Indirect Expenses,N ° de série {0} créé
 apps/erpnext/erpnext/controllers/selling_controller.py +163,Row {0}: Qty is mandatory,Ligne {0}: Quantité est obligatoire
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +8,Agriculture,agriculture
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +611,Your Products or Services,Vos produits ou services
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,agriculture
+apps/erpnext/erpnext/public/js/setup_wizard.js +347,Your Products or Services,Vos produits ou services
 DocType: Mode of Payment,Mode of Payment,Mode de paiement
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,Ceci est un groupe d'élément de racine et ne peut être modifié .
 DocType: Journal Entry Account,Purchase Order,Bon de commande
@@ -1125,7 +1085,7 @@
 DocType: Serial No,Serial No Details,Détails Pas de série
 DocType: Purchase Invoice Item,Item Tax Rate,Taux de la Taxe sur l'Article
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +113,"For {0}, only credit accounts can be linked against another debit entry","Pour {0}, seuls les comptes de crédit peuvent être liés avec une autre entrée de débit"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Delivery Note {0} is not submitted,Livraison Remarque {0} n'est pas soumis
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +470,Delivery Note {0} is not submitted,Livraison Remarque {0} n'est pas soumis
 apps/erpnext/erpnext/stock/get_item_details.py +136,Item {0} must be a Sub-contracted Item,Exercice Date de début
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,Equipements de capitaux
 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.","Prix règle est d'abord sélectionné sur la base de «postuler en« champ, qui peut être l'article, groupe d'articles ou de marque."
@@ -1135,7 +1095,7 @@
 DocType: Appraisal Goal,Goal,Objectif
 DocType: Sales Invoice Item,Edit Description,Modifier la description
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +318,Expected Delivery Date is lesser than Planned Start Date.,Date de livraison prévue est moindre que prévue Date de début.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +579,For Supplier,pour fournisseur
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +602,For Supplier,pour fournisseur
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,Type de compte Configuration aide à sélectionner ce compte dans les transactions.
 DocType: Purchase Invoice,Grand Total (Company Currency),Total (Société Monnaie)
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,Sortant total
@@ -1161,10 +1121,10 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +74,"Total {0} for all items is zero, may you should change 'Distribute Charges Based On'","Total {0} pour tous les articles est zéro, vous devriez peut-être changer &quot;Distribuer accusations fondées sur &#39;"
 DocType: Purchase Invoice,Taxes and Charges Calculation,Taxes et frais de calcul
 DocType: BOM Operation,Workstation,station de travail
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +112,Hardware,Sales Person cible Variance article Groupe Sage
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +112,Hardware,Sales Person cible Variance article Groupe Sage
 DocType: Attendance,HR Manager,Responsable des Ressources Humaines
 apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,S&#39;il vous plaît sélectionner une entreprise
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +50,Privilege Leave,Point {0} doit être fonction Point
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +50,Privilege Leave,Point {0} doit être fonction Point
 DocType: Purchase Invoice,Supplier Invoice Date,Date de la facture fournisseur
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +79,You need to enable Shopping Cart,Vous devez activer Panier
 apps/frappe/frappe/public/js/frappe/form/grid_body.html +6,No Data,Aucune donnée
@@ -1177,7 +1137,7 @@
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +81,Overlapping conditions found between:,condition qui se coincide touvée
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +168,Against Journal Entry {0} is already adjusted against some other voucher,Sur le Journal des entrées {0} est déjà ajusté par un autre bon
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +68,Total Order Value,Ordre Valeur totale
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +38,Food,Alimentation
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +38,Food,Alimentation
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Gamme de vieillissement 3
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +139,You can make a time log only against a submitted production order,Vous pouvez faire un journal de temps que contre une ordonnance de production soumis
 DocType: Maintenance Schedule Item,No of Visits,Pas de visites
@@ -1197,6 +1157,7 @@
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,View Offer Letter,Voir offre Lettre
 DocType: Communication,Communication,Communication
 DocType: Item,Is Service Item,Est-Point de service
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +81,Application period cannot be outside leave allocation period,Période d&#39;application ne peut pas être la période d&#39;allocation de congé à l&#39;extérieur
 DocType: Activity Cost,Projects,Projets
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +31,Please select Fiscal Year,S'il vous plaît sélectionner l'Exercice
 apps/erpnext/erpnext/controllers/buying_controller.py +23,From {0} | {1} {2},Du {0} | {1} {2}
@@ -1215,7 +1176,7 @@
 DocType: Item,Maintain Stock,Maintenir Stock
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +213,Stock Entries already created for Production Order ,Stock entrées déjà créés pour ordre de fabrication
 DocType: Leave Control Panel,Leave blank if considered for all designations,Laisser vide si cela est jugé pour toutes les désignations
-apps/erpnext/erpnext/controllers/accounts_controller.py +499,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Charge de type ' réel ' à la ligne {0} ne peut pas être inclus dans l'article Noter
+apps/erpnext/erpnext/controllers/accounts_controller.py +500,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Charge de type ' réel ' à la ligne {0} ne peut pas être inclus dans l'article Noter
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,Max: {0},Max: {0}
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +16,From Datetime,De Datetime
 DocType: Email Digest,For Company,Pour l&#39;entreprise
@@ -1225,7 +1186,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +50,Chart of Accounts,Plan comptable
 DocType: Material Request,Terms and Conditions Content,Termes et Conditions de contenu
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +471,cannot be greater than 100,ne peut pas être supérieure à 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +546,Item {0} is not a stock Item,Point {0} n'est pas un stock Article
+apps/erpnext/erpnext/stock/doctype/item/item.py +550,Item {0} is not a stock Item,Point {0} n'est pas un stock Article
 DocType: Maintenance Visit,Unscheduled,Non programmé
 DocType: Employee,Owned,Détenue
 DocType: Salary Slip Deduction,Depends on Leave Without Pay,Dépend de congé non payé
@@ -1239,31 +1200,29 @@
 DocType: HR Settings,Employee Settings,Réglages des employés
 ,Batch-Wise Balance History,Discontinu Histoire de la balance
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +72,To Do List,Liste de tâches à faire
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +63,Apprentice,Apprenti
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Apprentice,Apprenti
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +99,Negative Quantity is not allowed,Quantité négatif n'est pas autorisé
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
 Used for Taxes and Charges","Impôt table récupérées par le maître de l'article comme une chaîne et stockée dans ce domaine en détail.
  Utilisé pour les impôts et frais"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +61,Lancing,Lancing
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +151,Employee cannot report to himself.,Employé ne peut pas rendre compte à lui-même.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Si le compte est gelé , les entrées sont autorisés pour les utilisateurs restreints ."
 DocType: Email Digest,Bank Balance,Solde bancaire
-apps/erpnext/erpnext/controllers/accounts_controller.py +435,Accounting Entry for {0}: {1} can only be made in currency: {2},Entrée comptabilité pour {0}: {1} ne peut être faite en monnaie: {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +436,Accounting Entry for {0}: {1} can only be made in currency: {2},Entrée comptabilité pour {0}: {1} ne peut être faite en monnaie: {2}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +38,No active Salary Structure found for employee {0} and the month,Aucune structure salariale actif trouvé pour l&#39;employé {0} et le mois
 DocType: Job Opening,"Job profile, qualifications required etc.",Non authroized depuis {0} dépasse les limites
 DocType: Journal Entry Account,Account Balance,Solde du compte
 apps/erpnext/erpnext/config/accounts.py +112,Tax Rule for transactions.,Règle d&#39;impôt pour les transactions.
 DocType: Rename Tool,Type of document to rename.,Type de document à renommer.
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +630,We buy this Item,Nous achetons cet article
+apps/erpnext/erpnext/public/js/setup_wizard.js +366,We buy this Item,Nous achetons cet article
 DocType: Address,Billing,Facturation
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +77,Flanging,Flanger
 DocType: Bulk Email,Not Sent,Non Envoyés
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +73,Explosive forming,Formage par explosion
 DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),Total des taxes et charges (Société Monnaie)
 DocType: Shipping Rule,Shipping Account,Compte de livraison
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +43,Scheduled to send to {0} recipients,Prévu pour envoyer à {0} bénéficiaires
 DocType: Quality Inspection,Readings,Lectures
 DocType: Stock Entry,Total Additional Costs,Total des coûts supplémentaires
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Sub Assemblies,sous assemblées
+apps/erpnext/erpnext/public/js/setup_wizard.js +359,Sub Assemblies,sous assemblées
 DocType: Shipping Rule Condition,To Value,To Value
 DocType: Supplier,Stock Manager,Stock Manager
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +143,Source warehouse is mandatory for row {0},Entrepôt de Source est obligatoire pour la ligne {0}
@@ -1273,44 +1232,42 @@
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Importation a échoué!
 apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,Aucune adresse encore ajouté.
 DocType: Workstation Working Hour,Workstation Working Hour,Workstation heures de travail
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +83,Analyst,analyste
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +202,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Row {0}: Montant alloué {1} doit être inférieur ou égal au montant JV {2}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Analyst,analyste
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +149,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Row {0}: Montant alloué {1} doit être inférieur ou égal au montant JV {2}
 DocType: Item,Inventory,Inventaire
 DocType: Features Setup,"To enable ""Point of Sale"" view",Pour activer &quot;Point de vente&quot; vue
 apps/erpnext/erpnext/public/js/pos/pos.js +402,Payment cannot be made for empty cart,Le paiement ne peut être fait pour le chariot vide
 DocType: Item,Sales Details,Détails ventes
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +149,Pinning,Épinglant
 DocType: Opportunity,With Items,Avec Articles
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,Qté
 DocType: Notification Control,Expense Claim Rejected,Demande d&#39;indemnité rejetée
 DocType: Sales Invoice,"The date on which next invoice will be generated. It is generated on submit.
 ",La date à laquelle prochaine facture sera générée. Il est généré sur soumettre.
 DocType: Item Attribute,Item Attribute,Point Attribute
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +105,Government,Si différente de l'adresse du client
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Government,Si différente de l'adresse du client
 apps/erpnext/erpnext/config/stock.py +268,Item Variants,Des variantes de l&#39;article
 DocType: Company,Services,Services
 apps/erpnext/erpnext/accounts/report/financial_statements.py +147,Total ({0}),Total ({0})
 DocType: Cost Center,Parent Cost Center,Centre de coûts Parent
 DocType: Sales Invoice,Source,Source
 DocType: Leave Type,Is Leave Without Pay,Est un congé non payé
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +186,No records found in the Payment table,Aucun documents trouvés dans le tableau de paiement
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +405,Financial Year Start Date,Date de Début de l'exercice financier
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +133,No records found in the Payment table,Aucun documents trouvés dans le tableau de paiement
+apps/erpnext/erpnext/public/js/setup_wizard.js +153,Financial Year Start Date,Date de Début de l'exercice financier
 DocType: Employee External Work History,Total Experience,Total Experience
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +100,Countersinking,Chanfrainage
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +271,Packing Slip(s) cancelled,Point {0} doit être un élément de sous- traitance
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +276,Packing Slip(s) cancelled,Point {0} doit être un élément de sous- traitance
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,Fret et d'envoi en sus
 DocType: Material Request Item,Sales Order No,Ordonnance n ° de vente
 DocType: Item Group,Item Group Name,Nom du groupe d&#39;article
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +50,Taken,Pris
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,Pris
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +66,Transfer Materials for Manufacture,Matériaux de transfert pour la fabrication
 DocType: Pricing Rule,For Price List,Annuler matériaux Visites {0} avant l'annulation de cette visite d'entretien
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +27,Executive Search,Executive Search
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,Executive Search
 apps/erpnext/erpnext/stock/stock_ledger.py +405,"Purchase rate for item: {0} not found, which is required to book accounting entry (expense). Please mention item price against a buying price list.","taux d'achat pour l'article: {0} introuvable, qui est nécessaire pour réserver l'entrée comptabilité (charges). Se il vous plaît mentionner le prix de l'article à une liste de prix d'achat."
 DocType: Maintenance Schedule,Schedules,Horaires
 DocType: Purchase Invoice Item,Net Amount,Montant Net
 DocType: Purchase Order Item Supplied,BOM Detail No,Numéro du détail BOM
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),Montant de réduction supplémentaire (devise Société)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +537,Error: {0} > {1},Erreur: {0} > {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +541,Error: {0} > {1},Erreur: {0} > {1}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,S'il vous plaît créer un nouveau compte de plan comptable .
 DocType: Maintenance Visit,Maintenance Visit,Visite de maintenance
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer > Customer Group > Territory,Client> Groupe de clientèle> Territoire
@@ -1321,7 +1278,6 @@
 DocType: Event,Tuesday,Mardi
 DocType: Leave Block List,Block Holidays on important days.,Bloc Vacances sur les jours importants.
 ,Accounts Receivable Summary,Le résumé de comptes débiteurs
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +43,Leaves for type {0} already allocated for Employee {1} for period {2} - {3},Feuilles pour le type {0} déjà alloué pour les employés {1} pour la période {2} - {3}
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +187,Please set User ID field in an Employee record to set Employee Role,Se il vous plaît mettre champ ID de l'utilisateur dans un dossier de l'employé pour définir le rôle des employés
 DocType: UOM,UOM Name,Nom UDM
 DocType: Top Bar Item,Target,Cible
@@ -1333,20 +1289,19 @@
 DocType: ToDo,Due Date,Due Date
 DocType: Sales Invoice Item,Brand Name,La marque
 DocType: Purchase Receipt,Transporter Details,Transporter Détails
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Box,boîte
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +389,The Organization,l'Organisation
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Box,boîte
+apps/erpnext/erpnext/public/js/setup_wizard.js +137,The Organization,l'Organisation
 DocType: Monthly Distribution,Monthly Distribution,Une distribution mensuelle
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,Soit quantité de cible ou le montant cible est obligatoire .
 DocType: Production Plan Sales Order,Production Plan Sales Order,Plan de Production Ventes Ordre
 DocType: Sales Partner,Sales Partner Target,Cible Sales Partner
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},Entrée de comptabilité pour {0} ne peut être effectué en monnaie: {1}
 DocType: Pricing Rule,Pricing Rule,Provision pour plus - livraison / facturation excessive franchi pour objet {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +58,Notching,Encocheuse
 apps/erpnext/erpnext/config/learn.py +167,Material Request to Purchase Order,Demande de Matériel à Bon de commande
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +74,Row # {0}: Returned Item {1} does not exists in {2} {3},Row # {0}: article retourné {1} ne existe pas dans {2} {3}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,Comptes bancaires
 ,Bank Reconciliation Statement,Énoncé de rapprochement bancaire
-DocType: Address,Lead Name,Nom du chef de
+DocType: Address,Lead Name,Nom du prospect
 ,POS,POS
 apps/erpnext/erpnext/config/stock.py +273,Opening Stock Balance,Ouverture Stock Solde
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +36,{0} must appear only once,{0} doit apparaître qu'une seule fois
@@ -1358,20 +1313,19 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Amounts not reflected in bank,Les montants ne figurent pas dans la banque
 DocType: Quality Inspection Reading,Reading 4,Reading 4
 apps/erpnext/erpnext/config/hr.py +23,Claims for company expense.,Les réclamations pour frais de la société.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +8,Centrifugal casting,Coulée centrifuge
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +119,Magnetic field-assisted finishing,Finition assisté de champ magnétique
 DocType: Company,Default Holiday List,Par défaut Liste vacances
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +165,Stock Liabilities,Passif stock
 DocType: Purchase Receipt,Supplier Warehouse,Entrepôt Fournisseur
 DocType: Opportunity,Contact Mobile No,Contact Mobile Aucune
 DocType: Production Planning Tool,Select Sales Orders,Sélectionnez les commandes clients
 ,Material Requests for which Supplier Quotations are not created,Les demandes significatives dont les cotes des fournisseurs ne sont pas créés
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +117,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,Le jour (s) sur lequel vous postulez pour un congé sont des jours fériés. Vous ne devez pas demander l&#39;autorisation.
 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.,Pour suivre les éléments à l&#39;aide de code à barres. Vous serez en mesure d&#39;entrer dans les articles bon de livraison et la facture de vente par balayage de code à barres de l&#39;article.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +477,Mark as Delivered,Marquer comme Livré
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +497,Mark as Delivered,Marquer comme Livré
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +34,Make Quotation,Faire offre
 DocType: Dependent Task,Dependent Task,Tâche dépendante
-apps/erpnext/erpnext/stock/doctype/item/item.py +306,Conversion factor for default Unit of Measure must be 1 in row {0},revenu
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,Leave of type {0} cannot be longer than {1},Les entrées en stocks existent contre entrepôt {0} ne peut pas réaffecter ou modifier Maître Nom '
+apps/erpnext/erpnext/stock/doctype/item/item.py +310,Conversion factor for default Unit of Measure must be 1 in row {0},revenu
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +155,Leave of type {0} cannot be longer than {1},Les entrées en stocks existent contre entrepôt {0} ne peut pas réaffecter ou modifier Maître Nom '
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Essayez opérations de X jours de la planification à l&#39;avance.
 DocType: HR Settings,Stop Birthday Reminders,Arrêter anniversaire rappels
 DocType: SMS Center,Receiver List,Liste des récepteurs
@@ -1379,15 +1333,14 @@
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Quantité consommée
 apps/erpnext/erpnext/public/js/pos/pos.js +491,{0} View,{0} Voir
 DocType: Salary Structure Deduction,Salary Structure Deduction,Déduction structure salariale
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +158,Selective laser sintering,Frittage sélectif par laser
-apps/erpnext/erpnext/stock/doctype/item/item.py +301,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Unité de mesure {0} a été saisi plus d'une fois dans facteur de conversion de table
+apps/erpnext/erpnext/stock/doctype/item/item.py +305,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Unité de mesure {0} a été saisi plus d'une fois dans facteur de conversion de table
 apps/frappe/frappe/core/page/data_import_tool/data_import_tool.js +108,Import Successful!,Importez réussie !
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Coût de documents publiés
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +185,Quantity must not be more than {0},Quantité ne doit pas être plus de {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +41,Age (Days),Âge (jours)
-DocType: Quotation Item,Quotation Item,Article devis
+DocType: Quotation Item,Quotation Item,Article de la soumission
 DocType: Account,Account Name,Nom du compte
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +41,From Date cannot be greater than To Date,Date d'entrée ne peut pas être supérieur à ce jour
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +34,From Date cannot be greater than To Date,Date d'entrée ne peut pas être supérieur à ce jour
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +194,Serial No {0} quantity {1} cannot be a fraction,N ° de série {0} {1} quantité ne peut pas être une fraction
 apps/erpnext/erpnext/config/buying.py +59,Supplier Type master.,Solde de compte {0} doit toujours être {1}
 DocType: Purchase Order Item,Supplier Part Number,Numéro de pièce fournisseur
@@ -1396,14 +1349,14 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +247,{0} {1} is cancelled or stopped,{0} {1} est annulé ou arrêté
 DocType: Accounts Settings,Credit Controller,Credit Controller
 DocType: Delivery Note,Vehicle Dispatch Date,Date de véhicule Dispatch
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +197,Purchase Receipt {0} is not submitted,Reçu d'achat {0} n'est pas soumis
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +198,Purchase Receipt {0} is not submitted,Reçu d'achat {0} n'est pas soumis
 DocType: Company,Default Payable Account,Compte à payer par défaut
 apps/erpnext/erpnext/config/website.py +13,"Settings for online shopping cart such as shipping rules, price list etc.","Réglages pour panier en ligne telles que les règles d'expédition, liste de prix, etc."
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +660,Setup Complete,Configuration terminée
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +124,Setup Complete,Configuration terminée
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +65,{0}% Billed,{0}% Facturé
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +17,Reserved Qty,Quantité réservés
 DocType: Party Account,Party Account,Compte Parti
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +74,Human Resources,Ressources humaines
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +74,Human Resources,Ressources humaines
 DocType: Lead,Upper Income,Revenu élevé
 DocType: Journal Entry Account,Debit in Company Currency,Débit en Entreprise Devise
 apps/erpnext/erpnext/support/doctype/issue/issue.py +58,My Issues,Mes questions
@@ -1412,11 +1365,9 @@
 DocType: Company,Default Values,Les Valeurs Par Défaut
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +236,Row {0}: Payment amount can not be negative,Row {0}: Montant du paiement ne peut être négative
 DocType: Expense Claim,Total Amount Reimbursed,Montant total remboursé
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +152,Press fitting,Emmanchement
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +64,Against Supplier Invoice {0} dated {1},Sur le fournisseur de la facture {0} datée  {1}
 DocType: Customer,Default Price List,Liste des prix défaut
 DocType: Payment Reconciliation,Payments,Paiements
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +24,Hot isostatic pressing,Pressage isostatique à chaud
 DocType: ToDo,Medium,Moyen
 DocType: Budget Detail,Budget Allocated,Budget alloué
 DocType: Journal Entry,Entry Type,Type d&#39;entrée
@@ -1428,10 +1379,7 @@
 DocType: Manufacturing Settings,Capacity Planning For (Days),Planification de la capacité pendant (jours)
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +56,None of the items have any change in quantity or value.,Aucun des éléments ont tout changement dans la quantité ou la valeur.
 DocType: Warranty Claim,Warranty Claim,Demande de garantie
-,Lead Details,Le plomb Détails
-DocType: Authorization Rule,Approving User,Approuver l&#39;utilisateur
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +37,Forging,Forger
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +126,Plating,Placage
+,Lead Details,Détails du prospect
 DocType: Purchase Invoice,End date of current invoice's period,Date de fin de la période de facturation en cours
 DocType: Pricing Rule,Applicable For,Applicable pour
 DocType: Bank Reconciliation,From Date,Partir de la date
@@ -1453,31 +1401,29 @@
 DocType: Sales Invoice,Paid Amount (Company Currency),Montant payé (Société devise)
 DocType: Purchase Invoice,Additional Discount,Remise supplémentaires
 DocType: Selling Settings,Selling Settings,Réglages de vente
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +39,Online Auctions,Enchères en ligne
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,Enchères en ligne
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +94,Please specify either Quantity or Valuation Rate or both,S'il vous plaît spécifier Quantité ou l'évaluation des taux ou à la fois
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +50,"Company, Month and Fiscal Year is mandatory","Société , le mois et l'année fiscale est obligatoire"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Marketing Expenses,Dépenses de marketing
 ,Item Shortage Report,Point Pénurie rapport
-apps/erpnext/erpnext/stock/doctype/item/item.js +183,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Poids est mentionné, \n Se il vous plaît mentionner ""Poids UOM« trop"
+apps/erpnext/erpnext/stock/doctype/item/item.js +185,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Poids est mentionné, \n Se il vous plaît mentionner ""Poids UOM« trop"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,Demande de Matériel utilisé pour réaliser cette Stock Entrée
 apps/erpnext/erpnext/config/support.py +43,Single unit of an Item.,Une seule unité d&#39;un élément.
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +212,Time Log Batch {0} must be 'Submitted',Geler stocks Older Than [ jours]
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,Faites une entrée comptabilité pour chaque mouvement du stock
 DocType: Leave Allocation,Total Leaves Allocated,Feuilles total alloué
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +384,Warehouse required at Row No {0},Entrepôt nécessaire au rang n {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +386,Warehouse required at Row No {0},Entrepôt nécessaire au rang n {0}
 DocType: Employee,Date Of Retirement,Date de la retraite
 DocType: Upload Attendance,Get Template,Obtenez modèle
 DocType: Address,Postal,Postal
 DocType: Item,Weightage,Weightage
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +159,Mining,Exploitation minière
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +17,Resin casting,Résine de coulée
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,BOM récursivité : {0} ne peut pas être le parent ou l'enfant de {2}
 apps/erpnext/erpnext/public/js/pos/pos.js +147,Please select {0} first.,S'il vous plaît sélectionnez {0} en premier.
 apps/erpnext/erpnext/templates/pages/order.html +57,text {0},texte {0}
 DocType: Territory,Parent Territory,Territoire Parent
 DocType: Quality Inspection Reading,Reading 2,Lecture 2
 DocType: Stock Entry,Material Receipt,Réception matériau
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +622,Products,Produits
+apps/erpnext/erpnext/public/js/setup_wizard.js +358,Products,Produits
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +47,Party Type and Party is required for Receivable / Payable account {0},Type de Parti et le Parti est nécessaire pour recevoir / payer compte {0}
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.","Si cet article a variantes, alors il ne peut pas être sélectionné dans les ordres de vente, etc."
 DocType: Lead,Next Contact By,Suivant Par
@@ -1487,13 +1433,13 @@
 DocType: Purchase Invoice,Notification Email Address,Adresse e-mail de notification
 DocType: Payment Tool,Find Invoices to Match,Trouver factures pour correspondre
 ,Item-wise Sales Register,Ventes point-sage S&#39;enregistrer
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +399,"e.g. ""XYZ National Bank""","par exemple ""XYZ Banque Nationale """
+apps/erpnext/erpnext/public/js/setup_wizard.js +147,"e.g. ""XYZ National Bank""","par exemple ""XYZ Banque Nationale """
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,Est-ce Taxes incluses dans le taux de base?
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +57,Total Target,Cible total
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Target,Cible total
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.js +22,Shopping Cart is enabled,Panier est activé
 DocType: Job Applicant,Applicant for a Job,Candidat à un emploi
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +173,No Production Orders created,Section de base
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +131,Salary Slip of employee {0} already created for this month,Entrepôt réservé requis pour l'article courant {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +140,Salary Slip of employee {0} already created for this month,Entrepôt réservé requis pour l'article courant {0}
 DocType: Stock Reconciliation,Reconciliation JSON,Réconciliation JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Trop de colonnes. Exporter le rapport et l'imprimer à l'aide d'un tableur.
 DocType: Sales Invoice Item,Batch No,Numéro du lot
@@ -1503,14 +1449,14 @@
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +13,Variant,Variante
 apps/frappe/frappe/public/js/frappe/form/toolbar.js +165,New {0},Nouvelle {0}
 DocType: Naming Series,Set prefix for numbering series on your transactions,Définir le préfixe de numérotation des séries sur vos transactions
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +169,Stopped order cannot be cancelled. Unstop to cancel.,Compte des parents ne peut pas être un grand livre
-apps/erpnext/erpnext/stock/doctype/item/item.py +323,Default BOM ({0}) must be active for this item or its template,Par défaut BOM ({0}) doit être actif pour ce produit ou de son modèle
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +164,Stopped order cannot be cancelled. Unstop to cancel.,Compte des parents ne peut pas être un grand livre
+apps/erpnext/erpnext/stock/doctype/item/item.py +327,Default BOM ({0}) must be active for this item or its template,Par défaut BOM ({0}) doit être actif pour ce produit ou de son modèle
 DocType: Employee,Leave Encashed?,Laisser encaissés?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Opportunité champ est obligatoire
 DocType: Item,Variants,Variantes
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +458,Make Purchase Order,Faites bon de commande
 DocType: SMS Center,Send To,Send To
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +111,There is not enough leave balance for Leave Type {0},Il n'y a pas assez de solde de congés d'autorisation de type {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +127,There is not enough leave balance for Leave Type {0},Il n'y a pas assez de solde de congés d'autorisation de type {0}
 DocType: Sales Team,Contribution to Net Total,Contribution à Total net
 DocType: Sales Invoice Item,Customer's Item Code,Code article client
 DocType: Stock Reconciliation,Stock Reconciliation,Stock réconciliation
@@ -1547,11 +1493,11 @@
 DocType: Sales Order Item,Actual Qty,Quantité réelle
 DocType: Sales Invoice Item,References,Références
 DocType: Quality Inspection Reading,Reading 10,Lecture 10
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +612,"List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start.",Référencez vos produits ou services que vous achetez ou vendez.
+apps/erpnext/erpnext/public/js/setup_wizard.js +348,"List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start.",Référencez vos produits ou services que vous achetez ou vendez.
 DocType: Hub Settings,Hub Node,Node Hub
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,Vous avez entré les doublons . S'il vous plaît corriger et essayer à nouveau.
 apps/erpnext/erpnext/controllers/item_variant.py +65,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values,Valeur {0} pour l&#39;attribut {1} ne existe pas dans la liste des valeurs d&#39;attribut valide article
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +87,Associate,associé
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Associate,associé
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +46,Item {0} is not a serialized Item,"Société Email ID introuvable , donc postez pas envoyé"
 DocType: SMS Center,Create Receiver List,Créer une liste Receiver
 apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +5,Expired,Expiré
@@ -1560,7 +1506,7 @@
 DocType: Warranty Claim,Issue Date,Date d&#39;émission
 DocType: Activity Cost,Activity Cost,Le coût de l'activité
 DocType: Purchase Receipt Item Supplied,Consumed Qty,Quantité consommée
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +52,Telecommunications,télécommunications
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +52,Telecommunications,télécommunications
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),Indique que le package est une partie de cette livraison (Seuls les projets)
 DocType: Payment Tool,Make Payment Entry,Effectuer un paiement d'entrée
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +119,Quantity for Item {0} must be less than {1},Quantité de l'article {0} doit être inférieur à {1}
@@ -1577,10 +1523,8 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +37,"Selling must be checked, if Applicable For is selected as {0}","Vente doit être vérifiée, si pour Applicable est sélectionné comme {0}"
 DocType: Purchase Order Item,Supplier Quotation Item,Article Devis Fournisseur
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +27,Make Salary Structure,Faire structure salariale
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +54,Shearing,Tonte
 DocType: Item,Has Variants,A Variantes
 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.,Cliquez sur le bouton pour créer une nouvelle facture de vente «Facture de vente Make &#39;.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +166,Packaging and labeling,Emballage et l&#39;étiquetage
 DocType: Monthly Distribution,Name of the Monthly Distribution,Nom de la distribution mensuelle
 DocType: Sales Person,Parent Sales Person,Parent Sales Person
 apps/erpnext/erpnext/setup/utils.py +14,Please specify Default Currency in Company Master and Global Defaults,N ° de série {0} n'existe pas
@@ -1591,19 +1535,18 @@
 DocType: Budget Detail,Fiscal Year,Exercice
 DocType: Cost Center,Budget,Budget
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +41,"Budget cannot be assigned against {0}, as it's not an Income or Expense account","Budget ne peut pas être affecté contre {0}, car il est pas un compte de revenus ou de dépenses"
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Achieved,Atteint
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,Atteint
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +65,Territory / Customer,Territoire / client
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,e.g. 5,par exemple 5
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +207,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},Row {0}: Montant alloué {1} doit être inférieur ou égal au montant de la facture exceptionnelle {2}
+apps/erpnext/erpnext/public/js/setup_wizard.js +294,e.g. 5,par exemple 5
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},Row {0}: Montant alloué {1} doit être inférieur ou égal au montant de la facture exceptionnelle {2}
 DocType: Sales Invoice,In Words will be visible once you save the Sales Invoice.,Dans les mots seront visibles une fois que vous enregistrez la facture de vente.
 DocType: Item,Is Sales Item,Est-Point de vente
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,Point arborescence de groupe
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,Point {0} n'est pas configuré pour maître numéros de série Check Point
 DocType: Maintenance Visit,Maintenance Time,Temps de maintenance
 ,Amount to Deliver,Nombre à livrer
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +620,A Product or Service,Un produit ou service
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +158,There were errors.,Il y avait des erreurs .
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +101,Tapping,Tapotement
+apps/erpnext/erpnext/public/js/setup_wizard.js +356,A Product or Service,Un produit ou service
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +146,There were errors.,Il y avait des erreurs .
 DocType: Naming Series,Current Value,Valeur actuelle
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +171,{0} created,{0} créé
 DocType: Delivery Note Item,Against Sales Order,Sur la commande
@@ -1618,7 +1561,7 @@
 apps/erpnext/erpnext/accounts/party.py +275,Due Date cannot be before Posting Date,La date d'échéance ne peut être antérieure Date de publication
 DocType: Website Item Group,Website Item Group,Groupe Article Site
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Duties and Taxes,Frais et taxes
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Please enter Reference date,S'il vous plaît entrer Date de référence
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +312,Please enter Reference date,S'il vous plaît entrer Date de référence
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} entrées de paiement ne peuvent pas être filtrées par {1}
 DocType: Item Website Specification,Table for Item that will be shown in Web Site,Tableau pour le point qui sera affiché dans le site Web
 DocType: Purchase Order Item Supplied,Supplied Qty,Quantité fournie
@@ -1626,7 +1569,7 @@
 apps/erpnext/erpnext/config/stock.py +103,Tree of Item Groups.,Arbre de groupes des ouvrages .
 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,Nos série requis pour Serialized article {0}
 ,Item-wise Purchase History,Historique des achats (par Article)
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +152,Red,Rouge
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Red,Rouge
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +228,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},"S'il vous plaît cliquer sur "" Générer annexe ' pour aller chercher de série n ° ajouté pour objet {0}"
 DocType: Account,Frozen,Frozen
 ,Open Production Orders,Commandes ouverte de production
@@ -1641,7 +1584,7 @@
 DocType: Item Attribute,Attribute Name,Nom de l'attribut
 apps/erpnext/erpnext/controllers/selling_controller.py +236,Item {0} must be Sales or Service Item in {1},Ajouter au panier
 DocType: Item Group,Show In Website,Afficher dans le site Web
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +621,Group,Groupe
+apps/erpnext/erpnext/public/js/setup_wizard.js +357,Group,Groupe
 DocType: Task,Expected Time (in hours),Durée prévue (en heures)
 ,Qty to Order,Quantité à commander
 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","Pour suivre le nom de la marque dans les documents suivants de Livraison, Opportunité, Demande de Matériel, Item, bon de commande, bon d&#39;achat, l&#39;acheteur réception, offre, facture de vente, Fagot produit, Sales Order, No de série"
@@ -1651,6 +1594,7 @@
 DocType: Features Setup,Brands,Marques
 DocType: C-Form Invoice Detail,Invoice No,Aucune facture
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +480,From Purchase Order,De bon de commande
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +92,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Congé ne peut être appliquée / annulée avant {0}, que l&#39;équilibre de congé a déjà été transmis report dans le futur enregistrement d&#39;allocation de congé {1}"
 DocType: Activity Cost,Costing Rate,Taux Costing
 ,Customer Addresses And Contacts,Adresses et contacts clients
 DocType: Employee,Resignation Letter Date,Date de lettre de démission
@@ -1658,35 +1602,31 @@
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +137,Not Set,non définie
 DocType: Communication,Date,Date
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,Répétez Revenu à la clientèle
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +651,Sit tight while your system is being setup. This may take a few moments.,Veuillez patienter pendant l’installation. L’opération peut prendre quelques minutes. 
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +115,Sit tight while your system is being setup. This may take a few moments.,Veuillez patienter pendant l’installation. L’opération peut prendre quelques minutes. 
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +51,{0} ({1}) must have role 'Expense Approver',"{0} ({1}) doit avoir le rôle ""Approbateur de frais'"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Pair,Assistant de configuration
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Pair,Assistant de configuration
 DocType: Bank Reconciliation Detail,Against Account,Sur le compte
 DocType: Maintenance Schedule Detail,Actual Date,Date Réelle
 DocType: Item,Has Batch No,A lot no
 DocType: Delivery Note,Excise Page Number,Numéro de page d&#39;accise
 DocType: Employee,Personal Details,Données personnelles
 ,Maintenance Schedules,Programmes d&#39;entretien
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +44,Embossing,Gaufrage
-,Quotation Trends,Devis Tendances
+,Quotation Trends,Soumission Tendances
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +139,Item Group not mentioned in item master for item {0},Le groupe d'articles ne sont pas mentionnés dans le maître de l'article pour l'article {0}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +302,Debit To account must be a Receivable account,Débit Pour compte doit être un compte à recevoir
-apps/erpnext/erpnext/stock/doctype/item/item.py +310,"As Production Order can be made for this item, it must be a stock item.","Comme ordre de fabrication peut être faite de cet élément, il doit être un article en stock ."
 DocType: Shipping Rule Condition,Shipping Amount,Montant de livraison
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +140,Joining,Adhésion
-DocType: Authorization Rule,Above Value,Au-dessus de la valeur
 ,Pending Amount,Montant en attente
 DocType: Purchase Invoice Item,Conversion Factor,Facteur de conversion
 DocType: Purchase Order,Delivered,Livré
 apps/erpnext/erpnext/config/hr.py +160,Setup incoming server for jobs email id. (e.g. jobs@example.com),Configuration serveur entrant pour les emplois id e-mail . (par exemple jobs@example.com )
 DocType: Purchase Receipt,Vehicle Number,Nombre de véhicules
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,La date à laquelle la facture récurrente sera arrêter
+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,Nombre de feuilles alloués {0} ne peut pas être inférieure à feuilles déjà approuvés {1} pour la période
 DocType: Journal Entry,Accounts Receivable,Débiteurs
 ,Supplier-Wise Sales Analytics,Fournisseur - Wise ventes Analytics
 DocType: Address Template,This format is used if country specific format is not found,Ce format est utilisé si le format spécifique au pays n'est pas trouvé
 DocType: Custom Field,Custom,Coutume
 DocType: Production Order,Use Multi-Level BOM,Utilisez Multi-Level BOM
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +26,Injection molding,Le moulage par injection
 DocType: Bank Reconciliation,Include Reconciled Entries,Inclure les entrées rapprochées
 apps/erpnext/erpnext/config/accounts.py +41,Tree of finanial accounts.,Arborescence des comptes financiers.
 DocType: Leave Control Panel,Leave blank if considered for all employee types,Laisser vide si cela est jugé pour tous les types d&#39;employés
@@ -1696,30 +1636,28 @@
 apps/frappe/frappe/config/setup.py +130,Printing,Impression
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +114,Expense Claim is pending approval. Only the Expense Approver can update status.,Remboursement de frais est en attente d'approbation . Seulement l'approbateur des frais peut mettre à jour le statut .
 DocType: Purchase Invoice,Additional Discount Amount,Montant de réduction supplémentaire
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +99,The day(s) on which you are applying for leave are holiday. You need not apply for leave.,S'il vous plaît entrer comptes débiteurs groupe / à payer en master de l'entreprise
 apps/frappe/frappe/public/js/frappe/misc/utils.js +110,and,et
 DocType: Leave Block List Allow,Leave Block List Allow,Laisser Block List Autoriser
 apps/erpnext/erpnext/setup/doctype/company/company.py +236,Abbr can not be blank or space,Abr ne peut être vide ou l&#39;espace
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +50,Sports,sportif
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,sportif
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Actual,Totales réelles
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Unit,unité
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Unit,unité
 apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.py +182,Please set Dropbox access keys in your site config,S'il vous plaît définir les clés d'accès Dropbox sur votre site config
 apps/erpnext/erpnext/stock/get_item_details.py +113,Please specify Company,S&#39;il vous plaît préciser Company
 ,Customer Acquisition and Loyalty,Acquisition et fidélisation client
 DocType: Purchase Receipt,Warehouse where you are maintaining stock of rejected items,Entrepôt où vous êtes maintenant le bilan des éléments rejetés
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +408,Your financial year ends on,Date de fin de la période comptable
+apps/erpnext/erpnext/public/js/setup_wizard.js +156,Your financial year ends on,Date de fin de la période comptable
 DocType: POS Profile,Price List,Liste des prix
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +20,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0} est maintenant l'Année Fiscale par défaut. Rafraîchissez la page pour que les modifications soient prises en compte. Svp
 apps/erpnext/erpnext/projects/doctype/project/project.js +47,Expense Claims,Remboursement des dépenses
 DocType: Issue,Support,Support
-DocType: Authorization Rule,Approving Role,Approuver rôle
 ,BOM Search,BOM Recherche
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +176,Closing (Opening + Totals),Fermeture (ouverture + totaux)
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +26,Please specify currency in Company,Se il vous plaît spécifier la devise de Société
 DocType: Workstation,Wages per hour,Salaires par heure
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},Stock équilibre dans Batch {0} deviendra négative {1} pour le point {2} au Entrepôt {3}
 apps/erpnext/erpnext/config/setup.py +83,"Show / Hide features like Serial Nos, POS etc.",commercial
-apps/erpnext/erpnext/controllers/accounts_controller.py +236,Account {0} is invalid. Account Currency must be {1},Compte {0} est invalide. Compte doit être {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +237,Account {0} is invalid. Account Currency must be {1},Compte {0} est invalide. Compte doit être {1}
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +34,UOM Conversion factor is required in row {0},Point {0} a été saisi plusieurs fois avec la même description ou la date ou de l'entrepôt
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +53,Clearance date cannot be before check date in row {0},Chefs de lettre pour des modèles d'impression .
 DocType: Salary Slip,Deduction,Déduction
@@ -1738,13 +1676,13 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +82,Item {0} has already been returned,Nouveau Stock UDM doit être différent de stock actuel Emballage
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** Exercice ** représente un exercice. Toutes les écritures comptables et autres transactions majeures sont suivis dans ** Exercice **.
 DocType: Opportunity,Customer / Lead Address,Client / plomb adresse
+apps/erpnext/erpnext/stock/doctype/item/item.py +112,Warning: Invalid SSL certificate on attachment {0},Attention: certificat SSL non valide sur l&#39;attachement {0}
 DocType: Production Order Operation,Actual Operation Time,Temps Opérationnel Réel
 DocType: Authorization Rule,Applicable To (User),Applicable aux (Utilisateur)
 DocType: Purchase Taxes and Charges,Deduct,Déduire
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +170,Job Description,Description du poste
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +170,Job Description,Description du poste
 DocType: Purchase Order Item,Qty as per Stock UOM,Qté en stock pour Emballage
 apps/frappe/frappe/model/rename_doc.py +343,Please select a valid csv file with data,Date de liquidation ne peut pas être avant le check date dans la ligne {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +92,Coating,Revêtement
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +126,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Caractères spéciaux sauf ""-"", ""#"", ""."" et ""/"" pas autorisés à nommer série"
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Garder une trace des campagnes de vente. Gardez une trace de Leads, Citations, Sales Order etc de campagnes de mesurer le retour sur investissement. "
 DocType: Expense Claim,Approver,Approbateur
@@ -1754,12 +1692,11 @@
 DocType: Supplier Quotation,Manufacturing Manager,Responsable de la fabrication
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},Compte {0} n'appartient pas à la Société {1}
 apps/erpnext/erpnext/config/stock.py +69,Split Delivery Note into packages.,Séparer le bon de livraison dans des packages.
-apps/erpnext/erpnext/hooks.py +84,Shipments,Livraisons
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +29,Dip molding,Moulage par immersion
+apps/erpnext/erpnext/hooks.py +68,Shipments,Livraisons
 DocType: Purchase Order,To be delivered to customer,Pour être livré à la clientèle
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,Log Time Etat doit être soumis.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,N ° de série {0} ne fait pas partie de tout entrepôt
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +650,Setting Up,Configuration
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +114,Setting Up,Configuration
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,Row # ,Ligne #
 DocType: Purchase Invoice,In Words (Company Currency),En Words (Société Monnaie)
 DocType: Pricing Rule,Supplier,Fournisseur
@@ -1767,7 +1704,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +105,Miscellaneous Expenses,Nombre de mots
 DocType: Global Defaults,Default Company,Société défaut
 apps/erpnext/erpnext/controllers/stock_controller.py +166,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,Frais ou différence compte est obligatoire pour objet {0} car il impacts valeur globale des actions
-apps/erpnext/erpnext/controllers/accounts_controller.py +354,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","Vous ne pouvez pas surfacturer pour objet {0} à la ligne {1} plus {2}. Pour permettre à la surfacturation, se il vous plaît situé dans Réglages Stock"
+apps/erpnext/erpnext/controllers/accounts_controller.py +355,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","Vous ne pouvez pas surfacturer pour objet {0} à la ligne {1} plus {2}. Pour permettre à la surfacturation, se il vous plaît situé dans Réglages Stock"
 DocType: Employee,Bank Name,Nom de la banque
 apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +27,-Above,-Au-dessus
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +135,User {0} is disabled,Territoire cible Variance article Groupe Sage
@@ -1780,27 +1717,26 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,{0} is mandatory for Item {1},{0} est obligatoire pour l'objet {1}
 DocType: Currency Exchange,From Currency,De Monnaie
 DocType: DocField,Name,Nom
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +211,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Se il vous plaît sélectionnez Montant alloué, type de facture et numéro de facture dans atleast une rangée"
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +104,Sales Order required for Item {0},Commande requis pour objet {0}
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +158,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Se il vous plaît sélectionnez Montant alloué, type de facture et numéro de facture dans atleast une rangée"
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +107,Sales Order required for Item {0},Commande requis pour objet {0}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +43,Amounts not reflected in system,Les montants ne figurent pas dans le système
 DocType: Purchase Invoice Item,Rate (Company Currency),Taux (Monnaie de la société)
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +40,Others,autres
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +40,Others,autres
 apps/erpnext/erpnext/templates/includes/product_page.js +80,Cannot find a matching Item. Please select some other value for {0}.,Vous ne trouvez pas un produit trouvé. S&#39;il vous plaît sélectionner une autre valeur pour {0}.
 DocType: POS Profile,Taxes and Charges,Impôts et taxes
 DocType: Item,"A Product or a Service that is bought, sold or kept in stock.","Un produit ou un service qui est acheté, vendu ou conservé en 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,Point {0} a été saisi plusieurs fois avec la même description ou la date
 apps/frappe/frappe/core/doctype/doctype/boilerplate/controller_list.html +31,Completed,Terminé
 DocType: Web Form,Select DocType,Sélectionnez DocType
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +104,Broaching,Abordant
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +12,Banking,Bancaire
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,Bancaire
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +38,Please click on 'Generate Schedule' to get schedule,"S'il vous plaît cliquer sur "" Générer annexe » pour obtenir le calendrier"
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +283,New Cost Center,Nouveau centre de coût
 DocType: Bin,Ordered Quantity,Quantité commandée
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +397,"e.g. ""Build tools for builders""","par exemple "" Construire des outils pour les constructeurs """
+apps/erpnext/erpnext/public/js/setup_wizard.js +145,"e.g. ""Build tools for builders""","par exemple "" Construire des outils pour les constructeurs """
 DocType: Quality Inspection,In Process,In Process
 DocType: Authorization Rule,Itemwise Discount,Remise (par Article)
 DocType: Purchase Order Item,Reference Document Type,Référence Type de document
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +318,{0} against Sales Order {1},{0} contre le bon de commande de vente {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +320,{0} against Sales Order {1},{0} contre le bon de commande de vente {1}
 DocType: Account,Fixed Asset,Actifs immobilisés
 apps/erpnext/erpnext/config/stock.py +283,Serialized Inventory,Stocks en série
 DocType: Activity Type,Default Billing Rate,Par défaut taux de facturation
@@ -1815,14 +1751,13 @@
 DocType: Purchase Invoice Item,Page Break,Saut de page
 DocType: Production Order Operation,Pending,En attendant
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,Les utilisateurs qui peuvent approuver les demandes d'autorisation d'un employé en particulier
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +33,You cannot change default UOM of Variant. To change default UOM for Variant change default UOM of the Template,Vous ne pouvez pas changer UOM de défaut de la variante. Pour changer UOM par défaut pour la variante UOM changement défaut du modèle
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +50,Office Equipments,Équipement de bureau
 DocType: Purchase Invoice Item,Qty,Qté
 DocType: Fiscal Year,Companies,Sociétés
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +24,Electronics,électronique
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +24,Electronics,électronique
 DocType: Stock Settings,Raise Material Request when stock reaches re-order level,Soulever demande de matériel lorsque le stock atteint le niveau de réapprovisionnement
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +18,From Maintenance Schedule,De Calendrier d'entretien
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +56,Full-time,À plein temps
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +56,Full-time,À plein temps
 DocType: Purchase Invoice,Contact Details,Coordonnées
 DocType: C-Form,Received Date,Date de réception
 DocType: Delivery Note,"If you have created a standard template in Sales Taxes and Charges Template, select one and click on the button below.","Si vous avez créé un modèle standard en taxes de vente et frais Template, sélectionnez l&#39;une et cliquez sur le bouton ci-dessous."
@@ -1834,11 +1769,12 @@
 DocType: Job Applicant,Job Opening,Offre d&#39;emploi
 DocType: Payment Reconciliation,Payment Reconciliation,Rapprochement des paiements
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +154,Please select Incharge Person's name,S'il vous plaît sélectionnez le nom de la personne Incharge
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +51,Technology,technologie
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,technologie
 DocType: Offer Letter,Offer Letter,Offrez Lettre
 apps/erpnext/erpnext/config/manufacturing.py +51,Generate Material Requests (MRP) and Production Orders.,Lieu à des demandes de matériel (MRP) et de la procédure de production.
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +68,Total Invoiced Amt,Total facturé Amt
 DocType: Time Log,To Time,To Time
+DocType: Authorization Rule,Approving Role (above authorized value),Approuver Rôle (valeur autorisée ci-dessus)
 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.","Pour ajouter des nœuds de l'enfant , explorer arborescence et cliquez sur le nœud sous lequel vous voulez ajouter d'autres nœuds ."
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +102,Credit To account must be a Payable account,Crédit du compte doit être un compte à payer
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +233,BOM recursion: {0} cannot be parent or child of {2},S'il vous plaît entrer une adresse valide Id
@@ -1851,10 +1787,8 @@
 DocType: Item,Customer Item Codes,Codes de référence du client
 DocType: Opportunity,Lost Reason,Raison perdu
 apps/erpnext/erpnext/config/accounts.py +68,Create Payment Entries against Orders or Invoices.,Créer des entrées de paiement contre commandes ou factures.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +141,Welding,Soudage
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +40,New Stock UOM is required,Nouveau stock UDM est requis
 DocType: Quality Inspection,Sample Size,Taille de l&#39;échantillon
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +443,All items have already been invoiced,Tous les articles ont déjà été facturés
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +446,All items have already been invoiced,Tous les articles ont déjà été facturés
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',S&#39;il vous plaît indiquer une valide »De Affaire n &#39;
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +287,Further cost centers can be made under Groups but entries can be made against non-Groups,"D&#39;autres centres de coûts peuvent être réalisées dans les groupes, mais les entrées peuvent être faites contre les non-Groupes"
 DocType: Project,External,Externe
@@ -1866,8 +1800,7 @@
 DocType: Bin,Actual Quantity,Quantité réelle
 DocType: Shipping Rule,example: Next Day Shipping,Exemple: Jour suivant Livraison
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,N ° de série {0} introuvable
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +563,Your Customers,vos clients
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +27,Compression molding,Le moulage par compression
+apps/erpnext/erpnext/public/js/setup_wizard.js +303,Your Customers,vos clients
 DocType: Leave Block List Date,Block Date,Date de bloquer
 DocType: Sales Order,Not Delivered,Non Livré
 ,Bank Clearance Summary,Résumé de l'approbation de la banque
@@ -1888,10 +1821,10 @@
 DocType: SMS Log,Sent To,Envoyé À
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +28,Make Sales Invoice,Faire la facture de vente
 DocType: Company,For Reference Only.,Pour référence seulement.
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +29,Invalid {0}: {1},Non valide {0}: {1}
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +49,Invalid {0}: {1},Non valide {0}: {1}
 DocType: Sales Invoice Advance,Advance Amount,Montant de l&#39;avance
 DocType: Manufacturing Settings,Capacity Planning,Planification des capacités
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +49,'From Date' is required,'Date début' est nécessaire
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +43,'From Date' is required,'Date début' est nécessaire
 DocType: Journal Entry,Reference Number,Numéro de référence
 DocType: Employee,Employment Details,Détails de l&#39;emploi
 DocType: Employee,New Workplace,Travail du Nouveau-
@@ -1906,7 +1839,7 @@
 DocType: Serial No,Delivery Time,L'heure de la livraison
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Basé sur le vieillissement
 DocType: Item,End of Life,Fin de vie
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +41,Travel,Quantité ne peut pas être une fraction dans la ligne {0}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +41,Travel,Quantité ne peut pas être une fraction dans la ligne {0}
 DocType: Leave Block List,Allow Users,Autoriser les utilisateurs
 DocType: Purchase Order,Customer Mobile No,Client Mobile Pas
 DocType: Sales Invoice,Recurring,Récurrent
@@ -1920,7 +1853,7 @@
 DocType: Naming Series,User must always select,L&#39;utilisateur doit toujours sélectionner
 DocType: Stock Settings,Allow Negative Stock,Autoriser un stock négatif
 DocType: Installation Note,Installation Note,Note d&#39;installation
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +541,Add Taxes,Ajouter impôts
+apps/erpnext/erpnext/public/js/setup_wizard.js +283,Add Taxes,Ajouter impôts
 ,Financial Analytics,Financial Analytics
 DocType: Quality Inspection,Verified By,Vérifié par
 DocType: Address,Subsidiary,Filiale
@@ -1930,7 +1863,6 @@
 DocType: System Settings,In Hours,Dans Heures
 DocType: Process Payroll,Create Salary Slip,Créer bulletin de salaire
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Expected balance as per bank,L'équilibre attendu que par banque
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +115,Buffing,Polissage
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Source of Funds (Liabilities),Source des fonds ( Passif )
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +347,Quantity in row {0} ({1}) must be same as manufactured quantity {2},Entrepôt ne peut pas être supprimé car il existe entrée stock registre pour cet entrepôt .
 DocType: Appraisal,Employee,Employé
@@ -1947,11 +1879,11 @@
 DocType: Rename Tool,File to Rename,Fichier à Renommer
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +176,Purchse Order number required for Item {0},Ordre de fabrication {0} doit être annulée avant d'annuler cette commande client
 apps/erpnext/erpnext/public/js/controllers/transaction.js +136,Show Payments,Afficher les paiements
-apps/erpnext/erpnext/controllers/buying_controller.py +245,Specified BOM {0} does not exist for Item {1},Divulgué BOM {0} ne existe pas pour objet {1}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +202,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Programme de maintenance {0} doit être annulée avant d'annuler cette commande client
+apps/erpnext/erpnext/controllers/buying_controller.py +236,Specified BOM {0} does not exist for Item {1},Divulgué BOM {0} ne existe pas pour objet {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Programme de maintenance {0} doit être annulée avant d'annuler cette commande client
 apps/frappe/frappe/desk/page/backups/backups.html +13,Size,Taille
 DocType: Notification Control,Expense Claim Approved,Demande d&#39;indemnité Approuvé
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +113,Pharmaceutical,pharmaceutique
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Pharmaceutical,pharmaceutique
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,Coût des articles achetés
 DocType: Selling Settings,Sales Order Required,Commande obligatoire
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +30,Create Customer,créer clientèle
@@ -1961,7 +1893,6 @@
 DocType: Quality Inspection Reading,Reading 9,Lecture 9
 DocType: Supplier,Is Frozen,Est Gelé
 DocType: Buying Settings,Buying Settings,Réglages d&#39;achat
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +122,Mass finishing,La finition de masse
 DocType: Stock Entry Detail,BOM No. for a Finished Good Item,N ° nomenclature pour un produit fini Bonne
 DocType: Upload Attendance,Attendance To Date,La participation à ce jour
 apps/erpnext/erpnext/config/selling.py +158,Setup incoming server for sales email id. (e.g. sales@example.com),Cas No (s ) en cours d'utilisation . Essayez de l'affaire n ° {0}
@@ -1969,7 +1900,7 @@
 DocType: Payment Tool,Payment Account,Compte de paiement
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +713,Please specify Company to proceed,Veuillez indiquer Société de procéder
 apps/frappe/frappe/public/js/frappe/model/indicator.js +30,Draft,Avant-projet
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +46,Compensatory Off,faire
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Compensatory Off,faire
 DocType: Quality Inspection Reading,Accepted,Accepté
 DocType: User,Female,Femme
 DocType: Journal Entry Account,Debit in Account Currency,Débit en compte Devises
@@ -1981,7 +1912,7 @@
 DocType: Shipping Rule,Shipping Rule Label,Livraison règle étiquette
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +209,Raw Materials cannot be blank.,Matières premières ne peuvent pas être vide.
 DocType: Newsletter,Test,Test
-apps/erpnext/erpnext/stock/doctype/item/item.py +364,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +368,"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'","Comme il ya des transactions sur actions existants pour cet article, \ vous ne pouvez pas modifier les valeurs de &#39;A Numéro de série &quot;,&quot; A lot Non »,« Est-Stock Item »et« Méthode d&#39;évaluation »"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +448,Quick Journal Entry,Journal Entrée rapide
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +92,You can not change rate if BOM mentioned agianst any item,Vous ne pouvez pas modifier le taux si BOM mentionné agianst un article
@@ -1992,13 +1923,14 @@
 apps/erpnext/erpnext/config/stock.py +18,Requests for items.,Gestion des demandes d'articles.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,Pour la production séparée sera créée pour chaque article produit fini.
 DocType: Purchase Invoice,Terms and Conditions1,Termes et conditions1
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +18,Complete Setup,installation terminée
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard_page.html +18,Complete Setup,installation terminée
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","Les entrées comptable sont gelées jusqu'à cette date, personne ne peut ajouter / modifier les entrées sauf le(s) rôle(s) spécifié ci-dessous."
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +121,Please save the document before generating maintenance schedule,S'il vous plaît enregistrer le document avant de générer le calendrier d'entretien
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,État du projet
 DocType: UOM,Check this to disallow fractions. (for Nos),Cochez cette case pour interdire les fractions. (Pour les numéros)
 apps/erpnext/erpnext/config/crm.py +96,Newsletter Mailing List,Bulletin Liste de Diffusion
 DocType: Delivery Note,Transporter Name,Nom Transporteur
+DocType: Authorization Rule,Authorized Value,Valeur autorisée
 DocType: Contact,Enter department to which this Contact belongs,Entrez département auquel appartient ce contact
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Absent,Absent total
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +746,Item or Warehouse for row {0} does not match Material Request,Une autre entrée de clôture de la période {0} a été faite après {1}
@@ -2023,16 +1955,15 @@
 DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),Taux de base (comme par Stock UDM)
 DocType: SMS Log,No of Requested SMS,Pas de SMS demandés
 DocType: Campaign,Campaign-.####,Campagne-.####
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +55,Piercing,Perçant
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,Prochaines étapes
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +117,Contract End Date must be greater than Date of Joining,Fin du contrat La date doit être supérieure à date d'adhésion
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,Un tiers distributeur / commerçant / commissionnaire / affilié / revendeur qui vend les produits de l'entreprise en échange d'une commission.
 DocType: Customer Group,Has Child Node,A Node enfant
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{0} against Purchase Order {1},{0} contre le bon de commande d'achat {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +332,{0} against Purchase Order {1},{0} contre le bon de commande d'achat {1}
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","Entrez les paramètres url statiques (par exemple ici sender = ERPNext, username = ERPNext, mot de passe = 1234 etc)"
 apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,"{0} {1} dans aucun exercice actif. Pour plus de détails, consultez {2}."
-apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,Par défaut Warehouse est obligatoire pour les stock Article .
+apps/erpnext/erpnext/setup/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,Par défaut Warehouse est obligatoire pour les stock Article .
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +37,Ageing Range 1,Gamme de vieillissement 1
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +110,Photochemical machining,Usinage photochimique
 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.
 
 #### Note
@@ -2078,7 +2009,7 @@
 DocType: Purchase Receipt Item,Recd Quantity,Quantité recd
 DocType: Email Account,Email Ids,Email Ids
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},effondrement
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +471,Stock Entry {0} is not submitted,Stock entrée {0} est pas soumis
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +473,Stock Entry {0} is not submitted,Stock entrée {0} est pas soumis
 DocType: Payment Reconciliation,Bank / Cash Account,Compte en Banque / trésorerie
 DocType: Tax Rule,Billing City,Facturation Ville
 DocType: Global Defaults,Hide Currency Symbol,Masquer le symbole monétaire
@@ -2094,7 +2025,7 @@
 DocType: Purchase Invoice,Currency and Price List,Monnaie et liste de prix
 DocType: Opportunity,Customer / Lead Name,Entrepôt {0} n'existe pas
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +63,Clearance Date not mentioned,"Désignation des employés (par exemple de chef de la direction , directeur , etc.)"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +71,Production,Production
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Production,Production
 DocType: Item,Allow Production Order,Permettre les ordres de fabrication
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +60,Row {0}:Start Date must be before End Date,Ligne {0} : Date de début doit être avant Date de fin
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Total (Quantité)
@@ -2107,7 +2038,7 @@
 apps/erpnext/erpnext/utilities/doctype/address/address.py +113,My Addresses,Mes adresses
 DocType: Stock Ledger Entry,Outgoing Rate,Taux sortant
 apps/erpnext/erpnext/config/hr.py +100,Organization branch master.,Point impôt Row {0} doit avoir un compte de type de l'impôt sur le revenu ou de dépenses ou ou taxé
-apps/erpnext/erpnext/controllers/accounts_controller.py +237, or ,ou
+apps/erpnext/erpnext/controllers/accounts_controller.py +238, or ,ou
 DocType: Sales Order,Billing Status,Statut de la facturation
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Utility Expenses,Commande {0} n'est pas soumis
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,90-Above,90-dessus
@@ -2134,6 +2065,7 @@
 DocType: Stock Entry Detail,Serial No / Batch,N ° de série / lot
 DocType: Product Bundle,Parent Item,Article Parent
 DocType: Account,Account Type,Type de compte
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +113,Leave Type {0} cannot be carry-forwarded,Laissez type {0} ne peut pas être transmis carry-
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +213,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',Sélectionnez à télécharger:
 ,To Produce,A Produire
 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","Pour la ligne {0} dans {1}. Pour inclure {2} dans le prix de l&#39;article, les lignes {3} doivent également être inclus"
@@ -2141,10 +2073,7 @@
 DocType: Bin,Reserved Quantity,Quantité réservée
 DocType: Landed Cost Voucher,Purchase Receipt Items,Acheter des articles reçus
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,Personnalisation des formulaires
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +62,Cutting,Coupe
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +69,Flattening,Aplanissement
 DocType: Account,Income Account,Compte de revenu
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +22,Molding,Moulage
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +632,Delivery,Accouchement
 DocType: Stock Reconciliation Item,Current Qty,Quantité actuelle
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",Voir «Taux de matériaux à base de« coûts dans la section
@@ -2154,20 +2083,19 @@
 apps/frappe/frappe/desk/moduleview.py +61,Documents,Documents
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +17,Ref,Réf
 DocType: Cost Center,Cost Center,Centre de coûts
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.js +48,Voucher #,bon #
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +36,Voucher #,bon #
 DocType: Notification Control,Purchase Order Message,Achat message Ordre
 DocType: Tax Rule,Shipping Country,Pays de livraison
 DocType: Upload Attendance,Upload HTML,Téléchargez HTML
-apps/erpnext/erpnext/controllers/accounts_controller.py +391,"Total advance ({0}) against Order {1} cannot be greater \
+apps/erpnext/erpnext/controllers/accounts_controller.py +392,"Total advance ({0}) against Order {1} cannot be greater \
 				than the Grand Total ({2})","Avance totale ({0}) contre l'ordonnance {1} ne peut pas être supérieure \
  que le Grand total ({2})"
 DocType: Employee,Relieving Date,Date de soulager
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +12,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.","Prix règle est faite pour remplacer la liste des prix / définir le pourcentage de remise, sur la base de certains critères."
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,Entrepôt ne peut être modifié via Stock Entrée / bon de livraison / reçu d'achat
 DocType: Employee Education,Class / Percentage,Classe / Pourcentage
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +92,Head of Marketing and Sales,Responsable du marketing et des ventes
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +31,Income Tax,Facteur de conversion UDM est nécessaire dans la ligne {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +157,Laser engineered net shaping,Laser conçu façonnage net
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Head of Marketing and Sales,Responsable du marketing et des ventes
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +31,Income Tax,Facteur de conversion UDM est nécessaire dans la ligne {0}
 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.","Se il est sélectionné Prix règle est faite pour «Prix», il écrasera Prix. Prix ​​Prix de la règle est le prix définitif, donc pas de réduction supplémentaire devrait être appliqué. Ainsi, dans les transactions comme des commandes clients, bon de commande, etc., il sera récupéré dans le champ 'Prix', plutôt que champ 'Prix List Noter »."
 apps/erpnext/erpnext/config/selling.py +163,Track Leads by Industry Type.,Piste mène par type d'industrie .
 DocType: Item Supplier,Item Supplier,Fournisseur d&#39;article
@@ -2190,31 +2118,28 @@
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Quantité réelle après transaction
 ,Pending SO Items For Purchase Request,"Articles en attente Donc, pour demande d&#39;achat"
 DocType: Supplier,Billing Currency,Devise de facturation
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +148,Extra Large,Extra Large
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,Extra Large,Extra Large
 ,Profit and Loss Statement,Compte de résultat
 DocType: Bank Reconciliation Detail,Cheque Number,Numéro de chèque
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +43,Pressing,Pressage
 DocType: Payment Tool Detail,Payment Tool Detail,Paiement outil Détail
 ,Sales Browser,Exceptionnelle pour {0} ne peut pas être inférieur à zéro ( {1} )
 DocType: Journal Entry,Total Credit,Crédit total
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +474,Warning: Another {0} # {1} exists against stock entry {2},Attention: Un autre {0} {1} # existe contre l&#39;entrée en stock {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +459,Local,arrondis
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +476,Warning: Another {0} # {1} exists against stock entry {2},Attention: Un autre {0} {1} # existe contre l&#39;entrée en stock {2}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +397,Local,arrondis
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),Prêts et avances ( actif)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,Débiteurs
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +147,Large,Grand
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +23,No employee found!,Aucun employé trouvé!
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Large,Grand
 DocType: C-Form Invoice Detail,Territory,Territoire
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,Paiement du salaire pour le mois {0} et {1} an
 DocType: Purchase Order,Customer Address Display,Adresse du client Affichage
 DocType: Stock Settings,Default Valuation Method,Méthode d&#39;évaluation par défaut
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +127,Polishing,Polissage
 DocType: Production Order Operation,Planned Start Time,Heure de début prévue
 apps/erpnext/erpnext/config/accounts.py +63,Close Balance Sheet and book Profit or Loss.,Fermer Bilan et livre Bénéfice ou perte .
-apps/erpnext/erpnext/stock/doctype/item/item.py +661,"Default Unit of Measure for Item {0} cannot be changed directly because \
+apps/erpnext/erpnext/stock/doctype/item/item.py +665,"Default Unit of Measure for Item {0} cannot be changed directly because \
 			you have already made some transaction(s) with another UOM. To change default UOM, \
 			use 'UOM Replace Utility' tool under Stock module.","Unité de mesure pour le point de défaut {0} ne peut pas être modifié directement parce que \ vous avez déjà fait une transaction (s) avec une autre unité de mesure. Pour changer UOM par défaut, \ &#39;utilisation&#39; UOM Remplacer Utility &#39;outil sous module de Stock."
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,Spécifiez Taux de change pour convertir une monnaie en une autre
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +146,Quotation {0} is cancelled,Devis {0} est annulée
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +141,Quotation {0} is cancelled,Devis {0} est annulée
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,Encours total
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} was on leave on {1}. Cannot mark attendance.,Employé {0} a été en congé de {1} . Vous ne pouvez pas marquer la fréquentation .
 DocType: Sales Partner,Targets,Cibles
@@ -2225,7 +2150,6 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +158,Please create Customer from Lead {0},Prix ​​/ Rabais
 DocType: Price List,Applicable for Countries,Applicable pour les pays
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Computers,Ordinateurs
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +112,Electro-chemical grinding,Electro-chimique broyage
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +14,This is a root customer group and cannot be edited.,Il s'agit d'un groupe de clients de la racine et ne peut être modifié .
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +39,Please setup your chart of accounts before you start Accounting Entries,S'il vous plaît configurer votre plan de comptes avant de commencer Écritures comptables
 DocType: Purchase Invoice,Ignore Pricing Rule,Ignorez règle de prix
@@ -2283,7 +2207,6 @@
 DocType: Maintenance Visit,Purposes,Buts
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +103,Atleast one item should be entered with negative quantity in return document,Atleast un article doit être saisi avec quantité négative dans le document de retour
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +67,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","Opération {0} plus longtemps que les heures de travail disponibles dans poste de travail {1}, briser l&#39;opération en plusieurs opérations"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +134,Electrochemical machining,Usinage électrochimique
 ,Requested,demandé
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +66,No Remarks,Non Remarques
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +13,Overdue,En retard
@@ -2292,7 +2215,7 @@
 DocType: Monthly Distribution,Distribution Name,Nom distribution
 DocType: Features Setup,Sales and Purchase,Vente et achat
 DocType: Supplier Quotation Item,Material Request No,Demande de Support Aucun
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +218,Quality Inspection required for Item {0},Inspection de la qualité requise pour l'article {0} 
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +221,Quality Inspection required for Item {0},Inspection de la qualité requise pour l'article {0} 
 DocType: Quotation,Rate at which customer's currency is converted to company's base currency,Vitesse à laquelle la devise du client est converti en devise de base entreprise
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +107,{0} has been successfully unsubscribed from this list.,{0} a été désabonné avec succès de cette liste.
 DocType: Purchase Invoice Item,Net Rate (Company Currency),Taux net (Société devise)
@@ -2310,9 +2233,8 @@
 apps/erpnext/erpnext/accounts/report/financial_statements.py +16,Fiscal Year {0} not found.,Exercice {0} introuvable.
 DocType: Bank Reconciliation,Get Relevant Entries,Obtenez les entrées pertinentes
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +407,Accounting Entry for Stock,Entrée comptable pour Stock
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +64,Coining,Coining
 DocType: Sales Invoice,Sales Team1,Ventes Equipe1
-apps/erpnext/erpnext/stock/doctype/item/item.py +412,Item {0} does not exist,Point {0} n'existe pas
+apps/erpnext/erpnext/stock/doctype/item/item.py +416,Item {0} does not exist,Point {0} n'existe pas
 DocType: Sales Invoice,Customer Address,Adresse du client
 apps/frappe/frappe/desk/query_report.py +136,Total,Total
 DocType: Purchase Invoice,Apply Additional Discount On,Appliquer de remise supplémentaire sur
@@ -2324,14 +2246,13 @@
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),Montant de la taxe Après Montant de la remise (Société devise)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +149,Target warehouse is mandatory for row {0},Entrepôt de cible est obligatoire pour la ligne {0}
 DocType: Quality Inspection,Quality Inspection,Inspection de la Qualité
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +144,Extra Small,Très Petit
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +20,Spray forming,Vaporiser former
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Extra Small,Très Petit
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +458,Warning: Material Requested Qty is less than Minimum Order Qty,Attention: Matériel requis Quantité est inférieure Quantité minimum à commander
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +191,Account {0} is frozen,Le compte {0} est gelé
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Entité juridique / Filiale avec un tableau distinct des comptes appartenant à l'Organisation.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +29,"Food, Beverage & Tobacco","Alimentation , boissons et tabac"
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","Alimentation , boissons et tabac"
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +20,PL or BS,PL ou BS
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,Can only make payment against unbilled {0},Ne peut effectuer le paiement contre non facturés {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +531,Can only make payment against unbilled {0},Ne peut effectuer le paiement contre non facturés {0}
 apps/erpnext/erpnext/controllers/selling_controller.py +122,Commission rate cannot be greater than 100,Taux de commission ne peut pas être supérieure à 100
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Minimum Inventory Level,Niveau de Stock Minimal
 DocType: Stock Entry,Subcontract,Sous-traiter
@@ -2342,19 +2263,18 @@
 DocType: Item,Manufacturer Part Number,Numéro de pièce du fabricant
 DocType: Production Order Operation,Estimated Time and Cost,Durée et Coût estimatif
 DocType: Bin,Bin,Boîte
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +50,Nosing,Rebord
 DocType: SMS Log,No of Sent SMS,Pas de SMS envoyés
 DocType: Account,Company,Entreprise
 DocType: Account,Expense Account,Compte de dépenses
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +49,Software,logiciel
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +151,Colour,Couleur
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +49,Software,logiciel
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Colour,Couleur
 DocType: Maintenance Visit,Scheduled,Prévu
 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",S&#39;il vous plaît sélectionner Point où &quot;Est Stock Item&quot; est &quot;Non&quot; et &quot;est le point de vente&quot; est &quot;Oui&quot; et il n&#39;y a pas d&#39;autre groupe de produits
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,Sélectionnez une distribution mensuelle de distribuer inégalement cibles à travers les mois.
 DocType: Purchase Invoice Item,Valuation Rate,Taux d&#39;évaluation
 apps/erpnext/erpnext/stock/get_item_details.py +281,Price List Currency not selected,Liste des Prix devise sélectionné
 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,Point Row {0}: Reçu d'achat {1} ne existe pas dans le tableau ci-dessus 'achat reçus »
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +134,Employee {0} has already applied for {1} between {2} and {3},Employé {0} a déjà appliqué pour {1} entre {2} et {3}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +145,Employee {0} has already applied for {1} between {2} and {3},Employé {0} a déjà appliqué pour {1} entre {2} et {3}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Date de début du projet
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +8,Until,Jusqu'à
 DocType: Rename Tool,Rename Log,Renommez identifiez-vous
@@ -2364,7 +2284,7 @@
 apps/erpnext/erpnext/controllers/recurring_document.py +162,Please select {0},S'il vous plaît sélectionnez {0}
 DocType: C-Form,C-Form No,C-formulaire n °
 DocType: BOM,Exploded_items,Exploded_items
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +95,Researcher,chercheur
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Researcher,chercheur
 apps/frappe/frappe/custom/doctype/customize_form/customize_form.js +88,Update,Mettre à jour
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +78,Please save the Newsletter before sending,{0} {1} n'est pas soumis
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +23,Name or Email is mandatory,Nom ou Email est obligatoire
@@ -2373,11 +2293,10 @@
 DocType: Employee,Exit,Sortie
 apps/erpnext/erpnext/accounts/doctype/account/account.py +134,Root Type is mandatory,Type de Root est obligatoire
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +295,Serial No {0} created,aucune autorisation
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +125,Vibratory finishing,Tribofinition
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","Pour la commodité des clients, ces codes peuvent être utilisés dans des formats d&#39;impression comme les factures et les bons de livraison"
 DocType: Employee,You can enter any date manually,Vous pouvez entrer une date manuellement
 DocType: Sales Invoice,Advertisement,Publicité
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +165,Probationary Period,Période De Probation
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Probationary Period,Période De Probation
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Seuls les noeuds feuilles sont autorisées dans une transaction
 DocType: Expense Claim,Expense Approver,Dépenses approbateur
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,Article reçu d&#39;achat fournis
@@ -2385,19 +2304,16 @@
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +17,To Datetime,Pour La date du 
 DocType: SMS Settings,SMS Gateway URL,URL SMS Gateway
 apps/erpnext/erpnext/config/crm.py +53,Logs for maintaining sms delivery status,Logs pour le maintien du statut de livraison de sms
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +137,Grinding,Broyage
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +34,Shrink wrapping,Mise sous film rétractable
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +36,Pending Activities,Activités en attente
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,Confirmed,Confirmé
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier > Supplier Type,Fournisseur> Type de fournisseur
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +127,Please enter relieving date.,Type de partie de Parent
 apps/erpnext/erpnext/controllers/trends.py +137,Amt,Amt
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' can be submitted,Date de livraison prévue ne peut pas être avant commande date
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +51,Only Leave Applications with status 'Approved' can be submitted,Date de livraison prévue ne peut pas être avant commande date
 apps/erpnext/erpnext/utilities/doctype/address/address.py +21,Address Title is mandatory.,Le titre de l'adresse est obligatoire
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,Entrez le nom de la campagne si la source de l&#39;enquête est la campagne
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +38,Newspaper Publishers,Éditeurs de journaux
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +38,Newspaper Publishers,Éditeurs de journaux
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,Sélectionner exercice
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +88,Smelting,Fonte
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Réorganiser Niveau
 DocType: Attendance,Attendance Date,Date de Participation
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,rupture des salaires basée sur l&#39;obtention et la déduction.
@@ -2412,16 +2328,15 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +414,[Error],[Erreur]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,Dans les mots seront visibles une fois que vous enregistrez le bon de commande.
 ,Employee Birthday,Anniversaire des employés
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +55,Venture Capital,capital de risque
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,capital de risque
 DocType: UOM,Must be Whole Number,Doit être un nombre entier
 DocType: Leave Control Panel,New Leaves Allocated (In Days),Feuilles de nouveaux alloués (en jours)
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +51,Serial No {0} does not exist,Maître d'adresses.
 DocType: Pricing Rule,Discount Percentage,Annuler Matériel Visiter {0} avant d'annuler ce numéro de client
 DocType: Payment Reconciliation Invoice,Invoice Number,Numéro de facture
-apps/erpnext/erpnext/hooks.py +70,Orders,Commandes
+apps/erpnext/erpnext/hooks.py +54,Orders,Commandes
 DocType: Leave Control Panel,Employee Type,Type de contrat
-DocType: Employee Leave Approver,Leave Approver,Laisser approbateur
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +70,Swaging,Emboutissage
+DocType: Employee Leave Approver,Leave Approver,Approbateur d'absence
 DocType: Manufacturing Settings,Material Transferred for Manufacture,Matériel transféré pour Fabrication
 DocType: Expense Claim,"A user with ""Expense Approver"" role","Un utilisateur avec le rôle ""Autorise les dépenses"""
 ,Issued Items Against Production Order,Articles émis contre un ordre de fabrication
@@ -2433,19 +2348,18 @@
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +62,Cost Center with existing transactions can not be converted to group,S'il vous plaît entrer les détails de l' article
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Depreciation,Actifs d'impôt
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Fournisseur (s)
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +29,Invalid period,Période non valide
 DocType: Customer,Credit Limit,Limite de crédit
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,Sélectionner le type de transaction
 DocType: GL Entry,Voucher No,No du bon
-DocType: Leave Allocation,Leave Allocation,Laisser Allocation
+DocType: Leave Allocation,Leave Allocation,Absence Allocation
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +396,Material Requests {0} created,Devis {0} de type {1}
 apps/erpnext/erpnext/config/selling.py +122,Template of terms or contract.,Modèle de termes ou d&#39;un contrat.
 DocType: Customer,Address and Contact,Adresse et contact
 DocType: Customer,Last Day of the Next Month,Dernier jour du mois prochain
 DocType: Employee,Feedback,Commentaire
+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}","Congé ne peut être attribué avant {0}, que l&#39;équilibre de congé a déjà été transmis report dans le futur enregistrement d&#39;allocation de congé {1}"
 apps/erpnext/erpnext/accounts/party.py +284,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Remarque: En raison / Date de référence dépasse autorisés jours de crédit client par {0} jour (s)
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +621,Maint. Schedule,Maint. Calendrier
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +108,Abrasive jet machining,Abrasive jet usinage
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +632,Maint. Schedule,Maint. Calendrier
 DocType: Stock Settings,Freeze Stock Entries,Congeler entrées en stocks
 DocType: Website Settings,Website Settings,Réglages Site web
 DocType: Item,Reorder level based on Warehouse,Niveau de réapprovisionnement basée sur Entrepôt
@@ -2462,7 +2376,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +75,Show Stock Entries,Voir les entrées en stocks
 ,Is Primary Address,Est-Adresse primaire
 DocType: Production Order,Work-in-Progress Warehouse,Entrepôt Work-in-Progress
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +308,Reference #{0} dated {1},Référence #{0} daté {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Reference #{0} dated {1},Référence #{0} daté {1}
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +13,Manage Addresses,Gérer les adresses
 DocType: Pricing Rule,Item Code,Code de l&#39;article
 DocType: Production Planning Tool,Create Production Orders,Créer des ordres de fabrication
@@ -2471,7 +2385,7 @@
 DocType: Lead,Market Segment,Segment de marché
 DocType: Communication,Phone,Téléphone
 DocType: Employee Internal Work History,Employee Internal Work History,Antécédents de travail des employés internes
-apps/erpnext/erpnext/public/js/account_tree_grid.js +50,Closing (Dr),Fermeture (Dr)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +221,Closing (Dr),Fermeture (Dr)
 DocType: Contact,Passive,Passif
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,N ° de série {0} pas en stock
 apps/erpnext/erpnext/config/selling.py +127,Tax template for selling transactions.,Modèle de la taxe pour la vente de transactions .
@@ -2487,8 +2401,8 @@
 ,Billed Amount,Montant facturé
 DocType: Bank Reconciliation,Bank Reconciliation,Rapprochement bancaire
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +9,Get Updates,Mises à jour
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +129,Material Request {0} is cancelled or stopped,Demande de Matériel {0} est annulé ou arrêté
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +641,Add a few sample records,Ajouter quelque exemple de dossier
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +133,Material Request {0} is cancelled or stopped,Demande de Matériel {0} est annulé ou arrêté
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Add a few sample records,Ajouter quelque exemple de dossier
 apps/erpnext/erpnext/config/hr.py +210,Leave Management,Gestion des congés
 DocType: Event,Groups,Groupes
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,Groupe par compte
@@ -2501,38 +2415,34 @@
 DocType: Features Setup,Sales Extras,Extras ventes
 apps/erpnext/erpnext/accounts/utils.py +344,{0} budget for Account {1} against Cost Center {2} will exceed by {3},Le budget {0} pour le compte {1} va excéder le poste de coût {2} de {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +236,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Compte de différence doit être un compte de type actif / passif, puisque cette Stock réconciliation est une entrée d&#39;ouverture"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +138,Purchase Order number required for Item {0},Vous ne pouvez pas reporter {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Order number required for Item {0},Vous ne pouvez pas reporter {0}
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date','La date due' doit être antérieure à la 'Date'
 ,Stock Projected Qty,Stock projeté Quantité
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +147,Customer {0} does not belong to project {1},S'il vous plaît définir la valeur par défaut {0} dans Société {0}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +150,Customer {0} does not belong to project {1},S'il vous plaît définir la valeur par défaut {0} dans Société {0}
 DocType: Sales Order,Customer's Purchase Order,Bon de commande du client
 DocType: Warranty Claim,From Company,De Company
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,Valeur ou Quantité
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Minute,Le salaire net ne peut pas être négatif
+apps/erpnext/erpnext/public/js/setup_wizard.js +363,Minute,Le salaire net ne peut pas être négatif
 DocType: Purchase Invoice,Purchase Taxes and Charges,Impôts achat et les frais
 ,Qty to Receive,Quantité à recevoir
 DocType: Leave Block List,Leave Block List Allowed,Laisser Block List admis
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +61,Conversion factor cannot be in fractions,Installation Remarque {0} a déjà été soumis
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +358,You will use it to Login,Vous l'utiliserez pour vous identifier
+apps/erpnext/erpnext/public/js/setup_wizard.js +108,You will use it to Login,Vous l'utiliserez pour vous identifier
 DocType: Sales Partner,Retailer,Détaillant
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +99,Credit To account must be a Balance Sheet account,Crédit du compte doit être un compte de bilan
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,Tous les types de fournisseurs
 apps/erpnext/erpnext/stock/doctype/item/item.py +37,Item Code is mandatory because Item is not automatically numbered,"Code de l'article est obligatoire, car l'article n'est pas numéroté automatiquement"
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +99,Quotation {0} not of type {1},Activer / désactiver les monnaies .
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +93,Quotation {0} not of type {1},La soumission {0} n'est pas un type {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,Article calendrier d&#39;entretien
 DocType: Sales Order,%  Delivered,Livré%
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,Bank Overdraft Account,Compte du découvert bancaire
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +15,Make Salary Slip,Faire fiche de salaire
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +18,Browse BOM,Parcourir BOM
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +175,Secured Loans,Pas de nomenclature par défaut existe pour objet {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +3,Awesome Products,Produits impressionnants
+apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +3,Awesome Products,Produits impressionnants
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +189,Opening Balance Equity,Ouverture équité en matière d&#39;équilibre
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +80,Cannot approve leave as you are not authorized to approve leaves on Block Dates,Vous ne pouvez pas approuver les congés que vous n'êtes pas autorisé à approuver les congés sur les dates de bloc
 DocType: Appraisal,Appraisal,Évaluation
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +13,Lost-foam casting,Coulée à mousse perdue
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +47,Drawing,Dessin
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +22,Date is repeated,La date est répétée
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +148,Leave approver must be one of {0},Abréviation ne peut pas avoir plus de 5 caractères
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +162,Leave approver must be one of {0},Approbateur d'absence doit être un de {0}
 DocType: Hub Settings,Seller Email,Vendeur Email
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Coût d&#39;achat total (via la facture d&#39;achat)
 DocType: Workstation Working Hour,Start Time,Heure de début
@@ -2546,7 +2456,7 @@
 DocType: Purchase Invoice Item,Net Amount (Company Currency),Montant net (Société devise)
 DocType: BOM Operation,Hour Rate,Taux horraire
 DocType: Stock Settings,Item Naming By,Point de noms en
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +642,From Quotation,De offre
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +655,From Quotation,De offre
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},Point Wise impôt Détail
 DocType: Production Order,Material Transferred for Manufacturing,Matériel transféré pour la fabrication
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +29,Account {0} does not exists,Le compte {0} ne existe pas
@@ -2560,21 +2470,19 @@
 DocType: Purchase Invoice Item,PR Detail,Détail PR
 DocType: Sales Order,Fully Billed,Entièrement Qualifié
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +20,Cash In Hand,Votre exercice social commence le
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +72,Delivery warehouse required for stock item {0},Entrepôt de livraison requise pour stock pièce {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +119,Delivery warehouse required for stock item {0},Entrepôt de livraison requise pour stock pièce {0}
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),Le poids brut du colis. Habituellement poids net + poids du matériau d&#39;emballage. (Pour l&#39;impression)
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Les utilisateurs ayant ce rôle sont autorisés à fixer les comptes gelés et de créer / modifier des entrées comptables contre les comptes gelés
 DocType: Serial No,Is Cancelled,Est annulée
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +281,My Shipments,Mes envois
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +286,My Shipments,Mes envois
 DocType: Journal Entry,Bill Date,Date de la facture
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +43,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","Même s'il existe plusieurs règles de tarification avec la plus haute priorité, les priorités internes alors suivantes sont appliquées:"
 DocType: Supplier,Supplier Details,Détails de produit
 DocType: Communication,Recipients,Destinataires
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +146,Screwing,Baise
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +96,Knurling,Knurling
 DocType: Expense Claim,Approval Status,Statut d&#39;approbation
 DocType: Hub Settings,Publish Items to Hub,Publier les articles au Hub
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +44,From value must be less than to value in row {0},Parent Site Web page
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +133,Wire Transfer,Virement
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +133,Wire Transfer,Virement
 apps/erpnext/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py +25,Please select Bank Account,S&#39;il vous plaît sélectionner compte bancaire
 DocType: Newsletter,Create and Send Newsletters,Créer et envoyer des newsletters
 apps/frappe/frappe/public/js/frappe/views/reports/grid_report.js +305,From Date must be before To Date,Partir de la date doit être antérieure à ce jour
@@ -2582,14 +2490,14 @@
 DocType: Company,Default Income Account,Compte d'exploitation
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,Groupe de client / client
 DocType: Item Group,Check this if you want to show in website,Cochez cette case si vous souhaitez afficher sur le site
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +190,Welcome to ERPNext,Bienvenue à ERPNext
+,Welcome to ERPNext,Bienvenue à ERPNext
 DocType: Payment Reconciliation Payment,Voucher Detail Number,Bon nombre de Détail
-apps/erpnext/erpnext/config/crm.py +146,Lead to Quotation,Conduire à Devis
+apps/erpnext/erpnext/config/crm.py +146,Lead to Quotation,Délai pour Devis
 DocType: Lead,From Customer,Du client
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +37,Calls,appels
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Calls,appels
 DocType: Project,Total Costing Amount (via Time Logs),Montant total Costing (via Time Logs)
 DocType: Purchase Order Item Supplied,Stock UOM,Stock UDM
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Purchase Order {0} is not submitted,entrer une valeur
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +194,Purchase Order {0} is not submitted,entrer une valeur
 ,Projected,Projection
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},Les paramètres par défaut pour les transactions boursières .
 apps/erpnext/erpnext/controllers/status_updater.py +136,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Remarque : Le système ne vérifie pas sur - livraison et la sur- réservation pour objet {0} que la quantité ou le montant est égal à 0
@@ -2597,7 +2505,6 @@
 DocType: Issue,Opening Date,Date d&#39;ouverture
 DocType: Journal Entry,Remark,Remarque
 DocType: Purchase Receipt Item,Rate and Amount,Taux et le montant
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +95,Boring,Ennuyeux
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +667,From Sales Order,De Sales Order
 DocType: Blog Category,Parent Website Route,Montant de l'impôt après réduction Montant
 DocType: Sales Order,Not Billed,Non Facturé
@@ -2611,19 +2518,17 @@
 apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount Amount,S'il vous plaît tirer des articles de livraison Note
 DocType: Purchase Invoice,Return Against Purchase Invoice,Retour contre la facture d&#39;achat
 DocType: Item,Warranty Period (in days),Période de garantie (en jours)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +550,e.g. VAT,par exemple TVA
+apps/erpnext/erpnext/public/js/setup_wizard.js +292,e.g. VAT,par exemple TVA
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,Point 4
 DocType: Journal Entry Account,Journal Entry Account,Compte Entrée Journal
-DocType: Shopping Cart Settings,Quotation Series,Devis série
+DocType: Shopping Cart Settings,Quotation Series,Soumission série
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +52,"An item exists with same name ({0}), please change the item group name or rename the item","Un article existe avec le même nom ({0}), changez le groupe de l'article ou renommez l'article SVP"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +82,Hot metal gas forming,Hot gaz de formage des métaux
 DocType: Sales Order Item,Sales Order Date,Date de Commande
 DocType: Sales Invoice Item,Delivered Qty,Qté livrée
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +63,Warehouse {0}: Company is mandatory,Entrepôt {0}: Société est obligatoire
 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.",Aller au groupe approprié (généralement source de fonds&gt; Passif à court terme&gt; Impôts et taxes et de créer un nouveau compte (en cliquant sur Ajouter un enfant) de type «impôt» et faire mentionner le taux de l&#39;impôt.
 ,Payment Period Based On Invoice Date,Période de paiement basé sur Date de la facture
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +50,Missing Currency Exchange Rates for {0},Manquant Taux de change pour {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +135,Laser cutting,Découpe laser
 DocType: Event,Monday,Lundi
 DocType: Journal Entry,Stock Entry,Entrée Stock
 DocType: Account,Payable,Impôt sur le revenu
@@ -2646,7 +2551,7 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +46,Min Qty can not be greater than Max Qty,Quantité de minute ne peut être supérieure à Max Quantité
 DocType: Stock Entry,Customer or Supplier Details,Client ou fournisseur détails
 apps/frappe/frappe/core/page/permission_manager/permission_manager.js +428,Set,Série est obligatoire
-DocType: Lead,Lead Owner,Conduire du propriétaire
+DocType: Lead,Lead Owner,Propriétaire du prospect
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +248,Warehouse is required,Entrepôt est nécessaire
 DocType: Employee,Marital Status,État civil
 DocType: Stock Settings,Auto Material Request,Auto Demande de Matériel
@@ -2656,7 +2561,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +111,Date Of Retirement must be greater than Date of Joining,Date de la retraite doit être supérieure à date d'adhésion
 DocType: Sales Invoice,Against Income Account,Sur le compte des revenus
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +69,{0}% Delivered,{0}% Livré
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +78,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Point {0}: Quantité commandée {1} ne peut pas être inférieure à commande minimum qté {2} (défini au point).
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Point {0}: Quantité commandée {1} ne peut pas être inférieure à commande minimum qté {2} (défini au point).
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Répartition mensuelle Pourcentage
 DocType: Territory,Territory Targets,Les objectifs du Territoire
 DocType: Delivery Note,Transporter Info,Infos Transporteur
@@ -2665,7 +2570,6 @@
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,Titres pour les modèles d'impression par exemple Facture proforma.
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +140,Valuation type charges can not marked as Inclusive,charges de type d&#39;évaluation ne peuvent pas marqué comme Inclusive
 DocType: POS Profile,Update Stock,Mise à jour Stock
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +128,Superfinishing,Superfinition
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,Différents Emballage des articles mènera à incorrects (Total ) Valeur de poids . Assurez-vous que poids net de chaque article se trouve dans la même unité de mesure .
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,Taux BOM
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +85,Please pull items from Delivery Note,POS- Cadre . #
@@ -2680,7 +2584,6 @@
 ,Purchase Analytics,Les analyses des achats
 DocType: Sales Invoice Item,Delivery Note Item,Point de Livraison
 DocType: Expense Claim,Task,Tâche
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +57,Shaving,Rasage
 DocType: Purchase Taxes and Charges,Reference Row #,Ligne de référence #
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},Le numéro de lot est obligatoire pour objet {0}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js +14,This is a root sales person and cannot be edited.,Il s'agit d'une personne de ventes de racines et ne peut être modifié .
@@ -2692,13 +2595,11 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +74,Purpose must be one of {0},L'objectif doit être l'un des {0}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +108,Fill the form and save it,Remplissez le formulaire et l'enregistrer
 DocType: Production Planning Tool,Download a report containing all raw materials with their latest inventory status,Télécharger un rapport contenant toutes les matières premières avec leur dernier état des stocks
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +94,Facing,Parement
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,Communauté Forum
 DocType: Leave Application,Leave Balance Before Application,Laisser Solde Avant d&#39;application
 DocType: SMS Center,Send SMS,Envoyer un SMS
 DocType: Company,Default Letter Head,Par défaut Lettre Head
 DocType: Time Log,Billable,Facturable
-DocType: Authorization Rule,This will be used for setting rule in HR module,Il sera utilisé pour la règle de réglage dans le module RH
 DocType: Account,Rate at which this tax is applied,Vitesse à laquelle cet impôt est appliqué
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reorder Qty,Réorganiser Quantité
 DocType: Company,Stock Adjustment Account,Compte d&#39;ajustement de stock
@@ -2725,16 +2626,15 @@
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,Pourcentage allocation doit être égale à 100 %
 DocType: Serial No,Out of AMC,Sur AMC
 DocType: Purchase Order Item,Material Request Detail No,Détail Demande Support Aucun
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +97,Hard turning,Le tournage dur
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +33,Make Maintenance Visit,Assurez visite d'entretien
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +187,Please contact to the user who have Sales Master Manager {0} role,Se il vous plaît contacter à l'utilisateur qui ont Sales Master Chef {0} rôle
 DocType: Company,Default Cash Account,Compte caisse
 apps/erpnext/erpnext/config/accounts.py +79,Company (not Customer or Supplier) master.,Configuration de l'entreprise 
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +106,Please enter 'Expected Delivery Date',S'il vous plaît entrer « Date de livraison prévue '
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +187,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Quantité en ligne {0} ( {1} ) doit être la même que la quantité fabriquée {2}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +100,Please enter 'Expected Delivery Date',S'il vous plaît entrer « Date de livraison prévue '
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +182,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Quantité en ligne {0} ( {1} ) doit être la même que la quantité fabriquée {2}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +373,Paid amount + Write Off Amount can not be greater than Grand Total,Comptes provisoires ( passif)
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} n'est pas un numéro de lot valable pour l'objet {1}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,Note: There is not enough leave balance for Leave Type {0},S'il vous plaît spécifier un ID de ligne valide pour {0} en ligne {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +124,Note: There is not enough leave balance for Leave Type {0},S'il vous plaît spécifier un ID de ligne valide pour {0} en ligne {1}
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +9,"Note: If payment is not made against any reference, make Journal Entry manually.","Remarque: Si le paiement ne est pas faite contre toute référence, assurez Journal entrée manuellement."
 DocType: Item,Supplier Items,Fournisseur Articles
 DocType: Opportunity,Opportunity Type,Type d&#39;opportunité
@@ -2746,7 +2646,7 @@
 DocType: Hub Settings,Publish Availability,Publier Disponibilité
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +105,Date of Birth cannot be greater than today.,Date de naissance ne peut pas être supérieure à aujourd&#39;hui.
 ,Stock Ageing,Stock vieillissement
-apps/erpnext/erpnext/controllers/accounts_controller.py +200,{0} '{1}' is disabled,{0} '{1}' est désactivée
+apps/erpnext/erpnext/controllers/accounts_controller.py +201,{0} '{1}' is disabled,{0} '{1}' est désactivée
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Définir comme Ouvrir
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Envoyer des e-mails automatiques aux contacts sur les transactions Soumission.
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +232,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
@@ -2756,44 +2656,38 @@
 DocType: Purchase Order,Customer Contact Email,Client Contact Courriel
 DocType: Event,Sunday,Dimanche
 DocType: Sales Team,Contribution (%),Contribution (%)
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +455,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,Casual congé
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +171,Responsibilities,Responsabilités
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +457,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,Casual congé
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +171,Responsibilities,Responsabilités
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Template,Modèle
 DocType: Sales Person,Sales Person Name,Nom Sales Person
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,recevable
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +511,Add Users,Ajouter des utilisateurs
+apps/erpnext/erpnext/public/js/setup_wizard.js +255,Add Users,Ajouter des utilisateurs
 DocType: Pricing Rule,Item Group,Groupe d&#39;éléments
 DocType: Task,Actual Start Date (via Time Logs),Date de début réelle (via Time Logs)
 DocType: Stock Reconciliation Item,Before reconciliation,Avant la réconciliation
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +12,To {0},A {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Les impôts et les frais supplémentaires (Société Monnaie)
-apps/erpnext/erpnext/stock/doctype/item/item.py +340,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,"La ligne ""Taxe sur l'Article"" {0} doit indiquer un compte de type Revenu ou Dépense ou Facturable"
+apps/erpnext/erpnext/stock/doctype/item/item.py +344,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,"La ligne ""Taxe sur l'Article"" {0} doit indiquer un compte de type Revenu ou Dépense ou Facturable"
 DocType: Sales Order,Partly Billed,Présentée en partie
 DocType: Item,Default BOM,Nomenclature par défaut
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +79,Decambering,Decambering
 apps/erpnext/erpnext/setup/doctype/company/company.js +22,Please re-type company name to confirm,S&#39;il vous plaît retaper nom de l&#39;entreprise pour confirmer
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,Encours total Amt
 DocType: Time Log Batch,Total Hours,Total des heures
 DocType: Journal Entry,Printing Settings,Réglages d&#39;impression
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +268,Total Debit must be equal to Total Credit. The difference is {0},Débit total doit être égal au total du crédit .
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +11,Automotive,automobile
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +37,Item is required,Point n'est nécessaire
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +25,Metal injection molding,moulage par injection de métal
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +258,Total Debit must be equal to Total Credit. The difference is {0},Débit total doit être égal au total du crédit .
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,automobile
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +684,From Delivery Note,De bon de livraison
 DocType: Time Log,From Time,From Time
 DocType: Notification Control,Custom Message,Message personnalisé
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +33,Investment Banking,Banques d'investissement
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +261,"Select your Country, Time Zone and Currency","Sélectionnez votre pays, Fuseau horaire et devise"
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,Banques d'investissement
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +316,"Select your Country, Time Zone and Currency","Sélectionnez votre pays, Fuseau horaire et devise"
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +369,Cash or Bank Account is mandatory for making payment entry,N ° de série {0} a déjà été reçu
 DocType: Purchase Invoice,Price List Exchange Rate,Taux de change Prix de liste
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +91,Pickling,Décapage
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +18,Sand casting,Moulage en sable
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +117,Electroplating,Electroplating
 DocType: Purchase Invoice Item,Rate,Taux
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +62,Intern,interne
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Intern,interne
 DocType: Newsletter,A Lead with this email id should exist,Un responsable de cet identifiant de courriel doit exister
 DocType: Stock Entry,From BOM,De BOM
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +34,Basic,de base
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +34,Basic,de base
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,transactions d'actions avant {0} sont gelés
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +217,Please click on 'Generate Schedule',"S'il vous plaît cliquer sur "" Générer annexe '"
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +61,To Date should be same as From Date for Half Day leave,Pour la date doit être le même que Date d' autorisation pour une demi-journée
@@ -2801,11 +2695,11 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +96,Reference No is mandatory if you entered Reference Date,"Centre de coûts est nécessaire pour compte » de profits et pertes "" {0}"
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +108,Date of Joining must be greater than Date of Birth,enregistrement précédent
 DocType: Salary Structure,Salary Structure,Grille des salaires
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +242,"Multiple Price Rule exists with same criteria, please resolve \
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +246,"Multiple Price Rule exists with same criteria, please resolve \
 			conflict by assigning priority. Price Rules: {0}","Multiple règle de prix existe avec les mêmes critères, se il vous plaît résoudre \
  conflit en attribuant des priorités. Règles Prix: {0}"
 DocType: Account,Bank,Banque
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +9,Airline,compagnie aérienne
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,compagnie aérienne
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +493,Issue Material,Material Issue
 DocType: Material Request Item,For Warehouse,Pour Entrepôt
 DocType: Employee,Offer Date,Date de l'offre
@@ -2815,29 +2709,24 @@
 DocType: Item,Is Fixed Asset Item,Est- Fixed Asset article
 DocType: Stock Entry,Including items for sub assemblies,Incluant les éléments pour des sous-ensembles
 DocType: Features Setup,"If you have long print formats, this feature can be used to split the page to be printed on multiple pages with all headers and footers on each page","Si vous avez longtemps imprimer des formats, cette fonction peut être utilisée pour diviser la page à imprimer sur plusieurs pages avec tous les en-têtes et pieds de page sur chaque page"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +131,Hobbing,Hobbing
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +98,All Territories,Tous les secteurs
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +98,All Territories,Tous les secteurs
 DocType: Purchase Invoice,Items,Articles
 DocType: Fiscal Year,Year Name,Nom Année
 DocType: Process Payroll,Process Payroll,processus de paye
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +59,There are more holidays than working days this month.,Compte de capital
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +68,There are more holidays than working days this month.,Compte de capital
 DocType: Product Bundle Item,Product Bundle Item,Produit Bundle Point
 DocType: Sales Partner,Sales Partner Name,Nom Sales Partner
 DocType: Purchase Invoice Item,Image View,Voir l&#39;image
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +113,Finishing & industrial finishing,Finition &amp; finition industrielle
 DocType: Issue,Opening Time,Ouverture Heure
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,De et la date exigée
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +46,Securities & Commodity Exchanges,Valeurs mobilières et des bourses de marchandises
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Valeurs mobilières et des bourses de marchandises
 DocType: Shipping Rule,Calculate Based On,Calculer en fonction
 DocType: Delivery Note Item,From Warehouse,De Entrepôt
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +98,Drilling,Forage
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +28,Blow molding,Soufflage
 DocType: Purchase Taxes and Charges,Valuation and Total,Valorisation et Total
 DocType: Tax Rule,Shipping City,Ville de livraison
 apps/erpnext/erpnext/stock/doctype/item/item.js +43,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,Cet article est une variante de {0} (Template). Attributs seront copiés à partir du modèle à moins 'No Copy »est réglé
 DocType: Account,Purchase User,Achat utilisateur
 DocType: Notification Control,Customize the Notification,Personnaliser la notification
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +87,Hammering,Martelage
 DocType: Web Page,Slideshow,Diaporama
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +24,Default Address Template cannot be deleted,Adresse par défaut modèle ne peut pas être supprimé
 DocType: Sales Invoice,Shipping Rule,Livraison règle
@@ -2846,9 +2735,8 @@
 DocType: Workflow State,Search,Rechercher
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +54,Total cannot be zero,Total ne peut pas être zéro
 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,'Jours depuis la dernière commande' doit être supérieur ou égale à zéro
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +142,Brazing,Brasage
 DocType: C-Form,Amended From,Modifié depuis
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Raw Material,Matières premières
+apps/erpnext/erpnext/public/js/setup_wizard.js +359,Raw Material,Matières premières
 DocType: Leave Application,Follow via Email,Suivez par e-mail
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Aucun article avec Barcode {0}
 apps/erpnext/erpnext/accounts/doctype/account/account.py +174,Child account exists for this account. You can not delete this account.,Les matières premières ne peut pas être le même que l'article principal
@@ -2862,10 +2750,10 @@
 ,Produced,produit
 DocType: Item,Item Code for Suppliers,Code de l&#39;article pour les fournisseurs
 DocType: Issue,Raised By (Email),Raised By (e-mail)
-apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +72,General,Général
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +495,Attach Letterhead,Joindre l'entête
+apps/erpnext/erpnext/setup/setup_wizard/default_website.py +72,General,Général
+apps/erpnext/erpnext/public/js/setup_wizard.js +241,Attach Letterhead,Joindre l'entête
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +272,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',"Vous ne pouvez pas déduire lorsqu'une catégorie est pour « évaluation » ou « évaluation et Total """
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +542,"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.","Inscrivez vos têtes d&#39;impôt (par exemple, la TVA, douanes, etc., ils doivent avoir des noms uniques) et leurs taux standard. Cela va créer un modèle standard, que vous pouvez modifier et ajouter plus tard."
+apps/erpnext/erpnext/public/js/setup_wizard.js +284,"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.","Inscrivez vos têtes d&#39;impôt (par exemple, la TVA, douanes, etc., ils doivent avoir des noms uniques) et leurs taux standard. Cela va créer un modèle standard, que vous pouvez modifier et ajouter plus tard."
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial Nos Required for Serialized Item {0},Dupliquer entrée . S'il vous plaît vérifier une règle d'autorisation {0}
 DocType: Journal Entry,Bank Entry,Entrée de la Banque
 DocType: Authorization Rule,Applicable To (Designation),Applicable à (désignation)
@@ -2874,33 +2762,32 @@
 apps/erpnext/erpnext/config/accounts.py +143,Enable / disable currencies.,Activer / Désactiver la devise
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Postal Expenses,Frais postaux
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Total (Montant)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +26,Entertainment & Leisure,Entertainment & Leisure
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,Entertainment & Leisure
 DocType: Purchase Order,The date on which recurring order will be stop,La date à laquelle commande récurrente sera arrêter
 DocType: Quality Inspection,Item Serial No,N° de série
 apps/erpnext/erpnext/controllers/status_updater.py +142,{0} must be reduced by {1} or you should increase overflow tolerance,{0} doit être réduite par {1} ou vous devez augmenter la tolérance de dépassement
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Present,Présent total
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Hour,heure
+apps/erpnext/erpnext/public/js/setup_wizard.js +363,Hour,heure
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +138,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation","Point sérialisé {0} ne peut pas être mis à jour en utilisant \
  Stock réconciliation"
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +488,Transfer Material to Supplier,Transfert de matériel au fournisseur
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +513,Transfer Material to Supplier,Transfert de matériel au fournisseur
 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,S'il vous plaît créer clientèle de plomb {0}
-DocType: Lead,Lead Type,Type de câbles
+DocType: Lead,Lead Type,Type de prospect
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +82,Create Quotation,créer offre
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +306,All these items have already been invoiced,Tous ces articles ont déjà été facturés
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,You are not authorized to approve leaves on Block Dates,Vous n&#39;êtes pas autorisé à approuver les congés sur les dates de bloc
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +311,All these items have already been invoiced,Tous ces articles ont déjà été facturés
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},Peut être approuvé par {0}
 DocType: Shipping Rule,Shipping Rule Conditions,Règle expédition Conditions
 DocType: BOM Replace Tool,The new BOM after replacement,La nouvelle nomenclature après le remplacement
 DocType: Features Setup,Point of Sale,Point de vente
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +83,Curling,Curling
 DocType: Account,Tax,Impôt
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +28,Row {0}: {1} is not a valid {2},Row {0}: {1} ne est pas valide {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +89,Refining,Raffinage
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +37,Row {0}: {1} is not a valid {2},Row {0}: {1} ne est pas valide {2}
 DocType: Production Planning Tool,Production Planning Tool,Outil de planification de la production
 DocType: Quality Inspection,Report Date,Date du rapport
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +130,Routing,Routage
 DocType: C-Form,Invoices,Factures
 DocType: Job Opening,Job Title,Titre de l'emploi
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +54,{0} already allocated for Employee {1} for period {2} - {3},{0} déjà alloué pour les employés {1} pour la période {2} - {3}
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +80,{0} Recipients,{0} destinataire(s)
 DocType: Features Setup,Item Groups in Details,Groupes d&#39;articles en détails
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +335,Quantity to Manufacture must be greater than 0.,Quantité de Fabrication doit être supérieur à 0.
@@ -2913,19 +2800,18 @@
 DocType: Item,Website Description,Description du site Web
 DocType: Serial No,AMC Expiry Date,AMC Date d&#39;expiration
 ,Sales Register,Registre des ventes
-DocType: Quotation,Quotation Lost Reason,Devis perdu la raison
+DocType: Quotation,Quotation Lost Reason,Soumission perdu la raison
 DocType: Address,Plant,Plante
 DocType: DocType,Setup,Configuration
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,Il n'y a rien à modifier.
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +108,Summary for this month and pending activities,Résumé pour ce mois et les activités en suspens
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +39,Cold rolling,Laminage à froid
 DocType: Customer Group,Customer Group Name,Nom du groupe client
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +408,Please remove this Invoice {0} from C-Form {1},Se il vous plaît supprimer ce Facture {0} de C-Form {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +410,Please remove this Invoice {0} from C-Form {1},Se il vous plaît supprimer ce Facture {0} de C-Form {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,S&#39;il vous plaît sélectionnez Report si vous souhaitez également inclure le solde de l&#39;exercice précédent ne laisse à cet exercice
 DocType: GL Entry,Against Voucher Type,Sur le type de bon
 DocType: Item,Attributes,Attributs
 DocType: Packing Slip,Get Items,Obtenir les éléments
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +186,Please enter Write Off Account,S'il vous plaît entrer amortissent compte
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +187,Please enter Write Off Account,S'il vous plaît entrer amortissent compte
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +71,Last Order Date,Dernière date de commande
 DocType: DocField,Image,Image
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +179,Make Excise Invoice,Faire accise facture
@@ -2935,7 +2821,7 @@
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +146,Operation ID not set,Opération carte d&#39;identité pas réglé
 DocType: Production Order,Planned Start Date,Date de début prévue
 DocType: Serial No,Creation Document Type,Type de document de création
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +620,Maint. Visit,Maint. Visite
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +631,Maint. Visit,Maint. Visite
 DocType: Leave Type,Is Encash,Est encaisser
 DocType: Purchase Invoice,Mobile No,N° mobile
 DocType: Payment Tool,Make Journal Entry,Assurez Journal Entrée
@@ -2943,35 +2829,31 @@
 apps/erpnext/erpnext/controllers/trends.py +257,Project-wise data is not available for Quotation,alloué avec succès
 DocType: Project,Expected End Date,Date de fin prévue
 DocType: Appraisal Template,Appraisal Template Title,Titre modèle d&#39;évaluation
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +440,Commercial,Reste du monde
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +378,Commercial,Reste du monde
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +23,Parent Item {0} must not be a Stock Item,Parent Item {0} ne doit pas être un élément de Stock
 DocType: Cost Center,Distribution Id,Id distribution
-apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +14,Awesome Services,Services impressionnants
+apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +14,Awesome Services,Services impressionnants
 apps/erpnext/erpnext/config/manufacturing.py +29,All Products or Services.,Tous les produits ou services.
 DocType: Purchase Invoice,Supplier Address,Adresse du fournisseur
 DocType: Contact Us Settings,Address Line 2,Adresse ligne 2
 DocType: ToDo,Reference,Référence
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +59,Perforating,Perforateur
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,out Quantité
 apps/erpnext/erpnext/config/accounts.py +128,Rules to calculate shipping amount for a sale,Règles de calcul du montant de l&#39;expédition pour une vente
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +29,Series is mandatory,Congé de type {0} ne peut pas être plus long que {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +28,Financial Services,services financiers
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,services financiers
 apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3},Valeur pour l&#39;attribut {0} doit être dans la gamme de {1} à {2} dans les incréments de {3}
 DocType: Tax Rule,Sales,Ventes
 DocType: Stock Entry Detail,Basic Amount,Montant de base
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +173,Warehouse required for stock Item {0},{0} est obligatoire
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +178,Warehouse required for stock Item {0},{0} est obligatoire
 DocType: Leave Allocation,Unused leaves,Feuilles inutilisées
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,Cr
 DocType: Customer,Default Receivable Accounts,Par défaut Débiteurs
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +102,Sawing,Sciage
 DocType: Tax Rule,Billing State,État de facturation
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +32,Laminating,Laminage
 DocType: Item Reorder,Transfer,Transférer
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +549,Fetch exploded BOM (including sub-assemblies),Fetch nomenclature éclatée ( y compris les sous -ensembles )
 DocType: Authorization Rule,Applicable To (Employee),Applicable aux (Employé)
 apps/erpnext/erpnext/controllers/accounts_controller.py +101,Due Date is mandatory,Date d&#39;échéance est obligatoire
 apps/erpnext/erpnext/controllers/item_variant.py +51,Increment for Attribute {0} cannot be 0,Incrément pour attribut {0} ne peut pas être 0
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +143,Sintering,Frittage
 DocType: Journal Entry,Pay To / Recd From,Pay To / RECD De
 DocType: Naming Series,Setup Series,Série de configuration
 DocType: Supplier,Contact HTML,Contacter HTML
@@ -2984,7 +2866,6 @@
 DocType: Attendance,Absent,Absent
 DocType: Product Bundle,Product Bundle,Bundle de produit
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +180,Row {0}: Invalid reference {1},Row {0}: référence non valide {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +165,Crushing,Écrasement
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Achetez Taxes et frais Template
 DocType: Upload Attendance,Download Template,Télécharger le modèle
 DocType: GL Entry,Remarks,Remarques
@@ -2992,14 +2873,12 @@
 DocType: Journal Entry,Write Off Based On,Ecrire Off Basé sur
 DocType: Features Setup,POS View,POS View
 apps/erpnext/erpnext/config/stock.py +38,Installation record for a Serial No.,N° de série pour un dossier d'installation 
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +9,Continuous casting,Coulée continue
 apps/erpnext/erpnext/public/js/queries.js +39,Please specify a,Veuillez spécifier un
 DocType: Offer Letter,Awaiting Response,En attente de réponse
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +53,Above,Au dessus
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +80,Cold sizing,Dimensionnement froide
 DocType: Salary Slip,Earning & Deduction,Gains et déduction
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +76,Account {0} cannot be a Group,Compte {0} ne peut pas être un groupe
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +259,Region,Région
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +314,Region,Région
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +213,Optional. This setting will be used to filter in various transactions.,Facultatif. Ce paramètre sera utilisé pour filtrer dans diverses opérations .
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +104,Negative Valuation Rate is not allowed,Négatif évaluation Taux n'est pas autorisé
 DocType: Holiday List,Weekly Off,Hebdomadaire Off
@@ -3017,7 +2896,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,Account {0} is inactive,Le compte {0} est inactif
 DocType: GL Entry,Is Advance,Est-Advance
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,Participation Date de début et de présence à ce jour est obligatoire
-apps/erpnext/erpnext/controllers/buying_controller.py +131,Please enter 'Is Subcontracted' as Yes or No,{0} {1} contre facture {1}
+apps/erpnext/erpnext/controllers/buying_controller.py +122,Please enter 'Is Subcontracted' as Yes or No,{0} {1} contre facture {1}
 DocType: Sales Team,Contact No.,Contactez No.
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,'Profit and Loss' type account {0} not allowed in Opening Entry,Le compte {0} de type 'profit et pertes' n'est pas permis dans une ouverture d'entrée.
 DocType: Workflow State,Time,Temps
@@ -3026,14 +2905,13 @@
 DocType: Authorization Rule,Authorization Rule,Règle d&#39;autorisation
 DocType: Sales Invoice,Terms and Conditions Details,Termes et Conditions Détails
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,Taxes de vente et frais Template
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +10,Apparel & Accessories,Vêtements & Accessoires
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,Vêtements & Accessoires
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +67,Number of Order,Nombre de l'ordre
 DocType: Item Group,HTML / Banner that will show on the top of product list.,HTML / bannière qui apparaîtra sur le haut de la liste des produits.
 DocType: Shipping Rule,Specify conditions to calculate shipping amount,Préciser les conditions pour calculer le montant de l'expédition
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +121,Add Child,Ajouter un enfant
 DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,Rôle autorisés à fixer congelés Comptes et modifier les entrées congelés
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +52,Cannot convert Cost Center to ledger as it has child nodes,Vous ne pouvez pas convertir le centre de coûts à livre car il possède des nœuds enfant
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +47,Conversion Factor is required,Facture de vente {0} a déjà été soumis
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +37,Serial #,Serial #
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +87,Commission on Sales,Commission sur les ventes
 DocType: Offer Letter Term,Value / Description,Valeur / Description
@@ -3041,10 +2919,8 @@
 ,Customers Not Buying Since Long Time,Les clients ne pas acheter Depuis Long Time
 DocType: Production Order,Expected Delivery Date,Date de livraison prévue
 apps/erpnext/erpnext/accounts/general_ledger.py +121,Debit and Credit not equal for {0} #{1}. Difference is {2}.,De débit et de crédit pas égale pour {0} # {1}. La différence est {2}.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +48,Bulging,Renflé
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +11,Evaporative-pattern casting,Évaporation motif coulée
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Entertainment Expenses,Frais de représentation
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +195,Sales Invoice {0} must be cancelled before cancelling this Sales Order,Montant du rabais
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +190,Sales Invoice {0} must be cancelled before cancelling this Sales Order,Montant du rabais
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +61,Age,Âge
 DocType: Time Log,Billing Amount,Montant de facturation
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +84,Invalid quantity specified for item {0}. Quantity should be greater than 0.,Quantité spécifiée non valide pour l'élément {0} . Quantité doit être supérieur à 0 .
@@ -3063,46 +2939,42 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,New Revenu clientèle
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Travel Expenses,Code article nécessaire au rang n ° {0}
 DocType: Maintenance Visit,Breakdown,Panne
-apps/erpnext/erpnext/controllers/accounts_controller.py +241,Account: {0} with currency: {1} can not be selected,Compte: {0} avec la monnaie: {1} ne peut pas être sélectionné
+apps/erpnext/erpnext/controllers/accounts_controller.py +242,Account: {0} with currency: {1} can not be selected,Compte: {0} avec la monnaie: {1} ne peut pas être sélectionné
 DocType: Bank Reconciliation Detail,Cheque Date,Date de chèques
 apps/erpnext/erpnext/accounts/doctype/account/account.py +47,Account {0}: Parent account {1} does not belong to company: {2},Compte {0}: le compte parent {1} n'appartient pas à l'entreprise: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted all transactions related to this company!,Supprimé avec succès toutes les transactions liées à cette société!
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,Comme le Date
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +111,Honing,Honing
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +58,Probation,probation
-apps/erpnext/erpnext/stock/doctype/item/item.py +264,Default Warehouse is mandatory for stock Item.,{0} {1} contre le projet de loi {2} du {3}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Probation,probation
+apps/erpnext/erpnext/stock/doctype/item/item.py +268,Default Warehouse is mandatory for stock Item.,{0} {1} contre le projet de loi {2} du {3}
 DocType: Feed,Full Name,Nom et Prénom
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +148,Clinching,Clinchage
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +191,Payment of salary for the month {0} and year {1},Centre de coûts est nécessaire à la ligne {0} dans le tableau des impôts pour le type {1}
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +173,Payment of salary for the month {0} and year {1},Centre de coûts est nécessaire à la ligne {0} dans le tableau des impôts pour le type {1}
 DocType: Stock Settings,Auto insert Price List rate if missing,Insertion automatique de taux de la liste de prix si manquante
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,Montant total payé
 ,Transferred Qty,Quantité transféré
 apps/erpnext/erpnext/config/learn.py +11,Navigating,Naviguer
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +137,Planning,planification
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +137,Planning,planification
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +9,Make Time Log Batch,Prenez le temps Connexion lot
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Issued,Publié
 DocType: Project,Total Billing Amount (via Time Logs),Montant total de la facturation (via Time Logs)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +629,We sell this Item,Nous vendons cet article
+apps/erpnext/erpnext/public/js/setup_wizard.js +365,We sell this Item,Nous vendons cet article
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +65,Supplier Id,Fournisseur Id
 DocType: Journal Entry,Cash Entry,Cash Prix d'entrée
-DocType: Sales Partner,Contact Desc,Contacter Desc
+DocType: Sales Partner,Contact Desc,Contact Desc
 apps/erpnext/erpnext/config/hr.py +135,"Type of leaves like casual, sick etc.","Type de feuilles comme occasionnel, etc malades"
 DocType: Email Digest,Send regular summary reports via Email.,Envoyer des rapports réguliers sommaires par e-mail.
 DocType: Brand,Item Manager,Item Manager
 DocType: Cost Center,Add rows to set annual budgets on Accounts.,Ajoutez des lignes pour établir des budgets annuels sur des comptes.
 DocType: Buying Settings,Default Supplier Type,Fournisseur Type par défaut
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +160,Quarrying,Carrières
 DocType: Production Order,Total Operating Cost,Coût d&#39;exploitation total
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +160,Note: Item {0} entered multiple times,Stock ne peut pas être mis à jour contre livraison Remarque {0}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +163,Note: Item {0} entered multiple times,Stock ne peut pas être mis à jour contre livraison Remarque {0}
 apps/erpnext/erpnext/config/crm.py +27,All Contacts.,Tous les contacts.
 DocType: Newsletter,Test Email Id,Id Test Email
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +394,Company Abbreviation,Abréviation de l'entreprise
+apps/erpnext/erpnext/public/js/setup_wizard.js +142,Company Abbreviation,Abréviation de l'entreprise
 DocType: Features Setup,If you follow Quality Inspection. Enables Item QA Required and QA No in Purchase Receipt,Si vous suivez contrôle de la qualité . Permet article AQ requis et AQ Pas de ticket de caisse
 DocType: GL Entry,Party Type,Type de partie
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +68,Raw material cannot be same as main Item,Point {0} ignoré car il n'est pas un article en stock
 DocType: Item Attribute Value,Abbreviation,Abréviation
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,{0} {1} a été modifié . S'il vous plaît Actualiser
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +30,Rotational molding,Le rotomoulage
 apps/erpnext/erpnext/config/hr.py +115,Salary template master.,Maître de modèle de salaires .
 DocType: Leave Type,Max Days Leave Allowed,Laisser jours Max admis
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +55,Set Tax Rule for shopping cart,Définissez la règle d&#39;impôt pour panier
@@ -3113,18 +2985,18 @@
 apps/erpnext/erpnext/shopping_cart/utils.py +33,Cart,Chariot
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +136,Thank you for your interest in subscribing to our updates,Merci de votre intérêt pour vous abonnant à nos mises à jour
 ,Qty to Transfer,Qté à Transférer
-apps/erpnext/erpnext/config/selling.py +18,Quotes to Leads or Customers.,Citations à prospects ou clients.
+apps/erpnext/erpnext/config/selling.py +18,Quotes to Leads or Customers.,Soumission à prospects ou clients.
 DocType: Stock Settings,Role Allowed to edit frozen stock,Rôle autorisés à modifier stock congelé
 ,Territory Target Variance Item Group-Wise,Entretien Visitez {0} doit être annulée avant d'annuler cette commande client
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +101,All Customer Groups,Tous les groupes client
-apps/erpnext/erpnext/controllers/accounts_controller.py +474,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} est obligatoire. Peut-être que l'échange monétaire n'est pas créé pour {1} et {2}.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +101,All Customer Groups,Tous les groupes client
+apps/erpnext/erpnext/controllers/accounts_controller.py +475,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} est obligatoire. Peut-être que l'échange monétaire n'est pas créé pour {1} et {2}.
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +37,Tax Template is mandatory.,Modèle d&#39;impôt est obligatoire.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +41,Account {0}: Parent account {1} does not exist,Compte {0}: Le Compte parent {1} n'existe pas
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Tarifs Taux (Société Monnaie)
 DocType: Account,Temporary,Temporaire
 DocType: Address,Preferred Billing Address,Préféré adresse de facturation
 DocType: Monthly Distribution Percentage,Percentage Allocation,Répartition en pourcentage
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +86,Secretary,secrétaire
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Secretary,secrétaire
 DocType: Serial No,Distinct unit of an Item,Unité distincte d'un élément
 DocType: Pricing Rule,Buying,Achat
 DocType: HR Settings,Employee Records to be created by,Dossiers sur les employés à être créées par
@@ -3137,9 +3009,8 @@
 ,Item-wise Price List Rate,Article sage Prix Tarif
 DocType: Purchase Order Item,Supplier Quotation,Devis Fournisseur
 DocType: Quotation,In Words will be visible once you save the Quotation.,Dans les mots seront visibles une fois que vous enregistrez le devis.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +68,Ironing,Repassage
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is stopped,{0} {1} est arrêté
-apps/erpnext/erpnext/stock/doctype/item/item.py +352,Barcode {0} already used in Item {1},Le code barre {0} est déjà utilisé dans l'article {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +356,Barcode {0} already used in Item {1},Le code barre {0} est déjà utilisé dans l'article {1}
 DocType: Lead,Add to calendar on this date,Ajouter cette date au calendrier
 apps/erpnext/erpnext/config/selling.py +132,Rules for adding shipping costs.,S'il vous plaît entrer atleast une facture dans le tableau
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,évènements à venir
@@ -3148,13 +3019,12 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +27,Quick Entry,Entrée rapide
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0} est obligatoire pour le retour
 DocType: Purchase Order,To Receive,A Recevoir
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +33,Shrink fitting,Frettage
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +522,user@example.com,user@example.com
+apps/erpnext/erpnext/public/js/setup_wizard.js +266,user@example.com,user@example.com
 DocType: Email Digest,Income / Expense,Produits / charges
 DocType: Employee,Personal Email,Courriel personnel
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +58,Total Variance,Variance totale
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +62,Total Variance,Variance totale
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.","S&#39;il est activé, le système affichera les écritures comptables pour l&#39;inventaire automatiquement."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +15,Brokerage,courtage
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +15,Brokerage,courtage
 DocType: Address,Postal Code,Code Postal
 DocType: Production Order Operation,"in Minutes
 Updated via 'Time Log'","Mise à jour en quelques minutes 
@@ -3162,14 +3032,13 @@
 DocType: Customer,From Lead,Du plomb
 apps/erpnext/erpnext/config/manufacturing.py +19,Orders released for production.,Commandes validé pour la production.
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +42,Select Fiscal Year...,Sélectionnez Exercice ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +442,POS Profile required to make POS Entry,Profil POS nécessaire pour faire POS Entrée
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +444,POS Profile required to make POS Entry,Profil POS nécessaire pour faire POS Entrée
 DocType: Hub Settings,Name Token,Nom du jeton
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +106,Planing,Rabotage
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Selling,vente standard
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +120,Standard Selling,vente standard
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +137,Atleast one warehouse is mandatory,Au moins un entrepôt est obligatoire
 DocType: Serial No,Out of Warranty,Hors garantie
 DocType: BOM Replace Tool,Replace,Remplacer
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +314,{0} against Sales Invoice {1},{0} contre la facture de vente {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +316,{0} against Sales Invoice {1},{0} contre la facture de vente {1}
 apps/erpnext/erpnext/stock/doctype/item/item.py +49,Please enter default Unit of Measure,Entrepôt de cible dans la ligne {0} doit être la même que la production de commande
 DocType: Purchase Invoice Item,Project Name,Nom du projet
 DocType: Supplier,Mention if non-standard receivable account,Mentionner si créance non standard
@@ -3185,9 +3054,8 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,Journal Entry {0} does not have account {1} or already matched against other voucher,Journal entrée {0} n'a pas compte {1} ou déjà en correspondance avec une autre pièce justificative
 DocType: Item,Moving Average,Moyenne mobile
 DocType: BOM Replace Tool,The BOM which will be replaced,La nomenclature qui sera remplacé
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +43,New Stock UOM must be different from current stock UOM,Nouveau stock UDM doit être different de l'actuel stock UDM
 DocType: Account,Debit,Débit
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +34,Leaves must be allocated in multiples of 0.5,"Les feuilles doivent être alloués par multiples de 0,5"
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +44,Leaves must be allocated in multiples of 0.5,"Les feuilles doivent être alloués par multiples de 0,5"
 DocType: Production Order,Operation Cost,Coût de l'opération
 apps/erpnext/erpnext/config/hr.py +71,Upload attendance from a .csv file,Téléchargez la présence d&#39;un fichier. Csv
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,Exceptionnelle Amt
@@ -3205,8 +3073,7 @@
 DocType: Employee,Internal Work History,Histoire de travail interne
 DocType: DocField,Column Break,Saut de colonne
 DocType: Event,Thursday,Jeudi
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +42,Private Equity,Private Equity
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +93,Turning,Tournant
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,Private Equity
 DocType: Maintenance Visit,Customer Feedback,Réactions des clients
 DocType: Account,Expense,frais
 DocType: Sales Invoice,Exhibition,Exposition
@@ -3219,19 +3086,19 @@
 DocType: Employee,Held On,Tenu le
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +33,Production Item,Production Item
 ,Employee Information,Renseignements sur l&#39;employé
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,Rate (%),Taux (%)
+apps/erpnext/erpnext/public/js/setup_wizard.js +294,Rate (%),Taux (%)
 DocType: Stock Entry Detail,Additional Cost,Supplément
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +407,Financial Year End Date,Date de fin de l'exercice financier
+apps/erpnext/erpnext/public/js/setup_wizard.js +155,Financial Year End Date,Date de fin de l'exercice financier
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Voucher No, if grouped by Voucher","Impossible de filtrer sur la base Bon Non, si regroupés par Chèque"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +484,Make Supplier Quotation,Faire Fournisseur offre
 DocType: Quality Inspection,Incoming,Nouveau
 DocType: BOM,Materials Required (Exploded),Matériel nécessaire (éclatée)
 DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),Réduire Gagner de congé sans solde (PLT)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +512,"Add users to your organization, other than yourself","Ajouter des utilisateurs à votre organisation, autre que vous-même"
+apps/erpnext/erpnext/public/js/setup_wizard.js +256,"Add users to your organization, other than yourself","Ajouter des utilisateurs à votre organisation, autre que vous-même"
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No {1} does not match with {2} {3},Row # {0}: N ° de série {1} ne correspond pas à {2} {3}
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +44,Casual Leave,Règles d'application des prix et de ristournes .
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +44,Casual Leave,Règles d'application des prix et de ristournes .
 DocType: Batch,Batch ID,ID. du lot
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +334,Note: {0},Compte avec des nœuds enfants ne peut pas être converti en livre
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +336,Note: {0},Compte avec des nœuds enfants ne peut pas être converti en livre
 ,Delivery Note Trends,Bordereau de livraison Tendances
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +104,This Week's Summary,Résumé de la semaine
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +74,{0} must be a Purchased or Sub-Contracted Item in row {1},"{0} doit être un article ""Acheté"" ou ""Sous-traité"" à la ligne {1}"
@@ -3243,7 +3110,7 @@
 DocType: Purchase Receipt,Return Against Purchase Receipt,Retour contre Reçu d&#39;achat
 DocType: Purchase Order,To Bill,A facturer
 DocType: Material Request,% Ordered,% Commandé
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +61,Piecework,travail à la pièce
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Piecework,travail à la pièce
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +64,Avg. Buying Rate,Moy. Taux d'achat
 DocType: Task,Actual Time (in Hours),Temps réel (en heures)
 DocType: Employee,History In Company,Dans l&#39;histoire de l&#39;entreprise
@@ -3260,13 +3127,13 @@
 DocType: Opportunity,To Discuss,Pour discuter
 DocType: SMS Settings,SMS Settings,Paramètres SMS
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +60,Temporary Accounts,Comptes provisoires
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +155,Black,Noir
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Black,Noir
 DocType: BOM Explosion Item,BOM Explosion Item,Article éclatement de la nomenclature
 DocType: Account,Auditor,Auditeur
 DocType: Purchase Order,End date of current order's period,Date de fin de la période de commande en cours
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +17,Make Offer Letter,Assurez Lettre d&#39;offre
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +10,Return,Retour
-apps/erpnext/erpnext/stock/doctype/item/item.py +503,Default Unit of Measure for Variant must be same as Template,Unité de mesure pour la variante par défaut doit être la même comme modèle
+apps/erpnext/erpnext/stock/doctype/item/item.py +507,Default Unit of Measure for Variant must be same as Template,Unité de mesure pour la variante par défaut doit être la même comme modèle
 DocType: DocField,Fold,Plier
 DocType: Production Order Operation,Production Order Operation,Production ordre d'opération
 DocType: Pricing Rule,Disable,"Groupe ajoutée, rafraîchissant ..."
@@ -3277,13 +3144,12 @@
 DocType: Page,Page Name,Nom de la page
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +110,To Time must be greater than From Time,Time doit être supérieur From Time
 DocType: Journal Entry Account,Exchange Rate,Taux de change
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +465,Sales Order {0} is not submitted,Maximum {0} lignes autorisées
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +467,Sales Order {0} is not submitted,Maximum {0} lignes autorisées
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0}: Parent account {1} does not bolong to the company {2},Entrepôt {0}: compte de Parent {1} ne BOLONG à la société {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +124,Spindle finishing,La finition de la broche
 DocType: BOM,Last Purchase Rate,Purchase Rate Dernière
 DocType: Account,Asset,atout
 DocType: Project Task,Task ID,Groupe ID
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +395,"e.g. ""MC""","par exemple ""MC"""
+apps/erpnext/erpnext/public/js/setup_wizard.js +143,"e.g. ""MC""","par exemple ""MC"""
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,Stock cannot exist for Item {0} since has variants,Stock ne peut pas exister pour objet {0} a depuis variantes
 ,Sales Person-wise Transaction Summary,Sales Person-sage Résumé de la transaction
 DocType: System Settings,Time Zone,Fuseau horaire
@@ -3292,9 +3158,7 @@
 DocType: Monthly Distribution,Monthly Distribution Percentages,Les pourcentages de distribution mensuelle
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +16,The selected item cannot have Batch,L'élément sélectionné ne peut pas avoir lot
 DocType: Delivery Note,% of materials delivered against this Delivery Note,% Des matériaux livrés sur ce bon de livraison
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +151,Stapling,Agrafage
 DocType: Customer,Customer Details,Détails du client
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +105,Shaping,Façonner
 DocType: Employee,Reports to,Rapports au
 DocType: SMS Settings,Enter url parameter for receiver nos,Entrez le paramètre url pour nos récepteurs
 DocType: Sales Invoice,Paid Amount,Montant payé
@@ -3303,13 +3167,13 @@
 DocType: Item Variant,Item Variant,Point Variant
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +15,Setting this Address Template as default as there is no other default,"La définition de cette adresse modèle par défaut, car il n'ya pas d'autre défaut"
 apps/erpnext/erpnext/accounts/doctype/account/account.py +89,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Le solde du compte est déjà en débit, vous n'êtes pas autorisé à définir 'Doit être en équilibre' comme 'Crédit'"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +76,Quality Management,Gestion de la qualité
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Quality Management,Gestion de la qualité
 DocType: Production Planning Tool,Filter based on customer,Filtre basé sur le client
 DocType: Payment Tool Detail,Against Voucher No,Sur le bon n°
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +47,Please enter quantity for Item {0},Point {0} est annulée
 DocType: Employee External Work History,Employee External Work History,Antécédents de travail des employés externe
 DocType: Tax Rule,Purchase,Achat
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +34,Balance Qty,Qté soldée
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Balance Qty,Qté soldée
 DocType: Item Group,Parent Item Group,Groupe d&#39;éléments Parent
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +21,{0} for {1},{0} pour {1}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +96,Cost Centers,Centres de coûts
@@ -3319,12 +3183,12 @@
 DocType: Opportunity,Next Contact,Suivant Contactez
 DocType: Employee,Employment Type,Type d&#39;emploi
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,Facteur de conversion est requis
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +84,Application period cannot be across two alocation records,Période d&#39;application ne peut pas être sur deux dossiers de alocation
 DocType: Item Group,Default Expense Account,Compte de dépenses
 DocType: Employee,Notice (days),Avis ( jours )
 DocType: Page,Yes,Oui
 DocType: Tax Rule,Sales Tax Template,Modèle de la taxe de vente
 DocType: Employee,Encashment Date,Date de l&#39;encaissement
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +74,Electroforming,Electroformage
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +179,"Against Voucher Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Le type de bon doit être un de bon de commande, une facture d'achat ou une entrée du journal"
 DocType: Account,Stock Adjustment,Stock ajustement
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +34,Default Activity Cost exists for Activity Type - {0},Existe défaut Activité Coût pour le type d&#39;activité - {0}
@@ -3360,12 +3224,12 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,Descendre : {0}
 DocType: Company,Distribution,Répartition
 apps/erpnext/erpnext/public/js/pos/pos.html +36,Amount Paid,Montant payé
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +91,Project Manager,Chef de projet
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +72,Dispatch,envoi
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Project Manager,Chef de projet
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +72,Dispatch,envoi
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,Réduction de Max permis pour l'article: {0} {1} est%
 DocType: Customer,Default Taxes and Charges,Taxes et frais de défaut
 DocType: Account,Receivable,Impression et image de marque
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +268,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,Row # {0}: pas autorisé à changer de fournisseur que la commande d&#39;achat existe déjà
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +263,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,Row # {0}: pas autorisé à changer de fournisseur que la commande d&#39;achat existe déjà
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,Rôle qui est autorisé à soumettre des transactions qui dépassent les limites de crédit fixées.
 DocType: Sales Invoice,Supplier Reference,Référence fournisseur
 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.","Si elle est cochée, la nomenclature des sous-ensembles points seront examinés pour obtenir des matières premières. Sinon, tous les éléments du sous-ensemble sera traitée comme une matière première."
@@ -3373,8 +3237,8 @@
 DocType: Hub Settings,Seller Description,Vendeur description
 DocType: Employee Education,Qualification,Qualification
 DocType: Item Price,Item Price,Prix ​​de l&#39;article
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +48,Soap & Detergent,Savons et de Détergents
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +36,Motion Picture & Video,Motion Picture & Video
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +48,Soap & Detergent,Savons et de Détergents
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +36,Motion Picture & Video,Motion Picture & Video
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,ordonné
 DocType: Warehouse,Warehouse Name,Nom de l'entrepôt
 DocType: Naming Series,Select Transaction,Sélectionner Transaction
@@ -3383,7 +3247,6 @@
 DocType: BOM,Rate Of Materials Based On,Taux de matériaux à base
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,Analyse du support
 apps/erpnext/erpnext/accounts/doctype/accounts_settings/accounts_settings.py +27,Company is missing in warehouses {0},Société est manquant dans les entrepôts {0}
-DocType: Stock UOM Replace Utility,Stock UOM Replace Utility,Utilitaire Stock Remplacer Emballage
 DocType: POS Profile,Terms and Conditions,Termes et Conditions
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,To Date should be within the Fiscal Year. Assuming To Date = {0},Pour la date doit être dans l'exercice. En supposant à ce jour = {0}
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","Ici vous pouvez maintenir la hauteur, le poids, allergies, etc médicaux préoccupations"
@@ -3395,7 +3258,7 @@
 DocType: Sales Order Item,For Production,Pour la production
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +103,Please enter sales order in the above table,S'il vous plaît entrez la commande client dans le tableau ci-dessus
 DocType: Project Task,View Task,Voir Groupe
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +406,Your financial year begins on,Date de début de la période comptable
+apps/erpnext/erpnext/public/js/setup_wizard.js +154,Your financial year begins on,Date de début de la période comptable
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +46,Please enter Purchase Receipts,Se il vous plaît entrer achat reçus
 DocType: Sales Invoice,Get Advances Received,Obtenez Avances et acomptes reçus
 DocType: Email Digest,Add/Remove Recipients,Ajouter / supprimer des destinataires
@@ -3403,16 +3266,14 @@
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","Pour définir cette Année financière que par défaut , cliquez sur "" Définir par défaut """
 apps/erpnext/erpnext/config/support.py +54,Setup incoming server for support email id. (e.g. support@example.com),Configuration serveur entrant de soutien id e-mail . (par exemple support@example.com )
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,Qté non couverte
-apps/erpnext/erpnext/stock/doctype/item/item.py +528,Item variant {0} exists with same attributes,Variante d&#39;objet {0} existe avec les mêmes caractéristiques
+apps/erpnext/erpnext/stock/doctype/item/item.py +532,Item variant {0} exists with same attributes,Variante d&#39;objet {0} existe avec les mêmes caractéristiques
 DocType: Salary Slip,Salary Slip,Fiche de paye
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +116,Burnishing,Brunissage
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +54,'To Date' is required,'La date' est requise
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,'La date' est requise
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","Générer bordereaux des paquets à livrer. Utilisé pour notifier numéro de colis, le contenu du paquet et son poids."
 DocType: Sales Invoice Item,Sales Order Item,Poste de commande client
 DocType: Salary Slip,Payment Days,Jours de paiement
 DocType: BOM,Manage cost of operations,Gérer les coûts d&#39;exploitation
 DocType: Features Setup,Item Advanced,Article avancée
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +40,Hot rolling,Laminage à chaud
 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.","Lorsque l&#39;une des opérations contrôlées sont «soumis», un e-mail pop-up s&#39;ouvre automatiquement pour envoyer un courrier électronique à l&#39;associé &quot;Contact&quot; dans cette transaction, la transaction en pièce jointe. L&#39;utilisateur peut ou ne peut pas envoyer l&#39;e-mail."
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,Paramètres globaux
 DocType: Employee Education,Employee Education,Formation des employés
@@ -3425,25 +3286,23 @@
 DocType: Customer,Sales Team Details,Détails équipe de vente
 DocType: Expense Claim,Total Claimed Amount,Montant total réclamé
 apps/erpnext/erpnext/config/crm.py +22,Potential opportunities for selling.,Possibilités pour la vente.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +48,Sick Leave,{0} numéros de série valides pour objet {1}
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +174,Invalid {0},Non valide {0}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +48,Sick Leave,{0} numéros de série valides pour objet {1}
 DocType: Email Digest,Email Digest,Email Digest
 DocType: Delivery Note,Billing Address Name,Nom de l'adresse de facturation
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +22,Department Stores,Grands Magasins
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,Grands Magasins
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +40,System Balance,l'équilibre du système
 DocType: Workflow,Is Active,Est active
 apps/erpnext/erpnext/controllers/stock_controller.py +71,No accounting entries for the following warehouses,Pas d'entrées comptables pour les entrepôts suivants
 apps/erpnext/erpnext/projects/doctype/project/project.js +22,Save the document first.,Enregistrez le document en premier.
 DocType: Account,Chargeable,À la charge
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +121,Linishing,Linishing
 DocType: Company,Change Abbreviation,Changer Abréviation
 DocType: Workflow State,Primary,Primaire
 DocType: Expense Claim Detail,Expense Date,Date de frais
 DocType: Item,Max Discount (%),Max Réduction (%)
 DocType: Communication,More Information,Plus d&#39;information
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +70,Last Order Amount,Dernière Montant de la commande
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +161,Blasting,Minage
 DocType: Company,Warn,Avertir
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +111,Item valuation updated,Utilisation des fonds ( actif)
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Toute autre remarque, effort remarquable qui devrait aller dans les dossiers."
 DocType: BOM,Manufacturing User,Fabrication utilisateur
 DocType: Purchase Order,Raw Materials Supplied,Des matières premières fournies
@@ -3453,7 +3312,7 @@
 DocType: Appraisal,Appraisal Template,Modèle d&#39;évaluation
 DocType: Communication,Email,E-mail
 DocType: Item Group,Item Classification,Point Classification
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +89,Business Development Manager,Directeur du développement des affaires
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Business Development Manager,Directeur du développement des affaires
 DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,But Visite d&#39;entretien
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.js +15,Period,période
 ,General Ledger,Grand livre général
@@ -3463,9 +3322,7 @@
 ,Itemwise Recommended Reorder Level,Seuil de renouvellement des commandes (par Article)
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +264,Please select {0} first,S'il vous plaît sélectionnez {0} premier
 DocType: Features Setup,To get Item Group in details table,Pour obtenir Groupe d&#39;éléments dans le tableau de détails
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +67,Redrawing,Redessiner
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +112,Batch {0} of Item {1} has expired.,Lot {0} du point {1} a expiré.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +120,Etching,Gravure
 DocType: Sales Invoice,Commission,commission
 DocType: Address Template,"<h4>Default Template</h4>
 <p>Uses <a href=""http://jinja.pocoo.org/docs/templates/"">Jinja Templating</a> and all the fields of Address (including Custom Fields if any) will be available</p>
@@ -3510,7 +3367,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +340,Operation Time must be greater than 0 for Operation {0},Temps de fonctionnement doit être supérieure à 0 pour l&#39;opération {0}
 DocType: Supplier,Address and Contacts,Adresse et contacts
 DocType: UOM Conversion Detail,UOM Conversion Detail,Détail de conversion Emballage
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +496,Keep it web friendly 900px (w) by 100px (h),"Merci de conserver le format de l'image web friendly, i.e. 900px par 100px"
+apps/erpnext/erpnext/public/js/setup_wizard.js +242,Keep it web friendly 900px (w) by 100px (h),"Merci de conserver le format de l'image web friendly, i.e. 900px par 100px"
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +329,Production Order cannot be raised against a Item Template,Ordre de production ne peut être soulevée contre un modèle d&#39;objet
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +44,Charges are updated in Purchase Receipt against each item,Les frais sont mis à jour en Achat réception contre chaque article
 DocType: Payment Tool,Get Outstanding Vouchers,Obtenez suspens Chèques
@@ -3526,54 +3383,49 @@
 DocType: Item,Average time taken by the supplier to deliver,Délai moyen par le fournisseur de livrer
 DocType: Time Log,Hours,Heures
 DocType: Project,Expected Start Date,Date de début prévue
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +38,Rolling,Roulant
 DocType: ToDo,Priority,Priorité
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +41,Remove item if charges is not applicable to that item,Supprimer l'élément si des accusations ne est pas applicable à cet élément
 DocType: Dropbox Backup,Dropbox Access Allowed,Dropbox accès autorisé
 DocType: Dropbox Backup,Weekly,Hebdomadaire
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,Par exemple. smsgateway.com / api / send_sms.cgi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +485,Receive,Recevoir
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +510,Receive,Recevoir
 DocType: Maintenance Visit,Fully Completed,Entièrement complété
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% complète
 DocType: Employee,Educational Qualification,Qualification pour l&#39;éducation
 DocType: Workstation,Operating Costs,Coûts d'exploitation
 DocType: Employee Leave Approver,Employee Leave Approver,Congé employé approbateur
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,{0} has been successfully added to our Newsletter list.,{0} a été ajouté avec succès à notre liste de diffusion.
-apps/erpnext/erpnext/stock/doctype/item/item.py +383,Row {0}: An Reorder entry already exists for this warehouse {1},Row {0}: Une entrée Réorganiser existe déjà pour cet entrepôt {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +387,Row {0}: An Reorder entry already exists for this warehouse {1},Row {0}: Une entrée Réorganiser existe déjà pour cet entrepôt {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +67,"Cannot declare as lost, because Quotation has been made.","Vous ne pouvez pas déclarer comme perdu , parce offre a été faite."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +133,Electron beam machining,Usinage par faisceau d&#39;électrons
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Achat Maître Gestionnaire
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +424,Production Order {0} must be submitted,Client / Nom plomb
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +150,Please select Start Date and End Date for Item {0},S'il vous plaît sélectionnez Date de début et date de fin de l'article {0}
 apps/erpnext/erpnext/config/stock.py +141,Main Reports,Rapports principaux
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +102,Stock Ledger entries balances updated,Stock Ledger entrées soldes à jour
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,À ce jour ne peut pas être avant la date
 DocType: Purchase Receipt Item,Prevdoc DocType,Prevdoc DocType
-apps/erpnext/erpnext/stock/doctype/item/item.js +176,Add / Edit Prices,Ajouter / Modifier Prix
+apps/erpnext/erpnext/stock/doctype/item/item.js +178,Add / Edit Prices,Ajouter / Modifier Prix
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +53,Chart of Cost Centers,Carte des centres de coûts
 ,Requested Items To Be Ordered,Articles demandés à commander
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +298,My Orders,Mes Commandes
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +293,My Orders,Mes Commandes
 DocType: Price List,Price List Name,Nom Liste des Prix
 DocType: Time Log,For Manufacturing,Pour Manufacturing
-apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +70,Totals,Totaux
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +174,Totals,Totaux
 DocType: BOM,Manufacturing,Fabrication
 ,Ordered Items To Be Delivered,Articles commandés à livrer
 DocType: Account,Income,Revenu
 ,Setup Wizard,Assistant de configuration
 DocType: Industry Type,Industry Type,Secteur d&#39;activité
 apps/erpnext/erpnext/templates/includes/cart.js +137,Something went wrong!,Quelque chose a mal tourné !
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +68,Warning: Leave application contains following block dates,Attention: la demande d&#39;autorisation contient les dates de blocs suivants
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +251,Sales Invoice {0} has already been submitted,BOM {0} n'est pas actif ou non soumis
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +100,Warning: Leave application contains following block dates,Attention: la demande d&#39;autorisation contient les dates de blocs suivants
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +256,Sales Invoice {0} has already been submitted,BOM {0} n'est pas actif ou non soumis
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,Date d&#39;achèvement
 DocType: Purchase Invoice Item,Amount (Company Currency),Montant (Devise de la Société)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +10,Die casting,Moulage sous pression
 DocType: Email Alert,Reference Date,Date de Référence
 apps/erpnext/erpnext/config/hr.py +105,Organization unit (department) master.,Unité d'organisation (département) maître .
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +25,Please enter valid mobile nos,nos
 DocType: Budget Detail,Budget Detail,Détail du budget
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +75,Please enter message before sending,"Vous ne pouvez pas supprimer Aucune série {0} en stock . Première retirer du stock, puis supprimer ."
 DocType: Async Task,Status,Statut
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +65,Stock UOM updated for Item {0},Stock UOM mis à jour pour objet {0}
 DocType: Company History,Year,Année
 apps/erpnext/erpnext/config/accounts.py +127,Point-of-Sale Profile,Point-of-Sale profil
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +68,Please Update SMS Settings,S'il vous plaît Mettre à jour les paramètres de SMS
@@ -3587,12 +3439,12 @@
 ,Serial No Service Contract Expiry,N ° de série expiration du contrat de service
 DocType: Item,Unit of Measure Conversion,Unité de conversion de Mesure
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +86,Employee can not be changed,Employé ne peut être modifié
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +259,You cannot credit and debit same account at the same time,Vous ne pouvez pas crédit et de débit même compte en même temps
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,You cannot credit and debit same account at the same time,Vous ne pouvez pas crédit et de débit même compte en même temps
 DocType: Naming Series,Help HTML,Aide HTML
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},Weightage totale attribuée devrait être de 100 % . Il est {0}
 apps/erpnext/erpnext/controllers/status_updater.py +140,Allowance for over-{0} crossed for Item {1},Allocation pour les plus de {0} croisés pour objet {1}
 DocType: Address,Name of person or organization that this address belongs to.,Nom de la personne ou de l&#39;organisation que cette adresse appartient.
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +587,Your Suppliers,vos fournisseurs
+apps/erpnext/erpnext/public/js/setup_wizard.js +325,Your Suppliers,vos fournisseurs
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,Impossible de définir aussi perdu que les ventes décret.
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +65,Another Salary Structure {0} is active for employee {1}. Please make its status 'Inactive' to proceed.,Une autre structure salariale {0} est actif pour l'employé {1}. Se il vous plaît faire son statut «inactif» pour continuer.
 DocType: Purchase Invoice,Contact,Contacter
@@ -3601,37 +3453,35 @@
 DocType: Item,Has Serial No,N ° de série a
 DocType: Employee,Date of Issue,Date d&#39;émission
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +16,{0}: From {0} for {1},{0}: Du {0} pour {1}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +154,Row #{0}: Set Supplier for item {1},Row # {0}: Réglez Fournisseur pour le point {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +149,Row #{0}: Set Supplier for item {1},Row # {0}: Réglez Fournisseur pour le point {1}
 DocType: Issue,Content Type,Type de contenu
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +17,Computer,ordinateur
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,ordinateur
 DocType: Item,List this Item in multiple groups on the website.,Liste cet article dans plusieurs groupes sur le site.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +283,Please check Multi Currency option to allow accounts with other currency,S&#39;il vous plaît vérifier l&#39;option multi-devises pour permettre comptes avec autre monnaie
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +285,Please check Multi Currency option to allow accounts with other currency,S&#39;il vous plaît vérifier l&#39;option multi-devises pour permettre comptes avec autre monnaie
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +62,Item: {0} does not exist in the system,Item: {0} ne existe pas dans le système
 apps/erpnext/erpnext/accounts/doctype/account/account.py +81,You are not authorized to set Frozen value,Vous n'êtes pas autorisé à mettre en valeur Frozen
 DocType: Payment Reconciliation,Get Unreconciled Entries,Obtenez non rapprochés entrées
 DocType: Cost Center,Budgets,Budgets
 apps/frappe/frappe/core/page/modules_setup/modules_setup.py +11,Updated,Mise à jour
 DocType: Employee,Emergency Contact Details,Détails de contact d&#39;urgence
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +396,What does it do?,Que fait-elle ?
+apps/erpnext/erpnext/public/js/setup_wizard.js +144,What does it do?,Que fait-elle ?
 DocType: Delivery Note,To Warehouse,Pour Entrepôt
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +45,Account {0} has been entered more than once for fiscal year {1},Le compte {0} a été renseigné plus d'une fois pour l'année fiscale {1}
 ,Average Commission Rate,Taux moyen de la commission
-apps/erpnext/erpnext/stock/doctype/item/item.py +313,'Has Serial No' can not be 'Yes' for non-stock item,'A un numéro de série' ne peut pas être 'Oui' pour un article non-stock
+apps/erpnext/erpnext/stock/doctype/item/item.py +317,'Has Serial No' can not be 'Yes' for non-stock item,'A un numéro de série' ne peut pas être 'Oui' pour un article non-stock
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Attendance can not be marked for future dates,La participation ne peut pas être marqué pour les dates à venir
 DocType: Pricing Rule,Pricing Rule Help,Prix règle Aide
 DocType: Purchase Taxes and Charges,Account Head,Responsable du compte
 apps/erpnext/erpnext/config/stock.py +79,Update additional costs to calculate landed cost of items,Mettre à jour les coûts supplémentaires pour calculer le coût au débarquement des articles
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +111,Electrical,local
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +111,Electrical,local
 DocType: Stock Entry,Total Value Difference (Out - In),Valeur totale Différence (Out - En)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +302,Row {0}: Exchange Rate is mandatory,Row {0}: Taux de change est obligatoire
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +304,Row {0}: Exchange Rate is mandatory,Row {0}: Taux de change est obligatoire
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},ID utilisateur non défini pour les employés {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +72,Peening,Grenaillage
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,From Warranty Claim,De la revendication de garantie
 DocType: Stock Entry,Default Source Warehouse,Source d&#39;entrepôt par défaut
 DocType: Item,Customer Code,Code client
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +212,Birthday Reminder for {0},Rappel d'anniversaire pour {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +163,Lapping,Clapotis
-apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.js +8,Days Since Last Order,Jours depuis la dernière commande
+apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +72,Days Since Last Order,Jours depuis la dernière commande
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +299,Debit To account must be a Balance Sheet account,Débit Pour compte doit être un compte de bilan
 DocType: Buying Settings,Naming Series,Nommer Série
 DocType: Leave Block List,Leave Block List Name,Laisser Nom de la liste de blocage
@@ -3645,7 +3495,7 @@
 DocType: Notification Control,Sales Invoice Message,Message facture de vente
 DocType: Authorization Rule,Based On,Basé sur
 DocType: Sales Order Item,Ordered Qty, Quantité commandée
-apps/erpnext/erpnext/stock/doctype/item/item.py +539,Item {0} is disabled,Point {0} est désactivé
+apps/erpnext/erpnext/stock/doctype/item/item.py +543,Item {0} is disabled,Point {0} est désactivé
 DocType: Stock Settings,Stock Frozen Upto,Stock Frozen Jusqu&#39;à
 apps/erpnext/erpnext/controllers/recurring_document.py +166,Period From and Period To dates mandatory for recurring {0},Période De et période dates obligatoires pour récurrents {0}
 apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,Activité de projet / tâche.
@@ -3655,7 +3505,6 @@
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,La remise doit être inférieure à 100
 DocType: ToDo,Low,Bas
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Write Off Montant (Société devise)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +71,Spinning,Filature
 DocType: Landed Cost Voucher,Landed Cost Voucher,Bon d'Landed Cost
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +55,Please set {0},S'il vous plaît mettre {0}
 DocType: Purchase Invoice,Repeat on Day of Month,Répétez le Jour du Mois
@@ -3677,7 +3526,6 @@
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +37,Campaign Name is required,Le nom de la campagne est requis
 DocType: Maintenance Visit,Maintenance Date,Date de l&#39;entretien
 DocType: Purchase Receipt Item,Rejected Serial No,Rejeté N ° de série
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +51,Deep drawing,Emboutissage
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +40,New Newsletter,Nouvelle Bulletin
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +157,Start date should be less than end date for Item {0},{0} budget pour compte {1} contre des centres de coûts {2} dépassera par {3}
 apps/erpnext/erpnext/stock/doctype/item/item.js +17,Show Balance,Voir solde
@@ -3688,7 +3536,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +119,BOM and Manufacturing Quantity are required,BOM et fabrication Quantité sont nécessaires
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Gamme de vieillissement 2
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +450,Amount,Montant
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +147,Riveting,Rivetage
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,BOM remplacé
 ,Sales Analytics,Analytics Sales
 DocType: Manufacturing Settings,Manufacturing Settings,Paramètres de fabrication
@@ -3700,20 +3547,19 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +207,New Account Name,Nom du nouveau compte
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,Coût des matières premières fournies
 DocType: Selling Settings,Settings for Selling Module,Paramètres module vente
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +73,Customer Service,Service à la clientèle
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Customer Service,Service à la clientèle
 DocType: Item,Thumbnail,Miniature
 DocType: Item Customer Detail,Item Customer Detail,Détail d&#39;article
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +147,Confirm Your Email,Confirmez Votre Email
 apps/erpnext/erpnext/config/hr.py +53,Offer candidate a Job.,Offre candidat un emploi.
 DocType: Notification Control,Prompt for Email on Submission of,Prompt for Email relative à la présentation des
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +81,Total allocated leaves are more than days in the period,Nombre de feuilles alloués sont plus de jours de la période
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +70,Item {0} must be a stock Item,Point {0} doit être un stock Article
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,Par défaut Work In Progress Entrepôt
 apps/erpnext/erpnext/config/accounts.py +107,Default settings for accounting transactions.,Les paramètres par défaut pour les opérations comptables .
 apps/frappe/frappe/model/naming.py +40,{0} is required,{0} est nécessaire
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +21,Vacuum molding,Le moulage sous vide
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,Date prévu ne peut pas être avant Matériel Date de la demande
 DocType: Contact Us Settings,City,Ville
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +132,Ultrasonic machining,Usinage par ultrasons
 apps/frappe/frappe/templates/base.html +137,Error: Not a valid id?,Erreur: Pas un identifiant valide?
 apps/erpnext/erpnext/stock/get_item_details.py +125,Item {0} must be a Sales Item,Point {0} doit être un élément de ventes
 DocType: Naming Series,Update Series Number,Numéro de série mise à jour
@@ -3721,7 +3567,7 @@
 DocType: Sales Order,Printing Details,Impression Détails
 DocType: Task,Closing Date,Date de clôture
 DocType: Sales Order Item,Produced Quantity,Quantité produite
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +84,Engineer,ingénieur
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Engineer,ingénieur
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,Recherche de sous-ensembles
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +379,Item Code required at Row No {0},Aucun résultat
 DocType: Sales Partner,Partner Type,Type de partenaire
@@ -3729,7 +3575,7 @@
 DocType: Authorization Rule,Customerwise Discount,Remise Customerwise
 DocType: Purchase Invoice,Against Expense Account,Sur le compte des dépenses
 DocType: Production Order,Production Order,Ordre de fabrication
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +258,Installation Note {0} has already been submitted,Les demandes matérielles {0} créé
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +263,Installation Note {0} has already been submitted,Les demandes matérielles {0} créé
 DocType: Quotation Item,Against Docname,Contre docName
 DocType: SMS Center,All Employee (Active),Tous les employés (Actif)
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,voir maintenant
@@ -3738,19 +3584,19 @@
 DocType: Item,Re-Order Level,Re-commande de niveau
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,Introduisez les articles et qté planifiée pour laquelle vous voulez soulever ordres de fabrication ou de télécharger des matières premières pour l&#39;analyse.
 apps/frappe/frappe/public/js/frappe/views/ganttview.js +45,Gantt Chart,Diagramme de Gantt
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +57,Part-time,À temps partiel
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,Part-time,À temps partiel
 DocType: Employee,Applicable Holiday List,Liste de vacances applicable
 DocType: Employee,Cheque,Chèque
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,Mise à jour de la série
 apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Report Type is mandatory,Bulletin de salaire de l'employé {0} déjà créé pour ce mois-ci
 DocType: Item,Serial Number Series,Série Série Nombre
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},Facteur de conversion ne peut pas être dans les fractions
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +45,Retail & Wholesale,Retail & Wholesale
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,Retail & Wholesale
 DocType: Issue,First Responded On,D&#39;abord répondu le
 DocType: Website Item Group,Cross Listing of Item in multiple groups,Croix Listing des articles dans plusieurs groupes
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +351,The First User: You,Le premier utilisateur: Vous
+apps/erpnext/erpnext/public/js/setup_wizard.js +101,The First User: You,Le premier utilisateur: Vous
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +48,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},Exercice Date de début et de fin d'exercice la date sont réglées dans l'année fiscale {0}
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +172,Successfully Reconciled,Réconcilié avec succès
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +119,Successfully Reconciled,Réconcilié avec succès
 DocType: Production Order,Planned End Date,Date de fin prévue
 apps/erpnext/erpnext/config/stock.py +43,Where items are stored.,Lorsque des éléments sont stockés.
 DocType: Tax Rule,Validity,Validité
@@ -3770,39 +3616,36 @@
 DocType: DocPerm,Level,Niveau
 DocType: Purchase Taxes and Charges,On Net Total,Le total net
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +160,Target warehouse in row {0} must be same as Production Order,Bon de commande {0} n'est pas soumis
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +59,No permission to use Payment Tool,Pas de permission pour utiliser l'outil Paiement
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +97,No permission to use Payment Tool,Pas de permission pour utiliser l'outil Paiement
 apps/erpnext/erpnext/controllers/recurring_document.py +192,'Notification Email Addresses' not specified for recurring %s,«notification adresse e-mail non spécifiés pour% s récurrents
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +86,Milling,Fraisage
 apps/erpnext/erpnext/accounts/doctype/account/account.py +99,Currency can not be changed after making entries using some other currency,Devise ne peut être modifié après avoir fait des entrées en utilisant une autre monnaie
 DocType: Company,Round Off Account,Arrondir compte
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +60,Nibbling,Grignotage
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,Dépenses administratives
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +18,Consulting,consultant
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +18,Consulting,consultant
 DocType: Customer Group,Parent Customer Group,Groupe Client parent
 apps/erpnext/erpnext/public/js/pos/pos.js +429,Change,Changement
 DocType: Purchase Invoice,Contact Email,Contact Courriel
 DocType: Appraisal Goal,Score Earned,Score gagné
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +393,"e.g. ""My Company LLC""","par exemple "" Mon Company LLC """
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +173,Notice Period,Période De Préavis
+apps/erpnext/erpnext/public/js/setup_wizard.js +141,"e.g. ""My Company LLC""","par exemple "" Mon Company LLC """
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +173,Notice Period,Période De Préavis
 DocType: Bank Reconciliation Detail,Voucher ID,ID du Bon
 apps/erpnext/erpnext/setup/doctype/territory/territory.js +14,This is a root territory and cannot be edited.,C'est un territoire de racine et ne peut être modifié .
 DocType: Packing Slip,Gross Weight UOM,Emballage Poids brut
 DocType: Email Digest,Receivables / Payables,Créances / dettes
 DocType: Delivery Note Item,Against Sales Invoice,Sur la facture de vente
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +63,Stamping,Estampillage
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +457,Credit Account,Compte créditeur
 DocType: Landed Cost Item,Landed Cost Item,Article coût en magasin
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +56,Show zero values,Afficher les valeurs nulles
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,Quantité de produit obtenue après fabrication / reconditionnement des quantités données de matières premières
 DocType: Payment Reconciliation,Receivable / Payable Account,Compte à recevoir / payer
 DocType: Delivery Note Item,Against Sales Order Item,Sur l'objet de la commande
-apps/erpnext/erpnext/stock/doctype/item/item.py +521,Please specify Attribute Value for attribute {0},S&#39;il vous plaît spécifier Attribut Valeur pour l&#39;attribut {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +525,Please specify Attribute Value for attribute {0},S&#39;il vous plaît spécifier Attribut Valeur pour l&#39;attribut {0}
 DocType: Item,Default Warehouse,Entrepôt de défaut
 DocType: Task,Actual End Date (via Time Logs),Date réelle de fin (via Time Logs)
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +37,Budget cannot be assigned against Group Account {0},Budget ne peut pas être attribué à l&#39;encontre du compte de groupe {0}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +23,Please enter parent cost center,Le projet de loi n ° {0} déjà réservé dans la facture d'achat {1}
 DocType: Delivery Note,Print Without Amount,Imprimer Sans Montant
-apps/erpnext/erpnext/controllers/buying_controller.py +69,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,"Catégorie impôt ne peut pas être « évaluation » ou « évaluation et totale », comme tous les articles sont des articles hors stock"
+apps/erpnext/erpnext/controllers/buying_controller.py +60,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,"Catégorie impôt ne peut pas être « évaluation » ou « évaluation et totale », comme tous les articles sont des articles hors stock"
 DocType: User,Last Name,Nom de famille
 DocType: Web Page,Left,Gauche
 DocType: Event,All Day,Toute la journée
@@ -3810,7 +3653,7 @@
 DocType: Appraisal,Total Score (Out of 5),Score total (sur 5)
 DocType: Contact Us Settings,State,État
 DocType: Batch,Batch,Lot
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +51,Balance,Balance
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +28,Balance,Balance
 DocType: Project,Total Expense Claim (via Expense Claims),Demande d&#39;indemnité totale (via Remboursement des dépenses)
 DocType: User,Gender,Sexe
 DocType: Journal Entry,Debit Note,Note de débit
@@ -3840,8 +3683,7 @@
 DocType: Purchase Order,Get Last Purchase Rate,Obtenez Purchase Rate Dernière
 DocType: Time Log,Billing Rate based on Activity Type (per hour),Taux de facturation basé sur le type d&#39;activité (par heure)
 DocType: Company,Company Info,Informations sur l'entreprise
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +76,Seaming,Seaming
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +197,"Company Email ID not found, hence mail not sent",Remarque: Il n'est pas assez solde de congés d'autorisation de type {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +206,"Company Email ID not found, hence mail not sent",Remarque: Il n'est pas assez solde de congés d'autorisation de type {0}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),utilisation des fonds (Actifs)
 DocType: Production Planning Tool,Filter based on item,Filtre basé sur l'article
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +451,Debit Account,Compte de débit
@@ -3853,17 +3695,16 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +95,{0} {1} has been modified. Please refresh.,{0} {1} a été modifié. S.V.P rafraîchir.
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,"Empêcher les utilisateurs de faire des demandes d&#39;autorisation, les jours suivants."
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +591,From Opportunity,De Opportunity
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +46,Blanking,Obturation
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +166,Employee Benefits,Avantages du personnel
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,Employee Benefits,Avantages du personnel
 DocType: Sales Invoice,Is POS,Est-POS
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +240,Packed quantity must equal quantity for Item {0} in row {1},Emballé quantité doit être égale à la quantité pour l'article {0} à la ligne {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +245,Packed quantity must equal quantity for Item {0} in row {1},Emballé quantité doit être égale à la quantité pour l'article {0} à la ligne {1}
 DocType: Production Order,Manufactured Qty,Quantité fabriquée
 DocType: Purchase Receipt Item,Accepted Quantity,Quantité acceptés
 apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} ne existe pas
 apps/erpnext/erpnext/config/accounts.py +18,Bills raised to Customers.,Factures émises aux clients.
 DocType: DocField,Default,Par défaut
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Référence du projet
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +466,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Row Non {0}: montant ne peut être supérieur à l&#39;attente Montant contre remboursement de frais {1}. Montant attente est {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +468,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Row Non {0}: montant ne peut être supérieur à l&#39;attente Montant contre remboursement de frais {1}. Montant attente est {2}
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +40,{0} subscribers added,{0} abonnés ajoutés
 DocType: Maintenance Schedule,Schedule,Calendrier
 DocType: Cost Center,"Define Budget for this Cost Center. To set budget action, see ""Company List""","Définir budget pour ce centre de coûts. Pour définir l&#39;action budgétaire, voir «Liste des entreprises»"
@@ -3874,7 +3715,7 @@
 apps/erpnext/erpnext/public/js/pos/pos.js +91,Price List not found or disabled,Liste de prix introuvable ou desactivé
 DocType: Expense Claim,Approved,Approuvé
 DocType: Pricing Rule,Price,Profil de l'organisation
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +79,Employee relieved on {0} must be set as 'Left',S'il vous plaît entrer unité de mesure par défaut
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +88,Employee relieved on {0} must be set as 'Left',S'il vous plaît entrer unité de mesure par défaut
 DocType: Item,"Selecting ""Yes"" will give a unique identity to each entity of this item which can be viewed in the Serial No master.",La sélection de &quot;Oui&quot; donner une identité unique à chaque entité de cet article qui peut être consulté dans le N ° de série maître.
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +39,Appraisal {0} created for Employee {1} in the given date range,Soulager date doit être supérieure à date d'adhésion
 DocType: Employee,Education,éducation
@@ -3885,7 +3726,7 @@
 apps/frappe/frappe/desk/moduleview.py +67,Standard Reports,Rapports standard
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,Les écritures comptables.
 DocType: Delivery Note Item,Available Qty at From Warehouse,Disponible Quantité à partir de l&#39;entrepôt
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +209,Please select Employee Record first.,S&#39;il vous plaît sélectionnez dossier de l&#39;employé en premier.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +224,Please select Employee Record first.,S&#39;il vous plaît sélectionnez dossier de l&#39;employé en premier.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Row {0}: Fête / compte ne correspond pas à {1} / {2} en {3} {4}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +35,To create a Tax Account,Pour créer un compte d'impôt
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +233,Please enter Expense Account,S&#39;il vous plaît entrer Compte de dépenses
@@ -3898,46 +3739,43 @@
 DocType: Sales Order,Track this Sales Order against any Project,Suivre ce décret ventes contre tout projet
 DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,Tirez les ordres de vente (en attendant de livrer) sur la base des critères ci-dessus
 DocType: DocShare,Document Type,Type de document
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +565,From Supplier Quotation,De Fournisseur offre
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +588,From Supplier Quotation,De Fournisseur offre
 DocType: Deduction Type,Deduction Type,Type de déduction
 DocType: Attendance,Half Day,Demi-journée
 DocType: Pricing Rule,Min Qty,Compte {0} est gelé
 DocType: Features Setup,"To track items in sales and purchase documents with batch nos. ""Preferred Industry: Chemicals""",Pour suivre les articles dans les ventes et les documents d&#39;achat avec nos batch. &quot;Préférés de l&#39;industrie: Produits chimiques&quot;
 DocType: GL Entry,Transaction Date,Date de la transaction
 DocType: Production Plan Item,Planned Qty,Quantité planifiée
-apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +91,Total Tax,Total Tax
+apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +93,Total Tax,Total Tax
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +178,For Quantity (Manufactured Qty) is mandatory,Pour Quantité (Fabriqué Quantité) est obligatoire
 DocType: Stock Entry,Default Target Warehouse,Cible d&#39;entrepôt par défaut
 DocType: Purchase Invoice,Net Total (Company Currency),Total net (Société Monnaie)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +79,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Row {0}: Type et le Parti est applicable uniquement contre débiteurs / Comptes fournisseurs
 DocType: Notification Control,Purchase Receipt Message,Achat message de réception
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +95,Total allocated leaves are more than period,Nombre de feuilles alloués sont plus que la durée
 DocType: Production Order,Actual Start Date,Date de début réelle
 DocType: Sales Order,% of materials delivered against this Sales Order,% De matériaux livrés sur cette Commande vente
 apps/erpnext/erpnext/config/stock.py +23,Record item movement.,Gestion des mouvements du stock.
 DocType: Newsletter List Subscriber,Newsletter List Subscriber,Bulletin Liste abonné
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +164,Morticing,Mortaiseuse
 DocType: Email Account,Service,service
 DocType: Hub Settings,Hub Settings,Paramètres de Hub
 DocType: Project,Gross Margin %,Marge brute%
 DocType: BOM,With Operations,Avec des opérations
 apps/erpnext/erpnext/accounts/party.py +232,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Les écritures comptables ont déjà été réalisés en monnaie {0} pour la société {1}. S&#39;il vous plaît sélectionner un compte à recevoir ou à payer avec de la monnaie {0}.
 ,Monthly Salary Register,S&#39;enregistrer Salaire mensuel
-apps/frappe/frappe/website/template.py +140,Next,Suivant
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard_page.html +17,Next,Suivant
 DocType: Warranty Claim,If different than customer address,Si différente de l'adresse du client
 DocType: BOM Operation,BOM Operation,Opération BOM
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +118,Electropolishing,Électrolytique
 DocType: Purchase Taxes and Charges,On Previous Row Amount,Le montant rangée précédente
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +24,Please enter Payment Amount in atleast one row,Se il vous plaît entrez paiement Montant en atleast une rangée
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +33,Please enter Payment Amount in atleast one row,Se il vous plaît entrez paiement Montant en atleast une rangée
 DocType: POS Profile,POS Profile,Profil POS
 apps/erpnext/erpnext/config/accounts.py +153,"Seasonality for setting budgets, targets etc.","Saisonnalité de l'établissement des budgets, des objectifs, etc."
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +238,Row {0}: Payment Amount cannot be greater than Outstanding Amount,Row {0}: Montant du paiement ne peut pas être supérieure à Encours
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +46,Total Unpaid,Total non rémunéré
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +21,Time Log is not billable,Heure du journal n'est pas facturable
 apps/erpnext/erpnext/stock/get_item_details.py +128,"Item {0} is a template, please select one of its variants","Point {0} est un modèle, s&#39;il vous plaît sélectionnez l&#39;une de ses variantes"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +528,Purchaser,Acheteur
+apps/erpnext/erpnext/public/js/setup_wizard.js +272,Purchaser,Acheteur
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +81,Net pay cannot be negative,Landed Cost correctement mis à jour
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +71,Please enter the Against Vouchers manually,Se il vous plaît entrer le contre Chèques manuellement
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +107,Please enter the Against Vouchers manually,Se il vous plaît entrer le contre Chèques manuellement
 DocType: SMS Settings,Static Parameters,Paramètres statiques
 DocType: Purchase Order,Advance Paid,Acompte payée
 DocType: Item,Item Tax,Taxe sur l'Article
@@ -3946,14 +3784,12 @@
 apps/erpnext/erpnext/config/crm.py +48,Send mass SMS to your contacts,Envoyer un SMS en masse à vos contacts
 DocType: Purchase Taxes and Charges,Consider Tax or Charge for,Prenons l&#39;impôt ou charge pour
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,Quantité réelle est obligatoire
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +42,Cross-rolling,Croix-laminage
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +132,Credit Card,Carte de crédit
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +132,Credit Card,Carte de crédit
 DocType: BOM,Item to be manufactured or repacked,Ce point doit être manufacturés ou reconditionnés
 apps/erpnext/erpnext/config/stock.py +95,Default settings for stock transactions.,minute
 DocType: Purchase Invoice,Next Date,Date suivante
 DocType: Employee Education,Major/Optional Subjects,Sujets principaux / en option
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +49,Please enter Taxes and Charges,Se il vous plaît entrer Taxes et frais
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +85,Machining,Usinage
 DocType: Sales Invoice Item,Drop Ship,Drop Ship
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","Ici vous pouvez conserver les détails de famille comme nom et la profession des parents, le conjoint et les enfants"
 DocType: Hub Settings,Seller Name,Vendeur Nom
@@ -3963,7 +3799,7 @@
 DocType: Stock Entry,Repack,Remballez
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +6,You must Save the form before proceeding,Vous devez sauvegarder le formulaire avant de continuer
 DocType: Item Attribute,Numeric Values,Valeurs numériques
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +500,Attach Logo,Joindre le logo
+apps/erpnext/erpnext/public/js/setup_wizard.js +246,Attach Logo,Joindre le logo
 DocType: Customer,Commission Rate,Taux de commission
 apps/erpnext/erpnext/stock/doctype/item/item.js +38,Make Variant,Assurez Variant
 apps/erpnext/erpnext/config/hr.py +145,Block leave applications by department.,Bloquer les demandes d&#39;autorisation par le ministère.
@@ -3978,27 +3814,27 @@
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +105,Please select a csv file,S&#39;il vous plaît sélectionner un fichier csv
 DocType: Dropbox Backup,Send Backups to Dropbox,Envoyer sauvegardes à Dropbox
 DocType: Purchase Order,To Receive and Bill,Pour recevoir et le projet de loi
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +94,Designer,créateur
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Designer,créateur
 apps/erpnext/erpnext/config/selling.py +121,Terms and Conditions Template,Termes et Conditions modèle
 DocType: Serial No,Delivery Details,Détails de la livraison
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +383,Cost Center is required in row {0} in Taxes table for type {1},Livré de série n ° {0} ne peut pas être supprimé
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +386,Cost Center is required in row {0} in Taxes table for type {1},Livré de série n ° {0} ne peut pas être supprimé
 DocType: Item,Automatically create Material Request if quantity falls below this level,Créer automatiquement Demande de Matériel si la quantité tombe en dessous de ce niveau
 ,Item-wise Purchase Register,S&#39;enregistrer Achat point-sage
 DocType: Batch,Expiry Date,Date d&#39;expiration
-apps/erpnext/erpnext/stock/doctype/item/item.py +375,"To set reorder level, item must be a Purchase Item or Manufacturing Item","Pour définir le niveau de réapprovisionnement, item doit être un objet d&#39;achat ou de fabrication de l&#39;article"
+apps/erpnext/erpnext/stock/doctype/item/item.py +379,"To set reorder level, item must be a Purchase Item or Manufacturing Item","Pour définir le niveau de réapprovisionnement, item doit être un objet d&#39;achat ou de fabrication de l&#39;article"
 ,Supplier Addresses and Contacts,Adresses des fournisseurs et contacts
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,S'il vous plaît sélectionnez d'abord Catégorie
 apps/erpnext/erpnext/config/projects.py +18,Project master.,Projet de master.
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,Ne plus afficher n&#39;importe quel symbole comme $ etc à côté de devises.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +330, (Half Day),(Demi-journée)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +374, (Half Day),(Demi-journée)
 DocType: Supplier,Credit Days,Jours de crédit
 DocType: Leave Type,Is Carry Forward,Est-Report
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +478,Get Items from BOM,Obtenir des éléments de nomenclature
-apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Diriger jours Temps
+apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Délai jours Temps
 apps/erpnext/erpnext/config/manufacturing.py +120,Bill of Materials,Bill of Materials
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +77,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Row {0}: Type et le Parti est nécessaire pour recevoir / payer compte {1}
 DocType: Dropbox Backup,Send Notifications To,Envoyer des notifications aux
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html +26,Ref Date,Réf date
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +54,Ref Date,Réf date
 DocType: Employee,Reason for Leaving,Raison du départ
 DocType: Expense Claim Detail,Sanctioned Amount,Montant sanctionné
 DocType: GL Entry,Is Opening,Est l&#39;ouverture
@@ -4006,4 +3842,3 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +188,Account {0} does not exist,Compte {0} n'existe pas
 DocType: Account,Cash,Espèces
 DocType: Employee,Short biography for website and other publications.,Courte biographie pour le site Web et d&#39;autres publications.
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +31,Please create Salary Structure for employee {0},« Date de début prévue » ne peut être supérieur à ' Date de fin prévue '
diff --git a/erpnext/translations/he.csv b/erpnext/translations/he.csv
index 492a332..df21f09 100644
--- a/erpnext/translations/he.csv
+++ b/erpnext/translations/he.csv
@@ -1,13 +1,12 @@
 DocType: Employee,Salary Mode,שכר Mode
 DocType: Cost Center,"Select Monthly Distribution, if you want to track based on seasonality.","בחר בחתך חודשי, אם אתה רוצה לעקוב אחר המבוסס על עונתיות."
 DocType: Employee,Divorced,גרוש
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +86,Warning: Same item has been entered multiple times.,אזהרה: פריט אותו הוזן מספר פעמים.
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +80,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,הרשה פריט שיתווסף מספר פעמים בעסקה
 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/page/setup_wizard/fixtures/industry_type.py +19,Consumer Products,מוצרים צריכה
+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,אנא בחר מפלגה סוג ראשון
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +90,Annealing,חישול
 DocType: Item,Customer Items,פריטים לקוח
 apps/erpnext/erpnext/accounts/doctype/account/account.py +45,Account {0}: Parent account {1} can not be a ledger,חשבון {0}: הורה חשבון {1} לא יכול להיות פנקס
 DocType: Item,Publish Item to hub.erpnext.com,פרסם פריט לhub.erpnext.com
@@ -20,15 +19,14 @@
 DocType: About Us Settings,Website,אתר
 DocType: POS Profile,Applicable for User,ישים עבור משתמש
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +169,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","הזמנת ייצור הפסיק אינה ניתנת לביטול, מגופתו הראשונה לביטול"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +23,Compaction plus sintering,דחיסה בתוספת sintering
 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.,* יחושב בעסקה.
 DocType: Purchase Order,Customer Contact,צור קשר עם לקוחות
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +549,From Material Request,מבקשת חומר
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +572,From Material Request,מבקשת חומר
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} עץ
 DocType: Job Applicant,Job Applicant,עבודת מבקש
 apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,אין יותר תוצאות.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +78,Legal,משפטי
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +34,Legal,משפטי
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +114,Actual type tax cannot be included in Item rate in row {0},מס סוג בפועל לא ניתן כלול במחיר הפריט בשורת {0}
 DocType: C-Form,Customer,לקוחות
 DocType: Purchase Receipt Item,Required By,הנדרש על ידי
@@ -42,7 +40,6 @@
 DocType: Manufacturing Settings,Default 10 mins,ברירת מחדל 10 דקות
 DocType: Leave Type,Leave Type Name,השאר סוג שם
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +148,Series Updated Successfully,סדרת עדכון בהצלחה
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +150,Stitching,תפירה
 DocType: Pricing Rule,Apply On,החל ב
 DocType: Item Price,Multiple Item prices.,מחירי פריט מרובים.
 ,Purchase Order Items To Be Received,פריטים הזמנת רכש שיתקבלו
@@ -50,8 +47,8 @@
 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 +104,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 +189,New Leave Application,החדש Leave Application
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +134,Bank Draft,המחאה בנקאית
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +204,New Leave Application,החדש Leave Application
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +134,Bank Draft,המחאה בנקאית
 DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,1. כדי לשמור את קוד פריט החכם לקוחות ולגרום להם לחיפוש על סמך שימוש הקוד שלהם באפשרות זו
 DocType: Mode of Payment Account,Mode of Payment Account,מצב של חשבון תשלומים
 apps/erpnext/erpnext/stock/doctype/item/item.js +34,Show Variants,גרסאות הצג
@@ -63,25 +60,23 @@
 DocType: Production Plan Item,Production Plan Item,פריט תכנית ייצור
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +141,User {0} is already assigned to Employee {1},משתמש {0} כבר הוקצה לעובדי {1}
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +13,Make new POS Profile,פרופיל קופה חדש
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +31,Health Care,בריאות
+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 +494,Invoice,חשבונית
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +519,Invoice,חשבונית
 DocType: Maintenance Schedule Item,Periodicity,תְקוּפָתִיוּת
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +357,Email Address,"כתובת דוא""ל"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +21,Defense,ביטחון
+apps/erpnext/erpnext/public/js/setup_wizard.js +107,Email Address,"כתובת דוא""ל"
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,ביטחון
 DocType: Company,Abbr,Abbr
 DocType: Appraisal Goal,Score (0-5),ציון (0-5)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +193,Row {0}: {1} {2} does not match with {3},שורת {0}: {1} {2} אינה תואמת עם {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +67,Row # {0}:,# השורה {0}:
 DocType: Delivery Note,Vehicle No,רכב לא
 apps/erpnext/erpnext/public/js/pos/pos.js +528,Please select Price List,אנא בחר מחירון
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +162,Woodworking,עיבוד עץ
 DocType: Production Order Operation,Work In Progress,עבודה בתהליך
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +153,3D printing,הדפסת 3D
 DocType: Employee,Holiday List,רשימת החג
 DocType: Time Log,Time Log,הזמן התחבר
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +530,Accountant,חשב
+apps/erpnext/erpnext/public/js/setup_wizard.js +274,Accountant,חשב
 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.","יומן של פעילויות המבוצע על ידי משתמשים מפני משימות שיכולים לשמש למעקב זמן, חיוב."
@@ -95,18 +90,19 @@
 DocType: Bin,Quantity Requested for Purchase,כמות המבוקשת לרכישה
 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/setup/page/setup_wizard/setup_wizard.js +626,Kg,קילוגרם
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Kg,קילוגרם
 apps/erpnext/erpnext/config/hr.py +48,Opening for a Job.,פתיחה לעבודה.
 DocType: Item Attribute,Increment,תוספת
 apps/erpnext/erpnext/public/js/stock_analytics.js +63,Select Warehouse...,בחר מחסן ...
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +6,Advertising,פרסום
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,פרסום
+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/doctype/sales_invoice/sales_invoice.py +389,Stock cannot be updated against Delivery Note {0},המניה לא ניתן לעדכן נגד תעודת משלוח {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +391,Stock cannot be updated against Delivery Note {0},המניה לא ניתן לעדכן נגד תעודת משלוח {0}
 DocType: Payment Reconciliation,Reconcile,ליישב
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +30,Grocery,מכולת
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,מכולת
 DocType: Quality Inspection Reading,Reading 1,קריאת 1
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Make Bank Entry,הפוך בנק כניסה
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +40,Pension Funds,קרנות פנסיה
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,קרנות פנסיה
 apps/erpnext/erpnext/accounts/doctype/account/account.py +142,Warehouse is mandatory if account type is Warehouse,מחסן הוא חובה אם סוג החשבון הוא מחסן
 DocType: SMS Center,All Sales Person,כל איש המכירות
 DocType: Lead,Person Name,שם אדם
@@ -128,7 +124,7 @@
 DocType: Quality Inspection,Get Specification Details,קבל מפרט פרטים
 DocType: Lead,Interested,מעוניין
 apps/erpnext/erpnext/config/manufacturing.py +14,Bill of Material,ביל החומר
-apps/erpnext/erpnext/public/js/stock_analytics.js +45,Opening,פתיחה
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +158,Opening,פתיחה
 DocType: Item,Copy From Item Group,העתק מ קבוצת פריט
 DocType: Journal Entry,Opening Entry,כניסת פתיחה
 apps/frappe/frappe/email/doctype/email_account/email_account.py +58,{0} is mandatory,{0} הוא חובה
@@ -141,23 +137,22 @@
 DocType: Employee Education,Under Graduate,תחת בוגר
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +22,Target On,יעד ב
 DocType: BOM,Total Cost,עלות כוללת
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +99,Reaming,Reaming
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +9,Activity Log:,יומן פעילות:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +199,Item {0} does not exist in the system or has expired,פריט {0} אינו קיים במערכת או שפג תוקף
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +44,Real Estate,"נדל""ן"
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +44,Real Estate,"נדל""ן"
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +4,Statement of Account,הצהרה של חשבון
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +41,Pharmaceuticals,תרופות
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,תרופות
 DocType: Expense Claim Detail,Claim Amount,סכום תביעה
 DocType: Employee,Mr,מר
 DocType: Custom Script,Client,הלקוח
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,סוג ספק / ספק
 DocType: Naming Series,Prefix,קידומת
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Consumable,מתכלה
+apps/erpnext/erpnext/public/js/setup_wizard.js +359,Consumable,מתכלה
 DocType: Upload Attendance,Import Log,יבוא יומן
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.js +19,Send,שלח
 DocType: Sales Invoice Item,Delivered By Supplier,נמסר על ידי ספק
 DocType: SMS Center,All Contact,כל הקשר
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +164,Annual Salary,משכורת שנתית
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +164,Annual Salary,משכורת שנתית
 DocType: Period Closing Voucher,Closing Fiscal Year,סגירת שנת כספים
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +69,Stock Expenses,הוצאות המניה
 DocType: Newsletter,Email Sent?,"דוא""ל שנשלח?"
@@ -165,26 +160,24 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +92,Show Time Logs,יומני זמן השידור
 DocType: Journal Entry Account,Credit in Company Currency,אשראי במטבע החברה
 DocType: Delivery Note,Installation Status,מצב התקנה
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +115,Accepted + Rejected Qty must be equal to Received quantity for Item {0},+ מקובל שנדחו הכמות חייבת להיות שווה לכמות שהתקבל עבור פריט {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +118,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 +133,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 +493,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","כדי לכלול מס בשורת {0} בשיעור פריט, מסים בשורות {1} חייבים להיות כלולים גם"
+apps/erpnext/erpnext/controllers/accounts_controller.py +494,"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 +90,Settings for HR Module,הגדרות עבור מודול HR
 DocType: SMS Center,SMS Center,SMS מרכז
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +78,Straightening,מיישר
 DocType: BOM Replace Tool,New BOM,BOM החדש
 apps/erpnext/erpnext/config/projects.py +28,Batch Time Logs for billing.,אצווה יומני זמן לחיוב.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +15,Countergravity casting,ליהוק Countergravity
 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/setup/page/setup_wizard/fixtures/industry_type.py +14,Broadcasting,שידור
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +140,Execution,ביצוע
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +364,The first user will become the System Manager (you can change this later).,המשתמש הראשון יהפוך את מנהל המערכת (אתה יכול לשנות את זה בהמשך).
+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/public/js/setup_wizard.js +114,The first user will become the System Manager (you can change this later).,המשתמש הראשון יהפוך את מנהל המערכת (אתה יכול לשנות את זה בהמשך).
 apps/erpnext/erpnext/config/manufacturing.py +39,Details of the operations carried out.,פרטים של הפעולות שביצעו.
 DocType: Serial No,Maintenance Status,מצב תחזוקה
 apps/erpnext/erpnext/config/stock.py +263,Items and Pricing,פריטים ותמחור
@@ -201,7 +194,6 @@
 DocType: Pricing Rule,Discount on Price List Rate (%),הנחה על מחיר מחירון שיעור (%)
 apps/frappe/frappe/public/js/frappe/form/print.js +96,Start,התחל
 DocType: User,First Name,שם פרטים
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +12,Full-mold casting,ליהוק מלא עובש
 DocType: Offer Letter,Select Terms and Conditions,תנאים והגבלות בחרו
 DocType: Production Planning Tool,Sales Orders,הזמנות ומכירות
 DocType: Purchase Taxes and Charges,Valuation,הערכת שווי
@@ -213,8 +205,7 @@
 DocType: Bank Reconciliation,Bank Account,חשבון בנק
 DocType: Leave Type,Allow Negative Balance,לאפשר מאזן שלילי
 DocType: Selling Settings,Default Territory,טריטורית ברירת מחדל
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +53,Television,טלוויזיה
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +138,Gashing,המבתר
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,טלוויזיה
 DocType: Production Order Operation,Updated via 'Time Log',"עדכון באמצעות 'יומן זמן """
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +82,Account {0} does not belong to Company {1},חשבון {0} אינו שייך לחברת {1}
 DocType: Naming Series,Series List for this Transaction,רשימת סדרות לעסקה זו
@@ -229,14 +220,13 @@
 DocType: Leave Allocation,Add unused leaves from previous allocations,להוסיף עלים שאינם בשימוש מהקצאות קודמות
 apps/erpnext/erpnext/controllers/recurring_document.py +206,Next Recurring {0} will be created on {1},הבא חוזר {0} ייווצר על {1}
 DocType: Newsletter List,Total Subscribers,סה&quot;כ מנויים
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +575,Contact Name,שם איש קשר
+,Contact Name,שם איש קשר
 DocType: Production Plan Item,SO Pending Qty,SO המתנת כמות
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,יוצר תלוש משכורת לקריטריונים שהוזכרו לעיל.
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,בקש לרכישה.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +107,Double housing,דיור זוגי
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +156,Only the selected Leave Approver can submit this Leave Application,רק המאשר Leave נבחר יכול להגיש בקשה זו החופשה
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +171,Only the selected Leave Approver can submit this Leave Application,רק המאשר Leave נבחר יכול להגיש בקשה זו החופשה
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,להקלה על התאריך חייבת להיות גדולה מ תאריך ההצטרפות
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +172,Leaves per Year,עלים בכל שנה
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +172,Leaves per Year,עלים בכל שנה
 DocType: Time Log,Will be updated when batched.,יעודכן כאשר לכלך.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +104,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,שורת {0}: בדוק את 'האם Advance' נגד חשבון {1} אם זה כניסה מראש.
 apps/erpnext/erpnext/stock/utils.py +174,Warehouse {0} does not belong to company {1},מחסן {0} אינו שייך לחברת {1}
@@ -244,25 +234,24 @@
 DocType: Item Website Specification,Item Website Specification,מפרט אתר פריט
 DocType: Dropbox Backup,Dropbox Access Key,Dropbox מפתח הגישה
 DocType: Payment Tool,Reference No,אסמכתא
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +348,Leave Blocked,השאר חסימה
-apps/erpnext/erpnext/stock/doctype/item/item.py +535,Item {0} has reached its end of life on {1},פריט {0} הגיע לסיומו של חיים על {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +392,Leave Blocked,השאר חסימה
+apps/erpnext/erpnext/stock/doctype/item/item.py +539,Item {0} has reached its end of life on {1},פריט {0} הגיע לסיומו של חיים על {1}
 apps/erpnext/erpnext/accounts/utils.py +339,Annual,שנתי
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,פריט במלאי פיוס
 DocType: Stock Entry,Sales Invoice No,מכירות חשבונית לא
 DocType: Material Request Item,Min Order Qty,להזמין כמות מינימום
 DocType: Lead,Do Not Contact,אל תצור קשר
 DocType: Sales Invoice,The unique id for tracking all recurring invoices. It is generated on submit.,Id הייחודי למעקב אחר כל החשבוניות חוזרות. הוא נוצר על שליחה.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +93,Software Developer,מפתח תוכנה
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +93,Software Developer,מפתח תוכנה
 DocType: Item,Minimum Order Qty,להזמין כמות מינימום
 DocType: Pricing Rule,Supplier Type,סוג ספק
 DocType: Item,Publish in Hub,פרסם בHub
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +555,Item {0} is cancelled,פריט {0} יבוטל
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +598,Material Request,בקשת חומר
+apps/erpnext/erpnext/stock/doctype/item/item.py +559,Item {0} is cancelled,פריט {0} יבוטל
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +607,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} לא נמצא בטבלה &quot;חומרי גלם מסופקת &#39;בהזמנת רכש {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +129,Wire brushing,צחצוח חוט
 DocType: Employee,Relation,ביחס
 DocType: Shipping Rule,Worldwide Shipping,משלוח ברחבי העולם
 apps/erpnext/erpnext/config/selling.py +23,Confirmed orders from Customers.,הזמנות אישרו מלקוחות.
@@ -278,12 +267,11 @@
 DocType: Supplier,Address HTML,כתובת HTML
 DocType: Lead,Mobile No.,מס 'נייד
 DocType: Maintenance Schedule,Generate Schedule,צור לוח זמנים
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +81,Hubbing,Hubbing
 DocType: Purchase Invoice Item,Expense Head,ראש ההוצאה
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +86,Please select Charge Type first,אנא בחר Charge סוג ראשון
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,אחרון
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +395,Max 5 characters,מקסימום 5 תווים
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +195,Select Your Language,בחר את השפה שלך
+apps/erpnext/erpnext/public/js/setup_wizard.js +143,Max 5 characters,מקסימום 5 תווים
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +245,Select Your Language,בחר את השפה שלך
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,המאשר החופשה הראשונה ברשימה תהיה לקבוע כברירת מחדל Leave המאשרת
 DocType: Manufacturing Settings,"Disables creation of time logs against Production Orders.
 Operations shall not be tracked against Production Order",משבית יצירת יומני זמן נגד הזמנות ייצור. פעולות לא להיות במעקב נגד ההפקה להזמין
@@ -295,8 +283,6 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +34,Item {0} must be Service Item,פריט {0} חייב להיות פריט השירות
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +303,Completed Qty can not be greater than 'Qty to Manufacture',"כמות שהושלמה לא יכולה להיות גדולה מ 'כמות לייצור """
 DocType: DocType,Administrator,מנהל
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +136,Laser drilling,קידוח לייזר
-DocType: Stock UOM Replace Utility,New Stock UOM,החדש במלאי של אוני 'מישגן
 DocType: Period Closing Voucher,Closing Account Head,סגירת חשבון ראש
 DocType: Employee,External Work History,חיצוני היסטוריה עבודה
 apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,שגיאת הפניה מעגלית
@@ -305,18 +291,15 @@
 DocType: Lead,Industry,תעשייה
 DocType: Employee,Job Profile,פרופיל עבודה
 DocType: Newsletter,Newsletter,עלון
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +84,Hydroforming,Hydroforming
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +49,Necking,עִלוּסִים
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,להודיע ​​באמצעות דואר אלקטרוני על יצירת בקשת חומר אוטומטית
 DocType: Journal Entry,Multi Currency,מטבע רב
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +51,Item is updated,פריט מתעדכן
 DocType: Async Task,System Manager,מנהל מערכת
 DocType: Payment Reconciliation Invoice,Invoice Type,סוג חשבונית
 DocType: Sales Invoice Item,Delivery Note,תעודת משלוח
 DocType: Dropbox Backup,Allow Dropbox Access,אפשר גישה Dropbox
 apps/erpnext/erpnext/config/learn.py +72,Setting up Taxes,הגדרת מסים
 apps/erpnext/erpnext/accounts/utils.py +189,Payment Entry has been modified after you pulled it. Please pull it again.,כניסת תשלום השתנתה לאחר שמשכת אותו. אנא למשוך אותו שוב.
-apps/erpnext/erpnext/stock/doctype/item/item.py +343,{0} entered twice in Item Tax,{0} נכנס פעמיים במס פריט
+apps/erpnext/erpnext/stock/doctype/item/item.py +347,{0} entered twice in Item Tax,{0} נכנס פעמיים במס פריט
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +105,Summary for this week and pending activities,סיכום השבוע הזה ופעילויות תלויות ועומדות
 DocType: Workstation,Rent Cost,עלות השכרה
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +74,Please select month and year,אנא בחר חודש והשנה
@@ -333,22 +316,20 @@
 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","זמין בBOM, תעודת משלוח, חשבוניות רכש, ייצור להזמין, הזמנת רכש, קבלת רכישה, מכירות חשבונית, הזמנת מכירות, מלאי כניסה, גליון"
 DocType: Item Tax,Tax Rate,שיעור מס
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Select Item,פריט בחר
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +540,Select Item,פריט בחר
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +143,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","פריט: {0} הצליח אצווה-חכם, לא ניתן ליישב באמצעות מניות \ פיוס, במקום להשתמש במלאי כניסה"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +259,Purchase Invoice {0} is already submitted,לרכוש חשבונית {0} כבר הוגשה
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +262,Purchase Invoice {0} is already submitted,לרכוש חשבונית {0} כבר הוגשה
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Batch No must be same as {1} {2},# השורה {0}: אצווה לא חייב להיות זהה {1} {2}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Convert to non-Group,המרת שאינה קבוצה
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +55,Purchase Receipt must be submitted,קבלת רכישה יש להגיש
-DocType: Stock UOM Replace Utility,Current Stock UOM,נוכחי במלאי של אוני 'מישגן
 apps/erpnext/erpnext/config/stock.py +53,Batch (lot) of an Item.,אצווה (הרבה) של פריט.
 DocType: C-Form Invoice Detail,Invoice Date,תאריך חשבונית
 DocType: GL Entry,Debit Amount,סכום חיוב
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Your email address,"כתובת הדוא""ל שלך"
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +194,Please see attachment,אנא ראה קובץ מצורף
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +203,Please see attachment,אנא ראה קובץ מצורף
 DocType: Purchase Order,% Received,% התקבל
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +109,Water jet cutting,חיתוך סילון מים
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +24,Setup Already Complete!!,התקנה כבר מלא !!
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +20,Setup Already Complete!!,התקנה כבר מלא !!
 ,Finished Goods,מוצרים מוגמרים
 DocType: Delivery Note,Instructions,הוראות
 DocType: Quality Inspection,Inspected By,נבדק על ידי
@@ -363,6 +344,7 @@
 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,המרת מטבע
 DocType: Purchase Invoice Item,Item Name,שם פריט
+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","פריטים לבקשו שהם ""אזל"" בהתחשב בכל המחסנים המבוססים על כמות צפויה וכמות הזמנה מינימאלית"
@@ -372,11 +354,10 @@
 ,Purchase Register,רכישת הרשמה
 DocType: Landed Cost Item,Applicable Charges,חיובים החלים
 DocType: Workstation,Consumable Cost,עלות מתכלה
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,{0} ({1}) must have role 'Leave Approver',"{0} ({1}) חייב להיות תפקיד ""Leave מאשר '"
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +167,{0} ({1}) must have role 'Leave Approver',"{0} ({1}) חייב להיות תפקיד ""Leave מאשר '"
 DocType: Purchase Receipt,Vehicle Date,תאריך רכב
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +39,Medical,רפואי
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +39,Medical,רפואי
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,סיבה לאיבוד
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +36,Tube beading,אגלי צינור
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},תחנת עבודה סגורה בתאריכים הבאים בהתאם לרשימת Holiday: {0}
 DocType: Employee,Single,אחת
 DocType: Issue,Attachment,קובץ מצורף
@@ -397,10 +378,8 @@
 DocType: Account,Is Group,קבוצה
 DocType: Stock Settings,Automatically Set Serial Nos based on FIFO,הגדר סידורי מס באופן אוטומטי על בסיס FIFO
 DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,ספק בדוק חשבונית מספר הייחוד
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +31,Thermoforming,Thermoforming
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +66,Slitting,שיסוף
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +57,'To Case No.' cannot be less than 'From Case No.',"""למקרה מס ' לא יכול להיות פחות מ 'מתיק מס' '"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +104,Non Profit,ללא כוונת רווח
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +104,Non Profit,ללא כוונת רווח
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_list.js +7,Not Started,לא התחיל
 DocType: Lead,Channel Partner,Channel Partner
 DocType: Account,Old Parent,האם ישן
@@ -409,13 +388,12 @@
 apps/erpnext/erpnext/config/manufacturing.py +74,Global settings for all manufacturing processes.,הגדרות גלובליות עבור כל תהליכי הייצור.
 DocType: Accounts Settings,Accounts Frozen Upto,חשבונות קפואים Upto
 DocType: SMS Log,Sent On,נשלח ב
-apps/erpnext/erpnext/stock/doctype/item/item.py +512,Attribute {0} selected multiple times in Attributes Table,תכונה {0} נבחר מספר פעמים בטבלה תכונות
+apps/erpnext/erpnext/stock/doctype/item/item.py +516,Attribute {0} selected multiple times in Attributes Table,תכונה {0} נבחר מספר פעמים בטבלה תכונות
 DocType: Sales Order,Not Applicable,לא ישים
 apps/erpnext/erpnext/config/hr.py +140,Holiday master.,אב חג.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +19,Shell molding,דפוס פגז
 DocType: Material Request Item,Required Date,תאריך הנדרש
 DocType: Delivery Note,Billing Address,כתובת לחיוב
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +644,Please enter Item Code.,נא להזין את קוד פריט.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +648,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,"סה""כ כמות"
@@ -425,7 +403,7 @@
 DocType: Item Attribute,To Range,לטווח
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,ניירות ערך ופיקדונות
 DocType: Features Setup,Imports,יבוא
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +144,Adhesive bonding,מליטה הדבקה
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +77,Total leaves allocated is mandatory,סה&quot;כ עלים שהוקצו הוא חובה
 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.,נוכחות שיא.
@@ -433,26 +411,25 @@
 DocType: Sales Order Item,Used for Production Plan,המשמש לתכנית ייצור
 DocType: System Settings,Loading...,Loading ...
 DocType: DocField,Password,סיסמא
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +155,Fused deposition modeling,דוגמנות בתצהיר התמזגה
 DocType: Manufacturing Settings,Time Between Operations (in mins),זמן בין פעולות (בדקות)
 DocType: Customer,Buyer of Goods and Services.,קונה של מוצרים ושירותים.
 DocType: Journal Entry,Accounts Payable,חשבונות לתשלום
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +24,Add Subscribers,להוסיף מנויים
 apps/erpnext/erpnext/public/js/feature_setup.js +220,""" does not exists","""לא קיים"
 DocType: Pricing Rule,Valid Upto,Upto חוקי
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +564,List a few of your customers. They could be organizations or individuals.,רשימה כמה מהלקוחות שלך. הם יכולים להיות ארגונים או יחידים.
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,List a few of your customers. They could be organizations or individuals.,רשימה כמה מהלקוחות שלך. הם יכולים להיות ארגונים או יחידים.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Direct Income,הכנסה ישירה
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +33,"Can not filter based on Account, if grouped by Account","לא יכול לסנן על פי חשבון, אם מקובצים לפי חשבון"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +88,Administrative Officer,קצין מנהלי
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Administrative Officer,קצין מנהלי
 DocType: Payment Tool,Received Or Paid,התקבל או שולם
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +318,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 +305,Please enter Warehouse for which Material Request will be raised,נא להזין את המחסן שלבקשת חומר יועלה
 DocType: Production Order,Additional Operating Cost,עלות הפעלה נוספות
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +20,Cosmetics,קוסמטיקה
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,קוסמטיקה
 DocType: DocField,Type,סוג
-apps/erpnext/erpnext/stock/doctype/item/item.py +417,"To merge, following properties must be same for both items","למזג, המאפיינים הבאים חייבים להיות זהים בשני הפריטים"
+apps/erpnext/erpnext/stock/doctype/item/item.py +421,"To merge, following properties must be same for both items","למזג, המאפיינים הבאים חייבים להיות זהים בשני הפריטים"
 DocType: Communication,Subject,נושא
 DocType: Shipping Rule,Net Weight,משקל נטו
 DocType: Employee,Emergency Phone,טל 'חירום
@@ -462,7 +439,6 @@
 DocType: Journal Entry,Difference (Dr - Cr),"הבדל (ד""ר - Cr)"
 DocType: Account,Profit and Loss,רווח והפסד
 apps/erpnext/erpnext/config/stock.py +293,Managing Subcontracting,קבלנות משנה ניהול
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +58,New UOM must NOT be of type Whole Number,החדש של אוני 'מישגן לא חייבים להיות של מספר שלם סוג
 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 +47,Account {0} does not belong to company: {1},חשבון {0} אינו שייך לחברה: {1}
@@ -481,14 +457,14 @@
 DocType: Purchase Invoice,Supplier Invoice No,ספק חשבונית לא
 DocType: Territory,For reference,לעיון
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +154,"Cannot delete Serial No {0}, as it is used in stock transactions","לא יכול למחוק את מספר סידורי {0}, כפי שהוא משמש בעסקות מניות"
-apps/erpnext/erpnext/public/js/account_tree_grid.js +52,Closing (Cr),סגירה (Cr)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +227,Closing (Cr),סגירה (Cr)
 DocType: Serial No,Warranty Period (Days),תקופת אחריות (ימים)
 DocType: Installation Note Item,Installation Note Item,פריט הערה התקנה
 ,Pending Qty,בהמתנה כמות
 DocType: Job Applicant,Thread HTML,אשכול HTML
 DocType: Company,Ignore,התעלם
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +86,SMS sent to following numbers: {0},SMS שנשלח למספרים הבאים: {0}
-apps/erpnext/erpnext/controllers/buying_controller.py +135,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,מחסן ספק חובה לקבלה-נדבק תת רכישה
+apps/erpnext/erpnext/controllers/buying_controller.py +126,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,מחסן ספק חובה לקבלה-נדבק תת רכישה
 DocType: Pricing Rule,Valid From,בתוקף מ
 DocType: Sales Invoice,Total Commission,"הוועדה סה""כ"
 DocType: Pricing Rule,Sales Partner,פרטנר מכירות
@@ -496,7 +472,7 @@
 DocType: Monthly Distribution,"**Monthly Distribution** helps you distribute your budget across months if you have seasonality in your business.
 
 To distribute a budget using this distribution, set this **Monthly Distribution** in the **Cost Center**","** בחתך חודשי ** עוזר לך להפיץ את התקציב שלך על פני חודשים אם יש לך עונתיות בעסק שלך. על חלוקת תקציב באמצעות חלוקה זו, שנקבע בחתך חודשי ** זה ** במרכז העלות ** **"
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +183,No records found in the Invoice table,לא נמצא רשומות בטבלת החשבונית
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +130,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 +84,Financial / accounting year.,כספי לשנה / חשבונאות.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","מצטער, לא ניתן למזג מס סידורי"
@@ -512,25 +488,25 @@
 DocType: Sales Order,Billing and Delivery Status,סטטוס חיוב ומשלוח
 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/setup/page/setup_wizard/setup_wizard_page.html +16,Previous,קודם
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard_page.html +16,Previous,קודם
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +620,Sales Return,חזור מכירות
 DocType: Production Planning Tool,Select Sales Orders from which you want to create Production Orders.,בחר הזמנות ומכירות ממנו ברצונך ליצור הזמנות ייצור.
 DocType: Item,Delivered by Supplier (Drop Ship),נמסר על ידי ספק (זרוק משלוח)
 apps/erpnext/erpnext/config/hr.py +120,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.,מאגר מידע על לקוחות.
 DocType: Quotation,Quotation To,הצעת מחיר ל
 DocType: Lead,Middle Income,הכנסה התיכונה
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),פתיחה (Cr)
 apps/erpnext/erpnext/accounts/utils.py +193,Allocated amount can not be negative,סכום שהוקצה אינו יכול להיות שלילי
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +123,Tumbling,מתגלגל
 DocType: Purchase Order Item,Billed Amt,Amt שחויב
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,מחסן לוגי שנגדו מרשמו רשומות מלאי
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +92,Reference No & Reference Date is required for {0},התייחסות לא & תאריך הפניה נדרש עבור {0}
 DocType: Event,Wednesday,יום רביעי
 DocType: Sales Invoice,Customer's Vendor,הספק של הלקוח
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +214,Production Order is Mandatory,ייצור להזמין מנדטורי
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +139,Proposal Writing,כתיבת הצעה
+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} קיים עם אותו זיהוי העובד
 DocType: Fiscal Year Company,Fiscal Year Company,שנת כספי חברה
 DocType: Packing Slip Item,DN Detail,פרט DN
@@ -552,7 +528,7 @@
 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/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.py +179,Please install dropbox python module,בבקשה להתקין מודול פייתון dropbox
 DocType: Employee,Passport Number,דרכון מספר
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +82,Manager,מנהל
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Manager,מנהל
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +494,From Purchase Receipt,מיום קבלת רכישה
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +219,Same item has been entered multiple times.,אותו פריט כבר נכנס מספר רב של פעמים.
 DocType: SMS Settings,Receiver Parameter,מקלט פרמטר
@@ -560,10 +536,9 @@
 DocType: Sales Person,Sales Person Targets,מטרות איש מכירות
 apps/frappe/frappe/public/js/frappe/form/workflow.js +116,To,ל
 apps/frappe/frappe/templates/base.html +145,Please enter email address,אנא הכנס את כתובת דואר אלקטרוני
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +35,End tube forming,צינור סוף יצירה
 DocType: Production Order Operation,In minutes,בדקות
 DocType: Issue,Resolution Date,תאריך החלטה
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +635,Please set default Cash or Bank account in Mode of Payment {0},אנא הגדר מזומנים ברירת מחדל או חשבון בנק במצב של תשלום {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +637,Please set default Cash or Bank account in Mode of Payment {0},אנא הגדר מזומנים ברירת מחדל או חשבון בנק במצב של תשלום {0}
 DocType: Selling Settings,Customer Naming By,Naming הלקוח על ידי
 apps/erpnext/erpnext/accounts/doctype/account/account.js +67,Convert to Group,להמיר לקבוצה
 DocType: Activity Cost,Activity Type,סוג הפעילות
@@ -571,12 +546,12 @@
 DocType: Customer,Fixed Days,ימים קבועים
 DocType: Sales Invoice,Packing List,רשימת אריזה
 apps/erpnext/erpnext/config/buying.py +28,Purchase Orders given to Suppliers.,הזמנות רכש שניתנו לספקים.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +43,Publishing,הוצאה לאור
+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 +198,{0}: {1} not found in Invoice Details table,{0}: {1} לא נמצא בטבלת פרטי החשבונית
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,{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 +208,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,בקרו תחזוקת {0} יש לבטל לפני ביטול הזמנת מכירות זה
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +203,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),"פתיחה (ד""ר)"
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},חותמת זמן פרסום חייבת להיות אחרי {0}
@@ -588,7 +563,6 @@
 DocType: Pricing Rule,Sales Manager,מנהל מכירות
 apps/frappe/frappe/public/js/frappe/model/model.js +492,Rename,שינוי שם
 DocType: Journal Entry,Write Off Amount,לכתוב את הסכום
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +52,Bending,כיפוף
 apps/frappe/frappe/core/page/user_permissions/user_permissions.js +246,Allow User,לאפשר למשתמש
 DocType: Journal Entry,Bill No,ביל לא
 DocType: Purchase Invoice,Quarterly,הרבעונים
@@ -598,17 +572,16 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Please enter item details,נא להזין את פרטי פריט
 DocType: Purchase Receipt,Other Details,פרטים נוספים
 DocType: Account,Accounts,חשבונות
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +67,Marketing,שיווק
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +65,Straight shearing,גז ישר
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +67,Marketing,שיווק
 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.,כדי לעקוב אחר פריט במכירות ובמסמכי רכישה מבוססת על nos הסידורי שלהם. זה גם יכול להשתמש כדי לעקוב אחר פרטי אחריות של המוצר.
 DocType: Purchase Receipt Item Supplied,Current Stock,המניה נוכחית
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +99,Rejected Warehouse is mandatory against regected item,מחסן שנדחו הוא חובה נגד פריט regected
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +102,Rejected Warehouse is mandatory against regected item,מחסן שנדחו הוא חובה נגד פריט regected
 DocType: Account,Expenses Included In Valuation,הוצאות שנכללו בהערכת שווי
 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,להציע מכתב לטווח
-apps/erpnext/erpnext/stock/doctype/item/item.py +492,Item has variants.,יש פריט גרסאות.
+apps/erpnext/erpnext/stock/doctype/item/item.py +496,Item has variants.,יש פריט גרסאות.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,פריט {0} לא נמצא
 DocType: Bin,Stock Value,מניית ערך
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,סוג העץ
@@ -617,10 +590,9 @@
 DocType: Material Request Item,Quantity and Warehouse,כמות ומחסן
 DocType: Sales Invoice,Commission Rate (%),ועדת שיעור (%)
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +172,"Against Voucher Type must be one of Sales Order, Sales Invoice or Journal Entry","נגד שובר סוג חייב להיות אחד מלהזמין מכירות, חשבוניות מכירות או יומן"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +139,Biomachining,Biomachining
 apps/erpnext/erpnext/setup/utils.py +89,Unable to find exchange rate,לא ניתן למצוא את שער חליפין
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +7,Aerospace,התעופה והחלל
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +19,Welcome,ברוכים הבאים
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +7,Aerospace,התעופה והחלל
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +40,Welcome,ברוכים הבאים
 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.,מוצרים שהתקבלו מספקים.
@@ -643,18 +615,18 @@
 DocType: Employee,Cell Number,מספר סלולארי
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,איבדתי
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +120,You can not enter current voucher in 'Against Journal Entry' column,אתה לא יכול להיכנס לשובר נוכחי ב'נגד תנועת יומן 'טור
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +25,Energy,אנרגיה
+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.,הצהרת משכורת חודשית.
 DocType: Item Group,Website Specifications,מפרט אתר
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +205,New Account,חשבון חדש
-apps/erpnext/erpnext/controllers/buying_controller.py +283,Row {0}: Conversion Factor is mandatory,שורת {0}: המרת פקטור הוא חובה
+apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,שורת {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.,רישומים חשבונאיים יכולים להתבצע נגד צמתים עלה. ערכים נגד קבוצות אינם מורשים.
 DocType: ToDo,High,גבוה
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +361,Cannot deactivate or cancel BOM as it is linked with other BOMs,לא יכול לבטל או לבטל BOM כפי שהוא מקושר עם עצי מוצר אחרים
 DocType: Opportunity,Maintenance,תחזוקה
 DocType: User,Male,זכר
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +182,Purchase Receipt number required for Item {0},מספר קבלת רכישה הנדרש לפריט {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +183,Purchase Receipt number required for Item {0},מספר קבלת רכישה הנדרש לפריט {0}
 DocType: Item Attribute Value,Item Attribute Value,פריט תכונה ערך
 apps/erpnext/erpnext/config/crm.py +64,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.
@@ -683,10 +655,9 @@
 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 +324,"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/page/setup_wizard/fixtures/industry_type.py +13,Biotechnology,ביוטכנולוגיה
+apps/erpnext/erpnext/controllers/accounts_controller.py +325,"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,הוצאות משרד תחזוקה
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +53,Hemming,המינג
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +66,Please enter Item first,אנא ראשון להיכנס פריט
 DocType: Account,Liability,אחריות
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +62,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,סכום גושפנקא לא יכול להיות גדול מסכום תביעה בשורה {0}.
@@ -699,10 +670,10 @@
 DocType: Company,Default Bank Account,חשבון בנק ברירת מחדל
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +47,"To filter based on Party, select Party Type first","כדי לסנן מבוסס על המפלגה, מפלגה בחר את הסוג ראשון"
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},"לא ניתן לבדוק את &quot;מלאי עדכון &#39;, כי פריטים אינם מועברים באמצעות {0}"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Nos,מס
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Nos,מס
 DocType: Item,Items with higher weightage will be shown higher,פריטים עם weightage גבוה יותר תוכלו לראות גבוהים יותר
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,פרט בנק פיוס
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +627,My Invoices,חשבוניות שלי
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +629,My Invoices,חשבוניות שלי
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,אף עובדים מצא
 DocType: Purchase Order,Stopped,נעצר
 DocType: Item,If subcontracted to a vendor,אם קבלן לספקים
@@ -721,35 +692,33 @@
 DocType: Features Setup,"To enable ""Point of Sale"" features",כדי לאפשר &quot;נקודת המכירה&quot; תכונות
 DocType: Bin,Moving Average Rate,נע תעריף ממוצע
 DocType: Production Planning Tool,Select Items,פריטים בחרו
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,{0} against Bill {1} dated {2},{0} נגד ביל {1} יום {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +328,{0} against Bill {1} dated {2},{0} נגד ביל {1} יום {2}
 DocType: Comment,Reference Name,שם התייחסות
 DocType: Maintenance Visit,Completion Status,סטטוס השלמה
 DocType: Sales Invoice Item,Target Warehouse,יעד מחסן
 DocType: Item,Allow over delivery or receipt upto this percent,לאפשר על משלוח או קבלת upto אחוזים זה
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +49,Expected Delivery Date cannot be before Sales Order Date,תאריך אספקה ​​צפוי לא יכול להיות לפני תאריך הזמנת המכירות
 DocType: Upload Attendance,Import Attendance,נוכחות יבוא
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +17,All Item Groups,בכל קבוצות הפריט
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +17,All Item Groups,בכל קבוצות הפריט
 DocType: Process Payroll,Activity Log,יומן פעילות
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +30,Net Profit / Loss,רווח נקי / הפסד
 apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,באופן אוטומטי לחבר את ההודעה על הגשת עסקות.
 DocType: Production Order,Item To Manufacture,פריט לייצור
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +16,Permanent mold casting,ליהוק עובש קבוע
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} המצב הוא {2}
 apps/erpnext/erpnext/config/learn.py +172,Purchase Order to Payment,הזמנת רכש לתשלום
 DocType: Sales Order Item,Projected Qty,כמות חזויה
 DocType: Sales Invoice,Payment Due Date,מועד תשלום
 DocType: Newsletter,Newsletter Manager,מנהל עלון
-apps/erpnext/erpnext/stock/doctype/item/item.js +229,Item Variant {0} already exists with same attributes,פריט Variant {0} כבר קיים עימן תכונות
+apps/erpnext/erpnext/stock/doctype/item/item.js +231,Item Variant {0} already exists with same attributes,פריט Variant {0} כבר קיים עימן תכונות
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening',&quot;פתיחה&quot;
 DocType: Notification Control,Delivery Note Message,מסר תעודת משלוח
 DocType: Expense Claim,Expenses,הוצאות
 DocType: Item Variant Attribute,Item Variant Attribute,תכונה Variant פריט
 ,Purchase Receipt Trends,מגמות קבלת רכישה
 DocType: Appraisal,Select template from which you want to get the Goals,בחר תבנית שממנה אתה רוצה לקבל את המטרות
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +77,Research & Development,מחקר ופיתוח
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Research & Development,מחקר ופיתוח
 ,Amount to Bill,הסכום להצעת החוק
 DocType: Company,Registration Details,פרטי רישום
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +75,Staking,עומס כבד
 DocType: Item,Re-Order Qty,Re-להזמין כמות
 DocType: Leave Block List Date,Leave Block List Date,השאר תאריך בלוק רשימה
 DocType: Pricing Rule,Price or Discount,מחיר או הנחה
@@ -759,18 +728,16 @@
 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/hr/doctype/leave_allocation/leave_allocation.py +71,Cannot carry forward {0},לא יכול לשאת קדימה {0}
 apps/erpnext/erpnext/accounts/doctype/account/account.py +91,"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,הודעת תביעת הוצאות שנדחו
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +145,Nailing,סִמוּר
 ,Available Qty,כמות זמינה
 DocType: Purchase Taxes and Charges,On Previous Row Total,"בשורה הקודמת סה""כ"
 DocType: Salary Slip,Working Days,ימי עבודה
 DocType: Serial No,Incoming Rate,שערי נכנסים
 DocType: Packing Slip,Gross Weight,משקל ברוטו
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +410,The name of your company for which you are setting up this system.,שמה של החברה שלך שאתה מגדיר את המערכת הזאת.
+apps/erpnext/erpnext/public/js/setup_wizard.js +158,The name of your company for which you are setting up this system.,שמה של החברה שלך שאתה מגדיר את המערכת הזאת.
 DocType: HR Settings,Include holidays in Total no. of Working Days,כולל חגים בסך הכל לא. ימי עבודה
 DocType: Job Applicant,Hold,החזק
 DocType: Employee,Date of Joining,תאריך ההצטרפות
@@ -780,7 +747,6 @@
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +3,View Subscribers,צפה מנויים
 DocType: Purchase Invoice Item,Purchase Receipt,קבלת רכישה
 ,Received Items To Be Billed,פריטים שהתקבלו לחיוב
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +114,Abrasive blasting,פיצוץ שוחקים
 DocType: Employee,Ms,גב '
 apps/erpnext/erpnext/config/accounts.py +148,Currency exchange rate master.,שער חליפין של מטבע שני.
 DocType: Production Order,Plan material for sub-assemblies,חומר תכנית לתת מכלולים
@@ -791,7 +757,7 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +209,Serial No {0} does not belong to Item {1},מספר סידורי {0} אינו שייך לפריט {1}
 DocType: Purchase Receipt Item Supplied,Required Qty,חובה כמות
 DocType: Bank Reconciliation,Total Amount,"סה""כ לתשלום"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +32,Internet Publishing,הוצאה לאור באינטרנט
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,הוצאה לאור באינטרנט
 DocType: Production Planning Tool,Production Orders,הזמנות ייצור
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +35,Balance Value,ערך איזון
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,מחיר מחירון מכירות
@@ -802,7 +768,7 @@
 DocType: Supplier,Default Payable Accounts,חשבונות לתשלום ברירת מחדל
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,עובד {0} אינו פעיל או שאינו קיים
 DocType: Features Setup,Item Barcode,ברקוד פריט
-apps/erpnext/erpnext/stock/doctype/item/item.py +487,Item Variants {0} updated,פריט גרסאות {0} מעודכן
+apps/erpnext/erpnext/stock/doctype/item/item.py +491,Item Variants {0} updated,פריט גרסאות {0} מעודכן
 DocType: Quality Inspection Reading,Reading 6,קריאת 6
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,לרכוש חשבונית מראש
 DocType: Address,Shop,חנות
@@ -811,7 +777,7 @@
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,חשבון בנק / מזומנים ברירת מחדל יהיה מעודכן באופן אוטומטי בקופת חשבונית כאשר מצב זה נבחר.
 DocType: Employee,Permanent Address Is,כתובת קבע
 DocType: Production Order Operation,Operation completed for how many finished goods?,מבצע הושלם לכמה מוצרים מוגמרים?
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +491,The Brand,המותג
+apps/erpnext/erpnext/public/js/setup_wizard.js +237,The Brand,המותג
 apps/erpnext/erpnext/controllers/status_updater.py +163,Allowance for over-{0} crossed for Item {1}.,הפרשה ליתר {0} חצה לפריט {1}.
 DocType: Employee,Exit Interview Details,פרטי ראיון יציאה
 DocType: Item,Is Purchase Item,האם פריט הרכישה
@@ -831,16 +797,16 @@
 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,סכום תשלום שנקבע = סכום מצטיין
 DocType: Contact Us Settings,Address Line 1,שורת כתובת 1
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Variance,שונות
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +392,Company Name,שם חברה
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +53,Variance,שונות
+,Company Name,שם חברה
 DocType: SMS Center,Total Message(s),מסר כולל (ים)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +515,Select Item for Transfer,פריט בחר להעברה
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +538,Select Item for Transfer,פריט בחר להעברה
 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.,ראש בחר חשבון של הבנק שבו הופקד שיק.
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,לאפשר למשתמש לערוך מחירון שיעור בעסקות
 DocType: Pricing Rule,Max Qty,מקס כמות
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +106,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,שורת {0}: תשלום נגד מכירות / הזמנת רכש תמיד צריך להיות מסומן כמראש
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +16,Chemical,כימיה
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,כימיה
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +693,All items have already been transferred for this Production Order.,כל הפריטים כבר הועברו להזמנת ייצור זה.
 DocType: Process Payroll,Select Payroll Year and Month,בחר שכר שנה וחודש
 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""",עבור לקבוצה המתאימה (בדרך כלל יישום של קרנות&gt; נכסים שוטפים&gt; חשבונות בנק וליצור חשבון חדש (על ידי לחיצה על הוסף לילדים) מסוג &quot;בנק&quot;
@@ -851,12 +817,12 @@
 DocType: Item,Inspection Criteria,קריטריונים לבדיקה
 apps/erpnext/erpnext/config/accounts.py +101,Tree of finanial Cost Centers.,עץ של מרכזי עלות finanial.
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,הועבר
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +492,Upload your letter head and logo. (you can edit them later).,העלה ראש המכתב ואת הלוגו שלך. (אתה יכול לערוך אותם מאוחר יותר).
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +156,White,לבן
+apps/erpnext/erpnext/public/js/setup_wizard.js +238,Upload your letter head and logo. (you can edit them later).,העלה ראש המכתב ואת הלוגו שלך. (אתה יכול לערוך אותם מאוחר יותר).
+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/setup/page/setup_wizard/setup_wizard.js +362,Attach Your Picture,צרף התמונה שלך
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Make ,הפוך
+apps/erpnext/erpnext/public/js/setup_wizard.js +112,Attach Your Picture,צרף התמונה שלך
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +540,Make ,הפוך
 DocType: Journal Entry,Total Amount in Words,סכתי-הכל סכום מילים
 DocType: Workflow State,Stop,להפסיק
 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 אם הבעיה נמשכת.
@@ -864,13 +830,12 @@
 DocType: Lead,Next Contact Date,התאריך לתקשר הבא
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,פתיחת כמות
 DocType: Holiday List,Holiday List Name,שם רשימת החג
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +168,Stock Options,אופציות
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +168,Stock Options,אופציות
 DocType: Journal Entry Account,Expense Claim,תביעת הוצאות
 DocType: Leave Application,Leave Application,החופשה Application
 apps/erpnext/erpnext/config/hr.py +77,Leave Allocation Tool,השאר הקצאת כלי
 DocType: Leave Block List,Leave Block List Dates,השאר תאריכי בלוק רשימה
 DocType: Company,If Monthly Budget Exceeded (for expense account),אם תקציב חודשי חריגה (לחשבון הוצאות)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +56,Trimming,זמירה
 DocType: Workstation,Net Hour Rate,שערי שעה נטו
 DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,קבלת רכישת עלות נחתה
 DocType: Company,Default Terms,תנאי ברירת מחדל
@@ -878,10 +843,9 @@
 DocType: POS Profile,Cash/Bank Account,מזומנים / חשבון בנק
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,Removed items with no change in quantity or value.,פריטים הוסרו ללא שינוי בכמות או ערך.
 DocType: Delivery Note,Delivery To,משלוח ל
-apps/erpnext/erpnext/stock/doctype/item/item.py +509,Attribute table is mandatory,שולחן תכונה הוא חובה
+apps/erpnext/erpnext/stock/doctype/item/item.py +513,Attribute table is mandatory,שולחן תכונה הוא חובה
 DocType: Production Planning Tool,Get Sales Orders,קבל הזמנות ומכירות
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} אינו יכול להיות שלילי
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +103,Filing,הגשה
 apps/erpnext/erpnext/templates/form_grid/item_grid.html +72,Discount,דיסקונט
 DocType: Features Setup,Purchase Discounts,הנחות רכישה
 DocType: Workstation,Wages,שכר
@@ -898,6 +862,7 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +112,You are the Expense Approver for this record. Please Update the 'Status' and Save,אתה המאשר ההוצאה לתקליט הזה. אנא עדכן את 'הסטטוס' ושמור
 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 +136,"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 +194,Serial No {0} is under maintenance contract upto {1},מספר סידורי {0} הוא תחת חוזה תחזוקת upto {1}
@@ -906,7 +871,7 @@
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,הוצאות מכירה
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Buying,קנייה סטנדרטית
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +120,Standard Buying,קנייה סטנדרטית
 DocType: GL Entry,Against,נגד
 DocType: Item,Default Selling Cost Center,מרכז עלות מכירת ברירת מחדל
 DocType: Sales Partner,Implementation Partner,שותף יישום
@@ -926,29 +891,29 @@
 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/setup/page/setup_wizard/setup_wizard.js +588,List a few of your suppliers. They could be organizations or individuals.,רשימה כמה מהספקים שלך. הם יכולים להיות ארגונים או יחידים.
+apps/erpnext/erpnext/public/js/setup_wizard.js +326,List a few of your suppliers. They could be organizations or individuals.,רשימה כמה מהספקים שלך. הם יכולים להיות ארגונים או יחידים.
 DocType: Company,Default Currency,מטבע ברירת מחדל
 DocType: Contact,Enter designation of this Contact,הזן ייעודו של איש קשר זה
 DocType: Contact Us Settings,Address,כתובת
 DocType: Expense Claim,From Employee,מעובדים
-apps/erpnext/erpnext/controllers/accounts_controller.py +338,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,אזהרה: מערכת לא תבדוק overbilling מאז סכום עבור פריט {0} ב {1} הוא אפס
+apps/erpnext/erpnext/controllers/accounts_controller.py +339,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,אזהרה: מערכת לא תבדוק overbilling מאז סכום עבור פריט {0} ב {1} הוא אפס
 DocType: Journal Entry,Make Difference Entry,הפוך כניסת הבדל
 DocType: Upload Attendance,Attendance From Date,נוכחות מתאריך
 DocType: Appraisal Template Goal,Key Performance Area,פינת של ביצועים מרכזיים
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +54,Transportation,תחבורה
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +54,Transportation,תחבורה
 apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +67, and year: ,ושנה:
 DocType: Email Digest,Annual Expense,הוצאה שנתית
 DocType: SMS Center,Total Characters,"סה""כ תווים"
-apps/erpnext/erpnext/controllers/buying_controller.py +139,Please select BOM in BOM field for Item {0},אנא בחר BOM בתחום BOM לפריט {0}
+apps/erpnext/erpnext/controllers/buying_controller.py +130,Please select BOM in BOM field for Item {0},אנא בחר BOM בתחום BOM לפריט {0}
 DocType: C-Form Invoice Detail,C-Form Invoice Detail,פרט C-טופס חשבונית
 DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,תשלום פיוס חשבונית
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +32,Contribution %,% תרומה
 DocType: Item,website page link,קישור לדף באתר
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +192,Let's prepare the system for first use.,בואו להכין את המערכת לשימוש ראשון.
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +242,Let's prepare the system for first use.,בואו להכין את המערכת לשימוש ראשון.
 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 +214,Production Order {0} must be cancelled before cancelling this Sales Order,ייצור להזמין {0} יש לבטל לפני ביטול הזמנת מכירות זה
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +209,Production Order {0} must be cancelled before cancelling this Sales Order,ייצור להזמין {0} יש לבטל לפני ביטול הזמנת מכירות זה
 ,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.,בחר יומני זמן ושלח ליצור חשבונית מכירות חדשה.
@@ -968,14 +933,13 @@
 DocType: Sales Invoice Advance,Sales Invoice Advance,מכירות חשבונית מראש
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +398,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/page/setup_wizard/install_fixtures.py +75,Management,ניהול
+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/setup/page/setup_wizard/fixtures/operations.py +14,Investment casting,ליהוק השקעות
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +51,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.,חבילת נקי (במילים) תהיה גלויה ברגע שאתה לשמור את תלוש המשכורת.
 apps/frappe/frappe/core/doctype/user/user_list.js +12,Active,פעיל
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +154,Blue,כחול
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +154,Blue,כחול
 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,צמתים נוספים ניתן ליצור אך ורק תחת צמתים הסוג 'הקבוצה'
@@ -985,18 +949,16 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +22,POS Profile {0} already created for user: {1} and company {2},פרופיל קופה {0} כבר נוצר עבור משתמש: {1} והחברה {2}
 DocType: Purchase Order Item,UOM Conversion Factor,אוני 'מישגן המרת פקטור
 DocType: Stock Settings,Default Item Group,קבוצת ברירת מחדל של הפריט
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +156,Laminated object manufacturing,ייצור אובייקט רבודה
 apps/erpnext/erpnext/config/buying.py +13,Supplier database.,מסד נתוני ספק.
 DocType: Account,Balance Sheet,מאזן
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +561,Cost Center For Item with Item Code ',עלות מרכז לפריט עם קוד פריט '
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +45,Stretch forming,למתוח להרכיב
 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 +210,"Further accounts can be made under Groups, but entries can be made against non-Groups","חשבונות נוספים יכולים להתבצע תחת קבוצות, אבל ערכים יכולים להתבצע נגד לא-קבוצות"
 apps/erpnext/erpnext/config/hr.py +125,Tax and other salary deductions.,מס וניכויי שכר אחרים.
 DocType: Lead,Lead,עופרת
 DocType: Email Digest,Payables,זכאי
 DocType: Account,Warehouse,מחסן
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +90,Row #{0}: Rejected Qty can not be entered in Purchase Return,# השורה {0}: נדחו לא ניתן להזין כמות ברכישת חזרה
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +93,Row #{0}: Rejected Qty can not be entered in Purchase Return,# השורה {0}: נדחו לא ניתן להזין כמות ברכישת חזרה
 ,Purchase Order Items To Be Billed,פריטים הזמנת רכש לחיוב
 DocType: Purchase Invoice Item,Net Rate,שיעור נטו
 DocType: Purchase Invoice Item,Purchase Invoice Item,לרכוש פריט החשבונית
@@ -1011,13 +973,13 @@
 DocType: Global Defaults,Current Fiscal Year,שנת כספים נוכחית
 DocType: Global Defaults,Disable Rounded Total,"להשבית מעוגל סה""כ"
 DocType: Lead,Call,שיחה
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +384,'Entries' cannot be empty,'הערכים' לא יכולים להיות ריקים
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +386,'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 +205,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/page/setup_wizard/install_fixtures.py +138,Research,מחקר
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +138,Research,מחקר
 DocType: Maintenance Visit Purpose,Work Done,מה נעשה
 apps/erpnext/erpnext/controllers/item_variant.py +25,Please specify at least one attribute in the Attributes table,ציין מאפיין אחד לפחות בטבלת התכונות
 DocType: Contact,User ID,זיהוי משתמש
@@ -1025,10 +987,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +57,View Ledger,צפה לדג'ר
 DocType: File,Lft,LFT
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,המוקדם
-apps/erpnext/erpnext/stock/doctype/item/item.py +394,"An Item Group exists with same name, please change the item name or rename the item group","קבוצת פריט קיימת עם אותו שם, בבקשה לשנות את שם הפריט או לשנות את שם קבוצת הפריט"
+apps/erpnext/erpnext/stock/doctype/item/item.py +398,"An Item Group exists with same name, please change the item name or rename the item group","קבוצת פריט קיימת עם אותו שם, בבקשה לשנות את שם הפריט או לשנות את שם קבוצת הפריט"
 DocType: Communication,Delivery Status,סטטוס משלוח
 DocType: Production Order,Manufacture against Sales Order,ייצור נגד להזמין מכירות
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +517,Rest Of The World,שאר העולם
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +455,Rest Of The World,שאר העולם
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,פריט {0} לא יכול להיות אצווה
 ,Budget Variance Report,תקציב שונות דווח
 DocType: Salary Slip,Gross Pay,חבילת גרוס
@@ -1039,13 +1001,11 @@
 DocType: BOM Item,Item Description,תיאור פריט
 DocType: Payment Tool,Payment Mode,שיטת תשלום
 DocType: Purchase Invoice,Is Recurring,האם חוזר
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +154,Direct metal laser sintering,sintering לייזר ישיר מתכת
 DocType: Purchase Order,Supplied Items,פריטים שסופקו
 DocType: Production Order,Qty To Manufacture,כמות לייצור
 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,פתיחה זמנית
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +41,Cryorolling,Cryorolling
 ,Employee Leave Balance,עובד חופשת מאזן
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +128,Balance for Account {0} must always be {1},מאזן לחשבון {0} חייב תמיד להיות {1}
 DocType: Address,Address Type,סוג הכתובת
@@ -1061,23 +1021,23 @@
 DocType: Journal Entry,Get Outstanding Invoices,קבל חשבוניות מצטיינים
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,להזמין מכירות {0} אינו חוקי
 apps/erpnext/erpnext/setup/doctype/company/company.py +172,"Sorry, companies cannot be merged","מצטער, לא ניתן למזג חברות"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +145,Small,קטן
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Small,קטן
 DocType: Employee,Employee Number,מספר עובדים
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},מקרה לא (ים) כבר בשימוש. נסה מקייס לא {0}
 ,Invoiced Amount (Exculsive Tax),סכום חשבונית (מס Exculsive)
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,פריט 2
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +59,Account head {0} created,ראש חשבון {0} נוצר
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +153,Green,ירוק
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Green,ירוק
 DocType: Item,Auto re-order,רכב מחדש כדי
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +57,Total Achieved,"סה""כ הושג"
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +59,Total Achieved,"סה""כ הושג"
 DocType: Employee,Place of Issue,מקום ההנפקה
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +59,Contract,חוזה
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Contract,חוזה
 DocType: Report,Disabled,נכים
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +490,UOM coversion factor required for UOM: {0} in Item: {1},גורם coversion של אוני 'מישגן נדרש לאונים' מישגן: {0} בפריט: {1}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +83,Indirect Expenses,הוצאות עקיפות
 apps/erpnext/erpnext/controllers/selling_controller.py +163,Row {0}: Qty is mandatory,שורת {0}: הכמות היא חובה
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +8,Agriculture,חקלאות
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +611,Your Products or Services,המוצרים או השירותים שלך
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,חקלאות
+apps/erpnext/erpnext/public/js/setup_wizard.js +347,Your Products or Services,המוצרים או השירותים שלך
 DocType: Mode of Payment,Mode of Payment,מצב של תשלום
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,מדובר בקבוצת פריט שורש ולא ניתן לערוך.
 DocType: Journal Entry Account,Purchase Order,הזמנת רכש
@@ -1089,7 +1049,7 @@
 DocType: Serial No,Serial No Details,Serial No פרטים
 DocType: Purchase Invoice Item,Item Tax Rate,שיעור מס פריט
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +113,"For {0}, only credit accounts can be linked against another debit entry","עבור {0}, רק חשבונות האשראי יכולים להיות מקושרים נגד כניסת חיוב נוספת"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Delivery Note {0} is not submitted,משלוח הערה {0} לא תוגש
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +470,Delivery Note {0} is not submitted,משלוח הערה {0} לא תוגש
 apps/erpnext/erpnext/stock/get_item_details.py +136,Item {0} must be a Sub-contracted Item,פריט {0} חייב להיות פריט-נדבק Sub
 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.","כלל תמחור נבחר ראשון המבוססת על 'החל ב'שדה, אשר יכול להיות פריט, קבוצת פריט או מותג."
@@ -1099,7 +1059,7 @@
 DocType: Appraisal Goal,Goal,מטרה
 DocType: Sales Invoice Item,Edit Description,עריכת תיאור
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +318,Expected Delivery Date is lesser than Planned Start Date.,תאריך אספקה ​​צפוי הוא פחותה ממועד המתוכנן התחל.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +579,For Supplier,לספקים
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +602,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,"יוצא סה""כ"
@@ -1125,10 +1085,10 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +74,"Total {0} for all items is zero, may you should change 'Distribute Charges Based On'","סה&quot;כ {0} עבור כל הפריטים הוא אפס, אתה עלול צריך לשנות &quot;הפץ חיובים מבוסס על&quot;"
 DocType: Purchase Invoice,Taxes and Charges Calculation,חישוב מסים וחיובים
 DocType: BOM Operation,Workstation,Workstation
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +112,Hardware,חומרה
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +112,Hardware,חומרה
 DocType: Attendance,HR Manager,מנהל משאבי אנוש
 apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,אנא בחר חברה
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +50,Privilege Leave,זכות Leave
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +50,Privilege Leave,זכות Leave
 DocType: Purchase Invoice,Supplier Invoice Date,תאריך חשבונית ספק
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +79,You need to enable Shopping Cart,אתה צריך לאפשר סל קניות
 apps/frappe/frappe/public/js/frappe/form/grid_body.html +6,No Data,אין נתונים
@@ -1141,7 +1101,7 @@
 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 +168,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/setup/page/setup_wizard/install_fixtures.py +38,Food,מזון
+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 +139,You can make a time log only against a submitted production order,אתה יכול לעשות יומן זמן רק נגד הזמנת ייצור שהוגשה
 DocType: Maintenance Schedule Item,No of Visits,אין ביקורים
@@ -1161,6 +1121,7 @@
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,View Offer Letter,מכתב הצעת צפה
 DocType: Communication,Communication,תקשורת
 DocType: Item,Is Service Item,האם פריט השירות
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +81,Application period cannot be outside leave allocation period,תקופת יישום לא יכולה להיות תקופה הקצאת חופשה מחוץ
 DocType: Activity Cost,Projects,פרויקטים
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +31,Please select Fiscal Year,אנא בחר שנת כספים
 DocType: BOM Operation,Operation Description,תיאור מבצע
@@ -1178,7 +1139,7 @@
 DocType: Item,Maintain Stock,לשמור על המלאי
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +213,Stock Entries already created for Production Order ,ערכי מניות כבר יצרו להפקה להזמין
 DocType: Leave Control Panel,Leave blank if considered for all designations,שאר ריק אם תיחשב לכל הכינויים
-apps/erpnext/erpnext/controllers/accounts_controller.py +499,Charge of type 'Actual' in row {0} cannot be included in Item Rate,תשלום מסוג 'בפועל' בשורת {0} אינו יכול להיות כלולים במחיר הפריט
+apps/erpnext/erpnext/controllers/accounts_controller.py +500,Charge of type 'Actual' in row {0} cannot be included in Item Rate,תשלום מסוג 'בפועל' בשורת {0} אינו יכול להיות כלולים במחיר הפריט
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,Max: {0},מקס: {0}
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +16,From Datetime,מDatetime
 DocType: Email Digest,For Company,לחברה
@@ -1188,7 +1149,7 @@
 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 +471,cannot be greater than 100,לא יכול להיות גדול מ 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +546,Item {0} is not a stock Item,פריט {0} הוא לא פריט מניות
+apps/erpnext/erpnext/stock/doctype/item/item.py +550,Item {0} is not a stock Item,פריט {0} הוא לא פריט מניות
 DocType: Maintenance Visit,Unscheduled,לא מתוכנן
 DocType: Employee,Owned,בבעלות
 DocType: Salary Slip Deduction,Depends on Leave Without Pay,תלוי בחופשה ללא תשלום
@@ -1202,28 +1163,26 @@
 DocType: HR Settings,Employee Settings,הגדרות עובד
 ,Batch-Wise Balance History,אצווה-Wise היסטוריה מאזן
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +72,To Do List,כדי לעשות את רשימה
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +63,Apprentice,Apprentice
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Apprentice,Apprentice
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +99,Negative Quantity is not allowed,כמות שלילית אינה מותרת
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
 Used for Taxes and Charges",שולחן פירוט מס לכת מהפריט שני כמחרוזת ומאוחסן בתחום זה. משמש למסים וחיובים
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +61,Lancing,ננעץ
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +151,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/hr/doctype/salary_slip/salary_slip.py +38,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 +112,Tax Rule for transactions.,כלל מס לעסקות.
 DocType: Rename Tool,Type of document to rename.,סוג של מסמך כדי לשנות את השם.
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +630,We buy this Item,אנחנו קונים פריט זה
+apps/erpnext/erpnext/public/js/setup_wizard.js +366,We buy this Item,אנחנו קונים פריט זה
 DocType: Address,Billing,חיוב
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +77,Flanging,Flanging
 DocType: Bulk Email,Not Sent,לא נשלח
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +73,Explosive forming,נפץ יוצרים
 DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),"סה""כ מסים וחיובים (מטבע חברה)"
 DocType: Shipping Rule,Shipping Account,חשבון משלוח
 DocType: Quality Inspection,Readings,קריאות
 DocType: Stock Entry,Total Additional Costs,עלויות נוספות סה&quot;כ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Sub Assemblies,הרכבות תת
+apps/erpnext/erpnext/public/js/setup_wizard.js +359,Sub Assemblies,הרכבות תת
 DocType: Shipping Rule Condition,To Value,לערך
 DocType: Supplier,Stock Manager,מניית מנהל
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +143,Source warehouse is mandatory for row {0},מחסן המקור הוא חובה עבור שורת {0}
@@ -1233,44 +1192,42 @@
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,יבוא נכשל!
 apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,אין כתובת הוסיפה עדיין.
 DocType: Workstation Working Hour,Workstation Working Hour,Workstation עבודה שעה
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +83,Analyst,אנליסט
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +202,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},{0} שורה: סכום שהוקצה {1} חייב להיות פחות מ או שווה לסכום JV {2}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Analyst,אנליסט
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +149,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},{0} שורה: סכום שהוקצה {1} חייב להיות פחות מ או שווה לסכום JV {2}
 DocType: Item,Inventory,מלאי
 DocType: Features Setup,"To enable ""Point of Sale"" view",כדי לאפשר &quot;נקודת מכירה&quot; תצוגה
 apps/erpnext/erpnext/public/js/pos/pos.js +402,Payment cannot be made for empty cart,תשלום לא יכול להתבצע על עגלה ריקה
 DocType: Item,Sales Details,פרטי מכירות
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +149,Pinning,תולה
 DocType: Opportunity,With Items,עם פריטים
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,בכמות
 DocType: Notification Control,Expense Claim Rejected,תביעה נדחתה חשבון
 DocType: Sales Invoice,"The date on which next invoice will be generated. It is generated on submit.
 ",התאריך שבו החשבונית הבאה תופק. הוא נוצר על שליחה.
 DocType: Item Attribute,Item Attribute,תכונה פריט
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +105,Government,ממשלה
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Government,ממשלה
 apps/erpnext/erpnext/config/stock.py +268,Item Variants,גרסאות פריט
 DocType: Company,Services,שירותים
 apps/erpnext/erpnext/accounts/report/financial_statements.py +147,Total ({0}),"סה""כ ({0})"
 DocType: Cost Center,Parent Cost Center,מרכז עלות הורה
 DocType: Sales Invoice,Source,מקור
 DocType: Leave Type,Is Leave Without Pay,האם חופשה ללא תשלום
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +186,No records found in the Payment table,לא נמצא רשומות בטבלת התשלום
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +405,Financial Year Start Date,תאריך כספי לשנה שהתחל
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +133,No records found in the Payment table,לא נמצא רשומות בטבלת התשלום
+apps/erpnext/erpnext/public/js/setup_wizard.js +153,Financial Year Start Date,תאריך כספי לשנה שהתחל
 DocType: Employee External Work History,Total Experience,"ניסיון סה""כ"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +100,Countersinking,Countersinking
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +271,Packing Slip(s) cancelled,Slip אריזה (ים) בוטל
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +276,Packing Slip(s) cancelled,Slip אריזה (ים) בוטל
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,הוצאות הובלה והשילוח
 DocType: Material Request Item,Sales Order No,להזמין ללא מכירות
 DocType: Item Group,Item Group Name,שם קבוצת פריט
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +50,Taken,לקחתי
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,לקחתי
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +66,Transfer Materials for Manufacture,העברת חומרים לייצור
 DocType: Pricing Rule,For Price List,למחירון
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +27,Executive Search,חיפוש הנהלה
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,חיפוש הנהלה
 apps/erpnext/erpnext/stock/stock_ledger.py +405,"Purchase rate for item: {0} not found, which is required to book accounting entry (expense). Please mention item price against a buying price list.","שער רכישה עבור פריט: {0} לא מצא, שנדרש להזמין כניסת חשבונאות (הוצאה). נא לציין פריט מחיר נגד מחירון קנייה."
 DocType: Maintenance Schedule,Schedules,לוחות זמנים
 DocType: Purchase Invoice Item,Net Amount,סכום נטו
 DocType: Purchase Order Item Supplied,BOM Detail No,פרט BOM לא
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),סכום הנחה נוסף (מטבע חברה)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +537,Error: {0} > {1},שגיאה: {0}> {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +541,Error: {0} > {1},שגיאה: {0}> {1}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,צור חשבון חדש מתרשים של חשבונות.
 DocType: Maintenance Visit,Maintenance Visit,תחזוקה בקר
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer > Customer Group > Territory,לקוחות> קבוצת לקוחות> טריטוריה
@@ -1292,15 +1249,14 @@
 DocType: ToDo,Due Date,תאריך יעד
 DocType: Sales Invoice Item,Brand Name,שם מותג
 DocType: Purchase Receipt,Transporter Details,פרטי Transporter
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Box,תיבה
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +389,The Organization,הארגון
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Box,תיבה
+apps/erpnext/erpnext/public/js/setup_wizard.js +137,The Organization,הארגון
 DocType: Monthly Distribution,Monthly Distribution,בחתך חודשי
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,מקלט רשימה ריקה. אנא ליצור מקלט רשימה
 DocType: Production Plan Sales Order,Production Plan Sales Order,הפקת תכנית להזמין מכירות
 DocType: Sales Partner,Sales Partner Target,מכירות פרטנר יעד
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},כניסה לחשבונאות {0} יכולה להתבצע רק במטבע: {1}
 DocType: Pricing Rule,Pricing Rule,כלל תמחור
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +58,Notching,חֵרוּק
 apps/erpnext/erpnext/config/learn.py +167,Material Request to Purchase Order,בקשת חומר להזמנת רכש
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,חשבונות בנק
 ,Bank Reconciliation Statement,הצהרת בנק פיוס
@@ -1315,19 +1271,18 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Amounts not reflected in bank,סכומים שלא באו לידי ביטוי בבנק
 DocType: Quality Inspection Reading,Reading 4,קריאת 4
 apps/erpnext/erpnext/config/hr.py +23,Claims for company expense.,תביעות לחשבון חברה.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +8,Centrifugal casting,ליהוק צנטריפוגלי
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +119,Magnetic field-assisted finishing,גמר סייע שדה מגנטי
 DocType: Company,Default Holiday List,ברירת מחדל רשימת Holiday
 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,לתקשר נייד לא
 DocType: Production Planning Tool,Select Sales Orders,בחר הזמנות ומכירות
 ,Material Requests for which Supplier Quotations are not created,בקשות מהותיות שלציטוטי ספק הם לא נוצרו
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +117,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,היום (ים) שבו אתה מתראיין לחופשת חגים. אתה לא צריך להגיש בקשה לחופשה.
 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/buying/doctype/purchase_order/purchase_order.js +477,Mark as Delivered,סמן כנמסר
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +497,Mark as Delivered,סמן כנמסר
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +34,Make Quotation,הפוך הצעת מחיר
 DocType: Dependent Task,Dependent Task,משימה תלויה
-apps/erpnext/erpnext/stock/doctype/item/item.py +306,Conversion factor for default Unit of Measure must be 1 in row {0},גורם המרה ליחידת ברירת מחדל של מדד חייב להיות 1 בשורה {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +310,Conversion factor for default Unit of Measure must be 1 in row {0},גורם המרה ליחידת ברירת מחדל של מדד חייב להיות 1 בשורה {0}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,נסה לתכנן פעולות לימי X מראש.
 DocType: HR Settings,Stop Birthday Reminders,Stop יום הולדת תזכורות
 DocType: SMS Center,Receiver List,מקלט רשימה
@@ -1335,15 +1290,14 @@
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,כמות הנצרכת
 apps/erpnext/erpnext/public/js/pos/pos.js +491,{0} View,{0} צפה
 DocType: Salary Structure Deduction,Salary Structure Deduction,ניכוי שכר מבנה
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +158,Selective laser sintering,sintering לייזר סלקטיבי
-apps/erpnext/erpnext/stock/doctype/item/item.py +301,Unit of Measure {0} has been entered more than once in Conversion Factor Table,יחידת מידת {0} כבר נכנסה יותר מפעם אחת בהמרת פקטור טבלה
+apps/erpnext/erpnext/stock/doctype/item/item.py +305,Unit of Measure {0} has been entered more than once in Conversion Factor Table,יחידת מידת {0} כבר נכנסה יותר מפעם אחת בהמרת פקטור טבלה
 apps/frappe/frappe/core/page/data_import_tool/data_import_tool.js +108,Import Successful!,יבוא מוצלח!
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,עלות פריטים הונפק
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +185,Quantity must not be more than {0},כמות לא חייבת להיות יותר מ {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +41,Age (Days),גיל (ימים)
 DocType: Quotation Item,Quotation Item,פריט ציטוט
 DocType: Account,Account Name,שם חשבון
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +41,From Date cannot be greater than To Date,מתאריך לא יכול להיות גדול יותר מאשר תאריך
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +34,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.,סוג ספק אמן.
 DocType: Purchase Order Item,Supplier Part Number,"ספק מק""ט"
@@ -1352,14 +1306,14 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +247,{0} {1} is cancelled or stopped,{0} {1} יבוטל או הפסיק
 DocType: Accounts Settings,Credit Controller,בקר אשראי
 DocType: Delivery Note,Vehicle Dispatch Date,תאריך שיגור רכב
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +197,Purchase Receipt {0} is not submitted,קבלת רכישת {0} לא תוגש
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +198,Purchase Receipt {0} is not submitted,קבלת רכישת {0} לא תוגש
 DocType: Company,Default Payable Account,חשבון זכאים ברירת מחדל
 apps/erpnext/erpnext/config/website.py +13,"Settings for online shopping cart such as shipping rules, price list etc.","הגדרות לעגלת קניות מקוונות כגון כללי משלוח, מחירון וכו '"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +660,Setup Complete,התקנה מלאה
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +124,Setup Complete,התקנה מלאה
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +65,{0}% Billed,{0}% שחויבו
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +17,Reserved Qty,שמורות כמות
 DocType: Party Account,Party Account,חשבון המפלגה
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +74,Human Resources,משאבי אנוש
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +74,Human Resources,משאבי אנוש
 DocType: Lead,Upper Income,עליון הכנסה
 DocType: Journal Entry Account,Debit in Company Currency,חיוב בחברת מטבע
 apps/erpnext/erpnext/support/doctype/issue/issue.py +58,My Issues,הנושאים שלי
@@ -1368,11 +1322,9 @@
 DocType: Company,Default Values,ערכי ברירת מחדל
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +236,Row {0}: Payment amount can not be negative,שורת {0}: סכום לתשלום לא יכול להיות שלילי
 DocType: Expense Claim,Total Amount Reimbursed,הסכום כולל החזר
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +152,Press fitting,ראוי לחץ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +64,Against Supplier Invoice {0} dated {1},נגד ספק חשבונית {0} יום {1}
 DocType: Customer,Default Price List,מחיר מחירון ברירת מחדל
 DocType: Payment Reconciliation,Payments,תשלומים
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +24,Hot isostatic pressing,isostatic החם לחיצה
 DocType: ToDo,Medium,בינוני
 DocType: Budget Detail,Budget Allocated,תקציב שהוקצה
 DocType: Journal Entry,Entry Type,סוג הכניסה
@@ -1385,9 +1337,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +56,None of the items have any change in quantity or value.,אף אחד מהפריטים יש שינוי בכמות או ערך.
 DocType: Warranty Claim,Warranty Claim,הפעיל אחריות
 ,Lead Details,פרטי עופרת
-DocType: Authorization Rule,Approving User,משתמש אישור
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +37,Forging,זיוף
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +126,Plating,ציפוי
 DocType: Purchase Invoice,End date of current invoice's period,תאריך סיום של התקופה של החשבונית הנוכחית
 DocType: Pricing Rule,Applicable For,ישים ל
 DocType: Bank Reconciliation,From Date,מתאריך
@@ -1409,31 +1358,29 @@
 DocType: Sales Invoice,Paid Amount (Company Currency),הסכום ששולם (חברת מטבע)
 DocType: Purchase Invoice,Additional Discount,הנחה נוסף
 DocType: Selling Settings,Selling Settings,מכירת הגדרות
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +39,Online Auctions,מכירות פומביות באינטרנט
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,מכירות פומביות באינטרנט
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +94,Please specify either Quantity or Valuation Rate or both,נא לציין גם כמות או דרגו את ההערכה או שניהם
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +50,"Company, Month and Fiscal Year is mandatory","חברה, חודש ושנת כספים הוא חובה"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Marketing Expenses,הוצאות שיווק
 ,Item Shortage Report,דווח מחסור פריט
-apps/erpnext/erpnext/stock/doctype/item/item.js +183,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","המשקל מוזכר, \ n להזכיר ""משקל של אוני 'מישגן"" מדי"
+apps/erpnext/erpnext/stock/doctype/item/item.js +185,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","המשקל מוזכר, \ n להזכיר ""משקל של אוני 'מישגן"" מדי"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,בקשת חומר המשמשת לייצור Stock רשומת זו
 apps/erpnext/erpnext/config/support.py +43,Single unit of an Item.,יחידה אחת של פריט.
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +212,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 +384,Warehouse required at Row No {0},מחסן נדרש בשורה לא {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +386,Warehouse required at Row No {0},מחסן נדרש בשורה לא {0}
 DocType: Employee,Date Of Retirement,מועד הפרישה
 DocType: Upload Attendance,Get Template,קבל תבנית
 DocType: Address,Postal,דואר
 DocType: Item,Weightage,Weightage
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +159,Mining,כרייה
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +17,Resin casting,ליהוק שרף
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"קבוצת לקוחות קיימת עם אותו שם, בבקשה לשנות את שם הלקוח או לשנות את שם קבוצת הלקוחות"
 apps/erpnext/erpnext/public/js/pos/pos.js +147,Please select {0} first.,אנא בחר {0} הראשון.
 apps/erpnext/erpnext/templates/pages/order.html +57,text {0},טקסט {0}
 DocType: Territory,Parent Territory,טריטורית הורה
 DocType: Quality Inspection Reading,Reading 2,קריאת 2
 DocType: Stock Entry,Material Receipt,קבלת חומר
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +622,Products,מוצרים
+apps/erpnext/erpnext/public/js/setup_wizard.js +358,Products,מוצרים
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +47,Party Type and Party is required for Receivable / Payable account {0},מפלגת סוג והמפלגה נדרש לבקל / חשבון זכאים {0}
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.","אם פריט זה יש גרסאות, אז זה לא יכול להיות שנבחר בהזמנות וכו &#39;"
 DocType: Lead,Next Contact By,לתקשר בא על ידי
@@ -1443,13 +1390,13 @@
 DocType: Purchase Invoice,Notification Email Address,"כתובת דוא""ל להודעות"
 DocType: Payment Tool,Find Invoices to Match,מצא את חשבוניות להתאימו
 ,Item-wise Sales Register,פריט חכם מכירות הרשמה
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +399,"e.g. ""XYZ National Bank""","""הבנק הלאומי XYZ"" למשל"
+apps/erpnext/erpnext/public/js/setup_wizard.js +147,"e.g. ""XYZ National Bank""","""הבנק הלאומי XYZ"" למשל"
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,האם מס זה כלול ביסוד שיעור?
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +57,Total Target,"יעד סה""כ"
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Target,"יעד סה""כ"
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.js +22,Shopping Cart is enabled,סל קניות מופעל
 DocType: Job Applicant,Applicant for a Job,מועמד לעבודה
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +173,No Production Orders created,אין הזמנות ייצור שנוצרו
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +131,Salary Slip of employee {0} already created for this month,תלוש משכורת של עובד {0} כבר יצר לחודש זה
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +140,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.,יותר מדי עמודות. לייצא את הדוח ולהדפיס אותו באמצעות יישום גיליון אלקטרוני.
 DocType: Sales Invoice Item,Batch No,אצווה לא
@@ -1459,14 +1406,14 @@
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +13,Variant,Variant
 apps/frappe/frappe/public/js/frappe/form/toolbar.js +165,New {0},חדש {0}
 DocType: Naming Series,Set prefix for numbering series on your transactions,קידומת להגדיר למספור סדרה על העסקות שלך
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +169,Stopped order cannot be cancelled. Unstop to cancel.,לא ניתן לבטל הזמנה הפסיקה. מגופה כדי לבטל.
-apps/erpnext/erpnext/stock/doctype/item/item.py +323,Default BOM ({0}) must be active for this item or its template,BOM ברירת המחדל ({0}) חייב להיות פעיל לפריט זה או התבנית שלה
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +164,Stopped order cannot be cancelled. Unstop to cancel.,לא ניתן לבטל הזמנה הפסיקה. מגופה כדי לבטל.
+apps/erpnext/erpnext/stock/doctype/item/item.py +327,Default BOM ({0}) must be active for this item or its template,BOM ברירת המחדל ({0}) חייב להיות פעיל לפריט זה או התבנית שלה
 DocType: Employee,Leave Encashed?,השאר Encashed?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,הזדמנות מ השדה היא חובה
 DocType: Item,Variants,גרסאות
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +458,Make Purchase Order,הפוך הזמנת רכש
 DocType: SMS Center,Send To,שלח אל
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +111,There is not enough leave balance for Leave Type {0},אין איזון חופשה מספיק לחופשת סוג {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +127,There is not enough leave balance for Leave Type {0},אין איזון חופשה מספיק לחופשת סוג {0}
 DocType: Sales Team,Contribution to Net Total,"תרומה לנטו סה""כ"
 DocType: Sales Invoice Item,Customer's Item Code,קוד הפריט של הלקוח
 DocType: Stock Reconciliation,Stock Reconciliation,מניית פיוס
@@ -1503,11 +1450,11 @@
 DocType: Sales Order Item,Actual Qty,כמות בפועל
 DocType: Sales Invoice Item,References,אזכור
 DocType: Quality Inspection Reading,Reading 10,קריאת 10
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +612,"List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start.","רשימת המוצרים שלך או שירותים שאתה לקנות או למכור. הקפד לבדוק את קבוצת הפריט, יחידת המידה ונכסים אחרים בעת ההפעלה."
+apps/erpnext/erpnext/public/js/setup_wizard.js +348,"List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start.","רשימת המוצרים שלך או שירותים שאתה לקנות או למכור. הקפד לבדוק את קבוצת הפריט, יחידת המידה ונכסים אחרים בעת ההפעלה."
 DocType: Hub Settings,Hub Node,רכזת צומת
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,אתה נכנס פריטים כפולים. אנא לתקן ונסה שוב.
 apps/erpnext/erpnext/controllers/item_variant.py +65,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values,ערך {0} לתכונת {1} אינו קיים ברשימת הפריט תקף ערכי תכונה
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +87,Associate,חבר
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Associate,חבר
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +46,Item {0} is not a serialized Item,פריט {0} הוא לא פריט בהמשכים
 DocType: SMS Center,Create Receiver List,צור מקלט רשימה
 apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +5,Expired,פג תוקף
@@ -1516,7 +1463,7 @@
 DocType: Warranty Claim,Issue Date,תאריך הנפקה
 DocType: Activity Cost,Activity Cost,עלות פעילות
 DocType: Purchase Receipt Item Supplied,Consumed Qty,כמות הנצרכת
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +52,Telecommunications,תקשורת
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +52,Telecommunications,תקשורת
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),מציין כי החבילה היא חלק ממשלוח (רק טיוטה) זה
 DocType: Payment Tool,Make Payment Entry,הפוך כניסת תשלום
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +119,Quantity for Item {0} must be less than {1},כמות לפריט {0} חייבת להיות פחות מ {1}
@@ -1533,10 +1480,8 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +37,"Selling must be checked, if Applicable For is selected as {0}","מכירה חייבת להיבדק, אם לישים שנבחרה הוא {0}"
 DocType: Purchase Order Item,Supplier Quotation Item,פריט הצעת המחיר של ספק
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +27,Make Salary Structure,הפוך שכר מבנה
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +54,Shearing,גְזִיזָה
 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.,לחץ על כפתור 'הפוך מכירות חשבונית' כדי ליצור חשבונית מכירות חדשה.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +166,Packaging and labeling,אריזה וסימון
 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,נא לציין מטבע ברירת מחדל בחברת מאסטר וברירות מחדלים גלובלית
@@ -1547,19 +1492,18 @@
 DocType: Budget Detail,Fiscal Year,שנת כספים
 DocType: Cost Center,Budget,תקציב
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +41,"Budget cannot be assigned against {0}, as it's not an Income or Expense account","תקציב לא ניתן להקצות כנגד {0}, כמו שזה לא חשבון הכנסה או הוצאה"
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Achieved,הושג
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,הושג
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +65,Territory / Customer,שטח / לקוחות
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,e.g. 5,לדוגמא 5
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +207,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},{0} שורה: סכום שהוקצה {1} חייב להיות פחות מ או שווה לסכום חשבונית מצטיין {2}
+apps/erpnext/erpnext/public/js/setup_wizard.js +294,e.g. 5,לדוגמא 5
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},{0} שורה: סכום שהוקצה {1} חייב להיות פחות מ או שווה לסכום חשבונית מצטיין {2}
 DocType: Sales Invoice,In Words will be visible once you save the Sales Invoice.,במילים יהיו גלוי ברגע שאתה לשמור את חשבונית המכירות.
 DocType: Item,Is Sales Item,האם פריט מכירות
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,פריט עץ הקבוצה
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,פריט {0} הוא לא התקנה למס סידורי. בדוק אדון פריט
 DocType: Maintenance Visit,Maintenance Time,תחזוקת זמן
 ,Amount to Deliver,הסכום לאספקת
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +620,A Product or Service,מוצר או שירות
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +158,There were errors.,היו שגיאות.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +101,Tapping,הקשה
+apps/erpnext/erpnext/public/js/setup_wizard.js +356,A Product or Service,מוצר או שירות
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +146,There were errors.,היו שגיאות.
 DocType: Naming Series,Current Value,ערך נוכחי
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +171,{0} created,{0} נוצר
 DocType: Delivery Note Item,Against Sales Order,נגד להזמין מכירות
@@ -1571,7 +1515,7 @@
 apps/erpnext/erpnext/accounts/party.py +275,Due Date cannot be before Posting Date,תאריך יעד לא יכול להיות לפני פרסום תאריך
 DocType: Website Item Group,Website Item Group,קבוצת פריט באתר
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Duties and Taxes,חובות ומסים
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Please enter Reference date,נא להזין את תאריך הפניה
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +312,Please enter Reference date,נא להזין את תאריך הפניה
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},לא יכולים להיות מסוננים {0} ערכי תשלום על ידי {1}
 DocType: Item Website Specification,Table for Item that will be shown in Web Site,שולחן לפריט שיוצג באתר אינטרנט
 DocType: Purchase Order Item Supplied,Supplied Qty,כמות שסופק
@@ -1579,7 +1523,7 @@
 apps/erpnext/erpnext/config/stock.py +103,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,היסטוריה רכישת פריט-חכם
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +152,Red,אדום
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Red,אדום
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +228,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},אנא לחץ על 'צור לוח זמנים' כדי להביא מספר סידורי הוסיפה לפריט {0}
 DocType: Account,Frozen,קפוא
 ,Open Production Orders,הזמנות ייצור פתוחות
@@ -1592,7 +1536,7 @@
 DocType: Quality Inspection Reading,Acceptance Criteria,קריטריונים לקבלה
 DocType: Item Attribute,Attribute Name,שם תכונה
 DocType: Item Group,Show In Website,הצג באתר
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +621,Group,קבוצה
+apps/erpnext/erpnext/public/js/setup_wizard.js +357,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","כדי לעקוב אחר מותג בהערה המסמכים הבאים משלוח, הזדמנות, בקשת חומר, פריט, הזמנת רכש, רכישת השובר, קבלת רוכש, הצעת המחיר, מכירות חשבונית, מוצרי Bundle, להזמין מכירות, מספר סידורי"
@@ -1602,6 +1546,7 @@
 DocType: Features Setup,Brands,מותגים
 DocType: C-Form Invoice Detail,Invoice No,חשבונית לא
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +480,From Purchase Order,מהזמנת הרכש
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +92,"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,תאריך מכתב התפטרות
@@ -1609,35 +1554,31 @@
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +137,Not Set,לא הוגדר
 DocType: Communication,Date,תאריך
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,הכנסות לקוח חוזרות
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +651,Sit tight while your system is being setup. This may take a few moments.,לשבת בשקט בזמן שהמערכת שלך היא להיות הגדרה. זה עלול לקחת כמה רגעים.
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +115,Sit tight while your system is being setup. This may take a few moments.,לשבת בשקט בזמן שהמערכת שלך היא להיות הגדרה. זה עלול לקחת כמה רגעים.
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +51,{0} ({1}) must have role 'Expense Approver',{0} ({1}) חייב להיות 'מאשר מהוצאות' תפקיד
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Pair,זוג
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Pair,זוג
 DocType: Bank Reconciliation Detail,Against Account,נגד חשבון
 DocType: Maintenance Schedule Detail,Actual Date,תאריך בפועל
 DocType: Item,Has Batch No,יש אצווה לא
 DocType: Delivery Note,Excise Page Number,בלו מספר העמוד
 DocType: Employee,Personal Details,פרטים אישיים
 ,Maintenance Schedules,לוחות זמנים תחזוקה
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +44,Embossing,הבלטות
 ,Quotation Trends,מגמות ציטוט
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +139,Item Group not mentioned in item master for item {0},קבוצת פריט שלא צוינה באב פריט לפריט {0}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +302,Debit To account must be a Receivable account,חיוב החשבון חייב להיות חשבון חייבים
-apps/erpnext/erpnext/stock/doctype/item/item.py +310,"As Production Order can be made for this item, it must be a stock item.","כהפקה להזמין יכול להתבצע עבור פריט זה, זה חייב להיות פריט במלאי."
 DocType: Shipping Rule Condition,Shipping Amount,סכום משלוח
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +140,Joining,הצטרפות
-DocType: Authorization Rule,Above Value,מעל הערך
 ,Pending Amount,סכום תלוי ועומד
 DocType: Purchase Invoice Item,Conversion Factor,המרת פקטור
 DocType: Purchase Order,Delivered,נמסר
 apps/erpnext/erpnext/config/hr.py +160,Setup incoming server for jobs email id. (e.g. jobs@example.com),"התקנת שרת הנכנס לid הדוא""ל של מקומות עבודה. (למשל jobs@example.com)"
 DocType: Purchase Receipt,Vehicle Number,מספר רכב
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,התאריך שבו חשבונית חוזרת תהיה לעצור
+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,חשבונות חייבים
 ,Supplier-Wise Sales Analytics,ספק-Wise Analytics המכירות
 DocType: Address Template,This format is used if country specific format is not found,פורמט זה משמש אם פורמט ספציפי למדינה לא נמצא
 DocType: Custom Field,Custom,מותאם אישית
 DocType: Production Order,Use Multi-Level BOM,השתמש Multi-Level BOM
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +26,Injection molding,הזרקה
 DocType: Bank Reconciliation,Include Reconciled Entries,כוללים ערכים מפוייס
 apps/erpnext/erpnext/config/accounts.py +41,Tree of finanial accounts.,עץ של חשבונות finanial.
 DocType: Leave Control Panel,Leave blank if considered for all employee types,שאר ריק אם נחשב לכל סוגי העובדים
@@ -1647,30 +1588,28 @@
 apps/frappe/frappe/config/setup.py +130,Printing,הדפסה
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +114,Expense Claim is pending approval. Only the Expense Approver can update status.,תביעת חשבון ממתינה לאישור. רק המאשר ההוצאות יכול לעדכן את הסטטוס.
 DocType: Purchase Invoice,Additional Discount Amount,סכום הנחה נוסף
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +99,The day(s) on which you are applying for leave are holiday. You need not apply for leave.,היום (ים) שבו אתם פונים לקבלת חופשה הוא חופשה. אתה לא צריך להגיש בקשה לחופשה.
 apps/frappe/frappe/public/js/frappe/misc/utils.js +110,and,ו
 DocType: Leave Block List Allow,Leave Block List Allow,השאר בלוק רשימה אפשר
 apps/erpnext/erpnext/setup/doctype/company/company.py +236,Abbr can not be blank or space,Abbr לא יכול להיות ריק או חלל
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +50,Sports,ספורט
+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/setup/page/setup_wizard/setup_wizard.js +626,Unit,יחידה
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Unit,יחידה
 apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.py +182,Please set Dropbox access keys in your site config,אנא הגדר מקשי גישת Dropbox בconfig האתר שלך
 apps/erpnext/erpnext/stock/get_item_details.py +113,Please specify Company,נא לציין את החברה
 ,Customer Acquisition and Loyalty,לקוחות רכישה ונאמנות
 DocType: Purchase Receipt,Warehouse where you are maintaining stock of rejected items,מחסן שבו אתה שומר מלאי של פריטים דחו
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +408,Your financial year ends on,השנה שלך הפיננסית מסתיימת ב
+apps/erpnext/erpnext/public/js/setup_wizard.js +156,Your financial year ends on,השנה שלך הפיננסית מסתיימת ב
 DocType: POS Profile,Price List,מחיר מחירון
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +20,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0} הוא כעת ברירת מחדל שנת כספים. רענן את הדפדפן שלך כדי שהשינוי ייכנס לתוקף.
 apps/erpnext/erpnext/projects/doctype/project/project.js +47,Expense Claims,תביעות חשבון
 DocType: Issue,Support,תמיכה
-DocType: Authorization Rule,Approving Role,אישור תפקיד
 ,BOM Search,חיפוש BOM
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +176,Closing (Opening + Totals),סגירה (פתיחת סיכומים +)
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +26,Please specify currency in Company,נא לציין את מטבע בחברה
 DocType: Workstation,Wages per hour,שכר לשעה
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,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.","תכונות הצג / הסתר כמו מס 'סידורי, וכו' קופה"
-apps/erpnext/erpnext/controllers/accounts_controller.py +236,Account {0} is invalid. Account Currency must be {1},חשבון {0} אינו חוקי. מטבע חשבון חייב להיות {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +237,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}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +53,Clearance date cannot be before check date in row {0},תאריך חיסול לא יכול להיות לפני בדיקת תאריך בשורת {0}
 DocType: Salary Slip,Deduction,ניכוי
@@ -1689,13 +1628,13 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +82,Item {0} has already been returned,פריט {0} הוחזר כבר
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** שנת כספים ** מייצגת שנת כספים. כל הרישומים החשבונאיים ועסקות גדולות אחרות מתבצעים מעקב נגד שנת כספים ** **.
 DocType: Opportunity,Customer / Lead Address,לקוחות / כתובת עופרת
+apps/erpnext/erpnext/stock/doctype/item/item.py +112,Warning: Invalid SSL certificate on attachment {0},אזהרה: תעודת SSL לא חוקית בקובץ מצורף {0}
 DocType: Production Order Operation,Actual Operation Time,בפועל מבצע זמן
 DocType: Authorization Rule,Applicable To (User),כדי ישים (משתמש)
 DocType: Purchase Taxes and Charges,Deduct,לנכות
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +170,Job Description,תיאור התפקיד
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +170,Job Description,תיאור התפקיד
 DocType: Purchase Order Item,Qty as per Stock UOM,כמות כמו לכל בורסה של אוני 'מישגן
 apps/frappe/frappe/model/rename_doc.py +343,Please select a valid csv file with data,אנא בחר קובץ CSV תקף עם הנתונים
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +92,Coating,ציפוי
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +126,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","תווים מיוחדים מלבד ""-"" ""."", ""#"", ו"" / ""אסור בשמות סדרה"
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","עקוב אחר מסעות פרסום מכירות. עקוב אחר הובלות, הצעות מחיר, להזמין מכירות וכו 'ממסעות הפרסום כדי לאמוד את ההחזר על השקעה."
 DocType: Expense Claim,Approver,מאשר
@@ -1705,12 +1644,11 @@
 DocType: Supplier Quotation,Manufacturing Manager,ייצור מנהל
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},מספר סידורי {0} הוא תחת אחריות upto {1}
 apps/erpnext/erpnext/config/stock.py +69,Split Delivery Note into packages.,תעודת משלוח פצל לחבילות.
-apps/erpnext/erpnext/hooks.py +84,Shipments,משלוחים
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +29,Dip molding,דפוס טובלים
+apps/erpnext/erpnext/hooks.py +68,Shipments,משלוחים
 DocType: Purchase Order,To be delivered to customer,שיימסר ללקוח
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,סטטוס זמן יומן יש להגיש.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,מספר סידורי {0} אינו שייך לכל מחסן
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +650,Setting Up,הגדרה
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +114,Setting Up,הגדרה
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,Row # ,# שורה
 DocType: Purchase Invoice,In Words (Company Currency),במילים (חברת מטבע)
 DocType: Pricing Rule,Supplier,ספק
@@ -1718,7 +1656,7 @@
 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 +166,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,הוצאה או חשבון הבדל היא חובה עבור פריט {0} כערך המניה בסך הכל זה משפיע
-apps/erpnext/erpnext/controllers/accounts_controller.py +354,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","לא יכול overbill לפריט {0} בשורת {1} יותר מ {2}. כדי לאפשר overbilling, נא לקבוע בהגדרות בורסה"
+apps/erpnext/erpnext/controllers/accounts_controller.py +355,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","לא יכול overbill לפריט {0} בשורת {1} יותר מ {2}. כדי לאפשר overbilling, נא לקבוע בהגדרות בורסה"
 DocType: Employee,Bank Name,שם בנק
 apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +27,-Above,-Above
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +135,User {0} is disabled,משתמש {0} אינו זמין
@@ -1731,27 +1669,26 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,{0} is mandatory for Item {1},{0} הוא חובה עבור פריט {1}
 DocType: Currency Exchange,From Currency,ממטבע
 DocType: DocField,Name,שם
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +211,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","אנא בחר סכום שהוקצה, סוג החשבונית וחשבונית מספר בatleast שורה אחת"
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +104,Sales Order required for Item {0},להזמין מכירות הנדרשים לפריט {0}
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +158,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","אנא בחר סכום שהוקצה, סוג החשבונית וחשבונית מספר בatleast שורה אחת"
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +107,Sales Order required for Item {0},להזמין מכירות הנדרשים לפריט {0}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +43,Amounts not reflected in system,סכומים שלא באו לידי ביטוי במערכת
 DocType: Purchase Invoice Item,Rate (Company Currency),שיעור (חברת מטבע)
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +40,Others,אחרים
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +40,Others,אחרים
 apps/erpnext/erpnext/templates/includes/product_page.js +80,Cannot find a matching Item. Please select some other value for {0}.,לא ניתן למצוא את הפריט מתאים. אנא בחר ערך אחר עבור {0}.
 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/frappe/frappe/core/doctype/doctype/boilerplate/controller_list.html +31,Completed,הושלם
 DocType: Web Form,Select DocType,DOCTYPE בחר
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +104,Broaching,קידוח
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +12,Banking,בנקאות
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,בנקאות
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +38,Please click on 'Generate Schedule' to get schedule,אנא לחץ על 'צור לוח זמנים' כדי לקבל לוח זמנים
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +283,New Cost Center,מרכז עלות חדש
 DocType: Bin,Ordered Quantity,כמות מוזמנת
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +397,"e.g. ""Build tools for builders""","לדוגמא: ""לבנות כלים לבונים"""
+apps/erpnext/erpnext/public/js/setup_wizard.js +145,"e.g. ""Build tools for builders""","לדוגמא: ""לבנות כלים לבונים"""
 DocType: Quality Inspection,In Process,בתהליך
 DocType: Authorization Rule,Itemwise Discount,Itemwise דיסקונט
 DocType: Purchase Order Item,Reference Document Type,התייחסות סוג המסמך
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +318,{0} against Sales Order {1},{0} נגד להזמין מכירות {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +320,{0} against Sales Order {1},{0} נגד להזמין מכירות {1}
 DocType: Account,Fixed Asset,רכוש קבוע
 apps/erpnext/erpnext/config/stock.py +283,Serialized Inventory,מלאי בהמשכים
 DocType: Activity Type,Default Billing Rate,דרג חיוב ברירת מחדל
@@ -1766,14 +1703,13 @@
 DocType: Purchase Invoice Item,Page Break,מעבר עמוד
 DocType: Production Order Operation,Pending,ממתין ל
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,משתמשים שיכולים לאשר בקשות החופשה של עובד ספציפי
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +33,You cannot change default UOM of Variant. To change default UOM for Variant change default UOM of the Template,אתה לא יכול לשנות את ברירת מחדל של יחידת מידת Variant. כדי לשנות יחידת מידת ברירת מחדל עבור יחידת מידת שינוי ברירת מחדל Variant של התבנית
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +50,Office Equipments,ציוד משרדי
 DocType: Purchase Invoice Item,Qty,כמות
 DocType: Fiscal Year,Companies,חברות
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +24,Electronics,אלקטרוניקה
+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/support/doctype/maintenance_visit/maintenance_visit.js +18,From Maintenance Schedule,מתחזוקה לוח זמנים
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +56,Full-time,משרה מלאה
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +56,Full-time,משרה מלאה
 DocType: Purchase Invoice,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.","אם יצרת תבנית סטנדרטית בתבנית מסים מכירות וחיובים, בחר אחד ולחץ על הכפתור למטה."
@@ -1785,11 +1721,12 @@
 DocType: Job Applicant,Job Opening,פתיחת עבודה
 DocType: Payment Reconciliation,Payment Reconciliation,פיוס תשלום
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +154,Please select Incharge Person's name,אנא בחר את שמו של אדם Incharge
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +51,Technology,טכנולוגיה
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,טכנולוגיה
 DocType: Offer Letter,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,"סה""כ חשבונית 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.","כדי להוסיף צמתים ילד, לחקור עץ ולחץ על הצומת תחתיו ברצונך להוסיף עוד צמתים."
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +102,Credit To account must be a Payable account,אשראי לחשבון חייב להיות חשבון לתשלום
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +233,BOM recursion: {0} cannot be parent or child of {2},רקורסיה BOM: {0} אינה יכולה להיות הורה או ילד של {2}
@@ -1802,10 +1739,8 @@
 DocType: Item,Customer Item Codes,קודי פריט לקוחות
 DocType: Opportunity,Lost Reason,סיבה לאיבוד
 apps/erpnext/erpnext/config/accounts.py +68,Create Payment Entries against Orders or Invoices.,צור ערכי תשלום כנגד הזמנות או חשבוניות.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +141,Welding,ריתוך
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +40,New Stock UOM is required,החדש במלאי של אוני 'מישגן נדרש
 DocType: Quality Inspection,Sample Size,גודל מדגם
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +443,All items have already been invoiced,כל הפריטים כבר בחשבונית
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +446,All items have already been invoiced,כל הפריטים כבר בחשבונית
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',נא לציין חוקי 'מתיק מס' '
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +287,Further cost centers can be made under Groups but entries can be made against non-Groups,מרכזי עלות נוספים יכולים להתבצע תחת קבוצות אבל ערכים יכולים להתבצע נגד לא-קבוצות
 DocType: Project,External,חיצוני
@@ -1817,8 +1752,7 @@
 DocType: Bin,Actual Quantity,כמות בפועל
 DocType: Shipping Rule,example: Next Day Shipping,דוגמא: משלוח היום הבא
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,מספר סידורי {0} לא נמצאו
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +563,Your Customers,הלקוחות שלך
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +27,Compression molding,דפוס דחיסה
+apps/erpnext/erpnext/public/js/setup_wizard.js +303,Your Customers,הלקוחות שלך
 DocType: Leave Block List Date,Block Date,תאריך בלוק
 DocType: Sales Order,Not Delivered,לא נמסר
 ,Bank Clearance Summary,סיכום עמילות בנק
@@ -1839,10 +1773,10 @@
 DocType: SMS Log,Sent To,נשלח ל
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +28,Make Sales Invoice,הפוך מכירות חשבונית
 DocType: Company,For Reference Only.,לעיון בלבד.
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +29,Invalid {0}: {1},לא חוקי {0}: {1}
+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,תכנון קיבולת
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +49,'From Date' is required,"""מתאריך"" נדרש"
+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,חדש במקום העבודה
@@ -1857,7 +1791,7 @@
 DocType: Serial No,Delivery Time,זמן אספקה
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,הזדקנות המבוסס על
 DocType: Item,End of Life,סוף החיים
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +41,Travel,נסיעות
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +41,Travel,נסיעות
 DocType: Leave Block List,Allow Users,אפשר למשתמשים
 DocType: Purchase Order,Customer Mobile No,לקוחות ניידים לא
 DocType: Sales Invoice,Recurring,חוזר
@@ -1871,7 +1805,7 @@
 DocType: Naming Series,User must always select,משתמש חייב תמיד לבחור
 DocType: Stock Settings,Allow Negative Stock,לאפשר Stock שלילי
 DocType: Installation Note,Installation Note,הערה התקנה
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +541,Add Taxes,להוסיף מסים
+apps/erpnext/erpnext/public/js/setup_wizard.js +283,Add Taxes,להוסיף מסים
 ,Financial Analytics,Analytics הפיננסי
 DocType: Quality Inspection,Verified By,מאומת על ידי
 DocType: Address,Subsidiary,חברת בת
@@ -1881,7 +1815,6 @@
 DocType: System Settings,In Hours,בשעות
 DocType: Process Payroll,Create Salary Slip,צור שכר Slip
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Expected balance as per bank,מאזן צפוי לפי בנק
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +115,Buffing,צִחצוּחַ
 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,עובד
@@ -1898,11 +1831,11 @@
 DocType: Rename Tool,File to Rename,קובץ לשינוי השם
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +176,Purchse Order number required for Item {0},מספר ההזמנה Purchse נדרש לפריט {0}
 apps/erpnext/erpnext/public/js/controllers/transaction.js +136,Show Payments,תשלומי הצג
-apps/erpnext/erpnext/controllers/buying_controller.py +245,Specified BOM {0} does not exist for Item {1},BOM צוין {0} אינו קיימת עבור פריט {1}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +202,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,לוח זמנים תחזוקת {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 +197,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,לוח זמנים תחזוקת {0} יש לבטל לפני ביטול הזמנת מכירות זה
 apps/frappe/frappe/desk/page/backups/backups.html +13,Size,גודל
 DocType: Notification Control,Expense Claim Approved,תביעת הוצאות שאושרה
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +113,Pharmaceutical,תרופות
+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,סדר הנדרש מכירות
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +30,Create Customer,צור לקוח
@@ -1912,7 +1845,6 @@
 DocType: Quality Inspection Reading,Reading 9,קריאת 9
 DocType: Supplier,Is Frozen,האם קפוא
 DocType: Buying Settings,Buying Settings,הגדרות קנייה
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +122,Mass finishing,גמר המוני
 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)"
@@ -1920,7 +1852,7 @@
 DocType: Payment Tool,Payment Account,חשבון תשלומים
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +713,Please specify Company to proceed,נא לציין את חברה כדי להמשיך
 apps/frappe/frappe/public/js/frappe/model/indicator.js +30,Draft,טיוטה
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +46,Compensatory Off,Off המפצה
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Compensatory Off,Off המפצה
 DocType: Quality Inspection Reading,Accepted,קיבלתי
 DocType: User,Female,נקבה
 DocType: Journal Entry Account,Debit in Account Currency,חיוב במטבע חשבון
@@ -1932,7 +1864,7 @@
 DocType: Shipping Rule,Shipping Rule Label,תווית כלל משלוח
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +209,Raw Materials cannot be blank.,חומרי גלם לא יכולים להיות ריקים.
 DocType: Newsletter,Test,מבחן
-apps/erpnext/erpnext/stock/doctype/item/item.py +364,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +368,"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'","כמו שיש עסקות מלאי קיימות עבור פריט זה, \ אתה לא יכול לשנות את הערכים של &#39;יש מספר סידורי&#39;, &#39;יש אצווה לא&#39;, &#39;האם פריט במלאי &quot;ו-&quot; שיטת הערכה &quot;"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +448,Quick Journal Entry,מהיר יומן
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +92,You can not change rate if BOM mentioned agianst any item,אתה לא יכול לשנות את השיעור אם BOM ציינו agianst כל פריט
@@ -1943,13 +1875,14 @@
 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.,הזמנת ייצור נפרדת תיווצר לכל פריט טוב מוגמר.
 DocType: Purchase Invoice,Terms and Conditions1,תנאים וConditions1
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +18,Complete Setup,התקנה מלאה
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard_page.html +18,Complete Setup,התקנה מלאה
 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),לבדוק את זה כדי לאסור שברים. (למס)
 apps/erpnext/erpnext/config/crm.py +96,Newsletter Mailing List,רשימת תפוצה עלון
 DocType: Delivery Note,Transporter Name,שם Transporter
+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 +57,Total Absent,"סה""כ נעדר"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +746,Item or Warehouse for row {0} does not match Material Request,פריט או מחסן לשורת {0} אינו תואם בקשת חומר
@@ -1974,16 +1907,15 @@
 DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),שיעור בסיסי (כמו לכל מניית יחידת מידה)
 DocType: SMS Log,No of Requested SMS,לא של SMS המבוקש
 DocType: Campaign,Campaign-.####,קמפיין -. ####
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +55,Piercing,פירסינג
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,הצעדים הבאים
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +117,Contract End Date must be greater than Date of Joining,תאריך סיום חוזה חייב להיות גדול מ תאריך ההצטרפות
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,/ סוחר / סוכן / שותפים / משווק עמלת מפיץ הצד שלישי שמוכר את המוצרים עבור חברות בועדה.
 DocType: Customer Group,Has Child Node,יש ילד צומת
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{0} against Purchase Order {1},{0} נגד הזמנת רכש {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +332,{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/page/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
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +110,Photochemical machining,עיבוד פוטו
 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.
 
 #### Note
@@ -2009,7 +1941,7 @@
 DocType: Purchase Receipt Item,Recd Quantity,כמות Recd
 DocType: Email Account,Email Ids,דוא&quot;ל המזהים
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},לא יכול לייצר יותר פריט {0} מאשר כמות להזמין מכירות {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +471,Stock Entry {0} is not submitted,מניית כניסת {0} לא הוגשה
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +473,Stock Entry {0} is not submitted,מניית כניסת {0} לא הוגשה
 DocType: Payment Reconciliation,Bank / Cash Account,חשבון בנק / מזומנים
 DocType: Tax Rule,Billing City,עיר חיוב
 DocType: Global Defaults,Hide Currency Symbol,הסתר סמל מטבע
@@ -2025,7 +1957,7 @@
 DocType: Purchase Invoice,Currency and Price List,מטבע ומחיר מחירון
 DocType: Opportunity,Customer / Lead Name,לקוחות / שם עופרת
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +63,Clearance Date not mentioned,תאריך חיסול לא הוזכר
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +71,Production,הפקה
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Production,הפקה
 DocType: Item,Allow Production Order,לאפשר הפקה להזמין
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +60,Row {0}:Start Date must be before End Date,{0} שורה: תאריך ההתחלה חייב להיות לפני תאריך הסיום
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),"סה""כ (כמות)"
@@ -2038,7 +1970,7 @@
 apps/erpnext/erpnext/utilities/doctype/address/address.py +113,My Addresses,הכתובות שלי
 DocType: Stock Ledger Entry,Outgoing Rate,דרג יוצא
 apps/erpnext/erpnext/config/hr.py +100,Organization branch master.,אדון סניף ארגון.
-apps/erpnext/erpnext/controllers/accounts_controller.py +237, or ,או
+apps/erpnext/erpnext/controllers/accounts_controller.py +238, 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-מעל
@@ -2065,6 +1997,7 @@
 DocType: Stock Entry Detail,Serial No / Batch,לא / אצווה סידוריים
 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 +213,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',"תחזוקת לוח זמנים לא נוצרו עבור כל הפריטים. אנא לחץ על 'צור לוח זמנים """
 ,To Produce,כדי לייצר
 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} חייבים להיות כלולות גם"
@@ -2072,10 +2005,7 @@
 DocType: Bin,Reserved Quantity,כמות שמורות
 DocType: Landed Cost Voucher,Purchase Receipt Items,פריטים קבלת רכישה
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,טפסי התאמה אישית
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +62,Cutting,חיתוך
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +69,Flattening,משטח
 DocType: Account,Income Account,חשבון הכנסות
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +22,Molding,דפוס
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +632,Delivery,משלוח
 DocType: Stock Reconciliation Item,Current Qty,כמות נוכחית
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section","ראה ""שיעור חומרים הבוסס על"" בסעיף תמחיר"
@@ -2085,19 +2015,18 @@
 apps/frappe/frappe/desk/moduleview.py +61,Documents,מסמכים
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +17,Ref,"נ""צ"
 DocType: Cost Center,Cost Center,מרכז עלות
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.js +48,Voucher #,# שובר
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +36,Voucher #,# שובר
 DocType: Notification Control,Purchase Order Message,הזמנת רכש Message
 DocType: Tax Rule,Shipping Country,מדינה משלוח
 DocType: Upload Attendance,Upload HTML,ההעלאה HTML
-apps/erpnext/erpnext/controllers/accounts_controller.py +391,"Total advance ({0}) against Order {1} cannot be greater \
+apps/erpnext/erpnext/controllers/accounts_controller.py +392,"Total advance ({0}) against Order {1} cannot be greater \
 				than the Grand Total ({2})","מראש סה""כ ({0}) נגד להזמין {1} לא יכול להיות גדול \ מ Grand סה""כ ({2})"
 DocType: Employee,Relieving Date,תאריך להקלה
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +12,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.","כלל תמחור נעשה כדי לדרוס מחיר מחירון / להגדיר אחוז הנחה, המבוסס על כמה קריטריונים."
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,מחסן ניתן לשנות רק באמצעות צילומים כניסה / תעודת משלוח / קבלת רכישה
 DocType: Employee Education,Class / Percentage,כיתה / אחוז
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +92,Head of Marketing and Sales,ראש אגף השיווק ומכירות
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +31,Income Tax,מס הכנסה
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +157,Laser engineered net shaping,לייזר מהונדס עיצוב נקי
+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.,מסלול מוביל לפי סוג התעשייה.
 DocType: Item Supplier,Item Supplier,ספק פריט
@@ -2120,31 +2049,28 @@
 DocType: Stock Ledger Entry,Actual Qty After Transaction,כמות בפועל לאחר עסקה
 ,Pending SO Items For Purchase Request,ממתין לSO פריטים לבקשת רכישה
 DocType: Supplier,Billing Currency,מטבע חיוב
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +148,Extra Large,גדול במיוחד
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,Extra Large,גדול במיוחד
 ,Profit and Loss Statement,דוח רווח והפסד
 DocType: Bank Reconciliation Detail,Cheque Number,מספר המחאה
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +43,Pressing,לחיצה
 DocType: Payment Tool Detail,Payment Tool Detail,פרט כלי תשלום
 ,Sales Browser,דפדפן מכירות
 DocType: Journal Entry,Total Credit,"סה""כ אשראי"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +474,Warning: Another {0} # {1} exists against stock entry {2},אזהרה: נוסף {0} # {1} קיימת נגד כניסת מניית {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +459,Local,מקומי
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +476,Warning: Another {0} # {1} exists against stock entry {2},אזהרה: נוסף {0} # {1} קיימת נגד כניסת מניית {2}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +397,Local,מקומי
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),הלוואות ומקדמות (נכסים)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,חייבים
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +147,Large,גדול
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +23,No employee found!,אף עובדים מצא!
+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 +152,Please mention no of visits required,נא לציין אין ביקורים הנדרשים
 DocType: Purchase Order,Customer Address Display,תצוגת כתובת הלקוח
 DocType: Stock Settings,Default Valuation Method,שיטת הערכת ברירת מחדל
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +127,Polishing,פוליש
 DocType: Production Order Operation,Planned Start Time,מתוכנן זמן התחלה
 apps/erpnext/erpnext/config/accounts.py +63,Close Balance Sheet and book Profit or Loss.,גיליון קרוב מאזן ורווח או הפסד ספר.
-apps/erpnext/erpnext/stock/doctype/item/item.py +661,"Default Unit of Measure for Item {0} cannot be changed directly because \
+apps/erpnext/erpnext/stock/doctype/item/item.py +665,"Default Unit of Measure for Item {0} cannot be changed directly because \
 			you have already made some transaction(s) with another UOM. To change default UOM, \
 			use 'UOM Replace Utility' tool under Stock module.","ברירת מחדל של יחידת מדידה לפריט {0} לא ניתן לשנות באופן ישיר משום \ יש לך כבר עשה כמה עסקה (ים) עם עוד יחידת מידה. כדי לשנות יחידת מידת ברירת מחדל, שימוש \ &#39;יחידת מידה החלף שירות&#39; כלי תחת מודול המלאי."
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,ציין שער חליפין להמיר מטבע אחד לעוד
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +146,Quotation {0} is cancelled,ציטוט {0} יבוטל
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +141,Quotation {0} is cancelled,ציטוט {0} יבוטל
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,סכום חוב סך הכל
 DocType: Sales Partner,Targets,יעדים
 DocType: Price List,Price List Master,מחיר מחירון Master
@@ -2154,7 +2080,6 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +158,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,מחשבים
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +112,Electro-chemical grinding,אלקטרו-כימית שחיקה
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +14,This is a root customer group and cannot be edited.,מדובר בקבוצת לקוחות שורש ולא ניתן לערוך.
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +39,Please setup your chart of accounts before you start Accounting Entries,אנא התקנת לוח החשבונות שלך לפני שאתה מתחיל רישומים חשבונאיים
 DocType: Purchase Invoice,Ignore Pricing Rule,התעלם כלל תמחור
@@ -2200,7 +2125,6 @@
 DocType: Maintenance Visit,Purposes,מטרות
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +103,Atleast one item should be entered with negative quantity in return document,פריט אחד atleast יש להזין עם כמות שלילית במסמך התמורה
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +67,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","מבצע {0} יותר מכל שעות עבודה זמינות בתחנת העבודה {1}, לשבור את הפעולה לפעולות מרובות"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +134,Electrochemical machining,עיבוד אלקטרוכימי
 ,Requested,ביקשתי
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +66,No Remarks,אין הערות
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +13,Overdue,איחור
@@ -2209,7 +2133,7 @@
 DocType: Monthly Distribution,Distribution Name,שם הפצה
 DocType: Features Setup,Sales and Purchase,מכירות ורכש
 DocType: Supplier Quotation Item,Material Request No,בקשת חומר לא
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +218,Quality Inspection required for Item {0},בדיקת איכות הנדרשת לפריט {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +221,Quality Inspection required for Item {0},בדיקת איכות הנדרשת לפריט {0}
 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),שיעור נטו (חברת מטבע)
@@ -2227,9 +2151,8 @@
 apps/erpnext/erpnext/accounts/report/financial_statements.py +16,Fiscal Year {0} not found.,שנת כספים {0} לא מצאה.
 DocType: Bank Reconciliation,Get Relevant Entries,קבל ערכים רלוונטיים
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +407,Accounting Entry for Stock,כניסה לחשבונאות במלאי
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +64,Coining,הַטבָּעָה
 DocType: Sales Invoice,Sales Team1,Team1 מכירות
-apps/erpnext/erpnext/stock/doctype/item/item.py +412,Item {0} does not exist,פריט {0} אינו קיים
+apps/erpnext/erpnext/stock/doctype/item/item.py +416,Item {0} does not exist,פריט {0} אינו קיים
 DocType: Sales Invoice,Customer Address,כתובת הלקוח
 apps/frappe/frappe/desk/query_report.py +136,Total,"סה""כ"
 DocType: Purchase Invoice,Apply Additional Discount On,החל נוסף דיסקונט ב
@@ -2241,14 +2164,13 @@
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),סכום מס לאחר סכום דיסקונט (חברת מטבע)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +149,Target warehouse is mandatory for row {0},מחסן היעד הוא חובה עבור שורת {0}
 DocType: Quality Inspection,Quality Inspection,איכות פיקוח
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +144,Extra Small,קטן במיוחד
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +20,Spray forming,ריסוס יוצרים
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Extra Small,קטן במיוחד
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +458,Warning: Material Requested Qty is less than Minimum Order Qty,אזהרה: חומר המבוקש כמות הוא פחות מלהזמין כמות מינימאלית
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +191,Account {0} is frozen,חשבון {0} הוא קפוא
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,ישות / בת משפטית עם תרשים נפרד של חשבונות השייכים לארגון.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +29,"Food, Beverage & Tobacco","מזון, משקאות וטבק"
+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 +529,Can only make payment against unbilled {0},יכול רק לבצע את התשלום כנגד סרק {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +531,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/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Minimum Inventory Level,רמת מלאי מינימאלית
 DocType: Stock Entry,Subcontract,בקבלנות משנה
@@ -2259,12 +2181,11 @@
 DocType: Item,Manufacturer Part Number,"מק""ט יצרן"
 DocType: Production Order Operation,Estimated Time and Cost,זמן ועלות משוערים
 DocType: Bin,Bin,סל
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +50,Nosing,מרחרח
 DocType: SMS Log,No of Sent SMS,לא של SMS שנשלח
 DocType: Account,Company,חברה
 DocType: Account,Expense Account,חשבון הוצאות
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +49,Software,תוכנה
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +151,Colour,צבע
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +49,Software,תוכנה
+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",אנא בחר פריט שבו &quot;האם פריט במלאי&quot; הוא &quot;לא&quot; ו- &quot;האם פריט מכירות&quot; הוא &quot;כן&quot; ואין Bundle מוצרים אחר
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,בחר בחתך חודשי להפיץ בצורה לא אחידה על פני מטרות חודשים.
@@ -2280,7 +2201,7 @@
 apps/erpnext/erpnext/controllers/recurring_document.py +162,Please select {0},אנא בחר {0}
 DocType: C-Form,C-Form No,C-טופס לא
 DocType: BOM,Exploded_items,Exploded_items
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +95,Researcher,חוקר
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Researcher,חוקר
 apps/frappe/frappe/custom/doctype/customize_form/customize_form.js +88,Update,עדכון
 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 +23,Name or Email is mandatory,שם או דוא&quot;ל הוא חובה
@@ -2289,11 +2210,10 @@
 DocType: Employee,Exit,יציאה
 apps/erpnext/erpnext/accounts/doctype/account/account.py +134,Root Type is mandatory,סוג השורש הוא חובה
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +295,Serial No {0} created,מספר סידורי {0} נוצר
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +125,Vibratory finishing,גמר רטט
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","לנוחות לקוחות, ניתן להשתמש בקודים אלה בפורמטי הדפסה כמו הערות חשבוניות ומשלוח"
 DocType: Employee,You can enter any date manually,אתה יכול להיכנס לכל תאריך באופן ידני
 DocType: Sales Invoice,Advertisement,פרסומת
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +165,Probationary Period,תקופת ניסיון
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Probationary Period,תקופת ניסיון
 DocType: Customer Group,Only leaf nodes are allowed in transaction,רק צמתים עלה מותר בעסקה
 DocType: Expense Claim,Expense Approver,מאשר חשבון
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,פריט קבלת רכישה מסופק
@@ -2301,19 +2221,16 @@
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +17,To Datetime,לDatetime
 DocType: SMS Settings,SMS Gateway URL,URL SMS Gateway
 apps/erpnext/erpnext/config/crm.py +53,Logs for maintaining sms delivery status,יומנים לשמירה על סטטוס משלוח SMS
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +137,Grinding,טחינה
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +34,Shrink wrapping,פסיכולוג גלישה
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +36,Pending Activities,פעילויות ממתינות ל
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,Confirmed,אישר
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier > Supplier Type,ספק> סוג ספק
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +127,Please enter relieving date.,נא להזין את הקלת מועד.
 apps/erpnext/erpnext/controllers/trends.py +137,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/hr/doctype/leave_application/leave_application.py +51,Only Leave Applications with status 'Approved' can be submitted,השאר רק יישומים עם מעמד 'מאושר' ניתן להגיש
 apps/erpnext/erpnext/utilities/doctype/address/address.py +21,Address Title is mandatory.,כותרת כתובת היא חובה.
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,"הזן את השם של מסע פרסום, אם המקור של החקירה הוא קמפיין"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +38,Newspaper Publishers,מוציאים לאור עיתון
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +38,Newspaper Publishers,מוציאים לאור עיתון
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,בחר שנת כספים
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +88,Smelting,התכה
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,הזמנה חוזרת רמה
 DocType: Attendance,Attendance Date,תאריך נוכחות
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,פרידה שכר על בסיס צבירה וניכוי.
@@ -2328,16 +2245,15 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +414,[Error],[שגיאה]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,במילים יהיו גלוי לאחר שתשמרו את הזמנת המכירות.
 ,Employee Birthday,עובד יום הולדת
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +55,Venture Capital,הון סיכון
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,הון סיכון
 DocType: UOM,Must be Whole Number,חייב להיות מספר שלם
 DocType: Leave Control Panel,New Leaves Allocated (In Days),עלים חדשים המוקצים (בימים)
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +51,Serial No {0} does not exist,מספר סידורי {0} אינו קיימות
 DocType: Pricing Rule,Discount Percentage,אחוז הנחה
 DocType: Payment Reconciliation Invoice,Invoice Number,מספר חשבונית
-apps/erpnext/erpnext/hooks.py +70,Orders,הזמנות
+apps/erpnext/erpnext/hooks.py +54,Orders,הזמנות
 DocType: Leave Control Panel,Employee Type,סוג העובד
 DocType: Employee Leave Approver,Leave Approver,השאר מאשר
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +70,Swaging,Swaging
 DocType: Manufacturing Settings,Material Transferred for Manufacture,חומר הועבר לייצור
 DocType: Expense Claim,"A user with ""Expense Approver"" role","משתמש עם תפקיד ""הוצאות מאשר"""
 ,Issued Items Against Production Order,פריטים שהוצאו נגד להזמין הפקה
@@ -2349,7 +2265,6 @@
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +62,Cost Center with existing transactions can not be converted to group,מרכז עלות בעסקות קיימות לא ניתן להמיר לקבוצה
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Depreciation,פחת
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),ספק (ים)
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +29,Invalid period,תקופה לא חוקית
 DocType: Customer,Credit Limit,מגבלת אשראי
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,בחר סוג העסקה
 DocType: GL Entry,Voucher No,שובר לא
@@ -2359,9 +2274,9 @@
 DocType: Customer,Address and Contact,כתובת ולתקשר
 DocType: Customer,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}"
 apps/erpnext/erpnext/accounts/party.py +284,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),הערה: תאריך יעד / הפניה עולה ימי אשראי ללקוחות מותר על ידי {0} יום (ים)
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +621,Maint. Schedule,שימור. לוח זמנים
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +108,Abrasive jet machining,עיבוד סילון שיוף
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +632,Maint. Schedule,שימור. לוח זמנים
 DocType: Stock Settings,Freeze Stock Entries,ערכי מלאי הקפאה
 DocType: Website Settings,Website Settings,הגדרות אתר
 DocType: Item,Reorder level based on Warehouse,רמת הזמנה חוזרת המבוסס על מחסן
@@ -2378,7 +2293,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +75,Show Stock Entries,ערכי Stock הצג
 ,Is Primary Address,האם כתובת ראשית
 DocType: Production Order,Work-in-Progress Warehouse,עבודה ב-התקדמות מחסן
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +308,Reference #{0} dated {1},# התייחסות {0} יום {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Reference #{0} dated {1},# התייחסות {0} יום {1}
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +13,Manage Addresses,ניהול כתובות
 DocType: Pricing Rule,Item Code,קוד פריט
 DocType: Production Planning Tool,Create Production Orders,צור הזמנות ייצור
@@ -2387,7 +2302,7 @@
 DocType: Lead,Market Segment,פלח שוק
 DocType: Communication,Phone,טלפון
 DocType: Employee Internal Work History,Employee Internal Work History,העובד פנימי היסטוריה עבודה
-apps/erpnext/erpnext/public/js/account_tree_grid.js +50,Closing (Dr),"סגירה (ד""ר)"
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +221,Closing (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.,תבנית מס לעסקות מכירה.
@@ -2403,8 +2318,8 @@
 ,Billed Amount,סכום חיוב
 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 +129,Material Request {0} is cancelled or stopped,בקשת חומר {0} בוטלה או נעצרה
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +641,Add a few sample records,הוסף כמה תקליטי מדגם
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +133,Material Request {0} is cancelled or stopped,בקשת חומר {0} בוטלה או נעצרה
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Add a few sample records,הוסף כמה תקליטי מדגם
 apps/erpnext/erpnext/config/hr.py +210,Leave Management,השאר ניהול
 DocType: Event,Groups,קבוצות
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,קבוצה על ידי חשבון
@@ -2417,36 +2332,32 @@
 DocType: Features Setup,Sales Extras,תוספות מכירות
 apps/erpnext/erpnext/accounts/utils.py +344,{0} budget for Account {1} against Cost Center {2} will exceed by {3},{0} תקציב לחשבון {1} נגד מרכז עלות {2} יעלה על ידי {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +236,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","חשבון הבדל חייב להיות חשבון סוג הנכס / התחייבות, מאז מניית הפיוס הזה הוא כניסת פתיחה"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +138,Purchase Order number required for Item {0},לרכוש מספר ההזמנה נדרש לפריט {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Order number required for Item {0},לרכוש מספר ההזמנה נדרש לפריט {0}
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',"""מתאריך"" חייב להיות לאחר 'עד תאריך'"
 ,Stock Projected Qty,המניה צפויה כמות
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +147,Customer {0} does not belong to project {1},לקוח {0} אינו שייכים לפרויקט {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +150,Customer {0} does not belong to project {1},לקוח {0} אינו שייכים לפרויקט {1}
 DocType: Sales Order,Customer's Purchase Order,הלקוח הזמנת הרכש
 DocType: Warranty Claim,From Company,מחברה
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,ערך או כמות
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Minute,דקות
+apps/erpnext/erpnext/public/js/setup_wizard.js +363,Minute,דקות
 DocType: Purchase Invoice,Purchase Taxes and Charges,לרכוש מסים והיטלים
 ,Qty to Receive,כמות לקבלת
 DocType: Leave Block List,Leave Block List Allowed,השאר בלוק רשימת מחמד
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +61,Conversion factor cannot be in fractions,גורם המרה לא יכול להיות שבברים
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +358,You will use it to Login,תוכל להשתמש בו להתחברות
+apps/erpnext/erpnext/public/js/setup_wizard.js +108,You will use it to Login,תוכל להשתמש בו להתחברות
 DocType: Sales Partner,Retailer,הקמעונאית
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +99,Credit To account must be a Balance Sheet account,אשראי לחשבון חייב להיות חשבון מאזן
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,כל סוגי הספק
 apps/erpnext/erpnext/stock/doctype/item/item.py +37,Item Code is mandatory because Item is not automatically numbered,"קוד פריט חובה, כי הפריט לא ממוספר באופן אוטומטי"
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +99,Quotation {0} not of type {1},ציטוט {0} לא מסוג {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +93,Quotation {0} not of type {1},ציטוט {0} לא מסוג {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,פריט לוח זמנים תחזוקה
 DocType: Sales Order,%  Delivered,% נמסר
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,Bank Overdraft Account,בנק משייך יתר חשבון
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +15,Make Salary Slip,הפוך שכר Slip
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +18,Browse BOM,העיון BOM
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +175,Secured Loans,הלוואות מובטחות
-apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +3,Awesome Products,מוצרים מדהים
+apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +3,Awesome Products,מוצרים מדהים
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +189,Opening Balance Equity,הון עצמי יתרה פתיחה
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +80,Cannot approve leave as you are not authorized to approve leaves on Block Dates,לא יכול לאשר חופשה כמו שאתה לא מוסמך לאשר עלים על תאריכי בלוק
 DocType: Appraisal,Appraisal,הערכה
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +13,Lost-foam casting,ליהוק איבד-קצף
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +47,Drawing,ציור
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +22,Date is repeated,התאריך חוזר על עצמו
 DocType: Hub Settings,Seller Email,"דוא""ל מוכר"
 DocType: Project,Total Purchase Cost (via Purchase Invoice),עלות רכישה כוללת (באמצעות רכישת חשבונית)
@@ -2461,7 +2372,7 @@
 DocType: Purchase Invoice Item,Net Amount (Company Currency),סכום נטו (חברת מטבע)
 DocType: BOM Operation,Hour Rate,שעה שערי
 DocType: Stock Settings,Item Naming By,פריט מתן שמות על ידי
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +642,From Quotation,מהצעת המחיר
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +655,From Quotation,מהצעת המחיר
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},עוד כניסת סגירת תקופת {0} נעשתה לאחר {1}
 DocType: Production Order,Material Transferred for Manufacturing,חומר הועבר לייצור
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +29,Account {0} does not exists,חשבון {0} אינו קיים
@@ -2475,21 +2386,19 @@
 DocType: Purchase Invoice Item,PR Detail,פרט יחסי הציבור
 DocType: Sales Order,Fully Billed,שחויב במלואו
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +20,Cash In Hand,מזומן ביד
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +72,Delivery warehouse required for stock item {0},מחסן אספקה ​​הנדרש לפריט המניה {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +119,Delivery warehouse required for stock item {0},מחסן אספקה ​​הנדרש לפריט המניה {0}
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),המשקל הכולל של החבילה. בדרך כלל משקל נטו + משקל חומרי אריזה. (להדפסה)
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,משתמשים עם תפקיד זה מותר להגדיר חשבונות קפוא וליצור / לשנות רישומים חשבונאיים נגד חשבונות מוקפאים
 DocType: Serial No,Is Cancelled,האם בוטל
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +281,My Shipments,המשלוחים שלי
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +286,My Shipments,המשלוחים שלי
 DocType: Journal Entry,Bill Date,תאריך ביל
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +43,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","גם אם יש כללי תמחור מרובים עם העדיפות הגבוהה ביותר, סדרי עדיפויות פנימיים אז להלן מיושמות:"
 DocType: Supplier,Supplier Details,פרטי ספק
 DocType: Communication,Recipients,מקבלי
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +146,Screwing,דופק
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +96,Knurling,Knurling
 DocType: Expense Claim,Approval Status,סטטוס אישור
 DocType: Hub Settings,Publish Items to Hub,לפרסם פריטים לHub
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +44,From value must be less than to value in row {0},מהערך חייב להיות פחות משווי בשורת {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +133,Wire Transfer,העברה בנקאית
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +133,Wire Transfer,העברה בנקאית
 apps/erpnext/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py +25,Please select Bank Account,אנא בחר חשבון בנק
 DocType: Newsletter,Create and Send Newsletters,ידיעונים ליצור ולשלוח
 apps/frappe/frappe/public/js/frappe/views/reports/grid_report.js +305,From Date must be before To Date,מתאריך חייב להיות לפני תאריך כדי
@@ -2497,14 +2406,14 @@
 DocType: Company,Default Income Account,חשבון הכנסות ברירת מחדל
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,קבוצת לקוחות / לקוחות
 DocType: Item Group,Check this if you want to show in website,לבדוק את זה אם אתה רוצה להראות באתר
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +190,Welcome to ERPNext,ברוכים הבאים לERPNext
+,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/page/setup_wizard/install_fixtures.py +37,Calls,שיחות
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Calls,שיחות
 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 +193,Purchase Order {0} is not submitted,הזמנת רכש {0} לא תוגש
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +194,Purchase Order {0} is not submitted,הזמנת רכש {0} לא תוגש
 ,Projected,צפוי
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},מספר סידורי {0} אינו שייך למחסן {1}
 apps/erpnext/erpnext/controllers/status_updater.py +136,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,הערה: מערכת לא תבדוק על-אספקה ​​ועל-הזמנה לפריט {0} ככמות או כמות היא 0
@@ -2512,7 +2421,6 @@
 DocType: Issue,Opening Date,תאריך פתיחה
 DocType: Journal Entry,Remark,הערה
 DocType: Purchase Receipt Item,Rate and Amount,שיעור והסכום
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +95,Boring,משעמם
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +667,From Sales Order,מלהזמין מכירות
 DocType: Blog Category,Parent Website Route,הורה אתר כביש
 DocType: Sales Order,Not Billed,לא חויב
@@ -2526,18 +2434,16 @@
 apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount Amount,סכום הנחה
 DocType: Purchase Invoice,Return Against Purchase Invoice,חזור נגד רכישת חשבונית
 DocType: Item,Warranty Period (in days),תקופת אחריות (בימים)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +550,e.g. VAT,"למשל מע""מ"
+apps/erpnext/erpnext/public/js/setup_wizard.js +292,e.g. VAT,"למשל מע""מ"
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,פריט 4
 DocType: Journal Entry Account,Journal Entry Account,חשבון כניסת Journal
 DocType: Shopping Cart Settings,Quotation Series,סדרת ציטוט
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +52,"An item exists with same name ({0}), please change the item group name or rename the item","פריט קיים באותו שם ({0}), בבקשה לשנות את שם קבוצת פריט או לשנות את שם הפריט"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +82,Hot metal gas forming,גז מתכת חם להרכיב
 DocType: Sales Order Item,Sales Order Date,תאריך הזמנת מכירות
 DocType: Sales Invoice Item,Delivered Qty,כמות נמסרה
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +63,Warehouse {0}: Company is mandatory,מחסן {0}: החברה היא חובה
 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.",עבור לקבוצה המתאימה (בדרך כלל מקור כספים&gt; התחייבויות שוטפות&gt; מסים וחובות וליצור חשבון חדש (על ידי לחיצה על הוסף לילדים) של &quot;מס&quot; סוג ולעשות להזכיר את שיעור המס.
 ,Payment Period Based On Invoice Date,תקופת תשלום מבוסס בתאריך החשבונית
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +135,Laser cutting,חיתוך לייזר
 DocType: Event,Monday,יום שני
 DocType: Journal Entry,Stock Entry,מניית כניסה
 DocType: Account,Payable,משתלם
@@ -2570,7 +2476,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +111,Date Of Retirement must be greater than Date of Joining,מועד הפרישה חייב להיות גדול מ תאריך ההצטרפות
 DocType: Sales Invoice,Against Income Account,נגד חשבון הכנסות
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +69,{0}% Delivered,{0}% נמסר
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +78,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,פריט {0}: כמות מסודרת {1} לא יכול להיות פחות מכמות הזמנה מינימאלית {2} (מוגדר בסעיף).
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,פריט {0}: כמות מסודרת {1} לא יכול להיות פחות מכמות הזמנה מינימאלית {2} (מוגדר בסעיף).
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,אחוז בחתך חודשי
 DocType: Territory,Territory Targets,מטרות שטח
 DocType: Delivery Note,Transporter Info,Transporter מידע
@@ -2579,7 +2485,6 @@
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,כותרות לתבניות הדפסה למשל פרופורמה חשבונית.
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +140,Valuation type charges can not marked as Inclusive,חיובי סוג הערכת שווי לא יכולים סומן ככלול
 DocType: POS Profile,Update Stock,בורסת עדכון
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +128,Superfinishing,Superfinishing
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,"אוני 'מישגן שונה עבור פריטים יובילו לערך השגוי (סה""כ) נקי במשקל. ודא שמשקל נטו של כל פריט הוא באותו אוני 'מישגן."
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM שערי
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +85,Please pull items from Delivery Note,אנא למשוך פריטים מתעודת המשלוח
@@ -2594,7 +2499,6 @@
 ,Purchase Analytics,Analytics רכישה
 DocType: Sales Invoice Item,Delivery Note Item,פריט תעודת משלוח
 DocType: Expense Claim,Task,משימה
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +57,Shaving,גילוח
 DocType: Purchase Taxes and Charges,Reference Row #,# ההתייחסות Row
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},מספר אצווה הוא חובה עבור פריט {0}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js +14,This is a root sales person and cannot be edited.,זה איש מכירות שורש ולא ניתן לערוך.
@@ -2605,13 +2509,11 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +199,Select a group node first.,בחר צומת קבוצה ראשונה.
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +108,Fill the form and save it,מלא את הטופס ולשמור אותו
 DocType: Production Planning Tool,Download a report containing all raw materials with their latest inventory status,הורד דוח המכיל את כל חומרי הגלם עם מצב המלאי האחרון שלהם
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +94,Facing,מול
 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,שלח SMS
 DocType: Company,Default Letter Head,ברירת מחדל מכתב ראש
 DocType: Time Log,Billable,לחיוב
-DocType: Authorization Rule,This will be used for setting rule in HR module,זה ישמש לקביעת כלל במודול HR
 DocType: Account,Rate at which this tax is applied,קצב שבו מס זה מיושם
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reorder Qty,סדר מחדש כמות
 DocType: Company,Stock Adjustment Account,חשבון התאמת המניה
@@ -2637,16 +2539,15 @@
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,אחוז ההקצאה צריכה להיות שווה ל- 100%
 DocType: Serial No,Out of AMC,מתוך AMC
 DocType: Purchase Order Item,Material Request Detail No,פרטי בקשת חומר לא
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +97,Hard turning,מפנה קשה
 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,אנא צור קשר עם למשתמש שיש לי מכירות Master מנהל {0} תפקיד
 DocType: Company,Default Cash Account,חשבון מזומנים ברירת מחדל
 apps/erpnext/erpnext/config/accounts.py +79,Company (not Customer or Supplier) master.,אדון חברה (לא לקוח או ספק).
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +106,Please enter 'Expected Delivery Date',נא להזין את 'תאריך אספקה ​​צפויה של
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +187,Delivery Notes {0} must be cancelled before cancelling this Sales Order,תעודות משלוח {0} יש לבטל לפני ביטול הזמנת מכירות זה
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +100,Please enter 'Expected Delivery Date',נא להזין את 'תאריך אספקה ​​צפויה של
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +182,Delivery Notes {0} must be cancelled before cancelling this Sales Order,תעודות משלוח {0} יש לבטל לפני ביטול הזמנת מכירות זה
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +373,Paid amount + Write Off Amount can not be greater than Grand Total,הסכום ששולם + לכתוב את הסכום לא יכול להיות גדול יותר מסך כולל
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} הוא לא מספר אצווה תקף לפריט {1}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,Note: There is not enough leave balance for Leave Type {0},הערה: אין איזון חופשה מספיק לחופשת סוג {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +124,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,סוג ההזדמנות
@@ -2658,7 +2559,7 @@
 DocType: Hub Settings,Publish Availability,פרסם זמינים
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +105,Date of Birth cannot be greater than today.,תאריך לידה לא יכול להיות גדול יותר מהיום.
 ,Stock Ageing,מניית הזדקנות
-apps/erpnext/erpnext/controllers/accounts_controller.py +200,{0} '{1}' is disabled,{0} '{1}' אינו זמין
+apps/erpnext/erpnext/controllers/accounts_controller.py +201,{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.,"שלח דוא""ל אוטומטית למגעים על עסקות הגשת."
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +232,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
@@ -2667,43 +2568,37 @@
 DocType: Purchase Order,Customer Contact Email,דוא&quot;ל ליצירת קשר של לקוחות
 DocType: Event,Sunday,יום ראשון
 DocType: Sales Team,Contribution (%),תרומה (%)
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +455,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,"הערה: כניסת תשלום לא יצרה מאז ""מזומן או חשבון הבנק 'לא צוין"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +171,Responsibilities,אחריות
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +457,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 +11,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,נא להזין atleast חשבונית 1 בטבלה
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +511,Add Users,הוסף משתמשים
+apps/erpnext/erpnext/public/js/setup_wizard.js +255,Add Users,הוסף משתמשים
 DocType: Pricing Rule,Item Group,קבוצת פריט
 DocType: Task,Actual Start Date (via Time Logs),תאריך התחלה בפועל (באמצעות זמן יומנים)
 DocType: Stock Reconciliation Item,Before reconciliation,לפני הפיוס
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),מסים והיטלים נוסף (חברת מטבע)
-apps/erpnext/erpnext/stock/doctype/item/item.py +340,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,שורת מס פריט {0} חייבת להיות חשבון של מס סוג או הכנסה או הוצאה או לחיוב
+apps/erpnext/erpnext/stock/doctype/item/item.py +344,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,שורת מס פריט {0} חייבת להיות חשבון של מס סוג או הכנסה או הוצאה או לחיוב
 DocType: Sales Order,Partly Billed,בחלק שחויב
 DocType: Item,Default BOM,BOM ברירת המחדל
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +79,Decambering,Decambering
 apps/erpnext/erpnext/setup/doctype/company/company.js +22,Please re-type company name to confirm,אנא שם חברה הקלד לאשר
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,"סה""כ מצטיין Amt"
 DocType: Time Log Batch,Total Hours,"סה""כ שעות"
 DocType: Journal Entry,Printing Settings,הגדרות הדפסה
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +268,Total Debit must be equal to Total Credit. The difference is {0},חיוב כולל חייב להיות שווה לסך אשראי. ההבדל הוא {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +11,Automotive,רכב
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +37,Item is required,הפריט נדרש
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +25,Metal injection molding,הזרקת מתכת
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +258,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/accounts/doctype/sales_invoice/sales_invoice.js +684,From Delivery Note,מתעודת משלוח
 DocType: Time Log,From Time,מזמן
 DocType: Notification Control,Custom Message,הודעה מותאמת אישית
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +33,Investment Banking,בנקאות השקעות
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +261,"Select your Country, Time Zone and Currency","בחר את המדינה, אזור הזמן ומטבע"
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,בנקאות השקעות
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +316,"Select your Country, Time Zone and Currency","בחר את המדינה, אזור הזמן ומטבע"
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +369,Cash or Bank Account is mandatory for making payment entry,חשבון מזומן או בנק הוא חובה להכנת כניסת תשלום
 DocType: Purchase Invoice,Price List Exchange Rate,מחיר מחירון שער חליפין
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +91,Pickling,כְּבִישָׁה
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +18,Sand casting,יציקות חול
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +117,Electroplating,גלוון
 DocType: Purchase Invoice Item,Rate,שיעור
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +62,Intern,Intern
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Intern,Intern
 DocType: Newsletter,A Lead with this email id should exist," ליד עם  דוא""ל זה צריך להתקיים"
 DocType: Stock Entry,From BOM,מBOM
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +34,Basic,בסיסי
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +34,Basic,בסיסי
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,עסקות המניה לפני {0} קפואים
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +217,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,לתאריך צריך להיות זהה מתאריך לחופשה חצי יום
@@ -2711,10 +2606,10 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +96,Reference No is mandatory if you entered Reference Date,התייחסות לא חובה אם אתה נכנס תאריך ההפניה
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +108,Date of Joining must be greater than Date of Birth,תאריך ההצטרפות חייב להיות גדול מ תאריך לידה
 DocType: Salary Structure,Salary Structure,שכר מבנה
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +242,"Multiple Price Rule exists with same criteria, please resolve \
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +246,"Multiple Price Rule exists with same criteria, please resolve \
 			conflict by assigning priority. Price Rules: {0}","כלל מחיר מרובה קיים באותם קריטריונים, אנא לפתור \ סכסוך על ידי הקצאת עדיפות. כללי מחיר: {0}"
 DocType: Account,Bank,בנק
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +9,Airline,חברת תעופה
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,חברת תעופה
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +493,Issue Material,חומר נושא
 DocType: Material Request Item,For Warehouse,למחסן
 DocType: Employee,Offer Date,תאריך הצעה
@@ -2724,29 +2619,24 @@
 DocType: Item,Is Fixed Asset Item,האם פריט רכוש קבוע
 DocType: Stock Entry,Including items for sub assemblies,כולל פריטים למכלולים תת
 DocType: Features Setup,"If you have long print formats, this feature can be used to split the page to be printed on multiple pages with all headers and footers on each page","אם יש לך פורמטי הדפסה ארוכים, תכונה זו יכולה לשמש כדי לפצל את הדף שיודפס על דפים רבים עם כל הכותרות העליונות והתחתונות בכל עמוד"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +131,Hobbing,Hobbing
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +98,All Territories,כל השטחים
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +98,All Territories,כל השטחים
 DocType: Purchase Invoice,Items,פריטים
 DocType: Fiscal Year,Year Name,שם שנה
 DocType: Process Payroll,Process Payroll,שכר תהליך
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +59,There are more holidays than working days this month.,ישנם יותר מ חגי ימי עבודה בחודש זה.
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +68,There are more holidays than working days this month.,ישנם יותר מ חגי ימי עבודה בחודש זה.
 DocType: Product Bundle Item,Product Bundle Item,פריט Bundle מוצר
 DocType: Sales Partner,Sales Partner Name,שם שותף מכירות
 DocType: Purchase Invoice Item,Image View,צפה בתמונה
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +113,Finishing & industrial finishing,גימור וגימור תעשייתי
 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/page/setup_wizard/fixtures/industry_type.py +46,Securities & Commodity Exchanges,ניירות ערך ובורסות סחורות
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,ניירות ערך ובורסות סחורות
 DocType: Shipping Rule,Calculate Based On,חישוב המבוסס על
 DocType: Delivery Note Item,From Warehouse,ממחסן
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +98,Drilling,קידוח
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +28,Blow molding,ניפוח
 DocType: Purchase Taxes and Charges,Valuation and Total,"הערכת שווי וסה""כ"
 DocType: Tax Rule,Shipping City,משלוח עיר
 apps/erpnext/erpnext/stock/doctype/item/item.js +43,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,"פריט זה הנו נגזר של {0} (תבנית). תכונות תועתק על מהתבנית אלא אם כן ""לא העתק 'מוגדרת"
 DocType: Account,Purchase User,משתמש רכישה
 DocType: Notification Control,Customize the Notification,התאמה אישית של ההודעה
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +87,Hammering,פטיש
 DocType: Web Page,Slideshow,מצגת
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +24,Default Address Template cannot be deleted,תבנית כתובת ברירת מחדל לא ניתן למחוק
 DocType: Sales Invoice,Shipping Rule,כלל משלוח
@@ -2755,9 +2645,8 @@
 DocType: Workflow State,Search,חיפוש
 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/setup/page/setup_wizard/fixtures/operations.py +142,Brazing,הלחמה
 DocType: C-Form,Amended From,תוקן מ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Raw Material,חומר גלם
+apps/erpnext/erpnext/public/js/setup_wizard.js +359,Raw Material,חומר גלם
 DocType: Leave Application,Follow via Email,"עקוב באמצעות דוא""ל"
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,סכום מס לאחר סכום הנחה
 apps/erpnext/erpnext/accounts/doctype/account/account.py +174,Child account exists for this account. You can not delete this account.,חשבון ילד קיים עבור חשבון זה. אתה לא יכול למחוק את החשבון הזה.
@@ -2771,10 +2660,10 @@
 ,Produced,מיוצר
 DocType: Item,Item Code for Suppliers,קוד פריט לספקים
 DocType: Issue,Raised By (Email),"הועלה על ידי (דוא""ל)"
-apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +72,General,כללי
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +495,Attach Letterhead,צרף מכתבים
+apps/erpnext/erpnext/setup/setup_wizard/default_website.py +72,General,כללי
+apps/erpnext/erpnext/public/js/setup_wizard.js +241,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/setup/page/setup_wizard/setup_wizard.js +542,"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.","רשימת ראשי המס שלך (למשל מע&quot;מ, מכס וכו &#39;, הם צריכים להיות שמות ייחודיים) ושיעורי הסטנדרטים שלהם. זה יהיה ליצור תבנית סטנדרטית, שבו אתה יכול לערוך ולהוסיף עוד מאוחר יותר."
+apps/erpnext/erpnext/public/js/setup_wizard.js +284,"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.","רשימת ראשי המס שלך (למשל מע&quot;מ, מכס וכו &#39;, הם צריכים להיות שמות ייחודיים) ושיעורי הסטנדרטים שלהם. זה יהיה ליצור תבנית סטנדרטית, שבו אתה יכול לערוך ולהוסיף עוד מאוחר יותר."
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial Nos Required for Serialized Item {0},מס 'סידורי הנדרש לפריט מספר סידורי {0}
 DocType: Journal Entry,Bank Entry,בנק כניסה
 DocType: Authorization Rule,Applicable To (Designation),כדי ישים (ייעוד)
@@ -2783,30 +2672,28 @@
 apps/erpnext/erpnext/config/accounts.py +143,Enable / disable currencies.,הפעלה / השבתה של מטבעות.
 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)"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +26,Entertainment & Leisure,בידור ופנאי
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,בידור ופנאי
 DocType: Purchase Order,The date on which recurring order will be stop,המועד שבו על מנת חוזר יהיה לעצור
 DocType: Quality Inspection,Item Serial No,מספר סידורי פריט
 apps/erpnext/erpnext/controllers/status_updater.py +142,{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 +57,Total Present,"הווה סה""כ"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Hour,שעה
+apps/erpnext/erpnext/public/js/setup_wizard.js +363,Hour,שעה
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +138,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation",פריט בהמשכים {0} לא ניתן לעדכן \ באמצעות בורסת פיוס
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +488,Transfer Material to Supplier,העברת חומר לספקים
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +513,Transfer Material to Supplier,העברת חומר לספקים
 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,מספר סידורי חדש לא יכול להיות מחסן. מחסן חייב להיות מוגדר על ידי Stock כניסה או קבלת רכישה
 DocType: Lead,Lead Type,סוג עופרת
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +82,Create Quotation,צור הצעת מחיר
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +306,All these items have already been invoiced,כל הפריטים הללו כבר חשבונית
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,You are not authorized to approve leaves on Block Dates,אתה לא מורשה לאשר עלים בתאריכי הבלוק
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +311,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,משלוח תנאי Rule
 DocType: BOM Replace Tool,The new BOM after replacement,BOM החדש לאחר החלפה
 DocType: Features Setup,Point of Sale,Point of Sale
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +83,Curling,קרלינג
 DocType: Account,Tax,מס
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +28,Row {0}: {1} is not a valid {2},השורה {0}: {1} היא לא חוקית {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +89,Refining,זיקוק
+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,תכנון ייצור כלי
 DocType: Quality Inspection,Report Date,תאריך דוח
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +130,Routing,ניתוב
 DocType: C-Form,Invoices,חשבוניות
 DocType: Job Opening,Job Title,כותרת עבודה
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +80,{0} Recipients,{0} מקבלי
@@ -2826,14 +2713,13 @@
 DocType: DocType,Setup,התקנה
 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,סיכום לחודש זה ופעילויות תלויות ועומדות
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +39,Cold rolling,גלגול קר
 DocType: Customer Group,Customer Group Name,שם קבוצת הלקוחות
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +408,Please remove this Invoice {0} from C-Form {1},אנא הסר חשבונית זו {0} מC-טופס {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +410,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,תכונות
 DocType: Packing Slip,Get Items,קבל פריטים
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +186,Please enter Write Off Account,נא להזין לכתוב את החשבון
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +187,Please enter Write Off Account,נא להזין לכתוב את החשבון
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +71,Last Order Date,התאריך אחרון סדר
 DocType: DocField,Image,תמונה
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +179,Make Excise Invoice,הפוך בלו חשבונית
@@ -2843,7 +2729,7 @@
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +146,Operation ID not set,זיהוי מבצע לא קבע
 DocType: Production Order,Planned Start Date,תאריך התחלה מתוכנן
 DocType: Serial No,Creation Document Type,סוג מסמך יצירה
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +620,Maint. Visit,שימור. בקר ב
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +631,Maint. Visit,שימור. בקר ב
 DocType: Leave Type,Is Encash,האם encash
 DocType: Purchase Invoice,Mobile No,נייד לא
 DocType: Payment Tool,Make Journal Entry,הפוך יומן
@@ -2851,35 +2737,31 @@
 apps/erpnext/erpnext/controllers/trends.py +257,Project-wise data is not available for Quotation,נתוני פרויקט-חכם אינם זמינים להצעת מחיר
 DocType: Project,Expected End Date,תאריך סיום צפוי
 DocType: Appraisal Template,Appraisal Template Title,הערכת תבנית כותרת
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +440,Commercial,מסחרי
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +378,Commercial,מסחרי
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +23,Parent Item {0} must not be a Stock Item,פריט הורה {0} לא חייב להיות פריט במלאי
 DocType: Cost Center,Distribution Id,הפצת זיהוי
-apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +14,Awesome Services,שירותים מדהים
+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,כתובת ספק
 DocType: Contact Us Settings,Address Line 2,שורת כתובת 2
 DocType: ToDo,Reference,התייחסות
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +59,Perforating,נְקִיבָה
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,מתוך כמות
 apps/erpnext/erpnext/config/accounts.py +128,Rules to calculate shipping amount for a sale,כללים לחישוב סכום משלוח למכירה
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +29,Series is mandatory,סדרה היא חובה
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +28,Financial Services,שירותים פיננסיים
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,שירותים פיננסיים
 apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3},ערך תמורת תכונה {0} חייב להיות בטווח של {1} {2} במרווחים של {3}
 DocType: Tax Rule,Sales,מכירות
 DocType: Stock Entry Detail,Basic Amount,סכום בסיסי
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +173,Warehouse required for stock Item {0},מחסן נדרש לפריט המניה {0}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +178,Warehouse required for stock Item {0},מחסן נדרש לפריט המניה {0}
 DocType: Leave Allocation,Unused leaves,עלים שאינם בשימוש
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,Cr
 DocType: Customer,Default Receivable Accounts,ברירת מחדל חשבונות חייבים
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +102,Sawing,ניסור
 DocType: Tax Rule,Billing State,מדינת חיוב
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +32,Laminating,למינציה
 DocType: Item Reorder,Transfer,העברה
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +549,Fetch exploded BOM (including sub-assemblies),תביא BOM התפוצץ (כולל תת מכלולים)
 DocType: Authorization Rule,Applicable To (Employee),כדי ישים (עובד)
 apps/erpnext/erpnext/controllers/accounts_controller.py +101,Due Date is mandatory,תאריך היעד הוא חובה
 apps/erpnext/erpnext/controllers/item_variant.py +51,Increment for Attribute {0} cannot be 0,תוספת לתכונה {0} לא יכולה להיות 0
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +143,Sintering,Sintering
 DocType: Journal Entry,Pay To / Recd From,לשלם ל/ Recd מ
 DocType: Naming Series,Setup Series,סדרת התקנה
 DocType: Supplier,Contact HTML,צור קשר עם HTML
@@ -2892,7 +2774,6 @@
 DocType: Attendance,Absent,נעדר
 DocType: Product Bundle,Product Bundle,Bundle מוצר
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +180,Row {0}: Invalid reference {1},שורת {0}: התייחסות לא חוקית {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +165,Crushing,ריסוק
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,לרכוש תבנית מסים והיטלים
 DocType: Upload Attendance,Download Template,תבנית להורדה
 DocType: GL Entry,Remarks,הערות
@@ -2900,14 +2781,12 @@
 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/setup/page/setup_wizard/fixtures/operations.py +9,Continuous casting,יציקה רציפה
 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/setup/page/setup_wizard/fixtures/operations.py +80,Cold sizing,שינוי גודל קר
 DocType: Salary Slip,Earning & Deduction,השתכרות וניכוי
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +76,Account {0} cannot be a Group,חשבון {0} אינו יכול להיות קבוצה
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +259,Region,אזור
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +314,Region,אזור
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +213,Optional. This setting will be used to filter in various transactions.,אופציונאלי. הגדרה זו תשמש לסינון בעסקות שונות.
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +104,Negative Valuation Rate is not allowed,שערי הערכה שליליים אינו מותר
 DocType: Holiday List,Weekly Off,Off השבועי
@@ -2925,7 +2804,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,Account {0} is inactive,חשבון {0} אינו פעיל
 DocType: GL Entry,Is Advance,האם Advance
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,נוכחות מתאריך והנוכחות עד כה היא חובה
-apps/erpnext/erpnext/controllers/buying_controller.py +131,Please enter 'Is Subcontracted' as Yes or No,"נא להזין את 'האם קבלן ""ככן או לא"
+apps/erpnext/erpnext/controllers/buying_controller.py +122,Please enter 'Is Subcontracted' as Yes or No,"נא להזין את 'האם קבלן ""ככן או לא"
 DocType: Sales Team,Contact No.,מס 'לתקשר
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,'Profit and Loss' type account {0} not allowed in Opening Entry,"""רווח והפסד"" חשבון סוג {0} אסור בפתיחת כניסה"
 DocType: Workflow State,Time,זמן
@@ -2934,24 +2813,21 @@
 DocType: Authorization Rule,Authorization Rule,כלל אישור
 DocType: Sales Invoice,Terms and Conditions Details,פרטי תנאים והגבלות
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,מסים מכירות וחיובי תבנית
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +10,Apparel & Accessories,ביגוד ואביזרים
+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,מספר להזמין
 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 +121,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/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +47,Conversion Factor is required,פקטור המרה נדרש
 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,ערך / תיאור
 DocType: Tax Rule,Billing Country,ארץ חיוב
 ,Customers Not Buying Since Long Time,לקוחות לא קונים מאז הרבה זמן
 DocType: Production Order,Expected Delivery Date,תאריך אספקה ​​צפוי
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +48,Bulging,בולט
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +11,Evaporative-pattern casting,ליהוק אידוי-דפוס
 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 +195,Sales Invoice {0} must be cancelled before cancelling this Sales Order,מכירות חשבונית {0} יש לבטל לפני ביטול הזמנת מכירות זה
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +190,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.
@@ -2970,26 +2846,24 @@
 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 +241,Account: {0} with currency: {1} can not be selected,חשבון: {0} עם מטבע: {1} לא ניתן לבחור
+apps/erpnext/erpnext/controllers/accounts_controller.py +242,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 +47,Account {0}: Parent account {1} does not belong to company: {2},חשבון {0}: הורה חשבון {1} אינו שייך לחברה: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted all transactions related to this company!,בהצלחה נמחק כל העסקות הקשורות לחברה זו!
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,כבתאריך
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +111,Honing,השחזה
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +58,Probation,מבחן
-apps/erpnext/erpnext/stock/doctype/item/item.py +264,Default Warehouse is mandatory for stock Item.,מחסן ברירת מחדל הוא חובה עבור פריט המניה.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Probation,מבחן
+apps/erpnext/erpnext/stock/doctype/item/item.py +268,Default Warehouse is mandatory for stock Item.,מחסן ברירת מחדל הוא חובה עבור פריט המניה.
 DocType: Feed,Full Name,שם מלא
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +148,Clinching,קטפתי
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +191,Payment of salary for the month {0} and year {1},תשלום השכר עבור החודש {0} ושנה {1}
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +173,Payment of salary for the month {0} and year {1},תשלום השכר עבור החודש {0} ושנה {1}
 DocType: Stock Settings,Auto insert Price List rate if missing,הכנס אוטומטי שיעור מחירון אם חסר
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,"סכום ששולם סה""כ"
 ,Transferred Qty,כמות שהועברה
 apps/erpnext/erpnext/config/learn.py +11,Navigating,ניווט
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +137,Planning,תכנון
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +137,Planning,תכנון
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +9,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),סכום חיוב כולל (דרך זמן יומנים)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +629,We sell this Item,אנחנו מוכרים פריט זה
+apps/erpnext/erpnext/public/js/setup_wizard.js +365,We sell this Item,אנחנו מוכרים פריט זה
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +65,Supplier Id,ספק זיהוי
 DocType: Journal Entry,Cash Entry,כניסה במזומן
 DocType: Sales Partner,Contact Desc,לתקשר יורד
@@ -2998,18 +2872,16 @@
 DocType: Brand,Item Manager,מנהל פריט
 DocType: Cost Center,Add rows to set annual budgets on Accounts.,להוסיף שורות להגדיר תקציבים שנתי על חשבונות.
 DocType: Buying Settings,Default Supplier Type,סוג ספק ברירת מחדל
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +160,Quarrying,חציבה
 DocType: Production Order,Total Operating Cost,"עלות הפעלה סה""כ"
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +160,Note: Item {0} entered multiple times,הערה: פריט {0} נכנסה מספר פעמים
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +163,Note: Item {0} entered multiple times,הערה: פריט {0} נכנסה מספר פעמים
 apps/erpnext/erpnext/config/crm.py +27,All Contacts.,כל אנשי הקשר.
 DocType: Newsletter,Test Email Id,"דוא""ל מבחן זיהוי"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +394,Company Abbreviation,קיצור חברה
+apps/erpnext/erpnext/public/js/setup_wizard.js +142,Company Abbreviation,קיצור חברה
 DocType: Features Setup,If you follow Quality Inspection. Enables Item QA Required and QA No in Purchase Receipt,אם אתם עוקבים איכות פיקוח. מאפשר פריט QA חובה וQA אין בקבלת רכישה
 DocType: GL Entry,Party Type,סוג המפלגה
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +68,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,לא authroized מאז {0} עולה על גבולות
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +30,Rotational molding,דפוס רוטציה
 apps/erpnext/erpnext/config/hr.py +115,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,כלל מס שנקבע לעגלת קניות
@@ -3023,15 +2895,15 @@
 apps/erpnext/erpnext/config/selling.py +18,Quotes to Leads or Customers.,ציטוטים להובלות או לקוחות.
 DocType: Stock Settings,Role Allowed to edit frozen stock,תפקיד מחמד לערוך המניה קפוא
 ,Territory Target Variance Item Group-Wise,פריט יעד שונות טריטורית קבוצה-Wise
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +101,All Customer Groups,בכל קבוצות הלקוחות
-apps/erpnext/erpnext/controllers/accounts_controller.py +474,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} הוא חובה. אולי שיא המרה לא נוצר עבור {1} ל {2}.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +101,All Customer Groups,בכל קבוצות הלקוחות
+apps/erpnext/erpnext/controllers/accounts_controller.py +475,{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 +41,Account {0}: Parent account {1} does not exist,חשבון {0}: הורה חשבון {1} לא קיימת
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),מחיר מחירון שיעור (חברת מטבע)
 DocType: Account,Temporary,זמני
 DocType: Address,Preferred Billing Address,כתובת חיוב מועדפת
 DocType: Monthly Distribution Percentage,Percentage Allocation,אחוז ההקצאה
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +86,Secretary,מזכיר
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Secretary,מזכיר
 DocType: Serial No,Distinct unit of an Item,יחידה נפרדת של פריט
 DocType: Pricing Rule,Buying,קנייה
 DocType: HR Settings,Employee Records to be created by,רשומות עובדים שנוצרו על ידי
@@ -3044,9 +2916,8 @@
 ,Item-wise Price List Rate,שערי רשימת פריט המחיר חכם
 DocType: Purchase Order Item,Supplier Quotation,הצעת מחיר של ספק
 DocType: Quotation,In Words will be visible once you save the Quotation.,במילים יהיו גלוי לאחר שתשמרו את הצעת המחיר.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +68,Ironing,גיהוץ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is stopped,{0} {1} הוא הפסיק
-apps/erpnext/erpnext/stock/doctype/item/item.py +352,Barcode {0} already used in Item {1},ברקוד {0} כבר השתמש בפריט {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +356,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/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,אירועים קרובים
@@ -3055,27 +2926,25 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +27,Quick Entry,כניסה מהירה
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0} הוא חובה עבור שבות
 DocType: Purchase Order,To Receive,לקבל
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +33,Shrink fitting,פסיכולוג הולם
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +522,user@example.com,user@example.com
+apps/erpnext/erpnext/public/js/setup_wizard.js +266,user@example.com,user@example.com
 DocType: Email Digest,Income / Expense,הכנסות / הוצאות
 DocType: Employee,Personal Email,"דוא""ל אישי"
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +58,Total Variance,סך שונה
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +62,Total Variance,סך שונה
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.","אם מאופשר, המערכת תפרסם רישומים חשבונאיים עבור המלאי באופן אוטומטי."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +15,Brokerage,תיווך
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +15,Brokerage,תיווך
 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/accounts/page/financial_analytics/financial_analytics.js +42,Select Fiscal Year...,בחר שנת כספים ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +442,POS Profile required to make POS Entry,פרופיל קופה הנדרש כדי להפוך את קופה הכניסה
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +444,POS Profile required to make POS Entry,פרופיל קופה הנדרש כדי להפוך את קופה הכניסה
 DocType: Hub Settings,Name Token,שם אסימון
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +106,Planing,הַקצָעָה
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Selling,מכירה סטנדרטית
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +120,Standard Selling,מכירה סטנדרטית
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +137,Atleast one warehouse is mandatory,Atleast מחסן אחד הוא חובה
 DocType: Serial No,Out of Warranty,מתוך אחריות
 DocType: BOM Replace Tool,Replace,החלף
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +314,{0} against Sales Invoice {1},{0} נגד מכירות חשבונית {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +316,{0} against Sales Invoice {1},{0} נגד מכירות חשבונית {1}
 apps/erpnext/erpnext/stock/doctype/item/item.py +49,Please enter default Unit of Measure,נא להזין את ברירת מחדל של יחידת מדידה
 DocType: Purchase Invoice Item,Project Name,שם פרויקט
 DocType: Supplier,Mention if non-standard receivable account,להזכיר אם חשבון חייבים שאינם סטנדרטי
@@ -3091,9 +2960,8 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,Journal Entry {0} does not have account {1} or already matched against other voucher,היומן {0} אין חשבון {1} או שכבר מתאים נגד שובר אחר
 DocType: Item,Moving Average,ממוצע נע
 DocType: BOM Replace Tool,The BOM which will be replaced,BOM אשר יוחלף
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +43,New Stock UOM must be different from current stock UOM,החדש במלאי של אוני 'מישגן חייב להיות שונים משל אוני' מישגן המניה הנוכחי
 DocType: Account,Debit,חיוב
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +34,Leaves must be allocated in multiples of 0.5,עלים חייבים להיות מוקצים בכפולות של 0.5
+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/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,Amt מצטיין
@@ -3111,8 +2979,7 @@
 DocType: Employee,Internal Work History,היסטוריה עבודה פנימית
 DocType: DocField,Column Break,Break עמודה
 DocType: Event,Thursday,יום חמישי
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +42,Private Equity,הון פרטי
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +93,Turning,הפיכת
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,הון פרטי
 DocType: Maintenance Visit,Customer Feedback,לקוחות משוב
 DocType: Account,Expense,חשבון
 DocType: Sales Invoice,Exhibition,תערוכה
@@ -3125,19 +2992,19 @@
 DocType: Employee,Held On,במוחזק
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +33,Production Item,פריט ייצור
 ,Employee Information,מידע לעובדים
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,Rate (%),שיעור (%)
+apps/erpnext/erpnext/public/js/setup_wizard.js +294,Rate (%),שיעור (%)
 DocType: Stock Entry Detail,Additional Cost,עלות נוספת
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +407,Financial Year End Date,תאריך הפיננסי סוף השנה
+apps/erpnext/erpnext/public/js/setup_wizard.js +155,Financial Year End Date,תאריך הפיננסי סוף השנה
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Voucher No, if grouped by Voucher","לא לסנן מבוססים על השובר לא, אם מקובצים לפי שובר"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +484,Make Supplier Quotation,הפוך הצעת מחיר של ספק
 DocType: Quality Inspection,Incoming,נכנסים
 DocType: BOM,Materials Required (Exploded),חומרים דרושים (התפוצצו)
 DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),להפחית צבירה לחופשה ללא תשלום (LWP)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +512,"Add users to your organization, other than yourself","הוסף משתמשים לארגון שלך, מלבד את עצמך"
+apps/erpnext/erpnext/public/js/setup_wizard.js +256,"Add users to your organization, other than yourself","הוסף משתמשים לארגון שלך, מלבד את עצמך"
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No {1} does not match with {2} {3},# השורה {0}: סידורי לא {1} אינו תואם עם {2} {3}
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +44,Casual Leave,חופשה מזדמנת
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +44,Casual Leave,חופשה מזדמנת
 DocType: Batch,Batch ID,זיהוי אצווה
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +334,Note: {0},הערה: {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +336,Note: {0},הערה: {0}
 ,Delivery Note Trends,מגמות תעודת משלוח
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +104,This Week's Summary,סיכום זה של השבוע
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +74,{0} must be a Purchased or Sub-Contracted Item in row {1},{0} חייב להיות פריט שנרכש או-חוזה Sub בשורת {1}
@@ -3149,7 +3016,7 @@
 DocType: Purchase Receipt,Return Against Purchase Receipt,חזור כנגד קבלת רכישה
 DocType: Purchase Order,To Bill,להצעת החוק
 DocType: Material Request,% Ordered,% מסודר
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +61,Piecework,עֲבוֹדָה בְּקַבּלָנוּת
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Piecework,עֲבוֹדָה בְּקַבּלָנוּת
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +64,Avg. Buying Rate,ממוצע. שיעור קנייה
 DocType: Task,Actual Time (in Hours),זמן בפועל (בשעות)
 DocType: Employee,History In Company,ההיסטוריה בחברה
@@ -3166,13 +3033,13 @@
 DocType: Opportunity,To Discuss,כדי לדון ב
 DocType: SMS Settings,SMS Settings,הגדרות SMS
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +60,Temporary Accounts,חשבונות זמניים
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +155,Black,שחור
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Black,שחור
 DocType: BOM Explosion Item,BOM Explosion Item,פריט פיצוץ BOM
 DocType: Account,Auditor,מבקר
 DocType: Purchase Order,End date of current order's period,תאריך סיום של התקופה של הצו הנוכחי
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +17,Make Offer Letter,הפוך מכתב הצעת
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +10,Return,חזור
-apps/erpnext/erpnext/stock/doctype/item/item.py +503,Default Unit of Measure for Variant must be same as Template,ברירת מחדל של יחידת מדידה ולריאנט חייבת להיות זהה לתבנית
+apps/erpnext/erpnext/stock/doctype/item/item.py +507,Default Unit of Measure for Variant must be same as Template,ברירת מחדל של יחידת מדידה ולריאנט חייבת להיות זהה לתבנית
 DocType: DocField,Fold,מקפלים
 DocType: Production Order Operation,Production Order Operation,להזמין מבצע ייצור
 DocType: Pricing Rule,Disable,בטל
@@ -3183,13 +3050,12 @@
 DocType: Page,Page Name,שם דף
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +110,To Time must be greater than From Time,לזמן חייב להיות גדול מ מהזמן
 DocType: Journal Entry Account,Exchange Rate,שער חליפין
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +465,Sales Order {0} is not submitted,להזמין מכירות {0} לא יוגש
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +467,Sales Order {0} is not submitted,להזמין מכירות {0} לא יוגש
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0}: Parent account {1} does not bolong to the company {2},מחסן {0}: הורה חשבון {1} לא Bolong לחברת {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +124,Spindle finishing,גמר ציר
 DocType: BOM,Last Purchase Rate,שער רכישה אחרונה
 DocType: Account,Asset,נכס
 DocType: Project Task,Task ID,משימת זיהוי
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +395,"e.g. ""MC""","לדוגמא: ""MC"""
+apps/erpnext/erpnext/public/js/setup_wizard.js +143,"e.g. ""MC""","לדוגמא: ""MC"""
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,Stock cannot exist for Item {0} since has variants,המניה לא יכול להתקיים לפריט {0} שכן יש גרסאות
 ,Sales Person-wise Transaction Summary,סיכום עסקת איש מכירות-חכם
 DocType: System Settings,Time Zone,אזור הזמן
@@ -3198,9 +3064,7 @@
 DocType: Monthly Distribution,Monthly Distribution Percentages,אחוזים בחתך חודשיים
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +16,The selected item cannot have Batch,הפריט שנבחר לא יכול להיות אצווה
 DocType: Delivery Note,% of materials delivered against this Delivery Note,% מחומרים מועברים נגד תעודת משלוח זו
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +151,Stapling,הידוק
 DocType: Customer,Customer Details,פרטי לקוחות
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +105,Shaping,עיצוב
 DocType: Employee,Reports to,דיווחים ל
 DocType: SMS Settings,Enter url parameter for receiver nos,הזן פרמטר url למקלט nos
 DocType: Sales Invoice,Paid Amount,סכום ששולם
@@ -3209,13 +3073,13 @@
 DocType: Item Variant,Item Variant,פריט Variant
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +15,Setting this Address Template as default as there is no other default,הגדרת תבנית כתובת זו כברירת מחדל כפי שאין ברירת מחדל אחרת
 apps/erpnext/erpnext/accounts/doctype/account/account.py +89,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","יתרת חשבון כבר בחיוב, שאינך מורשים להגדרה 'יתרה חייבים להיות' כמו 'אשראי'"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +76,Quality Management,ניהול איכות
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Quality Management,ניהול איכות
 DocType: Production Planning Tool,Filter based on customer,מסנן המבוסס על לקוחות
 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}
 DocType: Employee External Work History,Employee External Work History,העובד חיצוני היסטוריה עבודה
 DocType: Tax Rule,Purchase,רכישה
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +34,Balance Qty,יתרת כמות
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Balance Qty,יתרת כמות
 DocType: Item Group,Parent Item Group,קבוצת פריט הורה
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +96,Cost Centers,מרכזי עלות
 apps/erpnext/erpnext/config/stock.py +115,Warehouses.,מחסנים.
@@ -3224,12 +3088,12 @@
 DocType: Opportunity,Next Contact,לתקשר הבא
 DocType: Employee,Employment Type,סוג התעסוקה
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,רכוש קבוע
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +84,Application period cannot be across two alocation records,תקופת יישום לא יכולה להיות על פני שתי רשומות alocation
 DocType: Item Group,Default Expense Account,חשבון הוצאות ברירת המחדל
 DocType: Employee,Notice (days),הודעה (ימים)
 DocType: Page,Yes,כן
 DocType: Tax Rule,Sales Tax Template,תבנית מס מכירות
 DocType: Employee,Encashment Date,תאריך encashment
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +74,Electroforming,Electroforming
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +179,"Against Voucher Type must be one of Purchase Order, Purchase Invoice or Journal Entry","נגד שובר סוג חייב להיות אחד מהזמנת הרכש, רכש חשבונית או יומן"
 DocType: Account,Stock Adjustment,התאמת המניה
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +34,Default Activity Cost exists for Activity Type - {0},עלות פעילות ברירת המחדל קיימת לסוג פעילות - {0}
@@ -3264,12 +3128,12 @@
 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,הפצה
 apps/erpnext/erpnext/public/js/pos/pos.html +36,Amount Paid,הסכום ששולם
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +91,Project Manager,מנהל פרויקט
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +72,Dispatch,שדר
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Project Manager,מנהל פרויקט
+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: Customer,Default Taxes and Charges,מסים והיטלים שברירת מחדל
 DocType: Account,Receivable,חייבים
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +268,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,# השורה {0}: לא הורשו לשנות ספק כהזמנת רכש כבר קיימת
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +263,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 לפריטים תת-הרכבה ייחשב להשגת חומרי גלם. אחרת, יטופלו כל הפריטים תת-ההרכבה כחומר גלם."
@@ -3277,8 +3141,8 @@
 DocType: Hub Settings,Seller Description,תיאור מוכר
 DocType: Employee Education,Qualification,הסמכה
 DocType: Item Price,Item Price,פריט מחיר
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +48,Soap & Detergent,סבון וחומרי ניקוי
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +36,Motion Picture & Video,Motion Picture ווידאו
+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,Motion Picture ווידאו
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,הורה
 DocType: Warehouse,Warehouse Name,שם מחסן
 DocType: Naming Series,Select Transaction,עסקה בחר
@@ -3287,7 +3151,6 @@
 DocType: BOM,Rate Of Materials Based On,שיעור חומרים הבוסס על
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,Analtyics תמיכה
 apps/erpnext/erpnext/accounts/doctype/accounts_settings/accounts_settings.py +27,Company is missing in warehouses {0},חברה חסרה במחסני {0}
-DocType: Stock UOM Replace Utility,Stock UOM Replace Utility,המניה של אוני 'מישגן החלף Utility
 DocType: POS Profile,Terms and Conditions,תנאים והגבלות
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,To Date should be within the Fiscal Year. Assuming To Date = {0},לתאריך צריך להיות בתוך שנת הכספים. בהנחה לתאריך = {0}
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","כאן אתה יכול לשמור על גובה, משקל, אלרגיות, בעיות רפואיות וכו '"
@@ -3299,7 +3162,7 @@
 DocType: Sales Order Item,For Production,להפקה
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +103,Please enter sales order in the above table,נא להזין את סדר מכירות בטבלה לעיל
 DocType: Project Task,View Task,צפה במשימה
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +406,Your financial year begins on,השנה שלך הפיננסית מתחילה ב
+apps/erpnext/erpnext/public/js/setup_wizard.js +154,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: Email Digest,Add/Remove Recipients,הוספה / הסרה של מקבלי
@@ -3307,16 +3170,14 @@
 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 +528,Item variant {0} exists with same attributes,גרסת פריט {0} קיימת עימן תכונות
+apps/erpnext/erpnext/stock/doctype/item/item.py +532,Item variant {0} exists with same attributes,גרסת פריט {0} קיימת עימן תכונות
 DocType: Salary Slip,Salary Slip,שכר Slip
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +116,Burnishing,צִחצוּחַ
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +54,'To Date' is required,'עד תאריך' נדרש
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,'עד תאריך' נדרש
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","צור תלושי אריזה עבור חבילות שתימסר. נהג להודיע ​​מספר חבילה, תוכן אריזה והמשקל שלה."
 DocType: Sales Invoice Item,Sales Order Item,פריט להזמין מכירות
 DocType: Salary Slip,Payment Days,ימי תשלום
 DocType: BOM,Manage cost of operations,ניהול עלות של פעולות
 DocType: Features Setup,Item Advanced,פריט מתקדם
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +40,Hot rolling,גלגול חם
 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,חינוך לעובדים
@@ -3329,25 +3190,23 @@
 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/setup/page/setup_wizard/install_fixtures.py +48,Sick Leave,חופשת מחלה
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +174,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/page/setup_wizard/fixtures/industry_type.py +22,Department Stores,חנויות כלבו
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,חנויות כלבו
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +40,System Balance,מאזן מערכת
 DocType: Workflow,Is Active,האם Active
 apps/erpnext/erpnext/controllers/stock_controller.py +71,No accounting entries for the following warehouses,אין רישומים חשבונאיים למחסנים הבאים
 apps/erpnext/erpnext/projects/doctype/project/project.js +22,Save the document first.,שמור את המסמך ראשון.
 DocType: Account,Chargeable,נִטעָן
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +121,Linishing,Linishing
 DocType: Company,Change Abbreviation,קיצור שינוי
 DocType: Workflow State,Primary,עיקרי
 DocType: Expense Claim Detail,Expense Date,תאריך הוצאה
 DocType: Item,Max Discount (%),מקס דיסקונט (%)
 DocType: Communication,More Information,מידע נוסף
 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/setup/page/setup_wizard/fixtures/operations.py +161,Blasting,פיצוץ
 DocType: Company,Warn,הזהר
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +111,Item valuation updated,הערכת שווי מעודכן פריט
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","כל דברים אחרים, מאמץ ראוי לציון שצריכה ללכת ברשומות."
 DocType: BOM,Manufacturing User,משתמש ייצור
 DocType: Purchase Order,Raw Materials Supplied,חומרי גלם הסופק
@@ -3357,7 +3216,7 @@
 DocType: Appraisal,Appraisal Template,הערכת תבנית
 DocType: Communication,Email,"דוא""ל"
 DocType: Item Group,Item Classification,סיווג פריט
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +89,Business Development Manager,מנהל פיתוח עסקי
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Business Development Manager,מנהל פיתוח עסקי
 DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,מטרת התחזוקה בקר
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.js +15,Period,תקופה
 ,General Ledger,בכלל לדג'ר
@@ -3367,9 +3226,7 @@
 ,Itemwise Recommended Reorder Level,Itemwise מומלץ להזמנה חוזרת רמה
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +264,Please select {0} first,אנא בחר {0} ראשון
 DocType: Features Setup,To get Item Group in details table,כדי לקבל קבוצת פריט בטבלת פרטים
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +67,Redrawing,שרטוט
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +112,Batch {0} of Item {1} has expired.,אצווה {0} של פריט {1} פג.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +120,Etching,תחריט
 DocType: Sales Invoice,Commission,הוועדה
 DocType: Address Template,"<h4>Default Template</h4>
 <p>Uses <a href=""http://jinja.pocoo.org/docs/templates/"">Jinja Templating</a> and all the fields of Address (including Custom Fields if any) will be available</p>
@@ -3403,7 +3260,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +340,Operation Time must be greater than 0 for Operation {0},מבצע זמן חייב להיות גדול מ 0 למבצע {0}
 DocType: Supplier,Address and Contacts,כתובת ומגעים
 DocType: UOM Conversion Detail,UOM Conversion Detail,פרט של אוני 'מישגן ההמרה
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +496,Keep it web friendly 900px (w) by 100px (h),שמור את זה באינטרנט 900px הידידותי (w) על ידי 100px (ח)
+apps/erpnext/erpnext/public/js/setup_wizard.js +242,Keep it web friendly 900px (w) by 100px (h),שמור את זה באינטרנט 900px הידידותי (w) על ידי 100px (ח)
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +329,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,קבל שוברים מצטיינים
@@ -3419,54 +3276,49 @@
 DocType: Item,Average time taken by the supplier to deliver,הזמן הממוצע שנלקח על ידי הספק לספק
 DocType: Time Log,Hours,שעות
 DocType: Project,Expected Start Date,תאריך התחלה צפוי
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +38,Rolling,מתגלגל
 DocType: ToDo,Priority,עדיפות
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +41,Remove item if charges is not applicable to that item,הסר פריט אם חיובים אינם ישימים לפריט ש
 DocType: Dropbox Backup,Dropbox Access Allowed,Dropbox גישה מחמד
 DocType: Dropbox Backup,Weekly,שבועי
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,לדוגמא. smsgateway.com/api/send_sms.cgi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +485,Receive,קבל
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +510,Receive,קבל
 DocType: Maintenance Visit,Fully Completed,הושלם במלואו
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% Complete
 DocType: Employee,Educational Qualification,הכשרה חינוכית
 DocType: Workstation,Operating Costs,עלויות תפעול
 DocType: Employee Leave Approver,Employee Leave Approver,עובד חופשה מאשר
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,{0} has been successfully added to our Newsletter list.,{0} נוספו בהצלחה לרשימת הדיוור שלנו.
-apps/erpnext/erpnext/stock/doctype/item/item.py +383,Row {0}: An Reorder entry already exists for this warehouse {1},שורת {0}: כניסת סידור מחדש כבר קיימת למחסן זה {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +387,Row {0}: An Reorder entry already exists for this warehouse {1},שורת {0}: כניסת סידור מחדש כבר קיימת למחסן זה {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +67,"Cannot declare as lost, because Quotation has been made.","לא יכול להכריז על שאבד כ, כי הצעת מחיר כבר עשתה."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +133,Electron beam machining,עיבוד אלומת אלקטרונים
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,רכישת Master מנהל
 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 +150,Please select Start Date and End Date for Item {0},אנא בחר תאריך התחלה ותאריך סיום לפריט {0}
 apps/erpnext/erpnext/config/stock.py +141,Main Reports,דוחות עיקריים
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +102,Stock Ledger entries balances updated,מניית דג'ר ערכי יתרות מעודכנות
 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,DOCTYPE Prevdoc
-apps/erpnext/erpnext/stock/doctype/item/item.js +176,Add / Edit Prices,להוסיף מחירים / עריכה
+apps/erpnext/erpnext/stock/doctype/item/item.js +178,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 +298,My Orders,ההזמנות שלי
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +293,My Orders,ההזמנות שלי
 DocType: Price List,Price List Name,שם מחיר המחירון
 DocType: Time Log,For Manufacturing,לייצור
-apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +70,Totals,סיכומים
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +174,Totals,סיכומים
 DocType: BOM,Manufacturing,ייצור
 ,Ordered Items To Be Delivered,פריטים הורה שיימסרו
 DocType: Account,Income,הכנסה
 ,Setup Wizard,אשף התקנה
 DocType: Industry Type,Industry Type,סוג התעשייה
 apps/erpnext/erpnext/templates/includes/cart.js +137,Something went wrong!,משהו השתבש!
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +68,Warning: Leave application contains following block dates,אזהרה: יישום השאר מכיל תאריכי הבלוק הבאים
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +251,Sales Invoice {0} has already been submitted,מכירות חשבונית {0} כבר הוגשה
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +100,Warning: Leave application contains following block dates,אזהרה: יישום השאר מכיל תאריכי הבלוק הבאים
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +256,Sales Invoice {0} has already been submitted,מכירות חשבונית {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/setup/page/setup_wizard/fixtures/operations.py +10,Die casting,ליהוק למות
 DocType: Email Alert,Reference Date,תאריך התייחסות
 apps/erpnext/erpnext/config/hr.py +105,Organization unit (department) master.,יחידת ארגון הורים (מחלקה).
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +25,Please enter valid mobile nos,נא להזין nos תקף הנייד
 DocType: Budget Detail,Budget Detail,פרטי תקציב
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +75,Please enter message before sending,נא להזין את ההודעה לפני השליחה
 DocType: Async Task,Status,סטטוס
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +65,Stock UOM updated for Item {0},המניה של אוני 'מישגן מעודכן לפריט {0}
 DocType: Company History,Year,שנה
 apps/erpnext/erpnext/config/accounts.py +127,Point-of-Sale Profile,נקודה-של-מכירת פרופיל
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +68,Please Update SMS Settings,אנא עדכן את הגדרות SMS
@@ -3480,12 +3332,12 @@
 ,Serial No Service Contract Expiry,שירות סידורי חוזה תפוגה
 DocType: Item,Unit of Measure Conversion,יחידה של המרת מדד
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +86,Employee can not be changed,העובד אינו ניתן לשינוי
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +259,You cannot credit and debit same account at the same time,אתה לא יכול אשראי וכרטיסי חיובו חשבון באותו הזמן
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,You cannot credit and debit same account at the same time,אתה לא יכול אשראי וכרטיסי חיובו חשבון באותו הזמן
 DocType: Naming Series,Help HTML,העזרה HTML
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},"weightage סה""כ הוקצה צריך להיות 100%. זה {0}"
 apps/erpnext/erpnext/controllers/status_updater.py +140,Allowance for over-{0} crossed for Item {1},הפרשה ליתר {0} חצה לפריט {1}
 DocType: Address,Name of person or organization that this address belongs to.,שמו של אדם או ארגון שכתובת זו שייכת ל.
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +587,Your Suppliers,הספקים שלך
+apps/erpnext/erpnext/public/js/setup_wizard.js +325,Your Suppliers,הספקים שלך
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,לא ניתן להגדיר כאבודים כלהזמין מכירות נעשה.
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +65,Another Salary Structure {0} is active for employee {1}. Please make its status 'Inactive' to proceed.,נוסף מבנה שכר {0} הוא פעיל לעובד {1}. בבקשה לעשות את מעמדה 'לא פעיל' כדי להמשיך.
 DocType: Purchase Invoice,Contact,צור קשר עם
@@ -3493,36 +3345,34 @@
 DocType: Lead,Converted,המרה
 DocType: Item,Has Serial No,יש מספר סידורי
 DocType: Employee,Date of Issue,מועד ההנפקה
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +154,Row #{0}: Set Supplier for item {1},# השורה {0}: ספק הוגדר לפריט {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +149,Row #{0}: Set Supplier for item {1},# השורה {0}: ספק הוגדר לפריט {1}
 DocType: Issue,Content Type,סוג תוכן
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +17,Computer,מחשב
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,מחשב
 DocType: Item,List this Item in multiple groups on the website.,רשימת פריט זה במספר קבוצות באתר.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +283,Please check Multi Currency option to allow accounts with other currency,אנא בדוק את אפשרות מטבע רב כדי לאפשר חשבונות עם מטבע אחר
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +285,Please check Multi Currency option to allow accounts with other currency,אנא בדוק את אפשרות מטבע רב כדי לאפשר חשבונות עם מטבע אחר
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +62,Item: {0} does not exist in the system,פריט: {0} אינו קיים במערכת
 apps/erpnext/erpnext/accounts/doctype/account/account.py +81,You are not authorized to set Frozen value,אתה לא רשאי לקבוע ערך קפוא
 DocType: Payment Reconciliation,Get Unreconciled Entries,קבל ערכים לא מותאמים
 DocType: Cost Center,Budgets,תקציבים
 apps/frappe/frappe/core/page/modules_setup/modules_setup.py +11,Updated,עדכון
 DocType: Employee,Emergency Contact Details,פרטי יצירת קשר חירום
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +396,What does it do?,מה זה עושה?
+apps/erpnext/erpnext/public/js/setup_wizard.js +144,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,העמלה ממוצעת שערי
-apps/erpnext/erpnext/stock/doctype/item/item.py +313,'Has Serial No' can not be 'Yes' for non-stock item,"""יש מספר סידורי 'לא יכול להיות' כן 'ללא מוחזק במלאי פריט"
+apps/erpnext/erpnext/stock/doctype/item/item.py +317,'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/setup/page/setup_wizard/install_fixtures.py +111,Electrical,חשמל
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +111,Electrical,חשמל
 DocType: Stock Entry,Total Value Difference (Out - In),הבדל ערך כולל (Out - ב)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +302,Row {0}: Exchange Rate is mandatory,שורת {0}: שער החליפין הוא חובה
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +304,Row {0}: Exchange Rate is mandatory,שורת {0}: שער החליפין הוא חובה
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},זיהוי משתמש לא נקבע לעובדים {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +72,Peening,Peening
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,From Warranty Claim,מתביעת אחריות
 DocType: Stock Entry,Default Source Warehouse,מחסן מקור ברירת מחדל
 DocType: Item,Customer Code,קוד לקוח
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +163,Lapping,לְחִיכָה
-apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.js +8,Days Since Last Order,ימים מאז להזמין אחרון
+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 +299,Debit To account must be a Balance Sheet account,חיוב החשבון חייב להיות חשבון מאזן
 DocType: Buying Settings,Naming Series,סדרת שמות
 DocType: Leave Block List,Leave Block List Name,השאר שם בלוק רשימה
@@ -3536,7 +3386,7 @@
 DocType: Notification Control,Sales Invoice Message,מסר חשבונית מכירות
 DocType: Authorization Rule,Based On,המבוסס על
 DocType: Sales Order Item,Ordered Qty,כמות הורה
-apps/erpnext/erpnext/stock/doctype/item/item.py +539,Item {0} is disabled,פריט {0} הוא נכים
+apps/erpnext/erpnext/stock/doctype/item/item.py +543,Item {0} is disabled,פריט {0} הוא נכים
 DocType: Stock Settings,Stock Frozen Upto,המניה קפואה Upto
 apps/erpnext/erpnext/controllers/recurring_document.py +166,Period From and Period To dates mandatory for recurring {0},תקופה ומתקופה לתאריכי חובה עבור חוזר {0}
 apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,פעילות פרויקט / משימה.
@@ -3546,7 +3396,6 @@
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,דיסקונט חייב להיות פחות מ -100
 DocType: ToDo,Low,נמוך
 DocType: Purchase Invoice,Write Off Amount (Company Currency),לכתוב את הסכום (חברת מטבע)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +71,Spinning,ספינינג
 DocType: Landed Cost Voucher,Landed Cost Voucher,שובר עלות נחת
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +55,Please set {0},אנא הגדר {0}
 DocType: Purchase Invoice,Repeat on Day of Month,חזור על פעולה ביום בחודש
@@ -3568,7 +3417,6 @@
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +37,Campaign Name is required,שם מסע פרסום נדרש
 DocType: Maintenance Visit,Maintenance Date,תאריך תחזוקה
 DocType: Purchase Receipt Item,Rejected Serial No,מספר סידורי שנדחו
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +51,Deep drawing,ציור עמוק
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +40,New Newsletter,ניו עלון
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +157,Start date should be less than end date for Item {0},תאריך ההתחלה צריכה להיות פחות מ תאריך סיום לפריט {0}
 apps/erpnext/erpnext/stock/doctype/item/item.js +17,Show Balance,מאזן הצג
@@ -3578,7 +3426,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +119,BOM and Manufacturing Quantity are required,BOM וכמות הייצור נדרשים
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,טווח הזדקנות 2
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +450,Amount,הסכום
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +147,Riveting,מרתק
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,BOM הוחלף
 ,Sales Analytics,Analytics מכירות
 DocType: Manufacturing Settings,Manufacturing Settings,הגדרות ייצור
@@ -3590,20 +3437,19 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +207,New Account Name,שם חשבון חדש
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,עלות חומרי גלם הסופק
 DocType: Selling Settings,Settings for Selling Module,הגדרות עבור מכירת מודול
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +73,Customer Service,שירות לקוחות
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Customer Service,שירות לקוחות
 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.,מועמד הצעת עבודה.
 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,עלים שהוקצו סה&quot;כ יותר מ ימים בתקופה
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +70,Item {0} must be a stock Item,פריט {0} חייב להיות פריט מניות
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,עבודה המוגדרת כברירת מחדל במחסן ההתקדמות
 apps/erpnext/erpnext/config/accounts.py +107,Default settings for accounting transactions.,הגדרות ברירת מחדל עבור עסקות חשבונאיות.
 apps/frappe/frappe/model/naming.py +40,{0} is required,{0} נדרש
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +21,Vacuum molding,דפוס ואקום
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,תאריך צפוי לא יכול להיות לפני תאריך בקשת חומר
 DocType: Contact Us Settings,City,עיר
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +132,Ultrasonic machining,עיבוד קולי
 apps/frappe/frappe/templates/base.html +137,Error: Not a valid id?,שגיאה: לא מזהה בתוקף?
 apps/erpnext/erpnext/stock/get_item_details.py +125,Item {0} must be a Sales Item,פריט {0} חייב להיות פריט מכירות
 DocType: Naming Series,Update Series Number,עדכון סדרת מספר
@@ -3611,7 +3457,7 @@
 DocType: Sales Order,Printing Details,הדפסת פרטים
 DocType: Task,Closing Date,תאריך סגירה
 DocType: Sales Order Item,Produced Quantity,כמות מיוצרת
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +84,Engineer,מהנדס
+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 +379,Item Code required at Row No {0},קוד פריט נדרש בשורה לא {0}
 DocType: Sales Partner,Partner Type,שם שותף
@@ -3619,7 +3465,7 @@
 DocType: Authorization Rule,Customerwise Discount,Customerwise דיסקונט
 DocType: Purchase Invoice,Against Expense Account,נגד חשבון הוצאות
 DocType: Production Order,Production Order,הזמנת ייצור
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +258,Installation Note {0} has already been submitted,הערה התקנת {0} כבר הוגשה
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +263,Installation Note {0} has already been submitted,הערה התקנת {0} כבר הוגשה
 DocType: Quotation Item,Against Docname,נגד Docname
 DocType: SMS Center,All Employee (Active),כל העובד (Active)
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,צפה עכשיו
@@ -3628,19 +3474,19 @@
 DocType: Item,Re-Order Level,סדר מחדש רמה
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,הזן פריטים וכמות מתוכננת עבורו ברצון להעלות הזמנות ייצור או להוריד חומרי גלם לניתוח.
 apps/frappe/frappe/public/js/frappe/views/ganttview.js +45,Gantt Chart,תרשים גנט
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +57,Part-time,במשרה חלקית
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,Part-time,במשרה חלקית
 DocType: Employee,Applicable Holiday List,רשימת Holiday ישימה
 DocType: Employee,Cheque,המחאה
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,סדרת עדכון
 apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Report Type is mandatory,סוג הדוח הוא חובה
 DocType: Item,Serial Number Series,סדרת מספר סידורי
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},המחסן הוא חובה עבור פריט המניה {0} בשורת {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +45,Retail & Wholesale,קמעונאות וסיטונאות
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,קמעונאות וסיטונאות
 DocType: Issue,First Responded On,הגיב בראשון
 DocType: Website Item Group,Cross Listing of Item in multiple groups,רישום צלב של פריט בקבוצות מרובות
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +351,The First User: You,המשתמש הראשון: אתה
+apps/erpnext/erpnext/public/js/setup_wizard.js +101,The First User: You,המשתמש הראשון: אתה
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +48,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 +172,Successfully Reconciled,מפוייס בהצלחה
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +119,Successfully Reconciled,מפוייס בהצלחה
 DocType: Production Order,Planned End Date,תאריך סיום מתוכנן
 apps/erpnext/erpnext/config/stock.py +43,Where items are stored.,איפה פריטים מאוחסנים.
 DocType: Tax Rule,Validity,תוקף
@@ -3660,39 +3506,36 @@
 DocType: DocPerm,Level,רמה
 DocType: Purchase Taxes and Charges,On Net Total,בסך הכל נטו
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +160,Target warehouse in row {0} must be same as Production Order,מחסן יעד בשורת {0} חייב להיות זהה להזמנת ייצור
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +59,No permission to use Payment Tool,אין רשות להשתמש בכלי תשלום
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +97,No permission to use Payment Tool,אין רשות להשתמש בכלי תשלום
 apps/erpnext/erpnext/controllers/recurring_document.py +192,'Notification Email Addresses' not specified for recurring %s,"""כתובות דוא""ל הודעה 'לא צוינו עבור חוזר% s"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +86,Milling,כרסום
 apps/erpnext/erpnext/accounts/doctype/account/account.py +99,Currency can not be changed after making entries using some other currency,מטבע לא ניתן לשנות לאחר ביצוע ערכים באמצעות כמה מטבע אחר
 DocType: Company,Round Off Account,לעגל את החשבון
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +60,Nibbling,מְכַּרסֵם
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,הוצאות הנהלה
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +18,Consulting,ייעוץ
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +18,Consulting,ייעוץ
 DocType: Customer Group,Parent Customer Group,קבוצת לקוחות הורה
 apps/erpnext/erpnext/public/js/pos/pos.js +429,Change,שינוי
 DocType: Purchase Invoice,Contact Email,"דוא""ל ליצירת קשר"
 DocType: Appraisal Goal,Score Earned,הציון שנצבר
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +393,"e.g. ""My Company LLC""","לדוגמא: ""החברה LLC שלי"""
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +173,Notice Period,תקופת הודעה
+apps/erpnext/erpnext/public/js/setup_wizard.js +141,"e.g. ""My Company LLC""","לדוגמא: ""החברה LLC שלי"""
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +173,Notice Period,תקופת הודעה
 DocType: Bank Reconciliation Detail,Voucher ID,זיהוי שובר
 apps/erpnext/erpnext/setup/doctype/territory/territory.js +14,This is a root territory and cannot be edited.,זהו שטח שורש ולא ניתן לערוך.
 DocType: Packing Slip,Gross Weight UOM,משקלים של אוני 'מישגן
 DocType: Email Digest,Receivables / Payables,חייבים / זכאי
 DocType: Delivery Note Item,Against Sales Invoice,נגד חשבונית מכירות
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +63,Stamping,הטבעה
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +457,Credit Account,חשבון אשראי
 DocType: Landed Cost Item,Landed Cost Item,פריט עלות נחת
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +56,Show zero values,הצג אפס ערכים
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,כמות של פריט המתקבלת לאחר ייצור / אריזה מחדש מכמויות מסוימות של חומרי גלם
 DocType: Payment Reconciliation,Receivable / Payable Account,חשבון לקבל / לשלם
 DocType: Delivery Note Item,Against Sales Order Item,נגד פריט להזמין מכירות
-apps/erpnext/erpnext/stock/doctype/item/item.py +521,Please specify Attribute Value for attribute {0},ציין מאפיין ערך עבור תכונת {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +525,Please specify Attribute Value for attribute {0},ציין מאפיין ערך עבור תכונת {0}
 DocType: Item,Default Warehouse,מחסן ברירת מחדל
 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,הדפסה ללא סכום
-apps/erpnext/erpnext/controllers/buying_controller.py +69,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,"קטגוריה מס לא יכולה להיות ""הערכה"" או ""הערכה וסה""כ 'ככל הפריטים הם פריטים שאינם במלאי"
+apps/erpnext/erpnext/controllers/buying_controller.py +60,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,"קטגוריה מס לא יכולה להיות ""הערכה"" או ""הערכה וסה""כ 'ככל הפריטים הם פריטים שאינם במלאי"
 DocType: User,Last Name,שם משפחה
 DocType: Web Page,Left,עזב
 DocType: Event,All Day,כל היום
@@ -3700,7 +3543,7 @@
 DocType: Appraisal,Total Score (Out of 5),ציון כולל (מתוך 5)
 DocType: Contact Us Settings,State,מדינה
 DocType: Batch,Batch,אצווה
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +51,Balance,מאזן
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +28,Balance,מאזן
 DocType: Project,Total Expense Claim (via Expense Claims),תביעת הוצאות כוללת (באמצעות תביעות הוצאות)
 DocType: User,Gender,מין
 DocType: Journal Entry,Debit Note,הערה חיוב
@@ -3730,8 +3573,7 @@
 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/setup/page/setup_wizard/fixtures/operations.py +76,Seaming,Seaming
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +197,"Company Email ID not found, hence mail not sent","זיהוי חברת דוא""ל לא נמצא, ומכאן אלקטרוניים לא נשלח"
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +206,"Company Email ID not found, hence mail not sent","זיהוי חברת דוא""ל לא נמצא, ומכאן אלקטרוניים לא נשלח"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),יישום של קרנות (נכסים)
 DocType: Production Planning Tool,Filter based on item,מסנן המבוסס על פריט
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +451,Debit Account,חשבון חיוב
@@ -3743,17 +3585,16 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +95,{0} {1} has been modified. Please refresh.,{0} {1} כבר שונה. אנא רענן.
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,להפסיק ממשתמשים לבצע יישומי חופשה בימים שלאחר מכן.
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +591,From Opportunity,מהזדמנות
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +46,Blanking,לתלייה
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +166,Employee Benefits,הטבות לעובדים
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,Employee Benefits,הטבות לעובדים
 DocType: Sales Invoice,Is POS,האם קופה
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +240,Packed quantity must equal quantity for Item {0} in row {1},כמות ארוזה חייבת להיות שווה לכמות פריט {0} בשורת {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +245,Packed quantity must equal quantity for Item {0} in row {1},כמות ארוזה חייבת להיות שווה לכמות פריט {0} בשורת {1}
 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.,הצעות חוק שהועלו ללקוחות.
 DocType: DocField,Default,ברירת מחדל
 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 +466,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},שורה לא {0}: הסכום אינו יכול להיות גדול מהסכום ממתין נגד תביעת {1} הוצאות. הסכום בהמתנת {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +468,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} מנויים הוסיפו
 DocType: Maintenance Schedule,Schedule,לוח זמנים
 DocType: Cost Center,"Define Budget for this Cost Center. To set budget action, see ""Company List""","להגדיר תקציב עבור מרכז עלות זו. כדי להגדיר פעולת תקציב, ראה &quot;חברת רשימה&quot;"
@@ -3764,7 +3605,7 @@
 apps/erpnext/erpnext/public/js/pos/pos.js +91,Price List not found or disabled,מחיר המחירון לא נמצא או נכים
 DocType: Expense Claim,Approved,אושר
 DocType: Pricing Rule,Price,מחיר
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +79,Employee relieved on {0} must be set as 'Left',עובד הקלה על {0} חייב להיות מוגדרים כ'שמאל '
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +88,Employee relieved on {0} must be set as 'Left',עובד הקלה על {0} חייב להיות מוגדרים כ'שמאל '
 DocType: Item,"Selecting ""Yes"" will give a unique identity to each entity of this item which can be viewed in the Serial No master.","הבחירה ""כן"" ייתן זהות ייחודית לכל ישותו של פריט זה שניתן לראות בטור לא אדון."
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +39,Appraisal {0} created for Employee {1} in the given date range,הערכת {0} נוצרה עבור עובדי {1} בטווח התאריכים נתון
 DocType: Employee,Education,חינוך
@@ -3775,7 +3616,7 @@
 apps/frappe/frappe/desk/moduleview.py +67,Standard Reports,דוחות סטנדרטיים
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,כתב עת חשבונאות ערכים.
 DocType: Delivery Note Item,Available Qty at From Warehouse,כמות זמינה ממחסן
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +209,Please select Employee Record first.,אנא בחר עובד רשומה ראשון.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +224,Please select Employee Record first.,אנא בחר עובד רשומה ראשון.
 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 +233,Please enter Expense Account,נא להזין את חשבון הוצאות
 DocType: Account,Stock,המניה
@@ -3787,46 +3628,43 @@
 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,הזמנות משיכה (תלויות ועומדות כדי לספק) המבוסס על הקריטריונים לעיל
 DocType: DocShare,Document Type,סוג המסמך
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +565,From Supplier Quotation,מהצעת המחיר של ספק
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +588,From Supplier Quotation,מהצעת המחיר של ספק
 DocType: Deduction Type,Deduction Type,סוג הניכוי
 DocType: Attendance,Half Day,חצי יום
 DocType: Pricing Rule,Min Qty,דקות כמות
 DocType: Features Setup,"To track items in sales and purchase documents with batch nos. ""Preferred Industry: Chemicals""",כדי לעקוב אחר פריטים במכירות ובמסמכי רכישה עם nos אצווה. &quot;תעשייה מועדפת: כימיקלים&quot;
 DocType: GL Entry,Transaction Date,תאריך עסקה
 DocType: Production Plan Item,Planned Qty,מתוכננת כמות
-apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +91,Total Tax,"מס סה""כ"
+apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +93,Total Tax,"מס סה""כ"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +178,For Quantity (Manufactured Qty) is mandatory,לכמות (מיוצר כמות) הוא חובה
 DocType: Stock Entry,Default Target Warehouse,מחסן יעד ברירת מחדל
 DocType: Purchase Invoice,Net Total (Company Currency),"סה""כ נקי (חברת מטבע)"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +79,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,שורת {0}: מפלגת סוג והמפלגה הוא ישים רק נגד חייבים / חשבון לתשלום
 DocType: Notification Control,Purchase Receipt Message,מסר קבלת רכישה
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +95,Total allocated leaves are more than period,עלים שהוקצו סה&quot;כ יותר מ תקופה
 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.,תנועת פריט שיא.
 DocType: Newsletter List Subscriber,Newsletter List Subscriber,עלון רשימה מנוי
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +164,Morticing,Morticing
 DocType: Email Account,Service,שירות
 DocType: Hub Settings,Hub Settings,הגדרות Hub
 DocType: Project,Gross Margin %,% שיעור רווח גולמי
 DocType: BOM,With Operations,עם מבצעים
 apps/erpnext/erpnext/accounts/party.py +232,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,רישומים חשבונאיים כבר נעשו במטבע {0} לחברת {1}. אנא בחר חשבון לקבל או לשלם במטבע {0}.
 ,Monthly Salary Register,חודשי שכר הרשמה
-apps/frappe/frappe/website/template.py +140,Next,הבא
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard_page.html +17,Next,הבא
 DocType: Warranty Claim,If different than customer address,אם שונה מכתובת הלקוח
 DocType: BOM Operation,BOM Operation,BOM מבצע
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +118,Electropolishing,אלקטרו
 DocType: Purchase Taxes and Charges,On Previous Row Amount,על סכום שורה הקודם
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +24,Please enter Payment Amount in atleast one row,נא להזין את סכום תשלום בatleast שורה אחת
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +33,Please enter Payment Amount in atleast one row,נא להזין את סכום תשלום בatleast שורה אחת
 DocType: POS Profile,POS Profile,פרופיל קופה
 apps/erpnext/erpnext/config/accounts.py +153,"Seasonality for setting budgets, targets etc.","עונתיות להגדרת תקציבים, יעדים וכו '"
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +238,Row {0}: Payment Amount cannot be greater than Outstanding Amount,השורה {0}: סכום תשלום לא יכול להיות גדולה מסכום חוב
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +46,Total Unpaid,סה&quot;כ שלא שולם
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +21,Time Log is not billable,זמן יומן הוא לא לחיוב
 apps/erpnext/erpnext/stock/get_item_details.py +128,"Item {0} is a template, please select one of its variants","פריט {0} הוא תבנית, אנא בחר באחת מגרסותיה"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +528,Purchaser,רוכש
+apps/erpnext/erpnext/public/js/setup_wizard.js +272,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 +71,Please enter the Against Vouchers manually,נא להזין את השוברים נגד ידני
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +107,Please enter the Against Vouchers manually,נא להזין את השוברים נגד ידני
 DocType: SMS Settings,Static Parameters,פרמטרים סטטיים
 DocType: Purchase Order,Advance Paid,מראש בתשלום
 DocType: Item,Item Tax,מס פריט
@@ -3835,14 +3673,12 @@
 apps/erpnext/erpnext/config/crm.py +48,Send mass SMS to your contacts,שלח SMS המוני לאנשי הקשר שלך
 DocType: Purchase Taxes and Charges,Consider Tax or Charge for,שקול מס או תשלום עבור
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,הכמות בפועל היא חובה
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +42,Cross-rolling,צלב-מתגלגל
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +132,Credit Card,כרטיס אשראי
+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 +95,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,נא להזין את המסים והיטלים ש
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +85,Machining,עיבוד שבבי
 DocType: Sales Invoice Item,Drop Ship,זרוק משלוח
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","כאן אתה יכול לשמור על פרטים כמו שם וכיבוש של הורה, בן זוג וילדי משפחה"
 DocType: Hub Settings,Seller Name,שם מוכר
@@ -3852,7 +3688,7 @@
 DocType: Stock Entry,Repack,לארוז מחדש
 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/setup/page/setup_wizard/setup_wizard.js +500,Attach Logo,צרף לוגו
+apps/erpnext/erpnext/public/js/setup_wizard.js +246,Attach Logo,צרף לוגו
 DocType: Customer,Commission Rate,הוועדה שערי
 apps/erpnext/erpnext/stock/doctype/item/item.js +38,Make Variant,הפוך Variant
 apps/erpnext/erpnext/config/hr.py +145,Block leave applications by department.,יישומי חופשת בלוק על ידי מחלקה.
@@ -3867,19 +3703,19 @@
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +105,Please select a csv file,אנא בחר קובץ CSV
 DocType: Dropbox Backup,Send Backups to Dropbox,שלח גיבויים לDropbox
 DocType: Purchase Order,To Receive and Bill,כדי לקבל וביל
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +94,Designer,מעצב
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Designer,מעצב
 apps/erpnext/erpnext/config/selling.py +121,Terms and Conditions Template,תבנית תנאים והגבלות
 DocType: Serial No,Delivery Details,פרטי משלוח
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +383,Cost Center is required in row {0} in Taxes table for type {1},מרכז העלות נדרש בשורת {0} במסי שולחן לסוג {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +386,Cost Center is required in row {0} in Taxes table for type {1},מרכז העלות נדרש בשורת {0} במסי שולחן לסוג {1}
 DocType: Item,Automatically create Material Request if quantity falls below this level,ליצור באופן אוטומטי בקשת חומר אם כמות נופלת מתחת לרמה זו
 ,Item-wise Purchase Register,הרשם רכישת פריט-חכם
 DocType: Batch,Expiry Date,תַאֲרִיך תְפוּגָה
-apps/erpnext/erpnext/stock/doctype/item/item.py +375,"To set reorder level, item must be a Purchase Item or Manufacturing Item","כדי להגדיר רמת הזמנה חוזרת, פריט חייב להיות פריט רכישה או פריט ייצור"
+apps/erpnext/erpnext/stock/doctype/item/item.py +379,"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.,אדון פרויקט.
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,לא מראה שום סימן כמו $$ וכו 'הבא למטבעות.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +330, (Half Day),(חצי יום)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +374, (Half Day),(חצי יום)
 DocType: Supplier,Credit Days,ימי אשראי
 DocType: Leave Type,Is Carry Forward,האם להמשיך קדימה
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +478,Get Items from BOM,קבל פריטים מBOM
@@ -3887,7 +3723,7 @@
 apps/erpnext/erpnext/config/manufacturing.py +120,Bill of Materials,הצעת חוק של חומרים
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +77,Row {0}: Party Type and Party is required for Receivable / Payable account {1},שורת {0}: מפלגת סוג והמפלגה נדרשים לבקל / חשבון זכאים {1}
 DocType: Dropbox Backup,Send Notifications To,לשלוח הודעות ל
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html +26,Ref Date,תאריך אסמכתא
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +54,Ref Date,תאריך אסמכתא
 DocType: Employee,Reason for Leaving,סיבה להשארה
 DocType: Expense Claim Detail,Sanctioned Amount,סכום גושפנקא
 DocType: GL Entry,Is Opening,האם פתיחה
@@ -3895,4 +3731,3 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +188,Account {0} does not exist,חשבון {0} אינו קיים
 DocType: Account,Cash,מזומנים
 DocType: Employee,Short biography for website and other publications.,ביוגרפיה קצרות באתר האינטרנט של ופרסומים אחרים.
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +31,Please create Salary Structure for employee {0},אנא ליצור מבנה שכר לעובד {0}
diff --git a/erpnext/translations/hi.csv b/erpnext/translations/hi.csv
index df8edf5..851f41d 100644
--- a/erpnext/translations/hi.csv
+++ b/erpnext/translations/hi.csv
@@ -1,13 +1,12 @@
 DocType: Employee,Salary Mode,वेतन साधन
 DocType: Cost Center,"Select Monthly Distribution, if you want to track based on seasonality.","आप मौसम के आधार पर नज़र रखने के लिए चाहते हैं, तो मासिक वितरण चुनें।"
 DocType: Employee,Divorced,तलाकशुदा
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +86,Warning: Same item has been entered multiple times.,चेतावनी: एक ही मद कई बार दर्ज किया गया है।
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +80,Warning: Same item has been entered multiple times.,चेतावनी: एक ही मद कई बार दर्ज किया गया है।
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +96,Items already synced,आइटम पहले से ही synced
 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/page/setup_wizard/fixtures/industry_type.py +19,Consumer Products,उपभोक्ता उत्पाद
+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,पहले पार्टी के प्रकार का चयन करें
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +90,Annealing,एनीलिंग
 DocType: Item,Customer Items,ग्राहक आइटम
 apps/erpnext/erpnext/accounts/doctype/account/account.py +45,Account {0}: Parent account {1} can not be a ledger,खाते {0}: माता पिता के खाते {1} एक खाता नहीं हो सकता
 DocType: Item,Publish Item to hub.erpnext.com,Hub.erpnext.com करने के लिए आइटम प्रकाशित
@@ -20,15 +19,14 @@
 DocType: About Us Settings,Website,वेबसाइट
 DocType: POS Profile,Applicable for User,उपयोगकर्ता के लिए लागू
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +169,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","रूका उत्पादन आदेश रद्द नहीं किया जा सकता, रद्द करने के लिए पहली बार इसे आगे बढ़ाना"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +23,Compaction plus sintering,संघनन से अधिक है sintering
 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.,* लेनदेन में गणना की जाएगी.
 DocType: Purchase Order,Customer Contact,ग्राहक से संपर्क
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +549,From Material Request,सामग्री अनुरोध से
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +572,From Material Request,सामग्री अनुरोध से
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} ट्री
 DocType: Job Applicant,Job Applicant,नौकरी आवेदक
 apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,कोई और अधिक परिणाम है।
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +78,Legal,कानूनी
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +34,Legal,कानूनी
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +114,Actual type tax cannot be included in Item rate in row {0},वास्तविक प्रकार टैक्स पंक्ति में आइटम की दर में शामिल नहीं किया जा सकता {0}
 DocType: C-Form,Customer,ग्राहक
 DocType: Purchase Receipt Item,Required By,द्वारा आवश्यक
@@ -43,7 +41,6 @@
 DocType: Manufacturing Settings,Default 10 mins,10 मिनट चूक
 DocType: Leave Type,Leave Type Name,प्रकार का नाम छोड़ दो
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +148,Series Updated Successfully,सीरीज सफलतापूर्वक अपडेट
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +150,Stitching,सिलाई
 DocType: Pricing Rule,Apply On,पर लागू होते हैं
 DocType: Item Price,Multiple Item prices.,एकाधिक आइटम कीमतों .
 ,Purchase Order Items To Be Received,खरीद आदेश प्राप्त किए जाने आइटम
@@ -51,8 +48,8 @@
 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 +104,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 +189,New Leave Application,नई छुट्टी के लिए अर्जी
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +134,Bank Draft,बैंक ड्राफ्ट
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +204,New Leave Application,नई छुट्टी के लिए अर्जी
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +134,Bank Draft,बैंक ड्राफ्ट
 DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,1. इस विकल्प का उपयोग ग्राहक वार आइटम कोड को बनाए रखने और कोड के आधार पर विकल्प खोज के लिए करे
 DocType: Mode of Payment Account,Mode of Payment Account,भुगतान खाता का तरीका
 apps/erpnext/erpnext/stock/doctype/item/item.js +34,Show Variants,दिखाएँ वेरिएंट
@@ -64,25 +61,23 @@
 DocType: Production Plan Item,Production Plan Item,उत्पादन योजना मद
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +141,User {0} is already assigned to Employee {1},प्रयोक्ता {0} पहले से ही कर्मचारी को सौंपा है {1}
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +13,Make new POS Profile,नई पीओएस प्रोफाइल बनाने
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +31,Health Care,स्वास्थ्य देखभाल
+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 +494,Invoice,बीजक
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +519,Invoice,बीजक
 DocType: Maintenance Schedule Item,Periodicity,आवधिकता
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +357,Email Address,ईमेल पता
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +21,Defense,रक्षा
+apps/erpnext/erpnext/public/js/setup_wizard.js +107,Email Address,ईमेल पता
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,रक्षा
 DocType: Company,Abbr,संक्षिप्त
 DocType: Appraisal Goal,Score (0-5),कुल (0-5)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +193,Row {0}: {1} {2} does not match with {3},पंक्ति {0}: {1} {2} के साथ मेल नहीं खाता {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +67,Row # {0}:,पंक्ति # {0}:
 DocType: Delivery Note,Vehicle No,वाहन नहीं
 apps/erpnext/erpnext/public/js/pos/pos.js +528,Please select Price List,मूल्य सूची का चयन करें
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +162,Woodworking,लकड़ी
 DocType: Production Order Operation,Work In Progress,अर्धनिर्मित उत्पादन
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +153,3D printing,3 डी मुद्रण
 DocType: Employee,Holiday List,अवकाश सूची
 DocType: Time Log,Time Log,समय प्रवेश
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +530,Accountant,मुनीम
+apps/erpnext/erpnext/public/js/setup_wizard.js +274,Accountant,मुनीम
 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.","क्रियाएँ का प्रवेश, बिलिंग समय पर नज़र रखने के लिए इस्तेमाल किया जा सकता है कि कार्यों के खिलाफ उपयोगकर्ताओं द्वारा प्रदर्शन किया।"
@@ -98,18 +93,19 @@
 DocType: Bin,Quantity Requested for Purchase,मात्रा में खरीद करने के लिए अनुरोध
 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/setup/page/setup_wizard/setup_wizard.js +626,Kg,किलो
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Kg,किलो
 apps/erpnext/erpnext/config/hr.py +48,Opening for a Job.,एक नौकरी के लिए खोलना.
 DocType: Item Attribute,Increment,वेतन वृद्धि
 apps/erpnext/erpnext/public/js/stock_analytics.js +63,Select Warehouse...,गोदाम का चयन करें ...
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +6,Advertising,विज्ञापन
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,विज्ञापन
+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/doctype/sales_invoice/sales_invoice.py +389,Stock cannot be updated against Delivery Note {0},शेयर वितरण नोट के खिलाफ अद्यतन नहीं किया जा सकता {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +391,Stock cannot be updated against Delivery Note {0},शेयर वितरण नोट के खिलाफ अद्यतन नहीं किया जा सकता {0}
 DocType: Payment Reconciliation,Reconcile,समाधान करना
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +30,Grocery,किराना
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,किराना
 DocType: Quality Inspection Reading,Reading 1,1 पढ़ना
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Make Bank Entry,बैंक एंट्री बनाओ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +40,Pension Funds,पेंशन फंड
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,पेंशन फंड
 apps/erpnext/erpnext/accounts/doctype/account/account.py +142,Warehouse is mandatory if account type is Warehouse,खाता प्रकार गोदाम है अगर वेयरहाउस अनिवार्य है
 DocType: SMS Center,All Sales Person,सभी बिक्री व्यक्ति
 DocType: Lead,Person Name,व्यक्ति का नाम
@@ -131,7 +127,7 @@
 DocType: Quality Inspection,Get Specification Details,विशिष्टता विवरण
 DocType: Lead,Interested,इच्छुक
 apps/erpnext/erpnext/config/manufacturing.py +14,Bill of Material,सामग्री का बिल
-apps/erpnext/erpnext/public/js/stock_analytics.js +45,Opening,प्रारंभिक
+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,आइटम समूह से कॉपी
 DocType: Journal Entry,Opening Entry,एंट्री खुलने
@@ -145,23 +141,22 @@
 DocType: Employee Education,Under Graduate,पूर्व - स्नातक
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +22,Target On,योजनापूर्ण
 DocType: BOM,Total Cost,कुल लागत
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +99,Reaming,Reaming
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +9,Activity Log:,गतिविधि प्रवेश करें :
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +199,Item {0} does not exist in the system or has expired,आइटम {0} सिस्टम में मौजूद नहीं है या समाप्त हो गई है
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +44,Real Estate,रियल एस्टेट
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +44,Real Estate,रियल एस्टेट
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +4,Statement of Account,लेखा - विवरण
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +41,Pharmaceuticals,औषधीय
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,औषधीय
 DocType: Expense Claim Detail,Claim Amount,दावे की राशि
 DocType: Employee,Mr,श्री
 DocType: Custom Script,Client,ग्राहक
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,प्रदायक प्रकार / प्रदायक
 DocType: Naming Series,Prefix,उपसर्ग
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Consumable,उपभोज्य
+apps/erpnext/erpnext/public/js/setup_wizard.js +359,Consumable,उपभोज्य
 DocType: Upload Attendance,Import Log,प्रवेश करें आयात
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.js +19,Send,भेजें
 DocType: Sales Invoice Item,Delivered By Supplier,प्रदायक द्वारा वितरित
 DocType: SMS Center,All Contact,सभी संपर्क
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +164,Annual Salary,वार्षिक वेतन
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +164,Annual Salary,वार्षिक वेतन
 DocType: Period Closing Voucher,Closing Fiscal Year,वित्तीय वर्ष और समापन
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +69,Stock Expenses,शेयर व्यय
 DocType: Newsletter,Email Sent?,ईमेल भेजा है?
@@ -169,7 +164,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +92,Show Time Logs,शो टाइम लॉग्स
 DocType: Journal Entry Account,Credit in Company Currency,कंपनी मुद्रा में ऋण
 DocType: Delivery Note,Installation Status,स्थापना स्थिति
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +115,Accepted + Rejected Qty must be equal to Received quantity for Item {0},स्वीकृत + अस्वीकृत मात्रा मद के लिए प्राप्त मात्रा के बराबर होना चाहिए {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +118,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 +133,Item {0} must be a Purchase Item,आइटम {0} एक क्रय मद होना चाहिए
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
@@ -177,19 +172,17 @@
  चयनित अवधि में सभी तिथियों और कर्मचारी संयोजन मौजूदा उपस्थिति रिकॉर्ड के साथ, टेम्पलेट में आ जाएगा"
 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 +493,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","पंक्ति में कर शामिल करने के लिए {0} आइटम रेट में , पंक्तियों में करों {1} भी शामिल किया जाना चाहिए"
+apps/erpnext/erpnext/controllers/accounts_controller.py +494,"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 +90,Settings for HR Module,मानव संसाधन मॉड्यूल के लिए सेटिंग्स
 DocType: SMS Center,SMS Center,एसएमएस केंद्र
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +78,Straightening,सीधे
 DocType: BOM Replace Tool,New BOM,नई बीओएम
 apps/erpnext/erpnext/config/projects.py +28,Batch Time Logs for billing.,बैच बिलिंग के लिए टाइम लॉग करता है।
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +15,Countergravity casting,Countergravity कास्टिंग
 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/setup/page/setup_wizard/fixtures/industry_type.py +14,Broadcasting,प्रसारण
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +140,Execution,निष्पादन
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +364,The first user will become the System Manager (you can change this later).,सिस्टम मैनेजर बन जाएगा पहले उपयोगकर्ता (आप इस पर बाद में बदल सकते हैं)।
+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/public/js/setup_wizard.js +114,The first user will become the System Manager (you can change this later).,सिस्टम मैनेजर बन जाएगा पहले उपयोगकर्ता (आप इस पर बाद में बदल सकते हैं)।
 apps/erpnext/erpnext/config/manufacturing.py +39,Details of the operations carried out.,आपरेशन के विवरण से बाहर किया।
 DocType: Serial No,Maintenance Status,रखरखाव स्थिति
 apps/erpnext/erpnext/config/stock.py +263,Items and Pricing,आइटम और मूल्य निर्धारण
@@ -206,7 +199,6 @@
 DocType: Pricing Rule,Discount on Price List Rate (%),मूल्य सूची दर पर डिस्काउंट (%)
 apps/frappe/frappe/public/js/frappe/form/print.js +96,Start,प्रारंभ
 DocType: User,First Name,प्रथम नाम
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +12,Full-mold casting,पूर्ण मोल्ड कास्टिंग
 DocType: Offer Letter,Select Terms and Conditions,का चयन नियम और शर्तें
 DocType: Production Planning Tool,Sales Orders,बिक्री के आदेश
 DocType: Purchase Taxes and Charges,Valuation,मूल्याकंन
@@ -218,8 +210,7 @@
 DocType: Bank Reconciliation,Bank Account,बैंक खाता
 DocType: Leave Type,Allow Negative Balance,ऋणात्मक शेष की अनुमति दें
 DocType: Selling Settings,Default Territory,Default टेरिटरी
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +53,Television,दूरदर्शन
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +138,Gashing,Gashing
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,दूरदर्शन
 DocType: Production Order Operation,Updated via 'Time Log','टाइम प्रवेश' के माध्यम से अद्यतन
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +82,Account {0} does not belong to Company {1},खाते {0} कंपनी से संबंधित नहीं है {1}
 DocType: Naming Series,Series List for this Transaction,इस लेन - देन के लिए सीरीज सूची
@@ -234,14 +225,13 @@
 DocType: Leave Allocation,Add unused leaves from previous allocations,पिछले आवंटन से अप्रयुक्त पत्ते जोड़ें
 apps/erpnext/erpnext/controllers/recurring_document.py +206,Next Recurring {0} will be created on {1},अगला आवर्ती {0} पर बनाया जाएगा {1}
 DocType: Newsletter List,Total Subscribers,कुल ग्राहकों
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +575,Contact Name,संपर्क का नाम
+,Contact Name,संपर्क का नाम
 DocType: Production Plan Item,SO Pending Qty,तो मात्रा लंबित
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,उपरोक्त मानदंडों के लिए वेतन पर्ची बनाता है.
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,खरीद के लिए अनुरोध.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +107,Double housing,डबल आवास
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +156,Only the selected Leave Approver can submit this Leave Application,केवल चयनित लीव अनुमोदक इस छुट्टी के लिए अर्जी प्रस्तुत कर सकते हैं
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +171,Only the selected Leave Approver can submit this Leave Application,केवल चयनित लीव अनुमोदक इस छुट्टी के लिए अर्जी प्रस्तुत कर सकते हैं
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,तिथि राहत शामिल होने की तिथि से अधिक होना चाहिए
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +172,Leaves per Year,प्रति वर्ष पत्तियां
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +172,Leaves per Year,प्रति वर्ष पत्तियां
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup > Settings > Naming Series,{0} सेटअप&gt; सेटिंग के माध्यम से&gt; नामकरण सीरीज के लिए सीरीज का नामकरण सेट करें
 DocType: Time Log,Will be updated when batched.,Batched जब अद्यतन किया जाएगा.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +104,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,पंक्ति {0}: कृपया जाँच खाते के खिलाफ 'अग्रिम है' {1} यह एक अग्रिम प्रविष्टि है।
@@ -250,25 +240,24 @@
 DocType: Item Website Specification,Item Website Specification,आइटम वेबसाइट विशिष्टता
 DocType: Dropbox Backup,Dropbox Access Key,ड्रॉपबॉक्स प्रवेश कुंजी
 DocType: Payment Tool,Reference No,संदर्भ संक्या
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +348,Leave Blocked,अवरुद्ध छोड़ दो
-apps/erpnext/erpnext/stock/doctype/item/item.py +535,Item {0} has reached its end of life on {1},आइटम {0} पर जीवन के अपने अंत तक पहुँच गया है {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +392,Leave Blocked,अवरुद्ध छोड़ दो
+apps/erpnext/erpnext/stock/doctype/item/item.py +539,Item {0} has reached its end of life on {1},आइटम {0} पर जीवन के अपने अंत तक पहुँच गया है {1}
 apps/erpnext/erpnext/accounts/utils.py +339,Annual,वार्षिक
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,शेयर सुलह आइटम
 DocType: Stock Entry,Sales Invoice No,बिक्री चालान नहीं
 DocType: Material Request Item,Min Order Qty,न्यूनतम आदेश मात्रा
 DocType: Lead,Do Not Contact,संपर्क नहीं है
 DocType: Sales Invoice,The unique id for tracking all recurring invoices. It is generated on submit.,सभी आवर्ती चालान पर नज़र रखने के लिए अद्वितीय पहचान. इसे प्रस्तुत करने पर उत्पन्न होता है.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +93,Software Developer,सॉफ्टवेयर डेवलपर
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +93,Software Developer,सॉफ्टवेयर डेवलपर
 DocType: Item,Minimum Order Qty,न्यूनतम आदेश मात्रा
 DocType: Pricing Rule,Supplier Type,प्रदायक प्रकार
 DocType: Item,Publish in Hub,हब में प्रकाशित
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +555,Item {0} is cancelled,आइटम {0} को रद्द कर दिया गया है
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +598,Material Request,सामग्री अनुरोध
+apps/erpnext/erpnext/stock/doctype/item/item.py +559,Item {0} is cancelled,आइटम {0} को रद्द कर दिया गया है
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +607,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},खरीद आदेश में &#39;कच्चे माल की आपूर्ति&#39; तालिका में नहीं मिला मद {0} {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +129,Wire brushing,वायर ब्रशिंग
 DocType: Employee,Relation,संबंध
 DocType: Shipping Rule,Worldwide Shipping,दुनिया भर में शिपिंग
 apps/erpnext/erpnext/config/selling.py +23,Confirmed orders from Customers.,ग्राहकों से आदेश की पुष्टि की है.
@@ -284,12 +273,11 @@
 DocType: Supplier,Address HTML,HTML पता करने के लिए
 DocType: Lead,Mobile No.,मोबाइल नंबर
 DocType: Maintenance Schedule,Generate Schedule,कार्यक्रम तय करें उत्पन्न
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +81,Hubbing,Hubbing
 DocType: Purchase Invoice Item,Expense Head,व्यय प्रमुख
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +86,Please select Charge Type first,प्रभारी प्रकार पहले का चयन करें
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,नवीनतम
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +395,Max 5 characters,अधिकतम 5 अक्षर
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +195,Select Your Language,अपनी भाषा का चयन
+apps/erpnext/erpnext/public/js/setup_wizard.js +143,Max 5 characters,अधिकतम 5 अक्षर
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +245,Select Your Language,अपनी भाषा का चयन
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,सूची में पहले छोड़ अनुमोदक डिफ़ॉल्ट छोड़ दो अनुमोदक के रूप में स्थापित किया जाएगा
 DocType: Manufacturing Settings,"Disables creation of time logs against Production Orders.
 Operations shall not be tracked against Production Order",उत्पादन के आदेश के खिलाफ समय लॉग का सृजन अक्षम करता है। संचालन उत्पादन आदेश के खिलाफ लगाया जा नहीं करेगा
@@ -301,8 +289,6 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +34,Item {0} must be Service Item,आइटम {0} सेवा आइटम होना चाहिए
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +303,Completed Qty can not be greater than 'Qty to Manufacture',की तुलना में 'मात्रा निर्माण करने के लिए' पूरी की गई मात्रा अधिक नहीं हो सकता
 DocType: DocType,Administrator,प्रशासक
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +136,Laser drilling,लेजर ड्रिलिंग
-DocType: Stock UOM Replace Utility,New Stock UOM,नई स्टॉक UOM
 DocType: Period Closing Voucher,Closing Account Head,बंद लेखाशीर्ष
 DocType: Employee,External Work History,बाहरी काम इतिहास
 apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,परिपत्र संदर्भ त्रुटि
@@ -311,18 +297,15 @@
 DocType: Lead,Industry,उद्योग
 DocType: Employee,Job Profile,नौकरी प्रोफाइल
 DocType: Newsletter,Newsletter,न्यूज़लैटर
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +84,Hydroforming,Hydroforming
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +49,Necking,गले मिलना
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,स्वचालित सामग्री अनुरोध के निर्माण पर ईमेल द्वारा सूचित करें
 DocType: Journal Entry,Multi Currency,बहु मुद्रा
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +51,Item is updated,आइटम अद्यतन किया जाता है
 DocType: Async Task,System Manager,सिस्टम प्रबंधक
 DocType: Payment Reconciliation Invoice,Invoice Type,चालान का प्रकार
 DocType: Sales Invoice Item,Delivery Note,बिलटी
 DocType: Dropbox Backup,Allow Dropbox Access,ड्रॉपबॉक्स पहुँच की अनुमति
 apps/erpnext/erpnext/config/learn.py +72,Setting up Taxes,करों की स्थापना
 apps/erpnext/erpnext/accounts/utils.py +189,Payment Entry has been modified after you pulled it. Please pull it again.,आप इसे खींचा बाद भुगतान एंट्री संशोधित किया गया है। इसे फिर से खींच कर दीजिये।
-apps/erpnext/erpnext/stock/doctype/item/item.py +343,{0} entered twice in Item Tax,{0} मद टैक्स में दो बार दर्ज
+apps/erpnext/erpnext/stock/doctype/item/item.py +347,{0} entered twice in Item Tax,{0} मद टैक्स में दो बार दर्ज
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +105,Summary for this week and pending activities,इस सप्ताह और लंबित गतिविधियों के लिए सारांश
 DocType: Workstation,Rent Cost,बाइक किराए मूल्य
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +74,Please select month and year,माह और वर्ष का चयन करें
@@ -339,24 +322,22 @@
 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","बीओएम , डिलिवरी नोट , खरीद चालान , उत्पादन का आदेश , खरीद आदेश , खरीद रसीद , बिक्री चालान , बिक्री आदेश , स्टॉक एंट्री , timesheet में उपलब्ध"
 DocType: Item Tax,Tax Rate,कर की दर
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Select Item,वस्तु चुनें
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +540,Select Item,वस्तु चुनें
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +143,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","आइटम: {0} बैच वार, बजाय का उपयोग स्टॉक एंट्री \
  स्टॉक सुलह का उपयोग कर समझौता नहीं किया जा सकता है कामयाब"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +259,Purchase Invoice {0} is already submitted,खरीद चालान {0} पहले से ही प्रस्तुत किया जाता है
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +262,Purchase Invoice {0} is already submitted,खरीद चालान {0} पहले से ही प्रस्तुत किया जाता है
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Batch No must be same as {1} {2},पंक्ति # {0}: बैच नहीं के रूप में ही किया जाना चाहिए {1} {2}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Convert to non-Group,गैर-समूह कन्वर्ट करने के लिए
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +55,Purchase Receipt must be submitted,खरीद रसीद प्रस्तुत किया जाना चाहिए
-DocType: Stock UOM Replace Utility,Current Stock UOM,वर्तमान स्टॉक UOM
 apps/erpnext/erpnext/config/stock.py +53,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},केवल में कंपनी के प्रति एक खाते से हो सकता है {0} {1}
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Your email address,आपका ईमेल पता
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +194,Please see attachment,लगाव को देखने के लिए धन्यवाद
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +203,Please see attachment,लगाव को देखने के लिए धन्यवाद
 DocType: Purchase Order,% Received,% प्राप्त
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +109,Water jet cutting,पानी जेट काटने
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +24,Setup Already Complete!!,सेटअप पहले से ही पूरा !
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +20,Setup Already Complete!!,सेटअप पहले से ही पूरा !
 ,Finished Goods,निर्मित माल
 DocType: Delivery Note,Instructions,निर्देश
 DocType: Quality Inspection,Inspected By,द्वारा निरीक्षण किया
@@ -371,6 +352,7 @@
 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,मुद्रा विनिमय
 DocType: Purchase Invoice Item,Item Name,मद का नाम
+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",अनुमानित मात्रा और न्यूनतम आदेश मात्रा के आधार पर सभी गोदामों पर विचार करने के लिए अनुरोध किया जा आइटम जो &quot;स्टॉक से बाहर कर रहे हैं&quot;
@@ -380,11 +362,10 @@
 ,Purchase Register,इन पंजीकृत खरीद
 DocType: Landed Cost Item,Applicable Charges,लागू शुल्कों
 DocType: Workstation,Consumable Cost,उपभोज्य लागत
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,{0} ({1}) must have role 'Leave Approver',{0} ({1}) भूमिका होनी चाहिए 'लीव अनुमोदनकर्ता'
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +167,{0} ({1}) must have role 'Leave Approver',{0} ({1}) भूमिका होनी चाहिए 'लीव अनुमोदनकर्ता'
 DocType: Purchase Receipt,Vehicle Date,वाहन की तारीख
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +39,Medical,चिकित्सा
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +39,Medical,चिकित्सा
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,खोने के लिए कारण
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +36,Tube beading,ट्यूब beading
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},कार्य केंद्र छुट्टी सूची के अनुसार निम्नलिखित तारीखों पर बंद हो गया है: {0}
 DocType: Employee,Single,एक
 DocType: Issue,Attachment,आसक्ति
@@ -405,10 +386,8 @@
 DocType: Account,Is Group,समूह के
 DocType: Stock Settings,Automatically Set Serial Nos based on FIFO,स्वचालित रूप से फीफो पर आधारित नग सीरियल सेट
 DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,चेक आपूर्तिकर्ता चालान संख्या अद्वितीयता
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +31,Thermoforming,Thermoforming
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +66,Slitting,Slitting
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +57,'To Case No.' cannot be less than 'From Case No.',&#39;प्रकरण नहीं करने के लिए&#39; &#39;केस नंबर से&#39; से कम नहीं हो सकता
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +104,Non Profit,गैर लाभ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +104,Non Profit,गैर लाभ
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_list.js +7,Not Started,शुरू नहीं
 DocType: Lead,Channel Partner,चैनल पार्टनर
 DocType: Account,Old Parent,पुरानी माता - पिता
@@ -417,13 +396,12 @@
 apps/erpnext/erpnext/config/manufacturing.py +74,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 +512,Attribute {0} selected multiple times in Attributes Table,गुण {0} गुण तालिका में कई बार चुना
+apps/erpnext/erpnext/stock/doctype/item/item.py +516,Attribute {0} selected multiple times in Attributes Table,गुण {0} गुण तालिका में कई बार चुना
 DocType: Sales Order,Not Applicable,लागू नहीं
 apps/erpnext/erpnext/config/hr.py +140,Holiday master.,अवकाश मास्टर .
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +19,Shell molding,शैल ढलाई
 DocType: Material Request Item,Required Date,आवश्यक तिथि
 DocType: Delivery Note,Billing Address,बिलिंग पता
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +644,Please enter Item Code.,मद कोड दर्ज करें.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +648,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,कुल मात्रा
@@ -433,7 +411,7 @@
 DocType: Item Attribute,To Range,सीमा
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,प्रतिभूति और जमाओं
 DocType: Features Setup,Imports,आयात
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +144,Adhesive bonding,चिपकने वाला संबंध
+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.,उपस्थिति रिकॉर्ड.
@@ -441,26 +419,25 @@
 DocType: Sales Order Item,Used for Production Plan,उत्पादन योजना के लिए प्रयुक्त
 DocType: System Settings,Loading...,लोड हो रहा है ...
 DocType: DocField,Password,पासवर्ड
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +155,Fused deposition modeling,इनकार बयान मॉडलिंग
 DocType: Manufacturing Settings,Time Between Operations (in mins),(मिनट में) संचालन के बीच का समय
 DocType: Customer,Buyer of Goods and Services.,सामान और सेवाओं के खरीदार।
 DocType: Journal Entry,Accounts Payable,लेखा देय
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +24,Add Subscribers,सदस्य जोड़ें
 apps/erpnext/erpnext/public/js/feature_setup.js +220,""" does not exists",""" मौजूद नहीं है"
 DocType: Pricing Rule,Valid Upto,विधिमान्य
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +564,List a few of your customers. They could be organizations or individuals.,अपने ग्राहकों के कुछ सूची . वे संगठनों या व्यक्तियों हो सकता है.
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,List a few of your customers. They could be organizations or individuals.,अपने ग्राहकों के कुछ सूची . वे संगठनों या व्यक्तियों हो सकता है.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Direct Income,प्रत्यक्ष आय
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +33,"Can not filter based on Account, if grouped by Account","खाता से वर्गीकृत किया है , तो खाते के आधार पर फ़िल्टर नहीं कर सकते"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +88,Administrative Officer,प्रशासनिक अधिकारी
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Administrative Officer,प्रशासनिक अधिकारी
 DocType: Payment Tool,Received Or Paid,प्राप्त या भुगतान
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +318,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 +305,Please enter Warehouse for which Material Request will be raised,"सामग्री अनुरोध उठाया जाएगा , जिसके लिए वेयरहाउस दर्ज करें"
 DocType: Production Order,Additional Operating Cost,अतिरिक्त ऑपरेटिंग कॉस्ट
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +20,Cosmetics,प्रसाधन सामग्री
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,प्रसाधन सामग्री
 DocType: DocField,Type,टाइप
-apps/erpnext/erpnext/stock/doctype/item/item.py +417,"To merge, following properties must be same for both items","मर्ज करने के लिए , निम्नलिखित गुण दोनों मदों के लिए ही होना चाहिए"
+apps/erpnext/erpnext/stock/doctype/item/item.py +421,"To merge, following properties must be same for both items","मर्ज करने के लिए , निम्नलिखित गुण दोनों मदों के लिए ही होना चाहिए"
 DocType: Communication,Subject,विषय
 DocType: Shipping Rule,Net Weight,निवल भार
 DocType: Employee,Emergency Phone,आपातकालीन फोन
@@ -470,7 +447,6 @@
 DocType: Journal Entry,Difference (Dr - Cr),अंतर ( डॉ. - सीआर )
 DocType: Account,Profit and Loss,लाभ और हानि
 apps/erpnext/erpnext/config/stock.py +293,Managing Subcontracting,प्रबंध उप
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +58,New UOM must NOT be of type Whole Number,नई UOM प्रकार पूर्ण संख्या का नहीं होना चाहिए
 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 +47,Account {0} does not belong to company: {1},खाते {0} कंपनी से संबंधित नहीं है: {1}
@@ -490,14 +466,14 @@
 DocType: Purchase Invoice,Supplier Invoice No,प्रदायक चालान नहीं
 DocType: Territory,For reference,संदर्भ के लिए
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +154,"Cannot delete Serial No {0}, as it is used in stock transactions","नहीं हटा सकते सीरियल नहीं {0}, यह शेयर लेनदेन में इस्तेमाल किया जाता है के रूप में"
-apps/erpnext/erpnext/public/js/account_tree_grid.js +52,Closing (Cr),समापन (सीआर)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +227,Closing (Cr),समापन (सीआर)
 DocType: Serial No,Warranty Period (Days),वारंटी अवधि (दिन)
 DocType: Installation Note Item,Installation Note Item,अधिष्ठापन नोट आइटम
 ,Pending Qty,विचाराधीन मात्रा
 DocType: Job Applicant,Thread HTML,धागा HTML
 DocType: Company,Ignore,उपेक्षा
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +86,SMS sent to following numbers: {0},एसएमएस निम्नलिखित संख्या के लिए भेजा: {0}
-apps/erpnext/erpnext/controllers/buying_controller.py +135,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,उप अनुबंधित खरीद रसीद के लिए अनिवार्य प्रदायक वेयरहाउस
+apps/erpnext/erpnext/controllers/buying_controller.py +126,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,उप अनुबंधित खरीद रसीद के लिए अनिवार्य प्रदायक वेयरहाउस
 DocType: Pricing Rule,Valid From,चुन
 DocType: Sales Invoice,Total Commission,कुल आयोग
 DocType: Pricing Rule,Sales Partner,बिक्री साथी
@@ -507,7 +483,7 @@
 To distribute a budget using this distribution, set this **Monthly Distribution** in the **Cost Center**","** मासिक वितरण ** आप अपने कारोबार में मौसमी है तो आप महीने भर में अपने बजट को वितरित मदद करता है।
 
 , इस वितरण का उपयोग कर एक बजट वितरित ** लागत केंद्र में ** इस ** मासिक वितरण सेट करने के लिए **"
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +183,No records found in the Invoice table,चालान तालिका में कोई अभिलेख
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +130,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 +84,Financial / accounting year.,वित्तीय / लेखा वर्ष .
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","क्षमा करें, सीरियल नं विलय हो नहीं सकता"
@@ -523,25 +499,25 @@
 DocType: Sales Order,Billing and Delivery Status,बिलिंग और डिलिवरी स्थिति
 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/setup/page/setup_wizard/setup_wizard_page.html +16,Previous,पिछला
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard_page.html +16,Previous,पिछला
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +620,Sales Return,बिक्री लौटें
 DocType: Production Planning Tool,Select Sales Orders from which you want to create Production Orders.,विक्रय आदेश का चयन करें जिसमें से आप उत्पादन के आदेश बनाना चाहते.
 DocType: Item,Delivered by Supplier (Drop Ship),प्रदायक द्वारा वितरित (ड्रॉप जहाज)
 apps/erpnext/erpnext/config/hr.py +120,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.,ग्राहक डेटाबेस.
 DocType: Quotation,Quotation To,करने के लिए कोटेशन
 DocType: Lead,Middle Income,मध्य आय
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),उद्घाटन (सीआर )
 apps/erpnext/erpnext/accounts/utils.py +193,Allocated amount can not be negative,आवंटित राशि ऋणात्मक नहीं हो सकता
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +123,Tumbling,Tumbling
 DocType: Purchase Order Item,Billed Amt,बिल भेजा राशि
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,शेयर प्रविष्टियों बना रहे हैं जिसके खिलाफ एक तार्किक वेयरहाउस।
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +92,Reference No & Reference Date is required for {0},संदर्भ कोई और संदर्भ तिथि के लिए आवश्यक है {0}
 DocType: Event,Wednesday,बुधवार
 DocType: Sales Invoice,Customer's Vendor,ग्राहक विक्रेता
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +214,Production Order is Mandatory,उत्पादन का आदेश अनिवार्य है
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +139,Proposal Writing,प्रस्ताव लेखन
+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} एक ही कर्मचारी आईडी के साथ मौजूद है
 apps/erpnext/erpnext/stock/stock_ledger.py +336,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},नकारात्मक स्टॉक त्रुटि ( {6} ) मद के लिए {0} गोदाम में {1} को {2} {3} में {4} {5}
 DocType: Fiscal Year Company,Fiscal Year Company,वित्त वर्ष कंपनी
@@ -564,7 +540,7 @@
 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/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.py +179,Please install dropbox python module,ड्रॉपबॉक्स अजगर मॉड्यूल स्थापित करें
 DocType: Employee,Passport Number,पासपोर्ट नंबर
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +82,Manager,मैनेजर
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Manager,मैनेजर
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +494,From Purchase Receipt,खरीद रसीद से
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +219,Same item has been entered multiple times.,एक ही मद कई बार दर्ज किया गया है।
 DocType: SMS Settings,Receiver Parameter,रिसीवर पैरामीटर
@@ -572,10 +548,9 @@
 DocType: Sales Person,Sales Person Targets,बिक्री व्यक्ति लक्ष्य
 apps/frappe/frappe/public/js/frappe/form/workflow.js +116,To,को
 apps/frappe/frappe/templates/base.html +145,Please enter email address,ईमेल पता दर्ज करें
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +35,End tube forming,बनाने की समाप्ति ट्यूब
 DocType: Production Order Operation,In minutes,मिनटों में
 DocType: Issue,Resolution Date,संकल्प तिथि
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +635,Please set default Cash or Bank account in Mode of Payment {0},भुगतान की विधि में डिफ़ॉल्ट नकद या बैंक खाता सेट करें {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +637,Please set default Cash or Bank account in Mode of Payment {0},भुगतान की विधि में डिफ़ॉल्ट नकद या बैंक खाता सेट करें {0}
 DocType: Selling Settings,Customer Naming By,द्वारा नामकरण ग्राहक
 apps/erpnext/erpnext/accounts/doctype/account/account.js +67,Convert to Group,समूह के साथ परिवर्तित
 DocType: Activity Cost,Activity Type,गतिविधि प्रकार
@@ -583,12 +558,12 @@
 DocType: Customer,Fixed Days,निश्चित दिन
 DocType: Sales Invoice,Packing List,सूची पैकिंग
 apps/erpnext/erpnext/config/buying.py +28,Purchase Orders given to Suppliers.,खरीद आपूर्तिकर्ताओं के लिए दिए गए आदेश.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +43,Publishing,प्रकाशन
+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 +198,{0}: {1} not found in Invoice Details table,{0} {1} चालान विवरण तालिका में नहीं मिला
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,{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 +208,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,रखरखाव भेंट {0} इस बिक्री आदेश रद्द करने से पहले रद्द कर दिया जाना चाहिए
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +203,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),उद्घाटन ( डॉ. )
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},पोस्टिंग टाइमस्टैम्प के बाद होना चाहिए {0}
@@ -600,7 +575,6 @@
 DocType: Pricing Rule,Sales Manager,बिक्री प्रबंधक
 apps/frappe/frappe/public/js/frappe/model/model.js +492,Rename,नाम बदलें
 DocType: Journal Entry,Write Off Amount,बंद राशि लिखें
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +52,Bending,झुका
 apps/frappe/frappe/core/page/user_permissions/user_permissions.js +246,Allow User,उपयोगकर्ता की अनुमति
 DocType: Journal Entry,Bill No,विधेयक नहीं
 DocType: Purchase Invoice,Quarterly,त्रैमासिक
@@ -610,17 +584,16 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Please enter item details,आइटम विवरण दर्ज करें
 DocType: Purchase Receipt,Other Details,अन्य विवरण
 DocType: Account,Accounts,लेखा
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +67,Marketing,विपणन
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +65,Straight shearing,सीधे बाल काटना
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +67,Marketing,विपणन
 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/stock/doctype/purchase_receipt/purchase_receipt.py +99,Rejected Warehouse is mandatory against regected item,अस्वीकृत वेयरहाउस regected मद के खिलाफ अनिवार्य है
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +102,Rejected Warehouse is mandatory against regected item,अस्वीकृत वेयरहाउस regected मद के खिलाफ अनिवार्य है
 DocType: Account,Expenses Included In Valuation,व्यय मूल्यांकन में शामिल
 DocType: Employee,Provide email id registered in company,कंपनी में पंजीकृत ईमेल आईडी प्रदान
 DocType: Hub Settings,Seller City,विक्रेता सिटी
 DocType: Email Digest,Next email will be sent on:,अगले ईमेल पर भेजा जाएगा:
 DocType: Offer Letter Term,Offer Letter Term,पत्र टर्म प्रस्ताव
-apps/erpnext/erpnext/stock/doctype/item/item.py +492,Item has variants.,आइटम वेरिएंट है।
+apps/erpnext/erpnext/stock/doctype/item/item.py +496,Item has variants.,आइटम वेरिएंट है।
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,आइटम {0} नहीं मिला
 DocType: Bin,Stock Value,शेयर मूल्य
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,पेड़ के प्रकार
@@ -629,10 +602,9 @@
 DocType: Material Request Item,Quantity and Warehouse,मात्रा और वेयरहाउस
 DocType: Sales Invoice,Commission Rate (%),आयोग दर (%)
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +172,"Against Voucher Type must be one of Sales Order, Sales Invoice or Journal Entry","वाउचर के खिलाफ टाइप बिक्री आदेश में से एक, बिक्री चालान या जर्नल प्रविष्टि होना चाहिए"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +139,Biomachining,Biomachining
 apps/erpnext/erpnext/setup/utils.py +89,Unable to find exchange rate,विनिमय दर मिल करने में असमर्थ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +7,Aerospace,एयरोस्पेस
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +19,Welcome,आपका स्वागत है
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +7,Aerospace,एयरोस्पेस
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +40,Welcome,आपका स्वागत है
 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.,माल आपूर्तिकर्ता से प्राप्त किया.
@@ -655,19 +627,19 @@
 DocType: Employee,Cell Number,सेल नंबर
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,खोया
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +120,You can not enter current voucher in 'Against Journal Entry' column,आप स्तंभ 'जर्नल प्रवेश के खिलाफ' में मौजूदा वाउचर प्रवेश नहीं कर सकते
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +25,Energy,ऊर्जा
+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.,मासिक वेतन बयान.
 DocType: Item Group,Website Specifications,वेबसाइट निर्दिष्टीकरण
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +205,New Account,नया खाता
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +21,{0}: From {0} of type {1},{0}: {0} प्रकार की {1}
-apps/erpnext/erpnext/controllers/buying_controller.py +283,Row {0}: Conversion Factor is mandatory,पंक्ति {0}: रूपांतरण कारक अनिवार्य है
+apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,पंक्ति {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.,लेखांकन प्रविष्टियों पत्ती नोड्स के खिलाफ किया जा सकता है। समूहों के खिलाफ प्रविष्टियों की अनुमति नहीं है।
 DocType: ToDo,High,उच्च
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +361,Cannot deactivate or cancel BOM as it is linked with other BOMs,निष्क्रिय या इसे अन्य BOMs के साथ जुड़ा हुआ है के रूप में बीओएम रद्द नहीं कर सकते
 DocType: Opportunity,Maintenance,रखरखाव
 DocType: User,Male,नर
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +182,Purchase Receipt number required for Item {0},आइटम के लिए आवश्यक खरीद रसीद संख्या {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +183,Purchase Receipt number required for Item {0},आइटम के लिए आवश्यक खरीद रसीद संख्या {0}
 DocType: Item Attribute Value,Item Attribute Value,आइटम विशेषता मान
 apps/erpnext/erpnext/config/crm.py +64,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.
@@ -715,10 +687,9 @@
 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 +324,"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/page/setup_wizard/fixtures/industry_type.py +13,Biotechnology,जैव प्रौद्योगिकी
+apps/erpnext/erpnext/controllers/accounts_controller.py +325,"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,कार्यालय रखरखाव का खर्च
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +53,Hemming,हेमिंग
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +66,Please enter Item first,पहले आइटम दर्ज करें
 DocType: Account,Liability,दायित्व
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +62,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,स्वीकृत राशि पंक्ति में दावा राशि से अधिक नहीं हो सकता है {0}।
@@ -731,10 +702,10 @@
 DocType: Company,Default Bank Account,डिफ़ॉल्ट बैंक खाता
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +47,"To filter based on Party, select Party Type first","पार्टी के आधार पर फिल्टर करने के लिए, का चयन पार्टी पहले प्रकार"
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},आइटम के माध्यम से वितरित नहीं कर रहे हैं क्योंकि &#39;अपडेट स्टॉक&#39; की जाँच नहीं की जा सकती {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Nos,ओपन स्कूल
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,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 +627,My Invoices,मेरा चालान
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +629,My Invoices,मेरा चालान
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,नहीं मिला कर्मचारी
 DocType: Purchase Order,Stopped,रोक
 DocType: Item,If subcontracted to a vendor,एक विक्रेता के लिए subcontracted हैं
@@ -753,35 +724,33 @@
 DocType: Features Setup,"To enable ""Point of Sale"" features",&quot;बिक्री के प्वाइंट&quot; सुविधाओं को सक्षम करने के लिए
 DocType: Bin,Moving Average Rate,मूविंग औसत दर
 DocType: Production Planning Tool,Select Items,आइटम का चयन करें
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,{0} against Bill {1} dated {2},{0} विधेयक के खिलाफ {1} दिनांक {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +328,{0} against Bill {1} dated {2},{0} विधेयक के खिलाफ {1} दिनांक {2}
 DocType: Comment,Reference Name,संदर्भ नाम
 DocType: Maintenance Visit,Completion Status,समापन स्थिति
 DocType: Sales Invoice Item,Target Warehouse,लक्ष्य वेअरहाउस
 DocType: Item,Allow over delivery or receipt upto this percent,इस प्रतिशत तक प्रसव या रसीद से अधिक की अनुमति दें
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +49,Expected Delivery Date cannot be before Sales Order Date,उम्मीद की डिलीवरी की तारीख से पहले बिक्री आदेश तिथि नहीं हो सकता
 DocType: Upload Attendance,Import Attendance,आयात उपस्थिति
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +17,All Item Groups,सभी आइटम समूहों
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +17,All Item Groups,सभी आइटम समूहों
 DocType: Process Payroll,Activity Log,गतिविधि लॉग
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +30,Net Profit / Loss,शुद्ध लाभ / हानि
 apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,स्वचालित रूप से लेनदेन के प्रस्तुत करने पर संदेश लिखें .
 DocType: Production Order,Item To Manufacture,आइटम करने के लिए निर्माण
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +16,Permanent mold casting,स्थायी मोल्ड कास्टिंग
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} स्थिति {2} है
 apps/erpnext/erpnext/config/learn.py +172,Purchase Order to Payment,भुगतान करने के लिए क्रय आदेश
 DocType: Sales Order Item,Projected Qty,अनुमानित मात्रा
 DocType: Sales Invoice,Payment Due Date,भुगतान की नियत तिथि
 DocType: Newsletter,Newsletter Manager,न्यूज़लैटर प्रबंधक
-apps/erpnext/erpnext/stock/doctype/item/item.js +229,Item Variant {0} already exists with same attributes,मद संस्करण {0} पहले से ही एक ही गुण के साथ मौजूद है
+apps/erpnext/erpnext/stock/doctype/item/item.js +231,Item Variant {0} already exists with same attributes,मद संस्करण {0} पहले से ही एक ही गुण के साथ मौजूद है
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening',&#39;उद्घाटन&#39;
 DocType: Notification Control,Delivery Note Message,डिलिवरी नोट संदेश
 DocType: Expense Claim,Expenses,व्यय
 DocType: Item Variant Attribute,Item Variant Attribute,मद संस्करण गुण
 ,Purchase Receipt Trends,खरीद रसीद रुझान
 DocType: Appraisal,Select template from which you want to get the Goals,जो टेम्पलेट से आप लक्ष्यों को प्राप्त करना चाहते हैं का चयन करें
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +77,Research & Development,अनुसंधान एवं विकास
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Research & Development,अनुसंधान एवं विकास
 ,Amount to Bill,बिल राशि
 DocType: Company,Registration Details,पंजीकरण के विवरण
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +75,Staking,जताया
 DocType: Item,Re-Order Qty,पुन: आदेश मात्रा
 DocType: Leave Block List Date,Leave Block List Date,ब्लॉक सूची तिथि छोड़ दो
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +25,Scheduled to send to {0},करने के लिए भेजने के लिए अनुसूचित {0}
@@ -792,18 +761,16 @@
 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/hr/doctype/leave_allocation/leave_allocation.py +71,Cannot carry forward {0},आगे नहीं ले जा सकता {0}
 apps/erpnext/erpnext/accounts/doctype/account/account.py +91,"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,व्यय दावा संदेश अस्वीकृत
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +145,Nailing,श्रेष्ठ
 ,Available Qty,उपलब्ध मात्रा
 DocType: Purchase Taxes and Charges,On Previous Row Total,पिछली पंक्ति कुल पर
 DocType: Salary Slip,Working Days,कार्यकारी दिनों
 DocType: Serial No,Incoming Rate,आवक दर
 DocType: Packing Slip,Gross Weight,सकल भार
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +410,The name of your company for which you are setting up this system.,"आप इस प्रणाली स्थापित कर रहे हैं , जिसके लिए आपकी कंपनी का नाम ."
+apps/erpnext/erpnext/public/js/setup_wizard.js +158,The name of your company for which you are setting up this system.,"आप इस प्रणाली स्थापित कर रहे हैं , जिसके लिए आपकी कंपनी का नाम ."
 DocType: HR Settings,Include holidays in Total no. of Working Days,कुल संख्या में छुट्टियों को शामिल करें. कार्य दिवस की
 DocType: Job Applicant,Hold,पकड़
 DocType: Employee,Date of Joining,शामिल होने की तिथि
@@ -813,7 +780,6 @@
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +3,View Subscribers,देखें सदस्य
 DocType: Purchase Invoice Item,Purchase Receipt,रसीद खरीद
 ,Received Items To Be Billed,बिल करने के लिए प्राप्त आइटम
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +114,Abrasive blasting,घर्षण नष्ट करना
 DocType: Employee,Ms,सुश्री
 apps/erpnext/erpnext/config/accounts.py +148,Currency exchange rate master.,मुद्रा विनिमय दर मास्टर .
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +253,Unable to find Time Slot in the next {0} days for Operation {1},ऑपरेशन के लिए अगले {0} दिनों में टाइम स्लॉट पाने में असमर्थ {1}
@@ -825,7 +791,7 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +209,Serial No {0} does not belong to Item {1},धारावाहिक नहीं {0} मद से संबंधित नहीं है {1}
 DocType: Purchase Receipt Item Supplied,Required Qty,आवश्यक मात्रा
 DocType: Bank Reconciliation,Total Amount,कुल राशि
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +32,Internet Publishing,इंटरनेट प्रकाशन
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,इंटरनेट प्रकाशन
 DocType: Production Planning Tool,Production Orders,उत्पादन के आदेश
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +35,Balance Value,शेष मूल्य
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,बिक्री मूल्य सूची
@@ -836,7 +802,7 @@
 DocType: Supplier,Default Payable Accounts,डिफ़ॉल्ट लेखा देय
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,कर्मचारी {0} सक्रिय नहीं है या मौजूद नहीं है
 DocType: Features Setup,Item Barcode,आइटम बारकोड
-apps/erpnext/erpnext/stock/doctype/item/item.py +487,Item Variants {0} updated,आइटम वेरिएंट {0} अद्यतन
+apps/erpnext/erpnext/stock/doctype/item/item.py +491,Item Variants {0} updated,आइटम वेरिएंट {0} अद्यतन
 DocType: Quality Inspection Reading,Reading 6,6 पढ़ना
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,चालान अग्रिम खरीद
 DocType: Address,Shop,दुकान
@@ -845,7 +811,7 @@
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,डिफ़ॉल्ट खाता / बैंक कैश स्वतः स्थिति चालान में अद्यतन किया जाएगा जब इस मोड का चयन किया जाता है.
 DocType: Employee,Permanent Address Is,स्थायी पता है
 DocType: Production Order Operation,Operation completed for how many finished goods?,ऑपरेशन कितने तैयार माल के लिए पूरा?
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +491,The Brand,ब्रांड
+apps/erpnext/erpnext/public/js/setup_wizard.js +237,The Brand,ब्रांड
 apps/erpnext/erpnext/controllers/status_updater.py +163,Allowance for over-{0} crossed for Item {1}.,भत्ता खत्म-{0} मद के लिए पार कर लिए {1}.
 DocType: Employee,Exit Interview Details,साक्षात्कार विवरण से बाहर निकलें
 DocType: Item,Is Purchase Item,खरीद आइटम है
@@ -865,16 +831,16 @@
 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,सेट भुगतान राशि = बकाया राशि
 DocType: Contact Us Settings,Address Line 1,पता पंक्ति 1
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Variance,झगड़ा
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +392,Company Name,कंपनी का नाम
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +53,Variance,झगड़ा
+,Company Name,कंपनी का नाम
 DocType: SMS Center,Total Message(s),कुल संदेश (ओं )
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +515,Select Item for Transfer,स्थानांतरण के लिए आइटम का चयन करें
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +538,Select Item for Transfer,स्थानांतरण के लिए आइटम का चयन करें
 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.,बैंक के खाते में जहां चेक जमा किया गया था सिर का चयन करें.
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,उपयोगकर्ता लेनदेन में मूल्य सूची दर को संपादित करने की अनुमति दें
 DocType: Pricing Rule,Max Qty,अधिकतम मात्रा
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +106,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,पंक्ति {0}: बिक्री / खरीद आदेश के खिलाफ भुगतान हमेशा अग्रिम के रूप में चिह्नित किया जाना चाहिए
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +16,Chemical,रासायनिक
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,रासायनिक
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +693,All items have already been transferred for this Production Order.,सभी आइटम को पहले से ही इस उत्पादन के आदेश के लिए स्थानांतरित कर दिया गया है।
 DocType: Process Payroll,Select Payroll Year and Month,पेरोल वर्ष और महीने का चयन करें
 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""",उपयुक्त समूह (आम तौर पर फंड के लिए आवेदन&gt; वर्तमान एसेट्स&gt; बैंक खातों में जाओ और प्रकार की) चाइल्ड जोड़ने पर क्लिक करके (एक नया खाता बनाने के &quot;बैंक&quot;
@@ -885,12 +851,12 @@
 DocType: Item,Inspection Criteria,निरीक्षण मानदंड
 apps/erpnext/erpnext/config/accounts.py +101,Tree of finanial Cost Centers.,Finanial लागत केन्द्रों का पेड़ .
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,तबादला
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +492,Upload your letter head and logo. (you can edit them later).,अपने पत्र सिर और लोगो अपलोड करें। (आप उन्हें बाद में संपादित कर सकते हैं)।
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +156,White,सफेद
+apps/erpnext/erpnext/public/js/setup_wizard.js +238,Upload your letter head and logo. (you can edit them later).,अपने पत्र सिर और लोगो अपलोड करें। (आप उन्हें बाद में संपादित कर सकते हैं)।
+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/setup/page/setup_wizard/setup_wizard.js +362,Attach Your Picture,आपका चित्र संलग्न
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Make ,मेक
+apps/erpnext/erpnext/public/js/setup_wizard.js +112,Attach Your Picture,आपका चित्र संलग्न
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +540,Make ,मेक
 DocType: Journal Entry,Total Amount in Words,शब्दों में कुल राशि
 DocType: Workflow State,Stop,रोक
 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 से संपर्क करें.
@@ -899,14 +865,13 @@
 DocType: Lead,Next Contact Date,अगले संपर्क तिथि
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,खुलने मात्रा
 DocType: Holiday List,Holiday List Name,अवकाश सूची नाम
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +168,Stock Options,पूँजी विकल्प
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +168,Stock Options,पूँजी विकल्प
 DocType: Journal Entry Account,Expense Claim,व्यय दावा
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +181,Qty for {0},के लिए मात्रा {0}
 DocType: Leave Application,Leave Application,छुट्टी की अर्ज़ी
 apps/erpnext/erpnext/config/hr.py +77,Leave Allocation Tool,आबंटन उपकरण छोड़ दो
 DocType: Leave Block List,Leave Block List Dates,ब्लॉक सूची तिथियां छोड़ो
 DocType: Company,If Monthly Budget Exceeded (for expense account),"मासिक बजट (व्यय खाते के लिए) से अधिक है, तो"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +56,Trimming,ट्रिमिंग
 DocType: Workstation,Net Hour Rate,नेट घंटे की दर
 DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,आयातित माल की लागत खरीद रसीद
 DocType: Company,Default Terms,डिफ़ॉल्ट शर्तें
@@ -914,10 +879,9 @@
 DocType: POS Profile,Cash/Bank Account,नकद / बैंक खाता
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,Removed items with no change in quantity or value.,मात्रा या मूल्य में कोई परिवर्तन से हटाया आइटम नहीं है।
 DocType: Delivery Note,Delivery To,करने के लिए डिलिवरी
-apps/erpnext/erpnext/stock/doctype/item/item.py +509,Attribute table is mandatory,गुण तालिका अनिवार्य है
+apps/erpnext/erpnext/stock/doctype/item/item.py +513,Attribute table is mandatory,गुण तालिका अनिवार्य है
 DocType: Production Planning Tool,Get Sales Orders,विक्रय आदेश
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} ऋणात्मक नहीं हो सकता
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +103,Filing,फाइलिंग
 apps/erpnext/erpnext/templates/form_grid/item_grid.html +72,Discount,छूट
 DocType: Features Setup,Purchase Discounts,खरीद छूट
 DocType: Workstation,Wages,वेतन
@@ -934,6 +898,7 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +112,You are the Expense Approver for this record. Please Update the 'Status' and Save,आप इस रिकॉर्ड के लिए खर्च अनुमोदक हैं . 'स्थिति' अद्यतन और बचा लो
 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 +136,"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 +194,Serial No {0} is under maintenance contract upto {1},धारावाहिक नहीं {0} तक रखरखाव अनुबंध के तहत है {1}
@@ -942,7 +907,7 @@
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,बिक्री व्यय
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Buying,मानक खरीद
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +120,Standard Buying,मानक खरीद
 DocType: GL Entry,Against,के खिलाफ
 DocType: Item,Default Selling Cost Center,डिफ़ॉल्ट बिक्री लागत केंद्र
 DocType: Sales Partner,Implementation Partner,कार्यान्वयन साथी
@@ -963,29 +928,29 @@
 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/setup/page/setup_wizard/setup_wizard.js +588,List a few of your suppliers. They could be organizations or individuals.,अपने आपूर्तिकर्ताओं में से कुछ की सूची . वे संगठनों या व्यक्तियों हो सकता है.
+apps/erpnext/erpnext/public/js/setup_wizard.js +326,List a few of your suppliers. They could be organizations or individuals.,अपने आपूर्तिकर्ताओं में से कुछ की सूची . वे संगठनों या व्यक्तियों हो सकता है.
 DocType: Company,Default Currency,डिफ़ॉल्ट मुद्रा
 DocType: Contact,Enter designation of this Contact,इस संपर्क के पद पर नियुक्ति दर्ज करें
 DocType: Contact Us Settings,Address,पता
 DocType: Expense Claim,From Employee,कर्मचारी से
-apps/erpnext/erpnext/controllers/accounts_controller.py +338,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,चेतावनी: सिस्टम {0} {1} शून्य है में आइटम के लिए राशि के बाद से overbilling जांच नहीं करेगा
+apps/erpnext/erpnext/controllers/accounts_controller.py +339,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,चेतावनी: सिस्टम {0} {1} शून्य है में आइटम के लिए राशि के बाद से overbilling जांच नहीं करेगा
 DocType: Journal Entry,Make Difference Entry,अंतर एंट्री
 DocType: Upload Attendance,Attendance From Date,दिनांक से उपस्थिति
 DocType: Appraisal Template Goal,Key Performance Area,परफ़ॉर्मेंस क्षेत्र
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +54,Transportation,परिवहन
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +54,Transportation,परिवहन
 apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +67, and year: ,और वर्ष:
 DocType: Email Digest,Annual Expense,वार्षिक खर्च
 DocType: SMS Center,Total Characters,कुल वर्ण
-apps/erpnext/erpnext/controllers/buying_controller.py +139,Please select BOM in BOM field for Item {0},आइटम के लिए बीओएम क्षेत्र में बीओएम चयन करें {0}
+apps/erpnext/erpnext/controllers/buying_controller.py +130,Please select BOM in BOM field for Item {0},आइटम के लिए बीओएम क्षेत्र में बीओएम चयन करें {0}
 DocType: C-Form Invoice Detail,C-Form Invoice Detail,सी - फार्म के चालान विस्तार
 DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,भुगतान सुलह चालान
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +32,Contribution %,अंशदान%
 DocType: Item,website page link,वेबसाइट के पेज लिंक
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +192,Let's prepare the system for first use.,का पहला प्रयोग के लिए सिस्टम को तैयार करते हैं।
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +242,Let's prepare the system for first use.,का पहला प्रयोग के लिए सिस्टम को तैयार करते हैं।
 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 +214,Production Order {0} must be cancelled before cancelling this Sales Order,उत्पादन का आदेश {0} इस बिक्री आदेश रद्द करने से पहले रद्द कर दिया जाना चाहिए
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +209,Production Order {0} must be cancelled before cancelling this Sales Order,उत्पादन का आदेश {0} इस बिक्री आदेश रद्द करने से पहले रद्द कर दिया जाना चाहिए
 ,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.,समय लॉग्स का चयन करें और एक नया बिक्री चालान बनाने के लिए भेजें.
@@ -1005,14 +970,13 @@
 DocType: Sales Invoice Advance,Sales Invoice Advance,बिक्री चालान अग्रिम
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +398,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/page/setup_wizard/install_fixtures.py +75,Management,प्रबंधन
+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/setup/page/setup_wizard/fixtures/operations.py +14,Investment casting,निवेश कास्टिंग
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +51,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""","इस प्रकार के आइटम कोड के साथ संलग्न किया जाएगा। अपने संक्षिप्त नाम ""एसएम"", और अगर उदाहरण के लिए, मद कोड ""टी शर्ट"", ""टी-शर्ट एस.एम."" हो जाएगा संस्करण के मद कोड है"
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,शुद्ध वेतन (शब्दों में) दिखाई हो सकता है एक बार आप वेतन पर्ची बचाने के लिए होगा.
 apps/frappe/frappe/core/doctype/user/user_list.js +12,Active,सक्रिय
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +154,Blue,नीला
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +154,Blue,नीला
 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,इसके अलावा नोड्स केवल ' समूह ' प्रकार नोड्स के तहत बनाया जा सकता है
@@ -1022,18 +986,16 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +22,POS Profile {0} already created for user: {1} and company {2},पीओएस प्रोफ़ाइल {0} पहले से ही उपयोगकर्ता के लिए बनाया: {1} और कंपनी {2}
 DocType: Purchase Order Item,UOM Conversion Factor,UOM रूपांतरण फैक्टर
 DocType: Stock Settings,Default Item Group,डिफ़ॉल्ट आइटम समूह
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +156,Laminated object manufacturing,टुकड़े टुकड़े वस्तु विनिर्माण
 apps/erpnext/erpnext/config/buying.py +13,Supplier database.,प्रदायक डेटाबेस.
 DocType: Account,Balance Sheet,बैलेंस शीट
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +561,Cost Center For Item with Item Code ','आइटम कोड के साथ आइटम के लिए केंद्र का खर्च
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +45,Stretch forming,बनाने की मांसपेशियों
 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 +210,"Further accounts can be made under Groups, but entries can be made against non-Groups","इसके अलावा खातों समूह के तहत बनाया जा सकता है, लेकिन प्रविष्टियों गैर समूहों के खिलाफ बनाया जा सकता है"
 apps/erpnext/erpnext/config/hr.py +125,Tax and other salary deductions.,टैक्स और अन्य वेतन कटौती.
 DocType: Lead,Lead,नेतृत्व
 DocType: Email Digest,Payables,देय
 DocType: Account,Warehouse,गोदाम
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +90,Row #{0}: Rejected Qty can not be entered in Purchase Return,पंक्ति # {0}: मात्रा क्रय वापसी में दर्ज नहीं किया जा सकता अस्वीकृत
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +93,Row #{0}: Rejected Qty can not be entered in Purchase Return,पंक्ति # {0}: मात्रा क्रय वापसी में दर्ज नहीं किया जा सकता अस्वीकृत
 ,Purchase Order Items To Be Billed,बिल के लिए खरीद आदेश आइटम
 DocType: Purchase Invoice Item,Net Rate,असल दर
 DocType: Purchase Invoice Item,Purchase Invoice Item,चालान आइटम खरीद
@@ -1048,13 +1010,13 @@
 DocType: Global Defaults,Current Fiscal Year,चालू वित्त वर्ष
 DocType: Global Defaults,Disable Rounded Total,गोल कुल अक्षम
 DocType: Lead,Call,कॉल
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +384,'Entries' cannot be empty,' प्रविष्टियां ' खाली नहीं हो सकती
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +386,'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 +205,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/page/setup_wizard/install_fixtures.py +138,Research,अनुसंधान
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +138,Research,अनुसंधान
 DocType: Maintenance Visit Purpose,Work Done,करेंकिया गया काम
 apps/erpnext/erpnext/controllers/item_variant.py +25,Please specify at least one attribute in the Attributes table,गुण तालिका में कम से कम एक विशेषता निर्दिष्ट करें
 DocType: Contact,User ID,प्रयोक्ता आईडी
@@ -1062,10 +1024,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +57,View Ledger,देखें खाता बही
 DocType: File,Lft,LFT
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,शीघ्रातिशीघ्र
-apps/erpnext/erpnext/stock/doctype/item/item.py +394,"An Item Group exists with same name, please change the item name or rename the item group","एक आइटम समूह में एक ही नाम के साथ मौजूद है , वस्तु का नाम बदलने के लिए या आइटम समूह का नाम बदलने के लिए कृपया"
+apps/erpnext/erpnext/stock/doctype/item/item.py +398,"An Item Group exists with same name, please change the item name or rename the item group","एक आइटम समूह में एक ही नाम के साथ मौजूद है , वस्तु का नाम बदलने के लिए या आइटम समूह का नाम बदलने के लिए कृपया"
 DocType: Communication,Delivery Status,डिलिवरी स्थिति
 DocType: Production Order,Manufacture against Sales Order,बिक्री आदेश के खिलाफ निर्माण
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +517,Rest Of The World,शेष विश्व
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +455,Rest Of The World,शेष विश्व
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,आइटम {0} बैच नहीं हो सकता
 ,Budget Variance Report,बजट विचरण रिपोर्ट
 DocType: Salary Slip,Gross Pay,सकल वेतन
@@ -1076,13 +1038,11 @@
 DocType: BOM Item,Item Description,आइटम विवरण
 DocType: Payment Tool,Payment Mode,भुगतान का प्रकार
 DocType: Purchase Invoice,Is Recurring,आवर्ती है
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +154,Direct metal laser sintering,प्रत्यक्ष धातु लेजर sintering
 DocType: Purchase Order,Supplied Items,आपूर्ति आइटम
 DocType: Production Order,Qty To Manufacture,विनिर्माण मात्रा
 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,अस्थाई उद्घाटन
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +41,Cryorolling,Cryorolling
 ,Employee Leave Balance,कर्मचारी लीव बैलेंस
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +128,Balance for Account {0} must always be {1},{0} हमेशा होना चाहिए खाता के लिए शेष {1}
 DocType: Address,Address Type,पता प्रकार
@@ -1098,23 +1058,23 @@
 DocType: Journal Entry,Get Outstanding Invoices,बकाया चालान
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,बिक्री आदेश {0} मान्य नहीं है
 apps/erpnext/erpnext/setup/doctype/company/company.py +172,"Sorry, companies cannot be merged","क्षमा करें, कंपनियों का विलय कर दिया नहीं किया जा सकता"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +145,Small,छोटा
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Small,छोटा
 DocType: Employee,Employee Number,कर्मचारियों की संख्या
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},प्रकरण नहीं ( ओं) पहले से ही उपयोग में . प्रकरण नहीं से try {0}
 ,Invoiced Amount (Exculsive Tax),चालान राशि ( Exculsive टैक्स )
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,आइटम 2
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +59,Account head {0} created,लेखाशीर्ष {0} बनाया
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +153,Green,ग्रीन
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Green,ग्रीन
 DocType: Item,Auto re-order,ऑटो पुनः आदेश
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +57,Total Achieved,कुल प्राप्त
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +59,Total Achieved,कुल प्राप्त
 DocType: Employee,Place of Issue,जारी करने की जगह
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +59,Contract,अनुबंध
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Contract,अनुबंध
 DocType: Report,Disabled,विकलांग
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +490,UOM coversion factor required for UOM: {0} in Item: {1},UOM के लिए आवश्यक UOM coversion पहलू: {0} मद में: {1}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +83,Indirect Expenses,अप्रत्यक्ष व्यय
 apps/erpnext/erpnext/controllers/selling_controller.py +163,Row {0}: Qty is mandatory,पंक्ति {0}: मात्रा अनिवार्य है
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +8,Agriculture,कृषि
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +611,Your Products or Services,अपने उत्पादों या सेवाओं
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,कृषि
+apps/erpnext/erpnext/public/js/setup_wizard.js +347,Your Products or Services,अपने उत्पादों या सेवाओं
 DocType: Mode of Payment,Mode of Payment,भुगतान की रीति
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,यह एक रूट आइटम समूह है और संपादित नहीं किया जा सकता है .
 DocType: Journal Entry Account,Purchase Order,आदेश खरीद
@@ -1126,7 +1086,7 @@
 DocType: Serial No,Serial No Details,धारावाहिक नहीं विवरण
 DocType: Purchase Invoice Item,Item Tax Rate,आइटम कर की दर
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +113,"For {0}, only credit accounts can be linked against another debit entry","{0}, केवल ऋण खातों अन्य डेबिट प्रविष्टि के खिलाफ जोड़ा जा सकता है के लिए"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Delivery Note {0} is not submitted,डिलिवरी नोट {0} प्रस्तुत नहीं किया गया है
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +470,Delivery Note {0} is not submitted,डिलिवरी नोट {0} प्रस्तुत नहीं किया गया है
 apps/erpnext/erpnext/stock/get_item_details.py +136,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.","मूल्य निर्धारण नियम पहला आइटम, आइटम समूह या ब्रांड हो सकता है, जो क्षेत्र 'पर लागू होते हैं' के आधार पर चुना जाता है."
@@ -1136,7 +1096,7 @@
 DocType: Appraisal Goal,Goal,लक्ष्य
 DocType: Sales Invoice Item,Edit Description,संपादित करें] वर्णन
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +318,Expected Delivery Date is lesser than Planned Start Date.,उम्मीद की डिलीवरी की तिथि नियोजित प्रारंभ तिथि की तुलना में कम है।
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +579,For Supplier,सप्लायर के लिए
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +602,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,कुल निवर्तमान
@@ -1162,10 +1122,10 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +74,"Total {0} for all items is zero, may you should change 'Distribute Charges Based On'","कुल {0} सभी मदों के लिए आप &#39;पर आधारित शुल्क वितरित करें&#39; बदलना चाहिए सकता है, शून्य है"
 DocType: Purchase Invoice,Taxes and Charges Calculation,कर और शुल्क गणना
 DocType: BOM Operation,Workstation,वर्कस्टेशन
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +112,Hardware,हार्डवेयर
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +112,Hardware,हार्डवेयर
 DocType: Attendance,HR Manager,मानव संसाधन प्रबंधक
 apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,एक कंपनी का चयन करें
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +50,Privilege Leave,विशेषाधिकार छुट्टी
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +50,Privilege Leave,विशेषाधिकार छुट्टी
 DocType: Purchase Invoice,Supplier Invoice Date,प्रदायक चालान तिथि
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +79,You need to enable Shopping Cart,आप खरीदारी की टोकरी में सक्रिय करने की जरूरत
 apps/frappe/frappe/public/js/frappe/form/grid_body.html +6,No Data,कोई डेटा नहीं
@@ -1178,7 +1138,7 @@
 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 +168,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/setup/page/setup_wizard/install_fixtures.py +38,Food,भोजन
+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 +139,You can make a time log only against a submitted production order,आप केवल एक प्रस्तुत उत्पादन के आदेश के खिलाफ एक समय प्रवेश कर सकते हैं
 DocType: Maintenance Schedule Item,No of Visits,यात्राओं की संख्या
@@ -1198,6 +1158,7 @@
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,View Offer Letter,देखें पेशकश पत्र
 DocType: Communication,Communication,संचार
 DocType: Item,Is Service Item,सेवा आइटम
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +81,Application period cannot be outside leave allocation period,आवेदन की अवधि के बाहर छुट्टी के आवंटन की अवधि नहीं किया जा सकता
 DocType: Activity Cost,Projects,परियोजनाओं
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +31,Please select Fiscal Year,वित्तीय वर्ष का चयन करें
 apps/erpnext/erpnext/controllers/buying_controller.py +23,From {0} | {1} {2},से {0} | {1} {2}
@@ -1216,7 +1177,7 @@
 DocType: Item,Maintain Stock,स्टॉक बनाए रखें
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +213,Stock Entries already created for Production Order ,पहले से ही उत्पादन आदेश के लिए बनाया स्टॉक प्रविष्टियां
 DocType: Leave Control Panel,Leave blank if considered for all designations,रिक्त छोड़ अगर सभी पदनाम के लिए विचार
-apps/erpnext/erpnext/controllers/accounts_controller.py +499,Charge of type 'Actual' in row {0} cannot be included in Item Rate,प्रकार पंक्ति {0} में 'वास्तविक ' का प्रभार आइटम रेट में शामिल नहीं किया जा सकता
+apps/erpnext/erpnext/controllers/accounts_controller.py +500,Charge of type 'Actual' in row {0} cannot be included in Item Rate,प्रकार पंक्ति {0} में 'वास्तविक ' का प्रभार आइटम रेट में शामिल नहीं किया जा सकता
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,Max: {0},मैक्स: {0}
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +16,From Datetime,Datetime से
 DocType: Email Digest,For Company,कंपनी के लिए
@@ -1226,7 +1187,7 @@
 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 +471,cannot be greater than 100,100 से अधिक नहीं हो सकता
-apps/erpnext/erpnext/stock/doctype/item/item.py +546,Item {0} is not a stock Item,आइटम {0} भंडार वस्तु नहीं है
+apps/erpnext/erpnext/stock/doctype/item/item.py +550,Item {0} is not a stock Item,आइटम {0} भंडार वस्तु नहीं है
 DocType: Maintenance Visit,Unscheduled,अनिर्धारित
 DocType: Employee,Owned,स्वामित्व
 DocType: Salary Slip Deduction,Depends on Leave Without Pay,बिना वेतन छुट्टी पर निर्भर करता है
@@ -1240,31 +1201,29 @@
 DocType: HR Settings,Employee Settings,कर्मचारी सेटिंग्स
 ,Batch-Wise Balance History,बैच वार बैलेंस इतिहास
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +72,To Do List,सूची
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +63,Apprentice,शिक्षु
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Apprentice,शिक्षु
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +99,Negative Quantity is not allowed,नकारात्मक मात्रा की अनुमति नहीं है
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
 Used for Taxes and Charges","एक स्ट्रिंग के रूप में आइटम गुरु से दिलवाया है और इस क्षेत्र में संग्रहित कर विस्तार मेज।
  करों और शुल्कों के लिए प्रयुक्त"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +61,Lancing,Lancing
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +151,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 +435,Accounting Entry for {0}: {1} can only be made in currency: {2},{1} केवल मुद्रा में बनाया जा सकता है: {0} के लिए लेखा प्रविष्टि {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +436,Accounting Entry for {0}: {1} can only be made in currency: {2},{1} केवल मुद्रा में बनाया जा सकता है: {0} के लिए लेखा प्रविष्टि {2}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +38,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 +112,Tax Rule for transactions.,लेन-देन के लिए टैक्स नियम।
 DocType: Rename Tool,Type of document to rename.,नाम बदलने के लिए दस्तावेज का प्रकार.
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +630,We buy this Item,हम इस मद से खरीदें
+apps/erpnext/erpnext/public/js/setup_wizard.js +366,We buy this Item,हम इस मद से खरीदें
 DocType: Address,Billing,बिलिंग
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +77,Flanging,Flanging
 DocType: Bulk Email,Not Sent,नहीं भेजा गया
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +73,Explosive forming,गठन विस्फोटक
 DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),कुल करों और शुल्कों (कंपनी मुद्रा)
 DocType: Shipping Rule,Shipping Account,नौवहन खाता
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +43,Scheduled to send to {0} recipients,{0} प्राप्तकर्ताओं को भेजने के लिए अनुसूचित
 DocType: Quality Inspection,Readings,रीडिंग
 DocType: Stock Entry,Total Additional Costs,कुल अतिरिक्त लागत
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Sub Assemblies,उप असेंबलियों
+apps/erpnext/erpnext/public/js/setup_wizard.js +359,Sub Assemblies,उप असेंबलियों
 DocType: Shipping Rule Condition,To Value,मूल्य के लिए
 DocType: Supplier,Stock Manager,शेयर प्रबंधक
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +143,Source warehouse is mandatory for row {0},स्रोत गोदाम पंक्ति के लिए अनिवार्य है {0}
@@ -1274,44 +1233,42 @@
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,आयात विफल!
 apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,कोई पता अभी तक जोड़ा।
 DocType: Workstation Working Hour,Workstation Working Hour,कार्य केंद्र घंटे काम
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +83,Analyst,विश्लेषक
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +202,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},पंक्ति {0}: आवंटित राशि {1} से भी कम हो या जेवी राशि के बराबर होना चाहिए {2}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Analyst,विश्लेषक
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +149,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},पंक्ति {0}: आवंटित राशि {1} से भी कम हो या जेवी राशि के बराबर होना चाहिए {2}
 DocType: Item,Inventory,इनवेंटरी
 DocType: Features Setup,"To enable ""Point of Sale"" view",दृश्य &quot;बिक्री के प्वाइंट&quot; सक्षम करने के लिए
 apps/erpnext/erpnext/public/js/pos/pos.js +402,Payment cannot be made for empty cart,भुगतान खाली गाड़ी के लिए नहीं बनाया जा सकता
 DocType: Item,Sales Details,बिक्री विवरण
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +149,Pinning,लगाए
 DocType: Opportunity,With Items,आइटम के साथ
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,मात्रा में
 DocType: Notification Control,Expense Claim Rejected,व्यय दावे का खंडन किया
 DocType: Sales Invoice,"The date on which next invoice will be generated. It is generated on submit.
 ","अगले चालान उत्पन्न हो जाएगा, जिस पर तारीख। इसे प्रस्तुत पर उत्पन्न होता है।"
 DocType: Item Attribute,Item Attribute,आइटम गुण
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +105,Government,सरकार
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Government,सरकार
 apps/erpnext/erpnext/config/stock.py +268,Item Variants,आइटम वेरिएंट
 DocType: Company,Services,सेवाएं
 apps/erpnext/erpnext/accounts/report/financial_statements.py +147,Total ({0}),कुल ({0})
 DocType: Cost Center,Parent Cost Center,माता - पिता लागत केंद्र
 DocType: Sales Invoice,Source,स्रोत
 DocType: Leave Type,Is Leave Without Pay,बिना वेतन छुट्टी है
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +186,No records found in the Payment table,भुगतान तालिका में कोई अभिलेख
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +405,Financial Year Start Date,वित्तीय वर्ष प्रारंभ दिनांक
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +133,No records found in the Payment table,भुगतान तालिका में कोई अभिलेख
+apps/erpnext/erpnext/public/js/setup_wizard.js +153,Financial Year Start Date,वित्तीय वर्ष प्रारंभ दिनांक
 DocType: Employee External Work History,Total Experience,कुल अनुभव
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +100,Countersinking,Countersinking
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +271,Packing Slip(s) cancelled,पैकिंग पर्ची (ओं ) को रद्द कर दिया
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +276,Packing Slip(s) cancelled,पैकिंग पर्ची (ओं ) को रद्द कर दिया
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,फ्रेट और अग्रेषण शुल्क
 DocType: Material Request Item,Sales Order No,बिक्री आदेश नहीं
 DocType: Item Group,Item Group Name,आइटम समूह का नाम
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +50,Taken,में ले ली
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,में ले ली
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +66,Transfer Materials for Manufacture,निर्माण के लिए हस्तांतरण सामग्री
 DocType: Pricing Rule,For Price List,मूल्य सूची के लिए
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +27,Executive Search,कार्यकारी खोज
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,कार्यकारी खोज
 apps/erpnext/erpnext/stock/stock_ledger.py +405,"Purchase rate for item: {0} not found, which is required to book accounting entry (expense). Please mention item price against a buying price list.","आइटम के लिए खरीद दर: {0} नहीं मिला, लेखा प्रविष्टि (व्यय) बुक करने के लिए आवश्यक है। एक खरीद मूल्य सूची के खिलाफ मद कीमत का उल्लेख करें।"
 DocType: Maintenance Schedule,Schedules,अनुसूचियों
 DocType: Purchase Invoice Item,Net Amount,शुद्ध राशि
 DocType: Purchase Order Item Supplied,BOM Detail No,बीओएम विस्तार नहीं
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),अतिरिक्त छूट राशि (कंपनी मुद्रा)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +537,Error: {0} > {1},त्रुटि: {0} > {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +541,Error: {0} > {1},त्रुटि: {0} > {1}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,खातों का चार्ट से नया खाता बनाने के लिए धन्यवाद.
 DocType: Maintenance Visit,Maintenance Visit,रखरखाव भेंट
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer > Customer Group > Territory,ग्राहक> ग्राहक समूह> टेरिटरी
@@ -1322,7 +1279,6 @@
 DocType: Event,Tuesday,मंगलवार
 DocType: Leave Block List,Block Holidays on important days.,महत्वपूर्ण दिन पर ब्लॉक छुट्टियाँ।
 ,Accounts Receivable Summary,लेखा प्राप्य सारांश
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +43,Leaves for type {0} already allocated for Employee {1} for period {2} - {3},पहले से ही अवधि के लिए कर्मचारी {1} के लिए आवंटित प्रकार {0} के लिए छोड़ देता {2} - {3}
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +187,Please set User ID field in an Employee record to set Employee Role,कर्मचारी भूमिका निर्धारित करने के लिए एक कर्मचारी रिकॉर्ड में यूजर आईडी क्षेत्र सेट करें
 DocType: UOM,UOM Name,UOM नाम
 DocType: Top Bar Item,Target,लक्ष्य
@@ -1334,15 +1290,14 @@
 DocType: ToDo,Due Date,नियत तारीख
 DocType: Sales Invoice Item,Brand Name,ब्रांड नाम
 DocType: Purchase Receipt,Transporter Details,ट्रांसपोर्टर विवरण
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Box,डिब्बा
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +389,The Organization,संगठन
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Box,डिब्बा
+apps/erpnext/erpnext/public/js/setup_wizard.js +137,The Organization,संगठन
 DocType: Monthly Distribution,Monthly Distribution,मासिक वितरण
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,पानेवाला सूची खाली है . पानेवाला सूची बनाएं
 DocType: Production Plan Sales Order,Production Plan Sales Order,उत्पादन योजना बिक्री आदेश
 DocType: Sales Partner,Sales Partner Target,बिक्री साथी लक्ष्य
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},{0} के लिए लेखा प्रविष्टि केवल मुद्रा में बनाया जा सकता है: {1}
 DocType: Pricing Rule,Pricing Rule,मूल्य निर्धारण नियम
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +58,Notching,निशाना साधना
 apps/erpnext/erpnext/config/learn.py +167,Material Request to Purchase Order,क्रय आदेश के लिए सामग्री का अनुरोध
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +74,Row # {0}: Returned Item {1} does not exists in {2} {3},पंक्ति # {0}: वापस आ मद {1} नहीं में मौजूद है {2} {3}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,बैंक खातों
@@ -1359,20 +1314,19 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Amounts not reflected in bank,बैंक में परिलक्षित नहीं मात्रा में
 DocType: Quality Inspection Reading,Reading 4,4 पढ़ना
 apps/erpnext/erpnext/config/hr.py +23,Claims for company expense.,कंपनी के खर्च के लिए दावा.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +8,Centrifugal casting,केन्द्रापसारक कास्टिंग
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +119,Magnetic field-assisted finishing,चुंबकीय क्षेत्र की मदद से परिष्करण
 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,मोबाइल संपर्क नहीं
 DocType: Production Planning Tool,Select Sales Orders,विक्रय आदेश का चयन करें
 ,Material Requests for which Supplier Quotations are not created,"प्रदायक कोटेशन नहीं बनाई गई हैं , जिसके लिए सामग्री अनुरोध"
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +117,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,"आप छुट्टी के लिए आवेदन कर रहे हैं, जिस पर दिन (एस) छुट्टियां हैं। आप छुट्टी के लिए लागू नहीं की जरूरत है।"
 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/buying/doctype/purchase_order/purchase_order.js +477,Mark as Delivered,मार्क के रूप में दिया
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +497,Mark as Delivered,मार्क के रूप में दिया
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +34,Make Quotation,कोटेशन बनाओ
 DocType: Dependent Task,Dependent Task,आश्रित टास्क
-apps/erpnext/erpnext/stock/doctype/item/item.py +306,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 +141,Leave of type {0} cannot be longer than {1},प्रकार की छुट्टी {0} से बड़ा नहीं हो सकता है {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +310,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 +155,Leave of type {0} cannot be longer than {1},प्रकार की छुट्टी {0} से बड़ा नहीं हो सकता है {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,अग्रिम में एक्स दिनों के लिए आपरेशन की योजना बना प्रयास करें।
 DocType: HR Settings,Stop Birthday Reminders,बंद करो जन्मदिन अनुस्मारक
 DocType: SMS Center,Receiver List,रिसीवर सूची
@@ -1380,15 +1334,14 @@
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,खपत राशि
 apps/erpnext/erpnext/public/js/pos/pos.js +491,{0} View,{0} देखें
 DocType: Salary Structure Deduction,Salary Structure Deduction,वेतन संरचना कटौती
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +158,Selective laser sintering,चयनित लेजर Sintering
-apps/erpnext/erpnext/stock/doctype/item/item.py +301,Unit of Measure {0} has been entered more than once in Conversion Factor Table,मापने की इकाई {0} अधिक रूपांतरण कारक तालिका में एक बार से अधिक दर्ज किया गया है
+apps/erpnext/erpnext/stock/doctype/item/item.py +305,Unit of Measure {0} has been entered more than once in Conversion Factor Table,मापने की इकाई {0} अधिक रूपांतरण कारक तालिका में एक बार से अधिक दर्ज किया गया है
 apps/frappe/frappe/core/page/data_import_tool/data_import_tool.js +108,Import Successful!,सफल आयात !
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,जारी मदों की लागत
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +185,Quantity must not be more than {0},मात्रा से अधिक नहीं होना चाहिए {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +41,Age (Days),आयु (दिन)
 DocType: Quotation Item,Quotation Item,कोटेशन आइटम
 DocType: Account,Account Name,खाते का नाम
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +41,From Date cannot be greater than To Date,तिथि से आज तक से बड़ा नहीं हो सकता
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +34,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.,प्रदायक प्रकार मास्टर .
 DocType: Purchase Order Item,Supplier Part Number,प्रदायक भाग संख्या
@@ -1397,14 +1350,14 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +247,{0} {1} is cancelled or stopped,{0} {1} रद्द या बंद कर दिया है
 DocType: Accounts Settings,Credit Controller,क्रेडिट नियंत्रक
 DocType: Delivery Note,Vehicle Dispatch Date,वाहन डिस्पैच तिथि
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +197,Purchase Receipt {0} is not submitted,खरीद रसीद {0} प्रस्तुत नहीं किया गया है
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +198,Purchase Receipt {0} is not submitted,खरीद रसीद {0} प्रस्तुत नहीं किया गया है
 DocType: Company,Default Payable Account,डिफ़ॉल्ट देय खाता
 apps/erpnext/erpnext/config/website.py +13,"Settings for online shopping cart such as shipping rules, price list etc.","ऐसे शिपिंग नियम, मूल्य सूची आदि के रूप में ऑनलाइन शॉपिंग कार्ट के लिए सेटिंग"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +660,Setup Complete,सेटअप पूरा हुआ
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +124,Setup Complete,सेटअप पूरा हुआ
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +65,{0}% Billed,{0}% बिल
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +17,Reserved Qty,सुरक्षित मात्रा
 DocType: Party Account,Party Account,पार्टी खाता
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +74,Human Resources,मानवीय संसाधन
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +74,Human Resources,मानवीय संसाधन
 DocType: Lead,Upper Income,ऊपरी आय
 DocType: Journal Entry Account,Debit in Company Currency,कंपनी मुद्रा में डेबिट
 apps/erpnext/erpnext/support/doctype/issue/issue.py +58,My Issues,मेरे मुद्दों
@@ -1413,11 +1366,9 @@
 DocType: Company,Default Values,डिफ़ॉल्ट मान
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +236,Row {0}: Payment amount can not be negative,पंक्ति {0}: भुगतान राशि नकारात्मक नहीं हो सकता
 DocType: Expense Claim,Total Amount Reimbursed,कुल राशि की प्रतिपूर्ति
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +152,Press fitting,प्रेस फिटिंग
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +64,Against Supplier Invoice {0} dated {1},प्रदायक के खिलाफ चालान {0} दिनांक {1}
 DocType: Customer,Default Price List,डिफ़ॉल्ट मूल्य सूची
 DocType: Payment Reconciliation,Payments,भुगतान
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +24,Hot isostatic pressing,दबाने गर्म isostatic
 DocType: ToDo,Medium,मध्यम
 DocType: Budget Detail,Budget Allocated,बजट आवंटित
 DocType: Journal Entry,Entry Type,प्रविष्टि प्रकार
@@ -1430,9 +1381,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +56,None of the items have any change in quantity or value.,आइटम में से कोई भी मात्रा या मूल्य में कोई बदलाव किया है।
 DocType: Warranty Claim,Warranty Claim,वारंटी का दावा
 ,Lead Details,विवरण लीड
-DocType: Authorization Rule,Approving User,उपयोगकर्ता के स्वीकृति
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +37,Forging,फोर्जिंग
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +126,Plating,चढ़ाना
 DocType: Purchase Invoice,End date of current invoice's period,वर्तमान चालान की अवधि की समाप्ति की तारीख
 DocType: Pricing Rule,Applicable For,के लिए लागू
 DocType: Bank Reconciliation,From Date,दिनांक से
@@ -1454,31 +1402,29 @@
 DocType: Sales Invoice,Paid Amount (Company Currency),भुगतान की गई राशि (कंपनी मुद्रा)
 DocType: Purchase Invoice,Additional Discount,अतिरिक्त छूट
 DocType: Selling Settings,Selling Settings,सेटिंग्स बेचना
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +39,Online Auctions,ऑनलाइन नीलामी
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,ऑनलाइन नीलामी
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +94,Please specify either Quantity or Valuation Rate or both,मात्रा या मूल्यांकन दर या दोनों निर्दिष्ट करें
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +50,"Company, Month and Fiscal Year is mandatory","कंपनी , महीना और वित्तीय वर्ष अनिवार्य है"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Marketing Expenses,विपणन व्यय
 ,Item Shortage Report,आइटम कमी की रिपोर्ट
-apps/erpnext/erpnext/stock/doctype/item/item.js +183,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","वजन भी ""वजन UOM"" का उल्लेख कृपया \n, उल्लेख किया गया है"
+apps/erpnext/erpnext/stock/doctype/item/item.js +185,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","वजन भी ""वजन UOM"" का उल्लेख कृपया \n, उल्लेख किया गया है"
 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 +212,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 +384,Warehouse required at Row No {0},रो नहीं पर आवश्यक गोदाम {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +386,Warehouse required at Row No {0},रो नहीं पर आवश्यक गोदाम {0}
 DocType: Employee,Date Of Retirement,सेवानिवृत्ति की तारीख
 DocType: Upload Attendance,Get Template,टेम्पलेट जाओ
 DocType: Address,Postal,डाक का
 DocType: Item,Weightage,महत्व
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +159,Mining,खनन
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +17,Resin casting,राल कास्टिंग
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"ग्राहक समूह समान नाम के साथ पहले से मौजूद है, कृपया ग्राहक का नाम बदले या ग्राहक समूह का नाम बदले"
 apps/erpnext/erpnext/public/js/pos/pos.js +147,Please select {0} first.,पहला {0} का चयन करें.
 apps/erpnext/erpnext/templates/pages/order.html +57,text {0},पाठ {0}
 DocType: Territory,Parent Territory,माता - पिता टेरिटरी
 DocType: Quality Inspection Reading,Reading 2,2 पढ़ना
 DocType: Stock Entry,Material Receipt,सामग्री प्राप्ति
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +622,Products,उत्पाद
+apps/erpnext/erpnext/public/js/setup_wizard.js +358,Products,उत्पाद
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +47,Party Type and Party is required for Receivable / Payable account {0},पार्टी का प्रकार और पार्टी प्राप्य / देय खाते के लिए आवश्यक है {0}
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.","इस मद वेरिएंट है, तो यह बिक्री के आदेश आदि में चयन नहीं किया जा सकता है"
 DocType: Lead,Next Contact By,द्वारा अगले संपर्क
@@ -1488,13 +1434,13 @@
 DocType: Purchase Invoice,Notification Email Address,सूचना ईमेल पता
 DocType: Payment Tool,Find Invoices to Match,मिलान करने के लिए चालान का पता लगाएं
 ,Item-wise Sales Register,आइटम के लिहाज से बिक्री रजिस्टर
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +399,"e.g. ""XYZ National Bank""","उदाहरण के लिए ""एक्सवायजेड नेशनल बैंक """
+apps/erpnext/erpnext/public/js/setup_wizard.js +147,"e.g. ""XYZ National Bank""","उदाहरण के लिए ""एक्सवायजेड नेशनल बैंक """
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,इस टैक्स मूल दर में शामिल है?
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +57,Total Target,कुल लक्ष्य
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Target,कुल लक्ष्य
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.js +22,Shopping Cart is enabled,खरीदारी की टोकरी में सक्षम हो जाता है
 DocType: Job Applicant,Applicant for a Job,एक नौकरी के लिए आवेदक
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +173,No Production Orders created,बनाया नहीं उत्पादन के आदेश
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +131,Salary Slip of employee {0} already created for this month,कर्मचारी के वेतन पर्ची {0} पहले से ही इस माह के लिए बनाए
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +140,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.,बहुत अधिक कॉलम. रिपोर्ट निर्यात और एक स्प्रेडशीट अनुप्रयोग का उपयोग कर इसे मुद्रित.
 DocType: Sales Invoice Item,Batch No,कोई बैच
@@ -1504,14 +1450,14 @@
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +13,Variant,प्रकार
 apps/frappe/frappe/public/js/frappe/form/toolbar.js +165,New {0},नई {0}
 DocType: Naming Series,Set prefix for numbering series on your transactions,अपने लेनदेन पर श्रृंखला नंबरिंग के लिए उपसर्ग सेट
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +169,Stopped order cannot be cancelled. Unstop to cancel.,रूका आदेश को रद्द नहीं किया जा सकता . रद्द करने के लिए आगे बढ़ाना .
-apps/erpnext/erpnext/stock/doctype/item/item.py +323,Default BOM ({0}) must be active for this item or its template,डिफ़ॉल्ट बीओएम ({0}) इस मद या अपने टेम्पलेट के लिए सक्रिय होना चाहिए
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +164,Stopped order cannot be cancelled. Unstop to cancel.,रूका आदेश को रद्द नहीं किया जा सकता . रद्द करने के लिए आगे बढ़ाना .
+apps/erpnext/erpnext/stock/doctype/item/item.py +327,Default BOM ({0}) must be active for this item or its template,डिफ़ॉल्ट बीओएम ({0}) इस मद या अपने टेम्पलेट के लिए सक्रिय होना चाहिए
 DocType: Employee,Leave Encashed?,भुनाया छोड़ दो?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,क्षेत्र से मौके अनिवार्य है
 DocType: Item,Variants,वेरिएंट
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +458,Make Purchase Order,बनाओ खरीद आदेश
 DocType: SMS Center,Send To,इन्हें भेजें
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +111,There is not enough leave balance for Leave Type {0},छोड़ दो प्रकार के लिए पर्याप्त छुट्टी संतुलन नहीं है {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +127,There is not enough leave balance for Leave Type {0},छोड़ दो प्रकार के लिए पर्याप्त छुट्टी संतुलन नहीं है {0}
 DocType: Sales Team,Contribution to Net Total,नेट कुल के लिए अंशदान
 DocType: Sales Invoice Item,Customer's Item Code,ग्राहक आइटम कोड
 DocType: Stock Reconciliation,Stock Reconciliation,स्टॉक सुलह
@@ -1548,11 +1494,11 @@
 DocType: Sales Order Item,Actual Qty,वास्तविक मात्रा
 DocType: Sales Invoice Item,References,संदर्भ
 DocType: Quality Inspection Reading,Reading 10,10 पढ़ना
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +612,"List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start.",अपने उत्पादों या आप खरीदने या बेचने सेवाओं है कि सूची .
+apps/erpnext/erpnext/public/js/setup_wizard.js +348,"List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start.",अपने उत्पादों या आप खरीदने या बेचने सेवाओं है कि सूची .
 DocType: Hub Settings,Hub Node,हब नोड
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,आप डुप्लिकेट आइटम दर्ज किया है . सुधारने और पुन: प्रयास करें .
 apps/erpnext/erpnext/controllers/item_variant.py +65,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values,मूल्य {0} विशेषता के लिए {1} वैध आइटम की सूची में मौजूद नहीं है विशेषता मान
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +87,Associate,सहयोगी
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Associate,सहयोगी
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +46,Item {0} is not a serialized Item,आइटम {0} एक धारावाहिक आइटम नहीं है
 DocType: SMS Center,Create Receiver List,रिसीवर सूची बनाएँ
 apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +5,Expired,समय सीमा समाप्त
@@ -1561,7 +1507,7 @@
 DocType: Warranty Claim,Issue Date,जारी करने की तिथि
 DocType: Activity Cost,Activity Cost,गतिविधि लागत
 DocType: Purchase Receipt Item Supplied,Consumed Qty,खपत मात्रा
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +52,Telecommunications,दूरसंचार
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +52,Telecommunications,दूरसंचार
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),पैकेज इस वितरण का एक हिस्सा है कि संकेत करता है (केवल मसौदा)
 DocType: Payment Tool,Make Payment Entry,भुगतान प्रवेश कर
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +119,Quantity for Item {0} must be less than {1},मात्रा मद के लिए {0} से कम होना चाहिए {1}
@@ -1578,10 +1524,8 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +37,"Selling must be checked, if Applicable For is selected as {0}","लागू करने के लिए के रूप में चुना जाता है तो बेचना, जाँच की जानी चाहिए {0}"
 DocType: Purchase Order Item,Supplier Quotation Item,प्रदायक कोटेशन आइटम
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +27,Make Salary Structure,वेतन संरचना बनाना
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +54,Shearing,बाल काटना
 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.,एक नया बिक्री चालान बनाने के लिए बटन &#39;बिक्री चालान करें&#39; पर क्लिक करें.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +166,Packaging and labeling,पैकेजिंग और लेबलिंग
 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,कंपनी मास्टर और वैश्विक मूलभूत में डिफ़ॉल्ट मुद्रा निर्दिष्ट करें
@@ -1592,19 +1536,18 @@
 DocType: Budget Detail,Fiscal Year,वित्तीय वर्ष
 DocType: Cost Center,Budget,बजट
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +41,"Budget cannot be assigned against {0}, as it's not an Income or Expense account",यह एक आय या खर्च खाता नहीं है के रूप में बजट के खिलाफ {0} नहीं सौंपा जा सकता
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Achieved,हासिल
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,हासिल
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +65,Territory / Customer,टेरिटरी / ग्राहक
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,e.g. 5,उदाहरणार्थ
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +207,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},पंक्ति {0}: आवंटित राशि {1} से भी कम हो या बकाया राशि चालान के बराबर होना चाहिए {2}
+apps/erpnext/erpnext/public/js/setup_wizard.js +294,e.g. 5,उदाहरणार्थ
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},पंक्ति {0}: आवंटित राशि {1} से भी कम हो या बकाया राशि चालान के बराबर होना चाहिए {2}
 DocType: Sales Invoice,In Words will be visible once you save the Sales Invoice.,शब्दों में दिखाई हो सकता है एक बार आप बिक्री चालान बचाने के लिए होगा.
 DocType: Item,Is Sales Item,बिक्री आइटम है
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,आइटम समूह ट्री
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,आइटम {0} सीरियल नग चेक आइटम गुरु के लिए सेटअप नहीं है
 DocType: Maintenance Visit,Maintenance Time,अनुरक्षण काल
 ,Amount to Deliver,राशि वितरित करने के लिए
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +620,A Product or Service,उत्पाद या सेवा
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +158,There were errors.,त्रुटियां थीं .
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +101,Tapping,दोहन
+apps/erpnext/erpnext/public/js/setup_wizard.js +356,A Product or Service,उत्पाद या सेवा
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +146,There were errors.,त्रुटियां थीं .
 DocType: Naming Series,Current Value,वर्तमान मान
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +171,{0} created,{0} बनाया
 DocType: Delivery Note Item,Against Sales Order,बिक्री के आदेश के खिलाफ
@@ -1619,7 +1562,7 @@
 apps/erpnext/erpnext/accounts/party.py +275,Due Date cannot be before Posting Date,नियत तिथि तिथि पोस्टिंग से पहले नहीं किया जा सकता
 DocType: Website Item Group,Website Item Group,वेबसाइट आइटम समूह
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Duties and Taxes,शुल्कों और करों
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Please enter Reference date,संदर्भ तिथि दर्ज करें
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +312,Please enter Reference date,संदर्भ तिथि दर्ज करें
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} भुगतान प्रविष्टियों द्वारा फिल्टर नहीं किया जा सकता है {1}
 DocType: Item Website Specification,Table for Item that will be shown in Web Site,वेब साइट में दिखाया जाएगा कि आइटम के लिए टेबल
 DocType: Purchase Order Item Supplied,Supplied Qty,आपूर्ति मात्रा
@@ -1627,7 +1570,7 @@
 apps/erpnext/erpnext/config/stock.py +103,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,आइटम के लिहाज से खरीदारी इतिहास
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +152,Red,लाल
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Red,लाल
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +228,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},सीरियल मद के लिए जोड़ा लाने के लिए 'उत्पन्न अनुसूची' पर क्लिक करें {0}
 DocType: Account,Frozen,फ्रोजन
 ,Open Production Orders,ओपन उत्पादन के आदेश
@@ -1642,7 +1585,7 @@
 DocType: Item Attribute,Attribute Name,उत्तरदायी ठहराने के लिए नाम
 apps/erpnext/erpnext/controllers/selling_controller.py +236,Item {0} must be Sales or Service Item in {1},आइटम {0} में बिक्री या सेवा आइटम होना चाहिए {1}
 DocType: Item Group,Show In Website,वेबसाइट में दिखाएँ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +621,Group,समूह
+apps/erpnext/erpnext/public/js/setup_wizard.js +357,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","निम्नलिखित दस्तावेजों डिलिवरी नोट, अवसर, सामग्री अनुरोध, मद, खरीद आदेश, खरीद वाउचर, क्रेता रसीद, कोटेशन, बिक्री चालान, उत्पाद बंडल, बिक्री आदेश, सीरियल नहीं में ब्रांड नाम को ट्रैक करने के लिए"
@@ -1652,6 +1595,7 @@
 DocType: Features Setup,Brands,ब्रांड
 DocType: C-Form Invoice Detail,Invoice No,कोई चालान
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +480,From Purchase Order,खरीद आदेश से
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +92,"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,इस्तीफा पत्र दिनांक
@@ -1659,35 +1603,31 @@
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +137,Not Set,सेट नहीं
 DocType: Communication,Date,तारीख
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,दोहराने ग्राहक राजस्व
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +651,Sit tight while your system is being setup. This may take a few moments.,"आपके सिस्टम सेटअप किया जा रहा है , जबकि ठीक से बैठो . इसमें कुछ समय लग सकता है."
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +115,Sit tight while your system is being setup. This may take a few moments.,"आपके सिस्टम सेटअप किया जा रहा है , जबकि ठीक से बैठो . इसमें कुछ समय लग सकता है."
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +51,{0} ({1}) must have role 'Expense Approver',{0} ({1}) भूमिका की कीमत अनुमोदनकर्ता 'होना चाहिए
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Pair,जोड़ा
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Pair,जोड़ा
 DocType: Bank Reconciliation Detail,Against Account,खाते के खिलाफ
 DocType: Maintenance Schedule Detail,Actual Date,वास्तविक तारीख
 DocType: Item,Has Batch No,बैच है नहीं
 DocType: Delivery Note,Excise Page Number,आबकारी पृष्ठ संख्या
 DocType: Employee,Personal Details,व्यक्तिगत विवरण
 ,Maintenance Schedules,रखरखाव अनुसूचियों
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +44,Embossing,एम्बॉसिंग
 ,Quotation Trends,कोटेशन रुझान
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +139,Item Group not mentioned in item master for item {0},आइटम के लिए आइटम मास्टर में उल्लेख नहीं मद समूह {0}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +302,Debit To account must be a Receivable account,खाते में डेबिट एक प्राप्य खाता होना चाहिए
-apps/erpnext/erpnext/stock/doctype/item/item.py +310,"As Production Order can be made for this item, it must be a stock item.","उत्पादन का आदेश इस मद के लिए बनाया जा सकता है, यह एक शेयर मद होना चाहिए ."
 DocType: Shipping Rule Condition,Shipping Amount,नौवहन राशि
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +140,Joining,एकजूट
-DocType: Authorization Rule,Above Value,ऊपर मूल्य
 ,Pending Amount,लंबित राशि
 DocType: Purchase Invoice Item,Conversion Factor,परिवर्तनकारक तत्व
 DocType: Purchase Order,Delivered,दिया गया
 apps/erpnext/erpnext/config/hr.py +160,Setup incoming server for jobs email id. (e.g. jobs@example.com),जॉब ईमेल आईडी के लिए सेटअप आवक सर्वर . (जैसे jobs@example.com )
 DocType: Purchase Receipt,Vehicle Number,वाहन संख्या
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,"तारीख, जिस पर आवर्ती चालान रोकने के लिए किया जाएगा"
+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,लेखा प्राप्य
 ,Supplier-Wise Sales Analytics,प्रदायक वार बिक्री विश्लेषिकी
 DocType: Address Template,This format is used if country specific format is not found,"देश विशिष्ट प्रारूप नहीं मिला है, तो यह प्रारूप प्रयोग किया जाता है"
 DocType: Custom Field,Custom,रिवाज
 DocType: Production Order,Use Multi-Level BOM,मल्टी लेवल बीओएम का उपयोग करें
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +26,Injection molding,इंजेक्शन मोल्डिंग
 DocType: Bank Reconciliation,Include Reconciled Entries,मेल मिलाप प्रविष्टियां शामिल करें
 apps/erpnext/erpnext/config/accounts.py +41,Tree of finanial accounts.,Finanial खातों का पेड़ .
 DocType: Leave Control Panel,Leave blank if considered for all employee types,रिक्त छोड़ दो अगर सभी कर्मचारी प्रकार के लिए विचार
@@ -1697,30 +1637,28 @@
 apps/frappe/frappe/config/setup.py +130,Printing,मुद्रण
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +114,Expense Claim is pending approval. Only the Expense Approver can update status.,खर्च का दावा अनुमोदन के लिए लंबित है . केवल खर्च अनुमोदक स्थिति अपडेट कर सकते हैं .
 DocType: Purchase Invoice,Additional Discount Amount,अतिरिक्त छूट राशि
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +99,The day(s) on which you are applying for leave are holiday. You need not apply for leave.,आप छुट्टी के लिए आवेदन कर रहे हैं जिस दिन (ओं ) अवकाश हैं . तुम्हें छोड़ के लिए लागू की जरूरत नहीं .
 apps/frappe/frappe/public/js/frappe/misc/utils.js +110,and,और
 DocType: Leave Block List Allow,Leave Block List Allow,छोड़ दो ब्लॉक सूची की अनुमति दें
 apps/erpnext/erpnext/setup/doctype/company/company.py +236,Abbr can not be blank or space,Abbr खाली या स्थान नहीं हो सकता
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +50,Sports,खेल
+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/setup/page/setup_wizard/setup_wizard.js +626,Unit,इकाई
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Unit,इकाई
 apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.py +182,Please set Dropbox access keys in your site config,आपकी साइट config में ड्रॉपबॉक्स का उपयोग चाबियां सेट करें
 apps/erpnext/erpnext/stock/get_item_details.py +113,Please specify Company,कंपनी निर्दिष्ट करें
 ,Customer Acquisition and Loyalty,ग्राहक अधिग्रहण और वफादारी
 DocType: Purchase Receipt,Warehouse where you are maintaining stock of rejected items,वेअरहाउस जहाँ आप को अस्वीकार कर दिया आइटम के शेयर को बनाए रखने रहे हैं
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +408,Your financial year ends on,आपकी वित्तीय वर्ष को समाप्त होता है
+apps/erpnext/erpnext/public/js/setup_wizard.js +156,Your financial year ends on,आपकी वित्तीय वर्ष को समाप्त होता है
 DocType: POS Profile,Price List,कीमत सूची
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +20,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0} अब मूलभूत वित्त वर्ष है . परिवर्तन को प्रभावी बनाने के लिए अपने ब्राउज़र को ताज़ा करें.
 apps/erpnext/erpnext/projects/doctype/project/project.js +47,Expense Claims,खर्चों के दावे
 DocType: Issue,Support,समर्थन
-DocType: Authorization Rule,Approving Role,रोल की स्वीकृति
 ,BOM Search,बीओएम खोज
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +176,Closing (Opening + Totals),समापन (+ योग खोलने)
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +26,Please specify currency in Company,कंपनी में मुद्रा निर्दिष्ट करें
 DocType: Workstation,Wages per hour,प्रति घंटे मजदूरी
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,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.","आदि सीरियल ओपन स्कूल , स्थिति की तरह दिखाएँ / छिपाएँ सुविधाओं"
-apps/erpnext/erpnext/controllers/accounts_controller.py +236,Account {0} is invalid. Account Currency must be {1},खाते {0} अमान्य है। खाता मुद्रा होना चाहिए {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +237,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},UOM रूपांतरण कारक पंक्ति में आवश्यक है {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +53,Clearance date cannot be before check date in row {0},क्लीयरेंस तारीख पंक्ति में चेक की तारीख से पहले नहीं किया जा सकता {0}
 DocType: Salary Slip,Deduction,कटौती
@@ -1739,13 +1677,13 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +82,Item {0} has already been returned,आइटम {0} पहले से ही लौटा दिया गया है
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** वित्त वर्ष ** एक वित्तीय वर्ष का प्रतिनिधित्व करता है। सभी लेखा प्रविष्टियों और अन्य प्रमुख लेनदेन ** ** वित्त वर्ष के खिलाफ ट्रैक किए गए हैं।
 DocType: Opportunity,Customer / Lead Address,ग्राहक / लीड पता
+apps/erpnext/erpnext/stock/doctype/item/item.py +112,Warning: Invalid SSL certificate on attachment {0},चेतावनी: कुर्की पर अवैध एसएसएल प्रमाणपत्र {0}
 DocType: Production Order Operation,Actual Operation Time,वास्तविक ऑपरेशन टाइम
 DocType: Authorization Rule,Applicable To (User),के लिए लागू (उपयोगकर्ता)
 DocType: Purchase Taxes and Charges,Deduct,घटाना
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +170,Job Description,नौकरी का विवरण
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +170,Job Description,नौकरी का विवरण
 DocType: Purchase Order Item,Qty as per Stock UOM,मात्रा स्टॉक UOM के अनुसार
 apps/frappe/frappe/model/rename_doc.py +343,Please select a valid csv file with data,डेटा के साथ एक मान्य सीएसवी फाइल चुनें
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +92,Coating,कोटिंग
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +126,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","सिवाय विशेष अक्षर ""-"" ""।"" ""#"", और ""/"" श्रृंखला के नामकरण में अनुमति नहीं"
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","बिक्री अभियान का ट्रैक रखें। बिक्रीसूत्र, कोटेशन का ट्रैक रखें, बिक्री आदेश आदि अभियानों से निवेश पर लौटें गेज करने के लिए। "
 DocType: Expense Claim,Approver,सरकारी गवाह
@@ -1755,12 +1693,11 @@
 DocType: Supplier Quotation,Manufacturing Manager,विनिर्माण प्रबंधक
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +191,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/hooks.py +84,Shipments,लदान
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +29,Dip molding,डुबकी मोल्डिंग
+apps/erpnext/erpnext/hooks.py +68,Shipments,लदान
 DocType: Purchase Order,To be delivered to customer,ग्राहक के लिए दिया जाना
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,समय लॉग स्थिति प्रस्तुत किया जाना चाहिए.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,सीरियल नहीं {0} किसी भी गोदाम से संबंधित नहीं है
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +650,Setting Up,की स्थापना
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +114,Setting Up,की स्थापना
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,Row # ,पंक्ति #
 DocType: Purchase Invoice,In Words (Company Currency),शब्दों में (कंपनी मुद्रा)
 DocType: Pricing Rule,Supplier,प्रदायक
@@ -1768,7 +1705,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +105,Miscellaneous Expenses,विविध व्यय
 DocType: Global Defaults,Default Company,Default कंपनी
 apps/erpnext/erpnext/controllers/stock_controller.py +166,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,व्यय या अंतर खाता अनिवार्य है मद के लिए {0} यह प्रभावों समग्र शेयर मूल्य के रूप में
-apps/erpnext/erpnext/controllers/accounts_controller.py +354,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","पंक्ति में आइटम {0} के लिए overbill नहीं कर सकते हैं {1} से अधिक {2}। Overbilling, स्टॉक सेटिंग्स में सेट कृपया अनुमति देने के लिए"
+apps/erpnext/erpnext/controllers/accounts_controller.py +355,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","पंक्ति में आइटम {0} के लिए overbill नहीं कर सकते हैं {1} से अधिक {2}। Overbilling, स्टॉक सेटिंग्स में सेट कृपया अनुमति देने के लिए"
 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 +135,User {0} is disabled,प्रयोक्ता {0} अक्षम है
@@ -1781,27 +1718,26 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,{0} is mandatory for Item {1},{0} मद के लिए अनिवार्य है {1}
 DocType: Currency Exchange,From Currency,मुद्रा से
 DocType: DocField,Name,नाम
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +211,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","कम से कम एक पंक्ति में आवंटित राशि, प्रकार का चालान और चालान नंबर का चयन करें"
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +104,Sales Order required for Item {0},आइटम के लिए आवश्यक बिक्री आदेश {0}
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +158,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","कम से कम एक पंक्ति में आवंटित राशि, प्रकार का चालान और चालान नंबर का चयन करें"
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +107,Sales Order required for Item {0},आइटम के लिए आवश्यक बिक्री आदेश {0}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +43,Amounts not reflected in system,प्रणाली में परिलक्षित नहीं मात्रा में
 DocType: Purchase Invoice Item,Rate (Company Currency),दर (कंपनी मुद्रा)
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +40,Others,दूसरों
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +40,Others,दूसरों
 apps/erpnext/erpnext/templates/includes/product_page.js +80,Cannot find a matching Item. Please select some other value for {0}.,एक मेल आइटम नहीं मिल सकता। के लिए {0} कुछ अन्य मूल्य का चयन करें।
 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/frappe/frappe/core/doctype/doctype/boilerplate/controller_list.html +31,Completed,पूरा
 DocType: Web Form,Select DocType,Doctype का चयन करें
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +104,Broaching,Broaching
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +12,Banking,बैंकिंग
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,बैंकिंग
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +38,Please click on 'Generate Schedule' to get schedule,अनुसूची पाने के लिए 'उत्पन्न अनुसूची' पर क्लिक करें
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +283,New Cost Center,नई लागत केंद्र
 DocType: Bin,Ordered Quantity,आदेशित मात्रा
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +397,"e.g. ""Build tools for builders""",उदाहरणार्थ
+apps/erpnext/erpnext/public/js/setup_wizard.js +145,"e.g. ""Build tools for builders""",उदाहरणार्थ
 DocType: Quality Inspection,In Process,इस प्रक्रिया में
 DocType: Authorization Rule,Itemwise Discount,Itemwise डिस्काउंट
 DocType: Purchase Order Item,Reference Document Type,संदर्भ दस्तावेज़ प्रकार
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +318,{0} against Sales Order {1},{0} बिक्री आदेश के खिलाफ {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +320,{0} against Sales Order {1},{0} बिक्री आदेश के खिलाफ {1}
 DocType: Account,Fixed Asset,स्थायी परिसम्पत्ति
 apps/erpnext/erpnext/config/stock.py +283,Serialized Inventory,श्रृंखलाबद्ध इन्वेंटरी
 DocType: Activity Type,Default Billing Rate,डिफ़ॉल्ट बिलिंग दर
@@ -1816,14 +1752,13 @@
 DocType: Purchase Invoice Item,Page Break,पृष्ठातर
 DocType: Production Order Operation,Pending,अपूर्ण
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,एक विशिष्ट कर्मचारी की छुट्टी आवेदनों को स्वीकृत कर सकते हैं जो प्रयोक्ता
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +33,You cannot change default UOM of Variant. To change default UOM for Variant change default UOM of the Template,आप संस्करण की डिफ़ॉल्ट UoM नहीं बदल सकते। टेम्पलेट के संस्करण परिवर्तन डिफ़ॉल्ट UoM के लिए डिफ़ॉल्ट UoM को बदलने के लिए
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +50,Office Equipments,कार्यालय उपकरण
 DocType: Purchase Invoice Item,Qty,मात्रा
 DocType: Fiscal Year,Companies,कंपनियां
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +24,Electronics,इलेक्ट्रानिक्स
+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/support/doctype/maintenance_visit/maintenance_visit.js +18,From Maintenance Schedule,रखरखाव अनुसूची से
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +56,Full-time,पूर्णकालिक
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +56,Full-time,पूर्णकालिक
 DocType: Purchase Invoice,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.","आप बिक्री करों और शुल्कों टेम्पलेट में एक मानक टेम्पलेट बनाया है, एक को चुनें और नीचे दिए गए बटन पर क्लिक करें।"
@@ -1835,11 +1770,12 @@
 DocType: Job Applicant,Job Opening,नौकरी खोलने
 DocType: Payment Reconciliation,Payment Reconciliation,भुगतान सुलह
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +154,Please select Incharge Person's name,प्रभारी व्यक्ति के नाम का चयन करें
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +51,Technology,प्रौद्योगिकी
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,प्रौद्योगिकी
 DocType: Offer Letter,Offer Letter,प्रस्ताव पत्र
 apps/erpnext/erpnext/config/manufacturing.py +51,Generate Material Requests (MRP) and Production Orders.,सामग्री (एमआरपी) के अनुरोध और उत्पादन के आदेश उत्पन्न.
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +68,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.","बच्चे नोड्स जोड़ने के लिए, पेड़ लगाने और आप अधिक नोड्स जोड़ना चाहते हैं जिसके तहत नोड पर क्लिक करें."
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +102,Credit To account must be a Payable account,खाते में जमा एक देय खाता होना चाहिए
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +233,BOM recursion: {0} cannot be parent or child of {2},बीओएम रिकर्शन : {0} माता पिता या के बच्चे नहीं हो सकता {2}
@@ -1852,10 +1788,8 @@
 DocType: Item,Customer Item Codes,ग्राहक आइटम संहिताओं
 DocType: Opportunity,Lost Reason,खोया कारण
 apps/erpnext/erpnext/config/accounts.py +68,Create Payment Entries against Orders or Invoices.,आदेश या चालान के खिलाफ भुगतान प्रविष्टियों को बनाने।
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +141,Welding,वेल्डिंग
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +40,New Stock UOM is required,नया स्टॉक UOM आवश्यक है
 DocType: Quality Inspection,Sample Size,नमूने का आकार
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +443,All items have already been invoiced,सभी आइटम पहले से चालान कर दिया गया है
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +446,All items have already been invoiced,सभी आइटम पहले से चालान कर दिया गया है
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',&#39;केस नंबर से&#39; एक वैध निर्दिष्ट करें
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +287,Further cost centers can be made under Groups but entries can be made against non-Groups,इसके अलावा लागत केन्द्रों समूह के तहत बनाया जा सकता है लेकिन प्रविष्टियों गैर समूहों के खिलाफ बनाया जा सकता है
 DocType: Project,External,बाहरी
@@ -1867,8 +1801,7 @@
 DocType: Bin,Actual Quantity,वास्तविक मात्रा
 DocType: Shipping Rule,example: Next Day Shipping,उदाहरण: अगले दिन शिपिंग
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,नहीं मिला सीरियल नहीं {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +563,Your Customers,अपने ग्राहकों
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +27,Compression molding,संपीड़न मोल्डिंग
+apps/erpnext/erpnext/public/js/setup_wizard.js +303,Your Customers,अपने ग्राहकों
 DocType: Leave Block List Date,Block Date,तिथि ब्लॉक
 DocType: Sales Order,Not Delivered,नहीं वितरित
 ,Bank Clearance Summary,बैंक क्लीयरेंस सारांश
@@ -1889,10 +1822,10 @@
 DocType: SMS Log,Sent To,भेजा
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +28,Make Sales Invoice,बिक्री चालान बनाएं
 DocType: Company,For Reference Only.,केवल संदर्भ के लिए।
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +29,Invalid {0}: {1},अवैध {0}: {1}
+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,क्षमता की योजना
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +49,'From Date' is required,'तिथि से ' आवश्यक है
+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,नए कार्यस्थल
@@ -1907,7 +1840,7 @@
 DocType: Serial No,Delivery Time,सुपुर्दगी समय
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,के आधार पर बूढ़े
 DocType: Item,End of Life,जीवन का अंत
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +41,Travel,यात्रा
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +41,Travel,यात्रा
 DocType: Leave Block List,Allow Users,उपयोगकर्ताओं को अनुमति दें
 DocType: Purchase Order,Customer Mobile No,ग्राहक मोबाइल नं
 DocType: Sales Invoice,Recurring,आवर्ती
@@ -1921,7 +1854,7 @@
 DocType: Naming Series,User must always select,उपयोगकर्ता हमेशा का चयन करना होगा
 DocType: Stock Settings,Allow Negative Stock,नकारात्मक स्टॉक की अनुमति दें
 DocType: Installation Note,Installation Note,स्थापना नोट
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +541,Add Taxes,करों जोड़ें
+apps/erpnext/erpnext/public/js/setup_wizard.js +283,Add Taxes,करों जोड़ें
 ,Financial Analytics,वित्तीय विश्लेषिकी
 DocType: Quality Inspection,Verified By,द्वारा सत्यापित
 DocType: Address,Subsidiary,सहायक
@@ -1931,7 +1864,6 @@
 DocType: System Settings,In Hours,घंटे में
 DocType: Process Payroll,Create Salary Slip,वेतनपर्ची बनाएँ
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Expected balance as per bank,बैंक के अनुसार अपेक्षित संतुलन
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +115,Buffing,Buffing
 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,कर्मचारी
@@ -1948,11 +1880,11 @@
 DocType: Rename Tool,File to Rename,नाम बदलने के लिए फ़ाइल
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +176,Purchse Order number required for Item {0},Purchse आदेश संख्या मद के लिए आवश्यक {0}
 apps/erpnext/erpnext/public/js/controllers/transaction.js +136,Show Payments,दिखाएँ भुगतान
-apps/erpnext/erpnext/controllers/buying_controller.py +245,Specified BOM {0} does not exist for Item {1},आइटम के लिए मौजूद नहीं है निर्दिष्ट बीओएम {0} {1}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +202,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,रखरखाव अनुसूची {0} इस बिक्री आदेश रद्द करने से पहले रद्द कर दिया जाना चाहिए
+apps/erpnext/erpnext/controllers/buying_controller.py +236,Specified BOM {0} does not exist for Item {1},आइटम के लिए मौजूद नहीं है निर्दिष्ट बीओएम {0} {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,रखरखाव अनुसूची {0} इस बिक्री आदेश रद्द करने से पहले रद्द कर दिया जाना चाहिए
 apps/frappe/frappe/desk/page/backups/backups.html +13,Size,आकार
 DocType: Notification Control,Expense Claim Approved,व्यय दावे को मंजूरी
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +113,Pharmaceutical,औषधि
+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,बिक्री आदेश आवश्यक
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +30,Create Customer,ग्राहक बनाएँ
@@ -1962,7 +1894,6 @@
 DocType: Quality Inspection Reading,Reading 9,9 पढ़ना
 DocType: Supplier,Is Frozen,जम गया है
 DocType: Buying Settings,Buying Settings,सेटिंग्स ख़रीदना
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +122,Mass finishing,मास परिष्करण
 DocType: Stock Entry Detail,BOM No. for a Finished Good Item,एक समाप्त अच्छा आइटम के लिए बीओएम सं.
 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),बिक्री ईमेल आईडी के लिए सेटअप आवक सर्वर . (जैसे sales@example.com )
@@ -1970,7 +1901,7 @@
 DocType: Payment Tool,Payment Account,भुगतान खाता
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +713,Please specify Company to proceed,कंपनी आगे बढ़ने के लिए निर्दिष्ट करें
 apps/frappe/frappe/public/js/frappe/model/indicator.js +30,Draft,मसौदा
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +46,Compensatory Off,प्रतिपूरक बंद
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Compensatory Off,प्रतिपूरक बंद
 DocType: Quality Inspection Reading,Accepted,स्वीकार किया
 DocType: User,Female,महिला
 DocType: Journal Entry Account,Debit in Account Currency,खाते की मुद्रा में डेबिट
@@ -1982,7 +1913,7 @@
 DocType: Shipping Rule,Shipping Rule Label,नौवहन नियम लेबल
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +209,Raw Materials cannot be blank.,कच्चे माल खाली नहीं किया जा सकता।
 DocType: Newsletter,Test,परीक्षण
-apps/erpnext/erpnext/stock/doctype/item/item.py +364,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +368,"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'","मौजूदा स्टॉक लेनदेन आप के मूल्यों को बदल नहीं सकते \ इस मद के लिए वहाँ के रूप में &#39;सीरियल नहीं है&#39;, &#39;बैच है,&#39; नहीं &#39;शेयर मद है&#39; और &#39;मूल्यांकन पद्धति&#39;"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +448,Quick Journal Entry,त्वरित जर्नल प्रविष्टि
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +92,You can not change rate if BOM mentioned agianst any item,बीओएम किसी भी आइटम agianst उल्लेख अगर आप दर में परिवर्तन नहीं कर सकते
@@ -1993,13 +1924,14 @@
 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.,अलग उत्पादन का आदेश प्रत्येक समाप्त अच्छा आइटम के लिए बनाया जाएगा.
 DocType: Purchase Invoice,Terms and Conditions1,नियम और Conditions1
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +18,Complete Setup,पूरा सेटअप
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard_page.html +18,Complete Setup,पूरा सेटअप
 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),नामंज़ूर भिन्न करने के लिए इसे चेक करें. (ओपन स्कूल के लिए)
 apps/erpnext/erpnext/config/crm.py +96,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 +57,Total Absent,कुल अनुपस्थित
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +746,Item or Warehouse for row {0} does not match Material Request,पंक्ति के लिए आइटम या वेयरहाउस {0} सामग्री अनुरोध मेल नहीं खाता
@@ -2024,16 +1956,15 @@
 DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),मूल दर (स्टॉक UoM के अनुसार)
 DocType: SMS Log,No of Requested SMS,अनुरोधित एसएमएस की संख्या
 DocType: Campaign,Campaign-.####,अभियान . # # # #
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +55,Piercing,छेदना
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,अगला कदम
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +117,Contract End Date must be greater than Date of Joining,अनुबंध समाप्ति तिथि शामिल होने की तिथि से अधिक होना चाहिए
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,एक आयोग के लिए कंपनियों के उत्पादों को बेचता है एक तीसरे पक्ष जो वितरक / डीलर / कमीशन एजेंट / सहबद्ध / पुनर्विक्रेता।
 DocType: Customer Group,Has Child Node,बाल नोड है
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{0} against Purchase Order {1},{0} खरीद आदेश के खिलाफ {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +332,{0} against Purchase Order {1},{0} खरीद आदेश के खिलाफ {1}
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","स्थैतिक यूआरएल यहाँ मानकों (Eg. प्रेषक = ERPNext, username = 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/page/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
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +110,Photochemical machining,प्रकाश-रसायनिक मशीनिंग
 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.
 
 #### Note
@@ -2079,7 +2010,7 @@
 DocType: Purchase Receipt Item,Recd Quantity,रिसी डी मात्रा
 DocType: Email Account,Email Ids,ईमेल आईडी
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},अधिक आइटम उत्पादन नहीं कर सकते {0} से बिक्री आदेश मात्रा {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +471,Stock Entry {0} is not submitted,स्टॉक एंट्री {0} प्रस्तुत नहीं किया गया है
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +473,Stock Entry {0} is not submitted,स्टॉक एंट्री {0} प्रस्तुत नहीं किया गया है
 DocType: Payment Reconciliation,Bank / Cash Account,बैंक / रोकड़ लेखा
 DocType: Tax Rule,Billing City,बिलिंग शहर
 DocType: Global Defaults,Hide Currency Symbol,मुद्रा प्रतीक छुपाएँ
@@ -2095,7 +2026,7 @@
 DocType: Purchase Invoice,Currency and Price List,मुद्रा और मूल्य सूची
 DocType: Opportunity,Customer / Lead Name,ग्राहक / लीड नाम
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +63,Clearance Date not mentioned,क्लीयरेंस तिथि का उल्लेख नहीं
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +71,Production,उत्पादन
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Production,उत्पादन
 DocType: Item,Allow Production Order,उत्पादन का आदेश दें
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +60,Row {0}:Start Date must be before End Date,पंक्ति {0} : आरंभ तिथि समाप्ति तिथि से पहले होना चाहिए
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),कुल मात्रा)
@@ -2108,7 +2039,7 @@
 apps/erpnext/erpnext/utilities/doctype/address/address.py +113,My Addresses,मेरे पते
 DocType: Stock Ledger Entry,Outgoing Rate,आउटगोइंग दर
 apps/erpnext/erpnext/config/hr.py +100,Organization branch master.,संगठन शाखा मास्टर .
-apps/erpnext/erpnext/controllers/accounts_controller.py +237, or ,या
+apps/erpnext/erpnext/controllers/accounts_controller.py +238, 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 से ऊपर
@@ -2135,6 +2066,7 @@
 DocType: Stock Entry Detail,Serial No / Batch,धारावाहिक नहीं / बैच
 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 +213,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',रखरखाव अनुसूची सभी मदों के लिए उत्पन्न नहीं है . 'उत्पन्न अनुसूची' पर क्लिक करें
 ,To Produce,निर्माण करने के लिए
 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} भी शामिल किया जाना चाहिए"
@@ -2142,10 +2074,7 @@
 DocType: Bin,Reserved Quantity,आरक्षित मात्रा
 DocType: Landed Cost Voucher,Purchase Receipt Items,रसीद वस्तुओं की खरीद
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,अनुकूलित प्रपत्र
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +62,Cutting,काटना
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +69,Flattening,सपाट
 DocType: Account,Income Account,आय खाता
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +22,Molding,ढलाई
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +632,Delivery,वितरण
 DocType: Stock Reconciliation Item,Current Qty,वर्तमान मात्रा
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",धारा लागत में &quot;सामग्री के आधार पर दर&quot; देखें
@@ -2155,20 +2084,19 @@
 apps/frappe/frappe/desk/moduleview.py +61,Documents,दस्तावेज़
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +17,Ref,संदर्भ .......................
 DocType: Cost Center,Cost Center,लागत केंद्र
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.js +48,Voucher #,वाउचर #
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +36,Voucher #,वाउचर #
 DocType: Notification Control,Purchase Order Message,खरीद आदेश संदेश
 DocType: Tax Rule,Shipping Country,शिपिंग देश
 DocType: Upload Attendance,Upload HTML,HTML अपलोड
-apps/erpnext/erpnext/controllers/accounts_controller.py +391,"Total advance ({0}) against Order {1} cannot be greater \
+apps/erpnext/erpnext/controllers/accounts_controller.py +392,"Total advance ({0}) against Order {1} cannot be greater \
 				than the Grand Total ({2})","कुल अग्रिम ({0}) आदेश के खिलाफ {1} \
  अधिक से अधिक नहीं हो सकता महायोग से ({2})"
 DocType: Employee,Relieving Date,तिथि राहत
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +12,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.","मूल्य निर्धारण नियम कुछ मानदंडों के आधार पर, मूल्य सूची / छूट प्रतिशत परिभाषित अधिलेखित करने के लिए किया जाता है."
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,वेयरहाउस केवल स्टॉक एंट्री / डिलिवरी नोट / खरीद रसीद के माध्यम से बदला जा सकता है
 DocType: Employee Education,Class / Percentage,/ कक्षा प्रतिशत
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +92,Head of Marketing and Sales,मार्केटिंग और सेल्स के प्रमुख
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +31,Income Tax,आयकर
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +157,Laser engineered net shaping,लेजर शुद्ध आकार देने इंजीनियर
+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.,ट्रैक उद्योग प्रकार के द्वारा होता है .
 DocType: Item Supplier,Item Supplier,आइटम प्रदायक
@@ -2191,31 +2119,28 @@
 DocType: Stock Ledger Entry,Actual Qty After Transaction,लेन - देन के बाद वास्तविक मात्रा
 ,Pending SO Items For Purchase Request,खरीद के अनुरोध के लिए लंबित है तो आइटम
 DocType: Supplier,Billing Currency,बिलिंग मुद्रा
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +148,Extra Large,एक्स्ट्रा लार्ज
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,Extra Large,एक्स्ट्रा लार्ज
 ,Profit and Loss Statement,लाभ एवं हानि के विवरण
 DocType: Bank Reconciliation Detail,Cheque Number,चेक संख्या
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +43,Pressing,दबाव
 DocType: Payment Tool Detail,Payment Tool Detail,भुगतान टूल विस्तार
 ,Sales Browser,बिक्री ब्राउज़र
 DocType: Journal Entry,Total Credit,कुल क्रेडिट
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +474,Warning: Another {0} # {1} exists against stock entry {2},चेतावनी: एक और {0} # {1} शेयर प्रविष्टि के खिलाफ मौजूद है {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +459,Local,स्थानीय
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +476,Warning: Another {0} # {1} exists against stock entry {2},चेतावनी: एक और {0} # {1} शेयर प्रविष्टि के खिलाफ मौजूद है {2}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +397,Local,स्थानीय
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),ऋण और अग्रिम ( संपत्ति)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,देनदार
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +147,Large,बड़ा
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +23,No employee found!,कोई कर्मचारी पाया !
+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 +152,Please mention no of visits required,कृपया उल्लेख आवश्यक यात्राओं की कोई
 DocType: Purchase Order,Customer Address Display,ग्राहक पता प्रदर्शन
 DocType: Stock Settings,Default Valuation Method,डिफ़ॉल्ट मूल्यन विधि
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +127,Polishing,चमकाने
 DocType: Production Order Operation,Planned Start Time,नियोजित प्रारंभ समय
 apps/erpnext/erpnext/config/accounts.py +63,Close Balance Sheet and book Profit or Loss.,बंद बैलेंस शीट और पुस्तक लाभ या हानि .
-apps/erpnext/erpnext/stock/doctype/item/item.py +661,"Default Unit of Measure for Item {0} cannot be changed directly because \
+apps/erpnext/erpnext/stock/doctype/item/item.py +665,"Default Unit of Measure for Item {0} cannot be changed directly because \
 			you have already made some transaction(s) with another UOM. To change default UOM, \
 			use 'UOM Replace Utility' tool under Stock module.","आप पहले से ही एक और UoM के साथ कुछ लेन-देन (एस) बना दिया है क्योंकि \ मद के लिए माप की मूलभूत इकाई {0} सीधे नहीं बदला जा सकता। डिफ़ॉल्ट UoM को बदलने के लिए, \ उपयोग स्टॉक मॉड्यूल के तहत उपकरण &#39;UoM उपयोगिता बदलें&#39;।"
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,विनिमय दर दूसरे में एक मुद्रा में परिवर्तित करने के लिए निर्दिष्ट करें
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +146,Quotation {0} is cancelled,कोटेशन {0} को रद्द कर दिया गया है
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +141,Quotation {0} is cancelled,कोटेशन {0} को रद्द कर दिया गया है
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,कुल बकाया राशि
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} was on leave on {1}. Cannot mark attendance.,कर्मचारी {0} {1} को छुट्टी पर था . उपस्थिति को चिह्नित नहीं किया जा सकता .
 DocType: Sales Partner,Targets,लक्ष्य
@@ -2226,7 +2151,6 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +158,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,कंप्यूटर्स
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +112,Electro-chemical grinding,विद्युत रासायनिक पीस
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +14,This is a root customer group and cannot be edited.,यह एक रूट ग्राहक समूह है और संपादित नहीं किया जा सकता है .
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +39,Please setup your chart of accounts before you start Accounting Entries,आप लेखांकन प्रविष्टियों शुरू होने से पहले सेटअप खातों की चार्ट कृपया
 DocType: Purchase Invoice,Ignore Pricing Rule,मूल्य निर्धारण नियम की अनदेखी
@@ -2284,7 +2208,6 @@
 DocType: Maintenance Visit,Purposes,उद्देश्यों
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +103,Atleast one item should be entered with negative quantity in return document,कम से कम एक आइटम वापसी दस्तावेज़ में नकारात्मक मात्रा के साथ दर्ज किया जाना चाहिए
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +67,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","ऑपरेशन {0} कार्य केंद्र में किसी भी उपलब्ध काम के घंटे से अधिक समय तक {1}, कई आपरेशनों में आपरेशन तोड़ने के नीचे"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +134,Electrochemical machining,विद्युत मशीनिंग
 ,Requested,निवेदित
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +66,No Remarks,कोई टिप्पणी
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +13,Overdue,अतिदेय
@@ -2293,7 +2216,7 @@
 DocType: Monthly Distribution,Distribution Name,वितरण नाम
 DocType: Features Setup,Sales and Purchase,बिक्री और खरीद
 DocType: Supplier Quotation Item,Material Request No,सामग्री अनुरोध नहीं
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +218,Quality Inspection required for Item {0},आइटम के लिए आवश्यक गुणवत्ता निरीक्षण {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +221,Quality Inspection required for Item {0},आइटम के लिए आवश्यक गुणवत्ता निरीक्षण {0}
 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),शुद्ध दर (कंपनी मुद्रा)
@@ -2311,9 +2234,8 @@
 apps/erpnext/erpnext/accounts/report/financial_statements.py +16,Fiscal Year {0} not found.,वित्त वर्ष {0} नहीं मिला।
 DocType: Bank Reconciliation,Get Relevant Entries,प्रासंगिक प्रविष्टियां प्राप्त करें
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +407,Accounting Entry for Stock,शेयर के लिए लेखा प्रविष्टि
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +64,Coining,Coining
 DocType: Sales Invoice,Sales Team1,Team1 बिक्री
-apps/erpnext/erpnext/stock/doctype/item/item.py +412,Item {0} does not exist,आइटम {0} मौजूद नहीं है
+apps/erpnext/erpnext/stock/doctype/item/item.py +416,Item {0} does not exist,आइटम {0} मौजूद नहीं है
 DocType: Sales Invoice,Customer Address,ग्राहक पता
 apps/frappe/frappe/desk/query_report.py +136,Total,संपूर्ण
 DocType: Purchase Invoice,Apply Additional Discount On,अतिरिक्त छूट पर लागू होते हैं
@@ -2325,14 +2247,13 @@
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),सबसे कम राशि के बाद टैक्स राशि (कंपनी मुद्रा)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +149,Target warehouse is mandatory for row {0},लक्ष्य गोदाम पंक्ति के लिए अनिवार्य है {0}
 DocType: Quality Inspection,Quality Inspection,गुणवत्ता निरीक्षण
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +144,Extra Small,अतिरिक्त छोटा
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +20,Spray forming,गठन स्प्रे
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Extra Small,अतिरिक्त छोटा
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +458,Warning: Material Requested Qty is less than Minimum Order Qty,चेतावनी: मात्रा अनुरोध सामग्री न्यूनतम आदेश मात्रा से कम है
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +191,Account {0} is frozen,खाते {0} जमे हुए है
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,संगठन से संबंधित खातों की एक अलग चार्ट के साथ कानूनी इकाई / सहायक।
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +29,"Food, Beverage & Tobacco","खाद्य , पेय और तंबाकू"
+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,पी एल या बी एस
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,Can only make payment against unbilled {0},केवल विरुद्ध भुगतान कर सकते हैं unbilled {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +531,Can only make payment against unbilled {0},केवल विरुद्ध भुगतान कर सकते हैं unbilled {0}
 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,उपपट्टा
@@ -2343,19 +2264,18 @@
 DocType: Item,Manufacturer Part Number,निर्माता भाग संख्या
 DocType: Production Order Operation,Estimated Time and Cost,अनुमानित समय और लागत
 DocType: Bin,Bin,बिन
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +50,Nosing,नाउज़िंग
 DocType: SMS Log,No of Sent SMS,भेजे गए एसएमएस की संख्या
 DocType: Account,Company,कंपनी
 DocType: Account,Expense Account,व्यय लेखा
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +49,Software,सॉफ्टवेयर
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +151,Colour,रंगीन
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +49,Software,सॉफ्टवेयर
+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",&quot;नहीं&quot; और &quot;बिक्री मद है&quot; &quot;स्टॉक मद है&quot; कहाँ है &quot;हाँ&quot; है आइटम का चयन करें और कोई अन्य उत्पाद बंडल नहीं है कृपया
 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 +281,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 +134,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 +145,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,प्रवेश का नाम बदलें
@@ -2365,7 +2285,7 @@
 apps/erpnext/erpnext/controllers/recurring_document.py +162,Please select {0},कृपया चुनें {0}
 DocType: C-Form,C-Form No,कोई सी - फार्म
 DocType: BOM,Exploded_items,Exploded_items
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +95,Researcher,अनुसंधानकर्ता
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Researcher,अनुसंधानकर्ता
 apps/frappe/frappe/custom/doctype/customize_form/customize_form.js +88,Update,अद्यतन
 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 +23,Name or Email is mandatory,नाम या ईमेल अनिवार्य है
@@ -2374,11 +2294,10 @@
 DocType: Employee,Exit,निकास
 apps/erpnext/erpnext/accounts/doctype/account/account.py +134,Root Type is mandatory,रूट प्रकार अनिवार्य है
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +295,Serial No {0} created,धारावाहिक नहीं {0} बनाया
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +125,Vibratory finishing,थरथानेवाला परिष्करण
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes",ग्राहकों की सुविधा के लिए इन कोड प्रिंट स्वरूपों में चालान और वितरण नोट की तरह इस्तेमाल किया जा सकता है
 DocType: Employee,You can enter any date manually,आप किसी भी तारीख को मैन्युअल रूप से दर्ज कर सकते हैं
 DocType: Sales Invoice,Advertisement,विज्ञापन
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +165,Probationary Period,परिवीक्षाधीन अवधि
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Probationary Period,परिवीक्षाधीन अवधि
 DocType: Customer Group,Only leaf nodes are allowed in transaction,केवल पत्ता नोड्स के लेनदेन में की अनुमति दी जाती है
 DocType: Expense Claim,Expense Approver,व्यय अनुमोदनकर्ता
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,खरीद रसीद आइटम की आपूर्ति
@@ -2386,19 +2305,16 @@
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +17,To Datetime,Datetime करने के लिए
 DocType: SMS Settings,SMS Gateway URL,एसएमएस गेटवे URL
 apps/erpnext/erpnext/config/crm.py +53,Logs for maintaining sms delivery status,एसएमएस वितरण की स्थिति बनाए रखने के लिए लॉग
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +137,Grinding,पिसाई
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +34,Shrink wrapping,लपेटकर हटना
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +36,Pending Activities,गतिविधियों में लंबित
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,Confirmed,पुष्टि
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier > Supplier Type,प्रदायक> प्रदायक प्रकार
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +127,Please enter relieving date.,तारीख से राहत दर्ज करें.
 apps/erpnext/erpnext/controllers/trends.py +137,Amt,राशि
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' can be submitted,केवल प्रस्तुत किया जा सकता है 'स्वीकृत' स्थिति के साथ आवेदन छोड़ दो
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +51,Only Leave Applications with status 'Approved' can be submitted,केवल प्रस्तुत किया जा सकता है 'स्वीकृत' स्थिति के साथ आवेदन छोड़ दो
 apps/erpnext/erpnext/utilities/doctype/address/address.py +21,Address Title is mandatory.,पता शीर्षक अनिवार्य है .
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,अभियान का नाम दर्ज़ अगर जांच के स्रोत अभियान
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +38,Newspaper Publishers,अखबार के प्रकाशक
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +38,Newspaper Publishers,अखबार के प्रकाशक
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,वित्तीय वर्ष का चयन करें
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +88,Smelting,प्रगलन
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,स्तर पुनः क्रमित करें
 DocType: Attendance,Attendance Date,उपस्थिति तिथि
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,वेतन गोलमाल अर्जन और कटौती पर आधारित है.
@@ -2413,16 +2329,15 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +414,[Error],[त्रुटि]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,शब्दों में दिखाई हो सकता है एक बार तुम बिक्री आदेश को बचाने के लिए होगा.
 ,Employee Birthday,कर्मचारी जन्मदिन
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +55,Venture Capital,वेंचर कैपिटल
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,वेंचर कैपिटल
 DocType: UOM,Must be Whole Number,पूर्ण संख्या होनी चाहिए
 DocType: Leave Control Panel,New Leaves Allocated (In Days),नई पत्तियों आवंटित (दिनों में)
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +51,Serial No {0} does not exist,धारावाहिक नहीं {0} मौजूद नहीं है
 DocType: Pricing Rule,Discount Percentage,डिस्काउंट प्रतिशत
 DocType: Payment Reconciliation Invoice,Invoice Number,चालान क्रमांक
-apps/erpnext/erpnext/hooks.py +70,Orders,आदेश
+apps/erpnext/erpnext/hooks.py +54,Orders,आदेश
 DocType: Leave Control Panel,Employee Type,कर्मचारी प्रकार
 DocType: Employee Leave Approver,Leave Approver,अनुमोदक छोड़ दो
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +70,Swaging,Swaging
 DocType: Manufacturing Settings,Material Transferred for Manufacture,सामग्री निर्माण के लिए हस्तांतरित
 DocType: Expense Claim,"A user with ""Expense Approver"" role","""व्यय अनुमोदनकर्ता"" भूमिका के साथ एक उपयोगकर्ता"
 ,Issued Items Against Production Order,उत्पादन के आदेश के खिलाफ जारी किए गए आइटम
@@ -2434,7 +2349,6 @@
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +62,Cost Center with existing transactions can not be converted to group,मौजूदा लेनदेन के साथ लागत केंद्र समूह परिवर्तित नहीं किया जा सकता है
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Depreciation,ह्रास
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),प्रदायक (ओं)
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +29,Invalid period,अमान्य अवधि
 DocType: Customer,Credit Limit,साख सीमा
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,लेन-देन प्रकार का चयन करें
 DocType: GL Entry,Voucher No,कोई वाउचर
@@ -2444,9 +2358,9 @@
 DocType: Customer,Address and Contact,पता और संपर्क
 DocType: Customer,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}"
 apps/erpnext/erpnext/accounts/party.py +284,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),नोट: कारण / संदर्भ तिथि {0} दिन द्वारा अनुमति ग्राहक क्रेडिट दिनों से अधिक (ओं)
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +621,Maint. Schedule,Maint। अनुसूची
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +108,Abrasive jet machining,घर्षण जेट मशीनिंग
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +632,Maint. Schedule,Maint। अनुसूची
 DocType: Stock Settings,Freeze Stock Entries,स्टॉक प्रविष्टियां रुक
 DocType: Website Settings,Website Settings,वेबसाइट सेटिंग
 DocType: Item,Reorder level based on Warehouse,गोदाम के आधार पर पुन: व्यवस्थित स्तर
@@ -2463,7 +2377,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +75,Show Stock Entries,दिखाएँ स्टॉक प्रविष्टियां
 ,Is Primary Address,प्राथमिक पता है
 DocType: Production Order,Work-in-Progress Warehouse,कार्य में प्रगति गोदाम
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +308,Reference #{0} dated {1},संदर्भ # {0} दिनांक {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Reference #{0} dated {1},संदर्भ # {0} दिनांक {1}
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +13,Manage Addresses,पतों का प्रबंधन
 DocType: Pricing Rule,Item Code,आइटम कोड
 DocType: Production Planning Tool,Create Production Orders,उत्पादन के आदेश बनाएँ
@@ -2472,7 +2386,7 @@
 DocType: Lead,Market Segment,बाजार खंड
 DocType: Communication,Phone,फ़ोन
 DocType: Employee Internal Work History,Employee Internal Work History,कर्मचारी आंतरिक कार्य इतिहास
-apps/erpnext/erpnext/public/js/account_tree_grid.js +50,Closing (Dr),समापन (डॉ.)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +221,Closing (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.,लेनदेन को बेचने के लिए टैक्स टेम्पलेट .
@@ -2488,8 +2402,8 @@
 ,Billed Amount,बिल की राशि
 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 +129,Material Request {0} is cancelled or stopped,सामग्री अनुरोध {0} को रद्द कर दिया है या बंद कर दिया गया है
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +641,Add a few sample records,कुछ नमूना रिकॉर्ड को जोड़ें
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +133,Material Request {0} is cancelled or stopped,सामग्री अनुरोध {0} को रद्द कर दिया है या बंद कर दिया गया है
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Add a few sample records,कुछ नमूना रिकॉर्ड को जोड़ें
 apps/erpnext/erpnext/config/hr.py +210,Leave Management,प्रबंधन छोड़ दो
 DocType: Event,Groups,समूह
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,खाता द्वारा समूह
@@ -2502,38 +2416,34 @@
 DocType: Features Setup,Sales Extras,बिक्री अतिरिक्त
 apps/erpnext/erpnext/accounts/utils.py +344,{0} budget for Account {1} against Cost Center {2} will exceed by {3},{0} खाते के लिए बजट {1} लागत केंद्र के खिलाफ {2} {3} से अधिक होगा
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +236,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","यह स्टॉक सुलह एक खोलने एंट्री के बाद से अंतर खाते, एक एसेट / दायित्व प्रकार खाता होना चाहिए"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +138,Purchase Order number required for Item {0},क्रय आदेश संख्या मद के लिए आवश्यक {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Order number required for Item {0},क्रय आदेश संख्या मद के लिए आवश्यक {0}
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date','तिथि तक' 'तिथि से'  के बाद होनी चाहिए
 ,Stock Projected Qty,शेयर मात्रा अनुमानित
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +147,Customer {0} does not belong to project {1},ग्राहक {0} परियोजना से संबंधित नहीं है {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +150,Customer {0} does not belong to project {1},ग्राहक {0} परियोजना से संबंधित नहीं है {1}
 DocType: Sales Order,Customer's Purchase Order,ग्राहक के क्रय आदेश
 DocType: Warranty Claim,From Company,कंपनी से
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,मूल्य या मात्रा
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Minute,मिनट
+apps/erpnext/erpnext/public/js/setup_wizard.js +363,Minute,मिनट
 DocType: Purchase Invoice,Purchase Taxes and Charges,खरीद कर और शुल्क
 ,Qty to Receive,प्राप्त करने के लिए मात्रा
 DocType: Leave Block List,Leave Block List Allowed,छोड़ दो ब्लॉक सूची रख सकते है
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +61,Conversion factor cannot be in fractions,रूपांतरण कारक भागों में नहीं किया जा सकता
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +358,You will use it to Login,यदि आप लॉग इन करने के लिए इसका इस्तेमाल करेंगे
+apps/erpnext/erpnext/public/js/setup_wizard.js +108,You will use it to Login,यदि आप लॉग इन करने के लिए इसका इस्तेमाल करेंगे
 DocType: Sales Partner,Retailer,खुदरा
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +99,Credit To account must be a Balance Sheet account,खाते में जमा एक बैलेंस शीट खाता होना चाहिए
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,सभी आपूर्तिकर्ता के प्रकार
 apps/erpnext/erpnext/stock/doctype/item/item.py +37,Item Code is mandatory because Item is not automatically numbered,आइटम स्वचालित रूप से गिने नहीं है क्योंकि मद कोड अनिवार्य है
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +99,Quotation {0} not of type {1},कोटेशन {0} नहीं प्रकार की {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +93,Quotation {0} not of type {1},कोटेशन {0} नहीं प्रकार की {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,रखरखाव अनुसूची आइटम
 DocType: Sales Order,%  Delivered,% वितरित
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,Bank Overdraft Account,बैंक ओवरड्राफ्ट खाता
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +15,Make Salary Slip,वेतन पर्ची बनाओ
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +18,Browse BOM,ब्राउज़ बीओएम
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +175,Secured Loans,सुरक्षित कर्जे
-apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +3,Awesome Products,बहुत बढ़िया उत्पाद
+apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +3,Awesome Products,बहुत बढ़िया उत्पाद
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +189,Opening Balance Equity,प्रारम्भिक शेष इक्विटी
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +80,Cannot approve leave as you are not authorized to approve leaves on Block Dates,आप ब्लॉक तारीखों पर पत्तियों को मंजूरी के लिए अधिकृत नहीं हैं के रूप में छुट्टी स्वीकृत नहीं कर सकते
 DocType: Appraisal,Appraisal,मूल्यांकन
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +13,Lost-foam casting,खोया-फोम कास्टिंग
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +47,Drawing,ड्राइंग
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +22,Date is repeated,तिथि दोहराया है
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +148,Leave approver must be one of {0},छोड़ दो सरकारी गवाह से एक होना चाहिए {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +162,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,समय शुरू
@@ -2547,7 +2457,7 @@
 DocType: Purchase Invoice Item,Net Amount (Company Currency),शुद्ध राशि (कंपनी मुद्रा)
 DocType: BOM Operation,Hour Rate,घंटा दर
 DocType: Stock Settings,Item Naming By,द्वारा नामकरण आइटम
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +642,From Quotation,से उद्धरण
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +655,From Quotation,से उद्धरण
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},अन्य समयावधि अंतिम लेखा {0} के बाद किया गया है {1}
 DocType: Production Order,Material Transferred for Manufacturing,सामग्री विनिर्माण के लिए स्थानांतरित
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +29,Account {0} does not exists,खाता {0} करता नहीं मौजूद है
@@ -2561,21 +2471,19 @@
 DocType: Purchase Invoice Item,PR Detail,पीआर विस्तार
 DocType: Sales Order,Fully Billed,पूरी तरह से किसी तरह का बिल
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +20,Cash In Hand,रोकड़ शेष
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +72,Delivery warehouse required for stock item {0},वितरण गोदाम स्टॉक आइटम के लिए आवश्यक {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +119,Delivery warehouse required for stock item {0},वितरण गोदाम स्टॉक आइटम के लिए आवश्यक {0}
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),पैकेज के कुल वजन. आमतौर पर शुद्ध + वजन पैकेजिंग सामग्री के वजन. (प्रिंट के लिए)
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,इस भूमिका के साथ उपयोक्ता जमे हुए खातों के खिलाफ लेखांकन प्रविष्टियों को संशोधित / जमे हुए खातों सेट और बनाने के लिए अनुमति दी जाती है
 DocType: Serial No,Is Cancelled,क्या Cancelled
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +281,My Shipments,मेरा लदान
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +286,My Shipments,मेरा लदान
 DocType: Journal Entry,Bill Date,बिल की तारीख
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +43,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","सर्वोच्च प्राथमिकता के साथ कई मूल्य निर्धारण नियम हैं, भले ही उसके बाद निम्न आंतरिक प्राथमिकताओं लागू कर रहे हैं:"
 DocType: Supplier,Supplier Details,आपूर्तिकर्ता विवरण
 DocType: Communication,Recipients,प्राप्तकर्ता
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +146,Screwing,पंगा लेना
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +96,Knurling,Knurling
 DocType: Expense Claim,Approval Status,स्वीकृति स्थिति
 DocType: Hub Settings,Publish Items to Hub,हब के लिए आइटम प्रकाशित करें
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +44,From value must be less than to value in row {0},मूल्य से पंक्ति में मान से कम होना चाहिए {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +133,Wire Transfer,वायर ट्रांसफर
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +133,Wire Transfer,वायर ट्रांसफर
 apps/erpnext/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py +25,Please select Bank Account,बैंक खाते का चयन करें
 DocType: Newsletter,Create and Send Newsletters,बनाने और भेजने समाचार
 apps/frappe/frappe/public/js/frappe/views/reports/grid_report.js +305,From Date must be before To Date,दिनांक से पहले तिथि करने के लिए होना चाहिए
@@ -2583,14 +2491,14 @@
 DocType: Company,Default Income Account,डिफ़ॉल्ट आय खाता
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,ग्राहक समूह / ग्राहक
 DocType: Item Group,Check this if you want to show in website,यह जाँच लें कि आप वेबसाइट में दिखाना चाहते हैं
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +190,Welcome to ERPNext,ERPNext में आपका स्वागत है
+,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/page/setup_wizard/install_fixtures.py +37,Calls,कॉल
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Calls,कॉल
 DocType: Project,Total Costing Amount (via Time Logs),कुल लागत राशि (टाइम लॉग्स के माध्यम से)
 DocType: Purchase Order Item Supplied,Stock UOM,स्टॉक UOM
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Purchase Order {0} is not submitted,खरीद आदेश {0} प्रस्तुत नहीं किया गया है
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +194,Purchase Order {0} is not submitted,खरीद आदेश {0} प्रस्तुत नहीं किया गया है
 ,Projected,प्रक्षेपित
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},धारावाहिक नहीं {0} वेयरहाउस से संबंधित नहीं है {1}
 apps/erpnext/erpnext/controllers/status_updater.py +136,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,नोट : सिस्टम मद के लिए वितरण और अधिक से अधिक बुकिंग की जांच नहीं करेगा {0} मात्रा या राशि के रूप में 0 है
@@ -2598,7 +2506,6 @@
 DocType: Issue,Opening Date,तिथि खुलने की
 DocType: Journal Entry,Remark,टिप्पणी
 DocType: Purchase Receipt Item,Rate and Amount,दर और राशि
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +95,Boring,बोरिंग
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +667,From Sales Order,बिक्री आदेश से
 DocType: Blog Category,Parent Website Route,जनक वेबसाइट ट्रेन
 DocType: Sales Order,Not Billed,नहीं बिल
@@ -2612,19 +2519,17 @@
 apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount Amount,छूट राशि
 DocType: Purchase Invoice,Return Against Purchase Invoice,के खिलाफ खरीद चालान लौटें
 DocType: Item,Warranty Period (in days),वारंटी अवधि (दिनों में)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +550,e.g. VAT,उदाहरणार्थ
+apps/erpnext/erpnext/public/js/setup_wizard.js +292,e.g. VAT,उदाहरणार्थ
 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,कोटेशन सीरीज
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +52,"An item exists with same name ({0}), please change the item group name or rename the item","एक आइटम ( {0}) , मद समूह का नाम बदलने के लिए या आइटम का नाम बदलने के लिए कृपया एक ही नाम के साथ मौजूद है"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +82,Hot metal gas forming,गठन गर्म धातु गैस
 DocType: Sales Order Item,Sales Order Date,बिक्री आदेश दिनांक
 DocType: Sales Invoice Item,Delivered Qty,वितरित मात्रा
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +63,Warehouse {0}: Company is mandatory,वेयरहाउस {0}: कंपनी अनिवार्य है
 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.",टैक्स दर का उल्लेख उचित समूह (निधि&gt; मौजूदा देनदारियों&gt; करों और शुल्कों का आमतौर पर स्रोत पर जाएँ और प्रकार &#39;कर&#39; के) बाल जोड़ें पर क्लिक करके (एक नया खाता बनाने और करते हैं।
 ,Payment Period Based On Invoice Date,चालान तिथि के आधार पर भुगतान की अवधि
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +50,Missing Currency Exchange Rates for {0},के लिए गुम मुद्रा विनिमय दरों {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +135,Laser cutting,लेजर काटने
 DocType: Event,Monday,सोमवार
 DocType: Journal Entry,Stock Entry,स्टॉक एंट्री
 DocType: Account,Payable,देय
@@ -2657,7 +2562,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +111,Date Of Retirement must be greater than Date of Joining,सेवानिवृत्ति की तिथि शामिल होने की तिथि से अधिक होना चाहिए
 DocType: Sales Invoice,Against Income Account,आय खाता के खिलाफ
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +69,{0}% Delivered,{0}% वितरित
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +78,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,आइटम {0}: आदेश दिया मात्रा {1} न्यूनतम आदेश मात्रा {2} (मद में परिभाषित) की तुलना में कम नहीं हो सकता।
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,आइटम {0}: आदेश दिया मात्रा {1} न्यूनतम आदेश मात्रा {2} (मद में परिभाषित) की तुलना में कम नहीं हो सकता।
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,मासिक वितरण का प्रतिशत
 DocType: Territory,Territory Targets,टेरिटरी लक्ष्य
 DocType: Delivery Note,Transporter Info,ट्रांसपोर्टर जानकारी
@@ -2666,7 +2571,6 @@
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,प्रिंट टेम्पलेट्स के लिए खिताब उदा प्रोफार्मा चालान .
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +140,Valuation type charges can not marked as Inclusive,मूल्यांकन प्रकार के आरोप समावेशी के रूप में चिह्नित नहीं कर सकता
 DocType: POS Profile,Update Stock,स्टॉक अद्यतन
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +128,Superfinishing,Superfinishing
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,मदों के लिए अलग UOM गलत ( कुल ) नेट वजन मूल्य को बढ़ावा मिलेगा. प्रत्येक आइटम का शुद्ध वजन ही UOM में है कि सुनिश्चित करें.
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,बीओएम दर
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +85,Please pull items from Delivery Note,डिलिवरी नोट से आइटम खींच कृपया
@@ -2681,7 +2585,6 @@
 ,Purchase Analytics,खरीद विश्लेषिकी
 DocType: Sales Invoice Item,Delivery Note Item,डिलिवरी नोट आइटम
 DocType: Expense Claim,Task,कार्य
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +57,Shaving,हजामत बनाने का काम
 DocType: Purchase Taxes and Charges,Reference Row #,संदर्भ row #
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},बैच संख्या आइटम के लिए अनिवार्य है {0}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js +14,This is a root sales person and cannot be edited.,यह एक रूट बिक्री व्यक्ति है और संपादित नहीं किया जा सकता है .
@@ -2693,13 +2596,11 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +74,Purpose must be one of {0},उद्देश्य से एक होना चाहिए {0}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +108,Fill the form and save it,फार्म भरें और इसे बचाने के लिए
 DocType: Production Planning Tool,Download a report containing all raw materials with their latest inventory status,उनकी नवीनतम सूची की स्थिति के साथ सभी कच्चे माल युक्त रिपोर्ट डाउनलोड करें
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +94,Facing,सामना
 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: Time Log,Billable,बिल
-DocType: Authorization Rule,This will be used for setting rule in HR module,इस मॉड्यूल में मानव संसाधन सेटिंग शासन के लिए इस्तेमाल किया जाएगा
 DocType: Account,Rate at which this tax is applied,दर जिस पर इस कर को लागू किया जाता है
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reorder Qty,Reorder मात्रा
 DocType: Company,Stock Adjustment Account,स्टॉक समायोजन खाता
@@ -2726,16 +2627,15 @@
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,प्रतिशत आवंटन 100 % के बराबर होना चाहिए
 DocType: Serial No,Out of AMC,एएमसी के बाहर
 DocType: Purchase Order Item,Material Request Detail No,सामग्री के लिए अनुरोध विस्तार नहीं
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +97,Hard turning,हार्ड मोड़
 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 +79,Company (not Customer or Supplier) master.,कंपनी ( नहीं ग्राहक या प्रदायक) मास्टर .
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +106,Please enter 'Expected Delivery Date',' उम्मीद की डिलीवरी तिथि ' दर्ज करें
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +187,Delivery Notes {0} must be cancelled before cancelling this Sales Order,डिलिवरी नोट्स {0} इस बिक्री आदेश रद्द करने से पहले रद्द कर दिया जाना चाहिए
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +100,Please enter 'Expected Delivery Date',' उम्मीद की डिलीवरी तिथि ' दर्ज करें
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +182,Delivery Notes {0} must be cancelled before cancelling this Sales Order,डिलिवरी नोट्स {0} इस बिक्री आदेश रद्द करने से पहले रद्द कर दिया जाना चाहिए
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +373,Paid amount + Write Off Amount can not be greater than Grand Total,भुगतान की गई राशि + राशि से लिखने के कुल योग से बड़ा नहीं हो सकता
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} आइटम के लिए एक वैध बैच नंबर नहीं है {1}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,Note: There is not enough leave balance for Leave Type {0},नोट : छोड़ किस्म के लिए पर्याप्त छुट्टी संतुलन नहीं है {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +124,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,अवसर प्रकार
@@ -2747,7 +2647,7 @@
 DocType: Hub Settings,Publish Availability,उपलब्धता प्रकाशित करें
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +105,Date of Birth cannot be greater than today.,जन्म तिथि आज की तुलना में अधिक से अधिक नहीं हो सकता।
 ,Stock Ageing,स्टॉक बूढ़े
-apps/erpnext/erpnext/controllers/accounts_controller.py +200,{0} '{1}' is disabled,{0} '{1}' अक्षम किया गया है
+apps/erpnext/erpnext/controllers/accounts_controller.py +201,{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.,भेजने से लेन-देन पर संपर्क करने के लिए स्वत: ईमेल भेजें।
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +232,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
@@ -2757,44 +2657,38 @@
 DocType: Purchase Order,Customer Contact Email,ग्राहक संपर्क ईमेल
 DocType: Event,Sunday,रविवार
 DocType: Sales Team,Contribution (%),अंशदान (%)
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +455,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,नोट : भुगतान एंट्री ' नकद या बैंक खाता' निर्दिष्ट नहीं किया गया था के बाद से नहीं बनाया जाएगा
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +171,Responsibilities,जिम्मेदारियों
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +457,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 +11,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,तालिका में कम से कम 1 चालान दाखिल करें
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +511,Add Users,उपयोगकर्ता जोड़ें
+apps/erpnext/erpnext/public/js/setup_wizard.js +255,Add Users,उपयोगकर्ता जोड़ें
 DocType: Pricing Rule,Item Group,आइटम समूह
 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),करों और शुल्कों जोड़ा (कंपनी मुद्रा)
-apps/erpnext/erpnext/stock/doctype/item/item.py +340,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,आइटम कर पंक्ति {0} प्रकार टैक्स या आय या खर्च या प्रभार्य का खाता होना चाहिए
+apps/erpnext/erpnext/stock/doctype/item/item.py +344,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,आइटम कर पंक्ति {0} प्रकार टैक्स या आय या खर्च या प्रभार्य का खाता होना चाहिए
 DocType: Sales Order,Partly Billed,आंशिक रूप से बिल
 DocType: Item,Default BOM,Default बीओएम
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +79,Decambering,Decambering
 apps/erpnext/erpnext/setup/doctype/company/company.js +22,Please re-type company name to confirm,फिर से लिखें कंपनी के नाम की पुष्टि के लिए कृपया
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,कुल बकाया राशि
 DocType: Time Log Batch,Total Hours,कुल घंटे
 DocType: Journal Entry,Printing Settings,मुद्रण सेटिंग्स
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +268,Total Debit must be equal to Total Credit. The difference is {0},कुल डेबिट कुल क्रेडिट के बराबर होना चाहिए .
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +11,Automotive,मोटर वाहन
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +37,Item is required,आइटम आवश्यक है
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +25,Metal injection molding,धातु इंजेक्शन मोल्डिंग
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +258,Total Debit must be equal to Total Credit. The difference is {0},कुल डेबिट कुल क्रेडिट के बराबर होना चाहिए .
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,मोटर वाहन
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +684,From Delivery Note,डिलिवरी नोट से
 DocType: Time Log,From Time,समय से
 DocType: Notification Control,Custom Message,कस्टम संदेश
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +33,Investment Banking,निवेश बैंकिंग
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +261,"Select your Country, Time Zone and Currency","अपने देश, समय क्षेत्र और मुद्रा का चयन करें"
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,निवेश बैंकिंग
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +316,"Select your Country, Time Zone and Currency","अपने देश, समय क्षेत्र और मुद्रा का चयन करें"
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +369,Cash or Bank Account is mandatory for making payment entry,नकद या बैंक खाते को भुगतान के प्रवेश करने के लिए अनिवार्य है
 DocType: Purchase Invoice,Price List Exchange Rate,मूल्य सूची विनिमय दर
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +91,Pickling,नमकीन बनाना
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +18,Sand casting,सैंड कास्टिंग
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +117,Electroplating,विद्युत
 DocType: Purchase Invoice Item,Rate,दर
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +62,Intern,प्रशिक्षु
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Intern,प्रशिक्षु
 DocType: Newsletter,A Lead with this email id should exist,इस ईमेल आईडी के साथ एक लीड मौजूद होना चाहिए
 DocType: Stock Entry,From BOM,बीओएम से
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +34,Basic,बुनियादी
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +34,Basic,बुनियादी
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,{0} से पहले शेयर लेनदेन जमे हुए हैं
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +217,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,तिथि करने के लिए आधे दिन की छुट्टी के लिए तिथि से ही होना चाहिए
@@ -2802,11 +2696,11 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +96,Reference No is mandatory if you entered Reference Date,"आप संदर्भ तिथि में प्रवेश किया , तो संदर्भ कोई अनिवार्य है"
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +108,Date of Joining must be greater than Date of Birth,शामिल होने की तिथि जन्म तिथि से अधिक होना चाहिए
 DocType: Salary Structure,Salary Structure,वेतन संरचना
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +242,"Multiple Price Rule exists with same criteria, please resolve \
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +246,"Multiple Price Rule exists with same criteria, please resolve \
 			conflict by assigning priority. Price Rules: {0}","एकाधिक मूल्य नियम एक ही मापदंड के साथ मौजूद है, प्राथमिकता बताए द्वारा \
  संघर्ष का समाधान करें। मूल्य नियम: {0}"
 DocType: Account,Bank,बैंक
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +9,Airline,एयरलाइन
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,एयरलाइन
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +493,Issue Material,मुद्दा सामग्री
 DocType: Material Request Item,For Warehouse,गोदाम के लिए
 DocType: Employee,Offer Date,प्रस्ताव की तिथि
@@ -2816,29 +2710,24 @@
 DocType: Item,Is Fixed Asset Item,तय परिसंपत्ति मद है
 DocType: Stock Entry,Including items for sub assemblies,उप असेंबलियों के लिए आइटम सहित
 DocType: Features Setup,"If you have long print formats, this feature can be used to split the page to be printed on multiple pages with all headers and footers on each page","यदि आप लंबे समय स्वरूपों मुद्रित किया है, इस सुविधा के लिए प्रत्येक पृष्ठ पर सभी हेडर और पाद लेख के साथ एकाधिक पृष्ठों पर मुद्रित विभाजित करने के लिए इस्तेमाल किया जा सकता है"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +131,Hobbing,Hobbing
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +98,All Territories,सभी प्रदेशों
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +98,All Territories,सभी प्रदेशों
 DocType: Purchase Invoice,Items,आइटम
 DocType: Fiscal Year,Year Name,वर्ष नाम
 DocType: Process Payroll,Process Payroll,प्रक्रिया पेरोल
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +59,There are more holidays than working days this month.,इस महीने के दिन काम की तुलना में अधिक छुट्टियां कर रहे हैं .
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +68,There are more holidays than working days this month.,इस महीने के दिन काम की तुलना में अधिक छुट्टियां कर रहे हैं .
 DocType: Product Bundle Item,Product Bundle Item,उत्पाद बंडल आइटम
 DocType: Sales Partner,Sales Partner Name,बिक्री भागीदार नाम
 DocType: Purchase Invoice Item,Image View,छवि देखें
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +113,Finishing & industrial finishing,फिनिशिंग और औद्योगिक परिष्करण
 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/page/setup_wizard/fixtures/industry_type.py +46,Securities & Commodity Exchanges,प्रतिभूति एवं कमोडिटी एक्सचेंजों
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,प्रतिभूति एवं कमोडिटी एक्सचेंजों
 DocType: Shipping Rule,Calculate Based On,के आधार पर गणना करें
 DocType: Delivery Note Item,From Warehouse,गोदाम से
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +98,Drilling,ड्रिलिंग
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +28,Blow molding,उड़ा ढलाई
 DocType: Purchase Taxes and Charges,Valuation and Total,मूल्यांकन और कुल
 DocType: Tax Rule,Shipping City,शिपिंग शहर
 apps/erpnext/erpnext/stock/doctype/item/item.js +43,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,"इस मद {0} (खाका) का एक संस्करण है। 'कोई प्रतिलिपि' सेट कर दिया जाता है, जब तक गुण टेम्पलेट से अधिक नकल की जाएगी"
 DocType: Account,Purchase User,क्रय उपयोगकर्ता
 DocType: Notification Control,Customize the Notification,अधिसूचना को मनपसंद
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +87,Hammering,टंकण
 DocType: Web Page,Slideshow,स्लाइड शो
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +24,Default Address Template cannot be deleted,डिफ़ॉल्ट पता खाका हटाया नहीं जा सकता
 DocType: Sales Invoice,Shipping Rule,नौवहन नियम
@@ -2847,9 +2736,8 @@
 DocType: Workflow State,Search,खोजें
 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/setup/page/setup_wizard/fixtures/operations.py +142,Brazing,टांकना
 DocType: C-Form,Amended From,से संशोधित
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Raw Material,कच्चे माल
+apps/erpnext/erpnext/public/js/setup_wizard.js +359,Raw Material,कच्चे माल
 DocType: Leave Application,Follow via Email,ईमेल के माध्यम से पालन करें
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,सबसे कम राशि के बाद टैक्स राशि
 apps/erpnext/erpnext/accounts/doctype/account/account.py +174,Child account exists for this account. You can not delete this account.,चाइल्ड खाता इस खाते के लिए मौजूद है. आप इस खाते को नष्ट नहीं कर सकते .
@@ -2863,10 +2751,10 @@
 ,Produced,उत्पादित
 DocType: Item,Item Code for Suppliers,आपूर्तिकर्ता के लिए आइटम कोड
 DocType: Issue,Raised By (Email),(ई) द्वारा उठाए गए
-apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +72,General,सामान्य
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +495,Attach Letterhead,लेटरहेड अटैच
+apps/erpnext/erpnext/setup/setup_wizard/default_website.py +72,General,सामान्य
+apps/erpnext/erpnext/public/js/setup_wizard.js +241,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/setup/page/setup_wizard/setup_wizard.js +542,"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/public/js/setup_wizard.js +284,"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}
 DocType: Journal Entry,Bank Entry,बैंक एंट्री
 DocType: Authorization Rule,Applicable To (Designation),के लिए लागू (पद)
@@ -2875,33 +2763,32 @@
 apps/erpnext/erpnext/config/accounts.py +143,Enable / disable currencies.,/ निष्क्रिय मुद्राओं सक्षम करें.
 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),कुल (राशि)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +26,Entertainment & Leisure,मनोरंजन और आराम
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,मनोरंजन और आराम
 DocType: Purchase Order,The date on which recurring order will be stop,"आवर्ती आदेश रोक दिया जाएगा, जिस पर तारीख"
 DocType: Quality Inspection,Item Serial No,आइटम कोई धारावाहिक
 apps/erpnext/erpnext/controllers/status_updater.py +142,{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 +57,Total Present,कुल वर्तमान
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Hour,घंटा
+apps/erpnext/erpnext/public/js/setup_wizard.js +363,Hour,घंटा
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +138,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation","धारावाहिक मद {0} शेयर सुलह का उपयोग कर \
  अद्यतन नहीं किया जा सकता है"
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +488,Transfer Material to Supplier,प्रदायक के लिए सामग्री हस्तांतरण
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +513,Transfer Material to Supplier,प्रदायक के लिए सामग्री हस्तांतरण
 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/crm/doctype/opportunity/opportunity.js +82,Create Quotation,कोटेशन बनाएँ
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +306,All these items have already been invoiced,इन सभी मदों पहले से चालान कर दिया गया है
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,You are not authorized to approve leaves on Block Dates,आप ब्लॉक तारीखों पर पत्तियों को मंजूरी के लिए अधिकृत नहीं हैं
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +311,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/setup/page/setup_wizard/fixtures/operations.py +83,Curling,कर्लिंग
 DocType: Account,Tax,कर
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +28,Row {0}: {1} is not a valid {2},पंक्ति {0}: {1} एक मान्य नहीं है {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +89,Refining,रिफाइनिंग
+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,उत्पादन योजना उपकरण
 DocType: Quality Inspection,Report Date,तिथि रिपोर्ट
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +130,Routing,मार्ग
 DocType: C-Form,Invoices,चालान
 DocType: Job Opening,Job Title,कार्य शीर्षक
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +54,{0} already allocated for Employee {1} for period {2} - {3},{0} पहले से ही अवधि के लिए कर्मचारी {1} के लिए आवंटित {2} - {3}
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +80,{0} Recipients,{0} प्राप्तकर्ता
 DocType: Features Setup,Item Groups in Details,विवरण में आइटम समूह
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +335,Quantity to Manufacture must be greater than 0.,निर्माण करने के लिए मात्रा 0 से अधिक होना चाहिए।
@@ -2919,14 +2806,13 @@
 DocType: DocType,Setup,व्यवस्था
 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,इस महीने और लंबित गतिविधियों के लिए सारांश
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +39,Cold rolling,कोल्ड रोलिंग
 DocType: Customer Group,Customer Group Name,ग्राहक समूह का नाम
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +408,Please remove this Invoice {0} from C-Form {1},सी-फार्म से इस चालान {0} निकाल दें {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +410,Please remove this Invoice {0} from C-Form {1},सी-फार्म से इस चालान {0} निकाल दें {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,गुण
 DocType: Packing Slip,Get Items,आइटम पाने के लिए
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +186,Please enter Write Off Account,खाता बंद लिखने दर्ज करें
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +187,Please enter Write Off Account,खाता बंद लिखने दर्ज करें
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +71,Last Order Date,पिछले आदेश की तिथि
 DocType: DocField,Image,छवि
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +179,Make Excise Invoice,उत्पाद शुल्क चालान बनाएं
@@ -2936,7 +2822,7 @@
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +146,Operation ID not set,ऑपरेशन आईडी सेट नहीं
 DocType: Production Order,Planned Start Date,नियोजित प्रारंभ दिनांक
 DocType: Serial No,Creation Document Type,निर्माण दस्तावेज़ प्रकार
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +620,Maint. Visit,Maint। भेंट
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +631,Maint. Visit,Maint। भेंट
 DocType: Leave Type,Is Encash,तुड़ाना है
 DocType: Purchase Invoice,Mobile No,नहीं मोबाइल
 DocType: Payment Tool,Make Journal Entry,जर्नल प्रविष्टि बनाने
@@ -2944,35 +2830,31 @@
 apps/erpnext/erpnext/controllers/trends.py +257,Project-wise data is not available for Quotation,परियोजना के लिहाज से डेटा उद्धरण के लिए उपलब्ध नहीं है
 DocType: Project,Expected End Date,उम्मीद समाप्ति तिथि
 DocType: Appraisal Template,Appraisal Template Title,मूल्यांकन टेम्पलेट शीर्षक
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +440,Commercial,वाणिज्यिक
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +378,Commercial,वाणिज्यिक
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +23,Parent Item {0} must not be a Stock Item,मूल आइटम {0} एक शेयर मद नहीं होना चाहिए
 DocType: Cost Center,Distribution Id,वितरण आईडी
-apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +14,Awesome Services,बहुत बढ़िया सेवाएं
+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,प्रदायक पता
 DocType: Contact Us Settings,Address Line 2,पता पंक्ति 2
 DocType: ToDo,Reference,संदर्भ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +59,Perforating,Perforating
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,मात्रा बाहर
 apps/erpnext/erpnext/config/accounts.py +128,Rules to calculate shipping amount for a sale,एक बिक्री के लिए शिपिंग राशि की गणना करने के नियम
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +29,Series is mandatory,सीरीज अनिवार्य है
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +28,Financial Services,वित्तीय सेवाएँ
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,वित्तीय सेवाएँ
 apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3},{0} विशेषता के लिए मान की सीमा के भीतर होना चाहिए {1} को {2} की वेतन वृद्धि में {3}
 DocType: Tax Rule,Sales,विक्रय
 DocType: Stock Entry Detail,Basic Amount,मूल राशि
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +173,Warehouse required for stock Item {0},शेयर मद के लिए आवश्यक वेयरहाउस {0}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +178,Warehouse required for stock Item {0},शेयर मद के लिए आवश्यक वेयरहाउस {0}
 DocType: Leave Allocation,Unused leaves,अप्रयुक्त पत्ते
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,सीआर
 DocType: Customer,Default Receivable Accounts,प्राप्य लेखा चूक
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +102,Sawing,काटने का कार्य
 DocType: Tax Rule,Billing State,बिलिंग राज्य
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +32,Laminating,Laminating
 DocType: Item Reorder,Transfer,हस्तांतरण
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +549,Fetch exploded BOM (including sub-assemblies),( उप असेंबलियों सहित) विस्फोट बीओएम लायें
 DocType: Authorization Rule,Applicable To (Employee),के लिए लागू (कर्मचारी)
 apps/erpnext/erpnext/controllers/accounts_controller.py +101,Due Date is mandatory,नियत तिथि अनिवार्य है
 apps/erpnext/erpnext/controllers/item_variant.py +51,Increment for Attribute {0} cannot be 0,गुण के लिए वेतन वृद्धि {0} 0 नहीं किया जा सकता
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +143,Sintering,Sintering
 DocType: Journal Entry,Pay To / Recd From,/ रिसी डी से भुगतान
 DocType: Naming Series,Setup Series,सेटअप सीरीज
 DocType: Supplier,Contact HTML,संपर्क HTML
@@ -2985,7 +2867,6 @@
 DocType: Attendance,Absent,अनुपस्थित
 DocType: Product Bundle,Product Bundle,उत्पाद बंडल
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +180,Row {0}: Invalid reference {1},पंक्ति {0}: अमान्य संदर्भ {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +165,Crushing,क्रशिंग
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,करों और शुल्कों टेम्पलेट खरीद
 DocType: Upload Attendance,Download Template,टेम्पलेट डाउनलोड करें
 DocType: GL Entry,Remarks,टिप्पणियाँ
@@ -2993,14 +2874,12 @@
 DocType: Journal Entry,Write Off Based On,के आधार पर बंद लिखने के लिए
 DocType: Features Setup,POS View,स्थिति देखें
 apps/erpnext/erpnext/config/stock.py +38,Installation record for a Serial No.,एक सीरियल नंबर के लिए स्थापना रिकॉर्ड
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +9,Continuous casting,निरंतर ढलाई
 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/setup/page/setup_wizard/fixtures/operations.py +80,Cold sizing,शीत नौकरशाही का आकार घटाने
 DocType: Salary Slip,Earning & Deduction,अर्जन कटौती
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +76,Account {0} cannot be a Group,खाते {0} एक समूह नहीं हो सकता
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +259,Region,प्रदेश
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +314,Region,प्रदेश
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +213,Optional. This setting will be used to filter in various transactions.,वैकल्पिक . यह सेटिंग विभिन्न लेनदेन में फिल्टर करने के लिए इस्तेमाल किया जाएगा .
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +104,Negative Valuation Rate is not allowed,नकारात्मक मूल्यांकन दर की अनुमति नहीं है
 DocType: Holiday List,Weekly Off,ऑफ साप्ताहिक
@@ -3018,7 +2897,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,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,तिथि करने के लिए तिथि और उपस्थिति से उपस्थिति अनिवार्य है
-apps/erpnext/erpnext/controllers/buying_controller.py +131,Please enter 'Is Subcontracted' as Yes or No,डालें हाँ या नहीं के रूप में ' subcontracted है '
+apps/erpnext/erpnext/controllers/buying_controller.py +122,Please enter 'Is Subcontracted' as Yes or No,डालें हाँ या नहीं के रूप में ' subcontracted है '
 DocType: Sales Team,Contact No.,सं संपर्क
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,'Profit and Loss' type account {0} not allowed in Opening Entry,' लाभ और हानि ' प्रकार खाते {0} एंट्री खुलने में अनुमति नहीं
 DocType: Workflow State,Time,समय
@@ -3027,14 +2906,13 @@
 DocType: Authorization Rule,Authorization Rule,प्राधिकरण नियम
 DocType: Sales Invoice,Terms and Conditions Details,नियमों और शर्तों के विवरण
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,बिक्री करों और शुल्कों खाका
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +10,Apparel & Accessories,परिधान और सहायक उपकरण
+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,आदेश की संख्या
 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 +121,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/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +47,Conversion Factor is required,रूपांतरण कारक की आवश्यकता है
 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,मूल्य / विवरण
@@ -3042,10 +2920,8 @@
 ,Customers Not Buying Since Long Time,ग्राहकों को लंबे समय से खरीद नहीं
 DocType: Production Order,Expected Delivery Date,उम्मीद डिलीवरी की तारीख
 apps/erpnext/erpnext/accounts/general_ledger.py +121,Debit and Credit not equal for {0} #{1}. Difference is {2}.,डेबिट और क्रेडिट {0} # के लिए बराबर नहीं {1}। अंतर यह है {2}।
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +48,Bulging,उभड़ा हुआ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +11,Evaporative-pattern casting,बाष्पीकरणीय पैटर्न कास्टिंग
 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 +195,Sales Invoice {0} must be cancelled before cancelling this Sales Order,बिक्री चालान {0} इस बिक्री आदेश रद्द करने से पहले रद्द कर दिया जाना चाहिए
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +190,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 से अधिक होना चाहिए .
@@ -3064,26 +2940,24 @@
 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 +241,Account: {0} with currency: {1} can not be selected,खाता: {0} मुद्रा के साथ: {1} चयनित नहीं किया जा सकता
+apps/erpnext/erpnext/controllers/accounts_controller.py +242,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 +47,Account {0}: Parent account {1} does not belong to company: {2},खाते {0}: माता पिता के खाते {1} कंपनी से संबंधित नहीं है: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted all transactions related to this company!,सफलतापूर्वक इस कंपनी से संबंधित सभी लेन-देन को नष्ट कर दिया!
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,आज की तारीख में
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +111,Honing,Honing
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +58,Probation,परिवीक्षा
-apps/erpnext/erpnext/stock/doctype/item/item.py +264,Default Warehouse is mandatory for stock Item.,डिफ़ॉल्ट गोदाम स्टॉक मद के लिए अनिवार्य है .
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Probation,परिवीक्षा
+apps/erpnext/erpnext/stock/doctype/item/item.py +268,Default Warehouse is mandatory for stock Item.,डिफ़ॉल्ट गोदाम स्टॉक मद के लिए अनिवार्य है .
 DocType: Feed,Full Name,पूरा नाम
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +148,Clinching,जकड़ना
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +191,Payment of salary for the month {0} and year {1},महीने के वेतन का भुगतान {0} और वर्ष {1}
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +173,Payment of salary for the month {0} and year {1},महीने के वेतन का भुगतान {0} और वर्ष {1}
 DocType: Stock Settings,Auto insert Price List rate if missing,ऑटो डालने मूल्य सूची दर लापता यदि
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,कुल भुगतान की गई राशि
 ,Transferred Qty,मात्रा तबादला
 apps/erpnext/erpnext/config/learn.py +11,Navigating,नेविगेट
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +137,Planning,आयोजन
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +137,Planning,आयोजन
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +9,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),कुल बिलिंग राशि (टाइम लॉग्स के माध्यम से)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +629,We sell this Item,हम इस आइटम बेचने
+apps/erpnext/erpnext/public/js/setup_wizard.js +365,We sell this Item,हम इस आइटम बेचने
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +65,Supplier Id,आपूर्तिकर्ता आईडी
 DocType: Journal Entry,Cash Entry,कैश एंट्री
 DocType: Sales Partner,Contact Desc,संपर्क जानकारी
@@ -3092,18 +2966,16 @@
 DocType: Brand,Item Manager,आइटम प्रबंधक
 DocType: Cost Center,Add rows to set annual budgets on Accounts.,पंक्तियाँ जोड़ें लेखा पर वार्षिक बजट निर्धारित.
 DocType: Buying Settings,Default Supplier Type,डिफ़ॉल्ट प्रदायक प्रकार
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +160,Quarrying,उत्खनन
 DocType: Production Order,Total Operating Cost,कुल परिचालन लागत
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +160,Note: Item {0} entered multiple times,नोट : आइटम {0} कई बार प्रवेश किया
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +163,Note: Item {0} entered multiple times,नोट : आइटम {0} कई बार प्रवेश किया
 apps/erpnext/erpnext/config/crm.py +27,All Contacts.,सभी संपर्क.
 DocType: Newsletter,Test Email Id,टेस्ट ईमेल आईडी
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +394,Company Abbreviation,कंपनी संक्षिप्त
+apps/erpnext/erpnext/public/js/setup_wizard.js +142,Company Abbreviation,कंपनी संक्षिप्त
 DocType: Features Setup,If you follow Quality Inspection. Enables Item QA Required and QA No in Purchase Receipt,आप गुणवत्ता निरीक्षण का पालन करें .
 DocType: GL Entry,Party Type,पार्टी के प्रकार
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +68,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} सीमा से अधिक के बाद से Authroized नहीं
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +30,Rotational molding,घूर्णी ढलाई
 apps/erpnext/erpnext/config/hr.py +115,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,शॉपिंग कार्ट के लिए सेट कर नियम
@@ -3117,15 +2989,15 @@
 apps/erpnext/erpnext/config/selling.py +18,Quotes to Leads or Customers.,सुराग या ग्राहक के लिए उद्धरण.
 DocType: Stock Settings,Role Allowed to edit frozen stock,जमे हुए शेयर संपादित करने के लिए रख सकते है भूमिका
 ,Territory Target Variance Item Group-Wise,क्षेत्र को लक्षित विचरण मद समूहवार
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +101,All Customer Groups,सभी ग्राहक समूहों
-apps/erpnext/erpnext/controllers/accounts_controller.py +474,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} अनिवार्य है. हो सकता है कि विनिमय दर रिकॉर्ड {2} को {1} के लिए नहीं बनाई गई है.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +101,All Customer Groups,सभी ग्राहक समूहों
+apps/erpnext/erpnext/controllers/accounts_controller.py +475,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} अनिवार्य है. हो सकता है कि विनिमय दर रिकॉर्ड {2} को {1} के लिए नहीं बनाई गई है.
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +37,Tax Template is mandatory.,टैक्स खाका अनिवार्य है।
 apps/erpnext/erpnext/accounts/doctype/account/account.py +41,Account {0}: Parent account {1} does not exist,खाते {0}: माता पिता के खाते {1} मौजूद नहीं है
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),मूल्य सूची दर (कंपनी मुद्रा)
 DocType: Account,Temporary,अस्थायी
 DocType: Address,Preferred Billing Address,पसंदीदा बिलिंग पता
 DocType: Monthly Distribution Percentage,Percentage Allocation,प्रतिशत आवंटन
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +86,Secretary,सचिव
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Secretary,सचिव
 DocType: Serial No,Distinct unit of an Item,एक आइटम की अलग इकाई
 DocType: Pricing Rule,Buying,क्रय
 DocType: HR Settings,Employee Records to be created by,कर्मचारी रिकॉर्ड्स द्वारा पैदा किए जाने की
@@ -3138,9 +3010,8 @@
 ,Item-wise Price List Rate,मद वार मूल्य सूची दर
 DocType: Purchase Order Item,Supplier Quotation,प्रदायक कोटेशन
 DocType: Quotation,In Words will be visible once you save the Quotation.,शब्दों में दिखाई हो सकता है एक बार आप उद्धरण बचाने के लिए होगा.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +68,Ironing,इस्त्री
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is stopped,{0} {1} बंद कर दिया है
-apps/erpnext/erpnext/stock/doctype/item/item.py +352,Barcode {0} already used in Item {1},बारकोड {0} पहले से ही मद में इस्तेमाल {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +356,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/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,आगामी कार्यक्रम
@@ -3149,13 +3020,12 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +27,Quick Entry,त्वरित एंट्री
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0} वापसी के लिए अनिवार्य है
 DocType: Purchase Order,To Receive,प्राप्त करने के लिए
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +33,Shrink fitting,फिटिंग हटना
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +522,user@example.com,user@example.com
+apps/erpnext/erpnext/public/js/setup_wizard.js +266,user@example.com,user@example.com
 DocType: Email Digest,Income / Expense,आय / व्यय
 DocType: Employee,Personal Email,व्यक्तिगत ईमेल
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +58,Total Variance,कुल विचरण
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +62,Total Variance,कुल विचरण
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.","यदि सक्रिय है, प्रणाली स्वतः सूची के लिए लेखांकन प्रविष्टियों के बाद होगा."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +15,Brokerage,दलाली
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +15,Brokerage,दलाली
 DocType: Address,Postal Code,डाक कोड
 DocType: Production Order Operation,"in Minutes
 Updated via 'Time Log'","मिनट में 
@@ -3163,14 +3033,13 @@
 DocType: Customer,From Lead,लीड से
 apps/erpnext/erpnext/config/manufacturing.py +19,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 +442,POS Profile required to make POS Entry,पीओएस प्रोफ़ाइल पीओएस एंट्री बनाने के लिए आवश्यक
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +444,POS Profile required to make POS Entry,पीओएस प्रोफ़ाइल पीओएस एंट्री बनाने के लिए आवश्यक
 DocType: Hub Settings,Name Token,नाम टोकन
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +106,Planing,Planing
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Selling,मानक बेच
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +120,Standard Selling,मानक बेच
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +137,Atleast one warehouse is mandatory,कम से कम एक गोदाम अनिवार्य है
 DocType: Serial No,Out of Warranty,वारंटी के बाहर
 DocType: BOM Replace Tool,Replace,बदलें
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +314,{0} against Sales Invoice {1},{0} बिक्री चालान के खिलाफ {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +316,{0} against Sales Invoice {1},{0} बिक्री चालान के खिलाफ {1}
 apps/erpnext/erpnext/stock/doctype/item/item.py +49,Please enter default Unit of Measure,उपाय की मूलभूत इकाई दर्ज करें
 DocType: Purchase Invoice Item,Project Name,इस परियोजना का नाम
 DocType: Supplier,Mention if non-standard receivable account,"मेंशन अमानक प्राप्य खाते है, तो"
@@ -3186,9 +3055,8 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,Journal Entry {0} does not have account {1} or already matched against other voucher,जर्नल प्रविष्टि {0} {1} या पहले से ही अन्य वाउचर के खिलाफ मिलान खाता नहीं है
 DocType: Item,Moving Average,चलायमान औसत
 DocType: BOM Replace Tool,The BOM which will be replaced,बीओएम जो प्रतिस्थापित किया जाएगा
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +43,New Stock UOM must be different from current stock UOM,नया स्टॉक UOM मौजूदा स्टॉक UOM से अलग होना चाहिए
 DocType: Account,Debit,नामे
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +34,Leaves must be allocated in multiples of 0.5,पत्तियां 0.5 के गुणकों में आवंटित किया जाना चाहिए
+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/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,बकाया राशि
@@ -3206,8 +3074,7 @@
 DocType: Employee,Internal Work History,आंतरिक कार्य इतिहास
 DocType: DocField,Column Break,स्तंभ विराम
 DocType: Event,Thursday,बृहस्पतिवार
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +42,Private Equity,निजी इक्विटी
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +93,Turning,टर्निंग
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,निजी इक्विटी
 DocType: Maintenance Visit,Customer Feedback,ग्राहक प्रतिक्रिया
 DocType: Account,Expense,व्यय
 DocType: Sales Invoice,Exhibition,प्रदर्शनी
@@ -3220,19 +3087,19 @@
 DocType: Employee,Held On,पर Held
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +33,Production Item,उत्पादन आइटम
 ,Employee Information,कर्मचारी जानकारी
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,Rate (%),दर (% )
+apps/erpnext/erpnext/public/js/setup_wizard.js +294,Rate (%),दर (% )
 DocType: Stock Entry Detail,Additional Cost,अतिरिक्त लागत
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +407,Financial Year End Date,वित्तीय वर्ष की समाप्ति तिथि
+apps/erpnext/erpnext/public/js/setup_wizard.js +155,Financial Year End Date,वित्तीय वर्ष की समाप्ति तिथि
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Voucher No, if grouped by Voucher","वाउचर के आधार पर फ़िल्टर नहीं कर सकते नहीं, वाउचर के आधार पर समूहीकृत अगर"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +484,Make Supplier Quotation,प्रदायक कोटेशन बनाओ
 DocType: Quality Inspection,Incoming,आवक
 DocType: BOM,Materials Required (Exploded),माल आवश्यक (विस्फोट)
 DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),वेतन (LWP) के बिना छुट्टी लिए कमाई कम करें
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +512,"Add users to your organization, other than yourself","खुद के अलावा अन्य, अपने संगठन के लिए उपयोगकर्ताओं को जोड़ें"
+apps/erpnext/erpnext/public/js/setup_wizard.js +256,"Add users to your organization, other than yourself","खुद के अलावा अन्य, अपने संगठन के लिए उपयोगकर्ताओं को जोड़ें"
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No {1} does not match with {2} {3},पंक्ति # {0}: सीरियल नहीं {1} के साथ मेल नहीं खाता {2} {3}
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +44,Casual Leave,आकस्मिक छुट्टी
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +44,Casual Leave,आकस्मिक छुट्टी
 DocType: Batch,Batch ID,बैच आईडी
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +334,Note: {0},नोट : {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +336,Note: {0},नोट : {0}
 ,Delivery Note Trends,डिलिवरी नोट रुझान
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +104,This Week's Summary,इस सप्ताह की सारांश
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +74,{0} must be a Purchased or Sub-Contracted Item in row {1},{0} पंक्ति में एक खरीदे या उप अनुबंधित आइटम होना चाहिए {1}
@@ -3244,7 +3111,7 @@
 DocType: Purchase Receipt,Return Against Purchase Receipt,खरीद रसीद के खिलाफ लौटें
 DocType: Purchase Order,To Bill,बिल
 DocType: Material Request,% Ordered,% का आदेश दिया
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +61,Piecework,ठेका
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Piecework,ठेका
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +64,Avg. Buying Rate,औसत। क्रय दर
 DocType: Task,Actual Time (in Hours),(घंटे में) वास्तविक समय
 DocType: Employee,History In Company,कंपनी में इतिहास
@@ -3261,13 +3128,13 @@
 DocType: Opportunity,To Discuss,चर्चा करने के लिए
 DocType: SMS Settings,SMS Settings,एसएमएस सेटिंग्स
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +60,Temporary Accounts,अस्थाई लेखा
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +155,Black,काली
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Black,काली
 DocType: BOM Explosion Item,BOM Explosion Item,बीओएम धमाका आइटम
 DocType: Account,Auditor,आडिटर
 DocType: Purchase Order,End date of current order's period,वर्तमान आदेश की अवधि की समाप्ति की तारीख
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +17,Make Offer Letter,प्रस्ताव पत्र बनाओ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +10,Return,वापसी
-apps/erpnext/erpnext/stock/doctype/item/item.py +503,Default Unit of Measure for Variant must be same as Template,संस्करण के लिए उपाय की मूलभूत इकाई टेम्पलेट के रूप में ही किया जाना चाहिए
+apps/erpnext/erpnext/stock/doctype/item/item.py +507,Default Unit of Measure for Variant must be same as Template,संस्करण के लिए उपाय की मूलभूत इकाई टेम्पलेट के रूप में ही किया जाना चाहिए
 DocType: DocField,Fold,गुना
 DocType: Production Order Operation,Production Order Operation,उत्पादन का आदेश ऑपरेशन
 DocType: Pricing Rule,Disable,असमर्थ
@@ -3278,13 +3145,12 @@
 DocType: Page,Page Name,पेज का नाम
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +110,To Time must be greater than From Time,समय समय से की तुलना में अधिक से अधिक होना चाहिए
 DocType: Journal Entry Account,Exchange Rate,विनिमय दर
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +465,Sales Order {0} is not submitted,बिक्री आदेश {0} प्रस्तुत नहीं किया गया है
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +467,Sales Order {0} is not submitted,बिक्री आदेश {0} प्रस्तुत नहीं किया गया है
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0}: Parent account {1} does not bolong to the company {2},वेयरहाउस {0}: माता पिता के खाते {1} कंपनी को Bolong नहीं है {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +124,Spindle finishing,तकला परिष्करण
 DocType: BOM,Last Purchase Rate,पिछले खरीद दर
 DocType: Account,Asset,संपत्ति
 DocType: Project Task,Task ID,टास्क आईडी
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +395,"e.g. ""MC""",उदाहरणार्थ
+apps/erpnext/erpnext/public/js/setup_wizard.js +143,"e.g. ""MC""",उदाहरणार्थ
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,Stock cannot exist for Item {0} since has variants,आइटम के लिए मौजूद नहीं कर सकते स्टॉक {0} के बाद से वेरिएंट है
 ,Sales Person-wise Transaction Summary,बिक्री व्यक्ति के लिहाज गतिविधि सारांश
 DocType: System Settings,Time Zone,समय क्षेत्र
@@ -3293,9 +3159,7 @@
 DocType: Monthly Distribution,Monthly Distribution Percentages,मासिक वितरण प्रतिशत
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +16,The selected item cannot have Batch,चयनित आइटम बैच नहीं हो सकता
 DocType: Delivery Note,% of materials delivered against this Delivery Note,% सामग्री को​ इस डिलिवरी नोट के सहारे​​ सुपुर्द किया गया है
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +151,Stapling,स्टैपल
 DocType: Customer,Customer Details,ग्राहक विवरण
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +105,Shaping,आकार देने
 DocType: Employee,Reports to,करने के लिए रिपोर्ट
 DocType: SMS Settings,Enter url parameter for receiver nos,रिसीवर ओपन स्कूल के लिए url पैरामीटर दर्ज करें
 DocType: Sales Invoice,Paid Amount,राशि भुगतान
@@ -3304,13 +3168,13 @@
 DocType: Item Variant,Item Variant,आइटम संस्करण
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +15,Setting this Address Template as default as there is no other default,कोई अन्य डिफ़ॉल्ट रूप में वहाँ डिफ़ॉल्ट के रूप में इस का पता खाका स्थापना
 apps/erpnext/erpnext/accounts/doctype/account/account.py +89,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","खाते की शेष राशि पहले से ही डेबिट में है, कृपया आप शेष राशि को क्रेडिट के रूप में ही रखें"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +76,Quality Management,गुणवत्ता प्रबंधन
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Quality Management,गुणवत्ता प्रबंधन
 DocType: Production Planning Tool,Filter based on customer,ग्राहकों के आधार पर फ़िल्टर
 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}
 DocType: Employee External Work History,Employee External Work History,कर्मचारी बाहरी काम इतिहास
 DocType: Tax Rule,Purchase,क्रय
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +34,Balance Qty,शेष मात्रा
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Balance Qty,शेष मात्रा
 DocType: Item Group,Parent Item Group,माता - पिता आइटम समूह
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +21,{0} for {1},{0} के लिए {1}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +96,Cost Centers,लागत केन्द्रों
@@ -3320,12 +3184,12 @@
 DocType: Opportunity,Next Contact,अगले संपर्क
 DocType: Employee,Employment Type,रोजगार के प्रकार
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,स्थायी संपत्तियाँ
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +84,Application period cannot be across two alocation records,आवेदन की अवधि दो alocation अभिलेखों के पार नहीं किया जा सकता
 DocType: Item Group,Default Expense Account,डिफ़ॉल्ट व्यय खाते
 DocType: Employee,Notice (days),सूचना (दिन)
 DocType: Page,Yes,हां
 DocType: Tax Rule,Sales Tax Template,सेल्स टैक्स खाका
 DocType: Employee,Encashment Date,नकदीकरण तिथि
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +74,Electroforming,Electroforming
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +179,"Against Voucher Type must be one of Purchase Order, Purchase Invoice or Journal Entry","वाउचर के खिलाफ प्रकार की खरीद के आदेश की एक, खरीद चालान या जर्नल प्रविष्टि होना चाहिए"
 DocType: Account,Stock Adjustment,शेयर समायोजन
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +34,Default Activity Cost exists for Activity Type - {0},डिफ़ॉल्ट गतिविधि लागत गतिविधि प्रकार के लिए मौजूद है - {0}
@@ -3361,12 +3225,12 @@
 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,वितरण
 apps/erpnext/erpnext/public/js/pos/pos.html +36,Amount Paid,राशि का भुगतान
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +91,Project Manager,परियोजना प्रबंधक
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +72,Dispatch,प्रेषण
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Project Manager,परियोजना प्रबंधक
+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: Customer,Default Taxes and Charges,डिफ़ॉल्ट करों और शुल्कों
 DocType: Account,Receivable,प्राप्य
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +268,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,पंक्ति # {0}: खरीद आदेश पहले से मौजूद है के रूप में आपूर्तिकर्ता बदलने की अनुमति नहीं
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +263,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.","अगर चेक्ड उप विधानसभा आइटम के लिए बीओएम कच्चे माल प्राप्त करने के लिए विचार किया जाएगा. अन्यथा, सभी उप विधानसभा वस्तुओं एक कच्चे माल के रूप में इलाज किया जाएगा."
@@ -3374,8 +3238,8 @@
 DocType: Hub Settings,Seller Description,विक्रेता विवरण
 DocType: Employee Education,Qualification,योग्यता
 DocType: Item Price,Item Price,मद मूल्य
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +48,Soap & Detergent,साबुन और डिटर्जेंट
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +36,Motion Picture & Video,मोशन पिक्चर और वीडियो
+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,आदेशित
 DocType: Warehouse,Warehouse Name,वेअरहाउस नाम
 DocType: Naming Series,Select Transaction,लेन - देन का चयन करें
@@ -3384,7 +3248,6 @@
 DocType: BOM,Rate Of Materials Based On,सामग्री के आधार पर दर
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,समर्थन Analtyics
 apps/erpnext/erpnext/accounts/doctype/accounts_settings/accounts_settings.py +27,Company is missing in warehouses {0},कंपनी के गोदामों में याद आ रही है {0}
-DocType: Stock UOM Replace Utility,Stock UOM Replace Utility,स्टॉक UOM बदलें उपयोगिता
 DocType: POS Profile,Terms and Conditions,नियम और शर्तें
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,To Date should be within the Fiscal Year. Assuming To Date = {0},तिथि वित्तीय वर्ष के भीतर होना चाहिए. तिथि करने के लिए मान लिया जाये = {0}
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","यहाँ आप ऊंचाई, वजन, एलर्जी, चिकित्सा चिंताओं आदि बनाए रख सकते हैं"
@@ -3396,7 +3259,7 @@
 DocType: Sales Order Item,For Production,उत्पादन के लिए
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +103,Please enter sales order in the above table,उपरोक्त तालिका में विक्रय आदेश दर्ज करें
 DocType: Project Task,View Task,देखें टास्क
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +406,Your financial year begins on,आपकी वित्तीय वर्ष को शुरू होता है
+apps/erpnext/erpnext/public/js/setup_wizard.js +154,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: Email Digest,Add/Remove Recipients,प्राप्तकर्ता जोड़ें / निकालें
@@ -3404,16 +3267,14 @@
 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),समर्थन ईमेल आईडी के लिए सेटअप आवक सर्वर . (जैसे 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 +528,Item variant {0} exists with same attributes,मद संस्करण {0} एक ही गुण के साथ मौजूद है
+apps/erpnext/erpnext/stock/doctype/item/item.py +532,Item variant {0} exists with same attributes,मद संस्करण {0} एक ही गुण के साथ मौजूद है
 DocType: Salary Slip,Salary Slip,वेतनपर्ची
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +116,Burnishing,Burnishing
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +54,'To Date' is required,तिथि करने के लिए आवश्यक है
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,तिथि करने के लिए आवश्यक है
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","संकुल वितरित किए जाने के लिए निकल जाता है पैकिंग उत्पन्न करता है। पैकेज संख्या, पैकेज सामग्री और अपने वजन को सूचित किया।"
 DocType: Sales Invoice Item,Sales Order Item,बिक्री आदेश आइटम
 DocType: Salary Slip,Payment Days,भुगतान दिन
 DocType: BOM,Manage cost of operations,संचालन की लागत का प्रबंधन
 DocType: Features Setup,Item Advanced,आइटम उन्नत
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +40,Hot rolling,हॉट रोलिंग
 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.",", एक चेक किए गए लेनदेन के किसी भी &quot;प्रस्तुत कर रहे हैं&quot; पॉप - अप ईमेल स्वचालित रूप से जुड़े है कि सौदे में &quot;संपर्क&quot; के लिए एक ईमेल भेजने के लिए, एक अनुलग्नक के रूप में लेन - देन के साथ खोला. उपयोगकर्ता या ईमेल भेजने के लिए नहीं हो सकता."
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,वैश्विक सेटिंग्स
 DocType: Employee Education,Employee Education,कर्मचारी शिक्षा
@@ -3426,25 +3287,23 @@
 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/setup/page/setup_wizard/install_fixtures.py +48,Sick Leave,बीमारी छुट्टी
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +174,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/page/setup_wizard/fixtures/industry_type.py +22,Department Stores,विभाग के स्टोर
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,विभाग के स्टोर
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +40,System Balance,सिस्टम बैलेंस
 DocType: Workflow,Is Active,सक्रिय है
 apps/erpnext/erpnext/controllers/stock_controller.py +71,No accounting entries for the following warehouses,निम्नलिखित गोदामों के लिए कोई लेखा प्रविष्टियों
 apps/erpnext/erpnext/projects/doctype/project/project.js +22,Save the document first.,पहले दस्तावेज़ को सहेजें।
 DocType: Account,Chargeable,प्रभार्य
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +121,Linishing,Linishing
 DocType: Company,Change Abbreviation,बदले संक्षिप्त
 DocType: Workflow State,Primary,प्राथमिक
 DocType: Expense Claim Detail,Expense Date,व्यय तिथि
 DocType: Item,Max Discount (%),अधिकतम डिस्काउंट (%)
 DocType: Communication,More Information,अधिक जानकारी
 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/setup/page/setup_wizard/fixtures/operations.py +161,Blasting,नष्ट करना
 DocType: Company,Warn,चेतावनी देना
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +111,Item valuation updated,आइटम वैल्यूएशन अद्यतन
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","किसी भी अन्य टिप्पणी, अभिलेखों में जाना चाहिए कि उल्लेखनीय प्रयास।"
 DocType: BOM,Manufacturing User,विनिर्माण प्रयोक्ता
 DocType: Purchase Order,Raw Materials Supplied,कच्चे माल की आपूर्ति
@@ -3454,7 +3313,7 @@
 DocType: Appraisal,Appraisal Template,मूल्यांकन टेम्पलेट
 DocType: Communication,Email,ईमेल
 DocType: Item Group,Item Classification,आइटम वर्गीकरण
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +89,Business Development Manager,व्यापार विकास प्रबंधक
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Business Development Manager,व्यापार विकास प्रबंधक
 DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,रखरखाव भेंट प्रयोजन
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.js +15,Period,अवधि
 ,General Ledger,सामान्य खाता
@@ -3464,9 +3323,7 @@
 ,Itemwise Recommended Reorder Level,Itemwise पुनःक्रमित स्तर की सिफारिश की
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +264,Please select {0} first,पहला {0} का चयन करें
 DocType: Features Setup,To get Item Group in details table,विवरण तालिका में आइटम समूह
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +67,Redrawing,Redrawing
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +112,Batch {0} of Item {1} has expired.,आइटम के बैच {0} {1} समाप्त हो गया है।
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +120,Etching,नक़्क़ाशी
 DocType: Sales Invoice,Commission,आयोग
 DocType: Address Template,"<h4>Default Template</h4>
 <p>Uses <a href=""http://jinja.pocoo.org/docs/templates/"">Jinja Templating</a> and all the fields of Address (including Custom Fields if any) will be available</p>
@@ -3511,7 +3368,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +340,Operation Time must be greater than 0 for Operation {0},आपरेशन के समय ऑपरेशन के लिए 0 से अधिक होना चाहिए {0}
 DocType: Supplier,Address and Contacts,पता और संपर्क
 DocType: UOM Conversion Detail,UOM Conversion Detail,UOM रूपांतरण विस्तार
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +496,Keep it web friendly 900px (w) by 100px (h),100px द्वारा वेब अनुकूल 900px (डब्ल्यू) रखो यह ( ज)
+apps/erpnext/erpnext/public/js/setup_wizard.js +242,Keep it web friendly 900px (w) by 100px (h),100px द्वारा वेब अनुकूल 900px (डब्ल्यू) रखो यह ( ज)
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +329,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,बकाया वाउचर जाओ
@@ -3527,54 +3384,49 @@
 DocType: Item,Average time taken by the supplier to deliver,सप्लायर द्वारा लिया गया औसत समय देने के लिए
 DocType: Time Log,Hours,घंटे
 DocType: Project,Expected Start Date,उम्मीद प्रारंभ दिनांक
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +38,Rolling,रोलिंग
 DocType: ToDo,Priority,प्राथमिकता
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +41,Remove item if charges is not applicable to that item,आरोप है कि आइटम के लिए लागू नहीं है अगर आइटम निकालें
 DocType: Dropbox Backup,Dropbox Access Allowed,ड्रॉपबॉक्स उपयोग की अनुमति दी
 DocType: Dropbox Backup,Weekly,साप्ताहिक
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,उदा. एपीआई smsgateway.com / / send_sms.cgi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +485,Receive,प्राप्त
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +510,Receive,प्राप्त
 DocType: Maintenance Visit,Fully Completed,पूरी तरह से पूरा
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% पूर्ण
 DocType: Employee,Educational Qualification,शैक्षिक योग्यता
 DocType: Workstation,Operating Costs,परिचालन लागत
 DocType: Employee Leave Approver,Employee Leave Approver,कर्मचारी छुट्टी अनुमोदक
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,{0} has been successfully added to our Newsletter list.,{0} सफलतापूर्वक हमारे न्यूज़लेटर की सूची में जोड़ा गया है।
-apps/erpnext/erpnext/stock/doctype/item/item.py +383,Row {0}: An Reorder entry already exists for this warehouse {1},पंक्ति {0}: एक पुनःक्रमित प्रविष्टि पहले से ही इस गोदाम के लिए मौजूद है {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +387,Row {0}: An Reorder entry already exists for this warehouse {1},पंक्ति {0}: एक पुनःक्रमित प्रविष्टि पहले से ही इस गोदाम के लिए मौजूद है {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +67,"Cannot declare as lost, because Quotation has been made.","खो के रूप में उद्धरण बना दिया गया है , क्योंकि घोषणा नहीं कर सकते हैं ."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +133,Electron beam machining,इलेक्ट्रॉन बीम मशीनिंग
 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 +150,Please select Start Date and End Date for Item {0},प्रारंभ तिथि और आइटम के लिए अंतिम तिथि का चयन करें {0}
 apps/erpnext/erpnext/config/stock.py +141,Main Reports,मुख्य रिपोर्ट
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +102,Stock Ledger entries balances updated,शेयर लेजर अद्यतन शेष प्रविष्टियों
 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 +176,Add / Edit Prices,/ संपादित कीमतों में जोड़ें
+apps/erpnext/erpnext/stock/doctype/item/item.js +178,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 +298,My Orders,मेरे आदेश
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +293,My Orders,मेरे आदेश
 DocType: Price List,Price List Name,मूल्य सूची का नाम
 DocType: Time Log,For Manufacturing,विनिर्माण के लिए
-apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +70,Totals,योग
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +174,Totals,योग
 DocType: BOM,Manufacturing,विनिर्माण
 ,Ordered Items To Be Delivered,हिसाब से दिया जा आइटम
 DocType: Account,Income,आय
 ,Setup Wizard,सेटअप विज़ार्ड
 DocType: Industry Type,Industry Type,उद्योग के प्रकार
 apps/erpnext/erpnext/templates/includes/cart.js +137,Something went wrong!,कुछ गलत हो गया!
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +68,Warning: Leave application contains following block dates,चेतावनी: अवकाश आवेदन निम्न ब्लॉक दिनांक शामिल
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +251,Sales Invoice {0} has already been submitted,बिक्री चालान {0} पहले से ही प्रस्तुत किया गया है
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +100,Warning: Leave application contains following block dates,चेतावनी: अवकाश आवेदन निम्न ब्लॉक दिनांक शामिल
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +256,Sales Invoice {0} has already been submitted,बिक्री चालान {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/setup/page/setup_wizard/fixtures/operations.py +10,Die casting,कास्टिंग मरो
 DocType: Email Alert,Reference Date,संदर्भ तिथि
 apps/erpnext/erpnext/config/hr.py +105,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,भेजने से पहले संदेश प्रविष्ट करें
 DocType: Async Task,Status,हैसियत
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +65,Stock UOM updated for Item {0},शेयर UOM आइटम के लिए अद्यतन {0}
 DocType: Company History,Year,वर्ष
 apps/erpnext/erpnext/config/accounts.py +127,Point-of-Sale Profile,प्वाइंट-ऑफ-सेल प्रोफ़ाइल
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +68,Please Update SMS Settings,एसएमएस सेटिंग को अपडेट करें
@@ -3588,12 +3440,12 @@
 ,Serial No Service Contract Expiry,धारावाहिक नहीं सेवा अनुबंध समाप्ति
 DocType: Item,Unit of Measure Conversion,उपाय रूपांतरण की इकाई
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +86,Employee can not be changed,कर्मचारी बदला नहीं जा सकता
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +259,You cannot credit and debit same account at the same time,आप क्रेडिट और एक ही समय में एक ही खाते से डेबिट नहीं कर सकते
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,You cannot credit and debit same account at the same time,आप क्रेडिट और एक ही समय में एक ही खाते से डेबिट नहीं कर सकते
 DocType: Naming Series,Help HTML,HTML मदद
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},कुल आवंटित वेटेज 100 % होना चाहिए . यह है {0}
 apps/erpnext/erpnext/controllers/status_updater.py +140,Allowance for over-{0} crossed for Item {1},भत्ता खत्म-{0} मद के लिए पार कर लिए {1}
 DocType: Address,Name of person or organization that this address belongs to.,कि इस पते पर संबधित व्यक्ति या संगठन का नाम.
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +587,Your Suppliers,अपने आपूर्तिकर्ताओं
+apps/erpnext/erpnext/public/js/setup_wizard.js +325,Your Suppliers,अपने आपूर्तिकर्ताओं
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,बिक्री आदेश किया जाता है के रूप में खो के रूप में सेट नहीं कर सकता .
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +65,Another Salary Structure {0} is active for employee {1}. Please make its status 'Inactive' to proceed.,एक और वेतन ढांचे {0} कर्मचारी के लिए सक्रिय है {1}। अपनी स्थिति को 'निष्क्रिय' आगे बढ़ने के लिए करें।
 DocType: Purchase Invoice,Contact,संपर्क
@@ -3602,37 +3454,35 @@
 DocType: Item,Has Serial No,नहीं सीरियल गया है
 DocType: Employee,Date of Issue,जारी करने की तारीख
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +16,{0}: From {0} for {1},{0}: {0} के लिए {1}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +154,Row #{0}: Set Supplier for item {1},पंक्ति # {0}: आइटम के लिए सेट प्रदायक {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +149,Row #{0}: Set Supplier for item {1},पंक्ति # {0}: आइटम के लिए सेट प्रदायक {1}
 DocType: Issue,Content Type,सामग्री प्रकार
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +17,Computer,कंप्यूटर
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,कंप्यूटर
 DocType: Item,List this Item in multiple groups on the website.,कई समूहों में वेबसाइट पर इस मद की सूची.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +283,Please check Multi Currency option to allow accounts with other currency,अन्य मुद्रा के साथ खातों अनुमति देने के लिए बहु मुद्रा विकल्प की जाँच करें
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +285,Please check Multi Currency option to allow accounts with other currency,अन्य मुद्रा के साथ खातों अनुमति देने के लिए बहु मुद्रा विकल्प की जाँच करें
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +62,Item: {0} does not exist in the system,आइटम: {0} सिस्टम में मौजूद नहीं है
 apps/erpnext/erpnext/accounts/doctype/account/account.py +81,You are not authorized to set Frozen value,आप स्थिर मूल्य निर्धारित करने के लिए अधिकृत नहीं हैं
 DocType: Payment Reconciliation,Get Unreconciled Entries,Unreconciled प्रविष्टियां प्राप्त करें
 DocType: Cost Center,Budgets,बजट
 apps/frappe/frappe/core/page/modules_setup/modules_setup.py +11,Updated,अद्यतित
 DocType: Employee,Emergency Contact Details,आपातकालीन सम्पर्क करने का विवरण
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +396,What does it do?,यह क्या करता है?
+apps/erpnext/erpnext/public/js/setup_wizard.js +144,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,औसत कमीशन दर
-apps/erpnext/erpnext/stock/doctype/item/item.py +313,'Has Serial No' can not be 'Yes' for non-stock item,गैर स्टॉक आइटम के लिए क्रमांक 'हाँ' नहीं हो सकता
+apps/erpnext/erpnext/stock/doctype/item/item.py +317,'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/setup/page/setup_wizard/install_fixtures.py +111,Electrical,विद्युत
+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 +302,Row {0}: Exchange Rate is mandatory,पंक्ति {0}: विनिमय दर अनिवार्य है
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +304,Row {0}: Exchange Rate is mandatory,पंक्ति {0}: विनिमय दर अनिवार्य है
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},यूजर आईडी कर्मचारी के लिए सेट नहीं {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +72,Peening,Peening
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,From Warranty Claim,वारंटी दावे से
 DocType: Stock Entry,Default Source Warehouse,डिफ़ॉल्ट स्रोत वेअरहाउस
 DocType: Item,Customer Code,ग्राहक कोड
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +212,Birthday Reminder for {0},के लिए जन्मदिन अनुस्मारक {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +163,Lapping,Lapping
-apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.js +8,Days Since Last Order,दिनों से पिछले आदेश
+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 +299,Debit To account must be a Balance Sheet account,खाते में डेबिट एक बैलेंस शीट खाता होना चाहिए
 DocType: Buying Settings,Naming Series,श्रृंखला का नामकरण
 DocType: Leave Block List,Leave Block List Name,ब्लॉक सूची नाम छोड़ दो
@@ -3646,7 +3496,7 @@
 DocType: Notification Control,Sales Invoice Message,बिक्री चालान संदेश
 DocType: Authorization Rule,Based On,के आधार पर
 DocType: Sales Order Item,Ordered Qty,मात्रा का आदेश दिया
-apps/erpnext/erpnext/stock/doctype/item/item.py +539,Item {0} is disabled,मद {0} अक्षम हो जाता है
+apps/erpnext/erpnext/stock/doctype/item/item.py +543,Item {0} is disabled,मद {0} अक्षम हो जाता है
 DocType: Stock Settings,Stock Frozen Upto,स्टॉक तक जमे हुए
 apps/erpnext/erpnext/controllers/recurring_document.py +166,Period From and Period To dates mandatory for recurring {0},से और अवधि आवर्ती के लिए अनिवार्य तिथियाँ तक की अवधि के {0}
 apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,परियोजना / कार्य कार्य.
@@ -3656,7 +3506,6 @@
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,सबसे कम से कम 100 होना चाहिए
 DocType: ToDo,Low,निम्न
 DocType: Purchase Invoice,Write Off Amount (Company Currency),राशि से लिखें (कंपनी मुद्रा)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +71,Spinning,कताई
 DocType: Landed Cost Voucher,Landed Cost Voucher,उतरा लागत वाउचर
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +55,Please set {0},सेट करें {0}
 DocType: Purchase Invoice,Repeat on Day of Month,महीने का दिन पर दोहराएँ
@@ -3678,7 +3527,6 @@
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +37,Campaign Name is required,अभियान का नाम आवश्यक है
 DocType: Maintenance Visit,Maintenance Date,रखरखाव तिथि
 DocType: Purchase Receipt Item,Rejected Serial No,अस्वीकृत धारावाहिक नहीं
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +51,Deep drawing,गहरी ड्राइंग
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +40,New Newsletter,नई न्यूज़लेटर
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +157,Start date should be less than end date for Item {0},प्रारंभ तिथि मद के लिए समाप्ति तिथि से कम होना चाहिए {0}
 apps/erpnext/erpnext/stock/doctype/item/item.js +17,Show Balance,दिखाएँ बैलेंस
@@ -3689,7 +3537,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +119,BOM and Manufacturing Quantity are required,बीओएम और विनिर्माण मात्रा की आवश्यकता होती है
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,बूढ़े रेंज 2
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +450,Amount,राशि
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +147,Riveting,Riveting
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,बीओएम प्रतिस्थापित
 ,Sales Analytics,बिक्री विश्लेषिकी
 DocType: Manufacturing Settings,Manufacturing Settings,विनिर्माण सेटिंग्स
@@ -3701,20 +3548,19 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +207,New Account Name,नया खाता नाम
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,कच्चे माल की लागत की आपूर्ति
 DocType: Selling Settings,Settings for Selling Module,मॉड्यूल बेचना के लिए सेटिंग
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +73,Customer Service,ग्राहक सेवा
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Customer Service,ग्राहक सेवा
 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.,ऑफर उम्मीदवार एक नौकरी।
 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 +70,Item {0} must be a stock Item,आइटम {0} भंडार वस्तु होना चाहिए
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,प्रगति गोदाम में डिफ़ॉल्ट वर्क
 apps/erpnext/erpnext/config/accounts.py +107,Default settings for accounting transactions.,लेखांकन लेनदेन के लिए डिफ़ॉल्ट सेटिंग्स .
 apps/frappe/frappe/model/naming.py +40,{0} is required,{0} के लिए आवश्यक है
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +21,Vacuum molding,वैक्यूम मोल्डिंग
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,उम्मीद की तारीख सामग्री अनुरोध तिथि से पहले नहीं हो सकता
 DocType: Contact Us Settings,City,शहर
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +132,Ultrasonic machining,अल्ट्रासोनिक मशीनिंग
 apps/frappe/frappe/templates/base.html +137,Error: Not a valid id?,त्रुटि: नहीं एक वैध पहचान?
 apps/erpnext/erpnext/stock/get_item_details.py +125,Item {0} must be a Sales Item,आइटम {0} एक बिक्री आइटम होना चाहिए
 DocType: Naming Series,Update Series Number,अद्यतन सीरीज नंबर
@@ -3722,7 +3568,7 @@
 DocType: Sales Order,Printing Details,मुद्रण विवरण
 DocType: Task,Closing Date,तिथि समापन
 DocType: Sales Order Item,Produced Quantity,उत्पादित मात्रा
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +84,Engineer,इंजीनियर
+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 +379,Item Code required at Row No {0},रो नहीं पर आवश्यक मद कोड {0}
 DocType: Sales Partner,Partner Type,साथी के प्रकार
@@ -3730,7 +3576,7 @@
 DocType: Authorization Rule,Customerwise Discount,Customerwise डिस्काउंट
 DocType: Purchase Invoice,Against Expense Account,व्यय खाते के खिलाफ
 DocType: Production Order,Production Order,उत्पादन का आदेश
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +258,Installation Note {0} has already been submitted,स्थापना नोट {0} पहले से ही प्रस्तुत किया गया है
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +263,Installation Note {0} has already been submitted,स्थापना नोट {0} पहले से ही प्रस्तुत किया गया है
 DocType: Quotation Item,Against Docname,Docname खिलाफ
 DocType: SMS Center,All Employee (Active),सभी कर्मचारी (सक्रिय)
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,अब देखें
@@ -3739,19 +3585,19 @@
 DocType: Item,Re-Order Level,स्तर पुनः क्रमित करें
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,"वस्तुओं और योजना बनाई मात्रा दर्ज करें, जिसके लिए आप उत्पादन के आदेश को बढ़ाने या विश्लेषण के लिए कच्चे माल के डाउनलोड करना चाहते हैं."
 apps/frappe/frappe/public/js/frappe/views/ganttview.js +45,Gantt Chart,Gantt चार्ट
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +57,Part-time,अंशकालिक
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,Part-time,अंशकालिक
 DocType: Employee,Applicable Holiday List,लागू अवकाश सूची
 DocType: Employee,Cheque,चैक
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,सीरीज नवीनीकृत
 apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Report Type is mandatory,रिपोर्ट प्रकार अनिवार्य है
 DocType: Item,Serial Number Series,सीरियल नंबर सीरीज
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},गोदाम स्टॉक मद के लिए अनिवार्य है {0} पंक्ति में {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +45,Retail & Wholesale,खुदरा और थोक
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,खुदरा और थोक
 DocType: Issue,First Responded On,पर पहले जवाब
 DocType: Website Item Group,Cross Listing of Item in multiple groups,कई समूहों में आइटम के क्रॉस लिस्टिंग
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +351,The First User: You,पहले उपयोगकर्ता : आप
+apps/erpnext/erpnext/public/js/setup_wizard.js +101,The First User: You,पहले उपयोगकर्ता : आप
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +48,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 +172,Successfully Reconciled,सफलतापूर्वक राज़ी
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +119,Successfully Reconciled,सफलतापूर्वक राज़ी
 DocType: Production Order,Planned End Date,नियोजित समाप्ति तिथि
 apps/erpnext/erpnext/config/stock.py +43,Where items are stored.,आइटम कहाँ संग्रहीत हैं.
 DocType: Tax Rule,Validity,वैधता
@@ -3771,39 +3617,36 @@
 DocType: DocPerm,Level,स्तर
 DocType: Purchase Taxes and Charges,On Net Total,नेट कुल
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +160,Target warehouse in row {0} must be same as Production Order,पंक्ति में लक्ष्य गोदाम {0} के रूप में ही किया जाना चाहिए उत्पादन का आदेश
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +59,No permission to use Payment Tool,कोई अनुमति नहीं भुगतान उपकरण का उपयोग करने के लिए
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +97,No permission to use Payment Tool,कोई अनुमति नहीं भुगतान उपकरण का उपयोग करने के लिए
 apps/erpnext/erpnext/controllers/recurring_document.py +192,'Notification Email Addresses' not specified for recurring %s,% की आवर्ती के लिए निर्दिष्ट नहीं 'सूचना ईमेल पते'
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +86,Milling,पिसाई
 apps/erpnext/erpnext/accounts/doctype/account/account.py +99,Currency can not be changed after making entries using some other currency,मुद्रा कुछ अन्य मुद्रा का उपयोग प्रविष्टियों करने के बाद बदला नहीं जा सकता
 DocType: Company,Round Off Account,खाता बंद दौर
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +60,Nibbling,Nibbling
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,प्रशासन - व्यय
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +18,Consulting,परामर्श
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +18,Consulting,परामर्श
 DocType: Customer Group,Parent Customer Group,माता - पिता ग्राहक समूह
 apps/erpnext/erpnext/public/js/pos/pos.js +429,Change,परिवर्तन
 DocType: Purchase Invoice,Contact Email,संपर्क ईमेल
 DocType: Appraisal Goal,Score Earned,स्कोर अर्जित
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +393,"e.g. ""My Company LLC""",उदाहरणार्थ
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +173,Notice Period,नोटिस की अवधि
+apps/erpnext/erpnext/public/js/setup_wizard.js +141,"e.g. ""My Company LLC""",उदाहरणार्थ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +173,Notice Period,नोटिस की अवधि
 DocType: Bank Reconciliation Detail,Voucher ID,वाउचर आईडी
 apps/erpnext/erpnext/setup/doctype/territory/territory.js +14,This is a root territory and cannot be edited.,यह एक जड़ क्षेत्र है और संपादित नहीं किया जा सकता है .
 DocType: Packing Slip,Gross Weight UOM,सकल वजन UOM
 DocType: Email Digest,Receivables / Payables,प्राप्तियों / देय
 DocType: Delivery Note Item,Against Sales Invoice,बिक्री चालान के खिलाफ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +63,Stamping,मुद्रांकन
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +457,Credit Account,क्रेडिट खाता
 DocType: Landed Cost Item,Landed Cost Item,आयातित माल की लागत मद
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +56,Show zero values,शून्य मूल्यों को दिखाने
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,वस्तु की मात्रा विनिर्माण / कच्चे माल की दी गई मात्रा से repacking के बाद प्राप्त
 DocType: Payment Reconciliation,Receivable / Payable Account,प्राप्य / देय खाता
 DocType: Delivery Note Item,Against Sales Order Item,बिक्री आदेश आइटम के खिलाफ
-apps/erpnext/erpnext/stock/doctype/item/item.py +521,Please specify Attribute Value for attribute {0},विशेषता के लिए विशेषता मान निर्दिष्ट करें {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +525,Please specify Attribute Value for attribute {0},विशेषता के लिए विशेषता मान निर्दिष्ट करें {0}
 DocType: Item,Default Warehouse,डिफ़ॉल्ट गोदाम
 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,राशि के बिना प्रिंट
-apps/erpnext/erpnext/controllers/buying_controller.py +69,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,टैक्स श्रेणी ' मूल्यांकन ' या ' मूल्यांकन और कुल ' सभी आइटम गैर स्टॉक वस्तुओं रहे हैं के रूप में नहीं किया जा सकता
+apps/erpnext/erpnext/controllers/buying_controller.py +60,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,टैक्स श्रेणी ' मूल्यांकन ' या ' मूल्यांकन और कुल ' सभी आइटम गैर स्टॉक वस्तुओं रहे हैं के रूप में नहीं किया जा सकता
 DocType: User,Last Name,सरनेम
 DocType: Web Page,Left,वाम
 DocType: Event,All Day,सभी दिन
@@ -3811,7 +3654,7 @@
 DocType: Appraisal,Total Score (Out of 5),कुल स्कोर (5 से बाहर)
 DocType: Contact Us Settings,State,राज्य
 DocType: Batch,Batch,बैच
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +51,Balance,संतुलन
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +28,Balance,संतुलन
 DocType: Project,Total Expense Claim (via Expense Claims),कुल खर्च दावा (खर्च का दावा के माध्यम से)
 DocType: User,Gender,लिंग
 DocType: Journal Entry,Debit Note,डेबिट नोट
@@ -3841,8 +3684,7 @@
 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/setup/page/setup_wizard/fixtures/operations.py +76,Seaming,Seaming
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +197,"Company Email ID not found, hence mail not sent","कंपनी ईमेल आईडी नहीं मिला , इसलिए नहीं भेजा मेल"
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +206,"Company Email ID not found, hence mail not sent","कंपनी ईमेल आईडी नहीं मिला , इसलिए नहीं भेजा मेल"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),फंड के अनुप्रयोग ( संपत्ति)
 DocType: Production Planning Tool,Filter based on item,आइटम के आधार पर फ़िल्टर
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +451,Debit Account,डेबिट अकाउंट
@@ -3854,17 +3696,16 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +95,{0} {1} has been modified. Please refresh.,{0} {1} संशोधित किया गया है . ताज़ा करें.
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,निम्नलिखित दिन पर छुट्टी अनुप्रयोग बनाने से उपयोगकर्ताओं को बंद करो.
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +591,From Opportunity,मौके से
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +46,Blanking,ब्लैंकिंग
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +166,Employee Benefits,कर्मचारी लाभ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,Employee Benefits,कर्मचारी लाभ
 DocType: Sales Invoice,Is POS,स्थिति है
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +240,Packed quantity must equal quantity for Item {0} in row {1},{0} पंक्ति में {1} पैक्ड मात्रा आइटम के लिए मात्रा के बराबर होना चाहिए
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +245,Packed quantity must equal quantity for Item {0} in row {1},{0} पंक्ति में {1} पैक्ड मात्रा आइटम के लिए मात्रा के बराबर होना चाहिए
 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.,बिलों ग्राहकों के लिए उठाया.
 DocType: DocField,Default,चूक
 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 +466,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},पंक्ति कोई {0}: राशि व्यय दावा {1} के खिलाफ राशि लंबित से अधिक नहीं हो सकता है। लंबित राशि है {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +468,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} ग्राहक जोड़े
 DocType: Maintenance Schedule,Schedule,अनुसूची
 DocType: Cost Center,"Define Budget for this Cost Center. To set budget action, see ""Company List""","इस लागत केंद्र के लिए बजट को परिभाषित करें। बजट कार्रवाई निर्धारित करने के लिए, देखने के लिए &quot;कंपनी सूची&quot;"
@@ -3875,7 +3716,7 @@
 apps/erpnext/erpnext/public/js/pos/pos.js +91,Price List not found or disabled,मूल्य सूची पाया या निष्क्रिय नहीं
 DocType: Expense Claim,Approved,अनुमोदित
 DocType: Pricing Rule,Price,कीमत
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +79,Employee relieved on {0} must be set as 'Left',{0} को राहत मिली कर्मचारी 'वाम ' के रूप में स्थापित किया जाना चाहिए
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +88,Employee relieved on {0} must be set as 'Left',{0} को राहत मिली कर्मचारी 'वाम ' के रूप में स्थापित किया जाना चाहिए
 DocType: Item,"Selecting ""Yes"" will give a unique identity to each entity of this item which can be viewed in the Serial No master.",&quot;हाँ&quot; का चयन जो कोई मास्टर सीरियल में देखा जा सकता है इस मद की प्रत्येक इकाई के लिए एक अद्वितीय पहचान दे देंगे.
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +39,Appraisal {0} created for Employee {1} in the given date range,मूल्यांकन {0} {1} निश्चित तिथि सीमा में कर्मचारी के लिए बनाया
 DocType: Employee,Education,शिक्षा
@@ -3886,7 +3727,7 @@
 apps/frappe/frappe/desk/moduleview.py +67,Standard Reports,मानक रिपोर्ट
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,लेखा पत्रिका प्रविष्टियों.
 DocType: Delivery Note Item,Available Qty at From Warehouse,गोदाम से पर उपलब्ध मात्रा
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +209,Please select Employee Record first.,पहले कर्मचारी रिकॉर्ड का चयन करें।
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +224,Please select Employee Record first.,पहले कर्मचारी रिकॉर्ड का चयन करें।
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,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 +233,Please enter Expense Account,व्यय खाते में प्रवेश करें
@@ -3899,46 +3740,43 @@
 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,उपरोक्त मानदंडों के आधार पर बिक्री के आदेश (वितरित करने के लिए लंबित) खींचो
 DocType: DocShare,Document Type,दस्तावेज़ प्रकार
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +565,From Supplier Quotation,प्रदायक से उद्धरण
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +588,From Supplier Quotation,प्रदायक से उद्धरण
 DocType: Deduction Type,Deduction Type,कटौती के प्रकार
 DocType: Attendance,Half Day,आधे दिन
 DocType: Pricing Rule,Min Qty,न्यूनतम मात्रा
 DocType: Features Setup,"To track items in sales and purchase documents with batch nos. ""Preferred Industry: Chemicals""",बैच ओपन स्कूल के साथ बिक्री और खरीद के दस्तावेजों में आइटम को ट्रैक करने के लिए। &quot;पसंदीदा उद्योग: रसायन&quot;
 DocType: GL Entry,Transaction Date,लेनदेन की तारीख
 DocType: Production Plan Item,Planned Qty,नियोजित मात्रा
-apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +91,Total Tax,कुल कर
+apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +93,Total Tax,कुल कर
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +178,For Quantity (Manufactured Qty) is mandatory,मात्रा के लिए (मात्रा निर्मित) अनिवार्य है
 DocType: Stock Entry,Default Target Warehouse,डिफ़ॉल्ट लक्ष्य वेअरहाउस
 DocType: Purchase Invoice,Net Total (Company Currency),नेट कुल (कंपनी मुद्रा)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +79,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,पंक्ति {0}: पार्टी के प्रकार और पार्टी प्राप्य / देय खाते के विरुद्ध ही लागू है
 DocType: Notification Control,Purchase Receipt Message,खरीद रसीद संदेश
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +95,Total allocated leaves are more than period,कुल आवंटित पत्ते अवधि की तुलना में अधिक कर रहे हैं
 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.,आइटम आंदोलन रिकार्ड.
 DocType: Newsletter List Subscriber,Newsletter List Subscriber,न्यूज़लेटर सूची सब्सक्राइबर
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +164,Morticing,Morticing
 DocType: Email Account,Service,सेवा
 DocType: Hub Settings,Hub Settings,हब सेटिंग्स
 DocType: Project,Gross Margin %,सकल मार्जिन%
 DocType: BOM,With Operations,आपरेशनों के साथ
 apps/erpnext/erpnext/accounts/party.py +232,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,लेखांकन प्रविष्टियों पहले से ही मुद्रा में किया गया है {0} कंपनी के लिए {1}। मुद्रा के साथ एक प्राप्य या देय खाते का चयन करें {0}।
 ,Monthly Salary Register,मासिक वेतन रेजिस्टर
-apps/frappe/frappe/website/template.py +140,Next,अगला
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard_page.html +17,Next,अगला
 DocType: Warranty Claim,If different than customer address,यदि ग्राहक पते से अलग
 DocType: BOM Operation,BOM Operation,बीओएम ऑपरेशन
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +118,Electropolishing,Electropolishing
 DocType: Purchase Taxes and Charges,On Previous Row Amount,पिछली पंक्ति राशि पर
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +24,Please enter Payment Amount in atleast one row,कम से कम एक पंक्ति में भुगतान राशि दर्ज करें
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +33,Please enter Payment Amount in atleast one row,कम से कम एक पंक्ति में भुगतान राशि दर्ज करें
 DocType: POS Profile,POS Profile,पीओएस प्रोफ़ाइल
 apps/erpnext/erpnext/config/accounts.py +153,"Seasonality for setting budgets, targets etc.","सेटिंग बजट, लक्ष्य आदि के लिए मौसम"
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +238,Row {0}: Payment Amount cannot be greater than Outstanding Amount,पंक्ति {0}: भुगतान की गई राशि बकाया राशि से अधिक नहीं हो सकता है
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +46,Total Unpaid,अवैतनिक कुल
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +21,Time Log is not billable,समय लॉग बिल नहीं है
 apps/erpnext/erpnext/stock/get_item_details.py +128,"Item {0} is a template, please select one of its variants","{0} आइटम एक टेम्पलेट है, इसके वेरिएंट में से एक का चयन करें"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +528,Purchaser,खरीदार
+apps/erpnext/erpnext/public/js/setup_wizard.js +272,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 +71,Please enter the Against Vouchers manually,मैन्युअल रूप खिलाफ वाउचर दर्ज करें
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +107,Please enter the Against Vouchers manually,मैन्युअल रूप खिलाफ वाउचर दर्ज करें
 DocType: SMS Settings,Static Parameters,स्टेटिक पैरामीटर
 DocType: Purchase Order,Advance Paid,अग्रिम भुगतान
 DocType: Item,Item Tax,आइटम टैक्स
@@ -3947,14 +3785,12 @@
 apps/erpnext/erpnext/config/crm.py +48,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 +57,Actual Qty is mandatory,वास्तविक मात्रा अनिवार्य है
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +42,Cross-rolling,क्रॉस-रोलिंग
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +132,Credit Card,क्रेडिट कार्ड
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +132,Credit Card,क्रेडिट कार्ड
 DocType: BOM,Item to be manufactured or repacked,आइटम निर्मित किया जा या repacked
 apps/erpnext/erpnext/config/stock.py +95,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,करों और शुल्कों दर्ज करें
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +85,Machining,मशीनिंग
 DocType: Sales Invoice Item,Drop Ship,ड्रॉप जहाज
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","यहाँ आप परिवार और माता - पिता, पति या पत्नी और बच्चों के नाम, व्यवसाय की तरह बनाए रख सकते हैं"
 DocType: Hub Settings,Seller Name,विक्रेता का नाम
@@ -3964,7 +3800,7 @@
 DocType: Stock Entry,Repack,Repack
 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/setup/page/setup_wizard/setup_wizard.js +500,Attach Logo,लोगो अटैच
+apps/erpnext/erpnext/public/js/setup_wizard.js +246,Attach Logo,लोगो अटैच
 DocType: Customer,Commission Rate,आयोग दर
 apps/erpnext/erpnext/stock/doctype/item/item.js +38,Make Variant,संस्करण बनाओ
 apps/erpnext/erpnext/config/hr.py +145,Block leave applications by department.,विभाग द्वारा आवेदन छोड़ मै.
@@ -3979,19 +3815,19 @@
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +105,Please select a csv file,एक csv फ़ाइल का चयन करें
 DocType: Dropbox Backup,Send Backups to Dropbox,ड्रॉपबॉक्स के लिए बैकअप भेजें
 DocType: Purchase Order,To Receive and Bill,प्राप्त करें और बिल के लिए
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +94,Designer,डिज़ाइनर
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Designer,डिज़ाइनर
 apps/erpnext/erpnext/config/selling.py +121,Terms and Conditions Template,नियमों और शर्तों टेम्पलेट
 DocType: Serial No,Delivery Details,वितरण विवरण
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +383,Cost Center is required in row {0} in Taxes table for type {1},लागत केंद्र पंक्ति में आवश्यक है {0} कर तालिका में प्रकार के लिए {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +386,Cost Center is required in row {0} in Taxes table for type {1},लागत केंद्र पंक्ति में आवश्यक है {0} कर तालिका में प्रकार के लिए {1}
 DocType: Item,Automatically create Material Request if quantity falls below this level,मात्रा इस स्तर से नीचे गिरता है तो स्वतः सामग्री अनुरोध बनाने
 ,Item-wise Purchase Register,आइटम के लिहाज से खरीद पंजीकृत करें
 DocType: Batch,Expiry Date,समाप्ति दिनांक
-apps/erpnext/erpnext/stock/doctype/item/item.py +375,"To set reorder level, item must be a Purchase Item or Manufacturing Item","पुनःक्रमित स्तर सेट करने के लिए, आइटम एक क्रय मद या विनिर्माण आइटम होना चाहिए"
+apps/erpnext/erpnext/stock/doctype/item/item.py +379,"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.,मास्टर परियोजना.
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,$ मुद्राओं की बगल आदि की तरह किसी भी प्रतीक नहीं दिखा.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +330, (Half Day),(आधा दिन)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +374, (Half Day),(आधा दिन)
 DocType: Supplier,Credit Days,क्रेडिट दिन
 DocType: Leave Type,Is Carry Forward,क्या आगे ले जाना
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +478,Get Items from BOM,बीओएम से आइटम प्राप्त
@@ -3999,7 +3835,7 @@
 apps/erpnext/erpnext/config/manufacturing.py +120,Bill of Materials,सामग्री के बिल
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +77,Row {0}: Party Type and Party is required for Receivable / Payable account {1},पंक्ति {0}: पार्टी के प्रकार और पार्टी प्राप्य / देय खाते के लिए आवश्यक है {1}
 DocType: Dropbox Backup,Send Notifications To,करने के लिए सूचनाएं भेजें
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html +26,Ref Date,रेफरी की तिथि
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +54,Ref Date,रेफरी की तिथि
 DocType: Employee,Reason for Leaving,छोड़ने के लिए कारण
 DocType: Expense Claim Detail,Sanctioned Amount,स्वीकृत राशि
 DocType: GL Entry,Is Opening,है खोलने
@@ -4007,4 +3843,3 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +188,Account {0} does not exist,खाते {0} मौजूद नहीं है
 DocType: Account,Cash,नकद
 DocType: Employee,Short biography for website and other publications.,वेबसाइट और अन्य प्रकाशनों के लिए लघु जीवनी.
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +31,Please create Salary Structure for employee {0},कर्मचारी के लिए वेतन संरचना बनाने कृपया {0}
diff --git a/erpnext/translations/hr.csv b/erpnext/translations/hr.csv
index 0219575..fd8289a 100644
--- a/erpnext/translations/hr.csv
+++ b/erpnext/translations/hr.csv
@@ -1,13 +1,12 @@
 DocType: Employee,Salary Mode,Plaća način
 DocType: Cost Center,"Select Monthly Distribution, if you want to track based on seasonality.","Odaberite mjesečna distribucija, ako želite pratiti temelji na sezonalnost."
 DocType: Employee,Divorced,Rastavljen
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +86,Warning: Same item has been entered multiple times.,Upozorenje: Isti predmet je ušao više puta.
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +80,Warning: Same item has been entered multiple times.,Upozorenje: Isti predmet je ušao više puta.
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +96,Items already synced,Stavke već sinkronizirane
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,Dopusti Stavka biti dodan više puta u transakciji
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,Odustani Materijal Posjetite {0} prije otkazivanja ovog jamstva se
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +19,Consumer Products,Consumer Products
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,Consumer Products
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +68,Please select Party Type first,Odaberite Party Tip prvi
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +90,Annealing,Prekaljivanje
 DocType: Item,Customer Items,Korisnički Stavke
 apps/erpnext/erpnext/accounts/doctype/account/account.py +45,Account {0}: Parent account {1} can not be a ledger,Račun {0}: nadređeni račun {1} ne može biti glavna knjiga
 DocType: Item,Publish Item to hub.erpnext.com,Objavi stavka to hub.erpnext.com
@@ -20,15 +19,14 @@
 DocType: About Us Settings,Website,Web stranica
 DocType: POS Profile,Applicable for User,Primjenjivo za članove
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +169,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Zaustavljen Proizvodnja Red ne može biti otkazana, odčepiti najprije otkazati"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +23,Compaction plus sintering,Priključci uz sinteriranje
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,Currency is required for Price List {0},Valuta je potrebno za Cjenika {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Bit će izračunata u transakciji.
 DocType: Purchase Order,Customer Contact,Kupac Kontakt
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +549,From Material Request,Od materijala zahtjev
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +572,From Material Request,Od materijala zahtjev
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} Tree
 DocType: Job Applicant,Job Applicant,Posao podnositelj
 apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,Nema više rezultata.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +78,Legal,Pravni
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +34,Legal,Pravni
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +114,Actual type tax cannot be included in Item rate in row {0},Stvarni tipa porez ne može biti uključen u stopu stavka u nizu {0}
 DocType: C-Form,Customer,Kupac
 DocType: Purchase Receipt Item,Required By,Potrebna Do
@@ -43,7 +41,6 @@
 DocType: Manufacturing Settings,Default 10 mins,Default 10 min
 DocType: Leave Type,Leave Type Name,Naziv vrste odsustva
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +148,Series Updated Successfully,Serija je uspješno ažurirana
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +150,Stitching,Šivanje
 DocType: Pricing Rule,Apply On,Nanesite na
 DocType: Item Price,Multiple Item prices.,Višestruke cijene proizvoda.
 ,Purchase Order Items To Be Received,Proizvodi narudžbe kupnje - za zaprimiti
@@ -51,8 +48,8 @@
 DocType: Quality Inspection Reading,Parameter,Parametar
 apps/erpnext/erpnext/projects/doctype/project/project.py +43,Expected End Date can not be less than Expected Start Date,Očekivani datum završetka ne može biti manji od očekivanog početka Datum
 apps/erpnext/erpnext/utilities/transaction_base.py +104,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Red # {0}: Ocijenite mora biti ista kao {1}: {2} ({3} / {4})
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +189,New Leave Application,Novi dopust Primjena
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +134,Bank Draft,Bank Nacrt
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +204,New Leave Application,Novi dopust Primjena
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +134,Bank Draft,Bank Nacrt
 DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,1. Za održavanje kupaca mudar Šifra i kako bi ih pretraživati ​​na temelju svog koda koristiti ovu opciju
 DocType: Mode of Payment Account,Mode of Payment Account,Način plaćanja računa
 apps/erpnext/erpnext/stock/doctype/item/item.js +34,Show Variants,Pokaži varijante
@@ -64,25 +61,23 @@
 DocType: Production Plan Item,Production Plan Item,Proizvodnja plan artikla
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +141,User {0} is already assigned to Employee {1},Korisnik {0} već dodijeljena zaposlenika {1}
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +13,Make new POS Profile,Napravite novi POS profil
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +31,Health Care,Health Care
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,Health Care
 DocType: Purchase Invoice,Monthly,Mjesečno
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +66,Delay in payment (Days),Kašnjenje u plaćanju (dani)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +494,Invoice,Faktura
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +519,Invoice,Faktura
 DocType: Maintenance Schedule Item,Periodicity,Periodičnost
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +357,Email Address,Email adresa
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +21,Defense,Obrana
+apps/erpnext/erpnext/public/js/setup_wizard.js +107,Email Address,Email adresa
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,Obrana
 DocType: Company,Abbr,Kratica
 DocType: Appraisal Goal,Score (0-5),Ocjena (0-5)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +193,Row {0}: {1} {2} does not match with {3},Red {0}: {1} {2} ne odgovara {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +67,Row # {0}:,Red # {0}:
 DocType: Delivery Note,Vehicle No,Ne vozila
 apps/erpnext/erpnext/public/js/pos/pos.js +528,Please select Price List,Molimo odaberite Cjenik
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +162,Woodworking,Stolarstvo
 DocType: Production Order Operation,Work In Progress,Radovi u tijeku
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +153,3D printing,3D ispis
 DocType: Employee,Holiday List,Turistička Popis
 DocType: Time Log,Time Log,Vrijeme Log
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +530,Accountant,Knjigovođa
+apps/erpnext/erpnext/public/js/setup_wizard.js +274,Accountant,Knjigovođa
 DocType: Cost Center,Stock User,Stock Korisnik
 DocType: Company,Phone No,Telefonski broj
 DocType: Time Log,"Log of Activities performed by users against Tasks that can be used for tracking time, billing.","Zapis aktivnosti korisnika vezanih uz zadatke koji se mogu koristiti za praćenje vremena, naplate."
@@ -98,18 +93,19 @@
 DocType: Bin,Quantity Requested for Purchase,Tražena količina za kupnju
 DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name","Pričvrstite .csv datoteku s dva stupca, jedan za stari naziv i jedan za novim nazivom"
 DocType: Packed Item,Parent Detail docname,Nadređeni detalj docname
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Kg,kg
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Kg,kg
 apps/erpnext/erpnext/config/hr.py +48,Opening for a Job.,Otvaranje za posao.
 DocType: Item Attribute,Increment,Pomak
 apps/erpnext/erpnext/public/js/stock_analytics.js +63,Select Warehouse...,Odaberite Warehouse ...
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +6,Advertising,Oglašavanje
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,Oglašavanje
+apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,Ista tvrtka je ušao više od jednom
 DocType: Employee,Married,Oženjen
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +389,Stock cannot be updated against Delivery Note {0},Dionica ne može biti obnovljeno protiv isporuke Napomena {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +391,Stock cannot be updated against Delivery Note {0},Dionica ne može biti obnovljeno protiv isporuke Napomena {0}
 DocType: Payment Reconciliation,Reconcile,pomiriti
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +30,Grocery,Trgovina prehrambenom robom
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,Trgovina prehrambenom robom
 DocType: Quality Inspection Reading,Reading 1,Čitanje 1
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Make Bank Entry,Provjerite banke unos
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +40,Pension Funds,Mirovinski fondovi
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,Mirovinski fondovi
 apps/erpnext/erpnext/accounts/doctype/account/account.py +142,Warehouse is mandatory if account type is Warehouse,Skladište je obavezno ako je Vrsta račun Skladište
 DocType: SMS Center,All Sales Person,Svi prodavači
 DocType: Lead,Person Name,Osoba ime
@@ -131,7 +127,7 @@
 DocType: Quality Inspection,Get Specification Details,Kreiraj detalje specifikacija
 DocType: Lead,Interested,Zainteresiran
 apps/erpnext/erpnext/config/manufacturing.py +14,Bill of Material,Sastavnica
-apps/erpnext/erpnext/public/js/stock_analytics.js +45,Opening,Otvaranje
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +158,Opening,Otvaranje
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},Od {0} do {1}
 DocType: Item,Copy From Item Group,Primjerak iz točke Group
 DocType: Journal Entry,Opening Entry,Otvaranje - ulaz
@@ -145,23 +141,22 @@
 DocType: Employee Education,Under Graduate,Pod diplomski
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +22,Target On,Target Na
 DocType: BOM,Total Cost,Ukupan trošak
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +99,Reaming,Razvrtavanje
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +9,Activity Log:,Dnevnik aktivnosti:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +199,Item {0} does not exist in the system or has expired,Proizvod {0} ne postoji u sustavu ili je istekao
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +44,Real Estate,Nekretnine
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +44,Real Estate,Nekretnine
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +4,Statement of Account,Izjava o računu
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +41,Pharmaceuticals,Farmaceutske
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,Farmaceutske
 DocType: Expense Claim Detail,Claim Amount,Iznos štete
 DocType: Employee,Mr,G.
 DocType: Custom Script,Client,Klijent
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,Dobavljač Tip / Supplier
 DocType: Naming Series,Prefix,Prefiks
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Consumable,potrošni
+apps/erpnext/erpnext/public/js/setup_wizard.js +359,Consumable,potrošni
 DocType: Upload Attendance,Import Log,Uvoz Prijavite
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.js +19,Send,Poslati
 DocType: Sales Invoice Item,Delivered By Supplier,Isporučio dobavljač
 DocType: SMS Center,All Contact,Svi kontakti
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +164,Annual Salary,Godišnja plaća
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +164,Annual Salary,Godišnja plaća
 DocType: Period Closing Voucher,Closing Fiscal Year,Zatvaranje Fiskalna godina
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +69,Stock Expenses,Stock Troškovi
 DocType: Newsletter,Email Sent?,Je li e-mail poslan?
@@ -169,7 +164,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +92,Show Time Logs,Pokaži Trupci vrijeme
 DocType: Journal Entry Account,Credit in Company Currency,Kredit u trgovačkim društvima valuti
 DocType: Delivery Note,Installation Status,Status instalacije
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +115,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Količina prihvaćeno + odbijeno mora biti jednaka zaprimljenoj količini proizvoda {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +118,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Količina prihvaćeno + odbijeno mora biti jednaka zaprimljenoj količini proizvoda {0}
 DocType: Item,Supply Raw Materials for Purchase,Nabava sirovine za kupnju
 apps/erpnext/erpnext/stock/get_item_details.py +133,Item {0} must be a Purchase Item,Stavka {0} mora bitikupnja artikla
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
@@ -177,19 +172,17 @@
  Sve datume i zaposlenika kombinacija u odabranom razdoblju doći će u predlošku s postojećim pohađanje evidencije"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +446,Item {0} is not active or end of life has been reached,Proizvod {0} nije aktivan ili nije došao do kraja roka valjanosti
 DocType: Time Log Batch,Will be updated after Sales Invoice is Submitted.,Hoće li se obnavljaju nakon prodaje fakture je Prijavljen.
-apps/erpnext/erpnext/controllers/accounts_controller.py +493,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","To uključuje porez u redu {0} u stopu točke , porezi u redovima {1} također moraju biti uključeni"
+apps/erpnext/erpnext/controllers/accounts_controller.py +494,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","To uključuje porez u redu {0} u stopu točke , porezi u redovima {1} također moraju biti uključeni"
 apps/erpnext/erpnext/config/hr.py +90,Settings for HR Module,Postavke za HR modula
 DocType: SMS Center,SMS Center,SMS centar
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +78,Straightening,Ravnanje
 DocType: BOM Replace Tool,New BOM,Novi BOM
 apps/erpnext/erpnext/config/projects.py +28,Batch Time Logs for billing.,Batch Vrijeme Trupci za naplatu.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +15,Countergravity casting,Countergravity lijevanje
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +30,Newsletter has already been sent,Bilten je već poslan
 DocType: Lead,Request Type,Zahtjev Tip
 DocType: Leave Application,Reason,Razlog
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +14,Broadcasting,Radiodifuzija
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +140,Execution,izvršenje
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +364,The first user will become the System Manager (you can change this later).,Prvi korisnik će postati System Manager (možete promijeniti tome kasnije).
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,Radiodifuzija
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +140,Execution,izvršenje
+apps/erpnext/erpnext/public/js/setup_wizard.js +114,The first user will become the System Manager (you can change this later).,Prvi korisnik će postati System Manager (možete promijeniti tome kasnije).
 apps/erpnext/erpnext/config/manufacturing.py +39,Details of the operations carried out.,Pojedinosti o operacijama koje se provode.
 DocType: Serial No,Maintenance Status,Status održavanja
 apps/erpnext/erpnext/config/stock.py +263,Items and Pricing,Stavke i cijene
@@ -206,7 +199,6 @@
 DocType: Pricing Rule,Discount on Price List Rate (%),Popust na Cjenik postotak (%)
 apps/frappe/frappe/public/js/frappe/form/print.js +96,Start,početak
 DocType: User,First Name,Ime
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +12,Full-mold casting,Cijeli plijesni lijevanje
 DocType: Offer Letter,Select Terms and Conditions,Odaberite Uvjeti
 DocType: Production Planning Tool,Sales Orders,Narudžbe kupca
 DocType: Purchase Taxes and Charges,Valuation,Procjena
@@ -218,8 +210,7 @@
 DocType: Bank Reconciliation,Bank Account,Žiro račun
 DocType: Leave Type,Allow Negative Balance,Dopustite negativan saldo
 DocType: Selling Settings,Default Territory,Zadani teritorij
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +53,Television,Televizija
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +138,Gashing,Gashing
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,Televizija
 DocType: Production Order Operation,Updated via 'Time Log',Ažurirano putem 'Time Log'
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +82,Account {0} does not belong to Company {1},Račun {0} ne pripada tvrtki {1}
 DocType: Naming Series,Series List for this Transaction,Serija Popis za ovu transakciju
@@ -234,14 +225,13 @@
 DocType: Leave Allocation,Add unused leaves from previous allocations,Dodaj neiskorištenih lišće iz prethodnih dodjela
 apps/erpnext/erpnext/controllers/recurring_document.py +206,Next Recurring {0} will be created on {1},Sljedeći ponavljajući {0} bit će izrađen na {1}
 DocType: Newsletter List,Total Subscribers,Ukupno Pretplatnici
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +575,Contact Name,Kontakt ime
+,Contact Name,Kontakt ime
 DocType: Production Plan Item,SO Pending Qty,SO čekanju Kol
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Stvara plaće slip za gore navedene kriterije.
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,Zahtjev za kupnju.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +107,Double housing,Dvostruko kućište
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +156,Only the selected Leave Approver can submit this Leave Application,Samo osoba ovlaštena za odobrenje odsustva može potvrditi zahtjev za odsustvom
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +171,Only the selected Leave Approver can submit this Leave Application,Samo osoba ovlaštena za odobrenje odsustva može potvrditi zahtjev za odsustvom
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,Olakšavanja Datum mora biti veći od dana ulaska u
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +172,Leaves per Year,Ostavlja godišnje
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +172,Leaves per Year,Ostavlja godišnje
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup > Settings > Naming Series,Molimo postavite Imenovanje serije za {0} preko Postavljanje&gt; Postavke&gt; Imenovanje serije
 DocType: Time Log,Will be updated when batched.,Hoće li biti ažurirani kada izmiješane.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +104,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,"Red {0}: Provjerite 'Je li Advance ""protiv nalog {1} Ako je to unaprijed ulaz."
@@ -250,25 +240,24 @@
 DocType: Item Website Specification,Item Website Specification,Specifikacija web stranice proizvoda
 DocType: Dropbox Backup,Dropbox Access Key,Dropbox pristupni ključ
 DocType: Payment Tool,Reference No,Referentni broj
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +348,Leave Blocked,Neodobreno odsustvo
-apps/erpnext/erpnext/stock/doctype/item/item.py +535,Item {0} has reached its end of life on {1},Proizvod {0} je dosegao svoj rok trajanja na {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +392,Leave Blocked,Neodobreno odsustvo
+apps/erpnext/erpnext/stock/doctype/item/item.py +539,Item {0} has reached its end of life on {1},Proizvod {0} je dosegao svoj rok trajanja na {1}
 apps/erpnext/erpnext/accounts/utils.py +339,Annual,godišnji
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Stock pomirenje točka
 DocType: Stock Entry,Sales Invoice No,Prodajni račun br
 DocType: Material Request Item,Min Order Qty,Min naručena kol
 DocType: Lead,Do Not Contact,Ne kontaktirati
 DocType: Sales Invoice,The unique id for tracking all recurring invoices. It is generated on submit.,Jedinstveni ID za praćenje svih ponavljajući fakture. To je izrađen podnijeti.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +93,Software Developer,Software Developer
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +93,Software Developer,Software Developer
 DocType: Item,Minimum Order Qty,Minimalna količina narudžbe
 DocType: Pricing Rule,Supplier Type,Dobavljač Tip
 DocType: Item,Publish in Hub,Objavi na Hub
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +555,Item {0} is cancelled,Proizvod {0} je otkazan
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +598,Material Request,Zahtjev za robom
+apps/erpnext/erpnext/stock/doctype/item/item.py +559,Item {0} is cancelled,Proizvod {0} je otkazan
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +607,Material Request,Zahtjev za robom
 DocType: Bank Reconciliation,Update Clearance Date,Ažurirajte provjeri datum
 DocType: Item,Purchase Details,Kupnja Detalji
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +323,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},Stavka {0} nije pronađena u &quot;sirovina nabavlja se &#39;stol narudžbenice {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +129,Wire brushing,Žica četkanje
 DocType: Employee,Relation,Odnos
 DocType: Shipping Rule,Worldwide Shipping,Dostava u svijetu
 apps/erpnext/erpnext/config/selling.py +23,Confirmed orders from Customers.,Potvrđene narudžbe kupaca.
@@ -284,12 +273,11 @@
 DocType: Supplier,Address HTML,Adressa u HTML-u
 DocType: Lead,Mobile No.,Mobitel br.
 DocType: Maintenance Schedule,Generate Schedule,Generiranje Raspored
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +81,Hubbing,Hubbing
 DocType: Purchase Invoice Item,Expense Head,Rashodi voditelj
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +86,Please select Charge Type first,Odaberite Naknada za prvi
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,Najnovije
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +395,Max 5 characters,Maksimalno 5 znakova
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +195,Select Your Language,Odaberite jezik
+apps/erpnext/erpnext/public/js/setup_wizard.js +143,Max 5 characters,Maksimalno 5 znakova
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +245,Select Your Language,Odaberite jezik
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,Prvi dopust Odobritelj na popisu će se postaviti kao zadani Odobritelj dopust
 DocType: Manufacturing Settings,"Disables creation of time logs against Production Orders.
 Operations shall not be tracked against Production Order",Onemogućuje stvaranje vremenskih trupaca protiv radne naloge. Operacije neće biti praćeni protiv proizvodnje Reda
@@ -301,8 +289,6 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +34,Item {0} must be Service Item,Stavka {0} mora biti usluga Stavka
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +303,Completed Qty can not be greater than 'Qty to Manufacture',Završen Qty ne može biti veći od 'Kol proizvoditi'
 DocType: DocType,Administrator,Upravitelj
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +136,Laser drilling,Laserski bušenje
-DocType: Stock UOM Replace Utility,New Stock UOM,Novi skladišni UOM
 DocType: Period Closing Voucher,Closing Account Head,Zatvaranje računa šefa
 DocType: Employee,External Work History,Vanjski Povijest Posao
 apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,Kružni Referentna Greška
@@ -311,18 +297,15 @@
 DocType: Lead,Industry,Industrija
 DocType: Employee,Job Profile,Profil posla
 DocType: Newsletter,Newsletter,Bilten
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +84,Hydroforming,Hydroforming
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +49,Necking,Ljubakanje
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Obavijest putem maila prilikom stvaranja automatskog Zahtjeva za robom
 DocType: Journal Entry,Multi Currency,Više valuta
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +51,Item is updated,Proizvod je obnovljen
 DocType: Async Task,System Manager,Sustav Manager
 DocType: Payment Reconciliation Invoice,Invoice Type,Tip fakture
 DocType: Sales Invoice Item,Delivery Note,Otpremnica
 DocType: Dropbox Backup,Allow Dropbox Access,Dopusti pristup Dropbox
 apps/erpnext/erpnext/config/learn.py +72,Setting up Taxes,Postavljanje Porezi
 apps/erpnext/erpnext/accounts/utils.py +189,Payment Entry has been modified after you pulled it. Please pull it again.,Ulazak Plaćanje je izmijenjen nakon što ga je izvukao. Ponovno izvucite ga.
-apps/erpnext/erpnext/stock/doctype/item/item.py +343,{0} entered twice in Item Tax,{0} dva puta ušao u točki poreza
+apps/erpnext/erpnext/stock/doctype/item/item.py +347,{0} entered twice in Item Tax,{0} dva puta ušao u točki poreza
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +105,Summary for this week and pending activities,Sažetak za ovaj tjedan i tijeku aktivnosti
 DocType: Workstation,Rent Cost,Rent cost
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +74,Please select month and year,Molimo odaberite mjesec i godinu
@@ -339,24 +322,22 @@
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,Stopa po kojoj Kupac valuta se pretvaraju u kupca osnovne valute
 DocType: Features Setup,"Available in BOM, Delivery Note, Purchase Invoice, Production Order, Purchase Order, Purchase Receipt, Sales Invoice, Sales Order, Stock Entry, Timesheet","Dostupno u sastavnicama, otpremnicama, računu kupnje, nalogu za proizvodnju, narudžbi kupnje, primci, prodajnom računu, narudžbi kupca, ulaznog naloga i kontrolnoj kartici"
 DocType: Item Tax,Tax Rate,Porezna stopa
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Select Item,Odaberite stavku
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +540,Select Item,Odaberite stavku
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +143,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","Stavka: {0} uspio turi, ne mogu se pomiriti pomoću \
  skladišta pomirenje, umjesto da koristite Stock unos"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +259,Purchase Invoice {0} is already submitted,Kupnja Račun {0} već je podnijela
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +262,Purchase Invoice {0} is already submitted,Kupnja Račun {0} već je podnijela
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Batch No must be same as {1} {2},Red # {0}: Batch Ne mora biti ista kao {1} {2}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Convert to non-Group,Pretvori u ne-Group
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +55,Purchase Receipt must be submitted,Kupnja Potvrda mora biti podnesen
-DocType: Stock UOM Replace Utility,Current Stock UOM,Trenutni kataloški UOM
 apps/erpnext/erpnext/config/stock.py +53,Batch (lot) of an Item.,Serija (puno) proizvoda.
 DocType: C-Form Invoice Detail,Invoice Date,Datum računa
 DocType: GL Entry,Debit Amount,Duguje iznos
 apps/erpnext/erpnext/accounts/party.py +223,There can only be 1 Account per Company in {0} {1},Tu može biti samo 1 račun po društvo u {0} {1}
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Your email address,Vaša e-mail adresa
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +194,Please see attachment,Pogledajte prilog
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +203,Please see attachment,Pogledajte prilog
 DocType: Purchase Order,% Received,% Zaprimljeno
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +109,Water jet cutting,Mlaz vode rezanja
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +24,Setup Already Complete!!,Postavke su već kompletne!
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +20,Setup Already Complete!!,Postavke su već kompletne!
 ,Finished Goods,Gotovi proizvodi
 DocType: Delivery Note,Instructions,Instrukcije
 DocType: Quality Inspection,Inspected By,Pregledati
@@ -371,6 +352,7 @@
 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.,Molimo vas da ne stvaraju računi za kupce i dobavljače. Oni su stvorili izravno iz Kupac / Dobavljač majstora.
 DocType: Currency Exchange,Currency Exchange,Mjenjačnica
 DocType: Purchase Invoice Item,Item Name,Naziv proizvoda
+DocType: Authorization Rule,Approving User  (above authorized value),Odobravanje korisnik (iznad ovlaštenog vrijednosti)
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Credit Balance,Kreditna bilanca
 DocType: Employee,Widowed,Udovički
 DocType: Production Planning Tool,"Items to be requested which are ""Out of Stock"" considering all warehouses based on projected qty and minimum order qty",Proizvodi se traži što su &quot;Out of Stock&quot; s obzirom na sve skladišta na temelju projicirane Qty i minimalne narudžbe Kol
@@ -380,11 +362,10 @@
 ,Purchase Register,Kupnja Registracija
 DocType: Landed Cost Item,Applicable Charges,Troškove u
 DocType: Workstation,Consumable Cost,potrošni cost
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,{0} ({1}) must have role 'Leave Approver',"{0} ({1}) mora imati ulogu ""Odobritelj odsustva '"
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +167,{0} ({1}) must have role 'Leave Approver',"{0} ({1}) mora imati ulogu ""Odobritelj odsustva '"
 DocType: Purchase Receipt,Vehicle Date,Datum vozila
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +39,Medical,Liječnički
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +39,Medical,Liječnički
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,Razlog gubitka
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +36,Tube beading,Tube izvlačenja
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},Radna stanica je zatvorena na sljedeće datume po Holiday Popis: {0}
 DocType: Employee,Single,Singl
 DocType: Issue,Attachment,Vezanost
@@ -405,10 +386,8 @@
 DocType: Account,Is Group,Je grupe
 DocType: Stock Settings,Automatically Set Serial Nos based on FIFO,Automatski Postavljanje Serijski broj na temelju FIFO
 DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,Provjerite Dobavljač Račun broj Jedinstvenost
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +31,Thermoforming,Thermoforming
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +66,Slitting,Rezanje
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +57,'To Case No.' cannot be less than 'From Case No.','Za Predmet br' ne može biti manje od 'Od Predmeta br'
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +104,Non Profit,Neprofitno
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +104,Non Profit,Neprofitno
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_list.js +7,Not Started,Ne pokrenuto
 DocType: Lead,Channel Partner,Channel Partner
 DocType: Account,Old Parent,Stari Roditelj
@@ -417,13 +396,12 @@
 apps/erpnext/erpnext/config/manufacturing.py +74,Global settings for all manufacturing processes.,Globalne postavke za sve proizvodne procese.
 DocType: Accounts Settings,Accounts Frozen Upto,Računi Frozen Upto
 DocType: SMS Log,Sent On,Poslan Na
-apps/erpnext/erpnext/stock/doctype/item/item.py +512,Attribute {0} selected multiple times in Attributes Table,Osobina {0} izabrani više puta u Svojstva tablice
+apps/erpnext/erpnext/stock/doctype/item/item.py +516,Attribute {0} selected multiple times in Attributes Table,Osobina {0} izabrani više puta u Svojstva tablice
 DocType: Sales Order,Not Applicable,Nije primjenjivo
 apps/erpnext/erpnext/config/hr.py +140,Holiday master.,Majstor za odmor .
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +19,Shell molding,Shell moulding
 DocType: Material Request Item,Required Date,Potrebna Datum
 DocType: Delivery Note,Billing Address,Adresa za naplatu
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +644,Please enter Item Code.,Unesite kod artikal .
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +648,Please enter Item Code.,Unesite kod artikal .
 DocType: BOM,Costing,Koštanje
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount","Ako je označeno, iznos poreza će se smatrati već uključena u Print Rate / Ispis Iznos"
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,Ukupna količina
@@ -433,7 +411,7 @@
 DocType: Item Attribute,To Range,U rasponu
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Vrijednosni papiri i depoziti
 DocType: Features Setup,Imports,Uvozi
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +144,Adhesive bonding,Lijepljenje
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +77,Total leaves allocated is mandatory,Ukupno lišće izdvojena obvezna
 DocType: Job Opening,Description of a Job Opening,Opis je otvaranju novih radnih mjesta
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +102,Pending activities for today,Čekanju aktivnosti za danas
 apps/erpnext/erpnext/config/hr.py +28,Attendance record.,Rekord gledanosti
@@ -441,26 +419,25 @@
 DocType: Sales Order Item,Used for Production Plan,Koristi se za plan proizvodnje
 DocType: System Settings,Loading...,Učitavanje ...
 DocType: DocField,Password,Zaporka
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +155,Fused deposition modeling,Fused taloženje modeliranje
 DocType: Manufacturing Settings,Time Between Operations (in mins),Vrijeme između operacije (u minutama)
 DocType: Customer,Buyer of Goods and Services.,Kupac robe i usluga.
 DocType: Journal Entry,Accounts Payable,Naplativi računi
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +24,Add Subscribers,Dodaj Pretplatnici
 apps/erpnext/erpnext/public/js/feature_setup.js +220,""" does not exists",""" ne postoji"
 DocType: Pricing Rule,Valid Upto,Vrijedi Upto
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +564,List a few of your customers. They could be organizations or individuals.,Navedite nekoliko svojih kupaca. Oni mogu biti tvrtke ili fizičke osobe.
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,List a few of your customers. They could be organizations or individuals.,Navedite nekoliko svojih kupaca. Oni mogu biti tvrtke ili fizičke osobe.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Direct Income,Izravni dohodak
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +33,"Can not filter based on Account, if grouped by Account","Ne možete filtrirati na temelju računa, ako je grupirano po računu"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +88,Administrative Officer,Administrativni službenik
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Administrative Officer,Administrativni službenik
 DocType: Payment Tool,Received Or Paid,Primiti ili platiti
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +318,Please select Company,Odaberite tvrtke
 DocType: Stock Entry,Difference Account,Račun razlike
 apps/erpnext/erpnext/projects/doctype/task/task.py +44,Cannot close task as its dependant task {0} is not closed.,Ne može zatvoriti zadatak kao njegova ovisna zadatak {0} nije zatvoren.
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +305,Please enter Warehouse for which Material Request will be raised,Unesite skladište za koje Materijal Zahtjev će biti podignuta
 DocType: Production Order,Additional Operating Cost,Dodatni trošak
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +20,Cosmetics,kozmetika
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,kozmetika
 DocType: DocField,Type,Vrsta
-apps/erpnext/erpnext/stock/doctype/item/item.py +417,"To merge, following properties must be same for both items","Spojiti , ova svojstva moraju biti isti za obje stavke"
+apps/erpnext/erpnext/stock/doctype/item/item.py +421,"To merge, following properties must be same for both items","Spojiti , ova svojstva moraju biti isti za obje stavke"
 DocType: Communication,Subject,Predmet
 DocType: Shipping Rule,Net Weight,Neto težina
 DocType: Employee,Emergency Phone,Telefon hitne službe
@@ -470,7 +447,6 @@
 DocType: Journal Entry,Difference (Dr - Cr),Razlika ( dr. - Cr )
 DocType: Account,Profit and Loss,Račun dobiti i gubitka
 apps/erpnext/erpnext/config/stock.py +293,Managing Subcontracting,Upravljanje podugovaranje
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +58,New UOM must NOT be of type Whole Number,Novi UOM ne mora biti cijeli broj
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Furniture and Fixture,Namještaj i susret
 DocType: Quotation,Rate at which Price list currency is converted to company's base currency,Stopa po kojoj Cjenik valute se pretvaraju u tvrtke bazne valute
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Account {0} does not belong to company: {1},Račun {0} ne pripada tvrtki: {1}
@@ -490,14 +466,14 @@
 DocType: Purchase Invoice,Supplier Invoice No,Dobavljač Račun br
 DocType: Territory,For reference,Za referencu
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +154,"Cannot delete Serial No {0}, as it is used in stock transactions","Ne možete izbrisati Serijski broj {0}, kao što se koristi na lageru transakcija"
-apps/erpnext/erpnext/public/js/account_tree_grid.js +52,Closing (Cr),Zatvaranje (Cr)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +227,Closing (Cr),Zatvaranje (Cr)
 DocType: Serial No,Warranty Period (Days),Jamstveni period (dani)
 DocType: Installation Note Item,Installation Note Item,Napomena instalacije proizvoda
 ,Pending Qty,U tijeku Kom
 DocType: Job Applicant,Thread HTML,Temu HTML
 DocType: Company,Ignore,Ignorirati
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +86,SMS sent to following numbers: {0},SMS poslan na sljedećim brojevima: {0}
-apps/erpnext/erpnext/controllers/buying_controller.py +135,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Dobavljač skladišta obvezan je za sub - ugovoreni kupiti primitka
+apps/erpnext/erpnext/controllers/buying_controller.py +126,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Dobavljač skladišta obvezan je za sub - ugovoreni kupiti primitka
 DocType: Pricing Rule,Valid From,vrijedi od
 DocType: Sales Invoice,Total Commission,Ukupno komisija
 DocType: Pricing Rule,Sales Partner,Prodajni partner
@@ -505,7 +481,7 @@
 DocType: Monthly Distribution,"**Monthly Distribution** helps you distribute your budget across months if you have seasonality in your business.
 
 To distribute a budget using this distribution, set this **Monthly Distribution** in the **Cost Center**","**Mjesečna distribucija** vam pomaže u raspodjeli proračuna po mjesecima, ako imate sezonalnost u svom poslovanju. Kako bi distribuirali proračun pomoću ove distribucije, postavite **Mjesečna distribucija** u **Troškovnom centru**"
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +183,No records found in the Invoice table,Nisu pronađeni zapisi u tablici računa
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +130,No records found in the Invoice table,Nisu pronađeni zapisi u tablici računa
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +20,Please select Company and Party Type first,Odaberite Društvo i Zabava Tip prvi
 apps/erpnext/erpnext/config/accounts.py +84,Financial / accounting year.,Financijska / obračunska godina.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","Žao nam je , Serial Nos ne mogu spojiti"
@@ -521,25 +497,25 @@
 DocType: Sales Order,Billing and Delivery Status,Naplate i isporuke status
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Ponoviti kupaca
 DocType: Leave Control Panel,Allocate,Dodijeliti
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +16,Previous,prijašnji
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard_page.html +16,Previous,prijašnji
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +620,Sales Return,Povrat robe
 DocType: Production Planning Tool,Select Sales Orders from which you want to create Production Orders.,Odaberite narudžbe iz kojih želite stvoriti radne naloge.
 DocType: Item,Delivered by Supplier (Drop Ship),Dostavlja Dobavljač (Drop Ship)
 apps/erpnext/erpnext/config/hr.py +120,Salary components.,Komponente plaće
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,Baza potencijalnih kupaca.
+DocType: Authorization Rule,Customer or Item,Kupac ili predmeta
 apps/erpnext/erpnext/config/crm.py +17,Customer database.,Baza kupaca.
 DocType: Quotation,Quotation To,Ponuda za
 DocType: Lead,Middle Income,Srednji Prihodi
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),Otvaranje ( Cr )
 apps/erpnext/erpnext/accounts/utils.py +193,Allocated amount can not be negative,Dodijeljeni iznos ne može biti negativan
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +123,Tumbling,Gimnastika
 DocType: Purchase Order Item,Billed Amt,Naplaćeno Amt
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,Logično Skladište protiv kojih su dionice unosi se.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +92,Reference No & Reference Date is required for {0},Reference Nema & Reference Datum je potrebno za {0}
 DocType: Event,Wednesday,Srijeda
 DocType: Sales Invoice,Customer's Vendor,Kupca Prodavatelj
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +214,Production Order is Mandatory,Proizvodni nalog je obavezan
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +139,Proposal Writing,Pisanje prijedlog
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,Proposal Writing,Pisanje prijedlog
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,Još jedna prodaja Osoba {0} postoji s istim ID zaposlenika
 apps/erpnext/erpnext/stock/stock_ledger.py +336,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},Negativni lager - greška ( {6} ) za proizvod {0} u skladištu {1} na {2} {3} u {4} {5}
 DocType: Fiscal Year Company,Fiscal Year Company,Fiskalna godina - tvrtka
@@ -562,7 +538,7 @@
 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.","Cjenovna pravila filtriraju se na temelju kupca, grupe kupaca, regije, dobavljača, proizvođača, kampanje, prodajnog partnera i sl."
 apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.py +179,Please install dropbox python module,Molimo instalirajte Dropbox piton modul
 DocType: Employee,Passport Number,Broj putovnice
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +82,Manager,Upravitelj
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Manager,Upravitelj
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +494,From Purchase Receipt,Od Račun kupnje
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +219,Same item has been entered multiple times.,Isti predmet je ušao više puta.
 DocType: SMS Settings,Receiver Parameter,Prijemnik parametra
@@ -570,10 +546,9 @@
 DocType: Sales Person,Sales Person Targets,Prodajni plan prodavača
 apps/frappe/frappe/public/js/frappe/form/workflow.js +116,To,za
 apps/frappe/frappe/templates/base.html +145,Please enter email address,Molimo unesite e-mail adresu
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +35,End tube forming,Kraj cijevi tvore
 DocType: Production Order Operation,In minutes,U minuta
 DocType: Issue,Resolution Date,Rezolucija Datum
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +635,Please set default Cash or Bank account in Mode of Payment {0},Molimo postavite zadanu gotovinom ili banka računa u načinu plaćanja {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +637,Please set default Cash or Bank account in Mode of Payment {0},Molimo postavite zadanu gotovinom ili banka računa u načinu plaćanja {0}
 DocType: Selling Settings,Customer Naming By,Imenovanje kupca prema
 apps/erpnext/erpnext/accounts/doctype/account/account.js +67,Convert to Group,Pretvori u Grupi
 DocType: Activity Cost,Activity Type,Tip aktivnosti
@@ -581,12 +556,12 @@
 DocType: Customer,Fixed Days,Fiksni dana
 DocType: Sales Invoice,Packing List,Popis pakiranja
 apps/erpnext/erpnext/config/buying.py +28,Purchase Orders given to Suppliers.,Kupnja naloge koje je dao dobavljače.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +43,Publishing,objavljivanje
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +43,Publishing,objavljivanje
 DocType: Activity Cost,Projects User,Projekti za korisnike
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Consumed,Konzumira
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +198,{0}: {1} not found in Invoice Details table,{0}: {1} nije pronađen u Pojedinosti dostavnice stolu
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,{0}: {1} not found in Invoice Details table,{0}: {1} nije pronađen u Pojedinosti dostavnice stolu
 DocType: Company,Round Off Cost Center,Zaokružiti troška
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +208,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Održavanje Posjetite {0} mora biti otkazana prije poništenja ovu prodajnog naloga
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +203,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Održavanje Posjetite {0} mora biti otkazana prije poništenja ovu prodajnog naloga
 DocType: Material Request,Material Transfer,Transfer robe
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +56,Opening (Dr),Otvaranje (DR)
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},Objavljivanje timestamp mora biti poslije {0}
@@ -598,7 +573,6 @@
 DocType: Pricing Rule,Sales Manager,Sales Manager
 apps/frappe/frappe/public/js/frappe/model/model.js +492,Rename,Preimenuj
 DocType: Journal Entry,Write Off Amount,Napišite paušalni iznos
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +52,Bending,Savijanje
 apps/frappe/frappe/core/page/user_permissions/user_permissions.js +246,Allow User,Dopusti korisnika
 DocType: Journal Entry,Bill No,Bill Ne
 DocType: Purchase Invoice,Quarterly,Tromjesečni
@@ -608,17 +582,16 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Please enter item details,Unesite Detalji
 DocType: Purchase Receipt,Other Details,Ostali detalji
 DocType: Account,Accounts,Računi
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +67,Marketing,Marketing
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +65,Straight shearing,Ravno šišanje
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +67,Marketing,Marketing
 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.,Za praćenje stavke u prodaji i kupnji dokumenata na temelju njihovih serijskih br. To je također može koristiti za praćenje jamstvene podatke o proizvodu.
 DocType: Purchase Receipt Item Supplied,Current Stock,Trenutačno stanje skladišta
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +99,Rejected Warehouse is mandatory against regected item,Odbijen Skladište je obavezno protiv regected stavku
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +102,Rejected Warehouse is mandatory against regected item,Odbijen Skladište je obavezno protiv regected stavku
 DocType: Account,Expenses Included In Valuation,Troškovi uključeni u vrednovanje
 DocType: Employee,Provide email id registered in company,Osigurati e id registriran u tvrtki
 DocType: Hub Settings,Seller City,Prodavač Grad
 DocType: Email Digest,Next email will be sent on:,Sljedeći email će biti poslan na:
 DocType: Offer Letter Term,Offer Letter Term,Ponuda pismo Pojam
-apps/erpnext/erpnext/stock/doctype/item/item.py +492,Item has variants.,Stavka ima varijante.
+apps/erpnext/erpnext/stock/doctype/item/item.py +496,Item has variants.,Stavka ima varijante.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Stavka {0} nije pronađena
 DocType: Bin,Stock Value,Stock vrijednost
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,Tree Type
@@ -627,10 +600,9 @@
 DocType: Material Request Item,Quantity and Warehouse,Količina i skladišta
 DocType: Sales Invoice,Commission Rate (%),Komisija stopa (%)
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +172,"Against Voucher Type must be one of Sales Order, Sales Invoice or Journal Entry","Protiv bon Tip mora biti jedan od prodajni nalog, prodaja Račun ili Temeljnica"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +139,Biomachining,Biomachining
 apps/erpnext/erpnext/setup/utils.py +89,Unable to find exchange rate,Nije moguće pronaći tečaj
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +7,Aerospace,Zračno-kosmički prostor
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +19,Welcome,dobrodošli
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +7,Aerospace,Zračno-kosmički prostor
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +40,Welcome,dobrodošli
 DocType: Journal Entry,Credit Card Entry,Credit Card Stupanje
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +18,Task Subject,Zadatak Tema
 apps/erpnext/erpnext/config/stock.py +33,Goods received from Suppliers.,Roba dobijena od dobavljača.
@@ -653,19 +625,19 @@
 DocType: Employee,Cell Number,Mobitel Broj
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Izgubljen
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +120,You can not enter current voucher in 'Against Journal Entry' column,Ne možete unijeti trenutni nalog u stupac 'u odnosu na temeljnicu'
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +25,Energy,energija
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,energija
 DocType: Opportunity,Opportunity From,Prilika od
 apps/erpnext/erpnext/config/hr.py +33,Monthly salary statement.,Mjesečna plaća izjava.
 DocType: Item Group,Website Specifications,Web Specifikacije
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +205,New Account,Novi račun
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +21,{0}: From {0} of type {1},{0}: Od {0} od {1} tipa
-apps/erpnext/erpnext/controllers/buying_controller.py +283,Row {0}: Conversion Factor is mandatory,Red {0}: pretvorbe Factor je obvezno
+apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,Red {0}: pretvorbe Factor je obvezno
 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.,Računovodstvo Prijave se mogu podnijeti protiv lisnih čvorova. Prijave protiv grupe nije dopušteno.
 DocType: ToDo,High,Visok
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +361,Cannot deactivate or cancel BOM as it is linked with other BOMs,Ne može deaktivirati ili otkazati BOM kao što je povezano s drugim sastavnicama
 DocType: Opportunity,Maintenance,Održavanje
 DocType: User,Male,Mužijak
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +182,Purchase Receipt number required for Item {0},Broj primke je potreban za artikal {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +183,Purchase Receipt number required for Item {0},Broj primke je potreban za artikal {0}
 DocType: Item Attribute Value,Item Attribute Value,Stavka Vrijednost atributa
 apps/erpnext/erpnext/config/crm.py +64,Sales campaigns.,Prodajne kampanje.
 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.
@@ -713,10 +685,9 @@
 DocType: Address,Personal,Osobno
 DocType: Expense Claim Detail,Expense Claim Type,Rashodi Vrsta polaganja
 DocType: Shopping Cart Settings,Default settings for Shopping Cart,Zadane postavke za Košarica
-apps/erpnext/erpnext/controllers/accounts_controller.py +324,"Journal Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Temeljnica {0} povezan protiv Red {1}, provjerite je li to trebalo biti izdvajali kao unaprijed u ovom računu."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +13,Biotechnology,Biotehnologija
+apps/erpnext/erpnext/controllers/accounts_controller.py +325,"Journal Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Temeljnica {0} povezan protiv Red {1}, provjerite je li to trebalo biti izdvajali kao unaprijed u ovom računu."
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +13,Biotechnology,Biotehnologija
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Office Maintenance Expenses,Troškovi održavanja ureda
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +53,Hemming,Okružuju
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +66,Please enter Item first,Unesite predmeta prvi
 DocType: Account,Liability,Odgovornost
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +62,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Kažnjeni Iznos ne može biti veći od Zahtjeva Iznos u nizu {0}.
@@ -729,10 +700,10 @@
 DocType: Company,Default Bank Account,Zadani bankovni račun
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +47,"To filter based on Party, select Party Type first","Za filtriranje se temelji na stranke, odaberite stranka Upišite prvi"
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},Opcija 'Ažuriraj zalihe' nije dostupna jer stavke nisu dostavljene putem {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Nos,Kom
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Nos,Kom
 DocType: Item,Items with higher weightage will be shown higher,Stavke sa višim weightage će se prikazati više
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Banka Pomirenje Detalj
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +627,My Invoices,Moji Računi
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +629,My Invoices,Moji Računi
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,Nisu pronađeni zaposlenici
 DocType: Purchase Order,Stopped,Zaustavljen
 DocType: Item,If subcontracted to a vendor,Ako podugovoren dobavljaču
@@ -751,35 +722,33 @@
 DocType: Features Setup,"To enable ""Point of Sale"" features",Da biste omogućili &quot;prodajno mjesto&quot; značajke
 DocType: Bin,Moving Average Rate,Stopa prosječne ponderirane cijene
 DocType: Production Planning Tool,Select Items,Odaberite proizvode
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,{0} against Bill {1} dated {2},{0} u odnosu na račun {1} s datumom {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +328,{0} against Bill {1} dated {2},{0} u odnosu na račun {1} s datumom {2}
 DocType: Comment,Reference Name,Referenca Ime
 DocType: Maintenance Visit,Completion Status,Završetak Status
 DocType: Sales Invoice Item,Target Warehouse,Ciljana galerija
 DocType: Item,Allow over delivery or receipt upto this percent,Dopustite preko isporuka ili primitak upto ovim posto
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +49,Expected Delivery Date cannot be before Sales Order Date,Očekuje se dostava Datum ne može biti prije prodajnog naloga Datum
 DocType: Upload Attendance,Import Attendance,Uvoz posjećenost
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +17,All Item Groups,Sve skupine proizvoda
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +17,All Item Groups,Sve skupine proizvoda
 DocType: Process Payroll,Activity Log,Dnevnik aktivnosti
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +30,Net Profit / Loss,Neto dobit / gubitak
 apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,Automatski napravi poruku pri podnošenju transakcije.
 DocType: Production Order,Item To Manufacture,Proizvod za proizvodnju
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +16,Permanent mold casting,Stalni kalupa za lijevanje
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} status {2}
 apps/erpnext/erpnext/config/learn.py +172,Purchase Order to Payment,Narudžbenica za plaćanje
 DocType: Sales Order Item,Projected Qty,Predviđena količina
 DocType: Sales Invoice,Payment Due Date,Plaćanje Due Date
 DocType: Newsletter,Newsletter Manager,Newsletter Upravitelj
-apps/erpnext/erpnext/stock/doctype/item/item.js +229,Item Variant {0} already exists with same attributes,Stavka Varijanta {0} već postoji s istim atributima
+apps/erpnext/erpnext/stock/doctype/item/item.js +231,Item Variant {0} already exists with same attributes,Stavka Varijanta {0} već postoji s istim atributima
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening',&quot;Otvaranje &#39;
 DocType: Notification Control,Delivery Note Message,Otpremnica - poruka
 DocType: Expense Claim,Expenses,troškovi
 DocType: Item Variant Attribute,Item Variant Attribute,Stavka Varijanta Osobina
 ,Purchase Receipt Trends,Trend primki
 DocType: Appraisal,Select template from which you want to get the Goals,Odaberite predložak s kojeg želite dobiti ciljeva
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +77,Research & Development,Istraživanje i razvoj
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Research & Development,Istraživanje i razvoj
 ,Amount to Bill,Iznositi Billa
 DocType: Company,Registration Details,Registracija Brodu
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +75,Staking,Iskolčenja
 DocType: Item,Re-Order Qty,Re-order Kom
 DocType: Leave Block List Date,Leave Block List Date,Datum popisa neodobrenih odsustava
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +25,Scheduled to send to {0},Planirano za slanje na {0}
@@ -790,18 +759,16 @@
 DocType: Sales Invoice Item,Stock Details,Stock Detalji
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Vrijednost projekta
 apps/erpnext/erpnext/config/selling.py +304,Point-of-Sale,Prodajno mjesto
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,Cannot carry forward {0},Ne može se prenositi {0}
 apps/erpnext/erpnext/accounts/doctype/account/account.py +91,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","Stanje računa već u kredit, što se ne smije postaviti 'ravnoteža se mora' kao 'zaduženje """
 DocType: Account,Balance must be,Bilanca mora biti
 DocType: Hub Settings,Publish Pricing,Objavi Cijene
 DocType: Notification Control,Expense Claim Rejected Message,Rashodi Zahtjev odbijen poruku
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +145,Nailing,Prikucavanje
 ,Available Qty,Dostupno Količina
 DocType: Purchase Taxes and Charges,On Previous Row Total,Na prethodni redak Ukupno
 DocType: Salary Slip,Working Days,Radnih dana
 DocType: Serial No,Incoming Rate,Dolazni Stopa
 DocType: Packing Slip,Gross Weight,Bruto težina
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +410,The name of your company for which you are setting up this system.,Ime vaše tvrtke za koje ste postavljanje ovog sustava .
+apps/erpnext/erpnext/public/js/setup_wizard.js +158,The name of your company for which you are setting up this system.,Ime vaše tvrtke za koje ste postavljanje ovog sustava .
 DocType: HR Settings,Include holidays in Total no. of Working Days,Uključi odmor u ukupnom. radnih dana
 DocType: Job Applicant,Hold,Zadrži
 DocType: Employee,Date of Joining,Datum pristupa
@@ -811,7 +778,6 @@
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +3,View Subscribers,Pogledaj Pretplatnici
 DocType: Purchase Invoice Item,Purchase Receipt,Račun kupnje
 ,Received Items To Be Billed,Primljeni Proizvodi se naplaćuje
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +114,Abrasive blasting,Pjeskarenje
 DocType: Employee,Ms,Gospođa
 apps/erpnext/erpnext/config/accounts.py +148,Currency exchange rate master.,Majstor valute .
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +253,Unable to find Time Slot in the next {0} days for Operation {1},Nije moguće pronaći termin u narednih {0} dana za rad {1}
@@ -823,7 +789,7 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +209,Serial No {0} does not belong to Item {1},Serijski Ne {0} ne pripada točki {1}
 DocType: Purchase Receipt Item Supplied,Required Qty,Potrebna Kol
 DocType: Bank Reconciliation,Total Amount,Ukupan iznos
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +32,Internet Publishing,Internet izdavaštvo
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,Internet izdavaštvo
 DocType: Production Planning Tool,Production Orders,Nalozi
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +35,Balance Value,Vrijednost bilance
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,Prodajni cjenik
@@ -834,7 +800,7 @@
 DocType: Supplier,Default Payable Accounts,Zadane naplativo račune
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,Zaposlenik {0} nije aktivan ili ne postoji
 DocType: Features Setup,Item Barcode,Barkod proizvoda
-apps/erpnext/erpnext/stock/doctype/item/item.py +487,Item Variants {0} updated,Stavka Varijante {0} ažurirani
+apps/erpnext/erpnext/stock/doctype/item/item.py +491,Item Variants {0} updated,Stavka Varijante {0} ažurirani
 DocType: Quality Inspection Reading,Reading 6,Čitanje 6
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Kupnja fakture Predujam
 DocType: Address,Shop,Dućan
@@ -843,7 +809,7 @@
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,"Zadana banka / novčani račun će se automatski ažurirati prema POS računu, kada je ovaj mod odabran."
 DocType: Employee,Permanent Address Is,Stalna adresa je
 DocType: Production Order Operation,Operation completed for how many finished goods?,Operacija završena za koliko gotovih proizvoda?
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +491,The Brand,Brand
+apps/erpnext/erpnext/public/js/setup_wizard.js +237,The Brand,Brand
 apps/erpnext/erpnext/controllers/status_updater.py +163,Allowance for over-{0} crossed for Item {1}.,Dodatak za prekomjerno {0} prešao za točku {1}.
 DocType: Employee,Exit Interview Details,Izlaz Intervju Detalji
 DocType: Item,Is Purchase Item,Je dobavljivi proizvod
@@ -863,16 +829,16 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Indirect Income,Neizravni dohodak
 DocType: Payment Tool,Set Payment Amount = Outstanding Amount,Postavi Iznos Plaćanje = Izvanredna Iznos
 DocType: Contact Us Settings,Address Line 1,Adresa - linija 1
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Variance,Varijacija
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +392,Company Name,Ime tvrtke
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +53,Variance,Varijacija
+,Company Name,Ime tvrtke
 DocType: SMS Center,Total Message(s),Ukupno poruka ( i)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +515,Select Item for Transfer,Odaberite stavke za prijenos
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +538,Select Item for Transfer,Odaberite stavke za prijenos
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,Pregled popisa svih pomoć videa
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,Odaberite račun šefa banke gdje je ček bio pohranjen.
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,Dopustite korisniku uređivanje cjenika u transakcijama
 DocType: Pricing Rule,Max Qty,Maksimalna količina
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +106,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Red {0}: Plaćanje protiv prodaje / narudžbenice treba uvijek biti označena kao unaprijed
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +16,Chemical,kemijski
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,kemijski
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +693,All items have already been transferred for this Production Order.,Svi predmeti su već prebačeni za ovu radnog naloga.
 DocType: Process Payroll,Select Payroll Year and Month,Odaberite Platne godina i mjesec
 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""",Idi na odgovarajućoj skupini (obično Application fondova&gt; kratkotrajne imovine&gt; bankovne račune i stvoriti novi račun (klikom na Dodaj dijete) tipa &quot;Banka&quot;
@@ -883,12 +849,12 @@
 DocType: Item,Inspection Criteria,Inspekcijski Kriteriji
 apps/erpnext/erpnext/config/accounts.py +101,Tree of finanial Cost Centers.,Drvo finanial troška .
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,Prenose
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +492,Upload your letter head and logo. (you can edit them later).,Upload Vaše pismo glavu i logotip. (Možete ih uređivati ​​kasnije).
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +156,White,Bijela
+apps/erpnext/erpnext/public/js/setup_wizard.js +238,Upload your letter head and logo. (you can edit them later).,Upload Vaše pismo glavu i logotip. (Možete ih uređivati ​​kasnije).
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,White,Bijela
 DocType: SMS Center,All Lead (Open),Svi potencijalni kupci (aktualni)
 DocType: Purchase Invoice,Get Advances Paid,Kreiraj avansno plaćanje
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +362,Attach Your Picture,Učvrstite svoju sliku
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Make ,Napraviti
+apps/erpnext/erpnext/public/js/setup_wizard.js +112,Attach Your Picture,Učvrstite svoju sliku
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +540,Make ,Napraviti
 DocType: Journal Entry,Total Amount in Words,Ukupan iznos riječima
 DocType: Workflow State,Stop,zaustaviti
 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.,Došlo je do pogreške . Jedan vjerojatan razlog bi mogao biti da niste spremili obrazac. Molimo kontaktirajte support@erpnext.com ako se problem ne riješi .
@@ -897,14 +863,13 @@
 DocType: Lead,Next Contact Date,Sljedeći datum kontakta
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,Otvaranje Kol
 DocType: Holiday List,Holiday List Name,Turistička Popis Ime
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +168,Stock Options,Burzovnih opcija
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +168,Stock Options,Burzovnih opcija
 DocType: Journal Entry Account,Expense Claim,Rashodi polaganja
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +181,Qty for {0},Količina za {0}
 DocType: Leave Application,Leave Application,Zahtjev za odsustvom
 apps/erpnext/erpnext/config/hr.py +77,Leave Allocation Tool,Alat za raspodjelu odsustva
 DocType: Leave Block List,Leave Block List Dates,Datumi popisa neodobrenih odsustava
 DocType: Company,If Monthly Budget Exceeded (for expense account),Ako Mjesečni proračun Prebačen (za reprezentaciju)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +56,Trimming,Podrezivanje
 DocType: Workstation,Net Hour Rate,Neto sat cijena
 DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,Ulazni račun zavisnog troška
 DocType: Company,Default Terms,Zadani uvjeti
@@ -912,10 +877,9 @@
 DocType: POS Profile,Cash/Bank Account,Novac / bankovni račun
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,Removed items with no change in quantity or value.,Uklonjene stvari bez promjena u količini ili vrijednosti.
 DocType: Delivery Note,Delivery To,Dostava za
-apps/erpnext/erpnext/stock/doctype/item/item.py +509,Attribute table is mandatory,Osobina stol je obavezno
+apps/erpnext/erpnext/stock/doctype/item/item.py +513,Attribute table is mandatory,Osobina stol je obavezno
 DocType: Production Planning Tool,Get Sales Orders,Kreiraj narudžbe
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} ne može biti negativna
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +103,Filing,Podnošenje
 apps/erpnext/erpnext/templates/form_grid/item_grid.html +72,Discount,Popust
 DocType: Features Setup,Purchase Discounts,Kupnja Popusti
 DocType: Workstation,Wages,Plaće
@@ -932,6 +896,7 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +112,You are the Expense Approver for this record. Please Update the 'Status' and Save,Vi ste osoba za odobrenje rashoda za ovaj zapis. Molimo ažurirajte status i spremite
 DocType: Serial No,Creation Document No,Stvaranje dokumenata nema
 DocType: Issue,Issue,Izdanje
+apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account does not match with Company,Račun ne odgovara tvrtke
 apps/erpnext/erpnext/config/stock.py +136,"Attributes for Item Variants. e.g Size, Color etc.","Atributi za stavku varijanti. npr Veličina, boja i sl"
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +39,WIP Warehouse,WIP Skladište
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +194,Serial No {0} is under maintenance contract upto {1},Serijski Ne {0} je pod ugovorom za održavanje upto {1}
@@ -940,7 +905,7 @@
 DocType: Tax Rule,Shipping State,Državna dostava
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,Stavka mora biti dodana pomoću 'se predmeti od kupnje primitaka' gumb
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,Prodajni troškovi
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Buying,Standardna kupnju
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +120,Standard Buying,Standardna kupnju
 DocType: GL Entry,Against,Protiv
 DocType: Item,Default Selling Cost Center,Zadani trošak prodaje
 DocType: Sales Partner,Implementation Partner,Provedba partner
@@ -961,29 +926,29 @@
 DocType: Time Log Batch,updated via Time Logs,ažurirati putem Vrijeme Trupci
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,Prosječna starost
 DocType: Opportunity,Your sales person who will contact the customer in future,Vaš prodavač koji će ubuduće kontaktirati kupca
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +588,List a few of your suppliers. They could be organizations or individuals.,Navedite nekoliko svojih dobavljača. Oni mogu biti tvrtke ili fizičke osobe.
+apps/erpnext/erpnext/public/js/setup_wizard.js +326,List a few of your suppliers. They could be organizations or individuals.,Navedite nekoliko svojih dobavljača. Oni mogu biti tvrtke ili fizičke osobe.
 DocType: Company,Default Currency,Zadana valuta
 DocType: Contact,Enter designation of this Contact,Upišite oznaku ove Kontakt
 DocType: Contact Us Settings,Address,Adresa
 DocType: Expense Claim,From Employee,Od zaposlenika
-apps/erpnext/erpnext/controllers/accounts_controller.py +338,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Upozorenje : Sustav neće provjeravati overbilling od iznosa za točku {0} u {1} je nula
+apps/erpnext/erpnext/controllers/accounts_controller.py +339,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Upozorenje : Sustav neće provjeravati overbilling od iznosa za točku {0} u {1} je nula
 DocType: Journal Entry,Make Difference Entry,Čine razliku Entry
 DocType: Upload Attendance,Attendance From Date,Gledanost od datuma
 DocType: Appraisal Template Goal,Key Performance Area,Zona ključnih performansi
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +54,Transportation,promet
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +54,Transportation,promet
 apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +67, and year: ,i godina:
 DocType: Email Digest,Annual Expense,Godišnji rashodi
 DocType: SMS Center,Total Characters,Ukupno Likovi
-apps/erpnext/erpnext/controllers/buying_controller.py +139,Please select BOM in BOM field for Item {0},Odaberite BOM u BOM polje za točku {0}
+apps/erpnext/erpnext/controllers/buying_controller.py +130,Please select BOM in BOM field for Item {0},Odaberite BOM u BOM polje za točku {0}
 DocType: C-Form Invoice Detail,C-Form Invoice Detail,C-obrazac detalj računa
 DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,Pomirenje Plaćanje fakture
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +32,Contribution %,Doprinos%
 DocType: Item,website page link,Poveznica web stranice
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +192,Let's prepare the system for first use.,Idemo pripremiti sustav za prvu uporabu.
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +242,Let's prepare the system for first use.,Idemo pripremiti sustav za prvu uporabu.
 DocType: Company,Company registration numbers for your reference. Tax numbers etc.,Tvrtka registracijski brojevi za svoju referencu. Porezni brojevi itd.
 DocType: Sales Partner,Distributor,Distributer
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Košarica Dostava Rule
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +214,Production Order {0} must be cancelled before cancelling this Sales Order,Proizvodni nalog {0} mora biti poništen prije nego se poništi ova prodajna narudžba
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +209,Production Order {0} must be cancelled before cancelling this Sales Order,Proizvodni nalog {0} mora biti poništen prije nego se poništi ova prodajna narudžba
 ,Ordered Items To Be Billed,Naručeni proizvodi za naplatu
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +24,From Range has to be less than To Range,Od Raspon mora biti manji od u rasponu
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +21,Select Time Logs and Submit to create a new Sales Invoice.,Odaberite vrijeme Evidencije i slanje stvoriti novi prodajni fakture.
@@ -1003,14 +968,13 @@
 DocType: Sales Invoice Advance,Sales Invoice Advance,Predujam prodajnog računa
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +398,Nothing to request,Ništa za zatražiti
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date',Stvarni datum početka ne može biti veći od stvarnog datuma završetka
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +75,Management,Uprava
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +75,Management,Uprava
 apps/erpnext/erpnext/config/projects.py +33,Types of activities for Time Sheets,Vrste aktivnosti za vrijeme listova
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +14,Investment casting,Lijev
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +51,Either debit or credit amount is required for {0},Ili debitna ili kreditna iznos potreban za {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""","To će biti dodan u šifra varijante. Na primjer, ako je vaš naziv je ""SM"", a točka kod ""T-shirt"", stavka kod varijante će biti ""T-SHIRT-SM"""
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,Neto plaća (riječima) će biti vidljiva nakon što spremite klizne plaće.
 apps/frappe/frappe/core/doctype/user/user_list.js +12,Active,Aktivan
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +154,Blue,Plava
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +154,Blue,Plava
 DocType: Purchase Invoice,Is Return,Je li povratak
 DocType: Price List Country,Price List Country,Cjenik Zemlja
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +123,Further nodes can be only created under 'Group' type nodes,"Daljnje čvorovi mogu se samo stvorio pod ""Grupa"" tipa čvorova"
@@ -1020,18 +984,16 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +22,POS Profile {0} already created for user: {1} and company {2},POS Profil {0} je već stvoren za korisnika: {1} i društvo {2}
 DocType: Purchase Order Item,UOM Conversion Factor,UOM konverzijski faktor
 DocType: Stock Settings,Default Item Group,Zadana grupa proizvoda
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +156,Laminated object manufacturing,Višeslojno objekt proizvodnja
 apps/erpnext/erpnext/config/buying.py +13,Supplier database.,Dobavljač baza podataka.
 DocType: Account,Balance Sheet,Završni račun
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +561,Cost Center For Item with Item Code ',Troška za stavku s šifra '
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +45,Stretch forming,Stretch oblikovanje
 DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,Prodavač će dobiti podsjetnik na taj datum kako bi pravovremeno kontaktirao kupca
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +210,"Further accounts can be made under Groups, but entries can be made against non-Groups","Daljnje računi mogu biti u skupinama, ali unose se može podnijeti protiv nesrpskog Groups"
 apps/erpnext/erpnext/config/hr.py +125,Tax and other salary deductions.,Porez i drugih isplata plaća.
 DocType: Lead,Lead,Potencijalni kupac
 DocType: Email Digest,Payables,Plativ
 DocType: Account,Warehouse,Skladište
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +90,Row #{0}: Rejected Qty can not be entered in Purchase Return,Red # {0}: Odbijen Kom se ne može upisati u kupnju povratak
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +93,Row #{0}: Rejected Qty can not be entered in Purchase Return,Red # {0}: Odbijen Kom se ne može upisati u kupnju povratak
 ,Purchase Order Items To Be Billed,Narudžbenica Proizvodi se naplaćuje
 DocType: Purchase Invoice Item,Net Rate,Neto stopa
 DocType: Purchase Invoice Item,Purchase Invoice Item,Kupnja fakture predmet
@@ -1046,13 +1008,13 @@
 DocType: Global Defaults,Current Fiscal Year,Tekuće fiskalne godine
 DocType: Global Defaults,Disable Rounded Total,Ugasiti zaokruženi iznos
 DocType: Lead,Call,Poziv
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +384,'Entries' cannot be empty,'Ulazi' ne može biti prazno
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +386,'Entries' cannot be empty,'Ulazi' ne može biti prazno
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},Dupli red {0} sa istim {1}
 ,Trial Balance,Pretresno bilanca
 apps/erpnext/erpnext/config/hr.py +205,Setting up Employees,Postavljanje zaposlenika
 apps/erpnext/erpnext/public/js/feature_setup.js +220,"Grid ""","Grid """
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +150,Please select prefix first,Odaberite prefiks prvi
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +138,Research,istraživanje
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +138,Research,istraživanje
 DocType: Maintenance Visit Purpose,Work Done,Rad Done
 apps/erpnext/erpnext/controllers/item_variant.py +25,Please specify at least one attribute in the Attributes table,Navedite barem jedan atribut u tablici Svojstva
 DocType: Contact,User ID,Korisnički ID
@@ -1060,10 +1022,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +57,View Ledger,Pogledaj Ledger
 DocType: File,Lft,LFT
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Najstarije
-apps/erpnext/erpnext/stock/doctype/item/item.py +394,"An Item Group exists with same name, please change the item name or rename the item group","Stavka Grupa postoji s istim imenom , molimo promijenite ime stavku ili preimenovati stavku grupe"
+apps/erpnext/erpnext/stock/doctype/item/item.py +398,"An Item Group exists with same name, please change the item name or rename the item group","Stavka Grupa postoji s istim imenom , molimo promijenite ime stavku ili preimenovati stavku grupe"
 DocType: Communication,Delivery Status,Status isporuke
 DocType: Production Order,Manufacture against Sales Order,Proizvodnja protiv prodaje Reda
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +517,Rest Of The World,Ostatak svijeta
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +455,Rest Of The World,Ostatak svijeta
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,Stavka {0} ne može imati Hrpa
 ,Budget Variance Report,Proračun varijance Prijavi
 DocType: Salary Slip,Gross Pay,Bruto plaća
@@ -1074,13 +1036,11 @@
 DocType: BOM Item,Item Description,Opis proizvoda
 DocType: Payment Tool,Payment Mode,Način plaćanja
 DocType: Purchase Invoice,Is Recurring,Je Ponavljajući
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +154,Direct metal laser sintering,Izravno metala laserom sinteriranje
 DocType: Purchase Order,Supplied Items,Isporučeni pribor
 DocType: Production Order,Qty To Manufacture,Količina za proizvodnju
 DocType: Buying Settings,Maintain same rate throughout purchase cycle,Održavaj istu stopu tijekom cijelog ciklusa kupnje
 DocType: Opportunity Item,Opportunity Item,Prilika proizvoda
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +61,Temporary Opening,Privremeni Otvaranje
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +41,Cryorolling,Cryorolling
 ,Employee Leave Balance,Zaposlenik napuste balans
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +128,Balance for Account {0} must always be {1},Bilanca računa {0} uvijek mora biti {1}
 DocType: Address,Address Type,Tip adrese
@@ -1096,23 +1056,23 @@
 DocType: Journal Entry,Get Outstanding Invoices,Kreiraj neplaćene račune
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,Prodajnog naloga {0} nije ispravan
 apps/erpnext/erpnext/setup/doctype/company/company.py +172,"Sorry, companies cannot be merged","Žao nam je , tvrtke ne mogu spojiti"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +145,Small,Mali
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Small,Mali
 DocType: Employee,Employee Number,Broj zaposlenika
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},Slučaj Ne ( i) je već u uporabi . Pokušajte s predmetu broj {0}
 ,Invoiced Amount (Exculsive Tax),Dostavljeni iznos ( Exculsive poreza )
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,Stavka 2
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +59,Account head {0} created,Zaglavlje računa {0} stvoreno
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +153,Green,Zelena
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Green,Zelena
 DocType: Item,Auto re-order,Auto re-red
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +57,Total Achieved,Ukupno Ostvareno
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +59,Total Achieved,Ukupno Ostvareno
 DocType: Employee,Place of Issue,Mjesto izdavanja
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +59,Contract,ugovor
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Contract,ugovor
 DocType: Report,Disabled,Ugašeno
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +490,UOM coversion factor required for UOM: {0} in Item: {1},UOM faktor coversion potrebna za UOM: {0} u točki: {1}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +83,Indirect Expenses,Neizravni troškovi
 apps/erpnext/erpnext/controllers/selling_controller.py +163,Row {0}: Qty is mandatory,Red {0}: Količina je obvezno
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +8,Agriculture,Poljoprivreda
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +611,Your Products or Services,Vaši proizvodi ili usluge
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,Poljoprivreda
+apps/erpnext/erpnext/public/js/setup_wizard.js +347,Your Products or Services,Vaši proizvodi ili usluge
 DocType: Mode of Payment,Mode of Payment,Način plaćanja
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,To jekorijen stavka grupa i ne može se mijenjati .
 DocType: Journal Entry Account,Purchase Order,Narudžbenica
@@ -1124,7 +1084,7 @@
 DocType: Serial No,Serial No Details,Serijski nema podataka
 DocType: Purchase Invoice Item,Item Tax Rate,Porezna stopa proizvoda
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +113,"For {0}, only credit accounts can be linked against another debit entry","Za {0}, samo kreditne računi se mogu povezati protiv drugog ulaska debitnom"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Delivery Note {0} is not submitted,Otpremnica {0} nije potvrđena
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +470,Delivery Note {0} is not submitted,Otpremnica {0} nije potvrđena
 apps/erpnext/erpnext/stock/get_item_details.py +136,Item {0} must be a Sub-contracted Item,Stavka {0} mora bitisklopljen ugovor artikla
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,Kapitalni oprema
 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.","Cijene Pravilo prvo se bira na temelju 'Nanesite na' terenu, koji može biti točka, točka Grupa ili Brand."
@@ -1134,7 +1094,7 @@
 DocType: Appraisal Goal,Goal,Cilj
 DocType: Sales Invoice Item,Edit Description,Uredi Opis
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +318,Expected Delivery Date is lesser than Planned Start Date.,Očekivani isporuke Datum manji od planiranog početka Datum.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +579,For Supplier,za Supplier
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +602,For Supplier,za Supplier
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,Postavljanje Vrsta računa pomaže u odabiru ovaj račun u prometu.
 DocType: Purchase Invoice,Grand Total (Company Currency),Sveukupno (valuta tvrtke)
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,Ukupno odlazni
@@ -1160,10 +1120,10 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +74,"Total {0} for all items is zero, may you should change 'Distribute Charges Based On'","Ukupno {0} za sve stavke nula, možda biste trebali promijeniti &quot;Podijeliti optužbi na temelju &#39;"
 DocType: Purchase Invoice,Taxes and Charges Calculation,Porezi i naknade Proračun
 DocType: BOM Operation,Workstation,Radna stanica
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +112,Hardware,Hardver
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +112,Hardware,Hardver
 DocType: Attendance,HR Manager,HR menadžer
 apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,Odaberite tvrtku
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +50,Privilege Leave,Privilege dopust
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +50,Privilege Leave,Privilege dopust
 DocType: Purchase Invoice,Supplier Invoice Date,Dobavljač Datum fakture
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +79,You need to enable Shopping Cart,Morate omogućiti košaricu
 apps/frappe/frappe/public/js/frappe/form/grid_body.html +6,No Data,Nema podataka
@@ -1176,7 +1136,7 @@
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +81,Overlapping conditions found between:,Preklapanje uvjeti nalaze između :
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +168,Against Journal Entry {0} is already adjusted against some other voucher,Protiv Temeljnica {0} već usklađuje se neki drugi bon
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +68,Total Order Value,Ukupna vrijednost narudžbe
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +38,Food,hrana
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +38,Food,hrana
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Starenje Raspon 3
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +139,You can make a time log only against a submitted production order,Možete napraviti vremenski dnevnik samo od podnesenoga naloga za proizvodnju
 DocType: Maintenance Schedule Item,No of Visits,Broj pregleda
@@ -1196,6 +1156,7 @@
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,View Offer Letter,Pogledaj Ponuda Pismo
 DocType: Communication,Communication,Mail
 DocType: Item,Is Service Item,Je usluga
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +81,Application period cannot be outside leave allocation period,Razdoblje prijava ne može biti izvan dopusta raspodjele
 DocType: Activity Cost,Projects,Projekti
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +31,Please select Fiscal Year,Odaberite Fiskalna godina
 apps/erpnext/erpnext/controllers/buying_controller.py +23,From {0} | {1} {2},Od {0} | {1} {2}
@@ -1214,7 +1175,7 @@
 DocType: Item,Maintain Stock,Upravljanje zalihama
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +213,Stock Entries already created for Production Order ,Stock Prijave su već stvorene za proizvodnju reda
 DocType: Leave Control Panel,Leave blank if considered for all designations,Ostavite prazno ako se odnosi na sve oznake
-apps/erpnext/erpnext/controllers/accounts_controller.py +499,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Punjenje tipa ' Stvarni ' u redu {0} ne mogu biti uključeni u točki Rate
+apps/erpnext/erpnext/controllers/accounts_controller.py +500,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Punjenje tipa ' Stvarni ' u redu {0} ne mogu biti uključeni u točki Rate
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,Max: {0},Maksimalno: {0}
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +16,From Datetime,Od datetime
 DocType: Email Digest,For Company,Za tvrtke
@@ -1224,7 +1185,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +50,Chart of Accounts,Kontnog
 DocType: Material Request,Terms and Conditions Content,Uvjeti sadržaj
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +471,cannot be greater than 100,ne može biti veće od 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +546,Item {0} is not a stock Item,Proizvod {0} nije skladišni proizvod
+apps/erpnext/erpnext/stock/doctype/item/item.py +550,Item {0} is not a stock Item,Proizvod {0} nije skladišni proizvod
 DocType: Maintenance Visit,Unscheduled,Neplanski
 DocType: Employee,Owned,U vlasništvu
 DocType: Salary Slip Deduction,Depends on Leave Without Pay,Ovisi o ostaviti bez platiti
@@ -1238,31 +1199,29 @@
 DocType: HR Settings,Employee Settings,Postavke zaposlenih
 ,Batch-Wise Balance History,Batch-Wise povijest bilance
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +72,To Do List,Popis podsjetnika
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +63,Apprentice,šegrt
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Apprentice,šegrt
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +99,Negative Quantity is not allowed,Negativna količina nije dopuštena
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
 Used for Taxes and Charges","Porezna detalj Tablica preuzeta iz točke majstora kao string i pohranjeni u tom području.
  Koristi se za poreze i troškove"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +61,Lancing,Lancing
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +151,Employee cannot report to himself.,Zaposlenik se ne može prijaviti na sebe.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Ako je račun zamrznut , unosi dopušteno ograničene korisnike ."
 DocType: Email Digest,Bank Balance,Bankovni saldo
-apps/erpnext/erpnext/controllers/accounts_controller.py +435,Accounting Entry for {0}: {1} can only be made in currency: {2},Računovodstvo Ulaz za {0}: {1} može biti samo u valuti: {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +436,Accounting Entry for {0}: {1} can only be made in currency: {2},Računovodstvo Ulaz za {0}: {1} može biti samo u valuti: {2}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +38,No active Salary Structure found for employee {0} and the month,Ne aktivna Struktura plaća pronađenih zaposlenika {0} i mjesec
 DocType: Job Opening,"Job profile, qualifications required etc.","Profil posla, tražene kvalifikacije i sl."
 DocType: Journal Entry Account,Account Balance,Bilanca računa
 apps/erpnext/erpnext/config/accounts.py +112,Tax Rule for transactions.,Porezni Pravilo za transakcije.
 DocType: Rename Tool,Type of document to rename.,Vrsta dokumenta za promjenu naziva.
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +630,We buy this Item,Kupili smo ovaj proizvod
+apps/erpnext/erpnext/public/js/setup_wizard.js +366,We buy this Item,Kupili smo ovaj proizvod
 DocType: Address,Billing,Naplata
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +77,Flanging,Prirubljivanja
 DocType: Bulk Email,Not Sent,Ne poslano
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +73,Explosive forming,Eksplozivna oblikovanje
 DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),Ukupno Porezi i naknade (Društvo valuta)
 DocType: Shipping Rule,Shipping Account,Dostava račun
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +43,Scheduled to send to {0} recipients,Planirano za slanje na {0} primatelja
 DocType: Quality Inspection,Readings,Očitanja
 DocType: Stock Entry,Total Additional Costs,Ukupno Dodatni troškovi
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Sub Assemblies,pod skupštine
+apps/erpnext/erpnext/public/js/setup_wizard.js +359,Sub Assemblies,pod skupštine
 DocType: Shipping Rule Condition,To Value,Za vrijednost
 DocType: Supplier,Stock Manager,Stock Manager
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +143,Source warehouse is mandatory for row {0},Izvor skladište je obvezno za redom {0}
@@ -1272,44 +1231,42 @@
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Uvoz nije uspio !
 apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,Adresa još nije dodana.
 DocType: Workstation Working Hour,Workstation Working Hour,Workstation Radno vrijeme
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +83,Analyst,analitičar
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +202,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Red {0}: Dodijeljeni iznos {1} mora biti manji ili jednak iznosu JV {2}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Analyst,analitičar
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +149,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Red {0}: Dodijeljeni iznos {1} mora biti manji ili jednak iznosu JV {2}
 DocType: Item,Inventory,Inventar
 DocType: Features Setup,"To enable ""Point of Sale"" view",Da biste omogućili &quot;Point of Sale&quot; pogled
 apps/erpnext/erpnext/public/js/pos/pos.js +402,Payment cannot be made for empty cart,Plaćanje ne može biti za prazan košaricu
 DocType: Item,Sales Details,Prodajni detalji
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +149,Pinning,Zapinjanje
 DocType: Opportunity,With Items,S Stavke
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,u kol
 DocType: Notification Control,Expense Claim Rejected,Rashodi Zahtjev odbijen
 DocType: Sales Invoice,"The date on which next invoice will be generated. It is generated on submit.
 ",Datum na koji pored faktura će biti generiran. Ona nastaje na dostavi.
 DocType: Item Attribute,Item Attribute,Stavka značajke
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +105,Government,Vlada
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Government,Vlada
 apps/erpnext/erpnext/config/stock.py +268,Item Variants,Stavka Varijante
 DocType: Company,Services,Usluge
 apps/erpnext/erpnext/accounts/report/financial_statements.py +147,Total ({0}),Ukupno ({0})
 DocType: Cost Center,Parent Cost Center,Nadređeni troškovni centar
 DocType: Sales Invoice,Source,Izvor
 DocType: Leave Type,Is Leave Without Pay,Je Ostavite bez plaće
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +186,No records found in the Payment table,Nisu pronađeni zapisi u tablici plaćanja
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +405,Financial Year Start Date,Financijska godina - početni datum
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +133,No records found in the Payment table,Nisu pronađeni zapisi u tablici plaćanja
+apps/erpnext/erpnext/public/js/setup_wizard.js +153,Financial Year Start Date,Financijska godina - početni datum
 DocType: Employee External Work History,Total Experience,Ukupno Iskustvo
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +100,Countersinking,Upuštanje
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +271,Packing Slip(s) cancelled,Pakiranje proklizavanja ( s) otkazan
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +276,Packing Slip(s) cancelled,Pakiranje proklizavanja ( s) otkazan
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,Teretni i Forwarding Optužbe
 DocType: Material Request Item,Sales Order No,Broj narudžbe kupca
 DocType: Item Group,Item Group Name,Proizvod - naziv grupe
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +50,Taken,Taken
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,Taken
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +66,Transfer Materials for Manufacture,Prijenos Materijali za izradu
 DocType: Pricing Rule,For Price List,Za Cjeniku
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +27,Executive Search,Executive Search
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,Executive Search
 apps/erpnext/erpnext/stock/stock_ledger.py +405,"Purchase rate for item: {0} not found, which is required to book accounting entry (expense). Please mention item price against a buying price list.","Kupnja stopa za stavke: {0} nije pronađena, koja je potrebna za rezervaciju knjiženje (trošak). Molimo spomenuti predmet cijenu od popisa za kupnju cijena."
 DocType: Maintenance Schedule,Schedules,Raspored
 DocType: Purchase Invoice Item,Net Amount,Neto Iznos
 DocType: Purchase Order Item Supplied,BOM Detail No,BOM detalji - broj
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),Dodatni popust Iznos (valuta Društvo)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +537,Error: {0} > {1},Pogreška : {0} > {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +541,Error: {0} > {1},Pogreška : {0} > {1}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,Molimo stvoriti novi račun iz kontnog plana .
 DocType: Maintenance Visit,Maintenance Visit,Održavanje Posjetite
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer > Customer Group > Territory,Kupac> Grupa kupaca> Regija
@@ -1320,7 +1277,6 @@
 DocType: Event,Tuesday,Utorak
 DocType: Leave Block List,Block Holidays on important days.,Blok Odmor na važnim danima.
 ,Accounts Receivable Summary,Potraživanja Sažetak
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +43,Leaves for type {0} already allocated for Employee {1} for period {2} - {3},Ostavlja za vrstu {0} već dodijeljeno za zaposlenika {1} za vrijeme {2} - {3}
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +187,Please set User ID field in an Employee record to set Employee Role,Molimo postavite korisnički ID polje u zapisu zaposlenika za postavljanje uloga zaposlenika
 DocType: UOM,UOM Name,UOM Ime
 DocType: Top Bar Item,Target,Meta
@@ -1332,15 +1288,14 @@
 DocType: ToDo,Due Date,Datum dospijeća
 DocType: Sales Invoice Item,Brand Name,Naziv brenda
 DocType: Purchase Receipt,Transporter Details,Transporter Detalji
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Box,kutija
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +389,The Organization,Organizacija
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Box,kutija
+apps/erpnext/erpnext/public/js/setup_wizard.js +137,The Organization,Organizacija
 DocType: Monthly Distribution,Monthly Distribution,Mjesečna distribucija
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,Receiver Lista je prazna . Molimo stvoriti Receiver Popis
 DocType: Production Plan Sales Order,Production Plan Sales Order,Proizvodnja plan prodajnog naloga
 DocType: Sales Partner,Sales Partner Target,Prodajni plan prodajnog partnera
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},Računovodstvo Ulaz za {0} može biti samo u valuti: {1}
 DocType: Pricing Rule,Pricing Rule,Pravila cijena
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +58,Notching,Urezivanje
 apps/erpnext/erpnext/config/learn.py +167,Material Request to Purchase Order,Materijal Zahtjev za Narudžbenica
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +74,Row # {0}: Returned Item {1} does not exists in {2} {3},Red # {0}: Vraćeno Stavka {1} ne postoji u {2} {3}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,Bankovni računi
@@ -1357,20 +1312,19 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Amounts not reflected in bank,Iznosi koji se ne ogleda u banci
 DocType: Quality Inspection Reading,Reading 4,Čitanje 4
 apps/erpnext/erpnext/config/hr.py +23,Claims for company expense.,Potraživanja za tvrtke trošak.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +8,Centrifugal casting,Centrifugalna lijevanje
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +119,Magnetic field-assisted finishing,Magnetska polja pomoć oplemenjivanje
 DocType: Company,Default Holiday List,Default odmor List
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +165,Stock Liabilities,Stock Obveze
 DocType: Purchase Receipt,Supplier Warehouse,Dobavljač galerija
 DocType: Opportunity,Contact Mobile No,Kontak GSM
 DocType: Production Planning Tool,Select Sales Orders,Odaberite narudžbe kupca
 ,Material Requests for which Supplier Quotations are not created,Zahtjevi za robom za koje dobavljačeve ponude nisu stvorene
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +117,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,Dan (e) na koje se prijavljuje za odmor su praznici. Ne morate se prijaviti za dopust.
 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.,Za praćenje stavki pomoću barkod. Vi ćete biti u mogućnosti da unesete stavke u otpremnici i prodaje Računa skeniranjem barkod stavke.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +477,Mark as Delivered,Označi kao Isporučeno
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +497,Mark as Delivered,Označi kao Isporučeno
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +34,Make Quotation,Napravite citat
 DocType: Dependent Task,Dependent Task,Ovisno zadatak
-apps/erpnext/erpnext/stock/doctype/item/item.py +306,Conversion factor for default Unit of Measure must be 1 in row {0},Faktor pretvorbe za zadani jedinica mjere mora biti jedan u nizu {0}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,Leave of type {0} cannot be longer than {1},Odsustvo tipa {0} ne može biti duže od {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +310,Conversion factor for default Unit of Measure must be 1 in row {0},Faktor pretvorbe za zadani jedinica mjere mora biti jedan u nizu {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +155,Leave of type {0} cannot be longer than {1},Odsustvo tipa {0} ne može biti duže od {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Pokušajte planirati poslovanje za X dana unaprijed.
 DocType: HR Settings,Stop Birthday Reminders,Zaustavi Rođendan Podsjetnici
 DocType: SMS Center,Receiver List,Prijemnik Popis
@@ -1378,15 +1332,14 @@
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Konzumira Iznos
 apps/erpnext/erpnext/public/js/pos/pos.js +491,{0} View,{0} Pogledaj
 DocType: Salary Structure Deduction,Salary Structure Deduction,Plaća Struktura Odbitak
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +158,Selective laser sintering,Selektivno lasersko sinteriranje
-apps/erpnext/erpnext/stock/doctype/item/item.py +301,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Jedinica mjere {0} je ušao više od jednom u konverzije Factor tablici
+apps/erpnext/erpnext/stock/doctype/item/item.py +305,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Jedinica mjere {0} je ušao više od jednom u konverzije Factor tablici
 apps/frappe/frappe/core/page/data_import_tool/data_import_tool.js +108,Import Successful!,Uvoz uspješan!
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Trošak izdanih stavki
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +185,Quantity must not be more than {0},Količina ne smije biti veća od {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +41,Age (Days),Starost (dani)
 DocType: Quotation Item,Quotation Item,Proizvod iz ponude
 DocType: Account,Account Name,Naziv računa
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +41,From Date cannot be greater than To Date,Od datuma ne može biti veća od To Date
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +34,From Date cannot be greater than To Date,Od datuma ne može biti veća od To Date
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +194,Serial No {0} quantity {1} cannot be a fraction,Serijski Ne {0} {1} količina ne može bitidio
 apps/erpnext/erpnext/config/buying.py +59,Supplier Type master.,Dobavljač Vrsta majstor .
 DocType: Purchase Order Item,Supplier Part Number,Dobavljač Broj dijela
@@ -1395,14 +1348,14 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +247,{0} {1} is cancelled or stopped,{0} {1} otkazan ili zaustavljen
 DocType: Accounts Settings,Credit Controller,Kreditne kontroler
 DocType: Delivery Note,Vehicle Dispatch Date,Vozilo Dispatch Datum
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +197,Purchase Receipt {0} is not submitted,Račun kupnje {0} nije podnesen
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +198,Purchase Receipt {0} is not submitted,Račun kupnje {0} nije podnesen
 DocType: Company,Default Payable Account,Zadana Plaća račun
 apps/erpnext/erpnext/config/website.py +13,"Settings for online shopping cart such as shipping rules, price list etc.","Postavke za online košarici, kao što su utovar pravila, cjenika i sl"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +660,Setup Complete,Postavljanje dovršeno
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +124,Setup Complete,Postavljanje dovršeno
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +65,{0}% Billed,{0}% Naplaćeno
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +17,Reserved Qty,Rezervirano Kol
 DocType: Party Account,Party Account,Račun stranke
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +74,Human Resources,Ljudski resursi
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +74,Human Resources,Ljudski resursi
 DocType: Lead,Upper Income,Gornja Prihodi
 DocType: Journal Entry Account,Debit in Company Currency,Zaduženja tvrtke valuti
 apps/erpnext/erpnext/support/doctype/issue/issue.py +58,My Issues,Moji problemi
@@ -1411,11 +1364,9 @@
 DocType: Company,Default Values,Zadane vrijednosti
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +236,Row {0}: Payment amount can not be negative,Red {0}: Iznos uplate ne može biti negativna
 DocType: Expense Claim,Total Amount Reimbursed,Ukupno Iznos nadoknađeni
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +152,Press fitting,Pritisnite dolikuje
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +64,Against Supplier Invoice {0} dated {1},Protiv dobavljača Račun {0} datira {1}
 DocType: Customer,Default Price List,Zadani cjenik
 DocType: Payment Reconciliation,Payments,Plaćanja
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +24,Hot isostatic pressing,Vruće izostatičko pritiskom
 DocType: ToDo,Medium,Srednji
 DocType: Budget Detail,Budget Allocated,Dodijeljeni proračun
 DocType: Journal Entry,Entry Type,Ulaz Tip
@@ -1428,9 +1379,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +56,None of the items have any change in quantity or value.,Nitko od stavki ima bilo kakve promjene u količini ili vrijednosti.
 DocType: Warranty Claim,Warranty Claim,Jamstvo Zatraži
 ,Lead Details,Detalji potenciajalnog kupca
-DocType: Authorization Rule,Approving User,Odobravanje korisnika
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +37,Forging,Kovanje
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +126,Plating,Pozlaćivanje
 DocType: Purchase Invoice,End date of current invoice's period,Kraj datum tekućeg razdoblja dostavnice
 DocType: Pricing Rule,Applicable For,primjenjivo za
 DocType: Bank Reconciliation,From Date,Od datuma
@@ -1452,31 +1400,29 @@
 DocType: Sales Invoice,Paid Amount (Company Currency),Plaćeni iznos (Društvo valuta)
 DocType: Purchase Invoice,Additional Discount,Dodatni popust
 DocType: Selling Settings,Selling Settings,Postavke prodaje
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +39,Online Auctions,Online aukcije
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,Online aukcije
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +94,Please specify either Quantity or Valuation Rate or both,Navedite ili količini ili vrednovanja Ocijenite ili oboje
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +50,"Company, Month and Fiscal Year is mandatory","Tvrtka , Mjesec i Fiskalna godina je obvezno"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Marketing Expenses,Troškovi marketinga
 ,Item Shortage Report,Nedostatak izvješća za proizvod
-apps/erpnext/erpnext/stock/doctype/item/item.js +183,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Težina se spomenuto, \n Molimo spomenuti ""težinu UOM"" previše"
+apps/erpnext/erpnext/stock/doctype/item/item.js +185,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Težina se spomenuto, \n Molimo spomenuti ""težinu UOM"" previše"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,Zahtjev za robom korišten za izradu ovog ulaza robe
 apps/erpnext/erpnext/config/support.py +43,Single unit of an Item.,Jedna jedinica stavku.
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +212,Time Log Batch {0} must be 'Submitted',"Vrijeme Log Batch {0} mora biti "" Postavio '"
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,Provjerite knjiženje za svaki burzi pokreta
 DocType: Leave Allocation,Total Leaves Allocated,Ukupno Lišće Dodijeljeni
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +384,Warehouse required at Row No {0},Skladište potrebna u nizu br {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +386,Warehouse required at Row No {0},Skladište potrebna u nizu br {0}
 DocType: Employee,Date Of Retirement,Datum odlaska u mirovinu
 DocType: Upload Attendance,Get Template,Kreiraj predložak
 DocType: Address,Postal,Poštanski
 DocType: Item,Weightage,Weightage
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +159,Mining,Rudarstvo
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +17,Resin casting,Smola lijevanje
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,Postoji grupa kupaca sa istim imenom. Promijenite naziv kupca ili naziv grupe kupaca.
 apps/erpnext/erpnext/public/js/pos/pos.js +147,Please select {0} first.,Odaberite {0} na prvom mjestu.
 apps/erpnext/erpnext/templates/pages/order.html +57,text {0},Tekst {0}
 DocType: Territory,Parent Territory,Nadređena teritorija
 DocType: Quality Inspection Reading,Reading 2,Čitanje 2
 DocType: Stock Entry,Material Receipt,Potvrda primitka robe
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +622,Products,Proizvodi
+apps/erpnext/erpnext/public/js/setup_wizard.js +358,Products,Proizvodi
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +47,Party Type and Party is required for Receivable / Payable account {0},Party Tip i stranka je potrebna za potraživanja / obveze prema dobavljačima račun {0}
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.","Ako ova stavka ima varijante, onda to ne može biti izabran u prodajnim nalozima itd"
 DocType: Lead,Next Contact By,Sljedeći kontakt od
@@ -1486,13 +1432,13 @@
 DocType: Purchase Invoice,Notification Email Address,Obavijest E-mail adresa
 DocType: Payment Tool,Find Invoices to Match,Nađi račune kako bi se slagala
 ,Item-wise Sales Register,Stavka-mudri prodaja registar
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +399,"e.g. ""XYZ National Bank""","npr ""XYZ narodna banka """
+apps/erpnext/erpnext/public/js/setup_wizard.js +147,"e.g. ""XYZ National Bank""","npr ""XYZ narodna banka """
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,Je li ovo pristojba uključena u osnovne stope?
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +57,Total Target,Ukupno Target
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Target,Ukupno Target
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.js +22,Shopping Cart is enabled,Košarica omogućeno
 DocType: Job Applicant,Applicant for a Job,Podnositelj zahtjeva za posao
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +173,No Production Orders created,Nema napravljenih proizvodnih naloga
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +131,Salary Slip of employee {0} already created for this month,Plaća Slip zaposlenika {0} već stvorena za ovaj mjesec
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +140,Salary Slip of employee {0} already created for this month,Plaća Slip zaposlenika {0} već stvorena za ovaj mjesec
 DocType: Stock Reconciliation,Reconciliation JSON,Pomirenje JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Previše stupovi. Izvesti izvješće i ispisati pomoću aplikacije za proračunske tablice.
 DocType: Sales Invoice Item,Batch No,Broj serije
@@ -1502,14 +1448,14 @@
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +13,Variant,Varijanta
 apps/frappe/frappe/public/js/frappe/form/toolbar.js +165,New {0},Novi dokument {0}
 DocType: Naming Series,Set prefix for numbering series on your transactions,Postavite prefiks za numeriranje niza na svoje transakcije
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +169,Stopped order cannot be cancelled. Unstop to cancel.,Zaustavljen nalog ne može prekinuti. Otpušiti otkazati .
-apps/erpnext/erpnext/stock/doctype/item/item.py +323,Default BOM ({0}) must be active for this item or its template,Zadana BOM ({0}) mora biti aktivan za tu stavku ili njegov predložak
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +164,Stopped order cannot be cancelled. Unstop to cancel.,Zaustavljen nalog ne može prekinuti. Otpušiti otkazati .
+apps/erpnext/erpnext/stock/doctype/item/item.py +327,Default BOM ({0}) must be active for this item or its template,Zadana BOM ({0}) mora biti aktivan za tu stavku ili njegov predložak
 DocType: Employee,Leave Encashed?,Odsustvo naplaćeno?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Prilika Od polje je obavezno
 DocType: Item,Variants,Varijante
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +458,Make Purchase Order,Napravi narudžbu kupnje
 DocType: SMS Center,Send To,Pošalji
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +111,There is not enough leave balance for Leave Type {0},Nema dovoljno ravnotežu dopust za dozvolu tipa {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +127,There is not enough leave balance for Leave Type {0},Nema dovoljno ravnotežu dopust za dozvolu tipa {0}
 DocType: Sales Team,Contribution to Net Total,Doprinos neto Ukupno
 DocType: Sales Invoice Item,Customer's Item Code,Kupca Stavka Šifra
 DocType: Stock Reconciliation,Stock Reconciliation,Kataloški pomirenje
@@ -1546,11 +1492,11 @@
 DocType: Sales Order Item,Actual Qty,Stvarna kol
 DocType: Sales Invoice Item,References,Reference
 DocType: Quality Inspection Reading,Reading 10,Čitanje 10
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +612,"List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start.","Prikažite svoje proizvode ili usluge koje kupujete ili prodajete. Odaberite grupu proizvoda, jedinicu mjere i ostale značajke."
+apps/erpnext/erpnext/public/js/setup_wizard.js +348,"List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start.","Prikažite svoje proizvode ili usluge koje kupujete ili prodajete. Odaberite grupu proizvoda, jedinicu mjere i ostale značajke."
 DocType: Hub Settings,Hub Node,Hub Node
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,Unijeli ste dupli proizvod. Ispravite i pokušajte ponovno.
 apps/erpnext/erpnext/controllers/item_variant.py +65,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values,Vrijednost {0} za Osobina {1} ne postoji u popisu važeće točke vrijednosti atributa
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +87,Associate,pomoćnik
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Associate,pomoćnik
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +46,Item {0} is not a serialized Item,Proizvod {0} nije serijalizirani proizvod
 DocType: SMS Center,Create Receiver List,Stvaranje Receiver popis
 apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +5,Expired,Istekla
@@ -1559,7 +1505,7 @@
 DocType: Warranty Claim,Issue Date,Datum izdavanja
 DocType: Activity Cost,Activity Cost,Aktivnost troškova
 DocType: Purchase Receipt Item Supplied,Consumed Qty,Potrošeno Kol
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +52,Telecommunications,Telekomunikacije
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +52,Telecommunications,Telekomunikacije
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),Ukazuje da je paket je dio ove isporuke (samo nacrti)
 DocType: Payment Tool,Make Payment Entry,Napravi ulazno plaćanje
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +119,Quantity for Item {0} must be less than {1},Količina za proizvod {0} mora biti manja od {1}
@@ -1576,10 +1522,8 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +37,"Selling must be checked, if Applicable For is selected as {0}","Prodaje se mora provjeriti, ako je primjenjivo za odabrano kao {0}"
 DocType: Purchase Order Item,Supplier Quotation Item,Dobavljač ponudu artikla
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +27,Make Salary Structure,Provjerite Plaća Struktura
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +54,Shearing,Smicanje
 DocType: Item,Has Variants,Je Varijante
 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.,Kliknite na &quot;Make prodaje Račun &#39;gumb za stvaranje nove prodaje fakture.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +166,Packaging and labeling,Pakiranje i označavanje
 DocType: Monthly Distribution,Name of the Monthly Distribution,Naziv mjesečne distribucije
 DocType: Sales Person,Parent Sales Person,Nadređeni prodavač
 apps/erpnext/erpnext/setup/utils.py +14,Please specify Default Currency in Company Master and Global Defaults,Navedite zadanu valutu u tvrtki Global Master i zadane
@@ -1590,19 +1534,18 @@
 DocType: Budget Detail,Fiscal Year,Fiskalna godina
 DocType: Cost Center,Budget,Budžet
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +41,"Budget cannot be assigned against {0}, as it's not an Income or Expense account","Proračun se ne može dodijeliti protiv {0}, kao što je nije prihod ili rashod račun"
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Achieved,Ostvareno
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,Ostvareno
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +65,Territory / Customer,Teritorij / Kupac
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,e.g. 5,na primjer 5
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +207,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},Red {0}: Dodijeljeni iznos {1} mora biti manji od ili jednak fakturirati preostali iznos {2}
+apps/erpnext/erpnext/public/js/setup_wizard.js +294,e.g. 5,na primjer 5
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},Red {0}: Dodijeljeni iznos {1} mora biti manji od ili jednak fakturirati preostali iznos {2}
 DocType: Sales Invoice,In Words will be visible once you save the Sales Invoice.,U riječi će biti vidljiv nakon što spremite prodaje fakture.
 DocType: Item,Is Sales Item,Je proizvod namijenjen prodaji
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,Raspodjela grupa proizvoda
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,"Stavka {0} nije dobro postavljen za gospodara , serijski brojevi Provjera"
 DocType: Maintenance Visit,Maintenance Time,Vrijeme održavanja
 ,Amount to Deliver,Iznos za isporuku
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +620,A Product or Service,Proizvod ili usluga
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +158,There were errors.,Bilo je grešaka .
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +101,Tapping,Kuckanje
+apps/erpnext/erpnext/public/js/setup_wizard.js +356,A Product or Service,Proizvod ili usluga
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +146,There were errors.,Bilo je grešaka .
 DocType: Naming Series,Current Value,Trenutna vrijednost
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +171,{0} created,{0} stvorio
 DocType: Delivery Note Item,Against Sales Order,Protiv prodajnog naloga
@@ -1617,7 +1560,7 @@
 apps/erpnext/erpnext/accounts/party.py +275,Due Date cannot be before Posting Date,Datum dospijeća ne može biti prije datuma objavljivanja
 DocType: Website Item Group,Website Item Group,Grupa proizvoda web stranice
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Duties and Taxes,Carine i porezi
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Please enter Reference date,Unesite Referentni datum
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +312,Please enter Reference date,Unesite Referentni datum
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} unosa plaćanja ne može se filtrirati po {1}
 DocType: Item Website Specification,Table for Item that will be shown in Web Site,Tablica za proizvode koji će biti prikazani na web stranici
 DocType: Purchase Order Item Supplied,Supplied Qty,Isporučena količina
@@ -1625,7 +1568,7 @@
 apps/erpnext/erpnext/config/stock.py +103,Tree of Item Groups.,Stablo grupe proizvoda.
 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,Ne mogu se odnositi broj retka veći ili jednak trenutnom broju red za ovu vrstu Charge
 ,Item-wise Purchase History,Stavka-mudar Kupnja Povijest
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +152,Red,Crvena
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Red,Crvena
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +228,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},"Molimo kliknite na ""Generiraj raspored ' dohvatiti Serial No dodao je za točku {0}"
 DocType: Account,Frozen,Zaleđeni
 ,Open Production Orders,Otvoreni radni nalozi
@@ -1640,7 +1583,7 @@
 DocType: Item Attribute,Attribute Name,Ime atributa
 apps/erpnext/erpnext/controllers/selling_controller.py +236,Item {0} must be Sales or Service Item in {1},Stavka {0} mora biti Prodaja ili usluga artikla u {1}
 DocType: Item Group,Show In Website,Pokaži na web stranici
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +621,Group,Grupa
+apps/erpnext/erpnext/public/js/setup_wizard.js +357,Group,Grupa
 DocType: Task,Expected Time (in hours),Očekivani vrijeme (u satima)
 ,Qty to Order,Količina za narudžbu
 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","Za praćenje robne marke u sljedećim dokumentima izdatnice, Prilika, materijala zahtjev, točke, narudžbenice, Kupnja bon, kupac primitka, citat, prodaja faktura, proizvoda Snop, prodajni nalog, serijski broj"
@@ -1650,6 +1593,7 @@
 DocType: Features Setup,Brands,Brendovi
 DocType: C-Form Invoice Detail,Invoice No,Račun br
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +480,From Purchase Order,Od narudžbenice
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +92,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Ostavite se ne može primijeniti / otkazan prije {0}, kao dopust ravnoteža je već ručne proslijeđena u buduće dodjele dopusta rekord {1}"
 DocType: Activity Cost,Costing Rate,Obračun troškova stopa
 ,Customer Addresses And Contacts,Kupčeve adrese i kontakti
 DocType: Employee,Resignation Letter Date,Ostavka Pismo Datum
@@ -1657,35 +1601,31 @@
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +137,Not Set,Nije postavljeno
 DocType: Communication,Date,Datum
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,Ponovite kupaca prihoda
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +651,Sit tight while your system is being setup. This may take a few moments.,"Sjedi čvrsto , dok je vaš sustav se postava . To može potrajati nekoliko trenutaka ."
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +115,Sit tight while your system is being setup. This may take a few moments.,"Sjedi čvrsto , dok je vaš sustav se postava . To može potrajati nekoliko trenutaka ."
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +51,{0} ({1}) must have role 'Expense Approver',"{0} ({1}) mora imati ulogu ""Odobritelj rashoda '"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Pair,Par
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Pair,Par
 DocType: Bank Reconciliation Detail,Against Account,Protiv računa
 DocType: Maintenance Schedule Detail,Actual Date,Stvarni datum
 DocType: Item,Has Batch No,Je Hrpa Ne
 DocType: Delivery Note,Excise Page Number,Trošarina Broj stranice
 DocType: Employee,Personal Details,Osobni podaci
 ,Maintenance Schedules,Održavanja rasporeda
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +44,Embossing,Utiskivanje
 ,Quotation Trends,Trend ponuda
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +139,Item Group not mentioned in item master for item {0},Stavka proizvoda se ne spominje u master artiklu za artikal {0}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +302,Debit To account must be a Receivable account,Zaduženja računa mora biti Potraživanja račun
-apps/erpnext/erpnext/stock/doctype/item/item.py +310,"As Production Order can be made for this item, it must be a stock item.","Kao Production Order može biti za tu stavku , to mora bitipredmet dionica ."
 DocType: Shipping Rule Condition,Shipping Amount,Dostava Iznos
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +140,Joining,Spajanje
-DocType: Authorization Rule,Above Value,Iznad vrijednosti
 ,Pending Amount,Iznos na čekanju
 DocType: Purchase Invoice Item,Conversion Factor,Konverzijski faktor
 DocType: Purchase Order,Delivered,Isporučeno
 apps/erpnext/erpnext/config/hr.py +160,Setup incoming server for jobs email id. (e.g. jobs@example.com),Postavke dolaznog servera za e-mail (npr. jobs@example.com)
 DocType: Purchase Receipt,Vehicle Number,Broj vozila
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,Datum na koji se ponavlja faktura će se zaustaviti
+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,Ukupno dodijeljeni lišće {0} ne može biti manja od već odobrenih lišća {1} za razdoblje
 DocType: Journal Entry,Accounts Receivable,Potraživanja
 ,Supplier-Wise Sales Analytics,Supplier -mudar prodaje Analytics
 DocType: Address Template,This format is used if country specific format is not found,Ovaj format se koristi ako država specifičan format nije pronađena
 DocType: Custom Field,Custom,Prilagođeno
 DocType: Production Order,Use Multi-Level BOM,Koristite multi-level BOM
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +26,Injection molding,Injection moulding
 DocType: Bank Reconciliation,Include Reconciled Entries,Uključi pomirio objave
 apps/erpnext/erpnext/config/accounts.py +41,Tree of finanial accounts.,Drvo finanial račune .
 DocType: Leave Control Panel,Leave blank if considered for all employee types,Ostavite prazno ako se odnosi na sve tipove zaposlenika
@@ -1695,30 +1635,28 @@
 apps/frappe/frappe/config/setup.py +130,Printing,Tiskanje
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +114,Expense Claim is pending approval. Only the Expense Approver can update status.,Rashodi Tužba se čeka odobrenje . SamoRashodi Odobritelj može ažurirati status .
 DocType: Purchase Invoice,Additional Discount Amount,Dodatni popust Iznos
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +99,The day(s) on which you are applying for leave are holiday. You need not apply for leave.,Dan (a ) na koji se prijavljujete za dopust su odmor . Ne trebaju podnijeti zahtjev za dopust .
 apps/frappe/frappe/public/js/frappe/misc/utils.js +110,and,i
 DocType: Leave Block List Allow,Leave Block List Allow,Odobrenje popisa neodobrenih odsustava
 apps/erpnext/erpnext/setup/doctype/company/company.py +236,Abbr can not be blank or space,Abbr ne može biti prazno ili prostora
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +50,Sports,sportovi
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,sportovi
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Actual,Ukupno Stvarni
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Unit,jedinica
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Unit,jedinica
 apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.py +182,Please set Dropbox access keys in your site config,Molimo postaviti Dropbox pristupnih tipki u vašem web config
 apps/erpnext/erpnext/stock/get_item_details.py +113,Please specify Company,Navedite tvrtke
 ,Customer Acquisition and Loyalty,Stjecanje kupaca i lojalnost
 DocType: Purchase Receipt,Warehouse where you are maintaining stock of rejected items,Skladište na kojem držite zalihe odbijenih proizvoda
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +408,Your financial year ends on,Vaša financijska godina završava
+apps/erpnext/erpnext/public/js/setup_wizard.js +156,Your financial year ends on,Vaša financijska godina završava
 DocType: POS Profile,Price List,Cjenik
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +20,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0} je sada zadana fiskalna godina. Osvježi preglednik kako bi se promjene aktualizirale.
 apps/erpnext/erpnext/projects/doctype/project/project.js +47,Expense Claims,Rashodi Potraživanja
 DocType: Issue,Support,Podrška
-DocType: Authorization Rule,Approving Role,Odobravanje ulogu
 ,BOM Search,BOM Pretraživanje
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +176,Closing (Opening + Totals),Zatvaranje (Otvaranje + iznosi)
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +26,Please specify currency in Company,Navedite valutu u Društvu
 DocType: Workstation,Wages per hour,Satnice
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},Stock ravnoteža u batch {0} postat negativna {1} za točku {2} na skladištu {3}
 apps/erpnext/erpnext/config/setup.py +83,"Show / Hide features like Serial Nos, POS etc.","Prikaži / sakrij značajke kao što su serijski broj, prodajno mjesto i sl."
-apps/erpnext/erpnext/controllers/accounts_controller.py +236,Account {0} is invalid. Account Currency must be {1},Račun {0} je nevažeća. Valuta računa mora biti {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +237,Account {0} is invalid. Account Currency must be {1},Račun {0} je nevažeća. Valuta računa mora biti {1}
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +34,UOM Conversion factor is required in row {0},Faktor UOM pretvorbe je potrebno u redu {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +53,Clearance date cannot be before check date in row {0},Datum rasprodaja ne može biti prije datuma check u redu {0}
 DocType: Salary Slip,Deduction,Odbitak
@@ -1737,13 +1675,13 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +82,Item {0} has already been returned,Proizvod {0} je već vraćen
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,**Fiskalna godina** predstavlja poslovnu godinu. Svi računovodstvene stavke i druge glavne transakcije su praćene od **Fiskalne godine**.
 DocType: Opportunity,Customer / Lead Address,Kupac / Olovo Adresa
+apps/erpnext/erpnext/stock/doctype/item/item.py +112,Warning: Invalid SSL certificate on attachment {0},Upozorenje: Invalid SSL potvrda o vezanosti {0}
 DocType: Production Order Operation,Actual Operation Time,Stvarni Operacija vrijeme
 DocType: Authorization Rule,Applicable To (User),Odnosi se na (Upute)
 DocType: Purchase Taxes and Charges,Deduct,Odbiti
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +170,Job Description,Opis Posla
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +170,Job Description,Opis Posla
 DocType: Purchase Order Item,Qty as per Stock UOM,Količina po skladišnom UOM-u
 apps/frappe/frappe/model/rename_doc.py +343,Please select a valid csv file with data,Odaberite valjanu CSV datoteku s podacima
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +92,Coating,Premazivanje
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +126,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Posebni znakovi osim ""-"" ""."", ""#"", i ""/"" nije dopušten u imenovanju serije"
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Pratite podatke o prodajnim kampanjama. Vodite zapise o potencijalima, ponudama, narudžbama itd kako bi ste procijenili povrat ulaganje ROI."
 DocType: Expense Claim,Approver,Odobritelj
@@ -1753,12 +1691,11 @@
 DocType: Supplier Quotation,Manufacturing Manager,Upravitelj proizvodnje
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},Serijski Ne {0} je pod jamstvom upto {1}
 apps/erpnext/erpnext/config/stock.py +69,Split Delivery Note into packages.,Split otpremnici u paketima.
-apps/erpnext/erpnext/hooks.py +84,Shipments,Pošiljke
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +29,Dip molding,Dip moulding
+apps/erpnext/erpnext/hooks.py +68,Shipments,Pošiljke
 DocType: Purchase Order,To be delivered to customer,Da biste se dostaviti kupcu
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,Vrijeme Log Status moraju biti dostavljeni.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,Serijski broj {0} ne pripada bilo Skladište
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +650,Setting Up,Postavljanje
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +114,Setting Up,Postavljanje
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,Row # ,Red #
 DocType: Purchase Invoice,In Words (Company Currency),Riječima (valuta tvrtke)
 DocType: Pricing Rule,Supplier,Dobavljač
@@ -1766,7 +1703,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +105,Miscellaneous Expenses,Razni troškovi
 DocType: Global Defaults,Default Company,Zadana tvrtka
 apps/erpnext/erpnext/controllers/stock_controller.py +166,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,Rashodi ili razlika račun je obvezna za točke {0} jer utječe na ukupnu vrijednost dionica
-apps/erpnext/erpnext/controllers/accounts_controller.py +354,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","Ne možete prekoračiti za proizvod {0} u redku {1} više od {2}. Kako bi omogućili prekoračenje, molimo promjenite u postavkama skladišta"
+apps/erpnext/erpnext/controllers/accounts_controller.py +355,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","Ne možete prekoračiti za proizvod {0} u redku {1} više od {2}. Kako bi omogućili prekoračenje, molimo promjenite u postavkama skladišta"
 DocType: Employee,Bank Name,Naziv banke
 apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +27,-Above,-Iznad
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +135,User {0} is disabled,Korisnik {0} je onemogućen
@@ -1779,27 +1716,26 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,{0} is mandatory for Item {1},{0} je obavezno za točku {1}
 DocType: Currency Exchange,From Currency,Od novca
 DocType: DocField,Name,Ime
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +211,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Odaberite Dodijeljeni iznos, Vrsta računa i broj računa u atleast jednom redu"
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +104,Sales Order required for Item {0},Prodajnog naloga potrebna za točke {0}
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +158,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Odaberite Dodijeljeni iznos, Vrsta računa i broj računa u atleast jednom redu"
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +107,Sales Order required for Item {0},Prodajnog naloga potrebna za točke {0}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +43,Amounts not reflected in system,Iznosi koji se ne ogleda u sustav
 DocType: Purchase Invoice Item,Rate (Company Currency),Ocijeni (Društvo valuta)
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +40,Others,Ostali
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +40,Others,Ostali
 apps/erpnext/erpnext/templates/includes/product_page.js +80,Cannot find a matching Item. Please select some other value for {0}.,Ne možete pronaći odgovarajući stavku. Odaberite neku drugu vrijednost za {0}.
 DocType: POS Profile,Taxes and Charges,Porezi i naknade
 DocType: Item,"A Product or a Service that is bought, sold or kept in stock.","Proizvoda ili usluge koja je kupio, prodao i zadržao na lageru."
 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,"Ne možete odabrati vrstu naboja kao ' na prethodnim Row Iznos ""ili"" u odnosu na prethodnu Row Ukupno ""za prvi red"
 apps/frappe/frappe/core/doctype/doctype/boilerplate/controller_list.html +31,Completed,Dovršen
 DocType: Web Form,Select DocType,Odaberite DOCTYPE
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +104,Broaching,Provlačenje
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +12,Banking,Bankarstvo
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,Bankarstvo
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +38,Please click on 'Generate Schedule' to get schedule,"Molimo kliknite na ""Generiraj raspored ' kako bi dobili raspored"
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +283,New Cost Center,Novi trošak
 DocType: Bin,Ordered Quantity,Naručena količina
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +397,"e.g. ""Build tools for builders""","na primjer ""Alati za graditelje"""
+apps/erpnext/erpnext/public/js/setup_wizard.js +145,"e.g. ""Build tools for builders""","na primjer ""Alati za graditelje"""
 DocType: Quality Inspection,In Process,U procesu
 DocType: Authorization Rule,Itemwise Discount,Itemwise popust
 DocType: Purchase Order Item,Reference Document Type,Referentna Tip dokumenta
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +318,{0} against Sales Order {1},{0} protiv prodajni nalog {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +320,{0} against Sales Order {1},{0} protiv prodajni nalog {1}
 DocType: Account,Fixed Asset,Dugotrajna imovina
 apps/erpnext/erpnext/config/stock.py +283,Serialized Inventory,Serijaliziranom Inventar
 DocType: Activity Type,Default Billing Rate,Zadana naplate stopa
@@ -1814,14 +1750,13 @@
 DocType: Purchase Invoice Item,Page Break,Prijelom stranice
 DocType: Production Order Operation,Pending,Na čekanju
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,Korisnici koji može odobriti dopust aplikacije neke specifične zaposlenika
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +33,You cannot change default UOM of Variant. To change default UOM for Variant change default UOM of the Template,Vi ne možete promijeniti zadanu UOM varijanti. Za promjenu zadanog UOM za Variant promjenu zadane UOM predloška
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +50,Office Equipments,Uredska oprema
 DocType: Purchase Invoice Item,Qty,Kol
 DocType: Fiscal Year,Companies,Tvrtke
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +24,Electronics,Elektronika
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +24,Electronics,Elektronika
 DocType: Stock Settings,Raise Material Request when stock reaches re-order level,Podignite Materijal Zahtjev kad dionica dosegne ponovno poredak razinu
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +18,From Maintenance Schedule,Od održavanje rasporeda
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +56,Full-time,Puno radno vrijeme
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +56,Full-time,Puno radno vrijeme
 DocType: Purchase Invoice,Contact Details,Kontakt podaci
 DocType: C-Form,Received Date,Datum pozicija
 DocType: Delivery Note,"If you have created a standard template in Sales Taxes and Charges Template, select one and click on the button below.","Ako ste stvorili standardni predložak u prodaji poreze i troškove predložak, odaberite jednu i kliknite na gumb ispod."
@@ -1833,11 +1768,12 @@
 DocType: Job Applicant,Job Opening,Posao Otvaranje
 DocType: Payment Reconciliation,Payment Reconciliation,Pomirenje plaćanja
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +154,Please select Incharge Person's name,Odaberite incharge ime osobe
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +51,Technology,tehnologija
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,tehnologija
 DocType: Offer Letter,Offer Letter,Ponuda Pismo
 apps/erpnext/erpnext/config/manufacturing.py +51,Generate Material Requests (MRP) and Production Orders.,Generirajte Materijal Upiti (MRP) i radne naloge.
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +68,Total Invoiced Amt,Ukupno fakturirati Amt
 DocType: Time Log,To Time,Za vrijeme
+DocType: Authorization Rule,Approving Role (above authorized value),Odobravanje ulogu (iznad ovlaštenog vrijednosti)
 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.","Da biste dodali djece čvorova , istražiti stablo i kliknite na čvoru pod kojima želite dodati više čvorova ."
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +102,Credit To account must be a Payable account,Kredit računa mora biti naplativo račun
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +233,BOM recursion: {0} cannot be parent or child of {2},BOM rekurzija : {0} ne može biti roditelj ili dijete od {2}
@@ -1850,10 +1786,8 @@
 DocType: Item,Customer Item Codes,Kupac Stavka Kodovi
 DocType: Opportunity,Lost Reason,Razlog gubitka
 apps/erpnext/erpnext/config/accounts.py +68,Create Payment Entries against Orders or Invoices.,Stvaranje unosa plaćanja protiv narudžbe ili fakture.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +141,Welding,Zavarivanje
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +40,New Stock UOM is required,Novi skldišni UOM je potreban
 DocType: Quality Inspection,Sample Size,Veličina uzorka
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +443,All items have already been invoiced,Svi proizvodi su već fakturirani
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +446,All items have already been invoiced,Svi proizvodi su već fakturirani
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',Navedite važeću &#39;iz Predmet br&#39;
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +287,Further cost centers can be made under Groups but entries can be made against non-Groups,"Daljnje troška mogu biti u skupinama, ali unose se može podnijeti protiv nesrpskog Groups"
 DocType: Project,External,Vanjski
@@ -1865,8 +1799,7 @@
 DocType: Bin,Actual Quantity,Stvarna količina
 DocType: Shipping Rule,example: Next Day Shipping,Primjer: Sljedeći dan Dostava
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,Serijski broj {0} nije pronađen
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +563,Your Customers,Vaši klijenti
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +27,Compression molding,Prešanje
+apps/erpnext/erpnext/public/js/setup_wizard.js +303,Your Customers,Vaši klijenti
 DocType: Leave Block List Date,Block Date,Datum bloka
 DocType: Sales Order,Not Delivered,Ne isporučeno
 ,Bank Clearance Summary,Razmak banka Sažetak
@@ -1887,10 +1820,10 @@
 DocType: SMS Log,Sent To,Poslano Da
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +28,Make Sales Invoice,Napravi prodajni račun
 DocType: Company,For Reference Only.,Za samo kao referenca.
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +29,Invalid {0}: {1},Pogrešna {0}: {1}
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +49,Invalid {0}: {1},Pogrešna {0}: {1}
 DocType: Sales Invoice Advance,Advance Amount,Iznos predujma
 DocType: Manufacturing Settings,Capacity Planning,Planiranje kapaciteta
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +49,'From Date' is required,'Od datuma' je potrebno
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +43,'From Date' is required,'Od datuma' je potrebno
 DocType: Journal Entry,Reference Number,Referentni broj
 DocType: Employee,Employment Details,Zapošljavanje Detalji
 DocType: Employee,New Workplace,Novo radno mjesto
@@ -1905,7 +1838,7 @@
 DocType: Serial No,Delivery Time,Vrijeme isporuke
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Starenje temelju On
 DocType: Item,End of Life,Kraj života
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +41,Travel,putovanje
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +41,Travel,putovanje
 DocType: Leave Block List,Allow Users,Omogućiti korisnicima
 DocType: Purchase Order,Customer Mobile No,Kupac mobilne Ne
 DocType: Sales Invoice,Recurring,Koji se vraća
@@ -1919,7 +1852,7 @@
 DocType: Naming Series,User must always select,Korisničko uvijek mora odabrati
 DocType: Stock Settings,Allow Negative Stock,Dopustite negativnu zalihu
 DocType: Installation Note,Installation Note,Napomena instalacije
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +541,Add Taxes,Dodaj poreze
+apps/erpnext/erpnext/public/js/setup_wizard.js +283,Add Taxes,Dodaj poreze
 ,Financial Analytics,Financijska analitika
 DocType: Quality Inspection,Verified By,Ovjeren od strane
 DocType: Address,Subsidiary,Podružnica
@@ -1929,7 +1862,6 @@
 DocType: System Settings,In Hours,U sati
 DocType: Process Payroll,Create Salary Slip,Stvaranje plaće Slip
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Expected balance as per bank,Očekivani Stanje na banke
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +115,Buffing,Poliranje
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Source of Funds (Liabilities),Izvor sredstava ( pasiva)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +347,Quantity in row {0} ({1}) must be same as manufactured quantity {2},Količina u redku {0} ({1}) mora biti ista kao proizvedena količina {2}
 DocType: Appraisal,Employee,Zaposlenik
@@ -1946,11 +1878,11 @@
 DocType: Rename Tool,File to Rename,Datoteka za Preimenovanje
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +176,Purchse Order number required for Item {0},Broj kupovne narudžbe potrebno za proizvod {0}
 apps/erpnext/erpnext/public/js/controllers/transaction.js +136,Show Payments,Pokaži Plaćanja
-apps/erpnext/erpnext/controllers/buying_controller.py +245,Specified BOM {0} does not exist for Item {1},Određena BOM {0} ne postoji za točku {1}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +202,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Stavka održavanja {0} mora biti otkazana prije poništenja ove narudžbe kupca
+apps/erpnext/erpnext/controllers/buying_controller.py +236,Specified BOM {0} does not exist for Item {1},Određena BOM {0} ne postoji za točku {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Stavka održavanja {0} mora biti otkazana prije poništenja ove narudžbe kupca
 apps/frappe/frappe/desk/page/backups/backups.html +13,Size,Veličina
 DocType: Notification Control,Expense Claim Approved,Rashodi Zahtjev odobren
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +113,Pharmaceutical,Farmaceutski
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Pharmaceutical,Farmaceutski
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,Troškovi kupljene predmete
 DocType: Selling Settings,Sales Order Required,Prodajnog naloga Obvezno
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +30,Create Customer,Kreiraj kupca
@@ -1960,7 +1892,6 @@
 DocType: Quality Inspection Reading,Reading 9,Čitanje 9
 DocType: Supplier,Is Frozen,Je Frozen
 DocType: Buying Settings,Buying Settings,Kupnja postavke
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +122,Mass finishing,Misa za završnu obradu
 DocType: Stock Entry Detail,BOM No. for a Finished Good Item,BOM broj za Gotovi Dobar točki
 DocType: Upload Attendance,Attendance To Date,Gledanost do danas
 apps/erpnext/erpnext/config/selling.py +158,Setup incoming server for sales email id. (e.g. sales@example.com),Postavke dolaznog servera za prodajni e-mail (npr. sales@example.com)
@@ -1968,7 +1899,7 @@
 DocType: Payment Tool,Payment Account,Račun za plaćanje
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +713,Please specify Company to proceed,Navedite Tvrtka postupiti
 apps/frappe/frappe/public/js/frappe/model/indicator.js +30,Draft,Nepotvrđeno
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +46,Compensatory Off,kompenzacijski Off
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Compensatory Off,kompenzacijski Off
 DocType: Quality Inspection Reading,Accepted,Prihvaćeno
 DocType: User,Female,Ženski
 DocType: Journal Entry Account,Debit in Account Currency,Debitna u valuti računa
@@ -1980,7 +1911,7 @@
 DocType: Shipping Rule,Shipping Rule Label,Dostava Pravilo Label
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +209,Raw Materials cannot be blank.,Sirovine ne može biti prazno.
 DocType: Newsletter,Test,Test
-apps/erpnext/erpnext/stock/doctype/item/item.py +364,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +368,"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'","Kao što već postoje dionice transakcija za tu stavku, \ ne možete mijenjati vrijednosti &#39;Je rednim&#39;, &#39;Je batch Ne&#39;, &#39;Je kataloški Stavka &quot;i&quot; Vrednovanje metoda&#39;"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +448,Quick Journal Entry,Brzo Temeljnica
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +92,You can not change rate if BOM mentioned agianst any item,Ne možete promijeniti cijenu ako je sastavnica spomenuta u bilo kojem proizvodu
@@ -1991,13 +1922,14 @@
 apps/erpnext/erpnext/config/stock.py +18,Requests for items.,Zahtjevi za stavke.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,Poseban proizvodnja kako će biti izrađen za svakog gotovog dobrom stavke.
 DocType: Purchase Invoice,Terms and Conditions1,Odredbe i Conditions1
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +18,Complete Setup,kompletan Setup
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard_page.html +18,Complete Setup,kompletan Setup
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","Knjiženje zamrznuta do tog datuma, nitko ne može učiniti / mijenjati ulazak, osim uloge naveden u nastavku."
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +121,Please save the document before generating maintenance schedule,Molimo spremite dokument prije stvaranja raspored za održavanje
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,Status projekta
 DocType: UOM,Check this to disallow fractions. (for Nos),Provjerite to da ne dopušta frakcija. (Za br)
 apps/erpnext/erpnext/config/crm.py +96,Newsletter Mailing List,Bilten Mailing lista
 DocType: Delivery Note,Transporter Name,Transporter Ime
+DocType: Authorization Rule,Authorized Value,Ovlašteni vrijednost
 DocType: Contact,Enter department to which this Contact belongs,Unesite odjel na koji se ovaj Kontakt pripada
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Absent,Ukupno Odsutni
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +746,Item or Warehouse for row {0} does not match Material Request,Proizvod ili skladište za redak {0} ne odgovara Zahtjevu za materijalom
@@ -2022,16 +1954,15 @@
 DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),Osnovna stopa (po burzi UOM)
 DocType: SMS Log,No of Requested SMS,Nema traženih SMS-a
 DocType: Campaign,Campaign-.####,Kampanja-.####
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +55,Piercing,Prodoran
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,Sljedeći koraci
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +117,Contract End Date must be greater than Date of Joining,Ugovor Datum završetka mora biti veći od dana ulaska u
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,Treća strana distributer / trgovac / trgovački zastupnik / affiliate / prodavača koji prodaje tvrtki koje proizvode za proviziju.
 DocType: Customer Group,Has Child Node,Je li čvor dijete
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{0} against Purchase Order {1},{0} u odnosu na narudžbu {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +332,{0} against Purchase Order {1},{0} u odnosu na narudžbu {1}
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","Unesite statičke parametre URL ovdje (npr. pošiljatelj = ERPNext, username = ERPNext, lozinkom = 1234 itd.)"
 apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,{0} {1} nije bilo aktivne fiskalne godine. Za provjeru više detalja {2}.
-apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,Ovo je primjer web stranica automatski generira iz ERPNext
+apps/erpnext/erpnext/setup/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,Ovo je primjer web stranica automatski generira iz ERPNext
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +37,Ageing Range 1,Starenje Raspon 1
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +110,Photochemical machining,Fotokemijski obrada
 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.
 
 #### Note
@@ -2077,7 +2008,7 @@
 DocType: Purchase Receipt Item,Recd Quantity,RecD Količina
 DocType: Email Account,Email Ids,IDS e-pošte
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},Ne može proizvesti više predmeta {0} od prodajnog naloga količina {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +471,Stock Entry {0} is not submitted,Međuskladišnica {0} nije potvrđena
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +473,Stock Entry {0} is not submitted,Međuskladišnica {0} nije potvrđena
 DocType: Payment Reconciliation,Bank / Cash Account,Banka / Cash račun
 DocType: Tax Rule,Billing City,Naplata Grad
 DocType: Global Defaults,Hide Currency Symbol,Sakrij simbol valute
@@ -2093,7 +2024,7 @@
 DocType: Purchase Invoice,Currency and Price List,Valuta i cjenik
 DocType: Opportunity,Customer / Lead Name,Potencijalni kupac
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +63,Clearance Date not mentioned,Razmak Datum nije spomenuo
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +71,Production,Proizvodnja
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Production,Proizvodnja
 DocType: Item,Allow Production Order,Dopustite proizvodni nalog
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +60,Row {0}:Start Date must be before End Date,Red {0} : Datum početka mora biti prije datuma završetka
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Ukupno (Kol)
@@ -2106,7 +2037,7 @@
 apps/erpnext/erpnext/utilities/doctype/address/address.py +113,My Addresses,Moje Adrese
 DocType: Stock Ledger Entry,Outgoing Rate,Odlazni Ocijenite
 apps/erpnext/erpnext/config/hr.py +100,Organization branch master.,Organizacija grana majstor .
-apps/erpnext/erpnext/controllers/accounts_controller.py +237, or ,ili
+apps/erpnext/erpnext/controllers/accounts_controller.py +238, or ,ili
 DocType: Sales Order,Billing Status,Status naplate
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Utility Expenses,komunalna Troškovi
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,90-Above,90-Iznad
@@ -2133,6 +2064,7 @@
 DocType: Stock Entry Detail,Serial No / Batch,Serijski Ne / Batch
 DocType: Product Bundle,Parent Item,Nadređeni proizvod
 DocType: Account,Account Type,Vrsta računa
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +113,Leave Type {0} cannot be carry-forwarded,Ostavite Tip {0} ne može nositi-proslijeđen
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +213,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',Raspored održavanja nije generiran za sve proizvode. Molimo kliknite na 'Generiraj raspored'
 ,To Produce,proizvoditi
 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","Za red {0} {1}. Da su {2} u stopu točke, redovi {3} također moraju biti uključeni"
@@ -2140,10 +2072,7 @@
 DocType: Bin,Reserved Quantity,Rezervirano Količina
 DocType: Landed Cost Voucher,Purchase Receipt Items,Primka proizvoda
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,Prilagodba Obrasci
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +62,Cutting,Rezanje
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +69,Flattening,Ravnanje
 DocType: Account,Income Account,Račun prihoda
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +22,Molding,Oblikovanje
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +632,Delivery,Isporuka
 DocType: Stock Reconciliation Item,Current Qty,Trenutno Kom
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",Pogledajte &quot;stopa materijali na temelju troškova&quot; u odjeljak
@@ -2153,20 +2082,19 @@
 apps/frappe/frappe/desk/moduleview.py +61,Documents,Dokumenti
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +17,Ref,Ref.
 DocType: Cost Center,Cost Center,Troška
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.js +48,Voucher #,bon #
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +36,Voucher #,bon #
 DocType: Notification Control,Purchase Order Message,Poruka narudžbenice
 DocType: Tax Rule,Shipping Country,Dostava Država
 DocType: Upload Attendance,Upload HTML,Prenesi HTML
-apps/erpnext/erpnext/controllers/accounts_controller.py +391,"Total advance ({0}) against Order {1} cannot be greater \
+apps/erpnext/erpnext/controllers/accounts_controller.py +392,"Total advance ({0}) against Order {1} cannot be greater \
 				than the Grand Total ({2})","Ukupno unaprijed ({0}) protiv Red {1} ne može biti veća \
  od SVEUKUPNO ({2})"
 DocType: Employee,Relieving Date,Rasterećenje Datum
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +12,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.","Cijene Pravilo je napravljen prebrisati Cjenik / definirati postotak popusta, na temelju nekih kriterija."
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,Skladište se može mijenjati samo preko Međuskladišnica / Otpremnica / Primka
 DocType: Employee Education,Class / Percentage,Klasa / Postotak
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +92,Head of Marketing and Sales,Voditelj marketinga i prodaje
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +31,Income Tax,Porez na dohodak
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +157,Laser engineered net shaping,Laserski projektirana neto oblikovanje
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Head of Marketing and Sales,Voditelj marketinga i prodaje
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +31,Income Tax,Porez na dohodak
 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.","Ako odabrani Cijene Pravilo je napravljen za 'Cijena', to će prebrisati Cjenik. Cijene Pravilo cijena je konačna cijena, pa dalje popust treba primijeniti. Dakle, u prometu kao što su prodajni nalog, narudžbenica itd, to će biti preuzeta u 'Rate' polju, a ne 'Cjenik stopom' polju."
 apps/erpnext/erpnext/config/selling.py +163,Track Leads by Industry Type.,Praćenje potencijalnih kupaca prema vrsti industrije.
 DocType: Item Supplier,Item Supplier,Dobavljač proizvoda
@@ -2189,31 +2117,28 @@
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Stvarna količina nakon transakcije
 ,Pending SO Items For Purchase Request,Otvorene stavke narudžbe za zahtjev za kupnju
 DocType: Supplier,Billing Currency,Naplata valuta
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +148,Extra Large,Extra large
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,Extra Large,Extra large
 ,Profit and Loss Statement,Račun dobiti i gubitka
 DocType: Bank Reconciliation Detail,Cheque Number,Ček Broj
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +43,Pressing,Pritisak
 DocType: Payment Tool Detail,Payment Tool Detail,Alat Plaćanje Detail
 ,Sales Browser,prodaja preglednik
 DocType: Journal Entry,Total Credit,Ukupna kreditna
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +474,Warning: Another {0} # {1} exists against stock entry {2},Upozorenje: Još {0} # {1} postoji protiv ulaska dionicama {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +459,Local,Lokalno
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +476,Warning: Another {0} # {1} exists against stock entry {2},Upozorenje: Još {0} # {1} postoji protiv ulaska dionicama {2}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +397,Local,Lokalno
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),Zajmovi i predujmovi (aktiva)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,Dužnici
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +147,Large,Veliki
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +23,No employee found!,Nisu pronađeni zaposlenici!
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Large,Veliki
 DocType: C-Form Invoice Detail,Territory,Teritorij
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,Molimo spomenuti nema posjeta potrebnih
 DocType: Purchase Order,Customer Address Display,Kupac Adresa prikaz
 DocType: Stock Settings,Default Valuation Method,Zadana metoda vrednovanja
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +127,Polishing,Poliranje
 DocType: Production Order Operation,Planned Start Time,Planirani početak vremena
 apps/erpnext/erpnext/config/accounts.py +63,Close Balance Sheet and book Profit or Loss.,Zatvori bilanca i knjiga dobit ili gubitak .
-apps/erpnext/erpnext/stock/doctype/item/item.py +661,"Default Unit of Measure for Item {0} cannot be changed directly because \
+apps/erpnext/erpnext/stock/doctype/item/item.py +665,"Default Unit of Measure for Item {0} cannot be changed directly because \
 			you have already made some transaction(s) with another UOM. To change default UOM, \
 			use 'UOM Replace Utility' tool under Stock module.","Zadana mjerna jedinica za točke {0} se ne može mijenjati, jer izravno \ ste već napravili neke transakcije (e) s drugim UOM. Za promjenu zadanog UOM, \ uporabu &#39;UOM Zamijenite Utility &quot;alat pod burzi modula."
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,Navedite Tečaj pretvoriti jedne valute u drugu
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +146,Quotation {0} is cancelled,Ponuda {0} je otkazana
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +141,Quotation {0} is cancelled,Ponuda {0} je otkazana
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,Ukupni iznos
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} was on leave on {1}. Cannot mark attendance.,Zaposlenik {0} je bio na odmoru na {1} . Ne možete označiti dolazak .
 DocType: Sales Partner,Targets,Ciljevi
@@ -2224,7 +2149,6 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +158,Please create Customer from Lead {0},Molimo stvoriti kupac iz Olovo {0}
 DocType: Price List,Applicable for Countries,Primjenjivo za zemlje
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Computers,Računala
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +112,Electro-chemical grinding,Elektro-kemijske brušenje
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +14,This is a root customer group and cannot be edited.,Ovo je glavna grupa kupaca i ne može se mijenjati.
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +39,Please setup your chart of accounts before you start Accounting Entries,Molim postaviti svoj kontni plan prije nego što počnete računovodstvenih unosa
 DocType: Purchase Invoice,Ignore Pricing Rule,Ignorirajte Cijene pravilo
@@ -2282,7 +2206,6 @@
 DocType: Maintenance Visit,Purposes,Svrhe
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +103,Atleast one item should be entered with negative quantity in return document,Atleast jedan predmet treba upisati s negativnim količinama u povratnom dokumentu
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +67,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","Operacija {0} više nego bilo raspoloživih radnih sati u radnom {1}, razbiti rad u više operacija"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +134,Electrochemical machining,Elektrokemijska obrada
 ,Requested,Tražena
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +66,No Remarks,Nema primjedbi
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +13,Overdue,Prezadužen
@@ -2291,7 +2214,7 @@
 DocType: Monthly Distribution,Distribution Name,Naziv distribucije
 DocType: Features Setup,Sales and Purchase,Prodaje i kupnje
 DocType: Supplier Quotation Item,Material Request No,Zahtjev za robom br.
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +218,Quality Inspection required for Item {0},Inspekcija kvalitete potrebna za proizvod {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +221,Quality Inspection required for Item {0},Inspekcija kvalitete potrebna za proizvod {0}
 DocType: Quotation,Rate at which customer's currency is converted to company's base currency,Stopa po kojoj se valuta klijenta se pretvaraju u tvrtke bazne valute
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +107,{0} has been successfully unsubscribed from this list.,{0} je uspješno poništili pretplatu s ovog popisa.
 DocType: Purchase Invoice Item,Net Rate (Company Currency),Neto stopa (Društvo valuta)
@@ -2309,9 +2232,8 @@
 apps/erpnext/erpnext/accounts/report/financial_statements.py +16,Fiscal Year {0} not found.,Fiskalna godina {0} nije pronađen.
 DocType: Bank Reconciliation,Get Relevant Entries,Kreiraj relevantne ulaze
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +407,Accounting Entry for Stock,Knjiženje na skladištu
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +64,Coining,Kovanja
 DocType: Sales Invoice,Sales Team1,Prodaja Team1
-apps/erpnext/erpnext/stock/doctype/item/item.py +412,Item {0} does not exist,Proizvod {0} ne postoji
+apps/erpnext/erpnext/stock/doctype/item/item.py +416,Item {0} does not exist,Proizvod {0} ne postoji
 DocType: Sales Invoice,Customer Address,Kupac Adresa
 apps/frappe/frappe/desk/query_report.py +136,Total,Ukupno
 DocType: Purchase Invoice,Apply Additional Discount On,Nanesite dodatni popust na
@@ -2323,14 +2245,13 @@
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),Porezna Iznos Nakon Popust Iznos (Društvo valuta)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +149,Target warehouse is mandatory for row {0},Target skladište je obvezno za redom {0}
 DocType: Quality Inspection,Quality Inspection,Provjera kvalitete
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +144,Extra Small,Dodatni Mali
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +20,Spray forming,Sprej za formiranje
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Extra Small,Dodatni Mali
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +458,Warning: Material Requested Qty is less than Minimum Order Qty,Upozorenje : Materijal Tražena količina manja nego minimalna narudžba kol
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +191,Account {0} is frozen,Račun {0} je zamrznut
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Pravna cjelina / Podružnica s odvojenim kontnim planom pripada Organizaciji.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +29,"Food, Beverage & Tobacco","Hrana , piće i duhan"
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","Hrana , piće i duhan"
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +20,PL or BS,PL ili BS
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,Can only make payment against unbilled {0},Može napraviti samo plaćanje protiv Nenaplaćena {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +531,Can only make payment against unbilled {0},Može napraviti samo plaćanje protiv Nenaplaćena {0}
 apps/erpnext/erpnext/controllers/selling_controller.py +122,Commission rate cannot be greater than 100,Proviziju ne može biti veća od 100
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Minimum Inventory Level,Minimalna zaliha Razina
 DocType: Stock Entry,Subcontract,Podugovor
@@ -2341,19 +2262,18 @@
 DocType: Item,Manufacturer Part Number,Proizvođačev broj dijela
 DocType: Production Order Operation,Estimated Time and Cost,Procijenjeno vrijeme i trošak
 DocType: Bin,Bin,Kanta
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +50,Nosing,Njuškanje
 DocType: SMS Log,No of Sent SMS,Broj poslanih SMS-a
 DocType: Account,Company,Društvo
 DocType: Account,Expense Account,Rashodi račun
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +49,Software,softver
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +151,Colour,Boja
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +49,Software,softver
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Colour,Boja
 DocType: Maintenance Visit,Scheduled,Planiran
 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","Molimo odaberite stavku u kojoj &quot;Je kataloški Stavka&quot; je &quot;Ne&quot; i &quot;Je Prodaja Stavka&quot; &quot;Da&quot;, a ne postoji drugi bala proizvoda"
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,Odaberite mjesečna distribucija na nejednako distribuirati ciljeve diljem mjeseci.
 DocType: Purchase Invoice Item,Valuation Rate,Stopa vrednovanja
 apps/erpnext/erpnext/stock/get_item_details.py +281,Price List Currency not selected,Cjenik valuta ne bira
 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,Stavka Red {0}: Kupnja Potvrda {1} ne postoji u gornjoj tablici 'kupiti primitaka'
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +134,Employee {0} has already applied for {1} between {2} and {3},Zaposlenik {0} već podnijela zahtjev za {1} od {2} i {3}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +145,Employee {0} has already applied for {1} between {2} and {3},Zaposlenik {0} već podnijela zahtjev za {1} od {2} i {3}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Datum početka projekta
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +8,Until,Do
 DocType: Rename Tool,Rename Log,Preimenuj prijavu
@@ -2363,7 +2283,7 @@
 apps/erpnext/erpnext/controllers/recurring_document.py +162,Please select {0},Odaberite {0}
 DocType: C-Form,C-Form No,C-obrazac br
 DocType: BOM,Exploded_items,Exploded_items
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +95,Researcher,istraživač
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Researcher,istraživač
 apps/frappe/frappe/custom/doctype/customize_form/customize_form.js +88,Update,Ažuriraj
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +78,Please save the Newsletter before sending,Molimo spremite Newsletter prije slanja
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +23,Name or Email is mandatory,Ime ili e-mail je obavezno
@@ -2372,11 +2292,10 @@
 DocType: Employee,Exit,Izlaz
 apps/erpnext/erpnext/accounts/doctype/account/account.py +134,Root Type is mandatory,Korijen Tip je obvezno
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +295,Serial No {0} created,Serijski Ne {0} stvorio
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +125,Vibratory finishing,Vibracijski završna obrada
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","Za praktičnost kupaca, te kodovi mogu se koristiti u tiskanim formata kao što su fakture i otpremnice"
 DocType: Employee,You can enter any date manually,Možete ručno unijeti bilo koji datum
 DocType: Sales Invoice,Advertisement,Oglas
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +165,Probationary Period,Probni
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Probationary Period,Probni
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Samo lisni čvorovi su dozvoljeni u transakciji
 DocType: Expense Claim,Expense Approver,Rashodi Odobritelj
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,Kupnja Prijem artikla Isporuka
@@ -2384,19 +2303,16 @@
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +17,To Datetime,Za datetime
 DocType: SMS Settings,SMS Gateway URL,SMS Gateway URL
 apps/erpnext/erpnext/config/crm.py +53,Logs for maintaining sms delivery status,Trupci za održavanje statusa isporuke sms
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +137,Grinding,Mljevenje
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +34,Shrink wrapping,Stisni omatanje
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +36,Pending Activities,Aktivnosti na čekanju
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,Confirmed,Potvrđen
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier > Supplier Type,Dobavljač> proizvođač tip
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +127,Please enter relieving date.,Unesite olakšavanja datum .
 apps/erpnext/erpnext/controllers/trends.py +137,Amt,AMT
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' can be submitted,"Samo zahtjev za odsustvom sa statusom ""Odobreno"" se može potvrditi"
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +51,Only Leave Applications with status 'Approved' can be submitted,"Samo zahtjev za odsustvom sa statusom ""Odobreno"" se može potvrditi"
 apps/erpnext/erpnext/utilities/doctype/address/address.py +21,Address Title is mandatory.,Naziv adrese je obavezan.
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,"Unesite naziv kampanje, ako je izvor upit je kampanja"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +38,Newspaper Publishers,Novinski izdavači
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +38,Newspaper Publishers,Novinski izdavači
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,Odaberite Fiskalna godina
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +88,Smelting,Taljenje
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Poredaj Razina
 DocType: Attendance,Attendance Date,Gledatelja Datum
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,Plaća raspada temelju zarađivati ​​i odbitka.
@@ -2411,16 +2327,15 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +414,[Error],[Greška]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,U riječi će biti vidljiv nakon što spremite prodajnog naloga.
 ,Employee Birthday,Rođendan zaposlenika
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +55,Venture Capital,venture Capital
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,venture Capital
 DocType: UOM,Must be Whole Number,Mora biti cijeli broj
 DocType: Leave Control Panel,New Leaves Allocated (In Days),Novi Lišće alociran (u danima)
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +51,Serial No {0} does not exist,Serijski Ne {0} ne postoji
 DocType: Pricing Rule,Discount Percentage,Postotak popusta
 DocType: Payment Reconciliation Invoice,Invoice Number,Račun broj
-apps/erpnext/erpnext/hooks.py +70,Orders,Narudžbe
+apps/erpnext/erpnext/hooks.py +54,Orders,Narudžbe
 DocType: Leave Control Panel,Employee Type,Zaposlenik Tip
 DocType: Employee Leave Approver,Leave Approver,Osoba ovlaštena za odobrenje odsustva
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +70,Swaging,Swaging
 DocType: Manufacturing Settings,Material Transferred for Manufacture,Materijal prenose Proizvodnja
 DocType: Expense Claim,"A user with ""Expense Approver"" role","Korisnik s ""Rashodi Odobritelj"" ulozi"
 ,Issued Items Against Production Order,Izdana Proizvodi prema proizvodnji Reda
@@ -2432,7 +2347,6 @@
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +62,Cost Center with existing transactions can not be converted to group,Troška s postojećim transakcija ne može se prevesti u skupini
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Depreciation,Amortizacija
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Dobavljač (s)
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +29,Invalid period,Pogrešna razdoblje
 DocType: Customer,Credit Limit,Kreditni limit
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,Odaberite tip transakcije
 DocType: GL Entry,Voucher No,Bon Ne
@@ -2442,9 +2356,9 @@
 DocType: Customer,Address and Contact,Kontakt
 DocType: Customer,Last Day of the Next Month,Posljednji dan sljedećeg mjeseca
 DocType: Employee,Feedback,Povratna veza
+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}","Ostavite se ne može dodijeliti prije {0}, kao dopust ravnoteža je već ručne proslijeđena u buduće dodjele dopusta rekord {1}"
 apps/erpnext/erpnext/accounts/party.py +284,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Napomena: S obzirom / Referentni datum prelazi dopuštene kupca kreditne dana od {0} dana (s)
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +621,Maint. Schedule,Maint. Raspored
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +108,Abrasive jet machining,Brusni jet obrada
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +632,Maint. Schedule,Maint. Raspored
 DocType: Stock Settings,Freeze Stock Entries,Zamrzavanje Stock Unosi
 DocType: Website Settings,Website Settings,Postavke web stranice
 DocType: Item,Reorder level based on Warehouse,Razina redoslijeda na temelju Skladište
@@ -2461,7 +2375,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +75,Show Stock Entries,Pokaži ulaz robe
 ,Is Primary Address,Je Osnovna adresa
 DocType: Production Order,Work-in-Progress Warehouse,Rad u tijeku Warehouse
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +308,Reference #{0} dated {1},Reference # {0} od {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Reference #{0} dated {1},Reference # {0} od {1}
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +13,Manage Addresses,Upravljanje adrese
 DocType: Pricing Rule,Item Code,Šifra proizvoda
 DocType: Production Planning Tool,Create Production Orders,Napravi proizvodni nalog
@@ -2470,7 +2384,7 @@
 DocType: Lead,Market Segment,Tržišni segment
 DocType: Communication,Phone,Telefon
 DocType: Employee Internal Work History,Employee Internal Work History,Zaposlenikova interna radna povijest
-apps/erpnext/erpnext/public/js/account_tree_grid.js +50,Closing (Dr),Zatvaranje (DR)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +221,Closing (Dr),Zatvaranje (DR)
 DocType: Contact,Passive,Pasiva
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,Serijski broj {0} nije na skladištu
 apps/erpnext/erpnext/config/selling.py +127,Tax template for selling transactions.,Porezni predložak za prodajne transakcije.
@@ -2486,8 +2400,8 @@
 ,Billed Amount,Naplaćeni iznos
 DocType: Bank Reconciliation,Bank Reconciliation,Banka pomirenje
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +9,Get Updates,Nabavite ažuriranja
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +129,Material Request {0} is cancelled or stopped,Zahtjev za robom {0} je otkazan ili zaustavljen
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +641,Add a few sample records,Dodaj nekoliko uzorak zapisa
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +133,Material Request {0} is cancelled or stopped,Zahtjev za robom {0} je otkazan ili zaustavljen
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Add a few sample records,Dodaj nekoliko uzorak zapisa
 apps/erpnext/erpnext/config/hr.py +210,Leave Management,Ostavite upravljanje
 DocType: Event,Groups,Grupe
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,Grupa po računu
@@ -2500,38 +2414,34 @@
 DocType: Features Setup,Sales Extras,Prodajni dodaci
 apps/erpnext/erpnext/accounts/utils.py +344,{0} budget for Account {1} against Cost Center {2} will exceed by {3},{0} proračun za račun {1} od troška {2} premašit će po {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +236,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Razlika računa mora biti tipa imovine / obveza račun, jer to kataloški Pomirenje je otvaranje Stupanje"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +138,Purchase Order number required for Item {0},Broj narudžbenice kupnje je potreban za artikal {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Order number required for Item {0},Broj narudžbenice kupnje je potreban za artikal {0}
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date','Od datuma' mora biti poslije 'Do datuma'
 ,Stock Projected Qty,Stanje skladišta
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +147,Customer {0} does not belong to project {1},Korisnik {0} ne pripada projicirati {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +150,Customer {0} does not belong to project {1},Korisnik {0} ne pripada projicirati {1}
 DocType: Sales Order,Customer's Purchase Order,Kupca narudžbenice
 DocType: Warranty Claim,From Company,Iz Društva
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,"Vrijednost, ili Kol"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Minute,Minuta
+apps/erpnext/erpnext/public/js/setup_wizard.js +363,Minute,Minuta
 DocType: Purchase Invoice,Purchase Taxes and Charges,Kupnja Porezi i naknade
 ,Qty to Receive,Količina za primanje
 DocType: Leave Block List,Leave Block List Allowed,Odobreni popis neodobrenih odsustava
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +61,Conversion factor cannot be in fractions,Faktor pretvorbe ne može biti u frakcijama
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +358,You will use it to Login,Koristit ćete ga za prijavu
+apps/erpnext/erpnext/public/js/setup_wizard.js +108,You will use it to Login,Koristit ćete ga za prijavu
 DocType: Sales Partner,Retailer,Prodavač na malo
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +99,Credit To account must be a Balance Sheet account,Kredit na računu mora biti bilanca račun
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,Sve vrste dobavljača
 apps/erpnext/erpnext/stock/doctype/item/item.py +37,Item Code is mandatory because Item is not automatically numbered,Kod proizvoda je obvezan jer artikli nisu automatski numerirani
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +99,Quotation {0} not of type {1},Ponuda {0} nije tip {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +93,Quotation {0} not of type {1},Ponuda {0} nije tip {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,Stavka rasporeda održavanja
 DocType: Sales Order,%  Delivered,% Isporučeno
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,Bank Overdraft Account,Bank Prekoračenje računa
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +15,Make Salary Slip,Provjerite plaće slip
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +18,Browse BOM,Pretraživanje BOM
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +175,Secured Loans,osigurani krediti
-apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +3,Awesome Products,Super proizvodi
+apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +3,Awesome Products,Super proizvodi
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +189,Opening Balance Equity,Početno stanje kapital
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +80,Cannot approve leave as you are not authorized to approve leaves on Block Dates,Ne može odobriti dopust kako niste ovlašteni za odobravanje lišće o skupnom datume
 DocType: Appraisal,Appraisal,Procjena
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +13,Lost-foam casting,Izgubljeno-pjena lijevanje
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +47,Drawing,Crtanje
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +22,Date is repeated,Datum se ponavlja
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +148,Leave approver must be one of {0},Osoba ovlaštena za odobravanje odsustva mora biti jedan od {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +162,Leave approver must be one of {0},Osoba ovlaštena za odobravanje odsustva mora biti jedan od {0}
 DocType: Hub Settings,Seller Email,Prodavač Email
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Ukupno troškovi nabave (putem kupnje proizvoda)
 DocType: Workstation Working Hour,Start Time,Vrijeme početka
@@ -2545,7 +2455,7 @@
 DocType: Purchase Invoice Item,Net Amount (Company Currency),Neto iznos (Društvo valuta)
 DocType: BOM Operation,Hour Rate,Cijena sata
 DocType: Stock Settings,Item Naming By,Proizvod imenovan po
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +642,From Quotation,od kotaciju
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +655,From Quotation,od kotaciju
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},Drugi period Zatvaranje Stupanje {0} je postignut nakon {1}
 DocType: Production Order,Material Transferred for Manufacturing,Materijal Preneseni za Manufacturing
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +29,Account {0} does not exists,Račun {0} ne postoji
@@ -2559,21 +2469,19 @@
 DocType: Purchase Invoice Item,PR Detail,PR Detalj
 DocType: Sales Order,Fully Billed,Potpuno Naplaćeno
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +20,Cash In Hand,Novac u blagajni
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +72,Delivery warehouse required for stock item {0},Isporuka skladište potrebno za dionicama stavku {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +119,Delivery warehouse required for stock item {0},Isporuka skladište potrebno za dionicama stavku {0}
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),Bruto težina paketa. Obično neto težina + ambalaža težina. (Za tisak)
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Korisnici s ovom ulogom smiju postaviti zamrznute račune i izradu / izmjenu računovodstvenih unosa protiv zamrznutih računa
 DocType: Serial No,Is Cancelled,Je otkazan
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +281,My Shipments,Moje pošiljke
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +286,My Shipments,Moje pošiljke
 DocType: Journal Entry,Bill Date,Bill Datum
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +43,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","Čak i ako postoji više Cijene pravila s najvišim prioritetom, onda sljedeći interni prioriteti primjenjuje se:"
 DocType: Supplier,Supplier Details,Dobavljač Detalji
 DocType: Communication,Recipients,Primatelji
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +146,Screwing,Vijak
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +96,Knurling,Knurling
 DocType: Expense Claim,Approval Status,Status odobrenja
 DocType: Hub Settings,Publish Items to Hub,Objavi artikle u Hub
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +44,From value must be less than to value in row {0},Od vrijednosti mora biti manje nego vrijednosti u redu {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +133,Wire Transfer,Wire Transfer
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +133,Wire Transfer,Wire Transfer
 apps/erpnext/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py +25,Please select Bank Account,Odaberite bankovni račun
 DocType: Newsletter,Create and Send Newsletters,Kreiraj i pošalji bilten
 apps/frappe/frappe/public/js/frappe/views/reports/grid_report.js +305,From Date must be before To Date,Od datuma mora biti prije do danas
@@ -2581,14 +2489,14 @@
 DocType: Company,Default Income Account,Zadani račun prihoda
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,Grupa kupaca / Kupac
 DocType: Item Group,Check this if you want to show in website,Označi ovo ako želiš prikazati na webu
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +190,Welcome to ERPNext,Dobrodošli u ERPNext
+,Welcome to ERPNext,Dobrodošli u ERPNext
 DocType: Payment Reconciliation Payment,Voucher Detail Number,Bon Detalj broj
 apps/erpnext/erpnext/config/crm.py +146,Lead to Quotation,Dovesti do kotaciju
 DocType: Lead,From Customer,Od kupca
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +37,Calls,Pozivi
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Calls,Pozivi
 DocType: Project,Total Costing Amount (via Time Logs),Ukupno Obračun troškova Iznos (preko Vrijeme Trupci)
 DocType: Purchase Order Item Supplied,Stock UOM,Kataloški UOM
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Purchase Order {0} is not submitted,Narudžbenicu {0} nije podnesen
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +194,Purchase Order {0} is not submitted,Narudžbenicu {0} nije podnesen
 ,Projected,Predviđeno
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},Serijski Ne {0} ne pripada Warehouse {1}
 apps/erpnext/erpnext/controllers/status_updater.py +136,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Napomena : Sustav neće provjeravati pretjerano isporuke i više - booking za točku {0} kao količinu ili vrijednost je 0
@@ -2596,7 +2504,6 @@
 DocType: Issue,Opening Date,Datum otvaranja
 DocType: Journal Entry,Remark,Primjedba
 DocType: Purchase Receipt Item,Rate and Amount,Kamatna stopa i iznos
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +95,Boring,Dosadan
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +667,From Sales Order,Od prodajnog naloga
 DocType: Blog Category,Parent Website Route,Nadređeni put web stranice
 DocType: Sales Order,Not Billed,Nije naplaćeno
@@ -2610,19 +2517,17 @@
 apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount Amount,Iznos popusta
 DocType: Purchase Invoice,Return Against Purchase Invoice,Povratak protiv fakturi
 DocType: Item,Warranty Period (in days),Jamstveni period (u danima)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +550,e.g. VAT,na primjer PDV
+apps/erpnext/erpnext/public/js/setup_wizard.js +292,e.g. VAT,na primjer PDV
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,Stavka 4
 DocType: Journal Entry Account,Journal Entry Account,Temeljnica račun
 DocType: Shopping Cart Settings,Quotation Series,Ponuda serija
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +52,"An item exists with same name ({0}), please change the item group name or rename the item","Stavka postoji s istim imenom ( {0} ) , molimo promijenite ime stavku grupe ili preimenovati stavku"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +82,Hot metal gas forming,Vruće metala plin tvore
 DocType: Sales Order Item,Sales Order Date,Datum narudžbe (kupca)
 DocType: Sales Invoice Item,Delivered Qty,Isporučena količina
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +63,Warehouse {0}: Company is mandatory,Skladište {0}: Kompanija je obvezna
 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.",Idi na odgovarajućoj skupini (obično izvor sredstava&gt; kratkoročnih obveza&gt; poreza i pristojbi te stvoriti novi račun (klikom na Dodaj dijete) tipa &quot;poreza&quot; i to spomenuti porezna stopa.
 ,Payment Period Based On Invoice Date,Razdoblje za naplatu po Datum fakture
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +50,Missing Currency Exchange Rates for {0},Nedostaje Valuta za {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +135,Laser cutting,Lasersko rezanje
 DocType: Event,Monday,Ponedjeljak
 DocType: Journal Entry,Stock Entry,Međuskladišnica
 DocType: Account,Payable,Plativ
@@ -2655,7 +2560,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +111,Date Of Retirement must be greater than Date of Joining,Datum umirovljenja mora biti veći od datuma pristupa
 DocType: Sales Invoice,Against Income Account,Protiv računu dohotka
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +69,{0}% Delivered,{0}% Isporučeno
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +78,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Stavka {0}: Ž Količina Jedinična {1} ne može biti manja od minimalne narudžbe kom {2} (definiranom u točki).
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Stavka {0}: Ž Količina Jedinična {1} ne može biti manja od minimalne narudžbe kom {2} (definiranom u točki).
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Mjesečni postotak distribucije
 DocType: Territory,Territory Targets,Prodajni plan prema teritoriju
 DocType: Delivery Note,Transporter Info,Transporter Info
@@ -2664,7 +2569,6 @@
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,"Naslovi za ispis predložaka, na primjer predračuna."
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +140,Valuation type charges can not marked as Inclusive,Troškovi tipa Vrednovanje se ne može označiti kao Inclusive
 DocType: POS Profile,Update Stock,Ažuriraj zalihe
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +128,Superfinishing,Superfinishing
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,Različite mjerne jedinice proizvoda će dovesti do ukupne pogrešne neto težine. Budite sigurni da je neto težina svakog proizvoda u istoj mjernoj jedinici.
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM stopa
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +85,Please pull items from Delivery Note,Molimo povucite stavke iz Dostavnica
@@ -2679,7 +2583,6 @@
 ,Purchase Analytics,Kupnja Analytics
 DocType: Sales Invoice Item,Delivery Note Item,Otpremnica proizvoda
 DocType: Expense Claim,Task,Zadatak
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +57,Shaving,Brijanje
 DocType: Purchase Taxes and Charges,Reference Row #,Reference Row #
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},Batch broj je obvezna za točku {0}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js +14,This is a root sales person and cannot be edited.,To jekorijen prodavač i ne može se mijenjati .
@@ -2691,13 +2594,11 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +74,Purpose must be one of {0},Svrha mora biti jedna od {0}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +108,Fill the form and save it,Ispunite obrazac i spremite ga
 DocType: Production Planning Tool,Download a report containing all raw materials with their latest inventory status,Preuzmite izvješće koje sadrži sve sirovine sa svojim najnovijim statusom inventara
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +94,Facing,Suočavanje
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,Forum
 DocType: Leave Application,Leave Balance Before Application,Bilanca odsustva prije predaje zahtjeva
 DocType: SMS Center,Send SMS,Pošalji SMS
 DocType: Company,Default Letter Head,Default Pismo Head
 DocType: Time Log,Billable,Naplativo
-DocType: Authorization Rule,This will be used for setting rule in HR module,To će se koristiti za postavljanje pravilu u HR modula
 DocType: Account,Rate at which this tax is applied,Stopa po kojoj je taj porez se primjenjuje
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reorder Qty,Poredaj Kom
 DocType: Company,Stock Adjustment Account,Stock Adjustment račun
@@ -2724,16 +2625,15 @@
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,Postotak izdvajanja mora biti 100 %
 DocType: Serial No,Out of AMC,Od AMC
 DocType: Purchase Order Item,Material Request Detail No,Zahtjev za robom - broj detalja
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +97,Hard turning,Tvrdi okretanje
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +33,Make Maintenance Visit,Provjerite održavanja Posjetite
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +187,Please contact to the user who have Sales Master Manager {0} role,Molimo kontaktirajte korisniku koji imaju Sales Manager Master {0} ulogu
 DocType: Company,Default Cash Account,Zadani novčani račun
 apps/erpnext/erpnext/config/accounts.py +79,Company (not Customer or Supplier) master.,Društvo ( ne kupaca i dobavljača ) majstor .
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +106,Please enter 'Expected Delivery Date',Unesite ' Očekivani datum isporuke '
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +187,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Otpremnica {0} mora biti otkazana prije poništenja ove narudžbenice
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +100,Please enter 'Expected Delivery Date',Unesite ' Očekivani datum isporuke '
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +182,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Otpremnica {0} mora biti otkazana prije poništenja ove narudžbenice
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +373,Paid amount + Write Off Amount can not be greater than Grand Total,Uplaćeni iznos + otpis iznos ne može biti veći od SVEUKUPNO
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} nije ispravan broj serije za točku {1}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,Note: There is not enough leave balance for Leave Type {0},Napomena : Nema dovoljno ravnotežu dopust za dozvolu tipa {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +124,Note: There is not enough leave balance for Leave Type {0},Napomena : Nema dovoljno ravnotežu dopust za dozvolu tipa {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.","Napomena: Ukoliko uplata nije izvršena protiv bilo referencu, provjerite Temeljnica ručno."
 DocType: Item,Supplier Items,Dobavljač Stavke
 DocType: Opportunity,Opportunity Type,Tip prilike
@@ -2745,7 +2645,7 @@
 DocType: Hub Settings,Publish Availability,Objavi dostupnost
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +105,Date of Birth cannot be greater than today.,Datum rođenja ne može biti veća nego danas.
 ,Stock Ageing,Starost skladišta
-apps/erpnext/erpnext/controllers/accounts_controller.py +200,{0} '{1}' is disabled,{0} '{1}' je onemogućen
+apps/erpnext/erpnext/controllers/accounts_controller.py +201,{0} '{1}' is disabled,{0} '{1}' je onemogućen
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Postavi kao Opena
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Pošaljite e-poštu automatski u imenik na podnošenje transakcija.
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +232,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
@@ -2755,44 +2655,38 @@
 DocType: Purchase Order,Customer Contact Email,Kupac Kontakt e
 DocType: Event,Sunday,Nedjelja
 DocType: Sales Team,Contribution (%),Doprinos (%)
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +455,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,Napomena : Stupanje Plaćanje neće biti izrađen od ' Gotovina ili bankovni račun ' nije naveden
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +171,Responsibilities,Odgovornosti
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +457,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,Napomena : Stupanje Plaćanje neće biti izrađen od ' Gotovina ili bankovni račun ' nije naveden
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +171,Responsibilities,Odgovornosti
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Template,Predložak
 DocType: Sales Person,Sales Person Name,Ime prodajne osobe
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,Unesite atleast jedan račun u tablici
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +511,Add Users,Dodaj korisnicima
+apps/erpnext/erpnext/public/js/setup_wizard.js +255,Add Users,Dodaj korisnicima
 DocType: Pricing Rule,Item Group,Grupa proizvoda
 DocType: Task,Actual Start Date (via Time Logs),Stvarni datum početka (putem Vrijeme Trupci)
 DocType: Stock Reconciliation Item,Before reconciliation,Prije pomirenja
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +12,To {0},Za {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Porezi i naknade uvrštenja (Društvo valuta)
-apps/erpnext/erpnext/stock/doctype/item/item.py +340,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Stavka Porezna Row {0} mora imati račun tipa poreza ili prihoda i rashoda ili naplativ
+apps/erpnext/erpnext/stock/doctype/item/item.py +344,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Stavka Porezna Row {0} mora imati račun tipa poreza ili prihoda i rashoda ili naplativ
 DocType: Sales Order,Partly Billed,Djelomično naplaćeno
 DocType: Item,Default BOM,Zadani BOM
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +79,Decambering,Decambering
 apps/erpnext/erpnext/setup/doctype/company/company.js +22,Please re-type company name to confirm,Ponovno upišite naziv tvrtke za potvrdu
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,Ukupni Amt
 DocType: Time Log Batch,Total Hours,Ukupno vrijeme
 DocType: Journal Entry,Printing Settings,Ispis Postavke
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +268,Total Debit must be equal to Total Credit. The difference is {0},Ukupno zaduženje mora biti jednak ukupnom kreditnom .
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +11,Automotive,Automobilska industrija
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +37,Item is required,Proizvod je potreban
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +25,Metal injection molding,Metal injection moulding
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +258,Total Debit must be equal to Total Credit. The difference is {0},Ukupno zaduženje mora biti jednak ukupnom kreditnom .
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,Automobilska industrija
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +684,From Delivery Note,Od otpremnici
 DocType: Time Log,From Time,S vremena
 DocType: Notification Control,Custom Message,Prilagođena poruka
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +33,Investment Banking,Investicijsko bankarstvo
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +261,"Select your Country, Time Zone and Currency","Odaberite svoju zemlju, vremensku zonu i valutu"
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,Investicijsko bankarstvo
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +316,"Select your Country, Time Zone and Currency","Odaberite svoju zemlju, vremensku zonu i valutu"
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +369,Cash or Bank Account is mandatory for making payment entry,Novac ili bankovni račun je obvezna za izradu ulazak plaćanje
 DocType: Purchase Invoice,Price List Exchange Rate,Cjenik tečajna
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +91,Pickling,Stavljanje u turšiju
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +18,Sand casting,Pijesak lijevanje
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +117,Electroplating,Galvansko
 DocType: Purchase Invoice Item,Rate,VPC
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +62,Intern,stažista
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Intern,stažista
 DocType: Newsletter,A Lead with this email id should exist,Kontakt sa ovim e-mailom bi trebao postojati
 DocType: Stock Entry,From BOM,Od sastavnice
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +34,Basic,Osnovni
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +34,Basic,Osnovni
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,Stock transakcije prije {0} se zamrznut
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +217,Please click on 'Generate Schedule',"Molimo kliknite na ""Generiraj raspored '"
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +61,To Date should be same as From Date for Half Day leave,Za datum bi trebao biti isti kao i od datuma za poludnevni dopust
@@ -2800,11 +2694,11 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +96,Reference No is mandatory if you entered Reference Date,Reference Ne obvezno ako ušao referentnog datuma
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +108,Date of Joining must be greater than Date of Birth,Datum pristupa mora biti veći od datuma rođenja
 DocType: Salary Structure,Salary Structure,Plaća Struktura
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +242,"Multiple Price Rule exists with same criteria, please resolve \
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +246,"Multiple Price Rule exists with same criteria, please resolve \
 			conflict by assigning priority. Price Rules: {0}","Višestruki Cijena postoji pravilo s istim kriterijima, molimo rješavanje sukoba \
  dodjeljivanjem prioriteta. Cijena Pravila: {0}"
 DocType: Account,Bank,Banka
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +9,Airline,Aviokompanija
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,Aviokompanija
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +493,Issue Material,Izdavanje materijala
 DocType: Material Request Item,For Warehouse,Za galeriju
 DocType: Employee,Offer Date,Datum ponude
@@ -2814,29 +2708,24 @@
 DocType: Item,Is Fixed Asset Item,Je fiksne imovine stavku
 DocType: Stock Entry,Including items for sub assemblies,Uključujući predmeta za sub sklopova
 DocType: Features Setup,"If you have long print formats, this feature can be used to split the page to be printed on multiple pages with all headers and footers on each page","Ako ste dugo ispis formata, ova značajka može se koristiti za podijeliti stranicu na koju se ispisuje više stranica sa svim zaglavljima i podnožjima na svakoj stranici"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +131,Hobbing,Hobbing
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +98,All Territories,Sve teritorije
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +98,All Territories,Sve teritorije
 DocType: Purchase Invoice,Items,Proizvodi
 DocType: Fiscal Year,Year Name,Naziv godine
 DocType: Process Payroll,Process Payroll,Proces plaće
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +59,There are more holidays than working days this month.,Postoji više odmor nego radnih dana ovog mjeseca .
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +68,There are more holidays than working days this month.,Postoji više odmor nego radnih dana ovog mjeseca .
 DocType: Product Bundle Item,Product Bundle Item,Proizvod bala predmeta
 DocType: Sales Partner,Sales Partner Name,Naziv prodajnog partnera
 DocType: Purchase Invoice Item,Image View,Prikaz slike
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +113,Finishing & industrial finishing,Dovršavanje i industrijska oplemenjivanje
 DocType: Issue,Opening Time,Radno vrijeme
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,Od i Do datuma zahtijevanih
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +46,Securities & Commodity Exchanges,Vrijednosni papiri i robne razmjene
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Vrijednosni papiri i robne razmjene
 DocType: Shipping Rule,Calculate Based On,Izračun temeljen na
 DocType: Delivery Note Item,From Warehouse,Iz skladišta
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +98,Drilling,Bušenje
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +28,Blow molding,Puhanje
 DocType: Purchase Taxes and Charges,Valuation and Total,Vrednovanje i Total
 DocType: Tax Rule,Shipping City,Dostava Grad
 apps/erpnext/erpnext/stock/doctype/item/item.js +43,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,"Ova točka je varijanta {0} (predložak). Značajke će biti kopirana iz predloška, ​​osim ako je postavljen 'Ne Kopiraj'"
 DocType: Account,Purchase User,Kupnja Korisnik
 DocType: Notification Control,Customize the Notification,Prilagodi obavijest
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +87,Hammering,Zakucavanje
 DocType: Web Page,Slideshow,Slideshow
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +24,Default Address Template cannot be deleted,Zadani predložak adrese ne može se izbrisati
 DocType: Sales Invoice,Shipping Rule,Dostava Pravilo
@@ -2845,9 +2734,8 @@
 DocType: Workflow State,Search,Traži
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +54,Total cannot be zero,Ukupna ne može biti nula
 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,'Dani od posljednje narudžbe' mora biti veći ili jednak nuli
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +142,Brazing,Lemljenje
 DocType: C-Form,Amended From,Izmijenjena Od
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Raw Material,sirovine
+apps/erpnext/erpnext/public/js/setup_wizard.js +359,Raw Material,sirovine
 DocType: Leave Application,Follow via Email,Slijedite putem e-maila
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Iznos poreza Nakon iznosa popusta
 apps/erpnext/erpnext/accounts/doctype/account/account.py +174,Child account exists for this account. You can not delete this account.,Dijete računa postoji za taj račun . Ne možete izbrisati ovaj račun .
@@ -2861,10 +2749,10 @@
 ,Produced,Proizvedeno
 DocType: Item,Item Code for Suppliers,Šifra za dobavljače
 DocType: Issue,Raised By (Email),Povišena Do (e)
-apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +72,General,Opći
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +495,Attach Letterhead,Pričvrstite zaglavljem
+apps/erpnext/erpnext/setup/setup_wizard/default_website.py +72,General,Opći
+apps/erpnext/erpnext/public/js/setup_wizard.js +241,Attach Letterhead,Pričvrstite zaglavljem
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +272,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',"Ne mogu odbiti kada kategorija je "" vrednovanje "" ili "" Vrednovanje i Total '"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +542,"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.","Popis svoje porezne glave (npr PDV, carina itd, oni bi trebali imati jedinstvene nazive) i njihove standardne stope. To će stvoriti standardni predložak koji možete uređivati ​​i dodavati više kasnije."
+apps/erpnext/erpnext/public/js/setup_wizard.js +284,"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.","Popis svoje porezne glave (npr PDV, carina itd, oni bi trebali imati jedinstvene nazive) i njihove standardne stope. To će stvoriti standardni predložak koji možete uređivati ​​i dodavati više kasnije."
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial Nos Required for Serialized Item {0},Serijski Nos potrebna za serijaliziranom točke {0}
 DocType: Journal Entry,Bank Entry,Bank Stupanje
 DocType: Authorization Rule,Applicable To (Designation),Odnosi se na (Oznaka)
@@ -2873,33 +2761,32 @@
 apps/erpnext/erpnext/config/accounts.py +143,Enable / disable currencies.,Omogućiti / onemogućiti valute .
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Postal Expenses,Poštanski troškovi
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Ukupno (AMT)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +26,Entertainment & Leisure,Zabava i slobodno vrijeme
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,Zabava i slobodno vrijeme
 DocType: Purchase Order,The date on which recurring order will be stop,Datum na koji se ponavlja kako će biti zaustaviti
 DocType: Quality Inspection,Item Serial No,Serijski broj proizvoda
 apps/erpnext/erpnext/controllers/status_updater.py +142,{0} must be reduced by {1} or you should increase overflow tolerance,{0} mora biti smanjena za {1} ili bi trebali povećati overflow toleranciju
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Present,Ukupno Present
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Hour,Sat
+apps/erpnext/erpnext/public/js/setup_wizard.js +363,Hour,Sat
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +138,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation","Serijaliziranom Stavka {0} nije moguće ažurirati pomoću \
  Stock pomirenja"
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +488,Transfer Material to Supplier,Prebaci Materijal Dobavljaču
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +513,Transfer Material to Supplier,Prebaci Materijal Dobavljaču
 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,Novi serijski broj ne može biti na skladištu. Skladište mora biti postavljen od strane međuskladišnice ili primke
 DocType: Lead,Lead Type,Tip potencijalnog kupca
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +82,Create Quotation,Napravi ponudu
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +306,All these items have already been invoiced,Svi ovi proizvodi su već fakturirani
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,You are not authorized to approve leaves on Block Dates,Niste ovlašteni za odobravanje lišće o skupnom Datumi
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +311,All these items have already been invoiced,Svi ovi proizvodi su već fakturirani
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},Može biti odobren od strane {0}
 DocType: Shipping Rule,Shipping Rule Conditions,Dostava Koje uvjete
 DocType: BOM Replace Tool,The new BOM after replacement,Novi BOM nakon zamjene
 DocType: Features Setup,Point of Sale,Point of Sale
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +83,Curling,Kovrčav
 DocType: Account,Tax,Porez
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +28,Row {0}: {1} is not a valid {2},Red {0}: {1} nije valjana {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +89,Refining,Rafinirajuæa
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +37,Row {0}: {1} is not a valid {2},Red {0}: {1} nije valjana {2}
 DocType: Production Planning Tool,Production Planning Tool,Planiranje proizvodnje alat
 DocType: Quality Inspection,Report Date,Prijavi Datum
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +130,Routing,Usmjeravanje
 DocType: C-Form,Invoices,Računi
 DocType: Job Opening,Job Title,Titula
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +54,{0} already allocated for Employee {1} for period {2} - {3},{0} već dodijeljeno za zaposlenika {1} za vrijeme {2} - {3}
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +80,{0} Recipients,{0} Primatelji
 DocType: Features Setup,Item Groups in Details,Grupe proizvoda detaljno
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +335,Quantity to Manufacture must be greater than 0.,Količina za proizvodnju mora biti veći od 0.
@@ -2917,14 +2804,13 @@
 DocType: DocType,Setup,Postavke
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,Ne postoji ništa za uređivanje .
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +108,Summary for this month and pending activities,Sažetak za ovaj mjesec i tijeku aktivnosti
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +39,Cold rolling,Hladno valjanje
 DocType: Customer Group,Customer Group Name,Naziv grupe kupaca
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +408,Please remove this Invoice {0} from C-Form {1},Molimo uklonite ovu fakturu {0} od C-obrasca {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +410,Please remove this Invoice {0} from C-Form {1},Molimo uklonite ovu fakturu {0} od C-obrasca {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,Molimo odaberite prenositi ako želite uključiti prethodnoj fiskalnoj godini je ravnoteža ostavlja na ovoj fiskalnoj godini
 DocType: GL Entry,Against Voucher Type,Protiv voucher vrsti
 DocType: Item,Attributes,Značajke
 DocType: Packing Slip,Get Items,Kreiraj proizvode
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +186,Please enter Write Off Account,Unesite otpis račun
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +187,Please enter Write Off Account,Unesite otpis račun
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +71,Last Order Date,Zadnje narudžbe Datum
 DocType: DocField,Image,Slika
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +179,Make Excise Invoice,Provjerite trošarinske fakturu
@@ -2934,7 +2820,7 @@
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +146,Operation ID not set,Operacija ID nije postavljen
 DocType: Production Order,Planned Start Date,Planirani datum početka
 DocType: Serial No,Creation Document Type,Tip stvaranje dokumenata
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +620,Maint. Visit,Maint. Posjetite
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +631,Maint. Visit,Maint. Posjetite
 DocType: Leave Type,Is Encash,Je li unovčiti
 DocType: Purchase Invoice,Mobile No,Mobitel br
 DocType: Payment Tool,Make Journal Entry,Provjerite Temeljnica
@@ -2942,35 +2828,31 @@
 apps/erpnext/erpnext/controllers/trends.py +257,Project-wise data is not available for Quotation,Projekt - mudar podaci nisu dostupni za ponudu
 DocType: Project,Expected End Date,Očekivani Datum završetka
 DocType: Appraisal Template,Appraisal Template Title,Procjena Predložak Naslov
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +440,Commercial,trgovački
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +378,Commercial,trgovački
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +23,Parent Item {0} must not be a Stock Item,Roditelj Stavka {0} ne smije biti kataloški predmeta
 DocType: Cost Center,Distribution Id,ID distribucije
-apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +14,Awesome Services,Super usluge
+apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +14,Awesome Services,Super usluge
 apps/erpnext/erpnext/config/manufacturing.py +29,All Products or Services.,Svi proizvodi i usluge.
 DocType: Purchase Invoice,Supplier Address,Dobavljač Adresa
 DocType: Contact Us Settings,Address Line 2,Adresa - linija 2
 DocType: ToDo,Reference,Upućivanje
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +59,Perforating,Perforiranje
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,Od kol
 apps/erpnext/erpnext/config/accounts.py +128,Rules to calculate shipping amount for a sale,Pravila za izračun shipping iznos za prodaju
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +29,Series is mandatory,Serija je obvezno
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +28,Financial Services,Financijske usluge
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,Financijske usluge
 apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3},Vrijednost za Osobina {0} mora biti u rasponu od {1} {2} u koracima od {3}
 DocType: Tax Rule,Sales,Prodaja
 DocType: Stock Entry Detail,Basic Amount,Osnovni iznos
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +173,Warehouse required for stock Item {0},Skladište je potrebno za skladišne proizvode {0}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +178,Warehouse required for stock Item {0},Skladište je potrebno za skladišne proizvode {0}
 DocType: Leave Allocation,Unused leaves,Neiskorišteni lišće
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,Cr
 DocType: Customer,Default Receivable Accounts,Default receivable račune
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +102,Sawing,Piljenje
 DocType: Tax Rule,Billing State,Državna naplate
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +32,Laminating,Plastificiranje
 DocType: Item Reorder,Transfer,Prijenos
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +549,Fetch exploded BOM (including sub-assemblies),Fetch eksplodirala BOM (uključujući i podsklopova )
 DocType: Authorization Rule,Applicable To (Employee),Odnosi se na (Radnik)
 apps/erpnext/erpnext/controllers/accounts_controller.py +101,Due Date is mandatory,Datum dospijeća je obavezno
 apps/erpnext/erpnext/controllers/item_variant.py +51,Increment for Attribute {0} cannot be 0,Pomak za Osobina {0} ne može biti 0
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +143,Sintering,Sinteriranje
 DocType: Journal Entry,Pay To / Recd From,Platiti do / primiti od
 DocType: Naming Series,Setup Series,Postavljanje Serija
 DocType: Supplier,Contact HTML,Kontakt HTML
@@ -2983,7 +2865,6 @@
 DocType: Attendance,Absent,Odsutan
 DocType: Product Bundle,Product Bundle,Snop proizvoda
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +180,Row {0}: Invalid reference {1},Red {0}: Pogrešna referentni {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +165,Crushing,Porazan
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Kupnja poreze i pristojbe predloška
 DocType: Upload Attendance,Download Template,Preuzmite predložak
 DocType: GL Entry,Remarks,Primjedbe
@@ -2991,14 +2872,12 @@
 DocType: Journal Entry,Write Off Based On,Otpis na temelju
 DocType: Features Setup,POS View,Prodajno mjesto prikaz
 apps/erpnext/erpnext/config/stock.py +38,Installation record for a Serial No.,Instalacijski zapis za serijski broj
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +9,Continuous casting,Kontinuirano lijevanje
 apps/erpnext/erpnext/public/js/queries.js +39,Please specify a,Navedite
 DocType: Offer Letter,Awaiting Response,Očekujem odgovor
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +53,Above,Iznad
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +80,Cold sizing,Hladno dimenzioniranje
 DocType: Salary Slip,Earning & Deduction,Zarada &amp; Odbitak
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +76,Account {0} cannot be a Group,Račun {0} ne može biti grupa
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +259,Region,Regija
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +314,Region,Regija
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +213,Optional. This setting will be used to filter in various transactions.,Izborni . Ova postavka će se koristiti za filtriranje u raznim transakcijama .
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +104,Negative Valuation Rate is not allowed,Negativna stopa vrijednovanja nije dopuštena
 DocType: Holiday List,Weekly Off,Tjedni Off
@@ -3016,7 +2895,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,Account {0} is inactive,Račun {0} nije aktivan
 DocType: GL Entry,Is Advance,Je Predujam
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,Gledanost od datuma do datuma je obvezna
-apps/erpnext/erpnext/controllers/buying_controller.py +131,Please enter 'Is Subcontracted' as Yes or No,Unesite ' Je podugovoren ' kao da ili ne
+apps/erpnext/erpnext/controllers/buying_controller.py +122,Please enter 'Is Subcontracted' as Yes or No,Unesite ' Je podugovoren ' kao da ili ne
 DocType: Sales Team,Contact No.,Kontakt broj
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,'Profit and Loss' type account {0} not allowed in Opening Entry,'Račun dobiti i gubitka' tip računa {0} nije dopušten u otvorenom ulazu
 DocType: Workflow State,Time,Vrijeme
@@ -3025,14 +2904,13 @@
 DocType: Authorization Rule,Authorization Rule,Pravilo autorizacije
 DocType: Sales Invoice,Terms and Conditions Details,Uvjeti Detalji
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,Prodaja Porezi i pristojbe Predložak
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +10,Apparel & Accessories,Odjeća i modni dodaci
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,Odjeća i modni dodaci
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +67,Number of Order,Broj narudžbe
 DocType: Item Group,HTML / Banner that will show on the top of product list.,HTML / baner koji će se prikazivati ​​na vrhu liste proizvoda.
 DocType: Shipping Rule,Specify conditions to calculate shipping amount,Navedite uvjete za izračunavanje iznosa dostave
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +121,Add Child,Dodaj dijete
 DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,Uloga dopušteno postavljanje blokada računa i uređivanje Frozen Entries
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +52,Cannot convert Cost Center to ledger as it has child nodes,"Ne može se pretvoriti troška za knjigu , kao da ima djece čvorova"
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +47,Conversion Factor is required,Faktor pretvorbe je potrebno
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +37,Serial #,Serijski #
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +87,Commission on Sales,Komisija za prodaju
 DocType: Offer Letter Term,Value / Description,Vrijednost / Opis
@@ -3040,10 +2918,8 @@
 ,Customers Not Buying Since Long Time,Kupci koji nisu kupili već dugo vremena
 DocType: Production Order,Expected Delivery Date,Očekivani rok isporuke
 apps/erpnext/erpnext/accounts/general_ledger.py +121,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Debitne i kreditne nije jednaka za {0} # {1}. Razlika je {2}.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +48,Bulging,Ispupčen
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +11,Evaporative-pattern casting,Isparenja-uzorak lijevanje
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Entertainment Expenses,Zabava Troškovi
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +195,Sales Invoice {0} must be cancelled before cancelling this Sales Order,Prodaja Račun {0} mora biti otkazana prije poništenja ovu prodajnog naloga
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +190,Sales Invoice {0} must be cancelled before cancelling this Sales Order,Prodaja Račun {0} mora biti otkazana prije poništenja ovu prodajnog naloga
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +61,Age,Doba
 DocType: Time Log,Billing Amount,Naplata Iznos
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +84,Invalid quantity specified for item {0}. Quantity should be greater than 0.,Navedena je pogrešna količina za proizvod {0}. Količina treba biti veći od 0.
@@ -3062,26 +2938,24 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,Novi prihod kupca
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Travel Expenses,putni troškovi
 DocType: Maintenance Visit,Breakdown,Slom
-apps/erpnext/erpnext/controllers/accounts_controller.py +241,Account: {0} with currency: {1} can not be selected,Račun: {0} s valutom: {1} ne može se odabrati
+apps/erpnext/erpnext/controllers/accounts_controller.py +242,Account: {0} with currency: {1} can not be selected,Račun: {0} s valutom: {1} ne može se odabrati
 DocType: Bank Reconciliation Detail,Cheque Date,Ček Datum
 apps/erpnext/erpnext/accounts/doctype/account/account.py +47,Account {0}: Parent account {1} does not belong to company: {2},Račun {0}: nadređeni račun {1} ne pripada tvrtki: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted all transactions related to this company!,Uspješno izbrisati sve transakcije vezane uz ovu tvrtku!
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,Kao i na datum
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +111,Honing,Brušenje
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +58,Probation,Probni rad
-apps/erpnext/erpnext/stock/doctype/item/item.py +264,Default Warehouse is mandatory for stock Item.,Glavno skladište je obvezno za skladišni proizvod.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Probation,Probni rad
+apps/erpnext/erpnext/stock/doctype/item/item.py +268,Default Warehouse is mandatory for stock Item.,Glavno skladište je obvezno za skladišni proizvod.
 DocType: Feed,Full Name,Ime i prezime
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +148,Clinching,Učvrstio
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +191,Payment of salary for the month {0} and year {1},Isplata plaće za mjesec {0} i godina {1}
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +173,Payment of salary for the month {0} and year {1},Isplata plaće za mjesec {0} i godina {1}
 DocType: Stock Settings,Auto insert Price List rate if missing,Auto umetak Cjenik stopa ako nedostaje
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,Ukupno uplaćeni iznos
 ,Transferred Qty,prebačen Kol
 apps/erpnext/erpnext/config/learn.py +11,Navigating,Kretanje
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +137,Planning,planiranje
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +137,Planning,planiranje
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +9,Make Time Log Batch,Napravi grupno vrijeme prijave
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Issued,Izdano
 DocType: Project,Total Billing Amount (via Time Logs),Ukupno naplate Iznos (preko Vrijeme Trupci)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +629,We sell this Item,Prodajemo ovaj proizvod
+apps/erpnext/erpnext/public/js/setup_wizard.js +365,We sell this Item,Prodajemo ovaj proizvod
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +65,Supplier Id,Id Dobavljač
 DocType: Journal Entry,Cash Entry,Novac Stupanje
 DocType: Sales Partner,Contact Desc,Kontakt ukratko
@@ -3090,18 +2964,16 @@
 DocType: Brand,Item Manager,Stavka Manager
 DocType: Cost Center,Add rows to set annual budgets on Accounts.,Dodaj redak za izračun godišnjeg proračuna.
 DocType: Buying Settings,Default Supplier Type,Zadani tip dobavljača
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +160,Quarrying,Vađenje
 DocType: Production Order,Total Operating Cost,Ukupni trošak
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +160,Note: Item {0} entered multiple times,Napomena : Proizvod {0} je upisan više puta
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +163,Note: Item {0} entered multiple times,Napomena : Proizvod {0} je upisan više puta
 apps/erpnext/erpnext/config/crm.py +27,All Contacts.,Svi kontakti.
 DocType: Newsletter,Test Email Id,Test E-mail ID
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +394,Company Abbreviation,Kratica Društvo
+apps/erpnext/erpnext/public/js/setup_wizard.js +142,Company Abbreviation,Kratica Društvo
 DocType: Features Setup,If you follow Quality Inspection. Enables Item QA Required and QA No in Purchase Receipt,Ako slijedite kvalitete . Omogućuje predmet QA potrebno i QA Ne u Račun kupnje
 DocType: GL Entry,Party Type,Tip stranke
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +68,Raw material cannot be same as main Item,Sirovina ne mogu biti isti kao glavni predmet
 DocType: Item Attribute Value,Abbreviation,Skraćenica
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,Niste ovlašteni od {0} prijeđenog limita
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +30,Rotational molding,Vrtnje moulding
 apps/erpnext/erpnext/config/hr.py +115,Salary template master.,Plaća predložak majstor .
 DocType: Leave Type,Max Days Leave Allowed,Max Dani Ostavite dopuštenih
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +55,Set Tax Rule for shopping cart,Postavite Porezni Pravilo za košaricu
@@ -3115,15 +2987,15 @@
 apps/erpnext/erpnext/config/selling.py +18,Quotes to Leads or Customers.,Ponude za kupce ili potencijalne kupce.
 DocType: Stock Settings,Role Allowed to edit frozen stock,Uloga dopuštenih urediti smrznute zalihe
 ,Territory Target Variance Item Group-Wise,Pregled prometa po teritoriji i grupi proizvoda
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +101,All Customer Groups,Sve grupe kupaca
-apps/erpnext/erpnext/controllers/accounts_controller.py +474,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} je obavezno. Možda Mjenjačnica zapis nije stvoren za {1} na {2}.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +101,All Customer Groups,Sve grupe kupaca
+apps/erpnext/erpnext/controllers/accounts_controller.py +475,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} je obavezno. Možda Mjenjačnica zapis nije stvoren za {1} na {2}.
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +37,Tax Template is mandatory.,Porez Predložak je obavezno.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +41,Account {0}: Parent account {1} does not exist,Račun {0}: nadređeni račun {1} ne postoji
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Cjenik stopa (Društvo valuta)
 DocType: Account,Temporary,Privremen
 DocType: Address,Preferred Billing Address,Željena adresa za naplatu
 DocType: Monthly Distribution Percentage,Percentage Allocation,Postotak raspodjele
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +86,Secretary,tajnica
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Secretary,tajnica
 DocType: Serial No,Distinct unit of an Item,Razlikuje jedinica stavku
 DocType: Pricing Rule,Buying,Kupnja
 DocType: HR Settings,Employee Records to be created by,Zaposlenik Records bi se stvorili
@@ -3136,9 +3008,8 @@
 ,Item-wise Price List Rate,Item-wise cjenik
 DocType: Purchase Order Item,Supplier Quotation,Dobavljač Ponuda
 DocType: Quotation,In Words will be visible once you save the Quotation.,U riječi će biti vidljiv nakon što spremite ponudu.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +68,Ironing,Glačanje
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is stopped,{0} {1} je zaustavljen
-apps/erpnext/erpnext/stock/doctype/item/item.py +352,Barcode {0} already used in Item {1},Barkod {0} se već koristi u proizvodu {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +356,Barcode {0} already used in Item {1},Barkod {0} se već koristi u proizvodu {1}
 DocType: Lead,Add to calendar on this date,Dodaj u kalendar na ovaj datum
 apps/erpnext/erpnext/config/selling.py +132,Rules for adding shipping costs.,Pravila za dodavanje troškova prijevoza.
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,Nadolazeći događaji
@@ -3147,13 +3018,12 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +27,Quick Entry,Brzi Ulaz
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0} je obvezna za povratak
 DocType: Purchase Order,To Receive,Primiti
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +33,Shrink fitting,Stisni dolikuje
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +522,user@example.com,user@example.com
+apps/erpnext/erpnext/public/js/setup_wizard.js +266,user@example.com,user@example.com
 DocType: Email Digest,Income / Expense,Prihodi / rashodi
 DocType: Employee,Personal Email,Osobni email
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +58,Total Variance,Ukupne varijance
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +62,Total Variance,Ukupne varijance
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.","Ako je omogućeno, sustav će objaviti računovodstvene stavke za popis automatski."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +15,Brokerage,Posredništvo
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +15,Brokerage,Posredništvo
 DocType: Address,Postal Code,poštanski broj
 DocType: Production Order Operation,"in Minutes
 Updated via 'Time Log'","U nekoliko minuta 
@@ -3161,14 +3031,13 @@
 DocType: Customer,From Lead,Od Olovo
 apps/erpnext/erpnext/config/manufacturing.py +19,Orders released for production.,Narudžbe objavljen za proizvodnju.
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +42,Select Fiscal Year...,Odaberite fiskalnu godinu ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +442,POS Profile required to make POS Entry,POS Profil potrebna da bi POS unos
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +444,POS Profile required to make POS Entry,POS Profil potrebna da bi POS unos
 DocType: Hub Settings,Name Token,Naziv tokena
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +106,Planing,Blanjanje
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Selling,Standardna prodaja
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +120,Standard Selling,Standardna prodaja
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +137,Atleast one warehouse is mandatory,Atleast jednom skladištu je obavezno
 DocType: Serial No,Out of Warranty,Od jamstvo
 DocType: BOM Replace Tool,Replace,Zamijeniti
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +314,{0} against Sales Invoice {1},{0} u odnosu na prodajnom računu {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +316,{0} against Sales Invoice {1},{0} u odnosu na prodajnom računu {1}
 apps/erpnext/erpnext/stock/doctype/item/item.py +49,Please enter default Unit of Measure,Unesite zadanu jedinicu mjere
 DocType: Purchase Invoice Item,Project Name,Naziv projekta
 DocType: Supplier,Mention if non-standard receivable account,Spomenuti ako nestandardni potraživanja račun
@@ -3184,9 +3053,8 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,Journal Entry {0} does not have account {1} or already matched against other voucher,Temeljnica {0} nema račun {1} ili već usklađeni protiv drugog bona
 DocType: Item,Moving Average,Prosječna ponderirana cijena
 DocType: BOM Replace Tool,The BOM which will be replaced,BOM koji će biti zamijenjen
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +43,New Stock UOM must be different from current stock UOM,Novi skladišni UOM mora biti različit od trenutnog UOM-a
 DocType: Account,Debit,Zaduženje
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +34,Leaves must be allocated in multiples of 0.5,"Odsustva moraju biti dodijeljena kao višekratnici od 0,5"
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +44,Leaves must be allocated in multiples of 0.5,"Odsustva moraju biti dodijeljena kao višekratnici od 0,5"
 DocType: Production Order,Operation Cost,Operacija troškova
 apps/erpnext/erpnext/config/hr.py +71,Upload attendance from a .csv file,Prenesi dolazak iz. Csv datoteku
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,Izvanredna Amt
@@ -3204,8 +3072,7 @@
 DocType: Employee,Internal Work History,Unutarnja Povijest Posao
 DocType: DocField,Column Break,Kolona Break
 DocType: Event,Thursday,Četvrtak
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +42,Private Equity,Private Equity
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +93,Turning,Tokarenje
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,Private Equity
 DocType: Maintenance Visit,Customer Feedback,Kupac Ocjena
 DocType: Account,Expense,rashod
 DocType: Sales Invoice,Exhibition,Izložba
@@ -3218,19 +3085,19 @@
 DocType: Employee,Held On,Održanoj
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +33,Production Item,Proizvodni proizvod
 ,Employee Information,Informacije o zaposleniku
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,Rate (%),Stopa ( % )
+apps/erpnext/erpnext/public/js/setup_wizard.js +294,Rate (%),Stopa ( % )
 DocType: Stock Entry Detail,Additional Cost,Dodatni trošak
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +407,Financial Year End Date,Financijska godina - zadnji datum
+apps/erpnext/erpnext/public/js/setup_wizard.js +155,Financial Year End Date,Financijska godina - zadnji datum
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Voucher No, if grouped by Voucher","Ne možete filtrirati na temelju vaučer No , ako grupirani po vaučer"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +484,Make Supplier Quotation,Napravi ponudu dobavljaču
 DocType: Quality Inspection,Incoming,Dolazni
 DocType: BOM,Materials Required (Exploded),Potrebna roba
 DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),Smanjenje plaća za ostaviti bez plaće (lwp)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +512,"Add users to your organization, other than yourself","Dodaj korisnika u vašoj organizaciji, osim sebe"
+apps/erpnext/erpnext/public/js/setup_wizard.js +256,"Add users to your organization, other than yourself","Dodaj korisnika u vašoj organizaciji, osim sebe"
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No {1} does not match with {2} {3},Red # {0}: Serijski br {1} ne odgovara {2} {3}
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +44,Casual Leave,Casual dopust
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +44,Casual Leave,Casual dopust
 DocType: Batch,Batch ID,ID serije
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +334,Note: {0},Napomena: {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +336,Note: {0},Napomena: {0}
 ,Delivery Note Trends,Trend otpremnica
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +104,This Week's Summary,Ovaj tjedan Sažetak
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +74,{0} must be a Purchased or Sub-Contracted Item in row {1},{0} mora bitikupljen ili pod-ugovori stavka u nizu {1}
@@ -3242,7 +3109,7 @@
 DocType: Purchase Receipt,Return Against Purchase Receipt,Povratak Protiv Račun kupnje
 DocType: Purchase Order,To Bill,Za Billa
 DocType: Material Request,% Ordered,% Ž
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +61,Piecework,Rad po komadu
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Piecework,Rad po komadu
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +64,Avg. Buying Rate,AVG. Kupnja stopa
 DocType: Task,Actual Time (in Hours),Stvarno vrijeme (u satima)
 DocType: Employee,History In Company,Povijest tvrtke
@@ -3259,13 +3126,13 @@
 DocType: Opportunity,To Discuss,Za Raspravljajte
 DocType: SMS Settings,SMS Settings,SMS postavke
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +60,Temporary Accounts,Privremeni računi
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +155,Black,Crna
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Black,Crna
 DocType: BOM Explosion Item,BOM Explosion Item,BOM eksplozije artikla
 DocType: Account,Auditor,Revizor
 DocType: Purchase Order,End date of current order's period,Datum završetka razdoblja tekuće narudžbe
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +17,Make Offer Letter,Ponudu Pismo
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +10,Return,Povratak
-apps/erpnext/erpnext/stock/doctype/item/item.py +503,Default Unit of Measure for Variant must be same as Template,Zadana mjerna jedinica za inačicom mora biti ista kao predložak
+apps/erpnext/erpnext/stock/doctype/item/item.py +507,Default Unit of Measure for Variant must be same as Template,Zadana mjerna jedinica za inačicom mora biti ista kao predložak
 DocType: DocField,Fold,Saviti
 DocType: Production Order Operation,Production Order Operation,Proizvodni nalog Rad
 DocType: Pricing Rule,Disable,Ugasiti
@@ -3276,13 +3143,12 @@
 DocType: Page,Page Name,Ime stranice
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +110,To Time must be greater than From Time,Za vrijeme mora biti veći od od vremena
 DocType: Journal Entry Account,Exchange Rate,Tečaj
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +465,Sales Order {0} is not submitted,Prodajnog naloga {0} nije podnesen
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +467,Sales Order {0} is not submitted,Prodajnog naloga {0} nije podnesen
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0}: Parent account {1} does not bolong to the company {2},Skladište {0}: Nadređeni račun {1} ne pripada tvrtki {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +124,Spindle finishing,Vretena završna obrada
 DocType: BOM,Last Purchase Rate,Zadnja kupovna cijena
 DocType: Account,Asset,Asset
 DocType: Project Task,Task ID,Zadatak ID
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +395,"e.g. ""MC""","na primjer ""MC"""
+apps/erpnext/erpnext/public/js/setup_wizard.js +143,"e.g. ""MC""","na primjer ""MC"""
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,Stock cannot exist for Item {0} since has variants,Stock ne može postojati točkom {0} jer ima varijante
 ,Sales Person-wise Transaction Summary,Pregled prometa po prodavaču
 DocType: System Settings,Time Zone,Time Zone
@@ -3291,9 +3157,7 @@
 DocType: Monthly Distribution,Monthly Distribution Percentages,Mjesečni postotci distribucije
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +16,The selected item cannot have Batch,Izabrani predmet ne može imati Hrpa
 DocType: Delivery Note,% of materials delivered against this Delivery Note,% robe od ove otpremnice je isporučeno
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +151,Stapling,Klamanje
 DocType: Customer,Customer Details,Korisnički podaci
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +105,Shaping,Oblikovanje
 DocType: Employee,Reports to,Izvješća
 DocType: SMS Settings,Enter url parameter for receiver nos,Unesite URL parametar za prijemnike br
 DocType: Sales Invoice,Paid Amount,Plaćeni iznos
@@ -3302,13 +3166,13 @@
 DocType: Item Variant,Item Variant,Stavka Variant
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +15,Setting this Address Template as default as there is no other default,"Postavljanje Ova adresa predloška kao zadano, jer nema drugog zadano"
 apps/erpnext/erpnext/accounts/doctype/account/account.py +89,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Stanje računa već u zaduženje, ne smiju postaviti 'ravnoteža se mora' kao 'kreditne'"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +76,Quality Management,Upravljanje kvalitetom
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Quality Management,Upravljanje kvalitetom
 DocType: Production Planning Tool,Filter based on customer,Filtriranje prema kupcima
 DocType: Payment Tool Detail,Against Voucher No,Protiv Voucher br
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +47,Please enter quantity for Item {0},Molimo unesite količinu za točku {0}
 DocType: Employee External Work History,Employee External Work History,Zaposlenik Vanjski Rad Povijest
 DocType: Tax Rule,Purchase,Kupiti
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +34,Balance Qty,Bilanca kol
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Balance Qty,Bilanca kol
 DocType: Item Group,Parent Item Group,Nadređena grupa proizvoda
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +21,{0} for {1},{0} od {1}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +96,Cost Centers,Troška
@@ -3318,12 +3182,12 @@
 DocType: Opportunity,Next Contact,Sljedeći Kontakt
 DocType: Employee,Employment Type,Zapošljavanje Tip
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,Dugotrajne imovine
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +84,Application period cannot be across two alocation records,Razdoblje zahtjev ne može biti preko dva alocation zapisa
 DocType: Item Group,Default Expense Account,Zadani račun rashoda
 DocType: Employee,Notice (days),Obavijest (dani)
 DocType: Page,Yes,Da
 DocType: Tax Rule,Sales Tax Template,Porez Predložak
 DocType: Employee,Encashment Date,Encashment Datum
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +74,Electroforming,Electroforming
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +179,"Against Voucher Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Protiv bon Tip mora biti jedan od narudžbenice, fakturi ili Temeljnica"
 DocType: Account,Stock Adjustment,Stock Podešavanje
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +34,Default Activity Cost exists for Activity Type - {0},Zadana aktivnost Troškovi postoji Vrsta djelatnosti - {0}
@@ -3359,12 +3223,12 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,Skladište se ne može izbrisati dok postoje upisi u glavnu knjigu za ovo skladište.
 DocType: Company,Distribution,Distribucija
 apps/erpnext/erpnext/public/js/pos/pos.html +36,Amount Paid,Plaćeni iznos
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +91,Project Manager,Voditelj projekta
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +72,Dispatch,Otpremanje
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Project Manager,Voditelj projekta
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +72,Dispatch,Otpremanje
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,Maksimalni dopušteni popust za proizvod: {0} je {1}%
 DocType: Customer,Default Taxes and Charges,Zadani poreza i naknada
 DocType: Account,Receivable,potraživanja
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +268,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,Red # {0}: Nije dopušteno mijenjati dobavljača kao narudžbenice već postoji
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +263,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,Red # {0}: Nije dopušteno mijenjati dobavljača kao narudžbenice već postoji
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,Uloga koja je dopušteno podnijeti transakcije koje premašuju kreditnih ograničenja postavljena.
 DocType: Sales Invoice,Supplier Reference,Dobavljač Referenca
 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.","Ako je označeno, BOM za pod-zbor stavke će biti uzeti u obzir za dobivanje sirovine. Inače, sve pod-montaža stavke će biti tretirani kao sirovinu."
@@ -3372,8 +3236,8 @@
 DocType: Hub Settings,Seller Description,Prodavač Opis
 DocType: Employee Education,Qualification,Kvalifikacija
 DocType: Item Price,Item Price,Cijena proizvoda
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +48,Soap & Detergent,Sapun i deterdžent
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +36,Motion Picture & Video,Pokretna slika & video
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +48,Soap & Detergent,Sapun i deterdžent
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +36,Motion Picture & Video,Pokretna slika & video
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Naručeno
 DocType: Warehouse,Warehouse Name,Naziv skladišta
 DocType: Naming Series,Select Transaction,Odaberite transakciju
@@ -3382,7 +3246,6 @@
 DocType: BOM,Rate Of Materials Based On,Stopa materijali na temelju
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,Analitike podrške
 apps/erpnext/erpnext/accounts/doctype/accounts_settings/accounts_settings.py +27,Company is missing in warehouses {0},Tvrtka je nestalo u skladištima {0}
-DocType: Stock UOM Replace Utility,Stock UOM Replace Utility,Alat za zamjenu mjernih jedinica (UOM)
 DocType: POS Profile,Terms and Conditions,Odredbe i uvjeti
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,To Date should be within the Fiscal Year. Assuming To Date = {0},Za datum mora biti unutar fiskalne godine. Pod pretpostavkom da bi datum = {0}
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","Ovdje možete održavati visina, težina, alergije, medicinske brige itd."
@@ -3394,7 +3257,7 @@
 DocType: Sales Order Item,For Production,Za proizvodnju
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +103,Please enter sales order in the above table,Unesite prodajnog naloga u gornjoj tablici
 DocType: Project Task,View Task,Pregled zadataka
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +406,Your financial year begins on,Vaša financijska godina počinje
+apps/erpnext/erpnext/public/js/setup_wizard.js +154,Your financial year begins on,Vaša financijska godina počinje
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +46,Please enter Purchase Receipts,Unesite Kupnja primici
 DocType: Sales Invoice,Get Advances Received,Kreiraj avansno primanje
 DocType: Email Digest,Add/Remove Recipients,Dodaj / ukloni primatelja
@@ -3402,16 +3265,14 @@
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","Za postavljanje ove fiskalne godine kao zadano , kliknite na "" Set as Default '"
 apps/erpnext/erpnext/config/support.py +54,Setup incoming server for support email id. (e.g. support@example.com),Postavke dolaznog servera za e-mail podrške (npr. support@example.com)
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,Nedostatak Kom
-apps/erpnext/erpnext/stock/doctype/item/item.py +528,Item variant {0} exists with same attributes,Inačica Stavka {0} postoji s istim atributima
+apps/erpnext/erpnext/stock/doctype/item/item.py +532,Item variant {0} exists with same attributes,Inačica Stavka {0} postoji s istim atributima
 DocType: Salary Slip,Salary Slip,Plaća proklizavanja
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +116,Burnishing,Poliranje
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +54,'To Date' is required,'Do datuma ' je potrebno
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,'Do datuma ' je potrebno
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","Izradi pakiranje gaćice za pakete biti isporučena. Koristi se za obavijesti paket broj, sadržaj paketa i njegovu težinu."
 DocType: Sales Invoice Item,Sales Order Item,Naručeni proizvod - prodaja
 DocType: Salary Slip,Payment Days,Plaćanja Dana
 DocType: BOM,Manage cost of operations,Uredi troškove poslovanja
 DocType: Features Setup,Item Advanced,Proizvod - napredno
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +40,Hot rolling,Vruće valjanje
 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.","Kada bilo koji od provjerenih transakcija &quot;Postavio&quot;, e-mail pop-up automatski otvorio poslati e-mail na povezane &quot;Kontakt&quot; u toj transakciji, s transakcijom u privitku. Korisnik može ili ne može poslati e-mail."
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,Globalne postavke
 DocType: Employee Education,Employee Education,Obrazovanje zaposlenika
@@ -3424,25 +3285,23 @@
 DocType: Customer,Sales Team Details,Detalji prodnog tima
 DocType: Expense Claim,Total Claimed Amount,Ukupno Zatražio Iznos
 apps/erpnext/erpnext/config/crm.py +22,Potential opportunities for selling.,Potencijalne prilike za prodaju.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +48,Sick Leave,bolovanje
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +174,Invalid {0},Pogrešna {0}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +48,Sick Leave,bolovanje
 DocType: Email Digest,Email Digest,E-pošta
 DocType: Delivery Note,Billing Address Name,Naziv adrese za naplatu
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +22,Department Stores,Robne kuće
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,Robne kuće
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +40,System Balance,Sustav Balance
 DocType: Workflow,Is Active,Je aktivan
 apps/erpnext/erpnext/controllers/stock_controller.py +71,No accounting entries for the following warehouses,Nema računovodstvenih unosa za ova skladišta
 apps/erpnext/erpnext/projects/doctype/project/project.js +22,Save the document first.,Spremite dokument prvi.
 DocType: Account,Chargeable,Naplativ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +121,Linishing,Linishing
 DocType: Company,Change Abbreviation,Promijeni naziv
 DocType: Workflow State,Primary,Osnovni
 DocType: Expense Claim Detail,Expense Date,Rashodi Datum
 DocType: Item,Max Discount (%),Maksimalni popust (%)
 DocType: Communication,More Information,Više informacija
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +70,Last Order Amount,Iznos zadnje narudžbe
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +161,Blasting,Miniranje
 DocType: Company,Warn,Upozoriti
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +111,Item valuation updated,Vrednovanje proizvoda je izmijenjeno
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Sve ostale primjedbe, značajan napor da bi trebao ići u evidenciji."
 DocType: BOM,Manufacturing User,Proizvodni korisnik
 DocType: Purchase Order,Raw Materials Supplied,Sirovine nabavlja
@@ -3452,7 +3311,7 @@
 DocType: Appraisal,Appraisal Template,Procjena Predložak
 DocType: Communication,Email,E-mail
 DocType: Item Group,Item Classification,Klasifikacija predmeta
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +89,Business Development Manager,Voditelj razvoja poslovanja
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Business Development Manager,Voditelj razvoja poslovanja
 DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,Održavanje Posjetite Namjena
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.js +15,Period,Razdoblje
 ,General Ledger,Glavna knjiga
@@ -3462,9 +3321,7 @@
 ,Itemwise Recommended Reorder Level,Itemwise - preporučena razina ponovne narudžbe
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +264,Please select {0} first,Odaberite {0} Prvi
 DocType: Features Setup,To get Item Group in details table,Da biste dobili predmeta Group u tablici pojedinosti
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +67,Redrawing,Prekrajanjem
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +112,Batch {0} of Item {1} has expired.,Hrpa {0} od {1} Stavka je istekla.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +120,Etching,Radirung
 DocType: Sales Invoice,Commission,provizija
 DocType: Address Template,"<h4>Default Template</h4>
 <p>Uses <a href=""http://jinja.pocoo.org/docs/templates/"">Jinja Templating</a> and all the fields of Address (including Custom Fields if any) will be available</p>
@@ -3509,7 +3366,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +340,Operation Time must be greater than 0 for Operation {0},Operacija vrijeme mora biti veći od 0 za rad {0}
 DocType: Supplier,Address and Contacts,Adresa i kontakti
 DocType: UOM Conversion Detail,UOM Conversion Detail,UOM pretvorbe Detalj
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +496,Keep it web friendly 900px (w) by 100px (h),Postavite dimenzije prilagođene web-u 900px X 100px
+apps/erpnext/erpnext/public/js/setup_wizard.js +242,Keep it web friendly 900px (w) by 100px (h),Postavite dimenzije prilagođene web-u 900px X 100px
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +329,Production Order cannot be raised against a Item Template,Proizvodnja Red ne može biti podignuta protiv predložak točka
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +44,Charges are updated in Purchase Receipt against each item,Optužbe su ažurirani u KUPNJE protiv svake stavke
 DocType: Payment Tool,Get Outstanding Vouchers,Dobiti izvrsne Vaučeri
@@ -3525,54 +3382,49 @@
 DocType: Item,Average time taken by the supplier to deliver,Prosječno vrijeme potrebno od strane dobavljača za isporuku
 DocType: Time Log,Hours,Sati
 DocType: Project,Expected Start Date,Očekivani datum početka
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +38,Rolling,Rolling
 DocType: ToDo,Priority,Prioritet
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +41,Remove item if charges is not applicable to that item,Uklanjanje stavke ako troškovi se ne odnosi na tu stavku
 DocType: Dropbox Backup,Dropbox Access Allowed,Dozvoljen pristup Dropboxu
 DocType: Dropbox Backup,Weekly,Tjedni
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,Npr.. smsgateway.com / api / send_sms.cgi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +485,Receive,Primite
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +510,Receive,Primite
 DocType: Maintenance Visit,Fully Completed,Potpuno Završeni
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% Cijela
 DocType: Employee,Educational Qualification,Obrazovne kvalifikacije
 DocType: Workstation,Operating Costs,Operativni troškovi
 DocType: Employee Leave Approver,Employee Leave Approver,Zaposlenik dopust Odobritelj
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,{0} has been successfully added to our Newsletter list.,{0} je uspješno dodana na popis Newsletter.
-apps/erpnext/erpnext/stock/doctype/item/item.py +383,Row {0}: An Reorder entry already exists for this warehouse {1},Red {0}: Ulazak redoslijeda već postoji za to skladište {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +387,Row {0}: An Reorder entry already exists for this warehouse {1},Red {0}: Ulazak redoslijeda već postoji za to skladište {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +67,"Cannot declare as lost, because Quotation has been made.","Ne može se proglasiti izgubljenim, jer je ponuda napravljena."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +133,Electron beam machining,Elektronska zraka obrada
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Kupnja Master Manager
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +424,Production Order {0} must be submitted,Proizvodnja Red {0} mora biti podnesen
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +150,Please select Start Date and End Date for Item {0},Molimo odaberite datum početka i datum završetka za točke {0}
 apps/erpnext/erpnext/config/stock.py +141,Main Reports,Glavno izvješće
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +102,Stock Ledger entries balances updated,Upisi u glavnu knjigu su ažurirani
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,Do danas ne može biti prije od datuma
 DocType: Purchase Receipt Item,Prevdoc DocType,Prevdoc DOCTYPE
-apps/erpnext/erpnext/stock/doctype/item/item.js +176,Add / Edit Prices,Dodaj / Uredi cijene
+apps/erpnext/erpnext/stock/doctype/item/item.js +178,Add / Edit Prices,Dodaj / Uredi cijene
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +53,Chart of Cost Centers,Grafikon troškovnih centara
 ,Requested Items To Be Ordered,Traženi Proizvodi se mogu naručiti
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +298,My Orders,Moje narudžbe
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +293,My Orders,Moje narudžbe
 DocType: Price List,Price List Name,Cjenik Ime
 DocType: Time Log,For Manufacturing,Za Manufacturing
-apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +70,Totals,Ukupan rezultat
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +174,Totals,Ukupan rezultat
 DocType: BOM,Manufacturing,Proizvodnja
 ,Ordered Items To Be Delivered,Naručeni proizvodi za dostavu
 DocType: Account,Income,Prihod
 ,Setup Wizard,Čarobnjak za postavljanje
 DocType: Industry Type,Industry Type,Industrija Tip
 apps/erpnext/erpnext/templates/includes/cart.js +137,Something went wrong!,Nešto je pošlo po krivu!
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +68,Warning: Leave application contains following block dates,Upozorenje: Ostavite program sadrži sljedeće blok datume
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +251,Sales Invoice {0} has already been submitted,Prodajni računi {0} su već potvrđeni
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +100,Warning: Leave application contains following block dates,Upozorenje: Ostavite program sadrži sljedeće blok datume
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +256,Sales Invoice {0} has already been submitted,Prodajni računi {0} su već potvrđeni
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,Završetak Datum
 DocType: Purchase Invoice Item,Amount (Company Currency),Iznos (valuta tvrtke)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +10,Die casting,Lijev
 DocType: Email Alert,Reference Date,Referentni datum
 apps/erpnext/erpnext/config/hr.py +105,Organization unit (department) master.,Organizacija jedinica ( odjela ) majstor .
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +25,Please enter valid mobile nos,Unesite valjane mobilne br
 DocType: Budget Detail,Budget Detail,Detalji proračuna
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +75,Please enter message before sending,Unesite poruku prije slanja
 DocType: Async Task,Status,Status
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +65,Stock UOM updated for Item {0},Stock UOM ažuriran točkom {0}
 DocType: Company History,Year,Godina
 apps/erpnext/erpnext/config/accounts.py +127,Point-of-Sale Profile,Point-of-prodaju Profil
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +68,Please Update SMS Settings,Obnovite SMS Settings
@@ -3586,12 +3438,12 @@
 ,Serial No Service Contract Expiry,Istek ugovora za serijski broj usluge
 DocType: Item,Unit of Measure Conversion,Mjerna jedinica pretvorbe
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +86,Employee can not be changed,Zaposlenik ne može se mijenjati
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +259,You cannot credit and debit same account at the same time,Ne možete istovremeno kreditirati i debitirati isti račun
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,You cannot credit and debit same account at the same time,Ne možete istovremeno kreditirati i debitirati isti račun
 DocType: Naming Series,Help HTML,HTML pomoć
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},Ukupno bi trebalo biti dodijeljena weightage 100 % . To je {0}
 apps/erpnext/erpnext/controllers/status_updater.py +140,Allowance for over-{0} crossed for Item {1},Dodatak za prekomjerno {0} prešao za točku {1}
 DocType: Address,Name of person or organization that this address belongs to.,Ime osobe ili organizacije kojoj ova adresa pripada.
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +587,Your Suppliers,Vaši dobavljači
+apps/erpnext/erpnext/public/js/setup_wizard.js +325,Your Suppliers,Vaši dobavljači
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,Ne mogu se postaviti kao izgubljen kao prodajnog naloga je napravio .
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +65,Another Salary Structure {0} is active for employee {1}. Please make its status 'Inactive' to proceed.,Još Struktura plaća {0} je aktivna djelatnika {1}. Molimo provjerite njegov status 'Neaktivan' za nastavak.
 DocType: Purchase Invoice,Contact,Kontakt
@@ -3600,37 +3452,35 @@
 DocType: Item,Has Serial No,Ima serijski br
 DocType: Employee,Date of Issue,Datum izdavanja
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +16,{0}: From {0} for {1},{0}: Od {0} od {1}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +154,Row #{0}: Set Supplier for item {1},Red # {0}: Postavite dobavljač za stavke {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +149,Row #{0}: Set Supplier for item {1},Red # {0}: Postavite dobavljač za stavke {1}
 DocType: Issue,Content Type,Vrsta sadržaja
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +17,Computer,računalo
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,računalo
 DocType: Item,List this Item in multiple groups on the website.,Prikaži ovu stavku u više grupa na web stranici.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +283,Please check Multi Currency option to allow accounts with other currency,Molimo provjerite više valuta mogućnost dopustiti račune s druge valute
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +285,Please check Multi Currency option to allow accounts with other currency,Molimo provjerite više valuta mogućnost dopustiti račune s druge valute
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +62,Item: {0} does not exist in the system,Stavka: {0} ne postoji u sustavu
 apps/erpnext/erpnext/accounts/doctype/account/account.py +81,You are not authorized to set Frozen value,Niste ovlašteni za postavljanje zamrznute vrijednosti
 DocType: Payment Reconciliation,Get Unreconciled Entries,Kreiraj neusklađene ulaze
 DocType: Cost Center,Budgets,Proračuni
 apps/frappe/frappe/core/page/modules_setup/modules_setup.py +11,Updated,Obnovljeno
 DocType: Employee,Emergency Contact Details,Kontaktni podaci hitne službe
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +396,What does it do?,Što učiniti ?
+apps/erpnext/erpnext/public/js/setup_wizard.js +144,What does it do?,Što učiniti ?
 DocType: Delivery Note,To Warehouse,Za skladište
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +45,Account {0} has been entered more than once for fiscal year {1},Račun {0} je unešen više od jednom za fiskalnu godinu {1}
 ,Average Commission Rate,Prosječna provizija
-apps/erpnext/erpnext/stock/doctype/item/item.py +313,'Has Serial No' can not be 'Yes' for non-stock item,'Ima serijski broj' ne može biti 'Da' za neskladišne proizvode
+apps/erpnext/erpnext/stock/doctype/item/item.py +317,'Has Serial No' can not be 'Yes' for non-stock item,'Ima serijski broj' ne može biti 'Da' za neskladišne proizvode
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Attendance can not be marked for future dates,Gledatelji ne može biti označena za budući datum
 DocType: Pricing Rule,Pricing Rule Help,Pravila cijena - pomoć
 DocType: Purchase Taxes and Charges,Account Head,Zaglavlje računa
 apps/erpnext/erpnext/config/stock.py +79,Update additional costs to calculate landed cost of items,Ažuriranje dodatne troškove za izračun sletio trošak stavke
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +111,Electrical,Električna
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +111,Electrical,Električna
 DocType: Stock Entry,Total Value Difference (Out - In),Ukupna vrijednost razlika (Out - In)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +302,Row {0}: Exchange Rate is mandatory,Red {0}: tečaj je obavezno
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +304,Row {0}: Exchange Rate is mandatory,Red {0}: tečaj je obavezno
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},Korisnik ID nije postavljen za zaposlenika {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +72,Peening,Peening
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,From Warranty Claim,Od jamstvenog zahtjeva
 DocType: Stock Entry,Default Source Warehouse,Zadano izvorno skladište
 DocType: Item,Customer Code,Kupac Šifra
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +212,Birthday Reminder for {0},Rođendan Podsjetnik za {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +163,Lapping,Preklapanje
-apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.js +8,Days Since Last Order,Dana od posljednje narudžbe
+apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +72,Days Since Last Order,Dana od posljednje narudžbe
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +299,Debit To account must be a Balance Sheet account,Zaduženja računa mora biti bilanca račun
 DocType: Buying Settings,Naming Series,Imenovanje serije
 DocType: Leave Block List,Leave Block List Name,Naziv popisa neodobrenih odsustava
@@ -3644,7 +3494,7 @@
 DocType: Notification Control,Sales Invoice Message,Poruka prodajnog  računa
 DocType: Authorization Rule,Based On,Na temelju
 DocType: Sales Order Item,Ordered Qty,Naručena kol
-apps/erpnext/erpnext/stock/doctype/item/item.py +539,Item {0} is disabled,Stavka {0} je onemogućen
+apps/erpnext/erpnext/stock/doctype/item/item.py +543,Item {0} is disabled,Stavka {0} je onemogućen
 DocType: Stock Settings,Stock Frozen Upto,Kataloški Frozen Upto
 apps/erpnext/erpnext/controllers/recurring_document.py +166,Period From and Period To dates mandatory for recurring {0},Razdoblje od razdoblja do datuma obvezna za ponavljajućih {0}
 apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,Projekt aktivnost / zadatak.
@@ -3654,7 +3504,6 @@
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,Popust mora biti manji od 100
 DocType: ToDo,Low,Nisko
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Otpis iznos (Društvo valuta)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +71,Spinning,Predenje
 DocType: Landed Cost Voucher,Landed Cost Voucher,Nalog zavisnog troška
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +55,Please set {0},Molimo postavite {0}
 DocType: Purchase Invoice,Repeat on Day of Month,Ponovite na dan u mjesecu
@@ -3676,7 +3525,6 @@
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +37,Campaign Name is required,Potreban je naziv kampanje
 DocType: Maintenance Visit,Maintenance Date,Datum održavanje
 DocType: Purchase Receipt Item,Rejected Serial No,Odbijen Serijski br
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +51,Deep drawing,Duboko uzdisanje
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +40,New Newsletter,Novi bilten
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +157,Start date should be less than end date for Item {0},Početak bi trebao biti manji od krajnjeg datuma za točke {0}
 apps/erpnext/erpnext/stock/doctype/item/item.js +17,Show Balance,Pokaži stanje
@@ -3687,7 +3535,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +119,BOM and Manufacturing Quantity are required,BOM i proizvodnja Količina potrebne su
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Starenje Raspon 2
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +450,Amount,Iznos
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +147,Riveting,Zakivanje
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,BOM zamijenjeno
 ,Sales Analytics,Prodajna analitika
 DocType: Manufacturing Settings,Manufacturing Settings,Postavke proizvodnje
@@ -3699,20 +3546,19 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +207,New Account Name,Naziv novog računa
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,Sirovine Isporuka Troškovi
 DocType: Selling Settings,Settings for Selling Module,Postavke za prodaju modula
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +73,Customer Service,Služba za korisnike
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Customer Service,Služba za korisnike
 DocType: Item,Thumbnail,Thumbnail
 DocType: Item Customer Detail,Item Customer Detail,Proizvod - detalji kupca
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +147,Confirm Your Email,Potvrdite vašu e-mail
 apps/erpnext/erpnext/config/hr.py +53,Offer candidate a Job.,Ponuda kandidata za posao.
 DocType: Notification Control,Prompt for Email on Submission of,Pitaj za e-poštu na podnošenje
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +81,Total allocated leaves are more than days in the period,Ukupno dodijeljeni Listovi su više od dana u razdoblju
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +70,Item {0} must be a stock Item,Proizvod {0} mora biti skladišni
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,Zadana rad u tijeku Skladište
 apps/erpnext/erpnext/config/accounts.py +107,Default settings for accounting transactions.,Zadane postavke za računovodstvene poslove.
 apps/frappe/frappe/model/naming.py +40,{0} is required,{0} je potrebno
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +21,Vacuum molding,Vakuum moulding
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,Očekivani datum ne može biti prije Materijal Zahtjev Datum
 DocType: Contact Us Settings,City,Grad
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +132,Ultrasonic machining,Ultrazvučno obrada
 apps/frappe/frappe/templates/base.html +137,Error: Not a valid id?,Pogreška: Nije valjana id?
 apps/erpnext/erpnext/stock/get_item_details.py +125,Item {0} must be a Sales Item,Stavka {0} mora bitiProdaja artikla
 DocType: Naming Series,Update Series Number,Update serije Broj
@@ -3720,7 +3566,7 @@
 DocType: Sales Order,Printing Details,Ispis Detalji
 DocType: Task,Closing Date,Datum zatvaranja
 DocType: Sales Order Item,Produced Quantity,Proizvedena količina
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +84,Engineer,inženjer
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Engineer,inženjer
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,Traži Sub skupštine
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +379,Item Code required at Row No {0},Kod proizvoda je potreban u redu broj {0}
 DocType: Sales Partner,Partner Type,Tip partnera
@@ -3728,7 +3574,7 @@
 DocType: Authorization Rule,Customerwise Discount,Customerwise Popust
 DocType: Purchase Invoice,Against Expense Account,Protiv Rashodi račun
 DocType: Production Order,Production Order,Proizvodni nalog
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +258,Installation Note {0} has already been submitted,Napomena instalacije {0} je već potvrđena
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +263,Installation Note {0} has already been submitted,Napomena instalacije {0} je već potvrđena
 DocType: Quotation Item,Against Docname,Protiv Docname
 DocType: SMS Center,All Employee (Active),Svi zaposlenici (aktivni)
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,Pogledaj sada
@@ -3737,19 +3583,19 @@
 DocType: Item,Re-Order Level,Ponovno bi razini
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,Unesite stavke i planirani Količina za koje želite povećati proizvodne naloge ili preuzimanje sirovine za analizu.
 apps/frappe/frappe/public/js/frappe/views/ganttview.js +45,Gantt Chart,Gantogram
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +57,Part-time,Privemeno (nepuno radno vrijeme)
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,Part-time,Privemeno (nepuno radno vrijeme)
 DocType: Employee,Applicable Holiday List,Primjenjivo odmor Popis
 DocType: Employee,Cheque,Ček
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,Serija ažurirana
 apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Report Type is mandatory,Vrsta izvješća je obvezno
 DocType: Item,Serial Number Series,Serijski broj serije
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},Skladište je obvezno za skladišne proizvode {0} u redu {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +45,Retail & Wholesale,Trgovina na veliko i
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,Trgovina na veliko i
 DocType: Issue,First Responded On,Prvo Odgovorili Na
 DocType: Website Item Group,Cross Listing of Item in multiple groups,Križ Oglas pošiljke u više grupa
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +351,The First User: You,Prvo Korisnik : Vi
+apps/erpnext/erpnext/public/js/setup_wizard.js +101,The First User: You,Prvo Korisnik : Vi
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +48,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},Fiskalna godina Datum početka i datum završetka fiskalne godine već su postavljeni u fiskalnoj godini {0}
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +172,Successfully Reconciled,Uspješno Pomirio
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +119,Successfully Reconciled,Uspješno Pomirio
 DocType: Production Order,Planned End Date,Planirani datum završetka
 apps/erpnext/erpnext/config/stock.py +43,Where items are stored.,Gdje predmeti su pohranjeni.
 DocType: Tax Rule,Validity,Valjanost
@@ -3769,39 +3615,36 @@
 DocType: DocPerm,Level,Razina
 DocType: Purchase Taxes and Charges,On Net Total,VPC
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +160,Target warehouse in row {0} must be same as Production Order,Target skladište u redu {0} mora biti ista kao Production Order
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +59,No permission to use Payment Tool,Nemate dopuštenje za korištenje platnih alata
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +97,No permission to use Payment Tool,Nemate dopuštenje za korištenje platnih alata
 apps/erpnext/erpnext/controllers/recurring_document.py +192,'Notification Email Addresses' not specified for recurring %s,'Obavijest E-mail adrese' nije navedena za ponavljajuće %s
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +86,Milling,Glodanje
 apps/erpnext/erpnext/accounts/doctype/account/account.py +99,Currency can not be changed after making entries using some other currency,Valuta se ne može mijenjati nakon što unose pomoću neke druge valute
 DocType: Company,Round Off Account,Zaokružiti račun
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +60,Nibbling,Grickanje
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,Administrativni troškovi
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +18,Consulting,savjetodavni
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +18,Consulting,savjetodavni
 DocType: Customer Group,Parent Customer Group,Nadređena grupa kupaca
 apps/erpnext/erpnext/public/js/pos/pos.js +429,Change,Promjena
 DocType: Purchase Invoice,Contact Email,Kontakt email
 DocType: Appraisal Goal,Score Earned,Ocjena Zarađeni
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +393,"e.g. ""My Company LLC""","na primjer ""Moja tvrtka LLC"""
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +173,Notice Period,Otkaznog roka
+apps/erpnext/erpnext/public/js/setup_wizard.js +141,"e.g. ""My Company LLC""","na primjer ""Moja tvrtka LLC"""
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +173,Notice Period,Otkaznog roka
 DocType: Bank Reconciliation Detail,Voucher ID,Bon ID
 apps/erpnext/erpnext/setup/doctype/territory/territory.js +14,This is a root territory and cannot be edited.,Ovo je glavni teritorij i ne može se mijenjati.
 DocType: Packing Slip,Gross Weight UOM,Bruto težina UOM
 DocType: Email Digest,Receivables / Payables,Potraživanja / obveze
 DocType: Delivery Note Item,Against Sales Invoice,Protiv prodaje fakture
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +63,Stamping,Žigosanje
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +457,Credit Account,Kreditni račun
 DocType: Landed Cost Item,Landed Cost Item,Stavka zavisnih troškova
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +56,Show zero values,Pokaži nulte vrijednosti
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,Količina proizvoda dobivena nakon proizvodnje / pakiranja od navedene količine sirovina
 DocType: Payment Reconciliation,Receivable / Payable Account,Potraživanja / Plaća račun
 DocType: Delivery Note Item,Against Sales Order Item,Protiv prodaje reda točkom
-apps/erpnext/erpnext/stock/doctype/item/item.py +521,Please specify Attribute Value for attribute {0},Navedite značajke vrijednost za atribut {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +525,Please specify Attribute Value for attribute {0},Navedite značajke vrijednost za atribut {0}
 DocType: Item,Default Warehouse,Glavno skladište
 DocType: Task,Actual End Date (via Time Logs),Stvarni datum završetka (preko Vrijeme Trupci)
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +37,Budget cannot be assigned against Group Account {0},Proračun se ne može dodijeliti protiv grupe nalog {0}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +23,Please enter parent cost center,Unesite roditelj troška
 DocType: Delivery Note,Print Without Amount,Ispis Bez visini
-apps/erpnext/erpnext/controllers/buying_controller.py +69,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,Porezna Kategorija ne može biti ' Procjena ' ili ' Procjena i Total ' kao i svi proizvodi bez zaliha predmeta
+apps/erpnext/erpnext/controllers/buying_controller.py +60,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,Porezna Kategorija ne može biti ' Procjena ' ili ' Procjena i Total ' kao i svi proizvodi bez zaliha predmeta
 DocType: User,Last Name,Prezime
 DocType: Web Page,Left,Lijevo
 DocType: Event,All Day,Svaki dan
@@ -3809,7 +3652,7 @@
 DocType: Appraisal,Total Score (Out of 5),Ukupna ocjena (od 5)
 DocType: Contact Us Settings,State,Županija
 DocType: Batch,Batch,Serija
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +51,Balance,Ravnoteža
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +28,Balance,Ravnoteža
 DocType: Project,Total Expense Claim (via Expense Claims),Ukupni rashodi Zatraži (preko Rashodi potraživanja)
 DocType: User,Gender,Rod
 DocType: Journal Entry,Debit Note,Rashodi - napomena
@@ -3839,8 +3682,7 @@
 DocType: Purchase Order,Get Last Purchase Rate,Kreiraj zadnju nabavnu cijenu
 DocType: Time Log,Billing Rate based on Activity Type (per hour),Naplate stopa temelji se na vrsti aktivnosti (po satu)
 DocType: Company,Company Info,Podaci o tvrtki
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +76,Seaming,Šavove
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +197,"Company Email ID not found, hence mail not sent","Tvrtka E-mail ID nije pronađen , pa se ne mail poslan"
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +206,"Company Email ID not found, hence mail not sent","Tvrtka E-mail ID nije pronađen , pa se ne mail poslan"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Primjena sredstava ( aktiva )
 DocType: Production Planning Tool,Filter based on item,Filtriranje prema proizvodima
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +451,Debit Account,Duguje račun
@@ -3852,17 +3694,16 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +95,{0} {1} has been modified. Please refresh.,{0} {1} je izmijenjen. Osvježi stranicu.
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,Prestani korisnike od izrade ostaviti aplikacija na sljedećim danima.
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +591,From Opportunity,od Opportunity
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +46,Blanking,Zatamnjenja
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +166,Employee Benefits,Primanja zaposlenih
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,Employee Benefits,Primanja zaposlenih
 DocType: Sales Invoice,Is POS,Je POS
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +240,Packed quantity must equal quantity for Item {0} in row {1},Pakirana količina mora biti jednaka količini za proizvod {0} u redku {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +245,Packed quantity must equal quantity for Item {0} in row {1},Pakirana količina mora biti jednaka količini za proizvod {0} u redku {1}
 DocType: Production Order,Manufactured Qty,Proizvedena količina
 DocType: Purchase Receipt Item,Accepted Quantity,Prihvaćena količina
 apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} Ne radi postoji
 apps/erpnext/erpnext/config/accounts.py +18,Bills raised to Customers.,Mjenice podignuta na kupce.
 DocType: DocField,Default,Zadano
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Id projekta
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +466,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Redak Ne {0}: Iznos ne može biti veća od visine u tijeku protiv Rashodi Zahtjeva {1}. U tijeku Iznos je {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +468,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Redak Ne {0}: Iznos ne može biti veća od visine u tijeku protiv Rashodi Zahtjeva {1}. U tijeku Iznos je {2}
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +40,{0} subscribers added,Dodao {0} pretplatnika
 DocType: Maintenance Schedule,Schedule,Raspored
 DocType: Cost Center,"Define Budget for this Cost Center. To set budget action, see ""Company List""","Odredite proračun za ovu troška. Za postavljanje proračuna akcije, pogledajte &quot;Lista poduzeća&quot;"
@@ -3873,7 +3714,7 @@
 apps/erpnext/erpnext/public/js/pos/pos.js +91,Price List not found or disabled,Cjenik nije pronađena ili onemogućena
 DocType: Expense Claim,Approved,Odobren
 DocType: Pricing Rule,Price,Cijena
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +79,Employee relieved on {0} must be set as 'Left',Zaposlenik razriješen na {0} mora biti postavljen kao 'lijevo '
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +88,Employee relieved on {0} must be set as 'Left',Zaposlenik razriješen na {0} mora biti postavljen kao 'lijevo '
 DocType: Item,"Selecting ""Yes"" will give a unique identity to each entity of this item which can be viewed in the Serial No master.",Odabir &quot;Da&quot; će dati jedinstveni identitet svakog entiteta ove točke koja se može vidjeti u rednim brojem učitelja.
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +39,Appraisal {0} created for Employee {1} in the given date range,Procjena {0} stvorena za zaposlenika {1} u određenom razdoblju
 DocType: Employee,Education,Obrazovanje
@@ -3884,7 +3725,7 @@
 apps/frappe/frappe/desk/moduleview.py +67,Standard Reports,Standardno izvješće
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,Knjigovodstvene temeljnice
 DocType: Delivery Note Item,Available Qty at From Warehouse,Dostupno Količina u iz skladišta
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +209,Please select Employee Record first.,Odaberite zaposlenika rekord prvi.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +224,Please select Employee Record first.,Odaberite zaposlenika rekord prvi.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Red {0}: stranka / računa ne odgovara {1} / {2} u {3} {4}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +35,To create a Tax Account,Za stvaranje porezno
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +233,Please enter Expense Account,Unesite trošak računa
@@ -3897,46 +3738,43 @@
 DocType: Sales Order,Track this Sales Order against any Project,Prati ovu prodajni nalog protiv bilo Projekta
 DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,Povucite prodajne naloge (na čekanju za isporuku) na temelju navedenih kriterija
 DocType: DocShare,Document Type,Tip dokumenta
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +565,From Supplier Quotation,Od dobavljača kotaciju
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +588,From Supplier Quotation,Od dobavljača kotaciju
 DocType: Deduction Type,Deduction Type,Tip odbitka
 DocType: Attendance,Half Day,Pola dana
 DocType: Pricing Rule,Min Qty,Min kol
 DocType: Features Setup,"To track items in sales and purchase documents with batch nos. ""Preferred Industry: Chemicals""",Za praćenje predmeta u prodaji i kupnji dokumenata s serije br. &quot;Radije Industrija: Kemikalije&quot;
 DocType: GL Entry,Transaction Date,Transakcija Datum
 DocType: Production Plan Item,Planned Qty,Planirani Kol
-apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +91,Total Tax,Ukupno porez
+apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +93,Total Tax,Ukupno porez
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +178,For Quantity (Manufactured Qty) is mandatory,Za Količina (Proizvedeno Kol) je obavezno
 DocType: Stock Entry,Default Target Warehouse,Centralno skladište
 DocType: Purchase Invoice,Net Total (Company Currency),Ukupno neto (valuta tvrtke)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +79,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Red {0}: Stranka Tip i stranka je primjenjiv samo protiv potraživanja / obveze prema dobavljačima račun
 DocType: Notification Control,Purchase Receipt Message,Poruka primke
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +95,Total allocated leaves are more than period,Ukupno dodijeljeni Listovi su više nego razdoblje
 DocType: Production Order,Actual Start Date,Stvarni datum početka
 DocType: Sales Order,% of materials delivered against this Sales Order,% robe od ove narudžbe je isporučeno
 apps/erpnext/erpnext/config/stock.py +23,Record item movement.,Zabilježite stavku pokret.
 DocType: Newsletter List Subscriber,Newsletter List Subscriber,Bilten popis pretplatnika
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +164,Morticing,Morticing
 DocType: Email Account,Service,usluga
 DocType: Hub Settings,Hub Settings,Hub Postavke
 DocType: Project,Gross Margin %,Bruto marža %
 DocType: BOM,With Operations,Uz operacije
 apps/erpnext/erpnext/accounts/party.py +232,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Računovodstvenih unosa već su napravljene u valuti {0} za poduzeće {1}. Odaberite potraživanja ili dugovanja račun s valutom {0}.
 ,Monthly Salary Register,Mjesečna plaća Registracija
-apps/frappe/frappe/website/template.py +140,Next,Sljedeći
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard_page.html +17,Next,Sljedeći
 DocType: Warranty Claim,If different than customer address,Ako se razlikuje od kupaca adresu
 DocType: BOM Operation,BOM Operation,BOM operacija
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +118,Electropolishing,Elektropoliranje
 DocType: Purchase Taxes and Charges,On Previous Row Amount,Na prethodnu Row visini
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +24,Please enter Payment Amount in atleast one row,Unesite iznos otplate u atleast jednom redu
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +33,Please enter Payment Amount in atleast one row,Unesite iznos otplate u atleast jednom redu
 DocType: POS Profile,POS Profile,POS profil
 apps/erpnext/erpnext/config/accounts.py +153,"Seasonality for setting budgets, targets etc.","Sezonska za postavljanje proračuna, ciljevi itd"
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +238,Row {0}: Payment Amount cannot be greater than Outstanding Amount,Red {0}: Plaćanje Iznos ne može biti veći od preostali iznos
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +46,Total Unpaid,Ukupno Neplaćeni
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +21,Time Log is not billable,Vrijeme Log nije naplatnih
 apps/erpnext/erpnext/stock/get_item_details.py +128,"Item {0} is a template, please select one of its variants","Stavka {0} je predložak, odaberite jednu od njegovih varijanti"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +528,Purchaser,Kupac
+apps/erpnext/erpnext/public/js/setup_wizard.js +272,Purchaser,Kupac
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +81,Net pay cannot be negative,Neto plaća ne može biti negativna
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +71,Please enter the Against Vouchers manually,Unesite protiv vaučera ručno
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +107,Please enter the Against Vouchers manually,Unesite protiv vaučera ručno
 DocType: SMS Settings,Static Parameters,Statički parametri
 DocType: Purchase Order,Advance Paid,Unaprijed plaćeni
 DocType: Item,Item Tax,Porez proizvoda
@@ -3945,14 +3783,12 @@
 apps/erpnext/erpnext/config/crm.py +48,Send mass SMS to your contacts,Pošalji grupne SMS poruke svojim kontaktima
 DocType: Purchase Taxes and Charges,Consider Tax or Charge for,Razmislite poreza ili pristojbi za
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,Stvarni Količina je obavezno
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +42,Cross-rolling,Cross-valjanje
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +132,Credit Card,kreditna kartica
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +132,Credit Card,kreditna kartica
 DocType: BOM,Item to be manufactured or repacked,Proizvod će biti proizveden ili prepakiran
 apps/erpnext/erpnext/config/stock.py +95,Default settings for stock transactions.,Zadane postavke za skladišne transakcije.
 DocType: Purchase Invoice,Next Date,Sljedeći datum
 DocType: Employee Education,Major/Optional Subjects,Glavni / Izborni predmeti
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +49,Please enter Taxes and Charges,Unesite poreza i pristojbi
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +85,Machining,Strojna
 DocType: Sales Invoice Item,Drop Ship,Drop Ship
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","Ovdje možete održavati obiteljske pojedinosti kao što su ime i okupacije roditelja, supružnika i djecu"
 DocType: Hub Settings,Seller Name,Naziv prodavatelja
@@ -3962,7 +3798,7 @@
 DocType: Stock Entry,Repack,Prepakiraj
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +6,You must Save the form before proceeding,Morate spremiti obrazac prije nastavka
 DocType: Item Attribute,Numeric Values,Brojčane vrijednosti
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +500,Attach Logo,Pričvrstite Logo
+apps/erpnext/erpnext/public/js/setup_wizard.js +246,Attach Logo,Pričvrstite Logo
 DocType: Customer,Commission Rate,Komisija Stopa
 apps/erpnext/erpnext/stock/doctype/item/item.js +38,Make Variant,Napravite varijanta
 apps/erpnext/erpnext/config/hr.py +145,Block leave applications by department.,Blok ostaviti aplikacija odjelu.
@@ -3977,19 +3813,19 @@
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +105,Please select a csv file,Odaberite CSV datoteku
 DocType: Dropbox Backup,Send Backups to Dropbox,Pošalji sigurnosne kopije na Dropbox
 DocType: Purchase Order,To Receive and Bill,Za primanje i Bill
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +94,Designer,Imenovatelj
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Designer,Imenovatelj
 apps/erpnext/erpnext/config/selling.py +121,Terms and Conditions Template,Uvjeti i odredbe - šprance
 DocType: Serial No,Delivery Details,Detalji isporuke
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +383,Cost Center is required in row {0} in Taxes table for type {1},Troška potrebno je u redu {0} poreza stolom za vrstu {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +386,Cost Center is required in row {0} in Taxes table for type {1},Troška potrebno je u redu {0} poreza stolom za vrstu {1}
 DocType: Item,Automatically create Material Request if quantity falls below this level,Automatsko stvaranje materijala zahtjev ako količina padne ispod te razine
 ,Item-wise Purchase Register,Stavka-mudar Kupnja Registracija
 DocType: Batch,Expiry Date,Datum isteka
-apps/erpnext/erpnext/stock/doctype/item/item.py +375,"To set reorder level, item must be a Purchase Item or Manufacturing Item",Za postavljanje razine naručivanja točka mora biti Kupnja predmeta ili proizvodnja predmeta
+apps/erpnext/erpnext/stock/doctype/item/item.py +379,"To set reorder level, item must be a Purchase Item or Manufacturing Item",Za postavljanje razine naručivanja točka mora biti Kupnja predmeta ili proizvodnja predmeta
 ,Supplier Addresses and Contacts,Supplier Adrese i kontakti
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,Molimo odaberite kategoriju prvi
 apps/erpnext/erpnext/config/projects.py +18,Project master.,Projekt majstor.
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,Ne pokazati nikakav simbol kao $ iza valute.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +330, (Half Day),(Pola dana)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +374, (Half Day),(Pola dana)
 DocType: Supplier,Credit Days,Kreditne Dani
 DocType: Leave Type,Is Carry Forward,Je Carry Naprijed
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +478,Get Items from BOM,Kreiraj proizvode od sastavnica (BOM)
@@ -3997,7 +3833,7 @@
 apps/erpnext/erpnext/config/manufacturing.py +120,Bill of Materials,Bill of Materials
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +77,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Red {0}: Stranka Tip i stranka je potrebno za potraživanja / obveze prema dobavljačima račun {1}
 DocType: Dropbox Backup,Send Notifications To,Slanje obavijesti
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html +26,Ref Date,Ref Datum
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +54,Ref Date,Ref Datum
 DocType: Employee,Reason for Leaving,Razlog za odlazak
 DocType: Expense Claim Detail,Sanctioned Amount,Iznos kažnjeni
 DocType: GL Entry,Is Opening,Je Otvaranje
@@ -4005,4 +3841,3 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +188,Account {0} does not exist,Račun {0} ne postoji
 DocType: Account,Cash,Gotovina
 DocType: Employee,Short biography for website and other publications.,Kratka biografija za web stranice i drugih publikacija.
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +31,Please create Salary Structure for employee {0},Molimo stvoriti Plaća Struktura za zaposlenika {0}
diff --git a/erpnext/translations/hu.csv b/erpnext/translations/hu.csv
index ab5cd98..483fbcd 100644
--- a/erpnext/translations/hu.csv
+++ b/erpnext/translations/hu.csv
@@ -1,13 +1,12 @@
 DocType: Employee,Salary Mode,Fizetés Mode
 DocType: Cost Center,"Select Monthly Distribution, if you want to track based on seasonality.","Válassza ki havi megoszlása, ha szeretné nyomon követni alapján a szezonalitás."
 DocType: Employee,Divorced,Elvált
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +86,Warning: Same item has been entered multiple times.,Figyelmeztetés: ugyanazt a tételt már többször jelenik meg.
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +80,Warning: Same item has been entered multiple times.,Figyelmeztetés: ugyanazt a tételt már többször jelenik meg.
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +96,Items already synced,Tételek már szinkronizálva
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,"Hagyjuk pont, hogy ki többször a tranzakció"
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,Mégsem Material látogatás {0} törlése előtt ezt a garanciális igény
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +19,Consumer Products,Consumer Products
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,Consumer Products
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +68,Please select Party Type first,"Kérjük, válasszon párt Type első"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +90,Annealing,Annealing
 DocType: Item,Customer Items,Vásárlói elemek
 apps/erpnext/erpnext/accounts/doctype/account/account.py +45,Account {0}: Parent account {1} can not be a ledger,Account {0}: Parent véve {1} nem lehet a főkönyvi
 DocType: Item,Publish Item to hub.erpnext.com,Közzé tétel hub.erpnext.com
@@ -20,15 +19,14 @@
 DocType: About Us Settings,Website,Weboldal
 DocType: POS Profile,Applicable for User,Alkalmazható Felhasználó
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +169,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Leállította a termelést rendelés nem törölhető, kidugaszol először, hogy megszünteti"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +23,Compaction plus sintering,Tömörítő plusz szinterezés
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,Currency is required for Price List {0},Árfolyam szükséges árlista {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* A tranzakcióban lesz kiszámolva.
 DocType: Purchase Order,Customer Contact,Ügyfélkapcsolati
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +549,From Material Request,Az anyagi kérése
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +572,From Material Request,Az anyagi kérése
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} Fa
 DocType: Job Applicant,Job Applicant,Állásra pályázó
 apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,Nincs több eredményt.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +78,Legal,Jogi
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +34,Legal,Jogi
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +114,Actual type tax cannot be included in Item rate in row {0},Tényleges típusú adó nem lehet jogcím tartalmazza ráta sorban {0}
 DocType: C-Form,Customer,Vevő
 DocType: Purchase Receipt Item,Required By,Által előírt
@@ -43,7 +41,6 @@
 DocType: Manufacturing Settings,Default 10 mins,Default 10 perc
 DocType: Leave Type,Leave Type Name,Hagyja típus neve
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +148,Series Updated Successfully,Sorozat sikeresen frissítve
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +150,Stitching,Varrás
 DocType: Pricing Rule,Apply On,Alkalmazza
 DocType: Item Price,Multiple Item prices.,Több tétel árakat.
 ,Purchase Order Items To Be Received,Megrendelés tételek Kapott
@@ -51,8 +48,8 @@
 DocType: Quality Inspection Reading,Parameter,Paraméter
 apps/erpnext/erpnext/projects/doctype/project/project.py +43,Expected End Date can not be less than Expected Start Date,"Várható befejezés dátuma nem lehet kevesebb, mint várható kezdési időpontja"
 apps/erpnext/erpnext/utilities/transaction_base.py +104,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Sor # {0}: Ár kell egyeznie {1}: {2} ({3} / {4})
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +189,New Leave Application,Új Leave Application
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +134,Bank Draft,Bank Draft
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +204,New Leave Application,Új Leave Application
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +134,Bank Draft,Bank Draft
 DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,"1. Ahhoz, hogy a megrendelő bölcs cikk-kód és kereshetővé tételéhez alapján kód Ezzel az opcióval"
 DocType: Mode of Payment Account,Mode of Payment Account,Mód Fizetési számla
 apps/erpnext/erpnext/stock/doctype/item/item.js +34,Show Variants,Mutasd változatok
@@ -64,25 +61,23 @@
 DocType: Production Plan Item,Production Plan Item,Gyártási terv tétele
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +141,User {0} is already assigned to Employee {1},Felhasználó {0} már hozzá van rendelve Employee {1}
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +13,Make new POS Profile,Szerezz új POS Profile
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +31,Health Care,Egészségügyi ellátás
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,Egészségügyi ellátás
 DocType: Purchase Invoice,Monthly,Havi
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +66,Delay in payment (Days),Fizetési késedelem (nap)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +494,Invoice,Számla
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +519,Invoice,Számla
 DocType: Maintenance Schedule Item,Periodicity,Időszakosság
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +357,Email Address,Email cím
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +21,Defense,Védelem
+apps/erpnext/erpnext/public/js/setup_wizard.js +107,Email Address,Email cím
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,Védelem
 DocType: Company,Abbr,Röv.
 DocType: Appraisal Goal,Score (0-5),Pontszám (0-5)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +193,Row {0}: {1} {2} does not match with {3},Row {0}: {1} {2} nem egyezik a {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +67,Row # {0}:,Row # {0}:
 DocType: Delivery Note,Vehicle No,Jármű No
 apps/erpnext/erpnext/public/js/pos/pos.js +528,Please select Price List,"Kérjük, válasszon árjegyzéke"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +162,Woodworking,Faipari
 DocType: Production Order Operation,Work In Progress,Dolgozunk rajta
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +153,3D printing,3D nyomtatás
 DocType: Employee,Holiday List,Szabadnapok listája
 DocType: Time Log,Time Log,Időnapló
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +530,Accountant,Könyvelő
+apps/erpnext/erpnext/public/js/setup_wizard.js +274,Accountant,Könyvelő
 DocType: Cost Center,Stock User,Stock Felhasználó
 DocType: Company,Phone No,Telefonszám
 DocType: Time Log,"Log of Activities performed by users against Tasks that can be used for tracking time, billing.","Bejelentkezés végzett tevékenységek, amelyeket a felhasználók ellen feladatok, melyek az adatok nyomon követhetők időt, számlázási."
@@ -98,18 +93,19 @@
 DocType: Bin,Quantity Requested for Purchase,Igényelt beszerzendő mennyiség
 DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name","Erősítse .csv fájlt két oszlopot, az egyik a régi nevet, a másik az új nevet"
 DocType: Packed Item,Parent Detail docname,Szülő Részlet docname
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Kg,Kg
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Kg,Kg
 apps/erpnext/erpnext/config/hr.py +48,Opening for a Job.,Nyitott állások
 DocType: Item Attribute,Increment,Növekmény
 apps/erpnext/erpnext/public/js/stock_analytics.js +63,Select Warehouse...,Válassza Warehouse ...
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +6,Advertising,Hirdetés
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,Hirdetés
+apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,Ugyanez a vállalat szerepel többször
 DocType: Employee,Married,Házas
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +389,Stock cannot be updated against Delivery Note {0},Stock nem lehet frissíteni ellen szállítólevél {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +391,Stock cannot be updated against Delivery Note {0},Stock nem lehet frissíteni ellen szállítólevél {0}
 DocType: Payment Reconciliation,Reconcile,Összeegyeztetni
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +30,Grocery,Élelmiszerbolt
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,Élelmiszerbolt
 DocType: Quality Inspection Reading,Reading 1,Reading 1
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Make Bank Entry,Tedd Bank Entry
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +40,Pension Funds,Nyugdíjpénztárak
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,Nyugdíjpénztárak
 apps/erpnext/erpnext/accounts/doctype/account/account.py +142,Warehouse is mandatory if account type is Warehouse,"Warehouse kötelező, ha figyelembe típus Warehouse"
 DocType: SMS Center,All Sales Person,Minden értékesítő
 DocType: Lead,Person Name,Személy Név
@@ -131,7 +127,7 @@
 DocType: Quality Inspection,Get Specification Details,Get Specification Részletek
 DocType: Lead,Interested,Érdekelt
 apps/erpnext/erpnext/config/manufacturing.py +14,Bill of Material,Anyagjegyzék
-apps/erpnext/erpnext/public/js/stock_analytics.js +45,Opening,Nyílás
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +158,Opening,Nyílás
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},Re {0} {1}
 DocType: Item,Copy From Item Group,Másolás jogcím-csoport
 DocType: Journal Entry,Opening Entry,Kezdő tétel
@@ -145,23 +141,22 @@
 DocType: Employee Education,Under Graduate,Under Graduate
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +22,Target On,Cél On
 DocType: BOM,Total Cost,Összköltség
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +99,Reaming,Dörzsárazás
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +9,Activity Log:,Tevékenység lista
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +199,Item {0} does not exist in the system or has expired,"Elem {0} nem létezik a rendszerben, vagy lejárt"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +44,Real Estate,Ingatlan
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +44,Real Estate,Ingatlan
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +4,Statement of Account,Statement of Account
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +41,Pharmaceuticals,Pharmaceuticals
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,Pharmaceuticals
 DocType: Expense Claim Detail,Claim Amount,Követelés összege
 DocType: Employee,Mr,Úr
 DocType: Custom Script,Client,Ügyfél
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,Szállító Type / szállító
 DocType: Naming Series,Prefix,Előtag
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Consumable,Elhasználható
+apps/erpnext/erpnext/public/js/setup_wizard.js +359,Consumable,Elhasználható
 DocType: Upload Attendance,Import Log,Importálás naplója
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.js +19,Send,Küldés
 DocType: Sales Invoice Item,Delivered By Supplier,Megérkezés a Szállító
 DocType: SMS Center,All Contact,Minden Kapcsolattartó
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +164,Annual Salary,Éves Fizetés
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +164,Annual Salary,Éves Fizetés
 DocType: Period Closing Voucher,Closing Fiscal Year,Záró pénzügyi év
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +69,Stock Expenses,Stock költségek
 DocType: Newsletter,Email Sent?,Emailt elküldeni?
@@ -169,26 +164,24 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +92,Show Time Logs,Időnaplók mutatása
 DocType: Journal Entry Account,Credit in Company Currency,Credit Company Valuta
 DocType: Delivery Note,Installation Status,Telepítés állapota
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +115,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Elfogadott + Elutasított Mennyiség meg kell egyeznie a beérkezett mennyiséget tétel {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +118,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Elfogadott + Elutasított Mennyiség meg kell egyeznie a beérkezett mennyiséget tétel {0}
 DocType: Item,Supply Raw Materials for Purchase,Supply nyersanyag beszerzése
 apps/erpnext/erpnext/stock/get_item_details.py +133,Item {0} must be a Purchase Item,Elem {0} kell a vásárlást tétel
 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","Töltse le a sablont, töltse megfelelő adatokat és csatolja a módosított fájlt. Minden időpontot és a munkavállalói kombináció a kiválasztott időszakban jön a sablon, a meglévő jelenléti ívek"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +446,Item {0} is not active or end of life has been reached,"Elem {0} nem aktív, vagy az elhasználódott elérte"
 DocType: Time Log Batch,Will be updated after Sales Invoice is Submitted.,Után felülvizsgálják Sales számla benyújtásának.
-apps/erpnext/erpnext/controllers/accounts_controller.py +493,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Hogy tartalmazzák az adót a sorban {0} tétel mértéke, az adók sorokban {1} is fel kell venni"
+apps/erpnext/erpnext/controllers/accounts_controller.py +494,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Hogy tartalmazzák az adót a sorban {0} tétel mértéke, az adók sorokban {1} is fel kell venni"
 apps/erpnext/erpnext/config/hr.py +90,Settings for HR Module,Beállításait HR modul
 DocType: SMS Center,SMS Center,SMS Központ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +78,Straightening,Egyengető
 DocType: BOM Replace Tool,New BOM,Új anyagjegyzék
 apps/erpnext/erpnext/config/projects.py +28,Batch Time Logs for billing.,Batch Time Naplók számlázás.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +15,Countergravity casting,Ellennyomásos öntés
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +30,Newsletter has already been sent,Hírlevél még nem küldték
 DocType: Lead,Request Type,Kérés típusa
 DocType: Leave Application,Reason,Ok
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +14,Broadcasting,Broadcasting
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +140,Execution,Végrehajtás
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +364,The first user will become the System Manager (you can change this later).,Az első felhasználó lesz a System Manager (meg lehet változtatni erről később).
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,Broadcasting
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +140,Execution,Végrehajtás
+apps/erpnext/erpnext/public/js/setup_wizard.js +114,The first user will become the System Manager (you can change this later).,Az első felhasználó lesz a System Manager (meg lehet változtatni erről később).
 apps/erpnext/erpnext/config/manufacturing.py +39,Details of the operations carried out.,Részletek az elvégzett műveleteket.
 DocType: Serial No,Maintenance Status,Karbantartás állapota
 apps/erpnext/erpnext/config/stock.py +263,Items and Pricing,Tételek és árak
@@ -205,7 +198,6 @@
 DocType: Pricing Rule,Discount on Price List Rate (%),Kedvezmény a árjegyzéke ráta (%)
 apps/frappe/frappe/public/js/frappe/form/print.js +96,Start,Start
 DocType: User,First Name,Vezetéknév
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +12,Full-mold casting,Full-olvadéköntési
 DocType: Offer Letter,Select Terms and Conditions,Válassza ki Feltételek
 DocType: Production Planning Tool,Sales Orders,Vevőmegrendelés
 DocType: Purchase Taxes and Charges,Valuation,Értékelés
@@ -217,8 +209,7 @@
 DocType: Bank Reconciliation,Bank Account,Bankszámla
 DocType: Leave Type,Allow Negative Balance,Negatív egyenleg engedélyezése
 DocType: Selling Settings,Default Territory,Alapértelmezett terület
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +53,Television,Televízió
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +138,Gashing,Gashing
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,Televízió
 DocType: Production Order Operation,Updated via 'Time Log',"Frissítve keresztül ""Idő Log"""
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +82,Account {0} does not belong to Company {1},Account {0} nem tartozik Company {1}
 DocType: Naming Series,Series List for this Transaction,Sorozat List ehhez a tranzakcióhoz
@@ -233,14 +224,13 @@
 DocType: Leave Allocation,Add unused leaves from previous allocations,Add fel nem használt leveleket a korábbi juttatások
 apps/erpnext/erpnext/controllers/recurring_document.py +206,Next Recurring {0} will be created on {1},Next Ismétlődő {0} jön létre {1}
 DocType: Newsletter List,Total Subscribers,Összes előfizető
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +575,Contact Name,Kapcsolattartó neve
+,Contact Name,Kapcsolattartó neve
 DocType: Production Plan Item,SO Pending Qty,SO Folyamatban Mennyiség
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Bérlap létrehozása a fenti kritériumok alapján.
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,Kérheti a vásárlást.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +107,Double housing,Dupla ház
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +156,Only the selected Leave Approver can submit this Leave Application,Csak a kijelölt Leave Jóváhagyó nyújthatják be ez a szabadság Application
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +171,Only the selected Leave Approver can submit this Leave Application,Csak a kijelölt Leave Jóváhagyó nyújthatják be ez a szabadság Application
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,"Tehermentesítő dátuma nagyobbnak kell lennie, mint Csatlakozás dátuma"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +172,Leaves per Year,Levelek évente
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +172,Leaves per Year,Levelek évente
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup > Settings > Naming Series,"Kérjük, állítsa elnevezése Series {0} a Setup&gt; Beállítások&gt; elnevezése Series"
 DocType: Time Log,Will be updated when batched.,"Frissíteni kell, ha kötegelt."
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +104,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,"Row {0}: Kérjük ellenőrzés ""Advance"" ellen Account {1}, ha ez egy előre bejegyzést."
@@ -249,25 +239,24 @@
 DocType: Item Website Specification,Item Website Specification,Az anyag weboldala
 DocType: Dropbox Backup,Dropbox Access Key,Dropbox Access Key
 DocType: Payment Tool,Reference No,Hivatkozási szám
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +348,Leave Blocked,Hagyja Blokkolt
-apps/erpnext/erpnext/stock/doctype/item/item.py +535,Item {0} has reached its end of life on {1},Elem {0} elérte az élettartama végét {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +392,Leave Blocked,Hagyja Blokkolt
+apps/erpnext/erpnext/stock/doctype/item/item.py +539,Item {0} has reached its end of life on {1},Elem {0} elérte az élettartama végét {1}
 apps/erpnext/erpnext/accounts/utils.py +339,Annual,Éves
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Stock Megbékélés Elem
 DocType: Stock Entry,Sales Invoice No,Értékesítési számlák No
 DocType: Material Request Item,Min Order Qty,Min. rendelési menny.
 DocType: Lead,Do Not Contact,Ne írj
 DocType: Sales Invoice,The unique id for tracking all recurring invoices. It is generated on submit.,Az egyedi azonosítóval nyomon követi az összes visszatérő számlákat. Úgy keletkezett benyújtani.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +93,Software Developer,Software Developer
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +93,Software Developer,Software Developer
 DocType: Item,Minimum Order Qty,Minimális rendelési menny
 DocType: Pricing Rule,Supplier Type,Beszállító típusa
 DocType: Item,Publish in Hub,Közzéteszi Hub
 ,Terretory,Terület
-apps/erpnext/erpnext/stock/doctype/item/item.py +555,Item {0} is cancelled,{0} elem törölve
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +598,Material Request,Anyagigénylés
+apps/erpnext/erpnext/stock/doctype/item/item.py +559,Item {0} is cancelled,{0} elem törölve
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +607,Material Request,Anyagigénylés
 DocType: Bank Reconciliation,Update Clearance Date,Frissítés Végső dátum
 DocType: Item,Purchase Details,Vásárlási adatok
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +323,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},Elem {0} nem található &quot;szállított alapanyagok&quot; táblázat Megrendelés {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +129,Wire brushing,Drótkeféléshez
 DocType: Employee,Relation,Kapcsolat
 DocType: Shipping Rule,Worldwide Shipping,Világszerte Szállítási
 apps/erpnext/erpnext/config/selling.py +23,Confirmed orders from Customers.,Visszaigazolt megrendelések ügyfelektől.
@@ -283,12 +272,11 @@
 DocType: Supplier,Address HTML,HTML Cím
 DocType: Lead,Mobile No.,Mobiltelefon
 DocType: Maintenance Schedule,Generate Schedule,Ütemezés generálása
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +81,Hubbing,Hubbing
 DocType: Purchase Invoice Item,Expense Head,Igénylés fejléce
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +86,Please select Charge Type first,"Kérjük, válasszon Charge Type első"
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,Legutolsó
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +395,Max 5 characters,Max. 5 karakter
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +195,Select Your Language,Nyelvválasztás
+apps/erpnext/erpnext/public/js/setup_wizard.js +143,Max 5 characters,Max. 5 karakter
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +245,Select Your Language,Nyelvválasztás
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,Az első Leave Jóváhagyó a lista lesz-e az alapértelmezett Leave Jóváhagyó
 DocType: Manufacturing Settings,"Disables creation of time logs against Production Orders.
 Operations shall not be tracked against Production Order",Kikapcsolja létrehozása időt naplóid gyártási megrendeléseket. Műveletek nem lehet nyomon követni ellenében rendelés
@@ -300,8 +288,6 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +34,Item {0} must be Service Item,Elem {0} kell lennie Service Elem
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +303,Completed Qty can not be greater than 'Qty to Manufacture',"Befejezett Menny nem lehet nagyobb, mint ""Menny a Manufacture"""
 DocType: DocType,Administrator,Adminisztrátor
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +136,Laser drilling,Lézerfúrással
-DocType: Stock UOM Replace Utility,New Stock UOM,Új készlet mértékegysége
 DocType: Period Closing Voucher,Closing Account Head,Záró fiók vezetője
 DocType: Employee,External Work History,Külső munka története
 apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,Körkörös hivatkozás Error
@@ -310,18 +296,15 @@
 DocType: Lead,Industry,Ipar
 DocType: Employee,Job Profile,Job Profile
 DocType: Newsletter,Newsletter,Hírlevél
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +84,Hydroforming,Hydroforming
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +49,Necking,Smárolás
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Értesítés e-mailben a létrehozása automatikus Material kérése
 DocType: Journal Entry,Multi Currency,Több pénznem
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +51,Item is updated,Elem frissül
 DocType: Async Task,System Manager,System Manager
 DocType: Payment Reconciliation Invoice,Invoice Type,Számla típusa
 DocType: Sales Invoice Item,Delivery Note,Szállítólevél
 DocType: Dropbox Backup,Allow Dropbox Access,Dropbox hozzáférés engedélyezése
 apps/erpnext/erpnext/config/learn.py +72,Setting up Taxes,Beállítása Adók
 apps/erpnext/erpnext/accounts/utils.py +189,Payment Entry has been modified after you pulled it. Please pull it again.,"Fizetési Entry módosításra került, miután húzta. Kérjük, húzza meg újra."
-apps/erpnext/erpnext/stock/doctype/item/item.py +343,{0} entered twice in Item Tax,{0} belépett kétszer tétel adó
+apps/erpnext/erpnext/stock/doctype/item/item.py +347,{0} entered twice in Item Tax,{0} belépett kétszer tétel adó
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +105,Summary for this week and pending activities,Összefoglaló erre a hétre és a folyamatban lévő tevékenységek
 DocType: Workstation,Rent Cost,Bérleti díj
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +74,Please select month and year,"Kérjük, válasszon hónapot és évet"
@@ -338,23 +321,21 @@
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,"Arány, amely Customer Valuta átalakul ügyfél alap deviza"
 DocType: Features Setup,"Available in BOM, Delivery Note, Purchase Invoice, Production Order, Purchase Order, Purchase Receipt, Sales Invoice, Sales Order, Stock Entry, Timesheet","Elérhető a BOM, szállítólevél, beszerzési számla, gyártási utasítás, megrendelés, vásárlási nyugta, Értékesítési számlák, Vevői rendelés, Stock Entry, Időnyilvántartó"
 DocType: Item Tax,Tax Rate,Adókulcs
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Select Item,Elem kiválasztása
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +540,Select Item,Elem kiválasztása
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +143,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","Cikk: {0} sikerült szakaszos, nem lehet összeegyeztetni a \ Stock Megbékélés helyett használja Stock Entry"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +259,Purchase Invoice {0} is already submitted,Vásárlást igazoló számlát {0} már benyújtott
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +262,Purchase Invoice {0} is already submitted,Vásárlást igazoló számlát {0} már benyújtott
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Batch No must be same as {1} {2},Sor # {0}: Batch Nem kell egyeznie {1} {2}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Convert to non-Group,Átalakítás nem Group
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +55,Purchase Receipt must be submitted,Vásárlási nyugta kell benyújtani
-DocType: Stock UOM Replace Utility,Current Stock UOM,Raktárkészlet UOM
 apps/erpnext/erpnext/config/stock.py +53,Batch (lot) of an Item.,Egy tétel sok mennyisége a köteg.
 DocType: C-Form Invoice Detail,Invoice Date,Számla dátuma
 DocType: GL Entry,Debit Amount,Betéti összeg
 apps/erpnext/erpnext/accounts/party.py +223,There can only be 1 Account per Company in {0} {1},Ott csak 1 fiók per Társaság {0} {1}
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Your email address,E-mail címed
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +194,Please see attachment,"Kérjük, olvassa mellékletet"
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +203,Please see attachment,"Kérjük, olvassa mellékletet"
 DocType: Purchase Order,% Received,% fogadva
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +109,Water jet cutting,Vízsugaras vágás
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +24,Setup Already Complete!!,Beállítás Már Komplett !!
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +20,Setup Already Complete!!,Beállítás Már Komplett !!
 ,Finished Goods,Készáru
 DocType: Delivery Note,Instructions,Utasítások
 DocType: Quality Inspection,Inspected By,Megvizsgálta
@@ -369,6 +350,7 @@
 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.,"Kérjük, ne hozzon létre ügyfélszámlák és beszállítók. Ők jönnek létre közvetlenül a vevői / szállítói mesterek."
 DocType: Currency Exchange,Currency Exchange,Valuta árfolyam
 DocType: Purchase Invoice Item,Item Name,Az elem neve
+DocType: Authorization Rule,Approving User  (above authorized value),Jóváhagyó felhasználó (a fenti engedélyezett érték)
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Credit Balance,Credit Balance
 DocType: Employee,Widowed,Özvegy
 DocType: Production Planning Tool,"Items to be requested which are ""Out of Stock"" considering all warehouses based on projected qty and minimum order qty","Tételek kért, amelyek ""Elfogyott"" figyelembe véve az összes raktárak alapján tervezett Menny és a minimális rendelési mennyiség"
@@ -378,11 +360,10 @@
 ,Purchase Register,Vásárlási Regisztráció
 DocType: Landed Cost Item,Applicable Charges,Alkalmazandó díjak
 DocType: Workstation,Consumable Cost,Fogyó költség
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,{0} ({1}) must have role 'Leave Approver',"{0} ({1}) kell szerepet ""Leave Jóváhagyó"""
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +167,{0} ({1}) must have role 'Leave Approver',"{0} ({1}) kell szerepet ""Leave Jóváhagyó"""
 DocType: Purchase Receipt,Vehicle Date,Jármű dátuma
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +39,Medical,Orvosi
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +39,Medical,Orvosi
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,Veszteség indoka
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +36,Tube beading,Cső gyöngyfűzés
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},Munkaállomás zárva a következő időpontokban per Nyaralás listája: {0}
 DocType: Employee,Single,Egyedülálló
 DocType: Issue,Attachment,Attachment
@@ -403,10 +384,8 @@
 DocType: Account,Is Group,Is Csoport
 DocType: Stock Settings,Automatically Set Serial Nos based on FIFO,Automatikusan beállítja Soros számú alapuló FIFO
 DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,Ellenőrizze Szállító Számla száma Egyediség
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +31,Thermoforming,Thermoforming
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +66,Slitting,Slitting
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +57,'To Case No.' cannot be less than 'From Case No.',"""A Case No."" nem lehet kevesebb, mint ""A Case No."""
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +104,Non Profit,Non Profit
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +104,Non Profit,Non Profit
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_list.js +7,Not Started,Nem kezdődött
 DocType: Lead,Channel Partner,Értékesítési partner
 DocType: Account,Old Parent,Régi szülő
@@ -415,13 +394,12 @@
 apps/erpnext/erpnext/config/manufacturing.py +74,Global settings for all manufacturing processes.,Globális beállítások minden egyes gyártási folyamat.
 DocType: Accounts Settings,Accounts Frozen Upto,A számlák be vannak fagyasztva eddig
 DocType: SMS Log,Sent On,Elküldve
-apps/erpnext/erpnext/stock/doctype/item/item.py +512,Attribute {0} selected multiple times in Attributes Table,Képesség {0} kiválasztott többször attribútumok táblázat
+apps/erpnext/erpnext/stock/doctype/item/item.py +516,Attribute {0} selected multiple times in Attributes Table,Képesség {0} kiválasztott többször attribútumok táblázat
 DocType: Sales Order,Not Applicable,Nem értelmezhető
 apps/erpnext/erpnext/config/hr.py +140,Holiday master.,Nyaralás mester.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +19,Shell molding,Héjformázás
 DocType: Material Request Item,Required Date,Szükséges dátuma
 DocType: Delivery Note,Billing Address,Számlázási cím
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +644,Please enter Item Code.,"Kérjük, adja tételkód."
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +648,Please enter Item Code.,"Kérjük, adja tételkód."
 DocType: BOM,Costing,Költség
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount","Ha be van jelölve, az adó összegét kell tekinteni, mint amelyek már szerepelnek a Print Ár / Print Összeg"
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,Összesen Mennyiség
@@ -431,7 +409,7 @@
 DocType: Item Attribute,To Range,Range
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Értékpapírok és betétek
 DocType: Features Setup,Imports,Importálások
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +144,Adhesive bonding,Ragasztás
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +77,Total leaves allocated is mandatory,Összesen levelek kiosztott kötelező
 DocType: Job Opening,Description of a Job Opening,Leírása egy Állásajánlatok
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +102,Pending activities for today,Függő tevékenységek ma
 apps/erpnext/erpnext/config/hr.py +28,Attendance record.,Részvételi rekord.
@@ -439,26 +417,25 @@
 DocType: Sales Order Item,Used for Production Plan,Használt termelési terv
 DocType: System Settings,Loading...,Betöltés...
 DocType: DocField,Password,Jelszó
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +155,Fused deposition modeling,Olvasztott leválasztás modellezés
 DocType: Manufacturing Settings,Time Between Operations (in mins),Time Between Operations (percben)
 DocType: Customer,Buyer of Goods and Services.,Vevő az áruk és szolgáltatások.
 DocType: Journal Entry,Accounts Payable,Fizethető számlák
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +24,Add Subscribers,Add előfizetők
 apps/erpnext/erpnext/public/js/feature_setup.js +220,""" does not exists","""Nem létezik"
 DocType: Pricing Rule,Valid Upto,Érvényes eddig:
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +564,List a few of your customers. They could be organizations or individuals.,Sorolja pár az ügyfelek. Ők lehetnek szervezetek vagy magánszemélyek.
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,List a few of your customers. They could be organizations or individuals.,Sorolja pár az ügyfelek. Ők lehetnek szervezetek vagy magánszemélyek.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Direct Income,Közvetlen jövedelemtámogatás
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +33,"Can not filter based on Account, if grouped by Account","Nem tudja kiszűrni alapján Account, ha csoportosítva Account"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +88,Administrative Officer,Igazgatási tisztviselő
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Administrative Officer,Igazgatási tisztviselő
 DocType: Payment Tool,Received Or Paid,Kapott vagy fizetett
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +318,Please select Company,"Kérjük, válasszon Társaság"
 DocType: Stock Entry,Difference Account,Különbség Account
 apps/erpnext/erpnext/projects/doctype/task/task.py +44,Cannot close task as its dependant task {0} is not closed.,Nem zárható feladata a függő feladat {0} nincs lezárva.
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +305,Please enter Warehouse for which Material Request will be raised,"Kérjük, adja Warehouse, amelyek anyaga kérés jelenik meg"
 DocType: Production Order,Additional Operating Cost,További üzemeltetési költség
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +20,Cosmetics,Kozmetikum
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,Kozmetikum
 DocType: DocField,Type,Típus
-apps/erpnext/erpnext/stock/doctype/item/item.py +417,"To merge, following properties must be same for both items","Egyesíteni, a következő tulajdonságokkal kell, hogy egyezzen mindkét tételek"
+apps/erpnext/erpnext/stock/doctype/item/item.py +421,"To merge, following properties must be same for both items","Egyesíteni, a következő tulajdonságokkal kell, hogy egyezzen mindkét tételek"
 DocType: Communication,Subject,Tárgy
 DocType: Shipping Rule,Net Weight,Nettó súly
 DocType: Employee,Emergency Phone,Sürgősségi telefon
@@ -468,7 +445,6 @@
 DocType: Journal Entry,Difference (Dr - Cr),Különbség (Dr - Cr)
 DocType: Account,Profit and Loss,Eredménykimutatás
 apps/erpnext/erpnext/config/stock.py +293,Managing Subcontracting,Ügyvezető alvállalkozói munkák
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +58,New UOM must NOT be of type Whole Number,Új UOM TILOS típusú egész szám
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Furniture and Fixture,Bútor és állvány
 DocType: Quotation,Rate at which Price list currency is converted to company's base currency,"Arány, amely Árlista valuta konvertálja a vállalkozás székhelyén pénznemben"
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Account {0} does not belong to company: {1},Account {0} nem tartozik a cég: {1}
@@ -487,14 +463,14 @@
 DocType: Purchase Invoice,Supplier Invoice No,Beszállítói számla száma
 DocType: Territory,For reference,Referenciaként
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +154,"Cannot delete Serial No {0}, as it is used in stock transactions","Nem lehet törölni a sorozatszám {0}, mivel ezt használja a részvény tranzakciók"
-apps/erpnext/erpnext/public/js/account_tree_grid.js +52,Closing (Cr),Zárás (Cr)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +227,Closing (Cr),Zárás (Cr)
 DocType: Serial No,Warranty Period (Days),Garancia idő (nap)
 DocType: Installation Note Item,Installation Note Item,Telepítési feljegyzés Elem
 ,Pending Qty,Folyamatban db
 DocType: Job Applicant,Thread HTML,HTML szál
 DocType: Company,Ignore,Mellőz
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +86,SMS sent to following numbers: {0},Küldött SMS alábbi telefonszámokon: {0}
-apps/erpnext/erpnext/controllers/buying_controller.py +135,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Szállító Warehouse kötelező alvállalkozóknak vásárlási nyugta
+apps/erpnext/erpnext/controllers/buying_controller.py +126,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Szállító Warehouse kötelező alvállalkozóknak vásárlási nyugta
 DocType: Pricing Rule,Valid From,Érvényes innentől:
 DocType: Sales Invoice,Total Commission,Teljes Bizottság
 DocType: Pricing Rule,Sales Partner,Értékesítő partner
@@ -502,7 +478,7 @@
 DocType: Monthly Distribution,"**Monthly Distribution** helps you distribute your budget across months if you have seasonality in your business.
 
 To distribute a budget using this distribution, set this **Monthly Distribution** in the **Cost Center**","** A havi elosztási ** segít terjeszteni a költségvetési egész hónapban, ha a szezonalitás a te dolgod. Terjeszteni a költségvetési ezzel a forgalmazás, állítsa ezt ** havi megoszlása ​​** a ** Cost Center **"
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +183,No records found in the Invoice table,Nincs bejegyzés találat a számlatáblázat
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +130,No records found in the Invoice table,Nincs bejegyzés találat a számlatáblázat
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +20,Please select Company and Party Type first,"Kérjük, válasszon Társaság és a Party Type első"
 apps/erpnext/erpnext/config/accounts.py +84,Financial / accounting year.,Pénzügyi / számviteli év.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","Sajnáljuk, Serial Nos nem lehet összevonni,"
@@ -518,25 +494,25 @@
 DocType: Sales Order,Billing and Delivery Status,Számlázási és Delivery Status
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Törzsvásárlóid
 DocType: Leave Control Panel,Allocate,Osztja
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +16,Previous,Előző
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard_page.html +16,Previous,Előző
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +620,Sales Return,Eladás visszaküldése
 DocType: Production Planning Tool,Select Sales Orders from which you want to create Production Orders.,Válassza ki Vevőmegrendelés ahonnan szeretne létrehozni gyártási megrendeléseket.
 DocType: Item,Delivered by Supplier (Drop Ship),Megérkezés a Szállító (Drop Ship)
 apps/erpnext/erpnext/config/hr.py +120,Salary components.,Fizetés alkatrészeket.
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,Adatbázist a potenciális vásárlók.
+DocType: Authorization Rule,Customer or Item,Ügyfél vagy jogcím
 apps/erpnext/erpnext/config/crm.py +17,Customer database.,Vevői adatbázis.
 DocType: Quotation,Quotation To,Árajánlat az ő részére
 DocType: Lead,Middle Income,Közepes jövedelmű
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),Opening (Cr)
 apps/erpnext/erpnext/accounts/utils.py +193,Allocated amount can not be negative,Elkülönített összeg nem lehet negatív
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +123,Tumbling,Bukdácsoló
 DocType: Purchase Order Item,Billed Amt,Számlázott össz.
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,A logikai Warehouse amely ellen állomány bejegyzések történnek.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +92,Reference No & Reference Date is required for {0},Hivatkozási szám és Referencia dátuma szükséges {0}
 DocType: Event,Wednesday,Szerda
 DocType: Sales Invoice,Customer's Vendor,A Vevő szállítója
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +214,Production Order is Mandatory,Termelési rend Kötelező
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +139,Proposal Writing,Pályázatírás
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,Proposal Writing,Pályázatírás
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,Egy másik Sales Person {0} létezik az azonos dolgozói azonosító
 apps/erpnext/erpnext/stock/stock_ledger.py +336,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},Negatív Stock Error ({6}) jogcím {0} Warehouse {1} a {2} {3} {4} {5}
 DocType: Fiscal Year Company,Fiscal Year Company,Pénzügyi év társaság
@@ -559,7 +535,7 @@
 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.","Aztán árképzési szabályok szűrik ki alapul vevő, Customer Group, Territory, Szállító, Szállító Type, kampány, értékesítési partner stb"
 apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.py +179,Please install dropbox python module,Kérjük telepítse Dropbox python modul
 DocType: Employee,Passport Number,Útlevél száma
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +82,Manager,Menedzser
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Manager,Menedzser
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +494,From Purchase Receipt,A vásárlástól átvétele
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +219,Same item has been entered multiple times.,Ugyanazt a tételt már többször jelenik meg.
 DocType: SMS Settings,Receiver Parameter,Vevő Paraméter
@@ -567,10 +543,9 @@
 DocType: Sales Person,Sales Person Targets,Értékesítői célok
 apps/frappe/frappe/public/js/frappe/form/workflow.js +116,To,eddig
 apps/frappe/frappe/templates/base.html +145,Please enter email address,Emailcím megadása
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +35,End tube forming,Vége csőformázó
 DocType: Production Order Operation,In minutes,Perceken
 DocType: Issue,Resolution Date,Megoldás dátuma
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +635,Please set default Cash or Bank account in Mode of Payment {0},Kérjük alapértelmezett Készpénz vagy bankszámlára Fizetési mód {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +637,Please set default Cash or Bank account in Mode of Payment {0},Kérjük alapértelmezett Készpénz vagy bankszámlára Fizetési mód {0}
 DocType: Selling Settings,Customer Naming By,Vásárlói Elnevezése a
 apps/erpnext/erpnext/accounts/doctype/account/account.js +67,Convert to Group,Átalakítás Group
 DocType: Activity Cost,Activity Type,Tevékenység típusa
@@ -578,12 +553,12 @@
 DocType: Customer,Fixed Days,Fix Napok
 DocType: Sales Invoice,Packing List,Csomagolási lista
 apps/erpnext/erpnext/config/buying.py +28,Purchase Orders given to Suppliers.,Megrendelések beszállítóknak.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +43,Publishing,Kiadás
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +43,Publishing,Kiadás
 DocType: Activity Cost,Projects User,Projekt felhasználó
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Consumed,Fogyasztott
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +198,{0}: {1} not found in Invoice Details table,{0}: {1} nem található a Számla részletek táblázatban
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,{0}: {1} not found in Invoice Details table,{0}: {1} nem található a Számla részletek táblázatban
 DocType: Company,Round Off Cost Center,Fejezze ki Cost Center
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +208,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Karbantartás látogatás {0} törölni kell lemondása előtt ezt a Vevői rendelés
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +203,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Karbantartás látogatás {0} törölni kell lemondása előtt ezt a Vevői rendelés
 DocType: Material Request,Material Transfer,Anyag átrakása
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +56,Opening (Dr),Megnyitó (Dr.)
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},"Kiküldetés timestamp kell lennie, miután {0}"
@@ -595,7 +570,6 @@
 DocType: Pricing Rule,Sales Manager,Sales Manager
 apps/frappe/frappe/public/js/frappe/model/model.js +492,Rename,Átnevezés
 DocType: Journal Entry,Write Off Amount,Leírt összeg
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +52,Bending,Hajlítás
 apps/frappe/frappe/core/page/user_permissions/user_permissions.js +246,Allow User,Felhasználó engedélyezése
 DocType: Journal Entry,Bill No,Bill No
 DocType: Purchase Invoice,Quarterly,Negyedévenként
@@ -605,17 +579,16 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Please enter item details,"Kérjük, adja Gift"
 DocType: Purchase Receipt,Other Details,Egyéb részletek
 DocType: Account,Accounts,Könyvelés
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +67,Marketing,Marketing
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +65,Straight shearing,Egyenes nyíró
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +67,Marketing,Marketing
 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.,Hogy nyomon tétel az értékesítési és beszerzési dokumentumok alapján soros nos. Ez is használják a pálya garanciális részleteket a termék.
 DocType: Purchase Receipt Item Supplied,Current Stock,Raktárkészlet
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +99,Rejected Warehouse is mandatory against regected item,Elutasított Warehouse kötelező elleni regected elem
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +102,Rejected Warehouse is mandatory against regected item,Elutasított Warehouse kötelező elleni regected elem
 DocType: Account,Expenses Included In Valuation,Költségekből Értékelési
 DocType: Employee,Provide email id registered in company,Adjon email id bejegyzett cég
 DocType: Hub Settings,Seller City,Eladó város
 DocType: Email Digest,Next email will be sent on:,A következő emailt küldjük:
 DocType: Offer Letter Term,Offer Letter Term,Ajánlat Letter Term
-apps/erpnext/erpnext/stock/doctype/item/item.py +492,Item has variants.,Tételnek változatok.
+apps/erpnext/erpnext/stock/doctype/item/item.py +496,Item has variants.,Tételnek változatok.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Elem {0} nem található
 DocType: Bin,Stock Value,Készlet értéke
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,Fa Típus
@@ -624,10 +597,9 @@
 DocType: Material Request Item,Quantity and Warehouse,Mennyiség és raktár
 DocType: Sales Invoice,Commission Rate (%),Jutalék mértéke (%)
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +172,"Against Voucher Type must be one of Sales Order, Sales Invoice or Journal Entry","Ellen utalvány típus közül kell Sales Order, eladást igazoló számla vagy Naplókönyvelés"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +139,Biomachining,Biomachining
 apps/erpnext/erpnext/setup/utils.py +89,Unable to find exchange rate,Nem található árfolyama
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +7,Aerospace,Légtér
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +19,Welcome,Üdv
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +7,Aerospace,Légtér
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +40,Welcome,Üdv
 DocType: Journal Entry,Credit Card Entry,Hitelkártya Entry
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +18,Task Subject,Feladat Téma
 apps/erpnext/erpnext/config/stock.py +33,Goods received from Suppliers.,Áruk szállítóktól kapott.
@@ -650,19 +622,19 @@
 DocType: Employee,Cell Number,Mobilszám
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Elveszett
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +120,You can not enter current voucher in 'Against Journal Entry' column,"Ha nem tud belépni a jelenlegi utalványt ""Against Naplókönyvelés"" oszlopban"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +25,Energy,Energia
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,Energia
 DocType: Opportunity,Opportunity From,Lehetőség tőle
 apps/erpnext/erpnext/config/hr.py +33,Monthly salary statement.,Havi kimutatást.
 DocType: Item Group,Website Specifications,Honlapok
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +205,New Account,New Account
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +21,{0}: From {0} of type {1},{0}: A {0} típusú {1}
-apps/erpnext/erpnext/controllers/buying_controller.py +283,Row {0}: Conversion Factor is mandatory,Row {0}: Conversion Factor kötelező
+apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,Row {0}: Conversion Factor kötelező
 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.,Könyvelési tételek nem lehet neki felróni az ágakat. Bejegyzés elleni csoportjai nem engedélyezettek.
 DocType: ToDo,High,Magas
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +361,Cannot deactivate or cancel BOM as it is linked with other BOMs,Nem lehet kikapcsolni vagy törölni BOM mivel kapcsolódik más Darabjegyzékeket
 DocType: Opportunity,Maintenance,Karbantartás
 DocType: User,Male,Férfi
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +182,Purchase Receipt number required for Item {0},Vásárlási nyugta számát szükséges Elem {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +183,Purchase Receipt number required for Item {0},Vásárlási nyugta számát szükséges Elem {0}
 DocType: Item Attribute Value,Item Attribute Value,Elem Jellemző értéke
 apps/erpnext/erpnext/config/crm.py +64,Sales campaigns.,Értékesítési kampányok.
 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.
@@ -691,10 +663,9 @@
 DocType: Address,Personal,Személyes
 DocType: Expense Claim Detail,Expense Claim Type,Béremelési igény típusa
 DocType: Shopping Cart Settings,Default settings for Shopping Cart,Alapértelmezett beállítások Kosár
-apps/erpnext/erpnext/controllers/accounts_controller.py +324,"Journal Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Naplókönyvelés {0} kapcsolódik ellen Order {1}, akkor esetleg meg kell húzni, mint előre ezen a számlán."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +13,Biotechnology,Biotechnológia
+apps/erpnext/erpnext/controllers/accounts_controller.py +325,"Journal Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Naplókönyvelés {0} kapcsolódik ellen Order {1}, akkor esetleg meg kell húzni, mint előre ezen a számlán."
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +13,Biotechnology,Biotechnológia
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Office Maintenance Expenses,Irodai karbantartási költségek
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +53,Hemming,Hemming
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +66,Please enter Item first,"Kérjük, adja tétel első"
 DocType: Account,Liability,Felelősség
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +62,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,"Szentesített összege nem lehet nagyobb, mint igény összegéből sorában {0}."
@@ -707,10 +678,10 @@
 DocType: Company,Default Bank Account,Alapértelmezett bankszámlaszám
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +47,"To filter based on Party, select Party Type first","Kiszűrni alapuló párt, válasszuk a párt Írja első"
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},"&#39;Update Stock&#39; nem lehet ellenőrizni, mert az elemek nem szállítják keresztül {0}"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Nos,Nos
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Nos,Nos
 DocType: Item,Items with higher weightage will be shown higher,Tételek magasabb weightage jelenik meg a magasabb
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Bank Megbékélés részlete
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +627,My Invoices,Saját számlák
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +629,My Invoices,Saját számlák
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,Egyetlen dolgozó sem találtam
 DocType: Purchase Order,Stopped,Megállítva
 DocType: Item,If subcontracted to a vendor,Ha alvállalkozásba eladó
@@ -729,35 +700,33 @@
 DocType: Features Setup,"To enable ""Point of Sale"" features","Annak érdekében, hogy &quot;Point of Sale&quot; funkciók"
 DocType: Bin,Moving Average Rate,Mozgóátlag
 DocType: Production Planning Tool,Select Items,Válassza ki az elemeket
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,{0} against Bill {1} dated {2},{0} ellen Bill {1} ​​kelt {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +328,{0} against Bill {1} dated {2},{0} ellen Bill {1} ​​kelt {2}
 DocType: Comment,Reference Name,Hivatkozott tétel
 DocType: Maintenance Visit,Completion Status,Készültségi állapot
 DocType: Sales Invoice Item,Target Warehouse,Cél raktár
 DocType: Item,Allow over delivery or receipt upto this percent,Hagyjuk fölött szállítás vagy nyugtát Akár ezt a százalékos
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +49,Expected Delivery Date cannot be before Sales Order Date,A Várható szállítás dátuma nem lehet korábbi mint a rendelés dátuma
 DocType: Upload Attendance,Import Attendance,Import Nézőszám
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +17,All Item Groups,Minden tétel Csoportok
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +17,All Item Groups,Minden tétel Csoportok
 DocType: Process Payroll,Activity Log,Tevékenység
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +30,Net Profit / Loss,Nettó nyereség / veszteség
 apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,Automatikusan üzenet írása benyújtása tranzakciókat.
 DocType: Production Order,Item To Manufacture,Anyag gyártáshoz
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +16,Permanent mold casting,Állandó olvadéköntési
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} állapot {2}
 apps/erpnext/erpnext/config/learn.py +172,Purchase Order to Payment,Megrendelést Fizetés
 DocType: Sales Order Item,Projected Qty,Tervezett mennyiség
 DocType: Sales Invoice,Payment Due Date,Fizetési határidő
 DocType: Newsletter,Newsletter Manager,Hírlevél menedzser
-apps/erpnext/erpnext/stock/doctype/item/item.js +229,Item Variant {0} already exists with same attributes,Elem Variant {0} már létezik azonos tulajdonságú
+apps/erpnext/erpnext/stock/doctype/item/item.js +231,Item Variant {0} already exists with same attributes,Elem Variant {0} már létezik azonos tulajdonságú
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening',"""Nyitás"""
 DocType: Notification Control,Delivery Note Message,Szállítólevél szövege
 DocType: Expense Claim,Expenses,Költségek
 DocType: Item Variant Attribute,Item Variant Attribute,Elem Variant Képesség
 ,Purchase Receipt Trends,Vásárlási nyugta Trends
 DocType: Appraisal,Select template from which you want to get the Goals,"Válassza ki a sablont, amely azt szeretné, hogy a célok"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +77,Research & Development,Kutatás és fejlesztés
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Research & Development,Kutatás és fejlesztés
 ,Amount to Bill,Összeget számlázni
 DocType: Company,Registration Details,Regisztrációs adatok
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +75,Staking,Kockára
 DocType: Item,Re-Order Qty,Re-Order Mennyiség
 DocType: Leave Block List Date,Leave Block List Date,Hagyja Block List dátuma
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +25,Scheduled to send to {0},Ütemezett küldeni a {0}
@@ -768,18 +737,16 @@
 DocType: Sales Invoice Item,Stock Details,Stock Részletek
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Projekt érték
 apps/erpnext/erpnext/config/selling.py +304,Point-of-Sale,Az értékesítés helyén
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,Cannot carry forward {0},Nem lehet tovább folytatni {0}
 apps/erpnext/erpnext/accounts/doctype/account/account.py +91,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","Számlaegyenleg már Credit, akkor nem szabad beállítani ""egyensúlyt kell"", mint ""Tartozik"""
 DocType: Account,Balance must be,Egyensúlyt kell
 DocType: Hub Settings,Publish Pricing,Közzé Pricing
 DocType: Notification Control,Expense Claim Rejected Message,Elutasított igény indoklása
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +145,Nailing,Szegező
 ,Available Qty,Elérhető Mennyiség
 DocType: Purchase Taxes and Charges,On Previous Row Total,A korábbi Row Total
 DocType: Salary Slip,Working Days,Munkanap
 DocType: Serial No,Incoming Rate,Bejövő Rate
 DocType: Packing Slip,Gross Weight,Bruttó súly
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +410,The name of your company for which you are setting up this system.,"A vállalat nevét, amelyikhez e rendszer kiépítésekor."
+apps/erpnext/erpnext/public/js/setup_wizard.js +158,The name of your company for which you are setting up this system.,"A vállalat nevét, amelyikhez e rendszer kiépítésekor."
 DocType: HR Settings,Include holidays in Total no. of Working Days,Közé ünnepek Total no. munkanapok
 DocType: Job Applicant,Hold,Tart
 DocType: Employee,Date of Joining,Belépés dátuma
@@ -789,7 +756,6 @@
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +3,View Subscribers,Kilátás előfizetők
 DocType: Purchase Invoice Item,Purchase Receipt,Vásárlási nyugta
 ,Received Items To Be Billed,Kapott elemek is fizetnie kell
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +114,Abrasive blasting,Szemcseszórás
 DocType: Employee,Ms,Hölgy
 apps/erpnext/erpnext/config/accounts.py +148,Currency exchange rate master.,Devizaárfolyam mester.
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +253,Unable to find Time Slot in the next {0} days for Operation {1},Nem található a Time Slot a következő {0} nap Operation {1}
@@ -801,7 +767,7 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +209,Serial No {0} does not belong to Item {1},Serial No {0} nem tartozik Elem {1}
 DocType: Purchase Receipt Item Supplied,Required Qty,Kötelező Mennyiség
 DocType: Bank Reconciliation,Total Amount,Összesen
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +32,Internet Publishing,Internet Publishing
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,Internet Publishing
 DocType: Production Planning Tool,Production Orders,Gyártási rendelések
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +35,Balance Value,Balance Érték
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,Értékesítési árlista
@@ -812,7 +778,7 @@
 DocType: Supplier,Default Payable Accounts,Alapértelmezett fizetendő számlák
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,"Employee {0} nem aktív, vagy nem létezik"
 DocType: Features Setup,Item Barcode,Elem vonalkódja
-apps/erpnext/erpnext/stock/doctype/item/item.py +487,Item Variants {0} updated,Elem változatok {0} frissített
+apps/erpnext/erpnext/stock/doctype/item/item.py +491,Item Variants {0} updated,Elem változatok {0} frissített
 DocType: Quality Inspection Reading,Reading 6,Olvasás 6
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Vásárlást igazoló számlát Advance
 DocType: Address,Shop,Bolt
@@ -821,7 +787,7 @@
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,"Alapértelmezett Bank / Cash fiók automatikusan frissített POS számla, ha ezt a módot választotta."
 DocType: Employee,Permanent Address Is,Állandó lakhelye
 DocType: Production Order Operation,Operation completed for how many finished goods?,Művelet befejeződött hány késztermékek?
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +491,The Brand,A Brand
+apps/erpnext/erpnext/public/js/setup_wizard.js +237,The Brand,A Brand
 apps/erpnext/erpnext/controllers/status_updater.py +163,Allowance for over-{0} crossed for Item {1}.,Engedmény a túl- {0} keresztbe jogcím {1}.
 DocType: Employee,Exit Interview Details,Kilépési interjú részletei
 DocType: Item,Is Purchase Item,Beszerzendő tétel?
@@ -841,16 +807,16 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Indirect Income,Közvetett jövedelem
 DocType: Payment Tool,Set Payment Amount = Outstanding Amount,Állítsa fizetés összege = fennálló összeg
 DocType: Contact Us Settings,Address Line 1,1. cím sor
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Variance,Variancia
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +392,Company Name,Cég neve
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +53,Variance,Variancia
+,Company Name,Cég neve
 DocType: SMS Center,Total Message(s),Teljes üzenet (ek)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +515,Select Item for Transfer,Válassza ki a tétel a Transfer
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +538,Select Item for Transfer,Válassza ki a tétel a Transfer
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,Listájának megtekintéséhez minden segítséget videók
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,"Válassza ki a fiók vezetője a bank, ahol check rakódott le."
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,Lehetővé teszi a felhasználó szerkesztheti árjegyzéke Rate tranzakciókban
 DocType: Pricing Rule,Max Qty,Max Mennyiség
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +106,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,"Row {0}: Fizetés ellenében Sales / Megrendelés mindig fel kell tüntetni, előre"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +16,Chemical,Vegyi
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,Vegyi
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +693,All items have already been transferred for this Production Order.,"Összes példány már átadott, erre a gyártási utasítás."
 DocType: Process Payroll,Select Payroll Year and Month,"Válassza bérszámfejtés év, hónap"
 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""",Tovább a megfelelő csoportba (általában pénzeszközök felhasználása&gt; forgóeszközök&gt; bankszámlák és új fiók létrehozása (kattintva Add Child) típusú &quot;Bank&quot;
@@ -861,12 +827,12 @@
 DocType: Item,Inspection Criteria,Vizsgálati szempontok
 apps/erpnext/erpnext/config/accounts.py +101,Tree of finanial Cost Centers.,Tree of finanial költség központok.
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,TRANSFERED
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +492,Upload your letter head and logo. (you can edit them later).,Töltsd fel fejléces és logo. (Ezeket lehet szerkeszteni később).
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +156,White,Fehér
+apps/erpnext/erpnext/public/js/setup_wizard.js +238,Upload your letter head and logo. (you can edit them later).,Töltsd fel fejléces és logo. (Ezeket lehet szerkeszteni később).
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,White,Fehér
 DocType: SMS Center,All Lead (Open),Minden Lead (Open)
 DocType: Purchase Invoice,Get Advances Paid,Kifizetett előlegek átmásolása
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +362,Attach Your Picture,Arcképed csatolása
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Make ,Csinál
+apps/erpnext/erpnext/public/js/setup_wizard.js +112,Attach Your Picture,Arcképed csatolása
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +540,Make ,Csinál
 DocType: Journal Entry,Total Amount in Words,Teljes összeg kiírva
 DocType: Workflow State,Stop,Megáll
 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.,"Hiba történt. Az egyik valószínű oka az lehet, hogy nem mentette formájában. Kérjük, forduljon support@erpnext.com ha a probléma továbbra is fennáll."
@@ -875,14 +841,13 @@
 DocType: Lead,Next Contact Date,Következő megbeszélés dátuma
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,Nyitva Mennyiség
 DocType: Holiday List,Holiday List Name,Szabadnapok listájának neve
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +168,Stock Options,Stock Options
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +168,Stock Options,Stock Options
 DocType: Journal Entry Account,Expense Claim,Béremelési igény
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +181,Qty for {0},Mennyiség: {0}
 DocType: Leave Application,Leave Application,Szabadságok
 apps/erpnext/erpnext/config/hr.py +77,Leave Allocation Tool,Szabadság Lefoglaló Eszköz
 DocType: Leave Block List,Leave Block List Dates,Hagyja Block List dátuma
 DocType: Company,If Monthly Budget Exceeded (for expense account),Ha havi költségkeret túllépése (a költség számla)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +56,Trimming,Trimmelés
 DocType: Workstation,Net Hour Rate,Net órás sebesség
 DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,Beszerzési költség vásárlási nyugta
 DocType: Company,Default Terms,Alapértelmezett feltételek
@@ -890,10 +855,9 @@
 DocType: POS Profile,Cash/Bank Account,Cash / Bank Account
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,Removed items with no change in quantity or value.,Az eltávolított elemek változása nélkül mennyiséget vagy értéket.
 DocType: Delivery Note,Delivery To,Szállítás az
-apps/erpnext/erpnext/stock/doctype/item/item.py +509,Attribute table is mandatory,Attribútum tábla kötelező
+apps/erpnext/erpnext/stock/doctype/item/item.py +513,Attribute table is mandatory,Attribútum tábla kötelező
 DocType: Production Planning Tool,Get Sales Orders,Get Vevőmegrendelés
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} nem lehet negatív
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +103,Filing,Benyújtás
 apps/erpnext/erpnext/templates/form_grid/item_grid.html +72,Discount,Kedvezmény
 DocType: Features Setup,Purchase Discounts,Árengedmények
 DocType: Workstation,Wages,Munkabér
@@ -910,6 +874,7 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +112,You are the Expense Approver for this record. Please Update the 'Status' and Save,"Te vagy a költség Jóváhagyó erre a lemezre. Kérjük, frissítse az ""Állapot"", és mentése"
 DocType: Serial No,Creation Document No,Creation Document No
 DocType: Issue,Issue,Probléma
+apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account does not match with Company,Számla nem egyezik Társaság
 apps/erpnext/erpnext/config/stock.py +136,"Attributes for Item Variants. e.g Size, Color etc.","Attribútumait tétel változatok. pl méret, szín stb"
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +39,WIP Warehouse,WIP Warehouse
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +194,Serial No {0} is under maintenance contract upto {1},Serial No {0} jelenleg karbantartás alatt áll szerződésben max {1}
@@ -918,7 +883,7 @@
 DocType: Tax Rule,Shipping State,Szállítási állam
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,"Elemet kell hozzá az 'hogy elemeket vásárlása bevételek ""gombot"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,Az értékesítési költségek
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Buying,Normál vásárlás
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +120,Standard Buying,Normál vásárlás
 DocType: GL Entry,Against,Ellen
 DocType: Item,Default Selling Cost Center,Alapértelmezett Selling Cost Center
 DocType: Sales Partner,Implementation Partner,Kivitelező partner
@@ -939,29 +904,29 @@
 DocType: Time Log Batch,updated via Time Logs,keresztül frissíthető Time Naplók
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,Átlagéletkor
 DocType: Opportunity,Your sales person who will contact the customer in future,"Az értékesítési személy, aki felveszi a kapcsolatot Önnel a jövőben"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +588,List a few of your suppliers. They could be organizations or individuals.,Felsorolok néhány a szállítók. Ők lehetnek szervezetek vagy magánszemélyek.
+apps/erpnext/erpnext/public/js/setup_wizard.js +326,List a few of your suppliers. They could be organizations or individuals.,Felsorolok néhány a szállítók. Ők lehetnek szervezetek vagy magánszemélyek.
 DocType: Company,Default Currency,Alapértelmezett pénznem
 DocType: Contact,Enter designation of this Contact,Adja kijelölése ennek Kapcsolat
 DocType: Contact Us Settings,Address,Cím
 DocType: Expense Claim,From Employee,Dolgozótól
-apps/erpnext/erpnext/controllers/accounts_controller.py +338,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Figyelmeztetés: A rendszer nem ellenőrzi overbilling hiszen összeget tétel {0} {1} nulla
+apps/erpnext/erpnext/controllers/accounts_controller.py +339,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Figyelmeztetés: A rendszer nem ellenőrzi overbilling hiszen összeget tétel {0} {1} nulla
 DocType: Journal Entry,Make Difference Entry,Különbözeti bejegyzés generálása
 DocType: Upload Attendance,Attendance From Date,Jelenléti Dátum
 DocType: Appraisal Template Goal,Key Performance Area,Teljesítménymutató terület
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +54,Transportation,Szállítás
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +54,Transportation,Szállítás
 apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +67, and year: ,év:
 DocType: Email Digest,Annual Expense,Éves költség
 DocType: SMS Center,Total Characters,Összesen karakterek
-apps/erpnext/erpnext/controllers/buying_controller.py +139,Please select BOM in BOM field for Item {0},"Kérjük, válasszon BOM BOM területen jogcím {0}"
+apps/erpnext/erpnext/controllers/buying_controller.py +130,Please select BOM in BOM field for Item {0},"Kérjük, válasszon BOM BOM területen jogcím {0}"
 DocType: C-Form Invoice Detail,C-Form Invoice Detail,C-Form Számla részlete
 DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,Fizetési Megbékélés Számla
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +32,Contribution %,Hozzájárulás%
 DocType: Item,website page link,website oldal link
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +192,Let's prepare the system for first use.,Nézzük előkészíti a rendszer első használat.
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +242,Let's prepare the system for first use.,Nézzük előkészíti a rendszer első használat.
 DocType: Company,Company registration numbers for your reference. Tax numbers etc.,A cég regisztrált adatai. Pl.: adószám; stb.
 DocType: Sales Partner,Distributor,Nagykereskedő
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Kosár Szállítási szabály
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +214,Production Order {0} must be cancelled before cancelling this Sales Order,Gyártási rendelés {0} törölni kell lemondása előtt ezt a Vevői rendelés
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +209,Production Order {0} must be cancelled before cancelling this Sales Order,Gyártási rendelés {0} törölni kell lemondása előtt ezt a Vevői rendelés
 ,Ordered Items To Be Billed,Rendelt mennyiség számlázásra
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +24,From Range has to be less than To Range,Range kell lennie kisebb hatótávolsággal
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +21,Select Time Logs and Submit to create a new Sales Invoice.,Válassza ki a Time Naplók és elküldése hogy hozzon létre egy új Értékesítési számlák.
@@ -981,14 +946,13 @@
 DocType: Sales Invoice Advance,Sales Invoice Advance,Értékesítési számla előleg
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +398,Nothing to request,Nincs kérni
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date',"""A tényleges kezdési dátum"" nem lehet nagyobb, mint a ""tényleges záró dátum"""
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +75,Management,Vezetés
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +75,Management,Vezetés
 apps/erpnext/erpnext/config/projects.py +33,Types of activities for Time Sheets,Az Időtáblában szereplő tevékenységek típusai
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +14,Investment casting,Befektetési öntés
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +51,Either debit or credit amount is required for {0},Vagy terhelés és jóváírás összegét szükséges {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""","Ez lesz fűzve az Item Code a variáns. Például, ha a rövidítés ""SM"", és az elem kód ""T-shirt"", a cikk-kód a variáns lesz ""feliratú pólót-SM"""
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,"Nettó Pay (szavakban) lesz látható, ha menteni a fizetés csúszik."
 apps/frappe/frappe/core/doctype/user/user_list.js +12,Active,Aktív
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +154,Blue,Kék
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +154,Blue,Kék
 DocType: Purchase Invoice,Is Return,Van Return
 DocType: Price List Country,Price List Country,Árlista Ország
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +123,Further nodes can be only created under 'Group' type nodes,"További csomópontok csak alatt létrehozott ""csoport"" típusú csomópontot"
@@ -998,18 +962,16 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +22,POS Profile {0} already created for user: {1} and company {2},POS profil {0} már létrehozott felhasználói: {1} és a társaság {2}
 DocType: Purchase Order Item,UOM Conversion Factor,UOM konverziós tényező
 DocType: Stock Settings,Default Item Group,Alapértelmezett árucsoport
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +156,Laminated object manufacturing,Laminált tárgy gyártás
 apps/erpnext/erpnext/config/buying.py +13,Supplier database.,Beszállítói adatbázis.
 DocType: Account,Balance Sheet,Mérleg
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +561,Cost Center For Item with Item Code ',"Költség Center For elem Elem Code """
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +45,Stretch forming,Stretch képező
 DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,"Az értékesítési személy kap egy emlékeztető Ezen a napon a kapcsolatot az ügyféllel,"
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +210,"Further accounts can be made under Groups, but entries can be made against non-Groups","További számlák tehető alatt csoportjai, de bejegyzéseket lehet tenni ellene nem Csoportok"
 apps/erpnext/erpnext/config/hr.py +125,Tax and other salary deductions.,Adó és egyéb levonások fizetést.
 DocType: Lead,Lead,Célpont
 DocType: Email Digest,Payables,Kötelezettségek
 DocType: Account,Warehouse,Raktár
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +90,Row #{0}: Rejected Qty can not be entered in Purchase Return,Sor # {0}: Elutasítva Menny nem lehet beírni Vásárlási Return
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +93,Row #{0}: Rejected Qty can not be entered in Purchase Return,Sor # {0}: Elutasítva Menny nem lehet beírni Vásárlási Return
 ,Purchase Order Items To Be Billed,Megrendelés elemek is fizetnie kell
 DocType: Purchase Invoice Item,Net Rate,Nettó ár
 DocType: Purchase Invoice Item,Purchase Invoice Item,Vásárlási számla tétel
@@ -1024,13 +986,13 @@
 DocType: Global Defaults,Current Fiscal Year,Jelenlegi pénzügyi év
 DocType: Global Defaults,Disable Rounded Total,Kerekített összesen elrejtése
 DocType: Lead,Call,Hívás
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +384,'Entries' cannot be empty,"""Bejegyzések"" nem lehet üres"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +386,'Entries' cannot be empty,"""Bejegyzések"" nem lehet üres"
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},A {0} duplikált sor azonos ezzel: {1}
 ,Trial Balance,Trial Balance
 apps/erpnext/erpnext/config/hr.py +205,Setting up Employees,Beállítása Alkalmazottak
 apps/erpnext/erpnext/public/js/feature_setup.js +220,"Grid ""","Grid """
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +150,Please select prefix first,"Kérjük, válasszon prefix első"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +138,Research,Kutatás
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +138,Research,Kutatás
 DocType: Maintenance Visit Purpose,Work Done,Kész a munka
 apps/erpnext/erpnext/controllers/item_variant.py +25,Please specify at least one attribute in the Attributes table,Kérem adjon meg legalább egy attribútum a tulajdonságok táblázatban
 DocType: Contact,User ID,Felhasználó ID
@@ -1038,10 +1000,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +57,View Ledger,Kilátás Ledger
 DocType: File,Lft,Lft
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Legkorábbi
-apps/erpnext/erpnext/stock/doctype/item/item.py +394,"An Item Group exists with same name, please change the item name or rename the item group","Egy tétel Group létezik azonos nevű, kérjük, változtassa meg az elem nevét, vagy nevezze át a tétel-csoportban"
+apps/erpnext/erpnext/stock/doctype/item/item.py +398,"An Item Group exists with same name, please change the item name or rename the item group","Egy tétel Group létezik azonos nevű, kérjük, változtassa meg az elem nevét, vagy nevezze át a tétel-csoportban"
 DocType: Communication,Delivery Status,Szállítás állapota
 DocType: Production Order,Manufacture against Sales Order,Gyártás ellen Vevői
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +517,Rest Of The World,A világ többi része
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +455,Rest Of The World,A világ többi része
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,A tétel {0} nem lehet Batch
 ,Budget Variance Report,Költségkeret Variance jelentés
 DocType: Salary Slip,Gross Pay,Bruttó fizetés
@@ -1052,13 +1014,11 @@
 DocType: BOM Item,Item Description,Az anyag leírása
 DocType: Payment Tool,Payment Mode,Fizetési mód
 DocType: Purchase Invoice,Is Recurring,Ismétlődő
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +154,Direct metal laser sintering,Közvetlen fém lézeres szinterezés
 DocType: Purchase Order,Supplied Items,A mellékelt tartozékok
 DocType: Production Order,Qty To Manufacture,Menny. gyártáshoz
 DocType: Buying Settings,Maintain same rate throughout purchase cycle,Fenntartani azonos ütemben egész vásárlási ciklus
 DocType: Opportunity Item,Opportunity Item,Lehetőség tétel
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +61,Temporary Opening,Ideiglenes megnyitását
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +41,Cryorolling,Cryorolling
 ,Employee Leave Balance,Munkavállalói Leave Balance
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +128,Balance for Account {0} must always be {1},Mérlegek Account {0} mindig legyen {1}
 DocType: Address,Address Type,Cím típusa
@@ -1074,23 +1034,23 @@
 DocType: Journal Entry,Get Outstanding Invoices,Get kiváló számlák
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,Vevői {0} nem érvényes
 apps/erpnext/erpnext/setup/doctype/company/company.py +172,"Sorry, companies cannot be merged","Sajnáljuk, a vállalatok nem lehet összevonni,"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +145,Small,Kis
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Small,Kis
 DocType: Employee,Employee Number,Munkavállalói száma
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},Case szám (ok) már használatban van. Próbálja a Case {0}
 ,Invoiced Amount (Exculsive Tax),Számlázott összeg (Exculsive Tax)
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,2. pont
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +59,Account head {0} created,Account fejét {0} létre
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +153,Green,Zöld
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Green,Zöld
 DocType: Item,Auto re-order,Auto újra érdekében
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +57,Total Achieved,Összesen Elért
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +59,Total Achieved,Összesen Elért
 DocType: Employee,Place of Issue,Probléma helye
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +59,Contract,Szerződés
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Contract,Szerződés
 DocType: Report,Disabled,Tiltva
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +490,UOM coversion factor required for UOM: {0} in Item: {1},UOM coversion tényező szükséges UOM: {0} Cikk: {1}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +83,Indirect Expenses,Közvetett költségek
 apps/erpnext/erpnext/controllers/selling_controller.py +163,Row {0}: Qty is mandatory,Row {0}: Menny kötelező
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +8,Agriculture,Mezőgazdaság
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +611,Your Products or Services,A termékek vagy szolgáltatások
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,Mezőgazdaság
+apps/erpnext/erpnext/public/js/setup_wizard.js +347,Your Products or Services,A termékek vagy szolgáltatások
 DocType: Mode of Payment,Mode of Payment,Fizetési mód
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,"Ez egy gyökér tétel-csoportban, és nem lehet szerkeszteni."
 DocType: Journal Entry Account,Purchase Order,Megrendelés
@@ -1102,7 +1062,7 @@
 DocType: Serial No,Serial No Details,Sorozatszám adatai
 DocType: Purchase Invoice Item,Item Tax Rate,Az anyag adójának mértéke
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +113,"For {0}, only credit accounts can be linked against another debit entry","{0}, csak jóváírásokat lehet kapcsolni a másik ellen terheléssel"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Delivery Note {0} is not submitted,Szállítólevélen {0} nem nyújtják be
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +470,Delivery Note {0} is not submitted,Szállítólevélen {0} nem nyújtják be
 apps/erpnext/erpnext/stock/get_item_details.py +136,Item {0} must be a Sub-contracted Item,Elem {0} kell egy Alvállalkozásban Elem
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,Capital Felszereltség
 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.","Árképzési szabály először alapján kiválasztott ""Apply"" mezőben, ami lehet pont, pont-csoport vagy a márka."
@@ -1112,7 +1072,7 @@
 DocType: Appraisal Goal,Goal,Cél
 DocType: Sales Invoice Item,Edit Description,Leírás szerkesztése
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +318,Expected Delivery Date is lesser than Planned Start Date.,"Várható szállítási határidő kisebb, mint a tervezett kezdési dátum."
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +579,For Supplier,A Szállító
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +602,For Supplier,A Szállító
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,Beállítás Account Type segít kiválasztani ezt a számlát a tranzakció.
 DocType: Purchase Invoice,Grand Total (Company Currency),Mindösszesen (Társaság Currency)
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,Összes kimenő
@@ -1138,10 +1098,10 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +74,"Total {0} for all items is zero, may you should change 'Distribute Charges Based On'","Összesen {0} minden példány nulla, akkor meg kell változtatni &quot;Osszuk alapuló díjak&quot;"
 DocType: Purchase Invoice,Taxes and Charges Calculation,Adók és költségek számítása
 DocType: BOM Operation,Workstation,Munkaállomás
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +112,Hardware,Hardver
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +112,Hardware,Hardver
 DocType: Attendance,HR Manager,HR menedzser
 apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,"Kérjük, válasszon egy cég"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +50,Privilege Leave,Privilege Leave
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +50,Privilege Leave,Privilege Leave
 DocType: Purchase Invoice,Supplier Invoice Date,Beszállítói számla dátuma
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +79,You need to enable Shopping Cart,Akkor engedélyezze a kosárba
 apps/frappe/frappe/public/js/frappe/form/grid_body.html +6,No Data,Nincs adat
@@ -1154,7 +1114,7 @@
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +81,Overlapping conditions found between:,Átfedő feltételei között található:
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +168,Against Journal Entry {0} is already adjusted against some other voucher,Ellen Naplókönyvelés {0} már értékével szemben néhány más voucher
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +68,Total Order Value,Teljes megrendelési érték
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +38,Food,Élelmiszer
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +38,Food,Élelmiszer
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Ageing tartomány 3
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +139,You can make a time log only against a submitted production order,"Tudod, hogy egy időben csak naplózás ellen benyújtott produkciós sorrendben"
 DocType: Maintenance Schedule Item,No of Visits,Nem a látogatások
@@ -1174,6 +1134,7 @@
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,View Offer Letter,Ajánlat megtekintése Letter
 DocType: Communication,Communication,Kommunikáció
 DocType: Item,Is Service Item,A szolgáltatás Elem
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +81,Application period cannot be outside leave allocation period,Jelentkezési határidő nem lehet kívülről szabadság kiosztási időszak
 DocType: Activity Cost,Projects,Projektek
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +31,Please select Fiscal Year,"Kérjük, válasszon pénzügyi év"
 apps/erpnext/erpnext/controllers/buying_controller.py +23,From {0} | {1} {2},Re {0} | {1} {2}
@@ -1192,7 +1153,7 @@
 DocType: Item,Maintain Stock,Fenntartani Stock
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +213,Stock Entries already created for Production Order ,Stock bejegyzés már létrehozott termelési rendelés
 DocType: Leave Control Panel,Leave blank if considered for all designations,"Hagyja üresen, ha figyelembe valamennyi megjelölés"
-apps/erpnext/erpnext/controllers/accounts_controller.py +499,Charge of type 'Actual' in row {0} cannot be included in Item Rate,"Charge típusú ""közvetlen"" sorában {0} nem lehet jogcím tartalmazza Rate"
+apps/erpnext/erpnext/controllers/accounts_controller.py +500,Charge of type 'Actual' in row {0} cannot be included in Item Rate,"Charge típusú ""közvetlen"" sorában {0} nem lehet jogcím tartalmazza Rate"
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,Max: {0},Max: {0}
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +16,From Datetime,Re Datetime
 DocType: Email Digest,For Company,A Társaságnak
@@ -1202,7 +1163,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +50,Chart of Accounts,Számlatükör
 DocType: Material Request,Terms and Conditions Content,Általános szerződési feltételek tartalma
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +471,cannot be greater than 100,"nem lehet nagyobb, mint 100"
-apps/erpnext/erpnext/stock/doctype/item/item.py +546,Item {0} is not a stock Item,Elem {0} nem Stock tétel
+apps/erpnext/erpnext/stock/doctype/item/item.py +550,Item {0} is not a stock Item,Elem {0} nem Stock tétel
 DocType: Maintenance Visit,Unscheduled,Nem tervezett
 DocType: Employee,Owned,Tulaj
 DocType: Salary Slip Deduction,Depends on Leave Without Pay,"Attól függ, fizetés nélküli szabadságon"
@@ -1216,30 +1177,28 @@
 DocType: HR Settings,Employee Settings,Munkavállalói beállítások
 ,Batch-Wise Balance History,Szakaszos Balance History
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +72,To Do List,Tennivalók listája
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +63,Apprentice,Ipari tanuló
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Apprentice,Ipari tanuló
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +99,Negative Quantity is not allowed,Negatív mennyiség nem megengedett
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
 Used for Taxes and Charges","Adó részletesen táblázatban letöltésre a tételt mester, mint egy húr, és tárolja ezen a területen. Használt adók és illetékek"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +61,Lancing,Lancing
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +151,Employee cannot report to himself.,Munkavállaló nem jelent magának.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Ha a számla zárolásra került, a bejegyzések szabad korlátozni a felhasználók."
 DocType: Email Digest,Bank Balance,Bank mérleg
-apps/erpnext/erpnext/controllers/accounts_controller.py +435,Accounting Entry for {0}: {1} can only be made in currency: {2},Számviteli könyvelése {0}: {1} csak akkor lehet elvégezni a pénznem: {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +436,Accounting Entry for {0}: {1} can only be made in currency: {2},Számviteli könyvelése {0}: {1} csak akkor lehet elvégezni a pénznem: {2}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +38,No active Salary Structure found for employee {0} and the month,Nem aktív bérszerkeztet talált munkavállalói {0} és a hónap
 DocType: Job Opening,"Job profile, qualifications required etc.","Munkakör, szükséges képesítések stb"
 DocType: Journal Entry Account,Account Balance,Számla egyenleg
 apps/erpnext/erpnext/config/accounts.py +112,Tax Rule for transactions.,Adó szabály tranzakciók.
 DocType: Rename Tool,Type of document to rename.,Dokumentum típusa átnevezni.
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +630,We buy this Item,Vásárolunk ezt a tárgyat
+apps/erpnext/erpnext/public/js/setup_wizard.js +366,We buy this Item,Vásárolunk ezt a tárgyat
 DocType: Address,Billing,Számlázás
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +77,Flanging,Flanging
 DocType: Bulk Email,Not Sent,Nincs elküldve
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +73,Explosive forming,Robbanásveszélyes képező
 DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),Összesen adók és illetékek (Társaság Currency)
 DocType: Shipping Rule,Shipping Account,Szállítási számla
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +43,Scheduled to send to {0} recipients,Ütemezett küldeni a {0} címzettek
 DocType: Quality Inspection,Readings,Olvasmányok
 DocType: Stock Entry,Total Additional Costs,Összesen További költségek
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Sub Assemblies,Részegységek
+apps/erpnext/erpnext/public/js/setup_wizard.js +359,Sub Assemblies,Részegységek
 DocType: Shipping Rule Condition,To Value,Hogy Érték
 DocType: Supplier,Stock Manager,Stock menedzser
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +143,Source warehouse is mandatory for row {0},Forrás raktárban kötelező sorban {0}
@@ -1249,44 +1208,42 @@
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Az importálás nem sikerült!
 apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,Nem címre hozzá még.
 DocType: Workstation Working Hour,Workstation Working Hour,Munkaállomás munkaideje
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +83,Analyst,Elemző
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +202,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},"Row {0}: elkülönített összege {1} kisebbnek kell lennie, vagy egyenlő JV összeget {2}"
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Analyst,Elemző
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +149,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},"Row {0}: elkülönített összege {1} kisebbnek kell lennie, vagy egyenlő JV összeget {2}"
 DocType: Item,Inventory,Leltár
 DocType: Features Setup,"To enable ""Point of Sale"" view","Annak érdekében, hogy &quot;Point of Sale&quot; nézet"
 apps/erpnext/erpnext/public/js/pos/pos.js +402,Payment cannot be made for empty cart,Fizetés nem lehet üres Kosár
 DocType: Item,Sales Details,Értékesítés részletei
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +149,Pinning,Pinning
 DocType: Opportunity,With Items,A tételek
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,A Menny
 DocType: Notification Control,Expense Claim Rejected,Béremelési igény elutasítva
 DocType: Sales Invoice,"The date on which next invoice will be generated. It is generated on submit.
 ","Az időpont, amikor a következő számlán kerül előállításra. Úgy keletkezett benyújtania."
 DocType: Item Attribute,Item Attribute,Elem Attribútum
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +105,Government,Kormány
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Government,Kormány
 apps/erpnext/erpnext/config/stock.py +268,Item Variants,Elem változatok
 DocType: Company,Services,Szolgáltatások
 apps/erpnext/erpnext/accounts/report/financial_statements.py +147,Total ({0}),Összesen ({0})
 DocType: Cost Center,Parent Cost Center,Szülő Cost Center
 DocType: Sales Invoice,Source,Forrás
 DocType: Leave Type,Is Leave Without Pay,A fizetés nélküli szabadságon
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +186,No records found in the Payment table,Nincs bejegyzés találat a fizetési táblázat
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +405,Financial Year Start Date,Pénzügyi év kezdő dátuma
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +133,No records found in the Payment table,Nincs bejegyzés találat a fizetési táblázat
+apps/erpnext/erpnext/public/js/setup_wizard.js +153,Financial Year Start Date,Pénzügyi év kezdő dátuma
 DocType: Employee External Work History,Total Experience,Összesen Experience
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +100,Countersinking,Süllyesztés
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +271,Packing Slip(s) cancelled,Csomagjegy(ek) törölve
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +276,Packing Slip(s) cancelled,Csomagjegy(ek) törölve
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,Freight Forwarding és díjak
 DocType: Material Request Item,Sales Order No,Sales Order No
 DocType: Item Group,Item Group Name,Anyagcsoport neve
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +50,Taken,Taken
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,Taken
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +66,Transfer Materials for Manufacture,Transfer anyagok gyártása
 DocType: Pricing Rule,For Price List,Ezen árlistán
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +27,Executive Search,Executive Search
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,Executive Search
 apps/erpnext/erpnext/stock/stock_ledger.py +405,"Purchase rate for item: {0} not found, which is required to book accounting entry (expense). Please mention item price against a buying price list.","Vételi árfolyamon a tétel: {0} nem található, ami szükséges könyv könyvelési tételt (ráfordítás). Kérjük beszélve tétel ára ellen felvásárlási árlistát."
 DocType: Maintenance Schedule,Schedules,Menetrendek
 DocType: Purchase Invoice Item,Net Amount,Nettó Összege
 DocType: Purchase Order Item Supplied,BOM Detail No,Anyagjegyzék részlet száma
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),További kedvezmény összege (Társaság Currency)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +537,Error: {0} > {1},Hiba: {0}> {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +541,Error: {0} > {1},Hiba: {0}> {1}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,"Kérjük, hozzon létre új fiókot a számlatükör."
 DocType: Maintenance Visit,Maintenance Visit,Karbantartási látogatás
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer > Customer Group > Territory,Vásárló > Vásárlói csoport > Terület
@@ -1297,7 +1254,6 @@
 DocType: Event,Tuesday,Kedd
 DocType: Leave Block List,Block Holidays on important days.,Blokk Holidays fontos napokon.
 ,Accounts Receivable Summary,VEVÔKÖVETELÉSEK Összefoglaló
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +43,Leaves for type {0} already allocated for Employee {1} for period {2} - {3},Elhagyja a {0} típusú már elkülönített Employee {1} időszakra {2} - {3}
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +187,Please set User ID field in an Employee record to set Employee Role,"Kérjük, állítsa User ID mező alkalmazotti rekordot beállítani Employee szerepe"
 DocType: UOM,UOM Name,Mértékegység neve
 DocType: Top Bar Item,Target,Cél
@@ -1309,15 +1265,14 @@
 DocType: ToDo,Due Date,Határidő
 DocType: Sales Invoice Item,Brand Name,Márkanév
 DocType: Purchase Receipt,Transporter Details,Transporter Részletek
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Box,Doboz
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +389,The Organization,A Szervezet
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Box,Doboz
+apps/erpnext/erpnext/public/js/setup_wizard.js +137,The Organization,A Szervezet
 DocType: Monthly Distribution,Monthly Distribution,Havi Distribution
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,"Vevő lista üres. Kérjük, hozzon létre Receiver listája"
 DocType: Production Plan Sales Order,Production Plan Sales Order,Gyártási terv Vevői
 DocType: Sales Partner,Sales Partner Target,Értékesítő partner célja
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},Számviteli könyvelése {0} csak akkor lehet elvégezni a pénznem: {1}
 DocType: Pricing Rule,Pricing Rule,Árképzési szabály
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +58,Notching,Kivágó
 apps/erpnext/erpnext/config/learn.py +167,Material Request to Purchase Order,Anyag Kérelem Megrendelés
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +74,Row # {0}: Returned Item {1} does not exists in {2} {3},Sor # {0}: Visszaküldött pont {1} nem létezik {2} {3}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,Bankszámlák
@@ -1334,20 +1289,19 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Amounts not reflected in bank,Összegek nem tükröződik bank
 DocType: Quality Inspection Reading,Reading 4,Reading 4
 apps/erpnext/erpnext/config/hr.py +23,Claims for company expense.,Követelések cég költségén.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +8,Centrifugal casting,Centrifugális öntési
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +119,Magnetic field-assisted finishing,Mágneses mező támogatott befejező
 DocType: Company,Default Holiday List,Alapértelmezett távolléti lista
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +165,Stock Liabilities,Stock Források
 DocType: Purchase Receipt,Supplier Warehouse,Beszállító raktára
 DocType: Opportunity,Contact Mobile No,Kapcsolattartó mobilszáma
 DocType: Production Planning Tool,Select Sales Orders,Válassza ki Vevőmegrendelés
 ,Material Requests for which Supplier Quotations are not created,"Anyag kérelmek, amelyek esetében Szállító idézetek nem jönnek létre"
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +117,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,"A nap (ok) on, amelyre pályázik a szabadság szabadság. Nem kell alkalmazni a szabadság."
 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.,"Hogy nyomon elemeket használja vonalkód. Ön képes lesz arra, hogy belépjen elemek szállítólevél és Értékesítési számlák beolvasásával vonalkód pont."
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +477,Mark as Delivered,Mark kézbesítettnek
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +497,Mark as Delivered,Mark kézbesítettnek
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +34,Make Quotation,Tedd Idézet
 DocType: Dependent Task,Dependent Task,Függő Task
-apps/erpnext/erpnext/stock/doctype/item/item.py +306,Conversion factor for default Unit of Measure must be 1 in row {0},Konverziós tényező alapértelmezett mértékegység legyen 1 sorban {0}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,Leave of type {0} cannot be longer than {1},"Szabadság típusú {0} nem lehet hosszabb, mint {1}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +310,Conversion factor for default Unit of Measure must be 1 in row {0},Konverziós tényező alapértelmezett mértékegység legyen 1 sorban {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +155,Leave of type {0} cannot be longer than {1},"Szabadság típusú {0} nem lehet hosszabb, mint {1}"
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Próbálja Tervezési tevékenység X nappal előre.
 DocType: HR Settings,Stop Birthday Reminders,Megállás Születésnapi emlékeztetők
 DocType: SMS Center,Receiver List,Vevő lista
@@ -1355,15 +1309,14 @@
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Elfogyasztott
 apps/erpnext/erpnext/public/js/pos/pos.js +491,{0} View,{0} megtekintése
 DocType: Salary Structure Deduction,Salary Structure Deduction,Bérszerkeztet levonása
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +158,Selective laser sintering,Szelektív lézeres szinterezés
-apps/erpnext/erpnext/stock/doctype/item/item.py +301,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Mértékegység {0} adta meg többször a konverziós tényező táblázat
+apps/erpnext/erpnext/stock/doctype/item/item.py +305,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Mértékegység {0} adta meg többször a konverziós tényező táblázat
 apps/frappe/frappe/core/page/data_import_tool/data_import_tool.js +108,Import Successful!,Import sikeres!
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Költsége Kiadott elemek
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +185,Quantity must not be more than {0},"Mennyiség nem lehet több, mint {0}"
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +41,Age (Days),Életkor (nap)
 DocType: Quotation Item,Quotation Item,Árajánlat tétele
 DocType: Account,Account Name,Számla név
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +41,From Date cannot be greater than To Date,"Dátum nem lehet nagyobb, mint dátuma"
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +34,From Date cannot be greater than To Date,"Dátum nem lehet nagyobb, mint dátuma"
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +194,Serial No {0} quantity {1} cannot be a fraction,Serial No {0} {1} mennyiséget nem lehet egy töredéke
 apps/erpnext/erpnext/config/buying.py +59,Supplier Type master.,Szállító Type mester.
 DocType: Purchase Order Item,Supplier Part Number,Szállító rész száma
@@ -1372,14 +1325,14 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +247,{0} {1} is cancelled or stopped,{0} {1} törlik vagy megállt
 DocType: Accounts Settings,Credit Controller,Credit Controller
 DocType: Delivery Note,Vehicle Dispatch Date,A jármű útnak indításának ideje
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +197,Purchase Receipt {0} is not submitted,Vásárlási nyugta {0} nem nyújtják be
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +198,Purchase Receipt {0} is not submitted,Vásárlási nyugta {0} nem nyújtják be
 DocType: Company,Default Payable Account,Alapértelmezett fizetendő számla
 apps/erpnext/erpnext/config/website.py +13,"Settings for online shopping cart such as shipping rules, price list etc.","A beállítások Online bevásárlókosár mint a hajózás szabályait, árlistát stb"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +660,Setup Complete,Telepítés befejezve
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +124,Setup Complete,Telepítés befejezve
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +65,{0}% Billed,{0}% számlázott
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +17,Reserved Qty,Reserved Mennyiség
 DocType: Party Account,Party Account,Párt Account
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +74,Human Resources,Emberi erőforrások
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +74,Human Resources,Emberi erőforrások
 DocType: Lead,Upper Income,Felső jövedelmi
 DocType: Journal Entry Account,Debit in Company Currency,Tartozik a Társaság Valuta
 apps/erpnext/erpnext/support/doctype/issue/issue.py +58,My Issues,Saját kérdések
@@ -1388,11 +1341,9 @@
 DocType: Company,Default Values,Alapértelmezett értékek
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +236,Row {0}: Payment amount can not be negative,Row {0}: Fizetés összege nem lehet negatív
 DocType: Expense Claim,Total Amount Reimbursed,Megtérített teljes összeg
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +152,Press fitting,Présidomba
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +64,Against Supplier Invoice {0} dated {1},Ellen Szállító Számla {0} dátuma {1}
 DocType: Customer,Default Price List,Alapértelmezett árjegyzék
 DocType: Payment Reconciliation,Payments,Kifizetések
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +24,Hot isostatic pressing,Izosztatikus megnyomásával
 DocType: ToDo,Medium,Közepes
 DocType: Budget Detail,Budget Allocated,Lefoglalt költségkeret
 DocType: Journal Entry,Entry Type,Bejegyzés típusa
@@ -1405,9 +1356,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +56,None of the items have any change in quantity or value.,"Egyik példány bármilyen változás mennyisége, illetve értéke."
 DocType: Warranty Claim,Warranty Claim,Jótállási igény
 ,Lead Details,Célpont adatai
-DocType: Authorization Rule,Approving User,Jóváhagyó Felhasználó
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +37,Forging,Kovácsolás
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +126,Plating,Galvanizálás
 DocType: Purchase Invoice,End date of current invoice's period,A befejezés dátuma az aktuális számla időszaka
 DocType: Pricing Rule,Applicable For,Alkalmazható
 DocType: Bank Reconciliation,From Date,Dátumtól
@@ -1429,31 +1377,29 @@
 DocType: Sales Invoice,Paid Amount (Company Currency),Befizetett összeg (Társaság Currency)
 DocType: Purchase Invoice,Additional Discount,További kedvezmény
 DocType: Selling Settings,Selling Settings,Értékesítés beállításai
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +39,Online Auctions,Online aukciók
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,Online aukciók
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +94,Please specify either Quantity or Valuation Rate or both,"Kérjük, adja meg sem mennyiség vagy Értékelési Rate, vagy mindkettő"
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +50,"Company, Month and Fiscal Year is mandatory","Cég, hónap és költségvetési évben kötelező"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Marketing Expenses,Marketing költségek
 ,Item Shortage Report,Elem Hiány jelentés
-apps/erpnext/erpnext/stock/doctype/item/item.js +183,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Súly említik, \ nKérlek beszélve ""Súly UOM"" túl"
+apps/erpnext/erpnext/stock/doctype/item/item.js +185,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Súly említik, \ nKérlek beszélve ""Súly UOM"" túl"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,Anyaga Request használják e Stock Entry
 apps/erpnext/erpnext/config/support.py +43,Single unit of an Item.,Egy darab anyag.
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +212,Time Log Batch {0} must be 'Submitted',"A(z) {0} időnapló gyűjtőt be kell ""Küldeni"""
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,Tedd számviteli könyvelése minden Készletmozgás
 DocType: Leave Allocation,Total Leaves Allocated,Összes lekötött szabadság
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +384,Warehouse required at Row No {0},Warehouse szükség Row {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +386,Warehouse required at Row No {0},Warehouse szükség Row {0}
 DocType: Employee,Date Of Retirement,A nyugdíjazás
 DocType: Upload Attendance,Get Template,Get Template
 DocType: Address,Postal,Postai
 DocType: Item,Weightage,Súlyozás
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +159,Mining,Bányászati
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +17,Resin casting,Gyanta casting
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"Az ügyfélszolgálati csoport létezik azonos nevű kérjük, változtassa meg az Ügyfél nevét vagy nevezze át a Vásárlói csoport"
 apps/erpnext/erpnext/public/js/pos/pos.js +147,Please select {0} first.,"Kérjük, válassza ki a {0} először."
 apps/erpnext/erpnext/templates/pages/order.html +57,text {0},text {0}
 DocType: Territory,Parent Territory,Szülő Terület
 DocType: Quality Inspection Reading,Reading 2,Reading 2
 DocType: Stock Entry,Material Receipt,Anyag bevételezése
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +622,Products,Termékek
+apps/erpnext/erpnext/public/js/setup_wizard.js +358,Products,Termékek
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +47,Party Type and Party is required for Receivable / Payable account {0},Párt típusa és fél köteles a követelések / kötelezettségek figyelembe {0}
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.","Ha ennek az elemnek a változatokat, akkor nem lehet kiválasztani a vevői rendelések stb"
 DocType: Lead,Next Contact By,Next Kapcsolat
@@ -1463,13 +1409,13 @@
 DocType: Purchase Invoice,Notification Email Address,Értesítendő emailcímek
 DocType: Payment Tool,Find Invoices to Match,Számlák keresése egyezésig
 ,Item-wise Sales Register,Elem-bölcs Sales Regisztráció
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +399,"e.g. ""XYZ National Bank""","pl. ""XYZ Nemzeti Bank"""
+apps/erpnext/erpnext/public/js/setup_wizard.js +147,"e.g. ""XYZ National Bank""","pl. ""XYZ Nemzeti Bank"""
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,Ez adó az árban Basic Rate?
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +57,Total Target,Összes célpont
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Target,Összes célpont
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.js +22,Shopping Cart is enabled,Kosár engedélyezve
 DocType: Job Applicant,Applicant for a Job,Kérelmező számára a Job
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +173,No Production Orders created,Nem gyártási megrendelések létre
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +131,Salary Slip of employee {0} already created for this month,Fizetés Slip munkavállalói {0} már létrehozott ebben a hónapban
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +140,Salary Slip of employee {0} already created for this month,Fizetés Slip munkavállalói {0} már létrehozott ebben a hónapban
 DocType: Stock Reconciliation,Reconciliation JSON,Megbékélés JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,"Túl sok oszlop. Exportálja a jelentést, és nyomtassa ki táblázatkezelő program segítségével."
 DocType: Sales Invoice Item,Batch No,Kötegszám
@@ -1479,14 +1425,14 @@
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +13,Variant,Variáns
 apps/frappe/frappe/public/js/frappe/form/toolbar.js +165,New {0},Új {0}
 DocType: Naming Series,Set prefix for numbering series on your transactions,Előtagja a számozás sorozat a tranzakciók
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +169,Stopped order cannot be cancelled. Unstop to cancel.,Megállt érdekében nem lehet törölni. Kidugaszol törölni.
-apps/erpnext/erpnext/stock/doctype/item/item.py +323,Default BOM ({0}) must be active for this item or its template,"Alapértelmezett BOM ({0}) aktívnak kell lennie ehhez a termékhez, vagy a sablon"
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +164,Stopped order cannot be cancelled. Unstop to cancel.,Megállt érdekében nem lehet törölni. Kidugaszol törölni.
+apps/erpnext/erpnext/stock/doctype/item/item.py +327,Default BOM ({0}) must be active for this item or its template,"Alapértelmezett BOM ({0}) aktívnak kell lennie ehhez a termékhez, vagy a sablon"
 DocType: Employee,Leave Encashed?,Hagyja beváltásának módjáról?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Lehetőség A mező kitöltése kötelező
 DocType: Item,Variants,Változatok
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +458,Make Purchase Order,Beszerzési rendelés készítése
 DocType: SMS Center,Send To,Címzett
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +111,There is not enough leave balance for Leave Type {0},Nincs elég szabadság mérlege Leave Type {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +127,There is not enough leave balance for Leave Type {0},Nincs elég szabadság mérlege Leave Type {0}
 DocType: Sales Team,Contribution to Net Total,Hozzájárulás a Net Total
 DocType: Sales Invoice Item,Customer's Item Code,Vevő cikkszáma
 DocType: Stock Reconciliation,Stock Reconciliation,Készlet egyeztetés
@@ -1523,11 +1469,11 @@
 DocType: Sales Order Item,Actual Qty,Aktuális db.
 DocType: Sales Invoice Item,References,Referenciák
 DocType: Quality Inspection Reading,Reading 10,Olvasás 10
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +612,"List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start.","Sorolja fel termékeket vagy szolgáltatásokat vásárol vagy eladni. Ügyeljen arra, hogy a tétel Group, mértékegység és egyéb tulajdonságait, amikor elkezdi."
+apps/erpnext/erpnext/public/js/setup_wizard.js +348,"List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start.","Sorolja fel termékeket vagy szolgáltatásokat vásárol vagy eladni. Ügyeljen arra, hogy a tétel Group, mértékegység és egyéb tulajdonságait, amikor elkezdi."
 DocType: Hub Settings,Hub Node,Hub Node
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,"Megadta ismétlődő elemek. Kérjük orvosolja, és próbálja újra."
 apps/erpnext/erpnext/controllers/item_variant.py +65,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values,Érték {0} Képesség {1} nem létezik a listát az érvényes jogcím attribútum értékek
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +87,Associate,Társult
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Associate,Társult
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +46,Item {0} is not a serialized Item,Elem {0} nem folytatásos tétel
 DocType: SMS Center,Create Receiver List,Címzettlista létrehozása
 apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +5,Expired,Lejárt
@@ -1536,7 +1482,7 @@
 DocType: Warranty Claim,Issue Date,Probléma dátuma
 DocType: Activity Cost,Activity Cost,Activity költség
 DocType: Purchase Receipt Item Supplied,Consumed Qty,Fogyasztott Mennyiség
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +52,Telecommunications,Távközlési
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +52,Telecommunications,Távközlési
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),"Azt jelzi, hogy a csomag egy része ennek a szállítási (Csak tervezet)"
 DocType: Payment Tool,Make Payment Entry,Fizess Entry
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +119,Quantity for Item {0} must be less than {1},"Mennyiség jogcím {0} kisebbnek kell lennie, mint {1}"
@@ -1553,10 +1499,8 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +37,"Selling must be checked, if Applicable For is selected as {0}","Ajánló ellenőrizni kell, amennyiben alkalmazható a kiválasztott {0}"
 DocType: Purchase Order Item,Supplier Quotation Item,Beszállítói ajánlat tétel
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +27,Make Salary Structure,Tedd bérszerkeztet
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +54,Shearing,Nyírás
 DocType: Item,Has Variants,Van-e változatok
 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.,"Kattints a ""Tedd Értékesítési számlák"" gombra, hogy egy új Értékesítési számlák."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +166,Packaging and labeling,Csomagolás és címkézés
 DocType: Monthly Distribution,Name of the Monthly Distribution,Nevét az havi megoszlása
 DocType: Sales Person,Parent Sales Person,Szülő Értékesítői
 apps/erpnext/erpnext/setup/utils.py +14,Please specify Default Currency in Company Master and Global Defaults,"Kérjük, adja meg alapértelmezett pénzneme a Társaság Mester és globális alapértékeit"
@@ -1567,19 +1511,18 @@
 DocType: Budget Detail,Fiscal Year,Pénzügyi év
 DocType: Cost Center,Budget,Költségkeret
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +41,"Budget cannot be assigned against {0}, as it's not an Income or Expense account","Költségvetést nem lehet rendelni ellen {0}, mivel ez nem egy bevétel vagy ráfordítás figyelembe"
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Achieved,Elért
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,Elért
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +65,Territory / Customer,Terület / Ügyfél
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,e.g. 5,pl. 5
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +207,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},"Row {0}: elkülönített összege {1} kisebbnek kell lennie, vagy egyenlő számlázni fennálló összeg {2}"
+apps/erpnext/erpnext/public/js/setup_wizard.js +294,e.g. 5,pl. 5
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},"Row {0}: elkülönített összege {1} kisebbnek kell lennie, vagy egyenlő számlázni fennálló összeg {2}"
 DocType: Sales Invoice,In Words will be visible once you save the Sales Invoice.,A szavak lesz látható mentése után a kereskedelmi számla.
 DocType: Item,Is Sales Item,Eladható tétel?
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,Tétel csoportfa
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,Elem {0} nem beállítás Serial Nos. Ellenőrizze tétel mester
 DocType: Maintenance Visit,Maintenance Time,Karbantartási idő
 ,Amount to Deliver,Összeget Deliver
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +620,A Product or Service,Egy termék vagy szolgáltatás
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +158,There were errors.,Voltak hibák.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +101,Tapping,Tapping
+apps/erpnext/erpnext/public/js/setup_wizard.js +356,A Product or Service,Egy termék vagy szolgáltatás
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +146,There were errors.,Voltak hibák.
 DocType: Naming Series,Current Value,Jelenlegi érték
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +171,{0} created,{0} létrehozva
 DocType: Delivery Note Item,Against Sales Order,Ellen Vevői
@@ -1593,7 +1536,7 @@
 apps/erpnext/erpnext/accounts/party.py +275,Due Date cannot be before Posting Date,A határidő nem lehet a rögzítés dátuma előtti
 DocType: Website Item Group,Website Item Group,Weboldal Termék Csoport
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Duties and Taxes,Vámok és adók
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Please enter Reference date,"Kérjük, adja Hivatkozási dátum"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +312,Please enter Reference date,"Kérjük, adja Hivatkozási dátum"
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} fizetési bejegyzéseket nem lehet szűrni {1}
 DocType: Item Website Specification,Table for Item that will be shown in Web Site,"Táblázat a tétel, amely megjelenik a Web Site"
 DocType: Purchase Order Item Supplied,Supplied Qty,Mellékelt Mennyiség
@@ -1601,7 +1544,7 @@
 apps/erpnext/erpnext/config/stock.py +103,Tree of Item Groups.,Fája Elem Csoportok.
 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,"Nem lehet hivatkozni sor száma nagyobb vagy egyenlő, mint aktuális sor számát erre a Charge típusú"
 ,Item-wise Purchase History,Elem-bölcs Vásárlási előzmények
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +152,Red,Piros
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Red,Piros
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +228,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},"Kérjük, kattintson a ""Létrehoz Menetrend"", hogy hozza Serial No hozzá jogcím {0}"
 DocType: Account,Frozen,Zárolt
 ,Open Production Orders,Nyitott gyártási rendelések
@@ -1616,7 +1559,7 @@
 DocType: Item Attribute,Attribute Name,Jellemző neve
 apps/erpnext/erpnext/controllers/selling_controller.py +236,Item {0} must be Sales or Service Item in {1},Elem {0} kell lennie értékesítési vagy szolgáltatási tétel a {1}
 DocType: Item Group,Show In Website,Weboldalon megjelenjen
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +621,Group,Csoport
+apps/erpnext/erpnext/public/js/setup_wizard.js +357,Group,Csoport
 DocType: Task,Expected Time (in hours),Várható idő (óra)
 ,Qty to Order,Mennyiség Rendelés
 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","Hogy nyomon márkanév a következő dokumentumokat szállítólevél, Opportunity, Material kérése, pont, Megrendelés, vásárlás utalvány, Vevő átvétele, idézet, Sales számlán, a termék Bundle, Vevői rendelés, Serial No"
@@ -1626,6 +1569,7 @@
 DocType: Features Setup,Brands,Márkák
 DocType: C-Form Invoice Detail,Invoice No,Számlát nem
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +480,From Purchase Order,Tól Megrendelés
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +92,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Hagyja nem alkalmazható / lemondás előtt {0}, mint szabadság egyensúlya már carry-továbbította a jövőben szabadság elosztása rekordot {1}"
 DocType: Activity Cost,Costing Rate,Költségszámítás Rate
 ,Customer Addresses And Contacts,Vevő címek és kapcsolatok
 DocType: Employee,Resignation Letter Date,Lemondását levélben dátuma
@@ -1633,35 +1577,31 @@
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +137,Not Set,Nincs megadva
 DocType: Communication,Date,Dátum
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,A törzsvásárlói Revenue
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +651,Sit tight while your system is being setup. This may take a few moments.,Ülj miközben a rendszer a telepítés. Ez eltarthat néhány pillanatig.
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +115,Sit tight while your system is being setup. This may take a few moments.,Ülj miközben a rendszer a telepítés. Ez eltarthat néhány pillanatig.
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +51,{0} ({1}) must have role 'Expense Approver',"{0} ({1}) kell szerepet költségére Jóváhagyó """
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Pair,Pár
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Pair,Pár
 DocType: Bank Reconciliation Detail,Against Account,Ellen számla
 DocType: Maintenance Schedule Detail,Actual Date,Tényleges dátuma
 DocType: Item,Has Batch No,Lesz kötegszáma?
 DocType: Delivery Note,Excise Page Number,Jövedéki Oldal száma
 DocType: Employee,Personal Details,Személyes adatai
 ,Maintenance Schedules,Karbantartási ütemezések
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +44,Embossing,Domborító
 ,Quotation Trends,Idézet Trends
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +139,Item Group not mentioned in item master for item {0},Elem Csoport nem említett elem mestere jogcím {0}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +302,Debit To account must be a Receivable account,Megterhelése figyelembe kell venni a követelések között
-apps/erpnext/erpnext/stock/doctype/item/item.py +310,"As Production Order can be made for this item, it must be a stock item.","Mivel a termelés Megrendelni lehet ezt az elemet, meg kell egy állomány elemet."
 DocType: Shipping Rule Condition,Shipping Amount,Szállítandó mennyiség
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +140,Joining,Összefogás
-DocType: Authorization Rule,Above Value,Feletti érték
 ,Pending Amount,Függőben lévő összeg
 DocType: Purchase Invoice Item,Conversion Factor,Konverziós tényező
 DocType: Purchase Order,Delivered,Kiszállítva
 apps/erpnext/erpnext/config/hr.py +160,Setup incoming server for jobs email id. (e.g. jobs@example.com),Beállítás bejövő kiszolgáló munkahelyek email id. (Pl jobs@example.com)
 DocType: Purchase Receipt,Vehicle Number,Jármű száma
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,"Az időpont, amikor az ismétlődő számlát fognak megállítani"
+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,"Összes elkülönített levelek {0} nem lehet kevesebb, mint a már jóváhagyott levelek {1} időszakra"
 DocType: Journal Entry,Accounts Receivable,VEVÔKÖVETELÉSEK
 ,Supplier-Wise Sales Analytics,Beszállítói Wise Sales Analytics
 DocType: Address Template,This format is used if country specific format is not found,"Ezt a formátumot használják, ha ország-specifikus formátumban nem található"
 DocType: Custom Field,Custom,Egyedi
 DocType: Production Order,Use Multi-Level BOM,Többszíntű anyagjegyzék
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +26,Injection molding,Fröccsöntés
 DocType: Bank Reconciliation,Include Reconciled Entries,Közé Egyeztetett bejegyzések
 apps/erpnext/erpnext/config/accounts.py +41,Tree of finanial accounts.,Fája finanial számlák.
 DocType: Leave Control Panel,Leave blank if considered for all employee types,"Hagyja üresen, ha figyelembe munkavállalói típusok"
@@ -1671,30 +1611,28 @@
 apps/frappe/frappe/config/setup.py +130,Printing,Nyomtatás
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +114,Expense Claim is pending approval. Only the Expense Approver can update status.,Költségén Követelés jóváhagyására vár. Csak a költség Jóváhagyó frissítheti állapotát.
 DocType: Purchase Invoice,Additional Discount Amount,További kedvezmény összege
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +99,The day(s) on which you are applying for leave are holiday. You need not apply for leave.,"A nap (ok) on, amelyre pályázik a szabadság ünnep. Nem kell alkalmazni a szabadság."
 apps/frappe/frappe/public/js/frappe/misc/utils.js +110,and,és
 DocType: Leave Block List Allow,Leave Block List Allow,Hagyja Block List engedélyezése
 apps/erpnext/erpnext/setup/doctype/company/company.py +236,Abbr can not be blank or space,Rövidített nem lehet üres vagy hely
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +50,Sports,Sport
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,Sport
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Actual,Összesen Aktuális
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Unit,Egység
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Unit,Egység
 apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.py +182,Please set Dropbox access keys in your site config,"Kérjük, állítsa Dropbox kisegítő billentyűk webhely config"
 apps/erpnext/erpnext/stock/get_item_details.py +113,Please specify Company,Kérem adja meg a Cég nevét
 ,Customer Acquisition and Loyalty,Ügyfélszerzés és hűség
 DocType: Purchase Receipt,Warehouse where you are maintaining stock of rejected items,"Raktár, ahol fenntartják állomány visszautasított tételek"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +408,Your financial year ends on,A pénzügyi év vége on
+apps/erpnext/erpnext/public/js/setup_wizard.js +156,Your financial year ends on,A pénzügyi év vége on
 DocType: POS Profile,Price List,Árlista
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +20,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,"{0} most az alapértelmezett pénzügyi évben. Kérjük, frissítse böngészőjét, hogy a változtatások életbe léptetéséhez."
 apps/erpnext/erpnext/projects/doctype/project/project.js +47,Expense Claims,Költségtérítési igényeket
 DocType: Issue,Support,Támogatás
-DocType: Authorization Rule,Approving Role,Jóváhagyó szerepe
 ,BOM Search,BOM Keresés
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +176,Closing (Opening + Totals),Zárás (nyitás + összesítések)
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +26,Please specify currency in Company,"Kérjük, adja valuta Társaság"
 DocType: Workstation,Wages per hour,Bérek óránként
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},"Stock egyensúly Batch {0} negatívvá válik {1} jogcím {2} a raktárunkban, {3}"
 apps/erpnext/erpnext/config/setup.py +83,"Show / Hide features like Serial Nos, POS etc.","Show / Hide funkciók, mint a Serial Nos, POS stb"
-apps/erpnext/erpnext/controllers/accounts_controller.py +236,Account {0} is invalid. Account Currency must be {1},Fiók {0} érvénytelen. A fiók pénzneme legyen {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +237,Account {0} is invalid. Account Currency must be {1},Fiók {0} érvénytelen. A fiók pénzneme legyen {1}
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +34,UOM Conversion factor is required in row {0},UOM átváltási arányra is szükség sorában {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +53,Clearance date cannot be before check date in row {0},Távolság dátum nem lehet a bejelentkezés előtt időpont sorában {0}
 DocType: Salary Slip,Deduction,Levonás
@@ -1713,13 +1651,13 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +82,Item {0} has already been returned,Elem {0} már visszatért
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,"** Pénzügyi év ** az adott pénzügyi évben. Minden könyvelési tétel, és más jelentős tranzakciókat nyomon elleni ** pénzügyi év **."
 DocType: Opportunity,Customer / Lead Address,Vevő / Célpont címe
+apps/erpnext/erpnext/stock/doctype/item/item.py +112,Warning: Invalid SSL certificate on attachment {0},Figyelmeztetés: Érvénytelen SSL tanúsítvány mellékletet {0}
 DocType: Production Order Operation,Actual Operation Time,Aktuális üzemidő
 DocType: Authorization Rule,Applicable To (User),Alkalmazandó (Felhasználó)
 DocType: Purchase Taxes and Charges,Deduct,Levonási
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +170,Job Description,Munkaleírás
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +170,Job Description,Munkaleírás
 DocType: Purchase Order Item,Qty as per Stock UOM,Mennyiség mint egy Stock UOM
 apps/frappe/frappe/model/rename_doc.py +343,Please select a valid csv file with data,Válasszon egy érvényes csv file adatok
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +92,Coating,Bevonat
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +126,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Speciális karakterek kivételével ""-"", ""#"", ""."" és a ""/"" nem engedélyezett elnevezési sorozat"
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Kövesse nyomon az értékesítési kampányok. Kövesse nyomon az érdeklődők, idézetek, vevői rendelés, stb a kampányok felmérni Return on Investment."
 DocType: Expense Claim,Approver,Jóváhagyó
@@ -1729,12 +1667,11 @@
 DocType: Supplier Quotation,Manufacturing Manager,Gyártási menedzser
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},Serial No {0} még garanciális max {1}
 apps/erpnext/erpnext/config/stock.py +69,Split Delivery Note into packages.,Osztott szállítólevél csomagokat.
-apps/erpnext/erpnext/hooks.py +84,Shipments,Szállítások
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +29,Dip molding,Dip öntés
+apps/erpnext/erpnext/hooks.py +68,Shipments,Szállítások
 DocType: Purchase Order,To be delivered to customer,Be kell nyújtani az ügyfél
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,Idő Log Status kell benyújtani.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,Soros {0} nem tartozik semmilyen Warehouse
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +650,Setting Up,Beállítása
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +114,Setting Up,Beállítása
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,Row # ,Sor #
 DocType: Purchase Invoice,In Words (Company Currency),Szavakkal (a cég valutanemében)
 DocType: Pricing Rule,Supplier,Beszállító
@@ -1742,7 +1679,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +105,Miscellaneous Expenses,Egyéb ráfordítások
 DocType: Global Defaults,Default Company,Alapértelmezett cég
 apps/erpnext/erpnext/controllers/stock_controller.py +166,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,Költség vagy Difference számla kötelező tétel {0} kifejtett hatása miatt teljes állomány értéke
-apps/erpnext/erpnext/controllers/accounts_controller.py +354,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","Nem overbill jogcím {0} sorban {1} több mint {2}. Ahhoz, hogy overbilling, kérjük beállított Stock Beállítások"
+apps/erpnext/erpnext/controllers/accounts_controller.py +355,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","Nem overbill jogcím {0} sorban {1} több mint {2}. Ahhoz, hogy overbilling, kérjük beállított Stock Beállítások"
 DocType: Employee,Bank Name,Bank neve
 apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +27,-Above,-Felett
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +135,User {0} is disabled,A(z) {0} felhasználó tiltva
@@ -1755,27 +1692,26 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,{0} is mandatory for Item {1},{0} kötelező tétel {1}
 DocType: Currency Exchange,From Currency,Deviza-
 DocType: DocField,Name,Név
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +211,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Kérjük, válasszon odaítélt összeg, Számla típusa és számlaszámra adni legalább egy sorban"
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +104,Sales Order required for Item {0},Vevői szükséges Elem {0}
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +158,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Kérjük, válasszon odaítélt összeg, Számla típusa és számlaszámra adni legalább egy sorban"
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +107,Sales Order required for Item {0},Vevői szükséges Elem {0}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +43,Amounts not reflected in system,Összegek nem tükröződik rendszer
 DocType: Purchase Invoice Item,Rate (Company Currency),Érték (a cég pénznemében)
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +40,Others,Egyéb
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +40,Others,Egyéb
 apps/erpnext/erpnext/templates/includes/product_page.js +80,Cannot find a matching Item. Please select some other value for {0}.,"Nem találja a megfelelő tétel. Kérjük, válasszon egy másik érték {0}."
 DocType: POS Profile,Taxes and Charges,Adók és költségek
 DocType: Item,"A Product or a Service that is bought, sold or kept in stock.","A termék vagy szolgáltatás, amelyet vásárolt, eladott vagy tartanak raktáron."
 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,"Nem lehet kiválasztani a felelős típusú ""On előző sor Összeg"" vagy ""On előző sor Total"" az első sorban"
 apps/frappe/frappe/core/doctype/doctype/boilerplate/controller_list.html +31,Completed,Befejezve
 DocType: Web Form,Select DocType,Válassza ki DocType
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +104,Broaching,Átvarratott
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +12,Banking,Banking
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,Banking
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +38,Please click on 'Generate Schedule' to get schedule,"Kérjük, kattintson a ""Létrehoz Menetrend"", hogy menetrend"
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +283,New Cost Center,Új költségközpont
 DocType: Bin,Ordered Quantity,Rendelt mennyiség
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +397,"e.g. ""Build tools for builders""","pl. ""Eszközök építőknek"""
+apps/erpnext/erpnext/public/js/setup_wizard.js +145,"e.g. ""Build tools for builders""","pl. ""Eszközök építőknek"""
 DocType: Quality Inspection,In Process,In Process
 DocType: Authorization Rule,Itemwise Discount,Itemwise Kedvezmény
 DocType: Purchase Order Item,Reference Document Type,Referencia Dokumentum típus
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +318,{0} against Sales Order {1},{0} ellen Vevői {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +320,{0} against Sales Order {1},{0} ellen Vevői {1}
 DocType: Account,Fixed Asset,Az állóeszköz-
 apps/erpnext/erpnext/config/stock.py +283,Serialized Inventory,Serialized Inventory
 DocType: Activity Type,Default Billing Rate,Alapértelmezett díjszabás
@@ -1790,14 +1726,13 @@
 DocType: Purchase Invoice Item,Page Break,Oldaltörés
 DocType: Production Order Operation,Pending,Függő
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,"A felhasználók, akik engedélyt egy bizonyos munkavállalói szabadság alkalmazások"
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +33,You cannot change default UOM of Variant. To change default UOM for Variant change default UOM of the Template,Nem lehet megváltoztatni az alapértelmezett mértékegysége változat. Ha módosítani alapértelmezett mértékegysége Variant változás alapértelmezett mértékegysége a Template
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +50,Office Equipments,Irodai berendezések
 DocType: Purchase Invoice Item,Qty,Menny.
 DocType: Fiscal Year,Companies,Cégek
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +24,Electronics,Elektronika
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +24,Electronics,Elektronika
 DocType: Stock Settings,Raise Material Request when stock reaches re-order level,"Emelje Material kérése, amikor állomány eléri újra, hogy szinten"
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +18,From Maintenance Schedule,Re Karbantartási ütemterv
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +56,Full-time,Teljes munkaidőben
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +56,Full-time,Teljes munkaidőben
 DocType: Purchase Invoice,Contact Details,Kapcsolattartó részletei
 DocType: C-Form,Received Date,Kapott dátuma
 DocType: Delivery Note,"If you have created a standard template in Sales Taxes and Charges Template, select one and click on the button below.","Ha már készítettünk egy szabványos sablon értékesítéshez kapcsolódó adók és díjak sablon, válasszon egyet és kattintson az alábbi gombra."
@@ -1809,11 +1744,12 @@
 DocType: Job Applicant,Job Opening,Állásajánlatok
 DocType: Payment Reconciliation,Payment Reconciliation,Fizetési Megbékélés
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +154,Please select Incharge Person's name,"Kérjük, válasszon incharge személy nevét"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +51,Technology,Technológia
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,Technológia
 DocType: Offer Letter,Offer Letter,Ajánlat Letter
 apps/erpnext/erpnext/config/manufacturing.py +51,Generate Material Requests (MRP) and Production Orders.,Létrehoz Material kérelmeket (MRP) és a gyártási megrendeléseket.
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +68,Total Invoiced Amt,Teljes kiszámlázott Amt
 DocType: Time Log,To Time,Az Idő
+DocType: Authorization Rule,Approving Role (above authorized value),Jóváhagyó szerepe (a fenti engedélyezett érték)
 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.","Hozzáadni a gyermek csomópontok, felfedezni fát, és kattintson a csomópont, amely alapján a felvenni kívánt több csomópontban."
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +102,Credit To account must be a Payable account,Hitel figyelembe kell venni a fizetendő
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +233,BOM recursion: {0} cannot be parent or child of {2},BOM rekurzív: {0} nem lehet a szülő vagy a gyermek {2}
@@ -1826,10 +1762,8 @@
 DocType: Item,Customer Item Codes,Vásárlói pont kódok
 DocType: Opportunity,Lost Reason,Elveszett Reason
 apps/erpnext/erpnext/config/accounts.py +68,Create Payment Entries against Orders or Invoices.,Hozzon létre Fizetési bejegyzés ellen megrendelések vagy számlák.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +141,Welding,Hegesztés
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +40,New Stock UOM is required,Új készlet mértékegységre szükség van
 DocType: Quality Inspection,Sample Size,A minta mérete
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +443,All items have already been invoiced,Összes példány már kiszámlázott
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +446,All items have already been invoiced,Összes példány már kiszámlázott
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',"Kérem adjon meg egy érvényes 'A Case No. """
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +287,Further cost centers can be made under Groups but entries can be made against non-Groups,További költség központok tehető alatt Csoportok de bejegyzéseket lehet tenni ellene nem Csoportok
 DocType: Project,External,Külső
@@ -1841,8 +1775,7 @@
 DocType: Bin,Actual Quantity,Tényleges Mennyiség
 DocType: Shipping Rule,example: Next Day Shipping,például: Következő napi szállítás
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,Serial No {0} nem található
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +563,Your Customers,Az ügyfelek
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +27,Compression molding,Sajtolóporokat
+apps/erpnext/erpnext/public/js/setup_wizard.js +303,Your Customers,Az ügyfelek
 DocType: Leave Block List Date,Block Date,Blokk dátuma
 DocType: Sales Order,Not Delivered,Nem szállított
 ,Bank Clearance Summary,Bank Végső összefoglaló
@@ -1863,10 +1796,10 @@
 DocType: SMS Log,Sent To,Elküldve
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +28,Make Sales Invoice,Értékesítési számla készítése
 DocType: Company,For Reference Only.,Csak tájékoztató jellegűek.
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +29,Invalid {0}: {1},Érvénytelen {0}: {1}
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +49,Invalid {0}: {1},Érvénytelen {0}: {1}
 DocType: Sales Invoice Advance,Advance Amount,Előleg
 DocType: Manufacturing Settings,Capacity Planning,Kapacitástervezés
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +49,'From Date' is required,"""Dátumtól"" szükséges"
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +43,'From Date' is required,"""Dátumtól"" szükséges"
 DocType: Journal Entry,Reference Number,Referencia szám
 DocType: Employee,Employment Details,Foglalkoztatás részletei
 DocType: Employee,New Workplace,Új munkahely
@@ -1881,7 +1814,7 @@
 DocType: Serial No,Delivery Time,Szállítási idő
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Ageing alapszik
 DocType: Item,End of Life,Felhasználhatósági idő
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +41,Travel,Utazási
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +41,Travel,Utazási
 DocType: Leave Block List,Allow Users,Felhasználók engedélyezése
 DocType: Purchase Order,Customer Mobile No,Vásárlói Mobile Nem
 DocType: Sales Invoice,Recurring,Ismétlődő
@@ -1895,7 +1828,7 @@
 DocType: Naming Series,User must always select,Felhasználó mindig válassza
 DocType: Stock Settings,Allow Negative Stock,Negatív készlet engedélyezése
 DocType: Installation Note,Installation Note,Telepítési feljegyzés
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +541,Add Taxes,Add adók
+apps/erpnext/erpnext/public/js/setup_wizard.js +283,Add Taxes,Add adók
 ,Financial Analytics,Pénzügyi analitika
 DocType: Quality Inspection,Verified By,Ellenőrizte
 DocType: Address,Subsidiary,Leányvállalat
@@ -1905,7 +1838,6 @@
 DocType: System Settings,In Hours,Órában
 DocType: Process Payroll,Create Salary Slip,Bérlap létrehozása
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Expected balance as per bank,Várható egyenleg bankonként
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +115,Buffing,Lehúzóbetét
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Source of Funds (Liabilities),Pénzeszközök forrását (Források)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +347,Quantity in row {0} ({1}) must be same as manufactured quantity {2},Mennyiség sorban {0} ({1}) meg kell egyeznie a gyártott mennyiség {2}
 DocType: Appraisal,Employee,Munkavállaló
@@ -1922,11 +1854,11 @@
 DocType: Rename Tool,File to Rename,Fájl átnevezése
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +176,Purchse Order number required for Item {0},Purchse Rendelési szám szükséges Elem {0}
 apps/erpnext/erpnext/public/js/controllers/transaction.js +136,Show Payments,Mutass Kifizetések
-apps/erpnext/erpnext/controllers/buying_controller.py +245,Specified BOM {0} does not exist for Item {1},Meghatározott BOM {0} nem létezik jogcím {1}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +202,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Karbantartási ütemterv {0} törölni kell lemondása előtt ezt a Vevői rendelés
+apps/erpnext/erpnext/controllers/buying_controller.py +236,Specified BOM {0} does not exist for Item {1},Meghatározott BOM {0} nem létezik jogcím {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Karbantartási ütemterv {0} törölni kell lemondása előtt ezt a Vevői rendelés
 apps/frappe/frappe/desk/page/backups/backups.html +13,Size,Méret
 DocType: Notification Control,Expense Claim Approved,Béremelési igény jóváhagyva
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +113,Pharmaceutical,Gyógyszeripari
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Pharmaceutical,Gyógyszeripari
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,A vásárolt tételek
 DocType: Selling Settings,Sales Order Required,Értékesítési sorrendbe
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +30,Create Customer,Készítsen Customer
@@ -1936,7 +1868,6 @@
 DocType: Quality Inspection Reading,Reading 9,Olvasás 9
 DocType: Supplier,Is Frozen,Van fagyasztva
 DocType: Buying Settings,Buying Settings,Beszerzési Beállítások
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +122,Mass finishing,Mass befejező
 DocType: Stock Entry Detail,BOM No. for a Finished Good Item,BOM No. egy kész jó pont
 DocType: Upload Attendance,Attendance To Date,Részvétel a dátum
 apps/erpnext/erpnext/config/selling.py +158,Setup incoming server for sales email id. (e.g. sales@example.com),Beállítás bejövő kiszolgáló értékesítési email id. (Pl sales@example.com)
@@ -1944,7 +1875,7 @@
 DocType: Payment Tool,Payment Account,Fizetési számla
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +713,Please specify Company to proceed,"Kérjük, adja Társaság a folytatáshoz"
 apps/frappe/frappe/public/js/frappe/model/indicator.js +30,Draft,Vázlat
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +46,Compensatory Off,Kompenzációs Off
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Compensatory Off,Kompenzációs Off
 DocType: Quality Inspection Reading,Accepted,Elfogadva
 DocType: User,Female,Nő
 DocType: Journal Entry Account,Debit in Account Currency,Tartozik a fiók pénzneme
@@ -1956,7 +1887,7 @@
 DocType: Shipping Rule,Shipping Rule Label,Szállítási lehetőség címkéi
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +209,Raw Materials cannot be blank.,Nyersanyagok nem lehet üres.
 DocType: Newsletter,Test,Teszt
-apps/erpnext/erpnext/stock/doctype/item/item.py +364,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +368,"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'","Mivel már meglévő részvény tranzakciók ezt az elemet, \ nem tudja megváltoztatni az értékeket &quot;Has Serial No&quot;, &quot;a kötegelt Nem&quot;, &quot;Úgy Stock pont&quot; és &quot;értékelési módszer&quot;"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +448,Quick Journal Entry,Gyors Naplókönyvelés
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +92,You can not change rate if BOM mentioned agianst any item,"Nem tudod megváltoztatni mértéke, ha BOM említett Against olyan tétel"
@@ -1967,13 +1898,14 @@
 apps/erpnext/erpnext/config/stock.py +18,Requests for items.,Kérelmek tételek.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,Külön termelési érdekében jön létre minden kész a jó elemet.
 DocType: Purchase Invoice,Terms and Conditions1,Általános szerződési feltételek1
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +18,Complete Setup,Teljes beállítás
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard_page.html +18,Complete Setup,Teljes beállítás
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","Könyvelési tételt befagyva, hogy ez az időpont, senkinek nincs joga / módosítani bejegyzést kivéve szerepet az alábbiak szerint."
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +121,Please save the document before generating maintenance schedule,"Kérjük, mentse a dokumentumot, utána karbantartási ütemterv"
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,Projekt állapota
 DocType: UOM,Check this to disallow fractions. (for Nos),"Jelölje be ezt, hogy ne engedélyezze frakciók. (A számok)"
 apps/erpnext/erpnext/config/crm.py +96,Newsletter Mailing List,Hírlevél levelezőlista
 DocType: Delivery Note,Transporter Name,Fuvarozó neve
+DocType: Authorization Rule,Authorized Value,Megengedett érték
 DocType: Contact,Enter department to which this Contact belongs,"Adja egysége, ahova a kapcsolattartónak tartozik"
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Absent,Összesen Hiány
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +746,Item or Warehouse for row {0} does not match Material Request,Elem vagy raktár sorban {0} nem egyezik Material kérése
@@ -1998,16 +1930,15 @@
 DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),Basic Rate (a per Stock UOM)
 DocType: SMS Log,No of Requested SMS,Nem kért SMS
 DocType: Campaign,Campaign-.####,Kampány -. ####
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +55,Piercing,Piercing
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,Következő lépések
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +117,Contract End Date must be greater than Date of Joining,"Szerződés befejezés dátuma nem lehet nagyobb, mint Csatlakozás dátuma"
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,"A harmadik fél forgalmazó / kereskedő / bizományos / társult / viszonteladó, aki eladja a vállalatok termékek a jutalék."
 DocType: Customer Group,Has Child Node,Lesz gyerek bejegyzése?
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{0} against Purchase Order {1},{0} ellen Megrendelés {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +332,{0} against Purchase Order {1},{0} ellen Megrendelés {1}
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","Írja be a statikus url paramétereket itt (Pl. A feladó = ERPNext, username = ERPNext, password = 1234 stb)"
 apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,{0} {1} sem aktív pénzügyi évben. További részletekért ellenőrizze {2}.
-apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,Ez egy példa honlapján automatikusan generált a ERPNext
+apps/erpnext/erpnext/setup/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,Ez egy példa honlapján automatikusan generált a ERPNext
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +37,Ageing Range 1,Ageing tartomány 1
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +110,Photochemical machining,Fotokémiai megmunkálás
 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.
 
 #### Note
@@ -2033,7 +1964,7 @@
 DocType: Purchase Receipt Item,Recd Quantity,RecD Mennyiség
 DocType: Email Account,Email Ids,E-mail azonosítók
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},"Nem lehet még több tétel {0}, mint Sales Rendelési mennyiség {1}"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +471,Stock Entry {0} is not submitted,"Stock Entry {0} nem nyújtják be,"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +473,Stock Entry {0} is not submitted,"Stock Entry {0} nem nyújtják be,"
 DocType: Payment Reconciliation,Bank / Cash Account,Bank / Cash Account
 DocType: Tax Rule,Billing City,Számlázási város
 DocType: Global Defaults,Hide Currency Symbol,Pénznem szimbólumának elrejtése
@@ -2049,7 +1980,7 @@
 DocType: Purchase Invoice,Currency and Price List,Pénznem és árlista
 DocType: Opportunity,Customer / Lead Name,Vevő / Célpont neve
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +63,Clearance Date not mentioned,Távolság dátuma nem szerepel
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +71,Production,Termelés
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Production,Termelés
 DocType: Item,Allow Production Order,Gyártási rendelés engedélyezése
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +60,Row {0}:Start Date must be before End Date,Row {0}: kezdő dátumot kell lennie a befejezés dátuma
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Összesen (db)
@@ -2062,7 +1993,7 @@
 apps/erpnext/erpnext/utilities/doctype/address/address.py +113,My Addresses,Saját címek
 DocType: Stock Ledger Entry,Outgoing Rate,Kimenő Rate
 apps/erpnext/erpnext/config/hr.py +100,Organization branch master.,Szervezet ága mester.
-apps/erpnext/erpnext/controllers/accounts_controller.py +237, or ,vagy
+apps/erpnext/erpnext/controllers/accounts_controller.py +238, or ,vagy
 DocType: Sales Order,Billing Status,Számlázási állapot
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Utility Expenses,Közműben
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,90-Above,90 felett
@@ -2089,6 +2020,7 @@
 DocType: Stock Entry Detail,Serial No / Batch,Serial No / Batch
 DocType: Product Bundle,Parent Item,Szülőelem
 DocType: Account,Account Type,Számla típus
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +113,Leave Type {0} cannot be carry-forwarded,Hagyja típusa {0} nem carry-továbbítani
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +213,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',"Karbantartási ütemterv nem keletkezik az összes elem. Kérjük, kattintson a ""Létrehoz Menetrend"""
 ,To Produce,Termelni
 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","A sorban {0} {1}. Márpedig a {2} jogcímben ráta, sorok {3} is fel kell venni"
@@ -2096,10 +2028,7 @@
 DocType: Bin,Reserved Quantity,Mennyiség fenntartva
 DocType: Landed Cost Voucher,Purchase Receipt Items,Vásárlási nyugta elemek
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,Testreszabása Forms
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +62,Cutting,Vágás
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +69,Flattening,Összelapulás
 DocType: Account,Income Account,Jövedelem számla
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +22,Molding,Öntvény
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +632,Delivery,Szállítás
 DocType: Stock Reconciliation Item,Current Qty,Jelenlegi Mennyiség
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",Lásd az 'Anyagköltség számítás módja' a Költség részben
@@ -2109,19 +2038,18 @@
 apps/frappe/frappe/desk/moduleview.py +61,Documents,Dokumentumok
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +17,Ref,Ref
 DocType: Cost Center,Cost Center,Költségközpont
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.js +48,Voucher #,Utalvány #
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +36,Voucher #,Utalvány #
 DocType: Notification Control,Purchase Order Message,Megrendelés Message
 DocType: Tax Rule,Shipping Country,Szállítási Ország
 DocType: Upload Attendance,Upload HTML,HTML feltöltése
-apps/erpnext/erpnext/controllers/accounts_controller.py +391,"Total advance ({0}) against Order {1} cannot be greater \
+apps/erpnext/erpnext/controllers/accounts_controller.py +392,"Total advance ({0}) against Order {1} cannot be greater \
 				than the Grand Total ({2})","Előleg teljes ({0}) ellen Order {1} nem lehet nagyobb, \ mint a Grand Total ({2})"
 DocType: Employee,Relieving Date,Tehermentesítő dátuma
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +12,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.","Árképzési szabály készül felülírni árjegyzéke / határozza kedvezmény százalékos, néhány olyan feltétel alapján."
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,Warehouse csak akkor lehet megváltoztatni keresztül Stock Entry / szállítólevél / vásárlási nyugta
 DocType: Employee Education,Class / Percentage,Osztály / Százalékos
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +92,Head of Marketing and Sales,Marketing és Értékesítés vezetője
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +31,Income Tax,Jövedelemadó
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +157,Laser engineered net shaping,Laser megtervezett net alakítására
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Head of Marketing and Sales,Marketing és Értékesítés vezetője
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +31,Income Tax,Jövedelemadó
 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.","Ha a kiválasztott árképzési szabály készül az ""Ár"", az felülírja árlista. Árképzési szabály ár a végleges ár, így további kedvezményt kellene alkalmazni. Ezért a tranzakciók, mint a vevői rendelés, megrendelés, stb, akkor kerül letöltésre a ""Rate"" mezőbe, ahelyett, hogy ""árjegyzéke Rate"" mezőben."
 apps/erpnext/erpnext/config/selling.py +163,Track Leads by Industry Type.,A pálya vezet az ipar típusa.
 DocType: Item Supplier,Item Supplier,Anyagbeszállító
@@ -2144,31 +2072,28 @@
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Tényleges Mennyiség Miután a tranzakciós
 ,Pending SO Items For Purchase Request,Függőben lévő SO elemek vásárolható kérése
 DocType: Supplier,Billing Currency,Számlázási Árfolyam
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +148,Extra Large,Extra Nagy
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,Extra Large,Extra Nagy
 ,Profit and Loss Statement,Az eredmény-kimutatás
 DocType: Bank Reconciliation Detail,Cheque Number,Csekk száma
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +43,Pressing,Nyomás
 DocType: Payment Tool Detail,Payment Tool Detail,Fizetési eszköz Detail
 ,Sales Browser,Értékesítési Browser
 DocType: Journal Entry,Total Credit,Követelés összesen
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +474,Warning: Another {0} # {1} exists against stock entry {2},Figyelmeztetés: Egy másik {0} # {1} létezik elleni készletnövekedést {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +459,Local,Helyi
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +476,Warning: Another {0} # {1} exists against stock entry {2},Figyelmeztetés: Egy másik {0} # {1} létezik elleni készletnövekedést {2}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +397,Local,Helyi
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),A hitelek és előlegek (Eszközök)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,Adósok
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +147,Large,Nagy
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +23,No employee found!,Nem alkalmazottja találta!
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Large,Nagy
 DocType: C-Form Invoice Detail,Territory,Terület
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,Kérjük beszélve nincs ellenőrzés szükséges
 DocType: Purchase Order,Customer Address Display,Ügyfél Cím megjelenítése
 DocType: Stock Settings,Default Valuation Method,Alapértelmezett készletérték számítási mód
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +127,Polishing,Polírozás
 DocType: Production Order Operation,Planned Start Time,Tervezett kezdési idő
 apps/erpnext/erpnext/config/accounts.py +63,Close Balance Sheet and book Profit or Loss.,Bezár Mérleg és a könyv nyereség vagy veszteség.
-apps/erpnext/erpnext/stock/doctype/item/item.py +661,"Default Unit of Measure for Item {0} cannot be changed directly because \
+apps/erpnext/erpnext/stock/doctype/item/item.py +665,"Default Unit of Measure for Item {0} cannot be changed directly because \
 			you have already made some transaction(s) with another UOM. To change default UOM, \
 			use 'UOM Replace Utility' tool under Stock module.","Alapértelmezett mértékegysége pont {0} nem módosítható közvetlenül, mert \ már tett néhány tranzakció (k) másik UOM. Ha módosítani alapértelmezett mértékegysége, \ use UOM Cserélje Utility &quot;eszköz keretében Stock modul."
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,Adja árfolyam átalakítani egy pénznem egy másik
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +146,Quotation {0} is cancelled,{0} ajánlat törölve
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +141,Quotation {0} is cancelled,{0} ajánlat törölve
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,Teljes fennálló összege
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} was on leave on {1}. Cannot mark attendance.,Employee {0} volt szabadságon lévő {1}. Nem jelölhet részvétel.
 DocType: Sales Partner,Targets,Célok
@@ -2179,7 +2104,6 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +158,Please create Customer from Lead {0},"Kérjük, hozzon létre Ügyfél a Lead {0}"
 DocType: Price List,Applicable for Countries,Alkalmazható Országok
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Computers,Számítógépek
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +112,Electro-chemical grinding,Elektrokémiai köszörülés
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +14,This is a root customer group and cannot be edited.,"Ez egy gyökér vevőkör, és nem lehet szerkeszteni."
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +39,Please setup your chart of accounts before you start Accounting Entries,"Kérjük, állítsa össze a számlatükör mielőtt elkezdi könyvelési tételek"
 DocType: Purchase Invoice,Ignore Pricing Rule,Figyelmen kívül hagyja árképzési szabály
@@ -2225,7 +2149,6 @@
 DocType: Maintenance Visit,Purposes,Célok
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +103,Atleast one item should be entered with negative quantity in return document,Atleast egy tételt kell beírni a negatív mennyiség cserébe dokumentum
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +67,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","Működés {0} hosszabb, mint bármely rendelkezésre álló munkaidő munkaállomás {1}, lebontják a művelet a több művelet"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +134,Electrochemical machining,Elektrokémiai megmunkálás
 ,Requested,Kért
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +66,No Remarks,Nincs megjegyzés
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +13,Overdue,Lejárt
@@ -2234,7 +2157,7 @@
 DocType: Monthly Distribution,Distribution Name,Nagykereskedelem neve
 DocType: Features Setup,Sales and Purchase,Értékesítés és beszerzés
 DocType: Supplier Quotation Item,Material Request No,Anyagigénylés száma
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +218,Quality Inspection required for Item {0},Minőség-ellenőrzési szükséges Elem {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +221,Quality Inspection required for Item {0},Minőség-ellenőrzési szükséges Elem {0}
 DocType: Quotation,Rate at which customer's currency is converted to company's base currency,"Arány, amely ügyfél deviza átalakul cég bázisvalutaként"
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +107,{0} has been successfully unsubscribed from this list.,{0} óta sikeresen megszüntette a listából.
 DocType: Purchase Invoice Item,Net Rate (Company Currency),Nettó ár (Társaság Currency)
@@ -2252,9 +2175,8 @@
 apps/erpnext/erpnext/accounts/report/financial_statements.py +16,Fiscal Year {0} not found.,A {0} pénzügyi év nem található.
 DocType: Bank Reconciliation,Get Relevant Entries,Get vonatkozó bejegyzései
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +407,Accounting Entry for Stock,Számviteli könyvelése Stock
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +64,Coining,Coining
 DocType: Sales Invoice,Sales Team1,Értékesítő csapat1
-apps/erpnext/erpnext/stock/doctype/item/item.py +412,Item {0} does not exist,Elem {0} nem létezik
+apps/erpnext/erpnext/stock/doctype/item/item.py +416,Item {0} does not exist,Elem {0} nem létezik
 DocType: Sales Invoice,Customer Address,Vevő címe
 apps/frappe/frappe/desk/query_report.py +136,Total,Összesen
 DocType: Purchase Invoice,Apply Additional Discount On,Alkalmazza További kedvezmény
@@ -2266,14 +2188,13 @@
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),Adó összege után kedvezmény összege (Társaság Currency)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +149,Target warehouse is mandatory for row {0},Cél raktárban kötelező sorban {0}
 DocType: Quality Inspection,Quality Inspection,Minőségvizsgálat
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +144,Extra Small,Extra Small
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +20,Spray forming,Spray képező
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Extra Small,Extra Small
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +458,Warning: Material Requested Qty is less than Minimum Order Qty,"Figyelmeztetés: Anyag kért Mennyiség kevesebb, mint Minimális rendelési menny"
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +191,Account {0} is frozen,Account {0} lefagyott
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Jogi személy / leányvállalat külön számlatükör tartozó Szervezet.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +29,"Food, Beverage & Tobacco","Élelmiszerek, italok és dohány"
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","Élelmiszerek, italok és dohány"
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +20,PL or BS,PL vagy BS
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,Can only make payment against unbilled {0},Egyszerre csak fizetés ellenében nem számlázott {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +531,Can only make payment against unbilled {0},Egyszerre csak fizetés ellenében nem számlázott {0}
 apps/erpnext/erpnext/controllers/selling_controller.py +122,Commission rate cannot be greater than 100,"Jutalék mértéke nem lehet nagyobb, mint a 100"
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Minimum Inventory Level,Minimum készletszint
 DocType: Stock Entry,Subcontract,Alvállalkozói
@@ -2284,19 +2205,18 @@
 DocType: Item,Manufacturer Part Number,Gyártó cikkszáma
 DocType: Production Order Operation,Estimated Time and Cost,Becsült idő és költség
 DocType: Bin,Bin,Láda
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +50,Nosing,Ütköző
 DocType: SMS Log,No of Sent SMS,Nem az elküldött SMS-
 DocType: Account,Company,Cég
 DocType: Account,Expense Account,Áfás számlát
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +49,Software,Szoftver
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +151,Colour,Szín
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +49,Software,Szoftver
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Colour,Szín
 DocType: Maintenance Visit,Scheduled,Ütemezett
 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","Kérjük, válasszon pont, ahol &quot;Is Stock tétel&quot; &quot;Nem&quot; és &quot;Van Sales Termék&quot; &quot;Igen&quot;, és nincs más termék Bundle"
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,Válassza ki havi megoszlása ​​egyenlőtlen osztja célok hónapok között.
 DocType: Purchase Invoice Item,Valuation Rate,Becsült érték
 apps/erpnext/erpnext/stock/get_item_details.py +281,Price List Currency not selected,Árlista Ki nem választott
 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,"Elem Row {0}: vásárlási nyugta {1} nem létezik a fent 'Vásárlás bevételek ""tábla"
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +134,Employee {0} has already applied for {1} between {2} and {3},Employee {0} már jelentkezett {1} között {2} és {3}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +145,Employee {0} has already applied for {1} between {2} and {3},Employee {0} már jelentkezett {1} között {2} és {3}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Projekt kezdési dátuma
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +8,Until,Míg
 DocType: Rename Tool,Rename Log,Átnevezési napló
@@ -2306,7 +2226,7 @@
 apps/erpnext/erpnext/controllers/recurring_document.py +162,Please select {0},"Kérjük, válassza ki a {0}"
 DocType: C-Form,C-Form No,C-Form No
 DocType: BOM,Exploded_items,Exploded_items
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +95,Researcher,Kutató
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Researcher,Kutató
 apps/frappe/frappe/custom/doctype/customize_form/customize_form.js +88,Update,Frissítés
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +78,Please save the Newsletter before sending,"Kérjük, őrizze meg a hírlevél küldés előtt"
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +23,Name or Email is mandatory,Név vagy e-mail kötelező
@@ -2315,11 +2235,10 @@
 DocType: Employee,Exit,Kilépés
 apps/erpnext/erpnext/accounts/doctype/account/account.py +134,Root Type is mandatory,Root Type kötelező
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +295,Serial No {0} created,{0} sorozatszám létrehozva
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +125,Vibratory finishing,Vibrációs befejező
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","A könnyebb ügyfelek, ezek a kódok használhatók a nyomtatási formátumok, mint számlákon és a szállítóleveleken"
 DocType: Employee,You can enter any date manually,Megadhat bármilyen dátum kézi
 DocType: Sales Invoice,Advertisement,Hirdetés
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +165,Probationary Period,Próbaidő
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Probationary Period,Próbaidő
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Csak az ágakat engedélyezettek a tranzakciós
 DocType: Expense Claim,Expense Approver,Költségén Jóváhagyó
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,Vásárlási nyugta mellékelt tételek
@@ -2327,19 +2246,16 @@
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +17,To Datetime,Hogy Datetime
 DocType: SMS Settings,SMS Gateway URL,SMS átjáró URL-je
 apps/erpnext/erpnext/config/crm.py +53,Logs for maintaining sms delivery status,Rönk fenntartása sms szállítási állapot
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +137,Grinding,Őrlés
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +34,Shrink wrapping,Zsugorfóliázó
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +36,Pending Activities,Függő Tevékenységek
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,Confirmed,Megerősített
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier > Supplier Type,Szállító> Szállító Type
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +127,Please enter relieving date.,"Kérjük, adja enyhíti a dátumot."
 apps/erpnext/erpnext/controllers/trends.py +137,Amt,Amt
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' can be submitted,"Csak Hagyd alkalmazások állapotát ""Elfogadott"" lehet benyújtani"
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +51,Only Leave Applications with status 'Approved' can be submitted,"Csak Hagyd alkalmazások állapotát ""Elfogadott"" lehet benyújtani"
 apps/erpnext/erpnext/utilities/doctype/address/address.py +21,Address Title is mandatory.,Address Cím kötelező.
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,"Adja meg nevét kampányt, ha a forrása a vizsgálódás kampány"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +38,Newspaper Publishers,Hírlevél publikálók
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +38,Newspaper Publishers,Hírlevél publikálók
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,Válassza ki Fiscal Year
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +88,Smelting,Smelting
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Újra rendelési szint
 DocType: Attendance,Attendance Date,Jelenléti dátuma
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,Fizetés szakítás alapján a kereseti és levonás.
@@ -2354,16 +2270,15 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +414,[Error],[Hiba]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,"A szavak lesz látható, ha menteni a Vevői rendelés."
 ,Employee Birthday,Munkavállaló születésnapja
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +55,Venture Capital,Venture Capital
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,Venture Capital
 DocType: UOM,Must be Whole Number,Egész számnak kell lennie
 DocType: Leave Control Panel,New Leaves Allocated (In Days),Új szabadság lefoglalása (napokban)
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +51,Serial No {0} does not exist,A {0} sorozatszám nem létezik
 DocType: Pricing Rule,Discount Percentage,Kedvezmény százaléka
 DocType: Payment Reconciliation Invoice,Invoice Number,Számla száma
-apps/erpnext/erpnext/hooks.py +70,Orders,Rendelés
+apps/erpnext/erpnext/hooks.py +54,Orders,Rendelés
 DocType: Leave Control Panel,Employee Type,Munkaviszony típusa
 DocType: Employee Leave Approver,Leave Approver,Szabadság jóváhagyó
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +70,Swaging,Swaging
 DocType: Manufacturing Settings,Material Transferred for Manufacture,Anyaga átadott gyártása
 DocType: Expense Claim,"A user with ""Expense Approver"" role","A felhasználó ""Költség Jóváhagyó"" szerepét"
 ,Issued Items Against Production Order,Gyártás rendelést akadályozó problémák
@@ -2375,7 +2290,6 @@
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +62,Cost Center with existing transactions can not be converted to group,"Költség Center meglévő tranzakciók nem lehet átalakítani, hogy csoportban"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Depreciation,Értékcsökkenés
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Szállító (k)
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +29,Invalid period,Érvénytelen időszakban
 DocType: Customer,Credit Limit,Credit Limit
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,Tranzakció kiválasztása
 DocType: GL Entry,Voucher No,Bizonylatszám
@@ -2385,9 +2299,9 @@
 DocType: Customer,Address and Contact,Cím és kapcsolattartási
 DocType: Customer,Last Day of the Next Month,Last Day of a következő hónapban
 DocType: Employee,Feedback,Visszajelzés
+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}","Szabadság nem kell elosztani {0}, mint szabadság egyensúlya már carry-továbbította a jövőben szabadság elosztása rekordot {1}"
 apps/erpnext/erpnext/accounts/party.py +284,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Megjegyzés: Mivel / Referencia dátum meghaladja a megengedett ügyfél hitel nap {0} nap (ok)
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +621,Maint. Schedule,Karba. Menetrend
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +108,Abrasive jet machining,Abrazív vízsugaras megmunkálás
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +632,Maint. Schedule,Karba. Menetrend
 DocType: Stock Settings,Freeze Stock Entries,Készlet zárolás
 DocType: Website Settings,Website Settings,Weboldal beállítások
 DocType: Item,Reorder level based on Warehouse,Reorder szinten alapuló Warehouse
@@ -2404,7 +2318,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +75,Show Stock Entries,Mutasd Stock bejegyzések
 ,Is Primary Address,Van Elsődleges cím
 DocType: Production Order,Work-in-Progress Warehouse,Work in progress Warehouse
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +308,Reference #{0} dated {1},Referencia # {0} dátuma {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Reference #{0} dated {1},Referencia # {0} dátuma {1}
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +13,Manage Addresses,Kezelje címek
 DocType: Pricing Rule,Item Code,Tételkód
 DocType: Production Planning Tool,Create Production Orders,Gyártásrendelés létrehozása
@@ -2413,7 +2327,7 @@
 DocType: Lead,Market Segment,Piaci rész
 DocType: Communication,Phone,Telefon
 DocType: Employee Internal Work History,Employee Internal Work History,A munkavállaló cégen belüli mozgása
-apps/erpnext/erpnext/public/js/account_tree_grid.js +50,Closing (Dr),Zárás (Dr)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +221,Closing (Dr),Zárás (Dr)
 DocType: Contact,Passive,Passzív
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,Serial No {0} nincs raktáron
 apps/erpnext/erpnext/config/selling.py +127,Tax template for selling transactions.,Adó sablon eladási ügyleteket.
@@ -2429,8 +2343,8 @@
 ,Billed Amount,Számlázott összeg
 DocType: Bank Reconciliation,Bank Reconciliation,Bank Megbékélés
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +9,Get Updates,Get frissítések
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +129,Material Request {0} is cancelled or stopped,"A(z) {0} anyagigénylés törölve, vagy leállítva"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +641,Add a few sample records,Adjunk hozzá néhány mintát bejegyzések
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +133,Material Request {0} is cancelled or stopped,"A(z) {0} anyagigénylés törölve, vagy leállítva"
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Add a few sample records,Adjunk hozzá néhány mintát bejegyzések
 apps/erpnext/erpnext/config/hr.py +210,Leave Management,Hagyja Management
 DocType: Event,Groups,Csoportok
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,Számla által csoportosítva
@@ -2443,38 +2357,34 @@
 DocType: Features Setup,Sales Extras,Értékesítési Extrák
 apps/erpnext/erpnext/accounts/utils.py +344,{0} budget for Account {1} against Cost Center {2} will exceed by {3},{0} költségvetés Account {1} ellen Cost Center {2} meg fogja haladni a {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +236,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Különbség Figyelembe kell lennie Eszköz / Forrás típusú számla, mivel ez a Stock Megbékélés egy Nyitva Entry"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +138,Purchase Order number required for Item {0},Megrendelés számát szükséges Elem {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Order number required for Item {0},Megrendelés számát szükséges Elem {0}
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',"a ""Dátumtól"" a ""Dátumig"" után kell állnia"
 ,Stock Projected Qty,Stock kivetített Mennyiség
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +147,Customer {0} does not belong to project {1},Vásárlói {0} nem tartozik a projekt {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +150,Customer {0} does not belong to project {1},Vásárlói {0} nem tartozik a projekt {1}
 DocType: Sales Order,Customer's Purchase Order,Ügyfél Megrendelés
 DocType: Warranty Claim,From Company,Cégtől
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,Érték vagy menny
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Minute,Perc
+apps/erpnext/erpnext/public/js/setup_wizard.js +363,Minute,Perc
 DocType: Purchase Invoice,Purchase Taxes and Charges,Adókat és díjakat
 ,Qty to Receive,Mennyiség fogadáshoz
 DocType: Leave Block List,Leave Block List Allowed,Hagyja Block List hozhatja
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +61,Conversion factor cannot be in fractions,Konverziós faktor nem lehet a frakciók
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +358,You will use it to Login,Fogod használni a belépéshez
+apps/erpnext/erpnext/public/js/setup_wizard.js +108,You will use it to Login,Fogod használni a belépéshez
 DocType: Sales Partner,Retailer,Kiskereskedő
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +99,Credit To account must be a Balance Sheet account,Hitel figyelembe kell egy Mérlegszámla
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,Minden beszállító típusok
 apps/erpnext/erpnext/stock/doctype/item/item.py +37,Item Code is mandatory because Item is not automatically numbered,"Elem kód megadása kötelező, mert pont nincs automatikusan számozott"
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +99,Quotation {0} not of type {1},Idézet {0} nem type {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +93,Quotation {0} not of type {1},Idézet {0} nem type {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,Karbantartandó eszköz
 DocType: Sales Order,%  Delivered,% kiszállítva
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,Bank Overdraft Account,Folyószámlahitel Account
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +15,Make Salary Slip,Bérlap készítése
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +18,Browse BOM,Keressen BOM
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +175,Secured Loans,Zálogkölcsön
-apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +3,Awesome Products,Döbbenetes termékek
+apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +3,Awesome Products,Döbbenetes termékek
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +189,Opening Balance Equity,Nyitó egyenleg Equity
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +80,Cannot approve leave as you are not authorized to approve leaves on Block Dates,Nem tudja jóváhagyni szabadság akkor Ön nem jogosult jóváhagyni levelek blokkolása dátuma
 DocType: Appraisal,Appraisal,Teljesítmény értékelés
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +13,Lost-foam casting,Lost-hab öntés
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +47,Drawing,Rajz
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +22,Date is repeated,Dátum megismétlődik
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +148,Leave approver must be one of {0},Hagyja jóváhagyóhoz közül kell {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +162,Leave approver must be one of {0},Hagyja jóváhagyóhoz közül kell {0}
 DocType: Hub Settings,Seller Email,Eladó Email
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Beszerzés teljes költségének (via vásárlást igazoló számlát)
 DocType: Workstation Working Hour,Start Time,Start Time
@@ -2488,7 +2398,7 @@
 DocType: Purchase Invoice Item,Net Amount (Company Currency),Nettó összeg (Társaság Currency)
 DocType: BOM Operation,Hour Rate,Órás sebesség
 DocType: Stock Settings,Item Naming By,Elem elnevezés típusa
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +642,From Quotation,Árajánlat
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +655,From Quotation,Árajánlat
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},Egy újabb pont a nevezési határidő {0} azután tette {1}
 DocType: Production Order,Material Transferred for Manufacturing,Anyag átrakva gyártáshoz
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +29,Account {0} does not exists,Account {0} nem létezik
@@ -2502,21 +2412,19 @@
 DocType: Purchase Invoice Item,PR Detail,PR részlete
 DocType: Sales Order,Fully Billed,Teljesen számlázott
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +20,Cash In Hand,A készpénz
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +72,Delivery warehouse required for stock item {0},Szállítási raktárban szükséges állomány elem {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +119,Delivery warehouse required for stock item {0},Szállítási raktárban szükséges állomány elem {0}
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),A bruttó tömeg a csomag. Általában a nettó tömeg + csomagolóanyag súlyát. (Nyomtatási)
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,"A felhasználók ezzel a szereppel megengedett, hogy a befagyasztott számlák és létrehozza / módosítja könyvelési tételek ellen befagyasztott számlák"
 DocType: Serial No,Is Cancelled,ez törölve
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +281,My Shipments,Saját szállítások
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +286,My Shipments,Saját szállítások
 DocType: Journal Entry,Bill Date,Bill dátuma
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +43,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","Még ha több árképzési szabályok kiemelten, akkor a következő belső prioritások kerülnek alkalmazásra:"
 DocType: Supplier,Supplier Details,Beszállító részletei
 DocType: Communication,Recipients,Címzettek
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +146,Screwing,Csavarozás
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +96,Knurling,Knurling
 DocType: Expense Claim,Approval Status,Jóváhagyás állapota
 DocType: Hub Settings,Publish Items to Hub,Közzé tételek Hub
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +44,From value must be less than to value in row {0},"Re kisebb legyen, mint az értéket sorban {0}"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +133,Wire Transfer,Banki átutalás
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +133,Wire Transfer,Banki átutalás
 apps/erpnext/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py +25,Please select Bank Account,"Kérjük, válasszon Bank Account"
 DocType: Newsletter,Create and Send Newsletters,Létrehozása és küldése hírlevelek
 apps/frappe/frappe/public/js/frappe/views/reports/grid_report.js +305,From Date must be before To Date,"Dátum kell, mielőtt To Date"
@@ -2524,14 +2432,14 @@
 DocType: Company,Default Income Account,Alapértelmezett bejövő számla
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,Vásárlói csoport / Ügyfélszolgálat
 DocType: Item Group,Check this if you want to show in website,"Jelölje be, ha azt szeretné, hogy megmutassa a honlapon"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +190,Welcome to ERPNext,Üdvözöl az ERPNext
+,Welcome to ERPNext,Üdvözöl az ERPNext
 DocType: Payment Reconciliation Payment,Voucher Detail Number,Utalvány Részlet száma
 apps/erpnext/erpnext/config/crm.py +146,Lead to Quotation,Vezethet Idézet
 DocType: Lead,From Customer,Az Ügyfél
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +37,Calls,Hívások
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Calls,Hívások
 DocType: Project,Total Costing Amount (via Time Logs),Összesen Költség Összeg (via Idő Napló)
 DocType: Purchase Order Item Supplied,Stock UOM,Készlet mértékegysége
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Purchase Order {0} is not submitted,Megrendelés {0} nem nyújtják be
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +194,Purchase Order {0} is not submitted,Megrendelés {0} nem nyújtják be
 ,Projected,Tervezett
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},Serial No {0} nem tartozik Warehouse {1}
 apps/erpnext/erpnext/controllers/status_updater.py +136,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,"Megjegyzés: A rendszer nem ellenőrzi túlteljesítés és over-foglalás jogcím {0}, mint a mennyiség vagy összeg 0"
@@ -2539,7 +2447,6 @@
 DocType: Issue,Opening Date,Kezdési dátum
 DocType: Journal Entry,Remark,Megjegyzés
 DocType: Purchase Receipt Item,Rate and Amount,Érték és mennyiség
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +95,Boring,Unalmas
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +667,From Sales Order,Áthozás értékesítési megrendelésből
 DocType: Blog Category,Parent Website Route,Szülő Weboldal Route
 DocType: Sales Order,Not Billed,Nem számlázott
@@ -2553,19 +2460,17 @@
 apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount Amount,Kedvezmény összege
 DocType: Purchase Invoice,Return Against Purchase Invoice,Return Against vásárlási számla
 DocType: Item,Warranty Period (in days),Garancia hossza (napokban)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +550,e.g. VAT,pl. ÁFA
+apps/erpnext/erpnext/public/js/setup_wizard.js +292,e.g. VAT,pl. ÁFA
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,4. pont
 DocType: Journal Entry Account,Journal Entry Account,Könyvelési tétel számlaszáma
 DocType: Shopping Cart Settings,Quotation Series,Idézet Series
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +52,"An item exists with same name ({0}), please change the item group name or rename the item","Egy elem létezik azonos nevű ({0}), kérjük, változtassa meg a tételt csoport nevét, vagy nevezze át a tételt"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +82,Hot metal gas forming,Forró fém gázt előállító
 DocType: Sales Order Item,Sales Order Date,Vevői rendelés dátuma
 DocType: Sales Invoice Item,Delivered Qty,Kiszállított mennyiség
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +63,Warehouse {0}: Company is mandatory,Warehouse {0}: Cég kötelező
 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.","Tovább a megfelelő csoportba (általában forrása alapok&gt; Rövid lejáratú kötelezettségek&gt; Adók és Illetékek és hozzon létre egy új fiók (kattintva Add Child) típusú &quot;adó&quot;, és nem beszélve az adókulcs."
 ,Payment Period Based On Invoice Date,Fizetési határidő számla alapján dátuma
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +50,Missing Currency Exchange Rates for {0},Hiányzó valutaárfolyamok: {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +135,Laser cutting,Lézeres vágás
 DocType: Event,Monday,Hétfő
 DocType: Journal Entry,Stock Entry,Készlet mozgás
 DocType: Account,Payable,Kifizetendő
@@ -2598,7 +2503,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +111,Date Of Retirement must be greater than Date of Joining,"A nyugdíjazás nagyobbnak kell lennie, mint Csatlakozás dátuma"
 DocType: Sales Invoice,Against Income Account,Elleni jövedelem számla
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +69,{0}% Delivered,{0}% szállítva
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +78,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,"Elem {0}: Rendezett Mennyiség {1} nem lehet kevesebb, mint a minimális rendelési mennyiség {2} (pontban meghatározott)."
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,"Elem {0}: Rendezett Mennyiség {1} nem lehet kevesebb, mint a minimális rendelési mennyiség {2} (pontban meghatározott)."
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Havi elosztási százalék
 DocType: Territory,Territory Targets,Területi célpontok
 DocType: Delivery Note,Transporter Info,Fuvarozó adatai
@@ -2607,7 +2512,6 @@
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,Címeket nyomtatási sablonok pl Pro forma számla.
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +140,Valuation type charges can not marked as Inclusive,Értékelés típusú költségeket nem lehet megjelölni Inclusive
 DocType: POS Profile,Update Stock,Készlet frissítése
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +128,Superfinishing,Szuperfiniselési
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,"Különböző mértékegysége elemek, az helytelen (Total) Nettó súly értéket. Győződjön meg arról, hogy a nettó tömege egyes tételek ugyanabban UOM."
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM Rate
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +85,Please pull items from Delivery Note,"Kérjük, húzza elemeket szállítólevél"
@@ -2622,7 +2526,6 @@
 ,Purchase Analytics,Vásárlási Analytics
 DocType: Sales Invoice Item,Delivery Note Item,Szállítólevél tétel
 DocType: Expense Claim,Task,Feladat
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +57,Shaving,Borotválkozás
 DocType: Purchase Taxes and Charges,Reference Row #,Referencia Row #
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},Batch szám kötelező tétel {0}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js +14,This is a root sales person and cannot be edited.,"Ez egy gyökér értékesítő személyt, és nem lehet szerkeszteni."
@@ -2634,13 +2537,11 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +74,Purpose must be one of {0},Ezen célok közül kell választani: {0}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +108,Fill the form and save it,"Töltse ki az űrlapot, és mentse el"
 DocType: Production Planning Tool,Download a report containing all raw materials with their latest inventory status,"Töltse le a jelentést, amely tartalmazza az összes nyersanyagot, a legfrissebb Készlet állapot"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +94,Facing,Szembenézni
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,Közösségi Fórum
 DocType: Leave Application,Leave Balance Before Application,Hagyja Balance alkalmazása előtt
 DocType: SMS Center,Send SMS,SMS küldése
 DocType: Company,Default Letter Head,Alapértelmezett levélfejléc
 DocType: Time Log,Billable,Számlázható
-DocType: Authorization Rule,This will be used for setting rule in HR module,Ez lesz használva beállítására szabály HR modulban
 DocType: Account,Rate at which this tax is applied,"Arány, amely ezt az adót alkalmaznak"
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reorder Qty,Újra rendelendő mennyiség
 DocType: Company,Stock Adjustment Account,Stock korrekció számla
@@ -2667,16 +2568,15 @@
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,Százalékos megoszlás egyenlőnek kell lennie a 100%
 DocType: Serial No,Out of AMC,ÉKSz időn túl
 DocType: Purchase Order Item,Material Request Detail No,Anyag kérése Részlet No
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +97,Hard turning,Keményesztergálást
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +33,Make Maintenance Visit,Karbantartási látogatás készítése
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +187,Please contact to the user who have Sales Master Manager {0} role,"Kérjük, lépjen kapcsolatba a felhasználónak, akik Sales mester menedzser {0} szerepe"
 DocType: Company,Default Cash Account,Alapértelmezett pénzforgalmi számlát
 apps/erpnext/erpnext/config/accounts.py +79,Company (not Customer or Supplier) master.,Cég (nem ügyfél vagy szállító) mestere.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +106,Please enter 'Expected Delivery Date',"Kérjük, írja be a ""szülés várható időpontja"""
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +187,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Szállítólevelek {0} törölni kell lemondása előtt ezt a Vevői rendelés
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +100,Please enter 'Expected Delivery Date',"Kérjük, írja be a ""szülés várható időpontja"""
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +182,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Szállítólevelek {0} törölni kell lemondása előtt ezt a Vevői rendelés
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +373,Paid amount + Write Off Amount can not be greater than Grand Total,"Befizetett összeg + Írja egyszeri összeg nem lehet nagyobb, mint a Grand Total"
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} nem érvényes Batch Number jogcím {1}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,Note: There is not enough leave balance for Leave Type {0},Megjegyzés: Nincs elég szabadság mérlege Leave Type {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +124,Note: There is not enough leave balance for Leave Type {0},Megjegyzés: Nincs elég szabadság mérlege Leave Type {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.","Megjegyzés: Ha a fizetés nem történik ellen utalást, hogy Naplókönyvelés kézzel."
 DocType: Item,Supplier Items,Szállító elemek
 DocType: Opportunity,Opportunity Type,Lehetőség Type
@@ -2688,7 +2588,7 @@
 DocType: Hub Settings,Publish Availability,Közzé Elérhetőség
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +105,Date of Birth cannot be greater than today.,"Születési idő nem lehet nagyobb, mint ma."
 ,Stock Ageing,Készlet öregedés
-apps/erpnext/erpnext/controllers/accounts_controller.py +200,{0} '{1}' is disabled,"{0} ""{1}"" le van tiltva"
+apps/erpnext/erpnext/controllers/accounts_controller.py +201,{0} '{1}' is disabled,"{0} ""{1}"" le van tiltva"
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Beállítás Nyílt
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Küldd automatikus e-maileket Kapcsolatok benyújtásával tranzakciókat.
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +232,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
@@ -2697,44 +2597,38 @@
 DocType: Purchase Order,Customer Contact Email,Vásárlói Email
 DocType: Event,Sunday,Vasárnap
 DocType: Sales Team,Contribution (%),Hozzájárulás (%)
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +455,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,"Megjegyzés: Fizetés bejegyzés nem hozható létre, mert ""Készpénz vagy bankszámláját"" nem volt megadva"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +171,Responsibilities,Felelősségek
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +457,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,"Megjegyzés: Fizetés bejegyzés nem hozható létre, mert ""Készpénz vagy bankszámláját"" nem volt megadva"
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +171,Responsibilities,Felelősségek
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Template,Sablon
 DocType: Sales Person,Sales Person Name,Értékesítő neve
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,"Kérjük, adja atleast 1 számlát a táblázatban"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +511,Add Users,Felhasználók hozzáadása
+apps/erpnext/erpnext/public/js/setup_wizard.js +255,Add Users,Felhasználók hozzáadása
 DocType: Pricing Rule,Item Group,Anyagcsoport
 DocType: Task,Actual Start Date (via Time Logs),Tényleges kezdési dátum (via Idő Napló)
 DocType: Stock Reconciliation Item,Before reconciliation,Mielőtt megbékélés
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +12,To {0},{0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Adók és költségek hozzáadása (a cég pénznemében)
-apps/erpnext/erpnext/stock/doctype/item/item.py +340,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Elem Tax Row {0} kell figyelembe típusú adót vagy bevételként vagy ráfordításként vagy fizetős
+apps/erpnext/erpnext/stock/doctype/item/item.py +344,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Elem Tax Row {0} kell figyelembe típusú adót vagy bevételként vagy ráfordításként vagy fizetős
 DocType: Sales Order,Partly Billed,Részben számlázott
 DocType: Item,Default BOM,Alapértelmezett BOM
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +79,Decambering,Decambering
 apps/erpnext/erpnext/setup/doctype/company/company.js +22,Please re-type company name to confirm,"Kérjük ismíteld cég nevét, hogy erősítse"
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,Teljes fennálló Amt
 DocType: Time Log Batch,Total Hours,Össz óraszám
 DocType: Journal Entry,Printing Settings,Nyomtatási beállítások
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +268,Total Debit must be equal to Total Credit. The difference is {0},"Összesen Betéti kell egyeznie az összes Credit. A különbség az, {0}"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +11,Automotive,Automotive
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +37,Item is required,Elem szükséges
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +25,Metal injection molding,Fém fröccsöntés
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +258,Total Debit must be equal to Total Credit. The difference is {0},"Összesen Betéti kell egyeznie az összes Credit. A különbség az, {0}"
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,Automotive
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +684,From Delivery Note,Áthozás fuvarlevélből
 DocType: Time Log,From Time,Időtől
 DocType: Notification Control,Custom Message,Egyedi üzenet
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +33,Investment Banking,Investment Banking
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +261,"Select your Country, Time Zone and Currency","Válassza ki az országot, időzóna és a pénznem"
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,Investment Banking
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +316,"Select your Country, Time Zone and Currency","Válassza ki az országot, időzóna és a pénznem"
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +369,Cash or Bank Account is mandatory for making payment entry,Készpénz vagy bankszámlára kötelező a fizetés bejegyzés
 DocType: Purchase Invoice,Price List Exchange Rate,Árlista árfolyam
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +91,Pickling,Pácolás
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +18,Sand casting,Homoköntésnél
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +117,Electroplating,Electroplating
 DocType: Purchase Invoice Item,Rate,Arány
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +62,Intern,Intern
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Intern,Intern
 DocType: Newsletter,A Lead with this email id should exist,Egy célpont ezzel az email címmel már létezik
 DocType: Stock Entry,From BOM,Anyagjegyzékből
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +34,Basic,Alapvető
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +34,Basic,Alapvető
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,Részvény tranzakciók előtt {0} befagyasztották
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +217,Please click on 'Generate Schedule',"Kérjük, kattintson a ""Létrehoz Menetrend"""
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +61,To Date should be same as From Date for Half Day leave,El kellene megegyezik Dátum fél napra szabadságra
@@ -2742,10 +2636,10 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +96,Reference No is mandatory if you entered Reference Date,"Hivatkozási szám kötelező, amennyiben megadta Referencia dátum"
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +108,Date of Joining must be greater than Date of Birth,A belépés dátumának nagyobbnak kell lennie a születési dátumnál
 DocType: Salary Structure,Salary Structure,Bérrendszer
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +242,"Multiple Price Rule exists with same criteria, please resolve \
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +246,"Multiple Price Rule exists with same criteria, please resolve \
 			conflict by assigning priority. Price Rules: {0}","Többszörös Ár szabály létezik azonos kritériumok, kérjük, oldja \ konfliktus elsőbbséget. Ár Szabályok: {0}"
 DocType: Account,Bank,Bank
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +9,Airline,Légitársaság
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,Légitársaság
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +493,Issue Material,Kérdés Anyag
 DocType: Material Request Item,For Warehouse,Ebbe a raktárba
 DocType: Employee,Offer Date,Ajánlat dátum
@@ -2755,29 +2649,24 @@
 DocType: Item,Is Fixed Asset Item,A befektetett eszközök tételeire
 DocType: Stock Entry,Including items for sub assemblies,Beleértve elemek részegységek
 DocType: Features Setup,"If you have long print formats, this feature can be used to split the page to be printed on multiple pages with all headers and footers on each page","Ha hosszú a nyomtatási formátumot, ez a funkció is használható szét a nyomtatandó oldal több oldalon az összes fejléc és lábléc minden oldalon"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +131,Hobbing,Hobbing
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +98,All Territories,Minden Területek
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +98,All Territories,Minden Területek
 DocType: Purchase Invoice,Items,Tételek
 DocType: Fiscal Year,Year Name,Év Név
 DocType: Process Payroll,Process Payroll,Bérszámfejtéséhez
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +59,There are more holidays than working days this month.,"Jelenleg több, mint a szabadság munkanapon ebben a hónapban."
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +68,There are more holidays than working days this month.,"Jelenleg több, mint a szabadság munkanapon ebben a hónapban."
 DocType: Product Bundle Item,Product Bundle Item,Termék Bundle pont
 DocType: Sales Partner,Sales Partner Name,Értékesítő partner neve
 DocType: Purchase Invoice Item,Image View,Kép megtekintése
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +113,Finishing & industrial finishing,Befejező &amp; ipari feldolgozása
 DocType: Issue,Opening Time,Kezdési idő
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,Ettől és időpontok megadása
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +46,Securities & Commodity Exchanges,Securities & árutőzsdén
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Securities & árutőzsdén
 DocType: Shipping Rule,Calculate Based On,A számítás ezen alapul
 DocType: Delivery Note Item,From Warehouse,Raktárról
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +98,Drilling,Fúrás
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +28,Blow molding,Flakonfúvó
 DocType: Purchase Taxes and Charges,Valuation and Total,Értékelési és Total
 DocType: Tax Rule,Shipping City,Szállítási Város
 apps/erpnext/erpnext/stock/doctype/item/item.js +43,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,"Ez pont egy változata {0} (Template). Attribútumok kerülnek másolásra át a sablont, kivéve, ha ""No Copy"" van beállítva"
 DocType: Account,Purchase User,Vásárlási Felhasználó
 DocType: Notification Control,Customize the Notification,Értesítés testreszabása
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +87,Hammering,Kalapálás
 DocType: Web Page,Slideshow,Diabemutató
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +24,Default Address Template cannot be deleted,Alapértelmezett Címsablon nem lehet törölni
 DocType: Sales Invoice,Shipping Rule,Szállítási lehetőség
@@ -2786,9 +2675,8 @@
 DocType: Workflow State,Search,Keresés
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +54,Total cannot be zero,Összesen nem lehet nulla
 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,"""Az utolsó rendelés óta eltelt napok""-nak nagyobbnak vagy egyenlőnek kell lennie nullával"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +142,Brazing,Brazing
 DocType: C-Form,Amended From,Módosított től
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Raw Material,Nyersanyag
+apps/erpnext/erpnext/public/js/setup_wizard.js +359,Raw Material,Nyersanyag
 DocType: Leave Application,Follow via Email,Kövesse e-mailben
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Adó összege után kedvezmény összege
 apps/erpnext/erpnext/accounts/doctype/account/account.py +174,Child account exists for this account. You can not delete this account.,Gyermek fiók létezik erre a számlára. Nem törölheti ezt a fiókot.
@@ -2802,10 +2690,10 @@
 ,Produced,Készült
 DocType: Item,Item Code for Suppliers,Elem Code for Ellátó
 DocType: Issue,Raised By (Email),Felvetette (e-mail)
-apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +72,General,Általános
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +495,Attach Letterhead,Levélfejléc csatolása
+apps/erpnext/erpnext/setup/setup_wizard/default_website.py +72,General,Általános
+apps/erpnext/erpnext/public/js/setup_wizard.js +241,Attach Letterhead,Levélfejléc csatolása
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +272,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',"Nem vonható le, ha a kategória a ""Értékelési"" vagy ""Értékelési és Total"""
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +542,"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.","Sorolja fel az adó fejek (például ÁFA, vám stb rendelkezniük kell egyedi neveket) és a normál áron. Ez létre fog hozni egy szokásos sablon, amely lehet szerkeszteni, és adjunk hozzá még később."
+apps/erpnext/erpnext/public/js/setup_wizard.js +284,"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.","Sorolja fel az adó fejek (például ÁFA, vám stb rendelkezniük kell egyedi neveket) és a normál áron. Ez létre fog hozni egy szokásos sablon, amely lehet szerkeszteni, és adjunk hozzá még később."
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial Nos Required for Serialized Item {0},Serial Nos Szükséges a Serialized tétel {0}
 DocType: Journal Entry,Bank Entry,Bank Entry
 DocType: Authorization Rule,Applicable To (Designation),Alkalmazandó (elnevezését)
@@ -2814,32 +2702,31 @@
 apps/erpnext/erpnext/config/accounts.py +143,Enable / disable currencies.,Engedélyezése / tiltása a pénznemnek
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Postal Expenses,Postai költségek
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Összesen (AMT)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +26,Entertainment & Leisure,Szórakozás és szabadidő
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,Szórakozás és szabadidő
 DocType: Purchase Order,The date on which recurring order will be stop,"Az időpont, amikor az ismétlődő rend lesz megállítani"
 DocType: Quality Inspection,Item Serial No,Anyag-sorozatszám
 apps/erpnext/erpnext/controllers/status_updater.py +142,{0} must be reduced by {1} or you should increase overflow tolerance,{0} csökkenteni kell {1} ​​vagy növelnie kell overflow tolerancia
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Present,Összesen Present
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Hour,Óra
+apps/erpnext/erpnext/public/js/setup_wizard.js +363,Hour,Óra
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +138,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation",Serialized Elem {0} nem lehet frissíteni \ felhasználásával Stock Megbékélés
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +488,Transfer Material to Supplier,Át az anyagot szállító
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +513,Transfer Material to Supplier,Át az anyagot szállító
 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,Új Serial No nem lehet Warehouse. Warehouse kell beállítani Stock Entry vagy vásárlási nyugta
 DocType: Lead,Lead Type,Célpont típusa
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +82,Create Quotation,Hozzon létre Idézet
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +306,All these items have already been invoiced,Mindezen tételek már kiszámlázott
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,You are not authorized to approve leaves on Block Dates,Ön nem jogosult jóváhagyni levelek blokkolása időpontjai
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +311,All these items have already been invoiced,Mindezen tételek már kiszámlázott
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},Lehet jóvá {0}
 DocType: Shipping Rule,Shipping Rule Conditions,Szállítás feltételei
 DocType: BOM Replace Tool,The new BOM after replacement,"Az anyagjegyzék, amire le lesz cserélve mindenhol"
 DocType: Features Setup,Point of Sale,Értékesítési hely
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +83,Curling,Bodorítás
 DocType: Account,Tax,Adó
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +28,Row {0}: {1} is not a valid {2},Row {0}: {1} nem érvényes {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +89,Refining,Finomítás
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +37,Row {0}: {1} is not a valid {2},Row {0}: {1} nem érvényes {2}
 DocType: Production Planning Tool,Production Planning Tool,Gyártástervező eszköz
 DocType: Quality Inspection,Report Date,Jelentés dátuma
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +130,Routing,Routing
 DocType: C-Form,Invoices,Számlák
 DocType: Job Opening,Job Title,Állás megnevezése
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +54,{0} already allocated for Employee {1} for period {2} - {3},{0} már elkülönített Employee {1} időszakra {2} - {3}
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +80,{0} Recipients,{0} címzettek
 DocType: Features Setup,Item Groups in Details,Az anyagcsoport részletei
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +335,Quantity to Manufacture must be greater than 0.,"Mennyiség hogy Előállítás nagyobbnak kell lennie, mint 0."
@@ -2858,14 +2745,13 @@
 DocType: DocType,Setup,Beállítás
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,Nincs semmi szerkeszteni.
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +108,Summary for this month and pending activities,"Összefoglaló ebben a hónapban, és folyamatban lévő tevékenységek"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +39,Cold rolling,Hideghengerléséhez
 DocType: Customer Group,Customer Group Name,Vevő csoport neve
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +408,Please remove this Invoice {0} from C-Form {1},Töröld a számla {0} a C-Form {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +410,Please remove this Invoice {0} from C-Form {1},Töröld a számla {0} a C-Form {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,"Kérjük, válasszon átviszi, ha Ön is szeretné közé előző pénzügyi év mérlege hagyja a költségvetési évben"
 DocType: GL Entry,Against Voucher Type,Ellen-bizonylat típusa
 DocType: Item,Attributes,Attribútumok
 DocType: Packing Slip,Get Items,Tételek áthozása
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +186,Please enter Write Off Account,"Kérjük, adja leírni Account"
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +187,Please enter Write Off Account,"Kérjük, adja leírni Account"
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +71,Last Order Date,Utolsó rendelési dátum
 DocType: DocField,Image,Kép
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +179,Make Excise Invoice,Tedd Jövedéki számla
@@ -2875,7 +2761,7 @@
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +146,Operation ID not set,Operation ID nincs beállítva
 DocType: Production Order,Planned Start Date,Tervezett kezdési dátum
 DocType: Serial No,Creation Document Type,Creation Document Type
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +620,Maint. Visit,Karba. Látogassa
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +631,Maint. Visit,Karba. Látogassa
 DocType: Leave Type,Is Encash,A behajt
 DocType: Purchase Invoice,Mobile No,Mobiltelefon
 DocType: Payment Tool,Make Journal Entry,Tedd Naplókönyvelés
@@ -2883,35 +2769,31 @@
 apps/erpnext/erpnext/controllers/trends.py +257,Project-wise data is not available for Quotation,Project-bölcs adatok nem állnak rendelkezésre árajánlat
 DocType: Project,Expected End Date,Várható befejezés dátuma
 DocType: Appraisal Template,Appraisal Template Title,Teljesítmény értékelő sablon címe
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +440,Commercial,Kereskedelmi
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +378,Commercial,Kereskedelmi
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +23,Parent Item {0} must not be a Stock Item,Szülőelem {0} nem lehet Stock pont
 DocType: Cost Center,Distribution Id,Nagykereskedelem azonosító
-apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +14,Awesome Services,Döbbenetes szolgáltatások
+apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +14,Awesome Services,Döbbenetes szolgáltatások
 apps/erpnext/erpnext/config/manufacturing.py +29,All Products or Services.,Minden termék és szolgáltatás.
 DocType: Purchase Invoice,Supplier Address,Beszállító címe
 DocType: Contact Us Settings,Address Line 2,2. cím sor
 DocType: ToDo,Reference,Kapcsolat
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +59,Perforating,Perforáló
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,Out Mennyiség
 apps/erpnext/erpnext/config/accounts.py +128,Rules to calculate shipping amount for a sale,Szabályok számítani a szállítási költség egy eladó
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +29,Series is mandatory,Sorozat kötelező
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +28,Financial Services,Pénzügyi szolgáltatások
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,Pénzügyi szolgáltatások
 apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3},Érték Képesség {0} kell tartományon belül a {1} {2} a lépésekben {3}
 DocType: Tax Rule,Sales,Értékesítés
 DocType: Stock Entry Detail,Basic Amount,Alapösszege
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +173,Warehouse required for stock Item {0},Warehouse szükséges Stock tétel {0}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +178,Warehouse required for stock Item {0},Warehouse szükséges Stock tétel {0}
 DocType: Leave Allocation,Unused leaves,A fel nem használt levelek
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,Kr
 DocType: Customer,Default Receivable Accounts,Default Követelés számlák
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +102,Sawing,Fűrészelés
 DocType: Tax Rule,Billing State,Számlázási állam
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +32,Laminating,Laminating
 DocType: Item Reorder,Transfer,Átutalás
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +549,Fetch exploded BOM (including sub-assemblies),Hozz robbant BOM (beleértve a részegységeket)
 DocType: Authorization Rule,Applicable To (Employee),Alkalmazandó (Employee)
 apps/erpnext/erpnext/controllers/accounts_controller.py +101,Due Date is mandatory,Due Date kötelező
 apps/erpnext/erpnext/controllers/item_variant.py +51,Increment for Attribute {0} cannot be 0,Növekménye Képesség {0} nem lehet 0
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +143,Sintering,Szinterezés
 DocType: Journal Entry,Pay To / Recd From,Fizetni / követelni tőle
 DocType: Naming Series,Setup Series,Sorszámozás beállítása
 DocType: Supplier,Contact HTML,Kapcsolattartó HTML leírása
@@ -2924,7 +2806,6 @@
 DocType: Attendance,Absent,Hiányzik
 DocType: Product Bundle,Product Bundle,Termék Bundle
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +180,Row {0}: Invalid reference {1},Sor {0}: Érvénytelen hivatkozás {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +165,Crushing,Zúzó
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Vásároljon adók és illetékek Template
 DocType: Upload Attendance,Download Template,Sablon letöltése
 DocType: GL Entry,Remarks,Megjegyzések
@@ -2932,14 +2813,12 @@
 DocType: Journal Entry,Write Off Based On,Írja Off alapuló
 DocType: Features Setup,POS View,POS megtekintése
 apps/erpnext/erpnext/config/stock.py +38,Installation record for a Serial No.,Telepítés rekordot a Serial No.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +9,Continuous casting,Folyamatos öntés
 apps/erpnext/erpnext/public/js/queries.js +39,Please specify a,Kérem adjon meg egy
 DocType: Offer Letter,Awaiting Response,Várom a választ
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +53,Above,Fent
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +80,Cold sizing,Hideg méretezés
 DocType: Salary Slip,Earning & Deduction,Kereset és levonás
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +76,Account {0} cannot be a Group,Account {0} nem lehet Group
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +259,Region,Régió
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +314,Region,Régió
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +213,Optional. This setting will be used to filter in various transactions.,"Opcionális. Ez a beállítás kell használni, a különböző tranzakciókat."
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +104,Negative Valuation Rate is not allowed,Negatív értékelési Rate nem megengedett
 DocType: Holiday List,Weekly Off,Heti Off
@@ -2957,7 +2836,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,Account {0} is inactive,Account {0} inaktív
 DocType: GL Entry,Is Advance,Ez előleg?
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,Jelenléti Dátum és jelenlét a mai napig kötelező
-apps/erpnext/erpnext/controllers/buying_controller.py +131,Please enter 'Is Subcontracted' as Yes or No,"Kérjük, írja be a ""alvállalkozói"", mint Igen vagy Nem"
+apps/erpnext/erpnext/controllers/buying_controller.py +122,Please enter 'Is Subcontracted' as Yes or No,"Kérjük, írja be a ""alvállalkozói"", mint Igen vagy Nem"
 DocType: Sales Team,Contact No.,Kapcsolattartó szám
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,'Profit and Loss' type account {0} not allowed in Opening Entry,"""Eredménykimutatás"" típusú számla {0} nem engedélyezett Nyitó Bejegyzés"
 DocType: Workflow State,Time,Idő
@@ -2966,14 +2845,13 @@
 DocType: Authorization Rule,Authorization Rule,Jóváhagyási szabály
 DocType: Sales Invoice,Terms and Conditions Details,Általános szerződési feltételek részletei
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,Értékesítési adók és költségek sablon
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +10,Apparel & Accessories,Ruházat és kiegészítők
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,Ruházat és kiegészítők
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +67,Number of Order,Számú rendelés
 DocType: Item Group,HTML / Banner that will show on the top of product list.,HTML / Banner hogy megjelenik a tetején termékek listáját.
 DocType: Shipping Rule,Specify conditions to calculate shipping amount,"Adja feltételek kiszámításához a szállítási költség,"
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +121,Add Child,Add Child
 DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,Szerepe lehet élesíteni befagyasztott számlák és szerkesztése Frozen bejegyzések
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +52,Cannot convert Cost Center to ledger as it has child nodes,Nem lehet átalakítani költséghely főkönyvi hiszen a gyermek csomópontok
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +47,Conversion Factor is required,Átváltási arányra is szükség
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +37,Serial #,Serial #
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +87,Commission on Sales,Eladási jutalékok
 DocType: Offer Letter Term,Value / Description,Érték / Leírás
@@ -2981,10 +2859,8 @@
 ,Customers Not Buying Since Long Time,Az ügyfelek nem vásárolnak hosszú idő óta
 DocType: Production Order,Expected Delivery Date,Várható szállítás dátuma
 apps/erpnext/erpnext/accounts/general_ledger.py +121,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Terhelés és jóváírás nem egyenlő a {0} # {1}. Különbség van {2}.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +48,Bulging,Domború
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +11,Evaporative-pattern casting,A párolgási-minta casting
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Entertainment Expenses,Reprezentációs költségek
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +195,Sales Invoice {0} must be cancelled before cancelling this Sales Order,Értékesítési számlák {0} törölni kell lemondása előtt ezt a Vevői rendelés
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +190,Sales Invoice {0} must be cancelled before cancelling this Sales Order,Értékesítési számlák {0} törölni kell lemondása előtt ezt a Vevői rendelés
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +61,Age,Életkor
 DocType: Time Log,Billing Amount,Számlázási Összeg
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +84,Invalid quantity specified for item {0}. Quantity should be greater than 0.,"Érvénytelen mennyiséget megadott elem {0}. A mennyiség nagyobb, mint 0."
@@ -3003,26 +2879,24 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,Új Vásárló Revenue
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Travel Expenses,Utazási költségek
 DocType: Maintenance Visit,Breakdown,Üzemzavar
-apps/erpnext/erpnext/controllers/accounts_controller.py +241,Account: {0} with currency: {1} can not be selected,Fiók: {0} pénznem: {1} nem választható
+apps/erpnext/erpnext/controllers/accounts_controller.py +242,Account: {0} with currency: {1} can not be selected,Fiók: {0} pénznem: {1} nem választható
 DocType: Bank Reconciliation Detail,Cheque Date,Csekk dátuma
 apps/erpnext/erpnext/accounts/doctype/account/account.py +47,Account {0}: Parent account {1} does not belong to company: {2},Account {0}: Parent véve {1} nem tartozik a cég: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted all transactions related to this company!,Sikeresen törölve valamennyi ügylet a vállalattal kapcsolatos!
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,Mivel a dátum
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +111,Honing,Hónolás
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +58,Probation,Próbaidő
-apps/erpnext/erpnext/stock/doctype/item/item.py +264,Default Warehouse is mandatory for stock Item.,Alapértelmezett Warehouse kötelező Stock tétel.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Probation,Próbaidő
+apps/erpnext/erpnext/stock/doctype/item/item.py +268,Default Warehouse is mandatory for stock Item.,Alapértelmezett Warehouse kötelező Stock tétel.
 DocType: Feed,Full Name,Teljes név
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +148,Clinching,Mezőnyében
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +191,Payment of salary for the month {0} and year {1},Kifizetését fizetése a hónap {0} és az év {1}
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +173,Payment of salary for the month {0} and year {1},Kifizetését fizetése a hónap {0} és az év {1}
 DocType: Stock Settings,Auto insert Price List rate if missing,"Auto insert árjegyzéke mértéke, ha hiányzik"
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,Teljes befizetett összeg
 ,Transferred Qty,Át Mennyiség
 apps/erpnext/erpnext/config/learn.py +11,Navigating,Navigálás
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +137,Planning,Tervezés
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +137,Planning,Tervezés
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +9,Make Time Log Batch,Legyen ideje Bejelentkezés Batch
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Issued,Kiadott
 DocType: Project,Total Billing Amount (via Time Logs),Összesen Számlázási összeg (via Idő Napló)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +629,We sell this Item,Az általunk forgalmazott ezt a tárgyat
+apps/erpnext/erpnext/public/js/setup_wizard.js +365,We sell this Item,Az általunk forgalmazott ezt a tárgyat
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +65,Supplier Id,Szállító Id
 DocType: Journal Entry,Cash Entry,Készpénz Entry
 DocType: Sales Partner,Contact Desc,Kapcsolattartó leírása
@@ -3031,18 +2905,16 @@
 DocType: Brand,Item Manager,Elem menedzser
 DocType: Cost Center,Add rows to set annual budgets on Accounts.,Add sorok beállítani éves költségvetésekben számlák.
 DocType: Buying Settings,Default Supplier Type,Alapértelmezett beszállító típus
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +160,Quarrying,Kőfejtés
 DocType: Production Order,Total Operating Cost,Teljes működési költség
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +160,Note: Item {0} entered multiple times,Megjegyzés: Elem {0} többször jelenik meg
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +163,Note: Item {0} entered multiple times,Megjegyzés: Elem {0} többször jelenik meg
 apps/erpnext/erpnext/config/crm.py +27,All Contacts.,Minden Kapcsolattartó.
 DocType: Newsletter,Test Email Id,Teszt email azonosítója
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +394,Company Abbreviation,Cég rövidítése
+apps/erpnext/erpnext/public/js/setup_wizard.js +142,Company Abbreviation,Cég rövidítése
 DocType: Features Setup,If you follow Quality Inspection. Enables Item QA Required and QA No in Purchase Receipt,"Ha követed Minőség-ellenőrzési. Lehetővé teszi a tétel QA szükség, és QA Nem a vásárláskor kapott nyugtát"
 DocType: GL Entry,Party Type,Párt Type
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +68,Raw material cannot be same as main Item,"Alapanyag nem lehet ugyanaz, mint a fő elem"
 DocType: Item Attribute Value,Abbreviation,Rövidítés
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,Nem authroized hiszen {0} meghaladja határértékek
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +30,Rotational molding,Rotációs öntés
 apps/erpnext/erpnext/config/hr.py +115,Salary template master.,Fizetés sablon mester.
 DocType: Leave Type,Max Days Leave Allowed,Max nap szabadságra hozhatja
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +55,Set Tax Rule for shopping cart,Állítsa adózási szabály az bevásárlókosár
@@ -3056,15 +2928,15 @@
 apps/erpnext/erpnext/config/selling.py +18,Quotes to Leads or Customers.,Idézetek a vezetéket vagy ügyfelek.
 DocType: Stock Settings,Role Allowed to edit frozen stock,Zárolt készlet szerkesztésének engedélyezése ennek a beosztásnak
 ,Territory Target Variance Item Group-Wise,Terület Cél Variance tétel Group-Wise
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +101,All Customer Groups,Minden vásárlói csoport
-apps/erpnext/erpnext/controllers/accounts_controller.py +474,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} kötelező. Talán Pénzváltó rekord nem teremtett {1} {2}.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +101,All Customer Groups,Minden vásárlói csoport
+apps/erpnext/erpnext/controllers/accounts_controller.py +475,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} kötelező. Talán Pénzváltó rekord nem teremtett {1} {2}.
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +37,Tax Template is mandatory.,Adó Sablon kötelező.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +41,Account {0}: Parent account {1} does not exist,Account {0}: Parent véve {1} nem létezik
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Árlista Rate (Társaság Currency)
 DocType: Account,Temporary,Ideiglenes
 DocType: Address,Preferred Billing Address,Ez legyen a számlázási cím is
 DocType: Monthly Distribution Percentage,Percentage Allocation,Százalékos megoszlás
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +86,Secretary,Titkár
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Secretary,Titkár
 DocType: Serial No,Distinct unit of an Item,Különálló egység Egy tétel
 DocType: Pricing Rule,Buying,Beszerzés
 DocType: HR Settings,Employee Records to be created by,Munkavállalói Records által létrehozandó
@@ -3077,9 +2949,8 @@
 ,Item-wise Price List Rate,Elem-bölcs árjegyzéke Rate
 DocType: Purchase Order Item,Supplier Quotation,Beszállítói ajánlat
 DocType: Quotation,In Words will be visible once you save the Quotation.,"A szavak lesz látható, ha menteni a stringet."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +68,Ironing,Vasalás
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is stopped,{0} {1} megállt
-apps/erpnext/erpnext/stock/doctype/item/item.py +352,Barcode {0} already used in Item {1},A vonalkód {0} már használt a {1} Tételnél
+apps/erpnext/erpnext/stock/doctype/item/item.py +356,Barcode {0} already used in Item {1},A vonalkód {0} már használt a {1} Tételnél
 DocType: Lead,Add to calendar on this date,Hozzáadás a naptárhoz ezen a napon
 apps/erpnext/erpnext/config/selling.py +132,Rules for adding shipping costs.,Szabályok hozzátéve szállítási költségeket.
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,Közelgő események
@@ -3088,27 +2959,25 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +27,Quick Entry,Gyors bevitel
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0} kötelező Return
 DocType: Purchase Order,To Receive,Kapni
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +33,Shrink fitting,Shrink szerelés
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +522,user@example.com,user@example.com
+apps/erpnext/erpnext/public/js/setup_wizard.js +266,user@example.com,user@example.com
 DocType: Email Digest,Income / Expense,Bevételek / ráfordítások
 DocType: Employee,Personal Email,Személyes emailcím
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +58,Total Variance,Total Variance
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +62,Total Variance,Total Variance
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.","Ha engedélyezve van, a rendszer küldeni könyvelési tételek a leltár automatikusan."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +15,Brokerage,Ügynöki jutalék
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +15,Brokerage,Ügynöki jutalék
 DocType: Address,Postal Code,Irányítószám
 DocType: Production Order Operation,"in Minutes
 Updated via 'Time Log'","percben Frissítve keresztül ""Idő Log"""
 DocType: Customer,From Lead,Célponttól
 apps/erpnext/erpnext/config/manufacturing.py +19,Orders released for production.,Megrendelések bocsátott termelés.
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +42,Select Fiscal Year...,Válassza ki Fiscal Year ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +442,POS Profile required to make POS Entry,POS Profil köteles a POS Entry
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +444,POS Profile required to make POS Entry,POS Profil köteles a POS Entry
 DocType: Hub Settings,Name Token,Név Token
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +106,Planing,Gyalulás
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Selling,Normál Ajánló
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +120,Standard Selling,Normál Ajánló
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +137,Atleast one warehouse is mandatory,Adni legalább egy raktárban kötelező
 DocType: Serial No,Out of Warranty,Garanciaidőn túl
 DocType: BOM Replace Tool,Replace,Csere
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +314,{0} against Sales Invoice {1},{0} ellen Értékesítési számlák {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +316,{0} against Sales Invoice {1},{0} ellen Értékesítési számlák {1}
 apps/erpnext/erpnext/stock/doctype/item/item.py +49,Please enter default Unit of Measure,"Kérjük, adja alapértelmezett mértékegység"
 DocType: Purchase Invoice Item,Project Name,Projekt neve
 DocType: Supplier,Mention if non-standard receivable account,"Beszélve, ha nem szabványos követelések számla"
@@ -3124,9 +2993,8 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,Journal Entry {0} does not have account {1} or already matched against other voucher,Naplókönyvelés {0} nem veszik {1} vagy már párba utalvány
 DocType: Item,Moving Average,Mozgóátlag
 DocType: BOM Replace Tool,The BOM which will be replaced,"Az anyagjegyzék, ami le lesz cserélve mindenhol"
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +43,New Stock UOM must be different from current stock UOM,New Stock UOM különböznie kell a jelenlegi állomány UOM
 DocType: Account,Debit,Tartozás
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +34,Leaves must be allocated in multiples of 0.5,"A levelek kell felosztani többszörösei 0,5"
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +44,Leaves must be allocated in multiples of 0.5,"A levelek kell felosztani többszörösei 0,5"
 DocType: Production Order,Operation Cost,Üzemeltetési költségek
 apps/erpnext/erpnext/config/hr.py +71,Upload attendance from a .csv file,Töltsd fel látogatottsága a CSV-fájl
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,Kiemelkedő Amt
@@ -3144,8 +3012,7 @@
 DocType: Employee,Internal Work History,Belső munka története
 DocType: DocField,Column Break,Oszloptörés
 DocType: Event,Thursday,Csütörtök
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +42,Private Equity,Private Equity
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +93,Turning,Fordítás
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,Private Equity
 DocType: Maintenance Visit,Customer Feedback,Vevői visszajelzés
 DocType: Account,Expense,Költség
 DocType: Sales Invoice,Exhibition,Kiállítás
@@ -3158,19 +3025,19 @@
 DocType: Employee,Held On,Tartott
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +33,Production Item,Gyártási tétel
 ,Employee Information,Munkavállalói adatok
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,Rate (%),Ráta (%)
+apps/erpnext/erpnext/public/js/setup_wizard.js +294,Rate (%),Ráta (%)
 DocType: Stock Entry Detail,Additional Cost,Járulékos költség
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +407,Financial Year End Date,Üzleti év végén dátuma
+apps/erpnext/erpnext/public/js/setup_wizard.js +155,Financial Year End Date,Üzleti év végén dátuma
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Voucher No, if grouped by Voucher","Nem tudja kiszűrni alapján utalvány No, ha csoportosítva utalvány"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +484,Make Supplier Quotation,Beszállítói ajánlat készítése
 DocType: Quality Inspection,Incoming,Bejövő
 DocType: BOM,Materials Required (Exploded),Szükséges anyagok (Robbantott)
 DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),Csökkentse Megszerezte a fizetés nélküli szabadságon (LWP)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +512,"Add users to your organization, other than yourself","Add felhasználók számára, hogy a szervezet, más mint te"
+apps/erpnext/erpnext/public/js/setup_wizard.js +256,"Add users to your organization, other than yourself","Add felhasználók számára, hogy a szervezet, más mint te"
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No {1} does not match with {2} {3},Sor # {0}: Sorszám {1} nem egyezik a {2} {3}
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +44,Casual Leave,Alkalmi szabadság
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +44,Casual Leave,Alkalmi szabadság
 DocType: Batch,Batch ID,Köteg ID
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +334,Note: {0},Megjegyzés: {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +336,Note: {0},Megjegyzés: {0}
 ,Delivery Note Trends,Szállítólevélen Trends
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +104,This Week's Summary,Ezen a héten összefoglalója
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +74,{0} must be a Purchased or Sub-Contracted Item in row {1},{0} kell egy megvásárolt vagy alvállalkozásba tétel sorában {1}
@@ -3182,7 +3049,7 @@
 DocType: Purchase Receipt,Return Against Purchase Receipt,Return Against vásárlási nyugtát
 DocType: Purchase Order,To Bill,Bill
 DocType: Material Request,% Ordered,Rendezett%
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +61,Piecework,Darabszámra fizetett munka
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Piecework,Darabszámra fizetett munka
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +64,Avg. Buying Rate,Átlagos vásárlási ráta
 DocType: Task,Actual Time (in Hours),Tényleges idő (óra)
 DocType: Employee,History In Company,Előzmények a cégnél
@@ -3199,13 +3066,13 @@
 DocType: Opportunity,To Discuss,Megvitatni
 DocType: SMS Settings,SMS Settings,SMS beállítások
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +60,Temporary Accounts,Ideiglenes számlák
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +155,Black,Fekete
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Black,Fekete
 DocType: BOM Explosion Item,BOM Explosion Item,BOM Robbanás Elem
 DocType: Account,Auditor,Könyvvizsgáló
 DocType: Purchase Order,End date of current order's period,A befejezés dátuma az aktuális rendelés időszaka
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +17,Make Offer Letter,Tedd Ajánlatot Letter
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +10,Return,Visszatérés
-apps/erpnext/erpnext/stock/doctype/item/item.py +503,Default Unit of Measure for Variant must be same as Template,Alapértelmezett mértékegysége Variant meg kell egyeznie a Template
+apps/erpnext/erpnext/stock/doctype/item/item.py +507,Default Unit of Measure for Variant must be same as Template,Alapértelmezett mértékegysége Variant meg kell egyeznie a Template
 DocType: DocField,Fold,Fold
 DocType: Production Order Operation,Production Order Operation,Gyártási rendelés Operation
 DocType: Pricing Rule,Disable,Tiltva
@@ -3216,13 +3083,12 @@
 DocType: Page,Page Name,Oldal név
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +110,To Time must be greater than From Time,"Az Idő nagyobbnak kell lennie, mint a Time"
 DocType: Journal Entry Account,Exchange Rate,Átváltási arány
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +465,Sales Order {0} is not submitted,Vevői {0} nem nyújtják be
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +467,Sales Order {0} is not submitted,Vevői {0} nem nyújtják be
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0}: Parent account {1} does not bolong to the company {2},Warehouse {0}: Parent véve {1} nem Bolong a cég {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +124,Spindle finishing,Orsó befejező
 DocType: BOM,Last Purchase Rate,Utolsó beszerzési ár
 DocType: Account,Asset,Vagyontárgy
 DocType: Project Task,Task ID,Feladat ID
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +395,"e.g. ""MC""","pl. ""MC"""
+apps/erpnext/erpnext/public/js/setup_wizard.js +143,"e.g. ""MC""","pl. ""MC"""
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,Stock cannot exist for Item {0} since has variants,Állomány nem létezik tétel {0} óta van változatok
 ,Sales Person-wise Transaction Summary,Sales Person-bölcs Tranzakciós összefoglalása
 DocType: System Settings,Time Zone,Időzóna
@@ -3231,9 +3097,7 @@
 DocType: Monthly Distribution,Monthly Distribution Percentages,Havi Distribution százalékok
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +16,The selected item cannot have Batch,A kiválasztott elem nem lehet Batch
 DocType: Delivery Note,% of materials delivered against this Delivery Note,% Anyagokat szállított ellen szállítólevél
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +151,Stapling,Tűzést
 DocType: Customer,Customer Details,Vevő részletek
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +105,Shaping,Formálás
 DocType: Employee,Reports to,Jelentések
 DocType: SMS Settings,Enter url parameter for receiver nos,Adja url paraméter vevő nos
 DocType: Sales Invoice,Paid Amount,Fizetett összeg
@@ -3242,13 +3106,13 @@
 DocType: Item Variant,Item Variant,Elem Variant
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +15,Setting this Address Template as default as there is no other default,"Ha ezt Címsablon alapértelmezett, mivel nincs más alapértelmezett"
 apps/erpnext/erpnext/accounts/doctype/account/account.py +89,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Számlaegyenleg már terhelés, akkor nem szabad beállítani ""egyensúlyt kell"", mint ""Credit"""
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +76,Quality Management,Quality Management
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Quality Management,Quality Management
 DocType: Production Planning Tool,Filter based on customer,A szűrő ügyfélen alapul
 DocType: Payment Tool Detail,Against Voucher No,Ellen betétlapjának
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +47,Please enter quantity for Item {0},"Kérjük, adjon meg mennyiséget tétel {0}"
 DocType: Employee External Work History,Employee External Work History,A munkavállaló korábbi munkahelyei
 DocType: Tax Rule,Purchase,Vásárlás
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +34,Balance Qty,Balance Mennyiség
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Balance Qty,Balance Mennyiség
 DocType: Item Group,Parent Item Group,Szülőelem Group
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +21,{0} for {1},{0} {1}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +96,Cost Centers,Költség Centers
@@ -3258,12 +3122,12 @@
 DocType: Opportunity,Next Contact,Következő Kapcsolat
 DocType: Employee,Employment Type,Dolgozó típusa
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,Befektetett eszközök
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +84,Application period cannot be across two alocation records,Jelentkezési határidő nem lehet az egész két alocation bejegyzések
 DocType: Item Group,Default Expense Account,Alapértelmezett áfás számlát
 DocType: Employee,Notice (days),Figyelmeztetés (nap)
 DocType: Page,Yes,Igen
 DocType: Tax Rule,Sales Tax Template,Forgalmi adó Template
 DocType: Employee,Encashment Date,Beváltás dátuma
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +74,Electroforming,Galvanoplasztika
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +179,"Against Voucher Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Ellen utalvány típus közül kell Megrendelés, vásárlást igazoló számla vagy Naplókönyvelés"
 DocType: Account,Stock Adjustment,Stock Adjustment
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +34,Default Activity Cost exists for Activity Type - {0},Alapértelmezett Tevékenység Költség létezik tevékenység típusa - {0}
@@ -3299,12 +3163,12 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,Raktár nem lehet törölni a készletek főkönyvi bejegyzés létezik erre a raktárban.
 DocType: Company,Distribution,Nagykereskedelem
 apps/erpnext/erpnext/public/js/pos/pos.html +36,Amount Paid,Kifizetett Összeg
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +91,Project Manager,Projekt menedzser
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +72,Dispatch,Dispatch
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Project Manager,Projekt menedzser
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +72,Dispatch,Dispatch
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,A(z) {0} tételre max. {1}% engedmény adható
 DocType: Customer,Default Taxes and Charges,Alapértelmezett adók és illetékek
 DocType: Account,Receivable,Követelés
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +268,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,Sor # {0}: nem szabad megváltoztatni szállító Megrendelés már létezik
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +263,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,Sor # {0}: nem szabad megváltoztatni szállító Megrendelés már létezik
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,"Szerepet, amely lehetővé tette, hogy nyújtson be tranzakciók, amelyek meghaladják hitel határértékeket."
 DocType: Sales Invoice,Supplier Reference,Beszállító ajánlása
 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.","Ha be van jelölve, BOM a részegység napirendi pontokat a szerzés nyersanyag. Ellenkező esetben minden részegység elemek fogják kezelni, mint a nyersanyag."
@@ -3312,8 +3176,8 @@
 DocType: Hub Settings,Seller Description,Eladó Leírás
 DocType: Employee Education,Qualification,Képesítés
 DocType: Item Price,Item Price,Elem ár
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +48,Soap & Detergent,Soap & Mosószer
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +36,Motion Picture & Video,Mozgókép és videó
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +48,Soap & Detergent,Soap & Mosószer
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +36,Motion Picture & Video,Mozgókép és videó
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Rendezett
 DocType: Warehouse,Warehouse Name,Raktár neve
 DocType: Naming Series,Select Transaction,Válassza a Tranzakció
@@ -3322,7 +3186,6 @@
 DocType: BOM,Rate Of Materials Based On,Anyagköltség számítás módja
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,Támogatási analitika
 apps/erpnext/erpnext/accounts/doctype/accounts_settings/accounts_settings.py +27,Company is missing in warehouses {0},Cég hiányát raktárakban {0}
-DocType: Stock UOM Replace Utility,Stock UOM Replace Utility,Készlet mértékegység cserélő
 DocType: POS Profile,Terms and Conditions,Általános Szerződési Feltételek
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,To Date should be within the Fiscal Year. Assuming To Date = {0},El kellene belüli pénzügyi évben. Feltételezve To Date = {0}
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","Itt tart fenn magasság, súly, allergia, egészségügyi problémák stb"
@@ -3334,7 +3197,7 @@
 DocType: Sales Order Item,For Production,Termelés
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +103,Please enter sales order in the above table,"Kérjük, adja értékesítés érdekében a fenti táblázatban"
 DocType: Project Task,View Task,Kilátás Feladat
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +406,Your financial year begins on,A pénzügyi év kezdete
+apps/erpnext/erpnext/public/js/setup_wizard.js +154,Your financial year begins on,A pénzügyi év kezdete
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +46,Please enter Purchase Receipts,"Kérjük, adja vásárlás nyugtáinak"
 DocType: Sales Invoice,Get Advances Received,Befogadott előlegek átmásolása
 DocType: Email Digest,Add/Remove Recipients,Hozzáadása / eltávolítása címzettek
@@ -3342,16 +3205,14 @@
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","Beállítani a költségvetési évben alapértelmezettként, kattintson a ""Beállítás alapértelmezettként"""
 apps/erpnext/erpnext/config/support.py +54,Setup incoming server for support email id. (e.g. support@example.com),Beállítás bejövő kiszolgáló támogatási email id. (Pl support@example.com)
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,Hiány Mennyiség
-apps/erpnext/erpnext/stock/doctype/item/item.py +528,Item variant {0} exists with same attributes,Elem változat {0} létezik azonos tulajdonságokkal
+apps/erpnext/erpnext/stock/doctype/item/item.py +532,Item variant {0} exists with same attributes,Elem változat {0} létezik azonos tulajdonságokkal
 DocType: Salary Slip,Salary Slip,Bérlap
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +116,Burnishing,Palástcsiszoló
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +54,'To Date' is required,"""Időpontig"" szükséges"
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,"""Időpontig"" szükséges"
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","Létrehoz csomagolás kombiné a csomagokat szállítani. Használt értesíteni csomag számát, a doboz tartalma, és a súlya."
 DocType: Sales Invoice Item,Sales Order Item,Vevői Elem
 DocType: Salary Slip,Payment Days,Fizetési Napok
 DocType: BOM,Manage cost of operations,Kezelje a működési költségeket
 DocType: Features Setup,Item Advanced,Elem Advanced
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +40,Hot rolling,Meleghengerléséhez
 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.","Ha bármelyik ellenőrzött tranzakciók ""Beküldő"", egy e-mailt pop-up automatikusan nyílik, hogy küldjön egy e-mailt a kapcsolódó ""Kapcsolat"" hogy ezen ügyletben az ügylet mellékletként. A felhasználó lehet, hogy nem küld e-mailt."
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,Globális beállítások
 DocType: Employee Education,Employee Education,Munkavállaló képzése
@@ -3364,25 +3225,23 @@
 DocType: Customer,Sales Team Details,Értékesítő csapat részletei
 DocType: Expense Claim,Total Claimed Amount,Összesen követelt összeget
 apps/erpnext/erpnext/config/crm.py +22,Potential opportunities for selling.,A potenciális értékesítési lehetőségeinek.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +48,Sick Leave,A betegszabadság
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +174,Invalid {0},Érvénytelen {0}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +48,Sick Leave,A betegszabadság
 DocType: Email Digest,Email Digest,Összefoglaló email
 DocType: Delivery Note,Billing Address Name,Számlázási cím neve
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +22,Department Stores,Áruházak
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,Áruházak
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +40,System Balance,Rendszer Balance
 DocType: Workflow,Is Active,Aktív?
 apps/erpnext/erpnext/controllers/stock_controller.py +71,No accounting entries for the following warehouses,Nincs számviteli bejegyzést az alábbi raktárak
 apps/erpnext/erpnext/projects/doctype/project/project.js +22,Save the document first.,Mentse el a dokumentumot.
 DocType: Account,Chargeable,Felszámítható
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +121,Linishing,Linishing
 DocType: Company,Change Abbreviation,Change rövidítése
 DocType: Workflow State,Primary,Elsődleges
 DocType: Expense Claim Detail,Expense Date,Igénylés dátuma
 DocType: Item,Max Discount (%),Max. engedmény (%)
 DocType: Communication,More Information,Több információ
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +70,Last Order Amount,Utolsó megrendelés összege
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +161,Blasting,Robbantás
 DocType: Company,Warn,Figyelmeztet
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +111,Item valuation updated,Elem értékelési frissítve
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Egyéb megjegyzések, említésre méltó erőfeszítés, hogy menjen a nyilvántartásban."
 DocType: BOM,Manufacturing User,Gyártás Felhasználó
 DocType: Purchase Order,Raw Materials Supplied,Szállított alapanyagok
@@ -3392,7 +3251,7 @@
 DocType: Appraisal,Appraisal Template,Teljesítmény értékelő sablon
 DocType: Communication,Email,Email
 DocType: Item Group,Item Classification,Elem osztályozás
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +89,Business Development Manager,Business Development Manager
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Business Development Manager,Business Development Manager
 DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,Karbantartási látogatás célja
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.js +15,Period,Időszak
 ,General Ledger,Főkönyvi számla
@@ -3402,9 +3261,7 @@
 ,Itemwise Recommended Reorder Level,Itemwise Ajánlott Reorder Level
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +264,Please select {0} first,"Kérjük, válassza ki a {0} első"
 DocType: Features Setup,To get Item Group in details table,"Ahhoz, hogy pont csoport adatait tartalmazó táblázatban"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +67,Redrawing,Újrarajzoláskor
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +112,Batch {0} of Item {1} has expired.,Batch {0} pont {1} lejárt.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +120,Etching,Rézkarc
 DocType: Sales Invoice,Commission,Jutalék
 DocType: Address Template,"<h4>Default Template</h4>
 <p>Uses <a href=""http://jinja.pocoo.org/docs/templates/"">Jinja Templating</a> and all the fields of Address (including Custom Fields if any) will be available</p>
@@ -3438,7 +3295,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +340,Operation Time must be greater than 0 for Operation {0},"Működési idő nagyobbnak kell lennie, mint 0 Operation {0}"
 DocType: Supplier,Address and Contacts,Cím és Kapcsolatok
 DocType: UOM Conversion Detail,UOM Conversion Detail,Mértékegység konvertálásának részlete
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +496,Keep it web friendly 900px (w) by 100px (h),Tartsa web barátságos 900px (w) által 100px (h)
+apps/erpnext/erpnext/public/js/setup_wizard.js +242,Keep it web friendly 900px (w) by 100px (h),Tartsa web barátságos 900px (w) által 100px (h)
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +329,Production Order cannot be raised against a Item Template,Termelési hogy nem lehet ellen emelt elemsablont
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +44,Charges are updated in Purchase Receipt against each item,Díjak frissülnek a vásárláskor kapott nyugtát az olyan áru
 DocType: Payment Tool,Get Outstanding Vouchers,Kiemelkedő utalványok
@@ -3454,54 +3311,49 @@
 DocType: Item,Average time taken by the supplier to deliver,Átlagos idő a szállító által szállítani
 DocType: Time Log,Hours,Óra
 DocType: Project,Expected Start Date,Várható indulás dátuma
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +38,Rolling,Gördülő
 DocType: ToDo,Priority,Prioritás
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +41,Remove item if charges is not applicable to that item,"Vegye ki az elemet, ha terheket nem adott elemre alkalmazandó"
 DocType: Dropbox Backup,Dropbox Access Allowed,Dropbox hozzáférés engedélyezve
 DocType: Dropbox Backup,Weekly,Heti
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,Pl. smsgateway.com/api/send_sms.cgi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +485,Receive,Kaphat
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +510,Receive,Kaphat
 DocType: Maintenance Visit,Fully Completed,Teljesen kész
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% kész
 DocType: Employee,Educational Qualification,Iskolai végzettség
 DocType: Workstation,Operating Costs,A működési költségek
 DocType: Employee Leave Approver,Employee Leave Approver,Munkavállalói Leave Jóváhagyó
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,{0} has been successfully added to our Newsletter list.,{0} sikeresen hozzáadva a hírlevél listán.
-apps/erpnext/erpnext/stock/doctype/item/item.py +383,Row {0}: An Reorder entry already exists for this warehouse {1},Row {0}: Egy Reorder bejegyzés már létezik erre a raktárban {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +387,Row {0}: An Reorder entry already exists for this warehouse {1},Row {0}: Egy Reorder bejegyzés már létezik erre a raktárban {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +67,"Cannot declare as lost, because Quotation has been made.","Nem jelenthetjük, mint elveszett, mert Idézet történt."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +133,Electron beam machining,Elektronsugaras megmunkálás
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Vásárlási mester menedzser
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +424,Production Order {0} must be submitted,Gyártási rendelés {0} kell benyújtani
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +150,Please select Start Date and End Date for Item {0},"Kérjük, válassza ki a Start és végének dátumát jogcím {0}"
 apps/erpnext/erpnext/config/stock.py +141,Main Reports,Főbb jelentések
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +102,Stock Ledger entries balances updated,Stock Ledger bejegyzések egyenlegek frissítve
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,"A mai napig nem lehet, mielőtt a dátumot"
 DocType: Purchase Receipt Item,Prevdoc DocType,Prevdoc DocType
-apps/erpnext/erpnext/stock/doctype/item/item.js +176,Add / Edit Prices,Add / Edit árak
+apps/erpnext/erpnext/stock/doctype/item/item.js +178,Add / Edit Prices,Add / Edit árak
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +53,Chart of Cost Centers,Költséghelyek listája
 ,Requested Items To Be Ordered,A kért lapok kell megrendelni
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +298,My Orders,Saját rendelések
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +293,My Orders,Saját rendelések
 DocType: Price List,Price List Name,Árlista neve
 DocType: Time Log,For Manufacturing,For Manufacturing
-apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +70,Totals,Az összesítések
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +174,Totals,Az összesítések
 DocType: BOM,Manufacturing,Gyártás
 ,Ordered Items To Be Delivered,Rendelt mennyiség szállításra
 DocType: Account,Income,Jövedelem
 ,Setup Wizard,Beállítás varázsló
 DocType: Industry Type,Industry Type,Iparág
 apps/erpnext/erpnext/templates/includes/cart.js +137,Something went wrong!,Valami hiba történt!
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +68,Warning: Leave application contains following block dates,Figyelmeztetés: Hagyjon kérelem tartalmazza a következő blokk húsz óra
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +251,Sales Invoice {0} has already been submitted,Értékesítési számlák {0} már benyújtott
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +100,Warning: Leave application contains following block dates,Figyelmeztetés: Hagyjon kérelem tartalmazza a következő blokk húsz óra
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +256,Sales Invoice {0} has already been submitted,Értékesítési számlák {0} már benyújtott
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,Teljesítési dátum
 DocType: Purchase Invoice Item,Amount (Company Currency),Összeg (Társaság Currency)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +10,Die casting,Die Casting
 DocType: Email Alert,Reference Date,Referencia dátuma
 apps/erpnext/erpnext/config/hr.py +105,Organization unit (department) master.,Szervezeti egység (osztály) mestere.
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +25,Please enter valid mobile nos,Adjon meg egy érvényes mobil nos
 DocType: Budget Detail,Budget Detail,Költségkeret részlete
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +75,Please enter message before sending,"Kérjük, adja üzenet elküldése előtt"
 DocType: Async Task,Status,Állapot
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +65,Stock UOM updated for Item {0},Stock UOM frissített jogcím {0}
 DocType: Company History,Year,Év
 apps/erpnext/erpnext/config/accounts.py +127,Point-of-Sale Profile,Point-of-Sale Profile
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +68,Please Update SMS Settings,"Kérjük, frissítsd SMS beállítások"
@@ -3515,12 +3367,12 @@
 ,Serial No Service Contract Expiry,Sorozatszám karbantartási szerződés lejárati ideje
 DocType: Item,Unit of Measure Conversion,Mértékegység átváltás
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +86,Employee can not be changed,Nem változtatható meg a munkavállaló
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +259,You cannot credit and debit same account at the same time,Egy bejegyzésben nem lehet egyszerre tartozás és követelés is.
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,You cannot credit and debit same account at the same time,Egy bejegyzésben nem lehet egyszerre tartozás és követelés is.
 DocType: Naming Series,Help HTML,Súgó HTML
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},Összesen weightage kijelölt kell 100%. Ez {0}
 apps/erpnext/erpnext/controllers/status_updater.py +140,Allowance for over-{0} crossed for Item {1},Engedmény a túl- {0} keresztbe jogcím {1}
 DocType: Address,Name of person or organization that this address belongs to.,"Teljes név vagy szervezet, amely ezt a címet tartozik."
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +587,Your Suppliers,Ön Szállítók
+apps/erpnext/erpnext/public/js/setup_wizard.js +325,Your Suppliers,Ön Szállítók
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,Nem lehet beállítani elveszett Sales elrendelése esetén.
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +65,Another Salary Structure {0} is active for employee {1}. Please make its status 'Inactive' to proceed.,"Egy másik bérszerkeztet {0} aktív munkavállalói {1}. Kérjük, hogy az állapota ""inaktív"" a folytatáshoz."
 DocType: Purchase Invoice,Contact,Kapcsolat
@@ -3529,37 +3381,35 @@
 DocType: Item,Has Serial No,Lesz sorozatszáma?
 DocType: Employee,Date of Issue,Probléma dátuma
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +16,{0}: From {0} for {1},{0}: A {0} az {1}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +154,Row #{0}: Set Supplier for item {1},Sor # {0}: Állítsa Szállító jogcím {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +149,Row #{0}: Set Supplier for item {1},Sor # {0}: Állítsa Szállító jogcím {1}
 DocType: Issue,Content Type,Tartalom típusa
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +17,Computer,Számítógép
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,Számítógép
 DocType: Item,List this Item in multiple groups on the website.,Sorolja ezt a tárgyat több csoportban a honlapon.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +283,Please check Multi Currency option to allow accounts with other currency,"Kérjük, ellenőrizze Több pénznem opciót, hogy számláikat más pénznemben"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +285,Please check Multi Currency option to allow accounts with other currency,"Kérjük, ellenőrizze Több pénznem opciót, hogy számláikat más pénznemben"
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +62,Item: {0} does not exist in the system,Cikk: {0} nem létezik a rendszerben
 apps/erpnext/erpnext/accounts/doctype/account/account.py +81,You are not authorized to set Frozen value,Ön nem jogosult a beállított értéket Frozen
 DocType: Payment Reconciliation,Get Unreconciled Entries,Get Nem egyeztetett bejegyzés
 DocType: Cost Center,Budgets,Költségvetési
 apps/frappe/frappe/core/page/modules_setup/modules_setup.py +11,Updated,Frissítve
 DocType: Employee,Emergency Contact Details,Sürgősségi Elérhetőségek
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +396,What does it do?,Mit csinál?
+apps/erpnext/erpnext/public/js/setup_wizard.js +144,What does it do?,Mit csinál?
 DocType: Delivery Note,To Warehouse,Raktárba
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +45,Account {0} has been entered more than once for fiscal year {1},Account {0} adta meg többször költségvetési évben {1}
 ,Average Commission Rate,Átlagos jutalék mértéke
-apps/erpnext/erpnext/stock/doctype/item/item.py +313,'Has Serial No' can not be 'Yes' for non-stock item,"""Van sorozatszáma"" nem lehet ""igen"" a nem-készletezett tételnél"
+apps/erpnext/erpnext/stock/doctype/item/item.py +317,'Has Serial No' can not be 'Yes' for non-stock item,"""Van sorozatszáma"" nem lehet ""igen"" a nem-készletezett tételnél"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Attendance can not be marked for future dates,Jelenlétit nem lehet megjelölni a jövőbeli időpontokban
 DocType: Pricing Rule,Pricing Rule Help,Árképzési szabály Súgó
 DocType: Purchase Taxes and Charges,Account Head,Számla fejléc
 apps/erpnext/erpnext/config/stock.py +79,Update additional costs to calculate landed cost of items,Frissítse többletköltségek kiszámítására landolt bekerülési
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +111,Electrical,Elektromos
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +111,Electrical,Elektromos
 DocType: Stock Entry,Total Value Difference (Out - In),Összesen értékkülönbözet ​​(Out - A)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +302,Row {0}: Exchange Rate is mandatory,Sor {0}: árfolyam kötelező
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +304,Row {0}: Exchange Rate is mandatory,Sor {0}: árfolyam kötelező
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},Felhasználói azonosító nem állította be az Employee {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +72,Peening,Kikalapálás
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,From Warranty Claim,Re jótállási igény
 DocType: Stock Entry,Default Source Warehouse,Alapértelmezett raktár
 DocType: Item,Customer Code,Vevő kódja
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +212,Birthday Reminder for {0},Születésnapi emlékeztető {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +163,Lapping,Lappolás
-apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.js +8,Days Since Last Order,Napok óta utolsó rendelés
+apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +72,Days Since Last Order,Napok óta utolsó rendelés
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +299,Debit To account must be a Balance Sheet account,Megterhelése figyelembe kell egy Mérlegszámla
 DocType: Buying Settings,Naming Series,Sorszámozási csoport
 DocType: Leave Block List,Leave Block List Name,Hagyja Block List név
@@ -3573,7 +3423,7 @@
 DocType: Notification Control,Sales Invoice Message,Értékesítési számlák Message
 DocType: Authorization Rule,Based On,Alapuló
 DocType: Sales Order Item,Ordered Qty,Rendelt menny.
-apps/erpnext/erpnext/stock/doctype/item/item.py +539,Item {0} is disabled,Elem {0} van tiltva
+apps/erpnext/erpnext/stock/doctype/item/item.py +543,Item {0} is disabled,Elem {0} van tiltva
 DocType: Stock Settings,Stock Frozen Upto,Készlet zárolása eddig
 apps/erpnext/erpnext/controllers/recurring_document.py +166,Period From and Period To dates mandatory for recurring {0},"Közötti időszakra, és időszakról kilenc óra kötelező visszatérő {0}"
 apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,Projekt feladatok és tevékenységek.
@@ -3583,7 +3433,6 @@
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,"A kedvezménynek kisebbnek kell lennie, mint 100"
 DocType: ToDo,Low,Alacsony
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Írj egy egyszeri összeget (Társaság Currency)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +71,Spinning,Spinning
 DocType: Landed Cost Voucher,Landed Cost Voucher,Beszerzési költség utalvány
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +55,Please set {0},"Kérjük, állítsa {0}"
 DocType: Purchase Invoice,Repeat on Day of Month,Ismételje meg a hónap napja
@@ -3605,7 +3454,6 @@
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +37,Campaign Name is required,Kampány név szükséges
 DocType: Maintenance Visit,Maintenance Date,Karbantartás dátuma
 DocType: Purchase Receipt Item,Rejected Serial No,Elutasított sorozatszám
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +51,Deep drawing,Mélyhúzó
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +40,New Newsletter,Új hírlevél
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +157,Start date should be less than end date for Item {0},"Kezdési időpont kisebbnek kell lennie, mint végső dátumát tétel {0}"
 apps/erpnext/erpnext/stock/doctype/item/item.js +17,Show Balance,Mutasd Balance
@@ -3615,7 +3463,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +119,BOM and Manufacturing Quantity are required,BOM and Manufacturing Mennyiség van szükség
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Ageing tartomány 2
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +450,Amount,Összeg
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +147,Riveting,Szegecselő
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,Anyagjegyzék cserélve
 ,Sales Analytics,Értékesítési analítika
 DocType: Manufacturing Settings,Manufacturing Settings,Gyártás Beállítások
@@ -3627,20 +3474,19 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +207,New Account Name,New Account Name
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,Szállított alapanyagok költsége
 DocType: Selling Settings,Settings for Selling Module,Beállítások Értékesítés modul
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +73,Customer Service,Ügyfélszolgálat
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Customer Service,Ügyfélszolgálat
 DocType: Item,Thumbnail,Thumbnail
 DocType: Item Customer Detail,Item Customer Detail,Az elem vevőjének részletei
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +147,Confirm Your Email,Erősítse Ön e-mail
 apps/erpnext/erpnext/config/hr.py +53,Offer candidate a Job.,Ajánlat jelölt munkát.
 DocType: Notification Control,Prompt for Email on Submission of,Kérjen Email benyújtása
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +81,Total allocated leaves are more than days in the period,Összes elkülönített levelek több mint nap közötti időszakban
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +70,Item {0} must be a stock Item,Elem {0} kell lennie Stock tétel
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,Alapértelmezett a Folyamatban Warehouse
 apps/erpnext/erpnext/config/accounts.py +107,Default settings for accounting transactions.,Alapértelmezett beállításokat számviteli tranzakciók.
 apps/frappe/frappe/model/naming.py +40,{0} is required,{0} szükséges
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +21,Vacuum molding,Vákuum öntés
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,Várható időpontja nem lehet korábbi Material igénylés dátuma
 DocType: Contact Us Settings,City,Város
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +132,Ultrasonic machining,Ultrahangos megmunkálás
 apps/frappe/frappe/templates/base.html +137,Error: Not a valid id?,Hiba: Nem érvényes id?
 apps/erpnext/erpnext/stock/get_item_details.py +125,Item {0} must be a Sales Item,Elem {0} kell lennie Sales tétel
 DocType: Naming Series,Update Series Number,Sorszám frissítése
@@ -3648,7 +3494,7 @@
 DocType: Sales Order,Printing Details,Nyomtatási Részletek
 DocType: Task,Closing Date,Benyújtási határidő
 DocType: Sales Order Item,Produced Quantity,"A termelt mennyiség,"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +84,Engineer,Mérnök
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Engineer,Mérnök
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,Keresés részegységek
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +379,Item Code required at Row No {0},Tételkód szükség Row {0}
 DocType: Sales Partner,Partner Type,Partner típusa
@@ -3656,7 +3502,7 @@
 DocType: Authorization Rule,Customerwise Discount,Customerwise Kedvezmény
 DocType: Purchase Invoice,Against Expense Account,Ellen áfás számlát
 DocType: Production Order,Production Order,Gyártásrendelés
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +258,Installation Note {0} has already been submitted,Telepítési feljegyzés {0} már benyújtott
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +263,Installation Note {0} has already been submitted,Telepítési feljegyzés {0} már benyújtott
 DocType: Quotation Item,Against Docname,Ellen Docname
 DocType: SMS Center,All Employee (Active),Minden dolgozó (Aktív)
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,Tekintse meg most
@@ -3665,19 +3511,19 @@
 DocType: Item,Re-Order Level,Re-Order Level
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,"Adja tételek és tervezett Mennyiség amelynek meg szeretné emelni a gyártási megrendeléseket, vagy töltse le a nyersanyagok elemzésre."
 apps/frappe/frappe/public/js/frappe/views/ganttview.js +45,Gantt Chart,Gantt diagram
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +57,Part-time,Részidős
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,Part-time,Részidős
 DocType: Employee,Applicable Holiday List,Alkalmazható Nyaralás listája
 DocType: Employee,Cheque,Csekk
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,Sorozat Frissítve
 apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Report Type is mandatory,Report Type kötelező
 DocType: Item,Serial Number Series,Sorozatszám sorozat
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},Warehouse kötelező Stock tétel {0} sorban {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +45,Retail & Wholesale,Kis- és nagykereskedelem
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,Kis- és nagykereskedelem
 DocType: Issue,First Responded On,Első válasz időpontja
 DocType: Website Item Group,Cross Listing of Item in multiple groups,Kereszt felsorolása Elem több csoportban
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +351,The First User: You,Az első felhasználó: You
+apps/erpnext/erpnext/public/js/setup_wizard.js +101,The First User: You,Az első felhasználó: You
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +48,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},Pénzügyi év kezdő dátuma és a pénzügyi év vége dátum már meghatározták Fiscal Year {0}
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +172,Successfully Reconciled,Sikeresen Egyeztetett
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +119,Successfully Reconciled,Sikeresen Egyeztetett
 DocType: Production Order,Planned End Date,Tervezett befejezési dátuma
 apps/erpnext/erpnext/config/stock.py +43,Where items are stored.,Ahol az anyagok tárolva vannak.
 DocType: Tax Rule,Validity,Érvényességi
@@ -3697,39 +3543,36 @@
 DocType: DocPerm,Level,Szint
 DocType: Purchase Taxes and Charges,On Net Total,Nettó összeshez
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +160,Target warehouse in row {0} must be same as Production Order,Cél raktár sorban {0} meg kell egyeznie a gyártási utasítás
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +59,No permission to use Payment Tool,Nincs joga felhasználni fizetési eszköz
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +97,No permission to use Payment Tool,Nincs joga felhasználni fizetési eszköz
 apps/erpnext/erpnext/controllers/recurring_document.py +192,'Notification Email Addresses' not specified for recurring %s,"""Értesítési e-mail címek"" nem meghatározott ismétlődő% s"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +86,Milling,Marás
 apps/erpnext/erpnext/accounts/doctype/account/account.py +99,Currency can not be changed after making entries using some other currency,"Valuta nem lehet változtatni, miután bejegyzések segítségével más pénznemben"
 DocType: Company,Round Off Account,Fejezze ki Account
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +60,Nibbling,Harapni
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,Igazgatási költségek
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +18,Consulting,Tanácsadó
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +18,Consulting,Tanácsadó
 DocType: Customer Group,Parent Customer Group,Szülő Vásárlói csoport
 apps/erpnext/erpnext/public/js/pos/pos.js +429,Change,Változás
 DocType: Purchase Invoice,Contact Email,Kapcsolattartó e-mailcíme
 DocType: Appraisal Goal,Score Earned,Pontszám Szerzett
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +393,"e.g. ""My Company LLC""","pl. ""Cégem Kft."""
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +173,Notice Period,Felmondási idő
+apps/erpnext/erpnext/public/js/setup_wizard.js +141,"e.g. ""My Company LLC""","pl. ""Cégem Kft."""
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +173,Notice Period,Felmondási idő
 DocType: Bank Reconciliation Detail,Voucher ID,Utalvány ID
 apps/erpnext/erpnext/setup/doctype/territory/territory.js +14,This is a root territory and cannot be edited.,"Ez egy gyökér területén, és nem lehet szerkeszteni."
 DocType: Packing Slip,Gross Weight UOM,Bruttó tömeg mértékegysége
 DocType: Email Digest,Receivables / Payables,Követelések / Kötelezettségek
 DocType: Delivery Note Item,Against Sales Invoice,Ellen Értékesítési számlák
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +63,Stamping,Bélyegzés
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +457,Credit Account,Hitelszámla
 DocType: Landed Cost Item,Landed Cost Item,Beszerzési költség tétel
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +56,Show zero values,Mutasd a nulla értékeket
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,"Mennyiség pont után kapott gyártási / visszacsomagolásánál a megadott alapanyagok mennyiségét,"
 DocType: Payment Reconciliation,Receivable / Payable Account,Követelések / Account
 DocType: Delivery Note Item,Against Sales Order Item,Ellen Vevői Elem
-apps/erpnext/erpnext/stock/doctype/item/item.py +521,Please specify Attribute Value for attribute {0},"Kérjük, adja Jellemző értéke az attribútum {0}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +525,Please specify Attribute Value for attribute {0},"Kérjük, adja Jellemző értéke az attribútum {0}"
 DocType: Item,Default Warehouse,Alapértelmezett raktár
 DocType: Task,Actual End Date (via Time Logs),Tényleges End Date (via Idő Napló)
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +37,Budget cannot be assigned against Group Account {0},Költségvetést nem lehet rendelni ellen Group Account {0}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +23,Please enter parent cost center,"Kérjük, adja szülő költséghely"
 DocType: Delivery Note,Print Without Amount,Nyomtatás érték nélkül
-apps/erpnext/erpnext/controllers/buying_controller.py +69,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,"Adó kategóriák nem lehet az ""Értékelés"" vagy ""Értékelési és Total"", mint az összes elem nincsenek raktáron tételek"
+apps/erpnext/erpnext/controllers/buying_controller.py +60,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,"Adó kategóriák nem lehet az ""Értékelés"" vagy ""Értékelési és Total"", mint az összes elem nincsenek raktáron tételek"
 DocType: User,Last Name,Keresztnév
 DocType: Web Page,Left,Elment
 DocType: Event,All Day,Minden nap
@@ -3737,7 +3580,7 @@
 DocType: Appraisal,Total Score (Out of 5),Összes pontszám (5–ből)
 DocType: Contact Us Settings,State,Állapot
 DocType: Batch,Batch,Köteg
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +51,Balance,Egyensúly
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +28,Balance,Egyensúly
 DocType: Project,Total Expense Claim (via Expense Claims),Teljes Költség Követelés (via költségtérítési igényeket)
 DocType: User,Gender,Neme
 DocType: Journal Entry,Debit Note,Terhelési értesítő
@@ -3767,8 +3610,7 @@
 DocType: Purchase Order,Get Last Purchase Rate,Kap Utolsó Purchase Rate
 DocType: Time Log,Billing Rate based on Activity Type (per hour),Díjszabás alapján tevékenység típusa (óránként)
 DocType: Company,Company Info,Cégadatok
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +76,Seaming,Szegélyterület
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +197,"Company Email ID not found, hence mail not sent","Cég E-mail ID nem található, így a levél nem ment"
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +206,"Company Email ID not found, hence mail not sent","Cég E-mail ID nem található, így a levél nem ment"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),A vagyon (eszközök)
 DocType: Production Planning Tool,Filter based on item,A szűrő cikken alapul
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +451,Debit Account,Betéti Számla
@@ -3780,17 +3622,16 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +95,{0} {1} has been modified. Please refresh.,"{0} {1} módosításra került. Kérjük, frissítse."
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,"Állj felhasználók abban, hogy Leave Alkalmazások következő napokon."
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +591,From Opportunity,A lehetőségektől
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +46,Blanking,Kivágó
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +166,Employee Benefits,Munkavállalói juttatások
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,Employee Benefits,Munkavállalói juttatások
 DocType: Sales Invoice,Is POS,POS
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +240,Packed quantity must equal quantity for Item {0} in row {1},Csomagolt mennyiséget kell egyezniük a mennyiséget tétel {0} sorban {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +245,Packed quantity must equal quantity for Item {0} in row {1},Csomagolt mennyiséget kell egyezniük a mennyiséget tétel {0} sorban {1}
 DocType: Production Order,Manufactured Qty,Gyártott menny.
 DocType: Purchase Receipt Item,Accepted Quantity,Elfogadott mennyiség
 apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} nem létezik
 apps/erpnext/erpnext/config/accounts.py +18,Bills raised to Customers.,Bills emelte az ügyfelek számára.
 DocType: DocField,Default,Alapértelmezett
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Projekt azonosító
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +466,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},"Row {0}: Az összeg nem lehet nagyobb, mint lévő összeget ad költségelszámolás benyújtás {1}. Függő Összeg: {2}"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +468,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},"Row {0}: Az összeg nem lehet nagyobb, mint lévő összeget ad költségelszámolás benyújtás {1}. Függő Összeg: {2}"
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +40,{0} subscribers added,{0} előfizetők hozzá
 DocType: Maintenance Schedule,Schedule,Ütemezés
 DocType: Cost Center,"Define Budget for this Cost Center. To set budget action, see ""Company List""","Adjuk költségvetés erre a költséghely. Beállításához költségvetésű akció, lásd a &quot;Társaság List&quot;"
@@ -3801,7 +3642,7 @@
 apps/erpnext/erpnext/public/js/pos/pos.js +91,Price List not found or disabled,"Árlista nem található, vagy a fogyatékkal"
 DocType: Expense Claim,Approved,Jóváhagyott
 DocType: Pricing Rule,Price,Árazás
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +79,Employee relieved on {0} must be set as 'Left',Munkavállalói megkönnyebbült {0} kell beállítani -Bal-
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +88,Employee relieved on {0} must be set as 'Left',Munkavállalói megkönnyebbült {0} kell beállítani -Bal-
 DocType: Item,"Selecting ""Yes"" will give a unique identity to each entity of this item which can be viewed in the Serial No master.","""Igen"" ad egy egyedi azonosító, hogy minden entitás ez a tétel, amely megtekinthető a Serial No mester."
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +39,Appraisal {0} created for Employee {1} in the given date range,Értékelési {0} létre Employee {1} az adott időpontban tartományban
 DocType: Employee,Education,Oktatás
@@ -3812,7 +3653,7 @@
 apps/frappe/frappe/desk/moduleview.py +67,Standard Reports,Általános jelentések
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,Számviteli naplóbejegyzések.
 DocType: Delivery Note Item,Available Qty at From Warehouse,Elérhető Mennyiség a raktárról
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +209,Please select Employee Record first.,"Kérjük, válassza ki a dolgozó Record első."
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +224,Please select Employee Record first.,"Kérjük, válassza ki a dolgozó Record első."
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Sor {0}: Party / fiók nem egyezik {1} / {2} a {3} {4}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +35,To create a Tax Account,Hogy hozzon létre egy adószámlára
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +233,Please enter Expense Account,"Kérjük, adja áfás számlát"
@@ -3825,46 +3666,43 @@
 DocType: Sales Order,Track this Sales Order against any Project,Kövesse nyomon ezt a Vevői ellen Project
 DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,Pull megrendelések (folyamatban szállítani) alapján a fenti kritériumok
 DocType: DocShare,Document Type,Dokumentum típusa
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +565,From Supplier Quotation,A beszállító Idézet
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +588,From Supplier Quotation,A beszállító Idézet
 DocType: Deduction Type,Deduction Type,Levonás típusa
 DocType: Attendance,Half Day,Félnapos
 DocType: Pricing Rule,Min Qty,Min. menny.
 DocType: Features Setup,"To track items in sales and purchase documents with batch nos. ""Preferred Industry: Chemicals""",Hogy nyomon tételek értékesítési és beszerzési dokumentumok kötegelt nos. &quot;Előnyben Ipar: Vegyi&quot;
 DocType: GL Entry,Transaction Date,Ügylet dátuma
 DocType: Production Plan Item,Planned Qty,Tervezett Mennyiség
-apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +91,Total Tax,Összes adó
+apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +93,Total Tax,Összes adó
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +178,For Quantity (Manufactured Qty) is mandatory,Mert Mennyiség (gyártott db) kötelező
 DocType: Stock Entry,Default Target Warehouse,Alapértelmezett cél raktár
 DocType: Purchase Invoice,Net Total (Company Currency),Nettó összesen (a cég pénznemében)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +79,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Row {0}: Party típusa és fél csak akkor alkalmazható elleni követelések / fiók
 DocType: Notification Control,Purchase Receipt Message,Vásárlási nyugta Message
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +95,Total allocated leaves are more than period,Összes elkülönített levelek több mint időszakban
 DocType: Production Order,Actual Start Date,Tényleges kezdési dátum
 DocType: Sales Order,% of materials delivered against this Sales Order,% Anyagokat szállított ellen Vevői
 apps/erpnext/erpnext/config/stock.py +23,Record item movement.,Record elem mozgását.
 DocType: Newsletter List Subscriber,Newsletter List Subscriber,Hírlevél előfizető
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +164,Morticing,Csaplyukvéső
 DocType: Email Account,Service,Szolgáltatás
 DocType: Hub Settings,Hub Settings,Hub Beállítások
 DocType: Project,Gross Margin %,A bruttó árrés %
 DocType: BOM,With Operations,Műveletek is
 apps/erpnext/erpnext/accounts/party.py +232,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,"Könyvelési tétel már megtörtént készpénzzel {0} {1} cég. Kérjük, válasszon járó vagy fizetendő számla valuta {0}."
 ,Monthly Salary Register,Havi fizetés Regisztráció
-apps/frappe/frappe/website/template.py +140,Next,Következő
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard_page.html +17,Next,Következő
 DocType: Warranty Claim,If different than customer address,"Ha más, mint megrendelő címét"
 DocType: BOM Operation,BOM Operation,BOM Operation
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +118,Electropolishing,Elektropolírozás
 DocType: Purchase Taxes and Charges,On Previous Row Amount,On előző sor összege
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +24,Please enter Payment Amount in atleast one row,"Kérjük, adja fizetési összeget adni legalább egy sorban"
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +33,Please enter Payment Amount in atleast one row,"Kérjük, adja fizetési összeget adni legalább egy sorban"
 DocType: POS Profile,POS Profile,POS Profile
 apps/erpnext/erpnext/config/accounts.py +153,"Seasonality for setting budgets, targets etc.","Szezonalitás a költségvetések tervezésekor, célok stb"
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +238,Row {0}: Payment Amount cannot be greater than Outstanding Amount,"Row {0}: kifizetés összege nem lehet nagyobb, mint fennálló összeg"
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +46,Total Unpaid,Összesen Kifizetetlen
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +21,Time Log is not billable,Időnapló nem számlázható
 apps/erpnext/erpnext/stock/get_item_details.py +128,"Item {0} is a template, please select one of its variants","Elem {0} egy olyan sablon, kérjük, válasszon variánsai"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +528,Purchaser,Vásárló
+apps/erpnext/erpnext/public/js/setup_wizard.js +272,Purchaser,Vásárló
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +81,Net pay cannot be negative,Nettó fizetés nem lehet negatív
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +71,Please enter the Against Vouchers manually,"Kérjük, adja meg Against utalványok kézzel"
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +107,Please enter the Against Vouchers manually,"Kérjük, adja meg Against utalványok kézzel"
 DocType: SMS Settings,Static Parameters,Statikus paraméterek
 DocType: Purchase Order,Advance Paid,A kifizetett előleg
 DocType: Item,Item Tax,Az anyag adójának típusa
@@ -3873,14 +3711,12 @@
 apps/erpnext/erpnext/config/crm.py +48,Send mass SMS to your contacts,Küldd tömeges SMS-ben a kapcsolatot
 DocType: Purchase Taxes and Charges,Consider Tax or Charge for,Fontolja adó vagy illeték
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,Tényleges Mennyiség kötelező
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +42,Cross-rolling,Határon gördülő
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +132,Credit Card,Hitelkártya
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +132,Credit Card,Hitelkártya
 DocType: BOM,Item to be manufactured or repacked,A tétel gyártott vagy újracsomagolt
 apps/erpnext/erpnext/config/stock.py +95,Default settings for stock transactions.,Alapértelmezett beállításokat részvény tranzakciók.
 DocType: Purchase Invoice,Next Date,Következő dátum
 DocType: Employee Education,Major/Optional Subjects,Fő / választható témák
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +49,Please enter Taxes and Charges,"Kérjük, adja adók és illetékek"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +85,Machining,Megmunkálás
 DocType: Sales Invoice Item,Drop Ship,Drop Ship
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","Itt tart fenn a családi részleteket, mint a neve és foglalkozása szülő, házastárs és a gyermekek"
 DocType: Hub Settings,Seller Name,Értékesítő neve
@@ -3890,7 +3726,7 @@
 DocType: Stock Entry,Repack,Repack
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +6,You must Save the form before proceeding,Meg kell menteni a formában a folytatás előtt
 DocType: Item Attribute,Numeric Values,Numerikus értékek
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +500,Attach Logo,Logo csatolása
+apps/erpnext/erpnext/public/js/setup_wizard.js +246,Attach Logo,Logo csatolása
 DocType: Customer,Commission Rate,Jutalék mértéke
 apps/erpnext/erpnext/stock/doctype/item/item.js +38,Make Variant,Győződjön Variant
 apps/erpnext/erpnext/config/hr.py +145,Block leave applications by department.,Blokk szabadság alkalmazások osztály.
@@ -3905,19 +3741,19 @@
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +105,Please select a csv file,Válasszon egy csv fájlt
 DocType: Dropbox Backup,Send Backups to Dropbox,Küldje Biztonsági mentés Dropbox
 DocType: Purchase Order,To Receive and Bill,Fogadására és Bill
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +94,Designer,Tervező
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Designer,Tervező
 apps/erpnext/erpnext/config/selling.py +121,Terms and Conditions Template,Általános szerződési feltételek sablon
 DocType: Serial No,Delivery Details,Szállítási adatok
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +383,Cost Center is required in row {0} in Taxes table for type {1},Költség Center szükséges sorában {0} adók táblázat típusú {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +386,Cost Center is required in row {0} in Taxes table for type {1},Költség Center szükséges sorában {0} adók táblázat típusú {1}
 DocType: Item,Automatically create Material Request if quantity falls below this level,Automatikusan létrehozza Anyag kérése esetén mennyiséget megadott szint alá esik
 ,Item-wise Purchase Register,Elem-bölcs vásárlása Regisztráció
 DocType: Batch,Expiry Date,Lejárat dátuma
-apps/erpnext/erpnext/stock/doctype/item/item.py +375,"To set reorder level, item must be a Purchase Item or Manufacturing Item",Beállításához újrarendezésből szinten elemet kell a vásárlást pont vagy a gyártási tétel
+apps/erpnext/erpnext/stock/doctype/item/item.py +379,"To set reorder level, item must be a Purchase Item or Manufacturing Item",Beállításához újrarendezésből szinten elemet kell a vásárlást pont vagy a gyártási tétel
 ,Supplier Addresses and Contacts,Szállító Címek és Kapcsolatok
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,"Kérjük, válasszon Kategória első"
 apps/erpnext/erpnext/config/projects.py +18,Project master.,Projektek.
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,"Nem mutatnak szimbólum, mint $$ etc mellett valuták."
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +330, (Half Day),(Fél Nap)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +374, (Half Day),(Fél Nap)
 DocType: Supplier,Credit Days,Credit Napok
 DocType: Leave Type,Is Carry Forward,Van átviszi
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +478,Get Items from BOM,Elemek áthozása Anyagjegyzékből
@@ -3925,7 +3761,7 @@
 apps/erpnext/erpnext/config/manufacturing.py +120,Bill of Materials,Darabjegyzékben
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +77,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Row {0}: Party típusa és fél köteles a követelések / fiók {1}
 DocType: Dropbox Backup,Send Notifications To,Értesítést küld
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html +26,Ref Date,Ref dátuma
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +54,Ref Date,Ref dátuma
 DocType: Employee,Reason for Leaving,Kilépés indoka
 DocType: Expense Claim Detail,Sanctioned Amount,Szentesített Összeg
 DocType: GL Entry,Is Opening,Nyit
@@ -3933,4 +3769,3 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +188,Account {0} does not exist,Account {0} nem létezik
 DocType: Account,Cash,Készpénz
 DocType: Employee,Short biography for website and other publications.,Rövid életrajz honlap és egyéb kiadványok.
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +31,Please create Salary Structure for employee {0},"Kérjük, hozzon létre bérszerkeztet munkavállalói {0}"
diff --git a/erpnext/translations/id.csv b/erpnext/translations/id.csv
index 8e7fd5a..bff156a 100644
--- a/erpnext/translations/id.csv
+++ b/erpnext/translations/id.csv
@@ -1,13 +1,12 @@
 DocType: Employee,Salary Mode,Modus Gaji
 DocType: Cost Center,"Select Monthly Distribution, if you want to track based on seasonality.","Pilih Distribusi Bulanan, jika Anda ingin melacak berdasarkan musim."
 DocType: Employee,Divorced,Bercerai
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +86,Warning: Same item has been entered multiple times.,Peringatan: Sama item telah memasuki beberapa kali.
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +80,Warning: Same item has been entered multiple times.,Peringatan: Sama item telah memasuki beberapa kali.
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +96,Items already synced,Item yang sudah disinkronkan
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,Izinkan Barang yang akan ditambahkan beberapa kali dalam suatu transaksi
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,Batal Bahan Kunjungan {0} sebelum membatalkan Garansi Klaim ini
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +19,Consumer Products,Produk Konsumen
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,Produk Konsumen
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +68,Please select Party Type first,Silakan pilih Partai Jenis pertama
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +90,Annealing,Anil
 DocType: Item,Customer Items,Produk Pelanggan
 apps/erpnext/erpnext/accounts/doctype/account/account.py +45,Account {0}: Parent account {1} can not be a ledger,Akun {0}: akun Induk {1} tidak dapat berupa buku besar
 DocType: Item,Publish Item to hub.erpnext.com,Publikasikan Item untuk hub.erpnext.com
@@ -20,15 +19,14 @@
 DocType: About Us Settings,Website,Situs Web
 DocType: POS Profile,Applicable for User,Berlaku untuk Pengguna
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +169,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Berhenti Orde Produksi tidak dapat dibatalkan, unstop pertama untuk membatalkan"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +23,Compaction plus sintering,Pemadatan ditambah sintering
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,Currency is required for Price List {0},Mata Uang diperlukan untuk Daftar Harga {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Akan dihitung dalam transaksi.
 DocType: Purchase Order,Customer Contact,Kontak Pelanggan
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +549,From Material Request,Dari Material Permintaan
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +572,From Material Request,Dari Material Permintaan
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} Tree
 DocType: Job Applicant,Job Applicant,Pemohon Job
 apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,Tidak ada lagi hasil.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +78,Legal,Hukum
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +34,Legal,Hukum
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +114,Actual type tax cannot be included in Item rate in row {0},Jenis pajak yang sebenarnya tidak dapat dimasukkan dalam tingkat Barang berturut-turut {0}
 DocType: C-Form,Customer,Layanan Pelanggan
 DocType: Purchase Receipt Item,Required By,Diperlukan Oleh
@@ -43,7 +41,6 @@
 DocType: Manufacturing Settings,Default 10 mins,Bawaan 10 menit
 DocType: Leave Type,Leave Type Name,Tinggalkan Type Nama
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +148,Series Updated Successfully,Seri Diperbarui Berhasil
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +150,Stitching,Jahitan
 DocType: Pricing Rule,Apply On,Terapkan Pada
 DocType: Item Price,Multiple Item prices.,Multiple Item harga.
 ,Purchase Order Items To Be Received,Purchase Order Items Akan Diterima
@@ -51,8 +48,8 @@
 DocType: Quality Inspection Reading,Parameter,{0}Para{/0}{1}me{/1}{0}ter{/0}
 apps/erpnext/erpnext/projects/doctype/project/project.py +43,Expected End Date can not be less than Expected Start Date,Diharapkan Tanggal Berakhir tidak bisa kurang dari yang diharapkan Tanggal Mulai
 apps/erpnext/erpnext/utilities/transaction_base.py +104,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Row # {0}: Tingkat harus sama dengan {1}: {2} ({3} / {4})
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +189,New Leave Application,Tinggalkan Aplikasi Baru
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +134,Bank Draft,Bank Draft
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +204,New Leave Application,Tinggalkan Aplikasi Baru
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +134,Bank Draft,Bank Draft
 DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,1.5. Untuk menjaga pelanggan bijaksana kode barang dan membuat mereka dicari berdasarkan penggunaan kode mereka pilihan ini
 DocType: Mode of Payment Account,Mode of Payment Account,Cara Rekening Pembayaran
 apps/erpnext/erpnext/stock/doctype/item/item.js +34,Show Variants,Tampilkan Varian
@@ -64,25 +61,23 @@
 DocType: Production Plan Item,Production Plan Item,Rencana Produksi Barang
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +141,User {0} is already assigned to Employee {1},Pengguna {0} sudah ditugaskan untuk Karyawan {1}
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +13,Make new POS Profile,Membuat baru Profil POS
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +31,Health Care,Perawatan Kesehatan
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,Perawatan Kesehatan
 DocType: Purchase Invoice,Monthly,Bulanan
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +66,Delay in payment (Days),Keterlambatan pembayaran (Hari)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +494,Invoice,Faktur
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +519,Invoice,Faktur
 DocType: Maintenance Schedule Item,Periodicity,Masa haid
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +357,Email Address,Alamat Email
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +21,Defense,Pertahanan
+apps/erpnext/erpnext/public/js/setup_wizard.js +107,Email Address,Alamat Email
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,Pertahanan
 DocType: Company,Abbr,Singkatan
 DocType: Appraisal Goal,Score (0-5),Skor (0-5)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +193,Row {0}: {1} {2} does not match with {3},Baris {0}: {1} {2} tidak cocok dengan {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +67,Row # {0}:,Row # {0}:
 DocType: Delivery Note,Vehicle No,Kendaraan yang
 apps/erpnext/erpnext/public/js/pos/pos.js +528,Please select Price List,Silakan pilih Daftar Harga
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +162,Woodworking,Woodworking
 DocType: Production Order Operation,Work In Progress,Bekerja In Progress
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +153,3D printing,Pencetakan 3D
 DocType: Employee,Holiday List,Liburan List
 DocType: Time Log,Time Log,Waktu Log
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +530,Accountant,Akuntan
+apps/erpnext/erpnext/public/js/setup_wizard.js +274,Accountant,Akuntan
 DocType: Cost Center,Stock User,Bursa Pengguna
 DocType: Company,Phone No,Telepon yang
 DocType: Time Log,"Log of Activities performed by users against Tasks that can be used for tracking time, billing.","Log Kegiatan yang dilakukan oleh pengguna terhadap Tugas yang dapat digunakan untuk waktu pelacakan, penagihan."
@@ -98,18 +93,19 @@
 DocType: Bin,Quantity Requested for Purchase,Kuantitas Diminta Pembelian
 DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name","Melampirkan file .csv dengan dua kolom, satu untuk nama lama dan satu untuk nama baru"
 DocType: Packed Item,Parent Detail docname,Induk Detil docname
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Kg,Kg
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Kg,Kg
 apps/erpnext/erpnext/config/hr.py +48,Opening for a Job.,Membuka untuk Job.
 DocType: Item Attribute,Increment,Kenaikan
 apps/erpnext/erpnext/public/js/stock_analytics.js +63,Select Warehouse...,Pilih Gudang ...
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +6,Advertising,Periklanan
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,Periklanan
+apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,Perusahaan yang sama dimasukkan lebih dari sekali
 DocType: Employee,Married,Belum Menikah
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +389,Stock cannot be updated against Delivery Note {0},Stock tidak dapat diperbarui terhadap Delivery Note {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +391,Stock cannot be updated against Delivery Note {0},Stock tidak dapat diperbarui terhadap Delivery Note {0}
 DocType: Payment Reconciliation,Reconcile,Mendamaikan
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +30,Grocery,Toko bahan makanan
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,Toko bahan makanan
 DocType: Quality Inspection Reading,Reading 1,Membaca 1
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Make Bank Entry,Membuat Bank Masuk
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +40,Pension Funds,Dana pensiun
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,Dana pensiun
 apps/erpnext/erpnext/accounts/doctype/account/account.py +142,Warehouse is mandatory if account type is Warehouse,Gudang adalah wajib jika jenis account adalah Gudang
 DocType: SMS Center,All Sales Person,Semua Salesmen
 DocType: Lead,Person Name,Nama orang
@@ -131,7 +127,7 @@
 DocType: Quality Inspection,Get Specification Details,Dapatkan Spesifikasi Detail
 DocType: Lead,Interested,Tertarik
 apps/erpnext/erpnext/config/manufacturing.py +14,Bill of Material,Bill of Material
-apps/erpnext/erpnext/public/js/stock_analytics.js +45,Opening,Pembukaan
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +158,Opening,Pembukaan
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},Dari {0} ke {1}
 DocType: Item,Copy From Item Group,Salin Dari Barang Grup
 DocType: Journal Entry,Opening Entry,Membuka Entri
@@ -145,23 +141,22 @@
 DocType: Employee Education,Under Graduate,Under Graduate
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +22,Target On,Sasaran On
 DocType: BOM,Total Cost,Total Biaya
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +99,Reaming,Reaming
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +9,Activity Log:,Log Aktivitas:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +199,Item {0} does not exist in the system or has expired,Item {0} tidak ada dalam sistem atau telah berakhir
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +44,Real Estate,Real Estate
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +44,Real Estate,Real Estate
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +4,Statement of Account,Pernyataan Rekening
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +41,Pharmaceuticals,Farmasi
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,Farmasi
 DocType: Expense Claim Detail,Claim Amount,Klaim Jumlah
 DocType: Employee,Mr,Mr
 DocType: Custom Script,Client,Client (Nasabah)
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,Pemasok Type / Pemasok
 DocType: Naming Series,Prefix,Awalan
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Consumable,Consumable
+apps/erpnext/erpnext/public/js/setup_wizard.js +359,Consumable,Consumable
 DocType: Upload Attendance,Import Log,Impor Log
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.js +19,Send,Kirim
 DocType: Sales Invoice Item,Delivered By Supplier,Disampaikan Oleh Pemasok
 DocType: SMS Center,All Contact,Semua Kontak
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +164,Annual Salary,Gaji Tahunan
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +164,Annual Salary,Gaji Tahunan
 DocType: Period Closing Voucher,Closing Fiscal Year,Penutup Tahun Anggaran
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +69,Stock Expenses,Beban saham
 DocType: Newsletter,Email Sent?,Email Terkirim?
@@ -169,7 +164,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +92,Show Time Logs,Show Time Log
 DocType: Journal Entry Account,Credit in Company Currency,Kredit di Perusahaan Mata
 DocType: Delivery Note,Installation Status,Status Instalasi
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +115,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Jumlah Diterima + Ditolak harus sama dengan jumlah yang diterima untuk Item {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +118,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Jumlah Diterima + Ditolak harus sama dengan jumlah yang diterima untuk Item {0}
 DocType: Item,Supply Raw Materials for Purchase,Bahan pasokan baku untuk Pembelian
 apps/erpnext/erpnext/stock/get_item_details.py +133,Item {0} must be a Purchase Item,Item {0} harus Pembelian Barang
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
@@ -177,19 +172,17 @@
  Semua tanggal dan karyawan kombinasi dalam jangka waktu yang dipilih akan datang dalam template, dengan catatan kehadiran yang ada"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +446,Item {0} is not active or end of life has been reached,Item {0} tidak aktif atau akhir hidup telah tercapai
 DocType: Time Log Batch,Will be updated after Sales Invoice is Submitted.,Akan diperbarui setelah Faktur Penjualan yang Dikirim.
-apps/erpnext/erpnext/controllers/accounts_controller.py +493,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Untuk mencakup pajak berturut-turut {0} di tingkat Barang, pajak dalam baris {1} juga harus disertakan"
+apps/erpnext/erpnext/controllers/accounts_controller.py +494,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Untuk mencakup pajak berturut-turut {0} di tingkat Barang, pajak dalam baris {1} juga harus disertakan"
 apps/erpnext/erpnext/config/hr.py +90,Settings for HR Module,Pengaturan untuk modul HR
 DocType: SMS Center,SMS Center,SMS Center
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +78,Straightening,Meluruskan
 DocType: BOM Replace Tool,New BOM,New BOM
 apps/erpnext/erpnext/config/projects.py +28,Batch Time Logs for billing.,Batch Waktu Log untuk Penagihan.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +15,Countergravity casting,Pengecoran Countergravity
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +30,Newsletter has already been sent,Newsletter telah terkirim
 DocType: Lead,Request Type,Permintaan Type
 DocType: Leave Application,Reason,Alasan
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +14,Broadcasting,Penyiaran
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +140,Execution,Eksekusi
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +364,The first user will become the System Manager (you can change this later).,Pengguna pertama akan menjadi System Manager (Anda dapat mengubah ini nanti).
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,Penyiaran
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +140,Execution,Eksekusi
+apps/erpnext/erpnext/public/js/setup_wizard.js +114,The first user will become the System Manager (you can change this later).,Pengguna pertama akan menjadi System Manager (Anda dapat mengubah ini nanti).
 apps/erpnext/erpnext/config/manufacturing.py +39,Details of the operations carried out.,Rincian operasi yang dilakukan.
 DocType: Serial No,Maintenance Status,Status pemeliharaan
 apps/erpnext/erpnext/config/stock.py +263,Items and Pricing,Item dan Harga
@@ -206,7 +199,6 @@
 DocType: Pricing Rule,Discount on Price List Rate (%),Diskon Harga Daftar Rate (%)
 apps/frappe/frappe/public/js/frappe/form/print.js +96,Start,Mulai
 DocType: User,First Name,Nama Depan
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +12,Full-mold casting,Pengecoran penuh cetakan
 DocType: Offer Letter,Select Terms and Conditions,Pilih Syarat dan Ketentuan
 DocType: Production Planning Tool,Sales Orders,Penjualan Pesanan
 DocType: Purchase Taxes and Charges,Valuation,Valuation
@@ -218,8 +210,7 @@
 DocType: Bank Reconciliation,Bank Account,Bank Account/Rekening Bank
 DocType: Leave Type,Allow Negative Balance,Izinkan Saldo Negatif
 DocType: Selling Settings,Default Territory,Wilayah standar
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +53,Television,Televisi
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +138,Gashing,Gashing
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,Televisi
 DocType: Production Order Operation,Updated via 'Time Log',Diperbarui melalui 'Time Log'
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +82,Account {0} does not belong to Company {1},Akun {0} bukan milik Perusahaan {1}
 DocType: Naming Series,Series List for this Transaction,Daftar Series Transaksi ini
@@ -234,14 +225,13 @@
 DocType: Leave Allocation,Add unused leaves from previous allocations,Tambahkan daun yang tidak terpakai dari alokasi sebelumnya
 apps/erpnext/erpnext/controllers/recurring_document.py +206,Next Recurring {0} will be created on {1},Berikutnya Berulang {0} akan dibuat pada {1}
 DocType: Newsletter List,Total Subscribers,Jumlah Pelanggan
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +575,Contact Name,Nama Kontak
+,Contact Name,Nama Kontak
 DocType: Production Plan Item,SO Pending Qty,SO Pending Qty
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Membuat Slip gaji untuk kriteria yang disebutkan di atas.
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,Permintaan pembelian.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +107,Double housing,Perumahan ganda
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +156,Only the selected Leave Approver can submit this Leave Application,Hanya dipilih Cuti Approver dapat mengirimkan Aplikasi Cuti ini
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +171,Only the selected Leave Approver can submit this Leave Application,Hanya dipilih Cuti Approver dapat mengirimkan Aplikasi Cuti ini
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,Menghilangkan Tanggal harus lebih besar dari Tanggal Bergabung
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +172,Leaves per Year,Daun per Tahun
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +172,Leaves per Year,Daun per Tahun
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup > Settings > Naming Series,Silakan set Penamaan Series untuk {0} melalui Pengaturan&gt; Pengaturan&gt; Penamaan Seri
 DocType: Time Log,Will be updated when batched.,Akan diperbarui bila batched.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +104,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,Baris {0}: Silakan periksa 'Apakah Muka' terhadap Rekening {1} jika ini adalah sebuah entri muka.
@@ -250,25 +240,24 @@
 DocType: Item Website Specification,Item Website Specification,Item Situs Spesifikasi
 DocType: Dropbox Backup,Dropbox Access Key,Dropbox Access Key
 DocType: Payment Tool,Reference No,Referensi Tidak
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +348,Leave Blocked,Tinggalkan Diblokir
-apps/erpnext/erpnext/stock/doctype/item/item.py +535,Item {0} has reached its end of life on {1},Item {0} telah mencapai akhir hidupnya pada {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +392,Leave Blocked,Tinggalkan Diblokir
+apps/erpnext/erpnext/stock/doctype/item/item.py +539,Item {0} has reached its end of life on {1},Item {0} telah mencapai akhir hidupnya pada {1}
 apps/erpnext/erpnext/accounts/utils.py +339,Annual,Tahunan
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Bursa Rekonsiliasi Barang
 DocType: Stock Entry,Sales Invoice No,Penjualan Faktur ada
 DocType: Material Request Item,Min Order Qty,Min Order Qty
 DocType: Lead,Do Not Contact,Jangan Hubungi
 DocType: Sales Invoice,The unique id for tracking all recurring invoices. It is generated on submit.,Id yang unik untuk melacak semua tagihan berulang. Hal ini dihasilkan di submit.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +93,Software Developer,Software Developer
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +93,Software Developer,Software Developer
 DocType: Item,Minimum Order Qty,Minimum Order Qty
 DocType: Pricing Rule,Supplier Type,Pemasok Type
 DocType: Item,Publish in Hub,Publikasikan di Hub
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +555,Item {0} is cancelled,Item {0} dibatalkan
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +598,Material Request,Permintaan Material
+apps/erpnext/erpnext/stock/doctype/item/item.py +559,Item {0} is cancelled,Item {0} dibatalkan
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +607,Material Request,Permintaan Material
 DocType: Bank Reconciliation,Update Clearance Date,Perbarui Izin Tanggal
 DocType: Item,Purchase Details,Rincian pembelian
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +323,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},Item {0} tidak ditemukan dalam &#39;Bahan Baku Disediakan&#39; tabel dalam Purchase Order {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +129,Wire brushing,Kawat menyikat
 DocType: Employee,Relation,Hubungan
 DocType: Shipping Rule,Worldwide Shipping,Pengiriman seluruh dunia
 apps/erpnext/erpnext/config/selling.py +23,Confirmed orders from Customers.,Dikonfirmasi pesanan dari pelanggan.
@@ -284,12 +273,11 @@
 DocType: Supplier,Address HTML,Alamat HTML
 DocType: Lead,Mobile No.,Ponsel Nomor
 DocType: Maintenance Schedule,Generate Schedule,Menghasilkan Jadwal
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +81,Hubbing,Hubbing
 DocType: Purchase Invoice Item,Expense Head,Beban Kepala
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +86,Please select Charge Type first,Silakan pilih Mengisi Tipe pertama
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,Terbaru
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +395,Max 5 characters,Max 5 karakter
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +195,Select Your Language,Pilih Bahasa Anda
+apps/erpnext/erpnext/public/js/setup_wizard.js +143,Max 5 characters,Max 5 karakter
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +245,Select Your Language,Pilih Bahasa Anda
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,The Approver Cuti pertama dalam daftar akan ditetapkan sebagai default Tinggalkan Approver
 DocType: Manufacturing Settings,"Disables creation of time logs against Production Orders.
 Operations shall not be tracked against Production Order",Menonaktifkan penciptaan log waktu terhadap Pesanan Produksi. Operasi tidak akan dilacak terhadap Orde Produksi
@@ -301,8 +289,6 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +34,Item {0} must be Service Item,Item {0} harus Layanan Barang
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +303,Completed Qty can not be greater than 'Qty to Manufacture',Selesai Qty tidak dapat lebih besar dari 'Jumlah untuk Industri'
 DocType: DocType,Administrator,Administrator
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +136,Laser drilling,Pengeboran Laser
-DocType: Stock UOM Replace Utility,New Stock UOM,New Stock UOM
 DocType: Period Closing Voucher,Closing Account Head,Menutup Akun Kepala
 DocType: Employee,External Work History,Eksternal Sejarah Kerja
 apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,Referensi Kesalahan melingkar
@@ -311,18 +297,15 @@
 DocType: Lead,Industry,Industri
 DocType: Employee,Job Profile,Profil Job
 DocType: Newsletter,Newsletter,Laporan berkala
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +84,Hydroforming,Hydroforming
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +49,Necking,Necking
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Memberitahu melalui Email pada penciptaan Permintaan Bahan otomatis
 DocType: Journal Entry,Multi Currency,Multi Currency
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +51,Item is updated,Item diperbarui
 DocType: Async Task,System Manager,System Manager
 DocType: Payment Reconciliation Invoice,Invoice Type,Invoice Type
 DocType: Sales Invoice Item,Delivery Note,Pengiriman Note
 DocType: Dropbox Backup,Allow Dropbox Access,Izinkan Akses Dropbox
 apps/erpnext/erpnext/config/learn.py +72,Setting up Taxes,Menyiapkan Pajak
 apps/erpnext/erpnext/accounts/utils.py +189,Payment Entry has been modified after you pulled it. Please pull it again.,Masuk pembayaran telah dimodifikasi setelah Anda menariknya. Silakan menariknya lagi.
-apps/erpnext/erpnext/stock/doctype/item/item.py +343,{0} entered twice in Item Tax,{0} dimasukan dua kali dalam Pajak Barang
+apps/erpnext/erpnext/stock/doctype/item/item.py +347,{0} entered twice in Item Tax,{0} dimasukan dua kali dalam Pajak Barang
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +105,Summary for this week and pending activities,Ringkasan untuk minggu ini dan kegiatan yang tertunda
 DocType: Workstation,Rent Cost,Sewa Biaya
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +74,Please select month and year,Silakan pilih bulan dan tahun
@@ -339,24 +322,22 @@
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,Tingkat di mana Pelanggan Mata Uang dikonversi ke mata uang dasar pelanggan
 DocType: Features Setup,"Available in BOM, Delivery Note, Purchase Invoice, Production Order, Purchase Order, Purchase Receipt, Sales Invoice, Sales Order, Stock Entry, Timesheet","Tersedia dalam BOM, Pengiriman Catatan, Purchase Invoice, Pesanan Produksi, Purchase Order, Penerimaan Pembelian, Faktur Penjualan, Sales Order, Stock Masuk, Timesheet"
 DocType: Item Tax,Tax Rate,Tarif Pajak
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Select Item,Pilih Barang
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +540,Select Item,Pilih Barang
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +143,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","Item: {0} berhasil batch-bijaksana, tidak dapat didamaikan dengan menggunakan \
  Stock Rekonsiliasi, bukan menggunakan Stock Masuk"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +259,Purchase Invoice {0} is already submitted,Purchase Invoice {0} sudah disampaikan
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +262,Purchase Invoice {0} is already submitted,Purchase Invoice {0} sudah disampaikan
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Batch No must be same as {1} {2},Row # {0}: Batch ada harus sama {1} {2}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Convert to non-Group,Dikonversi ke non-Grup
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +55,Purchase Receipt must be submitted,Pembelian Penerimaan harus diserahkan
-DocType: Stock UOM Replace Utility,Current Stock UOM,Stok saat ini UOM
 apps/erpnext/erpnext/config/stock.py +53,Batch (lot) of an Item.,Batch (banyak) dari Item.
 DocType: C-Form Invoice Detail,Invoice Date,Faktur Tanggal
 DocType: GL Entry,Debit Amount,Jumlah debit
 apps/erpnext/erpnext/accounts/party.py +223,There can only be 1 Account per Company in {0} {1},Hanya ada 1 Akun per Perusahaan di {0} {1}
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Your email address,Alamat email Anda
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +194,Please see attachment,Silakan lihat lampiran
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +203,Please see attachment,Silakan lihat lampiran
 DocType: Purchase Order,% Received,% Diterima
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +109,Water jet cutting,Air jet cutting
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +24,Setup Already Complete!!,Pengaturan Sudah Selesai!!
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +20,Setup Already Complete!!,Pengaturan Sudah Selesai!!
 ,Finished Goods,Barang Jadi
 DocType: Delivery Note,Instructions,Instruksi
 DocType: Quality Inspection,Inspected By,Diperiksa Oleh
@@ -371,6 +352,7 @@
 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.,Mohon TIDAK membuat Account untuk Pelanggan dan Pemasok. Mereka dibuat langsung dari Nasabah / Pemasok master.
 DocType: Currency Exchange,Currency Exchange,Kurs Mata Uang
 DocType: Purchase Invoice Item,Item Name,Nama Item
+DocType: Authorization Rule,Approving User  (above authorized value),Menyetujui Pengguna (di atas nilai yang berwenang)
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Credit Balance,Saldo kredit
 DocType: Employee,Widowed,Janda
 DocType: Production Planning Tool,"Items to be requested which are ""Out of Stock"" considering all warehouses based on projected qty and minimum order qty","Item harus diminta yang ""Out of Stock"" mengingat semua gudang berdasarkan qty diproyeksikan dan pesanan minimum qty"
@@ -380,11 +362,10 @@
 ,Purchase Register,Pembelian Register
 DocType: Landed Cost Item,Applicable Charges,Biaya yang berlaku
 DocType: Workstation,Consumable Cost,Biaya Consumable
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,{0} ({1}) must have role 'Leave Approver',{0} ({1}) harus memiliki akses sebagai 'Pemberi Izin Cuti'
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +167,{0} ({1}) must have role 'Leave Approver',{0} ({1}) harus memiliki akses sebagai 'Pemberi Izin Cuti'
 DocType: Purchase Receipt,Vehicle Date,Kendaraan Tanggal
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +39,Medical,Medis
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +39,Medical,Medis
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,Alasan untuk kehilangan
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +36,Tube beading,Tabung manik-manik
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},Workstation ditutup pada tanggal berikut sesuai Liburan Daftar: {0}
 DocType: Employee,Single,Tunggal
 DocType: Issue,Attachment,Lampiran
@@ -405,10 +386,8 @@
 DocType: Account,Is Group,Apakah Grup
 DocType: Stock Settings,Automatically Set Serial Nos based on FIFO,Otomatis Set Serial Nos berdasarkan FIFO
 DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,Periksa Pemasok Faktur Nomor Keunikan
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +31,Thermoforming,Thermoforming
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +66,Slitting,Menggorok
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +57,'To Case No.' cannot be less than 'From Case No.','Sampai Kasus No.' tidak bisa kurang dari 'Dari Kasus No.'
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +104,Non Profit,Non Profit
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +104,Non Profit,Non Profit
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_list.js +7,Not Started,Tidak Dimulai
 DocType: Lead,Channel Partner,Mitra Channel
 DocType: Account,Old Parent,Induk tua
@@ -417,13 +396,12 @@
 apps/erpnext/erpnext/config/manufacturing.py +74,Global settings for all manufacturing processes.,Pengaturan global untuk semua proses manufaktur.
 DocType: Accounts Settings,Accounts Frozen Upto,Akun dibekukan sampai dengan
 DocType: SMS Log,Sent On,Dikirim Pada
-apps/erpnext/erpnext/stock/doctype/item/item.py +512,Attribute {0} selected multiple times in Attributes Table,Atribut {0} karena beberapa kali dalam Atribut Tabel
+apps/erpnext/erpnext/stock/doctype/item/item.py +516,Attribute {0} selected multiple times in Attributes Table,Atribut {0} karena beberapa kali dalam Atribut Tabel
 DocType: Sales Order,Not Applicable,Tidak Berlaku
 apps/erpnext/erpnext/config/hr.py +140,Holiday master.,Master Holiday.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +19,Shell molding,Shell molding
 DocType: Material Request Item,Required Date,Diperlukan Tanggal
 DocType: Delivery Note,Billing Address,Alamat Penagihan
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +644,Please enter Item Code.,Masukkan Item Code.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +648,Please enter Item Code.,Masukkan Item Code.
 DocType: BOM,Costing,Biaya
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount","Jika dicentang, jumlah pajak akan dianggap sebagai sudah termasuk dalam Jumlah Tingkat Cetak / Print"
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,Jumlah Qty
@@ -433,7 +411,7 @@
 DocType: Item Attribute,To Range,Berkisar
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Efek dan Deposit
 DocType: Features Setup,Imports,Impor
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +144,Adhesive bonding,Ikatan perekat
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +77,Total leaves allocated is mandatory,Jumlah daun dialokasikan adalah wajib
 DocType: Job Opening,Description of a Job Opening,Deskripsi dari Lowongan
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +102,Pending activities for today,Kegiatan tertunda untuk hari ini
 apps/erpnext/erpnext/config/hr.py +28,Attendance record.,Catatan kehadiran.
@@ -441,26 +419,25 @@
 DocType: Sales Order Item,Used for Production Plan,Digunakan untuk Rencana Produksi
 DocType: System Settings,Loading...,Memuat...
 DocType: DocField,Password,Kata sandi
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +155,Fused deposition modeling,Pemodelan deposisi menyatu
 DocType: Manufacturing Settings,Time Between Operations (in mins),Waktu Antara Operasi (di menit)
 DocType: Customer,Buyer of Goods and Services.,Pembeli Barang dan Jasa.
 DocType: Journal Entry,Accounts Payable,Hutang
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +24,Add Subscribers,Tambahkan Pelanggan
 apps/erpnext/erpnext/public/js/feature_setup.js +220,""" does not exists","""Tidak ada"
 DocType: Pricing Rule,Valid Upto,Valid Upto
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +564,List a few of your customers. They could be organizations or individuals.,Daftar beberapa pelanggan Anda. Mereka bisa menjadi organisasi atau individu.
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,List a few of your customers. They could be organizations or individuals.,Daftar beberapa pelanggan Anda. Mereka bisa menjadi organisasi atau individu.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Direct Income,Penghasilan Langsung
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +33,"Can not filter based on Account, if grouped by Account","Tidak dapat memfilter berdasarkan Account, jika dikelompokkan berdasarkan Account"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +88,Administrative Officer,Petugas Administrasi
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Administrative Officer,Petugas Administrasi
 DocType: Payment Tool,Received Or Paid,Diterima Atau Dibayar
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +318,Please select Company,Silakan pilih Perusahaan
 DocType: Stock Entry,Difference Account,Perbedaan Akun
 apps/erpnext/erpnext/projects/doctype/task/task.py +44,Cannot close task as its dependant task {0} is not closed.,Tidak bisa tugas sedekat tugas yang tergantung {0} tidak tertutup.
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +305,Please enter Warehouse for which Material Request will be raised,Masukkan Gudang yang Material Permintaan akan dibangkitkan
 DocType: Production Order,Additional Operating Cost,Tambahan Biaya Operasi
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +20,Cosmetics,Kosmetik
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,Kosmetik
 DocType: DocField,Type,Jenis
-apps/erpnext/erpnext/stock/doctype/item/item.py +417,"To merge, following properties must be same for both items","Untuk bergabung, sifat berikut harus sama untuk kedua item"
+apps/erpnext/erpnext/stock/doctype/item/item.py +421,"To merge, following properties must be same for both items","Untuk bergabung, sifat berikut harus sama untuk kedua item"
 DocType: Communication,Subject,Perihal
 DocType: Shipping Rule,Net Weight,Berat Bersih
 DocType: Employee,Emergency Phone,Darurat Telepon
@@ -470,7 +447,6 @@
 DocType: Journal Entry,Difference (Dr - Cr),Perbedaan (Dr - Cr)
 DocType: Account,Profit and Loss,Laba Rugi
 apps/erpnext/erpnext/config/stock.py +293,Managing Subcontracting,Mengelola Subkontrak
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +58,New UOM must NOT be of type Whole Number,New UOM TIDAK harus dari jenis Whole Number
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Furniture and Fixture,Furniture dan Fixture
 DocType: Quotation,Rate at which Price list currency is converted to company's base currency,Tingkat di mana mata uang Daftar Harga dikonversi ke mata uang dasar perusahaan
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Account {0} does not belong to company: {1},Akun {0} bukan milik perusahaan: {1}
@@ -490,14 +466,14 @@
 DocType: Purchase Invoice,Supplier Invoice No,Pemasok Faktur ada
 DocType: Territory,For reference,Untuk referensi
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +154,"Cannot delete Serial No {0}, as it is used in stock transactions","Tidak dapat menghapus Serial ada {0}, seperti yang digunakan dalam transaksi saham"
-apps/erpnext/erpnext/public/js/account_tree_grid.js +52,Closing (Cr),Penutup (Cr)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +227,Closing (Cr),Penutup (Cr)
 DocType: Serial No,Warranty Period (Days),Masa Garansi (Hari)
 DocType: Installation Note Item,Installation Note Item,Instalasi Catatan Barang
 ,Pending Qty,Tertunda Qty
 DocType: Job Applicant,Thread HTML,Thread HTML
 DocType: Company,Ignore,Mengabaikan
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +86,SMS sent to following numbers: {0},SMS dikirim ke nomor berikut: {0}
-apps/erpnext/erpnext/controllers/buying_controller.py +135,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Pemasok Gudang wajib untuk Pembelian Penerimaan sub-kontrak
+apps/erpnext/erpnext/controllers/buying_controller.py +126,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Pemasok Gudang wajib untuk Pembelian Penerimaan sub-kontrak
 DocType: Pricing Rule,Valid From,Valid Dari
 DocType: Sales Invoice,Total Commission,Jumlah Komisi
 DocType: Pricing Rule,Sales Partner,Penjualan Mitra
@@ -507,7 +483,7 @@
 To distribute a budget using this distribution, set this **Monthly Distribution** in the **Cost Center**","** Distribusi Bulanan ** membantu Anda mendistribusikan anggaran di bulan jika Anda memiliki musiman dalam bisnis Anda.
 
  Untuk mendistribusikan anggaran menggunakan distribusi ini, mengatur Distribusi Bulanan ** ini ** di ** Biaya Pusat **"
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +183,No records found in the Invoice table,Tidak ada catatan yang ditemukan dalam tabel Faktur
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +130,No records found in the Invoice table,Tidak ada catatan yang ditemukan dalam tabel Faktur
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +20,Please select Company and Party Type first,Silakan pilih Perusahaan dan Partai Jenis pertama
 apps/erpnext/erpnext/config/accounts.py +84,Financial / accounting year.,Keuangan / akuntansi tahun.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","Maaf, Serial Nos tidak dapat digabungkan"
@@ -523,25 +499,25 @@
 DocType: Sales Order,Billing and Delivery Status,Penagihan dan Pengiriman Status
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Ulangi Pelanggan
 DocType: Leave Control Panel,Allocate,Alokasi
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +16,Previous,Sebelumnya
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard_page.html +16,Previous,Sebelumnya
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +620,Sales Return,Penjualan Kembali
 DocType: Production Planning Tool,Select Sales Orders from which you want to create Production Orders.,Pilih Penjualan Pesanan dari mana Anda ingin membuat Pesanan Produksi.
 DocType: Item,Delivered by Supplier (Drop Ship),Disampaikan oleh Pemasok (Drop Kapal)
 apps/erpnext/erpnext/config/hr.py +120,Salary components.,Komponen gaji.
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,Database pelanggan potensial.
+DocType: Authorization Rule,Customer or Item,Pelanggan atau Barang
 apps/erpnext/erpnext/config/crm.py +17,Customer database.,Database pelanggan.
 DocType: Quotation,Quotation To,Quotation Untuk
 DocType: Lead,Middle Income,Penghasilan Tengah
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),Pembukaan (Cr)
 apps/erpnext/erpnext/accounts/utils.py +193,Allocated amount can not be negative,Jumlah yang dialokasikan tidak dijinkan negatif
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +123,Tumbling,Tumbling
 DocType: Purchase Order Item,Billed Amt,Jumlah tagihan
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,Sebuah Gudang logis terhadap entri saham yang dibuat.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +92,Reference No & Reference Date is required for {0},Referensi ada & Referensi Tanggal diperlukan untuk {0}
 DocType: Event,Wednesday,Rabu
 DocType: Sales Invoice,Customer's Vendor,Penjual Nasabah
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +214,Production Order is Mandatory,Produksi Order adalah Wajib
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +139,Proposal Writing,Penulisan Proposal
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,Proposal Writing,Penulisan Proposal
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,Lain Penjualan Person {0} ada dengan id Karyawan yang sama
 apps/erpnext/erpnext/stock/stock_ledger.py +336,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},Kesalahan Stock negatif ({6}) untuk Item {0} Gudang {1} di {2} {3} in {4} {5}
 DocType: Fiscal Year Company,Fiscal Year Company,Fiskal Tahun Perusahaan
@@ -564,7 +540,7 @@
 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.","Kemudian Pricing Aturan disaring berdasarkan Pelanggan, Kelompok Pelanggan, Wilayah, Supplier, Supplier Type, Kampanye, Penjualan Mitra dll"
 apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.py +179,Please install dropbox python module,Silakan instal modul python dropbox
 DocType: Employee,Passport Number,Nomor Paspor
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +82,Manager,Manajer
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Manager,Manajer
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +494,From Purchase Receipt,Dari Penerimaan Pembelian
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +219,Same item has been entered multiple times.,Item yang sama telah dimasukkan beberapa kali.
 DocType: SMS Settings,Receiver Parameter,Receiver Parameter
@@ -572,10 +548,9 @@
 DocType: Sales Person,Sales Person Targets,Target Penjualan Orang
 apps/frappe/frappe/public/js/frappe/form/workflow.js +116,To,untuk
 apps/frappe/frappe/templates/base.html +145,Please enter email address,Masukkan alamat email
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +35,End tube forming,Tabung akhir membentuk
 DocType: Production Order Operation,In minutes,Dalam menit
 DocType: Issue,Resolution Date,Resolusi Tanggal
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +635,Please set default Cash or Bank account in Mode of Payment {0},Silakan set Cash standar atau rekening Bank Mode Pembayaran {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +637,Please set default Cash or Bank account in Mode of Payment {0},Silakan set Cash standar atau rekening Bank Mode Pembayaran {0}
 DocType: Selling Settings,Customer Naming By,Penamaan Pelanggan Dengan
 apps/erpnext/erpnext/accounts/doctype/account/account.js +67,Convert to Group,Konversikan ke Grup
 DocType: Activity Cost,Activity Type,Jenis Kegiatan
@@ -583,12 +558,12 @@
 DocType: Customer,Fixed Days,Hari Tetap
 DocType: Sales Invoice,Packing List,Packing List
 apps/erpnext/erpnext/config/buying.py +28,Purchase Orders given to Suppliers.,Pembelian Pesanan yang diberikan kepada Pemasok.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +43,Publishing,Penerbitan
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +43,Publishing,Penerbitan
 DocType: Activity Cost,Projects User,Proyek Pengguna
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Consumed,Dikonsumsi
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +198,{0}: {1} not found in Invoice Details table,{0}: {1} tidak ditemukan dalam tabel Rincian Tagihan
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,{0}: {1} not found in Invoice Details table,{0}: {1} tidak ditemukan dalam tabel Rincian Tagihan
 DocType: Company,Round Off Cost Center,Bulat Off Biaya Pusat
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +208,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Pemeliharaan Kunjungan {0} harus dibatalkan sebelum membatalkan Sales Order ini
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +203,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Pemeliharaan Kunjungan {0} harus dibatalkan sebelum membatalkan Sales Order ini
 DocType: Material Request,Material Transfer,Material Transfer
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +56,Opening (Dr),Pembukaan (Dr)
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},Posting timestamp harus setelah {0}
@@ -600,7 +575,6 @@
 DocType: Pricing Rule,Sales Manager,Sales Manager
 apps/frappe/frappe/public/js/frappe/model/model.js +492,Rename,Ubah nama
 DocType: Journal Entry,Write Off Amount,Menulis Off Jumlah
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +52,Bending,Pembengkokan
 apps/frappe/frappe/core/page/user_permissions/user_permissions.js +246,Allow User,Izinkan Pengguna
 DocType: Journal Entry,Bill No,Bill ada
 DocType: Purchase Invoice,Quarterly,Triwulanan
@@ -610,17 +584,16 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Please enter item details,Masukkan detil item
 DocType: Purchase Receipt,Other Details,Detail lainnya
 DocType: Account,Accounts,Akun / Rekening
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +67,Marketing,Pemasaran
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +65,Straight shearing,Geser lurus
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +67,Marketing,Pemasaran
 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.,Untuk melacak item dalam penjualan dan dokumen pembelian berdasarkan nos serial mereka. Hal ini juga dapat digunakan untuk melacak rincian garansi produk.
 DocType: Purchase Receipt Item Supplied,Current Stock,Stok saat ini
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +99,Rejected Warehouse is mandatory against regected item,Gudang Ditolak adalah wajib terhadap barang regected
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +102,Rejected Warehouse is mandatory against regected item,Gudang Ditolak adalah wajib terhadap barang regected
 DocType: Account,Expenses Included In Valuation,Biaya Termasuk Dalam Penilaian
 DocType: Employee,Provide email id registered in company,Menyediakan email id yang terdaftar di perusahaan
 DocType: Hub Settings,Seller City,Penjual Kota
 DocType: Email Digest,Next email will be sent on:,Email berikutnya akan dikirim pada:
 DocType: Offer Letter Term,Offer Letter Term,Menawarkan Surat Term
-apps/erpnext/erpnext/stock/doctype/item/item.py +492,Item has variants.,Item memiliki varian.
+apps/erpnext/erpnext/stock/doctype/item/item.py +496,Item has variants.,Item memiliki varian.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Item {0} tidak ditemukan
 DocType: Bin,Stock Value,Nilai saham
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,Jenis Pohon
@@ -629,10 +602,9 @@
 DocType: Material Request Item,Quantity and Warehouse,Kuantitas dan Gudang
 DocType: Sales Invoice,Commission Rate (%),Komisi Rate (%)
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +172,"Against Voucher Type must be one of Sales Order, Sales Invoice or Journal Entry","Terhadap Voucher Type harus menjadi salah satu Sales Order, Faktur Penjualan atau Journal Masuk"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +139,Biomachining,Biomachining
 apps/erpnext/erpnext/setup/utils.py +89,Unable to find exchange rate,Tidak dapat menemukan nilai tukar
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +7,Aerospace,Aerospace
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +19,Welcome,Selamat Datang
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +7,Aerospace,Aerospace
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +40,Welcome,Selamat Datang
 DocType: Journal Entry,Credit Card Entry,Kartu kredit Masuk
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +18,Task Subject,Tugas Subjek
 apps/erpnext/erpnext/config/stock.py +33,Goods received from Suppliers.,Barang yang diterima dari pemasok.
@@ -655,19 +627,19 @@
 DocType: Employee,Cell Number,Nomor Cell
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Tersesat
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +120,You can not enter current voucher in 'Against Journal Entry' column,Anda tidak dapat memasukkan voucher saat ini di kolom 'Atas Journal Entry'
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +25,Energy,Energi
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,Energi
 DocType: Opportunity,Opportunity From,Peluang Dari
 apps/erpnext/erpnext/config/hr.py +33,Monthly salary statement.,Pernyataan gaji bulanan.
 DocType: Item Group,Website Specifications,Website Spesifikasi
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +205,New Account,Akun baru
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +21,{0}: From {0} of type {1},{0}: Dari {0} tipe {1}
-apps/erpnext/erpnext/controllers/buying_controller.py +283,Row {0}: Conversion Factor is mandatory,Row {0}: Faktor Konversi adalah wajib
+apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,Row {0}: Faktor Konversi adalah wajib
 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.,Entri akuntansi dapat dilakukan terhadap node daun. Entri terhadap Grup tidak diperbolehkan.
 DocType: ToDo,High,Tinggi
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +361,Cannot deactivate or cancel BOM as it is linked with other BOMs,Tidak bisa menonaktifkan atau membatalkan BOM seperti yang terkait dengan BOMs lainnya
 DocType: Opportunity,Maintenance,Pemeliharaan
 DocType: User,Male,Laki-laki
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +182,Purchase Receipt number required for Item {0},Nomor Penerimaan Pembelian diperlukan untuk Item {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +183,Purchase Receipt number required for Item {0},Nomor Penerimaan Pembelian diperlukan untuk Item {0}
 DocType: Item Attribute Value,Item Attribute Value,Item Atribut Nilai
 apps/erpnext/erpnext/config/crm.py +64,Sales campaigns.,Kampanye penjualan.
 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.
@@ -715,10 +687,9 @@
 DocType: Address,Personal,Pribadi
 DocType: Expense Claim Detail,Expense Claim Type,Beban Klaim Type
 DocType: Shopping Cart Settings,Default settings for Shopping Cart,Pengaturan default untuk Belanja
-apps/erpnext/erpnext/controllers/accounts_controller.py +324,"Journal Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Jurnal Entri {0} dihubungkan terhadap Orde {1}, memeriksa apakah itu harus ditarik sebagai uang muka dalam faktur ini."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +13,Biotechnology,Bioteknologi
+apps/erpnext/erpnext/controllers/accounts_controller.py +325,"Journal Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Jurnal Entri {0} dihubungkan terhadap Orde {1}, memeriksa apakah itu harus ditarik sebagai uang muka dalam faktur ini."
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +13,Biotechnology,Bioteknologi
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Office Maintenance Expenses,Beban Pemeliharaan Kantor
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +53,Hemming,Hemming
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +66,Please enter Item first,Masukkan Barang pertama
 DocType: Account,Liability,Kewajiban
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +62,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Sanksi Jumlah tidak dapat lebih besar dari Klaim Jumlah dalam Row {0}.
@@ -731,10 +702,10 @@
 DocType: Company,Default Bank Account,Standar Rekening Bank
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +47,"To filter based on Party, select Party Type first","Untuk menyaring berdasarkan Party, pilih Partai Ketik pertama"
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},'Update Stok' tidak dapat diperiksa karena item tidak dikirim melalui {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Nos,Nos
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Nos,Nos
 DocType: Item,Items with higher weightage will be shown higher,Item dengan weightage lebih tinggi akan ditampilkan lebih tinggi
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Rincian Rekonsiliasi Bank
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +627,My Invoices,Faktur saya
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +629,My Invoices,Faktur saya
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,Tidak ada karyawan yang ditemukan
 DocType: Purchase Order,Stopped,Terhenti
 DocType: Item,If subcontracted to a vendor,Jika subkontrak ke vendor
@@ -753,35 +724,33 @@
 DocType: Features Setup,"To enable ""Point of Sale"" features",Untuk mengaktifkan &quot;Point of Sale&quot; fitur
 DocType: Bin,Moving Average Rate,Moving Average Tingkat
 DocType: Production Planning Tool,Select Items,Pilih Produk
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,{0} against Bill {1} dated {2},{0} terhadap Bill {1} ​​tanggal {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +328,{0} against Bill {1} dated {2},{0} terhadap Bill {1} ​​tanggal {2}
 DocType: Comment,Reference Name,Referensi Nama
 DocType: Maintenance Visit,Completion Status,Status Penyelesaian
 DocType: Sales Invoice Item,Target Warehouse,Target Gudang
 DocType: Item,Allow over delivery or receipt upto this percent,Biarkan selama pengiriman atau penerimaan upto persen ini
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +49,Expected Delivery Date cannot be before Sales Order Date,Diharapkan Pengiriman Tanggal tidak bisa sebelum Sales Order Tanggal
 DocType: Upload Attendance,Import Attendance,Impor Kehadiran
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +17,All Item Groups,Semua Grup Barang/Item
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +17,All Item Groups,Semua Grup Barang/Item
 DocType: Process Payroll,Activity Log,Log Aktivitas
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +30,Net Profit / Loss,Laba / Rugi
 apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,Secara otomatis menulis pesan pada pengajuan transaksi.
 DocType: Production Order,Item To Manufacture,Barang Untuk Industri
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +16,Permanent mold casting,Pengecoran cetakan permanen
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} Status adalah {2}
 apps/erpnext/erpnext/config/learn.py +172,Purchase Order to Payment,Pembelian Order untuk Pembayaran
 DocType: Sales Order Item,Projected Qty,Proyeksi Jumlah
 DocType: Sales Invoice,Payment Due Date,Tanggal Jatuh Tempo Pembayaran
 DocType: Newsletter,Newsletter Manager,Newsletter Manajer
-apps/erpnext/erpnext/stock/doctype/item/item.js +229,Item Variant {0} already exists with same attributes,Item Varian {0} sudah ada dengan atribut yang sama
+apps/erpnext/erpnext/stock/doctype/item/item.js +231,Item Variant {0} already exists with same attributes,Item Varian {0} sudah ada dengan atribut yang sama
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening','Awal'
 DocType: Notification Control,Delivery Note Message,Pengiriman Note Pesan
 DocType: Expense Claim,Expenses,Beban
 DocType: Item Variant Attribute,Item Variant Attribute,Item Varian Atribut
 ,Purchase Receipt Trends,Tren Penerimaan Pembelian
 DocType: Appraisal,Select template from which you want to get the Goals,Pilih template dari mana Anda ingin mendapatkan Goals
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +77,Research & Development,Penelitian & Pengembangan
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Research & Development,Penelitian & Pengembangan
 ,Amount to Bill,Sebesar Bill
 DocType: Company,Registration Details,Detail Pendaftaran
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +75,Staking,Mengintai
 DocType: Item,Re-Order Qty,Re-order Qty
 DocType: Leave Block List Date,Leave Block List Date,Tinggalkan Block List Tanggal
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +25,Scheduled to send to {0},Dijadwalkan untuk mengirim ke {0}
@@ -792,18 +761,16 @@
 DocType: Sales Invoice Item,Stock Details,Detail saham
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Nilai Proyek
 apps/erpnext/erpnext/config/selling.py +304,Point-of-Sale,Titik penjualan
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,Cannot carry forward {0},Tidak bisa meneruskan {0}
 apps/erpnext/erpnext/accounts/doctype/account/account.py +91,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","Saldo rekening telah berada di Kredit, Anda tidak diizinkan untuk mengatur 'Balance Harus' sebagai 'Debit'"
 DocType: Account,Balance must be,Saldo harus
 DocType: Hub Settings,Publish Pricing,Publikasikan Harga
 DocType: Notification Control,Expense Claim Rejected Message,Beban Klaim Ditolak Pesan
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +145,Nailing,Baik sekali
 ,Available Qty,Jumlah Tersedia
 DocType: Purchase Taxes and Charges,On Previous Row Total,Pada Sebelumnya Row Jumlah
 DocType: Salary Slip,Working Days,Hari Kerja
 DocType: Serial No,Incoming Rate,Tingkat yang masuk
 DocType: Packing Slip,Gross Weight,Berat Kotor
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +410,The name of your company for which you are setting up this system.,Nama perusahaan Anda yang Anda sedang mengatur sistem ini.
+apps/erpnext/erpnext/public/js/setup_wizard.js +158,The name of your company for which you are setting up this system.,Nama perusahaan Anda yang Anda sedang mengatur sistem ini.
 DocType: HR Settings,Include holidays in Total no. of Working Days,Sertakan liburan di total no. dari Hari Kerja
 DocType: Job Applicant,Hold,Memegang
 DocType: Employee,Date of Joining,Tanggal Bergabung
@@ -813,7 +780,6 @@
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +3,View Subscribers,Lihat Pelanggan
 DocType: Purchase Invoice Item,Purchase Receipt,Penerimaan Pembelian
 ,Received Items To Be Billed,Produk Diterima Akan Ditagih
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +114,Abrasive blasting,Peledakan abrasive
 DocType: Employee,Ms,Ms
 apps/erpnext/erpnext/config/accounts.py +148,Currency exchange rate master.,Menguasai nilai tukar mata uang.
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +253,Unable to find Time Slot in the next {0} days for Operation {1},Tidak dapat menemukan waktu Slot di {0} hari berikutnya untuk Operasi {1}
@@ -825,7 +791,7 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +209,Serial No {0} does not belong to Item {1},Serial ada {0} bukan milik Barang {1}
 DocType: Purchase Receipt Item Supplied,Required Qty,Diperlukan Qty
 DocType: Bank Reconciliation,Total Amount,Jumlah Total
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +32,Internet Publishing,Penerbitan Internet
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,Penerbitan Internet
 DocType: Production Planning Tool,Production Orders,Pesanan Produksi
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +35,Balance Value,Nilai Saldo
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,Daftar Harga Jual
@@ -836,7 +802,7 @@
 DocType: Supplier,Default Payable Accounts,Standar Account Payable
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,Karyawan {0} tidak aktif atau tidak ada
 DocType: Features Setup,Item Barcode,Item Barcode
-apps/erpnext/erpnext/stock/doctype/item/item.py +487,Item Variants {0} updated,Item Varian {0} diperbarui
+apps/erpnext/erpnext/stock/doctype/item/item.py +491,Item Variants {0} updated,Item Varian {0} diperbarui
 DocType: Quality Inspection Reading,Reading 6,Membaca 6
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Pembelian Faktur Muka
 DocType: Address,Shop,Toko
@@ -845,7 +811,7 @@
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,Standar rekening Bank / Cash akan secara otomatis diperbarui di POS Invoice saat mode ini dipilih.
 DocType: Employee,Permanent Address Is,Alamat permanen Apakah
 DocType: Production Order Operation,Operation completed for how many finished goods?,Operasi selesai untuk berapa banyak barang jadi?
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +491,The Brand,Merek
+apps/erpnext/erpnext/public/js/setup_wizard.js +237,The Brand,Merek
 apps/erpnext/erpnext/controllers/status_updater.py +163,Allowance for over-{0} crossed for Item {1}.,Penyisihan over-{0} menyeberang untuk Item {1}.
 DocType: Employee,Exit Interview Details,Detail Exit Interview
 DocType: Item,Is Purchase Item,Apakah Pembelian Barang
@@ -865,16 +831,16 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Indirect Income,Penghasilan tidak langsung
 DocType: Payment Tool,Set Payment Amount = Outstanding Amount,Mengatur Jumlah Pembayaran = Outstanding Jumlah
 DocType: Contact Us Settings,Address Line 1,Alamat Baris 1
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Variance,Perbedaan
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +392,Company Name,Company Name
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +53,Variance,Perbedaan
+,Company Name,Company Name
 DocType: SMS Center,Total Message(s),Total Pesan (s)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +515,Select Item for Transfer,Pilih item untuk transfer
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +538,Select Item for Transfer,Pilih item untuk transfer
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,Lihat daftar semua bantuan video
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,Pilih kepala rekening bank mana cek diendapkan.
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,Izinkan user/pengguna untuk mengubah rate daftar harga di dalam transaksi
 DocType: Pricing Rule,Max Qty,Max Qty
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +106,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Baris {0}: Pembayaran terhadap Penjualan / Purchase Order harus selalu ditandai sebagai muka
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +16,Chemical,Kimia
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,Kimia
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +693,All items have already been transferred for this Production Order.,Semua item telah dialihkan untuk Pesanan Produksi ini.
 DocType: Process Payroll,Select Payroll Year and Month,Pilih Payroll Tahun dan Bulan
 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""",Pergi ke kelompok yang sesuai (biasanya Penerapan Dana&gt; Aset Lancar&gt; Account Bank dan membuat Akun baru (dengan mengklik Tambahkan Anak) tipe &quot;Bank&quot;
@@ -885,12 +851,12 @@
 DocType: Item,Inspection Criteria,Kriteria Pemeriksaan
 apps/erpnext/erpnext/config/accounts.py +101,Tree of finanial Cost Centers.,Pohon Pusat Biaya finanial.
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,Ditransfer
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +492,Upload your letter head and logo. (you can edit them later).,Upload kop surat dan logo. (Anda dapat mengeditnya nanti).
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +156,White,Putih
+apps/erpnext/erpnext/public/js/setup_wizard.js +238,Upload your letter head and logo. (you can edit them later).,Upload kop surat dan logo. (Anda dapat mengeditnya nanti).
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,White,Putih
 DocType: SMS Center,All Lead (Open),Semua Prospektus (Open)
 DocType: Purchase Invoice,Get Advances Paid,Dapatkan Uang Muka Dibayar
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +362,Attach Your Picture,Pasang Gambar Anda
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Make ,Membuat
+apps/erpnext/erpnext/public/js/setup_wizard.js +112,Attach Your Picture,Pasang Gambar Anda
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +540,Make ,Membuat
 DocType: Journal Entry,Total Amount in Words,Jumlah Total Kata
 DocType: Workflow State,Stop,berhenti
 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.,Ada kesalahan. Salah satu alasan yang mungkin bisa jadi Anda belum menyimpan formulir. Silahkan hubungi support@erpnext.com jika masalah terus berlanjut.
@@ -899,14 +865,13 @@
 DocType: Lead,Next Contact Date,Berikutnya Hubungi Tanggal
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,Membuka Qty
 DocType: Holiday List,Holiday List Name,Nama Libur
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +168,Stock Options,Pilihan Persediaan
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +168,Stock Options,Pilihan Persediaan
 DocType: Journal Entry Account,Expense Claim,Beban Klaim
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +181,Qty for {0},Jumlah untuk {0}
 DocType: Leave Application,Leave Application,Tinggalkan Aplikasi
 apps/erpnext/erpnext/config/hr.py +77,Leave Allocation Tool,Tinggalkan Alokasi Alat
 DocType: Leave Block List,Leave Block List Dates,Tinggalkan Block List Tanggal
 DocType: Company,If Monthly Budget Exceeded (for expense account),Jika Anggaran Bulanan Melebihi (untuk akun beban)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +56,Trimming,Hiasan
 DocType: Workstation,Net Hour Rate,Tingkat Jam Bersih
 DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,Landed Biaya Penerimaan Pembelian
 DocType: Company,Default Terms,Persyaratan standar
@@ -914,10 +879,9 @@
 DocType: POS Profile,Cash/Bank Account,Rekening Kas / Bank
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,Removed items with no change in quantity or value.,Item dihapus dengan tidak ada perubahan dalam jumlah atau nilai.
 DocType: Delivery Note,Delivery To,Pengiriman Untuk
-apps/erpnext/erpnext/stock/doctype/item/item.py +509,Attribute table is mandatory,Tabel atribut wajib
+apps/erpnext/erpnext/stock/doctype/item/item.py +513,Attribute table is mandatory,Tabel atribut wajib
 DocType: Production Planning Tool,Get Sales Orders,Dapatkan Pesanan Penjualan
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} tidak dapat negatif
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +103,Filing,Pengajuan
 apps/erpnext/erpnext/templates/form_grid/item_grid.html +72,Discount,Diskon
 DocType: Features Setup,Purchase Discounts,Membeli Diskon
 DocType: Workstation,Wages,Upah
@@ -934,6 +898,7 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +112,You are the Expense Approver for this record. Please Update the 'Status' and Save,Anda adalah Approver Beban untuk record ini. Silakan Update 'Status' dan Simpan
 DocType: Serial No,Creation Document No,Penciptaan Dokumen Tidak
 DocType: Issue,Issue,Isu
+apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account does not match with Company,Akun tidak cocok dengan Perusahaan
 apps/erpnext/erpnext/config/stock.py +136,"Attributes for Item Variants. e.g Size, Color etc.","Atribut untuk Item Varian. misalnya Ukuran, Warna dll"
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +39,WIP Warehouse,WIP Gudang
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +194,Serial No {0} is under maintenance contract upto {1},Serial ada {0} berada di bawah kontrak pemeliharaan upto {1}
@@ -942,7 +907,7 @@
 DocType: Tax Rule,Shipping State,Pengiriman Negara
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,Item harus ditambahkan dengan menggunakan 'Dapatkan Produk dari Pembelian Penerimaan' tombol
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,Beban Penjualan
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Buying,Standard Membeli
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +120,Standard Buying,Standard Membeli
 DocType: GL Entry,Against,Terhadap
 DocType: Item,Default Selling Cost Center,Default Jual Biaya Pusat
 DocType: Sales Partner,Implementation Partner,Implementasi Mitra
@@ -963,29 +928,29 @@
 DocType: Time Log Batch,updated via Time Logs,diperbarui melalui Waktu Log
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,Rata-rata Usia
 DocType: Opportunity,Your sales person who will contact the customer in future,Sales Anda yang akan menghubungi pelanggan di masa depan
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +588,List a few of your suppliers. They could be organizations or individuals.,Daftar beberapa pemasok Anda. Mereka bisa menjadi organisasi atau individu.
+apps/erpnext/erpnext/public/js/setup_wizard.js +326,List a few of your suppliers. They could be organizations or individuals.,Daftar beberapa pemasok Anda. Mereka bisa menjadi organisasi atau individu.
 DocType: Company,Default Currency,Currency Default
 DocType: Contact,Enter designation of this Contact,Masukkan penunjukan Kontak ini
 DocType: Contact Us Settings,Address,Alamat
 DocType: Expense Claim,From Employee,Dari Karyawan
-apps/erpnext/erpnext/controllers/accounts_controller.py +338,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Peringatan: Sistem tidak akan memeriksa overbilling karena jumlahnya untuk Item {0} pada {1} adalah nol
+apps/erpnext/erpnext/controllers/accounts_controller.py +339,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Peringatan: Sistem tidak akan memeriksa overbilling karena jumlahnya untuk Item {0} pada {1} adalah nol
 DocType: Journal Entry,Make Difference Entry,Membuat Perbedaan Entri
 DocType: Upload Attendance,Attendance From Date,Kehadiran Dari Tanggal
 DocType: Appraisal Template Goal,Key Performance Area,Key Bidang Kinerja
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +54,Transportation,Transportasi
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +54,Transportation,Transportasi
 apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +67, and year: ,dan tahun:
 DocType: Email Digest,Annual Expense,Beban tahunan
 DocType: SMS Center,Total Characters,Jumlah Karakter
-apps/erpnext/erpnext/controllers/buying_controller.py +139,Please select BOM in BOM field for Item {0},Silakan pilih BOM BOM di lapangan untuk Item {0}
+apps/erpnext/erpnext/controllers/buying_controller.py +130,Please select BOM in BOM field for Item {0},Silakan pilih BOM BOM di lapangan untuk Item {0}
 DocType: C-Form Invoice Detail,C-Form Invoice Detail,C-Form Faktur Detil
 DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,Rekonsiliasi Pembayaran Faktur
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +32,Contribution %,Kontribusi%
 DocType: Item,website page link,tautan halaman situs web
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +192,Let's prepare the system for first use.,Mari kita mempersiapkan sistem untuk penggunaan pertama.
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +242,Let's prepare the system for first use.,Mari kita mempersiapkan sistem untuk penggunaan pertama.
 DocType: Company,Company registration numbers for your reference. Tax numbers etc.,Nomor registrasi perusahaan untuk referensi Anda. Nomor pajak dll
 DocType: Sales Partner,Distributor,Distributor
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Belanja Pengiriman Aturan
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +214,Production Order {0} must be cancelled before cancelling this Sales Order,Pesanan produksi {0} harus dibatalkan sebelum membatalkan Sales Order ini
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +209,Production Order {0} must be cancelled before cancelling this Sales Order,Pesanan produksi {0} harus dibatalkan sebelum membatalkan Sales Order ini
 ,Ordered Items To Be Billed,Memerintahkan Items Akan Ditagih
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +24,From Range has to be less than To Range,Dari Rentang harus kurang dari Untuk Rentang
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +21,Select Time Logs and Submit to create a new Sales Invoice.,Pilih Waktu Log dan Kirim untuk membuat Faktur Penjualan baru.
@@ -1005,14 +970,13 @@
 DocType: Sales Invoice Advance,Sales Invoice Advance,Faktur Penjualan Muka
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +398,Nothing to request,Tidak ada yang meminta
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date','Tanggal Mulai Sebenarnya' tidak dapat lebih besar dari 'Tanggal Selesai Sebenarnya'
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +75,Management,Manajemen
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +75,Management,Manajemen
 apps/erpnext/erpnext/config/projects.py +33,Types of activities for Time Sheets,Jenis kegiatan untuk Waktu Sheets
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +14,Investment casting,Investasi casting
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +51,Either debit or credit amount is required for {0},Entah debit atau jumlah kredit diperlukan untuk {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""","Ini akan ditambahkan ke Item Code dari varian. Sebagai contoh, jika Anda adalah singkatan ""SM"", dan kode barang adalah ""T-SHIRT"", kode item varian akan ""T-SHIRT-SM"""
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,Pay Bersih (dalam kata-kata) akan terlihat setelah Anda menyimpan Slip Gaji.
 apps/frappe/frappe/core/doctype/user/user_list.js +12,Active,Aktif
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +154,Blue,Biru
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +154,Blue,Biru
 DocType: Purchase Invoice,Is Return,Apakah Kembali
 DocType: Price List Country,Price List Country,Harga Daftar Negara
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +123,Further nodes can be only created under 'Group' type nodes,Node lebih lanjut dapat hanya dibuat di bawah tipe node 'Grup'
@@ -1022,18 +986,16 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +22,POS Profile {0} already created for user: {1} and company {2},POS Profil {0} sudah dibuat untuk pengguna: {1} dan perusahaan {2}
 DocType: Purchase Order Item,UOM Conversion Factor,UOM Faktor Konversi
 DocType: Stock Settings,Default Item Group,Default Item Grup
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +156,Laminated object manufacturing,Laminated manufaktur objek
 apps/erpnext/erpnext/config/buying.py +13,Supplier database.,Database Supplier.
 DocType: Account,Balance Sheet,Neraca
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +561,Cost Center For Item with Item Code ',Biaya Center For Barang dengan Item Code '
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +45,Stretch forming,Stretch membentuk
 DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,Sales Anda akan mendapatkan pengingat pada tanggal ini untuk menghubungi pelanggan
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +210,"Further accounts can be made under Groups, but entries can be made against non-Groups","Account lebih lanjut dapat dibuat di bawah Grup, tapi entri dapat dilakukan terhadap non-Grup"
 apps/erpnext/erpnext/config/hr.py +125,Tax and other salary deductions.,Pajak dan pemotongan gaji lainnya.
 DocType: Lead,Lead,Lead
 DocType: Email Digest,Payables,Hutang
 DocType: Account,Warehouse,Gudang
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +90,Row #{0}: Rejected Qty can not be entered in Purchase Return,Row # {0}: Ditolak Qty tidak dapat dimasukkan dalam Pembelian Kembali
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +93,Row #{0}: Rejected Qty can not be entered in Purchase Return,Row # {0}: Ditolak Qty tidak dapat dimasukkan dalam Pembelian Kembali
 ,Purchase Order Items To Be Billed,Purchase Order Items Akan Ditagih
 DocType: Purchase Invoice Item,Net Rate,Tingkat Net
 DocType: Purchase Invoice Item,Purchase Invoice Item,Purchase Invoice Barang
@@ -1048,13 +1010,13 @@
 DocType: Global Defaults,Current Fiscal Year,Tahun Anggaran saat ini
 DocType: Global Defaults,Disable Rounded Total,Nonaktifkan Rounded Jumlah
 DocType: Lead,Call,Panggilan
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +384,'Entries' cannot be empty,'Entries' tidak boleh kosong
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +386,'Entries' cannot be empty,'Entries' tidak boleh kosong
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},Baris duplikat {0} dengan sama {1}
 ,Trial Balance,Trial Balance
 apps/erpnext/erpnext/config/hr.py +205,Setting up Employees,Menyiapkan Karyawan
 apps/erpnext/erpnext/public/js/feature_setup.js +220,"Grid ""","Grid """
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +150,Please select prefix first,Silakan pilih awalan pertama
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +138,Research,Penelitian
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +138,Research,Penelitian
 DocType: Maintenance Visit Purpose,Work Done,Pekerjaan Selesai
 apps/erpnext/erpnext/controllers/item_variant.py +25,Please specify at least one attribute in the Attributes table,Silakan tentukan setidaknya satu atribut dalam tabel Atribut
 DocType: Contact,User ID,ID Pemakai
@@ -1062,10 +1024,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +57,View Ledger,View Ledger
 DocType: File,Lft,lft
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Terlama
-apps/erpnext/erpnext/stock/doctype/item/item.py +394,"An Item Group exists with same name, please change the item name or rename the item group","Item Grup ada dengan nama yang sama, ubah nama item atau mengubah nama kelompok barang"
+apps/erpnext/erpnext/stock/doctype/item/item.py +398,"An Item Group exists with same name, please change the item name or rename the item group","Item Grup ada dengan nama yang sama, ubah nama item atau mengubah nama kelompok barang"
 DocType: Communication,Delivery Status,Status Pengiriman
 DocType: Production Order,Manufacture against Sales Order,Industri melawan Sales Order
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +517,Rest Of The World,Istirahat Of The World
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +455,Rest Of The World,Istirahat Of The World
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,Item {0} tidak dapat memiliki Batch
 ,Budget Variance Report,Laporan Perbedaan Anggaran
 DocType: Salary Slip,Gross Pay,Gross Bayar
@@ -1076,13 +1038,11 @@
 DocType: BOM Item,Item Description,Item Description
 DocType: Payment Tool,Payment Mode,Modus Pembayaran
 DocType: Purchase Invoice,Is Recurring,Apakah Berulang
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +154,Direct metal laser sintering,Logam langsung Laser sintering
 DocType: Purchase Order,Supplied Items,Disediakan Produk
 DocType: Production Order,Qty To Manufacture,Qty Untuk Industri
 DocType: Buying Settings,Maintain same rate throughout purchase cycle,Mempertahankan tingkat yang sama sepanjang siklus pembelian
 DocType: Opportunity Item,Opportunity Item,Peluang Barang
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +61,Temporary Opening,Pembukaan sementara
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +41,Cryorolling,Cryorolling
 ,Employee Leave Balance,Cuti Karyawan Balance
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +128,Balance for Account {0} must always be {1},Saldo Rekening {0} harus selalu {1}
 DocType: Address,Address Type,Tipe Alamat
@@ -1098,23 +1058,23 @@
 DocType: Journal Entry,Get Outstanding Invoices,Dapatkan Posisi Faktur
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,Sales Order {0} tidak valid
 apps/erpnext/erpnext/setup/doctype/company/company.py +172,"Sorry, companies cannot be merged","Maaf, perusahaan tidak dapat digabungkan"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +145,Small,Kecil
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Small,Kecil
 DocType: Employee,Employee Number,Jumlah Karyawan
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},Kasus ada (s) sudah digunakan. Coba dari Case ada {0}
 ,Invoiced Amount (Exculsive Tax),Faktur Jumlah (Pajak exculsive)
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,Item 2
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +59,Account head {0} created,Kepala akun {0} telah dibuat
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +153,Green,Hijau
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Green,Hijau
 DocType: Item,Auto re-order,Auto re-order
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +57,Total Achieved,Total Dicapai
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +59,Total Achieved,Total Dicapai
 DocType: Employee,Place of Issue,Tempat Issue
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +59,Contract,Kontrak
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Contract,Kontrak
 DocType: Report,Disabled,Dinonaktifkan
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +490,UOM coversion factor required for UOM: {0} in Item: {1},Faktor coversion UOM diperlukan untuk UOM: {0} di Item: {1}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +83,Indirect Expenses,Biaya tidak langsung
 apps/erpnext/erpnext/controllers/selling_controller.py +163,Row {0}: Qty is mandatory,Row {0}: Qty adalah wajib
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +8,Agriculture,Pertanian
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +611,Your Products or Services,Produk atau Jasa
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,Pertanian
+apps/erpnext/erpnext/public/js/setup_wizard.js +347,Your Products or Services,Produk atau Jasa
 DocType: Mode of Payment,Mode of Payment,Mode Pembayaran
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,Ini adalah kelompok barang akar dan tidak dapat diedit.
 DocType: Journal Entry Account,Purchase Order,Purchase Order
@@ -1126,7 +1086,7 @@
 DocType: Serial No,Serial No Details,Serial Tidak Detail
 DocType: Purchase Invoice Item,Item Tax Rate,Tarif Pajak Barang
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +113,"For {0}, only credit accounts can be linked against another debit entry","Untuk {0}, hanya rekening kredit dapat dihubungkan dengan entri debit lain"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Delivery Note {0} is not submitted,Pengiriman Note {0} tidak disampaikan
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +470,Delivery Note {0} is not submitted,Pengiriman Note {0} tidak disampaikan
 apps/erpnext/erpnext/stock/get_item_details.py +136,Item {0} must be a Sub-contracted Item,Item {0} harus Item Sub-kontrak
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,Peralatan Modal
 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.","Rule harga pertama dipilih berdasarkan 'Terapkan On' lapangan, yang dapat Barang, Barang Grup atau Merek."
@@ -1136,7 +1096,7 @@
 DocType: Appraisal Goal,Goal,Sasaran
 DocType: Sales Invoice Item,Edit Description,Mengedit Keterangan
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +318,Expected Delivery Date is lesser than Planned Start Date.,Diharapkan Pengiriman Tanggal adalah lebih rendah daripada Tanggal Rencana Start.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +579,For Supplier,Untuk Pemasok
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +602,For Supplier,Untuk Pemasok
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,Mengatur Tipe Akun membantu dalam memilih Akun ini dalam transaksi.
 DocType: Purchase Invoice,Grand Total (Company Currency),Grand Total (Perusahaan Mata Uang)
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,Total Outgoing
@@ -1162,10 +1122,10 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +74,"Total {0} for all items is zero, may you should change 'Distribute Charges Based On'","Jumlah {0} untuk semua item adalah nol, mungkin Anda harus mengubah &#39;Mendistribusikan Biaya Berdasarkan&#39;"
 DocType: Purchase Invoice,Taxes and Charges Calculation,Pajak dan Biaya Perhitungan
 DocType: BOM Operation,Workstation,Workstation
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +112,Hardware,Perangkat keras
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +112,Hardware,Perangkat keras
 DocType: Attendance,HR Manager,HR Manager
 apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,Silakan pilih sebuah Perusahaan
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +50,Privilege Leave,Privilege Cuti
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +50,Privilege Leave,Privilege Cuti
 DocType: Purchase Invoice,Supplier Invoice Date,Pemasok Faktur Tanggal
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +79,You need to enable Shopping Cart,Anda harus mengaktifkan Keranjang Belanja
 apps/frappe/frappe/public/js/frappe/form/grid_body.html +6,No Data,Tidak ada data
@@ -1178,7 +1138,7 @@
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +81,Overlapping conditions found between:,Kondisi Tumpang Tindih ditemukan antara:
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +168,Against Journal Entry {0} is already adjusted against some other voucher,Terhadap Jurnal Entri {0} sudah disesuaikan terhadap beberapa voucher lainnya
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +68,Total Order Value,Nilai Total Pesanan
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +38,Food,Makanan
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +38,Food,Makanan
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Penuaan Rentang 3
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +139,You can make a time log only against a submitted production order,Anda dapat membuat log waktu hanya terhadap produksi pesanan dikirimkan
 DocType: Maintenance Schedule Item,No of Visits,Tidak ada Kunjungan
@@ -1198,6 +1158,7 @@
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,View Offer Letter,Lihat Penawaran Surat
 DocType: Communication,Communication,Komunikasi
 DocType: Item,Is Service Item,Apakah Layanan Barang
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +81,Application period cannot be outside leave allocation period,Periode aplikasi tidak bisa periode alokasi cuti di luar
 DocType: Activity Cost,Projects,Proyek
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +31,Please select Fiscal Year,Silahkan pilih Tahun Anggaran
 apps/erpnext/erpnext/controllers/buying_controller.py +23,From {0} | {1} {2},Dari {0} | {1} {2}
@@ -1216,7 +1177,7 @@
 DocType: Item,Maintain Stock,Menjaga Stock
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +213,Stock Entries already created for Production Order ,Saham Entries sudah dibuat untuk Pesanan Produksi
 DocType: Leave Control Panel,Leave blank if considered for all designations,Biarkan kosong jika dipertimbangkan untuk semua sebutan
-apps/erpnext/erpnext/controllers/accounts_controller.py +499,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Mengisi tipe 'sebenarnya' berturut-turut {0} tidak dapat dimasukkan dalam Butir Tingkat
+apps/erpnext/erpnext/controllers/accounts_controller.py +500,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Mengisi tipe 'sebenarnya' berturut-turut {0} tidak dapat dimasukkan dalam Butir Tingkat
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,Max: {0},Max: {0}
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +16,From Datetime,Dari Datetime
 DocType: Email Digest,For Company,Untuk Perusahaan
@@ -1226,7 +1187,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +50,Chart of Accounts,Chart of Account
 DocType: Material Request,Terms and Conditions Content,Syarat dan Ketentuan Konten
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +471,cannot be greater than 100,tidak dapat lebih besar dari 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +546,Item {0} is not a stock Item,Item {0} bukan merupakan saham Barang
+apps/erpnext/erpnext/stock/doctype/item/item.py +550,Item {0} is not a stock Item,Item {0} bukan merupakan saham Barang
 DocType: Maintenance Visit,Unscheduled,Terjadwal
 DocType: Employee,Owned,Dimiliki
 DocType: Salary Slip Deduction,Depends on Leave Without Pay,Tergantung pada Cuti Tanpa Bayar
@@ -1240,31 +1201,29 @@
 DocType: HR Settings,Employee Settings,Pengaturan Karyawan
 ,Batch-Wise Balance History,Batch-Wise Balance Sejarah
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +72,To Do List,To Do List
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +63,Apprentice,Magang
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Apprentice,Magang
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +99,Negative Quantity is not allowed,Jumlah negatif tidak diperbolehkan
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
 Used for Taxes and Charges","Rinci tabel pajak diambil dari master barang sebagai string dan disimpan dalam bidang ini.
  Digunakan untuk Pajak dan Biaya"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +61,Lancing,Lancing
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +151,Employee cannot report to himself.,Karyawan tidak bisa melaporkan kepada dirinya sendiri.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Jika account beku, entri yang diizinkan untuk pengguna terbatas."
 DocType: Email Digest,Bank Balance,Saldo bank
-apps/erpnext/erpnext/controllers/accounts_controller.py +435,Accounting Entry for {0}: {1} can only be made in currency: {2},Masuk akuntansi untuk {0}: {1} hanya dapat dilakukan dalam mata uang: {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +436,Accounting Entry for {0}: {1} can only be made in currency: {2},Masuk akuntansi untuk {0}: {1} hanya dapat dilakukan dalam mata uang: {2}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +38,No active Salary Structure found for employee {0} and the month,Tidak ada Struktur Gaji aktif yang ditemukan untuk karyawan {0} dan bulan
 DocType: Job Opening,"Job profile, qualifications required etc.","Profil pekerjaan, kualifikasi yang dibutuhkan dll"
 DocType: Journal Entry Account,Account Balance,Saldo Rekening
 apps/erpnext/erpnext/config/accounts.py +112,Tax Rule for transactions.,Aturan pajak untuk transaksi.
 DocType: Rename Tool,Type of document to rename.,Jenis dokumen untuk mengubah nama.
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +630,We buy this Item,Kami membeli item ini
+apps/erpnext/erpnext/public/js/setup_wizard.js +366,We buy this Item,Kami membeli item ini
 DocType: Address,Billing,Penagihan
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +77,Flanging,Flanging
 DocType: Bulk Email,Not Sent,Tidak Terkirim
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +73,Explosive forming,Explosive membentuk
 DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),Jumlah Pajak dan Biaya (Perusahaan Mata Uang)
 DocType: Shipping Rule,Shipping Account,Account Pengiriman
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +43,Scheduled to send to {0} recipients,Dijadwalkan untuk mengirim ke {0} penerima
 DocType: Quality Inspection,Readings,Bacaan
 DocType: Stock Entry,Total Additional Costs,Total Biaya Tambahan
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Sub Assemblies,Sub Assemblies
+apps/erpnext/erpnext/public/js/setup_wizard.js +359,Sub Assemblies,Sub Assemblies
 DocType: Shipping Rule Condition,To Value,Untuk Menghargai
 DocType: Supplier,Stock Manager,Bursa Manajer
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +143,Source warehouse is mandatory for row {0},Sumber gudang adalah wajib untuk baris {0}
@@ -1274,44 +1233,42 @@
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Impor Gagal!
 apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,Tidak ada alamat belum ditambahkan.
 DocType: Workstation Working Hour,Workstation Working Hour,Workstation Jam Kerja
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +83,Analyst,Analis
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +202,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Baris {0}: Alokasi jumlah {1} harus kurang dari atau sama dengan jumlah JV {2}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Analyst,Analis
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +149,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Baris {0}: Alokasi jumlah {1} harus kurang dari atau sama dengan jumlah JV {2}
 DocType: Item,Inventory,Inventarisasi
 DocType: Features Setup,"To enable ""Point of Sale"" view",Untuk mengaktifkan &quot;Point of Sale&quot; tampilan
 apps/erpnext/erpnext/public/js/pos/pos.js +402,Payment cannot be made for empty cart,Pembayaran tidak dapat dibuat untuk keranjang kosong
 DocType: Item,Sales Details,Detail Penjualan
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +149,Pinning,Menjepit
 DocType: Opportunity,With Items,Dengan Produk
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,Dalam Qty
 DocType: Notification Control,Expense Claim Rejected,Beban Klaim Ditolak
 DocType: Sales Invoice,"The date on which next invoice will be generated. It is generated on submit.
 ",Tanggal dimana faktur berikutnya akan dihasilkan. Hal ini dihasilkan di submit.
 DocType: Item Attribute,Item Attribute,Item Atribut
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +105,Government,pemerintahan
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Government,pemerintahan
 apps/erpnext/erpnext/config/stock.py +268,Item Variants,Item Varian
 DocType: Company,Services,Layanan
 apps/erpnext/erpnext/accounts/report/financial_statements.py +147,Total ({0}),Jumlah ({0})
 DocType: Cost Center,Parent Cost Center,Parent Biaya Pusat
 DocType: Sales Invoice,Source,Sumber
 DocType: Leave Type,Is Leave Without Pay,Apakah Tinggalkan Tanpa Bayar
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +186,No records found in the Payment table,Tidak ada catatan yang ditemukan dalam tabel Pembayaran
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +405,Financial Year Start Date,Tahun Buku Tanggal mulai
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +133,No records found in the Payment table,Tidak ada catatan yang ditemukan dalam tabel Pembayaran
+apps/erpnext/erpnext/public/js/setup_wizard.js +153,Financial Year Start Date,Tahun Buku Tanggal mulai
 DocType: Employee External Work History,Total Experience,Jumlah Pengalaman
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +100,Countersinking,Countersinking
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +271,Packing Slip(s) cancelled,Packing slip (s) dibatalkan
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +276,Packing Slip(s) cancelled,Packing slip (s) dibatalkan
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,Pengangkutan dan Forwarding Biaya
 DocType: Material Request Item,Sales Order No,Sales Order No
 DocType: Item Group,Item Group Name,Nama Item Grup
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +50,Taken,Diambil
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,Diambil
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +66,Transfer Materials for Manufacture,Transfer Material untuk Industri
 DocType: Pricing Rule,For Price List,Untuk Daftar Harga
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +27,Executive Search,Pencarian eksekutif
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,Pencarian eksekutif
 apps/erpnext/erpnext/stock/stock_ledger.py +405,"Purchase rate for item: {0} not found, which is required to book accounting entry (expense). Please mention item price against a buying price list.","Tingkat pembelian untuk item: {0} tidak ditemukan, yang diperlukan untuk buku akuntansi entri (beban). Sebutkan harga barang terhadap daftar harga beli."
 DocType: Maintenance Schedule,Schedules,Jadwal Pelajaran
 DocType: Purchase Invoice Item,Net Amount,Jumlah Bersih
 DocType: Purchase Order Item Supplied,BOM Detail No,No. Rincian BOM
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),Tambahan Jumlah Diskon (Perusahaan Mata Uang)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +537,Error: {0} > {1},Kesalahan: {0}> {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +541,Error: {0} > {1},Kesalahan: {0}> {1}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,Silahkan buat akun baru dari Bagan Akun.
 DocType: Maintenance Visit,Maintenance Visit,Pemeliharaan Visit
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer > Customer Group > Territory,Pelanggan> Grup Pelanggan> Wilayah
@@ -1322,7 +1279,6 @@
 DocType: Event,Tuesday,Selasa
 DocType: Leave Block List,Block Holidays on important days.,Blok Holidays pada hari-hari penting.
 ,Accounts Receivable Summary,Account Summary Piutang
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +43,Leaves for type {0} already allocated for Employee {1} for period {2} - {3},Daun untuk jenis {0} sudah dialokasikan untuk Karyawan {1} untuk periode {2} - {3}
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +187,Please set User ID field in an Employee record to set Employee Role,Silakan set ID lapangan Pengguna dalam catatan Karyawan untuk mengatur Peran Karyawan
 DocType: UOM,UOM Name,Nama UOM
 DocType: Top Bar Item,Target,Sasaran
@@ -1334,15 +1290,14 @@
 DocType: ToDo,Due Date,Tanggal Jatuh Tempo
 DocType: Sales Invoice Item,Brand Name,Merek Nama
 DocType: Purchase Receipt,Transporter Details,Detail transporter
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Box,Kotak
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +389,The Organization,Organisasi
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Box,Kotak
+apps/erpnext/erpnext/public/js/setup_wizard.js +137,The Organization,Organisasi
 DocType: Monthly Distribution,Monthly Distribution,Distribusi bulanan
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,Receiver List kosong. Silakan membuat Receiver List
 DocType: Production Plan Sales Order,Production Plan Sales Order,Rencana Produksi Sales Order
 DocType: Sales Partner,Sales Partner Target,Penjualan Mitra Sasaran
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},Masuk akuntansi untuk {0} hanya dapat dilakukan dalam mata uang: {1}
 DocType: Pricing Rule,Pricing Rule,Aturan Harga
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +58,Notching,Bentukan
 apps/erpnext/erpnext/config/learn.py +167,Material Request to Purchase Order,Permintaan bahan Pembelian Pesanan
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +74,Row # {0}: Returned Item {1} does not exists in {2} {3},Row # {0}: Returned Barang {1} tidak ada dalam {2} {3}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,Rekening Bank
@@ -1359,20 +1314,19 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Amounts not reflected in bank,Jumlah yang tidak tercermin di bank
 DocType: Quality Inspection Reading,Reading 4,Membaca 4
 apps/erpnext/erpnext/config/hr.py +23,Claims for company expense.,Klaim untuk biaya perusahaan.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +8,Centrifugal casting,Pengecoran sentrifugal
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +119,Magnetic field-assisted finishing,Magnetik lapangan dibantu menyelesaikan
 DocType: Company,Default Holiday List,Standar Hotel Daftar
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +165,Stock Liabilities,Kewajiban saham
 DocType: Purchase Receipt,Supplier Warehouse,Pemasok Gudang
 DocType: Opportunity,Contact Mobile No,Kontak Mobile No
 DocType: Production Planning Tool,Select Sales Orders,Pilih Pesanan Penjualan
 ,Material Requests for which Supplier Quotations are not created,Permintaan Material yang Pemasok Kutipan tidak diciptakan
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +117,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,Hari (s) yang Anda lamar cuti adalah hari libur. Anda tidak perlu mengajukan cuti.
 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.,Untuk melacak item menggunakan barcode. Anda akan dapat memasukkan item dalam Pengiriman Note dan Faktur Penjualan dengan memindai barcode barang.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +477,Mark as Delivered,Tandai sebagai Disampaikan
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +497,Mark as Delivered,Tandai sebagai Disampaikan
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +34,Make Quotation,Membuat Quotation
 DocType: Dependent Task,Dependent Task,Tugas Dependent
-apps/erpnext/erpnext/stock/doctype/item/item.py +306,Conversion factor for default Unit of Measure must be 1 in row {0},Faktor konversi untuk Unit default Ukur harus 1 berturut-turut {0}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,Leave of type {0} cannot be longer than {1},Tinggalkan jenis {0} tidak boleh lebih dari {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +310,Conversion factor for default Unit of Measure must be 1 in row {0},Faktor konversi untuk Unit default Ukur harus 1 berturut-turut {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +155,Leave of type {0} cannot be longer than {1},Tinggalkan jenis {0} tidak boleh lebih dari {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Coba operasi untuk hari X perencanaan di muka.
 DocType: HR Settings,Stop Birthday Reminders,Berhenti Ulang Tahun Pengingat
 DocType: SMS Center,Receiver List,Receiver Daftar
@@ -1380,15 +1334,14 @@
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Dikonsumsi Jumlah
 apps/erpnext/erpnext/public/js/pos/pos.js +491,{0} View,{0} View
 DocType: Salary Structure Deduction,Salary Structure Deduction,Struktur Gaji Pengurangan
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +158,Selective laser sintering,Laser sintering selektif
-apps/erpnext/erpnext/stock/doctype/item/item.py +301,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Satuan Ukur {0} telah dimasukkan lebih dari sekali dalam Faktor Konversi Tabel
+apps/erpnext/erpnext/stock/doctype/item/item.py +305,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Satuan Ukur {0} telah dimasukkan lebih dari sekali dalam Faktor Konversi Tabel
 apps/frappe/frappe/core/page/data_import_tool/data_import_tool.js +108,Import Successful!,Impor Sukses!
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Biaya Produk Dikeluarkan
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +185,Quantity must not be more than {0},Kuantitas tidak boleh lebih dari {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +41,Age (Days),Umur (Hari)
 DocType: Quotation Item,Quotation Item,Quotation Barang
 DocType: Account,Account Name,Nama Akun
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +41,From Date cannot be greater than To Date,Dari Tanggal tidak dapat lebih besar dari To Date
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +34,From Date cannot be greater than To Date,Dari Tanggal tidak dapat lebih besar dari To Date
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +194,Serial No {0} quantity {1} cannot be a fraction,Serial ada {0} kuantitas {1} tak bisa menjadi pecahan
 apps/erpnext/erpnext/config/buying.py +59,Supplier Type master.,Pemasok Type induk.
 DocType: Purchase Order Item,Supplier Part Number,Pemasok Part Number
@@ -1397,14 +1350,14 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +247,{0} {1} is cancelled or stopped,{0} {1} dibatalkan atau dihentikan
 DocType: Accounts Settings,Credit Controller,Kontroler Kredit
 DocType: Delivery Note,Vehicle Dispatch Date,Kendaraan Dispatch Tanggal
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +197,Purchase Receipt {0} is not submitted,Penerimaan Pembelian {0} tidak disampaikan
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +198,Purchase Receipt {0} is not submitted,Penerimaan Pembelian {0} tidak disampaikan
 DocType: Company,Default Payable Account,Standar Hutang Akun
 apps/erpnext/erpnext/config/website.py +13,"Settings for online shopping cart such as shipping rules, price list etc.","Pengaturan untuk keranjang belanja online seperti aturan pengiriman, daftar harga dll"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +660,Setup Complete,Pengaturan Selesai
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +124,Setup Complete,Pengaturan Selesai
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +65,{0}% Billed,{0}% Ditagih
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +17,Reserved Qty,Reserved Qty
 DocType: Party Account,Party Account,Akun Party
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +74,Human Resources,Sumber Daya Manusia
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +74,Human Resources,Sumber Daya Manusia
 DocType: Lead,Upper Income,Atas Penghasilan
 DocType: Journal Entry Account,Debit in Company Currency,Debit di Perusahaan Mata
 apps/erpnext/erpnext/support/doctype/issue/issue.py +58,My Issues,Masalah saya
@@ -1413,11 +1366,9 @@
 DocType: Company,Default Values,Nilai Default
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +236,Row {0}: Payment amount can not be negative,Baris {0}: Jumlah pembayaran tidak boleh negatif
 DocType: Expense Claim,Total Amount Reimbursed,Jumlah Total diganti
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +152,Press fitting,Tekan pas
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +64,Against Supplier Invoice {0} dated {1},Terhadap Pemasok Faktur {0} tanggal {1}
 DocType: Customer,Default Price List,Standar List Harga
 DocType: Payment Reconciliation,Payments,2. Payment (Pembayaran)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +24,Hot isostatic pressing,Hot isostatic menekan
 DocType: ToDo,Medium,Sedang
 DocType: Budget Detail,Budget Allocated,Anggaran Dialokasikan
 DocType: Journal Entry,Entry Type,Entri Type
@@ -1430,9 +1381,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +56,None of the items have any change in quantity or value.,Tak satu pun dari item memiliki perubahan kuantitas atau nilai.
 DocType: Warranty Claim,Warranty Claim,Garansi Klaim
 ,Lead Details,Detail Timbal
-DocType: Authorization Rule,Approving User,Menyetujui Pengguna
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +37,Forging,Penempaan
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +126,Plating,Plating
 DocType: Purchase Invoice,End date of current invoice's period,Tanggal akhir periode faktur saat ini
 DocType: Pricing Rule,Applicable For,Berlaku Untuk
 DocType: Bank Reconciliation,From Date,Dari Tanggal
@@ -1454,31 +1402,29 @@
 DocType: Sales Invoice,Paid Amount (Company Currency),Dibayar Jumlah (Perusahaan Mata Uang)
 DocType: Purchase Invoice,Additional Discount,Diskon tambahan
 DocType: Selling Settings,Selling Settings,Jual Pengaturan
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +39,Online Auctions,Lelang Online
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,Lelang Online
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +94,Please specify either Quantity or Valuation Rate or both,Silakan tentukan baik Quantity atau Tingkat Penilaian atau keduanya
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +50,"Company, Month and Fiscal Year is mandatory","Perusahaan, Bulan dan Tahun Anggaran adalah wajib"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Marketing Expenses,Beban Pemasaran
 ,Item Shortage Report,Item Kekurangan Laporan
-apps/erpnext/erpnext/stock/doctype/item/item.js +183,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Berat disebutkan, \n Sebutkan ""Berat UOM"" terlalu"
+apps/erpnext/erpnext/stock/doctype/item/item.js +185,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Berat disebutkan, \n Sebutkan ""Berat UOM"" terlalu"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,Permintaan bahan yang digunakan untuk membuat Masuk Bursa ini
 apps/erpnext/erpnext/config/support.py +43,Single unit of an Item.,Unit tunggal Item.
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +212,Time Log Batch {0} must be 'Submitted',Waktu Log Batch {0} harus 'Dikirim'
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,Membuat Entri Akuntansi Untuk Setiap Gerakan Stock
 DocType: Leave Allocation,Total Leaves Allocated,Jumlah Daun Dialokasikan
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +384,Warehouse required at Row No {0},Gudang diperlukan pada Row ada {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +386,Warehouse required at Row No {0},Gudang diperlukan pada Row ada {0}
 DocType: Employee,Date Of Retirement,Tanggal Of Pensiun
 DocType: Upload Attendance,Get Template,Dapatkan Template
 DocType: Address,Postal,Pos
 DocType: Item,Weightage,Weightage
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +159,Mining,Pertambangan
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +17,Resin casting,Pengecoran resin
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"Kelompok Pelanggan sudah ada dengan nama yang sama, silakan mengubah nama Pelanggan atau mengubah nama Grup Pelanggan"
 apps/erpnext/erpnext/public/js/pos/pos.js +147,Please select {0} first.,Silahkan pilih {0} pertama.
 apps/erpnext/erpnext/templates/pages/order.html +57,text {0},teks {0}
 DocType: Territory,Parent Territory,Wilayah Induk
 DocType: Quality Inspection Reading,Reading 2,Membaca 2
 DocType: Stock Entry,Material Receipt,Material Receipt
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +622,Products,Produk
+apps/erpnext/erpnext/public/js/setup_wizard.js +358,Products,Produk
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +47,Party Type and Party is required for Receivable / Payable account {0},Partai Jenis dan Partai diperlukan untuk Piutang / Hutang akun {0}
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.","Jika item ini memiliki varian, maka tidak dapat dipilih dalam order penjualan dll"
 DocType: Lead,Next Contact By,Berikutnya Contact By
@@ -1488,13 +1434,13 @@
 DocType: Purchase Invoice,Notification Email Address,Pemberitahuan Alamat Email
 DocType: Payment Tool,Find Invoices to Match,Cari Faktur Match
 ,Item-wise Sales Register,Item-wise Daftar Penjualan
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +399,"e.g. ""XYZ National Bank""","misalnya ""XYZ Bank Nasional """
+apps/erpnext/erpnext/public/js/setup_wizard.js +147,"e.g. ""XYZ National Bank""","misalnya ""XYZ Bank Nasional """
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,Apakah Pajak ini termasuk dalam Basic Rate?
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +57,Total Target,Jumlah Sasaran
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Target,Jumlah Sasaran
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.js +22,Shopping Cart is enabled,Daftar Belanja diaktifkan
 DocType: Job Applicant,Applicant for a Job,Pemohon untuk Job
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +173,No Production Orders created,Tidak ada Pesanan Produksi dibuat
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +131,Salary Slip of employee {0} already created for this month,Slip Gaji karyawan {0} sudah diciptakan untuk bulan ini
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +140,Salary Slip of employee {0} already created for this month,Slip Gaji karyawan {0} sudah diciptakan untuk bulan ini
 DocType: Stock Reconciliation,Reconciliation JSON,Rekonsiliasi JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Terlalu banyak kolom. Mengekspor laporan dan mencetaknya menggunakan aplikasi spreadsheet.
 DocType: Sales Invoice Item,Batch No,No. Batch
@@ -1504,14 +1450,14 @@
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +13,Variant,Variasi
 apps/frappe/frappe/public/js/frappe/form/toolbar.js +165,New {0},New {0}
 DocType: Naming Series,Set prefix for numbering series on your transactions,Mengatur awalan untuk penomoran seri pada transaksi Anda
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +169,Stopped order cannot be cancelled. Unstop to cancel.,Agar Berhenti tidak dapat dibatalkan. Unstop untuk membatalkan.
-apps/erpnext/erpnext/stock/doctype/item/item.py +323,Default BOM ({0}) must be active for this item or its template,Standar BOM ({0}) harus aktif untuk item ini atau template-nya
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +164,Stopped order cannot be cancelled. Unstop to cancel.,Agar Berhenti tidak dapat dibatalkan. Unstop untuk membatalkan.
+apps/erpnext/erpnext/stock/doctype/item/item.py +327,Default BOM ({0}) must be active for this item or its template,Standar BOM ({0}) harus aktif untuk item ini atau template-nya
 DocType: Employee,Leave Encashed?,Tinggalkan dicairkan?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Peluang Dari bidang wajib
 DocType: Item,Variants,Varian
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +458,Make Purchase Order,Membuat Purchase Order
 DocType: SMS Center,Send To,Kirim Ke
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +111,There is not enough leave balance for Leave Type {0},Tidak ada saldo cuti cukup bagi Leave Type {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +127,There is not enough leave balance for Leave Type {0},Tidak ada saldo cuti cukup bagi Leave Type {0}
 DocType: Sales Team,Contribution to Net Total,Kontribusi terhadap Net Jumlah
 DocType: Sales Invoice Item,Customer's Item Code,Nasabah Item Code
 DocType: Stock Reconciliation,Stock Reconciliation,Stock Rekonsiliasi
@@ -1548,11 +1494,11 @@
 DocType: Sales Order Item,Actual Qty,Jumlah Aktual
 DocType: Sales Invoice Item,References,Referensi
 DocType: Quality Inspection Reading,Reading 10,Membaca 10
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +612,"List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start.","Daftar produk atau jasa yang Anda membeli atau menjual. Pastikan untuk memeriksa Grup Barang, Satuan Ukur dan properti lainnya ketika Anda mulai."
+apps/erpnext/erpnext/public/js/setup_wizard.js +348,"List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start.","Daftar produk atau jasa yang Anda membeli atau menjual. Pastikan untuk memeriksa Grup Barang, Satuan Ukur dan properti lainnya ketika Anda mulai."
 DocType: Hub Settings,Hub Node,Hub Node
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,Anda telah memasukkan item yang sama. Harap diperbaiki dan coba lagi.
 apps/erpnext/erpnext/controllers/item_variant.py +65,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values,Nilai {0} untuk Atribut {1} tidak ada dalam daftar valid Barang Atribut Nilai
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +87,Associate,Rekan
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Associate,Rekan
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +46,Item {0} is not a serialized Item,Item {0} bukan merupakan Barang serial
 DocType: SMS Center,Create Receiver List,Buat Daftar Penerima
 apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +5,Expired,Expired
@@ -1561,7 +1507,7 @@
 DocType: Warranty Claim,Issue Date,Tanggal dibuat
 DocType: Activity Cost,Activity Cost,Kegiatan Biaya
 DocType: Purchase Receipt Item Supplied,Consumed Qty,Dikonsumsi Qty
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +52,Telecommunications,Telekomunikasi
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +52,Telecommunications,Telekomunikasi
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),Menunjukkan bahwa paket tersebut merupakan bagian dari pengiriman ini (Hanya Draft)
 DocType: Payment Tool,Make Payment Entry,Membuat Entri Pembayaran
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +119,Quantity for Item {0} must be less than {1},Kuantitas untuk Item {0} harus kurang dari {1}
@@ -1578,10 +1524,8 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +37,"Selling must be checked, if Applicable For is selected as {0}","Jual harus diperiksa, jika Berlaku Untuk dipilih sebagai {0}"
 DocType: Purchase Order Item,Supplier Quotation Item,Pemasok Barang Quotation
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +27,Make Salary Structure,Membuat Struktur Gaji
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +54,Shearing,Pencukuran
 DocType: Item,Has Variants,Memiliki Varian
 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.,Klik 'Buat Sales Invoice' tombol untuk membuat Faktur Penjualan baru.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +166,Packaging and labeling,Kemasan dan pelabelan
 DocType: Monthly Distribution,Name of the Monthly Distribution,Nama Distribusi Bulanan
 DocType: Sales Person,Parent Sales Person,Penjualan Induk Orang
 apps/erpnext/erpnext/setup/utils.py +14,Please specify Default Currency in Company Master and Global Defaults,Silakan tentukan Currency Default dalam Perseroan Guru dan Default global
@@ -1592,19 +1536,18 @@
 DocType: Budget Detail,Fiscal Year,Tahun Fiskal
 DocType: Cost Center,Budget,Anggaran belanja
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +41,"Budget cannot be assigned against {0}, as it's not an Income or Expense account","Anggaran tidak dapat ditugaskan terhadap {0}, karena itu bukan Penghasilan atau Beban akun"
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Achieved,Dicapai
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,Dicapai
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +65,Territory / Customer,Wilayah / Pelanggan
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,e.g. 5,misalnya 5
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +207,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},Baris {0}: Alokasi jumlah {1} harus kurang dari atau sama dengan faktur jumlah yang luar biasa {2}
+apps/erpnext/erpnext/public/js/setup_wizard.js +294,e.g. 5,misalnya 5
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},Baris {0}: Alokasi jumlah {1} harus kurang dari atau sama dengan faktur jumlah yang luar biasa {2}
 DocType: Sales Invoice,In Words will be visible once you save the Sales Invoice.,Dalam Kata-kata akan terlihat setelah Anda menyimpan Faktur Penjualan.
 DocType: Item,Is Sales Item,Apakah Penjualan Barang
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,Item Grup Pohon
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,Barang {0} tidak setup untuk Serial Nos Periksa Barang induk
 DocType: Maintenance Visit,Maintenance Time,Pemeliharaan Waktu
 ,Amount to Deliver,Jumlah yang Memberikan
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +620,A Product or Service,Produk atau Jasa
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +158,There were errors.,Ada kesalahan.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +101,Tapping,Penyadapan
+apps/erpnext/erpnext/public/js/setup_wizard.js +356,A Product or Service,Produk atau Jasa
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +146,There were errors.,Ada kesalahan.
 DocType: Naming Series,Current Value,Nilai saat ini
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +171,{0} created,{0} dibuat
 DocType: Delivery Note Item,Against Sales Order,Terhadap Order Penjualan
@@ -1619,7 +1562,7 @@
 apps/erpnext/erpnext/accounts/party.py +275,Due Date cannot be before Posting Date,Tanggal jatuh tempo tidak bisa sebelum Tanggal Posting
 DocType: Website Item Group,Website Item Group,Situs Barang Grup
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Duties and Taxes,Tugas dan Pajak
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Please enter Reference date,Harap masukkan tanggal Referensi
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +312,Please enter Reference date,Harap masukkan tanggal Referensi
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} entri pembayaran tidak dapat disaring oleh {1}
 DocType: Item Website Specification,Table for Item that will be shown in Web Site,Tabel untuk Item yang akan ditampilkan di Situs Web
 DocType: Purchase Order Item Supplied,Supplied Qty,Disediakan Qty
@@ -1627,7 +1570,7 @@
 apps/erpnext/erpnext/config/stock.py +103,Tree of Item Groups.,Pohon Item Grup.
 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,Tidak dapat merujuk nomor baris yang lebih besar dari atau sama dengan nomor baris saat ini untuk jenis Biaya ini
 ,Item-wise Purchase History,Barang-bijaksana Riwayat Pembelian
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +152,Red,Merah
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Red,Merah
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +228,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},Silahkan klik 'Menghasilkan Jadwal' untuk mengambil Serial yang ditambahkan untuk Item {0}
 DocType: Account,Frozen,Beku
 ,Open Production Orders,Pesanan terbuka Produksi
@@ -1642,7 +1585,7 @@
 DocType: Item Attribute,Attribute Name,Nama Atribut
 apps/erpnext/erpnext/controllers/selling_controller.py +236,Item {0} must be Sales or Service Item in {1},Item {0} harus Penjualan atau Jasa Barang di {1}
 DocType: Item Group,Show In Website,Tampilkan Di Website
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +621,Group,Grup
+apps/erpnext/erpnext/public/js/setup_wizard.js +357,Group,Grup
 DocType: Task,Expected Time (in hours),Waktu yang diharapkan (dalam jam)
 ,Qty to Order,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","Untuk melacak nama merek dalam dokumen-dokumen berikut Pengiriman Catatan, Peluang, Permintaan Bahan, Barang, Purchase Order, Voucher Pembelian, Pembeli Penerimaan, Quotation, Faktur Penjualan, Produk Bundle, Sales Order, Serial No"
@@ -1652,6 +1595,7 @@
 DocType: Features Setup,Brands,Merek
 DocType: C-Form Invoice Detail,Invoice No,Faktur ada
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +480,From Purchase Order,Dari Purchase Order
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +92,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Tinggalkan tidak dapat diterapkan / dibatalkan sebelum {0}, saldo cuti sudah pernah membawa-diteruskan dalam catatan alokasi cuti masa depan {1}"
 DocType: Activity Cost,Costing Rate,Biaya Tingkat
 ,Customer Addresses And Contacts,Alamat Pelanggan Dan Kontak
 DocType: Employee,Resignation Letter Date,Surat Pengunduran Diri Tanggal
@@ -1659,35 +1603,31 @@
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +137,Not Set,Tidak Diatur
 DocType: Communication,Date,Tanggal
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,Ulangi Pendapatan Pelanggan
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +651,Sit tight while your system is being setup. This may take a few moments.,Duduk diam sementara sistem anda sedang setup. Ini mungkin memerlukan beberapa saat.
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +115,Sit tight while your system is being setup. This may take a few moments.,Duduk diam sementara sistem anda sedang setup. Ini mungkin memerlukan beberapa saat.
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +51,{0} ({1}) must have role 'Expense Approver',{0} ({1}) harus memiliki akses sebagai 'Pemberi Izin Pengeluaran'
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Pair,Pasangkan
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Pair,Pasangkan
 DocType: Bank Reconciliation Detail,Against Account,Terhadap Akun
 DocType: Maintenance Schedule Detail,Actual Date,Tanggal Aktual
 DocType: Item,Has Batch No,Memiliki Batch ada
 DocType: Delivery Note,Excise Page Number,Jumlah Cukai Halaman
 DocType: Employee,Personal Details,Data Pribadi
 ,Maintenance Schedules,Jadwal pemeliharaan
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +44,Embossing,Embossing
 ,Quotation Trends,Quotation Trends
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +139,Item Group not mentioned in item master for item {0},Item Grup tidak disebutkan dalam master barang untuk item {0}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +302,Debit To account must be a Receivable account,Debit Untuk akun harus rekening Piutang
-apps/erpnext/erpnext/stock/doctype/item/item.py +310,"As Production Order can be made for this item, it must be a stock item.","Seperti Orde Produksi dapat dibuat untuk item ini, itu harus menjadi barang saham."
 DocType: Shipping Rule Condition,Shipping Amount,Pengiriman Jumlah
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +140,Joining,Bergabung
-DocType: Authorization Rule,Above Value,Nilai di atas
 ,Pending Amount,Pending Jumlah
 DocType: Purchase Invoice Item,Conversion Factor,Faktor konversi
 DocType: Purchase Order,Delivered,Disampaikan
 apps/erpnext/erpnext/config/hr.py +160,Setup incoming server for jobs email id. (e.g. jobs@example.com),Pengaturan server masuk untuk pekerjaan email id. (Misalnya jobs@example.com)
 DocType: Purchase Receipt,Vehicle Number,Jumlah kendaraan
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,Tanggal dimana berulang faktur akan berhenti
+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,Jumlah daun dialokasikan {0} tidak bisa kurang dari daun yang telah disetujui {1} untuk periode
 DocType: Journal Entry,Accounts Receivable,Piutang
 ,Supplier-Wise Sales Analytics,Pemasok-Wise Penjualan Analytics
 DocType: Address Template,This format is used if country specific format is not found,Format ini digunakan jika format khusus negara tidak ditemukan
 DocType: Custom Field,Custom,Disesuaikan
 DocType: Production Order,Use Multi-Level BOM,Gunakan Multi-Level BOM
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +26,Injection molding,Injection molding
 DocType: Bank Reconciliation,Include Reconciled Entries,Sertakan Entri Berdamai
 apps/erpnext/erpnext/config/accounts.py +41,Tree of finanial accounts.,Pohon rekening finanial.
 DocType: Leave Control Panel,Leave blank if considered for all employee types,Biarkan kosong jika dipertimbangkan untuk semua jenis karyawan
@@ -1697,30 +1637,28 @@
 apps/frappe/frappe/config/setup.py +130,Printing,Pencetakan
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +114,Expense Claim is pending approval. Only the Expense Approver can update status.,Beban Klaim sedang menunggu persetujuan. Hanya Approver Beban dapat memperbarui status.
 DocType: Purchase Invoice,Additional Discount Amount,Tambahan Jumlah Diskon
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +99,The day(s) on which you are applying for leave are holiday. You need not apply for leave.,Hari (s) yang Anda lamar untuk cuti adalah liburan. Anda tidak perlu mengajukan cuti.
 apps/frappe/frappe/public/js/frappe/misc/utils.js +110,and,Dan
 DocType: Leave Block List Allow,Leave Block List Allow,Tinggalkan Block List Izinkan
 apps/erpnext/erpnext/setup/doctype/company/company.py +236,Abbr can not be blank or space,Abbr tidak boleh kosong atau ruang
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +50,Sports,Olahraga
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,Olahraga
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Actual,Total Aktual
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Unit,Satuan
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Unit,Satuan
 apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.py +182,Please set Dropbox access keys in your site config,Silakan set tombol akses Dropbox di situs config Anda
 apps/erpnext/erpnext/stock/get_item_details.py +113,Please specify Company,Silakan tentukan Perusahaan
 ,Customer Acquisition and Loyalty,Akuisisi Pelanggan dan Loyalitas
 DocType: Purchase Receipt,Warehouse where you are maintaining stock of rejected items,Gudang di mana Anda mempertahankan stok item ditolak
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +408,Your financial year ends on,Tahun keuangan Anda berakhir pada
+apps/erpnext/erpnext/public/js/setup_wizard.js +156,Your financial year ends on,Tahun keuangan Anda berakhir pada
 DocType: POS Profile,Price List,Daftar Harga
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +20,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0} adalah Tahun Anggaran default. Silahkan me-refresh browser Anda agar perubahan dapat terwujud
 apps/erpnext/erpnext/projects/doctype/project/project.js +47,Expense Claims,Klaim Beban
 DocType: Issue,Support,Mendukung
-DocType: Authorization Rule,Approving Role,Menyetujui Peran
 ,BOM Search,BOM Cari
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +176,Closing (Opening + Totals),Penutupan (Membuka Total +)
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +26,Please specify currency in Company,Silakan tentukan mata uang di Perusahaan
 DocType: Workstation,Wages per hour,Upah per jam
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},Saldo saham di Batch {0} akan menjadi negatif {1} untuk Item {2} di Gudang {3}
 apps/erpnext/erpnext/config/setup.py +83,"Show / Hide features like Serial Nos, POS etc.","Tampilkan / Sembunyikan fitur seperti Serial Nos, POS dll"
-apps/erpnext/erpnext/controllers/accounts_controller.py +236,Account {0} is invalid. Account Currency must be {1},Akun {0} tidak valid. Akun Mata harus {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +237,Account {0} is invalid. Account Currency must be {1},Akun {0} tidak valid. Akun Mata harus {1}
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +34,UOM Conversion factor is required in row {0},Faktor UOM Konversi diperlukan berturut-turut {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +53,Clearance date cannot be before check date in row {0},Tanggal clearance tidak bisa sebelum tanggal check-in baris {0}
 DocType: Salary Slip,Deduction,Deduksi
@@ -1739,13 +1677,13 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +82,Item {0} has already been returned,Item {0} telah dikembalikan
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** Tahun Anggaran ** mewakili Tahun Keuangan. Semua entri akuntansi dan transaksi besar lainnya dilacak terhadap Tahun Anggaran ** **.
 DocType: Opportunity,Customer / Lead Address,Pelanggan / Lead Alamat
+apps/erpnext/erpnext/stock/doctype/item/item.py +112,Warning: Invalid SSL certificate on attachment {0},Peringatan: sertifikat SSL tidak valid pada lampiran {0}
 DocType: Production Order Operation,Actual Operation Time,Realisasi Waktu Operasi
 DocType: Authorization Rule,Applicable To (User),Berlaku Untuk (User)
 DocType: Purchase Taxes and Charges,Deduct,Mengurangi
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +170,Job Description,Job Description
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +170,Job Description,Job Description
 DocType: Purchase Order Item,Qty as per Stock UOM,Qty per Saham UOM
 apps/frappe/frappe/model/rename_doc.py +343,Please select a valid csv file with data,Silakan pilih file csv dengan data yang valid
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +92,Coating,Lapisan
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +126,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Karakter khusus kecuali ""-"" ""."", ""#"", dan ""/"" tidak diperbolehkan dalam penamaan seri"
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Pelihara Penjualan Kampanye. Melacak Memimpin, Kutipan, Sales Order dll dari Kampanye untuk mengukur Return on Investment. "
 DocType: Expense Claim,Approver,Approver
@@ -1755,12 +1693,11 @@
 DocType: Supplier Quotation,Manufacturing Manager,Manufaktur Manajer
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},Serial ada {0} masih dalam garansi upto {1}
 apps/erpnext/erpnext/config/stock.py +69,Split Delivery Note into packages.,Membagi Pengiriman Catatan ke dalam paket.
-apps/erpnext/erpnext/hooks.py +84,Shipments,Pengiriman
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +29,Dip molding,Dip molding
+apps/erpnext/erpnext/hooks.py +68,Shipments,Pengiriman
 DocType: Purchase Order,To be delivered to customer,Yang akan dikirimkan ke pelanggan
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,Waktu Log Status harus Dikirim.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,Serial ada {0} bukan milik Gudang setiap
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +650,Setting Up,Pengaturan
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +114,Setting Up,Pengaturan
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,Row # ,Row #
 DocType: Purchase Invoice,In Words (Company Currency),Dalam Kata-kata (Perusahaan Mata Uang)
 DocType: Pricing Rule,Supplier,Pemasok
@@ -1768,7 +1705,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +105,Miscellaneous Expenses,Beban lain-lain
 DocType: Global Defaults,Default Company,Standar Perusahaan
 apps/erpnext/erpnext/controllers/stock_controller.py +166,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,Beban atau Selisih akun adalah wajib untuk Item {0} karena dampak keseluruhan nilai saham
-apps/erpnext/erpnext/controllers/accounts_controller.py +354,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","Tidak bisa overbill untuk Item {0} berturut-turut {1} lebih dari {2}. Untuk memungkinkan mark up, atur di Bursa Pengaturan"
+apps/erpnext/erpnext/controllers/accounts_controller.py +355,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","Tidak bisa overbill untuk Item {0} berturut-turut {1} lebih dari {2}. Untuk memungkinkan mark up, atur di Bursa Pengaturan"
 DocType: Employee,Bank Name,Nama Bank
 apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +27,-Above,-Di Atas
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +135,User {0} is disabled,Pengguna {0} dinonaktifkan
@@ -1781,27 +1718,26 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,{0} is mandatory for Item {1},{0} adalah wajib untuk Item {1}
 DocType: Currency Exchange,From Currency,Dari Mata
 DocType: DocField,Name,Nama
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +211,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Silakan pilih Jumlah Alokasi, Faktur Jenis dan Faktur Nomor di minimal satu baris"
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +104,Sales Order required for Item {0},Sales Order yang diperlukan untuk Item {0}
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +158,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Silakan pilih Jumlah Alokasi, Faktur Jenis dan Faktur Nomor di minimal satu baris"
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +107,Sales Order required for Item {0},Sales Order yang diperlukan untuk Item {0}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +43,Amounts not reflected in system,Jumlah yang tidak tercermin dalam sistem
 DocType: Purchase Invoice Item,Rate (Company Currency),Rate (Perusahaan Mata Uang)
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +40,Others,Lainnya
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +40,Others,Lainnya
 apps/erpnext/erpnext/templates/includes/product_page.js +80,Cannot find a matching Item. Please select some other value for {0}.,Tidak dapat menemukan yang cocok Item. Silakan pilih beberapa nilai lain untuk {0}.
 DocType: POS Profile,Taxes and Charges,Pajak dan Biaya
 DocType: Item,"A Product or a Service that is bought, sold or kept in stock.","Sebuah Produk atau Jasa yang dibeli, dijual atau disimpan di gudang."
 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,Tidak dapat memilih jenis biaya sebagai 'Pada Row Sebelumnya Jumlah' atau 'On Sebelumnya Row Jumlah' untuk baris pertama
 apps/frappe/frappe/core/doctype/doctype/boilerplate/controller_list.html +31,Completed,Selesai
 DocType: Web Form,Select DocType,Pilih DocType
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +104,Broaching,Menggerek
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +12,Banking,Perbankan
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,Perbankan
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +38,Please click on 'Generate Schedule' to get schedule,Silahkan klik 'Menghasilkan Jadwal' untuk mendapatkan jadwal
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +283,New Cost Center,Biaya Pusat baru
 DocType: Bin,Ordered Quantity,Memerintahkan Kuantitas
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +397,"e.g. ""Build tools for builders""","misalnya ""Membangun alat untuk pembangun """
+apps/erpnext/erpnext/public/js/setup_wizard.js +145,"e.g. ""Build tools for builders""","misalnya ""Membangun alat untuk pembangun """
 DocType: Quality Inspection,In Process,Dalam Proses
 DocType: Authorization Rule,Itemwise Discount,Itemwise Diskon
 DocType: Purchase Order Item,Reference Document Type,Dokumen referensi Type
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +318,{0} against Sales Order {1},{0} terhadap Sales Order {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +320,{0} against Sales Order {1},{0} terhadap Sales Order {1}
 DocType: Account,Fixed Asset,Fixed Asset
 apps/erpnext/erpnext/config/stock.py +283,Serialized Inventory,Persediaan serial
 DocType: Activity Type,Default Billing Rate,Standar Tingkat Penagihan
@@ -1816,14 +1752,13 @@
 DocType: Purchase Invoice Item,Page Break,Halaman Istirahat
 DocType: Production Order Operation,Pending,Menunggu
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,Pengguna yang dapat menyetujui aplikasi cuti karyawan tertentu yang
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +33,You cannot change default UOM of Variant. To change default UOM for Variant change default UOM of the Template,Anda tidak dapat mengubah UOM default Varian. Untuk mengubah UOM default untuk Variant UOM perubahan default Template
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +50,Office Equipments,Peralatan Kantor
 DocType: Purchase Invoice Item,Qty,Qty
 DocType: Fiscal Year,Companies,Perusahaan
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +24,Electronics,Elektronik
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +24,Electronics,Elektronik
 DocType: Stock Settings,Raise Material Request when stock reaches re-order level,Angkat Permintaan Bahan ketika saham mencapai tingkat re-order
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +18,From Maintenance Schedule,Dari Pemeliharaan Jadwal
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +56,Full-time,Full-time
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +56,Full-time,Full-time
 DocType: Purchase Invoice,Contact Details,Kontak Detail
 DocType: C-Form,Received Date,Diterima Tanggal
 DocType: Delivery Note,"If you have created a standard template in Sales Taxes and Charges Template, select one and click on the button below.","Jika Anda telah membuat template standar dalam Penjualan Pajak dan Biaya Template, pilih salah satu dan klik pada tombol di bawah ini."
@@ -1835,11 +1770,12 @@
 DocType: Job Applicant,Job Opening,Pembukaan Job
 DocType: Payment Reconciliation,Payment Reconciliation,Rekonsiliasi Pembayaran
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +154,Please select Incharge Person's name,Silahkan pilih nama Incharge Orang
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +51,Technology,Teknologi
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,Teknologi
 DocType: Offer Letter,Offer Letter,Menawarkan Surat
 apps/erpnext/erpnext/config/manufacturing.py +51,Generate Material Requests (MRP) and Production Orders.,Menghasilkan Permintaan Material (MRP) dan Pesanan Produksi.
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +68,Total Invoiced Amt,Jumlah tagihan Amt
 DocType: Time Log,To Time,Untuk Waktu
+DocType: Authorization Rule,Approving Role (above authorized value),Menyetujui Peran (di atas nilai yang berwenang)
 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.","Untuk menambahkan node anak, mengeksplorasi pohon dan klik pada node di mana Anda ingin menambahkan lebih banyak node."
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +102,Credit To account must be a Payable account,Kredit Untuk akun harus rekening Hutang
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +233,BOM recursion: {0} cannot be parent or child of {2},BOM recursion: {0} tidak bisa menjadi induk atau cabang dari {2}
@@ -1852,10 +1788,8 @@
 DocType: Item,Customer Item Codes,Pelanggan Barang Kode
 DocType: Opportunity,Lost Reason,Kehilangan Alasan
 apps/erpnext/erpnext/config/accounts.py +68,Create Payment Entries against Orders or Invoices.,Buat Entri Pembayaran terhadap Pesanan atau Faktur.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +141,Welding,Pengelasan
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +40,New Stock UOM is required,New Stock UOM diperlukan
 DocType: Quality Inspection,Sample Size,Ukuran Sampel
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +443,All items have already been invoiced,Semua Barang telah tertagih
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +446,All items have already been invoiced,Semua Barang telah tertagih
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',Silakan tentukan valid 'Dari Kasus No'
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +287,Further cost centers can be made under Groups but entries can be made against non-Groups,Pusat biaya lebih lanjut dapat dibuat di bawah Grup tetapi entri dapat dilakukan terhadap non-Grup
 DocType: Project,External,Eksternal
@@ -1867,8 +1801,7 @@
 DocType: Bin,Actual Quantity,Kuantitas Aktual
 DocType: Shipping Rule,example: Next Day Shipping,Contoh: Hari Berikutnya Pengiriman
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,Serial No {0} tidak ditemukan
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +563,Your Customers,Pelanggan Anda
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +27,Compression molding,Kompresi molding
+apps/erpnext/erpnext/public/js/setup_wizard.js +303,Your Customers,Pelanggan Anda
 DocType: Leave Block List Date,Block Date,Blokir Tanggal
 DocType: Sales Order,Not Delivered,Tidak Disampaikan
 ,Bank Clearance Summary,Izin Bank Summary
@@ -1889,10 +1822,10 @@
 DocType: SMS Log,Sent To,Dikirim Ke
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +28,Make Sales Invoice,Membuat Sales Invoice
 DocType: Company,For Reference Only.,Untuk referensi saja.
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +29,Invalid {0}: {1},Valid {0}: {1}
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +49,Invalid {0}: {1},Valid {0}: {1}
 DocType: Sales Invoice Advance,Advance Amount,Jumlah Uang Muka
 DocType: Manufacturing Settings,Capacity Planning,Perencanaan Kapasitas
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +49,'From Date' is required,'Dari Tanggal' diperlukan
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +43,'From Date' is required,'Dari Tanggal' diperlukan
 DocType: Journal Entry,Reference Number,Nomor Referensi
 DocType: Employee,Employment Details,Rincian Pekerjaan
 DocType: Employee,New Workplace,Kerja baru
@@ -1907,7 +1840,7 @@
 DocType: Serial No,Delivery Time,Waktu Pengiriman
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Umur Berdasarkan
 DocType: Item,End of Life,Akhir Kehidupan
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +41,Travel,Perjalanan
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +41,Travel,Perjalanan
 DocType: Leave Block List,Allow Users,Izinkan Pengguna
 DocType: Purchase Order,Customer Mobile No,Pelanggan Seluler ada
 DocType: Sales Invoice,Recurring,Berulang
@@ -1921,7 +1854,7 @@
 DocType: Naming Series,User must always select,Pengguna harus selalu pilih
 DocType: Stock Settings,Allow Negative Stock,Izinkan Bursa Negatif
 DocType: Installation Note,Installation Note,Instalasi Note
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +541,Add Taxes,Tambahkan Pajak
+apps/erpnext/erpnext/public/js/setup_wizard.js +283,Add Taxes,Tambahkan Pajak
 ,Financial Analytics,Analytics keuangan
 DocType: Quality Inspection,Verified By,Diverifikasi oleh
 DocType: Address,Subsidiary,Anak Perusahaan
@@ -1931,7 +1864,6 @@
 DocType: System Settings,In Hours,Pada Jam
 DocType: Process Payroll,Create Salary Slip,Buat Slip Gaji
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Expected balance as per bank,Saldo diharapkan sebagai per bank
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +115,Buffing,Buffing
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Source of Funds (Liabilities),Sumber Dana (Kewajiban)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +347,Quantity in row {0} ({1}) must be same as manufactured quantity {2},Jumlah berturut-turut {0} ({1}) harus sama dengan jumlah yang diproduksi {2}
 DocType: Appraisal,Employee,Karyawan
@@ -1948,11 +1880,11 @@
 DocType: Rename Tool,File to Rename,File untuk Ganti nama
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +176,Purchse Order number required for Item {0},Nomor pesanan purchse diperlukan untuk Item {0}
 apps/erpnext/erpnext/public/js/controllers/transaction.js +136,Show Payments,Tampilkan Pembayaran
-apps/erpnext/erpnext/controllers/buying_controller.py +245,Specified BOM {0} does not exist for Item {1},Ditentukan BOM {0} tidak ada untuk Item {1}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +202,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Jadwal pemeliharaan {0} harus dibatalkan sebelum membatalkan Sales Order ini
+apps/erpnext/erpnext/controllers/buying_controller.py +236,Specified BOM {0} does not exist for Item {1},Ditentukan BOM {0} tidak ada untuk Item {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Jadwal pemeliharaan {0} harus dibatalkan sebelum membatalkan Sales Order ini
 apps/frappe/frappe/desk/page/backups/backups.html +13,Size,Ukuran
 DocType: Notification Control,Expense Claim Approved,Beban Klaim Disetujui
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +113,Pharmaceutical,Farmasi
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Pharmaceutical,Farmasi
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,Biaya Produk Dibeli
 DocType: Selling Settings,Sales Order Required,Sales Order Diperlukan
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +30,Create Customer,Buat Pelanggan
@@ -1962,7 +1894,6 @@
 DocType: Quality Inspection Reading,Reading 9,Membaca 9
 DocType: Supplier,Is Frozen,Membeku
 DocType: Buying Settings,Buying Settings,Setting Pembelian
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +122,Mass finishing,Finishing massa
 DocType: Stock Entry Detail,BOM No. for a Finished Good Item,No. BOM untuk Barang Jadi
 DocType: Upload Attendance,Attendance To Date,Kehadiran Sampai Tanggal
 apps/erpnext/erpnext/config/selling.py +158,Setup incoming server for sales email id. (e.g. sales@example.com),Pengaturan server masuk untuk email penjualan id. (Misalnya sales@example.com)
@@ -1970,7 +1901,7 @@
 DocType: Payment Tool,Payment Account,Akun Pembayaran
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +713,Please specify Company to proceed,Silahkan tentukan Perusahaan untuk melanjutkan
 apps/frappe/frappe/public/js/frappe/model/indicator.js +30,Draft,Konsep
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +46,Compensatory Off,Kompensasi Off
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Compensatory Off,Kompensasi Off
 DocType: Quality Inspection Reading,Accepted,Diterima
 DocType: User,Female,Perempuan
 DocType: Journal Entry Account,Debit in Account Currency,Debit dalam Rekening Mata Uang
@@ -1982,7 +1913,7 @@
 DocType: Shipping Rule,Shipping Rule Label,Peraturan Pengiriman Label
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +209,Raw Materials cannot be blank.,Bahan baku tidak boleh kosong.
 DocType: Newsletter,Test,tes
-apps/erpnext/erpnext/stock/doctype/item/item.py +364,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +368,"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'","Karena ada transaksi saham yang ada untuk item ini, \ Anda tidak dapat mengubah nilai-nilai &#39;Memiliki Serial No&#39;, &#39;Apakah Batch Tidak&#39;, &#39;Apakah Stok Item&#39; dan &#39;Metode Penilaian&#39;"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +448,Quick Journal Entry,Cepat Journal Masuk
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +92,You can not change rate if BOM mentioned agianst any item,Anda tidak dapat mengubah kurs jika BOM disebutkan atas tiap barang
@@ -1993,13 +1924,14 @@
 apps/erpnext/erpnext/config/stock.py +18,Requests for items.,Permintaan untuk item.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,Order produksi yang terpisah akan dibuat untuk setiap item barang jadi.
 DocType: Purchase Invoice,Terms and Conditions1,Syarat dan Conditions1
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +18,Complete Setup,Pengaturan Lengkap
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard_page.html +18,Complete Setup,Pengaturan Lengkap
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","Pencatatan Akuntansi telah dibekukan sampai tanggal ini, tidak seorang pun yang bisa melakukan / memodifikasi pencatatan kecuali peran yang telah ditentukan di bawah ini."
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +121,Please save the document before generating maintenance schedule,Harap menyimpan dokumen sebelum menghasilkan jadwal pemeliharaan
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,Status proyek
 DocType: UOM,Check this to disallow fractions. (for Nos),Centang untuk melarang fraksi. (Untuk Nos)
 apps/erpnext/erpnext/config/crm.py +96,Newsletter Mailing List,Newsletter Mailing List
 DocType: Delivery Note,Transporter Name,Transporter Nama
+DocType: Authorization Rule,Authorized Value,Nilai resmi
 DocType: Contact,Enter department to which this Contact belongs,Memasukkan departemen yang Kontak ini milik
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Absent,Jumlah Absen
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +746,Item or Warehouse for row {0} does not match Material Request,Item atau Gudang untuk baris {0} Material tidak cocok Permintaan
@@ -2024,16 +1956,15 @@
 DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),Tingkat dasar (seperti per Saham UOM)
 DocType: SMS Log,No of Requested SMS,Tidak ada dari Diminta SMS
 DocType: Campaign,Campaign-.####,Promosi-.# # # #
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +55,Piercing,Tajam
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,Langkah selanjutnya
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +117,Contract End Date must be greater than Date of Joining,Kontrak Tanggal Akhir harus lebih besar dari Tanggal Bergabung
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,Seorang distributor pihak ketiga / agen / komisi agen / affiliate / reseller yang menjual produk-produk perusahaan untuk komisi.
 DocType: Customer Group,Has Child Node,Memiliki Anak Node
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{0} against Purchase Order {1},{0} terhadap Purchase Order {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +332,{0} against Purchase Order {1},{0} terhadap Purchase Order {1}
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","Masukkan parameter url statis di sini (Misalnya pengirim = ERPNext, username = ERPNext, password = 1234 dll)"
 apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,{0} {1} tidak dalam Tahun Fiskal aktif. Untuk lebih jelasnya lihat {2}.
-apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,Ini adalah situs contoh auto-dihasilkan dari ERPNext
+apps/erpnext/erpnext/setup/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,Ini adalah situs contoh auto-dihasilkan dari ERPNext
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +37,Ageing Range 1,Penuaan Rentang 1
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +110,Photochemical machining,Mesin fotokimia
 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.
 
 #### Note
@@ -2079,7 +2010,7 @@
 DocType: Purchase Receipt Item,Recd Quantity,Recd Kuantitas
 DocType: Email Account,Email Ids,Email Id
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},Tidak dapat menghasilkan lebih Barang {0} daripada kuantitas Sales Order {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +471,Stock Entry {0} is not submitted,Masuk Bursa {0} tidak disampaikan
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +473,Stock Entry {0} is not submitted,Masuk Bursa {0} tidak disampaikan
 DocType: Payment Reconciliation,Bank / Cash Account,Bank / Rekening Kas
 DocType: Tax Rule,Billing City,Penagihan Kota
 DocType: Global Defaults,Hide Currency Symbol,Sembunyikan Currency Symbol
@@ -2095,7 +2026,7 @@
 DocType: Purchase Invoice,Currency and Price List,Mata Uang dan Daftar Harga
 DocType: Opportunity,Customer / Lead Name,Pelanggan / Lead Nama
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +63,Clearance Date not mentioned,Izin Tanggal tidak disebutkan
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +71,Production,Produksi
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Production,Produksi
 DocType: Item,Allow Production Order,Izinkan Pesanan Produksi
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +60,Row {0}:Start Date must be before End Date,Row {0}: Tanggal awal harus sebelum Tanggal Akhir
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Total (Qty)
@@ -2108,7 +2039,7 @@
 apps/erpnext/erpnext/utilities/doctype/address/address.py +113,My Addresses,Alamat saya
 DocType: Stock Ledger Entry,Outgoing Rate,Tingkat keluar
 apps/erpnext/erpnext/config/hr.py +100,Organization branch master.,Cabang master organisasi.
-apps/erpnext/erpnext/controllers/accounts_controller.py +237, or ,atau
+apps/erpnext/erpnext/controllers/accounts_controller.py +238, or ,atau
 DocType: Sales Order,Billing Status,Status Penagihan
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Utility Expenses,Beban utilitas
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,90-Above,90-ke atas
@@ -2135,6 +2066,7 @@
 DocType: Stock Entry Detail,Serial No / Batch,Serial No / Batch
 DocType: Product Bundle,Parent Item,Induk Barang
 DocType: Account,Account Type,Jenis Account
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +113,Leave Type {0} cannot be carry-forwarded,Tinggalkan Jenis {0} tidak dapat membawa-diteruskan
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +213,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',Jadwal pemeliharaan tidak dihasilkan untuk semua item. Silahkan klik 'Menghasilkan Jadwal'
 ,To Produce,Untuk Menghasilkan
 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","Untuk baris {0} di {1}. Untuk menyertakan {2} di tingkat Item, baris {3} juga harus disertakan"
@@ -2142,10 +2074,7 @@
 DocType: Bin,Reserved Quantity,Reserved Kuantitas
 DocType: Landed Cost Voucher,Purchase Receipt Items,Penerimaan Pembelian Produk
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,Menyesuaikan Bentuk
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +62,Cutting,Pemotongan
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +69,Flattening,Perataan
 DocType: Account,Income Account,Akun Penghasilan
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +22,Molding,Pengecoran
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +632,Delivery,Pengiriman
 DocType: Stock Reconciliation Item,Current Qty,Jumlah saat ini
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section","Lihat ""Rate Of Material Berbasis"" dalam Biaya Bagian"
@@ -2155,20 +2084,19 @@
 apps/frappe/frappe/desk/moduleview.py +61,Documents,Docuements
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +17,Ref,Ref
 DocType: Cost Center,Cost Center,Biaya Pusat
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.js +48,Voucher #,Voucher #
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +36,Voucher #,Voucher #
 DocType: Notification Control,Purchase Order Message,Pesan Purchase Order
 DocType: Tax Rule,Shipping Country,Pengiriman Negara
 DocType: Upload Attendance,Upload HTML,Upload HTML
-apps/erpnext/erpnext/controllers/accounts_controller.py +391,"Total advance ({0}) against Order {1} cannot be greater \
+apps/erpnext/erpnext/controllers/accounts_controller.py +392,"Total advance ({0}) against Order {1} cannot be greater \
 				than the Grand Total ({2})","Total muka ({0}) terhadap Orde {1} tidak bisa lebih besar daripada \
  Grand Total ({2})"
 DocType: Employee,Relieving Date,Menghilangkan Tanggal
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +12,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.","Rule harga dibuat untuk menimpa Daftar Harga / mendefinisikan persentase diskon, berdasarkan beberapa kriteria."
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,Gudang hanya dapat diubah melalui Bursa Masuk / Delivery Note / Penerimaan Pembelian
 DocType: Employee Education,Class / Percentage,Kelas / Persentase
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +92,Head of Marketing and Sales,Kepala Pemasaran dan Penjualan
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +31,Income Tax,Pajak Penghasilan
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +157,Laser engineered net shaping,Laser direkayasa membentuk jaring
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Head of Marketing and Sales,Kepala Pemasaran dan Penjualan
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +31,Income Tax,Pajak Penghasilan
 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.","Jika Aturan Harga yang dipilih dibuat untuk 'Harga', itu akan menimpa Daftar Harga. Harga Rule harga adalah harga akhir, sehingga tidak ada diskon lebih lanjut harus diterapkan. Oleh karena itu, dalam transaksi seperti Sales Order, Purchase Order dll, maka akan diambil di lapangan 'Tingkat', daripada lapangan 'Daftar Harga Tingkat'."
 apps/erpnext/erpnext/config/selling.py +163,Track Leads by Industry Type.,Melacak Memimpin menurut Industri Type.
 DocType: Item Supplier,Item Supplier,Item Pemasok
@@ -2191,31 +2119,28 @@
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Jumlah Aktual Setelah Transaksi
 ,Pending SO Items For Purchase Request,Pending SO Items Untuk Pembelian Permintaan
 DocType: Supplier,Billing Currency,Penagihan Mata Uang
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +148,Extra Large,Ekstra Besar
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,Extra Large,Ekstra Besar
 ,Profit and Loss Statement,Laba Rugi
 DocType: Bank Reconciliation Detail,Cheque Number,Nomor Cek
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +43,Pressing,Mendesak
 DocType: Payment Tool Detail,Payment Tool Detail,Alat Pembayaran Detil
 ,Sales Browser,Penjualan Browser
 DocType: Journal Entry,Total Credit,Jumlah Kredit
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +474,Warning: Another {0} # {1} exists against stock entry {2},Peringatan: lain {0} # {1} ada terhadap masuknya saham {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +459,Local,[Daerah
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +476,Warning: Another {0} # {1} exists against stock entry {2},Peringatan: lain {0} # {1} ada terhadap masuknya saham {2}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +397,Local,[Daerah
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),Pinjaman Uang Muka dan (Aset)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,Debitur
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +147,Large,Besar
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +23,No employee found!,Tidak ada karyawan ditemukan!
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Large,Besar
 DocType: C-Form Invoice Detail,Territory,Wilayah
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,Harap menyebutkan tidak ada kunjungan yang diperlukan
 DocType: Purchase Order,Customer Address Display,Alamat Pelanggan Tampilan
 DocType: Stock Settings,Default Valuation Method,Metode standar Penilaian
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +127,Polishing,Poles
 DocType: Production Order Operation,Planned Start Time,Rencana Start Time
 apps/erpnext/erpnext/config/accounts.py +63,Close Balance Sheet and book Profit or Loss.,Tutup Neraca dan Perhitungan Laba Rugi atau buku.
-apps/erpnext/erpnext/stock/doctype/item/item.py +661,"Default Unit of Measure for Item {0} cannot be changed directly because \
+apps/erpnext/erpnext/stock/doctype/item/item.py +665,"Default Unit of Measure for Item {0} cannot be changed directly because \
 			you have already made some transaction(s) with another UOM. To change default UOM, \
 			use 'UOM Replace Utility' tool under Stock module.","Standar Satuan Ukur untuk Item {0} tidak dapat diubah secara langsung karena \ Anda telah membuat beberapa transaksi (s) dengan UOM lain. Untuk mengubah UOM default, \ penggunaan &#39;UOM Ganti Utility&#39; alat di bawah modul Stock."
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,Tentukan Nilai Tukar untuk mengkonversi satu mata uang ke yang lain
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +146,Quotation {0} is cancelled,Quotation {0} dibatalkan
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +141,Quotation {0} is cancelled,Quotation {0} dibatalkan
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,Jumlah Total Outstanding
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} was on leave on {1}. Cannot mark attendance.,Karyawan {0} sedang cuti pada {1}. Tidak bisa menandai kehadiran.
 DocType: Sales Partner,Targets,Target
@@ -2226,7 +2151,6 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +158,Please create Customer from Lead {0},Silakan membuat pelanggan dari Lead {0}
 DocType: Price List,Applicable for Countries,Berlaku untuk Negara
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Computers,Komputer
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +112,Electro-chemical grinding,Elektro-kimia grinding
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +14,This is a root customer group and cannot be edited.,Ini adalah kelompok pelanggan akar dan tidak dapat diedit.
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +39,Please setup your chart of accounts before you start Accounting Entries,Silakan pengaturan grafik Anda account sebelum Anda mulai Entries Akuntansi
 DocType: Purchase Invoice,Ignore Pricing Rule,Abaikan Aturan Harga
@@ -2284,7 +2208,6 @@
 DocType: Maintenance Visit,Purposes,Tujuan
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +103,Atleast one item should be entered with negative quantity in return document,Atleast satu item harus dimasukkan dengan kuantitas negatif dalam dokumen kembali
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +67,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","Operasi {0} lebih lama daripada jam kerja yang tersedia di workstation {1}, memecah operasi menjadi beberapa operasi"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +134,Electrochemical machining,Mesin elektrokimia
 ,Requested,Diminta
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +66,No Remarks,Tidak ada Keterangan
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +13,Overdue,Terlambat
@@ -2293,7 +2216,7 @@
 DocType: Monthly Distribution,Distribution Name,Nama Distribusi
 DocType: Features Setup,Sales and Purchase,Penjualan dan Pembelian
 DocType: Supplier Quotation Item,Material Request No,Permintaan Material yang
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +218,Quality Inspection required for Item {0},Kualitas Inspeksi diperlukan untuk Item {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +221,Quality Inspection required for Item {0},Kualitas Inspeksi diperlukan untuk Item {0}
 DocType: Quotation,Rate at which customer's currency is converted to company's base currency,Tingkat di mana mata uang pelanggan dikonversi ke mata uang dasar perusahaan
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +107,{0} has been successfully unsubscribed from this list.,{0} telah berhasil berhenti berlangganan dari daftar ini.
 DocType: Purchase Invoice Item,Net Rate (Company Currency),Tingkat Net (Perusahaan Mata Uang)
@@ -2311,9 +2234,8 @@
 apps/erpnext/erpnext/accounts/report/financial_statements.py +16,Fiscal Year {0} not found.,Tahun fiskal {0} tidak ditemukan.
 DocType: Bank Reconciliation,Get Relevant Entries,Dapatkan Entries Relevan
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +407,Accounting Entry for Stock,Masuk akuntansi Saham
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +64,Coining,Coining
 DocType: Sales Invoice,Sales Team1,Penjualan team1
-apps/erpnext/erpnext/stock/doctype/item/item.py +412,Item {0} does not exist,Item {0} tidak ada
+apps/erpnext/erpnext/stock/doctype/item/item.py +416,Item {0} does not exist,Item {0} tidak ada
 DocType: Sales Invoice,Customer Address,Alamat pelanggan
 apps/frappe/frappe/desk/query_report.py +136,Total,Total
 DocType: Purchase Invoice,Apply Additional Discount On,Terapkan tambahan Diskon Pada
@@ -2325,14 +2247,13 @@
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),Jumlah pajak Setelah Diskon Jumlah (Perusahaan Mata Uang)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +149,Target warehouse is mandatory for row {0},Target gudang adalah wajib untuk baris {0}
 DocType: Quality Inspection,Quality Inspection,Inspeksi Kualitas
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +144,Extra Small,Ekstra Kecil
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +20,Spray forming,Semprot membentuk
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Extra Small,Ekstra Kecil
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +458,Warning: Material Requested Qty is less than Minimum Order Qty,Peringatan: Material Diminta Qty kurang dari Minimum Order Qty
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +191,Account {0} is frozen,Akun {0} dibekukan
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Badan Hukum / Anak dengan Bagan terpisah Account milik Organisasi.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +29,"Food, Beverage & Tobacco","Makanan, Minuman dan Tembakau"
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","Makanan, Minuman dan Tembakau"
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +20,PL or BS,PL atau BS
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,Can only make payment against unbilled {0},Hanya dapat melakukan pembayaran terhadap yang belum ditagihkan {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +531,Can only make payment against unbilled {0},Hanya dapat melakukan pembayaran terhadap yang belum ditagihkan {0}
 apps/erpnext/erpnext/controllers/selling_controller.py +122,Commission rate cannot be greater than 100,Tingkat komisi tidak dapat lebih besar dari 100
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Minimum Inventory Level,Persediaan Tingkat Minimum
 DocType: Stock Entry,Subcontract,Kontrak tambahan
@@ -2343,19 +2264,18 @@
 DocType: Item,Manufacturer Part Number,Produsen Part Number
 DocType: Production Order Operation,Estimated Time and Cost,Perkiraan Waktu dan Biaya
 DocType: Bin,Bin,Tong Sampah
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +50,Nosing,Nosing
 DocType: SMS Log,No of Sent SMS,Tidak ada dari Sent SMS
 DocType: Account,Company,Perusahaan
 DocType: Account,Expense Account,Beban Akun
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +49,Software,Perangkat lunak
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +151,Colour,Warna
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +49,Software,Perangkat lunak
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Colour,Warna
 DocType: Maintenance Visit,Scheduled,Dijadwalkan
 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","Silakan pilih item mana &quot;Apakah Stock Item&quot; adalah &quot;Tidak&quot;, dan &quot;Apakah Penjualan Item&quot; adalah &quot;Ya&quot; dan tidak ada Bundle Produk lainnya"
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,Pilih Distribusi bulanan untuk merata mendistribusikan target di bulan.
 DocType: Purchase Invoice Item,Valuation Rate,Tingkat Penilaian
 apps/erpnext/erpnext/stock/get_item_details.py +281,Price List Currency not selected,Daftar Harga Mata uang tidak dipilih
 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,Item Row {0}: Penerimaan Pembelian {1} tidak ada dalam tabel di atas 'Pembelian Penerimaan'
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +134,Employee {0} has already applied for {1} between {2} and {3},Karyawan {0} telah diterapkan untuk {1} antara {2} dan {3}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +145,Employee {0} has already applied for {1} between {2} and {3},Karyawan {0} telah diterapkan untuk {1} antara {2} dan {3}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Proyek Tanggal Mulai
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +8,Until,Sampai Sampai
 DocType: Rename Tool,Rename Log,Rename Log
@@ -2365,7 +2285,7 @@
 apps/erpnext/erpnext/controllers/recurring_document.py +162,Please select {0},Silahkan pilih {0}
 DocType: C-Form,C-Form No,C-Form ada
 DocType: BOM,Exploded_items,Exploded_items
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +95,Researcher,Peneliti
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Researcher,Peneliti
 apps/frappe/frappe/custom/doctype/customize_form/customize_form.js +88,Update,Perbarui
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +78,Please save the Newsletter before sending,Harap menyimpan Newsletter sebelum dikirim
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +23,Name or Email is mandatory,Nama atau Email adalah wajib
@@ -2374,11 +2294,10 @@
 DocType: Employee,Exit,Keluar
 apps/erpnext/erpnext/accounts/doctype/account/account.py +134,Root Type is mandatory,Akar Type adalah wajib
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +295,Serial No {0} created,Serial ada {0} dibuat
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +125,Vibratory finishing,Getaran finishing
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","Untuk kenyamanan pelanggan, kode ini dapat digunakan dalam format cetak seperti Faktur dan Pengiriman Catatan"
 DocType: Employee,You can enter any date manually,Anda dapat memasukkan tanggal apapun secara manual
 DocType: Sales Invoice,Advertisement,iklan
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +165,Probationary Period,Masa percobaan
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Probationary Period,Masa percobaan
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Hanya node daun yang diperbolehkan dalam transaksi
 DocType: Expense Claim,Expense Approver,Beban Approver
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,Penerimaan Pembelian Barang Disediakan
@@ -2386,20 +2305,17 @@
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +17,To Datetime,Untuk Datetime
 DocType: SMS Settings,SMS Gateway URL,SMS Gateway URL
 apps/erpnext/erpnext/config/crm.py +53,Logs for maintaining sms delivery status,Log untuk mempertahankan status pengiriman sms
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +137,Grinding,Penggilingan
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +34,Shrink wrapping,Kecilkan membungkus
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +36,Pending Activities,Tertunda Kegiatan
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,Confirmed,Dikonfirmasi
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier > Supplier Type,Pemasok> Pemasok Type
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +127,Please enter relieving date.,Silahkan masukkan menghilangkan date.
 apps/erpnext/erpnext/controllers/trends.py +137,Amt,Amt
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' can be submitted,Hanya Tinggalkan Aplikasi status 'Disetujui' dapat diajukan
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +51,Only Leave Applications with status 'Approved' can be submitted,Hanya Tinggalkan Aplikasi status 'Disetujui' dapat diajukan
 apps/erpnext/erpnext/utilities/doctype/address/address.py +21,Address Title is mandatory.,"Wajib masukan Judul Alamat.
 "
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,Masukkan nama kampanye jika sumber penyelidikan adalah kampanye
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +38,Newspaper Publishers,Koran Publishers
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +38,Newspaper Publishers,Koran Publishers
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,Pilih Tahun Fiskal
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +88,Smelting,Peleburan
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Susun ulang Tingkat
 DocType: Attendance,Attendance Date,Tanggal Kehadiran
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,Gaji perpisahan berdasarkan Produktif dan Pengurangan.
@@ -2414,16 +2330,15 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +414,[Error],[Kesalahan]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,Dalam Kata-kata akan terlihat setelah Anda menyimpan Sales Order.
 ,Employee Birthday,Ulang Tahun Karyawan
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +55,Venture Capital,Modal Ventura
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,Modal Ventura
 DocType: UOM,Must be Whole Number,Harus Nomor Utuh
 DocType: Leave Control Panel,New Leaves Allocated (In Days),Daun baru Dialokasikan (Dalam Hari)
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +51,Serial No {0} does not exist,Serial ada {0} tidak ada
 DocType: Pricing Rule,Discount Percentage,Persentase Diskon
 DocType: Payment Reconciliation Invoice,Invoice Number,Nomor Faktur
-apps/erpnext/erpnext/hooks.py +70,Orders,Pesanan
+apps/erpnext/erpnext/hooks.py +54,Orders,Pesanan
 DocType: Leave Control Panel,Employee Type,Tipe Karyawan
 DocType: Employee Leave Approver,Leave Approver,Tinggalkan Approver
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +70,Swaging,Swaging
 DocType: Manufacturing Settings,Material Transferred for Manufacture,Bahan Ditransfer untuk Industri
 DocType: Expense Claim,"A user with ""Expense Approver"" role","Seorang pengguna dengan ""Beban Approver"" Peran"
 ,Issued Items Against Production Order,Tahun Produk Terhadap Orde Produksi
@@ -2435,7 +2350,6 @@
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +62,Cost Center with existing transactions can not be converted to group,Biaya Center dengan transaksi yang ada tidak dapat dikonversi ke grup
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Depreciation,Penyusutan
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Pemasok (s)
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +29,Invalid period,Periode yang tidak valid
 DocType: Customer,Credit Limit,Batas Kredit
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,Pilih jenis transaksi
 DocType: GL Entry,Voucher No,Voucher Tidak ada
@@ -2445,9 +2359,9 @@
 DocType: Customer,Address and Contact,Alamat dan Kontak
 DocType: Customer,Last Day of the Next Month,Hari terakhir dari Bulan Depan
 DocType: Employee,Feedback,Umpan balik
+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}","Tinggalkan tidak dapat dialokasikan sebelum {0}, saldo cuti sudah pernah membawa-diteruskan dalam catatan alokasi cuti masa depan {1}"
 apps/erpnext/erpnext/accounts/party.py +284,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Catatan: Karena / Referensi Tanggal melebihi diperbolehkan hari kredit pelanggan dengan {0} hari (s)
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +621,Maint. Schedule,Maint. Susunan acara
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +108,Abrasive jet machining,Mesin jet abrasif
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +632,Maint. Schedule,Maint. Susunan acara
 DocType: Stock Settings,Freeze Stock Entries,Freeze Entries Stock
 DocType: Website Settings,Website Settings,Pengaturan situs web
 DocType: Item,Reorder level based on Warehouse,Tingkat pemesanan ulang berdasarkan Gudang
@@ -2464,7 +2378,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +75,Show Stock Entries,Tampilkan Entries Bursa
 ,Is Primary Address,Apakah Alamat Primer
 DocType: Production Order,Work-in-Progress Warehouse,Kerja-in Progress-Gudang
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +308,Reference #{0} dated {1},Referensi # {0} tanggal {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Reference #{0} dated {1},Referensi # {0} tanggal {1}
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +13,Manage Addresses,Mengelola Alamat
 DocType: Pricing Rule,Item Code,Item Code
 DocType: Production Planning Tool,Create Production Orders,Buat Pesanan Produksi
@@ -2473,7 +2387,7 @@
 DocType: Lead,Market Segment,Segmen Pasar
 DocType: Communication,Phone,Telepon
 DocType: Employee Internal Work History,Employee Internal Work History,Karyawan Kerja internal Sejarah
-apps/erpnext/erpnext/public/js/account_tree_grid.js +50,Closing (Dr),Penutup (Dr)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +221,Closing (Dr),Penutup (Dr)
 DocType: Contact,Passive,Pasif
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,Serial ada {0} bukan dalam stok
 apps/erpnext/erpnext/config/selling.py +127,Tax template for selling transactions.,Template Pajak menjual transaksi.
@@ -2489,8 +2403,8 @@
 ,Billed Amount,Jumlah Tagihan
 DocType: Bank Reconciliation,Bank Reconciliation,Rekonsiliasi Bank
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +9,Get Updates,Dapatkan Update
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +129,Material Request {0} is cancelled or stopped,Permintaan Material {0} dibatalkan atau dihentikan
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +641,Add a few sample records,Tambahkan beberapa catatan sampel
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +133,Material Request {0} is cancelled or stopped,Permintaan Material {0} dibatalkan atau dihentikan
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Add a few sample records,Tambahkan beberapa catatan sampel
 apps/erpnext/erpnext/config/hr.py +210,Leave Management,Tinggalkan Manajemen
 DocType: Event,Groups,Grup
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,Group by Akun
@@ -2503,38 +2417,34 @@
 DocType: Features Setup,Sales Extras,Penjualan Ekstra
 apps/erpnext/erpnext/accounts/utils.py +344,{0} budget for Account {1} against Cost Center {2} will exceed by {3},"{0} anggaran untuk Akun {1} terhadap ""Cost Center"" {2} akan melebihi oleh {3}"
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +236,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Perbedaan Akun harus rekening Jenis Aset / Kewajiban, karena ini Bursa Rekonsiliasi adalah Masuk Pembukaan"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +138,Purchase Order number required for Item {0},Nomor Purchase Order yang diperlukan untuk Item {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Order number required for Item {0},Nomor Purchase Order yang diperlukan untuk Item {0}
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date','Tanggal Mulai' harus sebelum 'Tanggal Akhir'
 ,Stock Projected Qty,Stock Proyeksi Jumlah
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +147,Customer {0} does not belong to project {1},Pelanggan {0} bukan milik proyek {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +150,Customer {0} does not belong to project {1},Pelanggan {0} bukan milik proyek {1}
 DocType: Sales Order,Customer's Purchase Order,Purchase Order pelanggan
 DocType: Warranty Claim,From Company,Dari Perusahaan
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,Nilai atau Qty
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Minute,Menit
+apps/erpnext/erpnext/public/js/setup_wizard.js +363,Minute,Menit
 DocType: Purchase Invoice,Purchase Taxes and Charges,Pajak Pembelian dan Biaya
 ,Qty to Receive,Qty untuk Menerima
 DocType: Leave Block List,Leave Block List Allowed,Tinggalkan Block List Diizinkan
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +61,Conversion factor cannot be in fractions,Faktor konversi tidak dapat di fraksi
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +358,You will use it to Login,Anda akan menggunakannya untuk Login
+apps/erpnext/erpnext/public/js/setup_wizard.js +108,You will use it to Login,Anda akan menggunakannya untuk Login
 DocType: Sales Partner,Retailer,Pengecer
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +99,Credit To account must be a Balance Sheet account,Kredit Untuk akun harus rekening Neraca
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,Semua Jenis pemasok
 apps/erpnext/erpnext/stock/doctype/item/item.py +37,Item Code is mandatory because Item is not automatically numbered,Item Code adalah wajib karena Item tidak secara otomatis nomor
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +99,Quotation {0} not of type {1},Quotation {0} bukan dari jenis {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +93,Quotation {0} not of type {1},Quotation {0} bukan dari jenis {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,Jadwal pemeliharaan Barang
 DocType: Sales Order,%  Delivered,% Terkirim
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,Bank Overdraft Account,Cerukan Bank Akun
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +15,Make Salary Slip,Membuat Slip Gaji
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +18,Browse BOM,Telusuri BOM
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +175,Secured Loans,Pinjaman Aman
-apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +3,Awesome Products,Produk Mengagumkan
+apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +3,Awesome Products,Produk Mengagumkan
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +189,Opening Balance Equity,Saldo pembukaan Equity
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +80,Cannot approve leave as you are not authorized to approve leaves on Block Dates,Tidak dapat menyetujui cuti karena Anda tidak berwenang untuk menyetujui daun di Blok Dates
 DocType: Appraisal,Appraisal,Penilaian
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +13,Lost-foam casting,Pengecoran hilang-busa
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +47,Drawing,Gambar
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +22,Date is repeated,Tanggal diulang
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +148,Leave approver must be one of {0},Tinggalkan approver harus menjadi salah satu {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +162,Leave approver must be one of {0},Tinggalkan approver harus menjadi salah satu {0}
 DocType: Hub Settings,Seller Email,Penjual Email
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Total Biaya Pembelian (Purchase Invoice via)
 DocType: Workstation Working Hour,Start Time,Waktu Mulai
@@ -2548,7 +2458,7 @@
 DocType: Purchase Invoice Item,Net Amount (Company Currency),Jumlah Bersih (Perusahaan Mata Uang)
 DocType: BOM Operation,Hour Rate,Tingkat Jam
 DocType: Stock Settings,Item Naming By,Item Penamaan Dengan
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +642,From Quotation,Dari Quotation
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +655,From Quotation,Dari Quotation
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},Lain Periode Pendaftaran penutupan {0} telah dibuat setelah {1}
 DocType: Production Order,Material Transferred for Manufacturing,Bahan Ditransfer untuk Manufaktur
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +29,Account {0} does not exists,Akun {0} tidak ada
@@ -2562,21 +2472,19 @@
 DocType: Purchase Invoice Item,PR Detail,PR Detil
 DocType: Sales Order,Fully Billed,Sepenuhnya Ditagih
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +20,Cash In Hand,Cash In Hand
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +72,Delivery warehouse required for stock item {0},Pengiriman gudang diperlukan untuk item saham {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +119,Delivery warehouse required for stock item {0},Pengiriman gudang diperlukan untuk item saham {0}
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),Berat kotor paket. Berat + kemasan biasanya net berat bahan. (Untuk mencetak)
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Pengguna dengan peran ini diperbolehkan untuk mengatur account beku dan membuat / memodifikasi entri akuntansi terhadap rekening beku
 DocType: Serial No,Is Cancelled,Apakah Dibatalkan
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +281,My Shipments,Pengiriman saya
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +286,My Shipments,Pengiriman saya
 DocType: Journal Entry,Bill Date,Bill Tanggal
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +43,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","Bahkan jika ada beberapa Aturan Harga dengan prioritas tertinggi, kemudian mengikuti prioritas internal diterapkan:"
 DocType: Supplier,Supplier Details,Pemasok Rincian
 DocType: Communication,Recipients,Penerima
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +146,Screwing,Meniduri
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +96,Knurling,Knurling
 DocType: Expense Claim,Approval Status,Status Persetujuan
 DocType: Hub Settings,Publish Items to Hub,Publikasikan Produk untuk Hub
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +44,From value must be less than to value in row {0},Dari nilai harus kurang dari nilai dalam baris {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +133,Wire Transfer,Transfer
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +133,Wire Transfer,Transfer
 apps/erpnext/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py +25,Please select Bank Account,Silakan pilih Rekening Bank
 DocType: Newsletter,Create and Send Newsletters,Membuat dan Kirim Nawala
 apps/frappe/frappe/public/js/frappe/views/reports/grid_report.js +305,From Date must be before To Date,Dari Tanggal harus sebelum To Date
@@ -2584,14 +2492,14 @@
 DocType: Company,Default Income Account,Akun Pendapatan standar
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,Kelompok Pelanggan / Pelanggan
 DocType: Item Group,Check this if you want to show in website,Periksa ini jika Anda ingin menunjukkan di website
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +190,Welcome to ERPNext,Selamat Datang di ERPNext
+,Welcome to ERPNext,Selamat Datang di ERPNext
 DocType: Payment Reconciliation Payment,Voucher Detail Number,Voucher Nomor Detil
 apps/erpnext/erpnext/config/crm.py +146,Lead to Quotation,Menyebabkan Quotation
 DocType: Lead,From Customer,Dari Pelanggan
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +37,Calls,Panggilan
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Calls,Panggilan
 DocType: Project,Total Costing Amount (via Time Logs),Jumlah Total Biaya (via Waktu Log)
 DocType: Purchase Order Item Supplied,Stock UOM,Stock UOM
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Purchase Order {0} is not submitted,Purchase Order {0} tidak disampaikan
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +194,Purchase Order {0} is not submitted,Purchase Order {0} tidak disampaikan
 ,Projected,Proyeksi
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},Serial ada {0} bukan milik Gudang {1}
 apps/erpnext/erpnext/controllers/status_updater.py +136,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Catatan: Sistem tidak akan memeriksa over-pengiriman dan over-booking untuk Item {0} kuantitas atau jumlah 0
@@ -2599,7 +2507,6 @@
 DocType: Issue,Opening Date,Tanggal pembukaan
 DocType: Journal Entry,Remark,Komentar
 DocType: Purchase Receipt Item,Rate and Amount,Rate dan Jumlah
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +95,Boring,Membosankan
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +667,From Sales Order,Dari Sales Order
 DocType: Blog Category,Parent Website Route,Parent Situs Route
 DocType: Sales Order,Not Billed,Tidak Ditagih
@@ -2613,19 +2520,17 @@
 apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount Amount,Jumlah Diskon
 DocType: Purchase Invoice,Return Against Purchase Invoice,Kembali Terhadap Pembelian Faktur
 DocType: Item,Warranty Period (in days),Masa Garansi (dalam hari)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +550,e.g. VAT,misalnya PPN
+apps/erpnext/erpnext/public/js/setup_wizard.js +292,e.g. VAT,misalnya PPN
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,Item 4
 DocType: Journal Entry Account,Journal Entry Account,Masuk Rekening Journal
 DocType: Shopping Cart Settings,Quotation Series,Quotation Series
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +52,"An item exists with same name ({0}), please change the item group name or rename the item","Sebuah item yang ada dengan nama yang sama ({0}), silakan mengubah nama kelompok barang atau mengubah nama item"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +82,Hot metal gas forming,Gas logam panas membentuk
 DocType: Sales Order Item,Sales Order Date,Sales Order Tanggal
 DocType: Sales Invoice Item,Delivered Qty,Disampaikan Qty
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +63,Warehouse {0}: Company is mandatory,Gudang {0}: Perusahaan wajib
 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.",Pergi ke kelompok yang sesuai (biasanya Sumber Dana&gt; Kewajiban Lancar&gt; Pajak dan Tugas dan membuat Akun baru (dengan mengklik Tambahkan Anak) tipe &quot;Pajak&quot; dan melakukan menyebutkan tingkat pajak.
 ,Payment Period Based On Invoice Date,Masa Pembayaran Berdasarkan Faktur Tanggal
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +50,Missing Currency Exchange Rates for {0},Hilang Kurs mata uang Tarif untuk {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +135,Laser cutting,Laser cutting
 DocType: Event,Monday,Senin
 DocType: Journal Entry,Stock Entry,Stock Entri
 DocType: Account,Payable,Hutang
@@ -2658,7 +2563,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +111,Date Of Retirement must be greater than Date of Joining,Tanggal Of Pensiun harus lebih besar dari Tanggal Bergabung
 DocType: Sales Invoice,Against Income Account,Terhadap Akun Pendapatan
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +69,{0}% Delivered,{0}% Terkirim
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +78,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Item {0}: qty Memerintahkan {1} tidak bisa kurang dari qty minimum order {2} (didefinisikan dalam Butir).
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Item {0}: qty Memerintahkan {1} tidak bisa kurang dari qty minimum order {2} (didefinisikan dalam Butir).
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Bulanan Persentase Distribusi
 DocType: Territory,Territory Targets,Target Wilayah
 DocType: Delivery Note,Transporter Info,Info Transporter
@@ -2667,7 +2572,6 @@
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,Judul untuk mencetak template misalnya Proforma Invoice.
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +140,Valuation type charges can not marked as Inclusive,Jenis penilaian biaya tidak dapat ditandai sebagai Inklusif
 DocType: POS Profile,Update Stock,Perbarui Stock
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +128,Superfinishing,Superfinishing
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,UOM berbeda untuk item akan menyebabkan salah (Total) Nilai Berat Bersih. Pastikan Berat Bersih dari setiap item di UOM sama.
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM Tingkat
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +85,Please pull items from Delivery Note,Silakan tarik item dari Pengiriman Note
@@ -2682,7 +2586,6 @@
 ,Purchase Analytics,Pembelian Analytics
 DocType: Sales Invoice Item,Delivery Note Item,Pengiriman Barang Note
 DocType: Expense Claim,Task,Tugas
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +57,Shaving,Cukur
 DocType: Purchase Taxes and Charges,Reference Row #,Referensi Row #
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},Nomor batch adalah wajib untuk Item {0}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js +14,This is a root sales person and cannot be edited.,Ini adalah orang penjualan akar dan tidak dapat diedit.
@@ -2694,13 +2597,11 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +74,Purpose must be one of {0},Tujuan harus menjadi salah satu {0}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +108,Fill the form and save it,Isi formulir dan menyimpannya
 DocType: Production Planning Tool,Download a report containing all raw materials with their latest inventory status,Download laporan yang berisi semua bahan baku dengan status persediaan terbaru mereka
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +94,Facing,Menghadapi
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,Forum Komunitas
 DocType: Leave Application,Leave Balance Before Application,Tinggalkan Saldo Sebelum Aplikasi
 DocType: SMS Center,Send SMS,Kirim SMS
 DocType: Company,Default Letter Head,Standar Surat Kepala
 DocType: Time Log,Billable,Dapat ditagih
-DocType: Authorization Rule,This will be used for setting rule in HR module,Ini akan digunakan untuk menetapkan aturan dalam modul HR
 DocType: Account,Rate at which this tax is applied,Tingkat di mana pajak ini diterapkan
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reorder Qty,Susun ulang Qty
 DocType: Company,Stock Adjustment Account,Penyesuaian Stock Akun
@@ -2727,16 +2628,15 @@
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,Persentase Alokasi harus sama dengan 100%
 DocType: Serial No,Out of AMC,Dari AMC
 DocType: Purchase Order Item,Material Request Detail No,Permintaan Detil Material ada
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +97,Hard turning,Keras balik
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +33,Make Maintenance Visit,Membuat Maintenance Visit
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +187,Please contact to the user who have Sales Master Manager {0} role,Silahkan hubungi untuk pengguna yang memiliki penjualan Guru Manajer {0} peran
 DocType: Company,Default Cash Account,Standar Rekening Kas
 apps/erpnext/erpnext/config/accounts.py +79,Company (not Customer or Supplier) master.,Perusahaan (tidak Pelanggan atau Pemasok) Master.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +106,Please enter 'Expected Delivery Date',Masukkan 'Diharapkan Pengiriman Tanggal'
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +187,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Catatan pengiriman {0} harus dibatalkan sebelum membatalkan Sales Order ini
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +100,Please enter 'Expected Delivery Date',Masukkan 'Diharapkan Pengiriman Tanggal'
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +182,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Catatan pengiriman {0} harus dibatalkan sebelum membatalkan Sales Order ini
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +373,Paid amount + Write Off Amount can not be greater than Grand Total,Jumlah yang dibayarkan + Write Off Jumlah tidak bisa lebih besar dari Grand Total
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} tidak Nomor Batch berlaku untuk barang {1}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,Note: There is not enough leave balance for Leave Type {0},Catatan: Tidak ada saldo cuti cukup bagi Leave Type {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +124,Note: There is not enough leave balance for Leave Type {0},Catatan: Tidak ada saldo cuti cukup bagi Leave Type {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.","Catatan: Jika pembayaran tidak dilakukan terhadap setiap referensi, membuat Journal Masuk manual."
 DocType: Item,Supplier Items,Pemasok Produk
 DocType: Opportunity,Opportunity Type,Peluang Type
@@ -2748,7 +2648,7 @@
 DocType: Hub Settings,Publish Availability,Publikasikan Ketersediaan
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +105,Date of Birth cannot be greater than today.,Tanggal Lahir tidak dapat lebih besar dari saat ini.
 ,Stock Ageing,Stock Penuaan
-apps/erpnext/erpnext/controllers/accounts_controller.py +200,{0} '{1}' is disabled,{0} '{1}' dinonaktifkan
+apps/erpnext/erpnext/controllers/accounts_controller.py +201,{0} '{1}' is disabled,{0} '{1}' dinonaktifkan
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Ditetapkan sebagai Terbuka
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Kirim email otomatis ke Kontak transaksi Mengirimkan.
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +232,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
@@ -2758,44 +2658,38 @@
 DocType: Purchase Order,Customer Contact Email,Email Kontak Pelanggan
 DocType: Event,Sunday,Minggu
 DocType: Sales Team,Contribution (%),Kontribusi (%)
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +455,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,Catatan: Entry Pembayaran tidak akan dibuat karena 'Cash atau Rekening Bank tidak ditentukan
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +171,Responsibilities,Tanggung Jawab
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +457,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,Catatan: Entry Pembayaran tidak akan dibuat karena 'Cash atau Rekening Bank tidak ditentukan
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +171,Responsibilities,Tanggung Jawab
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Template,Contoh
 DocType: Sales Person,Sales Person Name,Penjualan Person Nama
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,Masukkan minimal 1 faktur dalam tabel
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +511,Add Users,Tambahkan Pengguna
+apps/erpnext/erpnext/public/js/setup_wizard.js +255,Add Users,Tambahkan Pengguna
 DocType: Pricing Rule,Item Group,Item Grup
 DocType: Task,Actual Start Date (via Time Logs),Sebenarnya Tanggal Mulai (via Waktu Log)
 DocType: Stock Reconciliation Item,Before reconciliation,Sebelum rekonsiliasi
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +12,To {0},Untuk {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Pajak dan Biaya Ditambahkan (Perusahaan Mata Uang)
-apps/erpnext/erpnext/stock/doctype/item/item.py +340,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Item Pajak Row {0} harus memiliki akun Pajak jenis atau Penghasilan atau Beban atau Dibebankan
+apps/erpnext/erpnext/stock/doctype/item/item.py +344,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Item Pajak Row {0} harus memiliki akun Pajak jenis atau Penghasilan atau Beban atau Dibebankan
 DocType: Sales Order,Partly Billed,Sebagian Ditagih
 DocType: Item,Default BOM,Standar BOM
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +79,Decambering,Decambering
 apps/erpnext/erpnext/setup/doctype/company/company.js +22,Please re-type company name to confirm,Mohon tipe nama perusahaan untuk mengkonfirmasi
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,Jumlah Posisi Amt
 DocType: Time Log Batch,Total Hours,Jumlah Jam
 DocType: Journal Entry,Printing Settings,Pengaturan pencetakan
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +268,Total Debit must be equal to Total Credit. The difference is {0},Jumlah Debit harus sama dengan total kredit. Perbedaannya adalah {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +11,Automotive,Otomotif
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +37,Item is required,Item diperlukan
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +25,Metal injection molding,Logam injection molding
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +258,Total Debit must be equal to Total Credit. The difference is {0},Jumlah Debit harus sama dengan total kredit. Perbedaannya adalah {0}
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,Otomotif
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +684,From Delivery Note,Dari Delivery Note
 DocType: Time Log,From Time,Dari Waktu
 DocType: Notification Control,Custom Message,Custom Pesan
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +33,Investment Banking,Perbankan Investasi
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +261,"Select your Country, Time Zone and Currency","Pilih Negara Anda, Time Zone dan Mata Uang"
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,Perbankan Investasi
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +316,"Select your Country, Time Zone and Currency","Pilih Negara Anda, Time Zone dan Mata Uang"
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +369,Cash or Bank Account is mandatory for making payment entry,Kas atau Rekening Bank wajib untuk membuat entri pembayaran
 DocType: Purchase Invoice,Price List Exchange Rate,Daftar Harga Tukar
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +91,Pickling,Pengawetan
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +18,Sand casting,Pengecoran pasir
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +117,Electroplating,Electroplating
 DocType: Purchase Invoice Item,Rate,Menilai
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +62,Intern,Menginternir
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Intern,Menginternir
 DocType: Newsletter,A Lead with this email id should exist,Sebuah Lead dengan id email ini harus ada
 DocType: Stock Entry,From BOM,Dari BOM
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +34,Basic,Dasar
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +34,Basic,Dasar
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,Transaksi saham sebelum {0} dibekukan
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +217,Please click on 'Generate Schedule',Silahkan klik 'Menghasilkan Jadwal'
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +61,To Date should be same as From Date for Half Day leave,Untuk tanggal harus sama dengan Dari Tanggal untuk cuti Half Day
@@ -2803,11 +2697,11 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +96,Reference No is mandatory if you entered Reference Date,Referensi ada adalah wajib jika Anda memasukkan Referensi Tanggal
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +108,Date of Joining must be greater than Date of Birth,Tanggal Bergabung harus lebih besar dari Tanggal Lahir
 DocType: Salary Structure,Salary Structure,Struktur Gaji
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +242,"Multiple Price Rule exists with same criteria, please resolve \
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +246,"Multiple Price Rule exists with same criteria, please resolve \
 			conflict by assigning priority. Price Rules: {0}","Beberapa Aturan Harga ada dengan kriteria yang sama, silakan menyelesaikan \
  konflik dengan menetapkan prioritas. Harga Aturan: {0}"
 DocType: Account,Bank,Bank
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +9,Airline,Maskapai Penerbangan
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,Maskapai Penerbangan
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +493,Issue Material,Isu Material
 DocType: Material Request Item,For Warehouse,Untuk Gudang
 DocType: Employee,Offer Date,Penawaran Tanggal
@@ -2817,29 +2711,24 @@
 DocType: Item,Is Fixed Asset Item,Apakah Fixed Asset Barang
 DocType: Stock Entry,Including items for sub assemblies,Termasuk item untuk sub rakitan
 DocType: Features Setup,"If you have long print formats, this feature can be used to split the page to be printed on multiple pages with all headers and footers on each page","Jika Anda memiliki format cetak yang panjang, fitur ini dapat digunakan untuk membagi halaman yang akan dicetak pada beberapa halaman dengan semua header dan footer pada setiap halaman"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +131,Hobbing,Hobbing
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +98,All Territories,Semua Wilayah
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +98,All Territories,Semua Wilayah
 DocType: Purchase Invoice,Items,Items
 DocType: Fiscal Year,Year Name,Nama Tahun
 DocType: Process Payroll,Process Payroll,Proses Payroll
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +59,There are more holidays than working days this month.,Ada lebih dari hari kerja libur bulan ini.
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +68,There are more holidays than working days this month.,Ada lebih dari hari kerja libur bulan ini.
 DocType: Product Bundle Item,Product Bundle Item,Produk Bundle Barang
 DocType: Sales Partner,Sales Partner Name,Penjualan Mitra Nama
 DocType: Purchase Invoice Item,Image View,Citra Tampilan
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +113,Finishing & industrial finishing,Finishing &amp; menyelesaikan industri
 DocType: Issue,Opening Time,Membuka Waktu
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,Dari dan Untuk tanggal yang Anda inginkan
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +46,Securities & Commodity Exchanges,Efek & Bursa Komoditi
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Efek & Bursa Komoditi
 DocType: Shipping Rule,Calculate Based On,Hitung Berbasis On
 DocType: Delivery Note Item,From Warehouse,Dari Gudang
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +98,Drilling,Pengeboran
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +28,Blow molding,Blow molding
 DocType: Purchase Taxes and Charges,Valuation and Total,Penilaian dan Total
 DocType: Tax Rule,Shipping City,Pengiriman Kota
 apps/erpnext/erpnext/stock/doctype/item/item.js +43,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,Barang ini adalah Varian dari {0} (Template). Atribut akan disalin dari template kecuali 'No Copy' diatur
 DocType: Account,Purchase User,Pembelian Pengguna
 DocType: Notification Control,Customize the Notification,Sesuaikan Pemberitahuan
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +87,Hammering,Tempa
 DocType: Web Page,Slideshow,Rangkai Salindia
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +24,Default Address Template cannot be deleted,Template Default Address tidak bisa dihapus
 DocType: Sales Invoice,Shipping Rule,Aturan Pengiriman
@@ -2848,9 +2737,8 @@
 DocType: Workflow State,Search,Pencarian
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +54,Total cannot be zero,Jumlah tidak boleh nol
 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,'Hari Sejak Pemesanan terakhir' harus lebih besar dari atau sama dengan nol
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +142,Brazing,Mematri
 DocType: C-Form,Amended From,Diubah Dari
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Raw Material,Bahan Baku
+apps/erpnext/erpnext/public/js/setup_wizard.js +359,Raw Material,Bahan Baku
 DocType: Leave Application,Follow via Email,Ikuti via Email
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Jumlah pajak Setelah Diskon Jumlah
 apps/erpnext/erpnext/accounts/doctype/account/account.py +174,Child account exists for this account. You can not delete this account.,Akun anak ada untuk akun ini. Anda tidak dapat menghapus akun ini.
@@ -2864,10 +2752,10 @@
 ,Produced,Diproduksi
 DocType: Item,Item Code for Suppliers,Item Code untuk Pemasok
 DocType: Issue,Raised By (Email),Dibesarkan Oleh (Email)
-apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +72,General,Umum
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +495,Attach Letterhead,Lampirkan Surat
+apps/erpnext/erpnext/setup/setup_wizard/default_website.py +72,General,Umum
+apps/erpnext/erpnext/public/js/setup_wizard.js +241,Attach Letterhead,Lampirkan Surat
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +272,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',Tidak bisa mengurangi ketika kategori adalah untuk 'Penilaian' atau 'Penilaian dan Total'
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +542,"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.","Daftar kepala pajak Anda (misalnya PPN, Bea Cukai dll, mereka harus memiliki nama yang unik) dan tarif standar mereka. Ini akan membuat template standar, yang dapat Anda edit dan menambahkan lagi nanti."
+apps/erpnext/erpnext/public/js/setup_wizard.js +284,"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.","Daftar kepala pajak Anda (misalnya PPN, Bea Cukai dll, mereka harus memiliki nama yang unik) dan tarif standar mereka. Ini akan membuat template standar, yang dapat Anda edit dan menambahkan lagi nanti."
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial Nos Required for Serialized Item {0},Serial Nos Diperlukan untuk Serial Barang {0}
 DocType: Journal Entry,Bank Entry,Bank Masuk
 DocType: Authorization Rule,Applicable To (Designation),Berlaku Untuk (Penunjukan)
@@ -2876,33 +2764,32 @@
 apps/erpnext/erpnext/config/accounts.py +143,Enable / disable currencies.,Mengaktifkan / menonaktifkan mata uang.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Postal Expenses,Beban pos
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Total (Amt)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +26,Entertainment & Leisure,Hiburan & Kenyamanan
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,Hiburan & Kenyamanan
 DocType: Purchase Order,The date on which recurring order will be stop,Tanggal perintah berulang akan berhenti
 DocType: Quality Inspection,Item Serial No,Item Serial No
 apps/erpnext/erpnext/controllers/status_updater.py +142,{0} must be reduced by {1} or you should increase overflow tolerance,{0} harus dikurangi oleh {1} atau Anda harus meningkatkan toleransi overflow
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Present,Total Hadir
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Hour,Jam
+apps/erpnext/erpnext/public/js/setup_wizard.js +363,Hour,Jam
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +138,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation","Serial Barang {0} tidak dapat diperbarui \
  menggunakan Stock Rekonsiliasi"
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +488,Transfer Material to Supplier,Mentransfer Bahan untuk Pemasok
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +513,Transfer Material to Supplier,Mentransfer Bahan untuk Pemasok
 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,Baru Serial ada tidak dapat memiliki Gudang. Gudang harus diatur oleh Bursa Masuk atau Penerimaan Pembelian
 DocType: Lead,Lead Type,Timbal Type
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +82,Create Quotation,Buat Quotation
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +306,All these items have already been invoiced,Semua barang-barang tersebut telah ditagih
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,You are not authorized to approve leaves on Block Dates,Anda tidak berwenang untuk menyetujui daun di Blok Tanggal
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +311,All these items have already been invoiced,Semua barang-barang tersebut telah ditagih
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},Dapat disetujui oleh {0}
 DocType: Shipping Rule,Shipping Rule Conditions,Aturan Pengiriman Kondisi
 DocType: BOM Replace Tool,The new BOM after replacement,The BOM baru setelah penggantian
 DocType: Features Setup,Point of Sale,Point of Sale
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +83,Curling,Keriting
 DocType: Account,Tax,PPN
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +28,Row {0}: {1} is not a valid {2},Baris {0}: {1} tidak valid {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +89,Refining,Pengilangan
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +37,Row {0}: {1} is not a valid {2},Baris {0}: {1} tidak valid {2}
 DocType: Production Planning Tool,Production Planning Tool,Alat Perencanaan Produksi
 DocType: Quality Inspection,Report Date,Tanggal Laporan
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +130,Routing,Rute
 DocType: C-Form,Invoices,Faktur
 DocType: Job Opening,Job Title,Jabatan
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +54,{0} already allocated for Employee {1} for period {2} - {3},{0} sudah dialokasikan untuk Karyawan {1} untuk periode {2} - {3}
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +80,{0} Recipients,{0} Penerima
 DocType: Features Setup,Item Groups in Details,Item Grup dalam Rincian
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +335,Quantity to Manufacture must be greater than 0.,Kuantitas untuk Industri harus lebih besar dari 0.
@@ -2920,14 +2807,13 @@
 DocType: DocType,Setup,Pengaturan
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,Tidak ada yang mengedit.
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +108,Summary for this month and pending activities,Ringkasan untuk bulan ini dan kegiatan yang tertunda
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +39,Cold rolling,Cold rolling
 DocType: Customer Group,Customer Group Name,Nama Kelompok Pelanggan
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +408,Please remove this Invoice {0} from C-Form {1},Hapus Invoice ini {0} dari C-Form {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +410,Please remove this Invoice {0} from C-Form {1},Hapus Invoice ini {0} dari C-Form {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,Silakan pilih Carry Teruskan jika Anda juga ingin menyertakan keseimbangan fiskal tahun sebelumnya daun tahun fiskal ini
 DocType: GL Entry,Against Voucher Type,Terhadap Tipe Voucher
 DocType: Item,Attributes,Atribut
 DocType: Packing Slip,Get Items,Dapatkan Produk
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +186,Please enter Write Off Account,Cukup masukkan Write Off Akun
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +187,Please enter Write Off Account,Cukup masukkan Write Off Akun
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +71,Last Order Date,Pesanan terakhir Tanggal
 DocType: DocField,Image,Gambar
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +179,Make Excise Invoice,Membuat Cukai Faktur
@@ -2937,7 +2823,7 @@
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +146,Operation ID not set,ID operasi tidak diatur
 DocType: Production Order,Planned Start Date,Direncanakan Tanggal Mulai
 DocType: Serial No,Creation Document Type,Pembuatan Dokumen Type
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +620,Maint. Visit,Maint. Kunjungan
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +631,Maint. Visit,Maint. Kunjungan
 DocType: Leave Type,Is Encash,Apakah menjual
 DocType: Purchase Invoice,Mobile No,Ponsel Tidak ada
 DocType: Payment Tool,Make Journal Entry,Membuat Jurnal Entri
@@ -2945,35 +2831,31 @@
 apps/erpnext/erpnext/controllers/trends.py +257,Project-wise data is not available for Quotation,Data proyek-bijaksana tidak tersedia untuk Quotation
 DocType: Project,Expected End Date,Diharapkan Tanggal Akhir
 DocType: Appraisal Template,Appraisal Template Title,Judul Template Penilaian
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +440,Commercial,Komersial
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +378,Commercial,Komersial
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +23,Parent Item {0} must not be a Stock Item,Induk Barang {0} tidak harus menjadi Stok Item
 DocType: Cost Center,Distribution Id,Id Distribusi
-apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +14,Awesome Services,Layanan mengagumkan
+apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +14,Awesome Services,Layanan mengagumkan
 apps/erpnext/erpnext/config/manufacturing.py +29,All Products or Services.,Semua Produk atau Jasa.
 DocType: Purchase Invoice,Supplier Address,Pemasok Alamat
 DocType: Contact Us Settings,Address Line 2,Alamat Baris 2
 DocType: ToDo,Reference,Referensi
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +59,Perforating,Perforating
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,Out Qty
 apps/erpnext/erpnext/config/accounts.py +128,Rules to calculate shipping amount for a sale,Aturan untuk menghitung jumlah pengiriman untuk penjualan
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +29,Series is mandatory,Series adalah wajib
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +28,Financial Services,Jasa Keuangan
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,Jasa Keuangan
 apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3},Nilai untuk Atribut {0} harus berada dalam kisaran {1} ke {2} dalam penambahan sebesar {3}
 DocType: Tax Rule,Sales,Penjualan
 DocType: Stock Entry Detail,Basic Amount,Dasar Jumlah
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +173,Warehouse required for stock Item {0},Gudang diperlukan untuk stok Barang {0}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +178,Warehouse required for stock Item {0},Gudang diperlukan untuk stok Barang {0}
 DocType: Leave Allocation,Unused leaves,Daun terpakai
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,Cr
 DocType: Customer,Default Receivable Accounts,Standar Piutang Account
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +102,Sawing,Menggergaji
 DocType: Tax Rule,Billing State,Negara penagihan
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +32,Laminating,Laminating
 DocType: Item Reorder,Transfer,Transfer
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +549,Fetch exploded BOM (including sub-assemblies),Fetch meledak BOM (termasuk sub-rakitan)
 DocType: Authorization Rule,Applicable To (Employee),Berlaku Untuk (Karyawan)
 apps/erpnext/erpnext/controllers/accounts_controller.py +101,Due Date is mandatory,Due Date adalah wajib
 apps/erpnext/erpnext/controllers/item_variant.py +51,Increment for Attribute {0} cannot be 0,Kenaikan untuk Atribut {0} tidak dapat 0
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +143,Sintering,Sintering
 DocType: Journal Entry,Pay To / Recd From,Pay To / RECD Dari
 DocType: Naming Series,Setup Series,Pengaturan Series
 DocType: Supplier,Contact HTML,Hubungi HTML
@@ -2986,7 +2868,6 @@
 DocType: Attendance,Absent,Absen
 DocType: Product Bundle,Product Bundle,Bundle Produk
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +180,Row {0}: Invalid reference {1},Row {0}: referensi tidak valid {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +165,Crushing,Penghancuran
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Membeli Pajak dan Biaya Template
 DocType: Upload Attendance,Download Template,Download Template
 DocType: GL Entry,Remarks,Keterangan
@@ -2994,14 +2875,12 @@
 DocType: Journal Entry,Write Off Based On,Menulis Off Berbasis On
 DocType: Features Setup,POS View,Lihat POS
 apps/erpnext/erpnext/config/stock.py +38,Installation record for a Serial No.,Catatan instalasi untuk No Serial
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +9,Continuous casting,Pengecoran kontinu
 apps/erpnext/erpnext/public/js/queries.js +39,Please specify a,Silakan tentukan
 DocType: Offer Letter,Awaiting Response,Menunggu Respon
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +53,Above,Di atas
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +80,Cold sizing,Sizing Dingin
 DocType: Salary Slip,Earning & Deduction,Earning & Pengurangan
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +76,Account {0} cannot be a Group,Akun {0} tidak dapat menjadi akun Grup
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +259,Region,Daerah
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +314,Region,Daerah
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +213,Optional. This setting will be used to filter in various transactions.,Opsional. Pengaturan ini akan digunakan untuk menyaring dalam berbagai transaksi.
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +104,Negative Valuation Rate is not allowed,Tingkat Penilaian negatif tidak diperbolehkan
 DocType: Holiday List,Weekly Off,Weekly Off
@@ -3019,7 +2898,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,Account {0} is inactive,Akun {0} tidak aktif
 DocType: GL Entry,Is Advance,Apakah Muka
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,Kehadiran Dari Tanggal dan Kehadiran Sampai Tanggal adalah wajib
-apps/erpnext/erpnext/controllers/buying_controller.py +131,Please enter 'Is Subcontracted' as Yes or No,Masukkan 'Apakah subkontrak' sebagai Ya atau Tidak
+apps/erpnext/erpnext/controllers/buying_controller.py +122,Please enter 'Is Subcontracted' as Yes or No,Masukkan 'Apakah subkontrak' sebagai Ya atau Tidak
 DocType: Sales Team,Contact No.,Hubungi Nomor
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,'Profit and Loss' type account {0} not allowed in Opening Entry,Tipe akun 'Laba Rugi' {0} tidak diperbolehkan dalam Entri Saldo Awal
 DocType: Workflow State,Time,Durasi
@@ -3028,14 +2907,13 @@
 DocType: Authorization Rule,Authorization Rule,Regulasi Autorisasi
 DocType: Sales Invoice,Terms and Conditions Details,Syarat dan Ketentuan Detail
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,Penjualan Pajak dan Biaya Template
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +10,Apparel & Accessories,Pakaian & Aksesoris
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,Pakaian & Aksesoris
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +67,Number of Order,Jumlah Pesanan
 DocType: Item Group,HTML / Banner that will show on the top of product list.,HTML / Banner yang akan muncul di bagian atas daftar produk.
 DocType: Shipping Rule,Specify conditions to calculate shipping amount,Tentukan kondisi untuk menghitung jumlah pengiriman
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +121,Add Child,Tambah Anak
 DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,Peran Diizinkan Set Beku Account & Edit Frozen Entri
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +52,Cannot convert Cost Center to ledger as it has child nodes,Tidak dapat mengkonversi Biaya Center untuk buku karena memiliki node anak
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +47,Conversion Factor is required,Faktor konversi diperlukan
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +37,Serial #,Serial #
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +87,Commission on Sales,Komisi Penjualan
 DocType: Offer Letter Term,Value / Description,Nilai / Keterangan
@@ -3043,10 +2921,8 @@
 ,Customers Not Buying Since Long Time,Pelanggan Tidak Membeli Sejak Long Time
 DocType: Production Order,Expected Delivery Date,Diharapkan Pengiriman Tanggal
 apps/erpnext/erpnext/accounts/general_ledger.py +121,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Debit dan Kredit tidak sama untuk {0} # {1}. Perbedaan adalah {2}.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +48,Bulging,Menonjol
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +11,Evaporative-pattern casting,Menguapkan-pola pengecoran
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Entertainment Expenses,Beban Hiburan
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +195,Sales Invoice {0} must be cancelled before cancelling this Sales Order,Faktur Penjualan {0} harus dibatalkan sebelum membatalkan Sales Order ini
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +190,Sales Invoice {0} must be cancelled before cancelling this Sales Order,Faktur Penjualan {0} harus dibatalkan sebelum membatalkan Sales Order ini
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +61,Age,Usia
 DocType: Time Log,Billing Amount,Penagihan Jumlah
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +84,Invalid quantity specified for item {0}. Quantity should be greater than 0.,Kuantitas tidak valid untuk item {0}. Jumlah harus lebih besar dari 0.
@@ -3065,26 +2941,24 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,New Pendapatan Pelanggan
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Travel Expenses,Biaya Perjalanan
 DocType: Maintenance Visit,Breakdown,Rincian
-apps/erpnext/erpnext/controllers/accounts_controller.py +241,Account: {0} with currency: {1} can not be selected,Account: {0} dengan mata: {1} tidak dapat dipilih
+apps/erpnext/erpnext/controllers/accounts_controller.py +242,Account: {0} with currency: {1} can not be selected,Account: {0} dengan mata: {1} tidak dapat dipilih
 DocType: Bank Reconciliation Detail,Cheque Date,Cek Tanggal
 apps/erpnext/erpnext/accounts/doctype/account/account.py +47,Account {0}: Parent account {1} does not belong to company: {2},Akun {0}: akun Induk {1} bukan milik perusahaan: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted all transactions related to this company!,Berhasil dihapus semua transaksi yang terkait dengan perusahaan ini!
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,Seperti pada Tanggal
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +111,Honing,Mengasah
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +58,Probation,Percobaan
-apps/erpnext/erpnext/stock/doctype/item/item.py +264,Default Warehouse is mandatory for stock Item.,Standar Warehouse adalah wajib bagi saham Barang.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Probation,Percobaan
+apps/erpnext/erpnext/stock/doctype/item/item.py +268,Default Warehouse is mandatory for stock Item.,Standar Warehouse adalah wajib bagi saham Barang.
 DocType: Feed,Full Name,Nama Lengkap
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +148,Clinching,Meraih
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +191,Payment of salary for the month {0} and year {1},Pembayaran gaji untuk bulan {0} dan tahun {1}
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +173,Payment of salary for the month {0} and year {1},Pembayaran gaji untuk bulan {0} dan tahun {1}
 DocType: Stock Settings,Auto insert Price List rate if missing,Insert auto tingkat Daftar Harga jika hilang
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,Jumlah Total Dibayar
 ,Transferred Qty,Ditransfer Qty
 apps/erpnext/erpnext/config/learn.py +11,Navigating,Menjelajahi
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +137,Planning,Perencanaan
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +137,Planning,Perencanaan
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +9,Make Time Log Batch,Membuat Waktu Log Batch
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Issued,Diterbitkan
 DocType: Project,Total Billing Amount (via Time Logs),Jumlah Total Tagihan (via Waktu Log)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +629,We sell this Item,Kami menjual item ini
+apps/erpnext/erpnext/public/js/setup_wizard.js +365,We sell this Item,Kami menjual item ini
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +65,Supplier Id,Pemasok Id
 DocType: Journal Entry,Cash Entry,Masuk Kas
 DocType: Sales Partner,Contact Desc,Contact Info
@@ -3093,18 +2967,16 @@
 DocType: Brand,Item Manager,Item Manajer
 DocType: Cost Center,Add rows to set annual budgets on Accounts.,Tambahkan baris untuk mengatur akun anggaran tahunan.
 DocType: Buying Settings,Default Supplier Type,Standar Pemasok Type
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +160,Quarrying,Penggalian
 DocType: Production Order,Total Operating Cost,Total Biaya Operasional
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +160,Note: Item {0} entered multiple times,Catatan: Barang {0} masuk beberapa kali
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +163,Note: Item {0} entered multiple times,Catatan: Barang {0} masuk beberapa kali
 apps/erpnext/erpnext/config/crm.py +27,All Contacts.,Semua Kontak.
 DocType: Newsletter,Test Email Id,Uji Email Id
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +394,Company Abbreviation,Singkatan Perusahaan
+apps/erpnext/erpnext/public/js/setup_wizard.js +142,Company Abbreviation,Singkatan Perusahaan
 DocType: Features Setup,If you follow Quality Inspection. Enables Item QA Required and QA No in Purchase Receipt,Jika Anda mengikuti Inspeksi Kualitas. Memungkinkan Barang QA Diperlukan dan QA ada di Penerimaan Pembelian
 DocType: GL Entry,Party Type,Type Partai
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +68,Raw material cannot be same as main Item,Bahan baku tidak bisa sama dengan Butir utama
 DocType: Item Attribute Value,Abbreviation,Singkatan
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,Tidak Authroized sejak {0} melebihi batas
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +30,Rotational molding,Molding rotasi
 apps/erpnext/erpnext/config/hr.py +115,Salary template master.,Master Gaji Template.
 DocType: Leave Type,Max Days Leave Allowed,Max Hari Cuti Diizinkan
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +55,Set Tax Rule for shopping cart,Set Peraturan Pajak untuk keranjang belanja
@@ -3118,15 +2990,15 @@
 apps/erpnext/erpnext/config/selling.py +18,Quotes to Leads or Customers.,Harga untuk Memimpin atau Pelanggan.
 DocType: Stock Settings,Role Allowed to edit frozen stock,Peran Diizinkan untuk mengedit saham beku
 ,Territory Target Variance Item Group-Wise,Wilayah Sasaran Variance Barang Group-Wise
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +101,All Customer Groups,Semua Grup Pelanggan
-apps/erpnext/erpnext/controllers/accounts_controller.py +474,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} adalah wajib. Mungkin data rekaman kurs mata uang tidak dibuat untuk {1} ke {2}.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +101,All Customer Groups,Semua Grup Pelanggan
+apps/erpnext/erpnext/controllers/accounts_controller.py +475,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} adalah wajib. Mungkin data rekaman kurs mata uang tidak dibuat untuk {1} ke {2}.
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +37,Tax Template is mandatory.,Template pajak adalah wajib.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +41,Account {0}: Parent account {1} does not exist,Akun {0}: akun Induk {1} tidak ada
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Daftar Harga Rate (Perusahaan Mata Uang)
 DocType: Account,Temporary,Sementara
 DocType: Address,Preferred Billing Address,Disukai Alamat Penagihan
 DocType: Monthly Distribution Percentage,Percentage Allocation,Persentase Alokasi
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +86,Secretary,Sekretaris
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Secretary,Sekretaris
 DocType: Serial No,Distinct unit of an Item,Unit berbeda Item
 DocType: Pricing Rule,Buying,Pembelian
 DocType: HR Settings,Employee Records to be created by,Rekaman Karyawan yang akan dibuat oleh
@@ -3139,9 +3011,8 @@
 ,Item-wise Price List Rate,Barang-bijaksana Daftar Harga Tingkat
 DocType: Purchase Order Item,Supplier Quotation,Pemasok Quotation
 DocType: Quotation,In Words will be visible once you save the Quotation.,Dalam Kata-kata akan terlihat sekali Anda menyimpan Quotation tersebut.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +68,Ironing,Setrika
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is stopped,{0} {1} dihentikan
-apps/erpnext/erpnext/stock/doctype/item/item.py +352,Barcode {0} already used in Item {1},Barcode {0} sudah digunakan dalam Butir {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +356,Barcode {0} already used in Item {1},Barcode {0} sudah digunakan dalam Butir {1}
 DocType: Lead,Add to calendar on this date,Tambahkan ke kalender pada tanggal ini
 apps/erpnext/erpnext/config/selling.py +132,Rules for adding shipping costs.,Aturan untuk menambahkan biaya pengiriman.
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,Acara Mendatang
@@ -3150,13 +3021,12 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +27,Quick Entry,Entri Cepat
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0} adalah wajib bagi Kembali
 DocType: Purchase Order,To Receive,Menerima
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +33,Shrink fitting,Kecilkan pas
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +522,user@example.com,user@example.com
+apps/erpnext/erpnext/public/js/setup_wizard.js +266,user@example.com,user@example.com
 DocType: Email Digest,Income / Expense,Penghasilan / Beban
 DocType: Employee,Personal Email,Email Pribadi
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +58,Total Variance,Total Variance
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +62,Total Variance,Total Variance
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.","Jika diaktifkan, sistem akan posting entri akuntansi untuk persediaan otomatis."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +15,Brokerage,Memperantarai
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +15,Brokerage,Memperantarai
 DocType: Address,Postal Code,kode Pos
 DocType: Production Order Operation,"in Minutes
 Updated via 'Time Log'","di Menit 
@@ -3164,14 +3034,13 @@
 DocType: Customer,From Lead,Dari Timbal
 apps/erpnext/erpnext/config/manufacturing.py +19,Orders released for production.,Pesanan dirilis untuk produksi.
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +42,Select Fiscal Year...,Pilih Tahun Anggaran ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +442,POS Profile required to make POS Entry,POS Profil diperlukan untuk membuat POS Masuk
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +444,POS Profile required to make POS Entry,POS Profil diperlukan untuk membuat POS Masuk
 DocType: Hub Settings,Name Token,Nama Token
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +106,Planing,Perencanaan
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Selling,Standard Jual
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +120,Standard Selling,Standard Jual
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +137,Atleast one warehouse is mandatory,Setidaknya satu gudang adalah wajib
 DocType: Serial No,Out of Warranty,Out of Garansi
 DocType: BOM Replace Tool,Replace,Mengganti
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +314,{0} against Sales Invoice {1},{0} terhadap Faktur Penjualan {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +316,{0} against Sales Invoice {1},{0} terhadap Faktur Penjualan {1}
 apps/erpnext/erpnext/stock/doctype/item/item.py +49,Please enter default Unit of Measure,Masukkan Satuan default Ukur
 DocType: Purchase Invoice Item,Project Name,Nama Proyek
 DocType: Supplier,Mention if non-standard receivable account,Menyebutkan jika non-standar piutang
@@ -3187,9 +3056,8 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,Journal Entry {0} does not have account {1} or already matched against other voucher,Jurnal Entri {0} tidak memiliki akun {1} atau sudah dicocokkan voucher lainnya
 DocType: Item,Moving Average,Moving Average
 DocType: BOM Replace Tool,The BOM which will be replaced,BOM yang akan diganti
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +43,New Stock UOM must be different from current stock UOM,New Stock UOM harus berbeda dari UOM saham saat ini
 DocType: Account,Debit,Debet
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +34,Leaves must be allocated in multiples of 0.5,"Daun harus dialokasikan dalam kelipatan 0,5"
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +44,Leaves must be allocated in multiples of 0.5,"Daun harus dialokasikan dalam kelipatan 0,5"
 DocType: Production Order,Operation Cost,Biaya Operasi
 apps/erpnext/erpnext/config/hr.py +71,Upload attendance from a .csv file,Upload kehadiran dari file csv.
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,Posisi Amt
@@ -3207,8 +3075,7 @@
 DocType: Employee,Internal Work History,Sejarah Kerja internal
 DocType: DocField,Column Break,Kolom Istirahat
 DocType: Event,Thursday,Kamis
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +42,Private Equity,Private Equity
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +93,Turning,Putar
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,Private Equity
 DocType: Maintenance Visit,Customer Feedback,Pelanggan Umpan
 DocType: Account,Expense,Biaya
 DocType: Sales Invoice,Exhibition,Pameran
@@ -3221,19 +3088,19 @@
 DocType: Employee,Held On,Diadakan Pada
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +33,Production Item,Produksi Barang
 ,Employee Information,Informasi Karyawan
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,Rate (%),Rate (%)
+apps/erpnext/erpnext/public/js/setup_wizard.js +294,Rate (%),Rate (%)
 DocType: Stock Entry Detail,Additional Cost,Biaya tambahan
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +407,Financial Year End Date,Tahun Keuangan Akhir Tanggal
+apps/erpnext/erpnext/public/js/setup_wizard.js +155,Financial Year End Date,Tahun Keuangan Akhir Tanggal
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Voucher No, if grouped by Voucher","Tidak dapat memfilter berdasarkan No. Voucher, jika dikelompokkan berdasarkan Voucher"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +484,Make Supplier Quotation,Membuat Pemasok Quotation
 DocType: Quality Inspection,Incoming,Incoming
 DocType: BOM,Materials Required (Exploded),Bahan yang dibutuhkan (Meledak)
 DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),Mengurangi Produktif untuk Tinggalkan Tanpa Bayar (LWP)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +512,"Add users to your organization, other than yourself","Menambahkan pengguna ke organisasi Anda, selain diri Anda"
+apps/erpnext/erpnext/public/js/setup_wizard.js +256,"Add users to your organization, other than yourself","Menambahkan pengguna ke organisasi Anda, selain diri Anda"
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No {1} does not match with {2} {3},Row # {0}: Serial No {1} tidak sesuai dengan {2} {3}
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +44,Casual Leave,Santai Cuti
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +44,Casual Leave,Santai Cuti
 DocType: Batch,Batch ID,Batch ID
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +334,Note: {0},Catatan: {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +336,Note: {0},Catatan: {0}
 ,Delivery Note Trends,Tren pengiriman Note
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +104,This Week's Summary,Ringkasan minggu ini
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +74,{0} must be a Purchased or Sub-Contracted Item in row {1},{0} harus merupakan barang yang dibeli atau barang sub-kontrak di baris {1}
@@ -3245,7 +3112,7 @@
 DocType: Purchase Receipt,Return Against Purchase Receipt,Kembali Terhadap Pembelian Penerimaan
 DocType: Purchase Order,To Bill,Bill
 DocType: Material Request,% Ordered,Memerintahkan%
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +61,Piecework,Pekerjaan yg dibayar menurut hasil yg dikerjakan
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Piecework,Pekerjaan yg dibayar menurut hasil yg dikerjakan
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +64,Avg. Buying Rate,Avg. Tingkat Membeli
 DocType: Task,Actual Time (in Hours),Waktu yang sebenarnya (di Jam)
 DocType: Employee,History In Company,Sejarah Dalam Perusahaan
@@ -3262,13 +3129,13 @@
 DocType: Opportunity,To Discuss,Untuk Diskusikan
 DocType: SMS Settings,SMS Settings,Pengaturan SMS
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +60,Temporary Accounts,Akun sementara
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +155,Black,Hitam
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Black,Hitam
 DocType: BOM Explosion Item,BOM Explosion Item,BOM Ledakan Barang
 DocType: Account,Auditor,Akuntan
 DocType: Purchase Order,End date of current order's period,Tanggal akhir periode orde berjalan
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +17,Make Offer Letter,Membuat Penawaran Surat
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +10,Return,Kembali
-apps/erpnext/erpnext/stock/doctype/item/item.py +503,Default Unit of Measure for Variant must be same as Template,Standar Satuan Ukur untuk Varian harus sama dengan Template
+apps/erpnext/erpnext/stock/doctype/item/item.py +507,Default Unit of Measure for Variant must be same as Template,Standar Satuan Ukur untuk Varian harus sama dengan Template
 DocType: DocField,Fold,Melipat
 DocType: Production Order Operation,Production Order Operation,Pesanan Operasi Produksi
 DocType: Pricing Rule,Disable,Nonaktifkan
@@ -3279,13 +3146,12 @@
 DocType: Page,Page Name,Nama Halaman
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +110,To Time must be greater than From Time,Untuk waktu harus lebih besar dari Dari Waktu
 DocType: Journal Entry Account,Exchange Rate,Nilai Tukar
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +465,Sales Order {0} is not submitted,Sales Order {0} tidak disampaikan
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +467,Sales Order {0} is not submitted,Sales Order {0} tidak disampaikan
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0}: Parent account {1} does not bolong to the company {2},Gudang {0}: akun induk {1} tidak terkait kepada perusahaan {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +124,Spindle finishing,Finishing Spindle
 DocType: BOM,Last Purchase Rate,Tingkat Pembelian Terakhir
 DocType: Account,Asset,Aset
 DocType: Project Task,Task ID,Tugas ID
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +395,"e.g. ""MC""","misalnya ""MC """
+apps/erpnext/erpnext/public/js/setup_wizard.js +143,"e.g. ""MC""","misalnya ""MC """
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,Stock cannot exist for Item {0} since has variants,Saham tidak bisa eksis untuk Item {0} karena memiliki varian
 ,Sales Person-wise Transaction Summary,Penjualan Orang-bijaksana Rangkuman Transaksi
 DocType: System Settings,Time Zone,"Zona Waktu: GMT +2; CET +1, dan EST (AS-Timur) +7"
@@ -3294,9 +3160,7 @@
 DocType: Monthly Distribution,Monthly Distribution Percentages,Persentase Distribusi bulanan
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +16,The selected item cannot have Batch,Item yang dipilih tidak dapat memiliki Batch
 DocType: Delivery Note,% of materials delivered against this Delivery Note,% Dari materi yang disampaikan terhadap Pengiriman ini Note
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +151,Stapling,Stapel
 DocType: Customer,Customer Details,Rincian pelanggan
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +105,Shaping,Membentuk
 DocType: Employee,Reports to,Laporan untuk
 DocType: SMS Settings,Enter url parameter for receiver nos,Masukkan parameter url untuk penerima nos
 DocType: Sales Invoice,Paid Amount,Dibayar Jumlah
@@ -3305,13 +3169,13 @@
 DocType: Item Variant,Item Variant,Item Variant
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +15,Setting this Address Template as default as there is no other default,Mengatur Template Alamat ini sebagai default karena tidak ada standar lainnya
 apps/erpnext/erpnext/accounts/doctype/account/account.py +89,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Saldo rekening sudah berada di Debit, Anda tidak diizinkan untuk mengatur 'Balance Harus' sebagai 'Kredit'"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +76,Quality Management,Manajemen Kualitas
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Quality Management,Manajemen Kualitas
 DocType: Production Planning Tool,Filter based on customer,Filter berdasarkan pelanggan
 DocType: Payment Tool Detail,Against Voucher No,Terhadap Voucher Tidak ada
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +47,Please enter quantity for Item {0},Mohon masukkan untuk Item {0}
 DocType: Employee External Work History,Employee External Work History,Karyawan Eksternal Riwayat Pekerjaan
 DocType: Tax Rule,Purchase,Pembelian
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +34,Balance Qty,Jumlah Saldo
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Balance Qty,Jumlah Saldo
 DocType: Item Group,Parent Item Group,Induk Barang Grup
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +21,{0} for {1},{0} untuk {1}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +96,Cost Centers,Pusat biaya
@@ -3321,12 +3185,12 @@
 DocType: Opportunity,Next Contact,Hubungi Berikutnya
 DocType: Employee,Employment Type,Jenis Pekerjaan
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,Aktiva Tetap
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +84,Application period cannot be across two alocation records,Periode aplikasi tidak bisa di dua catatan alokasi
 DocType: Item Group,Default Expense Account,Beban standar Akun
 DocType: Employee,Notice (days),Notice (hari)
 DocType: Page,Yes,Ya
 DocType: Tax Rule,Sales Tax Template,Template Pajak Penjualan
 DocType: Employee,Encashment Date,Pencairan Tanggal
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +74,Electroforming,Electroforming
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +179,"Against Voucher Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Terhadap Voucher Type harus menjadi salah satu Purchase Order, Purchase Invoice atau Journal Masuk"
 DocType: Account,Stock Adjustment,Penyesuaian Stock
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +34,Default Activity Cost exists for Activity Type - {0},Standar Kegiatan Biaya ada untuk Jenis Kegiatan - {0}
@@ -3362,12 +3226,12 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,Gudang tidak dapat dihapus sebagai entri stok buku ada untuk gudang ini.
 DocType: Company,Distribution,Distribusi
 apps/erpnext/erpnext/public/js/pos/pos.html +36,Amount Paid,Jumlah Dibayar
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +91,Project Manager,Manager Project
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +72,Dispatch,Pengiriman
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Project Manager,Manager Project
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +72,Dispatch,Pengiriman
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,Diskon Max diperbolehkan untuk item: {0} {1}%
 DocType: Customer,Default Taxes and Charges,Pajak default dan Biaya
 DocType: Account,Receivable,Piutang
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +268,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,Row # {0}: Tidak diperbolehkan untuk mengubah Pemasok sebagai Purchase Order sudah ada
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +263,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,Row # {0}: Tidak diperbolehkan untuk mengubah Pemasok sebagai Purchase Order sudah ada
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,Peran yang diperbolehkan untuk mengirimkan transaksi yang melebihi batas kredit yang ditetapkan.
 DocType: Sales Invoice,Supplier Reference,Pemasok Referensi
 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.","Jika dicentang, BOM untuk item sub-assembly akan dipertimbangkan untuk mendapatkan bahan baku. Jika tidak, semua item sub-assembly akan diperlakukan sebagai bahan baku."
@@ -3375,8 +3239,8 @@
 DocType: Hub Settings,Seller Description,Penjual Deskripsi
 DocType: Employee Education,Qualification,Kualifikasi
 DocType: Item Price,Item Price,Item Price
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +48,Soap & Detergent,Sabun & Deterjen
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +36,Motion Picture & Video,Motion Picture & Video
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +48,Soap & Detergent,Sabun & Deterjen
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +36,Motion Picture & Video,Motion Picture & Video
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Ordered
 DocType: Warehouse,Warehouse Name,Gudang Nama
 DocType: Naming Series,Select Transaction,Pilih Transaksi
@@ -3385,7 +3249,6 @@
 DocType: BOM,Rate Of Materials Based On,Laju Bahan Berbasis On
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,Dukungan Analtyics
 apps/erpnext/erpnext/accounts/doctype/accounts_settings/accounts_settings.py +27,Company is missing in warehouses {0},Perusahaan hilang di gudang {0}
-DocType: Stock UOM Replace Utility,Stock UOM Replace Utility,Stock UOM Ganti Utilitas
 DocType: POS Profile,Terms and Conditions,Syarat dan Ketentuan
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,To Date should be within the Fiscal Year. Assuming To Date = {0},Untuk tanggal harus dalam Tahun Anggaran. Dengan asumsi To Date = {0}
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","Di sini Anda dapat mempertahankan tinggi, berat, alergi, masalah medis dll"
@@ -3397,7 +3260,7 @@
 DocType: Sales Order Item,For Production,Untuk Produksi
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +103,Please enter sales order in the above table,Masukkan order penjualan pada tabel di atas
 DocType: Project Task,View Task,Lihat Task
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +406,Your financial year begins on,Tahun pembukuan Anda dimulai
+apps/erpnext/erpnext/public/js/setup_wizard.js +154,Your financial year begins on,Tahun pembukuan Anda dimulai
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +46,Please enter Purchase Receipts,Cukup masukkan Pembelian Penerimaan
 DocType: Sales Invoice,Get Advances Received,Dapatkan Uang Muka Diterima
 DocType: Email Digest,Add/Remove Recipients,Tambah / Hapus Penerima
@@ -3405,16 +3268,14 @@
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","Untuk mengatur Tahun Anggaran ini sebagai Default, klik 'Set as Default'"
 apps/erpnext/erpnext/config/support.py +54,Setup incoming server for support email id. (e.g. support@example.com),Pengaturan server masuk untuk email dukungan id. (Misalnya support@example.com)
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,Kekurangan Jumlah
-apps/erpnext/erpnext/stock/doctype/item/item.py +528,Item variant {0} exists with same attributes,Item varian {0} ada dengan atribut yang sama
+apps/erpnext/erpnext/stock/doctype/item/item.py +532,Item variant {0} exists with same attributes,Item varian {0} ada dengan atribut yang sama
 DocType: Salary Slip,Salary Slip,Slip Gaji
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +116,Burnishing,Burnishing
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +54,'To Date' is required,'Sampai Tanggal' harus diisi
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,'Sampai Tanggal' harus diisi
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","Menghasilkan kemasan slip paket yang akan dikirimkan. Digunakan untuk memberitahu nomor paket, isi paket dan berat."
 DocType: Sales Invoice Item,Sales Order Item,Sales Order Barang
 DocType: Salary Slip,Payment Days,Hari Pembayaran
 DocType: BOM,Manage cost of operations,Mengelola biaya operasional
 DocType: Features Setup,Item Advanced,Item Lanjutan
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +40,Hot rolling,Hot bergulir
 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.","Ketika salah satu transaksi yang diperiksa ""Dikirim"", email pop-up secara otomatis dibuka untuk mengirim email ke terkait ""Kontak"" dalam transaksi itu, dengan transaksi sebagai lampiran. Pengguna mungkin atau mungkin tidak mengirim email."
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,Pengaturan global
 DocType: Employee Education,Employee Education,Pendidikan Karyawan
@@ -3427,25 +3288,23 @@
 DocType: Customer,Sales Team Details,Rincian Tim Penjualan
 DocType: Expense Claim,Total Claimed Amount,Jumlah Total Diklaim
 apps/erpnext/erpnext/config/crm.py +22,Potential opportunities for selling.,Potensi peluang untuk menjual.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +48,Sick Leave,Cuti Sakit
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +174,Invalid {0},Valid {0}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +48,Sick Leave,Cuti Sakit
 DocType: Email Digest,Email Digest,Email Digest
 DocType: Delivery Note,Billing Address Name,Nama Alamat Penagihan
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +22,Department Stores,Departmen Store
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,Departmen Store
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +40,System Balance,Sistem Balance
 DocType: Workflow,Is Active,Aktif
 apps/erpnext/erpnext/controllers/stock_controller.py +71,No accounting entries for the following warehouses,Tidak ada entri akuntansi untuk gudang berikut
 apps/erpnext/erpnext/projects/doctype/project/project.js +22,Save the document first.,Simpan dokumen pertama.
 DocType: Account,Chargeable,Dibebankan
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +121,Linishing,Linishing
 DocType: Company,Change Abbreviation,Ubah Singkatan
 DocType: Workflow State,Primary,Utama
 DocType: Expense Claim Detail,Expense Date,Beban Tanggal
 DocType: Item,Max Discount (%),Max Diskon (%)
 DocType: Communication,More Information,Informasi lebih
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +70,Last Order Amount,Pesanan terakhir Jumlah
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +161,Blasting,Peledakan
 DocType: Company,Warn,Memperingatkan
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +111,Item valuation updated,Item penilaian diperbarui
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Setiap komentar lain, upaya penting yang harus pergi dalam catatan."
 DocType: BOM,Manufacturing User,Manufaktur Pengguna
 DocType: Purchase Order,Raw Materials Supplied,Disediakan Bahan Baku
@@ -3455,7 +3314,7 @@
 DocType: Appraisal,Appraisal Template,Template Penilaian
 DocType: Communication,Email,Email
 DocType: Item Group,Item Classification,Klasifikasi Barang
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +89,Business Development Manager,Business Development Manager
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Business Development Manager,Business Development Manager
 DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,Pemeliharaan Visit Tujuan
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.js +15,Period,periode
 ,General Ledger,General Ledger
@@ -3465,9 +3324,7 @@
 ,Itemwise Recommended Reorder Level,Itemwise Rekomendasi Reorder Tingkat
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +264,Please select {0} first,Silahkan pilih {0} pertama
 DocType: Features Setup,To get Item Group in details table,Untuk mendapatkan Barang Group di tabel rincian
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +67,Redrawing,Menggambar ulang
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +112,Batch {0} of Item {1} has expired.,Batch {0} Item {1} telah berakhir.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +120,Etching,Etsa
 DocType: Sales Invoice,Commission,Komisi
 DocType: Address Template,"<h4>Default Template</h4>
 <p>Uses <a href=""http://jinja.pocoo.org/docs/templates/"">Jinja Templating</a> and all the fields of Address (including Custom Fields if any) will be available</p>
@@ -3512,7 +3369,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +340,Operation Time must be greater than 0 for Operation {0},Operasi Waktu harus lebih besar dari 0 untuk operasi {0}
 DocType: Supplier,Address and Contacts,Alamat dan Kontak
 DocType: UOM Conversion Detail,UOM Conversion Detail,Detil UOM Konversi
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +496,Keep it web friendly 900px (w) by 100px (h),Simpan web 900px ramah (w) oleh 100px (h)
+apps/erpnext/erpnext/public/js/setup_wizard.js +242,Keep it web friendly 900px (w) by 100px (h),Simpan web 900px ramah (w) oleh 100px (h)
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +329,Production Order cannot be raised against a Item Template,Pesanan produksi tidak dapat diajukan terhadap Template Barang
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +44,Charges are updated in Purchase Receipt against each item,Biaya diperbarui dalam Pembelian Penerimaan terhadap setiap item
 DocType: Payment Tool,Get Outstanding Vouchers,Dapatkan Posisi Voucher
@@ -3528,54 +3385,49 @@
 DocType: Item,Average time taken by the supplier to deliver,Rata-rata waktu yang dibutuhkan oleh pemasok untuk memberikan
 DocType: Time Log,Hours,Jam
 DocType: Project,Expected Start Date,Diharapkan Tanggal Mulai
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +38,Rolling,Bergulir
 DocType: ToDo,Priority,Prioritas
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +41,Remove item if charges is not applicable to that item,Hapus item jika biaya ini tidak berlaku untuk item
 DocType: Dropbox Backup,Dropbox Access Allowed,Dropbox Access Diizinkan
 DocType: Dropbox Backup,Weekly,Mingguan
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,Misalnya. smsgateway.com / api / send_sms.cgi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +485,Receive,Menerima
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +510,Receive,Menerima
 DocType: Maintenance Visit,Fully Completed,Sepenuhnya Selesai
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% Lengkap
 DocType: Employee,Educational Qualification,Kualifikasi Pendidikan
 DocType: Workstation,Operating Costs,Biaya Operasional
 DocType: Employee Leave Approver,Employee Leave Approver,Karyawan Tinggalkan Approver
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,{0} has been successfully added to our Newsletter list.,{0} telah berhasil ditambahkan ke daftar Newsletter.
-apps/erpnext/erpnext/stock/doctype/item/item.py +383,Row {0}: An Reorder entry already exists for this warehouse {1},Baris {0}: Entri perekam sudah ada untuk gudang ini {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +387,Row {0}: An Reorder entry already exists for this warehouse {1},Baris {0}: Entri perekam sudah ada untuk gudang ini {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +67,"Cannot declare as lost, because Quotation has been made.","Tidak dapat mendeklarasikan sebagai hilang, karena Quotation telah dibuat."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +133,Electron beam machining,Elektron beam mesin
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Pembelian Guru Manajer
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +424,Production Order {0} must be submitted,Pesanan produksi {0} harus diserahkan
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +150,Please select Start Date and End Date for Item {0},Silakan pilih Tanggal Mulai dan Tanggal Akhir untuk Item {0}
 apps/erpnext/erpnext/config/stock.py +141,Main Reports,Laporan Utama
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +102,Stock Ledger entries balances updated,Bursa Ledger entri saldo diperbarui
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,Sampai saat ini tidak dapat sebelumnya dari tanggal
 DocType: Purchase Receipt Item,Prevdoc DocType,Prevdoc DocType
-apps/erpnext/erpnext/stock/doctype/item/item.js +176,Add / Edit Prices,Tambah / Edit Harga
+apps/erpnext/erpnext/stock/doctype/item/item.js +178,Add / Edit Prices,Tambah / Edit Harga
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +53,Chart of Cost Centers,Bagan Pusat Biaya
 ,Requested Items To Be Ordered,Produk Diminta Akan Memerintahkan
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +298,My Orders,Pesanan saya
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +293,My Orders,Pesanan saya
 DocType: Price List,Price List Name,Daftar Harga Nama
 DocType: Time Log,For Manufacturing,Untuk Manufaktur
-apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +70,Totals,Total
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +174,Totals,Total
 DocType: BOM,Manufacturing,Manufaktur
 ,Ordered Items To Be Delivered,Memerintahkan Items Akan Disampaikan
 DocType: Account,Income,Penghasilan
 ,Setup Wizard,Setup Wizard
 DocType: Industry Type,Industry Type,Jenis Industri
 apps/erpnext/erpnext/templates/includes/cart.js +137,Something went wrong!,Ada yang salah!
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +68,Warning: Leave application contains following block dates,Peringatan: Tinggalkan aplikasi berisi tanggal blok berikut
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +251,Sales Invoice {0} has already been submitted,Faktur Penjualan {0} telah disampaikan
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +100,Warning: Leave application contains following block dates,Peringatan: Tinggalkan aplikasi berisi tanggal blok berikut
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +256,Sales Invoice {0} has already been submitted,Faktur Penjualan {0} telah disampaikan
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,Tanggal Penyelesaian
 DocType: Purchase Invoice Item,Amount (Company Currency),Jumlah (Perusahaan Mata Uang)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +10,Die casting,Die pengecoran
 DocType: Email Alert,Reference Date,Referensi Tanggal
 apps/erpnext/erpnext/config/hr.py +105,Organization unit (department) master.,Unit Organisasi (kawasan) menguasai.
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +25,Please enter valid mobile nos,Masukkan nos ponsel yang valid
 DocType: Budget Detail,Budget Detail,Rincian Anggaran
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +75,Please enter message before sending,Masukkan pesan sebelum mengirimnya
 DocType: Async Task,Status,Status
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +65,Stock UOM updated for Item {0},Bursa UOM diperbarui untuk Item {0}
 DocType: Company History,Year,Tahun
 apps/erpnext/erpnext/config/accounts.py +127,Point-of-Sale Profile,Point-of-Sale Profil
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +68,Please Update SMS Settings,Silahkan Perbarui Pengaturan SMS
@@ -3589,12 +3441,12 @@
 ,Serial No Service Contract Expiry,Serial No Layanan Kontrak kadaluarsa
 DocType: Item,Unit of Measure Conversion,Unit Konversi Ukur
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +86,Employee can not be changed,Karyawan tidak dapat diubah
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +259,You cannot credit and debit same account at the same time,Anda tidak dapat kredit dan mendebit rekening yang sama pada waktu yang sama
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,You cannot credit and debit same account at the same time,Anda tidak dapat kredit dan mendebit rekening yang sama pada waktu yang sama
 DocType: Naming Series,Help HTML,Bantuan HTML
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},Jumlah weightage ditugaskan harus 100%. Ini adalah {0}
 apps/erpnext/erpnext/controllers/status_updater.py +140,Allowance for over-{0} crossed for Item {1},Penyisihan over-{0} menyeberang untuk Item {1}
 DocType: Address,Name of person or organization that this address belongs to.,Nama orang atau organisasi yang alamat ini milik.
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +587,Your Suppliers,Pemasok Anda
+apps/erpnext/erpnext/public/js/setup_wizard.js +325,Your Suppliers,Pemasok Anda
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,Tidak dapat ditetapkan sebagai Hilang sebagai Sales Order dibuat.
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +65,Another Salary Structure {0} is active for employee {1}. Please make its status 'Inactive' to proceed.,Lain Struktur Gaji {0} aktif untuk karyawan {1}. Silakan membuat statusnya 'aktif' untuk melanjutkan.
 DocType: Purchase Invoice,Contact,Kontak
@@ -3603,37 +3455,35 @@
 DocType: Item,Has Serial No,Memiliki Serial No
 DocType: Employee,Date of Issue,Tanggal Issue
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +16,{0}: From {0} for {1},{0}: Dari {0} untuk {1}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +154,Row #{0}: Set Supplier for item {1},Row # {0}: Set Pemasok untuk item {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +149,Row #{0}: Set Supplier for item {1},Row # {0}: Set Pemasok untuk item {1}
 DocType: Issue,Content Type,Content Type
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +17,Computer,Komputer
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,Komputer
 DocType: Item,List this Item in multiple groups on the website.,Daftar Barang ini dalam beberapa kelompok di website.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +283,Please check Multi Currency option to allow accounts with other currency,Silakan periksa opsi Mata multi untuk memungkinkan account dengan mata uang lainnya
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +285,Please check Multi Currency option to allow accounts with other currency,Silakan periksa opsi Mata multi untuk memungkinkan account dengan mata uang lainnya
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +62,Item: {0} does not exist in the system,Item: {0} tidak ada dalam sistem
 apps/erpnext/erpnext/accounts/doctype/account/account.py +81,You are not authorized to set Frozen value,Anda tidak diizinkan untuk menetapkan nilai yg sedang dibekukan
 DocType: Payment Reconciliation,Get Unreconciled Entries,Dapatkan Entries Unreconciled
 DocType: Cost Center,Budgets,Anggaran
 apps/frappe/frappe/core/page/modules_setup/modules_setup.py +11,Updated,Diperbarui
 DocType: Employee,Emergency Contact Details,Detail Darurat Kontak
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +396,What does it do?,Apa gunanya?
+apps/erpnext/erpnext/public/js/setup_wizard.js +144,What does it do?,Apa gunanya?
 DocType: Delivery Note,To Warehouse,Untuk Gudang
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +45,Account {0} has been entered more than once for fiscal year {1},Akun {0} telah dimasukkan lebih dari sekali untuk tahun fiskal {1}
 ,Average Commission Rate,Rata-rata Komisi Tingkat
-apps/erpnext/erpnext/stock/doctype/item/item.py +313,'Has Serial No' can not be 'Yes' for non-stock item,"""Memiliki Nomor Serial' tidak bisa 'dipilih' untuk item non-stok"
+apps/erpnext/erpnext/stock/doctype/item/item.py +317,'Has Serial No' can not be 'Yes' for non-stock item,"""Memiliki Nomor Serial' tidak bisa 'dipilih' untuk item non-stok"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Attendance can not be marked for future dates,Kehadiran tidak dapat ditandai untuk tanggal masa depan
 DocType: Pricing Rule,Pricing Rule Help,Aturan Harga Bantuan
 DocType: Purchase Taxes and Charges,Account Head,Akun Kepala
 apps/erpnext/erpnext/config/stock.py +79,Update additional costs to calculate landed cost of items,Memperbarui biaya tambahan untuk menghitung biaya mendarat item
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +111,Electrical,Listrik
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +111,Electrical,Listrik
 DocType: Stock Entry,Total Value Difference (Out - In),Total Nilai Selisih (Out - Dalam)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +302,Row {0}: Exchange Rate is mandatory,Row {0}: Kurs adalah wajib
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +304,Row {0}: Exchange Rate is mandatory,Row {0}: Kurs adalah wajib
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},User ID tidak ditetapkan untuk Karyawan {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +72,Peening,Peening
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,From Warranty Claim,Dari Garansi Klaim
 DocType: Stock Entry,Default Source Warehouse,Sumber standar Gudang
 DocType: Item,Customer Code,Kode Pelanggan
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +212,Birthday Reminder for {0},Birthday Reminder untuk {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +163,Lapping,Memukul-mukul
-apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.js +8,Days Since Last Order,Hari Sejak Orde terakhir
+apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +72,Days Since Last Order,Hari Sejak Orde terakhir
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +299,Debit To account must be a Balance Sheet account,Debit Untuk akun harus rekening Neraca
 DocType: Buying Settings,Naming Series,Penamaan Series
 DocType: Leave Block List,Leave Block List Name,Tinggalkan Nama Block List
@@ -3647,7 +3497,7 @@
 DocType: Notification Control,Sales Invoice Message,Penjualan Faktur Pesan
 DocType: Authorization Rule,Based On,Berdasarkan
 DocType: Sales Order Item,Ordered Qty,Memerintahkan Qty
-apps/erpnext/erpnext/stock/doctype/item/item.py +539,Item {0} is disabled,Item {0} dinonaktifkan
+apps/erpnext/erpnext/stock/doctype/item/item.py +543,Item {0} is disabled,Item {0} dinonaktifkan
 DocType: Stock Settings,Stock Frozen Upto,Stock Frozen Upto
 apps/erpnext/erpnext/controllers/recurring_document.py +166,Period From and Period To dates mandatory for recurring {0},Periode Dari dan Untuk Periode tanggal wajib bagi berulang {0}
 apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,Kegiatan proyek / tugas.
@@ -3657,7 +3507,6 @@
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,Diskon harus kurang dari 100
 DocType: ToDo,Low,Rendah
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Menulis Off Jumlah (Perusahaan Mata Uang)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +71,Spinning,Pemintalan
 DocType: Landed Cost Voucher,Landed Cost Voucher,Voucher Biaya mendarat
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +55,Please set {0},Silakan set {0}
 DocType: Purchase Invoice,Repeat on Day of Month,Ulangi pada Hari Bulan
@@ -3679,7 +3528,6 @@
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +37,Campaign Name is required,Nama Promosi diperlukan
 DocType: Maintenance Visit,Maintenance Date,Pemeliharaan Tanggal
 DocType: Purchase Receipt Item,Rejected Serial No,Ditolak Serial No
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +51,Deep drawing,Dalam menggambar
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +40,New Newsletter,Baru Newsletter
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +157,Start date should be less than end date for Item {0},Tanggal mulai harus kurang dari tanggal akhir untuk Item {0}
 apps/erpnext/erpnext/stock/doctype/item/item.js +17,Show Balance,Tampilkan Balance
@@ -3690,7 +3538,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +119,BOM and Manufacturing Quantity are required,BOM dan Manufaktur Kuantitas diperlukan
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Penuaan Rentang 2
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +450,Amount,Jumlah
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +147,Riveting,Menarik
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,BOM diganti
 ,Sales Analytics,Penjualan Analytics
 DocType: Manufacturing Settings,Manufacturing Settings,Pengaturan manufaktur
@@ -3702,20 +3549,19 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +207,New Account Name,New Account Name
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,Biaya Bahan Baku Disediakan
 DocType: Selling Settings,Settings for Selling Module,Pengaturan untuk Jual Modul
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +73,Customer Service,Layanan Pelanggan
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Customer Service,Layanan Pelanggan
 DocType: Item,Thumbnail,Kuku ibu jari
 DocType: Item Customer Detail,Item Customer Detail,Barang Pelanggan Detil
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +147,Confirm Your Email,Konfirmasi Email Anda
 apps/erpnext/erpnext/config/hr.py +53,Offer candidate a Job.,Penawaran calon Ayub.
 DocType: Notification Control,Prompt for Email on Submission of,Prompt untuk Email pada Penyampaian
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +81,Total allocated leaves are more than days in the period,Jumlah daun dialokasikan lebih dari hari pada periode
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +70,Item {0} must be a stock Item,Item {0} harus stok Barang
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,Standar Kerja In Progress Gudang
 apps/erpnext/erpnext/config/accounts.py +107,Default settings for accounting transactions.,Pengaturan default untuk transaksi akuntansi.
 apps/frappe/frappe/model/naming.py +40,{0} is required,{0} harus diperlukan
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +21,Vacuum molding,Vacuum molding
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,Diharapkan Tanggal tidak bisa sebelum Material Request Tanggal
 DocType: Contact Us Settings,City,Kota
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +132,Ultrasonic machining,Ultrasonic mesin
 apps/frappe/frappe/templates/base.html +137,Error: Not a valid id?,Kesalahan: Tidak id valid?
 apps/erpnext/erpnext/stock/get_item_details.py +125,Item {0} must be a Sales Item,Item {0} harus Item Penjualan
 DocType: Naming Series,Update Series Number,Pembaruan Series Number
@@ -3723,7 +3569,7 @@
 DocType: Sales Order,Printing Details,Percetakan Detail
 DocType: Task,Closing Date,Closing Date
 DocType: Sales Order Item,Produced Quantity,Diproduksi Jumlah
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +84,Engineer,Insinyur
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Engineer,Insinyur
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,Cari Sub Sidang
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +379,Item Code required at Row No {0},Item Code dibutuhkan pada Row ada {0}
 DocType: Sales Partner,Partner Type,Mitra Type
@@ -3731,7 +3577,7 @@
 DocType: Authorization Rule,Customerwise Discount,Customerwise Diskon
 DocType: Purchase Invoice,Against Expense Account,Terhadap Akun Biaya
 DocType: Production Order,Production Order,Pesanan Produksi
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +258,Installation Note {0} has already been submitted,Instalasi Catatan {0} telah disampaikan
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +263,Installation Note {0} has already been submitted,Instalasi Catatan {0} telah disampaikan
 DocType: Quotation Item,Against Docname,Terhadap Docname
 DocType: SMS Center,All Employee (Active),Semua Karyawan (Aktif)
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,Lihat Sekarang
@@ -3740,19 +3586,19 @@
 DocType: Item,Re-Order Level,Re-order Tingkat
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,Masukkan item dan qty direncanakan untuk yang Anda ingin meningkatkan pesanan produksi atau download bahan baku untuk analisis.
 apps/frappe/frappe/public/js/frappe/views/ganttview.js +45,Gantt Chart,Gantt Bagan
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +57,Part-time,Part-time
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,Part-time,Part-time
 DocType: Employee,Applicable Holiday List,Daftar hari libur yang berlaku
 DocType: Employee,Cheque,Cek
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,Seri Diperbarui
 apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Report Type is mandatory,Jenis Laporan adalah wajib
 DocType: Item,Serial Number Series,Serial Number Series
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},Gudang adalah wajib bagi saham Barang {0} berturut-turut {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +45,Retail & Wholesale,Retail & Grosir
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,Retail & Grosir
 DocType: Issue,First Responded On,Pertama Menanggapi On
 DocType: Website Item Group,Cross Listing of Item in multiple groups,Daftar Lintas Item dalam beberapa kelompok
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +351,The First User: You,Pengguna Pertama: Anda
+apps/erpnext/erpnext/public/js/setup_wizard.js +101,The First User: You,Pengguna Pertama: Anda
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +48,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},Tahun Anggaran Tanggal Mulai dan Akhir Tahun Fiskal Tanggal sudah ditetapkan pada Tahun Anggaran {0}
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +172,Successfully Reconciled,Berhasil Berdamai
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +119,Successfully Reconciled,Berhasil Berdamai
 DocType: Production Order,Planned End Date,Direncanakan Tanggal Berakhir
 apps/erpnext/erpnext/config/stock.py +43,Where items are stored.,Dimana item disimpan.
 DocType: Tax Rule,Validity,Keabsahan
@@ -3772,39 +3618,36 @@
 DocType: DocPerm,Level,Level
 DocType: Purchase Taxes and Charges,On Net Total,Pada Bersih Jumlah
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +160,Target warehouse in row {0} must be same as Production Order,Target gudang di baris {0} harus sama dengan Orde Produksi
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +59,No permission to use Payment Tool,Tidak ada izin untuk menggunakan Alat Pembayaran
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +97,No permission to use Payment Tool,Tidak ada izin untuk menggunakan Alat Pembayaran
 apps/erpnext/erpnext/controllers/recurring_document.py +192,'Notification Email Addresses' not specified for recurring %s,'Notifikasi Alamat Email' tidak ditentukan untuk nota langganan %s
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +86,Milling,Penggilingan
 apps/erpnext/erpnext/accounts/doctype/account/account.py +99,Currency can not be changed after making entries using some other currency,Mata uang tidak dapat diubah setelah melakukan entri menggunakan beberapa mata uang lainnya
 DocType: Company,Round Off Account,Bulat Off Akun
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +60,Nibbling,Menggigit
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,Beban Administrasi
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +18,Consulting,Konsultasi
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +18,Consulting,Konsultasi
 DocType: Customer Group,Parent Customer Group,Induk Pelanggan Grup
 apps/erpnext/erpnext/public/js/pos/pos.js +429,Change,Perubahan
 DocType: Purchase Invoice,Contact Email,Email Kontak
 DocType: Appraisal Goal,Score Earned,Skor Earned
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +393,"e.g. ""My Company LLC""","misalnya ""My Company LLC """
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +173,Notice Period,Pemberitahuan Masa
+apps/erpnext/erpnext/public/js/setup_wizard.js +141,"e.g. ""My Company LLC""","misalnya ""My Company LLC """
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +173,Notice Period,Pemberitahuan Masa
 DocType: Bank Reconciliation Detail,Voucher ID,Voucher ID
 apps/erpnext/erpnext/setup/doctype/territory/territory.js +14,This is a root territory and cannot be edited.,Ini adalah wilayah akar dan tidak dapat diedit.
 DocType: Packing Slip,Gross Weight UOM,Berat Kotor UOM
 DocType: Email Digest,Receivables / Payables,Piutang / Hutang
 DocType: Delivery Note Item,Against Sales Invoice,Terhadap Faktur Penjualan
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +63,Stamping,Pencetakan
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +457,Credit Account,Akun kredit
 DocType: Landed Cost Item,Landed Cost Item,Landed Biaya Barang
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +56,Show zero values,Tampilkan nilai nol
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,Jumlah barang yang diperoleh setelah manufaktur / repacking dari mengingat jumlah bahan baku
 DocType: Payment Reconciliation,Receivable / Payable Account,Piutang / Account Payable
 DocType: Delivery Note Item,Against Sales Order Item,Terhadap Sales Order Barang
-apps/erpnext/erpnext/stock/doctype/item/item.py +521,Please specify Attribute Value for attribute {0},Silakan tentukan Atribut Nilai untuk atribut {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +525,Please specify Attribute Value for attribute {0},Silakan tentukan Atribut Nilai untuk atribut {0}
 DocType: Item,Default Warehouse,Standar Gudang
 DocType: Task,Actual End Date (via Time Logs),Sebenarnya Tanggal Akhir (via Waktu Log)
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +37,Budget cannot be assigned against Group Account {0},Anggaran tidak dapat diberikan terhadap Account Group {0}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +23,Please enter parent cost center,Masukkan pusat biaya orang tua
 DocType: Delivery Note,Print Without Amount,Cetak Tanpa Jumlah
-apps/erpnext/erpnext/controllers/buying_controller.py +69,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,Pajak Kategori tidak bisa 'Penilaian' atau 'Penilaian dan Total' karena semua item item non-saham
+apps/erpnext/erpnext/controllers/buying_controller.py +60,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,Pajak Kategori tidak bisa 'Penilaian' atau 'Penilaian dan Total' karena semua item item non-saham
 DocType: User,Last Name,Nama Belakang
 DocType: Web Page,Left,Waktu tersisa
 DocType: Event,All Day,Semua Hari
@@ -3812,7 +3655,7 @@
 DocType: Appraisal,Total Score (Out of 5),Skor Total (Out of 5)
 DocType: Contact Us Settings,State,Propinsi
 DocType: Batch,Batch,Batch
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +51,Balance,Keseimbangan
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +28,Balance,Keseimbangan
 DocType: Project,Total Expense Claim (via Expense Claims),Jumlah Klaim Beban (via Klaim Beban)
 DocType: User,Gender,Jenis Kelamin
 DocType: Journal Entry,Debit Note,Debit Note
@@ -3842,8 +3685,7 @@
 DocType: Purchase Order,Get Last Purchase Rate,Dapatkan Terakhir Purchase Rate
 DocType: Time Log,Billing Rate based on Activity Type (per hour),Tingkat penagihan berdasarkan Jenis Kegiatan (per jam)
 DocType: Company,Company Info,Info Perusahaan
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +76,Seaming,Seaming
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +197,"Company Email ID not found, hence mail not sent","Perusahaan Email ID tidak ditemukan, maka surat tidak terkirim"
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +206,"Company Email ID not found, hence mail not sent","Perusahaan Email ID tidak ditemukan, maka surat tidak terkirim"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Penerapan Dana (Aset)
 DocType: Production Planning Tool,Filter based on item,Filter berdasarkan pada item
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +451,Debit Account,Akun Debit
@@ -3855,17 +3697,16 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +95,{0} {1} has been modified. Please refresh.,{0} {1} telah dimodifikasi. Silahkan me-refresh.
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,Menghentikan pengguna dari membuat Aplikasi Leave pada hari-hari berikutnya.
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +591,From Opportunity,Dari Peluang
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +46,Blanking,Blanking
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +166,Employee Benefits,Manfaat Karyawan
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,Employee Benefits,Manfaat Karyawan
 DocType: Sales Invoice,Is POS,Apakah POS
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +240,Packed quantity must equal quantity for Item {0} in row {1},Dikemas kuantitas harus sama kuantitas untuk Item {0} berturut-turut {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +245,Packed quantity must equal quantity for Item {0} in row {1},Dikemas kuantitas harus sama kuantitas untuk Item {0} berturut-turut {1}
 DocType: Production Order,Manufactured Qty,Diproduksi Qty
 DocType: Purchase Receipt Item,Accepted Quantity,Kuantitas Diterima
 apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} tidak ada
 apps/erpnext/erpnext/config/accounts.py +18,Bills raised to Customers.,Bills diajukan ke Pelanggan.
 DocType: DocField,Default,Dfault
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Proyek Id
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +466,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Row ada {0}: Jumlah dapat tidak lebih besar dari Pending Jumlah terhadap Beban Klaim {1}. Pending Jumlah adalah {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +468,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Row ada {0}: Jumlah dapat tidak lebih besar dari Pending Jumlah terhadap Beban Klaim {1}. Pending Jumlah adalah {2}
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +40,{0} subscribers added,{0} pelanggan telah ditambahkan
 DocType: Maintenance Schedule,Schedule,Jadwal
 DocType: Cost Center,"Define Budget for this Cost Center. To set budget action, see ""Company List""","Tentukan Anggaran untuk Biaya Pusat ini. Untuk mengatur aksi anggaran, lihat &quot;Daftar Perusahaan&quot;"
@@ -3876,7 +3717,7 @@
 apps/erpnext/erpnext/public/js/pos/pos.js +91,Price List not found or disabled,Daftar Harga tidak ditemukan atau dinonaktifkan
 DocType: Expense Claim,Approved,Disetujui
 DocType: Pricing Rule,Price,Harga
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +79,Employee relieved on {0} must be set as 'Left',Karyawan lega pada {0} harus ditetapkan sebagai 'Kiri'
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +88,Employee relieved on {0} must be set as 'Left',Karyawan lega pada {0} harus ditetapkan sebagai 'Kiri'
 DocType: Item,"Selecting ""Yes"" will give a unique identity to each entity of this item which can be viewed in the Serial No master.","Memilih ""Ya"" akan memberikan identitas unik untuk setiap entitas dari produk ini yang dapat dilihat dalam Serial No guru."
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +39,Appraisal {0} created for Employee {1} in the given date range,Penilaian {0} telah dibuat untuk karyawan {1} dalam rentang tanggal tertentu
 DocType: Employee,Education,Pendidikan
@@ -3887,7 +3728,7 @@
 apps/frappe/frappe/desk/moduleview.py +67,Standard Reports,Laporan standar
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,Pencatatan Jurnal akuntansi.
 DocType: Delivery Note Item,Available Qty at From Warehouse,Jumlah yang tersedia di Gudang Dari
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +209,Please select Employee Record first.,Silakan pilih Rekam Karyawan pertama.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +224,Please select Employee Record first.,Silakan pilih Rekam Karyawan pertama.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Row {0}: Partai / Rekening tidak sesuai dengan {1} / {2} di {3} {4}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +35,To create a Tax Account,Untuk membuat Akun Pajak
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +233,Please enter Expense Account,Masukkan Beban Akun
@@ -3900,46 +3741,43 @@
 DocType: Sales Order,Track this Sales Order against any Project,Melacak Pesanan Penjualan ini terhadap Proyek apapun
 DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,Tarik pesanan penjualan (pending untuk memberikan) berdasarkan kriteria di atas
 DocType: DocShare,Document Type,Jenis Dokumen
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +565,From Supplier Quotation,Dari Pemasok Quotation
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +588,From Supplier Quotation,Dari Pemasok Quotation
 DocType: Deduction Type,Deduction Type,Pengurangan Type
 DocType: Attendance,Half Day,Half Day
 DocType: Pricing Rule,Min Qty,Min Qty
 DocType: Features Setup,"To track items in sales and purchase documents with batch nos. ""Preferred Industry: Chemicals""",Untuk melacak item dalam penjualan dan dokumen pembelian dengan nos batch. &quot;Industri yang dipilih: Kimia&quot;
 DocType: GL Entry,Transaction Date,Transaction Tanggal
 DocType: Production Plan Item,Planned Qty,Rencana Qty
-apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +91,Total Tax,Total Pajak
+apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +93,Total Tax,Total Pajak
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +178,For Quantity (Manufactured Qty) is mandatory,Untuk Quantity (Diproduksi Qty) adalah wajib
 DocType: Stock Entry,Default Target Warehouse,Standar Sasaran Gudang
 DocType: Purchase Invoice,Net Total (Company Currency),Jumlah Bersih (Perusahaan Mata Uang)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +79,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Row {0}: Partai Jenis dan Partai ini hanya berlaku terhadap Piutang / Hutang akun
 DocType: Notification Control,Purchase Receipt Message,Penerimaan Pembelian Pesan
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +95,Total allocated leaves are more than period,Jumlah daun dialokasikan lebih dari periode
 DocType: Production Order,Actual Start Date,Tanggal Mulai Aktual
 DocType: Sales Order,% of materials delivered against this Sales Order,% Dari materi yang disampaikan terhadap Sales Order ini
 apps/erpnext/erpnext/config/stock.py +23,Record item movement.,Gerakan barang Rekam.
 DocType: Newsletter List Subscriber,Newsletter List Subscriber,Newsletter Daftar Pelanggan
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +164,Morticing,Morticing
 DocType: Email Account,Service,Layanan
 DocType: Hub Settings,Hub Settings,Pengaturan Hub
 DocType: Project,Gross Margin %,Gross Margin%
 DocType: BOM,With Operations,Dengan Operasi
 apps/erpnext/erpnext/accounts/party.py +232,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Entri akuntansi telah dibuat dalam mata uang {0} untuk perusahaan {1}. Silakan pilih akun piutang atau hutang dengan mata uang {0}.
 ,Monthly Salary Register,Gaji Bulanan Daftar
-apps/frappe/frappe/website/template.py +140,Next,Berikutnya
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard_page.html +17,Next,Berikutnya
 DocType: Warranty Claim,If different than customer address,Jika berbeda dari alamat pelanggan
 DocType: BOM Operation,BOM Operation,BOM Operation
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +118,Electropolishing,Electropolishing
 DocType: Purchase Taxes and Charges,On Previous Row Amount,Pada Sebelumnya Row Jumlah
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +24,Please enter Payment Amount in atleast one row,Cukup masukkan Jumlah Pembayaran minimal satu baris
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +33,Please enter Payment Amount in atleast one row,Cukup masukkan Jumlah Pembayaran minimal satu baris
 DocType: POS Profile,POS Profile,POS Profil
 apps/erpnext/erpnext/config/accounts.py +153,"Seasonality for setting budgets, targets etc.","Musiman untuk menetapkan anggaran, target dll"
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +238,Row {0}: Payment Amount cannot be greater than Outstanding Amount,Baris {0}: Jumlah Pembayaran tidak dapat lebih besar dari Jumlah Posisi
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +46,Total Unpaid,Jumlah Tunggakan
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +21,Time Log is not billable,Waktu Log tidak dapat ditagih
 apps/erpnext/erpnext/stock/get_item_details.py +128,"Item {0} is a template, please select one of its variants","Item {0} adalah template, silahkan pilih salah satu variannya"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +528,Purchaser,Pembeli
+apps/erpnext/erpnext/public/js/setup_wizard.js +272,Purchaser,Pembeli
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +81,Net pay cannot be negative,Gaji bersih yang belum dapat negatif
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +71,Please enter the Against Vouchers manually,Silahkan masukkan Terhadap Voucher manual
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +107,Please enter the Against Vouchers manually,Silahkan masukkan Terhadap Voucher manual
 DocType: SMS Settings,Static Parameters,Parameter Statis
 DocType: Purchase Order,Advance Paid,Muka Dibayar
 DocType: Item,Item Tax,Pajak Barang
@@ -3948,14 +3786,12 @@
 apps/erpnext/erpnext/config/crm.py +48,Send mass SMS to your contacts,Kirim SMS massal ke kontak Anda
 DocType: Purchase Taxes and Charges,Consider Tax or Charge for,Pertimbangkan Pajak atau Biaya untuk
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,Realisasi Jumlah wajib
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +42,Cross-rolling,Cross-bergulir
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +132,Credit Card,Kartu Kredit
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +132,Credit Card,Kartu Kredit
 DocType: BOM,Item to be manufactured or repacked,Item yang akan diproduksi atau dikemas ulang
 apps/erpnext/erpnext/config/stock.py +95,Default settings for stock transactions.,Pengaturan default untuk transaksi saham.
 DocType: Purchase Invoice,Next Date,Berikutnya Tanggal
 DocType: Employee Education,Major/Optional Subjects,Mayor / Opsional Subjek
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +49,Please enter Taxes and Charges,Cukup masukkan Pajak dan Biaya
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +85,Machining,Machining
 DocType: Sales Invoice Item,Drop Ship,Drop Kapal
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","Di sini Anda dapat mempertahankan rincian keluarga seperti nama dan pekerjaan orang tua, pasangan dan anak-anak"
 DocType: Hub Settings,Seller Name,Penjual Nama
@@ -3965,7 +3801,7 @@
 DocType: Stock Entry,Repack,Dipak
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +6,You must Save the form before proceeding,Anda harus menyimpan formulir sebelum melanjutkan
 DocType: Item Attribute,Numeric Values,Nilai numerik
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +500,Attach Logo,Pasang Logo
+apps/erpnext/erpnext/public/js/setup_wizard.js +246,Attach Logo,Pasang Logo
 DocType: Customer,Commission Rate,Komisi Tingkat
 apps/erpnext/erpnext/stock/doctype/item/item.js +38,Make Variant,Membuat Varian
 apps/erpnext/erpnext/config/hr.py +145,Block leave applications by department.,Memblokir aplikasi cuti berdasarkan departemen.
@@ -3980,19 +3816,19 @@
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +105,Please select a csv file,Silakan pilih file csv
 DocType: Dropbox Backup,Send Backups to Dropbox,Kirim Backup ke Dropbox
 DocType: Purchase Order,To Receive and Bill,Untuk Menerima dan Bill
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +94,Designer,Perancang
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Designer,Perancang
 apps/erpnext/erpnext/config/selling.py +121,Terms and Conditions Template,Syarat dan Ketentuan Template
 DocType: Serial No,Delivery Details,Detail Pengiriman
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +383,Cost Center is required in row {0} in Taxes table for type {1},Biaya Pusat diperlukan dalam baris {0} dalam tabel Pajak untuk tipe {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +386,Cost Center is required in row {0} in Taxes table for type {1},Biaya Pusat diperlukan dalam baris {0} dalam tabel Pajak untuk tipe {1}
 DocType: Item,Automatically create Material Request if quantity falls below this level,Secara otomatis membuat Bahan Permintaan jika kuantitas turun di bawah tingkat ini
 ,Item-wise Purchase Register,Barang-bijaksana Pembelian Register
 DocType: Batch,Expiry Date,Tanggal Berakhir
-apps/erpnext/erpnext/stock/doctype/item/item.py +375,"To set reorder level, item must be a Purchase Item or Manufacturing Item","Untuk mengatur tingkat pemesanan ulang, barang harus Item Pembelian atau Manufacturing Barang"
+apps/erpnext/erpnext/stock/doctype/item/item.py +379,"To set reorder level, item must be a Purchase Item or Manufacturing Item","Untuk mengatur tingkat pemesanan ulang, barang harus Item Pembelian atau Manufacturing Barang"
 ,Supplier Addresses and Contacts,Pemasok Alamat dan Kontak
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,Silahkan pilih Kategori pertama
 apps/erpnext/erpnext/config/projects.py +18,Project master.,Menguasai proyek.
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,Jangan menunjukkan simbol seperti $ etc sebelah mata uang.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +330, (Half Day),(Setengah Hari)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +374, (Half Day),(Setengah Hari)
 DocType: Supplier,Credit Days,Hari Kredit
 DocType: Leave Type,Is Carry Forward,Apakah Carry Teruskan
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +478,Get Items from BOM,Dapatkan item dari BOM
@@ -4000,7 +3836,7 @@
 apps/erpnext/erpnext/config/manufacturing.py +120,Bill of Materials,Bill of Material
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +77,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Row {0}: Partai Jenis dan Partai diperlukan untuk Piutang / Hutang akun {1}
 DocType: Dropbox Backup,Send Notifications To,Kirim Pemberitahuan Untuk
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html +26,Ref Date,Ref Tanggal
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +54,Ref Date,Ref Tanggal
 DocType: Employee,Reason for Leaving,Alasan Meninggalkan
 DocType: Expense Claim Detail,Sanctioned Amount,Jumlah sanksi
 DocType: GL Entry,Is Opening,Apakah Membuka
@@ -4008,4 +3844,3 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +188,Account {0} does not exist,Akun {0} tidak ada
 DocType: Account,Cash,kas
 DocType: Employee,Short biography for website and other publications.,Biografi singkat untuk website dan publikasi lainnya.
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +31,Please create Salary Structure for employee {0},Silakan membuat Struktur Gaji untuk karyawan {0}
diff --git a/erpnext/translations/it.csv b/erpnext/translations/it.csv
index 30ba07a..14538bd 100644
--- a/erpnext/translations/it.csv
+++ b/erpnext/translations/it.csv
@@ -1,13 +1,12 @@
 DocType: Employee,Salary Mode,Modalità di stipendio
 DocType: Cost Center,"Select Monthly Distribution, if you want to track based on seasonality.","Selezionare distribuzione mensile, se si desidera tenere traccia sulla base di stagionalità."
 DocType: Employee,Divorced,Divorced
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +86,Warning: Same item has been entered multiple times.,Attenzione: Lo stesso articolo è stato inserito più volte.
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +80,Warning: Same item has been entered multiple times.,Attenzione: Lo stesso articolo è stato inserito più volte.
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +96,Items already synced,Elementi già sincronizzati
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,Permetterà che l&#39;articolo da aggiungere più volte in una transazione
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,Annulla Materiale Visita {0} prima di annullare questa rivendicazione di Garanzia
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +19,Consumer Products,Prodotti di consumo
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,Prodotti di consumo
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +68,Please select Party Type first,Seleziona il Partito Tipo primo
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +90,Annealing,Ricottura
 DocType: Item,Customer Items,Articoli clienti
 apps/erpnext/erpnext/accounts/doctype/account/account.py +45,Account {0}: Parent account {1} can not be a ledger,Il Conto {0}: conto derivato {1} non può essere un libro mastro
 DocType: Item,Publish Item to hub.erpnext.com,Pubblicare Item a hub.erpnext.com
@@ -20,15 +19,14 @@
 DocType: About Us Settings,Website,Sito Web
 DocType: POS Profile,Applicable for User,Applicabile per utente
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +169,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Produzione Arrestato Ordine non può essere annullato, Unstop è prima di cancellare"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +23,Compaction plus sintering,Compattazione più sinterizzazione
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,Currency is required for Price List {0},È richiesto di valuta per il listino prezzi {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Sarà calcolato nella transazione
 DocType: Purchase Order,Customer Contact,Customer Contact
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +549,From Material Request,Da Material Request
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +572,From Material Request,Da Material Request
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} Albero
 DocType: Job Applicant,Job Applicant,Candidato di lavoro
 apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,Nessun altro risultato.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +78,Legal,legale
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +34,Legal,legale
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +114,Actual type tax cannot be included in Item rate in row {0},Imposta tipo effettivo non può essere incluso nel prezzo dell&#39;oggetto in riga {0}
 DocType: C-Form,Customer,Cliente
 DocType: Purchase Receipt Item,Required By,Richiesto da
@@ -43,7 +41,6 @@
 DocType: Manufacturing Settings,Default 10 mins,Predefinito 10 minuti
 DocType: Leave Type,Leave Type Name,Lascia Tipo Nome
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +148,Series Updated Successfully,Serie Aggiornato con successo
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +150,Stitching,Stitching
 DocType: Pricing Rule,Apply On,applicare On
 DocType: Item Price,Multiple Item prices.,Molteplici i prezzi articolo.
 ,Purchase Order Items To Be Received,Ordine di Acquisto Oggetti da ricevere
@@ -51,8 +48,8 @@
 DocType: Quality Inspection Reading,Parameter,Parametro
 apps/erpnext/erpnext/projects/doctype/project/project.py +43,Expected End Date can not be less than Expected Start Date,Data fine prevista non può essere inferiore a quella prevista data di inizio
 apps/erpnext/erpnext/utilities/transaction_base.py +104,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Riga #{0}: il Rapporto deve essere lo stesso di {1}: {2} ({3} / {4})
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +189,New Leave Application,Nuovo Lascia Application
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +134,Bank Draft,Assegno Bancario
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +204,New Leave Application,Nuovo Lascia Application
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +134,Bank Draft,Assegno Bancario
 DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,1. Per mantenere il codice cliente e renderli ricercabili in base al loro codice usare questa opzione
 DocType: Mode of Payment Account,Mode of Payment Account,Modalità di pagamento Conto
 apps/erpnext/erpnext/stock/doctype/item/item.js +34,Show Variants,Mostra Varianti
@@ -64,25 +61,23 @@
 DocType: Production Plan Item,Production Plan Item,Produzione Piano Voce
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +141,User {0} is already assigned to Employee {1},Utente {0} è già assegnato a Employee {1}
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +13,Make new POS Profile,Crea Nuovo Profilo POS
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +31,Health Care,Assistenza Sanitaria
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,Assistenza Sanitaria
 DocType: Purchase Invoice,Monthly,Mensile
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +66,Delay in payment (Days),Ritardo nel pagamento (Giorni)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +494,Invoice,Fattura
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +519,Invoice,Fattura
 DocType: Maintenance Schedule Item,Periodicity,Periodicità
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +357,Email Address,Indirizzo E-Mail
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +21,Defense,Difesa
+apps/erpnext/erpnext/public/js/setup_wizard.js +107,Email Address,Indirizzo E-Mail
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,Difesa
 DocType: Company,Abbr,Abbr
 DocType: Appraisal Goal,Score (0-5),Punteggio (0-5)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +193,Row {0}: {1} {2} does not match with {3},Riga {0}: {1} {2} non corrisponde con {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +67,Row # {0}:,Row # {0}:
 DocType: Delivery Note,Vehicle No,Veicolo No
 apps/erpnext/erpnext/public/js/pos/pos.js +528,Please select Price List,Seleziona Listino Prezzi
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +162,Woodworking,Lavorazione del legno
 DocType: Production Order Operation,Work In Progress,Work In Progress
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +153,3D printing,Stampa 3D
 DocType: Employee,Holiday List,Elenco Vacanza
 DocType: Time Log,Time Log,Tempo di Log
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +530,Accountant,Ragioniere
+apps/erpnext/erpnext/public/js/setup_wizard.js +274,Accountant,Ragioniere
 DocType: Cost Center,Stock User,Utente Giacenze
 DocType: Company,Phone No,N. di telefono
 DocType: Time Log,"Log of Activities performed by users against Tasks that can be used for tracking time, billing.","Log delle attività svolte dagli utenti contro le attività che possono essere utilizzati per il monitoraggio in tempo, la fatturazione."
@@ -98,18 +93,19 @@
 DocType: Bin,Quantity Requested for Purchase,Quantità a fini di acquisto
 DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name","Allega file .csv con due colonne, una per il vecchio nome e uno per il nuovo nome"
 DocType: Packed Item,Parent Detail docname,Parent Dettaglio docname
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Kg,Kg
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Kg,Kg
 apps/erpnext/erpnext/config/hr.py +48,Opening for a Job.,Apertura di un lavoro.
 DocType: Item Attribute,Increment,Incremento
 apps/erpnext/erpnext/public/js/stock_analytics.js +63,Select Warehouse...,Seleziona Magazzino ...
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +6,Advertising,pubblicità
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,pubblicità
+apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,La stessa azienda viene inserito più di una volta
 DocType: Employee,Married,Sposato
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +389,Stock cannot be updated against Delivery Note {0},Stock non può essere aggiornata contro Consegna Nota {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +391,Stock cannot be updated against Delivery Note {0},Stock non può essere aggiornata contro Consegna Nota {0}
 DocType: Payment Reconciliation,Reconcile,conciliare
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +30,Grocery,drogheria
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,drogheria
 DocType: Quality Inspection Reading,Reading 1,Lettura 1
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Make Bank Entry,Crea Voce Banca
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +40,Pension Funds,Fondi Pensione
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,Fondi Pensione
 apps/erpnext/erpnext/accounts/doctype/account/account.py +142,Warehouse is mandatory if account type is Warehouse,Warehouse è obbligatoria se il tipo di conto è Warehouse
 DocType: SMS Center,All Sales Person,Tutti i Venditori
 DocType: Lead,Person Name,Nome Person
@@ -131,7 +127,7 @@
 DocType: Quality Inspection,Get Specification Details,Ottieni Specifiche Dettagli
 DocType: Lead,Interested,Interessati
 apps/erpnext/erpnext/config/manufacturing.py +14,Bill of Material,Bill of Material
-apps/erpnext/erpnext/public/js/stock_analytics.js +45,Opening,Apertura
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +158,Opening,Apertura
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},Da {0} a {1}
 DocType: Item,Copy From Item Group,Copiare da elemento Gruppo
 DocType: Journal Entry,Opening Entry,Apertura Entry
@@ -145,23 +141,22 @@
 DocType: Employee Education,Under Graduate,Sotto Laurea
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +22,Target On,obiettivo On
 DocType: BOM,Total Cost,Costo totale
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +99,Reaming,Alesaggio
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +9,Activity Log:,Registro attività :
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +199,Item {0} does not exist in the system or has expired,L'articolo {0} non esiste nel sistema o è scaduto
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +44,Real Estate,Immobiliare
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +44,Real Estate,Immobiliare
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +4,Statement of Account,Estratto conto
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +41,Pharmaceuticals,Pharmaceuticals
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,Pharmaceuticals
 DocType: Expense Claim Detail,Claim Amount,Importo Reclamo
 DocType: Employee,Mr,Sig.
 DocType: Custom Script,Client,Intestatario
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,Fornitore Tipo / fornitore
 DocType: Naming Series,Prefix,Prefisso
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Consumable,Consumabile
+apps/erpnext/erpnext/public/js/setup_wizard.js +359,Consumable,Consumabile
 DocType: Upload Attendance,Import Log,Log Importazione
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.js +19,Send,Invia
 DocType: Sales Invoice Item,Delivered By Supplier,Consegnato da parte del fornitore
 DocType: SMS Center,All Contact,Tutti i contatti
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +164,Annual Salary,Stipendio Annuo
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +164,Annual Salary,Stipendio Annuo
 DocType: Period Closing Voucher,Closing Fiscal Year,Chiusura Anno Fiscale
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +69,Stock Expenses,Spese Giacenza
 DocType: Newsletter,Email Sent?,E-mail Inviata?
@@ -169,7 +164,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +92,Show Time Logs,Mostra Logs Tempo
 DocType: Journal Entry Account,Credit in Company Currency,Credito in Società Valuta
 DocType: Delivery Note,Installation Status,Stato di installazione
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +115,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Accettato + Respinto quantità deve essere uguale al quantitativo ricevuto per la voce {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +118,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Accettato + Respinto quantità deve essere uguale al quantitativo ricevuto per la voce {0}
 DocType: Item,Supply Raw Materials for Purchase,Fornire Materie Prime per l'Acquisto
 apps/erpnext/erpnext/stock/get_item_details.py +133,Item {0} must be a Purchase Item,L'articolo {0} deve essere un'Articolo da Acquistare
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
@@ -177,19 +172,17 @@
  Tutti date e dipendente combinazione nel periodo selezionato arriverà nel modello, con record di presenze esistenti"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +446,Item {0} is not active or end of life has been reached,L'articolo {0} non è attivo o la fine della vita è stato raggiunta
 DocType: Time Log Batch,Will be updated after Sales Invoice is Submitted.,Saranno aggiornate dopo fattura di vendita sia presentata.
-apps/erpnext/erpnext/controllers/accounts_controller.py +493,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Per includere fiscale in riga {0} in rate articolo , tasse nelle righe {1} devono essere inclusi"
+apps/erpnext/erpnext/controllers/accounts_controller.py +494,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Per includere fiscale in riga {0} in rate articolo , tasse nelle righe {1} devono essere inclusi"
 apps/erpnext/erpnext/config/hr.py +90,Settings for HR Module,Impostazioni per il modulo HR
 DocType: SMS Center,SMS Center,Centro SMS
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +78,Straightening,Raddrizzare
 DocType: BOM Replace Tool,New BOM,Nuova Distinta Base
 apps/erpnext/erpnext/config/projects.py +28,Batch Time Logs for billing.,Batch registri di tempo per la fatturazione.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +15,Countergravity casting,Countergravity colata
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +30,Newsletter has already been sent,Newsletter già inviata
 DocType: Lead,Request Type,Tipo di richiesta
 DocType: Leave Application,Reason,Motivo
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +14,Broadcasting,emittente
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +140,Execution,esecuzione
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +364,The first user will become the System Manager (you can change this later).,Il primo utente diventerà il System Manager (è possibile cambiare in seguito).
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,emittente
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +140,Execution,esecuzione
+apps/erpnext/erpnext/public/js/setup_wizard.js +114,The first user will become the System Manager (you can change this later).,Il primo utente diventerà il System Manager (è possibile cambiare in seguito).
 apps/erpnext/erpnext/config/manufacturing.py +39,Details of the operations carried out.,I dettagli delle operazioni effettuate.
 DocType: Serial No,Maintenance Status,Stato di manutenzione
 apps/erpnext/erpnext/config/stock.py +263,Items and Pricing,Oggetti e prezzi
@@ -206,7 +199,6 @@
 DocType: Pricing Rule,Discount on Price List Rate (%),Sconto Listino Tasso (%)
 apps/frappe/frappe/public/js/frappe/form/print.js +96,Start,Inizio
 DocType: User,First Name,Nome
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +12,Full-mold casting,Full-stampo di fusione
 DocType: Offer Letter,Select Terms and Conditions,Selezionare i Termini e Condizioni
 DocType: Production Planning Tool,Sales Orders,Ordini di vendita
 DocType: Purchase Taxes and Charges,Valuation,Valorizzazione
@@ -218,8 +210,7 @@
 DocType: Bank Reconciliation,Bank Account,Conto Bancario
 DocType: Leave Type,Allow Negative Balance,Consentire Bilancio Negativo
 DocType: Selling Settings,Default Territory,Territorio Predefinito
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +53,Television,televisione
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +138,Gashing,Tranciatura
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,televisione
 DocType: Production Order Operation,Updated via 'Time Log',Aggiornato con 'Time Log'
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +82,Account {0} does not belong to Company {1},Il Conto {0} non appartiene alla società {1}
 DocType: Naming Series,Series List for this Transaction,Lista Serie per questa transazione
@@ -234,14 +225,13 @@
 DocType: Leave Allocation,Add unused leaves from previous allocations,Aggiungere le foglie non utilizzate precedentemente assegnata
 apps/erpnext/erpnext/controllers/recurring_document.py +206,Next Recurring {0} will be created on {1},Successivo ricorrente {0} verrà creato su {1}
 DocType: Newsletter List,Total Subscribers,Totale Iscritti
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +575,Contact Name,Nome Contatto
+,Contact Name,Nome Contatto
 DocType: Production Plan Item,SO Pending Qty,SO attesa Qtà
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Crea busta paga per i criteri sopra menzionati.
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,Richiesta di acquisto.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +107,Double housing,Custodia
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +156,Only the selected Leave Approver can submit this Leave Application,Solo il selezionato Lascia Approver può presentare questo Leave applicazione
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +171,Only the selected Leave Approver can submit this Leave Application,Solo il selezionato Lascia Approver può presentare questo Leave applicazione
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,Data Alleviare deve essere maggiore di Data di giunzione
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +172,Leaves per Year,Lascia per Anno
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +172,Leaves per Year,Lascia per Anno
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup > Settings > Naming Series,Impostare Naming Series per {0} via Impostazione&gt; Impostazioni&gt; Serie Naming
 DocType: Time Log,Will be updated when batched.,Verrà aggiornato quando dosati.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +104,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,Riga {0}: Abilita 'è Advance' contro Account {1} se questa è una voce di anticipo.
@@ -250,25 +240,24 @@
 DocType: Item Website Specification,Item Website Specification,Specifica da Sito Web dell'articolo
 DocType: Dropbox Backup,Dropbox Access Key,Chiave Accesso Dropbox
 DocType: Payment Tool,Reference No,Di riferimento
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +348,Leave Blocked,Lascia Bloccato
-apps/erpnext/erpnext/stock/doctype/item/item.py +535,Item {0} has reached its end of life on {1},L'articolo {0} ha raggiunto la fine della sua vita su {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +392,Leave Blocked,Lascia Bloccato
+apps/erpnext/erpnext/stock/doctype/item/item.py +539,Item {0} has reached its end of life on {1},L'articolo {0} ha raggiunto la fine della sua vita su {1}
 apps/erpnext/erpnext/accounts/utils.py +339,Annual,annuale
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Voce Riconciliazione Giacenza
 DocType: Stock Entry,Sales Invoice No,Fattura Commerciale No
 DocType: Material Request Item,Min Order Qty,Qtà Minima Ordine
 DocType: Lead,Do Not Contact,Non Contattaci
 DocType: Sales Invoice,The unique id for tracking all recurring invoices. It is generated on submit.,L&#39;ID univoco per il monitoraggio tutte le fatture ricorrenti. Si è generato su submit.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +93,Software Developer,Software Developer
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +93,Software Developer,Software Developer
 DocType: Item,Minimum Order Qty,Qtà ordine minimo
 DocType: Pricing Rule,Supplier Type,Tipo Fornitore
 DocType: Item,Publish in Hub,Pubblicare in Hub
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +555,Item {0} is cancelled,L'articolo {0} è annullato
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +598,Material Request,Richiesta Materiale 
+apps/erpnext/erpnext/stock/doctype/item/item.py +559,Item {0} is cancelled,L'articolo {0} è annullato
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +607,Material Request,Richiesta Materiale 
 DocType: Bank Reconciliation,Update Clearance Date,Aggiornare Liquidazione Data
 DocType: Item,Purchase Details,"Acquisto, i dati"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +323,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},Articolo {0} non trovato tra le 'Materie Prime Fornite' tabella in Ordine di Acquisto {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +129,Wire brushing,Spazzolatura Wire
 DocType: Employee,Relation,Relazione
 DocType: Shipping Rule,Worldwide Shipping,Spedizione in tutto il mondo
 apps/erpnext/erpnext/config/selling.py +23,Confirmed orders from Customers.,Ordini Confermati da Clienti.
@@ -284,12 +273,11 @@
 DocType: Supplier,Address HTML,Indirizzo HTML
 DocType: Lead,Mobile No.,Num. Cellulare
 DocType: Maintenance Schedule,Generate Schedule,Genera Programma
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +81,Hubbing,Hubbing
 DocType: Purchase Invoice Item,Expense Head,Expense Capo
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +86,Please select Charge Type first,Seleziona il tipo di carica prima
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,ultimo
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +395,Max 5 characters,Max 5 caratteri
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +195,Select Your Language,Seleziona la tua lingua
+apps/erpnext/erpnext/public/js/setup_wizard.js +143,Max 5 characters,Max 5 caratteri
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +245,Select Your Language,Seleziona la tua lingua
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,Lascia il primo responsabile approvazione della lista sarà impostato come predefinito Lascia Approver
 DocType: Manufacturing Settings,"Disables creation of time logs against Production Orders.
 Operations shall not be tracked against Production Order",Disabilita la creazione di registri di tempo contro gli ordini di produzione. Le operazioni non sono soggetti a controllo contro ordine di produzione
@@ -301,8 +289,6 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +34,Item {0} must be Service Item,L'Articolo {0} deve essere un Servizio
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +303,Completed Qty can not be greater than 'Qty to Manufacture',Completato Quantità non può essere maggiore di 'Quantità di Fabbricazione'
 DocType: DocType,Administrator,Amministratore
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +136,Laser drilling,Foratura laser
-DocType: Stock UOM Replace Utility,New Stock UOM,Nuovo UOM Archivio
 DocType: Period Closing Voucher,Closing Account Head,Chiudere Conto Primario
 DocType: Employee,External Work History,Storia del lavoro esterno
 apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,Circular Error Reference
@@ -311,18 +297,15 @@
 DocType: Lead,Industry,Industria
 DocType: Employee,Job Profile,Profilo di lavoro
 DocType: Newsletter,Newsletter,Newsletter
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +84,Hydroforming,Idroformatura
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +49,Necking,Necking
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Notifica tramite e-mail sulla creazione di Richiesta automatica Materiale
 DocType: Journal Entry,Multi Currency,Multi valuta
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +51,Item is updated,L'articolo è aggiornato
 DocType: Async Task,System Manager,System Manager
 DocType: Payment Reconciliation Invoice,Invoice Type,Tipo Fattura
 DocType: Sales Invoice Item,Delivery Note,Nota Consegna
 DocType: Dropbox Backup,Allow Dropbox Access,Consentire Accesso DropBox
 apps/erpnext/erpnext/config/learn.py +72,Setting up Taxes,Impostazione Tasse
 apps/erpnext/erpnext/accounts/utils.py +189,Payment Entry has been modified after you pulled it. Please pull it again.,Pagamento ingresso è stato modificato dopo l'tirato. Si prega di tirare di nuovo.
-apps/erpnext/erpnext/stock/doctype/item/item.py +343,{0} entered twice in Item Tax,{0} inserito due volte in tassazione articolo
+apps/erpnext/erpnext/stock/doctype/item/item.py +347,{0} entered twice in Item Tax,{0} inserito due volte in tassazione articolo
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +105,Summary for this week and pending activities,Riepilogo per questa settimana e le attività in corso
 DocType: Workstation,Rent Cost,Affitto Costo
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +74,Please select month and year,Si prega di selezionare mese e anno
@@ -339,24 +322,22 @@
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,Velocità con cui valuta Cliente viene convertito in valuta di base del cliente
 DocType: Features Setup,"Available in BOM, Delivery Note, Purchase Invoice, Production Order, Purchase Order, Purchase Receipt, Sales Invoice, Sales Order, Stock Entry, Timesheet","Disponibile in distinta , bolla di consegna , fattura di acquisto , ordine di produzione , ordine di acquisto , ricevuta d'acquisto , fattura di vendita , ordini di vendita , dell'entrata Stock , Timesheet"
 DocType: Item Tax,Tax Rate,Aliquota Fiscale
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Select Item,Seleziona elemento
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +540,Select Item,Seleziona elemento
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +143,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","Voce: {0} gestito non può conciliarsi con \
  della Riconciliazione, utilizzare invece dell'entrata Stock saggio-batch,"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +259,Purchase Invoice {0} is already submitted,Acquisto Fattura {0} è già presentato
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +262,Purchase Invoice {0} is already submitted,Acquisto Fattura {0} è già presentato
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Batch No must be same as {1} {2},Fila # {0}: Lotto n deve essere uguale a {1} {2}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Convert to non-Group,Convert to non-Group
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +55,Purchase Receipt must be submitted,Acquisto ricevuta deve essere presentata
-DocType: Stock UOM Replace Utility,Current Stock UOM,Giacenza Corrente (UdM)
 apps/erpnext/erpnext/config/stock.py +53,Batch (lot) of an Item.,Lotto di un articolo
 DocType: C-Form Invoice Detail,Invoice Date,Data fattura
 DocType: GL Entry,Debit Amount,Importo Debito
 apps/erpnext/erpnext/accounts/party.py +223,There can only be 1 Account per Company in {0} {1},Ci può essere solo 1 account per ogni impresa in {0} {1}
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Your email address,Il tuo indirizzo email
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +194,Please see attachment,Si prega di vedere allegato
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +203,Please see attachment,Si prega di vedere allegato
 DocType: Purchase Order,% Received,% Ricevuto
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +109,Water jet cutting,Taglio a getto d&#39;acqua
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +24,Setup Already Complete!!,Setup già completo !
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +20,Setup Already Complete!!,Setup già completo !
 ,Finished Goods,Beni finiti
 DocType: Delivery Note,Instructions,Istruzione
 DocType: Quality Inspection,Inspected By,Verifica a cura di
@@ -371,6 +352,7 @@
 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.,Si prega di non creare account per clienti e fornitori. Essi vengono creati direttamente dai maestri cliente / fornitore.
 DocType: Currency Exchange,Currency Exchange,Cambio Valuta
 DocType: Purchase Invoice Item,Item Name,Nome dell&#39;articolo
+DocType: Authorization Rule,Approving User  (above authorized value),Approvazione utente (sopra il valore autorizzato)
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Credit Balance,Balance Credit
 DocType: Employee,Widowed,Vedovo
 DocType: Production Planning Tool,"Items to be requested which are ""Out of Stock"" considering all warehouses based on projected qty and minimum order qty",Articoli da richieste che sono &quot;out of stock&quot; considerando tutti i magazzini in base qty proiettata e qty minimo di ordine
@@ -380,11 +362,10 @@
 ,Purchase Register,Acquisto Registrati
 DocType: Landed Cost Item,Applicable Charges,Spese applicabili
 DocType: Workstation,Consumable Cost,Costo consumabili
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,{0} ({1}) must have role 'Leave Approver',{0} ({1}) deve avere il ruolo 'Approvatore Ferie'
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +167,{0} ({1}) must have role 'Leave Approver',{0} ({1}) deve avere il ruolo 'Approvatore Ferie'
 DocType: Purchase Receipt,Vehicle Date,Veicolo
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +39,Medical,Medico
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +39,Medical,Medico
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,Motivo per Perdere
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +36,Tube beading,Tubo bordatura
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},Workstation è chiuso nei seguenti giorni secondo l'elenco di vacanza: {0}
 DocType: Employee,Single,Singolo
 DocType: Issue,Attachment,Attaccamento
@@ -405,10 +386,8 @@
 DocType: Account,Is Group,Is Group
 DocType: Stock Settings,Automatically Set Serial Nos based on FIFO,Imposta automaticamente seriale Nos sulla base FIFO
 DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,Controllare fornitore Numero fattura Uniqueness
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +31,Thermoforming,Termoformatura
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +66,Slitting,Taglio
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +57,'To Case No.' cannot be less than 'From Case No.','A Case N.' non puo essere minore di 'Da Case N.'
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +104,Non Profit,Non Profit
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +104,Non Profit,Non Profit
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_list.js +7,Not Started,Non Iniziato
 DocType: Lead,Channel Partner,Canale Partner
 DocType: Account,Old Parent,Vecchio genitore
@@ -417,13 +396,12 @@
 apps/erpnext/erpnext/config/manufacturing.py +74,Global settings for all manufacturing processes.,Impostazioni globali per tutti i processi produttivi.
 DocType: Accounts Settings,Accounts Frozen Upto,Conti congelati Fino
 DocType: SMS Log,Sent On,Inviata il
-apps/erpnext/erpnext/stock/doctype/item/item.py +512,Attribute {0} selected multiple times in Attributes Table,Attributo {0} selezionato più volte in Attributi Tabella
+apps/erpnext/erpnext/stock/doctype/item/item.py +516,Attribute {0} selected multiple times in Attributes Table,Attributo {0} selezionato più volte in Attributi Tabella
 DocType: Sales Order,Not Applicable,Non Applicabile
 apps/erpnext/erpnext/config/hr.py +140,Holiday master.,Maestro di vacanza .
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +19,Shell molding,Stampaggio Shell
 DocType: Material Request Item,Required Date,Data richiesta
 DocType: Delivery Note,Billing Address,Indirizzo Fatturazione
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +644,Please enter Item Code.,Inserisci il codice dell'articolo.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +648,Please enter Item Code.,Inserisci il codice dell'articolo.
 DocType: BOM,Costing,Valutazione Costi
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount","Se selezionato, l&#39;importo della tassa sarà considerata già inclusa nel Stampa Valuta / Stampa Importo"
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,Totale Quantità
@@ -433,7 +411,7 @@
 DocType: Item Attribute,To Range,Per Intervallo
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,I titoli e depositi
 DocType: Features Setup,Imports,Importazioni
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +144,Adhesive bonding,Incollaggio
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +77,Total leaves allocated is mandatory,Foglie totali assegnate è obbligatoria
 DocType: Job Opening,Description of a Job Opening,Descrizione di una apertura di lavoro
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +102,Pending activities for today,Attività di attesa per oggi
 apps/erpnext/erpnext/config/hr.py +28,Attendance record.,Archivio Presenze
@@ -441,26 +419,25 @@
 DocType: Sales Order Item,Used for Production Plan,Usato per Piano di Produzione
 DocType: System Settings,Loading...,Caricamento in corso ...
 DocType: DocField,Password,Parola d&#39;ordine
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +155,Fused deposition modeling,Fused Deposition Modeling
 DocType: Manufacturing Settings,Time Between Operations (in mins),Tempo tra le operazioni (in minuti)
 DocType: Customer,Buyer of Goods and Services.,Durante l'acquisto di beni e servizi.
 DocType: Journal Entry,Accounts Payable,Conti pagabili
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +24,Add Subscribers,Aggiungi abbonati
 apps/erpnext/erpnext/public/js/feature_setup.js +220,""" does not exists","""Non esiste"
 DocType: Pricing Rule,Valid Upto,Valido Fino
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +564,List a few of your customers. They could be organizations or individuals.,Elencare alcuni dei vostri clienti . Potrebbero essere organizzazioni o individui .
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,List a few of your customers. They could be organizations or individuals.,Elencare alcuni dei vostri clienti . Potrebbero essere organizzazioni o individui .
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Direct Income,reddito diretta
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +33,"Can not filter based on Account, if grouped by Account","Non è possibile filtrare sulla base di conto , se raggruppati per conto"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +88,Administrative Officer,responsabile amministrativo
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Administrative Officer,responsabile amministrativo
 DocType: Payment Tool,Received Or Paid,Ricevuto o pagato
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +318,Please select Company,Selezionare prego
 DocType: Stock Entry,Difference Account,account differenza
 apps/erpnext/erpnext/projects/doctype/task/task.py +44,Cannot close task as its dependant task {0} is not closed.,Impossibile chiudere compito il compito dipendente {0} non è chiuso.
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +305,Please enter Warehouse for which Material Request will be raised,Inserisci il Magazzino per cui Materiale richiesta sarà sollevata
 DocType: Production Order,Additional Operating Cost,Ulteriori costi di funzionamento
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +20,Cosmetics,cosmetici
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,cosmetici
 DocType: DocField,Type,Tipo
-apps/erpnext/erpnext/stock/doctype/item/item.py +417,"To merge, following properties must be same for both items","Per unire , seguenti proprietà devono essere uguali per entrambe le voci"
+apps/erpnext/erpnext/stock/doctype/item/item.py +421,"To merge, following properties must be same for both items","Per unire , seguenti proprietà devono essere uguali per entrambe le voci"
 DocType: Communication,Subject,Oggetto
 DocType: Shipping Rule,Net Weight,Peso netto
 DocType: Employee,Emergency Phone,Telefono di emergenza
@@ -470,7 +447,6 @@
 DocType: Journal Entry,Difference (Dr - Cr),Differenza ( Dr - Cr )
 DocType: Account,Profit and Loss,Profitti e Perdite
 apps/erpnext/erpnext/config/stock.py +293,Managing Subcontracting,Gestione Subfornitura
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +58,New UOM must NOT be of type Whole Number,La nuova unità di misura NON deve essere di tipo numero intero
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Furniture and Fixture,Mobili e Fixture
 DocType: Quotation,Rate at which Price list currency is converted to company's base currency,Tasso al quale Listino valuta viene convertita in valuta di base dell&#39;azienda
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Account {0} does not belong to company: {1},Il Conto {0} non appartiene alla società: {1}
@@ -490,14 +466,14 @@
 DocType: Purchase Invoice,Supplier Invoice No,Fornitore fattura n
 DocType: Territory,For reference,Per riferimento
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +154,"Cannot delete Serial No {0}, as it is used in stock transactions","Impossibile eliminare N. di serie {0}, come si usa in transazioni di borsa"
-apps/erpnext/erpnext/public/js/account_tree_grid.js +52,Closing (Cr),Chiusura (Cr)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +227,Closing (Cr),Chiusura (Cr)
 DocType: Serial No,Warranty Period (Days),Periodo di garanzia (Giorni)
 DocType: Installation Note Item,Installation Note Item,Installazione Nota articolo
 ,Pending Qty,In attesa Quantità
 DocType: Job Applicant,Thread HTML,HTML Discussione
 DocType: Company,Ignore,Ignora
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +86,SMS sent to following numbers: {0},SMS inviato al seguenti numeri: {0}
-apps/erpnext/erpnext/controllers/buying_controller.py +135,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Magazzino Fornitore obbligatorio per subappaltato ricevuta d'acquisto
+apps/erpnext/erpnext/controllers/buying_controller.py +126,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Magazzino Fornitore obbligatorio per subappaltato ricevuta d'acquisto
 DocType: Pricing Rule,Valid From,valido dal
 DocType: Sales Invoice,Total Commission,Commissione Totale
 DocType: Pricing Rule,Sales Partner,Partner di vendita
@@ -505,7 +481,7 @@
 DocType: Monthly Distribution,"**Monthly Distribution** helps you distribute your budget across months if you have seasonality in your business.
 
 To distribute a budget using this distribution, set this **Monthly Distribution** in the **Cost Center**","La **distribuzione mensile** aiuta a distribuire il budget attraverso mesi se si dispone di stagionalità nel vostro business. Per distribuire un budget con questa distribuzione, impostare questa **Distribuzione mensile** nel **Centro di costo**"
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +183,No records found in the Invoice table,Nessun record trovato nella tabella Fattura
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +130,No records found in the Invoice table,Nessun record trovato nella tabella Fattura
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +20,Please select Company and Party Type first,Selezionare prego e Partito Tipo primo
 apps/erpnext/erpnext/config/accounts.py +84,Financial / accounting year.,Esercizio finanziario / contabile .
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","Siamo spiacenti , Serial Nos non può essere fusa"
@@ -521,25 +497,25 @@
 DocType: Sales Order,Billing and Delivery Status,Fatturazione e di condizione di consegna
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Ripetere i clienti
 DocType: Leave Control Panel,Allocate,Assegna
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +16,Previous,precedente
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard_page.html +16,Previous,precedente
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +620,Sales Return,Ritorno di vendite
 DocType: Production Planning Tool,Select Sales Orders from which you want to create Production Orders.,Selezionare gli ordini di vendita da cui si desidera creare gli ordini di produzione.
 DocType: Item,Delivered by Supplier (Drop Ship),Consegnato da Supplier (Drop Ship)
 apps/erpnext/erpnext/config/hr.py +120,Salary components.,Componenti stipendio.
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,Database Potenziali Clienti.
+DocType: Authorization Rule,Customer or Item,Cliente o Voce
 apps/erpnext/erpnext/config/crm.py +17,Customer database.,Database Cliente.
 DocType: Quotation,Quotation To,Preventivo Per
 DocType: Lead,Middle Income,Reddito Medio
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),Opening ( Cr )
 apps/erpnext/erpnext/accounts/utils.py +193,Allocated amount can not be negative,Importo concesso non può essere negativo
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +123,Tumbling,Tumbling
 DocType: Purchase Order Item,Billed Amt,Importo Fatturato
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,Un Deposito logica a fronte del quale sono calcolate le scorte.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +92,Reference No & Reference Date is required for {0},N. di riferimento & Reference Data è necessario per {0}
 DocType: Event,Wednesday,Mercoledì
 DocType: Sales Invoice,Customer's Vendor,Fornitore del Cliente
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +214,Production Order is Mandatory,Ordine di produzione è obbligatorio
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +139,Proposal Writing,Scrivere proposta
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,Proposal Writing,Scrivere proposta
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,Un&#39;altra Sales Person {0} esiste con lo stesso ID Employee
 apps/erpnext/erpnext/stock/stock_ledger.py +336,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},Negativo Archivio Error ( {6} ) per la voce {0} in Magazzino {1} su {2} {3} {4} {5}
 DocType: Fiscal Year Company,Fiscal Year Company,Anno Fiscale Società
@@ -562,7 +538,7 @@
 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.","Poi Regole dei prezzi vengono filtrati in base a cliente, Gruppo Cliente, Territorio, Fornitore, Fornitore Tipo, Campagna, Partner di vendita ecc"
 apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.py +179,Please install dropbox python module,Si prega di installare dropbox modulo python
 DocType: Employee,Passport Number,Numero di passaporto
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +82,Manager,Manager
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Manager,Manager
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +494,From Purchase Receipt,Da Ricevuta di Acquisto
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +219,Same item has been entered multiple times.,Lo stesso oggetto è stato inserito più volte.
 DocType: SMS Settings,Receiver Parameter,Ricevitore Parametro
@@ -570,10 +546,9 @@
 DocType: Sales Person,Sales Person Targets,Sales Person Obiettivi
 apps/frappe/frappe/public/js/frappe/form/workflow.js +116,To,a
 apps/frappe/frappe/templates/base.html +145,Please enter email address,Si prega di inserire l'indirizzo email
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +35,End tube forming,Tubo End formando
 DocType: Production Order Operation,In minutes,In pochi minuti
 DocType: Issue,Resolution Date,Risoluzione Data
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +635,Please set default Cash or Bank account in Mode of Payment {0},Si prega di impostare di default Contanti o conto bancario in Modalità di pagamento {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +637,Please set default Cash or Bank account in Mode of Payment {0},Si prega di impostare di default Contanti o conto bancario in Modalità di pagamento {0}
 DocType: Selling Settings,Customer Naming By,Cliente nominato di
 apps/erpnext/erpnext/accounts/doctype/account/account.js +67,Convert to Group,Convert to Group
 DocType: Activity Cost,Activity Type,Tipo Attività
@@ -581,12 +556,12 @@
 DocType: Customer,Fixed Days,Giorni fissi
 DocType: Sales Invoice,Packing List,Lista di imballaggio
 apps/erpnext/erpnext/config/buying.py +28,Purchase Orders given to Suppliers.,Ordini di acquisto prestate a fornitori.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +43,Publishing,editoria
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +43,Publishing,editoria
 DocType: Activity Cost,Projects User,Progetti utente
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Consumed,Consumato
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +198,{0}: {1} not found in Invoice Details table,{0}: {1} non trovato in tabella Dettagli Fattura
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,{0}: {1} not found in Invoice Details table,{0}: {1} non trovato in tabella Dettagli Fattura
 DocType: Company,Round Off Cost Center,Arrotondamento Centro di costo
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +208,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Manutenzione Visita {0} deve essere cancellato prima di annullare questo ordine di vendita
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +203,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Manutenzione Visita {0} deve essere cancellato prima di annullare questo ordine di vendita
 DocType: Material Request,Material Transfer,Material Transfer
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +56,Opening (Dr),Opening ( Dr)
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},Distacco timestamp deve essere successiva {0}
@@ -598,7 +573,6 @@
 DocType: Pricing Rule,Sales Manager,Direttore Delle Vendite
 apps/frappe/frappe/public/js/frappe/model/model.js +492,Rename,rinominare
 DocType: Journal Entry,Write Off Amount,Scrivi Off Importo
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +52,Bending,Curvatura
 apps/frappe/frappe/core/page/user_permissions/user_permissions.js +246,Allow User,Consentire Utente
 DocType: Journal Entry,Bill No,Fattura N.
 DocType: Purchase Invoice,Quarterly,Trimestralmente
@@ -608,17 +582,16 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Please enter item details,Inserisci il dettaglio articolo
 DocType: Purchase Receipt,Other Details,Altri dettagli
 DocType: Account,Accounts,Conti
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +67,Marketing,Marketing
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +65,Straight shearing,Taglio dritto
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +67,Marketing,Marketing
 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.,Per tenere traccia di voce in documenti di vendita e di acquisto in base alle loro n ° di serie. Questo è può anche usato per rintracciare informazioni sulla garanzia del prodotto.
 DocType: Purchase Receipt Item Supplied,Current Stock,Giacenza Corrente
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +99,Rejected Warehouse is mandatory against regected item,Warehouse Respinto è obbligatoria alla voce regected
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +102,Rejected Warehouse is mandatory against regected item,Warehouse Respinto è obbligatoria alla voce regected
 DocType: Account,Expenses Included In Valuation,Spese incluse nella Valutazione
 DocType: Employee,Provide email id registered in company,Fornire id-mail registrato in azienda
 DocType: Hub Settings,Seller City,Città Venditore
 DocType: Email Digest,Next email will be sent on:,La prossimo Email verrà inviato:
 DocType: Offer Letter Term,Offer Letter Term,Offerta Lettera Termine
-apps/erpnext/erpnext/stock/doctype/item/item.py +492,Item has variants.,Articolo ha varianti.
+apps/erpnext/erpnext/stock/doctype/item/item.py +496,Item has variants.,Articolo ha varianti.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Articolo {0} non trovato
 DocType: Bin,Stock Value,Valore Giacenza
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,albero Type
@@ -627,10 +600,9 @@
 DocType: Material Request Item,Quantity and Warehouse,Quantità e Magazzino
 DocType: Sales Invoice,Commission Rate (%),Tasso Commissione (%)
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +172,"Against Voucher Type must be one of Sales Order, Sales Invoice or Journal Entry","Contro Voucher tipo deve essere uno dei Sales Order, Fattura o diario"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +139,Biomachining,Biomachining
 apps/erpnext/erpnext/setup/utils.py +89,Unable to find exchange rate,Impossibile trovare il tasso di cambio
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +7,Aerospace,aerospaziale
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +19,Welcome,benvenuto
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +7,Aerospace,aerospaziale
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +40,Welcome,benvenuto
 DocType: Journal Entry,Credit Card Entry,Entry Carta di Credito
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +18,Task Subject,Oggetto Attività
 apps/erpnext/erpnext/config/stock.py +33,Goods received from Suppliers.,Merci ricevute dai fornitori.
@@ -653,19 +625,19 @@
 DocType: Employee,Cell Number,Numero di Telefono
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,perso
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +120,You can not enter current voucher in 'Against Journal Entry' column,Non è possibile immettere buono attuale in 'Against Journal Entry' colonna
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +25,Energy,Energia
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,Energia
 DocType: Opportunity,Opportunity From,Opportunità da
 apps/erpnext/erpnext/config/hr.py +33,Monthly salary statement.,Busta Paga Mensile.
 DocType: Item Group,Website Specifications,Website Specifiche
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +205,New Account,Nuovo Account
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +21,{0}: From {0} of type {1},{0}: Da {0} di tipo {1}
-apps/erpnext/erpnext/controllers/buying_controller.py +283,Row {0}: Conversion Factor is mandatory,Riga {0}: fattore di conversione è obbligatoria
+apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,Riga {0}: fattore di conversione è obbligatoria
 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.,Le voci di contabilità può essere fatta contro nodi foglia. Non sono ammesse le voci contro gruppi.
 DocType: ToDo,High,Alto
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +361,Cannot deactivate or cancel BOM as it is linked with other BOMs,Impossibile disattivare o cancellare distinta in quanto è collegata con altri BOM
 DocType: Opportunity,Maintenance,Manutenzione
 DocType: User,Male,Maschio
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +182,Purchase Receipt number required for Item {0},Acquisto Ricevuta richiesta per la voce {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +183,Purchase Receipt number required for Item {0},Acquisto Ricevuta richiesta per la voce {0}
 DocType: Item Attribute Value,Item Attribute Value,Valore Attributo Articolo
 apps/erpnext/erpnext/config/crm.py +64,Sales campaigns.,Campagne di vendita .
 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.
@@ -713,10 +685,9 @@
 DocType: Address,Personal,Personale
 DocType: Expense Claim Detail,Expense Claim Type,Tipo Rimborso Spese
 DocType: Shopping Cart Settings,Default settings for Shopping Cart,Impostazioni predefinite per Carrello
-apps/erpnext/erpnext/controllers/accounts_controller.py +324,"Journal Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Diario {0} è legata contro Order {1}, controllare se deve essere tirato come anticipo in questa fattura."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +13,Biotechnology,Biotecnologia
+apps/erpnext/erpnext/controllers/accounts_controller.py +325,"Journal Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Diario {0} è legata contro Order {1}, controllare se deve essere tirato come anticipo in questa fattura."
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +13,Biotechnology,Biotecnologia
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Office Maintenance Expenses,Spese Manutenzione Ufficio
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +53,Hemming,Hemming
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +66,Please enter Item first,Inserisci articolo prima
 DocType: Account,Liability,responsabilità
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +62,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Importo sanzionato non può essere maggiore di rivendicazione Importo in riga {0}.
@@ -729,10 +700,10 @@
 DocType: Company,Default Bank Account,Conto Banca Predefinito
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +47,"To filter based on Party, select Party Type first","Per filtrare sulla base del partito, selezionare Partito Digitare prima"
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},'Aggiorna Scorte' non può essere selezionato perché gli articoli non vengono recapitati tramite {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Nos,nos
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Nos,nos
 DocType: Item,Items with higher weightage will be shown higher,Gli articoli con maggiore weightage nel periodo più alto
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Dettaglio Riconciliazione Banca
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +627,My Invoices,Le mie fatture
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +629,My Invoices,Le mie fatture
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,Nessun dipendente trovato
 DocType: Purchase Order,Stopped,Arrestato
 DocType: Item,If subcontracted to a vendor,Se subappaltato a un fornitore
@@ -751,35 +722,33 @@
 DocType: Features Setup,"To enable ""Point of Sale"" features",Per attivare la &quot;Point of Sale&quot; caratteristiche
 DocType: Bin,Moving Average Rate,Tasso Media Mobile
 DocType: Production Planning Tool,Select Items,Selezionare Elementi
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,{0} against Bill {1} dated {2},{0} contro Bill {1} ​​in data {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +328,{0} against Bill {1} dated {2},{0} contro Bill {1} ​​in data {2}
 DocType: Comment,Reference Name,Nome di riferimento
 DocType: Maintenance Visit,Completion Status,Stato Completamento
 DocType: Sales Invoice Item,Target Warehouse,Obiettivo Warehouse
 DocType: Item,Allow over delivery or receipt upto this percent,Consenti superamento ricezione o invio fino a questa percentuale
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +49,Expected Delivery Date cannot be before Sales Order Date,Data prevista di consegna non può essere precedente Sales Order Data
 DocType: Upload Attendance,Import Attendance,Importa presenze
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +17,All Item Groups,Tutti i gruppi di articoli
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +17,All Item Groups,Tutti i gruppi di articoli
 DocType: Process Payroll,Activity Log,Log Attività
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +30,Net Profit / Loss,Utile / Perdita
 apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,Comporre automaticamente il messaggio di presentazione delle transazioni .
 DocType: Production Order,Item To Manufacture,Articolo per la fabbricazione
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +16,Permanent mold casting,Colata in conchiglia
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} stato è {2}
 apps/erpnext/erpnext/config/learn.py +172,Purchase Order to Payment,Ordine d&#39;acquisto a pagamento
 DocType: Sales Order Item,Projected Qty,Qtà Proiettata
 DocType: Sales Invoice,Payment Due Date,Pagamento Due Date
 DocType: Newsletter,Newsletter Manager,Newsletter Manager
-apps/erpnext/erpnext/stock/doctype/item/item.js +229,Item Variant {0} already exists with same attributes,Prodotto Modello {0} esiste già con gli stessi attributi
+apps/erpnext/erpnext/stock/doctype/item/item.js +231,Item Variant {0} already exists with same attributes,Prodotto Modello {0} esiste già con gli stessi attributi
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening','Apertura'
 DocType: Notification Control,Delivery Note Message,Nota Messaggio Consegna
 DocType: Expense Claim,Expenses,Spese
 DocType: Item Variant Attribute,Item Variant Attribute,Prodotto Modello attributo
 ,Purchase Receipt Trends,Acquisto Tendenze Receipt
 DocType: Appraisal,Select template from which you want to get the Goals,Selezionare modello da cui si desidera ottenere gli Obiettivi
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +77,Research & Development,Ricerca & Sviluppo
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Research & Development,Ricerca & Sviluppo
 ,Amount to Bill,Importo da Bill
 DocType: Company,Registration Details,Dettagli di registrazione
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +75,Staking,Picchettamento
 DocType: Item,Re-Order Qty,Quantità Ri-ordino
 DocType: Leave Block List Date,Leave Block List Date,Lascia Block List Data
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +25,Scheduled to send to {0},Programmato per inviare {0}
@@ -790,18 +759,16 @@
 DocType: Sales Invoice Item,Stock Details,Dettagli della
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Valore di progetto
 apps/erpnext/erpnext/config/selling.py +304,Point-of-Sale,Punto vendita
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,Cannot carry forward {0},Non è possibile portare avanti {0}
 apps/erpnext/erpnext/accounts/doctype/account/account.py +91,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","Saldo del conto già in credito, non sei autorizzato a impostare 'saldo deve essere' come 'Debito'"
 DocType: Account,Balance must be,Saldo deve essere
 DocType: Hub Settings,Publish Pricing,Pubblicare Prezzi
 DocType: Notification Control,Expense Claim Rejected Message,Messaggio Rimborso Spese Rifiutato
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +145,Nailing,Chiodatrici
 ,Available Qty,Disponibile Quantità
 DocType: Purchase Taxes and Charges,On Previous Row Total,Sul Fila Indietro totale
 DocType: Salary Slip,Working Days,Giorni lavorativi
 DocType: Serial No,Incoming Rate,Tasso in ingresso
 DocType: Packing Slip,Gross Weight,Peso Lordo
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +410,The name of your company for which you are setting up this system.,Il nome della vostra azienda per la quale si sta configurando questo sistema.
+apps/erpnext/erpnext/public/js/setup_wizard.js +158,The name of your company for which you are setting up this system.,Il nome della vostra azienda per la quale si sta configurando questo sistema.
 DocType: HR Settings,Include holidays in Total no. of Working Days,Includi vacanze in totale n. dei giorni lavorativi
 DocType: Job Applicant,Hold,Trattieni
 DocType: Employee,Date of Joining,Data Adesione
@@ -811,7 +778,6 @@
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +3,View Subscribers,Visualizza abbonati
 DocType: Purchase Invoice Item,Purchase Receipt,RICEVUTA
 ,Received Items To Be Billed,Oggetti ricevuti da fatturare
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +114,Abrasive blasting,Sabbiatura
 DocType: Employee,Ms,Sig.ra
 apps/erpnext/erpnext/config/accounts.py +148,Currency exchange rate master.,Maestro del tasso di cambio di valuta .
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +253,Unable to find Time Slot in the next {0} days for Operation {1},Impossibile trovare tempo di slot nei prossimi {0} giorni per l&#39;operazione {1}
@@ -823,7 +789,7 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +209,Serial No {0} does not belong to Item {1},Serial No {0} non appartiene alla voce {1}
 DocType: Purchase Receipt Item Supplied,Required Qty,Quantità richiesta
 DocType: Bank Reconciliation,Total Amount,Totale Importo
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +32,Internet Publishing,Internet Publishing
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,Internet Publishing
 DocType: Production Planning Tool,Production Orders,Ordini di produzione
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +35,Balance Value,Valore Saldo
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,Lista Prezzo di vendita
@@ -834,7 +800,7 @@
 DocType: Supplier,Default Payable Accounts,Debiti default
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,Employee {0} non è attiva o non esiste
 DocType: Features Setup,Item Barcode,Barcode articolo
-apps/erpnext/erpnext/stock/doctype/item/item.py +487,Item Variants {0} updated,Voce Varianti {0} aggiornato
+apps/erpnext/erpnext/stock/doctype/item/item.py +491,Item Variants {0} updated,Voce Varianti {0} aggiornato
 DocType: Quality Inspection Reading,Reading 6,Lettura 6
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Acquisto Advance Fattura
 DocType: Address,Shop,Negozio
@@ -843,7 +809,7 @@
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,Conto predefinito Banca / Contante  aggiornato automaticamente in Fatture POS quando selezioni questo metodo
 DocType: Employee,Permanent Address Is,Indirizzo permanente è
 DocType: Production Order Operation,Operation completed for how many finished goods?,Operazione completata per quanti prodotti finiti?
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +491,The Brand,La Marca
+apps/erpnext/erpnext/public/js/setup_wizard.js +237,The Brand,La Marca
 apps/erpnext/erpnext/controllers/status_updater.py +163,Allowance for over-{0} crossed for Item {1}.,Indennità per over-{0} attraversato per la voce {1}.
 DocType: Employee,Exit Interview Details,Uscire Dettagli Intervista
 DocType: Item,Is Purchase Item,È Acquisto Voce
@@ -863,16 +829,16 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Indirect Income,Proventi indiretti
 DocType: Payment Tool,Set Payment Amount = Outstanding Amount,Set di Pagamento = debito residuo
 DocType: Contact Us Settings,Address Line 1,"Indirizzo, riga 1"
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Variance,Varianza
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +392,Company Name,Nome Azienda
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +53,Variance,Varianza
+,Company Name,Nome Azienda
 DocType: SMS Center,Total Message(s),Messaggio Total ( s )
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +515,Select Item for Transfer,Selezionare la voce per il trasferimento
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +538,Select Item for Transfer,Selezionare la voce per il trasferimento
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,Visualizzare un elenco di tutti i video di aiuto
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,Selezionare conto capo della banca in cui assegno è stato depositato.
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,Consenti all&#39;utente di modificare Listino cambio nelle transazioni
 DocType: Pricing Rule,Max Qty,Qtà max
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +106,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Riga {0}: Pagamento contro vendite / ordine di acquisto deve essere sempre contrassegnato come anticipo
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +16,Chemical,chimico
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,chimico
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +693,All items have already been transferred for this Production Order.,Tutti gli articoli sono già stati trasferiti per questo ordine di produzione.
 DocType: Process Payroll,Select Payroll Year and Month,Selezionare Payroll Anno e mese
 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""",Vai al gruppo appropriato (solitamente Applicazione dei fondi&gt; Attività correnti&gt; conti bancari e creare un nuovo account (facendo clic su Add Child) di tipo &quot;Banca&quot;
@@ -883,12 +849,12 @@
 DocType: Item,Inspection Criteria,Criteri di ispezione
 apps/erpnext/erpnext/config/accounts.py +101,Tree of finanial Cost Centers.,Albero dei centri di costo finanial .
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,Trasferiti
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +492,Upload your letter head and logo. (you can edit them later).,Carica la tua testa lettera e logo. (È possibile modificare in un secondo momento).
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +156,White,Bianco
+apps/erpnext/erpnext/public/js/setup_wizard.js +238,Upload your letter head and logo. (you can edit them later).,Carica la tua testa lettera e logo. (È possibile modificare in un secondo momento).
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,White,Bianco
 DocType: SMS Center,All Lead (Open),Tutti LEAD (Aperto)
 DocType: Purchase Invoice,Get Advances Paid,Ottenere anticipo pagamento
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +362,Attach Your Picture,Allega la tua foto
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Make ,Fare
+apps/erpnext/erpnext/public/js/setup_wizard.js +112,Attach Your Picture,Allega la tua foto
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +540,Make ,Fare
 DocType: Journal Entry,Total Amount in Words,Importo totale in parole
 DocType: Workflow State,Stop,stop
 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.,Si è verificato un errore . Una ragione probabile potrebbe essere che non si è salvato il modulo. Si prega di contattare support@erpnext.com se il problema persiste .
@@ -897,14 +863,13 @@
 DocType: Lead,Next Contact Date,Successivo Contact Data
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,Quantità di apertura
 DocType: Holiday List,Holiday List Name,Nome Elenco Vacanza
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +168,Stock Options,Stock Options
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +168,Stock Options,Stock Options
 DocType: Journal Entry Account,Expense Claim,Rimborso Spese
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +181,Qty for {0},Quantità per {0}
 DocType: Leave Application,Leave Application,Lascia Application
 apps/erpnext/erpnext/config/hr.py +77,Leave Allocation Tool,Lascia strumento Allocazione
 DocType: Leave Block List,Leave Block List Dates,Lascia Blocco Elenco date
 DocType: Company,If Monthly Budget Exceeded (for expense account),Se Budget Mensile superato (per conto spese)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +56,Trimming,Guarnizione
 DocType: Workstation,Net Hour Rate,Tasso Netto Orario
 DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,Landed Cost ricevuta di acquisto
 DocType: Company,Default Terms,Predefinito Termini
@@ -912,10 +877,9 @@
 DocType: POS Profile,Cash/Bank Account,Conto Cassa/Banca
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,Removed items with no change in quantity or value.,Elementi rimossi senza variazione di quantità o valore.
 DocType: Delivery Note,Delivery To,Consegna a
-apps/erpnext/erpnext/stock/doctype/item/item.py +509,Attribute table is mandatory,Tavolo attributo è obbligatorio
+apps/erpnext/erpnext/stock/doctype/item/item.py +513,Attribute table is mandatory,Tavolo attributo è obbligatorio
 DocType: Production Planning Tool,Get Sales Orders,Ottieni Ordini di Vendita
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} non può essere negativo
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +103,Filing,Limatura
 apps/erpnext/erpnext/templates/form_grid/item_grid.html +72,Discount,Sconto
 DocType: Features Setup,Purchase Discounts,Acquisto Sconti
 DocType: Workstation,Wages,Salari
@@ -932,6 +896,7 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +112,You are the Expense Approver for this record. Please Update the 'Status' and Save,Tu sei il Responsabile approvazione di spesa per questo record . Si prega di aggiornare il 'Stato' e Save
 DocType: Serial No,Creation Document No,Creazione di documenti No
 DocType: Issue,Issue,Questione
+apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account does not match with Company,Conto non corrisponde con la Società
 apps/erpnext/erpnext/config/stock.py +136,"Attributes for Item Variants. e.g Size, Color etc.","Attributi per Voce Varianti. ad esempio Taglia, colore etc."
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +39,WIP Warehouse,WIP Warehouse
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +194,Serial No {0} is under maintenance contract upto {1},Serial No {0} è sotto contratto di manutenzione fino a {1}
@@ -940,7 +905,7 @@
 DocType: Tax Rule,Shipping State,Stato Spedizione
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,L'oggetto deve essere aggiunto utilizzando 'ottenere elementi dal Receipts Purchase pulsante
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,Spese di vendita
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Buying,Comprare standard
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +120,Standard Buying,Comprare standard
 DocType: GL Entry,Against,Previsione
 DocType: Item,Default Selling Cost Center,Centro di costo di vendita di default
 DocType: Sales Partner,Implementation Partner,Partner di implementazione
@@ -961,29 +926,29 @@
 DocType: Time Log Batch,updated via Time Logs,aggiornato via Logs Tempo
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,Età media
 DocType: Opportunity,Your sales person who will contact the customer in future,Il vostro agente di commercio che si metterà in contatto il cliente in futuro
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +588,List a few of your suppliers. They could be organizations or individuals.,Elencare alcuni dei vostri fornitori . Potrebbero essere organizzazioni o individui .
+apps/erpnext/erpnext/public/js/setup_wizard.js +326,List a few of your suppliers. They could be organizations or individuals.,Elencare alcuni dei vostri fornitori . Potrebbero essere organizzazioni o individui .
 DocType: Company,Default Currency,Valuta Predefinita
 DocType: Contact,Enter designation of this Contact,Inserisci designazione di questo contatto
 DocType: Contact Us Settings,Address,Indirizzo
 DocType: Expense Claim,From Employee,Da Dipendente
-apps/erpnext/erpnext/controllers/accounts_controller.py +338,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Attenzione : Il sistema non controlla fatturazione eccessiva poiché importo per la voce {0} in {1} è zero
+apps/erpnext/erpnext/controllers/accounts_controller.py +339,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Attenzione : Il sistema non controlla fatturazione eccessiva poiché importo per la voce {0} in {1} è zero
 DocType: Journal Entry,Make Difference Entry,Crea Voce Differenza
 DocType: Upload Attendance,Attendance From Date,Partecipazione Da Data
 DocType: Appraisal Template Goal,Key Performance Area,Area Chiave Prestazioni
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +54,Transportation,Trasporto
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +54,Transportation,Trasporto
 apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +67, and year: ,e anno:
 DocType: Email Digest,Annual Expense,Spesa annua
 DocType: SMS Center,Total Characters,Totale Personaggi
-apps/erpnext/erpnext/controllers/buying_controller.py +139,Please select BOM in BOM field for Item {0},Seleziona BOM BOM in campo per la voce {0}
+apps/erpnext/erpnext/controllers/buying_controller.py +130,Please select BOM in BOM field for Item {0},Seleziona BOM BOM in campo per la voce {0}
 DocType: C-Form Invoice Detail,C-Form Invoice Detail,C-Form Detagli Fattura
 DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,Pagamento Riconciliazione fattura
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +32,Contribution %,Contributo%
 DocType: Item,website page link,sito web link alla pagina
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +192,Let's prepare the system for first use.,Prepariamo il sistema per il primo utilizzo.
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +242,Let's prepare the system for first use.,Prepariamo il sistema per il primo utilizzo.
 DocType: Company,Company registration numbers for your reference. Tax numbers etc.,"Numeri di registrazione dell'azienda per il vostro riferimento. numero Tassa, ecc"
 DocType: Sales Partner,Distributor,Distributore
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Carrello Regola Spedizione
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +214,Production Order {0} must be cancelled before cancelling this Sales Order,Ordine di produzione {0} deve essere cancellato prima di annullare questo ordine di vendita
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +209,Production Order {0} must be cancelled before cancelling this Sales Order,Ordine di produzione {0} deve essere cancellato prima di annullare questo ordine di vendita
 ,Ordered Items To Be Billed,Articoli ordinati da fatturare
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +24,From Range has to be less than To Range,Da Campo deve essere inferiore al campo
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +21,Select Time Logs and Submit to create a new Sales Invoice.,Selezionare Time Diari e Invia per creare una nuova fattura di vendita.
@@ -1003,14 +968,13 @@
 DocType: Sales Invoice Advance,Sales Invoice Advance,Fattura Advance
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +398,Nothing to request,Niente da chiedere
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date','Data Inizio effettivo' non può essere maggiore di 'Data di fine effettiva'
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +75,Management,Gestione
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +75,Management,Gestione
 apps/erpnext/erpnext/config/projects.py +33,Types of activities for Time Sheets,Tipi di attività per i fogli Tempo
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +14,Investment casting,Microfusione
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +51,Either debit or credit amount is required for {0},È obbligatorio debito o importo del credito per {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""","Questo sarà aggiunto al codice articolo della variante. Ad esempio, se la sigla è ""SM"", e il codice articolo è ""T-SHIRT"", il codice articolo della variante sarà ""T-SHIRT-SM"""
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,Pay Netto (in lettere) sarà visibile una volta che si salva la busta paga.
 apps/frappe/frappe/core/doctype/user/user_list.js +12,Active,Attivo
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +154,Blue,Blu
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +154,Blue,Blu
 DocType: Purchase Invoice,Is Return,È Return
 DocType: Price List Country,Price List Country,Listino Prezzi Nazione
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +123,Further nodes can be only created under 'Group' type nodes,Ulteriori nodi possono essere creati solo sotto i nodi di tipo ' Gruppo '
@@ -1020,18 +984,16 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +22,POS Profile {0} already created for user: {1} and company {2},POS Profilo {0} già creato per l&#39;utente: {1} e società {2}
 DocType: Purchase Order Item,UOM Conversion Factor,Fattore di Conversione UOM
 DocType: Stock Settings,Default Item Group,Gruppo elemento Predefinito
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +156,Laminated object manufacturing,Fabbricazione oggetti in laminato
 apps/erpnext/erpnext/config/buying.py +13,Supplier database.,Banca dati dei fornitori.
 DocType: Account,Balance Sheet,bilancio patrimoniale
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +561,Cost Center For Item with Item Code ',Centro di costo per articoli con Codice Prodotto '
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +45,Stretch forming,Stretch formando
 DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,Il rivenditore avrà un ricordo in questa data per contattare il cliente
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +210,"Further accounts can be made under Groups, but entries can be made against non-Groups","Ulteriori conti possono essere fatti in Gruppi, ma le voci possono essere fatte contro i non-Gruppi"
 apps/erpnext/erpnext/config/hr.py +125,Tax and other salary deductions.,Fiscale e di altre deduzioni salariali.
 DocType: Lead,Lead,Contatto
 DocType: Email Digest,Payables,Debiti
 DocType: Account,Warehouse,magazzino
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +90,Row #{0}: Rejected Qty can not be entered in Purchase Return,Row # {0}: Rifiutato Quantità non è possibile entrare in acquisto di ritorno
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +93,Row #{0}: Rejected Qty can not be entered in Purchase Return,Row # {0}: Rifiutato Quantità non è possibile entrare in acquisto di ritorno
 ,Purchase Order Items To Be Billed,Ordine di Acquisto Articoli da fatturare
 DocType: Purchase Invoice Item,Net Rate,Tasso Netto
 DocType: Purchase Invoice Item,Purchase Invoice Item,Acquisto Articolo Fattura
@@ -1046,13 +1008,13 @@
 DocType: Global Defaults,Current Fiscal Year,Anno Fiscale Corrente
 DocType: Global Defaults,Disable Rounded Total,Disabilita Arrotondamento su Totale
 DocType: Lead,Call,Chiama
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +384,'Entries' cannot be empty,'le voci' non possono essere vuote
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +386,'Entries' cannot be empty,'le voci' non possono essere vuote
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},Fila Duplicate {0} con lo stesso {1}
 ,Trial Balance,Bilancio di verifica
 apps/erpnext/erpnext/config/hr.py +205,Setting up Employees,Impostazione dipendenti
 apps/erpnext/erpnext/public/js/feature_setup.js +220,"Grid ""","grid """
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +150,Please select prefix first,Si prega di selezionare il prefisso prima
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +138,Research,ricerca
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +138,Research,ricerca
 DocType: Maintenance Visit Purpose,Work Done,Attività svolta
 apps/erpnext/erpnext/controllers/item_variant.py +25,Please specify at least one attribute in the Attributes table,Specifica almeno un attributo nella tabella Attributi
 DocType: Contact,User ID,ID utente
@@ -1060,10 +1022,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +57,View Ledger,vista Ledger
 DocType: File,Lft,LFT
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,La prima
-apps/erpnext/erpnext/stock/doctype/item/item.py +394,"An Item Group exists with same name, please change the item name or rename the item group","Un gruppo di elementi esiste con lo stesso nome , si prega di cambiare il nome della voce o rinominare il gruppo di articoli"
+apps/erpnext/erpnext/stock/doctype/item/item.py +398,"An Item Group exists with same name, please change the item name or rename the item group","Un gruppo di elementi esiste con lo stesso nome , si prega di cambiare il nome della voce o rinominare il gruppo di articoli"
 DocType: Communication,Delivery Status,Stato Consegna
 DocType: Production Order,Manufacture against Sales Order,Produzione contro Ordine di vendita
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +517,Rest Of The World,Resto del Mondo
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +455,Rest Of The World,Resto del Mondo
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,L'articolo {0} non può avere Batch
 ,Budget Variance Report,Report Variazione Budget
 DocType: Salary Slip,Gross Pay,Retribuzione lorda
@@ -1074,13 +1036,11 @@
 DocType: BOM Item,Item Description,Descrizione Articolo
 DocType: Payment Tool,Payment Mode,Modalità di pagamento
 DocType: Purchase Invoice,Is Recurring,È ricorrente
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +154,Direct metal laser sintering,Sinterizzazione laser metal diretto
 DocType: Purchase Order,Supplied Items,Elementi in dotazione
 DocType: Production Order,Qty To Manufacture,Qtà da Fabbricare
 DocType: Buying Settings,Maintain same rate throughout purchase cycle,Mantenere la stessa velocità per tutto il ciclo di acquisto
 DocType: Opportunity Item,Opportunity Item,Opportunità articolo
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +61,Temporary Opening,Apertura temporanea
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +41,Cryorolling,Cryorolling
 ,Employee Leave Balance,Saldo del Congedo Dipendete
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +128,Balance for Account {0} must always be {1},Saldo per conto {0} deve essere sempre {1}
 DocType: Address,Address Type,Tipo di indirizzo
@@ -1096,23 +1056,23 @@
 DocType: Journal Entry,Get Outstanding Invoices,Ottieni fatture non saldate
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,Sales Order {0} non è valido
 apps/erpnext/erpnext/setup/doctype/company/company.py +172,"Sorry, companies cannot be merged","Siamo spiacenti , le aziende non possono essere unite"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +145,Small,Piccolo
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Small,Piccolo
 DocType: Employee,Employee Number,Numero Dipendente
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},Caso n ( s) già in uso . Prova da Caso n {0}
 ,Invoiced Amount (Exculsive Tax),Importo fatturato ( Exculsive Tax)
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,Articolo 2
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +59,Account head {0} created,Il Conto Testa {0} creato
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +153,Green,Verde
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Green,Verde
 DocType: Item,Auto re-order,Auto riordino
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +57,Total Achieved,Totale Raggiunto
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +59,Total Achieved,Totale Raggiunto
 DocType: Employee,Place of Issue,Luogo di emissione
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +59,Contract,contratto
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Contract,contratto
 DocType: Report,Disabled,Disabilitato
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +490,UOM coversion factor required for UOM: {0} in Item: {1},Fattore coversion UOM richiesto per Confezionamento: {0} alla voce: {1}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +83,Indirect Expenses,spese indirette
 apps/erpnext/erpnext/controllers/selling_controller.py +163,Row {0}: Qty is mandatory,Riga {0}: Quantità è obbligatorio
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +8,Agriculture,agricoltura
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +611,Your Products or Services,I vostri prodotti o servizi
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,agricoltura
+apps/erpnext/erpnext/public/js/setup_wizard.js +347,Your Products or Services,I vostri prodotti o servizi
 DocType: Mode of Payment,Mode of Payment,Modalità di Pagamento
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,Questo è un gruppo elemento principale e non può essere modificato .
 DocType: Journal Entry Account,Purchase Order,Ordine di acquisto
@@ -1124,7 +1084,7 @@
 DocType: Serial No,Serial No Details,Serial No Dettagli
 DocType: Purchase Invoice Item,Item Tax Rate,Articolo Tax Rate
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +113,"For {0}, only credit accounts can be linked against another debit entry","Per {0}, solo i conti di credito possono essere collegati contro un'altra voce di addebito"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Delivery Note {0} is not submitted,Consegna Note {0} non è presentata
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +470,Delivery Note {0} is not submitted,Consegna Note {0} non è presentata
 apps/erpnext/erpnext/stock/get_item_details.py +136,Item {0} must be a Sub-contracted Item,L'Articolo {0} deve essere di un sub-contratto
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,Attrezzature Capital
 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.","Regola Prezzi viene prima selezionato in base al 'applicare sul campo', che può essere prodotto, Articolo di gruppo o di marca."
@@ -1134,7 +1094,7 @@
 DocType: Appraisal Goal,Goal,Obiettivo
 DocType: Sales Invoice Item,Edit Description,Modifica Descrizione
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +318,Expected Delivery Date is lesser than Planned Start Date.,Data prevista di consegna è minore del previsto Data inizio.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +579,For Supplier,per Fornitore
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +602,For Supplier,per Fornitore
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,Impostazione Tipo di account aiuta nella scelta questo account nelle transazioni.
 DocType: Purchase Invoice,Grand Total (Company Currency),Totale generale (valuta Azienda)
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,Uscita totale
@@ -1160,10 +1120,10 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +74,"Total {0} for all items is zero, may you should change 'Distribute Charges Based On'","Totale {0} per tutte le voci è pari a zero, potrebbe si dovrebbe cambiare &#39;Distribuire Spese Based On&#39;"
 DocType: Purchase Invoice,Taxes and Charges Calculation,Tasse e le spese di calcolo
 DocType: BOM Operation,Workstation,Stazione di lavoro
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +112,Hardware,hardware
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +112,Hardware,hardware
 DocType: Attendance,HR Manager,HR Manager
 apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,Seleziona una società
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +50,Privilege Leave,Lascia Privilege
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +50,Privilege Leave,Lascia Privilege
 DocType: Purchase Invoice,Supplier Invoice Date,Fornitore Data fattura
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +79,You need to enable Shopping Cart,È necessario abilitare Carrello
 apps/frappe/frappe/public/js/frappe/form/grid_body.html +6,No Data,Dati Assenti
@@ -1176,7 +1136,7 @@
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +81,Overlapping conditions found between:,Condizioni sovrapposti trovati tra :
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +168,Against Journal Entry {0} is already adjusted against some other voucher,Contro diario {0} è già regolata contro un altro buono
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +68,Total Order Value,Totale valore di ordine
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +38,Food,cibo
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +38,Food,cibo
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Gamma invecchiamento 3
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +139,You can make a time log only against a submitted production order,È possibile effettuare una registrazione dei tempi solo contro un ordine di produzione presentato
 DocType: Maintenance Schedule Item,No of Visits,Num. di Visite
@@ -1196,6 +1156,7 @@
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,View Offer Letter,Offerte Lettera
 DocType: Communication,Communication,Comunicazione
 DocType: Item,Is Service Item,È il servizio Voce
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +81,Application period cannot be outside leave allocation period,Periodo di applicazione non può essere periodo di assegnazione congedo di fuori
 DocType: Activity Cost,Projects,Progetti
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +31,Please select Fiscal Year,Si prega di selezionare l'anno fiscale
 apps/erpnext/erpnext/controllers/buying_controller.py +23,From {0} | {1} {2},Da {0} | {1} {2}
@@ -1214,7 +1175,7 @@
 DocType: Item,Maintain Stock,Mantenere Scorta
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +213,Stock Entries already created for Production Order ,Le voci di archivio già creati per ordine di produzione
 DocType: Leave Control Panel,Leave blank if considered for all designations,Lasciare vuoto se considerato per tutte le designazioni
-apps/erpnext/erpnext/controllers/accounts_controller.py +499,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Carica di tipo ' Actual ' in riga {0} non può essere incluso nella voce Tasso
+apps/erpnext/erpnext/controllers/accounts_controller.py +500,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Carica di tipo ' Actual ' in riga {0} non può essere incluso nella voce Tasso
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,Max: {0},Max: {0}
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +16,From Datetime,Da Datetime
 DocType: Email Digest,For Company,Per Azienda
@@ -1224,7 +1185,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +50,Chart of Accounts,Grafico dei Conti
 DocType: Material Request,Terms and Conditions Content,Termini e condizioni contenuti
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +471,cannot be greater than 100,non può essere superiore a 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +546,Item {0} is not a stock Item,L'articolo {0} non è in Giagenza
+apps/erpnext/erpnext/stock/doctype/item/item.py +550,Item {0} is not a stock Item,L'articolo {0} non è in Giagenza
 DocType: Maintenance Visit,Unscheduled,Non in programma
 DocType: Employee,Owned,Di proprietà
 DocType: Salary Slip Deduction,Depends on Leave Without Pay,Dipende in aspettativa senza assegni
@@ -1238,31 +1199,29 @@
 DocType: HR Settings,Employee Settings,Impostazioni dipendente
 ,Batch-Wise Balance History,Cronologia Bilanciamento Lotti-Wise
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +72,To Do List,To Do List
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +63,Apprentice,apprendista
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Apprentice,apprendista
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +99,Negative Quantity is not allowed,Quantità negative non è consentito
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
 Used for Taxes and Charges","Dettaglio Tax tavolo prelevato dalla voce principale come una stringa e memorizzati in questo campo.
  Utilizzato per imposte e oneri"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +61,Lancing,Lancing
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +151,Employee cannot report to himself.,Il dipendente non può riportare a se stesso.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Se l'account viene bloccato , le voci sono autorizzati a utenti con restrizioni ."
 DocType: Email Digest,Bank Balance,Saldo bancario
-apps/erpnext/erpnext/controllers/accounts_controller.py +435,Accounting Entry for {0}: {1} can only be made in currency: {2},Contabilità ingresso per {0}: {1} può essere fatto solo in valuta: {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +436,Accounting Entry for {0}: {1} can only be made in currency: {2},Contabilità ingresso per {0}: {1} può essere fatto solo in valuta: {2}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +38,No active Salary Structure found for employee {0} and the month,Nessuna struttura retributiva attivo trovato per dipendente {0} e il mese
 DocType: Job Opening,"Job profile, qualifications required etc.","Profilo del lavoro , qualifiche richieste ecc"
 DocType: Journal Entry Account,Account Balance,Il Conto Bilancio 
 apps/erpnext/erpnext/config/accounts.py +112,Tax Rule for transactions.,Regola fiscale per le operazioni.
 DocType: Rename Tool,Type of document to rename.,Tipo di documento da rinominare.
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +630,We buy this Item,Compriamo questo articolo
+apps/erpnext/erpnext/public/js/setup_wizard.js +366,We buy this Item,Compriamo questo articolo
 DocType: Address,Billing,Fatturazione
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +77,Flanging,Flangiatura
 DocType: Bulk Email,Not Sent,Non Inviato
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +73,Explosive forming,Esplosivo formando
 DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),Totale tasse e spese (Azienda valuta)
 DocType: Shipping Rule,Shipping Account,Account Spedizione
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +43,Scheduled to send to {0} recipients,Programmato per inviare {0} destinatari
 DocType: Quality Inspection,Readings,Letture
 DocType: Stock Entry,Total Additional Costs,Totale Costi aggiuntivi
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Sub Assemblies,sub Assemblies
+apps/erpnext/erpnext/public/js/setup_wizard.js +359,Sub Assemblies,sub Assemblies
 DocType: Shipping Rule Condition,To Value,Per Valore
 DocType: Supplier,Stock Manager,Manager di Giacenza
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +143,Source warehouse is mandatory for row {0},Magazzino Source è obbligatorio per riga {0}
@@ -1272,44 +1231,42 @@
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Importazione non riuscita!
 apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,Nessun indirizzo ancora aggiunto.
 DocType: Workstation Working Hour,Workstation Working Hour,Workstation ore di lavoro
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +83,Analyst,analista
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +202,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Riga {0}: importo assegnato {1} deve essere inferiore o uguale a JV importo {2}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Analyst,analista
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +149,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Riga {0}: importo assegnato {1} deve essere inferiore o uguale a JV importo {2}
 DocType: Item,Inventory,Inventario
 DocType: Features Setup,"To enable ""Point of Sale"" view",Per attivare la &quot;Point of Sale&quot; vista
 apps/erpnext/erpnext/public/js/pos/pos.js +402,Payment cannot be made for empty cart,Il pagamento non può essere effettuato per carrello vuoto
 DocType: Item,Sales Details,Dettagli di vendita
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +149,Pinning,Pinning
 DocType: Opportunity,With Items,Con gli articoli
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,Qtà
 DocType: Notification Control,Expense Claim Rejected,Rimborso Spese Rifiutato
 DocType: Sales Invoice,"The date on which next invoice will be generated. It is generated on submit.
 ",La data in cui viene generato prossima fattura. Viene generato su Invia.
 DocType: Item Attribute,Item Attribute,Attributo Articolo
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +105,Government,governo
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Government,governo
 apps/erpnext/erpnext/config/stock.py +268,Item Variants,Varianti Voce
 DocType: Company,Services,Servizi
 apps/erpnext/erpnext/accounts/report/financial_statements.py +147,Total ({0}),Totale ({0})
 DocType: Cost Center,Parent Cost Center,Parent Centro di costo
 DocType: Sales Invoice,Source,Fonte
 DocType: Leave Type,Is Leave Without Pay,È lasciare senza stipendio
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +186,No records found in the Payment table,Nessun record trovato nella tabella di Pagamento
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +405,Financial Year Start Date,Esercizio Data di inizio
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +133,No records found in the Payment table,Nessun record trovato nella tabella di Pagamento
+apps/erpnext/erpnext/public/js/setup_wizard.js +153,Financial Year Start Date,Esercizio Data di inizio
 DocType: Employee External Work History,Total Experience,Esperienza totale
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +100,Countersinking,Svasatura
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +271,Packing Slip(s) cancelled,Bolla di accompagnamento ( s ) annullato
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +276,Packing Slip(s) cancelled,Bolla di accompagnamento ( s ) annullato
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,Freight Forwarding e spese
 DocType: Material Request Item,Sales Order No,Ordine di vendita No
 DocType: Item Group,Item Group Name,Nome Gruppo Articoli
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +50,Taken,Preso
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,Preso
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +66,Transfer Materials for Manufacture,Trasferimento Materiali per Produzione
 DocType: Pricing Rule,For Price List,Per Listino Prezzi
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +27,Executive Search,executive Search
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,executive Search
 apps/erpnext/erpnext/stock/stock_ledger.py +405,"Purchase rate for item: {0} not found, which is required to book accounting entry (expense). Please mention item price against a buying price list.","Tasso di acquisto per la voce: {0} non trovato, che è necessario per prenotare l'ingresso contabilità (oneri). Si prega di indicare prezzi contro un listino prezzi di acquisto."
 DocType: Maintenance Schedule,Schedules,Orari
 DocType: Purchase Invoice Item,Net Amount,Importo Netto
 DocType: Purchase Order Item Supplied,BOM Detail No,DIBA Dettagli N.
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),Ulteriori Importo Discount (valuta Company)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +537,Error: {0} > {1},Errore: {0} > {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +541,Error: {0} > {1},Errore: {0} > {1}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,Si prega di creare un nuovo account dal Piano dei conti .
 DocType: Maintenance Visit,Maintenance Visit,Visita di manutenzione
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer > Customer Group > Territory,Clienti> Gruppi clienti> Territorio
@@ -1320,7 +1277,6 @@
 DocType: Event,Tuesday,Martedì
 DocType: Leave Block List,Block Holidays on important days.,Vacanze di blocco nei giorni importanti.
 ,Accounts Receivable Summary,Contabilità Sommario Crediti
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +43,Leaves for type {0} already allocated for Employee {1} for period {2} - {3},Parte per il tipo {0} già stanziato per Employee {1} per il periodo {2} - {3}
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +187,Please set User ID field in an Employee record to set Employee Role,Impostare campo ID utente in un record Employee impostare Ruolo Employee
 DocType: UOM,UOM Name,UOM Nome
 DocType: Top Bar Item,Target,Obiettivo
@@ -1332,15 +1288,14 @@
 DocType: ToDo,Due Date,Data di scadenza
 DocType: Sales Invoice Item,Brand Name,Nome Marca
 DocType: Purchase Receipt,Transporter Details,Transporter Dettagli
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Box,Scatola
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +389,The Organization,L'Organizzazione
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Box,Scatola
+apps/erpnext/erpnext/public/js/setup_wizard.js +137,The Organization,L'Organizzazione
 DocType: Monthly Distribution,Monthly Distribution,Distribuzione Mensile
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,Lista Receiver è vuoto . Si prega di creare List Ricevitore
 DocType: Production Plan Sales Order,Production Plan Sales Order,Produzione Piano di ordini di vendita
 DocType: Sales Partner,Sales Partner Target,Vendite Partner di destinazione
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},Ingresso contabile per {0} può essere fatta solo in valuta: {1}
 DocType: Pricing Rule,Pricing Rule,Regola Prezzi
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +58,Notching,Tranciatrice
 apps/erpnext/erpnext/config/learn.py +167,Material Request to Purchase Order,Richiesta materiale per ordine d&#39;acquisto
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +74,Row # {0}: Returned Item {1} does not exists in {2} {3},Row # {0}: restituito Voce {1} non esiste in {2} {3}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,Conti bancari
@@ -1357,20 +1312,19 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Amounts not reflected in bank,Gli importi non riflette in banca
 DocType: Quality Inspection Reading,Reading 4,Lettura 4
 apps/erpnext/erpnext/config/hr.py +23,Claims for company expense.,Reclami per spese dell'azienda.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +8,Centrifugal casting,Colata centrifuga
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +119,Magnetic field-assisted finishing,Finitura campo magnetico assistita
 DocType: Company,Default Holiday List,Predefinito List vacanze
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +165,Stock Liabilities,Passività in Giacenza
 DocType: Purchase Receipt,Supplier Warehouse,Magazzino Fornitore
 DocType: Opportunity,Contact Mobile No,Cellulare Contatto
 DocType: Production Planning Tool,Select Sales Orders,Selezionare Ordini di vendita
 ,Material Requests for which Supplier Quotations are not created,Richieste di materiale con le quotazioni dei fornitori non sono creati
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +117,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,Il giorno (s) in cui si stanno applicando per ferie sono le vacanze. Non è necessario chiedere un permesso.
 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.,Per tenere traccia di elementi con codice a barre. Si sarà in grado di inserire articoli nel DDT e fattura di vendita attraverso la scansione del codice a barre del prodotto.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +477,Mark as Delivered,Segna come Consegnato
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +497,Mark as Delivered,Segna come Consegnato
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +34,Make Quotation,Crea Preventivo
 DocType: Dependent Task,Dependent Task,Task dipendente
-apps/erpnext/erpnext/stock/doctype/item/item.py +306,Conversion factor for default Unit of Measure must be 1 in row {0},Fattore di conversione per unità di misura predefinita deve essere 1 in riga {0}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,Leave of type {0} cannot be longer than {1},Lascia di tipo {0} non può essere superiore a {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +310,Conversion factor for default Unit of Measure must be 1 in row {0},Fattore di conversione per unità di misura predefinita deve essere 1 in riga {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +155,Leave of type {0} cannot be longer than {1},Lascia di tipo {0} non può essere superiore a {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Provare le operazioni per X giorni in programma in anticipo.
 DocType: HR Settings,Stop Birthday Reminders,Arresto Compleanno Promemoria
 DocType: SMS Center,Receiver List,Lista Ricevitore
@@ -1378,15 +1332,14 @@
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Quantità consumata
 apps/erpnext/erpnext/public/js/pos/pos.js +491,{0} View,{0} Vista
 DocType: Salary Structure Deduction,Salary Structure Deduction,Struttura salariale Deduzione
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +158,Selective laser sintering,Sinterizzazione laser selettiva
-apps/erpnext/erpnext/stock/doctype/item/item.py +301,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Unità di misura {0} è stato inserito più di una volta Factor Tabella di conversione
+apps/erpnext/erpnext/stock/doctype/item/item.py +305,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Unità di misura {0} è stato inserito più di una volta Factor Tabella di conversione
 apps/frappe/frappe/core/page/data_import_tool/data_import_tool.js +108,Import Successful!,Importazione Corretta!
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Costo di elementi Emesso
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +185,Quantity must not be more than {0},Quantità non deve essere superiore a {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +41,Age (Days),Età (Giorni)
 DocType: Quotation Item,Quotation Item,Preventivo Articolo
 DocType: Account,Account Name,Nome Conto
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +41,From Date cannot be greater than To Date,Dalla data non può essere maggiore di A Data
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +34,From Date cannot be greater than To Date,Dalla data non può essere maggiore di A Data
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +194,Serial No {0} quantity {1} cannot be a fraction,Serial No {0} {1} quantità non può essere una frazione
 apps/erpnext/erpnext/config/buying.py +59,Supplier Type master.,Fornitore Tipo master.
 DocType: Purchase Order Item,Supplier Part Number,Numero di parte del fornitore
@@ -1395,14 +1348,14 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +247,{0} {1} is cancelled or stopped,{0} {1} viene cancellato o fermato
 DocType: Accounts Settings,Credit Controller,Controllare Credito
 DocType: Delivery Note,Vehicle Dispatch Date,Veicolo Spedizione Data
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +197,Purchase Receipt {0} is not submitted,Acquisto Ricevuta {0} non è presentata
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +198,Purchase Receipt {0} is not submitted,Acquisto Ricevuta {0} non è presentata
 DocType: Company,Default Payable Account,Conto da pagare Predefinito
 apps/erpnext/erpnext/config/website.py +13,"Settings for online shopping cart such as shipping rules, price list etc.","Impostazioni per in linea carrello della spesa, come le regole di trasporto, il listino prezzi ecc"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +660,Setup Complete,installazione completa
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +124,Setup Complete,installazione completa
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +65,{0}% Billed,{0}% Fatturato
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +17,Reserved Qty,Riservato Quantità
 DocType: Party Account,Party Account,Account partito
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +74,Human Resources,Risorse Umane
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +74,Human Resources,Risorse Umane
 DocType: Lead,Upper Income,Reddito superiore
 DocType: Journal Entry Account,Debit in Company Currency,Debito in Società Valuta
 apps/erpnext/erpnext/support/doctype/issue/issue.py +58,My Issues,I miei problemi
@@ -1411,11 +1364,9 @@
 DocType: Company,Default Values,Valori Predefiniti
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +236,Row {0}: Payment amount can not be negative,Riga {0}: Importo del pagamento non può essere negativo
 DocType: Expense Claim,Total Amount Reimbursed,Dell&#39;importo totale rimborsato
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +152,Press fitting,Press raccordo
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +64,Against Supplier Invoice {0} dated {1},Contro Fornitore Invoice {0} {1} datato
 DocType: Customer,Default Price List,Listino Prezzi Predefinito
 DocType: Payment Reconciliation,Payments,Pagamenti
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +24,Hot isostatic pressing,Hot pressatura isostatica
 DocType: ToDo,Medium,Media
 DocType: Budget Detail,Budget Allocated,Budget Assegnato
 DocType: Journal Entry,Entry Type,Tipo voce
@@ -1428,9 +1379,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +56,None of the items have any change in quantity or value.,Nessuno articolo ha modifiche in termini di quantità o di valore.
 DocType: Warranty Claim,Warranty Claim,Richiesta di Garanzia
 ,Lead Details,Dettagli Contatto
-DocType: Authorization Rule,Approving User,Utente Certificatore
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +37,Forging,Forgiatura
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +126,Plating,Placcatura
 DocType: Purchase Invoice,End date of current invoice's period,Data di fine del periodo di fatturazione corrente
 DocType: Pricing Rule,Applicable For,applicabile per
 DocType: Bank Reconciliation,From Date,Da Data
@@ -1452,31 +1400,29 @@
 DocType: Sales Invoice,Paid Amount (Company Currency),Importo versato (Società valuta)
 DocType: Purchase Invoice,Additional Discount,Sconto aggiuntivo
 DocType: Selling Settings,Selling Settings,Vendere Impostazioni
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +39,Online Auctions,Aste online
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,Aste online
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +94,Please specify either Quantity or Valuation Rate or both,Si prega di specificare Quantitativo o Tasso di valutazione o di entrambi
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +50,"Company, Month and Fiscal Year is mandatory","Società , mese e anno fiscale è obbligatoria"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Marketing Expenses,Spese di Marketing
 ,Item Shortage Report,Report Carenza Articolo
-apps/erpnext/erpnext/stock/doctype/item/item.js +183,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Il peso è menzionato, \n prega di citare ""Peso UOM"" troppo"
+apps/erpnext/erpnext/stock/doctype/item/item.js +185,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Il peso è menzionato, \n prega di citare ""Peso UOM"" troppo"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,Richiesta di materiale usato per fare questo Stock Entry
 apps/erpnext/erpnext/config/support.py +43,Single unit of an Item.,Unità singola di un articolo.
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +212,Time Log Batch {0} must be 'Submitted',Tempo Log Lotto {0} deve essere ' inoltrata '
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,Fai Entry Accounting per ogni Archivio Movimento
 DocType: Leave Allocation,Total Leaves Allocated,Totale Foglie allocati
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +384,Warehouse required at Row No {0},Magazzino richiesto al Fila No {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +386,Warehouse required at Row No {0},Magazzino richiesto al Fila No {0}
 DocType: Employee,Date Of Retirement,Data di Pensionamento
 DocType: Upload Attendance,Get Template,Ottieni Modulo
 DocType: Address,Postal,Postale
 DocType: Item,Weightage,Weightage
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +159,Mining,Minerario
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +17,Resin casting,Colata di resina
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"Esiste un Gruppo Clienti con lo stesso nome, per favore cambiare il nome del Cliente o rinominare il Gruppo Clienti"
 apps/erpnext/erpnext/public/js/pos/pos.js +147,Please select {0} first.,Si prega di selezionare {0} prima.
 apps/erpnext/erpnext/templates/pages/order.html +57,text {0},text {0}
 DocType: Territory,Parent Territory,Territorio genitore
 DocType: Quality Inspection Reading,Reading 2,Lettura 2
 DocType: Stock Entry,Material Receipt,Materiale Ricevuta
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +622,Products,prodotti
+apps/erpnext/erpnext/public/js/setup_wizard.js +358,Products,prodotti
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +47,Party Type and Party is required for Receivable / Payable account {0},Partito Tipo e partito è richiesto per Crediti / Debiti conto {0}
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.","Se questa voce ha varianti, allora non può essere selezionata in ordini di vendita, ecc"
 DocType: Lead,Next Contact By,Successivo Contatto Con
@@ -1486,13 +1432,13 @@
 DocType: Purchase Invoice,Notification Email Address,Indirizzo e-mail di notifica
 DocType: Payment Tool,Find Invoices to Match,Trova Fatture per incontri
 ,Item-wise Sales Register,Vendite articolo-saggio Registrati
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +399,"e.g. ""XYZ National Bank""","ad esempio ""XYZ Banca nazionale """
+apps/erpnext/erpnext/public/js/setup_wizard.js +147,"e.g. ""XYZ National Bank""","ad esempio ""XYZ Banca nazionale """
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,È questa tassa inclusi nel prezzo base?
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +57,Total Target,Obiettivo totale
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Target,Obiettivo totale
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.js +22,Shopping Cart is enabled,Carrello è abilitato
 DocType: Job Applicant,Applicant for a Job,Richiedente per un lavoro
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +173,No Production Orders created,Ordini di Produzione non creati
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +131,Salary Slip of employee {0} already created for this month,Salario Slip of dipendente {0} già creato per questo mese
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +140,Salary Slip of employee {0} already created for this month,Salario Slip of dipendente {0} già creato per questo mese
 DocType: Stock Reconciliation,Reconciliation JSON,Riconciliazione JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Troppe colonne. Esportare il report e stamparlo utilizzando un foglio di calcolo.
 DocType: Sales Invoice Item,Batch No,Lotto N.
@@ -1502,14 +1448,14 @@
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +13,Variant,Variante
 apps/frappe/frappe/public/js/frappe/form/toolbar.js +165,New {0},Nuovo {0}
 DocType: Naming Series,Set prefix for numbering series on your transactions,Impostare prefisso per numerazione serie sulle transazioni
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +169,Stopped order cannot be cancelled. Unstop to cancel.,Arrestato ordine non può essere cancellato . Stappare per annullare.
-apps/erpnext/erpnext/stock/doctype/item/item.py +323,Default BOM ({0}) must be active for this item or its template,BOM default ({0}) deve essere attivo per questo articolo o il suo modello
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +164,Stopped order cannot be cancelled. Unstop to cancel.,Arrestato ordine non può essere cancellato . Stappare per annullare.
+apps/erpnext/erpnext/stock/doctype/item/item.py +327,Default BOM ({0}) must be active for this item or its template,BOM default ({0}) deve essere attivo per questo articolo o il suo modello
 DocType: Employee,Leave Encashed?,Lascia incassati?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Opportunity Dal campo è obbligatorio
 DocType: Item,Variants,Varianti
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +458,Make Purchase Order,Crea Ordine d'Acquisto
 DocType: SMS Center,Send To,Invia a
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +111,There is not enough leave balance for Leave Type {0},Non c'è equilibrio congedo sufficiente per Leave tipo {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +127,There is not enough leave balance for Leave Type {0},Non c'è equilibrio congedo sufficiente per Leave tipo {0}
 DocType: Sales Team,Contribution to Net Total,Contributo sul totale netto
 DocType: Sales Invoice Item,Customer's Item Code,Codice elemento Cliente
 DocType: Stock Reconciliation,Stock Reconciliation,Riconciliazione Giacenza
@@ -1546,11 +1492,11 @@
 DocType: Sales Order Item,Actual Qty,Q.tà Reale
 DocType: Sales Invoice Item,References,Riferimenti
 DocType: Quality Inspection Reading,Reading 10,Lettura 10
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +612,"List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start.",Inserisci i tuoi prodotti o servizi che si acquistano o vendono .
+apps/erpnext/erpnext/public/js/setup_wizard.js +348,"List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start.",Inserisci i tuoi prodotti o servizi che si acquistano o vendono .
 DocType: Hub Settings,Hub Node,Hub Node
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,Hai inserito gli elementi duplicati . Si prega di correggere e riprovare .
 apps/erpnext/erpnext/controllers/item_variant.py +65,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values,Valore {0} per attributo {1} non esiste nella lista della voce validi i valori degli attributi
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +87,Associate,Associate
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Associate,Associate
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +46,Item {0} is not a serialized Item,L'articolo {0} non è un elemento serializzato
 DocType: SMS Center,Create Receiver List,Crea Elenco Ricezione
 apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +5,Expired,Scaduto
@@ -1559,7 +1505,7 @@
 DocType: Warranty Claim,Issue Date,Data di Emissione
 DocType: Activity Cost,Activity Cost,Attività Costo
 DocType: Purchase Receipt Item Supplied,Consumed Qty,Q.tà Consumata
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +52,Telecommunications,Telecomunicazioni
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +52,Telecommunications,Telecomunicazioni
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),Indica che il pacchetto è una parte di questa consegna (solo Bozza)
 DocType: Payment Tool,Make Payment Entry,Crea Voce Pagamento
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +119,Quantity for Item {0} must be less than {1},Quantità per la voce {0} deve essere inferiore a {1}
@@ -1576,10 +1522,8 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +37,"Selling must be checked, if Applicable For is selected as {0}","Vendita deve essere controllato, se applicabile per è selezionato come {0}"
 DocType: Purchase Order Item,Supplier Quotation Item,Preventivo Articolo Fornitore
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +27,Make Salary Structure,Crea Struttura Salariale
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +54,Shearing,Tosatura
 DocType: Item,Has Variants,Ha Varianti
 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.,Clicca sul pulsante 'Crea Fattura Vendita' per creare una nuova Fattura di Vendita
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +166,Packaging and labeling,Imballaggi ed etichettatura
 DocType: Monthly Distribution,Name of the Monthly Distribution,Nome della distribuzione mensile
 DocType: Sales Person,Parent Sales Person,Parent Sales Person
 apps/erpnext/erpnext/setup/utils.py +14,Please specify Default Currency in Company Master and Global Defaults,Siete pregati di specificare Valuta predefinita in azienda Maestro e predefiniti globali
@@ -1590,19 +1534,18 @@
 DocType: Budget Detail,Fiscal Year,Anno Fiscale
 DocType: Cost Center,Budget,Budget
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +41,"Budget cannot be assigned against {0}, as it's not an Income or Expense account","Bilancio non può essere assegnato contro {0}, in quanto non è un conto entrate o uscite"
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Achieved,Raggiunto
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,Raggiunto
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +65,Territory / Customer,Territorio / Cliente
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,e.g. 5,ad esempio 5
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +207,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},Riga {0}: importo assegnato {1} deve essere inferiore o uguale a fatturare importo residuo {2}
+apps/erpnext/erpnext/public/js/setup_wizard.js +294,e.g. 5,ad esempio 5
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},Riga {0}: importo assegnato {1} deve essere inferiore o uguale a fatturare importo residuo {2}
 DocType: Sales Invoice,In Words will be visible once you save the Sales Invoice.,In parole saranno visibili una volta che si salva la fattura di vendita.
 DocType: Item,Is Sales Item,È Voce vendite
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,Struttura Gruppi Articoli
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,L'articolo {0} non ha Numeri di Serie. Verifica l'Articolo Principale
 DocType: Maintenance Visit,Maintenance Time,Tempo di Manutenzione
 ,Amount to Deliver,Importo da consegnare
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +620,A Product or Service,Un prodotto o servizio
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +158,There were errors.,Ci sono stati degli errori .
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +101,Tapping,Toccando
+apps/erpnext/erpnext/public/js/setup_wizard.js +356,A Product or Service,Un prodotto o servizio
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +146,There were errors.,Ci sono stati degli errori .
 DocType: Naming Series,Current Value,Valore Corrente
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +171,{0} created,{0} creato
 DocType: Delivery Note Item,Against Sales Order,Contro Sales Order
@@ -1617,7 +1560,7 @@
 apps/erpnext/erpnext/accounts/party.py +275,Due Date cannot be before Posting Date,Data di scadenza non può essere precedente Data di registrazione
 DocType: Website Item Group,Website Item Group,Sito Gruppo Articolo
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Duties and Taxes,Dazi e tasse
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Please enter Reference date,Inserisci Data di riferimento
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +312,Please enter Reference date,Inserisci Data di riferimento
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} voci di pagamento non possono essere filtrate per {1}
 DocType: Item Website Specification,Table for Item that will be shown in Web Site,Tavolo per la voce che verrà mostrato in Sito Web
 DocType: Purchase Order Item Supplied,Supplied Qty,Dotazione Qtà
@@ -1625,7 +1568,7 @@
 apps/erpnext/erpnext/config/stock.py +103,Tree of Item Groups.,Albero di gruppi di articoli .
 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,Non può consultare numero di riga maggiore o uguale al numero di riga corrente per questo tipo di carica
 ,Item-wise Purchase History,Articolo-saggio Cronologia acquisti
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +152,Red,Rosso
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Red,Rosso
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +228,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},Si prega di cliccare su ' Generate Schedule ' a prendere Serial No aggiunto per la voce {0}
 DocType: Account,Frozen,Congelato
 ,Open Production Orders,Aprire ordini di produzione
@@ -1640,7 +1583,7 @@
 DocType: Item Attribute,Attribute Name,Nome Attributo
 apps/erpnext/erpnext/controllers/selling_controller.py +236,Item {0} must be Sales or Service Item in {1},L'Articolo {0} deve essere un'Articolo in Vendita o un Servizio in {1}
 DocType: Item Group,Show In Website,Mostra Nel Sito Web
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +621,Group,Gruppo
+apps/erpnext/erpnext/public/js/setup_wizard.js +357,Group,Gruppo
 DocType: Task,Expected Time (in hours),Tempo previsto (in ore)
 ,Qty to Order,Qtà da Ordinare
 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","Per tenere traccia di marca nei seguenti documenti DDT, Opportunità, Richiesta materiale, punto, ordine di acquisto, Buono Acquisto, l&#39;Acquirente Scontrino fiscale, Quotazione, Fattura, Product Bundle, ordini di vendita, Numero di serie"
@@ -1650,6 +1593,7 @@
 DocType: Features Setup,Brands,Marche
 DocType: C-Form Invoice Detail,Invoice No,Fattura n
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +480,From Purchase Order,Da Ordine di Acquisto
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +92,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Lasciare non può essere applicata / annullato prima {0}, come equilibrio congedo è già stato inoltrato carry-in futuro record di assegnazione congedo {1}"
 DocType: Activity Cost,Costing Rate,Costing Tasso
 ,Customer Addresses And Contacts,Indirizzi e Contatti Cliente
 DocType: Employee,Resignation Letter Date,Lettera di dimissioni Data
@@ -1657,35 +1601,31 @@
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +137,Not Set,Non Impostato
 DocType: Communication,Date,Data
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,Ripetere Revenue clienti
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +651,Sit tight while your system is being setup. This may take a few moments.,Tenere duro mentre il sistema è in corso di installazione . Questa operazione potrebbe richiedere alcuni minuti .
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +115,Sit tight while your system is being setup. This may take a few moments.,Tenere duro mentre il sistema è in corso di installazione . Questa operazione potrebbe richiedere alcuni minuti .
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +51,{0} ({1}) must have role 'Expense Approver',{0} ({1}) deve avere il ruolo 'Approvatore Spese'
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Pair,coppia
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Pair,coppia
 DocType: Bank Reconciliation Detail,Against Account,Previsione Conto
 DocType: Maintenance Schedule Detail,Actual Date,Stato Corrente
 DocType: Item,Has Batch No,Ha Lotto N.
 DocType: Delivery Note,Excise Page Number,Accise Numero Pagina
 DocType: Employee,Personal Details,Dettagli personali
 ,Maintenance Schedules,Programmi di manutenzione
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +44,Embossing,Goffratura
 ,Quotation Trends,Tendenze di preventivo
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +139,Item Group not mentioned in item master for item {0},Gruppo Articoli non menzionato nell'Articolo principale per l'Articolo {0}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +302,Debit To account must be a Receivable account,Debito Per account deve essere un account di Credito
-apps/erpnext/erpnext/stock/doctype/item/item.py +310,"As Production Order can be made for this item, it must be a stock item.","Come ordine di produzione può essere fatta per questo articolo , deve essere un elemento di magazzino ."
 DocType: Shipping Rule Condition,Shipping Amount,Importo spedizione
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +140,Joining,Accoppiamento
-DocType: Authorization Rule,Above Value,Sopra Valore
 ,Pending Amount,In attesa di Importo
 DocType: Purchase Invoice Item,Conversion Factor,Fattore di Conversione
 DocType: Purchase Order,Delivered,Consegnato
 apps/erpnext/erpnext/config/hr.py +160,Setup incoming server for jobs email id. (e.g. jobs@example.com),Configurazione del server in arrivo per i lavori di id-mail . ( ad esempio jobs@example.com )
 DocType: Purchase Receipt,Vehicle Number,Numero di veicoli
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,La data in cui fattura ricorrente sarà ferma
+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,Totale foglie assegnati {0} non può essere inferiore a foglie già approvati {1} per il periodo
 DocType: Journal Entry,Accounts Receivable,Conti esigibili
 ,Supplier-Wise Sales Analytics,Fornitore - Wise vendita Analytics
 DocType: Address Template,This format is used if country specific format is not found,Questo formato viene utilizzato se il formato specifico per il Paese non viene trovata
 DocType: Custom Field,Custom,Personalizzato
 DocType: Production Order,Use Multi-Level BOM,Utilizzare BOM Multi-Level
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +26,Injection molding,Stampaggio ad iniezione
 DocType: Bank Reconciliation,Include Reconciled Entries,Includi Voci riconciliati
 apps/erpnext/erpnext/config/accounts.py +41,Tree of finanial accounts.,Albero dei conti finanial .
 DocType: Leave Control Panel,Leave blank if considered for all employee types,Lasciare vuoto se considerato per tutti i tipi dipendenti
@@ -1695,30 +1635,28 @@
 apps/frappe/frappe/config/setup.py +130,Printing,Stampa
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +114,Expense Claim is pending approval. Only the Expense Approver can update status.,Expense Claim è in attesa di approvazione . Solo il Responsabile approvazione spesa può aggiornare lo stato .
 DocType: Purchase Invoice,Additional Discount Amount,Ulteriori Importo Sconto
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +99,The day(s) on which you are applying for leave are holiday. You need not apply for leave.,Il giorno ( s ) in cui si stanno applicando per ferie sono vacanze . Non c'è bisogno di domanda per il congedo .
 apps/frappe/frappe/public/js/frappe/misc/utils.js +110,and,e
 DocType: Leave Block List Allow,Leave Block List Allow,Lascia Block List Consentire
 apps/erpnext/erpnext/setup/doctype/company/company.py +236,Abbr can not be blank or space,Sigla non può essere vuoto o spazio
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +50,Sports,sportivo
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,sportivo
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Actual,Totale Actual
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Unit,Unità
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Unit,Unità
 apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.py +182,Please set Dropbox access keys in your site config,Si prega di impostare tasti di accesso Dropbox nel tuo sito config
 apps/erpnext/erpnext/stock/get_item_details.py +113,Please specify Company,Si prega di specificare Azienda
 ,Customer Acquisition and Loyalty,Acquisizione e fidelizzazione dei clienti
 DocType: Purchase Receipt,Warehouse where you are maintaining stock of rejected items,Magazzino dove si conservano Giacenze di Articoli Rifiutati
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +408,Your financial year ends on,Il tuo anno finanziario termina il
+apps/erpnext/erpnext/public/js/setup_wizard.js +156,Your financial year ends on,Il tuo anno finanziario termina il
 DocType: POS Profile,Price List,Listino Prezzi
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +20,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0} è ora l'anno fiscale predefinito. Si prega di aggiornare il browser perché la modifica abbia effetto .
 apps/erpnext/erpnext/projects/doctype/project/project.js +47,Expense Claims,Rimborsi spese
 DocType: Issue,Support,Sostenere
-DocType: Authorization Rule,Approving Role,Regola Approvazione
 ,BOM Search,BOM Ricerca
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +176,Closing (Opening + Totals),Chiusura (apertura + totali)
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +26,Please specify currency in Company,Si prega di specificare la valuta in azienda
 DocType: Workstation,Wages per hour,Salari all'ora
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},Equilibrio Stock in Lotto {0} sarà negativo {1} per la voce {2} a Warehouse {3}
 apps/erpnext/erpnext/config/setup.py +83,"Show / Hide features like Serial Nos, POS etc.","Mostra / Nascondi caratteristiche come Serial Nos, POS ecc"
-apps/erpnext/erpnext/controllers/accounts_controller.py +236,Account {0} is invalid. Account Currency must be {1},Account {0} non è valido. Conto valuta deve essere {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +237,Account {0} is invalid. Account Currency must be {1},Account {0} non è valido. Conto valuta deve essere {1}
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +34,UOM Conversion factor is required in row {0},Fattore UOM conversione è necessaria in riga {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +53,Clearance date cannot be before check date in row {0},Data di Liquidazione non può essere prima della data di arrivo in riga {0}
 DocType: Salary Slip,Deduction,Deduzioni
@@ -1737,13 +1675,13 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +82,Item {0} has already been returned,L'articolo {0} è già stato restituito
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,**Anno Fiscale** rappresenta un anno contabile. Tutte le voci contabili e altre operazioni importanti sono tracciati per **Anno Fiscale**.
 DocType: Opportunity,Customer / Lead Address, Indirizzo Cliente / Contatto
+apps/erpnext/erpnext/stock/doctype/item/item.py +112,Warning: Invalid SSL certificate on attachment {0},Attenzione: certificato SSL non valido sull&#39;attaccamento {0}
 DocType: Production Order Operation,Actual Operation Time,Actual Tempo di funzionamento
 DocType: Authorization Rule,Applicable To (User),Applicabile a (Utente)
 DocType: Purchase Taxes and Charges,Deduct,Detrarre
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +170,Job Description,Descrizione Del Lavoro
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +170,Job Description,Descrizione Del Lavoro
 DocType: Purchase Order Item,Qty as per Stock UOM,Quantità come da UOM Archivio
 apps/frappe/frappe/model/rename_doc.py +343,Please select a valid csv file with data,Selezionare un file csv valido con i dati
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +92,Coating,Rivestimento
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +126,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Caratteri speciali tranne ""-"" ""."", ""#"", e ""/"" non consentito in denominazione serie"
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Tenere traccia delle campagne di vendita. Tenere traccia di Contatti, Preventivi, Ordini ecc da campagne per misurare il ritorno sull'investimento."
 DocType: Expense Claim,Approver,Certificatore
@@ -1753,12 +1691,11 @@
 DocType: Supplier Quotation,Manufacturing Manager,Manager Produzione
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},Serial No {0} è in garanzia fino a {1}
 apps/erpnext/erpnext/config/stock.py +69,Split Delivery Note into packages.,Split di consegna Nota in pacchetti.
-apps/erpnext/erpnext/hooks.py +84,Shipments,Spedizioni
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +29,Dip molding,Stampaggio Dip
+apps/erpnext/erpnext/hooks.py +68,Shipments,Spedizioni
 DocType: Purchase Order,To be delivered to customer,Da consegnare al cliente
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,Tempo Log Stato deve essere presentata.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,N. di serie {0} non appartiene ad alcun magazzino
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +650,Setting Up,Impostazione
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +114,Setting Up,Impostazione
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,Row # ,Row #
 DocType: Purchase Invoice,In Words (Company Currency),In Parole (Azienda valuta)
 DocType: Pricing Rule,Supplier,Fornitore
@@ -1766,7 +1703,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +105,Miscellaneous Expenses,Spese Varie
 DocType: Global Defaults,Default Company,Azienda Predefinita
 apps/erpnext/erpnext/controllers/stock_controller.py +166,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,Spesa o Differenza conto è obbligatorio per la voce {0} come impatti valore azionario complessivo
-apps/erpnext/erpnext/controllers/accounts_controller.py +354,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","Impossibile overbill per la voce {0} in riga {1} più {2}. Per consentire fatturazione eccessiva, impostare in Impostazioni archivio"
+apps/erpnext/erpnext/controllers/accounts_controller.py +355,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","Impossibile overbill per la voce {0} in riga {1} più {2}. Per consentire fatturazione eccessiva, impostare in Impostazioni archivio"
 DocType: Employee,Bank Name,Nome Banca
 apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +27,-Above,-Sopra
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +135,User {0} is disabled,Utente {0} è disattivato
@@ -1779,27 +1716,26 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,{0} is mandatory for Item {1},{0} è obbligatorio per la voce {1}
 DocType: Currency Exchange,From Currency,Da Valuta
 DocType: DocField,Name,Nome
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +211,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Seleziona importo assegnato, Tipo fattura e fattura numero in almeno uno di fila"
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +104,Sales Order required for Item {0},Ordine di vendita necessaria per la voce {0}
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +158,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Seleziona importo assegnato, Tipo fattura e fattura numero in almeno uno di fila"
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +107,Sales Order required for Item {0},Ordine di vendita necessaria per la voce {0}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +43,Amounts not reflected in system,Gli importi non riflette nel sistema
 DocType: Purchase Invoice Item,Rate (Company Currency),Tariffa (Valuta Azienda)
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +40,Others,Altri
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +40,Others,Altri
 apps/erpnext/erpnext/templates/includes/product_page.js +80,Cannot find a matching Item. Please select some other value for {0}.,Non riesco a trovare un prodotto trovato. Si prega di selezionare un altro valore per {0}.
 DocType: POS Profile,Taxes and Charges,Tasse e Costi
 DocType: Item,"A Product or a Service that is bought, sold or kept in stock.","Un prodotto o un servizio che viene acquistato, venduto o conservato in Giacenza."
 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,Non è possibile selezionare il tipo di carica come 'On Fila Indietro Importo ' o 'On Precedente totale riga ' per la prima fila
 apps/frappe/frappe/core/doctype/doctype/boilerplate/controller_list.html +31,Completed,Completato
 DocType: Web Form,Select DocType,Selezionare DocType
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +104,Broaching,Brocciatura
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +12,Banking,bancario
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,bancario
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +38,Please click on 'Generate Schedule' to get schedule,Si prega di cliccare su ' Generate Schedule ' per ottenere pianificazione
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +283,New Cost Center,Nuovo Centro di costo
 DocType: Bin,Ordered Quantity,Ordinato Quantità
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +397,"e.g. ""Build tools for builders""","ad esempio "" Costruire strumenti per i costruttori """
+apps/erpnext/erpnext/public/js/setup_wizard.js +145,"e.g. ""Build tools for builders""","ad esempio "" Costruire strumenti per i costruttori """
 DocType: Quality Inspection,In Process,In Process
 DocType: Authorization Rule,Itemwise Discount,Sconto Itemwise
 DocType: Purchase Order Item,Reference Document Type,Riferimento Tipo di documento
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +318,{0} against Sales Order {1},{0} contro Sales Order {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +320,{0} against Sales Order {1},{0} contro Sales Order {1}
 DocType: Account,Fixed Asset,Asset fisso
 apps/erpnext/erpnext/config/stock.py +283,Serialized Inventory,Serialized Inventario
 DocType: Activity Type,Default Billing Rate,Predefinito fatturazione Tasso
@@ -1814,14 +1750,13 @@
 DocType: Purchase Invoice Item,Page Break,Interruzione di pagina
 DocType: Production Order Operation,Pending,In attesa
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,Gli utenti che possono approvare le applicazioni lasciare un specifico del dipendente
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +33,You cannot change default UOM of Variant. To change default UOM for Variant change default UOM of the Template,Non è possibile modificare UM predefinito Variant. Per cambiare UOM predefinita per la variante UM cambiamento di default del modello
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +50,Office Equipments,Attrezzature Ufficio
 DocType: Purchase Invoice Item,Qty,Qtà
 DocType: Fiscal Year,Companies,Aziende
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +24,Electronics,Elettronica
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +24,Electronics,Elettronica
 DocType: Stock Settings,Raise Material Request when stock reaches re-order level,Crea un Richiesta Materiale quando la scorta raggiunge il livello di riordino
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +18,From Maintenance Schedule,Dal Programma di manutenzione
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +56,Full-time,Tempo pieno
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +56,Full-time,Tempo pieno
 DocType: Purchase Invoice,Contact Details,Dettagli Contatto
 DocType: C-Form,Received Date,Data Received
 DocType: Delivery Note,"If you have created a standard template in Sales Taxes and Charges Template, select one and click on the button below.","Se è stato creato un modello standard di imposte delle entrate e oneri modello, selezionare uno e fare clic sul pulsante qui sotto."
@@ -1833,11 +1768,12 @@
 DocType: Job Applicant,Job Opening,Apertura di lavoro
 DocType: Payment Reconciliation,Payment Reconciliation,Pagamento Riconciliazione
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +154,Please select Incharge Person's name,Si prega di selezionare il nome del Incharge persona
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +51,Technology,tecnologia
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,tecnologia
 DocType: Offer Letter,Offer Letter,Lettera Di Offerta
 apps/erpnext/erpnext/config/manufacturing.py +51,Generate Material Requests (MRP) and Production Orders.,Generare richieste di materiali (MRP) e ordini di produzione.
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +68,Total Invoiced Amt,Totale fatturato Amt
 DocType: Time Log,To Time,Per Tempo
+DocType: Authorization Rule,Approving Role (above authorized value),Approvazione di ruolo (di sopra del valore autorizzato)
 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.","Per aggiungere nodi figlio , esplorare albero e fare clic sul nodo in cui si desidera aggiungere più nodi ."
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +102,Credit To account must be a Payable account,Credit Per account deve essere un account a pagamento
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +233,BOM recursion: {0} cannot be parent or child of {2},BOM ricorsione : {0} non può essere genitore o figlio di {2}
@@ -1850,10 +1786,8 @@
 DocType: Item,Customer Item Codes,Codici Voce clienti
 DocType: Opportunity,Lost Reason,Perso Motivo
 apps/erpnext/erpnext/config/accounts.py +68,Create Payment Entries against Orders or Invoices.,Creare voci di pagamento nei confronti di ordini o fatture.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +141,Welding,Saldatura
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +40,New Stock UOM is required,Nuovo Archivio UOM è necessaria
 DocType: Quality Inspection,Sample Size,Dimensione del campione
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +443,All items have already been invoiced,Tutti gli articoli sono già stati fatturati
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +446,All items have already been invoiced,Tutti gli articoli sono già stati fatturati
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',Si prega di specificare una valida &#39;Dalla sentenza n&#39;
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +287,Further cost centers can be made under Groups but entries can be made against non-Groups,Ulteriori centri di costo possono essere fatte in Gruppi ma le voci possono essere fatte contro i non-Gruppi
 DocType: Project,External,Esterno
@@ -1865,8 +1799,7 @@
 DocType: Bin,Actual Quantity,Quantità Reale
 DocType: Shipping Rule,example: Next Day Shipping,esempio: Next Day spedizione
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,Serial No {0} non trovato
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +563,Your Customers,I vostri clienti
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +27,Compression molding,Stampaggio a compressione
+apps/erpnext/erpnext/public/js/setup_wizard.js +303,Your Customers,I vostri clienti
 DocType: Leave Block List Date,Block Date,Data Blocco
 DocType: Sales Order,Not Delivered,Non Consegnati
 ,Bank Clearance Summary,Sintesi Liquidazione Banca
@@ -1887,10 +1820,10 @@
 DocType: SMS Log,Sent To,Inviato A
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +28,Make Sales Invoice,Crea Fattura di Vendita
 DocType: Company,For Reference Only.,Per riferimento soltanto.
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +29,Invalid {0}: {1},Non valido {0}: {1}
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +49,Invalid {0}: {1},Non valido {0}: {1}
 DocType: Sales Invoice Advance,Advance Amount,Importo Anticipo
 DocType: Manufacturing Settings,Capacity Planning,Capacity Planning
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +49,'From Date' is required,'Dalla Data' è obbligatorio
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +43,'From Date' is required,'Dalla Data' è obbligatorio
 DocType: Journal Entry,Reference Number,Numero di riferimento
 DocType: Employee,Employment Details,Dettagli Dipendente
 DocType: Employee,New Workplace,Nuovo posto di lavoro
@@ -1905,7 +1838,7 @@
 DocType: Serial No,Delivery Time,Tempo Consegna
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Invecchiamento Basato Su
 DocType: Item,End of Life,Fine Vita
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +41,Travel,viaggi
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +41,Travel,viaggi
 DocType: Leave Block List,Allow Users,Consentire Utenti
 DocType: Purchase Order,Customer Mobile No,Clienti mobile No
 DocType: Sales Invoice,Recurring,Periodico
@@ -1919,7 +1852,7 @@
 DocType: Naming Series,User must always select,L&#39;utente deve sempre selezionare
 DocType: Stock Settings,Allow Negative Stock,Consentire Scorte Negative
 DocType: Installation Note,Installation Note,Nota Installazione
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +541,Add Taxes,Aggiungi Imposte
+apps/erpnext/erpnext/public/js/setup_wizard.js +283,Add Taxes,Aggiungi Imposte
 ,Financial Analytics,Analisi Finanziaria
 DocType: Quality Inspection,Verified By,Verificato da
 DocType: Address,Subsidiary,Sussidiario
@@ -1929,7 +1862,6 @@
 DocType: System Settings,In Hours,In Ore
 DocType: Process Payroll,Create Salary Slip,Creare busta paga
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Expected balance as per bank,Equilibrio previsto come da banca
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +115,Buffing,Lucidatura
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Source of Funds (Liabilities),Fonte di Fondi ( Passivo )
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +347,Quantity in row {0} ({1}) must be same as manufactured quantity {2},Quantità in riga {0} ( {1} ) deve essere uguale quantità prodotta {2}
 DocType: Appraisal,Employee,Dipendente
@@ -1946,11 +1878,11 @@
 DocType: Rename Tool,File to Rename,File da rinominare
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +176,Purchse Order number required for Item {0},Numero Purchse ordine richiesto per la voce {0}
 apps/erpnext/erpnext/public/js/controllers/transaction.js +136,Show Payments,Mostra Pagamenti
-apps/erpnext/erpnext/controllers/buying_controller.py +245,Specified BOM {0} does not exist for Item {1},BOM specificato {0} non esiste per la voce {1}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +202,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Programma di manutenzione {0} deve essere cancellato prima di annullare questo ordine di vendita
+apps/erpnext/erpnext/controllers/buying_controller.py +236,Specified BOM {0} does not exist for Item {1},BOM specificato {0} non esiste per la voce {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Programma di manutenzione {0} deve essere cancellato prima di annullare questo ordine di vendita
 apps/frappe/frappe/desk/page/backups/backups.html +13,Size,Taglia
 DocType: Notification Control,Expense Claim Approved,Rimborso Spese Approvato
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +113,Pharmaceutical,farmaceutico
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Pharmaceutical,farmaceutico
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,Costo dei beni acquistati
 DocType: Selling Settings,Sales Order Required,Ordine di vendita richiesto
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +30,Create Customer,Crea clienti
@@ -1960,7 +1892,6 @@
 DocType: Quality Inspection Reading,Reading 9,Lettura 9
 DocType: Supplier,Is Frozen,È Congelato
 DocType: Buying Settings,Buying Settings,Impostazioni Acquisto
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +122,Mass finishing,Finitura di massa
 DocType: Stock Entry Detail,BOM No. for a Finished Good Item,DiBa N. per un buon articolo finito
 DocType: Upload Attendance,Attendance To Date,Data Fine Frequenza
 apps/erpnext/erpnext/config/selling.py +158,Setup incoming server for sales email id. (e.g. sales@example.com),Configurazione del server per la posta elettronica in entrata vendite id . ( ad esempio sales@example.com )
@@ -1968,7 +1899,7 @@
 DocType: Payment Tool,Payment Account,Conto di Pagamento
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +713,Please specify Company to proceed,Si prega di specificare Società di procedere
 apps/frappe/frappe/public/js/frappe/model/indicator.js +30,Draft,Bozza
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +46,Compensatory Off,compensativa Off
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Compensatory Off,compensativa Off
 DocType: Quality Inspection Reading,Accepted,Accettato
 DocType: User,Female,Femmina
 DocType: Journal Entry Account,Debit in Account Currency,Debito Account Valuta
@@ -1980,7 +1911,7 @@
 DocType: Shipping Rule,Shipping Rule Label,Etichetta Regola di Spedizione
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +209,Raw Materials cannot be blank.,Materie prime non può essere vuoto.
 DocType: Newsletter,Test,Prova
-apps/erpnext/erpnext/stock/doctype/item/item.py +364,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +368,"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'","Siccome ci sono transazioni di magazzino per questo articolo, \ non è possibile modificare i valori di 'Ha Numero Seriale', 'Ha Numero Lotto', 'presente in Scorta' e 'il metodo di valutazione'"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +448,Quick Journal Entry,Breve diario
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +92,You can not change rate if BOM mentioned agianst any item,Non è possibile modificare tariffa se BOM menzionato agianst tutto l'articolo
@@ -1991,13 +1922,14 @@
 apps/erpnext/erpnext/config/stock.py +18,Requests for items.,Le richieste di articoli.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,Ordine di produzione separata verrà creato per ogni buon prodotto finito.
 DocType: Purchase Invoice,Terms and Conditions1,Termini e Condizioni 1
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +18,Complete Setup,installazione completa
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard_page.html +18,Complete Setup,installazione completa
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","Registrazione contabile congelato fino a questa data, nessuno può / Modifica voce eccetto ruolo specificato di seguito."
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +121,Please save the document before generating maintenance schedule,Si prega di salvare il documento prima di generare il programma di manutenzione
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,Stato del progetto
 DocType: UOM,Check this to disallow fractions. (for Nos),Seleziona per disabilitare frazioni. (per NOS)
 apps/erpnext/erpnext/config/crm.py +96,Newsletter Mailing List,Elenco Indirizzi per Newsletter
 DocType: Delivery Note,Transporter Name,Trasportatore Nome
+DocType: Authorization Rule,Authorized Value,Valore Autorizzato
 DocType: Contact,Enter department to which this Contact belongs,Inserisci reparto a cui appartiene questo contatto
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Absent,Totale Assente
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +746,Item or Warehouse for row {0} does not match Material Request,Voce o Magazzino per riga {0} non corrisponde Material Request
@@ -2022,16 +1954,15 @@
 DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),Tasso di base (come da UOM Archivio)
 DocType: SMS Log,No of Requested SMS,Num. di SMS richiesto
 DocType: Campaign,Campaign-.####,Campagna . # # # #
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +55,Piercing,Penetrante
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,Prossimi passi
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +117,Contract End Date must be greater than Date of Joining,Data fine contratto deve essere maggiore di Data di giunzione
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,Un distributore di terze parti / rivenditore / commissionario / affiliate / rivenditore che vende i prodotti delle aziende per una commissione.
 DocType: Customer Group,Has Child Node,Ha un Nodo Figlio
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{0} against Purchase Order {1},{0} contro ordine di acquisto {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +332,{0} against Purchase Order {1},{0} contro ordine di acquisto {1}
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","Inserisci parametri statici della url qui (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)"
 apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,{0} {1} non è in alcun anno fiscale attivo. Per maggiori dettagli si veda {2}.
-apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,Questo è un sito di esempio generato automaticamente da ERPNext
+apps/erpnext/erpnext/setup/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,Questo è un sito di esempio generato automaticamente da ERPNext
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +37,Ageing Range 1,Gamma invecchiamento 1
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +110,Photochemical machining,Lavorazione fotochimica
 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.
 
 #### Note
@@ -2077,7 +2008,7 @@
 DocType: Purchase Receipt Item,Recd Quantity,RECD Quantità
 DocType: Email Account,Email Ids,Email Ids
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},Non può produrre più Voce {0} di Sales Order quantità {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +471,Stock Entry {0} is not submitted,Giacenza {0} non inserita
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +473,Stock Entry {0} is not submitted,Giacenza {0} non inserita
 DocType: Payment Reconciliation,Bank / Cash Account,Banca / Account Cash
 DocType: Tax Rule,Billing City,Fatturazione Città
 DocType: Global Defaults,Hide Currency Symbol,Nascondi Simbolo Valuta
@@ -2093,7 +2024,7 @@
 DocType: Purchase Invoice,Currency and Price List,Valuta e Lista Prezzi
 DocType: Opportunity,Customer / Lead Name,Nome Cliente / Contatto
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +63,Clearance Date not mentioned,Liquidazione data non menzionato
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +71,Production,produzione
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Production,produzione
 DocType: Item,Allow Production Order,Consentire Ordine Produzione
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +60,Row {0}:Start Date must be before End Date,Riga {0} : Data di inizio deve essere precedente Data di fine
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Totale (Quantità)
@@ -2106,7 +2037,7 @@
 apps/erpnext/erpnext/utilities/doctype/address/address.py +113,My Addresses,I miei indirizzi
 DocType: Stock Ledger Entry,Outgoing Rate,Tasso di uscita
 apps/erpnext/erpnext/config/hr.py +100,Organization branch master.,Ramo Organizzazione master.
-apps/erpnext/erpnext/controllers/accounts_controller.py +237, or ,oppure
+apps/erpnext/erpnext/controllers/accounts_controller.py +238, or ,oppure
 DocType: Sales Order,Billing Status,Stato Fatturazione
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Utility Expenses,Spese Utility
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,90-Above,90-Sopra
@@ -2133,6 +2064,7 @@
 DocType: Stock Entry Detail,Serial No / Batch,Serial n / Batch
 DocType: Product Bundle,Parent Item,Parent Item
 DocType: Account,Account Type,Tipo Conto
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +113,Leave Type {0} cannot be carry-forwarded,Lascia tipo {0} non può essere trasmessa carry-
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +213,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',Programma di manutenzione non viene generato per tutte le voci . Si prega di cliccare su ' Generate Schedule '
 ,To Produce,per produrre
 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","Per riga {0} a {1}. Per includere {2} a tasso Item, righe {3} deve essere inclusa anche"
@@ -2140,10 +2072,7 @@
 DocType: Bin,Reserved Quantity,Riservato Quantità
 DocType: Landed Cost Voucher,Purchase Receipt Items,Acquistare oggetti Receipt
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,Personalizzazione dei moduli
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +62,Cutting,Taglio
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +69,Flattening,Appiattimento
 DocType: Account,Income Account,Conto Proventi
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +22,Molding,Modanatura
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +632,Delivery,Recapito
 DocType: Stock Reconciliation Item,Current Qty,Quantità corrente
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",Vedere &quot;tasso di materiali a base di&quot; in Costing Sezione
@@ -2153,20 +2082,19 @@
 apps/frappe/frappe/desk/moduleview.py +61,Documents,Documenti
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +17,Ref,Rif
 DocType: Cost Center,Cost Center,Centro di Costo
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.js +48,Voucher #,Voucher #
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +36,Voucher #,Voucher #
 DocType: Notification Control,Purchase Order Message,Ordine di acquisto Message
 DocType: Tax Rule,Shipping Country,Spedizione Nazione
 DocType: Upload Attendance,Upload HTML,Carica HTML
-apps/erpnext/erpnext/controllers/accounts_controller.py +391,"Total advance ({0}) against Order {1} cannot be greater \
+apps/erpnext/erpnext/controllers/accounts_controller.py +392,"Total advance ({0}) against Order {1} cannot be greater \
 				than the Grand Total ({2})","Anticipo Totale ({0}) contro Order {1} non può essere maggiore \
  del Grand Total ({2})"
 DocType: Employee,Relieving Date,Alleviare Data
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +12,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.","Regola Pricing è fatto per sovrascrivere Listino Prezzi / definire la percentuale di sconto, sulla base di alcuni criteri."
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,Magazzino può essere modificato solo tramite Inserimento Giagenza / Bolla / Ricevuta d'Acquisto
 DocType: Employee Education,Class / Percentage,Classe / Percentuale
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +92,Head of Marketing and Sales,Responsabile Marketing e Vendite
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +31,Income Tax,Tassazione Proventi
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +157,Laser engineered net shaping,Laser progettato shaping netto
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Head of Marketing and Sales,Responsabile Marketing e Vendite
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +31,Income Tax,Tassazione Proventi
 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.","Se regola tariffaria selezionato è fatta per 'prezzo', che sovrascriverà Listino. Prezzo Regola Il prezzo è il prezzo finale, in modo che nessun ulteriore sconto deve essere applicato. Quindi, in operazioni come ordine di vendita, ordine di acquisto, ecc, che viene prelevato in campo 'Tasso', piuttosto che il campo 'Listino Rate'."
 apps/erpnext/erpnext/config/selling.py +163,Track Leads by Industry Type.,Traccia Contatti per settore Type.
 DocType: Item Supplier,Item Supplier,Articolo Fornitore
@@ -2189,31 +2117,28 @@
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Q.tà Reale dopo la Transazione
 ,Pending SO Items For Purchase Request,Elementi in sospeso così per Richiesta di Acquisto
 DocType: Supplier,Billing Currency,Fatturazione valuta
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +148,Extra Large,Extra Large
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,Extra Large,Extra Large
 ,Profit and Loss Statement,Conto Economico
 DocType: Bank Reconciliation Detail,Cheque Number,Numero Assegno
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +43,Pressing,Urgente
 DocType: Payment Tool Detail,Payment Tool Detail,Dettaglio strumento di pagamento
 ,Sales Browser,Browser vendite
 DocType: Journal Entry,Total Credit,Totale credito
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +474,Warning: Another {0} # {1} exists against stock entry {2},Attenzione: Un altro {0} # {1} esiste per l'entrata Giacenza {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +459,Local,Locale
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +476,Warning: Another {0} # {1} exists against stock entry {2},Attenzione: Un altro {0} # {1} esiste per l'entrata Giacenza {2}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +397,Local,Locale
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),Crediti ( Assets )
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,Debitori
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +147,Large,Grande
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +23,No employee found!,Nessun dipendente trovato!
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Large,Grande
 DocType: C-Form Invoice Detail,Territory,Territorio
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,Si prega di citare nessuna delle visite richieste
 DocType: Purchase Order,Customer Address Display,Indirizzo cliente display
 DocType: Stock Settings,Default Valuation Method,Metodo Valutazione Predefinito
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +127,Polishing,Lucidatura
 DocType: Production Order Operation,Planned Start Time,Planned Ora di inizio
 apps/erpnext/erpnext/config/accounts.py +63,Close Balance Sheet and book Profit or Loss.,Chiudere Stato Patrimoniale e il libro utile o perdita .
-apps/erpnext/erpnext/stock/doctype/item/item.py +661,"Default Unit of Measure for Item {0} cannot be changed directly because \
+apps/erpnext/erpnext/stock/doctype/item/item.py +665,"Default Unit of Measure for Item {0} cannot be changed directly because \
 			you have already made some transaction(s) with another UOM. To change default UOM, \
 			use 'UOM Replace Utility' tool under Stock module.","Unità di misura predefinita per la voce {0} non può essere modificato direttamente, perché \ hai già fatto qualche operazione (s) con un altro UOM. Per cambiare UOM predefinita, \ uso &#39;UOM Sostituire Utility&#39; strumento sotto modulo Fotografici."
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,Specificare Tasso di cambio per convertire una valuta in un'altra
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +146,Quotation {0} is cancelled,Preventivo {0} è annullato
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +141,Quotation {0} is cancelled,Preventivo {0} è annullato
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,Importo totale Eccezionale
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} was on leave on {1}. Cannot mark attendance.,Employee {0} era in aspettativa per {1} . Impossibile segnare presenze .
 DocType: Sales Partner,Targets,Obiettivi
@@ -2224,7 +2149,6 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +158,Please create Customer from Lead {0},Si prega di creare Cliente da Contatto {0}
 DocType: Price List,Applicable for Countries,Applicabile per i paesi
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Computers,computer
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +112,Electro-chemical grinding,Elettrochimica rettifica
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +14,This is a root customer group and cannot be edited.,Si tratta di un gruppo di clienti root e non può essere modificato .
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +39,Please setup your chart of accounts before you start Accounting Entries,Si prega di configurare il piano dei conti prima di iniziare scritture contabili
 DocType: Purchase Invoice,Ignore Pricing Rule,Ignora regola tariffaria
@@ -2282,7 +2206,6 @@
 DocType: Maintenance Visit,Purposes,Scopi
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +103,Atleast one item should be entered with negative quantity in return document,Atleast un elemento deve essere introdotto con quantità negativa nel documento ritorno
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +67,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","Operazione {0} più di tutte le ore di lavoro disponibili a workstation {1}, abbattere l&#39;operazione in più operazioni"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +134,Electrochemical machining,Lavorazione elettrochimica
 ,Requested,richiesto
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +66,No Remarks,Nessun Commento
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +13,Overdue,In ritardo
@@ -2291,7 +2214,7 @@
 DocType: Monthly Distribution,Distribution Name,Nome della Distribuzione
 DocType: Features Setup,Sales and Purchase,Vendita e Acquisto
 DocType: Supplier Quotation Item,Material Request No,Materiale Richiesta No
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +218,Quality Inspection required for Item {0},Controllo qualità richiesta per la voce {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +221,Quality Inspection required for Item {0},Controllo qualità richiesta per la voce {0}
 DocType: Quotation,Rate at which customer's currency is converted to company's base currency,Tasso al quale la valuta del cliente viene convertito in valuta di base dell&#39;azienda
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +107,{0} has been successfully unsubscribed from this list.,La sottoscrizione di {0} è stata rimossa da questo elenco.
 DocType: Purchase Invoice Item,Net Rate (Company Currency),Tasso Netto (Valuta Azienda)
@@ -2309,9 +2232,8 @@
 apps/erpnext/erpnext/accounts/report/financial_statements.py +16,Fiscal Year {0} not found.,Anno {0} fiscale non trovato.
 DocType: Bank Reconciliation,Get Relevant Entries,Prendi le voci rilevanti
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +407,Accounting Entry for Stock,Voce contabilità per scorta
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +64,Coining,Coniatura
 DocType: Sales Invoice,Sales Team1,Vendite Team1
-apps/erpnext/erpnext/stock/doctype/item/item.py +412,Item {0} does not exist,L'articolo {0} non esiste
+apps/erpnext/erpnext/stock/doctype/item/item.py +416,Item {0} does not exist,L'articolo {0} non esiste
 DocType: Sales Invoice,Customer Address,Indirizzo Cliente
 apps/frappe/frappe/desk/query_report.py +136,Total,Totale
 DocType: Purchase Invoice,Apply Additional Discount On,Applicare Sconto Ulteriori On
@@ -2323,14 +2245,13 @@
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),Fiscale Ammontare Dopo Ammontare Sconto (Società valuta)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +149,Target warehouse is mandatory for row {0},Magazzino di destinazione è obbligatoria per riga {0}
 DocType: Quality Inspection,Quality Inspection,Controllo Qualità
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +144,Extra Small,Extra Small
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +20,Spray forming,Spray formando
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Extra Small,Extra Small
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +458,Warning: Material Requested Qty is less than Minimum Order Qty,Attenzione : Materiale Qty richiesto è inferiore minima quantità
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +191,Account {0} is frozen,Il Conto {0} è congelato
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Entità Legale / Controllata con un grafico separato di conti appartenenti all'organizzazione.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +29,"Food, Beverage & Tobacco","Prodotti alimentari , bevande e tabacco"
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","Prodotti alimentari , bevande e tabacco"
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +20,PL or BS,PL o BS
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,Can only make payment against unbilled {0},Posso solo effettuare il pagamento non ancora fatturate contro {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +531,Can only make payment against unbilled {0},Posso solo effettuare il pagamento non ancora fatturate contro {0}
 apps/erpnext/erpnext/controllers/selling_controller.py +122,Commission rate cannot be greater than 100,Tasso Commissione non può essere superiore a 100
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Minimum Inventory Level,Livello Minimo di Inventario
 DocType: Stock Entry,Subcontract,Subappaltare
@@ -2341,19 +2262,18 @@
 DocType: Item,Manufacturer Part Number,Codice Produttore
 DocType: Production Order Operation,Estimated Time and Cost,Tempo e Costo Stimato
 DocType: Bin,Bin,Bin
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +50,Nosing,Nosing
 DocType: SMS Log,No of Sent SMS,Num. di SMS Inviati
 DocType: Account,Company,Azienda
 DocType: Account,Expense Account,Conto uscite
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +49,Software,software
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +151,Colour,Colore
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +49,Software,software
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Colour,Colore
 DocType: Maintenance Visit,Scheduled,Pianificate
 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","Si prega di selezionare la voce dove &quot;è articolo di&quot; è &quot;No&quot; e &quot;Is Voce di vendita&quot; è &quot;Sì&quot;, e non c&#39;è nessun altro pacchetto di prodotti"
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,Selezionare distribuzione mensile per distribuire in modo non uniforme obiettivi attraverso mesi.
 DocType: Purchase Invoice Item,Valuation Rate,Tasso Valutazione
 apps/erpnext/erpnext/stock/get_item_details.py +281,Price List Currency not selected,Listino Prezzi Valuta non selezionati
 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,Voce Riga {0}: Acquisto Ricevuta {1} non esiste nella tabella di cui sopra 'ricevute di acquisto'
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +134,Employee {0} has already applied for {1} between {2} and {3},Employee {0} ha già presentato domanda di {1} tra {2} e {3}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +145,Employee {0} has already applied for {1} between {2} and {3},Employee {0} ha già presentato domanda di {1} tra {2} e {3}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Data di inizio del progetto
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +8,Until,Fino a
 DocType: Rename Tool,Rename Log,Rinominare Entra
@@ -2363,7 +2283,7 @@
 apps/erpnext/erpnext/controllers/recurring_document.py +162,Please select {0},Si prega di selezionare {0}
 DocType: C-Form,C-Form No,C-Form N.
 DocType: BOM,Exploded_items,Exploded_items
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +95,Researcher,ricercatore
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Researcher,ricercatore
 apps/frappe/frappe/custom/doctype/customize_form/customize_form.js +88,Update,Aggiornare
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +78,Please save the Newsletter before sending,Si prega di salvare la Newsletter prima di inviare
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +23,Name or Email is mandatory,Nome o e-mail è obbligatorio
@@ -2372,11 +2292,10 @@
 DocType: Employee,Exit,Esci
 apps/erpnext/erpnext/accounts/doctype/account/account.py +134,Root Type is mandatory,Root Type è obbligatorio
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +295,Serial No {0} created,Serial No {0} creato
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +125,Vibratory finishing,Vibrofinitrice
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","Per la comodità dei clienti, questi codici possono essere utilizzati in formati di stampa, come fatture e bolle di consegna"
 DocType: Employee,You can enter any date manually,È possibile immettere qualsiasi data manualmente
 DocType: Sales Invoice,Advertisement,Pubblicità
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +165,Probationary Period,Periodo Di Prova
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Probationary Period,Periodo Di Prova
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Solo i nodi foglia sono ammessi nelle transazioni
 DocType: Expense Claim,Expense Approver,Expense Approver
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,Acquisto Ricevuta Articolo inserito
@@ -2384,19 +2303,16 @@
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +17,To Datetime,Per Data Ora
 DocType: SMS Settings,SMS Gateway URL,SMS Gateway URL
 apps/erpnext/erpnext/config/crm.py +53,Logs for maintaining sms delivery status,I registri per il mantenimento dello stato di consegna sms
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +137,Grinding,Rettifica
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +34,Shrink wrapping,Shrink wrapping
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +36,Pending Activities,Attività in sospeso
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,Confirmed,Confermato
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier > Supplier Type,Fornitore> Fornitore Tipo
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +127,Please enter relieving date.,Inserisci la data alleviare .
 apps/erpnext/erpnext/controllers/trends.py +137,Amt,Amt
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' can be submitted,Lasciare solo applicazioni con stato ' approvato ' possono essere presentate
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +51,Only Leave Applications with status 'Approved' can be submitted,Lasciare solo applicazioni con stato ' approvato ' possono essere presentate
 apps/erpnext/erpnext/utilities/doctype/address/address.py +21,Address Title is mandatory.,Titolo Indirizzo è obbligatorio.
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,Inserisci il nome della Campagna se la sorgente di indagine è la campagna
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +38,Newspaper Publishers,Editori Giornali
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +38,Newspaper Publishers,Editori Giornali
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,Selezionare l'anno fiscale
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +88,Smelting,Fusione
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Riordina Level
 DocType: Attendance,Attendance Date,Data Presenza
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,Stipendio rottura basato sul guadagno e di deduzione.
@@ -2411,16 +2327,15 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +414,[Error],[Errore]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,In parole saranno visibili una volta che si salva l&#39;ordine di vendita.
 ,Employee Birthday,Compleanno Dipendente
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +55,Venture Capital,capitale a rischio
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,capitale a rischio
 DocType: UOM,Must be Whole Number,Deve essere un Numero Intero
 DocType: Leave Control Panel,New Leaves Allocated (In Days),Nuove foglie attribuiti (in giorni)
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +51,Serial No {0} does not exist,Serial No {0} non esiste
 DocType: Pricing Rule,Discount Percentage,Percentuale di sconto
 DocType: Payment Reconciliation Invoice,Invoice Number,Numero di fattura
-apps/erpnext/erpnext/hooks.py +70,Orders,Ordini
+apps/erpnext/erpnext/hooks.py +54,Orders,Ordini
 DocType: Leave Control Panel,Employee Type,Tipo Dipendente
 DocType: Employee Leave Approver,Leave Approver,Lascia Approvatore
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +70,Swaging,Rastremazione
 DocType: Manufacturing Settings,Material Transferred for Manufacture,Materiale trasferito per Produzione
 DocType: Expense Claim,"A user with ""Expense Approver"" role","Un utente con ""Expense Approver"" ruolo"
 ,Issued Items Against Production Order,Articoli emesso contro Ordine di produzione
@@ -2432,7 +2347,6 @@
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +62,Cost Center with existing transactions can not be converted to group,Centro di costo con le transazioni esistenti non può essere convertito in gruppo
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Depreciation,ammortamento
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Fornitore (s)
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +29,Invalid period,Periodo non valido
 DocType: Customer,Credit Limit,Limite Credito
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,Seleziona il tipo di operazione
 DocType: GL Entry,Voucher No,Voucher No
@@ -2442,9 +2356,9 @@
 DocType: Customer,Address and Contact,Indirizzo e contatto
 DocType: Customer,Last Day of the Next Month,Ultimo giorno del mese prossimo
 DocType: Employee,Feedback,Riscontri
+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}","Ferie non possono essere assegnati prima {0}, come equilibrio congedo è già stato inoltrato carry-in futuro record di assegnazione congedo {1}"
 apps/erpnext/erpnext/accounts/party.py +284,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Nota: La data scadenza / riferimento supera i giorni ammessi per il credito dei clienti da {0} giorno (i)
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +621,Maint. Schedule,Maint. Tabella di marcia
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +108,Abrasive jet machining,Lavorazione a getto abrasivo
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +632,Maint. Schedule,Maint. Tabella di marcia
 DocType: Stock Settings,Freeze Stock Entries,Congela scorta voci
 DocType: Website Settings,Website Settings,Impostazioni Sito
 DocType: Item,Reorder level based on Warehouse,Livello di riordino sulla base di Magazzino
@@ -2461,7 +2375,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +75,Show Stock Entries,Mostra Immagini Entries
 ,Is Primary Address,È primario Indirizzo
 DocType: Production Order,Work-in-Progress Warehouse,Work-in-Progress Warehouse
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +308,Reference #{0} dated {1},Riferimento # {0} datato {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Reference #{0} dated {1},Riferimento # {0} datato {1}
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +13,Manage Addresses,Gestire Indirizzi
 DocType: Pricing Rule,Item Code,Codice Articolo
 DocType: Production Planning Tool,Create Production Orders,Crea Ordine Prodotto
@@ -2470,7 +2384,7 @@
 DocType: Lead,Market Segment,Segmento di Mercato
 DocType: Communication,Phone,Telefono
 DocType: Employee Internal Work History,Employee Internal Work History,Storia lavorativa Interna del Dipendente
-apps/erpnext/erpnext/public/js/account_tree_grid.js +50,Closing (Dr),Chiusura (Dr)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +221,Closing (Dr),Chiusura (Dr)
 DocType: Contact,Passive,Passive
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,Serial No {0} non in magazzino
 apps/erpnext/erpnext/config/selling.py +127,Tax template for selling transactions.,Modello fiscale per la vendita di transazioni.
@@ -2486,8 +2400,8 @@
 ,Billed Amount,importo fatturato
 DocType: Bank Reconciliation,Bank Reconciliation,Conciliazione Banca
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +9,Get Updates,Ricevi aggiornamenti
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +129,Material Request {0} is cancelled or stopped,Richiesta materiale {0} viene annullato o interrotto
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +641,Add a few sample records,Aggiungere un paio di record di esempio
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +133,Material Request {0} is cancelled or stopped,Richiesta materiale {0} viene annullato o interrotto
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Add a few sample records,Aggiungere un paio di record di esempio
 apps/erpnext/erpnext/config/hr.py +210,Leave Management,Lascia Gestione
 DocType: Event,Groups,Gruppi
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,Raggruppa per conto
@@ -2500,38 +2414,34 @@
 DocType: Features Setup,Sales Extras,Extra di vendita
 apps/erpnext/erpnext/accounts/utils.py +344,{0} budget for Account {1} against Cost Center {2} will exceed by {3},{0} budget per conto {1} contro il centro di costo {2} supererà da {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +236,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Account La differenza deve essere un account di tipo attività / passività, dal momento che questo Stock riconciliazione è una voce di apertura"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +138,Purchase Order number required for Item {0},Numero ordine di acquisto richiesto per la voce {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Order number required for Item {0},Numero ordine di acquisto richiesto per la voce {0}
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',' Dalla Data' deve essere successivo a 'Alla Data'
 ,Stock Projected Qty,Qtà Prevista Giacenza
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +147,Customer {0} does not belong to project {1},Cliente {0} non appartiene a proiettare {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +150,Customer {0} does not belong to project {1},Cliente {0} non appartiene a proiettare {1}
 DocType: Sales Order,Customer's Purchase Order,Ordine di Acquisto del Cliente
 DocType: Warranty Claim,From Company,Da Azienda
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,Valore o Quantità
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Minute,Minuto
+apps/erpnext/erpnext/public/js/setup_wizard.js +363,Minute,Minuto
 DocType: Purchase Invoice,Purchase Taxes and Charges,Acquisto Tasse e Costi
 ,Qty to Receive,Qtà da Ricevere
 DocType: Leave Block List,Leave Block List Allowed,Lascia Block List ammessi
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +61,Conversion factor cannot be in fractions,Fattore di conversione non può essere in frazioni
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +358,You will use it to Login,Si utilizzerà per il login
+apps/erpnext/erpnext/public/js/setup_wizard.js +108,You will use it to Login,Si utilizzerà per il login
 DocType: Sales Partner,Retailer,Dettagliante
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +99,Credit To account must be a Balance Sheet account,Credito Per account deve essere un account di Stato Patrimoniale
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,Tutti i tipi di fornitori
 apps/erpnext/erpnext/stock/doctype/item/item.py +37,Item Code is mandatory because Item is not automatically numbered,Codice Articolo è obbligatoria in quanto articolo non è numerato automaticamente
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +99,Quotation {0} not of type {1},Preventivo {0} non di tipo {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +93,Quotation {0} not of type {1},Preventivo {0} non di tipo {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,Programma di manutenzione Voce
 DocType: Sales Order,%  Delivered,%  Consegnato
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,Bank Overdraft Account,Scoperto di conto bancario
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +15,Make Salary Slip,Crea Busta Paga
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +18,Browse BOM,Sfoglia BOM
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +175,Secured Loans,Prestiti garantiti
-apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +3,Awesome Products,Prodotti di punta
+apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +3,Awesome Products,Prodotti di punta
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +189,Opening Balance Equity,Apertura Balance Equità
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +80,Cannot approve leave as you are not authorized to approve leaves on Block Dates,Non può approvare congedo in quanto non si è autorizzati ad approvare foglie su Date Block
 DocType: Appraisal,Appraisal,Valutazione
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +13,Lost-foam casting,-Foam perso colata
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +47,Drawing,Disegno
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +22,Date is repeated,La Data si Ripete
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +148,Leave approver must be one of {0},Lascia dell'approvazione deve essere uno dei {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +162,Leave approver must be one of {0},Lascia dell'approvazione deve essere uno dei {0}
 DocType: Hub Settings,Seller Email,Venditore Email
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Costo totale di acquisto (tramite acquisto fattura)
 DocType: Workstation Working Hour,Start Time,Ora di inizio
@@ -2545,7 +2455,7 @@
 DocType: Purchase Invoice Item,Net Amount (Company Currency),Importo netto (Valuta Azienda)
 DocType: BOM Operation,Hour Rate,Rapporto Orario
 DocType: Stock Settings,Item Naming By,Articolo Naming By
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +642,From Quotation,da Preventivo
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +655,From Quotation,da Preventivo
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},Un'altra voce periodo di chiusura {0} è stato fatto dopo {1}
 DocType: Production Order,Material Transferred for Manufacturing,Materiale trasferito for Manufacturing
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +29,Account {0} does not exists,Il Conto {0} non esiste
@@ -2559,21 +2469,19 @@
 DocType: Purchase Invoice Item,PR Detail,PR Dettaglio
 DocType: Sales Order,Fully Billed,Completamente Fatturato
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +20,Cash In Hand,Cash In Hand
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +72,Delivery warehouse required for stock item {0},Magazzino Data di consegna richiesto per articolo di {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +119,Delivery warehouse required for stock item {0},Magazzino Data di consegna richiesto per articolo di {0}
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),Il peso lordo del pacchetto. Di solito peso netto + peso materiale di imballaggio. (Per la stampa)
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Gli utenti con questo ruolo sono autorizzati a impostare conti congelati e creare / modificare le voci contabili nei confronti di conti congelati
 DocType: Serial No,Is Cancelled,È Annullato
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +281,My Shipments,Le mie spedizioni
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +286,My Shipments,Le mie spedizioni
 DocType: Journal Entry,Bill Date,Data Fattura
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +43,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","Anche se ci sono più regole sui prezzi con la priorità più alta, si applicano quindi le seguenti priorità interne:"
 DocType: Supplier,Supplier Details,Fornitore Dettagli
 DocType: Communication,Recipients,Destinatari
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +146,Screwing,Avvitamento
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +96,Knurling,Zigrinatura
 DocType: Expense Claim,Approval Status,Stato Approvazione
 DocType: Hub Settings,Publish Items to Hub,Pubblicare Articoli al Hub
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +44,From value must be less than to value in row {0},Dal valore deve essere inferiore al valore nella riga {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +133,Wire Transfer,Bonifico bancario
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +133,Wire Transfer,Bonifico bancario
 apps/erpnext/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py +25,Please select Bank Account,Seleziona conto bancario
 DocType: Newsletter,Create and Send Newsletters,Creare e inviare newsletter
 apps/frappe/frappe/public/js/frappe/views/reports/grid_report.js +305,From Date must be before To Date,Da Data deve essere prima di A Data
@@ -2581,14 +2489,14 @@
 DocType: Company,Default Income Account,Conto Predefinito Entrate
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,Gruppi clienti / clienti
 DocType: Item Group,Check this if you want to show in website,Seleziona se vuoi mostrare nel sito web
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +190,Welcome to ERPNext,Benvenuti a ERPNext
+,Welcome to ERPNext,Benvenuti a ERPNext
 DocType: Payment Reconciliation Payment,Voucher Detail Number,Voucher Number Dettaglio
 apps/erpnext/erpnext/config/crm.py +146,Lead to Quotation,Contatto per Preventivo
 DocType: Lead,From Customer,Da Cliente
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +37,Calls,chiamate
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Calls,chiamate
 DocType: Project,Total Costing Amount (via Time Logs),Importo totale Costing (via Time Diari)
 DocType: Purchase Order Item Supplied,Stock UOM,UdM Giacenza
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Purchase Order {0} is not submitted,Purchase Order {0} non è presentata
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +194,Purchase Order {0} is not submitted,Purchase Order {0} non è presentata
 ,Projected,proiettata
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},Serial No {0} non appartiene al Warehouse {1}
 apps/erpnext/erpnext/controllers/status_updater.py +136,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Nota : Il sistema non controlla over - consegna e over -booking per la voce {0} come la quantità o la quantità è 0
@@ -2596,7 +2504,6 @@
 DocType: Issue,Opening Date,Data di apertura
 DocType: Journal Entry,Remark,Osservazioni
 DocType: Purchase Receipt Item,Rate and Amount,Aliquota e importo
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +95,Boring,Noioso
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +667,From Sales Order,Da Ordine di Vendita
 DocType: Blog Category,Parent Website Route,Parent Sito Percorso
 DocType: Sales Order,Not Billed,Non Fatturata
@@ -2610,19 +2517,17 @@
 apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount Amount,Importo sconto
 DocType: Purchase Invoice,Return Against Purchase Invoice,Ritorno Contro Acquisto Fattura
 DocType: Item,Warranty Period (in days),Periodo di garanzia (in giorni)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +550,e.g. VAT,ad esempio IVA
+apps/erpnext/erpnext/public/js/setup_wizard.js +292,e.g. VAT,ad esempio IVA
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,Articolo 4
 DocType: Journal Entry Account,Journal Entry Account,Addebito Journal
 DocType: Shopping Cart Settings,Quotation Series,Serie Preventivi
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +52,"An item exists with same name ({0}), please change the item group name or rename the item","Un elemento esiste con lo stesso nome ( {0} ) , si prega di cambiare il nome del gruppo o di rinominare la voce"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +82,Hot metal gas forming,Gas metalli a caldo
 DocType: Sales Order Item,Sales Order Date,Ordine di vendita Data
 DocType: Sales Invoice Item,Delivered Qty,Q.tà Consegnata
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +63,Warehouse {0}: Company is mandatory,Warehouse {0}: Società è obbligatoria
 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.",Vai al gruppo appropriato (solitamente fonte di fondi&gt; passività correnti&gt; Tasse e imposte e creare un nuovo account (facendo clic su Add Child) di tipo &quot;Tax&quot; e fare parlare del Tax rate.
 ,Payment Period Based On Invoice Date,Periodo di pagamento basati su Data fattura
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +50,Missing Currency Exchange Rates for {0},Manca valuta Tassi di cambio in {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +135,Laser cutting,Taglio laser
 DocType: Event,Monday,Lunedi
 DocType: Journal Entry,Stock Entry,Inserimento Giacenza
 DocType: Account,Payable,pagabile
@@ -2655,7 +2560,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +111,Date Of Retirement must be greater than Date of Joining,Data del pensionamento deve essere maggiore di Data Assunzione
 DocType: Sales Invoice,Against Income Account,Per Reddito Conto
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +69,{0}% Delivered,{0}% Consegnato
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +78,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Articolo {0}: Qtà ordinata {1} non può essere inferiore a Qtà minima per ordine {2} (definita per l'Articolo).
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Articolo {0}: Qtà ordinata {1} non può essere inferiore a Qtà minima per ordine {2} (definita per l'Articolo).
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Percentuale Distribuzione Mensile
 DocType: Territory,Territory Targets,Obiettivi Territorio
 DocType: Delivery Note,Transporter Info,Info Transporter
@@ -2664,7 +2569,6 @@
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,Titoli di modelli di stampa ad esempio Fattura Proforma .
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +140,Valuation type charges can not marked as Inclusive,Spese tipo di valutazione non possono contrassegnata come Inclusive
 DocType: POS Profile,Update Stock,Aggiornare Giacenza
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +128,Superfinishing,Superfinitura
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,Diverso UOM per gli elementi porterà alla non corretta ( Total) Valore di peso netto . Assicurarsi che il peso netto di ogni articolo è nella stessa UOM .
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM Tasso
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +85,Please pull items from Delivery Note,Si prega di tirare oggetti da DDT
@@ -2679,7 +2583,6 @@
 ,Purchase Analytics,Acquisto Analytics
 DocType: Sales Invoice Item,Delivery Note Item,Nota articolo Consegna
 DocType: Expense Claim,Task,Attività
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +57,Shaving,Rasatura
 DocType: Purchase Taxes and Charges,Reference Row #,Riferimento Row #
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},Numero di lotto è obbligatoria per la voce {0}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js +14,This is a root sales person and cannot be edited.,Si tratta di una persona di vendita di root e non può essere modificato .
@@ -2691,13 +2594,11 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +74,Purpose must be one of {0},Scopo deve essere uno dei {0}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +108,Fill the form and save it,Compila il modulo e salvarlo
 DocType: Production Planning Tool,Download a report containing all raw materials with their latest inventory status,Scaricare un report contenete tutte le materie prime con il loro recente stato di inventario
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +94,Facing,Di fronte
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,Forum Community
 DocType: Leave Application,Leave Balance Before Application,Lascia equilibrio prima applicazione
 DocType: SMS Center,Send SMS,Invia SMS
 DocType: Company,Default Letter Head,Predefinito Lettera Capo
 DocType: Time Log,Billable,Addebitabile
-DocType: Authorization Rule,This will be used for setting rule in HR module,Questo verrà utilizzato per regola impostazione nel modulo HR
 DocType: Account,Rate at which this tax is applied,Tasso a cui viene applicata questa tassa
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reorder Qty,Riordina Quantità
 DocType: Company,Stock Adjustment Account,Conto di regolazione Archivio
@@ -2724,16 +2625,15 @@
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,Percentuale di ripartizione dovrebbe essere pari al 100 %
 DocType: Serial No,Out of AMC,Fuori di AMC
 DocType: Purchase Order Item,Material Request Detail No,Materiale richiesta dettaglio No
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +97,Hard turning,Tornitura dura
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +33,Make Maintenance Visit,Crea Visita Manutenzione
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +187,Please contact to the user who have Sales Master Manager {0} role,Si prega di contattare l'utente che hanno Sales Master Responsabile {0} ruolo
 DocType: Company,Default Cash Account,Conto Monete predefinito
 apps/erpnext/erpnext/config/accounts.py +79,Company (not Customer or Supplier) master.,Azienda ( non cliente o fornitore ) master.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +106,Please enter 'Expected Delivery Date',Inserisci il ' Data prevista di consegna '
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +187,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Note di consegna {0} devono essere cancellate prima di annullare questo ordine di vendita
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +100,Please enter 'Expected Delivery Date',Inserisci il ' Data prevista di consegna '
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +182,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Note di consegna {0} devono essere cancellate prima di annullare questo ordine di vendita
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +373,Paid amount + Write Off Amount can not be greater than Grand Total,Importo versato + Scrivi Off importo non può essere superiore a Grand Total
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} non è un numero di lotto valido per la voce {1}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,Note: There is not enough leave balance for Leave Type {0},Nota : Non c'è equilibrio congedo sufficiente per Leave tipo {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +124,Note: There is not enough leave balance for Leave Type {0},Nota : Non c'è equilibrio congedo sufficiente per Leave tipo {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.","Nota: Se il pagamento non viene effettuato nei confronti di qualsiasi riferimento, fare manualmente Journal Entry."
 DocType: Item,Supplier Items,Fornitore Articoli
 DocType: Opportunity,Opportunity Type,Tipo di Opportunità
@@ -2745,7 +2645,7 @@
 DocType: Hub Settings,Publish Availability,Pubblicare Disponibilità
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +105,Date of Birth cannot be greater than today.,Data di nascita non può essere maggiore rispetto a oggi.
 ,Stock Ageing,Invecchiamento Archivio
-apps/erpnext/erpnext/controllers/accounts_controller.py +200,{0} '{1}' is disabled,{0} '{1}' è disabilitato
+apps/erpnext/erpnext/controllers/accounts_controller.py +201,{0} '{1}' is disabled,{0} '{1}' è disabilitato
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Imposta come Open
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Invia e-mail automatica di contatti su operazioni Invio.
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +232,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
@@ -2755,44 +2655,38 @@
 DocType: Purchase Order,Customer Contact Email,Customer Contact Email
 DocType: Event,Sunday,Domenica
 DocType: Sales Team,Contribution (%),Contributo (%)
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +455,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,Nota : non verrà creato il pagamento poiché non è stato specificato 'conto bancario o fido'
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +171,Responsibilities,Responsabilità
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +457,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,Nota : non verrà creato il pagamento poiché non è stato specificato 'conto bancario o fido'
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +171,Responsibilities,Responsabilità
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Template,Modelli
 DocType: Sales Person,Sales Person Name,Vendite Nome persona
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,Inserisci atleast 1 fattura nella tabella
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +511,Add Users,Aggiungi utenti
+apps/erpnext/erpnext/public/js/setup_wizard.js +255,Add Users,Aggiungi utenti
 DocType: Pricing Rule,Item Group,Gruppo Articoli
 DocType: Task,Actual Start Date (via Time Logs),Actual Data di inizio (via Time Diari)
 DocType: Stock Reconciliation Item,Before reconciliation,Prima di riconciliazione
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +12,To {0},Per {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Tasse e spese aggiuntive (Azienda valuta)
-apps/erpnext/erpnext/stock/doctype/item/item.py +340,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Voce fiscale Row {0} deve avere un account di tipo fiscale o di reddito o spese o addebitabile
+apps/erpnext/erpnext/stock/doctype/item/item.py +344,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Voce fiscale Row {0} deve avere un account di tipo fiscale o di reddito o spese o addebitabile
 DocType: Sales Order,Partly Billed,Parzialmente Fatturato
 DocType: Item,Default BOM,BOM Predefinito
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +79,Decambering,Decambering
 apps/erpnext/erpnext/setup/doctype/company/company.js +22,Please re-type company name to confirm,Si prega di digitare nuovamente il nome della società per confermare
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,Totale Outstanding Amt
 DocType: Time Log Batch,Total Hours,Totale ore
 DocType: Journal Entry,Printing Settings,Impostazioni di stampa
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +268,Total Debit must be equal to Total Credit. The difference is {0},Debito totale deve essere pari al totale credito .
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +11,Automotive,Automotive
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +37,Item is required,L'Articolo è richiesto
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +25,Metal injection molding,Iniezione di metallo
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +258,Total Debit must be equal to Total Credit. The difference is {0},Debito totale deve essere pari al totale credito .
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,Automotive
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +684,From Delivery Note,Da Nota di Consegna
 DocType: Time Log,From Time,Da Periodo
 DocType: Notification Control,Custom Message,Messaggio Personalizzato
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +33,Investment Banking,Investment Banking
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +261,"Select your Country, Time Zone and Currency","Seleziona il tuo Paese, fuso orario e valuta"
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,Investment Banking
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +316,"Select your Country, Time Zone and Currency","Seleziona il tuo Paese, fuso orario e valuta"
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +369,Cash or Bank Account is mandatory for making payment entry,Contanti o conto bancario è obbligatoria per effettuare il pagamento voce
 DocType: Purchase Invoice,Price List Exchange Rate,Listino Prezzi Tasso di Cambio
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +91,Pickling,Decapaggio
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +18,Sand casting,Colata in sabbia
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +117,Electroplating,Galvanotecnica
 DocType: Purchase Invoice Item,Rate,Tariffa
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +62,Intern,Stagista
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Intern,Stagista
 DocType: Newsletter,A Lead with this email id should exist,Un potenziale cliente (lead) con questa e-mail dovrebbe esistere
 DocType: Stock Entry,From BOM,Da Distinta Base
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +34,Basic,di base
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +34,Basic,di base
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,Operazioni Giacenza prima {0} sono bloccate
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +217,Please click on 'Generate Schedule',Si prega di cliccare su ' 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,'A Data' deve essere uguale a 'Da Data' per il congedo di mezza giornata
@@ -2800,11 +2694,11 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +96,Reference No is mandatory if you entered Reference Date,N. di riferimento è obbligatoria se hai inserito Reference Data
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +108,Date of Joining must be greater than Date of Birth,Data di adesione deve essere maggiore di Data di nascita
 DocType: Salary Structure,Salary Structure,Struttura salariale
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +242,"Multiple Price Rule exists with same criteria, please resolve \
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +246,"Multiple Price Rule exists with same criteria, please resolve \
 			conflict by assigning priority. Price Rules: {0}","Multipla Regola Prezzo esiste con stessi criteri, si prega di risolvere \
  conflitto assegnando priorità. Regole Prezzo: {0}"
 DocType: Account,Bank,Banca
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +9,Airline,linea aerea
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,linea aerea
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +493,Issue Material,Fornire Materiale
 DocType: Material Request Item,For Warehouse,Per Magazzino
 DocType: Employee,Offer Date,offerta Data
@@ -2814,29 +2708,24 @@
 DocType: Item,Is Fixed Asset Item,È Asset fisso Voce
 DocType: Stock Entry,Including items for sub assemblies,Compresi articoli per sub assemblaggi
 DocType: Features Setup,"If you have long print formats, this feature can be used to split the page to be printed on multiple pages with all headers and footers on each page","Se si è a lungo stampare formati, questa funzione può essere usato per dividere la pagina da stampare su più pagine con tutte le intestazioni e piè di pagina in ogni pagina"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +131,Hobbing,Hobbing
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +98,All Territories,tutti i Territori
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +98,All Territories,tutti i Territori
 DocType: Purchase Invoice,Items,Articoli
 DocType: Fiscal Year,Year Name,Anno Nome
 DocType: Process Payroll,Process Payroll,Processo Payroll
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +59,There are more holidays than working days this month.,Ci sono più feste di giorni di lavoro di questo mese .
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +68,There are more holidays than working days this month.,Ci sono più feste di giorni di lavoro di questo mese .
 DocType: Product Bundle Item,Product Bundle Item,Prodotto Bundle Voce
 DocType: Sales Partner,Sales Partner Name,Vendite Partner Nome
 DocType: Purchase Invoice Item,Image View,Visualizza immagine
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +113,Finishing & industrial finishing,Finitura &amp; finitura industriale
 DocType: Issue,Opening Time,Tempo di apertura
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,Data Inizio e Fine sono obbligatorie
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +46,Securities & Commodity Exchanges,Securities & borse merci
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Securities & borse merci
 DocType: Shipping Rule,Calculate Based On,Calcola in base a
 DocType: Delivery Note Item,From Warehouse,Dal magazzino
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +98,Drilling,Perforazione
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +28,Blow molding,Soffiaggio
 DocType: Purchase Taxes and Charges,Valuation and Total,Valutazione e Total
 DocType: Tax Rule,Shipping City,Spedizione Città
 apps/erpnext/erpnext/stock/doctype/item/item.js +43,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,Questo Articolo è una variante di {0} (Modello). Gli attributi vengono copiati dal modello solo se si imposta 'No Copy'
 DocType: Account,Purchase User,Acquisto utente
 DocType: Notification Control,Customize the Notification,Personalizzare Notifica
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +87,Hammering,Martellamento
 DocType: Web Page,Slideshow,Slideshow
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +24,Default Address Template cannot be deleted,Indirizzo modello predefinito non può essere eliminato
 DocType: Sales Invoice,Shipping Rule,Spedizione Rule
@@ -2845,9 +2734,8 @@
 DocType: Workflow State,Search,Cerca
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +54,Total cannot be zero,Totale non può essere 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,'Giorni dall'ultimo Ordine' deve essere maggiore o uguale a zero
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +142,Brazing,Brasatura
 DocType: C-Form,Amended From,Corretto da
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Raw Material,Materia prima
+apps/erpnext/erpnext/public/js/setup_wizard.js +359,Raw Material,Materia prima
 DocType: Leave Application,Follow via Email,Seguire via Email
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Fiscale Ammontare Dopo Sconto Importo
 apps/erpnext/erpnext/accounts/doctype/account/account.py +174,Child account exists for this account. You can not delete this account.,Conto Child esiste per questo account . Non è possibile eliminare questo account .
@@ -2861,10 +2749,10 @@
 ,Produced,prodotto
 DocType: Item,Item Code for Suppliers,Codice Articolo per Fornitori
 DocType: Issue,Raised By (Email),Sollevata da (e-mail)
-apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +72,General,Generale
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +495,Attach Letterhead,Allega intestata
+apps/erpnext/erpnext/setup/setup_wizard/default_website.py +72,General,Generale
+apps/erpnext/erpnext/public/js/setup_wizard.js +241,Attach Letterhead,Allega intestata
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +272,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',Non può dedurre quando categoria è di ' valutazione ' o ' Valutazione e Total '
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +542,"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.","Inserisci il tuo capo fiscali (ad esempio IVA, dogana ecc, che devono avere nomi univoci) e le loro tariffe standard. Questo creerà un modello standard, che è possibile modificare e aggiungere più tardi."
+apps/erpnext/erpnext/public/js/setup_wizard.js +284,"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.","Inserisci il tuo capo fiscali (ad esempio IVA, dogana ecc, che devono avere nomi univoci) e le loro tariffe standard. Questo creerà un modello standard, che è possibile modificare e aggiungere più tardi."
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial Nos Required for Serialized Item {0},Serial Nos Obbligatorio per la voce Serialized {0}
 DocType: Journal Entry,Bank Entry,Bank Entry
 DocType: Authorization Rule,Applicable To (Designation),Applicabile a (Designazione)
@@ -2873,33 +2761,32 @@
 apps/erpnext/erpnext/config/accounts.py +143,Enable / disable currencies.,Abilitare / disabilitare valute.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Postal Expenses,spese postali
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Totale (Amt)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +26,Entertainment & Leisure,Intrattenimento e tempo libero
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,Intrattenimento e tempo libero
 DocType: Purchase Order,The date on which recurring order will be stop,La data in cui ordine ricorrente sarà ferma
 DocType: Quality Inspection,Item Serial No,Articolo N. d&#39;ordine
 apps/erpnext/erpnext/controllers/status_updater.py +142,{0} must be reduced by {1} or you should increase overflow tolerance,{0} deve essere ridotto di {1} o si dovrebbe aumentare la tolleranza di superamento soglia
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Present,Presente totale
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Hour,Ora
+apps/erpnext/erpnext/public/js/setup_wizard.js +363,Hour,Ora
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +138,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation","Serialized Voce {0} non può essere aggiornato tramite \
  riconciliazione Archivio"
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +488,Transfer Material to Supplier,Trasferire il materiale al Fornitore
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +513,Transfer Material to Supplier,Trasferire il materiale al Fornitore
 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,New Serial No non può avere Warehouse . Warehouse deve essere impostato da dell'entrata Stock o ricevuta d'acquisto
 DocType: Lead,Lead Type,Tipo Contatto
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +82,Create Quotation,Crea Preventivo
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +306,All these items have already been invoiced,Tutti questi elementi sono già stati fatturati
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,You are not authorized to approve leaves on Block Dates,Non sei autorizzato ad approvare foglie su Date Block
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +311,All these items have already been invoiced,Tutti questi elementi sono già stati fatturati
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},Può essere approvato da {0}
 DocType: Shipping Rule,Shipping Rule Conditions,Spedizione condizioni regola
 DocType: BOM Replace Tool,The new BOM after replacement,Il nuovo BOM dopo la sostituzione
 DocType: Features Setup,Point of Sale,Punto di vendita
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +83,Curling,Curling
 DocType: Account,Tax,Tassa
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +28,Row {0}: {1} is not a valid {2},Riga {0}: {1} non è un valido {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +89,Refining,Raffinazione
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +37,Row {0}: {1} is not a valid {2},Riga {0}: {1} non è un valido {2}
 DocType: Production Planning Tool,Production Planning Tool,Production Planning Tool
 DocType: Quality Inspection,Report Date,Data Segnala
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +130,Routing,Routing
 DocType: C-Form,Invoices,Fatture
 DocType: Job Opening,Job Title,Professione
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +54,{0} already allocated for Employee {1} for period {2} - {3},{0} già stanziato per Employee {1} per il periodo {2} - {3}
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +80,{0} Recipients,{0} Destinatari
 DocType: Features Setup,Item Groups in Details,Gruppi di articoli in Dettagli
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +335,Quantity to Manufacture must be greater than 0.,Quantità di Fabbricazione deve essere maggiore di 0.
@@ -2917,14 +2804,13 @@
 DocType: DocType,Setup,Setup
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,Non c'è nulla da modificare.
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +108,Summary for this month and pending activities,Riepilogo per questo mese e le attività in corso
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +39,Cold rolling,Laminazione a freddo
 DocType: Customer Group,Customer Group Name,Nome Gruppo Cliente
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +408,Please remove this Invoice {0} from C-Form {1},Si prega di rimuovere questo Invoice {0} dal C-Form {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +410,Please remove this Invoice {0} from C-Form {1},Si prega di rimuovere questo Invoice {0} dal C-Form {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,Si prega di selezionare il riporto se anche voi volete includere equilibrio precedente anno fiscale di parte per questo anno fiscale
 DocType: GL Entry,Against Voucher Type,Per tipo Tagliando
 DocType: Item,Attributes,Attributi
 DocType: Packing Slip,Get Items,Ottieni articoli
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +186,Please enter Write Off Account,Inserisci Scrivi Off conto
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +187,Please enter Write Off Account,Inserisci Scrivi Off conto
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +71,Last Order Date,Last Order Data
 DocType: DocField,Image,Immagine
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +179,Make Excise Invoice,Crea Fattura Accise (bolla)
@@ -2934,7 +2820,7 @@
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +146,Operation ID not set,ID Operazione non impostato
 DocType: Production Order,Planned Start Date,Data prevista di inizio
 DocType: Serial No,Creation Document Type,Creazione tipo di documento
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +620,Maint. Visit,Maint. Visita
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +631,Maint. Visit,Maint. Visita
 DocType: Leave Type,Is Encash,È incassare
 DocType: Purchase Invoice,Mobile No,Num. Cellulare
 DocType: Payment Tool,Make Journal Entry,Crea Voce Diario
@@ -2942,35 +2828,31 @@
 apps/erpnext/erpnext/controllers/trends.py +257,Project-wise data is not available for Quotation,Dati di progetto non sono disponibile per Preventivo
 DocType: Project,Expected End Date,Data prevista di fine
 DocType: Appraisal Template,Appraisal Template Title,Valutazione Titolo Modello
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +440,Commercial,commerciale
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +378,Commercial,commerciale
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +23,Parent Item {0} must not be a Stock Item,Voce genitore {0} non deve essere un Articolo Articolo
 DocType: Cost Center,Distribution Id,ID di Distribuzione
-apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +14,Awesome Services,Servizi di punta
+apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +14,Awesome Services,Servizi di punta
 apps/erpnext/erpnext/config/manufacturing.py +29,All Products or Services.,Tutti i Prodotti o Servizi.
 DocType: Purchase Invoice,Supplier Address,Fornitore Indirizzo
 DocType: Contact Us Settings,Address Line 2,"Indirizzo, riga 2"
 DocType: ToDo,Reference,Riferimento
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +59,Perforating,Perforazione
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,out Quantità
 apps/erpnext/erpnext/config/accounts.py +128,Rules to calculate shipping amount for a sale,Regole per il calcolo dell&#39;importo di trasporto per una vendita
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +29,Series is mandatory,Series è obbligatorio
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +28,Financial Services,Servizi finanziari
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,Servizi finanziari
 apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3},Rapporto qualità-attributo {0} deve essere compresa tra {1} a {2} nei incrementi di {3}
 DocType: Tax Rule,Sales,Vendite
 DocType: Stock Entry Detail,Basic Amount,Importo di base
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +173,Warehouse required for stock Item {0},Magazzino richiesto per l'Articolo in Giacenza {0}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +178,Warehouse required for stock Item {0},Magazzino richiesto per l'Articolo in Giacenza {0}
 DocType: Leave Allocation,Unused leaves,Foglie non utilizzati
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,Cr
 DocType: Customer,Default Receivable Accounts,Predefinito Contabilità clienti
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +102,Sawing,Segare
 DocType: Tax Rule,Billing State,Stato di fatturazione
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +32,Laminating,Laminazione
 DocType: Item Reorder,Transfer,Trasferimento
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +549,Fetch exploded BOM (including sub-assemblies),Fetch BOM esplosa ( inclusi sottoassiemi )
 DocType: Authorization Rule,Applicable To (Employee),Applicabile a (Dipendente)
 apps/erpnext/erpnext/controllers/accounts_controller.py +101,Due Date is mandatory,Data di scadenza è obbligatoria
 apps/erpnext/erpnext/controllers/item_variant.py +51,Increment for Attribute {0} cannot be 0,Incremento per attributo {0} non può essere 0
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +143,Sintering,Sinterizzazione
 DocType: Journal Entry,Pay To / Recd From,Pay To / RECD Da
 DocType: Naming Series,Setup Series,Serie Setup
 DocType: Supplier,Contact HTML,Contatto HTML
@@ -2983,7 +2865,6 @@
 DocType: Attendance,Absent,Assente
 DocType: Product Bundle,Product Bundle,Bundle prodotto
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +180,Row {0}: Invalid reference {1},Riga {0}: Riferimento non valido {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +165,Crushing,Frantumazione
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Acquistare Tasse e spese Template
 DocType: Upload Attendance,Download Template,Scarica Modello
 DocType: GL Entry,Remarks,Osservazioni
@@ -2991,14 +2872,12 @@
 DocType: Journal Entry,Write Off Based On,Scrivi Off Basato Su
 DocType: Features Setup,POS View,POS View
 apps/erpnext/erpnext/config/stock.py +38,Installation record for a Serial No.,Record di installazione per un numero di serie
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +9,Continuous casting,Colata continua
 apps/erpnext/erpnext/public/js/queries.js +39,Please specify a,Si prega di specificare una
 DocType: Offer Letter,Awaiting Response,In attesa di risposta
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +53,Above,Sopra
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +80,Cold sizing,Dimensionamento a freddo
 DocType: Salary Slip,Earning & Deduction,Rendimento & Detrazione
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +76,Account {0} cannot be a Group,Il Conto {0} non può essere un gruppo
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +259,Region,Regione
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +314,Region,Regione
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +213,Optional. This setting will be used to filter in various transactions.,Facoltativo. Questa impostazione verrà utilizzato per filtrare in diverse operazioni .
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +104,Negative Valuation Rate is not allowed,Negativo Tasso valutazione non è consentito
 DocType: Holiday List,Weekly Off,Settimanale Off
@@ -3016,7 +2895,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,Account {0} is inactive,Il Conto {0} è inattivo
 DocType: GL Entry,Is Advance,È Advance
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,Inizio e Fine data della frequenza soo obbligatori
-apps/erpnext/erpnext/controllers/buying_controller.py +131,Please enter 'Is Subcontracted' as Yes or No,Si prega di inserire ' è appaltata ' come Yes o No
+apps/erpnext/erpnext/controllers/buying_controller.py +122,Please enter 'Is Subcontracted' as Yes or No,Si prega di inserire ' è appaltata ' come Yes o No
 DocType: Sales Team,Contact No.,Contatto N.
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,'Profit and Loss' type account {0} not allowed in Opening Entry,Il tipo di conto {0} 'Profitti e Perdite' non consentito nella voce di apertura
 DocType: Workflow State,Time,Tempo
@@ -3025,14 +2904,13 @@
 DocType: Authorization Rule,Authorization Rule,Ruolo Autorizzazione
 DocType: Sales Invoice,Terms and Conditions Details,Termini e condizioni dettagli
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,Tasse di vendita e spese dei modelli
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +10,Apparel & Accessories,Abbigliamento e accessori
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,Abbigliamento e accessori
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +67,Number of Order,Numero di ordinazione
 DocType: Item Group,HTML / Banner that will show on the top of product list.,HTML / Banner verrà mostrato sulla parte superiore della lista dei prodotti.
 DocType: Shipping Rule,Specify conditions to calculate shipping amount,Specificare le condizioni per determinare il valore di spedizione
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +121,Add Child,Aggiungi ai bambini
 DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,Ruolo permesso di impostare conti congelati e modificare le voci congelati
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +52,Cannot convert Cost Center to ledger as it has child nodes,Impossibile convertire centro di costo a registro come ha nodi figlio
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +47,Conversion Factor is required,È necessario fattore di conversione
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +37,Serial #,Serial #
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +87,Commission on Sales,Commissione sulle vendite
 DocType: Offer Letter Term,Value / Description,Valore / Descrizione
@@ -3040,10 +2918,8 @@
 ,Customers Not Buying Since Long Time,Clienti non acquisto da molto tempo
 DocType: Production Order,Expected Delivery Date,Data prevista di consegna
 apps/erpnext/erpnext/accounts/general_ledger.py +121,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Dare e Avere non uguale per {0} # {1}. La differenza è {2}.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +48,Bulging,Sporgente
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +11,Evaporative-pattern casting,Evaporazione-modello colata
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Entertainment Expenses,Spese di rappresentanza
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +195,Sales Invoice {0} must be cancelled before cancelling this Sales Order,Fattura di vendita {0} deve essere cancellato prima di annullare questo ordine di vendita
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +190,Sales Invoice {0} must be cancelled before cancelling this Sales Order,Fattura di vendita {0} deve essere cancellato prima di annullare questo ordine di vendita
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +61,Age,Età
 DocType: Time Log,Billing Amount,Fatturazione Importo
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +84,Invalid quantity specified for item {0}. Quantity should be greater than 0.,Quantità non valido specificato per l'elemento {0}. La quantità dovrebbe essere maggiore di 0.
@@ -3062,26 +2938,24 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,Nuovi Ricavi Cliente
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Travel Expenses,Spese di viaggio
 DocType: Maintenance Visit,Breakdown,Esaurimento
-apps/erpnext/erpnext/controllers/accounts_controller.py +241,Account: {0} with currency: {1} can not be selected,Account: {0} con valuta: {1} non può essere selezionato
+apps/erpnext/erpnext/controllers/accounts_controller.py +242,Account: {0} with currency: {1} can not be selected,Account: {0} con valuta: {1} non può essere selezionato
 DocType: Bank Reconciliation Detail,Cheque Date,Data Assegno
 apps/erpnext/erpnext/accounts/doctype/account/account.py +47,Account {0}: Parent account {1} does not belong to company: {2},Il Conto {0}: conto derivato{1} non appartiene alla società: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted all transactions related to this company!,Cancellato con successo tutte le operazioni relative a questa società!
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,Come in data
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +111,Honing,Levigatura
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +58,Probation,prova
-apps/erpnext/erpnext/stock/doctype/item/item.py +264,Default Warehouse is mandatory for stock Item.,Magazino predefinito necessario per articolo in Giacenza.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Probation,prova
+apps/erpnext/erpnext/stock/doctype/item/item.py +268,Default Warehouse is mandatory for stock Item.,Magazino predefinito necessario per articolo in Giacenza.
 DocType: Feed,Full Name,Nome Completo
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +148,Clinching,Clinciatura
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +191,Payment of salary for the month {0} and year {1},Il pagamento dello stipendio del mese {0} e l'anno {1}
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +173,Payment of salary for the month {0} and year {1},Il pagamento dello stipendio del mese {0} e l'anno {1}
 DocType: Stock Settings,Auto insert Price List rate if missing,Inserimento automatico tasso Listino se mancante
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,Importo totale pagato
 ,Transferred Qty,Quantità trasferito
 apps/erpnext/erpnext/config/learn.py +11,Navigating,Navigazione
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +137,Planning,pianificazione
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +137,Planning,pianificazione
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +9,Make Time Log Batch,Crea Lotto log Tempo
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Issued,Rilasciato
 DocType: Project,Total Billing Amount (via Time Logs),Importo totale fatturazione (via Time Diari)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +629,We sell this Item,Vendiamo questo articolo
+apps/erpnext/erpnext/public/js/setup_wizard.js +365,We sell this Item,Vendiamo questo articolo
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +65,Supplier Id,Fornitore Id
 DocType: Journal Entry,Cash Entry,Cash Entry
 DocType: Sales Partner,Contact Desc,Desc Contatto
@@ -3090,18 +2964,16 @@
 DocType: Brand,Item Manager,Manager del'Articolo
 DocType: Cost Center,Add rows to set annual budgets on Accounts.,Aggiungere righe per impostare i budget annuali sui conti.
 DocType: Buying Settings,Default Supplier Type,Tipo Fornitore Predefinito
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +160,Quarrying,Estrazione
 DocType: Production Order,Total Operating Cost,Totale costi di esercizio
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +160,Note: Item {0} entered multiple times,Nota : Articolo {0} inserito più volte
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +163,Note: Item {0} entered multiple times,Nota : Articolo {0} inserito più volte
 apps/erpnext/erpnext/config/crm.py +27,All Contacts.,Tutti i contatti.
 DocType: Newsletter,Test Email Id,Prova Email Id
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +394,Company Abbreviation,Abbreviazione Società
+apps/erpnext/erpnext/public/js/setup_wizard.js +142,Company Abbreviation,Abbreviazione Società
 DocType: Features Setup,If you follow Quality Inspection. Enables Item QA Required and QA No in Purchase Receipt,Se si seguono Controllo Qualità . Abilita Voce QA necessari e QA No in Acquisto Ricevuta
 DocType: GL Entry,Party Type,Tipo partito
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +68,Raw material cannot be same as main Item,La materia prima non può essere lo stesso come voce principale
 DocType: Item Attribute Value,Abbreviation,Abbreviazione
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,Non autorizzato poiché {0} supera i limiti
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +30,Rotational molding,Stampaggio rotazionale
 apps/erpnext/erpnext/config/hr.py +115,Salary template master.,Modello Stipendio master.
 DocType: Leave Type,Max Days Leave Allowed,Max giorni di ferie domestici
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +55,Set Tax Rule for shopping cart,Set di regole fiscali per carrello della spesa
@@ -3115,15 +2987,15 @@
 apps/erpnext/erpnext/config/selling.py +18,Quotes to Leads or Customers.,Preventivo a clienti o contatti.
 DocType: Stock Settings,Role Allowed to edit frozen stock,Ruolo ammessi da modificare stock congelato
 ,Territory Target Variance Item Group-Wise,Territorio di destinazione Varianza articolo Group- Wise
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +101,All Customer Groups,Tutti i gruppi di clienti
-apps/erpnext/erpnext/controllers/accounts_controller.py +474,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} è obbligatorio. Forse il record di cambio di valuta non è stato creato per {1} {2}.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +101,All Customer Groups,Tutti i gruppi di clienti
+apps/erpnext/erpnext/controllers/accounts_controller.py +475,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} è obbligatorio. Forse il record di cambio di valuta non è stato creato per {1} {2}.
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +37,Tax Template is mandatory.,Tax modello è obbligatoria.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +41,Account {0}: Parent account {1} does not exist,Il Conto {0}: conto derivato {1} non esiste
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Prezzo di listino (Valuta Azienda)
 DocType: Account,Temporary,Temporaneo
 DocType: Address,Preferred Billing Address,Preferito Indirizzo di fatturazione
 DocType: Monthly Distribution Percentage,Percentage Allocation,Percentuale di allocazione
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +86,Secretary,segretario
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Secretary,segretario
 DocType: Serial No,Distinct unit of an Item,Un'unità distinta di un elemento
 DocType: Pricing Rule,Buying,Acquisti
 DocType: HR Settings,Employee Records to be created by,Informazioni del dipendenti da creare a cura di
@@ -3136,9 +3008,8 @@
 ,Item-wise Price List Rate,Articolo -saggio Listino Tasso
 DocType: Purchase Order Item,Supplier Quotation,Preventivo Fornitore
 DocType: Quotation,In Words will be visible once you save the Quotation.,In parole saranno visibili una volta che si salva il preventivo.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +68,Ironing,Stiratura
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is stopped,{0} {1} è fermato
-apps/erpnext/erpnext/stock/doctype/item/item.py +352,Barcode {0} already used in Item {1},Codice a barre {0} già utilizzato nel Prodotto {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +356,Barcode {0} already used in Item {1},Codice a barre {0} già utilizzato nel Prodotto {1}
 DocType: Lead,Add to calendar on this date,Aggiungi al calendario in questa data
 apps/erpnext/erpnext/config/selling.py +132,Rules for adding shipping costs.,Regole per l'aggiunta di spese di spedizione .
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,Prossimi eventi
@@ -3147,27 +3018,25 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +27,Quick Entry,Inserimento rapido
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0} è obbligatorio per Return
 DocType: Purchase Order,To Receive,Ricevere
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +33,Shrink fitting,Shrink raccordo
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +522,user@example.com,user@example.com
+apps/erpnext/erpnext/public/js/setup_wizard.js +266,user@example.com,user@example.com
 DocType: Email Digest,Income / Expense,Proventi / Spese
 DocType: Employee,Personal Email,Personal Email
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +58,Total Variance,Varianza totale
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +62,Total Variance,Varianza totale
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.","Se abilitato, il sistema pubblicherà le scritture contabili per l&#39;inventario automatico."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +15,Brokerage,mediazione
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +15,Brokerage,mediazione
 DocType: Address,Postal Code,Codice Postale
 DocType: Production Order Operation,"in Minutes
 Updated via 'Time Log'",Aggiornato da pochi minuti tramite 'Time Log'
 DocType: Customer,From Lead,Da Contatto
 apps/erpnext/erpnext/config/manufacturing.py +19,Orders released for production.,Gli ordini rilasciati per la produzione.
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +42,Select Fiscal Year...,Selezionare l'anno fiscale ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +442,POS Profile required to make POS Entry,POS Profilo tenuto a POS Entry
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +444,POS Profile required to make POS Entry,POS Profilo tenuto a POS Entry
 DocType: Hub Settings,Name Token,Nome Token
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +106,Planing,Progettazione
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Selling,Selling standard
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +120,Standard Selling,Selling standard
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +137,Atleast one warehouse is mandatory,Almeno un Magazzino è obbligatorio
 DocType: Serial No,Out of Warranty,Fuori Garanzia
 DocType: BOM Replace Tool,Replace,Sostituire
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +314,{0} against Sales Invoice {1},{0} contro Fattura {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +316,{0} against Sales Invoice {1},{0} contro Fattura {1}
 apps/erpnext/erpnext/stock/doctype/item/item.py +49,Please enter default Unit of Measure,Inserisci unità di misura predefinita
 DocType: Purchase Invoice Item,Project Name,Nome del progetto
 DocType: Supplier,Mention if non-standard receivable account,Menzione se conto credito non standard
@@ -3183,9 +3052,8 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,Journal Entry {0} does not have account {1} or already matched against other voucher,Diario {0} non ha conto {1} o già confrontato altro buono
 DocType: Item,Moving Average,Media Mobile
 DocType: BOM Replace Tool,The BOM which will be replaced,La distinta base che sarà sostituito
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +43,New Stock UOM must be different from current stock UOM,Nuovo Archivio UOM deve essere diverso da stock attuale UOM
 DocType: Account,Debit,Debito
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +34,Leaves must be allocated in multiples of 0.5,"Le foglie devono essere assegnati in multipli di 0,5"
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +44,Leaves must be allocated in multiples of 0.5,"Le foglie devono essere assegnati in multipli di 0,5"
 DocType: Production Order,Operation Cost,Operazione Costo
 apps/erpnext/erpnext/config/hr.py +71,Upload attendance from a .csv file,Carica presenze da un file. Csv
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,Eccezionale Amt
@@ -3203,8 +3071,7 @@
 DocType: Employee,Internal Work History,Storia di lavoro interni
 DocType: DocField,Column Break,Interruzione Colonna
 DocType: Event,Thursday,Giovedì
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +42,Private Equity,private Equity
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +93,Turning,Svolta
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,private Equity
 DocType: Maintenance Visit,Customer Feedback,Opinione Cliente
 DocType: Account,Expense,Spesa
 DocType: Sales Invoice,Exhibition,Esposizione
@@ -3217,19 +3084,19 @@
 DocType: Employee,Held On,Held On
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +33,Production Item,Produzione Voce
 ,Employee Information,Informazioni Dipendente
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,Rate (%),Tasso ( % )
+apps/erpnext/erpnext/public/js/setup_wizard.js +294,Rate (%),Tasso ( % )
 DocType: Stock Entry Detail,Additional Cost,Costo aggiuntivo
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +407,Financial Year End Date,Data di Esercizio di fine
+apps/erpnext/erpnext/public/js/setup_wizard.js +155,Financial Year End Date,Data di Esercizio di fine
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Voucher No, if grouped by Voucher","Non è possibile filtrare sulla base di Voucher No , se raggruppati per Voucher"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +484,Make Supplier Quotation,Crea Quotazione Fornitore
 DocType: Quality Inspection,Incoming,In arrivo
 DocType: BOM,Materials Required (Exploded),Materiali necessari (esploso)
 DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),Ridurre Guadagnare in aspettativa senza assegni (LWP)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +512,"Add users to your organization, other than yourself","Aggiungere utenti alla vostra organizzazione, diversa da te"
+apps/erpnext/erpnext/public/js/setup_wizard.js +256,"Add users to your organization, other than yourself","Aggiungere utenti alla vostra organizzazione, diversa da te"
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No {1} does not match with {2} {3},Fila # {0}: N. di serie {1} non corrisponde con {2} {3}
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +44,Casual Leave,Casual Leave
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +44,Casual Leave,Casual Leave
 DocType: Batch,Batch ID,ID Lotto
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +334,Note: {0},Nota : {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +336,Note: {0},Nota : {0}
 ,Delivery Note Trends,Nota Consegna Tendenza
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +104,This Week's Summary,Sintesi di questa settimana
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +74,{0} must be a Purchased or Sub-Contracted Item in row {1},{0} deve essere un articolo acquistato o in subappalto in riga {1}
@@ -3241,7 +3108,7 @@
 DocType: Purchase Receipt,Return Against Purchase Receipt,Di ritorno contro RICEVUTA
 DocType: Purchase Order,To Bill,Per Bill
 DocType: Material Request,% Ordered,Ordinato%
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +61,Piecework,lavoro a cottimo
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Piecework,lavoro a cottimo
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +64,Avg. Buying Rate,Avg. Buying Rate
 DocType: Task,Actual Time (in Hours),Tempo reale (in ore)
 DocType: Employee,History In Company,Storia Aziendale
@@ -3258,13 +3125,13 @@
 DocType: Opportunity,To Discuss,Da Discutere
 DocType: SMS Settings,SMS Settings,Impostazioni SMS
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +60,Temporary Accounts,Conti provvisori
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +155,Black,Nero
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Black,Nero
 DocType: BOM Explosion Item,BOM Explosion Item,DIBA Articolo Esploso
 DocType: Account,Auditor,Uditore
 DocType: Purchase Order,End date of current order's period,Data di fine del periodo di fine corso
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +17,Make Offer Letter,Crea una Lettera d'Offerta
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +10,Return,Ritorno
-apps/erpnext/erpnext/stock/doctype/item/item.py +503,Default Unit of Measure for Variant must be same as Template,Unità di misura predefinita per la variante deve essere lo stesso come modello
+apps/erpnext/erpnext/stock/doctype/item/item.py +507,Default Unit of Measure for Variant must be same as Template,Unità di misura predefinita per la variante deve essere lo stesso come modello
 DocType: DocField,Fold,Piega
 DocType: Production Order Operation,Production Order Operation,Ordine di produzione Operation
 DocType: Pricing Rule,Disable,Disattiva
@@ -3275,13 +3142,12 @@
 DocType: Page,Page Name,Nome pagina
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +110,To Time must be greater than From Time,Per ora deve essere maggiore di From Time
 DocType: Journal Entry Account,Exchange Rate,Tasso di cambio:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +465,Sales Order {0} is not submitted,Sales Order {0} non è presentata
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +467,Sales Order {0} is not submitted,Sales Order {0} non è presentata
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0}: Parent account {1} does not bolong to the company {2},Warehouse {0}: conto Parent {1} non Bolong alla società {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +124,Spindle finishing,Finitura mandrino
 DocType: BOM,Last Purchase Rate,Ultimo Purchase Rate
 DocType: Account,Asset,attività
 DocType: Project Task,Task ID,ID attività
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +395,"e.g. ""MC""","ad esempio "" MC """
+apps/erpnext/erpnext/public/js/setup_wizard.js +143,"e.g. ""MC""","ad esempio "" MC """
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,Stock cannot exist for Item {0} since has variants,Stock non può esistere per la voce {0} dal ha varianti
 ,Sales Person-wise Transaction Summary,Sales Person-saggio Sintesi dell&#39;Operazione
 DocType: System Settings,Time Zone,Fuso Orario
@@ -3290,9 +3156,7 @@
 DocType: Monthly Distribution,Monthly Distribution Percentages,Percentuali Distribuzione Mensile
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +16,The selected item cannot have Batch,La voce selezionata non può avere Batch
 DocType: Delivery Note,% of materials delivered against this Delivery Note,% dei materiali consegnati di questa Bolla di Consegna
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +151,Stapling,Pinzatura
 DocType: Customer,Customer Details,Dettagli Cliente
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +105,Shaping,Shaping
 DocType: Employee,Reports to,Relazioni al
 DocType: SMS Settings,Enter url parameter for receiver nos,Inserisci parametri url per NOS ricevuti
 DocType: Sales Invoice,Paid Amount,Importo pagato
@@ -3301,13 +3165,13 @@
 DocType: Item Variant,Item Variant,Elemento Variant
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +15,Setting this Address Template as default as there is no other default,L'impostazione di questo modello di indirizzo di default perché non c'è altro difetto
 apps/erpnext/erpnext/accounts/doctype/account/account.py +89,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Saldo del conto già in debito, non ti è permesso di impostare 'saldo deve essere' come 'credito'"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +76,Quality Management,Gestione della qualità
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Quality Management,Gestione della qualità
 DocType: Production Planning Tool,Filter based on customer,Filtro basato sul cliente
 DocType: Payment Tool Detail,Against Voucher No,Contro Voucher No
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +47,Please enter quantity for Item {0},Inserite la quantità per articolo {0}
 DocType: Employee External Work History,Employee External Work History,Storia lavorativa esterna del Dipendente
 DocType: Tax Rule,Purchase,Acquisto
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +34,Balance Qty,equilibrio Quantità
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Balance Qty,equilibrio Quantità
 DocType: Item Group,Parent Item Group,Capogruppo Voce
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +21,{0} for {1},{0} per {1}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +96,Cost Centers,Centri di costo
@@ -3317,12 +3181,12 @@
 DocType: Opportunity,Next Contact,Successivo Contattaci
 DocType: Employee,Employment Type,Tipo Dipendente
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,immobilizzazioni
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +84,Application period cannot be across two alocation records,Periodo di applicazione non può essere tra due record alocation
 DocType: Item Group,Default Expense Account,Account Spese Predefinito
 DocType: Employee,Notice (days),Avviso ( giorni )
 DocType: Page,Yes,Sì
 DocType: Tax Rule,Sales Tax Template,Sales Tax Template
 DocType: Employee,Encashment Date,Data Incasso
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +74,Electroforming,Elettroformatura
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +179,"Against Voucher Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Contro Voucher tipo deve essere uno di Ordine di Acquisto, Acquisto fattura o diario"
 DocType: Account,Stock Adjustment,Regolazione della
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +34,Default Activity Cost exists for Activity Type - {0},Esiste di default Attività Costo per il tipo di attività - {0}
@@ -3358,12 +3222,12 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,Magazzino non può essere eliminato siccome esiste articolo ad inventario per questo Magazzino .
 DocType: Company,Distribution,Distribuzione
 apps/erpnext/erpnext/public/js/pos/pos.html +36,Amount Paid,Importo pagato
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +91,Project Manager,Project Manager
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +72,Dispatch,Spedizione
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Project Manager,Project Manager
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +72,Dispatch,Spedizione
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,Sconto massimo consentito per la voce: {0} {1}%
 DocType: Customer,Default Taxes and Charges,Tasse predefinite e oneri
 DocType: Account,Receivable,Ricevibile
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +268,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,Fila # {0}: Non ammessi a cambiare fornitore come già esiste ordine d&#39;acquisto
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +263,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,Fila # {0}: Non ammessi a cambiare fornitore come già esiste ordine d&#39;acquisto
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,Ruolo che è consentito di presentare le transazioni che superano i limiti di credito stabiliti.
 DocType: Sales Invoice,Supplier Reference,Fornitore di riferimento
 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.","Se selezionato, distinta per gli elementi sub-assemblaggio sarà considerato per ottenere materie prime. In caso contrario, tutti gli elementi sub-assemblaggio saranno trattati come materia prima."
@@ -3371,8 +3235,8 @@
 DocType: Hub Settings,Seller Description,Venditore Descrizione
 DocType: Employee Education,Qualification,Qualifica
 DocType: Item Price,Item Price,Articolo Prezzo
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +48,Soap & Detergent,Soap & Detergente
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +36,Motion Picture & Video,Motion Picture & Video
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +48,Soap & Detergent,Soap & Detergente
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +36,Motion Picture & Video,Motion Picture & Video
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Ordinato
 DocType: Warehouse,Warehouse Name,Magazzino Nome
 DocType: Naming Series,Select Transaction,Selezionare Transaction
@@ -3381,7 +3245,6 @@
 DocType: BOM,Rate Of Materials Based On,Tasso di materiali a base di
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,Analtyics supporto
 apps/erpnext/erpnext/accounts/doctype/accounts_settings/accounts_settings.py +27,Company is missing in warehouses {0},Azienda è presente nei magazzini {0}
-DocType: Stock UOM Replace Utility,Stock UOM Replace Utility,Strumento sostituzione UdM Giacenza
 DocType: POS Profile,Terms and Conditions,Termini e Condizioni
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,To Date should be within the Fiscal Year. Assuming To Date = {0},'A Data' deve essere entro l'anno fiscale. Assumendo A Data = {0}
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","Qui è possibile mantenere l'altezza, il peso, le allergie, le preoccupazioni mediche ecc"
@@ -3393,7 +3256,7 @@
 DocType: Sales Order Item,For Production,Per la produzione
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +103,Please enter sales order in the above table,Inserisci ordine di vendita nella tabella sopra
 DocType: Project Task,View Task,Vista Task
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +406,Your financial year begins on,Il tuo anno finanziario comincia
+apps/erpnext/erpnext/public/js/setup_wizard.js +154,Your financial year begins on,Il tuo anno finanziario comincia
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +46,Please enter Purchase Receipts,Inserisci acquisto Receipts
 DocType: Sales Invoice,Get Advances Received,ottenere anticipo Ricevuto
 DocType: Email Digest,Add/Remove Recipients,Aggiungere/Rimuovere Destinatario
@@ -3401,16 +3264,14 @@
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","Per impostare questo anno fiscale come predefinito , clicca su ' Imposta come predefinito'"
 apps/erpnext/erpnext/config/support.py +54,Setup incoming server for support email id. (e.g. support@example.com),Configurazione del server in arrivo per il supporto e-mail id . ( ad esempio support@example.com )
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,Carenza Quantità
-apps/erpnext/erpnext/stock/doctype/item/item.py +528,Item variant {0} exists with same attributes,Variante item {0} esiste con le stesse caratteristiche
+apps/erpnext/erpnext/stock/doctype/item/item.py +532,Item variant {0} exists with same attributes,Variante item {0} esiste con le stesse caratteristiche
 DocType: Salary Slip,Salary Slip,Stipendio slittamento
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +116,Burnishing,Brunitura
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +54,'To Date' is required,'Alla Data' è obbligatorio
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,'Alla Data' è obbligatorio
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","Generare documenti di trasporto per i pacchetti da consegnare. Utilizzato per comunicare il numero del pacchetto, contenuto della confezione e il suo peso."
 DocType: Sales Invoice Item,Sales Order Item,Sales Order Item
 DocType: Salary Slip,Payment Days,Giorni di Pagamento
 DocType: BOM,Manage cost of operations,Gestire costi delle operazioni
 DocType: Features Setup,Item Advanced,Articolo Avanzato
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +40,Hot rolling,Laminazione a caldo
 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.","Quando una qualsiasi delle operazioni controllate sono &quot;inviati&quot;, una e-mail a comparsa visualizzata automaticamente per inviare una e-mail agli associati &quot;Contatto&quot; in tale operazione, con la transazione come allegato. L&#39;utente può o non può inviare l&#39;e-mail."
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,Impostazioni globali
 DocType: Employee Education,Employee Education,Istruzione Dipendente
@@ -3423,25 +3284,23 @@
 DocType: Customer,Sales Team Details,Vendite team Dettagli
 DocType: Expense Claim,Total Claimed Amount,Totale importo richiesto
 apps/erpnext/erpnext/config/crm.py +22,Potential opportunities for selling.,Potenziali opportunità di vendita.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +48,Sick Leave,Sick Leave
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +174,Invalid {0},Non valido {0}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +48,Sick Leave,Sick Leave
 DocType: Email Digest,Email Digest,Email di Sintesi
 DocType: Delivery Note,Billing Address Name,Nome Indirizzo Fatturazione
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +22,Department Stores,Grandi magazzini
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,Grandi magazzini
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +40,System Balance,Sistema Balance
 DocType: Workflow,Is Active,È attivo
 apps/erpnext/erpnext/controllers/stock_controller.py +71,No accounting entries for the following warehouses,Nessuna scritture contabili per le seguenti magazzini
 apps/erpnext/erpnext/projects/doctype/project/project.js +22,Save the document first.,Salvare il documento prima.
 DocType: Account,Chargeable,Addebitabile
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +121,Linishing,Linishing
 DocType: Company,Change Abbreviation,Change Abbreviazione
 DocType: Workflow State,Primary,Primaria
 DocType: Expense Claim Detail,Expense Date,Data Spesa
 DocType: Item,Max Discount (%),Sconto Max (%)
 DocType: Communication,More Information,Maggiori informazioni
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +70,Last Order Amount,Last Order Amount
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +161,Blasting,Sabbiatura
 DocType: Company,Warn,Avvisa
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +111,Item valuation updated,Valutazione Articolo aggiornato
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Eventuali altre osservazioni, sforzo degno di nota che dovrebbe andare nelle registrazioni."
 DocType: BOM,Manufacturing User,Utente Produzione
 DocType: Purchase Order,Raw Materials Supplied,Materie prime fornite
@@ -3451,7 +3310,7 @@
 DocType: Appraisal,Appraisal Template,Valutazione Modello
 DocType: Communication,Email,Email
 DocType: Item Group,Item Classification,Classificazione Articolo
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +89,Business Development Manager,Development Business Manager
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Business Development Manager,Development Business Manager
 DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,Visita di manutenzione Scopo
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.js +15,Period,periodo
 ,General Ledger,Libro mastro generale
@@ -3461,9 +3320,7 @@
 ,Itemwise Recommended Reorder Level,Itemwise consigliata riordino Livello
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +264,Please select {0} first,Si prega di selezionare {0} prima
 DocType: Features Setup,To get Item Group in details table,Per ottenere Gruppo di elementi in dettaglio tabella
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +67,Redrawing,Ridisegnare
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +112,Batch {0} of Item {1} has expired.,Lotto {0} di {1} Voce è scaduto.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +120,Etching,Acquaforte
 DocType: Sales Invoice,Commission,Commissione
 DocType: Address Template,"<h4>Default Template</h4>
 <p>Uses <a href=""http://jinja.pocoo.org/docs/templates/"">Jinja Templating</a> and all the fields of Address (including Custom Fields if any) will be available</p>
@@ -3508,7 +3365,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +340,Operation Time must be greater than 0 for Operation {0},Tempo di funzionamento deve essere maggiore di 0 per Operation {0}
 DocType: Supplier,Address and Contacts,Indirizzo e contatti
 DocType: UOM Conversion Detail,UOM Conversion Detail,UOM Dettaglio di conversione
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +496,Keep it web friendly 900px (w) by 100px (h),Proporzioni adatte al Web: 900px (larg) per 100px (altez)
+apps/erpnext/erpnext/public/js/setup_wizard.js +242,Keep it web friendly 900px (w) by 100px (h),Proporzioni adatte al Web: 900px (larg) per 100px (altez)
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +329,Production Order cannot be raised against a Item Template,Ordine di produzione non può essere sollevata nei confronti di un modello di elemento
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +44,Charges are updated in Purchase Receipt against each item,Le tariffe sono aggiornati in acquisto ricevuta contro ogni voce
 DocType: Payment Tool,Get Outstanding Vouchers,Get eccezionali Buoni
@@ -3524,54 +3381,49 @@
 DocType: Item,Average time taken by the supplier to deliver,Tempo medio impiegato dal fornitore di consegnare
 DocType: Time Log,Hours,Ore
 DocType: Project,Expected Start Date,Data prevista di inizio
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +38,Rolling,Rotolamento
 DocType: ToDo,Priority,Priorità
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +41,Remove item if charges is not applicable to that item,Rimuovere articolo se le spese non è applicabile a tale elemento
 DocType: Dropbox Backup,Dropbox Access Allowed,Consentire accesso Dropbox
 DocType: Dropbox Backup,Weekly,Settimanale
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,Ad es. smsgateway.com/api/send_sms.cgi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +485,Receive,Ricevere
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +510,Receive,Ricevere
 DocType: Maintenance Visit,Fully Completed,Debitamente compilato
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% Completato
 DocType: Employee,Educational Qualification,Titolo di Studio
 DocType: Workstation,Operating Costs,Costi operativi
 DocType: Employee Leave Approver,Employee Leave Approver,Approvatore Congedo Dipendente
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,{0} has been successfully added to our Newsletter list.,{0} è stato aggiunto alla nostra lista Newsletter.
-apps/erpnext/erpnext/stock/doctype/item/item.py +383,Row {0}: An Reorder entry already exists for this warehouse {1},Riga {0}: Una voce di riordino esiste già per questo magazzino {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +387,Row {0}: An Reorder entry already exists for this warehouse {1},Riga {0}: Una voce di riordino esiste già per questo magazzino {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +67,"Cannot declare as lost, because Quotation has been made.","Non è possibile dichiarare come perduto, perché è stato fatto il Preventivo."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +133,Electron beam machining,Lavorazione a fascio di elettroni
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Acquisto Maestro Direttore
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +424,Production Order {0} must be submitted,Ordine di produzione {0} deve essere presentata
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +150,Please select Start Date and End Date for Item {0},Scegliere una data di inizio e di fine per la voce {0}
 apps/erpnext/erpnext/config/stock.py +141,Main Reports,Rapporti principali
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +102,Stock Ledger entries balances updated,Saldi aggiornati per voci di Inventario
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,'A Data' deve essere successiva a 'Da Data'
 DocType: Purchase Receipt Item,Prevdoc DocType,Prevdoc DocType
-apps/erpnext/erpnext/stock/doctype/item/item.js +176,Add / Edit Prices,Aggiungi / Modifica prezzi
+apps/erpnext/erpnext/stock/doctype/item/item.js +178,Add / Edit Prices,Aggiungi / Modifica prezzi
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +53,Chart of Cost Centers,Grafico Centro di Costo
 ,Requested Items To Be Ordered,Elementi richiesti da ordinare
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +298,My Orders,I Miei Ordini
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +293,My Orders,I Miei Ordini
 DocType: Price List,Price List Name,Prezzo di listino Nome
 DocType: Time Log,For Manufacturing,Per Manufacturing
-apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +70,Totals,Totali
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +174,Totals,Totali
 DocType: BOM,Manufacturing,Produzione
 ,Ordered Items To Be Delivered,Articoli ordinati da consegnare
 DocType: Account,Income,Proventi
 ,Setup Wizard,Setup Wizard
 DocType: Industry Type,Industry Type,Tipo Industria
 apps/erpnext/erpnext/templates/includes/cart.js +137,Something went wrong!,Qualcosa è andato storto!
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +68,Warning: Leave application contains following block dates,Attenzione: Lascia applicazione contiene seguenti date di blocco
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +251,Sales Invoice {0} has already been submitted,{0} è già stato presentato fattura di vendita
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +100,Warning: Leave application contains following block dates,Attenzione: Lascia applicazione contiene seguenti date di blocco
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +256,Sales Invoice {0} has already been submitted,{0} è già stato presentato fattura di vendita
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,Data Completamento
 DocType: Purchase Invoice Item,Amount (Company Currency),Importo (Valuta Azienda)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +10,Die casting,Pressofusione
 DocType: Email Alert,Reference Date,Data di riferimento
 apps/erpnext/erpnext/config/hr.py +105,Organization unit (department) master.,Unità organizzativa ( dipartimento) master.
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +25,Please enter valid mobile nos,Inserisci nos mobili validi
 DocType: Budget Detail,Budget Detail,Dettaglio Budget
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +75,Please enter message before sending,Inserisci il messaggio prima di inviarlo
 DocType: Async Task,Status,Stato
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +65,Stock UOM updated for Item {0},UdM Giacenza aggiornata per l'Articolo {0}
 DocType: Company History,Year,Anno
 apps/erpnext/erpnext/config/accounts.py +127,Point-of-Sale Profile,Point-of-Sale Profilo
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +68,Please Update SMS Settings,Si prega di aggiornare le impostazioni SMS
@@ -3585,12 +3437,12 @@
 ,Serial No Service Contract Expiry,Serial No Contratto di Servizio di scadenza
 DocType: Item,Unit of Measure Conversion,Unità di Conversione di misura
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +86,Employee can not be changed,Il dipendente non può essere modificato
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +259,You cannot credit and debit same account at the same time,"Non si può di credito e debito stesso conto , allo stesso tempo"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,You cannot credit and debit same account at the same time,"Non si può di credito e debito stesso conto , allo stesso tempo"
 DocType: Naming Series,Help HTML,Aiuto HTML
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},Weightage totale assegnato dovrebbe essere al 100 % . E ' {0}
 apps/erpnext/erpnext/controllers/status_updater.py +140,Allowance for over-{0} crossed for Item {1},Indennità per over-{0} incrociate per la voce {1}
 DocType: Address,Name of person or organization that this address belongs to.,Nome della persona o organizzazione che questo indirizzo appartiene.
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +587,Your Suppliers,I vostri fornitori
+apps/erpnext/erpnext/public/js/setup_wizard.js +325,Your Suppliers,I vostri fornitori
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,Impossibile impostare come persa come è fatto Sales Order .
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +65,Another Salary Structure {0} is active for employee {1}. Please make its status 'Inactive' to proceed.,Un'altra struttura Stipendio {0} è attivo per dipendente {1}. Si prega di fare il suo status di 'Inattivo' per procedere.
 DocType: Purchase Invoice,Contact,Contatto
@@ -3599,37 +3451,35 @@
 DocType: Item,Has Serial No,Ha Serial No
 DocType: Employee,Date of Issue,Data Pubblicazione
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +16,{0}: From {0} for {1},{0}: Da {0} per {1}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +154,Row #{0}: Set Supplier for item {1},Fila # {0}: Impostare fornitore per voce {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +149,Row #{0}: Set Supplier for item {1},Fila # {0}: Impostare fornitore per voce {1}
 DocType: Issue,Content Type,Tipo Contenuto
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +17,Computer,computer
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,computer
 DocType: Item,List this Item in multiple groups on the website.,Elenco questo articolo a più gruppi sul sito.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +283,Please check Multi Currency option to allow accounts with other currency,Si prega di verificare l&#39;opzione multi valuta per consentire agli account con altra valuta
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +285,Please check Multi Currency option to allow accounts with other currency,Si prega di verificare l&#39;opzione multi valuta per consentire agli account con altra valuta
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +62,Item: {0} does not exist in the system,Voce: {0} non esiste nel sistema
 apps/erpnext/erpnext/accounts/doctype/account/account.py +81,You are not authorized to set Frozen value,Non sei autorizzato a impostare il valore Congelato
 DocType: Payment Reconciliation,Get Unreconciled Entries,Get non riconciliati Entries
 DocType: Cost Center,Budgets,I bilanci
 apps/frappe/frappe/core/page/modules_setup/modules_setup.py +11,Updated,Aggiornato
 DocType: Employee,Emergency Contact Details,Dettagli Contatto Emergenza
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +396,What does it do?,Che cosa fa ?
+apps/erpnext/erpnext/public/js/setup_wizard.js +144,What does it do?,Che cosa fa ?
 DocType: Delivery Note,To Warehouse,A Magazzino
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +45,Account {0} has been entered more than once for fiscal year {1},Il Conto {0} è stato inserito più di una volta per l'anno fiscale {1}
 ,Average Commission Rate,Tasso medio di commissione
-apps/erpnext/erpnext/stock/doctype/item/item.py +313,'Has Serial No' can not be 'Yes' for non-stock item,'Ha un numero di serie' non può essere 'Sì' per gli articoli non in scorta
+apps/erpnext/erpnext/stock/doctype/item/item.py +317,'Has Serial No' can not be 'Yes' for non-stock item,'Ha un numero di serie' non può essere 'Sì' per gli articoli non in scorta
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Attendance can not be marked for future dates,La Presenza non può essere inserita nel futuro
 DocType: Pricing Rule,Pricing Rule Help,Regola Prezzi Aiuto
 DocType: Purchase Taxes and Charges,Account Head,Conto Capo
 apps/erpnext/erpnext/config/stock.py +79,Update additional costs to calculate landed cost of items,Aggiornare costi aggiuntivi per calcolare il costo sbarcato di articoli
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +111,Electrical,elettrico
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +111,Electrical,elettrico
 DocType: Stock Entry,Total Value Difference (Out - In),Totale Valore Differenza (Out - In)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +302,Row {0}: Exchange Rate is mandatory,Riga {0}: Tasso di cambio è obbligatorio
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +304,Row {0}: Exchange Rate is mandatory,Riga {0}: Tasso di cambio è obbligatorio
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},ID utente non è impostato per Employee {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +72,Peening,Pallinatura
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,From Warranty Claim,Da Richiesta di Garanzia
 DocType: Stock Entry,Default Source Warehouse,Magazzino Origine Predefinito
 DocType: Item,Customer Code,Codice Cliente
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +212,Birthday Reminder for {0},Promemoria Compleanno per {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +163,Lapping,Sciabordio
-apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.js +8,Days Since Last Order,Giorni dall'ultimo ordine
+apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +72,Days Since Last Order,Giorni dall'ultimo ordine
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +299,Debit To account must be a Balance Sheet account,Debito Per account deve essere un account di Stato Patrimoniale
 DocType: Buying Settings,Naming Series,Naming Series
 DocType: Leave Block List,Leave Block List Name,Lascia Block List Nome
@@ -3643,7 +3493,7 @@
 DocType: Notification Control,Sales Invoice Message,Fattura Messaggio
 DocType: Authorization Rule,Based On,Basato su
 DocType: Sales Order Item,Ordered Qty,Quantità ordinato
-apps/erpnext/erpnext/stock/doctype/item/item.py +539,Item {0} is disabled,Voce {0} è disattivato
+apps/erpnext/erpnext/stock/doctype/item/item.py +543,Item {0} is disabled,Voce {0} è disattivato
 DocType: Stock Settings,Stock Frozen Upto,Giacenza Bloccate Fino
 apps/erpnext/erpnext/controllers/recurring_document.py +166,Period From and Period To dates mandatory for recurring {0},Periodo Dal periodo e per date obbligatorie per ricorrenti {0}
 apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,Attività / attività del progetto.
@@ -3653,7 +3503,6 @@
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,Sconto deve essere inferiore a 100
 DocType: ToDo,Low,Basso
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Scrivi Off Importo (Società valuta)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +71,Spinning,Filatura
 DocType: Landed Cost Voucher,Landed Cost Voucher,Landed Voucher Cost
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +55,Please set {0},Impostare {0}
 DocType: Purchase Invoice,Repeat on Day of Month,Ripetere il Giorno del mese
@@ -3675,7 +3524,6 @@
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +37,Campaign Name is required,Nome Campagna obbligatorio
 DocType: Maintenance Visit,Maintenance Date,Manutenzione Data
 DocType: Purchase Receipt Item,Rejected Serial No,Rifiutato Serial No
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +51,Deep drawing,Imbutitura
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +40,New Newsletter,Nuova Newsletter
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +157,Start date should be less than end date for Item {0},Data di inizio dovrebbe essere inferiore a quella di fine per la voce {0}
 apps/erpnext/erpnext/stock/doctype/item/item.js +17,Show Balance,Mostra Balance
@@ -3685,7 +3533,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +119,BOM and Manufacturing Quantity are required,BOM e produzione quantità sono necessari
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Gamma Ageing 2
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +450,Amount,Importo
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +147,Riveting,Avvincente
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,DiBa Sostituire
 ,Sales Analytics,Analisi dei dati di vendita
 DocType: Manufacturing Settings,Manufacturing Settings,Impostazioni di Produzione
@@ -3697,20 +3544,19 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +207,New Account Name,Nuovo Nome Account
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,Costo Fornitura Materie Prime
 DocType: Selling Settings,Settings for Selling Module,Impostazioni per la vendita di moduli
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +73,Customer Service,Servizio clienti
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Customer Service,Servizio clienti
 DocType: Item,Thumbnail,Thumbnail
 DocType: Item Customer Detail,Item Customer Detail,Dettaglio articolo cliente
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +147,Confirm Your Email,Conferma La Tua Email
 apps/erpnext/erpnext/config/hr.py +53,Offer candidate a Job.,Offerta candidato un lavoro.
 DocType: Notification Control,Prompt for Email on Submission of,Richiedi Email su presentazione di
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +81,Total allocated leaves are more than days in the period,Totale foglie assegnati sono più di giorni nel periodo
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +70,Item {0} must be a stock Item,L'Articolo {0} deve essere in Giacenza
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,Work In Progress Magazzino di default
 apps/erpnext/erpnext/config/accounts.py +107,Default settings for accounting transactions.,Impostazioni predefinite per le operazioni contabili.
 apps/frappe/frappe/model/naming.py +40,{0} is required,{0} è richiesto
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +21,Vacuum molding,Stampaggio sotto vuoto
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,Data prevista non può essere precedente Material Data richiesta
 DocType: Contact Us Settings,City,Città
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +132,Ultrasonic machining,Lavorazione ad ultrasuoni
 apps/frappe/frappe/templates/base.html +137,Error: Not a valid id?,Errore: Non è un documento di identità valido?
 apps/erpnext/erpnext/stock/get_item_details.py +125,Item {0} must be a Sales Item,L'articolo {0} deve essere un'Articolo in Vendita
 DocType: Naming Series,Update Series Number,Aggiornamento Numero di Serie
@@ -3718,7 +3564,7 @@
 DocType: Sales Order,Printing Details,Dettagli stampa
 DocType: Task,Closing Date,Data Chiusura
 DocType: Sales Order Item,Produced Quantity,Prodotto Quantità
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +84,Engineer,Ingegnere
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Engineer,Ingegnere
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,Cerca Sub Assemblies
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +379,Item Code required at Row No {0},Codice Articolo richiesto alla Riga N. {0}
 DocType: Sales Partner,Partner Type,Tipo di partner
@@ -3726,7 +3572,7 @@
 DocType: Authorization Rule,Customerwise Discount,Sconto Cliente saggio
 DocType: Purchase Invoice,Against Expense Account,Per Spesa Conto
 DocType: Production Order,Production Order,Ordine di produzione
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +258,Installation Note {0} has already been submitted,Nota Installazione {0} già inserita
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +263,Installation Note {0} has already been submitted,Nota Installazione {0} già inserita
 DocType: Quotation Item,Against Docname,Per Nome Doc
 DocType: SMS Center,All Employee (Active),Tutti Dipendenti (Attivi)
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,Guarda ora
@@ -3735,19 +3581,19 @@
 DocType: Item,Re-Order Level,Livello Ri-ordino
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,Inserisci articoli e q.tà programmate per i quali si desidera raccogliere gli ordini di produzione o scaricare materie prime per l'analisi.
 apps/frappe/frappe/public/js/frappe/views/ganttview.js +45,Gantt Chart,Diagramma di Gantt
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +57,Part-time,A tempo parziale
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,Part-time,A tempo parziale
 DocType: Employee,Applicable Holiday List,Lista Vacanze Applicabile
 DocType: Employee,Cheque,Assegno
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,serie Aggiornato
 apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Report Type is mandatory,Tipo di rapporto è obbligatoria
 DocType: Item,Serial Number Series,Serial Number Series
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},Magazzino è obbligatorio per l'Articolo in Giacenza {0} alla Riga {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +45,Retail & Wholesale,Retail & Wholesale
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,Retail & Wholesale
 DocType: Issue,First Responded On,Ha risposto prima su
 DocType: Website Item Group,Cross Listing of Item in multiple groups,Croce Listing dell'oggetto in più gruppi
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +351,The First User: You,Il Primo Utente : Tu
+apps/erpnext/erpnext/public/js/setup_wizard.js +101,The First User: You,Il Primo Utente : Tu
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +48,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},Anno fiscale Data di inizio e Data Fine dell'anno fiscale sono già impostati nel Fiscal Year {0}
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +172,Successfully Reconciled,Riconciliati con successo
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +119,Successfully Reconciled,Riconciliati con successo
 DocType: Production Order,Planned End Date,Data di fine pianificata
 apps/erpnext/erpnext/config/stock.py +43,Where items are stored.,Dove gli elementi vengono memorizzati.
 DocType: Tax Rule,Validity,Validità
@@ -3767,39 +3613,36 @@
 DocType: DocPerm,Level,Livello
 DocType: Purchase Taxes and Charges,On Net Total,Sul totale netto
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +160,Target warehouse in row {0} must be same as Production Order,Magazzino Target in riga {0} deve essere uguale ordine di produzione
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +59,No permission to use Payment Tool,Non autorizzato a utilizzare lo Strumento di Pagamento
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +97,No permission to use Payment Tool,Non autorizzato a utilizzare lo Strumento di Pagamento
 apps/erpnext/erpnext/controllers/recurring_document.py +192,'Notification Email Addresses' not specified for recurring %s,'Indirizzi email di notifica' non specificati per %s ricorrenti
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +86,Milling,Fresatura
 apps/erpnext/erpnext/accounts/doctype/account/account.py +99,Currency can not be changed after making entries using some other currency,Valuta non può essere modificata dopo aver fatto le voci utilizzando qualche altra valuta
 DocType: Company,Round Off Account,Arrotondamento Account
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +60,Nibbling,Brucatura
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,Spese Amministrative
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +18,Consulting,Consulting
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +18,Consulting,Consulting
 DocType: Customer Group,Parent Customer Group,Parent Gruppo clienti
 apps/erpnext/erpnext/public/js/pos/pos.js +429,Change,Cambiamento
 DocType: Purchase Invoice,Contact Email,Email Contatto
 DocType: Appraisal Goal,Score Earned,Punteggio Earned
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +393,"e.g. ""My Company LLC""","ad esempio ""My Company LLC """
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +173,Notice Period,Periodo Di Preavviso
+apps/erpnext/erpnext/public/js/setup_wizard.js +141,"e.g. ""My Company LLC""","ad esempio ""My Company LLC """
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +173,Notice Period,Periodo Di Preavviso
 DocType: Bank Reconciliation Detail,Voucher ID,ID Voucher
 apps/erpnext/erpnext/setup/doctype/territory/territory.js +14,This is a root territory and cannot be edited.,Questo è un territorio root e non può essere modificato .
 DocType: Packing Slip,Gross Weight UOM,Peso Lordo UOM
 DocType: Email Digest,Receivables / Payables,Crediti / Debiti
 DocType: Delivery Note Item,Against Sales Invoice,Per Fattura Vendita
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +63,Stamping,Stampigliatura
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +457,Credit Account,Conto di credito
 DocType: Landed Cost Item,Landed Cost Item,Landed Cost articolo
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +56,Show zero values,Mostra valori zero
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,Quantità di prodotto ottenuto dopo la produzione / reimballaggio da determinati quantitativi di materie prime
 DocType: Payment Reconciliation,Receivable / Payable Account,Conto Crediti / Debiti
 DocType: Delivery Note Item,Against Sales Order Item,Contro Sales Order Item
-apps/erpnext/erpnext/stock/doctype/item/item.py +521,Please specify Attribute Value for attribute {0},Si prega di specificare Attributo Valore per l&#39;attributo {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +525,Please specify Attribute Value for attribute {0},Si prega di specificare Attributo Valore per l&#39;attributo {0}
 DocType: Item,Default Warehouse,Magazzino Predefinito
 DocType: Task,Actual End Date (via Time Logs),Data di fine effettiva (via Time Diari)
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +37,Budget cannot be assigned against Group Account {0},Bilancio non può essere assegnato contro account gruppo {0}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +23,Please enter parent cost center,Inserisci il centro di costo genitore
 DocType: Delivery Note,Print Without Amount,Stampare senza Importo
-apps/erpnext/erpnext/controllers/buying_controller.py +69,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,"Categoria Tasse non può essere 'valutazione' o ' Totale e Valutazione', come tutti gli articoli non in Giacenza"
+apps/erpnext/erpnext/controllers/buying_controller.py +60,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,"Categoria Tasse non può essere 'valutazione' o ' Totale e Valutazione', come tutti gli articoli non in Giacenza"
 DocType: User,Last Name,Cognome
 DocType: Web Page,Left,Sinistra
 DocType: Event,All Day,Intera giornata
@@ -3807,7 +3650,7 @@
 DocType: Appraisal,Total Score (Out of 5),Punteggio totale (i 5)
 DocType: Contact Us Settings,State,Stato
 DocType: Batch,Batch,Lotto
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +51,Balance,Saldo
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +28,Balance,Saldo
 DocType: Project,Total Expense Claim (via Expense Claims),Total Expense Claim (via rimborsi spese)
 DocType: User,Gender,Genere
 DocType: Journal Entry,Debit Note,Nota Debito
@@ -3837,8 +3680,7 @@
 DocType: Purchase Order,Get Last Purchase Rate,Ottieni ultima quotazione acquisto
 DocType: Time Log,Billing Rate based on Activity Type (per hour),Fatturazione tariffa si basa su Tipo Attività (per ora)
 DocType: Company,Company Info,Info Azienda
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +76,Seaming,Seaming
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +197,"Company Email ID not found, hence mail not sent","Azienda Email ID non trovato , quindi posta non inviato"
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +206,"Company Email ID not found, hence mail not sent","Azienda Email ID non trovato , quindi posta non inviato"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Applicazione dei fondi ( Assets )
 DocType: Production Planning Tool,Filter based on item,Filtro basato sul articolo
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +451,Debit Account,Conto di addebito
@@ -3850,17 +3692,16 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +95,{0} {1} has been modified. Please refresh.,{0} {1} è stato modificato. Aggiornare prego.
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,Impedire agli utenti di effettuare Lascia le applicazioni in giorni successivi.
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +591,From Opportunity,da Opportunity
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +46,Blanking,Soppressione
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +166,Employee Benefits,Benefici per i dipendenti
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,Employee Benefits,Benefici per i dipendenti
 DocType: Sales Invoice,Is POS,È POS
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +240,Packed quantity must equal quantity for Item {0} in row {1},Pranzo quantità deve essere uguale quantità per articolo {0} in riga {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +245,Packed quantity must equal quantity for Item {0} in row {1},Pranzo quantità deve essere uguale quantità per articolo {0} in riga {1}
 DocType: Production Order,Manufactured Qty,Quantità Prodotto
 DocType: Purchase Receipt Item,Accepted Quantity,Quantità accettata
 apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} non esiste
 apps/erpnext/erpnext/config/accounts.py +18,Bills raised to Customers.,Fatture sollevate dai Clienti.
 DocType: DocField,Default,Predefinito
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Progetto Id
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +466,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Fila No {0}: Importo non può essere maggiore di attesa Importo contro Rimborso Spese {1}. In attesa importo è {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +468,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Fila No {0}: Importo non può essere maggiore di attesa Importo contro Rimborso Spese {1}. In attesa importo è {2}
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +40,{0} subscribers added,{0} abbonati aggiunti
 DocType: Maintenance Schedule,Schedule,Pianificare
 DocType: Cost Center,"Define Budget for this Cost Center. To set budget action, see ""Company List""","Definire bilancio per questo centro di costo. Per impostare l&#39;azione di bilancio, vedere &quot;Elenco Società&quot;"
@@ -3871,7 +3712,7 @@
 apps/erpnext/erpnext/public/js/pos/pos.js +91,Price List not found or disabled,Listino Prezzi non trovato o disattivato
 DocType: Expense Claim,Approved,Approvato
 DocType: Pricing Rule,Price,prezzo
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +79,Employee relieved on {0} must be set as 'Left',Dipendente esonerato da {0} deve essere impostato come 'Congedato'
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +88,Employee relieved on {0} must be set as 'Left',Dipendente esonerato da {0} deve essere impostato come 'Congedato'
 DocType: Item,"Selecting ""Yes"" will give a unique identity to each entity of this item which can be viewed in the Serial No master.",Selezionando &quot;Sì&quot; darà una identità unica di ciascun soggetto di questa voce che può essere visualizzato nel Serial Nessun maestro.
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +39,Appraisal {0} created for Employee {1} in the given date range,Valutazione {0} creato per Employee {1} nel determinato intervallo di date
 DocType: Employee,Education,Educazione
@@ -3882,7 +3723,7 @@
 apps/frappe/frappe/desk/moduleview.py +67,Standard Reports,Rapporti standard
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,Diario scritture contabili.
 DocType: Delivery Note Item,Available Qty at From Warehouse,Disponibile Quantità a partire Warehouse
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +209,Please select Employee Record first.,Si prega di selezionare i dipendenti Record prima.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +224,Please select Employee Record first.,Si prega di selezionare i dipendenti Record prima.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Riga {0}: partito / Account non corrisponde con {1} / {2} {3} {4}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +35,To create a Tax Account,Per creare un Account Tax
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +233,Please enter Expense Account,Inserisci il Conto uscite
@@ -3895,46 +3736,43 @@
 DocType: Sales Order,Track this Sales Order against any Project,Traccia questo ordine di vendita nei confronti di qualsiasi progetto
 DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,Tirare ordini di vendita (in attesa di consegnare) sulla base dei criteri di cui sopra
 DocType: DocShare,Document Type,Tipo di documento
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +565,From Supplier Quotation,Da Preventivo del Fornitore
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +588,From Supplier Quotation,Da Preventivo del Fornitore
 DocType: Deduction Type,Deduction Type,Tipo Deduzione
 DocType: Attendance,Half Day,Mezza Giornata
 DocType: Pricing Rule,Min Qty,Qtà Min
 DocType: Features Setup,"To track items in sales and purchase documents with batch nos. ""Preferred Industry: Chemicals""",Per tenere traccia articoli in documenti di vendita e di acquisto con nn batch. &quot;Settore preferito: Chemicals&quot;
 DocType: GL Entry,Transaction Date,Transaction Data
 DocType: Production Plan Item,Planned Qty,Qtà Planned
-apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +91,Total Tax,Totale IVA
+apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +93,Total Tax,Totale IVA
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +178,For Quantity (Manufactured Qty) is mandatory,Per quantità (Quantità Prodotto) è obbligatorio
 DocType: Stock Entry,Default Target Warehouse,Magazzino Destinazione Predefinito
 DocType: Purchase Invoice,Net Total (Company Currency),Totale Netto (Valuta Azienda)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +79,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Riga {0}: Partito Tipo e partito si applica solo nei confronti Crediti / Debiti conto
 DocType: Notification Control,Purchase Receipt Message,RICEVUTA Messaggio
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +95,Total allocated leaves are more than period,Totale foglie assegnati sono più di periodo
 DocType: Production Order,Actual Start Date,Data Inizio Effettivo
 DocType: Sales Order,% of materials delivered against this Sales Order,% dei materiali consegnati su questo Ordine di Vendita
 apps/erpnext/erpnext/config/stock.py +23,Record item movement.,Registrare il movimento dell&#39;oggetto.
 DocType: Newsletter List Subscriber,Newsletter List Subscriber,Newsletter Elenco utenti
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +164,Morticing,Morticing
 DocType: Email Account,Service,servizio
 DocType: Hub Settings,Hub Settings,Impostazioni Hub
 DocType: Project,Gross Margin %,Margine Lordo %
 DocType: BOM,With Operations,Con operazioni
 apps/erpnext/erpnext/accounts/party.py +232,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Scritture contabili sono già stati fatti in valuta {0} per azienda {1}. Si prega di selezionare un account di credito o da pagare con moneta {0}.
 ,Monthly Salary Register,Registro Stipendio Mensile
-apps/frappe/frappe/website/template.py +140,Next,Successivo
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard_page.html +17,Next,Successivo
 DocType: Warranty Claim,If different than customer address,Se diverso da indirizzo del cliente
 DocType: BOM Operation,BOM Operation,DiBa Operazione
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +118,Electropolishing,Elettrolucidatura
 DocType: Purchase Taxes and Charges,On Previous Row Amount,Sul Fila Indietro Importo
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +24,Please enter Payment Amount in atleast one row,Inserisci il pagamento Importo in almeno uno di fila
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +33,Please enter Payment Amount in atleast one row,Inserisci il pagamento Importo in almeno uno di fila
 DocType: POS Profile,POS Profile,POS Profilo
 apps/erpnext/erpnext/config/accounts.py +153,"Seasonality for setting budgets, targets etc.","Stagionalità per impostare i budget, obiettivi ecc"
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +238,Row {0}: Payment Amount cannot be greater than Outstanding Amount,Riga {0}: Importo pagamento non può essere maggiore di consistenze
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +46,Total Unpaid,Totale non pagato
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +21,Time Log is not billable,Il tempo log non è fatturabile
 apps/erpnext/erpnext/stock/get_item_details.py +128,"Item {0} is a template, please select one of its variants","L'articolo {0} è un modello, si prega di selezionare una delle sue varianti"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +528,Purchaser,Acquirente
+apps/erpnext/erpnext/public/js/setup_wizard.js +272,Purchaser,Acquirente
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +81,Net pay cannot be negative,Retribuzione netta non può essere negativa
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +71,Please enter the Against Vouchers manually,Si prega di inserire manualmente il Against Buoni
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +107,Please enter the Against Vouchers manually,Si prega di inserire manualmente il Against Buoni
 DocType: SMS Settings,Static Parameters,Parametri statici
 DocType: Purchase Order,Advance Paid,Anticipo versato
 DocType: Item,Item Tax,Tax articolo
@@ -3943,14 +3781,12 @@
 apps/erpnext/erpnext/config/crm.py +48,Send mass SMS to your contacts,Invia SMS di massa ai tuoi contatti
 DocType: Purchase Taxes and Charges,Consider Tax or Charge for,Cnsidera Tasse o Cambio per
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,Actual Qty è obbligatoria
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +42,Cross-rolling,Cross-rolling
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +132,Credit Card,carta di credito
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +132,Credit Card,carta di credito
 DocType: BOM,Item to be manufactured or repacked,Voce da fabbricati o nuovamente imballati
 apps/erpnext/erpnext/config/stock.py +95,Default settings for stock transactions.,Impostazioni predefinite per le transazioni di magazzino .
 DocType: Purchase Invoice,Next Date,Successiva Data
 DocType: Employee Education,Major/Optional Subjects,Principali / Opzionale Soggetti
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +49,Please enter Taxes and Charges,Inserisci Tasse e spese
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +85,Machining,Lavorazione a macchina
 DocType: Sales Invoice Item,Drop Ship,Drop Ship
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","Qui è possibile mantenere i dettagli della famiglia come il nome e l'occupazione del genitore, coniuge e figli"
 DocType: Hub Settings,Seller Name,Venditore Nome
@@ -3960,7 +3796,7 @@
 DocType: Stock Entry,Repack,Repack
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +6,You must Save the form before proceeding,È necessario Salvare il modulo prima di procedere
 DocType: Item Attribute,Numeric Values,Valori numerici
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +500,Attach Logo,Allega Logo
+apps/erpnext/erpnext/public/js/setup_wizard.js +246,Attach Logo,Allega Logo
 DocType: Customer,Commission Rate,Tasso Commissione
 apps/erpnext/erpnext/stock/doctype/item/item.js +38,Make Variant,Fai Variant
 apps/erpnext/erpnext/config/hr.py +145,Block leave applications by department.,Blocco domande uscita da ufficio.
@@ -3975,19 +3811,19 @@
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +105,Please select a csv file,Seleziona un file csv
 DocType: Dropbox Backup,Send Backups to Dropbox,Invia backup di Dropbox
 DocType: Purchase Order,To Receive and Bill,Per ricevere e Bill
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +94,Designer,designer
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Designer,designer
 apps/erpnext/erpnext/config/selling.py +121,Terms and Conditions Template,Termini e condizioni Template
 DocType: Serial No,Delivery Details,Dettagli Consegna
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +383,Cost Center is required in row {0} in Taxes table for type {1},Centro di costo è richiesto in riga {0} nella tabella Tasse per il tipo {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +386,Cost Center is required in row {0} in Taxes table for type {1},Centro di costo è richiesto in riga {0} nella tabella Tasse per il tipo {1}
 DocType: Item,Automatically create Material Request if quantity falls below this level,Creazione automatica di materiale richiesta se la quantità scende al di sotto di questo livello
 ,Item-wise Purchase Register,Articolo-saggio Acquisto Registrati
 DocType: Batch,Expiry Date,Data Scadenza
-apps/erpnext/erpnext/stock/doctype/item/item.py +375,"To set reorder level, item must be a Purchase Item or Manufacturing Item","Per impostare il livello di riordino, elemento deve essere un acquisto dell&#39;oggetto o Produzione Voce"
+apps/erpnext/erpnext/stock/doctype/item/item.py +379,"To set reorder level, item must be a Purchase Item or Manufacturing Item","Per impostare il livello di riordino, elemento deve essere un acquisto dell&#39;oggetto o Produzione Voce"
 ,Supplier Addresses and Contacts,Indirizzi e contatti Fornitore
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,Si prega di selezionare Categoria prima
 apps/erpnext/erpnext/config/projects.py +18,Project master.,Progetto Master.
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,Non visualizzare nessun simbolo tipo € dopo le Valute.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +330, (Half Day),(Mezza giornata)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +374, (Half Day),(Mezza giornata)
 DocType: Supplier,Credit Days,Giorni Credito
 DocType: Leave Type,Is Carry Forward,È Portare Avanti
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +478,Get Items from BOM,Recupera elementi da Distinta Base
@@ -3995,7 +3831,7 @@
 apps/erpnext/erpnext/config/manufacturing.py +120,Bill of Materials,Distinta materiali
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +77,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Riga {0}: Partito Tipo e Partito è necessario per Crediti / Debiti conto {1}
 DocType: Dropbox Backup,Send Notifications To,Inviare notifiche ai
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html +26,Ref Date,Data Rif
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +54,Ref Date,Data Rif
 DocType: Employee,Reason for Leaving,Motivo per Lasciare
 DocType: Expense Claim Detail,Sanctioned Amount,Importo sanzionato
 DocType: GL Entry,Is Opening,Sta aprendo
@@ -4003,4 +3839,3 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +188,Account {0} does not exist,Il Conto {0} non esiste
 DocType: Account,Cash,Contante
 DocType: Employee,Short biography for website and other publications.,Breve biografia per il sito web e altre pubblicazioni.
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +31,Please create Salary Structure for employee {0},Si prega di creare struttura salariale per dipendente {0}
diff --git a/erpnext/translations/ja.csv b/erpnext/translations/ja.csv
index 99a640e..e4424f1 100644
--- a/erpnext/translations/ja.csv
+++ b/erpnext/translations/ja.csv
@@ -1,13 +1,12 @@
 DocType: Employee,Salary Mode,給与モード
 DocType: Cost Center,"Select Monthly Distribution, if you want to track based on seasonality.",シーズンを基準に追跡する場合、「月次配分」を選択してください
 DocType: Employee,Divorced,離婚
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +86,Warning: Same item has been entered multiple times.,注意：同じ項目が複数回入力されています
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +80,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,取引内でのアイテムの複数回追加を許可
 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/page/setup_wizard/fixtures/industry_type.py +19,Consumer Products,消費者製品
+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,先に当事者タイプを選択してください
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +90,Annealing,焼きなまし
 DocType: Item,Customer Items,顧客アイテム
 apps/erpnext/erpnext/accounts/doctype/account/account.py +45,Account {0}: Parent account {1} can not be a ledger,アカウント{0}：親勘定{1}は元帳にすることができません
 DocType: Item,Publish Item to hub.erpnext.com,hub.erpnext.comにアイテムを発行
@@ -20,15 +19,14 @@
 DocType: About Us Settings,Website,ウェブサイト
 DocType: POS Profile,Applicable for User,ユーザーに適用
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +169,"Stopped Production Order cannot be cancelled, Unstop it first to cancel",停止中の製造指示をキャンセルすることはできません。キャンセルする前に停止解除してください
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +23,Compaction plus sintering,圧縮焼結
 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.,※取引内で計算されます。
 DocType: Purchase Order,Customer Contact,顧客の連絡先
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +549,From Material Request,資材要求元
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +572,From Material Request,資材要求元
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0}ツリー
 DocType: Job Applicant,Job Applicant,求職者
 apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,これ以上、結果はありません。
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +78,Legal,法務
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +34,Legal,法務
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +114,Actual type tax cannot be included in Item rate in row {0},「実際」タイプの税は行{0}内のアイテム額に含めることはできません
 DocType: C-Form,Customer,顧客
 DocType: Purchase Receipt Item,Required By,要求元
@@ -43,7 +41,6 @@
 DocType: Manufacturing Settings,Default 10 mins,デフォルト 10分
 DocType: Leave Type,Leave Type Name,休暇タイプ名
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +148,Series Updated Successfully,シリーズを正常に更新しました
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +150,Stitching,スティッチング
 DocType: Pricing Rule,Apply On,適用
 DocType: Item Price,Multiple Item prices.,複数のアイテム価格
 ,Purchase Order Items To Be Received,受領予定発注アイテム
@@ -51,8 +48,8 @@
 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 +104,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 +189,New Leave Application,新しい休暇申請
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +134,Bank Draft,銀行為替手形
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +204,New Leave Application,新しい休暇申請
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +134,Bank Draft,銀行為替手形
 DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,1 . 顧客ごとのアイテムコードを維持し、コードで検索を可能にするためには、このオプションを使用します。
 DocType: Mode of Payment Account,Mode of Payment Account,支払口座のモード
 apps/erpnext/erpnext/stock/doctype/item/item.js +34,Show Variants,バリエーションを表示
@@ -64,25 +61,23 @@
 DocType: Production Plan Item,Production Plan Item,生産計画アイテム
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +141,User {0} is already assigned to Employee {1},ユーザー{0}はすでに従業員{1}に割り当てられています
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +13,Make new POS Profile,新しいPOSプロファイルを作成
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +31,Health Care,健康管理
+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 +494,Invoice,請求
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +519,Invoice,請求
 DocType: Maintenance Schedule Item,Periodicity,周期性
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +357,Email Address,メールアドレス
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +21,Defense,防御
+apps/erpnext/erpnext/public/js/setup_wizard.js +107,Email Address,メールアドレス
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,防御
 DocType: Company,Abbr,略称
 DocType: Appraisal Goal,Score (0-5),スコア（0-5）
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +193,Row {0}: {1} {2} does not match with {3},行{0}：{1} {2} は {3}と一致しません
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +67,Row # {0}:,行 {0}：
 DocType: Delivery Note,Vehicle No,車両番号
 apps/erpnext/erpnext/public/js/pos/pos.js +528,Please select Price List,価格表を選択してください
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +162,Woodworking,木工
 DocType: Production Order Operation,Work In Progress,進行中の作業
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +153,3D printing,3Dプリント
 DocType: Employee,Holiday List,休日のリスト
 DocType: Time Log,Time Log,時間ログ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +530,Accountant,会計士
+apps/erpnext/erpnext/public/js/setup_wizard.js +274,Accountant,会計士
 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.",行動ログは、タスク（時間・請求の追跡に使用）に対してユーザーが実行します。
@@ -98,18 +93,19 @@
 DocType: Bin,Quantity Requested for Purchase,仕入要求数
 DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name",古い名前、新しい名前の計2列となっている.csvファイルを添付してください
 DocType: Packed Item,Parent Detail docname,親詳細文書名
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Kg,kg
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Kg,kg
 apps/erpnext/erpnext/config/hr.py +48,Opening for a Job.,欠員
 DocType: Item Attribute,Increment,増分
 apps/erpnext/erpnext/public/js/stock_analytics.js +63,Select Warehouse...,倉庫を選択...
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +6,Advertising,広告
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,広告
+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/doctype/sales_invoice/sales_invoice.py +389,Stock cannot be updated against Delivery Note {0},納品書{0}に対して在庫を更新することはできません
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +391,Stock cannot be updated against Delivery Note {0},納品書{0}に対して在庫を更新することはできません
 DocType: Payment Reconciliation,Reconcile,照合
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +30,Grocery,食料品
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,食料品
 DocType: Quality Inspection Reading,Reading 1,報告要素1
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Make Bank Entry,銀行エントリを作成
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +40,Pension Funds,年金基金
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,年金基金
 apps/erpnext/erpnext/accounts/doctype/account/account.py +142,Warehouse is mandatory if account type is Warehouse,アカウントタイプが「倉庫」の場合、倉庫が必須です
 DocType: SMS Center,All Sales Person,全ての営業担当者
 DocType: Lead,Person Name,人名
@@ -131,7 +127,7 @@
 DocType: Quality Inspection,Get Specification Details,仕様詳細を取得
 DocType: Lead,Interested,関心あり
 apps/erpnext/erpnext/config/manufacturing.py +14,Bill of Material,部品表
-apps/erpnext/erpnext/public/js/stock_analytics.js +45,Opening,期首
+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,項目グループからコピーする
 DocType: Journal Entry,Opening Entry,エントリーを開く
@@ -145,23 +141,22 @@
 DocType: Employee Education,Under Graduate,在学生
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +22,Target On,目標
 DocType: BOM,Total Cost,費用合計
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +99,Reaming,リーマー加工
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +9,Activity Log:,活動ログ：
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +199,Item {0} does not exist in the system or has expired,アイテム{0}は、システムに存在しないか有効期限が切れています
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +44,Real Estate,不動産
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +44,Real Estate,不動産
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +4,Statement of Account,決算報告
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +41,Pharmaceuticals,医薬品
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,医薬品
 DocType: Expense Claim Detail,Claim Amount,請求額
 DocType: Employee,Mr,氏
 DocType: Custom Script,Client,クライアント
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,サプライヤータイプ/サプライヤー
 DocType: Naming Series,Prefix,接頭辞
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Consumable,消耗品
+apps/erpnext/erpnext/public/js/setup_wizard.js +359,Consumable,消耗品
 DocType: Upload Attendance,Import Log,インポートログ
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.js +19,Send,送信
 DocType: Sales Invoice Item,Delivered By Supplier,サプライヤーで配信
 DocType: SMS Center,All Contact,全ての連絡先
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +164,Annual Salary,年俸
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +164,Annual Salary,年俸
 DocType: Period Closing Voucher,Closing Fiscal Year,閉会年度
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +69,Stock Expenses,在庫経費
 DocType: Newsletter,Email Sent?,メール送信済み？
@@ -169,7 +164,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +92,Show Time Logs,時間ログを表示
 DocType: Journal Entry Account,Credit in Company Currency,会社通貨の貸方
 DocType: Delivery Note,Installation Status,設置ステータス
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +115,Accepted + Rejected Qty must be equal to Received quantity for Item {0},受入数と拒否数の合計はアイテム{0}の受領数と等しくなければなりません
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +118,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 +133,Item {0} must be a Purchase Item,アイテム{0}は仕入アイテムでなければなりません
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
@@ -177,19 +172,17 @@
 選択した期間内のすべての日付と従業員の組み合わせは、既存の出勤記録と一緒に、テンプレートに入ります"
 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 +493,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included",アイテム料金の行{0}に税を含めるには、行{1}の税も含まれていなければなりません
+apps/erpnext/erpnext/controllers/accounts_controller.py +494,"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 +90,Settings for HR Module,人事モジュール設定
 DocType: SMS Center,SMS Center,SMSセンター
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +78,Straightening,曲り矯正
 DocType: BOM Replace Tool,New BOM,新しい部品表
 apps/erpnext/erpnext/config/projects.py +28,Batch Time Logs for billing.,請求用時間ログバッチ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +15,Countergravity casting,反重力鋳造
 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/setup/page/setup_wizard/fixtures/industry_type.py +14,Broadcasting,放送
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +140,Execution,実行
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +364,The first user will become the System Manager (you can change this later).,最初のユーザーは、システムマネージャとなります。（後で変更できます）
+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/public/js/setup_wizard.js +114,The first user will become the System Manager (you can change this later).,最初のユーザーは、システムマネージャとなります。（後で変更できます）
 apps/erpnext/erpnext/config/manufacturing.py +39,Details of the operations carried out.,作業遂行の詳細
 DocType: Serial No,Maintenance Status,メンテナンスステータス
 apps/erpnext/erpnext/config/stock.py +263,Items and Pricing,アイテムと価格
@@ -206,7 +199,6 @@
 DocType: Pricing Rule,Discount on Price List Rate (%),価格表での割引率（％）
 apps/frappe/frappe/public/js/frappe/form/print.js +96,Start,開始
 DocType: User,First Name,お名前（名）
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +12,Full-mold casting,フルモールド鋳造
 DocType: Offer Letter,Select Terms and Conditions,規約を選択
 DocType: Production Planning Tool,Sales Orders,受注
 DocType: Purchase Taxes and Charges,Valuation,評価
@@ -218,8 +210,7 @@
 DocType: Bank Reconciliation,Bank Account,銀行口座
 DocType: Leave Type,Allow Negative Balance,マイナス残高を許可
 DocType: Selling Settings,Default Territory,デフォルト地域
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +53,Television,TV
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +138,Gashing,ギャッシュ加工
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,TV
 DocType: Production Order Operation,Updated via 'Time Log',「時間ログ」から更新
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +82,Account {0} does not belong to Company {1},アカウント{0}は会社{1}に属していません
 DocType: Naming Series,Series List for this Transaction,この取引のシリーズ一覧
@@ -234,14 +225,13 @@
 DocType: Leave Allocation,Add unused leaves from previous allocations,前回の割り当てから未使用の葉を追加
 apps/erpnext/erpnext/controllers/recurring_document.py +206,Next Recurring {0} will be created on {1},次の繰り返し {0} は {1} 上に作成されます
 DocType: Newsletter List,Total Subscribers,総登録者数
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +575,Contact Name,担当者名
+,Contact Name,担当者名
 DocType: Production Plan Item,SO Pending Qty,受注保留数量
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,上記の基準の給与伝票を作成します。
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,仕入要求
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +107,Double housing,ダブルハウジング
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +156,Only the selected Leave Approver can submit this Leave Application,選択した休暇承認者のみ、休暇申請を提出可能です
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +171,Only the selected Leave Approver can submit this Leave Application,選択した休暇承認者のみ、休暇申請を提出可能です
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,退職日は入社日より後でなければなりません
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +172,Leaves per Year,年次休暇
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +172,Leaves per Year,年次休暇
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup > Settings > Naming Series,セットアップ＞設定＞命名シリーズから、{0} に命名シリーズを設定してください
 DocType: Time Log,Will be updated when batched.,バッチ処理されると更新されます。
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +104,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,行{0}：前払エントリである場合、アカウント{1}に対する「前払」をご確認ください
@@ -250,25 +240,24 @@
 DocType: Item Website Specification,Item Website Specification,アイテムのWebサイトの仕様
 DocType: Dropbox Backup,Dropbox Access Key,Dropboxのアクセスキー
 DocType: Payment Tool,Reference No,参照番号
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +348,Leave Blocked,休暇
-apps/erpnext/erpnext/stock/doctype/item/item.py +535,Item {0} has reached its end of life on {1},アイテム{0}は{1}に耐用年数の終わりに達します
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +392,Leave Blocked,休暇
+apps/erpnext/erpnext/stock/doctype/item/item.py +539,Item {0} has reached its end of life on {1},アイテム{0}は{1}に耐用年数の終わりに達します
 apps/erpnext/erpnext/accounts/utils.py +339,Annual,年次
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,在庫棚卸アイテム
 DocType: Stock Entry,Sales Invoice No,請求番号
 DocType: Material Request Item,Min Order Qty,最小注文数量
 DocType: Lead,Do Not Contact,コンタクト禁止
 DocType: Sales Invoice,The unique id for tracking all recurring invoices. It is generated on submit.,定期的な請求書を全て追跡するための一意のIDで、提出時に生成されます
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +93,Software Developer,ソフトウェア開発者
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +93,Software Developer,ソフトウェア開発者
 DocType: Item,Minimum Order Qty,最小注文数量
 DocType: Pricing Rule,Supplier Type,サプライヤータイプ
 DocType: Item,Publish in Hub,ハブに公開
 ,Terretory,地域
-apps/erpnext/erpnext/stock/doctype/item/item.py +555,Item {0} is cancelled,アイテム{0}をキャンセルしました
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +598,Material Request,資材要求
+apps/erpnext/erpnext/stock/doctype/item/item.py +559,Item {0} is cancelled,アイテム{0}をキャンセルしました
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +607,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},仕入注文 {1} の「原材料供給」テーブルにアイテム {0} が見つかりません
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +129,Wire brushing,ワイヤーブラッシング
 DocType: Employee,Relation,関連
 DocType: Shipping Rule,Worldwide Shipping,全世界出荷
 apps/erpnext/erpnext/config/selling.py +23,Confirmed orders from Customers.,お客様からのご注文確認。
@@ -284,12 +273,11 @@
 DocType: Supplier,Address HTML,住所のHTML
 DocType: Lead,Mobile No.,携帯番号
 DocType: Maintenance Schedule,Generate Schedule,スケジュールを生成
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +81,Hubbing,ハブ加工
 DocType: Purchase Invoice Item,Expense Head,経費科目
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +86,Please select Charge Type first,請求タイプを最初に選択してください
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,新着
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +395,Max 5 characters,最大5文字
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +195,Select Your Language,言語を選択
+apps/erpnext/erpnext/public/js/setup_wizard.js +143,Max 5 characters,最大5文字
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +245,Select Your Language,言語を選択
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,リストに最初に追加される休暇承認者は、デフォルト休暇承認者として設定されます。
 DocType: Manufacturing Settings,"Disables creation of time logs against Production Orders.
 Operations shall not be tracked against Production Order",製造指示に対する時間ログの作成を無効にします。製造指示に対する操作は追跡されなくなります
@@ -301,8 +289,6 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +34,Item {0} must be Service Item,アイテム{0}はサービスアイテムでなければなりません
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +303,Completed Qty can not be greater than 'Qty to Manufacture',完成した数量は「製造数量」より大きくすることはできません
 DocType: DocType,Administrator,管理者
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +136,Laser drilling,レーザードリル加工
-DocType: Stock UOM Replace Utility,New Stock UOM,新しい在庫単位
 DocType: Period Closing Voucher,Closing Account Head,決算科目
 DocType: Employee,External Work History,職歴（他社）
 apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,循環参照エラー
@@ -311,18 +297,15 @@
 DocType: Lead,Industry,業種
 DocType: Employee,Job Profile,職務内容
 DocType: Newsletter,Newsletter,ニュースレター
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +84,Hydroforming,ハイドロフォーミング
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +49,Necking,ネッキング加工
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,自動的な資材要求の作成時にメールで通知
 DocType: Journal Entry,Multi Currency,複数通貨
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +51,Item is updated,アイテムを更新しました
 DocType: Async Task,System Manager,システム管理者
 DocType: Payment Reconciliation Invoice,Invoice Type,請求書タイプ
 DocType: Sales Invoice Item,Delivery Note,納品書
 DocType: Dropbox Backup,Allow Dropbox Access,Dropboxのアクセスを許可
 apps/erpnext/erpnext/config/learn.py +72,Setting up Taxes,税設定
 apps/erpnext/erpnext/accounts/utils.py +189,Payment Entry has been modified after you pulled it. Please pull it again.,支払エントリが変更されています。引用しなおしてください
-apps/erpnext/erpnext/stock/doctype/item/item.py +343,{0} entered twice in Item Tax,アイテムの税金に{0}が2回入力されています
+apps/erpnext/erpnext/stock/doctype/item/item.py +347,{0} entered twice in Item Tax,アイテムの税金に{0}が2回入力されています
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +105,Summary for this week and pending activities,今週と保留中の活動の概要
 DocType: Workstation,Rent Cost,地代・賃料
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +74,Please select month and year,月と年を選択してください
@@ -340,24 +323,22 @@
 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/buying/doctype/purchase_order/purchase_order.js +517,Select Item,アイテムを選択
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +540,Select Item,アイテムを選択
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +143,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","アイテム：{0}はバッチごとに管理され、「在庫棚卸」を使用して照合することはできません。
 代わりに「在庫エントリー」を使用してください。"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +259,Purchase Invoice {0} is already submitted,仕入請求{0}はすでに提出されています
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +262,Purchase Invoice {0} is already submitted,仕入請求{0}はすでに提出されています
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Batch No must be same as {1} {2},行＃{0}：バッチ番号は {1} {2}と同じである必要があります
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Convert to non-Group,非グループに変換
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +55,Purchase Receipt must be submitted,仕入時の領収書を提出しなければなりません
-DocType: Stock UOM Replace Utility,Current Stock UOM,現在の在庫数量単位
 apps/erpnext/erpnext/config/stock.py +53,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},{0} {1} では会社ごとに1アカウントのみとなります
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Your email address,あなたのメール アドレス
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +194,Please see attachment,添付ファイルを参照してください
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +203,Please see attachment,添付ファイルを参照してください
 DocType: Purchase Order,% Received,％受領
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +109,Water jet cutting,ウォータージェット切断
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +24,Setup Already Complete!!,セットアップはすでに完了しています！
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +20,Setup Already Complete!!,セットアップはすでに完了しています！
 ,Finished Goods,完成品
 DocType: Delivery Note,Instructions,説明書
 DocType: Quality Inspection,Inspected By,検査担当
@@ -372,6 +353,7 @@
 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,為替
 DocType: Purchase Invoice Item,Item Name,アイテム名
+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",要求されるアイテム（計画数量と最小注文数量に基づきすべての倉庫を考慮して「在庫切れ」とされたもの）
@@ -381,11 +363,10 @@
 ,Purchase Register,仕入帳
 DocType: Landed Cost Item,Applicable Charges,適用料金
 DocType: Workstation,Consumable Cost,消耗品費
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,{0} ({1}) must have role 'Leave Approver',{0}（{1}）は「休暇承認者」の役割を持っている必要があります
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +167,{0} ({1}) must have role 'Leave Approver',{0}（{1}）は「休暇承認者」の役割を持っている必要があります
 DocType: Purchase Receipt,Vehicle Date,車両日付
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +39,Medical,検診
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +39,Medical,検診
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,失敗の原因
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +36,Tube beading,ビーディング加工
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},作業所は、休日リストに従って、次の日に休業します：{0}
 DocType: Employee,Single,シングル
 DocType: Issue,Attachment,添付
@@ -406,10 +387,8 @@
 DocType: Account,Is Group,グループ
 DocType: Stock Settings,Automatically Set Serial Nos based on FIFO,先入先出法（FIFO）によりシリアル番号を自動的に設定
 DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,サプライヤー請求番号が一意であることを確認してください
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +31,Thermoforming,熱成形
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +66,Slitting,スリッティング
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +57,'To Case No.' cannot be less than 'From Case No.',「終了事例番号」は「開始事例番号」より前にはできません
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +104,Non Profit,非営利
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +104,Non Profit,非営利
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_list.js +7,Not Started,未開始
 DocType: Lead,Channel Partner,チャネルパートナー
 DocType: Account,Old Parent,古い親
@@ -418,13 +397,12 @@
 apps/erpnext/erpnext/config/manufacturing.py +74,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 +512,Attribute {0} selected multiple times in Attributes Table,属性 {0} は属性表内で複数回選択されています
+apps/erpnext/erpnext/stock/doctype/item/item.py +516,Attribute {0} selected multiple times in Attributes Table,属性 {0} は属性表内で複数回選択されています
 DocType: Sales Order,Not Applicable,特になし
 apps/erpnext/erpnext/config/hr.py +140,Holiday master.,休日マスター
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +19,Shell molding,シェルモールド鋳造
 DocType: Material Request Item,Required Date,要求日
 DocType: Delivery Note,Billing Address,請求先住所
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +644,Please enter Item Code.,アイテムコードを入力してください
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +648,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,合計数量
@@ -434,7 +412,7 @@
 DocType: Item Attribute,To Range,範囲対象
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,有価証券および預金
 DocType: Features Setup,Imports,インポート
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +144,Adhesive bonding,接着
+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.,出勤レコード
@@ -442,26 +420,25 @@
 DocType: Sales Order Item,Used for Production Plan,生産計画に使用
 DocType: System Settings,Loading...,読み込んでいます...
 DocType: DocField,Password,パスワード
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +155,Fused deposition modeling,熱溶解積層法
 DocType: Manufacturing Settings,Time Between Operations (in mins),操作の間の時間（分単位）
 DocType: Customer,Buyer of Goods and Services.,物品・サービスのバイヤー
 DocType: Journal Entry,Accounts Payable,買掛金
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +24,Add Subscribers,登録者を追加
 apps/erpnext/erpnext/public/js/feature_setup.js +220,""" does not exists","""が存在しません"
 DocType: Pricing Rule,Valid Upto,有効（〜まで）
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +564,List a few of your customers. They could be organizations or individuals.,あなたの顧客の一部を一覧表示します。彼らは、組織や個人である可能性があります。
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,List a few of your customers. They could be organizations or individuals.,あなたの顧客の一部を一覧表示します。彼らは、組織や個人である可能性があります。
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Direct Income,直接利益
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +33,"Can not filter based on Account, if grouped by Account",アカウント別にグループ化されている場合、アカウントに基づいてフィルタリングすることはできません
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +88,Administrative Officer,管理担当者
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Administrative Officer,管理担当者
 DocType: Payment Tool,Received Or Paid,受領済または支払済
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +318,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 +305,Please enter Warehouse for which Material Request will be raised,資材要求が発生する倉庫を入力してください
 DocType: Production Order,Additional Operating Cost,追加の営業費用
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +20,Cosmetics,化粧品
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,化粧品
 DocType: DocField,Type,タイプ
-apps/erpnext/erpnext/stock/doctype/item/item.py +417,"To merge, following properties must be same for both items",マージするには、両方のアイテムで次の属性が同じである必要があります。
+apps/erpnext/erpnext/stock/doctype/item/item.py +421,"To merge, following properties must be same for both items",マージするには、両方のアイテムで次の属性が同じである必要があります。
 DocType: Communication,Subject,タイトル
 DocType: Shipping Rule,Net Weight,正味重量
 DocType: Employee,Emergency Phone,緊急電話
@@ -471,7 +448,6 @@
 DocType: Journal Entry,Difference (Dr - Cr),差額（借方 - 貸方）
 DocType: Account,Profit and Loss,損益
 apps/erpnext/erpnext/config/stock.py +293,Managing Subcontracting,業務委託管理
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +58,New UOM must NOT be of type Whole Number,新しい単位は、全体数タイプにはできません
 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 +47,Account {0} does not belong to company: {1},アカウント{0}は会社{1}に属していません
@@ -490,14 +466,14 @@
 DocType: Purchase Invoice,Supplier Invoice No,サプライヤー請求番号
 DocType: Territory,For reference,参考のため
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +154,"Cannot delete Serial No {0}, as it is used in stock transactions",それは株式取引で使用されているように、{0}シリアル番号を削除することはできません
-apps/erpnext/erpnext/public/js/account_tree_grid.js +52,Closing (Cr),（貸方）を閉じる
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +227,Closing (Cr),（貸方）を閉じる
 DocType: Serial No,Warranty Period (Days),保証期間（日数）
 DocType: Installation Note Item,Installation Note Item,設置票アイテム
 ,Pending Qty,保留中の数量
 DocType: Job Applicant,Thread HTML,スレッドHTML
 DocType: Company,Ignore,無視
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +86,SMS sent to following numbers: {0},次の番号に送信されたSMS：{0}
-apps/erpnext/erpnext/controllers/buying_controller.py +135,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,下請け領収書のために必須のサプライヤーの倉庫
+apps/erpnext/erpnext/controllers/buying_controller.py +126,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,下請け領収書のために必須のサプライヤーの倉庫
 DocType: Pricing Rule,Valid From,有効（〜から）
 DocType: Sales Invoice,Total Commission,手数料合計
 DocType: Pricing Rule,Sales Partner,販売パートナー
@@ -506,7 +482,7 @@
 
 To distribute a budget using this distribution, set this **Monthly Distribution** in the **Cost Center**","「月次配分」は、ビジネスに季節性がある場合、月間で予算を配分するのに使用できます。
 配分を行なう場合には、「コストセンター」にこの「月次配分」を設定してください。"
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +183,No records found in the Invoice table,請求書テーブルにレコードが見つかりません
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +130,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 +84,Financial / accounting year.,会計年度
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged",シリアル番号をマージすることはできません
@@ -522,25 +498,25 @@
 DocType: Sales Order,Billing and Delivery Status,請求と配達の状況
 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/setup/page/setup_wizard/setup_wizard_page.html +16,Previous,前
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard_page.html +16,Previous,前
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +620,Sales Return,販売返品
 DocType: Production Planning Tool,Select Sales Orders from which you want to create Production Orders.,作成した製造指示から受注を選択します。
 DocType: Item,Delivered by Supplier (Drop Ship),サプライヤー（ドロップ船）で配信
 apps/erpnext/erpnext/config/hr.py +120,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.,顧客データベース
 DocType: Quotation,Quotation To,見積先
 DocType: Lead,Middle Income,中収益
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),開く（貸方）
 apps/erpnext/erpnext/accounts/utils.py +193,Allocated amount can not be negative,割当額をマイナスにすることはできません
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +123,Tumbling,タンブリング
 DocType: Purchase Order Item,Billed Amt,支払額
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,在庫エントリが作成されるのに対する論理的な倉庫。
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +92,Reference No & Reference Date is required for {0},{0}には参照番号・参照日が必要です
 DocType: Event,Wednesday,水曜日
 DocType: Sales Invoice,Customer's Vendor,顧客のベンダー
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +214,Production Order is Mandatory,製造指示は必須です
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +139,Proposal Writing,提案の作成
+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/stock/stock_ledger.py +336,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},マイナス在庫エラー（{6}）アイテム {0} 倉庫 {1}の {4} {5} 内 {2} {3}
 DocType: Fiscal Year Company,Fiscal Year Company,会計年度（会社）
@@ -563,7 +539,7 @@
 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/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.py +179,Please install dropbox python module,PythonのDropBoxモジュールをインストールしてください
 DocType: Employee,Passport Number,パスポート番号
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +82,Manager,マネージャー
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Manager,マネージャー
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +494,From Purchase Receipt,参照元仕入領収書
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +219,Same item has been entered multiple times.,同じアイテムが複数回入力されています
 DocType: SMS Settings,Receiver Parameter,受領者パラメータ
@@ -571,10 +547,9 @@
 DocType: Sales Person,Sales Person Targets,営業担当者の目標
 apps/frappe/frappe/public/js/frappe/form/workflow.js +116,To,To
 apps/frappe/frappe/templates/base.html +145,Please enter email address,メールアドレスを入力してください
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +35,End tube forming,管端成形
 DocType: Production Order Operation,In minutes,分単位
 DocType: Issue,Resolution Date,課題解決日
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +635,Please set default Cash or Bank account in Mode of Payment {0},支払方法{0}にデフォルトの現金や銀行口座を設定してください
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +637,Please set default Cash or Bank account in Mode of Payment {0},支払方法{0}にデフォルトの現金や銀行口座を設定してください
 DocType: Selling Settings,Customer Naming By,顧客名設定
 apps/erpnext/erpnext/accounts/doctype/account/account.js +67,Convert to Group,グループへの変換
 DocType: Activity Cost,Activity Type,活動タイプ
@@ -582,12 +557,12 @@
 DocType: Customer,Fixed Days,期日
 DocType: Sales Invoice,Packing List,梱包リスト
 apps/erpnext/erpnext/config/buying.py +28,Purchase Orders given to Suppliers.,サプライヤーに与えられた発注
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +43,Publishing,公開
+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 +198,{0}: {1} not found in Invoice Details table,{0}：{1}は請求書詳細テーブルに存在しません
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,{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 +208,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,この受注をキャンセルする前に、メンテナンス訪問 {0} をキャンセルしなければなりません
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +203,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),開く（借方）
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},投稿のタイムスタンプは、{0}の後でなければなりません
@@ -599,7 +574,6 @@
 DocType: Pricing Rule,Sales Manager,営業部長
 apps/frappe/frappe/public/js/frappe/model/model.js +492,Rename,名称変更
 DocType: Journal Entry,Write Off Amount,償却額
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +52,Bending,曲げ加工
 apps/frappe/frappe/core/page/user_permissions/user_permissions.js +246,Allow User,ユーザを許可
 DocType: Journal Entry,Bill No,請求番号
 DocType: Purchase Invoice,Quarterly,4半期ごと
@@ -609,17 +583,16 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Please enter item details,アイテムの詳細を入力してください
 DocType: Purchase Receipt,Other Details,その他の詳細
 DocType: Account,Accounts,アカウント
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +67,Marketing,マーケティング
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +65,Straight shearing,直状せん断
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +67,Marketing,マーケティング
 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/stock/doctype/purchase_receipt/purchase_receipt.py +99,Rejected Warehouse is mandatory against regected item,拒否されたアイテムに対しては拒否された倉庫が必須です
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +102,Rejected Warehouse is mandatory against regected item,拒否されたアイテムに対しては拒否された倉庫が必須です
 DocType: Account,Expenses Included In Valuation,評価中経費
 DocType: Employee,Provide email id registered in company,会社に登録されたメールアドレスを提供
 DocType: Hub Settings,Seller City,販売者の市区町村
 DocType: Email Digest,Next email will be sent on:,次のメール送信先：
 DocType: Offer Letter Term,Offer Letter Term,雇用契約書条件
-apps/erpnext/erpnext/stock/doctype/item/item.py +492,Item has variants.,アイテムはバリエーションがあります
+apps/erpnext/erpnext/stock/doctype/item/item.py +496,Item has variants.,アイテムはバリエーションがあります
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,アイテム{0}が見つかりません
 DocType: Bin,Stock Value,在庫価値
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,ツリー型
@@ -628,10 +601,9 @@
 DocType: Material Request Item,Quantity and Warehouse,数量と倉庫
 DocType: Sales Invoice,Commission Rate (%),手数料率（％）
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +172,"Against Voucher Type must be one of Sales Order, Sales Invoice or Journal Entry",対伝票タイプは受注・納品書・仕訳のいずれかでなければなりません
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +139,Biomachining,バイオマシニング
 apps/erpnext/erpnext/setup/utils.py +89,Unable to find exchange rate,為替レートを見つけることができません。
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +7,Aerospace,航空宇宙
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +19,Welcome,ようこそ
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +7,Aerospace,航空宇宙
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +40,Welcome,ようこそ
 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.,サプライヤーから受け取った商品。
@@ -654,19 +626,19 @@
 DocType: Employee,Cell Number,携帯電話の番号
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,失われた
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +120,You can not enter current voucher in 'Against Journal Entry' column,「対仕訳入力」列に対してこの伝票を入力することはできません
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +25,Energy,エネルギー
+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.,月次給与計算書。
 DocType: Item Group,Website Specifications,ウェブサイトの仕様
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +205,New Account,新しいアカウント
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +21,{0}: From {0} of type {1},{0}：タイプ{1}の{0}から
-apps/erpnext/erpnext/controllers/buying_controller.py +283,Row {0}: Conversion Factor is mandatory,行{0}：換算係数が必須です
+apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,行{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.,会計エントリはリーフノードに対して行うことができます。グループに対するエントリは許可されていません。
 DocType: ToDo,High,高
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +361,Cannot deactivate or cancel BOM as it is linked with other BOMs,別の部品表にリンクされているため、無効化や部品表のキャンセルはできません
 DocType: Opportunity,Maintenance,メンテナンス
 DocType: User,Male,男性
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +182,Purchase Receipt number required for Item {0},アイテム{0}には領収書番号が必要です
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +183,Purchase Receipt number required for Item {0},アイテム{0}には領収書番号が必要です
 DocType: Item Attribute Value,Item Attribute Value,アイテムの属性値
 apps/erpnext/erpnext/config/crm.py +64,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.
@@ -721,10 +693,9 @@
 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 +324,"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/page/setup_wizard/fixtures/industry_type.py +13,Biotechnology,バイオテクノロジー
+apps/erpnext/erpnext/controllers/accounts_controller.py +325,"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,事務所維持費
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +53,Hemming,縁曲げ加工
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +66,Please enter Item first,最初のアイテムを入力してください
 DocType: Account,Liability,負債
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +62,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,決済額は、行{0}での請求額を超えることはできません。
@@ -737,10 +708,10 @@
 DocType: Company,Default Bank Account,デフォルト銀行口座
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +47,"To filter based on Party, select Party Type first",「当事者」に基づいてフィルタリングするには、最初の「当事者タイプ」を選択してください
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},アイテムが{0}経由で配送されていないため、「在庫更新」はチェックできません
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Nos,番号
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,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 +627,My Invoices,自分の請求書
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +629,My Invoices,自分の請求書
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,従業員が見つかりません
 DocType: Purchase Order,Stopped,停止
 DocType: Item,If subcontracted to a vendor,ベンダーに委託した場合
@@ -759,35 +730,33 @@
 DocType: Features Setup,"To enable ""Point of Sale"" features",POS機能を有効にする
 DocType: Bin,Moving Average Rate,移動平均レート
 DocType: Production Planning Tool,Select Items,アイテム選択
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,{0} against Bill {1} dated {2},{2}を指定日とする支払{1}に対する{0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +328,{0} against Bill {1} dated {2},{2}を指定日とする支払{1}に対する{0}
 DocType: Comment,Reference Name,参照名
 DocType: Maintenance Visit,Completion Status,完了状況
 DocType: Sales Invoice Item,Target Warehouse,ターゲット倉庫
 DocType: Item,Allow over delivery or receipt upto this percent,このパーセント以上の配送または受領を許可
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +49,Expected Delivery Date cannot be before Sales Order Date,納品予定日は受注日より前にすることはできません
 DocType: Upload Attendance,Import Attendance,出勤インポート
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +17,All Item Groups,全てのアイテムグループ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +17,All Item Groups,全てのアイテムグループ
 DocType: Process Payroll,Activity Log,活動ログ
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +30,Net Profit / Loss,純損益
 apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,取引の送信時、自動的にメッセージを作成します。
 DocType: Production Order,Item To Manufacture,製造するアイテム
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +16,Permanent mold casting,金型鋳造
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1}状態は{2}です
 apps/erpnext/erpnext/config/learn.py +172,Purchase Order to Payment,発注からの支払
 DocType: Sales Order Item,Projected Qty,予想数量
 DocType: Sales Invoice,Payment Due Date,支払期日
 DocType: Newsletter,Newsletter Manager,ニュースレターマネージャー
-apps/erpnext/erpnext/stock/doctype/item/item.js +229,Item Variant {0} already exists with same attributes,アイテムバリエーション{0}は既に同じ属性で存在しています
+apps/erpnext/erpnext/stock/doctype/item/item.js +231,Item Variant {0} already exists with same attributes,アイテムバリエーション{0}は既に同じ属性で存在しています
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening',「オープニング」
 DocType: Notification Control,Delivery Note Message,納品書のメッセージ
 DocType: Expense Claim,Expenses,経費
 DocType: Item Variant Attribute,Item Variant Attribute,アイテムバリエーション属性
 ,Purchase Receipt Trends,領収書傾向
 DocType: Appraisal,Select template from which you want to get the Goals,ゴールを取得する元となるテンプレートを選択
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +77,Research & Development,研究開発
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Research & Development,研究開発
 ,Amount to Bill,支払額
 DocType: Company,Registration Details,登録の詳細
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +75,Staking,ステーキング加工
 DocType: Item,Re-Order Qty,再オーダー数量
 DocType: Leave Block List Date,Leave Block List Date,休暇リスト日付
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +25,Scheduled to send to {0},{0}に送信するようにスケジュールしました
@@ -798,18 +767,16 @@
 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,POS
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,Cannot carry forward {0},繰越はできません{0}
 apps/erpnext/erpnext/accounts/doctype/account/account.py +91,"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,経費請求拒否されたメッセージ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +145,Nailing,釘打ち
 ,Available Qty,利用可能な数量
 DocType: Purchase Taxes and Charges,On Previous Row Total,前の行の合計
 DocType: Salary Slip,Working Days,勤務日
 DocType: Serial No,Incoming Rate,収入レート
 DocType: Packing Slip,Gross Weight,総重量
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +410,The name of your company for which you are setting up this system.,このシステムを設定する会社の名前
+apps/erpnext/erpnext/public/js/setup_wizard.js +158,The name of your company for which you are setting up this system.,このシステムを設定する会社の名前
 DocType: HR Settings,Include holidays in Total no. of Working Days,営業日数に休日を含む
 DocType: Job Applicant,Hold,保留
 DocType: Employee,Date of Joining,入社日
@@ -819,7 +786,6 @@
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +3,View Subscribers,登録者表示
 DocType: Purchase Invoice Item,Purchase Receipt,領収書
 ,Received Items To Be Billed,支払予定受領アイテム
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +114,Abrasive blasting,エアーブラスト
 DocType: Employee,Ms,女史
 apps/erpnext/erpnext/config/accounts.py +148,Currency exchange rate master.,為替レートマスター
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +253,Unable to find Time Slot in the next {0} days for Operation {1},操作{1}のための時間スロットは次の{0}日間に存在しません
@@ -831,7 +797,7 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +209,Serial No {0} does not belong to Item {1},アイテム {1} に関連付けが無いシリアル番号 {0}
 DocType: Purchase Receipt Item Supplied,Required Qty,必要な数量
 DocType: Bank Reconciliation,Total Amount,合計
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +32,Internet Publishing,インターネット出版
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,インターネット出版
 DocType: Production Planning Tool,Production Orders,製造指示
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +35,Balance Value,価格のバランス
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,販売価格表
@@ -842,7 +808,7 @@
 DocType: Supplier,Default Payable Accounts,デフォルト買掛金勘定
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,従業員{0}はアクティブでないか、存在しません
 DocType: Features Setup,Item Barcode,アイテムのバーコード
-apps/erpnext/erpnext/stock/doctype/item/item.py +487,Item Variants {0} updated,アイテムバリエーション{0}を更新しました
+apps/erpnext/erpnext/stock/doctype/item/item.py +491,Item Variants {0} updated,アイテムバリエーション{0}を更新しました
 DocType: Quality Inspection Reading,Reading 6,報告要素6
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,仕入請求前払
 DocType: Address,Shop,店
@@ -851,7 +817,7 @@
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,このモードを選択した場合、デフォルトの銀行口座／現金勘定がPOS請求書内で自動的に更新されます。
 DocType: Employee,Permanent Address Is,本籍地
 DocType: Production Order Operation,Operation completed for how many finished goods?,作業完了時の完成品数
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +491,The Brand,ブランド
+apps/erpnext/erpnext/public/js/setup_wizard.js +237,The Brand,ブランド
 apps/erpnext/erpnext/controllers/status_updater.py +163,Allowance for over-{0} crossed for Item {1}.,{0}以上の引当金は、アイテム {1}と相殺されています。
 DocType: Employee,Exit Interview Details,インタビュー詳細を終了
 DocType: Item,Is Purchase Item,仕入アイテム
@@ -871,16 +837,16 @@
 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,設定支払額＝残高
 DocType: Contact Us Settings,Address Line 1,住所 1行目
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Variance,差違
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +392,Company Name,（会社名）
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +53,Variance,差違
+,Company Name,（会社名）
 DocType: SMS Center,Total Message(s),全メッセージ
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +515,Select Item for Transfer,配送のためのアイテムを選択
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +538,Select Item for Transfer,配送のためのアイテムを選択
 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.,小切手が預けられた銀行の勘定科目を選択してください
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,ユーザーに取引の価格表単価の編集を許可
 DocType: Pricing Rule,Max Qty,最大数量
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +106,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,行{0}：受発注書に対する支払いは、常に前払金としてマークする必要があります
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +16,Chemical,化学
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,化学
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +693,All items have already been transferred for this Production Order.,アイテムは全てこの製造指示に移動されています。
 DocType: Process Payroll,Select Payroll Year and Month,賃金台帳 年と月を選択
 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""",適切なグループ（通常は資金運用＞流動資産＞銀行口座）に移動し、新しい「銀行」アカウント（クリックして子要素を追加します）を作成してください。
@@ -891,12 +857,12 @@
 DocType: Item,Inspection Criteria,検査基準
 apps/erpnext/erpnext/config/accounts.py +101,Tree of finanial Cost Centers.,財務コストセンターのツリー
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,移転済
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +492,Upload your letter head and logo. (you can edit them later).,レターヘッドとロゴをアップロードします（後で編集可能です）
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +156,White,ホワイト
+apps/erpnext/erpnext/public/js/setup_wizard.js +238,Upload your letter head and logo. (you can edit them later).,レターヘッドとロゴをアップロードします（後で編集可能です）
+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/setup/page/setup_wizard/setup_wizard.js +362,Attach Your Picture,あなたの写真を添付
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Make ,作成
+apps/erpnext/erpnext/public/js/setup_wizard.js +112,Attach Your Picture,あなたの写真を添付
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +540,Make ,作成
 DocType: Journal Entry,Total Amount in Words,合計の文字表記
 DocType: Workflow State,Stop,停止
 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.,"エラーが発生しました。
@@ -907,14 +873,13 @@
 DocType: Lead,Next Contact Date,次回連絡日
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,数量を開く
 DocType: Holiday List,Holiday List Name,休日リストの名前
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +168,Stock Options,ストックオプション
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +168,Stock Options,ストックオプション
 DocType: Journal Entry Account,Expense Claim,経費請求
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +181,Qty for {0},{0}用数量
 DocType: Leave Application,Leave Application,休暇申請
 apps/erpnext/erpnext/config/hr.py +77,Leave Allocation Tool,休暇割当ツール
 DocType: Leave Block List,Leave Block List Dates,休暇リスト日付
 DocType: Company,If Monthly Budget Exceeded (for expense account),毎月の予​​算（費用勘定のため）を超えた場合
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +56,Trimming,トリミング
 DocType: Workstation,Net Hour Rate,時給総計
 DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,輸入費用領収書
 DocType: Company,Default Terms,デフォルト規約
@@ -922,10 +887,9 @@
 DocType: POS Profile,Cash/Bank Account,現金/銀行口座
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,Removed items with no change in quantity or value.,数量または値の変化のないアイテムを削除しました。
 DocType: Delivery Note,Delivery To,納品先
-apps/erpnext/erpnext/stock/doctype/item/item.py +509,Attribute table is mandatory,属性表は必須です
+apps/erpnext/erpnext/stock/doctype/item/item.py +513,Attribute table is mandatory,属性表は必須です
 DocType: Production Planning Tool,Get Sales Orders,注文を取得
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0}はマイナスにできません
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +103,Filing,ファイリング
 apps/erpnext/erpnext/templates/form_grid/item_grid.html +72,Discount,割引
 DocType: Features Setup,Purchase Discounts,仕入割引
 DocType: Workstation,Wages,賃金
@@ -942,6 +906,7 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +112,You are the Expense Approver for this record. Please Update the 'Status' and Save,あなたはこのレコードの経費承認者です。「ステータス」を更新し保存してください。
 DocType: Serial No,Creation Document No,作成ドキュメント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 +136,"Attributes for Item Variants. e.g Size, Color etc.",アイテムバリエーションの属性。例）サイズ、色など
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +39,WIP Warehouse,作業中倉庫
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +194,Serial No {0} is under maintenance contract upto {1},シリアル番号{0}は {1}まで保守契約下にあります
@@ -950,7 +915,7 @@
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,販売費
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Buying,標準購入
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +120,Standard Buying,標準購入
 DocType: GL Entry,Against,に対して
 DocType: Item,Default Selling Cost Center,デフォルト販売コストセンター
 DocType: Sales Partner,Implementation Partner,導入パートナー
@@ -971,29 +936,29 @@
 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/setup/page/setup_wizard/setup_wizard.js +588,List a few of your suppliers. They could be organizations or individuals.,サプライヤーの一部を一覧表示します。彼らは、組織や個人である可能性があります。
+apps/erpnext/erpnext/public/js/setup_wizard.js +326,List a few of your suppliers. They could be organizations or individuals.,サプライヤーの一部を一覧表示します。彼らは、組織や個人である可能性があります。
 DocType: Company,Default Currency,デフォルトの通貨
 DocType: Contact,Enter designation of this Contact,この連絡先の肩書を入力してください
 DocType: Contact Us Settings,Address,住所
 DocType: Expense Claim,From Employee,社員から
-apps/erpnext/erpnext/controllers/accounts_controller.py +338,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,警告：{1}のアイテム{0} がゼロのため、システムは超過請求をチェックしません
+apps/erpnext/erpnext/controllers/accounts_controller.py +339,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,警告：{1}のアイテム{0} がゼロのため、システムは超過請求をチェックしません
 DocType: Journal Entry,Make Difference Entry,差違エントリを作成
 DocType: Upload Attendance,Attendance From Date,出勤開始日
 DocType: Appraisal Template Goal,Key Performance Area,重要実行分野
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +54,Transportation,輸送
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +54,Transportation,輸送
 apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +67, and year: ,＆年：
 DocType: Email Digest,Annual Expense,年間経費
 DocType: SMS Center,Total Characters,文字数合計
-apps/erpnext/erpnext/controllers/buying_controller.py +139,Please select BOM in BOM field for Item {0},アイテム{0}の部品表フィールドで部品表を選択してください
+apps/erpnext/erpnext/controllers/buying_controller.py +130,Please select BOM in BOM field for Item {0},アイテム{0}の部品表フィールドで部品表を選択してください
 DocType: C-Form Invoice Detail,C-Form Invoice Detail,C-フォーム請求書の詳細
 DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,支払照合 請求
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +32,Contribution %,貢献％
 DocType: Item,website page link,ウェブサイトのページリンク
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +192,Let's prepare the system for first use.,システムを準備して使い始めましょう
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +242,Let's prepare the system for first use.,システムを準備して使い始めましょう
 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 +214,Production Order {0} must be cancelled before cancelling this Sales Order,受注キャンセルには製造指示{0}のキャンセルをしなければなりません
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +209,Production Order {0} must be cancelled before cancelling this Sales Order,受注キャンセルには製造指示{0}のキャンセルをしなければなりません
 ,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.,タイムログを選択し、新しい請求書を作成し提出してください。
@@ -1013,14 +978,13 @@
 DocType: Sales Invoice Advance,Sales Invoice Advance,前払金
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +398,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/page/setup_wizard/install_fixtures.py +75,Management,マネジメント
+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/setup/page/setup_wizard/fixtures/operations.py +14,Investment casting,インベストメント鋳造
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +51,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.,給与伝票を保存すると給与が表示されます。
 apps/frappe/frappe/core/doctype/user/user_list.js +12,Active,アクティブ
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +154,Blue,青
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +154,Blue,青
 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,これ以上のノードは「グループ」タイプのノードの下にのみ作成することができます
@@ -1030,18 +994,16 @@
 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/setup/page/setup_wizard/fixtures/operations.py +156,Laminated object manufacturing,被ラミネート体の製造
 apps/erpnext/erpnext/config/buying.py +13,Supplier database.,サプライヤーデータベース
 DocType: Account,Balance Sheet,貸借対照表
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +561,Cost Center For Item with Item Code ',アイテムコードのあるアイテムのためのコストセンター
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +45,Stretch forming,ストレッチフォーミング
 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 +210,"Further accounts can be made under Groups, but entries can be made against non-Groups",アカウントはさらにグループの下に作成できますが、エントリは非グループに対して作成できます
 apps/erpnext/erpnext/config/hr.py +125,Tax and other salary deductions.,税その他給与控除
 DocType: Lead,Lead,リード
 DocType: Email Digest,Payables,買掛金
 DocType: Account,Warehouse,倉庫
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +90,Row #{0}: Rejected Qty can not be entered in Purchase Return,行＃{0}：拒否数量は「購買返品」に入力することはできません
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +93,Row #{0}: Rejected Qty can not be entered in Purchase Return,行＃{0}：拒否数量は「購買返品」に入力することはできません
 ,Purchase Order Items To Be Billed,支払予定発注アイテム
 DocType: Purchase Invoice Item,Net Rate,正味単価
 DocType: Purchase Invoice Item,Purchase Invoice Item,仕入請求アイテム
@@ -1056,13 +1018,13 @@
 DocType: Global Defaults,Current Fiscal Year,現在の会計年度
 DocType: Global Defaults,Disable Rounded Total,合計の四捨五入を無効にする
 DocType: Lead,Call,電話
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +384,'Entries' cannot be empty,「エントリ」は空にできません
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +386,'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 +205,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/page/setup_wizard/install_fixtures.py +138,Research,リサーチ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +138,Research,リサーチ
 DocType: Maintenance Visit Purpose,Work Done,作業完了
 apps/erpnext/erpnext/controllers/item_variant.py +25,Please specify at least one attribute in the Attributes table,属性テーブル内から少なくとも1つの属性を指定してください
 DocType: Contact,User ID,ユーザー ID
@@ -1071,10 +1033,10 @@
 "
 DocType: File,Lft,左
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,最初
-apps/erpnext/erpnext/stock/doctype/item/item.py +394,"An Item Group exists with same name, please change the item name or rename the item group",同名のアイテムグループが存在しますので、アイテム名を変えるか、アイテムグループ名を変更してください
+apps/erpnext/erpnext/stock/doctype/item/item.py +398,"An Item Group exists with same name, please change the item name or rename the item group",同名のアイテムグループが存在しますので、アイテム名を変えるか、アイテムグループ名を変更してください
 DocType: Communication,Delivery Status,納品ステータス
 DocType: Production Order,Manufacture against Sales Order,受注に対する製造
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +517,Rest Of The World,その他の地域
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +455,Rest Of The World,その他の地域
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,アイテム{0}はバッチを持てません
 ,Budget Variance Report,予算差異レポート
 DocType: Salary Slip,Gross Pay,給与総額
@@ -1085,13 +1047,11 @@
 DocType: BOM Item,Item Description,アイテム説明
 DocType: Payment Tool,Payment Mode,支払いモード
 DocType: Purchase Invoice,Is Recurring,繰り返し
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +154,Direct metal laser sintering,直接金属レーザー焼結
 DocType: Purchase Order,Supplied Items,サプライヤー供給アイテム
 DocType: Production Order,Qty To Manufacture,製造数
 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,仮勘定期首
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +41,Cryorolling,低温圧延
 ,Employee Leave Balance,従業員の残休暇数
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +128,Balance for Account {0} must always be {1},アカウントの残高は{0}は常に{1}でなければなりません
 DocType: Address,Address Type,住所タイプ
@@ -1107,23 +1067,23 @@
 DocType: Journal Entry,Get Outstanding Invoices,未払いの請求を取得
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,受注{0}は有効ではありません
 apps/erpnext/erpnext/setup/doctype/company/company.py +172,"Sorry, companies cannot be merged",企業はマージできません
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +145,Small,S
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Small,S
 DocType: Employee,Employee Number,従業員番号
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},ケース番号が既に使用されています。ケース番号 {0} から試してみてください
 ,Invoiced Amount (Exculsive Tax),請求額（外税）
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,アイテム2
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +59,Account head {0} created,勘定科目{0}を作成しました
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +153,Green,グリーン
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Green,グリーン
 DocType: Item,Auto re-order,自動再注文
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +57,Total Achieved,達成計
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +59,Total Achieved,達成計
 DocType: Employee,Place of Issue,発生場所
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +59,Contract,契約書
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Contract,契約書
 DocType: Report,Disabled,無効
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +490,UOM coversion factor required for UOM: {0} in Item: {1},アイテム{1}の{0}には数量単位変換係数が必要です
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +83,Indirect Expenses,間接経費
 apps/erpnext/erpnext/controllers/selling_controller.py +163,Row {0}: Qty is mandatory,行{0}：数量は必須です
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +8,Agriculture,農業
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +611,Your Products or Services,あなたの製品またはサービス
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,農業
+apps/erpnext/erpnext/public/js/setup_wizard.js +347,Your Products or Services,あなたの製品またはサービス
 DocType: Mode of Payment,Mode of Payment,支払方法
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,これは、ルートアイテムグループであり、編集することはできません。
 DocType: Journal Entry Account,Purchase Order,発注
@@ -1135,7 +1095,7 @@
 DocType: Serial No,Serial No Details,シリアル番号詳細
 DocType: Purchase Invoice Item,Item Tax Rate,アイテムごとの税率
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +113,"For {0}, only credit accounts can be linked against another debit entry",{0}には、別の借方エントリに対する貸方勘定のみリンクすることができます
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Delivery Note {0} is not submitted,納品書{0}は提出されていません
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +470,Delivery Note {0} is not submitted,納品書{0}は提出されていません
 apps/erpnext/erpnext/stock/get_item_details.py +136,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.",価格設定ルールは、「適用」フィールドに基づき、アイテム、アイテムグループ、ブランドとすることができます。
@@ -1145,7 +1105,7 @@
 DocType: Appraisal Goal,Goal,目標
 DocType: Sales Invoice Item,Edit Description,説明編集
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +318,Expected Delivery Date is lesser than Planned Start Date.,配送予定日が計画開始日よりも前に指定されています
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +579,For Supplier,サプライヤー用
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +602,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,出費総額
@@ -1171,10 +1131,10 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +74,"Total {0} for all items is zero, may you should change 'Distribute Charges Based On'",全てのアイテムの合計{0}がゼロです。「支払按分参照元」を変更してください
 DocType: Purchase Invoice,Taxes and Charges Calculation,租税公課計算
 DocType: BOM Operation,Workstation,作業所
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +112,Hardware,ハードウェア
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +112,Hardware,ハードウェア
 DocType: Attendance,HR Manager,人事マネージャー
 apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,会社を選択してください
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +50,Privilege Leave,特別休暇
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +50,Privilege Leave,特別休暇
 DocType: Purchase Invoice,Supplier Invoice Date,サプライヤー請求日
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +79,You need to enable Shopping Cart,「ショッピングカート」を有効にしてください
 apps/frappe/frappe/public/js/frappe/form/grid_body.html +6,No Data,データがありません
@@ -1187,7 +1147,7 @@
 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 +168,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/setup/page/setup_wizard/install_fixtures.py +38,Food,食べ物
+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,エイジングレンジ３
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +139,You can make a time log only against a submitted production order,時間ログは提出済の製造指示に対してのみ作成できます
 DocType: Maintenance Schedule Item,No of Visits,訪問なし
@@ -1207,6 +1167,7 @@
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,View Offer Letter,雇用契約書を表示
 DocType: Communication,Communication,コミュニケーション
 DocType: Item,Is Service Item,サービスアイテム
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +81,Application period cannot be outside leave allocation period,受付期間は、外部休暇割当期間にすることはできません
 DocType: Activity Cost,Projects,プロジェクト
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +31,Please select Fiscal Year,会計年度を選択してください
 apps/erpnext/erpnext/controllers/buying_controller.py +23,From {0} | {1} {2},{0}から | {1} {2}
@@ -1225,7 +1186,7 @@
 DocType: Item,Maintain Stock,在庫維持
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +213,Stock Entries already created for Production Order ,製造指示が作成済の在庫エントリー
 DocType: Leave Control Panel,Leave blank if considered for all designations,全ての肩書を対象にする場合は空白のままにします
-apps/erpnext/erpnext/controllers/accounts_controller.py +499,Charge of type 'Actual' in row {0} cannot be included in Item Rate,行{0}の料金タイプ「実費」はアイテムの料金に含めることはできません
+apps/erpnext/erpnext/controllers/accounts_controller.py +500,Charge of type 'Actual' in row {0} cannot be included in Item Rate,行{0}の料金タイプ「実費」はアイテムの料金に含めることはできません
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,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,会社用
@@ -1235,7 +1196,7 @@
 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 +471,cannot be greater than 100,100を超えることはできません
-apps/erpnext/erpnext/stock/doctype/item/item.py +546,Item {0} is not a stock Item,アイテム{0}は在庫アイテムではありません
+apps/erpnext/erpnext/stock/doctype/item/item.py +550,Item {0} is not a stock Item,アイテム{0}は在庫アイテムではありません
 DocType: Maintenance Visit,Unscheduled,スケジュール解除済
 DocType: Employee,Owned,所有済
 DocType: Salary Slip Deduction,Depends on Leave Without Pay,無給休暇に依存
@@ -1249,31 +1210,29 @@
 DocType: HR Settings,Employee Settings,従業員の設定
 ,Batch-Wise Balance History,バッチごとの残高履歴
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +72,To Do List,やることリスト
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +63,Apprentice,見習
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Apprentice,見習
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +99,Negative Quantity is not allowed,マイナスの数量は許可されていません
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
 Used for Taxes and Charges","文字列としてアイテムマスタから取得され、このフィールドに格納されている税詳細テーブル。
 租税公課のために使用されます"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +61,Lancing,切り込み加工
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +151,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 +435,Accounting Entry for {0}: {1} can only be made in currency: {2},{0}の勘定科目では{1}は通貨{2}でのみ作成可能です
+apps/erpnext/erpnext/controllers/accounts_controller.py +436,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 +38,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 +112,Tax Rule for transactions.,取引のための税ルール
 DocType: Rename Tool,Type of document to rename.,名前を変更するドキュメント型
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +630,We buy this Item,このアイテムを購入する
+apps/erpnext/erpnext/public/js/setup_wizard.js +366,We buy this Item,このアイテムを購入する
 DocType: Address,Billing,請求
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +77,Flanging,フランジ加工
 DocType: Bulk Email,Not Sent,送信されていません
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +73,Explosive forming,爆発成形
 DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),租税公課合計（報告通貨）
 DocType: Shipping Rule,Shipping Account,出荷アカウント
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +43,Scheduled to send to {0} recipients,{0}の受信者に送信するようにスケジュールしました
 DocType: Quality Inspection,Readings,報告要素
 DocType: Stock Entry,Total Additional Costs,追加費用合計
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Sub Assemblies,組立部品
+apps/erpnext/erpnext/public/js/setup_wizard.js +359,Sub Assemblies,組立部品
 DocType: Shipping Rule Condition,To Value,値
 DocType: Supplier,Stock Manager,在庫マネージャー
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +143,Source warehouse is mandatory for row {0},行{0}には出庫元が必須です
@@ -1283,45 +1242,43 @@
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,インポートが失敗しました！
 apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,アドレスがまだ追加されていません
 DocType: Workstation Working Hour,Workstation Working Hour,作業所の労働時間
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +83,Analyst,アナリスト
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +202,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},行{0}：割り当て額{1}は仕訳伝票額{2}以下でなければなりません
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Analyst,アナリスト
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +149,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},行{0}：割り当て額{1}は仕訳伝票額{2}以下でなければなりません
 DocType: Item,Inventory,在庫
 DocType: Features Setup,"To enable ""Point of Sale"" view",POS画面を有効にする
 apps/erpnext/erpnext/public/js/pos/pos.js +402,Payment cannot be made for empty cart,空のカートに支払はできません
 DocType: Item,Sales Details,販売明細
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +149,Pinning,ピンニング
 DocType: Opportunity,With Items,関連アイテム
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,数量中
 DocType: Notification Control,Expense Claim Rejected,経費請求が拒否
 DocType: Sales Invoice,"The date on which next invoice will be generated. It is generated on submit.
 ",次の請求書が生成される日付。これは提出時に生成されます。
 DocType: Item Attribute,Item Attribute,アイテム属性
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +105,Government,政府
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Government,政府
 apps/erpnext/erpnext/config/stock.py +268,Item Variants,アイテムバリエーション
 DocType: Company,Services,サービス
 apps/erpnext/erpnext/accounts/report/financial_statements.py +147,Total ({0}),計（{0}）
 DocType: Cost Center,Parent Cost Center,親コストセンター
 DocType: Sales Invoice,Source,ソース
 DocType: Leave Type,Is Leave Without Pay,無給休暇
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +186,No records found in the Payment table,支払テーブルにレコードが見つかりません
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +405,Financial Year Start Date,会計年度の開始日
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +133,No records found in the Payment table,支払テーブルにレコードが見つかりません
+apps/erpnext/erpnext/public/js/setup_wizard.js +153,Financial Year Start Date,会計年度の開始日
 DocType: Employee External Work History,Total Experience,実績合計
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +100,Countersinking,座繰り
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +271,Packing Slip(s) cancelled,梱包伝票（S）をキャンセル
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +276,Packing Slip(s) cancelled,梱包伝票（S）をキャンセル
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,運送・転送料金
 DocType: Material Request Item,Sales Order No,受注番号
 DocType: Item Group,Item Group Name,アイテムグループ名
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +50,Taken,売上高
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,売上高
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +66,Transfer Materials for Manufacture,製造用資材配送
 DocType: Pricing Rule,For Price List,価格表用
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +27,Executive Search,ヘッドハンティング
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,ヘッドハンティング
 apps/erpnext/erpnext/stock/stock_ledger.py +405,"Purchase rate for item: {0} not found, which is required to book accounting entry (expense). Please mention item price against a buying price list.","アイテム{0}の仕入額が見つかりません、会計エントリ（費用）を記帳するために必要とされています。
 仕入価格表に対するアイテム価格を記載してください。"
 DocType: Maintenance Schedule,Schedules,スケジュール
 DocType: Purchase Invoice Item,Net Amount,正味金額
 DocType: Purchase Order Item Supplied,BOM Detail No,部品表詳細番号
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),追加割引額（会社通貨）
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +537,Error: {0} > {1},エラー：{0}> {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +541,Error: {0} > {1},エラー：{0}> {1}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,勘定科目表から新しいアカウントを作成してください
 DocType: Maintenance Visit,Maintenance Visit,メンテナンスのための訪問
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer > Customer Group > Territory,顧客>顧客グループ>地域
@@ -1332,7 +1289,6 @@
 DocType: Event,Tuesday,火曜日
 DocType: Leave Block List,Block Holidays on important days.,年次休暇（記念日休暇）
 ,Accounts Receivable Summary,売掛金概要
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +43,Leaves for type {0} already allocated for Employee {1} for period {2} - {3},すでに期間の従業員{1}のために割り当てられたタイプ{0}のために葉{2}  -  {3}
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +187,Please set User ID field in an Employee record to set Employee Role,従業員の役割を設定するには、従業員レコードのユーザーIDフィールドを設定してください
 DocType: UOM,UOM Name,数量単位名
 DocType: Top Bar Item,Target,ターゲット
@@ -1345,15 +1301,14 @@
 DocType: ToDo,Due Date,期日
 DocType: Sales Invoice Item,Brand Name,ブランド名
 DocType: Purchase Receipt,Transporter Details,輸送業者詳細
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Box,箱
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +389,The Organization,組織
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Box,箱
+apps/erpnext/erpnext/public/js/setup_wizard.js +137,The Organization,組織
 DocType: Monthly Distribution,Monthly Distribution,月次配分
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,受領者リストが空です。受領者リストを作成してください
 DocType: Production Plan Sales Order,Production Plan Sales Order,製造計画受注
 DocType: Sales Partner,Sales Partner Target,販売パートナー目標
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},{0}の勘定科目は通貨{1}でのみ作成可能です
 DocType: Pricing Rule,Pricing Rule,価格設定ルール
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +58,Notching,ノッチング
 apps/erpnext/erpnext/config/learn.py +167,Material Request to Purchase Order,仕入注文のための資材要求
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +74,Row # {0}: Returned Item {1} does not exists in {2} {3},行＃{0}：返品アイテム {1} は {2} {3}に存在しません
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,銀行口座
@@ -1370,20 +1325,19 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Amounts not reflected in bank,銀行に反映されていない金額
 DocType: Quality Inspection Reading,Reading 4,報告要素4
 apps/erpnext/erpnext/config/hr.py +23,Claims for company expense.,会社経費の請求
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +8,Centrifugal casting,遠心鋳造
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +119,Magnetic field-assisted finishing,磁気研磨
 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,連絡先携帯番号
 DocType: Production Planning Tool,Select Sales Orders,受注を選択
 ,Material Requests for which Supplier Quotations are not created,サプライヤー見積が作成されていない資材要求
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +117,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,あなたは休暇を申請された日（複数可）は祝日です。あなたは休暇を申請する必要はありません。
 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/buying/doctype/purchase_order/purchase_order.js +477,Mark as Delivered,配信としてマーク
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +497,Mark as Delivered,配信としてマーク
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +34,Make Quotation,見積を作成
 DocType: Dependent Task,Dependent Task,依存タスク
-apps/erpnext/erpnext/stock/doctype/item/item.py +306,Conversion factor for default Unit of Measure must be 1 in row {0},デフォルト数量単位は、行{0}の1でなければなりません
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,Leave of type {0} cannot be longer than {1},休暇タイプ{0}は、{1}よりも長くすることはできません
+apps/erpnext/erpnext/stock/doctype/item/item.py +310,Conversion factor for default Unit of Measure must be 1 in row {0},デフォルト数量単位は、行{0}の1でなければなりません
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +155,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,受領者リスト
@@ -1391,15 +1345,14 @@
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,消費額
 apps/erpnext/erpnext/public/js/pos/pos.js +491,{0} View,{0}ビュー
 DocType: Salary Structure Deduction,Salary Structure Deduction,給与体系（控除）
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +158,Selective laser sintering,選択的レーザー焼結
-apps/erpnext/erpnext/stock/doctype/item/item.py +301,Unit of Measure {0} has been entered more than once in Conversion Factor Table,数量{0}が変換係数表に複数回記入されました。
+apps/erpnext/erpnext/stock/doctype/item/item.py +305,Unit of Measure {0} has been entered more than once in Conversion Factor Table,数量{0}が変換係数表に複数回記入されました。
 apps/frappe/frappe/core/page/data_import_tool/data_import_tool.js +108,Import Successful!,インポート成功！
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,課題アイテムの費用
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +185,Quantity must not be more than {0},数量は{0}以下でなければなりません
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +41,Age (Days),期間（日）
 DocType: Quotation Item,Quotation Item,見積項目
 DocType: Account,Account Name,アカウント名
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +41,From Date cannot be greater than To Date,開始日は終了日より後にすることはできません
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +34,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.,サプライヤータイプマスター
 DocType: Purchase Order Item,Supplier Part Number,サプライヤー部品番号
@@ -1408,14 +1361,14 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +247,{0} {1} is cancelled or stopped,{0} {1}はキャンセルまたは停止しています
 DocType: Accounts Settings,Credit Controller,与信管理
 DocType: Delivery Note,Vehicle Dispatch Date,配車日
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +197,Purchase Receipt {0} is not submitted,領収書{0}は提出されていません
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +198,Purchase Receipt {0} is not submitted,領収書{0}は提出されていません
 DocType: Company,Default Payable Account,デフォルト買掛金勘定
 apps/erpnext/erpnext/config/website.py +13,"Settings for online shopping cart such as shipping rules, price list etc.",オンラインショッピングカート設定（出荷ルール・価格表など）
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +660,Setup Complete,セットアップ完了
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +124,Setup Complete,セットアップ完了
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +65,{0}% Billed,{0}％支払済
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +17,Reserved Qty,予約数量
 DocType: Party Account,Party Account,当事者アカウント
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +74,Human Resources,人事
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +74,Human Resources,人事
 DocType: Lead,Upper Income,高収益
 DocType: Journal Entry Account,Debit in Company Currency,会社通貨での借方
 apps/erpnext/erpnext/support/doctype/issue/issue.py +58,My Issues,自分の課題
@@ -1424,11 +1377,9 @@
 DocType: Company,Default Values,デフォルト値
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +236,Row {0}: Payment amount can not be negative,行{0}：支払額は負にすることはできません
 DocType: Expense Claim,Total Amount Reimbursed,総払戻額
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +152,Press fitting,圧入
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +64,Against Supplier Invoice {0} dated {1},対サプライヤー請求書{0} 日付{1}
 DocType: Customer,Default Price List,デフォルト価格表
 DocType: Payment Reconciliation,Payments,支払
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +24,Hot isostatic pressing,熱間等静圧圧縮成形
 DocType: ToDo,Medium,普通
 DocType: Budget Detail,Budget Allocated,割当予算
 DocType: Journal Entry,Entry Type,エントリタイプ
@@ -1441,9 +1392,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +56,None of the items have any change in quantity or value.,数量または値に変化のあるアイテムはありません
 DocType: Warranty Claim,Warranty Claim,保証請求
 ,Lead Details,リード詳細
-DocType: Authorization Rule,Approving User,承認ユーザー
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +37,Forging,鍛造
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +126,Plating,メッキ
 DocType: Purchase Invoice,End date of current invoice's period,現在の請求書の期間の終了日
 DocType: Pricing Rule,Applicable For,適用可能なもの
 DocType: Bank Reconciliation,From Date,開始日
@@ -1466,24 +1414,22 @@
 DocType: Sales Invoice,Paid Amount (Company Currency),支払額（会社通貨）
 DocType: Purchase Invoice,Additional Discount,追加割引
 DocType: Selling Settings,Selling Settings,販売設定
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +39,Online Auctions,オンラインオークション
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,オンラインオークション
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +94,Please specify either Quantity or Valuation Rate or both,数量または評価レートのいずれか、または両方を指定してください
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +50,"Company, Month and Fiscal Year is mandatory",会社、月と年度は必須です
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Marketing Expenses,マーケティング費用
 ,Item Shortage Report,アイテム不足レポート
-apps/erpnext/erpnext/stock/doctype/item/item.js +183,"Weight is mentioned,\nPlease mention ""Weight UOM"" too",重量が記載されていますので、あわせて「重量単位」を記載してください
+apps/erpnext/erpnext/stock/doctype/item/item.js +185,"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 +212,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 +384,Warehouse required at Row No {0},行番号{0}には倉庫が必要です
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +386,Warehouse required at Row No {0},行番号{0}には倉庫が必要です
 DocType: Employee,Date Of Retirement,退職日
 DocType: Upload Attendance,Get Template,テンプレートを取得
 DocType: Address,Postal,郵便
 DocType: Item,Weightage,重み付け
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +159,Mining,鉱業
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +17,Resin casting,レジンキャスト
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"同じ名前の顧客グループが存在します
 顧客名か顧客グループのどちらかの名前を変更してください"
 apps/erpnext/erpnext/public/js/pos/pos.js +147,Please select {0} first.,最初の{0}を選択してください
@@ -1491,7 +1437,7 @@
 DocType: Territory,Parent Territory,上位地域
 DocType: Quality Inspection Reading,Reading 2,報告要素2
 DocType: Stock Entry,Material Receipt,資材領収書
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +622,Products,商品
+apps/erpnext/erpnext/public/js/setup_wizard.js +358,Products,商品
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +47,Party Type and Party is required for Receivable / Payable account {0},売掛金／買掛金勘定{0}には当事者タイプと当事者が必要です。
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.",このアイテムにバリエーションがある場合、受注などで選択することができません
 DocType: Lead,Next Contact By,次回連絡
@@ -1501,13 +1447,13 @@
 DocType: Purchase Invoice,Notification Email Address,通知メールアドレス
 DocType: Payment Tool,Find Invoices to Match,一致する請求書を探す
 ,Item-wise Sales Register,アイテムごとの販売登録
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +399,"e.g. ""XYZ National Bank""","例えば ​​""XYZ銀行 """
+apps/erpnext/erpnext/public/js/setup_wizard.js +147,"e.g. ""XYZ National Bank""","例えば ​​""XYZ銀行 """
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,この税金が基本料金に含まれているか
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +57,Total Target,ターゲット合計
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Target,ターゲット合計
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.js +22,Shopping Cart is enabled,ショッピングカートが有効になっています
 DocType: Job Applicant,Applicant for a Job,求職者
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +173,No Production Orders created,製造指示が作成されていません
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +131,Salary Slip of employee {0} already created for this month,この月の従業員{0}の給与明細は作成済です
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +140,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.,カラムが多すぎます。レポートをエクスポートして、スプレッドシートアプリケーションを使用して印刷します。
 DocType: Sales Invoice Item,Batch No,バッチ番号
@@ -1517,14 +1463,14 @@
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +13,Variant,バリエーション
 apps/frappe/frappe/public/js/frappe/form/toolbar.js +165,New {0},新しい{0}
 DocType: Naming Series,Set prefix for numbering series on your transactions,取引に連番の接頭辞を設定
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +169,Stopped order cannot be cancelled. Unstop to cancel.,停止された注文はキャンセルできません。キャンセルするには停止解除してください
-apps/erpnext/erpnext/stock/doctype/item/item.py +323,Default BOM ({0}) must be active for this item or its template,このアイテムまたはテンプレートには、デフォルトの部品表（{0}）がアクティブでなければなりません
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +164,Stopped order cannot be cancelled. Unstop to cancel.,停止された注文はキャンセルできません。キャンセルするには停止解除してください
+apps/erpnext/erpnext/stock/doctype/item/item.py +327,Default BOM ({0}) must be active for this item or its template,このアイテムまたはテンプレートには、デフォルトの部品表（{0}）がアクティブでなければなりません
 DocType: Employee,Leave Encashed?,現金化された休暇？
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,機会元フィールドは必須です
 DocType: Item,Variants,バリエーション
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +458,Make Purchase Order,発注を作成
 DocType: SMS Center,Send To,送信先
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +111,There is not enough leave balance for Leave Type {0},休暇タイプ{0}のための休暇残が足りません
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +127,There is not enough leave balance for Leave Type {0},休暇タイプ{0}のための休暇残が足りません
 DocType: Sales Team,Contribution to Net Total,合計額への貢献
 DocType: Sales Invoice Item,Customer's Item Code,顧客のアイテムコード
 DocType: Stock Reconciliation,Stock Reconciliation,在庫棚卸
@@ -1561,11 +1507,11 @@
 DocType: Sales Order Item,Actual Qty,実際の数量
 DocType: Sales Invoice Item,References,参照
 DocType: Quality Inspection Reading,Reading 10,報告要素10
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +612,"List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start.",あなたが購入または売却する製品やサービスの一覧を表示します。あなたが起動したときに項目グループ、測定およびその他のプロパティの単位を確認してください。
+apps/erpnext/erpnext/public/js/setup_wizard.js +348,"List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start.",あなたが購入または売却する製品やサービスの一覧を表示します。あなたが起動したときに項目グループ、測定およびその他のプロパティの単位を確認してください。
 DocType: Hub Settings,Hub Node,ハブノード
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,同じ商品が重複入力されました。修正してやり直してください
 apps/erpnext/erpnext/controllers/item_variant.py +65,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values,属性 {1} の値 {0} は有効なアイテム属性値リストに存在しません
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +87,Associate,同僚
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Associate,同僚
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +46,Item {0} is not a serialized Item,アイテム{0}にはシリアル番号が付与されていません
 DocType: SMS Center,Create Receiver List,受領者リストを作成
 apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +5,Expired,期限切れ
@@ -1574,7 +1520,7 @@
 DocType: Warranty Claim,Issue Date,課題日
 DocType: Activity Cost,Activity Cost,活動費用
 DocType: Purchase Receipt Item Supplied,Consumed Qty,消費数量
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +52,Telecommunications,通信
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +52,Telecommunications,通信
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),この納品の一部であることを梱包に示します（「下書き」のみ）
 DocType: Payment Tool,Make Payment Entry,支払いエントリを作成
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +119,Quantity for Item {0} must be less than {1},アイテム{0}の数量は{1}より小さくなければなりません
@@ -1591,10 +1537,8 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +37,"Selling must be checked, if Applicable For is selected as {0}",「適用先」に{0}が選択された場合、「販売」にチェックを入れる必要があります
 DocType: Purchase Order Item,Supplier Quotation Item,サプライヤー見積アイテム
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +27,Make Salary Structure,給与体系を作成
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +54,Shearing,シアリング
 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.,新しい売上請求書を作成するために「請求書を作成」ボタンをクリックしてください。
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +166,Packaging and labeling,包装
 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,会社マスタ・共通デフォルト設定で「デフォルト通貨」を指定してください
@@ -1605,19 +1549,18 @@
 DocType: Budget Detail,Fiscal Year,会計年度
 DocType: Cost Center,Budget,予算
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +41,"Budget cannot be assigned against {0}, as it's not an Income or Expense account",それは損益勘定ではないよう予算は、{0}に対して割り当てることができません
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Achieved,達成
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,達成
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +65,Territory / Customer,地域／顧客
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,e.g. 5,例「5」
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +207,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},行{0}：割り当て額 {1} は未払請求額{2}以下である必要があります。
+apps/erpnext/erpnext/public/js/setup_wizard.js +294,e.g. 5,例「5」
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},行{0}：割り当て額 {1} は未払請求額{2}以下である必要があります。
 DocType: Sales Invoice,In Words will be visible once you save the Sales Invoice.,請求書を保存すると表示される表記内。
 DocType: Item,Is Sales Item,販売アイテム
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,アイテムグループツリー
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,アイテム{0}にはシリアル番号が設定されていません。アイテムマスタを確認してください。
 DocType: Maintenance Visit,Maintenance Time,メンテナンス時間
 ,Amount to Deliver,配送額
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +620,A Product or Service,製品またはサービス
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +158,There were errors.,エラーが発生しました。
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +101,Tapping,タップ加工
+apps/erpnext/erpnext/public/js/setup_wizard.js +356,A Product or Service,製品またはサービス
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +146,There were errors.,エラーが発生しました。
 DocType: Naming Series,Current Value,現在の値
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +171,{0} created,{0} 作成
 DocType: Delivery Note Item,Against Sales Order,対受注書
@@ -1631,7 +1574,7 @@
 apps/erpnext/erpnext/accounts/party.py +275,Due Date cannot be before Posting Date,期限日を転記日付より前にすることはできません
 DocType: Website Item Group,Website Item Group,ウェブサイトの項目グループ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Duties and Taxes,関税と税金
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Please enter Reference date,基準日を入力してください
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +312,Please enter Reference date,基準日を入力してください
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} 件の支払いエントリが {1}によってフィルタリングできません
 DocType: Item Website Specification,Table for Item that will be shown in Web Site,Webサイトに表示されたアイテムの表
 DocType: Purchase Order Item Supplied,Supplied Qty,サプライ数量
@@ -1639,7 +1582,7 @@
 apps/erpnext/erpnext/config/stock.py +103,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,アイテムごとの仕入履歴
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +152,Red,レッド
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Red,レッド
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +228,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},アイテム{0}に付加されたシリアル番号を取得するためには「生成スケジュール」をクリックしてください
 DocType: Account,Frozen,凍結
 ,Open Production Orders,製造指示を開く
@@ -1655,7 +1598,7 @@
 DocType: Item Attribute,Attribute Name,属性名
 apps/erpnext/erpnext/controllers/selling_controller.py +236,Item {0} must be Sales or Service Item in {1},アイテム{0}は{1}での販売またはサービスでなければなりません
 DocType: Item Group,Show In Website,ウェブサイトで表示
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +621,Group,グループ
+apps/erpnext/erpnext/public/js/setup_wizard.js +357,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",ブランド名を追跡​​するための次の文書：納品書、機会、資材要求、アイテム、仕入発注、購入伝票、納品書、見積、請求、製品付属品、受注、シリアル番号
@@ -1665,6 +1608,7 @@
 DocType: Features Setup,Brands,ブランド
 DocType: C-Form Invoice Detail,Invoice No,請求番号
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +480,From Purchase Order,参照元発注
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +92,"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,辞表提出日
@@ -1672,35 +1616,31 @@
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +137,Not Set,設定されていません
 DocType: Communication,Date,日付
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,リピート顧客の収益
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +651,Sit tight while your system is being setup. This may take a few moments.,システムがセットアップされている間お待ちください。しばらく時間がかかる場合があります。
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +115,Sit tight while your system is being setup. This may take a few moments.,システムがセットアップされている間お待ちください。しばらく時間がかかる場合があります。
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +51,{0} ({1}) must have role 'Expense Approver',{0}（{1}）は「経費承認者」の権限を持っている必要があります
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Pair,組
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Pair,組
 DocType: Bank Reconciliation Detail,Against Account,アカウントに対して
 DocType: Maintenance Schedule Detail,Actual Date,実際の日付
 DocType: Item,Has Batch No,バッチ番号あり
 DocType: Delivery Note,Excise Page Number,物品税ページ番号
 DocType: Employee,Personal Details,個人情報詳細
 ,Maintenance Schedules,メンテナンス予定
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +44,Embossing,エンボス加工
 ,Quotation Trends,見積傾向
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +139,Item Group not mentioned in item master for item {0},アイテム{0}のアイテムマスターにはアイテムグループが記載されていません
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +302,Debit To account must be a Receivable account,借方計上は売掛金勘定でなければなりません
-apps/erpnext/erpnext/stock/doctype/item/item.py +310,"As Production Order can be made for this item, it must be a stock item.",このアイテムに製造指示を出すには、在庫アイテムでなければなりません。
 DocType: Shipping Rule Condition,Shipping Amount,出荷量
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +140,Joining,入社
-DocType: Authorization Rule,Above Value,値を上回る
 ,Pending Amount,保留中の金額
 DocType: Purchase Invoice Item,Conversion Factor,換算係数
 DocType: Purchase Order,Delivered,納品済
 apps/erpnext/erpnext/config/hr.py +160,Setup incoming server for jobs email id. (e.g. jobs@example.com),ジョブメールを受信するサーバのメールIDをセットアップします。（例 jobs@example.com）
 DocType: Purchase Receipt,Vehicle Number,車両番号
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,繰り返し請求停止予定日
+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,売掛金
 ,Supplier-Wise Sales Analytics,サプライヤーごとのセールス分析
 DocType: Address Template,This format is used if country specific format is not found,国別の書式が無い場合は、この書式が使用されます
 DocType: Custom Field,Custom,カスタム
 DocType: Production Order,Use Multi-Level BOM,マルチレベルの部品表を使用
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +26,Injection molding,射出成形
 DocType: Bank Reconciliation,Include Reconciled Entries,照合済のエントリを含む
 apps/erpnext/erpnext/config/accounts.py +41,Tree of finanial accounts.,財務アカウントのツリー
 DocType: Leave Control Panel,Leave blank if considered for all employee types,全従業員タイプを対象にする場合は空白のままにします
@@ -1710,30 +1650,28 @@
 apps/frappe/frappe/config/setup.py +130,Printing,印刷
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +114,Expense Claim is pending approval. Only the Expense Approver can update status.,経費請求は承認待ちです。経費承認者のみ、ステータスを更新することができます。
 DocType: Purchase Invoice,Additional Discount Amount,追加割引額
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +99,The day(s) on which you are applying for leave are holiday. You need not apply for leave.,休暇を申請している日は休日です。申請の必要はありません。
 apps/frappe/frappe/public/js/frappe/misc/utils.js +110,and,＆
 DocType: Leave Block List Allow,Leave Block List Allow,許可する休暇リスト
 apps/erpnext/erpnext/setup/doctype/company/company.py +236,Abbr can not be blank or space,略称は、空白またはスペースにすることはできません
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +50,Sports,スポーツ
+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/setup/page/setup_wizard/setup_wizard.js +626,Unit,単位
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Unit,単位
 apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.py +182,Please set Dropbox access keys in your site config,サイト設定でDropboxのアクセスキーを設定してください
 apps/erpnext/erpnext/stock/get_item_details.py +113,Please specify Company,会社を指定してください
 ,Customer Acquisition and Loyalty,顧客獲得とロイヤルティ
 DocType: Purchase Receipt,Warehouse where you are maintaining stock of rejected items,返品を保管する倉庫
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +408,Your financial year ends on,会計年度終了日
+apps/erpnext/erpnext/public/js/setup_wizard.js +156,Your financial year ends on,会計年度終了日
 DocType: POS Profile,Price List,価格表
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +20,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0}はデフォルト会計年度です。変更を反映するためにブラウザを更新してください
 apps/erpnext/erpnext/projects/doctype/project/project.js +47,Expense Claims,経費請求
 DocType: Issue,Support,サポート
-DocType: Authorization Rule,Approving Role,承認役割
 ,BOM Search,部品表（BOM）検索
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +176,Closing (Opening + Totals),期末（期首＋合計）
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +26,Please specify currency in Company,会社に通貨を指定してください
 DocType: Workstation,Wages per hour,時間あたり賃金
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},倉庫 {3} のアイテム {2} ではバッチ {0} の在庫残高がマイナス {1} になります
 apps/erpnext/erpnext/config/setup.py +83,"Show / Hide features like Serial Nos, POS etc.",シリアル番号、POSなどの表示/非表示機能
-apps/erpnext/erpnext/controllers/accounts_controller.py +236,Account {0} is invalid. Account Currency must be {1},アカウント{0}は無効です。アカウントの通貨は{1}でなければなりません
+apps/erpnext/erpnext/controllers/accounts_controller.py +237,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}には数量単位変換係数が必要です
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +53,Clearance date cannot be before check date in row {0},決済日付は行{0}の小切手日付より前にすることはできません
 DocType: Salary Slip,Deduction,控除
@@ -1752,13 +1690,13 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +82,Item {0} has already been returned,アイテム{0}はすでに返品されています
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,「会計年度」は、会計年度を表します。すべての会計記帳および他の主要な取引は、「会計年度」に対して記録されます。
 DocType: Opportunity,Customer / Lead Address,顧客／リード住所
+apps/erpnext/erpnext/stock/doctype/item/item.py +112,Warning: Invalid SSL certificate on attachment {0},警告：添付ファイル{0}に無効なSSL証明書
 DocType: Production Order Operation,Actual Operation Time,実作業時間
 DocType: Authorization Rule,Applicable To (User),（ユーザー）に適用
 DocType: Purchase Taxes and Charges,Deduct,差し引く
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +170,Job Description,仕事内容
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +170,Job Description,仕事内容
 DocType: Purchase Order Item,Qty as per Stock UOM,在庫単位ごとの数量
 apps/frappe/frappe/model/rename_doc.py +343,Please select a valid csv file with data,有効なCSVファイルを選択してください
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +92,Coating,コー​​ティング
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +126,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series",「-」「#」「.」「/」以外の記号は、シリーズ名に使用できません
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.",セールスキャンペーンを追跡します。投資収益率を測定するために、キャンペーンから受注、見積、リードなどを追跡します。
 DocType: Expense Claim,Approver,承認者
@@ -1768,12 +1706,11 @@
 DocType: Supplier Quotation,Manufacturing Manager,製造マネージャー
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +191,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/hooks.py +84,Shipments,出荷
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +29,Dip molding,ディップ成形
+apps/erpnext/erpnext/hooks.py +68,Shipments,出荷
 DocType: Purchase Order,To be delivered to customer,顧客に配信します
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,時間ログのステータスが提出されなければなりません
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,シリアル番号は{0}任意の倉庫にも属していません
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +650,Setting Up,セットアップ
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +114,Setting Up,セットアップ
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,Row # ,行＃
 DocType: Purchase Invoice,In Words (Company Currency),文字表記（会社通貨）
 DocType: Pricing Rule,Supplier,サプライヤー
@@ -1781,7 +1718,7 @@
 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 +166,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,在庫に影響するアイテム{0}には、費用または差損益が必須です
-apps/erpnext/erpnext/controllers/accounts_controller.py +354,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings",行{1}のアイテム{0}は{2}以上超過請求することはできません。超過請求を許可するには「在庫設定」で設定してください
+apps/erpnext/erpnext/controllers/accounts_controller.py +355,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings",行{1}のアイテム{0}は{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 +135,User {0} is disabled,ユーザー{0}無効になっています
@@ -1794,27 +1731,26 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,{0} is mandatory for Item {1},{0}はアイテム{1}に必須です
 DocType: Currency Exchange,From Currency,通貨から
 DocType: DocField,Name,名前
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +211,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row",割当額、請求タイプ、請求書番号を少なくとも1つの行から選択してください
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +104,Sales Order required for Item {0},受注に必要な項目{0}
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +158,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row",割当額、請求タイプ、請求書番号を少なくとも1つの行から選択してください
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +107,Sales Order required for Item {0},受注に必要な項目{0}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +43,Amounts not reflected in system,システムに反映されていない金額
 DocType: Purchase Invoice Item,Rate (Company Currency),レート（報告通貨）
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +40,Others,その他
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +40,Others,その他
 apps/erpnext/erpnext/templates/includes/product_page.js +80,Cannot find a matching Item. Please select some other value for {0}.,一致する項目が見つかりません。 {0}のために他の値を選択してください。
 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/frappe/frappe/core/doctype/doctype/boilerplate/controller_list.html +31,Completed,完了
 DocType: Web Form,Select DocType,文書タイプを選択
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +104,Broaching,ブローチ加工
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +12,Banking,銀行業務
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,銀行業務
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +38,Please click on 'Generate Schedule' to get schedule,「スケジュールを生成」をクリックしてスケジュールを取得してください
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +283,New Cost Center,新しいコストセンター
 DocType: Bin,Ordered Quantity,注文数
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +397,"e.g. ""Build tools for builders""",例「ビルダーのためのツール構築」
+apps/erpnext/erpnext/public/js/setup_wizard.js +145,"e.g. ""Build tools for builders""",例「ビルダーのためのツール構築」
 DocType: Quality Inspection,In Process,処理中
 DocType: Authorization Rule,Itemwise Discount,アイテムごとの割引
 DocType: Purchase Order Item,Reference Document Type,リファレンスドキュメントの種類
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +318,{0} against Sales Order {1},受注{1}に対する{0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +320,{0} against Sales Order {1},受注{1}に対する{0}
 DocType: Account,Fixed Asset,固定資産
 apps/erpnext/erpnext/config/stock.py +283,Serialized Inventory,シリアル番号を付与した目録
 DocType: Activity Type,Default Billing Rate,デフォルト請求単価
@@ -1829,14 +1765,13 @@
 DocType: Purchase Invoice Item,Page Break,改ページ
 DocType: Production Order Operation,Pending,保留
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,特定の従業員の休暇申請を承認することができるユーザー
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +33,You cannot change default UOM of Variant. To change default UOM for Variant change default UOM of the Template,バリエーションのデフォルト数量単位（UOM）を変更することはできません。変更する場合、テンプレートのデフォルト数量単位（UOM）を変更します
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +50,Office Equipments,OA機器
 DocType: Purchase Invoice Item,Qty,数量
 DocType: Fiscal Year,Companies,企業
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +24,Electronics,電子機器
+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/support/doctype/maintenance_visit/maintenance_visit.js +18,From Maintenance Schedule,メンテナンス予定から
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +56,Full-time,フルタイム
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +56,Full-time,フルタイム
 DocType: Purchase Invoice,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.",販売租税公課テンプレート内の標準テンプレートを作成した場合、いずれかを選択して、下のボタンをクリックしてください
@@ -1848,11 +1783,12 @@
 DocType: Job Applicant,Job Opening,求人
 DocType: Payment Reconciliation,Payment Reconciliation,支払照合
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +154,Please select Incharge Person's name,担当者名を選択してください
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +51,Technology,技術
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,技術
 DocType: Offer Letter,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,請求額合計
 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.",子ノードを追加するには、ツリーを展開し、増やしたいノードの下をクリックしてください
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +102,Credit To account must be a Payable account,「貸方へ」アカウントは買掛金でなければなりません
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +233,BOM recursion: {0} cannot be parent or child of {2},部品表再帰：{0} {2}の親または子にすることはできません
@@ -1865,10 +1801,8 @@
 DocType: Item,Customer Item Codes,顧客アイテムコード
 DocType: Opportunity,Lost Reason,失われた理由
 apps/erpnext/erpnext/config/accounts.py +68,Create Payment Entries against Orders or Invoices.,注文または請求書に対する支払エントリを作成
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +141,Welding,溶接
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +40,New Stock UOM is required,新しい在庫単位が必要です
 DocType: Quality Inspection,Sample Size,サンプルサイズ
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +443,All items have already been invoiced,全てのアイテムはすでに請求済みです
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +446,All items have already been invoiced,全てのアイテムはすでに請求済みです
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',有効な「参照元ケース番号」を指定してください
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +287,Further cost centers can be made under Groups but entries can be made against non-Groups,コストセンターはさらにグループの下に作成できますが、エントリは非グループに対して対して作成できます
 DocType: Project,External,外部
@@ -1880,8 +1814,7 @@
 DocType: Bin,Actual Quantity,実際の数量
 DocType: Shipping Rule,example: Next Day Shipping,例：翌日発送
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,シリアル番号 {0} は見つかりません
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +563,Your Customers,あなたの顧客
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +27,Compression molding,圧縮成形
+apps/erpnext/erpnext/public/js/setup_wizard.js +303,Your Customers,あなたの顧客
 DocType: Leave Block List Date,Block Date,ブロック日付
 DocType: Sales Order,Not Delivered,未納品
 ,Bank Clearance Summary,銀行決済の概要
@@ -1902,10 +1835,10 @@
 DocType: SMS Log,Sent To,送信先
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +28,Make Sales Invoice,納品書を作成
 DocType: Company,For Reference Only.,参考用
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +29,Invalid {0}: {1},無効な{0}：{1}
+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,キャパシティプランニング
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +49,'From Date' is required,「開始日」が必要です
+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,新しい職場
@@ -1920,7 +1853,7 @@
 DocType: Serial No,Delivery Time,納品時間
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,エイジング基準
 DocType: Item,End of Life,提供終了
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +41,Travel,移動
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +41,Travel,移動
 DocType: Leave Block List,Allow Users,ユーザーを許可
 DocType: Purchase Order,Customer Mobile No,お客様の携帯電話はありません
 DocType: Sales Invoice,Recurring,繰り返し
@@ -1934,7 +1867,7 @@
 DocType: Naming Series,User must always select,ユーザーは常に選択する必要があります
 DocType: Stock Settings,Allow Negative Stock,マイナス在庫を許可
 DocType: Installation Note,Installation Note,設置票
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +541,Add Taxes,税金を追加
+apps/erpnext/erpnext/public/js/setup_wizard.js +283,Add Taxes,税金を追加
 ,Financial Analytics,財務分析
 DocType: Quality Inspection,Verified By,検証者
 DocType: Address,Subsidiary,子会社
@@ -1945,7 +1878,6 @@
 DocType: System Settings,In Hours,時間内
 DocType: Process Payroll,Create Salary Slip,給与伝票を作成する
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Expected balance as per bank,銀行口座ごとの予想残高
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +115,Buffing,バフ研磨加工
 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,従業員
@@ -1962,11 +1894,11 @@
 DocType: Rename Tool,File to Rename,名前を変更するファイル
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +176,Purchse Order number required for Item {0},アイテム{0}には発注番号が必要です
 apps/erpnext/erpnext/public/js/controllers/transaction.js +136,Show Payments,支払いを表示
-apps/erpnext/erpnext/controllers/buying_controller.py +245,Specified BOM {0} does not exist for Item {1},アイテム{1}には、指定した部品表{0}が存在しません
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +202,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,この受注をキャンセルする前に、メンテナンス予定{0}をキャンセルしなければなりません
+apps/erpnext/erpnext/controllers/buying_controller.py +236,Specified BOM {0} does not exist for Item {1},アイテム{1}には、指定した部品表{0}が存在しません
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,この受注をキャンセルする前に、メンテナンス予定{0}をキャンセルしなければなりません
 apps/frappe/frappe/desk/page/backups/backups.html +13,Size,サイズ
 DocType: Notification Control,Expense Claim Approved,経費請求を承認
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +113,Pharmaceutical,医薬品
+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,受注必須
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +30,Create Customer,顧客を作成
@@ -1976,7 +1908,6 @@
 DocType: Quality Inspection Reading,Reading 9,報告要素9
 DocType: Supplier,Is Frozen,凍結
 DocType: Buying Settings,Buying Settings,購入設定
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +122,Mass finishing,バレル研磨
 DocType: Stock Entry Detail,BOM No. for a Finished Good Item,完成品アイテムの部品表番号
 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）
@@ -1984,7 +1915,7 @@
 DocType: Payment Tool,Payment Account,支払勘定
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +713,Please specify Company to proceed,続行する会社を指定してください
 apps/frappe/frappe/public/js/frappe/model/indicator.js +30,Draft,下書き
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +46,Compensatory Off,代償オフ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Compensatory Off,代償オフ
 DocType: Quality Inspection Reading,Accepted,承認済
 DocType: User,Female,女性
 DocType: Journal Entry Account,Debit in Account Currency,アカウントの通貨での借方
@@ -1996,7 +1927,7 @@
 DocType: Shipping Rule,Shipping Rule Label,出荷ルールラベル
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +209,Raw Materials cannot be blank.,原材料は空白にできません。
 DocType: Newsletter,Test,テスト
-apps/erpnext/erpnext/stock/doctype/item/item.py +364,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +368,"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'",このアイテムには在庫取引が存在するため、「シリアル番号あり」「バッチ番号あり」「ストックアイテム」「評価方法」の値を変更することはできません。
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +448,Quick Journal Entry,クイック仕訳
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +92,You can not change rate if BOM mentioned agianst any item,アイテムに対して部品表が記載されている場合は、レートを変更することができません
@@ -2007,13 +1938,14 @@
 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.,各完成品それぞれに独立した製造指示が作成されます。
 DocType: Purchase Invoice,Terms and Conditions1,規約１
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +18,Complete Setup,完全セットアップ
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard_page.html +18,Complete Setup,完全セットアップ
 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),数に小数を許可しない場合チェック
 apps/erpnext/erpnext/config/crm.py +96,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 +57,Total Absent,欠席計
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +746,Item or Warehouse for row {0} does not match Material Request,行{0}のアイテムまたは倉庫が資材要求と一致していません
@@ -2038,16 +1970,15 @@
 DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),基本単価（在庫数量単位ごと）
 DocType: SMS Log,No of Requested SMS,要求されたSMSの数
 DocType: Campaign,Campaign-.####,キャンペーン。＃＃＃＃
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +55,Piercing,ピアシング
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,次のステップ
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +117,Contract End Date must be greater than Date of Joining,契約終了日は、入社日よりも大きくなければなりません
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,コミッションのための企業の製品を販売している第三者の代理店/ディーラー/コミッションエージェント/アフィリエイト/リセラー。
 DocType: Customer Group,Has Child Node,子ノードあり
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{0} against Purchase Order {1},発注{1}に対する{0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +332,{0} against Purchase Order {1},発注{1}に対する{0}
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","静的なURLパラメータを入力してください（例：sender=ERPNext, username=ERPNext, password=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/page/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,エイジングレンジ１
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +110,Photochemical machining,光化学加工
 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.
 
 #### Note
@@ -2100,7 +2031,7 @@
 DocType: Purchase Receipt Item,Recd Quantity,受領数量
 DocType: Email Account,Email Ids,メールアドレス
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},受注数{1}より多くのアイテム{0}を製造することはできません
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +471,Stock Entry {0} is not submitted,在庫エントリ{0}は提出されていません
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +473,Stock Entry {0} is not submitted,在庫エントリ{0}は提出されていません
 DocType: Payment Reconciliation,Bank / Cash Account,銀行/現金勘定
 DocType: Tax Rule,Billing City,請求先の市
 DocType: Global Defaults,Hide Currency Symbol,通貨記号を非表示にする
@@ -2116,7 +2047,7 @@
 DocType: Purchase Invoice,Currency and Price List,通貨と価格表
 DocType: Opportunity,Customer / Lead Name,顧客／リード名
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +63,Clearance Date not mentioned,決済日が記入されていません
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +71,Production,製造
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Production,製造
 DocType: Item,Allow Production Order,製造指示を許可
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +60,Row {0}:Start Date must be before End Date,行{0}：開始日は終了日より前でなければなりません
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),合計（量）
@@ -2129,7 +2060,7 @@
 apps/erpnext/erpnext/utilities/doctype/address/address.py +113,My Addresses,自分の住所
 DocType: Stock Ledger Entry,Outgoing Rate,出庫率
 apps/erpnext/erpnext/config/hr.py +100,Organization branch master.,組織支部マスター。
-apps/erpnext/erpnext/controllers/accounts_controller.py +237, or ,または
+apps/erpnext/erpnext/controllers/accounts_controller.py +238, 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以上
@@ -2156,6 +2087,7 @@
 DocType: Stock Entry Detail,Serial No / Batch,シリアル番号／バッチ
 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 +213,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',メンテナンススケジュールが全てのアイテムに生成されていません。「スケジュールを生成」をクリックしてください
 ,To Produce,製造
 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",{1}の行{0}では、アイテム単価に{2}を含める場合、行{3}も含まれている必要があります
@@ -2163,10 +2095,7 @@
 DocType: Bin,Reserved Quantity,予約数量
 DocType: Landed Cost Voucher,Purchase Receipt Items,領収書アイテム
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,フォームのカスタマイズ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +62,Cutting,切断
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +69,Flattening,平面加工
 DocType: Account,Income Account,収益勘定
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +22,Molding,鋳造
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +632,Delivery,配送
 DocType: Stock Reconciliation Item,Current Qty,現在の数量
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",原価計算セクションの「資材単価基準」を参照してください。
@@ -2176,19 +2105,18 @@
 apps/frappe/frappe/desk/moduleview.py +61,Documents,文書
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +17,Ref,参照
 DocType: Cost Center,Cost Center,コストセンター
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.js +48,Voucher #,伝票番号
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +36,Voucher #,伝票番号
 DocType: Notification Control,Purchase Order Message,発注メッセージ
 DocType: Tax Rule,Shipping Country,出荷先の国
 DocType: Upload Attendance,Upload HTML,HTMLアップロード
-apps/erpnext/erpnext/controllers/accounts_controller.py +391,"Total advance ({0}) against Order {1} cannot be greater \
+apps/erpnext/erpnext/controllers/accounts_controller.py +392,"Total advance ({0}) against Order {1} cannot be greater \
 				than the Grand Total ({2})",注文{1}に対する前受金計（{0}）は総計（{2}）より大きくすることはできません
 DocType: Employee,Relieving Date,退職日
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +12,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.",価格設定ルールは、価格表を上書きし、いくつかの基準に基づいて値引きの割合を定義します
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,倉庫は在庫エントリー/納品書/領収書を介してのみ変更可能です
 DocType: Employee Education,Class / Percentage,クラス/パーセンテージ
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +92,Head of Marketing and Sales,マーケティングおよび販売部長
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +31,Income Tax,所得税
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +157,Laser engineered net shaping,LENS
+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.,業種によってリードを追跡
 DocType: Item Supplier,Item Supplier,アイテムサプライヤー
@@ -2211,31 +2139,28 @@
 DocType: Stock Ledger Entry,Actual Qty After Transaction,トランザクションの後、実際の数量
 ,Pending SO Items For Purchase Request,仕入要求のため保留中の受注アイテム
 DocType: Supplier,Billing Currency,請求通貨
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +148,Extra Large,XL
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,Extra Large,XL
 ,Profit and Loss Statement,損益計算書
 DocType: Bank Reconciliation Detail,Cheque Number,小切手番号
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +43,Pressing,プレス
 DocType: Payment Tool Detail,Payment Tool Detail,支払ツールの詳細
 ,Sales Browser,販売ブラウザ
 DocType: Journal Entry,Total Credit,貸方合計
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +474,Warning: Another {0} # {1} exists against stock entry {2},警告：別の{0}＃{1}が在庫エントリ{2}に対して存在します
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +459,Local,現地
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +476,Warning: Another {0} # {1} exists against stock entry {2},警告：別の{0}＃{1}が在庫エントリ{2}に対して存在します
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +397,Local,現地
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),ローンと貸付金（資産）
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,債務者
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +147,Large,L
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +23,No employee found!,従業員が見つかりません！
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Large,L
 DocType: C-Form Invoice Detail,Territory,地域
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,必要な訪問の数を記述してください
 DocType: Purchase Order,Customer Address Display,顧客の住所の表示
 DocType: Stock Settings,Default Valuation Method,デフォルト評価方法
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +127,Polishing,研磨
 DocType: Production Order Operation,Planned Start Time,計画開始時間
 apps/erpnext/erpnext/config/accounts.py +63,Close Balance Sheet and book Profit or Loss.,貸借対照表を閉じて損益を記帳
-apps/erpnext/erpnext/stock/doctype/item/item.py +661,"Default Unit of Measure for Item {0} cannot be changed directly because \
+apps/erpnext/erpnext/stock/doctype/item/item.py +665,"Default Unit of Measure for Item {0} cannot be changed directly because \
 			you have already made some transaction(s) with another UOM. To change default UOM, \
 			use 'UOM Replace Utility' tool under Stock module.",アイテム {0} のデフォルト数量単位（UOM）は、別の数量単位が取引内で使用されているため、直接変更することはできません。デフォルト数量単位を変更するには、在庫モジュール内の「数量単位置換ユーティリティ」ツールを使用してください。
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,別通貨に変換するための為替レートを指定
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +146,Quotation {0} is cancelled,見積{0}はキャンセルされました
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +141,Quotation {0} is cancelled,見積{0}はキャンセルされました
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,残高合計
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} was on leave on {1}. Cannot mark attendance.,従業員は{0} {1}に休暇中でした。出勤とすることはできません。
 DocType: Sales Partner,Targets,ターゲット
@@ -2246,7 +2171,6 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +158,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,コンピュータ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +112,Electro-chemical grinding,電解研削
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +14,This is a root customer group and cannot be edited.,ルート（大元の）顧客グループなので編集できません
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +39,Please setup your chart of accounts before you start Accounting Entries,会計エントリーを開始する前に、勘定科目を設定してください
 DocType: Purchase Invoice,Ignore Pricing Rule,価格設定ルールを無視
@@ -2303,7 +2227,6 @@
 DocType: Maintenance Visit,Purposes,目的
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +103,Atleast one item should be entered with negative quantity in return document,還付書内では、少なくとも1つの項目がマイナスで入力されていなければなりません
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +67,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations",操作{0}は、ワークステーション{1}で使用可能な作業時間よりも長いため、複数の操作に分解してください
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +134,Electrochemical machining,電解加工
 ,Requested,要求済
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +66,No Remarks,備考がありません
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +13,Overdue,期限超過
@@ -2312,7 +2235,7 @@
 DocType: Monthly Distribution,Distribution Name,配布名
 DocType: Features Setup,Sales and Purchase,販売と仕入
 DocType: Supplier Quotation Item,Material Request No,資材要求番号
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +218,Quality Inspection required for Item {0},アイテム{0}に必要な品質検査
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +221,Quality Inspection required for Item {0},アイテム{0}に必要な品質検査
 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),正味単価（会社通貨）
@@ -2330,9 +2253,8 @@
 apps/erpnext/erpnext/accounts/report/financial_statements.py +16,Fiscal Year {0} not found.,会計年度{0}が見つかりません
 DocType: Bank Reconciliation,Get Relevant Entries,関連するエントリを取得
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +407,Accounting Entry for Stock,在庫の会計エントリー
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +64,Coining,コイニング
 DocType: Sales Invoice,Sales Team1,販売チーム1
-apps/erpnext/erpnext/stock/doctype/item/item.py +412,Item {0} does not exist,アイテム{0}は存在しません
+apps/erpnext/erpnext/stock/doctype/item/item.py +416,Item {0} does not exist,アイテム{0}は存在しません
 DocType: Sales Invoice,Customer Address,顧客の住所
 apps/frappe/frappe/desk/query_report.py +136,Total,計
 DocType: Purchase Invoice,Apply Additional Discount On,追加割引に適用
@@ -2344,14 +2266,13 @@
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),割引後税額（会社通貨）
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +149,Target warehouse is mandatory for row {0},{0}行にターゲット倉庫が必須です。
 DocType: Quality Inspection,Quality Inspection,品質検査
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +144,Extra Small,XS
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +20,Spray forming,溶射成形
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Extra Small,XS
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +458,Warning: Material Requested Qty is less than Minimum Order Qty,警告：資材要求数が注文最小数を下回っています。
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +191,Account {0} is frozen,アカウント{0}は凍結されています
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,組織内で別々の勘定科目を持つ法人／子会社
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +29,"Food, Beverage & Tobacco",食品、飲料＆タバコ
+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 +529,Can only make payment against unbilled {0},唯一の未請求{0}に対して支払いを行うことができます
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +531,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/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Minimum Inventory Level,最小在庫レベル
 DocType: Stock Entry,Subcontract,下請
@@ -2362,19 +2283,18 @@
 DocType: Item,Manufacturer Part Number,メーカー品番
 DocType: Production Order Operation,Estimated Time and Cost,推定所要時間と費用
 DocType: Bin,Bin,保管場所
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +50,Nosing,ノージング
 DocType: SMS Log,No of Sent SMS,送信されたSMSの数
 DocType: Account,Company,会社
 DocType: Account,Expense Account,経費科目
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +49,Software,ソフトウェア
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +151,Colour,カラー
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +49,Software,ソフトウェア
+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",「在庫アイテム」が「いいえ」であり「販売アイテム」が「はい」であり他の製品付属品が無いアイテムを選択してください。
 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 +281,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 +134,Employee {0} has already applied for {1} between {2} and {3},従業員{0}は{2} と{3}の間の{1}を既に申請しています
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +145,Employee {0} has already applied for {1} between {2} and {3},従業員{0}は{2} と{3}の間の{1}を既に申請しています
 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,ログ名称変更
@@ -2384,7 +2304,7 @@
 apps/erpnext/erpnext/controllers/recurring_document.py +162,Please select {0},{0}を選択してください
 DocType: C-Form,C-Form No,C-フォームはありません
 DocType: BOM,Exploded_items,Exploded_items
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +95,Researcher,リサーチャー
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Researcher,リサーチャー
 apps/frappe/frappe/custom/doctype/customize_form/customize_form.js +88,Update,更新
 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 +23,Name or Email is mandatory,名前またはメールアドレスが必須です
@@ -2393,11 +2313,10 @@
 DocType: Employee,Exit,終了
 apps/erpnext/erpnext/accounts/doctype/account/account.py +134,Root Type is mandatory,ルートタイプが必須です
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +295,Serial No {0} created,シリアル番号 {0}を作成しました
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +125,Vibratory finishing,振動仕上げ
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes",これらのコードは、顧客の便宜のために、請求書および納品書等の印刷形式で使用することができます
 DocType: Employee,You can enter any date manually,手動で日付を入力することができます
 DocType: Sales Invoice,Advertisement,広告宣伝
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +165,Probationary Period,試用期間
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Probationary Period,試用期間
 DocType: Customer Group,Only leaf nodes are allowed in transaction,取引にはリーフノードのみ許可されています
 DocType: Expense Claim,Expense Approver,経費承認者
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,領収書アイテム供給済
@@ -2405,19 +2324,16 @@
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +17,To Datetime,終了日時
 DocType: SMS Settings,SMS Gateway URL,SMSゲートウェイURL
 apps/erpnext/erpnext/config/crm.py +53,Logs for maintaining sms delivery status,SMSの配信状態を維持管理するためのログ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +137,Grinding,研削
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +34,Shrink wrapping,シュリンクラップ
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +36,Pending Activities,保留中の活動
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,Confirmed,確認済
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier > Supplier Type,サプライヤー>サプライヤータイプ
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +127,Please enter relieving date.,退職日を入力してください。
 apps/erpnext/erpnext/controllers/trends.py +137,Amt,量／額
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' can be submitted,ステータスを「承認」とした休暇申請のみ提出可能です
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +51,Only Leave Applications with status 'Approved' can be submitted,ステータスを「承認」とした休暇申請のみ提出可能です
 apps/erpnext/erpnext/utilities/doctype/address/address.py +21,Address Title is mandatory.,住所タイトルは必須です。
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,問い合わせの内容がキャンペーンの場合は、キャンペーンの名前を入力してください
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +38,Newspaper Publishers,新聞社
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +38,Newspaper Publishers,新聞社
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,会計年度を選択
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +88,Smelting,精錬
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,再注文レベル
 DocType: Attendance,Attendance Date,出勤日
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,給与の支給と控除
@@ -2432,16 +2348,15 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +414,[Error],[エラー]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,受注を保存すると表示される表記内。
 ,Employee Birthday,従業員の誕生日
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +55,Venture Capital,ベンチャーキャピタル
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,ベンチャーキャピタル
 DocType: UOM,Must be Whole Number,整数でなければなりません
 DocType: Leave Control Panel,New Leaves Allocated (In Days),新しい有給休暇（日数）
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +51,Serial No {0} does not exist,シリアル番号 {0}は存在しません
 DocType: Pricing Rule,Discount Percentage,割引率
 DocType: Payment Reconciliation Invoice,Invoice Number,請求番号
-apps/erpnext/erpnext/hooks.py +70,Orders,注文
+apps/erpnext/erpnext/hooks.py +54,Orders,注文
 DocType: Leave Control Panel,Employee Type,従業員タイプ
 DocType: Employee Leave Approver,Leave Approver,休暇承認者
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +70,Swaging,スウェージング加工
 DocType: Manufacturing Settings,Material Transferred for Manufacture,製造用移送資材
 DocType: Expense Claim,"A user with ""Expense Approver"" role",「経費承認者」の役割を持つユーザー
 ,Issued Items Against Production Order,製造指示に対して発行されたアイテム
@@ -2453,7 +2368,6 @@
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +62,Cost Center with existing transactions can not be converted to group,既存の取引があるコストセンターは、グループに変換することはできません
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Depreciation,減価償却
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),サプライヤー
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +29,Invalid period,無効期間
 DocType: Customer,Credit Limit,与信限度
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,取引タイプを選択
 DocType: GL Entry,Voucher No,伝票番号
@@ -2463,9 +2377,9 @@
 DocType: Customer,Address and Contact,住所・連絡先
 DocType: Customer,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}
 apps/erpnext/erpnext/accounts/party.py +284,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),注：支払期限／基準日の超過は顧客の信用日数{0}日間許容されます
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +621,Maint. Schedule,メンテナンススケジュール
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +108,Abrasive jet machining,アブレイシブジェット加工
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +632,Maint. Schedule,メンテナンススケジュール
 DocType: Stock Settings,Freeze Stock Entries,凍結在庫エントリー
 DocType: Website Settings,Website Settings,Webサイト設定
 DocType: Item,Reorder level based on Warehouse,倉庫ごとの再注文レベル
@@ -2482,7 +2396,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +75,Show Stock Entries,在庫エントリー表示
 ,Is Primary Address,プライマリアドレス
 DocType: Production Order,Work-in-Progress Warehouse,作業中の倉庫
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +308,Reference #{0} dated {1},参照＃{0} 日付{1}　
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Reference #{0} dated {1},参照＃{0} 日付{1}　
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +13,Manage Addresses,住所管理
 DocType: Pricing Rule,Item Code,アイテムコード
 DocType: Production Planning Tool,Create Production Orders,製造指示を作成
@@ -2491,7 +2405,7 @@
 DocType: Lead,Market Segment,市場区分
 DocType: Communication,Phone,電話
 DocType: Employee Internal Work History,Employee Internal Work History,従業員の入社後の職歴
-apps/erpnext/erpnext/public/js/account_tree_grid.js +50,Closing (Dr),（借方）を閉じる
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +221,Closing (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.,販売取引用の税のテンプレート
@@ -2507,8 +2421,8 @@
 ,Billed Amount,請求金額
 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 +129,Material Request {0} is cancelled or stopped,資材要求{0}はキャンセルまたは停止されています
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +641,Add a few sample records,いくつかのサンプルレコードを追加
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +133,Material Request {0} is cancelled or stopped,資材要求{0}はキャンセルまたは停止されています
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Add a few sample records,いくつかのサンプルレコードを追加
 apps/erpnext/erpnext/config/hr.py +210,Leave Management,休暇管理
 DocType: Event,Groups,グループ
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,勘定によるグループ
@@ -2521,38 +2435,34 @@
 DocType: Features Setup,Sales Extras,試供
 apps/erpnext/erpnext/accounts/utils.py +344,{0} budget for Account {1} against Cost Center {2} will exceed by {3},コストセンター{2}に対するアカウント{1}の予算{0}が {3}により超えてしまいます
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +236,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry",この在庫棚卸が繰越エントリであるため、差異勘定は資産／負債タイプのアカウントである必要があります
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +138,Purchase Order number required for Item {0},アイテム{0}には発注番号が必要です
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Order number required for Item {0},アイテム{0}には発注番号が必要です
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',「終了日」は「開始日」の後にしてください。
 ,Stock Projected Qty,予測在庫数
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +147,Customer {0} does not belong to project {1},顧客{0}はプロジェクト{1}に属していません
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +150,Customer {0} does not belong to project {1},顧客{0}はプロジェクト{1}に属していません
 DocType: Sales Order,Customer's Purchase Order,顧客の購入注文
 DocType: Warranty Claim,From Company,会社から
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,値または数量
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Minute,分
+apps/erpnext/erpnext/public/js/setup_wizard.js +363,Minute,分
 DocType: Purchase Invoice,Purchase Taxes and Charges,購入租税公課
 ,Qty to Receive,受領数
 DocType: Leave Block List,Leave Block List Allowed,許可済休暇リスト
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +61,Conversion factor cannot be in fractions,換算係数は分数にすることができません
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +358,You will use it to Login,ログインに使用します
+apps/erpnext/erpnext/public/js/setup_wizard.js +108,You will use it to Login,ログインに使用します
 DocType: Sales Partner,Retailer,小売業者
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +99,Credit To account must be a Balance Sheet account,貸方アカウントは貸借対照表アカウントである必要があります
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,全てのサプライヤータイプ
 apps/erpnext/erpnext/stock/doctype/item/item.py +37,Item Code is mandatory because Item is not automatically numbered,アイテムは自動的に採番されていないため、アイテムコードが必須です
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +99,Quotation {0} not of type {1},見積{0}はタイプ{1}ではありません
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +93,Quotation {0} not of type {1},見積{0}はタイプ{1}ではありません
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,メンテナンス予定アイテム
 DocType: Sales Order,%  Delivered,％納品済
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,Bank Overdraft Account,銀行当座貸越口座
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +15,Make Salary Slip,給与伝票を作成
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +18,Browse BOM,部品表（BOM）を表示
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +175,Secured Loans,担保ローン
-apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +3,Awesome Products,素晴らしい製品
+apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +3,Awesome Products,素晴らしい製品
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +189,Opening Balance Equity,開始残高 資本
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +80,Cannot approve leave as you are not authorized to approve leaves on Block Dates,該当期間の休暇申請を承認する権限がありません
 DocType: Appraisal,Appraisal,査定
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +13,Lost-foam casting,ロストフォーム鋳造
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +47,Drawing,図
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +22,Date is repeated,日付が繰り返されます
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +148,Leave approver must be one of {0},休暇承認者は{0}のいずれかである必要があります
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +162,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,開始時間
@@ -2566,7 +2476,7 @@
 DocType: Purchase Invoice Item,Net Amount (Company Currency),正味金額（会社通貨）
 DocType: BOM Operation,Hour Rate,時給
 DocType: Stock Settings,Item Naming By,アイテム命名
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +642,From Quotation,見積から
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +655,From Quotation,見積から
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},別の期間の決算仕訳 {0} が {1} の後に作成されています
 DocType: Production Order,Material Transferred for Manufacturing,製造用移設資材
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +29,Account {0} does not exists,アカウント{0}が存在しません
@@ -2580,21 +2490,19 @@
 DocType: Purchase Invoice Item,PR Detail,PR詳細
 DocType: Sales Order,Fully Billed,全て記帳済
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +20,Cash In Hand,手持ちの現金
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +72,Delivery warehouse required for stock item {0},在庫アイテム{0}には配送倉庫が必要です
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +119,Delivery warehouse required for stock item {0},在庫アイテム{0}には配送倉庫が必要です
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),梱包の総重量は通常、正味重量＋梱包材重量です （印刷用）
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,この役割を持つユーザーは、口座の凍結と、凍結口座に対しての会計エントリーの作成/修正が許可されています
 DocType: Serial No,Is Cancelled,キャンセル済
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +281,My Shipments,自分の出荷
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +286,My Shipments,自分の出荷
 DocType: Journal Entry,Bill Date,ビル日
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +43,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:",最高優先度を持つ複数の価格設定ルールがあった場合でも、次の内部優先順位が適用されます
 DocType: Supplier,Supplier Details,サプライヤー詳細
 DocType: Communication,Recipients,受信者
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +146,Screwing,ねじ切り
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +96,Knurling,ローレット加工
 DocType: Expense Claim,Approval Status,承認ステータス
 DocType: Hub Settings,Publish Items to Hub,ハブにアイテムを公開
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +44,From value must be less than to value in row {0},行{0}の値以下の値でなければなりません
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +133,Wire Transfer,電信振込
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +133,Wire Transfer,電信振込
 apps/erpnext/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py +25,Please select Bank Account,銀行口座を選択してください
 DocType: Newsletter,Create and Send Newsletters,ニュースレターの作成・送信
 apps/frappe/frappe/public/js/frappe/views/reports/grid_report.js +305,From Date must be before To Date,開始日は終了日より前でなければなりません
@@ -2602,14 +2510,14 @@
 DocType: Company,Default Income Account,デフォルト損益勘定
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,顧客グループ／顧客
 DocType: Item Group,Check this if you want to show in website,ウェブサイトに表示したい場合チェック
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +190,Welcome to ERPNext,ERPNextへようこそ
+,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/page/setup_wizard/install_fixtures.py +37,Calls,電話
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Calls,電話
 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 +193,Purchase Order {0} is not submitted,発注{0}は提出されていません
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +194,Purchase Order {0} is not submitted,発注{0}は提出されていません
 ,Projected,予想
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},倉庫 {1} に存在しないシリアル番号 {0}
 apps/erpnext/erpnext/controllers/status_updater.py +136,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,注：アイテム{0}の数量が0であるため、システムは超過納品や超過注文をチェックしません。
@@ -2617,7 +2525,6 @@
 DocType: Issue,Opening Date,日付を開く
 DocType: Journal Entry,Remark,備考
 DocType: Purchase Receipt Item,Rate and Amount,割合と量
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +95,Boring,ボーリング加工
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +667,From Sales Order,受注から
 DocType: Blog Category,Parent Website Route,親サイトルート
 DocType: Sales Order,Not Billed,未記帳
@@ -2631,19 +2538,17 @@
 apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount Amount,割引額
 DocType: Purchase Invoice,Return Against Purchase Invoice,仕入請求書に対する返品
 DocType: Item,Warranty Period (in days),保証期間（日数）
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +550,e.g. VAT,例「付加価値税（VAT）」
+apps/erpnext/erpnext/public/js/setup_wizard.js +292,e.g. VAT,例「付加価値税（VAT）」
 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,見積シリーズ
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +52,"An item exists with same name ({0}), please change the item group name or rename the item",同名のアイテム（{0}）が存在しますので、アイテムグループ名を変えるか、アイテム名を変更してください
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +82,Hot metal gas forming,熱間ガスフォーミング
 DocType: Sales Order Item,Sales Order Date,受注日
 DocType: Sales Invoice Item,Delivered Qty,納品済数量
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +63,Warehouse {0}: Company is mandatory,倉庫{0}：当社は必須です
 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.",適切なグループ（通常は資金源＞流動負債＞租税公課）に移動し、新しい「税」アカウント（クリックして子要素を追加します）を作成して、税率を記載してください。
 ,Payment Period Based On Invoice Date,請求書の日付に基づく支払期間
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +50,Missing Currency Exchange Rates for {0},{0}用の為替レートがありません
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +135,Laser cutting,レーザー切断
 DocType: Event,Monday,月曜日
 DocType: Journal Entry,Stock Entry,在庫エントリー
 DocType: Account,Payable,買掛
@@ -2676,7 +2581,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +111,Date Of Retirement must be greater than Date of Joining,退職日は入社日より後でなければなりません
 DocType: Sales Invoice,Against Income Account,対損益勘定
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +69,{0}% Delivered,{0}％配送済
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +78,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,アイテム{0}：発注数量{1}は最小注文数量{2}（アイテム内で定義）より小さくすることはできません
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,アイテム{0}：発注数量{1}は最小注文数量{2}（アイテム内で定義）より小さくすることはできません
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,月次配分割合
 DocType: Territory,Territory Targets,ターゲット地域
 DocType: Delivery Note,Transporter Info,輸送情報
@@ -2685,7 +2590,6 @@
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,印刷テンプレートのタイトル（例：「見積送り状」）
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +140,Valuation type charges can not marked as Inclusive,評価タイプの請求は「包括的」にマークすることはえきません
 DocType: POS Profile,Update Stock,在庫更新
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +128,Superfinishing,超仕上げ
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,アイテムごとに数量単位が異なると、（合計）正味重量値が正しくなりません。各アイテムの正味重量が同じ単位になっていることを確認してください。
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,部品表通貨レート
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +85,Please pull items from Delivery Note,納品書からアイテムを抽出してください
@@ -2700,7 +2604,6 @@
 ,Purchase Analytics,仕入分析
 DocType: Sales Invoice Item,Delivery Note Item,納品書アイテム
 DocType: Expense Claim,Task,タスク
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +57,Shaving,シェービング
 DocType: Purchase Taxes and Charges,Reference Row #,参照行＃
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},項目{0}にバッチ番号が必須です
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js +14,This is a root sales person and cannot be edited.,ルート（大元の）営業担当者なので編集できません
@@ -2712,13 +2615,11 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +74,Purpose must be one of {0},目的は、{0}のいずれかである必要があります
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +108,Fill the form and save it,フォームに入力して保存します
 DocType: Production Planning Tool,Download a report containing all raw materials with their latest inventory status,最新の在庫状況とのすべての原材料を含むレポートをダウンロード
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +94,Facing,フェーシング加工
 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,SMSを送信
 DocType: Company,Default Letter Head,デフォルトレターヘッド
 DocType: Time Log,Billable,請求可能
-DocType: Authorization Rule,This will be used for setting rule in HR module,人事モジュールで規則を設定するために使用されます
 DocType: Account,Rate at which this tax is applied,この税金が適用されるレート
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reorder Qty,再注文数量
 DocType: Company,Stock Adjustment Account,在庫調整勘定
@@ -2745,16 +2646,15 @@
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,割合の割り当ては100パーセントに等しくなければなりません
 DocType: Serial No,Out of AMC,年間保守契約外
 DocType: Purchase Order Item,Material Request Detail No,資材要求の詳細番号
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +97,Hard turning,高硬度鋼旋削加工
 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 +79,Company (not Customer or Supplier) master.,会社（顧客・サプライヤーではない）のマスター
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +106,Please enter 'Expected Delivery Date',「納品予定日」を入力してください
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +187,Delivery Notes {0} must be cancelled before cancelling this Sales Order,この受注をキャンセルする前に、納品書{0}をキャンセルしなければなりません
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +100,Please enter 'Expected Delivery Date',「納品予定日」を入力してください
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +182,Delivery Notes {0} must be cancelled before cancelling this Sales Order,この受注をキャンセルする前に、納品書{0}をキャンセルしなければなりません
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +373,Paid amount + Write Off Amount can not be greater than Grand Total,支払額＋償却額は総計を超えることはできません
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0}はアイテム{1}に対して有効なバッチ番号ではありません
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,Note: There is not enough leave balance for Leave Type {0},注：休暇タイプ{0}のための休暇残高が足りません
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +124,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,機会タイプ
@@ -2766,7 +2666,7 @@
 DocType: Hub Settings,Publish Availability,公開可用性
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +105,Date of Birth cannot be greater than today.,生年月日は今日より後にすることはできません
 ,Stock Ageing,在庫エイジング
-apps/erpnext/erpnext/controllers/accounts_controller.py +200,{0} '{1}' is disabled,{0} '{1}'は無効になっています
+apps/erpnext/erpnext/controllers/accounts_controller.py +201,{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.,取引を処理した時に連絡先に自動メールを送信
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +232,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
@@ -2775,44 +2675,38 @@
 DocType: Purchase Order,Customer Contact Email,お客様の連絡先メールアドレス
 DocType: Event,Sunday,日曜日
 DocType: Sales Team,Contribution (%),寄与度（％）
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +455,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,注：「現金または銀行口座」が指定されていないため、支払エントリが作成されません
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +171,Responsibilities,責任
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +457,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 +11,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,表に少なくとも1件の請求書を入力してください
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +511,Add Users,ユーザー追加
+apps/erpnext/erpnext/public/js/setup_wizard.js +255,Add Users,ユーザー追加
 DocType: Pricing Rule,Item Group,アイテムグループ
 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),租税公課が追加されました。（報告通貨）
-apps/erpnext/erpnext/stock/doctype/item/item.py +340,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,アイテムごとの税の行{0}では、勘定タイプ「税」「収入」「経費」「支払」のいずれかが必要です
+apps/erpnext/erpnext/stock/doctype/item/item.py +344,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,アイテムごとの税の行{0}では、勘定タイプ「税」「収入」「経費」「支払」のいずれかが必要です
 DocType: Sales Order,Partly Billed,一部支払済
 DocType: Item,Default BOM,デフォルト部品表
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +79,Decambering,Decambering
 apps/erpnext/erpnext/setup/doctype/company/company.js +22,Please re-type company name to confirm,確認のため会社名を再入力してください
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,残高合計
 DocType: Time Log Batch,Total Hours,時間合計
 DocType: Journal Entry,Printing Settings,印刷設定
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +268,Total Debit must be equal to Total Credit. The difference is {0},借方合計は貸方合計に等しくなければなりません。{0}の差があります。
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +11,Automotive,自動車
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +37,Item is required,アイテムが必要です
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +25,Metal injection molding,金属射出成形
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +258,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/accounts/doctype/sales_invoice/sales_invoice.js +684,From Delivery Note,納品書から
 DocType: Time Log,From Time,開始時間
 DocType: Notification Control,Custom Message,カスタムメッセージ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +33,Investment Banking,投資銀行
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +261,"Select your Country, Time Zone and Currency",国、時間帯、通貨を選択
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,投資銀行
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +316,"Select your Country, Time Zone and Currency",国、時間帯、通貨を選択
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +369,Cash or Bank Account is mandatory for making payment entry,現金または銀行口座は、支払いのエントリを作成するための必須です
 DocType: Purchase Invoice,Price List Exchange Rate,価格表為替レート
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +91,Pickling,酸洗処理
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +18,Sand casting,砂型鋳造
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +117,Electroplating,電気めっき
 DocType: Purchase Invoice Item,Rate,単価／率
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +62,Intern,インターン
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Intern,インターン
 DocType: Newsletter,A Lead with this email id should exist,このメールアドレスを持つリードが必要です
 DocType: Stock Entry,From BOM,参照元部品表
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +34,Basic,基本
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +34,Basic,基本
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,{0}が凍結される以前の在庫取引
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +217,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,半日休暇の開始日と終了日は同日でなければなりません
@@ -2820,11 +2714,11 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +96,Reference No is mandatory if you entered Reference Date,参照日を入力した場合は参照番号が必須です
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +108,Date of Joining must be greater than Date of Birth,入社日は誕生日よりも後でなければなりません
 DocType: Salary Structure,Salary Structure,給与体系
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +242,"Multiple Price Rule exists with same criteria, please resolve \
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +246,"Multiple Price Rule exists with same criteria, please resolve \
 			conflict by assigning priority. Price Rules: {0}","同じ抽出条件に複数の価格ルールが存在しますので、優先順位を設定して衝突を解決してください。
 価格ルール：{0}"
 DocType: Account,Bank,銀行
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +9,Airline,航空会社
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,航空会社
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +493,Issue Material,資材課題
 DocType: Material Request Item,For Warehouse,倉庫用
 DocType: Employee,Offer Date,雇用契約日
@@ -2834,29 +2728,24 @@
 DocType: Item,Is Fixed Asset Item,固定資産アイテム
 DocType: Stock Entry,Including items for sub assemblies,組立部品のためのアイテムを含む
 DocType: Features Setup,"If you have long print formats, this feature can be used to split the page to be printed on multiple pages with all headers and footers on each page",長いプリント形式を使用している場合、この機能は、各ページのすべてのヘッダーとフッターに複数のページに印刷されるページを分割するために使用することができます
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +131,Hobbing,歯切り加工
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +98,All Territories,全ての領域
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +98,All Territories,全ての領域
 DocType: Purchase Invoice,Items,アイテム
 DocType: Fiscal Year,Year Name,年の名前
 DocType: Process Payroll,Process Payroll,給与支払
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +59,There are more holidays than working days this month.,休日数が月営業日数を上回っています
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +68,There are more holidays than working days this month.,休日数が月営業日数を上回っています
 DocType: Product Bundle Item,Product Bundle Item,製品付属品アイテム
 DocType: Sales Partner,Sales Partner Name,販売パートナー名
 DocType: Purchase Invoice Item,Image View,画像を見る
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +113,Finishing & industrial finishing,仕上＆工業仕上
 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/page/setup_wizard/fixtures/industry_type.py +46,Securities & Commodity Exchanges,証券・商品取引所
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,証券・商品取引所
 DocType: Shipping Rule,Calculate Based On,計算基準
 DocType: Delivery Note Item,From Warehouse,倉庫から
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +98,Drilling,穴あけ加工
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +28,Blow molding,ブロー成形
 DocType: Purchase Taxes and Charges,Valuation and Total,評価と総合
 DocType: Tax Rule,Shipping City,出荷先の市
 apps/erpnext/erpnext/stock/doctype/item/item.js +43,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,この商品は、{0}（テンプレート）のバリエーションです。「コピーしない」が設定されていない限り、属性は、テンプレートからコピーされます
 DocType: Account,Purchase User,仕入ユーザー
 DocType: Notification Control,Customize the Notification,通知をカスタマイズ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +87,Hammering,ハンマリング
 DocType: Web Page,Slideshow,スライドショー
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +24,Default Address Template cannot be deleted,デフォルトのアドレステンプレートを削除することはできません
 DocType: Sales Invoice,Shipping Rule,出荷ルール
@@ -2865,9 +2754,8 @@
 DocType: Workflow State,Search,検索
 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/setup/page/setup_wizard/fixtures/operations.py +142,Brazing,ろう付け
 DocType: C-Form,Amended From,修正元
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Raw Material,原材料
+apps/erpnext/erpnext/public/js/setup_wizard.js +359,Raw Material,原材料
 DocType: Leave Application,Follow via Email,メール経由でフォロー
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,割引後の税額
 apps/erpnext/erpnext/accounts/doctype/account/account.py +174,Child account exists for this account. You can not delete this account.,このアカウントには子アカウントが存在しています。このアカウントを削除することはできません。
@@ -2881,10 +2769,10 @@
 ,Produced,生産
 DocType: Item,Item Code for Suppliers,サプライヤーのためのアイテムコード
 DocType: Issue,Raised By (Email),提起元メールアドレス
-apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +72,General,一般
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +495,Attach Letterhead,レターヘッドを添付
+apps/erpnext/erpnext/setup/setup_wizard/default_website.py +72,General,一般
+apps/erpnext/erpnext/public/js/setup_wizard.js +241,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/setup/page/setup_wizard/setup_wizard.js +542,"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/public/js/setup_wizard.js +284,"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}には複数のシリアル番号が必要です
 DocType: Journal Entry,Bank Entry,銀行取引記帳
 DocType: Authorization Rule,Applicable To (Designation),（肩書）に適用
@@ -2893,32 +2781,31 @@
 apps/erpnext/erpnext/config/accounts.py +143,Enable / disable currencies.,通貨の有効／無効を切り替え
 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),合計（数）
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +26,Entertainment & Leisure,エンターテインメント＆レジャー
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,エンターテインメント＆レジャー
 DocType: Purchase Order,The date on which recurring order will be stop,繰り返し注文停止予定日
 DocType: Quality Inspection,Item Serial No,アイテムシリアル番号
 apps/erpnext/erpnext/controllers/status_updater.py +142,{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 +57,Total Present,総現在価値
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Hour,時
+apps/erpnext/erpnext/public/js/setup_wizard.js +363,Hour,時
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +138,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation",シリアル番号が付与されたアイテム{0}は「在庫棚卸」を使用して更新することはできません
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +488,Transfer Material to Supplier,サプライヤーに資材を配送
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +513,Transfer Material to Supplier,サプライヤーに資材を配送
 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/crm/doctype/opportunity/opportunity.js +82,Create Quotation,見積を登録
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +306,All these items have already been invoiced,これら全アイテムはすでに請求済みです
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,You are not authorized to approve leaves on Block Dates,あなたがブロック日付の葉を承認する権限がありません
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +311,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,POS
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +83,Curling,カーリング加工
 DocType: Account,Tax,税
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +28,Row {0}: {1} is not a valid {2},行{0}：{1}は有効な{2}ではありません
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +89,Refining,精錬
+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,製造計画ツール
 DocType: Quality Inspection,Report Date,レポート日
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +130,Routing,ルーティング
 DocType: C-Form,Invoices,請求
 DocType: Job Opening,Job Title,職業名
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +54,{0} already allocated for Employee {1} for period {2} - {3},{0}はすでに期間の従業員{1}のために割り当てられた{2}  -  {3}
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +80,{0} Recipients,{0}受信者
 DocType: Features Setup,Item Groups in Details,アイテムグループ詳細
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +335,Quantity to Manufacture must be greater than 0.,製造数量は0より大きくなければなりません
@@ -2936,14 +2823,13 @@
 DocType: DocType,Setup,セットアップ
 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,今月と保留中の活動の概要
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +39,Cold rolling,冷間圧延
 DocType: Customer Group,Customer Group Name,顧客グループ名
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +408,Please remove this Invoice {0} from C-Form {1},C-フォーム{1}から請求書{0}を削除してください
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +410,Please remove this Invoice {0} from C-Form {1},C-フォーム{1}から請求書{0}を削除してください
 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,属性
 DocType: Packing Slip,Get Items,項目を取得
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +186,Please enter Write Off Account,償却勘定を入力してください
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +187,Please enter Write Off Account,償却勘定を入力してください
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +71,Last Order Date,最終注文日
 DocType: DocField,Image,画像
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +179,Make Excise Invoice,消費税請求書を作成
@@ -2953,7 +2839,7 @@
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +146,Operation ID not set,操作IDが設定されていません
 DocType: Production Order,Planned Start Date,計画開始日
 DocType: Serial No,Creation Document Type,作成ドキュメントの種類
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +620,Maint. Visit,メンテナンス訪問
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +631,Maint. Visit,メンテナンス訪問
 DocType: Leave Type,Is Encash,現金化済
 DocType: Purchase Invoice,Mobile No,携帯番号
 DocType: Payment Tool,Make Journal Entry,仕訳を作成
@@ -2961,35 +2847,31 @@
 apps/erpnext/erpnext/controllers/trends.py +257,Project-wise data is not available for Quotation,プロジェクトごとのデータは、引用符は使用できません
 DocType: Project,Expected End Date,終了予定日
 DocType: Appraisal Template,Appraisal Template Title,査定テンプレートタイトル
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +440,Commercial,営利企業
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +378,Commercial,営利企業
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +23,Parent Item {0} must not be a Stock Item,親項目 {0} は在庫アイテムにはできません
 DocType: Cost Center,Distribution Id,配布ID
-apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +14,Awesome Services,素晴らしいサービス
+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,サプライヤー住所
 DocType: Contact Us Settings,Address Line 2,住所2行目
 DocType: ToDo,Reference,リファレンス
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +59,Perforating,穿孔
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,出量
 apps/erpnext/erpnext/config/accounts.py +128,Rules to calculate shipping amount for a sale,販売のために出荷量を計算するルール
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +29,Series is mandatory,シリーズは必須です
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +28,Financial Services,金融サービス
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,金融サービス
 apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3},属性 {0} の値は、{3}の単位で {1} から {2}の範囲内でなければなりません
 DocType: Tax Rule,Sales,販売
 DocType: Stock Entry Detail,Basic Amount,基本額
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +173,Warehouse required for stock Item {0},在庫アイテム{0}には倉庫が必要です
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +178,Warehouse required for stock Item {0},在庫アイテム{0}には倉庫が必要です
 DocType: Leave Allocation,Unused leaves,未使用の葉
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,貸方
 DocType: Customer,Default Receivable Accounts,デフォルト売掛金勘定
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +102,Sawing,ソーイング
 DocType: Tax Rule,Billing State,請求状況
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +32,Laminating,ラミネート
 DocType: Item Reorder,Transfer,移転
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +549,Fetch exploded BOM (including sub-assemblies),（部分組立品を含む）展開した部品表を取得する
 DocType: Authorization Rule,Applicable To (Employee),（従業員）に適用
 apps/erpnext/erpnext/controllers/accounts_controller.py +101,Due Date is mandatory,期日は必須です
 apps/erpnext/erpnext/controllers/item_variant.py +51,Increment for Attribute {0} cannot be 0,属性 {0} の増分は0にすることはできません
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +143,Sintering,焼結
 DocType: Journal Entry,Pay To / Recd From,支払先／受領元
 DocType: Naming Series,Setup Series,シリーズ設定
 DocType: Supplier,Contact HTML,連絡先HTML
@@ -3002,7 +2884,6 @@
 DocType: Attendance,Absent,欠勤
 DocType: Product Bundle,Product Bundle,製品付属品
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +180,Row {0}: Invalid reference {1},行{0}：無効参照{1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +165,Crushing,つぶし加工
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,購入租税公課テンプレート
 DocType: Upload Attendance,Download Template,テンプレートのダウンロード
 DocType: GL Entry,Remarks,備考
@@ -3010,14 +2891,12 @@
 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/setup/page/setup_wizard/fixtures/operations.py +9,Continuous casting,連続鋳造
 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/setup/page/setup_wizard/fixtures/operations.py +80,Cold sizing,冷間サイジング
 DocType: Salary Slip,Earning & Deduction,収益と控除
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +76,Account {0} cannot be a Group,アカウント{0}はグループにすることはできません
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +259,Region,地域
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +314,Region,地域
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +213,Optional. This setting will be used to filter in various transactions.,（オプション）この設定は、様々な取引をフィルタリングするために使用されます。
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +104,Negative Valuation Rate is not allowed,マイナスの評価額は許可されていません
 DocType: Holiday List,Weekly Off,週休
@@ -3035,7 +2914,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,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,出勤開始日と出勤日は必須です
-apps/erpnext/erpnext/controllers/buying_controller.py +131,Please enter 'Is Subcontracted' as Yes or No,「下請」にはYesかNoを入力してください
+apps/erpnext/erpnext/controllers/buying_controller.py +122,Please enter 'Is Subcontracted' as Yes or No,「下請」にはYesかNoを入力してください
 DocType: Sales Team,Contact No.,連絡先番号
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,'Profit and Loss' type account {0} not allowed in Opening Entry,開いているエントリでは「損益」タイプアカウント{0}は許可されていません
 DocType: Workflow State,Time,時間
@@ -3044,14 +2923,13 @@
 DocType: Authorization Rule,Authorization Rule,認証ルール
 DocType: Sales Invoice,Terms and Conditions Details,規約の詳細
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,販売租税公課テンプレート
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +10,Apparel & Accessories,服飾
+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,注文数
 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 +121,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/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +47,Conversion Factor is required,変換係数が必要です
 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,値／説明
@@ -3059,10 +2937,8 @@
 ,Customers Not Buying Since Long Time,長期間受注の無い顧客
 DocType: Production Order,Expected Delivery Date,配送予定日
 apps/erpnext/erpnext/accounts/general_ledger.py +121,Debit and Credit not equal for {0} #{1}. Difference is {2}.,{0} #{1}の借方と貸方が等しくありません。差は{2} です。
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +48,Bulging,バルジ加工
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +11,Evaporative-pattern casting,消失模型鋳造法
 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 +195,Sales Invoice {0} must be cancelled before cancelling this Sales Order,この受注をキャンセルする前に、請求書{0}がキャンセルされていなければなりません
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +190,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以上でなければなりません。
@@ -3081,26 +2957,24 @@
 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 +241,Account: {0} with currency: {1} can not be selected,アカウント：{0} で通貨：{1}を選択することはできません
+apps/erpnext/erpnext/controllers/accounts_controller.py +242,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 +47,Account {0}: Parent account {1} does not belong to company: {2},アカウント{0}：親アカウント{1}は会社{2}に属していません
 apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted all transactions related to this company!,この会社に関連するすべての取引を正常に削除しました！
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,基準日
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +111,Honing,ホーニング加工
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +58,Probation,試用
-apps/erpnext/erpnext/stock/doctype/item/item.py +264,Default Warehouse is mandatory for stock Item.,在庫アイテムにはデフォルト倉庫が必須です。
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Probation,試用
+apps/erpnext/erpnext/stock/doctype/item/item.py +268,Default Warehouse is mandatory for stock Item.,在庫アイテムにはデフォルト倉庫が必須です。
 DocType: Feed,Full Name,氏名
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +148,Clinching,クリンチ加工
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +191,Payment of salary for the month {0} and year {1},{1}年{0}月の給与支払
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +173,Payment of salary for the month {0} and year {1},{1}年{0}月の給与支払
 DocType: Stock Settings,Auto insert Price List rate if missing,空の場合価格表の単価を自動挿入
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,支出額合計
 ,Transferred Qty,移転数量
 apps/erpnext/erpnext/config/learn.py +11,Navigating,ナビゲート
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +137,Planning,計画
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +137,Planning,計画
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +9,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),総請求金額（時間ログ経由）
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +629,We sell this Item,このアイテムを売る
+apps/erpnext/erpnext/public/js/setup_wizard.js +365,We sell this Item,このアイテムを売る
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +65,Supplier Id,サプライヤーID
 DocType: Journal Entry,Cash Entry,現金エントリー
 DocType: Sales Partner,Contact Desc,連絡先説明
@@ -3109,18 +2983,16 @@
 DocType: Brand,Item Manager,アイテムマネージャ
 DocType: Cost Center,Add rows to set annual budgets on Accounts.,アカウントの年間予算を設定するために行を追加
 DocType: Buying Settings,Default Supplier Type,デフォルトサプライヤータイプ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +160,Quarrying,採石
 DocType: Production Order,Total Operating Cost,営業費合計
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +160,Note: Item {0} entered multiple times,注：アイテム{0}が複数回入力されています
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +163,Note: Item {0} entered multiple times,注：アイテム{0}が複数回入力されています
 apps/erpnext/erpnext/config/crm.py +27,All Contacts.,全ての連絡先。
 DocType: Newsletter,Test Email Id,テスト用メールアドレス
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +394,Company Abbreviation,会社略称
+apps/erpnext/erpnext/public/js/setup_wizard.js +142,Company Abbreviation,会社略称
 DocType: Features Setup,If you follow Quality Inspection. Enables Item QA Required and QA No in Purchase Receipt,品質検査に従う場合、アイテムの品質保証が必要となり領収書の品質保証番号が有効になります
 DocType: GL Entry,Party Type,当事者タイプ
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +68,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/setup/page/setup_wizard/fixtures/operations.py +30,Rotational molding,回転成形
 apps/erpnext/erpnext/config/hr.py +115,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,ショッピングカート用の税ルールを設定
@@ -3134,15 +3006,15 @@
 apps/erpnext/erpnext/config/selling.py +18,Quotes to Leads or Customers.,リードや顧客への見積。
 DocType: Stock Settings,Role Allowed to edit frozen stock,凍結在庫の編集が許可された役割
 ,Territory Target Variance Item Group-Wise,地域ターゲット差違（アイテムグループごと）
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +101,All Customer Groups,全ての顧客グループ
-apps/erpnext/erpnext/controllers/accounts_controller.py +474,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0}は必須です。おそらく{1}から {2}のための通貨変換レコードが作成されていません
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +101,All Customer Groups,全ての顧客グループ
+apps/erpnext/erpnext/controllers/accounts_controller.py +475,{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 +41,Account {0}: Parent account {1} does not exist,アカウント{0}：親アカウント{1}が存在しません
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),価格表単価（会社通貨）
 DocType: Account,Temporary,仮勘定
 DocType: Address,Preferred Billing Address,優先請求先住所
 DocType: Monthly Distribution Percentage,Percentage Allocation,パーセンテージの割当
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +86,Secretary,秘書
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Secretary,秘書
 DocType: Serial No,Distinct unit of an Item,アイテムの明確な単位
 DocType: Pricing Rule,Buying,購入
 DocType: HR Settings,Employee Records to be created by,従業員レコード作成元
@@ -3155,9 +3027,8 @@
 ,Item-wise Price List Rate,アイテムごとの価格表単価
 DocType: Purchase Order Item,Supplier Quotation,サプライヤー見積
 DocType: Quotation,In Words will be visible once you save the Quotation.,見積を保存すると表示される表記内。
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +68,Ironing,しごき加工
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is stopped,{0} {1}は停止しています
-apps/erpnext/erpnext/stock/doctype/item/item.py +352,Barcode {0} already used in Item {1},バーコード{0}はアイテム{1}で使用済です
+apps/erpnext/erpnext/stock/doctype/item/item.py +356,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/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,今後のイベント
@@ -3166,27 +3037,25 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +27,Quick Entry,クイック入力
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,返品には {0} が必須です
 DocType: Purchase Order,To Receive,受領する
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +33,Shrink fitting,焼き嵌め
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +522,user@example.com,user@example.com
+apps/erpnext/erpnext/public/js/setup_wizard.js +266,user@example.com,user@example.com
 DocType: Email Digest,Income / Expense,収益/費用
 DocType: Employee,Personal Email,個人メールアドレス
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +58,Total Variance,派生の合計
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +62,Total Variance,派生の合計
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.",有効にすると、システムは自動的に在庫の会計エントリーを投稿します
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +15,Brokerage,証券仲介
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +15,Brokerage,証券仲介
 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/accounts/page/financial_analytics/financial_analytics.js +42,Select Fiscal Year...,年度選択...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +442,POS Profile required to make POS Entry,POSエントリを作成するためにはPOSプロフィールが必要です
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +444,POS Profile required to make POS Entry,POSエントリを作成するためにはPOSプロフィールが必要です
 DocType: Hub Settings,Name Token,名前トークン
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +106,Planing,プレーニング
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Selling,標準販売
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +120,Standard Selling,標準販売
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +137,Atleast one warehouse is mandatory,倉庫は少なくとも1つ必須です
 DocType: Serial No,Out of Warranty,保証外
 DocType: BOM Replace Tool,Replace,置き換え
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +314,{0} against Sales Invoice {1},納品書{1}に対する{0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +316,{0} against Sales Invoice {1},納品書{1}に対する{0}
 apps/erpnext/erpnext/stock/doctype/item/item.py +49,Please enter default Unit of Measure,デフォルトの単位を入力してください
 DocType: Purchase Invoice Item,Project Name,プロジェクト名
 DocType: Supplier,Mention if non-standard receivable account,非標準の売掛金の場合に記載
@@ -3202,9 +3071,8 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,Journal Entry {0} does not have account {1} or already matched against other voucher,仕訳{0}は、勘定{1}が無いか、既に他の伝票に照合されています
 DocType: Item,Moving Average,移動平均
 DocType: BOM Replace Tool,The BOM which will be replaced,交換される部品表
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +43,New Stock UOM must be different from current stock UOM,新しい在庫単位は現在の在庫単位とは異なる必要があります
 DocType: Account,Debit,借方
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +34,Leaves must be allocated in multiples of 0.5,休暇は0.5の倍数で割り当てられなければなりません
+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/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,未払額
@@ -3223,8 +3091,7 @@
 DocType: Employee,Internal Work History,内部作業履歴
 DocType: DocField,Column Break,列区切り
 DocType: Event,Thursday,木曜日
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +42,Private Equity,未公開株式
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +93,Turning,ターニング
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,未公開株式
 DocType: Maintenance Visit,Customer Feedback,顧客フィードバック
 DocType: Account,Expense,経費
 DocType: Sales Invoice,Exhibition,展示会
@@ -3237,19 +3104,19 @@
 DocType: Employee,Held On,開催
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +33,Production Item,生産アイテム
 ,Employee Information,従業員の情報
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,Rate (%),割合（％）
+apps/erpnext/erpnext/public/js/setup_wizard.js +294,Rate (%),割合（％）
 DocType: Stock Entry Detail,Additional Cost,追加費用
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +407,Financial Year End Date,会計年度終了日
+apps/erpnext/erpnext/public/js/setup_wizard.js +155,Financial Year End Date,会計年度終了日
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Voucher No, if grouped by Voucher",伝票でグループ化されている場合、伝票番号でフィルタリングすることはできません。
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +484,Make Supplier Quotation,サプライヤ見積を作成
 DocType: Quality Inspection,Incoming,収入
 DocType: BOM,Materials Required (Exploded),資材が必要です（展開）
 DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),無給休暇（LWP）の所得減
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +512,"Add users to your organization, other than yourself",自分以外のユーザーを組織に追加
+apps/erpnext/erpnext/public/js/setup_wizard.js +256,"Add users to your organization, other than yourself",自分以外のユーザーを組織に追加
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No {1} does not match with {2} {3},行＃{0}：シリアル番号 {1} が {2} {3}と一致しません
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +44,Casual Leave,臨時休暇
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +44,Casual Leave,臨時休暇
 DocType: Batch,Batch ID,バッチID
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +334,Note: {0},注：{0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +336,Note: {0},注：{0}
 ,Delivery Note Trends,納品書の動向
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +104,This Week's Summary,今週のまとめ
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +74,{0} must be a Purchased or Sub-Contracted Item in row {1},行{1}の{0}は仕入または下請アイテムでなければなりません
@@ -3261,7 +3128,7 @@
 DocType: Purchase Receipt,Return Against Purchase Receipt,領収書に対する返品
 DocType: Purchase Order,To Bill,請求先
 DocType: Material Request,% Ordered,％注文済
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +61,Piecework,出来高制
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Piecework,出来高制
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +64,Avg. Buying Rate,平均購入レート
 DocType: Task,Actual Time (in Hours),実際の時間（時）
 DocType: Employee,History In Company,会社での履歴
@@ -3278,13 +3145,13 @@
 DocType: Opportunity,To Discuss,連絡事項
 DocType: SMS Settings,SMS Settings,SMS設定
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +60,Temporary Accounts,仮勘定
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +155,Black,黒
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Black,黒
 DocType: BOM Explosion Item,BOM Explosion Item,部品表展開アイテム
 DocType: Account,Auditor,監査人
 DocType: Purchase Order,End date of current order's period,現在の注文の期間の終了日
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +17,Make Offer Letter,雇用契約書を作成
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +10,Return,返品
-apps/erpnext/erpnext/stock/doctype/item/item.py +503,Default Unit of Measure for Variant must be same as Template,バリエーションのデフォルトの数量単位はテンプレートと同じでなければなりません
+apps/erpnext/erpnext/stock/doctype/item/item.py +507,Default Unit of Measure for Variant must be same as Template,バリエーションのデフォルトの数量単位はテンプレートと同じでなければなりません
 DocType: DocField,Fold,フォールド
 DocType: Production Order Operation,Production Order Operation,製造指示作業
 DocType: Pricing Rule,Disable,無効にする
@@ -3295,13 +3162,12 @@
 DocType: Page,Page Name,ページ名
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +110,To Time must be greater than From Time,終了時間は開始時間より大きくなければなりません
 DocType: Journal Entry Account,Exchange Rate,為替レート
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +465,Sales Order {0} is not submitted,受注{0}は提出されていません
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +467,Sales Order {0} is not submitted,受注{0}は提出されていません
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0}: Parent account {1} does not bolong to the company {2},倉庫{0}：親口座{1}は会社{2}に属していません
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +124,Spindle finishing,スピンドル仕上げ
 DocType: BOM,Last Purchase Rate,最新の仕入料金
 DocType: Account,Asset,資産
 DocType: Project Task,Task ID,タスクID
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +395,"e.g. ""MC""",例「MC」
+apps/erpnext/erpnext/public/js/setup_wizard.js +143,"e.g. ""MC""",例「MC」
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,Stock cannot exist for Item {0} since has variants,バリエーションを有しているのでアイテム{0}の在庫は存在させることができません
 ,Sales Person-wise Transaction Summary,各営業担当者の取引概要
 DocType: System Settings,Time Zone,時間帯
@@ -3310,9 +3176,7 @@
 DocType: Monthly Distribution,Monthly Distribution Percentages,月次配分割合
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +16,The selected item cannot have Batch,選択した項目はバッチを持てません
 DocType: Delivery Note,% of materials delivered against this Delivery Note,％の資材が納品済（この納品書を対象）
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +151,Stapling,ステープリング
 DocType: Customer,Customer Details,顧客の詳細
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +105,Shaping,形削り
 DocType: Employee,Reports to,レポート先
 DocType: SMS Settings,Enter url parameter for receiver nos,受信者番号にURLパラメータを入力してください
 DocType: Sales Invoice,Paid Amount,支払金額
@@ -3321,13 +3185,13 @@
 DocType: Item Variant,Item Variant,アイテムバリエーション
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +15,Setting this Address Template as default as there is no other default,他にデフォルトがないので、このアドレステンプレートをデフォルトとして設定します
 apps/erpnext/erpnext/accounts/doctype/account/account.py +89,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'",口座残高がすでに借方に存在しており、「残高仕訳先」を「貸方」に設定することはできません
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +76,Quality Management,品質管理
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Quality Management,品質管理
 DocType: Production Planning Tool,Filter based on customer,顧客に基づくフィルター
 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}の数量を入力してください
 DocType: Employee External Work History,Employee External Work History,従業員の職歴
 DocType: Tax Rule,Purchase,仕入
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +34,Balance Qty,残高数量
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Balance Qty,残高数量
 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/accounts/page/accounts_browser/accounts_browser.js +96,Cost Centers,コストセンター
@@ -3337,12 +3201,12 @@
 DocType: Opportunity,Next Contact,次の連絡先
 DocType: Employee,Employment Type,雇用の種類
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,固定資産
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +84,Application period cannot be across two alocation records,アプリケーション期間は2 alocationレコードを横断することはできません
 DocType: Item Group,Default Expense Account,デフォルト経費
 DocType: Employee,Notice (days),お知らせ（日）
 DocType: Page,Yes,はい
 DocType: Tax Rule,Sales Tax Template,販売税テンプレート
 DocType: Employee,Encashment Date,現金化日
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +74,Electroforming,電鋳
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +179,"Against Voucher Type must be one of Purchase Order, Purchase Invoice or Journal Entry",対伝票タイプは発注・請求書・仕訳のいずれかでなければなりません
 DocType: Account,Stock Adjustment,在庫調整
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +34,Default Activity Cost exists for Activity Type - {0},デフォルトの活動コストが活動タイプ -  {0} に存在します
@@ -3378,12 +3242,12 @@
 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,配布
 apps/erpnext/erpnext/public/js/pos/pos.html +36,Amount Paid,支払額
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +91,Project Manager,プロジェクトマネージャー
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +72,Dispatch,発送
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Project Manager,プロジェクトマネージャー
+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: Customer,Default Taxes and Charges,デフォルト租税公課
 DocType: Account,Receivable,売掛金
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +268,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,行＃{0}：注文がすでに存在しているとして、サプライヤーを変更することはできません
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +263,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.",チェックすると、部分組立品アイテムの「部品表」に原材料が組み込まれます。そうでなければ、全ての部分組立品アイテムが原材料として扱われます。
@@ -3391,8 +3255,8 @@
 DocType: Hub Settings,Seller Description,販売者の説明
 DocType: Employee Education,Qualification,資格
 DocType: Item Price,Item Price,アイテム価格
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +48,Soap & Detergent,石鹸＆洗剤
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +36,Motion Picture & Video,映画＆ビデオ
+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,注文済
 DocType: Warehouse,Warehouse Name,倉庫名
 DocType: Naming Series,Select Transaction,取引を選択
@@ -3401,7 +3265,6 @@
 DocType: BOM,Rate Of Materials Based On,資材単価基準
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,サポート分析
 apps/erpnext/erpnext/accounts/doctype/accounts_settings/accounts_settings.py +27,Company is missing in warehouses {0},倉庫{0}に「会社」がありません
-DocType: Stock UOM Replace Utility,Stock UOM Replace Utility,在庫単位置換ユーティリティ
 DocType: POS Profile,Terms and Conditions,規約
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,To Date should be within the Fiscal Year. Assuming To Date = {0},開始日は会計年度内でなければなりません（もしかして：{0}）
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc",ここでは、身長、体重、アレルギー、医療問題などを保持することができます
@@ -3413,7 +3276,7 @@
 DocType: Sales Order Item,For Production,生産用
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +103,Please enter sales order in the above table,上記の表に受注を入力してください
 DocType: Project Task,View Task,タスク表示
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +406,Your financial year begins on,会計年度開始日
+apps/erpnext/erpnext/public/js/setup_wizard.js +154,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: Email Digest,Add/Remove Recipients,受信者の追加／削除
@@ -3421,16 +3284,14 @@
 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 +528,Item variant {0} exists with same attributes,アイテムバリエーション{0}は同じ属性で存在しています
+apps/erpnext/erpnext/stock/doctype/item/item.py +532,Item variant {0} exists with same attributes,アイテムバリエーション{0}は同じ属性で存在しています
 DocType: Salary Slip,Salary Slip,給料明細
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +116,Burnishing,バニシング加工
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +54,'To Date' is required,「終了日」が必要です
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,「終了日」が必要です
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.",納品する梱包の荷造伝票を生成します。パッケージ番号、内容と重量を通知するために使用します。
 DocType: Sales Invoice Item,Sales Order Item,受注項目
 DocType: Salary Slip,Payment Days,支払日
 DocType: BOM,Manage cost of operations,作業費用を管理
 DocType: Features Setup,Item Advanced,アイテム詳細設定
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +40,Hot rolling,熱間圧延
 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,従業員教育
@@ -3443,25 +3304,23 @@
 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/setup/page/setup_wizard/install_fixtures.py +48,Sick Leave,病欠
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +174,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/page/setup_wizard/fixtures/industry_type.py +22,Department Stores,デパート
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,デパート
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +40,System Balance,システム残高
 DocType: Workflow,Is Active,アクティブ
 apps/erpnext/erpnext/controllers/stock_controller.py +71,No accounting entries for the following warehouses,次の倉庫には会計エントリーがありません
 apps/erpnext/erpnext/projects/doctype/project/project.js +22,Save the document first.,先に文書を保存してください
 DocType: Account,Chargeable,請求可能
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +121,Linishing,グレイニング
 DocType: Company,Change Abbreviation,略語を変更
 DocType: Workflow State,Primary,プライマリー
 DocType: Expense Claim Detail,Expense Date,経費日付
 DocType: Item,Max Discount (%),最大割引（％）
 DocType: Communication,More Information,詳細
 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/setup/page/setup_wizard/fixtures/operations.py +161,Blasting,ブラスト加工
 DocType: Company,Warn,警告する
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +111,Item valuation updated,アイテムの評価を更新しました
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.",記録内で注目に値する特記事項
 DocType: BOM,Manufacturing User,製造ユーザー
 DocType: Purchase Order,Raw Materials Supplied,原材料供給
@@ -3471,7 +3330,7 @@
 DocType: Appraisal,Appraisal Template,査定テンプレート
 DocType: Communication,Email,メール
 DocType: Item Group,Item Classification,アイテム分類
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +89,Business Development Manager,ビジネス開発マネージャー
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Business Development Manager,ビジネス開発マネージャー
 DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,メンテナンス訪問目的
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.js +15,Period,期間
 ,General Ledger,総勘定元帳
@@ -3481,9 +3340,7 @@
 ,Itemwise Recommended Reorder Level,アイテムごとに推奨される再注文レベル
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +264,Please select {0} first,{0}を選択してください
 DocType: Features Setup,To get Item Group in details table,詳細テーブルのアイテムグループを取得する
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +67,Redrawing,再描画
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +112,Batch {0} of Item {1} has expired.,アイテム {1}のバッチ {0} は期限切れです
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +120,Etching,エッチング
 DocType: Sales Invoice,Commission,歩合
 DocType: Address Template,"<h4>Default Template</h4>
 <p>Uses <a href=""http://jinja.pocoo.org/docs/templates/"">Jinja Templating</a> and all the fields of Address (including Custom Fields if any) will be available</p>
@@ -3528,7 +3385,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +340,Operation Time must be greater than 0 for Operation {0},作業 {0} の作業時間は0以上でなければなりません
 DocType: Supplier,Address and Contacts,住所・連絡先
 DocType: UOM Conversion Detail,UOM Conversion Detail,単位変換の詳細
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +496,Keep it web friendly 900px (w) by 100px (h),900px(横)100px(縦)が最適です
+apps/erpnext/erpnext/public/js/setup_wizard.js +242,Keep it web friendly 900px (w) by 100px (h),900px(横)100px(縦)が最適です
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +329,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,未払伝票を取得
@@ -3544,54 +3401,49 @@
 DocType: Item,Average time taken by the supplier to deliver,サプライヤー配送平均時間
 DocType: Time Log,Hours,時間
 DocType: Project,Expected Start Date,開始予定日
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +38,Rolling,圧延
 DocType: ToDo,Priority,優先度
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +41,Remove item if charges is not applicable to that item,料金がそのアイテムに適用できない場合は、アイテムを削除する
 DocType: Dropbox Backup,Dropbox Access Allowed,Dropboxのアクセス許可
 DocType: Dropbox Backup,Weekly,毎週
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,例「smsgateway.com/api/send_sms.cgi」
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +485,Receive,受信
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +510,Receive,受信
 DocType: Maintenance Visit,Fully Completed,全て完了
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}％完了
 DocType: Employee,Educational Qualification,学歴
 DocType: Workstation,Operating Costs,営業費用
 DocType: Employee Leave Approver,Employee Leave Approver,従業員休暇承認者
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,{0} has been successfully added to our Newsletter list.,{0} はニュースレターのリストに正常に追加されました
-apps/erpnext/erpnext/stock/doctype/item/item.py +383,Row {0}: An Reorder entry already exists for this warehouse {1},行{0}：この倉庫{1}には既に再注文エントリが存在しています
+apps/erpnext/erpnext/stock/doctype/item/item.py +387,Row {0}: An Reorder entry already exists for this warehouse {1},行{0}：この倉庫{1}には既に再注文エントリが存在しています
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +67,"Cannot declare as lost, because Quotation has been made.",見積が作成されているため、失注を宣言できません
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +133,Electron beam machining,電子ビーム加工
 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 +150,Please select Start Date and End Date for Item {0},アイテム{0}の開始日と終了日を選択してください
 apps/erpnext/erpnext/config/stock.py +141,Main Reports,メインレポート
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +102,Stock Ledger entries balances updated,在庫元帳エントリ残高を更新しました
 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文書型
-apps/erpnext/erpnext/stock/doctype/item/item.js +176,Add / Edit Prices,価格の追加/編集
+apps/erpnext/erpnext/stock/doctype/item/item.js +178,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 +298,My Orders,自分の注文
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +293,My Orders,自分の注文
 DocType: Price List,Price List Name,価格表名称
 DocType: Time Log,For Manufacturing,製造用
-apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +70,Totals,合計
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +174,Totals,合計
 DocType: BOM,Manufacturing,製造
 ,Ordered Items To Be Delivered,納品予定の注文済アイテム
 DocType: Account,Income,収入
 ,Setup Wizard,セットアップウィザード
 DocType: Industry Type,Industry Type,業種タイプ
 apps/erpnext/erpnext/templates/includes/cart.js +137,Something went wrong!,問題発生！
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +68,Warning: Leave application contains following block dates,警告：休暇申請に次の期間が含まれています。
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +251,Sales Invoice {0} has already been submitted,請求書{0}は提出済です
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +100,Warning: Leave application contains following block dates,警告：休暇申請に次の期間が含まれています。
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +256,Sales Invoice {0} has already been submitted,請求書{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/setup/page/setup_wizard/fixtures/operations.py +10,Die casting,ダイカスト
 DocType: Email Alert,Reference Date,参照日
 apps/erpnext/erpnext/config/hr.py +105,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,メッセージを入力してください
 DocType: Async Task,Status,ステータス
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +65,Stock UOM updated for Item {0},アイテム{0}の在庫数量単位を更新しました
 DocType: Company History,Year,年
 apps/erpnext/erpnext/config/accounts.py +127,Point-of-Sale Profile,POSプロフィール
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +68,Please Update SMS Settings,SMSの設定を更新してください
@@ -3605,12 +3457,12 @@
 ,Serial No Service Contract Expiry,シリアル番号（サービス契約の有効期限）
 DocType: Item,Unit of Measure Conversion,数量単位変換
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +86,Employee can not be changed,従業員を変更することはできません
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +259,You cannot credit and debit same account at the same time,同じ口座を同時に借方と貸方にすることはできません
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,You cannot credit and debit same account at the same time,同じ口座を同時に借方と貸方にすることはできません
 DocType: Naming Series,Help HTML,HTMLヘルプ
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},割り当てられた重みづけの合計は100％でなければなりません。{0}になっています。
 apps/erpnext/erpnext/controllers/status_updater.py +140,Allowance for over-{0} crossed for Item {1},{0}以上の引当金は、アイテム {1}と相殺されています
 DocType: Address,Name of person or organization that this address belongs to.,このアドレスが所属する個人または組織の名前。
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +587,Your Suppliers,サプライヤー
+apps/erpnext/erpnext/public/js/setup_wizard.js +325,Your Suppliers,サプライヤー
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,受注が作成されているため、失注にできません
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +65,Another Salary Structure {0} is active for employee {1}. Please make its status 'Inactive' to proceed.,従業員{1}のための別の給与体系{0}がアクティブです。ステータスを「非アクティブ」にして続行してください。
 DocType: Purchase Invoice,Contact,連絡先
@@ -3619,37 +3471,35 @@
 DocType: Item,Has Serial No,シリアル番号あり
 DocType: Employee,Date of Issue,発行日
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +16,{0}: From {0} for {1},{0}： {1}のための{0}から
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +154,Row #{0}: Set Supplier for item {1},行＃{0}：項目の設定サプライヤー{1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +149,Row #{0}: Set Supplier for item {1},行＃{0}：項目の設定サプライヤー{1}
 DocType: Issue,Content Type,コンテンツタイプ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +17,Computer,コンピュータ
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,コンピュータ
 DocType: Item,List this Item in multiple groups on the website.,ウェブサイト上の複数のグループでこのアイテムを一覧表示します。
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +283,Please check Multi Currency option to allow accounts with other currency,アカウントで他の通貨の使用を可能にするには「複数通貨」オプションをチェックしてください
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +285,Please check Multi Currency option to allow accounts with other currency,アカウントで他の通貨の使用を可能にするには「複数通貨」オプションをチェックしてください
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +62,Item: {0} does not exist in the system,アイテム：{0}はシステムに存在しません
 apps/erpnext/erpnext/accounts/doctype/account/account.py +81,You are not authorized to set Frozen value,凍結された値を設定する権限がありません
 DocType: Payment Reconciliation,Get Unreconciled Entries,未照合のエントリーを取得
 DocType: Cost Center,Budgets,予算
 apps/frappe/frappe/core/page/modules_setup/modules_setup.py +11,Updated,更新済
 DocType: Employee,Emergency Contact Details,緊急連絡先の詳細
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +396,What does it do?,これは何？
+apps/erpnext/erpnext/public/js/setup_wizard.js +144,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,平均手数料率
-apps/erpnext/erpnext/stock/doctype/item/item.py +313,'Has Serial No' can not be 'Yes' for non-stock item,在庫アイテム以外は「シリアル番号あり」を「はい」にすることができません。
+apps/erpnext/erpnext/stock/doctype/item/item.py +317,'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/setup/page/setup_wizard/install_fixtures.py +111,Electrical,電気
+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 +302,Row {0}: Exchange Rate is mandatory,行{0}：為替レートは必須です
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +304,Row {0}: Exchange Rate is mandatory,行{0}：為替レートは必須です
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},従業員{0}のユーザーIDが未設定です。
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +72,Peening,ピーニング
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,From Warranty Claim,保証請求元
 DocType: Stock Entry,Default Source Warehouse,デフォルトの出庫元倉庫
 DocType: Item,Customer Code,顧客コード
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +212,Birthday Reminder for {0},{0}のための誕生日リマインダー
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +163,Lapping,ラッピング
-apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.js +8,Days Since Last Order,最新注文からの日数
+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 +299,Debit To account must be a Balance Sheet account,借方アカウントは貸借対照表アカウ​​ントである必要があります
 DocType: Buying Settings,Naming Series,シリーズ名を付ける
 DocType: Leave Block List,Leave Block List Name,休暇リスト名
@@ -3663,7 +3513,7 @@
 DocType: Notification Control,Sales Invoice Message,請求書メッセージ
 DocType: Authorization Rule,Based On,参照元
 DocType: Sales Order Item,Ordered Qty,注文数
-apps/erpnext/erpnext/stock/doctype/item/item.py +539,Item {0} is disabled,項目{0}が無効になっています
+apps/erpnext/erpnext/stock/doctype/item/item.py +543,Item {0} is disabled,項目{0}が無効になっています
 DocType: Stock Settings,Stock Frozen Upto,在庫凍結
 apps/erpnext/erpnext/controllers/recurring_document.py +166,Period From and Period To dates mandatory for recurring {0},からと期間、繰り返しのために必須の日付までの期間{0}
 apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,プロジェクト活動／タスク
@@ -3673,7 +3523,6 @@
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,割引は100未満でなければなりません
 DocType: ToDo,Low,低
 DocType: Purchase Invoice,Write Off Amount (Company Currency),償却額（会社通貨）
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +71,Spinning,スピニング加工
 DocType: Landed Cost Voucher,Landed Cost Voucher,陸揚費用伝票
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +55,Please set {0},{0}を設定してください
 DocType: Purchase Invoice,Repeat on Day of Month,毎月繰り返し
@@ -3695,7 +3544,6 @@
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +37,Campaign Name is required,キャンペーン名が必要です
 DocType: Maintenance Visit,Maintenance Date,メンテナンス日
 DocType: Purchase Receipt Item,Rejected Serial No,拒否されたシリアル番号
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +51,Deep drawing,深絞り
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +40,New Newsletter,新しいニュースレター
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +157,Start date should be less than end date for Item {0},アイテム{0}の開始日は終了日より前でなければなりません
 apps/erpnext/erpnext/stock/doctype/item/item.js +17,Show Balance,残高表示
@@ -3707,7 +3555,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +119,BOM and Manufacturing Quantity are required,部品表と生産数量が必要です
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,エイジングレンジ２
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +450,Amount,額
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +147,Riveting,リベット
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,部品表交換
 ,Sales Analytics,販売分析
 DocType: Manufacturing Settings,Manufacturing Settings,製造設定
@@ -3719,20 +3566,19 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +207,New Account Name,新しいアカウント名
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,原材料供給費用
 DocType: Selling Settings,Settings for Selling Module,販売モジュール設定
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +73,Customer Service,顧客サービス
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Customer Service,顧客サービス
 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.,雇用候補者
 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 +70,Item {0} must be a stock Item,アイテム{0}は在庫アイテムでなければなりません
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,デフォルト作業中倉庫
 apps/erpnext/erpnext/config/accounts.py +107,Default settings for accounting transactions.,会計処理のデフォルト設定。
 apps/frappe/frappe/model/naming.py +40,{0} is required,{0}が必要です
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +21,Vacuum molding,真空成形
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,予定日は資材要求日の前にすることはできません
 DocType: Contact Us Settings,City,都市
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +132,Ultrasonic machining,超音波加工
 apps/frappe/frappe/templates/base.html +137,Error: Not a valid id?,エラー：有効なIDではない？
 apps/erpnext/erpnext/stock/get_item_details.py +125,Item {0} must be a Sales Item,アイテム{0}は販売アイテムでなければなりません
 DocType: Naming Series,Update Series Number,シリーズ番号更新
@@ -3740,7 +3586,7 @@
 DocType: Sales Order,Printing Details,印刷詳細
 DocType: Task,Closing Date,締切日
 DocType: Sales Order Item,Produced Quantity,生産数量
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +84,Engineer,エンジニア
+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 +379,Item Code required at Row No {0},行番号{0}にアイテムコードが必要です
 DocType: Sales Partner,Partner Type,パートナーの種類
@@ -3748,7 +3594,7 @@
 DocType: Authorization Rule,Customerwise Discount,顧客ごと割引
 DocType: Purchase Invoice,Against Expense Account,対経費
 DocType: Production Order,Production Order,製造指示
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +258,Installation Note {0} has already been submitted,設置票{0}はすでに提出されています
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +263,Installation Note {0} has already been submitted,設置票{0}はすでに提出されています
 DocType: Quotation Item,Against Docname,文書名に対して
 DocType: SMS Center,All Employee (Active),全ての従業員（アクティブ）
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,"表示
@@ -3758,19 +3604,19 @@
 DocType: Item,Re-Order Level,再注文レベル
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,製造指示を出すまたは分析用に原材料をダウンロードするための、アイテムと計画数を入力してください。
 apps/frappe/frappe/public/js/frappe/views/ganttview.js +45,Gantt Chart,ガントチャート
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +57,Part-time,パートタイム
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,Part-time,パートタイム
 DocType: Employee,Applicable Holiday List,適切な休日リスト
 DocType: Employee,Cheque,小切手
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,シリーズ更新
 apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Report Type is mandatory,レポートタイプは必須です
 DocType: Item,Serial Number Series,シリアル番号シリーズ
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},列{1}の在庫アイテム{0}には倉庫が必須です。
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +45,Retail & Wholesale,小売・卸売
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,小売・卸売
 DocType: Issue,First Responded On,初回返答
 DocType: Website Item Group,Cross Listing of Item in multiple groups,複数のグループのアイテムのクロスリスト
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +351,The First User: You,最初のユーザー：あなたです。
+apps/erpnext/erpnext/public/js/setup_wizard.js +101,The First User: You,最初のユーザー：あなたです。
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +48,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 +172,Successfully Reconciled,照合完了
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +119,Successfully Reconciled,照合完了
 DocType: Production Order,Planned End Date,計画終了日
 apps/erpnext/erpnext/config/stock.py +43,Where items are stored.,アイテムが保存される場所
 DocType: Tax Rule,Validity,正当性
@@ -3790,39 +3636,36 @@
 DocType: DocPerm,Level,レベル
 DocType: Purchase Taxes and Charges,On Net Total,差引計
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +160,Target warehouse in row {0} must be same as Production Order,{0}列のターゲット倉庫は製造注文と同じでなければなりません。
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +59,No permission to use Payment Tool,支払ツールを使用する権限がありません
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +97,No permission to use Payment Tool,支払ツールを使用する権限がありません
 apps/erpnext/erpnext/controllers/recurring_document.py +192,'Notification Email Addresses' not specified for recurring %s,%s の繰り返しに「通知メールアドレス」が指定されていません
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +86,Milling,フライス加工
 apps/erpnext/erpnext/accounts/doctype/account/account.py +99,Currency can not be changed after making entries using some other currency,他の通貨を使用してエントリーを作成した後には通貨を変更することができません
 DocType: Company,Round Off Account,丸め誤差アカウント
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +60,Nibbling,ニブリング加工
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,一般管理費
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +18,Consulting,コンサルティング
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +18,Consulting,コンサルティング
 DocType: Customer Group,Parent Customer Group,親顧客グループ
 apps/erpnext/erpnext/public/js/pos/pos.js +429,Change,変更
 DocType: Purchase Invoice,Contact Email,連絡先 メール
 DocType: Appraisal Goal,Score Earned,スコア獲得
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +393,"e.g. ""My Company LLC""",例「マイカンパニーLLC」
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +173,Notice Period,通知期間
+apps/erpnext/erpnext/public/js/setup_wizard.js +141,"e.g. ""My Company LLC""",例「マイカンパニーLLC」
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +173,Notice Period,通知期間
 DocType: Bank Reconciliation Detail,Voucher ID,伝票ID
 apps/erpnext/erpnext/setup/doctype/territory/territory.js +14,This is a root territory and cannot be edited.,ルート（大元の）地域なので編集できません
 DocType: Packing Slip,Gross Weight UOM,総重量数量単位
 DocType: Email Digest,Receivables / Payables,売掛／買掛
 DocType: Delivery Note Item,Against Sales Invoice,対納品書
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +63,Stamping,スタンピング成形
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +457,Credit Account,信用取引
 DocType: Landed Cost Item,Landed Cost Item,輸入費用項目
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +56,Show zero values,ゼロ値を表示
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,与えられた原材料の数量から製造／再梱包した後に得られたアイテムの数量
 DocType: Payment Reconciliation,Receivable / Payable Account,売掛金／買掛金
 DocType: Delivery Note Item,Against Sales Order Item,対受注アイテム
-apps/erpnext/erpnext/stock/doctype/item/item.py +521,Please specify Attribute Value for attribute {0},属性 {0} の属性値を指定してください
+apps/erpnext/erpnext/stock/doctype/item/item.py +525,Please specify Attribute Value for attribute {0},属性 {0} の属性値を指定してください
 DocType: Item,Default Warehouse,デフォルト倉庫
 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,金額なしで印刷
-apps/erpnext/erpnext/controllers/buying_controller.py +69,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,「税区分」は在庫アイテムではないので、「評価」や「評価と合計 」にすることはできません.
+apps/erpnext/erpnext/controllers/buying_controller.py +60,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,「税区分」は在庫アイテムではないので、「評価」や「評価と合計 」にすることはできません.
 DocType: User,Last Name,お名前（姓）
 DocType: Web Page,Left,退職
 DocType: Event,All Day,一日中
@@ -3830,7 +3673,7 @@
 DocType: Appraisal,Total Score (Out of 5),総得点（5点満点）
 DocType: Contact Us Settings,State,状態
 DocType: Batch,Batch,バッチ
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +51,Balance,残高
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +28,Balance,残高
 DocType: Project,Total Expense Claim (via Expense Claims),総経費請求（経費請求経由）
 DocType: User,Gender,性別
 DocType: Journal Entry,Debit Note,借方票
@@ -3860,8 +3703,7 @@
 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/setup/page/setup_wizard/fixtures/operations.py +76,Seaming,シーミング
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +197,"Company Email ID not found, hence mail not sent",会社メールアドレスが見つかなかったため、送信されませんでした。
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +206,"Company Email ID not found, hence mail not sent",会社メールアドレスが見つかなかったため、送信されませんでした。
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),資金運用（資産）
 DocType: Production Planning Tool,Filter based on item,項目に基づくフィルター
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +451,Debit Account,デビットアカウント
@@ -3873,17 +3715,16 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +95,{0} {1} has been modified. Please refresh.,{0} {1}が変更されています。画面を更新してください。
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,以下の日にはユーザーからの休暇申請を受け付けない
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +591,From Opportunity,機会から
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +46,Blanking,剪断
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +166,Employee Benefits,従業員給付
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,Employee Benefits,従業員給付
 DocType: Sales Invoice,Is POS,POS
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +240,Packed quantity must equal quantity for Item {0} in row {1},梱包済数量は、行{1}のアイテム{0}の数量と等しくなければなりません
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +245,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.,顧客あて請求
 DocType: DocField,Default,初期値
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,プロジェクトID
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +466,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},行番号 {0}：経費請求{1}に対して保留額より大きい額は指定できません。保留額は {2} です
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +468,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}登録者追加済
 DocType: Maintenance Schedule,Schedule,スケジュール
 DocType: Cost Center,"Define Budget for this Cost Center. To set budget action, see ""Company List""",このコストセンターの予算を定義します。予算のアクションを設定するには、「会社リスト」を参照してください
@@ -3894,7 +3735,7 @@
 apps/erpnext/erpnext/public/js/pos/pos.js +91,Price List not found or disabled,価格表が見つからないか無効になっています
 DocType: Expense Claim,Approved,承認済
 DocType: Pricing Rule,Price,価格
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +79,Employee relieved on {0} must be set as 'Left',{0}から取り除かれた従業員は「退職」に設定されなければなりません
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +88,Employee relieved on {0} must be set as 'Left',{0}から取り除かれた従業員は「退職」に設定されなければなりません
 DocType: Item,"Selecting ""Yes"" will give a unique identity to each entity of this item which can be viewed in the Serial No master.",「はい」を選択すると、シリアル番号のマスターで表示することができます。このアイテムの各内容に固有のIDを提供します。
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +39,Appraisal {0} created for Employee {1} in the given date range,指定期間内の従業員 {1} の査定 {0} が作成されました
 DocType: Employee,Education,教育
@@ -3905,7 +3746,7 @@
 apps/frappe/frappe/desk/moduleview.py +67,Standard Reports,標準レポート
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,会計仕訳
 DocType: Delivery Note Item,Available Qty at From Warehouse,倉庫からの利用可能な数量
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +209,Please select Employee Record first.,先に従業員レコードを選択してください
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +224,Please select Employee Record first.,先に従業員レコードを選択してください
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},行{0}：当事者／アカウントが {3} {4} の {1} / {2}と一致しません
 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 +233,Please enter Expense Account,経費勘定を入力してください
@@ -3918,46 +3759,43 @@
 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,上記の基準に基づいて（配送するために保留中の）受注を取り込む
 DocType: DocShare,Document Type,文書タイプ
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +565,From Supplier Quotation,サプライヤー見積から
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +588,From Supplier Quotation,サプライヤー見積から
 DocType: Deduction Type,Deduction Type,控除の種類
 DocType: Attendance,Half Day,半日
 DocType: Pricing Rule,Min Qty,最小数量
 DocType: Features Setup,"To track items in sales and purchase documents with batch nos. ""Preferred Industry: Chemicals""",バッチ番号とともに販売・購入文書内のアイテムを追跡します。 「優先業種：化学」
 DocType: GL Entry,Transaction Date,取引日
 DocType: Production Plan Item,Planned Qty,計画数量
-apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +91,Total Tax,税合計
+apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +93,Total Tax,税合計
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +178,For Quantity (Manufactured Qty) is mandatory,数量（製造数量）が必須です
 DocType: Stock Entry,Default Target Warehouse,デフォルト入庫先倉庫
 DocType: Purchase Invoice,Net Total (Company Currency),差引計（会社通貨）
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +79,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,行{0}：当事者タイプと当事者は売掛金／買掛金勘定に対してのみ適用されます
 DocType: Notification Control,Purchase Receipt Message,領収書のメッセージ
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +95,Total allocated leaves are more than period,総割り当てられた葉は期間以上あります
 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.,レコードアイテムの移動
 DocType: Newsletter List Subscriber,Newsletter List Subscriber,ニュースレターリスト購読者
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +164,Morticing,ホゾ穴加工
 DocType: Email Account,Service,サービス
 DocType: Hub Settings,Hub Settings,ハブの設定
 DocType: Project,Gross Margin %,粗利益率％
 DocType: BOM,With Operations,操作で
 apps/erpnext/erpnext/accounts/party.py +232,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,会計エントリは、すでに同社{1}の通貨{0}で行われています。通貨{0}と債権又は債務のアカウントを選択してください。
 ,Monthly Salary Register,月給登録
-apps/frappe/frappe/website/template.py +140,Next,次
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard_page.html +17,Next,次
 DocType: Warranty Claim,If different than customer address,顧客の住所と異なる場合
 DocType: BOM Operation,BOM Operation,部品表の操作
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +118,Electropolishing,電解研磨
 DocType: Purchase Taxes and Charges,On Previous Row Amount,前行の額
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +24,Please enter Payment Amount in atleast one row,支払額は少なくとも1行入力してください
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +33,Please enter Payment Amount in atleast one row,支払額は少なくとも1行入力してください
 DocType: POS Profile,POS Profile,POSプロフィール
 apps/erpnext/erpnext/config/accounts.py +153,"Seasonality for setting budgets, targets etc.",予算や目標などを設定する期間
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +238,Row {0}: Payment Amount cannot be greater than Outstanding Amount,行{0}：支払金額は残高を超えることはできません
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +46,Total Unpaid,未払合計
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +21,Time Log is not billable,時間ログは請求できません
 apps/erpnext/erpnext/stock/get_item_details.py +128,"Item {0} is a template, please select one of its variants",アイテム{0}はテンプレートです。バリエーションのいずれかを選択してください
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +528,Purchaser,購入者
+apps/erpnext/erpnext/public/js/setup_wizard.js +272,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 +71,Please enter the Against Vouchers manually,伝票を入力してください
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +107,Please enter the Against Vouchers manually,伝票を入力してください
 DocType: SMS Settings,Static Parameters,静的パラメータ
 DocType: Purchase Order,Advance Paid,立替金
 DocType: Item,Item Tax,アイテムごとの税
@@ -3966,14 +3804,12 @@
 apps/erpnext/erpnext/config/crm.py +48,Send mass SMS to your contacts,連絡先にまとめてSMSを送信
 DocType: Purchase Taxes and Charges,Consider Tax or Charge for,税金・料金を考慮
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,実際の数量は必須です
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +42,Cross-rolling,クロス圧延加工
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +132,Credit Card,クレジットカード
+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 +95,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,租税公課を入力してください
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +85,Machining,機械加工
 DocType: Sales Invoice Item,Drop Ship,ドロップシップ
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children",ここでは、親、配偶者や子供の名前と職業などの家族の詳細を保持することができます
 DocType: Hub Settings,Seller Name,販売者名
@@ -3983,7 +3819,7 @@
 DocType: Stock Entry,Repack,再梱包
 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/setup/page/setup_wizard/setup_wizard.js +500,Attach Logo,ロゴを添付
+apps/erpnext/erpnext/public/js/setup_wizard.js +246,Attach Logo,ロゴを添付
 DocType: Customer,Commission Rate,手数料率
 apps/erpnext/erpnext/stock/doctype/item/item.js +38,Make Variant,バリエーション作成
 apps/erpnext/erpnext/config/hr.py +145,Block leave applications by department.,部門別休暇申請
@@ -3998,19 +3834,19 @@
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +105,Please select a csv file,csvファイルを選択してください
 DocType: Dropbox Backup,Send Backups to Dropbox,Dropboxにバックアップを送信
 DocType: Purchase Order,To Receive and Bill,受領・請求する
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +94,Designer,デザイナー
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Designer,デザイナー
 apps/erpnext/erpnext/config/selling.py +121,Terms and Conditions Template,規約のテンプレート
 DocType: Serial No,Delivery Details,納品詳細
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +383,Cost Center is required in row {0} in Taxes table for type {1},タイプ{1}のための税金テーブルの行{0}にコストセンターが必要です
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +386,Cost Center is required in row {0} in Taxes table for type {1},タイプ{1}のための税金テーブルの行{0}にコストセンターが必要です
 DocType: Item,Automatically create Material Request if quantity falls below this level,量がこのレベルを下回った場合、自動的に資材要求を作成します
 ,Item-wise Purchase Register,アイテムごとの仕入登録
 DocType: Batch,Expiry Date,有効期限
-apps/erpnext/erpnext/stock/doctype/item/item.py +375,"To set reorder level, item must be a Purchase Item or Manufacturing Item",再注文のレベルを設定するには、アイテムは、購買アイテムや製造項目でなければなりません
+apps/erpnext/erpnext/stock/doctype/item/item.py +379,"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.,プロジェクトマスター
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,次の通貨に$などのような任意のシンボルを表示しません。
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +330, (Half Day),（半日）
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +374, (Half Day),（半日）
 DocType: Supplier,Credit Days,信用日数
 DocType: Leave Type,Is Carry Forward,繰越済
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +478,Get Items from BOM,部品表からアイテムを取得
@@ -4018,7 +3854,7 @@
 apps/erpnext/erpnext/config/manufacturing.py +120,Bill of Materials,部品表
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +77,Row {0}: Party Type and Party is required for Receivable / Payable account {1},行{0}：当事者タイプと当事者が売掛金／買掛金勘定 {1} に必要です
 DocType: Dropbox Backup,Send Notifications To,通知送信先
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html +26,Ref Date,参照日付
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +54,Ref Date,参照日付
 DocType: Employee,Reason for Leaving,退職理由
 DocType: Expense Claim Detail,Sanctioned Amount,承認予算額
 DocType: GL Entry,Is Opening,オープン
@@ -4026,4 +3862,3 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +188,Account {0} does not exist,アカウント{0}は存在しません
 DocType: Account,Cash,現金
 DocType: Employee,Short biography for website and other publications.,ウェブサイトや他の出版物のための略歴
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +31,Please create Salary Structure for employee {0},従業員{0}の給与構造を作成してください
diff --git a/erpnext/translations/km.csv b/erpnext/translations/km.csv
index 440ace5..2d3f0a1 100644
--- a/erpnext/translations/km.csv
+++ b/erpnext/translations/km.csv
@@ -1,12 +1,11 @@
 DocType: Employee,Salary Mode,របៀប​ប្រាក់​បៀវត្ស
 DocType: Cost Center,"Select Monthly Distribution, if you want to track based on seasonality.","ជ្រើស​ចែកចាយ​ប្រចាំខែ​, ប្រសិន​បើ​អ្នក​ចង់​តាមដាន​ដោយ​ផ្អែក​លើ​រដូវ​កាល​។"
 DocType: Employee,Divorced,លែងលះ​គ្នា
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +86,Warning: Same item has been entered multiple times.,ព្រមាន &amp; ‧​;​: ធាតុ​ដូចគ្នា​ត្រូវ​បាន​បញ្ចូល​ច្រើន​ដង​។
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +80,Warning: Same item has been entered multiple times.,ព្រមាន &amp; ‧​;​: ធាតុ​ដូចគ្នា​ត្រូវ​បាន​បញ្ចូល​ច្រើន​ដង​។
 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,អនុញ្ញាត​ឱ្យ​ធាតុ​នឹង​ត្រូវ​បាន​បន្ថែម​ជា​ច្រើន​ដង​នៅ​ក្នុង​ប្រតិ​ប​ត្តិ​ការ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +19,Consumer Products,ផលិតផល​ទំនិញ​ប្រើ​ប្រាស់
+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,សូម​ជ្រើស​ប្រភេទ​បក្ស​ទីមួយ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +90,Annealing,Annealing
 DocType: Item,Customer Items,ធាតុ​អតិថិជន
 DocType: Item,Publish Item to hub.erpnext.com,បោះពុម្ព​ផ្សាយ​ធាតុ​ទៅ hub.erpnext.com
 apps/erpnext/erpnext/config/setup.py +93,Email Notifications,ការ​ជូនដំណឹង​អ៊ីមែល
@@ -18,13 +17,12 @@
 DocType: About Us Settings,Website,វេ​ប​សាយ
 DocType: POS Profile,Applicable for User,អាច​ប្រើប្រាស់​បាន​សំរាប់​អ្នកប្រើប្រាស់
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +169,"Stopped Production Order cannot be cancelled, Unstop it first to cancel",បញ្ឈប់​ការ​បញ្ជា​ទិញ​ផលិត​ផល​ដែល​មិន​អាច​ត្រូវ​បាន​លុបចោល​ឮ​វា​ជា​លើក​ដំបូង​ដើម្បី​បោះបង់
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +23,Compaction plus sintering,បង្រួម​បូក sintering
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* នឹង​ត្រូវ​បាន​គណនា​ក្នុង​ប្រតិបត្តិការ​នេះ​។
 DocType: Purchase Order,Customer Contact,ទំនាក់ទំនង​អតិថិជន
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +549,From Material Request,ពី​សម្ភារៈ​ស្នើ​សុំ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +572,From Material Request,ពី​សម្ភារៈ​ស្នើ​សុំ
 DocType: Job Applicant,Job Applicant,ការងារ​ដែល​អ្នក​ដាក់ពាក្យសុំ
 apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,មិន​មាន​លទ្ធផល​ជា​ច្រើន​ទៀត​។
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +78,Legal,ផ្នែក​ច្បាប់
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +34,Legal,ផ្នែក​ច្បាប់
 DocType: C-Form,Customer,អតិថិជន
 DocType: Purchase Receipt Item,Required By,ដែល​បាន​ទាមទារ​ដោយ
 DocType: Delivery Note,Return Against Delivery Note,ការ​វិល​ត្រឡប់​ពី​ការ​ប្រឆាំង​នឹង​ការ​ផ្តល់​ចំណាំ
@@ -36,15 +34,14 @@
 DocType: Manufacturing Settings,Default 10 mins,10 នាទី​លំនាំ​ដើម
 DocType: Leave Type,Leave Type Name,ទុក​ឱ្យ​ប្រភេទ​ឈ្មោះ
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +148,Series Updated Successfully,កម្រង​ឯកសារ​បន្ទាន់​សម័យ​ដោយ​ជោគជ័យ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +150,Stitching,ការ stitches
 DocType: Pricing Rule,Apply On,អនុវត្ត​នៅ​លើ
 DocType: Item Price,Multiple Item prices.,តម្លៃ​ធាតុ​ជា​ច្រើន​។
 ,Purchase Order Items To Be Received,ការ​បញ្ជា​ទិញ​ធាតុ​ដែល​នឹង​ត្រូវ​ទទួល​បាន
 DocType: SMS Center,All Supplier Contact,ទាំងអស់​ផ្គត់ផ្គង់​ទំនាក់ទំនង
 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/hr/doctype/leave_application/leave_application.py +189,New Leave Application,ចាកចេញ​កម្មវិធី​ថ្មី
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +134,Bank Draft,សេចក្តី​ព្រាង​ធនាគារ
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +204,New Leave Application,ចាកចេញ​កម្មវិធី​ថ្មី
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +134,Bank Draft,សេចក្តី​ព្រាង​ធនាគារ
 DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,1. ដើម្បី​រក្សា​អតិថិជន​លេខ​កូដ​ធាតុ​ដែល​មាន​ប្រាជ្ញា​និង​ដើម្បី​ធ្វើ​ឱ្យ​ពួកគេ​អាច​ស្វែងរក​ដោយ​ផ្អែក​លើ​ការ​ប្រើ​ប្រាស់​កូដ​របស់​ពួក​គេ​ជម្រើស​នេះ
 DocType: Mode of Payment Account,Mode of Payment Account,របៀប​នៃ​ការ​ទូទាត់​គណនី
 apps/erpnext/erpnext/stock/doctype/item/item.js +34,Show Variants,បង្ហាញ​វ៉ា​រ្យ៉​ង់
@@ -55,23 +52,21 @@
 DocType: Designation,Designation,ការ​រចនា
 DocType: Production Plan Item,Production Plan Item,ផលិតកម្ម​ធាតុ​ផែនការ
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +13,Make new POS Profile,ទម្រង់​ម៉ាស៊ីន​ឆូត​កាត​ថ្មី​បាន​ធ្វើ​ឱ្យ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +31,Health Care,ការថែទាំ​សុខភាព
+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 +494,Invoice,វិ​ក័​យ​ប័ត្រ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +519,Invoice,វិ​ក័​យ​ប័ត្រ
 DocType: Maintenance Schedule Item,Periodicity,រយៈ​ពេល
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +357,Email Address,អាសយដ្ឋាន​អ៊ី​ម៉ែ​ល
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +21,Defense,ការពារ​ជាតិ
+apps/erpnext/erpnext/public/js/setup_wizard.js +107,Email Address,អាសយដ្ឋាន​អ៊ី​ម៉ែ​ល
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,ការពារ​ជាតិ
 DocType: Company,Abbr,Abbr
 DocType: Appraisal Goal,Score (0-5),ពិន្ទុ (0-5​)
 DocType: Delivery Note,Vehicle No,គ្មាន​យានយន្ត
 apps/erpnext/erpnext/public/js/pos/pos.js +528,Please select Price List,សូម​ជ្រើស​តារាងតម្លៃ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +162,Woodworking,woodworking
 DocType: Production Order Operation,Work In Progress,ការងារ​ក្នុង​វឌ្ឍនភាព
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +153,3D printing,ការ​បោះពុម្ព 3D
 DocType: Employee,Holiday List,បញ្ជី​ថ្ងៃ​ឈប់​សម្រាក
 DocType: Time Log,Time Log,កំណត់ហេតុ​ម៉ោង
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +530,Accountant,គណនេយ្យករ
+apps/erpnext/erpnext/public/js/setup_wizard.js +274,Accountant,គណនេយ្យករ
 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.","កំណត់​ហេតុ​នៃ​សកម្មភាព​អនុវត្ត​ដោយ​អ្នក​ប្រើ​ប្រឆាំង​នឹង​ភារកិច្ច​ដែល​អាច​ត្រូវ​បាន​ប្រើ​សម្រាប់​តាមដាន​ពេល​វេលា​, វិ​ក័​យ​ប័ត្រ​។"
@@ -83,17 +78,18 @@
 DocType: Bin,Quantity Requested for Purchase,បរិមាណ​ដែល​បាន​ស្នើ​សម្រាប់​ការ​ទិញ
 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/setup/page/setup_wizard/setup_wizard.js +626,Kg,គីឡូក្រាម
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Kg,គីឡូក្រាម
 apps/erpnext/erpnext/config/hr.py +48,Opening for a Job.,បើក​សម្រាប់​ការងារ​។
 DocType: Item Attribute,Increment,ចំនួន​បន្ថែម
 apps/erpnext/erpnext/public/js/stock_analytics.js +63,Select Warehouse...,ជ្រើស​ឃ្លាំង ...
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +6,Advertising,ការ​ផ្សព្វផ្សាយ​ពាណិជ្ជកម្ម
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,ការ​ផ្សព្វផ្សាយ​ពាណិជ្ជកម្ម
+apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,ក្រុម​ហ៊ុន​ដូច​គ្នា​ត្រូវ​បាន​បញ្ចូល​ច្រើន​ជាង​ម្ដង
 DocType: Employee,Married,រៀបការ​ជាមួយ
 DocType: Payment Reconciliation,Reconcile,សម្រប​សម្រួល
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +30,Grocery,គ្រឿងទេស
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,គ្រឿងទេស
 DocType: Quality Inspection Reading,Reading 1,ការ​អាន​ទី 1
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Make Bank Entry,ធ្វើ​ឱ្យ​ធាតុ​របស់​ធនាគារ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +40,Pension Funds,មូលនិធិ​សោធន​និវត្តន៍
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,មូលនិធិ​សោធន​និវត្តន៍
 apps/erpnext/erpnext/accounts/doctype/account/account.py +142,Warehouse is mandatory if account type is Warehouse,ឃ្លាំង​គឺ​ជា​ចាំបាច់​បើ​សិន​ជា​ប្រភេទ​គណនី​គឺ​ឃ្លាំង
 DocType: SMS Center,All Sales Person,ការ​លក់​របស់​បុគ្គល​ទាំង​អស់
 DocType: Lead,Person Name,ឈ្មោះ​បុគ្គល
@@ -113,7 +109,7 @@
 DocType: Quality Inspection,Get Specification Details,ទទួល​បាន​ព័ត៌មាន​លម្អិត​ជាក់លាក់
 DocType: Lead,Interested,មាន​ការ​ចាប់​អារម្មណ៍
 apps/erpnext/erpnext/config/manufacturing.py +14,Bill of Material,វិ​ក័​យ​ប័ត្រ​នៃ​សម្ភារៈ
-apps/erpnext/erpnext/public/js/stock_analytics.js +45,Opening,ពិធី​បើក
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +158,Opening,ពិធី​បើក
 DocType: Item,Copy From Item Group,ការ​ចម្លង​ពី​ធាតុ​គ្រុប
 DocType: Journal Entry,Opening Entry,ការ​បើក​ចូល
 DocType: Stock Entry,Additional Costs,ការ​ចំណាយ​បន្ថែម​ទៀត
@@ -125,22 +121,21 @@
 DocType: Employee Education,Under Graduate,នៅ​ក្រោម​បញ្ចប់​ការ​សិក្សា
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +22,Target On,គោល​ដៅ​នៅ​លើ
 DocType: BOM,Total Cost,ការ​ចំណាយ​សរុប
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +99,Reaming,Reaming
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +9,Activity Log:,កំណត់​ហេតុ​សកម្មភាព​:
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +44,Real Estate,អចលនទ្រព្យ
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +44,Real Estate,អចលនទ្រព្យ
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +4,Statement of Account,សេចក្តី​ថ្លែងការណ៍​របស់​គណនី
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +41,Pharmaceuticals,ឱសថ
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,ឱសថ
 DocType: Expense Claim Detail,Claim Amount,ចំនួន​ពាក្យ​ប​ណ្តឹ​ង
 DocType: Employee,Mr,លោក
 DocType: Custom Script,Client,ម៉ាស៊ីន​ភ្ញៀវ
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,ប្រភេទ​ក្រុមហ៊ុន​ផ្គត់ផ្គង់ / ផ្គត់ផ្គង់
 DocType: Naming Series,Prefix,បុព្វបទ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Consumable,អ្នក​ប្រើ​ប្រាស់
+apps/erpnext/erpnext/public/js/setup_wizard.js +359,Consumable,អ្នក​ប្រើ​ប្រាស់
 DocType: Upload Attendance,Import Log,នាំចូល​ចូល
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.js +19,Send,ផ្ញើ
 DocType: Sales Invoice Item,Delivered By Supplier,បាន​បញ្ជូន​ដោយ​អ្នក​ផ្គត់​ផ្គង់
 DocType: SMS Center,All Contact,ទំនាក់ទំនង​ទាំងអស់
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +164,Annual Salary,ប្រាក់បៀវត្ស​ប្រចាំឆ្នាំ​ប្រាក់
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +164,Annual Salary,ប្រាក់បៀវត្ស​ប្រចាំឆ្នាំ​ប្រាក់
 DocType: Period Closing Voucher,Closing Fiscal Year,បិទ​ឆ្នាំ​សារពើពន្ធ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +69,Stock Expenses,ការ​ចំណាយ​ភាគ​ហ៊ុន
 DocType: Newsletter,Email Sent?,អ៊ី​ម៉ែ​ល​?
@@ -154,16 +149,14 @@
 DocType: Time Log Batch,Will be updated after Sales Invoice is Submitted.,នឹង​ត្រូវ​បាន​បន្ថែម​បន្ទាប់​ពី​មាន​វិ​ក័​យ​ប័ត្រ​លក់​ត្រូវ​បាន​ដាក់​ស្នើ​។
 apps/erpnext/erpnext/config/hr.py +90,Settings for HR Module,ការ​កំណត់​សម្រាប់​ម៉ូឌុល​ធនធានមនុស្ស
 DocType: SMS Center,SMS Center,ផ្ញើ​សារ​ជា​អក្សរ​មជ្ឈមណ្ឌល
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +78,Straightening,straightening
 DocType: BOM Replace Tool,New BOM,Bom ដែល​ថ្មី
 apps/erpnext/erpnext/config/projects.py +28,Batch Time Logs for billing.,កំណត់ហេតុ​ជា​បាច់​សម្រាប់​វិ​ក័​យ​ប័ត្រ​វេលា​ម៉ោង​។
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +15,Countergravity casting,Countergravity សម្ដែង
 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/setup/page/setup_wizard/fixtures/industry_type.py +14,Broadcasting,ការ​ផ្សព្វផ្សាយ
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +140,Execution,ការ​ប្រតិបត្តិ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +364,The first user will become the System Manager (you can change this later).,អ្នក​ប្រើ​ដំបូង​នឹង​ក្លាយ​​​ជា​អ្នក​គ្រប់​គ្រង​ប្រព័ន្ធ (អ្នក​អាច​ផ្លាស់​ប្តូ​រ​នៅ​ពេល​ក្រោយ​នេះ​) ។
+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/public/js/setup_wizard.js +114,The first user will become the System Manager (you can change this later).,អ្នក​ប្រើ​ដំបូង​នឹង​ក្លាយ​​​ជា​អ្នក​គ្រប់​គ្រង​ប្រព័ន្ធ (អ្នក​អាច​ផ្លាស់​ប្តូ​រ​នៅ​ពេល​ក្រោយ​នេះ​) ។
 apps/erpnext/erpnext/config/manufacturing.py +39,Details of the operations carried out.,ព​ត៌​មាន​លំអិត​នៃ​ការ​ប្រតិ​ប​ត្ដិ​ការ​នេះ​បាន​អនុវត្ត​។
 DocType: Serial No,Maintenance Status,ស្ថានភាព​ថែទាំ
 apps/erpnext/erpnext/config/stock.py +263,Items and Pricing,ធាតុ​និង​តម្លៃ
@@ -176,7 +169,6 @@
 DocType: Pricing Rule,Discount on Price List Rate (%),ការ​បញ្ចុះ​តំលៃ​លើ​តំលៃ​អត្រា​បញ្ជី (%​)
 apps/frappe/frappe/public/js/frappe/form/print.js +96,Start,ការ​ចាប់​ផ្តើ​ម
 DocType: User,First Name,ឈ្មោះ​ជា​លើក​ដំបូង
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +12,Full-mold casting,ការ​សម្ដែង​ពេញ​ផ្សិត
 DocType: Offer Letter,Select Terms and Conditions,ជ្រើស​លក្ខខណ្ឌ
 DocType: Production Planning Tool,Sales Orders,ការ​បញ្ជា​ទិញ​ការ​លក់
 DocType: Purchase Taxes and Charges,Valuation,ការ​វាយ​តម្លៃ
@@ -188,8 +180,7 @@
 DocType: Bank Reconciliation,Bank Account,គណនី​ធនាគារ
 DocType: Leave Type,Allow Negative Balance,អនុញ្ញាត​ឱ្យ​មាន​តុល្យភាព​អវិជ្ជមាន
 DocType: Selling Settings,Default Territory,ដែនដី​លំនាំ​ដើម
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +53,Television,ទូរ​ទ​ស្ស​ន៏
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +138,Gashing,Gashing
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,ទូរ​ទ​ស្ស​ន៏
 DocType: Production Order Operation,Updated via 'Time Log',ធ្វើ​ឱ្យ​ទាន់​សម័យ​តាម​រយៈ &quot;ពេល​វេលា​កំណត់​ហេតុ &#39;
 DocType: Naming Series,Series List for this Transaction,បញ្ជី​ស៊េរី​សម្រាប់​ប្រតិបត្តិការ​នេះ
 DocType: Sales Invoice,Is Opening Entry,ត្រូវ​ការ​បើក​ចូល
@@ -202,35 +193,33 @@
 DocType: Lead,Address & Contact,អាសយដ្ឋាន​ទំនាក់ទំនង
 DocType: Leave Allocation,Add unused leaves from previous allocations,បន្ថែម​ស្លឹក​ដែល​មិន​បាន​ប្រើ​ពី​ការ​បែង​ចែក​ពី​មុន
 DocType: Newsletter List,Total Subscribers,អតិថិជន​សរុប
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +575,Contact Name,ឈ្មោះ​ទំនាក់ទំនង
+,Contact Name,ឈ្មោះ​ទំនាក់ទំនង
 DocType: Production Plan Item,SO Pending Qty,សូ​ដែល​មិនទាន់​បាន Qty
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,បង្កើត​ប័ណ្ណ​ប្រាក់​បៀវត្ស​ចំពោះ​លក្ខណៈ​វិនិច្ឆ័យ​ដែល​បាន​រៀបរាប់​ខាងលើ​។
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,ស្នើ​សុំ​សម្រាប់​ការ​ទិញ​។
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +107,Double housing,លំនៅ​ដ្ឋាន​បាន​កើន​ទ្វេ​រ​ដង
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +156,Only the selected Leave Approver can submit this Leave Application,មាន​តែ​ការ​យល់​ព្រម​ចាកចេញ​ជ្រើស​អាច​ដាក់ពាក្យសុំ​ចាកចេញ​នេះ
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +171,Only the selected Leave Approver can submit this Leave Application,មាន​តែ​ការ​យល់​ព្រម​ចាកចេញ​ជ្រើស​អាច​ដាក់ពាក្យសុំ​ចាកចេញ​នេះ
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,បន្ថយ​កាលបរិច្ឆេទ​ត្រូវ​តែ​ធំ​ជាង​កាលបរិច្ឆេទ​នៃ​ការ​ចូលរួម
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +172,Leaves per Year,ស្លឹក​មួយ​ឆ្នាំ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +172,Leaves per Year,ស្លឹក​មួយ​ឆ្នាំ
 DocType: Time Log,Will be updated when batched.,នឹង​ត្រូវ​បាន​បន្ថែម​ពេល batched ។
 DocType: Bulk Email,Message,សារ​ស្វាគមន៍
 DocType: Item Website Specification,Item Website Specification,បញ្ជាក់​ធាតុ​គេហទំព័រ
 DocType: Dropbox Backup,Dropbox Access Key,Dropbox គន្លឹះ​ចូល​ដំណើរ​ការ
 DocType: Payment Tool,Reference No,សេចក្តី​យោង​គ្មាន
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +348,Leave Blocked,ទុក​ឱ្យ​ទប់ស្កាត់
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +392,Leave Blocked,ទុក​ឱ្យ​ទប់ស្កាត់
 apps/erpnext/erpnext/accounts/utils.py +339,Annual,ប្រចាំ​ឆ្នាំ
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,ធាតុ​ភាគ​ហ៊ុន​ការផ្សះផ្សា
 DocType: Stock Entry,Sales Invoice No,ការ​លក់​វិ​ក័​យ​ប័ត្រ​គ្មាន
 DocType: Material Request Item,Min Order Qty,លោក Min លំដាប់ Qty
 DocType: Lead,Do Not Contact,កុំ​ទំនាក់ទំនង
 DocType: Sales Invoice,The unique id for tracking all recurring invoices. It is generated on submit.,លេខ​សម្គាល់​តែ​មួយ​គត់​សម្រាប់​ការ​តាម​ដាន​វិ​ក័​យ​ប័ត្រ​កើតឡើង​ទាំងអស់​។ វា​ត្រូវ​បាន​គេ​បង្កើត​នៅ​លើ​ការ​ដាក់​ស្នើ​។
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +93,Software Developer,អភិវឌ្ឍន៍​កម្មវិធី
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +93,Software Developer,អភិវឌ្ឍន៍​កម្មវិធី
 DocType: Item,Minimum Order Qty,អប្ប​រ​មា​លំដាប់ Qty
 DocType: Pricing Rule,Supplier Type,ប្រភេទ​ក្រុមហ៊ុន​ផ្គត់ផ្គង់
 DocType: Item,Publish in Hub,បោះ​ពុម្ព​ផ្សាយ​នៅ​ក្នុង​មជ្ឈមណ្ឌល
 ,Terretory,Terretory
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +598,Material Request,សម្ភារៈ​ស្នើ​សុំ
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +607,Material Request,សម្ភារៈ​ស្នើ​សុំ
 DocType: Bank Reconciliation,Update Clearance Date,ធ្វើ​ឱ្យ​ទាន់​សម័យ​បោសសំអាត​កាលបរិច្ឆេទ
 DocType: Item,Purchase Details,ព​ត៌​មាន​លំអិត​ទិញ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +129,Wire brushing,ដុសធ្មេញ​ខ្សែ
 DocType: Employee,Relation,ការ​ទំនាក់ទំនង
 DocType: Shipping Rule,Worldwide Shipping,ការ​ដឹក​ជញ្ជូន​នៅ​ទូទាំង​ពិភពលោក
 apps/erpnext/erpnext/config/selling.py +23,Confirmed orders from Customers.,ការ​បញ្ជា​ទិញ​បាន​បញ្ជាក់​អះអាង​ពី​អតិថិជន​។
@@ -244,12 +233,11 @@
 DocType: Supplier,Address HTML,អាសយដ្ឋាន​របស់ HTML
 DocType: Lead,Mobile No.,លេខ​ទូរស័ព្ទ​ចល័ត
 DocType: Maintenance Schedule,Generate Schedule,បង្កើត​កាលវិភាគ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +81,Hubbing,Hubbing
 DocType: Purchase Invoice Item,Expense Head,ប្រមុខ​ការ​ចំណាយ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +86,Please select Charge Type first,សូម​ជ្រើស​ប្រភេទ​ទទួលបន្ទុក​ជា​លើក​ដំបូង
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,មាន​ចុងក្រោយ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +395,Max 5 characters,អតិបរមា 5 តួអក្សរ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +195,Select Your Language,ជ្រើស​ភាសា​របស់​អ្នក
+apps/erpnext/erpnext/public/js/setup_wizard.js +143,Max 5 characters,អតិបរមា 5 តួអក្សរ
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +245,Select Your Language,ជ្រើស​ភាសា​របស់​អ្នក
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,ការ​អនុម័ត​ចាកចេញ​ដំបូង​ក្នុង​បញ្ជី​នេះ​នឹង​ត្រូវ​បាន​កំណត់​ជា​លំនាំដើម​ចាកចេញ​ការ​អនុម័ត
 DocType: Manufacturing Settings,"Disables creation of time logs against Production Orders.
 Operations shall not be tracked against Production Order",អនុញ្ញាត​ការ​បង្កើត​នៃ​ការ​កំណត់​ហេតុ​ពេលវេលា​ដែល​ប្រឆាំង​នឹង​ការ​បញ្ជា​ទិញ​ផលិត​ផល​។ ប្រតិ​ប​ត្ដិ​ការ​នឹង​មិន​ត្រូវ​បាន​តាមដាន​ប្រឆាំង​នឹង​ដីកាសម្រេច​របស់​ផលិតកម្ម
@@ -260,8 +248,6 @@
 DocType: Item,Variant Of,វ៉ា​រ្យ៉​ង់​របស់
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +303,Completed Qty can not be greater than 'Qty to Manufacture',Qty បាន​បញ្ចប់​មិន​អាច​ជា​ធំ​ជាង Qty ដើម្បី​ផលិត &quot;
 DocType: DocType,Administrator,អ្នកគ្រប់គ្រង
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +136,Laser drilling,ការ​ខួង​ឡាស៊ែរ
-DocType: Stock UOM Replace Utility,New Stock UOM,ញូ​ហ៊ុន UOM
 DocType: Period Closing Voucher,Closing Account Head,បិទ​នាយក​គណនី
 DocType: Employee,External Work History,ការងារ​ខាងក្រៅ​ប្រវត្តិ
 apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,កំហុស​ក្នុង​ការ​យោង​សារាចរ
@@ -270,11 +256,8 @@
 DocType: Lead,Industry,វិស័យ​ឧស្សាហកម្ម
 DocType: Employee,Job Profile,ទម្រង់​ការងារ
 DocType: Newsletter,Newsletter,ព្រឹត្តិ​ប័ត្រ​ព័ត៌មាន
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +84,Hydroforming,Hydroforming
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +49,Necking,Necking
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,ជូន​ដំណឹង​ដោយ​អ៊ីមែល​នៅ​លើ​ការ​បង្កើត​សម្ភារៈ​ស្នើ​សុំ​ដោយ​ស្វ័យ​ប្រវត្តិ
 DocType: Journal Entry,Multi Currency,រូបិយប័ណ្ណ​ពហុ
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +51,Item is updated,ធាតុ​នេះ​ត្រូវ​បាន​ធ្វើ​ឱ្យ​ទាន់​សម័យ
 DocType: Async Task,System Manager,ប្រព័ន្ធ​អ្នកគ្រប់គ្រង
 DocType: Payment Reconciliation Invoice,Invoice Type,ប្រភេទ​វិ​ក័​យ​ប័ត្រ
 DocType: Sales Invoice Item,Delivery Note,ដឹកជញ្ជូន​ចំណាំ
@@ -297,18 +280,16 @@
 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","ដែល​មាន​នៅ​ក្នុង Bom​, ដឹកជញ្ជូន​ចំណាំ​, ការ​ទិញ​វិ​ក័​យ​ប័ត្រ​, ការ​បញ្ជាទិញ​ផលិតផល​, ការ​ទិញ​លំដាប់​, ទទួល​ទិញ​, លក់​វិ​ក័​យ​ប័ត្រ​, ការ​លក់​លំដាប់​, ហ៊ុន​ធាតុ​, Timesheet"
 DocType: Item Tax,Tax Rate,អត្រា​អាករ
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Select Item,ជ្រើស​ធាតុ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +540,Select Item,ជ្រើស​ធាតុ
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Convert to non-Group,បម្លែង​ទៅ​នឹង​ការ​មិន​គ្រុប
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +55,Purchase Receipt must be submitted,ទទួល​ទិញ​ត្រូវតែ​ត្រូវ​បាន​ដាក់​ជូន
-DocType: Stock UOM Replace Utility,Current Stock UOM,នា​ពេល​បច្ចុប្បន្ន​ហ៊ុន UOM
 apps/erpnext/erpnext/config/stock.py +53,Batch (lot) of an Item.,បាច់ (ច្រើន​) នៃ​វត្ថុ​មួយ​។
 DocType: C-Form Invoice Detail,Invoice Date,វិ​ក័​យ​ប័ត្រ​កាលបរិច្ឆេទ
 DocType: GL Entry,Debit Amount,ចំនួន​ឥណពន្ធ
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Your email address,អាសយដ្ឋាន​អ៊ី​ម៉ែ​ល​របស់​អ្នក
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +194,Please see attachment,សូម​មើល​ឯកសារ​ភ្ជាប់
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +203,Please see attachment,សូម​មើល​ឯកសារ​ភ្ជាប់
 DocType: Purchase Order,% Received,% បាន​ទទួល
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +109,Water jet cutting,កាត់​យន្តហោះ​ទឹក
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +24,Setup Already Complete!!,ការ​ដំឡើង​ពេញលេញ​រួច​ទៅ​ហើយ !!
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +20,Setup Already Complete!!,ការ​ដំឡើង​ពេញលេញ​រួច​ទៅ​ហើយ !!
 ,Finished Goods,ទំនិញ​បាន​បញ្ចប់
 DocType: Delivery Note,Instructions,សេចក្តី​ណែនាំ
 DocType: Quality Inspection,Inspected By,បាន​ត្រួតពិនិត្យ​ដោយ
@@ -321,6 +302,7 @@
 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,ការ​ផ្លាស់​ប្តូ​រ​រូបិយវត្ថុ
 DocType: Purchase Invoice Item,Item Name,ឈ្មោះ​ធាតុ
+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",ធាតុ​ដែល​នឹង​ត្រូវ​បាន​ស្នើ​រ​សុំ​ដែល​ជា &quot;ចេញ​ពី​ហ៊ុន​&quot; ពិចារណា​ឃ្លាំង​ទាំង​អស់​ដែល​មាន​មូលដ្ឋាន​លើ​ការ​ព្យាករ qty និង qty អប្ប​រ​មា​ការ​បញ្ជាទិញ
@@ -331,9 +313,8 @@
 DocType: Landed Cost Item,Applicable Charges,ការ​ចោទ​ប្រកាន់​ដែល​អាច​អនុវត្ត​បាន
 DocType: Workstation,Consumable Cost,ការ​ចំណាយ​របស់​អតិថិជន​បាន
 DocType: Purchase Receipt,Vehicle Date,កាលបរិច្ឆេទ​យានយន្ត
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +39,Medical,ពេទ្យ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +39,Medical,ពេទ្យ
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,ហេតុផល​សម្រាប់​ការ​សម្រក
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +36,Tube beading,អ​ងា​្ក​ំ​បំពង់
 DocType: Employee,Single,នៅ​លីវ
 DocType: Issue,Attachment,ឯកសារ​ភ្ជាប់
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +29,Budget cannot be set for Group Cost Center,ថវិកា​ដែល​មិន​អាច​ត្រូវ​បាន​កំណត់​សម្រាប់​មជ្ឈមណ្ឌល​ថ្លៃដើម​គ្រុប
@@ -352,10 +333,8 @@
 DocType: Account,Is Group,គឺ​ជា​ក្រុម
 DocType: Stock Settings,Automatically Set Serial Nos based on FIFO,កំណត់​សម្គាល់ Nos ដោយ​ស្វ័យប្រវត្តិ​ដោយ​ផ្អែកលើ FIFO &amp; ‧​;
 DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,ពិនិត្យ​ហាងទំនិញ​វិ​ក័​យ​ប័ត្រ​លេខ​ពិសេស
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +31,Thermoforming,Thermoforming
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +66,Slitting,រន្ធ
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +57,'To Case No.' cannot be less than 'From Case No.',&#39;ដើម្បី​សំណុំ​រឿង​លេខ &quot; មិន​អាច​តិច​ជាង​ពី​សំណុំ​រឿង​លេខ &quot;
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +104,Non Profit,មិន​រក​ប្រាក់​ចំណេញ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +104,Non Profit,មិន​រក​ប្រាក់​ចំណេញ
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_list.js +7,Not Started,មិន​បាន​ចាប់​ផ្តើ​ម
 DocType: Lead,Channel Partner,ឆា​នែ​ល​ដៃគូ
 DocType: Account,Old Parent,ឪពុក​ម្តាយ​ចាស់
@@ -366,10 +345,9 @@
 DocType: SMS Log,Sent On,ដែល​បាន​ផ្ញើ​នៅ​ថ្ងៃ
 DocType: Sales Order,Not Applicable,ដែល​មិនអាច​អនុវត្ត​បាន
 apps/erpnext/erpnext/config/hr.py +140,Holiday master.,ចៅហ្វាយ​ថ្ងៃ​ឈប់​សម្រាក​។
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +19,Shell molding,ការអប់រំ​របស់​ក្រុមហ៊ុន Shell
 DocType: Material Request Item,Required Date,កាលបរិច្ឆេទ​ដែល​បាន​ទាមទារ
 DocType: Delivery Note,Billing Address,វិ​ក័​យ​ប័ត្រ​អាសយដ្ឋាន
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +644,Please enter Item Code.,សូម​បញ្ចូល​លេខ​កូដ​ធាតុ​។
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +648,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,សរុប Qty
@@ -379,7 +357,7 @@
 DocType: Item Attribute,To Range,ដើម្បី​ជួរ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,មូលបត្រ​និង​ប្រាក់​បញ្ញើ
 DocType: Features Setup,Imports,ការ​នាំ​ចូល
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +144,Adhesive bonding,ភ្ជាប់ adhesive
+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.,កំណត់​ត្រា​ចូលរួម​។
@@ -387,25 +365,24 @@
 DocType: Sales Order Item,Used for Production Plan,ត្រូវ​បាន​ប្រើ​សម្រាប់​ផែនការ​ផលិតកម្ម
 DocType: System Settings,Loading...,កំពុង​ផ្ទុក ...
 DocType: DocField,Password,ពាក្យ​សម្ងាត់
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +155,Fused deposition modeling,ការ​បង្ហាញ​ម៉ូត​កំណ​ជាប់គ្នា
 DocType: Manufacturing Settings,Time Between Operations (in mins),ពេល​វេលា​រវាង​ការ​ប្រតិបត្តិការ (នៅ​ក្នុង​នាទី​)
 DocType: Customer,Buyer of Goods and Services.,អ្នក​ទិញ​ទំនិញ​និង​សេវាកម្ម​។
 DocType: Journal Entry,Accounts Payable,គណនី​ទូទាត់
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +24,Add Subscribers,បន្ថែម​អតិថិជន
 apps/erpnext/erpnext/public/js/feature_setup.js +220,""" does not exists",«​មិន​ដែល​មាន
 DocType: Pricing Rule,Valid Upto,រីក​រាយ​ជាមួយ​នឹង​មាន​សុពលភាព
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +564,List a few of your customers. They could be organizations or individuals.,រាយ​មួយ​ចំនួន​នៃ​អតិថិជន​របស់​អ្នក​។ ពួក​គេ​អាច​ត្រូវ​បាន​អង្គការ​ឬ​បុគ្គល​។
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,List a few of your customers. They could be organizations or individuals.,រាយ​មួយ​ចំនួន​នៃ​អតិថិជន​របស់​អ្នក​។ ពួក​គេ​អាច​ត្រូវ​បាន​អង្គការ​ឬ​បុគ្គល​។
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Direct Income,ប្រាក់​ចំណូល​ដោយ​ផ្ទាល់
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +33,"Can not filter based on Account, if grouped by Account","មិន​អាច​ត្រង​ដោយ​ផ្អែក​លើ​គណនី​, ប្រសិន​បើ​ការ​ដាក់​ជា​ក្រុម​តាម​គណនី"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +88,Administrative Officer,ម​ន្រ្តី​រដ្ឋបាល
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Administrative Officer,ម​ន្រ្តី​រដ្ឋបាល
 DocType: Payment Tool,Received Or Paid,ទទួល​បាន​ការ​ឬ​បង់
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +318,Please select Company,សូម​ជ្រើសរើស​ក្រុមហ៊ុន
 DocType: Stock Entry,Difference Account,គណនី​មាន​ភាព​ខុស​គ្នា
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +305,Please enter Warehouse for which Material Request will be raised,សូម​បញ្ចូល​ឃ្លាំង​ដែល​សម្ភារៈ​ស្នើ​សុំ​នឹង​ត្រូវ​បាន​លើកឡើង
 DocType: Production Order,Additional Operating Cost,ចំណាយ​ប្រតិបត្តិការ​បន្ថែម
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +20,Cosmetics,គ្រឿងសំអាង
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,គ្រឿងសំអាង
 DocType: DocField,Type,ប្រភេទ
-apps/erpnext/erpnext/stock/doctype/item/item.py +417,"To merge, following properties must be same for both items",រួម​បញ្ចូល​គ្នា​នោះ​មាន​លក្ខណៈ​សម្បត្តិ​ដូច​ខាង​ក្រោម​នេះ​ត្រូវ​ដូចគ្នា​សម្រាប់​ធាតុ​ទាំង​ពីរ
+apps/erpnext/erpnext/stock/doctype/item/item.py +421,"To merge, following properties must be same for both items",រួម​បញ្ចូល​គ្នា​នោះ​មាន​លក្ខណៈ​សម្បត្តិ​ដូច​ខាង​ក្រោម​នេះ​ត្រូវ​ដូចគ្នា​សម្រាប់​ធាតុ​ទាំង​ពីរ
 DocType: Communication,Subject,ប្រធានបទ
 DocType: Shipping Rule,Net Weight,ទំ​ង​ន់​សុទ្ធ
 DocType: Employee,Emergency Phone,ទូរស័ព្ទ​ស​ង្រ្គោះ​បន្ទាន់
@@ -415,7 +392,6 @@
 DocType: Journal Entry,Difference (Dr - Cr),ភាព​ខុស​គ្នា (លោក​វេជ្ជបណ្ឌិត - Cr​)
 DocType: Account,Profit and Loss,ប្រាក់​ចំណេញ​និង​ការ​បាត់​បង់
 apps/erpnext/erpnext/config/stock.py +293,Managing Subcontracting,ការ​គ្រប់គ្រង​អ្នកម៉ៅការ​បន្ត
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +58,New UOM must NOT be of type Whole Number,ញូ UOM ត្រូវ​តែ​មិន​មាន​ប្រភេទ​លេខ​ទាំងមូល
 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,អត្រា​ដែល​តារាង​តំលៃ​រូបិយប័ណ្ណ​ត្រូវ​បម្លែង​ទៅ​ជា​រូបិយប័ណ្ណ​មូលដ្ឋាន​របស់​ក្រុមហ៊ុន
 DocType: Selling Settings,Default Customer Group,លំនាំ​ដើម​គ្រុប​អតិថិជន
@@ -429,13 +405,13 @@
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,បន្ថែម / កែសម្រួល​ពន្ធ​និង​ការ​ចោទ​ប្រកាន់
 DocType: Purchase Invoice,Supplier Invoice No,វិ​ក័​យ​ប័ត្រ​គ្មាន​ការ​ផ្គត់​ផ្គង់
 DocType: Territory,For reference,សម្រាប់​ជា​ឯកសារ​យោង
-apps/erpnext/erpnext/public/js/account_tree_grid.js +52,Closing (Cr),បិទ (Cr​)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +227,Closing (Cr),បិទ (Cr​)
 DocType: Serial No,Warranty Period (Days),រយៈពេល​ធានា (ថ្ងៃ​)
 DocType: Installation Note Item,Installation Note Item,ធាតុ​ចំណាំ​ការ​ដំឡើង
 ,Pending Qty,ដំ​ណើ Qty
 DocType: Job Applicant,Thread HTML,HTML ដែល​ខ្សែ​ស្រ​ឡាយ
 DocType: Company,Ignore,មិន​អើពើ
-apps/erpnext/erpnext/controllers/buying_controller.py +135,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,ឃ្លាំង​ក្រុមហ៊ុន​ផ្គត់ផ្គង់​ចាំបាច់​សម្រាប់​ការ​ទទួល​ទិញ​កិច្ច​សន្យា
+apps/erpnext/erpnext/controllers/buying_controller.py +126,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,ឃ្លាំង​ក្រុមហ៊ុន​ផ្គត់ផ្គង់​ចាំបាច់​សម្រាប់​ការ​ទទួល​ទិញ​កិច្ច​សន្យា
 DocType: Pricing Rule,Valid From,មាន​សុពលភាព​ពី
 DocType: Sales Invoice,Total Commission,គណៈ​ក​ម្មា​ការ​សរុប
 DocType: Pricing Rule,Sales Partner,ដៃគូ​ការ​លក់
@@ -443,7 +419,7 @@
 DocType: Monthly Distribution,"**Monthly Distribution** helps you distribute your budget across months if you have seasonality in your business.
 
 To distribute a budget using this distribution, set this **Monthly Distribution** in the **Cost Center**",** ចែកចាយ​ប្រចាំខែ ** អាច​ជួយ​អ្នក​បាន​ចែក​ចាយ​ថវិកា​របស់​អ្នក​នៅ​ទូទាំង​ខែ​ប្រសិន​បើ​អ្នក​មាន​រដូវ​នៅ​ក្នុង​អាជីវកម្ម​របស់​អ្នក​។ ដើម្បី​ចែក​ចាយ​ថវិកា​រ​ដោយ​ប្រើ​ការ​ចែកចាយ​ការ​នេះ​កំណត់​ការ​ចែកចាយ​ប្រចាំខែ ** ** នៅ​ក្នុង​មជ្ឈមណ្ឌល​នេះ​បាន ** ** ចំ​នាយ
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +183,No records found in the Invoice table,បាន​រក​ឃើញ​នៅ​ក្នុង​តារាង​វិ​ក័​យ​ប័ត្រ​កំណត់ត្រា​គ្មាន
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +130,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 +84,Financial / accounting year.,ហិរញ្ញវត្ថុ / ស្មើ​ឆ្នាំ​។
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","សូម​អភ័យ​ទោស​, សៀរៀល​, Nos មិន​អាច​ត្រូវ​បាន​បញ្ចូល​គ្នា"
@@ -458,24 +434,24 @@
 DocType: Sales Order,Billing and Delivery Status,វិ​ក័​យ​ប័ត្រ​និង​ការ​ដឹកជញ្ជូន​ស្ថានភាព
 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/setup/page/setup_wizard/setup_wizard_page.html +16,Previous,មុន
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard_page.html +16,Previous,មុន
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +620,Sales Return,ត្រឡប់​មក​វិញ​ការ​លក់
 DocType: Production Planning Tool,Select Sales Orders from which you want to create Production Orders.,ជ្រើស​ការ​បញ្ជា​ទិញ​លក់​ដែល​អ្នក​ចង់​បង្កើត​ការ​បញ្ជាទិញ​ផលិតកម្ម​។
 DocType: Item,Delivered by Supplier (Drop Ship),ថ្លែង​ដោយ​ហាងទំនិញ (ទម្លាក់​នាវា​)
 apps/erpnext/erpnext/config/hr.py +120,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.,មូលដ្ឋាន​ទិន្នន័យ​របស់​អតិថិជន​។
 DocType: Quotation,Quotation To,សម្រង់​ដើម្បី
 DocType: Lead,Middle Income,ប្រាក់​ចំណូល​ពាក់​ក​ណ្តា​ល
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),ពិធី​បើក (Cr​)
 apps/erpnext/erpnext/accounts/utils.py +193,Allocated amount can not be negative,ចំនួន​ទឹកប្រាក់​ដែល​បាន​បម្រុង​ទុក​សម្រាប់​មិន​អាច​ជា​អវិជ្ជមាន
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +123,Tumbling,ធ្លាក់​ចុះ
 DocType: Purchase Order Item,Billed Amt,វិ​ក័​យ​ប័ត្រ AMT
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,មួយ​ឃ្លាំង​សម​ប្រឆាំង​នឹង​ធាតុ​ដែល​ភាគ​ហ៊ុន​ត្រូវ​បាន​ធ្វើ​ឡើង​។
 DocType: Event,Wednesday,ថ្ងៃ​ពុធ
 DocType: Sales Invoice,Customer's Vendor,អតិថិជន​របស់​អ្នក​លក់
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +214,Production Order is Mandatory,ផលិតកម្ម​លំដាប់​គឺ​ចាំបាច់
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +139,Proposal Writing,ការ​សរសេរ​សំណើ​រ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,Proposal Writing,ការ​សរសេរ​សំណើ​រ
 DocType: Fiscal Year Company,Fiscal Year Company,ក្រុមហ៊ុន​ឆ្នាំ​សារពើពន្ធ
 DocType: Packing Slip Item,DN Detail,ព​ត៌​មាន​លំអិត DN
 DocType: Time Log,Billed,ផ្សព្វ​ផ្សាយ
@@ -495,7 +471,7 @@
 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.","បន្ទាប់​មក Pricing ក្បួន​ត្រូវ​បាន​ត្រង​ចេញ​ដោយ​ផ្អែក​លើ​អតិថិជន​, ក្រុម​អតិថិជន​ដែនដី​, ហាងទំនិញ​, ប្រភេទ​ហាងទំនិញ​, យុទ្ធនាការ​, ការ​លក់​ដៃគូ​ល"
 apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.py +179,Please install dropbox python module,សូម​ដំឡើង​ម៉ូឌុល​ពស់ថ្លាន់ Dropbox
 DocType: Employee,Passport Number,លេខ​លិខិត​ឆ្លង​ដែន
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +82,Manager,កម្មវិធី​គ្រប់គ្រង
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Manager,កម្មវិធី​គ្រប់គ្រង
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +494,From Purchase Receipt,ពី​ការ​ទទួល​ទិញ
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +219,Same item has been entered multiple times.,ធាតុ​ដូចគ្នា​ត្រូវ​បាន​បញ្ចូល​ច្រើន​ដង​។
 DocType: SMS Settings,Receiver Parameter,អ្នក​ទទួល​ប៉ារ៉ាម៉ែត្រ
@@ -503,7 +479,6 @@
 DocType: Sales Person,Sales Person Targets,ការ​លក់​មនុស្ស​គោលដៅ
 apps/frappe/frappe/public/js/frappe/form/workflow.js +116,To,ដើម្បី
 apps/frappe/frappe/templates/base.html +145,Please enter email address,សូម​បញ្ចូល​អាសយដ្ឋាន​អ៊ី​ម៉ែ​ល
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +35,End tube forming,បំពង់​បញ្ចប់​ការ​បង្កើត
 DocType: Production Order Operation,In minutes,នៅ​ក្នុង​នាទី
 DocType: Issue,Resolution Date,ការ​ដោះស្រាយ​កាលបរិច្ឆេទ
 DocType: Selling Settings,Customer Naming By,ឈ្មោះ​អតិថិជន​ដោយ
@@ -513,7 +488,7 @@
 DocType: Customer,Fixed Days,ថ្ងៃ​ថេរ
 DocType: Sales Invoice,Packing List,បញ្ជី​វេច​ខ្ចប់
 apps/erpnext/erpnext/config/buying.py +28,Purchase Orders given to Suppliers.,ការ​បញ្ជា​ទិញ​ដែល​បាន​ផ្ដល់​ទៅ​ឱ្យ​អ្នក​ផ្គត់​ផ្គង់​។
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +43,Publishing,បោះ​ពុម្ព​ផ្សាយ
+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,ប្រើ​ប្រាស់
 DocType: Company,Round Off Cost Center,បិទ​ការ​ប្រកួត​ជុំ​មជ្ឈ​មណ្ឌល​ការ​ចំណាយ
@@ -527,7 +502,6 @@
 DocType: Pricing Rule,Sales Manager,ប្រធាន​ផ្នែក​លក់
 apps/frappe/frappe/public/js/frappe/model/model.js +492,Rename,ប្តូ​រ​ឈ្មោះ
 DocType: Journal Entry,Write Off Amount,បិទ​ការ​សរសេរ​ចំនួន​ទឹកប្រាក់
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +52,Bending,ពត់​កោង
 apps/frappe/frappe/core/page/user_permissions/user_permissions.js +246,Allow User,អនុញ្ញាត​ឱ្យ​អ្នក​ប្រើ
 DocType: Journal Entry,Bill No,គ្មាន​វិ​ក័​យ​ប័ត្រ
 DocType: Purchase Invoice,Quarterly,ប្រចាំ​ត្រីមាស
@@ -537,17 +511,16 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Please enter item details,សូម​បញ្ចូល​សេចក្ដី​លម្អិត​ធាតុ
 DocType: Purchase Receipt,Other Details,ព​ត៌​មាន​លំអិត​ផ្សេងទៀត
 DocType: Account,Accounts,គណនី
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +67,Marketing,ទីផ្សារ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +65,Straight shearing,ត្រង់​កាត់
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +67,Marketing,ទីផ្សារ
 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.,ដើម្បី​តាមដាន​ធាតុ​នៅ​ក្នុង​ការ​លក់​និង​ទិញ​ដោយ​ផ្អែក​លើ​ឯក​សារ​សម្គាល់​របស់​ពួក​គេ NOS ។ នេះ​ក៏​អាច​ត្រូវ​បាន​គេ​ប្រើ​ដើម្បី​តាមដាន​ព័ត៌មាន​លម្អិត​ធានា​នៃ​ផលិតផល​។
 DocType: Purchase Receipt Item Supplied,Current Stock,ហ៊ុន​នា​ពេល​បច្ចុប្បន្ន
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +99,Rejected Warehouse is mandatory against regected item,ឃ្លាំង​បាន​ច្រាន​ចោល​ការ​ប្រឆាំង​នឹង​ធាតុ​គឺ​ចាំបាច់ regected
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +102,Rejected Warehouse is mandatory against regected item,ឃ្លាំង​បាន​ច្រាន​ចោល​ការ​ប្រឆាំង​នឹង​ធាតុ​គឺ​ចាំបាច់ regected
 DocType: Account,Expenses Included In Valuation,ការ​ចំណាយ​ដែល​បាន​រួម​បញ្ចូល​នៅ​ក្នុង​ការ​វាយតម្លៃ
 DocType: Employee,Provide email id registered in company,ផ្តល់​ជូន​នូវ​លេខ​សម្គាល់​នៅ​ក្នុង​ក្រុមហ៊ុន​អ៊ី​ម៉ែ​ល​ដែល​បាន​ចុះ​ឈ្មោះ
 DocType: Hub Settings,Seller City,ទីក្រុង​អ្នក​លក់
 DocType: Email Digest,Next email will be sent on:,អ៊ី​ម៉ែ​ល​បន្ទាប់​នឹង​ត្រូវ​បាន​ផ្ញើ​នៅ​លើ​:
 DocType: Offer Letter Term,Offer Letter Term,ផ្តល់​ជូន​នូវ​លិខិត​អាណត្តិ
-apps/erpnext/erpnext/stock/doctype/item/item.py +492,Item has variants.,ធាតុ​មាន​វ៉ា​រ្យ៉​ង់​។
+apps/erpnext/erpnext/stock/doctype/item/item.py +496,Item has variants.,ធាតុ​មាន​វ៉ា​រ្យ៉​ង់​។
 DocType: Bin,Stock Value,ភាគ​ហ៊ុន​តម្លៃ
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,ប្រភេទ​ដើម​ឈើ
 DocType: BOM Explosion Item,Qty Consumed Per Unit,qty ប្រើ​ប្រាស់​ក្នុង​មួយ​ឯកតា
@@ -555,10 +528,9 @@
 DocType: Material Request Item,Quantity and Warehouse,បរិមាណ​និង​ឃ្លាំង
 DocType: Sales Invoice,Commission Rate (%),អត្រា​ប្រាក់​កំរៃ (%​)
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +172,"Against Voucher Type must be one of Sales Order, Sales Invoice or Journal Entry","ប្រឆាំង​នឹង​ប្រភេទ​ត្រូវ​តែ​មាន​ប័ណ្ណ​មួយ​នៃ​ការ​លក់​ស​ណ្តា​ប់​ធ្នាប់​, ការ​លក់​វិ​ក័​យ​ប័ត្រ​ឬ​ធាតុ​ទិនានុប្បវត្តិ"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +139,Biomachining,Biomachining
 apps/erpnext/erpnext/setup/utils.py +89,Unable to find exchange rate,មិន​អាច​រក​ឃើញ​អត្រា​ប្តូ​រ​ប្រាក់
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +7,Aerospace,អវកាស
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +19,Welcome,សូម​ស្វា​គម​ន៏
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +7,Aerospace,អវកាស
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +40,Welcome,សូម​ស្វា​គម​ន៏
 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.,ទំនិញ​ទទួល​បាន​ពី​ការ​ផ្គត់​ផ្គង់​។
@@ -580,7 +552,7 @@
 DocType: Employee,Cell Number,លេខ​ទូរស័ព្ទ
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,ការ​បាត់​បង់
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +120,You can not enter current voucher in 'Against Journal Entry' column,អ្នក​មិន​អាច​បញ្ចូល​ទឹក​ប្រាក់​ក្នុង​ពេល​បច្ចុប្បន្ន​នៅ​ក្នុង​ការ​ប្រឆាំង​នឹង​ការ​ធាតុ​ទិនានុប្បវត្តិ &quot;ជួរ​ឈរ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +25,Energy,ថាមពល
+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.,សេចក្តី​ថ្លែង​ការ​ប្រាក់​បៀវត្សរ៍​ប្រចាំ​ខែ​។
 DocType: Item Group,Website Specifications,ជាក់លាក់​វេ​ប​សាយ
@@ -618,9 +590,8 @@
 DocType: Address,Personal,ផ្ទាល់ខ្លួន
 DocType: Expense Claim Detail,Expense Claim Type,ការ​ចំណាយ​ប្រភេទ​ពាក្យ​ប​ណ្តឹ​ង
 DocType: Shopping Cart Settings,Default settings for Shopping Cart,ការ​កំណត់​លំនាំ​ដើម​សម្រាប់​ក​ន្រ្ត​ក​ទំនិញ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +13,Biotechnology,ជី​វ​បច្ចេកវិទ្យា
+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,ការិយាល័យ​ថែទាំ​ចំណាយ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +53,Hemming,Hemming
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +66,Please enter Item first,សូម​បញ្ចូល​ធាតុ​ដំបូង
 DocType: Account,Liability,ការទទួលខុសត្រូវ
 DocType: Company,Default Cost of Goods Sold Account,តម្លៃ​លំនាំ​ដើម​នៃ​គណនី​ទំនិញ​លក់
@@ -630,10 +601,10 @@
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +88,No Permission,គ្មាន​សិទ្ធិ
 DocType: Company,Default Bank Account,គណនី​ធនាគារ​លំនាំ​ដើម
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +47,"To filter based on Party, select Party Type first",ដើម្បី​ត្រង​ដោយ​ផ្អែក​ទៅ​លើ​គណ​បក្ស​ជ្រើស​គណបក្ស​វាយ​ជា​លើក​ដំបូង
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Nos,nos
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Nos,nos
 DocType: Item,Items with higher weightage will be shown higher,ធាតុ​ជា​មួយ​នឹង weightage ខ្ពស់​ជាង​នេះ​នឹង​ត្រូវ​បាន​បង្ហាញ​ដែល​ខ្ពស់​ជាង
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,ព​ត៌​មាន​លំអិត​ធនាគារ​ការផ្សះផ្សា
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +627,My Invoices,វិ​កិ​យ​ប័ត្រ​របស់​ខ្ញុំ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +629,My Invoices,វិ​កិ​យ​ប័ត្រ​របស់​ខ្ញុំ
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,រក​មិន​ឃើញ​បុគ្គលិក
 DocType: Purchase Order,Stopped,បញ្ឈប់
 DocType: Item,If subcontracted to a vendor,ប្រសិន​បើ​មាន​អ្នក​លក់​មួយ​ម៉ៅការ​បន្ត
@@ -658,12 +629,11 @@
 DocType: Item,Allow over delivery or receipt upto this percent,អនុញ្ញាត​ឱ្យ​មាន​ការ​ចែក​ចាយ​ឬ​ទទួល​បាន​ជាង​រីក​រាយ​ជាមួយ​នឹង​ភាគរយ
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +49,Expected Delivery Date cannot be before Sales Order Date,គេ​រំពឹង​ថា​ការ​ដឹកជញ្ជូន​មិន​អាច​កាលបរិច្ឆេទ​ត្រូវ​តែ​មុន​ពេល​ការ​លក់​លំដាប់​កាលបរិច្ឆេទ
 DocType: Upload Attendance,Import Attendance,នាំចូល​វត្តមាន
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +17,All Item Groups,ក្រុម​ធាតុ​ទាំងអស់
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +17,All Item Groups,ក្រុម​ធាតុ​ទាំងអស់
 DocType: Process Payroll,Activity Log,សកម្មភាព​កំណត់​ហេតុ
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +30,Net Profit / Loss,ប្រាក់​ចំណេញ​សុទ្ធ / បាត់បង់
 apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,តែង​សារ​ស្វ័យ​ប្រវត្តិ​នៅ​លើ​ការ​ដាក់​ប្រតិបត្តិការ​។
 DocType: Production Order,Item To Manufacture,ធាតុ​ដើម្បី​ផលិត
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +16,Permanent mold casting,ការ​សម្ដែង​ផ្សិត​អ​ចិ​ន្រ្តៃ​យ៍
 apps/erpnext/erpnext/config/learn.py +172,Purchase Order to Payment,ដីកា​បង្គាប់​ឱ្យ​ទូទាត់​ការ​ទិញ
 DocType: Sales Order Item,Projected Qty,ការ​ព្យាករ Qty
 DocType: Sales Invoice,Payment Due Date,ការ​ទូទាត់​កាលបរិច្ឆេទ
@@ -674,10 +644,9 @@
 DocType: Item Variant Attribute,Item Variant Attribute,ធាតុ​គុណលក្ខណៈ​វ៉ារ្យង់
 ,Purchase Receipt Trends,និន្នាការ​បង្កាន់ដៃ​ទិញ
 DocType: Appraisal,Select template from which you want to get the Goals,ជ្រើស​ពុម្ព​ដែល​អ្នក​ចង់​បាន​ដើម្បី​ទទួល​បាន​គោលដៅ​នេះ
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +77,Research & Development,ស្រាវជ្រាវ​និង​អភិវឌ្ឍន៍
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Research & Development,ស្រាវជ្រាវ​និង​អភិវឌ្ឍន៍
 ,Amount to Bill,ចំនួន​ទឹកប្រាក់​ដែល​លោក Bill
 DocType: Company,Registration Details,ព​ត៌​មាន​លំអិត​ការ​ចុះឈ្មោះ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +75,Staking,ទឹកប្រាក់​ដើម
 DocType: Item,Re-Order Qty,ដីកាសម្រេច Qty ឡើងវិញ
 DocType: Leave Block List Date,Leave Block List Date,ទុក​ឱ្យ​បញ្ជី​ប្លុក​កាលបរិច្ឆេទ
 DocType: Pricing Rule,Price or Discount,ថ្លៃ​ឬ​ការ​បញ្ចុះតម្លៃ
@@ -691,13 +660,12 @@
 DocType: Account,Balance must be,មាន​តុល្យភាព​ត្រូវ​តែ​មាន
 DocType: Hub Settings,Publish Pricing,តម្លៃ​បោះ​ពុម្ព​ផ្សាយ
 DocType: Notification Control,Expense Claim Rejected Message,សារ​ពាក្យ​ប​ណ្តឹ​ង​លើ​ការ​ចំណាយ​បាន​ច្រាន​ចោល
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +145,Nailing,ក្រចក
 ,Available Qty,ដែល​អាច​ប្រើ​បាន Qty
 DocType: Purchase Taxes and Charges,On Previous Row Total,នៅ​លើ​ជួរដេក​សរុប​មុន
 DocType: Salary Slip,Working Days,ថ្ងៃ​ធ្វើការ
 DocType: Serial No,Incoming Rate,អត្រា​ការ​មក​ដល់
 DocType: Packing Slip,Gross Weight,ទំ​ង​ន់​សរុប​បាន
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +410,The name of your company for which you are setting up this system.,ឈ្មោះ​របស់​ក្រុមហ៊ុន​របស់​អ្នក​ដែល​អ្នក​កំពុង​បង្កើត​ប្រព័ន្ធ​នេះ​។
+apps/erpnext/erpnext/public/js/setup_wizard.js +158,The name of your company for which you are setting up this system.,ឈ្មោះ​របស់​ក្រុមហ៊ុន​របស់​អ្នក​ដែល​អ្នក​កំពុង​បង្កើត​ប្រព័ន្ធ​នេះ​។
 DocType: HR Settings,Include holidays in Total no. of Working Days,រួម​បញ្ចូល​ថ្ងៃ​ឈប់​សម្រាក​នៅ​ក្នុង​ការ​សរុប​ទេ​។ នៃ​ថ្ងៃ​ធ្វើការ
 DocType: Job Applicant,Hold,សង្កត់
 DocType: Employee,Date of Joining,កាលបរិច្ឆេទ​នៃ​ការ​ចូលរួម
@@ -707,7 +675,6 @@
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +3,View Subscribers,មើល​អតិថិជន
 DocType: Purchase Invoice Item,Purchase Receipt,បង្កាន់ដៃ​ទិញ
 ,Received Items To Be Billed,ទទួល​បាន​ធាតុ​ដែល​នឹង​ត្រូវ​បាន​ផ្សព្វ​ផ្សាយ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +114,Abrasive blasting,ការ​បំផ្ទុះ​សំណឹក
 DocType: Employee,Ms,លោកស្រី
 apps/erpnext/erpnext/config/accounts.py +148,Currency exchange rate master.,អត្រា​ប្តូ​រ​ប្រាក់​រូបិយប័ណ្ណ​មេ​។
 DocType: Production Order,Plan material for sub-assemblies,សម្ភារៈ​ផែនការ​សម្រាប់​ការ​អនុ​សភា
@@ -715,7 +682,7 @@
 DocType: Salary Slip,Leave Encashment Amount,ទុក​ឱ្យ Encashment ចំនួន​ទឹកប្រាក់
 DocType: Purchase Receipt Item Supplied,Required Qty,តម្រូវការ Qty
 DocType: Bank Reconciliation,Total Amount,ចំនួន​សរុប
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +32,Internet Publishing,ការ​បោះពុម្ព​អ៊ី​ធឺ​ណិ​ត
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,ការ​បោះពុម្ព​អ៊ី​ធឺ​ណិ​ត
 DocType: Production Planning Tool,Production Orders,ការ​បញ្ជាទិញ
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +35,Balance Value,តម្លៃ​ឱ្យ​មាន​តុល្យភាព
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,តារាងតម្លៃ​ការ​លក់
@@ -732,7 +699,7 @@
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,លំនាំ​ដើម​គណនី​ធនាគារ / សាច់ប្រាក់​នឹង​ត្រូវ​បាន​ធ្វើ​បច្ចុប្បន្នភាព​ដោយ​ស្វ័យ​ប្រវត្តិ​ក្នុង​ម៉ាស៊ីន​ឆូត​កាត​វិក្កយបត្រ​ពេល​អ្នក​ប្រើ​របៀប​នេះ​ត្រូវ​បាន​ជ្រើស​។
 DocType: Employee,Permanent Address Is,អាសយដ្ឋាន​គឺ​ជា​អ​ចិ​ន្រ្តៃ​យ៍
 DocType: Production Order Operation,Operation completed for how many finished goods?,ប្រតិ​ប​ត្ដិ​ការ​បាន​បញ្ចប់​សម្រាប់​ទំនិញ​ដែល​បាន​បញ្ចប់​តើ​មាន​មនុស្ស​ប៉ុន្មាន​?
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +491,The Brand,ម៉ាក​នេះ
+apps/erpnext/erpnext/public/js/setup_wizard.js +237,The Brand,ម៉ាក​នេះ
 DocType: Employee,Exit Interview Details,ព​ត៌​មាន​លំអិត​ចេញ​ពី​ការ​សម្ភាសន៍
 DocType: Item,Is Purchase Item,តើ​មាន​ធាតុ​ទិញ
 DocType: Journal Entry Account,Purchase Invoice,ការ​ទិញ​វិ​ក័​យ​ប័ត្រ
@@ -750,15 +717,15 @@
 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,កំណត់​ចំនួន​ការ​ទូទាត់ = ចំនួន​ទឹកប្រាក់​ឆ្នើម
 DocType: Contact Us Settings,Address Line 1,អាសយដ្ឋាន​បន្ទាត់ 1
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Variance,អថេរ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +392,Company Name,ឈ្មោះ​ក្រុមហ៊ុន
+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 +515,Select Item for Transfer,ជ្រើស​ធាតុ​សម្រាប់​ការ​ផ្ទេរ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +538,Select Item for Transfer,ជ្រើស​ធាតុ​សម្រាប់​ការ​ផ្ទេរ
 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.,ជ្រើស​ប្រធាន​គណនី​របស់​ធនាគារ​នេះ​ដែល​ជា​កន្លែង​ដែល​ការ​ត្រួត​ពិនិត្យ​ត្រូវ​បាន​តម្កល់ទុក​។
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,អនុញ្ញាត​ឱ្យ​អ្នក​ប្រើ​ដើម្បី​កែ​សម្រួល​អត្រា​តំលៃ​បញ្ជី​នៅ​ក្នុង​ប្រតិបត្តិការ
 DocType: Pricing Rule,Max Qty,អតិបរមា Qty
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +16,Chemical,គីមី
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,គីមី
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +693,All items have already been transferred for this Production Order.,ធាតុ​ទាំងអស់​ត្រូវ​បាន​បញ្ជូន​រួច​ហើយ​សម្រាប់​ការ​បញ្ជាទិញ​ផលិតផល​នេះ​។
 DocType: Process Payroll,Select Payroll Year and Month,ជ្រើស​បើក​ប្រាក់​បៀវត្ស​ឆ្នាំ​និង​ខែ
 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""",សូម​ចូល​ទៅ​កាន់​ក្រុម​ដែល​សមស្រប (ជា​ធម្មតា​ពាក្យ​ស្នើសុំ​របស់​មូលនិធិ​&gt; ទ្រព្យ​បច្ចុប្បន្ន​&gt; គណនី​ធនាគារ​និង​បង្កើត​គណនី​ថ្មី​មួយ (ដោយ​ចុច​លើ Add កុមារ​) នៃ​ប្រភេទ &quot;ធនាគារ​&quot;
@@ -769,12 +736,12 @@
 DocType: Item,Inspection Criteria,លក្ខណៈ​វិនិច្ឆ័យ​អធិការកិច្ច
 apps/erpnext/erpnext/config/accounts.py +101,Tree of finanial Cost Centers.,មែកធាង​នៃ​មជ្ឈ​មណ្ឌល​ការ​ចំណាយ finanial ។
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,ផ្ទេរ​ប្រាក់
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +492,Upload your letter head and logo. (you can edit them later).,ផ្ទុក​ឡើង​ក្បាល​លិខិត​និង​ស្លាក​សញ្ញា​របស់​អ្នក​។ (អ្នក​អាច​កែ​សម្រួល​ពួក​វា​នៅ​ពេល​ក្រោយ​) ។
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +156,White,សេត
+apps/erpnext/erpnext/public/js/setup_wizard.js +238,Upload your letter head and logo. (you can edit them later).,ផ្ទុក​ឡើង​ក្បាល​លិខិត​និង​ស្លាក​សញ្ញា​របស់​អ្នក​។ (អ្នក​អាច​កែ​សម្រួល​ពួក​វា​នៅ​ពេល​ក្រោយ​) ។
+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/setup/page/setup_wizard/setup_wizard.js +362,Attach Your Picture,ភ្ជាប់​រូបភាព​របស់​អ្នក
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Make ,ធ្វើ​ឱ្យ
+apps/erpnext/erpnext/public/js/setup_wizard.js +112,Attach Your Picture,ភ្ជាប់​រូបភាព​របស់​អ្នក
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +540,Make ,ធ្វើ​ឱ្យ
 DocType: Journal Entry,Total Amount in Words,ចំនួន​សរុប​នៅ​ក្នុង​ពាក្យ
 DocType: Workflow State,Stop,បញ្ឈប់
 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 ប្រសិន​បើ​បញ្ហា​នៅតែ​បន្ត​កើតមាន​។
@@ -782,13 +749,12 @@
 DocType: Lead,Next Contact Date,ទំនាក់ទំនង​បន្ទាប់​កាលបរិច្ឆេទ
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,បើក Qty
 DocType: Holiday List,Holiday List Name,បញ្ជី​ថ្ងៃ​ឈប់​សម្រាក​ឈ្មោះ
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +168,Stock Options,ជម្រើស​ភាគ​ហ៊ុន
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +168,Stock Options,ជម្រើស​ភាគ​ហ៊ុន
 DocType: Journal Entry Account,Expense Claim,ពាក្យ​ប​ណ្តឹ​ង​លើ​ការ​ចំណាយ
 DocType: Leave Application,Leave Application,ការ​ឈប់​សម្រាក​របស់​កម្មវិធី
 apps/erpnext/erpnext/config/hr.py +77,Leave Allocation Tool,ទុក​ឱ្យ​ឧបករណ៍​បម្រុង​ទុក
 DocType: Leave Block List,Leave Block List Dates,ទុក​ឱ្យ​ប្លុក​ថ្ងៃ​បញ្ជី
 DocType: Company,If Monthly Budget Exceeded (for expense account),ប្រសិន​បើ​មាន​ថវិកា​ប្រចាំខែ​លើស​ពី (សម្រាប់​គណនី​ដែល​ការ​ចំណាយ​)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +56,Trimming,ការ​កាត​់​បន្ថយ
 DocType: Workstation,Net Hour Rate,អត្រា​ហួរ​សុទ្ធ
 DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,ទទួល​ទិញ​ការ​ចំណាយ​បាន​ចុះ​ចត
 DocType: Company,Default Terms,លក្ខខណ្ឌ​លំនាំ​ដើម
@@ -796,9 +762,8 @@
 DocType: POS Profile,Cash/Bank Account,សាច់ប្រាក់ / គណនី​ធនាគារ
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,Removed items with no change in quantity or value.,ធាតុ​បាន​យក​ចេញ​ដោយ​ការ​ផ្លាស់​ប្តូ​រ​ក្នុង​បរិមាណ​ឬ​តម្លៃ​ទេ​។
 DocType: Delivery Note,Delivery To,ដឹកជញ្ជូន​ដើម្បី
-apps/erpnext/erpnext/stock/doctype/item/item.py +509,Attribute table is mandatory,តារាង​គុណលក្ខណៈ​គឺ​ជា​ការ​ចាំបាច់
+apps/erpnext/erpnext/stock/doctype/item/item.py +513,Attribute table is mandatory,តារាង​គុណលក្ខណៈ​គឺ​ជា​ការ​ចាំបាច់
 DocType: Production Planning Tool,Get Sales Orders,ទទួល​បាន​ការ​បញ្ជា​ទិញ​លក់
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +103,Filing,ការ​ដាក់​លិខិត
 apps/erpnext/erpnext/templates/form_grid/item_grid.html +72,Discount,បញ្ចុះ​តំលៃ
 DocType: Features Setup,Purchase Discounts,ការ​បញ្ចុះតម្លៃ​ទិញ
 DocType: Workstation,Wages,ប្រាក់​ឈ្នួល
@@ -814,6 +779,7 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +112,You are the Expense Approver for this record. Please Update the 'Status' and Save,អ្នក​គឺ​ជា​អ្នក​ដែល​មាន​ការ​យល់​ព្រម​ចំណាយ​សម្រាប់​កំណត់​ត្រា​នេះ​។ សូម​ធ្វើ​ឱ្យ​ទាន់​សម័យ​នេះ &#39;ស្ថានភាព​&#39; និង​រក្សាទុក
 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 +136,"Attributes for Item Variants. e.g Size, Color etc.",គុណ​លក្ខណៈ​សម្រាប់​ធាតុ​វ៉ា​រ្យ៉​ង់​។ ឧទាហរណ៍​ដូចជា​ទំហំ​ពណ៌​ល
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +39,WIP Warehouse,ឃ្លាំង WIP
 DocType: BOM Operation,Operation,ប្រតិ​ប​ត្ដិ​ការ
@@ -821,7 +787,7 @@
 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,ធាតុ​ត្រូវ​បាន​បន្ថែម​ដោយ​ប្រើ &quot;ចូរ​ក្រោក​ធាតុ​ពី​ការ​ទិញ​បង្កាន់ដៃ &#39;ប៊ូតុង
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,ចំណាយ​ការ​លក់
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Buying,ទិញ​ស្ដ​ង់​ដា​រ
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +120,Standard Buying,ទិញ​ស្ដ​ង់​ដា​រ
 DocType: GL Entry,Against,ប្រឆាំង​នឹង​ការ
 DocType: Item,Default Selling Cost Center,ចំណាយ​លើ​ការ​លក់​លំនាំ​ដើម​របស់​មជ្ឈមណ្ឌល
 DocType: Sales Partner,Implementation Partner,ដៃគូ​អនុវត្ដ​ន៍
@@ -840,7 +806,7 @@
 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/setup/page/setup_wizard/setup_wizard.js +588,List a few of your suppliers. They could be organizations or individuals.,រាយ​មួយ​ចំនួន​នៃ​ការ​ផ្គត់​ផ្គង់​របស់​អ្នក​។ ពួក​គេ​អាច​ត្រូវ​បាន​អង្គការ​ឬ​បុគ្គល​។
+apps/erpnext/erpnext/public/js/setup_wizard.js +326,List a few of your suppliers. They could be organizations or individuals.,រាយ​មួយ​ចំនួន​នៃ​ការ​ផ្គត់​ផ្គង់​របស់​អ្នក​។ ពួក​គេ​អាច​ត្រូវ​បាន​អង្គការ​ឬ​បុគ្គល​។
 DocType: Company,Default Currency,រូបិយប័ណ្ណ​លំនាំ​ដើម
 DocType: Contact,Enter designation of this Contact,បញ្ចូល​ការ​រចនា​នៃ​ទំនាក់ទំនង​នេះ
 DocType: Contact Us Settings,Address,អាសយដ្ឋាន
@@ -848,7 +814,7 @@
 DocType: Journal Entry,Make Difference Entry,ធ្វើ​ឱ្យ​ធាតុ​ខុស​គ្នា
 DocType: Upload Attendance,Attendance From Date,ការ​ចូលរួម​ពី​កាល​បរិច្ឆេទ
 DocType: Appraisal Template Goal,Key Performance Area,គន្លឹះ​ការ​ស​ម្តែ​ង​តំបន់
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +54,Transportation,ការ​ដឹក​ជញ្ជូន
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +54,Transportation,ការ​ដឹក​ជញ្ជូន
 apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +67, and year: ,និង​ឆ្នាំ​:
 DocType: Email Digest,Annual Expense,ចំណាយ​ប្រចាំ​ឆ្នាំ
 DocType: SMS Center,Total Characters,តួអក្សរ​សរុប
@@ -856,7 +822,7 @@
 DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,ការ​ទូទាត់​វិ​ក័​យ​ប័ត្រ​ផ្សះផ្សា​និង​យុត្តិធម៌
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +32,Contribution %,ការ​ចូលរួម​ចំណែក​%
 DocType: Item,website page link,តំណ​ភ្ជាប់​ទំព័រ​វេ​ប​សាយ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +192,Let's prepare the system for first use.,ចូរ​យើង​រៀបចំ​ប្រព័ន្ធ​សម្រាប់​ការ​ប្រើ​ប្រាស់​ជា​លើក​ដំបូង​។
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +242,Let's prepare the system for first use.,ចូរ​យើង​រៀបចំ​ប្រព័ន្ធ​សម្រាប់​ការ​ប្រើ​ប្រាស់​ជា​លើក​ដំបូង​។
 DocType: Company,Company registration numbers for your reference. Tax numbers etc.,លេខ​ចុះបញ្ជី​ក​​្រុមហ៊ុន​សម្រាប់​ជា​ឯកសារ​យោង​របស់​អ្នក​។ ចំនួន​ពន្ធ​ល
 DocType: Sales Partner,Distributor,ចែកចាយ
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,ការ​ដើរ​ទិញ​ឥវ៉ាន់​វ​​ិធាន​ការ​ដឹក​ជញ្ជូន​ក្នុង​ក​ន្រ្ត​ក
@@ -878,13 +844,12 @@
 DocType: Sales Invoice Advance,Sales Invoice Advance,ការ​លក់​វិ​ក័​យ​ប័ត្រ​ជាមុន
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +398,Nothing to request,គ្មាន​អ្វី​ដែល​ត្រូវ​ស្នើ​សុំ
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date',&quot;ជាក់ស្តែង​កាលបរិច្ឆេទ​ចាប់​ផ្តើ​ម​&quot; មិន​អាច​ជា​ធំ​ជាង​ជាក់ស្តែង​កាលបរិច្ឆេទ​បញ្ចប់ &quot;
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +75,Management,ការ​គ្រប់គ្រង
+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/setup/page/setup_wizard/fixtures/operations.py +14,Investment casting,ការ​សម្ដែង​ការ​វិនិយោគ
 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""","នេះ​នឹង​ត្រូវ​បាន​បន្ថែម​ទៅ​ក្នុង​ក្រម​ធាតុ​នៃ​វ៉ា​រ្យ៉​ង់​នោះ​។ ឧទាហរណ៍​ប្រសិន​បើ​អក្សរកាត់​របស់​អ្នក​គឺ &quot;ផលិតកម្ម SM​&quot; និង​លេខ​កូដ​ធាតុ​គឺ &quot;អាវ​យឺត​&quot;​, លេខ​កូដ​ធាតុ​នៃ​វ៉ា​រ្យ៉​ង់​នេះ​នឹង​ត្រូវ​បាន &quot;អាវ​យឺត​-ផលិតកម្ម SM​&quot;"
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,ប្រាក់​ចំណេញ​សុទ្ធ (និយាយ​ម្យ៉ាង​) នឹង​មើល​ឃើញ​នៅ​ពេល​ដែល​អ្នក​រក្សា​ទុក​ប័ណ្ណ​ប្រាក់​បៀវត្ស​។
 apps/frappe/frappe/core/doctype/user/user_list.js +12,Active,សកម្ម
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +154,Blue,ពណ៌​ខៀវ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +154,Blue,ពណ៌​ខៀវ
 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,ថ្នាំង​បន្ថែម​ទៀត​អាច​ត្រូវ​បាន​បង្កើត​ក្រោម​ការ​ថ្នាំង​ប្រភេទ &#39;ក្រុម
@@ -892,11 +857,9 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +57,Item Code cannot be changed for Serial No.,ក្រម​ធាតុ​មិន​អាច​ត្រូវ​បាន​ផ្លាស់​ប្តូ​រ​សម្រាប់​លេខ​ស៊េរី
 DocType: Purchase Order Item,UOM Conversion Factor,UOM កត្តា​ប្រែចិត្ត​ជឿ
 DocType: Stock Settings,Default Item Group,លំនាំ​ដើម​ធាតុ​គ្រុប
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +156,Laminated object manufacturing,រោងចក្រ​ផលិត​វត្ថុ laminated
 apps/erpnext/erpnext/config/buying.py +13,Supplier database.,មូលដ្ឋាន​ទិន្នន័យ​ដែល​បាន​ផ្គត់​ផ្គង់​។
 DocType: Account,Balance Sheet,តារាង​តុល្យការ
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +561,Cost Center For Item with Item Code ',មជ្ឈមណ្ឌល​ចំណាយ​សម្រាប់​ធាតុ​ដែល​មាន​លេខ​កូដ​ធាតុ &quot;
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +45,Stretch forming,stretch បង្កើត
 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 +210,"Further accounts can be made under Groups, but entries can be made against non-Groups",គណនី​ដែល​មាន​បន្ថែម​ទៀត​អាច​ត្រូវ​បាន​ធ្វើ​ក្រោម​ការ​ក្រុម​នោះ​ទេ​តែ​ធាតុ​ដែល​អាច​ត្រូវ​បាន​ធ្វើ​ប្រឆាំង​នឹង​ការ​ដែល​មិន​មែន​ជា​ក្រុម
 apps/erpnext/erpnext/config/hr.py +125,Tax and other salary deductions.,ពន្ធ​និង​ការ​កាត់​ប្រាក់​ខែ​ផ្សេង​ទៀត​។
@@ -917,12 +880,12 @@
 DocType: Global Defaults,Current Fiscal Year,ឆ្នាំ​សារពើពន្ធ​នា​ពេល​បច្ចុប្បន្ន
 DocType: Global Defaults,Disable Rounded Total,បិទ​ការ​សរុប​មូល
 DocType: Lead,Call,ការ​ហៅ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +384,'Entries' cannot be empty,&quot;ធាតុ​&quot; មិន​អាច​ទទេ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +386,'Entries' cannot be empty,&quot;ធាតុ​&quot; មិន​អាច​ទទេ
 ,Trial Balance,អង្គ​ជំនុំ​តុល្យភាព
 apps/erpnext/erpnext/config/hr.py +205,Setting up Employees,ការ​រៀបចំ​បុគ្គលិក
 apps/erpnext/erpnext/public/js/feature_setup.js +220,"Grid """,ក្រឡា​ចត្រង្គ &quot;
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +150,Please select prefix first,សូម​ជ្រើស​បុព្វបទ​ជា​លើក​ដំបូង
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +138,Research,ស្រាវជ្រាវ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +138,Research,ស្រាវជ្រាវ
 DocType: Maintenance Visit Purpose,Work Done,ការងារ​ធ្វើ
 apps/erpnext/erpnext/controllers/item_variant.py +25,Please specify at least one attribute in the Attributes table,សូម​បញ្ជាក់​គុណលក្ខណៈ​យ៉ាងហោចណាស់​មួយ​នៅ​ក្នុង​តារាង​លក្ខណៈ
 DocType: Contact,User ID,លេខ​សម្គាល់​អ្នក​ប្រើ
@@ -930,10 +893,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +57,View Ledger,មើល​សៀវភៅ
 DocType: File,Lft,Lft
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,ដំបូង​បំផុត
-apps/erpnext/erpnext/stock/doctype/item/item.py +394,"An Item Group exists with same name, please change the item name or rename the item group",ធាតុ​មួយ​ពូល​មាន​ឈ្មោះ​ដូច​គ្នា​សូម​ប្ដូរ​ឈ្មោះ​ធាតុ​ឬ​ប្ដូរ​ឈ្មោះ​ធាតុ​ដែល​ជា​ក្រុម
+apps/erpnext/erpnext/stock/doctype/item/item.py +398,"An Item Group exists with same name, please change the item name or rename the item group",ធាតុ​មួយ​ពូល​មាន​ឈ្មោះ​ដូច​គ្នា​សូម​ប្ដូរ​ឈ្មោះ​ធាតុ​ឬ​ប្ដូរ​ឈ្មោះ​ធាតុ​ដែល​ជា​ក្រុម
 DocType: Communication,Delivery Status,ស្ថានភាព​ដឹកជញ្ជូន
 DocType: Production Order,Manufacture against Sales Order,ផលិត​ប្រឆាំង​នឹង​ការ​លក់​ស​ណ្តា​ប់​ធ្នាប់
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +517,Rest Of The World,នៅ​សល់​នៃ​ពិភពលោក
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +455,Rest Of The World,នៅ​សល់​នៃ​ពិភពលោក
 ,Budget Variance Report,របាយការណ៍​អថេរ​ថវិកា​រ
 DocType: Salary Slip,Gross Pay,បង់​សរុប​បាន
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +186,Dividends Paid,ភាគលាភ​បង់​ប្រាក់
@@ -943,13 +906,11 @@
 DocType: BOM Item,Item Description,ធាតុ​ការ​ពិពណ៌នា​សង្ខេប
 DocType: Payment Tool,Payment Mode,របៀប​ទូទាត់​ប្រាក់
 DocType: Purchase Invoice,Is Recurring,តើ​ការ​កើតឡើង
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +154,Direct metal laser sintering,sintering ឡាស៊ែរ​លោហៈ​ដោយ​ផ្ទាល់
 DocType: Purchase Order,Supplied Items,ធាតុ​ដែល​បាន​ផ្គត់​ផ្គង់
 DocType: Production Order,Qty To Manufacture,qty ដើម្បី​ផលិត
 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,ពិធី​បើក​ប​ណ្តោះ​អាសន្ន
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +41,Cryorolling,Cryorolling
 ,Employee Leave Balance,បុគ្គលិក​ចាកចេញ​តុល្យភាព
 DocType: Address,Address Type,ប្រភេទ​អាសយដ្ឋាន
 DocType: Purchase Receipt,Rejected Warehouse,ឃ្លាំង​ច្រាន​ចោល
@@ -961,19 +922,19 @@
 ,Accounts Payable Summary,គណនី​ចងការប្រាក់​សង្ខេប
 DocType: Journal Entry,Get Outstanding Invoices,ទទួល​បាន​វិ​កិ​យ​ប័ត្រ​ឆ្នើម
 apps/erpnext/erpnext/setup/doctype/company/company.py +172,"Sorry, companies cannot be merged","សូម​អភ័យ​ទោស​, ក្រុម​ហ៊ុន​មិន​អាច​ត្រូវ​បាន​បញ្ចូល​គ្នា"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +145,Small,ខ្នាត​តូច
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Small,ខ្នាត​តូច
 DocType: Employee,Employee Number,ចំនួន​បុគ្គលិក
 ,Invoiced Amount (Exculsive Tax),ចំនួន invoiced (ពន្ធ​លើ Exculsive​)
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,ធាតុ 2
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +153,Green,ពណ៌​បៃតង
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Green,ពណ៌​បៃតង
 DocType: Item,Auto re-order,ការ​បញ្ជា​ទិញ​ជា​ថ្មី​ម្តង​ទៀត​ដោយ​ស្វ័យ​ប្រវត្តិ
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +57,Total Achieved,សរុប​សម្រេច
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +59,Total Achieved,សរុប​សម្រេច
 DocType: Employee,Place of Issue,ទីកន្លែង​បញ្ហា
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +59,Contract,ការ​ចុះ​កិច្ច​សន្យា
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Contract,ការ​ចុះ​កិច្ច​សន្យា
 DocType: Report,Disabled,ជន​ពិការ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +83,Indirect Expenses,ការ​ចំណាយ​ដោយ​ប្រយោល
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +8,Agriculture,កសិកម្ម
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +611,Your Products or Services,ផលិតផល​ឬ​សេវាកម្ម​របស់​អ្នក
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,កសិកម្ម
+apps/erpnext/erpnext/public/js/setup_wizard.js +347,Your Products or Services,ផលិតផល​ឬ​សេវាកម្ម​របស់​អ្នក
 DocType: Mode of Payment,Mode of Payment,របៀប​នៃ​ការ​ទូទាត់
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,នេះ​គឺជា​ក្រុម​មួយ​ដែល​ធាតុ root និង​មិន​អាច​ត្រូវ​បាន​កែសម្រួល​។
 DocType: Journal Entry Account,Purchase Order,ការ​បញ្ជា​ទិញ
@@ -991,7 +952,7 @@
 DocType: Appraisal Goal,Goal,គ្រាប់​បាល់​បញ្ចូល​ទី
 DocType: Sales Invoice Item,Edit Description,កែសម្រួល​ការ​បរិយាយ
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +318,Expected Delivery Date is lesser than Planned Start Date.,គេ​រំពឹង​ថា​កាលបរិច្ឆេទ​ដឹកជញ្ជូន​គឺ​តិច​ជាង​ចាប់​ផ្ដើម​គំរោង​កាលបរិច្ឆេទ​។
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +579,For Supplier,សម្រាប់​ផ្គត់​ផ្គង់
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +602,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,ចេញ​សរុប
@@ -1013,10 +974,10 @@
 DocType: Sales Partner,Agent,ភ្នាក់ងារ
 DocType: Purchase Invoice,Taxes and Charges Calculation,ពន្ធ​និង​ការ​ចោទ​ប្រកាន់​ពី​ការ​គណនា
 DocType: BOM Operation,Workstation,ស្ថានីយ​ការងារ Stencils
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +112,Hardware,ផ្នែក​រឹង
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +112,Hardware,ផ្នែក​រឹង
 DocType: Attendance,HR Manager,កម្មវិធី​គ្រប់គ្រង​ធនធានមនុស្ស
 apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,សូម​ជ្រើសរើស​ក្រុមហ៊ុន
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +50,Privilege Leave,ឯកសិទ្ធិ​ចាកចេញ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +50,Privilege Leave,ឯកសិទ្ធិ​ចាកចេញ
 DocType: Purchase Invoice,Supplier Invoice Date,កាលបរិច្ឆេទ​ផ្គត់​ផ្គង់​វិ​ក័​យ​ប័ត្រ
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +79,You need to enable Shopping Cart,អ្នក​ត្រូវ​អនុញ្ញាត​ក​ន្រ្ត​ក​ទំនិញ
 apps/frappe/frappe/public/js/frappe/form/grid_body.html +6,No Data,គ្មាន​ទិន្នន័យ
@@ -1028,7 +989,7 @@
 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/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +68,Total Order Value,តម្លៃ​លំដាប់​សរុប
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +38,Food,អាហារ
+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,ជួរ Ageing 3
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +139,You can make a time log only against a submitted production order,អ្នក​អាច​ធ្វើ​ឱ្យ​ពេល​វេលា​ជា​គ្រាន់​តែ​ជា​កំណត់​ហេតុ​ប្រឆាំង​ទៅ​នឹង​គោល​បំណង​ផលិត​កម្ម​ដែល​បាន​ដាក់​ជូន
 DocType: Maintenance Schedule Item,No of Visits,គ្មាន​ការ​មើល
@@ -1046,6 +1007,7 @@
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,View Offer Letter,មើល​លិខិត​ផ្តល់​ជូន
 DocType: Communication,Communication,ការ​ទំនាក់ទំនង
 DocType: Item,Is Service Item,តើ​មាន​ធាតុ​សេវា
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +81,Application period cannot be outside leave allocation period,រយៈពេល​ប្រើប្រាស់​មិន​អាច​មាន​ការ​បែង​ចែក​ការ​ឈប់​សម្រាក​នៅ​ខាង​ក្រៅ​ក្នុង​រយៈ​ពេល
 DocType: Activity Cost,Projects,គម្រោង​ការ
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +31,Please select Fiscal Year,សូម​ជ្រើសរើស​ឆ្នាំ​សារពើពន្ធ
 DocType: BOM Operation,Operation Description,ប្រតិ​ប​ត្ដិ​ការ​ពិពណ៌នា​សង្ខេប
@@ -1084,11 +1046,10 @@
 DocType: HR Settings,Employee Settings,ការ​កំណត់​បុគ្គលិក
 ,Batch-Wise Balance History,ប្រាជ្ញា​តុល្យភាព​បាច់​ប្រវត្តិ
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +72,To Do List,ដើម្បី​ធ្វើ​បញ្ជី
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +63,Apprentice,សិស្ស
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Apprentice,សិស្ស
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +99,Negative Quantity is not allowed,បរិមាណ​ដែល​ត្រូវ​ទទួលទាន​អវិជ្ជមាន​មិន​ត្រូវ​បាន​អនុញ្ញាត
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
 Used for Taxes and Charges",តារាង​ពន្ធ​លើ​ការ​ដែល​បាន​ទៅ​យក​ពី​ព័ត៌មាន​លម្អិត​ធាតុ​ដែល​ម្ចាស់​ជា​ខ្សែ​អក្សរ​មួយ​និង​បាន​រក្សា​ទុក​នៅ​ក្នុង​វាល​នេះ​។ ត្រូវ​បាន​ប្រើ​សម្រាប់​ការ​បង់ពន្ធ​និង​បន្ទុក
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +61,Lancing,Lancing
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +151,Employee cannot report to himself.,បុគ្គលិក​មិន​អាច​រាយ​ការណ៍​ទៅ​ខ្លួន​ឯង​។
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.",ប្រសិនបើ​គណនី​គឺ​ជា​ការ​ក​ក​ធាតុ​ត្រូវ​បាន​អនុញ្ញាត​ឱ្យ​អ្នក​ប្រើ​ប្រាស់​ដាក់​កម្រិត​។
 DocType: Email Digest,Bank Balance,ធនាគារ​តុល្យភាព
@@ -1096,16 +1057,14 @@
 DocType: Journal Entry Account,Account Balance,សមតុល្យ​គណនី
 apps/erpnext/erpnext/config/accounts.py +112,Tax Rule for transactions.,វិធាន​ពន្ធ​សម្រាប់​កិច្ចការ​ជំនួញ​។
 DocType: Rename Tool,Type of document to rename.,ប្រភេទ​នៃ​ឯកសារ​ដែល​បាន​ប្ដូរ​ឈ្មោះ​។
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +630,We buy this Item,យើង​ទិញ​ធាតុ​នេះ
+apps/erpnext/erpnext/public/js/setup_wizard.js +366,We buy this Item,យើង​ទិញ​ធាតុ​នេះ
 DocType: Address,Billing,វិ​ក័​យ​ប័ត្រ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +77,Flanging,គែម
 DocType: Bulk Email,Not Sent,មិន​បាន​ផ្ញើ​រ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +73,Explosive forming,ផ្ទុះ​ការ​បង្កើត
 DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),ពន្ធ​សរុប​និង​ការ​ចោទ​ប្រកាន់ (រូបិយប័ណ្ណ​របស់​ក្រុមហ៊ុន​)
 DocType: Shipping Rule,Shipping Account,គណនី​លើ​ការ​ដឹក​ជញ្ជូន
 DocType: Quality Inspection,Readings,អាន
 DocType: Stock Entry,Total Additional Costs,ការ​ចំណាយ​បន្ថែម​ទៀត​សរុប
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Sub Assemblies,សភា​អនុ
+apps/erpnext/erpnext/public/js/setup_wizard.js +359,Sub Assemblies,សភា​អនុ
 DocType: Shipping Rule Condition,To Value,ទៅ​តម្លៃ
 DocType: Supplier,Stock Manager,ភាគ​ហ៊ុន​ប្រធាន​គ្រប់គ្រង
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +581,Packing Slip,គ្រូពេទ្យ​ប្រហែលជា​វេច​ខ្ចប់
@@ -1114,36 +1073,34 @@
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,នាំចូល​បាន​បរាជ័យ​!
 apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,គ្មាន​អាសយដ្ឋាន​បន្ថែម​នៅ​ឡើយ​ទេ​។
 DocType: Workstation Working Hour,Workstation Working Hour,ស្ថានីយ​ការងារ​ការងារ​ហួរ
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +83,Analyst,អ្នក​វិភាគ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Analyst,អ្នក​វិភាគ
 DocType: Item,Inventory,សារពើ​ភ័​ណ្ឌ
 DocType: Features Setup,"To enable ""Point of Sale"" view",ដើម្បី​បើក​ការ​«​ចំណុច​នៃ​ការ​លក់​«​ទស្សនៈ
 apps/erpnext/erpnext/public/js/pos/pos.js +402,Payment cannot be made for empty cart,ការ​ទូទាត់​មិន​អាច​ត្រូវ​បាន​ធ្វើ​ឡើង​សម្រាប់​រទេះ​ទទេ
 DocType: Item,Sales Details,ព​ត៌​មាន​លំអិត​ការ​លក់
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +149,Pinning,pinning
 DocType: Opportunity,With Items,ជា​មួយ​នឹង​ការ​ធាតុ
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,នៅ​ក្នុង qty
 DocType: Notification Control,Expense Claim Rejected,ពាក្យ​ប​ណ្តឹ​ង​លើ​ការ​ចំណាយ​បាន​ច្រាន​ចោល
 DocType: Sales Invoice,"The date on which next invoice will be generated. It is generated on submit.
 ",កាលបរិច្ឆេទ​ដែល​វិ​ក័​យ​ប័ត្រ​ក្រោយ​នឹង​ត្រូវ​បាន​បង្កើត​។ វា​ត្រូវ​បាន​គេ​បង្កើត​នៅ​លើ​ការ​ដាក់​ស្នើ​។
 DocType: Item Attribute,Item Attribute,គុណ​លក្ខណៈ​ធាតុ
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +105,Government,រដ្ឋា​ភិ​បាល
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Government,រដ្ឋា​ភិ​បាល
 apps/erpnext/erpnext/config/stock.py +268,Item Variants,វ៉ា​រ្យ៉​ង់​ធាតុ
 DocType: Company,Services,ការ​ផ្តល់​សេវា
 DocType: Cost Center,Parent Cost Center,មជ្ឈមណ្ឌល​តម្លៃ​ដែល​មាតា​ឬ​បិតា
 DocType: Sales Invoice,Source,ប្រភព
 DocType: Leave Type,Is Leave Without Pay,ត្រូវ​ទុក​ឱ្យ​ដោយ​គ្មាន​ការ​បង់
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +186,No records found in the Payment table,រក​ឃើញ​នៅ​ក្នុង​តារាង​គ្មាន​ប្រាក់​បង់​ការ​កត់ត្រា
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +405,Financial Year Start Date,កាលបរិច្ឆេទ​ចាប់​ផ្តើ​ម​ក្នុង​ឆ្នាំ​ហិរញ្ញវត្ថុ
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +133,No records found in the Payment table,រក​ឃើញ​នៅ​ក្នុង​តារាង​គ្មាន​ប្រាក់​បង់​ការ​កត់ត្រា
+apps/erpnext/erpnext/public/js/setup_wizard.js +153,Financial Year Start Date,កាលបរិច្ឆេទ​ចាប់​ផ្តើ​ម​ក្នុង​ឆ្នាំ​ហិរញ្ញវត្ថុ
 DocType: Employee External Work History,Total Experience,បទពិសោធន៍​សរុប
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +100,Countersinking,Countersinking
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +271,Packing Slip(s) cancelled,គ្រូពេទ្យ​ប្រហែលជា​វេច​ខ្ចប់ (s​) បាន​ត្រូវ​បាន​លុប​ចោល
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +276,Packing Slip(s) cancelled,គ្រូពេទ្យ​ប្រហែលជា​វេច​ខ្ចប់ (s​) បាន​ត្រូវ​បាន​លុប​ចោល
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,ការ​ចោទ​ប្រកាន់​ការ​ដឹក​ជញ្ជូន​និង​ការ​បញ្ជូន​បន្ត
 DocType: Material Request Item,Sales Order No,គ្មាន​ការ​លក់​ស​ណ្តា​ប់​ធ្នាប់
 DocType: Item Group,Item Group Name,ធាតុ​ឈ្មោះ​ក្រុម
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +50,Taken,គេ​យក
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,គេ​យក
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +66,Transfer Materials for Manufacture,ផ្ទេរ​សម្រាប់​ការផលិត​សម្ភារៈ
 DocType: Pricing Rule,For Price List,សម្រាប់​តារាងតម្លៃ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +27,Executive Search,ស្វែងរក​ប្រតិបត្តិ
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,ស្វែងរក​ប្រតិបត្តិ
 DocType: Maintenance Schedule,Schedules,កាលវិភាគ
 DocType: Purchase Invoice Item,Net Amount,ចំនួន​ទឹកប្រាក់​សុទ្ធ
 DocType: Purchase Order Item Supplied,BOM Detail No,ព​ត៌​មាន​លំអិត Bom គ្មាន
@@ -1169,14 +1126,13 @@
 DocType: ToDo,Due Date,កាលបរិច្ឆេទ​ដល់​កំណត់
 DocType: Sales Invoice Item,Brand Name,ឈ្មោះ​ម៉ាក
 DocType: Purchase Receipt,Transporter Details,សេចក្ដី​លម្អិត​ដឹកជញ្ជូន
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Box,ប្រអប់
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +389,The Organization,អង្គការ
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Box,ប្រអប់
+apps/erpnext/erpnext/public/js/setup_wizard.js +137,The Organization,អង្គការ
 DocType: Monthly Distribution,Monthly Distribution,ចែកចាយ​ប្រចាំខែ
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,បញ្ជី​អ្នក​ទទួល​គឺ​ទទេ​។ សូម​បង្កើត​បញ្ជី​អ្នក​ទទួល
 DocType: Production Plan Sales Order,Production Plan Sales Order,ផលិតកម្ម​ផែនការ​លក់​ស​ណ្តា​ប់​ធ្នាប់
 DocType: Sales Partner,Sales Partner Target,ដៃគូ​គោលដៅ​ការ​លក់
 DocType: Pricing Rule,Pricing Rule,វិធាន​ការកំណត់​តម្លៃ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +58,Notching,ស្នាម​ចោះ
 apps/erpnext/erpnext/config/learn.py +167,Material Request to Purchase Order,សម្ភារៈ​សំណើ​ទិញ​ស​ណ្តា​ប់​ធ្នាប់
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,គណនី​ធនាគារ
 ,Bank Reconciliation Statement,សេចក្តី​ថ្លែង​ការ​របស់​ធនាគារ​ការផ្សះផ្សា
@@ -1189,16 +1145,15 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Amounts not reflected in bank,មាន​ចំនួន​មិន​បាន​ឆ្លុះ​បញ្ចាំង​នៅ​ក្នុង​ធនាគារ
 DocType: Quality Inspection Reading,Reading 4,ការ​អាន​ទី 4
 apps/erpnext/erpnext/config/hr.py +23,Claims for company expense.,ពាក្យ​ប​ណ្តឹ​ង​សម្រាប់​ការ​ចំណាយ​របស់​ក្រុម​ហ៊ុន​។
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +8,Centrifugal casting,ការ​សម្ដែង centrifugal
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +119,Magnetic field-assisted finishing,បញ្ចប់​វាល​ជំនួយ​ម៉ាញេទិច
 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,ទំនាក់ទំនង​ទូរស័ព្ទ​គ្មាន
 DocType: Production Planning Tool,Select Sales Orders,ជ្រើស​ការ​បញ្ជាទិញ​លក់
 ,Material Requests for which Supplier Quotations are not created,សំណើ​សម្ភារៈ​ដែល​សម្រង់​ស​ម្តី​ផ្គត់ផ្គង់​មិន​ត្រូវ​បាន​បង្កើត
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +117,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/buying/doctype/purchase_order/purchase_order.js +477,Mark as Delivered,សម្គាល់​ថា​បាន​ដឹកនាំ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +497,Mark as Delivered,សម្គាល់​ថា​បាន​ដឹកនាំ
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +34,Make Quotation,ចូរ​ធ្វើ​សម្រង់
 DocType: Dependent Task,Dependent Task,ការងារ​ពឹង​ផ្អែក
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,ការ​ធ្វើ​ផែនការ​ប្រតិ​ប​ត្ដិ​ការ​សម្រាប់​ការ​ព្យាយាម​របស់ X នៅ​មុន​ថ្ងៃ​។
@@ -1207,13 +1162,12 @@
 DocType: Payment Tool Detail,Payment Amount,ចំនួន​ទឹកប្រាក់​ការ​ទូទាត់
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,ចំនួន​ទឹកប្រាក់​ដែល​គេ​ប្រើ​ប្រាស់
 DocType: Salary Structure Deduction,Salary Structure Deduction,ការ​កាត់​រចនាសម្ព័ន្ធ​ប្រាក់​បៀវត្ស
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +158,Selective laser sintering,sintering ឡាស៊ែរ​ជ្រើសរើស
 apps/frappe/frappe/core/page/data_import_tool/data_import_tool.js +108,Import Successful!,ការ​នាំ​ចូល​ដែល​ទទួល​បាន​ជោគជ័យ​!
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,តម្លៃ​នៃ​ធាតុ​ដែល​បាន​ចេញ​ផ្សាយ
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +41,Age (Days),អាយុ (ថ្ងៃ​)
 DocType: Quotation Item,Quotation Item,ធាតុ​សម្រង់
 DocType: Account,Account Name,ឈ្មោះ​គណនី
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +41,From Date cannot be greater than To Date,ពី​កាល​បរិច្ឆេទ​មិន​អាច​មាន​ចំនួន​ច្រើន​ជាង​កាល​បរិច្ឆេទ
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +34,From Date cannot be greater than To Date,ពី​កាល​បរិច្ឆេទ​មិន​អាច​មាន​ចំនួន​ច្រើន​ជាង​កាល​បរិច្ឆេទ
 apps/erpnext/erpnext/config/buying.py +59,Supplier Type master.,ប្រភេទ​ផ្គត់​ផ្គង់​គ្រូ​។
 DocType: Purchase Order Item,Supplier Part Number,ក្រុមហ៊ុន​ផ្គត់ផ្គង់​ផ្នែក​មួយ​ចំនួន
 apps/frappe/frappe/core/page/permission_manager/permission_manager.js +379,Add,បន្ថែម
@@ -1222,10 +1176,10 @@
 DocType: Delivery Note,Vehicle Dispatch Date,កាលបរិច្ឆេទ​បញ្ជូន​យានយន្ត
 DocType: Company,Default Payable Account,គណនី​ទូទាត់​លំនាំ​ដើម
 apps/erpnext/erpnext/config/website.py +13,"Settings for online shopping cart such as shipping rules, price list etc.",ការ​កំណត់​សម្រាប់​រទេះ​ដើរ​ទិញ​ឥវ៉ាន់​អន​ឡា​ញ​ដូច​ជា​វិធាន​ការ​ដឹក​ជញ្ជូន​បញ្ជី​តម្លៃ​ល
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +660,Setup Complete,រៀបចំ​ការ​បំពេញ
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +124,Setup Complete,រៀបចំ​ការ​បំពេញ
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +17,Reserved Qty,រក្សា Qty
 DocType: Party Account,Party Account,គណនី​គណបក្ស
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +74,Human Resources,ធនធានមនុស្ស
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +74,Human Resources,ធនធានមនុស្ស
 DocType: Lead,Upper Income,ផ្នែក​ខាង​លើ​ប្រាក់​ចំណូល
 DocType: Journal Entry Account,Debit in Company Currency,ឥណពន្ធ​ក្នុង​ក្រុមហ៊ុន​រូបិយប័ណ្ណ
 apps/erpnext/erpnext/support/doctype/issue/issue.py +58,My Issues,បញ្ហា​របស់​ខ្ញុំ
@@ -1233,10 +1187,8 @@
 DocType: Appraisal,For Employee,សម្រាប់​បុគ្គលិក
 DocType: Company,Default Values,តម្លៃ​លំនាំដើម
 DocType: Expense Claim,Total Amount Reimbursed,ចំនួន​ទឹកប្រាក់​សរុប​ដែល​បាន​សង​វិញ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +152,Press fitting,សារ​ព​ត៌​មាន​ដែល​សម
 DocType: Customer,Default Price List,តារាងតម្លៃ​លំនាំ​ដើម
 DocType: Payment Reconciliation,Payments,ការ​ទូទាត់
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +24,Hot isostatic pressing,isostatic ក្តៅ​ចុច
 DocType: ToDo,Medium,មធ្យម
 DocType: Budget Detail,Budget Allocated,ថវិកា​ដែល​បាន​ត្រៀម​បម្រុងទុក
 DocType: Journal Entry,Entry Type,ប្រភេទ​ធាតុ
@@ -1249,9 +1201,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +56,None of the items have any change in quantity or value.,គ្មាន​ការ​ធាតុ​មាន​ការ​ផ្លាស់​ប្តូ​ណាមួយ​ក្នុង​បរិមាណ​ឬ​តម្លៃ​។
 DocType: Warranty Claim,Warranty Claim,ប​ណ្តឹ​ង​ធានា
 ,Lead Details,ព​ត៌​មាន​លំអិត​នាំ​មុខ
-DocType: Authorization Rule,Approving User,ការ​អនុម័ត​របស់​អ្នកប្រើប្រាស់
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +37,Forging,ក្លែង​បន្លំ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +126,Plating,ចាន
 DocType: Purchase Invoice,End date of current invoice's period,កាលបរិច្ឆេទ​បញ្ចប់​នៃ​រយៈ​ពេល​បច្ចុប្បន្ន​របស់​វិ​ក័​យ​ប័ត្រ
 DocType: Pricing Rule,Applicable For,កម្មវិធី​សម្រាប់
 DocType: Bank Reconciliation,From Date,ពី​កាល​បរិច្ឆេទ
@@ -1270,12 +1219,12 @@
 DocType: Sales Invoice,Paid Amount (Company Currency),ចំនួន​ទឹកប្រាក់​ដែល​បាន​បង់ (ក្រុមហ៊ុន​រូបិយវត្ថុ​)
 DocType: Purchase Invoice,Additional Discount,បញ្ចុះ​តំលៃ​បន្ថែម
 DocType: Selling Settings,Selling Settings,ការ​លក់​ការ​កំណត់
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +39,Online Auctions,ការ​ដេញ​ថ្លៃ​លើ​ប​ណ្តា​ញ
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,ការ​ដេញ​ថ្លៃ​លើ​ប​ណ្តា​ញ
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +94,Please specify either Quantity or Valuation Rate or both,សូម​បរិមាណ​ឬ​អត្រា​វាយតម្លៃ​ឬ​ទាំង​ពីរ​បាន​បញ្ជាក់
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +50,"Company, Month and Fiscal Year is mandatory","ក្រុម​ហ៊ុន​, ខែ​និង​ឆ្នាំ​សារពើពន្ធ​ចាំបាច់"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Marketing Expenses,ចំណាយ​ទីផ្សារ
 ,Item Shortage Report,របាយការណ៍​កង្វះ​ធាតុ
-apps/erpnext/erpnext/stock/doctype/item/item.js +183,"Weight is mentioned,\nPlease mention ""Weight UOM"" too",ទំ​ង​ន់​ត្រូវ​បាន​បង្ហាញ \ n សូម​និយាយ​អំពី &quot;ទម្ងន់ UOM​&quot; ពេក
+apps/erpnext/erpnext/stock/doctype/item/item.js +185,"Weight is mentioned,\nPlease mention ""Weight UOM"" too",ទំ​ង​ន់​ត្រូវ​បាន​បង្ហាញ \ n សូម​និយាយ​អំពី &quot;ទម្ងន់ UOM​&quot; ពេក
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,សម្ភារៈ​ស្នើ​សុំ​ប្រើ​ដើម្បី​ធ្វើ​ឱ្យ​ផ្សារ​ហ៊ុន​នេះ​បាន​ចូល
 apps/erpnext/erpnext/config/support.py +43,Single unit of an Item.,អង្គភាព​តែ​មួយ​នៃ​ធាតុ​មួយ​។
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,ធ្វើ​ឱ្យ​ធាតុ​គណនេយ្យ​សម្រាប់​គ្រប់​ចលនា​ហ៊ុន
@@ -1284,22 +1233,20 @@
 DocType: Upload Attendance,Get Template,ទទួល​បាន​ទំព័រ​គំរូ
 DocType: Address,Postal,ប្រៃ​ស​ណី​យ
 DocType: Item,Weightage,Weightage
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +159,Mining,ការ​រុក​រក​រ៉ែ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +17,Resin casting,ជ័រ​សម្ដែង
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,ការ​គ្រុប​អតិថិជន​មាន​ឈ្មោះ​ដូច​គ្នា​សូម​ផ្លាស់​ប្តូ​រ​ឈ្មោះ​របស់​អតិថិជន​ឬ​ប្តូ​រ​ឈ្មោះ​ក្រុម​របស់​អតិថិជន
 DocType: Territory,Parent Territory,ដែនដី​មាតា​ឬ​បិតា
 DocType: Quality Inspection Reading,Reading 2,ការ​អាន 2
 DocType: Stock Entry,Material Receipt,សម្ភារៈ​បង្កាន់ដៃ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +622,Products,ផលិតផល
+apps/erpnext/erpnext/public/js/setup_wizard.js +358,Products,ផលិតផល
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.","ប្រសិន​បើ​មាន​ធាតុ​នេះ​មាន​វ៉ា​រ្យ៉​ង់​, បន្ទាប់​មក​វា​មិន​អាច​ត្រូវ​បាន​ជ្រើស​នៅ​ក្នុង​ការ​បញ្ជា​ទិញ​ការ​លក់​ល"
 DocType: Lead,Next Contact By,ទំនាក់ទំនង​បន្ទាប់​ដោយ
 DocType: Quotation,Order Type,ប្រភេទ​លំដាប់
 DocType: Purchase Invoice,Notification Email Address,សេចក្តី​ជូនដំណឹង​ស្តី​ពី​អាសយដ្ឋាន​អ៊ី​ម៉ែ​ល
 DocType: Payment Tool,Find Invoices to Match,សែ​្វ​ង​រក​វិ​ក័​យ​ប័ត្រ​ឱ្យ​ស្មើភាព​គ្នា​រវាង
 ,Item-wise Sales Register,ធាតុ​ប្រាជ្ញា​លក់​ចុះឈ្មោះ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +399,"e.g. ""XYZ National Bank""",ឧ​ទា​ហរ​ណ៏ &quot;XYZ របស់​ធនាគារ​ជាតិ​&quot;
+apps/erpnext/erpnext/public/js/setup_wizard.js +147,"e.g. ""XYZ National Bank""",ឧ​ទា​ហរ​ណ៏ &quot;XYZ របស់​ធនាគារ​ជាតិ​&quot;
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,តើ​ការ​ប្រមូល​ពន្ធ​លើ​នេះ​បាន​រួម​បញ្ចូល​ក្នុង​អត្រា​ជា​មូលដ្ឋាន​?
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +57,Total Target,គោលដៅ​សរុប
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Target,គោលដៅ​សរុប
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.js +22,Shopping Cart is enabled,ក​ន្រ្ត​ក​ទំនិញ​ត្រូវ​បាន​អនុញ្ញាត
 DocType: Job Applicant,Applicant for a Job,កម្មវិធី​សម្រាប់​ការងារ
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +173,No Production Orders created,គ្មាន​ការ​បញ្ជា​ទិញ​ផលិត​ផល​ដែល​បាន​បង្កើត
@@ -1311,7 +1258,7 @@
 DocType: DocPerm,Delete,លុប
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +13,Variant,វ៉ា​រ្យ៉​ង់
 DocType: Naming Series,Set prefix for numbering series on your transactions,កំណត់​បុព្វបទ​សម្រាប់​លេខ​ស៊េរី​លើ​ប្រតិ​បតិ​្ត​ការ​របស់​អ្នក
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +169,Stopped order cannot be cancelled. Unstop to cancel.,គោល​បំណង​បញ្ឈប់​ការ​ដែល​មិន​អាច​ត្រូវ​បាន​លុបចោល​។ ឮ​ដើម្បី​លុបចោល​។
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +164,Stopped order cannot be cancelled. Unstop to cancel.,គោល​បំណង​បញ្ឈប់​ការ​ដែល​មិន​អាច​ត្រូវ​បាន​លុបចោល​។ ឮ​ដើម្បី​លុបចោល​។
 DocType: Employee,Leave Encashed?,ទុក​ឱ្យ Encashed​?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,ឱកាស​ក្នុង​វាល​ពី​គឺ​ចាំបាច់
 DocType: Item,Variants,វ៉ា​រ្យ៉​ង់
@@ -1349,10 +1296,10 @@
 DocType: Sales Order Item,Actual Qty,ជាក់​ស្តែ Qty
 DocType: Sales Invoice Item,References,ឯកសារយោង
 DocType: Quality Inspection Reading,Reading 10,ការ​អាន 10
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +612,"List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start.",រាយ​បញ្ជី​ផលិតផល​ឬ​សេវាកម្ម​របស់​អ្នក​ដែល​អ្នក​ទិញ​ឬ​លក់​។ ធ្វើ​ឱ្យ​ប្រាកដ​ថា​ដើម្បី​ពិនិត្យ​មើល​ធាតុ Group ដែល​ជា​ឯកតា​រង្វាស់​និង​លក្ខណៈ​សម្បត្តិ​ផ្សេង​ទៀត​នៅ​ពេល​ដែល​អ្នក​ចាប់​ផ្តើ​ម​។
+apps/erpnext/erpnext/public/js/setup_wizard.js +348,"List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start.",រាយ​បញ្ជី​ផលិតផល​ឬ​សេវាកម្ម​របស់​អ្នក​ដែល​អ្នក​ទិញ​ឬ​លក់​។ ធ្វើ​ឱ្យ​ប្រាកដ​ថា​ដើម្បី​ពិនិត្យ​មើល​ធាតុ Group ដែល​ជា​ឯកតា​រង្វាស់​និង​លក្ខណៈ​សម្បត្តិ​ផ្សេង​ទៀត​នៅ​ពេល​ដែល​អ្នក​ចាប់​ផ្តើ​ម​។
 DocType: Hub Settings,Hub Node,ហាប់​ថ្នាំង
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,អ្នក​បាន​បញ្ចូល​ធាតុ​ស្ទួន​។ សូម​កែ​តម្រូវ​និង​ព្យាយាម​ម្ដង​ទៀត​។
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +87,Associate,រង
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Associate,រង
 DocType: SMS Center,Create Receiver List,បង្កើត​បញ្ជី​អ្នក​ទទួល
 apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +5,Expired,ផុត​កំណត់
 DocType: Packing Slip,To Package No.,ខ្ចប់​លេខ
@@ -1360,7 +1307,7 @@
 DocType: Warranty Claim,Issue Date,បញ្ហា​កាលបរិច្ឆេទ
 DocType: Activity Cost,Activity Cost,ការ​ចំណាយ​សកម្មភាព
 DocType: Purchase Receipt Item Supplied,Consumed Qty,ប្រើ​ប្រាស់ Qty
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +52,Telecommunications,ទូរគមនាគមន៍
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +52,Telecommunications,ទូរគមនាគមន៍
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),បង្ហាញ​ថា​កញ្ចប់​នេះ​គឺ​ជា​ផ្នែក​មួយ​នៃ​រឿង​នេះ​ការ​ចែក​ចាយ (មាន​តែ​សេចក្តី​ព្រាង​)
 DocType: Payment Tool,Make Payment Entry,ធ្វើ​ឱ្យ​ធាតុ​ទូទាត់ប្រាក់
 ,Sales Invoice Trends,ការ​លក់​វិ​ក័​យ​ប័ត្រ​និន្នាការ
@@ -1374,10 +1321,8 @@
 DocType: Serial No,Creation Date,កាលបរិច្ឆេទ​បង្កើត
 DocType: Purchase Order Item,Supplier Quotation Item,ធាតុ​សម្រង់​ក្រុមហ៊ុន​ផ្គត់ផ្គង់
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +27,Make Salary Structure,ធ្វើ​ឱ្យ​រចនាសម្ព័ន្ធ​ប្រាក់ខែ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +54,Shearing,កាត់
 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.,ចុច​លើ​ប៊ូតុង &quot;ធ្វើ​ឱ្យ​ការ​លក់​វិ​ក័​យ​ប័ត្រ​ក្នុង​ការ​បង្កើត​វិ​ក័​យ​ប័ត្រ​លក់​ថ្មី​។
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +166,Packaging and labeling,វេច​ខ្ចប់​ស្លាក​និង
 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,សូម​បញ្ជាក់​រូបិយប័ណ្ណ​លំនាំដើម​ក្នុង​ក្រុមហ៊ុន Master និង​លំនាំដើម​ជា​សកល
@@ -1387,17 +1332,16 @@
 DocType: Supplier,Supplier of Goods or Services.,ក្រុមហ៊ុន​ផ្គត់ផ្គង់​ទំនិញ​ឬ​សេវា​។
 DocType: Budget Detail,Fiscal Year,ឆ្នាំ​សារពើពន្ធ
 DocType: Cost Center,Budget,ថវិកា​រ
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Achieved,សម្រេច​បាន
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,សម្រេច​បាន
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +65,Territory / Customer,ទឹក​ដី / អតិថិជន
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,e.g. 5,ឧ 5
+apps/erpnext/erpnext/public/js/setup_wizard.js +294,e.g. 5,ឧ 5
 DocType: Sales Invoice,In Words will be visible once you save the Sales Invoice.,នៅ​ក្នុង​ពាក្យ​នោះ​នឹង​ត្រូវ​បាន​មើល​ឃើញ​នៅ​ពេល​ដែល​អ្នក​រក្សា​ទុក​វិ​ក័​យ​ប័ត្រ​លក់​។
 DocType: Item,Is Sales Item,តើ​មាន​ធាតុ​លក់
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,ធាតុ​គ្រុប​ដើមឈើ​មួយ​ដើម
 DocType: Maintenance Visit,Maintenance Time,ថែទាំ​ម៉ោង
 ,Amount to Deliver,ចំនួន​ទឹកប្រាក់​ដែល​ផ្តល់
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +620,A Product or Service,ផលិតផល​ឬ​សេវាកម្ម
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +158,There were errors.,មាន​កំហុស​។
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +101,Tapping,ការ​ប្រើ​ប្រាស់
+apps/erpnext/erpnext/public/js/setup_wizard.js +356,A Product or Service,ផលិតផល​ឬ​សេវាកម្ម
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +146,There were errors.,មាន​កំហុស​។
 DocType: Naming Series,Current Value,តម្លៃ​បច្ចុប្បន្ន
 DocType: Delivery Note Item,Against Sales Order,ប្រឆាំង​នឹង​ដីកា​លក់
 ,Serial No Status,ស្ថានភាព​គ្មាន​សៀរៀល
@@ -1408,14 +1352,14 @@
 apps/erpnext/erpnext/accounts/party.py +275,Due Date cannot be before Posting Date,កាលបរិច្ឆេទ​ដោយ​សារ​តែ​មិន​អាច​មាន​មុន​ពេល​ការ​ប្រកាស​កាលបរិច្ឆេទ
 DocType: Website Item Group,Website Item Group,វេ​ប​សាយ​ធាតុ​គ្រុប
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Duties and Taxes,ភារកិច្ច​និង​ពន្ធ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Please enter Reference date,សូម​បញ្ចូល​កាលបរិច្ឆេទ​យោង
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +312,Please enter Reference date,សូម​បញ្ចូល​កាលបរិច្ឆេទ​យោង
 DocType: Item Website Specification,Table for Item that will be shown in Web Site,តារាង​សម្រាប់​ធាតុ​ដែល​នឹង​ត្រូវ​បាន​បង្ហាញ​នៅ​ក្នុង​វ៉ិ​ប​សាយ
 DocType: Purchase Order Item Supplied,Supplied Qty,ការ​ផ្គត់ផ្គង់ Qty
 DocType: Material Request Item,Material Request Item,ការ​ស្នើ​សុំ​សម្ភារៈ​ធាតុ
 apps/erpnext/erpnext/config/stock.py +103,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,ប្រវត្តិ​ទិញ​ប្រាជ្ញា​ធាតុ
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +152,Red,ពណ៌​ក្រហម
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Red,ពណ៌​ក្រហម
 DocType: Account,Frozen,ទឹកកក
 ,Open Production Orders,ការ​បើក​ចំហ​រ​ការ​បញ្ជាទិញ​ផលិតកម្ម
 DocType: Installation Note,Installation Time,ពេល​ដំឡើង
@@ -1427,7 +1371,7 @@
 DocType: Quality Inspection Reading,Acceptance Criteria,លក្ខណៈ​វិនិច្ឆ័យ​ក្នុង​ការ​ទទួល​យក
 DocType: Item Attribute,Attribute Name,ឈ្មោះ​គុណលក្ខណៈ
 DocType: Item Group,Show In Website,បង្ហាញ​នៅ​ក្នុង​វេ​ប​សាយ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +621,Group,ជា​ក្រុម
+apps/erpnext/erpnext/public/js/setup_wizard.js +357,Group,ជា​ក្រុម
 DocType: Task,Expected Time (in hours),ពេលវេលា​ដែល​គេ​រំពឹង​ថា (គិត​ជា​ម៉ោង​)
 ,Qty to Order,qty ម៉​ង់​ទិញ
 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","ដើម្បី​តាមដាន​ឈ្មោះ​យីហោ​ក្នុង​ឯកសារ​ចំណាំ​ដឹកជញ្ជូន​ឱកាស​សម្ភារៈ​ស្នើ​សុំ​, ធាតុ​, ការ​ទិញ​ស​ណ្តា​ប់​ធ្នាប់​, ការ​ទិញ​ប័ណ្ណ​, ទទួល​ទិញ​សម្រង់​, ការ​លក់​វិ​ក័​យ​ប័ត្រ​, ផលិតផល​កញ្ចប់​, ការ​លក់​ស​ណ្តា​ប់​ធ្នាប់​, សៀរៀល​, គ្មាន"
@@ -1444,21 +1388,17 @@
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +137,Not Set,មិន​បាន​កំណត់
 DocType: Communication,Date,កាលបរិច្ឆេទ
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,ប្រាក់​ចំណូល​គយ​បាន​ធ្វើ​ម្តង​ទៀត
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +651,Sit tight while your system is being setup. This may take a few moments.,ចូរ​អង្គុយ​យ៉ាង​តឹង​ខណៈ​ពេល​ដែល​ប្រព័ន្ធ​របស់​អ្នក​ត្រូវ​បាន​រៀបចំ​។ វា​អាច​ចំណាយ​ពេល​មួយ​ស្របក់​។
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Pair,គូ
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +115,Sit tight while your system is being setup. This may take a few moments.,ចូរ​អង្គុយ​យ៉ាង​តឹង​ខណៈ​ពេល​ដែល​ប្រព័ន្ធ​របស់​អ្នក​ត្រូវ​បាន​រៀបចំ​។ វា​អាច​ចំណាយ​ពេល​មួយ​ស្របក់​។
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Pair,គូ
 DocType: Bank Reconciliation Detail,Against Account,ប្រឆាំង​នឹង​គណនី
 DocType: Maintenance Schedule Detail,Actual Date,ជាក់​ស្តែ​ង​កាល​បរិច្ឆេទ
 DocType: Item,Has Batch No,មាន​បាច់​គ្មាន
 DocType: Delivery Note,Excise Page Number,រដ្ឋាករ​លេខ​ទំព័រ
 DocType: Employee,Personal Details,ព​ត៌​មាន​លំអិត​ផ្ទាល់ខ្លួន
 ,Maintenance Schedules,កាលវិភាគ​ថែរក្សា
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +44,Embossing,ក្រឡោត
 ,Quotation Trends,សម្រង់​និន្នាការ
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +302,Debit To account must be a Receivable account,ឥណពន្ធ​វី​សា​ទៅ​គណនី​ត្រូវ​តែ​ជា​គណនី​ដែល​ទទួល
-apps/erpnext/erpnext/stock/doctype/item/item.py +310,"As Production Order can be made for this item, it must be a stock item.",ខណៈ​ពេល​ដែល​ការ​បញ្ជាទិញ​ផលិតផល​អាច​ត្រូវ​បាន​ធ្វើ​សម្រាប់​ធាតុ​នេះ​វា​ត្រូវតែ​ជា​ធាតុ​ភាគ​ហ៊ុន​។
 DocType: Shipping Rule Condition,Shipping Amount,ចំនួន​ទឹកប្រាក់​ការ​ដឹក​ជញ្ជូន
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +140,Joining,ការ​ចូល​រួម
-DocType: Authorization Rule,Above Value,តម្លៃ​ខាង​លើ
 ,Pending Amount,ចំនួន​ទឹកប្រាក់​ដែល​មិន​ទាន់​សម្រេច
 DocType: Purchase Invoice Item,Conversion Factor,ការ​ប្រែចិត្ត​ជឿ​កត្តា
 DocType: Purchase Order,Delivered,បាន​បញ្ជូន
@@ -1470,7 +1410,6 @@
 DocType: Address Template,This format is used if country specific format is not found,ទ្រង់ទ្រាយ​នេះ​ត្រូវ​បាន​ប្រើ​ប្រសិន​បើ​ទ្រង់ទ្រាយ​ជាក់លាក់​គឺ​មិន​ត្រូវ​បាន​រក​ឃើញ​ថា​ប្រទេស
 DocType: Custom Field,Custom,ផ្ទាល់ខ្លួន
 DocType: Production Order,Use Multi-Level BOM,ប្រើ​ពហុ​កម្រិត Bom
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +26,Injection molding,ការ​ចាក់​ផ្សិត
 DocType: Bank Reconciliation,Include Reconciled Entries,រួម​បញ្ចូល​ធាតុ​សំ​រុះ​សំ​រួល
 apps/erpnext/erpnext/config/accounts.py +41,Tree of finanial accounts.,មែកធាង​នៃ​គណនី​របស់ finanial ។
 DocType: Leave Control Panel,Leave blank if considered for all employee types,ប្រសិន​បើ​អ្នក​ទុក​វា​ឱ្យ​ទទេ​អស់​ទាំង​ប្រភេទ​ពិចារណា​សម្រាប់​បុគ្គលិក
@@ -1479,22 +1418,20 @@
 apps/frappe/frappe/config/setup.py +130,Printing,ការ​បោះពុម្ព
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +114,Expense Claim is pending approval. Only the Expense Approver can update status.,ពាក្យ​ប​ណ្តឹ​ង​លើ​ការ​ចំណាយ​គឺ​ត្រូវ​រង់ចាំ​ការ​អនុម័ត​។ មាន​តែ​ការ​អនុម័ត​លើ​ការ​ចំណាយ​នេះ​អាច​ធ្វើ​ឱ្យ​ស្ថានភាព​ទាន់សម័យ​។
 DocType: Purchase Invoice,Additional Discount Amount,ចំនួន​ទឹកប្រាក់​ដែល​បញ្ចុះតម្លៃ​បន្ថែម
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +99,The day(s) on which you are applying for leave are holiday. You need not apply for leave.,ថ្ងៃ​នេះ (s​) បាន​នៅ​លើ​ដែល​អ្នក​កំពុង​ដាក​​់​ពាក្យ​សុំ​ឈប់​សម្រាក​គឺ​ជា​ថ្ងៃ​ឈប់​សម្រាក​។ អ្នក​ត្រូវ​ការ​មិន​អនុវត្ត​ការ​ឈប់​សម្រាក​។
 apps/frappe/frappe/public/js/frappe/misc/utils.js +110,and,និង
 DocType: Leave Block List Allow,Leave Block List Allow,បញ្ជី​ប្លុក​អនុញ្ញាត​ឱ្យ​ចាក​ចេញ​ពី
 apps/erpnext/erpnext/setup/doctype/company/company.py +236,Abbr can not be blank or space,Abbr មិន​អាច​មាន​នៅ​ទទេ​ឬ​ទំហំ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +50,Sports,កីឡា
+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/setup/page/setup_wizard/setup_wizard.js +626,Unit,អង្គភាព
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Unit,អង្គភាព
 apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.py +182,Please set Dropbox access keys in your site config,សូម​កំណត់​កូន​សោ​កំណត់​រចនា​សម្ព័ន្ធ​ការ​ចូល​ដំណើរ​ការ Dropbox ក្នុង​តំបន់​របស់​អ្នក
 apps/erpnext/erpnext/stock/get_item_details.py +113,Please specify Company,សូម​បញ្ជាក់​ក្រុមហ៊ុន
 ,Customer Acquisition and Loyalty,ការ​ទិញ​របស់​អតិថិជន​និង​ភាព​ស្មោះត្រង់
 DocType: Purchase Receipt,Warehouse where you are maintaining stock of rejected items,ឃ្លាំង​ដែល​ជា​កន្លែង​ដែល​អ្នក​ត្រូវ​បាន​រក្សា​ឱ្យ​បាន​នូវ​ភាគ​ហ៊ុន​របស់​ធាតុ​ដែល​បាន​ច្រាន​ចោល
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +408,Your financial year ends on,កាល​ពី​ឆ្នាំ​ហិរញ្ញវត្ថុ​របស់​អ្នក​នឹង​បញ្ចប់​នៅ​ថ្ងៃ
+apps/erpnext/erpnext/public/js/setup_wizard.js +156,Your financial year ends on,កាល​ពី​ឆ្នាំ​ហិរញ្ញវត្ថុ​របស់​អ្នក​នឹង​បញ្ចប់​នៅ​ថ្ងៃ
 DocType: POS Profile,Price List,តារាងតម្លៃ
 apps/erpnext/erpnext/projects/doctype/project/project.js +47,Expense Claims,ប្តឹ​ង​ទាមទារ​សំណង​លើ​ការ​ចំណាយ
 DocType: Issue,Support,ការ​គាំទ្រ
-DocType: Authorization Rule,Approving Role,ការ​អនុម័ត​តួនាទី
 ,BOM Search,ស្វែងរក Bom
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +176,Closing (Opening + Totals),បិទ (បើក + + សរុប​)
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +26,Please specify currency in Company,សូម​បញ្ជាក់​រូបិយប័ណ្ណ​នៅ​ក្នុង​ក្រុមហ៊ុន
@@ -1518,10 +1455,9 @@
 DocType: Production Order Operation,Actual Operation Time,ប្រតិ​ប​ត្ដិ​ការ​ពេល​វេលា​ពិត​ប្រាកដ
 DocType: Authorization Rule,Applicable To (User),ដែល​អាច​អនុវត្ត​ទៅ (អ្នកប្រើប្រាស់​)
 DocType: Purchase Taxes and Charges,Deduct,កាត់
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +170,Job Description,ការ​ពិពណ៌នា​ការងារ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +170,Job Description,ការ​ពិពណ៌នា​ការងារ
 DocType: Purchase Order Item,Qty as per Stock UOM,qty ដូច​ជា​ក្នុង​មួយ​ហ៊ុន UOM
 apps/frappe/frappe/model/rename_doc.py +343,Please select a valid csv file with data,សូម​ជ្រើស​ឯកសារ CSV ដែល​មាន​សុពលភាព​ជាមួយ​នឹង​ទិន្នន័យ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +92,Coating,ថ្នាំ​កូត
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +126,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","តួអក្សរ​ពិសេស​លើក​លែង​តែ &quot;-​&quot;​, &quot;#​&quot;​, &quot;&quot; ។ និង &quot;/​&quot; មិន​ត្រូវ​បាន​អនុញ្ញាត​ក្នុង​ការ​ដាក់​ឈ្មោះ​របស់​ស៊េរី"
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","រក្សា​ដាន​នៃ​ការ​លក់​យុទ្ធនាការ​។ រក្សា​ដាន​នៃ​ការ​នាំ​មុខ​, សម្រង់​ស​ម្តី​, ការ​លក់​លំដាប់​ល​ពី​យុទ្ធនាការ​ដើម្បី​វាស់​ស្ទង់​ត្រឡប់​ទៅ​លើ​ការ​វិនិយោគ​។"
 DocType: Expense Claim,Approver,ការ​អនុម័ត
@@ -1529,11 +1465,10 @@
 DocType: Appraisal,Calculate Total Score,គណនា​ពិន្ទុ​សរុប
 DocType: Supplier Quotation,Manufacturing Manager,កម្មវិធី​គ្រប់គ្រង​កម្មន្តសាល
 apps/erpnext/erpnext/config/stock.py +69,Split Delivery Note into packages.,ចំណាំ​ដឹកជញ្ជូន​ពុះ​ចូល​ទៅ​ក្នុង​កញ្ចប់​។
-apps/erpnext/erpnext/hooks.py +84,Shipments,ការ​នាំ​ចេញ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +29,Dip molding,ផ្សិត​ដង
+apps/erpnext/erpnext/hooks.py +68,Shipments,ការ​នាំ​ចេញ
 DocType: Purchase Order,To be delivered to customer,ត្រូវ​បាន​បញ្ជូន​ទៅ​កាន់​អតិថិជន
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,ស្ថានភាព​កំណត់ហេតុ​ម៉ោង​ត្រូវ​ជូន​។
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +650,Setting Up,ការ​ដំឡើង
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +114,Setting Up,ការ​ដំឡើង
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,Row # ,ជួរ​ដេក #
 DocType: Purchase Invoice,In Words (Company Currency),នៅ​ក្នុង​ពាក្យ (ក្រុមហ៊ុន​រូបិយវត្ថុ​)
 DocType: Pricing Rule,Supplier,ក្រុមហ៊ុន​ផ្គត់ផ្គង់
@@ -1550,21 +1485,20 @@
 apps/erpnext/erpnext/config/hr.py +95,"Types of employment (permanent, contract, intern etc.).",ប្រភេទ​ការងារ (អចិន្ត្រយ៍​កិច្ចសន្យា​ហាត់​ជាដើម​) ។
 DocType: Currency Exchange,From Currency,ចាប់​ពី​រូបិយប័ណ្ណ
 DocType: DocField,Name,ឈ្មោះ
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +211,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","សូម​ជ្រើស​ចំនួន​ទឹកប្រាក់​ដែល​បាន​បម្រុង​ទុក​, ប្រភេទ​វិ​ក័​យ​ប័ត្រ​និង​លេខ​វិក្កយបត្រ​ក្នុង​មួយ​ជួរ​ដេក​យ៉ាងហោចណាស់"
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +158,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","សូម​ជ្រើស​ចំនួន​ទឹកប្រាក់​ដែល​បាន​បម្រុង​ទុក​, ប្រភេទ​វិ​ក័​យ​ប័ត្រ​និង​លេខ​វិក្កយបត្រ​ក្នុង​មួយ​ជួរ​ដេក​យ៉ាងហោចណាស់"
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +43,Amounts not reflected in system,មាន​ចំនួន​មិន​បាន​ឆ្លុះ​បញ្ចាំង​នៅ​ក្នុង​ប្រព័ន្ធ
 DocType: Purchase Invoice Item,Rate (Company Currency),អត្រា​ការ​ប្រាក់ (ក្រុមហ៊ុន​រូបិយវត្ថុ​)
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +40,Others,អ្នក​ផ្សេង​ទៀត
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +40,Others,អ្នក​ផ្សេង​ទៀត
 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,មិន​អាច​ជ្រើស​ប្រភេទ​ការ​ចោទ​ប្រកាន់​ថា​ជា &quot;នៅ​លើ​ចំនួន​ជួរ​ដេក​មុន &#39;ឬ​&#39; នៅ​លើ​ជួរដេក​សរុប​មុន​&quot; សម្រាប់​ជួរ​ដេក​ដំបូង
 apps/frappe/frappe/core/doctype/doctype/boilerplate/controller_list.html +31,Completed,បាន​បញ្ចប់
 DocType: Web Form,Select DocType,ជ្រើស​ចង្អុល​បង្ហាញ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +104,Broaching,Broaching
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +12,Banking,វិស័យ​ធនាគារ
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,វិស័យ​ធនាគារ
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +38,Please click on 'Generate Schedule' to get schedule,សូម​ចុច​លើ &#39;បង្កើត​កាលវិភាគ​&#39; ដើម្បី​ទទួល​បាន​នូវ​កាលវិភាគ
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +283,New Cost Center,មជ្ឈមណ្ឌល​ការ​ចំណាយ​ថ្មី​មួយ
 DocType: Bin,Ordered Quantity,បរិមាណ​ដែល​ត្រូវ​បាន​បញ្ជា​ឱ្យ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +397,"e.g. ""Build tools for builders""",ឧ​ទា​ហរ​ណ៏ &quot;ឧបករណ៍​សម្រាប់​អ្នក​សាងសង់​ស្ថាបនា​&quot;
+apps/erpnext/erpnext/public/js/setup_wizard.js +145,"e.g. ""Build tools for builders""",ឧ​ទា​ហរ​ណ៏ &quot;ឧបករណ៍​សម្រាប់​អ្នក​សាងសង់​ស្ថាបនា​&quot;
 DocType: Quality Inspection,In Process,ក្នុង​ដំណើរការ
 DocType: Authorization Rule,Itemwise Discount,Itemwise បញ្ចុះ​តំលៃ
 DocType: Purchase Order Item,Reference Document Type,សេចក្តី​យោង​ប្រភេទ​ឯកសារ
@@ -1582,14 +1516,13 @@
 DocType: Purchase Invoice Item,Page Break,ការ​បំបែក​ទំព័រ
 DocType: Production Order Operation,Pending,ឡុ​ងេ​ពល
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,អ្នក​ប្រើ​ដែល​អាច​អនុម័ត​កម្មវិធី​ដែល​បាន​ឈប់​សម្រាក​ជាក់លាក់​របស់​បុគ្គលិក
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +33,You cannot change default UOM of Variant. To change default UOM for Variant change default UOM of the Template,អ្នក​មិន​អាច​ផ្លាស់​ប្តូ​រ​លំនាំ​ដើម​នៃ​វ៉ារ្យង់ UOM ។ ដើម្បី​ផ្លាស់​ប្តូ​រ UOM វ៉ារ្យង់ UOM លំនាំ​ដើម​សម្រាប់​ការ​ផ្លាស់​ប្តូ​រ​លំនាំ​ដើម​នៃ​ពុម្ព
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +50,Office Equipments,សម្ភារៈ​ការិយាល័យ
 DocType: Purchase Invoice Item,Qty,qty
 DocType: Fiscal Year,Companies,មាន​ក្រុម​ហ៊ុន
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +24,Electronics,ឡិច​ត្រូ​និ​ច
+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/support/doctype/maintenance_visit/maintenance_visit.js +18,From Maintenance Schedule,ពី​ការ​ថែទាំ​កាលវិភាគ
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +56,Full-time,ពេញ​ម៉ោង
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +56,Full-time,ពេញ​ម៉ោង
 DocType: Purchase Invoice,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.","បើ​អ្នក​បាន​បង្កើត​ពុម្ព​ដែល​ស្ដ​ង់​ដា​រ​ក្នុង​ការ​លក់​និង​ការ​ចោទ​ប្រកាន់​ពី​ពន្ធ​គំរូ​, ជ្រើស​យក​មួយ​និង​ចុច​លើ​ប៊ូតុង​ខាង​ក្រោម​។"
@@ -1601,11 +1534,12 @@
 DocType: Job Applicant,Job Opening,ពិធី​បើក​ការងារ
 DocType: Payment Reconciliation,Payment Reconciliation,ការ​ផ្សះផ្សា​ការ​ទូទាត់
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +154,Please select Incharge Person's name,សូម​ជ្រើស​ឈ្មោះ Incharge បុគ្គល​របស់
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +51,Technology,ប​ច្ចេ​ក​វិទ្យា
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,ប​ច្ចេ​ក​វិទ្យា
 DocType: Offer Letter,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,សរុប​វិ​ក័​យ​ប័ត្រ 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.",ដើម្បី​បន្ថែម​ថ្នាំង​កុមារ​ស្វែងយល់​ពី​ដើម​ឈើ​ហើយ​ចុច​លើ​ថ្នាំង​ក្រោម​ដែល​អ្នក​ចង់​បន្ថែម​ថ្នាំង​បន្ថែម​ទៀត​។
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +102,Credit To account must be a Payable account,ឥណទាន​ទៅ​គណនី​ត្រូវ​តែ​ជា​គណនី​ទូទាត់​មួយ
 DocType: Production Order Operation,Completed Qty,Qty បាន​បញ្ចប់
@@ -1614,10 +1548,8 @@
 DocType: Item,Customer Item Codes,កូដ​ធាតុ​អតិថិជន
 DocType: Opportunity,Lost Reason,បាត់​បង់​មូលហេតុ
 apps/erpnext/erpnext/config/accounts.py +68,Create Payment Entries against Orders or Invoices.,បង្កើត​ការ​ប្រឆាំង​នឹង​ការ​បញ្ជា​ទិញ​ប្រាក់​បង់​ធាតុ​វិ​កិ​យ​ប័ត្រ​ឬ​។
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +141,Welding,ផ្សារដែក
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +40,New Stock UOM is required,ញូ​ហ៊ុន UOM ត្រូវ​បាន​ទាមទារ
 DocType: Quality Inspection,Sample Size,ទំហំ​គំរូ
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +443,All items have already been invoiced,ធាតុ​ទាំងអស់​ត្រូវ​បាន invoiced រួច​ទៅ​ហើយ
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +446,All items have already been invoiced,ធាតុ​ទាំងអស់​ត្រូវ​បាន invoiced រួច​ទៅ​ហើយ
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',សូម​បញ្ជាក់​ត្រឹមត្រូវ​មួយ &quot;ពី​សំណុំ​រឿង​លេខ​&quot;
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +287,Further cost centers can be made under Groups but entries can be made against non-Groups,មជ្ឈ​មណ្ឌល​ការ​ចំណាយ​បន្ថែម​ទៀត​អាច​ត្រូវ​បាន​ធ្វើ​ឡើង​នៅ​ក្រោម​ការ​ក្រុម​នោះ​ទេ​ប៉ុន្តែ​ធាតុ​ដែល​អាច​ត្រូវ​បាន​ធ្វើ​ប្រឆាំង​នឹង​ការ​ដែល​មិន​មែន​ជា​ក្រុម
 DocType: Project,External,ខាងក្រៅ
@@ -1628,8 +1560,7 @@
 apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +66,No salary slip found for month:,គ្មាន​ប័ណ្ណ​ប្រាក់​បៀវត្ស​ដែល​បាន​រក​ឃើញ​ក្នុង​ខែ​:
 DocType: Bin,Actual Quantity,បរិមាណ​ដែល​ត្រូវ​ទទួលទាន​ពិត​ប្រាកដ
 DocType: Shipping Rule,example: Next Day Shipping,ឧទាហរណ៍​: ថ្ងៃ​បន្ទាប់​ការ​ដឹក​ជញ្ជូន
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +563,Your Customers,អតិថិជន​របស់​អ្នក
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +27,Compression molding,ផ្សិត​បង្ហាប់
+apps/erpnext/erpnext/public/js/setup_wizard.js +303,Your Customers,អតិថិជន​របស់​អ្នក
 DocType: Leave Block List Date,Block Date,ប្លុក​កាលបរិច្ឆេទ
 DocType: Sales Order,Not Delivered,មិន​បាន​ផ្តល់
 ,Bank Clearance Summary,ធនាគារ​សង្ខេប​បោសសំអាត
@@ -1651,7 +1582,7 @@
 DocType: Company,For Reference Only.,ឯកសារយោង​ប៉ុណ្ណោះ​។
 DocType: Sales Invoice Advance,Advance Amount,មុន​ចំនួន​ទឹកប្រាក់
 DocType: Manufacturing Settings,Capacity Planning,ផែនការ​ការ​កសាង​សមត្ថភាព
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +49,'From Date' is required,&quot;ពី​កាលបរិច្ឆេទ &#39;ត្រូវ​បាន​ទាមទារ
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +43,'From Date' is required,&quot;ពី​កាលបរិច្ឆេទ &#39;ត្រូវ​បាន​ទាមទារ
 DocType: Journal Entry,Reference Number,សេចក្តី​យោង​លេខ
 DocType: Employee,Employment Details,ព័ត៌មាន​ការងារ
 DocType: Employee,New Workplace,ញូ​ការងារ
@@ -1665,7 +1596,7 @@
 DocType: Serial No,Delivery Time,ម៉ោង​ដឹកជញ្ជូន
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Ageing ដោយ​ផ្អែក​លើ​ការ
 DocType: Item,End of Life,ចុង​បញ្ចប់​នៃ​ជីវិត
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +41,Travel,ការ​ធ្វើ​ដំណើរ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +41,Travel,ការ​ធ្វើ​ដំណើរ
 DocType: Leave Block List,Allow Users,អនុញ្ញាត​ឱ្យ​អ្នក​ប្រើ
 DocType: Purchase Order,Customer Mobile No,គ្មាន​គយ​ចល័ត
 DocType: Sales Invoice,Recurring,កើតឡើង
@@ -1679,7 +1610,7 @@
 DocType: Naming Series,User must always select,អ្នក​ប្រើ​ដែល​ត្រូវ​តែ​ជ្រើស​តែងតែ
 DocType: Stock Settings,Allow Negative Stock,អនុញ្ញាត​ឱ្យ​ហ៊ុន​អវិជ្ជមាន
 DocType: Installation Note,Installation Note,ចំណាំ​ការ​ដំឡើង
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +541,Add Taxes,បន្ថែម​ពន្ធ
+apps/erpnext/erpnext/public/js/setup_wizard.js +283,Add Taxes,បន្ថែម​ពន្ធ
 ,Financial Analytics,វិភាគ​ហិរញ្ញវត្ថុ
 DocType: Quality Inspection,Verified By,បាន​ផ្ទៀងផ្ទាត់​ដោយ
 DocType: Address,Subsidiary,ក្រុមហ៊ុន​បុត្រ​សម្ព័ន្ធ
@@ -1689,7 +1620,6 @@
 DocType: System Settings,In Hours,ក្នុង​ម៉ោង​ធ្វើការ
 DocType: Process Payroll,Create Salary Slip,បង្កើត​ប្រាក់ខែ​គ្រូពេទ្យ​ប្រហែលជា
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Expected balance as per bank,តុល្យភាព​គេ​រំពឹង​ទុក​ថា​ជា​មួយ​ធ​នា​គារ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +115,Buffing,ធ្វើ​ឱ្យ​រលោង
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Source of Funds (Liabilities),ប្រភព​មូលនិធិ (បំណុល​)
 DocType: Appraisal,Employee,បុគ្គលិក
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +10,Import Email From,នាំចូល​អ៊ីមែល​ពី
@@ -1705,7 +1635,7 @@
 apps/erpnext/erpnext/public/js/controllers/transaction.js +136,Show Payments,បង្ហាញ​ការ​ទូទាត់
 apps/frappe/frappe/desk/page/backups/backups.html +13,Size,ទំហំ
 DocType: Notification Control,Expense Claim Approved,ពាក្យ​ប​ណ្តឹ​ង​លើ​ការ​ចំណាយ​បាន​អនុម័ត
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +113,Pharmaceutical,ឱសថ
+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,ការ​លក់​លំដាប់​ដែល​បាន​ទាមទារ
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +30,Create Customer,បង្កើត​អតិថិជន
@@ -1715,7 +1645,6 @@
 DocType: Quality Inspection Reading,Reading 9,ការ​អាន 9
 DocType: Supplier,Is Frozen,ត្រូវ​បាន​ជាប់​គាំង
 DocType: Buying Settings,Buying Settings,ការ​កំណត់​ការ​ទិញ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +122,Mass finishing,បញ្ចប់​អភិបូជា
 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),រៀបចំ​ម៉ាស៊ីន​បម្រើ​ចូល​មក​សម្រាប់​លេខ​សម្គាល់​ការ​លក់​អ៊ីមែល​។ (ឧ sales@example.com​)
@@ -1723,7 +1652,7 @@
 DocType: Payment Tool,Payment Account,គណនី​ទូទាត់​ប្រាក់
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +713,Please specify Company to proceed,សូម​បញ្ជាក់​ក្រុមហ៊ុន​ដើម្បី​បន្ត
 apps/frappe/frappe/public/js/frappe/model/indicator.js +30,Draft,សេចក្តី​ព្រាង​ច្បាប់
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +46,Compensatory Off,ទូទាត់​បិទ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Compensatory Off,ទូទាត់​បិទ
 DocType: Quality Inspection Reading,Accepted,បាន​ទទួល​យក
 DocType: User,Female,ស្រី
 DocType: Journal Entry Account,Debit in Account Currency,ឥណពន្ធ​វី​សា​រូបិយប័ណ្ណ​គណនី
@@ -1734,7 +1663,7 @@
 DocType: Shipping Rule,Shipping Rule Label,វិធាន​ការ​ដឹក​ជញ្ជូន​ស្លាក
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +209,Raw Materials cannot be blank.,វត្ថុ​ធាតុ​ដើម​ដែល​មិន​អាច​ត្រូវ​បាន​ទទេ​។
 DocType: Newsletter,Test,ការ​ធ្វើ​តេ​ស្ត
-apps/erpnext/erpnext/stock/doctype/item/item.py +364,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +368,"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'","ដូច​​​ដែល​មាន​ប្រតិ​បតិ​្ត​ការ​ភាគ​ហ៊ុន​ដែល​មាន​ស្រាប់​សម្រាប់​ធាតុ​នេះ \ អ្នក​មិន​អាច​ផ្លាស់​ប្តូ​រ​តម្លៃ​នៃ &quot;គ្មាន​សៀរៀល &#39;,​&#39; មាន​ជំនាន់​ទី​គ្មាន &#39;,​&#39; គឺ​ជា​ធាតុ​ហ៊ុន​&quot; និង &quot;វិធី​សា​ស្រ្ត​វាយតម្លៃ​&quot;"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +448,Quick Journal Entry,ធាតុ​ទិនានុប្បវត្តិ​រហ័ស
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +92,You can not change rate if BOM mentioned agianst any item,អ្នក​មិន​អាច​ផ្លាស់​ប្តូ​រ​អត្រា​ការ​បាន​ប្រសិន​បើ Bom បាន​រៀបរាប់ agianst ធាតុ​ណាមួយ
@@ -1743,13 +1672,14 @@
 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.,គោល​បំណង​ផលិត​ដោយ​ឡែក​ពី​គ្នា​នឹង​ត្រូវ​បាន​បង្កើត​សម្រាប់​ធាតុ​ដ៏​ល្អ​គ្នា​បាន​បញ្ចប់​។
 DocType: Purchase Invoice,Terms and Conditions1,លក្ខខណ្ឌ​និង Conditions1
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +18,Complete Setup,ការ​រៀបចំ​ពេញលេញ
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard_page.html +18,Complete Setup,ការ​រៀបចំ​ពេញលេញ
 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/config/crm.py +96,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 +57,Total Absent,សរុប​អវត្តមាន
 apps/erpnext/erpnext/config/stock.py +109,Unit of Measure,ឯកតា​រង្វាស់
@@ -1772,14 +1702,13 @@
 DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),អត្រា​ការ​ប្រាក់​មូលដ្ឋាន (ដូច​ជា​ក្នុង​មួយ​ហ៊ុន UOM​)
 DocType: SMS Log,No of Requested SMS,គ្មាន​សារ​ជា​អក្សរ​ដែល​បាន​ស្នើ
 DocType: Campaign,Campaign-.####,យុទ្ធ​នា​ការ​។ - ####
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +55,Piercing,ះ
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,ជំហាន​បន្ទាប់
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +117,Contract End Date must be greater than Date of Joining,កិច្ច​សន្យា​ដែល​កាលបរិច្ឆេទ​បញ្ចប់​ត្រូវ​តែ​ធំ​ជាង​កាលបរិច្ឆេទ​នៃ​ការ​ចូលរួម
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,ការ​ចែក​ចាយ​របស់​ភាគី​ទី​បី / អ្នក​ចែកបៀ / គណៈ​កម្ម​ការ​របស់​ភ្នាក់ងារ / បុត្រ​សម្ព័ន្ធ / លក់​បន្ត​ដែល​លក់​ផលិត​ផល​របស់​ក្រុម​ហ៊ុន​សម្រាប់​គណៈ​ក​ម្មា​ការ​មួយ​។
 DocType: Customer Group,Has Child Node,មាន​ថ្នាំង​កុមារ
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","បញ្ចូល​ប៉ារ៉ាម៉ែត្រ URL ឋិតិ​វន្ត​នៅ​ទីនេះ (ឧ​។ អ្នក​ផ្ញើ = ERPNext​, ឈ្មោះ​អ្នក​ប្រើ = ERPNext ពាក្យ​សម្ងាត់ = 1234 ល​)"
-apps/erpnext/erpnext/setup/page/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,ជួរ Ageing 1
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +110,Photochemical machining,ម៉ាស៊ីន Photochemical
 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.
 
 #### Note
@@ -1818,7 +1747,7 @@
 DocType: Purchase Invoice,Currency and Price List,រូបិយប័ណ្ណ​និង​តារាងតម្លៃ
 DocType: Opportunity,Customer / Lead Name,អតិថិជន​នាំ​ឱ្យ​ឈ្មោះ /
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +63,Clearance Date not mentioned,ការ​បោសសំអាត​កាលបរិច្ឆេទ​មិន​បាន​លើកឡើង
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +71,Production,ផលិតកម្ម
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Production,ផលិតកម្ម
 DocType: Item,Allow Production Order,អនុញ្ញាត​ឱ្យ​មាន​ការ​បញ្ជាទិញ​ផលិតផល
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),សរុប (Qty​)
 DocType: Installation Note Item,Installed Qty,ដែល​បាន​ដំឡើង Qty
@@ -1830,7 +1759,7 @@
 apps/erpnext/erpnext/utilities/doctype/address/address.py +113,My Addresses,អាសយដ្ឋាន​របស់ខ្ញុំ
 DocType: Stock Ledger Entry,Outgoing Rate,អត្រា​ចេញ
 apps/erpnext/erpnext/config/hr.py +100,Organization branch master.,ចៅហ្វាយ​សាខា​អង្គការ​។
-apps/erpnext/erpnext/controllers/accounts_controller.py +237, or ,ឬ
+apps/erpnext/erpnext/controllers/accounts_controller.py +238, 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 ខាង​លើ
@@ -1861,10 +1790,7 @@
 DocType: Bin,Reserved Quantity,បរិមាណ​បំរុង​ទុក
 DocType: Landed Cost Voucher,Purchase Receipt Items,ទទួល​ទិញ​របស់របរ
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,ទម្រង់​តាម​បំណង
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +62,Cutting,កាត់
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +69,Flattening,វាយកម្ទេច
 DocType: Account,Income Account,គណនី​ប្រាក់​ចំណូល
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +22,Molding,ការអប់រំ
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +632,Delivery,ការ​ដឹកជញ្ជូន
 DocType: Stock Reconciliation Item,Current Qty,Qty នា​ពេល​បច្ចុប្បន្ន
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",សូម​មើល &quot;អត្រា​នៃ​មូលដ្ឋាន​នៅ​លើ​សម្ភារៈ​&quot; នៅ​ក្នុង​ផ្នែក​ទី​ផ្សារ
@@ -1873,7 +1799,7 @@
 apps/frappe/frappe/desk/moduleview.py +61,Documents,ឯកសារ
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +17,Ref,យោង
 DocType: Cost Center,Cost Center,មជ្ឈមណ្ឌល​ការ​ចំណាយ
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.js +48,Voucher #,# កាត​មាន​ទឹក​ប្រាក់
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +36,Voucher #,# កាត​មាន​ទឹក​ប្រាក់
 DocType: Notification Control,Purchase Order Message,ទិញ​សារ​លំដាប់
 DocType: Tax Rule,Shipping Country,ការ​ដឹក​ជញ្ជូន​ក្នុង​ប្រទេស
 DocType: Upload Attendance,Upload HTML,ផ្ទុក​ឡើង​របស់ HTML
@@ -1881,9 +1807,8 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +12,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.",វិធាន​ការ​កំណត់​តម្លៃ​ត្រូវ​បាន​ផលិត​ដើម្បី​សរសេរ​ជាន់​ពី​លើ​តារាងតម្លៃ / កំណត់​ជា​ភាគរយ​បញ្ចុះ​តម្លៃ​ដោយ​ផ្អែក​លើ​លក្ខណៈ​វិនិច្ឆ័យ​មួយ​ចំនួន​។
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,ឃ្លាំង​អាច​ផ្លាស់​ប្តូ​រ​បាន​តែ​តាម​រយៈ​ហ៊ុន​ចូល / ដឹកជញ្ជូន​ចំណាំ​បង្កាន់ដៃ / ការ​ទិញ
 DocType: Employee Education,Class / Percentage,ថ្នាក់ / ភាគរយ
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +92,Head of Marketing and Sales,ជា​ប្រធាន​ទីផ្សារ​និង​លក់
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +31,Income Tax,ពន្ធ​លើ​ប្រាក់​ចំណូល
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +157,Laser engineered net shaping,ឡាស៊ែរ engineered រាង​សុទ្ធ
+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.","បើ​សិន​ជា​វិធាន​តម្លៃ​ដែល​បាន​ជ្រើស​ត្រូវ​បាន​បង្កើត​ឡើង​សម្រាប់ &quot;តំលៃ​&quot; វា​នឹង​សរសេរ​ជាន់​លើ​បញ្ជី​តម្លៃ​។ តម្លៃ​ដែល​កំណត់​តម្លៃ​គឺ​ជា​តម្លៃ​វិធាន​ចុងក្រោយ​នេះ​បាន​បញ្ចុះ​តម្លៃ​បន្ថែម​ទៀត​ដូច្នេះ​មិន​មាន​គួរ​ត្រូវ​បាន​អនុវត្ត​។ ហេតុនេះ​ហើយ​បាន​ជា​នៅ​ក្នុង​ប្រតិបត្តិការ​ដូច​ជា​ការ​លក់​ស​ណ្តា​ប់​ធ្នាប់​, ការ​ទិញ​លំដាប់​ល​នោះ​វា​នឹង​ត្រូវ​បាន​ទៅ​យក​នៅ​ក្នុង​វិស័យ &#39;អត្រា​&#39; ជា​ជាង​វាល &quot;តំលៃ​អត្រា​បញ្ជី​។"
 apps/erpnext/erpnext/config/selling.py +163,Track Leads by Industry Type.,បទ​នាំ​តាម​ប្រភេទ​ឧស្សាហកម្ម​។
 DocType: Item Supplier,Item Supplier,ផ្គត់ផ្គង់​ធាតុ
@@ -1904,23 +1829,20 @@
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Qty ពិត​ប្រាកដ​បន្ទាប់​ពី​ការ​ប្រតិបត្តិការ
 ,Pending SO Items For Purchase Request,ការ​រង់ចាំ​ការ​ធាតុ​ដូច្នេះ​សម្រាប់​សំណើ​រ​សុំ​ទិញ
 DocType: Supplier,Billing Currency,រូបិយប័ណ្ណ​វិ​ក័​យ​ប័ត្រ
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +148,Extra Large,បន្ថែម​ទៀត​ដែល​មាន​ទំហំ​ធំ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,Extra Large,បន្ថែម​ទៀត​ដែល​មាន​ទំហំ​ធំ
 ,Profit and Loss Statement,សេចក្តី​ថ្លែងការណ៍​ប្រាក់​ចំណេញ​និង​ការ​បាត់​បង់
 DocType: Bank Reconciliation Detail,Cheque Number,លេខ​មូលប្បទានប័ត្រ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +43,Pressing,ការ​ចុច
 DocType: Payment Tool Detail,Payment Tool Detail,ព​ត៌​មាន​នៃ​ឧបករណ៍​ទូទាត់​ប្រាក់
 ,Sales Browser,កម្មវិធី​រុករក​ការ​លក់
 DocType: Journal Entry,Total Credit,ឥណទាន​សរុប
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +459,Local,ក្នុង​តំបន់
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +397,Local,ក្នុង​តំបន់
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),ឥណទាន​និង​បុរេប្រទាន (ទ្រព្យសម្បត្តិ​)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,ជំពាក់​បំណុល
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +147,Large,ដែល​មាន​ទំហំ​ធំ
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +23,No employee found!,គ្មាន​និយោជិត​រក​ឃើញ​!
+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 +152,Please mention no of visits required,សូម​និយាយ​ពី​មិន​មាន​នៃ​ការ​មើល​ដែល​បាន​ទាមទារ
 DocType: Purchase Order,Customer Address Display,អាសយដ្ឋាន​អតិថិជន​បង្ហាញ
 DocType: Stock Settings,Default Valuation Method,វិធី​សា​ស្រ្ត​វាយតម្លៃ​លំនាំ​ដើម
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +127,Polishing,ខាត់
 DocType: Production Order Operation,Planned Start Time,ពេលវេលា​ចាប់ផ្ដើម​គ្រោងទុក
 apps/erpnext/erpnext/config/accounts.py +63,Close Balance Sheet and book Profit or Loss.,តារាង​តុល្យការ​ជិតស្និទ្ធ​និង​សៀវភៅ​ចំណ​ញ​ឬ​ខាត​។
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,បញ្ជាក់​អត្រា​ប្តូ​រ​ប្រាក់​ដើម្បី​បម្លែង​រូបិយ​ប័ណ្ណ​មួយ​ទៅ​មួយ​ផ្សេង​ទៀត
@@ -1932,7 +1854,6 @@
 DocType: Production Order Operation,Make Time Log,ធ្វើ​ឱ្យ​ការ​កំណត់​ហេតុ​ម៉ោង
 DocType: Price List,Applicable for Countries,អនុវត្ត​សម្រាប់​ប​ណ្តា​ប្រទេស
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Computers,កុំ​ព្យូ​ទ័​រ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +112,Electro-chemical grinding,អគ្គិសនី​គីមី​កិន
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +14,This is a root customer group and cannot be edited.,នេះ​គឺជា​ក្រុម​អតិថិជន​ជា root និង​មិន​អាច​ត្រូវ​បាន​កែសម្រួល​។
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +39,Please setup your chart of accounts before you start Accounting Entries,សូម​រៀបចំ​ការ​គំនូស​តាង​របស់​អ្នក​គណនី​របស់​អ្នក​មុន​ពេល​អ្នក​ចាប់​ផ្តើ​ម​ធាតុ​គណនេយ្យ
 DocType: Purchase Invoice,Ignore Pricing Rule,មិន​អើពើ​វិធាន​តម្លៃ
@@ -1972,7 +1893,6 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +38,"Charges will be distributed proportionately based on item qty or amount, as per your selection",បទ​ចោទ​ប្រកាន់​នឹង​ត្រូវ​បាន​ចែក​ដោយ​ផ្អែក​លើ​ធាតុ qty សមាមាត្រ​ឬ​បរិមាណ​ជា​មួយ​ជម្រើស​របស់​អ្នក
 DocType: Maintenance Visit,Purposes,គោល​បំ​ន​ង
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +103,Atleast one item should be entered with negative quantity in return document,យ៉ាងហោចណាស់​ធាតុ​មួយ​ដែល​គួរ​តែ​ត្រូវ​បញ្ចូល​ដោយ​បរិមាណ​អវិជ្ជមាន​នៅ​ក្នុង​ឯកសារ​វិល​ត្រឡប់​មក​វិញ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +134,Electrochemical machining,ម៉ាស៊ីន Electrochemical
 ,Requested,បាន​ស្នើ​រ​សុំ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +66,No Remarks,គ្មាន​សុន្ទរកថា
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +13,Overdue,ហួស​កាលកំណត់
@@ -1996,7 +1916,6 @@
 DocType: Purchase Invoice,Half-yearly,ពាក់​ក​ណ្តា​ល​ប្រចាំ​ឆ្នាំ
 DocType: Bank Reconciliation,Get Relevant Entries,ទទួល​បាន​ធាតុ​ពាក់ព័ន្ធ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +407,Accounting Entry for Stock,ចូល​គណនេយ្យ​សម្រាប់​ក្រុមហ៊ុន​ផ្សារ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +64,Coining,coining
 DocType: Sales Invoice,Sales Team1,Team1 ការ​លក់
 DocType: Sales Invoice,Customer Address,អាសយដ្ឋាន​អតិថិជន
 apps/frappe/frappe/desk/query_report.py +136,Total,ចំនួន​សរុប
@@ -2007,11 +1926,10 @@
 DocType: BOM,Item UOM,ធាតុ UOM
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),ចំនួន​ប្រាក់​ពន្ធ​បន្ទាប់​ពី​ចំនួន​ការ​បញ្ចុះ​តម្លៃ (ក្រុមហ៊ុន​រូបិយវត្ថុ​)
 DocType: Quality Inspection,Quality Inspection,ពិនិត្យ​គុណភាព
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +144,Extra Small,បន្ថែម​ទៀត​ខ្នាត​តូច
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +20,Spray forming,បាញ់​បង្កើត
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Extra Small,បន្ថែម​ទៀត​ខ្នាត​តូច
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +458,Warning: Material Requested Qty is less than Minimum Order Qty,ព្រមាន​: សម្ភារៈ​ដែល​បាន​ស្នើ Qty គឺ​តិច​ជាង​អប្បបរមា​លំដាប់ Qty
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,ផ្នែក​ច្បាប់​អង្គភាព / តារាង​រួមផ្សំ​ជា​មួយ​នឹង​គណនី​ដាច់​ដោយ​ឡែក​មួយ​ដែល​ជា​កម្មសិទ្ធិ​របស់​អង្គការ​នេះ​។
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +29,"Food, Beverage & Tobacco","អាហារ​, ភេសជ្ជៈ​និង​ថ្នាំជក់"
+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/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,កម្រិត​សារពើ​ភ័​ណ្ឌ​អប្ប​បរិ​មា
@@ -2022,12 +1940,11 @@
 DocType: Item,Manufacturer Part Number,ក្រុមហ៊ុន​ផលិត​ផ្នែក​មួយ​ចំនួន
 DocType: Production Order Operation,Estimated Time and Cost,ការ​ប៉ាន់​ប្រមាណ​និង​ការ​ចំណាយ​ពេល​វេលា
 DocType: Bin,Bin,bin
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +50,Nosing,ច្រមុះ
 DocType: SMS Log,No of Sent SMS,គ្មាន​សារ​ដែល​បាន​ផ្ញើ
 DocType: Account,Company,កេ​ុ​ម​ហ៊ុន
 DocType: Account,Expense Account,ចំណាយ​តាម​គណនី
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +49,Software,កម្មវិធី​សម្រាប់​បញ្ចូល​កុំព្យូទ័រ
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +151,Colour,ពណ៌
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +49,Software,កម្មវិធី​សម្រាប់​បញ្ចូល​កុំព្យូទ័រ
+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",សូម​ជ្រើស​ធាតុ​ដែល &quot;គឺ​ជា​ធាតុ​ហ៊ុន​&quot; គឺ &quot;ទេ​&quot; ហើយ &quot;តើ​ធាតុ​លក់​&quot; គឺ​ជា &quot;បាទ​&quot; ហើយ​មិន​មាន​កញ្ចប់​ផលិត​ផល​ផ្សេង​ទៀត
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,ជ្រើស​ដើម្បី​មិន​ស្មើគ្នា​ចែកចាយ​ប្រចាំខែ​គោលដៅ​នៅ​ទូទាំង​ខែ​ចែកចាយ​។
@@ -2041,7 +1958,7 @@
 DocType: Quality Inspection,Inspection Type,ប្រភេទ​អធិការកិច្ច
 DocType: C-Form,C-Form No,ទម្រង់​បែបបទ​គ្មាន C​-
 DocType: BOM,Exploded_items,Exploded_items
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +95,Researcher,អ្នក​ស្រាវ​ជ្រាវ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Researcher,អ្នក​ស្រាវ​ជ្រាវ
 apps/frappe/frappe/custom/doctype/customize_form/customize_form.js +88,Update,ធ្វើ​ឱ្យ​ទាន់​សម័យ
 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 +23,Name or Email is mandatory,ឈ្មោះ​ឬ​អ៊ី​ម៉ែ​ល​ចាំបាច់
@@ -2049,11 +1966,10 @@
 DocType: Purchase Order Item,Returned Qty,ត្រឡប់​មក​វិញ Qty
 DocType: Employee,Exit,ការ​ចាក​ចេញ
 apps/erpnext/erpnext/accounts/doctype/account/account.py +134,Root Type is mandatory,ប្រភេទ​ជា Root គឺ​ជា​ចាំបាច់
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +125,Vibratory finishing,បញ្ចប់ Vibratory
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","ចំពោះ​ភាព​ងាយស្រួល​នៃ​អតិថិជន​, កូដ​ទាំង​នេះ​អាច​ត្រូវ​បាន​ប្រើ​នៅ​ក្នុង​ទ្រង់ទ្រាយ​បោះពុម្ព​ដូច​ជា​ការ​វិ​កិ​យ​ប័ត្រ​និង​ដឹកជញ្ជូន​ចំណាំ"
 DocType: Employee,You can enter any date manually,អ្នក​អាច​បញ្ចូល​កាលបរិច្ឆេទ​ណា​មួយ​ដោយ​ដៃ
 DocType: Sales Invoice,Advertisement,ការ​ផ្សព្វផ្សាយ
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +165,Probationary Period,រយៈ​ពេល​សាកល្បង
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Probationary Period,រយៈ​ពេល​សាកល្បង
 DocType: Customer Group,Only leaf nodes are allowed in transaction,មាន​តែ​ថ្នាំង​ស្លឹក​ត្រូវ​បាន​អនុញ្ញាត​ក្នុង​ប្រតិ​ប​ត្តិ​ការ
 DocType: Expense Claim,Expense Approver,ការ​អនុម័ត​ការ​ចំណាយ
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,ធាតុ​បង្កាន់ដៃ​ទិញ​សហ​ការី
@@ -2061,19 +1977,16 @@
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +17,To Datetime,ដើម្បី Datetime
 DocType: SMS Settings,SMS Gateway URL,URL ដែល​បាន​សារ SMS Gateway
 apps/erpnext/erpnext/config/crm.py +53,Logs for maintaining sms delivery status,កំណត់​ហេតុ​សម្រាប់​ការ​រក្សា​ស្ថានភាព​ចែក​ចាយ​ផ្ញើ​សារ​ជា​អក្សរ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +137,Grinding,កិន
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +34,Shrink wrapping,បង្រួញ​រុំ
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +36,Pending Activities,សកម្មភាព​ដែល​មិន​ទាន់​សម្រេច
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,Confirmed,បាន​បញ្ជាក់​ថា
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier > Supplier Type,ក្រុមហ៊ុន​ផ្គត់ផ្គង់​&gt; ប្រភេទ​ផ្គត់ផ្គង់
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +127,Please enter relieving date.,សូម​បញ្ចូល​កាលបរិច្ឆេទ​បន្ថយ​។
 apps/erpnext/erpnext/controllers/trends.py +137,Amt,AMT
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' can be submitted,ទុក​ឱ្យ​បាន​តែ​កម្មវិធី​ដែល​មាន​ស្ថានភាព &#39;ត្រូវ​បាន​អនុម័ត &quot;អាច​ត្រូវ​បាន​ដាក់​ស្នើ
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +51,Only Leave Applications with status 'Approved' can be submitted,ទុក​ឱ្យ​បាន​តែ​កម្មវិធី​ដែល​មាន​ស្ថានភាព &#39;ត្រូវ​បាន​អនុម័ត &quot;អាច​ត្រូវ​បាន​ដាក់​ស្នើ
 apps/erpnext/erpnext/utilities/doctype/address/address.py +21,Address Title is mandatory.,អាសយដ្ឋាន​ចំណងជើង​គឺ​ជា​ចាំបាច់​។
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,បញ្ចូល​ឈ្មោះ​នៃ​យុទ្ធ​នា​ការ​បាន​ប្រសិន​បើ​ប្រភព​នៃ​ការ​ស៊ើប​អង្កេត​គឺជា​យុទ្ធនាការ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +38,Newspaper Publishers,កាសែត​បោះពុម្ពផ្សាយ
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +38,Newspaper Publishers,កាសែត​បោះពុម្ពផ្សាយ
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,ជ្រើស​ឆ្នាំ​សារពើពន្ធ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +88,Smelting,រំលាយ
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,រៀបចំ​វគ្គ
 DocType: Attendance,Attendance Date,ការ​ចូលរួម​កាលបរិច្ឆេទ
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,ការ​បែកបាក់​គ្នា​ដោយ​ផ្អែក​លើ​ការ​រក​ប្រាក់​ចំណូល​បាន​ប្រាក់​ខែ​និង​ការ​កាត់​។
@@ -2088,15 +2001,14 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +414,[Error],[កំហុស​ក្នុង​ការ​]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,នៅ​ក្នុង​ពាក្យ​នោះ​នឹង​ត្រូវ​បាន​មើល​ឃើញ​នៅ​ពេល​ដែល​អ្នក​រក្សា​ស​ណ្តា​ប់​ធ្នាប់​ការ​លក់​។
 ,Employee Birthday,បុគ្គលិក​ខួបកំណើត
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +55,Venture Capital,យ្រ​ប
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,យ្រ​ប
 DocType: UOM,Must be Whole Number,ត្រូវ​តែ​ជា​លេខ​ទាំងមូល
 DocType: Leave Control Panel,New Leaves Allocated (In Days),ស្លឹក​ថ្មី​ដែល​បាន​បម្រុង​ទុក (ក្នុង​ថ្ងៃ​)
 DocType: Pricing Rule,Discount Percentage,ភាគរយ​បញ្ចុះ​តំលៃ
 DocType: Payment Reconciliation Invoice,Invoice Number,លេខ​វិ​ក្ក័​យ​ប័ត្រ
-apps/erpnext/erpnext/hooks.py +70,Orders,ការ​បញ្ជា​ទិញ
+apps/erpnext/erpnext/hooks.py +54,Orders,ការ​បញ្ជា​ទិញ
 DocType: Leave Control Panel,Employee Type,ប្រភេទ​បុគ្គលិក
 DocType: Employee Leave Approver,Leave Approver,ទុក​ឱ្យ​ការ​អនុម័ត
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +70,Swaging,Swaging
 DocType: Manufacturing Settings,Material Transferred for Manufacture,សម្ភារៈ​ផ្ទេរ​សម្រាប់​ការផលិត
 DocType: Expense Claim,"A user with ""Expense Approver"" role",អ្នក​ប្រើ​ដែល​មាន &quot;ការ​ចំណាយ​ការ​អនុម័ត​&quot; តួនាទី​មួយ
 ,Issued Items Against Production Order,ធាតុ​ដែល​បាន​ចេញ​ដីកា​បង្គាប់​របស់​ផលិតកម្ម​ប្រឆាំង​នឹង
@@ -2108,7 +2020,6 @@
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +62,Cost Center with existing transactions can not be converted to group,ជាមួយ​នឹង​ការ​ប្រតិ​ប​ត្តិ​ការ​នៃ​មជ្ឈមណ្ឌល​ការ​ចំណាយ​ដែល​មាន​ស្រាប់​ដែល​មិន​អាច​ត្រូវ​បាន​បម្លែង​ទៅ​ជា​ក្រុម
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Depreciation,រំលស់
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),ក្រុមហ៊ុន​ផ្គត់ផ្គង់ (s បាន​)
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +29,Invalid period,រយៈ​ពេល​មិន​ត្រឹមត្រូវ
 DocType: Customer,Credit Limit,ដែន​កំណត់​ឥណទាន
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,ជ្រើស​ប្រភេទ​នៃ​ការ​ប្រតិ​ប​ត្តិ​ការ
 DocType: GL Entry,Voucher No,កាត​មាន​ទឹក​ប្រាក់​គ្មាន
@@ -2117,8 +2028,7 @@
 DocType: Customer,Address and Contact,អាស័យ​ដ្ឋាន​និង​ទំនាក់ទំនង
 DocType: Customer,Last Day of the Next Month,ចុង​ក្រោយ​កាល​ពី​ថ្ងៃ​នៃ​ខែ​បន្ទាប់
 DocType: Employee,Feedback,មតិ​អ្នក
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +621,Maint. Schedule,Maint ។ កាលវិភាគ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +108,Abrasive jet machining,ម៉ាស៊ីន​យន្តហោះ​សំណឹក
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +632,Maint. Schedule,Maint ។ កាលវិភាគ
 DocType: Stock Settings,Freeze Stock Entries,ធាតុ​បង្ក​ហ៊ុន
 DocType: Website Settings,Website Settings,ការ​កំណត់​វេ​ប​សាយ
 DocType: Item,Reorder level based on Warehouse,កម្រិត​នៃ​ការ​រៀបចំ​ដែល​មាន​មូលដ្ឋាន​លើ​ឃ្លាំង
@@ -2143,7 +2053,7 @@
 DocType: Lead,Market Segment,ចំណែក​ទីផ្សារ
 DocType: Communication,Phone,ទូរស័ព្ទ
 DocType: Employee Internal Work History,Employee Internal Work History,ប្រវត្តិ​ការងារ​របស់​បុគ្គលិក​ផ្ទ​​ៃក្នុង
-apps/erpnext/erpnext/public/js/account_tree_grid.js +50,Closing (Dr),បិទ (លោក​បណ្ឌិត​)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +221,Closing (Dr),បិទ (លោក​បណ្ឌិត​)
 DocType: Contact,Passive,អ​កម្ម
 apps/erpnext/erpnext/config/selling.py +127,Tax template for selling transactions.,ពុម្ព​ពន្ធ​លើ​ការ​លក់​ការ​ធ្វើ​ប្រតិបត្តិការ​។
 DocType: Sales Invoice,Write Off Outstanding Amount,បិទ​ការ​សរសេរ​ចំនួន​ទឹកប្រាក់​ដ៏​ឆ្នើម
@@ -2157,7 +2067,7 @@
 ,Billed Amount,ចំនួន​ទឹកប្រាក់​ដែល​បាន​ផ្សព្វ​ផ្សាយ
 DocType: Bank Reconciliation,Bank Reconciliation,ធនាគារ​ការផ្សះផ្សា
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +9,Get Updates,ទទួល​បាន​ការ​ធ្វើ​ឱ្យ​ទាន់សម័យ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +641,Add a few sample records,បន្ថែម​កំណត់ត្រា​គំរូ​មួយ​ចំនួន​ដែល
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Add a few sample records,បន្ថែម​កំណត់ត្រា​គំរូ​មួយ​ចំនួន​ដែល
 apps/erpnext/erpnext/config/hr.py +210,Leave Management,ទុក​ឱ្យ​ការ​គ្រប់​គ្រង
 DocType: Event,Groups,ក្រុម​អ្នក
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,ក្រុម​តាម​គណនី
@@ -2173,12 +2083,11 @@
 DocType: Sales Order,Customer's Purchase Order,ទិញ​លំដាប់​របស់​អតិថិជន
 DocType: Warranty Claim,From Company,ពី​ក្រុមហ៊ុន
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,តំលៃ​ឬ Qty
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Minute,នាទី
+apps/erpnext/erpnext/public/js/setup_wizard.js +363,Minute,នាទី
 DocType: Purchase Invoice,Purchase Taxes and Charges,ទិញ​ពន្ធ​និង​ការ​ចោទ​ប្រកាន់
 ,Qty to Receive,qty ទទួល
 DocType: Leave Block List,Leave Block List Allowed,ទុក​ឱ្យ​ប្លុក​ដែល​បាន​អនុញ្ញាត​ក្នុង​បញ្ជី
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +61,Conversion factor cannot be in fractions,កត្តា​ការ​ប្រែចិត្ត​ជឿ​មិន​អាច​មាន​នៅ​ក្នុង​ការ​ប្រ​ភាគ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +358,You will use it to Login,អ្នក​នឹង​ប្រើ​វា​ដើម្បី​កត់ត្រា​ចូល
+apps/erpnext/erpnext/public/js/setup_wizard.js +108,You will use it to Login,អ្នក​នឹង​ប្រើ​វា​ដើម្បី​កត់ត្រា​ចូល
 DocType: Sales Partner,Retailer,ការ​លក់​រាយ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +99,Credit To account must be a Balance Sheet account,ឥណទាន​ទៅ​គណនី​ត្រូវ​តែ​មាន​តារាង​តុល្យការ​គណនី
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,ក្រុមហ៊ុន​ផ្គត់ផ្គង់​គ្រប់​ប្រភេទ
@@ -2189,12 +2098,9 @@
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +15,Make Salary Slip,ធ្វើ​ឱ្យ​ប្រាក់ខែ​គ្រូពេទ្យ​ប្រហែលជា
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +18,Browse BOM,រក​មើល Bom
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +175,Secured Loans,ការ​ផ្តល់​កម្ចី​ដែល​មាន​សុវត្ថិភាព
-apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +3,Awesome Products,ផលិតផល​ដែល​ប្រសើរ
+apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +3,Awesome Products,ផលិតផល​ដែល​ប្រសើរ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +189,Opening Balance Equity,សមធម៌​តុល្យភាព​ពិធី​បើក
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +80,Cannot approve leave as you are not authorized to approve leaves on Block Dates,មិន​អាច​អនុម័ត​លើ​ការ​ឈប់​សម្រាក​ដូច​ដែល​អ្នក​មិន​ត្រូវ​បាន​អនុញ្ញាត​ឱ្យ​អនុម័ត​ស្លឹក​នៅ​លើ​កាលបរិច្ឆេទ​ប្លុក
 DocType: Appraisal,Appraisal,ការវាយតម្លៃ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +13,Lost-foam casting,បាត់បង់​ស្នោ​សម្ដែង
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +47,Drawing,គំនូរ
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +22,Date is repeated,កាលបរិច្ឆេទ​គឺ​ត្រូវ​បាន​ធ្វើ​ម្តង​ទៀត
 DocType: Hub Settings,Seller Email,អ្នក​លក់​អ៊ី​ម៉ែ​ល
 DocType: Project,Total Purchase Cost (via Purchase Invoice),ការ​ចំណាយ​ទិញ​សរុប (តាម​រយៈ​ការ​ទិញ​វិ​ក័​យ​ប័ត្រ​)
@@ -2209,7 +2115,7 @@
 DocType: Purchase Invoice Item,Net Amount (Company Currency),ចំនួន​ទឹកប្រាក់​សុទ្ធ (ក្រុមហ៊ុន​រូបិយវត្ថុ​)
 DocType: BOM Operation,Hour Rate,ហួរ​អត្រា
 DocType: Stock Settings,Item Naming By,ធាតុ​ដាក់ឈ្មោះ​តាម
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +642,From Quotation,ចាប់​ពី​សម្រង់
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +655,From Quotation,ចាប់​ពី​សម្រង់
 DocType: Production Order,Material Transferred for Manufacturing,សម្ភារៈ​ផ្ទេរ​សម្រាប់​កម្មន្តសាល
 DocType: Purchase Receipt Item,Purchase Order Item No,ទិញ​ធាតុ​លំដាប់​គ្មាន
 DocType: System Settings,System Settings,កំណត់​ប្រព័ន្ធ
@@ -2223,16 +2129,14 @@
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),ទំ​ង​ន់​សរុប​នៃ​កញ្ចប់​។ ជា​ធម្មតា​មាន​ទម្ងន់​សុទ្ធ + + ការ​វេច​ខ្ចប់​មាន​ទម្ងន់​សម្ភារៈ​។ (សម្រាប់​ការ​បោះពុម្ព​)
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,អ្នក​ប្រើ​ដែល​មាន​តួនាទី​នេះ​ត្រូវ​បាន​អនុញ្ញាត​ឱ្យ​កំណត់​គណនី​របស់​ទឹកកក​និង​បង្កើត / កែប្រែ​ធាតុ​គណនេយ្យ​ប្រឆាំង​នឹង​គណនី​ជា​ទឹកកក
 DocType: Serial No,Is Cancelled,ត្រូវ​បាន​លុបចោល
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +281,My Shipments,ការ​នាំ​ចេញ​របស់​យើង
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +286,My Shipments,ការ​នាំ​ចេញ​របស់​យើង
 DocType: Journal Entry,Bill Date,លោក Bill កាលបរិច្ឆេទ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +43,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:",បើ​ទោះ​បី​ជា​មាន​ច្បាប់​តម្លៃ​ច្រើន​ដែល​មាន​អាទិភាព​ខ្ពស់​បំផុត​បន្ទាប់​មក​បន្ទាប់​ពី​មាន​អាទិភាព​ផ្ទៃក្នុង​ត្រូវ​បាន​អនុវត្ត​:
 DocType: Supplier,Supplier Details,ព​ត៌​មាន​លំអិត​ក្រុមហ៊ុន​ផ្គត់ផ្គង់
 DocType: Communication,Recipients,អ្នក​ទទួល
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +146,Screwing,មូល
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +96,Knurling,Knurling
 DocType: Expense Claim,Approval Status,ស្ថានភាព​ការ​អនុម័ត
 DocType: Hub Settings,Publish Items to Hub,បោះពុម្ព​ផ្សាយ​ធាតុ​ហាប់
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +133,Wire Transfer,ការ​ផ្ទេរ​ខ្សែ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +133,Wire Transfer,ការ​ផ្ទេរ​ខ្សែ
 apps/erpnext/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py +25,Please select Bank Account,សូម​ជ្រើស​រើស​គណនី​ធនាគារ
 DocType: Newsletter,Create and Send Newsletters,បង្កើត​និង​ផ្ញើ​ការ​ពិពណ៌នា
 apps/frappe/frappe/public/js/frappe/views/reports/grid_report.js +305,From Date must be before To Date,ចាប់​ពី​កាលបរិច្ឆេទ​ត្រូវ​តែ​ជា​កាលបរិច្ឆេទ​មុន
@@ -2240,11 +2144,11 @@
 DocType: Company,Default Income Account,គណនី​ចំណូល​លំនាំ​ដើម
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,ក្រុម​ផ្ទាល់ខ្លួន / អតិថិជន
 DocType: Item Group,Check this if you want to show in website,ធីក​ប្រអប់​នេះ​បើ​អ្នក​ចង់​បង្ហាញ​នៅ​ក្នុង​គេហទំព័រ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +190,Welcome to ERPNext,សូម​ស្វាគមន៍​មក​កាន់ ERPNext
+,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/page/setup_wizard/install_fixtures.py +37,Calls,ការ​ហៅ​ទូរស័ព្ទ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Calls,ការ​ហៅ​ទូរស័ព្ទ
 DocType: Project,Total Costing Amount (via Time Logs),ចំនួន​ទឹកប្រាក់​ផ្សារ​សរុប (តាម​រយៈ​ការ​ពេល​វេលា​កំណត់​ហេតុ​)
 DocType: Purchase Order Item Supplied,Stock UOM,ភាគ​ហ៊ុន UOM
 ,Projected,ការ​ព្យាករ
@@ -2252,7 +2156,6 @@
 DocType: Issue,Opening Date,ពិធី​បើក​កាលបរិច្ឆេទ
 DocType: Journal Entry,Remark,សំគាល់
 DocType: Purchase Receipt Item,Rate and Amount,អត្រា​ការ​ប្រាក់​និង​ចំនួន
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +95,Boring,គួរ​ឱ្យ​ធុញ
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +667,From Sales Order,ពី​ការ​លក់​ស​ណ្តា​ប់​ធ្នាប់
 DocType: Blog Category,Parent Website Route,ផ្លូវ​របស់​ឪពុក​ម្តាយ​គេហទំព័រ
 DocType: Sales Order,Not Billed,មិន​បាន​ផ្សព្វ​ផ្សាយ
@@ -2266,16 +2169,14 @@
 apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount Amount,ចំនួន​ការ​បញ្ចុះ​តំលៃ
 DocType: Purchase Invoice,Return Against Purchase Invoice,ការ​វិល​ត្រឡប់​ពី​ការ​ប្រឆាំង​នឹង​ការ​ទិញ​វិ​ក័​យ​ប័ត្រ
 DocType: Item,Warranty Period (in days),ការ​ធានា​រយៈ​ពេល (នៅ​ក្នុង​ថ្ងៃ​)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +550,e.g. VAT,ឧ​អាករ​លើ​តម្លៃ​បន្ថែម
+apps/erpnext/erpnext/public/js/setup_wizard.js +292,e.g. VAT,ឧ​អាករ​លើ​តម្លៃ​បន្ថែម
 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,សម្រង់​កម្រង​ឯកសារ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +82,Hot metal gas forming,ឧស្ម័ន​លោហៈ​ក្តៅ​បង្កើត
 DocType: Sales Order Item,Sales Order Date,លំដាប់​ការ​លក់​កាលបរិច្ឆេទ
 DocType: Sales Invoice Item,Delivered Qty,ប្រគល់ Qty
 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.",សូម​ចូល​ទៅ​កាន់​ក្រុម​ដែល​សមស្រប (ជា​ធម្មតា​ពី​ប្រភព​មូលនិធិ​&gt; បំណុល​បច្ចុប្បន្ន​&gt; ពន្ធ​និង​ភារៈ​កិច្ច​និង​ការ​បង្កើត​គណនី​ថ្មី​មួយ (ដោយ​ចុច​លើ Add កុមារ​) នៃ​ប្រភេទ &quot;អាករ​&quot; និង​ធ្វើ​ការ​និយាយ​ពី​អត្រា​ពន្ធ​នេះ​។
 ,Payment Period Based On Invoice Date,អំឡុង​ពេល​បង់​ប្រាក់​ដែល​មាន​មូលដ្ឋាន​លើ​វិ​ក័​យ​ប័ត្រ​កាលបរិច្ឆេទ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +135,Laser cutting,កាត់​ឡាស៊ែរ
 DocType: Event,Monday,កាល​ពី​ថ្ងៃ​ចន្ទ
 DocType: Journal Entry,Stock Entry,ភាគ​ហ៊ុន​ចូល
 DocType: Account,Payable,បង់
@@ -2315,7 +2216,6 @@
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,ការ​ផ្តល់​ប័ណ្ណ​សម្រាប់​ពុម្ព​ដែល​បោះពុម្ព​ឧ Proforma វិ​ក័​យ​ប័ត្រ​។
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +140,Valuation type charges can not marked as Inclusive,ការ​ចោទ​ប្រកាន់​មិន​អាច​វាយតម្លៃ​ប្រភេទ​សម្គាល់​ថា​ជា​ការ​រួម​បញ្ចូល
 DocType: POS Profile,Update Stock,ធ្វើ​ឱ្យ​ទាន់​សម័យ​ហ៊ុន
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +128,Superfinishing,Superfinishing
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,UOM ផ្សេង​គ្នា​សម្រាប់​ធាតុ​នឹង​នាំ​ឱ្យ​មាន​មិន​ត្រឹមត្រូវ (សរុប​) តម្លៃ​ទម្ងន់​សុទ្ធ​។ សូម​ប្រាកដ​ថា​ទម្ងន់​សុទ្ធ​នៃ​ធាតុ​គ្នា​គឺ​នៅ UOM ដូច​គ្នា​។
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,អត្រា Bom
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +85,Please pull items from Delivery Note,សូម​ទាញ​ធាតុ​ពី​ការ​ដឹកជញ្ជូន​ចំណាំ
@@ -2329,7 +2229,6 @@
 ,Purchase Analytics,វិភាគ​ទិញ
 DocType: Sales Invoice Item,Delivery Note Item,ធាតុ​ចំណាំ​ដឹកជញ្ជូន
 DocType: Expense Claim,Task,ភារកិច្ច
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +57,Shaving,កោរ
 DocType: Purchase Taxes and Charges,Reference Row #,សេចក្តី​យោង​ជួរ​ដេក #
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js +14,This is a root sales person and cannot be edited.,នេះ​គឺ​ជា​ការ​លក់​មនុស្ស​ម្នាក់​ជា root និង​មិន​អាច​ត្រូវ​បាន​កែសម្រួល​។
 ,Stock Ledger,ភាគ​ហ៊ុន​សៀវភៅ
@@ -2338,13 +2237,11 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +199,Select a group node first.,ជ្រើស​ថ្នាំង​ជា​ក្រុម​មួយ​ជា​លើក​ដំបូង​។
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +108,Fill the form and save it,បំពេញ​សំណុំ​បែបបទ​និង​រក្សា​ទុក​វា
 DocType: Production Planning Tool,Download a report containing all raw materials with their latest inventory status,ទាញ​យក​របាយការណ៍​ដែល​មាន​វត្ថុ​ធាតុ​ដើម​ទាំង​អស់​ដែល​មាន​ស្ថានភាព​សារពើ​ភ័​ណ្ឌ​ចុងក្រោយ​បំផុត​របស់​ពួក​គេ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +94,Facing,ប្រឈម​មុខ​នឹង​ការ
 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: Time Log,Billable,Billable
-DocType: Authorization Rule,This will be used for setting rule in HR module,ការ​នេះ​នឹង​ត្រូវ​បាន​ប្រើ​សម្រាប់​ការ​កំណត់​ក្បួន​នៅ​ក្នុង​ម៉ូឌុល​ធនធានមនុស្ស
 DocType: Account,Rate at which this tax is applied,អត្រា​ដែល​ពន្ធ​នេះ​ត្រូវ​បាន​អនុវត្ត
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reorder Qty,រៀបចំ Qty
 DocType: Company,Stock Adjustment Account,គណនី​កែតម្រូវ​ភាគ​ហ៊ុន
@@ -2369,11 +2266,10 @@
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,ការបែងចែក​គួរ​តែ​ស្មើ​ជា​ភាគរយ​ទៅ 100​%
 DocType: Serial No,Out of AMC,ចេញ​ពី​មជ្ឈមណ្ឌល AMC
 DocType: Purchase Order Item,Material Request Detail No,ព​ត៌​មាន​នៃ​ការ​ស្នើ​សុំ​សម្ភារៈ​គ្មាន
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +97,Hard turning,របត់​ការ​លំបាក
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +33,Make Maintenance Visit,ធ្វើ​ឱ្យ​ការ​ថែទាំ​ទស្សនកិច្ច
 DocType: Company,Default Cash Account,គណនី​សាច់ប្រាក់​លំនាំ​ដើម
 apps/erpnext/erpnext/config/accounts.py +79,Company (not Customer or Supplier) master.,ក្រុមហ៊ុន (មិន​មាន​អតិថិជន​ឬ​ផ្គត់​) មេ​។
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +106,Please enter 'Expected Delivery Date',សូម​បញ្ចូល &#39;កាលបរិច្ឆេទ​ដឹកជញ្ជូន​រំពឹង​ទុក &quot;
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +100,Please enter 'Expected Delivery Date',សូម​បញ្ចូល &#39;កាលបរិច្ឆេទ​ដឹកជញ្ជូន​រំពឹង​ទុក &quot;
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +373,Paid amount + Write Off Amount can not be greater than Grand Total,ចំនួន​ទឹកប្រាក់​ដែល​បង់ + + បិទ​សរសេរ​ចំនួន​ទឹកប្រាក់​ដែល​មិន​អាច​ត្រូវ​បាន​ធំជាង​សម្ពោធ​សរុប
 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,ក្រុមហ៊ុន​ផ្គត់ផ្គង់​ធាតុ
@@ -2391,41 +2287,35 @@
 DocType: Purchase Order,Customer Contact Email,ទំនាក់ទំនង​អតិថិជន​អ៊ី​ម៉ែ​ល
 DocType: Event,Sunday,កាល​ពី​ថ្ងៃ​អាទិត្យ
 DocType: Sales Team,Contribution (%),ចំ​ែ​ណ​ក (%​)
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +455,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,ចំណាំ​: ការ​ទូទាត់​នឹង​មិន​ចូល​ត្រូវ​បាន​បង្កើត​តាំង​ពី​សាច់ប្រាក់​ឬ​គណនី​ធនាគារ &#39;មិន​ត្រូវ​បាន​បញ្ជាក់
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +171,Responsibilities,ការ​ទទួល​ខុស​ត្រូវ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +457,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,ចំណាំ​: ការ​ទូទាត់​នឹង​មិន​ចូល​ត្រូវ​បាន​បង្កើត​តាំង​ពី​សាច់ប្រាក់​ឬ​គណនី​ធនាគារ &#39;មិន​ត្រូវ​បាន​បញ្ជាក់
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +171,Responsibilities,ការ​ទទួល​ខុស​ត្រូវ
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,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,សូម​បញ្ចូល​យ៉ាងហោចណាស់ 1 វិ​ក័​យ​ប័ត្រ​ក្នុង​តារាង
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +511,Add Users,បន្ថែម​អ្នក​ប្រើ
+apps/erpnext/erpnext/public/js/setup_wizard.js +255,Add Users,បន្ថែម​អ្នក​ប្រើ
 DocType: Pricing Rule,Item Group,ធាតុ​គ្រុប
 DocType: Task,Actual Start Date (via Time Logs),ជាក់​ស្តែ​កាលបរិច្ឆេទ​ចាប់​ផ្តើ​ម (តាមរយៈ​ម៉ោង​កំណត់ហេតុ​)
 DocType: Stock Reconciliation Item,Before reconciliation,មុន​ពេល​ការ​ផ្សះផ្សា​ជាតិ
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),ពន្ធ​និង​ការ​ចោទ​ប្រកាន់​បន្ថែម (ក្រុមហ៊ុន​រូបិយវត្ថុ​)
 DocType: Sales Order,Partly Billed,ផ្សព្វ​ផ្សាយ​មួយ​ផ្នែក
 DocType: Item,Default BOM,Bom លំនាំ​ដើម
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +79,Decambering,Decambering
 apps/erpnext/erpnext/setup/doctype/company/company.js +22,Please re-type company name to confirm,សូម​ប្រភេទ​ឈ្មោះ​របស់​ក្រុមហ៊ុន​ដើម្បី​បញ្ជាក់
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,សរុប​ឆ្នើម AMT
 DocType: Time Log Batch,Total Hours,ម៉ោង​សរុប
 DocType: Journal Entry,Printing Settings,ការ​កំណត់​បោះពុម្ព
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +11,Automotive,រថ​យ​ន្ដ
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +37,Item is required,ធាតុ​ត្រូវ​បាន​ទាមទារ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +25,Metal injection molding,ចាក់​ថ្នាំ​ធ្វើ​ពី​ដែក​ផ្សិត
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,រថ​យ​ន្ដ
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +684,From Delivery Note,ពី​ការ​ដឹកជញ្ជូន​ចំណាំ
 DocType: Time Log,From Time,ចាប់​ពី​ពេល​វេលា
 DocType: Notification Control,Custom Message,សារ​ផ្ទាល់ខ្លួន
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +33,Investment Banking,ធនាគារ​វិនិយោគ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +261,"Select your Country, Time Zone and Currency","ជ្រើស​ប្រទេស​, ម៉ោង​ក្នុង​តំបន់​និង​រូបិយវត្ថុ​របស់​អ្នក"
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,ធនាគារ​វិនិយោគ
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +316,"Select your Country, Time Zone and Currency","ជ្រើស​ប្រទេស​, ម៉ោង​ក្នុង​តំបន់​និង​រូបិយវត្ថុ​របស់​អ្នក"
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +369,Cash or Bank Account is mandatory for making payment entry,គណនី​សាច់ប្រាក់​ឬ​ធនាគារ​ជា​ការ​ចាំបាច់​សម្រាប់​ការ​ធ្វើ​ឱ្យ​ធាតុ​ដែល​បាន​ទូទាត់​ប្រាក់
 DocType: Purchase Invoice,Price List Exchange Rate,តារាងតម្លៃ​អត្រា​ប្តូ​រ​ប្រាក់
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +91,Pickling,pickling
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +18,Sand casting,ការ​សម្ដែង​ការ​បូម​ខ្សាច់
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +117,Electroplating,Electroplating
 DocType: Purchase Invoice Item,Rate,អត្រា​ការ​ប្រាក់
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +62,Intern,ហាត់​ការ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Intern,ហាត់​ការ
 DocType: Newsletter,A Lead with this email id should exist,អ្នក​ដឹក​នាំ​ដែល​មាន​លេខ​សម្គាល់​អ៊ីមែល​នេះ​គួរ​តែ​មាន
 DocType: Stock Entry,From BOM,ចាប់​ពី Bom
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +34,Basic,ជា​មូលដ្ឋាន
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +34,Basic,ជា​មូលដ្ឋាន
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +217,Please click on 'Generate Schedule',សូម​ចុច​លើ &#39;បង្កើត​កាលវិភាគ &quot;
 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 +110,"e.g. Kg, Unit, Nos, m","ឧ​គីឡូក្រាម​, អង្គភាព​, NOS លោក​ម៉ែត្រ"
@@ -2433,7 +2323,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +108,Date of Joining must be greater than Date of Birth,កាលបរិច្ឆេទ​នៃ​ការ​ចូលរួម​ត្រូវ​តែ​ធំ​ជាង​ថ្ងៃខែ​ឆ្នាំ​កំណើត
 DocType: Salary Structure,Salary Structure,រចនាសម្ព័ន្ធ​ប្រាក់​បៀវត្ស
 DocType: Account,Bank,ធនាគារ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +9,Airline,ក្រុមហ៊ុន​អាកាស​ចរ​ណ៍
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,ក្រុមហ៊ុន​អាកាស​ចរ​ណ៍
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +493,Issue Material,សម្ភារៈ​បញ្ហា
 DocType: Material Request Item,For Warehouse,សម្រាប់​ឃ្លាំង
 DocType: Employee,Offer Date,ការ​ផ្តល់​ជូន​កាលបរិច្ឆេទ
@@ -2443,28 +2333,23 @@
 DocType: Item,Is Fixed Asset Item,តើ​មាន​ធាតុ​ទ្រព្យសកម្ម​ថេរ
 DocType: Stock Entry,Including items for sub assemblies,អនុ​ដែល​រួម​មាន​ធាតុ​សម្រាប់​សភា
 DocType: Features Setup,"If you have long print formats, this feature can be used to split the page to be printed on multiple pages with all headers and footers on each page",ប្រសិនបើ​អ្នក​មាន​ទ្រង់ទ្រាយ​បោះពុម្ព​ជា​យូរ​មក​ហើយ​ដោយ​លក្ខណៈ​ពិសេស​នេះ​អាច​ត្រូវ​បាន​ប្រើ​ដើម្បី​បំបែក​ទំព័រ​ដែល​ត្រូវ​បោះពុម្ព​លើ​ទំព័រ​ច្រើន​ដែល​មាន​បឋមកថា​និង​បាតកថា​នៅ​លើ​ទំព័រ​ទាំង​អស់​គ្នា
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +131,Hobbing,Hobbing
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +98,All Territories,ទឹកដី​ទាំងអស់
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +98,All Territories,ទឹកដី​ទាំងអស់
 DocType: Purchase Invoice,Items,ធាតុ
 DocType: Fiscal Year,Year Name,ឈ្មោះ​ចូល​ឆ្នាំ
 DocType: Process Payroll,Process Payroll,បើក​ប្រាក់​បៀវត្ស​ដំណើរ​ការ
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +59,There are more holidays than working days this month.,មាន​ថ្ងៃ​ឈប់​សម្រាក​ច្រើន​ជាង​ថ្ងៃ​ធ្វើការ​ខែ​នេះ​។
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +68,There are more holidays than working days this month.,មាន​ថ្ងៃ​ឈប់​សម្រាក​ច្រើន​ជាង​ថ្ងៃ​ធ្វើការ​ខែ​នេះ​។
 DocType: Product Bundle Item,Product Bundle Item,ផលិតផល​ធាតុ​កញ្ចប់
 DocType: Sales Partner,Sales Partner Name,ឈ្មោះ​ដៃគូ​ការ​លក់
 DocType: Purchase Invoice Item,Image View,មើល​រូបភាព
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +113,Finishing & industrial finishing,បញ្ចប់​និង​បញ្ចប់​កម្ម​ឧស្សាហកម្ម
 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/page/setup_wizard/fixtures/industry_type.py +46,Securities & Commodity Exchanges,ផ្លាស់​ប្តូ​រ​ទំនិញ​និង​មូលបត្រ
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,ផ្លាស់​ប្តូ​រ​ទំនិញ​និង​មូលបត្រ
 DocType: Shipping Rule,Calculate Based On,គណនា​មូលដ្ឋាន​នៅ​លើ
 DocType: Delivery Note Item,From Warehouse,ចាប់​ពី​ឃ្លាំង
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +98,Drilling,ការ​ខួង
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +28,Blow molding,ផ្សិត​ខក​ចិត្ត
 DocType: Purchase Taxes and Charges,Valuation and Total,ការ​វាយ​តម្លៃ​និង​សរុប
 DocType: Tax Rule,Shipping City,ការ​ដឹក​ជញ្ជូន​ក្នុង​ទីក្រុង
 DocType: Account,Purchase User,អ្នកប្រើប្រាស់​ទិញ
 DocType: Notification Control,Customize the Notification,ប្ដូរ​តាម​សេចក្តី​ជូនដំណឹង​នេះ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +87,Hammering,ញញួរ
 DocType: Web Page,Slideshow,ការ​បញ្ចាំង​ស្លាយ
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +24,Default Address Template cannot be deleted,អាសយដ្ឋាន​លំនាំ​ដើម​ទំព័រ​គំរូ​មិន​អាច​ត្រូវ​បាន​លុប
 DocType: Sales Invoice,Shipping Rule,វិធាន​ការ​ដឹក​ជញ្ជូន
@@ -2473,9 +2358,8 @@
 DocType: Workflow State,Search,ស្វែងរក
 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,&quot;ថ្ងៃ​ចាប់​ពី​លំដាប់​ចុងក្រោយ &#39;ត្រូវ​តែ​ធំ​ជាង​ឬ​ស្មើ​សូន្យ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +142,Brazing,Brazing
 DocType: C-Form,Amended From,ធ្វើ​វិសោធនកម្ម​ពី
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Raw Material,វត្ថុ​ធាតុ​ដើម
+apps/erpnext/erpnext/public/js/setup_wizard.js +359,Raw Material,វត្ថុ​ធាតុ​ដើម
 DocType: Leave Application,Follow via Email,សូម​អនុវត្ត​តាម​រយៈ​អ៊ី​ម៉ែ​ល
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,ចំនួន​ប្រាក់​ពន្ធ​បន្ទាប់​ពី​ចំនួន​ទឹកប្រាក់​ដែល​បញ្ចុះតម្លៃ
 apps/erpnext/erpnext/accounts/doctype/account/account.py +174,Child account exists for this account. You can not delete this account.,គណនី​កុមារ​ដែល​មាន​សម្រាប់​គណនី​នេះ​។ អ្នក​មិន​អាច​លុប​គណនី​នេះ​។
@@ -2488,10 +2372,10 @@
 ,Produced,រថយន្ត​នេះ​ផលិត
 DocType: Item,Item Code for Suppliers,ក្រម​ធាតុ​សម្រាប់​អ្នកផ្គត់ផ្គង់
 DocType: Issue,Raised By (Email),បាន​លើក​ឡើង​ដោយ (អ៊ី​ម៉ែ​ល​)
-apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +72,General,ទូទៅ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +495,Attach Letterhead,ភ្ជាប់​ក្បាល​លិខិត
+apps/erpnext/erpnext/setup/setup_wizard/default_website.py +72,General,ទូទៅ
+apps/erpnext/erpnext/public/js/setup_wizard.js +241,Attach Letterhead,ភ្ជាប់​ក្បាល​លិខិត
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +272,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',មិន​អាច​ធ្វើ​ការ​កាត់​កង​នៅ​ពេល​ដែល​ប្រភេទ​គឺ​សម្រាប់ &#39;វាយតម្លៃ​&#39; ឬ &#39;វាយតម្លៃ​និង​សរុប
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +542,"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/public/js/setup_wizard.js +284,"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.",រាយ​បញ្ជី​ក​​្បាល​ពន្ធ​របស់​អ្នក (ឧទាហរណ៍​អាករ​លើ​តម្លៃ​បន្ថែម​ពន្ធ​គយ​ល​ពួក​គេ​គួរ​តែ​មាន​ឈ្មោះ​តែ​មួយ​គត់​) និង​អត្រា​ការ​ស្ដ​ង់​ដា​រ​របស់​ខ្លួន​។ ការ​នេះ​នឹង​បង្កើត​គំរូ​ស្តង់​ដា​ដែល​អ្នក​អាច​កែ​សម្រួល​និង​បន្ថែម​ច្រើន​ទៀត​នៅ​ពេល​ក្រោយ​។
 DocType: Journal Entry,Bank Entry,ចូល​ធនាគារ
 DocType: Authorization Rule,Applicable To (Designation),ដែល​អាច​អនុវត្ត​ទៅ (រចនា​)
 DocType: Blog Post,Blog Post,ភ្នំពេញ​ប៉ុស្តិ៍​កំណត់​ហេតុ​បណ្ដាញ
@@ -2499,25 +2383,23 @@
 apps/erpnext/erpnext/config/accounts.py +143,Enable / disable currencies.,អនុញ្ញាត / មិន​អនុញ្ញាត​ឱ្យ​រូបិយ​ប័ណ្ណ​។
 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​)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +26,Entertainment & Leisure,"ការ​កំសាន្ត​, ការ​លំហែ"
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,"ការ​កំសាន្ត​, ការ​លំហែ"
 DocType: Purchase Order,The date on which recurring order will be stop,ថ្ងៃ​ដែល​នឹង​ត្រូវ​កើតឡើង​តាម​លំដាប់​បញ្ឈប់​ការ
 DocType: Quality Inspection,Item Serial No,គ្មាន​សៀរៀល​ធាតុ
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Present,បច្ចុប្បន្ន​សរុប
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Hour,ហួរ
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +488,Transfer Material to Supplier,ផ្ទេរ​សម្ភារៈ​ដើម្បី​ផ្គត់​ផ្គង់
+apps/erpnext/erpnext/public/js/setup_wizard.js +363,Hour,ហួរ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +513,Transfer Material to Supplier,ផ្ទេរ​សម្ភារៈ​ដើម្បី​ផ្គត់​ផ្គង់
 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/crm/doctype/opportunity/opportunity.js +82,Create Quotation,បង្កើត​សម្រង់
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +306,All these items have already been invoiced,ធាតុ​ទាំងអស់​នេះ​ត្រូវ​បាន​គេ invoiced រួច​ទៅ​ហើយ
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,You are not authorized to approve leaves on Block Dates,អ្នក​មិន​ត្រូវ​បាន​អនុញ្ញាត​ឱ្យ​អនុម័ត​ស្លឹក​នៅ​លើ​កាលបរិច្ឆេទ​ប្លុក
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +311,All these items have already been invoiced,ធាតុ​ទាំងអស់​នេះ​ត្រូវ​បាន​គេ invoiced រួច​ទៅ​ហើយ
 DocType: Shipping Rule,Shipping Rule Conditions,ការ​ដឹក​ជញ្ជូន​វិធាន​លក្ខខណ្ឌ
 DocType: BOM Replace Tool,The new BOM after replacement,នេះ​បន្ទាប់ពី​ការ​ជំនួស Bom
 DocType: Features Setup,Point of Sale,ចំណុច​នៃ​ការ​លក់
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +83,Curling,ចម្ងាយ
 DocType: Account,Tax,ការ​បង់​ពន្ធ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +89,Refining,រោងចក្រ​ចម្រាញ់​ប្រេង
 DocType: Production Planning Tool,Production Planning Tool,ឧបករណ៍​ផែនការ​ផលិតកម្ម
 DocType: Quality Inspection,Report Date,របាយការណ៍​ស្តី​ពី​កាលបរិច្ឆេទ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +130,Routing,បញ្ជូន
 DocType: C-Form,Invoices,វិ​ក័​យ​ប័ត្រ
 DocType: Job Opening,Job Title,ចំណងជើង​ការងារ
 DocType: Features Setup,Item Groups in Details,ក្រុម​ធាតុ​នៅ​ក្នុង​ព​ត៌​មាន​លំអិត
@@ -2535,13 +2417,12 @@
 DocType: DocType,Setup,ការ​ដំឡើង
 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,សង្ខេប​សម្រាប់​ខែ​នេះ​និង​សកម្មភាព​ដែល​មិន​ទាន់​សម្រេច
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +39,Cold rolling,រំកិល​ម​ត្រជាក់
 DocType: Customer Group,Customer Group Name,ឈ្មោះ​ក្រុម​អតិថិជន
 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,គុណលក្ខណៈ
 DocType: Packing Slip,Get Items,ទទួល​បាន​ធាតុ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +186,Please enter Write Off Account,សូម​បញ្ចូល​បិទ​សរសេរ​គណនី
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +187,Please enter Write Off Account,សូម​បញ្ចូល​បិទ​សរសេរ​គណនី
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +71,Last Order Date,លំដាប់​ចុង​ក្រោយ​កាលបរិច្ឆេទ
 DocType: DocField,Image,រូបភាព
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +179,Make Excise Invoice,ធ្វើ​ឱ្យ​រដ្ឋាករ​វិ​ក័​យ​ប័ត្រ
@@ -2550,7 +2431,7 @@
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +146,Operation ID not set,លេខ​សម្គាល់​ការ​ប្រតិ​ប​ត្ដិ​ការ​មិន​បាន​កំណត់
 DocType: Production Order,Planned Start Date,ដែល​បាន​គ្រោង​ទុក​កាល​បរិច្ឆេទ​ចាប់​ផ្តើ​ម
 DocType: Serial No,Creation Document Type,ការ​បង្កើត​ប្រភេទ​ឯកសារ
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +620,Maint. Visit,Maint ។ ដំណើរ​ទស្សនកិច្ច
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +631,Maint. Visit,Maint ។ ដំណើរ​ទស្សនកិច្ច
 DocType: Leave Type,Is Encash,តើ​ការ Encash
 DocType: Purchase Invoice,Mobile No,គ្មាន​ទូរស័ព្ទ​ដៃ
 DocType: Payment Tool,Make Journal Entry,ធ្វើ​ឱ្យ​ធាតុ​ទិនានុប្បវត្តិ
@@ -2558,31 +2439,27 @@
 apps/erpnext/erpnext/controllers/trends.py +257,Project-wise data is not available for Quotation,ទិន្នន័យ​គម្រោង​ប្រាជ្ញា​គឺ​មិន​អាច​ប្រើ​បាន​សម្រាប់​សម្រង់
 DocType: Project,Expected End Date,គេ​រំពឹង​ថា​នឹង​កាលបរិច្ឆេទ​បញ្ចប់
 DocType: Appraisal Template,Appraisal Template Title,ការវាយតម្លៃ​ទំព័រ​គំរូ​ចំណងជើង
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +440,Commercial,ពាណិជ្ជ
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +378,Commercial,ពាណិជ្ជ
 DocType: Cost Center,Distribution Id,លេខ​សម្គាល់​ការ​ចែកចាយ
-apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +14,Awesome Services,សេវា​សេវា​ល្អ​មែន​ទែន
+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,ក្រុមហ៊ុន​ផ្គត់ផ្គង់​អាសយដ្ឋាន
 DocType: Contact Us Settings,Address Line 2,អាសយដ្ឋាន​បន្ទាត់​ទី 2
 DocType: ToDo,Reference,ឯកសារ​យោង
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +59,Perforating,Perforating
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,ចេញ Qty
 apps/erpnext/erpnext/config/accounts.py +128,Rules to calculate shipping amount for a sale,វិធាន​ដើម្បី​គណនា​ចំនួន​ដឹក​ជញ្ជូន​សម្រាប់​លក់
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +29,Series is mandatory,កម្រង​ឯកសារ​ចាំបាច់
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +28,Financial Services,សេវា​ហិរញ្ញវត្ថុ
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,សេវា​ហិរញ្ញវត្ថុ
 DocType: Tax Rule,Sales,ការ​លក់
 DocType: Stock Entry Detail,Basic Amount,ចំនួន​ទឹកប្រាក់​ជា​មូលដ្ឋាន
 DocType: Leave Allocation,Unused leaves,ស្លឹក​មិន​ប្រើ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,CR
 DocType: Customer,Default Receivable Accounts,លំនាំ​ដើម​គណនី​អ្នក​ទទួល
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +102,Sawing,sawing
 DocType: Tax Rule,Billing State,រដ្ឋ​វិ​ក័​យ​ប័ត្រ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +32,Laminating,laminate
 DocType: Item Reorder,Transfer,សេវា​ផ្ទេរ​ប្រាក់
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +549,Fetch exploded BOM (including sub-assemblies),យក Bom ផ្ទុះ (រួម​បញ្ចូល​ទាំង​សភា​អនុ​)
 DocType: Authorization Rule,Applicable To (Employee),ដែល​អាច​អនុវត្ត​ទៅ (បុគ្គលិក​)
 apps/erpnext/erpnext/controllers/accounts_controller.py +101,Due Date is mandatory,កាលបរិច្ឆេទ​ដល់​កំណត់​គឺ​ជា​ចាំបាច់
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +143,Sintering,Sintering
 DocType: Journal Entry,Pay To / Recd From,ចំណាយ​ប្រាក់​ដើម្បី / Recd ពី
 DocType: Naming Series,Setup Series,ការ​រៀបចំ​ស៊េរី
 DocType: Supplier,Contact HTML,ការ​ទំនាក់​ទំនង​របស់ HTML
@@ -2593,7 +2470,6 @@
 DocType: Company,Retail,ការ​លក់​រាយ
 DocType: Attendance,Absent,អវត្តមាន
 DocType: Product Bundle,Product Bundle,កញ្ចប់​ផលិតផល
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +165,Crushing,កម្ទេច
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,ទិញ​ពន្ធ​និង​ការ​ចោទ​ប្រកាន់​ពី​ទំព័រ​គំរូ
 DocType: Upload Attendance,Download Template,ទំព័រ​គំរូ​ទាញ​យក
 DocType: GL Entry,Remarks,សុន្ទរកថា
@@ -2601,13 +2477,11 @@
 DocType: Journal Entry,Write Off Based On,បិទ​ការ​សរសេរ​មូលដ្ឋាន​នៅ​លើ
 DocType: Features Setup,POS View,ម៉ាស៊ីន​ឆូត​កាត​មើល
 apps/erpnext/erpnext/config/stock.py +38,Installation record for a Serial No.,កំណត់​ត្រា​អំពី​ការ​ដំឡើង​សម្រាប់​លេខ​ស៊េរី
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +9,Continuous casting,ការ​សម្ដែង​ជា​បន្ត
 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/setup/page/setup_wizard/fixtures/operations.py +80,Cold sizing,ទំហំ​ម​ត្រជាក់
 DocType: Salary Slip,Earning & Deduction,ការ​រក​ប្រាក់​ចំណូល​និង​ការ​កាត់​បន​ថយ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +259,Region,តំបន់
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +314,Region,តំបន់
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +213,Optional. This setting will be used to filter in various transactions.,ស្រេច​ចិត្ត​។ ការ​កំណត់​នេះ​នឹង​ត្រូវ​បាន​ប្រើ​ដើម្បី​ត្រង​នៅ​ក្នុង​ប្រតិបត្តិការ​នានា​។
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +104,Negative Valuation Rate is not allowed,អត្រា​វាយតម្លៃ​អវិជ្ជមាន​មិន​ត្រូវ​បាន​អនុញ្ញាត
 DocType: Holiday List,Weekly Off,បិទ​ប្រចាំ​ស​ប្តា​ហ៍
@@ -2622,7 +2496,7 @@
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +16,No record found,បាន​រក​ឃើញ​ថា​គ្មាន​កំណត់ត្រា
 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,ការ​ចូល​រួម​ពី​កាលបរិច្ឆេទ​និង​ចូលរួម​កាលបរិច្ឆេទ​គឺ​ជា​ចាំបាច់
-apps/erpnext/erpnext/controllers/buying_controller.py +131,Please enter 'Is Subcontracted' as Yes or No,សូម​បញ្ចូល &lt;តើ​កិច្ចសន្យា​ប​ន្ដ &#39;ជា​បាទ​ឬ​ទេ
+apps/erpnext/erpnext/controllers/buying_controller.py +122,Please enter 'Is Subcontracted' as Yes or No,សូម​បញ្ចូល &lt;តើ​កិច្ចសន្យា​ប​ន្ដ &#39;ជា​បាទ​ឬ​ទេ
 DocType: Sales Team,Contact No.,លេខ​ទំនាក់​ទំនង​ទៅ
 DocType: Workflow State,Time,ម៉ោង
 DocType: Features Setup,Sales Discounts,ការ​បញ្ចុះតម្លៃ​ការ​លក់
@@ -2630,22 +2504,19 @@
 DocType: Authorization Rule,Authorization Rule,វិធាន​សេចក្តី​អនុញ្ញាត
 DocType: Sales Invoice,Terms and Conditions Details,លក្ខខណ្ឌ​ព​ត៌​មាន​លំអិត
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,ពន្ធ​លក់​និង​ការ​ចោទ​ប្រកាន់​ពី​ទំព័រ​គំរូ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +10,Apparel & Accessories,ស​ម្លៀ​ក​បំពាក់​និង​គ្រឿងបន្លាស់
+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,ចំនួន​នៃ​លំដាប់
 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 +121,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/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +47,Conversion Factor is required,កត្តា​ការ​ប្រែចិត្ត​ជឿ​ត្រូវ​បាន​ទាមទារ
 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,គុណ​តម្លៃ / ការ​ពិពណ៌នា​សង្ខេប
 DocType: Tax Rule,Billing Country,វិ​ក័​យ​ប័ត្រ​ប្រទេស
 ,Customers Not Buying Since Long Time,អតិថិជន​មិន​ទិញ​តាំង​ពី​លោក​ឡុ​ង​ពេល
 DocType: Production Order,Expected Delivery Date,គេ​រំពឹង​ថា​ការ​ដឹកជញ្ជូន​កាលបរិច្ឆេទ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +48,Bulging,bulging
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +11,Evaporative-pattern casting,ហួត​លំនាំ​សម្ដែង
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Entertainment Expenses,ចំណាយ​កំសាន្ត
 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,ចំនួន​វិ​ក័​យ​ប័ត្រ
@@ -2666,20 +2537,18 @@
 DocType: Bank Reconciliation Detail,Cheque Date,កាលបរិច្ឆេទ​មូលប្បទានប័ត្រ
 apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted all transactions related to this company!,ទទួល​បាន​ជោគជ័យ​ក្នុង​ការ​តិ​ប​ត្តិ​ការ​ទាំង​អស់​ដែល​បាន​លុប​ដែល​ទាក់ទង​ទៅ​នឹង​ក្រុម​ហ៊ុន​នេះ​!
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,ដូច​​​ជា​នៅ​លើ​កាលបរិច្ឆេទ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +111,Honing,Honing ដោយ
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +58,Probation,ការសាកល្បង
-apps/erpnext/erpnext/stock/doctype/item/item.py +264,Default Warehouse is mandatory for stock Item.,ឃ្លាំង​លំនាំ​ដើម​គឺ​ចាំបាច់​សម្រាប់​ធាតុ​ភាគហ៊ុន​។
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Probation,ការសាកល្បង
+apps/erpnext/erpnext/stock/doctype/item/item.py +268,Default Warehouse is mandatory for stock Item.,ឃ្លាំង​លំនាំ​ដើម​គឺ​ចាំបាច់​សម្រាប់​ធាតុ​ភាគហ៊ុន​។
 DocType: Feed,Full Name,ឈ្មោះ​ពេញ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +148,Clinching,ឈ្នះ
 DocType: Stock Settings,Auto insert Price List rate if missing,បញ្ចូល​ដោយ​ស្វ័យ​ប្រវត្តិ​ប្រសិន​បើ​អ្នក​មាន​អត្រា​តារាងតម្លៃ​បាត់​ខ្លួន
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,ចំនួន​ទឹកប្រាក់​ដែល​បង់​សរុប
 ,Transferred Qty,ផ្ទេរ Qty
 apps/erpnext/erpnext/config/learn.py +11,Navigating,ការ​រុករក
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +137,Planning,ការ​ធ្វើ​ផែនការ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +137,Planning,ការ​ធ្វើ​ផែនការ
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +9,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),ចំនួន​វិ​ក័​យ​ប័ត្រ​សរុប (តាម​រយៈ​ការ​ពេល​វេលា​កំណត់​ហេតុ​)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +629,We sell this Item,យើង​លក់​ធាតុ​នេះ
+apps/erpnext/erpnext/public/js/setup_wizard.js +365,We sell this Item,យើង​លក់​ធាតុ​នេះ
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +65,Supplier Id,លេខ​សម្គាល់​អ្នក​ផ្គត់ផ្គង់
 DocType: Journal Entry,Cash Entry,ចូល​ជា​សាច់ប្រាក់
 DocType: Sales Partner,Contact Desc,ការ​ទំនាក់ទំនង DESC
@@ -2688,16 +2557,14 @@
 DocType: Brand,Item Manager,កម្មវិធី​គ្រប់គ្រង​ធាតុ
 DocType: Cost Center,Add rows to set annual budgets on Accounts.,បន្ថែម​ជួរ​ដេក​ដើម្បី​កំណត់​ថវិកា​ប្រចាំ​ឆ្នាំ​នៅ​លើ​គណនី​។
 DocType: Buying Settings,Default Supplier Type,ប្រភេទ​ហាងទំនិញ​លំនាំ​ដើម
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +160,Quarrying,កន្លែង​យក​ថ្ម
 DocType: Production Order,Total Operating Cost,ថ្លៃ​ប្រតិបត្តិការ
 apps/erpnext/erpnext/config/crm.py +27,All Contacts.,ទំនាក់ទំនង​ទាំងអស់​។
 DocType: Newsletter,Test Email Id,ការ​ធ្វើ​តេ​ស្ត​អ៊ី​ម៉ែ​ល​លេខ​សម្គាល់
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +394,Company Abbreviation,អក្សរកាត់​របស់​ក្រុមហ៊ុន
+apps/erpnext/erpnext/public/js/setup_wizard.js +142,Company Abbreviation,អក្សរកាត់​របស់​ក្រុមហ៊ុន
 DocType: Features Setup,If you follow Quality Inspection. Enables Item QA Required and QA No in Purchase Receipt,បើ​សិន​ជា​អ្នក​ធ្វើ​តាម​ការ​ត្រួត​ពិនិត្យ​គុណភាព​។ អនុញ្ញាត​ឱ្យ​មាន​ធាតុ QA បាន​ទាមទារ​និង​បង្កាន់ដៃ QA គ្មាន​ក្នុង​ការ​ទិញ
 DocType: GL Entry,Party Type,ប្រភេទ​គណបក្ស
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +68,Raw material cannot be same as main Item,វត្ថុ​ធាតុ​ដើម​មិន​អាច​ជា​ដូច​គ្នា​ដូច​ដែល​ធាតុ​ដ៏​សំខាន់
 DocType: Item Attribute Value,Abbreviation,អក្សរកាត់
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +30,Rotational molding,ការអប់រំ​ការ​បង្វិល
 apps/erpnext/erpnext/config/hr.py +115,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,កំណត់​ច្បាប់​ពន្ធ​សម្រាប់​រទេះ​ដើរ​ទិញ​ឥវ៉ាន់
@@ -2711,13 +2578,13 @@
 apps/erpnext/erpnext/config/selling.py +18,Quotes to Leads or Customers.,ដកស្រង់​ដើម្បី​ដឹកនាំ​ឬ​អតិថិជន​។
 DocType: Stock Settings,Role Allowed to edit frozen stock,តួនាទី​ដែល​ត្រូវ​បាន​អនុញ្ញាត​ឱ្យ​កែ​សម្រួល​ភាគ​ហ៊ុន​ទឹកកក
 ,Territory Target Variance Item Group-Wise,ទឹកដី​របស់​ធាតុ​គោលដៅ​អថេរ Group និង​ក្រុមហ៊ុន​ដែល​មាន​ប្រាជ្ញា
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +101,All Customer Groups,ក្រុម​អតិថិជន​ទាំងអស់
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +101,All Customer Groups,ក្រុម​អតិថិជន​ទាំងអស់
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +37,Tax Template is mandatory.,ទំព័រ​គំរូ​ពន្ធ​លើ​គឺ​ជា​ចាំបាច់​។
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),បញ្ជី​តម្លៃ​ដែល​អត្រា (ក្រុមហ៊ុន​រូបិយវត្ថុ​)
 DocType: Account,Temporary,ជា​ប​ណ្តោះ​អាសន្ន
 DocType: Address,Preferred Billing Address,វិ​ក័​យ​ប័ត្រ​អាសយដ្ឋាន​ដែល​ពេញ​ចិត្ត
 DocType: Monthly Distribution Percentage,Percentage Allocation,ការ​បម្រុង​ទុក​ជា​ភាគរយ
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +86,Secretary,លេខា​ធិ​ការ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Secretary,លេខា​ធិ​ការ
 DocType: Serial No,Distinct unit of an Item,អង្គភាព​ផ្សេងគ្នា​នៃ​ធាតុ
 DocType: Pricing Rule,Buying,ការ​ទិញ
 DocType: HR Settings,Employee Records to be created by,កំណត់ត្រា​បុគ្គលិក​ដែល​នឹង​ត្រូវ​បាន​បង្កើត​ឡើង​ដោយ
@@ -2729,7 +2596,6 @@
 ,Item-wise Price List Rate,អត្រា​តារាងតម្លៃ​ធាតុ​ប្រាជ្ញា
 DocType: Purchase Order Item,Supplier Quotation,សម្រង់​ក្រុមហ៊ុន​ផ្គត់ផ្គង់
 DocType: Quotation,In Words will be visible once you save the Quotation.,នៅ​ក្នុង​ពាក្យ​នោះ​នឹង​ត្រូវ​បាន​មើល​ឃើញ​នៅ​ពេល​ដែល​អ្នក​រក្សា​ទុក​ការ​សម្រង់​នេះ​។
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +68,Ironing,ជាតិ​ដែក
 DocType: Lead,Add to calendar on this date,បញ្ចូល​ទៅ​ក្នុង​ប្រតិទិន​ស្តី​ពី​កាលបរិច្ឆេទ​នេះ
 apps/erpnext/erpnext/config/selling.py +132,Rules for adding shipping costs.,ក្បួន​សម្រាប់​ការ​បន្ថែម​ការ​ចំណាយ​លើ​ការ​ដឹក​ជញ្ជូន​។
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,ព្រឹត្តិការណ៍​ជិត​មក​ដល់
@@ -2737,23 +2603,21 @@
 DocType: Letter Head,Letter Head,លិខិត​នាយក
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +27,Quick Entry,ធាតុ​រហ័ស
 DocType: Purchase Order,To Receive,ដើម្បី​ទទួល​បាន
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +33,Shrink fitting,បង្រួញ​ការ​សម
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +522,user@example.com,user@example.com
+apps/erpnext/erpnext/public/js/setup_wizard.js +266,user@example.com,user@example.com
 DocType: Email Digest,Income / Expense,ប្រាក់​ចំណូល / ចំណាយ
 DocType: Employee,Personal Email,អ៊ី​ម៉ែ​ល​ផ្ទាល់ខ្លួន
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +58,Total Variance,អថេរ​ចំនួន​សរុប
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +62,Total Variance,អថេរ​ចំនួន​សរុប
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.",បើ​អនុញ្ញាត​ប្រព័ន្ធ​នេះ​នឹង​ផ្តល់​ការ​បញ្ចូល​គណនី​សម្រាប់​ការ​ដោយ​ស្វ័យ​ប្រវត្តិ​។
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +15,Brokerage,ឈ្មួញ​ក​ណ្តា​ល
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +15,Brokerage,ឈ្មួញ​ក​ណ្តា​ល
 DocType: Address,Postal Code,លេខ​កូដ​ប្រៃ​ស​ណី​យ
 DocType: Production Order Operation,"in Minutes
 Updated via 'Time Log'",បាន​បន្ទាន់​សម័យ​តាម​រយៈ​ការ​នៅ​នាទី &quot;ពេល​វេលា​កំណត់​ហេតុ &#39;
 DocType: Customer,From Lead,បាន​មក​ពី​អ្នក​ដឹក​នាំ
 apps/erpnext/erpnext/config/manufacturing.py +19,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 +442,POS Profile required to make POS Entry,ម៉ាស៊ីន​ឆូត​កាត​ព​ត៌​មាន​ផ្ទាល់ខ្លួន​ត្រូវ​បាន​ទាមទារ​ដើម្បី​ធ្វើ​ឱ្យ​ធាតុ​របស់​ម៉ាស៊ីន​ឆូត​កាត
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +444,POS Profile required to make POS Entry,ម៉ាស៊ីន​ឆូត​កាត​ព​ត៌​មាន​ផ្ទាល់ខ្លួន​ត្រូវ​បាន​ទាមទារ​ដើម្បី​ធ្វើ​ឱ្យ​ធាតុ​របស់​ម៉ាស៊ីន​ឆូត​កាត
 DocType: Hub Settings,Name Token,ឈ្មោះ​និមិត្ត​សញ្ញា
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +106,Planing,ផែនការ​ជនជាតិ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Selling,ស្តង់​ដា​លក់
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +120,Standard Selling,ស្តង់​ដា​លក់
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +137,Atleast one warehouse is mandatory,យ៉ាងហោចណាស់​មាន​ម្នាក់​ឃ្លាំង​គឺ​ជា​ចាំបាច់
 DocType: Serial No,Out of Warranty,ចេញ​ពី​ការធានា
 DocType: BOM Replace Tool,Replace,ជំនួស
@@ -2771,9 +2635,8 @@
 DocType: Contact Us Settings,Pincode,Pincode
 DocType: Item,Moving Average,ជា​មធ្យម​ការ​ផ្លាស់​ប្តូ​រ
 DocType: BOM Replace Tool,The BOM which will be replaced,Bom ដែល​នឹង​ត្រូវ​បាន​ជំនួស
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +43,New Stock UOM must be different from current stock UOM,ញូ​ហ៊ុន UOM ត្រូវ​តែ​មាន​ភាព​ខុស​គ្នា​ពី UOM សន្និធិ​បច្ចុប្បន្ន
 DocType: Account,Debit,ឥណពន្ធ
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +34,Leaves must be allocated in multiples of 0.5,"ស្លឹក​ត្រូវ​តែ​ត្រូវ​បាន​បម្រុង​ទុក​នៅ​ក្នុង 0,5 ច្រើន"
+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/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,ឆ្នើម AMT
@@ -2790,8 +2653,7 @@
 DocType: Employee,Internal Work History,ប្រវត្តិ​ការងារ​ផ្ទៃក្នុង
 DocType: DocField,Column Break,ការ​បំបែក​ជួរ​ឈរ
 DocType: Event,Thursday,ថ្ងៃ​ព្រហស្បតិ៍
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +42,Private Equity,សមធម៌​ឯកជន
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +93,Turning,ងាក
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,សមធម៌​ឯកជន
 DocType: Maintenance Visit,Customer Feedback,ការ​ឆ្លើយតប​របស់​អតិថិជន
 DocType: Account,Expense,ការ​ចំណាយ
 DocType: Sales Invoice,Exhibition,ការ​តាំង​ពិព័រណ៍
@@ -2803,16 +2665,16 @@
 DocType: Employee,Held On,ប្រារព្ធ​ឡើង​នៅ​ថ្ងៃទី
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +33,Production Item,ផលិតកម្ម​ធាតុ
 ,Employee Information,ព័ត៌មាន​បុគ្គលិក
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,Rate (%),អត្រា​ការ​ប្រាក់ (%​)
+apps/erpnext/erpnext/public/js/setup_wizard.js +294,Rate (%),អត្រា​ការ​ប្រាក់ (%​)
 DocType: Stock Entry Detail,Additional Cost,ការ​ចំណាយ​បន្ថែម​ទៀត
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +407,Financial Year End Date,កាលបរិច្ឆេទ​ឆ្នាំ​ហិរញ្ញវត្ថុ​បញ្ចប់
+apps/erpnext/erpnext/public/js/setup_wizard.js +155,Financial Year End Date,កាលបរិច្ឆេទ​ឆ្នាំ​ហិរញ្ញវត្ថុ​បញ្ចប់
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Voucher No, if grouped by Voucher",មិន​អាច​ត្រង​ដោយ​ផ្អែក​លើ​ប័ណ្ណ​គ្មាន​ប្រសិនបើ​ដាក់​ជា​ក្រុម​តាម​ប័ណ្ណ
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +484,Make Supplier Quotation,ធ្វើ​ឱ្យ​សម្រង់​ផ្គត់ផ្គង់
 DocType: Quality Inspection,Incoming,មក​ដល់
 DocType: BOM,Materials Required (Exploded),សំភារៈ​ទាមទារ (ផ្ទុះ​)
 DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),កាត់​បន្ថយ​រក​ស្នើសុំ​ការអនុញ្ញាត​ដោយ​គ្មាន​ការ​បង់ (LWP​)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +512,"Add users to your organization, other than yourself",បន្ថែម​អ្នក​ប្រើ​ប្រាស់​ក្នុង​អង្គការ​របស់​អ្នក​ក្រៅពី​ខ្លួន​អ្នក​ផ្ទ​​ាល់
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +44,Casual Leave,ចាកចេញ​ធម្មតា
+apps/erpnext/erpnext/public/js/setup_wizard.js +256,"Add users to your organization, other than yourself",បន្ថែម​អ្នក​ប្រើ​ប្រាស់​ក្នុង​អង្គការ​របស់​អ្នក​ក្រៅពី​ខ្លួន​អ្នក​ផ្ទ​​ាល់
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +44,Casual Leave,ចាកចេញ​ធម្មតា
 DocType: Batch,Batch ID,លេខ​សម្គាល់​បាច់
 ,Delivery Note Trends,និន្នាការ​ដឹកជញ្ជូន​ចំណាំ
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +104,This Week's Summary,ស​ប្តា​ហ៍​នេះ​មាន​សេចក្តី​សង្ខេប
@@ -2823,7 +2685,7 @@
 DocType: Purchase Receipt,Return Against Purchase Receipt,ការ​វិល​ត្រឡប់​ពី​ការ​ប្រឆាំង​នឹង​បង្កាន់ដៃ​ទិញ
 DocType: Purchase Order,To Bill,លោក Bill
 DocType: Material Request,% Ordered,% លំដាប់
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +61,Piecework,ម៉ៅការ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Piecework,ម៉ៅការ
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +64,Avg. Buying Rate,ជាមធ្យម​។ អត្រា​ទិញ
 DocType: Task,Actual Time (in Hours),ពេល​វេលា​ពិត​ប្រាកដ (នៅ​ក្នុង​ម៉ោង​ធ្វើការ​)
 DocType: Employee,History In Company,ប្រវត្តិ​សា​ស្រ្ត​នៅ​ក្នុង​ក្រុមហ៊ុន
@@ -2839,13 +2701,13 @@
 DocType: Opportunity,To Discuss,ដើម្បី​ពិភាក្សា
 DocType: SMS Settings,SMS Settings,កំណត់​ការ​ផ្ញើ​សារ​ជា​អក្សរ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +60,Temporary Accounts,គណនី​ប​ណ្តោះ​អាសន្ន
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +155,Black,ពណ៌​ខ្មៅ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Black,ពណ៌​ខ្មៅ
 DocType: BOM Explosion Item,BOM Explosion Item,ធាតុ​ផ្ទុះ Bom
 DocType: Account,Auditor,សវនករ
 DocType: Purchase Order,End date of current order's period,កាលបរិច្ឆេទ​បញ្ចប់​នៃ​រយៈ​ពេល​ការ​បញ្ជា​ទិញ​នា​ពេល​បច្ចុប្បន្ន​របស់
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +17,Make Offer Letter,ធ្វើ​ឱ្យ​ការ​ផ្តល់​ជូន​លិខិត
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +10,Return,ត្រឡប់​មក​វិញ
-apps/erpnext/erpnext/stock/doctype/item/item.py +503,Default Unit of Measure for Variant must be same as Template,ឯកតា​លំនាំដើម​នៃ​វិធានការ​សម្រាប់​វ៉ារ្យង់​ត្រូវតែ​មាន​ដូចគ្នា​ជា​ពុម្ព
+apps/erpnext/erpnext/stock/doctype/item/item.py +507,Default Unit of Measure for Variant must be same as Template,ឯកតា​លំនាំដើម​នៃ​វិធានការ​សម្រាប់​វ៉ារ្យង់​ត្រូវតែ​មាន​ដូចគ្នា​ជា​ពុម្ព
 DocType: DocField,Fold,បោះបង់ចោល
 DocType: Production Order Operation,Production Order Operation,ផលិតកម្ម​លំដាប់​ប្រតិបត្តិការ
 DocType: Pricing Rule,Disable,មិន​អនុញ្ញាត
@@ -2856,20 +2718,17 @@
 DocType: Page,Page Name,ឈ្មោះ​ទំព័រ
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +110,To Time must be greater than From Time,ទៅ​ពេល​ត្រូវ​តែ​ធំ​ជាង​ពី​ពេល​វេលា
 DocType: Journal Entry Account,Exchange Rate,អត្រា​ប្តូ​រ​ប្រាក់
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +124,Spindle finishing,បញ្ចប់ spindle
 DocType: BOM,Last Purchase Rate,អត្រា​ទិញ​ចុង​ក្រោយ
 DocType: Account,Asset,ទ្រព្យ​សកម្ម
 DocType: Project Task,Task ID,ភារកិច្ច​លេខ​សម្គាល់
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +395,"e.g. ""MC""",ឧ​ទា​ហរ​ណ៏ &quot;ពិធីករ​&quot;
+apps/erpnext/erpnext/public/js/setup_wizard.js +143,"e.g. ""MC""",ឧ​ទា​ហរ​ណ៏ &quot;ពិធីករ​&quot;
 ,Sales Person-wise Transaction Summary,ការ​លក់​បុគ្គល​ប្រាជ្ញា​សង្ខេប​ប្រតិបត្តិការ
 DocType: System Settings,Time Zone,តំបន់​ពេលវេលា
 apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,ចុះឈ្មោះ​សម្រាប់​ហាប់ ERPNext
 DocType: Monthly Distribution,Monthly Distribution Percentages,ចំនួន​ភាគរយ​ចែកចាយ​ប្រចាំខែ
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +16,The selected item cannot have Batch,ធាតុ​ដែល​បាន​ជ្រើស​មិន​អាច​មាន​ជំនាន់​ទី
 DocType: Delivery Note,% of materials delivered against this Delivery Note,ស​មា​្ភា​រៈ​បាន​បញ្ជូន​% នៃ​ការ​ប្រឆាំង​នឹង​ការ​ផ្តល់​ចំណាំ​នេះ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +151,Stapling,អាហារ​មាន​ជាតិ
 DocType: Customer,Customer Details,ព​ត៌​មាន​លំអិត​របស់​អតិថិជន
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +105,Shaping,រាង
 DocType: Employee,Reports to,របាយការណ៍​ទៅ
 DocType: SMS Settings,Enter url parameter for receiver nos,បញ្ចូល URL សម្រាប់​ការ​ទទួល​ប៉ារ៉ាម៉ែត្រ NOS
 DocType: Sales Invoice,Paid Amount,ចំនួន​ទឹកប្រាក់​ដែល​បង់
@@ -2877,12 +2736,12 @@
 DocType: Item Variant,Item Variant,ធាតុ​វ៉ារ្យង់
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +15,Setting this Address Template as default as there is no other default,ការ​កំណត់​អាសយដ្ឋាន​ទំព័រ​គំរូ​ជា​លំនាំ​ដើម​នេះ​ដូច​ជា​មិន​មាន​ការ​លំនាំ​ដើម​ផ្សេង​ទៀត
 apps/erpnext/erpnext/accounts/doctype/account/account.py +89,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","សមតុល្យ​គណនី​រួច​ហើយ​នៅ​ក្នុង​ឥណពន្ធ​, អ្នក​មិន​ត្រូវ​បាន​អនុញ្ញាត​ឱ្យ​កំណត់​ទឹកប្រាក់​ត្រូវតែ &quot;ជា​&quot; ឥណទាន &quot;"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +76,Quality Management,គ្រប់គ្រង​គុណភាព
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Quality Management,គ្រប់គ្រង​គុណភាព
 DocType: Production Planning Tool,Filter based on customer,តម្រង​ផ្អែក​លើ​ការ​អតិថិជន
 DocType: Payment Tool Detail,Against Voucher No,ប្រឆាំង​នឹង​ប័ណ្ណ​គ្មាន
 DocType: Employee External Work History,Employee External Work History,បុគ្គលិក​ខាងក្រៅ​ប្រវត្តិ​ការងារ
 DocType: Tax Rule,Purchase,ការ​ទិញ
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +34,Balance Qty,មាន​តុល្យភាព Qty
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Balance Qty,មាន​តុល្យភាព Qty
 DocType: Item Group,Parent Item Group,ធាតុ​មេ​គ្រុប
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +96,Cost Centers,មជ្ឈមណ្ឌល​ការ​ចំណាយ
 apps/erpnext/erpnext/config/stock.py +115,Warehouses.,ឃ្លាំង​។
@@ -2890,12 +2749,12 @@
 DocType: Opportunity,Next Contact,ទំនាក់ទំនង​បន្ទាប់
 DocType: Employee,Employment Type,ប្រភេទ​ការងារ​ធ្វើ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,ទ្រព្យសកម្ម​ថេរ
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +84,Application period cannot be across two alocation records,រយៈពេល​ប្រើប្រាស់​មិន​អាច​មាន​នៅ​ទូទាំង​កំណត់​ត្រា alocation ទាំង​ពីរ​នាក់
 DocType: Item Group,Default Expense Account,ចំណាយ​តាម​គណនី​លំនាំ​ដើម
 DocType: Employee,Notice (days),សេចក្តី​ជូនដំណឹង (ថ្ងៃ​)
 DocType: Page,Yes,បាទ
 DocType: Tax Rule,Sales Tax Template,ទំព័រ​គំរូ​ពន្ធ​លើ​ការ​លក់
 DocType: Employee,Encashment Date,Encashment កាលបរិច្ឆេទ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +74,Electroforming,Electroforming
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +179,"Against Voucher Type must be one of Purchase Order, Purchase Invoice or Journal Entry","ប្រឆាំង​នឹង​ប្រភេទ​ត្រូវ​តែ​មាន​ប័ណ្ណ​មួយ​នៃ​ការ​ទិញ​ស​ណ្តា​ប់​ធ្នាប់​, ការ​ទិញ​វិ​ក័​យ​ប័ត្រ​ឬ​ធាតុ​ទិនានុប្បវត្តិ"
 DocType: Account,Stock Adjustment,ការ​លៃ​តម្រូវ​ភាគ​ហ៊ុន
 DocType: Production Order,Planned Operating Cost,ចំណាយ​ប្រតិបត្តិការ​ដែល​បាន​គ្រោង​ទុក
@@ -2926,8 +2785,8 @@
 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,ចែកចាយ
 apps/erpnext/erpnext/public/js/pos/pos.html +36,Amount Paid,ចំនួន​ទឹកប្រាក់​ដែល​បង់
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +91,Project Manager,ប្រធាន​គ្រប់គ្រង​គម្រោង
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +72,Dispatch,បញ្ជូន
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Project Manager,ប្រធាន​គ្រប់គ្រង​គម្រោង
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +72,Dispatch,បញ្ជូន
 DocType: Customer,Default Taxes and Charges,ពន្ធ​លំនាំដើម​និង​ការ​ចោទ​ប្រកាន់
 DocType: Account,Receivable,អ្នក​ទទួល
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,តួនាទី​ដែល​ត្រូវ​បាន​អនុញ្ញាត​ឱ្យ​ដាក់​ស្នើ​តិ​ប​ត្តិ​ការ​ដែល​លើស​ពី​ដែន​កំណត់​ឥណទាន​បាន​កំណត់​។
@@ -2937,8 +2796,8 @@
 DocType: Hub Settings,Seller Description,អ្នក​លក់​ការ​ពិពណ៌នា​សង្ខេប
 DocType: Employee Education,Qualification,គុណវុឌ្ឍិ
 DocType: Item Price,Item Price,ថ្លៃ​ទំនិញ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +48,Soap & Detergent,ដុំ​និង​សាប៊ូ​ម្ស៉ៅ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +36,Motion Picture & Video,វីដេអូ​ចលនា​រូបភាព &amp;
+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,វីដេអូ​ចលនា​រូបភាព &amp;
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,បាន​បញ្ជា​ឱ្យ
 DocType: Warehouse,Warehouse Name,ឈ្មោះ​ឃ្លាំង
 DocType: Naming Series,Select Transaction,ជ្រើស​ប្រតិបត្តិការ
@@ -2946,7 +2805,6 @@
 DocType: Journal Entry,Write Off Entry,បិទ​សរសេរ​ធាតុ
 DocType: BOM,Rate Of Materials Based On,អត្រា​នៃ​សម្ភារៈ​មូលដ្ឋាន​នៅ​លើ
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,ការ​គាំទ្រ Analtyics
-DocType: Stock UOM Replace Utility,Stock UOM Replace Utility,ភាគ​ហ៊ុន UOM ជំនួស​ឧបករណ៍
 DocType: POS Profile,Terms and Conditions,លក្ខខណ្ឌ
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","នៅ​ទីនេះ​អ្នក​អាច​រក្សា​កម្ពស់​, ទម្ងន់​, អា​ឡែ​ស៊ី​, មាន​ការ​ព្រួយ​បារម្ភ​វេជ្ជ​សា​ស្រ្ត​ល"
 DocType: Leave Block List,Applies to Company,អនុវត្ត​ទៅ​ក្រុមហ៊ុន
@@ -2955,7 +2813,7 @@
 DocType: Sales Order Item,For Production,ចំពោះ​ផលិតកម្ម
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +103,Please enter sales order in the above table,សូម​បញ្ចូល​គោល​បំណង​លក់​នៅ​ក្នុង​តារាង​ខាង​លើ
 DocType: Project Task,View Task,មើល​ការងារ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +406,Your financial year begins on,កាល​ពី​ឆ្នាំ​ហិរញ្ញវត្ថុ​របស់​អ្នក​ចាប់​ផ្តើ​ម​នៅ
+apps/erpnext/erpnext/public/js/setup_wizard.js +154,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: Email Digest,Add/Remove Recipients,បន្ថែម / យក​អ្នក​ទទួល
@@ -2963,14 +2821,12 @@
 apps/erpnext/erpnext/config/support.py +54,Setup incoming server for support email id. (e.g. support@example.com),រៀបចំ​ម៉ាស៊ីន​បម្រើ​ចូល​មក​សម្រាប់​លេខ​សម្គាល់​អ្នក​គាំទ្រ​អ៊ី​ម៉ែ​ល​។ (ឧ support@example.com​)
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,កង្វះ​ខាត Qty
 DocType: Salary Slip,Salary Slip,ប្រាក់​បៀវត្ស​គ្រូពេទ្យ​ប្រហែលជា
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +116,Burnishing,Burnishing
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +54,'To Date' is required,&#39;ដើម្បី​កាលបរិច្ឆេទ​&#39; ត្រូវ​បាន​ទាមទារ
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,&#39;ដើម្បី​កាលបរិច្ឆេទ​&#39; ត្រូវ​បាន​ទាមទារ
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.",បង្កើត​វេច​ខ្ចប់​គ្រូពេទ្យ​ប្រហែលជា​សម្រាប់​កញ្ចប់​ត្រូវ​បាន​បញ្ជូន​។ ត្រូវ​បាន​ប្រើ​ដើម្បី​ជូន​ដំណឹង​ដល់​ចំនួន​ដែល​កញ្ចប់​មាតិកា​កញ្ចប់​និង​ទំ​ង​ន់​របស់​ខ្លួន​។
 DocType: Sales Invoice Item,Sales Order Item,ធាតុ​លំដាប់​ការ​លក់
 DocType: Salary Slip,Payment Days,ថ្ងៃ​ការ​ទូទាត់
 DocType: BOM,Manage cost of operations,គ្រប់គ្រង​ការ​ចំណាយ​ប្រតិ​ប​ត្តិ​ការ
 DocType: Features Setup,Item Advanced,ធាតុ​កម្រិត​ខ្ពស់
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +40,Hot rolling,រំកិល​ក្តៅ
 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.",នៅ​ពេល​ណា​ដែល​ប្រតិ​ប​ត្តិ​ការ​ដែល​បាន​ធីក​ត្រូវ​បាន &quot;ផ្តល់​ជូន​&quot; ដែល​ជា​ការ​លេច​ឡើង​អ៊ី​ម៉ែ​ល​ដែល​បាន​បើក​ដោយ​ស្វ័យ​ប្រវត្តិ​ដើម្បី​ផ្ញើ​អ៊ីមែល​ទៅ​ជាប់​ទាក់ទង &quot;ទំនាក់ទំនង​&quot; នៅ​ក្នុង​ប្រតិបត្តិការ​នោះ​ដោយ​មាន​ប្រតិ​ប​ត្តិ​ការ​ជា​មួយ​ការ​ភ្ជាប់​នេះ​។ អ្នក​ប្រើ​ដែល​អាច​ឬ​មិន​អាច​ផ្ញើ​អ៊ីមែល​។
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,ការ​កំណត់​សកល
 DocType: Employee Education,Employee Education,បុគ្គលិក​អប់រំ
@@ -2982,25 +2838,22 @@
 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/setup/page/setup_wizard/install_fixtures.py +48,Sick Leave,ស្លឹក​ឈឺ
+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/page/setup_wizard/fixtures/industry_type.py +22,Department Stores,ហាង​លក់​នាយកដ្ឋាន
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,ហាង​លក់​នាយកដ្ឋាន
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +40,System Balance,តុល្យភាព​របស់​ប្រព័ន្ធ
 DocType: Workflow,Is Active,គឺ​ជា​សកម្ម
 apps/erpnext/erpnext/controllers/stock_controller.py +71,No accounting entries for the following warehouses,គ្មាន​ការ​បញ្ចូល​គណនី​សម្រាប់​ឃ្លាំង​ដូច​ខាងក្រោម​នេះ
 apps/erpnext/erpnext/projects/doctype/project/project.js +22,Save the document first.,រក្សា​ទុក​ឯកសារ​ជា​លើក​ដំបូង​។
 DocType: Account,Chargeable,បន្ទុក
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +121,Linishing,Linishing
 DocType: Company,Change Abbreviation,ការ​ផ្លាស់​ប្តូ​រ​អក្សរកាត់
 DocType: Workflow State,Primary,បឋមសិក្សា
 DocType: Expense Claim Detail,Expense Date,ការ​ចំណាយ​កាលបរិច្ឆេទ
 DocType: Item,Max Discount (%),អតិបរមា​ការ​បញ្ចុះ​តម្លៃ (%​)
 DocType: Communication,More Information,ព​ត៌​មាន​បន្ថែម
 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/setup/page/setup_wizard/fixtures/operations.py +161,Blasting,បំផ្ទុះ
 DocType: Company,Warn,ព្រមាន
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +111,Item valuation updated,ការ​វាយ​តម្លៃ​ធាតុ​បាន​ធ្វើ​ឱ្យ​ទាន់សម័យ
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","ការ​កត់សម្គាល់​ណា​មួយ​ផ្សេង​ទៀត​, ការ​ខិតខំ​ប្រឹងប្រែង​គួរ​ឱ្យ​កត់សម្គាល់​ដែល​គួរ​តែ​ចូល​ទៅ​ក្នុង​របាយការណ៍​។"
 DocType: BOM,Manufacturing User,អ្នកប្រើប្រាស់​កម្មន្តសាល
 DocType: Purchase Order,Raw Materials Supplied,វត្ថុ​ធាតុ​ដើម​ដែល​សហ​ការី
@@ -3010,7 +2863,7 @@
 DocType: Appraisal,Appraisal Template,ការវាយតម្លៃ​ទំព័រ​គំរូ
 DocType: Communication,Email,អ៊ី​ម៉ែ​ល
 DocType: Item Group,Item Classification,ចំណាត់ថ្នាក់​ធាតុ
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +89,Business Development Manager,ប្រធាន​ផ្នែក​អភិវឌ្ឍន៍​ពាណិជ្ជកម្ម
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Business Development Manager,ប្រធាន​ផ្នែក​អភិវឌ្ឍន៍​ពាណិជ្ជកម្ម
 DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,គោលបំណង​ថែទាំ​ទស្សនកិច្ច
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.js +15,Period,រយៈ​ពេល
 ,General Ledger,ទូទៅ​សៀវភៅ
@@ -3018,8 +2871,6 @@
 DocType: Item Attribute Value,Attribute Value,តម្លៃ​គុណលក្ខណៈ
 ,Itemwise Recommended Reorder Level,Itemwise ផ្ដល់​អនុសាសន៍​រៀបចំ​វគ្គ
 DocType: Features Setup,To get Item Group in details table,ដើម្បី​ទទួល​បាន​ធាតុ Group ក្នុង​តារាង​ព​ត៌​មាន​លំអិត
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +67,Redrawing,ធ្វើការ​ផ្លាស់​ប្តូ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +120,Etching,ឆ្លាក់
 DocType: Sales Invoice,Commission,គណៈ​កម្ម​ការ
 DocType: Address Template,"<h4>Default Template</h4>
 <p>Uses <a href=""http://jinja.pocoo.org/docs/templates/"">Jinja Templating</a> and all the fields of Address (including Custom Fields if any) will be available</p>
@@ -3051,7 +2902,7 @@
 DocType: Sales Invoice,C-Form Applicable,C​-ទម្រង់​ពាក្យ​ស្នើសុំ
 DocType: Supplier,Address and Contacts,អាសយដ្ឋាន​និង​ទំនាក់ទំនង
 DocType: UOM Conversion Detail,UOM Conversion Detail,ព​ត៌​មាន​នៃ​ការ​ប្រែចិត្ត​ជឿ UOM
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +496,Keep it web friendly 900px (w) by 100px (h),រក្សា​វា​បណ្ដាញ 900px មិត្ត​ភាព (សរសេរ​) ដោយ 100px (ម៉ោង​)
+apps/erpnext/erpnext/public/js/setup_wizard.js +242,Keep it web friendly 900px (w) by 100px (h),រក្សា​វា​បណ្ដាញ 900px មិត្ត​ភាព (សរសេរ​) ដោយ 100px (ម៉ោង​)
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +329,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,ទទួល​បាន​ប័ណ្ណ​ឆ្នើម
@@ -3066,41 +2917,37 @@
 DocType: Item,Average time taken by the supplier to deliver,ពេល​មធ្យម​ដែល​ថត​ដោយ​អ្នក​ផ្គត់ផ្គង់​ដើម្បី​រំដោះ
 DocType: Time Log,Hours,ម៉ោង​ធ្វើការ
 DocType: Project,Expected Start Date,គេ​រំពឹង​ថា​នឹង​ចាប់​ផ្តើ​ម​កាល​បរិច្ឆេទ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +38,Rolling,រំកិល
 DocType: ToDo,Priority,អាទិភាព
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +41,Remove item if charges is not applicable to that item,យក​ធាតុ​ប្រសិន​បើ​ការ​ចោទ​ប្រកាន់​គឺ​អាច​អនុវត្ត​ទៅ​ធាតុ​ដែល
 DocType: Dropbox Backup,Dropbox Access Allowed,Dropbox បាន​អនុញ្ញាត​ការ​ចូល​ដំណើរ​ការ
 DocType: Dropbox Backup,Weekly,ប្រចាំ​ស​ប្តា​ហ៍
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,ឧ​ទា​ហរ​ណ៏​។ smsgateway.com/api/send_sms.cgi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +485,Receive,ទទួល​បាន
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +510,Receive,ទទួល​បាន
 DocType: Maintenance Visit,Fully Completed,បាន​បញ្ចប់​យ៉ាង​ពេញលេញ
 DocType: Employee,Educational Qualification,គុណវុឌ្ឍិ​អប់រំ
 DocType: Workstation,Operating Costs,ចំណាយ​ប្រតិបត្តិការ
 DocType: Employee Leave Approver,Employee Leave Approver,ទុក​ឱ្យ​ការ​អនុម័ត​បុគ្គលិក
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +67,"Cannot declare as lost, because Quotation has been made.",មិន​អាច​ប្រកាស​បាត់បង់​នោះ​ទេ​ព្រោះ​សម្រង់​ត្រូវ​បាន​ធ្វើ​ឡើង​។
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +133,Electron beam machining,ម៉ាស៊ីន​រត់​អេ​ឡិច​ត្រុ​ង
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,ការ​ទិញ​កម្មវិធី​គ្រប់គ្រង​អនុបណ្ឌិត
 apps/erpnext/erpnext/config/stock.py +141,Main Reports,របាយ​ការ​ណ៏​ដ៏​សំខាន់
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +102,Stock Ledger entries balances updated,ធាតុ​ភាគ​ហ៊ុន​សៀវភៅ​សមតុល្យ​ធ្វើ​ឱ្យ​ទាន់​សម័យ
 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
-apps/erpnext/erpnext/stock/doctype/item/item.js +176,Add / Edit Prices,បន្ថែម / កែសម្រួល​តម្លៃ​ទំនិញ
+apps/erpnext/erpnext/stock/doctype/item/item.js +178,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 +298,My Orders,ការ​បញ្ជា​ទិញ​របស់​ខ្ញុំ
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +293,My Orders,ការ​បញ្ជា​ទិញ​របស់​ខ្ញុំ
 DocType: Price List,Price List Name,ឈ្មោះ​តារាងតម្លៃ
 DocType: Time Log,For Manufacturing,សម្រាប់​អ្នក​ផលិត
-apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +70,Totals,សរុប
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +174,Totals,សរុប
 DocType: BOM,Manufacturing,កម្មន្តសាល
 ,Ordered Items To Be Delivered,ធាតុ​បញ្ជា​ឱ្យ​នឹង​ត្រូវ​បាន​បញ្ជូន
 DocType: Account,Income,ប្រាក់​ចំណូល
 ,Setup Wizard,អ្នក​ជំនួយ​ការ​ដំឡើង
 DocType: Industry Type,Industry Type,ប្រភេទ​វិស័យ​ឧស្សាហកម្ម
 apps/erpnext/erpnext/templates/includes/cart.js +137,Something went wrong!,អ្វី​មួយ​ដែល​ខុស​!
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +68,Warning: Leave application contains following block dates,ព្រមាន &amp; ‧​;​: កម្មវិធី​ទុក​ឱ្យ​មាន​កាល​បរិច្ឆេទ​នៃ​ការ​ហាមឃាត់​ដូច​ខាងក្រោម
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +100,Warning: Leave application contains following block dates,ព្រមាន &amp; ‧​;​: កម្មវិធី​ទុក​ឱ្យ​មាន​កាល​បរិច្ឆេទ​នៃ​ការ​ហាមឃាត់​ដូច​ខាងក្រោម
 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/setup/page/setup_wizard/fixtures/operations.py +10,Die casting,ការ​សម្ដែង​ស្លាប់
 DocType: Email Alert,Reference Date,សេចក្តី​យោង​កាលបរិច្ឆេទ
 apps/erpnext/erpnext/config/hr.py +105,Organization unit (department) master.,អង្គភាព (ក្រសួង​) មេ​។
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +25,Please enter valid mobile nos,សូម​បញ្ចូល NOS ទូរស័ព្ទ​ដៃ​ដែល​មាន​សុពលភាព
@@ -3119,10 +2966,10 @@
 ,Serial No Service Contract Expiry,គ្មាន​សេវា​កិច្ចសន្យា​សៀរៀល​ផុតកំណត់
 DocType: Item,Unit of Measure Conversion,ឯកតា​នៃ​ការ​ប្រែចិត្ត​ជឿ​វិធានការ
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +86,Employee can not be changed,និយោជិត​មិន​អាច​ត្រូវ​បាន​ផ្លាស់​ប្តូ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +259,You cannot credit and debit same account at the same time,អ្នក​មិន​អាច​ឥណទាន​និង​ឥណពន្ធ​គណនី​ដូច​គ្នា​នៅ​ពេល​តែមួយ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,You cannot credit and debit same account at the same time,អ្នក​មិន​អាច​ឥណទាន​និង​ឥណពន្ធ​គណនី​ដូច​គ្នា​នៅ​ពេល​តែមួយ
 DocType: Naming Series,Help HTML,ជំនួយ HTML
 DocType: Address,Name of person or organization that this address belongs to.,ឈ្មោះ​របស់​មនុស្ស​ម្នាក់​ឬ​អង្គការ​មួយ​ដែល​មាន​អាស័យ​ដ្ឋាន​ជា​របស់​វា​។
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +587,Your Suppliers,អ្នកផ្គត់ផ្គង់​របស់​អ្នក
+apps/erpnext/erpnext/public/js/setup_wizard.js +325,Your Suppliers,អ្នកផ្គត់ផ្គង់​របស់​អ្នក
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,មិន​អាច​បាត់​បង់​ដូច​ដែល​បាន​កំណត់​ជា​លំដាប់​ត្រូវ​បាន​ធ្វើ​ឱ្យ​ការ​លក់​រថយន្ត​។
 DocType: Purchase Invoice,Contact,ការ​ទំនាក់ទំនង
 DocType: Features Setup,Exports,ការ​នាំ​ចេញ
@@ -3130,30 +2977,28 @@
 DocType: Item,Has Serial No,គ្មាន​សៀរៀល
 DocType: Employee,Date of Issue,កាលបរិច្ឆេទ​នៃ​បញ្ហា
 DocType: Issue,Content Type,ប្រភេទ​មាតិកា​រ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +17,Computer,កុំ​ព្យូ​ទ័​រ
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,កុំ​ព្យូ​ទ័​រ
 DocType: Item,List this Item in multiple groups on the website.,រាយ​ធាតុ​នេះ​នៅ​ក្នុង​ក្រុម​ជា​ច្រើន​នៅ​លើ​គេហទំព័រ​។
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +283,Please check Multi Currency option to allow accounts with other currency,សូម​ពិនិត្យ​មើល​ជម្រើស​រូបិយវត្ថុ​ពហុ​ដើម្បី​អនុញ្ញាត​ឱ្យ​គណនី​ជា​រូបិយប័ណ្ណ​ផ្សេង​ទៀត
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +285,Please check Multi Currency option to allow accounts with other currency,សូម​ពិនិត្យ​មើល​ជម្រើស​រូបិយវត្ថុ​ពហុ​ដើម្បី​អនុញ្ញាត​ឱ្យ​គណនី​ជា​រូបិយប័ណ្ណ​ផ្សេង​ទៀត
 apps/erpnext/erpnext/accounts/doctype/account/account.py +81,You are not authorized to set Frozen value,អ្នក​មិន​ត្រូវ​បាន​អនុញ្ញាត​ឱ្យ​កំណត់​តម្លៃ​ទឹកកក
 DocType: Payment Reconciliation,Get Unreconciled Entries,ទទួល​បាន​ធាតុ Unreconciled
 DocType: Cost Center,Budgets,ថវិកា
 apps/frappe/frappe/core/page/modules_setup/modules_setup.py +11,Updated,ធ្វើ​ឱ្យ​ទាន់​សម័យ
 DocType: Employee,Emergency Contact Details,ព​ត៌​មាន​ទំនាក់ទំនង​ស​ង្រ្គោះ​បន្ទាន់
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +396,What does it do?,តើ​ធ្វើ​ដូច​ម្ដេច​?
+apps/erpnext/erpnext/public/js/setup_wizard.js +144,What does it do?,តើ​ធ្វើ​ដូច​ម្ដេច​?
 DocType: Delivery Note,To Warehouse,ដើម្បី​ឃ្លាំង
 ,Average Commission Rate,គណៈ​កម្ម​ការ​ជា​មធ្យម​អត្រា​ការ
-apps/erpnext/erpnext/stock/doctype/item/item.py +313,'Has Serial No' can not be 'Yes' for non-stock item,&#39;មិន​មាន​មិន​សៀរៀល​&#39; មិន​អាច​ក្លាយ​​​ជា &#39;បាទ​&#39; សម្រាប់​ធាតុ​ដែល​មិន​មែន​ជា​ភាគ​ហ៊ុន​-
+apps/erpnext/erpnext/stock/doctype/item/item.py +317,'Has Serial No' can not be 'Yes' for non-stock item,&#39;មិន​មាន​មិន​សៀរៀល​&#39; មិន​អាច​ក្លាយ​​​ជា &#39;បាទ​&#39; សម្រាប់​ធាតុ​ដែល​មិន​មែន​ជា​ភាគ​ហ៊ុន​-
 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/setup/page/setup_wizard/install_fixtures.py +111,Electrical,អគ្គិសនី
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +111,Electrical,អគ្គិសនី
 DocType: Stock Entry,Total Value Difference (Out - In),ភាព​ខុស​គ្នា​តម្លៃ​សរុប (ចេញ - ក្នុង​)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +72,Peening,Peening
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,From Warranty Claim,មក​ពី​ប​ណ្តឹ​ង​ធានា
 DocType: Stock Entry,Default Source Warehouse,លំនាំ​ដើម​ឃ្លាំង​ប្រភព
 DocType: Item,Customer Code,លេខ​កូដ​អតិថិជន
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +163,Lapping,ចូលរួម​ធ្វើការ​ប្រកួតប្រជែង
-apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.js +8,Days Since Last Order,ថ្ងៃ​ចាប់​ពី​លំដាប់​ចុង​ក្រោយ
+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 +299,Debit To account must be a Balance Sheet account,ឥណពន្ធ​វី​សា​ទៅ​គណនី​ត្រូវ​តែ​មាន​តារាង​តុល្យការ​គណនី
 DocType: Buying Settings,Naming Series,ដាក់​​​ឈ្មោះ​កម្រង​ឯកសារ
 DocType: Leave Block List,Leave Block List Name,ទុក​ឱ្យ​ឈ្មោះ​បញ្ជី​ប្លុក
@@ -3171,7 +3016,6 @@
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,ការ​បញ្ចុះ​តម្លៃ​ត្រូវ​តែ​មាន​តិច​ជាង 100
 DocType: ToDo,Low,កម្រិត​ទាប
 DocType: Purchase Invoice,Write Off Amount (Company Currency),បិទ​ការ​សរសេរ​ចំនួន​ទឹកប្រាក់ (ក្រុមហ៊ុន​រូបិយវត្ថុ​)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +71,Spinning,ការ​វិល
 DocType: Landed Cost Voucher,Landed Cost Voucher,ប័ណ្ណ​តម្លៃ​ដែល​បាន​ចុះ​ចត
 DocType: Purchase Invoice,Repeat on Day of Month,ធ្វើ​ម្តង​ទៀត​នៅ​ថ្ងៃ​នៃ​ខែ
 DocType: Employee,Health Details,ព​ត៌​មាន​លំអិត​សុខភាព
@@ -3191,7 +3035,6 @@
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +37,Campaign Name is required,ឈ្មោះ​ត្រូវ​បាន​ទាមទារ​យុទ្ធនាការ​ឃោសនា
 DocType: Maintenance Visit,Maintenance Date,ថែទាំ​កាលបរិច្ឆេទ
 DocType: Purchase Receipt Item,Rejected Serial No,គ្មាន​សៀរៀល​ច្រាន​ចោល
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +51,Deep drawing,គំនូរ​ដ៏​ជ្រៅ
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +40,New Newsletter,ព្រឹត្តិ​ប័ត្រ​ព័ត៌មាន​ថ្មី​មួយ
 apps/erpnext/erpnext/stock/doctype/item/item.js +17,Show Balance,បង្ហាញ​តុល្យភាព
 DocType: Item,"Example: ABCD.#####
@@ -3200,7 +3043,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +119,BOM and Manufacturing Quantity are required,កម្មន្តសាល​ចំ​នូន Bom និង​ត្រូវ​បាន​តម្រូវ
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,ជួរ Ageing 2
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +450,Amount,ចំនួន​ទឹកប្រាក់
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +147,Riveting,riveting
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,Bom បាន​ជំនួស
 ,Sales Analytics,វិភាគ​ការ​លក់
 DocType: Manufacturing Settings,Manufacturing Settings,ការ​កំណត់​កម្មន្តសាល
@@ -3211,25 +3053,24 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +207,New Account Name,ឈ្មោះ​គណនី​ថ្មី
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,ការ​ចំណាយ​វត្ថុ​ធាតុ​ដើម​ការី
 DocType: Selling Settings,Settings for Selling Module,ម៉ូឌុល​ការ​កំណត់​សម្រាប់​លក់
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +73,Customer Service,សេវា​បំរើ​អតិថិជន
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Customer Service,សេវា​បំរើ​អតិថិជន
 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.,បេក្ខជន​ផ្ដល់​ការងារ​។
 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,ស្លឹក​ដែល​បាន​បម្រុង​ទុក​សរុប​គឺ​មាន​ច្រើន​ជាង​ថ្ងៃ​ក្នុង​អំឡុង​ពេល​នេះ
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,ការងារ​លំនាំ​ដើម​នៅ​ក្នុង​ឃ្លាំង​វឌ្ឍនភាព
 apps/erpnext/erpnext/config/accounts.py +107,Default settings for accounting transactions.,ការ​កំណត់​លំនាំ​ដើម​សម្រាប់​ប្រតិបត្តិការ​គណនេយ្យ​។
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +21,Vacuum molding,ផ្សិត​សុញ្ញកាស
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,កាលបរិច្ឆេទ​គេ​រំពឹង​ថា​នឹង​មិន​អាច​មាន​មុន​ពេល​ដែល​កាលបរិច្ឆេទ​នៃ​សំណើ​សុំ​សម្ភារៈ
 DocType: Contact Us Settings,City,ទីក្រុង
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +132,Ultrasonic machining,ម៉ាស៊ីន Ultrasonic
 apps/frappe/frappe/templates/base.html +137,Error: Not a valid id?,កំហុស​: មិន​មាន​អត្តសញ្ញាណប័ណ្ណ​ដែល​មាន​សុពលភាព​?
 DocType: Naming Series,Update Series Number,កម្រង​ឯកសារ​លេខ​ធ្វើ​ឱ្យ​ទាន់​សម័យ
 DocType: Account,Equity,សមធម៌
 DocType: Sales Order,Printing Details,សេចក្ដី​លម្អិត​ការ​បោះពុម្ព
 DocType: Task,Closing Date,ថ្ងៃ​ផុតកំណត់
 DocType: Sales Order Item,Produced Quantity,បរិមាណ​ដែល​បាន​ផលិត
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +84,Engineer,វិស្វករ
+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,សភា​អនុ​ស្វែងរក
 DocType: Sales Partner,Partner Type,ប្រភេទ​ជា​ដៃគូ
 DocType: Purchase Taxes and Charges,Actual,ពិត​ប្រាកដ
@@ -3244,17 +3085,17 @@
 DocType: Item,Re-Order Level,ដីកាសម្រេច​កម្រិត​ឡើងវិញ
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,បញ្ចូល​ធាតុ​និង​ការ​ដែល​បាន​គ្រោង​ទុក qty ដែល​អ្នក​ចង់​បាន​ដើម្បី​បង្កើន​ការ​បញ្ជា​ទិញ​ផលិត​ផល​ឬ​ទាញ​យក​វត្ថុ​ធាតុ​ដើម​សម្រាប់​ការ​វិភាគ​។
 apps/frappe/frappe/public/js/frappe/views/ganttview.js +45,Gantt Chart,គំនូសតាង Gantt
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +57,Part-time,ពេញ​ម៉ោង
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,Part-time,ពេញ​ម៉ោង
 DocType: Employee,Applicable Holiday List,បញ្ជី​ថ្ងៃ​ឈប់​សម្រាក​ដែល​អាច​អនុវត្ត​បាន
 DocType: Employee,Cheque,មូលប្បទានប័ត្រ
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,បាន​បន្ទាន់​សម័យ​ស៊េរី
 apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Report Type is mandatory,របាយ​ការ​ណ៏​ចាំបាច់​ប្រភេទ
 DocType: Item,Serial Number Series,កម្រង​ឯកសារ​លេខ​សៀរៀល
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +45,Retail & Wholesale,ការ​លក់​រាយ​លក់ដុំ​និង​ចែកចាយ
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,ការ​លក់​រាយ​លក់ដុំ​និង​ចែកចាយ
 DocType: Issue,First Responded On,ជា​លើក​ដំបូង​បាន​ឆ្លើយ​តប​នៅ​លើ
 DocType: Website Item Group,Cross Listing of Item in multiple groups,កាកបាទ​បញ្ជី​ដែល​មាន​ធាតុ​នៅ​ក្នុង​ក្រុម​ជា​ច្រើន​ដែល
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +351,The First User: You,អ្នក​ប្រើ​ដំបូង​: អ្នក
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +172,Successfully Reconciled,ផ្សះផ្សា​ដោយ​ជោគជ័យ
+apps/erpnext/erpnext/public/js/setup_wizard.js +101,The First User: You,អ្នក​ប្រើ​ដំបូង​: អ្នក
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +119,Successfully Reconciled,ផ្សះផ្សា​ដោយ​ជោគជ័យ
 DocType: Production Order,Planned End Date,កាលបរិច្ឆេទ​បញ្ចប់​ការ​គ្រោង​ទុក
 apps/erpnext/erpnext/config/stock.py +43,Where items are stored.,ដែល​ជា​កន្លែង​ដែល​ធាតុ​ត្រូវ​បាន​រក្សា​ទុក​។
 DocType: Tax Rule,Validity,សុពលភាព
@@ -3273,26 +3114,23 @@
 DocType: Purchase Invoice,Advance Payments,ការ​ទូទាត់​ជាមុន
 DocType: DocPerm,Level,កំរិត
 DocType: Purchase Taxes and Charges,On Net Total,នៅ​លើ​សុទ្ធ​សរុប
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +59,No permission to use Payment Tool,មិន​មាន​ការ​អនុញ្ញាត​ឱ្យ​ប្រើ​ឧបករណ៍​ការ​ទូទាត់
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +97,No permission to use Payment Tool,មិន​មាន​ការ​អនុញ្ញាត​ឱ្យ​ប្រើ​ឧបករណ៍​ការ​ទូទាត់
 apps/erpnext/erpnext/controllers/recurring_document.py +192,'Notification Email Addresses' not specified for recurring %s,&quot;ការ​ជូន​ដំណឹង​អាសយដ្ឋាន​អ៊ីមែល &#39;មិន​ត្រូវ​បាន​បញ្ជាក់​សម្រាប់​% s ដែល​កើតឡើង
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +86,Milling,កិន
 apps/erpnext/erpnext/accounts/doctype/account/account.py +99,Currency can not be changed after making entries using some other currency,រូបិយ​ប័ណ្ណ​មិន​អាច​ត្រូវ​បាន​ផ្លាស់​ប្តូ​រ​បន្ទាប់​ពី​ធ្វើ​ការ​ធាតុ​ប្រើ​ប្រាស់​រូបិយ​ប័ណ្ណ​ផ្សេង​ទៀត​មួយ​ចំនួន
 DocType: Company,Round Off Account,បិទ​ការ​ប្រកួត​ជុំ​ទី​គណនី
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +60,Nibbling,nibbling
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,ចំណាយ​រដ្ឋបាល
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +18,Consulting,ការ​ប្រឹក្សា​យោបល់
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +18,Consulting,ការ​ប្រឹក្សា​យោបល់
 DocType: Customer Group,Parent Customer Group,ឪពុក​ម្តាយ​ដែល​ជា​ក្រុម​អតិថិជន
 apps/erpnext/erpnext/public/js/pos/pos.js +429,Change,ការ​ផ្លាស់​ប្តូ​រ
 DocType: Purchase Invoice,Contact Email,ទំនាក់ទំនង​តាម​អ៊ីមែល
 DocType: Appraisal Goal,Score Earned,គ្រាប់​បាល់​បញ្ចូល​ទី​ទទួល​បាន
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +393,"e.g. ""My Company LLC""",ឧទាហរណ៍​ដូចជា​រឿង &quot;My ក្រុមហ៊ុន LLC បាន​&quot;
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +173,Notice Period,រយៈ​ពេល​ជូន​ដំណឹង
+apps/erpnext/erpnext/public/js/setup_wizard.js +141,"e.g. ""My Company LLC""",ឧទាហរណ៍​ដូចជា​រឿង &quot;My ក្រុមហ៊ុន LLC បាន​&quot;
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +173,Notice Period,រយៈ​ពេល​ជូន​ដំណឹង
 DocType: Bank Reconciliation Detail,Voucher ID,លេខ​សម្គាល់​កាត​មាន​ទឹក​ប្រាក់
 apps/erpnext/erpnext/setup/doctype/territory/territory.js +14,This is a root territory and cannot be edited.,នេះ​គឺ​ជា​ទឹក​ដី​ជា root និង​មិន​អាច​ត្រូវ​បាន​កែសម្រួល​។
 DocType: Packing Slip,Gross Weight UOM,សរុប​បាន​ទំ UOM
 DocType: Email Digest,Receivables / Payables,ទទួល / បង់
 DocType: Delivery Note Item,Against Sales Invoice,ប្រឆាំង​នឹង​ការ​វិ​ក័​យ​ប័ត្រ​លក់
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +63,Stamping,ការ​បង្ក្រាប
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +457,Credit Account,គណនី​ឥណទាន
 DocType: Landed Cost Item,Landed Cost Item,ធាតុ​តម្លៃ​ដែល​បាន​ចុះ​ចត
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +56,Show zero values,បង្ហាញ​តម្លៃ​សូន្យ
@@ -3303,7 +3141,7 @@
 DocType: Task,Actual End Date (via Time Logs),ជាក់​ស្តែ​កាលបរិច្ឆេទ​បញ្ចប់ (តាម​រយៈ​ពេល​កំណត់​ហេតុ​)
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +23,Please enter parent cost center,សូម​បញ្ចូល​មជ្ឈមណ្ឌល​ចំណាយ​ឪពុក​ម្តាយ
 DocType: Delivery Note,Print Without Amount,បោះពុម្ព​ដោយ​គ្មាន​ការ​ចំនួន​ទឹកប្រាក់
-apps/erpnext/erpnext/controllers/buying_controller.py +69,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,ប្រភេទ​ពន្ធ​លើ​មិន​អាច​ជា &quot;វាយតម្លៃ &#39;ឬ​&#39; វាយតម្លៃ​និង​សរុប &#39;ជា​ធាតុ​ទាំង​អស់​នេះ​គឺ​ជា​ធាតុ​ដែល​មិន​មាន​ភាគ​ហ៊ុន
+apps/erpnext/erpnext/controllers/buying_controller.py +60,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,ប្រភេទ​ពន្ធ​លើ​មិន​អាច​ជា &quot;វាយតម្លៃ &#39;ឬ​&#39; វាយតម្លៃ​និង​សរុប &#39;ជា​ធាតុ​ទាំង​អស់​នេះ​គឺ​ជា​ធាតុ​ដែល​មិន​មាន​ភាគ​ហ៊ុន
 DocType: User,Last Name,ឈ្មោះ​ចុង​ក្រោយ
 DocType: Web Page,Left,ពី​ឆ្វេង
 DocType: Event,All Day,ថ្ងៃ​ទាំងអស់
@@ -3311,7 +3149,7 @@
 DocType: Appraisal,Total Score (Out of 5),ពិន្ទុ​សរុប (ក្នុង​ចំណោម 5​)
 DocType: Contact Us Settings,State,រដ្ឋ
 DocType: Batch,Batch,ជំនាន់​ទី
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +51,Balance,មាន​តុល្យភាព
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +28,Balance,មាន​តុល្យភាព
 DocType: Project,Total Expense Claim (via Expense Claims),ពាក្យ​ប​ណ្តឹ​ង​លើ​ការ​ចំណាយ​សរុប (តាម​រយៈ​ការ​ប្តឹ​ង​ទាមទារ​សំណង​លើ​ការ​ចំណាយ​)
 DocType: User,Gender,យែ​ន​ឌ័​រ
 DocType: Journal Entry,Debit Note,ចំណាំ​ឥណពន្ធ
@@ -3340,8 +3178,7 @@
 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/setup/page/setup_wizard/fixtures/operations.py +76,Seaming,ស៊ា
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +197,"Company Email ID not found, hence mail not sent",រក​មិន​ឃើញ​អ៊ី​ម៉ែ​ល​ដែល​ជា​ក្រុម​ហ៊ុន​លេខ​សម្គាល់​ដូចនេះ mail មិនបាន​ចាត់
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +206,"Company Email ID not found, hence mail not sent",រក​មិន​ឃើញ​អ៊ី​ម៉ែ​ល​ដែល​ជា​ក្រុម​ហ៊ុន​លេខ​សម្គាល់​ដូចនេះ mail មិនបាន​ចាត់
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),កម្មវិធី​របស់​មូលនិធិ (ទ្រព្យសកម្ម​)
 DocType: Production Planning Tool,Filter based on item,តម្រង​មាន​មូលដ្ឋាន​លើ​ធាតុ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +451,Debit Account,គណនី​ឥណពន្ធ​វី​សា
@@ -3352,8 +3189,7 @@
 DocType: Purchase Common,Purchase Common,ទិញ​ទូទៅ
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,បញ្ឈប់​ការ​របស់​អ្នក​ប្រើ​ពី​ការ​ធ្វើ​ឱ្យ​កម្មវិធី​ដែល​បាន​ចាកចេញ​នៅ​ថ្ងៃ​បន្ទាប់​។
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +591,From Opportunity,ពី​ឱកាស
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +46,Blanking,កំពុង​ធ្វើ​ឱ្យ​ទទេ
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +166,Employee Benefits,អត្ថប្រយោជន៍​បុគ្គលិក
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,Employee Benefits,អត្ថប្រយោជន៍​បុគ្គលិក
 DocType: Sales Invoice,Is POS,តើ​មាន​ម៉ាស៊ីន​ឆូត​កាត
 DocType: Production Order,Manufactured Qty,បាន​ផលិត Qty
 DocType: Purchase Receipt Item,Accepted Quantity,បរិមាណ​ដែល​ត្រូវ​ទទួល​យក
@@ -3378,7 +3214,7 @@
 apps/frappe/frappe/desk/moduleview.py +67,Standard Reports,របាយ​ការ​ណ៏​ស្ដ​ង់​ដា​រ
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,ធាតុ​ទិនានុប្បវត្តិ​គណនេយ្យ​។
 DocType: Delivery Note Item,Available Qty at From Warehouse,ដែល​អាច​ប្រើ​បាន​នៅ​ពី​ឃ្លាំង Qty
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +209,Please select Employee Record first.,សូម​ជ្រើសរើស​បុគ្គលិក​កំណត់ត្រា​ដំបូង​។
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +224,Please select Employee Record first.,សូម​ជ្រើសរើស​បុគ្គលិក​កំណត់ត្រា​ដំបូង​។
 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 +233,Please enter Expense Account,សូម​បញ្ចូល​ចំណាយ​តាម​គណនី
 DocType: Account,Stock,ភាគ​ហ៊ុន
@@ -3390,42 +3226,39 @@
 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,ការ​បញ្ជា​ទិញ​ការ​លក់​ទាញ (ដែល​មិន​ទាន់​សម្រេច​បាន​នូវ​ការ​ផ្តល់​) ដោយ​ផ្អែក​លើ​លក្ខណៈ​វិនិច្ឆ័យ​ដូច​ខាងលើ​នេះ
 DocType: DocShare,Document Type,ប្រភេទ​ឯកសារ
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +565,From Supplier Quotation,ចាប់​ពី​សម្រង់​ផ្គត់ផ្គង់
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +588,From Supplier Quotation,ចាប់​ពី​សម្រង់​ផ្គត់ផ្គង់
 DocType: Deduction Type,Deduction Type,ប្រភេទ​កាត់កង
 DocType: Attendance,Half Day,ពាក់​ក​ណ្តា​ល​ថ្ងៃ
 DocType: Pricing Rule,Min Qty,លោក Min Qty
 DocType: Features Setup,"To track items in sales and purchase documents with batch nos. ""Preferred Industry: Chemicals""",ដើម្បី​តាមដាន​ធាតុ​នៅ​ក្នុង​ការ​លក់​និង​ឯកសារ​ទិញ​ដោយ​មាន NOS បាច់​។ &quot;ឧស្សាហកម្ម​ពេញ​ចិត្ត​: គីមី​&quot;
 DocType: GL Entry,Transaction Date,ប្រតិ​ប​ត្តិ​ការ​កាលបរិច្ឆេទ
 DocType: Production Plan Item,Planned Qty,បាន​គ្រោងទុក Qty
-apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +91,Total Tax,ការ​ប្រមូល​ពន្ធ​លើ​ចំនួន​សរុប
+apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +93,Total Tax,ការ​ប្រមូល​ពន្ធ​លើ​ចំនួន​សរុប
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +178,For Quantity (Manufactured Qty) is mandatory,ចប់ (ផលិត Qty​) គឺ​ជា​ចាំបាច់
 DocType: Stock Entry,Default Target Warehouse,ឃ្លាំង​គោលដៅ​លំនាំ​ដើម
 DocType: Purchase Invoice,Net Total (Company Currency),សរុប (ក្រុមហ៊ុន​រូបិយវត្ថុ​)
 DocType: Notification Control,Purchase Receipt Message,សារ​បង្កាន់ដៃ​ទិញ
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +95,Total allocated leaves are more than period,ស្លឹក​ដែល​បាន​បម្រុង​ទុក​សរុប​គឺ​មាន​ច្រើន​ជាង​សម័យ
 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.,ចលនា​ធាតុ​កំណត់ត្រា​។
 DocType: Newsletter List Subscriber,Newsletter List Subscriber,បញ្ជី​ព្រឹត្តិ​ប័ត្រ​ព័ត៌មាន​អតិថិជន
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +164,Morticing,Morticing
 DocType: Email Account,Service,សេវាកម្ម
 DocType: Hub Settings,Hub Settings,ការ​កំណត់​ហាប់
 DocType: Project,Gross Margin %,រឹម​% សរុប​បាន
 DocType: BOM,With Operations,ជា​មួយ​នឹង​ការ​ប្រតិ​ប​ត្ដិ​ការ
 ,Monthly Salary Register,ប្រចាំខែ​ប្រាក់ខែ​ចុះឈ្មោះ
-apps/frappe/frappe/website/template.py +140,Next,បន្ទាប់
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard_page.html +17,Next,បន្ទាប់
 DocType: Warranty Claim,If different than customer address,បើ​សិន​ជា​ខុស​គ្នា​ជាង​អាសយដ្ឋាន​អតិថិជន
 DocType: BOM Operation,BOM Operation,Bom ប្រតិបត្តិការ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +118,Electropolishing,Electropolishing
 DocType: Purchase Taxes and Charges,On Previous Row Amount,នៅ​ថ្ងៃ​ទី​ចំនួន​ជួរ​ដេក​មុន
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +24,Please enter Payment Amount in atleast one row,សូម​បញ្ចូល​ចំនួន​ទឹកប្រាក់​ដែល​បង់​យ៉ាងហោចណាស់​មួយ​ជួរ​ដេក
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +33,Please enter Payment Amount in atleast one row,សូម​បញ្ចូល​ចំនួន​ទឹកប្រាក់​ដែល​បង់​យ៉ាងហោចណាស់​មួយ​ជួរ​ដេក
 DocType: POS Profile,POS Profile,ម៉ាស៊ីន​ឆូត​កាត​ព​ត៌​មាន​ផ្ទាល់ខ្លួន
 apps/erpnext/erpnext/config/accounts.py +153,"Seasonality for setting budgets, targets etc.",រដូវ​កាល​សម្រាប់​ការ​កំណត់​ថវិកា​គោលដៅ​ល
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +46,Total Unpaid,សរុប​គ្មាន​ប្រាក់ខែ
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +21,Time Log is not billable,កំណត់​ហេតុ​ពេល​វេលា​គឺ​មិន billable
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +528,Purchaser,អ្នក​ទិញ
+apps/erpnext/erpnext/public/js/setup_wizard.js +272,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 +71,Please enter the Against Vouchers manually,សូម​បញ្ចូល​ប័ណ្ណ​ដោយ​ដៃ​ប្រឆាំង​នឹង
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +107,Please enter the Against Vouchers manually,សូម​បញ្ចូល​ប័ណ្ណ​ដោយ​ដៃ​ប្រឆាំង​នឹង
 DocType: SMS Settings,Static Parameters,ប៉ារ៉ាម៉ែត្រ​ឋិតិ​វន្ត
 DocType: Purchase Order,Advance Paid,មុន​បង់ប្រាក់
 DocType: Item,Item Tax,ការ​ប្រមូល​ពន្ធ​លើ​ធាតុ
@@ -3434,14 +3267,12 @@
 apps/erpnext/erpnext/config/crm.py +48,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 +57,Actual Qty is mandatory,ជាក់​ស្តែ Qty ចាំបាច់
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +42,Cross-rolling,កាកបាទ​រំកិល
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +132,Credit Card,កាត​ឥណទាន
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +132,Credit Card,កាត​ឥណទាន
 DocType: BOM,Item to be manufactured or repacked,ធាតុ​នឹង​ត្រូវ​បាន​ផលិត​ឬ repacked
 apps/erpnext/erpnext/config/stock.py +95,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,សូម​បញ្ចូល​ពន្ធ​និង​ការ​ចោទ​ប្រកាន់
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +85,Machining,ការ​ឆ្នៃ​ប្រឌិត
 DocType: Sales Invoice Item,Drop Ship,ទម្លាក់​នាវា
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children",នៅ​ទីនេះ​អ្នក​អាច​រក្សា​បាន​នូវ​ព័ត៌មាន​លម្អិត​សម្រាប់​ក្រុម​គ្រួសារ​ដូច​ជា​ឈ្មោះ​និង​មុខរបរ​របស់​ឪពុក​ម្តាយ​ប្តី​ប្រពន្ធ​និង​កូន
 DocType: Hub Settings,Seller Name,ឈ្មោះ​អ្នក​លក់
@@ -3451,7 +3282,7 @@
 DocType: Stock Entry,Repack,Repack
 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/setup/page/setup_wizard/setup_wizard.js +500,Attach Logo,ភ្ជាប់​រូបសញ្ញា
+apps/erpnext/erpnext/public/js/setup_wizard.js +246,Attach Logo,ភ្ជាប់​រូបសញ្ញា
 DocType: Customer,Commission Rate,អត្រា​ប្រាក់​កំរៃ
 apps/erpnext/erpnext/stock/doctype/item/item.js +38,Make Variant,ធ្វើ​ឱ្យ​វ៉ារ្យង់
 apps/erpnext/erpnext/config/hr.py +145,Block leave applications by department.,កម្មវិធី​ដែល​បាន​ឈប់​សម្រាក​ប្លុក​ដោយ​នាយកដ្ឋាន​។
@@ -3466,25 +3297,25 @@
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +105,Please select a csv file,សូម​ជ្រើស​ឯកសារ csv
 DocType: Dropbox Backup,Send Backups to Dropbox,ផ្ញើ​ការ​បម្រុង​ទុក​ទៅ Dropbox
 DocType: Purchase Order,To Receive and Bill,ដើម្បី​ទទួល​បាន​និង Bill
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +94,Designer,អ្នក​រចនា
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Designer,អ្នក​រចនា
 apps/erpnext/erpnext/config/selling.py +121,Terms and Conditions Template,លក្ខខណ្ឌ​ទំព័រ​គំរូ
 DocType: Serial No,Delivery Details,ព​ត៌​មាន​លំអិត​ដឹកជញ្ជូន
 DocType: Item,Automatically create Material Request if quantity falls below this level,បង្កើត​សម្ភារៈ​ស្នើ​សុំ​ដោយ​ស្វ័យ​ប្រវត្តិ​បើ​បរិមាណ​ធ្លាក់​នៅ​ក្រោម​កម្រិត​នេះ
 ,Item-wise Purchase Register,ចុះឈ្មោះ​ទិញ​ធាតុ​ប្រាជ្ញា
 DocType: Batch,Expiry Date,កាលបរិច្ឆេទ​ផុតកំណត់
-apps/erpnext/erpnext/stock/doctype/item/item.py +375,"To set reorder level, item must be a Purchase Item or Manufacturing Item",ដើម្បី​កំណត់​កម្រិត​ការ​រៀបចំ​ធាតុ​ត្រូវ​តែ​ជា​ធាតុ​ទិញ​ឬ​ធាតុ​កម្មន្តសាល
+apps/erpnext/erpnext/stock/doctype/item/item.py +379,"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.,ចៅហ្វាយ​គម្រោង​។
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,កុំ​បង្ហាញ​និមិត្ត​រូប​ដូចជា $ ល​ណាមួយ​ដែល​ជាប់​នឹង​រូបិយ​ប័ណ្ណ​។
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +330, (Half Day),(ពាក់​ក​ណ្តា​ល​ថ្ងៃ​)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +374, (Half Day),(ពាក់​ក​ណ្តា​ល​ថ្ងៃ​)
 DocType: Supplier,Credit Days,ថ្ងៃ​ឥណទាន
 DocType: Leave Type,Is Carry Forward,គឺ​ត្រូវ​បាន​អនុវត្ត​ទៅ​មុខ
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +478,Get Items from BOM,ទទួល​បាន​ធាតុ​ពី Bom
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Lead ពេល​ថ្ងៃ
 apps/erpnext/erpnext/config/manufacturing.py +120,Bill of Materials,វិ​ក័​យ​ប័ត្រ​នៃ​សម្ភារៈ
 DocType: Dropbox Backup,Send Notifications To,ផ្ញើ​ការ​ជូន​ដំណឹង​ដើម្បី
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html +26,Ref Date,យោង​កាលបរិច្ឆេទ
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +54,Ref Date,យោង​កាលបរិច្ឆេទ
 DocType: Employee,Reason for Leaving,ហេតុផល​សម្រាប់​ការ​ចាកចេញ
 DocType: Expense Claim Detail,Sanctioned Amount,ចំនួន​ទឹកប្រាក់​ដែល​បាន​អនុញ្ញាត
 DocType: GL Entry,Is Opening,តើ​ការ​បើក
diff --git a/erpnext/translations/kn.csv b/erpnext/translations/kn.csv
index f2579f8..b46bc90 100644
--- a/erpnext/translations/kn.csv
+++ b/erpnext/translations/kn.csv
@@ -1,13 +1,12 @@
 DocType: Employee,Salary Mode,ಸಂಬಳ ಫ್ಯಾಷನ್
 DocType: Cost Center,"Select Monthly Distribution, if you want to track based on seasonality.","ನೀವು ಋತುಗಳು ಆಧರಿಸಿ ಟ್ರ್ಯಾಕ್ ಬಯಸಿದರೆ, ಮಾಸಿಕ ವಿತರಣೆ ಆಯ್ಕೆ."
 DocType: Employee,Divorced,ವಿವಾಹವಿಚ್ಛೇದಿತ
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +86,Warning: Same item has been entered multiple times.,ಎಚ್ಚರಿಕೆ: ಒಂದೇ ಐಟಂ ಅನ್ನು ಹಲವಾರು ಬಾರಿ ನಮೂದಿಸಲಾದ.
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +80,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,ಐಟಂ ಒಂದು ವ್ಯವಹಾರದಲ್ಲಿ ಅನೇಕ ಬಾರಿ ಸೇರಿಸಬೇಕಾಗಿದೆ
 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/page/setup_wizard/fixtures/industry_type.py +19,Consumer Products,ಗ್ರಾಹಕ ಉತ್ಪನ್ನಗಳು
+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,ಮೊದಲ ಪಕ್ಷದ ಪ್ರಕಾರವನ್ನು ಆಯ್ಕೆಮಾಡಿ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +90,Annealing,ಹದಗೊಳಿಸುವಿಕೆ
 DocType: Item,Customer Items,ಗ್ರಾಹಕ ವಸ್ತುಗಳು
 apps/erpnext/erpnext/accounts/doctype/account/account.py +45,Account {0}: Parent account {1} can not be a ledger,ಖಾತೆ {0}: ಪೋಷಕರ ಖಾತೆಯ {1} ಒಂದು ಲೆಡ್ಜರ್ ಸಾಧ್ಯವಿಲ್ಲ
 DocType: Item,Publish Item to hub.erpnext.com,Hub.erpnext.com ಗೆ ಐಟಂ ಪ್ರಕಟಿಸಿ
@@ -20,15 +19,14 @@
 DocType: About Us Settings,Website,ವೆಬ್ಸೈಟ್
 DocType: POS Profile,Applicable for User,ಬಳಕೆದಾರ ಅನ್ವಯಿಸುವುದಿಲ್ಲ
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +169,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","ನಿಲ್ಲಿಸಿತು ಪ್ರೊಡಕ್ಷನ್ ಆರ್ಡರ್ ರದ್ದುಗೊಳಿಸಲಾಗದು, ರದ್ದು ಮೊದಲು ಅಡ್ಡಿಯಾಗಿರುವುದನ್ನು ಬಿಡಿಸು"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +23,Compaction plus sintering,ಒತ್ತಡದಿಂದ ಜೊತೆಗೆ ಹೆಪ್ಪುಗಟ್ಟಿಸಿ
 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.,* ಲೆಕ್ಕಾಚಾರ ಮಾಡಲಾಗುತ್ತದೆ ವ್ಯವಹಾರದಲ್ಲಿ ಆಗಿದೆ .
 DocType: Purchase Order,Customer Contact,ಗ್ರಾಹಕ ಸಂಪರ್ಕ
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +549,From Material Request,ಮೆಟೀರಿಯಲ್ ವಿನಂತಿ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +572,From Material Request,ಮೆಟೀರಿಯಲ್ ವಿನಂತಿ
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} ಟ್ರೀ
 DocType: Job Applicant,Job Applicant,ಜಾಬ್ ಸಂ
 apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,ಹೆಚ್ಚು ಫಲಿತಾಂಶಗಳು.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +78,Legal,ಕಾನೂನಿನ
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +34,Legal,ಕಾನೂನಿನ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +114,Actual type tax cannot be included in Item rate in row {0},ನಿಜವಾದ ರೀತಿಯ ತೆರಿಗೆ ಸತತವಾಗಿ ಐಟಂ ದರದಲ್ಲಿ ಸೇರಿಸಲಾಗಿದೆ ಸಾಧ್ಯವಿಲ್ಲ {0}
 DocType: C-Form,Customer,ಗಿರಾಕಿ
 DocType: Purchase Receipt Item,Required By,ಅಗತ್ಯವಿರುತ್ತದೆ
@@ -43,7 +41,6 @@
 DocType: Manufacturing Settings,Default 10 mins,10 ನಿಮಿಷಗಳು ಡೀಫಾಲ್ಟ್
 DocType: Leave Type,Leave Type Name,TypeName ಬಿಡಿ
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +148,Series Updated Successfully,ಸರಣಿ ಯಶಸ್ವಿಯಾಗಿ ನವೀಕರಿಸಲಾಗಿದೆ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +150,Stitching,ಹೊಲಿಗೆ
 DocType: Pricing Rule,Apply On,ಅನ್ವಯಿಸುತ್ತದೆ
 DocType: Item Price,Multiple Item prices.,ಬಹು ಐಟಂ ಬೆಲೆಗಳು .
 ,Purchase Order Items To Be Received,ಸ್ವೀಕರಿಸಬೇಕು ಪರ್ಚೇಸ್ ಆರ್ಡರ್ ಐಟಂಗಳು
@@ -51,8 +48,8 @@
 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 +104,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 +189,New Leave Application,ಹೊಸ ರಜೆ ಅಪ್ಲಿಕೇಶನ್
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +134,Bank Draft,ಬ್ಯಾಂಕ್ ಡ್ರಾಫ್ಟ್
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +204,New Leave Application,ಹೊಸ ರಜೆ ಅಪ್ಲಿಕೇಶನ್
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +134,Bank Draft,ಬ್ಯಾಂಕ್ ಡ್ರಾಫ್ಟ್
 DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,1 ಬುದ್ಧಿವಂತ ಗ್ರಾಹಕ ಐಟಂ ಕೋಡ್ ನಿರ್ವಹಿಸಲು ಮತ್ತು ತಮ್ಮ ಕೋಡ್ ಬಳಕೆ ಈ ಆಯ್ಕೆಯನ್ನು ಆಧರಿಸಿ ಅವುಗಳನ್ನು ಹುಡುಕಲು ಸುಲಭವಾಗುವಂತೆ
 DocType: Mode of Payment Account,Mode of Payment Account,ಪಾವತಿ ಖಾತೆಯಿಂದ ಮೋಡ್
 apps/erpnext/erpnext/stock/doctype/item/item.js +34,Show Variants,ತೋರಿಸು ಮಾರ್ಪಾಟುಗಳು
@@ -64,25 +61,23 @@
 DocType: Production Plan Item,Production Plan Item,ನಿರ್ಮಾಣ ವೇಳಾಪಟ್ಟಿಯು ಐಟಂ
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +141,User {0} is already assigned to Employee {1},ಬಳಕೆದಾರ {0} ಈಗಾಗಲೇ ನೌಕರರ ನಿಗದಿಪಡಿಸಲಾಗಿದೆ {1}
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +13,Make new POS Profile,ಹೊಸ ಪಿಓಎಸ್ ವಿವರ ಮಾಡಿ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +31,Health Care,ಆರೋಗ್ಯ
+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 +494,Invoice,ಸರಕುಪಟ್ಟಿ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +519,Invoice,ಸರಕುಪಟ್ಟಿ
 DocType: Maintenance Schedule Item,Periodicity,ನಿಯತಕಾಲಿಕತೆ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +357,Email Address,ಇಮೇಲ್ ವಿಳಾಸ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +21,Defense,ರಕ್ಷಣೆ
+apps/erpnext/erpnext/public/js/setup_wizard.js +107,Email Address,ಇಮೇಲ್ ವಿಳಾಸ
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,ರಕ್ಷಣೆ
 DocType: Company,Abbr,ರದ್ದು
 DocType: Appraisal Goal,Score (0-5),ಸ್ಕೋರ್ ( 0-5 )
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +193,Row {0}: {1} {2} does not match with {3},ಸಾಲು {0}: {1} {2} ಹೊಂದಿಕೆಯಾಗುವುದಿಲ್ಲ {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +67,Row # {0}:,ರೋ # {0}:
 DocType: Delivery Note,Vehicle No,ವಾಹನ ನಂ
 apps/erpnext/erpnext/public/js/pos/pos.js +528,Please select Price List,ಬೆಲೆ ಪಟ್ಟಿ ಆಯ್ಕೆ ಮಾಡಿ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +162,Woodworking,ಮರಗೆಲಸ
 DocType: Production Order Operation,Work In Progress,ಪ್ರಗತಿಯಲ್ಲಿದೆ ಕೆಲಸ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +153,3D printing,3D ಮುದ್ರಣ
 DocType: Employee,Holiday List,ಹಾಲಿಡೇ ಪಟ್ಟಿ
 DocType: Time Log,Time Log,ಟೈಮ್ ಲಾಗ್
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +530,Accountant,ಅಕೌಂಟೆಂಟ್
+apps/erpnext/erpnext/public/js/setup_wizard.js +274,Accountant,ಅಕೌಂಟೆಂಟ್
 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.","ಚಟುವಟಿಕೆಗಳು ಲಾಗ್, ಬಿಲ್ಲಿಂಗ್ ಸಮಯ ಟ್ರ್ಯಾಕ್ ಬಳಸಬಹುದಾದ ಕಾರ್ಯಗಳು ಬಳಕೆದಾರರ ನಡೆಸಿದ."
@@ -98,18 +93,19 @@
 DocType: Bin,Quantity Requested for Purchase,ಖರೀದಿ ಮನವಿ ಪ್ರಮಾಣ
 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/setup/page/setup_wizard/setup_wizard.js +626,Kg,ಕೆಜಿ
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Kg,ಕೆಜಿ
 apps/erpnext/erpnext/config/hr.py +48,Opening for a Job.,ಕೆಲಸ ತೆರೆಯುತ್ತಿದೆ .
 DocType: Item Attribute,Increment,ಹೆಚ್ಚಳವನ್ನು
 apps/erpnext/erpnext/public/js/stock_analytics.js +63,Select Warehouse...,ವೇರ್ಹೌಸ್ ಆಯ್ಕೆ ...
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +6,Advertising,ಜಾಹೀರಾತು
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,ಜಾಹೀರಾತು
+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/doctype/sales_invoice/sales_invoice.py +389,Stock cannot be updated against Delivery Note {0},ಸ್ಟಾಕ್ ಡೆಲಿವರಿ ಗಮನಿಸಿ ವಿರುದ್ಧ ನವೀಕರಿಸಲಾಗುವುದಿಲ್ಲ {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +391,Stock cannot be updated against Delivery Note {0},ಸ್ಟಾಕ್ ಡೆಲಿವರಿ ಗಮನಿಸಿ ವಿರುದ್ಧ ನವೀಕರಿಸಲಾಗುವುದಿಲ್ಲ {0}
 DocType: Payment Reconciliation,Reconcile,ರಾಜಿ ಮಾಡಿಸು
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +30,Grocery,ದಿನಸಿ
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,ದಿನಸಿ
 DocType: Quality Inspection Reading,Reading 1,1 ಓದುವಿಕೆ
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Make Bank Entry,ಬ್ಯಾಂಕ್ ಎಂಟ್ರಿ ಮಾಡಿ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +40,Pension Funds,ಪಿಂಚಣಿ ನಿಧಿಗಳು
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,ಪಿಂಚಣಿ ನಿಧಿಗಳು
 apps/erpnext/erpnext/accounts/doctype/account/account.py +142,Warehouse is mandatory if account type is Warehouse,ಖಾತೆಯನ್ನು ರೀತಿಯ ವೇರ್ಹೌಸ್ ವೇಳೆ ವೇರ್ಹೌಸ್ ಕಡ್ಡಾಯ
 DocType: SMS Center,All Sales Person,ಎಲ್ಲಾ ಮಾರಾಟಗಾರನ
 DocType: Lead,Person Name,ವ್ಯಕ್ತಿ ಹೆಸರು
@@ -131,7 +127,7 @@
 DocType: Quality Inspection,Get Specification Details,ವಿಶಿಷ್ಟ ವಿವರಗಳನ್ನು ಪಡೆಯಲು
 DocType: Lead,Interested,ಆಸಕ್ತಿ
 apps/erpnext/erpnext/config/manufacturing.py +14,Bill of Material,ಮೆಟೀರಿಯಲ್ ಬಿಲ್
-apps/erpnext/erpnext/public/js/stock_analytics.js +45,Opening,ಆರಂಭಿಕ
+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,ಐಟಂ ಗುಂಪಿನಿಂದ ನಕಲಿಸಿ
 DocType: Journal Entry,Opening Entry,ಎಂಟ್ರಿ ತೆರೆಯುವ
@@ -145,23 +141,22 @@
 DocType: Employee Education,Under Graduate,ಸ್ನಾತಕಪೂರ್ವ ವಿದ್ಯಾರ್ಥಿ
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +22,Target On,ಟಾರ್ಗೆಟ್ ರಂದು
 DocType: BOM,Total Cost,ಒಟ್ಟು ವೆಚ್ಚ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +99,Reaming,Reaming
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +9,Activity Log:,ಚಟುವಟಿಕೆ ಲಾಗ್ :
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +199,Item {0} does not exist in the system or has expired,ಐಟಂ {0} ವ್ಯವಸ್ಥೆಯ ಅಸ್ತಿತ್ವದಲ್ಲಿಲ್ಲ ಅಥವಾ ಮುಗಿದಿದೆ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +44,Real Estate,ಸ್ಥಿರಾಸ್ತಿ
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +44,Real Estate,ಸ್ಥಿರಾಸ್ತಿ
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +4,Statement of Account,ಖಾತೆ ಹೇಳಿಕೆ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +41,Pharmaceuticals,ಫಾರ್ಮಾಸ್ಯುಟಿಕಲ್ಸ್
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,ಫಾರ್ಮಾಸ್ಯುಟಿಕಲ್ಸ್
 DocType: Expense Claim Detail,Claim Amount,ಹಕ್ಕು ಪ್ರಮಾಣವನ್ನು
 DocType: Employee,Mr,ಶ್ರೀ
 DocType: Custom Script,Client,ಕಕ್ಷಿಗಾರ
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,ಸರಬರಾಜುದಾರ ಟೈಪ್ / ಸರಬರಾಜುದಾರ
 DocType: Naming Series,Prefix,ಮೊದಲೇ ಜೋಡಿಸು
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Consumable,ಉಪಭೋಗ್ಯ
+apps/erpnext/erpnext/public/js/setup_wizard.js +359,Consumable,ಉಪಭೋಗ್ಯ
 DocType: Upload Attendance,Import Log,ಆಮದು ಲಾಗ್
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.js +19,Send,ಕಳುಹಿಸು
 DocType: Sales Invoice Item,Delivered By Supplier,ಸರಬರಾಜುದಾರ ವಿತರಣೆ
 DocType: SMS Center,All Contact,ಎಲ್ಲಾ ಸಂಪರ್ಕಿಸಿ
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +164,Annual Salary,ವಾರ್ಷಿಕ ಸಂಬಳ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +164,Annual Salary,ವಾರ್ಷಿಕ ಸಂಬಳ
 DocType: Period Closing Voucher,Closing Fiscal Year,ಹಣಕಾಸಿನ ವರ್ಷ ಕ್ಲೋಸಿಂಗ್
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +69,Stock Expenses,ಸ್ಟಾಕ್ ವೆಚ್ಚಗಳು
 DocType: Newsletter,Email Sent?,ಕಳುಹಿಸಲಾದ ಇಮೇಲ್ ?
@@ -169,7 +164,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +92,Show Time Logs,ಟೈಮ್ ತೋರಿಸಿ ದಾಖಲೆಗಳು
 DocType: Journal Entry Account,Credit in Company Currency,ಕಂಪನಿ ಕರೆನ್ಸಿ ಕ್ರೆಡಿಟ್
 DocType: Delivery Note,Installation Status,ಅನುಸ್ಥಾಪನ ಸ್ಥಿತಿಯನ್ನು
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +115,Accepted + Rejected Qty must be equal to Received quantity for Item {0},ಅಕ್ಸೆಪ್ಟೆಡ್ + ತಿರಸ್ಕರಿಸಲಾಗಿದೆ ಪ್ರಮಾಣ ಐಟಂ ಸ್ವೀಕರಿಸಲಾಗಿದೆ ಪ್ರಮಾಣಕ್ಕೆ ಸಮ ಇರಬೇಕು {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +118,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 +133,Item {0} must be a Purchase Item,ಐಟಂ {0} ಖರೀದಿಸಿ ಐಟಂ ಇರಬೇಕು
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
@@ -177,19 +172,17 @@
  ಆಯ್ಕೆ ಅವಧಿಯಲ್ಲಿ ಎಲ್ಲ ದಿನಾಂಕಗಳು ಮತ್ತು ನೌಕರ ಸಂಯೋಜನೆಯನ್ನು ಅಸ್ತಿತ್ವದಲ್ಲಿರುವ ಹಾಜರಾತಿ ದಾಖಲೆಗಳು, ಟೆಂಪ್ಲೇಟ್ ಬರುತ್ತದೆ"
 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 +493,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","ಸತತವಾಗಿ ತೆರಿಗೆ ಸೇರಿಸಲು {0} ಐಟಂ ಪ್ರಮಾಣದಲ್ಲಿ , ಸಾಲುಗಳಲ್ಲಿ ತೆರಿಗೆ {1} , ಎಂದು ಸೇರಿಸಲೇಬೇಕು"
+apps/erpnext/erpnext/controllers/accounts_controller.py +494,"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 +90,Settings for HR Module,ಮಾನವ ಸಂಪನ್ಮೂಲ ಮಾಡ್ಯೂಲ್ ಸೆಟ್ಟಿಂಗ್ಗಳು
 DocType: SMS Center,SMS Center,ಸಂಚಿಕೆ ಸೆಂಟರ್
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +78,Straightening,ನೇರವಾಗಿ
 DocType: BOM Replace Tool,New BOM,ಹೊಸ BOM
 apps/erpnext/erpnext/config/projects.py +28,Batch Time Logs for billing.,ಬ್ಯಾಚ್ ಬಿಲ್ಲಿಂಗ್ ಟೈಮ್ ದಾಖಲೆಗಳು.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +15,Countergravity casting,Countergravity ಎರಕದ
 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/setup/page/setup_wizard/fixtures/industry_type.py +14,Broadcasting,ಬ್ರಾಡ್ಕಾಸ್ಟಿಂಗ್
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +140,Execution,ಎಕ್ಸಿಕ್ಯೂಶನ್
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +364,The first user will become the System Manager (you can change this later).,ವ್ಯವಸ್ಥೆ ನಿರ್ವಾಹಕರಾಗುತ್ತೀರಿ ಮೊದಲ ಬಳಕೆದಾರ (ನೀವು ನಂತರ ಬದಲಾಯಿಸಬಹುದು).
+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/public/js/setup_wizard.js +114,The first user will become the System Manager (you can change this later).,ವ್ಯವಸ್ಥೆ ನಿರ್ವಾಹಕರಾಗುತ್ತೀರಿ ಮೊದಲ ಬಳಕೆದಾರ (ನೀವು ನಂತರ ಬದಲಾಯಿಸಬಹುದು).
 apps/erpnext/erpnext/config/manufacturing.py +39,Details of the operations carried out.,ಕಾರ್ಯಾಚರಣೆಗಳ ವಿವರಗಳು ನಡೆಸಿತು.
 DocType: Serial No,Maintenance Status,ನಿರ್ವಹಣೆ ಸ್ಥಿತಿಯನ್ನು
 apps/erpnext/erpnext/config/stock.py +263,Items and Pricing,ಐಟಂಗಳನ್ನು ಮತ್ತು ಬೆಲೆ
@@ -206,7 +199,6 @@
 DocType: Pricing Rule,Discount on Price List Rate (%),ದರ ಪಟ್ಟಿ ದರ ರಿಯಾಯಿತಿ (%)
 apps/frappe/frappe/public/js/frappe/form/print.js +96,Start,ಪ್ರಾರಂಭ
 DocType: User,First Name,ಮೊದಲ ಹೆಸರು
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +12,Full-mold casting,ಪೂರ್ಣ ಅಚ್ಚು ಎರಕದ
 DocType: Offer Letter,Select Terms and Conditions,ಆಯ್ಕೆ ನಿಯಮಗಳು ಮತ್ತು ನಿಯಮಗಳು
 DocType: Production Planning Tool,Sales Orders,ಮಾರಾಟ ಆದೇಶಗಳಿಗೆ
 DocType: Purchase Taxes and Charges,Valuation,ಬೆಲೆಕಟ್ಟುವಿಕೆ
@@ -218,8 +210,7 @@
 DocType: Bank Reconciliation,Bank Account,ಠೇವಣಿ ವಿವರ
 DocType: Leave Type,Allow Negative Balance,ನಕಾರಾತ್ಮಕ ಬ್ಯಾಲೆನ್ಸ್ ಅನುಮತಿಸಿ
 DocType: Selling Settings,Default Territory,ಡೀಫಾಲ್ಟ್ ಪ್ರದೇಶ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +53,Television,ಟೆಲಿವಿಷನ್
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +138,Gashing,Gashing
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,ಟೆಲಿವಿಷನ್
 DocType: Production Order Operation,Updated via 'Time Log','ಟೈಮ್ ಲಾಗ್' ಮೂಲಕ ಅಪ್ಡೇಟ್ಗೊಳಿಸಲಾಗಿದೆ
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +82,Account {0} does not belong to Company {1},ಖಾತೆ {0} ಕಂಪನಿ ಸೇರುವುದಿಲ್ಲ {1}
 DocType: Naming Series,Series List for this Transaction,ಈ ಟ್ರಾನ್ಸಾಕ್ಷನ್ ಸರಣಿ ಪಟ್ಟಿ
@@ -234,14 +225,13 @@
 DocType: Leave Allocation,Add unused leaves from previous allocations,ಹಿಂದಿನ ಹಂಚಿಕೆಗಳು ರಿಂದ ಬಳಕೆಯಾಗದ ಎಲೆಗಳು ಸೇರಿಸಿ
 apps/erpnext/erpnext/controllers/recurring_document.py +206,Next Recurring {0} will be created on {1},ಮುಂದಿನ ಮರುಕಳಿಸುವ {0} ಮೇಲೆ ನಿರ್ಮಿಸಲಾಗುತ್ತದೆ {1}
 DocType: Newsletter List,Total Subscribers,ಒಟ್ಟು ಚಂದಾದಾರರು
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +575,Contact Name,ಸಂಪರ್ಕಿಸಿ ಹೆಸರು
+,Contact Name,ಸಂಪರ್ಕಿಸಿ ಹೆಸರು
 DocType: Production Plan Item,SO Pending Qty,ಆದ್ದರಿಂದ ಬಾಕಿ ಪ್ರಮಾಣ
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,ಮೇಲೆ ತಿಳಿಸಿದ ಮಾನದಂಡಗಳನ್ನು ಸಂಬಳ ಸ್ಲಿಪ್ ರಚಿಸುತ್ತದೆ .
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,ಖರೀದಿ ವಿನಂತಿ .
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +107,Double housing,ಡಬಲ್ ವಸತಿ
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +156,Only the selected Leave Approver can submit this Leave Application,ಕೇವಲ ಆಯ್ದ ಲೀವ್ ಅನುಮೋದಕ ಈ ರಜೆ ಅಪ್ಲಿಕೇಶನ್ ಸಲ್ಲಿಸಬಹುದು
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +171,Only the selected Leave Approver can submit this Leave Application,ಕೇವಲ ಆಯ್ದ ಲೀವ್ ಅನುಮೋದಕ ಈ ರಜೆ ಅಪ್ಲಿಕೇಶನ್ ಸಲ್ಲಿಸಬಹುದು
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,ದಿನಾಂಕ ನಿವಾರಿಸುವ ಸೇರುವ ದಿನಾಂಕ ಹೆಚ್ಚಿನ ಇರಬೇಕು
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +172,Leaves per Year,ವರ್ಷಕ್ಕೆ ಎಲೆಗಳು
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +172,Leaves per Year,ವರ್ಷಕ್ಕೆ ಎಲೆಗಳು
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup > Settings > Naming Series,{0} ಸೆಟಪ್&gt; ಸೆಟ್ಟಿಂಗ್ಗಳು ಮೂಲಕ&gt; ಹೆಸರಿಸುವ ಸರಣಿಯ ಸರಣಿ ಹೆಸರಿಸುವ ಹೊಂದಿಸಿ
 DocType: Time Log,Will be updated when batched.,Batched ಮಾಡಿದಾಗ ನವೀಕರಿಸಲಾಗುತ್ತದೆ.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +104,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,ಸಾಲು {0}: ಪರಿಶೀಲಿಸಿ ಖಾತೆ ವಿರುದ್ಧ 'ಅಡ್ವಾನ್ಸ್ ಈಸ್' {1} ಈ ಮುಂಗಡ ಪ್ರವೇಶ ವೇಳೆ.
@@ -250,25 +240,24 @@
 DocType: Item Website Specification,Item Website Specification,ವಸ್ತು ವಿಶೇಷತೆಗಳು ವೆಬ್ಸೈಟ್
 DocType: Dropbox Backup,Dropbox Access Key,ಡ್ರಾಪ್ಬಾಕ್ಸ್ ಪ್ರವೇಶ ಕೀ
 DocType: Payment Tool,Reference No,ಉಲ್ಲೇಖ ಯಾವುದೇ
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +348,Leave Blocked,ಬಿಡಿ ನಿರ್ಬಂಧಿಸಿದ
-apps/erpnext/erpnext/stock/doctype/item/item.py +535,Item {0} has reached its end of life on {1},ಐಟಂ {0} ಜೀವನದ ತನ್ನ ಕೊನೆಯಲ್ಲಿ ತಲುಪಿದೆ {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +392,Leave Blocked,ಬಿಡಿ ನಿರ್ಬಂಧಿಸಿದ
+apps/erpnext/erpnext/stock/doctype/item/item.py +539,Item {0} has reached its end of life on {1},ಐಟಂ {0} ಜೀವನದ ತನ್ನ ಕೊನೆಯಲ್ಲಿ ತಲುಪಿದೆ {1}
 apps/erpnext/erpnext/accounts/utils.py +339,Annual,ವಾರ್ಷಿಕ
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,ಸ್ಟಾಕ್ ಸಾಮರಸ್ಯ ಐಟಂ
 DocType: Stock Entry,Sales Invoice No,ಮಾರಾಟದ ಸರಕುಪಟ್ಟಿ ನಂ
 DocType: Material Request Item,Min Order Qty,ಮಿನ್ ಪ್ರಮಾಣ ಆದೇಶ
 DocType: Lead,Do Not Contact,ಸಂಪರ್ಕಿಸಿ ಇಲ್ಲ
 DocType: Sales Invoice,The unique id for tracking all recurring invoices. It is generated on submit.,ಎಲ್ಲಾ ಮರುಕಳಿಸುವ ಇನ್ವಾಯ್ಸ್ ಟ್ರ್ಯಾಕ್ ಅನನ್ಯ ID . ಇದು ಸಲ್ಲಿಸಲು ಮೇಲೆ ಉತ್ಪಾದಿಸಲಾಗುತ್ತದೆ.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +93,Software Developer,ಸಾಫ್ಟ್ವೇರ್ ಡೆವಲಪರ್
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +93,Software Developer,ಸಾಫ್ಟ್ವೇರ್ ಡೆವಲಪರ್
 DocType: Item,Minimum Order Qty,ಕನಿಷ್ಠ ಪ್ರಮಾಣ ಆದೇಶ
 DocType: Pricing Rule,Supplier Type,ಸರಬರಾಜುದಾರ ಪ್ರಕಾರ
 DocType: Item,Publish in Hub,ಹಬ್ ಪ್ರಕಟಿಸಿ
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +555,Item {0} is cancelled,ಐಟಂ {0} ರದ್ದು
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +598,Material Request,ಮೆಟೀರಿಯಲ್ ವಿನಂತಿ
+apps/erpnext/erpnext/stock/doctype/item/item.py +559,Item {0} is cancelled,ಐಟಂ {0} ರದ್ದು
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +607,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},ಖರೀದಿ ಆದೇಶದ &#39;ಕಚ್ಚಾ ವಸ್ತುಗಳ ಸರಬರಾಜು ಕೋಷ್ಟಕದಲ್ಲಿ ಕಂಡುಬಂದಿಲ್ಲ ಐಟಂ {0} {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +129,Wire brushing,ವೈರ್ ಹಲ್ಲುಜ್ಜುವುದು
 DocType: Employee,Relation,ರಿಲೇಶನ್
 DocType: Shipping Rule,Worldwide Shipping,ವಿಶ್ವಾದ್ಯಂತ ಹಡಗು
 apps/erpnext/erpnext/config/selling.py +23,Confirmed orders from Customers.,ಗ್ರಾಹಕರಿಂದ ಕನ್ಫರ್ಮ್ಡ್ ಆದೇಶಗಳನ್ನು .
@@ -284,12 +273,11 @@
 DocType: Supplier,Address HTML,ವಿಳಾಸ ಎಚ್ಟಿಎಮ್ಎಲ್
 DocType: Lead,Mobile No.,ಮೊಬೈಲ್ ಸಂಖ್ಯೆ
 DocType: Maintenance Schedule,Generate Schedule,ವೇಳಾಪಟ್ಟಿ ರಚಿಸಿ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +81,Hubbing,Hubbing
 DocType: Purchase Invoice Item,Expense Head,ಖರ್ಚು ಹೆಡ್
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +86,Please select Charge Type first,ಮೊದಲ ಬ್ಯಾಚ್ ಪ್ರಕಾರವನ್ನು ಆಯ್ಕೆ ಮಾಡಿ
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,ಇತ್ತೀಚಿನ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +395,Max 5 characters,ಮ್ಯಾಕ್ಸ್ 5 ಪಾತ್ರಗಳು
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +195,Select Your Language,ನಿಮ್ಮ ಭಾಷೆಯನ್ನು ಆಯ್ಕೆ
+apps/erpnext/erpnext/public/js/setup_wizard.js +143,Max 5 characters,ಮ್ಯಾಕ್ಸ್ 5 ಪಾತ್ರಗಳು
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +245,Select Your Language,ನಿಮ್ಮ ಭಾಷೆಯನ್ನು ಆಯ್ಕೆ
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,ಪಟ್ಟಿಯಲ್ಲಿ ಮೊದಲ ಲೀವ್ ಅನುಮೋದಕ ಡೀಫಾಲ್ಟ್ ಲೀವ್ ಅನುಮೋದಕ ಎಂದು ಸೆಟ್ ಮಾಡಲಾಗುತ್ತದೆ
 DocType: Manufacturing Settings,"Disables creation of time logs against Production Orders.
 Operations shall not be tracked against Production Order",ಪ್ರೊಡಕ್ಷನ್ ಆದೇಶದ ವಿರುದ್ಧ ಸಮಯ ದಾಖಲೆಗಳು ಸೃಷ್ಟಿ ನಿಷ್ಕ್ರಿಯಗೊಳಿಸುತ್ತದೆ. ಕಾರ್ಯಾಚರಣೆ ಪ್ರೊಡಕ್ಷನ್ ಆರ್ಡರ್ ವಿರುದ್ಧ ಟ್ರ್ಯಾಕ್ ಸಾಧ್ಯವಿಲ್ಲ ಹಾಗಿಲ್ಲ
@@ -301,8 +289,6 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +34,Item {0} must be Service Item,ಐಟಂ {0} ಸೇವೆ ಐಟಂ ಇರಬೇಕು
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +303,Completed Qty can not be greater than 'Qty to Manufacture',ಹೆಚ್ಚು 'ಪ್ರಮಾಣ ತಯಾರಿಸಲು' ಮುಗಿದಿದೆ ಪ್ರಮಾಣ ಹೆಚ್ಚಾಗಿರುವುದು ಸಾಧ್ಯವಿಲ್ಲ
 DocType: DocType,Administrator,ನಿರ್ವಾಹಕ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +136,Laser drilling,ಲೇಸರ್ ಕೊರೆಯುವ
-DocType: Stock UOM Replace Utility,New Stock UOM,ಹೊಸ ಸ್ಟಾಕ್ UOM
 DocType: Period Closing Voucher,Closing Account Head,ಖಾತೆ ಮುಚ್ಚುವಿಕೆಗೆ ಹೆಡ್
 DocType: Employee,External Work History,ಬಾಹ್ಯ ಕೆಲಸ ಇತಿಹಾಸ
 apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,ಸುತ್ತೋಲೆ ಆಧಾರದೋಷ
@@ -311,18 +297,15 @@
 DocType: Lead,Industry,ಇಂಡಸ್ಟ್ರಿ
 DocType: Employee,Job Profile,ಜಾಬ್ ಪ್ರೊಫೈಲ್ಗಳು
 DocType: Newsletter,Newsletter,ಸುದ್ದಿಪತ್ರ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +84,Hydroforming,Hydroforming
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +49,Necking,ನೆಕ್ಕಿಂಗ್
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,ಸ್ವಯಂಚಾಲಿತ ವಸ್ತು ವಿನಂತಿಯನ್ನು ಸೃಷ್ಟಿ ಮೇಲೆ ಈಮೇಲ್ ಸೂಚಿಸಿ
 DocType: Journal Entry,Multi Currency,ಮಲ್ಟಿ ಕರೆನ್ಸಿ
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +51,Item is updated,ಐಟಂ ಅಪ್ಡೇಟ್ಗೊಳಿಸಲಾಗಿದೆ ಇದೆ
 DocType: Async Task,System Manager,ವ್ಯವಸ್ಥೆ ಮ್ಯಾನೇಜರ್
 DocType: Payment Reconciliation Invoice,Invoice Type,ಸರಕುಪಟ್ಟಿ ಪ್ರಕಾರ
 DocType: Sales Invoice Item,Delivery Note,ಡೆಲಿವರಿ ಗಮನಿಸಿ
 DocType: Dropbox Backup,Allow Dropbox Access,ಡ್ರಾಪ್ಬಾಕ್ಸ್ ಅನುಮತಿಸಬಹುದು
 apps/erpnext/erpnext/config/learn.py +72,Setting up Taxes,ತೆರಿಗೆಗಳು ಹೊಂದಿಸಲಾಗುತ್ತಿದೆ
 apps/erpnext/erpnext/accounts/utils.py +189,Payment Entry has been modified after you pulled it. Please pull it again.,ನೀವು ಹೊರಹಾಕಿದ ನಂತರ ಪಾವತಿ ಎಂಟ್ರಿ ಮಾರ್ಪಡಿಸಲಾಗಿದೆ. ಮತ್ತೆ ಎಳೆಯಲು ದಯವಿಟ್ಟು.
-apps/erpnext/erpnext/stock/doctype/item/item.py +343,{0} entered twice in Item Tax,{0} ಐಟಂ ತೆರಿಗೆ ಎರಡು ಬಾರಿ ಪ್ರವೇಶಿಸಿತು
+apps/erpnext/erpnext/stock/doctype/item/item.py +347,{0} entered twice in Item Tax,{0} ಐಟಂ ತೆರಿಗೆ ಎರಡು ಬಾರಿ ಪ್ರವೇಶಿಸಿತು
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +105,Summary for this week and pending activities,ಈ ವಾರ ಬಾಕಿ ಚಟುವಟಿಕೆಗಳಿಗೆ ಸಾರಾಂಶ
 DocType: Workstation,Rent Cost,ಬಾಡಿಗೆ ವೆಚ್ಚ
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +74,Please select month and year,ತಿಂಗಳು ವರ್ಷದ ಆಯ್ಕೆಮಾಡಿ
@@ -339,24 +322,22 @@
 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","BOM , ಡೆಲಿವರಿ ನೋಟ್, ಖರೀದಿ ಸರಕುಪಟ್ಟಿ , ಉತ್ಪಾದನೆ ಆರ್ಡರ್ , ಆರ್ಡರ್ ಖರೀದಿಸಿ , ಖರೀದಿ ರಸೀತಿ , ಮಾರಾಟದ ಸರಕುಪಟ್ಟಿ , ಮಾರಾಟದ ಆರ್ಡರ್ , ಸ್ಟಾಕ್ ಎಂಟ್ರಿ , timesheet ಲಭ್ಯವಿದೆ"
 DocType: Item Tax,Tax Rate,ತೆರಿಗೆ ದರ
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Select Item,ಆಯ್ಕೆ ಐಟಂ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +540,Select Item,ಆಯ್ಕೆ ಐಟಂ
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +143,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","ಐಟಂ: {0} ಬ್ಯಾಚ್ ಬಲ್ಲ, ಬದಲಿಗೆ ಬಳಸಲು ಸ್ಟಾಕ್ ಎಂಟ್ರಿ \
  ಸ್ಟಾಕ್ ಸಾಮರಸ್ಯ ಬಳಸಿಕೊಂಡು ರಾಜಿ ಸಾಧ್ಯವಿಲ್ಲ ನಿರ್ವಹಿಸುತ್ತಿದ್ದ"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +259,Purchase Invoice {0} is already submitted,ಖರೀದಿ ಸರಕುಪಟ್ಟಿ {0} ಈಗಾಗಲೇ ಸಲ್ಲಿಸಿದ
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +262,Purchase Invoice {0} is already submitted,ಖರೀದಿ ಸರಕುಪಟ್ಟಿ {0} ಈಗಾಗಲೇ ಸಲ್ಲಿಸಿದ
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Batch No must be same as {1} {2},ರೋ # {0}: ಬ್ಯಾಚ್ ಯಾವುದೇ ಅದೇ ಇರಬೇಕು {1} {2}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Convert to non-Group,ಅ ಗ್ರೂಪ್ ಗೆ ಪರಿವರ್ತಿಸಿ
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +55,Purchase Receipt must be submitted,ಖರೀದಿ ರಿಸೀಟ್ನ್ನು ಸಲ್ಲಿಸಬೇಕು
-DocType: Stock UOM Replace Utility,Current Stock UOM,ಪ್ರಸ್ತುತ ಸ್ಟಾಕ್ UOM
 apps/erpnext/erpnext/config/stock.py +53,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}
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Your email address,ನಿಮ್ಮ ಈಮೇಲ್ ವಿಳಾಸ
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +194,Please see attachment,ಬಾಂಧವ್ಯ ನೋಡಿ
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +203,Please see attachment,ಬಾಂಧವ್ಯ ನೋಡಿ
 DocType: Purchase Order,% Received,% ಸ್ವೀಕರಿಸಲಾಗಿದೆ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +109,Water jet cutting,ನೀರಿನ ಜೆಟ್ ತುಂಡರಿಸುವ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +24,Setup Already Complete!!,ಈಗಾಗಲೇ ಸೆಟಪ್ ಪೂರ್ಣಗೊಳಿಸಲು!
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +20,Setup Already Complete!!,ಈಗಾಗಲೇ ಸೆಟಪ್ ಪೂರ್ಣಗೊಳಿಸಲು!
 ,Finished Goods,ಪೂರ್ಣಗೊಂಡ ಸರಕನ್ನು
 DocType: Delivery Note,Instructions,ಸೂಚನೆಗಳು
 DocType: Quality Inspection,Inspected By,ಪರಿಶೀಲನೆ
@@ -371,6 +352,7 @@
 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,ಕರೆನ್ಸಿ ವಿನಿಮಯ
 DocType: Purchase Invoice Item,Item Name,ಐಟಂ ಹೆಸರು
+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",""" ಸ್ಟಾಕ್ ಔಟ್ "" ಇವು ವಿನಂತಿಸಿದ ಐಟಂಗಳನ್ನು ಯೋಜಿತ ಪ್ರಮಾಣ ಮತ್ತು ಕನಿಷ್ಠ ಪ್ರಮಾಣ ಆದೇಶ ಆಧರಿಸಿ ಎಲ್ಲಾ ಗೋದಾಮುಗಳು ಪರಿಗಣಿಸಿ"
@@ -380,11 +362,10 @@
 ,Purchase Register,ಖರೀದಿ ನೋಂದಣಿ
 DocType: Landed Cost Item,Applicable Charges,ಅನ್ವಯಿಸುವ ಆರೋಪಗಳನ್ನು
 DocType: Workstation,Consumable Cost,ಉಪಭೋಗ್ಯ ವೆಚ್ಚ
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,{0} ({1}) must have role 'Leave Approver',{0} ({1}) ಪಾತ್ರ ಹೊಂದಿರಬೇಕು 'ಬಿಡಿ ಅನುಮೋದಕ'
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +167,{0} ({1}) must have role 'Leave Approver',{0} ({1}) ಪಾತ್ರ ಹೊಂದಿರಬೇಕು 'ಬಿಡಿ ಅನುಮೋದಕ'
 DocType: Purchase Receipt,Vehicle Date,ವಾಹನ ದಿನಾಂಕ
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +39,Medical,ವೈದ್ಯಕೀಯ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +39,Medical,ವೈದ್ಯಕೀಯ
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,ಸೋತ ಕಾರಣ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +36,Tube beading,ಟ್ಯೂಬ್ ಮಣಿ ಪೋಣಿಸುವುದುಎಂದು
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},ಕಾರ್ಯಸ್ಥಳ ಹಾಲಿಡೇ ಪಟ್ಟಿ ಪ್ರಕಾರ ಕೆಳಗಿನ ದಿನಾಂಕಗಳಂದು ಮುಚ್ಚಲಾಗಿದೆ: {0}
 DocType: Employee,Single,ಏಕೈಕ
 DocType: Issue,Attachment,ಲಗತ್ತು
@@ -405,10 +386,8 @@
 DocType: Account,Is Group,ಗ್ರೂಪ್
 DocType: Stock Settings,Automatically Set Serial Nos based on FIFO,ಸ್ವಯಂಚಾಲಿತವಾಗಿ FIFO ಆಧರಿಸಿ ನಾವು ಸೀರಿಯಲ್ ಹೊಂದಿಸಿ
 DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,ಚೆಕ್ ಸರಬರಾಜುದಾರ ಸರಕುಪಟ್ಟಿ ಸಂಖ್ಯೆ ವೈಶಿಷ್ಟ್ಯ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +31,Thermoforming,ಥರ್ಮೋಫಾರ್ಮಿಂಗ್
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +66,Slitting,Slitting
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +57,'To Case No.' cannot be less than 'From Case No.',' ನಂ ಪ್ರಕರಣಕ್ಕೆ . ' ' ಕೇಸ್ ನಂ ಗೆ . ' ಕಡಿಮೆ ಸಾಧ್ಯವಿಲ್ಲ
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +104,Non Profit,ಲಾಭಾಪೇಕ್ಷೆಯಿಲ್ಲದ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +104,Non Profit,ಲಾಭಾಪೇಕ್ಷೆಯಿಲ್ಲದ
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_list.js +7,Not Started,ಪ್ರಾರಂಭವಾಗಿಲ್ಲ
 DocType: Lead,Channel Partner,ಚಾನೆಲ್ ಸಂಗಾತಿ
 DocType: Account,Old Parent,ಓಲ್ಡ್ ಪೋಷಕ
@@ -417,13 +396,12 @@
 apps/erpnext/erpnext/config/manufacturing.py +74,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 +512,Attribute {0} selected multiple times in Attributes Table,ಗುಣಲಕ್ಷಣ {0} ಗುಣಲಕ್ಷಣಗಳು ಟೇಬಲ್ ಅನೇಕ ಬಾರಿ ಆಯ್ಕೆ
+apps/erpnext/erpnext/stock/doctype/item/item.py +516,Attribute {0} selected multiple times in Attributes Table,ಗುಣಲಕ್ಷಣ {0} ಗುಣಲಕ್ಷಣಗಳು ಟೇಬಲ್ ಅನೇಕ ಬಾರಿ ಆಯ್ಕೆ
 DocType: Sales Order,Not Applicable,ಅನ್ವಯಿಸುವುದಿಲ್ಲ
 apps/erpnext/erpnext/config/hr.py +140,Holiday master.,ಹಾಲಿಡೇ ಮಾಸ್ಟರ್ .
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +19,Shell molding,ಶೆಲ್ ಸೂರು
 DocType: Material Request Item,Required Date,ಅಗತ್ಯವಿರುವ ದಿನಾಂಕ
 DocType: Delivery Note,Billing Address,ಬಿಲ್ಲಿಂಗ್ ವಿಳಾಸ
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +644,Please enter Item Code.,ಐಟಂ ಕೋಡ್ ನಮೂದಿಸಿ.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +648,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,ಒಟ್ಟು ಪ್ರಮಾಣ
@@ -433,7 +411,7 @@
 DocType: Item Attribute,To Range,ಶ್ರೇಣಿಗೆ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,ಸೆಕ್ಯುರಿಟೀಸ್ ಮತ್ತು ನಿಕ್ಷೇಪಗಳು
 DocType: Features Setup,Imports,ಆಮದುಗಳು
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +144,Adhesive bonding,ಅಂಟುವ ಬಂಧದ
+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.,ಹಾಜರಾತಿ .
@@ -441,26 +419,25 @@
 DocType: Sales Order Item,Used for Production Plan,ಉತ್ಪಾದನೆ ಯೋಜನೆ ಉಪಯೋಗಿಸಿದ
 DocType: System Settings,Loading...,ಲೋಡ್ ಆಗುತ್ತಿದೆ ...
 DocType: DocField,Password,ಪಾಸ್ವರ್ಡ್
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +155,Fused deposition modeling,ಬೆಸೆದುಕೊಂಡ ಶೇಖರಣೆ ಮಾಡೆಲಿಂಗ್
 DocType: Manufacturing Settings,Time Between Operations (in mins),(ನಿಮಿಷಗಳು) ಕಾರ್ಯಾಚರಣೆ ನಡುವೆ ಸಮಯ
 DocType: Customer,Buyer of Goods and Services.,ಸರಕು ಮತ್ತು ಸೇವೆಗಳ ಖರೀದಿದಾರನ.
 DocType: Journal Entry,Accounts Payable,ಖಾತೆಗಳನ್ನು ಕೊಡಬೇಕಾದ
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +24,Add Subscribers,ಚಂದಾದಾರರು ಸೇರಿಸಿ
 apps/erpnext/erpnext/public/js/feature_setup.js +220,""" does not exists",""" ಅಸ್ತಿತ್ವದಲ್ಲಿಲ್ಲ"
 DocType: Pricing Rule,Valid Upto,ಮಾನ್ಯ ವರೆಗೆ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +564,List a few of your customers. They could be organizations or individuals.,ನಿಮ್ಮ ಗ್ರಾಹಕರ ಕೆಲವು ಪಟ್ಟಿ. ಅವರು ಸಂಸ್ಥೆಗಳು ಅಥವಾ ವ್ಯಕ್ತಿಗಳು ಆಗಿರಬಹುದು .
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,List a few of your customers. They could be organizations or individuals.,ನಿಮ್ಮ ಗ್ರಾಹಕರ ಕೆಲವು ಪಟ್ಟಿ. ಅವರು ಸಂಸ್ಥೆಗಳು ಅಥವಾ ವ್ಯಕ್ತಿಗಳು ಆಗಿರಬಹುದು .
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Direct Income,ನೇರ ಆದಾಯ
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +33,"Can not filter based on Account, if grouped by Account","ಖಾತೆ ವರ್ಗೀಕರಿಸಲಾದ ವೇಳೆ , ಖಾತೆ ಆಧರಿಸಿ ಫಿಲ್ಟರ್ ಸಾಧ್ಯವಿಲ್ಲ"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +88,Administrative Officer,ಆಡಳಿತಾಧಿಕಾರಿ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Administrative Officer,ಆಡಳಿತಾಧಿಕಾರಿ
 DocType: Payment Tool,Received Or Paid,ಪಡೆದಾಗ ಅಥವಾ ಪಾವತಿಸಿದಾಗ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +318,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 +305,Please enter Warehouse for which Material Request will be raised,ವೇರ್ಹೌಸ್ ವಸ್ತು ವಿನಂತಿಯನ್ನು ಏರಿಸಲಾಗುತ್ತದೆ ಇದಕ್ಕಾಗಿ ನಮೂದಿಸಿ
 DocType: Production Order,Additional Operating Cost,ಹೆಚ್ಚುವರಿ ವೆಚ್ಚವನ್ನು
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +20,Cosmetics,ಕಾಸ್ಮೆಟಿಕ್ಸ್
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,ಕಾಸ್ಮೆಟಿಕ್ಸ್
 DocType: DocField,Type,ದರ್ಜೆ
-apps/erpnext/erpnext/stock/doctype/item/item.py +417,"To merge, following properties must be same for both items","ವಿಲೀನಗೊಳ್ಳಲು , ನಂತರ ಲಕ್ಷಣಗಳು ಐಟಂಗಳನ್ನು ಸಾಮಾನ್ಯ ಇರಬೇಕು"
+apps/erpnext/erpnext/stock/doctype/item/item.py +421,"To merge, following properties must be same for both items","ವಿಲೀನಗೊಳ್ಳಲು , ನಂತರ ಲಕ್ಷಣಗಳು ಐಟಂಗಳನ್ನು ಸಾಮಾನ್ಯ ಇರಬೇಕು"
 DocType: Communication,Subject,ವಿಷಯ
 DocType: Shipping Rule,Net Weight,ನೆಟ್ ತೂಕ
 DocType: Employee,Emergency Phone,ತುರ್ತು ದೂರವಾಣಿ
@@ -470,7 +447,6 @@
 DocType: Journal Entry,Difference (Dr - Cr),ವ್ಯತ್ಯಾಸ ( ಡಾ - ಸಿಆರ್)
 DocType: Account,Profit and Loss,ಲಾಭ ಮತ್ತು ನಷ್ಟ
 apps/erpnext/erpnext/config/stock.py +293,Managing Subcontracting,ವ್ಯವಸ್ಥಾಪಕ ಉಪಗುತ್ತಿಗೆ
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +58,New UOM must NOT be of type Whole Number,ಹೊಸ UOM ಇಡೀ ಸಂಖ್ಯೆ ಇರಬಾರದು
 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 +47,Account {0} does not belong to company: {1},ಖಾತೆ {0} ಕಂಪನಿ ಸೇರುವುದಿಲ್ಲ: {1}
@@ -490,14 +466,14 @@
 DocType: Purchase Invoice,Supplier Invoice No,ಸರಬರಾಜುದಾರ ಸರಕುಪಟ್ಟಿ ನಂ
 DocType: Territory,For reference,ಪರಾಮರ್ಶೆಗಾಗಿ
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +154,"Cannot delete Serial No {0}, as it is used in stock transactions","ಅಳಿಸಿಹಾಕಲಾಗದು ಸೀರಿಯಲ್ ಯಾವುದೇ {0}, ಇದು ಸ್ಟಾಕ್ ವ್ಯವಹಾರಗಳಲ್ಲಿ ಬಳಸಲಾಗುತ್ತದೆ"
-apps/erpnext/erpnext/public/js/account_tree_grid.js +52,Closing (Cr),ಮುಚ್ಚುವ (ಸಿಆರ್)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +227,Closing (Cr),ಮುಚ್ಚುವ (ಸಿಆರ್)
 DocType: Serial No,Warranty Period (Days),ಖಾತರಿ ಕಾಲ (ದಿನಗಳು)
 DocType: Installation Note Item,Installation Note Item,ಅನುಸ್ಥಾಪನೆ ಸೂಚನೆ ಐಟಂ
 ,Pending Qty,ಬಾಕಿ ಪ್ರಮಾಣ
 DocType: Job Applicant,Thread HTML,ಥ್ರೆಡ್ ಎಚ್ಟಿಎಮ್ಎಲ್
 DocType: Company,Ignore,ಕಡೆಗಣಿಸು
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +86,SMS sent to following numbers: {0},ಎಸ್ಎಂಎಸ್ ಸಂಖ್ಯೆಗಳನ್ನು ಕಳುಹಿಸಲಾಗುತ್ತದೆ: {0}
-apps/erpnext/erpnext/controllers/buying_controller.py +135,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,ಉಪ ಒಪ್ಪಂದ ಖರೀದಿ ರಸೀತಿ ಕಡ್ಡಾಯ ಸರಬರಾಜುದಾರ ವೇರ್ಹೌಸ್
+apps/erpnext/erpnext/controllers/buying_controller.py +126,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,ಉಪ ಒಪ್ಪಂದ ಖರೀದಿ ರಸೀತಿ ಕಡ್ಡಾಯ ಸರಬರಾಜುದಾರ ವೇರ್ಹೌಸ್
 DocType: Pricing Rule,Valid From,ಮಾನ್ಯ
 DocType: Sales Invoice,Total Commission,ಒಟ್ಟು ಆಯೋಗ
 DocType: Pricing Rule,Sales Partner,ಮಾರಾಟದ ಸಂಗಾತಿ
@@ -507,7 +483,7 @@
 To distribute a budget using this distribution, set this **Monthly Distribution** in the **Cost Center**","** ಮಾಸಿಕ ವಿತರಣೆ ** ನಿಮ್ಮ ವ್ಯವಹಾರದಲ್ಲಿ ನೀವು ಋತುಗಳು ಹೊಂದಿದ್ದರೆ ನೀವು ತಿಂಗಳ ಅಡ್ಡಲಾಗಿ ನಿಮ್ಮ ಬಜೆಟ್ ವಿತರಿಸಲು ನೆರವಾಗುತ್ತದೆ.
 
 , ಈ ವಿತರಣಾ ಬಳಸಿಕೊಂಡು ಒಂದು ಬಜೆಟ್ ವಿತರಿಸಲು ** ವೆಚ್ಚ ಕೇಂದ್ರದಲ್ಲಿ ** ಈ ** ಮಾಸಿಕ ವಿತರಣೆ ಹೊಂದಿಸಲು **"
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +183,No records found in the Invoice table,ಸರಕುಪಟ್ಟಿ ಕೋಷ್ಟಕದಲ್ಲಿ ಯಾವುದೇ ದಾಖಲೆಗಳು
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +130,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 +84,Financial / accounting year.,ಹಣಕಾಸು / ಲೆಕ್ಕಪರಿಶೋಧಕ ವರ್ಷ .
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","ಕ್ಷಮಿಸಿ, ಸೀರಿಯಲ್ ಸೂಲ ವಿಲೀನಗೊಳಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ"
@@ -523,25 +499,25 @@
 DocType: Sales Order,Billing and Delivery Status,ಬಿಲ್ಲಿಂಗ್ ಮತ್ತು ಡೆಲಿವರಿ ಸ್ಥಿತಿ
 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/setup/page/setup_wizard/setup_wizard_page.html +16,Previous,ಹಿಂದಿನ
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard_page.html +16,Previous,ಹಿಂದಿನ
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +620,Sales Return,ಮಾರಾಟದ ರಿಟರ್ನ್
 DocType: Production Planning Tool,Select Sales Orders from which you want to create Production Orders.,ನೀವು ಉತ್ಪಾದನೆ ಆದೇಶಗಳನ್ನು ರಚಿಸಲು ಬಯಸುವ ಆಯ್ಕೆ ಮಾರಾಟ ಆದೇಶಗಳನ್ನು .
 DocType: Item,Delivered by Supplier (Drop Ship),ಸರಬರಾಜುದಾರ ವಿತರಣೆ (ಡ್ರಾಪ್ ಹಡಗು)
 apps/erpnext/erpnext/config/hr.py +120,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.,ಗ್ರಾಹಕ ಡೇಟಾಬೇಸ್ .
 DocType: Quotation,Quotation To,ಉದ್ಧರಣಾ
 DocType: Lead,Middle Income,ಮಧ್ಯಮ
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),ತೆರೆಯುತ್ತಿದೆ ( ಸಿಆರ್)
 apps/erpnext/erpnext/accounts/utils.py +193,Allocated amount can not be negative,ಹಂಚಿಕೆ ಪ್ರಮಾಣವನ್ನು ಋಣಾತ್ಮಕ ಇರುವಂತಿಲ್ಲ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +123,Tumbling,ಉರುಳುವ
 DocType: Purchase Order Item,Billed Amt,ಖ್ಯಾತವಾದ ಕಚೇರಿ
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,ಸ್ಟಾಕ್ ನಮೂದುಗಳನ್ನು ಮಾಡಲಾಗುತ್ತದೆ ಇದು ವಿರುದ್ಧ ತಾರ್ಕಿಕ ವೇರ್ಹೌಸ್.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +92,Reference No & Reference Date is required for {0},ರೆಫರೆನ್ಸ್ ನಂ & ರೆಫರೆನ್ಸ್ ದಿನಾಂಕ ಅಗತ್ಯವಿದೆ {0}
 DocType: Event,Wednesday,ಬುಧವಾರ
 DocType: Sales Invoice,Customer's Vendor,ಗ್ರಾಹಕರ ಮಾರಾಟಗಾರರ
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +214,Production Order is Mandatory,ಪ್ರೊಡಕ್ಷನ್ ಆರ್ಡರ್ ಕಡ್ಡಾಯ
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +139,Proposal Writing,ಪ್ರೊಪೋಸಲ್ ಬರವಣಿಗೆ
+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} ಅದೇ ನೌಕರರ ಐಡಿ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ
 apps/erpnext/erpnext/stock/stock_ledger.py +336,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},ನಿರಾಕರಣೆಗಳು ಸ್ಟಾಕ್ ದೋಷ ( {6} ) ಐಟಂ {0} ಮೇಲೆ {1} ವೇರ್ಹೌಸ್ {2} {3} ಗೆ {4} {5}
 DocType: Fiscal Year Company,Fiscal Year Company,ಹಣಕಾಸಿನ ವರ್ಷ ಕಂಪನಿ
@@ -564,7 +540,7 @@
 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/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.py +179,Please install dropbox python module,ಡ್ರಾಪ್ಬಾಕ್ಸ್ pythonModule ಅನುಸ್ಥಾಪಿಸಲು ದಯವಿಟ್ಟು
 DocType: Employee,Passport Number,ಪಾಸ್ಪೋರ್ಟ್ ಸಂಖ್ಯೆ
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +82,Manager,ವ್ಯವಸ್ಥಾಪಕ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Manager,ವ್ಯವಸ್ಥಾಪಕ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +494,From Purchase Receipt,ಖರೀದಿ ಸ್ವೀಕರಿಸಿದ
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +219,Same item has been entered multiple times.,ಅದೇ ಐಟಂ ಅನೇಕ ಬಾರಿ ನಮೂದಿಸಲಾದ.
 DocType: SMS Settings,Receiver Parameter,ಸ್ವೀಕರಿಸುವವರ ನಿಯತಾಂಕಗಳನ್ನು
@@ -572,10 +548,9 @@
 DocType: Sales Person,Sales Person Targets,ಮಾರಾಟಗಾರನ ಗುರಿ
 apps/frappe/frappe/public/js/frappe/form/workflow.js +116,To,ಗೆ
 apps/frappe/frappe/templates/base.html +145,Please enter email address,ದಯವಿಟ್ಟು ಇಮೇಲ್ ವಿಳಾಸವನ್ನು ನಮೂದಿಸಿ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +35,End tube forming,ರೂಪಿಸುವ ಎಂಡ್ ಟ್ಯೂಬ್
 DocType: Production Order Operation,In minutes,ನಿಮಿಷಗಳಲ್ಲಿ
 DocType: Issue,Resolution Date,ರೆಸಲ್ಯೂಶನ್ ದಿನಾಂಕ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +635,Please set default Cash or Bank account in Mode of Payment {0},ಪಾವತಿಯ ಮಾದರಿಯು ಡೀಫಾಲ್ಟ್ ನಗದು ಅಥವಾ ಬ್ಯಾಂಕ್ ಖಾತೆ ಸೆಟ್ ದಯವಿಟ್ಟು {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +637,Please set default Cash or Bank account in Mode of Payment {0},ಪಾವತಿಯ ಮಾದರಿಯು ಡೀಫಾಲ್ಟ್ ನಗದು ಅಥವಾ ಬ್ಯಾಂಕ್ ಖಾತೆ ಸೆಟ್ ದಯವಿಟ್ಟು {0}
 DocType: Selling Settings,Customer Naming By,ಗ್ರಾಹಕ ಹೆಸರಿಸುವ ಮೂಲಕ
 apps/erpnext/erpnext/accounts/doctype/account/account.js +67,Convert to Group,ಗ್ರೂಪ್ ಗೆ ಪರಿವರ್ತಿಸಿ
 DocType: Activity Cost,Activity Type,ಚಟುವಟಿಕೆ ವಿಧ
@@ -583,12 +558,12 @@
 DocType: Customer,Fixed Days,ಸ್ಥಿರ ಡೇಸ್
 DocType: Sales Invoice,Packing List,ಪ್ಯಾಕಿಂಗ್ ಪಟ್ಟಿ
 apps/erpnext/erpnext/config/buying.py +28,Purchase Orders given to Suppliers.,ಪೂರೈಕೆದಾರರು givenName ಗೆ ಆದೇಶಗಳನ್ನು ಖರೀದಿಸಲು .
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +43,Publishing,ಪಬ್ಲಿಷಿಂಗ್
+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 +198,{0}: {1} not found in Invoice Details table,{0}: {1} ಸರಕುಪಟ್ಟಿ ವಿವರಗಳು ಟೇಬಲ್ ಕಂಡುಬಂದಿಲ್ಲ
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,{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 +208,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,ನಿರ್ವಹಣೆ ಭೇಟಿ {0} ಈ ಮಾರಾಟದ ಆದೇಶವನ್ನು ರದ್ದುಗೊಳಿಸುವ ಮೊದಲು ರದ್ದು ಮಾಡಬೇಕು
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +203,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),ತೆರೆಯುತ್ತಿದೆ ( ಡಾ )
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},ಪೋಸ್ಟ್ ಸಮಯಮುದ್ರೆಗೆ ನಂತರ ಇರಬೇಕು {0}
@@ -600,7 +575,6 @@
 DocType: Pricing Rule,Sales Manager,ಸೇಲ್ಸ್ ಮ್ಯಾನೇಜರ್
 apps/frappe/frappe/public/js/frappe/model/model.js +492,Rename,ಹೊಸ ಹೆಸರಿಡು
 DocType: Journal Entry,Write Off Amount,ಪ್ರಮಾಣ ಆಫ್ ಬರೆಯಿರಿ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +52,Bending,ಬಾಗುವುದು
 apps/frappe/frappe/core/page/user_permissions/user_permissions.js +246,Allow User,ಬಳಕೆದಾರ ಅನುಮತಿಸಿ
 DocType: Journal Entry,Bill No,ಬಿಲ್ ನಂ
 DocType: Purchase Invoice,Quarterly,ತ್ರೈಮಾಸಿಕ
@@ -610,17 +584,16 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Please enter item details,ಐಟಂ ವಿವರಗಳು ನಮೂದಿಸಿ
 DocType: Purchase Receipt,Other Details,ಇತರೆ ವಿವರಗಳು
 DocType: Account,Accounts,ಅಕೌಂಟ್ಸ್
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +67,Marketing,ಮಾರ್ಕೆಟಿಂಗ್
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +65,Straight shearing,ನೇರ ಕತ್ತರಿಸುವ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +67,Marketing,ಮಾರ್ಕೆಟಿಂಗ್
 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/stock/doctype/purchase_receipt/purchase_receipt.py +99,Rejected Warehouse is mandatory against regected item,ತಿರಸ್ಕರಿಸಲಾಗಿದೆ ವೇರ್ಹೌಸ್ regected ಐಟಂ ವಿರುದ್ಧ ಕಡ್ಡಾಯ
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +102,Rejected Warehouse is mandatory against regected item,ತಿರಸ್ಕರಿಸಲಾಗಿದೆ ವೇರ್ಹೌಸ್ regected ಐಟಂ ವಿರುದ್ಧ ಕಡ್ಡಾಯ
 DocType: Account,Expenses Included In Valuation,ವೆಚ್ಚಗಳು ಮೌಲ್ಯಾಂಕನ ಸೇರಿಸಲಾಗಿದೆ
 DocType: Employee,Provide email id registered in company,ಕಂಪನಿಗಳು ನೋಂದಣಿ ಇಮೇಲ್ ಐಡಿ ಒದಗಿಸಿ
 DocType: Hub Settings,Seller City,ಮಾರಾಟಗಾರ ಸಿಟಿ
 DocType: Email Digest,Next email will be sent on:,ಮುಂದೆ ಇಮೇಲ್ ಮೇಲೆ ಕಳುಹಿಸಲಾಗುವುದು :
 DocType: Offer Letter Term,Offer Letter Term,ಪತ್ರ ಟರ್ಮ್ ಆಫರ್
-apps/erpnext/erpnext/stock/doctype/item/item.py +492,Item has variants.,ಐಟಂ ವೇರಿಯಂಟ್.
+apps/erpnext/erpnext/stock/doctype/item/item.py +496,Item has variants.,ಐಟಂ ವೇರಿಯಂಟ್.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,ಐಟಂ {0} ಕಂಡುಬಂದಿಲ್ಲ
 DocType: Bin,Stock Value,ಸ್ಟಾಕ್ ಮೌಲ್ಯ
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,ಟ್ರೀ ಕೌಟುಂಬಿಕತೆ
@@ -629,10 +602,9 @@
 DocType: Material Request Item,Quantity and Warehouse,ಪ್ರಮಾಣ ಮತ್ತು ವೇರ್ಹೌಸ್
 DocType: Sales Invoice,Commission Rate (%),ಕಮಿಷನ್ ದರ ( % )
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +172,"Against Voucher Type must be one of Sales Order, Sales Invoice or Journal Entry","ಚೀಟಿ ವಿರುದ್ಧ ಕೌಟುಂಬಿಕತೆ ಮಾರಾಟದ ಆರ್ಡರ್ ಒಂದು, ಮಾರಾಟದ ಸರಕುಪಟ್ಟಿ ಅಥವಾ ಜರ್ನಲ್ ಎಂಟ್ರಿ ಇರಬೇಕು"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +139,Biomachining,Biomachining
 apps/erpnext/erpnext/setup/utils.py +89,Unable to find exchange rate,ವಿನಿಮಯ ದರ ಹುಡುಕಲು ಸಾಧ್ಯವಾಗುವುದಿಲ್ಲ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +7,Aerospace,ಏರೋಸ್ಪೇಸ್
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +19,Welcome,ಸ್ವಾಗತ
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +7,Aerospace,ಏರೋಸ್ಪೇಸ್
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +40,Welcome,ಸ್ವಾಗತ
 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.,ಗೂಡ್ಸ್ ವಿತರಕರಿಂದ ಪಡೆದ .
@@ -655,19 +627,19 @@
 DocType: Employee,Cell Number,ಸೆಲ್ ಸಂಖ್ಯೆ
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,ಲಾಸ್ಟ್
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +120,You can not enter current voucher in 'Against Journal Entry' column,ನೀವು ಕಾಲಮ್ 'ಜರ್ನಲ್ ಎಂಟ್ರಿ ವಿರುದ್ಧ' ನಲ್ಲಿ ಪ್ರಸ್ತುತ ಚೀಟಿ ಪ್ರವೇಶಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +25,Energy,ಶಕ್ತಿ
+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.,ಮಾಸಿಕ ವೇತನವನ್ನು ಹೇಳಿಕೆ .
 DocType: Item Group,Website Specifications,ವೆಬ್ಸೈಟ್ ವಿಶೇಷಣಗಳು
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +205,New Account,ಹೊಸ ಖಾತೆ
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +21,{0}: From {0} of type {1},{0}: ಗೆ {0} ರೀತಿಯ {1}
-apps/erpnext/erpnext/controllers/buying_controller.py +283,Row {0}: Conversion Factor is mandatory,ರೋ {0}: ಪರಿವರ್ತಿಸುವುದರ ಕಡ್ಡಾಯ
+apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,ರೋ {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.,ಲೆಕ್ಕಪರಿಶೋಧಕ ನಮೂದುಗಳು ಲೀಫ್ ನೋಡ್ಗಳು ವಿರುದ್ಧ ಮಾಡಬಹುದು. ಗುಂಪುಗಳ ವಿರುದ್ಧ ನಮೂದುಗಳು ಅನುಮತಿಸಲಾಗುವುದಿಲ್ಲ.
 DocType: ToDo,High,ಎತ್ತರದ
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +361,Cannot deactivate or cancel BOM as it is linked with other BOMs,ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲು ಅಥವಾ ಇತರ BOMs ಸಂಬಂಧ ಇದೆ ಎಂದು ಬಿಒಎಮ್ ರದ್ದುಗೊಳಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ
 DocType: Opportunity,Maintenance,ಸಂರಕ್ಷಣೆ
 DocType: User,Male,ಪುರುಷ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +182,Purchase Receipt number required for Item {0},ಐಟಂ ಅಗತ್ಯವಿದೆ ಖರೀದಿ ರಸೀತಿ ಸಂಖ್ಯೆ {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +183,Purchase Receipt number required for Item {0},ಐಟಂ ಅಗತ್ಯವಿದೆ ಖರೀದಿ ರಸೀತಿ ಸಂಖ್ಯೆ {0}
 DocType: Item Attribute Value,Item Attribute Value,ಐಟಂ ಮೌಲ್ಯ ಲಕ್ಷಣ
 apps/erpnext/erpnext/config/crm.py +64,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.
@@ -715,10 +687,9 @@
 DocType: Address,Personal,ದೊಣ್ಣೆ
 DocType: Expense Claim Detail,Expense Claim Type,ಖರ್ಚು ClaimType
 DocType: Shopping Cart Settings,Default settings for Shopping Cart,ಶಾಪಿಂಗ್ ಕಾರ್ಟ್ ಡೀಫಾಲ್ಟ್ ಸೆಟ್ಟಿಂಗ್ಗಳನ್ನು
-apps/erpnext/erpnext/controllers/accounts_controller.py +324,"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/page/setup_wizard/fixtures/industry_type.py +13,Biotechnology,ಬಯೋಟೆಕ್ನಾಲಜಿ
+apps/erpnext/erpnext/controllers/accounts_controller.py +325,"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,ಕಚೇರಿ ನಿರ್ವಹಣಾ ವೆಚ್ಚಗಳು
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +53,Hemming,Hemming
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +66,Please enter Item first,ಮೊದಲ ಐಟಂ ನಮೂದಿಸಿ
 DocType: Account,Liability,ಹೊಣೆಗಾರಿಕೆ
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +62,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,ಮಂಜೂರು ಪ್ರಮಾಣ ರೋನಲ್ಲಿ ಹಕ್ಕು ಪ್ರಮಾಣವನ್ನು ಹೆಚ್ಚು ಸಾಧ್ಯವಿಲ್ಲ {0}.
@@ -731,10 +702,10 @@
 DocType: Company,Default Bank Account,ಡೀಫಾಲ್ಟ್ ಬ್ಯಾಂಕ್ ಖಾತೆ
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +47,"To filter based on Party, select Party Type first",ಪಕ್ಷದ ಆಧಾರದ ಮೇಲೆ ಫಿಲ್ಟರ್ ಆರಿಸಿ ಪಕ್ಷದ ಮೊದಲ ನೀಡಿರಿ
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},ಐಟಂಗಳನ್ನು ಮೂಲಕ ವಿತರಿಸಲಾಯಿತು ಏಕೆಂದರೆ &#39;ಅಪ್ಡೇಟ್ ಸ್ಟಾಕ್&#39; ಪರಿಶೀಲಿಸಲಾಗುವುದಿಲ್ಲ {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Nos,ಸೂಲ
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,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 +627,My Invoices,ನನ್ನ ಇನ್ವಾಯ್ಸ್ಗಳು
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +629,My Invoices,ನನ್ನ ಇನ್ವಾಯ್ಸ್ಗಳು
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,ಯಾವುದೇ ನೌಕರ
 DocType: Purchase Order,Stopped,ನಿಲ್ಲಿಸಿತು
 DocType: Item,If subcontracted to a vendor,ಮಾರಾಟಗಾರರ ಗೆ subcontracted ವೇಳೆ
@@ -753,35 +724,33 @@
 DocType: Features Setup,"To enable ""Point of Sale"" features",&quot;ಮಾರಾಟದ&quot; ವೈಶಿಷ್ಟ್ಯಗಳನ್ನು ಶಕ್ತಗೊಳಿಸಲು
 DocType: Bin,Moving Average Rate,ಮೂವಿಂಗ್ ಸರಾಸರಿ ದರ
 DocType: Production Planning Tool,Select Items,ಐಟಂಗಳನ್ನು ಆಯ್ಕೆಮಾಡಿ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,{0} against Bill {1} dated {2},{0} ಬಿಲ್ ವಿರುದ್ಧ {1} ರ {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +328,{0} against Bill {1} dated {2},{0} ಬಿಲ್ ವಿರುದ್ಧ {1} ರ {2}
 DocType: Comment,Reference Name,ರೆಫರೆನ್ಸ್ ಹೆಸರು
 DocType: Maintenance Visit,Completion Status,ಪೂರ್ಣಗೊಂಡ ಸ್ಥಿತಿ
 DocType: Sales Invoice Item,Target Warehouse,ಟಾರ್ಗೆಟ್ ವೇರ್ಹೌಸ್
 DocType: Item,Allow over delivery or receipt upto this percent,ಈ ಶೇಕಡಾ ವರೆಗೆ ವಿತರಣೆ ಅಥವಾ ರಶೀದಿ ಮೇಲೆ ಅವಕಾಶ
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +49,Expected Delivery Date cannot be before Sales Order Date,ನಿರೀಕ್ಷಿತ ವಿತರಣಾ ದಿನಾಂಕದ ಮೊದಲು ಮಾರಾಟದ ಆದೇಶ ದಿನಾಂಕ ಸಾಧ್ಯವಿಲ್ಲ
 DocType: Upload Attendance,Import Attendance,ಆಮದು ಅಟೆಂಡೆನ್ಸ್
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +17,All Item Groups,ಎಲ್ಲಾ ಐಟಂ ಗುಂಪುಗಳು
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +17,All Item Groups,ಎಲ್ಲಾ ಐಟಂ ಗುಂಪುಗಳು
 DocType: Process Payroll,Activity Log,ಚಟುವಟಿಕೆ ಲಾಗ್
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +30,Net Profit / Loss,ನಿವ್ವಳ ಲಾಭ / ನಷ್ಟ
 apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,ಸ್ವಯಂಚಾಲಿತವಾಗಿ ವ್ಯವಹಾರಗಳ ಸಲ್ಲಿಕೆಯಲ್ಲಿ ಸಂದೇಶವನ್ನು ರಚಿಸಿದರು .
 DocType: Production Order,Item To Manufacture,ತಯಾರಿಸಲು ಐಟಂ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +16,Permanent mold casting,ಶಾಶ್ವತ ಅಚ್ಚು ಎರಕದ
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} ಸ್ಥಿತಿ {2} ಆಗಿದೆ
 apps/erpnext/erpnext/config/learn.py +172,Purchase Order to Payment,ಪಾವತಿ ಆರ್ಡರ್ ಖರೀದಿಸಿ
 DocType: Sales Order Item,Projected Qty,ಪ್ರಮಾಣ ಯೋಜಿತ
 DocType: Sales Invoice,Payment Due Date,ಪಾವತಿ ಕಾರಣ ದಿನಾಂಕ
 DocType: Newsletter,Newsletter Manager,ಸುದ್ದಿಪತ್ರ ಮ್ಯಾನೇಜರ್
-apps/erpnext/erpnext/stock/doctype/item/item.js +229,Item Variant {0} already exists with same attributes,ಐಟಂ ಭಿನ್ನ {0} ಈಗಾಗಲೇ ಅದೇ ಲಕ್ಷಣಗಳು ಅಸ್ತಿತ್ವದಲ್ಲಿದ್ದರೆ
+apps/erpnext/erpnext/stock/doctype/item/item.js +231,Item Variant {0} already exists with same attributes,ಐಟಂ ಭಿನ್ನ {0} ಈಗಾಗಲೇ ಅದೇ ಲಕ್ಷಣಗಳು ಅಸ್ತಿತ್ವದಲ್ಲಿದ್ದರೆ
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening',ಉದ್ಘಾಟಿಸುತ್ತಿರುವುದು
 DocType: Notification Control,Delivery Note Message,ಡೆಲಿವರಿ ಗಮನಿಸಿ ಸಂದೇಶ
 DocType: Expense Claim,Expenses,ವೆಚ್ಚಗಳು
 DocType: Item Variant Attribute,Item Variant Attribute,ಐಟಂ ಭಿನ್ನ ಲಕ್ಷಣ
 ,Purchase Receipt Trends,ಖರೀದಿ ರಸೀತಿ ಟ್ರೆಂಡ್ಸ್
 DocType: Appraisal,Select template from which you want to get the Goals,ನೀವು ಗೋಲುಗಳನ್ನು ಪಡೆಯಲು ಬಯಸುವ ಟೆಂಪ್ಲೇಟ್ ಆಯ್ಕೆ
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +77,Research & Development,ಸಂಶೋಧನೆ ಮತ್ತು ಅಭಿವೃದ್ಧಿ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Research & Development,ಸಂಶೋಧನೆ ಮತ್ತು ಅಭಿವೃದ್ಧಿ
 ,Amount to Bill,ಬಿಲ್ ಪ್ರಮಾಣ
 DocType: Company,Registration Details,ನೋಂದಣಿ ವಿವರಗಳು
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +75,Staking,ನೇತುಹಾಕಿದಾಗ ರಕ್ತವು ಹೊರಗೆ
 DocType: Item,Re-Order Qty,ಮರು ಪ್ರಮಾಣ ಆದೇಶ
 DocType: Leave Block List Date,Leave Block List Date,ಖಂಡ ದಿನಾಂಕ ಬಿಡಿ
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +25,Scheduled to send to {0},ಕಳುಹಿಸಿದನು ಪರಿಶಿಷ್ಟ {0}
@@ -792,18 +761,16 @@
 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/hr/doctype/leave_allocation/leave_allocation.py +71,Cannot carry forward {0},ಸಾಧ್ಯವಿಲ್ಲ carryforward {0}
 apps/erpnext/erpnext/accounts/doctype/account/account.py +91,"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,ಖರ್ಚು ಹೇಳಿಕೆಯನ್ನು ತಿರಸ್ಕರಿಸಿದರು ಸಂದೇಶ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +145,Nailing,ಉತ್ಕೃಷ್ಟವಾದ
 ,Available Qty,ಲಭ್ಯವಿರುವ ಪ್ರಮಾಣ
 DocType: Purchase Taxes and Charges,On Previous Row Total,ಹಿಂದಿನ ಸಾಲು ಒಟ್ಟು ರಂದು
 DocType: Salary Slip,Working Days,ಕೆಲಸ ದಿನಗಳ
 DocType: Serial No,Incoming Rate,ಒಳಬರುವ ದರ
 DocType: Packing Slip,Gross Weight,ಒಟ್ಟು ತೂಕ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +410,The name of your company for which you are setting up this system.,ನೀವು ಈ ಗಣಕವನ್ನು ಹೊಂದಿಸುವ ಇದು ನಿಮ್ಮ ಕಂಪನಿ ಹೆಸರು .
+apps/erpnext/erpnext/public/js/setup_wizard.js +158,The name of your company for which you are setting up this system.,ನೀವು ಈ ಗಣಕವನ್ನು ಹೊಂದಿಸುವ ಇದು ನಿಮ್ಮ ಕಂಪನಿ ಹೆಸರು .
 DocType: HR Settings,Include holidays in Total no. of Working Days,ಒಟ್ಟು ರಜಾದಿನಗಳು ಸೇರಿಸಿ ಕೆಲಸ ದಿನಗಳ ಯಾವುದೇ
 DocType: Job Applicant,Hold,ಹಿಡಿ
 DocType: Employee,Date of Joining,ಸೇರುವ ದಿನಾಂಕ
@@ -813,7 +780,6 @@
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +3,View Subscribers,ವೀಕ್ಷಿಸಿ ಚಂದಾದಾರರು
 DocType: Purchase Invoice Item,Purchase Receipt,ಖರೀದಿ ರಸೀತಿ
 ,Received Items To Be Billed,ಪಾವತಿಸಬೇಕಾಗುತ್ತದೆ ಸ್ವೀಕರಿಸಿದ ಐಟಂಗಳು
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +114,Abrasive blasting,ಅಪಘರ್ಷಕ ಸ್ಪೋಟವನ್ನು
 DocType: Employee,Ms,MS
 apps/erpnext/erpnext/config/accounts.py +148,Currency exchange rate master.,ಕರೆನ್ಸಿ ವಿನಿಮಯ ದರ ಮಾಸ್ಟರ್ .
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +253,Unable to find Time Slot in the next {0} days for Operation {1},ಆಪರೇಷನ್ ಮುಂದಿನ {0} ದಿನಗಳಲ್ಲಿ ಟೈಮ್ ಸ್ಲಾಟ್ ಕಾಣಬರಲಿಲ್ಲ {1}
@@ -825,7 +791,7 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +209,Serial No {0} does not belong to Item {1},ಯಾವುದೇ ಸೀರಿಯಲ್ {0} ಐಟಂ ಸೇರುವುದಿಲ್ಲ {1}
 DocType: Purchase Receipt Item Supplied,Required Qty,ಅಗತ್ಯವಿದೆ ಪ್ರಮಾಣ
 DocType: Bank Reconciliation,Total Amount,ಒಟ್ಟು ಪ್ರಮಾಣ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +32,Internet Publishing,ಇಂಟರ್ನೆಟ್ ಪಬ್ಲಿಷಿಂಗ್
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,ಇಂಟರ್ನೆಟ್ ಪಬ್ಲಿಷಿಂಗ್
 DocType: Production Planning Tool,Production Orders,ಪ್ರೊಡಕ್ಷನ್ ಆರ್ಡರ್ಸ್
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +35,Balance Value,ಬ್ಯಾಲೆನ್ಸ್ ಮೌಲ್ಯ
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,ಮಾರಾಟ ಬೆಲೆ ಪಟ್ಟಿ
@@ -836,7 +802,7 @@
 DocType: Supplier,Default Payable Accounts,ಡೀಫಾಲ್ಟ್ ಪಾವತಿಸಲಾಗುವುದು ಖಾತೆಗಳು
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,ನೌಕರರ {0} ಸಕ್ರಿಯವಾಗಿಲ್ಲ ಅಥವಾ ಅಸ್ತಿತ್ವದಲ್ಲಿಲ್ಲ
 DocType: Features Setup,Item Barcode,ಐಟಂ ಬಾರ್ಕೋಡ್
-apps/erpnext/erpnext/stock/doctype/item/item.py +487,Item Variants {0} updated,ಐಟಂ ಮಾರ್ಪಾಟುಗಳು {0} ಅಪ್ಡೇಟ್ಗೊಳಿಸಲಾಗಿದೆ
+apps/erpnext/erpnext/stock/doctype/item/item.py +491,Item Variants {0} updated,ಐಟಂ ಮಾರ್ಪಾಟುಗಳು {0} ಅಪ್ಡೇಟ್ಗೊಳಿಸಲಾಗಿದೆ
 DocType: Quality Inspection Reading,Reading 6,6 ಓದುವಿಕೆ
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,ಸರಕುಪಟ್ಟಿ ಮುಂಗಡ ಖರೀದಿ
 DocType: Address,Shop,ಅಂಗಡಿ
@@ -845,7 +811,7 @@
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,ಈ ಕ್ರಮವನ್ನು ಆಯ್ಕೆ ಮಾಡಿದಾಗ ಡೀಫಾಲ್ಟ್ ಬ್ಯಾಂಕ್ / ನಗದು ಖಾತೆಯನ್ನು ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಪಿಓಎಸ್ ಸರಕುಪಟ್ಟಿ ರಲ್ಲಿ ನವೀಕರಿಸಲಾಗುತ್ತದೆ.
 DocType: Employee,Permanent Address Is,ಖಾಯಂ ವಿಳಾಸ ಈಸ್
 DocType: Production Order Operation,Operation completed for how many finished goods?,ಆಪರೇಷನ್ ಎಷ್ಟು ಸಿದ್ಧಪಡಿಸಿದ ವಸ್ತುಗಳನ್ನು ಪೂರ್ಣಗೊಂಡಿತು?
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +491,The Brand,ಬ್ರ್ಯಾಂಡ್
+apps/erpnext/erpnext/public/js/setup_wizard.js +237,The Brand,ಬ್ರ್ಯಾಂಡ್
 apps/erpnext/erpnext/controllers/status_updater.py +163,Allowance for over-{0} crossed for Item {1}.,ಸೇವನೆ ಮೇಲೆ {0} ಐಟಂ ದಾಟಿದೆ ಫಾರ್ {1}.
 DocType: Employee,Exit Interview Details,ಎಕ್ಸಿಟ್ ಸಂದರ್ಶನ ವಿವರಗಳು
 DocType: Item,Is Purchase Item,ಖರೀದಿ ಐಟಂ
@@ -865,16 +831,16 @@
 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,ಹೊಂದಿಸಿ ಪಾವತಿ ಪ್ರಮಾಣವನ್ನು = ಬಾಕಿ ಮೊತ್ತದ
 DocType: Contact Us Settings,Address Line 1,ಲೈನ್ 1 ವಿಳಾಸ
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Variance,ಭಿನ್ನಾಭಿಪ್ರಾಯ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +392,Company Name,ಕಂಪನಿ ಹೆಸರು
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +53,Variance,ಭಿನ್ನಾಭಿಪ್ರಾಯ
+,Company Name,ಕಂಪನಿ ಹೆಸರು
 DocType: SMS Center,Total Message(s),ಒಟ್ಟು ಸಂದೇಶ (ಗಳು)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +515,Select Item for Transfer,ವರ್ಗಾವಣೆ ಆಯ್ಕೆ ಐಟಂ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +538,Select Item for Transfer,ವರ್ಗಾವಣೆ ಆಯ್ಕೆ ಐಟಂ
 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.,ಅಲ್ಲಿ ಚೆಕ್ ಠೇವಣಿ ಏನು ಬ್ಯಾಂಕ್ ಖಾತೆ ಮುಖ್ಯಸ್ಥ ಆಯ್ಕೆ .
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,ಬಳಕೆದಾರ ವ್ಯವಹಾರಗಳಲ್ಲಿ ಬೆಲೆ ಪಟ್ಟಿ ದರ ಸಂಪಾದಿಸಲು ಅನುಮತಿಸಿ
 DocType: Pricing Rule,Max Qty,ಮ್ಯಾಕ್ಸ್ ಪ್ರಮಾಣ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +106,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,ಸಾಲು {0}: ಮಾರಾಟದ / ​​ಪರ್ಚೇಸ್ ಆರ್ಡರ್ ವಿರುದ್ಧ ಪಾವತಿ ಯಾವಾಗಲೂ ಮುಂಚಿತವಾಗಿ ಎಂದು ಗುರುತಿಸಲಾಗಿದೆ ಮಾಡಬೇಕು
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +16,Chemical,ರಾಸಾಯನಿಕ
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,ರಾಸಾಯನಿಕ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +693,All items have already been transferred for this Production Order.,ಎಲ್ಲಾ ಐಟಂಗಳನ್ನು ಈಗಾಗಲೇ ಈ ಪ್ರೊಡಕ್ಷನ್ ಆರ್ಡರ್ ವರ್ಗಾಯಿಸಲಾಗಿದೆ.
 DocType: Process Payroll,Select Payroll Year and Month,ವೇತನದಾರರ ವರ್ಷ ಮತ್ತು ತಿಂಗಳು ಆಯ್ಕೆ
 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""",ಸೂಕ್ತ ಗುಂಪು (ಸಾಮಾನ್ಯವಾಗಿ ಫಂಡ್ಸ್ ಅಪ್ಲಿಕೇಶನ್&gt; ಪ್ರಸಕ್ತ ಆಸ್ತಿಪಾಸ್ತಿಗಳು&gt; ಬ್ಯಾಂಕ್ ಖಾತೆಗಳ ಹೋಗಿ ರೀತಿಯ) ಮಕ್ಕಳ ಸೇರಿಸಿ ಕ್ಲಿಕ್ಕಿಸಿ (ಒಂದು ಹೊಸ ಖಾತೆ ರಚಿಸಿ &quot;ಬ್ಯಾಂಕ್&quot;
@@ -885,12 +851,12 @@
 DocType: Item,Inspection Criteria,ಇನ್ಸ್ಪೆಕ್ಷನ್ ಮಾನದಂಡ
 apps/erpnext/erpnext/config/accounts.py +101,Tree of finanial Cost Centers.,Finanial ವೆಚ್ಚ ಕೇಂದ್ರದ ಟ್ರೀ .
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,ವರ್ಗಾವಣೆಯ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +492,Upload your letter head and logo. (you can edit them later).,ನಿಮ್ಮ ಪತ್ರ ತಲೆ ಮತ್ತು ಲೋಗೋ ಅಪ್ಲೋಡ್. (ನೀವು ಅವುಗಳನ್ನು ನಂತರ ಸಂಪಾದಿಸಬಹುದು).
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +156,White,ಬಿಳಿ
+apps/erpnext/erpnext/public/js/setup_wizard.js +238,Upload your letter head and logo. (you can edit them later).,ನಿಮ್ಮ ಪತ್ರ ತಲೆ ಮತ್ತು ಲೋಗೋ ಅಪ್ಲೋಡ್. (ನೀವು ಅವುಗಳನ್ನು ನಂತರ ಸಂಪಾದಿಸಬಹುದು).
+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/setup/page/setup_wizard/setup_wizard.js +362,Attach Your Picture,ನಿಮ್ಮ ಚಿತ್ರ ಲಗತ್ತಿಸಿ
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Make ,ಮಾಡಿ
+apps/erpnext/erpnext/public/js/setup_wizard.js +112,Attach Your Picture,ನಿಮ್ಮ ಚಿತ್ರ ಲಗತ್ತಿಸಿ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +540,Make ,ಮಾಡಿ
 DocType: Journal Entry,Total Amount in Words,ವರ್ಡ್ಸ್ ಒಟ್ಟು ಪ್ರಮಾಣ
 DocType: Workflow State,Stop,ನಿಲ್ಲಿಸಲು
 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 ಸಂಪರ್ಕಿಸಿ ಡಾಕ್ಯುಮೆಂಟ್ ಸಾಧ್ಯವಾಗಿಲ್ಲ .
@@ -899,14 +865,13 @@
 DocType: Lead,Next Contact Date,ಮುಂದೆ ಸಂಪರ್ಕಿಸಿ ದಿನಾಂಕ
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,ಆರಂಭಿಕ ಪ್ರಮಾಣ
 DocType: Holiday List,Holiday List Name,ಹಾಲಿಡೇ ಪಟ್ಟಿ ಹೆಸರು
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +168,Stock Options,ಸ್ಟಾಕ್ ಆಯ್ಕೆಗಳು
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +168,Stock Options,ಸ್ಟಾಕ್ ಆಯ್ಕೆಗಳು
 DocType: Journal Entry Account,Expense Claim,ಖರ್ಚು ಹಕ್ಕು
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +181,Qty for {0},ಫಾರ್ ಪ್ರಮಾಣ {0}
 DocType: Leave Application,Leave Application,ಅಪ್ಲಿಕೇಶನ್ ಬಿಡಿ
 apps/erpnext/erpnext/config/hr.py +77,Leave Allocation Tool,ಅಲೋಕೇಶನ್ ಉಪಕರಣ ಬಿಡಿ
 DocType: Leave Block List,Leave Block List Dates,ಖಂಡ ದಿನಾಂಕ ಬಿಡಿ
 DocType: Company,If Monthly Budget Exceeded (for expense account),ಮಾಸಿಕ ಬಜೆಟ್ (ವೆಚ್ಚದಲ್ಲಿ ಖಾತೆಗೆ) ಮೀರಿದ್ದಲ್ಲಿ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +56,Trimming,ಚೂರನ್ನು
 DocType: Workstation,Net Hour Rate,ನೆಟ್ ಅವರ್ ದರ
 DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,ವೆಚ್ಚ ಖರೀದಿ ರಸೀತಿ ಇಳಿಯಿತು
 DocType: Company,Default Terms,ಡೀಫಾಲ್ಟ್ ನಿಯಮಗಳು
@@ -914,10 +879,9 @@
 DocType: POS Profile,Cash/Bank Account,ನಗದು / ಬ್ಯಾಂಕ್ ಖಾತೆ
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,Removed items with no change in quantity or value.,ಪ್ರಮಾಣ ಅಥವಾ ಮೌಲ್ಯವನ್ನು ಯಾವುದೇ ಬದಲಾವಣೆ ತೆಗೆದುಹಾಕಲಾಗಿದೆ ಐಟಂಗಳನ್ನು.
 DocType: Delivery Note,Delivery To,ವಿತರಣಾ
-apps/erpnext/erpnext/stock/doctype/item/item.py +509,Attribute table is mandatory,ಗುಣಲಕ್ಷಣ ಟೇಬಲ್ ಕಡ್ಡಾಯ
+apps/erpnext/erpnext/stock/doctype/item/item.py +513,Attribute table is mandatory,ಗುಣಲಕ್ಷಣ ಟೇಬಲ್ ಕಡ್ಡಾಯ
 DocType: Production Planning Tool,Get Sales Orders,ಮಾರಾಟದ ಆರ್ಡರ್ಸ್ ಪಡೆಯಿರಿ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} ಋಣಾತ್ಮಕ ಇರುವಂತಿಲ್ಲ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +103,Filing,ಫೈಲಿಂಗ್
 apps/erpnext/erpnext/templates/form_grid/item_grid.html +72,Discount,ರಿಯಾಯಿತಿ
 DocType: Features Setup,Purchase Discounts,ರಿಯಾಯಿತಿಯು ಖರೀದಿಸಿ
 DocType: Workstation,Wages,ವೇತನ
@@ -934,6 +898,7 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +112,You are the Expense Approver for this record. Please Update the 'Status' and Save,ನೀವು ಈ ದಾಖಲೆ ಖರ್ಚು ಅನುಮೋದಕ ಇವೆ . ' ಸ್ಥಿತಿಯನ್ನು ' ಅಪ್ಡೇಟ್ ಮತ್ತು ಉಳಿಸಿ ದಯವಿಟ್ಟು
 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 +136,"Attributes for Item Variants. e.g Size, Color etc.","ಐಟಂ ಮಾರ್ಪಾಟುಗಳು ಗುಣಲಕ್ಷಣಗಳು. ಉದಾಹರಣೆಗೆ ಗಾತ್ರ, ಬಣ್ಣ ಇತ್ಯಾದಿ"
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +39,WIP Warehouse,ವಿಪ್ ವೇರ್ಹೌಸ್
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +194,Serial No {0} is under maintenance contract upto {1},ಯಾವುದೇ ಸೀರಿಯಲ್ {0} ವರೆಗೆ ನಿರ್ವಹಣೆ ಒಪ್ಪಂದ {1}
@@ -942,7 +907,7 @@
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,ಮಾರಾಟ ವೆಚ್ಚಗಳು
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Buying,ಸ್ಟ್ಯಾಂಡರ್ಡ್ ಬೈಯಿಂಗ್
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +120,Standard Buying,ಸ್ಟ್ಯಾಂಡರ್ಡ್ ಬೈಯಿಂಗ್
 DocType: GL Entry,Against,ವಿರುದ್ಧವಾಗಿ
 DocType: Item,Default Selling Cost Center,ಡೀಫಾಲ್ಟ್ ಮಾರಾಟ ವೆಚ್ಚ ಸೆಂಟರ್
 DocType: Sales Partner,Implementation Partner,ಅನುಷ್ಠಾನ ಸಂಗಾತಿ
@@ -963,29 +928,29 @@
 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/setup/page/setup_wizard/setup_wizard.js +588,List a few of your suppliers. They could be organizations or individuals.,ನಿಮ್ಮ ಪೂರೈಕೆದಾರರ ಕೆಲವು ಪಟ್ಟಿ. ಅವರು ಸಂಸ್ಥೆಗಳು ಅಥವಾ ವ್ಯಕ್ತಿಗಳು ಆಗಿರಬಹುದು .
+apps/erpnext/erpnext/public/js/setup_wizard.js +326,List a few of your suppliers. They could be organizations or individuals.,ನಿಮ್ಮ ಪೂರೈಕೆದಾರರ ಕೆಲವು ಪಟ್ಟಿ. ಅವರು ಸಂಸ್ಥೆಗಳು ಅಥವಾ ವ್ಯಕ್ತಿಗಳು ಆಗಿರಬಹುದು .
 DocType: Company,Default Currency,ಡೀಫಾಲ್ಟ್ ಕರೆನ್ಸಿ
 DocType: Contact,Enter designation of this Contact,ಈ ಸಂಪರ್ಕಿಸಿ ಅಂಕಿತವನ್ನು ಯನ್ನು
 DocType: Contact Us Settings,Address,ವಿಳಾಸ
 DocType: Expense Claim,From Employee,ಉದ್ಯೋಗಗಳು ಗೆ
-apps/erpnext/erpnext/controllers/accounts_controller.py +338,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,ಎಚ್ಚರಿಕೆ: ಸಿಸ್ಟಮ್ {0} {1} ಶೂನ್ಯ ರಲ್ಲಿ ಐಟಂ ಪ್ರಮಾಣದ overbilling ರಿಂದ ಪರೀಕ್ಷಿಸುವುದಿಲ್ಲ
+apps/erpnext/erpnext/controllers/accounts_controller.py +339,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,ಎಚ್ಚರಿಕೆ: ಸಿಸ್ಟಮ್ {0} {1} ಶೂನ್ಯ ರಲ್ಲಿ ಐಟಂ ಪ್ರಮಾಣದ overbilling ರಿಂದ ಪರೀಕ್ಷಿಸುವುದಿಲ್ಲ
 DocType: Journal Entry,Make Difference Entry,ವ್ಯತ್ಯಾಸ ಎಂಟ್ರಿ ಮಾಡಿ
 DocType: Upload Attendance,Attendance From Date,ಅಟೆಂಡೆನ್ಸ್ Fromdate
 DocType: Appraisal Template Goal,Key Performance Area,ಪ್ರಮುಖ ಸಾಧನೆ ಪ್ರದೇಶ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +54,Transportation,ಸಾರಿಗೆ
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +54,Transportation,ಸಾರಿಗೆ
 apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +67, and year: ,
 DocType: Email Digest,Annual Expense,ವಾರ್ಷಿಕ ಖರ್ಚು
 DocType: SMS Center,Total Characters,ಒಟ್ಟು ಪಾತ್ರಗಳು
-apps/erpnext/erpnext/controllers/buying_controller.py +139,Please select BOM in BOM field for Item {0},ಐಟಂ ಬಿಒಎಮ್ ಕ್ಷೇತ್ರದಲ್ಲಿ ಬಿಒಎಮ್ ಆಯ್ಕೆಮಾಡಿ {0}
+apps/erpnext/erpnext/controllers/buying_controller.py +130,Please select BOM in BOM field for Item {0},ಐಟಂ ಬಿಒಎಮ್ ಕ್ಷೇತ್ರದಲ್ಲಿ ಬಿಒಎಮ್ ಆಯ್ಕೆಮಾಡಿ {0}
 DocType: C-Form Invoice Detail,C-Form Invoice Detail,ಸಿ ಆಕಾರ ಸರಕುಪಟ್ಟಿ ವಿವರ
 DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,ಪಾವತಿ ಸಾಮರಸ್ಯ ಸರಕುಪಟ್ಟಿ
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +32,Contribution %,ಕೊಡುಗೆ%
 DocType: Item,website page link,ವೆಬ್ಸೈಟ್ ಪುಟ ಲಿಂಕ್
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +192,Let's prepare the system for first use.,ಮೊದಲ ಬಳಕೆಗೆ ವ್ಯವಸ್ಥೆಯ ತಯಾರು ಮಾಡೋಣ.
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +242,Let's prepare the system for first use.,ಮೊದಲ ಬಳಕೆಗೆ ವ್ಯವಸ್ಥೆಯ ತಯಾರು ಮಾಡೋಣ.
 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 +214,Production Order {0} must be cancelled before cancelling this Sales Order,ಪ್ರೊಡಕ್ಷನ್ ಆರ್ಡರ್ {0} ಈ ಮಾರಾಟದ ಆದೇಶವನ್ನು ರದ್ದುಗೊಳಿಸುವ ಮೊದಲು ರದ್ದು ಮಾಡಬೇಕು
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +209,Production Order {0} must be cancelled before cancelling this Sales Order,ಪ್ರೊಡಕ್ಷನ್ ಆರ್ಡರ್ {0} ಈ ಮಾರಾಟದ ಆದೇಶವನ್ನು ರದ್ದುಗೊಳಿಸುವ ಮೊದಲು ರದ್ದು ಮಾಡಬೇಕು
 ,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.,ಟೈಮ್ ದಾಖಲೆಗಳು ಆಯ್ಕೆ ಮತ್ತು ಹೊಸ ಮಾರಾಟದ ಸರಕುಪಟ್ಟಿ ರಚಿಸಲು ಸಲ್ಲಿಸಿ .
@@ -1005,14 +970,13 @@
 DocType: Sales Invoice Advance,Sales Invoice Advance,ಮಾರಾಟದ ಸರಕುಪಟ್ಟಿ ಅಡ್ವಾನ್ಸ್
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +398,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/page/setup_wizard/install_fixtures.py +75,Management,ಆಡಳಿತ
+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/setup/page/setup_wizard/fixtures/operations.py +14,Investment casting,ಹೂಡಿಕೆ ಎರಕದ
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +51,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""","ಈ ವ್ಯತ್ಯಯದ ಐಟಂ ಕೋಡ್ ಬಿತ್ತರಿಸಲಾಗುವುದು. ನಿಮ್ಮ ಸಂಕ್ಷೇಪಣ ""ಎಸ್ಎಮ್"", ಮತ್ತು ಉದಾಹರಣೆಗೆ, ಐಟಂ ಕೋಡ್ ""ಟಿ ಶರ್ಟ್"", ""ಟಿ-ಶರ್ಟ್ ಎಸ್.ಎಂ."" ಇರುತ್ತದೆ ವ್ಯತ್ಯಯದ ಐಟಂ ಸಂಕೇತ"
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,ನೀವು ಸಂಬಳ ಸ್ಲಿಪ್ ಉಳಿಸಲು ಒಮ್ಮೆ ( ಮಾತಿನಲ್ಲಿ) ನಿವ್ವಳ ವೇತನ ಗೋಚರಿಸುತ್ತದೆ.
 apps/frappe/frappe/core/doctype/user/user_list.js +12,Active,ಕ್ರಿಯಾಶೀಲ
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +154,Blue,ಬ್ಲೂ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +154,Blue,ಬ್ಲೂ
 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,ಮತ್ತಷ್ಟು ಗ್ರಂಥಿಗಳು ಮಾತ್ರ ' ಗ್ರೂಪ್ ' ರೀತಿಯ ನೋಡ್ಗಳನ್ನು ಅಡಿಯಲ್ಲಿ ರಚಿಸಬಹುದಾಗಿದೆ
@@ -1022,18 +986,16 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +22,POS Profile {0} already created for user: {1} and company {2},ಪಿಓಎಸ್ ಪ್ರೊಫೈಲ್ {0} ಈಗಾಗಲೇ ಬಳಕೆದಾರ ದಾಖಲಿಸಿದವರು: {1} ಮತ್ತು ಕಂಪನಿ {2}
 DocType: Purchase Order Item,UOM Conversion Factor,UOM ಪರಿವರ್ತಿಸುವುದರ
 DocType: Stock Settings,Default Item Group,ಡೀಫಾಲ್ಟ್ ಐಟಂ ಗುಂಪು
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +156,Laminated object manufacturing,ಹೊದಿಸಿ ವಸ್ತು ತಯಾರಿಕಾ
 apps/erpnext/erpnext/config/buying.py +13,Supplier database.,ಸರಬರಾಜುದಾರ ಡೇಟಾಬೇಸ್ .
 DocType: Account,Balance Sheet,ಬ್ಯಾಲೆನ್ಸ್ ಶೀಟ್
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +561,Cost Center For Item with Item Code ','ಐಟಂ ಕೋಡ್ನೊಂದಿಗೆ ಐಟಂ ಸೆಂಟರ್ ವೆಚ್ಚ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +45,Stretch forming,ರೂಪಿಸುವ ಸ್ಟ್ರೆಚ್
 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 +210,"Further accounts can be made under Groups, but entries can be made against non-Groups","ಮತ್ತಷ್ಟು ಖಾತೆಗಳನ್ನು ಗುಂಪುಗಳು ಅಡಿಯಲ್ಲಿ ಮಾಡಬಹುದು, ಆದರೆ ನಮೂದುಗಳನ್ನು ಅಲ್ಲದ ಗುಂಪುಗಳ ವಿರುದ್ಧ ಮಾಡಬಹುದು"
 apps/erpnext/erpnext/config/hr.py +125,Tax and other salary deductions.,ತೆರಿಗೆ ಮತ್ತು ಇತರ ಸಂಬಳ ನಿರ್ಣಯಗಳಿಂದ .
 DocType: Lead,Lead,ಲೀಡ್
 DocType: Email Digest,Payables,ಸಂದಾಯಗಳು
 DocType: Account,Warehouse,ಮಳಿಗೆ
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +90,Row #{0}: Rejected Qty can not be entered in Purchase Return,ರೋ # {0}: ಪ್ರಮಾಣ ಖರೀದಿ ರಿಟರ್ನ್ ಪ್ರವೇಶಿಸಿತು ಸಾಧ್ಯವಿಲ್ಲ ತಿರಸ್ಕರಿಸಲಾಗಿದೆ
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +93,Row #{0}: Rejected Qty can not be entered in Purchase Return,ರೋ # {0}: ಪ್ರಮಾಣ ಖರೀದಿ ರಿಟರ್ನ್ ಪ್ರವೇಶಿಸಿತು ಸಾಧ್ಯವಿಲ್ಲ ತಿರಸ್ಕರಿಸಲಾಗಿದೆ
 ,Purchase Order Items To Be Billed,ಪಾವತಿಸಬೇಕಾಗುತ್ತದೆ ಖರೀದಿ ಆದೇಶವನ್ನು ಐಟಂಗಳು
 DocType: Purchase Invoice Item,Net Rate,ನೆಟ್ ದರ
 DocType: Purchase Invoice Item,Purchase Invoice Item,ಖರೀದಿ ಸರಕುಪಟ್ಟಿ ಐಟಂ
@@ -1048,13 +1010,13 @@
 DocType: Global Defaults,Current Fiscal Year,ಪ್ರಸಕ್ತ ಆರ್ಥಿಕ ವರ್ಷದ
 DocType: Global Defaults,Disable Rounded Total,ದುಂಡಾದ ಒಟ್ಟು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಿ
 DocType: Lead,Call,ಕರೆ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +384,'Entries' cannot be empty,' ನಮೂದುಗಳು ' ಖಾಲಿ ಇರುವಂತಿಲ್ಲ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +386,'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 +205,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/page/setup_wizard/install_fixtures.py +138,Research,ರಿಸರ್ಚ್
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +138,Research,ರಿಸರ್ಚ್
 DocType: Maintenance Visit Purpose,Work Done,ಕೆಲಸ ನಡೆದಿದೆ
 apps/erpnext/erpnext/controllers/item_variant.py +25,Please specify at least one attribute in the Attributes table,ಗುಣಲಕ್ಷಣಗಳು ಕೋಷ್ಟಕದಲ್ಲಿ ಕನಿಷ್ಠ ಒಂದು ಗುಣಲಕ್ಷಣ ಸೂಚಿಸಿ
 DocType: Contact,User ID,ಬಳಕೆದಾರ ID
@@ -1062,10 +1024,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +57,View Ledger,ವೀಕ್ಷಿಸು ಲೆಡ್ಜರ್
 DocType: File,Lft,lft
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,ಮುಂಚಿನ
-apps/erpnext/erpnext/stock/doctype/item/item.py +394,"An Item Group exists with same name, please change the item name or rename the item group","ಐಟಂ ಗುಂಪು ಅದೇ ಹೆಸರಿನಲ್ಲಿ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ , ಐಟಂ ಹೆಸರನ್ನು ಬದಲಾಯಿಸಲು ಅಥವಾ ಐಟಂ ಗುಂಪು ಹೆಸರನ್ನು ದಯವಿಟ್ಟು"
+apps/erpnext/erpnext/stock/doctype/item/item.py +398,"An Item Group exists with same name, please change the item name or rename the item group","ಐಟಂ ಗುಂಪು ಅದೇ ಹೆಸರಿನಲ್ಲಿ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ , ಐಟಂ ಹೆಸರನ್ನು ಬದಲಾಯಿಸಲು ಅಥವಾ ಐಟಂ ಗುಂಪು ಹೆಸರನ್ನು ದಯವಿಟ್ಟು"
 DocType: Communication,Delivery Status,ಡೆಲಿವರಿ ಸ್ಥಿತಿ
 DocType: Production Order,Manufacture against Sales Order,ಮಾರಾಟದ ಆರ್ಡರ್ ವಿರುದ್ಧ ತಯಾರಿಸಲು
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +517,Rest Of The World,ವಿಶ್ವದ ಉಳಿದ
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +455,Rest Of The World,ವಿಶ್ವದ ಉಳಿದ
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,ಐಟಂ {0} ಬ್ಯಾಚ್ ಹೊಂದುವಂತಿಲ್ಲ
 ,Budget Variance Report,ಬಜೆಟ್ ವೈಷಮ್ಯವನ್ನು ವರದಿ
 DocType: Salary Slip,Gross Pay,ಗ್ರಾಸ್ ಪೇ
@@ -1076,13 +1038,11 @@
 DocType: BOM Item,Item Description,ಐಟಂ ವಿವರಣೆ
 DocType: Payment Tool,Payment Mode,ಪಾವತಿ ಮೋಡ್
 DocType: Purchase Invoice,Is Recurring,ಮರುಕಳಿಸುವ ಆಗಿದೆ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +154,Direct metal laser sintering,ನೇರ ಲೋಹದ ಲೇಸರ್ ಹೆಪ್ಪುಗಟ್ಟಿಸಿ
 DocType: Purchase Order,Supplied Items,ವಿತರಿಸಿದ ವಸ್ತುಗಳನ್ನು
 DocType: Production Order,Qty To Manufacture,ತಯಾರಿಸಲು ಪ್ರಮಾಣ
 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,ತಾತ್ಕಾಲಿಕ ಉದ್ಘಾಟನಾ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +41,Cryorolling,Cryorolling
 ,Employee Leave Balance,ನೌಕರರ ಲೀವ್ ಬ್ಯಾಲೆನ್ಸ್
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +128,Balance for Account {0} must always be {1},{0} ಯಾವಾಗಲೂ ಇರಬೇಕು ಖಾತೆ ಬಾಕಿ {1}
 DocType: Address,Address Type,ವಿಳಾಸ ಪ್ರಕಾರ
@@ -1098,23 +1058,23 @@
 DocType: Journal Entry,Get Outstanding Invoices,ಮಹೋನ್ನತ ಇನ್ವಾಯ್ಸಸ್ ಪಡೆಯಿರಿ
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,ಮಾರಾಟದ ಆರ್ಡರ್ {0} ಮಾನ್ಯವಾಗಿಲ್ಲ
 apps/erpnext/erpnext/setup/doctype/company/company.py +172,"Sorry, companies cannot be merged","ಕ್ಷಮಿಸಿ, ಕಂಪನಿಗಳು ವಿಲೀನಗೊಳಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +145,Small,ಸಣ್ಣ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Small,ಸಣ್ಣ
 DocType: Employee,Employee Number,ನೌಕರರ ಸಂಖ್ಯೆ
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},ಕೇಸ್ ಇಲ್ಲ (ಗಳು) ಈಗಾಗಲೇ ಬಳಕೆಯಲ್ಲಿದೆ. ಪ್ರಕರಣ ಸಂಖ್ಯೆ ನಿಂದ ಪ್ರಯತ್ನಿಸಿ {0}
 ,Invoiced Amount (Exculsive Tax),ಸರಕುಪಟ್ಟಿ ಪ್ರಮಾಣ ( ತೆರಿಗೆ Exculsive )
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,ಐಟಂ 2
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +59,Account head {0} created,ಖಾತೆ ತಲೆ {0} ದಾಖಲಿಸಿದವರು
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +153,Green,ಹಸಿರು
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Green,ಹಸಿರು
 DocType: Item,Auto re-order,ಆಟೋ ಪುನಃ ಸಲುವಾಗಿ
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +57,Total Achieved,ಒಟ್ಟು ಸಾಧಿಸಿದ
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +59,Total Achieved,ಒಟ್ಟು ಸಾಧಿಸಿದ
 DocType: Employee,Place of Issue,ಸಂಚಿಕೆ ಪ್ಲೇಸ್
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +59,Contract,ಒಪ್ಪಂದ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Contract,ಒಪ್ಪಂದ
 DocType: Report,Disabled,ಅಂಗವಿಕಲ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +490,UOM coversion factor required for UOM: {0} in Item: {1},UOM ಅಗತ್ಯವಿದೆ UOM coversion ಫ್ಯಾಕ್ಟರ್: {0} ಐಟಂ ರಲ್ಲಿ: {1}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +83,Indirect Expenses,ಪರೋಕ್ಷ ವೆಚ್ಚಗಳು
 apps/erpnext/erpnext/controllers/selling_controller.py +163,Row {0}: Qty is mandatory,ರೋ {0}: ಪ್ರಮಾಣ ಕಡ್ಡಾಯ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +8,Agriculture,ವ್ಯವಸಾಯ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +611,Your Products or Services,ನಿಮ್ಮ ಉತ್ಪನ್ನಗಳನ್ನು ಅಥವಾ ಸೇವೆಗಳನ್ನು
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,ವ್ಯವಸಾಯ
+apps/erpnext/erpnext/public/js/setup_wizard.js +347,Your Products or Services,ನಿಮ್ಮ ಉತ್ಪನ್ನಗಳನ್ನು ಅಥವಾ ಸೇವೆಗಳನ್ನು
 DocType: Mode of Payment,Mode of Payment,ಪಾವತಿಯ ಮಾದರಿಯು
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,ಈ ಒಂದು ಮೂಲ ಐಟಂ ಗುಂಪು ಮತ್ತು ಸಂಪಾದಿತವಾಗಿಲ್ಲ .
 DocType: Journal Entry Account,Purchase Order,ಪರ್ಚೇಸ್ ಆರ್ಡರ್
@@ -1126,7 +1086,7 @@
 DocType: Serial No,Serial No Details,ಯಾವುದೇ ಸೀರಿಯಲ್ ವಿವರಗಳು
 DocType: Purchase Invoice Item,Item Tax Rate,ಐಟಂ ತೆರಿಗೆ ದರ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +113,"For {0}, only credit accounts can be linked against another debit entry","{0}, ಮಾತ್ರ ಕ್ರೆಡಿಟ್ ಖಾತೆಗಳನ್ನು ಮತ್ತೊಂದು ಡೆಬಿಟ್ ಪ್ರವೇಶ ವಿರುದ್ಧ ಲಿಂಕ್ ಮಾಡಬಹುದು ಫಾರ್"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Delivery Note {0} is not submitted,ಡೆಲಿವರಿ ಗಮನಿಸಿ {0} ಸಲ್ಲಿಸದಿದ್ದರೆ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +470,Delivery Note {0} is not submitted,ಡೆಲಿವರಿ ಗಮನಿಸಿ {0} ಸಲ್ಲಿಸದಿದ್ದರೆ
 apps/erpnext/erpnext/stock/get_item_details.py +136,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.","ಬೆಲೆ ರೂಲ್ ಮೊದಲ ಐಟಂ, ಐಟಂ ಗುಂಪು ಅಥವಾ ಬ್ರಾಂಡ್ ಆಗಿರಬಹುದು, ಕ್ಷೇತ್ರದಲ್ಲಿ 'ರಂದು ಅನ್ವಯಿಸು' ಆಧಾರದ ಮೇಲೆ ಆಯ್ಕೆ."
@@ -1136,7 +1096,7 @@
 DocType: Appraisal Goal,Goal,ಗುರಿ
 DocType: Sales Invoice Item,Edit Description,ಸಂಪಾದಿಸಿ ವಿವರಣೆ
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +318,Expected Delivery Date is lesser than Planned Start Date.,ನಿರೀಕ್ಷಿತ ಡೆಲಿವರಿ ದಿನಾಂಕ ಪ್ಲಾನ್ಡ್ ಪ್ರಾರಂಭ ದಿನಾಂಕ ಗಿಂತ ಕಡಿಮೆಯಾಗಿದೆ.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +579,For Supplier,ಸರಬರಾಜುದಾರನ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +602,For Supplier,ಸರಬರಾಜುದಾರನ
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,ಹೊಂದಿಸಲಾಗುತ್ತಿದೆ AccountType ವ್ಯವಹಾರಗಳಲ್ಲಿ ಈ ಖಾತೆಯನ್ನು ಆಯ್ಕೆ ಮಾಡುತ್ತದೆ .
 DocType: Purchase Invoice,Grand Total (Company Currency),ಗ್ರ್ಯಾಂಡ್ ಒಟ್ಟು ( ಕಂಪನಿ ಕರೆನ್ಸಿ )
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,ಒಟ್ಟು ಹೊರಹೋಗುವ
@@ -1162,10 +1122,10 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +74,"Total {0} for all items is zero, may you should change 'Distribute Charges Based On'",ಒಟ್ಟು {0} ಎಲ್ಲಾ ಐಟಂಗಳನ್ನು ನೀವು ಆಧರಿಸಿದೆ ಚಾರ್ಜಸ್ ವಿತರಿಸಿ &#39;ಬದಲಿಸಬೇಕಾಗುತ್ತದೆ ಇರಬಹುದು ಶೂನ್ಯವಾಗಿರುತ್ತದೆ
 DocType: Purchase Invoice,Taxes and Charges Calculation,ತೆರಿಗೆಗಳು ಮತ್ತು ಶುಲ್ಕಗಳು ಲೆಕ್ಕಾಚಾರ
 DocType: BOM Operation,Workstation,ಕಾರ್ಯಸ್ಥಾನ
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +112,Hardware,ಹಾರ್ಡ್ವೇರ್
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +112,Hardware,ಹಾರ್ಡ್ವೇರ್
 DocType: Attendance,HR Manager,ಮಾನವ ಸಂಪನ್ಮೂಲ ಮ್ಯಾನೇಜರ್
 apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,ಒಂದು ಕಂಪನಿ ಆಯ್ಕೆಮಾಡಿ
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +50,Privilege Leave,ಸವಲತ್ತು ಲೀವ್
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +50,Privilege Leave,ಸವಲತ್ತು ಲೀವ್
 DocType: Purchase Invoice,Supplier Invoice Date,ಸರಬರಾಜುದಾರ ಸರಕುಪಟ್ಟಿ ದಿನಾಂಕ
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +79,You need to enable Shopping Cart,ನೀವು ಶಾಪಿಂಗ್ ಕಾರ್ಟ್ ಶಕ್ತಗೊಳಿಸಬೇಕಾಗುತ್ತದೆ
 apps/frappe/frappe/public/js/frappe/form/grid_body.html +6,No Data,ಡೇಟಾ ಇಲ್ಲ
@@ -1178,7 +1138,7 @@
 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 +168,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/setup/page/setup_wizard/install_fixtures.py +38,Food,ಆಹಾರ
+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 +139,You can make a time log only against a submitted production order,ನೀವು ಕೇವಲ ಒಂದು ಸಲ್ಲಿಸಿದ ಉತ್ಪಾದನೆ ಸಲುವಾಗಿ ವಿರುದ್ಧ ದಾಖಲೆ ಮಾಡಬಹುದು
 DocType: Maintenance Schedule Item,No of Visits,ಭೇಟಿ ಸಂಖ್ಯೆ
@@ -1198,6 +1158,7 @@
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,View Offer Letter,ವೀಕ್ಷಿಸಿ ಆಫರ್ ಲೆಟರ್
 DocType: Communication,Communication,ಸಂವಹನ
 DocType: Item,Is Service Item,ಸೇವೆ ಐಟಂ
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +81,Application period cannot be outside leave allocation period,ಅಪ್ಲಿಕೇಶನ್ ಅವಧಿಯಲ್ಲಿ ಹೊರಗೆ ರಜೆ ಹಂಚಿಕೆ ಅವಧಿಯಲ್ಲಿ ಸಾಧ್ಯವಿಲ್ಲ
 DocType: Activity Cost,Projects,ಯೋಜನೆಗಳು
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +31,Please select Fiscal Year,ಹಣಕಾಸಿನ ವರ್ಷ ಆಯ್ಕೆಮಾಡಿ
 apps/erpnext/erpnext/controllers/buying_controller.py +23,From {0} | {1} {2},ಗೆ {0} | {1} {2}
@@ -1216,7 +1177,7 @@
 DocType: Item,Maintain Stock,ಸ್ಟಾಕ್ ನಿರ್ವಹಿಸುವುದು
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +213,Stock Entries already created for Production Order ,ಈಗಾಗಲೇ ಉತ್ಪಾದನೆ ಆರ್ಡರ್ ದಾಖಲಿಸಿದವರು ಸ್ಟಾಕ್ ನಮೂದುಗಳು
 DocType: Leave Control Panel,Leave blank if considered for all designations,ಎಲ್ಲಾ ಅಂಕಿತಗಳು ಪರಿಗಣಿಸಲ್ಪಡುವ ವೇಳೆ ಖಾಲಿ ಬಿಡಿ
-apps/erpnext/erpnext/controllers/accounts_controller.py +499,Charge of type 'Actual' in row {0} cannot be included in Item Rate,ಮಾದರಿ ಸಾಲು {0} ನಲ್ಲಿ 'ವಾಸ್ತವಿಕ' ಉಸ್ತುವಾರಿ ಐಟಂ ದರದಲ್ಲಿ ಸೇರಿಸಲಾಗಿದೆ ಸಾಧ್ಯವಿಲ್ಲ
+apps/erpnext/erpnext/controllers/accounts_controller.py +500,Charge of type 'Actual' in row {0} cannot be included in Item Rate,ಮಾದರಿ ಸಾಲು {0} ನಲ್ಲಿ 'ವಾಸ್ತವಿಕ' ಉಸ್ತುವಾರಿ ಐಟಂ ದರದಲ್ಲಿ ಸೇರಿಸಲಾಗಿದೆ ಸಾಧ್ಯವಿಲ್ಲ
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,Max: {0},ಮ್ಯಾಕ್ಸ್: {0}
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +16,From Datetime,Datetime ಗೆ
 DocType: Email Digest,For Company,ಕಂಪನಿ
@@ -1226,7 +1187,7 @@
 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 +471,cannot be greater than 100,100 ಹೆಚ್ಚು ಸಾಧ್ಯವಿಲ್ಲ
-apps/erpnext/erpnext/stock/doctype/item/item.py +546,Item {0} is not a stock Item,ಐಟಂ {0} ಸ್ಟಾಕ್ ಐಟಂ ಅಲ್ಲ
+apps/erpnext/erpnext/stock/doctype/item/item.py +550,Item {0} is not a stock Item,ಐಟಂ {0} ಸ್ಟಾಕ್ ಐಟಂ ಅಲ್ಲ
 DocType: Maintenance Visit,Unscheduled,ಅನಿಗದಿತ
 DocType: Employee,Owned,ಸ್ವಾಮ್ಯದ
 DocType: Salary Slip Deduction,Depends on Leave Without Pay,ಸಂಬಳ ಇಲ್ಲದೆ ಬಿಟ್ಟು ಅವಲಂಬಿಸಿರುತ್ತದೆ
@@ -1240,31 +1201,29 @@
 DocType: HR Settings,Employee Settings,ನೌಕರರ ಸೆಟ್ಟಿಂಗ್ಗಳು
 ,Batch-Wise Balance History,ಬ್ಯಾಚ್ ವೈಸ್ ಬ್ಯಾಲೆನ್ಸ್ ಇತಿಹಾಸ
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +72,To Do List,ಪಟ್ಟಿ ಮಾಡಿ
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +63,Apprentice,ಹೊಸಗಸುಬಿ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Apprentice,ಹೊಸಗಸುಬಿ
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +99,Negative Quantity is not allowed,ನಕಾರಾತ್ಮಕ ಪ್ರಮಾಣ ಅನುಮತಿಸಲಾಗುವುದಿಲ್ಲ
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
 Used for Taxes and Charges","ಸ್ಟ್ರಿಂಗ್ ಐಟಂ ಮಾಸ್ಟರ್ ರಿಂದ ಗಳಿಸಿತು ಮತ್ತು ಈ ಕ್ಷೇತ್ರದಲ್ಲಿ ಸಂಗ್ರಹಿಸಲಾಗಿದೆ ತೆರಿಗೆ ವಿವರ ಟೇಬಲ್.
  ತೆರಿಗೆಗಳು ಮತ್ತು ಶುಲ್ಕಗಳು ಉಪಯೋಗಿಸಿದ"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +61,Lancing,Lancing
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +151,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 +435,Accounting Entry for {0}: {1} can only be made in currency: {2},{1} ಮಾತ್ರ ಕರೆನ್ಸಿ ಮಾಡಬಹುದು: {0} ಲೆಕ್ಕಪರಿಶೋಧಕ ಎಂಟ್ರಿ {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +436,Accounting Entry for {0}: {1} can only be made in currency: {2},{1} ಮಾತ್ರ ಕರೆನ್ಸಿ ಮಾಡಬಹುದು: {0} ಲೆಕ್ಕಪರಿಶೋಧಕ ಎಂಟ್ರಿ {2}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +38,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 +112,Tax Rule for transactions.,ವ್ಯವಹಾರಗಳಿಗೆ ತೆರಿಗೆ ನಿಯಮ.
 DocType: Rename Tool,Type of document to rename.,ಬದಲಾಯಿಸಲು ಡಾಕ್ಯುಮೆಂಟ್ ಪ್ರಕಾರ .
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +630,We buy this Item,ನಾವು ಈ ಐಟಂ ಖರೀದಿ
+apps/erpnext/erpnext/public/js/setup_wizard.js +366,We buy this Item,ನಾವು ಈ ಐಟಂ ಖರೀದಿ
 DocType: Address,Billing,ಬಿಲ್ಲಿಂಗ್
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +77,Flanging,Flanging
 DocType: Bulk Email,Not Sent,ಕಳುಹಿಸಲಾಗಿಲ್ಲ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +73,Explosive forming,ರೂಪಿಸುವ ಸ್ಫೋಟಕ
 DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),ಒಟ್ಟು ತೆರಿಗೆಗಳು ಮತ್ತು ಶುಲ್ಕಗಳು ( ಕಂಪನಿ ಕರೆನ್ಸಿ )
 DocType: Shipping Rule,Shipping Account,ಶಿಪ್ಪಿಂಗ್ ಖಾತೆ
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +43,Scheduled to send to {0} recipients,{0} ಸ್ವೀಕರಿಸುವವರಿಗೆ ಕಳುಹಿಸಲು ಪರಿಶಿಷ್ಟ
 DocType: Quality Inspection,Readings,ರೀಡಿಂಗ್ಸ್
 DocType: Stock Entry,Total Additional Costs,ಒಟ್ಟು ಹೆಚ್ಚುವರಿ ವೆಚ್ಚ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Sub Assemblies,ಉಪ ಅಸೆಂಬ್ಲೀಸ್
+apps/erpnext/erpnext/public/js/setup_wizard.js +359,Sub Assemblies,ಉಪ ಅಸೆಂಬ್ಲೀಸ್
 DocType: Shipping Rule Condition,To Value,ಮೌಲ್ಯ
 DocType: Supplier,Stock Manager,ಸ್ಟಾಕ್ ಮ್ಯಾನೇಜರ್
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +143,Source warehouse is mandatory for row {0},ಮೂಲ ಗೋದಾಮಿನ ಸಾಲು ಕಡ್ಡಾಯ {0}
@@ -1274,44 +1233,42 @@
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,ಆಮದು ವಿಫಲವಾಗಿದೆ!
 apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,ಯಾವುದೇ ವಿಳಾಸ ಇನ್ನೂ ಸೇರಿಸಲಾಗಿದೆ.
 DocType: Workstation Working Hour,Workstation Working Hour,ಕಾರ್ಯಸ್ಥಳ ವರ್ಕಿಂಗ್ ಅವರ್
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +83,Analyst,ವಿಶ್ಲೇಷಕ
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +202,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},ಸಾಲು {0}: ನಿಗದಿ ಪ್ರಮಾಣದ {1} ಕಡಿಮೆ ಅಥವಾ ಜಂಟಿ ಉದ್ಯಮ ಪ್ರಮಾಣದ ಸಮ ಮಾಡಬೇಕು {2}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Analyst,ವಿಶ್ಲೇಷಕ
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +149,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},ಸಾಲು {0}: ನಿಗದಿ ಪ್ರಮಾಣದ {1} ಕಡಿಮೆ ಅಥವಾ ಜಂಟಿ ಉದ್ಯಮ ಪ್ರಮಾಣದ ಸಮ ಮಾಡಬೇಕು {2}
 DocType: Item,Inventory,ತಪಶೀಲು ಪಟ್ಟಿ
 DocType: Features Setup,"To enable ""Point of Sale"" view",ವೀಕ್ಷಿಸಿ &quot;ಮಾರಾಟದ&quot; ಶಕ್ತಗೊಳಿಸಲು
 apps/erpnext/erpnext/public/js/pos/pos.js +402,Payment cannot be made for empty cart,ಪಾವತಿ ಖಾಲಿ ಕಾರ್ಟ್ ಸಾಧ್ಯವಿಲ್ಲ
 DocType: Item,Sales Details,ಮಾರಾಟದ ವಿವರಗಳು
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +149,Pinning,ಪಿನ್ನಿಂಗ್
 DocType: Opportunity,With Items,ವಸ್ತುಗಳು
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,ಸೇರಿಸಿ ಪ್ರಮಾಣ
 DocType: Notification Control,Expense Claim Rejected,ಖರ್ಚು ಹೇಳಿಕೆಯನ್ನು ತಿರಸ್ಕರಿಸಿದರು
 DocType: Sales Invoice,"The date on which next invoice will be generated. It is generated on submit.
 ",ಮುಂದಿನ ಸರಕುಪಟ್ಟಿ ಉತ್ಪಾದಿಸಬಹುದಾಗಿದೆ ಯಾವ ದಿನಾಂಕ. ಒಪ್ಪಿಸಬಹುದು ಮೇಲೆ ಉತ್ಪಾದಿಸಲಾಗುತ್ತದೆ.
 DocType: Item Attribute,Item Attribute,ಐಟಂ ಲಕ್ಷಣ
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +105,Government,ಸರ್ಕಾರ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Government,ಸರ್ಕಾರ
 apps/erpnext/erpnext/config/stock.py +268,Item Variants,ಐಟಂ ಮಾರ್ಪಾಟುಗಳು
 DocType: Company,Services,ಸೇವೆಗಳು
 apps/erpnext/erpnext/accounts/report/financial_statements.py +147,Total ({0}),ಒಟ್ಟು ({0})
 DocType: Cost Center,Parent Cost Center,ಪೋಷಕ ವೆಚ್ಚ ಸೆಂಟರ್
 DocType: Sales Invoice,Source,ಮೂಲ
 DocType: Leave Type,Is Leave Without Pay,ಸಂಬಳ ಇಲ್ಲದೆ ಬಿಟ್ಟು ಇದೆ
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +186,No records found in the Payment table,ಪಾವತಿ ಕೋಷ್ಟಕದಲ್ಲಿ ಯಾವುದೇ ದಾಖಲೆಗಳು
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +405,Financial Year Start Date,ಹಣಕಾಸು ವರ್ಷದ ಪ್ರಾರಂಭ ದಿನಾಂಕ
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +133,No records found in the Payment table,ಪಾವತಿ ಕೋಷ್ಟಕದಲ್ಲಿ ಯಾವುದೇ ದಾಖಲೆಗಳು
+apps/erpnext/erpnext/public/js/setup_wizard.js +153,Financial Year Start Date,ಹಣಕಾಸು ವರ್ಷದ ಪ್ರಾರಂಭ ದಿನಾಂಕ
 DocType: Employee External Work History,Total Experience,ಒಟ್ಟು ಅನುಭವ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +100,Countersinking,Countersinking
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +271,Packing Slip(s) cancelled,ಪ್ಯಾಕಿಂಗ್ ಸ್ಲಿಪ್ (ಗಳು) ರದ್ದು
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +276,Packing Slip(s) cancelled,ಪ್ಯಾಕಿಂಗ್ ಸ್ಲಿಪ್ (ಗಳು) ರದ್ದು
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,ಸರಕು ಮತ್ತು ಸಾಗಣೆಯನ್ನು ಚಾರ್ಜಸ್
 DocType: Material Request Item,Sales Order No,ಮಾರಾಟದ ಆದೇಶ ಸಂಖ್ಯೆ
 DocType: Item Group,Item Group Name,ಐಟಂ ಗುಂಪು ಹೆಸರು
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +50,Taken,ಟೇಕನ್
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,ಟೇಕನ್
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +66,Transfer Materials for Manufacture,ತಯಾರಿಕೆಗೆ ವರ್ಗಾವಣೆ ಮೆಟೀರಿಯಲ್ಸ್
 DocType: Pricing Rule,For Price List,ಬೆಲೆ ಪಟ್ಟಿ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +27,Executive Search,ಕಾರ್ಯನಿರ್ವಾಹಕ ಹುಡುಕು
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,ಕಾರ್ಯನಿರ್ವಾಹಕ ಹುಡುಕು
 apps/erpnext/erpnext/stock/stock_ledger.py +405,"Purchase rate for item: {0} not found, which is required to book accounting entry (expense). Please mention item price against a buying price list.","ಐಟಂ ಖರೀದಿ ದರ: {0} ಕಂಡುಬಂದಿಲ್ಲ, ಲೆಕ್ಕಪರಿಶೋಧಕ ಪ್ರವೇಶ (ಹೊಣೆಗಾರಿಕೆ) ಪುಸ್ತಕ ಬೇಕಾಗಿತ್ತು. ಒಂದು ಖರೀದಿಸುವ ಬೆಲೆ ಪಟ್ಟಿ ವಿರುದ್ಧ ಐಟಂ ಬೆಲೆ ನೀಡಿರಿ."
 DocType: Maintenance Schedule,Schedules,ವೇಳಾಪಟ್ಟಿಗಳು
 DocType: Purchase Invoice Item,Net Amount,ನೆಟ್ ಪ್ರಮಾಣ
 DocType: Purchase Order Item Supplied,BOM Detail No,BOM ವಿವರ ಯಾವುದೇ
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),ಹೆಚ್ಚುವರಿ ರಿಯಾಯಿತಿ ಪ್ರಮಾಣ (ಕಂಪನಿ ಕರೆನ್ಸಿ)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +537,Error: {0} > {1},ದೋಷ : {0} > {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +541,Error: {0} > {1},ದೋಷ : {0} > {1}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,ಖಾತೆಗಳ ಚಾರ್ಟ್ ಹೊಸ ಖಾತೆಯನ್ನು ರಚಿಸಿ.
 DocType: Maintenance Visit,Maintenance Visit,ನಿರ್ವಹಣೆ ಭೇಟಿ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer > Customer Group > Territory,ಗ್ರಾಹಕ> ಗ್ರಾಹಕ ಗುಂಪಿನ> ಪ್ರದೇಶ
@@ -1322,7 +1279,6 @@
 DocType: Event,Tuesday,ಮಂಗಳವಾರ
 DocType: Leave Block List,Block Holidays on important days.,ಪ್ರಮುಖ ದಿನಗಳಲ್ಲಿ ಬ್ಲಾಕ್ ರಜಾದಿನಗಳು.
 ,Accounts Receivable Summary,ಸ್ವೀಕರಿಸುವಂತಹ ಖಾತೆಗಳು ಸಾರಾಂಶ
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +43,Leaves for type {0} already allocated for Employee {1} for period {2} - {3},ಈಗಾಗಲೇ ಅವಧಿಗೆ ನೌಕರರ {1} ಇರುವ ರೀತಿಯ {0} ಎಲೆಗಳು {2} - {3}
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +187,Please set User ID field in an Employee record to set Employee Role,ನೌಕರರ ಪಾತ್ರ ಸೆಟ್ ಒಂದು ನೌಕರರ ದಾಖಲೆಯಲ್ಲಿ ಬಳಕೆದಾರ ID ಕ್ಷೇತ್ರದಲ್ಲಿ ಸೆಟ್ ಮಾಡಿ
 DocType: UOM,UOM Name,UOM ಹೆಸರು
 DocType: Top Bar Item,Target,ಟಾರ್ಗೆಟ್
@@ -1334,15 +1290,14 @@
 DocType: ToDo,Due Date,ಕಾರಣ ದಿನಾಂಕ
 DocType: Sales Invoice Item,Brand Name,ಬ್ರಾಂಡ್ ಹೆಸರು
 DocType: Purchase Receipt,Transporter Details,ಟ್ರಾನ್ಸ್ಪೋರ್ಟರ್ ವಿವರಗಳು
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Box,ಪೆಟ್ಟಿಗೆ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +389,The Organization,ಸಂಸ್ಥೆ
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Box,ಪೆಟ್ಟಿಗೆ
+apps/erpnext/erpnext/public/js/setup_wizard.js +137,The Organization,ಸಂಸ್ಥೆ
 DocType: Monthly Distribution,Monthly Distribution,ಮಾಸಿಕ ವಿತರಣೆ
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,ಸ್ವೀಕರಿಸುವವರ ಪಟ್ಟಿ ಖಾಲಿಯಾಗಿದೆ . ಸ್ವೀಕರಿಸುವವರ ಪಟ್ಟಿ ದಯವಿಟ್ಟು ರಚಿಸಿ
 DocType: Production Plan Sales Order,Production Plan Sales Order,ನಿರ್ಮಾಣ ವೇಳಾಪಟ್ಟಿಯು ಮಾರಾಟದ ಆರ್ಡರ್
 DocType: Sales Partner,Sales Partner Target,ಮಾರಾಟದ ಸಂಗಾತಿ ಟಾರ್ಗೆಟ್
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},{0} ಲೆಕ್ಕಪರಿಶೋಧಕ ಎಂಟ್ರಿ ಮಾತ್ರ ಕರೆನ್ಸಿ ಮಾಡಬಹುದು: {1}
 DocType: Pricing Rule,Pricing Rule,ಬೆಲೆ ರೂಲ್
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +58,Notching,Notching
 apps/erpnext/erpnext/config/learn.py +167,Material Request to Purchase Order,ಆರ್ಡರ್ ಖರೀದಿಸಿ ಮೆಟೀರಿಯಲ್ ವಿನಂತಿ
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +74,Row # {0}: Returned Item {1} does not exists in {2} {3},ರೋ # {0}: ರಿಟರ್ನ್ಡ ಐಟಂ {1} ಅಲ್ಲ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ ಇಲ್ಲ {2} {3}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,ಬ್ಯಾಂಕ್ ಖಾತೆಗಳು
@@ -1359,20 +1314,19 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Amounts not reflected in bank,ಬ್ಯಾಂಕ್ ಕಾಣಿಸಿಕೊಂಡಿಲ್ಲ ಪ್ರಮಾಣದ
 DocType: Quality Inspection Reading,Reading 4,4 ಓದುವಿಕೆ
 apps/erpnext/erpnext/config/hr.py +23,Claims for company expense.,ಕಂಪನಿ ಖರ್ಚು ಹಕ್ಕು .
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +8,Centrifugal casting,ಕೇಂದ್ರಾಪಗಾಮಿ ಎರಕದ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +119,Magnetic field-assisted finishing,ಕಾಂತಕ್ಷೇತ್ರ ನೆರವಿನ ಸ್ಥಾನ
 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,ಸಂಪರ್ಕಿಸಿ ಮೊಬೈಲ್ ನಂ
 DocType: Production Planning Tool,Select Sales Orders,ಆಯ್ಕೆ ಮಾರಾಟದ ಆರ್ಡರ್ಸ್
 ,Material Requests for which Supplier Quotations are not created,ಯಾವ ಸರಬರಾಜುದಾರ ಉಲ್ಲೇಖಗಳು ಮೆಟೀರಿಯಲ್ ವಿನಂತಿಗಳು ದಾಖಲಿಸಿದವರು ಇಲ್ಲ
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +117,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,ನೀವು ರಜೆ ಹಾಕುತ್ತಿವೆ ಮೇಲೆ ದಿನ (ಗಳು) ರಜಾದಿನಗಳು. ನೀವು ರಜೆ ಅನ್ವಯಿಸುವುದಿಲ್ಲ ಅಗತ್ಯವಿದೆ.
 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/buying/doctype/purchase_order/purchase_order.js +477,Mark as Delivered,ಮಾರ್ಕ್ ತಲುಪಿಸಿದರು
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +497,Mark as Delivered,ಮಾರ್ಕ್ ತಲುಪಿಸಿದರು
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +34,Make Quotation,ಉದ್ಧರಣ ಮಾಡಿ
 DocType: Dependent Task,Dependent Task,ಅವಲಂಬಿತ ಟಾಸ್ಕ್
-apps/erpnext/erpnext/stock/doctype/item/item.py +306,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 +141,Leave of type {0} cannot be longer than {1},ರೀತಿಯ ಲೀವ್ {0} ಹೆಚ್ಚು ಸಾಧ್ಯವಿಲ್ಲ {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +310,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 +155,Leave of type {0} cannot be longer than {1},ರೀತಿಯ ಲೀವ್ {0} ಹೆಚ್ಚು ಸಾಧ್ಯವಿಲ್ಲ {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,ಮುಂಚಿತವಾಗಿ ಎಕ್ಸ್ ದಿನಗಳ ಕಾರ್ಯಾಚರಣೆ ಯೋಜನೆ ಪ್ರಯತ್ನಿಸಿ.
 DocType: HR Settings,Stop Birthday Reminders,ನಿಲ್ಲಿಸಿ ಜನ್ಮದಿನ ಜ್ಞಾಪನೆಗಳು
 DocType: SMS Center,Receiver List,ಸ್ವೀಕರಿಸುವವರ ಪಟ್ಟಿ
@@ -1380,15 +1334,14 @@
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,ಸೇವಿಸುವ ಪ್ರಮಾಣವನ್ನು
 apps/erpnext/erpnext/public/js/pos/pos.js +491,{0} View,{0} ವೀಕ್ಷಿಸಿ
 DocType: Salary Structure Deduction,Salary Structure Deduction,ಸಂಬಳ ರಚನೆ ಕಳೆಯುವುದು
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +158,Selective laser sintering,ಆಯ್ದ ಲೇಸರ್ ಹೆಪ್ಪುಗಟ್ಟಿಸಿ
-apps/erpnext/erpnext/stock/doctype/item/item.py +301,Unit of Measure {0} has been entered more than once in Conversion Factor Table,ಅಳತೆಯ ಘಟಕ {0} ಹೆಚ್ಚು ಪರಿವರ್ತಿಸುವುದರ ಟೇಬಲ್ ಒಮ್ಮೆ ಹೆಚ್ಚು ನಮೂದಿಸಲಾದ
+apps/erpnext/erpnext/stock/doctype/item/item.py +305,Unit of Measure {0} has been entered more than once in Conversion Factor Table,ಅಳತೆಯ ಘಟಕ {0} ಹೆಚ್ಚು ಪರಿವರ್ತಿಸುವುದರ ಟೇಬಲ್ ಒಮ್ಮೆ ಹೆಚ್ಚು ನಮೂದಿಸಲಾದ
 apps/frappe/frappe/core/page/data_import_tool/data_import_tool.js +108,Import Successful!,ಯಶಸ್ವಿಯಾಗಿ ಆಮದು !
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,ನೀಡಲಾಗಿದೆ ಐಟಂಗಳು ವೆಚ್ಚ
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +185,Quantity must not be more than {0},ಪ್ರಮಾಣ ಹೆಚ್ಚು ಇರಬಾರದು {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +41,Age (Days),ವಯಸ್ಸು (ದಿನಗಳು)
 DocType: Quotation Item,Quotation Item,ನುಡಿಮುತ್ತುಗಳು ಐಟಂ
 DocType: Account,Account Name,ಖಾತೆ ಹೆಸರು
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +41,From Date cannot be greater than To Date,ದಿನಾಂಕದಿಂದ ದಿನಾಂಕ ಹೆಚ್ಚಿನ ಸಾಧ್ಯವಿಲ್ಲ
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +34,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.,ಸರಬರಾಜುದಾರ ಟೈಪ್ ಮಾಸ್ಟರ್ .
 DocType: Purchase Order Item,Supplier Part Number,ಸರಬರಾಜುದಾರ ಭಾಗ ಸಂಖ್ಯೆ
@@ -1397,14 +1350,14 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +247,{0} {1} is cancelled or stopped,{0} {1} ರದ್ದು ಅಥವಾ ನಿಲ್ಲಿಸಿದಾಗ
 DocType: Accounts Settings,Credit Controller,ಕ್ರೆಡಿಟ್ ನಿಯಂತ್ರಕ
 DocType: Delivery Note,Vehicle Dispatch Date,ವಾಹನ ಡಿಸ್ಪ್ಯಾಚ್ ದಿನಾಂಕ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +197,Purchase Receipt {0} is not submitted,ಖರೀದಿ ರಸೀತಿ {0} ಸಲ್ಲಿಸದಿದ್ದರೆ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +198,Purchase Receipt {0} is not submitted,ಖರೀದಿ ರಸೀತಿ {0} ಸಲ್ಲಿಸದಿದ್ದರೆ
 DocType: Company,Default Payable Account,ಡೀಫಾಲ್ಟ್ ಪಾವತಿಸಲಾಗುವುದು ಖಾತೆ
 apps/erpnext/erpnext/config/website.py +13,"Settings for online shopping cart such as shipping rules, price list etc.","ಉದಾಹರಣೆಗೆ ಹಡಗು ನಿಯಮಗಳು, ಬೆಲೆ ಪಟ್ಟಿ ಇತ್ಯಾದಿ ಆನ್ಲೈನ್ ಶಾಪಿಂಗ್ ಕಾರ್ಟ್ ಸೆಟ್ಟಿಂಗ್ಗಳು"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +660,Setup Complete,ಸೆಟಪ್ ಕಂಪ್ಲೀಟ್
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +124,Setup Complete,ಸೆಟಪ್ ಕಂಪ್ಲೀಟ್
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +65,{0}% Billed,{0}% ಖ್ಯಾತವಾದ
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +17,Reserved Qty,ಕಾಯ್ದಿರಿಸಲಾಗಿದೆ ಪ್ರಮಾಣ
 DocType: Party Account,Party Account,ಪಕ್ಷದ ಖಾತೆ
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +74,Human Resources,ಮಾನವ ಸಂಪನ್ಮೂಲ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +74,Human Resources,ಮಾನವ ಸಂಪನ್ಮೂಲ
 DocType: Lead,Upper Income,ಮೇಲ್ ವರಮಾನ
 DocType: Journal Entry Account,Debit in Company Currency,ಕಂಪನಿ ಕರೆನ್ಸಿ ಡೆಬಿಟ್
 apps/erpnext/erpnext/support/doctype/issue/issue.py +58,My Issues,ನನ್ನ ತೊಂದರೆಗಳು
@@ -1413,11 +1366,9 @@
 DocType: Company,Default Values,ಡೀಫಾಲ್ಟ್ ಮೌಲ್ಯಗಳು
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +236,Row {0}: Payment amount can not be negative,ಸಾಲು {0}: ಪಾವತಿ ಪ್ರಮಾಣವನ್ನು ನಕಾರಾತ್ಮಕವಾಗಿರಬಾರದು
 DocType: Expense Claim,Total Amount Reimbursed,ಒಟ್ಟು ಪ್ರಮಾಣ ಮತ್ತೆ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +152,Press fitting,ಪ್ರೆಸ್ ಬಿಗಿಯಾದ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +64,Against Supplier Invoice {0} dated {1},ಸರಬರಾಜುದಾರ ವಿರುದ್ಧ ಸರಕುಪಟ್ಟಿ {0} ರ {1}
 DocType: Customer,Default Price List,ಡೀಫಾಲ್ಟ್ ಬೆಲೆ ಪಟ್ಟಿ
 DocType: Payment Reconciliation,Payments,ಪಾವತಿಗಳು
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +24,Hot isostatic pressing,ಒತ್ತುವ ಬಿಸಿ ಸಮಸ್ಥಿತಿಯ
 DocType: ToDo,Medium,ಮಧ್ಯಮ
 DocType: Budget Detail,Budget Allocated,ನಿಗದಿ ಮಾಡಿದ ಮುಂಗಡಪತ್ರ
 DocType: Journal Entry,Entry Type,ಎಂಟ್ರಿ ಟೈಪ್
@@ -1430,9 +1381,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +56,None of the items have any change in quantity or value.,ಐಟಂಗಳನ್ನು ಯಾವುದೇ ಪ್ರಮಾಣ ಅಥವಾ ಮೌಲ್ಯವನ್ನು ಯಾವುದೇ ಬದಲಾವಣೆ.
 DocType: Warranty Claim,Warranty Claim,ಖಾತರಿ ಹಕ್ಕು
 ,Lead Details,ಲೀಡ್ ವಿವರಗಳು
-DocType: Authorization Rule,Approving User,ಅಂಗೀಕಾರಕ್ಕಾಗಿ ಬಳಕೆದಾರ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +37,Forging,ಮುನ್ನುಗ್ಗುತ್ತಿವೆ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +126,Plating,ಲೋಹಲೇಪ
 DocType: Purchase Invoice,End date of current invoice's period,ಪ್ರಸ್ತುತ ಅವಧಿಯ ಸರಕುಪಟ್ಟಿ ಅಂತಿಮ ದಿನಾಂಕ
 DocType: Pricing Rule,Applicable For,ಜ
 DocType: Bank Reconciliation,From Date,Fromdate
@@ -1454,31 +1402,29 @@
 DocType: Sales Invoice,Paid Amount (Company Currency),ಪಾವತಿಸಿದ ಮೊತ್ತಕ್ಕೆ (ಕಂಪನಿ ಕರೆನ್ಸಿ)
 DocType: Purchase Invoice,Additional Discount,ಹೆಚ್ಚುವರಿ ರಿಯಾಯಿತಿ
 DocType: Selling Settings,Selling Settings,ಸೆಟ್ಟಿಂಗ್ಗಳು ಮಾರಾಟ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +39,Online Auctions,ಆನ್ಲೈನ್ ಹರಾಜಿನಲ್ಲಿ
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,ಆನ್ಲೈನ್ ಹರಾಜಿನಲ್ಲಿ
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +94,Please specify either Quantity or Valuation Rate or both,ಪ್ರಮಾಣ ಅಥವಾ ಮೌಲ್ಯಾಂಕನ ದರ ಅಥವಾ ಎರಡೂ ಸೂಚಿಸಲು ದಯವಿಟ್ಟು
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +50,"Company, Month and Fiscal Year is mandatory","ಕಂಪನಿ , ತಿಂಗಳ ಮತ್ತು ಹಣಕಾಸಿನ ವರ್ಷ ಕಡ್ಡಾಯ"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Marketing Expenses,ಮಾರ್ಕೆಟಿಂಗ್ ವೆಚ್ಚಗಳು
 ,Item Shortage Report,ಐಟಂ ಕೊರತೆ ವರದಿ
-apps/erpnext/erpnext/stock/doctype/item/item.js +183,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","ತೂಕ ತುಂಬಾ ""ತೂಕ ಮೈ.ವಿ.ವಿ.ಯ"" ನೀಡಿರಿ \n, ಉಲ್ಲೇಖಿಸಲಾಗಿದೆ"
+apps/erpnext/erpnext/stock/doctype/item/item.js +185,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","ತೂಕ ತುಂಬಾ ""ತೂಕ ಮೈ.ವಿ.ವಿ.ಯ"" ನೀಡಿರಿ \n, ಉಲ್ಲೇಖಿಸಲಾಗಿದೆ"
 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 +212,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 +384,Warehouse required at Row No {0},ರೋ ಯಾವುದೇ ಅಗತ್ಯವಿದೆ ವೇರ್ಹೌಸ್ {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +386,Warehouse required at Row No {0},ರೋ ಯಾವುದೇ ಅಗತ್ಯವಿದೆ ವೇರ್ಹೌಸ್ {0}
 DocType: Employee,Date Of Retirement,ನಿವೃತ್ತಿ ದಿನಾಂಕ
 DocType: Upload Attendance,Get Template,ಟೆಂಪ್ಲೆಟ್ ಪಡೆಯಿರಿ
 DocType: Address,Postal,ಅಂಚೆಯ
 DocType: Item,Weightage,weightage
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +159,Mining,ಮೈನಿಂಗ್
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +17,Resin casting,ರಾಳದ ಎರಕದ
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,ಎ ಗ್ರಾಹಕ ಗುಂಪಿನ ಅದೇ ಹೆಸರಿನಲ್ಲಿ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ ಗ್ರಾಹಕ ಹೆಸರನ್ನು ಬದಲಾಯಿಸಲು ಅಥವಾ ಗ್ರಾಹಕ ಗುಂಪಿನ ಹೆಸರನ್ನು ದಯವಿಟ್ಟು
 apps/erpnext/erpnext/public/js/pos/pos.js +147,Please select {0} first.,ಮೊದಲ {0} ಆಯ್ಕೆ ಮಾಡಿ.
 apps/erpnext/erpnext/templates/pages/order.html +57,text {0},ಪಠ್ಯ {0}
 DocType: Territory,Parent Territory,ಪೋಷಕ ಪ್ರದೇಶ
 DocType: Quality Inspection Reading,Reading 2,2 ಓದುವಿಕೆ
 DocType: Stock Entry,Material Receipt,ಮೆಟೀರಿಯಲ್ ರಸೀತಿ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +622,Products,ಉತ್ಪನ್ನಗಳು
+apps/erpnext/erpnext/public/js/setup_wizard.js +358,Products,ಉತ್ಪನ್ನಗಳು
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +47,Party Type and Party is required for Receivable / Payable account {0},ಪಕ್ಷದ ಕೌಟುಂಬಿಕತೆ ಮತ್ತು ಪಕ್ಷದ ಸ್ವೀಕರಿಸುವಂತಹ / ಪಾವತಿಸಲಾಗುವುದು ಖಾತೆಯನ್ನು ಅಗತ್ಯವಿದೆ {0}
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.","ಈ ಐಟಂ ವೇರಿಯಂಟ್, ಅದು ಮಾರಾಟ ಆದೇಶಗಳಿಗೆ ಇತ್ಯಾದಿ ಆಯ್ಕೆ ಸಾಧ್ಯವಿಲ್ಲ"
 DocType: Lead,Next Contact By,ಮುಂದೆ ಸಂಪರ್ಕಿಸಿ
@@ -1488,13 +1434,13 @@
 DocType: Purchase Invoice,Notification Email Address,ಅಧಿಸೂಚನೆ ಇಮೇಲ್ ವಿಳಾಸವನ್ನು
 DocType: Payment Tool,Find Invoices to Match,ಪಂದ್ಯಕ್ಕೆ ಇನ್ವಾಯ್ಸ್ಗಳು ಹುಡುಕಿ
 ,Item-wise Sales Register,ಐಟಂ ಬಲ್ಲ ಮಾರಾಟದ ರಿಜಿಸ್ಟರ್
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +399,"e.g. ""XYZ National Bank""","ಉದಾಹರಣೆಗೆ ""XYZ ನ್ಯಾಷನಲ್ ಬ್ಯಾಂಕ್ """
+apps/erpnext/erpnext/public/js/setup_wizard.js +147,"e.g. ""XYZ National Bank""","ಉದಾಹರಣೆಗೆ ""XYZ ನ್ಯಾಷನಲ್ ಬ್ಯಾಂಕ್ """
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,ಈ ಮೂಲ ದರದ ತೆರಿಗೆ ಒಳಗೊಂಡಿದೆ?
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +57,Total Target,ಒಟ್ಟು ಟಾರ್ಗೆಟ್
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Target,ಒಟ್ಟು ಟಾರ್ಗೆಟ್
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.js +22,Shopping Cart is enabled,ಶಾಪಿಂಗ್ ಕಾರ್ಟ್ ಶಕ್ತಗೊಳಿಸಲಾಗುವುದು
 DocType: Job Applicant,Applicant for a Job,ಒಂದು ಜಾಬ್ ಅರ್ಜಿದಾರರ
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +173,No Production Orders created,ದಾಖಲಿಸಿದವರು ಯಾವುದೇ ನಿರ್ಮಾಣ ಆದೇಶಗಳನ್ನು
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +131,Salary Slip of employee {0} already created for this month,ಉದ್ಯೋಗಿ ಸಂಬಳದ ಸ್ಲಿಪ್ {0} ಈಗಾಗಲೇ ಈ ತಿಂಗಳ ದಾಖಲಿಸಿದವರು
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +140,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.,ಹಲವು ಕಾಲಮ್ಗಳನ್ನು. ವರದಿಯನ್ನು ರಫ್ತು ಸ್ಪ್ರೆಡ್ಶೀಟ್ ಅಪ್ಲಿಕೇಶನ್ ಬಳಸಿಕೊಂಡು ಅದನ್ನು ಮುದ್ರಿಸಲು.
 DocType: Sales Invoice Item,Batch No,ಬ್ಯಾಚ್ ನಂ
@@ -1504,14 +1450,14 @@
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +13,Variant,ಭಿನ್ನ
 apps/frappe/frappe/public/js/frappe/form/toolbar.js +165,New {0},ಹೊಸ {0}
 DocType: Naming Series,Set prefix for numbering series on your transactions,ನಿಮ್ಮ ವ್ಯವಹಾರಗಳ ಮೇಲೆ ಸರಣಿ ಸಂಖ್ಯೆಗಳನ್ನು ಹೊಂದಿಸಿ ಪೂರ್ವಪ್ರತ್ಯಯ
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +169,Stopped order cannot be cancelled. Unstop to cancel.,ನಿಲ್ಲಿಸಿತು ಆದೇಶವನ್ನು ರದ್ದು ಸಾಧ್ಯವಿಲ್ಲ . ರದ್ದು ಅಡ್ಡಿಯಾಗಿರುವುದನ್ನು ಬಿಡಿಸು .
-apps/erpnext/erpnext/stock/doctype/item/item.py +323,Default BOM ({0}) must be active for this item or its template,ಡೀಫಾಲ್ಟ್ BOM ({0}) ಈ ಐಟಂ ಅಥವಾ ಅದರ ಟೆಂಪ್ಲೇಟ್ ಸಕ್ರಿಯ ಇರಬೇಕು
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +164,Stopped order cannot be cancelled. Unstop to cancel.,ನಿಲ್ಲಿಸಿತು ಆದೇಶವನ್ನು ರದ್ದು ಸಾಧ್ಯವಿಲ್ಲ . ರದ್ದು ಅಡ್ಡಿಯಾಗಿರುವುದನ್ನು ಬಿಡಿಸು .
+apps/erpnext/erpnext/stock/doctype/item/item.py +327,Default BOM ({0}) must be active for this item or its template,ಡೀಫಾಲ್ಟ್ BOM ({0}) ಈ ಐಟಂ ಅಥವಾ ಅದರ ಟೆಂಪ್ಲೇಟ್ ಸಕ್ರಿಯ ಇರಬೇಕು
 DocType: Employee,Leave Encashed?,Encashed ಬಿಡಿ ?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,ಕ್ಷೇತ್ರದ ಅವಕಾಶ ಕಡ್ಡಾಯ
 DocType: Item,Variants,ರೂಪಾಂತರಗಳು
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +458,Make Purchase Order,ಮಾಡಿ ಪರ್ಚೇಸ್ ಆರ್ಡರ್
 DocType: SMS Center,Send To,ಕಳಿಸಿ
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +111,There is not enough leave balance for Leave Type {0},ಲೀವ್ ಪ್ರಕಾರ ಸಾಕಷ್ಟು ರಜೆ ಸಮತೋಲನ ಇಲ್ಲ {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +127,There is not enough leave balance for Leave Type {0},ಲೀವ್ ಪ್ರಕಾರ ಸಾಕಷ್ಟು ರಜೆ ಸಮತೋಲನ ಇಲ್ಲ {0}
 DocType: Sales Team,Contribution to Net Total,ನೆಟ್ ಒಟ್ಟು ಕೊಡುಗೆ
 DocType: Sales Invoice Item,Customer's Item Code,ಗ್ರಾಹಕರ ಐಟಂ ಕೋಡ್
 DocType: Stock Reconciliation,Stock Reconciliation,ಸ್ಟಾಕ್ ಸಾಮರಸ್ಯ
@@ -1548,11 +1494,11 @@
 DocType: Sales Order Item,Actual Qty,ನಿಜವಾದ ಪ್ರಮಾಣ
 DocType: Sales Invoice Item,References,ಉಲ್ಲೇಖಗಳು
 DocType: Quality Inspection Reading,Reading 10,10 ಓದುವಿಕೆ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +612,"List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start.",ನಿಮ್ಮ ಉತ್ಪನ್ನಗಳನ್ನು ಅಥವಾ ಖರೀದಿ ಅಥವಾ ಮಾರಾಟ ಸೇವೆಗಳು ಪಟ್ಟಿ .
+apps/erpnext/erpnext/public/js/setup_wizard.js +348,"List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start.",ನಿಮ್ಮ ಉತ್ಪನ್ನಗಳನ್ನು ಅಥವಾ ಖರೀದಿ ಅಥವಾ ಮಾರಾಟ ಸೇವೆಗಳು ಪಟ್ಟಿ .
 DocType: Hub Settings,Hub Node,ಹಬ್ ನೋಡ್
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,ನೀವು ನಕಲಿ ಐಟಂಗಳನ್ನು ನಮೂದಿಸಿದ್ದೀರಿ. ನಿವಾರಿಸಿಕೊಳ್ಳಲು ಹಾಗೂ ಮತ್ತೆ ಪ್ರಯತ್ನಿಸಿ .
 apps/erpnext/erpnext/controllers/item_variant.py +65,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values,ಮೌಲ್ಯ {0} ವೈಶಿಷ್ಟ್ಯದ {1} ಮಾನ್ಯ ಐಟಂ ಪಟ್ಟಿಯಲ್ಲಿ ಅಸ್ತಿತ್ವದಲ್ಲಿಲ್ಲ ವೈಶಿಷ್ಟ್ಯದ ಮೌಲ್ಯಗಳನ್ನು
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +87,Associate,ಜತೆಗೂಡಿದ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Associate,ಜತೆಗೂಡಿದ
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +46,Item {0} is not a serialized Item,ಐಟಂ {0} ಒಂದು ಧಾರಾವಾಹಿಯಾಗಿ ಐಟಂ ಅಲ್ಲ
 DocType: SMS Center,Create Receiver List,ಸ್ವೀಕರಿಸುವವರ ಪಟ್ಟಿ ರಚಿಸಿ
 apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +5,Expired,ಅವಧಿ
@@ -1561,7 +1507,7 @@
 DocType: Warranty Claim,Issue Date,ಸಂಚಿಕೆ ದಿನಾಂಕ
 DocType: Activity Cost,Activity Cost,ಚಟುವಟಿಕೆ ವೆಚ್ಚ
 DocType: Purchase Receipt Item Supplied,Consumed Qty,ಸೇವಿಸಲ್ಪಟ್ಟ ಪ್ರಮಾಣ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +52,Telecommunications,ದೂರಸಂಪರ್ಕ
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +52,Telecommunications,ದೂರಸಂಪರ್ಕ
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),ಪ್ಯಾಕೇಜ್ ಈ ವಿತರಣಾ ಒಂದು ಭಾಗ ಎಂದು ಸೂಚಿಸುತ್ತದೆ (ಮಾತ್ರ Draft)
 DocType: Payment Tool,Make Payment Entry,ಪಾವತಿ ಎಂಟ್ರಿ ಮಾಡಿ
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +119,Quantity for Item {0} must be less than {1},ಪ್ರಮಾಣ ಐಟಂ {0} ಕಡಿಮೆ ಇರಬೇಕು {1}
@@ -1578,10 +1524,8 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +37,"Selling must be checked, if Applicable For is selected as {0}","ಅನ್ವಯಿಸುವ ಹಾಗೆ ಆರಿಸಿದರೆ ವಿಕ್ರಯ, ಪರೀಕ್ಷಿಸಬೇಕು {0}"
 DocType: Purchase Order Item,Supplier Quotation Item,ಸರಬರಾಜುದಾರ ಉದ್ಧರಣ ಐಟಂ
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +27,Make Salary Structure,ಸಂಬಳ ರಚನೆ ಮಾಡಿ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +54,Shearing,ಕತ್ತರಿಸುವುದು
 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.,ಹೊಸ ಮಾರಾಟದ ಸರಕುಪಟ್ಟಿ ರಚಿಸಲು ' ಮಾರಾಟದ ಸರಕುಪಟ್ಟಿ ಮಾಡಿ ' ಗುಂಡಿಯನ್ನು ಕ್ಲಿಕ್ ಮಾಡಿ .
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +166,Packaging and labeling,ಪ್ಯಾಕೇಜ್ ಮತ್ತು ಲೇಬಲಿಂಗ್
 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,ಕಂಪನಿ ಮಾಸ್ಟರ್ ಮತ್ತು ಜಾಗತಿಕ ಪೂರ್ವನಿಯೋಜಿತಗಳು ರಲ್ಲಿ ಡೀಫಾಲ್ಟ್ ಕರೆನ್ಸಿ ಸೂಚಿಸಲು ದಯವಿಟ್ಟು
@@ -1592,19 +1536,18 @@
 DocType: Budget Detail,Fiscal Year,ಹಣಕಾಸಿನ ವರ್ಷ
 DocType: Cost Center,Budget,ಮುಂಗಡಪತ್ರ
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +41,"Budget cannot be assigned against {0}, as it's not an Income or Expense account",ಇದು ಆದಾಯ ಅಥವಾ ಖರ್ಚುವೆಚ್ಚ ಅಲ್ಲ ಎಂದು ಬಜೆಟ್ ವಿರುದ್ಧ {0} ನಿಯೋಜಿಸಲಾಗುವುದು ಸಾಧ್ಯವಿಲ್ಲ
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Achieved,ಸಾಧಿಸಿದ
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,ಸಾಧಿಸಿದ
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +65,Territory / Customer,ಪ್ರದೇಶ / ಗ್ರಾಹಕ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,e.g. 5,ಇ ಜಿ 5
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +207,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},ಸಾಲು {0}: ನಿಗದಿ ಪ್ರಮಾಣದ {1} ಕಡಿಮೆ ಅಥವಾ ಬಾಕಿ ಮೊತ್ತದ ಸರಕುಪಟ್ಟಿ ಸಮನಾಗಿರುತ್ತದೆ ಮಾಡಬೇಕು {2}
+apps/erpnext/erpnext/public/js/setup_wizard.js +294,e.g. 5,ಇ ಜಿ 5
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},ಸಾಲು {0}: ನಿಗದಿ ಪ್ರಮಾಣದ {1} ಕಡಿಮೆ ಅಥವಾ ಬಾಕಿ ಮೊತ್ತದ ಸರಕುಪಟ್ಟಿ ಸಮನಾಗಿರುತ್ತದೆ ಮಾಡಬೇಕು {2}
 DocType: Sales Invoice,In Words will be visible once you save the Sales Invoice.,ನೀವು ಮಾರಾಟದ ಸರಕುಪಟ್ಟಿ ಉಳಿಸಲು ಒಮ್ಮೆ ವರ್ಡ್ಸ್ ಗೋಚರಿಸುತ್ತದೆ.
 DocType: Item,Is Sales Item,ಮಾರಾಟದ ಐಟಂ
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,ಐಟಂ ಗುಂಪು ಟ್ರೀ
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,ಐಟಂ {0} ಸೀರಿಯಲ್ ಸಂಖ್ಯೆ ಸ್ಥಾಪನೆಯ ಅಲ್ಲ ಐಟಂ ಮಾಸ್ಟರ್ ಪರಿಶೀಲಿಸಿ
 DocType: Maintenance Visit,Maintenance Time,ನಿರ್ವಹಣೆ ಟೈಮ್
 ,Amount to Deliver,ಪ್ರಮಾಣವನ್ನು ಬಿಡುಗಡೆಗೊಳಿಸಲು
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +620,A Product or Service,ಒಂದು ಉತ್ಪನ್ನ ಅಥವಾ ಸೇವೆ
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +158,There were errors.,ದೋಷಗಳು ಇದ್ದವು.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +101,Tapping,ಟ್ಯಾಪಿಂಗ್
+apps/erpnext/erpnext/public/js/setup_wizard.js +356,A Product or Service,ಒಂದು ಉತ್ಪನ್ನ ಅಥವಾ ಸೇವೆ
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +146,There were errors.,ದೋಷಗಳು ಇದ್ದವು.
 DocType: Naming Series,Current Value,ಪ್ರಸ್ತುತ ಮೌಲ್ಯ
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +171,{0} created,{0} ದಾಖಲಿಸಿದವರು
 DocType: Delivery Note Item,Against Sales Order,ಮಾರಾಟದ ಆದೇಶದ ವಿರುದ್ಧ
@@ -1619,7 +1562,7 @@
 apps/erpnext/erpnext/accounts/party.py +275,Due Date cannot be before Posting Date,ಕಾರಣ ದಿನಾಂಕ ದಿನಾಂಕ ಪೋಸ್ಟ್ ಮುನ್ನ ಸಾಧ್ಯವಿಲ್ಲ
 DocType: Website Item Group,Website Item Group,ಐಟಂ ಗ್ರೂಪ್ ವೆಬ್ಸೈಟ್
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Duties and Taxes,ಕರ್ತವ್ಯಗಳು ಮತ್ತು ತೆರಿಗೆಗಳು
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Please enter Reference date,ರೆಫರೆನ್ಸ್ ದಿನಾಂಕ ನಮೂದಿಸಿ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +312,Please enter Reference date,ರೆಫರೆನ್ಸ್ ದಿನಾಂಕ ನಮೂದಿಸಿ
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} ಪಾವತಿ ನಮೂದುಗಳನ್ನು ಫಿಲ್ಟರ್ ಸಾಧ್ಯವಿಲ್ಲ {1}
 DocType: Item Website Specification,Table for Item that will be shown in Web Site,ವೆಬ್ ಸೈಟ್ ತೋರಿಸಲಾಗುತ್ತದೆ ಎಂದು ಐಟಂ ಟೇಬಲ್
 DocType: Purchase Order Item Supplied,Supplied Qty,ಸರಬರಾಜು ಪ್ರಮಾಣ
@@ -1627,7 +1570,7 @@
 apps/erpnext/erpnext/config/stock.py +103,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,ಐಟಂ ಬುದ್ಧಿವಂತ ಖರೀದಿ ಇತಿಹಾಸ
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +152,Red,ಕೆಂಪು
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Red,ಕೆಂಪು
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +228,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},ಯಾವುದೇ ಸೀರಿಯಲ್ ಐಟಂ ಸೇರಿಸಲಾಗಿದೆ ತರಲು ' ರಚಿಸಿ ' ವೇಳಾಪಟ್ಟಿ ' ಕ್ಲಿಕ್ ಮಾಡಿ {0}
 DocType: Account,Frozen,ಘನೀಕೃತ
 ,Open Production Orders,ಓಪನ್ ಉತ್ಪಾದನೆ ಆರ್ಡರ್ಸ್
@@ -1642,7 +1585,7 @@
 DocType: Item Attribute,Attribute Name,ಹೆಸರು ಕಾರಣವಾಗಿದ್ದು
 apps/erpnext/erpnext/controllers/selling_controller.py +236,Item {0} must be Sales or Service Item in {1},ಐಟಂ {0} ನಲ್ಲಿ ಮಾರಾಟ ಅಥವಾ ಸೇವೆ ಐಟಂ ಇರಬೇಕು {1}
 DocType: Item Group,Show In Website,ವೆಬ್ಸೈಟ್ ಹೋಗಿ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +621,Group,ಗುಂಪು
+apps/erpnext/erpnext/public/js/setup_wizard.js +357,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","ಕೆಳಗಿನ ದಾಖಲೆಗಳನ್ನು ಡೆಲಿವರಿ ಗಮನಿಸಿ, ಅವಕಾಶ, ಮೆಟೀರಿಯಲ್ ವಿನಂತಿ, ಐಟಂ, ಆರ್ಡರ್ ಖರೀದಿಸಿ, ಖರೀದಿ ಚೀಟಿ, ಖರೀದಿದಾರ ರಸೀತಿ, ಉದ್ಧರಣ, ಮಾರಾಟದ ಸರಕುಪಟ್ಟಿ, ಉತ್ಪನ್ನ ಕಟ್ಟು, ಮಾರಾಟದ ಆರ್ಡರ್, ಸೀರಿಯಲ್ ಯಾವುದೇ ಬ್ರ್ಯಾಂಡ್ ಹೆಸರಿನ ಟ್ರ್ಯಾಕ್"
@@ -1652,6 +1595,7 @@
 DocType: Features Setup,Brands,ಬ್ರಾಂಡ್ಸ್
 DocType: C-Form Invoice Detail,Invoice No,ಸರಕುಪಟ್ಟಿ ನಂ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +480,From Purchase Order,ಪರ್ಚೇಸ್ ಆರ್ಡರ್ ಗೆ
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +92,"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,ರಾಜೀನಾಮೆ ಪತ್ರ ದಿನಾಂಕ
@@ -1659,35 +1603,31 @@
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +137,Not Set,ಹೊಂದಿಸಿ
 DocType: Communication,Date,ದಿನಾಂಕ
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,ಪುನರಾವರ್ತಿತ ಗ್ರಾಹಕ ಕಂದಾಯ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +651,Sit tight while your system is being setup. This may take a few moments.,ನಿಮ್ಮ ವ್ಯವಸ್ಥೆಯ ಸೆಟಪ್ ಬಂದಿದ್ದರೂ ಜಾಗ್ರತರಾಗಿ . ಈ ಜೂನ್ ಕೆಲವು ಕ್ಷಣಗಳನ್ನು ತೆಗೆದುಕೊಳ್ಳಬಹುದು .
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +115,Sit tight while your system is being setup. This may take a few moments.,ನಿಮ್ಮ ವ್ಯವಸ್ಥೆಯ ಸೆಟಪ್ ಬಂದಿದ್ದರೂ ಜಾಗ್ರತರಾಗಿ . ಈ ಜೂನ್ ಕೆಲವು ಕ್ಷಣಗಳನ್ನು ತೆಗೆದುಕೊಳ್ಳಬಹುದು .
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +51,{0} ({1}) must have role 'Expense Approver',{0} ({1}) ಪಾತ್ರ 'ಖರ್ಚು ಅನುಮೋದಕ' ಆಗಿರಬೇಕು
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Pair,ಜೋಡಿ
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Pair,ಜೋಡಿ
 DocType: Bank Reconciliation Detail,Against Account,ಖಾತೆ ವಿರುದ್ಧ
 DocType: Maintenance Schedule Detail,Actual Date,ನಿಜವಾದ ದಿನಾಂಕ
 DocType: Item,Has Batch No,ಬ್ಯಾಚ್ ನಂ ಹೊಂದಿದೆ
 DocType: Delivery Note,Excise Page Number,ಅಬಕಾರಿ ಪುಟ ಸಂಖ್ಯೆ
 DocType: Employee,Personal Details,ವೈಯಕ್ತಿಕ ವಿವರಗಳು
 ,Maintenance Schedules,ನಿರ್ವಹಣಾ ವೇಳಾಪಟ್ಟಿಗಳು
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +44,Embossing,ಉಬ್ಬು
 ,Quotation Trends,ನುಡಿಮುತ್ತುಗಳು ಟ್ರೆಂಡ್ಸ್
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +139,Item Group not mentioned in item master for item {0},ಐಟಂ ಐಟಂ ಮಾಸ್ಟರ್ ಉಲ್ಲೇಖಿಸಿಲ್ಲ ಐಟಂ ಗ್ರೂಪ್ {0}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +302,Debit To account must be a Receivable account,ಖಾತೆಗೆ ಡೆಬಿಟ್ ಒಂದು ಸ್ವೀಕರಿಸುವಂತಹ ಖಾತೆಯನ್ನು ಇರಬೇಕು
-apps/erpnext/erpnext/stock/doctype/item/item.py +310,"As Production Order can be made for this item, it must be a stock item.","ಪ್ರೊಡಕ್ಷನ್ ಆರ್ಡರ್ ಈ ಐಟಂ ಮಾಡಬಹುದು ಎಂದು, ಇದು ಒಂದು ಸ್ಟಾಕ್ ಐಟಂ ಇರಬೇಕು ."
 DocType: Shipping Rule Condition,Shipping Amount,ಶಿಪ್ಪಿಂಗ್ ಪ್ರಮಾಣ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +140,Joining,ಸೇರುವ
-DocType: Authorization Rule,Above Value,ಮೌಲ್ಯದ ಮೇಲೆ
 ,Pending Amount,ಬಾಕಿ ಪ್ರಮಾಣ
 DocType: Purchase Invoice Item,Conversion Factor,ಪರಿವರ್ತಿಸುವುದರ
 DocType: Purchase Order,Delivered,ತಲುಪಿಸಲಾಗಿದೆ
 apps/erpnext/erpnext/config/hr.py +160,Setup incoming server for jobs email id. (e.g. jobs@example.com),ಉದ್ಯೋಗಗಳು ಇಮೇಲ್ ಐಡಿ ಸೆಟಪ್ ಒಳಬರುವ ಸರ್ವರ್ . ( ಇ ಜಿ jobs@example.com )
 DocType: Purchase Receipt,Vehicle Number,ವಾಹನ ಸಂಖ್ಯೆ
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,ಮರುಕಳಿಸುವ ಸರಕುಪಟ್ಟಿ ಸ್ಟಾಪ್ ಯಾವ ದಿನಾಂಕ
+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,ಸ್ವೀಕರಿಸುವಂತಹ ಖಾತೆಗಳು
 ,Supplier-Wise Sales Analytics,ಸರಬರಾಜುದಾರ ವೈಸ್ ಮಾರಾಟದ ಅನಾಲಿಟಿಕ್ಸ್
 DocType: Address Template,This format is used if country specific format is not found,ದೇಶದ ನಿರ್ದಿಷ್ಟ ಸ್ವರೂಪ ದೊರೆಯಲಿಲ್ಲ ವೇಳೆ ಈ ವಿನ್ಯಾಸವನ್ನು ಬಳಸಿದಾಗ
 DocType: Custom Field,Custom,ಪದ್ಧತಿ
 DocType: Production Order,Use Multi-Level BOM,ಬಹು ಮಟ್ಟದ BOM ಬಳಸಿ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +26,Injection molding,ಅಚ್ಚೊತ್ತುವಿಕೆ
 DocType: Bank Reconciliation,Include Reconciled Entries,ಮರುಕೌನ್ಸಿಲ್ ನಮೂದುಗಳು ಸೇರಿಸಿ
 apps/erpnext/erpnext/config/accounts.py +41,Tree of finanial accounts.,Finanial ಖಾತೆಗಳ ಟ್ರೀ .
 DocType: Leave Control Panel,Leave blank if considered for all employee types,ಎಲ್ಲಾ ನೌಕರ ರೀತಿಯ ಪರಿಗಣಿಸಲಾಗಿದೆ ವೇಳೆ ಖಾಲಿ ಬಿಡಿ
@@ -1697,30 +1637,28 @@
 apps/frappe/frappe/config/setup.py +130,Printing,ಮುದ್ರಣ
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +114,Expense Claim is pending approval. Only the Expense Approver can update status.,ಖರ್ಚು ಹಕ್ಕು ಅನುಮೋದನೆ ಬಾಕಿ ಇದೆ . ಮಾತ್ರ ಖರ್ಚು ಅನುಮೋದಕ ಡೇಟ್ ಮಾಡಬಹುದು .
 DocType: Purchase Invoice,Additional Discount Amount,ಹೆಚ್ಚುವರಿ ರಿಯಾಯಿತಿ ಪ್ರಮಾಣ
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +99,The day(s) on which you are applying for leave are holiday. You need not apply for leave.,ನೀವು ರಜೆ ಹಾಕುತ್ತಿವೆ ಮೇಲೆ ದಿನ (ಗಳು) ರಜಾ ಇವೆ . ನೀವು ಬಿಟ್ಟು ಅರ್ಜಿ ಅಗತ್ಯವಿದೆ .
 apps/frappe/frappe/public/js/frappe/misc/utils.js +110,and,ಮತ್ತು
 DocType: Leave Block List Allow,Leave Block List Allow,ಬ್ಲಾಕ್ ಲಿಸ್ಟ್ ಅನುಮತಿಸಿ ಬಿಡಿ
 apps/erpnext/erpnext/setup/doctype/company/company.py +236,Abbr can not be blank or space,Abbr ಖಾಲಿ ಅಥವಾ ಜಾಗವನ್ನು ಇರುವಂತಿಲ್ಲ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +50,Sports,ಕ್ರೀಡೆ
+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/setup/page/setup_wizard/setup_wizard.js +626,Unit,ಘಟಕ
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Unit,ಘಟಕ
 apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.py +182,Please set Dropbox access keys in your site config,ನಿಮ್ಮ ಸೈಟ್ ಸಂರಚನಾ ಡ್ರಾಪ್ಬಾಕ್ಸ್ accesskeys ಸೆಟ್ ದಯವಿಟ್ಟು
 apps/erpnext/erpnext/stock/get_item_details.py +113,Please specify Company,ಕಂಪನಿ ನಮೂದಿಸಿ
 ,Customer Acquisition and Loyalty,ಗ್ರಾಹಕ ಸ್ವಾಧೀನ ಮತ್ತು ನಿಷ್ಠೆ
 DocType: Purchase Receipt,Warehouse where you are maintaining stock of rejected items,ನೀವು ತಿರಸ್ಕರಿಸಿದರು ಐಟಂಗಳ ಸ್ಟಾಕ್ ನಿರ್ವಹಿಸುವುದು ಅಲ್ಲಿ ವೇರ್ಹೌಸ್
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +408,Your financial year ends on,ನಿಮ್ಮ ಹಣಕಾಸಿನ ವರ್ಷ ಕೊನೆಗೊಳ್ಳುತ್ತದೆ
+apps/erpnext/erpnext/public/js/setup_wizard.js +156,Your financial year ends on,ನಿಮ್ಮ ಹಣಕಾಸಿನ ವರ್ಷ ಕೊನೆಗೊಳ್ಳುತ್ತದೆ
 DocType: POS Profile,Price List,ಬೆಲೆ ಪಟ್ಟಿ
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +20,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0} ಈಗ ಡೀಫಾಲ್ಟ್ ಹಣಕಾಸಿನ ವರ್ಷ ಆಗಿದೆ . ಕಾರ್ಯಗತವಾಗಲು ಬದಲಾವಣೆಗೆ ನಿಮ್ಮ ಬ್ರೌಸರ್ ರಿಫ್ರೆಶ್ ಮಾಡಿ .
 apps/erpnext/erpnext/projects/doctype/project/project.js +47,Expense Claims,ಖರ್ಚು ಹಕ್ಕು
 DocType: Issue,Support,ಬೆಂಬಲ
-DocType: Authorization Rule,Approving Role,ಅಂಗೀಕಾರಕ್ಕಾಗಿ ಪಾತ್ರ
 ,BOM Search,ಬೊಮ್ ಹುಡುಕಾಟ
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +176,Closing (Opening + Totals),ಕ್ಲೋಸಿಂಗ್ (+ ಒಟ್ಟು ತೆರೆಯುವ)
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +26,Please specify currency in Company,ಕಂಪನಿ ಕರೆನ್ಸಿ ಸೂಚಿಸಿ
 DocType: Workstation,Wages per hour,ಗಂಟೆಗೆ ವೇತನ
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,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.","ಇತ್ಯಾದಿ ಸೀರಿಯಲ್ ಸೂಲ , ಪಿಓಎಸ್ ಹಾಗೆ ತೋರಿಸು / ಮರೆಮಾಡು ವೈಶಿಷ್ಟ್ಯಗಳನ್ನು"
-apps/erpnext/erpnext/controllers/accounts_controller.py +236,Account {0} is invalid. Account Currency must be {1},ಖಾತೆ {0} ಅಮಾನ್ಯವಾಗಿದೆ. ಖಾತೆ ಕರೆನ್ಸಿ ಇರಬೇಕು {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +237,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},UOM ಪರಿವರ್ತಿಸುವುದರ ಸತತವಾಗಿ ಅಗತ್ಯವಿದೆ {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +53,Clearance date cannot be before check date in row {0},ಕ್ಲಿಯರೆನ್ಸ್ ದಿನಾಂಕ ದಿನಾಂಕ ಸತತವಾಗಿ ಚೆಕ್ ಮೊದಲು ಸಾಧ್ಯವಿಲ್ಲ {0}
 DocType: Salary Slip,Deduction,ವ್ಯವಕಲನ
@@ -1739,13 +1677,13 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +82,Item {0} has already been returned,ಐಟಂ {0} ಈಗಾಗಲೇ ಮರಳಿದರು
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** ಹಣಕಾಸಿನ ವರ್ಷ ** ಒಂದು ಹಣಕಾಸು ವರ್ಷದ ಪ್ರತಿನಿಧಿಸುತ್ತದೆ. ಎಲ್ಲಾ ಲೆಕ್ಕ ನಮೂದುಗಳನ್ನು ಮತ್ತು ಇತರ ಪ್ರಮುಖ ವ್ಯವಹಾರಗಳ ** ** ಹಣಕಾಸಿನ ವರ್ಷ ವಿರುದ್ಧ ಕಂಡುಕೊಳ್ಳಲಾಯಿತು.
 DocType: Opportunity,Customer / Lead Address,ಗ್ರಾಹಕ / ಲೀಡ್ ವಿಳಾಸ
+apps/erpnext/erpnext/stock/doctype/item/item.py +112,Warning: Invalid SSL certificate on attachment {0},ಎಚ್ಚರಿಕೆ: ಬಾಂಧವ್ಯ ಅಮಾನ್ಯ SSL ಪ್ರಮಾಣಪತ್ರ {0}
 DocType: Production Order Operation,Actual Operation Time,ನಿಜವಾದ ಕಾರ್ಯಾಚರಣೆ ಟೈಮ್
 DocType: Authorization Rule,Applicable To (User),ಅನ್ವಯವಾಗುತ್ತದೆ ( ಬಳಕೆದಾರ )
 DocType: Purchase Taxes and Charges,Deduct,ಕಳೆ
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +170,Job Description,ಜಾಬ್ ವಿವರಣೆ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +170,Job Description,ಜಾಬ್ ವಿವರಣೆ
 DocType: Purchase Order Item,Qty as per Stock UOM,ಪ್ರಮಾಣ ಸ್ಟಾಕ್ UOM ಪ್ರಕಾರ
 apps/frappe/frappe/model/rename_doc.py +343,Please select a valid csv file with data,ದತ್ತಾಂಶ ಮಾನ್ಯ CSV ಕಡತ ಆಯ್ಕೆ ಮಾಡಿ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +92,Coating,ಲೇಪನ
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +126,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","ಹೊರತುಪಡಿಸಿ ವಿಶೇಷ ಅಕ್ಷರಗಳು ""-"" ""."", ""#"", ಮತ್ತು ""/"" ಸರಣಿ ಹೆಸರಿಸುವ ಅನುಮತಿಸಲಾಗುವುದಿಲ್ಲ"
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.",ಮಾರಾಟದ ಶಿಬಿರಗಳು ಟ್ರ್ಯಾಕ್. ಲೀಡ್ಸ್ ಉಲ್ಲೇಖಗಳು ಜಾಡನ್ನು ಮಾರಾಟದ ಆರ್ಡರ್ ಇತ್ಯಾದಿ ಶಿಬಿರಗಳು ರಿಂದ ಹೂಡಿಕೆ ಮೇಲೆ ರಿಟರ್ನ್ ಅಳೆಯುವ. 
 DocType: Expense Claim,Approver,ಅನಪುಮೋದಕ
@@ -1755,12 +1693,11 @@
 DocType: Supplier Quotation,Manufacturing Manager,ಉತ್ಪಾದನಾ ಮ್ಯಾನೇಜರ್
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +191,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/hooks.py +84,Shipments,ಸಾಗಣೆಗಳು
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +29,Dip molding,ಅದ್ದು ಸೂರು
+apps/erpnext/erpnext/hooks.py +68,Shipments,ಸಾಗಣೆಗಳು
 DocType: Purchase Order,To be delivered to customer,ಗ್ರಾಹಕನಿಗೆ ನೀಡಬೇಕಾಗಿದೆ
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,ಟೈಮ್ ಲಾಗ್ ಸ್ಥಿತಿ ಸಲ್ಲಿಸಬೇಕು.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,ಸೀರಿಯಲ್ ಯಾವುದೇ {0} ಯಾವುದೇ ವೇರ್ಹೌಸ್ ಸೇರುವುದಿಲ್ಲ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +650,Setting Up,ಹೊಂದಿಸಲಾಗುತ್ತಿದೆ
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +114,Setting Up,ಹೊಂದಿಸಲಾಗುತ್ತಿದೆ
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,Row # ,ರೋ #
 DocType: Purchase Invoice,In Words (Company Currency),ವರ್ಡ್ಸ್ ( ಕಂಪನಿ ಕರೆನ್ಸಿ ) ರಲ್ಲಿ
 DocType: Pricing Rule,Supplier,ಸರಬರಾಜುದಾರ
@@ -1768,7 +1705,7 @@
 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 +166,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,ಖರ್ಚು ಅಥವಾ ವ್ಯತ್ಯಾಸ ಖಾತೆ ಕಡ್ಡಾಯ ಐಟಂ {0} ಪರಿಣಾಮ ಬೀರುತ್ತದೆ ಒಟ್ಟಾರೆ ಸ್ಟಾಕ್ ಮೌಲ್ಯ
-apps/erpnext/erpnext/controllers/accounts_controller.py +354,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","ಸತತವಾಗಿ ಐಟಂ {0} ಫಾರ್ overbill ಸಾಧ್ಯವಿಲ್ಲ {1} ಹೆಚ್ಚು {2}. Overbilling, ಸ್ಟಾಕ್ ಸೆಟ್ಟಿಂಗ್ಗಳು ದಯವಿಟ್ಟು ಅವಕಾಶ"
+apps/erpnext/erpnext/controllers/accounts_controller.py +355,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","ಸತತವಾಗಿ ಐಟಂ {0} ಫಾರ್ overbill ಸಾಧ್ಯವಿಲ್ಲ {1} ಹೆಚ್ಚು {2}. Overbilling, ಸ್ಟಾಕ್ ಸೆಟ್ಟಿಂಗ್ಗಳು ದಯವಿಟ್ಟು ಅವಕಾಶ"
 DocType: Employee,Bank Name,ಬ್ಯಾಂಕ್ ಹೆಸರು
 apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +27,-Above,-Above
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +135,User {0} is disabled,ಬಳಕೆದಾರ {0} ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ
@@ -1781,27 +1718,26 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,{0} is mandatory for Item {1},{0} ಐಟಂ ಕಡ್ಡಾಯ {1}
 DocType: Currency Exchange,From Currency,ಚಲಾವಣೆಯ
 DocType: DocField,Name,ಹೆಸರು
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +211,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","ಕನಿಷ್ಠ ಒಂದು ಸತತವಾಗಿ ನಿಗದಿ ಪ್ರಮಾಣ, ಸರಕುಪಟ್ಟಿ ಕೌಟುಂಬಿಕತೆ ಮತ್ತು ಸರಕುಪಟ್ಟಿ ಸಂಖ್ಯೆ ಆಯ್ಕೆಮಾಡಿ"
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +104,Sales Order required for Item {0},ಮಾರಾಟದ ಆರ್ಡರ್ ಐಟಂ ಅಗತ್ಯವಿದೆ {0}
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +158,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","ಕನಿಷ್ಠ ಒಂದು ಸತತವಾಗಿ ನಿಗದಿ ಪ್ರಮಾಣ, ಸರಕುಪಟ್ಟಿ ಕೌಟುಂಬಿಕತೆ ಮತ್ತು ಸರಕುಪಟ್ಟಿ ಸಂಖ್ಯೆ ಆಯ್ಕೆಮಾಡಿ"
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +107,Sales Order required for Item {0},ಮಾರಾಟದ ಆರ್ಡರ್ ಐಟಂ ಅಗತ್ಯವಿದೆ {0}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +43,Amounts not reflected in system,ವ್ಯವಸ್ಥೆಯ ಕಾಣಿಸಿಕೊಂಡಿಲ್ಲ ಪ್ರಮಾಣದ
 DocType: Purchase Invoice Item,Rate (Company Currency),ದರ ( ಕಂಪನಿ ಕರೆನ್ಸಿ )
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +40,Others,ಇತರೆ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +40,Others,ಇತರೆ
 apps/erpnext/erpnext/templates/includes/product_page.js +80,Cannot find a matching Item. Please select some other value for {0}.,ಮ್ಯಾಚಿಂಗ್ ಐಟಂ ಸಿಗುವುದಿಲ್ಲ. ಫಾರ್ {0} ಕೆಲವು ಇತರ ಮೌಲ್ಯ ಆಯ್ಕೆಮಾಡಿ.
 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/frappe/frappe/core/doctype/doctype/boilerplate/controller_list.html +31,Completed,ಪೂರ್ಣಗೊಂಡಿದೆ
 DocType: Web Form,Select DocType,ಆಯ್ಕೆ doctype
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +104,Broaching,Broaching
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +12,Banking,ಲೇವಾದೇವಿ
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,ಲೇವಾದೇವಿ
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +38,Please click on 'Generate Schedule' to get schedule,ವೇಳಾಪಟ್ಟಿ ಪಡೆಯಲು ' ರಚಿಸಿ ವೇಳಾಪಟ್ಟಿ ' ಮೇಲೆ ಕ್ಲಿಕ್ ಮಾಡಿ
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +283,New Cost Center,ಹೊಸ ವೆಚ್ಚ ಸೆಂಟರ್
 DocType: Bin,Ordered Quantity,ಆದೇಶ ಪ್ರಮಾಣ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +397,"e.g. ""Build tools for builders""","ಇ ಜಿ "" ಬಿಲ್ಡರ್ ಗಳು ಉಪಕರಣಗಳು ನಿರ್ಮಿಸಿ """
+apps/erpnext/erpnext/public/js/setup_wizard.js +145,"e.g. ""Build tools for builders""","ಇ ಜಿ "" ಬಿಲ್ಡರ್ ಗಳು ಉಪಕರಣಗಳು ನಿರ್ಮಿಸಿ """
 DocType: Quality Inspection,In Process,ಪ್ರಕ್ರಿಯೆಯಲ್ಲಿ
 DocType: Authorization Rule,Itemwise Discount,Itemwise ಡಿಸ್ಕೌಂಟ್
 DocType: Purchase Order Item,Reference Document Type,ರೆಫರೆನ್ಸ್ ಡಾಕ್ಯುಮೆಂಟ್ ಕೌಟುಂಬಿಕತೆ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +318,{0} against Sales Order {1},{0} ಮಾರಾಟದ ಆರ್ಡರ್ ವಿರುದ್ಧ {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +320,{0} against Sales Order {1},{0} ಮಾರಾಟದ ಆರ್ಡರ್ ವಿರುದ್ಧ {1}
 DocType: Account,Fixed Asset,ಸ್ಥಿರಾಸ್ತಿ
 apps/erpnext/erpnext/config/stock.py +283,Serialized Inventory,ಧಾರಾವಾಹಿಯಾಗಿ ಇನ್ವೆಂಟರಿ
 DocType: Activity Type,Default Billing Rate,ಡೀಫಾಲ್ಟ್ ಬಿಲ್ಲಿಂಗ್ ದರ
@@ -1816,14 +1752,13 @@
 DocType: Purchase Invoice Item,Page Break,ಪುಟ ಬ್ರೇಕ್
 DocType: Production Order Operation,Pending,ಬಾಕಿ
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,ನಿರ್ದಿಷ್ಟ ನೌಕರನ ರಜೆ ಅನ್ವಯಗಳನ್ನು ಒಪ್ಪಿಗೆ ಬಳಕೆದಾರರು
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +33,You cannot change default UOM of Variant. To change default UOM for Variant change default UOM of the Template,ನೀವು ಭಿನ್ನ ಡೀಫಾಲ್ಟ್ ಮೈಸೂರು ವಿಶ್ವವಿದ್ಯಾನಿಲದ ಬದಲಿಸಲಾಗುವುದಿಲ್ಲ. ಟೆಂಪ್ಲೇಟು ಭಿನ್ನ ಬದಲಾವಣೆ ಡೀಫಾಲ್ಟ್ ಮೈಸೂರು ವಿಶ್ವವಿದ್ಯಾನಿಲದ ಡೀಫಾಲ್ಟ್ ಮೈಸೂರು ವಿಶ್ವವಿದ್ಯಾನಿಲದ ಬದಲಾಯಿಸಲು
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +50,Office Equipments,ಕಚೇರಿ ಉಪಕರಣ
 DocType: Purchase Invoice Item,Qty,ಪ್ರಮಾಣ
 DocType: Fiscal Year,Companies,ಕಂಪನಿಗಳು
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +24,Electronics,ಇಲೆಕ್ಟ್ರಾನಿಕ್ ಶಾಸ್ತ್ರ
+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/support/doctype/maintenance_visit/maintenance_visit.js +18,From Maintenance Schedule,ನಿರ್ವಹಣೆ ವೇಳಾಪಟ್ಟಿ ಗೆ
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +56,Full-time,ಪೂರ್ಣ ಬಾರಿ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +56,Full-time,ಪೂರ್ಣ ಬಾರಿ
 DocType: Purchase Invoice,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.","ನೀವು ಮಾರಾಟ ತೆರಿಗೆ ಮತ್ತು ಶುಲ್ಕಗಳು ಟೆಂಪ್ಲೇಟು ಮಾದರಿಯಲ್ಲಿ ಸೃಷ್ಟಿಸಿದ್ದರೆ, ಒಂದು ಆಯ್ಕೆ ಮತ್ತು ಕೆಳಗಿನ ಬಟನ್ ಮೇಲೆ ಕ್ಲಿಕ್ ಮಾಡಿ."
@@ -1835,11 +1770,12 @@
 DocType: Job Applicant,Job Opening,ಉದ್ಯೋಗಾವಕಾಶದ
 DocType: Payment Reconciliation,Payment Reconciliation,ಪಾವತಿ ಸಾಮರಸ್ಯ
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +154,Please select Incharge Person's name,ಉಸ್ತುವಾರಿ ವ್ಯಕ್ತಿಯ ಹೆಸರು ಆಯ್ಕೆ ಮಾಡಿ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +51,Technology,ತಂತ್ರಜ್ಞಾನ
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,ತಂತ್ರಜ್ಞಾನ
 DocType: Offer Letter,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,ಒಟ್ಟು ಸರಕುಪಟ್ಟಿ ಆಮ್ಟ್
 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.","ChildNodes ಸೇರಿಸಲು, ಮರ ಅನ್ವೇಷಿಸಲು ಮತ್ತು ನೀವು ಹೆಚ್ಚು ಗ್ರಂಥಿಗಳು ಸೇರಿಸಲು ಬಯಸುವ ಯಾವ ನೋಡ್ ಅನ್ನು ."
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +102,Credit To account must be a Payable account,ಖಾತೆಗೆ ಕ್ರೆಡಿಟ್ ಒಂದು ಪಾವತಿಸಲಾಗುವುದು ಖಾತೆಯನ್ನು ಇರಬೇಕು
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +233,BOM recursion: {0} cannot be parent or child of {2},BOM ಪುನರಾವರ್ತನ : {0} ಪೋಷಕರು ಅಥವಾ ಮಗು ಸಾಧ್ಯವಿಲ್ಲ {2}
@@ -1852,10 +1788,8 @@
 DocType: Item,Customer Item Codes,ಗ್ರಾಹಕ ಐಟಂ ಕೋಡ್ಸ್
 DocType: Opportunity,Lost Reason,ಲಾಸ್ಟ್ ಕಾರಣ
 apps/erpnext/erpnext/config/accounts.py +68,Create Payment Entries against Orders or Invoices.,ಆದೇಶ ಅಥವಾ ಇನ್ವಾಯ್ಸ್ ವಿರುದ್ಧ ಪಾವತಿ ನಮೂದುಗಳು ರಚಿಸಿ.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +141,Welding,ವೆಲ್ಡಿಂಗ್
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +40,New Stock UOM is required,ಹೊಸ ಸ್ಟಾಕ್ UOM ಅಗತ್ಯವಿದೆ
 DocType: Quality Inspection,Sample Size,ಸ್ಯಾಂಪಲ್ ಸೈಜ್
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +443,All items have already been invoiced,ಎಲ್ಲಾ ಐಟಂಗಳನ್ನು ಈಗಾಗಲೇ ಸರಕುಪಟ್ಟಿ ಮಾಡಲಾಗಿದೆ
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +446,All items have already been invoiced,ಎಲ್ಲಾ ಐಟಂಗಳನ್ನು ಈಗಾಗಲೇ ಸರಕುಪಟ್ಟಿ ಮಾಡಲಾಗಿದೆ
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',ಮಾನ್ಯ ಸೂಚಿಸಲು ದಯವಿಟ್ಟು ' ಕೇಸ್ ನಂ ಗೆ . '
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +287,Further cost centers can be made under Groups but entries can be made against non-Groups,ಮತ್ತಷ್ಟು ವೆಚ್ಚ ಕೇಂದ್ರಗಳು ಗುಂಪುಗಳು ಅಡಿಯಲ್ಲಿ ಮಾಡಬಹುದು ಆದರೆ ನಮೂದುಗಳನ್ನು ಅಲ್ಲದ ಗುಂಪುಗಳ ವಿರುದ್ಧ ಮಾಡಬಹುದು
 DocType: Project,External,ಬಾಹ್ಯ
@@ -1867,8 +1801,7 @@
 DocType: Bin,Actual Quantity,ನಿಜವಾದ ಪ್ರಮಾಣ
 DocType: Shipping Rule,example: Next Day Shipping,ಉದಾಹರಣೆಗೆ : ಮುಂದೆ ದಿನ ಶಿಪ್ಪಿಂಗ್
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,ಕಂಡುಬಂದಿಲ್ಲ ಸರಣಿ ಯಾವುದೇ {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +563,Your Customers,ನಿಮ್ಮ ಗ್ರಾಹಕರು
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +27,Compression molding,ಸಂಕೋಚನ ಸೂರು
+apps/erpnext/erpnext/public/js/setup_wizard.js +303,Your Customers,ನಿಮ್ಮ ಗ್ರಾಹಕರು
 DocType: Leave Block List Date,Block Date,ಬ್ಲಾಕ್ ದಿನಾಂಕ
 DocType: Sales Order,Not Delivered,ಈಡೇರಿಸಿಲ್ಲ
 ,Bank Clearance Summary,ಬ್ಯಾಂಕ್ ಕ್ಲಿಯರೆನ್ಸ್ ಸಾರಾಂಶ
@@ -1889,10 +1822,10 @@
 DocType: SMS Log,Sent To,ಕಳುಹಿಸಲಾಗುತ್ತದೆ
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +28,Make Sales Invoice,ಮಾರಾಟದ ಸರಕುಪಟ್ಟಿ ಮಾಡಿ
 DocType: Company,For Reference Only.,ಪರಾಮರ್ಶೆಗಾಗಿ ಮಾತ್ರ.
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +29,Invalid {0}: {1},ಅಮಾನ್ಯ {0}: {1}
+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,ಸಾಮರ್ಥ್ಯವನ್ನು ಯೋಜನೆ
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +49,'From Date' is required,' ದಿನಾಂಕದಿಂದ ' ಅಗತ್ಯವಿದೆ
+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,ಹೊಸ ಕೆಲಸದ
@@ -1907,7 +1840,7 @@
 DocType: Serial No,Delivery Time,ಡೆಲಿವರಿ ಟೈಮ್
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,ರಂದು ಆಧರಿಸಿ ಏಜಿಂಗ್
 DocType: Item,End of Life,ಲೈಫ್ ಅಂತ್ಯ
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +41,Travel,ಓಡಾಡು
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +41,Travel,ಓಡಾಡು
 DocType: Leave Block List,Allow Users,ಬಳಕೆದಾರರನ್ನು ಅನುಮತಿಸಿ
 DocType: Purchase Order,Customer Mobile No,ಗ್ರಾಹಕ ಮೊಬೈಲ್ ಯಾವುದೇ
 DocType: Sales Invoice,Recurring,ಮರುಕಳಿಸುವ
@@ -1921,7 +1854,7 @@
 DocType: Naming Series,User must always select,ಬಳಕೆದಾರ ಯಾವಾಗಲೂ ಆಯ್ಕೆ ಮಾಡಬೇಕು
 DocType: Stock Settings,Allow Negative Stock,ನಕಾರಾತ್ಮಕ ಸ್ಟಾಕ್ ಅನುಮತಿಸಿ
 DocType: Installation Note,Installation Note,ಅನುಸ್ಥಾಪನೆ ಸೂಚನೆ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +541,Add Taxes,ತೆರಿಗೆಗಳು ಸೇರಿಸಿ
+apps/erpnext/erpnext/public/js/setup_wizard.js +283,Add Taxes,ತೆರಿಗೆಗಳು ಸೇರಿಸಿ
 ,Financial Analytics,ಹಣಕಾಸು ಅನಾಲಿಟಿಕ್ಸ್
 DocType: Quality Inspection,Verified By,ಪರಿಶೀಲಿಸಲಾಗಿದೆ
 DocType: Address,Subsidiary,ಸಹಕಾರಿ
@@ -1931,7 +1864,6 @@
 DocType: System Settings,In Hours,ಗಂಟೆಗಳ
 DocType: Process Payroll,Create Salary Slip,ಸಂಬಳ ಸ್ಲಿಪ್ ರಚಿಸಿ
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Expected balance as per bank,ಬ್ಯಾಂಕ್ ಪ್ರಕಾರ ನಿರೀಕ್ಷಿಸಲಾಗಿದೆ ಸಮತೋಲನ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +115,Buffing,Buffing
 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,ನೌಕರರ
@@ -1948,11 +1880,11 @@
 DocType: Rename Tool,File to Rename,ಮರುಹೆಸರಿಸಲು ಫೈಲ್
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +176,Purchse Order number required for Item {0},Purchse ಆದೇಶ ಸಂಖ್ಯೆ ಐಟಂ ಅಗತ್ಯವಿದೆ {0}
 apps/erpnext/erpnext/public/js/controllers/transaction.js +136,Show Payments,ಶೋ ಪಾವತಿಗಳು
-apps/erpnext/erpnext/controllers/buying_controller.py +245,Specified BOM {0} does not exist for Item {1},ಐಟಂ ಅಸ್ತಿತ್ವದಲ್ಲಿಲ್ಲ ನಿಗದಿತ ಬಿಒಎಮ್ {0} {1}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +202,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,ನಿರ್ವಹಣೆ ವೇಳಾಪಟ್ಟಿ {0} ಈ ಮಾರಾಟದ ಆದೇಶವನ್ನು ರದ್ದುಗೊಳಿಸುವ ಮೊದಲು ರದ್ದು ಮಾಡಬೇಕು
+apps/erpnext/erpnext/controllers/buying_controller.py +236,Specified BOM {0} does not exist for Item {1},ಐಟಂ ಅಸ್ತಿತ್ವದಲ್ಲಿಲ್ಲ ನಿಗದಿತ ಬಿಒಎಮ್ {0} {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,ನಿರ್ವಹಣೆ ವೇಳಾಪಟ್ಟಿ {0} ಈ ಮಾರಾಟದ ಆದೇಶವನ್ನು ರದ್ದುಗೊಳಿಸುವ ಮೊದಲು ರದ್ದು ಮಾಡಬೇಕು
 apps/frappe/frappe/desk/page/backups/backups.html +13,Size,ಗಾತ್ರ
 DocType: Notification Control,Expense Claim Approved,ಖರ್ಚು ಹಕ್ಕು ಅನುಮೋದನೆ
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +113,Pharmaceutical,ಔಷಧೀಯ
+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,ಮಾರಾಟದ ಆದೇಶ ಅಗತ್ಯವಿರುವ
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +30,Create Customer,ಗ್ರಾಹಕ ರಚಿಸಿ
@@ -1962,7 +1894,6 @@
 DocType: Quality Inspection Reading,Reading 9,9 ಓದುವಿಕೆ
 DocType: Supplier,Is Frozen,ಹೆಪ್ಪುಗಟ್ಟಿರುವ
 DocType: Buying Settings,Buying Settings,ಸೆಟ್ಟಿಂಗ್ಗಳು ಖರೀದಿ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +122,Mass finishing,ಮಾಸ್ ಸ್ಥಾನ
 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),ಮಾರಾಟ ಇಮೇಲ್ ಐಡಿ ಸೆಟಪ್ ಒಳಬರುವ ಸರ್ವರ್ . ( ಇ ಜಿ sales@example.com )
@@ -1970,7 +1901,7 @@
 DocType: Payment Tool,Payment Account,ಪಾವತಿ ಖಾತೆ
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +713,Please specify Company to proceed,ಮುಂದುವರೆಯಲು ಕಂಪನಿ ನಮೂದಿಸಿ
 apps/frappe/frappe/public/js/frappe/model/indicator.js +30,Draft,ಡ್ರಾಫ್ಟ್
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +46,Compensatory Off,ಪರಿಹಾರ ಆಫ್
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Compensatory Off,ಪರಿಹಾರ ಆಫ್
 DocType: Quality Inspection Reading,Accepted,Accepted
 DocType: User,Female,ಹೆಣ್ಣು
 DocType: Journal Entry Account,Debit in Account Currency,ಖಾತೆ ಕರೆನ್ಸಿ ಡೆಬಿಟ್
@@ -1982,7 +1913,7 @@
 DocType: Shipping Rule,Shipping Rule Label,ಶಿಪ್ಪಿಂಗ್ ಲೇಬಲ್ ರೂಲ್
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +209,Raw Materials cannot be blank.,ರಾ ಮೆಟೀರಿಯಲ್ಸ್ ಖಾಲಿ ಇರುವಂತಿಲ್ಲ.
 DocType: Newsletter,Test,ಟೆಸ್ಟ್
-apps/erpnext/erpnext/stock/doctype/item/item.py +364,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +368,"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'","ಅಸ್ತಿತ್ವದಲ್ಲಿರುವ ಸ್ಟಾಕ್ ವ್ಯವಹಾರ ನಿಮಗೆ ಮೌಲ್ಯಗಳನ್ನು ಬದಲಾಯಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ \ ಈ ಐಟಂ, ಇವೆ ಎಂದು &#39;ಸೀರಿಯಲ್ ಯಾವುದೇ ಹೊಂದಿದೆ&#39;, &#39;ಬ್ಯಾಚ್ ಹೊಂದಿದೆ ಇಲ್ಲ&#39;, &#39;ಸ್ಟಾಕ್ ಐಟಂ&#39; ಮತ್ತು &#39;ಮೌಲ್ಯಮಾಪನ ವಿಧಾನ&#39;"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +448,Quick Journal Entry,ತ್ವರಿತ ಜರ್ನಲ್ ಎಂಟ್ರಿ
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +92,You can not change rate if BOM mentioned agianst any item,BOM ಯಾವುದೇ ಐಟಂ agianst ಪ್ರಸ್ತಾಪಿಸಿದ್ದಾರೆ ವೇಳೆ ನೀವು ದರ ಬದಲಾಯಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ
@@ -1993,13 +1924,14 @@
 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.,ಪ್ರತ್ಯೇಕ ಉತ್ಪಾದನಾ ಸಲುವಾಗಿ ಪ್ರತಿ ಸಿದ್ಧಪಡಿಸಿದ ಉತ್ತಮ ಐಟಂ ನಿರ್ಮಿಸಲಾಗುತ್ತದೆ .
 DocType: Purchase Invoice,Terms and Conditions1,ನಿಯಮಗಳು ಮತ್ತು Conditions1
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +18,Complete Setup,ಕಂಪ್ಲೀಟ್ ಸೆಟಪ್
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard_page.html +18,Complete Setup,ಕಂಪ್ಲೀಟ್ ಸೆಟಪ್
 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),ಭಿನ್ನರಾಶಿಗಳನ್ನು ಅವಕಾಶ ಈ ಪರಿಶೀಲಿಸಿ . ( ಸೂಲ ಫಾರ್ )
 apps/erpnext/erpnext/config/crm.py +96,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 +57,Total Absent,ಒಟ್ಟು ಆಬ್ಸೆಂಟ್
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +746,Item or Warehouse for row {0} does not match Material Request,ಸಾಲು ಐಟಂ ಅಥವಾ ಗೋದಾಮಿನ {0} ಮೆಟೀರಿಯಲ್ ವಿನಂತಿ ಹೊಂದಿಕೆಯಾಗುವುದಿಲ್ಲ
@@ -2024,16 +1956,15 @@
 DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),ಮೂಲ ದರದ (ಸ್ಟಾಕ್ ಮೈಸೂರು ವಿಶ್ವವಿದ್ಯಾನಿಲದ ಪ್ರಕಾರ)
 DocType: SMS Log,No of Requested SMS,ವಿನಂತಿಸಲಾಗಿದೆ SMS ನ ನಂ
 DocType: Campaign,Campaign-.####,ಕ್ಯಾಂಪೇನ್ . # # # #
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +55,Piercing,ಚುಚ್ಚುವ
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,ಮುಂದಿನ ಕ್ರಮಗಳು
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +117,Contract End Date must be greater than Date of Joining,ಕಾಂಟ್ರಾಕ್ಟ್ ಎಂಡ್ ದಿನಾಂಕ ಸೇರುವ ದಿನಾಂಕ ಹೆಚ್ಚಿನ ಇರಬೇಕು
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,ನಿಯೋಜನೆಗಾಗಿ ಕಂಪನಿಗಳು ಉತ್ಪನ್ನಗಳನ್ನು ಮಾರುತ್ತದೆ ಒಬ್ಬ ಮೂರನೇ ವ್ಯಕ್ತಿಯ ವಿತರಕ / ಡೀಲರ್ / ಆಯೋಗದ ಏಜೆಂಟ್ / ಅಂಗ / ಮರುಮಾರಾಟಗಾರರ.
 DocType: Customer Group,Has Child Node,ಮಗುವಿನ ನೋಡ್ ಹೊಂದಿದೆ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{0} against Purchase Order {1},{0} ಪರ್ಚೇಸ್ ಆರ್ಡರ್ ವಿರುದ್ಧ {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +332,{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/page/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
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +110,Photochemical machining,ದ್ಯುತಿರಾಸಾಯನಿಕ ಯಂತ್ರ
 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.
 
 #### Note
@@ -2079,7 +2010,7 @@
 DocType: Purchase Receipt Item,Recd Quantity,Recd ಪ್ರಮಾಣ
 DocType: Email Account,Email Ids,ಇಮೇಲ್ ಐಡಿಗಳನ್ನು
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},ಹೆಚ್ಚು ಐಟಂ ಉತ್ಪಾದಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ {0} ಹೆಚ್ಚು ಮಾರಾಟದ ಆರ್ಡರ್ ಪ್ರಮಾಣ {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +471,Stock Entry {0} is not submitted,ಸ್ಟಾಕ್ ಎಂಟ್ರಿ {0} ಸಲ್ಲಿಸದಿದ್ದರೆ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +473,Stock Entry {0} is not submitted,ಸ್ಟಾಕ್ ಎಂಟ್ರಿ {0} ಸಲ್ಲಿಸದಿದ್ದರೆ
 DocType: Payment Reconciliation,Bank / Cash Account,ಬ್ಯಾಂಕ್ / ನಗದು ಖಾತೆ
 DocType: Tax Rule,Billing City,ಬಿಲ್ಲಿಂಗ್ ನಗರ
 DocType: Global Defaults,Hide Currency Symbol,ಕರೆನ್ಸಿ ಸಂಕೇತ ಮರೆಮಾಡಿ
@@ -2095,7 +2026,7 @@
 DocType: Purchase Invoice,Currency and Price List,ಕರೆನ್ಸಿ ಮತ್ತು ಬೆಲೆ ಪಟ್ಟಿ
 DocType: Opportunity,Customer / Lead Name,ಗ್ರಾಹಕ / ಲೀಡ್ ಹೆಸರು
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +63,Clearance Date not mentioned,ಕ್ಲಿಯರೆನ್ಸ್ ದಿನಾಂಕ ಪ್ರಸ್ತಾಪಿಸಿದ್ದಾರೆ
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +71,Production,ಉತ್ಪಾದನೆ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Production,ಉತ್ಪಾದನೆ
 DocType: Item,Allow Production Order,ಅನುಮತಿಸಿ ಉತ್ಪಾದನೆ ಆರ್ಡರ್
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +60,Row {0}:Start Date must be before End Date,ರೋ {0} : ಪ್ರಾರಂಭ ದಿನಾಂಕ ಎಂಡ್ ದಿನಾಂಕದ ಮೊದಲು
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),ಒಟ್ಟು (ಪ್ರಮಾಣ)
@@ -2108,7 +2039,7 @@
 apps/erpnext/erpnext/utilities/doctype/address/address.py +113,My Addresses,ನನ್ನ ವಿಳಾಸಗಳು
 DocType: Stock Ledger Entry,Outgoing Rate,ಹೊರಹೋಗುವ ದರ
 apps/erpnext/erpnext/config/hr.py +100,Organization branch master.,ಸಂಸ್ಥೆ ಶಾಖೆ ಮಾಸ್ಟರ್ .
-apps/erpnext/erpnext/controllers/accounts_controller.py +237, or ,ಅಥವಾ
+apps/erpnext/erpnext/controllers/accounts_controller.py +238, 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 ಮೇಲೆ
@@ -2135,6 +2066,7 @@
 DocType: Stock Entry Detail,Serial No / Batch,ಯಾವುದೇ ಸೀರಿಯಲ್ / ಬ್ಯಾಚ್
 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 +213,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',ನಿರ್ವಹಣೆ ವೇಳಾಪಟ್ಟಿ ಎಲ್ಲಾ ಐಟಂಗಳನ್ನು ಉತ್ಪತ್ತಿಯಾಗುವುದಿಲ್ಲ. ವೇಳಾಪಟ್ಟಿ ' ' ರಚಿಸಿ 'ಅನ್ನು ಕ್ಲಿಕ್ ಮಾಡಿ
 ,To Produce,ಉತ್ಪಾದಿಸಲು
 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} ಸಹ ಸೇರಿಸಲೇಬೇಕು"
@@ -2142,10 +2074,7 @@
 DocType: Bin,Reserved Quantity,ರಿಸರ್ವ್ಡ್ ಪ್ರಮಾಣ
 DocType: Landed Cost Voucher,Purchase Receipt Items,ಖರೀದಿ ರಸೀತಿ ಐಟಂಗಳು
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,ಇಚ್ಛೆಗೆ ತಕ್ಕಂತೆ ಫಾರ್ಮ್ಸ್
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +62,Cutting,ಕಟಿಂಗ್
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +69,Flattening,ದುರ್ಬಲಗೊಳ್ಳುವ
 DocType: Account,Income Account,ಆದಾಯ ಖಾತೆ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +22,Molding,ರೂಪಣೆಯ
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +632,Delivery,ಡೆಲಿವರಿ
 DocType: Stock Reconciliation Item,Current Qty,ಪ್ರಸ್ತುತ ಪ್ರಮಾಣ
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section","ವಿಭಾಗ ಕಾಸ್ಟಿಂಗ್ ರಲ್ಲಿ ""ಆಧರಿಸಿ ವಸ್ತುಗಳ ದರ "" ನೋಡಿ"
@@ -2155,20 +2084,19 @@
 apps/frappe/frappe/desk/moduleview.py +61,Documents,ಡಾಕ್ಯುಮೆಂಟ್ಸ್
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +17,Ref,ತೀರ್ಪುಗಾರ
 DocType: Cost Center,Cost Center,ವೆಚ್ಚ ಸೆಂಟರ್
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.js +48,Voucher #,ಚೀಟಿ #
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +36,Voucher #,ಚೀಟಿ #
 DocType: Notification Control,Purchase Order Message,ಖರೀದಿ ಆದೇಶವನ್ನು ಸಂದೇಶವನ್ನು
 DocType: Tax Rule,Shipping Country,ಶಿಪ್ಪಿಂಗ್ ಕಂಟ್ರಿ
 DocType: Upload Attendance,Upload HTML,ಅಪ್ಲೋಡ್ ಎಚ್ಟಿಎಮ್ಎಲ್
-apps/erpnext/erpnext/controllers/accounts_controller.py +391,"Total advance ({0}) against Order {1} cannot be greater \
+apps/erpnext/erpnext/controllers/accounts_controller.py +392,"Total advance ({0}) against Order {1} cannot be greater \
 				than the Grand Total ({2})","ಒಟ್ಟು ಮುಂಚಿತವಾಗಿ ({0}) ಆರ್ಡರ್ ವಿರುದ್ಧ {1} \
  ಹೆಚ್ಚಾಗಿರುವುದು ಸಾಧ್ಯವಿಲ್ಲ ಗ್ರ್ಯಾಂಡ್ ಒಟ್ಟು ಹೆಚ್ಚು ({2})"
 DocType: Employee,Relieving Date,ದಿನಾಂಕ ನಿವಾರಿಸುವ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +12,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.","ಬೆಲೆ ರೂಲ್ ಕೆಲವು ಮಾನದಂಡಗಳನ್ನು ಆಧರಿಸಿ, ಬೆಲೆ ಪಟ್ಟಿ / ರಿಯಾಯಿತಿ ಶೇಕಡಾವಾರು ವ್ಯಾಖ್ಯಾನಿಸಲು ಬದಲಿಸಿ ತಯಾರಿಸಲಾಗುತ್ತದೆ."
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,ವೇರ್ಹೌಸ್ ಮಾತ್ರ ಸ್ಟಾಕ್ ಎಂಟ್ರಿ / ಡೆಲಿವರಿ ಸೂಚನೆ / ರಸೀತಿ ಖರೀದಿ ಮೂಲಕ ಬದಲಾಯಿಸಬಹುದು
 DocType: Employee Education,Class / Percentage,ವರ್ಗ / ಶೇಕಡಾವಾರು
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +92,Head of Marketing and Sales,ಮಾರ್ಕೆಟಿಂಗ್ ಮತ್ತು ಮಾರಾಟದ ಮುಖ್ಯಸ್ಥ
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +31,Income Tax,ವರಮಾನ ತೆರಿಗೆ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +157,Laser engineered net shaping,ಲೇಸರ್ ನಿವ್ವಳ ಆಕಾರ ವಿನ್ಯಾಸ
+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.,ಟ್ರ್ಯಾಕ್ ಇಂಡಸ್ಟ್ರಿ ಪ್ರಕಾರ ಕಾರಣವಾಗುತ್ತದೆ.
 DocType: Item Supplier,Item Supplier,ಐಟಂ ಸರಬರಾಜುದಾರ
@@ -2191,31 +2119,28 @@
 DocType: Stock Ledger Entry,Actual Qty After Transaction,ವ್ಯವಹಾರದ ನಂತರ ನಿಜವಾದ ಪ್ರಮಾಣ
 ,Pending SO Items For Purchase Request,ಖರೀದಿ ವಿನಂತಿ ಆದ್ದರಿಂದ ಐಟಂಗಳು ಬಾಕಿ
 DocType: Supplier,Billing Currency,ಬಿಲ್ಲಿಂಗ್ ಕರೆನ್ಸಿ
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +148,Extra Large,ದೊಡ್ಡದು
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,Extra Large,ದೊಡ್ಡದು
 ,Profit and Loss Statement,ಲಾಭ ಮತ್ತು ನಷ್ಟ ಹೇಳಿಕೆ
 DocType: Bank Reconciliation Detail,Cheque Number,ಚೆಕ್ ಸಂಖ್ಯೆ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +43,Pressing,ಒತ್ತುವುದರಿಂದ
 DocType: Payment Tool Detail,Payment Tool Detail,ಪಾವತಿ ಉಪಕರಣ ವಿವರ
 ,Sales Browser,ಮಾರಾಟದ ಬ್ರೌಸರ್
 DocType: Journal Entry,Total Credit,ಒಟ್ಟು ಕ್ರೆಡಿಟ್
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +474,Warning: Another {0} # {1} exists against stock entry {2},ಎಚ್ಚರಿಕೆ: ಮತ್ತೊಂದು {0} # {1} ಸ್ಟಾಕ್ ಪ್ರವೇಶ ವಿರುದ್ಧ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +459,Local,ಸ್ಥಳೀಯ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +476,Warning: Another {0} # {1} exists against stock entry {2},ಎಚ್ಚರಿಕೆ: ಮತ್ತೊಂದು {0} # {1} ಸ್ಟಾಕ್ ಪ್ರವೇಶ ವಿರುದ್ಧ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ {2}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +397,Local,ಸ್ಥಳೀಯ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),ಸಾಲ ಮತ್ತು ಅಡ್ವಾನ್ಸಸ್ ( ಆಸ್ತಿಗಳು )
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,ಸಾಲಗಾರರು
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +147,Large,ದೊಡ್ಡದು
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +23,No employee found!,ಯಾವುದೇ ನೌಕರ ಕಂಡು !
+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 +152,Please mention no of visits required,ನಮೂದಿಸಿ ಅಗತ್ಯವಿದೆ ಭೇಟಿ ಯಾವುದೇ
 DocType: Purchase Order,Customer Address Display,ಗ್ರಾಹಕ ವಿಳಾಸ ಪ್ರದರ್ಶನ
 DocType: Stock Settings,Default Valuation Method,ಡೀಫಾಲ್ಟ್ ಮೌಲ್ಯಮಾಪನ ವಿಧಾನ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +127,Polishing,ಹೊಳಪು
 DocType: Production Order Operation,Planned Start Time,ಯೋಜಿತ ಆರಂಭಿಸಲು ಸಮಯ
 apps/erpnext/erpnext/config/accounts.py +63,Close Balance Sheet and book Profit or Loss.,ಮುಚ್ಚಿ ಬ್ಯಾಲೆನ್ಸ್ ಶೀಟ್ ಮತ್ತು ಪುಸ್ತಕ ಲಾಭ ಅಥವಾ ನಷ್ಟ .
-apps/erpnext/erpnext/stock/doctype/item/item.py +661,"Default Unit of Measure for Item {0} cannot be changed directly because \
+apps/erpnext/erpnext/stock/doctype/item/item.py +665,"Default Unit of Measure for Item {0} cannot be changed directly because \
 			you have already made some transaction(s) with another UOM. To change default UOM, \
 			use 'UOM Replace Utility' tool under Stock module.","ನೀವು ಈಗಾಗಲೇ ಮತ್ತೊಂದು ಮೈಸೂರು ವಿಶ್ವವಿದ್ಯಾನಿಲದ ಕೆಲವು ವ್ಯವಹಾರ (ರು) ಮಾಡಿದ \ ಕಾರಣ ಐಟಂ ಚಟುವಟಿಕೆ ಡೀಫಾಲ್ಟ್ ಘಟಕ {0} ನೇರವಾಗಿ ಬದಲಾಯಿಸಲಾಗುವುದಿಲ್ಲ. ಡೀಫಾಲ್ಟ್ ಮೈಸೂರು ವಿಶ್ವವಿದ್ಯಾನಿಲದ ಬದಲಾಯಿಸಲು, \ ಬಳಕೆ ಸ್ಟಾಕ್ ಘಟಕ ಅಡಿಯಲ್ಲಿ ಸಾಧನ &#39;ಮೈಸೂರು ವಿಶ್ವವಿದ್ಯಾನಿಲದ ಯುಟಿಲಿಟಿ ಬದಲಾಯಿಸಿ&#39;."
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,ವಿನಿಮಯ ದರ ಇನ್ನೊಂದು ಒಂದು ಕರೆನ್ಸಿ ಪರಿವರ್ತಿಸಲು ಸೂಚಿಸಿ
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +146,Quotation {0} is cancelled,ನುಡಿಮುತ್ತುಗಳು {0} ರದ್ದು
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +141,Quotation {0} is cancelled,ನುಡಿಮುತ್ತುಗಳು {0} ರದ್ದು
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,ಒಟ್ಟು ಬಾಕಿ ಮೊತ್ತದ
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} was on leave on {1}. Cannot mark attendance.,ನೌಕರರ {0} ಮೇಲೆ ರಜೆ ಮೇಲೆ {1} . ಹಾಜರಾತಿ ಗುರುತಿಸಲಾಗುವುದಿಲ್ಲ.
 DocType: Sales Partner,Targets,ಗುರಿ
@@ -2226,7 +2151,6 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +158,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,ಕಂಪ್ಯೂಟರ್
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +112,Electro-chemical grinding,ವಿದ್ಯುತ್-ರಾಸಾಯನಿಕ ರುಬ್ಬುವ
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +14,This is a root customer group and cannot be edited.,ಈ ಗ್ರಾಹಕ ಗುಂಪಿನ ಮೂಲ ಮತ್ತು ಸಂಪಾದಿತವಾಗಿಲ್ಲ .
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +39,Please setup your chart of accounts before you start Accounting Entries,ನೀವು ಲೆಕ್ಕಪರಿಶೋಧಕ ನಮೂದುಗಳು ಆರಂಭಿಸುವ ಮುನ್ನ ಸೆಟಪ್ ಖಾತೆಗಳ ನಿಮ್ಮ ಚಾರ್ಟ್ ಪ್ಲೀಸ್
 DocType: Purchase Invoice,Ignore Pricing Rule,ಬೆಲೆ ರೂಲ್ ನಿರ್ಲಕ್ಷಿಸು
@@ -2284,7 +2208,6 @@
 DocType: Maintenance Visit,Purposes,ಉದ್ದೇಶಗಳಿಗಾಗಿ
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +103,Atleast one item should be entered with negative quantity in return document,ಕನಿಷ್ಠ ಒಂದು ಐಟಂ ರಿಟರ್ನ್ ದಸ್ತಾವೇಜು ನಕಾರಾತ್ಮಕ ಪ್ರಮಾಣ ದಾಖಲಿಸಬೇಕಾಗುತ್ತದೆ
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +67,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","ಆಪರೇಷನ್ {0} ಕಾರ್ಯಸ್ಥಳ ಯಾವುದೇ ಲಭ್ಯವಿರುವ ಕೆಲಸದ ಹೆಚ್ಚು {1}, ಅನೇಕ ಕಾರ್ಯಾಚರಣೆಗಳು ಆಪರೇಷನ್ ಮುರಿಯಲು"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +134,Electrochemical machining,ವಿದ್ಯುದ್ರಾಸಾಯನಿಕ ಯಂತ್ರ
 ,Requested,ವಿನಂತಿಸಲಾಗಿದೆ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +66,No Remarks,ಯಾವುದೇ ಟೀಕೆಗಳನ್ನು
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +13,Overdue,ಮಿತಿಮೀರಿದ
@@ -2293,7 +2216,7 @@
 DocType: Monthly Distribution,Distribution Name,ವಿತರಣೆ ಹೆಸರು
 DocType: Features Setup,Sales and Purchase,ಮಾರಾಟ ಮತ್ತು ಖರೀದಿ
 DocType: Supplier Quotation Item,Material Request No,ಮೆಟೀರಿಯಲ್ ವಿನಂತಿ ನಂ
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +218,Quality Inspection required for Item {0},ಐಟಂ ಬೇಕಾದ ಗುಣಮಟ್ಟ ತಪಾಸಣೆ {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +221,Quality Inspection required for Item {0},ಐಟಂ ಬೇಕಾದ ಗುಣಮಟ್ಟ ತಪಾಸಣೆ {0}
 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),ನೆಟ್ ದರ (ಕಂಪನಿ ಕರೆನ್ಸಿ)
@@ -2311,9 +2234,8 @@
 apps/erpnext/erpnext/accounts/report/financial_statements.py +16,Fiscal Year {0} not found.,ಹಣಕಾಸಿನ ವರ್ಷ {0} ಕಂಡುಬಂದಿಲ್ಲ.
 DocType: Bank Reconciliation,Get Relevant Entries,ಸಂಬಂಧಿತ ನಮೂದುಗಳು ಪಡೆಯಿರಿ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +407,Accounting Entry for Stock,ಸ್ಟಾಕ್ ಲೆಕ್ಕಪರಿಶೋಧಕ ಎಂಟ್ರಿ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +64,Coining,ರೂಪಿಸಲ್ಪಟ್ಟ
 DocType: Sales Invoice,Sales Team1,ಮಾರಾಟದ team1
-apps/erpnext/erpnext/stock/doctype/item/item.py +412,Item {0} does not exist,ಐಟಂ {0} ಅಸ್ತಿತ್ವದಲ್ಲಿಲ್ಲ
+apps/erpnext/erpnext/stock/doctype/item/item.py +416,Item {0} does not exist,ಐಟಂ {0} ಅಸ್ತಿತ್ವದಲ್ಲಿಲ್ಲ
 DocType: Sales Invoice,Customer Address,ಗ್ರಾಹಕ ವಿಳಾಸ
 apps/frappe/frappe/desk/query_report.py +136,Total,ಒಟ್ಟು
 DocType: Purchase Invoice,Apply Additional Discount On,ಹೆಚ್ಚುವರಿ ರಿಯಾಯತಿ ಅನ್ವಯಿಸು
@@ -2325,14 +2247,13 @@
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),ಡಿಸ್ಕೌಂಟ್ ಪ್ರಮಾಣದ ನಂತರ ತೆರಿಗೆ ಪ್ರಮಾಣ (ಕಂಪನಿ ಕರೆನ್ಸಿ)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +149,Target warehouse is mandatory for row {0},ಟಾರ್ಗೆಟ್ ಗೋದಾಮಿನ ಸಾಲು ಕಡ್ಡಾಯ {0}
 DocType: Quality Inspection,Quality Inspection,ಗುಣಮಟ್ಟದ ತಪಾಸಣೆ
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +144,Extra Small,ಹೆಚ್ಚುವರಿ ಸಣ್ಣ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +20,Spray forming,ರೂಪಿಸುವ ಸ್ಪ್ರೇ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Extra Small,ಹೆಚ್ಚುವರಿ ಸಣ್ಣ
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +458,Warning: Material Requested Qty is less than Minimum Order Qty,ಎಚ್ಚರಿಕೆ : ಪ್ರಮಾಣ ವಿನಂತಿಸಿದ ವಸ್ತು ಕನಿಷ್ಠ ಪ್ರಮಾಣ ಆದೇಶ ಕಡಿಮೆ
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +191,Account {0} is frozen,ಖಾತೆ {0} ಹೆಪ್ಪುಗಟ್ಟಿರುವ
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,ಸಂಸ್ಥೆ ಸೇರಿದ ಖಾತೆಗಳ ಪ್ರತ್ಯೇಕ ಚಾರ್ಟ್ ಜೊತೆಗೆ ಕಾನೂನು ಘಟಕದ / ಅಂಗಸಂಸ್ಥೆ.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +29,"Food, Beverage & Tobacco","ಆಹಾರ , ಪಾನೀಯ ಮತ್ತು ತಂಬಾಕು"
+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,ಪಿಎಲ್ ಅಥವಾ ಬಿಎಸ್
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,Can only make payment against unbilled {0},ಮಾತ್ರ ವಿರುದ್ಧ ಪಾವತಿ ಮಾಡಬಹುದು unbilled {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +531,Can only make payment against unbilled {0},ಮಾತ್ರ ವಿರುದ್ಧ ಪಾವತಿ ಮಾಡಬಹುದು unbilled {0}
 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,subcontract
@@ -2343,19 +2264,18 @@
 DocType: Item,Manufacturer Part Number,ತಯಾರಿಸುವರು ಭಾಗ ಸಂಖ್ಯೆ
 DocType: Production Order Operation,Estimated Time and Cost,ಅಂದಾಜು ಸಮಯ ಮತ್ತು ವೆಚ್ಚ
 DocType: Bin,Bin,ಬಿನ್
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +50,Nosing,ದುಂಡುಮಾಡಿದ ಏಣು
 DocType: SMS Log,No of Sent SMS,ಕಳುಹಿಸಲಾಗಿದೆ ಎಸ್ಎಂಎಸ್ ಸಂಖ್ಯೆ
 DocType: Account,Company,ಕಂಪನಿ
 DocType: Account,Expense Account,ವೆಚ್ಚದಲ್ಲಿ ಖಾತೆಯನ್ನು
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +49,Software,ತಂತ್ರಾಂಶ
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +151,Colour,ಬಣ್ಣದ
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +49,Software,ತಂತ್ರಾಂಶ
+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",&quot;ಇಲ್ಲ&quot; ಮತ್ತು &quot;ಮಾರಾಟ ಐಟಂ&quot; &quot;ಸ್ಟಾಕ್ ಐಟಂ&quot; ಅಲ್ಲಿ &quot;ಹೌದು&quot; ಐಟಂ ಆಯ್ಕೆ ಮತ್ತು ಯಾವುದೇ ಉತ್ಪನ್ನ ಕಟ್ಟು ಇಲ್ಲ ದಯವಿಟ್ಟು
 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 +281,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 +134,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 +145,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,ಲಾಗ್ ಮರುಹೆಸರಿಸು
@@ -2365,7 +2285,7 @@
 apps/erpnext/erpnext/controllers/recurring_document.py +162,Please select {0},ಆಯ್ಕೆಮಾಡಿ {0}
 DocType: C-Form,C-Form No,ಸಿ ಫಾರ್ಮ್ ನಂ
 DocType: BOM,Exploded_items,Exploded_items
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +95,Researcher,ಸಂಶೋಧಕ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Researcher,ಸಂಶೋಧಕ
 apps/frappe/frappe/custom/doctype/customize_form/customize_form.js +88,Update,ಅಪ್ಡೇಟ್
 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 +23,Name or Email is mandatory,ಹೆಸರು ಅಥವಾ ಇಮೇಲ್ ಕಡ್ಡಾಯ
@@ -2374,11 +2294,10 @@
 DocType: Employee,Exit,ನಿರ್ಗಮನ
 apps/erpnext/erpnext/accounts/doctype/account/account.py +134,Root Type is mandatory,ರೂಟ್ ಪ್ರಕಾರ ಕಡ್ಡಾಯ
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +295,Serial No {0} created,ಯಾವುದೇ ಸೀರಿಯಲ್ {0} ದಾಖಲಿಸಿದವರು
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +125,Vibratory finishing,ಕಂಪನದ ಸ್ಥಾನ
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","ಗ್ರಾಹಕರ ಅನುಕೂಲಕ್ಕಾಗಿ, ಪ್ರಬಂಧ ಸಂಕೇತಗಳು ಇನ್ವಾಯ್ಸ್ ಮತ್ತು ಡೆಲಿವರಿ ಟಿಪ್ಪಣಿಗಳು ರೀತಿಯ ಮುದ್ರಣ ಸ್ವರೂಪಗಳು ಬಳಸಬಹುದು"
 DocType: Employee,You can enter any date manually,ನೀವು ಕೈಯಾರೆ ಯಾವುದೇ ದಿನಾಂಕ ನಮೂದಿಸಬಹುದು
 DocType: Sales Invoice,Advertisement,ಜಾಹೀರಾತು
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +165,Probationary Period,ಉಮೇದುವಾರಿಕೆಯ ಅವಧಿಯಲ್ಲಿ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Probationary Period,ಉಮೇದುವಾರಿಕೆಯ ಅವಧಿಯಲ್ಲಿ
 DocType: Customer Group,Only leaf nodes are allowed in transaction,ಮಾತ್ರ ಲೀಫ್ ನೋಡ್ಗಳು ವ್ಯವಹಾರದಲ್ಲಿ ಅವಕಾಶ
 DocType: Expense Claim,Expense Approver,ವೆಚ್ಚದಲ್ಲಿ ಅನುಮೋದಕ
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,ಖರೀದಿ ರಸೀತಿ ಐಟಂ ವಿತರಿಸುತ್ತಾರೆ
@@ -2386,19 +2305,16 @@
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +17,To Datetime,Datetime ಗೆ
 DocType: SMS Settings,SMS Gateway URL,SMS ಗೇಟ್ವೇ URL ಅನ್ನು
 apps/erpnext/erpnext/config/crm.py +53,Logs for maintaining sms delivery status,SMS ಡೆಲಿವರಿ ಸ್ಥಾನಮಾನ ಕಾಯ್ದುಕೊಳ್ಳುವುದು ದಾಖಲೆಗಳು
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +137,Grinding,ಗ್ರೈಂಡಿಂಗ್
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +34,Shrink wrapping,ಸುತ್ತಿ ಸಂಕೋಚನ
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +36,Pending Activities,ಬಾಕಿ ಚಟುವಟಿಕೆಗಳು
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,Confirmed,ದೃಢಪಡಿಸಿದರು
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier > Supplier Type,ಸರಬರಾಜುದಾರ> ಸರಬರಾಜುದಾರ ಪ್ರಕಾರ
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +127,Please enter relieving date.,ದಿನಾಂಕ ನಿವಾರಿಸುವ ನಮೂದಿಸಿ.
 apps/erpnext/erpnext/controllers/trends.py +137,Amt,ಮೊತ್ತ
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' can be submitted,ಮಾತ್ರ ಸಲ್ಲಿಸಿದ ಮಾಡಬಹುದು 'ಅಂಗೀಕಾರವಾದ' ಸ್ಥಿತಿಯನ್ನು ಅನ್ವಯಗಳಲ್ಲಿ ಬಿಡಿ
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +51,Only Leave Applications with status 'Approved' can be submitted,ಮಾತ್ರ ಸಲ್ಲಿಸಿದ ಮಾಡಬಹುದು 'ಅಂಗೀಕಾರವಾದ' ಸ್ಥಿತಿಯನ್ನು ಅನ್ವಯಗಳಲ್ಲಿ ಬಿಡಿ
 apps/erpnext/erpnext/utilities/doctype/address/address.py +21,Address Title is mandatory.,ವಿಳಾಸ ಶೀರ್ಷಿಕೆ ಕಡ್ಡಾಯ.
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,ವಿಚಾರಣೆಯ ಮೂಲ ಪ್ರಚಾರ ವೇಳೆ ಪ್ರಚಾರ ಹೆಸರನ್ನು ನಮೂದಿಸಿ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +38,Newspaper Publishers,ಸುದ್ದಿ ಪತ್ರಿಕೆಗಳ
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +38,Newspaper Publishers,ಸುದ್ದಿ ಪತ್ರಿಕೆಗಳ
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,ಹಣಕಾಸಿನ ವರ್ಷ ಆಯ್ಕೆಮಾಡಿ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +88,Smelting,ಕರಗಿಸುವ
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,ಮರುಕ್ರಮಗೊಳಿಸಿ ಮಟ್ಟ
 DocType: Attendance,Attendance Date,ಅಟೆಂಡೆನ್ಸ್ ದಿನಾಂಕ
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,ಸಂಬಳ ವಿಘಟನೆಯ ಸಂಪಾದಿಸಿದ ಮತ್ತು ಕಳೆಯುವುದು ಆಧರಿಸಿ .
@@ -2413,16 +2329,15 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +414,[Error],[ದೋಷ]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,ನೀವು ಮಾರಾಟದ ಆರ್ಡರ್ ಉಳಿಸಲು ಒಮ್ಮೆ ವರ್ಡ್ಸ್ ಗೋಚರಿಸುತ್ತದೆ.
 ,Employee Birthday,ನೌಕರರ ಜನ್ಮದಿನ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +55,Venture Capital,ಸಾಹಸೋದ್ಯಮ ಬಂಡವಾಳ
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,ಸಾಹಸೋದ್ಯಮ ಬಂಡವಾಳ
 DocType: UOM,Must be Whole Number,ಹೋಲ್ ಸಂಖ್ಯೆ ಇರಬೇಕು
 DocType: Leave Control Panel,New Leaves Allocated (In Days),( ದಿನಗಳಲ್ಲಿ) ನಿಗದಿ ಹೊಸ ಎಲೆಗಳು
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +51,Serial No {0} does not exist,ಯಾವುದೇ ಸೀರಿಯಲ್ {0} ಅಸ್ತಿತ್ವದಲ್ಲಿಲ್ಲ
 DocType: Pricing Rule,Discount Percentage,ರಿಯಾಯಿತಿ ಶೇಕಡಾವಾರು
 DocType: Payment Reconciliation Invoice,Invoice Number,ಸರಕುಪಟ್ಟಿ ಸಂಖ್ಯೆ
-apps/erpnext/erpnext/hooks.py +70,Orders,ಆರ್ಡರ್ಸ್
+apps/erpnext/erpnext/hooks.py +54,Orders,ಆರ್ಡರ್ಸ್
 DocType: Leave Control Panel,Employee Type,ನೌಕರರ ಪ್ರಕಾರ
 DocType: Employee Leave Approver,Leave Approver,ಅನುಮೋದಕ ಬಿಡಿ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +70,Swaging,Swaging
 DocType: Manufacturing Settings,Material Transferred for Manufacture,ವಸ್ತು ತಯಾರಿಕೆಗೆ ವರ್ಗಾಯಿಸಲಾಯಿತು
 DocType: Expense Claim,"A user with ""Expense Approver"" role","""ಖರ್ಚು ಅನುಮೋದಕ"" ಪಾತ್ರವನ್ನು ಒಂದು ಬಳಕೆದಾರ"
 ,Issued Items Against Production Order,ಪ್ರೊಡಕ್ಷನ್ ಆರ್ಡರ್ ವಿರುದ್ಧ ನೀಡಲ್ಪಟ್ಟ ಐಟಂಗಳು
@@ -2434,7 +2349,6 @@
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +62,Cost Center with existing transactions can not be converted to group,ಅಸ್ತಿತ್ವದಲ್ಲಿರುವ ವ್ಯವಹಾರಗಳು ವೆಚ್ಚ ಸೆಂಟರ್ ಗುಂಪು ಪರಿವರ್ತನೆ ಸಾಧ್ಯವಿಲ್ಲ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Depreciation,ಸವಕಳಿ
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),ಪೂರೈಕೆದಾರ (ರು)
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +29,Invalid period,ಅಮಾನ್ಯವಾದ ಅವಧಿಯಲ್ಲಿ
 DocType: Customer,Credit Limit,ಕ್ರೆಡಿಟ್ ಮಿತಿಯನ್ನು
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,ವ್ಯವಹಾರದ ಪ್ರಕಾರವನ್ನುಆರಿಸಿ
 DocType: GL Entry,Voucher No,ಚೀಟಿ ಸಂಖ್ಯೆ
@@ -2444,9 +2358,9 @@
 DocType: Customer,Address and Contact,ವಿಳಾಸ ಮತ್ತು ಸಂಪರ್ಕ
 DocType: Customer,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}"
 apps/erpnext/erpnext/accounts/party.py +284,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),ಗಮನಿಸಿ: ಕಾರಣ / ಉಲ್ಲೇಖ ದಿನಾಂಕ {0} ದಿನ ಅವಕಾಶ ಗ್ರಾಹಕ ಕ್ರೆಡಿಟ್ ದಿನಗಳ ಮೀರಿದೆ (ರು)
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +621,Maint. Schedule,ಮಾಹಿತಿ ಗಾತ್ರ. ವೇಳಾಪಟ್ಟಿ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +108,Abrasive jet machining,ಅಪಘರ್ಷಕ ಜೆಟ್ ಯಂತ್ರ
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +632,Maint. Schedule,ಮಾಹಿತಿ ಗಾತ್ರ. ವೇಳಾಪಟ್ಟಿ
 DocType: Stock Settings,Freeze Stock Entries,ಫ್ರೀಜ್ ಸ್ಟಾಕ್ ನಮೂದುಗಳು
 DocType: Website Settings,Website Settings,ಸೈಟ್ ಸೆಟ್ಟಿಂಗ್ಗಳು
 DocType: Item,Reorder level based on Warehouse,ವೇರ್ಹೌಸ್ ಆಧರಿಸಿ ಮರುಕ್ರಮಗೊಳಿಸಿ ಮಟ್ಟದ
@@ -2463,7 +2377,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +75,Show Stock Entries,ಪ್ರದರ್ಶನ ಸ್ಟಾಕ್ ನಮೂದುಗಳು
 ,Is Primary Address,ಪ್ರಾಥಮಿಕ ವಿಳಾಸ
 DocType: Production Order,Work-in-Progress Warehouse,ಕೆಲಸ ಪ್ರಗತಿಯಲ್ಲಿರುವ ವೇರ್ಹೌಸ್
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +308,Reference #{0} dated {1},ರೆಫರೆನ್ಸ್ # {0} {1} ರ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Reference #{0} dated {1},ರೆಫರೆನ್ಸ್ # {0} {1} ರ
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +13,Manage Addresses,ವಿಳಾಸಗಳನ್ನು ನಿರ್ವಹಿಸಿ
 DocType: Pricing Rule,Item Code,ಐಟಂ ಕೋಡ್
 DocType: Production Planning Tool,Create Production Orders,ಪ್ರೊಡಕ್ಷನ್ ಆದೇಶಗಳನ್ನು ರಚಿಸಲು
@@ -2472,7 +2386,7 @@
 DocType: Lead,Market Segment,ಮಾರುಕಟ್ಟೆ ವಿಭಾಗ
 DocType: Communication,Phone,ದೂರವಾಣಿ
 DocType: Employee Internal Work History,Employee Internal Work History,ಆಂತರಿಕ ಕೆಲಸದ ಇತಿಹಾಸ
-apps/erpnext/erpnext/public/js/account_tree_grid.js +50,Closing (Dr),ಮುಚ್ಚುವ (ಡಾ)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +221,Closing (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.,ವ್ಯವಹಾರ ಮಾರಾಟ ತೆರಿಗೆ ಟೆಂಪ್ಲೆಟ್ .
@@ -2488,8 +2402,8 @@
 ,Billed Amount,ಖ್ಯಾತವಾದ ಪ್ರಮಾಣ
 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 +129,Material Request {0} is cancelled or stopped,ಮೆಟೀರಿಯಲ್ ವಿನಂತಿ {0} ರದ್ದು ಅಥವಾ ನಿಲ್ಲಿಸಿದಾಗ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +641,Add a few sample records,ಕೆಲವು ಸ್ಯಾಂಪಲ್ ದಾಖಲೆಗಳನ್ನು ಸೇರಿಸಿ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +133,Material Request {0} is cancelled or stopped,ಮೆಟೀರಿಯಲ್ ವಿನಂತಿ {0} ರದ್ದು ಅಥವಾ ನಿಲ್ಲಿಸಿದಾಗ
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Add a few sample records,ಕೆಲವು ಸ್ಯಾಂಪಲ್ ದಾಖಲೆಗಳನ್ನು ಸೇರಿಸಿ
 apps/erpnext/erpnext/config/hr.py +210,Leave Management,ಮ್ಯಾನೇಜ್ಮೆಂಟ್ ಬಿಡಿ
 DocType: Event,Groups,ಗುಂಪುಗಳು
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,ಖಾತೆ ಗುಂಪು
@@ -2502,38 +2416,34 @@
 DocType: Features Setup,Sales Extras,ಮಾರಾಟದ ಪರಿಕರಗಳು
 apps/erpnext/erpnext/accounts/utils.py +344,{0} budget for Account {1} against Cost Center {2} will exceed by {3},ವೆಚ್ಚ ಸೆಂಟರ್ ವಿರುದ್ಧ ಬಜೆಟ್ {0} {1} ಖಾತೆಗೆ {2} {3} ಮೂಲಕ ಮೀರುತ್ತದೆ
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +236,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","ಈ ಸ್ಟಾಕ್ ಸಾಮರಸ್ಯ ಒಂದು ಆರಂಭಿಕ ಎಂಟ್ರಿ ಏಕೆಂದರೆ ವ್ಯತ್ಯಾಸ ಖಾತೆ, ಒಂದು ಆಸ್ತಿ / ಹೊಣೆಗಾರಿಕೆ ರೀತಿಯ ಖಾತೆ ಇರಬೇಕು"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +138,Purchase Order number required for Item {0},ಪರ್ಚೇಸ್ ಆರ್ಡರ್ ಸಂಖ್ಯೆ ಐಟಂ ಅಗತ್ಯವಿದೆ {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Order number required for Item {0},ಪರ್ಚೇಸ್ ಆರ್ಡರ್ ಸಂಖ್ಯೆ ಐಟಂ ಅಗತ್ಯವಿದೆ {0}
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',' ದಿನಾಂಕದಿಂದ ' ' ದಿನಾಂಕ ' ನಂತರ ಇರಬೇಕು
 ,Stock Projected Qty,ಸ್ಟಾಕ್ ಪ್ರಮಾಣ ಯೋಜಿತ
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +147,Customer {0} does not belong to project {1},ಗ್ರಾಹಕ {0} ಅಭಿವ್ಯಕ್ತಗೊಳಿಸಲು ಸೇರಿಲ್ಲ {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +150,Customer {0} does not belong to project {1},ಗ್ರಾಹಕ {0} ಅಭಿವ್ಯಕ್ತಗೊಳಿಸಲು ಸೇರಿಲ್ಲ {1}
 DocType: Sales Order,Customer's Purchase Order,ಗ್ರಾಹಕರ ಆರ್ಡರ್ ಖರೀದಿಸಿ
 DocType: Warranty Claim,From Company,ಕಂಪನಿ
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,ಮೌಲ್ಯ ಅಥವಾ ಪ್ರಮಾಣ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Minute,ಮಿನಿಟ್
+apps/erpnext/erpnext/public/js/setup_wizard.js +363,Minute,ಮಿನಿಟ್
 DocType: Purchase Invoice,Purchase Taxes and Charges,ಖರೀದಿ ತೆರಿಗೆಗಳು ಮತ್ತು ಶುಲ್ಕಗಳು
 ,Qty to Receive,ಸ್ವೀಕರಿಸುವ ಪ್ರಮಾಣ
 DocType: Leave Block List,Leave Block List Allowed,ಖಂಡ ಅನುಮತಿಸಲಾಗಿದೆ ಬಿಡಿ
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +61,Conversion factor cannot be in fractions,ಪರಿವರ್ತಿಸುವುದರ ಭಿನ್ನರಾಶಿಗಳನ್ನು ಇರುವುದಿಲ್ಲವೋ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +358,You will use it to Login,ನೀವು ಲಾಗಿನ್ ಅದನ್ನು ಬಳಸುತ್ತದೆ
+apps/erpnext/erpnext/public/js/setup_wizard.js +108,You will use it to Login,ನೀವು ಲಾಗಿನ್ ಅದನ್ನು ಬಳಸುತ್ತದೆ
 DocType: Sales Partner,Retailer,ಚಿಲ್ಲರೆ ವ್ಯಾಪಾರಿ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +99,Credit To account must be a Balance Sheet account,ಖಾತೆಗೆ ಕ್ರೆಡಿಟ್ ಬ್ಯಾಲೆನ್ಸ್ ಶೀಟ್ ಖಾತೆ ಇರಬೇಕು
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,ಎಲ್ಲಾ ವಿಧಗಳು ಸರಬರಾಜುದಾರ
 apps/erpnext/erpnext/stock/doctype/item/item.py +37,Item Code is mandatory because Item is not automatically numbered,ಐಟಂ ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಸಂಖ್ಯೆಯ ಕಾರಣ ಐಟಂ ಕೋಡ್ ಕಡ್ಡಾಯ
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +99,Quotation {0} not of type {1},ನುಡಿಮುತ್ತುಗಳು {0} ಅಲ್ಲ ರೀತಿಯ {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +93,Quotation {0} not of type {1},ನುಡಿಮುತ್ತುಗಳು {0} ಅಲ್ಲ ರೀತಿಯ {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,ನಿರ್ವಹಣೆ ವೇಳಾಪಟ್ಟಿ ಐಟಂ
 DocType: Sales Order,%  Delivered,ತಲುಪಿಸಲಾಗಿದೆ %
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,Bank Overdraft Account,ಬ್ಯಾಂಕಿನ ಓವರ್ಡ್ರಾಫ್ಟ್ ಖಾತೆ
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +15,Make Salary Slip,ಸಂಬಳ ಸ್ಲಿಪ್ ಮಾಡಿ
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +18,Browse BOM,ಬ್ರೌಸ್ BOM
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +175,Secured Loans,ಸುರಕ್ಷಿತ ಸಾಲ
-apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +3,Awesome Products,ಆಕರ್ಷಕ ಉತ್ಪನ್ನಗಳು
+apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +3,Awesome Products,ಆಕರ್ಷಕ ಉತ್ಪನ್ನಗಳು
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +189,Opening Balance Equity,ಆರಂಭಿಕ ಬ್ಯಾಲೆನ್ಸ್ ಇಕ್ವಿಟಿ
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +80,Cannot approve leave as you are not authorized to approve leaves on Block Dates,ನೀವು ಬ್ಲಾಕ್ ದಿನಾಂಕಗಳಂದು ಎಲೆಗಳು ಅನುಮೋದಿಸಲು ಅನುಮತಿಯನ್ನು ಹೊಂದಿಲ್ಲ ರಜೆ ಅನುಮೋದಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ
 DocType: Appraisal,Appraisal,ಬೆಲೆಕಟ್ಟುವಿಕೆ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +13,Lost-foam casting,ಲಾಸ್ಟ್-ಫೋಮ್ ಎರಕದ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +47,Drawing,ಡ್ರಾಯಿಂಗ್
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +22,Date is repeated,ದಿನಾಂಕ ಪುನರಾವರ್ತಿಸುತ್ತದೆ
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +148,Leave approver must be one of {0},ಬಿಡಿ ಅನುಮೋದಕ ಒಂದು ಇರಬೇಕು {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +162,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,ಟೈಮ್
@@ -2547,7 +2457,7 @@
 DocType: Purchase Invoice Item,Net Amount (Company Currency),ನೆಟ್ ಪ್ರಮಾಣ (ಕಂಪನಿ ಕರೆನ್ಸಿ)
 DocType: BOM Operation,Hour Rate,ಅವರ್ ದರ
 DocType: Stock Settings,Item Naming By,ಐಟಂ ಹೆಸರಿಸುವ ಮೂಲಕ
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +642,From Quotation,ನುಡಿಮುತ್ತುಗಳು ಗೆ
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +655,From Quotation,ನುಡಿಮುತ್ತುಗಳು ಗೆ
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},ಮತ್ತೊಂದು ಅವಧಿ ಮುಕ್ತಾಯ ಎಂಟ್ರಿ {0} ನಂತರ ಮಾಡಲಾಗಿದೆ {1}
 DocType: Production Order,Material Transferred for Manufacturing,ವಸ್ತು ಉತ್ಪಾದನೆ ವರ್ಗಾಯಿಸಲ್ಪಟ್ಟ
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +29,Account {0} does not exists,ಖಾತೆ {0} ಮಾಡುವುದಿಲ್ಲ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ
@@ -2561,21 +2471,19 @@
 DocType: Purchase Invoice Item,PR Detail,ತರಬೇತಿ ವಿವರ
 DocType: Sales Order,Fully Billed,ಸಂಪೂರ್ಣವಾಗಿ ಖ್ಯಾತವಾದ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +20,Cash In Hand,ಕೈಯಲ್ಲಿ ನಗದು
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +72,Delivery warehouse required for stock item {0},ಡೆಲಿವರಿ ಗೋದಾಮಿನ ಸ್ಟಾಕ್ ಐಟಂ ಬೇಕಾದ {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +119,Delivery warehouse required for stock item {0},ಡೆಲಿವರಿ ಗೋದಾಮಿನ ಸ್ಟಾಕ್ ಐಟಂ ಬೇಕಾದ {0}
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),ಪ್ಯಾಕೇಜ್ ಒಟ್ಟಾರೆ ತೂಕದ . ಸಾಮಾನ್ಯವಾಗಿ ನಿವ್ವಳ ತೂಕ + ಪ್ಯಾಕೇಜಿಂಗ್ ವಸ್ತುಗಳ ತೂಕ . ( ಮುದ್ರಣ )
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,ಈ ಪಾತ್ರವನ್ನು ಬಳಕೆದಾರರು ಹೆಪ್ಪುಗಟ್ಟಿದ ಖಾತೆಗಳ ವಿರುದ್ಧ ಲೆಕ್ಕಪರಿಶೋಧಕ ನಮೂದುಗಳನ್ನು ಮಾರ್ಪಡಿಸಲು / ಹೆಪ್ಪುಗಟ್ಟಿದ ಖಾತೆಗಳನ್ನು ಸೆಟ್ ಮತ್ತು ರಚಿಸಲು ಅವಕಾಶ
 DocType: Serial No,Is Cancelled,ರದ್ದುಗೊಳಿಸಲಾಗಿದೆ ಇದೆ
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +281,My Shipments,ನನ್ನ ಸಾಗಾಣಿಕೆಯಲ್ಲಿ
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +286,My Shipments,ನನ್ನ ಸಾಗಾಣಿಕೆಯಲ್ಲಿ
 DocType: Journal Entry,Bill Date,ಬಿಲ್ ದಿನಾಂಕ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +43,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","ಹೆಚ್ಚಿನ ಆದ್ಯತೆ ಬಹು ಬೆಲೆ ನಿಯಮಗಳು ಇವೆ ಸಹ, ನಂತರ ಕೆಳಗಿನ ಆಂತರಿಕ ಆದ್ಯತೆಗಳು ಅನ್ವಯಿಸಲಾಗಿದೆ:"
 DocType: Supplier,Supplier Details,ಪೂರೈಕೆದಾರರ ವಿವರಗಳು
 DocType: Communication,Recipients,ಸ್ವೀಕೃತದಾರರ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +146,Screwing,ತಿರುಗಿಸದೇ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +96,Knurling,Knurling
 DocType: Expense Claim,Approval Status,ಅನುಮೋದನೆ ಸ್ಥಿತಿ
 DocType: Hub Settings,Publish Items to Hub,ಹಬ್ ಐಟಂಗಳು ಪ್ರಕಟಿಸಿ
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +44,From value must be less than to value in row {0},ಮೌಲ್ಯದಿಂದ ಸತತವಾಗಿ ಮೌಲ್ಯಕ್ಕೆ ಕಡಿಮೆ ಇರಬೇಕು {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +133,Wire Transfer,ವೈರ್ ಟ್ರಾನ್ಸ್ಫರ್
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +133,Wire Transfer,ವೈರ್ ಟ್ರಾನ್ಸ್ಫರ್
 apps/erpnext/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py +25,Please select Bank Account,ಬ್ಯಾಂಕ್ ಖಾತೆ ಆಯ್ಕೆಮಾಡಿ
 DocType: Newsletter,Create and Send Newsletters,ರಚಿಸಿ ಮತ್ತು ಕಳುಹಿಸಿ ಸುದ್ದಿಪತ್ರಗಳು
 apps/frappe/frappe/public/js/frappe/views/reports/grid_report.js +305,From Date must be before To Date,ದಿನಾಂಕ ಇಲ್ಲಿಯವರೆಗೆ ಮೊದಲು ಇರಬೇಕು
@@ -2583,14 +2491,14 @@
 DocType: Company,Default Income Account,ಡೀಫಾಲ್ಟ್ ಆದಾಯ ಖಾತೆ
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,ಗ್ರಾಹಕ ಗುಂಪಿನ / ಗ್ರಾಹಕ
 DocType: Item Group,Check this if you want to show in website,ನೀವು ವೆಬ್ಸೈಟ್ ತೋರಿಸಲು ಬಯಸಿದರೆ ಈ ಪರಿಶೀಲಿಸಿ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +190,Welcome to ERPNext,ERPNext ಸ್ವಾಗತ
+,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/page/setup_wizard/install_fixtures.py +37,Calls,ಕರೆಗಳು
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Calls,ಕರೆಗಳು
 DocType: Project,Total Costing Amount (via Time Logs),ಒಟ್ಟು ಕಾಸ್ಟಿಂಗ್ ಪ್ರಮಾಣ (ಸಮಯ ದಾಖಲೆಗಳು ಮೂಲಕ)
 DocType: Purchase Order Item Supplied,Stock UOM,ಸ್ಟಾಕ್ UOM
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Purchase Order {0} is not submitted,ಪರ್ಚೇಸ್ ಆರ್ಡರ್ {0} ಸಲ್ಲಿಸದಿದ್ದರೆ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +194,Purchase Order {0} is not submitted,ಪರ್ಚೇಸ್ ಆರ್ಡರ್ {0} ಸಲ್ಲಿಸದಿದ್ದರೆ
 ,Projected,ಯೋಜಿತ
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},ಯಾವುದೇ ಸೀರಿಯಲ್ {0} ವೇರ್ಹೌಸ್ ಸೇರುವುದಿಲ್ಲ {1}
 apps/erpnext/erpnext/controllers/status_updater.py +136,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,ಗಮನಿಸಿ : ಸಿಸ್ಟಮ್ ಐಟಂ ಡೆಲಿವರಿ ಮೇಲೆ ಮತ್ತು ಅತಿ ಬುಕಿಂಗ್ ಪರೀಕ್ಷಿಸುವುದಿಲ್ಲ {0} ಪ್ರಮಾಣ ಅಥವಾ ಪ್ರಮಾಣದ 0
@@ -2598,7 +2506,6 @@
 DocType: Issue,Opening Date,ದಿನಾಂಕ ತೆರೆಯುವ
 DocType: Journal Entry,Remark,ಟೀಕಿಸು
 DocType: Purchase Receipt Item,Rate and Amount,ದರ ಮತ್ತು ಪ್ರಮಾಣ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +95,Boring,ಬೋರಿಂಗ್
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +667,From Sales Order,ಮಾರಾಟದ ಆರ್ಡರ್ ಗೆ
 DocType: Blog Category,Parent Website Route,ಪೋಷಕ ಸೈಟ್ ಮಾರ್ಗ
 DocType: Sales Order,Not Billed,ಖ್ಯಾತವಾದ ಮಾಡಿರುವುದಿಲ್ಲ
@@ -2612,19 +2519,17 @@
 apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount Amount,ರಿಯಾಯಿತಿ ಪ್ರಮಾಣ
 DocType: Purchase Invoice,Return Against Purchase Invoice,ವಿರುದ್ಧ ಖರೀದಿ ಸರಕುಪಟ್ಟಿ ಹಿಂತಿರುಗಿ
 DocType: Item,Warranty Period (in days),( ದಿನಗಳಲ್ಲಿ ) ಖಾತರಿ ಅವಧಿಯ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +550,e.g. VAT,ಇ ಜಿ ವ್ಯಾಟ್
+apps/erpnext/erpnext/public/js/setup_wizard.js +292,e.g. VAT,ಇ ಜಿ ವ್ಯಾಟ್
 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,ಉದ್ಧರಣ ಸರಣಿ
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +52,"An item exists with same name ({0}), please change the item group name or rename the item","ಐಟಂ ( {0} ) , ಐಟಂ ಗುಂಪು ಹೆಸರನ್ನು ಬದಲಾಯಿಸಲು ಅಥವಾ ಐಟಂ ಹೆಸರನ್ನು ದಯವಿಟ್ಟು ಅದೇ ಹೆಸರಿನಲ್ಲಿ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +82,Hot metal gas forming,ರೂಪಿಸುವ ಬಿಸಿ ಲೋಹದ ಅನಿಲ
 DocType: Sales Order Item,Sales Order Date,ಮಾರಾಟದ ಆದೇಶ ದಿನಾಂಕ
 DocType: Sales Invoice Item,Delivered Qty,ತಲುಪಿಸಲಾಗಿದೆ ಪ್ರಮಾಣ
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +63,Warehouse {0}: Company is mandatory,ವೇರ್ಹೌಸ್ {0}: ಕಂಪನಿ ಕಡ್ಡಾಯ
 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.",ತೆರಿಗೆ ಪ್ರಮಾಣ ಬಗ್ಗೆ ಸೂಕ್ತ ಗುಂಪು (ನಿಧಿಗಳು&gt; ಪ್ರಸಕ್ತ ಹಣಕಾಸಿನ ಹೊಣೆಗಾರಿಕೆಗಳು&gt; ತೆರಿಗೆಗಳು ಮತ್ತು ಕರ್ತವ್ಯಗಳು ಸಾಮಾನ್ಯವಾಗಿ ಮೂಲ ಹೋಗಿ ರೀತಿಯ &quot;ತೆರಿಗೆ&quot;) ಮಕ್ಕಳ ಸೇರಿಸಿ ಕ್ಲಿಕ್ಕಿಸಿ (ಒಂದು ಹೊಸ ಖಾತೆ ರಚಿಸಿ ಮತ್ತು ಮಾಡಲು.
 ,Payment Period Based On Invoice Date,ಸರಕುಪಟ್ಟಿ ದಿನಾಂಕವನ್ನು ಆಧರಿಸಿ ಪಾವತಿ ಅವಧಿ
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +50,Missing Currency Exchange Rates for {0},ಕಾಣೆಯಾಗಿದೆ ಕರೆನ್ಸಿ ವಿನಿಮಯ ದರಗಳು {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +135,Laser cutting,ಲೇಸರ್ ಕತ್ತರಿಸುವ
 DocType: Event,Monday,ಸೋಮವಾರ
 DocType: Journal Entry,Stock Entry,ಸ್ಟಾಕ್ ಎಂಟ್ರಿ
 DocType: Account,Payable,ಕೊಡಬೇಕಾದ
@@ -2657,7 +2562,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +111,Date Of Retirement must be greater than Date of Joining,ನಿವೃತ್ತಿ ದಿನಾಂಕ ಸೇರುವ ದಿನಾಂಕ ಹೆಚ್ಚಿನ ಇರಬೇಕು
 DocType: Sales Invoice,Against Income Account,ಆದಾಯ ಖಾತೆ ವಿರುದ್ಧ
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +69,{0}% Delivered,{0}% ತಲುಪಿಸಲಾಗಿದೆ
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +78,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,ಐಟಂ {0}: ಆದೇಶ ಪ್ರಮಾಣ {1} ಕನಿಷ್ಠ ಸಲುವಾಗಿ ಪ್ರಮಾಣ {2} (ಐಟಂ ವ್ಯಾಖ್ಯಾನಿಸಲಾಗಿದೆ) ಕಡಿಮೆ ಸಾಧ್ಯವಿಲ್ಲ.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,ಐಟಂ {0}: ಆದೇಶ ಪ್ರಮಾಣ {1} ಕನಿಷ್ಠ ಸಲುವಾಗಿ ಪ್ರಮಾಣ {2} (ಐಟಂ ವ್ಯಾಖ್ಯಾನಿಸಲಾಗಿದೆ) ಕಡಿಮೆ ಸಾಧ್ಯವಿಲ್ಲ.
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,ಮಾಸಿಕ ವಿತರಣೆ ಶೇಕಡಾವಾರು
 DocType: Territory,Territory Targets,ಪ್ರದೇಶ ಗುರಿಗಳ
 DocType: Delivery Note,Transporter Info,ಸಾರಿಗೆ ಮಾಹಿತಿ
@@ -2666,7 +2571,6 @@
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,ಮುದ್ರಣ ಶೀರ್ಷಿಕೆ ಇ ಜಿ ಟೆಂಪ್ಲೇಟ್ಗಳು Proforma ಸರಕುಪಟ್ಟಿ .
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +140,Valuation type charges can not marked as Inclusive,ಮೌಲ್ಯಾಂಕನ ರೀತಿಯ ಆರೋಪಗಳನ್ನು ಇನ್ಕ್ಲೂಸಿವ್ ಎಂದು ಗುರುತಿಸಲಾಗಿದೆ ಸಾಧ್ಯವಿಲ್ಲ
 DocType: POS Profile,Update Stock,ಸ್ಟಾಕ್ ನವೀಕರಿಸಲು
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +128,Superfinishing,Superfinishing
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,ಐಟಂಗಳನ್ನು ವಿವಿಧ UOM ತಪ್ಪು ( ಒಟ್ಟು ) ನೆಟ್ ತೂಕ ಮೌಲ್ಯವನ್ನು ಕಾರಣವಾಗುತ್ತದೆ . ಪ್ರತಿ ಐಟಂ ಮಾಡಿ surethat ನೆಟ್ ತೂಕ ಅದೇ UOM ಹೊಂದಿದೆ .
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,ಬಿಒಎಮ್ ದರ
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +85,Please pull items from Delivery Note,ಡೆಲಿವರಿ ಗಮನಿಸಿ ಐಟಂಗಳನ್ನು ಪುಲ್ ದಯವಿಟ್ಟು
@@ -2681,7 +2585,6 @@
 ,Purchase Analytics,ಖರೀದಿ ಅನಾಲಿಟಿಕ್ಸ್
 DocType: Sales Invoice Item,Delivery Note Item,ಡೆಲಿವರಿ ಗಮನಿಸಿ ಐಟಂ
 DocType: Expense Claim,Task,ಟಾಸ್ಕ್
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +57,Shaving,ಶೇವಿಂಗ್
 DocType: Purchase Taxes and Charges,Reference Row #,ರೆಫರೆನ್ಸ್ ರೋ #
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},ಬ್ಯಾಚ್ ಸಂಖ್ಯೆ ಐಟಂ ಕಡ್ಡಾಯವಾಗಿರುತ್ತದೆ {0}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js +14,This is a root sales person and cannot be edited.,ಈ ಒಂದು ಮೂಲ ಮಾರಾಟಗಾರ ಮತ್ತು ಸಂಪಾದಿತವಾಗಿಲ್ಲ .
@@ -2693,13 +2596,11 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +74,Purpose must be one of {0},ಉದ್ದೇಶ ಒಂದು ಇರಬೇಕು {0}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +108,Fill the form and save it,ರೂಪ ಭರ್ತಿ ಮಾಡಿ ಮತ್ತು ಅದನ್ನು ಉಳಿಸಲು
 DocType: Production Planning Tool,Download a report containing all raw materials with their latest inventory status,ಅವರ ಇತ್ತೀಚಿನ ದಾಸ್ತಾನು ಸ್ಥಿತಿಯನ್ನು ಕಚ್ಚಾ ವಸ್ತುಗಳನ್ನು ಹೊಂದಿದ ಒಂದು ವರದಿಯನ್ನು ಡೌನ್ಲೋಡ್
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +94,Facing,ಎದುರಿಸುತ್ತಿರುವ
 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: Time Log,Billable,ಬಿಲ್ ಮಾಡಬಹುದಾದ
-DocType: Authorization Rule,This will be used for setting rule in HR module,ಈ ಮಾನವ ಸಂಪನ್ಮೂಲ ಭಾಗದಲ್ಲಿ ನಿಯಮ ಸ್ಥಾಪನೆಗೆ ಬಳಸಲಾಗುತ್ತದೆ
 DocType: Account,Rate at which this tax is applied,ದರ ಈ ತೆರಿಗೆ ಅನ್ವಯಿಸಲಾಗುತ್ತದೆ ನಲ್ಲಿ
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reorder Qty,ಮರುಕ್ರಮಗೊಳಿಸಿ ಪ್ರಮಾಣ
 DocType: Company,Stock Adjustment Account,ಸ್ಟಾಕ್ ಹೊಂದಾಣಿಕೆ ಖಾತೆ
@@ -2726,16 +2627,15 @@
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,ಶೇಕಡಾವಾರು ಅಲೋಕೇಶನ್ 100% ಸಮನಾಗಿರುತ್ತದೆ
 DocType: Serial No,Out of AMC,ಎಎಂಸಿ ಔಟ್
 DocType: Purchase Order Item,Material Request Detail No,ಮೆಟೀರಿಯಲ್ ವಿನಂತಿ ವಿವರ ನಂ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +97,Hard turning,ಹಾರ್ಡ್ ತಿರುವು
 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 +79,Company (not Customer or Supplier) master.,ಕಂಪನಿ ( ಗ್ರಾಹಕ ಅಥವಾ ಸರಬರಾಜುದಾರ ) ಮಾಸ್ಟರ್ .
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +106,Please enter 'Expected Delivery Date',' ನಿರೀಕ್ಷಿತ ಡೆಲಿವರಿ ದಿನಾಂಕ ' ನಮೂದಿಸಿ
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +187,Delivery Notes {0} must be cancelled before cancelling this Sales Order,ಡೆಲಿವರಿ ಟಿಪ್ಪಣಿಗಳು {0} ಈ ಮಾರಾಟದ ಆದೇಶವನ್ನು ರದ್ದುಗೊಳಿಸುವ ಮೊದಲು ರದ್ದು ಮಾಡಬೇಕು
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +100,Please enter 'Expected Delivery Date',' ನಿರೀಕ್ಷಿತ ಡೆಲಿವರಿ ದಿನಾಂಕ ' ನಮೂದಿಸಿ
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +182,Delivery Notes {0} must be cancelled before cancelling this Sales Order,ಡೆಲಿವರಿ ಟಿಪ್ಪಣಿಗಳು {0} ಈ ಮಾರಾಟದ ಆದೇಶವನ್ನು ರದ್ದುಗೊಳಿಸುವ ಮೊದಲು ರದ್ದು ಮಾಡಬೇಕು
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +373,Paid amount + Write Off Amount can not be greater than Grand Total,ಪಾವತಿಸಿದ ಪ್ರಮಾಣದ + ಆಫ್ ಬರೆಯಿರಿ ಪ್ರಮಾಣ ಹೆಚ್ಚಿನ ಗ್ರ್ಯಾಂಡ್ ಒಟ್ಟು ಸಾಧ್ಯವಿಲ್ಲ
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} ಐಟಂ ಮಾನ್ಯ ಬ್ಯಾಚ್ ಸಂಖ್ಯೆ ಅಲ್ಲ {1}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,Note: There is not enough leave balance for Leave Type {0},ಗಮನಿಸಿ : ಲೀವ್ ಪ್ರಕಾರ ಸಾಕಷ್ಟು ರಜೆ ಸಮತೋಲನ ಇಲ್ಲ {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +124,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,ಅವಕಾಶ ಪ್ರಕಾರ
@@ -2747,7 +2647,7 @@
 DocType: Hub Settings,Publish Availability,ಲಭ್ಯತೆ ಪ್ರಕಟಿಸಿ
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +105,Date of Birth cannot be greater than today.,ಜನ್ಮ ದಿನಾಂಕ ಇಂದು ಹೆಚ್ಚು ಸಾಧ್ಯವಿಲ್ಲ.
 ,Stock Ageing,ಸ್ಟಾಕ್ ಏಜಿಂಗ್
-apps/erpnext/erpnext/controllers/accounts_controller.py +200,{0} '{1}' is disabled,{0} '{1}' ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ
+apps/erpnext/erpnext/controllers/accounts_controller.py +201,{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.,ಸಲ್ಲಿಸಲಾಗುತ್ತಿದೆ ವ್ಯವಹಾರಗಳ ಮೇಲೆ ಸಂಪರ್ಕಗಳು ಸ್ವಯಂಚಾಲಿತ ಕಳುಹಿಸು.
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +232,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
@@ -2757,44 +2657,38 @@
 DocType: Purchase Order,Customer Contact Email,ಗ್ರಾಹಕ ಸಂಪರ್ಕ ಇಮೇಲ್
 DocType: Event,Sunday,ಭಾನುವಾರ
 DocType: Sales Team,Contribution (%),ಕೊಡುಗೆ ( % )
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +455,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,ಗಮನಿಸಿ : ಪಾವತಿ ಎಂಟ್ರಿ 'ನಗದು ಅಥವಾ ಬ್ಯಾಂಕ್ ಖಾತೆ ' ಏನು ನಿರ್ದಿಷ್ಟಪಡಿಸಿಲ್ಲ ರಿಂದ ರಚಿಸಲಾಗುವುದಿಲ್ಲ
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +171,Responsibilities,ಜವಾಬ್ದಾರಿಗಳನ್ನು
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +457,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 +11,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/setup/page/setup_wizard/setup_wizard.js +511,Add Users,ಬಳಕೆದಾರರು ಸೇರಿಸಿ
+apps/erpnext/erpnext/public/js/setup_wizard.js +255,Add Users,ಬಳಕೆದಾರರು ಸೇರಿಸಿ
 DocType: Pricing Rule,Item Group,ಐಟಂ ಗುಂಪು
 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),ಸೇರಿಸಲಾಗಿದೆ ತೆರಿಗೆಗಳು ಮತ್ತು ಶುಲ್ಕಗಳು ( ಕಂಪನಿ ಕರೆನ್ಸಿ )
-apps/erpnext/erpnext/stock/doctype/item/item.py +340,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,ಐಟಂ ತೆರಿಗೆ ರೋ {0} ಬಗೆಯ ತೆರಿಗೆ ಅಥವಾ ಆದಾಯ ಅಥವಾ ಖರ್ಚು ಅಥವಾ ಶುಲ್ಕಕ್ಕೆ ಖಾತೆಯನ್ನು ಹೊಂದಿರಬೇಕು
+apps/erpnext/erpnext/stock/doctype/item/item.py +344,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,ಐಟಂ ತೆರಿಗೆ ರೋ {0} ಬಗೆಯ ತೆರಿಗೆ ಅಥವಾ ಆದಾಯ ಅಥವಾ ಖರ್ಚು ಅಥವಾ ಶುಲ್ಕಕ್ಕೆ ಖಾತೆಯನ್ನು ಹೊಂದಿರಬೇಕು
 DocType: Sales Order,Partly Billed,ಹೆಚ್ಚಾಗಿ ಖ್ಯಾತವಾದ
 DocType: Item,Default BOM,ಡೀಫಾಲ್ಟ್ BOM
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +79,Decambering,Decambering
 apps/erpnext/erpnext/setup/doctype/company/company.js +22,Please re-type company name to confirm,ಮರು ಮಾದರಿ ಕಂಪನಿ ಹೆಸರು ದೃಢೀಕರಿಸಿ ದಯವಿಟ್ಟು
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,ಒಟ್ಟು ಅತ್ಯುತ್ತಮ ಆಮ್ಟ್
 DocType: Time Log Batch,Total Hours,ಒಟ್ಟು ಅವರ್ಸ್
 DocType: Journal Entry,Printing Settings,ಮುದ್ರಣ ಸೆಟ್ಟಿಂಗ್ಗಳು
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +268,Total Debit must be equal to Total Credit. The difference is {0},ಒಟ್ಟು ಡೆಬಿಟ್ ಒಟ್ಟು ಕ್ರೆಡಿಟ್ ಸಮಾನವಾಗಿರಬೇಕು . ವ್ಯತ್ಯಾಸ {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +11,Automotive,ಆಟೋಮೋಟಿವ್
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +37,Item is required,ಐಟಂ ಅಗತ್ಯವಿದೆ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +25,Metal injection molding,ಮೆಟಲ್ ಅಚ್ಚೊತ್ತುವಿಕೆ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +258,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/accounts/doctype/sales_invoice/sales_invoice.js +684,From Delivery Note,ಡೆಲಿವರಿ ಗಮನಿಸಿ
 DocType: Time Log,From Time,ಸಮಯದಿಂದ
 DocType: Notification Control,Custom Message,ಕಸ್ಟಮ್ ಸಂದೇಶ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +33,Investment Banking,ಇನ್ವೆಸ್ಟ್ಮೆಂಟ್ ಬ್ಯಾಂಕಿಂಗ್
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +261,"Select your Country, Time Zone and Currency","ನಿಮ್ಮ ದೇಶ, ಕಾಲವಲಯವನ್ನು ಮತ್ತು ಕರೆನ್ಸಿ ಆಯ್ಕೆ"
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,ಇನ್ವೆಸ್ಟ್ಮೆಂಟ್ ಬ್ಯಾಂಕಿಂಗ್
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +316,"Select your Country, Time Zone and Currency","ನಿಮ್ಮ ದೇಶ, ಕಾಲವಲಯವನ್ನು ಮತ್ತು ಕರೆನ್ಸಿ ಆಯ್ಕೆ"
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +369,Cash or Bank Account is mandatory for making payment entry,ನಗದು ಅಥವಾ ಬ್ಯಾಂಕ್ ಖಾತೆ ಪಾವತಿ ಪ್ರವೇಶ ಮಾಡುವ ಕಡ್ಡಾಯ
 DocType: Purchase Invoice,Price List Exchange Rate,ಬೆಲೆ ಪಟ್ಟಿ ವಿನಿಮಯ ದರ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +91,Pickling,ಉಪ್ಪಿನಕಾಯಿ ಹಾಕುವ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +18,Sand casting,ಮರಳು ಎರಕದ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +117,Electroplating,ವಿದ್ಯುಲ್ಲೇಪಿಸುವಿಕೆಯನ್ನು
 DocType: Purchase Invoice Item,Rate,ದರ
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +62,Intern,ಆಂತರಿಕ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Intern,ಆಂತರಿಕ
 DocType: Newsletter,A Lead with this email id should exist,ಈ ಇಮೇಲ್ ಐಡಿ Shoulderstand ಒಂದು ಪ್ರಮುಖ ಅಸ್ತಿತ್ವದಲ್ಲಿವೆ
 DocType: Stock Entry,From BOM,BOM ಗೆ
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +34,Basic,ಮೂಲಭೂತ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +34,Basic,ಮೂಲಭೂತ
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,{0} ಮೊದಲು ಸ್ಟಾಕ್ ವ್ಯವಹಾರ ಘನೀಭವಿಸಿದ
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +217,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,ದಿನಾಂಕ ಅರ್ಧ ದಿನ ರಜೆ Fromdate ಅದೇ ಇರಬೇಕು
@@ -2802,11 +2696,11 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +96,Reference No is mandatory if you entered Reference Date,ನೀವು ರೆಫರೆನ್ಸ್ ದಿನಾಂಕ ನಮೂದಿಸಿದರೆ ರೆಫರೆನ್ಸ್ ನಂ ಕಡ್ಡಾಯ
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +108,Date of Joining must be greater than Date of Birth,ಸೇರುವ ದಿನಾಂಕ ಜನ್ಮ ದಿನಾಂಕ ಹೆಚ್ಚಿನ ಇರಬೇಕು
 DocType: Salary Structure,Salary Structure,ಸಂಬಳ ರಚನೆ
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +242,"Multiple Price Rule exists with same criteria, please resolve \
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +246,"Multiple Price Rule exists with same criteria, please resolve \
 			conflict by assigning priority. Price Rules: {0}","ಬಹು ಬೆಲೆ ರೂಲ್ ಅದೇ ಮಾನದಂಡವನ್ನು ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ, ಪ್ರಾಶಸ್ತ್ಯವನ್ನು ನಿಗದಿಪಡಿಸಬೇಕು \
  ಸಂಘರ್ಷ ಪರಿಹರಿಸಲು ದಯವಿಟ್ಟು. ಬೆಲೆ ನಿಯಮಗಳು: {0}"
 DocType: Account,Bank,ಬ್ಯಾಂಕ್
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +9,Airline,ಏರ್ಲೈನ್
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,ಏರ್ಲೈನ್
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +493,Issue Material,ಸಂಚಿಕೆ ಮೆಟೀರಿಯಲ್
 DocType: Material Request Item,For Warehouse,ಗೋದಾಮಿನ
 DocType: Employee,Offer Date,ಆಫರ್ ದಿನಾಂಕ
@@ -2816,29 +2710,24 @@
 DocType: Item,Is Fixed Asset Item,ಸ್ಥಿರ ಆಸ್ತಿ ಐಟಂ
 DocType: Stock Entry,Including items for sub assemblies,ಉಪ ಅಸೆಂಬ್ಲಿಗಳಿಗೆ ಐಟಂಗಳನ್ನು ಸೇರಿದಂತೆ
 DocType: Features Setup,"If you have long print formats, this feature can be used to split the page to be printed on multiple pages with all headers and footers on each page","ನೀವು ದೀರ್ಘ ಮುದ್ರಣ ಸ್ವರೂಪಗಳು ಹೊಂದಿದ್ದರೆ, ಈ ವೈಶಿಷ್ಟ್ಯವನ್ನು ಎಲ್ಲಾ ಪ್ರತಿ ಪುಟದಲ್ಲಿ ಶೀರ್ಷಿಕೆಗಳು ಮತ್ತು ಅಡಿಟಿಪ್ಪಣಿಗಳು ಬಹು ಪುಟಗಳನ್ನು ಮೇಲೆ ಮುದ್ರಿತ ಪುಟ ಬೇರ್ಪಡಿಸಲು ಬಳಸಬಹುದಾಗಿದೆ"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +131,Hobbing,Hobbing
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +98,All Territories,ಎಲ್ಲಾ ಪ್ರಾಂತ್ಯಗಳು
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +98,All Territories,ಎಲ್ಲಾ ಪ್ರಾಂತ್ಯಗಳು
 DocType: Purchase Invoice,Items,ಐಟಂಗಳನ್ನು
 DocType: Fiscal Year,Year Name,ವರ್ಷದ ಹೆಸರು
 DocType: Process Payroll,Process Payroll,ಪ್ರಕ್ರಿಯೆ ವೇತನದಾರರ ಪಟ್ಟಿ
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +59,There are more holidays than working days this month.,ಈ ತಿಂಗಳ ದಿನಗಳ ಕೆಲಸ ಹೆಚ್ಚು ರಜಾದಿನಗಳಲ್ಲಿ ಇವೆ .
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +68,There are more holidays than working days this month.,ಈ ತಿಂಗಳ ದಿನಗಳ ಕೆಲಸ ಹೆಚ್ಚು ರಜಾದಿನಗಳಲ್ಲಿ ಇವೆ .
 DocType: Product Bundle Item,Product Bundle Item,ಉತ್ಪನ್ನ ಕಟ್ಟು ಐಟಂ
 DocType: Sales Partner,Sales Partner Name,ಮಾರಾಟದ ಸಂಗಾತಿ ಹೆಸರು
 DocType: Purchase Invoice Item,Image View,ImageView
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +113,Finishing & industrial finishing,ಸ್ಥಾನ ಮತ್ತು ಕೈಗಾರಿಕಾ ಸ್ಥಾನ
 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/page/setup_wizard/fixtures/industry_type.py +46,Securities & Commodity Exchanges,ಸೆಕ್ಯುರಿಟೀಸ್ ಮತ್ತು ಸರಕು ವಿನಿಮಯ
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,ಸೆಕ್ಯುರಿಟೀಸ್ ಮತ್ತು ಸರಕು ವಿನಿಮಯ
 DocType: Shipping Rule,Calculate Based On,ಆಧರಿಸಿದ ಲೆಕ್ಕ
 DocType: Delivery Note Item,From Warehouse,ಗೋದಾಮಿನ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +98,Drilling,ಕೊರೆಯುವ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +28,Blow molding,ಊದು ಅಚ್ಚೊತ್ತುವಿಕೆ
 DocType: Purchase Taxes and Charges,Valuation and Total,ಮೌಲ್ಯಾಂಕನ ಮತ್ತು ಒಟ್ಟು
 DocType: Tax Rule,Shipping City,ಶಿಪ್ಪಿಂಗ್ ನಗರ
 apps/erpnext/erpnext/stock/doctype/item/item.js +43,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,ಈ ಐಟಂ {0} (ಟೆಂಪ್ಲೇಟು) ಒಂದು ಭೇದ. 'ಯಾವುದೇ ನಕಲಿಸಿ' ಸೆಟ್ ಹೊರತು ಲಕ್ಷಣಗಳು ಟೆಂಪ್ಲೇಟ್ ನಕಲು ಮಾಡಲಾಗುತ್ತದೆ
 DocType: Account,Purchase User,ಖರೀದಿ ಬಳಕೆದಾರ
 DocType: Notification Control,Customize the Notification,ಅಧಿಸೂಚನೆ ಕಸ್ಟಮೈಸ್
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +87,Hammering,ಬಡಿಯುವಿಕೆಯಿಂದ
 DocType: Web Page,Slideshow,ಸ್ಲೈಡ್ಶೋ
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +24,Default Address Template cannot be deleted,ಡೀಫಾಲ್ಟ್ ವಿಳಾಸ ಟೆಂಪ್ಲೇಟು ಅಳಿಸಲಾಗಿಲ್ಲ
 DocType: Sales Invoice,Shipping Rule,ಶಿಪ್ಪಿಂಗ್ ರೂಲ್
@@ -2847,9 +2736,8 @@
 DocType: Workflow State,Search,ಹುಡುಕು
 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/setup/page/setup_wizard/fixtures/operations.py +142,Brazing,Brazing
 DocType: C-Form,Amended From,ಗೆ ತಿದ್ದುಪಡಿ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Raw Material,ಮೂಲಸಾಮಗ್ರಿ
+apps/erpnext/erpnext/public/js/setup_wizard.js +359,Raw Material,ಮೂಲಸಾಮಗ್ರಿ
 DocType: Leave Application,Follow via Email,ಇಮೇಲ್ ಮೂಲಕ ಅನುಸರಿಸಿ
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,ಡಿಸ್ಕೌಂಟ್ ಪ್ರಮಾಣ ನಂತರ ತೆರಿಗೆ ಪ್ರಮಾಣ
 apps/erpnext/erpnext/accounts/doctype/account/account.py +174,Child account exists for this account. You can not delete this account.,ಮಗುವಿನ ಖಾತೆಗೆ ಈ ಖಾತೆಗಾಗಿ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ . ನೀವು ಈ ಖಾತೆಯನ್ನು ಅಳಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ .
@@ -2863,10 +2751,10 @@
 ,Produced,ನಿರ್ಮಾಣ
 DocType: Item,Item Code for Suppliers,ಪೂರೈಕೆದಾರರು ಐಟಂ ಕೋಡ್
 DocType: Issue,Raised By (Email),( ಇಮೇಲ್ ) ಬೆಳೆಸಿದರು
-apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +72,General,ಜನರಲ್
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +495,Attach Letterhead,ತಲೆಬರಹ ಲಗತ್ತಿಸಿ
+apps/erpnext/erpnext/setup/setup_wizard/default_website.py +72,General,ಜನರಲ್
+apps/erpnext/erpnext/public/js/setup_wizard.js +241,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/setup/page/setup_wizard/setup_wizard.js +542,"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/public/js/setup_wizard.js +284,"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}
 DocType: Journal Entry,Bank Entry,ಬ್ಯಾಂಕ್ ಎಂಟ್ರಿ
 DocType: Authorization Rule,Applicable To (Designation),ಅನ್ವಯವಾಗುತ್ತದೆ ( ಹುದ್ದೆ )
@@ -2875,33 +2763,32 @@
 apps/erpnext/erpnext/config/accounts.py +143,Enable / disable currencies.,/ ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಿ ಕರೆನ್ಸಿಗಳ ಸಕ್ರಿಯಗೊಳಿಸಿ .
 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),ಒಟ್ಟು (ಆಮ್ಟ್)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +26,Entertainment & Leisure,ಮನರಂಜನೆ ಮತ್ತು ವಿರಾಮ
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,ಮನರಂಜನೆ ಮತ್ತು ವಿರಾಮ
 DocType: Purchase Order,The date on which recurring order will be stop,ಮರುಕಳಿಸುವ ಸಲುವಾಗಿ ನಿಲ್ಲಿಸಲು ಯಾವ ದಿನಾಂಕ
 DocType: Quality Inspection,Item Serial No,ಐಟಂ ಅನುಕ್ರಮ ಸಂಖ್ಯೆ
 apps/erpnext/erpnext/controllers/status_updater.py +142,{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 +57,Total Present,ಒಟ್ಟು ಪ್ರೆಸೆಂಟ್
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Hour,ಗಂಟೆ
+apps/erpnext/erpnext/public/js/setup_wizard.js +363,Hour,ಗಂಟೆ
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +138,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation","ಧಾರಾವಾಹಿಯಾಗಿ ಐಟಂ {0} ಸ್ಟಾಕ್ ಸಾಮರಸ್ಯ ಬಳಸಿಕೊಂಡು \
  ನವೀಕರಿಸಲಾಗುವುದಿಲ್ಲ"
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +488,Transfer Material to Supplier,ಸರಬರಾಜುದಾರರಿಗೆ ವಸ್ತು ವರ್ಗಾವಣೆ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +513,Transfer Material to Supplier,ಸರಬರಾಜುದಾರರಿಗೆ ವಸ್ತು ವರ್ಗಾವಣೆ
 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/crm/doctype/opportunity/opportunity.js +82,Create Quotation,ಉದ್ಧರಣ ರಚಿಸಿ
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +306,All these items have already been invoiced,ಈ ಎಲ್ಲಾ ವಸ್ತುಗಳನ್ನು ಈಗಾಗಲೇ ಸರಕುಪಟ್ಟಿ ಮಾಡಲಾಗಿದೆ
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,You are not authorized to approve leaves on Block Dates,ನೀವು ಬ್ಲಾಕ್ ದಿನಾಂಕ ಎಲೆಗಳು ಅನುಮೋದಿಸಲು ನಿನಗೆ ಅಧಿಕಾರವಿಲ್ಲ
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +311,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,ಬದಲಿ ನಂತರ ಹೊಸ BOM
 DocType: Features Setup,Point of Sale,ಪಾಯಿಂಟ್ ಆಫ್ ಸೇಲ್
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +83,Curling,ಕರ್ಲಿಂಗ್
 DocType: Account,Tax,ತೆರಿಗೆ
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +28,Row {0}: {1} is not a valid {2},ಸಾಲು {0}: {1} ಒಂದು ಮಾನ್ಯವಾಗಿಲ್ಲ {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +89,Refining,ಸಂಸ್ಕರಣೆ
+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,ತಯಾರಿಕಾ ಯೋಜನೆ ಉಪಕರಣ
 DocType: Quality Inspection,Report Date,ವರದಿಯ ದಿನಾಂಕ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +130,Routing,ರೂಟಿಂಗ್
 DocType: C-Form,Invoices,ಇನ್ವಾಯ್ಸ್ಗಳು
 DocType: Job Opening,Job Title,ಕೆಲಸದ ಶೀರ್ಷಿಕೆ
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +54,{0} already allocated for Employee {1} for period {2} - {3},{0} ಈಗಾಗಲೇ ಅವಧಿಗೆ ನೌಕರರ {1} ಇರುವ {2} - {3}
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +80,{0} Recipients,{0} ಪಡೆದವರು
 DocType: Features Setup,Item Groups in Details,ವಿವರಗಳನ್ನು ಐಟಂ ಗುಂಪುಗಳು
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +335,Quantity to Manufacture must be greater than 0.,ತಯಾರಿಸಲು ಪ್ರಮಾಣ 0 ಹೆಚ್ಚು ಇರಬೇಕು.
@@ -2919,14 +2806,13 @@
 DocType: DocType,Setup,ಸೆಟಪ್
 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,ಈ ತಿಂಗಳ ಬಾಕಿ ಚಟುವಟಿಕೆಗಳಿಗೆ ಸಾರಾಂಶ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +39,Cold rolling,ಶೀತಲ ಸುರುಳಿ
 DocType: Customer Group,Customer Group Name,ಗ್ರಾಹಕ ಗುಂಪಿನ ಹೆಸರು
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +408,Please remove this Invoice {0} from C-Form {1},ಸಿ ಫಾರ್ಮ್ ಈ ಸರಕುಪಟ್ಟಿ {0} ತೆಗೆದುಹಾಕಿ {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +410,Please remove this Invoice {0} from C-Form {1},ಸಿ ಫಾರ್ಮ್ ಈ ಸರಕುಪಟ್ಟಿ {0} ತೆಗೆದುಹಾಕಿ {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,ಗುಣಲಕ್ಷಣಗಳು
 DocType: Packing Slip,Get Items,ಐಟಂಗಳನ್ನು ಪಡೆಯಿರಿ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +186,Please enter Write Off Account,ಖಾತೆ ಆಫ್ ಬರೆಯಿರಿ ನಮೂದಿಸಿ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +187,Please enter Write Off Account,ಖಾತೆ ಆಫ್ ಬರೆಯಿರಿ ನಮೂದಿಸಿ
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +71,Last Order Date,ಕೊನೆಯ ಆದೇಶ ದಿನಾಂಕ
 DocType: DocField,Image,ಚಿತ್ರ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +179,Make Excise Invoice,ಅಬಕಾರಿ ಸರಕುಪಟ್ಟಿ ಮಾಡಿ
@@ -2936,7 +2822,7 @@
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +146,Operation ID not set,ಆಪರೇಷನ್ ಐಡಿ ಹೊಂದಿಸಿಲ್ಲ
 DocType: Production Order,Planned Start Date,ಯೋಜನೆ ಪ್ರಾರಂಭ ದಿನಾಂಕ
 DocType: Serial No,Creation Document Type,ಸೃಷ್ಟಿ ಡಾಕ್ಯುಮೆಂಟ್ ಕೌಟುಂಬಿಕತೆ
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +620,Maint. Visit,ಮಾಹಿತಿ ಗಾತ್ರ. ಭೇಟಿ
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +631,Maint. Visit,ಮಾಹಿತಿ ಗಾತ್ರ. ಭೇಟಿ
 DocType: Leave Type,Is Encash,ಮುರಿಸು ಇದೆ
 DocType: Purchase Invoice,Mobile No,ಮೊಬೈಲ್ ಸಂಖ್ಯೆ
 DocType: Payment Tool,Make Journal Entry,ಜರ್ನಲ್ ಎಂಟ್ರಿ ಮಾಡಿ
@@ -2944,35 +2830,31 @@
 apps/erpnext/erpnext/controllers/trends.py +257,Project-wise data is not available for Quotation,ಪ್ರಾಜೆಕ್ಟ್ ಬಲ್ಲ ದಶಮಾಂಶ ಉದ್ಧರಣ ಲಭ್ಯವಿಲ್ಲ
 DocType: Project,Expected End Date,ನಿರೀಕ್ಷಿತ ಅಂತಿಮ ದಿನಾಂಕ
 DocType: Appraisal Template,Appraisal Template Title,ಅಪ್ರೇಸಲ್ ಟೆಂಪ್ಲೇಟು ಶೀರ್ಷಿಕೆ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +440,Commercial,ವ್ಯಾಪಾರದ
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +378,Commercial,ವ್ಯಾಪಾರದ
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +23,Parent Item {0} must not be a Stock Item,ಪೋಷಕ ಐಟಂ {0} ಒಂದು ಸ್ಟಾಕ್ ಐಟಂ ಇರಬಾರದು
 DocType: Cost Center,Distribution Id,ವಿತರಣೆ ಸಂ
-apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +14,Awesome Services,ಆಕರ್ಷಕ ಸೇವೆಗಳು
+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,ಸರಬರಾಜುದಾರ ವಿಳಾಸ
 DocType: Contact Us Settings,Address Line 2,ಲೈನ್ 2 ವಿಳಾಸ
 DocType: ToDo,Reference,ರೆಫರೆನ್ಸ್
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +59,Perforating,ರಂಧ್ರಕೊರೆಯುವಿಕೆ
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,ಪ್ರಮಾಣ ಔಟ್
 apps/erpnext/erpnext/config/accounts.py +128,Rules to calculate shipping amount for a sale,ಒಂದು ಮಾರಾಟ ಹಡಗು ಪ್ರಮಾಣವನ್ನು ಲೆಕ್ಕಾಚಾರ ನಿಯಮಗಳು
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +29,Series is mandatory,ಸರಣಿ ಕಡ್ಡಾಯ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +28,Financial Services,ಹಣಕಾಸು ಸೇವೆಗಳು
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,ಹಣಕಾಸು ಸೇವೆಗಳು
 apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3},{0} ಲಕ್ಷಣ ಮೌಲ್ಯವನ್ನು ವ್ಯಾಪ್ತಿಯಲ್ಲಿ ಇರಬೇಕು {1} ಗೆ {2} ಏರಿಕೆಗಳಲ್ಲಿ {3}
 DocType: Tax Rule,Sales,ಮಾರಾಟದ
 DocType: Stock Entry Detail,Basic Amount,ಬೇಸಿಕ್ ಪ್ರಮಾಣ
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +173,Warehouse required for stock Item {0},ಸ್ಟಾಕ್ ಐಟಂ ಅಗತ್ಯವಿದೆ ವೇರ್ಹೌಸ್ {0}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +178,Warehouse required for stock Item {0},ಸ್ಟಾಕ್ ಐಟಂ ಅಗತ್ಯವಿದೆ ವೇರ್ಹೌಸ್ {0}
 DocType: Leave Allocation,Unused leaves,ಬಳಕೆಯಾಗದ ಎಲೆಗಳು
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,ಕೋಟಿ
 DocType: Customer,Default Receivable Accounts,ಸ್ವೀಕರಿಸುವಂತಹ ಖಾತೆಗಳು ಡೀಫಾಲ್ಟ್
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +102,Sawing,Sawing
 DocType: Tax Rule,Billing State,ಬಿಲ್ಲಿಂಗ್ ರಾಜ್ಯ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +32,Laminating,ಲ್ಯಾಮಿನೇಟ್
 DocType: Item Reorder,Transfer,ವರ್ಗಾವಣೆ
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +549,Fetch exploded BOM (including sub-assemblies),( ಉಪ ಜೋಡಣೆಗಳಿಗೆ ಸೇರಿದಂತೆ ) ಸ್ಫೋಟಿಸಿತು BOM ಪಡೆದುಕೊಳ್ಳಿ
 DocType: Authorization Rule,Applicable To (Employee),ಅನ್ವಯವಾಗುತ್ತದೆ ( ಉದ್ಯೋಗಗಳು)
 apps/erpnext/erpnext/controllers/accounts_controller.py +101,Due Date is mandatory,ಕಾರಣ ದಿನಾಂಕ ಕಡ್ಡಾಯ
 apps/erpnext/erpnext/controllers/item_variant.py +51,Increment for Attribute {0} cannot be 0,ಗುಣಲಕ್ಷಣ ಹೆಚ್ಚಳವನ್ನು {0} 0 ಸಾಧ್ಯವಿಲ್ಲ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +143,Sintering,ಹೆಪ್ಪುಗಟ್ಟಿಸಿ
 DocType: Journal Entry,Pay To / Recd From,Recd ಗೆ / ಕಟ್ಟುವುದನ್ನು
 DocType: Naming Series,Setup Series,ಸೆಟಪ್ ಸರಣಿ
 DocType: Supplier,Contact HTML,ಸಂಪರ್ಕಿಸಿ ಎಚ್ಟಿಎಮ್ಎಲ್
@@ -2985,7 +2867,6 @@
 DocType: Attendance,Absent,ಆಬ್ಸೆಂಟ್
 DocType: Product Bundle,Product Bundle,ಉತ್ಪನ್ನ ಬಂಡಲ್
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +180,Row {0}: Invalid reference {1},ಸಾಲು {0}: ಅಮಾನ್ಯ ಉಲ್ಲೇಖಿತ {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +165,Crushing,ಹಿಂಡುವಿಕೆ
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,ತೆರಿಗೆಗಳು ಮತ್ತು ಶುಲ್ಕಗಳು ಟೆಂಪ್ಲೇಟು ಖರೀದಿಸಿ
 DocType: Upload Attendance,Download Template,ಡೌನ್ಲೋಡ್ ಟೆಂಪ್ಲೇಟು
 DocType: GL Entry,Remarks,ರಿಮಾರ್ಕ್ಸ್
@@ -2993,14 +2874,12 @@
 DocType: Journal Entry,Write Off Based On,ಆಧರಿಸಿದ ಆಫ್ ಬರೆಯಿರಿ
 DocType: Features Setup,POS View,ಪಿಓಎಸ್ ವೀಕ್ಷಿಸಿ
 apps/erpnext/erpnext/config/stock.py +38,Installation record for a Serial No.,ಒಂದು ನೆಯ ಅನುಸ್ಥಾಪನೆ ದಾಖಲೆ .
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +9,Continuous casting,ನಿರಂತರ ಎರಕದ
 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/setup/page/setup_wizard/fixtures/operations.py +80,Cold sizing,ಶೀತಲ ಗಾತ್ರ
 DocType: Salary Slip,Earning & Deduction,ದುಡಿಯುತ್ತಿದ್ದ & ಡಿಡಕ್ಷನ್
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +76,Account {0} cannot be a Group,ಖಾತೆ {0} ಒಂದು ಗುಂಪು ಸಾಧ್ಯವಿಲ್ಲ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +259,Region,ಪ್ರದೇಶ
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +314,Region,ಪ್ರದೇಶ
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +213,Optional. This setting will be used to filter in various transactions.,ಐಚ್ಛಿಕ . ಈ ಸೆಟ್ಟಿಂಗ್ ವಿವಿಧ ವ್ಯವಹಾರಗಳಲ್ಲಿ ಫಿಲ್ಟರ್ ಬಳಸಲಾಗುತ್ತದೆ.
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +104,Negative Valuation Rate is not allowed,ನಕಾರಾತ್ಮಕ ಮೌಲ್ಯಾಂಕನ ದರ ಅನುಮತಿಸಲಾಗುವುದಿಲ್ಲ
 DocType: Holiday List,Weekly Off,ಸಾಪ್ತಾಹಿಕ ಆಫ್
@@ -3018,7 +2897,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,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,ದಿನಾಂಕದಿಂದ ಮತ್ತು ದಿನಾಂಕ ಅಟೆಂಡೆನ್ಸ್ ಹಾಜರಿದ್ದ ಕಡ್ಡಾಯ
-apps/erpnext/erpnext/controllers/buying_controller.py +131,Please enter 'Is Subcontracted' as Yes or No,ನಮೂದಿಸಿ ಹೌದು ಅಥವಾ ಇಲ್ಲ ಎಂದು ' subcontracted ಈಸ್'
+apps/erpnext/erpnext/controllers/buying_controller.py +122,Please enter 'Is Subcontracted' as Yes or No,ನಮೂದಿಸಿ ಹೌದು ಅಥವಾ ಇಲ್ಲ ಎಂದು ' subcontracted ಈಸ್'
 DocType: Sales Team,Contact No.,ಸಂಪರ್ಕಿಸಿ ನಂ
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,'Profit and Loss' type account {0} not allowed in Opening Entry,' ಲಾಭ ಮತ್ತು ನಷ್ಟ ' ಮಾದರಿ ಖಾತೆಯನ್ನು {0} ಎಂಟ್ರಿ ತೆರೆಯುವ ಅನುಮತಿ ಇಲ್ಲ
 DocType: Workflow State,Time,ಟೈಮ್
@@ -3027,14 +2906,13 @@
 DocType: Authorization Rule,Authorization Rule,ಅಧಿಕಾರ ರೂಲ್
 DocType: Sales Invoice,Terms and Conditions Details,ನಿಯಮಗಳು ಮತ್ತು ನಿಯಮಗಳು ವಿವರಗಳು
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,ಮಾರಾಟ ತೆರಿಗೆ ಮತ್ತು ಶುಲ್ಕಗಳು ಟೆಂಪ್ಲೇಟು
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +10,Apparel & Accessories,ಬಟ್ಟೆಬರೆ ಮತ್ತು ಭಾಗಗಳು
+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,ಆರ್ಡರ್ ಸಂಖ್ಯೆ
 DocType: Item Group,HTML / Banner that will show on the top of product list.,ಉತ್ಪನ್ನದ ಪಟ್ಟಿ ಮೇಲೆ ತೋರಿಸಿ thatwill ಎಚ್ಟಿಎಮ್ಎಲ್ / ಬ್ಯಾನರ್ .
 DocType: Shipping Rule,Specify conditions to calculate shipping amount,ಹಡಗು ಪ್ರಮಾಣವನ್ನು ಲೆಕ್ಕ ಪರಿಸ್ಥಿತಿಗಳು ಸೂಚಿಸಿ
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +121,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,ಆಲ್ಡ್ವಿಚ್ childNodes ಲೆಡ್ಜರ್ ಒಂದು ವೆಚ್ಚದ ಕೇಂದ್ರವಾಗಿ ಪರಿವರ್ತಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +47,Conversion Factor is required,ಪರಿವರ್ತಿಸುವುದರ ಅಗತ್ಯವಿದೆ
 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,ಮೌಲ್ಯ / ವಿವರಣೆ
@@ -3042,10 +2920,8 @@
 ,Customers Not Buying Since Long Time,ಗ್ರಾಹಕರು ರಿಂದ ಲಾಂಗ್ ಟೈಮ್ ಖರೀದಿ ಇಲ್ಲ
 DocType: Production Order,Expected Delivery Date,ನಿರೀಕ್ಷಿತ ಡೆಲಿವರಿ ದಿನಾಂಕ
 apps/erpnext/erpnext/accounts/general_ledger.py +121,Debit and Credit not equal for {0} #{1}. Difference is {2}.,ಡೆಬಿಟ್ ಮತ್ತು ಕ್ರೆಡಿಟ್ {0} # ಸಮಾನ ಅಲ್ಲ {1}. ವ್ಯತ್ಯಾಸ {2}.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +48,Bulging,ಉಬ್ಬುವ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +11,Evaporative-pattern casting,ಆವಿಗೊಳಿಸುವ ಚಿತ್ತಾರ ಎರಕದ
 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 +195,Sales Invoice {0} must be cancelled before cancelling this Sales Order,ಮಾರಾಟದ ಸರಕುಪಟ್ಟಿ {0} ಈ ಮಾರಾಟದ ಆದೇಶವನ್ನು ರದ್ದುಗೊಳಿಸುವ ಮೊದಲು ರದ್ದು ಮಾಡಬೇಕು
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +190,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 ಹೆಚ್ಚಿರಬೇಕು
@@ -3064,26 +2940,24 @@
 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 +241,Account: {0} with currency: {1} can not be selected,ಖಾತೆ: {0} ಕರೆನ್ಸಿಗೆ: {1} ಆಯ್ಕೆ ಸಾಧ್ಯವಿಲ್ಲ
+apps/erpnext/erpnext/controllers/accounts_controller.py +242,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 +47,Account {0}: Parent account {1} does not belong to company: {2},ಖಾತೆ {0}: ಪೋಷಕರ ಖಾತೆಯ {1} ಕಂಪನಿ ಸೇರುವುದಿಲ್ಲ: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted all transactions related to this company!,ಯಶಸ್ವಿಯಾಗಿ ಈ ಕಂಪನಿಗೆ ಸಂಬಂಧಿಸಿದ ಎಲ್ಲಾ ವ್ಯವಹಾರಗಳನ್ನು ಅಳಿಸಲಾಗಿದೆ!
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,ದಿನಾಂಕದಂದು
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +111,Honing,ಸಾಣೆ
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +58,Probation,ಪರೀಕ್ಷಣೆ
-apps/erpnext/erpnext/stock/doctype/item/item.py +264,Default Warehouse is mandatory for stock Item.,ಡೀಫಾಲ್ಟ್ ವೇರ್ಹೌಸ್ ಸ್ಟಾಕ್ ಐಟಂ ಕಡ್ಡಾಯ.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Probation,ಪರೀಕ್ಷಣೆ
+apps/erpnext/erpnext/stock/doctype/item/item.py +268,Default Warehouse is mandatory for stock Item.,ಡೀಫಾಲ್ಟ್ ವೇರ್ಹೌಸ್ ಸ್ಟಾಕ್ ಐಟಂ ಕಡ್ಡಾಯ.
 DocType: Feed,Full Name,ಪೂರ್ಣ ಹೆಸರು
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +148,Clinching,ತೆಕ್ಕೆಗೆ
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +191,Payment of salary for the month {0} and year {1},ತಿಂಗಳು ಮತ್ತು ವರ್ಷದ ಸಂಬಳ ಪಾವತಿ {0} {1}
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +173,Payment of salary for the month {0} and year {1},ತಿಂಗಳು ಮತ್ತು ವರ್ಷದ ಸಂಬಳ ಪಾವತಿ {0} {1}
 DocType: Stock Settings,Auto insert Price List rate if missing,ಆಟೋ ಇನ್ಸರ್ಟ್ ದರ ಪಟ್ಟಿ ದರ ಕಾಣೆಯಾಗಿದೆ ವೇಳೆ
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,ಒಟ್ಟು ಗಳಿಸುವ ಪ್ರಮಾಣ
 ,Transferred Qty,ಪ್ರಮಾಣ ವರ್ಗಾಯಿಸಲಾಯಿತು
 apps/erpnext/erpnext/config/learn.py +11,Navigating,ನ್ಯಾವಿಗೇಟ್
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +137,Planning,ಯೋಜನೆ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +137,Planning,ಯೋಜನೆ
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +9,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),ಒಟ್ಟು ಬಿಲ್ಲಿಂಗ್ ಪ್ರಮಾಣ (ಸಮಯ ದಾಖಲೆಗಳು ಮೂಲಕ)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +629,We sell this Item,ನಾವು ಈ ಐಟಂ ಮಾರಾಟ
+apps/erpnext/erpnext/public/js/setup_wizard.js +365,We sell this Item,ನಾವು ಈ ಐಟಂ ಮಾರಾಟ
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +65,Supplier Id,ಪೂರೈಕೆದಾರ ಐಡಿ
 DocType: Journal Entry,Cash Entry,ನಗದು ಎಂಟ್ರಿ
 DocType: Sales Partner,Contact Desc,ಸಂಪರ್ಕಿಸಿ DESC
@@ -3092,18 +2966,16 @@
 DocType: Brand,Item Manager,ಐಟಂ ಮ್ಯಾನೇಜರ್
 DocType: Cost Center,Add rows to set annual budgets on Accounts.,ಖಾತೆಗಳ ವಾರ್ಷಿಕ ಬಜೆಟ್ ಹೊಂದಿಸಲು ಸಾಲುಗಳನ್ನು ಸೇರಿಸಿ .
 DocType: Buying Settings,Default Supplier Type,ಡೀಫಾಲ್ಟ್ ಸರಬರಾಜುದಾರ ಪ್ರಕಾರ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +160,Quarrying,ಕಲ್ಲುಗಣಿಗಾರಿಕೆ
 DocType: Production Order,Total Operating Cost,ಒಟ್ಟು ವೆಚ್ಚವನ್ನು
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +160,Note: Item {0} entered multiple times,ರೇಟಿಂಗ್ : ಐಟಂ {0} ಅನೇಕ ಬಾರಿ ಪ್ರವೇಶಿಸಿತು
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +163,Note: Item {0} entered multiple times,ರೇಟಿಂಗ್ : ಐಟಂ {0} ಅನೇಕ ಬಾರಿ ಪ್ರವೇಶಿಸಿತು
 apps/erpnext/erpnext/config/crm.py +27,All Contacts.,ಎಲ್ಲಾ ಸಂಪರ್ಕಗಳು .
 DocType: Newsletter,Test Email Id,ಟೆಸ್ಟ್ ಮಿಂಚಂಚೆ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +394,Company Abbreviation,ಕಂಪನಿ ಸಂಕ್ಷೇಪಣ
+apps/erpnext/erpnext/public/js/setup_wizard.js +142,Company Abbreviation,ಕಂಪನಿ ಸಂಕ್ಷೇಪಣ
 DocType: Features Setup,If you follow Quality Inspection. Enables Item QA Required and QA No in Purchase Receipt,ನೀವು ಗುಣಮಟ್ಟ ತಪಾಸಣೆ ಅನುಸರಿಸಿದರೆ . ಖರೀದಿ ರಸೀದಿಯಲ್ಲಿ ಐಟಂ ಅಗತ್ಯವಿದೆ QA ಮತ್ತು ಗುಣಮಟ್ಟ ಖಾತರಿ ನಂ ಸಕ್ರಿಯಗೊಳಿಸುತ್ತದೆ
 DocType: GL Entry,Party Type,ಪಕ್ಷದ ಪ್ರಕಾರ
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +68,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} ಮಿತಿಗಳನ್ನು ಮೀರಿದೆ ರಿಂದ authroized ಮಾಡಿರುವುದಿಲ್ಲ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +30,Rotational molding,ಆವರ್ತನದ ಸೂರು
 apps/erpnext/erpnext/config/hr.py +115,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,ಶಾಪಿಂಗ್ ಕಾರ್ಟ್ ತೆರಿಗೆಯ ರೂಲ್
@@ -3117,15 +2989,15 @@
 apps/erpnext/erpnext/config/selling.py +18,Quotes to Leads or Customers.,ಪಾತ್ರಗಳ ಅಥವಾ ಗ್ರಾಹಕರಿಗೆ ಹಿಟ್ಟಿಗೆ .
 DocType: Stock Settings,Role Allowed to edit frozen stock,ಪಾತ್ರ ಹೆಪ್ಪುಗಟ್ಟಿದ ಸ್ಟಾಕ್ ಸಂಪಾದಿಸಲು ಅನುಮತಿಸಲಾಗಿದೆ
 ,Territory Target Variance Item Group-Wise,ಪ್ರದೇಶ ಟಾರ್ಗೆಟ್ ವೈಷಮ್ಯವನ್ನು ಐಟಂ ಗ್ರೂಪ್ ವೈಸ್
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +101,All Customer Groups,ಎಲ್ಲಾ ಗ್ರಾಹಕ ಗುಂಪುಗಳು
-apps/erpnext/erpnext/controllers/accounts_controller.py +474,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} ಕಡ್ಡಾಯ. ಬಹುಶಃ ಕರೆನ್ಸಿ ವಿನಿಮಯ ದಾಖಲೆ {2} ಗೆ {1} ದಾಖಲಿಸಿದವರು ಇದೆ.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +101,All Customer Groups,ಎಲ್ಲಾ ಗ್ರಾಹಕ ಗುಂಪುಗಳು
+apps/erpnext/erpnext/controllers/accounts_controller.py +475,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} ಕಡ್ಡಾಯ. ಬಹುಶಃ ಕರೆನ್ಸಿ ವಿನಿಮಯ ದಾಖಲೆ {2} ಗೆ {1} ದಾಖಲಿಸಿದವರು ಇದೆ.
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +37,Tax Template is mandatory.,ತೆರಿಗೆ ಟೆಂಪ್ಲೇಟು ಕಡ್ಡಾಯವಾಗಿದೆ.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +41,Account {0}: Parent account {1} does not exist,ಖಾತೆ {0}: ಪೋಷಕರ ಖಾತೆಯ {1} ಅಸ್ತಿತ್ವದಲ್ಲಿಲ್ಲ
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),ಬೆಲೆ ಪಟ್ಟಿ ದರ ( ಕಂಪನಿ ಕರೆನ್ಸಿ )
 DocType: Account,Temporary,ತಾತ್ಕಾಲಿಕ
 DocType: Address,Preferred Billing Address,ಮೆಚ್ಚಿನ ಬಿಲ್ಲಿಂಗ್ ವಿಳಾಸ
 DocType: Monthly Distribution Percentage,Percentage Allocation,ಶೇಕಡಾವಾರು ಹಂಚಿಕ
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +86,Secretary,ಕಾರ್ಯದರ್ಶಿ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Secretary,ಕಾರ್ಯದರ್ಶಿ
 DocType: Serial No,Distinct unit of an Item,ಐಟಂ ವಿಶಿಷ್ಟ ಘಟಕವಾಗಿದೆ
 DocType: Pricing Rule,Buying,ಖರೀದಿ
 DocType: HR Settings,Employee Records to be created by,ನೌಕರರ ದಾಖಲೆಗಳು ದಾಖಲಿಸಿದವರು
@@ -3138,9 +3010,8 @@
 ,Item-wise Price List Rate,ಐಟಂ ಬಲ್ಲ ಬೆಲೆ ಪಟ್ಟಿ ದರ
 DocType: Purchase Order Item,Supplier Quotation,ಸರಬರಾಜುದಾರ ನುಡಿಮುತ್ತುಗಳು
 DocType: Quotation,In Words will be visible once you save the Quotation.,ನೀವು ಉದ್ಧರಣ ಉಳಿಸಲು ಒಮ್ಮೆ ವರ್ಡ್ಸ್ ಗೋಚರಿಸುತ್ತದೆ.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +68,Ironing,ಇಸ್ತ್ರಿ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is stopped,{0} {1} ನಿಲ್ಲಿಸಿದಾಗ
-apps/erpnext/erpnext/stock/doctype/item/item.py +352,Barcode {0} already used in Item {1},ಬಾರ್ಕೋಡ್ {0} ಈಗಾಗಲೇ ಐಟಂ ಬಳಸಲಾಗುತ್ತದೆ {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +356,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/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,ಮುಂಬರುವ ಕಾರ್ಯಕ್ರಮಗಳು
@@ -3149,13 +3020,12 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +27,Quick Entry,ತ್ವರಿತ ಪ್ರವೇಶ
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0} ರಿಟರ್ನ್ ಕಡ್ಡಾಯ
 DocType: Purchase Order,To Receive,ಪಡೆಯಲು
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +33,Shrink fitting,ಬಿಗಿಯಾದ ಸಂಕೋಚನ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +522,user@example.com,user@example.com
+apps/erpnext/erpnext/public/js/setup_wizard.js +266,user@example.com,user@example.com
 DocType: Email Digest,Income / Expense,ಆದಾಯ / ಖರ್ಚು
 DocType: Employee,Personal Email,ಸ್ಟಾಫ್ ಇಮೇಲ್
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +58,Total Variance,ಒಟ್ಟು ಭಿನ್ನಾಭಿಪ್ರಾಯ
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +62,Total Variance,ಒಟ್ಟು ಭಿನ್ನಾಭಿಪ್ರಾಯ
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.","ಶಕ್ತಗೊಂಡಿದ್ದಲ್ಲಿ , ಗಣಕವು ದಾಸ್ತಾನು ಲೆಕ್ಕಪರಿಶೋಧಕ ನಮೂದುಗಳನ್ನು ಪೋಸ್ಟ್ ಕಾಣಿಸುತ್ತದೆ ."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +15,Brokerage,ದಲ್ಲಾಳಿಗೆ ಕೊಡುವ ಹಣ
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +15,Brokerage,ದಲ್ಲಾಳಿಗೆ ಕೊಡುವ ಹಣ
 DocType: Address,Postal Code,ಅಂಚೆ ಕೋಡ್
 DocType: Production Order Operation,"in Minutes
 Updated via 'Time Log'","ನಿಮಿಷಗಳಲ್ಲಿ 
@@ -3163,14 +3033,13 @@
 DocType: Customer,From Lead,ಮುಂಚೂಣಿಯಲ್ಲಿವೆ
 apps/erpnext/erpnext/config/manufacturing.py +19,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 +442,POS Profile required to make POS Entry,ಪಿಓಎಸ್ ಪ್ರೊಫೈಲ್ ಪಿಓಎಸ್ ಎಂಟ್ರಿ ಮಾಡಲು ಅಗತ್ಯವಿದೆ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +444,POS Profile required to make POS Entry,ಪಿಓಎಸ್ ಪ್ರೊಫೈಲ್ ಪಿಓಎಸ್ ಎಂಟ್ರಿ ಮಾಡಲು ಅಗತ್ಯವಿದೆ
 DocType: Hub Settings,Name Token,ಹೆಸರು ಟೋಕನ್
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +106,Planing,ಪ್ಲ್ಯಾನಿಂಗ್
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Selling,ಸ್ಟ್ಯಾಂಡರ್ಡ್ ವಿಕ್ರಯ
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +120,Standard Selling,ಸ್ಟ್ಯಾಂಡರ್ಡ್ ವಿಕ್ರಯ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +137,Atleast one warehouse is mandatory,ಕನಿಷ್ಠ ಒಂದು ಗೋದಾಮಿನ ಕಡ್ಡಾಯ
 DocType: Serial No,Out of Warranty,ಖಾತರಿ ಹೊರಗೆ
 DocType: BOM Replace Tool,Replace,ಬದಲಾಯಿಸಿ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +314,{0} against Sales Invoice {1},{0} ಮಾರಾಟದ ಸರಕುಪಟ್ಟಿ ವಿರುದ್ಧ {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +316,{0} against Sales Invoice {1},{0} ಮಾರಾಟದ ಸರಕುಪಟ್ಟಿ ವಿರುದ್ಧ {1}
 apps/erpnext/erpnext/stock/doctype/item/item.py +49,Please enter default Unit of Measure,ಅಳತೆ ಡೀಫಾಲ್ಟ್ ಘಟಕ ನಮೂದಿಸಿ
 DocType: Purchase Invoice Item,Project Name,ಪ್ರಾಜೆಕ್ಟ್ ಹೆಸರು
 DocType: Supplier,Mention if non-standard receivable account,ಬಗ್ಗೆ ಸ್ಟಾಂಡರ್ಡ್ ಅಲ್ಲದ ಸ್ವೀಕೃತಿ ಖಾತೆಯನ್ನು ವೇಳೆ
@@ -3186,9 +3055,8 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,Journal Entry {0} does not have account {1} or already matched against other voucher,ಜರ್ನಲ್ ಎಂಟ್ರಿ {0} {1} ಅಥವಾ ಈಗಾಗಲೇ ಇತರ ಚೀಟಿ ವಿರುದ್ಧ ದಾಖಲೆಗಳುಸರಿಹೊಂದಿವೆ ಖಾತೆಯನ್ನು ಹೊಂದಿಲ್ಲ
 DocType: Item,Moving Average,ಸರಾಸರಿ ಮೂವಿಂಗ್
 DocType: BOM Replace Tool,The BOM which will be replaced,BOM ಯಾವ ಸ್ಥಾನಾಂತರಿಸಲಾಗಿದೆ
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +43,New Stock UOM must be different from current stock UOM,ಹೊಸ ಸ್ಟಾಕ್ UOM ಪ್ರಸ್ತುತ ಸ್ಟಾಕ್ UOM ಭಿನ್ನವಾಗಿದೆ ಇರಬೇಕು
 DocType: Account,Debit,ಡೆಬಿಟ್
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +34,Leaves must be allocated in multiples of 0.5,ಎಲೆಗಳು ಹಂಚಿಕೆ 0.5 ಗುಣಾತ್ಮಕವಾಗಿ ಇರಬೇಕು
+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/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,ಅತ್ಯುತ್ತಮ ಆಮ್ಟ್
@@ -3206,8 +3074,7 @@
 DocType: Employee,Internal Work History,ಆಂತರಿಕ ಕೆಲಸದ ಇತಿಹಾಸ
 DocType: DocField,Column Break,ಕಾಲಮ್ ಬ್ರೇಕ್
 DocType: Event,Thursday,ಗುರುವಾರ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +42,Private Equity,ಖಾಸಗಿ ಈಕ್ವಿಟಿ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +93,Turning,ಟರ್ನಿಂಗ್
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,ಖಾಸಗಿ ಈಕ್ವಿಟಿ
 DocType: Maintenance Visit,Customer Feedback,ಪ್ರತಿಕ್ರಿಯೆ
 DocType: Account,Expense,ಖರ್ಚುವೆಚ್ಚಗಳು
 DocType: Sales Invoice,Exhibition,ಪ್ರದರ್ಶನ
@@ -3220,19 +3087,19 @@
 DocType: Employee,Held On,ನಡೆದ
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +33,Production Item,ಪ್ರೊಡಕ್ಷನ್ ಐಟಂ
 ,Employee Information,ನೌಕರರ ಮಾಹಿತಿ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,Rate (%),ದರ (%)
+apps/erpnext/erpnext/public/js/setup_wizard.js +294,Rate (%),ದರ (%)
 DocType: Stock Entry Detail,Additional Cost,ಹೆಚ್ಚುವರಿ ವೆಚ್ಚ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +407,Financial Year End Date,ಹಣಕಾಸು ವರ್ಷಾಂತ್ಯದ ದಿನಾಂಕ
+apps/erpnext/erpnext/public/js/setup_wizard.js +155,Financial Year End Date,ಹಣಕಾಸು ವರ್ಷಾಂತ್ಯದ ದಿನಾಂಕ
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Voucher No, if grouped by Voucher","ಚೀಟಿ ಮೂಲಕ ವರ್ಗೀಕರಿಸಲಾಗಿದೆ ವೇಳೆ , ಚೀಟಿ ಸಂಖ್ಯೆ ಆಧರಿಸಿ ಫಿಲ್ಟರ್ ಸಾಧ್ಯವಿಲ್ಲ"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +484,Make Supplier Quotation,ಸರಬರಾಜುದಾರ ಉದ್ಧರಣ ಮಾಡಿ
 DocType: Quality Inspection,Incoming,ಒಳಬರುವ
 DocType: BOM,Materials Required (Exploded),ಬೇಕಾದ ಸಾಮಗ್ರಿಗಳು (ಸ್ಫೋಟಿಸಿತು )
 DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),ವೇತನ ಇಲ್ಲದೆ ರಜೆ ದುಡಿಯುತ್ತಿದ್ದ ಕಡಿಮೆ ( LWP )
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +512,"Add users to your organization, other than yourself","ನಿಮ್ಮನ್ನು ಬೇರೆ, ನಿಮ್ಮ ಸಂಸ್ಥೆಗೆ ಬಳಕೆದಾರರು ಸೇರಿಸಿ"
+apps/erpnext/erpnext/public/js/setup_wizard.js +256,"Add users to your organization, other than yourself","ನಿಮ್ಮನ್ನು ಬೇರೆ, ನಿಮ್ಮ ಸಂಸ್ಥೆಗೆ ಬಳಕೆದಾರರು ಸೇರಿಸಿ"
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No {1} does not match with {2} {3},ರೋ # {0}: ಸೀರಿಯಲ್ ಯಾವುದೇ {1} ಹೊಂದಿಕೆಯಾಗುವುದಿಲ್ಲ {2} {3}
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +44,Casual Leave,ರಜೆ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +44,Casual Leave,ರಜೆ
 DocType: Batch,Batch ID,ಬ್ಯಾಚ್ ID
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +334,Note: {0},ರೇಟಿಂಗ್ : {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +336,Note: {0},ರೇಟಿಂಗ್ : {0}
 ,Delivery Note Trends,ಡೆಲಿವರಿ ಗಮನಿಸಿ ಪ್ರವೃತ್ತಿಗಳು
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +104,This Week's Summary,ಈ ವಾರದ ಸಾರಾಂಶ
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +74,{0} must be a Purchased or Sub-Contracted Item in row {1},{0} ಸತತವಾಗಿ ಖರೀದಿಸಲಾದ ಅಥವಾ ಉಪ ಒಪ್ಪಂದ ಐಟಂ ಇರಬೇಕು {1}
@@ -3244,7 +3111,7 @@
 DocType: Purchase Receipt,Return Against Purchase Receipt,ಖರೀದಿ ರಿಸೀಟ್ನ್ನು ವಿರುದ್ಧ ಪುನರಾಗಮನ
 DocType: Purchase Order,To Bill,ಬಿಲ್
 DocType: Material Request,% Ordered,% ಆದೇಶ
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +61,Piecework,Piecework
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Piecework,Piecework
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +64,Avg. Buying Rate,ಆವರೇಜ್. ಬೈಯಿಂಗ್ ದರ
 DocType: Task,Actual Time (in Hours),(ಘಂಟೆಗಳಲ್ಲಿ) ವಾಸ್ತವ ಟೈಮ್
 DocType: Employee,History In Company,ಕಂಪನಿ ಇತಿಹಾಸ
@@ -3261,13 +3128,13 @@
 DocType: Opportunity,To Discuss,ಡಿಸ್ಕಸ್
 DocType: SMS Settings,SMS Settings,SMS ಸೆಟ್ಟಿಂಗ್ಗಳು
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +60,Temporary Accounts,ತಾತ್ಕಾಲಿಕ ಖಾತೆಗಳು
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +155,Black,ಬ್ಲಾಕ್
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Black,ಬ್ಲಾಕ್
 DocType: BOM Explosion Item,BOM Explosion Item,BOM ಸ್ಫೋಟ ಐಟಂ
 DocType: Account,Auditor,ಆಡಿಟರ್
 DocType: Purchase Order,End date of current order's period,ಪ್ರಸ್ತುತ ಸಲುವಾಗಿ ನ ಅವಧಿಯ ಕೊನೆಯಲ್ಲಿ ದಿನಾಂಕ
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +17,Make Offer Letter,ಆಫರ್ ಲೆಟರ್ ಮಾಡಿ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +10,Return,ರಿಟರ್ನ್
-apps/erpnext/erpnext/stock/doctype/item/item.py +503,Default Unit of Measure for Variant must be same as Template,ಭಿನ್ನ ಚಟುವಟಿಕೆ ಡೀಫಾಲ್ಟ್ ಘಟಕ ಟೆಂಪ್ಲೇಟು ಅದೇ ಇರಬೇಕು
+apps/erpnext/erpnext/stock/doctype/item/item.py +507,Default Unit of Measure for Variant must be same as Template,ಭಿನ್ನ ಚಟುವಟಿಕೆ ಡೀಫಾಲ್ಟ್ ಘಟಕ ಟೆಂಪ್ಲೇಟು ಅದೇ ಇರಬೇಕು
 DocType: DocField,Fold,ಪಟ್ಟು
 DocType: Production Order Operation,Production Order Operation,ಪ್ರೊಡಕ್ಷನ್ ಆರ್ಡರ್ ಆಪರೇಷನ್
 DocType: Pricing Rule,Disable,ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಿ
@@ -3278,13 +3145,12 @@
 DocType: Page,Page Name,ಪುಟ ಹೆಸರು
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +110,To Time must be greater than From Time,ಟೈಮ್ ಟೈಮ್ ಗೆ ಹೆಚ್ಚು ಇರಬೇಕು ಗೆ
 DocType: Journal Entry Account,Exchange Rate,ವಿನಿಮಯ ದರ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +465,Sales Order {0} is not submitted,ಮಾರಾಟದ ಆರ್ಡರ್ {0} ಸಲ್ಲಿಸದಿದ್ದರೆ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +467,Sales Order {0} is not submitted,ಮಾರಾಟದ ಆರ್ಡರ್ {0} ಸಲ್ಲಿಸದಿದ್ದರೆ
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0}: Parent account {1} does not bolong to the company {2},ವೇರ್ಹೌಸ್ {0}: ಪೋಷಕರ ಖಾತೆಯ {1} ಕಂಪನಿಗೆ ಸದಸ್ಯ ಮಾಡುವುದಿಲ್ಲ {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +124,Spindle finishing,ಸ್ಪಿಂಡಲ್ ಸ್ಥಾನ
 DocType: BOM,Last Purchase Rate,ಕೊನೆಯ ಖರೀದಿ ದರ
 DocType: Account,Asset,ಆಸ್ತಿಪಾಸ್ತಿ
 DocType: Project Task,Task ID,ಟಾಸ್ಕ್ ಐಡಿ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +395,"e.g. ""MC""","ಇ ಜಿ "" ಎಂಸಿ """
+apps/erpnext/erpnext/public/js/setup_wizard.js +143,"e.g. ""MC""","ಇ ಜಿ "" ಎಂಸಿ """
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,Stock cannot exist for Item {0} since has variants,ಐಟಂ ಅಸ್ತಿತ್ವದಲ್ಲಿರುವುದಿಲ್ಲ ಸ್ಟಾಕ್ {0} ರಿಂದ ವೇರಿಯಂಟ್
 ,Sales Person-wise Transaction Summary,ಮಾರಾಟಗಾರನ ಬಲ್ಲ ಟ್ರಾನ್ಸಾಕ್ಷನ್ ಸಾರಾಂಶ
 DocType: System Settings,Time Zone,ಕಾಲವಲಯವನ್ನು
@@ -3293,9 +3159,7 @@
 DocType: Monthly Distribution,Monthly Distribution Percentages,ಮಾಸಿಕ ವಿತರಣೆ ಶೇಕಡಾವಾರು
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +16,The selected item cannot have Batch,ಆಯ್ದುಕೊಂಡ ಬ್ಯಾಚ್ ಹೊಂದುವಂತಿಲ್ಲ
 DocType: Delivery Note,% of materials delivered against this Delivery Note,ಈ ಡೆಲಿವರಿ ಗಮನಿಸಿ ವಿರುದ್ಧ ವಿತರಿಸಲಾಯಿತು ವಸ್ತುಗಳ %
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +151,Stapling,ತಂತಿಗಳಿಂದ
 DocType: Customer,Customer Details,ಗ್ರಾಹಕ ವಿವರಗಳು
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +105,Shaping,ಆಕಾರ
 DocType: Employee,Reports to,ಗೆ ವರದಿಗಳು
 DocType: SMS Settings,Enter url parameter for receiver nos,ರಿಸೀವರ್ ಸೂಲ URL ಅನ್ನು ನಿಯತಾಂಕ ಯನ್ನು
 DocType: Sales Invoice,Paid Amount,ಮೊತ್ತವನ್ನು
@@ -3304,13 +3168,13 @@
 DocType: Item Variant,Item Variant,ಐಟಂ ಭಿನ್ನ
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +15,Setting this Address Template as default as there is no other default,ಯಾವುದೇ ಡೀಫಾಲ್ಟ್ ಇಲ್ಲ ಎಂದು ಪೂರ್ವನಿಯೋಜಿತವಾಗಿ ಈ ವಿಳಾಸ ಟೆಂಪ್ಲೇಟ್ ಹೊಂದಿಸುವ
 apps/erpnext/erpnext/accounts/doctype/account/account.py +89,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","ಈಗಾಗಲೇ ಡೆಬಿಟ್ ರಲ್ಲಿ ಖಾತೆ ಸಮತೋಲನ, ನೀವು 'ಕ್ರೆಡಿಟ್' 'ಬ್ಯಾಲೆನ್ಸ್ ಇರಬೇಕು ಹೊಂದಿಸಲು ಅನುಮತಿ ಇಲ್ಲ"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +76,Quality Management,ಗುಣಮಟ್ಟ ನಿರ್ವಹಣೆ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Quality Management,ಗುಣಮಟ್ಟ ನಿರ್ವಹಣೆ
 DocType: Production Planning Tool,Filter based on customer,ಫಿಲ್ಟರ್ ಗ್ರಾಹಕ ಆಧಾರಿತ
 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}
 DocType: Employee External Work History,Employee External Work History,ಬಾಹ್ಯ ಕೆಲಸದ ಇತಿಹಾಸ
 DocType: Tax Rule,Purchase,ಖರೀದಿ
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +34,Balance Qty,ಬ್ಯಾಲೆನ್ಸ್ ಪ್ರಮಾಣ
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Balance Qty,ಬ್ಯಾಲೆನ್ಸ್ ಪ್ರಮಾಣ
 DocType: Item Group,Parent Item Group,ಪೋಷಕ ಐಟಂ ಗುಂಪು
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +21,{0} for {1},{0} ಫಾರ್ {1}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +96,Cost Centers,ವೆಚ್ಚ ಕೇಂದ್ರಗಳು
@@ -3320,12 +3184,12 @@
 DocType: Opportunity,Next Contact,ಮುಂದಿನ ಸಂಪರ್ಕಿಸಿ
 DocType: Employee,Employment Type,ಉದ್ಯೋಗ ಪ್ರಕಾರ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,ಸ್ಥಿರ ಆಸ್ತಿಗಳ
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +84,Application period cannot be across two alocation records,ಅಪ್ಲಿಕೇಶನ್ ಅವಧಿಯಲ್ಲಿ ಎರಡು alocation ದಾಖಲೆಗಳನ್ನು ಅಡ್ಡಲಾಗಿ ಸಾಧ್ಯವಿಲ್ಲ
 DocType: Item Group,Default Expense Account,ಡೀಫಾಲ್ಟ್ ಖರ್ಚು ಖಾತೆ
 DocType: Employee,Notice (days),ಎಚ್ಚರಿಕೆ ( ದಿನಗಳು)
 DocType: Page,Yes,ಹೌದು
 DocType: Tax Rule,Sales Tax Template,ಮಾರಾಟ ತೆರಿಗೆ ಟೆಂಪ್ಲೇಟು
 DocType: Employee,Encashment Date,ನಗದೀಕರಣ ದಿನಾಂಕ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +74,Electroforming,Electroforming
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +179,"Against Voucher Type must be one of Purchase Order, Purchase Invoice or Journal Entry","ಚೀಟಿ ವಿರುದ್ಧ ಕೌಟುಂಬಿಕತೆ ಪರ್ಚೇಸ್ ಆರ್ಡರ್ ಒಂದು, ಖರೀದಿ ಸರಕುಪಟ್ಟಿ ಅಥವಾ ಜರ್ನಲ್ ಎಂಟ್ರಿ ಇರಬೇಕು"
 DocType: Account,Stock Adjustment,ಸ್ಟಾಕ್ ಹೊಂದಾಣಿಕೆ
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +34,Default Activity Cost exists for Activity Type - {0},ಡೀಫಾಲ್ಟ್ ಚಟುವಟಿಕೆ ವೆಚ್ಚ ಚಟುವಟಿಕೆ ಕೌಟುಂಬಿಕತೆ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ - {0}
@@ -3361,12 +3225,12 @@
 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,ಹಂಚುವುದು
 apps/erpnext/erpnext/public/js/pos/pos.html +36,Amount Paid,ಮೊತ್ತವನ್ನು
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +91,Project Manager,ಪ್ರಾಜೆಕ್ಟ್ ಮ್ಯಾನೇಜರ್
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +72,Dispatch,ರವಾನಿಸು
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Project Manager,ಪ್ರಾಜೆಕ್ಟ್ ಮ್ಯಾನೇಜರ್
+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: Customer,Default Taxes and Charges,ಡೀಫಾಲ್ಟ್ ತೆರಿಗೆಗಳು ಮತ್ತು ಶುಲ್ಕಗಳು
 DocType: Account,Receivable,ಲಭ್ಯ
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +268,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,ರೋ # {0}: ಆರ್ಡರ್ ಖರೀದಿಸಿ ಈಗಾಗಲೇ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ ಪೂರೈಕೆದಾರ ಬದಲಾಯಿಸಲು ಅನುಮತಿಸಲಾಗುವುದಿಲ್ಲ
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +263,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 ಕಚ್ಚಾ ವಸ್ತುಗಳನ್ನು ಪಡೆಯುವ ಪರಿಗಣಿಸಲಾಗುವುದು . ಇಲ್ಲದಿದ್ದರೆ, ಎಲ್ಲಾ ಉಪ ಅಸೆಂಬ್ಲಿ ಐಟಂಗಳನ್ನು ಕಚ್ಚಾವಸ್ತುಗಳನ್ನು ಪರಿಗಣಿಸಲಾಗುವುದು ."
@@ -3374,8 +3238,8 @@
 DocType: Hub Settings,Seller Description,ಮಾರಾಟಗಾರ ವಿವರಣೆ
 DocType: Employee Education,Qualification,ಅರ್ಹತೆ
 DocType: Item Price,Item Price,ಐಟಂ ಬೆಲೆ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +48,Soap & Detergent,ಸಾಬೂನು ಹಾಗೂ ಮಾರ್ಜಕ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +36,Motion Picture & Video,ಚಲನಚಿತ್ರ ಮತ್ತು ವೀಡಿಯೊ
+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,ಆದೇಶ
 DocType: Warehouse,Warehouse Name,ವೇರ್ಹೌಸ್ ಹೆಸರು
 DocType: Naming Series,Select Transaction,ಟ್ರಾನ್ಸಾಕ್ಷನ್ ಆಯ್ಕೆ
@@ -3384,7 +3248,6 @@
 DocType: BOM,Rate Of Materials Based On,ಮೆಟೀರಿಯಲ್ಸ್ ಆಧರಿಸಿದ ದರ
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,ಬೆಂಬಲ Analtyics
 apps/erpnext/erpnext/accounts/doctype/accounts_settings/accounts_settings.py +27,Company is missing in warehouses {0},ಕಂಪನಿ ಗೋದಾಮುಗಳು ಕಾಣೆಯಾಗಿದೆ {0}
-DocType: Stock UOM Replace Utility,Stock UOM Replace Utility,ಸ್ಟಾಕ್ UOM ಯುಟಿಲಿಟಿ ಬದಲಾಯಿಸಿ
 DocType: POS Profile,Terms and Conditions,ನಿಯಮಗಳು ಮತ್ತು ನಿಯಮಗಳು
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,To Date should be within the Fiscal Year. Assuming To Date = {0},ದಿನಾಂಕ ಹಣಕಾಸಿನ ವರ್ಷದ ಒಳಗೆ ಇರಬೇಕು. ದಿನಾಂಕ ಭಾವಿಸಿಕೊಂಡು = {0}
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","ಇಲ್ಲಿ ನೀವು ಎತ್ತರ, ತೂಕ, ಅಲರ್ಜಿ , ವೈದ್ಯಕೀಯ ಇತ್ಯಾದಿ ಕನ್ಸರ್ನ್ಸ್ ಕಾಯ್ದುಕೊಳ್ಳಬಹುದು"
@@ -3396,7 +3259,7 @@
 DocType: Sales Order Item,For Production,ಉತ್ಪಾದನೆಗೆ
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +103,Please enter sales order in the above table,ಮೇಲಿನ ಕೋಷ್ಟಕದಲ್ಲಿ ಮಾರಾಟ ಸಲುವಾಗಿ ನಮೂದಿಸಿ
 DocType: Project Task,View Task,ವೀಕ್ಷಿಸಿ ಟಾಸ್ಕ್
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +406,Your financial year begins on,ನಿಮ್ಮ ಹಣಕಾಸಿನ ವರ್ಷ ಆರಂಭವಾಗುವ
+apps/erpnext/erpnext/public/js/setup_wizard.js +154,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: Email Digest,Add/Remove Recipients,ಸೇರಿಸಿ / ತೆಗೆದುಹಾಕಿ ಸ್ವೀಕೃತದಾರರ
@@ -3404,16 +3267,14 @@
 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),ಬೆಂಬಲ ಇಮೇಲ್ ಐಡಿ ಸೆಟಪ್ ಒಳಬರುವ ಸರ್ವರ್ . ( ಇ ಜಿ 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 +528,Item variant {0} exists with same attributes,ಐಟಂ ಭಿನ್ನ {0} ಅದೇ ಲಕ್ಷಣಗಳು ಅಸ್ತಿತ್ವದಲ್ಲಿದ್ದರೆ
+apps/erpnext/erpnext/stock/doctype/item/item.py +532,Item variant {0} exists with same attributes,ಐಟಂ ಭಿನ್ನ {0} ಅದೇ ಲಕ್ಷಣಗಳು ಅಸ್ತಿತ್ವದಲ್ಲಿದ್ದರೆ
 DocType: Salary Slip,Salary Slip,ಸಂಬಳದ ಸ್ಲಿಪ್
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +116,Burnishing,ಮೆರುಗು ಕೊಡುವುದರ
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +54,'To Date' is required,' ದಿನಾಂಕ ' ಅಗತ್ಯವಿದೆ
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,' ದಿನಾಂಕ ' ಅಗತ್ಯವಿದೆ
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","ಪ್ರವಾಸ ತಲುಪಬೇಕಾದರೆ ಚೂರುಗಳನ್ನು ಪ್ಯಾಕಿಂಗ್ ರಚಿಸಿ. ಪ್ಯಾಕೇಜ್ ಸಂಖ್ಯೆ, ಪ್ಯಾಕೇಜ್ ್ಷೀಸಿ ಮತ್ತು ಅದರ ತೂಕ ತಿಳಿಸಲು ಬಳಸಲಾಗುತ್ತದೆ."
 DocType: Sales Invoice Item,Sales Order Item,ಮಾರಾಟದ ಆರ್ಡರ್ ಐಟಂ
 DocType: Salary Slip,Payment Days,ಪಾವತಿ ಡೇಸ್
 DocType: BOM,Manage cost of operations,ಕಾರ್ಯಾಚರಣೆಗಳ ನಿರ್ವಹಣೆ ವೆಚ್ಚ
 DocType: Features Setup,Item Advanced,ಐಟಂ ವಿಸ್ತೃತ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +40,Hot rolling,ಹಾಟ್ ರೋಲಿಂಗ್
 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,ನೌಕರರ ಶಿಕ್ಷಣ
@@ -3426,25 +3287,23 @@
 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/setup/page/setup_wizard/install_fixtures.py +48,Sick Leave,ಸಿಕ್ ಲೀವ್
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +174,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/page/setup_wizard/fixtures/industry_type.py +22,Department Stores,ಡಿಪಾರ್ಟ್ಮೆಂಟ್ ಸ್ಟೋರ್ಸ್
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,ಡಿಪಾರ್ಟ್ಮೆಂಟ್ ಸ್ಟೋರ್ಸ್
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +40,System Balance,ವ್ಯವಸ್ಥೆ ಬ್ಯಾಲೆನ್ಸ್
 DocType: Workflow,Is Active,ಸಕ್ರಿಯವಾಗಿದೆ
 apps/erpnext/erpnext/controllers/stock_controller.py +71,No accounting entries for the following warehouses,ನಂತರ ಗೋದಾಮುಗಳು ಯಾವುದೇ ಲೆಕ್ಕಪರಿಶೋಧಕ ನಮೂದುಗಳನ್ನು
 apps/erpnext/erpnext/projects/doctype/project/project.js +22,Save the document first.,ಮೊದಲ ದಾಖಲೆ ಉಳಿಸಿ.
 DocType: Account,Chargeable,ಪೂರಣಮಾಡಬಲ್ಲ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +121,Linishing,Linishing
 DocType: Company,Change Abbreviation,ಬದಲಾವಣೆ ಸಂಕ್ಷೇಪಣ
 DocType: Workflow State,Primary,ಪ್ರಾಥಮಿಕ
 DocType: Expense Claim Detail,Expense Date,ಖರ್ಚು ದಿನಾಂಕ
 DocType: Item,Max Discount (%),ಮ್ಯಾಕ್ಸ್ ಡಿಸ್ಕೌಂಟ್ ( % )
 DocType: Communication,More Information,ಹೆಚ್ಚಿನ ಮಾಹಿತಿ
 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/setup/page/setup_wizard/fixtures/operations.py +161,Blasting,ಸ್ಫೋಟ
 DocType: Company,Warn,ಎಚ್ಚರಿಕೆ
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +111,Item valuation updated,ಐಟಂ ಮೌಲ್ಯಮಾಪನ ಅಪ್ಡೇಟ್ಗೊಳಿಸಲಾಗಿದೆ
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","ಯಾವುದೇ ಟೀಕೆಗಳನ್ನು, ದಾಖಲೆಗಳಲ್ಲಿ ಹೋಗಬೇಕು ಎಂದು ವಿವರಣೆಯಾಗಿದೆ ಪ್ರಯತ್ನ."
 DocType: BOM,Manufacturing User,ಉತ್ಪಾದನಾ ಬಳಕೆದಾರ
 DocType: Purchase Order,Raw Materials Supplied,ವಿತರಿಸುತ್ತಾರೆ ರಾ ಮೆಟೀರಿಯಲ್ಸ್
@@ -3454,7 +3313,7 @@
 DocType: Appraisal,Appraisal Template,ಅಪ್ರೇಸಲ್ ಟೆಂಪ್ಲೇಟು
 DocType: Communication,Email,ಗಾಜುಲೇಪ
 DocType: Item Group,Item Classification,ಐಟಂ ವರ್ಗೀಕರಣ
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +89,Business Development Manager,ವ್ಯವಹಾರ ಅಭಿವೃದ್ಧಿ ವ್ಯವಸ್ಥಾಪಕ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Business Development Manager,ವ್ಯವಹಾರ ಅಭಿವೃದ್ಧಿ ವ್ಯವಸ್ಥಾಪಕ
 DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,ನಿರ್ವಹಣೆ ಭೇಟಿ ಉದ್ದೇಶ
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.js +15,Period,ಅವಧಿ
 ,General Ledger,ಸಾಮಾನ್ಯ ಲೆಡ್ಜರ್
@@ -3464,9 +3323,7 @@
 ,Itemwise Recommended Reorder Level,Itemwise ಮರುಕ್ರಮಗೊಳಿಸಿ ಮಟ್ಟ ಶಿಫಾರಸು
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +264,Please select {0} first,ಮೊದಲ {0} ಆಯ್ಕೆ ಮಾಡಿ
 DocType: Features Setup,To get Item Group in details table,ವಿವರಗಳು ಕೋಷ್ಟಕದಲ್ಲಿ ಐಟಂ ಗುಂಪು ಪಡೆಯಲು
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +67,Redrawing,ಮರುರಚನೆ
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +112,Batch {0} of Item {1} has expired.,ಐಟಂ ಬ್ಯಾಚ್ {0} {1} ಮುಗಿದಿದೆ.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +120,Etching,ಎಚ್ಚಣೆ
 DocType: Sales Invoice,Commission,ಆಯೋಗ
 DocType: Address Template,"<h4>Default Template</h4>
 <p>Uses <a href=""http://jinja.pocoo.org/docs/templates/"">Jinja Templating</a> and all the fields of Address (including Custom Fields if any) will be available</p>
@@ -3511,7 +3368,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +340,Operation Time must be greater than 0 for Operation {0},ಆಪರೇಷನ್ ಟೈಮ್ ಆಪರೇಷನ್ 0 ಹೆಚ್ಚು ಇರಬೇಕು {0}
 DocType: Supplier,Address and Contacts,ವಿಳಾಸ ಮತ್ತು ಸಂಪರ್ಕಗಳು
 DocType: UOM Conversion Detail,UOM Conversion Detail,UOM ಪರಿವರ್ತನೆ ವಿವರಗಳು
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +496,Keep it web friendly 900px (w) by 100px (h),100px ವೆಬ್ ಸ್ನೇಹಿ 900px ( W ) ನೋಡಿಕೊಳ್ಳಿ ( H )
+apps/erpnext/erpnext/public/js/setup_wizard.js +242,Keep it web friendly 900px (w) by 100px (h),100px ವೆಬ್ ಸ್ನೇಹಿ 900px ( W ) ನೋಡಿಕೊಳ್ಳಿ ( H )
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +329,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,ಅತ್ಯುತ್ತಮ ರಶೀದಿ ಪಡೆಯಲು
@@ -3527,54 +3384,49 @@
 DocType: Item,Average time taken by the supplier to deliver,ಪೂರೈಕೆದಾರರಿಂದ ವಿಧವಾಗಿ ಸಮಯ ತಲುಪಿಸಲು
 DocType: Time Log,Hours,ಅವರ್ಸ್
 DocType: Project,Expected Start Date,ನಿರೀಕ್ಷಿತ ಪ್ರಾರಂಭ ದಿನಾಂಕ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +38,Rolling,ರೋಲಿಂಗ್
 DocType: ToDo,Priority,ಆದ್ಯತೆ
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +41,Remove item if charges is not applicable to that item,ಆರೋಪಗಳನ್ನು ಐಟಂ ಅನ್ವಯಿಸುವುದಿಲ್ಲ ವೇಳೆ ಐಟಂ ತೆಗೆದುಹಾಕಿ
 DocType: Dropbox Backup,Dropbox Access Allowed,ಅನುಮತಿಸಲಾಗಿದೆ ಡ್ರಾಪ್ಬಾಕ್ಸ್ ಪ್ರವೇಶ
 DocType: Dropbox Backup,Weekly,ವಾರದ
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,ಉದಾ . smsgateway.com / API / send_sms.cgi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +485,Receive,ಸ್ವೀಕರಿಸಿ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +510,Receive,ಸ್ವೀಕರಿಸಿ
 DocType: Maintenance Visit,Fully Completed,ಸಂಪೂರ್ಣವಾಗಿ
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% ಕಂಪ್ಲೀಟ್
 DocType: Employee,Educational Qualification,ಶೈಕ್ಷಣಿಕ ಅರ್ಹತೆ
 DocType: Workstation,Operating Costs,ವೆಚ್ಚದ
 DocType: Employee Leave Approver,Employee Leave Approver,ನೌಕರರ ಲೀವ್ ಅನುಮೋದಕ
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,{0} has been successfully added to our Newsletter list.,{0} ಯಶಸ್ವಿಯಾಗಿ ನಮ್ಮ ಸುದ್ದಿಪತ್ರ ಪಟ್ಟಿಗೆ ಸೇರಿಸಲಾಗಿದೆ.
-apps/erpnext/erpnext/stock/doctype/item/item.py +383,Row {0}: An Reorder entry already exists for this warehouse {1},ಸಾಲು {0}: ಒಂದು ಮರುಕ್ರಮಗೊಳಿಸಿ ಪ್ರವೇಶ ಈಗಾಗಲೇ ಈ ಗೋದಾಮಿನ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +387,Row {0}: An Reorder entry already exists for this warehouse {1},ಸಾಲು {0}: ಒಂದು ಮರುಕ್ರಮಗೊಳಿಸಿ ಪ್ರವೇಶ ಈಗಾಗಲೇ ಈ ಗೋದಾಮಿನ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +67,"Cannot declare as lost, because Quotation has been made.","ಸೋತು ಉದ್ಧರಣ ಮಾಡಲಾಗಿದೆ ಏಕೆಂದರೆ , ಘೋಷಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +133,Electron beam machining,ಎಲೆಕ್ಟ್ರಾನ್ ಕಿರಣವು ಯಂತ್ರ
 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 +150,Please select Start Date and End Date for Item {0},ಪ್ರಾರಂಭ ದಿನಾಂಕ ಮತ್ತು ಐಟಂ ಎಂಡ್ ದಿನಾಂಕ ಆಯ್ಕೆ ಮಾಡಿ {0}
 apps/erpnext/erpnext/config/stock.py +141,Main Reports,ಮುಖ್ಯ ವರದಿಗಳು
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +102,Stock Ledger entries balances updated,ಸ್ಟಾಕ್ ಲೆಡ್ಜರ್ ಅಪ್ಡೇಟ್ಗೊಳಿಸಲಾಗಿದೆ ನಮೂದುಗಳನ್ನು ಸಮತೋಲನಗೊಳಿಸುತ್ತದೆ
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,ಇಲ್ಲಿಯವರೆಗೆ fromDate ಮೊದಲು ಸಾಧ್ಯವಿಲ್ಲ
 DocType: Purchase Receipt Item,Prevdoc DocType,Prevdoc doctype
-apps/erpnext/erpnext/stock/doctype/item/item.js +176,Add / Edit Prices,/ ಸಂಪಾದಿಸಿ ಬೆಲೆಗಳು ಸೇರಿಸಿ
+apps/erpnext/erpnext/stock/doctype/item/item.js +178,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 +298,My Orders,ನನ್ನ ಆರ್ಡರ್ಸ್
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +293,My Orders,ನನ್ನ ಆರ್ಡರ್ಸ್
 DocType: Price List,Price List Name,ಬೆಲೆ ಪಟ್ಟಿ ಹೆಸರು
 DocType: Time Log,For Manufacturing,ಉತ್ಪಾದನೆ
-apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +70,Totals,ಮೊತ್ತವನ್ನು
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +174,Totals,ಮೊತ್ತವನ್ನು
 DocType: BOM,Manufacturing,ಮ್ಯಾನುಫ್ಯಾಕ್ಚರಿಂಗ್
 ,Ordered Items To Be Delivered,ನೀಡಬೇಕಾಗಿದೆ ಐಟಂಗಳು ಆದೇಶ
 DocType: Account,Income,ಆದಾಯ
 ,Setup Wizard,ಸೆಟಪ್ ವಿಝಾರ್ಡ್
 DocType: Industry Type,Industry Type,ಉದ್ಯಮ ಪ್ರಕಾರ
 apps/erpnext/erpnext/templates/includes/cart.js +137,Something went wrong!,ಏನೋ ತಪ್ಪಾಗಿದೆ!
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +68,Warning: Leave application contains following block dates,ಎಚ್ಚರಿಕೆ : ಅಪ್ಲಿಕೇಶನ್ ಬಿಡಿ ಕೆಳಗಿನ ಬ್ಲಾಕ್ ದಿನಾಂಕಗಳನ್ನು ಒಳಗೊಂಡಿರುತ್ತದೆ
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +251,Sales Invoice {0} has already been submitted,ಮಾರಾಟದ ಸರಕುಪಟ್ಟಿ {0} ಈಗಾಗಲೇ ಸಲ್ಲಿಸಲಾಗಿದೆ
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +100,Warning: Leave application contains following block dates,ಎಚ್ಚರಿಕೆ : ಅಪ್ಲಿಕೇಶನ್ ಬಿಡಿ ಕೆಳಗಿನ ಬ್ಲಾಕ್ ದಿನಾಂಕಗಳನ್ನು ಒಳಗೊಂಡಿರುತ್ತದೆ
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +256,Sales Invoice {0} has already been submitted,ಮಾರಾಟದ ಸರಕುಪಟ್ಟಿ {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/setup/page/setup_wizard/fixtures/operations.py +10,Die casting,ಡೈ ಆವರಣ
 DocType: Email Alert,Reference Date,ರೆಫರೆನ್ಸ್ ದಿನಾಂಕ
 apps/erpnext/erpnext/config/hr.py +105,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,ಕಳುಹಿಸುವ ಮೊದಲು ಸಂದೇಶವನ್ನು ನಮೂದಿಸಿ
 DocType: Async Task,Status,ಅಂತಸ್ತು
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +65,Stock UOM updated for Item {0},ಸ್ಟಾಕ್ ಮೈ.ವಿ.ವಿ.ಯ ಐಟಂ ಅಪ್ಡೇಟ್ಗೊಳಿಸಲಾಗಿದೆ {0}
 DocType: Company History,Year,ವರ್ಷ
 apps/erpnext/erpnext/config/accounts.py +127,Point-of-Sale Profile,ಪಾಯಿಂಟ್ ಯಾ ಮಾರಾಟಕ್ಕೆ ವಿವರ
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +68,Please Update SMS Settings,SMS ಸೆಟ್ಟಿಂಗ್ಗಳು ಅಪ್ಡೇಟ್ ಮಾಡಿ
@@ -3588,12 +3440,12 @@
 ,Serial No Service Contract Expiry,ಯಾವುದೇ ಸೀರಿಯಲ್ ಸೇವೆ ಕಾಂಟ್ರಾಕ್ಟ್ ಅಂತ್ಯ
 DocType: Item,Unit of Measure Conversion,ಅಳತೆ ಮತಾಂತರದ ಘಟಕ
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +86,Employee can not be changed,ನೌಕರರ ಬದಲಾವಣೆ ಸಾಧ್ಯವಿಲ್ಲ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +259,You cannot credit and debit same account at the same time,ನೀವು ಕ್ರೆಡಿಟ್ ಮತ್ತು sametime ನಲ್ಲಿ ಅದೇ ಖಾತೆಯನ್ನು ಡೆಬಿಟ್ ಸಾಧ್ಯವಿಲ್ಲ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,You cannot credit and debit same account at the same time,ನೀವು ಕ್ರೆಡಿಟ್ ಮತ್ತು sametime ನಲ್ಲಿ ಅದೇ ಖಾತೆಯನ್ನು ಡೆಬಿಟ್ ಸಾಧ್ಯವಿಲ್ಲ
 DocType: Naming Series,Help HTML,HTML ಸಹಾಯ
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},ನಿಯೋಜಿಸಲಾಗಿದೆ ಒಟ್ಟು ಪ್ರಾಮುಖ್ಯತೆಯನ್ನು 100% ಇರಬೇಕು. ಇದು {0}
 apps/erpnext/erpnext/controllers/status_updater.py +140,Allowance for over-{0} crossed for Item {1},ಸೇವನೆ ಮೇಲೆ {0} ಐಟಂ ದಾಟಿದೆ ಫಾರ್ {1}
 DocType: Address,Name of person or organization that this address belongs to.,ವ್ಯಕ್ತಿ ಅಥವಾ ಸಂಸ್ಥೆಯ ಹೆಸರು ಈ ವಿಳಾಸಕ್ಕೆ ಸೇರುತ್ತದೆ .
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +587,Your Suppliers,ನಿಮ್ಮ ಪೂರೈಕೆದಾರರು
+apps/erpnext/erpnext/public/js/setup_wizard.js +325,Your Suppliers,ನಿಮ್ಮ ಪೂರೈಕೆದಾರರು
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,ಮಾರಾಟದ ಆರ್ಡರ್ ಮಾಡಿದ ಎಂದು ಕಳೆದು ಹೊಂದಿಸಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ .
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +65,Another Salary Structure {0} is active for employee {1}. Please make its status 'Inactive' to proceed.,ಮತ್ತೊಂದು ಸಂಬಳ ರಚನೆ {0} ನೌಕರ ಸಕ್ರಿಯವಾಗಿದೆ {1}. ಅದರ ಸ್ಥಿತಿ 'ನಿಷ್ಕ್ರಿಯ' ಮುಂದುವರೆಯಲು ಮಾಡಿ.
 DocType: Purchase Invoice,Contact,ಸಂಪರ್ಕಿಸಿ
@@ -3602,37 +3454,35 @@
 DocType: Item,Has Serial No,ಅನುಕ್ರಮ ಸಂಖ್ಯೆ ಹೊಂದಿದೆ
 DocType: Employee,Date of Issue,ಸಂಚಿಕೆ ದಿನಾಂಕ
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +16,{0}: From {0} for {1},{0}: ಗೆ {0} ಫಾರ್ {1}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +154,Row #{0}: Set Supplier for item {1},ರೋ # {0}: ಐಟಂ ಹೊಂದಿಸಿ ಸರಬರಾಜುದಾರ {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +149,Row #{0}: Set Supplier for item {1},ರೋ # {0}: ಐಟಂ ಹೊಂದಿಸಿ ಸರಬರಾಜುದಾರ {1}
 DocType: Issue,Content Type,ವಿಷಯ ಪ್ರಕಾರ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +17,Computer,ಗಣಕಯಂತ್ರ
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,ಗಣಕಯಂತ್ರ
 DocType: Item,List this Item in multiple groups on the website.,ವೆಬ್ಸೈಟ್ನಲ್ಲಿ ಅನೇಕ ಗುಂಪುಗಳಲ್ಲಿ ಈ ಐಟಂ ಪಟ್ಟಿ .
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +283,Please check Multi Currency option to allow accounts with other currency,ಇತರ ಕರೆನ್ಸಿ ಖಾತೆಗಳನ್ನು ಅವಕಾಶ ಮಲ್ಟಿ ಕರೆನ್ಸಿ ಆಯ್ಕೆಯನ್ನು ಪರಿಶೀಲಿಸಿ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +285,Please check Multi Currency option to allow accounts with other currency,ಇತರ ಕರೆನ್ಸಿ ಖಾತೆಗಳನ್ನು ಅವಕಾಶ ಮಲ್ಟಿ ಕರೆನ್ಸಿ ಆಯ್ಕೆಯನ್ನು ಪರಿಶೀಲಿಸಿ
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +62,Item: {0} does not exist in the system,ಐಟಂ: {0} ವ್ಯವಸ್ಥೆಯ ಅಸ್ತಿತ್ವದಲ್ಲಿಲ್ಲ
 apps/erpnext/erpnext/accounts/doctype/account/account.py +81,You are not authorized to set Frozen value,ನೀವು ಫ್ರೋಜನ್ ಮೌಲ್ಯವನ್ನು ಅಧಿಕಾರ
 DocType: Payment Reconciliation,Get Unreconciled Entries,ರಾಜಿಯಾಗದ ನಮೂದುಗಳು ಪಡೆಯಿರಿ
 DocType: Cost Center,Budgets,ಬಜೆಟ್
 apps/frappe/frappe/core/page/modules_setup/modules_setup.py +11,Updated,ನವೀಕರಿಸಲಾಗಿದೆ
 DocType: Employee,Emergency Contact Details,ತುರ್ತು ಸಂಪರ್ಕ ವಿವರಗಳು
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +396,What does it do?,ಇದು ಏನು ಮಾಡುತ್ತದೆ?
+apps/erpnext/erpnext/public/js/setup_wizard.js +144,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,ಸರಾಸರಿ ಆಯೋಗದ ದರ
-apps/erpnext/erpnext/stock/doctype/item/item.py +313,'Has Serial No' can not be 'Yes' for non-stock item,' ಸೀರಿಯಲ್ ನಂ ಹ್ಯಾಸ್ ' ನಾನ್ ಸ್ಟಾಕ್ ಐಟಂ ' ಹೌದು ' ಸಾಧ್ಯವಿಲ್ಲ
+apps/erpnext/erpnext/stock/doctype/item/item.py +317,'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/setup/page/setup_wizard/install_fixtures.py +111,Electrical,ವಿದ್ಯುತ್ತಿನ
+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 +302,Row {0}: Exchange Rate is mandatory,ಸಾಲು {0}: ವಿನಿಮಯ ದರ ಕಡ್ಡಾಯ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +304,Row {0}: Exchange Rate is mandatory,ಸಾಲು {0}: ವಿನಿಮಯ ದರ ಕಡ್ಡಾಯ
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},ಬಳಕೆದಾರ ID ನೌಕರ ಸೆಟ್ {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +72,Peening,Peening
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,From Warranty Claim,ಖಾತರಿ ಹಕ್ಕು
 DocType: Stock Entry,Default Source Warehouse,ಡೀಫಾಲ್ಟ್ ಮೂಲ ವೇರ್ಹೌಸ್
 DocType: Item,Customer Code,ಗ್ರಾಹಕ ಕೋಡ್
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +212,Birthday Reminder for {0},ಹುಟ್ಟುಹಬ್ಬದ ಜ್ಞಾಪನೆ {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +163,Lapping,Lapping
-apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.js +8,Days Since Last Order,ದಿನಗಳಿಂದಲೂ ಕೊನೆಯ ಆರ್ಡರ್
+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 +299,Debit To account must be a Balance Sheet account,ಖಾತೆಗೆ ಡೆಬಿಟ್ ಬ್ಯಾಲೆನ್ಸ್ ಶೀಟ್ ಖಾತೆ ಇರಬೇಕು
 DocType: Buying Settings,Naming Series,ಸರಣಿ ಹೆಸರಿಸುವ
 DocType: Leave Block List,Leave Block List Name,ಖಂಡ ಬಿಡಿ ಹೆಸರು
@@ -3646,7 +3496,7 @@
 DocType: Notification Control,Sales Invoice Message,ಮಾರಾಟದ ಸರಕುಪಟ್ಟಿ ಸಂದೇಶ
 DocType: Authorization Rule,Based On,ಆಧರಿಸಿದೆ
 DocType: Sales Order Item,Ordered Qty,ಪ್ರಮಾಣ ಆದೇಶ
-apps/erpnext/erpnext/stock/doctype/item/item.py +539,Item {0} is disabled,ಐಟಂ {0} ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ
+apps/erpnext/erpnext/stock/doctype/item/item.py +543,Item {0} is disabled,ಐಟಂ {0} ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ
 DocType: Stock Settings,Stock Frozen Upto,ಸ್ಟಾಕ್ ಘನೀಕೃತ ವರೆಗೆ
 apps/erpnext/erpnext/controllers/recurring_document.py +166,Period From and Period To dates mandatory for recurring {0},ಗೆ ಅವಧಿಯ ಮರುಕಳಿಸುವ ಕಡ್ಡಾಯವಾಗಿ ದಿನಾಂಕಗಳನ್ನು ಅವಧಿಯಲ್ಲಿ {0}
 apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,ಪ್ರಾಜೆಕ್ಟ್ ಚಟುವಟಿಕೆ / ಕೆಲಸ .
@@ -3656,7 +3506,6 @@
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,ರಿಯಾಯಿತಿ ಕಡಿಮೆ 100 ಇರಬೇಕು
 DocType: ToDo,Low,ಕಡಿಮೆ
 DocType: Purchase Invoice,Write Off Amount (Company Currency),ಪ್ರಮಾಣದ ಆಫ್ ಬರೆಯಿರಿ (ಕಂಪನಿ ಕರೆನ್ಸಿ)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +71,Spinning,ಸ್ಪಿನ್ನಿಂಗ್
 DocType: Landed Cost Voucher,Landed Cost Voucher,ಇಳಿಯಿತು ವೆಚ್ಚ ಚೀಟಿ
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +55,Please set {0},ಸೆಟ್ ದಯವಿಟ್ಟು {0}
 DocType: Purchase Invoice,Repeat on Day of Month,ತಿಂಗಳಿನ ದಿನ ಪುನರಾವರ್ತಿಸಿ
@@ -3678,7 +3527,6 @@
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +37,Campaign Name is required,ಕ್ಯಾಂಪೇನ್ ಹೆಸರು ಅಗತ್ಯವಿದೆ
 DocType: Maintenance Visit,Maintenance Date,ನಿರ್ವಹಣೆ ದಿನಾಂಕ
 DocType: Purchase Receipt Item,Rejected Serial No,ತಿರಸ್ಕರಿಸಲಾಗಿದೆ ಅನುಕ್ರಮ ಸಂಖ್ಯೆ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +51,Deep drawing,ಚಿತ್ರ ಬಿಡಿಸುವ
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +40,New Newsletter,ಹೊಸ ಸುದ್ದಿಪತ್ರ
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +157,Start date should be less than end date for Item {0},ಪ್ರಾರಂಭ ದಿನಾಂಕ ಐಟಂ ಅಂತಿಮ ದಿನಾಂಕವನ್ನು ಕಡಿಮೆ Shoulderstand {0}
 apps/erpnext/erpnext/stock/doctype/item/item.js +17,Show Balance,ತೋರಿಸು ಬ್ಯಾಲೆನ್ಸ್
@@ -3689,7 +3537,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +119,BOM and Manufacturing Quantity are required,BOM ಮತ್ತು ಉತ್ಪಾದನೆ ಪ್ರಮಾಣ ಅಗತ್ಯವಿದೆ
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,ಏಜಿಂಗ್ ರೇಂಜ್ 2
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +450,Amount,ಪ್ರಮಾಣ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +147,Riveting,ರಿವರ್ಟಿಂಗ್ನಿಂದ
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,BOM ಬದಲಾಯಿಸಲ್ಪಟ್ಟಿದೆ
 ,Sales Analytics,ಮಾರಾಟದ ಅನಾಲಿಟಿಕ್ಸ್
 DocType: Manufacturing Settings,Manufacturing Settings,ಉತ್ಪಾದನಾ ಸೆಟ್ಟಿಂಗ್ಗಳು
@@ -3701,20 +3548,19 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +207,New Account Name,ಹೊಸ ಖಾತೆ ಹೆಸರು
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,ರಾ ಮೆಟೀರಿಯಲ್ಸ್ ಸರಬರಾಜು ವೆಚ್ಚ
 DocType: Selling Settings,Settings for Selling Module,ಮಾಡ್ಯೂಲ್ ಮಾರಾಟವಾಗುವ ಸೆಟ್ಟಿಂಗ್ಗಳು
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +73,Customer Service,ಗ್ರಾಹಕ ಸೇವೆ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Customer Service,ಗ್ರಾಹಕ ಸೇವೆ
 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.,ಆಫರ್ ಅಭ್ಯರ್ಥಿ ಒಂದು ಜಾಬ್.
 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 +70,Item {0} must be a stock Item,ಐಟಂ {0} ಸ್ಟಾಕ್ ಐಟಂ ಇರಬೇಕು
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,ಪ್ರೋಗ್ರೆಸ್ ಉಗ್ರಾಣದಲ್ಲಿ ಡೀಫಾಲ್ಟ್ ಕೆಲಸ
 apps/erpnext/erpnext/config/accounts.py +107,Default settings for accounting transactions.,ಅಕೌಂಟಿಂಗ್ ವ್ಯವಹಾರ ಡೀಫಾಲ್ಟ್ ಸೆಟ್ಟಿಂಗ್ಗಳನ್ನು .
 apps/frappe/frappe/model/naming.py +40,{0} is required,{0} ಅಗತ್ಯವಿದೆ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +21,Vacuum molding,ನಿರ್ವಾತ ಸೂರು
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,ನಿರೀಕ್ಷಿತ ದಿನಾಂಕ ಮೆಟೀರಿಯಲ್ ವಿನಂತಿ ದಿನಾಂಕ ಮೊದಲು ಸಾಧ್ಯವಿಲ್ಲ
 DocType: Contact Us Settings,City,ನಗರ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +132,Ultrasonic machining,ಅಲ್ಟ್ರಾಸಾನಿಕ್ ಯಂತ್ರ
 apps/frappe/frappe/templates/base.html +137,Error: Not a valid id?,ದೋಷ: ಮಾನ್ಯ ಐಡಿ?
 apps/erpnext/erpnext/stock/get_item_details.py +125,Item {0} must be a Sales Item,ಐಟಂ {0} ಸೇಲ್ಸ್ ಐಟಂ ಇರಬೇಕು
 DocType: Naming Series,Update Series Number,ಅಪ್ಡೇಟ್ ಸರಣಿ ಸಂಖ್ಯೆ
@@ -3722,7 +3568,7 @@
 DocType: Sales Order,Printing Details,ಮುದ್ರಣ ವಿವರಗಳು
 DocType: Task,Closing Date,ದಿನಾಂಕ ಕ್ಲೋಸಿಂಗ್
 DocType: Sales Order Item,Produced Quantity,ಉತ್ಪಾದನೆಯ ಪ್ರಮಾಣ
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +84,Engineer,ಇಂಜಿನಿಯರ್
+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 +379,Item Code required at Row No {0},ರೋ ನಂ ಅಗತ್ಯವಿದೆ ಐಟಂ ಕೋಡ್ {0}
 DocType: Sales Partner,Partner Type,ಸಂಗಾತಿ ಪ್ರಕಾರ
@@ -3730,7 +3576,7 @@
 DocType: Authorization Rule,Customerwise Discount,Customerwise ಡಿಸ್ಕೌಂಟ್
 DocType: Purchase Invoice,Against Expense Account,ವೆಚ್ಚದಲ್ಲಿ ಖಾತೆಯನ್ನು ವಿರುದ್ಧ
 DocType: Production Order,Production Order,ಪ್ರೊಡಕ್ಷನ್ ಆರ್ಡರ್
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +258,Installation Note {0} has already been submitted,ಅನುಸ್ಥಾಪನೆ ಸೂಚನೆ {0} ಈಗಾಗಲೇ ಸಲ್ಲಿಸಲಾಗಿದೆ
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +263,Installation Note {0} has already been submitted,ಅನುಸ್ಥಾಪನೆ ಸೂಚನೆ {0} ಈಗಾಗಲೇ ಸಲ್ಲಿಸಲಾಗಿದೆ
 DocType: Quotation Item,Against Docname,docName ವಿರುದ್ಧ
 DocType: SMS Center,All Employee (Active),ಎಲ್ಲಾ ನೌಕರರ ( ಸಕ್ರಿಯ )
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,ಈಗ ವೀಕ್ಷಿಸಿ
@@ -3739,19 +3585,19 @@
 DocType: Item,Re-Order Level,ಮರು ಕ್ರಮಾಂಕದ ಮಟ್ಟ
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,ನೀವು ಉತ್ಪಾದನೆ ಆದೇಶಗಳನ್ನು ಹೆಚ್ಚಿಸಲು ಅಥವಾ ವಿಶ್ಲೇಷಣೆ ಕಚ್ಚಾ ವಸ್ತುಗಳನ್ನು ಡೌನ್ಲೋಡ್ ಬಯಸುವ ಐಟಂಗಳನ್ನು ಮತ್ತು ಯೋಜಿಸಿದ ಪ್ರಮಾಣ ನಮೂದಿಸಿ.
 apps/frappe/frappe/public/js/frappe/views/ganttview.js +45,Gantt Chart,ಗಂಟ್ ಚಾರ್ಟ್
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +57,Part-time,ಅರೆಕಾಲಿಕ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,Part-time,ಅರೆಕಾಲಿಕ
 DocType: Employee,Applicable Holiday List,ಅನ್ವಯಿಸುವ ಹಾಲಿಡೇ ಪಟ್ಟಿ
 DocType: Employee,Cheque,ಚೆಕ್
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,ಸರಣಿ Updated
 apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Report Type is mandatory,ವರದಿ ಪ್ರಕಾರ ಕಡ್ಡಾಯ
 DocType: Item,Serial Number Series,ಕ್ರಮ ಸಂಖ್ಯೆ ಸರಣಿ
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},ವೇರ್ಹೌಸ್ ಸ್ಟಾಕ್ ಐಟಂ ಕಡ್ಡಾಯ {0} ಸತತವಾಗಿ {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +45,Retail & Wholesale,ಚಿಲ್ಲರೆ & ಸಗಟು
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,ಚಿಲ್ಲರೆ & ಸಗಟು
 DocType: Issue,First Responded On,ಮೊದಲ ಪ್ರತಿಕ್ರಿಯೆ
 DocType: Website Item Group,Cross Listing of Item in multiple groups,ಅನೇಕ ಗುಂಪುಗಳಲ್ಲಿ ಐಟಂ ಅಡ್ಡ ಪಟ್ಟಿ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +351,The First User: You,ಮೊದಲ ಬಳಕೆದಾರ : ನೀವು
+apps/erpnext/erpnext/public/js/setup_wizard.js +101,The First User: You,ಮೊದಲ ಬಳಕೆದಾರ : ನೀವು
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +48,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 +172,Successfully Reconciled,ಯಶಸ್ವಿಯಾಗಿ ಮರುಕೌನ್ಸಿಲ್
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +119,Successfully Reconciled,ಯಶಸ್ವಿಯಾಗಿ ಮರುಕೌನ್ಸಿಲ್
 DocType: Production Order,Planned End Date,ಯೋಜನೆ ಅಂತಿಮ ದಿನಾಂಕ
 apps/erpnext/erpnext/config/stock.py +43,Where items are stored.,ಐಟಂಗಳನ್ನು ಸಂಗ್ರಹಿಸಲಾಗಿದೆ ಅಲ್ಲಿ .
 DocType: Tax Rule,Validity,ವಾಯಿದೆ
@@ -3771,39 +3617,36 @@
 DocType: DocPerm,Level,ಮಟ್ಟ
 DocType: Purchase Taxes and Charges,On Net Total,ನೆಟ್ ಒಟ್ಟು ರಂದು
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +160,Target warehouse in row {0} must be same as Production Order,ಸತತವಾಗಿ ಟಾರ್ಗೆಟ್ ಗೋದಾಮಿನ {0} ಅದೇ ಇರಬೇಕು ಉತ್ಪಾದನೆ ಆರ್ಡರ್
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +59,No permission to use Payment Tool,ಯಾವುದೇ ಅನುಮತಿ ಪಾವತಿ ಉಪಕರಣವನ್ನು ಬಳಸಲು
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +97,No permission to use Payment Tool,ಯಾವುದೇ ಅನುಮತಿ ಪಾವತಿ ಉಪಕರಣವನ್ನು ಬಳಸಲು
 apps/erpnext/erpnext/controllers/recurring_document.py +192,'Notification Email Addresses' not specified for recurring %s,% ರು ಪುನರಾವರ್ತಿತ ನಿರ್ದಿಷ್ಟಪಡಿಸಲಾಗಿಲ್ಲ 'ಅಧಿಸೂಚನೆ ಇಮೇಲ್ ವಿಳಾಸಗಳು'
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +86,Milling,ಮಿಲ್ಲಿಂಗ್
 apps/erpnext/erpnext/accounts/doctype/account/account.py +99,Currency can not be changed after making entries using some other currency,ಕರೆನ್ಸಿ ಕೆಲವು ಇತರ ಕರೆನ್ಸಿ ಬಳಸಿಕೊಂಡು ನಮೂದುಗಳನ್ನು ಮಾಡಿದ ನಂತರ ಬದಲಾಯಿಸಲಾಗುವುದಿಲ್ಲ
 DocType: Company,Round Off Account,ಖಾತೆ ಆಫ್ ಸುತ್ತ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +60,Nibbling,Nibbling
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,ಆಡಳಿತಾತ್ಮಕ ವೆಚ್ಚಗಳು
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +18,Consulting,ಕನ್ಸಲ್ಟಿಂಗ್
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +18,Consulting,ಕನ್ಸಲ್ಟಿಂಗ್
 DocType: Customer Group,Parent Customer Group,ಪೋಷಕ ಗ್ರಾಹಕ ಗುಂಪಿನ
 apps/erpnext/erpnext/public/js/pos/pos.js +429,Change,ಬದಲಾವಣೆ
 DocType: Purchase Invoice,Contact Email,ಇಮೇಲ್ ಮೂಲಕ ಸಂಪರ್ಕಿಸಿ
 DocType: Appraisal Goal,Score Earned,ಸ್ಕೋರ್ ಗಳಿಸಿದರು
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +393,"e.g. ""My Company LLC""","ಇ ಜಿ "" ನನ್ನ ಕಂಪನಿ ಎಲ್ಎಲ್ """
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +173,Notice Period,ಎಚ್ಚರಿಕೆ ಅವಧಿಯ
+apps/erpnext/erpnext/public/js/setup_wizard.js +141,"e.g. ""My Company LLC""","ಇ ಜಿ "" ನನ್ನ ಕಂಪನಿ ಎಲ್ಎಲ್ """
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +173,Notice Period,ಎಚ್ಚರಿಕೆ ಅವಧಿಯ
 DocType: Bank Reconciliation Detail,Voucher ID,ಚೀಟಿ ID ಯನ್ನು
 apps/erpnext/erpnext/setup/doctype/territory/territory.js +14,This is a root territory and cannot be edited.,ಈ ಒಂದು ಮೂಲ ಪ್ರದೇಶವನ್ನು ಮತ್ತು ಸಂಪಾದಿತವಾಗಿಲ್ಲ .
 DocType: Packing Slip,Gross Weight UOM,ಒಟ್ಟಾರೆ ತೂಕದ UOM
 DocType: Email Digest,Receivables / Payables,ಕರಾರು / ಸಂದಾಯಗಳು
 DocType: Delivery Note Item,Against Sales Invoice,ಮಾರಾಟದ ಸರಕುಪಟ್ಟಿ ವಿರುದ್ಧ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +63,Stamping,Stamping
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +457,Credit Account,ಕ್ರೆಡಿಟ್ ಖಾತೆ
 DocType: Landed Cost Item,Landed Cost Item,ಇಳಿಯಿತು ವೆಚ್ಚ ಐಟಂ
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +56,Show zero values,ಶೂನ್ಯ ಮೌಲ್ಯಗಳು ತೋರಿಸಿ
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,ಕಚ್ಚಾ ವಸ್ತುಗಳ givenName ಪ್ರಮಾಣದಲ್ಲಿ repacking / ತಯಾರಿಕಾ ನಂತರ ಪಡೆದುಕೊಂಡು ಐಟಂ ಪ್ರಮಾಣ
 DocType: Payment Reconciliation,Receivable / Payable Account,ಸ್ವೀಕರಿಸುವಂತಹ / ಪಾವತಿಸಲಾಗುವುದು ಖಾತೆ
 DocType: Delivery Note Item,Against Sales Order Item,ಮಾರಾಟದ ಆರ್ಡರ್ ಐಟಂ ವಿರುದ್ಧ
-apps/erpnext/erpnext/stock/doctype/item/item.py +521,Please specify Attribute Value for attribute {0},ಗುಣಲಕ್ಷಣ ಮೌಲ್ಯ ಗುಣಲಕ್ಷಣ ಸೂಚಿಸಿ {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +525,Please specify Attribute Value for attribute {0},ಗುಣಲಕ್ಷಣ ಮೌಲ್ಯ ಗುಣಲಕ್ಷಣ ಸೂಚಿಸಿ {0}
 DocType: Item,Default Warehouse,ಡೀಫಾಲ್ಟ್ ವೇರ್ಹೌಸ್
 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,ಪ್ರಮಾಣ ಇಲ್ಲದೆ ಮುದ್ರಿಸು
-apps/erpnext/erpnext/controllers/buying_controller.py +69,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,ತೆರಿಗೆ ಬದಲಿಸಿ ' ಮೌಲ್ಯಾಂಕನ ' ಅಥವಾ ' ಮೌಲ್ಯಾಂಕನ ಮತ್ತು ಒಟ್ಟು ' ಎಲ್ಲಾ ಐಟಂಗಳನ್ನು ಅಲ್ಲದ ಸ್ಟಾಕ್ ವಸ್ತುಗಳಾಗಿವೆ ಎಂದು ಸಾಧ್ಯವಿಲ್ಲ
+apps/erpnext/erpnext/controllers/buying_controller.py +60,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,ತೆರಿಗೆ ಬದಲಿಸಿ ' ಮೌಲ್ಯಾಂಕನ ' ಅಥವಾ ' ಮೌಲ್ಯಾಂಕನ ಮತ್ತು ಒಟ್ಟು ' ಎಲ್ಲಾ ಐಟಂಗಳನ್ನು ಅಲ್ಲದ ಸ್ಟಾಕ್ ವಸ್ತುಗಳಾಗಿವೆ ಎಂದು ಸಾಧ್ಯವಿಲ್ಲ
 DocType: User,Last Name,ಕೊನೆಯ ಹೆಸರು
 DocType: Web Page,Left,ಎಡ
 DocType: Event,All Day,ಎಲ್ಲಾ ದಿನ
@@ -3811,7 +3654,7 @@
 DocType: Appraisal,Total Score (Out of 5),ಒಟ್ಟು ಸ್ಕೋರ್ ( 5)
 DocType: Contact Us Settings,State,ರಾಜ್ಯ
 DocType: Batch,Batch,ಗುಂಪು
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +51,Balance,ಬ್ಯಾಲೆನ್ಸ್
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +28,Balance,ಬ್ಯಾಲೆನ್ಸ್
 DocType: Project,Total Expense Claim (via Expense Claims),ಒಟ್ಟು ಖರ್ಚು ಹಕ್ಕು (ಖರ್ಚು ಹಕ್ಕು ಮೂಲಕ)
 DocType: User,Gender,ಲಿಂಗ
 DocType: Journal Entry,Debit Note,ಡೆಬಿಟ್ ಚೀಟಿಯನ್ನು
@@ -3841,8 +3684,7 @@
 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/setup/page/setup_wizard/fixtures/operations.py +76,Seaming,ಅಂಚು
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +197,"Company Email ID not found, hence mail not sent","ಕಂಪನಿ ಇಮೇಲ್ ಐಡಿ ಪತ್ತೆಯಾಗಿಲ್ಲ , ಆದ್ದರಿಂದ ಕಳುಹಿಸಲಾಗಿಲ್ಲ ಮೇಲ್"
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +206,"Company Email ID not found, hence mail not sent","ಕಂಪನಿ ಇಮೇಲ್ ಐಡಿ ಪತ್ತೆಯಾಗಿಲ್ಲ , ಆದ್ದರಿಂದ ಕಳುಹಿಸಲಾಗಿಲ್ಲ ಮೇಲ್"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),ನಿಧಿಗಳು ಅಪ್ಲಿಕೇಶನ್ ( ಆಸ್ತಿಗಳು )
 DocType: Production Planning Tool,Filter based on item,ಐಟಂ ಆಧರಿಸಿ ಫಿಲ್ಟರ್
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +451,Debit Account,ಡೆಬಿಟ್ ಖಾತೆ
@@ -3854,17 +3696,16 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +95,{0} {1} has been modified. Please refresh.,{0} {1} ಮಾರ್ಪಡಿಸಲಾಗಿದೆ. ರಿಫ್ರೆಶ್ ಮಾಡಿ.
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,ಕೆಳಗಿನ ದಿನಗಳಲ್ಲಿ ಲೀವ್ ಅಪ್ಲಿಕೇಶನ್ ಮಾಡುವ ಬಳಕೆದಾರರನ್ನು ನಿಲ್ಲಿಸಿ .
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +591,From Opportunity,ಅವಕಾಶದಿಂದ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +46,Blanking,ಖಾಲಿಮಾಡುವ
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +166,Employee Benefits,ಉದ್ಯೋಗಿ ಸೌಲಭ್ಯಗಳು
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,Employee Benefits,ಉದ್ಯೋಗಿ ಸೌಲಭ್ಯಗಳು
 DocType: Sales Invoice,Is POS,ಪಿಓಎಸ್ ಹೊಂದಿದೆ
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +240,Packed quantity must equal quantity for Item {0} in row {1},{0} ಸತತವಾಗಿ {1} ಪ್ಯಾಕ್ಡ್ ಪ್ರಮಾಣ ಐಟಂ ಪ್ರಮಾಣ ಸಮ
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +245,Packed quantity must equal quantity for Item {0} in row {1},{0} ಸತತವಾಗಿ {1} ಪ್ಯಾಕ್ಡ್ ಪ್ರಮಾಣ ಐಟಂ ಪ್ರಮಾಣ ಸಮ
 DocType: Production Order,Manufactured Qty,ತಯಾರಿಸಲ್ಪಟ್ಟ ಪ್ರಮಾಣ
 DocType: Purchase Receipt Item,Accepted Quantity,Accepted ಪ್ರಮಾಣ
 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.,ಗ್ರಾಹಕರು ಬೆಳೆದ ಬಿಲ್ಲುಗಳನ್ನು .
 DocType: DocField,Default,ಡೀಫಾಲ್ಟ್
 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 +466,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},ರೋ ಯಾವುದೇ {0}: ಪ್ರಮಾಣ ಖರ್ಚು ಹಕ್ಕು {1} ವಿರುದ್ಧ ಪ್ರಮಾಣ ಬಾಕಿ ಹೆಚ್ಚು ಸಾಧ್ಯವಿಲ್ಲ. ಬಾಕಿ ಪ್ರಮಾಣ {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +468,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} ಗ್ರಾಹಕರನ್ನು ಸೇರ್ಪಡೆ
 DocType: Maintenance Schedule,Schedule,ಕಾರ್ಯಕ್ರಮ
 DocType: Cost Center,"Define Budget for this Cost Center. To set budget action, see ""Company List""","ಈ ವೆಚ್ಚ ಕೇಂದ್ರ ಬಜೆಟ್ ವಿವರಿಸಿ. ವೆಚ್ಚದ ಸೆಟ್, ನೋಡಿ &quot;ಕಂಪನಿ ಪಟ್ಟಿ&quot;"
@@ -3875,7 +3716,7 @@
 apps/erpnext/erpnext/public/js/pos/pos.js +91,Price List not found or disabled,ದರ ಪಟ್ಟಿ ಕಂಡುಬಂದಿಲ್ಲ ಅಥವಾ ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ
 DocType: Expense Claim,Approved,Approved
 DocType: Pricing Rule,Price,ಬೆಲೆ
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +79,Employee relieved on {0} must be set as 'Left',{0} ಮೇಲೆ ಬಿಡುಗಡೆ ನೌಕರರ ' ಎಡ ' ಹೊಂದಿಸಿ
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +88,Employee relieved on {0} must be set as 'Left',{0} ಮೇಲೆ ಬಿಡುಗಡೆ ನೌಕರರ ' ಎಡ ' ಹೊಂದಿಸಿ
 DocType: Item,"Selecting ""Yes"" will give a unique identity to each entity of this item which can be viewed in the Serial No master.",""" ಹೌದು "" ಆಯ್ಕೆ ಅನುಕ್ರಮ ಸಂಖ್ಯೆ ಮಾಸ್ಟರ್ ನೋಡಬಹುದು ಈ ಐಟಂ ಪ್ರತಿ ಘಟಕದ ಒಂದು ಅನನ್ಯ ಗುರುತನ್ನು ನೀಡುತ್ತದೆ ."
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +39,Appraisal {0} created for Employee {1} in the given date range,ಅಪ್ರೇಸಲ್ {0} ನೌಕರ ದಾಖಲಿಸಿದವರು {1} givenName ದಿನಾಂಕ ವ್ಯಾಪ್ತಿಯಲ್ಲಿ
 DocType: Employee,Education,ಶಿಕ್ಷಣ
@@ -3886,7 +3727,7 @@
 apps/frappe/frappe/desk/moduleview.py +67,Standard Reports,ಸ್ಟ್ಯಾಂಡರ್ಡ್ ವರದಿಗಳು
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,ಲೆಕ್ಕಪರಿಶೋಧಕ ಜರ್ನಲ್ ನಮೂದುಗಳು .
 DocType: Delivery Note Item,Available Qty at From Warehouse,ಗೋದಾಮಿನ ಲಭ್ಯವಿದೆ ಪ್ರಮಾಣ
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +209,Please select Employee Record first.,ಮೊದಲ ನೌಕರರ ರೆಕಾರ್ಡ್ ಆಯ್ಕೆಮಾಡಿ.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +224,Please select Employee Record first.,ಮೊದಲ ನೌಕರರ ರೆಕಾರ್ಡ್ ಆಯ್ಕೆಮಾಡಿ.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,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 +233,Please enter Expense Account,ವೆಚ್ಚದಲ್ಲಿ ಖಾತೆಯನ್ನು ನಮೂದಿಸಿ
@@ -3899,46 +3740,43 @@
 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,ಮೇಲೆ ಮಾನದಂಡಗಳನ್ನು ಆಧರಿಸಿ ( ತಲುಪಿಸಲು ಬಾಕಿ ) ಮಾರಾಟ ಆದೇಶಗಳನ್ನು ಪುಲ್
 DocType: DocShare,Document Type,ಡಾಕ್ಯುಮೆಂಟ್ ಪ್ರಕಾರ
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +565,From Supplier Quotation,ಸರಬರಾಜುದಾರ ಉದ್ಧರಣ ಗೆ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +588,From Supplier Quotation,ಸರಬರಾಜುದಾರ ಉದ್ಧರಣ ಗೆ
 DocType: Deduction Type,Deduction Type,ಕಡಿತವು ಕೌಟುಂಬಿಕತೆ
 DocType: Attendance,Half Day,ಅರ್ಧ ದಿನ
 DocType: Pricing Rule,Min Qty,ಮಿನ್ ಪ್ರಮಾಣ
 DocType: Features Setup,"To track items in sales and purchase documents with batch nos. ""Preferred Industry: Chemicals""",ಬ್ಯಾಚ್ ಸೂಲ ಜೊತೆ ಮಾರಾಟ ಮತ್ತು ಖರೀದಿ ದಾಖಲೆಗಳಲ್ಲಿ ಐಟಂಗಳನ್ನು ಟ್ರ್ಯಾಕ್. &quot;ಮೆಚ್ಚಿನ ಇಂಡಸ್ಟ್ರಿ: ರಾಸಾಯನಿಕಗಳು&quot;
 DocType: GL Entry,Transaction Date,TransactionDate
 DocType: Production Plan Item,Planned Qty,ಯೋಜಿಸಿದ ಪ್ರಮಾಣ
-apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +91,Total Tax,ಒಟ್ಟು ತೆರಿಗೆ
+apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +93,Total Tax,ಒಟ್ಟು ತೆರಿಗೆ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +178,For Quantity (Manufactured Qty) is mandatory,ಪ್ರಮಾಣ (ಪ್ರಮಾಣ ತಯಾರಿಸಲ್ಪಟ್ಟ) ಕಡ್ಡಾಯ
 DocType: Stock Entry,Default Target Warehouse,ಡೀಫಾಲ್ಟ್ ಟಾರ್ಗೆಟ್ ವೇರ್ಹೌಸ್
 DocType: Purchase Invoice,Net Total (Company Currency),ನೆಟ್ ಒಟ್ಟು ( ಕಂಪನಿ ಕರೆನ್ಸಿ )
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +79,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,ಸಾಲು {0}: ಪಕ್ಷದ ಕೌಟುಂಬಿಕತೆ ಮತ್ತು ಪಕ್ಷದ ಸ್ವೀಕರಿಸುವಂತಹ / ಪಾವತಿಸಲಾಗುವುದು ಖಾತೆಯನ್ನು ವಿರುದ್ಧ ಮಾತ್ರ ಅನ್ವಯವಾಗುತ್ತದೆ
 DocType: Notification Control,Purchase Receipt Message,ಖರೀದಿ ರಸೀತಿ ಸಂದೇಶ
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +95,Total allocated leaves are more than period,ಒಟ್ಟು ಹಂಚಿಕೆ ಎಲೆಗಳು ಅವಧಿಯಲ್ಲಿ ಹೆಚ್ಚು
 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.,ರೆಕಾರ್ಡ್ ಐಟಂ ಚಳುವಳಿ .
 DocType: Newsletter List Subscriber,Newsletter List Subscriber,ಸುದ್ದಿಪತ್ರ ಪಟ್ಟಿ ಚಂದಾದಾರ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +164,Morticing,Morticing
 DocType: Email Account,Service,ಸೇವೆ
 DocType: Hub Settings,Hub Settings,ಹಬ್ ಸೆಟ್ಟಿಂಗ್ಗಳು
 DocType: Project,Gross Margin %,ಒಟ್ಟು ಅಂಚು %
 DocType: BOM,With Operations,ಕಾರ್ಯಾಚರಣೆ
 apps/erpnext/erpnext/accounts/party.py +232,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,ಲೆಕ್ಕಪರಿಶೋಧಕ ನಮೂದುಗಳನ್ನು ಈಗಾಗಲೇ ಕರೆನ್ಸಿ ಮಾಡಲಾಗಿದೆ {0} ಕಂಪನಿಗೆ {1}. ಕರೆನ್ಸಿಯ ಜತೆ ಸ್ವೀಕೃತಿ ಅಥವಾ ಕೊಡಬೇಕಾದ ಖಾತೆಯನ್ನು ಆಯ್ಕೆಮಾಡಿ {0}.
 ,Monthly Salary Register,ಮಾಸಿಕ ವೇತನ ನೋಂದಣಿ
-apps/frappe/frappe/website/template.py +140,Next,ಮುಂದೆ
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard_page.html +17,Next,ಮುಂದೆ
 DocType: Warranty Claim,If different than customer address,ಗ್ರಾಹಕ ವಿಳಾಸಕ್ಕೆ ವಿಭಿನ್ನವಾದ
 DocType: BOM Operation,BOM Operation,BOM ಕಾರ್ಯಾಚರಣೆ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +118,Electropolishing,ವಿದ್ಯುದ್ಮೆರಗು
 DocType: Purchase Taxes and Charges,On Previous Row Amount,ಹಿಂದಿನ ಸಾಲು ಪ್ರಮಾಣ ರಂದು
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +24,Please enter Payment Amount in atleast one row,ಕನಿಷ್ಠ ಒಂದು ಸತತವಾಗಿ ಪಾವತಿ ಪ್ರಮಾಣವನ್ನು ನಮೂದಿಸಿ
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +33,Please enter Payment Amount in atleast one row,ಕನಿಷ್ಠ ಒಂದು ಸತತವಾಗಿ ಪಾವತಿ ಪ್ರಮಾಣವನ್ನು ನಮೂದಿಸಿ
 DocType: POS Profile,POS Profile,ಪಿಓಎಸ್ ವಿವರ
 apps/erpnext/erpnext/config/accounts.py +153,"Seasonality for setting budgets, targets etc.","ಸ್ಥಾಪನೆಗೆ ಬಜೆಟ್, ಗುರಿಗಳನ್ನು ಇತ್ಯಾದಿ ಋತುಮಾನ"
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +238,Row {0}: Payment Amount cannot be greater than Outstanding Amount,ಸಾಲು {0}: ಪಾವತಿ ಪ್ರಮಾಣವನ್ನು ಬಾಕಿ ಮೊತ್ತದ ಹೆಚ್ಚಿನ ಸಾಧ್ಯವಿಲ್ಲ
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +46,Total Unpaid,ಪೇಯ್ಡ್ ಒಟ್ಟು
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +21,Time Log is not billable,ಟೈಮ್ ಲಾಗ್ ಬಿಲ್ ಮಾಡಬಹುದಾದ ಅಲ್ಲ
 apps/erpnext/erpnext/stock/get_item_details.py +128,"Item {0} is a template, please select one of its variants","{0} ಐಟಂ ಒಂದು ಟೆಂಪ್ಲೇಟ್ ಆಗಿದೆ, ಅದರ ರೂಪಾಂತರಗಳು ಒಂದಾಗಿದೆ ಆಯ್ಕೆ ಮಾಡಿ"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +528,Purchaser,ಖರೀದಿದಾರ
+apps/erpnext/erpnext/public/js/setup_wizard.js +272,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 +71,Please enter the Against Vouchers manually,ಕೈಯಾರೆ ವಿರುದ್ಧ ರಶೀದಿ ನಮೂದಿಸಿ
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +107,Please enter the Against Vouchers manually,ಕೈಯಾರೆ ವಿರುದ್ಧ ರಶೀದಿ ನಮೂದಿಸಿ
 DocType: SMS Settings,Static Parameters,ಸ್ಥಾಯೀ ನಿಯತಾಂಕಗಳನ್ನು
 DocType: Purchase Order,Advance Paid,ಅಡ್ವಾನ್ಸ್ ಪಾವತಿಸಿದ
 DocType: Item,Item Tax,ಐಟಂ ತೆರಿಗೆ
@@ -3947,14 +3785,12 @@
 apps/erpnext/erpnext/config/crm.py +48,Send mass SMS to your contacts,ನಿಮ್ಮ ಸಂಪರ್ಕಗಳಿಗೆ ಸಾಮೂಹಿಕ SMS ಕಳುಹಿಸಿ
 DocType: Purchase Taxes and Charges,Consider Tax or Charge for,ತೆರಿಗೆ ಅಥವಾ ಶುಲ್ಕ ಪರಿಗಣಿಸಿ
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,ನಿಜವಾದ ಪ್ರಮಾಣ ಕಡ್ಡಾಯ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +42,Cross-rolling,ಕ್ರಾಸ್ ರೋಲಿಂಗ್
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +132,Credit Card,ಕ್ರೆಡಿಟ್ ಕಾರ್ಡ್
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +132,Credit Card,ಕ್ರೆಡಿಟ್ ಕಾರ್ಡ್
 DocType: BOM,Item to be manufactured or repacked,ಉತ್ಪಾದಿತ ಅಥವಾ repacked ಎಂದು ಐಟಂ
 apps/erpnext/erpnext/config/stock.py +95,Default settings for stock transactions.,ಸ್ಟಾಕ್ ವ್ಯವಹಾರ ಡೀಫಾಲ್ಟ್ ಸೆಟ್ಟಿಂಗ್ಗಳನ್ನು .
 DocType: Purchase Invoice,Next Date,NextDate
 DocType: Employee Education,Major/Optional Subjects,ಮೇಜರ್ / ಐಚ್ಛಿಕ ವಿಷಯಗಳ
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +49,Please enter Taxes and Charges,ತೆರಿಗೆಗಳು ಮತ್ತು ಶುಲ್ಕಗಳು ನಮೂದಿಸಿ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +85,Machining,ಯಂತ್ರಗಳ
 DocType: Sales Invoice Item,Drop Ship,ಡ್ರಾಪ್ ಹಡಗು
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","ಇಲ್ಲಿ ನೀವು ಮೂಲ , ಹೆಂಡತಿ ಮತ್ತು ಮಕ್ಕಳ ಹೆಸರು ಮತ್ತು ಉದ್ಯೋಗ ಕುಟುಂಬ ವಿವರಗಳು ಕಾಯ್ದುಕೊಳ್ಳಬಹುದು"
 DocType: Hub Settings,Seller Name,ಮಾರಾಟಗಾರ ಹೆಸರು
@@ -3964,7 +3800,7 @@
 DocType: Stock Entry,Repack,ಮೂಟೆಕಟ್ಟು
 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/setup/page/setup_wizard/setup_wizard.js +500,Attach Logo,ಲೋಗೋ ಲಗತ್ತಿಸಿ
+apps/erpnext/erpnext/public/js/setup_wizard.js +246,Attach Logo,ಲೋಗೋ ಲಗತ್ತಿಸಿ
 DocType: Customer,Commission Rate,ಕಮಿಷನ್ ದರ
 apps/erpnext/erpnext/stock/doctype/item/item.js +38,Make Variant,ಭಿನ್ನ ಮಾಡಿ
 apps/erpnext/erpnext/config/hr.py +145,Block leave applications by department.,ಇಲಾಖೆ ರಜೆ ಅನ್ವಯಗಳನ್ನು ನಿರ್ಬಂಧಿಸಿ .
@@ -3979,19 +3815,19 @@
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +105,Please select a csv file,ಒಂದು CSV ಕಡತ ಆಯ್ಕೆ ಮಾಡಿ
 DocType: Dropbox Backup,Send Backups to Dropbox,ಡ್ರಾಪ್ಬಾಕ್ಸ್ ಬ್ಯಾಕ್ಅಪ್ಗಳು ಕಳುಹಿಸಿ
 DocType: Purchase Order,To Receive and Bill,ಸ್ವೀಕರಿಸಿ ಮತ್ತು ಬಿಲ್
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +94,Designer,ಡಿಸೈನರ್
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Designer,ಡಿಸೈನರ್
 apps/erpnext/erpnext/config/selling.py +121,Terms and Conditions Template,ನಿಯಮಗಳು ಮತ್ತು ನಿಯಮಗಳು ಟೆಂಪ್ಲೇಟು
 DocType: Serial No,Delivery Details,ಡೆಲಿವರಿ ವಿವರಗಳು
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +383,Cost Center is required in row {0} in Taxes table for type {1},ವೆಚ್ಚ ಸೆಂಟರ್ ಸಾಲು ಅಗತ್ಯವಿದೆ {0} ತೆರಿಗೆಗಳು ಕೋಷ್ಟಕದಲ್ಲಿ ಮಾದರಿ {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +386,Cost Center is required in row {0} in Taxes table for type {1},ವೆಚ್ಚ ಸೆಂಟರ್ ಸಾಲು ಅಗತ್ಯವಿದೆ {0} ತೆರಿಗೆಗಳು ಕೋಷ್ಟಕದಲ್ಲಿ ಮಾದರಿ {1}
 DocType: Item,Automatically create Material Request if quantity falls below this level,ಪ್ರಮಾಣ ಈ ಮಟ್ಟಕ್ಕಿಂತಲೂ ಕಳಗೆ ಬಿದ್ದಲ್ಲಿ ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಮೆಟೀರಿಯಲ್ ವಿನಂತಿ ರಚಿಸಲು
 ,Item-wise Purchase Register,ಐಟಂ ಬುದ್ಧಿವಂತ ಖರೀದಿ ನೋಂದಣಿ
 DocType: Batch,Expiry Date,ಅಂತ್ಯ ದಿನಾಂಕ
-apps/erpnext/erpnext/stock/doctype/item/item.py +375,"To set reorder level, item must be a Purchase Item or Manufacturing Item","ಮರುಕ್ರಮಗೊಳಿಸಿ ಮಟ್ಟದ ಹೊಂದಿಸಲು, ಐಟಂ ಖರೀದಿ ಐಟಂ ಅಥವಾ ಮ್ಯಾನುಫ್ಯಾಕ್ಚರಿಂಗ್ ಐಟಂ ಇರಬೇಕು"
+apps/erpnext/erpnext/stock/doctype/item/item.py +379,"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.,ಪ್ರಾಜೆಕ್ಟ್ ಮಾಸ್ಟರ್ .
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,ಮುಂದಿನ ಕರೆನ್ಸಿಗಳ $ ಇತ್ಯಾದಿ ಯಾವುದೇ ಸಂಕೇತ ತೋರಿಸುವುದಿಲ್ಲ.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +330, (Half Day),(ಅರ್ಧ ದಿನ)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +374, (Half Day),(ಅರ್ಧ ದಿನ)
 DocType: Supplier,Credit Days,ಕ್ರೆಡಿಟ್ ಡೇಸ್
 DocType: Leave Type,Is Carry Forward,ಮುಂದಕ್ಕೆ ಸಾಗಿಸುವ ಇದೆ
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +478,Get Items from BOM,BOM ಐಟಂಗಳು ಪಡೆಯಿರಿ
@@ -3999,7 +3835,7 @@
 apps/erpnext/erpnext/config/manufacturing.py +120,Bill of Materials,ಸಾಮಗ್ರಿಗಳ ಬಿಲ್ಲು
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +77,Row {0}: Party Type and Party is required for Receivable / Payable account {1},ಸಾಲು {0}: ಪಕ್ಷದ ಕೌಟುಂಬಿಕತೆ ಮತ್ತು ಪಕ್ಷದ ಸ್ವೀಕರಿಸುವಂತಹ / ಪಾವತಿಸಲಾಗುವುದು ಖಾತೆಯನ್ನು ಅಗತ್ಯವಿದೆ {1}
 DocType: Dropbox Backup,Send Notifications To,ಅಧಿಸೂಚನೆಗಳನ್ನು ಕಳುಹಿಸಿ
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html +26,Ref Date,ಉಲ್ಲೇಖ ದಿನಾಂಕ
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +54,Ref Date,ಉಲ್ಲೇಖ ದಿನಾಂಕ
 DocType: Employee,Reason for Leaving,ಲೀವಿಂಗ್ ಕಾರಣ
 DocType: Expense Claim Detail,Sanctioned Amount,ಮಂಜೂರಾದ ಹಣದಲ್ಲಿ
 DocType: GL Entry,Is Opening,ಆರಂಭ
@@ -4007,4 +3843,3 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +188,Account {0} does not exist,ಖಾತೆ {0} ಅಸ್ತಿತ್ವದಲ್ಲಿಲ್ಲ
 DocType: Account,Cash,ನಗದು
 DocType: Employee,Short biography for website and other publications.,ವೆಬ್ಸೈಟ್ ಮತ್ತು ಇತರ ಪ್ರಕಟಣೆಗಳು ಕಿರು ಜೀವನಚರಿತ್ರೆ.
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +31,Please create Salary Structure for employee {0},ನೌಕರ ಸಂಬಳ ರಚನೆ ರಚಿಸಲು ದಯವಿಟ್ಟು {0}
diff --git a/erpnext/translations/ko.csv b/erpnext/translations/ko.csv
index 75c7dc3..c9e368f 100644
--- a/erpnext/translations/ko.csv
+++ b/erpnext/translations/ko.csv
@@ -1,13 +1,12 @@
 DocType: Employee,Salary Mode,급여 모드
 DocType: Cost Center,"Select Monthly Distribution, if you want to track based on seasonality.","당신은 계절에 따라 추적 할 경우, 월별 분포를 선택합니다."
 DocType: Employee,Divorced,이혼
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +86,Warning: Same item has been entered multiple times.,경고 : 동일한 항목을 복수 회 입력되었습니다.
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +80,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,항목은 트랜잭션에 여러 번 추가 할 수
 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/page/setup_wizard/fixtures/industry_type.py +19,Consumer Products,소비자 제품
+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,첫 번째 파티 유형을 선택하십시오
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +90,Annealing,가열 냉각
 DocType: Item,Customer Items,고객 항목
 apps/erpnext/erpnext/accounts/doctype/account/account.py +45,Account {0}: Parent account {1} can not be a ledger,계정 {0} : 부모 계정은 {1} 원장이 될 수 없습니다
 DocType: Item,Publish Item to hub.erpnext.com,hub.erpnext.com에 항목을 게시
@@ -20,15 +19,14 @@
 DocType: About Us Settings,Website,웹사이트
 DocType: POS Profile,Applicable for User,사용자에 대한 적용
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +169,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","중지 생산 주문이 취소 될 수 없으며, 취소 먼저 ...의 마개를 따다"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +23,Compaction plus sintering,다짐 플러스 소결
 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.,* 트랜잭션에서 계산됩니다.
 DocType: Purchase Order,Customer Contact,고객 연락처
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +549,From Material Request,자료 요청에서
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +572,From Material Request,자료 요청에서
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} 트리
 DocType: Job Applicant,Job Applicant,구직자
 apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,더 이상 결과가 없습니다.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +78,Legal,법률
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +34,Legal,법률
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +114,Actual type tax cannot be included in Item rate in row {0},실제의 형태 세금은 행의 항목 요금에 포함 할 수없는 {0}
 DocType: C-Form,Customer,고객
 DocType: Purchase Receipt Item,Required By,에 의해 필요한
@@ -43,7 +41,6 @@
 DocType: Manufacturing Settings,Default 10 mins,10 분을 기본
 DocType: Leave Type,Leave Type Name,유형 이름을 남겨주세요
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +148,Series Updated Successfully,시리즈가 업데이트
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +150,Stitching,바느질
 DocType: Pricing Rule,Apply On,에 적용
 DocType: Item Price,Multiple Item prices.,여러 품목의 가격.
 ,Purchase Order Items To Be Received,수신 될 구매 주문 아이템
@@ -51,8 +48,8 @@
 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 +104,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 +189,New Leave Application,새로운 허가 신청
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +134,Bank Draft,은행 어음
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +204,New Leave Application,새로운 허가 신청
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +134,Bank Draft,은행 어음
 DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,1고객 현명한 항목 코드를 유지하고 자신의 코드 사용이 옵션에 따라이를 검색 할 수 있도록
 DocType: Mode of Payment Account,Mode of Payment Account,지불 계정의 모드
 apps/erpnext/erpnext/stock/doctype/item/item.js +34,Show Variants,쇼 변형
@@ -64,25 +61,23 @@
 DocType: Production Plan Item,Production Plan Item,생산 계획 항목
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +141,User {0} is already assigned to Employee {1},사용자 {0}이 (가) 이미 직원에 할당 된 {1}
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +13,Make new POS Profile,새로운 POS의 프로필을
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +31,Health Care,건강 관리
+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 +494,Invoice,송장
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +519,Invoice,송장
 DocType: Maintenance Schedule Item,Periodicity,주기성
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +357,Email Address,이메일 주소
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +21,Defense,방어
+apps/erpnext/erpnext/public/js/setup_wizard.js +107,Email Address,이메일 주소
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,방어
 DocType: Company,Abbr,약어
 DocType: Appraisal Goal,Score (0-5),점수 (0-5)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +193,Row {0}: {1} {2} does not match with {3},행 {0} : {1} {2}과 일치하지 않는 {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +67,Row # {0}:,행 번호 {0} :
 DocType: Delivery Note,Vehicle No,차량 없음
 apps/erpnext/erpnext/public/js/pos/pos.js +528,Please select Price List,가격리스트를 선택하세요
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +162,Woodworking,목공
 DocType: Production Order Operation,Work In Progress,진행중인 작업
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +153,3D printing,3D 프린팅
 DocType: Employee,Holiday List,휴일 목록
 DocType: Time Log,Time Log,소요시간 로그
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +530,Accountant,회계사
+apps/erpnext/erpnext/public/js/setup_wizard.js +274,Accountant,회계사
 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.","활동 로그, 결제 시간을 추적하기 위해 사용할 수있는 작업에 대한 사용자에 의해 수행."
@@ -98,18 +93,19 @@
 DocType: Bin,Quantity Requested for Purchase,구매를 위해 요청한 수량
 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/setup/page/setup_wizard/setup_wizard.js +626,Kg,KG
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Kg,KG
 apps/erpnext/erpnext/config/hr.py +48,Opening for a Job.,작업에 대한 열기.
 DocType: Item Attribute,Increment,증가
 apps/erpnext/erpnext/public/js/stock_analytics.js +63,Select Warehouse...,창고를 선택합니다 ...
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +6,Advertising,광고
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,광고
+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/doctype/sales_invoice/sales_invoice.py +389,Stock cannot be updated against Delivery Note {0},스톡 배달 주에 업데이트 할 수 없습니다 {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +391,Stock cannot be updated against Delivery Note {0},스톡 배달 주에 업데이트 할 수 없습니다 {0}
 DocType: Payment Reconciliation,Reconcile,조정
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +30,Grocery,식료품 점
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,식료품 점
 DocType: Quality Inspection Reading,Reading 1,읽기 1
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Make Bank Entry,은행 입장 확인
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +40,Pension Funds,연금 펀드
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,연금 펀드
 apps/erpnext/erpnext/accounts/doctype/account/account.py +142,Warehouse is mandatory if account type is Warehouse,계정 유형이 창고인 경우 창고는 필수입니다
 DocType: SMS Center,All Sales Person,모든 판매 사람
 DocType: Lead,Person Name,사람 이름
@@ -131,7 +127,7 @@
 DocType: Quality Inspection,Get Specification Details,사양 세부 사항을 얻을
 DocType: Lead,Interested,관심
 apps/erpnext/erpnext/config/manufacturing.py +14,Bill of Material,자재 명세서 (BOM)
-apps/erpnext/erpnext/public/js/stock_analytics.js +45,Opening,열기
+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,상품 그룹에서 복사
 DocType: Journal Entry,Opening Entry,항목 열기
@@ -145,23 +141,22 @@
 DocType: Employee Education,Under Graduate,대학원에서
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +22,Target On,대상에
 DocType: BOM,Total Cost,총 비용
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +99,Reaming,리밍
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +9,Activity Log:,활동 로그 :
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +199,Item {0} does not exist in the system or has expired,{0} 항목을 시스템에 존재하지 않거나 만료
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +44,Real Estate,부동산
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +44,Real Estate,부동산
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +4,Statement of Account,거래명세표
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +41,Pharmaceuticals,제약
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,제약
 DocType: Expense Claim Detail,Claim Amount,청구 금액
 DocType: Employee,Mr,씨
 DocType: Custom Script,Client,클라이언트
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,공급 업체 유형 / 공급 업체
 DocType: Naming Series,Prefix,접두사
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Consumable,소모품
+apps/erpnext/erpnext/public/js/setup_wizard.js +359,Consumable,소모품
 DocType: Upload Attendance,Import Log,가져 오기 로그
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.js +19,Send,보내기
 DocType: Sales Invoice Item,Delivered By Supplier,공급 업체에 의해 전달
 DocType: SMS Center,All Contact,모든 연락처
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +164,Annual Salary,연봉
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +164,Annual Salary,연봉
 DocType: Period Closing Voucher,Closing Fiscal Year,회계 연도 결산
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +69,Stock Expenses,재고 비용
 DocType: Newsletter,Email Sent?,이메일 전송?
@@ -169,7 +164,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +92,Show Time Logs,시간 표시 로그
 DocType: Journal Entry Account,Credit in Company Currency,회사 통화 신용
 DocType: Delivery Note,Installation Status,설치 상태
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +115,Accepted + Rejected Qty must be equal to Received quantity for Item {0},수락 + 거부 수량이 항목에 대한 수신 수량이 동일해야합니다 {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +118,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 +133,Item {0} must be a Purchase Item,{0} 항목을 구매 상품이어야합니다
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
@@ -177,19 +172,17 @@
  선택한 기간의 모든 날짜와 직원 조합은 기존의 출석 기록과 함께, 템플릿에 올 것이다"
 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 +493,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","행에있는 세금을 포함하려면 {0} 항목의 요금에, 행의 세금은 {1}도 포함되어야한다"
+apps/erpnext/erpnext/controllers/accounts_controller.py +494,"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 +90,Settings for HR Module,HR 모듈에 대한 설정
 DocType: SMS Center,SMS Center,SMS 센터
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +78,Straightening,스트레이트
 DocType: BOM Replace Tool,New BOM,새로운 BOM
 apps/erpnext/erpnext/config/projects.py +28,Batch Time Logs for billing.,일괄 결제를위한 시간 로그.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +15,Countergravity casting,중력식 주조
 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/setup/page/setup_wizard/fixtures/industry_type.py +14,Broadcasting,방송
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +140,Execution,실행
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +364,The first user will become the System Manager (you can change this later).,시스템 관리자가 될 것이다 첫 번째 사용자 (이 나중에 변경할 수 있습니다).
+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/public/js/setup_wizard.js +114,The first user will become the System Manager (you can change this later).,시스템 관리자가 될 것이다 첫 번째 사용자 (이 나중에 변경할 수 있습니다).
 apps/erpnext/erpnext/config/manufacturing.py +39,Details of the operations carried out.,작업의 세부 사항은 실시.
 DocType: Serial No,Maintenance Status,유지 보수 상태
 apps/erpnext/erpnext/config/stock.py +263,Items and Pricing,품목 및 가격
@@ -206,7 +199,6 @@
 DocType: Pricing Rule,Discount on Price List Rate (%),가격 목록 요금에 할인 (%)
 apps/frappe/frappe/public/js/frappe/form/print.js +96,Start,시작
 DocType: User,First Name,이름
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +12,Full-mold casting,풀 몰드 주조
 DocType: Offer Letter,Select Terms and Conditions,이용 약관 선택
 DocType: Production Planning Tool,Sales Orders,판매 주문
 DocType: Purchase Taxes and Charges,Valuation,평가
@@ -218,8 +210,7 @@
 DocType: Bank Reconciliation,Bank Account,은행 계좌
 DocType: Leave Type,Allow Negative Balance,음의 균형이 허용
 DocType: Selling Settings,Default Territory,기본 지역
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +53,Television,텔레비전
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +138,Gashing,Gashing
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,텔레비전
 DocType: Production Order Operation,Updated via 'Time Log','소요시간 로그'를 통해 업데이트 되었습니다.
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +82,Account {0} does not belong to Company {1},계정 {0}이 회사에 속하지 않는 {1}
 DocType: Naming Series,Series List for this Transaction,이 트랜잭션에 대한 시리즈 일람
@@ -234,14 +225,13 @@
 DocType: Leave Allocation,Add unused leaves from previous allocations,이전 할당에서 사용하지 않는 잎 추가
 apps/erpnext/erpnext/controllers/recurring_document.py +206,Next Recurring {0} will be created on {1},다음 반복 {0} 생성됩니다 {1}
 DocType: Newsletter List,Total Subscribers,총 구독자
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +575,Contact Name,담당자 이름
+,Contact Name,담당자 이름
 DocType: Production Plan Item,SO Pending Qty,SO 보류 수량
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,위에서 언급 한 기준에 대한 급여 명세서를 작성합니다.
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,구입 요청합니다.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +107,Double housing,두 주택
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +156,Only the selected Leave Approver can submit this Leave Application,만 선택 안함 승인자이 허가 신청을 제출할 수 있습니다
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +171,Only the selected Leave Approver can submit this Leave Application,만 선택 안함 승인자이 허가 신청을 제출할 수 있습니다
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,날짜를 완화하는 것은 가입 날짜보다 커야합니다
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +172,Leaves per Year,연간 잎
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +172,Leaves per Year,연간 잎
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup > Settings > Naming Series,{0} 설정&gt; 설정을 통해&gt; 명명 시리즈에 대한 시리즈를 명명 설정을하세요
 DocType: Time Log,Will be updated when batched.,일괄 처리 할 때 업데이트됩니다.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +104,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,행 {0} : 확인하시기 바랍니다이 계정에 대한 '사전인가'{1}이 사전 항목 인 경우.
@@ -250,25 +240,24 @@
 DocType: Item Website Specification,Item Website Specification,항목 웹 사이트 사양
 DocType: Dropbox Backup,Dropbox Access Key,보관 용 액세스 키
 DocType: Payment Tool,Reference No,참조 번호
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +348,Leave Blocked,남겨 차단
-apps/erpnext/erpnext/stock/doctype/item/item.py +535,Item {0} has reached its end of life on {1},항목 {0}에 수명이 다한 {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +392,Leave Blocked,남겨 차단
+apps/erpnext/erpnext/stock/doctype/item/item.py +539,Item {0} has reached its end of life on {1},항목 {0}에 수명이 다한 {1}
 apps/erpnext/erpnext/accounts/utils.py +339,Annual,연간
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,재고 조정 항목
 DocType: Stock Entry,Sales Invoice No,판매 송장 번호
 DocType: Material Request Item,Min Order Qty,최소 주문 수량
 DocType: Lead,Do Not Contact,연락하지 말라
 DocType: Sales Invoice,The unique id for tracking all recurring invoices. It is generated on submit.,모든 반복 송장을 추적하는 고유 ID.그것은 제출에 생성됩니다.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +93,Software Developer,소프트웨어 개발자
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +93,Software Developer,소프트웨어 개발자
 DocType: Item,Minimum Order Qty,최소 주문 수량
 DocType: Pricing Rule,Supplier Type,공급 업체 유형
 DocType: Item,Publish in Hub,허브에 게시
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +555,Item {0} is cancelled,{0} 항목 취소
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +598,Material Request,자료 요청
+apps/erpnext/erpnext/stock/doctype/item/item.py +559,Item {0} is cancelled,{0} 항목 취소
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +607,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},구매 주문에 &#39;원료 공급&#39;테이블에없는 항목 {0} {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +129,Wire brushing,와이어 브러싱
 DocType: Employee,Relation,관계
 DocType: Shipping Rule,Worldwide Shipping,해외 배송
 apps/erpnext/erpnext/config/selling.py +23,Confirmed orders from Customers.,고객의 확정 주문.
@@ -284,12 +273,11 @@
 DocType: Supplier,Address HTML,주소 HTML
 DocType: Lead,Mobile No.,모바일 번호
 DocType: Maintenance Schedule,Generate Schedule,일정을 생성
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +81,Hubbing,Hubbing
 DocType: Purchase Invoice Item,Expense Head,비용 헤드
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +86,Please select Charge Type first,충전 유형을 먼저 선택하세요
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,최근
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +395,Max 5 characters,최대 5 자
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +195,Select Your Language,언어를 선택하십시오
+apps/erpnext/erpnext/public/js/setup_wizard.js +143,Max 5 characters,최대 5 자
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +245,Select Your Language,언어를 선택하십시오
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,목록의 첫 번째 허가 승인자는 기본 남겨 승인자로 설정됩니다
 DocType: Manufacturing Settings,"Disables creation of time logs against Production Orders.
 Operations shall not be tracked against Production Order",생산 오더에 대한 시간 로그의 생성을 사용하지 않습니다. 작업은 생산 오더에 대해 추적 할 수 없다
@@ -301,8 +289,6 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +34,Item {0} must be Service Item,항목 {0} 서비스 상품이어야합니다
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +303,Completed Qty can not be greater than 'Qty to Manufacture',보다 '수량 제조하는'완료 수량은 클 수 없습니다
 DocType: DocType,Administrator,관리자
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +136,Laser drilling,레이저 드릴링
-DocType: Stock UOM Replace Utility,New Stock UOM,새로운 재고 UOM
 DocType: Period Closing Voucher,Closing Account Head,마감 계정 헤드
 DocType: Employee,External Work History,외부 작업의 역사
 apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,순환 참조 오류
@@ -311,18 +297,15 @@
 DocType: Lead,Industry,산업
 DocType: Employee,Job Profile,작업 프로필
 DocType: Newsletter,Newsletter,뉴스레터
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +84,Hydroforming,하이드로 포밍
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +49,Necking,네킹
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,자동 자료 요청의 생성에 이메일로 통보
 DocType: Journal Entry,Multi Currency,멀티 통화
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +51,Item is updated,항목이 업데이트됩니다
 DocType: Async Task,System Manager,시스템 관리자
 DocType: Payment Reconciliation Invoice,Invoice Type,송장 유형
 DocType: Sales Invoice Item,Delivery Note,상품 수령증
 DocType: Dropbox Backup,Allow Dropbox Access,보관 용 접근이 허용
 apps/erpnext/erpnext/config/learn.py +72,Setting up Taxes,세금 설정
 apps/erpnext/erpnext/accounts/utils.py +189,Payment Entry has been modified after you pulled it. Please pull it again.,당신이 그것을 끌어 후 결제 항목이 수정되었습니다.다시 당깁니다.
-apps/erpnext/erpnext/stock/doctype/item/item.py +343,{0} entered twice in Item Tax,{0} 항목의 세금에 두 번 입력
+apps/erpnext/erpnext/stock/doctype/item/item.py +347,{0} entered twice in Item Tax,{0} 항목의 세금에 두 번 입력
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +105,Summary for this week and pending activities,이번 주 보류중인 활동에 대한 요약
 DocType: Workstation,Rent Cost,임대 비용
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +74,Please select month and year,월 및 연도를 선택하세요
@@ -339,24 +322,22 @@
 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","BOM, 배달 참고, 구매 송장, 생산 주문, 구매 주문, 구입 영수증, 견적서, 판매 주문, 재고 항목, 작업 표에서 사용 가능"
 DocType: Item Tax,Tax Rate,세율
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Select Item,항목 선택
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +540,Select Item,항목 선택
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +143,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","항목 : {0} 배치 식, 대신 사용 재고 항목 \
  재고 조정을 사용하여 조정되지 않는 경우가 있습니다 관리"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +259,Purchase Invoice {0} is already submitted,구매 송장 {0}이 (가) 이미 제출
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +262,Purchase Invoice {0} is already submitted,구매 송장 {0}이 (가) 이미 제출
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Batch No must be same as {1} {2},행 번호 {0} : 일괄 없음은 동일해야합니다 {1} {2}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Convert to non-Group,비 그룹으로 변환
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +55,Purchase Receipt must be submitted,구매 영수증을 제출해야합니다
-DocType: Stock UOM Replace Utility,Current Stock UOM,현재 재고 UOM
 apps/erpnext/erpnext/config/stock.py +53,Batch (lot) of an Item.,항목의 일괄처리 (lot).
 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}
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Your email address,귀하의 이메일 주소
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +194,Please see attachment,첨부 파일을 참조하시기 바랍니다
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +203,Please see attachment,첨부 파일을 참조하시기 바랍니다
 DocType: Purchase Order,% Received,% 수신
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +109,Water jet cutting,워터 제트 절단
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +24,Setup Already Complete!!,이미 설치 완료!
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +20,Setup Already Complete!!,이미 설치 완료!
 ,Finished Goods,완성품
 DocType: Delivery Note,Instructions,지침
 DocType: Quality Inspection,Inspected By,검사
@@ -371,6 +352,7 @@
 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,환전
 DocType: Purchase Invoice Item,Item Name,품명
+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","""재고 없음""이다 요구되는 항목은 예상 수량 및 최소 주문 수량에 따라 모든 창고를 고려"
@@ -380,11 +362,10 @@
 ,Purchase Register,회원에게 구매
 DocType: Landed Cost Item,Applicable Charges,적용 요금
 DocType: Workstation,Consumable Cost,소모품 비용
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,{0} ({1}) must have role 'Leave Approver',{0} ({1}) 역할이 있어야합니다 '휴가 승인'
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +167,{0} ({1}) must have role 'Leave Approver',{0} ({1}) 역할이 있어야합니다 '휴가 승인'
 DocType: Purchase Receipt,Vehicle Date,차량 날짜
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +39,Medical,의료
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +39,Medical,의료
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,잃는 이유
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +36,Tube beading,튜브 구슬
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},워크 스테이션 홀리데이 목록에 따라 다음과 같은 날짜에 닫혀 : {0}
 DocType: Employee,Single,미혼
 DocType: Issue,Attachment,첨부
@@ -405,10 +386,8 @@
 DocType: Account,Is Group,IS 그룹
 DocType: Stock Settings,Automatically Set Serial Nos based on FIFO,자동으로 FIFO를 기반으로 제 직렬 설정
 DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,체크 공급 업체 송장 번호 특이 사항
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +31,Thermoforming,열 성형
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +66,Slitting,슬리 팅
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +57,'To Case No.' cannot be less than 'From Case No.','사건 번호 사람' '사건 번호에서'보다 작을 수 없습니다
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +104,Non Profit,비영리
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +104,Non Profit,비영리
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_list.js +7,Not Started,시작되지 않음
 DocType: Lead,Channel Partner,채널 파트너
 DocType: Account,Old Parent,이전 부모
@@ -417,13 +396,12 @@
 apps/erpnext/erpnext/config/manufacturing.py +74,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 +512,Attribute {0} selected multiple times in Attributes Table,속성 {0} 속성 테이블에서 여러 번 선택
+apps/erpnext/erpnext/stock/doctype/item/item.py +516,Attribute {0} selected multiple times in Attributes Table,속성 {0} 속성 테이블에서 여러 번 선택
 DocType: Sales Order,Not Applicable,적용 할 수 없음
 apps/erpnext/erpnext/config/hr.py +140,Holiday master.,휴일 마스터.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +19,Shell molding,쉘 성형
 DocType: Material Request Item,Required Date,필요한 날짜
 DocType: Delivery Note,Billing Address,청구 주소
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +644,Please enter Item Code.,상품 코드를 입력 해 주시기 바랍니다.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +648,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,총 수량
@@ -433,7 +411,7 @@
 DocType: Item Attribute,To Range,범위
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,증권 및 예치금
 DocType: Features Setup,Imports,수입
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +144,Adhesive bonding,접착제 접합
+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.,출석 기록.
@@ -441,26 +419,25 @@
 DocType: Sales Order Item,Used for Production Plan,생산 계획에 사용
 DocType: System Settings,Loading...,로딩 중...
 DocType: DocField,Password,비밀번호
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +155,Fused deposition modeling,융착 모델링
 DocType: Manufacturing Settings,Time Between Operations (in mins),(분에) 작업 사이의 시간
 DocType: Customer,Buyer of Goods and Services.,제품 및 서비스의 구매자.
 DocType: Journal Entry,Accounts Payable,미지급금
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +24,Add Subscribers,가입자 추가
 apps/erpnext/erpnext/public/js/feature_setup.js +220,""" does not exists","""존재하지 않습니다"
 DocType: Pricing Rule,Valid Upto,유효한 개까지
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +564,List a few of your customers. They could be organizations or individuals.,고객의 몇 가지를 나열합니다.그들은 조직 또는 개인이 될 수 있습니다.
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,List a few of your customers. They could be organizations or individuals.,고객의 몇 가지를 나열합니다.그들은 조직 또는 개인이 될 수 있습니다.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Direct Income,직접 수입
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +33,"Can not filter based on Account, if grouped by Account","계정별로 분류하면, 계정을 기준으로 필터링 할 수 없습니다"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +88,Administrative Officer,관리 책임자
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Administrative Officer,관리 책임자
 DocType: Payment Tool,Received Or Paid,수신 또는 유료
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +318,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 +305,Please enter Warehouse for which Material Request will be raised,자료 요청이 발생합니다있는 창고를 입력 해주십시오
 DocType: Production Order,Additional Operating Cost,추가 운영 비용
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +20,Cosmetics,화장품
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,화장품
 DocType: DocField,Type,종류
-apps/erpnext/erpnext/stock/doctype/item/item.py +417,"To merge, following properties must be same for both items",병합하려면 다음과 같은 속성이 두 항목에 대해 동일해야합니다
+apps/erpnext/erpnext/stock/doctype/item/item.py +421,"To merge, following properties must be same for both items",병합하려면 다음과 같은 속성이 두 항목에 대해 동일해야합니다
 DocType: Communication,Subject,주제
 DocType: Shipping Rule,Net Weight,순중량
 DocType: Employee,Emergency Phone,긴급 전화
@@ -470,7 +447,6 @@
 DocType: Journal Entry,Difference (Dr - Cr),차이 (박사 - 크롬)
 DocType: Account,Profit and Loss,이익과 손실
 apps/erpnext/erpnext/config/stock.py +293,Managing Subcontracting,관리 하도급
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +58,New UOM must NOT be of type Whole Number,새 UOM 형 정수 가져야 할 필요는 없다
 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 +47,Account {0} does not belong to company: {1},계정 {0} 회사에 속하지 않는 {1}
@@ -490,14 +466,14 @@
 DocType: Purchase Invoice,Supplier Invoice No,공급 업체 송장 번호
 DocType: Territory,For reference,참고로
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +154,"Cannot delete Serial No {0}, as it is used in stock transactions","삭제할 수 없습니다 시리얼 번호 {0}, 그것은 증권 거래에 사용되는로"
-apps/erpnext/erpnext/public/js/account_tree_grid.js +52,Closing (Cr),결산 (CR)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +227,Closing (Cr),결산 (CR)
 DocType: Serial No,Warranty Period (Days),보증 기간 (일)
 DocType: Installation Note Item,Installation Note Item,설치 노트 항목
 ,Pending Qty,보류 수량
 DocType: Job Applicant,Thread HTML,스레드 HTML
 DocType: Company,Ignore,무시
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +86,SMS sent to following numbers: {0},SMS는 다음 번호로 전송 : {0}
-apps/erpnext/erpnext/controllers/buying_controller.py +135,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,하청 구입 영수증 필수 공급 업체 창고
+apps/erpnext/erpnext/controllers/buying_controller.py +126,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,하청 구입 영수증 필수 공급 업체 창고
 DocType: Pricing Rule,Valid From,유효
 DocType: Sales Invoice,Total Commission,전체위원회
 DocType: Pricing Rule,Sales Partner,영업 파트너
@@ -507,7 +483,7 @@
 To distribute a budget using this distribution, set this **Monthly Distribution** in the **Cost Center**","** 예산 월간 배분 ** 귀하의 비즈니스에 계절성이있는 경우 월별로 예산을 배분하는 데 도움이됩니다.
 
 ,이 분포를 사용하여 예산을 분배 ** 비용 센터에서 **이 ** 월간 배포를 설정하려면 **"
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +183,No records found in the Invoice table,송장 테이블에있는 레코드 없음
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +130,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 +84,Financial / accounting year.,금융 / 회계 연도.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","죄송합니다, 시리얼 NOS는 병합 할 수 없습니다"
@@ -523,25 +499,25 @@
 DocType: Sales Order,Billing and Delivery Status,결제 및 배송 상태
 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/setup/page/setup_wizard/setup_wizard_page.html +16,Previous,이전
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard_page.html +16,Previous,이전
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +620,Sales Return,판매로 돌아 가기
 DocType: Production Planning Tool,Select Sales Orders from which you want to create Production Orders.,당신이 생산 오더를 생성하려는 선택 판매 주문.
 DocType: Item,Delivered by Supplier (Drop Ship),공급 업체에 의해 전달 (드롭 선박)
 apps/erpnext/erpnext/config/hr.py +120,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.,고객 데이터베이스입니다.
 DocType: Quotation,Quotation To,에 견적
 DocType: Lead,Middle Income,중간 소득
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),오프닝 (CR)
 apps/erpnext/erpnext/accounts/utils.py +193,Allocated amount can not be negative,할당 된 금액은 음수 일 수 없습니다
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +123,Tumbling,텀블링
 DocType: Purchase Order Item,Billed Amt,청구 AMT 사의
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,재고 항목이 만들어지는에 대해 논리적 창고.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +92,Reference No & Reference Date is required for {0},참조 번호 및 참고 날짜가 필요합니다 {0}
 DocType: Event,Wednesday,수요일
 DocType: Sales Invoice,Customer's Vendor,고객의 공급 업체
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +214,Production Order is Mandatory,생산 오더는 필수입니다
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +139,Proposal Writing,제안서 작성
+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/stock/stock_ledger.py +336,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},음의 재고 오류 ({6}) 항목에 대한 {0} 창고 {1}에 {2} {3}에서 {4} {5}
 DocType: Fiscal Year Company,Fiscal Year Company,회계 연도 회사
@@ -564,7 +540,7 @@
 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/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.py +179,Please install dropbox python module,보관 용 파이썬 모듈을 설치하십시오
 DocType: Employee,Passport Number,여권 번호
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +82,Manager,관리자
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Manager,관리자
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +494,From Purchase Receipt,구매 영수증에서
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +219,Same item has been entered multiple times.,동일한 항목을 복수 회 입력되었습니다.
 DocType: SMS Settings,Receiver Parameter,수신기 매개 변수
@@ -572,10 +548,9 @@
 DocType: Sales Person,Sales Person Targets,영업 사원 대상
 apps/frappe/frappe/public/js/frappe/form/workflow.js +116,To,에
 apps/frappe/frappe/templates/base.html +145,Please enter email address,이메일 주소를 입력하세요
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +35,End tube forming,형성 엔드 튜브
 DocType: Production Order Operation,In minutes,분에서
 DocType: Issue,Resolution Date,결의일
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +635,Please set default Cash or Bank account in Mode of Payment {0},지불 모드로 기본 현금 또는 은행 계정을 설정하십시오 {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +637,Please set default Cash or Bank account in Mode of Payment {0},지불 모드로 기본 현금 또는 은행 계정을 설정하십시오 {0}
 DocType: Selling Settings,Customer Naming By,고객 이름 지정으로
 apps/erpnext/erpnext/accounts/doctype/account/account.js +67,Convert to Group,그룹으로 변환
 DocType: Activity Cost,Activity Type,활동 유형
@@ -583,12 +558,12 @@
 DocType: Customer,Fixed Days,고정 일
 DocType: Sales Invoice,Packing List,패킹리스트
 apps/erpnext/erpnext/config/buying.py +28,Purchase Orders given to Suppliers.,공급 업체에 제공 구매 주문.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +43,Publishing,출판
+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 +198,{0}: {1} not found in Invoice Details table,{0} {1} 송장 정보 테이블에서 찾을 수 없습니다
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,{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 +208,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,유지 보수 방문은 {0}이 판매 주문을 취소하기 전에 취소해야합니다
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +203,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),오프닝 (박사)
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},게시 타임 스탬프 이후 여야 {0}
@@ -600,7 +575,6 @@
 DocType: Pricing Rule,Sales Manager,영업 관리자
 apps/frappe/frappe/public/js/frappe/model/model.js +492,Rename,이름
 DocType: Journal Entry,Write Off Amount,금액을 상각
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +52,Bending,굽​​힘
 apps/frappe/frappe/core/page/user_permissions/user_permissions.js +246,Allow User,사용자에게 허용
 DocType: Journal Entry,Bill No,청구 번호
 DocType: Purchase Invoice,Quarterly,분기 별
@@ -610,17 +584,16 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Please enter item details,항목의 세부 사항을 입력하십시오
 DocType: Purchase Receipt,Other Details,기타 세부 사항
 DocType: Account,Accounts,회계
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +67,Marketing,마케팅
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +65,Straight shearing,스트레이트 전단
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +67,Marketing,마케팅
 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.,자신의 시리얼 NOS에 따라 판매 및 구매 문서의 항목을 추적 할 수 있습니다.또한이 제품의 보증 내용을 추적하는 데 사용 할 수 있습니다.
 DocType: Purchase Receipt Item Supplied,Current Stock,현재 재고
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +99,Rejected Warehouse is mandatory against regected item,거부 창고 regected 항목에 대해 필수입니다
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +102,Rejected Warehouse is mandatory against regected item,거부 창고 regected 항목에 대해 필수입니다
 DocType: Account,Expenses Included In Valuation,비용은 평가에 포함
 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,편지 기간을 제공
-apps/erpnext/erpnext/stock/doctype/item/item.py +492,Item has variants.,항목 변종이있다.
+apps/erpnext/erpnext/stock/doctype/item/item.py +496,Item has variants.,항목 변종이있다.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,{0} 항목을 찾을 수 없습니다
 DocType: Bin,Stock Value,재고 가치
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,나무의 종류
@@ -629,10 +602,9 @@
 DocType: Material Request Item,Quantity and Warehouse,수량 및 창고
 DocType: Sales Invoice,Commission Rate (%),위원회 비율 (%)
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +172,"Against Voucher Type must be one of Sales Order, Sales Invoice or Journal Entry","바우처를 피해 유형은 판매 주문의 하나, 견적서 또는 분개해야합니다"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +139,Biomachining,Biomachining
 apps/erpnext/erpnext/setup/utils.py +89,Unable to find exchange rate,환율을 찾을 수 없습니다
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +7,Aerospace,항공 우주
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +19,Welcome,반갑습니다
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +7,Aerospace,항공 우주
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +40,Welcome,반갑습니다
 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.,제품은 공급 업체에서 받았다.
@@ -655,19 +627,19 @@
 DocType: Employee,Cell Number,핸드폰 번호
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,상실
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +120,You can not enter current voucher in 'Against Journal Entry' column,당신은 열 '저널 항목에 대하여'에서 현재의 바우처를 입력 할 수 없습니다
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +25,Energy,에너지
+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.,월급의 문.
 DocType: Item Group,Website Specifications,웹 사이트 사양
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +205,New Account,새 계정
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +21,{0}: From {0} of type {1},{0}에서 {0} 유형의 {1}
-apps/erpnext/erpnext/controllers/buying_controller.py +283,Row {0}: Conversion Factor is mandatory,행 {0} : 변환 계수는 필수입니다
+apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,행 {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.,회계 항목은 리프 노드에 대해 할 수있다. 그룹에 대한 항목은 허용되지 않습니다.
 DocType: ToDo,High,높음
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +361,Cannot deactivate or cancel BOM as it is linked with other BOMs,비활성화하거나 다른 BOM을 함께 연결되어로 BOM을 취소 할 수 없습니다
 DocType: Opportunity,Maintenance,유지
 DocType: User,Male,남성
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +182,Purchase Receipt number required for Item {0},상품에 필요한 구매 영수증 번호 {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +183,Purchase Receipt number required for Item {0},상품에 필요한 구매 영수증 번호 {0}
 DocType: Item Attribute Value,Item Attribute Value,항목 속성 값
 apps/erpnext/erpnext/config/crm.py +64,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.
@@ -715,10 +687,9 @@
 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 +324,"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/page/setup_wizard/fixtures/industry_type.py +13,Biotechnology,생명 공학
+apps/erpnext/erpnext/controllers/accounts_controller.py +325,"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,사무실 유지 비용
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +53,Hemming,헤밍
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +66,Please enter Item first,첫 번째 항목을 입력하십시오
 DocType: Account,Liability,부채
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +62,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,제재 금액 행에 청구 금액보다 클 수 없습니다 {0}.
@@ -731,10 +702,10 @@
 DocType: Company,Default Bank Account,기본 은행 계좌
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +47,"To filter based on Party, select Party Type first",파티를 기반으로 필터링하려면 선택 파티 첫 번째 유형
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},항목을 통해 전달되지 않기 때문에 &#39;업데이트 재고&#39;확인 할 수없는 {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Nos,NOS
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Nos,NOS
 DocType: Item,Items with higher weightage will be shown higher,높은 weightage와 항목에서 높은 표시됩니다
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,은행 계정조정 세부 정보
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +627,My Invoices,내 송장
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +629,My Invoices,내 송장
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,검색된 직원이 없습니다
 DocType: Purchase Order,Stopped,중지
 DocType: Item,If subcontracted to a vendor,공급 업체에 하청하는 경우
@@ -753,35 +724,33 @@
 DocType: Features Setup,"To enable ""Point of Sale"" features",&quot;판매 시점&quot;기능을 사용하려면
 DocType: Bin,Moving Average Rate,이동 평균 속도
 DocType: Production Planning Tool,Select Items,항목 선택
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,{0} against Bill {1} dated {2},{0} 빌에 대해 {1} 일자 {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +328,{0} against Bill {1} dated {2},{0} 빌에 대해 {1} 일자 {2}
 DocType: Comment,Reference Name,참조명(Reference Name)
 DocType: Maintenance Visit,Completion Status,완료 상태
 DocType: Sales Invoice Item,Target Warehouse,목표웨어 하우스
 DocType: Item,Allow over delivery or receipt upto this percent,이 퍼센트 개까지 배달 또는 영수증을 통해 허용
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +49,Expected Delivery Date cannot be before Sales Order Date,예상 배달 날짜 이전에 판매 주문 날짜가 될 수 없습니다
 DocType: Upload Attendance,Import Attendance,수입 출석
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +17,All Item Groups,모든 상품 그룹
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +17,All Item Groups,모든 상품 그룹
 DocType: Process Payroll,Activity Log,활동 로그
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +30,Net Profit / Loss,당기 순이익 / 손실
 apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,자동 거래의 제출에 메시지를 작성합니다.
 DocType: Production Order,Item To Manufacture,제조 품목에
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +16,Permanent mold casting,영구 금형 주조
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} 상태가 {2}이다
 apps/erpnext/erpnext/config/learn.py +172,Purchase Order to Payment,지불하기 위해 구매
 DocType: Sales Order Item,Projected Qty,수량을 예상
 DocType: Sales Invoice,Payment Due Date,지불 기한
 DocType: Newsletter,Newsletter Manager,뉴스 관리자
-apps/erpnext/erpnext/stock/doctype/item/item.js +229,Item Variant {0} already exists with same attributes,항목 변형 {0} 이미 동일한 속성을 가진 존재
+apps/erpnext/erpnext/stock/doctype/item/item.js +231,Item Variant {0} already exists with same attributes,항목 변형 {0} 이미 동일한 속성을 가진 존재
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening',&#39;열기&#39;
 DocType: Notification Control,Delivery Note Message,납품서 메시지
 DocType: Expense Claim,Expenses,비용
 DocType: Item Variant Attribute,Item Variant Attribute,항목 변형 특성
 ,Purchase Receipt Trends,구매 영수증 동향
 DocType: Appraisal,Select template from which you want to get the Goals,당신이 목표를 취득하는 템플릿을 선택
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +77,Research & Development,연구 개발 (R & D)
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Research & Development,연구 개발 (R & D)
 ,Amount to Bill,빌 금액
 DocType: Company,Registration Details,등록 세부 사항
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +75,Staking,STAKING
 DocType: Item,Re-Order Qty,다시 주문 수량
 DocType: Leave Block List Date,Leave Block List Date,차단 목록 날짜를 남겨
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +25,Scheduled to send to {0},에 보낼 예정 {0}
@@ -792,18 +761,16 @@
 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/hr/doctype/leave_allocation/leave_allocation.py +71,Cannot carry forward {0},앞으로 수행 할 수 없습니다 {0}
 apps/erpnext/erpnext/accounts/doctype/account/account.py +91,"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,비용 청구 거부 메시지
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +145,Nailing,못 박는
 ,Available Qty,사용 가능한 수량
 DocType: Purchase Taxes and Charges,On Previous Row Total,이전 행에 총
 DocType: Salary Slip,Working Days,작업 일
 DocType: Serial No,Incoming Rate,수신 속도
 DocType: Packing Slip,Gross Weight,총중량
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +410,The name of your company for which you are setting up this system.,이 시스템을 설정하는하는 기업의 이름입니다.
+apps/erpnext/erpnext/public/js/setup_wizard.js +158,The name of your company for which you are setting up this system.,이 시스템을 설정하는하는 기업의 이름입니다.
 DocType: HR Settings,Include holidays in Total no. of Working Days,없이 총 휴일을 포함. 작업 일의
 DocType: Job Applicant,Hold,길게 누르기
 DocType: Employee,Date of Joining,가입 날짜
@@ -813,7 +780,6 @@
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +3,View Subscribers,보기 가입자
 DocType: Purchase Invoice Item,Purchase Receipt,구입 영수증
 ,Received Items To Be Billed,청구에 주어진 항목
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +114,Abrasive blasting,블라스트
 DocType: Employee,Ms,MS
 apps/erpnext/erpnext/config/accounts.py +148,Currency exchange rate master.,통화 환율 마스터.
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +253,Unable to find Time Slot in the next {0} days for Operation {1},작업에 대한 다음 {0} 일 시간 슬롯을 찾을 수 없습니다 {1}
@@ -825,7 +791,7 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +209,Serial No {0} does not belong to Item {1},일련 번호 {0} 항목에 속하지 않는 {1}
 DocType: Purchase Receipt Item Supplied,Required Qty,필요한 수량
 DocType: Bank Reconciliation,Total Amount,총액
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +32,Internet Publishing,인터넷 게시
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,인터넷 게시
 DocType: Production Planning Tool,Production Orders,생산 주문
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +35,Balance Value,잔고액
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,판매 가격 목록
@@ -836,7 +802,7 @@
 DocType: Supplier,Default Payable Accounts,기본 미지급금
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,직원 {0} 활성화되지 않거나 존재하지 않습니다
 DocType: Features Setup,Item Barcode,상품의 바코드
-apps/erpnext/erpnext/stock/doctype/item/item.py +487,Item Variants {0} updated,항목 변형 {0} 업데이트
+apps/erpnext/erpnext/stock/doctype/item/item.py +491,Item Variants {0} updated,항목 변형 {0} 업데이트
 DocType: Quality Inspection Reading,Reading 6,6 읽기
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,송장 전진에게 구입
 DocType: Address,Shop,상점
@@ -845,7 +811,7 @@
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,이 모드를 선택하면 기본 은행 / 현금 계정은 자동으로 POS 송장에 업데이트됩니다.
 DocType: Employee,Permanent Address Is,영구 주소는
 DocType: Production Order Operation,Operation completed for how many finished goods?,작업이 얼마나 많은 완제품 완료?
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +491,The Brand,브랜드
+apps/erpnext/erpnext/public/js/setup_wizard.js +237,The Brand,브랜드
 apps/erpnext/erpnext/controllers/status_updater.py +163,Allowance for over-{0} crossed for Item {1}.,수당에 {0} 항목에 대한 교차에 대한 {1}.
 DocType: Employee,Exit Interview Details,출구 인터뷰의 자세한 사항
 DocType: Item,Is Purchase Item,구매 상품입니다
@@ -865,16 +831,16 @@
 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,설정 지불 금액 = 뛰어난 금액
 DocType: Contact Us Settings,Address Line 1,1 호선 주소
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Variance,변화
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +392,Company Name,회사 명
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +53,Variance,변화
+,Company Name,회사 명
 DocType: SMS Center,Total Message(s),전체 메시지 (들)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +515,Select Item for Transfer,전송 항목 선택
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +538,Select Item for Transfer,전송 항목 선택
 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.,검사가 입금 된 은행 계좌 머리를 선택합니다.
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,사용자가 거래 가격리스트 평가를 편집 할 수
 DocType: Pricing Rule,Max Qty,최대 수량
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +106,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,행 {0} : 판매 / 구매 주문에 대한 결제가 항상 사전으로 표시해야
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +16,Chemical,화학
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,화학
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +693,All items have already been transferred for this Production Order.,모든 항목은 이미 생산 주문에 대한 전송되었습니다.
 DocType: Process Payroll,Select Payroll Year and Month,급여 연도와 월을 선택
 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""",해당 그룹 (일반적으로 펀드의 응용 프로그램&gt; 현재 자산&gt; 은행 계좌로 이동 유형) 자녀 추가 클릭하여 (새 계정 만들기 &quot;은행&quot;
@@ -885,12 +851,12 @@
 DocType: Item,Inspection Criteria,검사 기준
 apps/erpnext/erpnext/config/accounts.py +101,Tree of finanial Cost Centers.,finanial 코스트 센터의 나무.
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,옮겨진
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +492,Upload your letter head and logo. (you can edit them later).,편지의 머리와 로고를 업로드합니다. (나중에 편집 할 수 있습니다).
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +156,White,화이트
+apps/erpnext/erpnext/public/js/setup_wizard.js +238,Upload your letter head and logo. (you can edit them later).,편지의 머리와 로고를 업로드합니다. (나중에 편집 할 수 있습니다).
+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/setup/page/setup_wizard/setup_wizard.js +362,Attach Your Picture,사진 첨부
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Make ,확인
+apps/erpnext/erpnext/public/js/setup_wizard.js +112,Attach Your Picture,사진 첨부
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +540,Make ,확인
 DocType: Journal Entry,Total Amount in Words,단어의 합계 금액
 DocType: Workflow State,Stop,중지
 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에 문의하시기 바랍니다.
@@ -899,14 +865,13 @@
 DocType: Lead,Next Contact Date,다음 접촉 날짜
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,열기 수량
 DocType: Holiday List,Holiday List Name,휴일 목록 이름
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +168,Stock Options,스톡 옵션
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +168,Stock Options,스톡 옵션
 DocType: Journal Entry Account,Expense Claim,비용 청구
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +181,Qty for {0},대한 수량 {0}
 DocType: Leave Application,Leave Application,휴가 신청
 apps/erpnext/erpnext/config/hr.py +77,Leave Allocation Tool,할당 도구를 남겨
 DocType: Leave Block List,Leave Block List Dates,차단 목록 날짜를 남겨
 DocType: Company,If Monthly Budget Exceeded (for expense account),월별 예산 (비용 계정) 초과하는 경우
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +56,Trimming,트리밍
 DocType: Workstation,Net Hour Rate,인터넷 시간 비율
 DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,비용 구매 영수증 랜디
 DocType: Company,Default Terms,기본 약관
@@ -914,10 +879,9 @@
 DocType: POS Profile,Cash/Bank Account,현금 / 은행 계좌
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,Removed items with no change in quantity or value.,양 또는 값의 변화없이 제거 항목.
 DocType: Delivery Note,Delivery To,에 배달
-apps/erpnext/erpnext/stock/doctype/item/item.py +509,Attribute table is mandatory,속성 테이블은 필수입니다
+apps/erpnext/erpnext/stock/doctype/item/item.py +513,Attribute table is mandatory,속성 테이블은 필수입니다
 DocType: Production Planning Tool,Get Sales Orders,판매 주문을 받아보세요
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} 음수가 될 수 없습니다
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +103,Filing,제출
 apps/erpnext/erpnext/templates/form_grid/item_grid.html +72,Discount,할인
 DocType: Features Setup,Purchase Discounts,할인 구매
 DocType: Workstation,Wages,임금
@@ -934,6 +898,7 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +112,You are the Expense Approver for this record. Please Update the 'Status' and Save,이 기록에 대한 비용 승인자입니다.'상태'를 업데이트하고 저장하십시오
 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 +136,"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 +194,Serial No {0} is under maintenance contract upto {1},일련 번호는 {0}까지 유지 보수 계약에 따라 {1}
@@ -942,7 +907,7 @@
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,영업 비용
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Buying,표준 구매
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +120,Standard Buying,표준 구매
 DocType: GL Entry,Against,에 대하여
 DocType: Item,Default Selling Cost Center,기본 판매 비용 센터
 DocType: Sales Partner,Implementation Partner,구현 파트너
@@ -963,29 +928,29 @@
 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/setup/page/setup_wizard/setup_wizard.js +588,List a few of your suppliers. They could be organizations or individuals.,공급 업체의 몇 가지를 나열합니다.그들은 조직 또는 개인이 될 수 있습니다.
+apps/erpnext/erpnext/public/js/setup_wizard.js +326,List a few of your suppliers. They could be organizations or individuals.,공급 업체의 몇 가지를 나열합니다.그들은 조직 또는 개인이 될 수 있습니다.
 DocType: Company,Default Currency,기본 통화
 DocType: Contact,Enter designation of this Contact,이 연락처의 지정을 입력
 DocType: Contact Us Settings,Address,주소
 DocType: Expense Claim,From Employee,직원에서
-apps/erpnext/erpnext/controllers/accounts_controller.py +338,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,경고 : 시스템이 {0} {1} 제로의 항목에 대한 금액 때문에 과다 청구를 확인하지 않습니다
+apps/erpnext/erpnext/controllers/accounts_controller.py +339,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,핵심 성과 지역
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +54,Transportation,교통비
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +54,Transportation,교통비
 apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +67, and year: ,그리고 일년
 DocType: Email Digest,Annual Expense,연간 비용
 DocType: SMS Center,Total Characters,전체 문자
-apps/erpnext/erpnext/controllers/buying_controller.py +139,Please select BOM in BOM field for Item {0},상품에 대한 BOM 필드에서 BOM을 선택하세요 {0}
+apps/erpnext/erpnext/controllers/buying_controller.py +130,Please select BOM in BOM field for Item {0},상품에 대한 BOM 필드에서 BOM을 선택하세요 {0}
 DocType: C-Form Invoice Detail,C-Form Invoice Detail,C-양식 송장 세부 정보
 DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,결제 조정 송장
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +32,Contribution %,공헌 %
 DocType: Item,website page link,웹 사이트 페이지 링크
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +192,Let's prepare the system for first use.,처음의 사용을 위해 시스템을 준비하자.
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +242,Let's prepare the system for first use.,처음의 사용을 위해 시스템을 준비하자.
 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 +214,Production Order {0} must be cancelled before cancelling this Sales Order,생산 순서는 {0}이 판매 주문을 취소하기 전에 취소해야합니다
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +209,Production Order {0} must be cancelled before cancelling this Sales Order,생산 순서는 {0}이 판매 주문을 취소하기 전에 취소해야합니다
 ,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.,시간 로그를 선택하고 새로운 판매 송장을 만들 제출.
@@ -1005,14 +970,13 @@
 DocType: Sales Invoice Advance,Sales Invoice Advance,선행 견적서
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +398,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/page/setup_wizard/install_fixtures.py +75,Management,관리
+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/setup/page/setup_wizard/fixtures/operations.py +14,Investment casting,투자 주조
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +51,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.,당신이 급여 슬립을 저장하면 (즉) 순 유료가 표시됩니다.
 apps/frappe/frappe/core/doctype/user/user_list.js +12,Active,활성화
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +154,Blue,푸른
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +154,Blue,푸른
 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,또한 노드는 '그룹'형태의 노드에서 생성 할 수 있습니다
@@ -1022,18 +986,16 @@
 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,UOM 변환 계수
 DocType: Stock Settings,Default Item Group,기본 항목 그룹
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +156,Laminated object manufacturing,적층 객체 제조
 apps/erpnext/erpnext/config/buying.py +13,Supplier database.,공급 업체 데이터베이스.
 DocType: Account,Balance Sheet,대차 대조표
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +561,Cost Center For Item with Item Code ','상품 코드와 항목에 대한 센터 비용
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +45,Stretch forming,형성 스트레치
 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 +210,"Further accounts can be made under Groups, but entries can be made against non-Groups","또한 계정의 그룹에서 제조 될 수 있지만, 항목은 비 ​​- 그룹에 대해 만들어 질 수있다"
 apps/erpnext/erpnext/config/hr.py +125,Tax and other salary deductions.,세금 및 기타 급여 공제.
 DocType: Lead,Lead,리드 고객
 DocType: Email Digest,Payables,채무
 DocType: Account,Warehouse,창고
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +90,Row #{0}: Rejected Qty can not be entered in Purchase Return,행 번호 {0} : 수량은 구매 대가로 입력 할 수 없습니다 거부
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +93,Row #{0}: Rejected Qty can not be entered in Purchase Return,행 번호 {0} : 수량은 구매 대가로 입력 할 수 없습니다 거부
 ,Purchase Order Items To Be Billed,청구 할 수 구매 주문 아이템
 DocType: Purchase Invoice Item,Net Rate,인터넷 속도
 DocType: Purchase Invoice Item,Purchase Invoice Item,구매 송장 항목
@@ -1048,13 +1010,13 @@
 DocType: Global Defaults,Current Fiscal Year,당해 사업 연도
 DocType: Global Defaults,Disable Rounded Total,둥근 전체에게 사용 안 함
 DocType: Lead,Call,전화
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +384,'Entries' cannot be empty,'항목은'비워 둘 수 없습니다
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +386,'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 +205,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/page/setup_wizard/install_fixtures.py +138,Research,연구
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +138,Research,연구
 DocType: Maintenance Visit Purpose,Work Done,작업 완료
 apps/erpnext/erpnext/controllers/item_variant.py +25,Please specify at least one attribute in the Attributes table,속성 테이블에서 하나 이상의 속성을 지정하십시오
 DocType: Contact,User ID,사용자 ID
@@ -1062,10 +1024,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +57,View Ledger,보기 원장
 DocType: File,Lft,LFT
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,처음
-apps/erpnext/erpnext/stock/doctype/item/item.py +394,"An Item Group exists with same name, please change the item name or rename the item group",항목 그룹이 동일한 이름을 가진 항목의 이름을 변경하거나 항목 그룹의 이름을 바꾸십시오
+apps/erpnext/erpnext/stock/doctype/item/item.py +398,"An Item Group exists with same name, please change the item name or rename the item group",항목 그룹이 동일한 이름을 가진 항목의 이름을 변경하거나 항목 그룹의 이름을 바꾸십시오
 DocType: Communication,Delivery Status,배달 상태
 DocType: Production Order,Manufacture against Sales Order,판매 주문에 대해 제조
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +517,Rest Of The World,세계의 나머지
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +455,Rest Of The World,세계의 나머지
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,항목 {0} 배치를 가질 수 없습니다
 ,Budget Variance Report,예산 차이 보고서
 DocType: Salary Slip,Gross Pay,총 지불
@@ -1076,13 +1038,11 @@
 DocType: BOM Item,Item Description,항목 설명
 DocType: Payment Tool,Payment Mode,지불 방식
 DocType: Purchase Invoice,Is Recurring,반복인가
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +154,Direct metal laser sintering,직접 금속 레이저 소결
 DocType: Purchase Order,Supplied Items,제공 한
 DocType: Production Order,Qty To Manufacture,제조하는 수량
 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,임시 열기
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +41,Cryorolling,Cryorolling
 ,Employee Leave Balance,직원 허가 밸런스
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +128,Balance for Account {0} must always be {1},{0} 계정 잔고는 항상 {1}  이어야합니다
 DocType: Address,Address Type,주소 유형
@@ -1098,23 +1058,23 @@
 DocType: Journal Entry,Get Outstanding Invoices,미결제 송장를 얻을
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,판매 주문 {0} 유효하지 않습니다
 apps/erpnext/erpnext/setup/doctype/company/company.py +172,"Sorry, companies cannot be merged","죄송합니다, 회사는 병합 할 수 없습니다"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +145,Small,작은
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Small,작은
 DocType: Employee,Employee Number,직원 수
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},케이스 없음 (들)을 이미 사용.케이스 없음에서 시도 {0}
 ,Invoiced Amount (Exculsive Tax),송장에 청구 된 금액 (Exculsive 세금)
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,항목 2
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +59,Account head {0} created,계정 머리 {0} 생성
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +153,Green,녹색
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Green,녹색
 DocType: Item,Auto re-order,자동 재 주문
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +57,Total Achieved,전체 달성
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +59,Total Achieved,전체 달성
 DocType: Employee,Place of Issue,문제의 장소
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +59,Contract,계약직
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Contract,계약직
 DocType: Report,Disabled,사용 안함
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +490,UOM coversion factor required for UOM: {0} in Item: {1},UOM에 필요한 UOM coversion 인자 : {0} 항목 {1}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +83,Indirect Expenses,간접 비용
 apps/erpnext/erpnext/controllers/selling_controller.py +163,Row {0}: Qty is mandatory,행 {0} : 수량은 필수입니다
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +8,Agriculture,농업
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +611,Your Products or Services,귀하의 제품이나 서비스
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,농업
+apps/erpnext/erpnext/public/js/setup_wizard.js +347,Your Products or Services,귀하의 제품이나 서비스
 DocType: Mode of Payment,Mode of Payment,결제 방식
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,이 루트 항목 그룹 및 편집 할 수 없습니다.
 DocType: Journal Entry Account,Purchase Order,구매 주문
@@ -1126,7 +1086,7 @@
 DocType: Serial No,Serial No Details,일련 번호 세부 사항
 DocType: Purchase Invoice Item,Item Tax Rate,항목 세율
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +113,"For {0}, only credit accounts can be linked against another debit entry",{0} 만 신용 계정은 자동 이체 항목에 링크 할 수 있습니다 들어
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Delivery Note {0} is not submitted,배송 참고 {0} 제출되지
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +470,Delivery Note {0} is not submitted,배송 참고 {0} 제출되지
 apps/erpnext/erpnext/stock/get_item_details.py +136,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.","가격 규칙은 첫 번째 항목, 항목 그룹 또는 브랜드가 될 수있는 필드 '에 적용'에 따라 선택됩니다."
@@ -1136,7 +1096,7 @@
 DocType: Appraisal Goal,Goal,골
 DocType: Sales Invoice Item,Edit Description,편집 설명
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +318,Expected Delivery Date is lesser than Planned Start Date.,예상 배달 날짜는 계획 시작 날짜보다 적은이다.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +579,For Supplier,공급 업체
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +602,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,총 발신
@@ -1162,10 +1122,10 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +74,"Total {0} for all items is zero, may you should change 'Distribute Charges Based On'","총 {0} 모든 항목에 대해 당신이 &#39;를 기반으로 요금을 분배&#39;변경해야 할 수 있습니다, 제로"
 DocType: Purchase Invoice,Taxes and Charges Calculation,세금과 요금 계산
 DocType: BOM Operation,Workstation,워크스테이션
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +112,Hardware,하드웨어
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +112,Hardware,하드웨어
 DocType: Attendance,HR Manager,HR 관리자
 apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,회사를 선택하세요
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +50,Privilege Leave,권한 허가
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +50,Privilege Leave,권한 허가
 DocType: Purchase Invoice,Supplier Invoice Date,공급 업체 송장 날짜
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +79,You need to enable Shopping Cart,당신은 쇼핑 카트를 활성화해야
 apps/frappe/frappe/public/js/frappe/form/grid_body.html +6,No Data,데이터가 없습니다
@@ -1178,7 +1138,7 @@
 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 +168,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/setup/page/setup_wizard/install_fixtures.py +38,Food,음식
+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 +139,You can make a time log only against a submitted production order,당신은 제출 된 생산 오더에 대해 한 번 로그를 만들 수 있습니다
 DocType: Maintenance Schedule Item,No of Visits,방문 없음
@@ -1198,6 +1158,7 @@
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,View Offer Letter,보기 제공 편지
 DocType: Communication,Communication,통신 네트워크
 DocType: Item,Is Service Item,서비스 항목은
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +81,Application period cannot be outside leave allocation period,신청 기간은 외부 휴가 할당 기간이 될 수 없습니다
 DocType: Activity Cost,Projects,프로젝트
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +31,Please select Fiscal Year,회계 연도를 선택하십시오
 apps/erpnext/erpnext/controllers/buying_controller.py +23,From {0} | {1} {2},에서 {0} | {1} {2}
@@ -1216,7 +1177,7 @@
 DocType: Item,Maintain Stock,재고 유지
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +213,Stock Entries already created for Production Order ,이미 생산 오더에 대 한 만든 항목
 DocType: Leave Control Panel,Leave blank if considered for all designations,모든 지정을 고려하는 경우 비워 둡니다
-apps/erpnext/erpnext/controllers/accounts_controller.py +499,Charge of type 'Actual' in row {0} cannot be included in Item Rate,유형 행 {0}에있는 '실제'의 책임은 상품 요금에 포함 할 수 없습니다
+apps/erpnext/erpnext/controllers/accounts_controller.py +500,Charge of type 'Actual' in row {0} cannot be included in Item Rate,유형 행 {0}에있는 '실제'의 책임은 상품 요금에 포함 할 수 없습니다
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,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,회사
@@ -1226,7 +1187,7 @@
 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 +471,cannot be greater than 100,100보다 큰 수 없습니다
-apps/erpnext/erpnext/stock/doctype/item/item.py +546,Item {0} is not a stock Item,{0} 항목을 재고 항목이 없습니다
+apps/erpnext/erpnext/stock/doctype/item/item.py +550,Item {0} is not a stock Item,{0} 항목을 재고 항목이 없습니다
 DocType: Maintenance Visit,Unscheduled,예약되지 않은
 DocType: Employee,Owned,소유
 DocType: Salary Slip Deduction,Depends on Leave Without Pay,무급 휴가에 따라 다름
@@ -1240,31 +1201,29 @@
 DocType: HR Settings,Employee Settings,직원 설정
 ,Batch-Wise Balance History,배치 식 밸런스 역사
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +72,To Do List,할일 목록
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +63,Apprentice,도제
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Apprentice,도제
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +99,Negative Quantity is not allowed,음의 수량은 허용되지 않습니다
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
 Used for Taxes and Charges","문자열로 품목 마스터에서 가져온이 분야에 저장 세금 세부 테이블.
  세금 및 요금에 사용"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +61,Lancing,랜싱
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +151,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 +435,Accounting Entry for {0}: {1} can only be made in currency: {2},{1} 만 통화 할 수있다 : {0}에 대한 회계 항목 {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +436,Accounting Entry for {0}: {1} can only be made in currency: {2},{1} 만 통화 할 수있다 : {0}에 대한 회계 항목 {2}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +38,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 +112,Tax Rule for transactions.,거래에 대한 세금 규칙.
 DocType: Rename Tool,Type of document to rename.,이름을 바꿀 문서의 종류.
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +630,We buy this Item,우리는이 품목을 구매
+apps/erpnext/erpnext/public/js/setup_wizard.js +366,We buy this Item,우리는이 품목을 구매
 DocType: Address,Billing,청구
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +77,Flanging,플랜지
 DocType: Bulk Email,Not Sent,보낼 수 없습니다
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +73,Explosive forming,형성 폭발
 DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),총 세금 및 요금 (회사 통화)
 DocType: Shipping Rule,Shipping Account,배송 계정
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +43,Scheduled to send to {0} recipients,{0}받는 사람에게 보낼 예정
 DocType: Quality Inspection,Readings,읽기
 DocType: Stock Entry,Total Additional Costs,총 추가 비용
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Sub Assemblies,서브 어셈블리
+apps/erpnext/erpnext/public/js/setup_wizard.js +359,Sub Assemblies,서브 어셈블리
 DocType: Shipping Rule Condition,To Value,값
 DocType: Supplier,Stock Manager,재고 관리자
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +143,Source warehouse is mandatory for row {0},소스웨어 하우스는 행에 대해 필수입니다 {0}
@@ -1274,44 +1233,42 @@
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,가져 오기 실패!
 apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,어떤 주소는 아직 추가되지 않습니다.
 DocType: Workstation Working Hour,Workstation Working Hour,워크 스테이션 작업 시간
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +83,Analyst,분석자
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +202,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},행 {0} : 할당 된 양 {1} 미만 또는 JV의 양에 해당한다 {2}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Analyst,분석자
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +149,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},행 {0} : 할당 된 양 {1} 미만 또는 JV의 양에 해당한다 {2}
 DocType: Item,Inventory,재고
 DocType: Features Setup,"To enable ""Point of Sale"" view",보기 &quot;판매 시점&quot;을 사용하려면
 apps/erpnext/erpnext/public/js/pos/pos.js +402,Payment cannot be made for empty cart,결제는 빈 카트에 할 수 없다
 DocType: Item,Sales Details,판매 세부 사항
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +149,Pinning,피닝
 DocType: Opportunity,With Items,항목
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,수량에
 DocType: Notification Control,Expense Claim Rejected,비용 청구는 거부
 DocType: Sales Invoice,"The date on which next invoice will be generated. It is generated on submit.
 ",다음 송장이 생성됩니다되는 날짜입니다. 그것은 제출에 생성됩니다.
 DocType: Item Attribute,Item Attribute,항목 속성
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +105,Government,통치 체제
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Government,통치 체제
 apps/erpnext/erpnext/config/stock.py +268,Item Variants,항목 변형
 DocType: Company,Services,Services (서비스)
 apps/erpnext/erpnext/accounts/report/financial_statements.py +147,Total ({0}),전체 ({0})
 DocType: Cost Center,Parent Cost Center,부모의 비용 센터
 DocType: Sales Invoice,Source,소스
 DocType: Leave Type,Is Leave Without Pay,지불하지 않고 남겨주세요
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +186,No records found in the Payment table,지불 테이블에있는 레코드 없음
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +405,Financial Year Start Date,회계 연도의 시작 날짜
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +133,No records found in the Payment table,지불 테이블에있는 레코드 없음
+apps/erpnext/erpnext/public/js/setup_wizard.js +153,Financial Year Start Date,회계 연도의 시작 날짜
 DocType: Employee External Work History,Total Experience,총 체험
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +100,Countersinking,카운터 싱크
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +271,Packing Slip(s) cancelled,포장 명세서 (들) 취소
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +276,Packing Slip(s) cancelled,포장 명세서 (들) 취소
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,화물 운송 및 포워딩 요금
 DocType: Material Request Item,Sales Order No,판매 주문 번호
 DocType: Item Group,Item Group Name,항목 그룹 이름
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +50,Taken,촬영
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,촬영
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +66,Transfer Materials for Manufacture,제조에 대한 전송 재료
 DocType: Pricing Rule,For Price List,가격 목록을 보려면
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +27,Executive Search,대표 조사
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,대표 조사
 apps/erpnext/erpnext/stock/stock_ledger.py +405,"Purchase rate for item: {0} not found, which is required to book accounting entry (expense). Please mention item price against a buying price list.","항목에 대한 구매 비율 : {0}을 (를) 찾을 수 없습니다, 회계 항목 (비용)을 예약하는 데 필요합니다.구매 가격 목록에 대해 품목 가격을 언급하시기 바랍니다."
 DocType: Maintenance Schedule,Schedules,일정
 DocType: Purchase Invoice Item,Net Amount,순액
 DocType: Purchase Order Item Supplied,BOM Detail No,BOM 세부 사항 없음
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),추가 할인 금액 (회사 통화)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +537,Error: {0} > {1},오류 : {0}> {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +541,Error: {0} > {1},오류 : {0}> {1}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,계정 차트에서 새로운 계정을 생성 해주세요.
 DocType: Maintenance Visit,Maintenance Visit,유지 보수 방문
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer > Customer Group > Territory,고객 지원> 고객 그룹> 지역
@@ -1322,7 +1279,6 @@
 DocType: Event,Tuesday,화요일
 DocType: Leave Block List,Block Holidays on important days.,중요한 일에 블록 휴일.
 ,Accounts Receivable Summary,미수금 요약
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +43,Leaves for type {0} already allocated for Employee {1} for period {2} - {3},이미 기간 동안 직원 {1}에 할당 된 유형 {0}에 대한 잎 {2} - {3}
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +187,Please set User ID field in an Employee record to set Employee Role,직원 역할을 설정하는 직원 레코드에 사용자 ID 필드를 설정하십시오
 DocType: UOM,UOM Name,UOM 이름
 DocType: Top Bar Item,Target,목표물
@@ -1334,15 +1290,14 @@
 DocType: ToDo,Due Date,마감일
 DocType: Sales Invoice Item,Brand Name,브랜드 명
 DocType: Purchase Receipt,Transporter Details,수송기 상세
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Box,상자
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +389,The Organization,조직
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Box,상자
+apps/erpnext/erpnext/public/js/setup_wizard.js +137,The Organization,조직
 DocType: Monthly Distribution,Monthly Distribution,예산 월간 배분
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,수신기 목록이 비어 있습니다.수신기 목록을 만드십시오
 DocType: Production Plan Sales Order,Production Plan Sales Order,생산 계획 판매 주문
 DocType: Sales Partner,Sales Partner Target,영업 파트너 대상
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},{0}에 대한 회계 항목 만 통화 할 수있다 : {1}
 DocType: Pricing Rule,Pricing Rule,가격 규칙
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +58,Notching,노칭
 apps/erpnext/erpnext/config/learn.py +167,Material Request to Purchase Order,주문을 (를) 구매하려면 자료 요청
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +74,Row # {0}: Returned Item {1} does not exists in {2} {3},행 번호 {0} : 반환 항목 {1}에 존재하지 않는 {2} {3}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,은행 계정
@@ -1359,20 +1314,19 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Amounts not reflected in bank,은행에 반영되지 금액
 DocType: Quality Inspection Reading,Reading 4,4 읽기
 apps/erpnext/erpnext/config/hr.py +23,Claims for company expense.,회사 경비 주장한다.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +8,Centrifugal casting,원심 주조
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +119,Magnetic field-assisted finishing,자장 보조 마무리
 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,연락처 모바일 없음
 DocType: Production Planning Tool,Select Sales Orders,선택 판매 주문
 ,Material Requests for which Supplier Quotations are not created,공급 업체의 견적이 생성되지 않는 자재 요청
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +117,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,당신이 휴가를 신청하는 날 (들)은 휴일입니다. 당신은 휴가를 신청할 필요가 없습니다.
 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/buying/doctype/purchase_order/purchase_order.js +477,Mark as Delivered,마크 배달로
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +497,Mark as Delivered,마크 배달로
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +34,Make Quotation,견적 확인
 DocType: Dependent Task,Dependent Task,종속 작업
-apps/erpnext/erpnext/stock/doctype/item/item.py +306,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 +141,Leave of type {0} cannot be longer than {1},유형의 휴가는 {0}을 넘을 수 없습니다 {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +310,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 +155,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,수신기 목록
@@ -1380,15 +1334,14 @@
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,소비 금액
 apps/erpnext/erpnext/public/js/pos/pos.js +491,{0} View,{0}보기
 DocType: Salary Structure Deduction,Salary Structure Deduction,급여 구조 공제
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +158,Selective laser sintering,선택적 레이저 소결
-apps/erpnext/erpnext/stock/doctype/item/item.py +301,Unit of Measure {0} has been entered more than once in Conversion Factor Table,측정 단위는 {0}보다 변환 계수 표에 두 번 이상 입력 한
+apps/erpnext/erpnext/stock/doctype/item/item.py +305,Unit of Measure {0} has been entered more than once in Conversion Factor Table,측정 단위는 {0}보다 변환 계수 표에 두 번 이상 입력 한
 apps/frappe/frappe/core/page/data_import_tool/data_import_tool.js +108,Import Successful!,성공적인 가져 오기!
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,발행 항목의 비용
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +185,Quantity must not be more than {0},수량 이하이어야한다 {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +41,Age (Days),나이 (일)
 DocType: Quotation Item,Quotation Item,견적 상품
 DocType: Account,Account Name,계정 이름
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +41,From Date cannot be greater than To Date,날짜에서 날짜보다 클 수 없습니다
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +34,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.,공급 유형 마스터.
 DocType: Purchase Order Item,Supplier Part Number,공급 업체 부품 번호
@@ -1397,14 +1350,14 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +247,{0} {1} is cancelled or stopped,{0} {1} 취소 또는 정지
 DocType: Accounts Settings,Credit Controller,신용 컨트롤러
 DocType: Delivery Note,Vehicle Dispatch Date,차량 파견 날짜
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +197,Purchase Receipt {0} is not submitted,구입 영수증 {0} 제출되지
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +198,Purchase Receipt {0} is not submitted,구입 영수증 {0} 제출되지
 DocType: Company,Default Payable Account,기본 지불 계정
 apps/erpnext/erpnext/config/website.py +13,"Settings for online shopping cart such as shipping rules, price list etc.","이러한 운송 규칙, 가격 목록 등 온라인 쇼핑 카트에 대한 설정"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +660,Setup Complete,설치 완료
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +124,Setup Complete,설치 완료
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +65,{0}% Billed,{0} % 청구
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +17,Reserved Qty,예약 수량
 DocType: Party Account,Party Account,당 계정
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +74,Human Resources,인적 자원
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +74,Human Resources,인적 자원
 DocType: Lead,Upper Income,위 소득
 DocType: Journal Entry Account,Debit in Company Currency,회사 통화에서 직불
 apps/erpnext/erpnext/support/doctype/issue/issue.py +58,My Issues,내 문제
@@ -1413,11 +1366,9 @@
 DocType: Company,Default Values,기본값
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +236,Row {0}: Payment amount can not be negative,행 {0} : 지불 금액은 음수가 될 수 없습니다
 DocType: Expense Claim,Total Amount Reimbursed,총 금액 상환
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +152,Press fitting,보도 피팅
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +64,Against Supplier Invoice {0} dated {1},공급 업체 청구서를 {0} 일자 {1}
 DocType: Customer,Default Price List,기본 가격리스트
 DocType: Payment Reconciliation,Payments,지불
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +24,Hot isostatic pressing,핫 프레스 등방
 DocType: ToDo,Medium,중간
 DocType: Budget Detail,Budget Allocated,할당 된 예산
 DocType: Journal Entry,Entry Type,항목 유형
@@ -1430,9 +1381,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +56,None of the items have any change in quantity or value.,항목 중에 양 또는 값의 변화가 없다.
 DocType: Warranty Claim,Warranty Claim,보증 청구
 ,Lead Details,리드 세부 사항
-DocType: Authorization Rule,Approving User,승인 사용자
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +37,Forging,단조
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +126,Plating,도금
 DocType: Purchase Invoice,End date of current invoice's period,현재 송장의 기간의 종료 날짜
 DocType: Pricing Rule,Applicable For,에 적용
 DocType: Bank Reconciliation,From Date,날짜
@@ -1454,31 +1402,29 @@
 DocType: Sales Invoice,Paid Amount (Company Currency),지불 금액 (회사 통화)
 DocType: Purchase Invoice,Additional Discount,추가 할인
 DocType: Selling Settings,Selling Settings,판매 설정
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +39,Online Auctions,온라인 경매
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,온라인 경매
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +94,Please specify either Quantity or Valuation Rate or both,수량이나 평가 비율 또는 둘 중 하나를 지정하십시오
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +50,"Company, Month and Fiscal Year is mandatory","회사, 월, 회계 연도는 필수입니다"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Marketing Expenses,마케팅 비용
 ,Item Shortage Report,매물 부족 보고서
-apps/erpnext/erpnext/stock/doctype/item/item.js +183,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","무게도 ""무게 UOM""를 언급 해주십시오 \n, 언급"
+apps/erpnext/erpnext/stock/doctype/item/item.js +185,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","무게도 ""무게 UOM""를 언급 해주십시오 \n, 언급"
 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 +212,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 +384,Warehouse required at Row No {0},행 없음에 필요한 창고 {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +386,Warehouse required at Row No {0},행 없음에 필요한 창고 {0}
 DocType: Employee,Date Of Retirement,은퇴 날짜
 DocType: Upload Attendance,Get Template,양식 구하기
 DocType: Address,Postal,우편의
 DocType: Item,Weightage,Weightage
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +159,Mining,채광
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +17,Resin casting,수지 주조
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,고객 그룹이 동일한 이름으로 존재하는 것은 고객의 이름을 변경하거나 고객 그룹의 이름을 바꾸십시오
 apps/erpnext/erpnext/public/js/pos/pos.js +147,Please select {0} first.,먼저 {0}을 선택하십시오.
 apps/erpnext/erpnext/templates/pages/order.html +57,text {0},텍스트 {0}
 DocType: Territory,Parent Territory,상위 지역
 DocType: Quality Inspection Reading,Reading 2,2 읽기
 DocType: Stock Entry,Material Receipt,소재 영수증
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +622,Products,제품
+apps/erpnext/erpnext/public/js/setup_wizard.js +358,Products,제품
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +47,Party Type and Party is required for Receivable / Payable account {0},파티 형 파티는 채권 / 채무 계정이 필요합니다 {0}
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.","이 항목이 변형을 갖는다면, 이는 판매 주문 등을 선택할 수 없다"
 DocType: Lead,Next Contact By,다음 접촉
@@ -1488,13 +1434,13 @@
 DocType: Purchase Invoice,Notification Email Address,알림 전자 메일 주소
 DocType: Payment Tool,Find Invoices to Match,일치하는 송장을 찾기
 ,Item-wise Sales Register,상품이 많다는 판매 등록
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +399,"e.g. ""XYZ National Bank""","예)  ""XYZ 국립 은행 """
+apps/erpnext/erpnext/public/js/setup_wizard.js +147,"e.g. ""XYZ National Bank""","예)  ""XYZ 국립 은행 """
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,이 세금은 기본 요금에 포함되어 있습니까?
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +57,Total Target,총 대상
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Target,총 대상
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.js +22,Shopping Cart is enabled,장바구니가 활성화됩니다
 DocType: Job Applicant,Applicant for a Job,작업에 대한 신청자
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +173,No Production Orders created,생성 된 NO 생성 주문하지
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +131,Salary Slip of employee {0} already created for this month,직원의 급여 전표 {0}이 (가) 이미 이번 달 생성
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +140,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.,열이 너무 많습니다.보고서를 내 보낸 스프레드 시트 응용 프로그램을 사용하여 인쇄 할 수 있습니다.
 DocType: Sales Invoice Item,Batch No,배치 없음
@@ -1504,14 +1450,14 @@
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +13,Variant,변체
 apps/frappe/frappe/public/js/frappe/form/toolbar.js +165,New {0},새로운 {0}
 DocType: Naming Series,Set prefix for numbering series on your transactions,트랜잭션에 일련 번호에 대한 설정 접두사
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +169,Stopped order cannot be cancelled. Unstop to cancel.,정지 순서는 취소 할 수 없습니다.취소 멈추지.
-apps/erpnext/erpnext/stock/doctype/item/item.py +323,Default BOM ({0}) must be active for this item or its template,기본 BOM은 ({0})이 항목 또는 템플릿에 대한 활성화되어 있어야합니다
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +164,Stopped order cannot be cancelled. Unstop to cancel.,정지 순서는 취소 할 수 없습니다.취소 멈추지.
+apps/erpnext/erpnext/stock/doctype/item/item.py +327,Default BOM ({0}) must be active for this item or its template,기본 BOM은 ({0})이 항목 또는 템플릿에 대한 활성화되어 있어야합니다
 DocType: Employee,Leave Encashed?,Encashed 남겨?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,필드에서 기회는 필수입니다
 DocType: Item,Variants,변종
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +458,Make Purchase Order,확인 구매 주문
 DocType: SMS Center,Send To,보내기
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +111,There is not enough leave balance for Leave Type {0},허가 유형에 대한 충분한 휴가 밸런스가 없습니다 {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +127,There is not enough leave balance for Leave Type {0},허가 유형에 대한 충분한 휴가 밸런스가 없습니다 {0}
 DocType: Sales Team,Contribution to Net Total,인터넷 전체에 기여
 DocType: Sales Invoice Item,Customer's Item Code,고객의 상품 코드
 DocType: Stock Reconciliation,Stock Reconciliation,재고 조정
@@ -1548,11 +1494,11 @@
 DocType: Sales Order Item,Actual Qty,실제 수량
 DocType: Sales Invoice Item,References,참조
 DocType: Quality Inspection Reading,Reading 10,10 읽기
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +612,"List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start.","귀하의 제품이나 제품을 구매하거나 판매하는 서비스를 나열합니다.당신이 시작할 때 항목 그룹, 측정 및 기타 속성의 단위를 확인해야합니다."
+apps/erpnext/erpnext/public/js/setup_wizard.js +348,"List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start.","귀하의 제품이나 제품을 구매하거나 판매하는 서비스를 나열합니다.당신이 시작할 때 항목 그룹, 측정 및 기타 속성의 단위를 확인해야합니다."
 DocType: Hub Settings,Hub Node,허브 노드
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,중복 항목을 입력했습니다.조정하고 다시 시도하십시오.
 apps/erpnext/erpnext/controllers/item_variant.py +65,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values,값이 {0} 속성에 대한 {1} 유효한 항목 목록에 존재하지 않는 속성 값
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +87,Associate,준
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Associate,준
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +46,Item {0} is not a serialized Item,{0} 항목을 직렬화 된 상품이 없습니다
 DocType: SMS Center,Create Receiver List,수신기 목록 만들기
 apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +5,Expired,만료
@@ -1561,7 +1507,7 @@
 DocType: Warranty Claim,Issue Date,발행일
 DocType: Activity Cost,Activity Cost,활동 비용
 DocType: Purchase Receipt Item Supplied,Consumed Qty,소비 수량
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +52,Telecommunications,통신
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +52,Telecommunications,통신
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),패키지이 배달의 일부임을 나타냅니다 (만 안)
 DocType: Payment Tool,Make Payment Entry,지불 항목을 만듭니다
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +119,Quantity for Item {0} must be less than {1},수량 항목에 대한 {0}보다 작아야합니다 {1}
@@ -1578,10 +1524,8 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +37,"Selling must be checked, if Applicable For is selected as {0}","해당 법령에가로 선택된 경우 판매, 확인해야합니다 {0}"
 DocType: Purchase Order Item,Supplier Quotation Item,공급 업체의 견적 상품
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +27,Make Salary Structure,급여 구조를 확인
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +54,Shearing,양털 깎기
 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.,새로운 판매 송장을 작성하는 '판매 송장 확인'버튼을 클릭합니다.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +166,Packaging and labeling,포장 및 라벨링
 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,회사 마스터 및 글로벌 기본값에 기본 통화를 지정하십시오
@@ -1592,19 +1536,18 @@
 DocType: Budget Detail,Fiscal Year,회계 연도
 DocType: Cost Center,Budget,예산
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +41,"Budget cannot be assigned against {0}, as it's not an Income or Expense account",이 수입 또는 비용 계정이 아니다으로 예산이에 대해 {0}에 할당 할 수 없습니다
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Achieved,달성
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,달성
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +65,Territory / Customer,지역 / 고객
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,e.g. 5,예) 5
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +207,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},행 {0} : 할당 된 양 {1} 미만 또는 잔액을 청구하기 위해 동일합니다 {2}
+apps/erpnext/erpnext/public/js/setup_wizard.js +294,e.g. 5,예) 5
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},행 {0} : 할당 된 양 {1} 미만 또는 잔액을 청구하기 위해 동일합니다 {2}
 DocType: Sales Invoice,In Words will be visible once you save the Sales Invoice.,당신이 판매 송장을 저장 한 단어에서 볼 수 있습니다.
 DocType: Item,Is Sales Item,판매 상품입니다
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,항목 그룹 트리
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,{0} 항목을 직렬 제의 체크 항목 마스터에 대한 설정이 없습니다
 DocType: Maintenance Visit,Maintenance Time,유지 시간
 ,Amount to Deliver,금액 제공하는
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +620,A Product or Service,제품 또는 서비스
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +158,There were errors.,오류가 발생했습니다.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +101,Tapping,태핑
+apps/erpnext/erpnext/public/js/setup_wizard.js +356,A Product or Service,제품 또는 서비스
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +146,There were errors.,오류가 발생했습니다.
 DocType: Naming Series,Current Value,현재 값
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +171,{0} created,{0} 생성
 DocType: Delivery Note Item,Against Sales Order,판매 주문에 대해
@@ -1619,7 +1562,7 @@
 apps/erpnext/erpnext/accounts/party.py +275,Due Date cannot be before Posting Date,기한 날짜를 게시하기 전에 할 수 없습니다
 DocType: Website Item Group,Website Item Group,웹 사이트 상품 그룹
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Duties and Taxes,관세 및 세금
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Please enter Reference date,참고 날짜를 입력 해주세요
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +312,Please enter Reference date,참고 날짜를 입력 해주세요
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} 지급 항목으로 필터링 할 수 없습니다 {1}
 DocType: Item Website Specification,Table for Item that will be shown in Web Site,웹 사이트에 표시됩니다 항목 표
 DocType: Purchase Order Item Supplied,Supplied Qty,납품 수량
@@ -1627,7 +1570,7 @@
 apps/erpnext/erpnext/config/stock.py +103,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,상품 현명한 구입 내역
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +152,Red,빨간
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Red,빨간
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +228,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},시리얼 번호는 항목에 대한 추가 가져 오기 위해 '생성 일정'을 클릭하십시오 {0}
 DocType: Account,Frozen,동결
 ,Open Production Orders,오픈 생산 주문
@@ -1642,7 +1585,7 @@
 DocType: Item Attribute,Attribute Name,속성 이름
 apps/erpnext/erpnext/controllers/selling_controller.py +236,Item {0} must be Sales or Service Item in {1},{0} 항목을 판매하거나 서비스 상품이어야 {1}
 DocType: Item Group,Show In Website,웹 사이트에 표시
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +621,Group,그릅
+apps/erpnext/erpnext/public/js/setup_wizard.js +357,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","다음의 서류 배달 참고, 기회, 자료 요청, 상품, 구매 주문, 구매 바우처, 구매자 영수증, 견적, 견적서, 제품 번들, 판매 주문, 일련 번호에 브랜드 이름을 추적"
@@ -1652,6 +1595,7 @@
 DocType: Features Setup,Brands,상표
 DocType: C-Form Invoice Detail,Invoice No,아니 송장
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +480,From Purchase Order,구매 발주
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +92,"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,사직서 날짜
@@ -1659,35 +1603,31 @@
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +137,Not Set,설정 아님
 DocType: Communication,Date,날짜
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,반복 고객 수익
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +651,Sit tight while your system is being setup. This may take a few moments.,시스템이 설치되는 동안 잠시 기다려 주세요. 이 작업은 약간의 시간이 걸릴 수 있습니다.
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +115,Sit tight while your system is being setup. This may take a few moments.,시스템이 설치되는 동안 잠시 기다려 주세요. 이 작업은 약간의 시간이 걸릴 수 있습니다.
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +51,{0} ({1}) must have role 'Expense Approver',{0} ({1}) 역할 '지출 승인'을 가지고 있어야합니다
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Pair,페어링
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Pair,페어링
 DocType: Bank Reconciliation Detail,Against Account,계정에 대하여
 DocType: Maintenance Schedule Detail,Actual Date,실제 날짜
 DocType: Item,Has Batch No,일괄 없음에게 있습니다
 DocType: Delivery Note,Excise Page Number,소비세의 페이지 번호
 DocType: Employee,Personal Details,개인 정보
 ,Maintenance Schedules,관리 스케줄
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +44,Embossing,엠보싱
 ,Quotation Trends,견적 동향
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +139,Item Group not mentioned in item master for item {0},항목에 대한 항목을 마스터에 언급되지 않은 항목 그룹 {0}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +302,Debit To account must be a Receivable account,차변계정은 채권 계정이어야합니다
-apps/erpnext/erpnext/stock/doctype/item/item.py +310,"As Production Order can be made for this item, it must be a stock item.","생산 주문이 항목에 대한 만들 수 있습니다, 그것은 재고 품목 수 있어야합니다."
 DocType: Shipping Rule Condition,Shipping Amount,배송 금액
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +140,Joining,합류
-DocType: Authorization Rule,Above Value,상위값
 ,Pending Amount,대기중인 금액
 DocType: Purchase Invoice Item,Conversion Factor,변환 계수
 DocType: Purchase Order,Delivered,배달
 apps/erpnext/erpnext/config/hr.py +160,Setup incoming server for jobs email id. (e.g. jobs@example.com),작업 메일 ID의 설정받는 서버. (예를 들어 jobs@example.com)
 DocType: Purchase Receipt,Vehicle Number,차량 번호
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,반복 송장이 중단 될 일자
+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,미수금
 ,Supplier-Wise Sales Analytics,공급 업체 현명한 판매 분석
 DocType: Address Template,This format is used if country specific format is not found,국가 별 형식을 찾을 수없는 경우이 형식이 사용됩니다
 DocType: Custom Field,Custom,사용자 지정
 DocType: Production Order,Use Multi-Level BOM,사용 다중 레벨 BOM
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +26,Injection molding,사출 성형
 DocType: Bank Reconciliation,Include Reconciled Entries,조정 됨 항목을 포함
 apps/erpnext/erpnext/config/accounts.py +41,Tree of finanial accounts.,재무계정트리
 DocType: Leave Control Panel,Leave blank if considered for all employee types,모든 직원의 유형을 고려하는 경우 비워 둡니다
@@ -1697,30 +1637,28 @@
 apps/frappe/frappe/config/setup.py +130,Printing,인쇄
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +114,Expense Claim is pending approval. Only the Expense Approver can update status.,비용 청구가 승인 대기 중입니다.만 비용 승인자 상태를 업데이트 할 수 있습니다.
 DocType: Purchase Invoice,Additional Discount Amount,추가 할인 금액
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +99,The day(s) on which you are applying for leave are holiday. You need not apply for leave.,당신이 허가를 신청하는 날 (들)은 휴일입니다.당신은 휴가를 신청할 필요가 없습니다.
 apps/frappe/frappe/public/js/frappe/misc/utils.js +110,and,손목
 DocType: Leave Block List Allow,Leave Block List Allow,차단 목록은 허용 남겨
 apps/erpnext/erpnext/setup/doctype/company/company.py +236,Abbr can not be blank or space,약어는 비워둘수 없습니다
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +50,Sports,스포츠
+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/setup/page/setup_wizard/setup_wizard.js +626,Unit,단위
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Unit,단위
 apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.py +182,Please set Dropbox access keys in your site config,사이트 구성에 보관 액세스 키를 설정하십시오
 apps/erpnext/erpnext/stock/get_item_details.py +113,Please specify Company,회사를 지정하십시오
 ,Customer Acquisition and Loyalty,고객 확보 및 충성도
 DocType: Purchase Receipt,Warehouse where you are maintaining stock of rejected items,당신이 거부 된 품목의 재고를 유지하고 창고
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +408,Your financial year ends on,재무 년에 종료
+apps/erpnext/erpnext/public/js/setup_wizard.js +156,Your financial year ends on,재무 년에 종료
 DocType: POS Profile,Price List,가격리스트
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +20,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0} 이제 기본 회계 연도이다.변경 내용을 적용하기 위해 브라우저를 새로 고침하십시오.
 apps/erpnext/erpnext/projects/doctype/project/project.js +47,Expense Claims,비용 청구
 DocType: Issue,Support,기술 지원
-DocType: Authorization Rule,Approving Role,승인 역할
 ,BOM Search,BOM 검색
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +176,Closing (Opening + Totals),닫기 (+ 합계 열기)
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +26,Please specify currency in Company,회사에 통화를 지정하십시오
 DocType: Workstation,Wages per hour,시간당 임금
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,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.","등 일련 NOS, POS 등의 표시 / 숨기기 기능"
-apps/erpnext/erpnext/controllers/accounts_controller.py +236,Account {0} is invalid. Account Currency must be {1},계정 {0} 유효하지 않습니다. 계정 통화가 있어야합니다 {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +237,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},UOM 변환 계수는 행에 필요한 {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +53,Clearance date cannot be before check date in row {0},통관 날짜 행 체크인 날짜 이전 할 수 없습니다 {0}
 DocType: Salary Slip,Deduction,공제
@@ -1739,13 +1677,13 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +82,Item {0} has already been returned,항목 {0}이 (가) 이미 반환 된
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** 회계 연도는 ** 금융 년도 나타냅니다.모든 회계 항목 및 기타 주요 거래는 ** ** 회계 연도에 대해 추적됩니다.
 DocType: Opportunity,Customer / Lead Address,고객 / 리드 주소
+apps/erpnext/erpnext/stock/doctype/item/item.py +112,Warning: Invalid SSL certificate on attachment {0},경고 : 첨부 파일에 잘못된 SSL 인증서 {0}
 DocType: Production Order Operation,Actual Operation Time,실제 작업 시간
 DocType: Authorization Rule,Applicable To (User),에 적용 (사용자)
 DocType: Purchase Taxes and Charges,Deduct,공제
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +170,Job Description,작업 설명
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +170,Job Description,작업 설명
 DocType: Purchase Order Item,Qty as per Stock UOM,수량 재고 UOM 당
 apps/frappe/frappe/model/rename_doc.py +343,Please select a valid csv file with data,데이터가 유효한 CSV 파일을 선택하세요
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +92,Coating,코팅
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +126,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","를 제외한 특수 문자 ""-"" ""."", ""#"", 그리고 ""/""시리즈 이름에 사용할 수 없습니다"
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","판매 캠페인을 추적.리드, 인용문을 추적, 판매 주문 등 캠페인에서 투자 수익을 측정합니다."
 DocType: Expense Claim,Approver,승인자
@@ -1755,12 +1693,11 @@
 DocType: Supplier Quotation,Manufacturing Manager,제조 관리자
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +191,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/hooks.py +84,Shipments,선적
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +29,Dip molding,딥 성형
+apps/erpnext/erpnext/hooks.py +68,Shipments,선적
 DocType: Purchase Order,To be delivered to customer,고객에게 전달 될
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,소요시간 로그 상태는 제출해야합니다.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,일련 번호 {0} 어떤 창고에 속하지 않는
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +650,Setting Up,설정
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +114,Setting Up,설정
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,Row # ,행 #
 DocType: Purchase Invoice,In Words (Company Currency),단어 (회사 통화)에서
 DocType: Pricing Rule,Supplier,공급 업체
@@ -1768,7 +1705,7 @@
 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 +166,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,비용이나 차이 계정은 필수 항목에 대한 {0}에 영향을 미치기 전체 재고 가치로
-apps/erpnext/erpnext/controllers/accounts_controller.py +354,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings",행의 항목 {0}에 대한 청구 되요 수 없습니다 {1}보다 {2}.과다 청구가 재고 설정에서 설정하시기 바랍니다 허용하려면
+apps/erpnext/erpnext/controllers/accounts_controller.py +355,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings",행의 항목 {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 +135,User {0} is disabled,{0} 사용자가 비활성화되어 있습니다
@@ -1781,27 +1718,26 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,{0} is mandatory for Item {1},{0} 항목에 대한 필수입니다 {1}
 DocType: Currency Exchange,From Currency,통화와
 DocType: DocField,Name,이름
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +211,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","이어야 한 행에 할당 된 금액, 송장 유형 및 송장 번호를 선택하세요"
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +104,Sales Order required for Item {0},상품에 필요한 판매 주문 {0}
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +158,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","이어야 한 행에 할당 된 금액, 송장 유형 및 송장 번호를 선택하세요"
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +107,Sales Order required for Item {0},상품에 필요한 판매 주문 {0}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +43,Amounts not reflected in system,시스템에 반영되지 금액
 DocType: Purchase Invoice Item,Rate (Company Currency),속도 (회사 통화)
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +40,Others,기타사항
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +40,Others,기타사항
 apps/erpnext/erpnext/templates/includes/product_page.js +80,Cannot find a matching Item. Please select some other value for {0}.,일치하는 항목을 찾을 수 없습니다. 에 대한 {0} 다른 값을 선택하십시오.
 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/frappe/frappe/core/doctype/doctype/boilerplate/controller_list.html +31,Completed,완료
 DocType: Web Form,Select DocType,문서 종류 선택
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +104,Broaching,꿰매
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +12,Banking,은행
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,은행
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +38,Please click on 'Generate Schedule' to get schedule,일정을 얻기 위해 '생성 일정'을 클릭 해주세요
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +283,New Cost Center,새로운 비용 센터
 DocType: Bin,Ordered Quantity,주문 수량
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +397,"e.g. ""Build tools for builders""","예) ""빌더를 위한  빌드 도구"""
+apps/erpnext/erpnext/public/js/setup_wizard.js +145,"e.g. ""Build tools for builders""","예) ""빌더를 위한  빌드 도구"""
 DocType: Quality Inspection,In Process,처리 중
 DocType: Authorization Rule,Itemwise Discount,Itemwise 할인
 DocType: Purchase Order Item,Reference Document Type,참조 문서 유형
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +318,{0} against Sales Order {1},{0} 판매 주문에 대한 {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +320,{0} against Sales Order {1},{0} 판매 주문에 대한 {1}
 DocType: Account,Fixed Asset,고정 자산
 apps/erpnext/erpnext/config/stock.py +283,Serialized Inventory,직렬화 된 재고
 DocType: Activity Type,Default Billing Rate,기본 결제 요금
@@ -1816,14 +1752,13 @@
 DocType: Purchase Invoice Item,Page Break,페이지 나누기
 DocType: Production Order Operation,Pending,대기 중
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,특정 직원의 휴가 응용 프로그램을 승인 할 수 있습니다 사용자
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +33,You cannot change default UOM of Variant. To change default UOM for Variant change default UOM of the Template,당신은 변형의 기본 UOM을 변경할 수 없습니다. 템플릿의 변형 변화 기본 UOM에 대한 기본 UOM을 변경하려면
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +50,Office Equipments,사무용품
 DocType: Purchase Invoice Item,Qty,수량
 DocType: Fiscal Year,Companies,회사
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +24,Electronics,전자 공학
+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/support/doctype/maintenance_visit/maintenance_visit.js +18,From Maintenance Schedule,유지 보수 일정에서
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +56,Full-time,전 시간
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +56,Full-time,전 시간
 DocType: Purchase Invoice,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.","당신이 판매 세금 및 요금 템플릿의 표준 템플릿을 생성 한 경우, 하나를 선택하고 아래 버튼을 클릭합니다."
@@ -1835,11 +1770,12 @@
 DocType: Job Applicant,Job Opening,구인
 DocType: Payment Reconciliation,Payment Reconciliation,결제 조정
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +154,Please select Incharge Person's name,INCHARGE 사람의 이름을 선택하세요
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +51,Technology,기술
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,기술
 DocType: Offer Letter,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,총 청구 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.","자식 노드를 추가하려면, 나무를 탐구하고 더 많은 노드를 추가 할 노드를 클릭합니다."
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +102,Credit To account must be a Payable account,대변계정은 채무 계정이어야합니다
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +233,BOM recursion: {0} cannot be parent or child of {2},BOM 재귀 : {0} 부모 또는 자녀가 될 수 없습니다 {2}
@@ -1852,10 +1788,8 @@
 DocType: Item,Customer Item Codes,고객 상품 코드
 DocType: Opportunity,Lost Reason,분실 된 이유
 apps/erpnext/erpnext/config/accounts.py +68,Create Payment Entries against Orders or Invoices.,주문 또는 송장에 대한 지불 항목을 만듭니다.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +141,Welding,용접
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +40,New Stock UOM is required,새로운 재고 UOM가 필요합니다
 DocType: Quality Inspection,Sample Size,표본 크기
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +443,All items have already been invoiced,모든 상품은 이미 청구 된
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +446,All items have already been invoiced,모든 상품은 이미 청구 된
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.','사건 번호에서'유효 기간을 지정하십시오
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +287,Further cost centers can be made under Groups but entries can be made against non-Groups,또한 비용 센터 그룹에서 할 수 있지만 항목이 아닌 그룹에 대해 할 수있다
 DocType: Project,External,외부
@@ -1867,8 +1801,7 @@
 DocType: Bin,Actual Quantity,실제 수량
 DocType: Shipping Rule,example: Next Day Shipping,예 : 익일 배송
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,발견되지 일련 번호 {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +563,Your Customers,고객
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +27,Compression molding,압축 성형
+apps/erpnext/erpnext/public/js/setup_wizard.js +303,Your Customers,고객
 DocType: Leave Block List Date,Block Date,블록 날짜
 DocType: Sales Order,Not Delivered,전달되지 않음
 ,Bank Clearance Summary,은행 정리 요약
@@ -1889,10 +1822,10 @@
 DocType: SMS Log,Sent To,전송
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +28,Make Sales Invoice,견적서에게 확인
 DocType: Company,For Reference Only.,참조 용으로 만 사용됩니다.
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +29,Invalid {0}: {1},잘못된 {0} : {1}
+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,용량 계획
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +49,'From Date' is required,'시작일자'가 필요합니다
+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,새로운 직장
@@ -1907,7 +1840,7 @@
 DocType: Serial No,Delivery Time,배달 시간
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,을 바탕으로 고령화
 DocType: Item,End of Life,수명 종료
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +41,Travel,여행
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +41,Travel,여행
 DocType: Leave Block List,Allow Users,사용자에게 허용
 DocType: Purchase Order,Customer Mobile No,고객 모바일 없음
 DocType: Sales Invoice,Recurring,반복
@@ -1921,7 +1854,7 @@
 DocType: Naming Series,User must always select,사용자는 항상 선택해야합니다
 DocType: Stock Settings,Allow Negative Stock,음의 재고 허용
 DocType: Installation Note,Installation Note,설치 노트
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +541,Add Taxes,세금 추가
+apps/erpnext/erpnext/public/js/setup_wizard.js +283,Add Taxes,세금 추가
 ,Financial Analytics,재무 분석
 DocType: Quality Inspection,Verified By,에 의해 확인
 DocType: Address,Subsidiary,자회사
@@ -1931,7 +1864,6 @@
 DocType: System Settings,In Hours,시간
 DocType: Process Payroll,Create Salary Slip,급여 슬립을 만듭니다
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Expected balance as per bank,은행에 따라 예상 균형
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +115,Buffing,버핑
 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,종업원
@@ -1948,11 +1880,11 @@
 DocType: Rename Tool,File to Rename,이름 바꾸기 파일
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +176,Purchse Order number required for Item {0},purchse를 주문 번호는 상품에 필요한 {0}
 apps/erpnext/erpnext/public/js/controllers/transaction.js +136,Show Payments,쇼 지불
-apps/erpnext/erpnext/controllers/buying_controller.py +245,Specified BOM {0} does not exist for Item {1},상품에 대한 존재하지 않습니다 BOM {0} {1}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +202,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,유지 보수 일정은 {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 +197,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,유지 보수 일정은 {0}이 판매 주문을 취소하기 전에 취소해야합니다
 apps/frappe/frappe/desk/page/backups/backups.html +13,Size,크기
 DocType: Notification Control,Expense Claim Approved,비용 청구 승인
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +113,Pharmaceutical,제약
+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,판매 주문 필수
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +30,Create Customer,고객을 만들기
@@ -1962,7 +1894,6 @@
 DocType: Quality Inspection Reading,Reading 9,9 읽기
 DocType: Supplier,Is Frozen,동결
 DocType: Buying Settings,Buying Settings,구매 설정
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +122,Mass finishing,질량 마무리
 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)
@@ -1970,7 +1901,7 @@
 DocType: Payment Tool,Payment Account,결제 계정
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +713,Please specify Company to proceed,진행하는 회사를 지정하십시오
 apps/frappe/frappe/public/js/frappe/model/indicator.js +30,Draft,초안
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +46,Compensatory Off,보상 오프
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Compensatory Off,보상 오프
 DocType: Quality Inspection Reading,Accepted,허용
 DocType: User,Female,여성
 DocType: Journal Entry Account,Debit in Account Currency,계정 통화에서 직불
@@ -1982,7 +1913,7 @@
 DocType: Shipping Rule,Shipping Rule Label,배송 규칙 라벨
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +209,Raw Materials cannot be blank.,원료는 비워 둘 수 없습니다.
 DocType: Newsletter,Test,미리 보기
-apps/erpnext/erpnext/stock/doctype/item/item.py +364,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +368,"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'","기존의 주식 거래는의 값을 변경할 수 없습니다 \이 항목에 대한 있기 때문에 &#39;일련 번호를 가지고&#39;, &#39;배치를 가지고 없음&#39;, &#39;주식 항목으로&#39;와 &#39;평가 방법&#39;"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +448,Quick Journal Entry,빠른 분개
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +92,You can not change rate if BOM mentioned agianst any item,BOM 어떤 항목 agianst 언급 한 경우는 속도를 변경할 수 없습니다
@@ -1993,13 +1924,14 @@
 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.,별도의 생산 순서는 각 완제품 항목에 대해 작성됩니다.
 DocType: Purchase Invoice,Terms and Conditions1,약관 및 상태 인 경우 1
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +18,Complete Setup,설정 완료
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard_page.html +18,Complete Setup,설정 완료
 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/config/crm.py +96,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 +57,Total Absent,총 결석
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +746,Item or Warehouse for row {0} does not match Material Request,행에 대한 항목이나 창고 {0} 물자의 요청과 일치하지 않습니다
@@ -2024,16 +1956,15 @@
 DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),기본 요금 (주식 UOM에 따라)
 DocType: SMS Log,No of Requested SMS,요청 SMS 없음
 DocType: Campaign,Campaign-.####,캠페인.# # # #
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +55,Piercing,꿰뚫는
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,다음 단계
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +117,Contract End Date must be greater than Date of Joining,계약 종료 날짜는 가입 날짜보다 커야합니다
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,수수료에 대한 회사의 제품을 판매하는 타사 대리점 / 딜러 /위원회 에이전트 / 제휴 / 대리점.
 DocType: Customer Group,Has Child Node,아이 노드에게 있습니다
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{0} against Purchase Order {1},{0} 구매 주문에 대한 {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +332,{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/page/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
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +110,Photochemical machining,광화학 가공
 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.
 
 #### Note
@@ -2079,7 +2010,7 @@
 DocType: Purchase Receipt Item,Recd Quantity,Recd 수량
 DocType: Email Account,Email Ids,이메일 IDS
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},더 많은 항목을 생성 할 수 없습니다 {0}보다 판매 주문 수량 {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +471,Stock Entry {0} is not submitted,재고 항목 {0} 제출되지
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +473,Stock Entry {0} is not submitted,재고 항목 {0} 제출되지
 DocType: Payment Reconciliation,Bank / Cash Account,은행 / 현금 계정
 DocType: Tax Rule,Billing City,결제시
 DocType: Global Defaults,Hide Currency Symbol,통화 기호에게 숨기기
@@ -2095,7 +2026,7 @@
 DocType: Purchase Invoice,Currency and Price List,통화 및 가격 목록
 DocType: Opportunity,Customer / Lead Name,고객 / 리드 명
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +63,Clearance Date not mentioned,통관 날짜가 언급되지 않았습니다
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +71,Production,생산
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Production,생산
 DocType: Item,Allow Production Order,허용 생산 주문
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +60,Row {0}:Start Date must be before End Date,행 {0} : 시작 날짜가 종료 날짜 이전이어야합니다
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),합계 (수량)
@@ -2108,7 +2039,7 @@
 apps/erpnext/erpnext/utilities/doctype/address/address.py +113,My Addresses,내 주소
 DocType: Stock Ledger Entry,Outgoing Rate,보내는 속도
 apps/erpnext/erpnext/config/hr.py +100,Organization branch master.,조직 분기의 마스터.
-apps/erpnext/erpnext/controllers/accounts_controller.py +237, or ,또는
+apps/erpnext/erpnext/controllers/accounts_controller.py +238, 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 위
@@ -2135,6 +2066,7 @@
 DocType: Stock Entry Detail,Serial No / Batch,일련 번호 / 배치
 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 +213,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',유지 보수 일정은 모든 항목에 대해 생성되지 않습니다.'생성 일정'을 클릭 해주세요
 ,To Produce,생산
 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}도 포함해야
@@ -2142,10 +2074,7 @@
 DocType: Bin,Reserved Quantity,예약 주문
 DocType: Landed Cost Voucher,Purchase Receipt Items,구매 영수증 항목
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,사용자 정의 양식
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +62,Cutting,절단
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +69,Flattening,편평
 DocType: Account,Income Account,수익 계정
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +22,Molding,조형
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +632,Delivery,배달
 DocType: Stock Reconciliation Item,Current Qty,현재 수량
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section","절 원가 계산의 ""에 근거를 자료의 평가""를 참조하십시오"
@@ -2155,20 +2084,19 @@
 apps/frappe/frappe/desk/moduleview.py +61,Documents,서류
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +17,Ref,참조
 DocType: Cost Center,Cost Center,비용 센터
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.js +48,Voucher #,상품권 #
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +36,Voucher #,상품권 #
 DocType: Notification Control,Purchase Order Message,구매 주문 메시지
 DocType: Tax Rule,Shipping Country,배송 국가
 DocType: Upload Attendance,Upload HTML,업로드 HTML
-apps/erpnext/erpnext/controllers/accounts_controller.py +391,"Total advance ({0}) against Order {1} cannot be greater \
+apps/erpnext/erpnext/controllers/accounts_controller.py +392,"Total advance ({0}) against Order {1} cannot be greater \
 				than the Grand Total ({2})","총 선수금  ({0})은 {1} \ 주문에 대하여 
  총합계 ({2})보다 클 수 없습니다"
 DocType: Employee,Relieving Date,날짜를 덜어
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +12,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.","가격 규칙은 몇 가지 기준에 따라, 가격 목록 / 할인 비율을 정의 덮어 쓰기를한다."
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,창고 재고 만 입력 / 배달 주 / 구매 영수증을 통해 변경 될 수 있습니다
 DocType: Employee Education,Class / Percentage,클래스 / 비율
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +92,Head of Marketing and Sales,마케팅 및 영업 책임자
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +31,Income Tax,소득세
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +157,Laser engineered net shaping,레이저 그물 형성을 설계
+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.,트랙은 산업 유형에 의해 리드.
 DocType: Item Supplier,Item Supplier,부품 공급 업체
@@ -2191,31 +2119,28 @@
 DocType: Stock Ledger Entry,Actual Qty After Transaction,거래 후 실제 수량
 ,Pending SO Items For Purchase Request,구매 요청에 대한 SO 항목 보류
 DocType: Supplier,Billing Currency,결제 통화
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +148,Extra Large,아주 큰
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,Extra Large,아주 큰
 ,Profit and Loss Statement,손익 계산서
 DocType: Bank Reconciliation Detail,Cheque Number,수표 번호
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +43,Pressing,누르면
 DocType: Payment Tool Detail,Payment Tool Detail,지불 도구 세부 정보
 ,Sales Browser,판매 브라우저
 DocType: Journal Entry,Total Credit,총 크레딧
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +474,Warning: Another {0} # {1} exists against stock entry {2},경고 : 또 다른 {0} # {1} 재고 항목에 대해 존재 {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +459,Local,지역정보 검색
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +476,Warning: Another {0} # {1} exists against stock entry {2},경고 : 또 다른 {0} # {1} 재고 항목에 대해 존재 {2}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +397,Local,지역정보 검색
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),대출 및 선수금 (자산)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,외상매출금
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +147,Large,큰
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +23,No employee found!,어떤 직원을 찾을 수 없습니다!
+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 +152,Please mention no of visits required,언급 해주십시오 필요한 방문 없음
 DocType: Purchase Order,Customer Address Display,고객의 주소 표시
 DocType: Stock Settings,Default Valuation Method,기본 평가 방법
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +127,Polishing,연마
 DocType: Production Order Operation,Planned Start Time,계획 시작 시간
 apps/erpnext/erpnext/config/accounts.py +63,Close Balance Sheet and book Profit or Loss.,닫기 대차 대조표 및 책 이익 또는 손실.
-apps/erpnext/erpnext/stock/doctype/item/item.py +661,"Default Unit of Measure for Item {0} cannot be changed directly because \
+apps/erpnext/erpnext/stock/doctype/item/item.py +665,"Default Unit of Measure for Item {0} cannot be changed directly because \
 			you have already made some transaction(s) with another UOM. To change default UOM, \
 			use 'UOM Replace Utility' tool under Stock module.","이미 다른 UOM 일부 거래 (들)을 만들었습니다 \ 있기 때문에 항목에 대한 측정의 기본 단위는 {0} 직접 변경할 수 없습니다. 기본 UOM을 변경하려면, \ 사용 stock 모듈에서 도구 &#39;UOM 유틸리티 바꾸기."
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,환율이 통화를 다른 통화로 지정
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +146,Quotation {0} is cancelled,견적 {0} 취소
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +141,Quotation {0} is cancelled,견적 {0} 취소
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,총 발행 금액
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} was on leave on {1}. Cannot mark attendance.,직원은 {0} {1}에 휴가를했다.출석을 표시 할 수 없습니다.
 DocType: Sales Partner,Targets,대상
@@ -2226,7 +2151,6 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +158,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,컴퓨터
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +112,Electro-chemical grinding,전기 화학적 연마
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +14,This is a root customer group and cannot be edited.,이 루트 고객 그룹 및 편집 할 수 없습니다.
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +39,Please setup your chart of accounts before you start Accounting Entries,회계 항목을 입력하기 전에  계정 차트를설정해주세요
 DocType: Purchase Invoice,Ignore Pricing Rule,가격 규칙을 무시
@@ -2284,7 +2208,6 @@
 DocType: Maintenance Visit,Purposes,목적
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +103,Atleast one item should be entered with negative quantity in return document,이어야 하나의 항목이 반환 문서에 부정적인 수량 입력해야합니다
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +67,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","작업 {0} 워크 스테이션에서 사용 가능한 근무 시간 이상 {1}, 여러 작업으로 작업을 분해"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +134,Electrochemical machining,전기 기계
 ,Requested,요청
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +66,No Remarks,없음 비고
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +13,Overdue,연체
@@ -2293,7 +2216,7 @@
 DocType: Monthly Distribution,Distribution Name,배포 이름
 DocType: Features Setup,Sales and Purchase,판매 및 구매
 DocType: Supplier Quotation Item,Material Request No,자료 요청 없음
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +218,Quality Inspection required for Item {0},상품에 필요한 품질 검사 {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +221,Quality Inspection required for Item {0},상품에 필요한 품질 검사 {0}
 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),인터넷 속도 (회사 통화)
@@ -2311,9 +2234,8 @@
 apps/erpnext/erpnext/accounts/report/financial_statements.py +16,Fiscal Year {0} not found.,회계 연도 {0}를 찾을 수 없습니다.
 DocType: Bank Reconciliation,Get Relevant Entries,관련 항목을보세요
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +407,Accounting Entry for Stock,재고에 대한 회계 항목
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +64,Coining,코 이닝
 DocType: Sales Invoice,Sales Team1,판매 Team1
-apps/erpnext/erpnext/stock/doctype/item/item.py +412,Item {0} does not exist,{0} 항목이 존재하지 않습니다
+apps/erpnext/erpnext/stock/doctype/item/item.py +416,Item {0} does not exist,{0} 항목이 존재하지 않습니다
 DocType: Sales Invoice,Customer Address,고객 주소
 apps/frappe/frappe/desk/query_report.py +136,Total,합계
 DocType: Purchase Invoice,Apply Additional Discount On,추가 할인에 적용
@@ -2325,14 +2247,13 @@
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),할인 금액 후 세액 (회사 통화)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +149,Target warehouse is mandatory for row {0},목표웨어 하우스는 행에 대해 필수입니다 {0}
 DocType: Quality Inspection,Quality Inspection,품질 검사
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +144,Extra Small,매우 작은
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +20,Spray forming,형성 스프레이
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Extra Small,매우 작은
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +458,Warning: Material Requested Qty is less than Minimum Order Qty,경고 : 수량 요청 된 자료는 최소 주문 수량보다 적은
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +191,Account {0} is frozen,계정 {0} 동결
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,조직에 속한 계정의 별도의 차트와 법인 / 자회사.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +29,"Food, Beverage & Tobacco","음식, 음료 및 담배"
+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 +529,Can only make payment against unbilled {0},단지에 대한 지불을 할 수 미 청구 {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +531,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/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Minimum Inventory Level,최소 재고 수준
 DocType: Stock Entry,Subcontract,하청
@@ -2343,19 +2264,18 @@
 DocType: Item,Manufacturer Part Number,제조업체 부품 번호
 DocType: Production Order Operation,Estimated Time and Cost,예상 시간 및 비용
 DocType: Bin,Bin,큰 상자
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +50,Nosing,디딤판 코
 DocType: SMS Log,No of Sent SMS,보낸 SMS 없음
 DocType: Account,Company,회사
 DocType: Account,Expense Account,비용 계정
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +49,Software,소프트웨어
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +151,Colour,컬러
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +49,Software,소프트웨어
+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",&quot;아니오&quot;와 &quot;판매 상품은&quot; &quot;주식의 항목으로&quot;여기서 &quot;예&quot;인 항목을 선택하고 다른 제품 번들이없는하세요
 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 +281,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 +134,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 +145,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,로그인에게 이름 바꾸기
@@ -2365,7 +2285,7 @@
 apps/erpnext/erpnext/controllers/recurring_document.py +162,Please select {0},선택하세요 {0}
 DocType: C-Form,C-Form No,C-양식 없음
 DocType: BOM,Exploded_items,Exploded_items
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +95,Researcher,연구원
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Researcher,연구원
 apps/frappe/frappe/custom/doctype/customize_form/customize_form.js +88,Update,업데이트
 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 +23,Name or Email is mandatory,이름이나 이메일은 필수입니다
@@ -2374,11 +2294,10 @@
 DocType: Employee,Exit,닫기
 apps/erpnext/erpnext/accounts/doctype/account/account.py +134,Root Type is mandatory,루트 유형이 필수입니다
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +295,Serial No {0} created,일련 번호 {0} 생성
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +125,Vibratory finishing,진동 마무리
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","고객의 편의를 위해, 이러한 코드는 송장 배송 메모와 같은 인쇄 포맷으로 사용될 수있다"
 DocType: Employee,You can enter any date manually,당신은 수동으로 날짜를 입력 할 수 있습니다
 DocType: Sales Invoice,Advertisement,광고
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +165,Probationary Period,수습 기간
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Probationary Period,수습 기간
 DocType: Customer Group,Only leaf nodes are allowed in transaction,만 잎 노드는 트랜잭션에 허용
 DocType: Expense Claim,Expense Approver,지출 승인
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,구매 영수증 품목 공급
@@ -2386,19 +2305,16 @@
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +17,To Datetime,날짜 시간에
 DocType: SMS Settings,SMS Gateway URL,SMS 게이트웨이 URL
 apps/erpnext/erpnext/config/crm.py +53,Logs for maintaining sms delivery status,SMS 전달 상태를 유지하기위한 로그
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +137,Grinding,연마
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +34,Shrink wrapping,포장 축소
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +36,Pending Activities,보류 활동
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,Confirmed,확인 된
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier > Supplier Type,공급 업체> 공급 업체 유형
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +127,Please enter relieving date.,날짜를 덜어 입력 해 주시기 바랍니다.
 apps/erpnext/erpnext/controllers/trends.py +137,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/hr/doctype/leave_application/leave_application.py +51,Only Leave Applications with status 'Approved' can be submitted,휴가신청은  '승인'상태로 제출 될 수있다
 apps/erpnext/erpnext/utilities/doctype/address/address.py +21,Address Title is mandatory.,주소 제목은 필수입니다.
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,메시지의 소스 캠페인 경우 캠페인의 이름을 입력
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +38,Newspaper Publishers,신문 발행인
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +38,Newspaper Publishers,신문 발행인
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,회계 연도 선택
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +88,Smelting,제련
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,재정렬 수준
 DocType: Attendance,Attendance Date,출석 날짜
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,급여 이별은 적립 및 차감에 따라.
@@ -2413,16 +2329,15 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +414,[Error],[오류]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,당신이 판매 주문을 저장하면 단어에서 볼 수 있습니다.
 ,Employee Birthday,직원 생일
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +55,Venture Capital,벤처 캐피탈
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,벤처 캐피탈
 DocType: UOM,Must be Whole Number,전체 숫자 여야합니다
 DocType: Leave Control Panel,New Leaves Allocated (In Days),(일) 할당 된 새로운 잎
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +51,Serial No {0} does not exist,일련 번호 {0}이 (가) 없습니다
 DocType: Pricing Rule,Discount Percentage,할인 비율
 DocType: Payment Reconciliation Invoice,Invoice Number,송장 번호
-apps/erpnext/erpnext/hooks.py +70,Orders,명령
+apps/erpnext/erpnext/hooks.py +54,Orders,명령
 DocType: Leave Control Panel,Employee Type,직원 유형
 DocType: Employee Leave Approver,Leave Approver,승인자를 남겨
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +70,Swaging,스웨이 징
 DocType: Manufacturing Settings,Material Transferred for Manufacture,재료 제조에 양도
 DocType: Expense Claim,"A user with ""Expense Approver"" role","""비용 승인자""역할이있는 사용자"
 ,Issued Items Against Production Order,생산 오더에 대해 실행 항목
@@ -2434,7 +2349,6 @@
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +62,Cost Center with existing transactions can not be converted to group,기존의 트랜잭션 비용 센터는 그룹으로 변환 할 수 없습니다
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Depreciation,감가 상각
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),공급 업체 (들)
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +29,Invalid period,잘못된 기간
 DocType: Customer,Credit Limit,신용 한도
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,거래 종류 선택
 DocType: GL Entry,Voucher No,바우처 없음
@@ -2444,9 +2358,9 @@
 DocType: Customer,Address and Contact,주소와 연락처
 DocType: Customer,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}"
 apps/erpnext/erpnext/accounts/party.py +284,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),참고 : 지원 / 참조 날짜가 {0} 일에 의해 허용 된 고객의 신용 일을 초과 (들)
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +621,Maint. Schedule,MAINT. 예정
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +108,Abrasive jet machining,연마 제트 가공
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +632,Maint. Schedule,MAINT. 예정
 DocType: Stock Settings,Freeze Stock Entries,동결 재고 항목
 DocType: Website Settings,Website Settings,웹 사이트 설정
 DocType: Item,Reorder level based on Warehouse,웨어 하우스를 기반으로 재정렬 수준
@@ -2463,7 +2377,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +75,Show Stock Entries,보기 재고 항목
 ,Is Primary Address,기본 주소는
 DocType: Production Order,Work-in-Progress Warehouse,작업중인 창고
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +308,Reference #{0} dated {1},참고 # {0} 년 {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Reference #{0} dated {1},참고 # {0} 년 {1}
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +13,Manage Addresses,주소를 관리
 DocType: Pricing Rule,Item Code,상품 코드
 DocType: Production Planning Tool,Create Production Orders,생산 오더를 생성
@@ -2472,7 +2386,7 @@
 DocType: Lead,Market Segment,시장 세분
 DocType: Communication,Phone,휴대폰
 DocType: Employee Internal Work History,Employee Internal Work History,직원 내부 작업 기록
-apps/erpnext/erpnext/public/js/account_tree_grid.js +50,Closing (Dr),결산 (박사)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +221,Closing (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.,거래를 판매에 대한 세금 템플릿.
@@ -2488,8 +2402,8 @@
 ,Billed Amount,청구 금액
 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 +129,Material Request {0} is cancelled or stopped,자료 요청 {0} 취소 또는 정지
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +641,Add a few sample records,몇 가지 샘플 레코드 추가
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +133,Material Request {0} is cancelled or stopped,자료 요청 {0} 취소 또는 정지
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Add a few sample records,몇 가지 샘플 레코드 추가
 apps/erpnext/erpnext/config/hr.py +210,Leave Management,관리를 남겨주세요
 DocType: Event,Groups,그룹
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,계정별 그룹
@@ -2502,38 +2416,34 @@
 DocType: Features Setup,Sales Extras,판매 부가항목
 apps/erpnext/erpnext/accounts/utils.py +344,{0} budget for Account {1} against Cost Center {2} will exceed by {3},{0} 계정에 대한 예산은 {1} 코스트 센터에 대해 {2} {3}에 의해 초과
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +236,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","콘텐츠 화해는 열기 항목이기 때문에 차이 계정, 자산 / 부채 형 계정이어야합니다"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +138,Purchase Order number required for Item {0},구매 주문 번호 항목에 필요한 {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Order number required for Item {0},구매 주문 번호 항목에 필요한 {0}
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date','시작일자'는  '마감일자'이후이 여야합니다
 ,Stock Projected Qty,재고 수량을 예상
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +147,Customer {0} does not belong to project {1},고객 {0} 프로젝트에 속하지 않는 {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +150,Customer {0} does not belong to project {1},고객 {0} 프로젝트에 속하지 않는 {1}
 DocType: Sales Order,Customer's Purchase Order,고객의 구매 주문
 DocType: Warranty Claim,From Company,회사에서
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,값 또는 수량
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Minute,분
+apps/erpnext/erpnext/public/js/setup_wizard.js +363,Minute,분
 DocType: Purchase Invoice,Purchase Taxes and Charges,구매 세금과 요금
 ,Qty to Receive,받도록 수량
 DocType: Leave Block List,Leave Block List Allowed,차단 목록은 허용 남겨
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +61,Conversion factor cannot be in fractions,전환 요인은 분수에있을 수 없습니다
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +358,You will use it to Login,당신은 로그인하는 데 사용할 것
+apps/erpnext/erpnext/public/js/setup_wizard.js +108,You will use it to Login,당신은 로그인하는 데 사용할 것
 DocType: Sales Partner,Retailer,소매상 인
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +99,Credit To account must be a Balance Sheet account,계정에 신용은 대차 대조표 계정이어야합니다
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,모든 공급 유형
 apps/erpnext/erpnext/stock/doctype/item/item.py +37,Item Code is mandatory because Item is not automatically numbered,항목이 자동으로 번호가되어 있지 않기 때문에 상품 코드는 필수입니다
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +99,Quotation {0} not of type {1},견적 {0}은 유형 {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +93,Quotation {0} not of type {1},견적 {0}은 유형 {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,유지 보수 일정 상품
 DocType: Sales Order,%  Delivered,% 배달
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,Bank Overdraft Account,당좌 차월 계정
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +15,Make Salary Slip,급여 슬립을
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +18,Browse BOM,찾아 BOM
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +175,Secured Loans,보안 대출
-apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +3,Awesome Products,최고 제품
+apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +3,Awesome Products,최고 제품
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +189,Opening Balance Equity,잔액 지분
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +80,Cannot approve leave as you are not authorized to approve leaves on Block Dates,당신이 블록 날짜에 잎을 승인 할 수있는 권한이 없습니다로 휴가를 승인 할 수 없습니다
 DocType: Appraisal,Appraisal,펑가
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +13,Lost-foam casting,분실 거품 주조
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +47,Drawing,그림
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +22,Date is repeated,날짜는 반복된다
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +148,Leave approver must be one of {0},남겨 승인 중 하나 여야합니다 {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +162,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,시작 시간
@@ -2547,7 +2457,7 @@
 DocType: Purchase Invoice Item,Net Amount (Company Currency),순 금액 (회사 통화)
 DocType: BOM Operation,Hour Rate,시간 비율
 DocType: Stock Settings,Item Naming By,상품 이름 지정으로
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +642,From Quotation,견적에서
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +655,From Quotation,견적에서
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},또 다른 기간 결산 항목은 {0} 이후 한 {1}
 DocType: Production Order,Material Transferred for Manufacturing,재료 제조에 대한 양도
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +29,Account {0} does not exists,계정 {0}이 존재하지 않습니다
@@ -2561,21 +2471,19 @@
 DocType: Purchase Invoice Item,PR Detail,PR의 세부 사항
 DocType: Sales Order,Fully Billed,완전 청구
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +20,Cash In Hand,손에 현금
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +72,Delivery warehouse required for stock item {0},배송 창고 재고 항목에 필요한 {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +119,Delivery warehouse required for stock item {0},배송 창고 재고 항목에 필요한 {0}
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),패키지의 총 무게.보통 그물 무게 + 포장 재료의 무게. (프린트)
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,이 역할이있는 사용자는 고정 된 계정에 대한 계정 항목을 수정 / 동결 계정을 설정하고 만들 수 있습니다
 DocType: Serial No,Is Cancelled,취소된다
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +281,My Shipments,내 선적
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +286,My Shipments,내 선적
 DocType: Journal Entry,Bill Date,청구 일자
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +43,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","우선 순위가 가장 높은 가격에 여러 규칙이있는 경우에도, 그 다음 다음 내부의 우선 순위가 적용됩니다"
 DocType: Supplier,Supplier Details,공급 업체의 상세 정보
 DocType: Communication,Recipients,받는 사람
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +146,Screwing,나사
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +96,Knurling,널링
 DocType: Expense Claim,Approval Status,승인 상태
 DocType: Hub Settings,Publish Items to Hub,허브에 항목을 게시
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +44,From value must be less than to value in row {0},값에서 행의 값보다 작아야합니다 {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +133,Wire Transfer,송금
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +133,Wire Transfer,송금
 apps/erpnext/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py +25,Please select Bank Account,은행 계좌를 선택하세요
 DocType: Newsletter,Create and Send Newsletters,작성 및 보내기 뉴스 레터
 apps/frappe/frappe/public/js/frappe/views/reports/grid_report.js +305,From Date must be before To Date,날짜 누계 이전이어야합니다
@@ -2583,14 +2491,14 @@
 DocType: Company,Default Income Account,기본 수입 계정
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,고객 그룹 / 고객
 DocType: Item Group,Check this if you want to show in website,당신이 웹 사이트에 표시 할 경우이 옵션을 선택
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +190,Welcome to ERPNext,ERPNext에 오신 것을 환영합니다
+,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/page/setup_wizard/install_fixtures.py +37,Calls,통화
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Calls,통화
 DocType: Project,Total Costing Amount (via Time Logs),총 원가 계산 금액 (시간 로그를 통해)
 DocType: Purchase Order Item Supplied,Stock UOM,재고 UOM
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Purchase Order {0} is not submitted,구매 주문 {0} 제출되지
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +194,Purchase Order {0} is not submitted,구매 주문 {0} 제출되지
 ,Projected,예상
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},일련 번호 {0} 창고에 속하지 않는 {1}
 apps/erpnext/erpnext/controllers/status_updater.py +136,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,주 : 시스템이 항목에 대한 납품에 이상 - 예약 확인하지 않습니다 {0} 수량 또는 금액으로 0이됩니다
@@ -2598,7 +2506,6 @@
 DocType: Issue,Opening Date,Opening 날짜
 DocType: Journal Entry,Remark,비고
 DocType: Purchase Receipt Item,Rate and Amount,속도 및 양
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +95,Boring,지루한
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +667,From Sales Order,판매 주문에서
 DocType: Blog Category,Parent Website Route,상위 웹 사이트 루트
 DocType: Sales Order,Not Billed,청구되지 않음
@@ -2612,19 +2519,17 @@
 apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount Amount,할인 금액
 DocType: Purchase Invoice,Return Against Purchase Invoice,에 대하여 구매 송장을 돌려줍니다
 DocType: Item,Warranty Period (in days),(일) 보증 기간
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +550,e.g. VAT,예) VAT
+apps/erpnext/erpnext/public/js/setup_wizard.js +292,e.g. VAT,예) VAT
 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,견적 시리즈
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +52,"An item exists with same name ({0}), please change the item group name or rename the item",항목 ({0}) 항목의 그룹 이름을 변경하거나 항목의 이름을 변경하시기 바랍니다 같은 이름을 가진
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +82,Hot metal gas forming,열간 금속 가스
 DocType: Sales Order Item,Sales Order Date,판매 주문 날짜
 DocType: Sales Invoice Item,Delivered Qty,납품 수량
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +63,Warehouse {0}: Company is mandatory,창고 {0} : 회사는 필수입니다
 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.",세율을 언급 해당 그룹 (펀드&gt; 유동 부채&gt; 세금 및 관세의 보통 소스로 이동 유형 &quot;세금&quot;의) 자식을 추가 클릭하여 (새 계정을 만들 않습니다.
 ,Payment Period Based On Invoice Date,송장의 날짜를 기준으로 납부 기간
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +50,Missing Currency Exchange Rates for {0},대한 누락 된 통화 환율 {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +135,Laser cutting,레이저 절단
 DocType: Event,Monday,월요일
 DocType: Journal Entry,Stock Entry,재고 항목
 DocType: Account,Payable,지급
@@ -2657,7 +2562,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +111,Date Of Retirement must be greater than Date of Joining,은퇴 날짜 가입 날짜보다 커야합니다
 DocType: Sales Invoice,Against Income Account,손익 계정에 대한
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +69,{0}% Delivered,{0} % 배달
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +78,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,항목 {0} : 정렬 된 수량은 {1} 최소 주문 수량 {2} (항목에 정의)보다 작을 수 없습니다.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,항목 {0} : 정렬 된 수량은 {1} 최소 주문 수량 {2} (항목에 정의)보다 작을 수 없습니다.
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,월별 분포 비율
 DocType: Territory,Territory Targets,지역 대상
 DocType: Delivery Note,Transporter Info,트랜스 정보
@@ -2666,7 +2571,6 @@
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,인쇄 템플릿의 제목은 형식 상 청구서를 예.
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +140,Valuation type charges can not marked as Inclusive,평가 유형 요금은 포괄적으로 표시 할 수 없습니다
 DocType: POS Profile,Update Stock,재고 업데이트
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +128,Superfinishing,Superfinishing
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,항목에 대해 서로 다른 UOM가 잘못 (총) 순 중량 값으로 이어질 것입니다.각 항목의 순 중량이 동일한 UOM에 있는지 확인하십시오.
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM 평가
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +85,Please pull items from Delivery Note,배달 주에서 항목을 뽑아주세요
@@ -2681,7 +2585,6 @@
 ,Purchase Analytics,구매 분석
 DocType: Sales Invoice Item,Delivery Note Item,배송 참고 항목
 DocType: Expense Claim,Task,태스크
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +57,Shaving,면도
 DocType: Purchase Taxes and Charges,Reference Row #,참조 행 번호
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},배치 번호는 항목에 대해 필수입니다 {0}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js +14,This is a root sales person and cannot be edited.,이 루트 판매 사람 및 편집 할 수 없습니다.
@@ -2693,13 +2596,11 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +74,Purpose must be one of {0},목적 중 하나 여야합니다 {0}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +108,Fill the form and save it,양식을 작성하고 저장
 DocType: Production Planning Tool,Download a report containing all raw materials with their latest inventory status,그들의 최신의 재고 상황에 따라 모든 원료가 포함 된 보고서를 다운로드
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +94,Facing,직면
 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,SMS 보내기
 DocType: Company,Default Letter Head,편지 헤드 기본
 DocType: Time Log,Billable,청구
-DocType: Authorization Rule,This will be used for setting rule in HR module,이것은 HR 모듈 규칙을 설정하는 데 사용할
 DocType: Account,Rate at which this tax is applied,요금이 세금이 적용되는
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reorder Qty,재주문 수량
 DocType: Company,Stock Adjustment Account,재고 조정 계정
@@ -2726,16 +2627,15 @@
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,백분율 할당은 100 % 같아야
 DocType: Serial No,Out of AMC,AMC의 아웃
 DocType: Purchase Order Item,Material Request Detail No,자료 요청의 세부 사항 없음
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +97,Hard turning,하드 터닝
 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 +79,Company (not Customer or Supplier) master.,회사 (안 고객 또는 공급 업체) 마스터.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +106,Please enter 'Expected Delivery Date','예상 배달 날짜'를 입력하십시오
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +187,Delivery Notes {0} must be cancelled before cancelling this Sales Order,배달 노트는 {0}이 판매 주문을 취소하기 전에 취소해야합니다
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +100,Please enter 'Expected Delivery Date','예상 배달 날짜'를 입력하십시오
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +182,Delivery Notes {0} must be cancelled before cancelling this Sales Order,배달 노트는 {0}이 판매 주문을 취소하기 전에 취소해야합니다
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +373,Paid amount + Write Off Amount can not be greater than Grand Total,지불 금액 + 금액 오프 쓰기 총합보다 클 수 없습니다
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} 항목에 대한 유효한 배치 번호없는 {1}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,Note: There is not enough leave balance for Leave Type {0},참고 : 허가 유형에 대한 충분한 휴가 밸런스가 없습니다 {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +124,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,기회의 유형
@@ -2747,7 +2647,7 @@
 DocType: Hub Settings,Publish Availability,가용성을 게시
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +105,Date of Birth cannot be greater than today.,생년월일은 오늘보다 클 수 없습니다.
 ,Stock Ageing,재고 고령화
-apps/erpnext/erpnext/controllers/accounts_controller.py +200,{0} '{1}' is disabled,{0} '{1}'해제
+apps/erpnext/erpnext/controllers/accounts_controller.py +201,{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.,제출 거래에 연락처에 자동으로 이메일을 보내십시오.
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +232,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
@@ -2757,44 +2657,38 @@
 DocType: Purchase Order,Customer Contact Email,고객 연락처 이메일
 DocType: Event,Sunday,일요일
 DocType: Sales Team,Contribution (%),기여도 (%)
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +455,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,참고 : 결제 항목이 '현금 또는 은행 계좌'이 지정되지 않았기 때문에 생성되지 않습니다
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +171,Responsibilities,책임
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +457,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 +11,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,표에이어야 1 송장을 입력하십시오
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +511,Add Users,사용자 추가
+apps/erpnext/erpnext/public/js/setup_wizard.js +255,Add Users,사용자 추가
 DocType: Pricing Rule,Item Group,항목 그룹
 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),추가 세금 및 수수료 (회사 통화)
-apps/erpnext/erpnext/stock/doctype/item/item.py +340,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,상품 세금 행 {0} 유형의 세금 또는 수입 비용 또는 청구의 계정이 있어야합니다
+apps/erpnext/erpnext/stock/doctype/item/item.py +344,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,상품 세금 행 {0} 유형의 세금 또는 수입 비용 또는 청구의 계정이 있어야합니다
 DocType: Sales Order,Partly Billed,일부 청구
 DocType: Item,Default BOM,기본 BOM
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +79,Decambering,Decambering
 apps/erpnext/erpnext/setup/doctype/company/company.js +22,Please re-type company name to confirm,다시 입력 회사 이름은 확인하시기 바랍니다
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,총 발행 AMT 사의
 DocType: Time Log Batch,Total Hours,총 시간
 DocType: Journal Entry,Printing Settings,인쇄 설정
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +268,Total Debit must be equal to Total Credit. The difference is {0},총 직불 카드는 전체 신용 동일해야합니다.차이는 {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +11,Automotive,자동차
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +37,Item is required,항목이 필요합니다
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +25,Metal injection molding,금속 사출 성형
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +258,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/accounts/doctype/sales_invoice/sales_invoice.js +684,From Delivery Note,배달 주에서
 DocType: Time Log,From Time,시간에서
 DocType: Notification Control,Custom Message,사용자 지정 메시지
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +33,Investment Banking,투자 은행
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +261,"Select your Country, Time Zone and Currency","국가, 시간대 및 통화를 선택"
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,투자 은행
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +316,"Select your Country, Time Zone and Currency","국가, 시간대 및 통화를 선택"
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +369,Cash or Bank Account is mandatory for making payment entry,현금 또는 은행 계좌 결제 항목을 만들기위한 필수입니다
 DocType: Purchase Invoice,Price List Exchange Rate,가격 기준 환율
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +91,Pickling,산세
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +18,Sand casting,모래 주조
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +117,Electroplating,전기 도금
 DocType: Purchase Invoice Item,Rate,비율
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +62,Intern,인턴
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Intern,인턴
 DocType: Newsletter,A Lead with this email id should exist,이 이메일 ID와 리드가 존재한다
 DocType: Stock Entry,From BOM,BOM에서
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +34,Basic,기본
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +34,Basic,기본
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,{0} 전에 재고 거래는 동결
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +217,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,다른 날짜로 반나절 휴직 일로부터 동일해야합니다
@@ -2802,11 +2696,11 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +96,Reference No is mandatory if you entered Reference Date,당신이 참조 날짜를 입력 한 경우 참조 번호는 필수입니다
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +108,Date of Joining must be greater than Date of Birth,가입 날짜는 출생의 날짜보다 커야합니다
 DocType: Salary Structure,Salary Structure,급여 체계
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +242,"Multiple Price Rule exists with same criteria, please resolve \
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +246,"Multiple Price Rule exists with same criteria, please resolve \
 			conflict by assigning priority. Price Rules: {0}","여러 가격 규칙이 동일한 기준 존재, 우선 순위를 할당하여 \
  충돌을 해결하십시오.가격 규칙 : {0}"
 DocType: Account,Bank,은행
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +9,Airline,항공 회사
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,항공 회사
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +493,Issue Material,문제의 소재
 DocType: Material Request Item,For Warehouse,웨어 하우스
 DocType: Employee,Offer Date,제공 날짜
@@ -2816,29 +2710,24 @@
 DocType: Item,Is Fixed Asset Item,고정 자산 상품에게 있습니다
 DocType: Stock Entry,Including items for sub assemblies,서브 어셈블리에 대한 항목을 포함
 DocType: Features Setup,"If you have long print formats, this feature can be used to split the page to be printed on multiple pages with all headers and footers on each page","당신이 긴 프린트 형식이있는 경우,이 기능은 각 페이지의 모든 머리글과 바닥 글과 함께 여러 페이지에 인쇄 할 페이지를 분할 할 수 있습니다"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +131,Hobbing,호빙
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +98,All Territories,모든 국가
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +98,All Territories,모든 국가
 DocType: Purchase Invoice,Items,아이템
 DocType: Fiscal Year,Year Name,올해의 이름
 DocType: Process Payroll,Process Payroll,프로세스 급여
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +59,There are more holidays than working days this month.,이번 달 작업 일 이상 휴일이 있습니다.
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +68,There are more holidays than working days this month.,이번 달 작업 일 이상 휴일이 있습니다.
 DocType: Product Bundle Item,Product Bundle Item,번들 제품 항목
 DocType: Sales Partner,Sales Partner Name,영업 파트너 명
 DocType: Purchase Invoice Item,Image View,이미지보기
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +113,Finishing & industrial finishing,마무리 및 산업 마무리
 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/page/setup_wizard/fixtures/industry_type.py +46,Securities & Commodity Exchanges,증권 및 상품 교환
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,증권 및 상품 교환
 DocType: Shipping Rule,Calculate Based On,에 의거에게 계산
 DocType: Delivery Note Item,From Warehouse,창고에서
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +98,Drilling,드릴링
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +28,Blow molding,블로우 성형
 DocType: Purchase Taxes and Charges,Valuation and Total,평가 및 총
 DocType: Tax Rule,Shipping City,배송시
 apps/erpnext/erpnext/stock/doctype/item/item.js +43,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,이 항목은 {0} (템플릿)의 변종이다.'카피'가 설정되어 있지 않는 속성은 템플릿에서 복사됩니다
 DocType: Account,Purchase User,구매 사용자
 DocType: Notification Control,Customize the Notification,알림 사용자 지정
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +87,Hammering,망치로 침
 DocType: Web Page,Slideshow,슬라이드쇼
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +24,Default Address Template cannot be deleted,기본 주소 템플릿을 삭제할 수 없습니다
 DocType: Sales Invoice,Shipping Rule,배송 규칙
@@ -2847,9 +2736,8 @@
 DocType: Workflow State,Search,{0}{/0}{1}검색 {/1}
 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,'마지막 주문 날짜 이후'는 0보다 크거나 같아야합니다
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +142,Brazing,브레이징
 DocType: C-Form,Amended From,개정
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Raw Material,원료
+apps/erpnext/erpnext/public/js/setup_wizard.js +359,Raw Material,원료
 DocType: Leave Application,Follow via Email,이메일을 통해 수행
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,할인 금액 후 세액
 apps/erpnext/erpnext/accounts/doctype/account/account.py +174,Child account exists for this account. You can not delete this account.,이 계정에 하위계정이 존재합니다.이 계정을 삭제할 수 없습니다.
@@ -2863,10 +2751,10 @@
 ,Produced,생산
 DocType: Item,Item Code for Suppliers,공급 업체에 대한 상품 코드
 DocType: Issue,Raised By (Email),(이메일)에 의해 제기
-apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +72,General,일반
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +495,Attach Letterhead,레터 첨부하기
+apps/erpnext/erpnext/setup/setup_wizard/default_website.py +72,General,일반
+apps/erpnext/erpnext/public/js/setup_wizard.js +241,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/setup/page/setup_wizard/setup_wizard.js +542,"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/public/js/setup_wizard.js +284,"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},직렬화 된 항목에 대한 일련 NOS 필수 {0}
 DocType: Journal Entry,Bank Entry,은행 입장
 DocType: Authorization Rule,Applicable To (Designation),에 적용 (지정)
@@ -2875,33 +2763,32 @@
 apps/erpnext/erpnext/config/accounts.py +143,Enable / disable currencies.,/ 비활성화 통화를 사용합니다.
 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 ()
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +26,Entertainment & Leisure,엔터테인먼트 & 레저
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,엔터테인먼트 & 레저
 DocType: Purchase Order,The date on which recurring order will be stop,반복되는 순서가 중지됩니다 된 날짜
 DocType: Quality Inspection,Item Serial No,상품 시리얼 번호
 apps/erpnext/erpnext/controllers/status_updater.py +142,{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 +57,Total Present,전체 현재
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Hour,시간
+apps/erpnext/erpnext/public/js/setup_wizard.js +363,Hour,시간
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +138,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation","직렬화 된 항목 {0} 재고 조정을 사용 \
  업데이트 할 수 없습니다"
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +488,Transfer Material to Supplier,공급 업체에 자료를 전송
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +513,Transfer Material to Supplier,공급 업체에 자료를 전송
 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/crm/doctype/opportunity/opportunity.js +82,Create Quotation,견적을 만들기
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +306,All these items have already been invoiced,이러한 모든 항목이 이미 청구 된
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,You are not authorized to approve leaves on Block Dates,당신은 블록 날짜에 잎을 승인 할 수있는 권한이 없습니다
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +311,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,교체 후 새로운 BOM
 DocType: Features Setup,Point of Sale,판매 시점
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +83,Curling,컬링
 DocType: Account,Tax,세금
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +28,Row {0}: {1} is not a valid {2},행 {0} : {1} 유효하지 않은 {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +89,Refining,정제
+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,생산 계획 도구
 DocType: Quality Inspection,Report Date,보고서 날짜
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +130,Routing,라우팅
 DocType: C-Form,Invoices,송장
 DocType: Job Opening,Job Title,직책
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +54,{0} already allocated for Employee {1} for period {2} - {3},{0} 이미 기간 동안 직원 {1}에 할당 된 {2} - {3}
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +80,{0} Recipients,{0}받는 사람
 DocType: Features Setup,Item Groups in Details,자세한 사항 상품 그룹
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +335,Quantity to Manufacture must be greater than 0.,제조하는 수량은 0보다 커야합니다.
@@ -2919,14 +2806,13 @@
 DocType: DocType,Setup,설정
 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,이 달 보류중인 활동에 대한 요약
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +39,Cold rolling,냉간 압연
 DocType: Customer Group,Customer Group Name,고객 그룹 이름
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +408,Please remove this Invoice {0} from C-Form {1},C-양식에서이 송장 {0}을 제거하십시오 {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +410,Please remove this Invoice {0} from C-Form {1},C-양식에서이 송장 {0}을 제거하십시오 {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,속성
 DocType: Packing Slip,Get Items,항목 가져 오기
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +186,Please enter Write Off Account,계정을 끄기 쓰기 입력하십시오
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +187,Please enter Write Off Account,계정을 끄기 쓰기 입력하십시오
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +71,Last Order Date,마지막 주문 날짜
 DocType: DocField,Image,영상
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +179,Make Excise Invoice,소비세 송장에게 확인
@@ -2936,7 +2822,7 @@
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +146,Operation ID not set,작업 ID가 설정되어 있지
 DocType: Production Order,Planned Start Date,계획 시작 날짜
 DocType: Serial No,Creation Document Type,작성 문서 형식
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +620,Maint. Visit,MAINT. 방문
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +631,Maint. Visit,MAINT. 방문
 DocType: Leave Type,Is Encash,현금화는
 DocType: Purchase Invoice,Mobile No,모바일 없음
 DocType: Payment Tool,Make Journal Entry,저널 항목을 만듭니다
@@ -2944,35 +2830,31 @@
 apps/erpnext/erpnext/controllers/trends.py +257,Project-wise data is not available for Quotation,프로젝트 와이즈 데이터는 견적을 사용할 수 없습니다
 DocType: Project,Expected End Date,예상 종료 날짜
 DocType: Appraisal Template,Appraisal Template Title,평가 템플릿 제목
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +440,Commercial,광고 방송
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +378,Commercial,광고 방송
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +23,Parent Item {0} must not be a Stock Item,상위 항목 {0} 주식 항목이 아니어야합니다
 DocType: Cost Center,Distribution Id,배신 ID
-apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +14,Awesome Services,멋진 서비스
+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,공급 업체 주소
 DocType: Contact Us Settings,Address Line 2,2 호선 주소
 DocType: ToDo,Reference,참고
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +59,Perforating,천공
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,수량 아웃
 apps/erpnext/erpnext/config/accounts.py +128,Rules to calculate shipping amount for a sale,판매 배송 금액을 계산하는 규칙
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +29,Series is mandatory,시리즈는 필수입니다
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +28,Financial Services,금융 서비스
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,금융 서비스
 apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3},{0} 속성에 대한 값의 범위 내에 있어야합니다 {1}에 {2}의 단위로 {3}
 DocType: Tax Rule,Sales,판매
 DocType: Stock Entry Detail,Basic Amount,기본 금액
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +173,Warehouse required for stock Item {0},재고 품목에 필요한 창고 {0}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +178,Warehouse required for stock Item {0},재고 품목에 필요한 창고 {0}
 DocType: Leave Allocation,Unused leaves,사용하지 않는 잎
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,CR
 DocType: Customer,Default Receivable Accounts,미수금 기본
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +102,Sawing,톱질
 DocType: Tax Rule,Billing State,결제 주
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +32,Laminating,라미네이팅
 DocType: Item Reorder,Transfer,이체
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +549,Fetch exploded BOM (including sub-assemblies),(서브 어셈블리 포함) 폭발 BOM 가져 오기
 DocType: Authorization Rule,Applicable To (Employee),에 적용 (직원)
 apps/erpnext/erpnext/controllers/accounts_controller.py +101,Due Date is mandatory,마감일은 필수입니다
 apps/erpnext/erpnext/controllers/item_variant.py +51,Increment for Attribute {0} cannot be 0,속성에 대한 증가는 {0} 0이 될 수 없습니다
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +143,Sintering,소결
 DocType: Journal Entry,Pay To / Recd From,지불 / 수취처
 DocType: Naming Series,Setup Series,설치 시리즈
 DocType: Supplier,Contact HTML,연락 HTML
@@ -2985,7 +2867,6 @@
 DocType: Attendance,Absent,없는
 DocType: Product Bundle,Product Bundle,번들 제품
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +180,Row {0}: Invalid reference {1},행 {0} : 잘못된 참조 {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +165,Crushing,분쇄
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,구매세금 및 요금 템플릿
 DocType: Upload Attendance,Download Template,다운로드 템플릿
 DocType: GL Entry,Remarks,Remarks
@@ -2993,14 +2874,12 @@
 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/setup/page/setup_wizard/fixtures/operations.py +9,Continuous casting,연속 주조
 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/setup/page/setup_wizard/fixtures/operations.py +80,Cold sizing,콜드 크기 조정
 DocType: Salary Slip,Earning & Deduction,당기순이익/손실
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +76,Account {0} cannot be a Group,계정 {0} 그룹이 될 수 없습니다
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +259,Region,지방
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +314,Region,지방
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +213,Optional. This setting will be used to filter in various transactions.,선택.이 설정은 다양한 거래를 필터링하는 데 사용됩니다.
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +104,Negative Valuation Rate is not allowed,부정 평가 비율은 허용되지 않습니다
 DocType: Holiday List,Weekly Off,주간 끄기
@@ -3018,7 +2897,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,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,날짜에 날짜 및 출석 출석은 필수입니다
-apps/erpnext/erpnext/controllers/buying_controller.py +131,Please enter 'Is Subcontracted' as Yes or No,입력 해주십시오은 예 또는 아니오로 '하청'
+apps/erpnext/erpnext/controllers/buying_controller.py +122,Please enter 'Is Subcontracted' as Yes or No,입력 해주십시오은 예 또는 아니오로 '하청'
 DocType: Sales Team,Contact No.,연락 번호
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,'Profit and Loss' type account {0} not allowed in Opening Entry,'손익'계정  {0}은 개시기입이 허용되지 않습니다
 DocType: Workflow State,Time,시간
@@ -3027,14 +2906,13 @@
 DocType: Authorization Rule,Authorization Rule,권한 부여 규칙
 DocType: Sales Invoice,Terms and Conditions Details,약관의 자세한 사항
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,판매 세금 및 요금 템플릿
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +10,Apparel & Accessories,의류 및 액세서리
+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,주문 번호
 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 +121,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/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +47,Conversion Factor is required,변환 계수가 필요합니다
 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,값 / 설명
@@ -3042,10 +2920,8 @@
 ,Customers Not Buying Since Long Time,장기 휴면 고객
 DocType: Production Order,Expected Delivery Date,예상 배송 날짜
 apps/erpnext/erpnext/accounts/general_ledger.py +121,Debit and Credit not equal for {0} #{1}. Difference is {2}.,직불 및 신용 {0} #에 대한 동일하지 {1}. 차이는 {2}.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +48,Bulging,부푼
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +11,Evaporative-pattern casting,증발 패턴 주조
 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 +195,Sales Invoice {0} must be cancelled before cancelling this Sales Order,판매 송장은 {0}이 판매 주문을 취소하기 전에 취소해야합니다
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +190,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보다 커야합니다.
@@ -3064,26 +2940,24 @@
 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 +241,Account: {0} with currency: {1} can not be selected,계정 : {0} 통화로 : {1}을 선택할 수 없습니다
+apps/erpnext/erpnext/controllers/accounts_controller.py +242,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 +47,Account {0}: Parent account {1} does not belong to company: {2},계정 {0} : 부모 계정 {1} 회사에 속하지 않는 {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted all transactions related to this company!,성공적으로이 회사에 관련된 모든 트랜잭션을 삭제!
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,날짜에로
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +111,Honing,래핑
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +58,Probation,근신
-apps/erpnext/erpnext/stock/doctype/item/item.py +264,Default Warehouse is mandatory for stock Item.,기본 창고 재고 상품에 대한 필수입니다.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Probation,근신
+apps/erpnext/erpnext/stock/doctype/item/item.py +268,Default Warehouse is mandatory for stock Item.,기본 창고 재고 상품에 대한 필수입니다.
 DocType: Feed,Full Name,전체 이름
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +148,Clinching,결말
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +191,Payment of salary for the month {0} and year {1},달의 급여의 지급 {0}과 연도 {1}
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +173,Payment of salary for the month {0} and year {1},달의 급여의 지급 {0}과 연도 {1}
 DocType: Stock Settings,Auto insert Price List rate if missing,자동 삽입 가격표 속도없는 경우
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,총 지불 금액
 ,Transferred Qty,수량에게 전송
 apps/erpnext/erpnext/config/learn.py +11,Navigating,탐색
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +137,Planning,계획
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +137,Planning,계획
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +9,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),총 결제 금액 (시간 로그를 통해)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +629,We sell this Item,우리는이 품목을
+apps/erpnext/erpnext/public/js/setup_wizard.js +365,We sell this Item,우리는이 품목을
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +65,Supplier Id,공급 업체 아이디
 DocType: Journal Entry,Cash Entry,현금 항목
 DocType: Sales Partner,Contact Desc,연락처 제품 설명
@@ -3092,18 +2966,16 @@
 DocType: Brand,Item Manager,항목 관리자
 DocType: Cost Center,Add rows to set annual budgets on Accounts.,계정에 연간 예산을 설정하는 행을 추가합니다.
 DocType: Buying Settings,Default Supplier Type,기본 공급자 유형
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +160,Quarrying,채석
 DocType: Production Order,Total Operating Cost,총 영업 비용
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +160,Note: Item {0} entered multiple times,참고 : {0} 항목을 여러 번 입력
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +163,Note: Item {0} entered multiple times,참고 : {0} 항목을 여러 번 입력
 apps/erpnext/erpnext/config/crm.py +27,All Contacts.,모든 연락처.
 DocType: Newsletter,Test Email Id,테스트 이메일 아이디
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +394,Company Abbreviation,회사의 약어
+apps/erpnext/erpnext/public/js/setup_wizard.js +142,Company Abbreviation,회사의 약어
 DocType: Features Setup,If you follow Quality Inspection. Enables Item QA Required and QA No in Purchase Receipt,당신이 품질 검사를 수행합니다.아니 구매 영수증에 상품 QA 필수 및 QA를 활성화하지
 DocType: GL Entry,Party Type,파티 형
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +68,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} 한도를 초과 한 authroized Not
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +30,Rotational molding,회전 성형
 apps/erpnext/erpnext/config/hr.py +115,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,쇼핑 카트에 설정 세금 규칙
@@ -3117,15 +2989,15 @@
 apps/erpnext/erpnext/config/selling.py +18,Quotes to Leads or Customers.,리드 또는 고객에게 인용.
 DocType: Stock Settings,Role Allowed to edit frozen stock,동결 재고을 편집 할 수 있는 역할
 ,Territory Target Variance Item Group-Wise,지역 대상 분산 상품 그룹 와이즈
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +101,All Customer Groups,모든 고객 그룹
-apps/erpnext/erpnext/controllers/accounts_controller.py +474,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} 필수입니다.아마 통화 기록은 {2}로 {1}에 만들어지지 않습니다.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +101,All Customer Groups,모든 고객 그룹
+apps/erpnext/erpnext/controllers/accounts_controller.py +475,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} 필수입니다.아마 통화 기록은 {2}로 {1}에 만들어지지 않습니다.
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +37,Tax Template is mandatory.,세금 템플릿은 필수입니다.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +41,Account {0}: Parent account {1} does not exist,계정 {0} : 부모 계정 {1}이 (가) 없습니다
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),가격 목록 비율 (회사 통화)
 DocType: Account,Temporary,일시적인
 DocType: Address,Preferred Billing Address,선호하는 결제 주소
 DocType: Monthly Distribution Percentage,Percentage Allocation,비율 할당
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +86,Secretary,비서
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Secretary,비서
 DocType: Serial No,Distinct unit of an Item,항목의 고유 단위
 DocType: Pricing Rule,Buying,구매
 DocType: HR Settings,Employee Records to be created by,직원 기록에 의해 생성되는
@@ -3138,9 +3010,8 @@
 ,Item-wise Price List Rate,상품이 많다는 가격리스트 평가
 DocType: Purchase Order Item,Supplier Quotation,공급 업체 견적
 DocType: Quotation,In Words will be visible once you save the Quotation.,당신은 견적을 저장 한 단어에서 볼 수 있습니다.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +68,Ironing,다림질
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is stopped,{0} {1}이 정지 될
-apps/erpnext/erpnext/stock/doctype/item/item.py +352,Barcode {0} already used in Item {1},바코드 {0}이 (가) 이미 상품에 사용되는 {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +356,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/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,다가오는 이벤트
@@ -3149,27 +3020,25 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +27,Quick Entry,빠른 입력
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0} 반환을위한 필수입니다
 DocType: Purchase Order,To Receive,받다
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +33,Shrink fitting,피팅 축소
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +522,user@example.com,user@example.com
+apps/erpnext/erpnext/public/js/setup_wizard.js +266,user@example.com,user@example.com
 DocType: Email Digest,Income / Expense,수익 / 비용
 DocType: Employee,Personal Email,개인 이메일
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +58,Total Variance,총 분산
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +62,Total Variance,총 분산
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.","활성화되면, 시스템이 자동으로 재고에 대한 회계 항목을 게시 할 예정입니다."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +15,Brokerage,중개
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +15,Brokerage,중개
 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/accounts/page/financial_analytics/financial_analytics.js +42,Select Fiscal Year...,회계 연도 선택 ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +442,POS Profile required to make POS Entry,POS 프로필 POS 항목을 만드는 데 필요한
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +444,POS Profile required to make POS Entry,POS 프로필 POS 항목을 만드는 데 필요한
 DocType: Hub Settings,Name Token,이름 토큰
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +106,Planing,기획
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Selling,표준 판매
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +120,Standard Selling,표준 판매
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +137,Atleast one warehouse is mandatory,이어야 한 창고는 필수입니다
 DocType: Serial No,Out of Warranty,보증 기간 만료
 DocType: BOM Replace Tool,Replace,교체
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +314,{0} against Sales Invoice {1},{0} 견적서에 대한 {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +316,{0} against Sales Invoice {1},{0} 견적서에 대한 {1}
 apps/erpnext/erpnext/stock/doctype/item/item.py +49,Please enter default Unit of Measure,측정의 기본 단위를 입력하십시오
 DocType: Purchase Invoice Item,Project Name,프로젝트 이름
 DocType: Supplier,Mention if non-standard receivable account,언급 표준이 아닌 채권 계정의 경우
@@ -3185,9 +3054,8 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,Journal Entry {0} does not have account {1} or already matched against other voucher,분개 {0} {1} 또는 이미 다른 쿠폰에 대해 일치하는 계정이 없습니다
 DocType: Item,Moving Average,움직임 평균
 DocType: BOM Replace Tool,The BOM which will be replaced,대체됩니다 BOM
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +43,New Stock UOM must be different from current stock UOM,새로운 재고 UOM은 현재 재고 UOM 달라야합니다
 DocType: Account,Debit,직불
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +34,Leaves must be allocated in multiples of 0.5,잎은 0.5의 배수로 할당해야합니다
+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/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,뛰어난 AMT 사의
@@ -3205,8 +3073,7 @@
 DocType: Employee,Internal Work History,내부 작업 기록
 DocType: DocField,Column Break,단 나누기
 DocType: Event,Thursday,목요일
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +42,Private Equity,사모
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +93,Turning,선회
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,사모
 DocType: Maintenance Visit,Customer Feedback,고객 의견
 DocType: Account,Expense,지출
 DocType: Sales Invoice,Exhibition,전시회
@@ -3219,19 +3086,19 @@
 DocType: Employee,Held On,개최
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +33,Production Item,생산 품목
 ,Employee Information,직원 정보
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,Rate (%),비율 (%)
+apps/erpnext/erpnext/public/js/setup_wizard.js +294,Rate (%),비율 (%)
 DocType: Stock Entry Detail,Additional Cost,추가 비용
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +407,Financial Year End Date,회계 연도 종료일
+apps/erpnext/erpnext/public/js/setup_wizard.js +155,Financial Year End Date,회계 연도 종료일
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Voucher No, if grouped by Voucher","바우처를 기반으로 필터링 할 수 없음, 바우처로 그룹화하는 경우"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +484,Make Supplier Quotation,공급 업체의 견적을
 DocType: Quality Inspection,Incoming,수신
 DocType: BOM,Materials Required (Exploded),필요한 재료 (분해)
 DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),무급 휴직 적립 감소 (LWP)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +512,"Add users to your organization, other than yourself",자신보다 다른 조직에 사용자를 추가
+apps/erpnext/erpnext/public/js/setup_wizard.js +256,"Add users to your organization, other than yourself",자신보다 다른 조직에 사용자를 추가
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No {1} does not match with {2} {3},행 번호 {0} : 일련 번호 {1}과 일치하지 않는 {2} {3}
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +44,Casual Leave,캐주얼 허가
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +44,Casual Leave,캐주얼 허가
 DocType: Batch,Batch ID,일괄 처리 ID
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +334,Note: {0},참고 : {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +336,Note: {0},참고 : {0}
 ,Delivery Note Trends,배송 참고 동향
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +104,This Week's Summary,이번 주 요약
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +74,{0} must be a Purchased or Sub-Contracted Item in row {1},{0} 행의 구입 또는 하위 계약 품목이어야 {1}
@@ -3243,7 +3110,7 @@
 DocType: Purchase Receipt,Return Against Purchase Receipt,구매 영수증에 대해 반환
 DocType: Purchase Order,To Bill,빌
 DocType: Material Request,% Ordered,% 발주
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +61,Piecework,일한 분량에 따라 공임을 지급받는 일
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Piecework,일한 분량에 따라 공임을 지급받는 일
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +64,Avg. Buying Rate,평균. 구매 비율
 DocType: Task,Actual Time (in Hours),(시간) 실제 시간
 DocType: Employee,History In Company,회사의 역사
@@ -3260,13 +3127,13 @@
 DocType: Opportunity,To Discuss,토론하기
 DocType: SMS Settings,SMS Settings,SMS 설정
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +60,Temporary Accounts,임시 계정
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +155,Black,검정
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Black,검정
 DocType: BOM Explosion Item,BOM Explosion Item,BOM 폭발 상품
 DocType: Account,Auditor,감사
 DocType: Purchase Order,End date of current order's period,현재 주문의 기간의 종료일
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +17,Make Offer Letter,제공 문자를 확인
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +10,Return,반환
-apps/erpnext/erpnext/stock/doctype/item/item.py +503,Default Unit of Measure for Variant must be same as Template,변형에 대한 측정의 기본 단위는 템플릿으로 동일해야합니다
+apps/erpnext/erpnext/stock/doctype/item/item.py +507,Default Unit of Measure for Variant must be same as Template,변형에 대한 측정의 기본 단위는 템플릿으로 동일해야합니다
 DocType: DocField,Fold,겹
 DocType: Production Order Operation,Production Order Operation,생산 오더 운영
 DocType: Pricing Rule,Disable,사용 안함
@@ -3277,13 +3144,12 @@
 DocType: Page,Page Name,페이지 이름
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +110,To Time must be greater than From Time,시간은 시간보다는 커야하는 방법
 DocType: Journal Entry Account,Exchange Rate,환율
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +465,Sales Order {0} is not submitted,판매 주문 {0} 제출되지 않았습니다.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +467,Sales Order {0} is not submitted,판매 주문 {0} 제출되지 않았습니다.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0}: Parent account {1} does not bolong to the company {2},창고 {0} : 부모 계정이 {1} 회사에 BOLONG하지 않는 {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +124,Spindle finishing,스핀들 마무리
 DocType: BOM,Last Purchase Rate,마지막 구매 비율
 DocType: Account,Asset,자산
 DocType: Project Task,Task ID,태스크 ID
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +395,"e.g. ""MC""","예) ""MC """
+apps/erpnext/erpnext/public/js/setup_wizard.js +143,"e.g. ""MC""","예) ""MC """
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,Stock cannot exist for Item {0} since has variants,상품에 대한 존재할 수 없다 재고 {0} 이후 변종이있다
 ,Sales Person-wise Transaction Summary,판매 사람이 많다는 거래 요약
 DocType: System Settings,Time Zone,시간대
@@ -3292,9 +3158,7 @@
 DocType: Monthly Distribution,Monthly Distribution Percentages,예산 월간 배분 백분율
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +16,The selected item cannot have Batch,선택한 항목이 배치를 가질 수 없습니다
 DocType: Delivery Note,% of materials delivered against this Delivery Note,이 납품서에 대해 배송자재 %
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +151,Stapling,스테이플 링
 DocType: Customer,Customer Details,고객 상세 정보
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +105,Shaping,쉐이핑
 DocType: Employee,Reports to,에 대한 보고서
 DocType: SMS Settings,Enter url parameter for receiver nos,수신기 NOS에 대한 URL 매개 변수를 입력
 DocType: Sales Invoice,Paid Amount,지불 금액
@@ -3303,13 +3167,13 @@
 DocType: Item Variant,Item Variant,항목 변형
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +15,Setting this Address Template as default as there is no other default,다른 기본이 없기 때문에 기본적으로이 주소 템플릿 설정
 apps/erpnext/erpnext/accounts/doctype/account/account.py +89,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","이미 직불의 계정 잔액, 당신은 같은 '신용', '균형이어야합니다'설정할 수 없습니다"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +76,Quality Management,품질 관리
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Quality Management,품질 관리
 DocType: Production Planning Tool,Filter based on customer,필터 고객에 따라
 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}
 DocType: Employee External Work History,Employee External Work History,직원 외부 일 역사
 DocType: Tax Rule,Purchase,구입
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +34,Balance Qty,잔고 수량
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Balance Qty,잔고 수량
 DocType: Item Group,Parent Item Group,부모 항목 그룹
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +21,{0} for {1},{0}에 대한 {1}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +96,Cost Centers,코스트 센터
@@ -3319,12 +3183,12 @@
 DocType: Opportunity,Next Contact,다음 연락
 DocType: Employee,Employment Type,고용 유형
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,고정 자산
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +84,Application period cannot be across two alocation records,신청 기간은 2 alocation 기록을 통해 할 수 없습니다
 DocType: Item Group,Default Expense Account,기본 비용 계정
 DocType: Employee,Notice (days),공지 사항 (일)
 DocType: Page,Yes,예
 DocType: Tax Rule,Sales Tax Template,판매 세 템플릿
 DocType: Employee,Encashment Date,현금화 날짜
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +74,Electroforming,전주
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +179,"Against Voucher Type must be one of Purchase Order, Purchase Invoice or Journal Entry","바우처를 피해 유형은 구매 주문의 하나, 구매 송장 또는 분개해야합니다"
 DocType: Account,Stock Adjustment,재고 조정
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +34,Default Activity Cost exists for Activity Type - {0},기본 활동 비용은 활동 유형에 대해 존재 - {0}
@@ -3360,12 +3224,12 @@
 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,유통
 apps/erpnext/erpnext/public/js/pos/pos.html +36,Amount Paid,지불 금액
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +91,Project Manager,프로젝트 매니저
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +72,Dispatch,파견
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Project Manager,프로젝트 매니저
+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: Customer,Default Taxes and Charges,기본 세금 및 요금
 DocType: Account,Receivable,받을 수있는
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +268,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,행 번호 {0} : 구매 주문이 이미 존재로 공급 업체를 변경할 수 없습니다
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +263,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은 원료를 얻기 위해 고려 될 것입니다.그렇지 않으면, 모든 서브 어셈블리 항목은 원료로 처리됩니다."
@@ -3373,8 +3237,8 @@
 DocType: Hub Settings,Seller Description,판매자 설명
 DocType: Employee Education,Qualification,자격
 DocType: Item Price,Item Price,상품 가격
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +48,Soap & Detergent,비누 및 세제
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +36,Motion Picture & Video,영화 및 비디오
+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,주문
 DocType: Warehouse,Warehouse Name,창고의 이름
 DocType: Naming Series,Select Transaction,거래 선택
@@ -3383,7 +3247,6 @@
 DocType: BOM,Rate Of Materials Based On,자료에 의거 한 속도
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,지원 Analtyics
 apps/erpnext/erpnext/accounts/doctype/accounts_settings/accounts_settings.py +27,Company is missing in warehouses {0},회사는 창고에없는 {0}
-DocType: Stock UOM Replace Utility,Stock UOM Replace Utility,재고 UOM 유틸리티를 교체
 DocType: POS Profile,Terms and Conditions,이용약관
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,To Date should be within the Fiscal Year. Assuming To Date = {0},현재까지의 회계 연도 내에 있어야합니다.날짜에 가정 = {0}
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","여기서 당신은 신장, 체중, 알레르기, 의료 문제 등 유지 관리 할 수 있습니다"
@@ -3395,7 +3258,7 @@
 DocType: Sales Order Item,For Production,생산
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +103,Please enter sales order in the above table,위의 표에 판매 주문을 입력하십시오
 DocType: Project Task,View Task,보기 작업
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +406,Your financial year begins on,귀하의 회계 연도가 시작됩니다
+apps/erpnext/erpnext/public/js/setup_wizard.js +154,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: Email Digest,Add/Remove Recipients,추가 /받는 사람을 제거
@@ -3403,16 +3266,14 @@
 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 +528,Item variant {0} exists with same attributes,항목 변형 {0} 같은 속성을 가진 존재
+apps/erpnext/erpnext/stock/doctype/item/item.py +532,Item variant {0} exists with same attributes,항목 변형 {0} 같은 속성을 가진 존재
 DocType: Salary Slip,Salary Slip,급여 전표
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +116,Burnishing,버니 싱
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +54,'To Date' is required,'마감일자'필요
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,'마감일자'필요
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","패키지가 제공하는 슬립 포장 생성합니다.패키지 번호, 패키지 내용과 그 무게를 통보하는 데 사용됩니다."
 DocType: Sales Invoice Item,Sales Order Item,판매 주문 품목
 DocType: Salary Slip,Payment Days,지불 일
 DocType: BOM,Manage cost of operations,작업의 비용 관리
 DocType: Features Setup,Item Advanced,상품 상세
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +40,Hot rolling,열간 압연
 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,직원 교육
@@ -3425,25 +3286,23 @@
 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/setup/page/setup_wizard/install_fixtures.py +48,Sick Leave,병가
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +174,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/page/setup_wizard/fixtures/industry_type.py +22,Department Stores,백화점
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,백화점
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +40,System Balance,시스템 밸런스
 DocType: Workflow,Is Active,활성
 apps/erpnext/erpnext/controllers/stock_controller.py +71,No accounting entries for the following warehouses,다음 창고에 대한 회계 항목이 없음
 apps/erpnext/erpnext/projects/doctype/project/project.js +22,Save the document first.,먼저 문서를 저장합니다.
 DocType: Account,Chargeable,청구
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +121,Linishing,Linishing
 DocType: Company,Change Abbreviation,변경 요약
 DocType: Workflow State,Primary,기본
 DocType: Expense Claim Detail,Expense Date,비용 날짜
 DocType: Item,Max Discount (%),최대 할인 (%)
 DocType: Communication,More Information,추가 정보
 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/setup/page/setup_wizard/fixtures/operations.py +161,Blasting,발파
 DocType: Company,Warn,경고
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +111,Item valuation updated,상품 평가가 업데이트
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","다른 발언, 기록에 가야한다 주목할만한 노력."
 DocType: BOM,Manufacturing User,제조 사용자
 DocType: Purchase Order,Raw Materials Supplied,공급 원료
@@ -3453,7 +3312,7 @@
 DocType: Appraisal,Appraisal Template,평가 템플릿
 DocType: Communication,Email,이메일
 DocType: Item Group,Item Classification,품목 분류
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +89,Business Development Manager,비즈니스 개발 매니저
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Business Development Manager,비즈니스 개발 매니저
 DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,유지 보수 방문 목적
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.js +15,Period,기간
 ,General Ledger,원장
@@ -3463,9 +3322,7 @@
 ,Itemwise Recommended Reorder Level,Itemwise는 재주문 수준에게 추천
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +264,Please select {0} first,먼저 {0}를 선택하세요
 DocType: Features Setup,To get Item Group in details table,자세한 내용은 테이블에 항목 그룹을 얻으려면
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +67,Redrawing,다시 그리기
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +112,Batch {0} of Item {1} has expired.,항목의 일괄 {0} {1} 만료되었습니다.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +120,Etching,에칭
 DocType: Sales Invoice,Commission,위원회
 DocType: Address Template,"<h4>Default Template</h4>
 <p>Uses <a href=""http://jinja.pocoo.org/docs/templates/"">Jinja Templating</a> and all the fields of Address (including Custom Fields if any) will be available</p>
@@ -3510,7 +3367,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +340,Operation Time must be greater than 0 for Operation {0},작업 시간은 작업에 대한 0보다 큰 수 있어야 {0}
 DocType: Supplier,Address and Contacts,주소 및 연락처
 DocType: UOM Conversion Detail,UOM Conversion Detail,UOM 변환 세부 사항
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +496,Keep it web friendly 900px (w) by 100px (h),100 픽셀로 웹 친화적 인 900px (W)를 유지 (H)
+apps/erpnext/erpnext/public/js/setup_wizard.js +242,Keep it web friendly 900px (w) by 100px (h),100 픽셀로 웹 친화적 인 900px (W)를 유지 (H)
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +329,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,뛰어난 쿠폰 받기
@@ -3526,54 +3383,49 @@
 DocType: Item,Average time taken by the supplier to deliver,공급 업체에 의해 촬영 평균 시간 제공하는
 DocType: Time Log,Hours,시간
 DocType: Project,Expected Start Date,예상 시작 날짜
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +38,Rolling,롤링
 DocType: ToDo,Priority,우선순위
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +41,Remove item if charges is not applicable to that item,요금은 해당 항목에 적용 할 수없는 경우 항목을 제거
 DocType: Dropbox Backup,Dropbox Access Allowed,허용 보관 용 액세스
 DocType: Dropbox Backup,Weekly,주l
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,예. smsgateway.com / API / send_sms.cgi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +485,Receive,수신
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +510,Receive,수신
 DocType: Maintenance Visit,Fully Completed,완전히 완료
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0} % 완료
 DocType: Employee,Educational Qualification,교육 자격
 DocType: Workstation,Operating Costs,운영 비용
 DocType: Employee Leave Approver,Employee Leave Approver,직원 허가 승인자
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,{0} has been successfully added to our Newsletter list.,{0} 성공적으로 우리의 뉴스 레터 목록에 추가되었습니다.
-apps/erpnext/erpnext/stock/doctype/item/item.py +383,Row {0}: An Reorder entry already exists for this warehouse {1},행 {0} : 재주문 항목이 이미이웨어 하우스 존재 {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +387,Row {0}: An Reorder entry already exists for this warehouse {1},행 {0} : 재주문 항목이 이미이웨어 하우스 존재 {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +67,"Cannot declare as lost, because Quotation has been made.","손실로 견적이되었습니다 때문에, 선언 할 수 없습니다."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +133,Electron beam machining,전자빔 가공
 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 +150,Please select Start Date and End Date for Item {0},시작 날짜와 항목에 대한 종료 날짜를 선택하세요 {0}
 apps/erpnext/erpnext/config/stock.py +141,Main Reports,주 보고서
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +102,Stock Ledger entries balances updated,재고 원장 업데이트 균형 엔트리
 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의 문서 종류
-apps/erpnext/erpnext/stock/doctype/item/item.js +176,Add / Edit Prices,가격 추가/편집
+apps/erpnext/erpnext/stock/doctype/item/item.js +178,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 +298,My Orders,내 주문
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +293,My Orders,내 주문
 DocType: Price List,Price List Name,가격리스트 이름
 DocType: Time Log,For Manufacturing,제조
-apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +70,Totals,합계
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +174,Totals,합계
 DocType: BOM,Manufacturing,생산
 ,Ordered Items To Be Delivered,전달 될 품목을 주문
 DocType: Account,Income,수익
 ,Setup Wizard,설치 마법사
 DocType: Industry Type,Industry Type,산업 유형
 apps/erpnext/erpnext/templates/includes/cart.js +137,Something went wrong!,문제가 발생했습니다!
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +68,Warning: Leave application contains following block dates,경고 : 응용 프로그램이 다음 블록 날짜를 포함 남겨
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +251,Sales Invoice {0} has already been submitted,판매 송장 {0}이 (가) 이미 제출되었습니다
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +100,Warning: Leave application contains following block dates,경고 : 응용 프로그램이 다음 블록 날짜를 포함 남겨
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +256,Sales Invoice {0} has already been submitted,판매 송장 {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/setup/page/setup_wizard/fixtures/operations.py +10,Die casting,다이 캐스팅
 DocType: Email Alert,Reference Date,참조 날짜
 apps/erpnext/erpnext/config/hr.py +105,Organization unit (department) master.,조직 단위 (현)의 마스터.
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +25,Please enter valid mobile nos,유효 모바일 NOS를 입력 해주십시오
 DocType: Budget Detail,Budget Detail,예산 세부 정보
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +75,Please enter message before sending,전송하기 전에 메시지를 입력 해주세요
 DocType: Async Task,Status,상태
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +65,Stock UOM updated for Item {0},재고 UOM는 항목에 대해 업데이트 {0}
 DocType: Company History,Year,년
 apps/erpnext/erpnext/config/accounts.py +127,Point-of-Sale Profile,판매 시점 프로필
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +68,Please Update SMS Settings,SMS 설정을 업데이트하십시오
@@ -3587,12 +3439,12 @@
 ,Serial No Service Contract Expiry,일련 번호 서비스 계약 유효
 DocType: Item,Unit of Measure Conversion,측정 단위 변환
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +86,Employee can not be changed,직원은 변경할 수 없다
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +259,You cannot credit and debit same account at the same time,당신은 신용과 같은 시간에 같은 계좌에서 금액을 인출 할 수 없습니다
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,You cannot credit and debit same account at the same time,당신은 신용과 같은 시간에 같은 계좌에서 금액을 인출 할 수 없습니다
 DocType: Naming Series,Help HTML,도움말 HTML
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},할당 된 총 weightage 100 %이어야한다.그것은 {0}
 apps/erpnext/erpnext/controllers/status_updater.py +140,Allowance for over-{0} crossed for Item {1},수당에 {0} 항목에 대한 교차에 대한 {1}
 DocType: Address,Name of person or organization that this address belongs to.,이 주소가 속해있는 개인이나 조직의 이름입니다.
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +587,Your Suppliers,공급 업체
+apps/erpnext/erpnext/public/js/setup_wizard.js +325,Your Suppliers,공급 업체
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,판매 주문이 이루어질으로 분실로 설정할 수 없습니다.
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +65,Another Salary Structure {0} is active for employee {1}. Please make its status 'Inactive' to proceed.,또 다른 급여 구조 {0} 직원에 대한 활성화 {1}.상태 '비활성'이 진행하시기 바랍니다.
 DocType: Purchase Invoice,Contact,연락처
@@ -3601,37 +3453,35 @@
 DocType: Item,Has Serial No,시리얼 No에게 있습니다
 DocType: Employee,Date of Issue,발행일
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +16,{0}: From {0} for {1},{0}에서 {0}에 대한 {1}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +154,Row #{0}: Set Supplier for item {1},행 번호 {0} 항목에 대한 설정 공급 업체 {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +149,Row #{0}: Set Supplier for item {1},행 번호 {0} 항목에 대한 설정 공급 업체 {1}
 DocType: Issue,Content Type,컨텐츠 유형
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +17,Computer,컴퓨터
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,컴퓨터
 DocType: Item,List this Item in multiple groups on the website.,웹 사이트에 여러 그룹에이 항목을 나열합니다.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +283,Please check Multi Currency option to allow accounts with other currency,다른 통화와 계정을 허용하는 다중 통화 옵션을 확인하시기 바랍니다
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +285,Please check Multi Currency option to allow accounts with other currency,다른 통화와 계정을 허용하는 다중 통화 옵션을 확인하시기 바랍니다
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +62,Item: {0} does not exist in the system,상품 : {0} 시스템에 존재하지 않을
 apps/erpnext/erpnext/accounts/doctype/account/account.py +81,You are not authorized to set Frozen value,당신은 고정 된 값을 설정할 수있는 권한이 없습니다
 DocType: Payment Reconciliation,Get Unreconciled Entries,비 조정 항목을보세요
 DocType: Cost Center,Budgets,예산
 apps/frappe/frappe/core/page/modules_setup/modules_setup.py +11,Updated,업데이트
 DocType: Employee,Emergency Contact Details,비상 연락처 세부 정보
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +396,What does it do?,그것은 무엇을 하는가?
+apps/erpnext/erpnext/public/js/setup_wizard.js +144,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,평균위원회 평가
-apps/erpnext/erpnext/stock/doctype/item/item.py +313,'Has Serial No' can not be 'Yes' for non-stock item,'시리얼 번호를 가지고'재고 항목에 대해 '예'일 수 없습니다
+apps/erpnext/erpnext/stock/doctype/item/item.py +317,'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/setup/page/setup_wizard/install_fixtures.py +111,Electrical,전기의
+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 +302,Row {0}: Exchange Rate is mandatory,행 {0} : 환율은 필수입니다
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +304,Row {0}: Exchange Rate is mandatory,행 {0} : 환율은 필수입니다
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},사용자 ID 직원에 대한 설정하지 {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +72,Peening,피닝
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,From Warranty Claim,보증 청구에서
 DocType: Stock Entry,Default Source Warehouse,기본 소스 창고
 DocType: Item,Customer Code,고객 코드
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +212,Birthday Reminder for {0},생일 알림 {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +163,Lapping,래핑
-apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.js +8,Days Since Last Order,일 이후 마지막 주문
+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 +299,Debit To account must be a Balance Sheet account,계정에 직불는 대차 대조표 계정이어야합니다
 DocType: Buying Settings,Naming Series,시리즈 이름 지정
 DocType: Leave Block List,Leave Block List Name,차단 목록의 이름을 남겨주세요
@@ -3645,7 +3495,7 @@
 DocType: Notification Control,Sales Invoice Message,판매 송장 메시지
 DocType: Authorization Rule,Based On,에 근거
 DocType: Sales Order Item,Ordered Qty,수량 주문
-apps/erpnext/erpnext/stock/doctype/item/item.py +539,Item {0} is disabled,항목 {0} 사용할 수 없습니다
+apps/erpnext/erpnext/stock/doctype/item/item.py +543,Item {0} is disabled,항목 {0} 사용할 수 없습니다
 DocType: Stock Settings,Stock Frozen Upto,재고 동결 개까지
 apps/erpnext/erpnext/controllers/recurring_document.py +166,Period From and Period To dates mandatory for recurring {0},에서와 기간 반복 필수 날짜로 기간 {0}
 apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,프로젝트 활동 / 작업.
@@ -3655,7 +3505,6 @@
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,할인 100 미만이어야합니다
 DocType: ToDo,Low,낮음
 DocType: Purchase Invoice,Write Off Amount (Company Currency),금액을 상각 (회사 통화)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +71,Spinning,회전
 DocType: Landed Cost Voucher,Landed Cost Voucher,착륙 비용 바우처
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +55,Please set {0},설정하십시오 {0}
 DocType: Purchase Invoice,Repeat on Day of Month,이달의 날 반복
@@ -3677,7 +3526,6 @@
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +37,Campaign Name is required,캠페인 이름이 필요합니다
 DocType: Maintenance Visit,Maintenance Date,유지 보수 날짜
 DocType: Purchase Receipt Item,Rejected Serial No,시리얼 No 거부
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +51,Deep drawing,디프 드로잉
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +40,New Newsletter,새로운 뉴스
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +157,Start date should be less than end date for Item {0},시작 날짜는 항목에 대한 종료 날짜보다 작아야합니다 {0}
 apps/erpnext/erpnext/stock/doctype/item/item.js +17,Show Balance,쇼 밸런스
@@ -3688,7 +3536,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +119,BOM and Manufacturing Quantity are required,BOM 및 제조 수량이 필요합니다
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,고령화 범위 2
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +450,Amount,양
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +147,Riveting,리벳
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,BOM 교체
 ,Sales Analytics,판매 분석
 DocType: Manufacturing Settings,Manufacturing Settings,제조 설정
@@ -3700,20 +3547,19 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +207,New Account Name,새 계정 이름
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,원료 공급 비용
 DocType: Selling Settings,Settings for Selling Module,모듈 판매에 대한 설정
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +73,Customer Service,고객 서비스
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Customer Service,고객 서비스
 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.,제공 후보 작업.
 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 +70,Item {0} must be a stock Item,{0} 항목을 재고 품목 수 있어야합니다
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,진행웨어 하우스의 기본 작업
 apps/erpnext/erpnext/config/accounts.py +107,Default settings for accounting transactions.,회계 거래의 기본 설정.
 apps/frappe/frappe/model/naming.py +40,{0} is required,{0}이 필요합니다
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +21,Vacuum molding,진공 성형
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,예상 날짜 자료 요청 날짜 이전 할 수 없습니다
 DocType: Contact Us Settings,City,시
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +132,Ultrasonic machining,초음파 가공
 apps/frappe/frappe/templates/base.html +137,Error: Not a valid id?,오류 : 유효한 ID?
 apps/erpnext/erpnext/stock/get_item_details.py +125,Item {0} must be a Sales Item,항목 {0} 판매 품목이어야합니다
 DocType: Naming Series,Update Series Number,업데이트 시리즈 번호
@@ -3721,7 +3567,7 @@
 DocType: Sales Order,Printing Details,인쇄 세부 사항
 DocType: Task,Closing Date,마감일
 DocType: Sales Order Item,Produced Quantity,생산 수량
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +84,Engineer,기사
+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 +379,Item Code required at Row No {0},행 번호에 필요한 상품 코드 {0}
 DocType: Sales Partner,Partner Type,파트너 유형
@@ -3729,7 +3575,7 @@
 DocType: Authorization Rule,Customerwise Discount,Customerwise 할인
 DocType: Purchase Invoice,Against Expense Account,비용 계정에 대한
 DocType: Production Order,Production Order,생산 주문
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +258,Installation Note {0} has already been submitted,설치 노트 {0}이 (가) 이미 제출되었습니다
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +263,Installation Note {0} has already been submitted,설치 노트 {0}이 (가) 이미 제출되었습니다
 DocType: Quotation Item,Against Docname,docName 같은 반대
 DocType: SMS Center,All Employee (Active),모든 직원 (활성)
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,지금보기
@@ -3738,19 +3584,19 @@
 DocType: Item,Re-Order Level,다시 주문 수준
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,당신이 생산 주문을 올리거나 분석을위한 원시 자료를 다운로드하고자하는 항목 및 계획 수량을 입력합니다.
 apps/frappe/frappe/public/js/frappe/views/ganttview.js +45,Gantt Chart,Gantt 차트
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +57,Part-time,파트 타임으로
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,Part-time,파트 타임으로
 DocType: Employee,Applicable Holiday List,해당 휴일 목록
 DocType: Employee,Cheque,수표
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,시리즈 업데이트
 apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Report Type is mandatory,보고서 유형이 필수입니다
 DocType: Item,Serial Number Series,일련 번호 시리즈
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},창고 재고 상품의 경우 필수 {0} 행에서 {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +45,Retail & Wholesale,소매 및 도매
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,소매 및 도매
 DocType: Issue,First Responded On,첫 번째에 반응했다
 DocType: Website Item Group,Cross Listing of Item in multiple groups,여러 그룹에서 항목의 크로스 리스팅
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +351,The First User: You,첫 번째 사용자 : 당신
+apps/erpnext/erpnext/public/js/setup_wizard.js +101,The First User: You,첫 번째 사용자 : 당신
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +48,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 +172,Successfully Reconciled,성공적으로 조정 됨
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +119,Successfully Reconciled,성공적으로 조정 됨
 DocType: Production Order,Planned End Date,계획 종료 날짜
 apps/erpnext/erpnext/config/stock.py +43,Where items are stored.,항목이 저장되는 위치.
 DocType: Tax Rule,Validity,효력
@@ -3770,39 +3616,36 @@
 DocType: DocPerm,Level,레벨
 DocType: Purchase Taxes and Charges,On Net Total,인터넷 전체에
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +160,Target warehouse in row {0} must be same as Production Order,행의 목표웨어 하우스가 {0}과 동일해야합니다 생산 주문
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +59,No permission to use Payment Tool,권한이 없습니다 지불 도구를 사용하지합니다
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +97,No permission to use Payment Tool,권한이 없습니다 지불 도구를 사용하지합니다
 apps/erpnext/erpnext/controllers/recurring_document.py +192,'Notification Email Addresses' not specified for recurring %s,% s을 (를) 반복되는 지정되지 않은 '알림 이메일 주소'
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +86,Milling,밀링
 apps/erpnext/erpnext/accounts/doctype/account/account.py +99,Currency can not be changed after making entries using some other currency,환율이 다른 통화를 사용하여 항목을 한 후 변경할 수 없습니다
 DocType: Company,Round Off Account,반올림
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +60,Nibbling,니블 링
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,관리비
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +18,Consulting,컨설팅
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +18,Consulting,컨설팅
 DocType: Customer Group,Parent Customer Group,상위 고객 그룹
 apps/erpnext/erpnext/public/js/pos/pos.js +429,Change,변경
 DocType: Purchase Invoice,Contact Email,담당자 이메일
 DocType: Appraisal Goal,Score Earned,점수 획득
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +393,"e.g. ""My Company LLC""","예) ""내 회사 LLC """
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +173,Notice Period,통지 기간
+apps/erpnext/erpnext/public/js/setup_wizard.js +141,"e.g. ""My Company LLC""","예) ""내 회사 LLC """
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +173,Notice Period,통지 기간
 DocType: Bank Reconciliation Detail,Voucher ID,바우처 ID
 apps/erpnext/erpnext/setup/doctype/territory/territory.js +14,This is a root territory and cannot be edited.,이 루트 영토 및 편집 할 수 없습니다.
 DocType: Packing Slip,Gross Weight UOM,총중량 UOM
 DocType: Email Digest,Receivables / Payables,채권 / 채무
 DocType: Delivery Note Item,Against Sales Invoice,견적서에 대하여
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +63,Stamping,스탬핑
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +457,Credit Account,신용 계정
 DocType: Landed Cost Item,Landed Cost Item,착륙 비용 항목
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +56,Show zero values,0 값을보기
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,원료의 부여 수량에서 재 포장 / 제조 후의 아이템의 수량
 DocType: Payment Reconciliation,Receivable / Payable Account,채권 / 채무 계정
 DocType: Delivery Note Item,Against Sales Order Item,판매 주문 항목에 대하여
-apps/erpnext/erpnext/stock/doctype/item/item.py +521,Please specify Attribute Value for attribute {0},속성에 대한 속성 값을 지정하십시오 {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +525,Please specify Attribute Value for attribute {0},속성에 대한 속성 값을 지정하십시오 {0}
 DocType: Item,Default Warehouse,기본 창고
 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,금액없이 인쇄
-apps/erpnext/erpnext/controllers/buying_controller.py +69,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,세금의 종류는 '평가'또는 '평가 및 전체'모든 항목은 비 재고 품목이기 때문에 할 수 없습니다
+apps/erpnext/erpnext/controllers/buying_controller.py +60,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,세금의 종류는 '평가'또는 '평가 및 전체'모든 항목은 비 재고 품목이기 때문에 할 수 없습니다
 DocType: User,Last Name,성
 DocType: Web Page,Left,왼쪽
 DocType: Event,All Day,하루 종일
@@ -3810,7 +3653,7 @@
 DocType: Appraisal,Total Score (Out of 5),전체 점수 (5 점 만점)
 DocType: Contact Us Settings,State,도
 DocType: Batch,Batch,일괄처리
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +51,Balance,잔고
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +28,Balance,잔고
 DocType: Project,Total Expense Claim (via Expense Claims),총 경비 요청 (비용 청구를 통해)
 DocType: User,Gender,성별
 DocType: Journal Entry,Debit Note,직불 주
@@ -3840,8 +3683,7 @@
 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/setup/page/setup_wizard/fixtures/operations.py +76,Seaming,봉합
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +197,"Company Email ID not found, hence mail not sent","회사 이메일 ID를 찾을 수 없습니다, 따라서 전송되지 메일"
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +206,"Company Email ID not found, hence mail not sent","회사 이메일 ID를 찾을 수 없습니다, 따라서 전송되지 메일"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),펀드의 응용 프로그램 (자산)
 DocType: Production Planning Tool,Filter based on item,항목을 기준으로 필터링
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +451,Debit Account,자동 이체 계좌
@@ -3853,17 +3695,16 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +95,{0} {1} has been modified. Please refresh.,{0} {1} 수정되었습니다.새로 고침하십시오.
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,다음과 같은 일에 허가 신청을하는 사용자가 중지합니다.
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +591,From Opportunity,기회에서
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +46,Blanking,블랭킹
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +166,Employee Benefits,종업원 급여
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,Employee Benefits,종업원 급여
 DocType: Sales Invoice,Is POS,POS입니다
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +240,Packed quantity must equal quantity for Item {0} in row {1},{0} 행에서 {1} 포장 수량의 수량을 동일해야합니다
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +245,Packed quantity must equal quantity for Item {0} in row {1},{0} 행에서 {1} 포장 수량의 수량을 동일해야합니다
 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.,고객에게 제기 지폐입니다.
 DocType: DocField,Default,기본값
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,프로젝트 ID
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +466,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},행 번호 {0} : 금액 경비 요청 {1}에 대해 금액을 보류보다 클 수 없습니다. 등록되지 않은 금액은 {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +468,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} 가입자는 추가
 DocType: Maintenance Schedule,Schedule,일정
 DocType: Cost Center,"Define Budget for this Cost Center. To set budget action, see ""Company List""",이 코스트 센터에 대한 예산을 정의합니다. 예산 작업을 설정하려면 다음을 참조 &quot;회사 목록&quot;
@@ -3874,7 +3715,7 @@
 apps/erpnext/erpnext/public/js/pos/pos.js +91,Price List not found or disabled,가격 목록 발견되지 않았거나 비활성화
 DocType: Expense Claim,Approved,인가 된
 DocType: Pricing Rule,Price,가격
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +79,Employee relieved on {0} must be set as 'Left',{0}에 안심 직원은 '왼쪽'으로 설정해야합니다
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +88,Employee relieved on {0} must be set as 'Left',{0}에 안심 직원은 '왼쪽'으로 설정해야합니다
 DocType: Item,"Selecting ""Yes"" will give a unique identity to each entity of this item which can be viewed in the Serial No master.","""예""를 선택하면 일련 번호 마스터에서 볼 수있는 항목의 각 개체에 고유 한 ID를 제공합니다."
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +39,Appraisal {0} created for Employee {1} in the given date range,평가 {0} {1} 지정된 날짜 범위에서 직원에 대해 생성
 DocType: Employee,Education,교육
@@ -3885,7 +3726,7 @@
 apps/frappe/frappe/desk/moduleview.py +67,Standard Reports,표준 보고서
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,회계 분개.
 DocType: Delivery Note Item,Available Qty at From Warehouse,창고에서 이용 가능한 수량
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +209,Please select Employee Record first.,먼저 직원 레코드를 선택하십시오.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +224,Please select Employee Record first.,먼저 직원 레코드를 선택하십시오.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,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 +233,Please enter Expense Account,비용 계정을 입력하십시오
@@ -3898,46 +3739,43 @@
 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,위의 기준에 따라 (전달하기 위해 출원 중) 판매 주문을 당겨
 DocType: DocShare,Document Type,문서 형식
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +565,From Supplier Quotation,공급 업체의 견적에서
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +588,From Supplier Quotation,공급 업체의 견적에서
 DocType: Deduction Type,Deduction Type,공제 유형
 DocType: Attendance,Half Day,반나절
 DocType: Pricing Rule,Min Qty,최소 수량
 DocType: Features Setup,"To track items in sales and purchase documents with batch nos. ""Preferred Industry: Chemicals""",배치 번호와 판매 및 구매 문서의 항목을 추적합니다. &quot;선호 업종 : 화학&quot;
 DocType: GL Entry,Transaction Date,거래 날짜
 DocType: Production Plan Item,Planned Qty,계획 수량
-apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +91,Total Tax,총 세금
+apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +93,Total Tax,총 세금
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +178,For Quantity (Manufactured Qty) is mandatory,수량 (수량 제조) 필수
 DocType: Stock Entry,Default Target Warehouse,기본 대상 창고
 DocType: Purchase Invoice,Net Total (Company Currency),합계액 (회사 통화)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +79,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,행 {0} : 파티 형 파티는 채권 / 채무 계정에 대하여 만 적용
 DocType: Notification Control,Purchase Receipt Message,구매 영수증 메시지
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +95,Total allocated leaves are more than period,총 할당 된 잎은 기간보다 더 있습니다
 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.,기록 항목의 움직임.
 DocType: Newsletter List Subscriber,Newsletter List Subscriber,뉴스 목록 가입자
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +164,Morticing,Morticing
 DocType: Email Account,Service,서비스
 DocType: Hub Settings,Hub Settings,허브 설정
 DocType: Project,Gross Margin %,매출 총 이익률의 %
 DocType: BOM,With Operations,운영과
 apps/erpnext/erpnext/accounts/party.py +232,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,회계 항목이 이미 통화로 된 {0} 회사의 {1}. 통화와 채권 또는 채무 계정을 선택하세요 {0}.
 ,Monthly Salary Register,월급 등록
-apps/frappe/frappe/website/template.py +140,Next,다음
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard_page.html +17,Next,다음
 DocType: Warranty Claim,If different than customer address,만약 고객 주소와 다른
 DocType: BOM Operation,BOM Operation,BOM 운영
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +118,Electropolishing,전해
 DocType: Purchase Taxes and Charges,On Previous Row Amount,이전 행의 양에
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +24,Please enter Payment Amount in atleast one row,이어야 한 행에 결제 금액을 입력하세요
+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 프로필
 apps/erpnext/erpnext/config/accounts.py +153,"Seasonality for setting budgets, targets etc.","설정 예산, 목표 등 계절성"
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +238,Row {0}: Payment Amount cannot be greater than Outstanding Amount,행 {0} : 결제 금액 잔액보다 클 수 없습니다
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +46,Total Unpaid,무급 총
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +21,Time Log is not billable,소요시간 로그는 청구되지 않습니다
 apps/erpnext/erpnext/stock/get_item_details.py +128,"Item {0} is a template, please select one of its variants","{0} 항목 템플릿이며, 그 변종 중 하나를 선택하십시오"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +528,Purchaser,구매자
+apps/erpnext/erpnext/public/js/setup_wizard.js +272,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 +71,Please enter the Against Vouchers manually,수동에 대해 바우처를 입력하세요
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +107,Please enter the Against Vouchers manually,수동에 대해 바우처를 입력하세요
 DocType: SMS Settings,Static Parameters,정적 매개 변수
 DocType: Purchase Order,Advance Paid,사전 유료
 DocType: Item,Item Tax,상품의 세금
@@ -3946,14 +3784,12 @@
 apps/erpnext/erpnext/config/crm.py +48,Send mass SMS to your contacts,상대에게 대량 SMS를 보내기
 DocType: Purchase Taxes and Charges,Consider Tax or Charge for,세금이나 요금에 대한 고려
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,실제 수량은 필수입니다
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +42,Cross-rolling,크로스 압연
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +132,Credit Card,신용카드
+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 +95,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,세금 및 요금을 입력하세요
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +85,Machining,가공
 DocType: Sales Invoice Item,Drop Ship,드롭 선박
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","여기에서 당신은 부모, 배우자와 자녀의 이름과 직업 등 가족 세부 사항을 유지 관리 할 수 있습니다"
 DocType: Hub Settings,Seller Name,판매자 이름
@@ -3963,7 +3799,7 @@
 DocType: Stock Entry,Repack,재 포장
 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/setup/page/setup_wizard/setup_wizard.js +500,Attach Logo,로고 첨부
+apps/erpnext/erpnext/public/js/setup_wizard.js +246,Attach Logo,로고 첨부
 DocType: Customer,Commission Rate,위원회 평가
 apps/erpnext/erpnext/stock/doctype/item/item.js +38,Make Variant,변형을 확인
 apps/erpnext/erpnext/config/hr.py +145,Block leave applications by department.,부서에서 허가 응용 프로그램을 차단합니다.
@@ -3978,19 +3814,19 @@
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +105,Please select a csv file,CSV 파일을 선택하세요
 DocType: Dropbox Backup,Send Backups to Dropbox,드롭 박스에 백업 보내기
 DocType: Purchase Order,To Receive and Bill,수신 및 법안
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +94,Designer,디자이너
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Designer,디자이너
 apps/erpnext/erpnext/config/selling.py +121,Terms and Conditions Template,이용 약관 템플릿
 DocType: Serial No,Delivery Details,납품 세부 사항
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +383,Cost Center is required in row {0} in Taxes table for type {1},비용 센터가 행에 필요한 {0} 세금 테이블의 유형에 대한 {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +386,Cost Center is required in row {0} in Taxes table for type {1},비용 센터가 행에 필요한 {0} 세금 테이블의 유형에 대한 {1}
 DocType: Item,Automatically create Material Request if quantity falls below this level,수량이 수준 이하로 떨어질 경우 자동으로 자료 요청을 만들
 ,Item-wise Purchase Register,상품 현명한 구매 등록
 DocType: Batch,Expiry Date,유효 기간
-apps/erpnext/erpnext/stock/doctype/item/item.py +375,"To set reorder level, item must be a Purchase Item or Manufacturing Item",재주문 수준을 설정하려면 항목은 구매 상품 또는 제조 품목이어야합니다
+apps/erpnext/erpnext/stock/doctype/item/item.py +379,"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.,프로젝트 마스터.
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,다음 통화 $ 등과 같은 모든 기호를 표시하지 마십시오.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +330, (Half Day),(반나절)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +374, (Half Day),(반나절)
 DocType: Supplier,Credit Days,신용 일
 DocType: Leave Type,Is Carry Forward,이월된다
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +478,Get Items from BOM,BOM에서 항목 가져 오기
@@ -3998,7 +3834,7 @@
 apps/erpnext/erpnext/config/manufacturing.py +120,Bill of Materials,재료 명세서 (BOM)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +77,Row {0}: Party Type and Party is required for Receivable / Payable account {1},행 {0} : 파티 형 파티는 채권 / 채무 계정이 필요합니다 {1}
 DocType: Dropbox Backup,Send Notifications To,알림을 보내기
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html +26,Ref Date,참조 날짜
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +54,Ref Date,참조 날짜
 DocType: Employee,Reason for Leaving,떠나는 이유
 DocType: Expense Claim Detail,Sanctioned Amount,제재 금액
 DocType: GL Entry,Is Opening,개시
@@ -4006,4 +3842,3 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +188,Account {0} does not exist,계정 {0}이 (가) 없습니다
 DocType: Account,Cash,자금
 DocType: Employee,Short biography for website and other publications.,웹 사이트 및 기타 간행물에 대한 짧은 전기.
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +31,Please create Salary Structure for employee {0},직원에 대한 급여 구조를 만드십시오 {0}
diff --git a/erpnext/translations/lv.csv b/erpnext/translations/lv.csv
index e2f6e52..7b50e61 100644
--- a/erpnext/translations/lv.csv
+++ b/erpnext/translations/lv.csv
@@ -1,13 +1,12 @@
 DocType: Employee,Salary Mode,Alga Mode
 DocType: Cost Center,"Select Monthly Distribution, if you want to track based on seasonality.","Izvēlieties Mēneša Distribution, ja jūs vēlaties, lai izsekotu, pamatojoties uz sezonalitāti."
 DocType: Employee,Divorced,Šķīries
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +86,Warning: Same item has been entered multiple times.,Brīdinājums: Same priekšmets ir ievadīts vairākas reizes.
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +80,Warning: Same item has been entered multiple times.,Brīdinājums: Same priekšmets ir ievadīts vairākas reizes.
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +96,Items already synced,Preces jau sinhronizēts
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,Atļaut punkts jāpievieno vairākas reizes darījumā
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,Atcelt Materiāls Visit {0} pirms lauzt šo garantijas prasību
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +19,Consumer Products,Consumer Products
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,Consumer Products
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +68,Please select Party Type first,"Lūdzu, izvēlieties Party veids pirmais"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +90,Annealing,Rūdīšana
 DocType: Item,Customer Items,Klientu Items
 apps/erpnext/erpnext/accounts/doctype/account/account.py +45,Account {0}: Parent account {1} can not be a ledger,Konts {0}: Mātes vērā {1} nevar būt grāmata
 DocType: Item,Publish Item to hub.erpnext.com,Publicēt postenis uz hub.erpnext.com
@@ -20,15 +19,14 @@
 DocType: About Us Settings,Website,Mājas lapa
 DocType: POS Profile,Applicable for User,Piemērojams Lietotājs
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +169,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Pārtraucis ražošanu rīkojums nevar tikt atcelts, Unstop to vispirms, lai atceltu"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +23,Compaction plus sintering,Blīvēšanas plus aglomerācijas
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,Currency is required for Price List {0},Valūta ir nepieciešama Cenrāža {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Tiks aprēķināts darījumā.
 DocType: Purchase Order,Customer Contact,Klientu Kontakti
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +549,From Material Request,No Material Pieprasījums
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +572,From Material Request,No Material Pieprasījums
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} Tree
 DocType: Job Applicant,Job Applicant,Darba iesniedzējs
 apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,Nav vairāk rezultātu.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +78,Legal,Juridisks
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +34,Legal,Juridisks
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +114,Actual type tax cannot be included in Item rate in row {0},Faktiskais veids nodokli nevar iekļaut vienības likmes kārtas {0}
 DocType: C-Form,Customer,Klients
 DocType: Purchase Receipt Item,Required By,Nepieciešamais Līdz
@@ -43,7 +41,6 @@
 DocType: Manufacturing Settings,Default 10 mins,Default 10 min
 DocType: Leave Type,Leave Type Name,Atstājiet veida nosaukums
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +148,Series Updated Successfully,Series Atjaunots Veiksmīgi
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +150,Stitching,Izšūšanas
 DocType: Pricing Rule,Apply On,Piesakies On
 DocType: Item Price,Multiple Item prices.,Vairāki Izstrādājumu cenas.
 ,Purchase Order Items To Be Received,"Pirkuma pasūtījuma posteņi, kas saņemami"
@@ -51,8 +48,8 @@
 DocType: Quality Inspection Reading,Parameter,Parametrs
 apps/erpnext/erpnext/projects/doctype/project/project.py +43,Expected End Date can not be less than Expected Start Date,"Paredzams, beigu datums nevar būt mazāki nekā paredzēts sākuma datuma"
 apps/erpnext/erpnext/utilities/transaction_base.py +104,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Row # {0}: Novērtēt jābūt tāda pati kā {1} {2} ({3} / {4})
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +189,New Leave Application,Jauns atvaļinājuma pieteikums
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +134,Bank Draft,Banka projekts
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +204,New Leave Application,Jauns atvaļinājuma pieteikums
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +134,Bank Draft,Banka projekts
 DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,"1. Lai saglabātu klientu gudrs pozīcijas kods un padarīt tās meklēšanai, pamatojoties uz to kodu Izmantojiet šo opciju"
 DocType: Mode of Payment Account,Mode of Payment Account,Mode maksājumu konta
 apps/erpnext/erpnext/stock/doctype/item/item.js +34,Show Variants,Rādīt Variants
@@ -64,25 +61,23 @@
 DocType: Production Plan Item,Production Plan Item,Ražošanas plāna punktu
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +141,User {0} is already assigned to Employee {1},Lietotāja {0} jau ir piešķirts Darbinieku {1}
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +13,Make new POS Profile,Veikt jaunu POS profils
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +31,Health Care,Veselības aprūpe
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,Veselības aprūpe
 DocType: Purchase Invoice,Monthly,Ikmēneša
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +66,Delay in payment (Days),Maksājuma kavējums (dienas)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +494,Invoice,Pavadzīme
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +519,Invoice,Pavadzīme
 DocType: Maintenance Schedule Item,Periodicity,Periodiskums
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +357,Email Address,E-pasta adrese
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +21,Defense,Aizstāvēšana
+apps/erpnext/erpnext/public/js/setup_wizard.js +107,Email Address,E-pasta adrese
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,Aizstāvēšana
 DocType: Company,Abbr,Abbr
 DocType: Appraisal Goal,Score (0-5),Rezultāts (0-5)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +193,Row {0}: {1} {2} does not match with {3},Rinda {0}: {1}{2} nesakrīt ar {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +67,Row # {0}:,Row # {0}:
 DocType: Delivery Note,Vehicle No,Transportlīdzekļu Nr
 apps/erpnext/erpnext/public/js/pos/pos.js +528,Please select Price List,"Lūdzu, izvēlieties cenrādi"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +162,Woodworking,Kokapstrāde
 DocType: Production Order Operation,Work In Progress,Work In Progress
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +153,3D printing,3D drukāšana
 DocType: Employee,Holiday List,Brīvdienu saraksts
 DocType: Time Log,Time Log,Laiks Log
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +530,Accountant,Grāmatvedis
+apps/erpnext/erpnext/public/js/setup_wizard.js +274,Accountant,Grāmatvedis
 DocType: Cost Center,Stock User,Stock User
 DocType: Company,Phone No,Tālruņa Nr
 DocType: Time Log,"Log of Activities performed by users against Tasks that can be used for tracking time, billing.","Log par veiktajām darbībām, ko lietotāji pret uzdevumu, ko var izmantot, lai izsekotu laiku, rēķinu."
@@ -98,18 +93,19 @@
 DocType: Bin,Quantity Requested for Purchase,Daudzums lūdz iesniegt pirkšanai
 DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name","Pievienojiet .csv failu ar divām kolonnām, viena veco nosaukumu un vienu jaunu nosaukumu"
 DocType: Packed Item,Parent Detail docname,Parent Detail docname
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Kg,Kg
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Kg,Kg
 apps/erpnext/erpnext/config/hr.py +48,Opening for a Job.,Atvēršana uz darbu.
 DocType: Item Attribute,Increment,Pieaugums
 apps/erpnext/erpnext/public/js/stock_analytics.js +63,Select Warehouse...,Izvēlieties noliktava ...
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +6,Advertising,Reklāma
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,Reklāma
+apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,Pats uzņēmums ir reģistrēts vairāk nekā vienu reizi
 DocType: Employee,Married,Precējies
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +389,Stock cannot be updated against Delivery Note {0},Preces nevar atjaunināt pret piegāde piezīme {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +391,Stock cannot be updated against Delivery Note {0},Preces nevar atjaunināt pret piegāde piezīme {0}
 DocType: Payment Reconciliation,Reconcile,Saskaņot
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +30,Grocery,Pārtikas veikals
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,Pārtikas veikals
 DocType: Quality Inspection Reading,Reading 1,Reading 1
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Make Bank Entry,Padarīt Bank Entry
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +40,Pension Funds,Pensiju fondi
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,Pensiju fondi
 apps/erpnext/erpnext/accounts/doctype/account/account.py +142,Warehouse is mandatory if account type is Warehouse,"Noliktava ir obligāta, ja konts veids ir noliktava"
 DocType: SMS Center,All Sales Person,Visi Sales Person
 DocType: Lead,Person Name,Persona Name
@@ -131,7 +127,7 @@
 DocType: Quality Inspection,Get Specification Details,Saņemt specifikācijas detaļas
 DocType: Lead,Interested,Ieinteresēts
 apps/erpnext/erpnext/config/manufacturing.py +14,Bill of Material,Bill materiālu
-apps/erpnext/erpnext/public/js/stock_analytics.js +45,Opening,Atklāšana
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +158,Opening,Atklāšana
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},No {0} uz {1}
 DocType: Item,Copy From Item Group,Kopēt no posteņa grupas
 DocType: Journal Entry,Opening Entry,Atklāšanas Entry
@@ -145,23 +141,22 @@
 DocType: Employee Education,Under Graduate,Zem absolvents
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +22,Target On,Mērķa On
 DocType: BOM,Total Cost,Kopējās izmaksas
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +99,Reaming,Urbšana
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +9,Activity Log:,Aktivitāte Log:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +199,Item {0} does not exist in the system or has expired,Postenis {0} nepastāv sistēmā vai ir beidzies
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +44,Real Estate,Real Estate
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +44,Real Estate,Real Estate
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +4,Statement of Account,Paziņojums par konta
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +41,Pharmaceuticals,Pharmaceuticals
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,Pharmaceuticals
 DocType: Expense Claim Detail,Claim Amount,Prasības summa
 DocType: Employee,Mr,Mr
 DocType: Custom Script,Client,Klients
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,Piegādātājs Type / piegādātājs
 DocType: Naming Series,Prefix,Priedēklis
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Consumable,Patērējamās
+apps/erpnext/erpnext/public/js/setup_wizard.js +359,Consumable,Patērējamās
 DocType: Upload Attendance,Import Log,Import Log
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.js +19,Send,Sūtīt
 DocType: Sales Invoice Item,Delivered By Supplier,Pasludināts piegādātāja
 DocType: SMS Center,All Contact,Visi Contact
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +164,Annual Salary,Gada alga
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +164,Annual Salary,Gada alga
 DocType: Period Closing Voucher,Closing Fiscal Year,Noslēguma fiskālajā gadā
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +69,Stock Expenses,Akciju Izdevumi
 DocType: Newsletter,Email Sent?,Nosūtīts e-pasts?
@@ -169,26 +164,24 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +92,Show Time Logs,Rādīt Time Baļķi
 DocType: Journal Entry Account,Credit in Company Currency,Kredītu uzņēmumā Valūta
 DocType: Delivery Note,Installation Status,Instalācijas statuss
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +115,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Pieņemts + Noraidīts Daudz ir jābūt vienādam ar Saņemts daudzumu postenī {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +118,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Pieņemts + Noraidīts Daudz ir jābūt vienādam ar Saņemts daudzumu postenī {0}
 DocType: Item,Supply Raw Materials for Purchase,Piegādes izejvielas iegādei
 apps/erpnext/erpnext/stock/get_item_details.py +133,Item {0} must be a Purchase Item,Postenis {0} jābūt iegāde punkts
 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","Lejupielādēt veidni, aizpildīt atbilstošus datus un pievienot modificētu failu. Visi datumi un darbinieku saspēles izvēlēto periodu nāks veidnē, ar esošajiem apmeklējuma reģistru"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +446,Item {0} is not active or end of life has been reached,Postenis {0} nav aktīvs vai ir sasniegts nolietoto
 DocType: Time Log Batch,Will be updated after Sales Invoice is Submitted.,Atjauninās pēc pārdošanas rēķinu iesniegšanas.
-apps/erpnext/erpnext/controllers/accounts_controller.py +493,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Lai iekļautu nodokli rindā {0} vienības likmes, nodokļi rindās {1} ir jāiekļauj arī"
+apps/erpnext/erpnext/controllers/accounts_controller.py +494,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Lai iekļautu nodokli rindā {0} vienības likmes, nodokļi rindās {1} ir jāiekļauj arī"
 apps/erpnext/erpnext/config/hr.py +90,Settings for HR Module,Iestatījumi HR moduļa
 DocType: SMS Center,SMS Center,SMS Center
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +78,Straightening,Iztaisnošana
 DocType: BOM Replace Tool,New BOM,Jaunais BOM
 apps/erpnext/erpnext/config/projects.py +28,Batch Time Logs for billing.,Partijas Time Baļķi uz rēķinu.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +15,Countergravity casting,Countergravity liešana
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +30,Newsletter has already been sent,Biļetens jau ir nosūtīts
 DocType: Lead,Request Type,Pieprasījums Type
 DocType: Leave Application,Reason,Iemesls
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +14,Broadcasting,Apraides
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +140,Execution,Izpildīšana
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +364,The first user will become the System Manager (you can change this later).,Pirmais lietotājs kļūs System Manager (jūs varat mainīt šo vēlāk).
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,Apraides
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +140,Execution,Izpildīšana
+apps/erpnext/erpnext/public/js/setup_wizard.js +114,The first user will become the System Manager (you can change this later).,Pirmais lietotājs kļūs System Manager (jūs varat mainīt šo vēlāk).
 apps/erpnext/erpnext/config/manufacturing.py +39,Details of the operations carried out.,Sīkāka informācija par veiktajām darbībām.
 DocType: Serial No,Maintenance Status,Uzturēšana statuss
 apps/erpnext/erpnext/config/stock.py +263,Items and Pricing,Preces un cenu
@@ -205,7 +198,6 @@
 DocType: Pricing Rule,Discount on Price List Rate (%),Atlaide Cenrādis Rate (%)
 apps/frappe/frappe/public/js/frappe/form/print.js +96,Start,Sākums
 DocType: User,First Name,Vārds
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +12,Full-mold casting,Pilna veidņu liešana
 DocType: Offer Letter,Select Terms and Conditions,Izvēlieties Noteikumi un nosacījumi
 DocType: Production Planning Tool,Sales Orders,Pārdošanas pasūtījumu
 DocType: Purchase Taxes and Charges,Valuation,Vērtējums
@@ -217,8 +209,7 @@
 DocType: Bank Reconciliation,Bank Account,Bankas konts
 DocType: Leave Type,Allow Negative Balance,Atļaut negatīvo atlikumu
 DocType: Selling Settings,Default Territory,Default Teritorija
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +53,Television,Televīzija
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +138,Gashing,Gashing
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,Televīzija
 DocType: Production Order Operation,Updated via 'Time Log',"Atjaunināt, izmantojot ""Time Ieiet"""
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +82,Account {0} does not belong to Company {1},Konts {0} nepieder Sabiedrībai {1}
 DocType: Naming Series,Series List for this Transaction,Sērija saraksts par šo darījumu
@@ -233,14 +224,13 @@
 DocType: Leave Allocation,Add unused leaves from previous allocations,Pievienot neizmantotās lapas no iepriekšējiem piešķīrumiem
 apps/erpnext/erpnext/controllers/recurring_document.py +206,Next Recurring {0} will be created on {1},Nākamais Atkārtojas {0} tiks izveidota {1}
 DocType: Newsletter List,Total Subscribers,Kopā Reģistrētiem
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +575,Contact Name,Contact Name
+,Contact Name,Contact Name
 DocType: Production Plan Item,SO Pending Qty,SO Gaida Daudz
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Izveido atalgojumu par iepriekš minētajiem kritērijiem.
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,Pieprasīt iegādei.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +107,Double housing,Double korpuss
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +156,Only the selected Leave Approver can submit this Leave Application,Tikai izvēlētais Leave apstiprinātājs var iesniegt šo atvaļinājums
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +171,Only the selected Leave Approver can submit this Leave Application,Tikai izvēlētais Leave apstiprinātājs var iesniegt šo atvaļinājums
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,Atbrīvojot datums nedrīkst būt lielāks par datums savienošana
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +172,Leaves per Year,Lapām gadā
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +172,Leaves per Year,Lapām gadā
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup > Settings > Naming Series,"Lūdzu noteikt nosaukšana Series {0}, izmantojot Setup&gt; Uzstādījumi&gt; nosaucot Series"
 DocType: Time Log,Will be updated when batched.,"Tiks papildināts, ja batched."
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +104,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,"Rinda {0}: Lūdzu, pārbaudiet ""Vai Advance"" pret kontā {1}, ja tas ir iepriekš ieraksts."
@@ -249,25 +239,24 @@
 DocType: Item Website Specification,Item Website Specification,Postenis Website Specifikācija
 DocType: Dropbox Backup,Dropbox Access Key,Dropbox Access Key
 DocType: Payment Tool,Reference No,Atsauces Nr
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +348,Leave Blocked,Atstājiet Bloķēts
-apps/erpnext/erpnext/stock/doctype/item/item.py +535,Item {0} has reached its end of life on {1},Postenis {0} ir sasniedzis beigas dzīves uz {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +392,Leave Blocked,Atstājiet Bloķēts
+apps/erpnext/erpnext/stock/doctype/item/item.py +539,Item {0} has reached its end of life on {1},Postenis {0} ir sasniedzis beigas dzīves uz {1}
 apps/erpnext/erpnext/accounts/utils.py +339,Annual,Gada
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Stock Samierināšanās postenis
 DocType: Stock Entry,Sales Invoice No,Pārdošanas rēķins Nr
 DocType: Material Request Item,Min Order Qty,Min Order Daudz
 DocType: Lead,Do Not Contact,Nesazināties
 DocType: Sales Invoice,The unique id for tracking all recurring invoices. It is generated on submit.,"Unikāls id, lai izsekotu visas periodiskās rēķinus. Tas ir radīts apstiprināšanas."
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +93,Software Developer,Software Developer
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +93,Software Developer,Software Developer
 DocType: Item,Minimum Order Qty,Minimālais Order Daudz
 DocType: Pricing Rule,Supplier Type,Piegādātājs Type
 DocType: Item,Publish in Hub,Publicē Hub
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +555,Item {0} is cancelled,Postenis {0} ir atcelts
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +598,Material Request,Materiāls Pieprasījums
+apps/erpnext/erpnext/stock/doctype/item/item.py +559,Item {0} is cancelled,Postenis {0} ir atcelts
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +607,Material Request,Materiāls Pieprasījums
 DocType: Bank Reconciliation,Update Clearance Date,Update Klīrenss Datums
 DocType: Item,Purchase Details,Pirkuma 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} Prece nav atrasts &quot;Izejvielu Kopā&quot; tabulā Pirkuma pasūtījums {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +129,Wire brushing,Wire suku
 DocType: Employee,Relation,Attiecība
 DocType: Shipping Rule,Worldwide Shipping,Worldwide Shipping
 apps/erpnext/erpnext/config/selling.py +23,Confirmed orders from Customers.,Apstiprināti pasūtījumus no klientiem.
@@ -283,12 +272,11 @@
 DocType: Supplier,Address HTML,Adrese HTML
 DocType: Lead,Mobile No.,Mobile No.
 DocType: Maintenance Schedule,Generate Schedule,Izveidot Kalendārs
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +81,Hubbing,Hubbing
 DocType: Purchase Invoice Item,Expense Head,Izdevumu Head
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +86,Please select Charge Type first,"Lūdzu, izvēlieties iekasēšanas veids pirmais"
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,Jaunākais
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +395,Max 5 characters,Max 5 simboli
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +195,Select Your Language,Izvēlieties savu valodu
+apps/erpnext/erpnext/public/js/setup_wizard.js +143,Max 5 characters,Max 5 simboli
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +245,Select Your Language,Izvēlieties savu valodu
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,Pirmais Atstājiet apstiprinātājs sarakstā tiks iestatīts kā noklusējuma Leave apstiprinātāja
 DocType: Manufacturing Settings,"Disables creation of time logs against Production Orders.
 Operations shall not be tracked against Production Order",Izslēdz izveidi laika baļķu pret pasūtījumu. Darbības nedrīkst kāpurķēžu pret Ražošanas Pasūtīt
@@ -300,8 +288,6 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +34,Item {0} must be Service Item,{0} postenis jābūt Service postenis
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +303,Completed Qty can not be greater than 'Qty to Manufacture',"Pabeigts Daudz nevar būt lielāks par ""Daudz, lai ražotu"""
 DocType: DocType,Administrator,Administrators
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +136,Laser drilling,Laser urbšana
-DocType: Stock UOM Replace Utility,New Stock UOM,Inventāra UOM
 DocType: Period Closing Voucher,Closing Account Head,Noslēguma konta vadītājs
 DocType: Employee,External Work History,Ārējā Work Vēsture
 apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,Apļveida Reference kļūda
@@ -310,18 +296,15 @@
 DocType: Lead,Industry,Rūpniecība
 DocType: Employee,Job Profile,Darba Profile
 DocType: Newsletter,Newsletter,Biļetens
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +84,Hydroforming,Hydroforming
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +49,Necking,Mīlināšanās
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Paziņot pa e-pastu uz izveidojot automātisku Material pieprasījuma
 DocType: Journal Entry,Multi Currency,Multi Valūtas
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +51,Item is updated,Postenis tiek atjaunināts
 DocType: Async Task,System Manager,System Manager
 DocType: Payment Reconciliation Invoice,Invoice Type,Rēķins Type
 DocType: Sales Invoice Item,Delivery Note,Piegāde Note
 DocType: Dropbox Backup,Allow Dropbox Access,Atļaut Dropbox Access
 apps/erpnext/erpnext/config/learn.py +72,Setting up Taxes,Iestatīšana Nodokļi
 apps/erpnext/erpnext/accounts/utils.py +189,Payment Entry has been modified after you pulled it. Please pull it again.,"Maksājums Entry ir modificēts pēc velk to. Lūdzu, velciet to vēlreiz."
-apps/erpnext/erpnext/stock/doctype/item/item.py +343,{0} entered twice in Item Tax,{0} ieraksta divreiz Vienības nodokli
+apps/erpnext/erpnext/stock/doctype/item/item.py +347,{0} entered twice in Item Tax,{0} ieraksta divreiz Vienības nodokli
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +105,Summary for this week and pending activities,Kopsavilkums par šo nedēļu un izskatāmo darbību
 DocType: Workstation,Rent Cost,Rent izmaksas
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +74,Please select month and year,"Lūdzu, izvēlieties mēnesi un gadu"
@@ -338,23 +321,21 @@
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,"Ātrums, kādā Klients Valūtu pārvērsts klienta bāzes valūtā"
 DocType: Features Setup,"Available in BOM, Delivery Note, Purchase Invoice, Production Order, Purchase Order, Purchase Receipt, Sales Invoice, Sales Order, Stock Entry, Timesheet","Pieejams BOM, pavadzīme, pirkuma rēķina, ražošanas kārtību, pirkuma pasūtījuma, pirkuma čeka, pārdošanas rēķinu, pārdošanas rīkojumu, Fondu Entry, laika kontrolsaraksts"
 DocType: Item Tax,Tax Rate,Nodokļa likme
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Select Item,Select postenis
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +540,Select Item,Select postenis
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +143,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","Vienība: {0} izdevās partiju gudrs, nevar saskaņot, izmantojot \ Stock samierināšanās, nevis izmantot akciju Entry"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +259,Purchase Invoice {0} is already submitted,Pirkuma rēķins {0} jau ir iesniegts
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +262,Purchase Invoice {0} is already submitted,Pirkuma rēķins {0} jau ir iesniegts
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Batch No must be same as {1} {2},Row # {0}: Partijas Nr jābūt tāda pati kā {1} {2}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Convert to non-Group,Pārvērst ne-Group
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +55,Purchase Receipt must be submitted,Pirkuma saņemšana jāiesniedz
-DocType: Stock UOM Replace Utility,Current Stock UOM,Pašreizējā Stock UOM
 apps/erpnext/erpnext/config/stock.py +53,Batch (lot) of an Item.,(Sērijas) posteņa.
 DocType: C-Form Invoice Detail,Invoice Date,Rēķina datums
 DocType: GL Entry,Debit Amount,Debets Summa
 apps/erpnext/erpnext/accounts/party.py +223,There can only be 1 Account per Company in {0} {1},Tur var būt tikai 1 konts per Company {0} {1}
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Your email address,Jūsu e-pasta adrese
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +194,Please see attachment,"Lūdzu, skatiet pielikumu"
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +203,Please see attachment,"Lūdzu, skatiet pielikumu"
 DocType: Purchase Order,% Received,% Saņemts
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +109,Water jet cutting,Ūdens strūklas griešana
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +24,Setup Already Complete!!,Setup Jau Complete !!
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +20,Setup Already Complete!!,Setup Jau Complete !!
 ,Finished Goods,Gatavās preces
 DocType: Delivery Note,Instructions,Instrukcijas
 DocType: Quality Inspection,Inspected By,Pārbaudīti Līdz
@@ -369,6 +350,7 @@
 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.,"Lūdzu, nav izveidot klientu kontus un piegādātājiem. Tie ir radīti tieši no klienta / piegādātāja meistari."
 DocType: Currency Exchange,Currency Exchange,Valūtas maiņa
 DocType: Purchase Invoice Item,Item Name,Vienības nosaukums
+DocType: Authorization Rule,Approving User  (above authorized value),Apstiprinot lietotāju (virs atļautā vērtība)
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Credit Balance,Kredītu atlikums
 DocType: Employee,Widowed,Atraitnis
 DocType: Production Planning Tool,"Items to be requested which are ""Out of Stock"" considering all warehouses based on projected qty and minimum order qty","Preces, kas jāpieprasa, kas ir ""Izpārdots"", ņemot vērā visas noliktavas, pamatojoties uz plānoto Daudz un minimālā pasūtījuma qty"
@@ -378,11 +360,10 @@
 ,Purchase Register,Pirkuma Reģistrēties
 DocType: Landed Cost Item,Applicable Charges,Piemērojamām izmaksām
 DocType: Workstation,Consumable Cost,Patērējamās izmaksas
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,{0} ({1}) must have role 'Leave Approver',{0} ({1}) ir jābūt lomu 'Leave apstiprinātājs'
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +167,{0} ({1}) must have role 'Leave Approver',{0} ({1}) ir jābūt lomu 'Leave apstiprinātājs'
 DocType: Purchase Receipt,Vehicle Date,Transportlīdzekļu Datums
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +39,Medical,Medicīnisks
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +39,Medical,Medicīnisks
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,Iemesls zaudēt
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +36,Tube beading,Tube beading
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},"Darbstacija ir slēgta šādos datumos, kā par Holiday saraksts: {0}"
 DocType: Employee,Single,Viens
 DocType: Issue,Attachment,Pieķeršanās
@@ -403,10 +384,8 @@
 DocType: Account,Is Group,Is Group
 DocType: Stock Settings,Automatically Set Serial Nos based on FIFO,Automātiski iestata Serial Nos pamatojoties uz FIFO
 DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,Pārbaudiet Piegādātājs Rēķina numurs Unikalitāte
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +31,Thermoforming,Termoformēšanas
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +66,Slitting,Sagriešanas
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +57,'To Case No.' cannot be less than 'From Case No.',"""Lai Lieta Nr ' nevar būt mazāks kā ""No lietā Nr '"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +104,Non Profit,Non Profit
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +104,Non Profit,Non Profit
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_list.js +7,Not Started,Nav sākusies
 DocType: Lead,Channel Partner,Kanālu Partner
 DocType: Account,Old Parent,Old Parent
@@ -415,13 +394,12 @@
 apps/erpnext/erpnext/config/manufacturing.py +74,Global settings for all manufacturing processes.,Globālie uzstādījumi visām ražošanas procesiem.
 DocType: Accounts Settings,Accounts Frozen Upto,Konti Frozen Līdz pat
 DocType: SMS Log,Sent On,Nosūtīts
-apps/erpnext/erpnext/stock/doctype/item/item.py +512,Attribute {0} selected multiple times in Attributes Table,Prasme {0} izvēlēts vairākas reizes atribūtos tabulā
+apps/erpnext/erpnext/stock/doctype/item/item.py +516,Attribute {0} selected multiple times in Attributes Table,Prasme {0} izvēlēts vairākas reizes atribūtos tabulā
 DocType: Sales Order,Not Applicable,Nav piemērojams
 apps/erpnext/erpnext/config/hr.py +140,Holiday master.,Holiday meistars.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +19,Shell molding,Shell formēšanas
 DocType: Material Request Item,Required Date,Nepieciešamais Datums
 DocType: Delivery Note,Billing Address,Norēķinu adrese
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +644,Please enter Item Code.,Ievadiet Preces kods.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +648,Please enter Item Code.,Ievadiet Preces kods.
 DocType: BOM,Costing,Izmaksu
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount","Ja atzīmēts, nodokļa summa tiks uzskatīta par jau iekļautas Print Rate / Print summa"
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,Kopā Daudz
@@ -431,7 +409,7 @@
 DocType: Item Attribute,To Range,Svārstās
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Vērtspapīri un noguldījumi
 DocType: Features Setup,Imports,Imports
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +144,Adhesive bonding,Līmēšanas
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +77,Total leaves allocated is mandatory,Kopā lapas piešķirtās ir obligāta
 DocType: Job Opening,Description of a Job Opening,Apraksts par vakanču
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +102,Pending activities for today,Neapstiprinātas aktivitātes šodienu
 apps/erpnext/erpnext/config/hr.py +28,Attendance record.,Apmeklējumu ieraksts.
@@ -439,26 +417,25 @@
 DocType: Sales Order Item,Used for Production Plan,Izmanto ražošanas plānu
 DocType: System Settings,Loading...,Loading ...
 DocType: DocField,Password,Parole
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +155,Fused deposition modeling,Kausēta nogulsnēšanās modelēšana
 DocType: Manufacturing Settings,Time Between Operations (in mins),Laiks starp operācijām (Min)
 DocType: Customer,Buyer of Goods and Services.,Pircējs Preču un pakalpojumu.
 DocType: Journal Entry,Accounts Payable,Kreditoru
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +24,Add Subscribers,Pievienot abonenti
 apps/erpnext/erpnext/public/js/feature_setup.js +220,""" does not exists","""Neeksistē"
 DocType: Pricing Rule,Valid Upto,Derīgs Līdz pat
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +564,List a few of your customers. They could be organizations or individuals.,Uzskaitīt daži no saviem klientiem. Tie varētu būt organizācijas vai privātpersonas.
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,List a few of your customers. They could be organizations or individuals.,Uzskaitīt daži no saviem klientiem. Tie varētu būt organizācijas vai privātpersonas.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Direct Income,Direct Ienākumi
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +33,"Can not filter based on Account, if grouped by Account","Nevar filtrēt, pamatojoties uz kontu, ja grupēti pēc kontu"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +88,Administrative Officer,Administratīvā amatpersona
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Administrative Officer,Administratīvā amatpersona
 DocType: Payment Tool,Received Or Paid,Saņem vai maksā
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +318,Please select Company,"Lūdzu, izvēlieties Uzņēmums"
 DocType: Stock Entry,Difference Account,Atšķirība konts
 apps/erpnext/erpnext/projects/doctype/task/task.py +44,Cannot close task as its dependant task {0} is not closed.,"Nevar aizvērt uzdevums, jo tās atkarīgas uzdevums {0} nav slēgta."
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +305,Please enter Warehouse for which Material Request will be raised,"Ievadiet noliktava, par kuru Materiāls Pieprasījums tiks izvirzīts"
 DocType: Production Order,Additional Operating Cost,Papildus ekspluatācijas izmaksas
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +20,Cosmetics,Kosmētika
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,Kosmētika
 DocType: DocField,Type,Tips
-apps/erpnext/erpnext/stock/doctype/item/item.py +417,"To merge, following properties must be same for both items","Apvienoties, šādi īpašībām jābūt vienādam abiem posteņiem"
+apps/erpnext/erpnext/stock/doctype/item/item.py +421,"To merge, following properties must be same for both items","Apvienoties, šādi īpašībām jābūt vienādam abiem posteņiem"
 DocType: Communication,Subject,Pakļauts
 DocType: Shipping Rule,Net Weight,Neto svars
 DocType: Employee,Emergency Phone,Avārijas Phone
@@ -468,7 +445,6 @@
 DocType: Journal Entry,Difference (Dr - Cr),Starpība (Dr - Cr)
 DocType: Account,Profit and Loss,Peļņa un zaudējumi
 apps/erpnext/erpnext/config/stock.py +293,Managing Subcontracting,Managing Apakšuzņēmēji
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +58,New UOM must NOT be of type Whole Number,Jaunais UOM NEDRĪKST tipa Visa skaits
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Furniture and Fixture,Mēbeles un Armatūra
 DocType: Quotation,Rate at which Price list currency is converted to company's base currency,"Ātrums, kādā cenrādis valūta tiek pārvērsts uzņēmuma bāzes valūtā"
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Account {0} does not belong to company: {1},Konts {0} nav pieder uzņēmumam: {1}
@@ -487,14 +463,14 @@
 DocType: Purchase Invoice,Supplier Invoice No,Piegādātāju rēķinu Nr
 DocType: Territory,For reference,Par atskaites
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +154,"Cannot delete Serial No {0}, as it is used in stock transactions","Nevar izdzēst Sērijas Nr {0}, jo tas tiek izmantots akciju darījumiem"
-apps/erpnext/erpnext/public/js/account_tree_grid.js +52,Closing (Cr),Noslēguma (Cr)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +227,Closing (Cr),Noslēguma (Cr)
 DocType: Serial No,Warranty Period (Days),Garantijas periods (dienas)
 DocType: Installation Note Item,Installation Note Item,Uzstādīšana Note postenis
 ,Pending Qty,Kamēr Daudz
 DocType: Job Applicant,Thread HTML,Pavediens HTML
 DocType: Company,Ignore,Ignorēt
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +86,SMS sent to following numbers: {0},SMS nosūtīts šādiem numuriem: {0}
-apps/erpnext/erpnext/controllers/buying_controller.py +135,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Piegādātājs Noliktava obligāta nolīgta apakšuzņēmuma pirkuma čeka
+apps/erpnext/erpnext/controllers/buying_controller.py +126,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Piegādātājs Noliktava obligāta nolīgta apakšuzņēmuma pirkuma čeka
 DocType: Pricing Rule,Valid From,Derīgs no
 DocType: Sales Invoice,Total Commission,Kopā Komisija
 DocType: Pricing Rule,Sales Partner,Sales Partner
@@ -502,7 +478,7 @@
 DocType: Monthly Distribution,"**Monthly Distribution** helps you distribute your budget across months if you have seasonality in your business.
 
 To distribute a budget using this distribution, set this **Monthly Distribution** in the **Cost Center**","** Mēneša Distribution ** palīdz izplatīt savu budžetu pāri mēnešiem, ja jums ir sezonalitātes jūsu biznesu. Izplatīt budžetu, izmantojot šo sadalījumu, noteikt šo ** Mēneša sadalījums ** ar ** izmaksu centra **"
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +183,No records found in the Invoice table,Nav atrasti rēķinu tabulas ieraksti
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +130,No records found in the Invoice table,Nav atrasti rēķinu tabulas ieraksti
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +20,Please select Company and Party Type first,"Lūdzu, izvēlieties Uzņēmumu un Party tips pirmais"
 apps/erpnext/erpnext/config/accounts.py +84,Financial / accounting year.,Finanšu / grāmatvedības gadā.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","Atvainojiet, Serial Nos nevar tikt apvienots"
@@ -518,25 +494,25 @@
 DocType: Sales Order,Billing and Delivery Status,Norēķini un piegāde statuss
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Atkārtojiet Klienti
 DocType: Leave Control Panel,Allocate,Piešķirt
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +16,Previous,Iepriekšējais
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard_page.html +16,Previous,Iepriekšējais
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +620,Sales Return,Sales Return
 DocType: Production Planning Tool,Select Sales Orders from which you want to create Production Orders.,"Izvēlieties klientu pasūtījumu, no kuriem vēlaties izveidot pasūtījumu."
 DocType: Item,Delivered by Supplier (Drop Ship),Pasludināts ar piegādātāja (Drop Ship)
 apps/erpnext/erpnext/config/hr.py +120,Salary components.,Algu sastāvdaļas.
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,Database potenciālo klientu.
+DocType: Authorization Rule,Customer or Item,Klients vai postenis
 apps/erpnext/erpnext/config/crm.py +17,Customer database.,Klientu datu bāzi.
 DocType: Quotation,Quotation To,Citāts Lai
 DocType: Lead,Middle Income,Middle Ienākumi
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),Atvere (Cr)
 apps/erpnext/erpnext/accounts/utils.py +193,Allocated amount can not be negative,Piešķirtā summa nevar būt negatīvs
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +123,Tumbling,Akrobātika
 DocType: Purchase Order Item,Billed Amt,Billed Amt
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,Loģisks Noliktava pret kuru noliktavas ierakstu veikšanas.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +92,Reference No & Reference Date is required for {0},Atsauces Nr & Reference datums ir nepieciešama {0}
 DocType: Event,Wednesday,Trešdiena
 DocType: Sales Invoice,Customer's Vendor,Klienta Vendor
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +214,Production Order is Mandatory,Ražošanas uzdevums ir obligāta
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +139,Proposal Writing,Priekšlikums Writing
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,Proposal Writing,Priekšlikums Writing
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,Vēl Sales Person {0} pastāv ar to pašu darbinieku id
 apps/erpnext/erpnext/stock/stock_ledger.py +336,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},Negatīvs Stock Kļūda ({6}) postenī {0} noliktavā {1} uz {2}{3}{4}{5}
 DocType: Fiscal Year Company,Fiscal Year Company,Fiskālā Gads Company
@@ -559,7 +535,7 @@
 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.","Tad Cenu Noteikumi tiek filtrētas, balstoties uz klientu, klientu grupā, teritorija, piegādātājs, piegādātāju veida, kampaņas, pārdošanas partneris uc"
 apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.py +179,Please install dropbox python module,"Lūdzu, instalējiet nomestuves python moduli"
 DocType: Employee,Passport Number,Pases numurs
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +82,Manager,Vadītājs
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Manager,Vadītājs
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +494,From Purchase Receipt,No pirkuma čeka
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +219,Same item has been entered multiple times.,Pats priekšmets ir ierakstīta vairākas reizes.
 DocType: SMS Settings,Receiver Parameter,Uztvērējs parametrs
@@ -567,10 +543,9 @@
 DocType: Sales Person,Sales Person Targets,Sales Person Mērķi
 apps/frappe/frappe/public/js/frappe/form/workflow.js +116,To,Līdz
 apps/frappe/frappe/templates/base.html +145,Please enter email address,Ievadiet e-pasta adresi
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +35,End tube forming,End cauruļu veidošanas
 DocType: Production Order Operation,In minutes,Minūtēs
 DocType: Issue,Resolution Date,Izšķirtspēja Datums
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +635,Please set default Cash or Bank account in Mode of Payment {0},Lūdzu iestatītu standarta kases vai bankas kontu maksājuma veidu {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +637,Please set default Cash or Bank account in Mode of Payment {0},Lūdzu iestatītu standarta kases vai bankas kontu maksājuma veidu {0}
 DocType: Selling Settings,Customer Naming By,Klientu nosaukšana Līdz
 apps/erpnext/erpnext/accounts/doctype/account/account.js +67,Convert to Group,Pārveidot uz Group
 DocType: Activity Cost,Activity Type,Pasākuma veids
@@ -578,12 +553,12 @@
 DocType: Customer,Fixed Days,Fiksētie dienas
 DocType: Sales Invoice,Packing List,Iepakojums Latviešu
 apps/erpnext/erpnext/config/buying.py +28,Purchase Orders given to Suppliers.,Pirkuma pasūtījumu dota piegādātājiem.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +43,Publishing,Publicēšana
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +43,Publishing,Publicēšana
 DocType: Activity Cost,Projects User,Projekti User
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Consumed,Patērētā
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +198,{0}: {1} not found in Invoice Details table,{0}: {1} nav atrasts Rēķina informācija tabulā
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,{0}: {1} not found in Invoice Details table,{0}: {1} nav atrasts Rēķina informācija tabulā
 DocType: Company,Round Off Cost Center,Noapaļot izmaksu centru
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +208,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Uzturēšana Visit {0} ir atcelts pirms anulējot šo klientu pasūtījumu
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +203,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Uzturēšana Visit {0} ir atcelts pirms anulējot šo klientu pasūtījumu
 DocType: Material Request,Material Transfer,Materiāls Transfer
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +56,Opening (Dr),Atvere (DR)
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},Norīkošanu timestamp jābūt pēc {0}
@@ -595,7 +570,6 @@
 DocType: Pricing Rule,Sales Manager,Pārdošanas vadītājs
 apps/frappe/frappe/public/js/frappe/model/model.js +492,Rename,Pārdēvēt
 DocType: Journal Entry,Write Off Amount,Uzrakstiet Off summa
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +52,Bending,Locīšana
 apps/frappe/frappe/core/page/user_permissions/user_permissions.js +246,Allow User,Atļaut lietotāju
 DocType: Journal Entry,Bill No,Bill Nr
 DocType: Purchase Invoice,Quarterly,Ceturkšņa
@@ -605,17 +579,16 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Please enter item details,Ievadiet Papildus informācija
 DocType: Purchase Receipt,Other Details,Cita informācija
 DocType: Account,Accounts,Konti
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +67,Marketing,Mārketings
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +65,Straight shearing,Straight cirpšana
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +67,Marketing,Mārketings
 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.,"Lai izsekotu objektu pārdošanas un pirkuma dokumentiem, pamatojoties uz to sērijas nos. Tas var arī izmantot, lai izsekotu garantijas informāciju par produktu."
 DocType: Purchase Receipt Item Supplied,Current Stock,Pašreizējā Stock
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +99,Rejected Warehouse is mandatory against regected item,Noraidīts Noliktava ir obligāta pret regected postenī
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +102,Rejected Warehouse is mandatory against regected item,Noraidīts Noliktava ir obligāta pret regected postenī
 DocType: Account,Expenses Included In Valuation,Izdevumi iekļauts vērtēšanā
 DocType: Employee,Provide email id registered in company,Nodrošināt e-pasta id reģistrēts uzņēmums
 DocType: Hub Settings,Seller City,Pārdevējs City
 DocType: Email Digest,Next email will be sent on:,Nākamais e-pastu tiks nosūtīts uz:
 DocType: Offer Letter Term,Offer Letter Term,Akcija vēstule termins
-apps/erpnext/erpnext/stock/doctype/item/item.py +492,Item has variants.,Prece ir varianti.
+apps/erpnext/erpnext/stock/doctype/item/item.py +496,Item has variants.,Prece ir varianti.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,{0} prece nav atrasta
 DocType: Bin,Stock Value,Stock Value
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,Tree Type
@@ -624,10 +597,9 @@
 DocType: Material Request Item,Quantity and Warehouse,Daudzums un Noliktavas
 DocType: Sales Invoice,Commission Rate (%),Komisijas likme (%)
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +172,"Against Voucher Type must be one of Sales Order, Sales Invoice or Journal Entry","Pret kuponu Type jābūt vienam no pārdošanas rīkojumu, pārdošanas rēķinu vai Journal Entry"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +139,Biomachining,Biomachining
 apps/erpnext/erpnext/setup/utils.py +89,Unable to find exchange rate,Nevar atrast valūtas kursu
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +7,Aerospace,Aerospace
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +19,Welcome,Gaidīts
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +7,Aerospace,Aerospace
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +40,Welcome,Gaidīts
 DocType: Journal Entry,Credit Card Entry,Kredītkarte Entry
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +18,Task Subject,Uzdevums Subject
 apps/erpnext/erpnext/config/stock.py +33,Goods received from Suppliers.,"Preces, kas saņemti no piegādātājiem."
@@ -650,19 +622,19 @@
 DocType: Employee,Cell Number,Šūnu skaits
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Zaudējis
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +120,You can not enter current voucher in 'Against Journal Entry' column,Jūs nevarat ievadīt pašreizējo kuponu in 'Pret žurnālu ierakstu kolonnā
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +25,Energy,Enerģija
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,Enerģija
 DocType: Opportunity,Opportunity From,Iespēja no
 apps/erpnext/erpnext/config/hr.py +33,Monthly salary statement.,Mēnešalga paziņojumu.
 DocType: Item Group,Website Specifications,Website specifikācijas
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +205,New Account,Jauns konts
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +21,{0}: From {0} of type {1},{0}: No {0} tipa {1}
-apps/erpnext/erpnext/controllers/buying_controller.py +283,Row {0}: Conversion Factor is mandatory,Rinda {0}: pārveidošanas koeficients ir obligāta
+apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,Rinda {0}: pārveidošanas koeficients ir obligāta
 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.,Grāmatvedības Ierakstus var veikt pret lapu mezgliem. Ieraksti pret grupām nav atļauts.
 DocType: ToDo,High,Augsts
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +361,Cannot deactivate or cancel BOM as it is linked with other BOMs,"Nevar atslēgt vai anulēt BOM, jo tas ir saistīts ar citām BOMs"
 DocType: Opportunity,Maintenance,Uzturēšana
 DocType: User,Male,Vīrietis
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +182,Purchase Receipt number required for Item {0},"Pirkuma saņemšana skaits, kas nepieciešams postenī {0}"
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +183,Purchase Receipt number required for Item {0},"Pirkuma saņemšana skaits, kas nepieciešams postenī {0}"
 DocType: Item Attribute Value,Item Attribute Value,Postenis īpašības vērtība
 apps/erpnext/erpnext/config/crm.py +64,Sales campaigns.,Pārdošanas kampaņas.
 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.
@@ -691,10 +663,9 @@
 DocType: Address,Personal,Personisks
 DocType: Expense Claim Detail,Expense Claim Type,Izdevumu Pretenzija Type
 DocType: Shopping Cart Settings,Default settings for Shopping Cart,Noklusējuma iestatījumi Grozs
-apps/erpnext/erpnext/controllers/accounts_controller.py +324,"Journal Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Journal Entry {0} ir saistīts pret ordeņa {1}, pārbaudiet, vai tas būtu velk kā iepriekš šajā rēķinā."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +13,Biotechnology,Biotehnoloģija
+apps/erpnext/erpnext/controllers/accounts_controller.py +325,"Journal Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Journal Entry {0} ir saistīts pret ordeņa {1}, pārbaudiet, vai tas būtu velk kā iepriekš šajā rēķinā."
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +13,Biotechnology,Biotehnoloģija
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Office Maintenance Expenses,Biroja uzturēšanas izdevumiem
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +53,Hemming,Hemming
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +66,Please enter Item first,Ievadiet Prece pirmais
 DocType: Account,Liability,Atbildība
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +62,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Sodīt Summa nevar būt lielāka par prasības summas rindā {0}.
@@ -707,10 +678,10 @@
 DocType: Company,Default Bank Account,Default bankas kontu
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +47,"To filter based on Party, select Party Type first","Lai filtrētu pamatojoties uz partijas, izvēlieties Party Type pirmais"
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},"&quot;Update Stock&quot;, nevar pārbaudīt, jo preces netiek piegādātas ar {0}"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Nos,Nos
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Nos,Nos
 DocType: Item,Items with higher weightage will be shown higher,Preces ar augstāku weightage tiks parādīts augstāk
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Banku samierināšanās Detail
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +627,My Invoices,Mani Rēķini
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +629,My Invoices,Mani Rēķini
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,Neviens darbinieks atrasts
 DocType: Purchase Order,Stopped,Apturēts
 DocType: Item,If subcontracted to a vendor,Ja apakšlīgumu nodot pārdevējs
@@ -729,35 +700,33 @@
 DocType: Features Setup,"To enable ""Point of Sale"" features",Lai aktivizētu &quot;tirdzniecības vieta&quot; funkcijas
 DocType: Bin,Moving Average Rate,Moving vidējā likme
 DocType: Production Planning Tool,Select Items,Izvēlieties preces
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,{0} against Bill {1} dated {2},{0} pret likumprojektu {1} datēts {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +328,{0} against Bill {1} dated {2},{0} pret likumprojektu {1} datēts {2}
 DocType: Comment,Reference Name,Atsauce Name
 DocType: Maintenance Visit,Completion Status,Pabeigšana statuss
 DocType: Sales Invoice Item,Target Warehouse,Mērķa Noliktava
 DocType: Item,Allow over delivery or receipt upto this percent,Atļaut pār piegādi vai saņemšanu līdz pat šim procentiem
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +49,Expected Delivery Date cannot be before Sales Order Date,"Paredzams, Piegāde datums nevar būt pirms Sales Order Datums"
 DocType: Upload Attendance,Import Attendance,Import apmeklējums
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +17,All Item Groups,Visi punkts grupas
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +17,All Item Groups,Visi punkts grupas
 DocType: Process Payroll,Activity Log,Aktivitāte Log
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +30,Net Profit / Loss,Neto peļņa / zaudējumi
 apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,Automātiski komponēt ziņu iesniegšanas darījumiem.
 DocType: Production Order,Item To Manufacture,Postenis ražot
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +16,Permanent mold casting,Pastāvīgs veidņu liešana
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} statuss ir {2}
 apps/erpnext/erpnext/config/learn.py +172,Purchase Order to Payment,Iegādājieties Rīkojumu Apmaksa
 DocType: Sales Order Item,Projected Qty,Prognozēts Daudz
 DocType: Sales Invoice,Payment Due Date,Maksājuma Due Date
 DocType: Newsletter,Newsletter Manager,Biļetens vadītājs
-apps/erpnext/erpnext/stock/doctype/item/item.js +229,Item Variant {0} already exists with same attributes,Postenis Variant {0} jau eksistē ar tiem pašiem atribūtiem
+apps/erpnext/erpnext/stock/doctype/item/item.js +231,Item Variant {0} already exists with same attributes,Postenis Variant {0} jau eksistē ar tiem pašiem atribūtiem
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening',&quot;Atklāšana&quot;
 DocType: Notification Control,Delivery Note Message,Piegāde Note Message
 DocType: Expense Claim,Expenses,Izdevumi
 DocType: Item Variant Attribute,Item Variant Attribute,Prece Variant Prasme
 ,Purchase Receipt Trends,Pirkuma čeka tendences
 DocType: Appraisal,Select template from which you want to get the Goals,"Izvēlieties veidni, no kuras jūs vēlaties saņemt mērķus"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +77,Research & Development,Pētniecība un attīstība
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Research & Development,Pētniecība un attīstība
 ,Amount to Bill,"Summa, Bill"
 DocType: Company,Registration Details,Reģistrācija Details
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +75,Staking,Staking
 DocType: Item,Re-Order Qty,Re-Order Daudz
 DocType: Leave Block List Date,Leave Block List Date,Atstājiet Block saraksts datums
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +25,Scheduled to send to {0},Plānots sūtīt uz {0}
@@ -768,18 +737,16 @@
 DocType: Sales Invoice Item,Stock Details,Stock Details
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Projekts Value
 apps/erpnext/erpnext/config/selling.py +304,Point-of-Sale,Tirdzniecības vieta
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,Cannot carry forward {0},Nevar pārnest {0}
 apps/erpnext/erpnext/accounts/doctype/account/account.py +91,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","Konta atlikums jau Kredīts, jums nav atļauts noteikt ""Balance Must Be"", jo ""debets"""
 DocType: Account,Balance must be,Līdzsvars ir jābūt
 DocType: Hub Settings,Publish Pricing,Publicēt Cenas
 DocType: Notification Control,Expense Claim Rejected Message,Izdevumu noraida prasību Message
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +145,Nailing,Naglām
 ,Available Qty,Pieejams Daudz
 DocType: Purchase Taxes and Charges,On Previous Row Total,No iepriekšējās rindas Kopā
 DocType: Salary Slip,Working Days,Darba dienas
 DocType: Serial No,Incoming Rate,Ienākošais Rate
 DocType: Packing Slip,Gross Weight,Bruto svars
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +410,The name of your company for which you are setting up this system.,"Jūsu uzņēmuma nosaukums, par kuru jums ir izveidot šo sistēmu."
+apps/erpnext/erpnext/public/js/setup_wizard.js +158,The name of your company for which you are setting up this system.,"Jūsu uzņēmuma nosaukums, par kuru jums ir izveidot šo sistēmu."
 DocType: HR Settings,Include holidays in Total no. of Working Days,Iekļaut brīvdienas Kopā nē. Darba dienu
 DocType: Job Applicant,Hold,Turēt
 DocType: Employee,Date of Joining,Datums Pievienošanās
@@ -789,7 +756,6 @@
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +3,View Subscribers,Skatīt ES PVN reģistrā
 DocType: Purchase Invoice Item,Purchase Receipt,Pirkuma čeka
 ,Received Items To Be Billed,Saņemtie posteņi ir Jāmaksā
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +114,Abrasive blasting,Smilšstrūklas
 DocType: Employee,Ms,Ms
 apps/erpnext/erpnext/config/accounts.py +148,Currency exchange rate master.,Valūtas maiņas kurss meistars.
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +253,Unable to find Time Slot in the next {0} days for Operation {1},Nevar atrast laika nišu nākamajos {0} dienas ekspluatācijai {1}
@@ -801,7 +767,7 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +209,Serial No {0} does not belong to Item {1},Sērijas Nr {0} nepieder posteni {1}
 DocType: Purchase Receipt Item Supplied,Required Qty,Nepieciešamais Daudz
 DocType: Bank Reconciliation,Total Amount,Kopējā summa
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +32,Internet Publishing,Interneta Publishing
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,Interneta Publishing
 DocType: Production Planning Tool,Production Orders,Ražošanas Pasūtījumi
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +35,Balance Value,Bilance Value
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,Pārdošanas Cenrādis
@@ -812,7 +778,7 @@
 DocType: Supplier,Default Payable Accounts,Noklusējuma samaksu konti
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,Darbinieku {0} nav aktīvs vai neeksistē
 DocType: Features Setup,Item Barcode,Postenis Barcode
-apps/erpnext/erpnext/stock/doctype/item/item.py +487,Item Variants {0} updated,Postenis Variants {0} atjaunināta
+apps/erpnext/erpnext/stock/doctype/item/item.py +491,Item Variants {0} updated,Postenis Variants {0} atjaunināta
 DocType: Quality Inspection Reading,Reading 6,Lasīšana 6
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Pirkuma rēķins Advance
 DocType: Address,Shop,Veikals
@@ -821,7 +787,7 @@
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,"Default Bank / Naudas konts tiks automātiski atjaunināti POS Rēķinā, ja ir izvēlēts šis režīms."
 DocType: Employee,Permanent Address Is,Pastāvīga adrese ir
 DocType: Production Order Operation,Operation completed for how many finished goods?,Darbība pabeigta uz cik gatavās produkcijas?
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +491,The Brand,Brand
+apps/erpnext/erpnext/public/js/setup_wizard.js +237,The Brand,Brand
 apps/erpnext/erpnext/controllers/status_updater.py +163,Allowance for over-{0} crossed for Item {1}.,Pabalsts pārmērīga {0} šķērsoja postenī {1}.
 DocType: Employee,Exit Interview Details,Iziet Intervija Details
 DocType: Item,Is Purchase Item,Vai iegāde postenis
@@ -841,16 +807,16 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Indirect Income,Netieša Ienākumi
 DocType: Payment Tool,Set Payment Amount = Outstanding Amount,Uzstādīt Maksājuma summa = Outstanding Summa
 DocType: Contact Us Settings,Address Line 1,Adrese Line 1
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Variance,Pretruna
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +392,Company Name,Uzņēmuma nosaukums
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +53,Variance,Pretruna
+,Company Name,Uzņēmuma nosaukums
 DocType: SMS Center,Total Message(s),Kopējais ziņojumu (-i)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +515,Select Item for Transfer,Izvēlieties Prece pārneses
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +538,Select Item for Transfer,Izvēlieties Prece pārneses
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,Skatīt sarakstu ar visu palīdzību video
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,"Izvēlieties kontu vadītājs banku, kurā tika deponēts pārbaude."
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,Ļauj lietotājam rediģēt Cenrādi Rate darījumos
 DocType: Pricing Rule,Max Qty,Max Daudz
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +106,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Rinda {0}: Samaksa pret pārdošanas / pirkšanas ordeņa vienmēr jāmarķē kā iepriekš
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +16,Chemical,Ķīmisks
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,Ķīmisks
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +693,All items have already been transferred for this Production Order.,"Visi posteņi jau ir pārskaitīta, lai šim Ražošanas ordeni."
 DocType: Process Payroll,Select Payroll Year and Month,Izvēlieties Algas gads un mēnesis
 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""",Iet uz atbilstošo grupā (parasti piemērošana fondu&gt; apgrozāmo līdzekļu&gt; bankas kontos un izveidot jaunu kontu (noklikšķinot uz Pievienot Child) tipa &quot;Banka&quot;
@@ -861,12 +827,12 @@
 DocType: Item,Inspection Criteria,Pārbaudes kritēriji
 apps/erpnext/erpnext/config/accounts.py +101,Tree of finanial Cost Centers.,Koks finanial izmaksu centriem.
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,Nodota
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +492,Upload your letter head and logo. (you can edit them later).,Augšupielādēt jūsu vēstules galva un logo. (Jūs varat rediģēt tos vēlāk).
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +156,White,Balts
+apps/erpnext/erpnext/public/js/setup_wizard.js +238,Upload your letter head and logo. (you can edit them later).,Augšupielādēt jūsu vēstules galva un logo. (Jūs varat rediģēt tos vēlāk).
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,White,Balts
 DocType: SMS Center,All Lead (Open),Visi Svins (Open)
 DocType: Purchase Invoice,Get Advances Paid,Get Avansa Paid
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +362,Attach Your Picture,Pievienojiet savu attēlu
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Make ,Padarīt
+apps/erpnext/erpnext/public/js/setup_wizard.js +112,Attach Your Picture,Pievienojiet savu attēlu
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +540,Make ,Padarīt
 DocType: Journal Entry,Total Amount in Words,Kopā summa vārdiem
 DocType: Workflow State,Stop,Apstāties
 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.,"Tur bija kļūda. Viens iespējamais iemesls varētu būt, ka jūs neesat saglabājis formu. Lūdzu, sazinieties ar support@erpnext.com ja problēma joprojām pastāv."
@@ -875,14 +841,13 @@
 DocType: Lead,Next Contact Date,Nākamais Contact Datums
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,Atklāšanas Daudzums
 DocType: Holiday List,Holiday List Name,Holiday Latviešu Name
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +168,Stock Options,Akciju opcijas
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +168,Stock Options,Akciju opcijas
 DocType: Journal Entry Account,Expense Claim,Izdevumu Pretenzija
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +181,Qty for {0},Daudz par {0}
 DocType: Leave Application,Leave Application,Atvaļinājuma pieteikums
 apps/erpnext/erpnext/config/hr.py +77,Leave Allocation Tool,Atstājiet Allocation rīks
 DocType: Leave Block List,Leave Block List Dates,Atstājiet Block List Datumi
 DocType: Company,If Monthly Budget Exceeded (for expense account),Ja Mēneša budžets pārsniedza (par izdevumu kontu)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +56,Trimming,Rotājums
 DocType: Workstation,Net Hour Rate,Neto stundu likme
 DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,Izkrauti izmaksas pirkuma čeka
 DocType: Company,Default Terms,Noklusējuma noteikumi
@@ -890,10 +855,9 @@
 DocType: POS Profile,Cash/Bank Account,Naudas / bankas kontu
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,Removed items with no change in quantity or value.,Noņemts preces bez izmaiņām daudzumā vai vērtībā.
 DocType: Delivery Note,Delivery To,Piegāde uz
-apps/erpnext/erpnext/stock/doctype/item/item.py +509,Attribute table is mandatory,Atribūts tabula ir obligāta
+apps/erpnext/erpnext/stock/doctype/item/item.py +513,Attribute table is mandatory,Atribūts tabula ir obligāta
 DocType: Production Planning Tool,Get Sales Orders,Saņemt klientu pasūtījumu
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} nevar būt negatīvs
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +103,Filing,Iesniegšana
 apps/erpnext/erpnext/templates/form_grid/item_grid.html +72,Discount,Atlaide
 DocType: Features Setup,Purchase Discounts,Pirkuma Atlaides
 DocType: Workstation,Wages,Alga
@@ -910,6 +874,7 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +112,You are the Expense Approver for this record. Please Update the 'Status' and Save,"Jūs esat Izdevumu apstiprinātājs šā ieraksta. Lūdzu Update ""Statuss"" un Saglabāt"
 DocType: Serial No,Creation Document No,Izveide Dokumenta Nr
 DocType: Issue,Issue,Izdevums
+apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account does not match with Company,Konts nesakrīt ar Sabiedrību
 apps/erpnext/erpnext/config/stock.py +136,"Attributes for Item Variants. e.g Size, Color etc.","Atribūti postenī Varianti. piemēram, lielumu, krāsu uc"
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +39,WIP Warehouse,WIP Noliktava
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +194,Serial No {0} is under maintenance contract upto {1},Sērijas Nr {0} ir zem uzturēšanas līgumu līdz pat {1}
@@ -918,7 +883,7 @@
 DocType: Tax Rule,Shipping State,Piegāde Valsts
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,"Postenī, jāpievieno, izmantojot ""dabūtu preces no pirkumu čekus 'pogu"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,Pārdošanas izmaksas
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Buying,Standard Pirkšana
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +120,Standard Buying,Standard Pirkšana
 DocType: GL Entry,Against,Pret
 DocType: Item,Default Selling Cost Center,Default pārdošana Izmaksu centrs
 DocType: Sales Partner,Implementation Partner,Īstenošana Partner
@@ -939,29 +904,29 @@
 DocType: Time Log Batch,updated via Time Logs,"atjaunināt, izmantojot Time Baļķi"
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,Vidējais vecums
 DocType: Opportunity,Your sales person who will contact the customer in future,"Jūsu pārdošanas persona, kas sazinās ar klientu nākotnē"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +588,List a few of your suppliers. They could be organizations or individuals.,Uzskaitīt daži no jūsu piegādātājiem. Tie varētu būt organizācijas vai privātpersonas.
+apps/erpnext/erpnext/public/js/setup_wizard.js +326,List a few of your suppliers. They could be organizations or individuals.,Uzskaitīt daži no jūsu piegādātājiem. Tie varētu būt organizācijas vai privātpersonas.
 DocType: Company,Default Currency,Default Valūtas
 DocType: Contact,Enter designation of this Contact,Ievadiet cilmes šo kontaktadresi
 DocType: Contact Us Settings,Address,Adrese
 DocType: Expense Claim,From Employee,No darbinieka
-apps/erpnext/erpnext/controllers/accounts_controller.py +338,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,"Brīdinājums: Sistēma nepārbaudīs pārāk augstu maksu, jo summu par posteni {0} ir {1} ir nulle"
+apps/erpnext/erpnext/controllers/accounts_controller.py +339,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,"Brīdinājums: Sistēma nepārbaudīs pārāk augstu maksu, jo summu par posteni {0} ir {1} ir nulle"
 DocType: Journal Entry,Make Difference Entry,Padarīt atšķirība Entry
 DocType: Upload Attendance,Attendance From Date,Apmeklējumu No Datums
 DocType: Appraisal Template Goal,Key Performance Area,Key Performance Platība
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +54,Transportation,Transportēšana
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +54,Transportation,Transportēšana
 apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +67, and year: ,un gads:
 DocType: Email Digest,Annual Expense,Gada Izdevumu
 DocType: SMS Center,Total Characters,Kopā rakstzīmes
-apps/erpnext/erpnext/controllers/buying_controller.py +139,Please select BOM in BOM field for Item {0},"Lūdzu, izvēlieties BOM BOM jomā postenim {0}"
+apps/erpnext/erpnext/controllers/buying_controller.py +130,Please select BOM in BOM field for Item {0},"Lūdzu, izvēlieties BOM BOM jomā postenim {0}"
 DocType: C-Form Invoice Detail,C-Form Invoice Detail,C-Form rēķinu Detail
 DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,Maksājumu Samierināšanās rēķins
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +32,Contribution %,Ieguldījums%
 DocType: Item,website page link,vietnes lapa saite
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +192,Let's prepare the system for first use.,Pieņemsim sagatavot sistēmu pirmās lietošanas.
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +242,Let's prepare the system for first use.,Pieņemsim sagatavot sistēmu pirmās lietošanas.
 DocType: Company,Company registration numbers for your reference. Tax numbers etc.,Uzņēmuma reģistrācijas numuri jūsu atsauci. Nodokļu numurus uc
 DocType: Sales Partner,Distributor,Izplatītājs
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Grozs Piegāde noteikums
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +214,Production Order {0} must be cancelled before cancelling this Sales Order,Ražošanas Order {0} ir atcelts pirms anulējot šo klientu pasūtījumu
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +209,Production Order {0} must be cancelled before cancelling this Sales Order,Ražošanas Order {0} ir atcelts pirms anulējot šo klientu pasūtījumu
 ,Ordered Items To Be Billed,Pasūtītās posteņi ir Jāmaksā
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +24,From Range has to be less than To Range,No Range ir jābūt mazāk nekā svārstās
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +21,Select Time Logs and Submit to create a new Sales Invoice.,"Izvēlieties Time Baļķi un iesniegt, lai izveidotu jaunu pārdošanas rēķinu."
@@ -981,14 +946,13 @@
 DocType: Sales Invoice Advance,Sales Invoice Advance,Pārdošanas rēķins Advance
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +398,Nothing to request,Nekas pieprasīt
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date',"""Faktiskais sākuma datums"" nevar būt lielāks par ""faktiskā beigu datuma"""
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +75,Management,Vadība
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +75,Management,Vadība
 apps/erpnext/erpnext/config/projects.py +33,Types of activities for Time Sheets,Darbības veidi uz laiku lapām
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +14,Investment casting,Investīciju liešana
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +51,Either debit or credit amount is required for {0},Nu debeta vai kredīta summa ir nepieciešama {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""","Tas tiks pievienots Vienības kodeksa variantu. Piemēram, ja jūsu saīsinājums ir ""SM"", un pozīcijas kods ir ""T-krekls"", postenis kods variants būs ""T-krekls-SM"""
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,"Neto Pay (vārdiem), būs redzams pēc tam, kad esat saglabāt algas aprēķinu."
 apps/frappe/frappe/core/doctype/user/user_list.js +12,Active,Aktīvs
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +154,Blue,Zils
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +154,Blue,Zils
 DocType: Purchase Invoice,Is Return,Vai Return
 DocType: Price List Country,Price List Country,Cenrādis Valsts
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +123,Further nodes can be only created under 'Group' type nodes,"Turpmākas mezglus var izveidot tikai ar ""grupa"" tipa mezgliem"
@@ -998,18 +962,16 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +22,POS Profile {0} already created for user: {1} and company {2},POS Profile {0} jau izveidots lietotājam: {1} un kompānija {2}
 DocType: Purchase Order Item,UOM Conversion Factor,UOM Conversion Factor
 DocType: Stock Settings,Default Item Group,Default Prece Group
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +156,Laminated object manufacturing,Laminētas objekts ražošana
 apps/erpnext/erpnext/config/buying.py +13,Supplier database.,Piegādātājs datu bāze.
 DocType: Account,Balance Sheet,Bilance
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +561,Cost Center For Item with Item Code ',"Izmaksās Center postenī ar Preces kods """
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +45,Stretch forming,Stretch formēšana
 DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,"Jūsu pārdošanas persona saņems atgādinājumu par šo datumu, lai sazināties ar klientu"
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +210,"Further accounts can be made under Groups, but entries can be made against non-Groups","Turpmākas kontus var veikt saskaņā grupās, bet ierakstus var izdarīt pret nepilsoņu grupām"
 apps/erpnext/erpnext/config/hr.py +125,Tax and other salary deductions.,Nodokļu un citu algas atskaitījumi.
 DocType: Lead,Lead,Potenciālie klienti
 DocType: Email Digest,Payables,Piegādātājiem un darbuzņēmējiem
 DocType: Account,Warehouse,Noliktava
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +90,Row #{0}: Rejected Qty can not be entered in Purchase Return,Row # {0}: Noraidīts Daudz nevar jāieraksta Pirkuma Atgriezties
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +93,Row #{0}: Rejected Qty can not be entered in Purchase Return,Row # {0}: Noraidīts Daudz nevar jāieraksta Pirkuma Atgriezties
 ,Purchase Order Items To Be Billed,Pirkuma pasūtījuma posteņi ir Jāmaksā
 DocType: Purchase Invoice Item,Net Rate,Net Rate
 DocType: Purchase Invoice Item,Purchase Invoice Item,Pirkuma rēķins postenis
@@ -1024,13 +986,13 @@
 DocType: Global Defaults,Current Fiscal Year,Kārtējā fiskālajā gadā
 DocType: Global Defaults,Disable Rounded Total,Atslēgt noapaļotiem Kopā
 DocType: Lead,Call,Izsaukums
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +384,'Entries' cannot be empty,"""Ieraksti"" nevar būt tukšs"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +386,'Entries' cannot be empty,"""Ieraksti"" nevar būt tukšs"
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},Dublikāts rinda {0} ar pašu {1}
 ,Trial Balance,Trial Balance
 apps/erpnext/erpnext/config/hr.py +205,Setting up Employees,Iestatīšana Darbinieki
 apps/erpnext/erpnext/public/js/feature_setup.js +220,"Grid ""","Grid """
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +150,Please select prefix first,"Lūdzu, izvēlieties kodu pirmais"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +138,Research,Pētniecība
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +138,Research,Pētniecība
 DocType: Maintenance Visit Purpose,Work Done,Darbs Gatavs
 apps/erpnext/erpnext/controllers/item_variant.py +25,Please specify at least one attribute in the Attributes table,"Lūdzu, norādiet vismaz vienu atribūtu Atribūti tabulā"
 DocType: Contact,User ID,Lietotāja ID
@@ -1038,10 +1000,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +57,View Ledger,View Ledger
 DocType: File,Lft,LFT
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Senākās
-apps/erpnext/erpnext/stock/doctype/item/item.py +394,"An Item Group exists with same name, please change the item name or rename the item group","Prece Group pastāv ar tādu pašu nosaukumu, lūdzu mainīt rindas nosaukumu vai pārdēvēt objektu grupu"
+apps/erpnext/erpnext/stock/doctype/item/item.py +398,"An Item Group exists with same name, please change the item name or rename the item group","Prece Group pastāv ar tādu pašu nosaukumu, lūdzu mainīt rindas nosaukumu vai pārdēvēt objektu grupu"
 DocType: Communication,Delivery Status,Piegāde statuss
 DocType: Production Order,Manufacture against Sales Order,Izgatavojam pret pārdošanas rīkojumu
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +517,Rest Of The World,Pārējā pasaule
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +455,Rest Of The World,Pārējā pasaule
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,{0} postenis nevar būt partijas
 ,Budget Variance Report,Budžets Variance ziņojums
 DocType: Salary Slip,Gross Pay,Bruto Pay
@@ -1052,13 +1014,11 @@
 DocType: BOM Item,Item Description,Vienība Apraksts
 DocType: Payment Tool,Payment Mode,Maksājumu Mode
 DocType: Purchase Invoice,Is Recurring,Vai Atkārtojas
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +154,Direct metal laser sintering,Tiešā metāla lāzera aglomerācijas
 DocType: Purchase Order,Supplied Items,Komplektā Items
 DocType: Production Order,Qty To Manufacture,Daudz ražot
 DocType: Buying Settings,Maintain same rate throughout purchase cycle,Uzturēt pašu likmi visā pirkuma ciklu
 DocType: Opportunity Item,Opportunity Item,Iespēja postenis
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +61,Temporary Opening,Pagaidu atklāšana
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +41,Cryorolling,Cryorolling
 ,Employee Leave Balance,Darbinieku Leave Balance
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +128,Balance for Account {0} must always be {1},Atlikums kontā {0} vienmēr jābūt {1}
 DocType: Address,Address Type,Adrese Īpašuma tips
@@ -1074,23 +1034,23 @@
 DocType: Journal Entry,Get Outstanding Invoices,Saņemt neapmaksātus rēķinus
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,Pasūtījumu {0} nav derīga
 apps/erpnext/erpnext/setup/doctype/company/company.py +172,"Sorry, companies cannot be merged","Atvainojiet, uzņēmumi nevar tikt apvienots"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +145,Small,Mazs
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Small,Mazs
 DocType: Employee,Employee Number,Darbinieku skaits
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},"Gadījums (-i), kas jau ir lietošanā. Izmēģināt no lietā Nr {0}"
 ,Invoiced Amount (Exculsive Tax),Rēķinā Summa (Exculsive nodoklis)
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,2.punkts
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +59,Account head {0} created,Konts galva {0} izveidots
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +153,Green,Zaļš
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Green,Zaļš
 DocType: Item,Auto re-order,Auto re-pasūtīt
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +57,Total Achieved,Kopā Izpildīts
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +59,Total Achieved,Kopā Izpildīts
 DocType: Employee,Place of Issue,Izsniegšanas vieta
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +59,Contract,Līgums
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Contract,Līgums
 DocType: Report,Disabled,Invalīdiem
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +490,UOM coversion factor required for UOM: {0} in Item: {1},UOM Coversion faktors nepieciešama UOM: {0} postenī: {1}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +83,Indirect Expenses,Netiešie izdevumi
 apps/erpnext/erpnext/controllers/selling_controller.py +163,Row {0}: Qty is mandatory,Rinda {0}: Daudz ir obligāta
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +8,Agriculture,Lauksaimniecība
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +611,Your Products or Services,Savus produktus vai pakalpojumus
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,Lauksaimniecība
+apps/erpnext/erpnext/public/js/setup_wizard.js +347,Your Products or Services,Savus produktus vai pakalpojumus
 DocType: Mode of Payment,Mode of Payment,Maksājuma veidu
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,Tas ir sakne posteni grupas un to nevar rediģēt.
 DocType: Journal Entry Account,Purchase Order,Pasūtījuma
@@ -1102,7 +1062,7 @@
 DocType: Serial No,Serial No Details,Sērijas Nr Details
 DocType: Purchase Invoice Item,Item Tax Rate,Postenis Nodokļu likme
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +113,"For {0}, only credit accounts can be linked against another debit entry","Par {0}, tikai kredīta kontus var saistīt pret citu debeta ierakstu"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Delivery Note {0} is not submitted,Piegāde piezīme {0} nav iesniegta
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +470,Delivery Note {0} is not submitted,Piegāde piezīme {0} nav iesniegta
 apps/erpnext/erpnext/stock/get_item_details.py +136,Item {0} must be a Sub-contracted Item,Postenis {0} jābūt Apakšuzņēmēju postenis
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,Kapitāla Ekipējums
 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.","Cenu noteikums vispirms izvēlas, pamatojoties uz ""Apply On 'jomā, kas var būt punkts, punkts Koncerns vai Brand."
@@ -1112,7 +1072,7 @@
 DocType: Appraisal Goal,Goal,Mērķis
 DocType: Sales Invoice Item,Edit Description,Edit Apraksts
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +318,Expected Delivery Date is lesser than Planned Start Date.,"Paredzams, piegāde datums ir mazāks nekā plānotais sākuma datums."
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +579,For Supplier,Piegādātājam
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +602,For Supplier,Piegādātājam
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,"Iestatīšana konta veidu palīdz, izvēloties šo kontu darījumos."
 DocType: Purchase Invoice,Grand Total (Company Currency),Pavisam kopā (Company valūta)
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,Kopā Izejošais
@@ -1138,10 +1098,10 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +74,"Total {0} for all items is zero, may you should change 'Distribute Charges Based On'","Kopā {0} uz visiem posteņiem ir nulle, var jums vajadzētu mainīt &quot;Sadalīt maksa ir atkarīga no&quot;"
 DocType: Purchase Invoice,Taxes and Charges Calculation,Nodokļi un maksājumi aprēķināšana
 DocType: BOM Operation,Workstation,Workstation
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +112,Hardware,Detaļas
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +112,Hardware,Detaļas
 DocType: Attendance,HR Manager,HR vadītājs
 apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,"Lūdzu, izvēlieties Company"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +50,Privilege Leave,Privilege Leave
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +50,Privilege Leave,Privilege Leave
 DocType: Purchase Invoice,Supplier Invoice Date,Piegādātāju rēķinu Datums
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +79,You need to enable Shopping Cart,"Jums ir nepieciešams, lai dotu iespēju Grozs"
 apps/frappe/frappe/public/js/frappe/form/grid_body.html +6,No Data,Nav datu
@@ -1154,7 +1114,7 @@
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +81,Overlapping conditions found between:,Pārklāšanās apstākļi atrasts starp:
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +168,Against Journal Entry {0} is already adjusted against some other voucher,Pret Vēstnesī Entry {0} jau ir koriģēts pret kādu citu talonu
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +68,Total Order Value,Kopā pasūtījuma vērtība
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +38,Food,Pārtika
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +38,Food,Pārtika
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Novecošana Range 3
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +139,You can make a time log only against a submitted production order,Jūs varat veikt laiku žurnāls tikai pret iesniegto ražošanas kārtībā
 DocType: Maintenance Schedule Item,No of Visits,Nē apmeklējumu
@@ -1174,6 +1134,7 @@
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,View Offer Letter,Skatīt Piedāvājums vēstule
 DocType: Communication,Communication,Sakari
 DocType: Item,Is Service Item,Vai Service postenis
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +81,Application period cannot be outside leave allocation period,Pieteikumu iesniegšanas termiņš nevar būt ārpus atvaļinājuma piešķiršana periods
 DocType: Activity Cost,Projects,Projekti
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +31,Please select Fiscal Year,"Lūdzu, izvēlieties saimnieciskais gads"
 apps/erpnext/erpnext/controllers/buying_controller.py +23,From {0} | {1} {2},No {0} | {1}{2}
@@ -1192,7 +1153,7 @@
 DocType: Item,Maintain Stock,Uzturēt Noliktava
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +213,Stock Entries already created for Production Order ,Krājumu jau radīti Ražošanas Pasūtīt
 DocType: Leave Control Panel,Leave blank if considered for all designations,"Atstāt tukšu, ja to uzskata par visiem apzīmējumiem"
-apps/erpnext/erpnext/controllers/accounts_controller.py +499,Charge of type 'Actual' in row {0} cannot be included in Item Rate,"Lādiņš tips ""Faktiskais"" rindā {0} nevar iekļaut postenī Rate"
+apps/erpnext/erpnext/controllers/accounts_controller.py +500,Charge of type 'Actual' in row {0} cannot be included in Item Rate,"Lādiņš tips ""Faktiskais"" rindā {0} nevar iekļaut postenī Rate"
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,Max: {0},Max: {0}
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +16,From Datetime,No DATETIME
 DocType: Email Digest,For Company,Par Company
@@ -1202,7 +1163,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +50,Chart of Accounts,Kontu
 DocType: Material Request,Terms and Conditions Content,Noteikumi un nosacījumi saturs
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +471,cannot be greater than 100,nevar būt lielāks par 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +546,Item {0} is not a stock Item,Postenis {0} nav krājums punkts
+apps/erpnext/erpnext/stock/doctype/item/item.py +550,Item {0} is not a stock Item,Postenis {0} nav krājums punkts
 DocType: Maintenance Visit,Unscheduled,Neplānotā
 DocType: Employee,Owned,Pieder
 DocType: Salary Slip Deduction,Depends on Leave Without Pay,Atkarīgs Bezalgas atvaļinājums
@@ -1216,30 +1177,28 @@
 DocType: HR Settings,Employee Settings,Darbinieku iestatījumi
 ,Batch-Wise Balance History,Partijas-Wise Balance Vēsture
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +72,To Do List,To Do List
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +63,Apprentice,Māceklis
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Apprentice,Māceklis
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +99,Negative Quantity is not allowed,Negatīva Daudzums nav atļauta
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
 Used for Taxes and Charges",Nodokļu detaļa galda paņemti no postenis kapteiņa kā stīgu un uzglabā šajā jomā. Lieto nodokļiem un nodevām
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +61,Lancing,Lancing
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +151,Employee cannot report to himself.,Darbinieks nevar ziņot sev.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Ja konts ir sasalusi, ieraksti ir atļauts ierobežotas lietotājiem."
 DocType: Email Digest,Bank Balance,Bankas bilance
-apps/erpnext/erpnext/controllers/accounts_controller.py +435,Accounting Entry for {0}: {1} can only be made in currency: {2},Grāmatvedības ieraksts par {0}: {1} var veikt tikai valūtā: {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +436,Accounting Entry for {0}: {1} can only be made in currency: {2},Grāmatvedības ieraksts par {0}: {1} var veikt tikai valūtā: {2}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +38,No active Salary Structure found for employee {0} and the month,Nav aktīvas Algu struktūra atrasts darbiniekam {0} un mēneša
 DocType: Job Opening,"Job profile, qualifications required etc.","Darba profils, nepieciešams kvalifikācija uc"
 DocType: Journal Entry Account,Account Balance,Konta atlikuma
 apps/erpnext/erpnext/config/accounts.py +112,Tax Rule for transactions.,Nodokļu noteikums par darījumiem.
 DocType: Rename Tool,Type of document to rename.,Dokumenta veids pārdēvēt.
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +630,We buy this Item,Mēs Pirkt šo preci
+apps/erpnext/erpnext/public/js/setup_wizard.js +366,We buy this Item,Mēs Pirkt šo preci
 DocType: Address,Billing,Norēķinu
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +77,Flanging,Flanging
 DocType: Bulk Email,Not Sent,Nav nosūtīts
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +73,Explosive forming,Sprādzienbīstama formēšana
 DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),Kopā nodokļi un maksājumi (Company valūtā)
 DocType: Shipping Rule,Shipping Account,Piegāde Konts
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +43,Scheduled to send to {0} recipients,Plānots nosūtīt uz {0} saņēmējiem
 DocType: Quality Inspection,Readings,Rādījumus
 DocType: Stock Entry,Total Additional Costs,Kopējās papildu izmaksas
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Sub Assemblies,Sub Kompleksi
+apps/erpnext/erpnext/public/js/setup_wizard.js +359,Sub Assemblies,Sub Kompleksi
 DocType: Shipping Rule Condition,To Value,Vērtēt
 DocType: Supplier,Stock Manager,Krājumu pārvaldnieks
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +143,Source warehouse is mandatory for row {0},Source noliktava ir obligāta rindā {0}
@@ -1249,44 +1208,42 @@
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Import neizdevās!
 apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,Neviena adrese vēl nav pievienota.
 DocType: Workstation Working Hour,Workstation Working Hour,Workstation Darba stundu
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +83,Analyst,Analītiķis
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +202,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Rinda {0}: piešķirtā summa {1} jābūt mazākam par vai vienāds ar JV summai {2}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Analyst,Analītiķis
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +149,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Rinda {0}: piešķirtā summa {1} jābūt mazākam par vai vienāds ar JV summai {2}
 DocType: Item,Inventory,Inventārs
 DocType: Features Setup,"To enable ""Point of Sale"" view",Lai aktivizētu &quot;tirdzniecības vieta&quot; Ņemot
 apps/erpnext/erpnext/public/js/pos/pos.js +402,Payment cannot be made for empty cart,Maksājumu nevar būt par tukšu grozā
 DocType: Item,Sales Details,Pārdošanas Details
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +149,Pinning,Pinning
 DocType: Opportunity,With Items,Ar preces
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,In Daudz
 DocType: Notification Control,Expense Claim Rejected,Izdevumu noraida prasību
 DocType: Sales Invoice,"The date on which next invoice will be generated. It is generated on submit.
 ","Datums, kad nākamais rēķins tiks radīts. Tas ir radīts apstiprināšanas."
 DocType: Item Attribute,Item Attribute,Postenis Atribūtu
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +105,Government,Valdība
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Government,Valdība
 apps/erpnext/erpnext/config/stock.py +268,Item Variants,Postenis Variants
 DocType: Company,Services,Pakalpojumi
 apps/erpnext/erpnext/accounts/report/financial_statements.py +147,Total ({0}),Kopā ({0})
 DocType: Cost Center,Parent Cost Center,Parent Izmaksu centrs
 DocType: Sales Invoice,Source,Avots
 DocType: Leave Type,Is Leave Without Pay,Vai atstāt bez Pay
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +186,No records found in the Payment table,Nav atrasti Maksājuma tabulā ieraksti
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +405,Financial Year Start Date,Finanšu gada sākuma datums
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +133,No records found in the Payment table,Nav atrasti Maksājuma tabulā ieraksti
+apps/erpnext/erpnext/public/js/setup_wizard.js +153,Financial Year Start Date,Finanšu gada sākuma datums
 DocType: Employee External Work History,Total Experience,Kopā pieredze
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +100,Countersinking,Countersinking
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +271,Packing Slip(s) cancelled,Packing Slip (s) atcelts
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +276,Packing Slip(s) cancelled,Packing Slip (s) atcelts
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,Kravu un Ekspedīcijas maksājumi
 DocType: Material Request Item,Sales Order No,Pasūtījumu Nr
 DocType: Item Group,Item Group Name,Postenis Grupas nosaukums
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +50,Taken,Taken
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,Taken
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +66,Transfer Materials for Manufacture,Transfer Materiāli Ražošana
 DocType: Pricing Rule,For Price List,Par cenrādi
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +27,Executive Search,Executive Search
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,Executive Search
 apps/erpnext/erpnext/stock/stock_ledger.py +405,"Purchase rate for item: {0} not found, which is required to book accounting entry (expense). Please mention item price against a buying price list.","Pirkuma likme posteni: {0} nav atrasts, kas ir nepieciešams, lai rezervētu grāmatvedības ieraksts (izdevumi). Lūdzu, atsaucieties uz objektu cenu pret pērk cenrādi."
 DocType: Maintenance Schedule,Schedules,Saraksti
 DocType: Purchase Invoice Item,Net Amount,Neto summa
 DocType: Purchase Order Item Supplied,BOM Detail No,BOM Detail Nr
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),Papildu Atlaide Summa (Uzņēmējdarbības valūta)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +537,Error: {0} > {1},Kļūda: {0}> {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +541,Error: {0} > {1},Kļūda: {0}> {1}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,"Lūdzu, izveidojiet jaunu kontu no kontu plāna."
 DocType: Maintenance Visit,Maintenance Visit,Uzturēšana Apmeklēt
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer > Customer Group > Territory,Klientu> Klientu Group> Teritorija
@@ -1297,7 +1254,6 @@
 DocType: Event,Tuesday,Otrdiena
 DocType: Leave Block List,Block Holidays on important days.,Bloķēt Holidays par svarīgākajiem dienas.
 ,Accounts Receivable Summary,Debitoru kopsavilkums
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +43,Leaves for type {0} already allocated for Employee {1} for period {2} - {3},Lapas tipa {0} jau piešķirtās Darbinieku {1} par periodu {2} - {3}
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +187,Please set User ID field in an Employee record to set Employee Role,Lūdzu noteikt lietotāja ID lauku darbinieks ierakstā noteikt darbinieku lomu
 DocType: UOM,UOM Name,UOM Name
 DocType: Top Bar Item,Target,Mērķis
@@ -1309,15 +1265,14 @@
 DocType: ToDo,Due Date,Due Date
 DocType: Sales Invoice Item,Brand Name,Brand Name
 DocType: Purchase Receipt,Transporter Details,Transporter Details
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Box,Kaste
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +389,The Organization,Organizācija
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Box,Kaste
+apps/erpnext/erpnext/public/js/setup_wizard.js +137,The Organization,Organizācija
 DocType: Monthly Distribution,Monthly Distribution,Mēneša Distribution
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,"Uztvērējs saraksts ir tukšs. Lūdzu, izveidojiet Uztvērēja saraksts"
 DocType: Production Plan Sales Order,Production Plan Sales Order,Ražošanas plāns Sales Order
 DocType: Sales Partner,Sales Partner Target,Sales Partner Mērķa
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},Grāmatvedības ieraksts par {0} var veikt tikai valūtā: {1}
 DocType: Pricing Rule,Pricing Rule,Cenu noteikums
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +58,Notching,Izciršanai
 apps/erpnext/erpnext/config/learn.py +167,Material Request to Purchase Order,Materiāls Pieprasījums Pirkuma pasūtījums
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +74,Row # {0}: Returned Item {1} does not exists in {2} {3},Row # {0}: Atgriezās Vienība {1} jo neeksistē {2} {3}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,Bankas konti
@@ -1334,20 +1289,19 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Amounts not reflected in bank,"Summas, kas nav atspoguļots bankā"
 DocType: Quality Inspection Reading,Reading 4,Reading 4
 apps/erpnext/erpnext/config/hr.py +23,Claims for company expense.,Prasības attiecībā uz uzņēmuma rēķina.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +8,Centrifugal casting,Centrbēdzes liešana
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +119,Magnetic field-assisted finishing,Magnētiskais lauks-palīdz apdare
 DocType: Company,Default Holiday List,Default brīvdienu sarakstu
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +165,Stock Liabilities,Akciju Saistības
 DocType: Purchase Receipt,Supplier Warehouse,Piegādātājs Noliktava
 DocType: Opportunity,Contact Mobile No,Kontaktinformācija Mobilais Nr
 DocType: Production Planning Tool,Select Sales Orders,Izvēlieties klientu pasūtījumu
 ,Material Requests for which Supplier Quotations are not created,"Materiāls pieprasījumi, par kuriem Piegādātājs Citāti netiek radīti"
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +117,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,"Diena (-s), kad jūs piesakāties atvaļinājumu ir brīvdienas. Jums ir nepieciešams, neattiecas uz atvaļinājumu."
 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.,"Izsekot objektus, izmantojot svītrkodu. Jums būs iespēja ievadīt objektus piegāde piezīmi un pārdošanas rēķinu, skenējot svītrkodu posteņa."
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +477,Mark as Delivered,Atzīmēt kā Pasludināts
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +497,Mark as Delivered,Atzīmēt kā Pasludināts
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +34,Make Quotation,Padarīt citāts
 DocType: Dependent Task,Dependent Task,Atkarīgs Task
-apps/erpnext/erpnext/stock/doctype/item/item.py +306,Conversion factor for default Unit of Measure must be 1 in row {0},Konversijas faktors noklusējuma mērvienība ir 1 kārtas {0}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,Leave of type {0} cannot be longer than {1},Atvaļinājums tipa {0} nevar būt ilgāks par {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +310,Conversion factor for default Unit of Measure must be 1 in row {0},Konversijas faktors noklusējuma mērvienība ir 1 kārtas {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +155,Leave of type {0} cannot be longer than {1},Atvaļinājums tipa {0} nevar būt ilgāks par {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Mēģiniet plānojot operācijas X dienas iepriekš.
 DocType: HR Settings,Stop Birthday Reminders,Stop Birthday atgādinājumi
 DocType: SMS Center,Receiver List,Uztvērējs Latviešu
@@ -1355,15 +1309,14 @@
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Patērētā summa
 apps/erpnext/erpnext/public/js/pos/pos.js +491,{0} View,{0} View
 DocType: Salary Structure Deduction,Salary Structure Deduction,Algu struktūra atskaitīšana
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +158,Selective laser sintering,Selektīvā lāzera aglomerācijas
-apps/erpnext/erpnext/stock/doctype/item/item.py +301,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Mērvienība {0} ir ievadīts vairāk nekā vienu reizi Conversion Factor tabulā
+apps/erpnext/erpnext/stock/doctype/item/item.py +305,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Mērvienība {0} ir ievadīts vairāk nekā vienu reizi Conversion Factor tabulā
 apps/frappe/frappe/core/page/data_import_tool/data_import_tool.js +108,Import Successful!,Import veiksmīga!
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Izmaksas Izdoti preces
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +185,Quantity must not be more than {0},Daudzums nedrīkst būt lielāks par {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +41,Age (Days),Vecums (dienas)
 DocType: Quotation Item,Quotation Item,Citāts postenis
 DocType: Account,Account Name,Konta nosaukums
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +41,From Date cannot be greater than To Date,No datums nevar būt lielāks par līdz šim datumam
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +34,From Date cannot be greater than To Date,No datums nevar būt lielāks par līdz šim datumam
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +194,Serial No {0} quantity {1} cannot be a fraction,Sērijas Nr {0} daudzums {1} nevar būt daļa
 apps/erpnext/erpnext/config/buying.py +59,Supplier Type master.,Piegādātājs Type meistars.
 DocType: Purchase Order Item,Supplier Part Number,Piegādātājs Part Number
@@ -1372,14 +1325,14 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +247,{0} {1} is cancelled or stopped,{0} {1} tiek atcelts vai pārtraukta
 DocType: Accounts Settings,Credit Controller,Kredīts Controller
 DocType: Delivery Note,Vehicle Dispatch Date,Transportlīdzekļu Nosūtīšanas datums
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +197,Purchase Receipt {0} is not submitted,Pirkuma saņemšana {0} nav iesniegta
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +198,Purchase Receipt {0} is not submitted,Pirkuma saņemšana {0} nav iesniegta
 DocType: Company,Default Payable Account,Default Kreditoru konts
 apps/erpnext/erpnext/config/website.py +13,"Settings for online shopping cart such as shipping rules, price list etc.","Iestatījumi tiešsaistes iepirkšanās grozs, piemēram, kuģošanas noteikumus, cenrādi uc"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +660,Setup Complete,Setup Complete
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +124,Setup Complete,Setup Complete
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +65,{0}% Billed,{0}% Jāmaksā
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +17,Reserved Qty,Rezervēts Daudz
 DocType: Party Account,Party Account,Party konts
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +74,Human Resources,Cilvēkresursi
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +74,Human Resources,Cilvēkresursi
 DocType: Lead,Upper Income,Upper Ienākumi
 DocType: Journal Entry Account,Debit in Company Currency,Debeta uzņēmumā Valūta
 apps/erpnext/erpnext/support/doctype/issue/issue.py +58,My Issues,Mani jautājumi
@@ -1388,11 +1341,9 @@
 DocType: Company,Default Values,Noklusējuma vērtības
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +236,Row {0}: Payment amount can not be negative,Rinda {0}: Maksājuma summa nevar būt negatīvs
 DocType: Expense Claim,Total Amount Reimbursed,Atmaksāto līdzekļu kopsummas
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +152,Press fitting,Preses montāžas
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +64,Against Supplier Invoice {0} dated {1},Pret Piegādātāju rēķinu {0} datēts {1}
 DocType: Customer,Default Price List,Default Cenrādis
 DocType: Payment Reconciliation,Payments,Maksājumi
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +24,Hot isostatic pressing,Karstā izostatiskā nospiežot
 DocType: ToDo,Medium,Medijs
 DocType: Budget Detail,Budget Allocated,Budžets Piešķirtie
 DocType: Journal Entry,Entry Type,Entry Type
@@ -1405,9 +1356,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +56,None of the items have any change in quantity or value.,Neviens no priekšmetiem ir kādas izmaiņas daudzumā vai vērtībā.
 DocType: Warranty Claim,Warranty Claim,Garantijas prasību
 ,Lead Details,Potenciālā klienta detaļas
-DocType: Authorization Rule,Approving User,Apstiprinot User
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +37,Forging,Kalšanas
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +126,Plating,Galvanizācijas
 DocType: Purchase Invoice,End date of current invoice's period,Beigu datums no kārtējā rēķinā s perioda
 DocType: Pricing Rule,Applicable For,Piemērojami
 DocType: Bank Reconciliation,From Date,No Datums
@@ -1429,31 +1377,29 @@
 DocType: Sales Invoice,Paid Amount (Company Currency),Apmaksātais Summa (Company valūta)
 DocType: Purchase Invoice,Additional Discount,Papildu Atlaide
 DocType: Selling Settings,Selling Settings,Pārdodot Settings
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +39,Online Auctions,Online Izsoles
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,Online Izsoles
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +94,Please specify either Quantity or Valuation Rate or both,"Lūdzu, norādiet nu Daudzums vai Vērtēšanas Rate vai abus"
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +50,"Company, Month and Fiscal Year is mandatory","Company, mēnesis un gads tiek obligāta"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Marketing Expenses,Mārketinga izdevumi
 ,Item Shortage Report,Postenis trūkums ziņojums
-apps/erpnext/erpnext/stock/doctype/item/item.js +183,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Svars ir minēts, \ nLūdzu nerunājot ""Svara UOM"" too"
+apps/erpnext/erpnext/stock/doctype/item/item.js +185,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Svars ir minēts, \ nLūdzu nerunājot ""Svara UOM"" too"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,"Materiāls Pieprasījums izmantoti, lai šā krājuma Entry"
 apps/erpnext/erpnext/config/support.py +43,Single unit of an Item.,Viena vienība posteņa.
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +212,Time Log Batch {0} must be 'Submitted',"Time Log Partijas {0} ir ""Iesniegtie"""
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,Padarīt grāmatvedības ieraksts Katrs krājumu aprites
 DocType: Leave Allocation,Total Leaves Allocated,Kopā Leaves Piešķirtie
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +384,Warehouse required at Row No {0},Noliktava vajadzīgi Row Nr {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +386,Warehouse required at Row No {0},Noliktava vajadzīgi Row Nr {0}
 DocType: Employee,Date Of Retirement,Brīža līdz pensionēšanās
 DocType: Upload Attendance,Get Template,Saņemt Template
 DocType: Address,Postal,Pasta
 DocType: Item,Weightage,Weightage
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +159,Mining,Kalnrūpniecība
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +17,Resin casting,Sveķu liešana
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"Klientu grupa pastāv ar tādu pašu nosaukumu, lūdzu mainīt Klienta nosaukumu vai pārdēvēt klientu grupai"
 apps/erpnext/erpnext/public/js/pos/pos.js +147,Please select {0} first.,"Lūdzu, izvēlieties {0} pirmās."
 apps/erpnext/erpnext/templates/pages/order.html +57,text {0},Teksta {0}
 DocType: Territory,Parent Territory,Parent Teritorija
 DocType: Quality Inspection Reading,Reading 2,Lasīšana 2
 DocType: Stock Entry,Material Receipt,Materiālu saņemšana
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +622,Products,Produkti
+apps/erpnext/erpnext/public/js/setup_wizard.js +358,Products,Produkti
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +47,Party Type and Party is required for Receivable / Payable account {0},Party Type un partija ir nepieciešama / debitoru kontā {0}
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.","Ja šis postenis ir varianti, tad tas nevar izvēlēties pārdošanas pasūtījumiem uc"
 DocType: Lead,Next Contact By,Nākamais Kontakti Pēc
@@ -1463,13 +1409,13 @@
 DocType: Purchase Invoice,Notification Email Address,Paziņošana e-pasta adrese
 DocType: Payment Tool,Find Invoices to Match,"Atrast rēķinus, lai atbilstu"
 ,Item-wise Sales Register,Postenis gudrs Sales Reģistrēties
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +399,"e.g. ""XYZ National Bank""","piemēram, ""XYZ National Bank"""
+apps/erpnext/erpnext/public/js/setup_wizard.js +147,"e.g. ""XYZ National Bank""","piemēram, ""XYZ National Bank"""
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,Vai šis nodoklis iekļauts pamatlikmes?
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +57,Total Target,Kopā Mērķa
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Target,Kopā Mērķa
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.js +22,Shopping Cart is enabled,Grozs ir iespējots
 DocType: Job Applicant,Applicant for a Job,Pretendents uz darbu
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +173,No Production Orders created,Nav Ražošanas Pasūtījumi izveidoti
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +131,Salary Slip of employee {0} already created for this month,Alga Slip darbinieka {0} jau izveidojis šajā mēnesī
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +140,Salary Slip of employee {0} already created for this month,Alga Slip darbinieka {0} jau izveidojis šajā mēnesī
 DocType: Stock Reconciliation,Reconciliation JSON,Izlīgums JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,"Pārāk daudz kolonnas. Eksportēt ziņojumu un izdrukāt to, izmantojot izklājlapu lietotni."
 DocType: Sales Invoice Item,Batch No,Partijas Nr
@@ -1479,14 +1425,14 @@
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +13,Variant,Variants
 apps/frappe/frappe/public/js/frappe/form/toolbar.js +165,New {0},Jaunais {0}
 DocType: Naming Series,Set prefix for numbering series on your transactions,Uzstādīt tituls numerāciju sērijas par jūsu darījumiem
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +169,Stopped order cannot be cancelled. Unstop to cancel.,Apturēts rīkojumu nevar atcelt. Unstop lai atceltu.
-apps/erpnext/erpnext/stock/doctype/item/item.py +323,Default BOM ({0}) must be active for this item or its template,Default BOM ({0}) ir jābūt aktīvam par šo priekšmetu vai tās veidni
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +164,Stopped order cannot be cancelled. Unstop to cancel.,Apturēts rīkojumu nevar atcelt. Unstop lai atceltu.
+apps/erpnext/erpnext/stock/doctype/item/item.py +327,Default BOM ({0}) must be active for this item or its template,Default BOM ({0}) ir jābūt aktīvam par šo priekšmetu vai tās veidni
 DocType: Employee,Leave Encashed?,Atvaļinājums inkasēta?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Iespēja No jomā ir obligāta
 DocType: Item,Variants,Varianti
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +458,Make Purchase Order,Padarīt pirkuma pasūtījuma
 DocType: SMS Center,Send To,Sūtīt
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +111,There is not enough leave balance for Leave Type {0},Nav pietiekami daudz atvaļinājums bilance Atstāt tipa {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +127,There is not enough leave balance for Leave Type {0},Nav pietiekami daudz atvaļinājums bilance Atstāt tipa {0}
 DocType: Sales Team,Contribution to Net Total,Ieguldījums kopējiem neto
 DocType: Sales Invoice Item,Customer's Item Code,Klienta Produkta kods
 DocType: Stock Reconciliation,Stock Reconciliation,Stock Izlīgums
@@ -1523,11 +1469,11 @@
 DocType: Sales Order Item,Actual Qty,Faktiskais Daudz
 DocType: Sales Invoice Item,References,Atsauces
 DocType: Quality Inspection Reading,Reading 10,Reading 10
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +612,"List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start.","Uzskaitīt savus produktus vai pakalpojumus, ko var iegādāties vai pārdot. Pārliecinieties, lai pārbaudītu Vienība Group, mērvienību un citas īpašības, kad sākat."
+apps/erpnext/erpnext/public/js/setup_wizard.js +348,"List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start.","Uzskaitīt savus produktus vai pakalpojumus, ko var iegādāties vai pārdot. Pārliecinieties, lai pārbaudītu Vienība Group, mērvienību un citas īpašības, kad sākat."
 DocType: Hub Settings,Hub Node,Hub Mezgls
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,"Esat ievadījis dublikātus preces. Lūdzu, labot un mēģiniet vēlreiz."
 apps/erpnext/erpnext/controllers/item_variant.py +65,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values,Value {0} par atribūtu {1} neeksistē sarakstā derīgu postenī atribūtu vērtības
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +87,Associate,Līdzstrādnieks
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Associate,Līdzstrādnieks
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +46,Item {0} is not a serialized Item,Postenis {0} nav sērijveida punkts
 DocType: SMS Center,Create Receiver List,Izveidot Uztvērēja sarakstu
 apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +5,Expired,Beidzies
@@ -1536,7 +1482,7 @@
 DocType: Warranty Claim,Issue Date,Emisijas datums
 DocType: Activity Cost,Activity Cost,Aktivitāte Cost
 DocType: Purchase Receipt Item Supplied,Consumed Qty,Patērētā Daudz
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +52,Telecommunications,Telekomunikācijas
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +52,Telecommunications,Telekomunikācijas
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),"Norāda, ka pakete ir daļa no šīs piegādes (Tikai projekts)"
 DocType: Payment Tool,Make Payment Entry,Veikt maksājumus Entry
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +119,Quantity for Item {0} must be less than {1},Daudzums postenī {0} nedrīkst būt mazāks par {1}
@@ -1553,10 +1499,8 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +37,"Selling must be checked, if Applicable For is selected as {0}","Pārdošanas ir jāpārbauda, ​​ja nepieciešams, par ir izvēlēts kā {0}"
 DocType: Purchase Order Item,Supplier Quotation Item,Piegādātājs Citāts postenis
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +27,Make Salary Structure,Padarīt Algas struktūra
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +54,Shearing,Nobīdes
 DocType: Item,Has Variants,Ir Varianti
 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.,"Noklikšķiniet uz ""Make pārdošanas rēķinu"" pogu, lai izveidotu jaunu pārdošanas rēķinu."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +166,Packaging and labeling,Iepakojums un marķējums
 DocType: Monthly Distribution,Name of the Monthly Distribution,Nosaukums Mēneša Distribution
 DocType: Sales Person,Parent Sales Person,Parent Sales Person
 apps/erpnext/erpnext/setup/utils.py +14,Please specify Default Currency in Company Master and Global Defaults,"Lūdzu, norādiet noklusējuma valūtu kompānijā Master un Global noklusējumu"
@@ -1567,19 +1511,18 @@
 DocType: Budget Detail,Fiscal Year,Fiskālā gads
 DocType: Cost Center,Budget,Budžets
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +41,"Budget cannot be assigned against {0}, as it's not an Income or Expense account","Budžets nevar iedalīt pret {0}, jo tas nav ienākumu vai izdevumu kontu"
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Achieved,Izpildīts
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,Izpildīts
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +65,Territory / Customer,Teritorija / Klientu
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,e.g. 5,"piemēram, 5"
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +207,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},Rinda {0}: piešķirtā summa {1} jābūt mazākam par vai vienāds ar rēķinu nenomaksāto summu {2}
+apps/erpnext/erpnext/public/js/setup_wizard.js +294,e.g. 5,"piemēram, 5"
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},Rinda {0}: piešķirtā summa {1} jābūt mazākam par vai vienāds ar rēķinu nenomaksāto summu {2}
 DocType: Sales Invoice,In Words will be visible once you save the Sales Invoice.,"Vārdos būs redzams pēc tam, kad esat saglabāt pārdošanas rēķinu."
 DocType: Item,Is Sales Item,Vai Pārdošanas punkts
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,Postenis Group Tree
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,Postenis {0} nav setup Serial Nr. Pārbaudiet Vienības kapteinis
 DocType: Maintenance Visit,Maintenance Time,Apkopes laiks
 ,Amount to Deliver,Summa rīkoties
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +620,A Product or Service,Produkts vai pakalpojums
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +158,There were errors.,Bija kļūdas.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +101,Tapping,Pieskaroties
+apps/erpnext/erpnext/public/js/setup_wizard.js +356,A Product or Service,Produkts vai pakalpojums
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +146,There were errors.,Bija kļūdas.
 DocType: Naming Series,Current Value,Pašreizējā vērtība
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +171,{0} created,{0} izveidots
 DocType: Delivery Note Item,Against Sales Order,Pret pārdošanas rīkojumu
@@ -1593,7 +1536,7 @@
 apps/erpnext/erpnext/accounts/party.py +275,Due Date cannot be before Posting Date,Due Date nevar būt pirms nosūtīšanas datums
 DocType: Website Item Group,Website Item Group,Mājas lapa Prece Group
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Duties and Taxes,Nodevas un nodokļi
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Please enter Reference date,Ievadiet Atsauces datums
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +312,Please enter Reference date,Ievadiet Atsauces datums
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} maksājumu ierakstus nevar filtrēt pēc {1}
 DocType: Item Website Specification,Table for Item that will be shown in Web Site,"Tabula postenī, kas tiks parādīts Web Site"
 DocType: Purchase Order Item Supplied,Supplied Qty,Piegādāto Daudz
@@ -1601,7 +1544,7 @@
 apps/erpnext/erpnext/config/stock.py +103,Tree of Item Groups.,Koks poz grupu.
 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,Nevar atsaukties rindu skaits ir lielāks par vai vienāds ar pašreizējo rindu skaitu šim Charge veida
 ,Item-wise Purchase History,Postenis gudrs Pirkumu vēsture
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +152,Red,Sarkans
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Red,Sarkans
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +228,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},"Lūdzu, noklikšķiniet uz ""Generate grafiks"" atnest Sērijas Nr piebilda postenī {0}"
 DocType: Account,Frozen,Sasalis
 ,Open Production Orders,Atvērt pasūtījumu
@@ -1616,7 +1559,7 @@
 DocType: Item Attribute,Attribute Name,Atribūta nosaukums
 apps/erpnext/erpnext/controllers/selling_controller.py +236,Item {0} must be Sales or Service Item in {1},Postenis {0} ir pārdošanas vai pakalpojumu prece {1}
 DocType: Item Group,Show In Website,Show In Website
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +621,Group,Grupa
+apps/erpnext/erpnext/public/js/setup_wizard.js +357,Group,Grupa
 DocType: Task,Expected Time (in hours),Sagaidāmais laiks (stundās)
 ,Qty to Order,Daudz pasūtījuma
 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","Lai izsekotu zīmolu šādos dokumentos piegādes pavadzīmē, Opportunity, materiālu pieprasījuma posteni, pirkuma pasūtījuma, Pirkuma kuponu, pircēju saņemšana, citāts, pārdošanas rēķinu, Product Bundle, pārdošanas rīkojumu, Sērijas Nr"
@@ -1626,6 +1569,7 @@
 DocType: Features Setup,Brands,Brands
 DocType: C-Form Invoice Detail,Invoice No,Rēķins Nr
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +480,From Purchase Order,No Pirkuma pasūtījums
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +92,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Atstājiet nevar piemērot / atcelts pirms {0}, jo atvaļinājumu bilance jau ir rokas nosūtīja nākotnē atvaļinājumu piešķiršanas ierakstu {1}"
 DocType: Activity Cost,Costing Rate,Izmaksu Rate
 ,Customer Addresses And Contacts,Klientu Adreses un kontakti
 DocType: Employee,Resignation Letter Date,Atkāpšanās no amata vēstule Datums
@@ -1633,35 +1577,31 @@
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +137,Not Set,Not Set
 DocType: Communication,Date,Datums
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,Atkārtot Klientu Ieņēmumu
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +651,Sit tight while your system is being setup. This may take a few moments.,Sēdēt saspringts kamēr jūsu sistēma tiek uzstādīšana. Tas var aizņemt pāris mirkļus.
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +115,Sit tight while your system is being setup. This may take a few moments.,Sēdēt saspringts kamēr jūsu sistēma tiek uzstādīšana. Tas var aizņemt pāris mirkļus.
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +51,{0} ({1}) must have role 'Expense Approver',"{0} ({1}) ir jābūt lomu rēķina apstiprinātāja """
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Pair,Pāris
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Pair,Pāris
 DocType: Bank Reconciliation Detail,Against Account,Pret kontu
 DocType: Maintenance Schedule Detail,Actual Date,Faktiskais datums
 DocType: Item,Has Batch No,Ir Partijas Nr
 DocType: Delivery Note,Excise Page Number,Akcīzes Page Number
 DocType: Employee,Personal Details,Personīgie Details
 ,Maintenance Schedules,Apkopes grafiki
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +44,Embossing,Reljefs
 ,Quotation Trends,Citāts tendences
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +139,Item Group not mentioned in item master for item {0},Postenis Group vienības kapteinis nav minēts par posteni {0}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +302,Debit To account must be a Receivable account,Debets Lai kontā jābūt pasūtītāju konta
-apps/erpnext/erpnext/stock/doctype/item/item.py +310,"As Production Order can be made for this item, it must be a stock item.","Kā Ražošanas Pasūtīt var izdarīt šajā postenī, ir jābūt akciju postenis."
 DocType: Shipping Rule Condition,Shipping Amount,Piegāde Summa
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +140,Joining,Savieno
-DocType: Authorization Rule,Above Value,Virs vērtība
 ,Pending Amount,Kamēr Summa
 DocType: Purchase Invoice Item,Conversion Factor,Conversion Factor
 DocType: Purchase Order,Delivered,Pasludināts
 apps/erpnext/erpnext/config/hr.py +160,Setup incoming server for jobs email id. (e.g. jobs@example.com),Setup ienākošā servera darba vietas e-pasta id. (Piem jobs@example.com)
 DocType: Purchase Receipt,Vehicle Number,Transportlīdzekļu skaits
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,"Datums, kurā atkārtojas rēķins tiks apstāties"
+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,Kopā piešķirtie lapas {0} nevar būt mazāka par jau apstiprināto lapām {1} par periodu
 DocType: Journal Entry,Accounts Receivable,Debitoru parādi
 ,Supplier-Wise Sales Analytics,Piegādātājs-Wise Sales Analytics
 DocType: Address Template,This format is used if country specific format is not found,"Šis formāts tiek izmantots, ja valstij īpašs formāts nav atrasts"
 DocType: Custom Field,Custom,Paraža
 DocType: Production Order,Use Multi-Level BOM,Lietojiet Multi-Level BOM
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +26,Injection molding,Iesmidzināšana
 DocType: Bank Reconciliation,Include Reconciled Entries,Iekļaut jāsaskaņo Ieraksti
 apps/erpnext/erpnext/config/accounts.py +41,Tree of finanial accounts.,Koks finanial kontiem.
 DocType: Leave Control Panel,Leave blank if considered for all employee types,"Atstājiet tukšu, ja uzskatīja visus darbinieku tipiem"
@@ -1671,30 +1611,28 @@
 apps/frappe/frappe/config/setup.py +130,Printing,Iespiešana
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +114,Expense Claim is pending approval. Only the Expense Approver can update status.,Izdevumu Prasība tiek gaidīts apstiprinājums. Tikai Izdevumu apstiprinātājs var atjaunināt statusu.
 DocType: Purchase Invoice,Additional Discount Amount,Papildus Atlaides summa
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +99,The day(s) on which you are applying for leave are holiday. You need not apply for leave.,"Diena (-as), kurā jūs piesakāties atvaļinājuma ir svētki. Jums ir nepieciešams, neattiecas uz atvaļinājumu."
 apps/frappe/frappe/public/js/frappe/misc/utils.js +110,and,un
 DocType: Leave Block List Allow,Leave Block List Allow,Atstājiet Block Latviešu Atļaut
 apps/erpnext/erpnext/setup/doctype/company/company.py +236,Abbr can not be blank or space,Abbr nevar būt tukšs vai telpa
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +50,Sports,Sporta
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,Sporta
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Actual,Kopā Faktiskais
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Unit,Vienība
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Unit,Vienība
 apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.py +182,Please set Dropbox access keys in your site config,Lūdzu noteikt Dropbox piekļuves atslēgas vietnes config
 apps/erpnext/erpnext/stock/get_item_details.py +113,Please specify Company,"Lūdzu, norādiet Company"
 ,Customer Acquisition and Loyalty,Klientu iegāde un lojalitātes
 DocType: Purchase Receipt,Warehouse where you are maintaining stock of rejected items,"Noliktava, kur jums ir saglabāt krājumu noraidīto posteņiem"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +408,Your financial year ends on,Jūsu finanšu gads beidzas
+apps/erpnext/erpnext/public/js/setup_wizard.js +156,Your financial year ends on,Jūsu finanšu gads beidzas
 DocType: POS Profile,Price List,Cenrādis
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +20,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,"{0} tagad ir noklusējuma saimnieciskais gads. Lūdzu, atsvaidziniet savu pārlūkprogrammu, lai izmaiņas stātos spēkā."
 apps/erpnext/erpnext/projects/doctype/project/project.js +47,Expense Claims,Izdevumu Prasības
 DocType: Issue,Support,Atbalsts
-DocType: Authorization Rule,Approving Role,Apstiprinot loma
 ,BOM Search,BOM Meklēt
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +176,Closing (Opening + Totals),Noslēguma (atvēršana + kopsummas)
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +26,Please specify currency in Company,"Lūdzu, norādiet valūtu Company"
 DocType: Workstation,Wages per hour,Algas stundā
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},Krājumu atlikumu partijā {0} kļūs negatīvs {1} postenī {2} pie Warehouse {3}
 apps/erpnext/erpnext/config/setup.py +83,"Show / Hide features like Serial Nos, POS etc.","Rādīt / paslēpt iespējas, piemēram, sērijas numuriem, POS uc"
-apps/erpnext/erpnext/controllers/accounts_controller.py +236,Account {0} is invalid. Account Currency must be {1},Konts {0} ir nederīgs. Konta valūta ir {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +237,Account {0} is invalid. Account Currency must be {1},Konts {0} ir nederīgs. Konta valūta ir {1}
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +34,UOM Conversion factor is required in row {0},UOM pārrēķināšanas koeficients ir nepieciešams rindā {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +53,Clearance date cannot be before check date in row {0},Klīrenss datums nevar būt pirms reģistrācijas datuma pēc kārtas {0}
 DocType: Salary Slip,Deduction,Atskaitīšana
@@ -1713,13 +1651,13 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +82,Item {0} has already been returned,Postenis {0} jau ir atgriezies
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** Saimnieciskais gads ** pārstāv finanšu gads. Visus grāmatvedības ierakstus un citi lielākie darījumi kāpurķēžu pret ** fiskālā gada **.
 DocType: Opportunity,Customer / Lead Address,Klients / Lead adrese
+apps/erpnext/erpnext/stock/doctype/item/item.py +112,Warning: Invalid SSL certificate on attachment {0},Brīdinājums: Invalid SSL sertifikātu par arestu {0}
 DocType: Production Order Operation,Actual Operation Time,Faktiskais Darbības laiks
 DocType: Authorization Rule,Applicable To (User),Piemērojamais Lai (lietotājs)
 DocType: Purchase Taxes and Charges,Deduct,Atskaitīt
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +170,Job Description,Darba apraksts
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +170,Job Description,Darba apraksts
 DocType: Purchase Order Item,Qty as per Stock UOM,Daudz kā vienu akciju UOM
 apps/frappe/frappe/model/rename_doc.py +343,Please select a valid csv file with data,"Lūdzu, izvēlieties derīgu csv failu ar datiem"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +92,Coating,Slānis
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +126,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Speciālās rakstzīmes, izņemot ""-"" ""."", ""#"", un ""/"" nav atļauts nosaucot sērijas"
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Sekot izpārdošanām. Sekot noved citāti, Pasūtījumu utt no kampaņas, lai novērtētu atdevi no ieguldījumiem."
 DocType: Expense Claim,Approver,Apstiprinātājs
@@ -1729,12 +1667,11 @@
 DocType: Supplier Quotation,Manufacturing Manager,Ražošanas vadītājs
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},Sērijas Nr {0} ir garantijas līdz pat {1}
 apps/erpnext/erpnext/config/stock.py +69,Split Delivery Note into packages.,Split Piegāde piezīme paketēs.
-apps/erpnext/erpnext/hooks.py +84,Shipments,Sūtījumi
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +29,Dip molding,Dip formēšanas
+apps/erpnext/erpnext/hooks.py +68,Shipments,Sūtījumi
 DocType: Purchase Order,To be delivered to customer,Jāpiegādā klientam
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,Laiks Log Status jāiesniedz.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,Sērijas Nr {0} nepieder nevienai noliktavā
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +650,Setting Up,Iestatīšana
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +114,Setting Up,Iestatīšana
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,Row # ,Row #
 DocType: Purchase Invoice,In Words (Company Currency),Vārdos (Company valūta)
 DocType: Pricing Rule,Supplier,Piegādātājs
@@ -1742,7 +1679,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +105,Miscellaneous Expenses,Dažādi izdevumi
 DocType: Global Defaults,Default Company,Default Company
 apps/erpnext/erpnext/controllers/stock_controller.py +166,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,"Izdevumu vai Atšķirība konts ir obligāta postenī {0}, kā tā ietekmē vispārējo akciju vērtības"
-apps/erpnext/erpnext/controllers/accounts_controller.py +354,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","Nevar overbill postenī {0} rindā {1} vairāk nekā {2}. Lai atļautu pārāk augstu maksu, lūdzu, noteikts akciju Settings"
+apps/erpnext/erpnext/controllers/accounts_controller.py +355,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","Nevar overbill postenī {0} rindā {1} vairāk nekā {2}. Lai atļautu pārāk augstu maksu, lūdzu, noteikts akciju Settings"
 DocType: Employee,Bank Name,Bankas nosaukums
 apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +27,-Above,-Virs
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +135,User {0} is disabled,Lietotāja {0} ir invalīds
@@ -1755,27 +1692,26 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,{0} is mandatory for Item {1},{0} ir obligāta postenī {1}
 DocType: Currency Exchange,From Currency,No Valūta
 DocType: DocField,Name,Nosaukums
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +211,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Lūdzu, izvēlieties piešķirtā summa, rēķina veidu un rēķina numura atleast vienā rindā"
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +104,Sales Order required for Item {0},Pasūtījumu nepieciešams postenī {0}
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +158,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Lūdzu, izvēlieties piešķirtā summa, rēķina veidu un rēķina numura atleast vienā rindā"
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +107,Sales Order required for Item {0},Pasūtījumu nepieciešams postenī {0}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +43,Amounts not reflected in system,"Summas, kas nav atspoguļots sistēmā"
 DocType: Purchase Invoice Item,Rate (Company Currency),Rate (Company valūta)
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +40,Others,Pārējie
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +40,Others,Pārējie
 apps/erpnext/erpnext/templates/includes/product_page.js +80,Cannot find a matching Item. Please select some other value for {0}.,"Nevar atrast atbilstošas ​​objektu. Lūdzu, izvēlieties kādu citu vērtību {0}."
 DocType: POS Profile,Taxes and Charges,Nodokļi un maksājumi
 DocType: Item,"A Product or a Service that is bought, sold or kept in stock.","Produkts vai pakalpojums, kas tiek pirkti, pārdot vai turēt noliktavā."
 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,"Nav iespējams izvēlēties maksas veidu, kā ""Par iepriekšējo rindu summas"" vai ""Par iepriekšējā rindā Total"" par pirmās rindas"
 apps/frappe/frappe/core/doctype/doctype/boilerplate/controller_list.html +31,Completed,Pabeigts
 DocType: Web Form,Select DocType,Izvēlieties DOCTYPE
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +104,Broaching,Caurvilkšanai
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +12,Banking,Banku
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,Banku
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +38,Please click on 'Generate Schedule' to get schedule,"Lūdzu, noklikšķiniet uz ""Generate grafiks"", lai saņemtu grafiku"
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +283,New Cost Center,Jaunais Izmaksu centrs
 DocType: Bin,Ordered Quantity,Sakārtots daudzums
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +397,"e.g. ""Build tools for builders""","piemēram, ""Build instrumenti celtniekiem"""
+apps/erpnext/erpnext/public/js/setup_wizard.js +145,"e.g. ""Build tools for builders""","piemēram, ""Build instrumenti celtniekiem"""
 DocType: Quality Inspection,In Process,In process
 DocType: Authorization Rule,Itemwise Discount,Itemwise Atlaide
 DocType: Purchase Order Item,Reference Document Type,Atsauces dokuments Type
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +318,{0} against Sales Order {1},{0} pret pārdošanas ordeņa {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +320,{0} against Sales Order {1},{0} pret pārdošanas ordeņa {1}
 DocType: Account,Fixed Asset,Pamatlīdzeklis
 apps/erpnext/erpnext/config/stock.py +283,Serialized Inventory,Serializēja inventarizācija
 DocType: Activity Type,Default Billing Rate,Default Norēķinu Rate
@@ -1790,14 +1726,13 @@
 DocType: Purchase Invoice Item,Page Break,Page Break
 DocType: Production Order Operation,Pending,Līdz
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,"Lietotāji, kuri var apstiprināt konkrētā darbinieka atvaļinājumu pieteikumus"
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +33,You cannot change default UOM of Variant. To change default UOM for Variant change default UOM of the Template,Jūs nevarat mainīt noklusēto UOM varianta. Lai mainītu noklusēto UOM variantā izmaiņas noklusējuma UOM veidnes
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +50,Office Equipments,Biroja iekārtas
 DocType: Purchase Invoice Item,Qty,Daudz
 DocType: Fiscal Year,Companies,Uzņēmumi
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +24,Electronics,Elektronika
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +24,Electronics,Elektronika
 DocType: Stock Settings,Raise Material Request when stock reaches re-order level,Paaugstināt Materiālu pieprasījums kad akciju sasniedz atkārtoti pasūtījuma līmeni
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +18,From Maintenance Schedule,No tehniskās apkopes grafika
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +56,Full-time,Pilna laika
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +56,Full-time,Pilna laika
 DocType: Purchase Invoice,Contact Details,Kontaktinformācija
 DocType: C-Form,Received Date,Saņēma Datums
 DocType: Delivery Note,"If you have created a standard template in Sales Taxes and Charges Template, select one and click on the button below.","Ja esat izveidojis standarta veidni Pārdošanas nodokļi un nodevas veidni, izvēlieties vienu, un noklikšķiniet uz pogas zemāk."
@@ -1809,11 +1744,12 @@
 DocType: Job Applicant,Job Opening,Darba atklāšana
 DocType: Payment Reconciliation,Payment Reconciliation,Maksājumu Izlīgums
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +154,Please select Incharge Person's name,"Lūdzu, izvēlieties incharge Personas vārds"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +51,Technology,Tehnoloģija
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,Tehnoloģija
 DocType: Offer Letter,Offer Letter,Akcija vēstule
 apps/erpnext/erpnext/config/manufacturing.py +51,Generate Material Requests (MRP) and Production Orders.,Izveidot Materiāls Pieprasījumi (MRP) un pasūtījumu.
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +68,Total Invoiced Amt,Kopējo rēķinā Amt
 DocType: Time Log,To Time,Uz laiku
+DocType: Authorization Rule,Approving Role (above authorized value),Apstiprinot loma (virs atļautā vērtība)
 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.","Lai pievienotu bērnu mezgliem, pētīt koku un noklikšķiniet uz mezglu, saskaņā ar kuru vēlaties pievienot vairāk mezglu."
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +102,Credit To account must be a Payable account,Kredīts kontā jābūt Kreditoru konts
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +233,BOM recursion: {0} cannot be parent or child of {2},BOM rekursijas: {0} nevar būt vecāks vai bērns {2}
@@ -1826,10 +1762,8 @@
 DocType: Item,Customer Item Codes,Klientu punkts Codes
 DocType: Opportunity,Lost Reason,Zaudēja Iemesls
 apps/erpnext/erpnext/config/accounts.py +68,Create Payment Entries against Orders or Invoices.,Izveidot Maksājumu Ieraksti pret rīkojumiem vai rēķinos.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +141,Welding,Metināšanas
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +40,New Stock UOM is required,Jaunais Stock UOM ir nepieciešama
 DocType: Quality Inspection,Sample Size,Izlases lielums
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +443,All items have already been invoiced,Visi posteņi jau ir rēķinā
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +446,All items have already been invoiced,Visi posteņi jau ir rēķinā
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',"Lūdzu, norādiet derīgu ""No lietā Nr '"
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +287,Further cost centers can be made under Groups but entries can be made against non-Groups,"Turpmākie izmaksu centrus var izdarīt ar grupu, bet ierakstus var izdarīt pret nepilsoņu grupām"
 DocType: Project,External,Ārējs
@@ -1841,8 +1775,7 @@
 DocType: Bin,Actual Quantity,Faktiskais daudzums
 DocType: Shipping Rule,example: Next Day Shipping,Piemērs: Nākošā diena Piegāde
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,Sērijas Nr {0} nav atrasts
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +563,Your Customers,Jūsu klienti
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +27,Compression molding,Kompresijas molding
+apps/erpnext/erpnext/public/js/setup_wizard.js +303,Your Customers,Jūsu klienti
 DocType: Leave Block List Date,Block Date,Block Datums
 DocType: Sales Order,Not Delivered,Nav sniegusi
 ,Bank Clearance Summary,Banka Klīrenss kopsavilkums
@@ -1863,10 +1796,10 @@
 DocType: SMS Log,Sent To,Nosūtīts
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +28,Make Sales Invoice,Padarīt pārdošanas rēķinu
 DocType: Company,For Reference Only.,Tikai atsaucei.
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +29,Invalid {0}: {1},Nederīga {0}: {1}
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +49,Invalid {0}: {1},Nederīga {0}: {1}
 DocType: Sales Invoice Advance,Advance Amount,Advance Summa
 DocType: Manufacturing Settings,Capacity Planning,Capacity Planning
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +49,'From Date' is required,"""No datums"" ir nepieciešams"
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +43,'From Date' is required,"""No datums"" ir nepieciešams"
 DocType: Journal Entry,Reference Number,Atsauces numurs
 DocType: Employee,Employment Details,Nodarbinātības Details
 DocType: Employee,New Workplace,Jaunajā darbavietā
@@ -1881,7 +1814,7 @@
 DocType: Serial No,Delivery Time,Piegādes laiks
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Novecošanās Based On
 DocType: Item,End of Life,End of Life
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +41,Travel,Ceļot
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +41,Travel,Ceļot
 DocType: Leave Block List,Allow Users,Atļaut lietotājiem
 DocType: Purchase Order,Customer Mobile No,Klientu Mobile Nr
 DocType: Sales Invoice,Recurring,Atkārtojas
@@ -1895,7 +1828,7 @@
 DocType: Naming Series,User must always select,Lietotājam ir vienmēr izvēlēties
 DocType: Stock Settings,Allow Negative Stock,Atļaut negatīvs Stock
 DocType: Installation Note,Installation Note,Uzstādīšana Note
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +541,Add Taxes,Pievienot Nodokļi
+apps/erpnext/erpnext/public/js/setup_wizard.js +283,Add Taxes,Pievienot Nodokļi
 ,Financial Analytics,Finanšu Analytics
 DocType: Quality Inspection,Verified By,Verified by
 DocType: Address,Subsidiary,Filiāle
@@ -1905,7 +1838,6 @@
 DocType: System Settings,In Hours,Stundās
 DocType: Process Payroll,Create Salary Slip,Izveidot algas lapu
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Expected balance as per bank,"Paredzams, bilance katru banku"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +115,Buffing,Pulēšanas
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Source of Funds (Liabilities),Līdzekļu avots (Pasīvi)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +347,Quantity in row {0} ({1}) must be same as manufactured quantity {2},Daudzums rindā {0} ({1}) jābūt tādai pašai kā saražotā apjoma {2}
 DocType: Appraisal,Employee,Darbinieks
@@ -1922,11 +1854,11 @@
 DocType: Rename Tool,File to Rename,Failu pārdēvēt
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +176,Purchse Order number required for Item {0},"Purchse Pasūtījuma skaits, kas nepieciešams postenī {0}"
 apps/erpnext/erpnext/public/js/controllers/transaction.js +136,Show Payments,Rādīt Maksājumi
-apps/erpnext/erpnext/controllers/buying_controller.py +245,Specified BOM {0} does not exist for Item {1},Noteiktais BOM {0} nepastāv postenī {1}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +202,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Uzturēšana Kalendārs {0} ir atcelts pirms anulējot šo klientu pasūtījumu
+apps/erpnext/erpnext/controllers/buying_controller.py +236,Specified BOM {0} does not exist for Item {1},Noteiktais BOM {0} nepastāv postenī {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Uzturēšana Kalendārs {0} ir atcelts pirms anulējot šo klientu pasūtījumu
 apps/frappe/frappe/desk/page/backups/backups.html +13,Size,Izmērs
 DocType: Notification Control,Expense Claim Approved,Izdevumu Pretenzija Apstiprināts
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +113,Pharmaceutical,Farmaceitisks
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Pharmaceutical,Farmaceitisks
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,Izmaksas iegādātās preces
 DocType: Selling Settings,Sales Order Required,Pasūtījumu Nepieciešamais
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +30,Create Customer,Izveidot klientu
@@ -1936,7 +1868,6 @@
 DocType: Quality Inspection Reading,Reading 9,Lasīšana 9
 DocType: Supplier,Is Frozen,Vai Frozen
 DocType: Buying Settings,Buying Settings,Pērk iestatījumi
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +122,Mass finishing,Mass apdare
 DocType: Stock Entry Detail,BOM No. for a Finished Good Item,BOM Nē par gatavo labi posteni
 DocType: Upload Attendance,Attendance To Date,Apmeklējumu Lai datums
 apps/erpnext/erpnext/config/selling.py +158,Setup incoming server for sales email id. (e.g. sales@example.com),Setup ienākošā servera pārdošanas e-pasta id. (Piem sales@example.com)
@@ -1944,7 +1875,7 @@
 DocType: Payment Tool,Payment Account,Maksājumu konts
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +713,Please specify Company to proceed,"Lūdzu, norādiet Company, lai turpinātu"
 apps/frappe/frappe/public/js/frappe/model/indicator.js +30,Draft,Projekts
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +46,Compensatory Off,Kompensējošs Off
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Compensatory Off,Kompensējošs Off
 DocType: Quality Inspection Reading,Accepted,Pieņemts
 DocType: User,Female,Sieviete
 DocType: Journal Entry Account,Debit in Account Currency,Debeta in konta valūtā
@@ -1956,7 +1887,7 @@
 DocType: Shipping Rule,Shipping Rule Label,Piegāde noteikums Label
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +209,Raw Materials cannot be blank.,Izejvielas nevar būt tukšs.
 DocType: Newsletter,Test,Pārbaude
-apps/erpnext/erpnext/stock/doctype/item/item.py +364,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +368,"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'","Tā kā ir esošās akciju darījumi par šo priekšmetu, \ jūs nevarat mainīt vērtības &quot;Has Sērijas nē&quot;, &quot;Vai partijas Nē&quot;, &quot;Vai Stock Vienība&quot; un &quot;vērtēšanas metode&quot;"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +448,Quick Journal Entry,Quick Journal Entry
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +92,You can not change rate if BOM mentioned agianst any item,"Jūs nevarat mainīt likmi, ja BOM minēja agianst jebkuru posteni"
@@ -1967,13 +1898,14 @@
 apps/erpnext/erpnext/config/stock.py +18,Requests for items.,Lūgumus par.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,Atsevišķa produkcija pasūtījums tiks izveidots katrā gatavā labu posteni.
 DocType: Purchase Invoice,Terms and Conditions1,Noteikumi un Conditions1
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +18,Complete Setup,Complete Setup
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard_page.html +18,Complete Setup,Complete Setup
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","Grāmatvedības ieraksts iesaldēta līdz šim datumam, neviens nevar darīt / mainīt ierakstu izņemot lomu zemāk norādīto."
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +121,Please save the document before generating maintenance schedule,"Lūdzu, saglabājiet dokumentu pirms ražošanas apkopes grafiku"
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,Projekta statuss
 DocType: UOM,Check this to disallow fractions. (for Nos),Pārbaudiet to neatļaut frakcijas. (Par Nr)
 apps/erpnext/erpnext/config/crm.py +96,Newsletter Mailing List,Biļetens Mailing List
 DocType: Delivery Note,Transporter Name,Transporter Name
+DocType: Authorization Rule,Authorized Value,Autorizēts Value
 DocType: Contact,Enter department to which this Contact belongs,"Ievadiet departaments, kurā šis Kontaktinformācija pieder"
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Absent,Kopā Nav
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +746,Item or Warehouse for row {0} does not match Material Request,Postenis vai noliktava rindā {0} nesakrīt Material pieprasījumu
@@ -1998,16 +1930,15 @@
 DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),Basic Rate (par katru akciju UOM)
 DocType: SMS Log,No of Requested SMS,Neviens pieprasījuma SMS
 DocType: Campaign,Campaign-.####,Kampaņa -. ####
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +55,Piercing,Pīrsings
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,Nākamie soļi
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +117,Contract End Date must be greater than Date of Joining,Līguma beigu datums ir jābūt lielākam nekā datums savienošana
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,"Trešā persona izplatītājs / tirgotājs / komisijas pārstāvis / filiāli / izplatītāja, kurš pārdod uzņēmumiem produktus komisija."
 DocType: Customer Group,Has Child Node,Ir Bērnu Mezgls
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{0} against Purchase Order {1},{0} pret Pirkuma pasūtījums {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +332,{0} against Purchase Order {1},{0} pret Pirkuma pasūtījums {1}
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","Ievadiet statiskās url parametrus šeit (Piem. Sūtītājs = ERPNext, lietotājvārds = ERPNext, parole = 1234 uc)"
 apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,"{0} {1} nekādā aktīvā fiskālajā gadā. Lai saņemtu sīkāku informāciju, pārbaudiet {2}."
-apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,Šis ir piemērs mājas lapā automātiski ģenerēts no ERPNext
+apps/erpnext/erpnext/setup/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,Šis ir piemērs mājas lapā automātiski ģenerēts no ERPNext
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +37,Ageing Range 1,Novecošana Range 1
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +110,Photochemical machining,Fotoķīmisko machining
 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.
 
 #### Note
@@ -2033,7 +1964,7 @@
 DocType: Purchase Receipt Item,Recd Quantity,Recd daudzums
 DocType: Email Account,Email Ids,E-pasta ID
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},Nevar ražot vairāk Vienību {0} nekā Pasūtījumu daudzums {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +471,Stock Entry {0} is not submitted,Stock Entry {0} nav iesniegts
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +473,Stock Entry {0} is not submitted,Stock Entry {0} nav iesniegts
 DocType: Payment Reconciliation,Bank / Cash Account,Bankas / Naudas konts
 DocType: Tax Rule,Billing City,Norēķinu City
 DocType: Global Defaults,Hide Currency Symbol,Slēpt valūtas simbols
@@ -2049,7 +1980,7 @@
 DocType: Purchase Invoice,Currency and Price List,Valūta un Cenrādis
 DocType: Opportunity,Customer / Lead Name,Klients / Lead Name
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +63,Clearance Date not mentioned,Klīrenss datums nav minēts
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +71,Production,Ražošana
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Production,Ražošana
 DocType: Item,Allow Production Order,Atļaut Ražošanas rīkojums
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +60,Row {0}:Start Date must be before End Date,Rinda {0}: Sākuma datumam jābūt pirms beigu datuma
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Kopā (Daudz)
@@ -2062,7 +1993,7 @@
 apps/erpnext/erpnext/utilities/doctype/address/address.py +113,My Addresses,Mani adreses
 DocType: Stock Ledger Entry,Outgoing Rate,Izejošais Rate
 apps/erpnext/erpnext/config/hr.py +100,Organization branch master.,Organizācija filiāle meistars.
-apps/erpnext/erpnext/controllers/accounts_controller.py +237, or ,vai
+apps/erpnext/erpnext/controllers/accounts_controller.py +238, or ,vai
 DocType: Sales Order,Billing Status,Norēķinu statuss
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Utility Expenses,Utility Izdevumi
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,90-Above,90 Virs
@@ -2089,6 +2020,7 @@
 DocType: Stock Entry Detail,Serial No / Batch,Sērijas Nr / Partijas
 DocType: Product Bundle,Parent Item,Parent postenis
 DocType: Account,Account Type,Konta tips
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +113,Leave Type {0} cannot be carry-forwarded,"Atstājiet Type {0} nevar veikt, nosūta"
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +213,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',"Uzturēšana Kalendārs nav radīts visiem posteņiem. Lūdzu, noklikšķiniet uz ""Generate sarakstā '"
 ,To Produce,Ražot
 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","Par rindu {0} jo {1}. Lai iekļautu {2} vienības likmi, rindas {3} jāiekļauj arī"
@@ -2096,10 +2028,7 @@
 DocType: Bin,Reserved Quantity,Rezervēts daudzums
 DocType: Landed Cost Voucher,Purchase Receipt Items,Pirkuma čeka Items
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,Pielāgošana Veidlapas
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +62,Cutting,Griešana
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +69,Flattening,Izlīdzināšana
 DocType: Account,Income Account,Ienākumu konta
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +22,Molding,Cilnis
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +632,Delivery,Nodošana
 DocType: Stock Reconciliation Item,Current Qty,Pašreizējais Daudz
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section","Skatīt ""Rate Materiālu Balstoties uz"" in tāmēšanu iedaļā"
@@ -2109,19 +2038,18 @@
 apps/frappe/frappe/desk/moduleview.py +61,Documents,Dokumenti
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +17,Ref,Ref
 DocType: Cost Center,Cost Center,Izmaksas Center
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.js +48,Voucher #,Kuponu #
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +36,Voucher #,Kuponu #
 DocType: Notification Control,Purchase Order Message,Pasūtījuma Ziņa
 DocType: Tax Rule,Shipping Country,Piegāde Country
 DocType: Upload Attendance,Upload HTML,Augšupielāde HTML
-apps/erpnext/erpnext/controllers/accounts_controller.py +391,"Total advance ({0}) against Order {1} cannot be greater \
+apps/erpnext/erpnext/controllers/accounts_controller.py +392,"Total advance ({0}) against Order {1} cannot be greater \
 				than the Grand Total ({2})","Kopā avanss ({0}) pret rīkojuma {1}, nevar būt lielāks \ nekā Grand Kopā ({2})"
 DocType: Employee,Relieving Date,Atbrīvojot Datums
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +12,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.","Cenu noteikums ir, lai pārrakstītu Cenrādī / noteikt diskonta procentus, pamatojoties uz dažiem kritērijiem."
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,Noliktavu var mainīt tikai ar Fondu Entry / Piegāde Note / pirkuma čeka
 DocType: Employee Education,Class / Percentage,Klase / procentuālā
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +92,Head of Marketing and Sales,Mārketinga un pārdošanas
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +31,Income Tax,Ienākuma nodoklis
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +157,Laser engineered net shaping,Laser inženierijas neto veidošanā
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Head of Marketing and Sales,Mārketinga un pārdošanas
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +31,Income Tax,Ienākuma nodoklis
 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.","Ja izvēlētais Cenu noteikums ir paredzēts ""cena"", tas pārrakstīs cenrādi. Cenu noteikums cena ir galīgā cena, tāpēc vairs atlaide jāpiemēro. Tādējādi, darījumos, piemēram, pārdošanas rīkojumu, pirkuma pasūtījuma utt, tas tiks atnesa 'ātrums' laukā, nevis ""Cenu saraksts likmes"" laukā."
 apps/erpnext/erpnext/config/selling.py +163,Track Leads by Industry Type.,Track noved līdz Rūpniecības Type.
 DocType: Item Supplier,Item Supplier,Postenis piegādātājs
@@ -2144,31 +2072,28 @@
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Faktiskais Daudz Pēc Darījuma
 ,Pending SO Items For Purchase Request,Kamēr SO šeit: pirkuma pieprasījumu
 DocType: Supplier,Billing Currency,Norēķinu valūta
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +148,Extra Large,Īpaši liels
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,Extra Large,Īpaši liels
 ,Profit and Loss Statement,Peļņas un zaudējumu aprēķins
 DocType: Bank Reconciliation Detail,Cheque Number,Čeku skaits
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +43,Pressing,Nospiežot
 DocType: Payment Tool Detail,Payment Tool Detail,Maksājumu Tool Detail
 ,Sales Browser,Sales Browser
 DocType: Journal Entry,Total Credit,Kopā Credit
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +474,Warning: Another {0} # {1} exists against stock entry {2},Brīdinājums: Vēl {0} # {1} eksistē pret akciju stāšanās {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +459,Local,Vietējs
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +476,Warning: Another {0} # {1} exists against stock entry {2},Brīdinājums: Vēl {0} # {1} eksistē pret akciju stāšanās {2}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +397,Local,Vietējs
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),Aizdevumi un avansi (Aktīvi)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,Debitori
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +147,Large,Liels
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +23,No employee found!,Neviens darbinieks atrasts!
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Large,Liels
 DocType: C-Form Invoice Detail,Territory,Teritorija
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,"Lūdzu, norādiet neviena apmeklējumu nepieciešamo"
 DocType: Purchase Order,Customer Address Display,Klientu Adrese Display
 DocType: Stock Settings,Default Valuation Method,Default Vērtēšanas metode
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +127,Polishing,Pulēšanas
 DocType: Production Order Operation,Planned Start Time,Plānotais Sākuma laiks
 apps/erpnext/erpnext/config/accounts.py +63,Close Balance Sheet and book Profit or Loss.,Close Bilance un grāmatu peļņa vai zaudējumi.
-apps/erpnext/erpnext/stock/doctype/item/item.py +661,"Default Unit of Measure for Item {0} cannot be changed directly because \
+apps/erpnext/erpnext/stock/doctype/item/item.py +665,"Default Unit of Measure for Item {0} cannot be changed directly because \
 			you have already made some transaction(s) with another UOM. To change default UOM, \
 			use 'UOM Replace Utility' tool under Stock module.","Default mērvienība postenī {0} nevar mainīt, tieši tāpēc, ka \ tu jau guvusi darījums (-us) ar citu UOM. Lai mainītu noklusēto UOM, \ izmantošana &quot;UOM aizstāt lietderība &#39;līdzeklis saskaņā ar Fondu moduli."
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,Norādiet Valūtas kurss pārveidot vienu valūtu citā
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +146,Quotation {0} is cancelled,Citāts {0} ir atcelts
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +141,Quotation {0} is cancelled,Citāts {0} ir atcelts
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,Kopējā nesaņemtā summa
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} was on leave on {1}. Cannot mark attendance.,Darbinieku {0} bija atvaļinājumā {1}. Nevar atzīmēt apmeklēšanu.
 DocType: Sales Partner,Targets,Mērķi
@@ -2179,7 +2104,6 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +158,Please create Customer from Lead {0},"Lūdzu, izveidojiet Klientam no Svins {0}"
 DocType: Price List,Applicable for Countries,Piemērojams valstīs
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Computers,Datori
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +112,Electro-chemical grinding,Electro-ķīmisko slīpēšana
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +14,This is a root customer group and cannot be edited.,"Tas ir sakne klientu grupai, un to nevar rediģēt."
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +39,Please setup your chart of accounts before you start Accounting Entries,"Lūdzu setup savu grāmatvedības kontu plānu, pirms sākat grāmatvedības ierakstiem"
 DocType: Purchase Invoice,Ignore Pricing Rule,Ignorēt cenu veidošanas likumu
@@ -2225,7 +2149,6 @@
 DocType: Maintenance Visit,Purposes,Mērķiem
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +103,Atleast one item should be entered with negative quantity in return document,Vismaz vienu posteni jānorāda ar negatīvu daudzumu atgriešanās dokumentā
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +67,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","Darbība {0} vairāk nekā visus pieejamos darba stundas darbstaciju {1}, nojauktu darbību vairākos operācijām"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +134,Electrochemical machining,Elektroķīmiskā machining
 ,Requested,Pieprasīts
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +66,No Remarks,Nav Piezīmes
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +13,Overdue,Nokavēts
@@ -2234,7 +2157,7 @@
 DocType: Monthly Distribution,Distribution Name,Distribution vārds
 DocType: Features Setup,Sales and Purchase,Pārdošanas un iegāde
 DocType: Supplier Quotation Item,Material Request No,Materiāls Pieprasījums Nr
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +218,Quality Inspection required for Item {0},Kvalitātes pārbaudes nepieciešamas postenī {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +221,Quality Inspection required for Item {0},Kvalitātes pārbaudes nepieciešamas postenī {0}
 DocType: Quotation,Rate at which customer's currency is converted to company's base currency,"Likmi, pēc kuras klienta valūtā tiek konvertēta uz uzņēmuma bāzes valūtā"
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +107,{0} has been successfully unsubscribed from this list.,{0} ir veiksmīgi anulējis no šī saraksta.
 DocType: Purchase Invoice Item,Net Rate (Company Currency),Net Rate (Uzņēmējdarbības valūta)
@@ -2252,9 +2175,8 @@
 apps/erpnext/erpnext/accounts/report/financial_statements.py +16,Fiscal Year {0} not found.,Fiskālā gads {0} nav atrasts.
 DocType: Bank Reconciliation,Get Relevant Entries,Saņemt attiecīgus ierakstus
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +407,Accounting Entry for Stock,Grāmatvedības Entry par noliktavā
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +64,Coining,Coining
 DocType: Sales Invoice,Sales Team1,Sales team1
-apps/erpnext/erpnext/stock/doctype/item/item.py +412,Item {0} does not exist,Postenis {0} nepastāv
+apps/erpnext/erpnext/stock/doctype/item/item.py +416,Item {0} does not exist,Postenis {0} nepastāv
 DocType: Sales Invoice,Customer Address,Klientu adrese
 apps/frappe/frappe/desk/query_report.py +136,Total,Kopsumma
 DocType: Purchase Invoice,Apply Additional Discount On,Piesakies Papildu atlaide
@@ -2266,14 +2188,13 @@
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),Nodokļa summa pēc atlaides apmērs (Uzņēmējdarbības valūta)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +149,Target warehouse is mandatory for row {0},Mērķa noliktava ir obligāta rindā {0}
 DocType: Quality Inspection,Quality Inspection,Kvalitātes pārbaudes
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +144,Extra Small,Extra Small
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +20,Spray forming,Spray formēšana
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Extra Small,Extra Small
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +458,Warning: Material Requested Qty is less than Minimum Order Qty,Brīdinājums: Materiāls Pieprasītā Daudz ir mazāks nekā minimālais pasūtījums Daudz
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +191,Account {0} is frozen,Konts {0} ir sasalusi
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,"Juridiskā persona / meitas uzņēmums ar atsevišķu kontu plānu, kas pieder Organizācijai."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +29,"Food, Beverage & Tobacco","Pārtika, dzērieni un tabakas"
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","Pārtika, dzērieni un tabakas"
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +20,PL or BS,PL vai BS
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,Can only make payment against unbilled {0},Var tikai veikt maksājumus pret unbilled {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +531,Can only make payment against unbilled {0},Var tikai veikt maksājumus pret unbilled {0}
 apps/erpnext/erpnext/controllers/selling_controller.py +122,Commission rate cannot be greater than 100,Komisijas likme nevar būt lielāka par 100
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Minimum Inventory Level,Minimālā Inventāra līmenis
 DocType: Stock Entry,Subcontract,Apakšlīgumu
@@ -2284,19 +2205,18 @@
 DocType: Item,Manufacturer Part Number,Ražotāja daļas numurs
 DocType: Production Order Operation,Estimated Time and Cost,Paredzamais laiks un izmaksas
 DocType: Bin,Bin,Kaste
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +50,Nosing,Aizsargapkalums
 DocType: SMS Log,No of Sent SMS,Neviens Nosūtītās SMS
 DocType: Account,Company,Kompānija
 DocType: Account,Expense Account,Izdevumu konts
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +49,Software,Software
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +151,Colour,Krāsa
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +49,Software,Software
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Colour,Krāsa
 DocType: Maintenance Visit,Scheduled,Plānotais
 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","Lūdzu, izvēlieties elements, &quot;Vai Stock Vienība&quot; ir &quot;nē&quot; un &quot;Vai Pārdošanas punkts&quot; ir &quot;jā&quot;, un nav cita Product Bundle"
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,Izvēlieties Mēneša Distribution nevienmērīgi izplatīt mērķus visā mēnešiem.
 DocType: Purchase Invoice Item,Valuation Rate,Vērtēšanas Rate
 apps/erpnext/erpnext/stock/get_item_details.py +281,Price List Currency not selected,Cenrādis Valūtu nav izvēlēta
 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,"Postenis Row {0}: pirkuma čeka {1} neeksistē virs ""pirkumu čekus"" galda"
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +134,Employee {0} has already applied for {1} between {2} and {3},Darbinieku {0} jau ir pieprasījis {1} no {2} un {3}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +145,Employee {0} has already applied for {1} between {2} and {3},Darbinieku {0} jau ir pieprasījis {1} no {2} un {3}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Projekta sākuma datums
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +8,Until,Līdz
 DocType: Rename Tool,Rename Log,Pārdēvēt Ieiet
@@ -2306,7 +2226,7 @@
 apps/erpnext/erpnext/controllers/recurring_document.py +162,Please select {0},"Lūdzu, izvēlieties {0}"
 DocType: C-Form,C-Form No,C-Form Nr
 DocType: BOM,Exploded_items,Exploded_items
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +95,Researcher,Pētnieks
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Researcher,Pētnieks
 apps/frappe/frappe/custom/doctype/customize_form/customize_form.js +88,Update,Update
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +78,Please save the Newsletter before sending,"Lūdzu, saglabājiet Izdevumu pirms nosūtīšanas"
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +23,Name or Email is mandatory,Vārds vai e-pasts ir obligāta
@@ -2315,11 +2235,10 @@
 DocType: Employee,Exit,Izeja
 apps/erpnext/erpnext/accounts/doctype/account/account.py +134,Root Type is mandatory,Sakne Type ir obligāts
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +295,Serial No {0} created,Sērijas Nr {0} izveidots
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +125,Vibratory finishing,Vibrācijas apdare
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","Par ērtības klientiem, šie kodi var izmantot drukas formātos, piemēram, rēķinos un pavadzīmēs"
 DocType: Employee,You can enter any date manually,Jūs varat ievadīt jebkuru datumu manuāli
 DocType: Sales Invoice,Advertisement,Reklāma
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +165,Probationary Period,Pārbaudes laiks
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Probationary Period,Pārbaudes laiks
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Tikai lapu mezgli ir atļauts darījumā
 DocType: Expense Claim,Expense Approver,Izdevumu apstiprinātājs
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,Pirkuma čeka Prece Kopā
@@ -2327,19 +2246,16 @@
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +17,To Datetime,Lai DATETIME
 DocType: SMS Settings,SMS Gateway URL,SMS Gateway URL
 apps/erpnext/erpnext/config/crm.py +53,Logs for maintaining sms delivery status,Baļķi uzturēšanai sms piegādes statusu
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +137,Grinding,Slīpēšanas
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +34,Shrink wrapping,Shrink iesaiņošana
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +36,Pending Activities,Neapstiprinātas aktivitātes
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,Confirmed,Apstiprināts
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier > Supplier Type,Piegādātājs> Piegādātājs Type
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +127,Please enter relieving date.,Ievadiet atbrīvojot datumu.
 apps/erpnext/erpnext/controllers/trends.py +137,Amt,Amt
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' can be submitted,"Tikai ar statusu ""Apstiprināts"" var iesniegt Atvaļinājuma pieteikumu"
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +51,Only Leave Applications with status 'Approved' can be submitted,"Tikai ar statusu ""Apstiprināts"" var iesniegt Atvaļinājuma pieteikumu"
 apps/erpnext/erpnext/utilities/doctype/address/address.py +21,Address Title is mandatory.,Adrese sadaļa ir obligāta.
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,"Ievadiet nosaukumu, kampaņas, ja avots izmeklēšanas ir kampaņa"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +38,Newspaper Publishers,Laikrakstu izdevēji
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +38,Newspaper Publishers,Laikrakstu izdevēji
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,Izvēlieties saimnieciskais gads
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +88,Smelting,Kausēšanas
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Pārkārtot Level
 DocType: Attendance,Attendance Date,Apmeklējumu Datums
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,Alga sabrukuma pamatojoties uz izpeļņu un atskaitīšana.
@@ -2354,16 +2270,15 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +414,[Error],[Kļūda]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,"Vārdos būs redzams pēc tam, kad esat saglabāt klientu pasūtījumu."
 ,Employee Birthday,Darbinieku Birthday
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +55,Venture Capital,Venture Capital
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,Venture Capital
 DocType: UOM,Must be Whole Number,Jābūt veselam skaitlim
 DocType: Leave Control Panel,New Leaves Allocated (In Days),Jaunas lapas Piešķirtas (dienās)
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +51,Serial No {0} does not exist,Sērijas Nr {0} nepastāv
 DocType: Pricing Rule,Discount Percentage,Atlaide procentuālā
 DocType: Payment Reconciliation Invoice,Invoice Number,Rēķina numurs
-apps/erpnext/erpnext/hooks.py +70,Orders,Pasūtījumi
+apps/erpnext/erpnext/hooks.py +54,Orders,Pasūtījumi
 DocType: Leave Control Panel,Employee Type,Darbinieku Type
 DocType: Employee Leave Approver,Leave Approver,Atstājiet apstiprinātāja
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +70,Swaging,Swaging
 DocType: Manufacturing Settings,Material Transferred for Manufacture,"Materiāls pārvietoti, lai ražošana"
 DocType: Expense Claim,"A user with ""Expense Approver"" role","Lietotājs ar ""Izdevumu apstiprinātājs"" lomu"
 ,Issued Items Against Production Order,"Izsniegtās preces, uzrādot ordeņa"
@@ -2375,7 +2290,6 @@
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +62,Cost Center with existing transactions can not be converted to group,"Izmaksas Center ar esošajiem darījumiem, nevar pārvērst par grupai"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Depreciation,Nolietojums
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Piegādātājs (-i)
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +29,Invalid period,Nederīga periods
 DocType: Customer,Credit Limit,Kredītlimita
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,Izvēlēties veidu darījumu
 DocType: GL Entry,Voucher No,Kuponu Nr
@@ -2385,9 +2299,9 @@
 DocType: Customer,Address and Contact,Adrese un kontaktinformācija
 DocType: Customer,Last Day of the Next Month,Pēdējā diena nākamajā mēnesī
 DocType: Employee,Feedback,Atsauksmes
+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}","Atvaļinājumu nevar tikt piešķirts pirms {0}, jo atvaļinājumu bilance jau ir rokas nosūtīja nākotnē atvaļinājumu piešķiršanas ierakstu {1}"
 apps/erpnext/erpnext/accounts/party.py +284,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Piezīme: Due / Reference Date pārsniedz ļāva klientu kredītu dienām ar {0} dienā (s)
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +621,Maint. Schedule,Maint. Grafiks
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +108,Abrasive jet machining,Abrazīvs jet machining
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +632,Maint. Schedule,Maint. Grafiks
 DocType: Stock Settings,Freeze Stock Entries,Iesaldēt krājumu papildināšanu
 DocType: Website Settings,Website Settings,Website iestatījumi
 DocType: Item,Reorder level based on Warehouse,Pārkārtot līmenis balstās uz Noliktava
@@ -2404,7 +2318,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +75,Show Stock Entries,Rādīt krājumu papildināšanu
 ,Is Primary Address,Vai Primārā adrese
 DocType: Production Order,Work-in-Progress Warehouse,Work-in-Progress noliktavā
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +308,Reference #{0} dated {1},Atsauce # {0} datēts {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Reference #{0} dated {1},Atsauce # {0} datēts {1}
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +13,Manage Addresses,Pārvaldīt adreses
 DocType: Pricing Rule,Item Code,Postenis Code
 DocType: Production Planning Tool,Create Production Orders,Izveidot pasūtījumu
@@ -2413,7 +2327,7 @@
 DocType: Lead,Market Segment,Tirgus segmentā
 DocType: Communication,Phone,Telefons
 DocType: Employee Internal Work History,Employee Internal Work History,Darbinieku Iekšējā Work Vēsture
-apps/erpnext/erpnext/public/js/account_tree_grid.js +50,Closing (Dr),Noslēguma (Dr)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +221,Closing (Dr),Noslēguma (Dr)
 DocType: Contact,Passive,Pasīvs
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,Sērijas Nr {0} nav noliktavā
 apps/erpnext/erpnext/config/selling.py +127,Tax template for selling transactions.,Nodokļu veidni pārdošanas darījumu.
@@ -2429,8 +2343,8 @@
 ,Billed Amount,Jāmaksā Summa
 DocType: Bank Reconciliation,Bank Reconciliation,Banku samierināšanās
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +9,Get Updates,Saņemt atjauninājumus
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +129,Material Request {0} is cancelled or stopped,Materiāls Pieprasījums {0} ir atcelts vai pārtraukta
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +641,Add a few sample records,Pievieno dažas izlases ierakstus
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +133,Material Request {0} is cancelled or stopped,Materiāls Pieprasījums {0} ir atcelts vai pārtraukta
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Add a few sample records,Pievieno dažas izlases ierakstus
 apps/erpnext/erpnext/config/hr.py +210,Leave Management,Atstājiet Management
 DocType: Event,Groups,Grupas
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,Grupa ar kontu
@@ -2443,38 +2357,34 @@
 DocType: Features Setup,Sales Extras,Pārdošanas Ekstras
 apps/erpnext/erpnext/accounts/utils.py +344,{0} budget for Account {1} against Cost Center {2} will exceed by {3},{0} budžets konta {1} pret izmaksām centra {2} pārsniegs līdz {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +236,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Starpība Konts jābūt aktīva / saistību veidu konts, jo šis fonds Salīdzināšana ir atklāšana Entry"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +138,Purchase Order number required for Item {0},"Pasūtījuma skaitu, kas nepieciešams postenī {0}"
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Order number required for Item {0},"Pasūtījuma skaitu, kas nepieciešams postenī {0}"
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',"""No Datuma 'jābūt pēc"" Uz Datumu'"
 ,Stock Projected Qty,Stock Plānotais Daudzums
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +147,Customer {0} does not belong to project {1},Klientu {0} nepieder projekta {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +150,Customer {0} does not belong to project {1},Klientu {0} nepieder projekta {1}
 DocType: Sales Order,Customer's Purchase Order,Klienta Pasūtījuma
 DocType: Warranty Claim,From Company,No Company
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,Vērtība vai Daudz
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Minute,Minūte
+apps/erpnext/erpnext/public/js/setup_wizard.js +363,Minute,Minūte
 DocType: Purchase Invoice,Purchase Taxes and Charges,Pirkuma nodokļiem un maksājumiem
 ,Qty to Receive,Daudz saņems
 DocType: Leave Block List,Leave Block List Allowed,Atstājiet Block Latviešu Atļauts
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +61,Conversion factor cannot be in fractions,Konversijas faktors nevar būt frakcijās
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +358,You will use it to Login,Jūs izmantot to uz autorizāciju
+apps/erpnext/erpnext/public/js/setup_wizard.js +108,You will use it to Login,Jūs izmantot to uz autorizāciju
 DocType: Sales Partner,Retailer,Mazumtirgotājs
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +99,Credit To account must be a Balance Sheet account,Kredīts kontā jābūt bilance konts
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,Visi Piegādātājs veidi
 apps/erpnext/erpnext/stock/doctype/item/item.py +37,Item Code is mandatory because Item is not automatically numbered,"Postenis Kodekss ir obligāts, jo vienība nav automātiski numurētas"
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +99,Quotation {0} not of type {1},Citāts {0} nav tipa {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +93,Quotation {0} not of type {1},Citāts {0} nav tipa {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,Uzturēšana grafiks postenis
 DocType: Sales Order,%  Delivered,% Piegādāts
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,Bank Overdraft Account,Banka Overdrafts konts
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +15,Make Salary Slip,Padarīt par atalgojumu
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +18,Browse BOM,Pārlūkot BOM
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +175,Secured Loans,Nodrošināti aizdevumi
-apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +3,Awesome Products,Awesome Produkcija
+apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +3,Awesome Products,Awesome Produkcija
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +189,Opening Balance Equity,Atklāšanas Balance Equity
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +80,Cannot approve leave as you are not authorized to approve leaves on Block Dates,"Nevar apstiprināt atvaļinājumu, kā jums nav atļauts apstiprināt atstāj uz Bloķēt datumiem"
 DocType: Appraisal,Appraisal,Novērtējums
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +13,Lost-foam casting,Lost-putu liešana
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +47,Drawing,Zīmējums
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +22,Date is repeated,Datums tiek atkārtots
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +148,Leave approver must be one of {0},Atstājiet apstiprinātājs jābūt vienam no {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +162,Leave approver must be one of {0},Atstājiet apstiprinātājs jābūt vienam no {0}
 DocType: Hub Settings,Seller Email,Pārdevējs Email
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Total Cost iegāde (via pirkuma rēķina)
 DocType: Workstation Working Hour,Start Time,Sākuma laiks
@@ -2488,7 +2398,7 @@
 DocType: Purchase Invoice Item,Net Amount (Company Currency),Net Summa (Uzņēmējdarbības valūta)
 DocType: BOM Operation,Hour Rate,Stunda Rate
 DocType: Stock Settings,Item Naming By,Postenis nosaukšana Līdz
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +642,From Quotation,No aptauja
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +655,From Quotation,No aptauja
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},Vēl viens periods Noslēguma Entry {0} ir veikts pēc {1}
 DocType: Production Order,Material Transferred for Manufacturing,"Materiāls pārvietoti, lai Manufacturing"
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +29,Account {0} does not exists,Konts {0} neeksistē
@@ -2502,21 +2412,19 @@
 DocType: Purchase Invoice Item,PR Detail,PR Detail
 DocType: Sales Order,Fully Billed,Pilnībā Jāmaksā
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +20,Cash In Hand,Cash In Hand
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +72,Delivery warehouse required for stock item {0},Piegāde noliktava nepieciešama akciju posteni {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +119,Delivery warehouse required for stock item {0},Piegāde noliktava nepieciešama akciju posteni {0}
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),Bruto iepakojuma svars. Parasti neto svars + iepakojuma materiālu svara. (Drukāšanai)
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,"Lietotāji ar šo lomu ir atļauts noteikt iesaldētos kontus, un izveidot / mainīt grāmatvedības ierakstus pret iesaldētos kontus"
 DocType: Serial No,Is Cancelled,Tiek atcelta
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +281,My Shipments,Mani sūtījumi
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +286,My Shipments,Mani sūtījumi
 DocType: Journal Entry,Bill Date,Bill Datums
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +43,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","Pat tad, ja ir vairāki cenu noteikšanas noteikumus ar augstāko prioritāti, tiek piemēroti tad šādi iekšējie prioritātes:"
 DocType: Supplier,Supplier Details,Piegādātājs Details
 DocType: Communication,Recipients,Saņēmēji
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +146,Screwing,Skrūvēm
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +96,Knurling,Knurling
 DocType: Expense Claim,Approval Status,Apstiprinājums statuss
 DocType: Hub Settings,Publish Items to Hub,Publicēt preces Hub
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +44,From value must be less than to value in row {0},No vērtība nedrīkst būt mazāka par to vērtību rindā {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +133,Wire Transfer,Wire Transfer
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +133,Wire Transfer,Wire Transfer
 apps/erpnext/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py +25,Please select Bank Account,"Lūdzu, izvēlieties bankas kontu"
 DocType: Newsletter,Create and Send Newsletters,Izveidot un nosūtīt jaunumus
 apps/frappe/frappe/public/js/frappe/views/reports/grid_report.js +305,From Date must be before To Date,No datumam jābūt pirms līdz šim datumam
@@ -2524,14 +2432,14 @@
 DocType: Company,Default Income Account,Default Ienākumu konta
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,Klientu Group / Klientu
 DocType: Item Group,Check this if you want to show in website,"Atzīmējiet šo, ja vēlaties, lai parādītu, kas mājas lapā"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +190,Welcome to ERPNext,Laipni lūdzam ERPNext
+,Welcome to ERPNext,Laipni lūdzam ERPNext
 DocType: Payment Reconciliation Payment,Voucher Detail Number,Kuponu Detail skaits
 apps/erpnext/erpnext/config/crm.py +146,Lead to Quotation,Potenciālais klients -> Piedāvājums (quotation)
 DocType: Lead,From Customer,No Klienta
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +37,Calls,Zvani
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Calls,Zvani
 DocType: Project,Total Costing Amount (via Time Logs),Kopā Izmaksu summa (via Time Baļķi)
 DocType: Purchase Order Item Supplied,Stock UOM,Stock UOM
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Purchase Order {0} is not submitted,Pasūtījuma {0} nav iesniegta
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +194,Purchase Order {0} is not submitted,Pasūtījuma {0} nav iesniegta
 ,Projected,Prognozēts
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},Sērijas Nr {0} nepieder noliktavu {1}
 apps/erpnext/erpnext/controllers/status_updater.py +136,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Piezīme: Sistēma nepārbaudīs pārāk piegādi un pār-rezervāciju postenī {0} kā daudzums vai vērtība ir 0
@@ -2539,7 +2447,6 @@
 DocType: Issue,Opening Date,Atvēršanas datums
 DocType: Journal Entry,Remark,Piezīme
 DocType: Purchase Receipt Item,Rate and Amount,Novērtēt un Summa
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +95,Boring,Garlaicīgs
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +667,From Sales Order,No pārdošanas rīkojumu
 DocType: Blog Category,Parent Website Route,Parent Website Route
 DocType: Sales Order,Not Billed,Nav Jāmaksā
@@ -2553,19 +2460,17 @@
 apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount Amount,Atlaide Summa
 DocType: Purchase Invoice,Return Against Purchase Invoice,Atgriezties Pret pirkuma rēķina
 DocType: Item,Warranty Period (in days),Garantijas periods (dienās)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +550,e.g. VAT,"piemēram, PVN"
+apps/erpnext/erpnext/public/js/setup_wizard.js +292,e.g. VAT,"piemēram, PVN"
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,4. punkts
 DocType: Journal Entry Account,Journal Entry Account,Journal Entry konts
 DocType: Shopping Cart Settings,Quotation Series,Citāts Series
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +52,"An item exists with same name ({0}), please change the item group name or rename the item","Priekšmets pastāv ar tādu pašu nosaukumu ({0}), lūdzu, nomainiet priekšmets grupas nosaukumu vai pārdēvēt objektu"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +82,Hot metal gas forming,Karstā metāla gāzes formēšana
 DocType: Sales Order Item,Sales Order Date,Sales Order Date
 DocType: Sales Invoice Item,Delivered Qty,Pasludināts Daudz
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +63,Warehouse {0}: Company is mandatory,Noliktava {0}: Uzņēmums ir obligāta
 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.","Iet uz atbilstošo grupā (parasti līdzekļu avots&gt; īstermiņa saistībām&gt; nodokļiem un nodevām, un izveidot jaunu kontu (noklikšķinot uz Pievienot Child) tipa &quot;nodokli&quot; un to pieminēt nodokļa likmi."
 ,Payment Period Based On Invoice Date,"Samaksa periodā, pamatojoties uz rēķina datuma"
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +50,Missing Currency Exchange Rates for {0},Trūkst Valūtu kursi par {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +135,Laser cutting,Lāzera griešana
 DocType: Event,Monday,Pirmdiena
 DocType: Journal Entry,Stock Entry,Stock Entry
 DocType: Account,Payable,Maksājams
@@ -2598,7 +2503,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +111,Date Of Retirement must be greater than Date of Joining,Brīža līdz pensionēšanās jābūt lielākam nekā datums savienošana
 DocType: Sales Invoice,Against Income Account,Pret ienākuma kontu
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +69,{0}% Delivered,{0}% Pasludināts
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +78,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Prece {0}: pasūtīts Daudzums {1} nevar būt mazāka par minimālo pasūtījuma Daudz {2} (definēts postenī).
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Prece {0}: pasūtīts Daudzums {1} nevar būt mazāka par minimālo pasūtījuma Daudz {2} (definēts postenī).
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Mēneša procentuālais sadalījums
 DocType: Territory,Territory Targets,Teritorija Mērķi
 DocType: Delivery Note,Transporter Info,Transporter Info
@@ -2607,7 +2512,6 @@
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,"Nosaukumi drukāt veidnes, piemēram, rēķins."
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +140,Valuation type charges can not marked as Inclusive,Vērtēšanas veida maksājumus nevar atzīmēts kā Inclusive
 DocType: POS Profile,Update Stock,Update Stock
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +128,Superfinishing,Superfinishing
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,"Different UOM objektus, novedīs pie nepareizas (kopā) Neto svars vērtību. Pārliecinieties, ka neto svars katru posteni ir tādā pašā UOM."
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM Rate
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +85,Please pull items from Delivery Note,Lūdzu pull preces no piegādes pavadzīmē
@@ -2622,7 +2526,6 @@
 ,Purchase Analytics,Pirkuma Analytics
 DocType: Sales Invoice Item,Delivery Note Item,Piegāde Note postenis
 DocType: Expense Claim,Task,Uzdevums
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +57,Shaving,Skūšana
 DocType: Purchase Taxes and Charges,Reference Row #,Atsauce Row #
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},Partijas numurs ir obligāta postenī {0}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js +14,This is a root sales person and cannot be edited.,"Tas ir sakņu pārdošanas persona, un to nevar rediģēt."
@@ -2634,13 +2537,11 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +74,Purpose must be one of {0},Mērķim ir jābūt vienam no {0}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +108,Fill the form and save it,Aizpildiet formu un saglabājiet to
 DocType: Production Planning Tool,Download a report containing all raw materials with their latest inventory status,"Lejupielādēt ziņojumu, kurā visas izejvielas, ar savu jaunāko inventāra statusu"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +94,Facing,Facing
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,Forums
 DocType: Leave Application,Leave Balance Before Application,Atstājiet Balance pirms uzklāšanas
 DocType: SMS Center,Send SMS,Sūti SMS
 DocType: Company,Default Letter Head,Default Letter vadītājs
 DocType: Time Log,Billable,Billable
-DocType: Authorization Rule,This will be used for setting rule in HR module,"Tas tiks izmantota, lai noteiktu noteikumu, HR moduli"
 DocType: Account,Rate at which this tax is applied,"Ātrums, kādā tiek piemērots šis nodoklis"
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reorder Qty,Pārkārtot Daudz
 DocType: Company,Stock Adjustment Account,Stock konta korekcijas
@@ -2667,16 +2568,15 @@
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,Procentuālais sadalījums būtu vienāda ar 100%
 DocType: Serial No,Out of AMC,Out of AMC
 DocType: Purchase Order Item,Material Request Detail No,Materiāls Pieprasījums Detail Nr
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +97,Hard turning,Hard pagrieziena
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +33,Make Maintenance Visit,Veikt tehniskās apkopes vizīte
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +187,Please contact to the user who have Sales Master Manager {0} role,"Lūdzu, sazinieties ar lietotāju, kurš ir Sales Master vadītājs {0} lomu"
 DocType: Company,Default Cash Account,Default Naudas konts
 apps/erpnext/erpnext/config/accounts.py +79,Company (not Customer or Supplier) master.,Company (nav Klients vai piegādātājs) kapteinis.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +106,Please enter 'Expected Delivery Date',"Ievadiet ""piegādes paredzētais datums"""
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +187,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Piegāde Notes {0} ir atcelts pirms anulējot šo klientu pasūtījumu
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +100,Please enter 'Expected Delivery Date',"Ievadiet ""piegādes paredzētais datums"""
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +182,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Piegāde Notes {0} ir atcelts pirms anulējot šo klientu pasūtījumu
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +373,Paid amount + Write Off Amount can not be greater than Grand Total,Samaksāta summa + norakstīt summa nedrīkst būt lielāka par Grand Kopā
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} nav derīgs Partijas skaits postenī {1}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,Note: There is not enough leave balance for Leave Type {0},Piezīme: Nav pietiekami daudz atvaļinājums bilance Atstāt tipa {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +124,Note: There is not enough leave balance for Leave Type {0},Piezīme: Nav pietiekami daudz atvaļinājums bilance Atstāt tipa {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.","Piezīme: Ja maksājums nav veikts pret jebkādu atsauci, veikt Journal Entry manuāli."
 DocType: Item,Supplier Items,Piegādātājs preces
 DocType: Opportunity,Opportunity Type,Iespēja Type
@@ -2688,7 +2588,7 @@
 DocType: Hub Settings,Publish Availability,Publicēt Availability
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +105,Date of Birth cannot be greater than today.,Dzimšanas datums nevar būt lielāks nekā šodien.
 ,Stock Ageing,Stock Novecošana
-apps/erpnext/erpnext/controllers/accounts_controller.py +200,{0} '{1}' is disabled,{0} '{1}' ir neaktīvs
+apps/erpnext/erpnext/controllers/accounts_controller.py +201,{0} '{1}' is disabled,{0} '{1}' ir neaktīvs
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Uzstādīt kā Atvērt
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Nosūtīt automātisko e-pastus kontaktiem Iesniedzot darījumiem.
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +232,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
@@ -2697,44 +2597,38 @@
 DocType: Purchase Order,Customer Contact Email,Klientu Kontakti Email
 DocType: Event,Sunday,Svētdiena
 DocType: Sales Team,Contribution (%),Ieguldījums (%)
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +455,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,"Piezīme: Maksājumu ievades netiks izveidota, jo ""naudas vai bankas konts"" netika norādīta"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +171,Responsibilities,Pienākumi
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +457,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,"Piezīme: Maksājumu ievades netiks izveidota, jo ""naudas vai bankas konts"" netika norādīta"
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +171,Responsibilities,Pienākumi
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Template,Template
 DocType: Sales Person,Sales Person Name,Sales Person Name
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,Ievadiet Vismaz 1 rēķinu tabulā
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +511,Add Users,Pievienot lietotājus
+apps/erpnext/erpnext/public/js/setup_wizard.js +255,Add Users,Pievienot lietotājus
 DocType: Pricing Rule,Item Group,Postenis Group
 DocType: Task,Actual Start Date (via Time Logs),Faktiskā Sākuma datums (via Time Baļķi)
 DocType: Stock Reconciliation Item,Before reconciliation,Pirms samierināšanās
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +12,To {0},Uz {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Nodokļi un maksājumi Pievienoja (Company valūta)
-apps/erpnext/erpnext/stock/doctype/item/item.py +340,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,"Postenis Nodokļu Row {0} ir jābūt vērā tipa nodokli vai ienākumu vai izdevumu, vai jāmaksā"
+apps/erpnext/erpnext/stock/doctype/item/item.py +344,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,"Postenis Nodokļu Row {0} ir jābūt vērā tipa nodokli vai ienākumu vai izdevumu, vai jāmaksā"
 DocType: Sales Order,Partly Billed,Daļēji Jāmaksā
 DocType: Item,Default BOM,Default BOM
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +79,Decambering,Decambering
 apps/erpnext/erpnext/setup/doctype/company/company.js +22,Please re-type company name to confirm,"Lūdzu, atkārtoti tipa uzņēmuma nosaukums, lai apstiprinātu"
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,Kopā Izcila Amt
 DocType: Time Log Batch,Total Hours,Kopējais stundu skaits
 DocType: Journal Entry,Printing Settings,Drukāšanas iestatījumi
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +268,Total Debit must be equal to Total Credit. The difference is {0},Kopējais debets jābūt vienādam ar kopējās kredīta. Atšķirība ir {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +11,Automotive,Automobiļu
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +37,Item is required,Ir nepieciešama postenis
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +25,Metal injection molding,Metāla iesmidzināšanas formēšanas
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +258,Total Debit must be equal to Total Credit. The difference is {0},Kopējais debets jābūt vienādam ar kopējās kredīta. Atšķirība ir {0}
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,Automobiļu
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +684,From Delivery Note,No piegāde piezīme
 DocType: Time Log,From Time,No Time
 DocType: Notification Control,Custom Message,Custom Message
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +33,Investment Banking,Investīciju banku
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +261,"Select your Country, Time Zone and Currency","Izvēlieties savu valsti, laika joslu un Valūta"
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,Investīciju banku
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +316,"Select your Country, Time Zone and Currency","Izvēlieties savu valsti, laika joslu un Valūta"
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +369,Cash or Bank Account is mandatory for making payment entry,"Nauda vai bankas konts ir obligāta, lai padarītu maksājumu ierakstu"
 DocType: Purchase Invoice,Price List Exchange Rate,Cenrādis Valūtas kurss
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +91,Pickling,Kodināšana
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +18,Sand casting,Sand liešana
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +117,Electroplating,Elektrogalvanizācijas
 DocType: Purchase Invoice Item,Rate,Likme
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +62,Intern,Interns
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Intern,Interns
 DocType: Newsletter,A Lead with this email id should exist,Svins ar šo e-pasta id jāpastāv
 DocType: Stock Entry,From BOM,No BOM
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +34,Basic,Pamata
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +34,Basic,Pamata
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,Akciju darījumiem pirms {0} ir iesaldēti
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +217,Please click on 'Generate Schedule',"Lūdzu, noklikšķiniet uz ""Generate sarakstā '"
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +61,To Date should be same as From Date for Half Day leave,Līdz šim vajadzētu būt tāds pats kā No datums par Half Day atvaļinājumu
@@ -2742,10 +2636,10 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +96,Reference No is mandatory if you entered Reference Date,"Atsauces Nr ir obligāta, ja esat norādījis atsauces datumā"
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +108,Date of Joining must be greater than Date of Birth,Datums Savieno jābūt lielākam nekā Dzimšanas datums
 DocType: Salary Structure,Salary Structure,Algu struktūra
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +242,"Multiple Price Rule exists with same criteria, please resolve \
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +246,"Multiple Price Rule exists with same criteria, please resolve \
 			conflict by assigning priority. Price Rules: {0}","Vairāki Cena noteikums pastāv ar tiem pašiem kritērijiem, lūdzu atrisināt \ konfliktu, piešķirot prioritāti. Cena Noteikumi: {0}"
 DocType: Account,Bank,Banka
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +9,Airline,Aviokompānija
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,Aviokompānija
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +493,Issue Material,Jautājums Materiāls
 DocType: Material Request Item,For Warehouse,Par Noliktava
 DocType: Employee,Offer Date,Piedāvājums Datums
@@ -2755,29 +2649,24 @@
 DocType: Item,Is Fixed Asset Item,Ir ilgtermiņa ieguldījumu postenim
 DocType: Stock Entry,Including items for sub assemblies,Ieskaitot posteņiem apakš komplektiem
 DocType: Features Setup,"If you have long print formats, this feature can be used to split the page to be printed on multiple pages with all headers and footers on each page","Ja jums ir garas drukas formātus, šo funkciju var izmantot, lai sadalīt lapu, lai drukā uz vairākām lapām ar visām galvenes un kājenes katrā lappusē"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +131,Hobbing,Hobbing
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +98,All Territories,Visas teritorijas
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +98,All Territories,Visas teritorijas
 DocType: Purchase Invoice,Items,Preces
 DocType: Fiscal Year,Year Name,Gadā Name
 DocType: Process Payroll,Process Payroll,Process Algas
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +59,There are more holidays than working days this month.,Ir vairāk svētku nekā darba dienu šajā mēnesī.
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +68,There are more holidays than working days this month.,Ir vairāk svētku nekā darba dienu šajā mēnesī.
 DocType: Product Bundle Item,Product Bundle Item,Produkta Bundle Prece
 DocType: Sales Partner,Sales Partner Name,Sales Partner Name
 DocType: Purchase Invoice Item,Image View,Image View
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +113,Finishing & industrial finishing,Apdare un rūpniecības apdares
 DocType: Issue,Opening Time,Atvēršanas laiks
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,No un uz datumiem nepieciešamo
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +46,Securities & Commodity Exchanges,Vērtspapīru un preču biržu
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Vērtspapīru un preču biržu
 DocType: Shipping Rule,Calculate Based On,"Aprēķināt, pamatojoties uz"
 DocType: Delivery Note Item,From Warehouse,No Noliktava
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +98,Drilling,Urbšana
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +28,Blow molding,Blow molding
 DocType: Purchase Taxes and Charges,Valuation and Total,Vērtēšana un Total
 DocType: Tax Rule,Shipping City,Piegāde City
 apps/erpnext/erpnext/stock/doctype/item/item.js +43,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,"Šis postenis ir variants {0} (veidni). Atribūti tiks pārkopēti no šablona, ​​ja ""Nē Copy"" ir iestatīts"
 DocType: Account,Purchase User,Iegādāties lietotāju
 DocType: Notification Control,Customize the Notification,Pielāgot paziņojumu
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +87,Hammering,Sišana
 DocType: Web Page,Slideshow,Slaidrādi
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +24,Default Address Template cannot be deleted,Default Adrese Template nevar izdzēst
 DocType: Sales Invoice,Shipping Rule,Piegāde noteikums
@@ -2786,9 +2675,8 @@
 DocType: Workflow State,Search,Meklēšana
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +54,Total cannot be zero,Kopā nevar būt nulle
 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,"""Dienas kopš pēdējā pasūtījuma"" nedrīkst būt lielāks par vai vienāds ar nulli"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +142,Brazing,Cietlodēšana
 DocType: C-Form,Amended From,Grozīts No
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Raw Material,Izejviela
+apps/erpnext/erpnext/public/js/setup_wizard.js +359,Raw Material,Izejviela
 DocType: Leave Application,Follow via Email,Sekot pa e-pastu
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Nodokļu summa pēc Atlaide Summa
 apps/erpnext/erpnext/accounts/doctype/account/account.py +174,Child account exists for this account. You can not delete this account.,Bērnu konts pastāv šim kontam. Jūs nevarat dzēst šo kontu.
@@ -2802,10 +2690,10 @@
 ,Produced,Saražotā
 DocType: Item,Item Code for Suppliers,Prece kodekss Piegādātājiem
 DocType: Issue,Raised By (Email),Raised Ar (e-pasts)
-apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +72,General,Vispārīgs
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +495,Attach Letterhead,Pievienojiet iespiedveidlapām
+apps/erpnext/erpnext/setup/setup_wizard/default_website.py +72,General,Vispārīgs
+apps/erpnext/erpnext/public/js/setup_wizard.js +241,Attach Letterhead,Pievienojiet iespiedveidlapām
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +272,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',"Nevar atskaitīt, ja kategorija ir ""vērtēšanas"" vai ""Novērtēšanas un Total"""
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +542,"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.","Sarakstu jūsu nodokļu galvas (piemēram, PVN, muitas uc; viņiem ir unikālas nosaukumi) un to standarta likmes. Tas radīs standarta veidni, kuru varat rediģēt un pievienot vēl vēlāk."
+apps/erpnext/erpnext/public/js/setup_wizard.js +284,"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.","Sarakstu jūsu nodokļu galvas (piemēram, PVN, muitas uc; viņiem ir unikālas nosaukumi) un to standarta likmes. Tas radīs standarta veidni, kuru varat rediģēt un pievienot vēl vēlāk."
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial Nos Required for Serialized Item {0},Sērijas Nos Nepieciešamais par sērijveida postenī {0}
 DocType: Journal Entry,Bank Entry,Banka Entry
 DocType: Authorization Rule,Applicable To (Designation),Piemērojamais Lai (Apzīmējums)
@@ -2814,32 +2702,31 @@
 apps/erpnext/erpnext/config/accounts.py +143,Enable / disable currencies.,Ieslēgt / izslēgt valūtas.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Postal Expenses,Pasta izdevumi
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Kopā (Amt)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +26,Entertainment & Leisure,Entertainment & Leisure
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,Entertainment & Leisure
 DocType: Purchase Order,The date on which recurring order will be stop,"Datums, kurā atkārtojas pasūtījums tiks apstāties"
 DocType: Quality Inspection,Item Serial No,Postenis Sērijas Nr
 apps/erpnext/erpnext/controllers/status_updater.py +142,{0} must be reduced by {1} or you should increase overflow tolerance,"{0} ir jāsamazina par {1}, vai jums vajadzētu palielināt pārplūdes toleranci"
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Present,Kopā Present
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Hour,Stunda
+apps/erpnext/erpnext/public/js/setup_wizard.js +363,Hour,Stunda
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +138,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation",Sērijveida postenis {0} nevar atjaunināt \ izmantojot krājumu samierināšanās
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +488,Transfer Material to Supplier,Transfer Materiāls piegādātājam
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +513,Transfer Material to Supplier,Transfer Materiāls piegādātājam
 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,"Jaunais Sērijas Nē, nevar būt noliktava. Noliktavu jānosaka ar Fondu ieceļošanas vai pirkuma čeka"
 DocType: Lead,Lead Type,Potenciālā klienta Veids (Type)
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +82,Create Quotation,Izveidot citāts
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +306,All these items have already been invoiced,Visi šie posteņi jau rēķinā
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,You are not authorized to approve leaves on Block Dates,Jums nav atļauts apstiprināt lapas par Grantu datumi
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +311,All these items have already been invoiced,Visi šie posteņi jau rēķinā
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},Var apstiprināt ar {0}
 DocType: Shipping Rule,Shipping Rule Conditions,Piegāde pants Nosacījumi
 DocType: BOM Replace Tool,The new BOM after replacement,Jaunais BOM pēc nomaiņas
 DocType: Features Setup,Point of Sale,Point of Sale
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +83,Curling,Kērlings
 DocType: Account,Tax,Nodoklis
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +28,Row {0}: {1} is not a valid {2},Rinda {0}: {1} nav derīgs {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +89,Refining,Refining
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +37,Row {0}: {1} is not a valid {2},Rinda {0}: {1} nav derīgs {2}
 DocType: Production Planning Tool,Production Planning Tool,Ražošanas plānošanas rīks
 DocType: Quality Inspection,Report Date,Ziņojums Datums
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +130,Routing,Maršrutēšana
 DocType: C-Form,Invoices,Rēķini
 DocType: Job Opening,Job Title,Amats
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +54,{0} already allocated for Employee {1} for period {2} - {3},{0} jau piešķirtais Darbinieku {1} par periodu {2} - {3}
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +80,{0} Recipients,{0} saņēmēji
 DocType: Features Setup,Item Groups in Details,Postenis Grupas detaļās
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +335,Quantity to Manufacture must be greater than 0.,"Daudzums, ražošana jābūt lielākam par 0."
@@ -2857,14 +2744,13 @@
 DocType: DocType,Setup,Setup
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,"Nav nekas, lai rediģētu."
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +108,Summary for this month and pending activities,Kopsavilkums par šo mēnesi un izskatāmo darbību
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +39,Cold rolling,Aukstās velmēšanas
 DocType: Customer Group,Customer Group Name,Klientu Grupas nosaukums
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +408,Please remove this Invoice {0} from C-Form {1},"Lūdzu, noņemiet šo rēķinu {0} no C-Form {1}"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +410,Please remove this Invoice {0} from C-Form {1},"Lūdzu, noņemiet šo rēķinu {0} no C-Form {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,"Lūdzu, izvēlieties Carry priekšu, ja jūs arī vēlaties iekļaut iepriekšējā finanšu gadā bilance atstāj šajā fiskālajā gadā"
 DocType: GL Entry,Against Voucher Type,Pret kupona Tips
 DocType: Item,Attributes,Atribūti
 DocType: Packing Slip,Get Items,Saņemt Items
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +186,Please enter Write Off Account,Ievadiet norakstīt kontu
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +187,Please enter Write Off Account,Ievadiet norakstīt kontu
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +71,Last Order Date,Pēdējā pasūtījuma datums
 DocType: DocField,Image,Attēls
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +179,Make Excise Invoice,Padarīt akcīzes rēķinu
@@ -2874,7 +2760,7 @@
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +146,Operation ID not set,Darbība ID nav noteikts
 DocType: Production Order,Planned Start Date,Plānotais sākuma datums
 DocType: Serial No,Creation Document Type,Izveide Dokumenta tips
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +620,Maint. Visit,Maint. Apmeklējums
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +631,Maint. Visit,Maint. Apmeklējums
 DocType: Leave Type,Is Encash,Ir iekasēt skaidrā naudā
 DocType: Purchase Invoice,Mobile No,Mobile Nr
 DocType: Payment Tool,Make Journal Entry,Padarīt Journal Entry
@@ -2882,35 +2768,31 @@
 apps/erpnext/erpnext/controllers/trends.py +257,Project-wise data is not available for Quotation,Projekts gudrs dati nav pieejami aptauja
 DocType: Project,Expected End Date,"Paredzams, beigu datums"
 DocType: Appraisal Template,Appraisal Template Title,Izvērtēšana Template sadaļa
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +440,Commercial,Tirdzniecības
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +378,Commercial,Tirdzniecības
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +23,Parent Item {0} must not be a Stock Item,Parent postenis {0} nedrīkst būt Stock Vienība
 DocType: Cost Center,Distribution Id,Distribution Id
-apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +14,Awesome Services,Awesome Services
+apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +14,Awesome Services,Awesome Services
 apps/erpnext/erpnext/config/manufacturing.py +29,All Products or Services.,Visi produkti vai pakalpojumi.
 DocType: Purchase Invoice,Supplier Address,Piegādātājs adrese
 DocType: Contact Us Settings,Address Line 2,Adrese Line 2
 DocType: ToDo,Reference,Atsauces
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +59,Perforating,Perforācijas
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,Out Daudz
 apps/erpnext/erpnext/config/accounts.py +128,Rules to calculate shipping amount for a sale,Noteikumi aprēķināt kuģniecības summu pārdošanu
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +29,Series is mandatory,Sērija ir obligāta
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +28,Financial Services,Finanšu pakalpojumi
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,Finanšu pakalpojumi
 apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3},Cenas atribūtu {0} ir jābūt robežās no {1} līdz {2} Jo soli {3}
 DocType: Tax Rule,Sales,Sales
 DocType: Stock Entry Detail,Basic Amount,Pamatsumma
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +173,Warehouse required for stock Item {0},Noliktava nepieciešama krājumu postenī {0}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +178,Warehouse required for stock Item {0},Noliktava nepieciešama krājumu postenī {0}
 DocType: Leave Allocation,Unused leaves,Neizmantotās lapas
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,Cr
 DocType: Customer,Default Receivable Accounts,Default parādi Debitoru
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +102,Sawing,Zāģēšanas
 DocType: Tax Rule,Billing State,Norēķinu Valsts
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +32,Laminating,Laminēšanas
 DocType: Item Reorder,Transfer,Nodošana
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +549,Fetch exploded BOM (including sub-assemblies),Atnest eksplodēja BOM (ieskaitot mezglus)
 DocType: Authorization Rule,Applicable To (Employee),Piemērojamais Lai (Darbinieku)
 apps/erpnext/erpnext/controllers/accounts_controller.py +101,Due Date is mandatory,Due Date ir obligāts
 apps/erpnext/erpnext/controllers/item_variant.py +51,Increment for Attribute {0} cannot be 0,Pieaugums par atribūtu {0} nevar būt 0
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +143,Sintering,Aglomerācijas
 DocType: Journal Entry,Pay To / Recd From,Pay / Recd No
 DocType: Naming Series,Setup Series,Setup Series
 DocType: Supplier,Contact HTML,Contact HTML
@@ -2923,7 +2805,6 @@
 DocType: Attendance,Absent,Nekonstatē
 DocType: Product Bundle,Product Bundle,Produkta Bundle
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +180,Row {0}: Invalid reference {1},Row {0}: Invalid atsauce {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +165,Crushing,Drupināšanas
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Pirkuma nodokļi un nodevas Template
 DocType: Upload Attendance,Download Template,Download Template
 DocType: GL Entry,Remarks,Piezīmes
@@ -2931,14 +2812,12 @@
 DocType: Journal Entry,Write Off Based On,Uzrakstiet Off Based On
 DocType: Features Setup,POS View,POS View
 apps/erpnext/erpnext/config/stock.py +38,Installation record for a Serial No.,Uzstādīšana rekords Serial Nr
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +9,Continuous casting,Nepārtrauktās liešanas
 apps/erpnext/erpnext/public/js/queries.js +39,Please specify a,"Lūdzu, norādiet"
 DocType: Offer Letter,Awaiting Response,Gaida atbildi
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +53,Above,Iepriekš
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +80,Cold sizing,Cold izmēru
 DocType: Salary Slip,Earning & Deduction,Nopelnot & atskaitīšana
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +76,Account {0} cannot be a Group,Konts {0} nevar būt Group
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +259,Region,Apgabals
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +314,Region,Apgabals
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +213,Optional. This setting will be used to filter in various transactions.,"Pēc izvēles. Šis iestatījums tiks izmantota, lai filtrētu dažādos darījumos."
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +104,Negative Valuation Rate is not allowed,Negatīva Vērtēšana Rate nav atļauta
 DocType: Holiday List,Weekly Off,Weekly Off
@@ -2956,7 +2835,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,Account {0} is inactive,Konts {0} ir neaktīvs
 DocType: GL Entry,Is Advance,Vai Advance
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,Apmeklējumu No Datums un apmeklētība līdz šim ir obligāta
-apps/erpnext/erpnext/controllers/buying_controller.py +131,Please enter 'Is Subcontracted' as Yes or No,"Ievadiet ""tiek slēgti apakšuzņēmuma līgumi"", kā jā vai nē"
+apps/erpnext/erpnext/controllers/buying_controller.py +122,Please enter 'Is Subcontracted' as Yes or No,"Ievadiet ""tiek slēgti apakšuzņēmuma līgumi"", kā jā vai nē"
 DocType: Sales Team,Contact No.,Contact No.
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,'Profit and Loss' type account {0} not allowed in Opening Entry,"""Peļņas un zaudējumu"" tipa konts {0} nav atļauts atvēršana Entry"
 DocType: Workflow State,Time,Laiks
@@ -2965,14 +2844,13 @@
 DocType: Authorization Rule,Authorization Rule,Autorizācija noteikums
 DocType: Sales Invoice,Terms and Conditions Details,Noteikumi un nosacījumi Details
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,Pārdošanas nodokļi un maksājumi Template
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +10,Apparel & Accessories,Apģērbs un Aksesuāri
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,Apģērbs un Aksesuāri
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +67,Number of Order,Skaits ordeņa
 DocType: Item Group,HTML / Banner that will show on the top of product list.,"HTML / Banner, kas parādīsies uz augšu produktu sarakstu."
 DocType: Shipping Rule,Specify conditions to calculate shipping amount,"Norādiet apstākļus, lai aprēķinātu kuģniecības summu"
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +121,Add Child,Pievienot Child
 DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,Loma atļauts noteikt iesaldētos kontus un rediģēt Saldētas Ieraksti
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +52,Cannot convert Cost Center to ledger as it has child nodes,"Nevar pārvērst izmaksu centru, lai grāmatai, jo tā ir bērnu mezgliem"
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +47,Conversion Factor is required,Ir vajadzīgs pārrēķina koeficients
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +37,Serial #,Sērijas #
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +87,Commission on Sales,Komisijas apjoms
 DocType: Offer Letter Term,Value / Description,Vērtība / Apraksts
@@ -2980,10 +2858,8 @@
 ,Customers Not Buying Since Long Time,"Klienti nepērk, jo ilgu laiku"
 DocType: Production Order,Expected Delivery Date,Gaidīts Piegāde Datums
 apps/erpnext/erpnext/accounts/general_ledger.py +121,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Debeta un kredīta nav vienāds {0} # {1}. Atšķirība ir {2}.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +48,Bulging,Uztūcis
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +11,Evaporative-pattern casting,Iztvaikošanas-modelis liešana
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Entertainment Expenses,Izklaides izdevumi
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +195,Sales Invoice {0} must be cancelled before cancelling this Sales Order,Pārdošanas rēķins {0} ir atcelts pirms anulējot šo klientu pasūtījumu
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +190,Sales Invoice {0} must be cancelled before cancelling this Sales Order,Pārdošanas rēķins {0} ir atcelts pirms anulējot šo klientu pasūtījumu
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +61,Age,Vecums
 DocType: Time Log,Billing Amount,Norēķinu summa
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +84,Invalid quantity specified for item {0}. Quantity should be greater than 0.,Noteikts posteni Invalid daudzums {0}. Daudzums ir lielāks par 0.
@@ -3002,26 +2878,24 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,Jaunais klientu Ieņēmumu
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Travel Expenses,Ceļa izdevumi
 DocType: Maintenance Visit,Breakdown,Avārija
-apps/erpnext/erpnext/controllers/accounts_controller.py +241,Account: {0} with currency: {1} can not be selected,Konts: {0} ar valūtu: {1} nevar atlasīt
+apps/erpnext/erpnext/controllers/accounts_controller.py +242,Account: {0} with currency: {1} can not be selected,Konts: {0} ar valūtu: {1} nevar atlasīt
 DocType: Bank Reconciliation Detail,Cheque Date,Čeku Datums
 apps/erpnext/erpnext/accounts/doctype/account/account.py +47,Account {0}: Parent account {1} does not belong to company: {2},Konts {0}: Mātes vērā {1} nepieder uzņēmumam: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted all transactions related to this company!,Veiksmīgi svītrots visas ar šo uzņēmumu darījumus!
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,Kā datumā
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +111,Honing,Trīšanas
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +58,Probation,Probācija
-apps/erpnext/erpnext/stock/doctype/item/item.py +264,Default Warehouse is mandatory for stock Item.,Default Noliktava ir obligāta krājumu postenī.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Probation,Probācija
+apps/erpnext/erpnext/stock/doctype/item/item.py +268,Default Warehouse is mandatory for stock Item.,Default Noliktava ir obligāta krājumu postenī.
 DocType: Feed,Full Name,Pilns nosaukums
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +148,Clinching,Uzvarot
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +191,Payment of salary for the month {0} and year {1},Samaksa algas par mēnesi {0} un gads {1}
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +173,Payment of salary for the month {0} and year {1},Samaksa algas par mēnesi {0} un gads {1}
 DocType: Stock Settings,Auto insert Price List rate if missing,"Auto ievietot Cenrādis likme, ja trūkst"
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,Kopējais samaksāto summu
 ,Transferred Qty,Nodota Daudz
 apps/erpnext/erpnext/config/learn.py +11,Navigating,Navigācija
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +137,Planning,Plānošana
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +137,Planning,Plānošana
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +9,Make Time Log Batch,Padarīt Time Ieiet Sērija
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Issued,Izdots
 DocType: Project,Total Billing Amount (via Time Logs),Kopā Norēķinu Summa (via Time Baļķi)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +629,We sell this Item,Mēs pārdot šo Prece
+apps/erpnext/erpnext/public/js/setup_wizard.js +365,We sell this Item,Mēs pārdot šo Prece
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +65,Supplier Id,Piegādātājs Id
 DocType: Journal Entry,Cash Entry,Naudas Entry
 DocType: Sales Partner,Contact Desc,Contact Desc
@@ -3030,18 +2904,16 @@
 DocType: Brand,Item Manager,Prece vadītājs
 DocType: Cost Center,Add rows to set annual budgets on Accounts.,Pievienot rindas noteikt ikgadējos budžetus uz kontu.
 DocType: Buying Settings,Default Supplier Type,Default Piegādātājs Type
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +160,Quarrying,Karjeru
 DocType: Production Order,Total Operating Cost,Kopā ekspluatācijas izmaksas
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +160,Note: Item {0} entered multiple times,Piezīme: postenis {0} ieraksta vairākas reizes
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +163,Note: Item {0} entered multiple times,Piezīme: postenis {0} ieraksta vairākas reizes
 apps/erpnext/erpnext/config/crm.py +27,All Contacts.,Visi Kontakti.
 DocType: Newsletter,Test Email Id,Tests Email Id
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +394,Company Abbreviation,Uzņēmuma saīsinājums
+apps/erpnext/erpnext/public/js/setup_wizard.js +142,Company Abbreviation,Uzņēmuma saīsinājums
 DocType: Features Setup,If you follow Quality Inspection. Enables Item QA Required and QA No in Purchase Receipt,"Ja jums sekot kvalitātes pārbaudei. Ļauj lietu QA vajadzīga, un KN Nr in pirkuma čeka"
 DocType: GL Entry,Party Type,Party Type
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +68,Raw material cannot be same as main Item,Izejvielas nevar būt tāds pats kā galveno posteni
 DocType: Item Attribute Value,Abbreviation,Saīsinājums
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,Ne authroized kopš {0} pārsniedz ierobežojumus
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +30,Rotational molding,Rotācijas formēšanas
 apps/erpnext/erpnext/config/hr.py +115,Salary template master.,Algu veidni meistars.
 DocType: Leave Type,Max Days Leave Allowed,Max dienu atvaļinājumu Atļauts
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +55,Set Tax Rule for shopping cart,Uzstādīt Nodokļu noteikums par iepirkumu grozs
@@ -3055,15 +2927,15 @@
 apps/erpnext/erpnext/config/selling.py +18,Quotes to Leads or Customers.,Citāti par potenciālajiem klientiem vai klientiem.
 DocType: Stock Settings,Role Allowed to edit frozen stock,Loma Atļauts rediģēt saldētas krājumus
 ,Territory Target Variance Item Group-Wise,Teritorija Mērķa Variance Prece Group-Wise
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +101,All Customer Groups,Visas klientu grupas
-apps/erpnext/erpnext/controllers/accounts_controller.py +474,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} ir obligāta. Varbūt Valūtas ieraksts nav izveidots {1} uz {2}.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +101,All Customer Groups,Visas klientu grupas
+apps/erpnext/erpnext/controllers/accounts_controller.py +475,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} ir obligāta. Varbūt Valūtas ieraksts nav izveidots {1} uz {2}.
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +37,Tax Template is mandatory.,Nodokļu veidne ir obligāta.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +41,Account {0}: Parent account {1} does not exist,Konts {0}: Mātes vērā {1} neeksistē
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Cenrādis Rate (Company valūta)
 DocType: Account,Temporary,Pagaidu
 DocType: Address,Preferred Billing Address,Vēlamā Norēķinu adrese
 DocType: Monthly Distribution Percentage,Percentage Allocation,Procentuālais sadalījums
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +86,Secretary,Sekretārs
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Secretary,Sekretārs
 DocType: Serial No,Distinct unit of an Item,Atsevišķu vienību posteņa
 DocType: Pricing Rule,Buying,Pirkšana
 DocType: HR Settings,Employee Records to be created by,"Darbinieku Records, kas rada"
@@ -3076,9 +2948,8 @@
 ,Item-wise Price List Rate,Postenis gudrs Cenrādis Rate
 DocType: Purchase Order Item,Supplier Quotation,Piegādātājs Citāts
 DocType: Quotation,In Words will be visible once you save the Quotation.,"Vārdos būs redzami, kad saglabājat citāts."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +68,Ironing,Gludināšanas
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is stopped,{0}{1} ir apturēta
-apps/erpnext/erpnext/stock/doctype/item/item.py +352,Barcode {0} already used in Item {1},Svītrkodu {0} jau izmanto postenī {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +356,Barcode {0} already used in Item {1},Svītrkodu {0} jau izmanto postenī {1}
 DocType: Lead,Add to calendar on this date,Pievienot kalendāram šajā datumā
 apps/erpnext/erpnext/config/selling.py +132,Rules for adding shipping costs.,Noteikumi par piebilstot piegādes izmaksas.
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,Gaidāmie notikumi
@@ -3087,27 +2958,25 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +27,Quick Entry,Quick Entry
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0} ir obligāta Atgriezties
 DocType: Purchase Order,To Receive,Saņemt
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +33,Shrink fitting,Shrink montāžas
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +522,user@example.com,user@example.com
+apps/erpnext/erpnext/public/js/setup_wizard.js +266,user@example.com,user@example.com
 DocType: Email Digest,Income / Expense,Ienākumi / izdevumi
 DocType: Employee,Personal Email,Personal Email
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +58,Total Variance,Kopējās dispersijas
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +62,Total Variance,Kopējās dispersijas
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.","Ja ieslēgts, sistēma būs pēc grāmatvedības ierakstus inventāru automātiski."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +15,Brokerage,Brokeru
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +15,Brokerage,Brokeru
 DocType: Address,Postal Code,Pasta indekss
 DocType: Production Order Operation,"in Minutes
 Updated via 'Time Log'","minūtēs Atjaunināts izmantojot 'Time Ieiet """
 DocType: Customer,From Lead,No Lead
 apps/erpnext/erpnext/config/manufacturing.py +19,Orders released for production.,Pasūtījumi izlaists ražošanai.
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +42,Select Fiscal Year...,Izvēlieties fiskālajā gadā ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +442,POS Profile required to make POS Entry,POS Profile jāveic POS Entry
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +444,POS Profile required to make POS Entry,POS Profile jāveic POS Entry
 DocType: Hub Settings,Name Token,Nosaukums Token
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +106,Planing,Ēvelēšana
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Selling,Standard pārdošana
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +120,Standard Selling,Standard pārdošana
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +137,Atleast one warehouse is mandatory,Vismaz viena noliktava ir obligāta
 DocType: Serial No,Out of Warranty,No Garantijas
 DocType: BOM Replace Tool,Replace,Aizstāt
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +314,{0} against Sales Invoice {1},{0} pret pārdošanas rēķinu {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +316,{0} against Sales Invoice {1},{0} pret pārdošanas rēķinu {1}
 apps/erpnext/erpnext/stock/doctype/item/item.py +49,Please enter default Unit of Measure,Ievadiet noklusējuma mērvienības
 DocType: Purchase Invoice Item,Project Name,Projekta nosaukums
 DocType: Supplier,Mention if non-standard receivable account,Pieminēt ja nestandarta debitoru konts
@@ -3123,9 +2992,8 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,Journal Entry {0} does not have account {1} or already matched against other voucher,Journal Entry {0} nav konta {1} vai jau saskaņota pret citu talonu
 DocType: Item,Moving Average,Moving Average
 DocType: BOM Replace Tool,The BOM which will be replaced,BOM kas tiks aizstāti
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +43,New Stock UOM must be different from current stock UOM,Jaunais Stock UOM jāatšķiras no pašreizējās akciju UOM
 DocType: Account,Debit,Debets
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +34,Leaves must be allocated in multiples of 0.5,Lapas jāpiešķir var sastāvēt no 0.5
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +44,Leaves must be allocated in multiples of 0.5,Lapas jāpiešķir var sastāvēt no 0.5
 DocType: Production Order,Operation Cost,Darbība izmaksas
 apps/erpnext/erpnext/config/hr.py +71,Upload attendance from a .csv file,Augšupielādēt apmeklēšanu no .csv faila
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,Izcila Amt
@@ -3143,8 +3011,7 @@
 DocType: Employee,Internal Work History,Iekšējā Work Vēsture
 DocType: DocField,Column Break,Kolonna Break
 DocType: Event,Thursday,Ceturtdiena
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +42,Private Equity,Private Equity
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +93,Turning,Virpošana
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,Private Equity
 DocType: Maintenance Visit,Customer Feedback,Klientu Atsauksmes
 DocType: Account,Expense,Izdevumi
 DocType: Sales Invoice,Exhibition,Izstāde
@@ -3157,19 +3024,19 @@
 DocType: Employee,Held On,Notika
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +33,Production Item,Ražošanas postenis
 ,Employee Information,Darbinieku informācija
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,Rate (%),Likme (%)
+apps/erpnext/erpnext/public/js/setup_wizard.js +294,Rate (%),Likme (%)
 DocType: Stock Entry Detail,Additional Cost,Papildu izmaksas
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +407,Financial Year End Date,Finanšu gads beigu datums
+apps/erpnext/erpnext/public/js/setup_wizard.js +155,Financial Year End Date,Finanšu gads beigu datums
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Voucher No, if grouped by Voucher","Nevar filtrēt balstīta uz kupona, ja grupēti pēc kuponu"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +484,Make Supplier Quotation,Padarīt Piegādātāja citāts
 DocType: Quality Inspection,Incoming,Ienākošs
 DocType: BOM,Materials Required (Exploded),Nepieciešamie materiāli (eksplodēja)
 DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),Samazināt Nopelnot par Bezalgas atvaļinājums (LWP)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +512,"Add users to your organization, other than yourself","Pievienot lietotājus jūsu organizācijā, izņemot sevi"
+apps/erpnext/erpnext/public/js/setup_wizard.js +256,"Add users to your organization, other than yourself","Pievienot lietotājus jūsu organizācijā, izņemot sevi"
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No {1} does not match with {2} {3},Row # {0}: Sērijas Nr {1} nesakrīt ar {2} {3}
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +44,Casual Leave,Casual Leave
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +44,Casual Leave,Casual Leave
 DocType: Batch,Batch ID,Partijas ID
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +334,Note: {0},Piezīme: {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +336,Note: {0},Piezīme: {0}
 ,Delivery Note Trends,Piegāde Piezīme tendences
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +104,This Week's Summary,ŠONEDĒĻ kopsavilkums
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +74,{0} must be a Purchased or Sub-Contracted Item in row {1},{0} jābūt Pirkta vai Apakšuzņēmēju Ir rindā {1}
@@ -3181,7 +3048,7 @@
 DocType: Purchase Receipt,Return Against Purchase Receipt,Atgriezties Pret pirkuma čeka
 DocType: Purchase Order,To Bill,Bill
 DocType: Material Request,% Ordered,% Sakārtoti
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +61,Piecework,Gabaldarbs
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Piecework,Gabaldarbs
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +64,Avg. Buying Rate,Vid. Pirkšana Rate
 DocType: Task,Actual Time (in Hours),Faktiskais laiks (stundās)
 DocType: Employee,History In Company,Vēsture Company
@@ -3198,13 +3065,13 @@
 DocType: Opportunity,To Discuss,Apspriediet
 DocType: SMS Settings,SMS Settings,SMS iestatījumi
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +60,Temporary Accounts,Pagaidu konti
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +155,Black,Melns
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Black,Melns
 DocType: BOM Explosion Item,BOM Explosion Item,BOM Explosion postenis
 DocType: Account,Auditor,Revidents
 DocType: Purchase Order,End date of current order's period,Beigu datums no kārtējā pasūtījuma perioda
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +17,Make Offer Letter,Padarīt piedāvājuma vēstule
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +10,Return,Atgriešanās
-apps/erpnext/erpnext/stock/doctype/item/item.py +503,Default Unit of Measure for Variant must be same as Template,Default mērvienība Variant jābūt tāda pati kā Template
+apps/erpnext/erpnext/stock/doctype/item/item.py +507,Default Unit of Measure for Variant must be same as Template,Default mērvienība Variant jābūt tāda pati kā Template
 DocType: DocField,Fold,Salocīt
 DocType: Production Order Operation,Production Order Operation,Ražošanas Order Operation
 DocType: Pricing Rule,Disable,Atslēgt
@@ -3215,13 +3082,12 @@
 DocType: Page,Page Name,Lapas nosaukums
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +110,To Time must be greater than From Time,Lai Time jābūt lielākam par laiku
 DocType: Journal Entry Account,Exchange Rate,Valūtas kurss
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +465,Sales Order {0} is not submitted,Pasūtījumu {0} nav iesniegta
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +467,Sales Order {0} is not submitted,Pasūtījumu {0} nav iesniegta
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0}: Parent account {1} does not bolong to the company {2},Noliktava {0}: Mātes vērā {1} nav Bolong uzņēmumam {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +124,Spindle finishing,Spindle apdare
 DocType: BOM,Last Purchase Rate,"Pēdējā pirkuma ""Rate"""
 DocType: Account,Asset,Aktīvs
 DocType: Project Task,Task ID,Uzdevums ID
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +395,"e.g. ""MC""","piemēram, ""MC"""
+apps/erpnext/erpnext/public/js/setup_wizard.js +143,"e.g. ""MC""","piemēram, ""MC"""
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,Stock cannot exist for Item {0} since has variants,"Preces nevar pastāvēt postenī {0}, jo ir varianti"
 ,Sales Person-wise Transaction Summary,Sales Person-gudrs Transaction kopsavilkums
 DocType: System Settings,Time Zone,Time Zone
@@ -3230,9 +3096,7 @@
 DocType: Monthly Distribution,Monthly Distribution Percentages,Mēneša procentuālo sadalījumu
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +16,The selected item cannot have Batch,Izvēlētais objekts nevar būt partijas
 DocType: Delivery Note,% of materials delivered against this Delivery Note,% Materiālu piegādā pret šo piegāde piezīmes
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +151,Stapling,Skavošanas
 DocType: Customer,Customer Details,Klientu Details
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +105,Shaping,Veidošana
 DocType: Employee,Reports to,Ziņojumi
 DocType: SMS Settings,Enter url parameter for receiver nos,Ievadiet url parametrs uztvērēja nos
 DocType: Sales Invoice,Paid Amount,Samaksāta summa
@@ -3241,13 +3105,13 @@
 DocType: Item Variant,Item Variant,Postenis Variant
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +15,Setting this Address Template as default as there is no other default,"Šī adrese veidne kā noklusējuma iestatījums, jo nav cita noklusējuma"
 apps/erpnext/erpnext/accounts/doctype/account/account.py +89,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Konta atlikums jau debets, jums nav atļauts noteikt ""Balance Must Be"", jo ""Kredīts"""
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +76,Quality Management,Kvalitātes vadība
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Quality Management,Kvalitātes vadība
 DocType: Production Planning Tool,Filter based on customer,"Filtrs, pamatojoties uz klientu"
 DocType: Payment Tool Detail,Against Voucher No,Pret kupona
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +47,Please enter quantity for Item {0},Ievadiet daudzumu postenī {0}
 DocType: Employee External Work History,Employee External Work History,Darbinieku Ārējās Work Vēsture
 DocType: Tax Rule,Purchase,Pirkums
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +34,Balance Qty,Bilance Daudz
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Balance Qty,Bilance Daudz
 DocType: Item Group,Parent Item Group,Parent Prece Group
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +21,{0} for {1},{0} uz {1}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +96,Cost Centers,Izmaksu centri
@@ -3257,12 +3121,12 @@
 DocType: Opportunity,Next Contact,Nākamais Kontakti
 DocType: Employee,Employment Type,Nodarbinātības Type
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,Pamatlīdzekļi
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +84,Application period cannot be across two alocation records,Pieteikumu iesniegšanas termiņš nevar būt pa diviem alocation ierakstiem
 DocType: Item Group,Default Expense Account,Default Izdevumu konts
 DocType: Employee,Notice (days),Paziņojums (dienas)
 DocType: Page,Yes,Jā
 DocType: Tax Rule,Sales Tax Template,Sales Tax Template
 DocType: Employee,Encashment Date,Inkasācija Datums
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +74,Electroforming,Galvanoplastika
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +179,"Against Voucher Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Pret kuponu Type jābūt vienam no Pirkuma pasūtījums, Pirkuma rēķins vai Journal Entry"
 DocType: Account,Stock Adjustment,Stock korekcija
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +34,Default Activity Cost exists for Activity Type - {0},Default darbības izmaksas pastāv darbības veidam - {0}
@@ -3298,12 +3162,12 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,"Noliktava nevar izdzēst, jo pastāv šī noliktava akciju grāmata ierakstu."
 DocType: Company,Distribution,Sadale
 apps/erpnext/erpnext/public/js/pos/pos.html +36,Amount Paid,Samaksātā summa
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +91,Project Manager,Projekta vadītājs
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +72,Dispatch,Nosūtīšana
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Project Manager,Projekta vadītājs
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +72,Dispatch,Nosūtīšana
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,Max atlaide atļauta posteni: {0}{1}%
 DocType: Customer,Default Taxes and Charges,Noklusējuma nodokļi un maksājumi
 DocType: Account,Receivable,Saņemams
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +268,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,"Row # {0}: Nav atļauts mainīt piegādātāju, jo jau pastāv Pasūtījuma"
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +263,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,"Row # {0}: Nav atļauts mainīt piegādātāju, jo jau pastāv Pasūtījuma"
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,"Loma, kas ir atļauts iesniegt darījumus, kas pārsniedz noteiktos kredīta limitus."
 DocType: Sales Invoice,Supplier Reference,Piegādātājs 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.","Ja ieslēgts, BOM uz sub-montāžas vienības tiks uzskatīts, lai iegūtu izejvielas. Pretējā gadījumā visi sub-montāžas vienības tiks uzskatīta par izejvielu."
@@ -3311,8 +3175,8 @@
 DocType: Hub Settings,Seller Description,Pārdevējs Apraksts
 DocType: Employee Education,Qualification,Kvalifikācija
 DocType: Item Price,Item Price,Vienība Cena
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +48,Soap & Detergent,Ziepes un mazgāšanas
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +36,Motion Picture & Video,Motion Picture & Video
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +48,Soap & Detergent,Ziepes un mazgāšanas
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +36,Motion Picture & Video,Motion Picture & Video
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Sakārtoti
 DocType: Warehouse,Warehouse Name,Noliktava Name
 DocType: Naming Series,Select Transaction,Izvēlieties Transaction
@@ -3321,7 +3185,6 @@
 DocType: BOM,Rate Of Materials Based On,Novērtējiet materiālu specifikācijas Based On
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,Atbalsta Analtyics
 apps/erpnext/erpnext/accounts/doctype/accounts_settings/accounts_settings.py +27,Company is missing in warehouses {0},Uzņēmums trūkst noliktavās {0}
-DocType: Stock UOM Replace Utility,Stock UOM Replace Utility,Stock UOM Aizstāt Utility
 DocType: POS Profile,Terms and Conditions,Noteikumi un nosacījumi
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,To Date should be within the Fiscal Year. Assuming To Date = {0},"Līdz šim būtu jāatrodas attiecīgajā taksācijas gadā. Pieņemot, ka līdz šim datumam = {0}"
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","Šeit jūs varat saglabāt augstumu, svaru, alerģijas, medicīnas problēmas utt"
@@ -3333,7 +3196,7 @@
 DocType: Sales Order Item,For Production,Par ražošanu
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +103,Please enter sales order in the above table,Ievadiet pārdošanas kārtību tabulā iepriekš
 DocType: Project Task,View Task,Skatīt Task
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +406,Your financial year begins on,Jūsu finanšu gads sākas
+apps/erpnext/erpnext/public/js/setup_wizard.js +154,Your financial year begins on,Jūsu finanšu gads sākas
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +46,Please enter Purchase Receipts,Ievadiet pirkumu čekus
 DocType: Sales Invoice,Get Advances Received,Get Saņemtā Avansa
 DocType: Email Digest,Add/Remove Recipients,Add / Remove saņēmējus
@@ -3341,16 +3204,14 @@
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","Lai uzstādītu šo taksācijas gadu kā noklusējumu, noklikšķiniet uz ""Set as Default"""
 apps/erpnext/erpnext/config/support.py +54,Setup incoming server for support email id. (e.g. support@example.com),Setup ienākošā servera atbalstu e-pasta id. (Piem support@example.com)
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,Trūkums Daudz
-apps/erpnext/erpnext/stock/doctype/item/item.py +528,Item variant {0} exists with same attributes,Postenis variants {0} nepastāv ar tiem pašiem atribūtiem
+apps/erpnext/erpnext/stock/doctype/item/item.py +532,Item variant {0} exists with same attributes,Postenis variants {0} nepastāv ar tiem pašiem atribūtiem
 DocType: Salary Slip,Salary Slip,Alga Slip
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +116,Burnishing,Apstādījumu
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +54,'To Date' is required,"""Lai datums"" ir nepieciešama"
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,"""Lai datums"" ir nepieciešama"
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","Izveidot iepakošanas lapas par paketes jāpiegādā. Izmanto, lai paziņot Iepakojumu skaits, iepakojuma saturu un tā svaru."
 DocType: Sales Invoice Item,Sales Order Item,Pasūtījumu postenis
 DocType: Salary Slip,Payment Days,Maksājumu dienas
 DocType: BOM,Manage cost of operations,Pārvaldīt darbības izmaksām
 DocType: Features Setup,Item Advanced,Postenis Advanced
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +40,Hot rolling,Hot valcēšana
 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.","Ja kāda no pārbaudītajiem darījumiem ir ""Iesniegtie"", e-pasts pop-up automātiski atvērta, lai nosūtītu e-pastu uz saistīto ""Kontakti"" šajā darījumā, ar darījumu kā pielikumu. Lietotājs var vai nevar nosūtīt e-pastu."
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,Globālie iestatījumi
 DocType: Employee Education,Employee Education,Darbinieku izglītība
@@ -3363,25 +3224,23 @@
 DocType: Customer,Sales Team Details,Sales Team Details
 DocType: Expense Claim,Total Claimed Amount,Kopējais pieprasītā summa
 apps/erpnext/erpnext/config/crm.py +22,Potential opportunities for selling.,Potenciālie iespējas pārdot.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +48,Sick Leave,Slimības atvaļinājums
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +174,Invalid {0},Nederīga {0}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +48,Sick Leave,Slimības atvaļinājums
 DocType: Email Digest,Email Digest,E-pasts Digest
 DocType: Delivery Note,Billing Address Name,Norēķinu Adrese Nosaukums
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +22,Department Stores,Departaments veikali
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,Departaments veikali
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +40,System Balance,Sistēma Balance
 DocType: Workflow,Is Active,Vai Active
 apps/erpnext/erpnext/controllers/stock_controller.py +71,No accounting entries for the following warehouses,Nav grāmatvedības ieraksti par šādām noliktavām
 apps/erpnext/erpnext/projects/doctype/project/project.js +22,Save the document first.,Saglabājiet dokumentu pirmās.
 DocType: Account,Chargeable,Iekasējams
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +121,Linishing,Linishing
 DocType: Company,Change Abbreviation,Mainīt saīsinājums
 DocType: Workflow State,Primary,Galvenais
 DocType: Expense Claim Detail,Expense Date,Izdevumu Datums
 DocType: Item,Max Discount (%),Max Atlaide (%)
 DocType: Communication,More Information,Vairāk informācijas
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +70,Last Order Amount,Pēdējā pasūtījuma Summa
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +161,Blasting,Spridzināšanas darbi
 DocType: Company,Warn,Brīdināt
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +111,Item valuation updated,Posteņu novērtēšana atjaunināts
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Jebkādas citas piezīmes, ievērības cienīgs piepūles ka jāiet ierakstos."
 DocType: BOM,Manufacturing User,Manufacturing User
 DocType: Purchase Order,Raw Materials Supplied,Izejvielas Kopā
@@ -3391,7 +3250,7 @@
 DocType: Appraisal,Appraisal Template,Izvērtēšana Template
 DocType: Communication,Email,E-pasts
 DocType: Item Group,Item Classification,Postenis klasifikācija
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +89,Business Development Manager,Biznesa attīstības vadītājs
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Business Development Manager,Biznesa attīstības vadītājs
 DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,Uzturēšana Vizītes mērķis
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.js +15,Period,Periods
 ,General Ledger,General Ledger
@@ -3401,9 +3260,7 @@
 ,Itemwise Recommended Reorder Level,Itemwise Ieteicams Pārkārtot Level
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +264,Please select {0} first,"Lūdzu, izvēlieties {0} pirmais"
 DocType: Features Setup,To get Item Group in details table,Lai iegūtu posteni Group detaļas tabulā
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +67,Redrawing,Redrawing
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +112,Batch {0} of Item {1} has expired.,Sērija {0} no posteņa {1} ir beidzies.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +120,Etching,Oforts
 DocType: Sales Invoice,Commission,Komisija
 DocType: Address Template,"<h4>Default Template</h4>
 <p>Uses <a href=""http://jinja.pocoo.org/docs/templates/"">Jinja Templating</a> and all the fields of Address (including Custom Fields if any) will be available</p>
@@ -3437,7 +3294,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +340,Operation Time must be greater than 0 for Operation {0},Darbība Time jābūt lielākam par 0 ekspluatācijai {0}
 DocType: Supplier,Address and Contacts,Adrese un kontakti
 DocType: UOM Conversion Detail,UOM Conversion Detail,UOM Conversion Detail
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +496,Keep it web friendly 900px (w) by 100px (h),Paturiet to tīmekļa draudzīgu 900px (w) ar 100px (h)
+apps/erpnext/erpnext/public/js/setup_wizard.js +242,Keep it web friendly 900px (w) by 100px (h),Paturiet to tīmekļa draudzīgu 900px (w) ar 100px (h)
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +329,Production Order cannot be raised against a Item Template,Ražošanas rīkojums nevar tikt izvirzīts pret Vienības Template
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +44,Charges are updated in Purchase Receipt against each item,Izmaksas tiek atjauninātas pirkuma čeka pret katru posteni
 DocType: Payment Tool,Get Outstanding Vouchers,Iegūt nepārspējamas Kuponi
@@ -3453,54 +3310,49 @@
 DocType: Item,Average time taken by the supplier to deliver,"Vidējais laiks, ko piegādātājs piegādāt"
 DocType: Time Log,Hours,Stundas
 DocType: Project,Expected Start Date,"Paredzams, sākuma datums"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +38,Rolling,Ritošā
 DocType: ToDo,Priority,Prioritāte
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +41,Remove item if charges is not applicable to that item,"Noņemt objektu, ja maksa nav piemērojama šim postenim"
 DocType: Dropbox Backup,Dropbox Access Allowed,Dropbox Access Atļauts
 DocType: Dropbox Backup,Weekly,Nedēļas
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,Piem. smsgateway.com/api/send_sms.cgi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +485,Receive,Saņemt
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +510,Receive,Saņemt
 DocType: Maintenance Visit,Fully Completed,Pilnībā Pabeigts
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% pabeigti
 DocType: Employee,Educational Qualification,Izglītības Kvalifikācijas
 DocType: Workstation,Operating Costs,Ekspluatācijas Izmaksas
 DocType: Employee Leave Approver,Employee Leave Approver,Darbinieku Leave apstiprinātājs
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,{0} has been successfully added to our Newsletter list.,{0} ir veiksmīgi pievienota mūsu Newsletter sarakstā.
-apps/erpnext/erpnext/stock/doctype/item/item.py +383,Row {0}: An Reorder entry already exists for this warehouse {1},Rinda {0}: Pārkārtot ieraksts jau eksistē šī noliktava {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +387,Row {0}: An Reorder entry already exists for this warehouse {1},Rinda {0}: Pārkārtot ieraksts jau eksistē šī noliktava {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +67,"Cannot declare as lost, because Quotation has been made.","Nevar atzīt par zaudēto, jo citāts ir veikts."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +133,Electron beam machining,Elektronu kūļa machining
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Pirkuma Master vadītājs
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +424,Production Order {0} must be submitted,Ražošanas Order {0} jāiesniedz
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +150,Please select Start Date and End Date for Item {0},"Lūdzu, izvēlieties sākuma datumu un beigu datums postenim {0}"
 apps/erpnext/erpnext/config/stock.py +141,Main Reports,Galvenie Ziņojumi
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +102,Stock Ledger entries balances updated,Stock Ledger ieraksti atlikumus atjaunotie
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,Līdz šim nevar būt agrāk no dienas
 DocType: Purchase Receipt Item,Prevdoc DocType,Prevdoc DOCTYPE
-apps/erpnext/erpnext/stock/doctype/item/item.js +176,Add / Edit Prices,Pievienot / rediģēt Cenas
+apps/erpnext/erpnext/stock/doctype/item/item.js +178,Add / Edit Prices,Pievienot / rediģēt Cenas
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +53,Chart of Cost Centers,Shēma izmaksu centriem
 ,Requested Items To Be Ordered,Pieprasītās Preces jāpiespriež
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +298,My Orders,Mani Pasūtījumi
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +293,My Orders,Mani Pasūtījumi
 DocType: Price List,Price List Name,Cenrādis Name
 DocType: Time Log,For Manufacturing,Par Manufacturing
-apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +70,Totals,Kopsummas
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +174,Totals,Kopsummas
 DocType: BOM,Manufacturing,Ražošana
 ,Ordered Items To Be Delivered,Pasūtītās preces jāpiegādā
 DocType: Account,Income,Ienākums
 ,Setup Wizard,Setup Wizard
 DocType: Industry Type,Industry Type,Industry Type
 apps/erpnext/erpnext/templates/includes/cart.js +137,Something went wrong!,Kaut kas nogāja greizi!
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +68,Warning: Leave application contains following block dates,Brīdinājums: Atvaļinājuma pieteikums ietver sekojošus bloķētus datumus
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +251,Sales Invoice {0} has already been submitted,Pārdošanas rēķins {0} jau ir iesniegti
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +100,Warning: Leave application contains following block dates,Brīdinājums: Atvaļinājuma pieteikums ietver sekojošus bloķētus datumus
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +256,Sales Invoice {0} has already been submitted,Pārdošanas rēķins {0} jau ir iesniegti
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,Pabeigšana Datums
 DocType: Purchase Invoice Item,Amount (Company Currency),Summa (Company valūta)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +10,Die casting,Die liešana
 DocType: Email Alert,Reference Date,Atsauces datums
 apps/erpnext/erpnext/config/hr.py +105,Organization unit (department) master.,Organizācijas struktūrvienība (departaments) meistars.
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +25,Please enter valid mobile nos,Ievadiet derīgus mobilos nos
 DocType: Budget Detail,Budget Detail,Budžets Detail
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +75,Please enter message before sending,Ievadiet ziņu pirms nosūtīšanas
 DocType: Async Task,Status,Stāvoklis
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +65,Stock UOM updated for Item {0},Stock UOM atjaunināts postenī {0}
 DocType: Company History,Year,Gads
 apps/erpnext/erpnext/config/accounts.py +127,Point-of-Sale Profile,Point-of-Sale Profils
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +68,Please Update SMS Settings,"Lūdzu, atjauniniet SMS Settings"
@@ -3514,12 +3366,12 @@
 ,Serial No Service Contract Expiry,Sērijas Nr Pakalpojumu līgums derīguma
 DocType: Item,Unit of Measure Conversion,Mērvienība Conversion
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +86,Employee can not be changed,Darbinieku nevar mainīt
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +259,You cannot credit and debit same account at the same time,"Var nav kredīta un debeta pašu kontu, tajā pašā laikā"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,You cannot credit and debit same account at the same time,"Var nav kredīta un debeta pašu kontu, tajā pašā laikā"
 DocType: Naming Series,Help HTML,Palīdzība HTML
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},Kopā weightage piešķirts vajadzētu būt 100%. Tas ir {0}
 apps/erpnext/erpnext/controllers/status_updater.py +140,Allowance for over-{0} crossed for Item {1},Pabalsts pārmērīga {0} šķērsoja postenī {1}
 DocType: Address,Name of person or organization that this address belongs to.,"Nosaukums personas vai organizācijas, ka šī adrese pieder."
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +587,Your Suppliers,Jūsu Piegādātāji
+apps/erpnext/erpnext/public/js/setup_wizard.js +325,Your Suppliers,Jūsu Piegādātāji
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,Nevar iestatīt kā Lost kā tiek veikts Sales Order.
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +65,Another Salary Structure {0} is active for employee {1}. Please make its status 'Inactive' to proceed.,"Vēl Alga Struktūra {0} ir aktīva darbiniekam {1}. Lūdzu, tā statusu ""Neaktīvs"", lai turpinātu."
 DocType: Purchase Invoice,Contact,Kontakts
@@ -3528,37 +3380,35 @@
 DocType: Item,Has Serial No,Ir Sērijas nr
 DocType: Employee,Date of Issue,Izdošanas datums
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +16,{0}: From {0} for {1},{0}: No {0} uz {1}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +154,Row #{0}: Set Supplier for item {1},Row # {0}: Set Piegādātājs posteni {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +149,Row #{0}: Set Supplier for item {1},Row # {0}: Set Piegādātājs posteni {1}
 DocType: Issue,Content Type,Content Type
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +17,Computer,Dators
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,Dators
 DocType: Item,List this Item in multiple groups on the website.,Uzskaitīt šo Prece vairākās grupās par mājas lapā.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +283,Please check Multi Currency option to allow accounts with other currency,"Lūdzu, pārbaudiet multi valūtu iespēju ļaut konti citā valūtā"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +285,Please check Multi Currency option to allow accounts with other currency,"Lūdzu, pārbaudiet multi valūtu iespēju ļaut konti citā valūtā"
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +62,Item: {0} does not exist in the system,Punkts: {0} neeksistē sistēmā
 apps/erpnext/erpnext/accounts/doctype/account/account.py +81,You are not authorized to set Frozen value,Jums nav atļauts uzstādīt Frozen vērtību
 DocType: Payment Reconciliation,Get Unreconciled Entries,Saņemt Unreconciled Ieraksti
 DocType: Cost Center,Budgets,Budžeti
 apps/frappe/frappe/core/page/modules_setup/modules_setup.py +11,Updated,Atjaunots
 DocType: Employee,Emergency Contact Details,Avārijas kontaktinformāciju var
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +396,What does it do?,Ko tas dod?
+apps/erpnext/erpnext/public/js/setup_wizard.js +144,What does it do?,Ko tas dod?
 DocType: Delivery Note,To Warehouse,Uz noliktavu
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +45,Account {0} has been entered more than once for fiscal year {1},Konts {0} ir ievadīts vairāk nekā vienu reizi taksācijas gadā {1}
 ,Average Commission Rate,Vidēji Komisija likme
-apps/erpnext/erpnext/stock/doctype/item/item.py +313,'Has Serial No' can not be 'Yes' for non-stock item,"""Ir Sērijas Nr"" nevar būt ""Jā"", ja nav krājumu postenis"
+apps/erpnext/erpnext/stock/doctype/item/item.py +317,'Has Serial No' can not be 'Yes' for non-stock item,"""Ir Sērijas Nr"" nevar būt ""Jā"", ja nav krājumu postenis"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Attendance can not be marked for future dates,Apmeklējumu nevar atzīmēti nākamajām datumiem
 DocType: Pricing Rule,Pricing Rule Help,Cenu noteikums Palīdzība
 DocType: Purchase Taxes and Charges,Account Head,Konts Head
 apps/erpnext/erpnext/config/stock.py +79,Update additional costs to calculate landed cost of items,"Atjaunināt papildu izmaksas, lai aprēķinātu izkraut objektu izmaksas"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +111,Electrical,Elektrības
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +111,Electrical,Elektrības
 DocType: Stock Entry,Total Value Difference (Out - In),Kopējā vērtība Starpība (Out - In)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +302,Row {0}: Exchange Rate is mandatory,Row {0}: Valūtas kurss ir obligāta
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +304,Row {0}: Exchange Rate is mandatory,Row {0}: Valūtas kurss ir obligāta
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},"Lietotāja ID nav noteikts, Darbinieka {0}"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +72,Peening,Peening
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,From Warranty Claim,No garantijas prasību
 DocType: Stock Entry,Default Source Warehouse,Default Source Noliktava
 DocType: Item,Customer Code,Klienta kods
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +212,Birthday Reminder for {0},Dzimšanas dienu atgādinājums par {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +163,Lapping,Pieslīpēšanas
-apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.js +8,Days Since Last Order,Dienas Kopš pēdējā pasūtījuma
+apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +72,Days Since Last Order,Dienas Kopš pēdējā pasūtījuma
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +299,Debit To account must be a Balance Sheet account,Debets kontā jābūt bilance konts
 DocType: Buying Settings,Naming Series,Nosaucot Series
 DocType: Leave Block List,Leave Block List Name,Atstājiet Block Saraksta nosaukums
@@ -3572,7 +3422,7 @@
 DocType: Notification Control,Sales Invoice Message,Sales rēķins Message
 DocType: Authorization Rule,Based On,Pamatojoties uz
 DocType: Sales Order Item,Ordered Qty,Sakārtots Daudz
-apps/erpnext/erpnext/stock/doctype/item/item.py +539,Item {0} is disabled,Postenis {0} ir invalīds
+apps/erpnext/erpnext/stock/doctype/item/item.py +543,Item {0} is disabled,Postenis {0} ir invalīds
 DocType: Stock Settings,Stock Frozen Upto,Stock Frozen Līdz pat
 apps/erpnext/erpnext/controllers/recurring_document.py +166,Period From and Period To dates mandatory for recurring {0},"Laika posmā no un periodu, lai datumiem obligātajām atkārtotu {0}"
 apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,Projekta aktivitāte / uzdevums.
@@ -3582,7 +3432,6 @@
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,Atlaide jābūt mazāk nekā 100
 DocType: ToDo,Low,Zems
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Norakstīt summu (Company valūta)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +71,Spinning,Spinning
 DocType: Landed Cost Voucher,Landed Cost Voucher,Izkrauti izmaksas kuponu
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +55,Please set {0},Lūdzu noteikt {0}
 DocType: Purchase Invoice,Repeat on Day of Month,Atkārtot mēneša diena
@@ -3604,7 +3453,6 @@
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +37,Campaign Name is required,Kampaņas nosaukums ir obligāts
 DocType: Maintenance Visit,Maintenance Date,Uzturēšana Datums
 DocType: Purchase Receipt Item,Rejected Serial No,Noraidīts Sērijas Nr
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +51,Deep drawing,Deep zīmējums
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +40,New Newsletter,Jauns izdevums
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +157,Start date should be less than end date for Item {0},Sākuma datums ir jābūt mazākam par beigu datumu postenī {0}
 apps/erpnext/erpnext/stock/doctype/item/item.js +17,Show Balance,Rādīt Balance
@@ -3614,7 +3462,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +119,BOM and Manufacturing Quantity are required,BOM un ražošana daudzums ir nepieciešami
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Novecošana Range 2
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +450,Amount,Summa
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +147,Riveting,Kniedēm
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,BOM aizstāj
 ,Sales Analytics,Pārdošanas Analytics
 DocType: Manufacturing Settings,Manufacturing Settings,Ražošanas iestatījumi
@@ -3626,20 +3473,19 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +207,New Account Name,Jaunais Konta nosaukums
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,Izejvielas Kopā izmaksas
 DocType: Selling Settings,Settings for Selling Module,Iestatījumi Pārdošana modulis
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +73,Customer Service,Klientu apkalpošana
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Customer Service,Klientu apkalpošana
 DocType: Item,Thumbnail,Thumbnail
 DocType: Item Customer Detail,Item Customer Detail,Postenis Klientu Detail
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +147,Confirm Your Email,Apstiprināt Jūsu e-pasts
 apps/erpnext/erpnext/config/hr.py +53,Offer candidate a Job.,Piedāvājums kandidāts Job.
 DocType: Notification Control,Prompt for Email on Submission of,Jautāt e-pastu uz iesniegšanai
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +81,Total allocated leaves are more than days in the period,Kopā piešķirtie lapas ir vairāk nekā dienu periodā
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +70,Item {0} must be a stock Item,Postenis {0} jābūt krājums punkts
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,Default nepabeigtie Noliktava
 apps/erpnext/erpnext/config/accounts.py +107,Default settings for accounting transactions.,Noklusējuma iestatījumi grāmatvedības darījumiem.
 apps/frappe/frappe/model/naming.py +40,{0} is required,{0} ir nepieciešams
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +21,Vacuum molding,Vakuuma formēšanas
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,"Paredzams, datums nevar būt pirms Material Pieprasīt Datums"
 DocType: Contact Us Settings,City,Pilsēta
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +132,Ultrasonic machining,Ultraskaņas mehāniskā
 apps/frappe/frappe/templates/base.html +137,Error: Not a valid id?,Kļūda: Nav derīgs id?
 apps/erpnext/erpnext/stock/get_item_details.py +125,Item {0} must be a Sales Item,Postenis {0} jābūt Pārdošanas punkts
 DocType: Naming Series,Update Series Number,Update Series skaits
@@ -3647,7 +3493,7 @@
 DocType: Sales Order,Printing Details,Drukas Details
 DocType: Task,Closing Date,Slēgšanas datums
 DocType: Sales Order Item,Produced Quantity,Saražotā daudzums
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +84,Engineer,Inženieris
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Engineer,Inženieris
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,Meklēt Sub Kompleksi
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +379,Item Code required at Row No {0},Postenis Code vajadzīga Row Nr {0}
 DocType: Sales Partner,Partner Type,Partner Type
@@ -3655,7 +3501,7 @@
 DocType: Authorization Rule,Customerwise Discount,Customerwise Atlaide
 DocType: Purchase Invoice,Against Expense Account,Pret Izdevumu kontu
 DocType: Production Order,Production Order,Ražošanas rīkojums
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +258,Installation Note {0} has already been submitted,Jau ir iesniegta uzstādīšana Note {0}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +263,Installation Note {0} has already been submitted,Jau ir iesniegta uzstādīšana Note {0}
 DocType: Quotation Item,Against Docname,Pret Docname
 DocType: SMS Center,All Employee (Active),Visi Employee (Active)
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,Skatīt Tagad
@@ -3664,19 +3510,19 @@
 DocType: Item,Re-Order Level,Re-Order līmenis
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,Ievadiet preces un plānoto qty par kuru vēlaties paaugstināt ražošanas pasūtījumus vai lejupielādēt izejvielas analīzei.
 apps/frappe/frappe/public/js/frappe/views/ganttview.js +45,Gantt Chart,Ganta diagramma
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +57,Part-time,Nepilna laika
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,Part-time,Nepilna laika
 DocType: Employee,Applicable Holiday List,Piemērojams brīvdienu sarakstu
 DocType: Employee,Cheque,Čeks
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,Series Atjaunots
 apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Report Type is mandatory,Ziņojums Type ir obligāts
 DocType: Item,Serial Number Series,Sērijas numurs Series
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},Noliktava ir obligāta krājuma priekšmetu {0} rindā {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +45,Retail & Wholesale,Tirdzniecība un vairumtirdzniecība
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,Tirdzniecība un vairumtirdzniecība
 DocType: Issue,First Responded On,First atbildēja
 DocType: Website Item Group,Cross Listing of Item in multiple groups,Cross uzskaitījums Prece ir vairākām grupām
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +351,The First User: You,Pirmais Lietotājs: You
+apps/erpnext/erpnext/public/js/setup_wizard.js +101,The First User: You,Pirmais Lietotājs: You
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +48,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},Fiskālā gada sākuma datums un fiskālā gada beigu datums jau ir paredzēta fiskālā gada {0}
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +172,Successfully Reconciled,Veiksmīgi jāsaskaņo
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +119,Successfully Reconciled,Veiksmīgi jāsaskaņo
 DocType: Production Order,Planned End Date,Plānotais beigu datums
 apps/erpnext/erpnext/config/stock.py +43,Where items are stored.,"Gadījumos, kad preces tiek uzglabāti."
 DocType: Tax Rule,Validity,Derīgums
@@ -3696,39 +3542,36 @@
 DocType: DocPerm,Level,Līmenis
 DocType: Purchase Taxes and Charges,On Net Total,No kopējiem neto
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +160,Target warehouse in row {0} must be same as Production Order,Mērķa noliktava rindā {0} ir jābūt tādai pašai kā Production ordeņa
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +59,No permission to use Payment Tool,Nē atļauju izmantot maksājumu ierīce
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +97,No permission to use Payment Tool,Nē atļauju izmantot maksājumu ierīce
 apps/erpnext/erpnext/controllers/recurring_document.py +192,'Notification Email Addresses' not specified for recurring %s,"""paziņojuma e-pasta adrese"", kas nav norādītas atkārtojas% s"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +86,Milling,Frēzēšana
 apps/erpnext/erpnext/accounts/doctype/account/account.py +99,Currency can not be changed after making entries using some other currency,Valūtas nevar mainīt pēc tam ierakstus izmantojot kādu citu valūtu
 DocType: Company,Round Off Account,Noapaļot kontu
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +60,Nibbling,Nibbling
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,Administratīvie izdevumi
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +18,Consulting,Consulting
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +18,Consulting,Consulting
 DocType: Customer Group,Parent Customer Group,Parent Klientu Group
 apps/erpnext/erpnext/public/js/pos/pos.js +429,Change,Maiņa
 DocType: Purchase Invoice,Contact Email,Kontaktpersonas e-pasta
 DocType: Appraisal Goal,Score Earned,Score Nopelnītās
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +393,"e.g. ""My Company LLC""","piemēram, ""My Company LLC"""
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +173,Notice Period,Uzteikuma termiņa
+apps/erpnext/erpnext/public/js/setup_wizard.js +141,"e.g. ""My Company LLC""","piemēram, ""My Company LLC"""
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +173,Notice Period,Uzteikuma termiņa
 DocType: Bank Reconciliation Detail,Voucher ID,Kuponu ID
 apps/erpnext/erpnext/setup/doctype/territory/territory.js +14,This is a root territory and cannot be edited.,"Tas ir sakne teritorija, un to nevar rediģēt."
 DocType: Packing Slip,Gross Weight UOM,Bruto svars UOM
 DocType: Email Digest,Receivables / Payables,Debitori / Parādi
 DocType: Delivery Note Item,Against Sales Invoice,Pret pārdošanas rēķinu
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +63,Stamping,Zīmogošana
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +457,Credit Account,Kredīta konts
 DocType: Landed Cost Item,Landed Cost Item,Izkrauti izmaksu pozīcijas
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +56,Show zero values,Parādīt nulles vērtības
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,Daudzums posteņa iegūta pēc ražošanas / pārpakošana no dotajiem izejvielu daudzumu
 DocType: Payment Reconciliation,Receivable / Payable Account,Debitoru / kreditoru konts
 DocType: Delivery Note Item,Against Sales Order Item,Pret Sales Order posteni
-apps/erpnext/erpnext/stock/doctype/item/item.py +521,Please specify Attribute Value for attribute {0},"Lūdzu, norādiet īpašības Value atribūtam {0}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +525,Please specify Attribute Value for attribute {0},"Lūdzu, norādiet īpašības Value atribūtam {0}"
 DocType: Item,Default Warehouse,Default Noliktava
 DocType: Task,Actual End Date (via Time Logs),Faktiskā beigu datums (via Time Baļķi)
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +37,Budget cannot be assigned against Group Account {0},Budžets nevar iedalīt pret grupas kontā {0}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +23,Please enter parent cost center,Ievadiet mātes izmaksu centru
 DocType: Delivery Note,Print Without Amount,Izdrukāt Bez summa
-apps/erpnext/erpnext/controllers/buying_controller.py +69,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,"Nodokļu kategorija nevar būt ""Vērtējums"" vai ""Vērtējums un Total"", jo visi priekšmeti ir nenoteiktas Noliktavā preces"
+apps/erpnext/erpnext/controllers/buying_controller.py +60,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,"Nodokļu kategorija nevar būt ""Vērtējums"" vai ""Vērtējums un Total"", jo visi priekšmeti ir nenoteiktas Noliktavā preces"
 DocType: User,Last Name,Uzvārds
 DocType: Web Page,Left,Kreisais
 DocType: Event,All Day,All Day
@@ -3736,7 +3579,7 @@
 DocType: Appraisal,Total Score (Out of 5),Total Score (no 5)
 DocType: Contact Us Settings,State,Valsts
 DocType: Batch,Batch,Partijas
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +51,Balance,Līdzsvars
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +28,Balance,Līdzsvars
 DocType: Project,Total Expense Claim (via Expense Claims),Kopējo izdevumu Pretenzijas (via izdevumu deklarācijas)
 DocType: User,Gender,Dzimums
 DocType: Journal Entry,Debit Note,Parādzīmi
@@ -3766,8 +3609,7 @@
 DocType: Purchase Order,Get Last Purchase Rate,Saņemt pēdējā pirkšanas likme
 DocType: Time Log,Billing Rate based on Activity Type (per hour),"Norēķinu likme, pamatojoties uz darbības veida (stundā)"
 DocType: Company,Company Info,Uzņēmuma informācija
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +76,Seaming,Seaming
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +197,"Company Email ID not found, hence mail not sent","Uzņēmuma e-pasta ID nav atrasts, tāpēc pasts nav nosūtīts"
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +206,"Company Email ID not found, hence mail not sent","Uzņēmuma e-pasta ID nav atrasts, tāpēc pasts nav nosūtīts"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Līdzekļu (aktīvu)
 DocType: Production Planning Tool,Filter based on item,Filtrs balstās uz posteni
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +451,Debit Account,Debeta kontu
@@ -3779,17 +3621,16 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +95,{0} {1} has been modified. Please refresh.,{0}{1} ir mainīta. Lūdzu atsvaidzināt.
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,Pietura lietotājiem veikt Leave Pieteikumi uz nākamajās dienās.
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +591,From Opportunity,No Opportunity
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +46,Blanking,Blanking
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +166,Employee Benefits,Darbinieku pabalsti
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,Employee Benefits,Darbinieku pabalsti
 DocType: Sales Invoice,Is POS,Ir POS
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +240,Packed quantity must equal quantity for Item {0} in row {1},Pildīta daudzums ir jābūt vienādai daudzums postenim {0} rindā {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +245,Packed quantity must equal quantity for Item {0} in row {1},Pildīta daudzums ir jābūt vienādai daudzums postenim {0} rindā {1}
 DocType: Production Order,Manufactured Qty,Ražoti Daudz
 DocType: Purchase Receipt Item,Accepted Quantity,Pieņemts daudzums
 apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} neeksistē
 apps/erpnext/erpnext/config/accounts.py +18,Bills raised to Customers.,Rēķinus izvirzīti klientiem.
 DocType: DocField,Default,Saistību nepildīšana
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Projekts Id
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +466,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Row Nr {0}: Summa nevar būt lielāks par rezervēta summa pret Izdevumu pretenzijā {1}. Līdz Summa ir {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +468,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Row Nr {0}: Summa nevar būt lielāks par rezervēta summa pret Izdevumu pretenzijā {1}. Līdz Summa ir {2}
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +40,{0} subscribers added,{0} abonenti pievienotās
 DocType: Maintenance Schedule,Schedule,Grafiks
 DocType: Cost Center,"Define Budget for this Cost Center. To set budget action, see ""Company List""","Definēt budžets šim izmaksu centru. Lai uzstādītu budžeta pasākumus, skatiet &quot;Uzņēmuma saraksts&quot;"
@@ -3800,7 +3641,7 @@
 apps/erpnext/erpnext/public/js/pos/pos.js +91,Price List not found or disabled,Cenrādis nav atrasts vai invalīds
 DocType: Expense Claim,Approved,Apstiprināts
 DocType: Pricing Rule,Price,Cena
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +79,Employee relieved on {0} must be set as 'Left',"Darbinieku atvieglots par {0} ir jānosaka kā ""Kreisais"""
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +88,Employee relieved on {0} must be set as 'Left',"Darbinieku atvieglots par {0} ir jānosaka kā ""Kreisais"""
 DocType: Item,"Selecting ""Yes"" will give a unique identity to each entity of this item which can be viewed in the Serial No master.","Izvēloties ""Jā"" sniegs unikālu identitāti katrai vienībai šī posteņa, kuru var apskatīt šajā seriālā Nr kapteinis."
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +39,Appraisal {0} created for Employee {1} in the given date range,Izvērtēšana {0} radīts Darbinieku {1} dotajā datumu diapazonā
 DocType: Employee,Education,Izglītība
@@ -3811,7 +3652,7 @@
 apps/frappe/frappe/desk/moduleview.py +67,Standard Reports,Standarta Ziņojumi
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,Grāmatvedības dienasgrāmatas ieraksti.
 DocType: Delivery Note Item,Available Qty at From Warehouse,Pieejams Daudz at No noliktavas
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +209,Please select Employee Record first.,"Lūdzu, izvēlieties Darbinieku Ierakstīt pirmās."
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +224,Please select Employee Record first.,"Lūdzu, izvēlieties Darbinieku Ierakstīt pirmās."
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Row {0}: Party / Account nesakrīt ar {1} / {2} jo {3} {4}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +35,To create a Tax Account,Lai izveidotu nodokļu kontā
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +233,Please enter Expense Account,Ievadiet izdevumu kontu
@@ -3824,46 +3665,43 @@
 DocType: Sales Order,Track this Sales Order against any Project,Sekot šim klientu pasūtījumu pret jebkuru projektu
 DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,"Pull pārdošanas pasūtījumiem (līdz piegādāt), pamatojoties uz iepriekš minētajiem kritērijiem"
 DocType: DocShare,Document Type,Dokumenta tips
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +565,From Supplier Quotation,No piegādātāja aptauja
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +588,From Supplier Quotation,No piegādātāja aptauja
 DocType: Deduction Type,Deduction Type,Atskaitīšana Type
 DocType: Attendance,Half Day,Half Day
 DocType: Pricing Rule,Min Qty,Min Daudz
 DocType: Features Setup,"To track items in sales and purchase documents with batch nos. ""Preferred Industry: Chemicals""",Lai izsekotu objektus pārdošanas un pirkšanas dokumentu ar partijas nr. &quot;Vēlamā Rūpniecība: Chemicals&quot;
 DocType: GL Entry,Transaction Date,Darījuma datums
 DocType: Production Plan Item,Planned Qty,Plānotais Daudz
-apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +91,Total Tax,Kopā Nodokļu
+apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +93,Total Tax,Kopā Nodokļu
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +178,For Quantity (Manufactured Qty) is mandatory,Par Daudzums (Rūpniecības Daudzums) ir obligāts
 DocType: Stock Entry,Default Target Warehouse,Default Mērķa Noliktava
 DocType: Purchase Invoice,Net Total (Company Currency),Neto Kopā (Company valūta)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +79,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Row {0}: Party Tips un partija ir piemērojama tikai pret debitoru / kreditoru kontu
 DocType: Notification Control,Purchase Receipt Message,Pirkuma čeka Message
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +95,Total allocated leaves are more than period,Kopā piešķirtie lapas ir vairāk nekā periodā
 DocType: Production Order,Actual Start Date,Faktiskais sākuma datums
 DocType: Sales Order,% of materials delivered against this Sales Order,% Materiālu piegādā pret šo pārdošanas rīkojuma
 apps/erpnext/erpnext/config/stock.py +23,Record item movement.,Ierakstīt postenis kustība.
 DocType: Newsletter List Subscriber,Newsletter List Subscriber,Biļetens Latviešu Abonenta
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +164,Morticing,Gropju iegriešanas
 DocType: Email Account,Service,Pakalpojums
 DocType: Hub Settings,Hub Settings,Hub iestatījumi
 DocType: Project,Gross Margin %,Bruto rezerve%
 DocType: BOM,With Operations,Ar operāciju
 apps/erpnext/erpnext/accounts/party.py +232,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,"Grāmatvedības ieraksti jau ir veikts valūtā {0} kompānijai {1}. Lūdzu, izvēlieties saņemamo vai maksājamo konts valūtā {0}."
 ,Monthly Salary Register,Mēnešalga Reģistrēties
-apps/frappe/frappe/website/template.py +140,Next,Nākamais
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard_page.html +17,Next,Nākamais
 DocType: Warranty Claim,If different than customer address,Ja savādāka nekā klientu adreses
 DocType: BOM Operation,BOM Operation,BOM Operation
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +118,Electropolishing,Elektropulēšana
 DocType: Purchase Taxes and Charges,On Previous Row Amount,Uz iepriekšējo rindu summas
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +24,Please enter Payment Amount in atleast one row,Ievadiet maksājuma summu atleast vienā rindā
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +33,Please enter Payment Amount in atleast one row,Ievadiet maksājuma summu atleast vienā rindā
 DocType: POS Profile,POS Profile,POS Profile
 apps/erpnext/erpnext/config/accounts.py +153,"Seasonality for setting budgets, targets etc.","Sezonalitāte, nosakot budžetu, mērķus uc"
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +238,Row {0}: Payment Amount cannot be greater than Outstanding Amount,Rinda {0}: Maksājuma summa nedrīkst būt lielāka par izcilu summa
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +46,Total Unpaid,Kopā Neapmaksāta
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +21,Time Log is not billable,Laiks Log nav saņemts rēķins
 apps/erpnext/erpnext/stock/get_item_details.py +128,"Item {0} is a template, please select one of its variants","Prece {0} ir veidne, lūdzu, izvēlieties vienu no saviem variantiem"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +528,Purchaser,Pircējs
+apps/erpnext/erpnext/public/js/setup_wizard.js +272,Purchaser,Pircējs
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +81,Net pay cannot be negative,Neto darba samaksa nevar būt negatīvs
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +71,Please enter the Against Vouchers manually,Ievadiet Pret Kuponi manuāli
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +107,Please enter the Against Vouchers manually,Ievadiet Pret Kuponi manuāli
 DocType: SMS Settings,Static Parameters,Statiskie Parametri
 DocType: Purchase Order,Advance Paid,Izmaksāto avansu
 DocType: Item,Item Tax,Postenis Nodokļu
@@ -3872,14 +3710,12 @@
 apps/erpnext/erpnext/config/crm.py +48,Send mass SMS to your contacts,Sūtīt masu SMS saviem kontaktiem
 DocType: Purchase Taxes and Charges,Consider Tax or Charge for,"Apsveriet nodokļi un maksājumi, lai"
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,Faktiskais Daudz ir obligāta
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +42,Cross-rolling,Cross-rolling
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +132,Credit Card,Kredītkarte
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +132,Credit Card,Kredītkarte
 DocType: BOM,Item to be manufactured or repacked,Postenis tiks ražots pārsaiņojamā
 apps/erpnext/erpnext/config/stock.py +95,Default settings for stock transactions.,Noklusējuma iestatījumi akciju darījumiem.
 DocType: Purchase Invoice,Next Date,Nākamais datums
 DocType: Employee Education,Major/Optional Subjects,Lielākie / Izvēles priekšmeti
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +49,Please enter Taxes and Charges,Ievadiet nodokļiem un maksājumiem
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +85,Machining,Mehāniskā apstrāde
 DocType: Sales Invoice Item,Drop Ship,Drop Ship
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","Šeit jūs varat saglabāt ģimenes informāciju, piemēram, vārdu un okupācijas mātes, laulātā un bērnu"
 DocType: Hub Settings,Seller Name,Pārdevējs Vārds
@@ -3889,7 +3725,7 @@
 DocType: Stock Entry,Repack,Repack
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +6,You must Save the form before proceeding,Nepieciešams saglabāt formu pirms procedūras
 DocType: Item Attribute,Numeric Values,Skaitliskām vērtībām
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +500,Attach Logo,Pievienojiet Logo
+apps/erpnext/erpnext/public/js/setup_wizard.js +246,Attach Logo,Pievienojiet Logo
 DocType: Customer,Commission Rate,Komisija Rate
 apps/erpnext/erpnext/stock/doctype/item/item.js +38,Make Variant,Padarīt Variant
 apps/erpnext/erpnext/config/hr.py +145,Block leave applications by department.,Block atvaļinājums iesniegumi departamentā.
@@ -3904,19 +3740,19 @@
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +105,Please select a csv file,"Lūdzu, izvēlieties csv failu"
 DocType: Dropbox Backup,Send Backups to Dropbox,Nosūtīt backups uz Dropbox
 DocType: Purchase Order,To Receive and Bill,Lai saņemtu un Bill
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +94,Designer,Dizainers
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Designer,Dizainers
 apps/erpnext/erpnext/config/selling.py +121,Terms and Conditions Template,Noteikumi un nosacījumi Template
 DocType: Serial No,Delivery Details,Piegādes detaļas
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +383,Cost Center is required in row {0} in Taxes table for type {1},Izmaksas Center ir nepieciešama rindā {0} nodokļos tabula veidam {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +386,Cost Center is required in row {0} in Taxes table for type {1},Izmaksas Center ir nepieciešama rindā {0} nodokļos tabula veidam {1}
 DocType: Item,Automatically create Material Request if quantity falls below this level,"Automātiski izveidot Materiālu pieprasījumu, ja daudzums samazinās zem šī līmeņa"
 ,Item-wise Purchase Register,Postenis gudrs iegāde Reģistrēties
 DocType: Batch,Expiry Date,Derīguma termiņš
-apps/erpnext/erpnext/stock/doctype/item/item.py +375,"To set reorder level, item must be a Purchase Item or Manufacturing Item","Lai uzstādītu pasūtīšanas līmeni, postenis jābūt iegāde postenis vai Manufacturing postenis"
+apps/erpnext/erpnext/stock/doctype/item/item.py +379,"To set reorder level, item must be a Purchase Item or Manufacturing Item","Lai uzstādītu pasūtīšanas līmeni, postenis jābūt iegāde postenis vai Manufacturing postenis"
 ,Supplier Addresses and Contacts,Piegādātāju Adreses un kontakti
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,"Lūdzu, izvēlieties Kategorija pirmais"
 apps/erpnext/erpnext/config/projects.py +18,Project master.,Projekts meistars.
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,"Nerādīt kādu simbolu, piemēram, $$ utt blakus valūtām."
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +330, (Half Day),(puse dienas)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +374, (Half Day),(puse dienas)
 DocType: Supplier,Credit Days,Kredīta dienas
 DocType: Leave Type,Is Carry Forward,Vai Carry Forward
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +478,Get Items from BOM,Dabūtu preces no BOM
@@ -3924,7 +3760,7 @@
 apps/erpnext/erpnext/config/manufacturing.py +120,Bill of Materials,Materiālu rēķins
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +77,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Row {0}: Party Tips un partija ir nepieciešama debitoru / kreditoru kontā {1}
 DocType: Dropbox Backup,Send Notifications To,Nosūtīt paziņojumus
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html +26,Ref Date,Ref Datums
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +54,Ref Date,Ref Datums
 DocType: Employee,Reason for Leaving,Iemesls Atstājot
 DocType: Expense Claim Detail,Sanctioned Amount,Sodīts Summa
 DocType: GL Entry,Is Opening,Vai atvēršana
@@ -3932,4 +3768,3 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +188,Account {0} does not exist,Konts {0} nepastāv
 DocType: Account,Cash,Nauda
 DocType: Employee,Short biography for website and other publications.,Īsa biogrāfija mājas lapas un citas publikācijas.
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +31,Please create Salary Structure for employee {0},"Lūdzu, izveidojiet Algas struktūru darbiniekam {0}"
diff --git a/erpnext/translations/mk.csv b/erpnext/translations/mk.csv
index 3a35e2e..da88f6a 100644
--- a/erpnext/translations/mk.csv
+++ b/erpnext/translations/mk.csv
@@ -1,13 +1,12 @@
 DocType: Employee,Salary Mode,Режим на плата
 DocType: Cost Center,"Select Monthly Distribution, if you want to track based on seasonality.","Изберете Месечен Дистрибуција, ако сакате да ги пратите врз основа на сезоната."
 DocType: Employee,Divorced,Разведен
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +86,Warning: Same item has been entered multiple times.,Предупредување: истата таа ствар е внесен повеќе пати.
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +80,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,Точка овозможуваат да се додадат повеќе пати во една трансакција
 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/page/setup_wizard/fixtures/industry_type.py +19,Consumer Products,Производи за широка потрошувачка
+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,Ве молиме изберете партија Тип прв
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +90,Annealing,Annealing
 DocType: Item,Customer Items,Теми на клиентите
 apps/erpnext/erpnext/accounts/doctype/account/account.py +45,Account {0}: Parent account {1} can not be a ledger,На сметка {0}: Родител на сметка {1} не може да биде Леџер
 DocType: Item,Publish Item to hub.erpnext.com,"Објавуваат елемент, за да hub.erpnext.com"
@@ -20,15 +19,14 @@
 DocType: About Us Settings,Website,Веб-страница
 DocType: POS Profile,Applicable for User,Применливи за пристап
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +169,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Престана производството со цел да не може да биде укинат, отпушвам тоа прво да го откажете"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +23,Compaction plus sintering,Тампонирање плус синтерување
 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.,* Ќе се пресметува во трансакцијата.
 DocType: Purchase Order,Customer Contact,Контакт со клиентите
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +549,From Material Request,Од материјално Барање
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +572,From Material Request,Од материјално Барање
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} дрвото
 DocType: Job Applicant,Job Applicant,Работа на апликантот
 apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,Нема повеќе резултати.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +78,Legal,Правни
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +34,Legal,Правни
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +114,Actual type tax cannot be included in Item rate in row {0},Крај на даночните тип не може да бидат вклучени во стапка точка во ред {0}
 DocType: C-Form,Customer,Клиент
 DocType: Purchase Receipt Item,Required By,Бара од страна на
@@ -43,7 +41,6 @@
 DocType: Manufacturing Settings,Default 10 mins,Стандардно 10 минути
 DocType: Leave Type,Leave Type Name,Остави видот на името
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +148,Series Updated Successfully,Серија успешно ажурирани
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +150,Stitching,Шевове
 DocType: Pricing Rule,Apply On,Apply On
 DocType: Item Price,Multiple Item prices.,Повеќекратни цени точка.
 ,Purchase Order Items To Be Received,"Нарачката елементи, за да бидат примени"
@@ -51,8 +48,8 @@
 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 +104,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 +189,New Leave Application,Нов Оставете апликација
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +134,Bank Draft,Банкарски нацрт
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +204,New Leave Application,Нов Оставете апликација
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +134,Bank Draft,Банкарски нацрт
 DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,1. За да се задржи клиентите мудро код ставка и да ги пребарува врз основа на нивниот код Користете ја оваа опција
 DocType: Mode of Payment Account,Mode of Payment Account,Начин на плаќање сметка
 apps/erpnext/erpnext/stock/doctype/item/item.js +34,Show Variants,Прикажи Варијанти
@@ -64,25 +61,23 @@
 DocType: Production Plan Item,Production Plan Item,Производство план Точка
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +141,User {0} is already assigned to Employee {1},Корисник {0} е веќе доделен на вработените {1}
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +13,Make new POS Profile,Направи нови ПОС Профил
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +31,Health Care,Здравствена заштита
+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 +494,Invoice,Фактура
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +519,Invoice,Фактура
 DocType: Maintenance Schedule Item,Periodicity,Поените
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +357,Email Address,E-mail адреса
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +21,Defense,Одбрана
+apps/erpnext/erpnext/public/js/setup_wizard.js +107,Email Address,E-mail адреса
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,Одбрана
 DocType: Company,Abbr,Abbr
 DocType: Appraisal Goal,Score (0-5),Резултат (0-5)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +193,Row {0}: {1} {2} does not match with {3},Ред {0}: {1} {2} не се поклопува со {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +67,Row # {0}:,Ред # {0}:
 DocType: Delivery Note,Vehicle No,Возило Не
 apps/erpnext/erpnext/public/js/pos/pos.js +528,Please select Price List,Ве молиме изберете Ценовник
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +162,Woodworking,Дрво
 DocType: Production Order Operation,Work In Progress,Работа во прогрес
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +153,3D printing,3D печатење
 DocType: Employee,Holiday List,Одмор Листа
 DocType: Time Log,Time Log,Време Влез
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +530,Accountant,Сметководител
+apps/erpnext/erpnext/public/js/setup_wizard.js +274,Accountant,Сметководител
 DocType: Cost Center,Stock User,Акциите пристап
 DocType: Company,Phone No,Телефон No
 DocType: Time Log,"Log of Activities performed by users against Tasks that can be used for tracking time, billing.","Дневник на дејностите што се вршат од страна на корисниците против задачи кои може да се користи за следење на времето, платежна."
@@ -98,18 +93,19 @@
 DocType: Bin,Quantity Requested for Purchase,Кол бара за купување
 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/setup/page/setup_wizard/setup_wizard.js +626,Kg,Кг
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Kg,Кг
 apps/erpnext/erpnext/config/hr.py +48,Opening for a Job.,Отворање на работа.
 DocType: Item Attribute,Increment,Прираст
 apps/erpnext/erpnext/public/js/stock_analytics.js +63,Select Warehouse...,Изберете Магацински ...
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +6,Advertising,Рекламирање
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,Рекламирање
+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/doctype/sales_invoice/sales_invoice.py +389,Stock cannot be updated against Delivery Note {0},Акции не може да се ажурира против Испратница {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +391,Stock cannot be updated against Delivery Note {0},Акции не може да се ажурира против Испратница {0}
 DocType: Payment Reconciliation,Reconcile,Помират
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +30,Grocery,Бакалница
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,Бакалница
 DocType: Quality Inspection Reading,Reading 1,Читање 1
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Make Bank Entry,Направете банка Влегување
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +40,Pension Funds,Пензиски фондови
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,Пензиски фондови
 apps/erpnext/erpnext/accounts/doctype/account/account.py +142,Warehouse is mandatory if account type is Warehouse,Склад е задолжително ако тип на сметка е складиште
 DocType: SMS Center,All Sales Person,Сите продажбата на лице
 DocType: Lead,Person Name,Име лице
@@ -131,7 +127,7 @@
 DocType: Quality Inspection,Get Specification Details,Земете Спецификација Детали за
 DocType: Lead,Interested,Заинтересирани
 apps/erpnext/erpnext/config/manufacturing.py +14,Bill of Material,Бил на материјалот
-apps/erpnext/erpnext/public/js/stock_analytics.js +45,Opening,Отворање
+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,Копија од став група
 DocType: Journal Entry,Opening Entry,Отворање Влегување
@@ -145,23 +141,22 @@
 DocType: Employee Education,Under Graduate,Под Додипломски
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +22,Target On,На цел
 DocType: BOM,Total Cost,Вкупно трошоци
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +99,Reaming,Reaming
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +9,Activity Log:,Влез активност:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +199,Item {0} does not exist in the system or has expired,Точка {0} не постои во системот или е истечен
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +44,Real Estate,Недвижнини
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +44,Real Estate,Недвижнини
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +4,Statement of Account,Состојба на сметката
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +41,Pharmaceuticals,Лекови
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,Лекови
 DocType: Expense Claim Detail,Claim Amount,Износ барање
 DocType: Employee,Mr,Г-дин
 DocType: Custom Script,Client,Клиентот
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,Добавувачот Вид / Добавувачот
 DocType: Naming Series,Prefix,Префикс
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Consumable,Потрошни
+apps/erpnext/erpnext/public/js/setup_wizard.js +359,Consumable,Потрошни
 DocType: Upload Attendance,Import Log,Увоз Влез
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.js +19,Send,Испрати
 DocType: Sales Invoice Item,Delivered By Supplier,Дадено од страна на Добавувачот
 DocType: SMS Center,All Contact,Сите Контакт
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +164,Annual Salary,Годишна плата
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +164,Annual Salary,Годишна плата
 DocType: Period Closing Voucher,Closing Fiscal Year,Затворање на фискалната година
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +69,Stock Expenses,Акции Трошоци
 DocType: Newsletter,Email Sent?,Е-мејл испратен?
@@ -169,26 +164,24 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +92,Show Time Logs,Прикажи Време на дневници
 DocType: Journal Entry Account,Credit in Company Currency,Кредит во компанијата Валута
 DocType: Delivery Note,Installation Status,Инсталација Статус
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +115,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Прифатени + Отфрлени Количина мора да биде еднаков Доби количество за Точка {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +118,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 +133,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 +493,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","За да го вклучите данок во ред {0} на стапката точка, даноци во редови {1} исто така, мора да бидат вклучени"
+apps/erpnext/erpnext/controllers/accounts_controller.py +494,"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 +90,Settings for HR Module,Прилагодувања за Модул со хумани ресурси
 DocType: SMS Center,SMS Center,SMS центарот
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +78,Straightening,Зацрвстувањето
 DocType: BOM Replace Tool,New BOM,Нов Бум
 apps/erpnext/erpnext/config/projects.py +28,Batch Time Logs for billing.,Серија Време на дневници за исплата.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +15,Countergravity casting,Countergravity кастинг
 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/setup/page/setup_wizard/fixtures/industry_type.py +14,Broadcasting,Емитување
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +140,Execution,Извршување
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +364,The first user will become the System Manager (you can change this later).,Првиот корисник ќе стане менаџер на систем (можете да го промените ова подоцна).
+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/public/js/setup_wizard.js +114,The first user will become the System Manager (you can change this later).,Првиот корисник ќе стане менаџер на систем (можете да го промените ова подоцна).
 apps/erpnext/erpnext/config/manufacturing.py +39,Details of the operations carried out.,Детали за операции извршени.
 DocType: Serial No,Maintenance Status,Одржување Статус
 apps/erpnext/erpnext/config/stock.py +263,Items and Pricing,Теми и цени
@@ -205,7 +198,6 @@
 DocType: Pricing Rule,Discount on Price List Rate (%),Попуст на Ценовник стапка (%)
 apps/frappe/frappe/public/js/frappe/form/print.js +96,Start,Почеток
 DocType: User,First Name,Име
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +12,Full-mold casting,Кастинг со полно работно мувла
 DocType: Offer Letter,Select Terms and Conditions,Изберете Услови и правила
 DocType: Production Planning Tool,Sales Orders,Продај Нарачка
 DocType: Purchase Taxes and Charges,Valuation,Вреднување
@@ -217,8 +209,7 @@
 DocType: Bank Reconciliation,Bank Account,Банкарска сметка
 DocType: Leave Type,Allow Negative Balance,Им овозможи на негативното салдо
 DocType: Selling Settings,Default Territory,Стандардно Територија
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +53,Television,Телевизија
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +138,Gashing,Gashing
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,Телевизија
 DocType: Production Order Operation,Updated via 'Time Log',Ажурираат преку &quot;Време Вклучи се &#39;
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +82,Account {0} does not belong to Company {1},На сметка {0} не му припаѓа на компанијата {1}
 DocType: Naming Series,Series List for this Transaction,Серија Листа за оваа трансакција
@@ -233,14 +224,13 @@
 DocType: Leave Allocation,Add unused leaves from previous allocations,Додади неискористени листови од претходните алокации
 apps/erpnext/erpnext/controllers/recurring_document.py +206,Next Recurring {0} will be created on {1},Следна Повторувачки {0} ќе се креира {1}
 DocType: Newsletter List,Total Subscribers,Вкупно претплатници
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +575,Contact Name,Име за Контакт
+,Contact Name,Име за Контакт
 DocType: Production Plan Item,SO Pending Qty,ПА очекување Количина
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Создава плата се лизга за горенаведените критериуми.
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,Барање за купување.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +107,Double housing,Двојно домување
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +156,Only the selected Leave Approver can submit this Leave Application,Само избраните Остави Approver може да го достави овој Оставете апликација
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +171,Only the selected Leave Approver can submit this Leave Application,Само избраните Остави Approver може да го достави овој Оставете апликација
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,Ослободување Датум мора да биде поголема од датумот на пристап
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +172,Leaves per Year,Остава на годишно ниво
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +172,Leaves per Year,Остава на годишно ниво
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup > Settings > Naming Series,Ве молиме да се постави Именување серија за {0} преку подесување&gt; Settings&gt; Именување Серија
 DocType: Time Log,Will be updated when batched.,Ќе биде обновен кога batched.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +104,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,Ред {0}: Ве молиме проверете &quot;Дали напредување против сметка {1} Ако ова е однапред влез.
@@ -249,25 +239,24 @@
 DocType: Item Website Specification,Item Website Specification,Точка на вебсајт Спецификација
 DocType: Dropbox Backup,Dropbox Access Key,Dropbox пристап Клучни
 DocType: Payment Tool,Reference No,Референтен број
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +348,Leave Blocked,Остави блокирани
-apps/erpnext/erpnext/stock/doctype/item/item.py +535,Item {0} has reached its end of life on {1},Точка {0} достигна својот крај на животот на {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +392,Leave Blocked,Остави блокирани
+apps/erpnext/erpnext/stock/doctype/item/item.py +539,Item {0} has reached its end of life on {1},Точка {0} достигна својот крај на животот на {1}
 apps/erpnext/erpnext/accounts/utils.py +339,Annual,Годишен
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Акции помирување Точка
 DocType: Stock Entry,Sales Invoice No,Продај фактура Не
 DocType: Material Request Item,Min Order Qty,Минимална Подреди Количина
 DocType: Lead,Do Not Contact,Не го допирајте
 DocType: Sales Invoice,The unique id for tracking all recurring invoices. It is generated on submit.,На уникатен проект за следење на сите периодични фактури. Тоа е генерирана за поднесете.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +93,Software Developer,Развивач на софтвер
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +93,Software Developer,Развивач на софтвер
 DocType: Item,Minimum Order Qty,Минимална Подреди Количина
 DocType: Pricing Rule,Supplier Type,Добавувачот Тип
 DocType: Item,Publish in Hub,Објави во Hub
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +555,Item {0} is cancelled,Точка {0} е откажана
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +598,Material Request,Материјал Барање
+apps/erpnext/erpnext/stock/doctype/item/item.py +559,Item {0} is cancelled,Точка {0} е откажана
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +607,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} не се најде во &quot;суровини испорачува&quot; маса во нарачката {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +129,Wire brushing,Жица четкање
 DocType: Employee,Relation,Врска
 DocType: Shipping Rule,Worldwide Shipping,Светот превозот
 apps/erpnext/erpnext/config/selling.py +23,Confirmed orders from Customers.,Потврди налози од клиенти.
@@ -283,12 +272,11 @@
 DocType: Supplier,Address HTML,HTML адреса
 DocType: Lead,Mobile No.,Мобилен број
 DocType: Maintenance Schedule,Generate Schedule,Генерирање Распоред
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +81,Hubbing,Hubbing
 DocType: Purchase Invoice Item,Expense Head,Сметка на главата
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +86,Please select Charge Type first,Ве молиме изберете Полнење Тип прв
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,Најнови
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +395,Max 5 characters,Макс 5 знаци
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +195,Select Your Language,Изберете го вашиот јазик
+apps/erpnext/erpnext/public/js/setup_wizard.js +143,Max 5 characters,Макс 5 знаци
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +245,Select Your Language,Изберете го вашиот јазик
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,Првиот Leave Approver во листата ќе биде поставена како стандардна Остави Approver
 DocType: Manufacturing Settings,"Disables creation of time logs against Production Orders.
 Operations shall not be tracked against Production Order",Го оневозможува создавањето на време се најавува против Производство наредби. Работи не треба да се следи од цел производство
@@ -300,8 +288,6 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +34,Item {0} must be Service Item,Точка {0} мора да биде послужната ствар
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +303,Completed Qty can not be greater than 'Qty to Manufacture',Завршено Количина не може да биде поголем од &quot;Количина на производство&quot;
 DocType: DocType,Administrator,Администратор
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +136,Laser drilling,Ласерски дупчење
-DocType: Stock UOM Replace Utility,New Stock UOM,Нова берза UOM
 DocType: Period Closing Voucher,Closing Account Head,Завршната сметка на главата
 DocType: Employee,External Work History,Надворешни Историја работа
 apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,Кружни Суд Грешка
@@ -310,18 +296,15 @@
 DocType: Lead,Industry,Индустрија
 DocType: Employee,Job Profile,Профил работа
 DocType: Newsletter,Newsletter,Билтен
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +84,Hydroforming,Hydroforming
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +49,Necking,Нежности
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Да го извести преку е-пошта на создавање на автоматски материјал Барање
 DocType: Journal Entry,Multi Currency,Мулти Валута
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +51,Item is updated,Точка се ажурира
 DocType: Async Task,System Manager,Систем за менаџер
 DocType: Payment Reconciliation Invoice,Invoice Type,Тип на фактура
 DocType: Sales Invoice Item,Delivery Note,Потврда за испорака
 DocType: Dropbox Backup,Allow Dropbox Access,Им овозможи на Dropbox пристап
 apps/erpnext/erpnext/config/learn.py +72,Setting up Taxes,Поставување Даноци
 apps/erpnext/erpnext/accounts/utils.py +189,Payment Entry has been modified after you pulled it. Please pull it again.,Плаќање Влегување е изменета откако ќе го влечат. Ве молиме да се повлече повторно.
-apps/erpnext/erpnext/stock/doctype/item/item.py +343,{0} entered twice in Item Tax,{0} влезе двапати во точка Данок
+apps/erpnext/erpnext/stock/doctype/item/item.py +347,{0} entered twice in Item Tax,{0} влезе двапати во точка Данок
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +105,Summary for this week and pending activities,"Резимето на оваа недела, а во очекување на активности"
 DocType: Workstation,Rent Cost,Изнајмување на трошоците
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +74,Please select month and year,Ве молиме изберете месец и година
@@ -338,23 +321,21 @@
 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","Достапен во бирото, испорака, Набавка фактура, производство цел, нарачка, купување прием, Продај фактура, Продај Побарувања, Акции влез, timesheet"
 DocType: Item Tax,Tax Rate,Даночна стапка
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Select Item,Одберете ја изборната ставка
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +540,Select Item,Одберете ја изборната ставка
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +143,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","Точка: {0} успеа според групата, не може да се помири со користење \ берза помирување, наместо користење берза Влегување"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +259,Purchase Invoice {0} is already submitted,Купување на фактура {0} е веќе поднесен
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +262,Purchase Invoice {0} is already submitted,Купување на фактура {0} е веќе поднесен
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Batch No must be same as {1} {2},Ред # {0}: Серија Не мора да биде иста како {1} {2}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Convert to non-Group,Претворат во не-групата
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +55,Purchase Receipt must be submitted,Купување Потврда мора да се поднесе
-DocType: Stock UOM Replace Utility,Current Stock UOM,Моменталната залиха UOM
 apps/erpnext/erpnext/config/stock.py +53,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}
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Your email address,Вашиот е-мејл адреса
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +194,Please see attachment,Ве молиме погледнете приврзаност
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +203,Please see attachment,Ве молиме погледнете приврзаност
 DocType: Purchase Order,% Received,% Доби
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +109,Water jet cutting,Вода авион сечење
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +24,Setup Already Complete!!,Поставување веќе е завршено !!
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +20,Setup Already Complete!!,Поставување веќе е завршено !!
 ,Finished Goods,Готови производи
 DocType: Delivery Note,Instructions,Инструкции
 DocType: Quality Inspection,Inspected By,Прегледано од страна на
@@ -369,6 +350,7 @@
 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,Размена на валута
 DocType: Purchase Invoice Item,Item Name,Точка Име
+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","Предмети да се бара кои се &quot;Од берза&quot;, со оглед на сите магацини врз основа на проектираните Количина и минимум цел количество: Контакт лице"
@@ -378,11 +360,10 @@
 ,Purchase Register,Купување Регистрирај се
 DocType: Landed Cost Item,Applicable Charges,Се применува Давачки
 DocType: Workstation,Consumable Cost,Потрошни Цена
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,{0} ({1}) must have role 'Leave Approver',{0} ({1}) мора да имаат улога &quot;Остави Approver&quot;
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +167,{0} ({1}) must have role 'Leave Approver',{0} ({1}) мора да имаат улога &quot;Остави Approver&quot;
 DocType: Purchase Receipt,Vehicle Date,Датум на возилото
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +39,Medical,Медицинска
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +39,Medical,Медицинска
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,Причина за губење
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +36,Tube beading,Цевка капки
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},Работна станица е затворена на следните датуми како на летни Листа на: {0}
 DocType: Employee,Single,Еден
 DocType: Issue,Attachment,Прилог
@@ -403,10 +384,8 @@
 DocType: Account,Is Group,Е група
 DocType: Stock Settings,Automatically Set Serial Nos based on FIFO,Автоматски го менува Сериски броеви врз основа на правилото FIFO
 DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,Проверете Добавувачот број на фактурата Единственост
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +31,Thermoforming,Термообликување
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +66,Slitting,Slitting
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +57,'To Case No.' cannot be less than 'From Case No.',&quot;Да Случај бр &#39; не може да биде помал од &quot;Од Случај бр &#39;
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +104,Non Profit,Непрофитна
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +104,Non Profit,Непрофитна
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_list.js +7,Not Started,Не е стартуван
 DocType: Lead,Channel Partner,Channel Partner
 DocType: Account,Old Parent,Стариот Родител
@@ -415,13 +394,12 @@
 apps/erpnext/erpnext/config/manufacturing.py +74,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 +512,Attribute {0} selected multiple times in Attributes Table,Атрибут {0} одбрани неколку пати во атрибути на табелата
+apps/erpnext/erpnext/stock/doctype/item/item.py +516,Attribute {0} selected multiple times in Attributes Table,Атрибут {0} одбрани неколку пати во атрибути на табелата
 DocType: Sales Order,Not Applicable,Не е применливо
 apps/erpnext/erpnext/config/hr.py +140,Holiday master.,Одмор господар.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +19,Shell molding,Школка во калапи
 DocType: Material Request Item,Required Date,Бараниот датум
 DocType: Delivery Note,Billing Address,Платежна адреса
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +644,Please enter Item Code.,Ве молиме внесете Точка законик.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +648,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","Ако е обележано, износот на данокот што ќе се смета како веќе се вклучени во Print Оцени / Печатење Износ"
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,Вкупно Количина
@@ -431,7 +409,7 @@
 DocType: Item Attribute,To Range,Да се ​​движи
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Хартии од вредност и депозити
 DocType: Features Setup,Imports,Увозот
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +144,Adhesive bonding,Лепило сврзување
+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.,Присуство евиденција.
@@ -439,26 +417,25 @@
 DocType: Sales Order Item,Used for Production Plan,Се користат за производство план
 DocType: System Settings,Loading...,Се вчитува ...
 DocType: DocField,Password,Лозинка
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +155,Fused deposition modeling,Сплотена навредување моделирање
 DocType: Manufacturing Settings,Time Between Operations (in mins),Време помеѓу операции (во минути)
 DocType: Customer,Buyer of Goods and Services.,Купувач на стоки и услуги.
 DocType: Journal Entry,Accounts Payable,Сметки се плаќаат
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +24,Add Subscribers,Додади претплатници
 apps/erpnext/erpnext/public/js/feature_setup.js +220,""" does not exists",&quot;Не постои
 DocType: Pricing Rule,Valid Upto,Важи до
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +564,List a few of your customers. They could be organizations or individuals.,Листа на неколку од вашите клиенти. Тие можат да бидат организации или поединци.
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,List a few of your customers. They could be organizations or individuals.,Листа на неколку од вашите клиенти. Тие можат да бидат организации или поединци.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Direct Income,Директните приходи
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +33,"Can not filter based on Account, if grouped by Account","Не може да се филтрираат врз основа на сметка, ако групирани по сметка"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +88,Administrative Officer,Административен службеник
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Administrative Officer,Административен службеник
 DocType: Payment Tool,Received Or Paid,Доби Или Платиле
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +318,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 +305,Please enter Warehouse for which Material Request will be raised,Ве молиме внесете Магацински за кои ќе се зголеми материјал Барање
 DocType: Production Order,Additional Operating Cost,Дополнителни оперативни трошоци
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +20,Cosmetics,Козметика
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,Козметика
 DocType: DocField,Type,Тип
-apps/erpnext/erpnext/stock/doctype/item/item.py +417,"To merge, following properties must be same for both items","За да се логирате, следниве својства мора да биде иста за двата предмети"
+apps/erpnext/erpnext/stock/doctype/item/item.py +421,"To merge, following properties must be same for both items","За да се логирате, следниве својства мора да биде иста за двата предмети"
 DocType: Communication,Subject,Предмет
 DocType: Shipping Rule,Net Weight,Нето тежина
 DocType: Employee,Emergency Phone,Итни Телефон
@@ -468,7 +445,6 @@
 DocType: Journal Entry,Difference (Dr - Cr),Разлика (Д-р - Cr)
 DocType: Account,Profit and Loss,Добивка и загуба
 apps/erpnext/erpnext/config/stock.py +293,Managing Subcontracting,Управување Склучување
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +58,New UOM must NOT be of type Whole Number,Нов UOM не смее да биде од типот цел број
 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 +47,Account {0} does not belong to company: {1},На сметка {0} не му припаѓа на компанијата: {1}
@@ -487,14 +463,14 @@
 DocType: Purchase Invoice,Supplier Invoice No,Добавувачот Фактура бр
 DocType: Territory,For reference,За референца
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +154,"Cannot delete Serial No {0}, as it is used in stock transactions","Не можат да избришат сериски Не {0}, како што се користи во акции трансакции"
-apps/erpnext/erpnext/public/js/account_tree_grid.js +52,Closing (Cr),Затворање (ЦР)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +227,Closing (Cr),Затворање (ЦР)
 DocType: Serial No,Warranty Period (Days),Гарантниот период (денови)
 DocType: Installation Note Item,Installation Note Item,Инсталација Забелешка Точка
 ,Pending Qty,Во очекување на Количина
 DocType: Job Applicant,Thread HTML,Тема HTML
 DocType: Company,Ignore,Игнорирај
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +86,SMS sent to following numbers: {0},СМС испратен до следните броеви: {0}
-apps/erpnext/erpnext/controllers/buying_controller.py +135,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Добавувачот Магацински задолжително за под-договор Набавка Потврда
+apps/erpnext/erpnext/controllers/buying_controller.py +126,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Добавувачот Магацински задолжително за под-договор Набавка Потврда
 DocType: Pricing Rule,Valid From,Важи од
 DocType: Sales Invoice,Total Commission,Вкупно комисија
 DocType: Pricing Rule,Sales Partner,Продажбата партнер
@@ -502,7 +478,7 @@
 DocType: Monthly Distribution,"**Monthly Distribution** helps you distribute your budget across months if you have seasonality in your business.
 
 To distribute a budget using this distribution, set this **Monthly Distribution** in the **Cost Center**","** Месечен Дистрибуција ** ви помага да се дистрибуира вашиот буџет низ месеци ако имате сезоната во вашиот бизнис. Да се ​​дистрибуира буџет со користење на овој дистрибуција, користете ја оваа ** Месечен Дистрибуција ** ** во центар на трошок на **"
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +183,No records found in the Invoice table,Не се пронајдени во табелата Фактура рекорди
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +130,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 +84,Financial / accounting year.,Финансиски / пресметковната година.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","За жал, сериски броеви не можат да се спојат"
@@ -518,25 +494,25 @@
 DocType: Sales Order,Billing and Delivery Status,Платежна и испорака Статус
 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/setup/page/setup_wizard/setup_wizard_page.html +16,Previous,Претходната
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard_page.html +16,Previous,Претходната
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +620,Sales Return,Продажбата Враќање
 DocType: Production Planning Tool,Select Sales Orders from which you want to create Production Orders.,Изберете Продај Нарачка од која што сакате да се создаде производство наредби.
 DocType: Item,Delivered by Supplier (Drop Ship),Дадено од страна на Добавувачот (Капка Брод)
 apps/erpnext/erpnext/config/hr.py +120,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.,Клиент база на податоци.
 DocType: Quotation,Quotation To,Котација на
 DocType: Lead,Middle Income,Среден приход
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),Отворање (ЦР)
 apps/erpnext/erpnext/accounts/utils.py +193,Allocated amount can not be negative,Распределени износ не може да биде негативен
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +123,Tumbling,Тркалаат
 DocType: Purchase Order Item,Billed Amt,Таксуваната Амт
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,Логична Магацински против кои се направени записи парк.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +92,Reference No & Reference Date is required for {0},Референтен број и референтен датум е потребно за {0}
 DocType: Event,Wednesday,Среда
 DocType: Sales Invoice,Customer's Vendor,Добавувачот на купувачи
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +214,Production Order is Mandatory,Производство цел е задолжително
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +139,Proposal Writing,Пишување предлози
+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} со истиот Вработен проект
 apps/erpnext/erpnext/stock/stock_ledger.py +336,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},Негативна состојба Грешка ({6}) за ставката {0} во складиште {1} на {2} {3} во {4} {5}
 DocType: Fiscal Year Company,Fiscal Year Company,Фискална година компанијата
@@ -559,7 +535,7 @@
 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/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.py +179,Please install dropbox python module,Ве молиме инсталирајте Dropbox Пајтон модул
 DocType: Employee,Passport Number,Број на пасош
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +82,Manager,Менаџер
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Manager,Менаџер
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +494,From Purchase Receipt,Од Набавка Потврда
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +219,Same item has been entered multiple times.,Истата таа ствар е внесен повеќе пати.
 DocType: SMS Settings,Receiver Parameter,Приемник Параметар
@@ -567,10 +543,9 @@
 DocType: Sales Person,Sales Person Targets,Продажбата на лице Цели
 apps/frappe/frappe/public/js/frappe/form/workflow.js +116,To,Да
 apps/frappe/frappe/templates/base.html +145,Please enter email address,Ве молиме внесете e-mail адреса
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +35,End tube forming,Крајот цевка формирање
 DocType: Production Order Operation,In minutes,Во минути
 DocType: Issue,Resolution Date,Резолуцијата Датум
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +635,Please set default Cash or Bank account in Mode of Payment {0},Ве молиме да поставите основен готовина или Банкарска сметка во начинот на плаќање {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +637,Please set default Cash or Bank account in Mode of Payment {0},Ве молиме да поставите основен готовина или Банкарска сметка во начинот на плаќање {0}
 DocType: Selling Settings,Customer Naming By,Именувањето на клиентите со
 apps/erpnext/erpnext/accounts/doctype/account/account.js +67,Convert to Group,Претворат во група
 DocType: Activity Cost,Activity Type,Тип на активност
@@ -578,12 +553,12 @@
 DocType: Customer,Fixed Days,Фиксни дена
 DocType: Sales Invoice,Packing List,Листа на пакување
 apps/erpnext/erpnext/config/buying.py +28,Purchase Orders given to Suppliers.,Купување на налози со оглед на добавувачите.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +43,Publishing,Објавување
+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 +198,{0}: {1} not found in Invoice Details table,{0}: {1} не се најде во Фактура Детали маса
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,{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 +208,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Одржување Посетете {0} мора да биде укинат пред да го раскине овој Продај Побарувања
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +203,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),Отворање (д-р)
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},Праќање пораки во временската ознака мора да биде по {0}
@@ -595,7 +570,6 @@
 DocType: Pricing Rule,Sales Manager,Менаџер за продажба
 apps/frappe/frappe/public/js/frappe/model/model.js +492,Rename,Преименувај
 DocType: Journal Entry,Write Off Amount,Отпише Износ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +52,Bending,Виткање
 apps/frappe/frappe/core/page/user_permissions/user_permissions.js +246,Allow User,Овозможи пристап
 DocType: Journal Entry,Bill No,Бил Не
 DocType: Purchase Invoice,Quarterly,Квартален
@@ -605,17 +579,16 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Please enter item details,Ве молиме внесете детали ставка
 DocType: Purchase Receipt,Other Details,Други детали
 DocType: Account,Accounts,Сметки
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +67,Marketing,Маркетинг
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +65,Straight shearing,Директно сечење
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +67,Marketing,Маркетинг
 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/stock/doctype/purchase_receipt/purchase_receipt.py +99,Rejected Warehouse is mandatory against regected item,Одбиени Магацински е задолжително против regected точка
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +102,Rejected Warehouse is mandatory against regected item,Одбиени Магацински е задолжително против regected точка
 DocType: Account,Expenses Included In Valuation,Трошоци Вклучени Во Вреднување
 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,Понуда писмо Рок
-apps/erpnext/erpnext/stock/doctype/item/item.py +492,Item has variants.,Ставка има варијанти.
+apps/erpnext/erpnext/stock/doctype/item/item.py +496,Item has variants.,Ставка има варијанти.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Точка {0} не е пронајдена
 DocType: Bin,Stock Value,Акции вредност
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,Тип на дрвото
@@ -624,10 +597,9 @@
 DocType: Material Request Item,Quantity and Warehouse,Кол и Магацински
 DocType: Sales Invoice,Commission Rate (%),Комисијата стапка (%)
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +172,"Against Voucher Type must be one of Sales Order, Sales Invoice or Journal Entry","Против ваучер типот мора да биде еден од Продај Побарувања, Продај фактура или весник Влегување"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +139,Biomachining,Biomachining
 apps/erpnext/erpnext/setup/utils.py +89,Unable to find exchange rate,Не може да се најде на девизниот курс
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +7,Aerospace,Воздухопловна
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +19,Welcome,Добредојдовте
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +7,Aerospace,Воздухопловна
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +40,Welcome,Добредојдовте
 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.,Примената стока од добавувачите.
@@ -650,19 +622,19 @@
 DocType: Employee,Cell Number,Мобилен Број
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Си ја заборавивте
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +120,You can not enter current voucher in 'Against Journal Entry' column,Вие не може да влезе во тековната ваучер во &quot;Против весник Влегување&quot; колона
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +25,Energy,Енергија
+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.,Месечен извештај плата.
 DocType: Item Group,Website Specifications,Веб-страница Спецификации
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +205,New Account,Нова сметка
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +21,{0}: From {0} of type {1},{0}: Од {0} од типот на {1}
-apps/erpnext/erpnext/controllers/buying_controller.py +283,Row {0}: Conversion Factor is mandatory,Ред {0}: Фактор на конверзија е задолжително
+apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,Ред {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.,Сметководствени записи може да се направи против лист јазли. Записи од групите не се дозволени.
 DocType: ToDo,High,Висок
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +361,Cannot deactivate or cancel BOM as it is linked with other BOMs,Не може да го деактивирате или да го откажете Бум како што е поврзано со други BOMs
 DocType: Opportunity,Maintenance,Одржување
 DocType: User,Male,Машко
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +182,Purchase Receipt number required for Item {0},Купување Потврда број потребен за Точка {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +183,Purchase Receipt number required for Item {0},Купување Потврда број потребен за Точка {0}
 DocType: Item Attribute Value,Item Attribute Value,Точка вредноста на атрибутот
 apps/erpnext/erpnext/config/crm.py +64,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.
@@ -691,10 +663,9 @@
 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 +324,"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/page/setup_wizard/fixtures/industry_type.py +13,Biotechnology,Биотехнологијата
+apps/erpnext/erpnext/controllers/accounts_controller.py +325,"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,Канцеларија Одржување трошоци
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +53,Hemming,Hemming
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +66,Please enter Item first,Ве молиме внесете стварта прв
 DocType: Account,Liability,Одговорност
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +62,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Санкционирани сума не може да биде поголема од Тврдат Износ во ред {0}.
@@ -707,10 +678,10 @@
 DocType: Company,Default Bank Account,Стандардно банкарска сметка
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +47,"To filter based on Party, select Party Type first","За филтрирање врз основа на партија, изберете партија Тип прв"
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},"&quot;Ажурирај акции &#39;не може да се провери, бидејќи предмети кои не се доставуваат преку {0}"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Nos,Бр
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Nos,Бр
 DocType: Item,Items with higher weightage will be shown higher,Предмети со поголема weightage ќе бидат прикажани повисоки
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Банка помирување Детална
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +627,My Invoices,Мои Фактури
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +629,My Invoices,Мои Фактури
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,Не се пронајдени вработен
 DocType: Purchase Order,Stopped,Запрен
 DocType: Item,If subcontracted to a vendor,Ако иницираат да продавач
@@ -729,35 +700,33 @@
 DocType: Features Setup,"To enable ""Point of Sale"" features",Да им овозможи на &quot;Точка на продажба&quot; карактеристики
 DocType: Bin,Moving Average Rate,Преселба Просечна стапка
 DocType: Production Planning Tool,Select Items,Одбирајте ги изборните ставки
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,{0} against Bill {1} dated {2},{0} од Бил {1} датум {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +328,{0} against Bill {1} dated {2},{0} од Бил {1} датум {2}
 DocType: Comment,Reference Name,Референца
 DocType: Maintenance Visit,Completion Status,Проектот Статус
 DocType: Sales Invoice Item,Target Warehouse,Целна Магацински
 DocType: Item,Allow over delivery or receipt upto this percent,Дозволете врз доставувањето или приемот до овој процент
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +49,Expected Delivery Date cannot be before Sales Order Date,Се очекува испорака датум не може да биде пред Продај Побарувања Датум
 DocType: Upload Attendance,Import Attendance,Увоз Публика
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +17,All Item Groups,Сите Точка групи
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +17,All Item Groups,Сите Точка групи
 DocType: Process Payroll,Activity Log,Активност Влез
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +30,Net Profit / Loss,Нето добивка / загуба
 apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,Автоматски компонира порака на поднесување на трансакции.
 DocType: Production Order,Item To Manufacture,Ставка за производство
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +16,Permanent mold casting,Постојана кастинг мувла
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} статус е {2}
 apps/erpnext/erpnext/config/learn.py +172,Purchase Order to Payment,Нарачка на плаќање
 DocType: Sales Order Item,Projected Qty,Проектирани Количина
 DocType: Sales Invoice,Payment Due Date,Плаќање Поради Датум
 DocType: Newsletter,Newsletter Manager,Билтен менаџер
-apps/erpnext/erpnext/stock/doctype/item/item.js +229,Item Variant {0} already exists with same attributes,Ставка Варијанта {0} веќе постои со истите атрибути
+apps/erpnext/erpnext/stock/doctype/item/item.js +231,Item Variant {0} already exists with same attributes,Ставка Варијанта {0} веќе постои со истите атрибути
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening',&#39;Отворање&#39;
 DocType: Notification Control,Delivery Note Message,Испратница порака
 DocType: Expense Claim,Expenses,Трошоци
 DocType: Item Variant Attribute,Item Variant Attribute,Ставка Варијанта Атрибут
 ,Purchase Receipt Trends,Купување Потврда трендови
 DocType: Appraisal,Select template from which you want to get the Goals,Изберете дефиниција од каде што сакате да го добиете цели
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +77,Research & Development,Истражување и развој
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Research & Development,Истражување и развој
 ,Amount to Bill,Износот на Бил
 DocType: Company,Registration Details,Детали за регистрација
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +75,Staking,Staking
 DocType: Item,Re-Order Qty,Повторно да Количина
 DocType: Leave Block List Date,Leave Block List Date,Остави Забрани Листа Датум
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +25,Scheduled to send to {0},Треба да се испрати до {0}
@@ -768,18 +737,16 @@
 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,Point-of-Продажба
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,Cannot carry forward {0},Не може да го носи напред {0}
 apps/erpnext/erpnext/accounts/doctype/account/account.py +91,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","Баланс на сметка веќе во кредит, не Ви е дозволено да се постави рамнотежа мора да биде &quot;како&quot; дебитни &quot;"
 DocType: Account,Balance must be,Рамнотежа мора да биде
 DocType: Hub Settings,Publish Pricing,Објавување на цени
 DocType: Notification Control,Expense Claim Rejected Message,Сметка Тврдат Отфрлени порака
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +145,Nailing,Заковаме
 ,Available Qty,На располагање Количина
 DocType: Purchase Taxes and Charges,On Previous Row Total,На претходниот ред Вкупно
 DocType: Salary Slip,Working Days,Работни дена
 DocType: Serial No,Incoming Rate,Дојдовни стапка
 DocType: Packing Slip,Gross Weight,Бруто тежина на апаратот
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +410,The name of your company for which you are setting up this system.,Името на вашата компанија за која сте за создавање на овој систем.
+apps/erpnext/erpnext/public/js/setup_wizard.js +158,The name of your company for which you are setting up this system.,Името на вашата компанија за која сте за создавање на овој систем.
 DocType: HR Settings,Include holidays in Total no. of Working Days,Вклучи празници во Вкупен број. на работните денови
 DocType: Job Applicant,Hold,Држете
 DocType: Employee,Date of Joining,Датум на приклучување
@@ -789,7 +756,6 @@
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +3,View Subscribers,Види претплатници
 DocType: Purchase Invoice Item,Purchase Receipt,Купување Потврда
 ,Received Items To Be Billed,Примените предмети да бидат фактурирани
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +114,Abrasive blasting,Пескарење
 DocType: Employee,Ms,Г-ѓа
 apps/erpnext/erpnext/config/accounts.py +148,Currency exchange rate master.,Валута на девизниот курс господар.
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +253,Unable to find Time Slot in the next {0} days for Operation {1},Не можам да најдам временски слот во следните {0} денови за работа {1}
@@ -801,7 +767,7 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +209,Serial No {0} does not belong to Item {1},Сериски № {0} не припаѓаат на Точка {1}
 DocType: Purchase Receipt Item Supplied,Required Qty,Потребни Количина
 DocType: Bank Reconciliation,Total Amount,Вкупниот износ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +32,Internet Publishing,Интернет издаваштво
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,Интернет издаваштво
 DocType: Production Planning Tool,Production Orders,Производство Нарачка
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +35,Balance Value,Биланс вредност
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,Цена за продажба Листа
@@ -812,7 +778,7 @@
 DocType: Supplier,Default Payable Accounts,Стандардно Обврски
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,Вработен {0} не е активна или не постои
 DocType: Features Setup,Item Barcode,Точка Баркод
-apps/erpnext/erpnext/stock/doctype/item/item.py +487,Item Variants {0} updated,Точка Варијанти {0} ажурирани
+apps/erpnext/erpnext/stock/doctype/item/item.py +491,Item Variants {0} updated,Точка Варијанти {0} ажурирани
 DocType: Quality Inspection Reading,Reading 6,Читање 6
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Купување на фактура напредување
 DocType: Address,Shop,Продавница
@@ -821,7 +787,7 @@
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,Стандардно банка / готовинска сметка ќе се ажурира автоматски во POS Фактура кога е избрана оваа опција.
 DocType: Employee,Permanent Address Is,Постојана адреса е
 DocType: Production Order Operation,Operation completed for how many finished goods?,Операцијата заврши за колку готовите производи?
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +491,The Brand,Бренд
+apps/erpnext/erpnext/public/js/setup_wizard.js +237,The Brand,Бренд
 apps/erpnext/erpnext/controllers/status_updater.py +163,Allowance for over-{0} crossed for Item {1}.,Додаток за надминување {0} преминал за Точка {1}.
 DocType: Employee,Exit Interview Details,Излез Интервју Детали за
 DocType: Item,Is Purchase Item,Е Набавка Точка
@@ -841,16 +807,16 @@
 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,Сет износот на плаќање = преостанатиот износ за наплата
 DocType: Contact Us Settings,Address Line 1,Адреса Линија 1
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Variance,Варијанса
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +392,Company Name,Име на компанијата
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +53,Variance,Варијанса
+,Company Name,Име на компанијата
 DocType: SMS Center,Total Message(s),Вкупно пораки (и)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +515,Select Item for Transfer,Одберете ја изборната ставка за трансфер
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +538,Select Item for Transfer,Одберете ја изборната ставка за трансфер
 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.,Изберете Account главата на банката во која е депониран чек.
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,Им овозможи на корисникот да ги уредувате Ценовник стапка во трансакции
 DocType: Pricing Rule,Max Qty,Макс Количина
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +106,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Ред {0}: Плаќање против продажба / нарачка секогаш треба да бидат означени како однапред
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +16,Chemical,Хемиски
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,Хемиски
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +693,All items have already been transferred for this Production Order.,Сите предмети се веќе префрлени за оваа цел производство.
 DocType: Process Payroll,Select Payroll Year and Month,Изберете Даноци година и месец
 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""",Оди до соодветната група (обично Примена на фондови&gt; Тековни средства&gt; банкарски сметки и да се создаде нова сметка (со кликање на Додади детето) од типот &quot;банка&quot;
@@ -861,12 +827,12 @@
 DocType: Item,Inspection Criteria,Критериуми за инспекција
 apps/erpnext/erpnext/config/accounts.py +101,Tree of finanial Cost Centers.,Дрвото на finanial трошочни центри.
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,Трансферираните
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +492,Upload your letter head and logo. (you can edit them later).,Внеси писмо главата и логото. (Можете да ги менувате подоцна).
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +156,White,Бела
+apps/erpnext/erpnext/public/js/setup_wizard.js +238,Upload your letter head and logo. (you can edit them later).,Внеси писмо главата и логото. (Можете да ги менувате подоцна).
+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/setup/page/setup_wizard/setup_wizard.js +362,Attach Your Picture,Закачите вашата слика
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Make ,Направете
+apps/erpnext/erpnext/public/js/setup_wizard.js +112,Attach Your Picture,Закачите вашата слика
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +540,Make ,Направете
 DocType: Journal Entry,Total Amount in Words,Вкупниот износ со зборови
 DocType: Workflow State,Stop,Стоп
 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 ако проблемот продолжи.
@@ -875,14 +841,13 @@
 DocType: Lead,Next Contact Date,Следна Контакт Датум
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,Отворање Количина
 DocType: Holiday List,Holiday List Name,Одмор Листа на Име
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +168,Stock Options,Опции на акции
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +168,Stock Options,Опции на акции
 DocType: Journal Entry Account,Expense Claim,Сметка побарување
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +181,Qty for {0},Количина за {0}
 DocType: Leave Application,Leave Application,Отсуство на апликација
 apps/erpnext/erpnext/config/hr.py +77,Leave Allocation Tool,Остави алатката Распределба
 DocType: Leave Block List,Leave Block List Dates,Остави Забрани Листа Датуми
 DocType: Company,If Monthly Budget Exceeded (for expense account),Ако месечен Буџет надминати (за сметка на сметка)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +56,Trimming,Кастри
 DocType: Workstation,Net Hour Rate,Нето час стапка
 DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,Слета купување цена Потврда
 DocType: Company,Default Terms,Стандардно Услови
@@ -890,10 +855,9 @@
 DocType: POS Profile,Cash/Bank Account,Пари / банка сметка
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,Removed items with no change in quantity or value.,Отстранет предмети без промена во количината или вредноста.
 DocType: Delivery Note,Delivery To,Испорака на
-apps/erpnext/erpnext/stock/doctype/item/item.py +509,Attribute table is mandatory,Атрибут маса е задолжително
+apps/erpnext/erpnext/stock/doctype/item/item.py +513,Attribute table is mandatory,Атрибут маса е задолжително
 DocType: Production Planning Tool,Get Sales Orders,Земете Продај Нарачка
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} не може да биде негативен
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +103,Filing,Поднесување
 apps/erpnext/erpnext/templates/form_grid/item_grid.html +72,Discount,Попуст
 DocType: Features Setup,Purchase Discounts,Купување Попусти
 DocType: Workstation,Wages,Платите
@@ -910,6 +874,7 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +112,You are the Expense Approver for this record. Please Update the 'Status' and Save,Вие сте на сметка Approver за овој запис. Ве молиме инсталирајте ја &quot;статус&quot; и заштеди
 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 +136,"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 +194,Serial No {0} is under maintenance contract upto {1},Сериски № {0} е под договор за одржување до {1}
@@ -918,7 +883,7 @@
 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,Ставка мора да се додаде со користење на &quot;се предмети од Набавка Разписки&quot; копчето
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,Трошоци за продажба
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Buying,Стандардна Купување
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +120,Standard Buying,Стандардна Купување
 DocType: GL Entry,Against,Против
 DocType: Item,Default Selling Cost Center,Стандардно Продажба Цена центар
 DocType: Sales Partner,Implementation Partner,Партнер имплементација
@@ -939,29 +904,29 @@
 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/setup/page/setup_wizard/setup_wizard.js +588,List a few of your suppliers. They could be organizations or individuals.,Листа на неколку од вашите добавувачи. Тие можат да бидат организации или поединци.
+apps/erpnext/erpnext/public/js/setup_wizard.js +326,List a few of your suppliers. They could be organizations or individuals.,Листа на неколку од вашите добавувачи. Тие можат да бидат организации или поединци.
 DocType: Company,Default Currency,Стандардна валута
 DocType: Contact,Enter designation of this Contact,Внесете ознака на овој Контакт
 DocType: Contact Us Settings,Address,Адреса
 DocType: Expense Claim,From Employee,Од вработените
-apps/erpnext/erpnext/controllers/accounts_controller.py +338,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Предупредување: Систем не ќе ги провери overbilling од износот за ставката {0} од {1} е нула
+apps/erpnext/erpnext/controllers/accounts_controller.py +339,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Предупредување: Систем не ќе ги провери overbilling од износот за ставката {0} од {1} е нула
 DocType: Journal Entry,Make Difference Entry,Направи разликата Влегување
 DocType: Upload Attendance,Attendance From Date,Публика од денот
 DocType: Appraisal Template Goal,Key Performance Area,Основна област на ефикасноста
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +54,Transportation,Превоз
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +54,Transportation,Превоз
 apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +67, and year: ,и годината:
 DocType: Email Digest,Annual Expense,Годишната сметка
 DocType: SMS Center,Total Characters,Вкупно Ликови
-apps/erpnext/erpnext/controllers/buying_controller.py +139,Please select BOM in BOM field for Item {0},Ве молиме изберете Бум Бум во полето за предмет {0}
+apps/erpnext/erpnext/controllers/buying_controller.py +130,Please select BOM in BOM field for Item {0},Ве молиме изберете Бум Бум во полето за предмет {0}
 DocType: C-Form Invoice Detail,C-Form Invoice Detail,Детална C-Образец Фактура
 DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,Плаќање помирување Фактура
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +32,Contribution %,Учество%
 DocType: Item,website page link,веб-страница линк страница
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +192,Let's prepare the system for first use.,Ајде да се подготви системот за првата употреба.
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +242,Let's prepare the system for first use.,Ајде да се подготви системот за првата употреба.
 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 +214,Production Order {0} must be cancelled before cancelling this Sales Order,Производство на налози {0} мора да биде укинат пред да го раскине овој Продај Побарувања
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +209,Production Order {0} must be cancelled before cancelling this Sales Order,Производство на налози {0} мора да биде укинат пред да го раскине овој Продај Побарувања
 ,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.,Изберете Време на дневници и поднесете да се создаде нов Продај фактура.
@@ -981,14 +946,13 @@
 DocType: Sales Invoice Advance,Sales Invoice Advance,Продај фактура напредување
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +398,Nothing to request,Ништо да побара
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date',&quot;Старт на проектот Датум &#39;не може да биде поголема од&#39; Крај на екстремна датум&quot;
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +75,Management,За управување со
+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/setup/page/setup_wizard/fixtures/operations.py +14,Investment casting,Инвестиции кастинг
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +51,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""","Ова ќе биде додаден на Кодексот точка на варијанта. На пример, ако вашиот кратенката е &quot;СМ&quot; и кодот на предметот е &quot;Т-маица&quot;, кодот го ставка на варијанта ќе биде &quot;Т-маица-СМ&quot;"
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,Нето плати (со зборови) ќе биде видлив откако ќе ја зачувате фиш плата.
 apps/frappe/frappe/core/doctype/user/user_list.js +12,Active,Активен
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +154,Blue,Blue
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +154,Blue,Blue
 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,Понатаму јазли може да се создаде само под тип јазли &quot;група&quot;
@@ -998,18 +962,16 @@
 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,UOM конверзија Фактор
 DocType: Stock Settings,Default Item Group,Стандардно Точка група
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +156,Laminated object manufacturing,Ламинат производство објект
 apps/erpnext/erpnext/config/buying.py +13,Supplier database.,Снабдувач база на податоци.
 DocType: Account,Balance Sheet,Биланс на состојба
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +561,Cost Center For Item with Item Code ',Цена центар за предмет со точка законик &quot;
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +45,Stretch forming,Рашири формирање
 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 +210,"Further accounts can be made under Groups, but entries can be made against non-Groups","Понатаму сметки може да се направи под Групи, но записи може да се направи врз несрпското групи"
 apps/erpnext/erpnext/config/hr.py +125,Tax and other salary deductions.,Данок и други намалувања на платите.
 DocType: Lead,Lead,Водач
 DocType: Email Digest,Payables,Обврски кон добавувачите
 DocType: Account,Warehouse,Магацин
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +90,Row #{0}: Rejected Qty can not be entered in Purchase Return,Ред # {0}: Отфрлени Количина не може да се влезе во Набавка Враќање
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +93,Row #{0}: Rejected Qty can not be entered in Purchase Return,Ред # {0}: Отфрлени Количина не може да се влезе во Набавка Враќање
 ,Purchase Order Items To Be Billed,"Нарачката елементи, за да бидат фактурирани"
 DocType: Purchase Invoice Item,Net Rate,Нето стапката
 DocType: Purchase Invoice Item,Purchase Invoice Item,Купување на фактура Точка
@@ -1024,13 +986,13 @@
 DocType: Global Defaults,Current Fiscal Year,Тековната фискална година
 DocType: Global Defaults,Disable Rounded Total,Оневозможи заоблени Вкупно
 DocType: Lead,Call,Повик
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +384,'Entries' cannot be empty,&quot;Записи&quot; не може да биде празна
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +386,'Entries' cannot be empty,&quot;Записи&quot; не може да биде празна
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},Дупликат ред {0} со истиот {1}
 ,Trial Balance,Судскиот биланс
 apps/erpnext/erpnext/config/hr.py +205,Setting up Employees,Поставување на вработените
 apps/erpnext/erpnext/public/js/feature_setup.js +220,"Grid """,Мрежа &quot;
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +150,Please select prefix first,Ве молиме изберете префикс прв
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +138,Research,Истражување
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +138,Research,Истражување
 DocType: Maintenance Visit Purpose,Work Done,Работа
 apps/erpnext/erpnext/controllers/item_variant.py +25,Please specify at least one attribute in the Attributes table,Ве молиме да наведете барем еден атрибут во табелата атрибути
 DocType: Contact,User ID,ID на корисникот
@@ -1038,10 +1000,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +57,View Ledger,Види Леџер
 DocType: File,Lft,Lft
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Први
-apps/erpnext/erpnext/stock/doctype/item/item.py +394,"An Item Group exists with same name, please change the item name or rename the item group","Ставка група постои со истото име, Ве молиме да се промени името на точка или преименувате групата точка"
+apps/erpnext/erpnext/stock/doctype/item/item.py +398,"An Item Group exists with same name, please change the item name or rename the item group","Ставка група постои со истото име, Ве молиме да се промени името на точка или преименувате групата точка"
 DocType: Communication,Delivery Status,Статус на Испорака
 DocType: Production Order,Manufacture against Sales Order,Производство против Продај Побарувања
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +517,Rest Of The World,Остатокот од светот
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +455,Rest Of The World,Остатокот од светот
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,Ставката {0} не може да има Batch
 ,Budget Variance Report,Буџетот Варијанса Злоупотреба
 DocType: Salary Slip,Gross Pay,Бруто плата
@@ -1052,13 +1014,11 @@
 DocType: BOM Item,Item Description,Опис
 DocType: Payment Tool,Payment Mode,Начин на плаќање
 DocType: Purchase Invoice,Is Recurring,Е Повторувачки
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +154,Direct metal laser sintering,Директен метални ласерски синтерување
 DocType: Purchase Order,Supplied Items,Испорачани делови
 DocType: Production Order,Qty To Manufacture,Количина на производство
 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,Привремено отворање
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +41,Cryorolling,Cryorolling
 ,Employee Leave Balance,Вработен Остави Биланс
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +128,Balance for Account {0} must always be {1},Биланс на сметка {0} мора секогаш да биде {1}
 DocType: Address,Address Type,Тип адреса
@@ -1074,23 +1034,23 @@
 DocType: Journal Entry,Get Outstanding Invoices,Земете ненаплатени фактури
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,Продај Побарувања {0} не е валиден
 apps/erpnext/erpnext/setup/doctype/company/company.py +172,"Sorry, companies cannot be merged","За жал, компаниите не можат да се спојат"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +145,Small,Мали
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Small,Мали
 DocType: Employee,Employee Number,Број вработен
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},Нема случај (и) веќе е во употреба. Обидете се од случај не {0}
 ,Invoiced Amount (Exculsive Tax),Фактурираниот износ (Exculsive на доход)
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,Точка 2
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +59,Account head {0} created,Сметка главата {0} создаде
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +153,Green,Зелени
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Green,Зелени
 DocType: Item,Auto re-order,Автоматско повторно цел
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +57,Total Achieved,Вкупно Постигнати
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +59,Total Achieved,Вкупно Постигнати
 DocType: Employee,Place of Issue,Место на издавање
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +59,Contract,Договор
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Contract,Договор
 DocType: Report,Disabled,Со посебни потреби
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +490,UOM coversion factor required for UOM: {0} in Item: {1},UOM фактор coversion потребни за UOM: {0} во точка: {1}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +83,Indirect Expenses,Индиректни трошоци
 apps/erpnext/erpnext/controllers/selling_controller.py +163,Row {0}: Qty is mandatory,Ред {0}: Количина е задолжително
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +8,Agriculture,Земјоделството
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +611,Your Products or Services,Вашите производи или услуги
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,Земјоделството
+apps/erpnext/erpnext/public/js/setup_wizard.js +347,Your Products or Services,Вашите производи или услуги
 DocType: Mode of Payment,Mode of Payment,Начин на плаќање
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,Ова е корен елемент група и не може да се уредува.
 DocType: Journal Entry Account,Purchase Order,Нарачката
@@ -1102,7 +1062,7 @@
 DocType: Serial No,Serial No Details,Сериски № Детали за
 DocType: Purchase Invoice Item,Item Tax Rate,Точка даночна стапка
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +113,"For {0}, only credit accounts can be linked against another debit entry","За {0}, само кредитни сметки може да се поврзат против друг запис дебитна"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Delivery Note {0} is not submitted,Испратница {0} не е поднесен
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +470,Delivery Note {0} is not submitted,Испратница {0} не е поднесен
 apps/erpnext/erpnext/stock/get_item_details.py +136,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.","Цените правило е првата избрана врз основа на &quot;Apply On&quot; поле, која може да биде точка, точка група или бренд."
@@ -1112,7 +1072,7 @@
 DocType: Appraisal Goal,Goal,Цел
 DocType: Sales Invoice Item,Edit Description,Измени Опис
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +318,Expected Delivery Date is lesser than Planned Start Date.,Се очекува испорака датум е помал од планираниот почеток датум.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +579,For Supplier,За Добавувачот
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +602,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,Вкупниот појдовен
@@ -1138,10 +1098,10 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +74,"Total {0} for all items is zero, may you should change 'Distribute Charges Based On'","Вкупно {0} за сите предмети е нула, може да треба да се менува &quot;Дистрибуирање пријави врз основа на&quot;"
 DocType: Purchase Invoice,Taxes and Charges Calculation,Такси и надоместоци Пресметка
 DocType: BOM Operation,Workstation,Работна станица
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +112,Hardware,Хардвер
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +112,Hardware,Хардвер
 DocType: Attendance,HR Manager,Менаџер за човечки ресурси
 apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,Ве молиме изберете една компанија
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +50,Privilege Leave,Привилегија Leave
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +50,Privilege Leave,Привилегија Leave
 DocType: Purchase Invoice,Supplier Invoice Date,Добавувачот датум на фактурата
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +79,You need to enable Shopping Cart,Вие треба да им овозможи на Корпа
 apps/frappe/frappe/public/js/frappe/form/grid_body.html +6,No Data,Нема податоци
@@ -1154,7 +1114,7 @@
 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 +168,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/setup/page/setup_wizard/install_fixtures.py +38,Food,Храна
+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 +139,You can make a time log only against a submitted production order,Можете да направите најавите време само против поднесено цел производство
 DocType: Maintenance Schedule Item,No of Visits,Број на посети
@@ -1174,6 +1134,7 @@
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,View Offer Letter,Види понудата писмо
 DocType: Communication,Communication,Комуникација
 DocType: Item,Is Service Item,Е послужната ствар
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +81,Application period cannot be outside leave allocation period,Период апликација не може да биде надвор одмор период распределба
 DocType: Activity Cost,Projects,Проекти
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +31,Please select Fiscal Year,Ве молиме изберете фискалната година
 apps/erpnext/erpnext/controllers/buying_controller.py +23,From {0} | {1} {2},Од {0} | {1} {2}
@@ -1192,7 +1153,7 @@
 DocType: Item,Maintain Stock,Одржување на берза
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +213,Stock Entries already created for Production Order ,Акции записи веќе создадена за цел производство
 DocType: Leave Control Panel,Leave blank if considered for all designations,Оставете го празно ако се земе предвид за сите ознаки
-apps/erpnext/erpnext/controllers/accounts_controller.py +499,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Полнење од типот &quot;Крај&quot; во ред {0} не може да бидат вклучени во точка Оцени
+apps/erpnext/erpnext/controllers/accounts_controller.py +500,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Полнење од типот &quot;Крај&quot; во ред {0} не може да бидат вклучени во точка Оцени
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,Max: {0},Макс: {0}
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +16,From Datetime,Од DateTime
 DocType: Email Digest,For Company,За компанијата
@@ -1202,7 +1163,7 @@
 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 +471,cannot be greater than 100,не може да биде поголема од 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +546,Item {0} is not a stock Item,Точка {0} не е парк Точка
+apps/erpnext/erpnext/stock/doctype/item/item.py +550,Item {0} is not a stock Item,Точка {0} не е парк Точка
 DocType: Maintenance Visit,Unscheduled,Непланирана
 DocType: Employee,Owned,Сопственост
 DocType: Salary Slip Deduction,Depends on Leave Without Pay,Зависи неплатено отсуство
@@ -1216,30 +1177,28 @@
 DocType: HR Settings,Employee Settings,Подесувања на вработените
 ,Batch-Wise Balance History,Според групата биланс Историја
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +72,To Do List,Да се ​​направи листа
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +63,Apprentice,Чирак
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Apprentice,Чирак
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +99,Negative Quantity is not allowed,Негативни Кол не е дозволено
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
 Used for Taxes and Charges",Данок детали табелата се донесени од точка господар како стринг и се чуваат во оваа област. Се користи за даноци и такси
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +61,Lancing,Lancing
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +151,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 +435,Accounting Entry for {0}: {1} can only be made in currency: {2},Сметководство за влез на {0}: {1} може да се направи само во валута: {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +436,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 +38,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 +112,Tax Rule for transactions.,Правило данок за трансакции.
 DocType: Rename Tool,Type of document to rename.,Вид на документ да се преименува.
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +630,We buy this Item,Ние купуваме Оваа содржина
+apps/erpnext/erpnext/public/js/setup_wizard.js +366,We buy this Item,Ние купуваме Оваа содржина
 DocType: Address,Billing,Платежна
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +77,Flanging,Flanging
 DocType: Bulk Email,Not Sent,Не Испратени
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +73,Explosive forming,Експлозивни формирање
 DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),Вкупно даноци и такси (Фирма валута)
 DocType: Shipping Rule,Shipping Account,Испорака на профилот
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +43,Scheduled to send to {0} recipients,Треба да се испрати до {0} примачи
 DocType: Quality Inspection,Readings,Читања
 DocType: Stock Entry,Total Additional Costs,Вкупно Дополнителни трошоци
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Sub Assemblies,Под собранија
+apps/erpnext/erpnext/public/js/setup_wizard.js +359,Sub Assemblies,Под собранија
 DocType: Shipping Rule Condition,To Value,На вредноста
 DocType: Supplier,Stock Manager,Акции менаџер
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +143,Source warehouse is mandatory for row {0},Извор склад е задолжително за спорот {0}
@@ -1249,44 +1208,42 @@
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Увоз Не успеав!
 apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,Постои адреса додаде уште.
 DocType: Workstation Working Hour,Workstation Working Hour,Работна станица работен час
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +83,Analyst,Аналитичарот
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +202,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Ред {0}: распределени износ {1} мора да е помала или еднаква на JV износ {2}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Analyst,Аналитичарот
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +149,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Ред {0}: распределени износ {1} мора да е помала или еднаква на JV износ {2}
 DocType: Item,Inventory,Инвентар
 DocType: Features Setup,"To enable ""Point of Sale"" view",Да им овозможи на &quot;Точка на продажба&quot; поглед
 apps/erpnext/erpnext/public/js/pos/pos.js +402,Payment cannot be made for empty cart,Плаќање не може да се направи за празни кошничка
 DocType: Item,Sales Details,Детали за продажба
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +149,Pinning,Прикачување
 DocType: Opportunity,With Items,Со предмети
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,Во Количина
 DocType: Notification Control,Expense Claim Rejected,Сметка Тврдат Одбиени
 DocType: Sales Invoice,"The date on which next invoice will be generated. It is generated on submit.
 ",Датумот на кој ќе биде генериранa следната фактура. Тоа е генерирана за поднесете.
 DocType: Item Attribute,Item Attribute,Точка Атрибут
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +105,Government,Владата
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Government,Владата
 apps/erpnext/erpnext/config/stock.py +268,Item Variants,Точка Варијанти
 DocType: Company,Services,Услуги
 apps/erpnext/erpnext/accounts/report/financial_statements.py +147,Total ({0}),Вкупно ({0})
 DocType: Cost Center,Parent Cost Center,Родител цена центар
 DocType: Sales Invoice,Source,Извор
 DocType: Leave Type,Is Leave Without Pay,Е неплатено отсуство
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +186,No records found in the Payment table,Не се пронајдени во табелата за платен записи
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +405,Financial Year Start Date,Финансиска година Почеток Датум
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +133,No records found in the Payment table,Не се пронајдени во табелата за платен записи
+apps/erpnext/erpnext/public/js/setup_wizard.js +153,Financial Year Start Date,Финансиска година Почеток Датум
 DocType: Employee External Work History,Total Experience,Вкупно Искуство
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +100,Countersinking,Countersinking
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +271,Packing Slip(s) cancelled,Пакување фиш (и) откажани
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +276,Packing Slip(s) cancelled,Пакување фиш (и) откажани
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,Товар и товар пријави
 DocType: Material Request Item,Sales Order No,Продај Побарувања Не
 DocType: Item Group,Item Group Name,Точка име на група
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +50,Taken,Земени
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,Земени
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +66,Transfer Materials for Manufacture,Пренос на материјали за изработка
 DocType: Pricing Rule,For Price List,За Ценовник
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +27,Executive Search,Извршниот Барај
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,Извршниот Барај
 apps/erpnext/erpnext/stock/stock_ledger.py +405,"Purchase rate for item: {0} not found, which is required to book accounting entry (expense). Please mention item price against a buying price list.","Купување стапка за ставка: {0} не е пронајден, кои се потребни да се резервира влез сметководството (сметка). Ве молиме спомнете ставка цена од купување на ценовникот."
 DocType: Maintenance Schedule,Schedules,Распоред
 DocType: Purchase Invoice Item,Net Amount,Нето износ
 DocType: Purchase Order Item Supplied,BOM Detail No,Бум Детална Не
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),Дополнителен попуст Износ (Фирма валута)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +537,Error: {0} > {1},Грешка: {0}&gt; {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +541,Error: {0} > {1},Грешка: {0}&gt; {1}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,Ве молиме да се создаде нова сметка од сметковниот план.
 DocType: Maintenance Visit,Maintenance Visit,Одржување Посета
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer > Customer Group > Territory,Клиентите&gt; група на потрошувачи&gt; Територија
@@ -1297,7 +1254,6 @@
 DocType: Event,Tuesday,Вторник
 DocType: Leave Block List,Block Holidays on important days.,Забрани празници на важни датуми.
 ,Accounts Receivable Summary,Побарувања Резиме
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +43,Leaves for type {0} already allocated for Employee {1} for period {2} - {3},Заминува за видот {0} веќе наменети за вработените {1} за период {2} - {3}
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +187,Please set User ID field in an Employee record to set Employee Role,Ве молиме поставете го полето корисничко име во евиденција на вработените да го поставите Улогата на вработените
 DocType: UOM,UOM Name,UOM Име
 DocType: Top Bar Item,Target,Целни
@@ -1309,15 +1265,14 @@
 DocType: ToDo,Due Date,Поради Датум
 DocType: Sales Invoice Item,Brand Name,Името на брендот
 DocType: Purchase Receipt,Transporter Details,Транспортерот Детали
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Box,Кутија
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +389,The Organization,Организацијата
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Box,Кутија
+apps/erpnext/erpnext/public/js/setup_wizard.js +137,The Organization,Организацијата
 DocType: Monthly Distribution,Monthly Distribution,Месечен Дистрибуција
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,Листа на приемник е празна. Ве молиме да се создаде листа ресивер
 DocType: Production Plan Sales Order,Production Plan Sales Order,Производство план Продај Побарувања
 DocType: Sales Partner,Sales Partner Target,Продажбата партнер Целна
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},Сметководство за влез на {0} може да се направи само во валута: {1}
 DocType: Pricing Rule,Pricing Rule,Цените Правило
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +58,Notching,Notching
 apps/erpnext/erpnext/config/learn.py +167,Material Request to Purchase Order,Материјал Барање за нарачка
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +74,Row # {0}: Returned Item {1} does not exists in {2} {3},Ред # {0}: Назад Точка {1} не постои во {2} {3}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,Банкарски сметки
@@ -1334,20 +1289,19 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Amounts not reflected in bank,Износи не се гледа во банка
 DocType: Quality Inspection Reading,Reading 4,Читање 4
 apps/erpnext/erpnext/config/hr.py +23,Claims for company expense.,Барања за сметка на компанијата.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +8,Centrifugal casting,Центрифугални кастинг
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +119,Magnetic field-assisted finishing,Магнетно поле со помош на завршна обработка
 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,Контакт Мобилни Не
 DocType: Production Planning Tool,Select Sales Orders,Изберете Продај Нарачка
 ,Material Requests for which Supplier Quotations are not created,Материјал Барања за кои не се создадени Добавувачот Цитати
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +117,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,Ден (а) на која аплицирате за дозвола се одмори. Вие не треба да аплицираат за одмор.
 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/buying/doctype/purchase_order/purchase_order.js +477,Mark as Delivered,Означи како Дадени
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +497,Mark as Delivered,Означи како Дадени
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +34,Make Quotation,Направете цитат
 DocType: Dependent Task,Dependent Task,Зависни Task
-apps/erpnext/erpnext/stock/doctype/item/item.py +306,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 +141,Leave of type {0} cannot be longer than {1},Отсуство од типот {0} не може да биде подолг од {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +310,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 +155,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,Листа на примачот
@@ -1355,15 +1309,14 @@
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Конзумира Износ
 apps/erpnext/erpnext/public/js/pos/pos.js +491,{0} View,{0} Види
 DocType: Salary Structure Deduction,Salary Structure Deduction,Структура плата Одбивање
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +158,Selective laser sintering,Селективен ласерски синтерување
-apps/erpnext/erpnext/stock/doctype/item/item.py +301,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Единица мерка {0} е внесен повеќе од еднаш во конверзија Фактор Табела
+apps/erpnext/erpnext/stock/doctype/item/item.py +305,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Единица мерка {0} е внесен повеќе од еднаш во конверзија Фактор Табела
 apps/frappe/frappe/core/page/data_import_tool/data_import_tool.js +108,Import Successful!,Увоз успешно!
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Цената на издадени материјали
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +185,Quantity must not be more than {0},Кол не смее да биде повеќе од {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +41,Age (Days),Возраст (во денови)
 DocType: Quotation Item,Quotation Item,Цитат Точка
 DocType: Account,Account Name,Име на сметка
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +41,From Date cannot be greater than To Date,Од датум не може да биде поголема од: Да најдам
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +34,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,Serial No {0} количина {1} не може да биде дел
 apps/erpnext/erpnext/config/buying.py +59,Supplier Type master.,Добавувачот Тип господар.
 DocType: Purchase Order Item,Supplier Part Number,Добавувачот Дел број
@@ -1372,14 +1325,14 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +247,{0} {1} is cancelled or stopped,{1} {0} е откажана или запрена
 DocType: Accounts Settings,Credit Controller,Кредитна контролор
 DocType: Delivery Note,Vehicle Dispatch Date,Возило диспечерски Датум
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +197,Purchase Receipt {0} is not submitted,Купување Потврда {0} не е поднесен
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +198,Purchase Receipt {0} is not submitted,Купување Потврда {0} не е поднесен
 DocType: Company,Default Payable Account,Стандардно се плаќаат профил
 apps/erpnext/erpnext/config/website.py +13,"Settings for online shopping cart such as shipping rules, price list etc.","Подесувања за онлајн шопинг количка како и со правилата за испорака, ценовник, итн"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +660,Setup Complete,Целосно подесување
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +124,Setup Complete,Целосно подесување
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +65,{0}% Billed,{0}% Опишан
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +17,Reserved Qty,Количина задржани
 DocType: Party Account,Party Account,Партијата на профилот
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +74,Human Resources,Човечки ресурси
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +74,Human Resources,Човечки ресурси
 DocType: Lead,Upper Income,Горниот дел од приходите
 DocType: Journal Entry Account,Debit in Company Currency,Дебитна во компанијата Валута
 apps/erpnext/erpnext/support/doctype/issue/issue.py +58,My Issues,Мои прашања
@@ -1388,11 +1341,9 @@
 DocType: Company,Default Values,Стандардни вредности
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +236,Row {0}: Payment amount can not be negative,Ред {0}: износот за исплата не може да биде негативен
 DocType: Expense Claim,Total Amount Reimbursed,Вкупниот износ Надоместени
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +152,Press fitting,Прес фитинг
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +64,Against Supplier Invoice {0} dated {1},Против Добавувачот Фактура {0} датум {1}
 DocType: Customer,Default Price List,Стандардно Ценовник
 DocType: Payment Reconciliation,Payments,Плаќања
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +24,Hot isostatic pressing,Жешка isostatic притискање
 DocType: ToDo,Medium,Медиум
 DocType: Budget Detail,Budget Allocated,Буџетот
 DocType: Journal Entry,Entry Type,Тип на влез
@@ -1405,9 +1356,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +56,None of the items have any change in quantity or value.,Ниту еден од предметите имаат каква било промена во количината или вредноста.
 DocType: Warranty Claim,Warranty Claim,Гаранција побарување
 ,Lead Details,Водач Детали за
-DocType: Authorization Rule,Approving User,Одобрување на пристап
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +37,Forging,Фалсификување
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +126,Plating,Позлата
 DocType: Purchase Invoice,End date of current invoice's period,Датум на завршување на периодот тековната сметка е
 DocType: Pricing Rule,Applicable For,Применливи за
 DocType: Bank Reconciliation,From Date,Од датум
@@ -1429,31 +1377,29 @@
 DocType: Sales Invoice,Paid Amount (Company Currency),Платениот износ (Фирма валута)
 DocType: Purchase Invoice,Additional Discount,Дополнителен попуст
 DocType: Selling Settings,Selling Settings,Продажба Settings
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +39,Online Auctions,Онлајн аукции
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,Онлајн аукции
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +94,Please specify either Quantity or Valuation Rate or both,Ве молиме напишете и некоја Кол или вреднување стапка или двете
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +50,"Company, Month and Fiscal Year is mandatory","Компанија, месец и фискалната година е задолжително"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Marketing Expenses,Маркетинг трошоци
 ,Item Shortage Report,Точка Недостаток Извештај
-apps/erpnext/erpnext/stock/doctype/item/item.js +183,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Тежина се споменува, \ Променете спомене &quot;Тежина UOM&quot; премногу"
+apps/erpnext/erpnext/stock/doctype/item/item.js +185,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Тежина се споменува, \ Променете спомене &quot;Тежина UOM&quot; премногу"
 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 +212,Time Log Batch {0} must be 'Submitted',Време Вклучи Серија {0} мора да биде предаден &quot;
 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 +384,Warehouse required at Row No {0},Магацински бара во ред Нема {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +386,Warehouse required at Row No {0},Магацински бара во ред Нема {0}
 DocType: Employee,Date Of Retirement,Датум на заминување во пензија
 DocType: Upload Attendance,Get Template,Земете Шаблон
 DocType: Address,Postal,Поштенските
 DocType: Item,Weightage,Weightage
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +159,Mining,Рударски
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +17,Resin casting,Кастинг смола
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"А група на клиентите постои со истото име, ве молиме промена на името на клиентите или преименување на група на купувачи"
 apps/erpnext/erpnext/public/js/pos/pos.js +147,Please select {0} first.,Ве молиме изберете {0} прво.
 apps/erpnext/erpnext/templates/pages/order.html +57,text {0},текст {0}
 DocType: Territory,Parent Territory,Родител Територија
 DocType: Quality Inspection Reading,Reading 2,Читање 2
 DocType: Stock Entry,Material Receipt,Материјал Потврда
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +622,Products,Производи
+apps/erpnext/erpnext/public/js/setup_wizard.js +358,Products,Производи
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +47,Party Type and Party is required for Receivable / Payable account {0},Партијата Вид и Партијата е потребно за побарувања / Платив сметка {0}
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.","Ако оваа точка има варијанти, тогаш тоа не може да биде избран во продажбата на налози итн"
 DocType: Lead,Next Contact By,Следна Контакт Со
@@ -1463,13 +1409,13 @@
 DocType: Purchase Invoice,Notification Email Address,Известување за е-мејл адреса
 DocType: Payment Tool,Find Invoices to Match,Најди ги Фактури на појавување
 ,Item-wise Sales Register,Точка-мудар Продажбата Регистрирај се
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +399,"e.g. ""XYZ National Bank""","на пример, &quot;XYZ Народната банка&quot;"
+apps/erpnext/erpnext/public/js/setup_wizard.js +147,"e.g. ""XYZ National Bank""","на пример, &quot;XYZ Народната банка&quot;"
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,Е овој данок се вклучени во основната стапка?
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +57,Total Target,Вкупно Целна
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Target,Вкупно Целна
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.js +22,Shopping Cart is enabled,Кошничка е овозможено
 DocType: Job Applicant,Applicant for a Job,Подносителот на барањето за работа
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +173,No Production Orders created,Нема производство наредби создаде
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +131,Salary Slip of employee {0} already created for this month,Плата се лизга на вработен {0} веќе создадена за овој месец
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +140,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.,Премногу колона. Извоз на извештајот и печатење со помош на апликацијата табела.
 DocType: Sales Invoice Item,Batch No,Серија Не
@@ -1479,14 +1425,14 @@
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +13,Variant,Варијанта
 apps/frappe/frappe/public/js/frappe/form/toolbar.js +165,New {0},Нов {0}
 DocType: Naming Series,Set prefix for numbering series on your transactions,Намести префикс за нумерирање серија на вашиот трансакции
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +169,Stopped order cannot be cancelled. Unstop to cancel.,Престана да не може да се откаже. Отпушвам да ја откажете.
-apps/erpnext/erpnext/stock/doctype/item/item.py +323,Default BOM ({0}) must be active for this item or its template,Стандардно Бум ({0}) мора да бидат активни за оваа стварта или нејзиниот дефиниција
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +164,Stopped order cannot be cancelled. Unstop to cancel.,Престана да не може да се откаже. Отпушвам да ја откажете.
+apps/erpnext/erpnext/stock/doctype/item/item.py +327,Default BOM ({0}) must be active for this item or its template,Стандардно Бум ({0}) мора да бидат активни за оваа стварта или нејзиниот дефиниција
 DocType: Employee,Leave Encashed?,Остави Encashed?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Можност од поле е задолжително
 DocType: Item,Variants,Варијанти
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +458,Make Purchase Order,Направи нарачка
 DocType: SMS Center,Send To,Испрати до
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +111,There is not enough leave balance for Leave Type {0},Нема доволно одмор биланс за Оставете Тип {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +127,There is not enough leave balance for Leave Type {0},Нема доволно одмор биланс за Оставете Тип {0}
 DocType: Sales Team,Contribution to Net Total,Придонес на нето Вкупно
 DocType: Sales Invoice Item,Customer's Item Code,Купувачи Точка законик
 DocType: Stock Reconciliation,Stock Reconciliation,Акции помирување
@@ -1523,11 +1469,11 @@
 DocType: Sales Order Item,Actual Qty,Крај на Количина
 DocType: Sales Invoice Item,References,Референци
 DocType: Quality Inspection Reading,Reading 10,Читањето 10
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +612,"List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start.","Листа вашите производи или услуги да ја купите или да го продаде. Бидете сигурни да се провери точка група, Одделение за премер и други својства кога ќе почнете."
+apps/erpnext/erpnext/public/js/setup_wizard.js +348,"List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start.","Листа вашите производи или услуги да ја купите или да го продаде. Бидете сигурни да се провери точка група, Одделение за премер и други својства кога ќе почнете."
 DocType: Hub Settings,Hub Node,Центар Јазол
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,Внесовте дупликат предмети. Ве молиме да се поправат и обидете се повторно.
 apps/erpnext/erpnext/controllers/item_variant.py +65,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values,Вредност {0} {1} Атрибут не постои во листата на валидни Точка атрибут вредности
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +87,Associate,Соработник
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Associate,Соработник
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +46,Item {0} is not a serialized Item,Точка {0} не е серијали Точка
 DocType: SMS Center,Create Receiver List,Креирај Листа ресивер
 apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +5,Expired,Истечен
@@ -1536,7 +1482,7 @@
 DocType: Warranty Claim,Issue Date,Датум на издавање
 DocType: Activity Cost,Activity Cost,Цена активност
 DocType: Purchase Receipt Item Supplied,Consumed Qty,Конзумира Количина
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +52,Telecommunications,Телекомуникации
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +52,Telecommunications,Телекомуникации
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),Покажува дека пакетот е дел од овој испорака (Само Предлог)
 DocType: Payment Tool,Make Payment Entry,Направете плаќање Влегување
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +119,Quantity for Item {0} must be less than {1},Кол за ставката {0} мора да биде помала од {1}
@@ -1553,10 +1499,8 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +37,"Selling must be checked, if Applicable For is selected as {0}","Продажба треба да се провери, ако е применливо за е избран како {0}"
 DocType: Purchase Order Item,Supplier Quotation Item,Добавувачот Цитат Точка
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +27,Make Salary Structure,Направете плата структура
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +54,Shearing,Сечење
 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.,Кликнете на копчето &#39;Направете Продај фактура &quot;да се создаде нов Продај фактура.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +166,Packaging and labeling,Пакување и означување
 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,Ве молиме наведете стандардна валута во компанијата Мајсторот и Глобал Стандардни
@@ -1567,19 +1511,18 @@
 DocType: Budget Detail,Fiscal Year,Фискална година
 DocType: Cost Center,Budget,Буџет
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +41,"Budget cannot be assigned against {0}, as it's not an Income or Expense account","Буџетот не може да биде доделен од {0}, како што не е сметката за приходи и трошоци"
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Achieved,Постигнати
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,Постигнати
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +65,Territory / Customer,Подрачје / клиентите
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,e.g. 5,на пример 5
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +207,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},Ред {0}: распределени износ {1} мора да биде помалку од или еднакво на фактура преостанатиот износ за наплата {2}
+apps/erpnext/erpnext/public/js/setup_wizard.js +294,e.g. 5,на пример 5
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},Ред {0}: распределени износ {1} мора да биде помалку од или еднакво на фактура преостанатиот износ за наплата {2}
 DocType: Sales Invoice,In Words will be visible once you save the Sales Invoice.,Во Зборови ќе бидат видливи кога еднаш ќе ве спаси Фактура на продажба.
 DocType: Item,Is Sales Item,Е продажба Точка
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,Точка Група на дрвото
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,Точка {0} не е подесување за сериски бр. Проверете Точка господар
 DocType: Maintenance Visit,Maintenance Time,Одржување Време
 ,Amount to Deliver,Износ за да овозможи
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +620,A Product or Service,Производ или услуга
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +158,There were errors.,Имаше грешки.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +101,Tapping,Навлегувањето
+apps/erpnext/erpnext/public/js/setup_wizard.js +356,A Product or Service,Производ или услуга
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +146,There were errors.,Имаше грешки.
 DocType: Naming Series,Current Value,Сегашна вредност
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +171,{0} created,{0} создаден
 DocType: Delivery Note Item,Against Sales Order,Против Продај Побарувања
@@ -1593,7 +1536,7 @@
 apps/erpnext/erpnext/accounts/party.py +275,Due Date cannot be before Posting Date,Поради Датум не може да биде пред Праќање пораки во Датум
 DocType: Website Item Group,Website Item Group,Веб-страница Точка група
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Duties and Taxes,Давачки и даноци
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Please enter Reference date,Ве молиме внесете референтен датум
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +312,Please enter Reference date,Ве молиме внесете референтен датум
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} записи плаќање не може да се филтрираат од {1}
 DocType: Item Website Specification,Table for Item that will be shown in Web Site,"Табела за елемент, кој ќе биде прикажан на веб сајтот"
 DocType: Purchase Order Item Supplied,Supplied Qty,Опрема што се испорачува Количина
@@ -1601,7 +1544,7 @@
 apps/erpnext/erpnext/config/stock.py +103,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,Точка-мудар Набавка Историја
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +152,Red,Црвена
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Red,Црвена
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +228,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},Ве молиме кликнете на &quot;Генерирање Распоред&quot; да достигне цена Сериски Без додадеме точка за {0}
 DocType: Account,Frozen,Замрзнати
 ,Open Production Orders,Отворен Нарачка производство
@@ -1616,7 +1559,7 @@
 DocType: Item Attribute,Attribute Name,Атрибут Име
 apps/erpnext/erpnext/controllers/selling_controller.py +236,Item {0} must be Sales or Service Item in {1},"Точка {0} мора да биде на продажба, односно послужната ствар во {1}"
 DocType: Item Group,Show In Website,Прикажи Во вебсајт
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +621,Group,Група
+apps/erpnext/erpnext/public/js/setup_wizard.js +357,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","Да ги пратите на името на брендот во следниве документи испорака, можности, материјал Барање точка, нарачка, купување на ваучер, Набавувачот прием, цитатноста, Продај фактура, производ Бовча, Продај Побарувања, Сериски Не"
@@ -1626,6 +1569,7 @@
 DocType: Features Setup,Brands,Брендови
 DocType: C-Form Invoice Detail,Invoice No,Фактура бр
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +480,From Purchase Order,Од нарачка
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +92,"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,Оставка писмо Датум
@@ -1633,35 +1577,31 @@
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +137,Not Set,Не е поставена
 DocType: Communication,Date,Датум
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,Повторете приходи за корисници
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +651,Sit tight while your system is being setup. This may take a few moments.,Седнете тесни додека вашиот систем е да се биде поставување. Ова може да потрае неколку моменти.
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +115,Sit tight while your system is being setup. This may take a few moments.,Седнете тесни додека вашиот систем е да се биде поставување. Ова може да потрае неколку моменти.
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +51,{0} ({1}) must have role 'Expense Approver',{0} ({1}) мора да имаат улога &quot;расход Approver&quot;
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Pair,Пар
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Pair,Пар
 DocType: Bank Reconciliation Detail,Against Account,Против профил
 DocType: Maintenance Schedule Detail,Actual Date,Крај Датум
 DocType: Item,Has Batch No,Има Batch Не
 DocType: Delivery Note,Excise Page Number,Акцизни Број на страница
 DocType: Employee,Personal Details,Лични податоци
 ,Maintenance Schedules,Распоред за одржување
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +44,Embossing,Втиснување
 ,Quotation Trends,Трендови цитат
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +139,Item Group not mentioned in item master for item {0},Точка Група кои не се споменати во точка мајстор за ставката {0}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +302,Debit To account must be a Receivable account,Дебит сметка мора да биде побарувања сметка
-apps/erpnext/erpnext/stock/doctype/item/item.py +310,"As Production Order can be made for this item, it must be a stock item.","Како што производството со цел да се направат по оваа точка, тој мора да биде точка на акциите."
 DocType: Shipping Rule Condition,Shipping Amount,Испорака Износ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +140,Joining,Состави
-DocType: Authorization Rule,Above Value,Пред вредност
 ,Pending Amount,Во очекување Износ
 DocType: Purchase Invoice Item,Conversion Factor,Конверзија Фактор
 DocType: Purchase Order,Delivered,Дадени
 apps/erpnext/erpnext/config/hr.py +160,Setup incoming server for jobs email id. (e.g. jobs@example.com),Поставување на дојдовен сервер за работни места-мејл ID. (На пр jobs@example.com)
 DocType: Purchase Receipt,Vehicle Number,Број на возило
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,Датумот на кој се повторуваат фактура ќе се запре
+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,Побарувања
 ,Supplier-Wise Sales Analytics,Добавувачот-wise Продажбата анализи
 DocType: Address Template,This format is used if country specific format is not found,Овој формат се користи ако не се најде специфичен формат земја
 DocType: Custom Field,Custom,Прилагодено
 DocType: Production Order,Use Multi-Level BOM,Користете Мулти-ниво на бирото
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +26,Injection molding,Шприц
 DocType: Bank Reconciliation,Include Reconciled Entries,Вклучи се помири записи
 apps/erpnext/erpnext/config/accounts.py +41,Tree of finanial accounts.,Дрвото на finanial сметки.
 DocType: Leave Control Panel,Leave blank if considered for all employee types,Оставете го празно ако се земе предвид за сите видови на вработените
@@ -1671,30 +1611,28 @@
 apps/frappe/frappe/config/setup.py +130,Printing,Печатење
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +114,Expense Claim is pending approval. Only the Expense Approver can update status.,Сметка тврдат дека е во очекување на одобрување. Само на сметка Approver може да го ажурира статусот.
 DocType: Purchase Invoice,Additional Discount Amount,Дополнителен попуст Износ
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +99,The day(s) on which you are applying for leave are holiday. You need not apply for leave.,На ден (а) на која аплицирате за дозвола се на одмор. Вие не треба да се применуваат за одмор.
 apps/frappe/frappe/public/js/frappe/misc/utils.js +110,and,и
 DocType: Leave Block List Allow,Leave Block List Allow,Остави Забрани Листа Дозволете
 apps/erpnext/erpnext/setup/doctype/company/company.py +236,Abbr can not be blank or space,Abbr не може да биде празно или простор
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +50,Sports,Спорт
+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/setup/page/setup_wizard/setup_wizard.js +626,Unit,Единица
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Unit,Единица
 apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.py +182,Please set Dropbox access keys in your site config,Ве молиме да се постави Dropbox копчиња за пристап на вашиот сајт config
 apps/erpnext/erpnext/stock/get_item_details.py +113,Please specify Company,"Ве молиме назначете фирма,"
 ,Customer Acquisition and Loyalty,Стекнување на клиентите и лојалност
 DocType: Purchase Receipt,Warehouse where you are maintaining stock of rejected items,"Складиште, каде што се одржување на залихи на одбиени предмети"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +408,Your financial year ends on,Вашата финансиска година завршува на
+apps/erpnext/erpnext/public/js/setup_wizard.js +156,Your financial year ends on,Вашата финансиска година завршува на
 DocType: POS Profile,Price List,Ценовник
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +20,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0} сега е стандардно фискална година. Ве молиме да обновите вашиот прелистувач за промените да имаат ефект.
 apps/erpnext/erpnext/projects/doctype/project/project.js +47,Expense Claims,Сметка побарувања
 DocType: Issue,Support,Поддршка
-DocType: Authorization Rule,Approving Role,Одобрување Улогата
 ,BOM Search,Бум Барај
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +176,Closing (Opening + Totals),Затворање (отворање + одделение)
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +26,Please specify currency in Company,Ве молиме наведете валута во компанијата
 DocType: Workstation,Wages per hour,Плата по час
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,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.","Прикажи / Сокриј функции како сериски броеви, ПОС итн"
-apps/erpnext/erpnext/controllers/accounts_controller.py +236,Account {0} is invalid. Account Currency must be {1},Сметка {0} не е валиден. Валута сметка мора да биде {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +237,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},Фактор UOM конверзија е потребно во ред {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +53,Clearance date cannot be before check date in row {0},Датум дозвола не може да биде пред датумот проверка во ред {0}
 DocType: Salary Slip,Deduction,Одбивање
@@ -1713,13 +1651,13 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +82,Item {0} has already been returned,Точка {0} веќе се вратени
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** Фискалната година ** претставува финансиска година. Сите сметководствени записи и други големи трансакции се следи против ** ** фискалната година.
 DocType: Opportunity,Customer / Lead Address,Клиент / Водечки адреса
+apps/erpnext/erpnext/stock/doctype/item/item.py +112,Warning: Invalid SSL certificate on attachment {0},Предупредување: Невалиден SSL сертификат прикачување {0}
 DocType: Production Order Operation,Actual Operation Time,Крај на време операција
 DocType: Authorization Rule,Applicable To (User),Се применуваат за (Корисник)
 DocType: Purchase Taxes and Charges,Deduct,Одземе
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +170,Job Description,Опис на работата
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +170,Job Description,Опис на работата
 DocType: Purchase Order Item,Qty as per Stock UOM,Количина како на берза UOM
 apps/frappe/frappe/model/rename_doc.py +343,Please select a valid csv file with data,Ве молиме изберете една валидна CSV датотека со податоци
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +92,Coating,Слој
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +126,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Специјални знаци освен &quot;-&quot; &quot;.&quot;, &quot;#&quot;, и &quot;/&quot; не е дозволено во именување серија"
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Пратете на продажба кампањи. Пратете води, цитати, Продај Побарувања итн од кампањи за да се измери враќање на инвестицијата."
 DocType: Expense Claim,Approver,Approver
@@ -1729,12 +1667,11 @@
 DocType: Supplier Quotation,Manufacturing Manager,Производство менаџер
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +191,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/hooks.py +84,Shipments,Пратки
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +29,Dip molding,Натопи во калапи
+apps/erpnext/erpnext/hooks.py +68,Shipments,Пратки
 DocType: Purchase Order,To be delivered to customer,Да бидат доставени до клиентите
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,Време Вклучи Статус мора да се поднесе.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,Сериски Не {0} не припаѓа на ниту еден Магацински
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +650,Setting Up,Поставување на
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +114,Setting Up,Поставување на
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,Row # ,Ред #
 DocType: Purchase Invoice,In Words (Company Currency),Во зборови (компанија валута)
 DocType: Pricing Rule,Supplier,Добавувачот
@@ -1742,7 +1679,7 @@
 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 +166,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,Сметка или сметка разликата е задолжително за ставката {0} што вкупната вредност на акции што влијанија
-apps/erpnext/erpnext/controllers/accounts_controller.py +354,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","Не може да overbill за Точка {0} во ред {1} повеќе од {2}. За да се овозможи overbilling, молам постави во парк Settings"
+apps/erpnext/erpnext/controllers/accounts_controller.py +355,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","Не може да overbill за Точка {0} во ред {1} повеќе од {2}. За да се овозможи overbilling, молам постави во парк Settings"
 DocType: Employee,Bank Name,Име на банка
 apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +27,-Above,-Above
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +135,User {0} is disabled,Корисник {0} е исклучен
@@ -1755,27 +1692,26 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,{0} is mandatory for Item {1},{0} е задолжително за ставката {1}
 DocType: Currency Exchange,From Currency,Од валутен
 DocType: DocField,Name,Име
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +211,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Ве молиме изберете распределени износот, видот Фактура и број на фактурата во барем еден ред"
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +104,Sales Order required for Item {0},Продај Побарувања потребни за Точка {0}
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +158,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Ве молиме изберете распределени износот, видот Фактура и број на фактурата во барем еден ред"
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +107,Sales Order required for Item {0},Продај Побарувања потребни за Точка {0}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +43,Amounts not reflected in system,Износи не се гледа на системот
 DocType: Purchase Invoice Item,Rate (Company Currency),Стапка (Фирма валута)
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +40,Others,"Други, пак,"
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +40,Others,"Други, пак,"
 apps/erpnext/erpnext/templates/includes/product_page.js +80,Cannot find a matching Item. Please select some other value for {0}.,Не може да се најде за појавување Точка. Ве молиме одберете некои други вредност за {0}.
 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,Не може да го изберете типот задолжен како &quot;На претходниот ред Износ&quot; или &quot;На претходниот ред Вкупно &#39;за првиот ред
 apps/frappe/frappe/core/doctype/doctype/boilerplate/controller_list.html +31,Completed,Завршено
 DocType: Web Form,Select DocType,Изберете DOCTYPE
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +104,Broaching,Broaching
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +12,Banking,Банкарство
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,Банкарство
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +38,Please click on 'Generate Schedule' to get schedule,Ве молиме кликнете на &quot;Генерирање Распоред&quot; да се добие распоред
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +283,New Cost Center,Нова цена центар
 DocType: Bin,Ordered Quantity,Нареди Кол
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +397,"e.g. ""Build tools for builders""","на пример, &quot;Изградба на алатки за градители&quot;"
+apps/erpnext/erpnext/public/js/setup_wizard.js +145,"e.g. ""Build tools for builders""","на пример, &quot;Изградба на алатки за градители&quot;"
 DocType: Quality Inspection,In Process,Во процесот
 DocType: Authorization Rule,Itemwise Discount,Itemwise попуст
 DocType: Purchase Order Item,Reference Document Type,Референтен документ Тип
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +318,{0} against Sales Order {1},{0} против Продај Побарувања {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +320,{0} against Sales Order {1},{0} против Продај Побарувања {1}
 DocType: Account,Fixed Asset,Основни средства
 apps/erpnext/erpnext/config/stock.py +283,Serialized Inventory,Серијали Инвентар
 DocType: Activity Type,Default Billing Rate,Стандардно регистрации курс
@@ -1790,14 +1726,13 @@
 DocType: Purchase Invoice Item,Page Break,Page Break
 DocType: Production Order Operation,Pending,Во очекување
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,Корисниците кои може да одобри апликации одмор одредена вработениот
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +33,You cannot change default UOM of Variant. To change default UOM for Variant change default UOM of the Template,Не можете да го промените стандардниот UOM на варијанта. За да го промените стандардниот UOM за Варијанта промените стандардниот UOM на Шаблон
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +50,Office Equipments,Канцеларија опрема
 DocType: Purchase Invoice Item,Qty,Количина
 DocType: Fiscal Year,Companies,Компании
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +24,Electronics,Електроника
+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/support/doctype/maintenance_visit/maintenance_visit.js +18,From Maintenance Schedule,Од Распоред за одржување
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +56,Full-time,Со полно работно време
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +56,Full-time,Со полно работно време
 DocType: Purchase Invoice,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.","Ако имате креирано стандарден образец во продажба даноци и давачки дефиниција, изберете една и кликнете на копчето подолу."
@@ -1809,11 +1744,12 @@
 DocType: Job Applicant,Job Opening,Отворање работа
 DocType: Payment Reconciliation,Payment Reconciliation,Плаќање помирување
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +154,Please select Incharge Person's name,Ве молиме изберете име incharge на лицето
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +51,Technology,Технологија
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,Технологија
 DocType: Offer Letter,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,Вкупниот фактуриран Амт
 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.","За да додадете дете јазли, истражуваат дрво и кликнете на јазол под кои сакате да додадете повеќе лимфни јазли."
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +102,Credit To account must be a Payable account,Кредит на сметка мора да биде плаќаат сметка
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +233,BOM recursion: {0} cannot be parent or child of {2},Бум на рекурзијата: {0} не може да биде родител или дете на {2}
@@ -1826,10 +1762,8 @@
 DocType: Item,Customer Item Codes,Клиент Точка Код
 DocType: Opportunity,Lost Reason,Си ја заборавивте Причина
 apps/erpnext/erpnext/config/accounts.py +68,Create Payment Entries against Orders or Invoices.,Креирај Плаќање записи против налози или фактури.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +141,Welding,Заварување
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +40,New Stock UOM is required,Нова берза UOM е потребно
 DocType: Quality Inspection,Sample Size,Големина на примерокот
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +443,All items have already been invoiced,Сите предмети веќе се фактурира
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +446,All items have already been invoiced,Сите предмети веќе се фактурира
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',Ве молиме наведете валидна &quot;од случај бр &#39;
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +287,Further cost centers can be made under Groups but entries can be made against non-Groups,Понатаму центри цена може да се направи под Групи но записи може да се направи врз несрпското групи
 DocType: Project,External,Надворешни
@@ -1841,8 +1775,7 @@
 DocType: Bin,Actual Quantity,Крај на Кол
 DocType: Shipping Rule,example: Next Day Shipping,пример: Следен ден на испорака
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,Сериски № {0} не е пронајдена
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +563,Your Customers,Вашите клиенти
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +27,Compression molding,Компресија калапи
+apps/erpnext/erpnext/public/js/setup_wizard.js +303,Your Customers,Вашите клиенти
 DocType: Leave Block List Date,Block Date,Датум на блок
 DocType: Sales Order,Not Delivered,Не Дадени
 ,Bank Clearance Summary,Банката Чистење Резиме
@@ -1863,10 +1796,10 @@
 DocType: SMS Log,Sent To,Испратени до
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +28,Make Sales Invoice,Направи Продај фактура
 DocType: Company,For Reference Only.,За повикување само.
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +29,Invalid {0}: {1},Невалиден {0}: {1}
+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,Планирање на капацитетот
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +49,'From Date' is required,&quot;Од датум &#39;е потребен
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +43,'From Date' is required,&quot;Од датум &#39;е потребен
 DocType: Journal Entry,Reference Number,Референтен број
 DocType: Employee,Employment Details,Детали за вработување
 DocType: Employee,New Workplace,Нов работен простор
@@ -1881,7 +1814,7 @@
 DocType: Serial No,Delivery Time,Време на испорака
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Стареењето Врз основа на
 DocType: Item,End of Life,Крајот на животот
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +41,Travel,Патување
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +41,Travel,Патување
 DocType: Leave Block List,Allow Users,Им овозможи на корисниците
 DocType: Purchase Order,Customer Mobile No,Клиент Мобилни Не
 DocType: Sales Invoice,Recurring,Повторувачки
@@ -1895,7 +1828,7 @@
 DocType: Naming Series,User must always select,Корисникот мора секогаш изберете
 DocType: Stock Settings,Allow Negative Stock,Дозволете негативна состојба
 DocType: Installation Note,Installation Note,Инсталација Забелешка
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +541,Add Taxes,Додади Даноци
+apps/erpnext/erpnext/public/js/setup_wizard.js +283,Add Taxes,Додади Даноци
 ,Financial Analytics,Финансиски анализи
 DocType: Quality Inspection,Verified By,Заверена од
 DocType: Address,Subsidiary,Подружница
@@ -1905,7 +1838,6 @@
 DocType: System Settings,In Hours,Во часови
 DocType: Process Payroll,Create Salary Slip,Креирај Плата фиш
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Expected balance as per bank,"Се очекува баланс, како на банката"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +115,Buffing,Buffing
 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,Вработен
@@ -1922,11 +1854,11 @@
 DocType: Rename Tool,File to Rename,Датотека за да ја преименувате
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +176,Purchse Order number required for Item {0},Purchse Број на налогот се потребни за Точка {0}
 apps/erpnext/erpnext/public/js/controllers/transaction.js +136,Show Payments,Плаќања шоу
-apps/erpnext/erpnext/controllers/buying_controller.py +245,Specified BOM {0} does not exist for Item {1},Назначена Бум {0} не постои точка за {1}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +202,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Распоред за одржување {0} мора да биде укинат пред да го раскине овој Продај Побарувања
+apps/erpnext/erpnext/controllers/buying_controller.py +236,Specified BOM {0} does not exist for Item {1},Назначена Бум {0} не постои точка за {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Распоред за одржување {0} мора да биде укинат пред да го раскине овој Продај Побарувања
 apps/frappe/frappe/desk/page/backups/backups.html +13,Size,Големина
 DocType: Notification Control,Expense Claim Approved,Сметка Тврдат Одобрени
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +113,Pharmaceutical,Фармацевтската
+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,Продај Побарувања задолжителни
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +30,Create Customer,Креирај клиентите
@@ -1936,7 +1868,6 @@
 DocType: Quality Inspection Reading,Reading 9,Читање 9
 DocType: Supplier,Is Frozen,Е Замрзнати
 DocType: Buying Settings,Buying Settings,Поставки за купување
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +122,Mass finishing,Маса завршувањето
 DocType: Stock Entry Detail,BOM No. for a Finished Good Item,Бум број за завршен добра ствар
 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)
@@ -1944,7 +1875,7 @@
 DocType: Payment Tool,Payment Account,Уплатна сметка
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +713,Please specify Company to proceed,"Ве молиме назначете фирма, да се продолжи"
 apps/frappe/frappe/public/js/frappe/model/indicator.js +30,Draft,Нацрт
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +46,Compensatory Off,Обесштетување Off
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Compensatory Off,Обесштетување Off
 DocType: Quality Inspection Reading,Accepted,Прифатени
 DocType: User,Female,Женски
 DocType: Journal Entry Account,Debit in Account Currency,Дебитна во профил Валута
@@ -1956,7 +1887,7 @@
 DocType: Shipping Rule,Shipping Rule Label,Испорака Правило Етикета
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +209,Raw Materials cannot be blank.,"Суровини, не може да биде празна."
 DocType: Newsletter,Test,Тест
-apps/erpnext/erpnext/stock/doctype/item/item.py +364,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +368,"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'","Како што постојат постојните акции трансакции за оваа точка, \ вие не може да се промени на вредностите на &quot;Мора Сериски Не&quot;, &quot;Дали Серија Не&quot;, &quot;Дали берза точка&quot; и &quot;метода на проценка&quot;"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +448,Quick Journal Entry,Брзо весник Влегување
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +92,You can not change rate if BOM mentioned agianst any item,Вие не може да го промени стапка ако Бум споменати agianst која било ставка
@@ -1967,13 +1898,14 @@
 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.,Одделни производни цел ќе биде направена за секоја завршена добра ствар.
 DocType: Purchase Invoice,Terms and Conditions1,Услови и Conditions1
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +18,Complete Setup,Целосно подесување
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard_page.html +18,Complete Setup,Целосно подесување
 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/config/crm.py +96,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 +57,Total Absent,Вкупно Отсутни
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +746,Item or Warehouse for row {0} does not match Material Request,Точка или складиште ред {0} не се поклопува материјал Барање
@@ -1998,16 +1930,15 @@
 DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),Основната стапка (како на Акции UOM)
 DocType: SMS Log,No of Requested SMS,Број на Побарано СМС
 DocType: Campaign,Campaign-.####,Кампања -. ####
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +55,Piercing,Пирсинг
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,Следните чекори
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +117,Contract End Date must be greater than Date of Joining,Договор Крај Датум мора да биде поголема од датумот на пристап
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,Трето лице дистрибутер / дилер / комисионен застапник / партнер / препродавач кој ги продава компании производи за провизија.
 DocType: Customer Group,Has Child Node,Има Јазол дете
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{0} against Purchase Order {1},{0} против нарачка {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +332,{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/page/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
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +110,Photochemical machining,Фотохемиски обработка
 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.
 
 #### Note
@@ -2033,7 +1964,7 @@
 DocType: Purchase Receipt Item,Recd Quantity,Recd Кол
 DocType: Email Account,Email Ids,E-mail ИД
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},Не може да произведе повеќе Точка {0} од Продај Побарувања количина {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +471,Stock Entry {0} is not submitted,Акции Влегување {0} не е поднесен
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +473,Stock Entry {0} is not submitted,Акции Влегување {0} не е поднесен
 DocType: Payment Reconciliation,Bank / Cash Account,Банка / готовинска сметка
 DocType: Tax Rule,Billing City,Платежна Сити
 DocType: Global Defaults,Hide Currency Symbol,Сокриј Валута Симбол
@@ -2049,7 +1980,7 @@
 DocType: Purchase Invoice,Currency and Price List,Валута и Ценовник
 DocType: Opportunity,Customer / Lead Name,Клиент / Водечки Име
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +63,Clearance Date not mentioned,Чистење Датум кои не се споменати
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +71,Production,Производство
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Production,Производство
 DocType: Item,Allow Production Order,Им овозможи на производството со цел
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +60,Row {0}:Start Date must be before End Date,Ред {0}: Почеток Датум мора да биде пред Крај Датум
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Вкупно (Количина)
@@ -2062,7 +1993,7 @@
 apps/erpnext/erpnext/utilities/doctype/address/address.py +113,My Addresses,Мои адреси
 DocType: Stock Ledger Entry,Outgoing Rate,Тековна стапка
 apps/erpnext/erpnext/config/hr.py +100,Organization branch master.,Организација гранка господар.
-apps/erpnext/erpnext/controllers/accounts_controller.py +237, or ,или
+apps/erpnext/erpnext/controllers/accounts_controller.py +238, 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-
@@ -2089,6 +2020,7 @@
 DocType: Stock Entry Detail,Serial No / Batch,Сериски Не / Batch
 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 +213,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',Распоред за одржување не е генерирана за сите предмети. Ве молиме кликнете на &quot;Генерирање Распоред &#39;
 ,To Produce,Да произведе
 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} исто така, мора да бидат вклучени"
@@ -2096,10 +2028,7 @@
 DocType: Bin,Reserved Quantity,Кол задржани
 DocType: Landed Cost Voucher,Purchase Receipt Items,Купување Потврда Теми
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,Персонализација форми
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +62,Cutting,Сечење
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +69,Flattening,Изедначување
 DocType: Account,Income Account,Сметка приходи
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +22,Molding,Калапи
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +632,Delivery,Испорака
 DocType: Stock Reconciliation Item,Current Qty,Тековни Количина
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",Видете &quot;стапката на материјали врз основа на&quot; Чини во Дел
@@ -2109,19 +2038,18 @@
 apps/frappe/frappe/desk/moduleview.py +61,Documents,Документи
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +17,Ref,Реф
 DocType: Cost Center,Cost Center,Трошоците центар
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.js +48,Voucher #,Ваучер #
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +36,Voucher #,Ваучер #
 DocType: Notification Control,Purchase Order Message,Нарачка порака
 DocType: Tax Rule,Shipping Country,Превозот Земја
 DocType: Upload Attendance,Upload HTML,Upload HTML
-apps/erpnext/erpnext/controllers/accounts_controller.py +391,"Total advance ({0}) against Order {1} cannot be greater \
+apps/erpnext/erpnext/controllers/accounts_controller.py +392,"Total advance ({0}) against Order {1} cannot be greater \
 				than the Grand Total ({2})",Вкупно однапред ({0}) против Ред {1} може да не биде поголема \ од Големиот Вкупно ({2})
 DocType: Employee,Relieving Date,Ослободување Датум
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +12,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.","Цените Правило е направен за да ја пребришете Ценовник / дефинира попуст процент, врз основа на некои критериуми."
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,Склад може да се менува само преку берза за влез / Испратница / Купување Потврда
 DocType: Employee Education,Class / Percentage,Класа / Процент
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +92,Head of Marketing and Sales,Раководител на маркетинг и продажба
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +31,Income Tax,Данок на доход
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +157,Laser engineered net shaping,Ласерски Инженерните нето обликување
+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.","Ако е избрано Цените правило е направен за &quot;цената&quot;, таа ќе ги избрише ценовникот. Цените Правило цена е крајната цена, па нема повеќе Попустот треба да биде применет. Оттука, во трансакции како Продај Побарувања, нарачка итн, тоа ќе биде Земени се во полето &#39;стапка &quot;, отколку полето&quot; Ценовник стапка."
 apps/erpnext/erpnext/config/selling.py +163,Track Leads by Industry Type.,Песна води од страна на индустриски тип.
 DocType: Item Supplier,Item Supplier,Точка Добавувачот
@@ -2144,31 +2072,28 @@
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Крај Количина По трансакцијата
 ,Pending SO Items For Purchase Request,Во очекување на ПА Теми за купување Барање
 DocType: Supplier,Billing Currency,Платежна валута
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +148,Extra Large,Extra Large
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,Extra Large,Extra Large
 ,Profit and Loss Statement,Добивка и загуба Изјава
 DocType: Bank Reconciliation Detail,Cheque Number,Чек број
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +43,Pressing,Притискање
 DocType: Payment Tool Detail,Payment Tool Detail,Плаќање алатката Детална
 ,Sales Browser,Продажбата Browser
 DocType: Journal Entry,Total Credit,Вкупно кредитни
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +474,Warning: Another {0} # {1} exists against stock entry {2},Постои Друга {0} {1} # против влез парк {2}: опомена
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +459,Local,Локалните
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +476,Warning: Another {0} # {1} exists against stock entry {2},Постои Друга {0} {1} # против влез парк {2}: опомена
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +397,Local,Локалните
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),Кредити и побарувања (средства)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,Должниците
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +147,Large,Големи
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +23,No employee found!,Ниту еден вработен пронајдена!
+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 +152,Please mention no of visits required,Ве молиме спомнете Број на посети бара
 DocType: Purchase Order,Customer Address Display,Клиент Адреса Покажи
 DocType: Stock Settings,Default Valuation Method,Метод за проценка стандардно
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +127,Polishing,Полирање
 DocType: Production Order Operation,Planned Start Time,Планирани Почеток Време
 apps/erpnext/erpnext/config/accounts.py +63,Close Balance Sheet and book Profit or Loss.,Затвори Биланс на состојба и книга добивка или загуба.
-apps/erpnext/erpnext/stock/doctype/item/item.py +661,"Default Unit of Measure for Item {0} cannot be changed directly because \
+apps/erpnext/erpnext/stock/doctype/item/item.py +665,"Default Unit of Measure for Item {0} cannot be changed directly because \
 			you have already made some transaction(s) with another UOM. To change default UOM, \
 			use 'UOM Replace Utility' tool under Stock module.","Стандардно единица мерка за Точка {0} може да се промени, бидејќи директно \ веќе сте направиле некои трансакција (а) со друг UOM. За да го промените стандардниот UOM \ употреба &quot;UOM Замени комунални &#39;алатка под Акции модул."
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,Наведете курс за претворање на еден валута во друга
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +146,Quotation {0} is cancelled,Цитат {0} е откажана
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +141,Quotation {0} is cancelled,Цитат {0} е откажана
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,Вкупно преостанатиот износ за наплата
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} was on leave on {1}. Cannot mark attendance.,Вработен {0} е на одмор на {1}. Не може да означува присуство.
 DocType: Sales Partner,Targets,Цели
@@ -2179,7 +2104,6 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +158,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,Компјутери
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +112,Electro-chemical grinding,Електро-хемиски мелење
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +14,This is a root customer group and cannot be edited.,Ова е коренот на клиентите група и не може да се уредува.
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +39,Please setup your chart of accounts before you start Accounting Entries,Ве молиме да ги конфигурирате вашите сметковниот план пред да почнете Сметководство записи
 DocType: Purchase Invoice,Ignore Pricing Rule,Игнорирај Цените Правило
@@ -2225,7 +2149,6 @@
 DocType: Maintenance Visit,Purposes,Цели
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +103,Atleast one item should be entered with negative quantity in return document,Барем една ставка треба да се внесуваат со негативен количество во замена документ
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +67,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","Операција {0} подолго од било кој на располагање на работното време во станица {1}, се прекине работењето во повеќе операции"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +134,Electrochemical machining,Електрохемиски обработка
 ,Requested,Побарано
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +66,No Remarks,Нема забелешки
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +13,Overdue,Задоцнета
@@ -2234,7 +2157,7 @@
 DocType: Monthly Distribution,Distribution Name,Дистрибуција Име
 DocType: Features Setup,Sales and Purchase,Продажба и купување
 DocType: Supplier Quotation Item,Material Request No,Материјал Барање Не
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +218,Quality Inspection required for Item {0},Квалитет инспекција потребни за Точка {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +221,Quality Inspection required for Item {0},Квалитет инспекција потребни за Точка {0}
 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),Нето стапката (Фирма валута)
@@ -2252,9 +2175,8 @@
 apps/erpnext/erpnext/accounts/report/financial_statements.py +16,Fiscal Year {0} not found.,Фискална година {0} не е пронајдена.
 DocType: Bank Reconciliation,Get Relevant Entries,Добие релевантни записи
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +407,Accounting Entry for Stock,Сметководство за влез на берза
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +64,Coining,Сковал
 DocType: Sales Invoice,Sales Team1,Продажбата Team1
-apps/erpnext/erpnext/stock/doctype/item/item.py +412,Item {0} does not exist,Точка {0} не постои
+apps/erpnext/erpnext/stock/doctype/item/item.py +416,Item {0} does not exist,Точка {0} не постои
 DocType: Sales Invoice,Customer Address,Клиент адреса
 apps/frappe/frappe/desk/query_report.py +136,Total,Вкупниот
 DocType: Purchase Invoice,Apply Additional Discount On,Да важат и дополнителни попуст на
@@ -2266,14 +2188,13 @@
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),Износот на данокот По Износ попуст (Фирма валута)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +149,Target warehouse is mandatory for row {0},Целна склад е задолжително за спорот {0}
 DocType: Quality Inspection,Quality Inspection,Квалитет инспекција
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +144,Extra Small,Екстра Мали
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +20,Spray forming,Спреј формирање
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Extra Small,Екстра Мали
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +458,Warning: Material Requested Qty is less than Minimum Order Qty,Предупредување: Материјал Бараниот Количина е помалку од Минимална Подреди Количина
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +191,Account {0} is frozen,На сметка {0} е замрзнат
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Правното лице / Подружница со посебен сметковен кои припаѓаат на Организацијата.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +29,"Food, Beverage & Tobacco","Храна, пијалаци и тутун"
+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 или диплома
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,Can only make payment against unbilled {0},Може само да се направи исплата против нефактурираното {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +531,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/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Minimum Inventory Level,Минимална Инвентар ниво
 DocType: Stock Entry,Subcontract,Поддоговор
@@ -2284,19 +2205,18 @@
 DocType: Item,Manufacturer Part Number,Производителот Дел број
 DocType: Production Order Operation,Estimated Time and Cost,Проценето време и трошоци
 DocType: Bin,Bin,Бин
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +50,Nosing,Душкајќи
 DocType: SMS Log,No of Sent SMS,Број на испратени СМС
 DocType: Account,Company,Компанијата
 DocType: Account,Expense Account,Сметка сметка
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +49,Software,Софтвер
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +151,Colour,Боја
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +49,Software,Софтвер
+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",Ве молиме одберете ја изборната ставка каде што &quot;Дали берза Точка&quot; е &quot;Не&quot; и &quot;е продажба точка&quot; е &quot;Да&quot; и не постои друг Бовча производ
 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 +281,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} не постои во горната табела &quot;Набавка Разписки&quot;
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +134,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 +145,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,Преименувај Влез
@@ -2306,7 +2226,7 @@
 apps/erpnext/erpnext/controllers/recurring_document.py +162,Please select {0},Ве молиме изберете {0}
 DocType: C-Form,C-Form No,C-Образец бр
 DocType: BOM,Exploded_items,Exploded_items
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +95,Researcher,Истражувач
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Researcher,Истражувач
 apps/frappe/frappe/custom/doctype/customize_form/customize_form.js +88,Update,Ажурирање
 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 +23,Name or Email is mandatory,Име или е-пошта е задолжително
@@ -2315,11 +2235,10 @@
 DocType: Employee,Exit,Излез
 apps/erpnext/erpnext/accounts/doctype/account/account.py +134,Root Type is mandatory,Корен Тип е задолжително
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +295,Serial No {0} created,Сериски № {0} создаден
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +125,Vibratory finishing,Вибрационен доработка
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","За погодност на клиентите, овие кодови може да се користи во печатените формати како Фактури и испорака белешки"
 DocType: Employee,You can enter any date manually,Можете да внесете кој било датум рачно
 DocType: Sales Invoice,Advertisement,Маркетинг
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +165,Probationary Period,Пробниот период
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Probationary Period,Пробниот период
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Само лист јазли се дозволени во трансакција
 DocType: Expense Claim,Expense Approver,Сметка Approver
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,Купување Потврда точка Опрема што се испорачува
@@ -2327,19 +2246,16 @@
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +17,To Datetime,Да DateTime
 DocType: SMS Settings,SMS Gateway URL,SMS Gateway URL
 apps/erpnext/erpnext/config/crm.py +53,Logs for maintaining sms delivery status,Дневници за одржување на статусот на испораката смс
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +137,Grinding,Мелење
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +34,Shrink wrapping,Смалуваат завиткување
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +36,Pending Activities,Активности во тек
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,Confirmed,Потврди
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier > Supplier Type,Добавувачот&gt; Добавувачот Тип
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +127,Please enter relieving date.,Ве молиме внесете ослободување датум.
 apps/erpnext/erpnext/controllers/trends.py +137,Amt,АМТ
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' can be submitted,Остави само Пријавите со статус &#39;одобрена &quot;може да се поднесе
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +51,Only Leave Applications with status 'Approved' can be submitted,Остави само Пријавите со статус &#39;одобрена &quot;може да се поднесе
 apps/erpnext/erpnext/utilities/doctype/address/address.py +21,Address Title is mandatory.,Наслов адреса е задолжително.
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,"Внесете го името на кампања, ако извор на истрага е кампања"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +38,Newspaper Publishers,Новински издавачи
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +38,Newspaper Publishers,Новински издавачи
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,Изберете фискалната година
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +88,Smelting,Топење
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Пренареждане ниво
 DocType: Attendance,Attendance Date,Публика Датум
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,Плата распадот врз основа на заработка и одбивање.
@@ -2354,16 +2270,15 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +414,[Error],[Грешка]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,Во Зборови ќе бидат видливи откако ќе го спаси Продај Побарувања.
 ,Employee Birthday,Вработен Роденден
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +55,Venture Capital,Вложување на капитал
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,Вложување на капитал
 DocType: UOM,Must be Whole Number,Мора да биде цел број
 DocType: Leave Control Panel,New Leaves Allocated (In Days),Нови лисја распределени (во денови)
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +51,Serial No {0} does not exist,Сериски № {0} не постои
 DocType: Pricing Rule,Discount Percentage,Процент попуст
 DocType: Payment Reconciliation Invoice,Invoice Number,Број на фактура
-apps/erpnext/erpnext/hooks.py +70,Orders,Нарачка
+apps/erpnext/erpnext/hooks.py +54,Orders,Нарачка
 DocType: Leave Control Panel,Employee Type,Тип на вработените
 DocType: Employee Leave Approver,Leave Approver,Остави Approver
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +70,Swaging,Ковањето
 DocType: Manufacturing Settings,Material Transferred for Manufacture,Материјал префрлени за Производство
 DocType: Expense Claim,"A user with ""Expense Approver"" role",Корисник со &quot;Расходи Approver&quot; улога
 ,Issued Items Against Production Order,Издадени Теми против производството со цел
@@ -2375,7 +2290,6 @@
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +62,Cost Center with existing transactions can not be converted to group,Трошоците центар со постојните трансакции не може да се конвертира во групата
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Depreciation,Амортизација
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Добавувачот (и)
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +29,Invalid period,Неправилен период
 DocType: Customer,Credit Limit,Кредитен лимит
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,Изберете тип на трансакција
 DocType: GL Entry,Voucher No,Ваучер Не
@@ -2385,9 +2299,9 @@
 DocType: Customer,Address and Contact,Адреса и контакт
 DocType: Customer,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}"
 apps/erpnext/erpnext/accounts/party.py +284,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Забелешка: Поради / референтен датум надминува дозволено клиент кредит дена од {0} ден (а)
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +621,Maint. Schedule,Maint. Распоред
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +108,Abrasive jet machining,Абразивни авион обработка
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +632,Maint. Schedule,Maint. Распоред
 DocType: Stock Settings,Freeze Stock Entries,Замрзнување берза записи
 DocType: Website Settings,Website Settings,Settings веб-страница
 DocType: Item,Reorder level based on Warehouse,Ниво врз основа на промените редоследот Магацински
@@ -2404,7 +2318,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +75,Show Stock Entries,Прикажи берза записи
 ,Is Primary Address,Е Основен адреса
 DocType: Production Order,Work-in-Progress Warehouse,Работа во прогрес Магацински
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +308,Reference #{0} dated {1},Референтен # {0} датум {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Reference #{0} dated {1},Референтен # {0} датум {1}
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +13,Manage Addresses,Управуваат со адреси
 DocType: Pricing Rule,Item Code,Точка законик
 DocType: Production Planning Tool,Create Production Orders,Креирај Производство Нарачка
@@ -2413,7 +2327,7 @@
 DocType: Lead,Market Segment,Сегмент од пазарот
 DocType: Communication,Phone,Телефон
 DocType: Employee Internal Work History,Employee Internal Work History,Вработен внатрешна работа Историја
-apps/erpnext/erpnext/public/js/account_tree_grid.js +50,Closing (Dr),Затворање (д-р)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +221,Closing (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.,Данок дефиниција за продажба трансакции.
@@ -2429,8 +2343,8 @@
 ,Billed Amount,Фактурирани Износ
 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 +129,Material Request {0} is cancelled or stopped,Материјал Барање {0} е откажана или запрена
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +641,Add a few sample records,Додадете неколку записи примерок
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +133,Material Request {0} is cancelled or stopped,Материјал Барање {0} е откажана или запрена
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Add a few sample records,Додадете неколку записи примерок
 apps/erpnext/erpnext/config/hr.py +210,Leave Management,Остави менаџмент
 DocType: Event,Groups,Групи
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,Група од сметка
@@ -2443,38 +2357,34 @@
 DocType: Features Setup,Sales Extras,Продажба Бенефиции
 apps/erpnext/erpnext/accounts/utils.py +344,{0} budget for Account {1} against Cost Center {2} will exceed by {3},{0} буџетот на сметка {1} од трошоците центар {2} ќе се надмине со {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +236,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Разликата сметките мора да бидат типот на средствата / одговорност сметка, бидејќи овој парк помирување претставува Отворање Влегување"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +138,Purchase Order number required for Item {0},Нарачка број потребен за Точка {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Order number required for Item {0},Нарачка број потребен за Точка {0}
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',&quot;Од датум&quot; мора да биде по &quot;Да најдам&quot;
 ,Stock Projected Qty,Акции Проектирани Количина
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +147,Customer {0} does not belong to project {1},Клиент {0} не му припаѓа на проектот {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +150,Customer {0} does not belong to project {1},Клиент {0} не му припаѓа на проектот {1}
 DocType: Sales Order,Customer's Purchase Order,Нарачка на купувачот
 DocType: Warranty Claim,From Company,Од компанијата
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,Вредност или Количина
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Minute,Минута
+apps/erpnext/erpnext/public/js/setup_wizard.js +363,Minute,Минута
 DocType: Purchase Invoice,Purchase Taxes and Charges,Купување на даноци и такси
 ,Qty to Receive,Количина да добијам
 DocType: Leave Block List,Leave Block List Allowed,Остави Забрани листата на дозволени
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +61,Conversion factor cannot be in fractions,Фактор на конверзија не може да биде во делови
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +358,You will use it to Login,Вие ќе го користите за најава
+apps/erpnext/erpnext/public/js/setup_wizard.js +108,You will use it to Login,Вие ќе го користите за најава
 DocType: Sales Partner,Retailer,Трговија на мало
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +99,Credit To account must be a Balance Sheet account,Кредит на сметка мора да биде на сметка Биланс на состојба
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,Сите типови на Добавувачот
 apps/erpnext/erpnext/stock/doctype/item/item.py +37,Item Code is mandatory because Item is not automatically numbered,"Точка законик е задолжително, бидејќи точка не се нумерирани автоматски"
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +99,Quotation {0} not of type {1},Цитат {0} не е од типот на {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +93,Quotation {0} not of type {1},Цитат {0} не е од типот на {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,Одржување Распоред Точка
 DocType: Sales Order,%  Delivered,% Дадени
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,Bank Overdraft Account,Банка пречекорување на профилот
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +15,Make Salary Slip,Направете Плата фиш
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +18,Browse BOM,Преглед на бирото
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +175,Secured Loans,Препорачана кредити
-apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +3,Awesome Products,Прекрасно производи
+apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +3,Awesome Products,Прекрасно производи
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +189,Opening Balance Equity,Салдо инвестициски фондови
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +80,Cannot approve leave as you are not authorized to approve leaves on Block Dates,"Не може да се одобри отсуство, како што не се овластени да го одобри лисја Забрани Датуми"
 DocType: Appraisal,Appraisal,Процена
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +13,Lost-foam casting,Кастинг Изгубени пена
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +47,Drawing,Цртеж
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +22,Date is repeated,Датум се повторува
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +148,Leave approver must be one of {0},Остави approver мора да биде еден од {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +162,Leave approver must be one of {0},Остави approver мора да биде еден од {0}
 DocType: Hub Settings,Seller Email,Продавачот Email
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Вкупниот откуп на трошоци (преку купување фактура)
 DocType: Workstation Working Hour,Start Time,Почеток Време
@@ -2488,7 +2398,7 @@
 DocType: Purchase Invoice Item,Net Amount (Company Currency),Нето износ (Фирма валута)
 DocType: BOM Operation,Hour Rate,Стапка на час
 DocType: Stock Settings,Item Naming By,Точка грабеж на име со
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +642,From Quotation,Од цитат
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +655,From Quotation,Од цитат
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},Уште еден период Затворање Влегување {0} е направен по {1}
 DocType: Production Order,Material Transferred for Manufacturing,Материјал е пренесен за производство
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +29,Account {0} does not exists,На сметка {0} не постои
@@ -2502,21 +2412,19 @@
 DocType: Purchase Invoice Item,PR Detail,ПР Детална
 DocType: Sales Order,Fully Billed,Целосно Опишан
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +20,Cash In Hand,Парични средства во благајна
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +72,Delivery warehouse required for stock item {0},Испорака магацин потребни за трговија ставка {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +119,Delivery warehouse required for stock item {0},Испорака магацин потребни за трговија ставка {0}
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),Бруто тежина на пакувањето. Обично нето тежина + материјал за пакување тежина. (За печатење)
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Корисниците со оваа улога може да поставите замрзнати сметки и да се создаде / измени на сметководствените ставки кон замрзнатите сметки
 DocType: Serial No,Is Cancelled,Е Откажано
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +281,My Shipments,Мои Пратки
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +286,My Shipments,Мои Пратки
 DocType: Journal Entry,Bill Date,Бил Датум
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +43,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","Дури и ако постојат повеќе Цените правила со највисок приоритет, тогаш се применуваат следните интерни приоритети:"
 DocType: Supplier,Supplier Details,Добавувачот Детали за
 DocType: Communication,Recipients,Примателите
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +146,Screwing,Нарезници
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +96,Knurling,Knurling
 DocType: Expense Claim,Approval Status,Статус на Одобри
 DocType: Hub Settings,Publish Items to Hub,Објавуваат Теми на Hub
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +44,From value must be less than to value in row {0},Од вредност мора да биде помал од вредност во ред {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +133,Wire Transfer,Wire Transfer
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +133,Wire Transfer,Wire Transfer
 apps/erpnext/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py +25,Please select Bank Account,Ве молиме изберете банкарска сметка
 DocType: Newsletter,Create and Send Newsletters,Креирајте и испратете Билтени
 apps/frappe/frappe/public/js/frappe/views/reports/grid_report.js +305,From Date must be before To Date,Од датум мора да е пред: Да најдам
@@ -2524,14 +2432,14 @@
 DocType: Company,Default Income Account,Сметка стандардно на доход
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,Клиент група / клиентите
 DocType: Item Group,Check this if you want to show in website,Обележете го ова ако сакате да се покаже во веб-страница
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +190,Welcome to ERPNext,Добредојдовте на ERPNext
+,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/page/setup_wizard/install_fixtures.py +37,Calls,Повици
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Calls,Повици
 DocType: Project,Total Costing Amount (via Time Logs),Вкупно Чини Износ (преку Време на дневници)
 DocType: Purchase Order Item Supplied,Stock UOM,Акции UOM
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Purchase Order {0} is not submitted,Нарачка {0} не е поднесен
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +194,Purchase Order {0} is not submitted,Нарачка {0} не е поднесен
 ,Projected,Проектирани
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},Сериски № {0} не припаѓаат Магацински {1}
 apps/erpnext/erpnext/controllers/status_updater.py +136,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,"Забелешка: системот не ќе ги провери над-испорака и над-резервација за Точка {0}, на пример количината или сума е 0"
@@ -2539,7 +2447,6 @@
 DocType: Issue,Opening Date,Отворање датум
 DocType: Journal Entry,Remark,Напомена
 DocType: Purchase Receipt Item,Rate and Amount,Стапка и износот
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +95,Boring,Досадни
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +667,From Sales Order,Од Продај Побарувања
 DocType: Blog Category,Parent Website Route,Родител вебсајт Пат
 DocType: Sales Order,Not Billed,Не Опишан
@@ -2553,19 +2460,17 @@
 apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount Amount,Износ попуст
 DocType: Purchase Invoice,Return Against Purchase Invoice,Врати против Набавка Фактура
 DocType: Item,Warranty Period (in days),Гарантниот период (во денови)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +550,e.g. VAT,на пример ДДВ
+apps/erpnext/erpnext/public/js/setup_wizard.js +292,e.g. VAT,на пример ДДВ
 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,Серија цитат
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +52,"An item exists with same name ({0}), please change the item group name or rename the item","Ставка постои со исто име ({0}), ве молиме да го смени името на ставката група или преименување на точка"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +82,Hot metal gas forming,Формирање жешки метални гас
 DocType: Sales Order Item,Sales Order Date,Продажбата на Ред Датум
 DocType: Sales Invoice Item,Delivered Qty,Дадени Количина
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +63,Warehouse {0}: Company is mandatory,Магацински {0}: Компанијата е задолжително
 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.",Оди до соодветната група (обично Извор на фондови&gt; Тековни обврски&gt; даноци и давачки и да се создаде нова сметка (со кликање на Додади детето) од типот &quot;данок&quot; и се спомнуваат на даночната стапка.
 ,Payment Period Based On Invoice Date,Плаќање период врз основа на датум на фактурата
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +50,Missing Currency Exchange Rates for {0},Недостасува размена на валута стапки за {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +135,Laser cutting,Ласерско сечење
 DocType: Event,Monday,Понеделник
 DocType: Journal Entry,Stock Entry,Акции Влегување
 DocType: Account,Payable,Треба да се плати
@@ -2598,7 +2503,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +111,Date Of Retirement must be greater than Date of Joining,Денот на неговото пензионирање мора да биде поголема од датумот на пристап
 DocType: Sales Invoice,Against Income Account,Против профил доход
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +69,{0}% Delivered,{0}% Дадени
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +78,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Точка {0}: Нареди Количина {1} не може да биде помала од минималната Количина налог {2} (што е дефинирано во точка).
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Точка {0}: Нареди Количина {1} не може да биде помала од минималната Количина налог {2} (што е дефинирано во точка).
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Месечен Процентуална распределба
 DocType: Territory,Territory Targets,Територија Цели
 DocType: Delivery Note,Transporter Info,Превозникот Информации
@@ -2607,7 +2512,6 @@
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,Наслови за печатење шаблони пр проформа фактура.
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +140,Valuation type charges can not marked as Inclusive,Трошоци тип вреднување не може да го означи како Инклузивна
 DocType: POS Profile,Update Stock,Ажурирање берза
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +128,Superfinishing,Superfinishing
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,Различни UOM за предмети ќе доведе до неточни (Вкупно) Нето вредноста на тежината. Бидете сигурни дека нето-тежината на секоја ставка е во иста UOM.
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,Бум стапка
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +85,Please pull items from Delivery Note,Ве молиме да се повлече предмети од Испратница
@@ -2622,7 +2526,6 @@
 ,Purchase Analytics,Купување анализи
 DocType: Sales Invoice Item,Delivery Note Item,Испратница Точка
 DocType: Expense Claim,Task,Задача
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +57,Shaving,Бричење
 DocType: Purchase Taxes and Charges,Reference Row #,Референтен Ред #
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},Серија број е задолжително за Точка {0}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js +14,This is a root sales person and cannot be edited.,Ова е лице корен продажба и не може да се уредува.
@@ -2634,13 +2537,11 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +74,Purpose must be one of {0},Целта мора да биде еден од {0}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +108,Fill the form and save it,Пополнете го формуларот и го спаси
 DocType: Production Planning Tool,Download a report containing all raw materials with their latest inventory status,Преземете извештај кој ги содржи сите суровини со најновите статусот инвентар
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +94,Facing,Со кои се соочува
 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: Time Log,Billable,Фактурираните
-DocType: Authorization Rule,This will be used for setting rule in HR module,Ова ќе се користи за поставување на власт во човечки ресурси модул
 DocType: Account,Rate at which this tax is applied,Стапка по која се применува овој данок
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reorder Qty,Пренареждане Количина
 DocType: Company,Stock Adjustment Account,Акциите прилагодување профил
@@ -2667,16 +2568,15 @@
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,Процент распределба треба да биде еднаква на 100%
 DocType: Serial No,Out of AMC,Од АМЦ
 DocType: Purchase Order Item,Material Request Detail No,Материјал Барање Детална Не
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +97,Hard turning,Хард пресвртна
 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 +79,Company (not Customer or Supplier) master.,Компанијата (не клиент или добавувач) господар.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +106,Please enter 'Expected Delivery Date',Ве молиме внесете &#39;очекува испорака датум &quot;
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +187,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Испорака белешки {0} мора да биде укинат пред да го раскине овој Продај Побарувања
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +100,Please enter 'Expected Delivery Date',Ве молиме внесете &#39;очекува испорака датум &quot;
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +182,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Испорака белешки {0} мора да биде укинат пред да го раскине овој Продај Побарувања
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +373,Paid amount + Write Off Amount can not be greater than Grand Total,Уплатениот износ + отпише сума не може да биде поголема од Гранд Вкупно
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} не е валиден сериски број за ставката {1}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,Note: There is not enough leave balance for Leave Type {0},Забелешка: Не е доволно одмор биланс за Оставете Тип {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +124,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,Можност Тип
@@ -2688,7 +2588,7 @@
 DocType: Hub Settings,Publish Availability,Објавуваат Достапност
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +105,Date of Birth cannot be greater than today.,Датум на раѓање не може да биде поголема отколку денес.
 ,Stock Ageing,Акции стареење
-apps/erpnext/erpnext/controllers/accounts_controller.py +200,{0} '{1}' is disabled,{0} {1} &quot;е оневозможено
+apps/erpnext/erpnext/controllers/accounts_controller.py +201,{0} '{1}' is disabled,{0} {1} &quot;е оневозможено
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Постави како отворено
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Испрати автоматски пораки до контакти за доставување на трансакции.
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +232,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
@@ -2697,44 +2597,38 @@
 DocType: Purchase Order,Customer Contact Email,Контакт е-маил клиент
 DocType: Event,Sunday,Недела
 DocType: Sales Team,Contribution (%),Придонес (%)
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +455,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,"Забелешка: Плаќањето за влез нема да бидат направивме од &quot;Пари или банкарска сметка &#39;не е одредено,"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +171,Responsibilities,Одговорности
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +457,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,"Забелешка: Плаќањето за влез нема да бидат направивме од &quot;Пари или банкарска сметка &#39;не е одредено,"
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +171,Responsibilities,Одговорности
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,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,Ве молиме внесете барем 1 фактура во табелата
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +511,Add Users,Додади корисници
+apps/erpnext/erpnext/public/js/setup_wizard.js +255,Add Users,Додади корисници
 DocType: Pricing Rule,Item Group,Точка група
 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),Даноци и давачки Додадено (Фирма валута)
-apps/erpnext/erpnext/stock/doctype/item/item.py +340,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Точка Даночниот спор во {0} мора да има предвид типот Данок или на приход или трошок или Наплатлив
+apps/erpnext/erpnext/stock/doctype/item/item.py +344,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Точка Даночниот спор во {0} мора да има предвид типот Данок или на приход или трошок или Наплатлив
 DocType: Sales Order,Partly Billed,Делумно Опишан
 DocType: Item,Default BOM,Стандардно Бум
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +79,Decambering,Decambering
 apps/erpnext/erpnext/setup/doctype/company/company.js +22,Please re-type company name to confirm,Ве молиме име ре-вид на компанија за да се потврди
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,Вкупно Најдобро Амт
 DocType: Time Log Batch,Total Hours,Вкупно часови
 DocType: Journal Entry,Printing Settings,Поставки за печатење
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +268,Total Debit must be equal to Total Credit. The difference is {0},Вкупно Дебитна мора да биде еднаков Вкупно кредит. Разликата е {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +11,Automotive,Автомобилски
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +37,Item is required,Е потребно точка
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +25,Metal injection molding,Метал шприц
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +258,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/accounts/doctype/sales_invoice/sales_invoice.js +684,From Delivery Note,Од Испратница
 DocType: Time Log,From Time,Од време
 DocType: Notification Control,Custom Message,Прилагодено порака
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +33,Investment Banking,Инвестициско банкарство
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +261,"Select your Country, Time Zone and Currency","Изберете ја вашата земја, временска зона и валута"
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,Инвестициско банкарство
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +316,"Select your Country, Time Zone and Currency","Изберете ја вашата земја, временска зона и валута"
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +369,Cash or Bank Account is mandatory for making payment entry,Парични средства или банкарска сметка е задолжително за правење влез плаќање
 DocType: Purchase Invoice,Price List Exchange Rate,Ценовник курс
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +91,Pickling,Мариноване
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +18,Sand casting,Песок кастинг
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +117,Electroplating,Галванизација
 DocType: Purchase Invoice Item,Rate,Стапка
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +62,Intern,Практикант
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Intern,Практикант
 DocType: Newsletter,A Lead with this email id should exist,Водечки со оваа е-мејл проект треба да постои
 DocType: Stock Entry,From BOM,Од бирото
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +34,Basic,Основни
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +34,Basic,Основни
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,На акции трансакции пред {0} се замрзнати
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +217,Please click on 'Generate Schedule',Ве молиме кликнете на &quot;Генерирање Распоред &#39;
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +61,To Date should be same as From Date for Half Day leave,Датум треба да биде иста како и од датумот за половина ден одмор
@@ -2742,10 +2636,10 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +96,Reference No is mandatory if you entered Reference Date,Референтен број е задолжително ако влезе референтен датум
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +108,Date of Joining must be greater than Date of Birth,Датум на приклучување мора да биде поголем Датум на раѓање
 DocType: Salary Structure,Salary Structure,Структура плата
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +242,"Multiple Price Rule exists with same criteria, please resolve \
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +246,"Multiple Price Rule exists with same criteria, please resolve \
 			conflict by assigning priority. Price Rules: {0}","Повеќе Цена правило постои со истите критериуми, ве молиме решавање \ конфликт со давање приоритет. Цена Правила: {0}"
 DocType: Account,Bank,Банка
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +9,Airline,Авиокомпанијата
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,Авиокомпанијата
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +493,Issue Material,Материјал прашање
 DocType: Material Request Item,For Warehouse,За Магацински
 DocType: Employee,Offer Date,Датум на понуда
@@ -2755,29 +2649,24 @@
 DocType: Item,Is Fixed Asset Item,Е фиксни средства Точка
 DocType: Stock Entry,Including items for sub assemblies,Вклучувајќи и предмети за суб собранија
 DocType: Features Setup,"If you have long print formats, this feature can be used to split the page to be printed on multiple pages with all headers and footers on each page","Ако имате долга формати за печатење, оваа функција може да се користи за разделување на страницата треба да се печати на повеќе страници со сите заглавјето и подножјето на секоја страница"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +131,Hobbing,Hobbing
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +98,All Territories,Сите територии
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +98,All Territories,Сите територии
 DocType: Purchase Invoice,Items,Теми
 DocType: Fiscal Year,Year Name,Име година
 DocType: Process Payroll,Process Payroll,Процесот Даноци
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +59,There are more holidays than working days this month.,Постојат повеќе одмори од работни дена овој месец.
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +68,There are more holidays than working days this month.,Постојат повеќе одмори од работни дена овој месец.
 DocType: Product Bundle Item,Product Bundle Item,Производ Бовча Точка
 DocType: Sales Partner,Sales Partner Name,Продажбата партнер Име
 DocType: Purchase Invoice Item,Image View,Слика Види
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +113,Finishing & industrial finishing,Доработка и индустриски завршна обработка
 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/page/setup_wizard/fixtures/industry_type.py +46,Securities & Commodity Exchanges,Хартии од вредност и стоковни берзи
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Хартии од вредност и стоковни берзи
 DocType: Shipping Rule,Calculate Based On,Се пресмета врз основа на
 DocType: Delivery Note Item,From Warehouse,Од магацин
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +98,Drilling,Дупчење
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +28,Blow molding,Калапи удар
 DocType: Purchase Taxes and Charges,Valuation and Total,Вреднување и вкупно
 DocType: Tax Rule,Shipping City,Превозот Сити
 apps/erpnext/erpnext/stock/doctype/item/item.js +43,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,Оваа содржина е варијанта на {0} (дефиниција). Атрибути ќе бидат копирани во текот од дефиниција освен ако е &quot;Не Копирај&quot; е поставена
 DocType: Account,Purchase User,Набавка пристап
 DocType: Notification Control,Customize the Notification,Персонализација на известувањето
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +87,Hammering,Ковале
 DocType: Web Page,Slideshow,Слајдшоу
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +24,Default Address Template cannot be deleted,Стандардно адреса Шаблон не може да се избришат
 DocType: Sales Invoice,Shipping Rule,Испорака Правило
@@ -2786,9 +2675,8 @@
 DocType: Workflow State,Search,Барај
 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,&quot;Дена од денот на Ред&quot; мора да биде поголем или еднаков на нула
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +142,Brazing,Лемење
 DocType: C-Form,Amended From,Изменет Од
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Raw Material,Суровина
+apps/erpnext/erpnext/public/js/setup_wizard.js +359,Raw Material,Суровина
 DocType: Leave Application,Follow via Email,Следете ги преку E-mail
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Износот на данокот По Износ попуст
 apps/erpnext/erpnext/accounts/doctype/account/account.py +174,Child account exists for this account. You can not delete this account.,Сметка детето постои за оваа сметка. Не можете да ја избришете оваа сметка.
@@ -2802,10 +2690,10 @@
 ,Produced,Произведени
 DocType: Item,Item Code for Suppliers,Точка Код за добавувачи
 DocType: Issue,Raised By (Email),Покренати од страна на (E-mail)
-apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +72,General,Генералниот
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +495,Attach Letterhead,Прикачи меморандум
+apps/erpnext/erpnext/setup/setup_wizard/default_website.py +72,General,Генералниот
+apps/erpnext/erpnext/public/js/setup_wizard.js +241,Attach Letterhead,Прикачи меморандум
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +272,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',Не може да се одбие кога категорија е наменета за &quot;Вреднување&quot; или &quot;вреднување и вкупно&quot;
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +542,"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/public/js/setup_wizard.js +284,"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}
 DocType: Journal Entry,Bank Entry,Банката Влегување
 DocType: Authorization Rule,Applicable To (Designation),Применливи To (Означување)
@@ -2814,32 +2702,31 @@
 apps/erpnext/erpnext/config/accounts.py +143,Enable / disable currencies.,Овозможи / оневозможи валути.
 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),Вкупно (АМТ)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +26,Entertainment & Leisure,Забава &amp; Leisure
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,Забава &amp; Leisure
 DocType: Purchase Order,The date on which recurring order will be stop,Датумот на кој периодично да се запре
 DocType: Quality Inspection,Item Serial No,Точка Сериски Не
 apps/erpnext/erpnext/controllers/status_updater.py +142,{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 +57,Total Present,Вкупно Тековен
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Hour,Час
+apps/erpnext/erpnext/public/js/setup_wizard.js +363,Hour,Час
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +138,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation",Серијали Точка {0} не може да се ажурира \ користење на берза за помирување
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +488,Transfer Material to Supplier,Пренос на материјал за да Добавувачот
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +513,Transfer Material to Supplier,Пренос на материјал за да Добавувачот
 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/crm/doctype/opportunity/opportunity.js +82,Create Quotation,Креирај цитат
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +306,All these items have already been invoiced,Сите овие предмети веќе се фактурира
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,You are not authorized to approve leaves on Block Dates,Немате дозвола да го одобри лисјата Забрани Термини
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +311,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/setup/page/setup_wizard/fixtures/operations.py +83,Curling,Виткање
 DocType: Account,Tax,Данок
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +28,Row {0}: {1} is not a valid {2},Ред {0}: {1} не е валиден {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +89,Refining,Рафинирање
+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,Алатка за производство планирање
 DocType: Quality Inspection,Report Date,Датум на извештајот
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +130,Routing,Рутирање
 DocType: C-Form,Invoices,Фактури
 DocType: Job Opening,Job Title,Работно место
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +54,{0} already allocated for Employee {1} for period {2} - {3},{0} веќе наменети за вработените {1} за период {2} - {3}
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +80,{0} Recipients,{0} Примателите
 DocType: Features Setup,Item Groups in Details,Точка групи во Детали
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +335,Quantity to Manufacture must be greater than 0.,Количина за производство мора да биде поголем од 0.
@@ -2857,14 +2744,13 @@
 DocType: DocType,Setup,Подесување
 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,Резиме за овој месец и во очекување на активности
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +39,Cold rolling,Ладно валање
 DocType: Customer Group,Customer Group Name,Клиент Име на групата
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +408,Please remove this Invoice {0} from C-Form {1},Ве молиме да се отстрани оваа фактура {0} од C-Форма {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +410,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,Атрибути
 DocType: Packing Slip,Get Items,Се предмети
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +186,Please enter Write Off Account,Ве молиме внесете го отпише профил
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +187,Please enter Write Off Account,Ве молиме внесете го отпише профил
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +71,Last Order Date,Последните Ред Датум
 DocType: DocField,Image,Слика
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +179,Make Excise Invoice,Направете акцизи Фактура
@@ -2874,7 +2760,7 @@
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +146,Operation ID not set,Операција проект не е поставена
 DocType: Production Order,Planned Start Date,Планираниот почеток Датум
 DocType: Serial No,Creation Document Type,Креирање Вид на документ
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +620,Maint. Visit,Maint. Посетата
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +631,Maint. Visit,Maint. Посетата
 DocType: Leave Type,Is Encash,Е инкасирам
 DocType: Purchase Invoice,Mobile No,Мобилни Не
 DocType: Payment Tool,Make Journal Entry,Направете весник Влегување
@@ -2882,35 +2768,31 @@
 apps/erpnext/erpnext/controllers/trends.py +257,Project-wise data is not available for Quotation,Проект-мудар податоци не се достапни за котација
 DocType: Project,Expected End Date,Се очекува Крај Датум
 DocType: Appraisal Template,Appraisal Template Title,Процена Шаблон Наслов
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +440,Commercial,Комерцијален
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +378,Commercial,Комерцијален
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +23,Parent Item {0} must not be a Stock Item,Родител Точка {0} не мора да биде Акции Точка
 DocType: Cost Center,Distribution Id,Id дистрибуција
-apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +14,Awesome Services,Прекрасно Услуги
+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,Добавувачот адреса
 DocType: Contact Us Settings,Address Line 2,Адреса Линија 2
 DocType: ToDo,Reference,Референтен
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +59,Perforating,Perforating
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,Од Количина
 apps/erpnext/erpnext/config/accounts.py +128,Rules to calculate shipping amount for a sale,Правила за да се пресмета износот превозот за продажба
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +29,Series is mandatory,Серија е задолжително
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +28,Financial Services,Финансиски Услуги
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,Финансиски Услуги
 apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3},Вредноста за атрибутот {0} мора да биде во рамките на опсегот на {1} до {2} во зголемувања од {3}
 DocType: Tax Rule,Sales,Продажба
 DocType: Stock Entry Detail,Basic Amount,Основицата
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +173,Warehouse required for stock Item {0},Магацински потребни за акции Точка {0}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +178,Warehouse required for stock Item {0},Магацински потребни за акции Точка {0}
 DocType: Leave Allocation,Unused leaves,Неискористени листови
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,Cr
 DocType: Customer,Default Receivable Accounts,Стандардно сметки побарувања
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +102,Sawing,Пила
 DocType: Tax Rule,Billing State,Платежна држава
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +32,Laminating,Ламиниране
 DocType: Item Reorder,Transfer,Трансфер
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +549,Fetch exploded BOM (including sub-assemblies),Земи експлодира Бум (вклучувајќи ги и потсклопови)
 DocType: Authorization Rule,Applicable To (Employee),Применливи To (вработените)
 apps/erpnext/erpnext/controllers/accounts_controller.py +101,Due Date is mandatory,Поради Датум е задолжително
 apps/erpnext/erpnext/controllers/item_variant.py +51,Increment for Attribute {0} cannot be 0,Интервалот за Атрибут {0} не може да биде 0
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +143,Sintering,Синтерување
 DocType: Journal Entry,Pay To / Recd From,Да се ​​плати / Recd Од
 DocType: Naming Series,Setup Series,Подесување Серија
 DocType: Supplier,Contact HTML,Контакт HTML
@@ -2923,7 +2805,6 @@
 DocType: Attendance,Absent,Отсутен
 DocType: Product Bundle,Product Bundle,Производ Бовча
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +180,Row {0}: Invalid reference {1},Ред {0}: Невалидна референца {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +165,Crushing,Дробење
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Купување на даноци и такси Шаблон
 DocType: Upload Attendance,Download Template,Преземи Шаблон
 DocType: GL Entry,Remarks,Забелешки
@@ -2931,14 +2812,12 @@
 DocType: Journal Entry,Write Off Based On,Отпише врз основа на
 DocType: Features Setup,POS View,POS View
 apps/erpnext/erpnext/config/stock.py +38,Installation record for a Serial No.,Инсталација рекорд за сериски број
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +9,Continuous casting,Континуирано леење
 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/setup/page/setup_wizard/fixtures/operations.py +80,Cold sizing,Студената големината
 DocType: Salary Slip,Earning & Deduction,Заработувајќи &amp; Одбивање
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +76,Account {0} cannot be a Group,На сметка {0} не може да биде група
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +259,Region,Регионот
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +314,Region,Регионот
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +213,Optional. This setting will be used to filter in various transactions.,Опционални. Оваа поставка ќе се користи за филтрирање на различни трансакции.
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +104,Negative Valuation Rate is not allowed,Негативни Вреднување стапка не е дозволено
 DocType: Holiday List,Weekly Off,Неделен Off
@@ -2956,7 +2835,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,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,Публика од денот и Публика во тек е задолжително
-apps/erpnext/erpnext/controllers/buying_controller.py +131,Please enter 'Is Subcontracted' as Yes or No,"Ве молиме внесете &#39;се дава под договор &quot;, како Да или Не"
+apps/erpnext/erpnext/controllers/buying_controller.py +122,Please enter 'Is Subcontracted' as Yes or No,"Ве молиме внесете &#39;се дава под договор &quot;, како Да или Не"
 DocType: Sales Team,Contact No.,Контакт број
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,'Profit and Loss' type account {0} not allowed in Opening Entry,&quot;Добивка и загуба&quot; тип на сметка {0} не е дозволено во Отворање Влегување
 DocType: Workflow State,Time,Време
@@ -2965,14 +2844,13 @@
 DocType: Authorization Rule,Authorization Rule,Овластување Правило
 DocType: Sales Invoice,Terms and Conditions Details,Услови и правила Детали за
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,Продажбата на даноци и такси Шаблон
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +10,Apparel & Accessories,Облека и додатоци
+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,Број на нарачка
 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 +121,Add Child,Додади детето
 DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,Улогата дозволено да го поставите замрзнати сметки &amp; Уреди Замрзнати записи
 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/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +47,Conversion Factor is required,Се бара Фактор на конверзија
 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,Вредност / Опис
@@ -2980,10 +2858,8 @@
 ,Customers Not Buying Since Long Time,"Клиентите не за купување, бидејќи долго време"
 DocType: Production Order,Expected Delivery Date,Се очекува испорака датум
 apps/erpnext/erpnext/accounts/general_ledger.py +121,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Дебитни и кредитни не се еднакви за {0} # {1}. Разликата е во тоа {2}.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +48,Bulging,Издут
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +11,Evaporative-pattern casting,Кастинг испарување-модел
 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 +195,Sales Invoice {0} must be cancelled before cancelling this Sales Order,Продај фактура {0} мора да биде укинат пред да го раскине овој Продај Побарувања
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +190,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."
@@ -3002,26 +2878,24 @@
 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 +241,Account: {0} with currency: {1} can not be selected,Сметка: {0} со валутна: не може да се одбрани {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +242,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 +47,Account {0}: Parent account {1} does not belong to company: {2},На сметка {0}: Родител на сметка {1} не припаѓа на компанијата: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted all transactions related to this company!,Успешно избришани сите трансакции поврзани со оваа компанија!
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,Како на датум
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +111,Honing,Усовршувајќи
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +58,Probation,Условна казна
-apps/erpnext/erpnext/stock/doctype/item/item.py +264,Default Warehouse is mandatory for stock Item.,Стандардно Магацински е задолжително за акциите точка.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Probation,Условна казна
+apps/erpnext/erpnext/stock/doctype/item/item.py +268,Default Warehouse is mandatory for stock Item.,Стандардно Магацински е задолжително за акциите точка.
 DocType: Feed,Full Name,Целосно име
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +148,Clinching,Clinching
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +191,Payment of salary for the month {0} and year {1},Исплата на плата за месец {0} и годината {1}
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +173,Payment of salary for the month {0} and year {1},Исплата на плата за месец {0} и годината {1}
 DocType: Stock Settings,Auto insert Price List rate if missing,Авто вметнете Ценовник стапка ако недостасува
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,Вкупно исплатен износ
 ,Transferred Qty,Пренесува Количина
 apps/erpnext/erpnext/config/learn.py +11,Navigating,Навигацијата
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +137,Planning,Планирање
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +137,Planning,Планирање
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +9,Make Time Log Batch,Најдете време Пријавете се Batch
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Issued,Издадени
 DocType: Project,Total Billing Amount (via Time Logs),Вкупно регистрации Износ (преку Време на дневници)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +629,We sell this Item,Ние продаваме Оваа содржина
+apps/erpnext/erpnext/public/js/setup_wizard.js +365,We sell this Item,Ние продаваме Оваа содржина
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +65,Supplier Id,Id снабдувач
 DocType: Journal Entry,Cash Entry,Кеш Влегување
 DocType: Sales Partner,Contact Desc,Контакт Desc
@@ -3030,18 +2904,16 @@
 DocType: Brand,Item Manager,Точка менаџер
 DocType: Cost Center,Add rows to set annual budgets on Accounts.,Додадете редови да го поставите на годишниот буџет на сметки.
 DocType: Buying Settings,Default Supplier Type,Стандардно Добавувачот Тип
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +160,Quarrying,Вадење на камен
 DocType: Production Order,Total Operating Cost,Вкупно оперативни трошоци
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +160,Note: Item {0} entered multiple times,Забелешка: Точката {0} влегоа неколку пати
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +163,Note: Item {0} entered multiple times,Забелешка: Точката {0} влегоа неколку пати
 apps/erpnext/erpnext/config/crm.py +27,All Contacts.,Сите контакти.
 DocType: Newsletter,Test Email Id,Тест-мејл ID
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +394,Company Abbreviation,Компанијата Кратенка
+apps/erpnext/erpnext/public/js/setup_wizard.js +142,Company Abbreviation,Компанијата Кратенка
 DocType: Features Setup,If you follow Quality Inspection. Enables Item QA Required and QA No in Purchase Receipt,Ако ги следите испитување квалитет. Овозможува точка ОК задолжителни и ОК Не во Набавка Потврда
 DocType: GL Entry,Party Type,Партијата Тип
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +68,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,Не authroized од {0} надминува граници
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +30,Rotational molding,Ротациона лиење
 apps/erpnext/erpnext/config/hr.py +115,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,Постави Данок Правило за количката
@@ -3055,15 +2927,15 @@
 apps/erpnext/erpnext/config/selling.py +18,Quotes to Leads or Customers.,Цитати да се води или клиенти.
 DocType: Stock Settings,Role Allowed to edit frozen stock,Улогата дозволено да ја менувате замрзнати акции
 ,Territory Target Variance Item Group-Wise,Територија Целна Варијанса Точка група-wise
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +101,All Customer Groups,Сите групи потрошувачи
-apps/erpnext/erpnext/controllers/accounts_controller.py +474,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} е задолжително. Можеби рекорд размена на валута не е создадена за {1} до {2}.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +101,All Customer Groups,Сите групи потрошувачи
+apps/erpnext/erpnext/controllers/accounts_controller.py +475,{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 +41,Account {0}: Parent account {1} does not exist,На сметка {0}: Родител на сметка {1} не постои
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Ценовник стапка (Фирма валута)
 DocType: Account,Temporary,Привремено
 DocType: Address,Preferred Billing Address,Најпосакувана платежна адреса
 DocType: Monthly Distribution Percentage,Percentage Allocation,Процент Распределба
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +86,Secretary,Секретар
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Secretary,Секретар
 DocType: Serial No,Distinct unit of an Item,Посебна единица на Точка
 DocType: Pricing Rule,Buying,Купување
 DocType: HR Settings,Employee Records to be created by,Вработен евиденција да бидат создадени од страна
@@ -3076,9 +2948,8 @@
 ,Item-wise Price List Rate,Точка-мудар Ценовник стапка
 DocType: Purchase Order Item,Supplier Quotation,Добавувачот цитат
 DocType: Quotation,In Words will be visible once you save the Quotation.,Во Зборови ќе бидат видливи откако ќе го спаси котација.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +68,Ironing,Пеглање
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is stopped,{0} {1} е запрен
-apps/erpnext/erpnext/stock/doctype/item/item.py +352,Barcode {0} already used in Item {1},Баркод {0} веќе се користи во точка {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +356,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/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,Престојни настани
@@ -3087,27 +2958,25 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +27,Quick Entry,Брз влез
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0} е задолжително за враќање
 DocType: Purchase Order,To Receive,За да добиете
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +33,Shrink fitting,Се намалува фитинг
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +522,user@example.com,user@example.com
+apps/erpnext/erpnext/public/js/setup_wizard.js +266,user@example.com,user@example.com
 DocType: Email Digest,Income / Expense,Приходи / расходи
 DocType: Employee,Personal Email,Личен е-маил
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +58,Total Variance,Вкупната варијанса
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +62,Total Variance,Вкупната варијанса
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.","Ако е овозможено, системот ќе ја објавите на сметководствените ставки за попис автоматски."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +15,Brokerage,Брокерски
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +15,Brokerage,Брокерски
 DocType: Address,Postal Code,поштенски код
 DocType: Production Order Operation,"in Minutes
 Updated via 'Time Log'",во минути освежено преку &quot;Време Вклучи се &#39;
 DocType: Customer,From Lead,Од олово
 apps/erpnext/erpnext/config/manufacturing.py +19,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 +442,POS Profile required to make POS Entry,POS Профил потребно да се направи ПОС Влегување
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +444,POS Profile required to make POS Entry,POS Профил потребно да се направи ПОС Влегување
 DocType: Hub Settings,Name Token,Име знак
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +106,Planing,Планирање
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Selling,Стандардна Продажба
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +120,Standard Selling,Стандардна Продажба
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +137,Atleast one warehouse is mandatory,Барем еден магацин е задолжително
 DocType: Serial No,Out of Warranty,Надвор од гаранција
 DocType: BOM Replace Tool,Replace,Заменете
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +314,{0} against Sales Invoice {1},{0} против Продај фактура {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +316,{0} against Sales Invoice {1},{0} против Продај фактура {1}
 apps/erpnext/erpnext/stock/doctype/item/item.py +49,Please enter default Unit of Measure,Ве молиме внесете го стандардно единица мерка
 DocType: Purchase Invoice Item,Project Name,Име на проектот
 DocType: Supplier,Mention if non-standard receivable account,Наведе ако нестандардни побарувања сметка
@@ -3123,9 +2992,8 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,Journal Entry {0} does not have account {1} or already matched against other voucher,Весник Влегување {0} нема сметка {1} или веќе се споредуваат со други ваучер
 DocType: Item,Moving Average,Се движат просек
 DocType: BOM Replace Tool,The BOM which will be replaced,Бум на која ќе биде заменет
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +43,New Stock UOM must be different from current stock UOM,Нова берза UOM мора да бидат различни од сегашните акции UOM
 DocType: Account,Debit,Дебитна
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +34,Leaves must be allocated in multiples of 0.5,"Листови мора да бидат распределени во мултипли од 0,5"
+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/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,Најдобро Амт
@@ -3143,8 +3011,7 @@
 DocType: Employee,Internal Work History,Внатрешна работа Историја
 DocType: DocField,Column Break,Колона Break
 DocType: Event,Thursday,Четврток
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +42,Private Equity,Приватни инвестициски фондови
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +93,Turning,Претворајќи
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,Приватни инвестициски фондови
 DocType: Maintenance Visit,Customer Feedback,Клиент повратни информации
 DocType: Account,Expense,Сметка
 DocType: Sales Invoice,Exhibition,Изложба
@@ -3157,19 +3024,19 @@
 DocType: Employee,Held On,Одржана на
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +33,Production Item,Производство Точка
 ,Employee Information,Вработен информации
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,Rate (%),Стапка (%)
+apps/erpnext/erpnext/public/js/setup_wizard.js +294,Rate (%),Стапка (%)
 DocType: Stock Entry Detail,Additional Cost,Дополнителни трошоци
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +407,Financial Year End Date,Финансиска година Крај Датум
+apps/erpnext/erpnext/public/js/setup_wizard.js +155,Financial Year End Date,Финансиска година Крај Датум
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Voucher No, if grouped by Voucher","Не може да се филтрираат врз основа на ваучер Не, ако се групираат според ваучер"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +484,Make Supplier Quotation,Направете Добавувачот цитат
 DocType: Quality Inspection,Incoming,Дојдовни
 DocType: BOM,Materials Required (Exploded),Потребни материјали (експлодира)
 DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),Намалување на заработка за неплатено отсуство (LWP)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +512,"Add users to your organization, other than yourself","Додади корисниците на вашата организација, освен себе"
+apps/erpnext/erpnext/public/js/setup_wizard.js +256,"Add users to your organization, other than yourself","Додади корисниците на вашата организација, освен себе"
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No {1} does not match with {2} {3},Ред # {0}: Сериски Не {1} не се совпаѓа со {2} {3}
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +44,Casual Leave,Обичните Leave
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +44,Casual Leave,Обичните Leave
 DocType: Batch,Batch ID,Серија проект
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +334,Note: {0},Забелешка: {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +336,Note: {0},Забелешка: {0}
 ,Delivery Note Trends,Испратница трендови
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +104,This Week's Summary,Краток преглед на оваа недела
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +74,{0} must be a Purchased or Sub-Contracted Item in row {1},{0} мора да биде купена или под-договор ставка во ред {1}
@@ -3181,7 +3048,7 @@
 DocType: Purchase Receipt,Return Against Purchase Receipt,Врати против Набавка Потврда
 DocType: Purchase Order,To Bill,Бил
 DocType: Material Request,% Ordered,Нареди%
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +61,Piecework,Плаќаат на парче
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Piecework,Плаќаат на парче
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +64,Avg. Buying Rate,Ср. Купување стапка
 DocType: Task,Actual Time (in Hours),Крај на времето (во часови)
 DocType: Employee,History In Company,Во историјата на компанијата
@@ -3198,13 +3065,13 @@
 DocType: Opportunity,To Discuss,За да дискутираат
 DocType: SMS Settings,SMS Settings,SMS Settings
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +60,Temporary Accounts,Привремени сметки
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +155,Black,Црна
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Black,Црна
 DocType: BOM Explosion Item,BOM Explosion Item,Бум експлозија Точка
 DocType: Account,Auditor,Ревизор
 DocType: Purchase Order,End date of current order's period,Датум на завршување на периодот тековниот ред е
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +17,Make Offer Letter,Направете Понуда писмо
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +10,Return,Враќање
-apps/erpnext/erpnext/stock/doctype/item/item.py +503,Default Unit of Measure for Variant must be same as Template,Стандардно единица мерка за варијанта мора да биде иста како Шаблон
+apps/erpnext/erpnext/stock/doctype/item/item.py +507,Default Unit of Measure for Variant must be same as Template,Стандардно единица мерка за варијанта мора да биде иста како Шаблон
 DocType: DocField,Fold,Пати
 DocType: Production Order Operation,Production Order Operation,Производството со цел Операција
 DocType: Pricing Rule,Disable,Оневозможи
@@ -3215,13 +3082,12 @@
 DocType: Page,Page Name,Страница Име
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +110,To Time must be greater than From Time,На време мора да биде поголем од Time
 DocType: Journal Entry Account,Exchange Rate,На девизниот курс
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +465,Sales Order {0} is not submitted,Продај Побарувања {0} не е поднесен
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +467,Sales Order {0} is not submitted,Продај Побарувања {0} не е поднесен
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0}: Parent account {1} does not bolong to the company {2},Магацински {0}: Родител на сметка {1} не bolong на компанијата {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +124,Spindle finishing,Вретено завршна обработка
 DocType: BOM,Last Purchase Rate,Последните Набавка стапка
 DocType: Account,Asset,Средства
 DocType: Project Task,Task ID,Задача проект
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +395,"e.g. ""MC""","на пример, &quot;MC&quot;"
+apps/erpnext/erpnext/public/js/setup_wizard.js +143,"e.g. ""MC""","на пример, &quot;MC&quot;"
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,Stock cannot exist for Item {0} since has variants,Акции не може да постои на точка {0} бидејќи има варијанти
 ,Sales Person-wise Transaction Summary,Продажбата на лице-мудар Преглед на трансакциите
 DocType: System Settings,Time Zone,Временска зона
@@ -3230,9 +3096,7 @@
 DocType: Monthly Distribution,Monthly Distribution Percentages,Месечен Процентите Дистрибуција
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +16,The selected item cannot have Batch,На избраната ставка не може да има Batch
 DocType: Delivery Note,% of materials delivered against this Delivery Note,% На материјалите доставени од ова за испорака
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +151,Stapling,Хефтање
 DocType: Customer,Customer Details,Детали за корисници
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +105,Shaping,Обликување
 DocType: Employee,Reports to,Извештаи до
 DocType: SMS Settings,Enter url parameter for receiver nos,Внесете URL параметар за примачот бр
 DocType: Sales Invoice,Paid Amount,Уплатениот износ
@@ -3241,13 +3105,13 @@
 DocType: Item Variant,Item Variant,Точка Варијанта
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +15,Setting this Address Template as default as there is no other default,Поставуањето на оваа адреса Шаблон како стандардно што не постои друг стандардно
 apps/erpnext/erpnext/accounts/doctype/account/account.py +89,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Баланс на сметка веќе во Дебитна, не Ви е дозволено да се постави рамнотежа мора да биде &quot;како&quot; кредит &quot;"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +76,Quality Management,Управување со квалитет
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Quality Management,Управување со квалитет
 DocType: Production Planning Tool,Filter based on customer,Филтер врз основа на клиент
 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}
 DocType: Employee External Work History,Employee External Work History,Вработен Надворешни Историја работа
 DocType: Tax Rule,Purchase,Купување
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +34,Balance Qty,Биланс Количина
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Balance Qty,Биланс Количина
 DocType: Item Group,Parent Item Group,Родител Точка група
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +21,{0} for {1},{0} {1}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +96,Cost Centers,Трошковни центри
@@ -3257,12 +3121,12 @@
 DocType: Opportunity,Next Contact,Следна Контакт
 DocType: Employee,Employment Type,Тип на вработување
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,"Основни средства,"
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +84,Application period cannot be across two alocation records,Период апликација не може да биде во две alocation евиденција
 DocType: Item Group,Default Expense Account,Стандардно сметка сметка
 DocType: Employee,Notice (days),Известување (во денови)
 DocType: Page,Yes,Да
 DocType: Tax Rule,Sales Tax Template,Данок на промет Шаблон
 DocType: Employee,Encashment Date,Датум на инкасо
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +74,Electroforming,Electroforming
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +179,"Against Voucher Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Против ваучер типот мора да биде еден од нарачка, купување фактура или весник Влегување"
 DocType: Account,Stock Adjustment,Акциите прилагодување
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +34,Default Activity Cost exists for Activity Type - {0},Постои Цена стандардно активност за Тип на активност - {0}
@@ -3298,12 +3162,12 @@
 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,Дистрибуција
 apps/erpnext/erpnext/public/js/pos/pos.html +36,Amount Paid,Уплатениот износ
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +91,Project Manager,Проект менаџер
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +72,Dispatch,Испраќање
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Project Manager,Проект менаџер
+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: Customer,Default Taxes and Charges,Стандардно даноци и давачки
 DocType: Account,Receivable,Побарувања
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +268,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,Ред # {0}: Не е дозволено да се промени Добавувачот како веќе постои нарачка
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +263,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.","Ако е обележано, Бум за под-собранието предмети ќе се смета за добивање на суровини. Инаку, сите објекти под-собранието ќе бидат третирани како суровина."
@@ -3311,8 +3175,8 @@
 DocType: Hub Settings,Seller Description,Продавачот Опис
 DocType: Employee Education,Qualification,Квалификација
 DocType: Item Price,Item Price,Ставка Цена
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +48,Soap & Detergent,Сапун и детергент
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +36,Motion Picture & Video,Филмски и видео
+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,Нареди
 DocType: Warehouse,Warehouse Name,Магацински Име
 DocType: Naming Series,Select Transaction,Изберете Трансакција
@@ -3321,7 +3185,6 @@
 DocType: BOM,Rate Of Materials Based On,Стапка на материјали врз основа на
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,Поддршка Analtyics
 apps/erpnext/erpnext/accounts/doctype/accounts_settings/accounts_settings.py +27,Company is missing in warehouses {0},Компанијата се водат за исчезнати во магацини {0}
-DocType: Stock UOM Replace Utility,Stock UOM Replace Utility,Акции UOM Заменете комунални
 DocType: POS Profile,Terms and Conditions,Услови и правила
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,To Date should be within the Fiscal Year. Assuming To Date = {0},Датум треба да биде во рамките на фискалната година. Претпоставувајќи Да најдам = {0}
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","Овде можете да одржите висина, тежина, алергии, медицински проблеми итн"
@@ -3333,7 +3196,7 @@
 DocType: Sales Order Item,For Production,За производство
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +103,Please enter sales order in the above table,Ве молиме внесете продажба со цел во горната табела
 DocType: Project Task,View Task,Види Task
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +406,Your financial year begins on,Вашата финансиска година започнува на
+apps/erpnext/erpnext/public/js/setup_wizard.js +154,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: Email Digest,Add/Remove Recipients,Додадете / отстраните примачи
@@ -3341,16 +3204,14 @@
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","Да го поставите на оваа фискална година како стандарден, кликнете на &quot;Постави како стандарден&quot;"
 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 +528,Item variant {0} exists with same attributes,Постои ставка варијанта {0} со истите атрибути
+apps/erpnext/erpnext/stock/doctype/item/item.py +532,Item variant {0} exists with same attributes,Постои ставка варијанта {0} со истите атрибути
 DocType: Salary Slip,Salary Slip,Плата фиш
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +116,Burnishing,Полирање
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +54,'To Date' is required,&quot;Да најдам &#39;е потребен
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,&quot;Да најдам &#39;е потребен
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","Генерирање пакување измолкнува за пакети да бидат испорачани. Се користи за да го извести пакет број, содржината на пакетот и неговата тежина."
 DocType: Sales Invoice Item,Sales Order Item,Продај Побарувања Точка
 DocType: Salary Slip,Payment Days,Плаќање дена
 DocType: BOM,Manage cost of operations,Управување со трошоците на работење
 DocType: Features Setup,Item Advanced,Точка Напредно
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +40,Hot rolling,Топло валање
 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.","Кога било кој од обележаните трансакции се &quot;поднесе&quot;, е-мејл pop-up автоматски се отвори да се испрати е-маил до поврзани &quot;Контакт&quot; во таа трансакција, со трансакцијата како прилог. Корисникот може или не може да го испрати е-мејл."
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,Општи нагодувања
 DocType: Employee Education,Employee Education,Вработен образование
@@ -3363,25 +3224,23 @@
 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/setup/page/setup_wizard/install_fixtures.py +48,Sick Leave,Боледување
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +174,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/page/setup_wizard/fixtures/industry_type.py +22,Department Stores,Одделот на мало
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,Одделот на мало
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +40,System Balance,Систем биланс
 DocType: Workflow,Is Active,Е активен
 apps/erpnext/erpnext/controllers/stock_controller.py +71,No accounting entries for the following warehouses,Не сметководствените ставки за следните магацини
 apps/erpnext/erpnext/projects/doctype/project/project.js +22,Save the document first.,Зачувај го документот во прв план.
 DocType: Account,Chargeable,Наплатени
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +121,Linishing,Linishing
 DocType: Company,Change Abbreviation,Промена Кратенка
 DocType: Workflow State,Primary,Основно
 DocType: Expense Claim Detail,Expense Date,Датум на сметка
 DocType: Item,Max Discount (%),Макс попуст (%)
 DocType: Communication,More Information,Повеќе информации
 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/setup/page/setup_wizard/fixtures/operations.py +161,Blasting,Детонација
 DocType: Company,Warn,Предупреди
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +111,Item valuation updated,Точка вреднување ажурирани
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Било други забелешки, да се спомене напори кои треба да одат во евиденцијата."
 DocType: BOM,Manufacturing User,Производство пристап
 DocType: Purchase Order,Raw Materials Supplied,Суровини Опрема што се испорачува
@@ -3391,7 +3250,7 @@
 DocType: Appraisal,Appraisal Template,Процена Шаблон
 DocType: Communication,Email,Е-пошта
 DocType: Item Group,Item Classification,Точка Класификација
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +89,Business Development Manager,Бизнис менаџер за развој
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Business Development Manager,Бизнис менаџер за развој
 DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,Одржување Посетете Цел
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.js +15,Period,Период
 ,General Ledger,Општи Леџер
@@ -3401,9 +3260,7 @@
 ,Itemwise Recommended Reorder Level,Itemwise Препорачани Пренареждане ниво
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +264,Please select {0} first,Ве молиме изберете {0} Првиот
 DocType: Features Setup,To get Item Group in details table,За да се добие Точка група во детали маса
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +67,Redrawing,Прецртуваат
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +112,Batch {0} of Item {1} has expired.,Серија {0} од точка {1} е истечен.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +120,Etching,Гравирање
 DocType: Sales Invoice,Commission,Комисијата
 DocType: Address Template,"<h4>Default Template</h4>
 <p>Uses <a href=""http://jinja.pocoo.org/docs/templates/"">Jinja Templating</a> and all the fields of Address (including Custom Fields if any) will be available</p>
@@ -3437,7 +3294,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +340,Operation Time must be greater than 0 for Operation {0},Операција на времето мора да биде поголема од 0 за операција {0}
 DocType: Supplier,Address and Contacts,Адреса и контакти
 DocType: UOM Conversion Detail,UOM Conversion Detail,Детална UOM конверзија
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +496,Keep it web friendly 900px (w) by 100px (h),Чувајте го веб пријателски 900px (w) од 100пк (ж)
+apps/erpnext/erpnext/public/js/setup_wizard.js +242,Keep it web friendly 900px (w) by 100px (h),Чувајте го веб пријателски 900px (w) од 100пк (ж)
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +329,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,Земете Најдобро Ваучери
@@ -3453,54 +3310,49 @@
 DocType: Item,Average time taken by the supplier to deliver,Просечно време преземени од страна на снабдувачот да испорача
 DocType: Time Log,Hours,Часа
 DocType: Project,Expected Start Date,Се очекува Почеток Датум
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +38,Rolling,Тркалање
 DocType: ToDo,Priority,Приоритет
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +41,Remove item if charges is not applicable to that item,Отстрани точка ако обвиненијата не се применува на таа ставка
 DocType: Dropbox Backup,Dropbox Access Allowed,Дозволено Dropbox пристап
 DocType: Dropbox Backup,Weekly,Неделен
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,На пр. smsgateway.com/api/send_sms.cgi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +485,Receive,Добивате
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +510,Receive,Добивате
 DocType: Maintenance Visit,Fully Completed,Целосно завршен
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% Целосно
 DocType: Employee,Educational Qualification,Образовните квалификации
 DocType: Workstation,Operating Costs,Оперативни трошоци
 DocType: Employee Leave Approver,Employee Leave Approver,Вработен Остави Approver
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,{0} has been successfully added to our Newsletter list.,{0} е успешно додаден во нашиот листа Билтен.
-apps/erpnext/erpnext/stock/doctype/item/item.py +383,Row {0}: An Reorder entry already exists for this warehouse {1},Ред {0}: Тоа е внесување Пренареждане веќе постои за оваа магацин {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +387,Row {0}: An Reorder entry already exists for this warehouse {1},Ред {0}: Тоа е внесување Пренареждане веќе постои за оваа магацин {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +67,"Cannot declare as lost, because Quotation has been made.","Не може да се декларираат како изгубени, бидејќи цитат е направен."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +133,Electron beam machining,"Електрони, зрак обработка"
 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 +150,Please select Start Date and End Date for Item {0},Ве молиме одберете Start Датум и краен датум за Точка {0}
 apps/erpnext/erpnext/config/stock.py +141,Main Reports,Главни извештаи
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +102,Stock Ledger entries balances updated,Акции Леџер записи салда ажурирани
 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 +176,Add / Edit Prices,Додај / Уреди цени
+apps/erpnext/erpnext/stock/doctype/item/item.js +178,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 +298,My Orders,Мои нарачки
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +293,My Orders,Мои нарачки
 DocType: Price List,Price List Name,Ценовник Име
 DocType: Time Log,For Manufacturing,За производство
-apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +70,Totals,Одделение
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +174,Totals,Одделение
 DocType: BOM,Manufacturing,Производство
 ,Ordered Items To Be Delivered,Нарачани да бидат испорачани
 DocType: Account,Income,Приходи
 ,Setup Wizard,Советник за подесување
 DocType: Industry Type,Industry Type,Индустрија Тип
 apps/erpnext/erpnext/templates/includes/cart.js +137,Something went wrong!,Нешто не беше во ред!
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +68,Warning: Leave application contains following block dates,Предупредување: Оставете апликација ги содржи следниве датуми блок
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +251,Sales Invoice {0} has already been submitted,Продај фактура {0} е веќе испратена
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +100,Warning: Leave application contains following block dates,Предупредување: Оставете апликација ги содржи следниве датуми блок
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +256,Sales Invoice {0} has already been submitted,Продај фактура {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/setup/page/setup_wizard/fixtures/operations.py +10,Die casting,Леене
 DocType: Email Alert,Reference Date,Референтен датум
 apps/erpnext/erpnext/config/hr.py +105,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,Ве молиме внесете ја пораката пред испраќањето
 DocType: Async Task,Status,Статус
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +65,Stock UOM updated for Item {0},Акции UOM ажурирани за Точка {0}
 DocType: Company History,Year,Година
 apps/erpnext/erpnext/config/accounts.py +127,Point-of-Sale Profile,Point-of-Продажба Профил
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +68,Please Update SMS Settings,Ве молиме инсталирајте SMS Settings
@@ -3514,12 +3366,12 @@
 ,Serial No Service Contract Expiry,Сериски Нема договор за услуги Важи
 DocType: Item,Unit of Measure Conversion,Единица мерка конверзија
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +86,Employee can not be changed,Работникот не може да се промени
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +259,You cannot credit and debit same account at the same time,Вие не може да кредитни и дебитни истата сметка во исто време
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,You cannot credit and debit same account at the same time,Вие не може да кредитни и дебитни истата сметка во исто време
 DocType: Naming Series,Help HTML,Помош HTML
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},Вкупно weightage доделени треба да биде 100%. Тоа е {0}
 apps/erpnext/erpnext/controllers/status_updater.py +140,Allowance for over-{0} crossed for Item {1},Додаток за надминување {0} преминал за Точка {1}
 DocType: Address,Name of person or organization that this address belongs to.,Име на лицето или организацијата која оваа адреса припаѓа.
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +587,Your Suppliers,Вашите добавувачи
+apps/erpnext/erpnext/public/js/setup_wizard.js +325,Your Suppliers,Вашите добавувачи
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,Не може да се постави како изгубени како Продај Побарувања е направен.
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +65,Another Salary Structure {0} is active for employee {1}. Please make its status 'Inactive' to proceed.,Уште една плата структура {0} е активен за вработен {1}. Ве молиме да го направи својот статус како &quot;неактивен&quot; за да продолжите.
 DocType: Purchase Invoice,Contact,Контакт
@@ -3528,37 +3380,35 @@
 DocType: Item,Has Serial No,Има серија №
 DocType: Employee,Date of Issue,Датум на издавање
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +16,{0}: From {0} for {1},{0}: Од {0} {1}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +154,Row #{0}: Set Supplier for item {1},Ред # {0}: Постави Добавувачот за ставката {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +149,Row #{0}: Set Supplier for item {1},Ред # {0}: Постави Добавувачот за ставката {1}
 DocType: Issue,Content Type,Типот на содржина
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +17,Computer,Компјутер
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,Компјутер
 DocType: Item,List this Item in multiple groups on the website.,Листа на оваа точка во повеќе групи на веб страната.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +283,Please check Multi Currency option to allow accounts with other currency,Ве молиме проверете ја опцијата Мулти Валута да им овозможи на сметки со друга валута
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +285,Please check Multi Currency option to allow accounts with other currency,Ве молиме проверете ја опцијата Мулти Валута да им овозможи на сметки со друга валута
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +62,Item: {0} does not exist in the system,Точка: {0} не постои во системот
 apps/erpnext/erpnext/accounts/doctype/account/account.py +81,You are not authorized to set Frozen value,Немате дозвола да го поставите Замрзнати вредност
 DocType: Payment Reconciliation,Get Unreconciled Entries,Земете неусогласеност записи
 DocType: Cost Center,Budgets,Буџети
 apps/frappe/frappe/core/page/modules_setup/modules_setup.py +11,Updated,Ажурирани
 DocType: Employee,Emergency Contact Details,Итни Контакт Детали
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +396,What does it do?,Што да направам?
+apps/erpnext/erpnext/public/js/setup_wizard.js +144,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,Просечната стапка на Комисијата
-apps/erpnext/erpnext/stock/doctype/item/item.py +313,'Has Serial No' can not be 'Yes' for non-stock item,&quot;Мора Сериски Не&quot; не може да биде &quot;Да&quot; за не-парк точка
+apps/erpnext/erpnext/stock/doctype/item/item.py +317,'Has Serial No' can not be 'Yes' for non-stock item,&quot;Мора Сериски Не&quot; не може да биде &quot;Да&quot; за не-парк точка
 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/setup/page/setup_wizard/install_fixtures.py +111,Electrical,Електрични
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +111,Electrical,Електрични
 DocType: Stock Entry,Total Value Difference (Out - In),Вкупно разликата вредност (Out - Во)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +302,Row {0}: Exchange Rate is mandatory,Ред {0}: курс е задолжително
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +304,Row {0}: Exchange Rate is mandatory,Ред {0}: курс е задолжително
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},ID на корисникот не е поставена за вработените {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +72,Peening,Peening
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,From Warranty Claim,Од Гаранција побарување
 DocType: Stock Entry,Default Source Warehouse,Стандардно Извор Магацински
 DocType: Item,Customer Code,Код на клиентите
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +212,Birthday Reminder for {0},Роденден Потсетник за {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +163,Lapping,Lapping
-apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.js +8,Days Since Last Order,Дена од денот на нарачка
+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 +299,Debit To account must be a Balance Sheet account,Должење на сметка мора да биде на сметка Биланс на состојба
 DocType: Buying Settings,Naming Series,Именување Серија
 DocType: Leave Block List,Leave Block List Name,Остави Забрани Листа на Име
@@ -3572,7 +3422,7 @@
 DocType: Notification Control,Sales Invoice Message,Порака Продај фактура
 DocType: Authorization Rule,Based On,Врз основа на
 DocType: Sales Order Item,Ordered Qty,Нареди Количина
-apps/erpnext/erpnext/stock/doctype/item/item.py +539,Item {0} is disabled,Ставката {0} е оневозможено
+apps/erpnext/erpnext/stock/doctype/item/item.py +543,Item {0} is disabled,Ставката {0} е оневозможено
 DocType: Stock Settings,Stock Frozen Upto,Акции Замрзнати до
 apps/erpnext/erpnext/controllers/recurring_document.py +166,Period From and Period To dates mandatory for recurring {0},Период од периодот и роковите на задолжителна за периодични {0}
 apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,Проектна активност / задача.
@@ -3582,7 +3432,6 @@
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,Попуст смее да биде помал од 100
 DocType: ToDo,Low,Ниски
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Отпише Износ (Фирма валута)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +71,Spinning,Врти
 DocType: Landed Cost Voucher,Landed Cost Voucher,Слета Цена на ваучер
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +55,Please set {0},Ве молиме да се постави {0}
 DocType: Purchase Invoice,Repeat on Day of Month,Повторете на Денот од месецот
@@ -3604,7 +3453,6 @@
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +37,Campaign Name is required,Потребно е име на кампања
 DocType: Maintenance Visit,Maintenance Date,Датум на одржување
 DocType: Purchase Receipt Item,Rejected Serial No,Одбиени Сериски Не
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +51,Deep drawing,Длабоко извлекување
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +40,New Newsletter,Нов Билтен
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +157,Start date should be less than end date for Item {0},Датум на почеток треба да биде помал од крајот датум за Точка {0}
 apps/erpnext/erpnext/stock/doctype/item/item.js +17,Show Balance,Прикажи Биланс
@@ -3614,7 +3462,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +119,BOM and Manufacturing Quantity are required,Бум Производство и Кол се бара
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Стареењето опсег 2
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +450,Amount,Износот
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +147,Riveting,Возбудлив
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,Бум замени
 ,Sales Analytics,Продажбата анализи
 DocType: Manufacturing Settings,Manufacturing Settings,Settings производство
@@ -3626,20 +3473,19 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +207,New Account Name,Нови име на сметка
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,Суровини и материјали обезбедени Цена
 DocType: Selling Settings,Settings for Selling Module,Поставки за продажба Модул
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +73,Customer Service,Услуги за Потрошувачи
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Customer Service,Услуги за Потрошувачи
 DocType: Item,Thumbnail,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.,Понуда кандидат работа.
 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 +70,Item {0} must be a stock Item,Точка {0} мора да биде акции Точка
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,Стандардно работа во магацин за напредокот
 apps/erpnext/erpnext/config/accounts.py +107,Default settings for accounting transactions.,Стандардните поставувања за сметководствени трансакции.
 apps/frappe/frappe/model/naming.py +40,{0} is required,{0} е потребно
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +21,Vacuum molding,Вакуум калапи
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,Очекуваниот датум не може да биде пред Материјал Барање Датум
 DocType: Contact Us Settings,City,Градот
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +132,Ultrasonic machining,Ултразвучно обработка
 apps/frappe/frappe/templates/base.html +137,Error: Not a valid id?,Грешка: Не е валидна проект?
 apps/erpnext/erpnext/stock/get_item_details.py +125,Item {0} must be a Sales Item,Точка {0} мора да биде Продажбата Точка
 DocType: Naming Series,Update Series Number,Ажурирање Серија број
@@ -3647,7 +3493,7 @@
 DocType: Sales Order,Printing Details,Детали за печатење
 DocType: Task,Closing Date,Краен датум
 DocType: Sales Order Item,Produced Quantity,Произведената количина
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +84,Engineer,Инженер
+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 +379,Item Code required at Row No {0},Точка законик бара во ред Нема {0}
 DocType: Sales Partner,Partner Type,Тип партнер
@@ -3655,7 +3501,7 @@
 DocType: Authorization Rule,Customerwise Discount,Customerwise попуст
 DocType: Purchase Invoice,Against Expense Account,Против сметка сметка
 DocType: Production Order,Production Order,Производството со цел
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +258,Installation Note {0} has already been submitted,Инсталација Забелешка {0} е веќе испратена
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +263,Installation Note {0} has already been submitted,Инсталација Забелешка {0} е веќе испратена
 DocType: Quotation Item,Against Docname,Против Docname
 DocType: SMS Center,All Employee (Active),Сите вработените (Активни)
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,Прикажи Сега
@@ -3664,19 +3510,19 @@
 DocType: Item,Re-Order Level,Повторно да Ниво
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,Внесете предмети и планирани Количина за која сакате да се зголеми производството наредби или преземете суровини за анализа.
 apps/frappe/frappe/public/js/frappe/views/ganttview.js +45,Gantt Chart,Gantt шема
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +57,Part-time,Скратено работно време
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,Part-time,Скратено работно време
 DocType: Employee,Applicable Holiday List,Применливи летни Листа
 DocType: Employee,Cheque,Чек
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,Серија освежено
 apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Report Type is mandatory,Тип на излагањето е задолжително
 DocType: Item,Serial Number Series,Сериски број Серија
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},Складиште е задолжително за акциите Точка {0} во ред {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +45,Retail & Wholesale,Мало и големо
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,Мало и големо
 DocType: Issue,First Responded On,Прво одговорија
 DocType: Website Item Group,Cross Listing of Item in multiple groups,Крстот на оглас на точка во повеќе групи
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +351,The First User: You,Првата Корисник: Вие
+apps/erpnext/erpnext/public/js/setup_wizard.js +101,The First User: You,Првата Корисник: Вие
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +48,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 +172,Successfully Reconciled,Успешно помири
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +119,Successfully Reconciled,Успешно помири
 DocType: Production Order,Planned End Date,Планирани Крај Датум
 apps/erpnext/erpnext/config/stock.py +43,Where items are stored.,Каде што предмети се чуваат.
 DocType: Tax Rule,Validity,Валидноста
@@ -3696,39 +3542,36 @@
 DocType: DocPerm,Level,Ниво
 DocType: Purchase Taxes and Charges,On Net Total,Он Нет Вкупно
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +160,Target warehouse in row {0} must be same as Production Order,Целна магацин во ред {0} мора да биде иста како цел производство
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +59,No permission to use Payment Tool,Нема дозвола за користење на плаќање алатката
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +97,No permission to use Payment Tool,Нема дозвола за користење на плаќање алатката
 apps/erpnext/erpnext/controllers/recurring_document.py +192,'Notification Email Addresses' not specified for recurring %s,&quot;Известување-мејл адреси не е наведен за повторување на% s
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +86,Milling,Мелење
 apps/erpnext/erpnext/accounts/doctype/account/account.py +99,Currency can not be changed after making entries using some other currency,Валута не може да се промени по правење записи со употреба на други валута
 DocType: Company,Round Off Account,Заокружуваат профил
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +60,Nibbling,Грицкање
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,Административни трошоци
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +18,Consulting,Консалтинг
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +18,Consulting,Консалтинг
 DocType: Customer Group,Parent Customer Group,Родител група на потрошувачи
 apps/erpnext/erpnext/public/js/pos/pos.js +429,Change,Промени
 DocType: Purchase Invoice,Contact Email,Контакт E-mail
 DocType: Appraisal Goal,Score Earned,Резултат Заработени
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +393,"e.g. ""My Company LLC""","на пример, &quot;Мојата компанија ДОО&quot;"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +173,Notice Period,Отказен рок
+apps/erpnext/erpnext/public/js/setup_wizard.js +141,"e.g. ""My Company LLC""","на пример, &quot;Мојата компанија ДОО&quot;"
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +173,Notice Period,Отказен рок
 DocType: Bank Reconciliation Detail,Voucher ID,Ваучер проект
 apps/erpnext/erpnext/setup/doctype/territory/territory.js +14,This is a root territory and cannot be edited.,Ова е коренот територија и не може да се уредува.
 DocType: Packing Slip,Gross Weight UOM,Бруто тежина на апаратот UOM
 DocType: Email Digest,Receivables / Payables,Побарувања / Обврските
 DocType: Delivery Note Item,Against Sales Invoice,Против Продај фактура
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +63,Stamping,Сузбивање
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +457,Credit Account,Кредитна сметка
 DocType: Landed Cost Item,Landed Cost Item,Слета Цена Точка
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +56,Show zero values,Прикажи нула вредности
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,Кол од точка добиени по производство / препакување од даден количини на суровини
 DocType: Payment Reconciliation,Receivable / Payable Account,Побарувања / Платив сметка
 DocType: Delivery Note Item,Against Sales Order Item,Против Продај Побарувања Точка
-apps/erpnext/erpnext/stock/doctype/item/item.py +521,Please specify Attribute Value for attribute {0},Ве молиме наведете Атрибут Вредноста за атрибутот {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +525,Please specify Attribute Value for attribute {0},Ве молиме наведете Атрибут Вредноста за атрибутот {0}
 DocType: Item,Default Warehouse,Стандардно Магацински
 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,Печати Без Износ
-apps/erpnext/erpnext/controllers/buying_controller.py +69,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,Категорија данок не може да биде &quot;Вреднување&quot; или &quot;вреднување и вкупно&quot; како и сите предмети се без акции предмети
+apps/erpnext/erpnext/controllers/buying_controller.py +60,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,Категорија данок не може да биде &quot;Вреднување&quot; или &quot;вреднување и вкупно&quot; како и сите предмети се без акции предмети
 DocType: User,Last Name,Презиме
 DocType: Web Page,Left,Лево
 DocType: Event,All Day,Цел ден
@@ -3736,7 +3579,7 @@
 DocType: Appraisal,Total Score (Out of 5),Вкупниот резултат (Од 5)
 DocType: Contact Us Settings,State,Држава
 DocType: Batch,Batch,Серија
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +51,Balance,Биланс
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +28,Balance,Биланс
 DocType: Project,Total Expense Claim (via Expense Claims),Вкупно расходи барање (преку трошоците побарувања)
 DocType: User,Gender,Пол
 DocType: Journal Entry,Debit Note,Задолжување
@@ -3766,8 +3609,7 @@
 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/setup/page/setup_wizard/fixtures/operations.py +76,Seaming,Seaming
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +197,"Company Email ID not found, hence mail not sent","Компанија е-мејл ID не е пронајден, па затоа не пошта испратена"
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +206,"Company Email ID not found, hence mail not sent","Компанија е-мејл ID не е пронајден, па затоа не пошта испратена"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Примена на средства (средства)
 DocType: Production Planning Tool,Filter based on item,Филтер врз основа на точка
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +451,Debit Account,Дебитни сметка
@@ -3779,17 +3621,16 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +95,{0} {1} has been modified. Please refresh.,{0} {1} е изменета. Ве молиме да се одмориме.
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,Стоп за корисниците од правење Остави апликации на наредните денови.
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +591,From Opportunity,Од Можност
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +46,Blanking,Бришење
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +166,Employee Benefits,Користи за вработените
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,Employee Benefits,Користи за вработените
 DocType: Sales Invoice,Is POS,Е ПОС
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +240,Packed quantity must equal quantity for Item {0} in row {1},Спакувани количество мора да биде еднаков количина за ставката {0} во ред {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +245,Packed quantity must equal quantity for Item {0} in row {1},Спакувани количество мора да биде еднаков количина за ставката {0} во ред {1}
 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.,Сметки се зголеми на клиенти.
 DocType: DocField,Default,Стандардно
 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 +466,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Ред Нема {0}: Износ не може да биде поголема од До Износ против расходи Тврдат {1}. Во очекување сума е {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +468,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} претплатници
 DocType: Maintenance Schedule,Schedule,Распоред
 DocType: Cost Center,"Define Budget for this Cost Center. To set budget action, see ""Company List""","Дефинираат Буџетот за оваа цена центар. За да го поставите на буџетот акција, видете &quot;компанијата Листа&quot;"
@@ -3800,7 +3641,7 @@
 apps/erpnext/erpnext/public/js/pos/pos.js +91,Price List not found or disabled,Ценовник не е пронајдена или со посебни потреби
 DocType: Expense Claim,Approved,Одобрени
 DocType: Pricing Rule,Price,Цена
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +79,Employee relieved on {0} must be set as 'Left',Вработен ослободен на {0} мора да биде поставено како &quot;Лево&quot;
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +88,Employee relieved on {0} must be set as 'Left',Вработен ослободен на {0} мора да биде поставено како &quot;Лево&quot;
 DocType: Item,"Selecting ""Yes"" will give a unique identity to each entity of this item which can be viewed in the Serial No master.",Избирање на &quot;Да&quot; ќе им даде единствен идентитет на секој субјект на оваа точка која може да се гледа во серија № господар.
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +39,Appraisal {0} created for Employee {1} in the given date range,Процена {0} создадена за вработените {1} во дадениот период
 DocType: Employee,Education,Образование
@@ -3811,7 +3652,7 @@
 apps/frappe/frappe/desk/moduleview.py +67,Standard Reports,Стандардни извештаи
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,Сметководствени записи во дневникот.
 DocType: Delivery Note Item,Available Qty at From Warehouse,Количина на располагање од магацин
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +209,Please select Employee Record first.,Ве молиме изберете Снимај вработените во прв план.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +224,Please select Employee Record first.,Ве молиме изберете Снимај вработените во прв план.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,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 +233,Please enter Expense Account,Ве молиме внесете сметка сметка
@@ -3824,46 +3665,43 @@
 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,Продажбата на налози се повлече (во очекување да се испорача) врз основа на горенаведените критериуми
 DocType: DocShare,Document Type,Тип на документ
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +565,From Supplier Quotation,Од Добавувачот цитат
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +588,From Supplier Quotation,Од Добавувачот цитат
 DocType: Deduction Type,Deduction Type,Одбивање Тип
 DocType: Attendance,Half Day,Половина ден
 DocType: Pricing Rule,Min Qty,Мин Количина
 DocType: Features Setup,"To track items in sales and purchase documents with batch nos. ""Preferred Industry: Chemicals""",За следење на предмети во продажба и купување на документи со серија бр. &quot;Склопот Индустрија: Хемикалии&quot;
 DocType: GL Entry,Transaction Date,Датум на трансакција
 DocType: Production Plan Item,Planned Qty,Планирани Количина
-apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +91,Total Tax,Вкупен данок
+apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +93,Total Tax,Вкупен данок
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +178,For Quantity (Manufactured Qty) is mandatory,За Кол (Произведени Количина) се задолжителни
 DocType: Stock Entry,Default Target Warehouse,Стандардно Целна Магацински
 DocType: Purchase Invoice,Net Total (Company Currency),Нето Вкупно (Фирма валута)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +79,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Ред {0}: Тип партија и Партијата се применува само против побарувања / Платив сметка
 DocType: Notification Control,Purchase Receipt Message,Купување Потврда порака
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +95,Total allocated leaves are more than period,Вкупно одобрени Листовите се повеќе од периодот
 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.,Рекорд движење точка.
 DocType: Newsletter List Subscriber,Newsletter List Subscriber,Билтен претплатникот листа
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +164,Morticing,Morticing
 DocType: Email Account,Service,Услуги
 DocType: Hub Settings,Hub Settings,Settings центар
 DocType: Project,Gross Margin %,Бруто маржа%
 DocType: BOM,With Operations,Со операции
 apps/erpnext/erpnext/accounts/party.py +232,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Сметководствени записи се веќе направени во валута {0} за компанија {1}. Ве молиме одберете побарувања или треба да се плати сметката со валутна {0}.
 ,Monthly Salary Register,Месечна плата Регистрирај се
-apps/frappe/frappe/website/template.py +140,Next,Следна
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard_page.html +17,Next,Следна
 DocType: Warranty Claim,If different than customer address,Ако се разликува од клиент адреса
 DocType: BOM Operation,BOM Operation,Бум работа
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +118,Electropolishing,Electropolishing
 DocType: Purchase Taxes and Charges,On Previous Row Amount,На претходниот ред Износ
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +24,Please enter Payment Amount in atleast one row,Ве молиме внесете исплата Износ во барем еден ред
+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 Профил
 apps/erpnext/erpnext/config/accounts.py +153,"Seasonality for setting budgets, targets etc.","Сезоната за поставување на буџети, цели итн"
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +238,Row {0}: Payment Amount cannot be greater than Outstanding Amount,Ред {0}: Плаќањето сума не може да биде поголем од преостанатиот износ за наплата
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +46,Total Unpaid,Вкупно ненаплатени
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +21,Time Log is not billable,Време најавите не е фактурираните
 apps/erpnext/erpnext/stock/get_item_details.py +128,"Item {0} is a template, please select one of its variants","Точка {0} е шаблон, ве молиме изберете една од неговите варијанти"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +528,Purchaser,Купувачот
+apps/erpnext/erpnext/public/js/setup_wizard.js +272,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 +71,Please enter the Against Vouchers manually,Ве молиме внесете го Против Ваучери рачно
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +107,Please enter the Against Vouchers manually,Ве молиме внесете го Против Ваучери рачно
 DocType: SMS Settings,Static Parameters,Статични параметрите
 DocType: Purchase Order,Advance Paid,Однапред платени
 DocType: Item,Item Tax,Точка Данок
@@ -3872,14 +3710,12 @@
 apps/erpnext/erpnext/config/crm.py +48,Send mass SMS to your contacts,Испрати маса SMS порака на вашите контакти
 DocType: Purchase Taxes and Charges,Consider Tax or Charge for,Сметаат дека даночните или полнење за
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,Крај Количина е задолжително
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +42,Cross-rolling,Крос-тркалање
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +132,Credit Card,Со кредитна картичка
+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 +95,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,Ве молиме внесете даноци и такси
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +85,Machining,Обработка
 DocType: Sales Invoice Item,Drop Ship,Капка Брод
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","Тука може да го задржи семејството детали како име и окупација на родител, брачен другар и деца"
 DocType: Hub Settings,Seller Name,Продавачот Име
@@ -3889,7 +3725,7 @@
 DocType: Stock Entry,Repack,Repack
 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/setup/page/setup_wizard/setup_wizard.js +500,Attach Logo,Прикачи Logo
+apps/erpnext/erpnext/public/js/setup_wizard.js +246,Attach Logo,Прикачи Logo
 DocType: Customer,Commission Rate,Комисијата стапка
 apps/erpnext/erpnext/stock/doctype/item/item.js +38,Make Variant,Направи Варијанта
 apps/erpnext/erpnext/config/hr.py +145,Block leave applications by department.,Апликации одмор блок од страна на одделот.
@@ -3904,19 +3740,19 @@
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +105,Please select a csv file,Ве молиме изберете CSV датотека
 DocType: Dropbox Backup,Send Backups to Dropbox,Испрати бекап на Dropbox
 DocType: Purchase Order,To Receive and Bill,За да примите и Бил
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +94,Designer,Дизајнер
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Designer,Дизајнер
 apps/erpnext/erpnext/config/selling.py +121,Terms and Conditions Template,Услови и правила Шаблон
 DocType: Serial No,Delivery Details,Детали за испорака
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +383,Cost Center is required in row {0} in Taxes table for type {1},Цена центар е потребно во ред {0} даноци во табелата за видот {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +386,Cost Center is required in row {0} in Taxes table for type {1},Цена центар е потребно во ред {0} даноци во табелата за видот {1}
 DocType: Item,Automatically create Material Request if quantity falls below this level,"Автоматски се создаде материјал барањето, доколку количината паѓа под ова ниво"
 ,Item-wise Purchase Register,Точка-мудар Набавка Регистрирај се
 DocType: Batch,Expiry Date,Датумот на истекување
-apps/erpnext/erpnext/stock/doctype/item/item.py +375,"To set reorder level, item must be a Purchase Item or Manufacturing Item",Да го поставите нивото редоследот точка мора да биде Набавка Точка или Производство Точка
+apps/erpnext/erpnext/stock/doctype/item/item.py +379,"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.,Господар на проектот.
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,Не покажува никакви симбол како $ итн до валути.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +330, (Half Day),(Полудневен)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +374, (Half Day),(Полудневен)
 DocType: Supplier,Credit Days,Кредитна дена
 DocType: Leave Type,Is Carry Forward,Е пренесување
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +478,Get Items from BOM,Се предмети од бирото
@@ -3924,7 +3760,7 @@
 apps/erpnext/erpnext/config/manufacturing.py +120,Bill of Materials,Бил на материјали
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +77,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Ред {0}: Тип партија и Партијата е потребно за побарувања / Платив сметка {1}
 DocType: Dropbox Backup,Send Notifications To,Доставуваат известувања до
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html +26,Ref Date,Реф Датум
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +54,Ref Date,Реф Датум
 DocType: Employee,Reason for Leaving,Причина за напуштање
 DocType: Expense Claim Detail,Sanctioned Amount,Износ санкционира
 DocType: GL Entry,Is Opening,Се отвора
@@ -3932,4 +3768,3 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +188,Account {0} does not exist,На сметка {0} не постои
 DocType: Account,Cash,Пари
 DocType: Employee,Short biography for website and other publications.,Кратка биографија за веб-страница и други публикации.
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +31,Please create Salary Structure for employee {0},Ве молиме да се создаде Плата структура за вработен {0}
diff --git a/erpnext/translations/mr.csv b/erpnext/translations/mr.csv
index 80b5dbf..33d6fe6 100644
--- a/erpnext/translations/mr.csv
+++ b/erpnext/translations/mr.csv
@@ -1,13 +1,12 @@
 DocType: Employee,Salary Mode,पगार मोड
 DocType: Cost Center,"Select Monthly Distribution, if you want to track based on seasonality.","तुम्ही हंगामी आधारित ट्रॅक करू इच्छित असल्यास, मासिक वितरण निवडा."
 DocType: Employee,Divorced,घटस्फोट
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +86,Warning: Same item has been entered multiple times.,चेतावनी: समान आयटम अनेक वेळा केलेला आहे.
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +80,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,आयटम व्यवहार अनेक वेळा जोडले जाण्यास अनुमती द्या
 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/page/setup_wizard/fixtures/industry_type.py +19,Consumer Products,ग्राहक उत्पादने
+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,प्रथम पक्ष प्रकार निवडा
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +90,Annealing,Annealing
 DocType: Item,Customer Items,ग्राहक आयटम
 apps/erpnext/erpnext/accounts/doctype/account/account.py +45,Account {0}: Parent account {1} can not be a ledger,खाते {0}: पालक खाते {1} एक खातेवही असू शकत नाही
 DocType: Item,Publish Item to hub.erpnext.com,Hub.erpnext.com करण्यासाठी आयटम प्रकाशित
@@ -20,15 +19,14 @@
 DocType: About Us Settings,Website,वेबसाइट
 DocType: POS Profile,Applicable for User,वापरकर्ता लागू
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +169,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","थांबविले उत्पादन ऑर्डर रद्द करता येणार नाही, रद्द करण्यासाठी प्रथम ती बूच"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +23,Compaction plus sintering,कॉम्पॅक्शन अधिक sintering
 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.,* व्यवहार हिशोब केला जाईल.
 DocType: Purchase Order,Customer Contact,ग्राहक संपर्क
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +549,From Material Request,साहित्य विनंती पासून
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +572,From Material Request,साहित्य विनंती पासून
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} वृक्ष
 DocType: Job Applicant,Job Applicant,ईयोब अर्जदाराचे
 apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,अधिक परिणाम नाहीत.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +78,Legal,कायदेशीर
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +34,Legal,कायदेशीर
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +114,Actual type tax cannot be included in Item rate in row {0},वास्तविक प्रकार कर सलग आयटम दर समाविष्ट केले जाऊ शकत नाही {0}
 DocType: C-Form,Customer,ग्राहक
 DocType: Purchase Receipt Item,Required By,करून आवश्यक
@@ -43,7 +41,6 @@
 DocType: Manufacturing Settings,Default 10 mins,10 मि डीफॉल्ट
 DocType: Leave Type,Leave Type Name,नाव टाइप करा सोडा
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +148,Series Updated Successfully,मालिका यशस्वीपणे अद्यतनित
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +150,Stitching,शिवणकाम
 DocType: Pricing Rule,Apply On,रोजी लागू करा
 DocType: Item Price,Multiple Item prices.,एकाधिक आयटम भाव.
 ,Purchase Order Items To Be Received,पर्चेस आयटम प्राप्त करण्यासाठी
@@ -51,8 +48,8 @@
 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 +104,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 +189,New Leave Application,नवी रजेचा अर्ज
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +134,Bank Draft,बँक ड्राफ्ट
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +204,New Leave Application,नवी रजेचा अर्ज
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +134,Bank Draft,बँक ड्राफ्ट
 DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,1. या पर्याय चा वापर ग्राहक नुसार आयटम कोड ठेवणे आणि आयटम कोड  चा शोध करण्यासाठी करावा 
 DocType: Mode of Payment Account,Mode of Payment Account,भरणा खाते मोड
 apps/erpnext/erpnext/stock/doctype/item/item.js +34,Show Variants,दर्शवा रूपे
@@ -64,25 +61,23 @@
 DocType: Production Plan Item,Production Plan Item,उत्पादन योजना आयटम
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +141,User {0} is already assigned to Employee {1},सदस्य {0} आधीच कर्मचारी नियुक्त केले आहे {1}
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +13,Make new POS Profile,नवीन पीओएस प्रोफाइल करा
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +31,Health Care,हेल्थ केअर
+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 +494,Invoice,चलन
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +519,Invoice,चलन
 DocType: Maintenance Schedule Item,Periodicity,ठराविक मुदतीने पुन: पुन्हा उगवणे
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +357,Email Address,ई-मेल पत्ता
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +21,Defense,संरक्षण
+apps/erpnext/erpnext/public/js/setup_wizard.js +107,Email Address,ई-मेल पत्ता
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,संरक्षण
 DocType: Company,Abbr,Abbr
 DocType: Appraisal Goal,Score (0-5),धावसंख्या (0-5)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +193,Row {0}: {1} {2} does not match with {3},रो {0}: {1} {2} सह जुळत नाही {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +67,Row # {0}:,रो # {0}:
 DocType: Delivery Note,Vehicle No,वाहन नाही
 apps/erpnext/erpnext/public/js/pos/pos.js +528,Please select Price List,किंमत सूची निवडा कृपया
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +162,Woodworking,लाकडीकामाच्या
 DocType: Production Order Operation,Work In Progress,प्रगती मध्ये कार्य
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +153,3D printing,3D छपाई
 DocType: Employee,Holiday List,सुट्टी यादी
 DocType: Time Log,Time Log,वेळ लॉग
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +530,Accountant,फडणवीस
+apps/erpnext/erpnext/public/js/setup_wizard.js +274,Accountant,फडणवीस
 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.","कार्यक्रमांचे लॉग, बिलिंग वेळ ट्रॅक वापरले जाऊ शकते कार्ये वापरकर्त्यांना केले."
@@ -98,18 +93,19 @@
 DocType: Bin,Quantity Requested for Purchase,प्रमाण खरेदी विनंती
 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/setup/page/setup_wizard/setup_wizard.js +626,Kg,किलो
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Kg,किलो
 apps/erpnext/erpnext/config/hr.py +48,Opening for a Job.,जॉब साठी उघडत आहे.
 DocType: Item Attribute,Increment,बढती
 apps/erpnext/erpnext/public/js/stock_analytics.js +63,Select Warehouse...,वखार निवडा ...
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +6,Advertising,जाहिरात
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,जाहिरात
+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/doctype/sales_invoice/sales_invoice.py +389,Stock cannot be updated against Delivery Note {0},शेअर वितरण टीप विरुद्ध अद्यतनित करणे शक्य नाही {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +391,Stock cannot be updated against Delivery Note {0},शेअर वितरण टीप विरुद्ध अद्यतनित करणे शक्य नाही {0}
 DocType: Payment Reconciliation,Reconcile,समेट
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +30,Grocery,किराणा
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,किराणा
 DocType: Quality Inspection Reading,Reading 1,1 वाचन
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Make Bank Entry,बँक प्रवेश करा
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +40,Pension Funds,पेन्शन फंड्स
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,पेन्शन फंड्स
 apps/erpnext/erpnext/accounts/doctype/account/account.py +142,Warehouse is mandatory if account type is Warehouse,खाते प्रकार कोठार असेल तर कोठार अनिवार्य आहे
 DocType: SMS Center,All Sales Person,सर्व विक्री व्यक्ती
 DocType: Lead,Person Name,व्यक्ती नाव
@@ -131,7 +127,7 @@
 DocType: Quality Inspection,Get Specification Details,तपशील तपशील मिळवा
 DocType: Lead,Interested,इच्छुक
 apps/erpnext/erpnext/config/manufacturing.py +14,Bill of Material,साहित्य बिल
-apps/erpnext/erpnext/public/js/stock_analytics.js +45,Opening,उघडणे
+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,आयटम गट पासून कॉपी
 DocType: Journal Entry,Opening Entry,उघडणे प्रवेश
@@ -145,23 +141,22 @@
 DocType: Employee Education,Under Graduate,पदवीधर अंतर्गत
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +22,Target On,लक्ष्य रोजी
 DocType: BOM,Total Cost,एकूण खर्च
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +99,Reaming,Reaming
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +9,Activity Log:,क्रियाकलाप लॉग:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +199,Item {0} does not exist in the system or has expired,{0} आयटम प्रणाली अस्तित्वात नाही किंवा कालबाह्य झाले आहे
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +44,Real Estate,स्थावर मालमत्ता
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +44,Real Estate,स्थावर मालमत्ता
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +4,Statement of Account,खाते स्टेटमेंट
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +41,Pharmaceuticals,फार्मास्युटिकल्स
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,फार्मास्युटिकल्स
 DocType: Expense Claim Detail,Claim Amount,दाव्याची रक्कम
 DocType: Employee,Mr,श्री
 DocType: Custom Script,Client,क्लायंट
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,पुरवठादार प्रकार / पुरवठादार
 DocType: Naming Series,Prefix,पूर्वपद
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Consumable,Consumable
+apps/erpnext/erpnext/public/js/setup_wizard.js +359,Consumable,Consumable
 DocType: Upload Attendance,Import Log,आयात लॉग
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.js +19,Send,पाठवा
 DocType: Sales Invoice Item,Delivered By Supplier,पुरवठादार करून वितरित
 DocType: SMS Center,All Contact,सर्व संपर्क
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +164,Annual Salary,वार्षिक पगार
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +164,Annual Salary,वार्षिक पगार
 DocType: Period Closing Voucher,Closing Fiscal Year,आर्थिक वर्ष बंद
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +69,Stock Expenses,शेअर खर्च
 DocType: Newsletter,Email Sent?,ई-मेल पाठविले?
@@ -169,26 +164,24 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +92,Show Time Logs,दर्शवा वेळ नोंदी
 DocType: Journal Entry Account,Credit in Company Currency,कंपनी चलन क्रेडिट
 DocType: Delivery Note,Installation Status,प्रतिष्ठापन स्थिती
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +115,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Qty नाकारलेले स्वीकृत + आयटम साठी प्राप्त प्रमाण समान असणे आवश्यक {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +118,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Qty नाकारलेले स्वीकृत + आयटम साठी प्राप्त प्रमाण समान असणे आवश्यक {0}
 DocType: Item,Supply Raw Materials for Purchase,पुरवठा कच्चा माल खरेदी
 apps/erpnext/erpnext/stock/get_item_details.py +133,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 +493,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","आयटम दर सलग {0} कर समाविष्ट करण्यासाठी, पंक्ती मध्ये कर {1} समाविष्ट करणे आवश्यक आहे"
+apps/erpnext/erpnext/controllers/accounts_controller.py +494,"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 +90,Settings for HR Module,एचआर विभाग सेटिंग्ज
 DocType: SMS Center,SMS Center,एसएमएस केंद्र
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +78,Straightening,सरळ
 DocType: BOM Replace Tool,New BOM,नवी BOM
 apps/erpnext/erpnext/config/projects.py +28,Batch Time Logs for billing.,बॅच बिलिंग वेळ नोंदी.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +15,Countergravity casting,Countergravity निर्णायक
 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/setup/page/setup_wizard/fixtures/industry_type.py +14,Broadcasting,प्रसारण
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +140,Execution,कार्यवाही
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +364,The first user will become the System Manager (you can change this later).,प्रणाली व्यवस्थापक होईल प्रथम वापरकर्ता (आपण हे नंतर बदलू शकता).
+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/public/js/setup_wizard.js +114,The first user will become the System Manager (you can change this later).,प्रणाली व्यवस्थापक होईल प्रथम वापरकर्ता (आपण हे नंतर बदलू शकता).
 apps/erpnext/erpnext/config/manufacturing.py +39,Details of the operations carried out.,ऑपरेशन तपशील चालते.
 DocType: Serial No,Maintenance Status,देखभाल स्थिती
 apps/erpnext/erpnext/config/stock.py +263,Items and Pricing,आयटम आणि ती
@@ -205,7 +198,6 @@
 DocType: Pricing Rule,Discount on Price List Rate (%),दर सूची रेट सूट (%)
 apps/frappe/frappe/public/js/frappe/form/print.js +96,Start,प्रारंभ
 DocType: User,First Name,प्रथम नाव
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +12,Full-mold casting,पूर्ण-मूस निर्णायक
 DocType: Offer Letter,Select Terms and Conditions,निवडा अटी आणि नियम
 DocType: Production Planning Tool,Sales Orders,विक्री ऑर्डर
 DocType: Purchase Taxes and Charges,Valuation,मूल्यांकन
@@ -217,8 +209,7 @@
 DocType: Bank Reconciliation,Bank Account,बँक खाते
 DocType: Leave Type,Allow Negative Balance,नकारात्मक शिल्लक परवानगी द्या
 DocType: Selling Settings,Default Territory,मुलभूत प्रदेश
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +53,Television,दूरदर्शन
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +138,Gashing,Gashing
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,दूरदर्शन
 DocType: Production Order Operation,Updated via 'Time Log',&#39;वेळ लॉग&#39; द्वारे अद्यतनित
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +82,Account {0} does not belong to Company {1},खाते {0} कंपनी संबंधित नाही {1}
 DocType: Naming Series,Series List for this Transaction,या व्यवहारासाठी मालिका यादी
@@ -233,14 +224,13 @@
 DocType: Leave Allocation,Add unused leaves from previous allocations,मागील वाटप पासून न वापरलेल्या पाने जोडा
 apps/erpnext/erpnext/controllers/recurring_document.py +206,Next Recurring {0} will be created on {1},पुढील आवर्ती {0} वर तयार केले जाईल {1}
 DocType: Newsletter List,Total Subscribers,एकूण सदस्य
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +575,Contact Name,संपर्क नाव
+,Contact Name,संपर्क नाव
 DocType: Production Plan Item,SO Pending Qty,त्यामुळे प्रलंबित Qty
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,वर उल्लेख केलेल्या निकष पगार स्लिप तयार.
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,खरेदीसाठी विनंती.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +107,Double housing,डबल गृहनिर्माण
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +156,Only the selected Leave Approver can submit this Leave Application,केवळ निवडलेले रजा मंजुरी या रजेचा अर्ज सादर करू शकतो
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +171,Only the selected Leave Approver can submit this Leave Application,केवळ निवडलेले रजा मंजुरी या रजेचा अर्ज सादर करू शकतो
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,तारीख relieving प्रवेश दिनांक पेक्षा जास्त असणे आवश्यक आहे
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +172,Leaves per Year,दर वर्षी नाही
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +172,Leaves per Year,दर वर्षी नाही
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup > Settings > Naming Series,{0} सेटअप&gt; सेटिंग्ज द्वारे&gt; नामांकन मालिका मालिका नामांकन सेट करा
 DocType: Time Log,Will be updated when batched.,बॅच तेव्हा अद्यतनित केले जाईल.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +104,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,रो {0}: तपासा खाते विरुद्ध &#39;आगाऊ आहे&#39; {1} हा एक आगाऊ नोंद आहे तर.
@@ -249,25 +239,24 @@
 DocType: Item Website Specification,Item Website Specification,आयटम वेबसाइट तपशील
 DocType: Dropbox Backup,Dropbox Access Key,ड्रॉपबॉक्स प्रवेश की
 DocType: Payment Tool,Reference No,संदर्भ नाही
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +348,Leave Blocked,सोडा अवरोधित
-apps/erpnext/erpnext/stock/doctype/item/item.py +535,Item {0} has reached its end of life on {1},आयटम {0} वर जीवनाची ओवरनंतर गाठली आहे {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +392,Leave Blocked,सोडा अवरोधित
+apps/erpnext/erpnext/stock/doctype/item/item.py +539,Item {0} has reached its end of life on {1},आयटम {0} वर जीवनाची ओवरनंतर गाठली आहे {1}
 apps/erpnext/erpnext/accounts/utils.py +339,Annual,वार्षिक
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,शेअर मेळ आयटम
 DocType: Stock Entry,Sales Invoice No,विक्री चलन नाही
 DocType: Material Request Item,Min Order Qty,किमान ऑर्डर Qty
 DocType: Lead,Do Not Contact,संपर्क करू नका
 DocType: Sales Invoice,The unique id for tracking all recurring invoices. It is generated on submit.,सर्व आवर्ती पावत्या ट्रॅक अद्वितीय आयडी. हे सबमिट निर्माण होते.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +93,Software Developer,सॉफ्टवेअर डेव्हलपर
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +93,Software Developer,सॉफ्टवेअर डेव्हलपर
 DocType: Item,Minimum Order Qty,किमान Qty
 DocType: Pricing Rule,Supplier Type,पुरवठादार प्रकार
 DocType: Item,Publish in Hub,हब मध्ये प्रकाशित
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +555,Item {0} is cancelled,{0} आयटम रद्द
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +598,Material Request,साहित्य विनंती
+apps/erpnext/erpnext/stock/doctype/item/item.py +559,Item {0} is cancelled,{0} आयटम रद्द
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +607,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},खरेदी करण्यासाठी &#39;कच्चा माल प्रदान&#39; टेबल आढळले नाही आयटम {0} {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +129,Wire brushing,वायर घासणे
 DocType: Employee,Relation,नाते
 DocType: Shipping Rule,Worldwide Shipping,जगभरातील शिपिंग
 apps/erpnext/erpnext/config/selling.py +23,Confirmed orders from Customers.,ग्राहक समोर ऑर्डर.
@@ -283,12 +272,11 @@
 DocType: Supplier,Address HTML,पत्ता HTML
 DocType: Lead,Mobile No.,मोबाइल क्रमांक
 DocType: Maintenance Schedule,Generate Schedule,वेळापत्रक व्युत्पन्न
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +81,Hubbing,Hubbing
 DocType: Purchase Invoice Item,Expense Head,खर्च प्रमुख
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +86,Please select Charge Type first,पहिल्या शुल्क प्रकार निवडा
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,ताज्या
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +395,Max 5 characters,कमाल 5 वर्ण
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +195,Select Your Language,आपली भाषा निवडा
+apps/erpnext/erpnext/public/js/setup_wizard.js +143,Max 5 characters,कमाल 5 वर्ण
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +245,Select Your Language,आपली भाषा निवडा
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,सूचीतील पहिली रजा मंजुरी मुलभूत रजा मंजुरी म्हणून सेट केले जाईल
 DocType: Manufacturing Settings,"Disables creation of time logs against Production Orders.
 Operations shall not be tracked against Production Order",उत्पादन ऑर्डर विरुद्ध वेळ नोंदी निर्माण अक्षम करा. संचालन उत्पादन आदेशा माग काढला जाऊ नये
@@ -300,8 +288,6 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +34,Item {0} must be Service Item,आयटम {0} सेवा आयटम असणे आवश्यक आहे
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +303,Completed Qty can not be greater than 'Qty to Manufacture',पेक्षा &#39;Qty निर्मिती करणे&#39; पूर्ण Qty जास्त असू शकत नाही
 DocType: DocType,Administrator,प्रशासक
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +136,Laser drilling,लेझर ड्रिलिंग
-DocType: Stock UOM Replace Utility,New Stock UOM,नवीन स्टॉक UOM
 DocType: Period Closing Voucher,Closing Account Head,खाते प्रमुख बंद
 DocType: Employee,External Work History,बाह्य कार्य इतिहास
 apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,परिपत्रक संदर्भ त्रुटी
@@ -310,18 +296,15 @@
 DocType: Lead,Industry,उद्योग
 DocType: Employee,Job Profile,कामाचे
 DocType: Newsletter,Newsletter,वृत्तपत्र
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +84,Hydroforming,Hydroforming
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +49,Necking,Necking
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,स्वयंचलित साहित्य विनंती निर्माण ईमेल द्वारे सूचित करा
 DocType: Journal Entry,Multi Currency,मल्टी चलन
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +51,Item is updated,आयटम सुधारित केले आहे
 DocType: Async Task,System Manager,प्रणाली व्यवस्थापक
 DocType: Payment Reconciliation Invoice,Invoice Type,चलन प्रकार
 DocType: Sales Invoice Item,Delivery Note,डिलिव्हरी टीप
 DocType: Dropbox Backup,Allow Dropbox Access,ड्रॉपबॉक्स प्रवेश परवानगी द्या
 apps/erpnext/erpnext/config/learn.py +72,Setting up Taxes,कर सेट अप
 apps/erpnext/erpnext/accounts/utils.py +189,Payment Entry has been modified after you pulled it. Please pull it again.,तुम्ही तो धावा केल्यानंतर भरणा प्रवेश सुधारणा करण्यात आली आहे. पुन्हा तो खेचणे करा.
-apps/erpnext/erpnext/stock/doctype/item/item.py +343,{0} entered twice in Item Tax,{0} आयटम कर दोनदा प्रवेश केला
+apps/erpnext/erpnext/stock/doctype/item/item.py +347,{0} entered twice in Item Tax,{0} आयटम कर दोनदा प्रवेश केला
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +105,Summary for this week and pending activities,या आठवड्यात आणि प्रलंबित उपक्रम सारांश
 DocType: Workstation,Rent Cost,भाडे खर्च
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +74,Please select month and year,महिना आणि वर्ष निवडा कृपया
@@ -338,23 +321,21 @@
 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","BOM, डिलिव्हरी टीप, खरेदी चलन, उत्पादन आदेश, पर्चेस, खरेदी पावती, विक्री चलन, विक्री आदेश, शेअर प्रवेश, Timesheet उपलब्ध"
 DocType: Item Tax,Tax Rate,कर दर
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Select Item,आयटम निवडा
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +540,Select Item,आयटम निवडा
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +143,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","आयटम: {0} बॅच कुशल, त्याऐवजी वापर स्टॉक प्रवेश \ शेअर मेळ वापर समेट जाऊ शकत नाही व्यवस्थापित"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +259,Purchase Invoice {0} is already submitted,चलन {0} आधीच सादर खरेदी
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +262,Purchase Invoice {0} is already submitted,चलन {0} आधीच सादर खरेदी
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Batch No must be same as {1} {2},रो # {0}: बॅच कोणत्याही समान असणे आवश्यक आहे {1} {2}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Convert to non-Group,नॉन-गट रूपांतरित करा
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +55,Purchase Receipt must be submitted,खरेदी पावती सादर करणे आवश्यक आहे
-DocType: Stock UOM Replace Utility,Current Stock UOM,वर्तमान शेअर UOM
 apps/erpnext/erpnext/config/stock.py +53,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}
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Your email address,आपला ई-मेल पत्ता
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +194,Please see attachment,संलग्नक पहा कृपया
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +203,Please see attachment,संलग्नक पहा कृपया
 DocType: Purchase Order,% Received,% प्राप्त
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +109,Water jet cutting,वॉटर जेट कटिंग
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +24,Setup Already Complete!!,सेटअप आधीच पूर्ण !!
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +20,Setup Already Complete!!,सेटअप आधीच पूर्ण !!
 ,Finished Goods,तयार वस्तू
 DocType: Delivery Note,Instructions,सूचना
 DocType: Quality Inspection,Inspected By,करून पाहणी केली
@@ -369,6 +350,7 @@
 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,चलन विनिमय
 DocType: Purchase Invoice Item,Item Name,आयटम नाव
+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",आयटम अंदाज qty आणि किमान qty आधारित सर्व गोदामे विचार जे &quot;स्टॉक संपला&quot; आहेत विनंती करणे
@@ -378,11 +360,10 @@
 ,Purchase Register,खरेदी नोंदणी
 DocType: Landed Cost Item,Applicable Charges,लागू असलेले शुल्क
 DocType: Workstation,Consumable Cost,Consumable खर्च
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,{0} ({1}) must have role 'Leave Approver',{0} ({1}) 'रजा मंजुरी' भूमिका असणे आवश्यक आहे
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +167,{0} ({1}) must have role 'Leave Approver',{0} ({1}) 'रजा मंजुरी' भूमिका असणे आवश्यक आहे
 DocType: Purchase Receipt,Vehicle Date,वाहन तारीख
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +39,Medical,वैद्यकीय
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +39,Medical,वैद्यकीय
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,तोट्याचा कारण
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +36,Tube beading,नळी मण्यांचे काम
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},वर्कस्टेशन सुट्टी यादी नुसार खालील तारखांना बंद आहे: {0}
 DocType: Employee,Single,सिंगल
 DocType: Issue,Attachment,संलग्नक
@@ -403,10 +384,8 @@
 DocType: Account,Is Group,आहे गट
 DocType: Stock Settings,Automatically Set Serial Nos based on FIFO,स्वयंचलितपणे FIFO आधारित संख्या सिरिअल सेट
 DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,चेक पुरवठादार चलन क्रमांक वेगळेपण
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +31,Thermoforming,Thermoforming
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +66,Slitting,Slitting
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +57,'To Case No.' cannot be less than 'From Case No.','प्रकरण क्रमांक' पेक्षा 'प्रकरण क्रमांक पासून' कमी असू शकत नाही
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +104,Non Profit,ना नफा
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +104,Non Profit,ना नफा
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_list.js +7,Not Started,प्रारंभ नाही
 DocType: Lead,Channel Partner,चॅनेल पार्टनर
 DocType: Account,Old Parent,जुने पालक
@@ -415,13 +394,12 @@
 apps/erpnext/erpnext/config/manufacturing.py +74,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 +512,Attribute {0} selected multiple times in Attributes Table,विशेषता {0} विशेषता टेबल अनेक वेळा निवड
+apps/erpnext/erpnext/stock/doctype/item/item.py +516,Attribute {0} selected multiple times in Attributes Table,विशेषता {0} विशेषता टेबल अनेक वेळा निवड
 DocType: Sales Order,Not Applicable,लागू नाही
 apps/erpnext/erpnext/config/hr.py +140,Holiday master.,सुट्टी मास्टर.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +19,Shell molding,शेल काठ
 DocType: Material Request Item,Required Date,आवश्यक तारीख
 DocType: Delivery Note,Billing Address,बिलिंग पत्ता
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +644,Please enter Item Code.,आयटम कोड प्रविष्ट करा.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +648,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,एकूण Qty
@@ -431,7 +409,7 @@
 DocType: Item Attribute,To Range,श्रेणी
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,सिक्युरिटीज आणि ठेवी
 DocType: Features Setup,Imports,आयात
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +144,Adhesive bonding,चिकटवता बाँडिंग
+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.,उपस्थित रेकॉर्ड.
@@ -439,26 +417,25 @@
 DocType: Sales Order Item,Used for Production Plan,उत्पादन योजना करीता वापरले जाते
 DocType: System Settings,Loading...,लोड करीत आहे ...
 DocType: DocField,Password,पासवर्ड
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +155,Fused deposition modeling,लघुप्रतिमा पदच्युती मॉडेलिंग
 DocType: Manufacturing Settings,Time Between Operations (in mins),(मि) प्रक्रिया दरम्यान वेळ
 DocType: Customer,Buyer of Goods and Services.,वस्तू आणि सेवा खरेदीदार.
 DocType: Journal Entry,Accounts Payable,देय खाती
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +24,Add Subscribers,सदस्य जोडा
 apps/erpnext/erpnext/public/js/feature_setup.js +220,""" does not exists",&quot;अस्तित्वात नाही
 DocType: Pricing Rule,Valid Upto,वैध पर्यंत
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +564,List a few of your customers. They could be organizations or individuals.,आपल्या ग्राहकांना काही करा. ते संघटना किंवा व्यक्तींना असू शकते.
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,List a few of your customers. They could be organizations or individuals.,आपल्या ग्राहकांना काही करा. ते संघटना किंवा व्यक्तींना असू शकते.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Direct Income,थेट उत्पन्न
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +33,"Can not filter based on Account, if grouped by Account","खाते प्रमाणे गटात समाविष्ट केले, तर खाते आधारित फिल्टर करू शकत नाही"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +88,Administrative Officer,प्रशासकीय अधिकारी
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Administrative Officer,प्रशासकीय अधिकारी
 DocType: Payment Tool,Received Or Paid,मिळालेली किंवा दिलेली
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +318,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 +305,Please enter Warehouse for which Material Request will be raised,साहित्य विनंती उठविला जाईल जे भांडार प्रविष्ट करा
 DocType: Production Order,Additional Operating Cost,अतिरिक्त कार्यकारी खर्च
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +20,Cosmetics,सौंदर्यप्रसाधन
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,सौंदर्यप्रसाधन
 DocType: DocField,Type,प्रकार
-apps/erpnext/erpnext/stock/doctype/item/item.py +417,"To merge, following properties must be same for both items","विलीन करण्यासाठी, खालील गुणधर्म दोन्ही आयटम समान असणे आवश्यक आहे"
+apps/erpnext/erpnext/stock/doctype/item/item.py +421,"To merge, following properties must be same for both items","विलीन करण्यासाठी, खालील गुणधर्म दोन्ही आयटम समान असणे आवश्यक आहे"
 DocType: Communication,Subject,विषय
 DocType: Shipping Rule,Net Weight,नेट वजन
 DocType: Employee,Emergency Phone,आणीबाणी फोन
@@ -468,7 +445,6 @@
 DocType: Journal Entry,Difference (Dr - Cr),फरक (डॉ - कोटी)
 DocType: Account,Profit and Loss,नफा व तोटा
 apps/erpnext/erpnext/config/stock.py +293,Managing Subcontracting,व्यवस्थापकीय Subcontracting
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +58,New UOM must NOT be of type Whole Number,नवी UOM प्रकार होल क्रमांक असणे आवश्यक नाही
 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 +47,Account {0} does not belong to company: {1},{0} खाते कंपनी संबंधित नाही: {1}
@@ -487,14 +463,14 @@
 DocType: Purchase Invoice,Supplier Invoice No,पुरवठादार चलन नाही
 DocType: Territory,For reference,संदर्भासाठी
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +154,"Cannot delete Serial No {0}, as it is used in stock transactions","हटवू शकत नाही सिरियल नाही {0}, तो स्टॉक व्यवहार वापरले जाते म्हणून"
-apps/erpnext/erpnext/public/js/account_tree_grid.js +52,Closing (Cr),बंद (कोटी)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +227,Closing (Cr),बंद (कोटी)
 DocType: Serial No,Warranty Period (Days),वॉरंटी कालावधी (दिवस)
 DocType: Installation Note Item,Installation Note Item,प्रतिष्ठापन टीप आयटम
 ,Pending Qty,प्रलंबित Qty
 DocType: Job Applicant,Thread HTML,थ्रेड HTML
 DocType: Company,Ignore,दुर्लक्ष करा
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +86,SMS sent to following numbers: {0},एसएमएस खालील संख्या पाठविले: {0}
-apps/erpnext/erpnext/controllers/buying_controller.py +135,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,उप-करारबद्ध खरेदी पावती बंधनकारक पुरवठादार कोठार
+apps/erpnext/erpnext/controllers/buying_controller.py +126,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,उप-करारबद्ध खरेदी पावती बंधनकारक पुरवठादार कोठार
 DocType: Pricing Rule,Valid From,पासून पर्यंत वैध
 DocType: Sales Invoice,Total Commission,एकूण आयोग
 DocType: Pricing Rule,Sales Partner,विक्री भागीदार
@@ -502,7 +478,7 @@
 DocType: Monthly Distribution,"**Monthly Distribution** helps you distribute your budget across months if you have seasonality in your business.
 
 To distribute a budget using this distribution, set this **Monthly Distribution** in the **Cost Center**","** मासिक वितरण ** आपल्या व्यवसायात तुम्हाला हंगामी असल्यास आपण महिने ओलांडून आपले बजेट वाटप करण्यास मदत करते. **, या वितरण वापरून कमी खर्चात वाटप ** खर्च केंद्रातील ** या ** मासिक वितरण सेट करण्यासाठी"
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +183,No records found in the Invoice table,चलन टेबल आढळली नाही रेकॉर्ड
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +130,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 +84,Financial / accounting year.,आर्थिक / लेखा वर्षी.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","क्षमस्व, सिरीयल क्रमांक विलीन करणे शक्य नाही"
@@ -518,25 +494,25 @@
 DocType: Sales Order,Billing and Delivery Status,बिलिंग आणि वितरण स्थिती
 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/setup/page/setup_wizard/setup_wizard_page.html +16,Previous,मागील
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard_page.html +16,Previous,मागील
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +620,Sales Return,विक्री परत
 DocType: Production Planning Tool,Select Sales Orders from which you want to create Production Orders.,आपण उत्पादन ऑर्डर तयार करू इच्छित असलेल्या पासून विक्री ऑर्डर निवडा.
 DocType: Item,Delivered by Supplier (Drop Ship),पुरवठादार द्वारे वितरित (ड्रॉप जहाज)
 apps/erpnext/erpnext/config/hr.py +120,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.,ग्राहक डेटाबेस.
 DocType: Quotation,Quotation To,करण्यासाठी कोटेशन
 DocType: Lead,Middle Income,मध्यम उत्पन्न
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),उघडणे (कोटी)
 apps/erpnext/erpnext/accounts/utils.py +193,Allocated amount can not be negative,रक्कम नकारात्मक असू शकत नाही
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +123,Tumbling,Tumbling
 DocType: Purchase Order Item,Billed Amt,बिल रक्कम
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,स्टॉक नोंदी केले जातात जे विरोधात लॉजिकल वखार.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +92,Reference No & Reference Date is required for {0},संदर्भ नाही आणि संदर्भ तारीख आवश्यक आहे {0}
 DocType: Event,Wednesday,बुधवारी
 DocType: Sales Invoice,Customer's Vendor,ग्राहक च्या विक्रेता
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +214,Production Order is Mandatory,उत्पादन ऑर्डर अनिवार्य आहे
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +139,Proposal Writing,प्रस्ताव लेखन
+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/stock/stock_ledger.py +336,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},नकारात्मक शेअर त्रुटी ({6}) आयटम साठी {0} कोठार मध्ये {1} वर {2} {3} मधील {4} {5}
 DocType: Fiscal Year Company,Fiscal Year Company,आर्थिक वर्ष कंपनी
@@ -559,7 +535,7 @@
 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/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.py +179,Please install dropbox python module,ड्रॉपबॉक्स पायथन मॉड्युल स्थापित करा
 DocType: Employee,Passport Number,पासपोर्ट क्रमांक
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +82,Manager,व्यवस्थापक
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Manager,व्यवस्थापक
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +494,From Purchase Receipt,खरेदी पावती पासून
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +219,Same item has been entered multiple times.,समान आयटम अनेक वेळा केलेला आहे.
 DocType: SMS Settings,Receiver Parameter,स्वीकारणारा मापदंड
@@ -567,10 +543,9 @@
 DocType: Sales Person,Sales Person Targets,विक्री व्यक्ती लक्ष्य
 apps/frappe/frappe/public/js/frappe/form/workflow.js +116,To,करण्यासाठी
 apps/frappe/frappe/templates/base.html +145,Please enter email address,ई-मेल पत्ता प्रविष्ट करा
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +35,End tube forming,लागत समाप्त ट्यूब
 DocType: Production Order Operation,In minutes,मिनिटे
 DocType: Issue,Resolution Date,ठराव तारीख
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +635,Please set default Cash or Bank account in Mode of Payment {0},मोड ऑफ पेमेंट्स मध्ये डीफॉल्ट रोख किंवा बँक खाते सेट करा {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +637,Please set default Cash or Bank account in Mode of Payment {0},मोड ऑफ पेमेंट्स मध्ये डीफॉल्ट रोख किंवा बँक खाते सेट करा {0}
 DocType: Selling Settings,Customer Naming By,करून ग्राहक नामांकन
 apps/erpnext/erpnext/accounts/doctype/account/account.js +67,Convert to Group,गट रूपांतरित
 DocType: Activity Cost,Activity Type,क्रियाकलाप प्रकार
@@ -578,12 +553,12 @@
 DocType: Customer,Fixed Days,मुदत दिवस
 DocType: Sales Invoice,Packing List,पॅकिंग यादी
 apps/erpnext/erpnext/config/buying.py +28,Purchase Orders given to Suppliers.,खरेदी ऑर्डर पुरवठादार देण्यात.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +43,Publishing,प्रकाशन
+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 +198,{0}: {1} not found in Invoice Details table,{0}: {1} चलन तपशील तक्ता आढळले नाही
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,{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 +208,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,देखभाल भेट द्या {0} या विक्री ऑर्डर रद्द आधी रद्द करणे आवश्यक आहे
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +203,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),उघडणे (डॉ)
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},पोस्टिंग शिक्का नंतर असणे आवश्यक आहे {0}
@@ -595,7 +570,6 @@
 DocType: Pricing Rule,Sales Manager,विक्री व्यवस्थापक
 apps/frappe/frappe/public/js/frappe/model/model.js +492,Rename,पुनर्नामित करा
 DocType: Journal Entry,Write Off Amount,रक्कम बंद लिहा
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +52,Bending,Bending
 apps/frappe/frappe/core/page/user_permissions/user_permissions.js +246,Allow User,सदस्य परवानगी द्या
 DocType: Journal Entry,Bill No,बिल नाही
 DocType: Purchase Invoice,Quarterly,तिमाही
@@ -605,17 +579,16 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Please enter item details,आयटम तपशील प्रविष्ट करा
 DocType: Purchase Receipt,Other Details,इतर तपशील
 DocType: Account,Accounts,खाते
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +67,Marketing,विपणन
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +65,Straight shearing,नीट shearing
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +67,Marketing,विपणन
 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/stock/doctype/purchase_receipt/purchase_receipt.py +99,Rejected Warehouse is mandatory against regected item,नाकारल्याचे कोठार regected आयटम विरुद्ध अनिवार्य आहे
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +102,Rejected Warehouse is mandatory against regected item,नाकारल्याचे कोठार regected आयटम विरुद्ध अनिवार्य आहे
 DocType: Account,Expenses Included In Valuation,खर्च मूल्यांकन मध्ये समाविष्ट
 DocType: Employee,Provide email id registered in company,कंपनी मध्ये नोंदणीकृत ई-मेल आयडी द्या
 DocType: Hub Settings,Seller City,विक्रेता सिटी
 DocType: Email Digest,Next email will be sent on:,पुढील ई-मेल वर पाठविण्यात येईल:
 DocType: Offer Letter Term,Offer Letter Term,पत्र मुदत ऑफर
-apps/erpnext/erpnext/stock/doctype/item/item.py +492,Item has variants.,आयटम रूपे आहेत.
+apps/erpnext/erpnext/stock/doctype/item/item.py +496,Item has variants.,आयटम रूपे आहेत.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,आयटम {0} आढळले नाही
 DocType: Bin,Stock Value,शेअर मूल्य
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,वृक्ष प्रकार
@@ -624,10 +597,9 @@
 DocType: Material Request Item,Quantity and Warehouse,प्रमाण आणि कोठार
 DocType: Sales Invoice,Commission Rate (%),आयोगाने दर (%)
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +172,"Against Voucher Type must be one of Sales Order, Sales Invoice or Journal Entry","व्हाउचर विरुद्ध प्रकार विक्री आदेश एक, विक्री चलन किंवा जर्नल प्रवेश असणे आवश्यक आहे"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +139,Biomachining,Biomachining
 apps/erpnext/erpnext/setup/utils.py +89,Unable to find exchange rate,विनिमय दर शोधण्यात अक्षम
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +7,Aerospace,एरोस्पेस
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +19,Welcome,आपले स्वागत आहे
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +7,Aerospace,एरोस्पेस
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +40,Welcome,आपले स्वागत आहे
 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.,वस्तू पुरवठादार प्राप्त झाली.
@@ -650,19 +622,19 @@
 DocType: Employee,Cell Number,सेल क्रमांक
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,गमावले
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +120,You can not enter current voucher in 'Against Journal Entry' column,रकान्याच्या &#39;जर्नल प्रवेश विरुद्ध&#39; सध्याच्या व्हाउचर प्रविष्ट करू शकत नाही
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +25,Energy,ऊर्जा
+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.,मासिक पगार विधान.
 DocType: Item Group,Website Specifications,वेबसाइट वैशिष्ट्य
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +205,New Account,नवीन खाते
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +21,{0}: From {0} of type {1},{0}: पासून {0} प्रकारच्या {1}
-apps/erpnext/erpnext/controllers/buying_controller.py +283,Row {0}: Conversion Factor is mandatory,रो {0}: रूपांतरण फॅक्टर अनिवार्य आहे
+apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,रो {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.,लेखा नोंदी पानांचे नोडस् विरुद्ध केले जाऊ शकते. गट विरुद्ध नोंदी परवानगी नाही.
 DocType: ToDo,High,उच्च
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +361,Cannot deactivate or cancel BOM as it is linked with other BOMs,निष्क्रिय किंवा इतर BOMs निगडीत आहे म्हणून BOM रद्द करू शकत नाही
 DocType: Opportunity,Maintenance,देखभाल
 DocType: User,Male,पुरुष
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +182,Purchase Receipt number required for Item {0},आयटम आवश्यक खरेदी पावती क्रमांक {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +183,Purchase Receipt number required for Item {0},आयटम आवश्यक खरेदी पावती क्रमांक {0}
 DocType: Item Attribute Value,Item Attribute Value,आयटम मूल्य विशेषता
 apps/erpnext/erpnext/config/crm.py +64,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.
@@ -691,10 +663,9 @@
 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 +324,"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/page/setup_wizard/fixtures/industry_type.py +13,Biotechnology,जैवतंत्रज्ञान
+apps/erpnext/erpnext/controllers/accounts_controller.py +325,"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,कार्यालय देखभाल खर्च
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +53,Hemming,Hemming
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +66,Please enter Item first,पहिल्या आयटम प्रविष्ट करा
 DocType: Account,Liability,दायित्व
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +62,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,मंजूर रक्कम रो मागणी रक्कम पेक्षा जास्त असू शकत नाही {0}.
@@ -707,10 +678,10 @@
 DocType: Company,Default Bank Account,मुलभूत बँक खाते
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +47,"To filter based on Party, select Party Type first","पार्टी आधारित फिल्टर कर यासाठी, पयायय पार्टी पहिल्या टाइप करा"
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},आयटम द्वारे वितरीत नाही कारण &#39;अद्यतन शेअर&#39; तपासणे शक्य नाही {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Nos,क्र
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,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 +627,My Invoices,माझे चलने
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +629,My Invoices,माझे चलने
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,नाही कर्मचारी आढळले
 DocType: Purchase Order,Stopped,थांबवले
 DocType: Item,If subcontracted to a vendor,विक्रेता करण्यासाठी subcontracted तर
@@ -729,35 +700,33 @@
 DocType: Features Setup,"To enable ""Point of Sale"" features",&quot;विक्री पॉइंट&quot; वैशिष्ट्ये सक्षम करण्यासाठी
 DocType: Bin,Moving Average Rate,सरासरी दर हलवित
 DocType: Production Planning Tool,Select Items,निवडा
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,{0} against Bill {1} dated {2},{0} बिल विरुद्ध {1} दिनांक {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +328,{0} against Bill {1} dated {2},{0} बिल विरुद्ध {1} दिनांक {2}
 DocType: Comment,Reference Name,संदर्भ नाव
 DocType: Maintenance Visit,Completion Status,पूर्ण स्थिती
 DocType: Sales Invoice Item,Target Warehouse,लक्ष्य कोठार
 DocType: Item,Allow over delivery or receipt upto this percent,या टक्के पर्यंत चेंडू किंवा पावती प्रती परवानगी द्या
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +49,Expected Delivery Date cannot be before Sales Order Date,अपेक्षित वितरण तारीख विक्री ऑर्डर तारीख आधी असू शकत नाही
 DocType: Upload Attendance,Import Attendance,आयात हजेरी
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +17,All Item Groups,सर्व आयटम गट
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +17,All Item Groups,सर्व आयटम गट
 DocType: Process Payroll,Activity Log,क्रियाकलाप लॉग
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +30,Net Profit / Loss,निव्वळ नफा / तोटा
 apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,स्वयंचलितपणे व्यवहार सादर संदेश तयार करा.
 DocType: Production Order,Item To Manufacture,आयटम निर्मिती करणे
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +16,Permanent mold casting,स्थायी मूस निर्णायक
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} स्थिती {2} आहे
 apps/erpnext/erpnext/config/learn.py +172,Purchase Order to Payment,भरणा करण्यासाठी खरेदी
 DocType: Sales Order Item,Projected Qty,अंदाज Qty
 DocType: Sales Invoice,Payment Due Date,पैसे भरण्याची शेवटची तारिख
 DocType: Newsletter,Newsletter Manager,वृत्तपत्र व्यवस्थापक
-apps/erpnext/erpnext/stock/doctype/item/item.js +229,Item Variant {0} already exists with same attributes,आयटम व्हेरियंट {0} आधीच समान गुणधर्म अस्तित्वात
+apps/erpnext/erpnext/stock/doctype/item/item.js +231,Item Variant {0} already exists with same attributes,आयटम व्हेरियंट {0} आधीच समान गुणधर्म अस्तित्वात
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening',&#39;उघडणे&#39;
 DocType: Notification Control,Delivery Note Message,डिलिव्हरी टीप संदेश
 DocType: Expense Claim,Expenses,खर्च
 DocType: Item Variant Attribute,Item Variant Attribute,आयटम व्हेरियंट विशेषता
 ,Purchase Receipt Trends,खरेदी पावती ट्रेन्ड
 DocType: Appraisal,Select template from which you want to get the Goals,तुम्ही ध्येय प्राप्त करू इच्छित असलेल्या टेम्प्लेट निवडा
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +77,Research & Development,संशोधन आणि विकास
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Research & Development,संशोधन आणि विकास
 ,Amount to Bill,बिल रक्कम
 DocType: Company,Registration Details,नोंदणी तपशील
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +75,Staking,Staking
 DocType: Item,Re-Order Qty,पुन्हा-क्रम Qty
 DocType: Leave Block List Date,Leave Block List Date,ब्लॉक यादी तारीख सोडा
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +25,Scheduled to send to {0},पाठविण्याची अनुसूचित {0}
@@ -768,18 +737,16 @@
 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/hr/doctype/leave_allocation/leave_allocation.py +71,Cannot carry forward {0},कॅरी फॉरवर्ड करू शकत नाही {0}
 apps/erpnext/erpnext/accounts/doctype/account/account.py +91,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","आधीच क्रेडिट खाते शिल्लक, आपण &#39;डेबिट&#39; म्हणून &#39;शिल्लक असणे आवश्यक आहे&#39; सेट करण्याची परवानगी नाही"
 DocType: Account,Balance must be,शिल्लक असणे आवश्यक आहे
 DocType: Hub Settings,Publish Pricing,किंमत प्रकाशित
 DocType: Notification Control,Expense Claim Rejected Message,खर्च हक्क नाकारला संदेश
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +145,Nailing,Nailing
 ,Available Qty,उपलब्ध Qty
 DocType: Purchase Taxes and Charges,On Previous Row Total,मागील पंक्ती एकूण रोजी
 DocType: Salary Slip,Working Days,कामाचे दिवस
 DocType: Serial No,Incoming Rate,येणार्या दर
 DocType: Packing Slip,Gross Weight,एकूण वजन
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +410,The name of your company for which you are setting up this system.,"आपल्या कंपनीचे नाव, जे आपण या प्रणाली सेट आहेत."
+apps/erpnext/erpnext/public/js/setup_wizard.js +158,The name of your company for which you are setting up this system.,"आपल्या कंपनीचे नाव, जे आपण या प्रणाली सेट आहेत."
 DocType: HR Settings,Include holidays in Total no. of Working Days,नाही एकूण मध्ये सुटी यांचा समावेश आहे. कार्यरत दिवस
 DocType: Job Applicant,Hold,धरा
 DocType: Employee,Date of Joining,प्रवेश दिनांक
@@ -789,7 +756,6 @@
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +3,View Subscribers,पहा सदस्य
 DocType: Purchase Invoice Item,Purchase Receipt,खरेदी पावती
 ,Received Items To Be Billed,प्राप्त आयटम बिल करायचे
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +114,Abrasive blasting,कठोर झपाटा
 DocType: Employee,Ms,श्रीमती
 apps/erpnext/erpnext/config/accounts.py +148,Currency exchange rate master.,चलन विनिमय दर मास्टर.
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +253,Unable to find Time Slot in the next {0} days for Operation {1},ऑपरेशन पुढील {0} दिवसांत वेळ शोधू शकला नाही {1}
@@ -801,7 +767,7 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +209,Serial No {0} does not belong to Item {1},सिरियल नाही {0} आयटम संबंधित नाही {1}
 DocType: Purchase Receipt Item Supplied,Required Qty,आवश्यक Qty
 DocType: Bank Reconciliation,Total Amount,एकूण रक्कम
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +32,Internet Publishing,इंटरनेट प्रकाशन
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,इंटरनेट प्रकाशन
 DocType: Production Planning Tool,Production Orders,उत्पादन ऑर्डर
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +35,Balance Value,शिल्लक मूल्य
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,विक्री किंमत सूची
@@ -812,7 +778,7 @@
 DocType: Supplier,Default Payable Accounts,मुलभूत देय खाती
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,{0} कर्मचारी सक्रिय नाही आहे किंवा अस्तित्वात नाही
 DocType: Features Setup,Item Barcode,आयटम बारकोड
-apps/erpnext/erpnext/stock/doctype/item/item.py +487,Item Variants {0} updated,आयटम रूपे {0} अद्ययावत
+apps/erpnext/erpnext/stock/doctype/item/item.py +491,Item Variants {0} updated,आयटम रूपे {0} अद्ययावत
 DocType: Quality Inspection Reading,Reading 6,6 वाचन
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,चलन आगाऊ खरेदी
 DocType: Address,Shop,दुकान
@@ -821,7 +787,7 @@
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,या मोडमध्ये निवडलेले असताना मुलभूत बँक / रोख खाते आपोआप पीओएस चलन अद्यतनित केले जाईल.
 DocType: Employee,Permanent Address Is,स्थायी पत्ता आहे
 DocType: Production Order Operation,Operation completed for how many finished goods?,ऑपरेशन किती तयार वस्तू पूर्ण?
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +491,The Brand,ब्रँड
+apps/erpnext/erpnext/public/js/setup_wizard.js +237,The Brand,ब्रँड
 apps/erpnext/erpnext/controllers/status_updater.py +163,Allowance for over-{0} crossed for Item {1}.,{0} आयटम साठी पार over- भत्ता {1}.
 DocType: Employee,Exit Interview Details,बाहेर पडा मुलाखत तपशील
 DocType: Item,Is Purchase Item,खरेदी आयटम आहे
@@ -841,16 +807,16 @@
 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,सेट भरणा रक्कम = शिल्लक रक्कम
 DocType: Contact Us Settings,Address Line 1,पत्ता ओळ 1
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Variance,फरक
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +392,Company Name,कंपनी नाव
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +53,Variance,फरक
+,Company Name,कंपनी नाव
 DocType: SMS Center,Total Message(s),एकूण संदेश (चे)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +515,Select Item for Transfer,हस्तांतरणासाठी आयटम निवडा
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +538,Select Item for Transfer,हस्तांतरणासाठी आयटम निवडा
 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.,चेक जमा होते जेथे बँक खाते निवडा प्रमुख.
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,वापरकर्ता व्यवहार दर सूची दर संपादित करण्याची परवानगी द्या
 DocType: Pricing Rule,Max Qty,कमाल Qty
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +106,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,रो {0}: विक्री / खरेदी आदेशा भरणा नेहमी आगाऊ म्हणून चिन्हांकित पाहिजे
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +16,Chemical,रासायनिक
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,रासायनिक
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +693,All items have already been transferred for this Production Order.,सर्व आयटम आधीच या उत्पादन ऑर्डर बदल्या करण्यात आल्या आहेत.
 DocType: Process Payroll,Select Payroll Year and Month,वेतनपट वर्ष आणि महिना निवडा
 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""",योग्य गट (सहसा निधी अर्ज&gt; वर्तमान मालमत्ता&gt; बँक खाते जा टाइप करा) बाल जोडा वर क्लिक करून (नवीन खाते तयार &quot;बँक&quot;
@@ -861,12 +827,12 @@
 DocType: Item,Inspection Criteria,तपासणी निकष
 apps/erpnext/erpnext/config/accounts.py +101,Tree of finanial Cost Centers.,Finanial खर्च केंद्रांची वृक्ष.
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,हस्तांतरण
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +492,Upload your letter head and logo. (you can edit them later).,आपले पत्र डोके आणि लोगो अपलोड करा. (आपण नंतर संपादित करू शकता).
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +156,White,व्हाइट
+apps/erpnext/erpnext/public/js/setup_wizard.js +238,Upload your letter head and logo. (you can edit them later).,आपले पत्र डोके आणि लोगो अपलोड करा. (आपण नंतर संपादित करू शकता).
+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/setup/page/setup_wizard/setup_wizard.js +362,Attach Your Picture,आपले चित्र संलग्न
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Make ,करा
+apps/erpnext/erpnext/public/js/setup_wizard.js +112,Attach Your Picture,आपले चित्र संलग्न
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +540,Make ,करा
 DocType: Journal Entry,Total Amount in Words,शब्द एकूण रक्कम
 DocType: Workflow State,Stop,थांबवा
 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 संपर्क साधा.
@@ -875,14 +841,13 @@
 DocType: Lead,Next Contact Date,पुढील संपर्क तारीख
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,Qty उघडत
 DocType: Holiday List,Holiday List Name,सुट्टी यादी नाव
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +168,Stock Options,शेअर पर्याय
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +168,Stock Options,शेअर पर्याय
 DocType: Journal Entry Account,Expense Claim,खर्च दावा
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +181,Qty for {0},साठी Qty {0}
 DocType: Leave Application,Leave Application,रजेचा अर्ज
 apps/erpnext/erpnext/config/hr.py +77,Leave Allocation Tool,वाटप साधन सोडा
 DocType: Leave Block List,Leave Block List Dates,ब्लॉक यादी तारखा सोडा
 DocType: Company,If Monthly Budget Exceeded (for expense account),मासिक अर्थसंकल्प (खर्च खात्यासाठी) ओलांडली तर
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +56,Trimming,Trimming
 DocType: Workstation,Net Hour Rate,नेट तास दर
 DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,उतरले खर्च खरेदी पावती
 DocType: Company,Default Terms,मुलभूत अटी
@@ -890,10 +855,9 @@
 DocType: POS Profile,Cash/Bank Account,रोख / बँक खाते
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,Removed items with no change in quantity or value.,प्रमाणात किंवा मूल्य नाही बदल काढली आयटम.
 DocType: Delivery Note,Delivery To,वितरण
-apps/erpnext/erpnext/stock/doctype/item/item.py +509,Attribute table is mandatory,विशेषता टेबल अनिवार्य आहे
+apps/erpnext/erpnext/stock/doctype/item/item.py +513,Attribute table is mandatory,विशेषता टेबल अनिवार्य आहे
 DocType: Production Planning Tool,Get Sales Orders,विक्री ऑर्डर मिळवा
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} नकारात्मक असू शकत नाही
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +103,Filing,दाखल
 apps/erpnext/erpnext/templates/form_grid/item_grid.html +72,Discount,सवलत
 DocType: Features Setup,Purchase Discounts,खरेदी सवलत
 DocType: Workstation,Wages,पगार
@@ -910,6 +874,7 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +112,You are the Expense Approver for this record. Please Update the 'Status' and Save,आपण या रेकॉर्डसाठी खर्चाचे माफीचा साक्षीदार आहेत. &#39;स्थिती&#39; आणि जतन करा अद्यतनित करा
 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 +136,"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 +194,Serial No {0} is under maintenance contract upto {1},सिरियल नाही {0} पर्यंत देखभाल करार अंतर्गत आहे {1}
@@ -918,7 +883,7 @@
 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,आयटम &#39;बटण खरेदी पावत्या आयटम मिळवा&#39; वापर करून समाविष्ट करणे आवश्यक आहे
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,विक्री खर्च
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Buying,मानक खरेदी
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +120,Standard Buying,मानक खरेदी
 DocType: GL Entry,Against,विरुद्ध
 DocType: Item,Default Selling Cost Center,मुलभूत विक्री खर्च केंद्र
 DocType: Sales Partner,Implementation Partner,अंमलबजावणी भागीदार
@@ -939,29 +904,29 @@
 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/setup/page/setup_wizard/setup_wizard.js +588,List a few of your suppliers. They could be organizations or individuals.,आपल्या पुरवठादार काही करा. ते संघटना किंवा व्यक्तींना असू शकते.
+apps/erpnext/erpnext/public/js/setup_wizard.js +326,List a few of your suppliers. They could be organizations or individuals.,आपल्या पुरवठादार काही करा. ते संघटना किंवा व्यक्तींना असू शकते.
 DocType: Company,Default Currency,पूर्वनिर्धारीत चलन
 DocType: Contact,Enter designation of this Contact,या संपर्क पद प्रविष्ट करा
 DocType: Contact Us Settings,Address,पत्ता
 DocType: Expense Claim,From Employee,कर्मचारी पासून
-apps/erpnext/erpnext/controllers/accounts_controller.py +338,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,चेतावनी: प्रणाली आयटम रक्कम पासून overbilling तपासा नाही {0} मधील {1} शून्य आहे
+apps/erpnext/erpnext/controllers/accounts_controller.py +339,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,चेतावनी: प्रणाली आयटम रक्कम पासून overbilling तपासा नाही {0} मधील {1} शून्य आहे
 DocType: Journal Entry,Make Difference Entry,फरक प्रवेश करा
 DocType: Upload Attendance,Attendance From Date,तारीख पासून उपस्थिती
 DocType: Appraisal Template Goal,Key Performance Area,की कामगिरी क्षेत्र
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +54,Transportation,वाहतूक
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +54,Transportation,वाहतूक
 apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +67, and year: ,आणि वर्ष:
 DocType: Email Digest,Annual Expense,वार्षिक खर्च
 DocType: SMS Center,Total Characters,एकूण वर्ण
-apps/erpnext/erpnext/controllers/buying_controller.py +139,Please select BOM in BOM field for Item {0},आयटम साठी BOM क्षेत्रात BOM निवडा कृपया {0}
+apps/erpnext/erpnext/controllers/buying_controller.py +130,Please select BOM in BOM field for Item {0},आयटम साठी BOM क्षेत्रात BOM निवडा कृपया {0}
 DocType: C-Form Invoice Detail,C-Form Invoice Detail,सी-फॉर्म चलन तपशील
 DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,भरणा मेळ चलन
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +32,Contribution %,योगदान%
 DocType: Item,website page link,संकेतस्थळावर दुवा
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +192,Let's prepare the system for first use.,च्या प्रथम वापर प्रणाली तयार द्या.
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +242,Let's prepare the system for first use.,च्या प्रथम वापर प्रणाली तयार द्या.
 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 +214,Production Order {0} must be cancelled before cancelling this Sales Order,उत्पादन ऑर्डर {0} या विक्री ऑर्डर रद्द आधी रद्द करणे आवश्यक आहे
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +209,Production Order {0} must be cancelled before cancelling this Sales Order,उत्पादन ऑर्डर {0} या विक्री ऑर्डर रद्द आधी रद्द करणे आवश्यक आहे
 ,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.,वेळ नोंदी निवडा आणि एक नवीन विक्री चलन तयार करण्यासाठी सबमिट करा.
@@ -981,14 +946,13 @@
 DocType: Sales Invoice Advance,Sales Invoice Advance,विक्री चलन आगाऊ
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +398,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/page/setup_wizard/install_fixtures.py +75,Management,व्यवस्थापन
+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/setup/page/setup_wizard/fixtures/operations.py +14,Investment casting,गुंतवणूक निर्णायक
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +51,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""","या जिच्यामध्ये variant आयटम कोड जोडलेली जाईल. आपल्या संक्षेप &quot;एम&quot;, आहे आणि उदाहरणार्थ, आयटम कोड &quot;टी-शर्ट&quot;, &quot;टी-शर्ट-एम&quot; असेल जिच्यामध्ये variant आयटम कोड आहे"
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,तुम्ही पगाराच्या स्लिप्स जतन एकदा (शब्दात) निव्वळ वेतन दृश्यमान होईल.
 apps/frappe/frappe/core/doctype/user/user_list.js +12,Active,सक्रिय
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +154,Blue,ब्लू
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +154,Blue,ब्लू
 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,पुढील नोडस् फक्त &#39;ग्रुप प्रकार नोडस् अंतर्गत तयार केले जाऊ शकते
@@ -998,18 +962,16 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +22,POS Profile {0} already created for user: {1} and company {2},पीओएस प्रोफाइल {0} आधीपासूनच प्रयोक्ता तयार: {1} आणि कंपनी {2}
 DocType: Purchase Order Item,UOM Conversion Factor,UOM रुपांतर फॅक्टर
 DocType: Stock Settings,Default Item Group,मुलभूत आयटम गट
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +156,Laminated object manufacturing,लॅमिनेटेड ऑब्जेक्ट उत्पादन
 apps/erpnext/erpnext/config/buying.py +13,Supplier database.,पुरवठादार डेटाबेस.
 DocType: Account,Balance Sheet,ताळेबंद
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +561,Cost Center For Item with Item Code ',&#39;आयटम कोड आयटम केंद्र किंमत
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +45,Stretch forming,लागत ताणून
 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 +210,"Further accounts can be made under Groups, but entries can be made against non-Groups","पुढील खाती गट अंतर्गत केले जाऊ शकते, पण नोंदी नॉन-गट सुरू केले"
 apps/erpnext/erpnext/config/hr.py +125,Tax and other salary deductions.,कर आणि इतर पगार कपात.
 DocType: Lead,Lead,लीड
 DocType: Email Digest,Payables,देय
 DocType: Account,Warehouse,कोठार
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +90,Row #{0}: Rejected Qty can not be entered in Purchase Return,रो # {0}: Qty खरेदी परत प्रविष्ट करणे शक्य नाही नाकारली
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +93,Row #{0}: Rejected Qty can not be entered in Purchase Return,रो # {0}: Qty खरेदी परत प्रविष्ट करणे शक्य नाही नाकारली
 ,Purchase Order Items To Be Billed,पर्चेस आयटम बिल करायचे
 DocType: Purchase Invoice Item,Net Rate,नेट दर
 DocType: Purchase Invoice Item,Purchase Invoice Item,चलन आयटम खरेदी
@@ -1024,13 +986,13 @@
 DocType: Global Defaults,Current Fiscal Year,चालू आर्थिक वर्षात वर्ष
 DocType: Global Defaults,Disable Rounded Total,गोळाबेरीज एकूण अक्षम करा
 DocType: Lead,Call,कॉल
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +384,'Entries' cannot be empty,&#39;नोंदी&#39; रिकामे असू शकत नाही
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +386,'Entries' cannot be empty,&#39;नोंदी&#39; रिकामे असू शकत नाही
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},सह डुप्लिकेट सलग {0} त्याच {1}
 ,Trial Balance,चाचणी शिल्लक
 apps/erpnext/erpnext/config/hr.py +205,Setting up Employees,कर्मचारी सेट अप
 apps/erpnext/erpnext/public/js/feature_setup.js +220,"Grid """,ग्रिड &quot;
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +150,Please select prefix first,पहिल्या उपसर्ग निवडा कृपया
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +138,Research,संशोधन
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +138,Research,संशोधन
 DocType: Maintenance Visit Purpose,Work Done,कार्य पूर्ण झाले
 apps/erpnext/erpnext/controllers/item_variant.py +25,Please specify at least one attribute in the Attributes table,विशेषता टेबल मध्ये किमान एक गुणधर्म निर्दिष्ट करा
 DocType: Contact,User ID,वापरकर्ता आयडी
@@ -1038,10 +1000,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +57,View Ledger,पहा लेजर
 DocType: File,Lft,Lft
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,लवकरात लवकर
-apps/erpnext/erpnext/stock/doctype/item/item.py +394,"An Item Group exists with same name, please change the item name or rename the item group","एक आयटम गट त्याच नावाने अस्तित्वात नाही, आयटम नाव बदलू किंवा आयटम गटाचे नाव कृपया"
+apps/erpnext/erpnext/stock/doctype/item/item.py +398,"An Item Group exists with same name, please change the item name or rename the item group","एक आयटम गट त्याच नावाने अस्तित्वात नाही, आयटम नाव बदलू किंवा आयटम गटाचे नाव कृपया"
 DocType: Communication,Delivery Status,वितरण स्थिती
 DocType: Production Order,Manufacture against Sales Order,विक्री ऑर्डर विरुद्ध उत्पादन
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +517,Rest Of The World,उर्वरित जग
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +455,Rest Of The World,उर्वरित जग
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,आयटम {0} बॅच असू शकत नाही
 ,Budget Variance Report,अर्थसंकल्प फरक अहवाल
 DocType: Salary Slip,Gross Pay,एकूण वेतन
@@ -1052,13 +1014,11 @@
 DocType: BOM Item,Item Description,आयटम वर्णन
 DocType: Payment Tool,Payment Mode,भरणा मोड
 DocType: Purchase Invoice,Is Recurring,आवर्ती आहे
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +154,Direct metal laser sintering,थेट मेटल लेसर sintering
 DocType: Purchase Order,Supplied Items,पुरवले आयटम
 DocType: Production Order,Qty To Manufacture,निर्मिती करणे Qty
 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,तात्पुरती उघडणे
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +41,Cryorolling,Cryorolling
 ,Employee Leave Balance,कर्मचारी रजा शिल्लक
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +128,Balance for Account {0} must always be {1},खाते साठी शिल्लक {0} नेहमी असणे आवश्यक आहे {1}
 DocType: Address,Address Type,पत्ता प्रकार
@@ -1074,23 +1034,23 @@
 DocType: Journal Entry,Get Outstanding Invoices,थकबाकी पावत्या मिळवा
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,विक्री ऑर्डर {0} वैध नाही
 apps/erpnext/erpnext/setup/doctype/company/company.py +172,"Sorry, companies cannot be merged","क्षमस्व, कंपन्या विलीन करणे शक्य नाही"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +145,Small,लहान
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Small,लहान
 DocType: Employee,Employee Number,कर्मचारी संख्या
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},प्रकरण नाही (चे) आधीपासून वापरात आहे. प्रकरण नाही ते पहा {0}
 ,Invoiced Amount (Exculsive Tax),Invoiced रक्कम (Exculsive कर)
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,आयटम 2
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +59,Account head {0} created,खाते प्रमुख {0} तयार
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +153,Green,ग्रीन
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Green,ग्रीन
 DocType: Item,Auto re-order,ऑटो पुन्हा आदेश
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +57,Total Achieved,एकूण गाठले
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +59,Total Achieved,एकूण गाठले
 DocType: Employee,Place of Issue,समस्या ठिकाण
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +59,Contract,करार
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Contract,करार
 DocType: Report,Disabled,अपंग
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +490,UOM coversion factor required for UOM: {0} in Item: {1},UOM आवश्यक UOM coversion घटक: {0} आयटम मध्ये: {1}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +83,Indirect Expenses,अप्रत्यक्ष खर्च
 apps/erpnext/erpnext/controllers/selling_controller.py +163,Row {0}: Qty is mandatory,रो {0}: Qty अनिवार्य आहे
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +8,Agriculture,कृषी
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +611,Your Products or Services,आपली उत्पादने किंवा सेवा
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,कृषी
+apps/erpnext/erpnext/public/js/setup_wizard.js +347,Your Products or Services,आपली उत्पादने किंवा सेवा
 DocType: Mode of Payment,Mode of Payment,मोड ऑफ पेमेंट्स
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,हा रूट आयटम गट आहे आणि संपादित केला जाऊ शकत नाही.
 DocType: Journal Entry Account,Purchase Order,खरेदी ऑर्डर
@@ -1102,7 +1062,7 @@
 DocType: Serial No,Serial No Details,सिरियल तपशील
 DocType: Purchase Invoice Item,Item Tax Rate,आयटम कराचा दर
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +113,"For {0}, only credit accounts can be linked against another debit entry","{0}, फक्त क्रेडिट खात्यांच्या दुसऱ्या नावे नोंद लिंक जाऊ शकते"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Delivery Note {0} is not submitted,"डिलिव्हरी टीप {0} सबमिट केलेली नाही,"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +470,Delivery Note {0} is not submitted,"डिलिव्हरी टीप {0} सबमिट केलेली नाही,"
 apps/erpnext/erpnext/stock/get_item_details.py +136,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.","किंमत नियम पहिल्या आधारित निवडले आहे आयटम, आयटम गट किंवा ब्रॅण्ड असू शकते जे शेत &#39;रोजी लागू करा&#39;."
@@ -1112,7 +1072,7 @@
 DocType: Appraisal Goal,Goal,लक्ष्य
 DocType: Sales Invoice Item,Edit Description,वर्णन संपादित करा
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +318,Expected Delivery Date is lesser than Planned Start Date.,अपेक्षित वितरण तारीख नियोजनबद्ध प्रारंभ तारीख पेक्षा कमी आहे.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +579,For Supplier,पुरवठादार साठी
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +602,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,एकूण जाणारे
@@ -1138,10 +1098,10 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +74,"Total {0} for all items is zero, may you should change 'Distribute Charges Based On'","एकूण {0} सर्व आयटम आपण &#39;वर आधारीत शुल्क वितरण&#39; बदलू पाहीजे, शून्य आहे"
 DocType: Purchase Invoice,Taxes and Charges Calculation,कर आणि शुल्क गणना
 DocType: BOM Operation,Workstation,वर्कस्टेशन
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +112,Hardware,हार्डवेअर
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +112,Hardware,हार्डवेअर
 DocType: Attendance,HR Manager,एचआर व्यवस्थापक
 apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,कंपनी निवडा
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +50,Privilege Leave,रजा
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +50,Privilege Leave,रजा
 DocType: Purchase Invoice,Supplier Invoice Date,पुरवठादार चलन तारीख
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +79,You need to enable Shopping Cart,आपण हे खरेदी सूचीत टाका सक्षम करणे आवश्यक
 apps/frappe/frappe/public/js/frappe/form/grid_body.html +6,No Data,नाही डेटा
@@ -1154,7 +1114,7 @@
 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 +168,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/setup/page/setup_wizard/install_fixtures.py +38,Food,अन्न
+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,Ageing श्रेणी 3
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +139,You can make a time log only against a submitted production order,आपण फक्त एक सादर उत्पादन आदेशा एक वेळ लॉग करू शकता
 DocType: Maintenance Schedule Item,No of Visits,भेटी नाही
@@ -1174,6 +1134,7 @@
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,View Offer Letter,ऑफर पहा पत्र
 DocType: Communication,Communication,संवाद
 DocType: Item,Is Service Item,सेवा आयटम आहे
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +81,Application period cannot be outside leave allocation period,अर्ज काळात बाहेर रजा वाटप कालावधी असू शकत नाही
 DocType: Activity Cost,Projects,प्रकल्प
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +31,Please select Fiscal Year,आर्थिक वर्ष निवडा कृपया
 apps/erpnext/erpnext/controllers/buying_controller.py +23,From {0} | {1} {2},पासून {0} | {1} {2}
@@ -1192,7 +1153,7 @@
 DocType: Item,Maintain Stock,शेअर ठेवा
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +213,Stock Entries already created for Production Order ,आधीच उत्पादन ऑर्डर तयार स्टॉक नोंदी
 DocType: Leave Control Panel,Leave blank if considered for all designations,सर्व पदे विचार तर रिक्त सोडा
-apps/erpnext/erpnext/controllers/accounts_controller.py +499,Charge of type 'Actual' in row {0} cannot be included in Item Rate,प्रकार वास्तविक &#39;सलग प्रभारी {0} आयटम रेट समाविष्ट केले जाऊ शकत नाही
+apps/erpnext/erpnext/controllers/accounts_controller.py +500,Charge of type 'Actual' in row {0} cannot be included in Item Rate,प्रकार वास्तविक &#39;सलग प्रभारी {0} आयटम रेट समाविष्ट केले जाऊ शकत नाही
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,Max: {0},कमाल: {0}
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +16,From Datetime,DATETIME पासून
 DocType: Email Digest,For Company,कंपनी साठी
@@ -1202,7 +1163,7 @@
 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 +471,cannot be greater than 100,पेक्षा जास्त 100 असू शकत नाही
-apps/erpnext/erpnext/stock/doctype/item/item.py +546,Item {0} is not a stock Item,{0} आयटम स्टॉक आयटम नाही
+apps/erpnext/erpnext/stock/doctype/item/item.py +550,Item {0} is not a stock Item,{0} आयटम स्टॉक आयटम नाही
 DocType: Maintenance Visit,Unscheduled,Unscheduled
 DocType: Employee,Owned,मालकीचे
 DocType: Salary Slip Deduction,Depends on Leave Without Pay,पे न करता सोडू अवलंबून
@@ -1216,30 +1177,28 @@
 DocType: HR Settings,Employee Settings,कर्मचारी सेटिंग्ज
 ,Batch-Wise Balance History,बॅच-शहाणे शिल्लक इतिहास
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +72,To Do List,सूची करावे
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +63,Apprentice,शिकाऊ उमेदवार
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Apprentice,शिकाऊ उमेदवार
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +99,Negative Quantity is not allowed,नकारात्मक प्रमाण परवानगी नाही
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
 Used for Taxes and Charges",स्ट्रिंग म्हणून आयटम मालक प्राप्त आणि या क्षेत्रात संग्रहित कर तपशील टेबल. कर आणि शुल्क करीता वापरले जाते
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +61,Lancing,Lancing
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +151,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 +435,Accounting Entry for {0}: {1} can only be made in currency: {2},{1} फक्त चलनात केले जाऊ शकते: {0} एकट्या प्रवेश {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +436,Accounting Entry for {0}: {1} can only be made in currency: {2},{1} फक्त चलनात केले जाऊ शकते: {0} एकट्या प्रवेश {2}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +38,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 +112,Tax Rule for transactions.,व्यवहार कर नियम.
 DocType: Rename Tool,Type of document to rename.,दस्तऐवज प्रकार पुनर्नामित करण्यात.
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +630,We buy this Item,आम्ही या आयटम खरेदी
+apps/erpnext/erpnext/public/js/setup_wizard.js +366,We buy this Item,आम्ही या आयटम खरेदी
 DocType: Address,Billing,बिलिंग
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +77,Flanging,Flanging
 DocType: Bulk Email,Not Sent,पाठविलेला नाही
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +73,Explosive forming,लागत स्फोटक
 DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),एकूण कर आणि शुल्क (कंपनी चलन)
 DocType: Shipping Rule,Shipping Account,शिपिंग खाते
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +43,Scheduled to send to {0} recipients,{0} प्राप्तकर्ता पाठविण्यासाठी अनुसूचित
 DocType: Quality Inspection,Readings,वाचन
 DocType: Stock Entry,Total Additional Costs,एकूण अतिरिक्त खर्च
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Sub Assemblies,उप विधानसभा
+apps/erpnext/erpnext/public/js/setup_wizard.js +359,Sub Assemblies,उप विधानसभा
 DocType: Shipping Rule Condition,To Value,मूल्य
 DocType: Supplier,Stock Manager,शेअर व्यवस्थापक
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +143,Source warehouse is mandatory for row {0},स्रोत कोठार सलग अनिवार्य आहे {0}
@@ -1249,44 +1208,42 @@
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,आयात अयशस्वी!
 apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,नाही पत्ता अद्याप जोडले.
 DocType: Workstation Working Hour,Workstation Working Hour,वर्कस्टेशन कार्यरत तास
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +83,Analyst,विश्लेषक
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +202,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},रो {0}: रक्कम {1} पेक्षा कमी किंवा संयुक्त रक्कम बरोबरी करणे आवश्यक आहे {2}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Analyst,विश्लेषक
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +149,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},रो {0}: रक्कम {1} पेक्षा कमी किंवा संयुक्त रक्कम बरोबरी करणे आवश्यक आहे {2}
 DocType: Item,Inventory,सूची
 DocType: Features Setup,"To enable ""Point of Sale"" view",दृश्य &quot;विक्री पॉइंट&quot; सक्षम करण्यासाठी
 apps/erpnext/erpnext/public/js/pos/pos.js +402,Payment cannot be made for empty cart,भरणा रिक्त कार्ट केले जाऊ शकत नाही
 DocType: Item,Sales Details,विक्री तपशील
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +149,Pinning,पिन
 DocType: Opportunity,With Items,आयटम
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,Qty मध्ये
 DocType: Notification Control,Expense Claim Rejected,खर्च हक्क नाकारला
 DocType: Sales Invoice,"The date on which next invoice will be generated. It is generated on submit.
 ","पुढील चलन निर्माण केले जातील, ज्या तारखेला. हे सबमिट निर्माण होते."
 DocType: Item Attribute,Item Attribute,आयटम विशेषता
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +105,Government,सरकार
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Government,सरकार
 apps/erpnext/erpnext/config/stock.py +268,Item Variants,आयटम रूपे
 DocType: Company,Services,सेवा
 apps/erpnext/erpnext/accounts/report/financial_statements.py +147,Total ({0}),एकूण ({0})
 DocType: Cost Center,Parent Cost Center,पालक खर्च केंद्र
 DocType: Sales Invoice,Source,स्रोत
 DocType: Leave Type,Is Leave Without Pay,पे न करता सोडू आहे
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +186,No records found in the Payment table,भरणा टेबल आढळली नाही रेकॉर्ड
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +405,Financial Year Start Date,आर्थिक वर्ष प्रारंभ तारीख
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +133,No records found in the Payment table,भरणा टेबल आढळली नाही रेकॉर्ड
+apps/erpnext/erpnext/public/js/setup_wizard.js +153,Financial Year Start Date,आर्थिक वर्ष प्रारंभ तारीख
 DocType: Employee External Work History,Total Experience,एकूण अनुभव
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +100,Countersinking,Countersinking
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +271,Packing Slip(s) cancelled,रद्द पॅकिंग स्लिप (चे)
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +276,Packing Slip(s) cancelled,रद्द पॅकिंग स्लिप (चे)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,वाहतुक आणि अग्रेषित शुल्क
 DocType: Material Request Item,Sales Order No,विक्री ऑर्डर नाही
 DocType: Item Group,Item Group Name,आयटम गट नाव
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +50,Taken,घेतले
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,घेतले
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +66,Transfer Materials for Manufacture,उत्पादन हस्तांतरण सामुग्री
 DocType: Pricing Rule,For Price List,किंमत सूची
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +27,Executive Search,कार्यकारी शोध
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,कार्यकारी शोध
 apps/erpnext/erpnext/stock/stock_ledger.py +405,"Purchase rate for item: {0} not found, which is required to book accounting entry (expense). Please mention item price against a buying price list.","आयटम खरेदी दर: {0} आढळले नाही, एकट्या नोंदणी (खर्च) बुक करणे आवश्यक आहे. एक खरेदी किंमत सूची विरुद्ध आयटम किंमत उल्लेख करा."
 DocType: Maintenance Schedule,Schedules,वेळापत्रक
 DocType: Purchase Invoice Item,Net Amount,निव्वळ रक्कम
 DocType: Purchase Order Item Supplied,BOM Detail No,BOM तपशील नाही
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),अतिरिक्त सवलत रक्कम (कंपनी चलन)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +537,Error: {0} > {1},त्रुटी: {0}&gt; {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +541,Error: {0} > {1},त्रुटी: {0}&gt; {1}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,लेखा चार्ट नवीन खाते तयार करा.
 DocType: Maintenance Visit,Maintenance Visit,देखभाल भेट द्या
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer > Customer Group > Territory,ग्राहक&gt; ग्राहक गट&gt; प्रदेश
@@ -1297,7 +1254,6 @@
 DocType: Event,Tuesday,मंगळवारी
 DocType: Leave Block List,Block Holidays on important days.,महत्वाचे दिवस अवरोधित करा सुट्ट्या.
 ,Accounts Receivable Summary,खाते प्राप्तीयोग्य सारांश
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +43,Leaves for type {0} already allocated for Employee {1} for period {2} - {3},आधीच कालावधीसाठी कर्मचारी {1} तरतूद प्रकार {0} साठी पाने {2} - {3}
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +187,Please set User ID field in an Employee record to set Employee Role,कर्मचारी भूमिका सेट करण्यासाठी एक कर्मचारी रेकॉर्ड वापरकर्ता आयडी फील्ड सेट करा
 DocType: UOM,UOM Name,UOM नाव
 DocType: Top Bar Item,Target,लक्ष्य
@@ -1309,15 +1265,14 @@
 DocType: ToDo,Due Date,मुळे तारीख
 DocType: Sales Invoice Item,Brand Name,ब्रँड नाव
 DocType: Purchase Receipt,Transporter Details,वाहतुक तपशील
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Box,बॉक्स
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +389,The Organization,संघटना
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Box,बॉक्स
+apps/erpnext/erpnext/public/js/setup_wizard.js +137,The Organization,संघटना
 DocType: Monthly Distribution,Monthly Distribution,मासिक वितरण
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,स्वीकारणारा सूची रिक्त आहे. स्वीकारणारा यादी तयार करा
 DocType: Production Plan Sales Order,Production Plan Sales Order,उत्पादन योजना विक्री आदेश
 DocType: Sales Partner,Sales Partner Target,विक्री भागीदार लक्ष्य
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},{0} एकट्या फक्त प्रवेश चलनात केले जाऊ शकते: {1}
 DocType: Pricing Rule,Pricing Rule,किंमत नियम
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +58,Notching,तिसऱ्या क्रमांकावर
 apps/erpnext/erpnext/config/learn.py +167,Material Request to Purchase Order,ऑर्डर खरेदी करण्यासाठी साहित्य विनंती
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +74,Row # {0}: Returned Item {1} does not exists in {2} {3},रो # {0}: परत आयटम {1} नाही विद्यमान नाही {2} {3}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,बँक खाते
@@ -1334,20 +1289,19 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Amounts not reflected in bank,बँक प्रतिबिंबित नाही प्रमाणात
 DocType: Quality Inspection Reading,Reading 4,4 वाचन
 apps/erpnext/erpnext/config/hr.py +23,Claims for company expense.,कंपनी खर्च दावे.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +8,Centrifugal casting,केंद्रापासून निर्णायक
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +119,Magnetic field-assisted finishing,चुंबकीय क्षेत्र-सहाय्य पूर्ण
 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,संपर्क मोबाइल नाही
 DocType: Production Planning Tool,Select Sales Orders,विक्री ऑर्डर निवडा
 ,Material Requests for which Supplier Quotations are not created,पुरवठादार अवतरणे तयार नाहीत जे साहित्य विनंत्या
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +117,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,आपण रजा अर्ज करत आहेत ज्या दिवशी (चे) सुटी आहेत. आपण रजा अर्ज गरज नाही.
 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/buying/doctype/purchase_order/purchase_order.js +477,Mark as Delivered,मार्क वितरित म्हणून
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +497,Mark as Delivered,मार्क वितरित म्हणून
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +34,Make Quotation,कोटेशन करा
 DocType: Dependent Task,Dependent Task,अवलंबित कार्य
-apps/erpnext/erpnext/stock/doctype/item/item.py +306,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 +141,Leave of type {0} cannot be longer than {1},प्रकारच्या रजा {0} जास्त असू शकत नाही {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +310,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 +155,Leave of type {0} cannot be longer than {1},प्रकारच्या रजा {0} जास्त असू शकत नाही {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,आगाऊ एक्स दिवस ऑपरेशन नियोजन प्रयत्न करा.
 DocType: HR Settings,Stop Birthday Reminders,थांबवा वाढदिवस स्मरणपत्रे
 DocType: SMS Center,Receiver List,स्वीकारणारा यादी
@@ -1355,15 +1309,14 @@
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,नाश रक्कम
 apps/erpnext/erpnext/public/js/pos/pos.js +491,{0} View,{0} पहा
 DocType: Salary Structure Deduction,Salary Structure Deduction,वेतन संरचना कपात
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +158,Selective laser sintering,पसंतीचा लेसर sintering
-apps/erpnext/erpnext/stock/doctype/item/item.py +301,Unit of Measure {0} has been entered more than once in Conversion Factor Table,माप {0} युनिट रुपांतर फॅक्टर टेबल एकदा पेक्षा अधिक प्रविष्ट केले गेले आहे
+apps/erpnext/erpnext/stock/doctype/item/item.py +305,Unit of Measure {0} has been entered more than once in Conversion Factor Table,माप {0} युनिट रुपांतर फॅक्टर टेबल एकदा पेक्षा अधिक प्रविष्ट केले गेले आहे
 apps/frappe/frappe/core/page/data_import_tool/data_import_tool.js +108,Import Successful!,आयात यशस्वी!
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,जारी आयटम खर्च
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +185,Quantity must not be more than {0},प्रमाण जास्त असू शकत नाही {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +41,Age (Days),वय (दिवस)
 DocType: Quotation Item,Quotation Item,कोटेशन आयटम
 DocType: Account,Account Name,खाते नाव
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +41,From Date cannot be greater than To Date,तारीख तारीख करण्यासाठी पेक्षा जास्त असू शकत नाही पासून
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +34,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.,पुरवठादार प्रकार मास्टर.
 DocType: Purchase Order Item,Supplier Part Number,पुरवठादार भाग क्रमांक
@@ -1372,14 +1325,14 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +247,{0} {1} is cancelled or stopped,{0} {1} रद्द किंवा बंद आहे
 DocType: Accounts Settings,Credit Controller,क्रेडिट कंट्रोलर
 DocType: Delivery Note,Vehicle Dispatch Date,वाहन खलिता तारीख
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +197,Purchase Receipt {0} is not submitted,"खरेदी पावती {0} सबमिट केलेली नाही,"
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +198,Purchase Receipt {0} is not submitted,"खरेदी पावती {0} सबमिट केलेली नाही,"
 DocType: Company,Default Payable Account,मुलभूत देय खाते
 apps/erpnext/erpnext/config/website.py +13,"Settings for online shopping cart such as shipping rules, price list etc.","जसे शिपिंग नियम, किंमत सूची इत्यादी ऑनलाइन शॉपिंग कार्ट सेटिंग्ज"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +660,Setup Complete,सेटअप पूर्ण
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +124,Setup Complete,सेटअप पूर्ण
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +65,{0}% Billed,{0}% बिल
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +17,Reserved Qty,राखीव Qty
 DocType: Party Account,Party Account,पार्टी खाते
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +74,Human Resources,मानव संसाधन
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +74,Human Resources,मानव संसाधन
 DocType: Lead,Upper Income,उच्च उत्पन्न
 DocType: Journal Entry Account,Debit in Company Currency,कंपनी चलनात डेबिट
 apps/erpnext/erpnext/support/doctype/issue/issue.py +58,My Issues,माझे मुद्दे
@@ -1388,11 +1341,9 @@
 DocType: Company,Default Values,मुलभूत मुल्य
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +236,Row {0}: Payment amount can not be negative,रो {0}: भरणा रक्कम नकारात्मक असू शकत नाही
 DocType: Expense Claim,Total Amount Reimbursed,एकूण रक्कम परत देऊन
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +152,Press fitting,प्रेस समर्पक
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +64,Against Supplier Invoice {0} dated {1},पुरवठादार विरुद्ध चलन {0} दिनांक {1}
 DocType: Customer,Default Price List,मुलभूत दर सूची
 DocType: Payment Reconciliation,Payments,देयके
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +24,Hot isostatic pressing,दाबून हॉट isostatic
 DocType: ToDo,Medium,मध्यम
 DocType: Budget Detail,Budget Allocated,अर्थसंकल्प वाटप
 DocType: Journal Entry,Entry Type,प्रवेश प्रकार
@@ -1405,9 +1356,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +56,None of the items have any change in quantity or value.,आयटम कोणतेही प्रमाणात किंवा मूल्य कोणत्याही बदल आहेत.
 DocType: Warranty Claim,Warranty Claim,हमी दावा
 ,Lead Details,लीड तपशील
-DocType: Authorization Rule,Approving User,मंजूर सदस्य
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +37,Forging,फोर्जिंग
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +126,Plating,मुलाला
 DocType: Purchase Invoice,End date of current invoice's period,चालू चलन च्या कालावधी समाप्ती तारीख
 DocType: Pricing Rule,Applicable For,लागू
 DocType: Bank Reconciliation,From Date,तारीख पासून
@@ -1429,31 +1377,29 @@
 DocType: Sales Invoice,Paid Amount (Company Currency),पेड रक्कम (कंपनी चलन)
 DocType: Purchase Invoice,Additional Discount,अतिरिक्त सवलत
 DocType: Selling Settings,Selling Settings,सेटिंग्ज विक्री
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +39,Online Auctions,ऑनलाइन लिलाव
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,ऑनलाइन लिलाव
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +94,Please specify either Quantity or Valuation Rate or both,प्रमाण किंवा मूल्यांकन दर किंवा दोन्ही निर्दिष्ट करा
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +50,"Company, Month and Fiscal Year is mandatory","कंपनी, महिना आणि आर्थिक वर्ष अनिवार्य आहे"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Marketing Expenses,विपणन खर्च
 ,Item Shortage Report,आयटम कमतरता अहवाल
-apps/erpnext/erpnext/stock/doctype/item/item.js +183,"Weight is mentioned,\nPlease mention ""Weight UOM"" too",वजन \ n कृपया खूप &quot;वजन UOM&quot; उल्लेख उल्लेख आहे
+apps/erpnext/erpnext/stock/doctype/item/item.js +185,"Weight is mentioned,\nPlease mention ""Weight UOM"" too",वजन \ n कृपया खूप &quot;वजन UOM&quot; उल्लेख उल्लेख आहे
 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 +212,Time Log Batch {0} must be 'Submitted',वेळ लॉग बॅच {0} &#39;सादर&#39; करणे आवश्यक आहे
 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 +384,Warehouse required at Row No {0},रो नाही आवश्यक कोठार {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +386,Warehouse required at Row No {0},रो नाही आवश्यक कोठार {0}
 DocType: Employee,Date Of Retirement,निवृत्ती तारीख
 DocType: Upload Attendance,Get Template,साचा मिळवा
 DocType: Address,Postal,पोस्टल
 DocType: Item,Weightage,वजन
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +159,Mining,खनन
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +17,Resin casting,राळ निर्णायक
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,एक ग्राहक गट तत्सम नावाने विद्यमान ग्राहक नाव बदलू किंवा ग्राहक गट नाव बदला करा
 apps/erpnext/erpnext/public/js/pos/pos.js +147,Please select {0} first.,{0} पहिल्या निवडा.
 apps/erpnext/erpnext/templates/pages/order.html +57,text {0},मजकूर {0}
 DocType: Territory,Parent Territory,पालक प्रदेश
 DocType: Quality Inspection Reading,Reading 2,2 वाचन
 DocType: Stock Entry,Material Receipt,साहित्य पावती
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +622,Products,उत्पादने
+apps/erpnext/erpnext/public/js/setup_wizard.js +358,Products,उत्पादने
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +47,Party Type and Party is required for Receivable / Payable account {0},पार्टी प्रकार आणि पक्षाचे प्राप्तीयोग्य / देय खाते आवश्यक आहे {0}
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.","या आयटम रूपे आहेत, तर तो विक्री आदेश इ निवडले जाऊ शकत नाही"
 DocType: Lead,Next Contact By,पुढील संपर्क
@@ -1463,13 +1409,13 @@
 DocType: Purchase Invoice,Notification Email Address,सूचना ई-मेल पत्ता
 DocType: Payment Tool,Find Invoices to Match,मॅच चलने शोधा
 ,Item-wise Sales Register,आयटम निहाय विक्री नोंदणी
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +399,"e.g. ""XYZ National Bank""",उदा &quot;xyz नॅशनल बँक&quot;
+apps/erpnext/erpnext/public/js/setup_wizard.js +147,"e.g. ""XYZ National Bank""",उदा &quot;xyz नॅशनल बँक&quot;
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,बेसिक रेट मध्ये समाविष्ट या कर काय आहे?
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +57,Total Target,एकूण लक्ष्य
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Target,एकूण लक्ष्य
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.js +22,Shopping Cart is enabled,हे खरेदी सूचीत टाका सक्षम आहे
 DocType: Job Applicant,Applicant for a Job,जॉब साठी अर्जदाराची
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +173,No Production Orders created,तयार केला नाही उत्पादन आदेश
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +131,Salary Slip of employee {0} already created for this month,कर्मचारी पगार स्लिप्स {0} आधीच या महिन्यात तयार
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +140,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.,बरेच स्तंभ. अहवाल निर्यात करा आणि एक स्प्रेडशीट अनुप्रयोग वापरून मुद्रित करा.
 DocType: Sales Invoice Item,Batch No,बॅच नाही
@@ -1479,14 +1425,14 @@
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +13,Variant,जिच्यामध्ये variant
 apps/frappe/frappe/public/js/frappe/form/toolbar.js +165,New {0},नवी {0}
 DocType: Naming Series,Set prefix for numbering series on your transactions,तुमचा व्यवहार वर मालिका संख्या सेट पूर्वपद
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +169,Stopped order cannot be cancelled. Unstop to cancel.,थांबवले आदेश रद्द केले जाऊ शकत नाही. रद्द करण्यासाठी बूच.
-apps/erpnext/erpnext/stock/doctype/item/item.py +323,Default BOM ({0}) must be active for this item or its template,मुलभूत BOM ({0}) या आयटम किंवा त्याच्या साचा सक्रिय असणे आवश्यक आहे
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +164,Stopped order cannot be cancelled. Unstop to cancel.,थांबवले आदेश रद्द केले जाऊ शकत नाही. रद्द करण्यासाठी बूच.
+apps/erpnext/erpnext/stock/doctype/item/item.py +327,Default BOM ({0}) must be active for this item or its template,मुलभूत BOM ({0}) या आयटम किंवा त्याच्या साचा सक्रिय असणे आवश्यक आहे
 DocType: Employee,Leave Encashed?,पैसे मिळविता सोडा?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,शेत पासून संधी अनिवार्य आहे
 DocType: Item,Variants,रूपे
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +458,Make Purchase Order,खरेदी ऑर्डर करा
 DocType: SMS Center,Send To,पाठवा
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +111,There is not enough leave balance for Leave Type {0},रजा प्रकार पुरेशी रजा शिल्लक नाही {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +127,There is not enough leave balance for Leave Type {0},रजा प्रकार पुरेशी रजा शिल्लक नाही {0}
 DocType: Sales Team,Contribution to Net Total,नेट एकूण अंशदान
 DocType: Sales Invoice Item,Customer's Item Code,ग्राहक आयटम कोड
 DocType: Stock Reconciliation,Stock Reconciliation,शेअर मेळ
@@ -1523,11 +1469,11 @@
 DocType: Sales Order Item,Actual Qty,वास्तविक Qty
 DocType: Sales Invoice Item,References,संदर्भ
 DocType: Quality Inspection Reading,Reading 10,10 वाचन
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +612,"List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start.","आपण खरेदी किंवा विक्री आपली उत्पादने किंवा सेवा करा. आपण प्रारंभ कराल तेव्हा उपाय व इतर मालमत्ता बाब गट, युनिट तपासण्याची खात्री करा."
+apps/erpnext/erpnext/public/js/setup_wizard.js +348,"List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start.","आपण खरेदी किंवा विक्री आपली उत्पादने किंवा सेवा करा. आपण प्रारंभ कराल तेव्हा उपाय व इतर मालमत्ता बाब गट, युनिट तपासण्याची खात्री करा."
 DocType: Hub Settings,Hub Node,हब नोड
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,आपण ड्युप्लिकेट आयटम केला आहे. डॉ आणि पुन्हा प्रयत्न करा.
 apps/erpnext/erpnext/controllers/item_variant.py +65,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values,मूल्य {0} विशेषता साठी {1} वैध आयटम यादीत अस्तित्वात नाही मूल्ये विशेषता
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +87,Associate,सहकारी
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Associate,सहकारी
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +46,Item {0} is not a serialized Item,{0} आयटम सिरीयलाइज आयटम नाही
 DocType: SMS Center,Create Receiver List,स्वीकारणारा यादी तयार करा
 apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +5,Expired,कालबाह्य
@@ -1536,7 +1482,7 @@
 DocType: Warranty Claim,Issue Date,जारी केल्याचा दिनांक
 DocType: Activity Cost,Activity Cost,क्रियाकलाप खर्च
 DocType: Purchase Receipt Item Supplied,Consumed Qty,नाश Qty
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +52,Telecommunications,दूरसंचार
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +52,Telecommunications,दूरसंचार
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),पॅकेज वितरण (फक्त मसुदा) एक भाग आहे असे दर्शवले
 DocType: Payment Tool,Make Payment Entry,भरणा प्रवेश करा
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +119,Quantity for Item {0} must be less than {1},आयटम संख्या {0} पेक्षा कमी असणे आवश्यक आहे {1}
@@ -1553,10 +1499,8 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +37,"Selling must be checked, if Applicable For is selected as {0}","पाञ म्हणून निवडले आहे, तर विक्री, चेक करणे आवश्यक आहे {0}"
 DocType: Purchase Order Item,Supplier Quotation Item,पुरवठादार कोटेशन आयटम
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +27,Make Salary Structure,तत्वे करा
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +54,Shearing,Shearing
 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.,नवीन विक्री चलन तयार करण्यासाठी &#39;विक्री चलन करा&#39; बटणावर क्लिक करा.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +166,Packaging and labeling,पॅकेजिंग आणि लेबलिंग
 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,कंपनी मास्टर आणि ग्लोबल मुलभूत पूर्वनिर्धारीत चलन निर्दिष्ट करा
@@ -1567,19 +1511,18 @@
 DocType: Budget Detail,Fiscal Year,आर्थिक वर्ष
 DocType: Cost Center,Budget,अर्थसंकल्प
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +41,"Budget cannot be assigned against {0}, as it's not an Income or Expense account",तो एक उत्पन्न किंवा खर्च खाते नाही आहे म्हणून अर्थसंकल्प विरुद्ध {0} नियुक्त केला जाऊ शकत नाही
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Achieved,साध्य
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,साध्य
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +65,Territory / Customer,प्रदेश / ग्राहक
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,e.g. 5,उदा 5
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +207,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},रो {0}: रक्कम {1} पेक्षा कमी किंवा थकबाकी रक्कम चलन करण्यासाठी समान आवश्यक {2}
+apps/erpnext/erpnext/public/js/setup_wizard.js +294,e.g. 5,उदा 5
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},रो {0}: रक्कम {1} पेक्षा कमी किंवा थकबाकी रक्कम चलन करण्यासाठी समान आवश्यक {2}
 DocType: Sales Invoice,In Words will be visible once you save the Sales Invoice.,तुम्ही विक्री चलन जतन एकदा शब्द मध्ये दृश्यमान होईल.
 DocType: Item,Is Sales Item,विक्री आयटम आहे
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,आयटम गट वृक्ष
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,{0} आयटम सिरियल क्र सेटअप नाही. आयटम मास्टर तपासा
 DocType: Maintenance Visit,Maintenance Time,देखभाल वेळ
 ,Amount to Deliver,रक्कम वितरीत करण्यासाठी
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +620,A Product or Service,एखाद्या उत्पादन किंवा सेवा
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +158,There were errors.,त्रुटी होत्या.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +101,Tapping,टॅप
+apps/erpnext/erpnext/public/js/setup_wizard.js +356,A Product or Service,एखाद्या उत्पादन किंवा सेवा
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +146,There were errors.,त्रुटी होत्या.
 DocType: Naming Series,Current Value,वर्तमान मूल्य
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +171,{0} created,{0} तयार
 DocType: Delivery Note Item,Against Sales Order,विक्री आदेशा
@@ -1593,7 +1536,7 @@
 apps/erpnext/erpnext/accounts/party.py +275,Due Date cannot be before Posting Date,मुळे तारीख तारीख पोस्ट करण्यापूर्वी असू शकत नाही
 DocType: Website Item Group,Website Item Group,वेबसाइट आयटम गट
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Duties and Taxes,करापोटी
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Please enter Reference date,संदर्भ तारीख प्रविष्ट करा
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +312,Please enter Reference date,संदर्भ तारीख प्रविष्ट करा
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} पैसे नोंदी फिल्टर जाऊ शकत नाही {1}
 DocType: Item Website Specification,Table for Item that will be shown in Web Site,वेब साईट मध्ये दर्शविले जाईल की आयटम टेबल
 DocType: Purchase Order Item Supplied,Supplied Qty,पुरवले Qty
@@ -1601,7 +1544,7 @@
 apps/erpnext/erpnext/config/stock.py +103,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,आयटम निहाय खरेदी इतिहास
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +152,Red,लाल
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Red,लाल
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +228,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},सिरियल नाही आयटम जोडले प्राप्त करण्यासाठी &#39;व्युत्पन्न वेळापत्रक&#39; वर क्लिक करा {0}
 DocType: Account,Frozen,फ्रोजन
 ,Open Production Orders,ओपन उत्पादन ऑर्डर
@@ -1616,7 +1559,7 @@
 DocType: Item Attribute,Attribute Name,विशेषता नाव
 apps/erpnext/erpnext/controllers/selling_controller.py +236,Item {0} must be Sales or Service Item in {1},आयटम {0} विक्री किंवा सेवा आयटम असणे आवश्यक आहे {1}
 DocType: Item Group,Show In Website,वेबसाइट मध्ये दर्शवा
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +621,Group,गट
+apps/erpnext/erpnext/public/js/setup_wizard.js +357,Group,गट
 DocType: Task,Expected Time (in hours),(तास) अपेक्षित वेळ
 ,Qty to Order,मागणी Qty
 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","खालील कागदपत्रे वितरण टीप, संधी, साहित्य विनंती, आयटम, पर्चेस, खरेदी व्हाउचर, ग्राहक पावती, कोटेशन, विक्री चलन, उत्पादन बंडल, विक्री आदेश, माणे मध्ये ब्रांड नाव ट्रॅक करण्यासाठी"
@@ -1626,6 +1569,7 @@
 DocType: Features Setup,Brands,ब्रांड
 DocType: C-Form Invoice Detail,Invoice No,चलन नाही
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +480,From Purchase Order,खरेदी ऑर्डर पासून
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +92,"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,राजीनामा तारीख
@@ -1633,35 +1577,31 @@
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +137,Not Set,सेट नाही
 DocType: Communication,Date,तारीख
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,पुन्हा करा ग्राहक महसूल
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +651,Sit tight while your system is being setup. This may take a few moments.,"तुमची प्रणाली सेटअप केले जात आहे, तर खिळून बसा,. या काही क्षण लागू शकतात."
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +115,Sit tight while your system is being setup. This may take a few moments.,"तुमची प्रणाली सेटअप केले जात आहे, तर खिळून बसा,. या काही क्षण लागू शकतात."
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +51,{0} ({1}) must have role 'Expense Approver',{0} ({1}) 'एक्सपेन्स मंजुरी' भूमिका असणे आवश्यक आहे
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Pair,जोडी
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Pair,जोडी
 DocType: Bank Reconciliation Detail,Against Account,खाते विरुद्ध
 DocType: Maintenance Schedule Detail,Actual Date,वास्तविक तारीख
 DocType: Item,Has Batch No,बॅच नाही आहे
 DocType: Delivery Note,Excise Page Number,अबकारी पृष्ठ क्रमांक
 DocType: Employee,Personal Details,वैयक्तिक माहिती
 ,Maintenance Schedules,देखभाल वेळापत्रक
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +44,Embossing,एम्बॉसिंग
 ,Quotation Trends,कोटेशन ट्रेन्ड
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +139,Item Group not mentioned in item master for item {0},आयटम गट आयटम आयटम मास्टर उल्लेख केला नाही {0}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +302,Debit To account must be a Receivable account,खात्यात डेबिट एक प्राप्तीयोग्य खाते असणे आवश्यक आहे
-apps/erpnext/erpnext/stock/doctype/item/item.py +310,"As Production Order can be made for this item, it must be a stock item.","उत्पादन ऑर्डर या आयटम केले जाऊ शकतात, हा एक स्टॉक आयटम असणे आवश्यक आहे."
 DocType: Shipping Rule Condition,Shipping Amount,शिपिंग रक्कम
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +140,Joining,सामील होत
-DocType: Authorization Rule,Above Value,मूल्य वर
 ,Pending Amount,प्रलंबित रक्कम
 DocType: Purchase Invoice Item,Conversion Factor,रूपांतरण फॅक्टर
 DocType: Purchase Order,Delivered,वितरित केले
 apps/erpnext/erpnext/config/hr.py +160,Setup incoming server for jobs email id. (e.g. jobs@example.com),रोजगार ई-मेल आयडी साठी सेटअप येणार्या सर्व्हर. (उदा jobs@example.com)
 DocType: Purchase Receipt,Vehicle Number,वाहन क्रमांक
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,आवर्ती अशी यादी तयार करणे बंद होणार तारीख
+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,प्राप्तीयोग्य खाते
 ,Supplier-Wise Sales Analytics,पुरवठादार-शहाणे विक्री विश्लेषण
 DocType: Address Template,This format is used if country specific format is not found,"देशातील विशिष्ट स्वरूप सापडले नाही, तर हे स्वरूप वापरले जाते"
 DocType: Custom Field,Custom,सानुकूल
 DocType: Production Order,Use Multi-Level BOM,मल्टी लेव्हल BOM वापरा
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +26,Injection molding,इंजेक्शन मोल्डिंग
 DocType: Bank Reconciliation,Include Reconciled Entries,समेट नोंदी समाविष्ट
 apps/erpnext/erpnext/config/accounts.py +41,Tree of finanial accounts.,Finanial खाती वृक्ष.
 DocType: Leave Control Panel,Leave blank if considered for all employee types,सर्व कर्मचारी प्रकार विचार तर रिक्त सोडा
@@ -1671,30 +1611,28 @@
 apps/frappe/frappe/config/setup.py +130,Printing,मुद्रण
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +114,Expense Claim is pending approval. Only the Expense Approver can update status.,खर्च दावा मंजुरीसाठी प्रलंबित आहे. फक्त खर्च माफीचा साक्षीदार स्थिती अद्यतनित करू शकता.
 DocType: Purchase Invoice,Additional Discount Amount,अतिरिक्त सवलत रक्कम
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +99,The day(s) on which you are applying for leave are holiday. You need not apply for leave.,तुम्ही रजा अर्ज आहेत ज्या दिवशी (चे) सुट्टी आहे. आपण रजा अर्ज गरज नाही.
 apps/frappe/frappe/public/js/frappe/misc/utils.js +110,and,आणि
 DocType: Leave Block List Allow,Leave Block List Allow,ब्लॉक यादी परवानगी द्या सोडा
 apps/erpnext/erpnext/setup/doctype/company/company.py +236,Abbr can not be blank or space,Abbr रिक्त किंवा जागा असू शकत नाही
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +50,Sports,क्रीडा
+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/setup/page/setup_wizard/setup_wizard.js +626,Unit,युनिट
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Unit,युनिट
 apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.py +182,Please set Dropbox access keys in your site config,आपली साइट संरचना मध्ये ड्रॉपबॉक्स प्रवेश कळा सेट करा
 apps/erpnext/erpnext/stock/get_item_details.py +113,Please specify Company,कंपनी निर्दिष्ट करा
 ,Customer Acquisition and Loyalty,ग्राहक संपादन आणि लॉयल्टी
 DocType: Purchase Receipt,Warehouse where you are maintaining stock of rejected items,तुम्ही नाकारले आयटम साठा राखण्यासाठी आहेत जेथे कोठार
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +408,Your financial year ends on,आपले आर्थिक वर्षात रोजी संपत आहे
+apps/erpnext/erpnext/public/js/setup_wizard.js +156,Your financial year ends on,आपले आर्थिक वर्षात रोजी संपत आहे
 DocType: POS Profile,Price List,किंमत सूची
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +20,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0} मुलभूत आर्थिक वर्ष आहे. बदल प्रभावाखाली येण्यासाठी आपल्या ब्राउझर रीफ्रेश करा.
 apps/erpnext/erpnext/projects/doctype/project/project.js +47,Expense Claims,खर्च दावे
 DocType: Issue,Support,समर्थन
-DocType: Authorization Rule,Approving Role,भूमिका मंजूर
 ,BOM Search,BOM शोध
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +176,Closing (Opening + Totals),बंद (+ बेरजा उघडत)
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +26,Please specify currency in Company,कंपनी चलन निर्दिष्ट करा
 DocType: Workstation,Wages per hour,ताशी वेतन
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,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.","इ सिरियल क्रमांक, पीओएस जसे दर्शवा / लपवा वैशिष्ट्ये"
-apps/erpnext/erpnext/controllers/accounts_controller.py +236,Account {0} is invalid. Account Currency must be {1},खाते {0} अवैध आहे. खाते चलन असणे आवश्यक आहे {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +237,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},UOM रुपांतर घटक सलग आवश्यक आहे {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +53,Clearance date cannot be before check date in row {0},निपटारा तारीख सलग चेक तारखेच्या आधी असू शकत नाही {0}
 DocType: Salary Slip,Deduction,कपात
@@ -1713,13 +1651,13 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +82,Item {0} has already been returned,आयटम {0} आधीच परत आले आहे
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** आर्थिक वर्ष ** एक आर्थिक वर्ष प्रस्तुत करते. सर्व लेखा नोंदणी व इतर प्रमुख व्यवहार ** ** आर्थिक वर्ष विरुद्ध नियंत्रीत केले जाते.
 DocType: Opportunity,Customer / Lead Address,ग्राहक / लीड पत्ता
+apps/erpnext/erpnext/stock/doctype/item/item.py +112,Warning: Invalid SSL certificate on attachment {0},चेतावणी: जोड वर अवैध SSL प्रमाणपत्र {0}
 DocType: Production Order Operation,Actual Operation Time,वास्तविक ऑपरेशन वेळ
 DocType: Authorization Rule,Applicable To (User),लागू करण्यासाठी (सदस्य)
 DocType: Purchase Taxes and Charges,Deduct,वजा
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +170,Job Description,कामाचे वर्णन
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +170,Job Description,कामाचे वर्णन
 DocType: Purchase Order Item,Qty as per Stock UOM,Qty शेअर UOM नुसार
 apps/frappe/frappe/model/rename_doc.py +343,Please select a valid csv file with data,डेटा वैध सी फाइल निवडा
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +92,Coating,लेप
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +126,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","वगळता विशेष वर्ण &quot;-&quot; &quot;.&quot;, &quot;#&quot;, आणि &quot;/&quot; मालिका म्हणण्यापर्यंत परवानगी नाही"
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","विक्री मोहिमांच्या ट्रॅक ठेवा. निष्पन्न, अवतरणे मागोवा ठेवा, विक्री ऑर्डर इत्यादी मोहीमा गुंतवणूक वर परत गेज."
 DocType: Expense Claim,Approver,माफीचा साक्षीदार
@@ -1729,12 +1667,11 @@
 DocType: Supplier Quotation,Manufacturing Manager,उत्पादन व्यवस्थापक
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +191,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/hooks.py +84,Shipments,निर्यात
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +29,Dip molding,बुडवून काठ
+apps/erpnext/erpnext/hooks.py +68,Shipments,निर्यात
 DocType: Purchase Order,To be delivered to customer,ग्राहकाला वितरित करणे
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,वेळ लॉग स्थिती सादर करणे आवश्यक आहे.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,सिरियल नाही {0} कोणत्याही वखार संबंधित नाही
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +650,Setting Up,सेटअप
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +114,Setting Up,सेटअप
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,Row # ,रो #
 DocType: Purchase Invoice,In Words (Company Currency),शब्द मध्ये (कंपनी चलन)
 DocType: Pricing Rule,Supplier,पुरवठादार
@@ -1742,7 +1679,7 @@
 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 +166,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,खर्च किंवा फरक खाते आयटम {0} म्हणून परिणाम एकूणच स्टॉक मूल्य अनिवार्य आहे
-apps/erpnext/erpnext/controllers/accounts_controller.py +354,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","सलग आयटम {0} साठी overbill करू शकत नाही {1} जास्त {2}. Overbilling, शेअर सेटिंग्ज सेट करा अनुमती देण्यासाठी"
+apps/erpnext/erpnext/controllers/accounts_controller.py +355,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","सलग आयटम {0} साठी overbill करू शकत नाही {1} जास्त {2}. Overbilling, शेअर सेटिंग्ज सेट करा अनुमती देण्यासाठी"
 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 +135,User {0} is disabled,सदस्य {0} अक्षम आहे
@@ -1755,27 +1692,26 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,{0} is mandatory for Item {1},{0} आयटम अनिवार्य आहे {1}
 DocType: Currency Exchange,From Currency,चलन पासून
 DocType: DocField,Name,नाव
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +211,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","किमान एक सलग रक्कम, चलन प्रकार आणि चलन क्रमांक निवडा"
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +104,Sales Order required for Item {0},आयटम आवश्यक विक्री ऑर्डर {0}
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +158,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","किमान एक सलग रक्कम, चलन प्रकार आणि चलन क्रमांक निवडा"
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +107,Sales Order required for Item {0},आयटम आवश्यक विक्री ऑर्डर {0}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +43,Amounts not reflected in system,प्रणाली प्रतिबिंबित नाही प्रमाणात
 DocType: Purchase Invoice Item,Rate (Company Currency),दर (कंपनी चलन)
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +40,Others,इतर
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +40,Others,इतर
 apps/erpnext/erpnext/templates/includes/product_page.js +80,Cannot find a matching Item. Please select some other value for {0}.,एक जुळणारे आयटम शोधू शकत नाही. साठी {0} काही इतर मूल्य निवडा.
 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,पहिल्या रांगेत साठी &#39;मागील पंक्ती एकूण रोजी&#39; &#39;मागील पंक्ती रकमेवर&#39; म्हणून जबाबदारी प्रकार निवडा किंवा करू शकत नाही
 apps/frappe/frappe/core/doctype/doctype/boilerplate/controller_list.html +31,Completed,पूर्ण
 DocType: Web Form,Select DocType,निवडा DocType
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +104,Broaching,Broaching
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +12,Banking,बँकिंग
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,बँकिंग
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +38,Please click on 'Generate Schedule' to get schedule,वेळापत्रक प्राप्त करण्यासाठी &#39;व्युत्पन्न वेळापत्रक&#39; वर क्लिक करा
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +283,New Cost Center,नवी खर्च केंद्र
 DocType: Bin,Ordered Quantity,आदेश दिले प्रमाण
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +397,"e.g. ""Build tools for builders""",उदा &quot;बांधणाऱ्यांनी साधने बिल्ड&quot;
+apps/erpnext/erpnext/public/js/setup_wizard.js +145,"e.g. ""Build tools for builders""",उदा &quot;बांधणाऱ्यांनी साधने बिल्ड&quot;
 DocType: Quality Inspection,In Process,प्रक्रिया मध्ये
 DocType: Authorization Rule,Itemwise Discount,Itemwise सवलत
 DocType: Purchase Order Item,Reference Document Type,संदर्भ दस्तऐवज प्रकार
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +318,{0} against Sales Order {1},{0} विक्री आदेशा {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +320,{0} against Sales Order {1},{0} विक्री आदेशा {1}
 DocType: Account,Fixed Asset,निश्चित मालमत्ता
 apps/erpnext/erpnext/config/stock.py +283,Serialized Inventory,सिरीयलाइज यादी
 DocType: Activity Type,Default Billing Rate,डीफॉल्ट बिलिंग दर
@@ -1790,14 +1726,13 @@
 DocType: Purchase Invoice Item,Page Break,पृष्ठ ब्रेक
 DocType: Production Order Operation,Pending,प्रलंबित
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,विशिष्ट कर्मचारी सुट्टीच्या अनुप्रयोग मंजूर करू शकता जे वापरकर्ते
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +33,You cannot change default UOM of Variant. To change default UOM for Variant change default UOM of the Template,आपण व्हेरियंट मुलभूत UOM बदलू शकत नाही. साचा व्हेरियंट बदल मुलभूत UOM मुलभूत UOM बदलण्यासाठी
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +50,Office Equipments,कार्यालय उपकरणे
 DocType: Purchase Invoice Item,Qty,Qty
 DocType: Fiscal Year,Companies,कंपन्या
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +24,Electronics,इलेक्ट्रॉनिक्स
+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/support/doctype/maintenance_visit/maintenance_visit.js +18,From Maintenance Schedule,देखभाल वेळापत्रक पासून
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +56,Full-time,पूर्ण-वेळ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +56,Full-time,पूर्ण-वेळ
 DocType: Purchase Invoice,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.","तुम्ही विक्री कर आणि शुल्क साचा मध्ये एक मानक टेम्प्लेट तयार केले असेल तर, एक निवडा आणि खालील बटणावर क्लिक करा."
@@ -1809,11 +1744,12 @@
 DocType: Job Applicant,Job Opening,जॉब ओपनिंग
 DocType: Payment Reconciliation,Payment Reconciliation,भरणा मेळ
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +154,Please select Incharge Person's name,प्रभारी व्यक्तीचे नाव निवडा कृपया
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +51,Technology,तंत्रज्ञान
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,तंत्रज्ञान
 DocType: Offer Letter,Offer Letter,पत्र ऑफर
 apps/erpnext/erpnext/config/manufacturing.py +51,Generate Material Requests (MRP) and Production Orders.,साहित्य विनंत्या (एमआरपी) आणि उत्पादन आदेश व्युत्पन्न.
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +68,Total Invoiced Amt,एकूण Invoiced रक्कम
 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.","मुलाला नोडस् जोडण्यासाठी, वृक्ष अन्वेषण आणि आपण अधिक नोडस् जोडू इच्छित ज्या अंतर्गत नोड वर क्लिक करा."
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +102,Credit To account must be a Payable account,खाते क्रेडिट देय खाते असणे आवश्यक आहे
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +233,BOM recursion: {0} cannot be parent or child of {2},BOM recursion: {0} पालक किंवा मुलाला होऊ शकत नाही {2}
@@ -1826,10 +1762,8 @@
 DocType: Item,Customer Item Codes,ग्राहक आयटम कोड
 DocType: Opportunity,Lost Reason,गमावले कारण
 apps/erpnext/erpnext/config/accounts.py +68,Create Payment Entries against Orders or Invoices.,ऑर्डर किंवा चलने विरुद्ध भरणा नोंदी तयार करा.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +141,Welding,वेल्डिंग
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +40,New Stock UOM is required,नवी स्टॉक UOM आवश्यक आहे
 DocType: Quality Inspection,Sample Size,नमुना आकार
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +443,All items have already been invoiced,सर्व आयटम आधीच invoiced आहेत
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +446,All items have already been invoiced,सर्व आयटम आधीच invoiced आहेत
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',&#39;प्रकरण क्रमांक पासून&#39; एक वैध निर्दिष्ट करा
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +287,Further cost centers can be made under Groups but entries can be made against non-Groups,पुढील खर्च केंद्रे गट अंतर्गत केले जाऊ शकते पण नोंदी नॉन-गट सुरू केले
 DocType: Project,External,बाह्य
@@ -1841,8 +1775,7 @@
 DocType: Bin,Actual Quantity,वास्तविक प्रमाण
 DocType: Shipping Rule,example: Next Day Shipping,उदाहरण: पुढील दिवस शिपिंग
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,आढळले नाही सिरियल नाही {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +563,Your Customers,आपले ग्राहक
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +27,Compression molding,संक्षेप काठ
+apps/erpnext/erpnext/public/js/setup_wizard.js +303,Your Customers,आपले ग्राहक
 DocType: Leave Block List Date,Block Date,ब्लॉक तारीख
 DocType: Sales Order,Not Delivered,वितरण नाही
 ,Bank Clearance Summary,बँक लाभ सारांश
@@ -1863,10 +1796,10 @@
 DocType: SMS Log,Sent To,करण्यासाठी पाठविले
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +28,Make Sales Invoice,विक्री चलन करा
 DocType: Company,For Reference Only.,संदर्भ केवळ.
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +29,Invalid {0}: {1},अवैध {0}: {1}
+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,क्षमता नियोजन
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +49,'From Date' is required,'तारीख पासून' आवश्यक आहे
+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,नवीन कामाची जागा
@@ -1881,7 +1814,7 @@
 DocType: Serial No,Delivery Time,वितरण वेळ
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,आधारित Ageing
 DocType: Item,End of Life,आयुष्याच्या शेवटी
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +41,Travel,प्रवास
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +41,Travel,प्रवास
 DocType: Leave Block List,Allow Users,वापरकर्त्यांना परवानगी द्या
 DocType: Purchase Order,Customer Mobile No,ग्राहक मोबाइल नं
 DocType: Sales Invoice,Recurring,आवर्ती
@@ -1895,7 +1828,7 @@
 DocType: Naming Series,User must always select,सदस्य नेहमी निवडणे आवश्यक आहे
 DocType: Stock Settings,Allow Negative Stock,नकारात्मक शेअर परवानगी द्या
 DocType: Installation Note,Installation Note,प्रतिष्ठापन टीप
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +541,Add Taxes,कर जोडा
+apps/erpnext/erpnext/public/js/setup_wizard.js +283,Add Taxes,कर जोडा
 ,Financial Analytics,आर्थिक विश्लेषण
 DocType: Quality Inspection,Verified By,द्वारा सत्यापित केली
 DocType: Address,Subsidiary,उपकंपनी
@@ -1905,7 +1838,6 @@
 DocType: System Settings,In Hours,तास मध्ये
 DocType: Process Payroll,Create Salary Slip,पगाराच्या स्लिप्स तयार करा
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Expected balance as per bank,बँक नुसार अपेक्षित शिल्लक
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +115,Buffing,Buffing
 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,कर्मचारी
@@ -1922,11 +1854,11 @@
 DocType: Rename Tool,File to Rename,पुनर्नामित करा फाइल
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +176,Purchse Order number required for Item {0},आयटम आवश्यक Purchse मागणी क्रमांक {0}
 apps/erpnext/erpnext/public/js/controllers/transaction.js +136,Show Payments,शो देयके
-apps/erpnext/erpnext/controllers/buying_controller.py +245,Specified BOM {0} does not exist for Item {1},आयटम अस्तित्वात नाही निर्दिष्ट BOM {0} {1}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +202,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,देखभाल वेळापत्रक {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 +197,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,देखभाल वेळापत्रक {0} या विक्री ऑर्डर रद्द आधी रद्द करणे आवश्यक आहे
 apps/frappe/frappe/desk/page/backups/backups.html +13,Size,आकार
 DocType: Notification Control,Expense Claim Approved,खर्च क्लेम मंजूर
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +113,Pharmaceutical,फार्मास्युटिकल
+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,विक्री ऑर्डर आवश्यक
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +30,Create Customer,ग्राहक तयार करा
@@ -1936,7 +1868,6 @@
 DocType: Quality Inspection Reading,Reading 9,9 वाचन
 DocType: Supplier,Is Frozen,गोठवले आहे
 DocType: Buying Settings,Buying Settings,खरेदी सेटिंग्ज
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +122,Mass finishing,मास पूर्ण
 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),विक्री ई-मेल आयडी साठी सेटअप येणार्या सर्व्हर. (उदा sales@example.com)
@@ -1944,7 +1875,7 @@
 DocType: Payment Tool,Payment Account,भरणा खाते
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +713,Please specify Company to proceed,पुढे जाण्यासाठी कंपनी निर्दिष्ट करा
 apps/frappe/frappe/public/js/frappe/model/indicator.js +30,Draft,मसुदा
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +46,Compensatory Off,भरपाई देणारा बंद
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Compensatory Off,भरपाई देणारा बंद
 DocType: Quality Inspection Reading,Accepted,स्वीकारले
 DocType: User,Female,स्त्री
 DocType: Journal Entry Account,Debit in Account Currency,खाते चलनात डेबिट
@@ -1956,7 +1887,7 @@
 DocType: Shipping Rule,Shipping Rule Label,शिपिंग नियम लेबल
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +209,Raw Materials cannot be blank.,कच्चा माल रिक्त असू शकत नाही.
 DocType: Newsletter,Test,कसोटी
-apps/erpnext/erpnext/stock/doctype/item/item.py +364,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +368,"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'","सध्याच्या स्टॉक व्यवहार आपण मूल्ये बदलू शकत नाही \ या आयटम, आहेत म्हणून &#39;सिरियल नाही आहे&#39; &#39;&#39; बॅच आहे नाही &#39;,&#39; शेअर आयटम आहे &#39;आणि&#39; मूल्यांकन पद्धत &#39;"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +448,Quick Journal Entry,जलद प्रवेश जर्नल
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +92,You can not change rate if BOM mentioned agianst any item,BOM कोणत्याही आयटम agianst उल्लेख केला तर आपण दर बदलू शकत नाही
@@ -1967,13 +1898,14 @@
 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.,स्वतंत्र उत्पादन करण्यासाठी प्रत्येक पूर्ण चांगल्या आयटम तयार केले जाईल.
 DocType: Purchase Invoice,Terms and Conditions1,अटी आणि Conditions1
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +18,Complete Setup,सेटअप पूर्ण
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard_page.html +18,Complete Setup,सेटअप पूर्ण
 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),अपूर्णांक अनुमती रद्द करण्यासाठी हे तपासा. (क्र साठी)
 apps/erpnext/erpnext/config/crm.py +96,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 +57,Total Absent,एकूण अनुपिस्थत
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +746,Item or Warehouse for row {0} does not match Material Request,सलग {0} जुळत नाही सामग्री विनंती आयटम किंवा कोठार
@@ -1998,16 +1930,15 @@
 DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),बेसिक रेट (शेअर UOM नुसार)
 DocType: SMS Log,No of Requested SMS,मागणी एसएमएस नाही
 DocType: Campaign,Campaign-.####,मोहीम -. ####
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +55,Piercing,छेदन
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,पुढील पायऱ्या
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +117,Contract End Date must be greater than Date of Joining,कंत्राटी अंतिम तारीख प्रवेश दिनांक पेक्षा जास्त असणे आवश्यक आहे
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,एक आयोग कंपन्या उत्पादने विकतो तृतीय पक्ष जो वितरक / विक्रेता / दलाल / संलग्न / विक्रेत्याशी.
 DocType: Customer Group,Has Child Node,बाल नोड आहे
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{0} against Purchase Order {1},{0} पर्चेस विरुद्ध {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +332,{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/page/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,Ageing श्रेणी 1
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +110,Photochemical machining,Photochemical यंत्र
 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.
 
 #### Note
@@ -2033,7 +1964,7 @@
 DocType: Purchase Receipt Item,Recd Quantity,Recd प्रमाण
 DocType: Email Account,Email Ids,ईमेल आयडी
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},विक्री ऑर्डर प्रमाणात जास्त आयटम {0} निर्मिती करू शकत नाही {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +471,Stock Entry {0} is not submitted,"शेअर प्रवेश {0} सबमिट केलेली नाही,"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +473,Stock Entry {0} is not submitted,"शेअर प्रवेश {0} सबमिट केलेली नाही,"
 DocType: Payment Reconciliation,Bank / Cash Account,बँक / रोख खाते
 DocType: Tax Rule,Billing City,बिलिंग शहर
 DocType: Global Defaults,Hide Currency Symbol,चलन प्रतीक लपवा
@@ -2049,7 +1980,7 @@
 DocType: Purchase Invoice,Currency and Price List,चलन आणि किंमत यादी
 DocType: Opportunity,Customer / Lead Name,ग्राहक / लीड नाव
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +63,Clearance Date not mentioned,निपटारा तारीख नमूद केलेली नाही
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +71,Production,उत्पादन
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Production,उत्पादन
 DocType: Item,Allow Production Order,परवानगी द्या उत्पादन ऑर्डर
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +60,Row {0}:Start Date must be before End Date,रो {0}: प्रारंभ तारीख अंतिम तारखेपूर्वी असणे आवश्यक आहे
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),एकूण (Qty)
@@ -2062,7 +1993,7 @@
 apps/erpnext/erpnext/utilities/doctype/address/address.py +113,My Addresses,माझे पत्ते
 DocType: Stock Ledger Entry,Outgoing Rate,जाणारे दर
 apps/erpnext/erpnext/config/hr.py +100,Organization branch master.,संघटना शाखा मास्टर.
-apps/erpnext/erpnext/controllers/accounts_controller.py +237, or ,किंवा
+apps/erpnext/erpnext/controllers/accounts_controller.py +238, 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-वर
@@ -2089,6 +2020,7 @@
 DocType: Stock Entry Detail,Serial No / Batch,सिरियल / नाही बॅच
 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 +213,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',देखभाल वेळापत्रक सर्व आयटम व्युत्पन्न नाही. &#39;व्युत्पन्न वेळापत्रक&#39; वर क्लिक करा
 ,To Produce,उत्पन्न करण्यासाठी
 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} समाविष्ट करणे आवश्यक आहे"
@@ -2096,10 +2028,7 @@
 DocType: Bin,Reserved Quantity,राखीव प्रमाण
 DocType: Landed Cost Voucher,Purchase Receipt Items,खरेदी पावती आयटम
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,पसंतीचे अर्ज
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +62,Cutting,कटिंग
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +69,Flattening,Flattening
 DocType: Account,Income Account,उत्पन्न खाते
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +22,Molding,मोल्डिंग
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +632,Delivery,डिलिव्हरी
 DocType: Stock Reconciliation Item,Current Qty,वर्तमान Qty
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",पहा कोटीच्या विभाग &quot;सामुग्री आधारित रोजी दर&quot;
@@ -2109,19 +2038,18 @@
 apps/frappe/frappe/desk/moduleview.py +61,Documents,दस्तऐवज
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +17,Ref,संदर्भ
 DocType: Cost Center,Cost Center,खर्च केंद्र
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.js +48,Voucher #,प्रमाणक #
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +36,Voucher #,प्रमाणक #
 DocType: Notification Control,Purchase Order Message,ऑर्डर संदेश खरेदी
 DocType: Tax Rule,Shipping Country,शिपिंग देश
 DocType: Upload Attendance,Upload HTML,अपलोड करा HTML
-apps/erpnext/erpnext/controllers/accounts_controller.py +391,"Total advance ({0}) against Order {1} cannot be greater \
+apps/erpnext/erpnext/controllers/accounts_controller.py +392,"Total advance ({0}) against Order {1} cannot be greater \
 				than the Grand Total ({2})",एकूण आगाऊ ({0}) आदेश विरुद्ध {1} \ जास्त असू शकत नाही एकूण पेक्षा ({2})
 DocType: Employee,Relieving Date,Relieving तारीख
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +12,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.","किंमत नियम काही निकषांच्या आधारे, / यादी किंमत पुन्हा खोडून सवलतीच्या टक्केवारी परिभाषित केले आहे."
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,कोठार फक्त शेअर प्रवेश द्वारे बदलले जाऊ शकते / डिलिव्हरी टीप / खरेदी पावती
 DocType: Employee Education,Class / Percentage,वर्ग / टक्केवारी
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +92,Head of Marketing and Sales,विपणन आणि विक्री प्रमुख
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +31,Income Tax,आयकर
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +157,Laser engineered net shaping,लेझर निव्वळ आकार घेत engineered
+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.","निवड किंमत नियम &#39;किंमत&#39; केले असेल, तर ते दर सूची अधिलिखित केले जाईल. किंमत नियम किंमत अंतिम किंमत आहे, त्यामुळे पुढील सवलतीच्या लागू केले जावे. त्यामुळे, इ विक्री आदेश, पर्चेस जसे व्यवहार, ते ऐवजी &#39;दर सूची दर&#39; फील्डमध्ये पेक्षा, &#39;दर&#39; फील्डमध्ये प्राप्त करता येईल."
 apps/erpnext/erpnext/config/selling.py +163,Track Leads by Industry Type.,ट्रॅक उद्योग प्रकार करून ठरतो.
 DocType: Item Supplier,Item Supplier,आयटम पुरवठादार
@@ -2144,31 +2072,28 @@
 DocType: Stock Ledger Entry,Actual Qty After Transaction,व्यवहार केल्यानंतर प्रत्यक्ष Qty
 ,Pending SO Items For Purchase Request,खरेदी विनंती म्हणून प्रलंबित आयटम
 DocType: Supplier,Billing Currency,बिलिंग चलन
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +148,Extra Large,अधिक मोठे
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,Extra Large,अधिक मोठे
 ,Profit and Loss Statement,नफा व तोटा स्टेटमेंट
 DocType: Bank Reconciliation Detail,Cheque Number,धनादेश क्रमांक
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +43,Pressing,दाबल्याने
 DocType: Payment Tool Detail,Payment Tool Detail,भरणा साधन तपशील
 ,Sales Browser,विक्री ब्राउझर
 DocType: Journal Entry,Total Credit,एकूण क्रेडिट
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +474,Warning: Another {0} # {1} exists against stock entry {2},चेतावनी: आणखी {0} # {1} स्टॉक प्रवेश विरुद्ध अस्तित्वात {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +459,Local,स्थानिक
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +476,Warning: Another {0} # {1} exists against stock entry {2},चेतावनी: आणखी {0} # {1} स्टॉक प्रवेश विरुद्ध अस्तित्वात {2}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +397,Local,स्थानिक
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),कर्ज मालमत्ता (assets)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,कर्जदार
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +147,Large,मोठे
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +23,No employee found!,नाही कर्मचारी आढळले!
+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 +152,Please mention no of visits required,आवश्यक भेटी नाही उल्लेख करा
 DocType: Purchase Order,Customer Address Display,ग्राहक पत्ता प्रदर्शन
 DocType: Stock Settings,Default Valuation Method,मुलभूत मूल्यांकन पद्धत
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +127,Polishing,कांती
 DocType: Production Order Operation,Planned Start Time,नियोजनबद्ध प्रारंभ वेळ
 apps/erpnext/erpnext/config/accounts.py +63,Close Balance Sheet and book Profit or Loss.,बंद करा ताळेबंद आणि नफा पुस्तक किंवा तोटा.
-apps/erpnext/erpnext/stock/doctype/item/item.py +661,"Default Unit of Measure for Item {0} cannot be changed directly because \
+apps/erpnext/erpnext/stock/doctype/item/item.py +665,"Default Unit of Measure for Item {0} cannot be changed directly because \
 			you have already made some transaction(s) with another UOM. To change default UOM, \
 			use 'UOM Replace Utility' tool under Stock module.","आपण आधीच दुसर्या UOM काही व्यवहार (चे) केले आहे \ कारण आयटम साठी उपाय, डीफॉल्ट युनिट {0} थेट बदलले जाऊ शकत नाही. मुलभूत UOM बदलण्यासाठी, \ वापर शेअर विभागात अंतर्गत साधन &#39;UOM उपयुक्तता बदला."
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,विनिमय दर आणखी मध्ये एक चलन रूपांतरित करण्यात निर्देशीत
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +146,Quotation {0} is cancelled,कोटेशन {0} रद्द
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +141,Quotation {0} is cancelled,कोटेशन {0} रद्द
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,एकूण थकबाकी रक्कम
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} was on leave on {1}. Cannot mark attendance.,{0} कर्मचारी वर सुट्टी घेतली होती {1}. हजेरी चिन्हांकित करू शकत नाही.
 DocType: Sales Partner,Targets,लक्ष्य
@@ -2179,7 +2104,6 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +158,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,संगणक
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +112,Electro-chemical grinding,इलेक्ट्रो-रासायनिक पदार्थ बारीक
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +14,This is a root customer group and cannot be edited.,हे मूळ ग्राहक गट आहे आणि संपादित केला जाऊ शकत नाही.
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +39,Please setup your chart of accounts before you start Accounting Entries,खाती आपल्या चार्ट सेटअप तुम्ही लेखा नोंदी सुरू करा आधी
 DocType: Purchase Invoice,Ignore Pricing Rule,किंमत नियम दुर्लक्ष करा
@@ -2225,7 +2149,6 @@
 DocType: Maintenance Visit,Purposes,हेतू
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +103,Atleast one item should be entered with negative quantity in return document,किमान एक आयटम परत दस्तऐवज नकारात्मक प्रमाणात प्रवेश केला पाहिजे
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +67,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","ऑपरेशन {0} वर्कस्टेशन म्हणून कोणत्याही उपलब्ध काम तासांपेक्षा जास्त {1}, अनेक ऑपरेशन मध्ये ऑपरेशन तोडून"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +134,Electrochemical machining,पाहून यंत्र
 ,Requested,विनंती
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +66,No Remarks,नाही शेरा
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +13,Overdue,मुदत संपलेला
@@ -2234,7 +2157,7 @@
 DocType: Monthly Distribution,Distribution Name,वितरण नाव
 DocType: Features Setup,Sales and Purchase,विक्री आणि खरेदी
 DocType: Supplier Quotation Item,Material Request No,साहित्य विनंती नाही
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +218,Quality Inspection required for Item {0},आयटम आवश्यक गुणवत्ता तपासणी {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +221,Quality Inspection required for Item {0},आयटम आवश्यक गुणवत्ता तपासणी {0}
 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),निव्वळ दर (कंपनी चलन)
@@ -2252,9 +2175,8 @@
 apps/erpnext/erpnext/accounts/report/financial_statements.py +16,Fiscal Year {0} not found.,आर्थिक वर्ष {0} सापडले नाही.
 DocType: Bank Reconciliation,Get Relevant Entries,संबंधित नोंदी मिळवा
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +407,Accounting Entry for Stock,शेअर एकट्या प्रवेश
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +64,Coining,Coining
 DocType: Sales Invoice,Sales Team1,विक्री Team1
-apps/erpnext/erpnext/stock/doctype/item/item.py +412,Item {0} does not exist,आयटम {0} अस्तित्वात नाही
+apps/erpnext/erpnext/stock/doctype/item/item.py +416,Item {0} does not exist,आयटम {0} अस्तित्वात नाही
 DocType: Sales Invoice,Customer Address,ग्राहक पत्ता
 apps/frappe/frappe/desk/query_report.py +136,Total,एकूण
 DocType: Purchase Invoice,Apply Additional Discount On,अतिरिक्त सवलत लागू
@@ -2266,14 +2188,13 @@
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),सवलत रक्कम नंतर कर रक्कम (कंपनी चलन)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +149,Target warehouse is mandatory for row {0},लक्ष्य कोठार सलग अनिवार्य आहे {0}
 DocType: Quality Inspection,Quality Inspection,गुणवत्ता तपासणी
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +144,Extra Small,अतिरिक्त लहान
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +20,Spray forming,लागत स्प्रे
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Extra Small,अतिरिक्त लहान
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +458,Warning: Material Requested Qty is less than Minimum Order Qty,चेतावनी: Qty मागणी साहित्य किमान Qty पेक्षा कमी आहे
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +191,Account {0} is frozen,खाते {0} गोठविले
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,संघटना राहण्याचे लेखा स्वतंत्र चार्ट सह कायदेशीर अस्तित्व / उपकंपनी.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +29,"Food, Beverage & Tobacco","अन्न, पेय आणि तंबाखू"
+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,पु किंवा बी.एस.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,Can only make payment against unbilled {0},फक्त रक्कम करू शकता बिल न केलेली {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +531,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/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Minimum Inventory Level,किमान सूची स्तर
 DocType: Stock Entry,Subcontract,Subcontract
@@ -2284,19 +2205,18 @@
 DocType: Item,Manufacturer Part Number,निर्माता भाग क्रमांक
 DocType: Production Order Operation,Estimated Time and Cost,अंदाजे वेळ आणि खर्च
 DocType: Bin,Bin,बिन
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +50,Nosing,Nosing
 DocType: SMS Log,No of Sent SMS,पाठविलेला एसएमएस नाही
 DocType: Account,Company,कंपनी
 DocType: Account,Expense Account,खर्च खाते
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +49,Software,सॉफ्टवेअर
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +151,Colour,रंग
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +49,Software,सॉफ्टवेअर
+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",&quot;नाही&quot; आणि &quot;विक्री आयटम आहे&quot; &quot;शेअर आयटम आहे&quot; कोठे आहे? &quot;होय&quot; आहे आयटम निवडा आणि इतर उत्पादन बंडल आहे कृपया
 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 +281,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} वरील &#39;खरेदी पावत्या&#39; टेबल मध्ये अस्तित्वात नाही खरेदी पावती
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +134,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 +145,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,लॉग पुनर्नामित करा
@@ -2306,7 +2226,7 @@
 apps/erpnext/erpnext/controllers/recurring_document.py +162,Please select {0},कृपया निवडा {0}
 DocType: C-Form,C-Form No,सी-फॉर्म नाही
 DocType: BOM,Exploded_items,Exploded_items
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +95,Researcher,संशोधक
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Researcher,संशोधक
 apps/frappe/frappe/custom/doctype/customize_form/customize_form.js +88,Update,अद्यतन
 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 +23,Name or Email is mandatory,नाव किंवा ईमेल अनिवार्य आहे
@@ -2315,11 +2235,10 @@
 DocType: Employee,Exit,बाहेर पडा
 apps/erpnext/erpnext/accounts/doctype/account/account.py +134,Root Type is mandatory,रूट प्रकार अनिवार्य आहे
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +295,Serial No {0} created,{0} तयार माणे
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +125,Vibratory finishing,कंप पावणारा पूर्ण
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","ग्राहकांच्या सोयीसाठी, हे कोड पावत्या आणि वितरण टिपा सारख्या प्रिंट स्वरूपात वापरले जाऊ शकते"
 DocType: Employee,You can enter any date manually,तुम्ही स्वतः तारीख प्रविष्ट करू शकता
 DocType: Sales Invoice,Advertisement,जाहिरात
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +165,Probationary Period,प्रशिक्षणार्थी कालावधी
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Probationary Period,प्रशिक्षणार्थी कालावधी
 DocType: Customer Group,Only leaf nodes are allowed in transaction,फक्त पाने नोडस् व्यवहार अनुमत आहेत
 DocType: Expense Claim,Expense Approver,खर्च माफीचा साक्षीदार
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,खरेदी पावती आयटम प्रदान
@@ -2327,19 +2246,16 @@
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +17,To Datetime,DATETIME करण्यासाठी
 DocType: SMS Settings,SMS Gateway URL,एसएमएस गेटवे URL
 apps/erpnext/erpnext/config/crm.py +53,Logs for maintaining sms delivery status,एसएमएस स्थिती राखण्यासाठी नोंदी
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +137,Grinding,ग्राइंडर
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +34,Shrink wrapping,ओघ संकुचित
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +36,Pending Activities,प्रलंबित उपक्रम
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,Confirmed,पुष्टी
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier > Supplier Type,पुरवठादार&gt; पुरवठादार प्रकार
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +127,Please enter relieving date.,तारीख relieving प्रविष्ट करा.
 apps/erpnext/erpnext/controllers/trends.py +137,Amt,रक्कम
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' can be submitted,फक्त स्थिती &#39;मंजूर&#39; सादर केला जाऊ शकतो अनुप्रयोग सोडा
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +51,Only Leave Applications with status 'Approved' can be submitted,फक्त स्थिती &#39;मंजूर&#39; सादर केला जाऊ शकतो अनुप्रयोग सोडा
 apps/erpnext/erpnext/utilities/doctype/address/address.py +21,Address Title is mandatory.,पत्ता शीर्षक आवश्यक आहे.
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,चौकशी स्रोत मोहिम आहे तर मोहीम नाव प्रविष्ट करा
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +38,Newspaper Publishers,वृत्तपत्र प्रकाशक
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +38,Newspaper Publishers,वृत्तपत्र प्रकाशक
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,आर्थिक वर्ष निवडा
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +88,Smelting,Smelting
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,पुनर्क्रमित करा स्तर
 DocType: Attendance,Attendance Date,विधान परिषदेच्या तारीख
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,कमावते आणि कपात आधारित पगार चित्रपटाने.
@@ -2354,16 +2270,15 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +414,[Error],[त्रुटी]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,तुम्ही विक्री ऑर्डर जतन एकदा शब्द मध्ये दृश्यमान होईल.
 ,Employee Birthday,कर्मचारी वाढदिवस
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +55,Venture Capital,व्हेंचर कॅपिटल
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,व्हेंचर कॅपिटल
 DocType: UOM,Must be Whole Number,संपूर्ण क्रमांक असणे आवश्यक आहे
 DocType: Leave Control Panel,New Leaves Allocated (In Days),(दिवस मध्ये) वाटप नवी पाने
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +51,Serial No {0} does not exist,सिरियल नाही {0} अस्तित्वात नाही
 DocType: Pricing Rule,Discount Percentage,सवलत टक्केवारी
 DocType: Payment Reconciliation Invoice,Invoice Number,चलन क्रमांक
-apps/erpnext/erpnext/hooks.py +70,Orders,आदेश
+apps/erpnext/erpnext/hooks.py +54,Orders,आदेश
 DocType: Leave Control Panel,Employee Type,कर्मचारी प्रकार
 DocType: Employee Leave Approver,Leave Approver,माफीचा साक्षीदार सोडा
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +70,Swaging,Swaging
 DocType: Manufacturing Settings,Material Transferred for Manufacture,साहित्य उत्पादन साठी हस्तांतरित
 DocType: Expense Claim,"A user with ""Expense Approver"" role",&quot;खर्चाचे माफीचा साक्षीदार&quot; भूमिका एक वापरकर्ता
 ,Issued Items Against Production Order,उत्पादन आदेशा जारी आयटम
@@ -2375,7 +2290,6 @@
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +62,Cost Center with existing transactions can not be converted to group,विद्यमान व्यवहार खर्चाच्या केंद्र गट रूपांतरीत केले जाऊ शकत नाही
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Depreciation,घसारा
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),पुरवठादार (चे)
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +29,Invalid period,अवैध कालावधी
 DocType: Customer,Credit Limit,क्रेडिट मर्यादा
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,व्यवहार प्रकार निवडा
 DocType: GL Entry,Voucher No,प्रमाणक नाही
@@ -2385,9 +2299,9 @@
 DocType: Customer,Address and Contact,पत्ता आणि संपर्क
 DocType: Customer,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}"
 apps/erpnext/erpnext/accounts/party.py +284,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),टीप: मुळे / संदर्भ तारीख {0} दिवसा परवानगी ग्राहक क्रेडिट दिवस पेक्षा जास्त (चे)
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +621,Maint. Schedule,पिररक्षण. वेळापत्रक
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +108,Abrasive jet machining,कठोर जेट यंत्र
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +632,Maint. Schedule,पिररक्षण. वेळापत्रक
 DocType: Stock Settings,Freeze Stock Entries,फ्रीझ शेअर नोंदी
 DocType: Website Settings,Website Settings,वेबसाइट सेटिंग्ज
 DocType: Item,Reorder level based on Warehouse,वखार आधारित पुन्हा क्रमवारी लावा पातळी
@@ -2404,7 +2318,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +75,Show Stock Entries,दर्शवा शेअर नोंदी
 ,Is Primary Address,प्राथमिक पत्ता आहे
 DocType: Production Order,Work-in-Progress Warehouse,कार्य-इन-प्रगती कोठार
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +308,Reference #{0} dated {1},संदर्भ # {0} दिनांक {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Reference #{0} dated {1},संदर्भ # {0} दिनांक {1}
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +13,Manage Addresses,पत्ते व्यवस्थापित करा
 DocType: Pricing Rule,Item Code,आयटम कोड
 DocType: Production Planning Tool,Create Production Orders,उत्पादन ऑर्डर तयार करा
@@ -2413,7 +2327,7 @@
 DocType: Lead,Market Segment,बाजार विभाग
 DocType: Communication,Phone,फोन
 DocType: Employee Internal Work History,Employee Internal Work History,कर्मचारी अंतर्गत कार्य इतिहास
-apps/erpnext/erpnext/public/js/account_tree_grid.js +50,Closing (Dr),बंद (डॉ)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +221,Closing (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.,व्यवहार विक्री कर टेम्प्लेट.
@@ -2429,8 +2343,8 @@
 ,Billed Amount,बिल केलेली रक्कम
 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 +129,Material Request {0} is cancelled or stopped,साहित्य विनंती {0} रद्द किंवा बंद आहे
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +641,Add a few sample records,काही नमुना रेकॉर्ड जोडा
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +133,Material Request {0} is cancelled or stopped,साहित्य विनंती {0} रद्द किंवा बंद आहे
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Add a few sample records,काही नमुना रेकॉर्ड जोडा
 apps/erpnext/erpnext/config/hr.py +210,Leave Management,व्यवस्थापन सोडा
 DocType: Event,Groups,गट
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,खाते गट
@@ -2443,38 +2357,34 @@
 DocType: Features Setup,Sales Extras,विक्री अवांतर
 apps/erpnext/erpnext/accounts/utils.py +344,{0} budget for Account {1} against Cost Center {2} will exceed by {3},{2} खर्च केंद्र विरुद्ध खाते {1} साठी {0} बजेट करून टाकेल {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +236,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","या शेअर मेळ उदघाटन नोंद आहे पासून फरक खाते, एक मालमत्ता / दायित्व प्रकार खाते असणे आवश्यक आहे"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +138,Purchase Order number required for Item {0},आयटम आवश्यक मागणी क्रमांक खरेदी {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Order number required for Item {0},आयटम आवश्यक मागणी क्रमांक खरेदी {0}
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',&#39;तारीख पासून&#39; नंतर &#39;दिनांक करण्यासाठी&#39; असणे आवश्यक आहे
 ,Stock Projected Qty,शेअर Qty अंदाज
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +147,Customer {0} does not belong to project {1},संबंधित नाही {0} ग्राहक प्रोजेक्ट करण्यासाठी {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +150,Customer {0} does not belong to project {1},संबंधित नाही {0} ग्राहक प्रोजेक्ट करण्यासाठी {1}
 DocType: Sales Order,Customer's Purchase Order,ग्राहकाच्या पर्चेस
 DocType: Warranty Claim,From Company,कंपनी पासून
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,मूल्य किंवा Qty
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Minute,मिनिट
+apps/erpnext/erpnext/public/js/setup_wizard.js +363,Minute,मिनिट
 DocType: Purchase Invoice,Purchase Taxes and Charges,कर आणि शुल्क खरेदी
 ,Qty to Receive,प्राप्त करण्यासाठी Qty
 DocType: Leave Block List,Leave Block List Allowed,ब्लॉक यादी परवानगी द्या
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +61,Conversion factor cannot be in fractions,रुपांतर घटक अपूर्णांक असू शकत नाही
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +358,You will use it to Login,आपण लॉगिन करेल
+apps/erpnext/erpnext/public/js/setup_wizard.js +108,You will use it to Login,आपण लॉगिन करेल
 DocType: Sales Partner,Retailer,किरकोळ विक्रेता
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +99,Credit To account must be a Balance Sheet account,खाते क्रेडिट ताळेबंद खाते असणे आवश्यक आहे
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,सर्व पुरवठादार प्रकार
 apps/erpnext/erpnext/stock/doctype/item/item.py +37,Item Code is mandatory because Item is not automatically numbered,आयटम स्वयंचलितपणे गणती केली नाही कारण आयटम कोड बंधनकारक आहे
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +99,Quotation {0} not of type {1},कोटेशन {0} नाही प्रकारच्या {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +93,Quotation {0} not of type {1},कोटेशन {0} नाही प्रकारच्या {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,देखभाल वेळापत्रक आयटम
 DocType: Sales Order,%  Delivered,% वितरण
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,Bank Overdraft Account,बँक ओव्हरड्राफ्ट खाते
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +15,Make Salary Slip,पगाराच्या स्लिप्स करा
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +18,Browse BOM,ब्राउझ करा BOM
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +175,Secured Loans,सुरक्षित कर्ज
-apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +3,Awesome Products,अप्रतिम उत्पादने
+apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +3,Awesome Products,अप्रतिम उत्पादने
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +189,Opening Balance Equity,उघडणे शिल्लक इक्विटी
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +80,Cannot approve leave as you are not authorized to approve leaves on Block Dates,तुम्ही ब्लॉक तारखा वर पाने मंजूर करण्यासाठी अधिकृत नाही रजा मंजूर करू शकत नाही
 DocType: Appraisal,Appraisal,मूल्यमापन
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +13,Lost-foam casting,गमावले-फेस निर्णायक
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +47,Drawing,चित्रकला
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +22,Date is repeated,तारीख पुनरावृत्ती आहे
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +148,Leave approver must be one of {0},एक असणे आवश्यक आहे माफीचा साक्षीदार सोडा {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +162,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,प्रारंभ वेळ
@@ -2488,7 +2398,7 @@
 DocType: Purchase Invoice Item,Net Amount (Company Currency),निव्वळ रक्कम (कंपनी चलन)
 DocType: BOM Operation,Hour Rate,तास दर
 DocType: Stock Settings,Item Naming By,आयटम करून नामांकन
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +642,From Quotation,कोटेशन पासून
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +655,From Quotation,कोटेशन पासून
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},आणखी कालावधी संवरण {0} आला आहे {1}
 DocType: Production Order,Material Transferred for Manufacturing,साहित्य उत्पादन साठी हस्तांतरित
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +29,Account {0} does not exists,खाते {0} नाही अस्तित्वात
@@ -2502,21 +2412,19 @@
 DocType: Purchase Invoice Item,PR Detail,जनसंपर्क तपशील
 DocType: Sales Order,Fully Billed,पूर्णतः बिल
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +20,Cash In Hand,हातात रोख
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +72,Delivery warehouse required for stock item {0},डिलिव्हरी कोठार स्टॉक आयटम आवश्यक {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +119,Delivery warehouse required for stock item {0},डिलिव्हरी कोठार स्टॉक आयटम आवश्यक {0}
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),संकुल एकूण वजन. सहसा निव्वळ वजन + पॅकेजिंग साहित्य वजन. (मुद्रण)
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,या भूमिका वापरकर्ते गोठविलेल्या खात्यांचे विरुद्ध लेखा नोंदी गोठविलेल्या खाती सेट आणि तयार / सुधारित करण्याची अनुमती आहे
 DocType: Serial No,Is Cancelled,रद्द आहे
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +281,My Shipments,माझे Shipments
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +286,My Shipments,माझे Shipments
 DocType: Journal Entry,Bill Date,बिल तारीख
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +43,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","सर्वोच्च प्राधान्य एकाधिक किंमत नियम आहेत जरी, तर खालील अंतर्गत प्राधान्यक्रम लागू केले आहेत:"
 DocType: Supplier,Supplier Details,पुरवठादार तपशील
 DocType: Communication,Recipients,घेवप्यांची
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +146,Screwing,Screwing
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +96,Knurling,Knurling
 DocType: Expense Claim,Approval Status,मंजूरीची स्थिती
 DocType: Hub Settings,Publish Items to Hub,हब करण्यासाठी आयटम प्रकाशित
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +44,From value must be less than to value in row {0},मूल्य रांगेत मूल्य पेक्षा कमी असणे आवश्यक पासून {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +133,Wire Transfer,वायर हस्तांतरण
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +133,Wire Transfer,वायर हस्तांतरण
 apps/erpnext/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py +25,Please select Bank Account,बँक खाते निवडा
 DocType: Newsletter,Create and Send Newsletters,तयार करा आणि पाठवा वृत्तपत्रे
 apps/frappe/frappe/public/js/frappe/views/reports/grid_report.js +305,From Date must be before To Date,तारीख दिनांक करण्यासाठी असणे आवश्यक आहे
@@ -2524,14 +2432,14 @@
 DocType: Company,Default Income Account,मुलभूत उत्पन्न खाते
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,ग्राहक गट / ग्राहक
 DocType: Item Group,Check this if you want to show in website,आपण वेबसाइटवर मध्ये दाखवायची असेल तर या तपासा
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +190,Welcome to ERPNext,ERPNext आपले स्वागत आहे
+,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/page/setup_wizard/install_fixtures.py +37,Calls,कॉल
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Calls,कॉल
 DocType: Project,Total Costing Amount (via Time Logs),एकूण भांडवलाच्या रक्कम (वेळ नोंदी द्वारे)
 DocType: Purchase Order Item Supplied,Stock UOM,शेअर UOM
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Purchase Order {0} is not submitted,"ऑर्डर {0} सबमिट केलेली नाही, खरेदी"
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +194,Purchase Order {0} is not submitted,"ऑर्डर {0} सबमिट केलेली नाही, खरेदी"
 ,Projected,अंदाज
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},सिरियल नाही {0} कोठार संबंधित नाही {1}
 apps/erpnext/erpnext/controllers/status_updater.py +136,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,टीप: {0} प्रमाणात किंवा रक्कम 0 आहे म्हणून चेंडू-प्रती आणि-बुकिंग आयटम सिस्टम तपासा नाही
@@ -2539,7 +2447,6 @@
 DocType: Issue,Opening Date,उघडण्याच्या तारीख
 DocType: Journal Entry,Remark,शेरा
 DocType: Purchase Receipt Item,Rate and Amount,दर आणि रक्कम
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +95,Boring,कंटाळवाणा
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +667,From Sales Order,विक्री ऑर्डर पासून
 DocType: Blog Category,Parent Website Route,पालक वेबसाइट मार्ग
 DocType: Sales Order,Not Billed,बिल नाही
@@ -2553,19 +2460,17 @@
 apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount Amount,सवलत रक्कम
 DocType: Purchase Invoice,Return Against Purchase Invoice,विरुद्ध खरेदी चलन परत
 DocType: Item,Warranty Period (in days),(दिवस मध्ये) वॉरंटी कालावधी
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +550,e.g. VAT,उदा व्हॅट
+apps/erpnext/erpnext/public/js/setup_wizard.js +292,e.g. VAT,उदा व्हॅट
 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,कोटेशन मालिका
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +52,"An item exists with same name ({0}), please change the item group name or rename the item","एक आयटम त्याच नावाने अस्तित्वात ({0}), आयटम समूहाचे नाव बदलू किंवा आयटम पुनर्नामित करा"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +82,Hot metal gas forming,लागत हॉट मेटल गॅस
 DocType: Sales Order Item,Sales Order Date,विक्री ऑर्डर तारीख
 DocType: Sales Invoice Item,Delivered Qty,वितरित केले Qty
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +63,Warehouse {0}: Company is mandatory,कोठार {0}: कंपनी अनिवार्य आहे
 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.",कर दर उल्लेख योग्य गट (निधी&gt; वर्तमान उत्तरदायित्व&gt; कर आणि कर्तव्ये सहसा स्त्रोत जा आणि प्रकार &quot;कर&quot; या) बालक जोडा वर क्लिक करून (नवीन खाते तयार करा आणि करू.
 ,Payment Period Based On Invoice Date,चलन तारखेला आधारित भरणा कालावधी
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +50,Missing Currency Exchange Rates for {0},साठी गहाळ चलन विनिमय दर {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +135,Laser cutting,लेझर कटिंग
 DocType: Event,Monday,सोमवारी
 DocType: Journal Entry,Stock Entry,शेअर प्रवेश
 DocType: Account,Payable,देय
@@ -2598,7 +2503,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +111,Date Of Retirement must be greater than Date of Joining,निवृत्ती तारीख प्रवेश दिनांक पेक्षा जास्त असणे आवश्यक आहे
 DocType: Sales Invoice,Against Income Account,उत्पन्न खाते विरुद्ध
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +69,{0}% Delivered,{0}% वितरण
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +78,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,आयटम {0}: क्रमांकित qty {1} किमान qty {2} (आयटम मध्ये परिभाषित) पेक्षा कमी असू शकत नाही.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,आयटम {0}: क्रमांकित qty {1} किमान qty {2} (आयटम मध्ये परिभाषित) पेक्षा कमी असू शकत नाही.
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,मासिक वितरण टक्केवारी
 DocType: Territory,Territory Targets,प्रदेश लक्ष्य
 DocType: Delivery Note,Transporter Info,वाहतुक माहिती
@@ -2607,7 +2512,6 @@
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,प्रिंट टेम्पलेट साठी शोध शिर्षके फाईल नाव Proforma चलन उदा.
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +140,Valuation type charges can not marked as Inclusive,मूल्यांकन प्रकार शुल्क समावेश म्हणून चिन्हांकित करू शकत नाही
 DocType: POS Profile,Update Stock,अद्यतन शेअर
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +128,Superfinishing,Superfinishing
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,आयटम साठी विविध UOM अयोग्य (एकूण) निव्वळ वजन मूल्य नेईल. प्रत्येक आयटम निव्वळ वजन समान UOM आहे याची खात्री करा.
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM दर
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +85,Please pull items from Delivery Note,डिलिव्हरी टीप आयटम पुल करा
@@ -2622,7 +2526,6 @@
 ,Purchase Analytics,खरेदी Analytics
 DocType: Sales Invoice Item,Delivery Note Item,डिलिव्हरी टीप आयटम
 DocType: Expense Claim,Task,कार्य
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +57,Shaving,दाढी
 DocType: Purchase Taxes and Charges,Reference Row #,संदर्भ रो #
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},बॅच नंबर आयटम अनिवार्य आहे {0}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js +14,This is a root sales person and cannot be edited.,या रूट विक्री व्यक्ती आहे आणि संपादित केला जाऊ शकत नाही.
@@ -2634,13 +2537,11 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +74,Purpose must be one of {0},हेतू एक असणे आवश्यक आहे {0}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +108,Fill the form and save it,फॉर्म भरा आणि तो जतन
 DocType: Production Planning Tool,Download a report containing all raw materials with their latest inventory status,त्यांच्या नवीनतम यादी स्थिती सर्व कच्चा माल असलेली एक अहवाल डाउनलोड करा
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +94,Facing,तोंड
 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: Time Log,Billable,बिल
-DocType: Authorization Rule,This will be used for setting rule in HR module,हे एचआर विभागात नियम सेट करण्यासाठी वापरले जाईल
 DocType: Account,Rate at which this tax is applied,हा कर लागू आहे येथे दर
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reorder Qty,पुनर्क्रमित करा Qty
 DocType: Company,Stock Adjustment Account,शेअर समायोजन खाते
@@ -2667,16 +2568,15 @@
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,टक्केवारी वाटप 100% समान असावी
 DocType: Serial No,Out of AMC,एएमसी पैकी
 DocType: Purchase Order Item,Material Request Detail No,साहित्य विनंती तपशील नाही
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +97,Hard turning,हार्ड वळण
 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 +79,Company (not Customer or Supplier) master.,कंपनी (नाही ग्राहक किंवा पुरवठादार) मास्टर.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +106,Please enter 'Expected Delivery Date',&#39;अपेक्षित डिलिव्हरी तारीख&#39; प्रविष्ट करा
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +187,Delivery Notes {0} must be cancelled before cancelling this Sales Order,डिलिव्हरी टिपा {0} या विक्री ऑर्डर रद्द आधी रद्द करणे आवश्यक आहे
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +100,Please enter 'Expected Delivery Date',&#39;अपेक्षित डिलिव्हरी तारीख&#39; प्रविष्ट करा
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +182,Delivery Notes {0} must be cancelled before cancelling this Sales Order,डिलिव्हरी टिपा {0} या विक्री ऑर्डर रद्द आधी रद्द करणे आवश्यक आहे
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +373,Paid amount + Write Off Amount can not be greater than Grand Total,पेड रक्कम रक्कम एकूण पेक्षा जास्त असू शकत नाही बंद लिहा +
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} आयटम एक वैध बॅच क्रमांक नाही {1}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,Note: There is not enough leave balance for Leave Type {0},टीप: रजा प्रकार पुरेशी रजा शिल्लक नाही {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +124,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,संधी प्रकार
@@ -2688,7 +2588,7 @@
 DocType: Hub Settings,Publish Availability,उपलब्धता प्रकाशित
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +105,Date of Birth cannot be greater than today.,जन्म तारीख आज पेक्षा जास्त असू शकत नाही.
 ,Stock Ageing,शेअर Ageing
-apps/erpnext/erpnext/controllers/accounts_controller.py +200,{0} '{1}' is disabled,{0} &#39;{1}&#39; अक्षम आहे
+apps/erpnext/erpnext/controllers/accounts_controller.py +201,{0} '{1}' is disabled,{0} &#39;{1}&#39; अक्षम आहे
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,म्हणून उघडा सेट
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,सादर करत आहे व्यवहार वर संपर्क स्वयंचलित ईमेल पाठवा.
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +232,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
@@ -2697,44 +2597,38 @@
 DocType: Purchase Order,Customer Contact Email,ग्राहक संपर्क ईमेल
 DocType: Event,Sunday,रविवारी
 DocType: Sales Team,Contribution (%),योगदान (%)
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +455,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,टीप: भरणा प्रवेश पासून तयार केले जाणार नाहीत &#39;रोख किंवा बँक खाते&#39; निर्दिष्ट नाही
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +171,Responsibilities,जबाबदारी
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +457,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,टीप: भरणा प्रवेश पासून तयार केले जाणार नाहीत &#39;रोख किंवा बँक खाते&#39; निर्दिष्ट नाही
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +171,Responsibilities,जबाबदारी
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,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,टेबल मध्ये किमान 1 चलन प्रविष्ट करा
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +511,Add Users,वापरकर्ते जोडा
+apps/erpnext/erpnext/public/js/setup_wizard.js +255,Add Users,वापरकर्ते जोडा
 DocType: Pricing Rule,Item Group,आयटम गट
 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),कर आणि शुल्क जोडले (कंपनी चलन)
-apps/erpnext/erpnext/stock/doctype/item/item.py +340,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,आयटम कर रो {0} प्रकार कर किंवा उत्पन्न किंवा खर्चाचे किंवा भार च्या खाते असणे आवश्यक आहे
+apps/erpnext/erpnext/stock/doctype/item/item.py +344,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,आयटम कर रो {0} प्रकार कर किंवा उत्पन्न किंवा खर्चाचे किंवा भार च्या खाते असणे आवश्यक आहे
 DocType: Sales Order,Partly Billed,पाऊस बिल
 DocType: Item,Default BOM,मुलभूत BOM
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +79,Decambering,Decambering
 apps/erpnext/erpnext/setup/doctype/company/company.js +22,Please re-type company name to confirm,पुन्हा-टाइप करा कंपनीचे नाव पुष्टी करा
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,एकूण थकबाकी रक्कम
 DocType: Time Log Batch,Total Hours,एकूण तास
 DocType: Journal Entry,Printing Settings,मुद्रण सेटिंग्ज
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +268,Total Debit must be equal to Total Credit. The difference is {0},एकूण डेबिट एकूण क्रेडिट समान असणे आवश्यक आहे. फरक आहे {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +11,Automotive,ऑटोमोटिव्ह
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +37,Item is required,आयटम आवश्यक आहे
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +25,Metal injection molding,मेटल इंजेक्शन मोल्डिंग
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +258,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/accounts/doctype/sales_invoice/sales_invoice.js +684,From Delivery Note,डिलिव्हरी टीप पासून
 DocType: Time Log,From Time,वेळ पासून
 DocType: Notification Control,Custom Message,सानुकूल संदेश
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +33,Investment Banking,गुंतवणूक बँकिंग
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +261,"Select your Country, Time Zone and Currency","आपला देश, टाइम झोन, आणि चलन निवडा"
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,गुंतवणूक बँकिंग
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +316,"Select your Country, Time Zone and Currency","आपला देश, टाइम झोन, आणि चलन निवडा"
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +369,Cash or Bank Account is mandatory for making payment entry,रोख रक्कम किंवा बँक खाते पैसे नोंदणी करण्यासाठी अनिवार्य आहे
 DocType: Purchase Invoice,Price List Exchange Rate,किंमत सूची विनिमय दर
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +91,Pickling,Pickling
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +18,Sand casting,वाळू निर्णायक
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +117,Electroplating,इलेक्ट्रोप्लेटिंगचा
 DocType: Purchase Invoice Item,Rate,दर
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +62,Intern,हद्दीच्या
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Intern,हद्दीच्या
 DocType: Newsletter,A Lead with this email id should exist,या ई-मेल आयडी सह आघाडी अस्तित्वात पाहिजे
 DocType: Stock Entry,From BOM,BOM पासून
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +34,Basic,मूलभूत
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +34,Basic,मूलभूत
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,{0} गोठविली आहेत करण्यापूर्वी शेअर व्यवहार
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +217,Please click on 'Generate Schedule',&#39;व्युत्पन्न वेळापत्रक&#39; वर क्लिक करा
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +61,To Date should be same as From Date for Half Day leave,तारीख करण्यासाठी अर्धा दिवस रजा दिनांक पासून एकच असले पाहिजे
@@ -2742,10 +2636,10 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +96,Reference No is mandatory if you entered Reference Date,तुम्ही संदर्भ तारीख प्रविष्ट केला असल्यास संदर्भ नाही बंधनकारक आहे
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +108,Date of Joining must be greater than Date of Birth,प्रवेश दिनांक जन्म तारीख पेक्षा जास्त असणे आवश्यक आहे
 DocType: Salary Structure,Salary Structure,वेतन रचना
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +242,"Multiple Price Rule exists with same criteria, please resolve \
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +246,"Multiple Price Rule exists with same criteria, please resolve \
 			conflict by assigning priority. Price Rules: {0}","एकापेक्षा जास्त किंमत नियम समान निकष अस्तित्वात नाही, प्राधान्य सोपवून \ विरोधाचे निराकरण करा. किंमत नियम: {0}"
 DocType: Account,Bank,बँक
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +9,Airline,एयरलाईन
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,एयरलाईन
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +493,Issue Material,समस्या साहित्य
 DocType: Material Request Item,For Warehouse,वखार साठी
 DocType: Employee,Offer Date,ऑफर तारीख
@@ -2755,29 +2649,24 @@
 DocType: Item,Is Fixed Asset Item,मुदत मालमत्ता आयटम आहे
 DocType: Stock Entry,Including items for sub assemblies,उप विधानसभा आयटम समावेश
 DocType: Features Setup,"If you have long print formats, this feature can be used to split the page to be printed on multiple pages with all headers and footers on each page","आपण लांब प्रिंट स्वरूप असल्यास, हे वैशिष्ट्य प्रत्येक पानावर सर्व शीर्षलेख आणि तळटीप सह एकाधिक पृष्ठांवर मुद्रित केले पृष्ठ विभाजन करण्यासाठी वापरले जाऊ शकते"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +131,Hobbing,Hobbing
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +98,All Territories,सर्व प्रदेश
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +98,All Territories,सर्व प्रदेश
 DocType: Purchase Invoice,Items,आयटम
 DocType: Fiscal Year,Year Name,वर्ष नाव
 DocType: Process Payroll,Process Payroll,प्रक्रिया वेतनपट
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +59,There are more holidays than working days this month.,कामाचे दिवस पेक्षा अधिक सुटी या महिन्यात आहेत.
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +68,There are more holidays than working days this month.,कामाचे दिवस पेक्षा अधिक सुटी या महिन्यात आहेत.
 DocType: Product Bundle Item,Product Bundle Item,उत्पादन बंडल आयटम
 DocType: Sales Partner,Sales Partner Name,विक्री भागीदार नाव
 DocType: Purchase Invoice Item,Image View,प्रतिमा पहा
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +113,Finishing & industrial finishing,पूर्ण आणि औद्योगिक पूर्ण
 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/page/setup_wizard/fixtures/industry_type.py +46,Securities & Commodity Exchanges,सिक्युरिटीज अँड कमोडिटी
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,सिक्युरिटीज अँड कमोडिटी
 DocType: Shipping Rule,Calculate Based On,आधारित असणे
 DocType: Delivery Note Item,From Warehouse,वखार पासून
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +98,Drilling,ड्रिलिंग
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +28,Blow molding,वाहणे काठ
 DocType: Purchase Taxes and Charges,Valuation and Total,मूल्यांकन आणि एकूण
 DocType: Tax Rule,Shipping City,शिपिंग शहर
 apps/erpnext/erpnext/stock/doctype/item/item.js +43,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,या आयटम {0} (साचा) एक प्रकार आहे. &#39;नाही प्रत बनवा&#39; वर सेट केले नसेल विशेषता टेम्पलेट प्रती कॉपी होईल
 DocType: Account,Purchase User,खरेदी सदस्य
 DocType: Notification Control,Customize the Notification,सूचना सानुकूलित
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +87,Hammering,ठोकून
 DocType: Web Page,Slideshow,स्लाइडशो
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +24,Default Address Template cannot be deleted,मुलभूत पत्ता साचा हटविले जाऊ शकत नाही
 DocType: Sales Invoice,Shipping Rule,शिपिंग नियम
@@ -2786,9 +2675,8 @@
 DocType: Workflow State,Search,शोध
 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,&#39;गेल्या ऑर्डर असल्याने दिवस&#39; शून्य पेक्षा मोठे किंवा समान असणे आवश्यक आहे
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +142,Brazing,Brazing
 DocType: C-Form,Amended From,पासून दुरुस्ती
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Raw Material,कच्चा माल
+apps/erpnext/erpnext/public/js/setup_wizard.js +359,Raw Material,कच्चा माल
 DocType: Leave Application,Follow via Email,ईमेल द्वारे अनुसरण करा
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,सवलत रक्कम नंतर कर रक्कम
 apps/erpnext/erpnext/accounts/doctype/account/account.py +174,Child account exists for this account. You can not delete this account.,बाल खाते हे खाते विद्यमान आहे. आपण हे खाते हटवू शकत नाही.
@@ -2802,10 +2690,10 @@
 ,Produced,निर्मिती
 DocType: Item,Item Code for Suppliers,पुरवठादार आयटम कोड
 DocType: Issue,Raised By (Email),उपस्थित (ईमेल)
-apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +72,General,सामान्य
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +495,Attach Letterhead,नाव संलग्न
+apps/erpnext/erpnext/setup/setup_wizard/default_website.py +72,General,सामान्य
+apps/erpnext/erpnext/public/js/setup_wizard.js +241,Attach Letterhead,नाव संलग्न
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +272,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',गटात मूल्यांकन &#39;किंवा&#39; मूल्यांकन आणि एकूण &#39;आहे तेव्हा वजा करू शकत नाही
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +542,"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/public/js/setup_wizard.js +284,"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}
 DocType: Journal Entry,Bank Entry,बँक प्रवेश
 DocType: Authorization Rule,Applicable To (Designation),लागू करण्यासाठी (पद)
@@ -2814,32 +2702,31 @@
 apps/erpnext/erpnext/config/accounts.py +143,Enable / disable currencies.,/ अक्षम चलने सक्षम करा.
 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),एकूण (रक्कम)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +26,Entertainment & Leisure,मनोरंजन आणि फुरसतीचा वेळ
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,मनोरंजन आणि फुरसतीचा वेळ
 DocType: Purchase Order,The date on which recurring order will be stop,आवर्ती ऑर्डर बंद होणार तारीख
 DocType: Quality Inspection,Item Serial No,आयटम सिरियल नाही
 apps/erpnext/erpnext/controllers/status_updater.py +142,{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 +57,Total Present,एकूण उपस्थित
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Hour,तास
+apps/erpnext/erpnext/public/js/setup_wizard.js +363,Hour,तास
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +138,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation",सिरीयलाइज आयटम {0} शेअर मेळ वापरून \ अद्यतनित करणे शक्य नाही
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +488,Transfer Material to Supplier,पुरवठादार करण्यासाठी ह तांत रत
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +513,Transfer Material to Supplier,पुरवठादार करण्यासाठी ह तांत रत
 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/crm/doctype/opportunity/opportunity.js +82,Create Quotation,कोटेशन तयार करा
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +306,All these items have already been invoiced,या सर्व आयटम आधीच invoiced आहेत
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,You are not authorized to approve leaves on Block Dates,आपण ब्लॉक तारखा वर पाने मंजूर करण्यासाठी अधिकृत नाही
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +311,All these items have already been invoiced,या सर्व आयटम आधीच 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,बदली नवीन BOM
 DocType: Features Setup,Point of Sale,विक्री पॉइंट
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +83,Curling,कर्लिंग
 DocType: Account,Tax,कर
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +28,Row {0}: {1} is not a valid {2},रो {0}: {1} एक वैध नाही {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +89,Refining,शुद्धीकरण
+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,उत्पादन नियोजन साधन
 DocType: Quality Inspection,Report Date,अहवाल तारीख
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +130,Routing,मार्गाचे
 DocType: C-Form,Invoices,पावत्या
 DocType: Job Opening,Job Title,कार्य शीर्षक
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +54,{0} already allocated for Employee {1} for period {2} - {3},{0} आधीच कालावधीसाठी कर्मचारी {1} तरतूद {2} - {3}
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +80,{0} Recipients,{0} घेवप्यांची
 DocType: Features Setup,Item Groups in Details,तपशील आयटम गट
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +335,Quantity to Manufacture must be greater than 0.,कारखानदार प्रमाण 0 पेक्षा जास्त असणे आवश्यक आहे.
@@ -2857,14 +2744,13 @@
 DocType: DocType,Setup,सेटअप
 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,या महिन्यात आणि प्रलंबित उपक्रम सारांश
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +39,Cold rolling,थंड रोलिंग
 DocType: Customer Group,Customer Group Name,ग्राहक गट नाव
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +408,Please remove this Invoice {0} from C-Form {1},सी-फॉर्म या चलन {0} काढून टाका {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +410,Please remove this Invoice {0} from C-Form {1},सी-फॉर्म या चलन {0} काढून टाका {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,विशेषता
 DocType: Packing Slip,Get Items,आयटम मिळवा
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +186,Please enter Write Off Account,खाते बंद लिहा प्रविष्ट करा
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +187,Please enter Write Off Account,खाते बंद लिहा प्रविष्ट करा
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +71,Last Order Date,गेल्या ऑर्डर तारीख
 DocType: DocField,Image,प्रतिमा
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +179,Make Excise Invoice,अबकारी चलन करा
@@ -2874,7 +2760,7 @@
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +146,Operation ID not set,ऑपरेशन आयडी सेट नाही
 DocType: Production Order,Planned Start Date,नियोजनबद्ध प्रारंभ तारीख
 DocType: Serial No,Creation Document Type,निर्मिती दस्तऐवज प्रकार
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +620,Maint. Visit,पिररक्षण. भेट द्या
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +631,Maint. Visit,पिररक्षण. भेट द्या
 DocType: Leave Type,Is Encash,रोख रकमेत बदलून आहे
 DocType: Purchase Invoice,Mobile No,मोबाइल नाही
 DocType: Payment Tool,Make Journal Entry,जर्नल प्रवेश करा
@@ -2882,35 +2768,31 @@
 apps/erpnext/erpnext/controllers/trends.py +257,Project-wise data is not available for Quotation,प्रकल्प निहाय माहिती कोटेशन उपलब्ध नाही
 DocType: Project,Expected End Date,अपेक्षित शेवटची तारीख
 DocType: Appraisal Template,Appraisal Template Title,मूल्यांकन साचा शीर्षक
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +440,Commercial,व्यावसायिक
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +378,Commercial,व्यावसायिक
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +23,Parent Item {0} must not be a Stock Item,पालक आयटम {0} शेअर आयटम असू शकत नाही
 DocType: Cost Center,Distribution Id,वितरण आयडी
-apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +14,Awesome Services,अप्रतिम सेवा
+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,पुरवठादार पत्ता
 DocType: Contact Us Settings,Address Line 2,पत्ता ओळ 2
 DocType: ToDo,Reference,संदर्भ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +59,Perforating,Perforating
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,Qty आउट
 apps/erpnext/erpnext/config/accounts.py +128,Rules to calculate shipping amount for a sale,नियम विक्रीसाठी शिपिंग रक्कम गणना
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +29,Series is mandatory,मालिका अनिवार्य आहे
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +28,Financial Services,वित्तीय सेवा
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,वित्तीय सेवा
 apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3},{0} विशेषता मूल्य श्रेणीत असणे आवश्यक आहे {1} करण्यासाठी {2} वाढ मध्ये {3}
 DocType: Tax Rule,Sales,विक्री
 DocType: Stock Entry Detail,Basic Amount,मूलभूत रक्कम
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +173,Warehouse required for stock Item {0},कोठार स्टॉक आयटम आवश्यक {0}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +178,Warehouse required for stock Item {0},कोठार स्टॉक आयटम आवश्यक {0}
 DocType: Leave Allocation,Unused leaves,न वापरलेले पाने
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,कोटी
 DocType: Customer,Default Receivable Accounts,प्राप्तीयोग्य खाते डीफॉल्ट
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +102,Sawing,Sawing
 DocType: Tax Rule,Billing State,बिलिंग राज्य
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +32,Laminating,लॅमिनेट
 DocType: Item Reorder,Transfer,ट्रान्सफर
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +549,Fetch exploded BOM (including sub-assemblies),(उप-मंडळ्यांना समावेश) स्फोट झाला BOM प्राप्त
 DocType: Authorization Rule,Applicable To (Employee),लागू करण्यासाठी (कर्मचारी)
 apps/erpnext/erpnext/controllers/accounts_controller.py +101,Due Date is mandatory,मुळे तारीख अनिवार्य आहे
 apps/erpnext/erpnext/controllers/item_variant.py +51,Increment for Attribute {0} cannot be 0,विशेषता साठी बढती {0} 0 असू शकत नाही
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +143,Sintering,Sintering
 DocType: Journal Entry,Pay To / Recd From,पासून / Recd अदा
 DocType: Naming Series,Setup Series,सेटअप मालिका
 DocType: Supplier,Contact HTML,संपर्क HTML
@@ -2923,7 +2805,6 @@
 DocType: Attendance,Absent,अनुपस्थित
 DocType: Product Bundle,Product Bundle,उत्पादन बंडल
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +180,Row {0}: Invalid reference {1},रो {0}: अवैध संदर्भ {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +165,Crushing,निर्णायक
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,कर आणि शुल्क साचा खरेदी
 DocType: Upload Attendance,Download Template,डाउनलोड साचा
 DocType: GL Entry,Remarks,शेरा
@@ -2931,14 +2812,12 @@
 DocType: Journal Entry,Write Off Based On,आधारित बंद लिहा
 DocType: Features Setup,POS View,पीओएस पहा
 apps/erpnext/erpnext/config/stock.py +38,Installation record for a Serial No.,एक सिरियल क्रमांक प्रतिष्ठापन रेकॉर्ड
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +9,Continuous casting,सतत निर्णायक
 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/setup/page/setup_wizard/fixtures/operations.py +80,Cold sizing,थंड आकाराचे
 DocType: Salary Slip,Earning & Deduction,कमाई आणि कपात
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +76,Account {0} cannot be a Group,खाते {0} एक गट असू शकत नाही
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +259,Region,प्रदेश
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +314,Region,प्रदेश
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +213,Optional. This setting will be used to filter in various transactions.,पर्यायी. हे सेटिंग विविध व्यवहार फिल्टर करण्यासाठी वापरला जाईल.
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +104,Negative Valuation Rate is not allowed,नकारात्मक मूल्यांकन दर परवानगी नाही
 DocType: Holiday List,Weekly Off,साप्ताहिक बंद
@@ -2956,7 +2835,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,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,तारीख करण्यासाठी तारीख आणि विधान परिषदेच्या पासून उपस्थिती अनिवार्य आहे
-apps/erpnext/erpnext/controllers/buying_controller.py +131,Please enter 'Is Subcontracted' as Yes or No,होय किंवा नाही म्हणून &#39;Subcontracted आहे&#39; प्रविष्ट करा
+apps/erpnext/erpnext/controllers/buying_controller.py +122,Please enter 'Is Subcontracted' as Yes or No,होय किंवा नाही म्हणून &#39;Subcontracted आहे&#39; प्रविष्ट करा
 DocType: Sales Team,Contact No.,संपर्क क्रमांक
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,'Profit and Loss' type account {0} not allowed in Opening Entry,'नफा व तोटा' प्रकार खाते {0} प्रवेशास परवानगी नाही 
 DocType: Workflow State,Time,वेळ
@@ -2965,14 +2844,13 @@
 DocType: Authorization Rule,Authorization Rule,प्राधिकृत नियम
 DocType: Sales Invoice,Terms and Conditions Details,अटी आणि शर्ती तपशील
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,विक्री कर आणि शुल्क साचा
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +10,Apparel & Accessories,तयार कपडे आणि अॅक्सेसरीज
+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,ऑर्डर संख्या
 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 +121,Add Child,बाल जोडा
 DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,भूमिका फ्रोजन खाती &amp; संपादित करा फ्रोजन नोंदी सेट करण्याची परवानगी
 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/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +47,Conversion Factor is required,रुपांतरण फॅक्टर आवश्यक आहे
 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,मूल्य / वर्णन
@@ -2980,10 +2858,8 @@
 ,Customers Not Buying Since Long Time,ग्राहक वेळ असल्याने खरेदी
 DocType: Production Order,Expected Delivery Date,अपेक्षित वितरण तारीख
 apps/erpnext/erpnext/accounts/general_ledger.py +121,Debit and Credit not equal for {0} #{1}. Difference is {2}.,डेबिट आणि क्रेडिट {0} # समान नाही {1}. फरक आहे {2}.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +48,Bulging,फुगवटा
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +11,Evaporative-pattern casting,बाष्पीभवन-नमुना निर्णायक
 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 +195,Sales Invoice {0} must be cancelled before cancelling this Sales Order,या विक्री ऑर्डर रद्द आधी चलन {0} रद्द करणे आवश्यक आहे विक्री
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +190,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 पेक्षा जास्त असणे आवश्यक आहे.
@@ -3002,26 +2878,24 @@
 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 +241,Account: {0} with currency: {1} can not be selected,खाते: {0} चलन: {1} निवडले जाऊ शकत नाही
+apps/erpnext/erpnext/controllers/accounts_controller.py +242,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 +47,Account {0}: Parent account {1} does not belong to company: {2},खाते {0}: पालक खाते {1} कंपनी संबंधित नाही: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted all transactions related to this company!,यशस्वीरित्या ही कंपनी संबंधित सर्व व्यवहार हटवला!
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,तारखेला
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +111,Honing,Honing
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +58,Probation,उमेदवारीचा काळ
-apps/erpnext/erpnext/stock/doctype/item/item.py +264,Default Warehouse is mandatory for stock Item.,मुलभूत कोठार स्टॉक आयटम अनिवार्य आहे.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Probation,उमेदवारीचा काळ
+apps/erpnext/erpnext/stock/doctype/item/item.py +268,Default Warehouse is mandatory for stock Item.,मुलभूत कोठार स्टॉक आयटम अनिवार्य आहे.
 DocType: Feed,Full Name,पूर्ण नाव
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +148,Clinching,Clinching
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +191,Payment of salary for the month {0} and year {1},महिन्यात पगार भरणा {0} आणि वर्ष {1}
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +173,Payment of salary for the month {0} and year {1},महिन्यात पगार भरणा {0} आणि वर्ष {1}
 DocType: Stock Settings,Auto insert Price List rate if missing,ऑटो घाला दर सूची दर गहाळ असेल तर
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,एकूण देय रक्कम
 ,Transferred Qty,हस्तांतरित Qty
 apps/erpnext/erpnext/config/learn.py +11,Navigating,नॅव्हिगेट
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +137,Planning,नियोजन
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +137,Planning,नियोजन
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +9,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),एकूण बिलिंग रक्कम (वेळ नोंदी द्वारे)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +629,We sell this Item,आम्ही या आयटम विक्री
+apps/erpnext/erpnext/public/js/setup_wizard.js +365,We sell this Item,आम्ही या आयटम विक्री
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +65,Supplier Id,पुरवठादार आयडी
 DocType: Journal Entry,Cash Entry,रोख प्रवेश
 DocType: Sales Partner,Contact Desc,संपर्क desc
@@ -3030,18 +2904,16 @@
 DocType: Brand,Item Manager,आयटम व्यवस्थापक
 DocType: Cost Center,Add rows to set annual budgets on Accounts.,खाती वार्षिक अर्थसंकल्प सेट करण्यासाठी पंक्ती जोडा.
 DocType: Buying Settings,Default Supplier Type,मुलभूत पुरवठादार प्रकार
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +160,Quarrying,दागिने
 DocType: Production Order,Total Operating Cost,एकूण ऑपरेटिंग खर्च
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +160,Note: Item {0} entered multiple times,टीप: आयटम {0} अनेक वेळा प्रवेश केला
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +163,Note: Item {0} entered multiple times,टीप: आयटम {0} अनेक वेळा प्रवेश केला
 apps/erpnext/erpnext/config/crm.py +27,All Contacts.,सर्व संपर्क.
 DocType: Newsletter,Test Email Id,कसोटी ई मेल आयडी
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +394,Company Abbreviation,कंपनी Abbreviation
+apps/erpnext/erpnext/public/js/setup_wizard.js +142,Company Abbreviation,कंपनी Abbreviation
 DocType: Features Setup,If you follow Quality Inspection. Enables Item QA Required and QA No in Purchase Receipt,आपण गुणवत्ता तपासणी अनुसरण केल्यास. खरेदी पावती नाही आयटम गुणवत्ता आवश्यक आणि QA वर सक्षम
 DocType: GL Entry,Party Type,पार्टी प्रकार
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +68,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} मर्यादा ओलांडते पासून authroized नाही
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +30,Rotational molding,फेरपालटीचे काठ
 apps/erpnext/erpnext/config/hr.py +115,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,हे खरेदी सूचीत टाका सेट कर नियम
@@ -3055,15 +2927,15 @@
 apps/erpnext/erpnext/config/selling.py +18,Quotes to Leads or Customers.,निष्पन्न किंवा ग्राहकांना कोट्स.
 DocType: Stock Settings,Role Allowed to edit frozen stock,भूमिका गोठविलेल्या स्टॉक संपादित करण्याची परवानगी
 ,Territory Target Variance Item Group-Wise,प्रदेश लक्ष्य फरक आयटम गट निहाय
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +101,All Customer Groups,सर्व ग्राहक गट
-apps/erpnext/erpnext/controllers/accounts_controller.py +474,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} करणे आवश्यक आहे. कदाचित चलन विनिमय रेकॉर्ड {1} {2} करण्यासाठी तयार केले नाही.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +101,All Customer Groups,सर्व ग्राहक गट
+apps/erpnext/erpnext/controllers/accounts_controller.py +475,{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 +41,Account {0}: Parent account {1} does not exist,खाते {0}: पालक खाते {1} अस्तित्वात नाही
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),किंमत सूची दर (कंपनी चलन)
 DocType: Account,Temporary,अस्थायी
 DocType: Address,Preferred Billing Address,पसंतीचे बिलिंग पत्ता
 DocType: Monthly Distribution Percentage,Percentage Allocation,टक्केवारी वाटप
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +86,Secretary,सचिव
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Secretary,सचिव
 DocType: Serial No,Distinct unit of an Item,एक आयटम वेगळा एकक
 DocType: Pricing Rule,Buying,खरेदी
 DocType: HR Settings,Employee Records to be created by,कर्मचारी रेकॉर्ड करून तयार करणे
@@ -3076,9 +2948,8 @@
 ,Item-wise Price List Rate,आयटम कुशल दर सूची दर
 DocType: Purchase Order Item,Supplier Quotation,पुरवठादार कोटेशन
 DocType: Quotation,In Words will be visible once you save the Quotation.,तुम्ही अवतरण जतन एकदा शब्द मध्ये दृश्यमान होईल.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +68,Ironing,इस्त्रीसाठी
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is stopped,{0} {1} बंद आहे
-apps/erpnext/erpnext/stock/doctype/item/item.py +352,Barcode {0} already used in Item {1},बारकोड {0} आधीच आयटम वापरले {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +356,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/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,पुढील कार्यक्रम
@@ -3087,27 +2958,25 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +27,Quick Entry,जलद प्रवेश
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0} परत अनिवार्य आहे
 DocType: Purchase Order,To Receive,प्राप्त करण्यासाठी
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +33,Shrink fitting,समर्पक संकुचित
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +522,user@example.com,user@example.com
+apps/erpnext/erpnext/public/js/setup_wizard.js +266,user@example.com,user@example.com
 DocType: Email Digest,Income / Expense,उत्पन्न / खर्च
 DocType: Employee,Personal Email,वैयक्तिक ईमेल
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +58,Total Variance,एकूण फरक
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +62,Total Variance,एकूण फरक
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.","सक्षम असल्यास, प्रणाली आपोआप यादी एकट्या नोंदी पोस्ट होईल."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +15,Brokerage,दलाली
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +15,Brokerage,दलाली
 DocType: Address,Postal Code,पिन कोड
 DocType: Production Order Operation,"in Minutes
 Updated via 'Time Log'",मिनिटे मध्ये &#39;लॉग इन टाइम&#39; द्वारे अद्यतनित
 DocType: Customer,From Lead,लीड पासून
 apps/erpnext/erpnext/config/manufacturing.py +19,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 +442,POS Profile required to make POS Entry,पीओएस प्रोफाइल पीओएस नोंद करणे आवश्यक
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +444,POS Profile required to make POS Entry,पीओएस प्रोफाइल पीओएस नोंद करणे आवश्यक
 DocType: Hub Settings,Name Token,नाव टोकन
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +106,Planing,नियोजन
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Selling,मानक विक्री
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +120,Standard Selling,मानक विक्री
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +137,Atleast one warehouse is mandatory,किमान एक कोठार अनिवार्य आहे
 DocType: Serial No,Out of Warranty,हमी पैकी
 DocType: BOM Replace Tool,Replace,बदला
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +314,{0} against Sales Invoice {1},{0} विक्री चलन विरुद्ध {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +316,{0} against Sales Invoice {1},{0} विक्री चलन विरुद्ध {1}
 apps/erpnext/erpnext/stock/doctype/item/item.py +49,Please enter default Unit of Measure,माप मुलभूत युनिट प्रविष्ट करा
 DocType: Purchase Invoice Item,Project Name,प्रकल्प नाव
 DocType: Supplier,Mention if non-standard receivable account,उल्लेख गैर-मानक प्राप्त खाते तर
@@ -3123,9 +2992,8 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,Journal Entry {0} does not have account {1} or already matched against other voucher,जर्नल प्रवेश {0} {1} किंवा आधीच इतर व्हाउचर जुळवले खाते नाही
 DocType: Item,Moving Average,हलवित सरासरी
 DocType: BOM Replace Tool,The BOM which will be replaced,पुनर्स्थित केले जाईल BOM
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +43,New Stock UOM must be different from current stock UOM,नवी स्टॉक UOM चालू स्टॉक UOM भिन्न असणे आवश्यक आहे
 DocType: Account,Debit,डेबिट
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +34,Leaves must be allocated in multiples of 0.5,पाने 0.5 च्या पटीत वाटप करणे आवश्यक आहे
+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/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,बाकी रक्कम
@@ -3143,8 +3011,7 @@
 DocType: Employee,Internal Work History,अंतर्गत कार्य इतिहास
 DocType: DocField,Column Break,स्तंभ ब्रेक
 DocType: Event,Thursday,गुरुवारी
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +42,Private Equity,प्रायव्हेट इक्विटी
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +93,Turning,अडचणीत
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,प्रायव्हेट इक्विटी
 DocType: Maintenance Visit,Customer Feedback,ग्राहक अभिप्राय
 DocType: Account,Expense,खर्च
 DocType: Sales Invoice,Exhibition,प्रदर्शन
@@ -3157,19 +3024,19 @@
 DocType: Employee,Held On,आयोजित रोजी
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +33,Production Item,उत्पादन आयटम
 ,Employee Information,कर्मचारी माहिती
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,Rate (%),दर (%)
+apps/erpnext/erpnext/public/js/setup_wizard.js +294,Rate (%),दर (%)
 DocType: Stock Entry Detail,Additional Cost,अतिरिक्त खर्च
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +407,Financial Year End Date,आर्थिक वर्ष अंतिम तारीख
+apps/erpnext/erpnext/public/js/setup_wizard.js +155,Financial Year End Date,आर्थिक वर्ष अंतिम तारीख
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Voucher No, if grouped by Voucher","व्हाउचर नाही आधारित फिल्टर करू शकत नाही, व्हाउचर प्रमाणे गटात समाविष्ट केले तर"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +484,Make Supplier Quotation,पुरवठादार कोटेशन करा
 DocType: Quality Inspection,Incoming,येणार्या
 DocType: BOM,Materials Required (Exploded),साहित्य (स्फोट झाला) आवश्यक
 DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),पे न करता सोडू साठी मिळवून कमी (LWP)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +512,"Add users to your organization, other than yourself","स्वत: पेक्षा इतर, आपल्या संस्थेसाठी वापरकर्ते जोडा"
+apps/erpnext/erpnext/public/js/setup_wizard.js +256,"Add users to your organization, other than yourself","स्वत: पेक्षा इतर, आपल्या संस्थेसाठी वापरकर्ते जोडा"
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No {1} does not match with {2} {3},रो # {0}: सिरियल नाही {1} जुळत नाही {2} {3}
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +44,Casual Leave,प्रासंगिक रजा
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +44,Casual Leave,प्रासंगिक रजा
 DocType: Batch,Batch ID,बॅच आयडी
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +334,Note: {0},टीप: {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +336,Note: {0},टीप: {0}
 ,Delivery Note Trends,डिलिव्हरी टीप ट्रेन्ड
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +104,This Week's Summary,या आठवड्यातील सारांश
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +74,{0} must be a Purchased or Sub-Contracted Item in row {1},{0} एकापाठोपाठ एक खरेदी किंवा उप-करारबद्ध आयटम असणे आवश्यक आहे {1}
@@ -3181,7 +3048,7 @@
 DocType: Purchase Receipt,Return Against Purchase Receipt,खरेदी पावती विरुद्ध परत
 DocType: Purchase Order,To Bill,बिल
 DocType: Material Request,% Ordered,% आदेश
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +61,Piecework,Piecework
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Piecework,Piecework
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +64,Avg. Buying Rate,सरासरी. खरेदी दर
 DocType: Task,Actual Time (in Hours),(तास) वास्तविक वेळ
 DocType: Employee,History In Company,कंपनी मध्ये इतिहास
@@ -3198,13 +3065,13 @@
 DocType: Opportunity,To Discuss,चर्चा करण्यासाठी
 DocType: SMS Settings,SMS Settings,SMS सेटिंग्ज
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +60,Temporary Accounts,तात्पुरती खाती
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +155,Black,ब्लॅक
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Black,ब्लॅक
 DocType: BOM Explosion Item,BOM Explosion Item,BOM स्फोट आयटम
 DocType: Account,Auditor,लेखापरीक्षक
 DocType: Purchase Order,End date of current order's period,चालू ऑर्डरच्या कालावधी समाप्ती तारीख
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +17,Make Offer Letter,ऑफर पत्र करा
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +10,Return,परत
-apps/erpnext/erpnext/stock/doctype/item/item.py +503,Default Unit of Measure for Variant must be same as Template,प्रकार करीता माप मुलभूत युनिट साचा म्हणून समान असणे आवश्यक आहे
+apps/erpnext/erpnext/stock/doctype/item/item.py +507,Default Unit of Measure for Variant must be same as Template,प्रकार करीता माप मुलभूत युनिट साचा म्हणून समान असणे आवश्यक आहे
 DocType: DocField,Fold,दुमडणे
 DocType: Production Order Operation,Production Order Operation,उत्पादन ऑर्डर ऑपरेशन
 DocType: Pricing Rule,Disable,अक्षम करा
@@ -3215,13 +3082,12 @@
 DocType: Page,Page Name,पृष्ठ नाव
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +110,To Time must be greater than From Time,वेळ वेळ पासून पेक्षा जास्त असणे आवश्यक करण्यासाठी
 DocType: Journal Entry Account,Exchange Rate,विनिमय दर
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +465,Sales Order {0} is not submitted,"विक्री ऑर्डर {0} सबमिट केलेली नाही,"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +467,Sales Order {0} is not submitted,"विक्री ऑर्डर {0} सबमिट केलेली नाही,"
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0}: Parent account {1} does not bolong to the company {2},कोठार {0}: पालक खाते {1} कंपनी bolong नाही {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +124,Spindle finishing,आस पूर्ण
 DocType: BOM,Last Purchase Rate,गेल्या खरेदी दर
 DocType: Account,Asset,मालमत्ता
 DocType: Project Task,Task ID,कार्य आयडी
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +395,"e.g. ""MC""",उदा &quot;MC&quot;
+apps/erpnext/erpnext/public/js/setup_wizard.js +143,"e.g. ""MC""",उदा &quot;MC&quot;
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,Stock cannot exist for Item {0} since has variants,आयटम साठी अस्तित्वात शकत नाही स्टॉक {0} पासून रूपे आहेत
 ,Sales Person-wise Transaction Summary,विक्री व्यक्ती-ज्ञानी व्यवहार सारांश
 DocType: System Settings,Time Zone,वेळ क्षेत्र
@@ -3230,9 +3096,7 @@
 DocType: Monthly Distribution,Monthly Distribution Percentages,मासिक वितरण टक्केवारी
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +16,The selected item cannot have Batch,निवडलेले आयटम बॅच असू शकत नाही
 DocType: Delivery Note,% of materials delivered against this Delivery Note,साहित्य% या डिलिव्हरी टीप विरोधात वितरित
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +151,Stapling,Stapling
 DocType: Customer,Customer Details,ग्राहक तपशील
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +105,Shaping,आकार घेत
 DocType: Employee,Reports to,अहवाल
 DocType: SMS Settings,Enter url parameter for receiver nos,स्वीकारणारा नग साठी मापदंड प्रविष्ट करा
 DocType: Sales Invoice,Paid Amount,पेड रक्कम
@@ -3241,13 +3105,13 @@
 DocType: Item Variant,Item Variant,आयटम व्हेरियंट
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +15,Setting this Address Template as default as there is no other default,नाही इतर मुलभूत आहे म्हणून हे मुलभूतरित्या पत्ता साचा सेट
 apps/erpnext/erpnext/accounts/doctype/account/account.py +89,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","आधीच डेबिट खाते शिल्लक, आपण &#39;क्रेडिट&#39; म्हणून &#39;शिल्लक असणे आवश्यक आहे&#39; सेट करण्याची परवानगी नाही"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +76,Quality Management,गुणवत्ता व्यवस्थापन
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Quality Management,गुणवत्ता व्यवस्थापन
 DocType: Production Planning Tool,Filter based on customer,फिल्टर ग्राहक आधारित
 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}
 DocType: Employee External Work History,Employee External Work History,कर्मचारी बाह्य कार्य इतिहास
 DocType: Tax Rule,Purchase,खरेदी
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +34,Balance Qty,शिल्लक Qty
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Balance Qty,शिल्लक Qty
 DocType: Item Group,Parent Item Group,मुख्य घटक गट
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +21,{0} for {1},{0} साठी {1}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +96,Cost Centers,खर्च केंद्रे
@@ -3257,12 +3121,12 @@
 DocType: Opportunity,Next Contact,पुढील संपर्क
 DocType: Employee,Employment Type,रोजगार प्रकार
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,स्थिर मालमत्ता
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +84,Application period cannot be across two alocation records,अर्ज कालावधी दोन alocation रेकॉर्ड ओलांडून असू शकत नाही
 DocType: Item Group,Default Expense Account,मुलभूत खर्च खाते
 DocType: Employee,Notice (days),सूचना (दिवस)
 DocType: Page,Yes,होय
 DocType: Tax Rule,Sales Tax Template,विक्री कर साचा
 DocType: Employee,Encashment Date,एनकॅशमेंट तारीख
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +74,Electroforming,Electroforming
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +179,"Against Voucher Type must be one of Purchase Order, Purchase Invoice or Journal Entry","व्हाउचर विरुद्ध प्रकार पर्चेस एक, खरेदी चलन किंवा जर्नल प्रवेश असणे आवश्यक आहे"
 DocType: Account,Stock Adjustment,शेअर समायोजन
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +34,Default Activity Cost exists for Activity Type - {0},मुलभूत गतिविधी खर्च क्रियाकलाप प्रकार विद्यमान - {0}
@@ -3298,12 +3162,12 @@
 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,वितरण
 apps/erpnext/erpnext/public/js/pos/pos.html +36,Amount Paid,अदा केलेली रक्कम
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +91,Project Manager,प्रकल्प व्यवस्थापक
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +72,Dispatch,पाठवणे
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Project Manager,प्रकल्प व्यवस्थापक
+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: Customer,Default Taxes and Charges,मुलभूत कर आणि शुल्क
 DocType: Account,Receivable,प्राप्त
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +268,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,रो # {0}: पर्चेस आधिपासूनच अस्तित्वात आहे म्हणून पुरवठादार बदलण्याची परवानगी नाही
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +263,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 कच्चा माल मिळत विचार केला जाईल. अन्यथा, सर्व उप-विधानसभा आयटम एक कच्चा माल म्हणून मानले जाईल."
@@ -3311,8 +3175,8 @@
 DocType: Hub Settings,Seller Description,विक्रेता वर्णन
 DocType: Employee Education,Qualification,पात्रता
 DocType: Item Price,Item Price,आयटम किंमत
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +48,Soap & Detergent,साबण आणि कपडे
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +36,Motion Picture & Video,मोशन पिक्चर आणि व्हिडिओ
+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,आदेश दिले
 DocType: Warehouse,Warehouse Name,वखार नाव
 DocType: Naming Series,Select Transaction,निवडक व्यवहार
@@ -3321,7 +3185,6 @@
 DocType: BOM,Rate Of Materials Based On,दर साहित्य आधारित रोजी
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,समर्थन Analtyics
 apps/erpnext/erpnext/accounts/doctype/accounts_settings/accounts_settings.py +27,Company is missing in warehouses {0},कंपनी गोदामांची मधिल आढळणारी {0}
-DocType: Stock UOM Replace Utility,Stock UOM Replace Utility,शेअर UOM उपयुक्तता बदला
 DocType: POS Profile,Terms and Conditions,अटी आणि शर्ती
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,To Date should be within the Fiscal Year. Assuming To Date = {0},तारीख करण्यासाठी आर्थिक वर्ष आत असावे. = तारीख करण्यासाठी गृहीत धरून {0}
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","येथे आपण इ उंची, वजन, अॅलर्जी, वैद्यकीय चिंता राखण्यास मदत"
@@ -3333,7 +3196,7 @@
 DocType: Sales Order Item,For Production,उत्पादन
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +103,Please enter sales order in the above table,वरील टेबल विक्री करण्यासाठी प्रविष्ट करा
 DocType: Project Task,View Task,पहा कार्य
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +406,Your financial year begins on,आपले आर्थिक वर्षात सुरू
+apps/erpnext/erpnext/public/js/setup_wizard.js +154,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: Email Digest,Add/Remove Recipients,घेवप्यांची जोडा / काढा
@@ -3341,16 +3204,14 @@
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'",", डीफॉल्ट म्हणून या आर्थिक वर्षात सेट करण्यासाठी &#39;डीफॉल्ट म्हणून सेट करा&#39; वर क्लिक करा"
 apps/erpnext/erpnext/config/support.py +54,Setup incoming server for support email id. (e.g. support@example.com),मदत ईमेल आयडी सेटअप येणार्या सर्व्हर. (उदा support@example.com)
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,कमतरता Qty
-apps/erpnext/erpnext/stock/doctype/item/item.py +528,Item variant {0} exists with same attributes,आयटम जिच्यामध्ये variant {0} समान गुणधर्म अस्तित्वात
+apps/erpnext/erpnext/stock/doctype/item/item.py +532,Item variant {0} exists with same attributes,आयटम जिच्यामध्ये variant {0} समान गुणधर्म अस्तित्वात
 DocType: Salary Slip,Salary Slip,पगाराच्या स्लिप्स
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +116,Burnishing,Burnishing
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +54,'To Date' is required,'तारीख' आवश्यक आहे
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,'तारीख' आवश्यक आहे
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","संकुल वितरित करण्यासाठी स्लिप पॅकिंग व्युत्पन्न. पॅकेज संख्या, संकुल सामुग्री आणि त्याचे वजन सूचित करण्यासाठी वापरले जाते."
 DocType: Sales Invoice Item,Sales Order Item,विक्री ऑर्डर आयटम
 DocType: Salary Slip,Payment Days,भरणा दिवस
 DocType: BOM,Manage cost of operations,ऑपरेशन खर्च व्यवस्थापित करा
 DocType: Features Setup,Item Advanced,आयटम प्रगत
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +40,Hot rolling,हॉट रोलिंग
 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.","तपासले व्यवहार कोणत्याही &quot;सबमिट&quot; जातात तेव्हा, एक ईमेल पॉप-अप आपोआप संलग्नक म्हणून व्यवहार, की व्यवहार संबंधित &quot;संपर्क&quot; एक ईमेल पाठवू उघडले. वापरकर्ता मे किंवा ई-मेल पाठवू शकत नाही."
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,ग्लोबल सेटिंग्ज
 DocType: Employee Education,Employee Education,कर्मचारी शिक्षण
@@ -3363,25 +3224,23 @@
 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/setup/page/setup_wizard/install_fixtures.py +48,Sick Leave,आजारी रजा
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +174,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/page/setup_wizard/fixtures/industry_type.py +22,Department Stores,विभाग स्टोअर्स
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,विभाग स्टोअर्स
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +40,System Balance,प्रणाली शिल्लक
 DocType: Workflow,Is Active,सक्रिय आहे
 apps/erpnext/erpnext/controllers/stock_controller.py +71,No accounting entries for the following warehouses,खालील गोदामांची नाही लेखा नोंदी
 apps/erpnext/erpnext/projects/doctype/project/project.js +22,Save the document first.,पहिल्या दस्तऐवज जतन करा.
 DocType: Account,Chargeable,आकारण्यास
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +121,Linishing,Linishing
 DocType: Company,Change Abbreviation,बदला Abbreviation
 DocType: Workflow State,Primary,प्राथमिक
 DocType: Expense Claim Detail,Expense Date,खर्च तारीख
 DocType: Item,Max Discount (%),कमाल सवलत (%)
 DocType: Communication,More Information,अधिक माहिती
 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/setup/page/setup_wizard/fixtures/operations.py +161,Blasting,झपाटा
 DocType: Company,Warn,चेतावणी द्या
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +111,Item valuation updated,आयटम मूल्यांकन अद्ययावत
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","इतर कोणताही अभिप्राय, रेकॉर्ड जावे की लक्षात घेण्याजोगा प्रयत्न."
 DocType: BOM,Manufacturing User,उत्पादन सदस्य
 DocType: Purchase Order,Raw Materials Supplied,कच्चा माल प्रदान
@@ -3391,7 +3250,7 @@
 DocType: Appraisal,Appraisal Template,मूल्यांकन साचा
 DocType: Communication,Email,ईमेल
 DocType: Item Group,Item Classification,आयटम वर्गीकरण
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +89,Business Development Manager,व्यवसाय विकास व्यवस्थापक
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Business Development Manager,व्यवसाय विकास व्यवस्थापक
 DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,देखभाल भेट द्या उद्देश
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.js +15,Period,कालावधी
 ,General Ledger,सामान्य खातेवही
@@ -3401,9 +3260,7 @@
 ,Itemwise Recommended Reorder Level,Itemwise पुनर्क्रमित स्तर शिफारस
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +264,Please select {0} first,प्रथम {0} निवडा कृपया
 DocType: Features Setup,To get Item Group in details table,तपशील तक्ता मध्ये आयटम गट प्राप्त करण्यासाठी
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +67,Redrawing,ठरविण्याशी
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +112,Batch {0} of Item {1} has expired.,आयटम बॅच {0} {1} कालबाह्य झाले आहे.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +120,Etching,कोरीव काम
 DocType: Sales Invoice,Commission,आयोग
 DocType: Address Template,"<h4>Default Template</h4>
 <p>Uses <a href=""http://jinja.pocoo.org/docs/templates/"">Jinja Templating</a> and all the fields of Address (including Custom Fields if any) will be available</p>
@@ -3437,7 +3294,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +340,Operation Time must be greater than 0 for Operation {0},ऑपरेशन वेळ ऑपरेशन साठी 0 पेक्षा असणे आवश्यक आहे {0}
 DocType: Supplier,Address and Contacts,पत्ता आणि संपर्क
 DocType: UOM Conversion Detail,UOM Conversion Detail,UOM रुपांतर तपशील
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +496,Keep it web friendly 900px (w) by 100px (h),100px करून (प) वेब अनुकूल 900px ठेवा (ह)
+apps/erpnext/erpnext/public/js/setup_wizard.js +242,Keep it web friendly 900px (w) by 100px (h),100px करून (प) वेब अनुकूल 900px ठेवा (ह)
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +329,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,थकबाकी कूपन मिळवा
@@ -3453,54 +3310,49 @@
 DocType: Item,Average time taken by the supplier to deliver,पुरवठादार घेतलेल्या सरासरी वेळ वितरीत करण्यासाठी
 DocType: Time Log,Hours,तास
 DocType: Project,Expected Start Date,अपेक्षित प्रारंभ तारीख
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +38,Rolling,पाठवित
 DocType: ToDo,Priority,प्राधान्य
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +41,Remove item if charges is not applicable to that item,शुल्क की आयटम लागू नाही तर आयटम काढा
 DocType: Dropbox Backup,Dropbox Access Allowed,ड्रॉपबॉक्स प्रवेश परवानगी
 DocType: Dropbox Backup,Weekly,साप्ताहिक
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,उदा. smsgateway.com/api/send_sms.cgi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +485,Receive,प्राप्त
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +510,Receive,प्राप्त
 DocType: Maintenance Visit,Fully Completed,पूर्णतः पूर्ण
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% पूर्ण
 DocType: Employee,Educational Qualification,शैक्षणिक अर्हता
 DocType: Workstation,Operating Costs,खर्च
 DocType: Employee Leave Approver,Employee Leave Approver,कर्मचारी रजा मंजुरी
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,{0} has been successfully added to our Newsletter list.,{0} यशस्वीरित्या आमच्या वार्तापत्राचे यादीत समाविष्ट केले गेले आहे.
-apps/erpnext/erpnext/stock/doctype/item/item.py +383,Row {0}: An Reorder entry already exists for this warehouse {1},रो {0}: एक पुनर्क्रमित अगोदरपासून या कोठार विद्यमान {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +387,Row {0}: An Reorder entry already exists for this warehouse {1},रो {0}: एक पुनर्क्रमित अगोदरपासून या कोठार विद्यमान {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +67,"Cannot declare as lost, because Quotation has been made.","कोटेशन केले आहे कारण, म्हणून गमवलेले जाहीर करू शकत नाही."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +133,Electron beam machining,इलेक्ट्रॉन बीम यंत्र
 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 +150,Please select Start Date and End Date for Item {0},आयटम प्रारंभ तारीख आणि अंतिम तारीख निवडा कृपया {0}
 apps/erpnext/erpnext/config/stock.py +141,Main Reports,मुख्य अहवाल
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +102,Stock Ledger entries balances updated,शेअर लेजर अद्ययावत शिल्लक नोंदी
 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 +176,Add / Edit Prices,/ संपादित करा किंमती जोडा
+apps/erpnext/erpnext/stock/doctype/item/item.js +178,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 +298,My Orders,माझे ऑर्डर
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +293,My Orders,माझे ऑर्डर
 DocType: Price List,Price List Name,किंमत सूची नाव
 DocType: Time Log,For Manufacturing,उत्पादन साठी
-apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +70,Totals,एकूण
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +174,Totals,एकूण
 DocType: BOM,Manufacturing,उत्पादन
 ,Ordered Items To Be Delivered,आदेश दिले आयटम वितरित करणे
 DocType: Account,Income,उत्पन्न
 ,Setup Wizard,सेटअप सहाय्यक
 DocType: Industry Type,Industry Type,उद्योग प्रकार
 apps/erpnext/erpnext/templates/includes/cart.js +137,Something went wrong!,काहीतरी चूक झाली!
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +68,Warning: Leave application contains following block dates,चेतावणी: अनुप्रयोग सोडा खालील ब्लॉक तारखा समाविष्टीत आहे
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +251,Sales Invoice {0} has already been submitted,चलन {0} आधीच सादर केला गेला आहे विक्री
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +100,Warning: Leave application contains following block dates,चेतावणी: अनुप्रयोग सोडा खालील ब्लॉक तारखा समाविष्टीत आहे
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +256,Sales Invoice {0} has already been submitted,चलन {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/setup/page/setup_wizard/fixtures/operations.py +10,Die casting,मरतात निर्णायक
 DocType: Email Alert,Reference Date,संदर्भ तारीख
 apps/erpnext/erpnext/config/hr.py +105,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,पाठविण्यापूर्वी कृपया संदेश प्रविष्ट करा
 DocType: Async Task,Status,स्थिती
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +65,Stock UOM updated for Item {0},शेअर UOM आयटम सुधारित {0}
 DocType: Company History,Year,वर्ष
 apps/erpnext/erpnext/config/accounts.py +127,Point-of-Sale Profile,पॉइंट-ऑफ-विक्री प्रोफाइल
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +68,Please Update SMS Settings,SMS सेटिंग्ज अद्यतनित करा
@@ -3514,12 +3366,12 @@
 ,Serial No Service Contract Expiry,सिरियल नाही सेवा करार कालावधी समाप्ती
 DocType: Item,Unit of Measure Conversion,माप रुपांतर युनिट
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +86,Employee can not be changed,कर्मचारी बदलले जाऊ शकत नाही
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +259,You cannot credit and debit same account at the same time,आपण जमा आणि एकाच वेळी एकाच खाते डेबिट करू शकत नाही
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,You cannot credit and debit same account at the same time,आपण जमा आणि एकाच वेळी एकाच खाते डेबिट करू शकत नाही
 DocType: Naming Series,Help HTML,मदत HTML
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},100% असावे नियुक्त एकूण वजन. ही सेवा विनामुल्य आहे {0}
 apps/erpnext/erpnext/controllers/status_updater.py +140,Allowance for over-{0} crossed for Item {1},{0} आयटम साठी पार over- भत्ता {1}
 DocType: Address,Name of person or organization that this address belongs to.,या पत्त्यावर मालकीची व्यक्ती किंवा संस्थेच्या नाव.
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +587,Your Suppliers,आपले पुरवठादार
+apps/erpnext/erpnext/public/js/setup_wizard.js +325,Your Suppliers,आपले पुरवठादार
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,विक्री आदेश केले आहे म्हणून गमावले म्हणून सेट करू शकत नाही.
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +65,Another Salary Structure {0} is active for employee {1}. Please make its status 'Inactive' to proceed.,आणखी तत्वे {0} कर्मचारी सक्रिय आहे {1}. त्याच्या &#39;चा दर्जा निष्क्रीय&#39; पुढे जाण्यासाठी करा.
 DocType: Purchase Invoice,Contact,संपर्क
@@ -3528,37 +3380,35 @@
 DocType: Item,Has Serial No,सिरियल नाही आहे
 DocType: Employee,Date of Issue,समस्येच्या तारीख
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +16,{0}: From {0} for {1},{0}: पासून {0} साठी {1}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +154,Row #{0}: Set Supplier for item {1},रो # {0}: आयटम सेट करा पुरवठादार {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +149,Row #{0}: Set Supplier for item {1},रो # {0}: आयटम सेट करा पुरवठादार {1}
 DocType: Issue,Content Type,सामग्री प्रकार
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +17,Computer,संगणक
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,संगणक
 DocType: Item,List this Item in multiple groups on the website.,वेबसाइट अनेक गट या आयटम यादी.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +283,Please check Multi Currency option to allow accounts with other currency,इतर चलन खाती परवानगी मल्टी चलन पर्याय तपासा
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +285,Please check Multi Currency option to allow accounts with other currency,इतर चलन खाती परवानगी मल्टी चलन पर्याय तपासा
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +62,Item: {0} does not exist in the system,आयटम: {0} प्रणाली अस्तित्वात नाही
 apps/erpnext/erpnext/accounts/doctype/account/account.py +81,You are not authorized to set Frozen value,आपण गोठविलेल्या मूल्य सेट करण्यासाठी अधिकृत नाही
 DocType: Payment Reconciliation,Get Unreconciled Entries,Unreconciled नोंदी मिळवा
 DocType: Cost Center,Budgets,खर्चाचे अंदाजपत्रक
 apps/frappe/frappe/core/page/modules_setup/modules_setup.py +11,Updated,अद्यतनित
 DocType: Employee,Emergency Contact Details,तात्काळ संपर्क तपशील
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +396,What does it do?,ती काय करते?
+apps/erpnext/erpnext/public/js/setup_wizard.js +144,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,सरासरी आयोग दर
-apps/erpnext/erpnext/stock/doctype/item/item.py +313,'Has Serial No' can not be 'Yes' for non-stock item,&#39;होय&#39; असेल नॉन-स्टॉक आयटम शकत नाही &#39;सिरियल नाही आहे&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +317,'Has Serial No' can not be 'Yes' for non-stock item,&#39;होय&#39; असेल नॉन-स्टॉक आयटम शकत नाही &#39;सिरियल नाही आहे&#39;
 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/setup/page/setup_wizard/install_fixtures.py +111,Electrical,इलेक्ट्रिकल
+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 +302,Row {0}: Exchange Rate is mandatory,रो {0}: विनिमय दर अनिवार्य आहे
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +304,Row {0}: Exchange Rate is mandatory,रो {0}: विनिमय दर अनिवार्य आहे
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},वापरकर्ता आयडी कर्मचारी साठी सेट न {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +72,Peening,Peening
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,From Warranty Claim,हमी दावा पासून
 DocType: Stock Entry,Default Source Warehouse,मुलभूत स्रोत कोठार
 DocType: Item,Customer Code,ग्राहक कोड
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +212,Birthday Reminder for {0},साठी जन्मदिवस अनुस्मरण {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +163,Lapping,Lapping
-apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.js +8,Days Since Last Order,गेल्या ऑर्डर असल्याने दिवस
+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 +299,Debit To account must be a Balance Sheet account,खाते करण्यासाठी डेबिट एक ताळेबंद खाते असणे आवश्यक आहे
 DocType: Buying Settings,Naming Series,नामांकन मालिका
 DocType: Leave Block List,Leave Block List Name,ब्लॉक यादी नाव सोडा
@@ -3572,7 +3422,7 @@
 DocType: Notification Control,Sales Invoice Message,विक्री चलन संदेश
 DocType: Authorization Rule,Based On,आधारित
 DocType: Sales Order Item,Ordered Qty,आदेश दिले Qty
-apps/erpnext/erpnext/stock/doctype/item/item.py +539,Item {0} is disabled,आयटम {0} अक्षम आहे
+apps/erpnext/erpnext/stock/doctype/item/item.py +543,Item {0} is disabled,आयटम {0} अक्षम आहे
 DocType: Stock Settings,Stock Frozen Upto,शेअर फ्रोजन पर्यंत
 apps/erpnext/erpnext/controllers/recurring_document.py +166,Period From and Period To dates mandatory for recurring {0},पासून आणि कालावधी आवर्ती बंधनकारक तारखा करण्यासाठी कालावधी {0}
 apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,प्रकल्प क्रियाकलाप / कार्य.
@@ -3582,7 +3432,6 @@
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,सवलत 100 पेक्षा कमी असणे आवश्यक आहे
 DocType: ToDo,Low,कमी
 DocType: Purchase Invoice,Write Off Amount (Company Currency),रक्कम बंद लिहा (कंपनी चलन)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +71,Spinning,हातमाग
 DocType: Landed Cost Voucher,Landed Cost Voucher,उतरले खर्च व्हाउचर
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +55,Please set {0},सेट करा {0}
 DocType: Purchase Invoice,Repeat on Day of Month,महिना दिवशी पुन्हा करा
@@ -3604,7 +3453,6 @@
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +37,Campaign Name is required,मोहीम नाव आवश्यक आहे
 DocType: Maintenance Visit,Maintenance Date,देखभाल तारीख
 DocType: Purchase Receipt Item,Rejected Serial No,नाकारल्याचे सिरियल नाही
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +51,Deep drawing,दीप रेखाचित्र
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +40,New Newsletter,नवी वृत्तपत्र
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +157,Start date should be less than end date for Item {0},आयटम साठी अंतिम तारीख कमी असणे आवश्यक आहे प्रारंभ तारीख {0}
 apps/erpnext/erpnext/stock/doctype/item/item.js +17,Show Balance,दर्शवा शिल्लक
@@ -3614,7 +3462,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +119,BOM and Manufacturing Quantity are required,BOM व उत्पादन प्रमाण आवश्यक आहे
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Ageing श्रेणी 2
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +450,Amount,रक्कम
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +147,Riveting,Riveting
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,BOM बदलले
 ,Sales Analytics,विक्री Analytics
 DocType: Manufacturing Settings,Manufacturing Settings,उत्पादन सेटिंग्ज
@@ -3626,20 +3473,19 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +207,New Account Name,नवीन खाते नाव
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,कच्चा माल प्रदान खर्च
 DocType: Selling Settings,Settings for Selling Module,विभाग विक्री साठी सेटिंग्ज
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +73,Customer Service,ग्राहक सेवा
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Customer Service,ग्राहक सेवा
 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.,ऑफर उमेदवार जॉब.
 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 +70,Item {0} must be a stock Item,आयटम {0} एक स्टॉक आयटम असणे आवश्यक आहे
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,प्रगती वखार मध्ये डीफॉल्ट कार्य
 apps/erpnext/erpnext/config/accounts.py +107,Default settings for accounting transactions.,लेखा व्यवहार डीफॉल्ट सेटिंग्ज.
 apps/frappe/frappe/model/naming.py +40,{0} is required,{0} आवश्यक आहे
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +21,Vacuum molding,व्हॅक्यूम काठ
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,अपेक्षित तारीख साहित्य विनंती तारीख आधी असू शकत नाही
 DocType: Contact Us Settings,City,शहर
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +132,Ultrasonic machining,Ultrasonic यंत्र
 apps/frappe/frappe/templates/base.html +137,Error: Not a valid id?,त्रुटी: वैध आयडी?
 apps/erpnext/erpnext/stock/get_item_details.py +125,Item {0} must be a Sales Item,आयटम {0} विक्री आयटम असणे आवश्यक आहे
 DocType: Naming Series,Update Series Number,अद्यतन मालिका क्रमांक
@@ -3647,7 +3493,7 @@
 DocType: Sales Order,Printing Details,मुद्रण तपशील
 DocType: Task,Closing Date,अखेरची दिनांक
 DocType: Sales Order Item,Produced Quantity,निर्मिती प्रमाण
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +84,Engineer,अभियंता
+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 +379,Item Code required at Row No {0},आयटम कोड रो नाही आवश्यक {0}
 DocType: Sales Partner,Partner Type,भागीदार प्रकार
@@ -3655,7 +3501,7 @@
 DocType: Authorization Rule,Customerwise Discount,Customerwise सवलत
 DocType: Purchase Invoice,Against Expense Account,खर्चाचे खाते विरुद्ध
 DocType: Production Order,Production Order,उत्पादन ऑर्डर
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +258,Installation Note {0} has already been submitted,प्रतिष्ठापन टीप {0} आधीच सादर केला गेला आहे
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +263,Installation Note {0} has already been submitted,प्रतिष्ठापन टीप {0} आधीच सादर केला गेला आहे
 DocType: Quotation Item,Against Docname,Docname विरुद्ध
 DocType: SMS Center,All Employee (Active),सर्व कर्मचारी (सक्रिय)
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,आता पहा
@@ -3664,19 +3510,19 @@
 DocType: Item,Re-Order Level,पुन्हा-क्रम स्तर
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,आपण उत्पादन आदेश वाढवण्याची किंवा विश्लेषण कच्चा माल डाउनलोड करायचे आहे आयटम आणि नियोजित qty प्रविष्ट करा.
 apps/frappe/frappe/public/js/frappe/views/ganttview.js +45,Gantt Chart,Gantt चार्ट
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +57,Part-time,भाग-वेळ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,Part-time,भाग-वेळ
 DocType: Employee,Applicable Holiday List,लागू सुट्टी यादी
 DocType: Employee,Cheque,धनादेश
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,मालिका अद्यतनित
 apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Report Type is mandatory,अहवाल प्रकार अनिवार्य आहे
 DocType: Item,Serial Number Series,अनुक्रमांक मालिका
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},कोठार सलग शेअर आयटम {0} अनिवार्य आहे {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +45,Retail & Wholesale,रिटेल अॅण्ड घाऊक
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,रिटेल अॅण्ड घाऊक
 DocType: Issue,First Responded On,प्रथम रोजी प्रतिसाद
 DocType: Website Item Group,Cross Listing of Item in multiple groups,अनेक गट आयटम च्या क्रॉस यादी
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +351,The First User: You,प्रथम वापरकर्ता: आपण
+apps/erpnext/erpnext/public/js/setup_wizard.js +101,The First User: You,प्रथम वापरकर्ता: आपण
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +48,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 +172,Successfully Reconciled,यशस्वीरित्या समेट
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +119,Successfully Reconciled,यशस्वीरित्या समेट
 DocType: Production Order,Planned End Date,नियोजनबद्ध अंतिम तारीख
 apps/erpnext/erpnext/config/stock.py +43,Where items are stored.,आयटम कोठे साठवले जातात.
 DocType: Tax Rule,Validity,वैधता
@@ -3696,39 +3542,36 @@
 DocType: DocPerm,Level,स्तर
 DocType: Purchase Taxes and Charges,On Net Total,नेट एकूण रोजी
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +160,Target warehouse in row {0} must be same as Production Order,{0} सलग लक्ष्य कोठार उत्पादन आदेश सारखाच असणे आवश्यक आहे
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +59,No permission to use Payment Tool,कोणतीही परवानगी नाही भरणा साधन वापरण्यास
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +97,No permission to use Payment Tool,कोणतीही परवानगी नाही भरणा साधन वापरण्यास
 apps/erpnext/erpnext/controllers/recurring_document.py +192,'Notification Email Addresses' not specified for recurring %s,% S च्या आवर्ती निर्देशीत नाही &#39;सूचना ईमेल पत्ते&#39;
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +86,Milling,दळणे
 apps/erpnext/erpnext/accounts/doctype/account/account.py +99,Currency can not be changed after making entries using some other currency,चलन काही इतर चलन वापरत नोंदी केल्यानंतर बदलले जाऊ शकत नाही
 DocType: Company,Round Off Account,खाते बंद फेरीत
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +60,Nibbling,Nibbling
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,प्रशासकीय खर्च
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +18,Consulting,सल्ला
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +18,Consulting,सल्ला
 DocType: Customer Group,Parent Customer Group,पालक ग्राहक गट
 apps/erpnext/erpnext/public/js/pos/pos.js +429,Change,बदला
 DocType: Purchase Invoice,Contact Email,संपर्क ईमेल
 DocType: Appraisal Goal,Score Earned,स्कोअर कमाई
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +393,"e.g. ""My Company LLC""",उदा &quot;माझे कंपनी LLC&quot;
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +173,Notice Period,सूचना कालावधी
+apps/erpnext/erpnext/public/js/setup_wizard.js +141,"e.g. ""My Company LLC""",उदा &quot;माझे कंपनी LLC&quot;
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +173,Notice Period,सूचना कालावधी
 DocType: Bank Reconciliation Detail,Voucher ID,प्रमाणक आयडी
 apps/erpnext/erpnext/setup/doctype/territory/territory.js +14,This is a root territory and cannot be edited.,या मूळ प्रदेश आहे आणि संपादित केला जाऊ शकत नाही.
 DocType: Packing Slip,Gross Weight UOM,एकूण वजन UOM
 DocType: Email Digest,Receivables / Payables,Receivables / देय
 DocType: Delivery Note Item,Against Sales Invoice,विक्री चलन विरुद्ध
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +63,Stamping,स्टॅम्पिंग
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +457,Credit Account,क्रेडिट खाते
 DocType: Landed Cost Item,Landed Cost Item,उतरले खर्च आयटम
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +56,Show zero values,शून्य मूल्ये दर्शवा
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,आयटम प्रमाण कच्चा माल दिलेल्या प्रमाणात repacking / उत्पादन नंतर प्राप्त
 DocType: Payment Reconciliation,Receivable / Payable Account,प्राप्त / देय खाते
 DocType: Delivery Note Item,Against Sales Order Item,विक्री ऑर्डर आयटम विरुद्ध
-apps/erpnext/erpnext/stock/doctype/item/item.py +521,Please specify Attribute Value for attribute {0},विशेषतेसाठी मूल्य विशेषता निर्दिष्ट करा {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +525,Please specify Attribute Value for attribute {0},विशेषतेसाठी मूल्य विशेषता निर्दिष्ट करा {0}
 DocType: Item,Default Warehouse,मुलभूत कोठार
 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,रक्कम न मुद्रण
-apps/erpnext/erpnext/controllers/buying_controller.py +69,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,सर्व आयटम नॉन-स्टॉक आयटम आहेत म्हणून कर वर्ग &#39;मूल्यांकन&#39; किंवा &#39;मूल्यांकन आणि एकूण&#39; असू शकत नाही
+apps/erpnext/erpnext/controllers/buying_controller.py +60,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,सर्व आयटम नॉन-स्टॉक आयटम आहेत म्हणून कर वर्ग &#39;मूल्यांकन&#39; किंवा &#39;मूल्यांकन आणि एकूण&#39; असू शकत नाही
 DocType: User,Last Name,गेल्या नाव
 DocType: Web Page,Left,डावीकडे
 DocType: Event,All Day,सर्व दिवस
@@ -3736,7 +3579,7 @@
 DocType: Appraisal,Total Score (Out of 5),(5 पैकी) एकूण धावसंख्या
 DocType: Contact Us Settings,State,राज्य
 DocType: Batch,Batch,बॅच
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +51,Balance,शिल्लक
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +28,Balance,शिल्लक
 DocType: Project,Total Expense Claim (via Expense Claims),एकूण खर्च हक्क (खर्चाचे दावे द्वारे)
 DocType: User,Gender,लिंग
 DocType: Journal Entry,Debit Note,डेबिट टीप
@@ -3766,8 +3609,7 @@
 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/setup/page/setup_wizard/fixtures/operations.py +76,Seaming,Seaming
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +197,"Company Email ID not found, hence mail not sent","कंपनी ईमेल आयडी आढळले नाही, त्यामुळे पाठविले नाही मेल"
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +206,"Company Email ID not found, hence mail not sent","कंपनी ईमेल आयडी आढळले नाही, त्यामुळे पाठविले नाही मेल"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),निधी मालमत्ता (assets) अर्ज
 DocType: Production Planning Tool,Filter based on item,फिल्टर आयटम आधारित
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +451,Debit Account,डेबिट खाते
@@ -3779,17 +3621,16 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +95,{0} {1} has been modified. Please refresh.,{0} {1} सुधारणा करण्यात आली आहे. रिफ्रेश करा.
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,खालील दिवस रजा अनुप्रयोग बनवण्यासाठी वापरकर्त्यांना थांबवा.
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +591,From Opportunity,संधी पासून
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +46,Blanking,Blanking
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +166,Employee Benefits,कर्मचारी फायदे
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,Employee Benefits,कर्मचारी फायदे
 DocType: Sales Invoice,Is POS,पीओएस आहे
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +240,Packed quantity must equal quantity for Item {0} in row {1},पॅक प्रमाणात सलग आयटम {0} संख्या समान असणे आवश्यक आहे {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +245,Packed quantity must equal quantity for Item {0} in row {1},पॅक प्रमाणात सलग आयटम {0} संख्या समान असणे आवश्यक आहे {1}
 DocType: Production Order,Manufactured Qty,उत्पादित 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.,ग्राहक असण्याचा बिले.
 DocType: DocField,Default,मुलभूत
 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 +466,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},रो नाही {0}: रक्कम खर्च दावा {1} विरुद्ध रक्कम प्रलंबित पेक्षा जास्त असू शकत नाही. प्रलंबित रक्कम आहे {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +468,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} ग्राहक जोडले
 DocType: Maintenance Schedule,Schedule,वेळापत्रक
 DocType: Cost Center,"Define Budget for this Cost Center. To set budget action, see ""Company List""","हा खर्च केंद्र अर्थसंकल्पात परिभाषित. बजेट क्रिया सेट करण्यासाठी, पाहू &quot;कंपनी यादी&quot;"
@@ -3800,7 +3641,7 @@
 apps/erpnext/erpnext/public/js/pos/pos.js +91,Price List not found or disabled,किंमत सूची आढळली किंवा अकार्यान्वीत केले नाही
 DocType: Expense Claim,Approved,मंजूर
 DocType: Pricing Rule,Price,किंमत
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +79,Employee relieved on {0} must be set as 'Left',{0} असे सेट करणे आवश्यक वर मुक्त कर्मचारी लेफ्ट &#39;म्हणून
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +88,Employee relieved on {0} must be set as 'Left',{0} असे सेट करणे आवश्यक वर मुक्त कर्मचारी लेफ्ट &#39;म्हणून
 DocType: Item,"Selecting ""Yes"" will give a unique identity to each entity of this item which can be viewed in the Serial No master.",निवडणे &quot;होय&quot; सिरियल नाही मास्टर पाहिले जाऊ शकतात या आयटम प्रत्येक घटकाचे करण्यासाठी एक अद्वितीय ओळख देईल.
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +39,Appraisal {0} created for Employee {1} in the given date range,मूल्यमापन {0} {1} दिलेल्या तारखेपासून श्रेणीत कर्मचारी तयार
 DocType: Employee,Education,शिक्षण
@@ -3811,7 +3652,7 @@
 apps/frappe/frappe/desk/moduleview.py +67,Standard Reports,मानक अहवाल
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,लेखा जर्नल नोंदी.
 DocType: Delivery Note Item,Available Qty at From Warehouse,वखार पासून वर उपलब्ध Qty
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +209,Please select Employee Record first.,पहिल्या कर्मचारी नोंद निवडा.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +224,Please select Employee Record first.,पहिल्या कर्मचारी नोंद निवडा.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,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 +233,Please enter Expense Account,खर्चाचे खाते प्रविष्ट करा
@@ -3824,46 +3665,43 @@
 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,पुल विक्री आदेश वरील निकष आधारित (वितरीत करण्यासाठी प्रलंबित)
 DocType: DocShare,Document Type,दस्तऐवज प्रकार
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +565,From Supplier Quotation,पुरवठादार कोटेशन पासून
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +588,From Supplier Quotation,पुरवठादार कोटेशन पासून
 DocType: Deduction Type,Deduction Type,कपात प्रकार
 DocType: Attendance,Half Day,अर्धा दिवस
 DocType: Pricing Rule,Min Qty,किमान Qty
 DocType: Features Setup,"To track items in sales and purchase documents with batch nos. ""Preferred Industry: Chemicals""",बॅच नग सह विक्री आणि खरेदी दस्तऐवज आयटम ट्रॅक करणे. &quot;पसंतीचे उद्योग: रसायन&quot;
 DocType: GL Entry,Transaction Date,व्यवहार तारीख
 DocType: Production Plan Item,Planned Qty,नियोजनबद्ध Qty
-apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +91,Total Tax,एकूण कर
+apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +93,Total Tax,एकूण कर
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +178,For Quantity (Manufactured Qty) is mandatory,प्रमाण साठी (Qty उत्पादित) करणे आवश्यक आहे
 DocType: Stock Entry,Default Target Warehouse,मुलभूत लक्ष्य कोठार
 DocType: Purchase Invoice,Net Total (Company Currency),निव्वळ एकूण (कंपनी चलन)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +79,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,रो {0}: पक्ष प्रकार आणि पक्षाचे प्राप्तीयोग्य / देय खाते फक्त लागू आहे
 DocType: Notification Control,Purchase Receipt Message,खरेदी पावती संदेश
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +95,Total allocated leaves are more than period,एकूण वाटप पाने कालावधी जास्त आहे
 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.,नोंद आयटम चळवळ.
 DocType: Newsletter List Subscriber,Newsletter List Subscriber,वृत्तपत्र यादी ग्राहक
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +164,Morticing,Morticing
 DocType: Email Account,Service,सेवा
 DocType: Hub Settings,Hub Settings,हब सेटिंग्ज
 DocType: Project,Gross Margin %,एकूण मार्जिन%
 DocType: BOM,With Operations,ऑपरेशन
 apps/erpnext/erpnext/accounts/party.py +232,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,लेखा नोंदी आधीच चलनात केले गेले आहेत {0} कंपनी {1}. चलन एक प्राप्त किंवा देय असलेले खाते निवडा {0}.
 ,Monthly Salary Register,मासिक पगार नोंदणी
-apps/frappe/frappe/website/template.py +140,Next,पुढील
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard_page.html +17,Next,पुढील
 DocType: Warranty Claim,If different than customer address,ग्राहक पत्ता पेक्षा भिन्न असेल तर
 DocType: BOM Operation,BOM Operation,BOM ऑपरेशन
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +118,Electropolishing,Electropolishing
 DocType: Purchase Taxes and Charges,On Previous Row Amount,मागील पंक्ती रकमेवर
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +24,Please enter Payment Amount in atleast one row,किमान एक सलग भरणा रक्कम प्रविष्ट करा
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +33,Please enter Payment Amount in atleast one row,किमान एक सलग भरणा रक्कम प्रविष्ट करा
 DocType: POS Profile,POS Profile,पीओएस प्रोफाइल
 apps/erpnext/erpnext/config/accounts.py +153,"Seasonality for setting budgets, targets etc.","सेट अर्थसंकल्प, लक्ष्य इ हंगामी"
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +238,Row {0}: Payment Amount cannot be greater than Outstanding Amount,रो {0}: भरणा रक्कम शिल्लक रक्कम पेक्षा जास्त असू शकत नाही
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +46,Total Unpaid,न चुकता केल्यामुळे एकूण
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +21,Time Log is not billable,वेळ लॉग बिल देण्यायोग्य नाही
 apps/erpnext/erpnext/stock/get_item_details.py +128,"Item {0} is a template, please select one of its variants","{0} आयटम एक टेम्प्लेट आहे, त्याच्या रूपे कृपया एक निवडा"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +528,Purchaser,ग्राहक
+apps/erpnext/erpnext/public/js/setup_wizard.js +272,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 +71,Please enter the Against Vouchers manually,स्वतः विरुद्ध कूपन प्रविष्ट करा
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +107,Please enter the Against Vouchers manually,स्वतः विरुद्ध कूपन प्रविष्ट करा
 DocType: SMS Settings,Static Parameters,स्थिर बाबी
 DocType: Purchase Order,Advance Paid,आगाऊ अदा
 DocType: Item,Item Tax,आयटम कर
@@ -3872,14 +3710,12 @@
 apps/erpnext/erpnext/config/crm.py +48,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 +57,Actual Qty is mandatory,वास्तविक Qty अनिवार्य आहे
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +42,Cross-rolling,क्रॉस-रोलिंग
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +132,Credit Card,क्रेडिट कार्ड
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +132,Credit Card,क्रेडिट कार्ड
 DocType: BOM,Item to be manufactured or repacked,आयटम उत्पादित किंवा repacked करणे
 apps/erpnext/erpnext/config/stock.py +95,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,कर आणि शुल्क प्रविष्ट करा
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +85,Machining,यंत्र
 DocType: Sales Invoice Item,Drop Ship,ड्रॉप जहाज
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","येथे आपण नाव आणि पालक, पती, पत्नी आणि मुले उद्योग जसे कौटुंबिक तपशील राखण्यास मदत"
 DocType: Hub Settings,Seller Name,विक्रेता नाव
@@ -3889,7 +3725,7 @@
 DocType: Stock Entry,Repack,Repack
 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/setup/page/setup_wizard/setup_wizard.js +500,Attach Logo,लोगो संलग्न
+apps/erpnext/erpnext/public/js/setup_wizard.js +246,Attach Logo,लोगो संलग्न
 DocType: Customer,Commission Rate,आयोगाने दर
 apps/erpnext/erpnext/stock/doctype/item/item.js +38,Make Variant,व्हेरियंट करा
 apps/erpnext/erpnext/config/hr.py +145,Block leave applications by department.,विभागाने ब्लॉक रजा अनुप्रयोग.
@@ -3904,19 +3740,19 @@
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +105,Please select a csv file,एक सी फाइल निवडा
 DocType: Dropbox Backup,Send Backups to Dropbox,ड्रॉपबॉक्स साठवत पाठवा
 DocType: Purchase Order,To Receive and Bill,प्राप्त आणि बिल
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +94,Designer,डिझायनर
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Designer,डिझायनर
 apps/erpnext/erpnext/config/selling.py +121,Terms and Conditions Template,अटी आणि शर्ती साचा
 DocType: Serial No,Delivery Details,वितरण तपशील
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +383,Cost Center is required in row {0} in Taxes table for type {1},प्रकार करीता खर्च केंद्र सलग आवश्यक आहे {0} कर टेबल {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +386,Cost Center is required in row {0} in Taxes table for type {1},प्रकार करीता खर्च केंद्र सलग आवश्यक आहे {0} कर टेबल {1}
 DocType: Item,Automatically create Material Request if quantity falls below this level,"प्रमाण या पातळी खाली पडले, तर स्वयंचलितपणे साहित्य विनंती तयार"
 ,Item-wise Purchase Register,आयटम निहाय खरेदी नोंदणी
 DocType: Batch,Expiry Date,कालावधी समाप्ती तारीख
-apps/erpnext/erpnext/stock/doctype/item/item.py +375,"To set reorder level, item must be a Purchase Item or Manufacturing Item","पुनर्क्रमित पातळी सेट करण्यासाठी, आयटम खरेदी आयटम किंवा उत्पादन आयटम असणे आवश्यक आहे"
+apps/erpnext/erpnext/stock/doctype/item/item.py +379,"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.,प्रकल्प मास्टर.
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,चलने इ $ असे कोणत्याही प्रतीक पुढील दर्शवू नका.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +330, (Half Day),(अर्धा दिवस)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +374, (Half Day),(अर्धा दिवस)
 DocType: Supplier,Credit Days,क्रेडिट दिवस
 DocType: Leave Type,Is Carry Forward,कॅरी फॉरवर्ड आहे
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +478,Get Items from BOM,BOM आयटम मिळवा
@@ -3924,7 +3760,7 @@
 apps/erpnext/erpnext/config/manufacturing.py +120,Bill of Materials,साहित्य बिल
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +77,Row {0}: Party Type and Party is required for Receivable / Payable account {1},रो {0}: पक्ष प्रकार आणि पक्षाचे प्राप्तीयोग्य / देय खाते आवश्यक आहे {1}
 DocType: Dropbox Backup,Send Notifications To,सूचना पाठवा
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html +26,Ref Date,संदर्भ तारीख
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +54,Ref Date,संदर्भ तारीख
 DocType: Employee,Reason for Leaving,सोडत आहे कारण
 DocType: Expense Claim Detail,Sanctioned Amount,मंजूर रक्कम
 DocType: GL Entry,Is Opening,उघडत आहे
@@ -3932,4 +3768,3 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +188,Account {0} does not exist,खाते {0} अस्तित्वात नाही
 DocType: Account,Cash,रोख
 DocType: Employee,Short biography for website and other publications.,वेबसाइट आणि इतर प्रकाशने लहान चरित्र.
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +31,Please create Salary Structure for employee {0},कर्मचारी पगार रचना तयार करा {0}
diff --git a/erpnext/translations/ms.csv b/erpnext/translations/ms.csv
new file mode 100644
index 0000000..1bb2ed8
--- /dev/null
+++ b/erpnext/translations/ms.csv
@@ -0,0 +1,3770 @@
+DocType: Employee,Salary Mode,Mod Gaji
+DocType: Cost Center,"Select Monthly Distribution, if you want to track based on seasonality.","Pilih Pengagihan Bulanan, jika anda mahu untuk mengesan berdasarkan bermusim."
+DocType: Employee,Divorced,Bercerai
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +80,Warning: Same item has been entered multiple times.,Amaran: Sama item telah dimasukkan beberapa kali.
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +96,Items already synced,Item telah disegerakkan
+DocType: Buying Settings,Allow Item to be added multiple times in a transaction,Benarkan Perkara yang akan ditambah beberapa kali dalam urus niaga
+apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,Batal Bahan Melawat {0} sebelum membatalkan Waranti Tuntutan
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,Produk Pengguna
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +68,Please select Party Type first,Sila pilih Jenis Parti pertama
+DocType: Item,Customer Items,Item Pelanggan
+apps/erpnext/erpnext/accounts/doctype/account/account.py +45,Account {0}: Parent account {1} can not be a ledger,Akaun {0}: akaun Induk {1} tidak boleh merupakan satu lejar
+DocType: Item,Publish Item to hub.erpnext.com,Terbitkan Perkara untuk hub.erpnext.com
+apps/erpnext/erpnext/config/setup.py +93,Email Notifications,E-mel Pemberitahuan
+DocType: Item,Default Unit of Measure,Unit keingkaran Langkah
+DocType: SMS Center,All Sales Partner Contact,Semua Jualan Rakan Hubungi
+DocType: Employee,Leave Approvers,Tinggalkan Approvers
+DocType: Sales Partner,Dealer,Peniaga
+DocType: Employee,Rented,Disewa
+DocType: About Us Settings,Website,Laman Web
+DocType: POS Profile,Applicable for User,Digunakan untuk Pengguna
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +169,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Perintah Pengeluaran berhenti tidak boleh dibatalkan, Unstop terlebih dahulu untuk membatalkan"
+apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,Currency is required for Price List {0},Mata wang diperlukan untuk Senarai Harga {0}
+DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Akan dikira dalam urus niaga.
+DocType: Purchase Order,Customer Contact,Pelanggan Hubungi
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +572,From Material Request,Dari Permintaan Bahan
+apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,Pokok {0} 
+DocType: Job Applicant,Job Applicant,Kerja Pemohon
+apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,Tiada lagi hasil.
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +34,Legal,Undang-undang
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +114,Actual type tax cannot be included in Item rate in row {0},Jenis cukai sebenar tidak boleh dimasukkan dalam kadar Perkara berturut-turut {0}
+DocType: C-Form,Customer,Pelanggan
+DocType: Purchase Receipt Item,Required By,Diperlukan oleh
+DocType: Delivery Note,Return Against Delivery Note,Kembali Terhadap Penghantaran Nota
+DocType: Department,Department,Jabatan
+DocType: Purchase Order,% Billed,% Dibilkan
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate must be same as {0} {1} ({2}),Kadar pertukaran mestilah sama dengan {0} {1} ({2})
+DocType: Sales Invoice,Customer Name,Nama Pelanggan
+DocType: Features Setup,"All export related fields like currency, conversion rate, export total, export grand total etc are available in Delivery Note, POS, Quotation, Sales Invoice, Sales Order etc.","Semua bidang yang berkaitan eksport seperti mata wang, kadar penukaran, jumlah eksport, eksport dan lain-lain jumlah besar boleh didapati dalam Nota Penghantaran, POS, Sebut Harga, Invois Jualan, Jualan Pesanan dan lain-lain"
+DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,Kepala (atau kumpulan) terhadap yang Penyertaan Perakaunan dibuat dan baki dikekalkan.
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +177,Outstanding for {0} cannot be less than zero ({1}),Cemerlang untuk {0} tidak boleh kurang daripada sifar ({1})
+DocType: Manufacturing Settings,Default 10 mins,Default 10 minit
+DocType: Leave Type,Leave Type Name,Tinggalkan Nama Jenis
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +148,Series Updated Successfully,Siri Dikemaskini Berjaya
+DocType: Pricing Rule,Apply On,Memohon Pada
+DocType: Item Price,Multiple Item prices.,Harga Item berbilang.
+,Purchase Order Items To Be Received,Item Pesanan Belian Akan Diterima
+DocType: SMS Center,All Supplier Contact,Semua Pembekal Contact
+DocType: Quality Inspection Reading,Parameter,Parameter
+apps/erpnext/erpnext/projects/doctype/project/project.py +43,Expected End Date can not be less than Expected Start Date,Tarikh Jangkaan Tamat tidak boleh kurang daripada yang dijangka Tarikh Mula
+apps/erpnext/erpnext/utilities/transaction_base.py +104,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Row # {0}: Kadar mestilah sama dengan {1}: {2} ({3} / {4})
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +204,New Leave Application,Cuti Permohonan Baru
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +134,Bank Draft,Bank Draf
+DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,"1. Untuk mengekalkan kod item berdasarkan pelanggan dan untuk membolehkan mereka dicari berdasarkan kod mereka, guna pilihan ini"
+DocType: Mode of Payment Account,Mode of Payment Account,Cara Pembayaran Akaun
+apps/erpnext/erpnext/stock/doctype/item/item.js +34,Show Variants,Show Kelainan
+DocType: Sales Invoice Item,Quantity,Kuantiti
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),Pinjaman (Liabiliti)
+DocType: Employee Education,Year of Passing,Tahun Pemergian
+apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,In Stock
+DocType: Designation,Designation,Jawatan
+DocType: Production Plan Item,Production Plan Item,Rancangan Pengeluaran Item
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +141,User {0} is already assigned to Employee {1},Pengguna {0} telah diberikan kepada Pekerja {1}
+apps/erpnext/erpnext/accounts/page/pos/pos_page.html +13,Make new POS Profile,Buat Profil POS baru
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,Penjagaan Kesihatan
+DocType: Purchase Invoice,Monthly,Bulanan
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +66,Delay in payment (Days),Kelewatan dalam pembayaran (Hari)
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +519,Invoice,Invois
+DocType: Maintenance Schedule Item,Periodicity,Jangka masa
+apps/erpnext/erpnext/public/js/setup_wizard.js +107,Email Address,Alamat e-mel
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,Pertahanan
+DocType: Company,Abbr,Abbr
+DocType: Appraisal Goal,Score (0-5),Score (0-5)
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +193,Row {0}: {1} {2} does not match with {3},Row {0}: {1} {2} tidak sepadan dengan {3}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +67,Row # {0}:,Row # {0}:
+DocType: Delivery Note,Vehicle No,Kenderaan Tiada
+apps/erpnext/erpnext/public/js/pos/pos.js +528,Please select Price List,Sila pilih Senarai Harga
+DocType: Production Order Operation,Work In Progress,Kerja Dalam Kemajuan
+DocType: Employee,Holiday List,Senarai Holiday
+DocType: Time Log,Time Log,Masa Log
+apps/erpnext/erpnext/public/js/setup_wizard.js +274,Accountant,Akauntan
+DocType: Cost Center,Stock User,Saham pengguna
+DocType: Company,Phone No,Telefon No
+DocType: Time Log,"Log of Activities performed by users against Tasks that can be used for tracking time, billing.","Log Aktiviti yang dilakukan oleh pengguna terhadap Tugas yang boleh digunakan untuk mengesan masa, bil."
+apps/erpnext/erpnext/controllers/recurring_document.py +127,New {0}: #{1},New {0}: # {1}
+,Sales Partners Commission,Pasangan Jualan Suruhanjaya
+apps/erpnext/erpnext/setup/doctype/company/company.py +32,Abbreviation cannot have more than 5 characters,Singkatan tidak boleh mempunyai lebih daripada 5 aksara
+apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +56,"Attribute Value {0} cannot be removed from {1} as Item Variants \
+						exist with this Attribute.",Atribut Nilai {0} tidak boleh dikeluarkan dari {1} sebagai Item Kelainan \ wujud dengan Atribut ini.
+DocType: Print Settings,Classic,Classic
+apps/erpnext/erpnext/accounts/doctype/account/account.js +27,This is a root account and cannot be edited.,Ini adalah akaun akar dan tidak boleh diedit.
+DocType: BOM,Operations,Operasi
+apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +38,Cannot set authorization on basis of Discount for {0},Tidak boleh menetapkan kebenaran secara Diskaun untuk {0}
+DocType: Bin,Quantity Requested for Purchase,Kuantiti yang diminta untuk Pembelian
+DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name","Lampirkan fail csv dengan dua lajur, satu untuk nama lama dan satu untuk nama baru"
+DocType: Packed Item,Parent Detail docname,Detail Ibu Bapa docname
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Kg,Kg
+apps/erpnext/erpnext/config/hr.py +48,Opening for a Job.,Membuka pekerjaan.
+DocType: Item Attribute,Increment,Kenaikan
+apps/erpnext/erpnext/public/js/stock_analytics.js +63,Select Warehouse...,Pilih Warehouse ...
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,Pengiklanan
+apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,Syarikat yang sama memasuki lebih daripada sekali
+DocType: Employee,Married,Berkahwin
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +391,Stock cannot be updated against Delivery Note {0},Saham tidak boleh dikemaskini terhadap Penghantaran Nota {0}
+DocType: Payment Reconciliation,Reconcile,Mendamaikan
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,Barang runcit
+DocType: Quality Inspection Reading,Reading 1,Membaca 1
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Make Bank Entry,Buat Bank Entry
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,Dana pencen
+apps/erpnext/erpnext/accounts/doctype/account/account.py +142,Warehouse is mandatory if account type is Warehouse,Gudang adalah wajib jika jenis akaun adalah Gudang
+DocType: SMS Center,All Sales Person,Semua Orang Jualan
+DocType: Lead,Person Name,Nama Orang
+DocType: Sales Order,"Check if recurring order, uncheck to stop recurring or put proper End Date","Periksa sama ada perintah berulang, jangan tanda supaya berhenti atau meletakkan Tarikh Akhir betul"
+DocType: Sales Invoice Item,Sales Invoice Item,Perkara Invois Jualan
+DocType: Account,Credit,Kredit
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +25,Please setup Employee Naming System in Human Resource > HR Settings,Sila setup Pekerja Sistem Penamaan dalam Sumber Manusia&gt; Tetapan HR
+DocType: POS Profile,Write Off Cost Center,Tulis Off PTJ
+DocType: Warehouse,Warehouse Detail,Detail Gudang
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +181,Credit limit has been crossed for customer {0} {1}/{2},Had kredit telah menyeberang untuk pelanggan {0} {1} / {2}
+DocType: Tax Rule,Tax Type,Jenis Cukai
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +141,You are not authorized to add or update entries before {0},Anda tidak dibenarkan untuk menambah atau update entri sebelum {0}
+DocType: Item,Item Image (if not slideshow),Perkara imej (jika tidak menayang)
+apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,Satu Pelanggan wujud dengan nama yang sama
+DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(Kadar sejam / 60) * Masa Operasi Sebenar
+DocType: SMS Log,SMS Log,SMS Log
+apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,Kos Item Dihantar
+DocType: Blog Post,Guest,Tetamu
+DocType: Quality Inspection,Get Specification Details,Dapatkan Spesifikasi Butiran
+DocType: Lead,Interested,Berminat
+apps/erpnext/erpnext/config/manufacturing.py +14,Bill of Material,Bill of Material
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +158,Opening,Pembukaan
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},Dari {0} kepada {1}
+DocType: Item,Copy From Item Group,Salinan Dari Perkara Kumpulan
+DocType: Journal Entry,Opening Entry,Entry pembukaan
+apps/frappe/frappe/email/doctype/email_account/email_account.py +58,{0} is mandatory,{0} adalah wajib
+DocType: Stock Entry,Additional Costs,Kos Tambahan
+apps/erpnext/erpnext/accounts/doctype/account/account.py +113,Account with existing transaction can not be converted to group.,Akaun dengan urus niaga yang sedia ada tidak boleh ditukar kepada kumpulan.
+DocType: Lead,Product Enquiry,Pertanyaan Produk
+DocType: Standard Reply,Owner,Pemilik
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +13,Please enter company first,Sila masukkan syarikat pertama
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Company first,Sila pilih Syarikat pertama
+DocType: Employee Education,Under Graduate,Di bawah Siswazah
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +22,Target On,Sasaran Pada
+DocType: BOM,Total Cost,Jumlah Kos
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +9,Activity Log:,Log Aktiviti:
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +199,Item {0} does not exist in the system or has expired,Perkara {0} tidak wujud di dalam sistem atau telah tamat
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +44,Real Estate,Harta Tanah
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +4,Statement of Account,Penyata Akaun
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,Pharmaceuticals
+DocType: Expense Claim Detail,Claim Amount,Tuntutan Amaun
+DocType: Employee,Mr,Mr
+DocType: Custom Script,Client,Pelanggan
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,Jenis pembekal / Pembekal
+DocType: Naming Series,Prefix,Awalan
+apps/erpnext/erpnext/public/js/setup_wizard.js +359,Consumable,Guna habis
+DocType: Upload Attendance,Import Log,Import Log
+apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.js +19,Send,Hantar
+DocType: Sales Invoice Item,Delivered By Supplier,Dihantar Oleh Pembekal
+DocType: SMS Center,All Contact,Semua Contact
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +164,Annual Salary,Gaji Tahunan
+DocType: Period Closing Voucher,Closing Fiscal Year,Penutup Tahun Anggaran
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +69,Stock Expenses,Perbelanjaan saham
+DocType: Newsletter,Email Sent?,E-mel Dihantar?
+DocType: Journal Entry,Contra Entry,Contra Entry
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +92,Show Time Logs,Show Time Logs
+DocType: Journal Entry Account,Credit in Company Currency,Kredit dalam Mata Wang Syarikat
+DocType: Delivery Note,Installation Status,Pemasangan Status
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +118,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Qty Diterima + Ditolak mestilah sama dengan kuantiti yang Diterima untuk Perkara {0}
+DocType: Item,Supply Raw Materials for Purchase,Bahan mentah untuk bekalan Pembelian
+apps/erpnext/erpnext/stock/get_item_details.py +133,Item {0} must be a Purchase Item,Perkara {0} mestilah Pembelian Item
+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","Muat Template, isikan data yang sesuai dan melampirkan fail yang diubah suai. Semua tarikh dan pekerja gabungan dalam tempoh yang dipilih akan datang dalam template, dengan rekod kehadiran yang sedia ada"
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +446,Item {0} is not active or end of life has been reached,Perkara {0} tidak aktif atau akhir hayat telah dicapai
+DocType: Time Log Batch,Will be updated after Sales Invoice is Submitted.,Akan dikemaskinikan selepas Invois Jualan dikemukakan.
+apps/erpnext/erpnext/controllers/accounts_controller.py +494,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Untuk memasukkan cukai berturut-turut {0} dalam kadar Perkara, cukai dalam baris {1} hendaklah juga disediakan"
+apps/erpnext/erpnext/config/hr.py +90,Settings for HR Module,Tetapan untuk HR Modul
+DocType: SMS Center,SMS Center,SMS Center
+DocType: BOM Replace Tool,New BOM,New BOM
+apps/erpnext/erpnext/config/projects.py +28,Batch Time Logs for billing.,Batch Masa Log bil.
+apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +30,Newsletter has already been sent,Newsletter telah dihantar
+DocType: Lead,Request Type,Jenis Permintaan
+DocType: Leave Application,Reason,Sebab
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,Penyiaran
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +140,Execution,Pelaksanaan
+apps/erpnext/erpnext/public/js/setup_wizard.js +114,The first user will become the System Manager (you can change this later).,Pengguna yang pertama akan menjadi Pengurus Sistem (anda boleh menukarnya kemudian).
+apps/erpnext/erpnext/config/manufacturing.py +39,Details of the operations carried out.,Butiran operasi dijalankan.
+DocType: Serial No,Maintenance Status,Penyelenggaraan Status
+apps/erpnext/erpnext/config/stock.py +263,Items and Pricing,Item dan Harga
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +37,From Date should be within the Fiscal Year. Assuming From Date = {0},Dari Tarikh harus berada dalam Tahun Fiskal. Dengan mengandaikan Dari Tarikh = {0}
+DocType: Appraisal,Select the Employee for whom you are creating the Appraisal.,Pilih Pekerja untuk siapa anda mewujudkan Penilaian.
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,Cost Center {0} does not belong to Company {1},Kos Pusat {0} bukan milik Syarikat {1}
+DocType: Customer,Individual,Individu
+apps/erpnext/erpnext/config/support.py +23,Plan for maintenance visits.,Rancangan untuk lawatan penyelenggaraan.
+DocType: SMS Settings,Enter url parameter for message,Masukkan parameter url untuk mesej
+apps/erpnext/erpnext/config/selling.py +148,Rules for applying pricing and discount.,Peraturan untuk menggunakan penentuan harga dan diskaun.
+apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +81,This Time Log conflicts with {0} for {1} {2},Masa ini konflik Log dengan {0} untuk {1} {2}
+apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,Senarai Harga mesti pakai untuk Membeli atau Menjual
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +81,Installation date cannot be before delivery date for Item {0},Tarikh pemasangan tidak boleh sebelum tarikh penghantaran untuk Perkara {0}
+DocType: Pricing Rule,Discount on Price List Rate (%),Diskaun Senarai Harga Kadar (%)
+apps/frappe/frappe/public/js/frappe/form/print.js +96,Start,Mula
+DocType: User,First Name,Nama Pertama
+DocType: Offer Letter,Select Terms and Conditions,Pilih Terma dan Syarat
+DocType: Production Planning Tool,Sales Orders,Jualan Pesanan
+DocType: Purchase Taxes and Charges,Valuation,Penilaian
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +17,Set as Default,Tetapkan sebagai lalai
+,Purchase Order Trends,Membeli Trend Pesanan
+apps/erpnext/erpnext/config/hr.py +78,Allocate leaves for the year.,Memperuntukkan daun bagi tahun ini.
+DocType: Earning Type,Earning Type,Jenis pendapatan
+DocType: Manufacturing Settings,Disable Capacity Planning and Time Tracking,Perancangan Kapasiti melumpuhkan dan Penjejakan Masa
+DocType: Bank Reconciliation,Bank Account,Akaun Bank
+DocType: Leave Type,Allow Negative Balance,Benarkan Baki negatif
+DocType: Selling Settings,Default Territory,Wilayah Default
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,Televisyen
+DocType: Production Order Operation,Updated via 'Time Log',Dikemaskini melalui &#39;Time Log&#39;
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +82,Account {0} does not belong to Company {1},Akaun {0} bukan milik Syarikat {1}
+DocType: Naming Series,Series List for this Transaction,Senarai Siri bagi Urusniaga ini
+DocType: Sales Invoice,Is Opening Entry,Apakah Membuka Entry
+DocType: Customer Group,Mention if non-standard receivable account applicable,Sebut jika akaun belum terima tidak standard yang diguna pakai
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +154,For Warehouse is required before Submit,Untuk Gudang diperlukan sebelum Hantar
+DocType: Sales Partner,Reseller,Penjual Semula
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +41,Please enter Company,Sila masukkan Syarikat
+DocType: Delivery Note Item,Against Sales Invoice Item,Terhadap Jualan Invois Perkara
+,Production Orders in Progress,Pesanan Pengeluaran di Kemajuan
+DocType: Lead,Address & Contact,Alamat
+DocType: Leave Allocation,Add unused leaves from previous allocations,Tambahkan daun yang tidak digunakan dari peruntukan sebelum
+apps/erpnext/erpnext/controllers/recurring_document.py +206,Next Recurring {0} will be created on {1},Seterusnya berulang {0} akan diwujudkan pada {1}
+DocType: Newsletter List,Total Subscribers,Jumlah Pelanggan
+,Contact Name,Nama Kenalan
+DocType: Production Plan Item,SO Pending Qty,SO selesai Qty
+DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Mencipta slip gaji untuk kriteria yang dinyatakan di atas.
+apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,Meminta untuk pembelian.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +171,Only the selected Leave Approver can submit this Leave Application,Hanya Pelulus Cuti yang dipilih boleh mengemukakan Permohonan Cuti ini
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,Tarikh melegakan mesti lebih besar daripada Tarikh Menyertai
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +172,Leaves per Year,Meninggalkan setiap Tahun
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup > Settings > Naming Series,Sila tetapkan Penamaan Siri untuk {0} melalui Persediaan&gt; Tetapan&gt; Menamakan Siri
+DocType: Time Log,Will be updated when batched.,Akan dikemaskinikan apabila berkumpulan.
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +104,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,Row {0}: Sila semak &#39;Adakah Advance&#39; terhadap Akaun {1} jika ini adalah suatu catatan terlebih dahulu.
+apps/erpnext/erpnext/stock/utils.py +174,Warehouse {0} does not belong to company {1},Gudang {0} bukan milik syarikat {1}
+DocType: Bulk Email,Message,Mesej
+DocType: Item Website Specification,Item Website Specification,Spesifikasi Item Laman Web
+DocType: Dropbox Backup,Dropbox Access Key,Dropbox Akses Utama
+DocType: Payment Tool,Reference No,Rujukan
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +392,Leave Blocked,Tinggalkan Disekat
+apps/erpnext/erpnext/stock/doctype/item/item.py +539,Item {0} has reached its end of life on {1},Perkara {0} telah mencapai penghujungnya kehidupan di {1}
+apps/erpnext/erpnext/accounts/utils.py +339,Annual,Tahunan
+DocType: Stock Reconciliation Item,Stock Reconciliation Item,Saham Penyesuaian Perkara
+DocType: Stock Entry,Sales Invoice No,Jualan Invois No
+DocType: Material Request Item,Min Order Qty,Min Order Qty
+DocType: Lead,Do Not Contact,Jangan Hubungi
+DocType: Sales Invoice,The unique id for tracking all recurring invoices. It is generated on submit.,Id unik untuk mengesan semua invois berulang. Ia dihasilkan di hantar.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +93,Software Developer,Perisian Pemaju
+DocType: Item,Minimum Order Qty,Minimum Kuantiti Pesanan
+DocType: Pricing Rule,Supplier Type,Jenis Pembekal
+DocType: Item,Publish in Hub,Menyiarkan dalam Hab
+,Terretory,Terretory
+apps/erpnext/erpnext/stock/doctype/item/item.py +559,Item {0} is cancelled,Perkara {0} dibatalkan
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +607,Material Request,Permintaan bahan
+DocType: Bank Reconciliation,Update Clearance Date,Update Clearance Tarikh
+DocType: Item,Purchase Details,Butiran Pembelian
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +323,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},Perkara {0} tidak dijumpai dalam &#39;Bahan Mentah Dibekalkan&#39; meja dalam Pesanan Belian {1}
+DocType: Employee,Relation,Perhubungan
+DocType: Shipping Rule,Worldwide Shipping,Penghantaran di seluruh dunia
+apps/erpnext/erpnext/config/selling.py +23,Confirmed orders from Customers.,Pesanan disahkan dari Pelanggan.
+DocType: Purchase Receipt Item,Rejected Quantity,Ditolak Kuantiti
+DocType: Features Setup,"Field available in Delivery Note, Quotation, Sales Invoice, Sales Order","Bidang yang terdapat di Nota Penghantaran, Sebut Harga, Invois Jualan, Pesanan Jualan"
+DocType: SMS Settings,SMS Sender Name,SMS Sender Nama
+DocType: Contact,Is Primary Contact,Adalah Hubungi Rendah
+DocType: Notification Control,Notification Control,Kawalan Pemberitahuan
+DocType: Lead,Suggestions,Cadangan
+DocType: Territory,Set Item Group-wise budgets on this Territory. You can also include seasonality by setting the Distribution.,Perkara Set Kumpulan segi belanjawan di Wilayah ini. Juga boleh bermusim dengan menetapkan Pengedaran.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +72,Please enter parent account group for warehouse {0},Sila masukkan kumpulan akaun induk untuk gudang {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +242,Payment against {0} {1} cannot be greater than Outstanding Amount {2},Bayaran terhadap {0} {1} tidak boleh lebih besar daripada Outstanding Jumlah {2}
+DocType: Supplier,Address HTML,Alamat HTML
+DocType: Lead,Mobile No.,No. Telefon
+DocType: Maintenance Schedule,Generate Schedule,Menjana Jadual
+DocType: Purchase Invoice Item,Expense Head,Perbelanjaan Ketua
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +86,Please select Charge Type first,Sila pilih Jenis Caj pertama
+apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,Terkini
+apps/erpnext/erpnext/public/js/setup_wizard.js +143,Max 5 characters,Max 5 aksara
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +245,Select Your Language,Pilih Bahasa Anda
+DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,Yang pertama Pelulus Cuti dalam senarai akan ditetapkan sebagai lalai Cuti Pelulus yang
+DocType: Manufacturing Settings,"Disables creation of time logs against Production Orders.
+Operations shall not be tracked against Production Order",Melumpuhkan penciptaan balak masa terhadap Perintah Pengeluaran. Operasi tidak boleh dikesan terhadap Perintah Pengeluaran
+DocType: Accounts Settings,Settings for Accounts,Tetapan untuk Akaun
+apps/erpnext/erpnext/config/crm.py +90,Manage Sales Person Tree.,Menguruskan Orang Jualan Tree.
+DocType: Item,Synced With Hub,Segerakkan Dengan Hub
+apps/erpnext/erpnext/setup/doctype/company/company.js +41,Wrong Password,Salah Kata Laluan
+DocType: Item,Variant Of,Varian Daripada
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +34,Item {0} must be Service Item,Perkara {0} mesti Perkhidmatan Perkara
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +303,Completed Qty can not be greater than 'Qty to Manufacture',Siap Qty tidak boleh lebih besar daripada &#39;Kuantiti untuk Pengeluaran&#39;
+DocType: DocType,Administrator,Pentadbir
+DocType: Period Closing Voucher,Closing Account Head,Penutup Kepala Akaun
+DocType: Employee,External Work History,Luar Sejarah Kerja
+apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,Ralat Rujukan Pekeliling
+DocType: Communication,Closed,Ditutup
+DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,Dalam Perkataan (Eksport) akan dapat dilihat selepas anda menyimpan Nota Penghantaran.
+DocType: Lead,Industry,Industri
+DocType: Employee,Job Profile,Profil kerja
+DocType: Newsletter,Newsletter,Surat Berita
+DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Memberitahu melalui e-mel pada penciptaan Permintaan Bahan automatik
+DocType: Journal Entry,Multi Currency,Mata Multi
+DocType: Async Task,System Manager,Pengurus Sistem
+DocType: Payment Reconciliation Invoice,Invoice Type,Jenis invois
+DocType: Sales Invoice Item,Delivery Note,Penghantaran Nota
+DocType: Dropbox Backup,Allow Dropbox Access,Membenarkan akses Dropbox
+apps/erpnext/erpnext/config/learn.py +72,Setting up Taxes,Menubuhkan Cukai
+apps/erpnext/erpnext/accounts/utils.py +189,Payment Entry has been modified after you pulled it. Please pull it again.,Entry pembayaran telah diubah suai selepas anda ditarik. Sila tarik lagi.
+apps/erpnext/erpnext/stock/doctype/item/item.py +347,{0} entered twice in Item Tax,{0} dimasukkan dua kali dalam Cukai Perkara
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +105,Summary for this week and pending activities,Ringkasan untuk minggu ini dan aktiviti-aktiviti yang belum selesai
+DocType: Workstation,Rent Cost,Kos sewa
+apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +74,Please select month and year,Sila pilih bulan dan tahun
+DocType: Purchase Invoice,"Enter email id separated by commas, invoice will be mailed automatically on particular date","Masukkan id e-mel yang dipisahkan oleh koma, invois akan dihantar secara automatik pada tarikh tertentu"
+DocType: Employee,Company Email,Syarikat E-mel
+DocType: GL Entry,Debit Amount in Account Currency,Jumlah debit dalam Mata Wang Akaun
+DocType: Shipping Rule,Valid for Countries,Sah untuk Negara
+DocType: Workflow State,Refresh,Muat semula
+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.","Semua bidang yang berkaitan import seperti mata wang, kadar penukaran, jumlah import, import dan lain-lain jumlah besar boleh didapati dalam Resit Pembelian, Sebutharga Pembekal, Invois Belian, Pesanan Belian dan lain-lain"
+apps/erpnext/erpnext/stock/doctype/item/item.js +33,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,Perkara ini adalah Template dan tidak boleh digunakan dalam urus niaga. Sifat-sifat perkara akan disalin ke atas ke dalam varian kecuali &#39;Tiada Salinan&#39; ditetapkan
+apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +69,Total Order Considered,Jumlah Pesanan Dianggap
+apps/erpnext/erpnext/config/hr.py +110,"Employee designation (e.g. CEO, Director etc.).","Jawatan Pekerja (contohnya Ketua Pegawai Eksekutif, Pengarah dan lain-lain)."
+apps/erpnext/erpnext/controllers/recurring_document.py +199,Please enter 'Repeat on Day of Month' field value,Sila masukkan &#39;Ulangi pada hari Bulan&#39; nilai bidang
+DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,Kadar di mana mata wang Pelanggan ditukar kepada mata wang asas pelanggan
+DocType: Features Setup,"Available in BOM, Delivery Note, Purchase Invoice, Production Order, Purchase Order, Purchase Receipt, Sales Invoice, Sales Order, Stock Entry, Timesheet","Terdapat dalam BOM, Menghantar Nota, Invois Belian, Pesanan Pengeluaran, Pesanan Belian, Resit Pembelian, Jualan Invois, Jualan Order, Saham Masuk, Timesheet"
+DocType: Item Tax,Tax Rate,Kadar Cukai
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +540,Select Item,Pilih Item
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +143,"Item: {0} managed batch-wise, can not be reconciled using \
+					Stock Reconciliation, instead use Stock Entry","Perkara: {0} berjaya kelompok-bijak, tidak boleh berdamai dengan menggunakan \ Saham Perdamaian, sebaliknya menggunakan Saham Entry"
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +262,Purchase Invoice {0} is already submitted,Membeli Invois {0} telah dikemukakan
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Batch No must be same as {1} {2},Row # {0}: Batch No mestilah sama dengan {1} {2}
+apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Convert to non-Group,Tukar ke Kumpulan bukan-
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +55,Purchase Receipt must be submitted,Resit Pembelian perlu dihantar
+apps/erpnext/erpnext/config/stock.py +53,Batch (lot) of an Item.,Batch (banyak) dari Perkara yang.
+DocType: C-Form Invoice Detail,Invoice Date,Tarikh invois
+DocType: GL Entry,Debit Amount,Jumlah Debit
+apps/erpnext/erpnext/accounts/party.py +223,There can only be 1 Account per Company in {0} {1},Hanya akan ada 1 Akaun setiap Syarikat dalam {0} {1}
+apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Your email address,Alamat e-mel anda
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +203,Please see attachment,Sila lihat lampiran
+DocType: Purchase Order,% Received,% Diterima
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +20,Setup Already Complete!!,Persediaan Sudah Lengkap !!
+,Finished Goods,Barangan selesai
+DocType: Delivery Note,Instructions,Arahan
+DocType: Quality Inspection,Inspected By,Diperiksa oleh
+DocType: Maintenance Visit,Maintenance Type,Jenis Penyelenggaraan
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +61,Serial No {0} does not belong to Delivery Note {1},No siri {0} bukan milik Penghantaran Nota {1}
+DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,Perkara Kualiti Pemeriksaan Parameter
+DocType: Leave Application,Leave Approver Name,Tinggalkan nama Pelulus
+,Schedule Date,Jadual Tarikh
+DocType: Packed Item,Packed Item,Makan Perkara
+apps/erpnext/erpnext/config/buying.py +54,Default settings for buying transactions.,Tetapan lalai untuk membeli transaksi.
+apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +29,Activity Cost exists for Employee {0} against Activity Type - {1},Kos Aktiviti wujud untuk Pekerja {0} terhadap Jenis Kegiatan - {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.,Sila TIDAK mewujudkan Akaun untuk Pelanggan dan Pembekal. Ia diciptakan secara langsung daripada tuan Pelanggan / Pembekal.
+DocType: Currency Exchange,Currency Exchange,Pertukaran mata wang
+DocType: Purchase Invoice Item,Item Name,Nama Item
+DocType: Authorization Rule,Approving User  (above authorized value),Meluluskan pengguna (di atas nilai yang diberi kuasa)
+apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Credit Balance,Baki kredit
+DocType: Employee,Widowed,Janda
+DocType: Production Planning Tool,"Items to be requested which are ""Out of Stock"" considering all warehouses based on projected qty and minimum order qty",Perkara untuk diminta iaitu &quot;Daripada Saham&quot; segala urusan gudang berdasarkan qty yang diunjurkan dan perintah qty minimum
+DocType: Workstation,Working Hours,Waktu Bekerja
+DocType: Naming Series,Change the starting / current sequence number of an existing series.,Menukar nombor yang bermula / semasa urutan siri yang sedia ada.
+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.","Jika beberapa Peraturan Harga terus diguna pakai, pengguna diminta untuk menetapkan Keutamaan secara manual untuk menyelesaikan konflik."
+,Purchase Register,Pembelian Daftar
+DocType: Landed Cost Item,Applicable Charges,Caj yang dikenakan
+DocType: Workstation,Consumable Cost,Kos guna habis
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +167,{0} ({1}) must have role 'Leave Approver',{0} ({1}) mesti mempunyai peranan 'Pelulus Cuti'
+DocType: Purchase Receipt,Vehicle Date,Kenderaan Tarikh
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +39,Medical,Perubatan
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,Sebab bagi kehilangan
+apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},Workstation ditutup pada tarikh-tarikh berikut seperti Senarai Holiday: {0}
+DocType: Employee,Single,Single
+DocType: Issue,Attachment,Lampiran
+apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +29,Budget cannot be set for Group Cost Center,Bajet tidak boleh ditetapkan untuk PTJ Kumpulan
+DocType: Account,Cost of Goods Sold,Kos Barang Dijual
+DocType: Purchase Invoice,Yearly,Setiap tahun
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +223,Please enter Cost Center,Sila masukkan PTJ
+DocType: Journal Entry Account,Sales Order,Pesanan Jualan
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +63,Avg. Selling Rate,Purata. Menjual Kadar
+DocType: Purchase Order,Start date of current order's period,Tarikh tempoh perintah semasa memulakan
+apps/erpnext/erpnext/utilities/transaction_base.py +128,Quantity cannot be a fraction in row {0},Kuantiti tidak boleh menjadi sebahagian kecil berturut-turut {0}
+DocType: Purchase Invoice Item,Quantity and Rate,Kuantiti dan Kadar
+DocType: Delivery Note,% Installed,% Dipasang
+apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +59,Please enter company name first,Sila masukkan nama syarikat pertama
+DocType: BOM,Item Desription,Perkara Desription
+DocType: Purchase Invoice,Supplier Name,Nama Pembekal
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,Baca Manual ERPNext yang
+DocType: Account,Is Group,Adakah Kumpulan
+DocType: Stock Settings,Automatically Set Serial Nos based on FIFO,Set Siri Nos secara automatik berdasarkan FIFO
+DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,Semak Pembekal Invois Nombor Keunikan
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +57,'To Case No.' cannot be less than 'From Case No.','Kepada Perkara No. ' tidak boleh kurang daripada 'Dari Perkara No.'
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +104,Non Profit,Keuntungan tidak
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_list.js +7,Not Started,Belum Bermula
+DocType: Lead,Channel Partner,Rakan Channel
+DocType: Account,Old Parent,Old Ibu Bapa
+DocType: Notification Control,Customize the introductory text that goes as a part of that email. Each transaction has a separate introductory text.,Menyesuaikan teks pengenalan yang berlaku sebagai sebahagian daripada e-mel itu. Setiap transaksi mempunyai teks pengenalan yang berasingan.
+DocType: Sales Taxes and Charges Template,Sales Master Manager,Master Sales Manager
+apps/erpnext/erpnext/config/manufacturing.py +74,Global settings for all manufacturing processes.,Tetapan global untuk semua proses pembuatan.
+DocType: Accounts Settings,Accounts Frozen Upto,Akaun-akaun Dibekukan Sehingga
+DocType: SMS Log,Sent On,Dihantar Pada
+apps/erpnext/erpnext/stock/doctype/item/item.py +516,Attribute {0} selected multiple times in Attributes Table,Sifat {0} dipilih beberapa kali dalam Atribut Jadual
+DocType: Sales Order,Not Applicable,Tidak Berkenaan
+apps/erpnext/erpnext/config/hr.py +140,Holiday master.,Master bercuti.
+DocType: Material Request Item,Required Date,Tarikh Diperlukan
+DocType: Delivery Note,Billing Address,Alamat Bil
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +648,Please enter Item Code.,Sila masukkan Kod Item.
+DocType: BOM,Costing,Berharga
+DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount","Jika disemak, jumlah cukai yang akan dianggap sebagai sudah termasuk dalam Kadar Cetak / Print Amaun"
+apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,Jumlah Kuantiti
+DocType: Employee,Health Concerns,Kebimbangan Kesihatan
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +15,Unpaid,Belum dibayar
+DocType: Packing Slip,From Package No.,Dari Pakej No.
+DocType: Item Attribute,To Range,Untuk Julat
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Sekuriti dan Deposit
+DocType: Features Setup,Imports,Import
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +77,Total leaves allocated is mandatory,Jumlah daun diperuntukkan adalah wajib
+DocType: Job Opening,Description of a Job Opening,Keterangan yang Lowongan
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +102,Pending activities for today,Sementara menunggu aktiviti untuk hari ini
+apps/erpnext/erpnext/config/hr.py +28,Attendance record.,Rekod kehadiran.
+DocType: Bank Reconciliation,Journal Entries,Jurnal Penyertaan
+DocType: Sales Order Item,Used for Production Plan,Digunakan untuk Rancangan Pengeluaran
+DocType: System Settings,Loading...,Loading ...
+DocType: DocField,Password,Kata laluan
+DocType: Manufacturing Settings,Time Between Operations (in mins),Masa Antara Operasi (dalam minit)
+DocType: Customer,Buyer of Goods and Services.,Pembeli Barang dan Perkhidmatan.
+DocType: Journal Entry,Accounts Payable,Akaun-akaun Boleh diBayar
+apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +24,Add Subscribers,Tambah Pelanggan
+apps/erpnext/erpnext/public/js/feature_setup.js +220,""" does not exists",""" Tidak wujud"
+DocType: Pricing Rule,Valid Upto,Sah Upto
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,List a few of your customers. They could be organizations or individuals.,Senarai beberapa pelanggan anda. Mereka boleh menjadi organisasi atau individu.
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Direct Income,Pendapatan Langsung
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +33,"Can not filter based on Account, if grouped by Account","Tidak boleh menapis di Akaun, jika dikumpulkan oleh Akaun"
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Administrative Officer,Pegawai Tadbir
+DocType: Payment Tool,Received Or Paid,Diterima Atau Dibayar
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +318,Please select Company,Sila pilih Syarikat
+DocType: Stock Entry,Difference Account,Akaun perbezaan
+apps/erpnext/erpnext/projects/doctype/task/task.py +44,Cannot close task as its dependant task {0} is not closed.,Tidak boleh tugas sedekat tugas takluknya {0} tidak ditutup.
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +305,Please enter Warehouse for which Material Request will be raised,Sila masukkan Gudang yang mana Bahan Permintaan akan dibangkitkan
+DocType: Production Order,Additional Operating Cost,Tambahan Kos Operasi
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,Kosmetik
+DocType: DocField,Type,Jenis
+apps/erpnext/erpnext/stock/doctype/item/item.py +421,"To merge, following properties must be same for both items","Untuk bergabung, sifat berikut mestilah sama bagi kedua-dua perkara"
+DocType: Communication,Subject,Tertakluk
+DocType: Shipping Rule,Net Weight,Berat Bersih
+DocType: Employee,Emergency Phone,Telefon Kecemasan
+,Serial No Warranty Expiry,Serial Tiada Jaminan tamat
+DocType: Sales Order,To Deliver,Untuk Menyampaikan
+DocType: Purchase Invoice Item,Item,Perkara
+DocType: Journal Entry,Difference (Dr - Cr),Perbezaan (Dr - Cr)
+DocType: Account,Profit and Loss,Untung dan Rugi
+apps/erpnext/erpnext/config/stock.py +293,Managing Subcontracting,Urusan subkontrak
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Furniture and Fixture,Perabot dan Perlawanan
+DocType: Quotation,Rate at which Price list currency is converted to company's base currency,Kadar di mana Senarai harga mata wang ditukar kepada mata wang asas syarikat
+apps/erpnext/erpnext/setup/doctype/company/company.py +47,Account {0} does not belong to company: {1},Akaun {0} bukan milik syarikat: {1}
+DocType: Selling Settings,Default Customer Group,Default Pelanggan Kumpulan
+DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction","Jika kurang upaya, bidang &#39;Bulat Jumlah&#39; tidak akan dapat dilihat dalam mana-mana transaksi"
+DocType: BOM,Operating Cost,Kos operasi
+,Gross Profit,Keuntungan kasar
+apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +27,Increment cannot be 0,Kenaikan tidak boleh 0
+DocType: Production Planning Tool,Material Requirement,Keperluan Bahan
+DocType: Company,Delete Company Transactions,Padam Transaksi Syarikat
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +85,Item {0} is not Purchase Item,Perkara {0} tidak Membeli Item
+apps/erpnext/erpnext/controllers/recurring_document.py +188,"{0} is an invalid email address in 'Notification \
+					Email Address'",{0} adalah alamat e-mel yang tidak sah dalam &#39;Pemberitahuan \ Alamat E-mel&#39;
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +44,Total Billing This Year:,Jumlah Bil Tahun Ini:
+DocType: Purchase Receipt,Add / Edit Taxes and Charges,Tambah / Edit Cukai dan Caj
+DocType: Purchase Invoice,Supplier Invoice No,Pembekal Invois No
+DocType: Territory,For reference,Untuk rujukan
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +154,"Cannot delete Serial No {0}, as it is used in stock transactions","Tidak dapat memadam No Serial {0}, kerana ia digunakan dalam urus niaga saham"
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +227,Closing (Cr),Penutup (Cr)
+DocType: Serial No,Warranty Period (Days),Tempoh Waranti (Hari)
+DocType: Installation Note Item,Installation Note Item,Pemasangan Nota Perkara
+,Pending Qty,Menunggu Kuantiti
+DocType: Job Applicant,Thread HTML,Thread HTML
+DocType: Company,Ignore,Abaikan
+apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +86,SMS sent to following numbers: {0},SMS yang dihantar ke nombor berikut: {0}
+apps/erpnext/erpnext/controllers/buying_controller.py +126,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Pembekal Gudang mandatori bagi sub-kontrak Pembelian Resit
+DocType: Pricing Rule,Valid From,Sah Dari
+DocType: Sales Invoice,Total Commission,Jumlah Suruhanjaya
+DocType: Pricing Rule,Sales Partner,Rakan Jualan
+DocType: Buying Settings,Purchase Receipt Required,Resit pembelian Diperlukan
+DocType: Monthly Distribution,"**Monthly Distribution** helps you distribute your budget across months if you have seasonality in your business.
+
+To distribute a budget using this distribution, set this **Monthly Distribution** in the **Cost Center**","** Pengagihan Bulanan ** membantu anda mengagihkan bajet anda melangkaui bulan-bulan jika anda mempunyai musim dalam perniagaan anda. Untuk mengagihkan bajet yang menggunakan taburan ini, tetapkan **Pengagihan Bulanan** di **Pusat Kos** berkenaan"
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +130,No records found in the Invoice table,Tiada rekod yang terdapat dalam jadual Invois yang
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +20,Please select Company and Party Type first,Sila pilih Syarikat dan Parti Jenis pertama
+apps/erpnext/erpnext/config/accounts.py +84,Financial / accounting year.,Tahun kewangan / perakaunan.
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","Maaf, Serial No tidak boleh digabungkan"
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +581,Make Sales Order,Buat Jualan Pesanan
+DocType: Project Task,Project Task,Projek Petugas
+,Lead Id,Lead Id
+DocType: C-Form Invoice Detail,Grand Total,Jumlah Besar
+DocType: About Us Settings,Website Manager,Laman Web Pengurus
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +34,Fiscal Year Start Date should not be greater than Fiscal Year End Date,Tahun fiskal Tarikh Mula tidak seharusnya lebih besar daripada Tahun Anggaran Tarikh akhir
+DocType: Warranty Claim,Resolution,Resolusi
+apps/erpnext/erpnext/templates/pages/order.html +51,Delivered: {0},Dihantar: {0}
+apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +66,Payable Account,Akaun Belum Bayar
+DocType: Sales Order,Billing and Delivery Status,Bil dan Status Penghantaran
+apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Ulang Pelanggan
+DocType: Leave Control Panel,Allocate,Memperuntukkan
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard_page.html +16,Previous,Sebelumnya
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +620,Sales Return,Jualan Pulangan
+DocType: Production Planning Tool,Select Sales Orders from which you want to create Production Orders.,Pilih Pesanan Jualan yang anda ingin membuat Pesanan Pengeluaran.
+DocType: Item,Delivered by Supplier (Drop Ship),Dihantar oleh Pembekal (Drop Ship)
+apps/erpnext/erpnext/config/hr.py +120,Salary components.,Komponen gaji.
+apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,Pangkalan data pelanggan yang berpotensi.
+DocType: Authorization Rule,Customer or Item,Pelanggan atau Perkara
+apps/erpnext/erpnext/config/crm.py +17,Customer database.,Pangkalan data pelanggan.
+DocType: Quotation,Quotation To,Sebutharga Untuk
+DocType: Lead,Middle Income,Pendapatan Tengah
+apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),Pembukaan (Cr)
+apps/erpnext/erpnext/accounts/utils.py +193,Allocated amount can not be negative,Jumlah yang diperuntukkan tidak boleh negatif
+DocType: Purchase Order Item,Billed Amt,Billed AMT
+DocType: Warehouse,A logical Warehouse against which stock entries are made.,Satu Gudang maya di mana kemasukkan stok dibuat.
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +92,Reference No & Reference Date is required for {0},Rujukan &amp; Tarikh Rujukan diperlukan untuk {0}
+DocType: Event,Wednesday,Rabu
+DocType: Sales Invoice,Customer's Vendor,Penjual Pelanggan
+apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +214,Production Order is Mandatory,Pengeluaran Pesanan adalah Mandatori
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,Proposal Writing,Penulisan Cadangan
+apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,Satu lagi Orang Jualan {0} wujud dengan id Pekerja yang sama
+apps/erpnext/erpnext/stock/stock_ledger.py +336,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},Negatif Ralat Saham ({6}) untuk Perkara {0} dalam Gudang {1} pada {2} {3} dalam {4} {5}
+DocType: Fiscal Year Company,Fiscal Year Company,Tahun Anggaran Syarikat
+DocType: Packing Slip Item,DN Detail,Detail DN
+DocType: Time Log,Billed,Dibilkan
+DocType: Batch,Batch Description,Batch Penerangan
+DocType: Delivery Note,Time at which items were delivered from warehouse,Masa di mana barang-barang telah dihantar dari gudang
+DocType: Sales Invoice,Sales Taxes and Charges,Jualan Cukai dan Caj
+DocType: Employee,Organization Profile,Organisasi Profil
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +90,Please setup numbering series for Attendance via Setup > Numbering Series,Sila setup penomboran siri untuk Kehadiran melalui Persediaan&gt; Penomboran Siri
+DocType: Employee,Reason for Resignation,Sebab Peletakan jawatan
+apps/erpnext/erpnext/config/hr.py +150,Template for performance appraisals.,Template bagi tujuan penilaian prestasi.
+DocType: Payment Reconciliation,Invoice/Journal Entry Details,Invois / Journal Entry Details
+apps/erpnext/erpnext/accounts/utils.py +53,{0} '{1}' not in Fiscal Year {2},{0} '{1}' tidak dalam Tahun Kewangan {2}
+DocType: Buying Settings,Settings for Buying Module,Tetapan untuk Membeli Modul
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +62,Please enter Purchase Receipt first,Sila masukkan Resit Pembelian pertama
+DocType: Buying Settings,Supplier Naming By,Pembekal Menamakan Dengan
+DocType: Activity Type,Default Costing Rate,Kadar Kos lalai
+DocType: Maintenance Schedule,Maintenance Schedule,Jadual Penyelenggaraan
+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.","Peraturan Kemudian Harga ditapis keluar berdasarkan Pelanggan, Kumpulan Pelanggan, Wilayah, Pembekal, Jenis Pembekal, Kempen, Rakan Jualan dan lain-lain"
+apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.py +179,Please install dropbox python module,Sila pasang dropbox modul ular sawa
+DocType: Employee,Passport Number,Nombor Pasport
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Manager,Pengurus
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +494,From Purchase Receipt,Dari Resit Pembelian
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +219,Same item has been entered multiple times.,Perkara sama telah dibuat beberapa kali.
+DocType: SMS Settings,Receiver Parameter,Penerima Parameter
+apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,'Berdasarkan Kepada' dan 'Kumpul Mengikut' tidak boleh sama
+DocType: Sales Person,Sales Person Targets,Sasaran Orang Jualan
+apps/frappe/frappe/public/js/frappe/form/workflow.js +116,To,Untuk
+apps/frappe/frappe/templates/base.html +145,Please enter email address,Sila masukkan alamat e-mel
+DocType: Production Order Operation,In minutes,Dalam beberapa minit
+DocType: Issue,Resolution Date,Resolusi Tarikh
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +637,Please set default Cash or Bank account in Mode of Payment {0},Sila tetapkan lalai Tunai atau akaun Bank dalam Mod Bayaran {0}
+DocType: Selling Settings,Customer Naming By,Menamakan Dengan Pelanggan
+apps/erpnext/erpnext/accounts/doctype/account/account.js +67,Convert to Group,Tukar ke Kumpulan
+DocType: Activity Cost,Activity Type,Jenis Kegiatan
+apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +47,Delivered Amount,Jumlah dihantar
+DocType: Customer,Fixed Days,Hari Tetap
+DocType: Sales Invoice,Packing List,Senarai Pembungkusan
+apps/erpnext/erpnext/config/buying.py +28,Purchase Orders given to Suppliers.,Pesanan pembelian diberikan kepada Pembekal.
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +43,Publishing,Penerbitan
+DocType: Activity Cost,Projects User,Projek pengguna
+apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Consumed,Digunakan
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,{0}: {1} not found in Invoice Details table,{0}: {1} tidak terdapat dalam jadual Butiran Invois
+DocType: Company,Round Off Cost Center,Bundarkan PTJ
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +203,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Lawatan penyelenggaraan {0} hendaklah dibatalkan sebelum membatalkan Perintah Jualan ini
+DocType: Material Request,Material Transfer,Pemindahan bahan
+apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +56,Opening (Dr),Pembukaan (Dr)
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},Penempatan tanda waktu mesti selepas {0}
+apps/frappe/frappe/config/setup.py +59,Settings,Tetapan
+DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,Cukai Tanah Kos dan Caj
+DocType: Production Order Operation,Actual Start Time,Masa Mula Sebenar 
+DocType: BOM Operation,Operation Time,Masa Operasi
+apps/frappe/frappe/public/js/frappe/views/module/module_section.html +27,More,Lebih banyak
+DocType: Pricing Rule,Sales Manager,Pengurus Jualan
+apps/frappe/frappe/public/js/frappe/model/model.js +492,Rename,Nama semula
+DocType: Journal Entry,Write Off Amount,Tulis Off Jumlah
+apps/frappe/frappe/core/page/user_permissions/user_permissions.js +246,Allow User,Benarkan pengguna
+DocType: Journal Entry,Bill No,Rang Undang-Undang No
+DocType: Purchase Invoice,Quarterly,Suku Tahunan
+DocType: Selling Settings,Delivery Note Required,Penghantaran Nota Diperlukan
+DocType: Sales Order Item,Basic Rate (Company Currency),Kadar asas (Syarikat mata wang)
+DocType: Manufacturing Settings,Backflush Raw Materials Based On,Backflush Bahan Mentah Based On
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Please enter item details,Sila masukkan butiran item
+DocType: Purchase Receipt,Other Details,Butiran lain
+DocType: Account,Accounts,Akaun-akaun
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +67,Marketing,Pemasaran
+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.,Untuk mengesan item dalam jualan dan dokumen pembelian berdasarkan nos siri mereka. Ini juga boleh digunakan untuk mengesan butiran jaminan produk.
+DocType: Purchase Receipt Item Supplied,Current Stock,Saham Semasa
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +102,Rejected Warehouse is mandatory against regected item,Gudang ditolak adalah wajib terhadap item regected
+DocType: Account,Expenses Included In Valuation,Perbelanjaan Termasuk Dalam Penilaian
+DocType: Employee,Provide email id registered in company,Menyediakan id e-mel yang berdaftar dalam syarikat
+DocType: Hub Settings,Seller City,Penjual City
+DocType: Email Digest,Next email will be sent on:,E-mel seterusnya akan dihantar pada:
+DocType: Offer Letter Term,Offer Letter Term,Menawarkan Surat Jangka
+apps/erpnext/erpnext/stock/doctype/item/item.py +496,Item has variants.,Perkara mempunyai varian.
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Perkara {0} tidak dijumpai
+DocType: Bin,Stock Value,Nilai saham
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,Tree Jenis
+DocType: BOM Explosion Item,Qty Consumed Per Unit,Kuantiti Digunakan Seunit
+DocType: Serial No,Warranty Expiry Date,Waranti Tarikh Luput
+DocType: Material Request Item,Quantity and Warehouse,Kuantiti dan Gudang
+DocType: Sales Invoice,Commission Rate (%),Kadar komisen (%)
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +172,"Against Voucher Type must be one of Sales Order, Sales Invoice or Journal Entry","Terhadap Baucer Jenis mesti menjadi salah satu Perintah Jualan, Jualan Invois atau Journal Entry"
+apps/erpnext/erpnext/setup/utils.py +89,Unable to find exchange rate,Tidak dapat mencari kadar pertukaran
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +7,Aerospace,Aeroangkasa
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +40,Welcome,Selamat Datang
+DocType: Journal Entry,Credit Card Entry,Entry Kad Kredit
+apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +18,Task Subject,Petugas Subjek
+apps/erpnext/erpnext/config/stock.py +33,Goods received from Suppliers.,Barangan yang diterima daripada Pembekal.
+DocType: Communication,Open,Terbuka
+DocType: Lead,Campaign Name,Nama Kempen
+,Reserved,Cipta Terpelihara
+DocType: Purchase Order,Supply Raw Materials,Bekalan Bahan Mentah
+DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,Tarikh di mana invois akan dijana. Ia dihasilkan di hantar.
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,Aset Semasa
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +92,{0} is not a stock Item,{0} bukan perkara stok
+DocType: Mode of Payment Account,Default Account,Akaun Default
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +157,Lead must be set if Opportunity is made from Lead,Lead mesti ditetapkan jika Peluang diperbuat daripada Lead
+DocType: Contact Us Settings,Address Title,Alamat Tajuk
+apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +33,Please select weekly off day,Sila pilih hari cuti mingguan
+DocType: Production Order Operation,Planned End Time,Dirancang Akhir Masa
+,Sales Person Target Variance Item Group-Wise,Orang Jualan Sasaran Varian Perkara Kumpulan Bijaksana
+DocType: Dropbox Backup,Daily,Daily
+apps/erpnext/erpnext/accounts/doctype/account/account.py +105,Account with existing transaction cannot be converted to ledger,Akaun dengan urus niaga yang sedia ada tidak boleh ditukar ke lejar
+DocType: Delivery Note,Customer's Purchase Order No,Pelanggan Pesanan Pembelian No
+DocType: Employee,Cell Number,Bilangan sel
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Hilang
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +120,You can not enter current voucher in 'Against Journal Entry' column,Anda tidak boleh memasuki baucar semasa dalam &#39;Terhadap Journal Entry&#39; ruangan
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,Tenaga
+DocType: Opportunity,Opportunity From,Peluang Daripada
+apps/erpnext/erpnext/config/hr.py +33,Monthly salary statement.,Kenyataan gaji bulanan.
+DocType: Item Group,Website Specifications,Laman Web Spesifikasi
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +205,New Account,Akaun Baru
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +21,{0}: From {0} of type {1},{0}: Dari {0} dari jenis {1}
+apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,Row {0}: Faktor penukaran adalah wajib
+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.,Catatan perakaunan boleh dibuat terhadap nod daun. Catatan terhadap Kumpulan adalah tidak dibenarkan.
+DocType: ToDo,High,Tinggi
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +361,Cannot deactivate or cancel BOM as it is linked with other BOMs,Tidak boleh menyahaktifkan atau membatalkan BOM kerana ia dikaitkan dengan BOMs lain
+DocType: Opportunity,Maintenance,Penyelenggaraan
+DocType: User,Male,Lelaki
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +183,Purchase Receipt number required for Item {0},Nombor resit pembelian diperlukan untuk Perkara {0}
+DocType: Item Attribute Value,Item Attribute Value,Perkara Atribut Nilai
+apps/erpnext/erpnext/config/crm.py +64,Sales campaigns.,Kempen jualan.
+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
+
+The tax rate you define here will be the standard tax rate for all **Items**. If there are **Items** that have different rates, they must be added in the **Item Tax** table in the **Item** master.
+
+#### Description of Columns
+
+1. Calculation Type: 
+    - This can be on **Net Total** (that is the sum of basic amount).
+    - **On Previous Row Total / Amount** (for cumulative taxes or charges). If you select this option, the tax will be applied as a percentage of the previous row (in the tax table) amount or total.
+    - **Actual** (as mentioned).
+2. Account Head: The Account ledger under which this tax will be booked
+3. Cost Center: If the tax / charge is an income (like shipping) or expense it needs to be booked against a Cost Center.
+4. Description: Description of the tax (that will be printed in invoices / quotes).
+5. Rate: Tax rate.
+6. Amount: Tax amount.
+7. Total: Cumulative total to this point.
+8. Enter Row: If based on ""Previous Row Total"" you can select the row number which will be taken as a base for this calculation (default is the previous row).
+9. Is this Tax included in Basic Rate?: If you check this, it means that this tax will not be shown below the item table, but will be included in the Basic Rate in your main item table. This is useful where you want give a flat price (inclusive of all taxes) price to customers.","Template cukai standard yang boleh diguna pakai untuk semua Transaksi Jualan. Templat ini boleh mengandungi senarai kepala cukai dan juga lain kepala perbelanjaan / pendapatan seperti &quot;Penghantaran&quot;, &quot;Insurans&quot;, &quot;Pengendalian&quot; dan lain-lain #### Nota Kadar cukai anda tentukan di sini akan menjadi kadar cukai standard untuk semua ** Item **. Jika terdapat Item ** ** yang mempunyai kadar yang berbeza, mereka perlu ditambah dalam ** Item Cukai ** meja dalam ** ** Item induk. #### Keterangan Kolum 1. Pengiraan Jenis: - Ini boleh menjadi pada ** ** Jumlah bersih (iaitu jumlah jumlah asas). - ** Pada Row Sebelumnya Jumlah / Jumlah ** (untuk cukai atau caj terkumpul). Jika anda memilih pilihan ini, cukai yang akan digunakan sebagai peratusan daripada baris sebelumnya (dalam jadual cukai) amaun atau jumlah. - ** ** Sebenar (seperti yang dinyatakan). 2. Ketua Akaun: The lejar Akaun di mana cukai ini akan ditempah 3. Kos Center: Jika cukai / caj adalah pendapatan (seperti penghantaran) atau perbelanjaan perlu ditempah terhadap PTJ. 4. Keterangan: Keterangan cukai (yang akan dicetak dalam invois / sebut harga). 5. Kadar: Kadar Cukai. 6. Jumlah: Jumlah Cukai. 7. Jumlah: Jumlah terkumpul sehingga hal ini. 8. Masukkan Row: Jika berdasarkan &quot;Row Sebelumnya Jumlah&quot; anda boleh pilih nombor barisan yang akan diambil sebagai asas untuk pengiraan ini (default adalah berturut-turut sebelumnya). 9. Cukai ini termasuk dalam Kadar Asas ?: Jika anda mendaftar ini, ia bermakna bahawa cukai ini tidak akan ditunjukkan di bawah meja item, tetapi akan dimasukkan ke dalam Kadar Asas dalam jadual item utama anda. Ini berguna jika anda ingin memberikan harga yang rata (termasuk semua cukai) harga kepada pelanggan."
+DocType: Employee,Bank A/C No.,Bank A / C No.
+DocType: Expense Claim,Project,Projek
+DocType: Quality Inspection Reading,Reading 7,Membaca 7
+DocType: Address,Personal,Peribadi
+DocType: Expense Claim Detail,Expense Claim Type,Perbelanjaan Jenis Tuntutan
+DocType: Shopping Cart Settings,Default settings for Shopping Cart,Tetapan lalai untuk Troli Beli Belah
+apps/erpnext/erpnext/controllers/accounts_controller.py +325,"Journal Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Jurnal Entry {0} dikaitkan terhadap Perintah {1}, memeriksa jika ia harus ditarik sebagai pendahuluan dalam invois ini."
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +13,Biotechnology,Bioteknologi
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Office Maintenance Expenses,Perbelanjaan Penyelenggaraan
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +66,Please enter Item first,Sila masukkan Perkara pertama
+DocType: Account,Liability,Liabiliti
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +62,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Amaun yang dibenarkan tidak boleh lebih besar daripada Tuntutan Jumlah dalam Row {0}.
+DocType: Company,Default Cost of Goods Sold Account,Kos Default Akaun Barangan Dijual
+apps/erpnext/erpnext/stock/get_item_details.py +262,Price List not selected,Senarai Harga tidak dipilih
+DocType: Employee,Family Background,Latar Belakang Keluarga
+DocType: Process Payroll,Send Email,Hantar E-mel
+apps/erpnext/erpnext/stock/doctype/item/item.py +108,Warning: Invalid Attachment {0},Amaran: Lampiran sah {0}
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +88,No Permission,Tiada Kebenaran
+DocType: Company,Default Bank Account,Akaun Bank Default
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +47,"To filter based on Party, select Party Type first","Untuk menapis berdasarkan Parti, pilih Parti Taipkan pertama"
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},&#39;Update Stock&#39; tidak boleh disemak kerana perkara yang tidak dihantar melalui {0}
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Nos,Nos
+DocType: Item,Items with higher weightage will be shown higher,Item dengan wajaran yang lebih tinggi akan ditunjukkan tinggi
+DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Detail Penyesuaian Bank
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +629,My Invoices,Invois saya
+apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,Tiada pekerja didapati
+DocType: Purchase Order,Stopped,Berhenti
+DocType: Item,If subcontracted to a vendor,Jika subkontrak kepada vendor
+apps/erpnext/erpnext/manufacturing/page/bom_browser/bom_browser.js +17,Select BOM to start,Pilih BOM untuk memulakan
+DocType: SMS Center,All Customer Contact,Semua Hubungi Pelanggan
+apps/erpnext/erpnext/config/stock.py +64,Upload stock balance via csv.,Memuat naik keseimbangan saham melalui csv.
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,Hantar Sekarang
+,Support Analytics,Sokongan Analytics
+DocType: Item,Website Warehouse,Laman Web Gudang
+DocType: Sales Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","Hari dalam bulan di mana invois automatik akan dijana contohnya 05, 28 dan lain-lain"
+apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,Skor mesti kurang daripada atau sama dengan 5
+apps/erpnext/erpnext/config/accounts.py +169,C-Form records,C-Borang rekod
+apps/erpnext/erpnext/config/selling.py +294,Customer and Supplier,Pelanggan dan Pembekal
+DocType: Email Digest,Email Digest Settings,E-mel Tetapan Digest
+apps/erpnext/erpnext/config/support.py +13,Support queries from customers.,Pertanyaan sokongan daripada pelanggan.
+DocType: Features Setup,"To enable ""Point of Sale"" features",Untuk membolehkan &quot;Point of Sale&quot; ciri-ciri
+DocType: Bin,Moving Average Rate,Bergerak Kadar Purata
+DocType: Production Planning Tool,Select Items,Pilih Item
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +328,{0} against Bill {1} dated {2},{0} terhadap Bil {1} bertarikh {2}
+DocType: Comment,Reference Name,Nama Rujukan
+DocType: Maintenance Visit,Completion Status,Siap Status
+DocType: Sales Invoice Item,Target Warehouse,Sasaran Gudang
+DocType: Item,Allow over delivery or receipt upto this percent,Membolehkan lebih penghantaran atau penerimaan hamper peratus ini
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +49,Expected Delivery Date cannot be before Sales Order Date,Jangkaan Tarikh Penghantaran tidak boleh sebelum Jualan Pesanan Tarikh
+DocType: Upload Attendance,Import Attendance,Import Kehadiran
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +17,All Item Groups,Semua Kumpulan Perkara
+DocType: Process Payroll,Activity Log,Log Aktiviti 
+apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +30,Net Profit / Loss,Keuntungan bersih / Rugi
+apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,Mengarang mesej secara automatik pada penyerahan transaksi.
+DocType: Production Order,Item To Manufacture,Perkara Untuk Pembuatan
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} status adalah {2}
+apps/erpnext/erpnext/config/learn.py +172,Purchase Order to Payment,Membeli Perintah untuk Pembayaran
+DocType: Sales Order Item,Projected Qty,Unjuran Qty
+DocType: Sales Invoice,Payment Due Date,Tarikh Pembayaran
+DocType: Newsletter,Newsletter Manager,Newsletter Pengurus
+apps/erpnext/erpnext/stock/doctype/item/item.js +231,Item Variant {0} already exists with same attributes,Perkara Variant {0} telah wujud dengan sifat-sifat yang sama
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening',&#39;Pembukaan&#39;
+DocType: Notification Control,Delivery Note Message,Penghantaran Nota Mesej
+DocType: Expense Claim,Expenses,Perbelanjaan
+DocType: Item Variant Attribute,Item Variant Attribute,Perkara Variant Sifat
+,Purchase Receipt Trends,Trend Resit Pembelian
+DocType: Appraisal,Select template from which you want to get the Goals,Pilih template yang anda ingin mendapatkan Matlamat
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Research & Development,Penyelidikan &amp; Pembangunan
+,Amount to Bill,Jumlah untuk Rang Undang-undang
+DocType: Company,Registration Details,Butiran Pendaftaran
+DocType: Item,Re-Order Qty,Re-Order Qty
+DocType: Leave Block List Date,Leave Block List Date,Tinggalkan Sekat Senarai Tarikh
+apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +25,Scheduled to send to {0},Dijadual menghantar kepada {0}
+DocType: Pricing Rule,Price or Discount,Harga atau diskaun
+DocType: Sales Team,Incentives,Insentif
+DocType: SMS Log,Requested Numbers,Nombor diminta
+apps/erpnext/erpnext/config/hr.py +38,Performance appraisal.,Penilaian prestasi.
+DocType: Sales Invoice Item,Stock Details,Stok
+apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Nilai Projek
+apps/erpnext/erpnext/config/selling.py +304,Point-of-Sale,Tempat jualan
+apps/erpnext/erpnext/accounts/doctype/account/account.py +91,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","Baki akaun sudah dalam Kredit, anda tidak dibenarkan untuk menetapkan 'Baki Mestilah' sebagai 'debit'"
+DocType: Account,Balance must be,Baki mestilah
+DocType: Hub Settings,Publish Pricing,Terbitkan Harga
+DocType: Notification Control,Expense Claim Rejected Message,Mesej perbelanjaan Tuntutan Ditolak
+,Available Qty,Terdapat Qty
+DocType: Purchase Taxes and Charges,On Previous Row Total,Pada Sebelumnya Row Jumlah
+DocType: Salary Slip,Working Days,Hari Bekerja
+DocType: Serial No,Incoming Rate,Kadar masuk
+DocType: Packing Slip,Gross Weight,Berat kasar
+apps/erpnext/erpnext/public/js/setup_wizard.js +158,The name of your company for which you are setting up this system.,Nama syarikat anda yang mana anda menubuhkan sistem ini.
+DocType: HR Settings,Include holidays in Total no. of Working Days,Termasuk bercuti di Jumlah no. Hari Kerja
+DocType: Job Applicant,Hold,Pegang
+DocType: Employee,Date of Joining,Tarikh Menyertai
+DocType: Naming Series,Update Series,Update Siri
+DocType: Supplier Quotation,Is Subcontracted,Apakah Subkontrak
+DocType: Item Attribute,Item Attribute Values,Nilai Perkara Sifat
+apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +3,View Subscribers,Lihat Pelanggan
+DocType: Purchase Invoice Item,Purchase Receipt,Resit Pembelian
+,Received Items To Be Billed,Barangan yang diterima dikenakan caj
+DocType: Employee,Ms,Ms
+apps/erpnext/erpnext/config/accounts.py +148,Currency exchange rate master.,Mata Wang Kadar pertukaran utama.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +253,Unable to find Time Slot in the next {0} days for Operation {1},Tidak dapat mencari Slot Masa di akhirat {0} hari untuk Operasi {1}
+DocType: Production Order,Plan material for sub-assemblies,Bahan rancangan untuk sub-pemasangan
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +426,BOM {0} must be active,BOM {0} mesti aktif
+apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +26,Please select the document type first,Sila pilih jenis dokumen pertama
+apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,Batal Bahan Lawatan {0} sebelum membatalkan Lawatan Penyelenggaraan ini
+DocType: Salary Slip,Leave Encashment Amount,Tinggalkan Penunaian Jumlah
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +209,Serial No {0} does not belong to Item {1},No siri {0} bukan milik Perkara {1}
+DocType: Purchase Receipt Item Supplied,Required Qty,Diperlukan Qty
+DocType: Bank Reconciliation,Total Amount,Jumlah
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,Penerbitan Internet
+DocType: Production Planning Tool,Production Orders,Pesanan Pengeluaran
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +35,Balance Value,Nilai Baki
+apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,Senarai Harga Jualan
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +69,Publish to sync items,Publish untuk menyegerakkan item
+DocType: GL Entry,Account Currency,Mata Wang Akaun
+apps/erpnext/erpnext/accounts/general_ledger.py +131,Please mention Round Off Account in Company,Sila menyebut Akaun Off Pusingan dalam Syarikat
+DocType: Purchase Receipt,Range,Pelbagai
+DocType: Supplier,Default Payable Accounts,Default Akaun Belum Bayar
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,Pekerja {0} tidak aktif atau tidak wujud
+DocType: Features Setup,Item Barcode,Item Barcode
+apps/erpnext/erpnext/stock/doctype/item/item.py +491,Item Variants {0} updated,Perkara Kelainan {0} dikemaskini
+DocType: Quality Inspection Reading,Reading 6,Membaca 6
+DocType: Purchase Invoice Advance,Purchase Invoice Advance,Membeli Advance Invois
+DocType: Address,Shop,Kedai
+DocType: Hub Settings,Sync Now,Sync Sekarang
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +167,Row {0}: Credit entry can not be linked with a {1},Row {0}: kemasukan Kredit tidak boleh dikaitkan dengan {1}
+DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,Lalai akaun Bank / Tunai akan secara automatik dikemaskini dalam POS Invois apabila mod ini dipilih.
+DocType: Employee,Permanent Address Is,Alamat Tetap Adakah
+DocType: Production Order Operation,Operation completed for how many finished goods?,Operasi siap untuk berapa banyak barangan siap?
+apps/erpnext/erpnext/public/js/setup_wizard.js +237,The Brand,Jenama
+apps/erpnext/erpnext/controllers/status_updater.py +163,Allowance for over-{0} crossed for Item {1}.,Peruntukan berlebihan {0} terlintas untuk Perkara {1}.
+DocType: Employee,Exit Interview Details,Butiran Keluar Temuduga
+DocType: Item,Is Purchase Item,Adalah Pembelian Item
+DocType: Journal Entry Account,Purchase Invoice,Invois Belian
+DocType: Stock Ledger Entry,Voucher Detail No,Detail baucar Tiada
+DocType: Stock Entry,Total Outgoing Value,Jumlah Nilai Keluar
+apps/erpnext/erpnext/public/js/account_tree_grid.js +225,Opening Date and Closing Date should be within same Fiscal Year,Tarikh dan Tarikh Tutup merasmikan perlu berada dalam sama Tahun Anggaran
+DocType: Lead,Request for Information,Permintaan Maklumat
+DocType: Payment Tool,Paid,Dibayar
+DocType: Salary Slip,Total in words,Jumlah dalam perkataan
+DocType: Material Request Item,Lead Time Date,Lead Tarikh Masa
+apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +54, is mandatory. Maybe Currency Exchange record is not created for ,adalah wajib. Mungkin rekod pertukaran mata wang tidak dicipta untuk
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +111,Row #{0}: Please specify Serial No for Item {1},Row # {0}: Sila nyatakan Serial No untuk Perkara {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +538,"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.","Untuk item &#39;Bundle Produk&#39;, Gudang, No Serial dan batch Tidak akan dipertimbangkan dari &#39;Packing List&#39; meja. Jika Gudang dan Batch No adalah sama untuk semua barangan pembungkusan untuk item apa-apa &#39;Bundle Produk&#39;, nilai-nilai boleh dimasukkan dalam jadual Perkara utama, nilai akan disalin ke &#39;Packing List&#39; meja."
+apps/erpnext/erpnext/config/stock.py +28,Shipments to customers.,Penghantaran kepada pelanggan.
+DocType: Purchase Invoice Item,Purchase Order Item,Pesanan Pembelian Item
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Indirect Income,Pendapatan tidak langsung
+DocType: Payment Tool,Set Payment Amount = Outstanding Amount,Jumlah Pembayaran Set = Jumlah Cemerlang
+DocType: Contact Us Settings,Address Line 1,Alamat Baris 1
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +53,Variance,Varian
+,Company Name,Nama Syarikat
+DocType: SMS Center,Total Message(s),Jumlah Mesej (s)
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +538,Select Item for Transfer,Pilih Item Pemindahan
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,Lihat senarai semua video bantuan
+DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,Pilih kepala akaun bank di mana cek didepositkan.
+DocType: Selling Settings,Allow user to edit Price List Rate in transactions,Membolehkan pengguna untuk mengedit Senarai Harga Kadar dalam urus niaga
+DocType: Pricing Rule,Max Qty,Max Qty
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +106,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Row {0}: Pembayaran terhadap Jualan / Pesanan Belian perlu sentiasa ditandakan sebagai pendahuluan
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,Kimia
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +693,All items have already been transferred for this Production Order.,Semua barang-barang telah dipindahkan bagi Perintah Pengeluaran ini.
+DocType: Process Payroll,Select Payroll Year and Month,Pilih Tahun Gaji dan Bulan
+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""",Pergi ke kumpulan yang sesuai (biasanya Permohonan Dana&gt; Aset Semasa&gt; Akaun Bank dan membuat Akaun baru (dengan klik pada Tambah Kanak-kanak) jenis &quot;Bank&quot;
+DocType: Workstation,Electricity Cost,Kos Elektrik
+DocType: HR Settings,Don't send Employee Birthday Reminders,Jangan hantar Pekerja Hari Lahir Peringatan
+DocType: Comment,Unsubscribed,Dilanggan
+DocType: Opportunity,Walk In,Berjalan Dalam
+DocType: Item,Inspection Criteria,Kriteria Pemeriksaan
+apps/erpnext/erpnext/config/accounts.py +101,Tree of finanial Cost Centers.,Pohon Pusat Kos finanial.
+apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,Dipindahkan
+apps/erpnext/erpnext/public/js/setup_wizard.js +238,Upload your letter head and logo. (you can edit them later).,Memuat naik kepala surat dan logo. (Anda boleh mengeditnya kemudian).
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,White,White
+DocType: SMS Center,All Lead (Open),Semua Lead (Terbuka)
+DocType: Purchase Invoice,Get Advances Paid,Mendapatkan Pendahuluan Dibayar
+apps/erpnext/erpnext/public/js/setup_wizard.js +112,Attach Your Picture,Sertakan Gambar Anda
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +540,Make ,Buat
+DocType: Journal Entry,Total Amount in Words,Jumlah Amaun dalam Perkataan
+DocType: Workflow State,Stop,Hentikan
+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.,Terdapat ralat. Yang berkemungkinan boleh bahawa anda belum menyimpan borang. Sila hubungi support@erpnext.com jika masalah berterusan.
+apps/erpnext/erpnext/templates/pages/cart.html +3,My Cart,Keranjang saya
+apps/erpnext/erpnext/controllers/selling_controller.py +150,Order Type must be one of {0},Perintah Jenis mestilah salah seorang daripada {0}
+DocType: Lead,Next Contact Date,Hubungi Seterusnya Tarikh
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,Membuka Qty
+DocType: Holiday List,Holiday List Name,Nama Senarai Holiday
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +168,Stock Options,Pilihan Saham
+DocType: Journal Entry Account,Expense Claim,Perbelanjaan Tuntutan
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +181,Qty for {0},Qty untuk {0}
+DocType: Leave Application,Leave Application,Cuti Permohonan
+apps/erpnext/erpnext/config/hr.py +77,Leave Allocation Tool,Tinggalkan Alat Peruntukan
+DocType: Leave Block List,Leave Block List Dates,Tinggalkan Tarikh Sekat Senarai
+DocType: Company,If Monthly Budget Exceeded (for expense account),Jika Anggaran Bulanan Melebihi (untuk akaun perbelanjaan)
+DocType: Workstation,Net Hour Rate,Kadar Hour bersih
+DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,Kos mendarat Pembelian Resit
+DocType: Company,Default Terms,Terma Default
+DocType: Packing Slip Item,Packing Slip Item,Pembungkusan Slip Perkara
+DocType: POS Profile,Cash/Bank Account,Akaun Tunai / Bank
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,Removed items with no change in quantity or value.,Barangan dikeluarkan dengan tiada perubahan dalam kuantiti atau nilai.
+DocType: Delivery Note,Delivery To,Penghantaran Untuk
+apps/erpnext/erpnext/stock/doctype/item/item.py +513,Attribute table is mandatory,Jadual atribut adalah wajib
+DocType: Production Planning Tool,Get Sales Orders,Dapatkan Perintah Jualan
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} tidak boleh negatif
+apps/erpnext/erpnext/templates/form_grid/item_grid.html +72,Discount,Diskaun
+DocType: Features Setup,Purchase Discounts,Diskaun Pembelian
+DocType: Workstation,Wages,Upah
+DocType: Time Log,Will be updated only if Time Log is 'Billable',Akan dikemas kini hanya jika Time Log adalah &#39;dapat ditaksir&#39;
+DocType: Project,Internal,Dalam Negeri
+DocType: Task,Urgent,Segera
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +97,Please specify a valid Row ID for row {0} in table {1},Sila nyatakan ID Row sah untuk barisan {0} dalam jadual {1}
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +23,Go to the Desktop and start using ERPNext,Pergi ke Desktop dan mula menggunakan ERPNext
+DocType: Item,Manufacturer,Pengeluar
+DocType: Landed Cost Item,Purchase Receipt Item,Pembelian Penerimaan Perkara
+DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,Gudang Terpelihara dalam Sales Order / Selesai Barang Gudang
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +65,Selling Amount,Jumlah Jualan
+apps/erpnext/erpnext/projects/doctype/project/project.js +40,Time Logs,Time Logs
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +112,You are the Expense Approver for this record. Please Update the 'Status' and Save,Anda Pelulus Perbelanjaan untuk rekod ini. Sila Kemas kini &#39;Status&#39; dan Jimat
+DocType: Serial No,Creation Document No,Penciptaan Dokumen No
+DocType: Issue,Issue,Isu
+apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account does not match with Company,Akaun tidak sepadan dengan Syarikat
+apps/erpnext/erpnext/config/stock.py +136,"Attributes for Item Variants. e.g Size, Color etc.","Sifat-sifat bagi Perkara Kelainan. contohnya Saiz, Warna dan lain-lain"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +39,WIP Warehouse,WIP Gudang
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +194,Serial No {0} is under maintenance contract upto {1},No siri {0} adalah di bawah kontrak penyelenggaraan hamper {1}
+DocType: BOM Operation,Operation,Operasi
+DocType: Lead,Organization Name,Nama Pertubuhan
+DocType: Tax Rule,Shipping State,Negeri Penghantaran
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,Item mesti ditambah menggunakan &#39;Dapatkan Item daripada Pembelian Resit&#39; butang
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,Perbelanjaan jualan
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +120,Standard Buying,Membeli Standard
+DocType: GL Entry,Against,Terhadap
+DocType: Item,Default Selling Cost Center,Default Jualan Kos Pusat
+DocType: Sales Partner,Implementation Partner,Rakan Pelaksanaan
+apps/erpnext/erpnext/controllers/selling_controller.py +227,Sales Order {0} is {1},Pesanan Jualan {0} ialah {1}
+DocType: Opportunity,Contact Info,Maklumat perhubungan
+apps/erpnext/erpnext/config/stock.py +278,Making Stock Entries,Membuat Penyertaan Saham
+DocType: Packing Slip,Net Weight UOM,Berat UOM bersih
+DocType: Item,Default Supplier,Pembekal Default
+DocType: Manufacturing Settings,Over Production Allowance Percentage,Lebih Pengeluaran Peratus Peruntukan
+DocType: Shipping Rule Condition,Shipping Rule Condition,Penghantaran Keadaan Peraturan
+DocType: Features Setup,Miscelleneous,Miscelleneous
+DocType: Holiday List,Get Weekly Off Dates,Dapatkan Mingguan Off Tarikh
+apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +30,End Date can not be less than Start Date,Tarikh akhir tidak boleh kurang daripada Tarikh Mula
+DocType: Sales Person,Select company name first.,Pilih nama syarikat pertama.
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Dr,Dr
+apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,Sebut Harga yang diterima daripada Pembekal.
+apps/erpnext/erpnext/controllers/selling_controller.py +21,To {0} | {1} {2},Untuk {0} | {1} {2}
+DocType: Time Log Batch,updated via Time Logs,dikemaskini melalui Time Logs
+apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,Purata Umur
+DocType: Opportunity,Your sales person who will contact the customer in future,Orang jualan anda yang akan menghubungi pelanggan pada masa akan datang
+apps/erpnext/erpnext/public/js/setup_wizard.js +326,List a few of your suppliers. They could be organizations or individuals.,Senarai beberapa pembekal anda. Mereka boleh menjadi organisasi atau individu.
+DocType: Company,Default Currency,Mata wang lalai
+DocType: Contact,Enter designation of this Contact,Masukkan penetapan Hubungi ini
+DocType: Contact Us Settings,Address,Alamat
+DocType: Expense Claim,From Employee,Dari Pekerja
+apps/erpnext/erpnext/controllers/accounts_controller.py +339,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Amaran: Sistem tidak akan semak overbilling sejak jumlah untuk Perkara {0} dalam {1} adalah sifar
+DocType: Journal Entry,Make Difference Entry,Membawa Perubahan Entry
+DocType: Upload Attendance,Attendance From Date,Kehadiran Dari Tarikh
+DocType: Appraisal Template Goal,Key Performance Area,Kawasan Prestasi Utama
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +54,Transportation,Pengangkutan
+apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +67, and year: ,dan tahun:
+DocType: Email Digest,Annual Expense,Perbelanjaan Tahunan
+DocType: SMS Center,Total Characters,Jumlah Watak
+apps/erpnext/erpnext/controllers/buying_controller.py +130,Please select BOM in BOM field for Item {0},Sila pilih BOM dalam bidang BOM untuk Perkara {0}
+DocType: C-Form Invoice Detail,C-Form Invoice Detail,Detail C-Borang Invois
+DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,Bayaran Penyesuaian Invois
+apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +32,Contribution %,Sumbangan%
+DocType: Item,website page link,pautan halaman laman web
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +242,Let's prepare the system for first use.,Mari kita menyediakan sistem untuk penggunaan pertama.
+DocType: Company,Company registration numbers for your reference. Tax numbers etc.,Nombor pendaftaran syarikat untuk rujukan anda. Nombor cukai dan lain-lain
+DocType: Sales Partner,Distributor,Pengedar
+DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Membeli-belah Troli Penghantaran Peraturan
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +209,Production Order {0} must be cancelled before cancelling this Sales Order,Pengeluaran Pesanan {0} hendaklah dibatalkan sebelum membatalkan Perintah Jualan ini
+,Ordered Items To Be Billed,Item Diperintah dibilkan
+apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +24,From Range has to be less than To Range,Dari Range mempunyai kurang daripada Untuk Julat
+apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +21,Select Time Logs and Submit to create a new Sales Invoice.,Pilih Masa balak dan Hantar untuk mewujudkan Invois Jualan baru.
+DocType: Global Defaults,Global Defaults,Lalai Global
+DocType: Salary Slip,Deductions,Potongan
+DocType: Purchase Invoice,Start date of current invoice's period,Tarikh tempoh invois semasa memulakan
+apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +23,This Time Log Batch has been billed.,Ini batch Masa Log telah ditaksir.
+apps/erpnext/erpnext/crm/doctype/lead/lead.js +32,Create Opportunity,Cipta Peluang
+DocType: Salary Slip,Leave Without Pay,Tinggalkan Tanpa Gaji
+DocType: Supplier,Communications,Komunikasi
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +287,Capacity Planning Error,Kapasiti Ralat Perancangan
+,Trial Balance for Party,Baki percubaan untuk Parti
+DocType: Lead,Consultant,Perunding
+DocType: Salary Slip,Earnings,Pendapatan
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +357,Finished Item {0} must be entered for Manufacture type entry,Mendapat tempat Item {0} mesti dimasukkan untuk masuk jenis Pembuatan
+apps/erpnext/erpnext/config/learn.py +77,Opening Accounting Balance,Perakaunan membuka Baki
+DocType: Sales Invoice Advance,Sales Invoice Advance,Jualan Invois Advance
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +398,Nothing to request,Tiada apa-apa untuk meminta
+apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date','Tarikh Mula Sebenar' tidak boleh lebih besar daripada 'Tarikh Akhir Sebenar'
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +75,Management,Pengurusan
+apps/erpnext/erpnext/config/projects.py +33,Types of activities for Time Sheets,Jenis-jenis aktiviti untuk Lembaran Masa
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +51,Either debit or credit amount is required for {0},Jumlah debit atau kredit sama ada diperlukan untuk {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""","Ini akan dilampirkan Kod Item bagi varian. Sebagai contoh, jika anda adalah singkatan &quot;SM&quot;, dan kod item adalah &quot;T-SHIRT&quot;, kod item varian akan &quot;T-SHIRT-SM&quot;"
+DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,Gaji bersih (dengan perkataan) akan dapat dilihat selepas anda menyimpan Slip Gaji.
+apps/frappe/frappe/core/doctype/user/user_list.js +12,Active,Aktif
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +154,Blue,Blue
+DocType: Purchase Invoice,Is Return,Tempat kembalinya
+DocType: Price List Country,Price List Country,Senarai harga Negara
+apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +123,Further nodes can be only created under 'Group' type nodes,Nod lagi hanya boleh diwujudkan di bawah nod jenis &#39;Kumpulan
+DocType: Item,UOMs,UOMs
+apps/erpnext/erpnext/stock/utils.py +167,{0} valid serial nos for Item {1},{0} nombor siri sah untuk Perkara {1}
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +57,Item Code cannot be changed for Serial No.,Kod Item tidak boleh ditukar untuk No. Siri
+apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +22,POS Profile {0} already created for user: {1} and company {2},POS Profil {0} telah dicipta untuk pengguna: {1} dan syarikat {2}
+DocType: Purchase Order Item,UOM Conversion Factor,Faktor Penukaran UOM
+DocType: Stock Settings,Default Item Group,Default Perkara Kumpulan
+apps/erpnext/erpnext/config/buying.py +13,Supplier database.,Pangkalan data pembekal.
+DocType: Account,Balance Sheet,Kunci Kira-kira
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +561,Cost Center For Item with Item Code ',Pusat Kos Bagi Item Kod Item &#39;
+DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,Orang jualan anda akan mendapat peringatan pada tarikh ini untuk menghubungi pelanggan
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +210,"Further accounts can be made under Groups, but entries can be made against non-Groups","Akaun lanjut boleh dibuat di bawah Kumpulan, tetapi penyertaan boleh dibuat terhadap bukan Kumpulan"
+apps/erpnext/erpnext/config/hr.py +125,Tax and other salary deductions.,Cukai dan potongan gaji lain.
+DocType: Lead,Lead,Lead
+DocType: Email Digest,Payables,Pemiutang
+DocType: Account,Warehouse,Gudang
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +93,Row #{0}: Rejected Qty can not be entered in Purchase Return,Row # {0}: Ditolak Qty tidak boleh dimasukkan dalam Pembelian Pulangan
+,Purchase Order Items To Be Billed,Item Pesanan Belian dikenakan caj
+DocType: Purchase Invoice Item,Net Rate,Kadar bersih
+DocType: Purchase Invoice Item,Purchase Invoice Item,Membeli Invois Perkara
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +50,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,Saham Lejar Penyertaan dan GL Penyertaan diumumkan bagi Resit Pembelian dipilih
+apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +8,Item 1,Perkara 1
+DocType: Holiday,Holiday,Holiday
+DocType: Event,Saturday,Sabtu
+DocType: Leave Control Panel,Leave blank if considered for all branches,Tinggalkan kosong jika dipertimbangkan untuk semua cawangan
+,Daily Time Log Summary,Masa Log Ringkasan Harian
+DocType: DocField,Label,Label
+DocType: Payment Reconciliation,Unreconciled Payment Details,Butiran Pembayaran yang belum disatukan
+DocType: Global Defaults,Current Fiscal Year,Fiskal Tahun Semasa
+DocType: Global Defaults,Disable Rounded Total,Melumpuhkan Bulat Jumlah
+DocType: Lead,Call,Panggilan
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +386,'Entries' cannot be empty,&#39;Penyertaan&#39; tidak boleh kosong
+apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},Salinan barisan {0} dengan sama {1}
+,Trial Balance,Imbangan Duga
+apps/erpnext/erpnext/config/hr.py +205,Setting up Employees,Menubuhkan Pekerja
+apps/erpnext/erpnext/public/js/feature_setup.js +220,"Grid """,Grid &quot;
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +150,Please select prefix first,Sila pilih awalan pertama
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +138,Research,Penyelidikan
+DocType: Maintenance Visit Purpose,Work Done,Kerja Selesai
+apps/erpnext/erpnext/controllers/item_variant.py +25,Please specify at least one attribute in the Attributes table,Sila nyatakan sekurang-kurangnya satu atribut dalam jadual Atribut
+DocType: Contact,User ID,ID Pengguna
+DocType: Communication,Sent,Dihantar
+apps/erpnext/erpnext/accounts/doctype/account/account.js +57,View Ledger,Lihat Lejar
+DocType: File,Lft,LFT
+apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Terawal
+apps/erpnext/erpnext/stock/doctype/item/item.py +398,"An Item Group exists with same name, please change the item name or rename the item group","Satu Kumpulan Item wujud dengan nama yang sama, sila tukar nama item atau menamakan semula kumpulan item"
+DocType: Communication,Delivery Status,Status Penghantaran
+DocType: Production Order,Manufacture against Sales Order,Pengilangan terhadap Jualan Pesanan
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +455,Rest Of The World,Rest Of The World
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,The Perkara {0} tidak boleh mempunyai Batch
+,Budget Variance Report,Belanjawan Laporan Varian
+DocType: Salary Slip,Gross Pay,Gaji kasar
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +186,Dividends Paid,Dividen Dibayar
+apps/erpnext/erpnext/public/js/controllers/stock_controller.js +40,Accounting Ledger,Perakaunan Lejar
+DocType: Stock Reconciliation,Difference Amount,Perbezaan Amaun
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +192,Retained Earnings,Pendapatan tertahan
+DocType: BOM Item,Item Description,Perkara Penerangan
+DocType: Payment Tool,Payment Mode,Cara Pembayaran
+DocType: Purchase Invoice,Is Recurring,Adalah Berulang
+DocType: Purchase Order,Supplied Items,Item dibekalkan
+DocType: Production Order,Qty To Manufacture,Qty Untuk Pembuatan
+DocType: Buying Settings,Maintain same rate throughout purchase cycle,Mengekalkan kadar yang sama sepanjang kitaran pembelian
+DocType: Opportunity Item,Opportunity Item,Peluang Perkara
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +61,Temporary Opening,Pembukaan sementara
+,Employee Leave Balance,Pekerja Cuti Baki
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +128,Balance for Account {0} must always be {1},Baki untuk Akaun {0} mesti sentiasa {1}
+DocType: Address,Address Type,Alamat Jenis
+DocType: Purchase Receipt,Rejected Warehouse,Gudang Ditolak
+DocType: GL Entry,Against Voucher,Terhadap Baucar
+DocType: Item,Default Buying Cost Center,Default Membeli Kos Pusat
+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.","Untuk mendapatkan yang terbaik daripada ERPNext, kami menyarankan anda mengambil sedikit masa dan menonton video bantuan."
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +38,Item {0} must be Sales Item,Perkara {0} mesti Item Jualan
+apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +55, to ,kepada
+DocType: Item,Lead Time in days,Masa utama dalam hari
+,Accounts Payable Summary,Ringkasan Akaun Boleh Dibayar
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +193,Not authorized to edit frozen Account {0},Tiada kebenaran untuk mengedit Akaun beku {0}
+DocType: Journal Entry,Get Outstanding Invoices,Dapatkan Invois Cemerlang
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,Pesanan Jualan {0} tidak sah
+apps/erpnext/erpnext/setup/doctype/company/company.py +172,"Sorry, companies cannot be merged","Maaf, syarikat tidak boleh digabungkan"
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Small,Kecil
+DocType: Employee,Employee Number,Bilangan pekerja
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},Kes Tidak (s) telah digunakan. Cuba dari Case No {0}
+,Invoiced Amount (Exculsive Tax),Invois (Exculsive Cukai)
+apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,Perkara 2
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +59,Account head {0} created,Kepala Akaun {0} telah diadakan
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Green,Green
+DocType: Item,Auto re-order,Auto semula perintah
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +59,Total Achieved,Jumlah Pencapaian
+DocType: Employee,Place of Issue,Tempat Dikeluarkan
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Contract,Kontrak
+DocType: Report,Disabled,Orang kurang upaya
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +490,UOM coversion factor required for UOM: {0} in Item: {1},Faktor coversion UOM diperlukan untuk UOM: {0} dalam Perkara: {1}
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +83,Indirect Expenses,Perbelanjaan tidak langsung
+apps/erpnext/erpnext/controllers/selling_controller.py +163,Row {0}: Qty is mandatory,Row {0}: Qty adalah wajib
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,Pertanian
+apps/erpnext/erpnext/public/js/setup_wizard.js +347,Your Products or Services,Produk atau Perkhidmatan anda
+DocType: Mode of Payment,Mode of Payment,Cara Pembayaran
+apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,Ini adalah kumpulan item akar dan tidak boleh diedit.
+DocType: Journal Entry Account,Purchase Order,Pesanan Pembelian
+DocType: Warehouse,Warehouse Contact Info,Gudang info
+apps/frappe/frappe/public/js/frappe/form/save.js +78,Name is required,Nama diperlukan
+DocType: Purchase Invoice,Recurring Type,Jenis berulang
+DocType: Address,City/Town,Bandar / Pekan
+DocType: Email Digest,Annual Income,Pendapatan tahunan
+DocType: Serial No,Serial No Details,Serial No Butiran
+DocType: Purchase Invoice Item,Item Tax Rate,Perkara Kadar Cukai
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +113,"For {0}, only credit accounts can be linked against another debit entry","Untuk {0}, hanya akaun kredit boleh dikaitkan terhadap kemasukan debit lain"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +470,Delivery Note {0} is not submitted,Penghantaran Nota {0} tidak dikemukakan
+apps/erpnext/erpnext/stock/get_item_details.py +136,Item {0} must be a Sub-contracted Item,Perkara {0} mestilah Sub-kontrak Perkara
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,Peralatan Modal
+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.","Peraturan harga mula-mula dipilih berdasarkan &#39;Guna Mengenai&#39; bidang, yang boleh menjadi Perkara, Perkara Kumpulan atau Jenama."
+DocType: Hub Settings,Seller Website,Penjual Laman Web
+apps/erpnext/erpnext/controllers/selling_controller.py +143,Total allocated percentage for sales team should be 100,Jumlah peratusan yang diperuntukkan bagi pasukan jualan harus 100
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +111,Production Order status is {0},Status Perintah Pengeluaran adalah {0}
+DocType: Appraisal Goal,Goal,Matlamat
+DocType: Sales Invoice Item,Edit Description,Edit Penerangan
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +318,Expected Delivery Date is lesser than Planned Start Date.,Jangkaan Tarikh penghantaran adalah lebih rendah daripada yang dirancang Tarikh Mula.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +602,For Supplier,Untuk Pembekal
+DocType: Account,Setting Account Type helps in selecting this Account in transactions.,Menetapkan Jenis Akaun membantu dalam memilih Akaun ini dalam urus niaga.
+DocType: Purchase Invoice,Grand Total (Company Currency),Jumlah Besar (Syarikat mata wang)
+apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,Jumlah Keluar
+apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +48,"There can only be one Shipping Rule Condition with 0 or blank value for ""To Value""",Hanya ada satu Keadaan Peraturan Penghantaran dengan 0 atau nilai kosong untuk &quot;Untuk Nilai&quot;
+DocType: Authorization Rule,Transaction,Transaksi
+apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +45,Note: This Cost Center is a Group. Cannot make accounting entries against groups.,Nota: Ini PTJ adalah Kumpulan. Tidak boleh membuat catatan perakaunan terhadap kumpulan.
+apps/frappe/frappe/config/desk.py +7,Tools,Tools
+DocType: Item,Website Item Groups,Kumpulan Website Perkara
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +174,Production order number is mandatory for stock entry purpose manufacture,Nombor pesanan pengeluaran adalah wajib untuk masuk saham pembuatan tujuan
+DocType: Purchase Invoice,Total (Company Currency),Jumlah (Syarikat mata wang)
+apps/erpnext/erpnext/stock/utils.py +162,Serial number {0} entered more than once,Nombor siri {0} memasuki lebih daripada sekali
+DocType: Journal Entry,Journal Entry,Jurnal Entry
+DocType: Workstation,Workstation Name,Nama stesen kerja
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,E-mel Digest:
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +432,BOM {0} does not belong to Item {1},BOM {0} bukan milik Perkara {1}
+DocType: Sales Partner,Target Distribution,Pengagihan Sasaran
+apps/frappe/frappe/public/js/frappe/model/model.js +25,Comments,Comments
+DocType: Salary Slip,Bank Account No.,No. Akaun Bank
+DocType: Naming Series,This is the number of the last created transaction with this prefix,Ini ialah bilangan transaksi terakhir yang dibuat dengan awalan ini
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +172,Valuation Rate required for Item {0},Kadar penilaian diperlukan untuk Perkara {0}
+DocType: Quality Inspection Reading,Reading 8,Membaca 8
+DocType: Sales Partner,Agent,Agen
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +74,"Total {0} for all items is zero, may you should change 'Distribute Charges Based On'","Jumlah {0} untuk semua perkara adalah sifar, mungkin anda perlu menukar &#39;Edar Caj Berdasarkan&#39;"
+DocType: Purchase Invoice,Taxes and Charges Calculation,Cukai dan Caj Pengiraan
+DocType: BOM Operation,Workstation,Stesen kerja
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +112,Hardware,Perkakasan
+DocType: Attendance,HR Manager,HR Manager
+apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,Sila pilih sebuah Syarikat
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +50,Privilege Leave,Privilege Cuti
+DocType: Purchase Invoice,Supplier Invoice Date,Pembekal Invois Tarikh
+apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +79,You need to enable Shopping Cart,Anda perlu untuk membolehkan Troli
+apps/frappe/frappe/public/js/frappe/form/grid_body.html +6,No Data,Tiada Data
+DocType: Appraisal Template Goal,Appraisal Template Goal,Templat Penilaian Matlamat
+DocType: Salary Slip,Earning,Pendapatan
+DocType: Payment Tool,Party Account Currency,Akaun Pihak Mata Wang
+,BOM Browser,BOM Pelayar
+DocType: Purchase Taxes and Charges,Add or Deduct,Tambah atau Memotong
+DocType: Company,If Yearly Budget Exceeded (for expense account),Jika Bajet tahunan Melebihi (untuk akaun perbelanjaan)
+apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +81,Overlapping conditions found between:,Keadaan bertindih yang terdapat di antara:
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +168,Against Journal Entry {0} is already adjusted against some other voucher,Terhadap Journal Entry {0} telah diselaraskan dengan beberapa baucar lain
+apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +68,Total Order Value,Jumlah Nilai Pesanan
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +38,Food,Makanan
+apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Range Penuaan 3
+apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +139,You can make a time log only against a submitted production order,Anda boleh membuat log masa sahaja terhadap perintah pengeluaran dikemukakan
+DocType: Maintenance Schedule Item,No of Visits,Jumlah Lawatan
+DocType: File,old_parent,old_parent
+apps/erpnext/erpnext/config/support.py +33,"Newsletters to contacts, leads.","Surat berita kepada kenalan, membawa."
+apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},Mata Wang Akaun Penutupan mestilah {0}
+apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},Jumlah mata untuk semua matlamat harus 100. Ia adalah {0}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +365,Operations cannot be left blank.,Operasi tidak boleh dibiarkan kosong.
+,Delivered Items To Be Billed,Item Dihantar dikenakan caj
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,Gudang tidak boleh diubah untuk No. Siri
+DocType: DocField,Description,Penerangan
+DocType: Authorization Rule,Average Discount,Diskaun Purata
+DocType: Letter Head,Is Default,Adalah Default
+DocType: Address,Utilities,Utiliti
+DocType: Purchase Invoice Item,Accounting,Perakaunan
+DocType: Features Setup,Features Setup,Ciri-ciri Persediaan
+apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,View Offer Letter,Lihat Tawaran Surat
+DocType: Communication,Communication,Komunikasi
+DocType: Item,Is Service Item,Adalah Perkhidmatan Perkara
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +81,Application period cannot be outside leave allocation period,Tempoh permohonan tidak boleh cuti di luar tempoh peruntukan
+DocType: Activity Cost,Projects,Projek
+apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +31,Please select Fiscal Year,Sila pilih Tahun Anggaran
+apps/erpnext/erpnext/controllers/buying_controller.py +23,From {0} | {1} {2},Dari {0} | {1} {2}
+DocType: BOM Operation,Operation Description,Operasi Penerangan
+DocType: Item,Will also apply to variants,Juga akan memohon kepada varian
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +30,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,Tidak dapat ubah Tahun Fiskal Mula Tarikh dan Tahun Anggaran Tarikh akhir sekali Tahun Fiskal disimpan.
+DocType: Quotation,Shopping Cart,Troli Membeli-belah
+apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Avg Daily Outgoing,Purata harian Keluar
+DocType: Pricing Rule,Campaign,Kempen
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +30,Approval Status must be 'Approved' or 'Rejected',Kelulusan Status mesti &#39;diluluskan&#39; atau &#39;Ditolak&#39;
+DocType: Purchase Invoice,Contact Person,Dihubungi
+apps/erpnext/erpnext/projects/doctype/task/task.py +35,'Expected Start Date' can not be greater than 'Expected End Date','Jangkaan Tarikh Bermula' tidak boleh menjadi lebih besar daripada 'Jangkaan Tarikh Tamat'
+DocType: Holiday List,Holidays,Cuti
+DocType: Sales Order Item,Planned Quantity,Dirancang Kuantiti
+DocType: Purchase Invoice Item,Item Tax Amount,Jumlah Perkara Cukai
+DocType: Item,Maintain Stock,Mengekalkan Saham
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +213,Stock Entries already created for Production Order ,Penyertaan Saham telah dicipta untuk Perintah Pengeluaran
+DocType: Leave Control Panel,Leave blank if considered for all designations,Tinggalkan kosong jika dipertimbangkan untuk semua jawatan
+apps/erpnext/erpnext/controllers/accounts_controller.py +500,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Penjaga jenis &#39;sebenar&#39; di baris {0} tidak boleh dimasukkan dalam Kadar Perkara
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,Max: {0},Max: {0}
+apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +16,From Datetime,Dari datetime
+DocType: Email Digest,For Company,Bagi Syarikat
+apps/erpnext/erpnext/config/support.py +38,Communication log.,Log komunikasi.
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +66,Buying Amount,Membeli Jumlah
+DocType: Sales Invoice,Shipping Address Name,Alamat Penghantaran Nama
+apps/erpnext/erpnext/accounts/doctype/account/account.js +50,Chart of Accounts,Carta Akaun
+DocType: Material Request,Terms and Conditions Content,Terma dan Syarat Kandungan
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +471,cannot be greater than 100,tidak boleh lebih besar daripada 100
+apps/erpnext/erpnext/stock/doctype/item/item.py +550,Item {0} is not a stock Item,Perkara {0} bukan Item saham
+DocType: Maintenance Visit,Unscheduled,Tidak Berjadual
+DocType: Employee,Owned,Milik
+DocType: Salary Slip Deduction,Depends on Leave Without Pay,Bergantung kepada Cuti Tanpa Gaji
+DocType: Pricing Rule,"Higher the number, higher the priority","Lebih tinggi nombor tersebut, lebih tinggi keutamaan"
+,Purchase Invoice Trends,Membeli Trend Invois
+DocType: Employee,Better Prospects,Prospek yang lebih baik
+DocType: Appraisal,Goals,Matlamat
+DocType: Warranty Claim,Warranty / AMC Status,Waranti / AMC Status
+,Accounts Browser,Pelayar Akaun-akaun
+DocType: GL Entry,GL Entry,GL Entry
+DocType: HR Settings,Employee Settings,Tetapan pekerja
+,Batch-Wise Balance History,Batch Bijaksana Baki Sejarah
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +72,To Do List,To Do List
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Apprentice,Perantis
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +99,Negative Quantity is not allowed,Kuantiti negatif tidak dibenarkan
+DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
+Used for Taxes and Charges",Cukai terperinci jadual diambil dari ruang induk sebagai rentetan dan disimpan di dalam bidang ini. Digunakan untuk Cukai dan Caj
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +151,Employee cannot report to himself.,Pekerja tidak boleh melaporkan kepada dirinya sendiri.
+DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Jika akaun dibekukan, entri dibenarkan pengguna terhad."
+DocType: Email Digest,Bank Balance,Baki Bank
+apps/erpnext/erpnext/controllers/accounts_controller.py +436,Accounting Entry for {0}: {1} can only be made in currency: {2},Kemasukan Perakaunan untuk {0}: {1} hanya boleh dibuat dalam mata wang: {2}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +38,No active Salary Structure found for employee {0} and the month,Tiada Struktur Gaji aktif dijumpai untuk pekerja {0} dan bulan
+DocType: Job Opening,"Job profile, qualifications required etc.","Profil kerja, kelayakan yang diperlukan dan lain-lain"
+DocType: Journal Entry Account,Account Balance,Baki Akaun
+apps/erpnext/erpnext/config/accounts.py +112,Tax Rule for transactions.,Peraturan cukai bagi urus niaga.
+DocType: Rename Tool,Type of document to rename.,Jenis dokumen untuk menamakan semula.
+apps/erpnext/erpnext/public/js/setup_wizard.js +366,We buy this Item,Kami membeli Perkara ini
+DocType: Address,Billing,Bil
+DocType: Bulk Email,Not Sent,Tidak Dihantar
+DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),Jumlah Cukai dan Caj (Mata Wang Syarikat)
+DocType: Shipping Rule,Shipping Account,Akaun Penghantaran
+apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +43,Scheduled to send to {0} recipients,Dijadual menghantar kepada {0} penerima
+DocType: Quality Inspection,Readings,Bacaan
+DocType: Stock Entry,Total Additional Costs,Jumlah Kos Tambahan
+apps/erpnext/erpnext/public/js/setup_wizard.js +359,Sub Assemblies,Dewan Sub
+DocType: Shipping Rule Condition,To Value,Untuk Nilai
+DocType: Supplier,Stock Manager,Pengurus saham
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +143,Source warehouse is mandatory for row {0},Sumber gudang adalah wajib untuk berturut-turut {0}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +581,Packing Slip,Slip pembungkusan
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,Pejabat Disewa
+apps/erpnext/erpnext/config/setup.py +110,Setup SMS gateway settings,Tetapan gateway Persediaan SMS
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Import Gagal!
+apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,Tiada alamat ditambah lagi.
+DocType: Workstation Working Hour,Workstation Working Hour,Workstation Jam Kerja
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Analyst,Penganalisis
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +149,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Row {0}: Jumlah Peruntukan {1} mesti kurang daripada atau bersamaan dengan jumlah JV {2}
+DocType: Item,Inventory,Inventori
+DocType: Features Setup,"To enable ""Point of Sale"" view",Untuk membolehkan &quot;Point of Sale&quot; Pandangan
+apps/erpnext/erpnext/public/js/pos/pos.js +402,Payment cannot be made for empty cart,Pembayaran tidak boleh dibuat untuk cart kosong
+DocType: Item,Sales Details,Jualan Butiran
+DocType: Opportunity,With Items,Dengan Item
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,Dalam Kuantiti
+DocType: Notification Control,Expense Claim Rejected,Perbelanjaan Tuntutan Ditolak
+DocType: Sales Invoice,"The date on which next invoice will be generated. It is generated on submit.
+",Tarikh di mana invois akan dijana. Ia dihasilkan di hantar.
+DocType: Item Attribute,Item Attribute,Perkara Sifat
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Government,Kerajaan
+apps/erpnext/erpnext/config/stock.py +268,Item Variants,Kelainan Perkara
+DocType: Company,Services,Perkhidmatan
+apps/erpnext/erpnext/accounts/report/financial_statements.py +147,Total ({0}),Jumlah ({0})
+DocType: Cost Center,Parent Cost Center,Kos Pusat Ibu Bapa
+DocType: Sales Invoice,Source,Sumber
+DocType: Leave Type,Is Leave Without Pay,Apakah Tinggalkan Tanpa Gaji
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +133,No records found in the Payment table,Tiada rekod yang terdapat dalam jadual Pembayaran
+apps/erpnext/erpnext/public/js/setup_wizard.js +153,Financial Year Start Date,Tahun Kewangan Tarikh Mula
+DocType: Employee External Work History,Total Experience,Jumlah Pengalaman
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +276,Packing Slip(s) cancelled,Slip pembungkusan (s) dibatalkan
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,Freight Forwarding dan Caj
+DocType: Material Request Item,Sales Order No,Pesanan Jualan No
+DocType: Item Group,Item Group Name,Perkara Kumpulan Nama
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,Diambil
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +66,Transfer Materials for Manufacture,Bahan Pemindahan bagi Pembuatan
+DocType: Pricing Rule,For Price List,Untuk Senarai Harga
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,Cari Eksekutif
+apps/erpnext/erpnext/stock/stock_ledger.py +405,"Purchase rate for item: {0} not found, which is required to book accounting entry (expense). Please mention item price against a buying price list.","Kadar pembelian untuk item: {0} tidak ditemui, yang diperlukan untuk menempah kemasukan perakaunan (perbelanjaan). Sila sebutkan harga item dengan senarai harga belian."
+DocType: Maintenance Schedule,Schedules,Jadual
+DocType: Purchase Invoice Item,Net Amount,Jumlah Bersih
+DocType: Purchase Order Item Supplied,BOM Detail No,Detail BOM Tiada
+DocType: Purchase Invoice,Additional Discount Amount (Company Currency),Jumlah Diskaun tambahan (Mata Wang Syarikat)
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +541,Error: {0} > {1},Ralat: {0}&gt; {1}
+apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,Sila buat akaun baru dari carta akaun.
+DocType: Maintenance Visit,Maintenance Visit,Penyelenggaraan Lawatan
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer > Customer Group > Territory,Pelanggan&gt; Kumpulan Pelanggan&gt; Wilayah
+DocType: Sales Invoice Item,Available Batch Qty at Warehouse,Batch didapati Qty di Gudang
+DocType: Time Log Batch Detail,Time Log Batch Detail,Masa Log batch Detail
+DocType: Workflow State,Tasks,Tugas
+DocType: Landed Cost Voucher,Landed Cost Help,Tanah Kos Bantuan
+DocType: Event,Tuesday,Selasa
+DocType: Leave Block List,Block Holidays on important days.,Sekat Cuti pada hari-hari penting.
+,Accounts Receivable Summary,Ringkasan Akaun Belum Terima 
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +187,Please set User ID field in an Employee record to set Employee Role,Sila tetapkan ID Pengguna medan dalam rekod Pekerja untuk menetapkan Peranan Pekerja
+DocType: UOM,UOM Name,Nama UOM
+DocType: Top Bar Item,Target,Sasaran
+apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +33,Contribution Amount,Jumlah Sumbangan
+DocType: Sales Invoice,Shipping Address,Alamat Penghantaran
+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.,Alat ini membantu anda untuk mengemas kini atau yang menetapkan kuantiti dan penilaian stok sistem. Ia biasanya digunakan untuk menyegerakkan nilai sistem dan apa yang benar-benar wujud di gudang anda.
+DocType: Delivery Note,In Words will be visible once you save the Delivery Note.,Dalam Perkataan akan dapat dilihat selepas anda menyimpan Nota Penghantaran.
+apps/erpnext/erpnext/config/stock.py +120,Brand master.,Master Jenama.
+DocType: ToDo,Due Date,Tarikh Akhir
+DocType: Sales Invoice Item,Brand Name,Nama jenama
+DocType: Purchase Receipt,Transporter Details,Butiran Transporter
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Box,Box
+apps/erpnext/erpnext/public/js/setup_wizard.js +137,The Organization,Pertubuhan
+DocType: Monthly Distribution,Monthly Distribution,Pengagihan Bulanan
+apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,Penerima Senarai kosong. Sila buat Penerima Senarai
+DocType: Production Plan Sales Order,Production Plan Sales Order,Rancangan Pengeluaran Jualan Pesanan
+DocType: Sales Partner,Sales Partner Target,Jualan Rakan Sasaran
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},Kemasukan Perakaunan untuk {0} hanya boleh dibuat dalam mata wang: {1}
+DocType: Pricing Rule,Pricing Rule,Peraturan Harga
+apps/erpnext/erpnext/config/learn.py +167,Material Request to Purchase Order,Permintaan bahan Membeli Pesanan
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +74,Row # {0}: Returned Item {1} does not exists in {2} {3},Row # {0}: Dikembalikan Perkara {1} tidak wujud dalam {2} {3}
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,Akaun Bank
+,Bank Reconciliation Statement,Penyata Penyesuaian Bank
+DocType: Address,Lead Name,Nama Lead
+,POS,POS
+apps/erpnext/erpnext/config/stock.py +273,Opening Stock Balance,Membuka Baki Saham
+apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +36,{0} must appear only once,{0} mesti muncul hanya sekali
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +334,Not allowed to tranfer more {0} than {1} against Purchase Order {2},Tidak dibenarkan Pindahkan lebih {0} daripada {1} terhadap Perintah Pembelian {2}
+apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +62,Leaves Allocated Successfully for {0},Meninggalkan Diperuntukkan Berjaya untuk {0}
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,Tiada item untuk pek
+DocType: Shipping Rule Condition,From Value,Dari Nilai
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +552,Manufacturing Quantity is mandatory,Pembuatan Kuantiti adalah wajib
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Amounts not reflected in bank,Amaun tidak dicerminkan dalam bank
+DocType: Quality Inspection Reading,Reading 4,Membaca 4
+apps/erpnext/erpnext/config/hr.py +23,Claims for company expense.,Tuntutan perbelanjaan syarikat.
+DocType: Company,Default Holiday List,Default Senarai Holiday
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +165,Stock Liabilities,Liabiliti saham
+DocType: Purchase Receipt,Supplier Warehouse,Gudang Pembekal
+DocType: Opportunity,Contact Mobile No,Hubungi Mobile No
+DocType: Production Planning Tool,Select Sales Orders,Pilih Pesanan Jualan
+,Material Requests for which Supplier Quotations are not created,Permintaan bahan yang mana Sebutharga Pembekal tidak dicipta
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +117,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,Hari (s) di mana anda memohon cuti adalah cuti. Anda tidak perlu memohon cuti.
+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.,Untuk menjejaki item menggunakan kod bar. Anda akan dapat untuk memasuki perkara dalam Nota Penghantaran dan Jualan Invois dengan mengimbas kod bar barangan.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +497,Mark as Delivered,Tanda sebagai Dihantar
+apps/erpnext/erpnext/crm/doctype/lead/lead.js +34,Make Quotation,Membuat Sebut Harga
+DocType: Dependent Task,Dependent Task,Petugas bergantung
+apps/erpnext/erpnext/stock/doctype/item/item.py +310,Conversion factor for default Unit of Measure must be 1 in row {0},Faktor penukaran Unit keingkaran Langkah mesti 1 berturut-turut {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +155,Leave of type {0} cannot be longer than {1},Cuti jenis {0} tidak boleh lebih panjang daripada {1}
+DocType: Manufacturing Settings,Try planning operations for X days in advance.,Cuba merancang operasi untuk hari X terlebih dahulu.
+DocType: HR Settings,Stop Birthday Reminders,Stop Hari Lahir Peringatan
+DocType: SMS Center,Receiver List,Penerima Senarai
+DocType: Payment Tool Detail,Payment Amount,Jumlah Bayaran
+apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Jumlah dimakan
+apps/erpnext/erpnext/public/js/pos/pos.js +491,{0} View,{0} Lihat
+DocType: Salary Structure Deduction,Salary Structure Deduction,Struktur Potongan Gaji
+apps/erpnext/erpnext/stock/doctype/item/item.py +305,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Unit Langkah {0} telah memasuki lebih daripada sekali dalam Factor Penukaran Jadual
+apps/frappe/frappe/core/page/data_import_tool/data_import_tool.js +108,Import Successful!,Import yang berjaya!
+apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Kos Item Dikeluarkan
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +185,Quantity must not be more than {0},Kuantiti mestilah tidak lebih daripada {0}
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +41,Age (Days),Umur (Hari)
+DocType: Quotation Item,Quotation Item,Sebut Harga Item
+DocType: Account,Account Name,Nama Akaun
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +34,From Date cannot be greater than To Date,Dari Tarikh tidak boleh lebih besar daripada Dating
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +194,Serial No {0} quantity {1} cannot be a fraction,Serial No {0} kuantiti {1} tidak boleh menjadi sebahagian kecil
+apps/erpnext/erpnext/config/buying.py +59,Supplier Type master.,Jenis pembekal induk.
+DocType: Purchase Order Item,Supplier Part Number,Pembekal Bahagian Nombor
+apps/frappe/frappe/core/page/permission_manager/permission_manager.js +379,Add,Tambah
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +92,Conversion rate cannot be 0 or 1,Kadar Penukaran tidak boleh menjadi 0 atau 1
+apps/erpnext/erpnext/controllers/stock_controller.py +247,{0} {1} is cancelled or stopped,{0} {1} dibatalkan atau dihentikan
+DocType: Accounts Settings,Credit Controller,Pengawal Kredit
+DocType: Delivery Note,Vehicle Dispatch Date,Kenderaan Dispatch Tarikh
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +198,Purchase Receipt {0} is not submitted,Pembelian Resit {0} tidak dikemukakan
+DocType: Company,Default Payable Account,Default Akaun Belum Bayar
+apps/erpnext/erpnext/config/website.py +13,"Settings for online shopping cart such as shipping rules, price list etc.","Tetapan untuk troli membeli-belah dalam talian seperti peraturan perkapalan, senarai harga dan lain-lain"
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +124,Setup Complete,Persediaan Lengkap
+apps/erpnext/erpnext/controllers/website_list_for_contact.py +65,{0}% Billed,{0}% dibilkan
+apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +17,Reserved Qty,Terpelihara Qty
+DocType: Party Account,Party Account,Akaun Pihak
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +74,Human Resources,Sumber Manusia
+DocType: Lead,Upper Income,Pendapatan atas
+DocType: Journal Entry Account,Debit in Company Currency,Debit dalam Syarikat Mata Wang
+apps/erpnext/erpnext/support/doctype/issue/issue.py +58,My Issues,Isu saya
+DocType: BOM Item,BOM Item,BOM Perkara
+DocType: Appraisal,For Employee,Untuk Pekerja
+DocType: Company,Default Values,Nilai lalai
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +236,Row {0}: Payment amount can not be negative,Row {0}: Jumlah Pembayaran tidak boleh negatif
+DocType: Expense Claim,Total Amount Reimbursed,Jumlah dibayar balik
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +64,Against Supplier Invoice {0} dated {1},Terhadap Pembekal Invois {0} bertarikh {1}
+DocType: Customer,Default Price List,Senarai Harga Default
+DocType: Payment Reconciliation,Payments,Pembayaran
+DocType: ToDo,Medium,Sederhana
+DocType: Budget Detail,Budget Allocated,Bajet Diperuntukkan
+DocType: Journal Entry,Entry Type,Jenis Kemasukan
+,Customer Credit Balance,Baki Pelanggan Kredit
+apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +137,Please verify your email id,Sila sahkan id e-mel anda
+apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +42,Customer required for 'Customerwise Discount',Pelanggan dikehendaki untuk &#39;Customerwise Diskaun&#39;
+apps/erpnext/erpnext/config/accounts.py +53,Update bank payment dates with journals.,Update tarikh pembayaran bank dengan jurnal.
+DocType: Quotation,Term Details,Butiran jangka
+DocType: Manufacturing Settings,Capacity Planning For (Days),Perancangan Keupayaan (Hari)
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +56,None of the items have any change in quantity or value.,Tiada item mempunyai apa-apa perubahan dalam kuantiti atau nilai.
+DocType: Warranty Claim,Warranty Claim,Jaminan Tuntutan
+,Lead Details,Butiran Lead
+DocType: Purchase Invoice,End date of current invoice's period,Tarikh akhir tempoh invois semasa
+DocType: Pricing Rule,Applicable For,Terpakai Untuk
+DocType: Bank Reconciliation,From Date,Dari Tarikh
+DocType: Shipping Rule Country,Shipping Rule Country,Kaedah Penghantaran Negara
+DocType: Maintenance Visit,Partially Completed,Sebahagiannya telah lengkap
+DocType: Leave Type,Include holidays within leaves as leaves,Termasuk cuti dalam daun daun
+DocType: Sales Invoice,Packed Items,Makan Item
+apps/erpnext/erpnext/config/support.py +18,Warranty Claim against Serial No.,Jaminan Tuntutan terhadap No. Siri
+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","Gantikan BOM tertentu dalam semua BOMs lain di mana ia digunakan. Ia akan menggantikan BOM pautan lama, mengemas kini kos dan menjana semula &quot;BOM Letupan Perkara&quot; jadual seperti BOM baru"
+DocType: Shopping Cart Settings,Enable Shopping Cart,Membolehkan Troli
+DocType: Employee,Permanent Address,Alamat Tetap
+apps/erpnext/erpnext/stock/get_item_details.py +122,Item {0} must be a Service Item.,Perkara {0} mestilah Perkara Perkhidmatan.
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +226,"Advance paid against {0} {1} cannot be greater \
+						than Grand Total {2}",Advance dibayar terhadap {0} {1} tidak boleh lebih besar \ daripada Jumlah Besar {2}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +148,Please select item code,Sila pilih kod item
+DocType: Salary Structure Deduction,Reduce Deduction for Leave Without Pay (LWP),Mengurangkan Potongan bagi Cuti Tanpa Gaji (LWP)
+DocType: Territory,Territory Manager,Pengurus Wilayah
+DocType: Delivery Note Item,To Warehouse (Optional),Untuk Gudang (pilihan)
+DocType: Sales Invoice,Paid Amount (Company Currency),Jumlah yang dibayar (Syarikat Mata Wang)
+DocType: Purchase Invoice,Additional Discount,Diskaun tambahan
+DocType: Selling Settings,Selling Settings,Menjual Tetapan
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,Lelong Online
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +94,Please specify either Quantity or Valuation Rate or both,Sila nyatakan sama ada atau Kuantiti Kadar Nilaian atau kedua-duanya
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +50,"Company, Month and Fiscal Year is mandatory","Syarikat, Bulan dan Tahun Anggaran adalah wajib"
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Marketing Expenses,Perbelanjaan pemasaran
+,Item Shortage Report,Perkara Kekurangan Laporan
+apps/erpnext/erpnext/stock/doctype/item/item.js +185,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Berat disebutkan, \ nSila menyebut &quot;Berat UOM&quot; terlalu"
+DocType: Stock Entry Detail,Material Request used to make this Stock Entry,Permintaan bahan yang digunakan untuk membuat ini Entry Saham
+apps/erpnext/erpnext/config/support.py +43,Single unit of an Item.,Unit tunggal Item satu.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +212,Time Log Batch {0} must be 'Submitted',Masa Log batch {0} mesti &#39;Dihantar&#39;
+DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,Buat Perakaunan Entry Untuk Setiap Pergerakan Saham
+DocType: Leave Allocation,Total Leaves Allocated,Jumlah Daun Diperuntukkan
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +386,Warehouse required at Row No {0},Gudang diperlukan semasa Row Tiada {0}
+DocType: Employee,Date Of Retirement,Tarikh Persaraan
+DocType: Upload Attendance,Get Template,Dapatkan Template
+DocType: Address,Postal,Pos
+DocType: Item,Weightage,Wajaran
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"Satu Kumpulan Pelanggan sudah wujud dengan nama yang sama, sila tukar nama Pelanggan atau menamakan semula Kumpulan Pelanggan"
+apps/erpnext/erpnext/public/js/pos/pos.js +147,Please select {0} first.,Sila pilih {0} pertama.
+apps/erpnext/erpnext/templates/pages/order.html +57,text {0},teks {0}
+DocType: Territory,Parent Territory,Wilayah Ibu Bapa
+DocType: Quality Inspection Reading,Reading 2,Membaca 2
+DocType: Stock Entry,Material Receipt,Penerimaan Bahan
+apps/erpnext/erpnext/public/js/setup_wizard.js +358,Products,Produk
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +47,Party Type and Party is required for Receivable / Payable account {0},Jenis Parti dan Parti diperlukan untuk / akaun Dibayar Terima {0}
+DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.","Jika perkara ini mempunyai varian, maka ia tidak boleh dipilih dalam pesanan jualan dan lain-lain"
+DocType: Lead,Next Contact By,Hubungi Seterusnya By
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +215,Quantity required for Item {0} in row {1},Kuantiti yang diperlukan untuk Perkara {0} berturut-turut {1}
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +85,Warehouse {0} can not be deleted as quantity exists for Item {1},Gudang {0} tidak boleh dihapuskan sebagai kuantiti wujud untuk Perkara {1}
+DocType: Quotation,Order Type,Perintah Jenis
+DocType: Purchase Invoice,Notification Email Address,Pemberitahuan Alamat E-mel
+DocType: Payment Tool,Find Invoices to Match,Cari Invois untuk Padankan
+,Item-wise Sales Register,Perkara-bijak Jualan Daftar
+apps/erpnext/erpnext/public/js/setup_wizard.js +147,"e.g. ""XYZ National Bank""",contohnya &quot;XYZ Bank Negara&quot;
+DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,Cukai ini adalah termasuk dalam Kadar Asas?
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Target,Jumlah Sasaran
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.js +22,Shopping Cart is enabled,Troli Membeli-belah diaktifkan
+DocType: Job Applicant,Applicant for a Job,Pemohon untuk pekerjaan yang
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +173,No Production Orders created,Tiada Perintah Pengeluaran dicipta
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +140,Salary Slip of employee {0} already created for this month,Slip gaji pekerja {0} telah dicipta untuk bulan ini
+DocType: Stock Reconciliation,Reconciliation JSON,Penyesuaian JSON
+apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Terlalu banyak tiang. Mengeksport laporan dan mencetak penggunaan aplikasi spreadsheet.
+DocType: Sales Invoice Item,Batch No,Batch No
+DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Membenarkan pelbagai Pesanan Jualan terhadap Perintah Pembelian yang Pelanggan
+apps/erpnext/erpnext/setup/doctype/company/company.py +152,Main,Utama
+DocType: DocPerm,Delete,Padam
+apps/erpnext/erpnext/stock/doctype/item/item_list.js +13,Variant,Varian
+apps/frappe/frappe/public/js/frappe/form/toolbar.js +165,New {0},New {0}
+DocType: Naming Series,Set prefix for numbering series on your transactions,Terletak awalan untuk penomboran siri transaksi anda
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +164,Stopped order cannot be cancelled. Unstop to cancel.,Perintah berhenti tidak boleh dibatalkan. Unstop untuk membatalkan.
+apps/erpnext/erpnext/stock/doctype/item/item.py +327,Default BOM ({0}) must be active for this item or its template,BOM lalai ({0}) mesti aktif untuk item ini atau template yang
+DocType: Employee,Leave Encashed?,Cuti ditunaikan?
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Peluang Daripada bidang adalah wajib
+DocType: Item,Variants,Kelainan
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +458,Make Purchase Order,Buat Pesanan Belian
+DocType: SMS Center,Send To,Hantar Kepada
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +127,There is not enough leave balance for Leave Type {0},Tidak ada baki cuti yang cukup untuk Cuti Jenis {0}
+DocType: Sales Team,Contribution to Net Total,Sumbangan kepada Jumlah Bersih
+DocType: Sales Invoice Item,Customer's Item Code,Kod Item Pelanggan
+DocType: Stock Reconciliation,Stock Reconciliation,Saham Penyesuaian
+DocType: Territory,Territory Name,Wilayah Nama
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +152,Work-in-Progress Warehouse is required before Submit,Kerja dalam Kemajuan Gudang diperlukan sebelum Hantar
+apps/erpnext/erpnext/config/hr.py +43,Applicant for a Job.,Pemohon pekerjaan.
+DocType: Purchase Order Item,Warehouse and Reference,Gudang dan Rujukan
+DocType: Supplier,Statutory info and other general information about your Supplier,Maklumat berkanun dan maklumat umum lain mengenai pembekal anda
+DocType: Country,Country,Negara
+apps/erpnext/erpnext/shopping_cart/utils.py +47,Addresses,Alamat
+DocType: Communication,Received,Diterima
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +137,Against Journal Entry {0} does not have any unmatched {1} entry,Terhadap Journal Entry {0} tidak mempunyai apa-apa yang tidak dapat ditandingi {1} masuk
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},Salinan No Serial masuk untuk Perkara {0}
+DocType: Shipping Rule Condition,A condition for a Shipping Rule,Satu syarat untuk Peraturan Penghantaran
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +326,Item is not allowed to have Production Order.,Perkara yang tidak dibenarkan mempunyai Perintah Pengeluaran.
+DocType: DocField,Attach Image,Lampirkan imej
+DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),Berat bersih pakej ini. (Dikira secara automatik sebagai jumlah berat bersih item)
+DocType: Stock Reconciliation Item,Leave blank if no change,Tinggalkan kosong jika tiada perubahan
+DocType: Sales Order,To Deliver and Bill,Untuk Menghantar dan Rang Undang-undang
+DocType: GL Entry,Credit Amount in Account Currency,Jumlah Kredit dalam Mata Wang Akaun
+apps/erpnext/erpnext/config/manufacturing.py +24,Time Logs for manufacturing.,Masa balak untuk pengeluaran.
+DocType: Item,Apply Warehouse-wise Reorder Level,Memohon Gudang-bijak Reorder Level
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +429,BOM {0} must be submitted,BOM {0} hendaklah dikemukakan
+DocType: Authorization Control,Authorization Control,Kawalan Kuasa
+apps/erpnext/erpnext/config/projects.py +23,Time Log for tasks.,Masa Log untuk tugas-tugas.
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +474,Payment,Pembayaran
+DocType: Production Order Operation,Actual Time and Cost,Masa sebenar dan Kos
+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},Permintaan Bahan maksimum {0} boleh dibuat untuk Perkara {1} terhadap Sales Order {2}
+DocType: Employee,Salutation,Salam
+DocType: Communication,Rejected,Ditolak
+DocType: Pricing Rule,Brand,Jenama
+DocType: Item,Will also apply for variants,Juga akan memohon varian
+apps/erpnext/erpnext/config/selling.py +153,Bundle items at time of sale.,Barangan bundle pada masa jualan.
+DocType: Sales Order Item,Actual Qty,Kuantiti Sebenar
+DocType: Sales Invoice Item,References,Rujukan
+DocType: Quality Inspection Reading,Reading 10,Membaca 10
+apps/erpnext/erpnext/public/js/setup_wizard.js +348,"List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start.","Senarai produk atau perkhidmatan anda bahawa anda membeli atau menjual. Pastikan untuk memeriksa Kumpulan Item, Unit Ukur dan hartanah lain apabila anda mula."
+DocType: Hub Settings,Hub Node,Hub Nod
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,Anda telah memasukkan perkara yang sama. Sila membetulkan dan cuba lagi.
+apps/erpnext/erpnext/controllers/item_variant.py +65,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values,Nilai {0} untuk Atribut {1} tidak wujud dalam senarai item sah Atribut Nilai
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Associate,Madya
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +46,Item {0} is not a serialized Item,Perkara {0} bukan Item bersiri
+DocType: SMS Center,Create Receiver List,Cipta Senarai Penerima
+apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +5,Expired,Tamat
+DocType: Packing Slip,To Package No.,Untuk Pakej No.
+DocType: DocType,System,Sistem
+DocType: Warranty Claim,Issue Date,Isu Tarikh
+DocType: Activity Cost,Activity Cost,Kos Aktiviti
+DocType: Purchase Receipt Item Supplied,Consumed Qty,Digunakan Qty
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +52,Telecommunications,Telekomunikasi
+DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),Menunjukkan bahawa pakej itu adalah sebahagian daripada penghantaran ini (Hanya Draf)
+DocType: Payment Tool,Make Payment Entry,Buat Entry Pembayaran
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +119,Quantity for Item {0} must be less than {1},Kuantiti untuk Perkara {0} mesti kurang daripada {1}
+,Sales Invoice Trends,Sales Trend Invois
+DocType: Leave Application,Apply / Approve Leaves,Sapukan / Meluluskan Daun
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +90,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',Boleh merujuk berturut-turut hanya jika jenis pertuduhan adalah &#39;Pada Row Jumlah Sebelumnya&#39; atau &#39;Sebelumnya Row Jumlah&#39;
+DocType: Sales Order Item,Delivery Warehouse,Gudang Penghantaran
+DocType: Stock Settings,Allowance Percent,Peruntukan Peratus
+DocType: SMS Settings,Message Parameter,Mesej Parameter
+DocType: Serial No,Delivery Document No,Penghantaran Dokumen No
+DocType: Landed Cost Voucher,Get Items From Purchase Receipts,Dapatkan Item Dari Pembelian Terimaan
+DocType: Serial No,Creation Date,Tarikh penciptaan
+apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +33,Item {0} appears multiple times in Price List {1},Perkara {0} muncul beberapa kali dalam Senarai Harga {1}
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +37,"Selling must be checked, if Applicable For is selected as {0}","Jualan hendaklah disemak, jika Terpakai Untuk dipilih sebagai {0}"
+DocType: Purchase Order Item,Supplier Quotation Item,Pembekal Sebutharga Item
+apps/erpnext/erpnext/hr/doctype/employee/employee.js +27,Make Salary Structure,Buat Struktur Gaji
+DocType: Item,Has Variants,Mempunyai Kelainan
+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.,Klik pada butang &#39;Buat Jualan Invois&#39; untuk mewujudkan Invois Jualan baru.
+DocType: Monthly Distribution,Name of the Monthly Distribution,Nama Pembahagian Bulanan
+DocType: Sales Person,Parent Sales Person,Orang Ibu Bapa Jualan
+apps/erpnext/erpnext/setup/utils.py +14,Please specify Default Currency in Company Master and Global Defaults,Sila nyatakan mata wang lalai dalam Syarikat Induk dan Lalai Global
+DocType: Dropbox Backup,Dropbox Access Secret,Dropbox Akses Rahsia
+DocType: Purchase Invoice,Recurring Invoice,Invois berulang
+apps/erpnext/erpnext/config/projects.py +79,Managing Projects,Menguruskan Projek
+DocType: Supplier,Supplier of Goods or Services.,Pembekal Barangan atau Perkhidmatan.
+DocType: Budget Detail,Fiscal Year,Tahun Anggaran
+DocType: Cost Center,Budget,Bajet
+apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +41,"Budget cannot be assigned against {0}, as it's not an Income or Expense account","Bajet tidak boleh diberikan terhadap {0}, kerana ia bukan satu akaun Pendapatan atau Perbelanjaan"
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,Tercapai
+apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +65,Territory / Customer,Wilayah / Pelanggan
+apps/erpnext/erpnext/public/js/setup_wizard.js +294,e.g. 5,contohnya 5
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},Row {0}: Jumlah Peruntukan {1} mesti kurang daripada atau sama dengan invois Jumlah tertunggak {2}
+DocType: Sales Invoice,In Words will be visible once you save the Sales Invoice.,Dalam Perkataan akan dapat dilihat selepas anda menyimpan Invois Jualan.
+DocType: Item,Is Sales Item,Adalah Item Jualan
+apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,Perkara Kumpulan Tree
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,Perkara {0} tidak ditetapkan untuk Serial No. Semak Item induk
+DocType: Maintenance Visit,Maintenance Time,Masa penyelenggaraan
+,Amount to Deliver,Jumlah untuk Menyampaikan
+apps/erpnext/erpnext/public/js/setup_wizard.js +356,A Product or Service,Satu Produk atau Perkhidmatan
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +146,There were errors.,Terdapat ralat.
+DocType: Naming Series,Current Value,Nilai semasa
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +171,{0} created,{0} dihasilkan
+DocType: Delivery Note Item,Against Sales Order,Terhadap Perintah Jualan
+,Serial No Status,Serial No Status
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +382,Item table can not be blank,Meja Item tidak boleh kosong
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +138,"Row {0}: To set {1} periodicity, difference between from and to date \
+						must be greater than or equal to {2}","Row {0}: Untuk menetapkan {1} jangka masa, perbezaan antara dari dan ke tarikh \ mesti lebih besar daripada atau sama dengan {2}"
+DocType: Pricing Rule,Selling,Jualan
+DocType: Employee,Salary Information,Maklumat Gaji
+DocType: Sales Person,Name and Employee ID,Nama dan ID Pekerja
+apps/erpnext/erpnext/accounts/party.py +275,Due Date cannot be before Posting Date,Tarikh Akhir tidak boleh sebelum Tarikh Pos
+DocType: Website Item Group,Website Item Group,Laman Web Perkara Kumpulan
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Duties and Taxes,Tugas dan Cukai
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +312,Please enter Reference date,Sila masukkan tarikh Rujukan
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} entri bayaran tidak boleh ditapis oleh {1}
+DocType: Item Website Specification,Table for Item that will be shown in Web Site,Jadual untuk Perkara yang akan dipaparkan dalam Laman Web
+DocType: Purchase Order Item Supplied,Supplied Qty,Dibekalkan Qty
+DocType: Material Request Item,Material Request Item,Bahan Permintaan Item
+apps/erpnext/erpnext/config/stock.py +103,Tree of Item Groups.,Pohon Kumpulan Item.
+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,Tidak boleh merujuk beberapa berturut-turut lebih besar daripada atau sama dengan bilangan baris semasa untuk jenis Caj ini
+,Item-wise Purchase History,Perkara-bijak Pembelian Sejarah
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Red,Merah
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +228,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},Sila klik pada &#39;Menjana Jadual&#39; mengambil No Serial ditambah untuk Perkara {0}
+DocType: Account,Frozen,Beku
+,Open Production Orders,Pesanan Pengeluaran terbuka
+DocType: Installation Note,Installation Time,Masa pemasangan
+DocType: Sales Invoice,Accounting Details,Maklumat Perakaunan
+apps/erpnext/erpnext/setup/doctype/company/company.js +44,Delete all the Transactions for this Company,Memadam semua Transaksi Syarikat ini
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +191,Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Production Order # {3}. Please update operation status via Time Logs,Row # {0}: Operasi {1} tidak siap untuk {2} qty barangan siap dalam Pengeluaran Pesanan # {3}. Sila kemas kini status operasi melalui Time Logs
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +57,Investments,Pelaburan
+DocType: Issue,Resolution Details,Resolusi Butiran
+apps/erpnext/erpnext/config/stock.py +84,Change UOM for an Item.,Tukar UOM untuk item.
+DocType: Quality Inspection Reading,Acceptance Criteria,Kriteria Penerimaan
+DocType: Item Attribute,Attribute Name,Atribut Nama
+apps/erpnext/erpnext/controllers/selling_controller.py +236,Item {0} must be Sales or Service Item in {1},Perkara {0} mesti Jualan atau Perkhidmatan Item dalam {1}
+DocType: Item Group,Show In Website,Show Dalam Laman Web
+apps/erpnext/erpnext/public/js/setup_wizard.js +357,Group,Kumpulan
+DocType: Task,Expected Time (in hours),Jangkaan Masa (dalam jam)
+,Qty to Order,Qty Aturan
+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","Untuk menjejaki jenama dalam dokumen-dokumen berikut Penghantaran Nota, Peluang, Permintaan Bahan, Perkara, Pesanan Belian, Baucar Pembelian, Pembeli Resit, Sebut Harga, Invois Jualan, Bundle Produk, Jualan Pesanan, No Siri"
+apps/erpnext/erpnext/config/projects.py +51,Gantt chart of all tasks.,Carta Gantt semua tugas.
+DocType: Appraisal,For Employee Name,Nama Pekerja
+DocType: Holiday List,Clear Table,Jadual jelas
+DocType: Features Setup,Brands,Jenama
+DocType: C-Form Invoice Detail,Invoice No,Tiada invois
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +480,From Purchase Order,Dari Pesanan Belian
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +92,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Tinggalkan tidak boleh digunakan / dibatalkan sebelum {0}, sebagai baki cuti telah pun dibawa dikemukakan dalam rekod peruntukan cuti masa depan {1}"
+DocType: Activity Cost,Costing Rate,Kadar berharga
+,Customer Addresses And Contacts,Alamat Pelanggan Dan Kenalan
+DocType: Employee,Resignation Letter Date,Peletakan jawatan Surat Tarikh
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +37,Pricing Rules are further filtered based on quantity.,Peraturan harga yang lagi ditapis berdasarkan kuantiti.
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +137,Not Set,Tidak diset
+DocType: Communication,Date,Tarikh
+apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,Ulang Hasil Pelanggan
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +115,Sit tight while your system is being setup. This may take a few moments.,Duduk ketat manakala sistem anda sedang persediaan. Ini mungkin mengambil sedikit masa.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +51,{0} ({1}) must have role 'Expense Approver',{0} ({1}) mesti mempunyai peranan 'Pelulus Perbelanjaan'
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Pair,Pasangan
+DocType: Bank Reconciliation Detail,Against Account,Terhadap Akaun
+DocType: Maintenance Schedule Detail,Actual Date,Tarikh sebenar
+DocType: Item,Has Batch No,Mempunyai Batch No
+DocType: Delivery Note,Excise Page Number,Eksais Bilangan Halaman
+DocType: Employee,Personal Details,Maklumat Peribadi
+,Maintenance Schedules,Jadual Penyelenggaraan
+,Quotation Trends,Trend Sebut Harga
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +139,Item Group not mentioned in item master for item {0},Perkara Kumpulan tidak dinyatakan dalam perkara induk untuk item {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +302,Debit To account must be a Receivable account,Debit Untuk akaun mestilah akaun Belum Terima
+DocType: Shipping Rule Condition,Shipping Amount,Penghantaran Jumlah
+,Pending Amount,Sementara menunggu Jumlah
+DocType: Purchase Invoice Item,Conversion Factor,Faktor penukaran
+DocType: Purchase Order,Delivered,Dihantar
+apps/erpnext/erpnext/config/hr.py +160,Setup incoming server for jobs email id. (e.g. jobs@example.com),Persediaan pelayan masuk untuk id e-mel pekerjaan. (Contohnya jobs@example.com)
+DocType: Purchase Receipt,Vehicle Number,Bilangan Kenderaan
+DocType: Purchase Invoice,The date on which recurring invoice will be stop,Tarikh di mana invois berulang akan berhenti
+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,Jumlah daun diperuntukkan {0} tidak boleh kurang daripada daun yang telah pun diluluskan {1} bagi tempoh
+DocType: Journal Entry,Accounts Receivable,Akaun-akaun boleh terima
+,Supplier-Wise Sales Analytics,Pembekal Bijaksana Jualan Analytics
+DocType: Address Template,This format is used if country specific format is not found,Format ini digunakan jika format tertentu negara tidak dijumpai
+DocType: Custom Field,Custom,Custom
+DocType: Production Order,Use Multi-Level BOM,Gunakan Multi-Level BOM
+DocType: Bank Reconciliation,Include Reconciled Entries,Termasuk Penyertaan berdamai
+apps/erpnext/erpnext/config/accounts.py +41,Tree of finanial accounts.,Tree akaun finanial.
+DocType: Leave Control Panel,Leave blank if considered for all employee types,Tinggalkan kosong jika dipertimbangkan untuk semua jenis pekerja
+DocType: Landed Cost Voucher,Distribute Charges Based On,Mengedarkan Caj Berasaskan
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +312,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,Akaun {0} mestilah dari jenis &#39;Aset Tetap&#39; sebagai Item {1} adalah Perkara Aset
+DocType: HR Settings,HR Settings,Tetapan HR
+apps/frappe/frappe/config/setup.py +130,Printing,Percetakan
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +114,Expense Claim is pending approval. Only the Expense Approver can update status.,Perbelanjaan Tuntutan sedang menunggu kelulusan. Hanya Pelulus Perbelanjaan yang boleh mengemas kini status.
+DocType: Purchase Invoice,Additional Discount Amount,Jumlah Diskaun tambahan
+apps/frappe/frappe/public/js/frappe/misc/utils.js +110,and,dan
+DocType: Leave Block List Allow,Leave Block List Allow,Tinggalkan Sekat Senarai Benarkan
+apps/erpnext/erpnext/setup/doctype/company/company.py +236,Abbr can not be blank or space,Abbr tidak boleh kosong atau senggang
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,Sukan
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Actual,Jumlah Sebenar
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Unit,Unit
+apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.py +182,Please set Dropbox access keys in your site config,Sila set kunci akses Dropbox dalam config laman anda
+apps/erpnext/erpnext/stock/get_item_details.py +113,Please specify Company,Sila nyatakan Syarikat
+,Customer Acquisition and Loyalty,Perolehan Pelanggan dan Kesetiaan
+DocType: Purchase Receipt,Warehouse where you are maintaining stock of rejected items,Gudang di mana anda mengekalkan stok barangan ditolak
+apps/erpnext/erpnext/public/js/setup_wizard.js +156,Your financial year ends on,Tahun kewangan anda berakhir pada
+DocType: POS Profile,Price List,Senarai Harga
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +20,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0} kini Tahun Anggaran asalan. Sila muat semula browser anda untuk mengemaskini perubahan
+apps/erpnext/erpnext/projects/doctype/project/project.js +47,Expense Claims,Tuntutan perbelanjaan
+DocType: Issue,Support,Sokongan
+,BOM Search,BOM Search
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +176,Closing (Opening + Totals),Penutup (Membuka Total +)
+apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +26,Please specify currency in Company,Sila nyatakan mata wang dalam Syarikat
+DocType: Workstation,Wages per hour,Upah sejam
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},Baki saham dalam batch {0} akan menjadi negatif {1} untuk Perkara {2} di Gudang {3}
+apps/erpnext/erpnext/config/setup.py +83,"Show / Hide features like Serial Nos, POS etc.","Papar / Sembunyi ciri-ciri seperti Serial No, POS dan lain-lain"
+apps/erpnext/erpnext/controllers/accounts_controller.py +237,Account {0} is invalid. Account Currency must be {1},Akaun {0} tidak sah. Mata Wang Akaun mesti {1}
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +34,UOM Conversion factor is required in row {0},Faktor UOM Penukaran diperlukan berturut-turut {0}
+apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +53,Clearance date cannot be before check date in row {0},Tarikh pelepasan tidak boleh sebelum tarikh cek berturut-turut {0}
+DocType: Salary Slip,Deduction,Potongan
+DocType: Address Template,Address Template,Templat Alamat
+apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +128,Please enter Employee Id of this sales person,Sila masukkan ID Pekerja orang jualan ini
+DocType: Territory,Classification of Customers by region,Pengelasan Pelanggan mengikut wilayah
+DocType: Project,% Tasks Completed,% Tugas Selesai
+DocType: Project,Gross Margin,Margin kasar
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +140,Please enter Production Item first,Sila masukkan Pengeluaran Perkara pertama
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +72,disabled user,pengguna orang kurang upaya
+DocType: Opportunity,Quotation,Sebut Harga
+DocType: Salary Slip,Total Deduction,Jumlah Potongan
+DocType: Quotation,Maintenance User,Penyelenggaraan pengguna
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +144,Cost Updated,Kos Dikemaskini
+DocType: Employee,Date of Birth,Tarikh Lahir
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +82,Item {0} has already been returned,Perkara {0} telah kembali
+DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** Tahun Fiskal ** mewakili Tahun Kewangan. Semua kemasukan perakaunan dan transaksi utama yang lain dijejak terhadap Tahun Fiskal ** **.
+DocType: Opportunity,Customer / Lead Address,Pelanggan / Lead Alamat
+apps/erpnext/erpnext/stock/doctype/item/item.py +112,Warning: Invalid SSL certificate on attachment {0},Amaran: Sijil SSL tidak sah pada lampiran {0}
+DocType: Production Order Operation,Actual Operation Time,Masa Sebenar Operasi
+DocType: Authorization Rule,Applicable To (User),Terpakai Untuk (pengguna)
+DocType: Purchase Taxes and Charges,Deduct,Memotong
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +170,Job Description,Penerangan mengenai Jawatan
+DocType: Purchase Order Item,Qty as per Stock UOM,Qty seperti Saham UOM
+apps/frappe/frappe/model/rename_doc.py +343,Please select a valid csv file with data,Sila pilih fail csv yang sah dengan data
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +126,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Watak khas kecuali &quot;-&quot; &quot;.&quot;, &quot;#&quot;, dan &quot;/&quot; tidak dibenarkan dalam menamakan siri"
+DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Simpan Track Kempen Jualan. Jejaki Leads, Sebut Harga, Pesanan Jualan dan lain-lain daripada kempen untuk mengukur Pulangan atas Pelaburan."
+DocType: Expense Claim,Approver,Pelulus
+,SO Qty,SO Qty
+apps/erpnext/erpnext/accounts/doctype/account/account.py +155,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","Penyertaan saham wujud terhadap gudang {0}, oleh itu anda tidak boleh menetapkan semula atau mengubah suai Gudang"
+DocType: Appraisal,Calculate Total Score,Kira Jumlah Skor
+DocType: Supplier Quotation,Manufacturing Manager,Pembuatan Pengurus
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},No siri {0} adalah di bawah jaminan hamper {1}
+apps/erpnext/erpnext/config/stock.py +69,Split Delivery Note into packages.,Penghantaran Split Nota ke dalam pakej.
+apps/erpnext/erpnext/hooks.py +68,Shipments,Penghantaran
+DocType: Purchase Order,To be delivered to customer,Yang akan dihantar kepada pelanggan
+apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,Masa Log Status mesti Dihantar.
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,No siri {0} bukan milik mana-mana Warehouse
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +114,Setting Up,Menyediakan
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,Row # ,Row #
+DocType: Purchase Invoice,In Words (Company Currency),Dalam Perkataan (Syarikat mata wang)
+DocType: Pricing Rule,Supplier,Pembekal
+DocType: C-Form,Quarter,Suku
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +105,Miscellaneous Expenses,Perbelanjaan Pelbagai
+DocType: Global Defaults,Default Company,Syarikat Default
+apps/erpnext/erpnext/controllers/stock_controller.py +166,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,Perbelanjaan atau akaun perbezaan adalah wajib bagi Perkara {0} kerana ia kesan nilai saham keseluruhan
+apps/erpnext/erpnext/controllers/accounts_controller.py +355,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","Tidak boleh overbill untuk Perkara {0} berturut-turut {1} lebih daripada {2}. Untuk membolehkan overbilling, sila ditetapkan dalam Tetapan Saham"
+DocType: Employee,Bank Name,Nama Bank
+apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +27,-Above,-Diatas
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +135,User {0} is disabled,Pengguna {0} adalah orang kurang upaya
+DocType: Leave Application,Total Leave Days,Jumlah Hari Cuti
+DocType: Journal Entry Account,Credit in Account Currency,Kredit dalam Mata Wang Akaun
+DocType: Email Digest,Note: Email will not be sent to disabled users,Nota: Email tidak akan dihantar kepada pengguna kurang upaya
+apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +36,Select Company...,Pilih Syarikat ...
+DocType: Leave Control Panel,Leave blank if considered for all departments,Tinggalkan kosong jika dipertimbangkan untuk semua jabatan
+apps/erpnext/erpnext/config/hr.py +95,"Types of employment (permanent, contract, intern etc.).","Jenis pekerjaan (tetap, kontrak, pelatih dan lain-lain)."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,{0} is mandatory for Item {1},{0} adalah wajib bagi Perkara {1}
+DocType: Currency Exchange,From Currency,Dari Mata Wang
+DocType: DocField,Name,Nama
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +158,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Sila pilih Jumlah Diperuntukkan, Jenis Invois dan Nombor Invois dalam atleast satu baris"
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +107,Sales Order required for Item {0},Pesanan Jualan diperlukan untuk Perkara {0}
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +43,Amounts not reflected in system,Amaun tidak dicerminkan dalam sistem
+DocType: Purchase Invoice Item,Rate (Company Currency),Kadar (Syarikat mata wang)
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +40,Others,Lain
+apps/erpnext/erpnext/templates/includes/product_page.js +80,Cannot find a matching Item. Please select some other value for {0}.,Tidak dapat mencari item yang sepadan. Sila pilih beberapa nilai lain untuk {0}.
+DocType: POS Profile,Taxes and Charges,Cukai dan Caj
+DocType: Item,"A Product or a Service that is bought, sold or kept in stock.","Satu Produk atau Perkhidmatan yang dibeli, dijual atau disimpan dalam stok."
+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,Tidak boleh pilih jenis bayaran sebagai &#39;Pada Row Jumlah Sebelumnya&#39; atau &#39;Pada Sebelumnya Row Jumlah&#39; untuk baris pertama
+apps/frappe/frappe/core/doctype/doctype/boilerplate/controller_list.html +31,Completed,Siap
+DocType: Web Form,Select DocType,Pilih DOCTYPE
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,Perbankan
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +38,Please click on 'Generate Schedule' to get schedule,Sila klik pada &#39;Menjana Jadual&#39; untuk mendapatkan jadual
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +283,New Cost Center,Kos Pusat Baru
+DocType: Bin,Ordered Quantity,Mengarahkan Kuantiti
+apps/erpnext/erpnext/public/js/setup_wizard.js +145,"e.g. ""Build tools for builders""",contohnya &quot;Membina alat bagi pembina&quot;
+DocType: Quality Inspection,In Process,Dalam Proses
+DocType: Authorization Rule,Itemwise Discount,Itemwise Diskaun
+DocType: Purchase Order Item,Reference Document Type,Rujukan Jenis Dokumen
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +320,{0} against Sales Order {1},{0} terhadap Permintaan Jualan {1}
+DocType: Account,Fixed Asset,Aset Tetap
+apps/erpnext/erpnext/config/stock.py +283,Serialized Inventory,Inventori bersiri
+DocType: Activity Type,Default Billing Rate,Kadar Bil lalai
+DocType: Time Log Batch,Total Billing Amount,Jumlah Bil
+apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +47,Receivable Account,Akaun Belum Terima
+,Stock Balance,Baki saham
+apps/erpnext/erpnext/config/selling.py +299,Sales Order to Payment,Perintah Jualan kepada Pembayaran
+DocType: Expense Claim Detail,Expense Claim Detail,Perbelanjaan Tuntutan Detail
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +271,Time Logs created:,Masa Log dicipta:
+DocType: Item,Weight UOM,Berat UOM
+DocType: Employee,Blood Group,Kumpulan Darah
+DocType: Purchase Invoice Item,Page Break,Page Break
+DocType: Production Order Operation,Pending,Sementara menunggu
+DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,Pengguna yang boleh meluluskan permohonan cuti kakitangan yang khusus
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +50,Office Equipments,Peralatan Pejabat
+DocType: Purchase Invoice Item,Qty,Qty
+DocType: Fiscal Year,Companies,Syarikat
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +24,Electronics,Elektronik
+DocType: Stock Settings,Raise Material Request when stock reaches re-order level,Meningkatkan Bahan Permintaan apabila saham mencapai tahap semula perintah-
+apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +18,From Maintenance Schedule,Dari Jadual Penyelenggaraan
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +56,Full-time,Sepenuh masa
+DocType: Purchase Invoice,Contact Details,Butiran Hubungi
+DocType: C-Form,Received Date,Tarikh terima
+DocType: Delivery Note,"If you have created a standard template in Sales Taxes and Charges Template, select one and click on the button below.","Jika anda telah mencipta satu template standard dalam Jualan Cukai dan Caj Template, pilih satu dan klik pada butang di bawah."
+apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +29,Please specify a country for this Shipping Rule or check Worldwide Shipping,Sila nyatakan negara untuk Peraturan Penghantaran ini atau daftar Penghantaran di seluruh dunia
+DocType: Stock Entry,Total Incoming Value,Jumlah Nilai masuk
+apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Pembelian Senarai Harga
+DocType: Offer Letter Term,Offer Term,Tawaran Jangka
+DocType: Quality Inspection,Quality Manager,Pengurus Kualiti
+DocType: Job Applicant,Job Opening,Lowongan
+DocType: Payment Reconciliation,Payment Reconciliation,Penyesuaian bayaran
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +154,Please select Incharge Person's name,Sila pilih nama memproses permohonan lesen Orang
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,Teknologi
+DocType: Offer Letter,Offer Letter,Menawarkan Surat
+apps/erpnext/erpnext/config/manufacturing.py +51,Generate Material Requests (MRP) and Production Orders.,Menjana Permintaan Bahan (MRP) dan Perintah Pengeluaran.
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +68,Total Invoiced Amt,Jumlah invois AMT
+DocType: Time Log,To Time,Untuk Masa
+DocType: Authorization Rule,Approving Role (above authorized value),Meluluskan Peranan (di atas nilai yang diberi kuasa)
+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.","Untuk menambah nod anak, meneroka pokok dan klik pada nod di mana anda mahu untuk menambah lebih banyak nod."
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +102,Credit To account must be a Payable account,Kredit Untuk akaun mestilah akaun Dibayar
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +233,BOM recursion: {0} cannot be parent or child of {2},BOM rekursi: {0} tidak boleh menjadi ibu bapa atau kanak-kanak {2}
+DocType: Production Order Operation,Completed Qty,Siap Qty
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +116,"For {0}, only debit accounts can be linked against another credit entry","Untuk {0}, akaun debit hanya boleh dikaitkan dengan kemasukan kredit lain"
+apps/erpnext/erpnext/stock/get_item_details.py +260,Price List {0} is disabled,Senarai Harga {0} adalah orang kurang upaya
+DocType: Manufacturing Settings,Allow Overtime,Benarkan kerja lebih masa
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +197,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} nombor siri yang diperlukan untuk item {1}. Anda telah menyediakan {2}.
+DocType: Stock Reconciliation Item,Current Valuation Rate,Kadar Penilaian semasa
+DocType: Item,Customer Item Codes,Kod Item Pelanggan
+DocType: Opportunity,Lost Reason,Hilang Akal
+apps/erpnext/erpnext/config/accounts.py +68,Create Payment Entries against Orders or Invoices.,Buat Penyertaan Bayaran terhadap Pesanan atau Invois.
+DocType: Quality Inspection,Sample Size,Saiz Sampel
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +446,All items have already been invoiced,Semua barang-barang telah diinvois
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',Sila nyatakan yang sah Dari Perkara No. &#39;
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +287,Further cost centers can be made under Groups but entries can be made against non-Groups,Pusat kos lanjut boleh dibuat di bawah Kumpulan tetapi penyertaan boleh dibuat terhadap bukan Kumpulan
+DocType: Project,External,Luar
+DocType: Features Setup,Item Serial Nos,Perkara Serial No.
+apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,Pengguna dan Kebenaran
+DocType: Branch,Branch,Cawangan
+apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,Percetakan dan Penjenamaan
+apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +66,No salary slip found for month:,Tiada slip gaji dijumpai untuk bulan:
+DocType: Bin,Actual Quantity,Kuantiti sebenar
+DocType: Shipping Rule,example: Next Day Shipping,contoh: Penghantaran Hari Seterusnya
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,No siri {0} tidak dijumpai
+apps/erpnext/erpnext/public/js/setup_wizard.js +303,Your Customers,Pelanggan anda
+DocType: Leave Block List Date,Block Date,Sekat Tarikh
+DocType: Sales Order,Not Delivered,Tidak Dihantar
+,Bank Clearance Summary,Bank Clearance Ringkasan
+apps/erpnext/erpnext/config/setup.py +105,"Create and manage daily, weekly and monthly email digests.","Membuat dan menguruskan mencerna e-mel harian, mingguan dan bulanan."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code > Item Group > Brand,Kod Item&gt; Perkara Kumpulan&gt; Jenama
+DocType: Appraisal Goal,Appraisal Goal,Penilaian Matlamat
+DocType: Event,Friday,Jumaat
+DocType: Time Log,Costing Amount,Jumlah berharga
+DocType: Process Payroll,Submit Salary Slip,Hantar Slip Gaji
+DocType: Salary Structure,Monthly Earning & Deduction,Pendapatan Bulanan &amp; Potongan
+apps/erpnext/erpnext/controllers/selling_controller.py +157,Maxiumm discount for Item {0} is {1}%,Diskaun Maxiumm untuk Perkara {0} adalah {1}%
+apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,Import di Bulk
+DocType: Sales Partner,Address & Contacts,Alamat Kenalan
+DocType: SMS Log,Sender Name,Nama Pengirim
+DocType: Page,Title,Tajuk
+apps/frappe/frappe/public/js/frappe/list/doclistview.js +418,Customize,Menyesuaikan
+DocType: POS Profile,[Select],[Pilih]
+DocType: SMS Log,Sent To,Dihantar Kepada
+apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +28,Make Sales Invoice,Buat Jualan Invois
+DocType: Company,For Reference Only.,Untuk Rujukan Sahaja.
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +49,Invalid {0}: {1},Tidak sah {0}: {1}
+DocType: Sales Invoice Advance,Advance Amount,Advance Jumlah
+DocType: Manufacturing Settings,Capacity Planning,Perancangan Kapasiti
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +43,'From Date' is required,&#39;Dari Tarikh&#39; diperlukan
+DocType: Journal Entry,Reference Number,Nombor Rujukan
+DocType: Employee,Employment Details,Butiran Pekerjaan
+DocType: Employee,New Workplace,New Tempat Kerja
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +17,Set as Closed,Ditetapkan sebagai Ditutup
+apps/erpnext/erpnext/stock/get_item_details.py +103,No Item with Barcode {0},No Perkara dengan Barcode {0}
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,Perkara No. tidak boleh 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,Jika anda mempunyai Pasukan Jualan dan Jualan Partners (Channel Partners) mereka boleh ditandakan dan mengekalkan sumbangan mereka dalam aktiviti jualan
+DocType: Item,Show a slideshow at the top of the page,Menunjukkan tayangan slaid di bahagian atas halaman
+DocType: Item,"Allow in Sales Order of type ""Service""",Benarkan dalam Sales Order dari jenis &quot;Perkhidmatan&quot;
+apps/erpnext/erpnext/setup/doctype/company/company.py +80,Stores,Kedai
+DocType: Time Log,Projects Manager,Projek Pengurus
+DocType: Serial No,Delivery Time,Masa penghantaran
+apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Penuaan Berasaskan
+DocType: Item,End of Life,Akhir Hayat
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +41,Travel,Perjalanan
+DocType: Leave Block List,Allow Users,Benarkan Pengguna
+DocType: Purchase Order,Customer Mobile No,Pelanggan Bimbit
+DocType: Sales Invoice,Recurring,Berulang
+DocType: Cost Center,Track separate Income and Expense for product verticals or divisions.,Jejaki Pendapatan berasingan dan Perbelanjaan untuk menegak produk atau bahagian.
+DocType: Rename Tool,Rename Tool,Nama semula Tool
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,Update Kos
+DocType: Item Reorder,Item Reorder,Perkara Reorder
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +489,Transfer Material,Pemindahan Bahan
+DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Nyatakan operasi, kos operasi dan memberikan Operasi unik tidak kepada operasi anda."
+DocType: Purchase Invoice,Price List Currency,Senarai Harga Mata Wang
+DocType: Naming Series,User must always select,Pengguna perlu sentiasa pilih
+DocType: Stock Settings,Allow Negative Stock,Benarkan Saham Negatif
+DocType: Installation Note,Installation Note,Pemasangan Nota
+apps/erpnext/erpnext/public/js/setup_wizard.js +283,Add Taxes,Tambah Cukai
+,Financial Analytics,Analisis Kewangan
+DocType: Quality Inspection,Verified By,Disahkan oleh
+DocType: Address,Subsidiary,Anak Syarikat
+apps/erpnext/erpnext/setup/doctype/company/company.py +55,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","Tidak boleh menukar mata wang lalai syarikat itu, kerana terdapat urus niaga yang sedia ada. Transaksi mesti dibatalkan untuk menukar mata wang lalai."
+DocType: Quality Inspection,Purchase Receipt No,Resit Pembelian No
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,Wang Earnest
+DocType: System Settings,In Hours,Dalam Waktu
+DocType: Process Payroll,Create Salary Slip,Membuat Slip Gaji
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Expected balance as per bank,Keseimbangan dijangka seperti bank
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Source of Funds (Liabilities),Sumber Dana (Liabiliti)
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +347,Quantity in row {0} ({1}) must be same as manufactured quantity {2},Kuantiti berturut-turut {0} ({1}) mestilah sama dengan kuantiti yang dikeluarkan {2}
+DocType: Appraisal,Employee,Pekerja
+apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +10,Import Email From,Import Dari E-mel
+apps/erpnext/erpnext/utilities/doctype/contact/contact.js +67,Invite as User,Jemput sebagai pengguna
+DocType: Features Setup,After Sale Installations,Selepas Pemasangan Sale
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,{0} {1} is fully billed,{0} {1} telah dibil sepenuhnya
+DocType: Workstation Working Hour,End Time,Akhir Masa
+apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,Terma kontrak standard untuk Jualan atau Beli.
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +75,Group by Voucher,Kumpulan dengan Voucher
+apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Diperlukan Pada
+DocType: Sales Invoice,Mass Mailing,Mailing massa
+DocType: Page,Standard,Standard
+DocType: Rename Tool,File to Rename,Fail untuk Namakan semula
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +176,Purchse Order number required for Item {0},Nombor pesanan Purchse diperlukan untuk Perkara {0}
+apps/erpnext/erpnext/public/js/controllers/transaction.js +136,Show Payments,Show Pembayaran
+apps/erpnext/erpnext/controllers/buying_controller.py +236,Specified BOM {0} does not exist for Item {1},Dinyatakan BOM {0} tidak wujud untuk Perkara {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Jadual Penyelenggaraan {0} hendaklah dibatalkan sebelum membatalkan Perintah Jualan ini
+apps/frappe/frappe/desk/page/backups/backups.html +13,Size,Saiz
+DocType: Notification Control,Expense Claim Approved,Perbelanjaan Tuntutan Diluluskan
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Pharmaceutical,Farmasi
+apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,Kos Item Dibeli
+DocType: Selling Settings,Sales Order Required,Pesanan Jualan Diperlukan
+apps/erpnext/erpnext/crm/doctype/lead/lead.js +30,Create Customer,Buat Pelanggan
+DocType: Purchase Invoice,Credit To,Kredit Untuk
+DocType: Employee Education,Post Graduate,Siswazah
+DocType: Maintenance Schedule Detail,Maintenance Schedule Detail,Jadual Penyelenggaraan Detail
+DocType: Quality Inspection Reading,Reading 9,Membaca 9
+DocType: Supplier,Is Frozen,Adalah Beku
+DocType: Buying Settings,Buying Settings,Tetapan Membeli
+DocType: Stock Entry Detail,BOM No. for a Finished Good Item,BOM No. untuk Perkara Baik Selesai
+DocType: Upload Attendance,Attendance To Date,Kehadiran Untuk Tarikh
+apps/erpnext/erpnext/config/selling.py +158,Setup incoming server for sales email id. (e.g. sales@example.com),Persediaan pelayan masuk untuk id e-mel jualan. (Contohnya sales@example.com)
+DocType: Warranty Claim,Raised By,Dibangkitkan Oleh
+DocType: Payment Tool,Payment Account,Akaun Pembayaran
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +713,Please specify Company to proceed,Sila nyatakan Syarikat untuk meneruskan
+apps/frappe/frappe/public/js/frappe/model/indicator.js +30,Draft,Draf
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Compensatory Off,Pampasan Off
+DocType: Quality Inspection Reading,Accepted,Diterima
+DocType: User,Female,Perempuan
+DocType: Journal Entry Account,Debit in Account Currency,Debit dalam Mata Wang Akaun
+apps/erpnext/erpnext/setup/doctype/company/company.js +24,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,Sila pastikan anda benar-benar ingin memadam semua urus niaga bagi syarikat ini. Data induk anda akan kekal kerana ia adalah. Tindakan ini tidak boleh dibuat asal.
+DocType: Print Settings,Modern,Moden
+DocType: Communication,Replied,Menjawab
+DocType: Payment Tool,Total Payment Amount,Jumlah Pembayaran
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +145,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) tidak boleh lebih besar dari kuantiti yang dirancang ({2}) dalam Pesanan Pengeluaran {3}
+DocType: Shipping Rule,Shipping Rule Label,Peraturan Penghantaran Label
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +209,Raw Materials cannot be blank.,Bahan mentah tidak boleh kosong.
+DocType: Newsletter,Test,Ujian
+apps/erpnext/erpnext/stock/doctype/item/item.py +368,"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'","Oleh kerana terdapat transaksi saham sedia ada untuk item ini, \ anda tidak boleh menukar nilai-nilai &#39;Belum Bersiri&#39;, &#39;Mempunyai batch Tidak&#39;, &#39;Apakah Saham Perkara&#39; dan &#39;Kaedah Penilaian&#39;"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +448,Quick Journal Entry,Pantas Journal Kemasukan
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +92,You can not change rate if BOM mentioned agianst any item,Anda tidak boleh mengubah kadar jika BOM disebut agianst sebarang perkara
+DocType: Employee,Previous Work Experience,Pengalaman Kerja Sebelumnya
+DocType: Stock Entry,For Quantity,Untuk Kuantiti
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +157,Please enter Planned Qty for Item {0} at row {1},Sila masukkan Dirancang Kuantiti untuk Perkara {0} di barisan {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +211,{0} {1} is not submitted,{0} {1} tidak diserahkan
+apps/erpnext/erpnext/config/stock.py +18,Requests for items.,Permintaan untuk barang-barang.
+DocType: Production Planning Tool,Separate production order will be created for each finished good item.,Perintah pengeluaran berasingan akan diwujudkan bagi setiap item siap baik.
+DocType: Purchase Invoice,Terms and Conditions1,Terma dan Conditions1
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard_page.html +18,Complete Setup,Persediaan yang lengkap
+DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","Catatan Perakaunan dibekukan sehingga tarikh ini, tiada siapa boleh melakukan / mengubah suai kemasukan kecuali yang berperanan seperti di bawah."
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +121,Please save the document before generating maintenance schedule,Sila simpan dokumen itu sebelum menjana jadual penyelenggaraan
+apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,Status projek
+DocType: UOM,Check this to disallow fractions. (for Nos),Semak ini untuk tidak membenarkan pecahan. (Untuk Nos)
+apps/erpnext/erpnext/config/crm.py +96,Newsletter Mailing List,Newsletter Senarai Mel
+DocType: Delivery Note,Transporter Name,Nama Transporter
+DocType: Authorization Rule,Authorized Value,Nilai yang diberi kuasa
+DocType: Contact,Enter department to which this Contact belongs,Masukkan jabatan yang Contact ini kepunyaan
+apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Absent,Jumlah Tidak hadir
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +746,Item or Warehouse for row {0} does not match Material Request,Perkara atau Gudang untuk baris {0} tidak sepadan Bahan Permintaan
+apps/erpnext/erpnext/config/stock.py +109,Unit of Measure,Unit Tindakan
+DocType: Fiscal Year,Year End Date,Tahun Tarikh Akhir
+DocType: Task Depends On,Task Depends On,Petugas Bergantung Pada
+DocType: Lead,Opportunity,Peluang
+DocType: Salary Structure Earning,Salary Structure Earning,Struktur Gaji Pendapatan
+,Completed Production Orders,Pesanan Pengeluaran selesai
+DocType: Operation,Default Workstation,Workstation Default
+DocType: Notification Control,Expense Claim Approved Message,Mesej perbelanjaan Tuntutan Diluluskan
+DocType: Email Digest,How frequently?,Berapa kerap?
+DocType: Purchase Receipt,Get Current Stock,Dapatkan Saham Semasa
+apps/erpnext/erpnext/config/manufacturing.py +63,Tree of Bill of Materials,Tree Rang Undang-Undang Bahan
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +198,Maintenance start date can not be before delivery date for Serial No {0},Tarikh mula penyelenggaraan tidak boleh sebelum tarikh penghantaran untuk No Serial {0}
+DocType: Production Order,Actual End Date,Tarikh Akhir Sebenar 
+DocType: Authorization Rule,Applicable To (Role),Terpakai Untuk (Peranan)
+DocType: Stock Entry,Purpose,Tujuan
+DocType: Item,Will also apply for variants unless overrridden,Juga akan memohon varian kecuali overrridden
+DocType: Purchase Invoice,Advances,Pendahuluan
+apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +32,Approving User cannot be same as user the rule is Applicable To,Meluluskan pengguna tidak boleh menjadi sama seperti pengguna peraturan adalah Terpakai Untuk
+DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),Kadar asas (seperti Stock UOM)
+DocType: SMS Log,No of Requested SMS,Jumlah SMS yang diminta
+DocType: Campaign,Campaign-.####,Kempen -. ####
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,Langkah seterusnya
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +117,Contract End Date must be greater than Date of Joining,Kontrak Tarikh Akhir mesti lebih besar daripada Tarikh Menyertai
+DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,Seorang pengedar pihak ketiga / peniaga / ejen / kenalan / penjual semula yang menjual produk syarikat untuk komisen.
+DocType: Customer Group,Has Child Node,Kanak-kanak mempunyai Nod
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +332,{0} against Purchase Order {1},{0} terhadap Permintaan Pembelian {1}
+DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","Masukkan parameter url statik di sini (Eg. Penghantar = ERPNext, nama pengguna = ERPNext, kata laluan = 1234 dan lain-lain)"
+apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,{0} {1} tidak dalam mana-mana Tahun Fiskal aktif. Untuk maklumat lanjut daftar {2}.
+apps/erpnext/erpnext/setup/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,Ini adalah laman contoh automatik dihasilkan daripada ERPNext
+apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +37,Ageing Range 1,Range Penuaan 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.
+
+#### Note
+
+The tax rate you define here will be the standard tax rate for all **Items**. If there are **Items** that have different rates, they must be added in the **Item Tax** table in the **Item** master.
+
+#### Description of Columns
+
+1. Calculation Type: 
+    - This can be on **Net Total** (that is the sum of basic amount).
+    - **On Previous Row Total / Amount** (for cumulative taxes or charges). If you select this option, the tax will be applied as a percentage of the previous row (in the tax table) amount or total.
+    - **Actual** (as mentioned).
+2. Account Head: The Account ledger under which this tax will be booked
+3. Cost Center: If the tax / charge is an income (like shipping) or expense it needs to be booked against a Cost Center.
+4. Description: Description of the tax (that will be printed in invoices / quotes).
+5. Rate: Tax rate.
+6. Amount: Tax amount.
+7. Total: Cumulative total to this point.
+8. Enter Row: If based on ""Previous Row Total"" you can select the row number which will be taken as a base for this calculation (default is the previous row).
+9. Consider Tax or Charge for: In this section you can specify if the tax / charge is only for valuation (not a part of total) or only for total (does not add value to the item) or for both.
+10. Add or Deduct: Whether you want to add or deduct the tax.","Template cukai standard yang boleh diguna pakai untuk semua Transaksi Pembelian. Templat ini boleh mengandungi senarai kepala cukai dan juga kepala perbelanjaan lain seperti &quot;Penghantaran&quot;, &quot;Insurans&quot;, &quot;Pengendalian&quot; dan lain-lain #### Nota Kadar cukai anda tentukan di sini akan menjadi kadar cukai standard untuk semua ** Item * *. Jika terdapat Item ** ** yang mempunyai kadar yang berbeza, mereka perlu ditambah dalam ** Item Cukai ** meja dalam ** ** Item induk. #### Keterangan Kolum 1. Pengiraan Jenis: - Ini boleh menjadi pada ** ** Jumlah bersih (iaitu jumlah jumlah asas). - ** Pada Row Sebelumnya Jumlah / Jumlah ** (untuk cukai atau caj terkumpul). Jika anda memilih pilihan ini, cukai yang akan digunakan sebagai peratusan daripada baris sebelumnya (dalam jadual cukai) amaun atau jumlah. - ** ** Sebenar (seperti yang dinyatakan). 2. Ketua Akaun: The lejar Akaun di mana cukai ini akan ditempah 3. Kos Center: Jika cukai / caj adalah pendapatan (seperti penghantaran) atau perbelanjaan perlu ditempah terhadap PTJ. 4. Keterangan: Keterangan cukai (yang akan dicetak dalam invois / sebut harga). 5. Kadar: Kadar Cukai. 6. Jumlah: Jumlah Cukai. 7. Jumlah: Jumlah terkumpul sehingga hal ini. 8. Masukkan Row: Jika berdasarkan &quot;Row Sebelumnya Jumlah&quot; anda boleh pilih nombor barisan yang akan diambil sebagai asas untuk pengiraan ini (default adalah berturut-turut sebelumnya). 9. Pertimbangkan Cukai atau Caj: Dalam bahagian ini, anda boleh menentukan jika cukai / caj adalah hanya untuk penilaian (bukan sebahagian daripada jumlah) atau hanya untuk jumlah (tidak menambah nilai kepada item) atau kedua-duanya. 10. Tambah atau Tolak: Adakah anda ingin menambah atau memotong cukai."
+DocType: Note,Note,Nota
+DocType: Purchase Receipt Item,Recd Quantity,Recd Kuantiti
+DocType: Email Account,Email Ids,E-mel Id
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},Tidak boleh menghasilkan Perkara lebih {0} daripada kuantiti Sales Order {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +473,Stock Entry {0} is not submitted,Saham Entry {0} tidak dikemukakan
+DocType: Payment Reconciliation,Bank / Cash Account,Akaun Bank / Tunai
+DocType: Tax Rule,Billing City,Bandar Bil
+DocType: Global Defaults,Hide Currency Symbol,Menyembunyikan Simbol mata wang
+apps/erpnext/erpnext/config/accounts.py +164,"e.g. Bank, Cash, Credit Card","contohnya Bank, Tunai, Kad Kredit"
+DocType: Journal Entry,Credit Note,Nota Kredit
+apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +221,Completed Qty cannot be more than {0} for operation {1},Siap Qty tidak boleh lebih daripada {0} untuk operasi {1}
+DocType: Features Setup,Quality,Kualiti
+DocType: Contact Us Settings,Introduction,Pengenalan
+DocType: Warranty Claim,Service Address,Alamat Perkhidmatan
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +76,Max 100 rows for Stock Reconciliation.,Max 100 baris untuk Saham Penyesuaian.
+DocType: Stock Entry,Manufacture,Pembuatan
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +13,Please Delivery Note first,Sila Penghantaran Nota pertama
+DocType: Purchase Invoice,Currency and Price List,Mata wang dan Senarai Harga
+DocType: Opportunity,Customer / Lead Name,Pelanggan / Nama Lead
+apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +63,Clearance Date not mentioned,Clearance Tarikh tidak dinyatakan
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Production,Pengeluaran
+DocType: Item,Allow Production Order,Membenarkan Perintah Pengeluaran
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +60,Row {0}:Start Date must be before End Date,Row {0}: Tarikh Mula mestilah sebelum Tarikh Akhir
+apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Jumlah (Kuantiti)
+DocType: Installation Note Item,Installed Qty,Dipasang Qty
+DocType: Lead,Fax,Fax
+DocType: Purchase Taxes and Charges,Parenttype,Parenttype
+apps/frappe/frappe/public/js/frappe/model/indicator.js +43,Submitted,Dihantar
+DocType: Salary Structure,Total Earning,Jumlah Pendapatan
+DocType: Purchase Receipt,Time at which materials were received,Masa di mana bahan-bahan yang telah diterima
+apps/erpnext/erpnext/utilities/doctype/address/address.py +113,My Addresses,Alamat saya
+DocType: Stock Ledger Entry,Outgoing Rate,Kadar keluar
+apps/erpnext/erpnext/config/hr.py +100,Organization branch master.,Master cawangan organisasi.
+apps/erpnext/erpnext/controllers/accounts_controller.py +238, or ,atau
+DocType: Sales Order,Billing Status,Bil Status
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Utility Expenses,Perbelanjaan utiliti
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,90-Above,90 Ke atas
+DocType: Buying Settings,Default Buying Price List,Default Senarai Membeli Harga
+,Download Backups,Muat turun Backup
+DocType: Notification Control,Sales Order Message,Pesanan Jualan Mesej
+apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","Nilai Default Tetapkan seperti Syarikat, mata wang, fiskal semasa Tahun, dan lain-lain"
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js +28,Payment Type,Jenis Pembayaran
+DocType: Process Payroll,Select Employees,Pilih Pekerja
+DocType: Bank Reconciliation,To Date,Tarikh
+DocType: Opportunity,Potential Sales Deal,Deal Potensi Jualan
+apps/frappe/frappe/public/js/frappe/form/footer/timeline_item.html +39,Details,Butiran
+DocType: Purchase Invoice,Total Taxes and Charges,Jumlah Cukai dan Caj
+DocType: Employee,Emergency Contact,Hubungi Kecemasan
+DocType: Item,Quality Parameters,Parameter Kualiti
+DocType: Target Detail,Target  Amount,Sasaran Jumlah
+DocType: Shopping Cart Settings,Shopping Cart Settings,Troli membeli-belah Tetapan
+DocType: Journal Entry,Accounting Entries,Catatan Perakaunan
+apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +24,Duplicate Entry. Please check Authorization Rule {0},Salinan Entry. Sila semak Kebenaran Peraturan {0}
+apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +25,Global POS Profile {0} already created for company {1},Profil POS Global {0} telah dicipta untuk syarikat {1}
+DocType: Purchase Order,Ref SQ,Ref SQ
+apps/erpnext/erpnext/config/manufacturing.py +56,Replace Item / BOM in all BOMs,Ganti Perkara / BOM dalam semua BOMs
+DocType: Purchase Order Item,Received Qty,Diterima Qty
+DocType: Stock Entry Detail,Serial No / Batch,Serial No / batch
+DocType: Product Bundle,Parent Item,Perkara Ibu Bapa
+DocType: Account,Account Type,Jenis Akaun
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +113,Leave Type {0} cannot be carry-forwarded,Tinggalkan Jenis {0} tidak boleh bawa dikemukakan
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +213,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',Jadual penyelenggaraan tidak dihasilkan untuk semua item. Sila klik pada &#39;Menjana Jadual&#39;
+,To Produce,Hasilkan
+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","Bagi barisan {0} dalam {1}. Untuk memasukkan {2} dalam kadar Perkara, baris {3} hendaklah juga disediakan"
+DocType: Packing Slip,Identification of the package for the delivery (for print),Pengenalan pakej untuk penghantaran (untuk cetak)
+DocType: Bin,Reserved Quantity,Cipta Terpelihara Kuantiti
+DocType: Landed Cost Voucher,Purchase Receipt Items,Item Resit Pembelian
+apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,Borang menyesuaikan
+DocType: Account,Income Account,Akaun Pendapatan
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +632,Delivery,Penghantaran
+DocType: Stock Reconciliation Item,Current Qty,Kuantiti semasa
+DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",Lihat &quot;Kadar Bahan Based On&quot; dalam Seksyen Kos
+DocType: Appraisal Goal,Key Responsibility Area,Kawasan Tanggungjawab Utama
+DocType: Item Reorder,Material Request Type,Permintaan Jenis Bahan
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +84,Row {0}: UOM Conversion Factor is mandatory,Row {0}: Faktor Penukaran UOM adalah wajib
+apps/frappe/frappe/desk/moduleview.py +61,Documents,Dokumen
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +17,Ref,Ref
+DocType: Cost Center,Cost Center,PTJ
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +36,Voucher #,Baucer #
+DocType: Notification Control,Purchase Order Message,Membeli Pesanan Mesej
+DocType: Tax Rule,Shipping Country,Penghantaran Negara
+DocType: Upload Attendance,Upload HTML,Naik HTML
+apps/erpnext/erpnext/controllers/accounts_controller.py +392,"Total advance ({0}) against Order {1} cannot be greater \
+				than the Grand Total ({2})",Jumlah terlebih dahulu ({0}) terhadap Perintah {1} tidak boleh lebih besar \ daripada Jumlah Besar ({2})
+DocType: Employee,Relieving Date,Melegakan Tarikh
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +12,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.","Peraturan Harga dibuat untuk menulis ganti Senarai Harga / menentukan peratusan diskaun, berdasarkan beberapa kriteria."
+DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,Gudang hanya boleh ditukar melalui Saham Entry / Penghantaran Nota / Resit Pembelian
+DocType: Employee Education,Class / Percentage,Kelas / Peratus
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Head of Marketing and Sales,Ketua Pemasaran dan Jualan
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +31,Income Tax,Cukai Pendapatan
+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.","Jika Peraturan Harga dipilih dibuat untuk &#39;Harga&#39;, ia akan menulis ganti Senarai Harga. Harga Peraturan Harga adalah harga akhir, jadi tidak ada diskaun lagi boleh diguna pakai. Oleh itu, dalam urus niaga seperti Perintah Jualan, Pesanan Belian dan lain-lain, ia akan berjaya meraih jumlah dalam bidang &#39;Rate&#39;, daripada bidang &#39;Senarai Harga Rate&#39;."
+apps/erpnext/erpnext/config/selling.py +163,Track Leads by Industry Type.,Track Leads mengikut Jenis Industri.
+DocType: Item Supplier,Item Supplier,Perkara Pembekal
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +328,Please enter Item Code to get batch no,Sila masukkan Kod Item untuk mendapatkan kumpulan tidak
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +643,Please select a value for {0} quotation_to {1},Sila pilih nilai untuk {0} quotation_to {1}
+apps/erpnext/erpnext/config/selling.py +33,All Addresses.,Semua Alamat.
+DocType: Company,Stock Settings,Tetapan saham
+DocType: User,Bio,Bio
+apps/erpnext/erpnext/accounts/doctype/account/account.py +194,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Penggabungan hanya boleh dilakukan jika sifat berikut adalah sama dalam kedua-dua rekod. Adalah Kumpulan, Jenis Akar, Syarikat"
+apps/erpnext/erpnext/config/crm.py +72,Manage Customer Group Tree.,Menguruskan Tree Kumpulan Pelanggan.
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +285,New Cost Center Name,New Nama PTJ
+DocType: Leave Control Panel,Leave Control Panel,Tinggalkan Panel Kawalan
+apps/erpnext/erpnext/utilities/doctype/address/address.py +90,No default Address Template found. Please create a new one from Setup > Printing and Branding > Address Template.,Tiada Templat Alamat lalai dijumpai. Sila buat yang baru dari Setup&gt; Percetakan dan Penjenamaan&gt; Templat Alamat.
+DocType: Appraisal,HR User,HR pengguna
+DocType: Purchase Invoice,Taxes and Charges Deducted,Cukai dan Caj Dipotong
+apps/erpnext/erpnext/shopping_cart/utils.py +46,Issues,Isu-isu
+apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},Status mestilah salah seorang daripada {0}
+DocType: Sales Invoice,Debit To,Debit Untuk
+DocType: Delivery Note,Required only for sample item.,Diperlukan hanya untuk item sampel.
+DocType: Stock Ledger Entry,Actual Qty After Transaction,Kuantiti Sebenar Selepas Transaksi
+,Pending SO Items For Purchase Request,Sementara menunggu SO Item Untuk Pembelian Permintaan
+DocType: Supplier,Billing Currency,Bil Mata Wang
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,Extra Large,Lebih Besar
+,Profit and Loss Statement,Penyata Untung dan Rugi
+DocType: Bank Reconciliation Detail,Cheque Number,Nombor Cek
+DocType: Payment Tool Detail,Payment Tool Detail,Alat pembayaran Detail
+,Sales Browser,Jualan Pelayar
+DocType: Journal Entry,Total Credit,Jumlah Kredit
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +476,Warning: Another {0} # {1} exists against stock entry {2},Amaran: Satu lagi {0} # {1} wujud terhadap kemasukan saham {2}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +397,Local,Tempatan
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),Pinjaman dan Pendahuluan (Aset)
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,Penghutang
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Large,Besar
+DocType: C-Form Invoice Detail,Territory,Wilayah
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,Sila menyebut ada lawatan diperlukan
+DocType: Purchase Order,Customer Address Display,Alamat Pelanggan Display
+DocType: Stock Settings,Default Valuation Method,Kaedah Penilaian Default
+DocType: Production Order Operation,Planned Start Time,Dirancang Mula Masa
+apps/erpnext/erpnext/config/accounts.py +63,Close Balance Sheet and book Profit or Loss.,Kunci Kira-kira rapat dan buku Untung atau Rugi.
+apps/erpnext/erpnext/stock/doctype/item/item.py +665,"Default Unit of Measure for Item {0} cannot be changed directly because \
+			you have already made some transaction(s) with another UOM. To change default UOM, \
+			use 'UOM Replace Utility' tool under Stock module.","Unit keingkaran Langkah untuk Perkara {0} tidak boleh diubah langsung kerana \ anda telah membuat beberapa transaksi (s) dengan yang lain UOM. Untuk menukar UOM lalai, \ menggunakannya &#39;UOM Ganti utiliti&#39; alat di bawah modul Stock."
+DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,Nyatakan Kadar Pertukaran untuk menukar satu matawang kepada yang lain
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +141,Quotation {0} is cancelled,Sebut Harga {0} dibatalkan
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,Jumlah Cemerlang
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} was on leave on {1}. Cannot mark attendance.,Pekerja {0} adalah bercuti di {1}. Tidak boleh menandakan kehadiran.
+DocType: Sales Partner,Targets,Sasaran
+DocType: Price List,Price List Master,Senarai Harga Master
+DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,Semua Transaksi Jualan boleh tagged terhadap pelbagai ** Jualan Orang ** supaya anda boleh menetapkan dan memantau sasaran.
+,S.O. No.,PP No.
+DocType: Production Order Operation,Make Time Log,Buat Masa Log
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +158,Please create Customer from Lead {0},Sila buat Pelanggan dari Lead {0}
+DocType: Price List,Applicable for Countries,Digunakan untuk Negara
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Computers,Komputer
+apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +14,This is a root customer group and cannot be edited.,Ini adalah kumpulan pelanggan akar dan tidak boleh diedit.
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +39,Please setup your chart of accounts before you start Accounting Entries,Sila setup carta akaun anda sebelum anda mula Penyertaan Perakaunan
+DocType: Purchase Invoice,Ignore Pricing Rule,Abaikan Peraturan Harga
+apps/frappe/frappe/public/js/frappe/model/indicator.js +34,Cancelled,Dibatalkan
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +91,From Date in Salary Structure cannot be lesser than Employee Joining Date.,Dari Tarikh dalam Struktur Gaji tidak boleh kurang daripada Pekerja Tarikh Menyertai.
+DocType: Employee Education,Graduate,Siswazah
+DocType: Leave Block List,Block Days,Hari blok
+DocType: Journal Entry,Excise Entry,Eksais Entry
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +62,Warning: Sales Order {0} already exists against Customer's Purchase Order {1},Amaran: Sales Order {0} telah wujud terhadap Perintah Pembelian Pelanggan {1}
+DocType: Terms and Conditions,"Standard Terms and Conditions that can be added to Sales and Purchases.
+
+Examples:
+
+1. Validity of the offer.
+1. Payment Terms (In Advance, On Credit, part advance etc).
+1. What is extra (or payable by the Customer).
+1. Safety / usage warning.
+1. Warranty if any.
+1. Returns Policy.
+1. Terms of shipping, if applicable.
+1. Ways of addressing disputes, indemnity, liability, etc.
+1. Address and Contact of your Company.","Terma dan Syarat Standard yang boleh ditambah untuk Jualan dan Pembelian. Contoh: 1. Kesahan tawaran itu. 1. Terma Pembayaran (Dalam Advance, Mengenai Kredit, bahagian pendahuluan dan lain-lain). 1. Apakah tambahan (atau perlu dibayar oleh Pelanggan). 1. Keselamatan amaran / penggunaan. 1. Waranti jika ada. 1. Kembali Polisi. 1. Syarat-syarat penghantaran, jika berkenaan. 1. Cara-cara menangani pertikaian, tanggung rugi, kerugian, dan lain-lain 1. Alamat dan Contact Syarikat anda."
+DocType: Attendance,Leave Type,Cuti Jenis
+apps/erpnext/erpnext/controllers/stock_controller.py +172,Expense / Difference account ({0}) must be a 'Profit or Loss' account,Akaun perbelanjaan / Perbezaan ({0}) mestilah akaun &#39;Keuntungan atau Kerugian&#39;
+DocType: Account,Accounts User,pengguna Akaun-akaun
+DocType: Sales Invoice,"Check if recurring invoice, uncheck to stop recurring or put proper End Date","Periksa sama ada invois berulang, jangan tanda supaya berhenti atau meletakkan Tarikh Akhir betul"
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,Kehadiran bagi pekerja {0} telah ditandakan
+DocType: Packing Slip,If more than one package of the same type (for print),Jika lebih daripada satu bungkusan dari jenis yang sama (untuk cetak)
+apps/frappe/frappe/model/rename_doc.py +348,Maximum {0} rows allowed,Maksimum {0} baris dibenarkan
+DocType: C-Form Invoice Detail,Net Total,Jumlah bersih
+DocType: Bin,FCFS Rate,Kadar FCFS
+apps/erpnext/erpnext/accounts/page/pos/pos.js +15,Billing (Sales Invoice),Bil (Jualan Invois)
+DocType: Payment Reconciliation Invoice,Outstanding Amount,Jumlah yang tertunggak
+DocType: Project Task,Working,Kerja
+DocType: Stock Ledger Entry,Stock Queue (FIFO),Saham Queue (FIFO)
+apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +13,Please select Time Logs.,Sila pilih Time Log.
+apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +37,{0} does not belong to Company {1},{0} bukan milik Syarikat {1}
+DocType: Account,Round Off,Bundarkan
+,Requested Qty,Diminta Qty
+DocType: Tax Rule,Use for Shopping Cart,Gunakan untuk Troli
+DocType: BOM Item,Scrap %,Scrap%
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +38,"Charges will be distributed proportionately based on item qty or amount, as per your selection","Caj akan diagihkan mengikut kadar berdasarkan item qty atau amaunnya, seperti pilihan anda"
+DocType: Maintenance Visit,Purposes,Tujuan
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +103,Atleast one item should be entered with negative quantity in return document,Atleast perkara seseorang itu perlu dimasukkan dengan kuantiti negatif dalam dokumen pulangan
+apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +67,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","Operasi {0} lebih lama daripada mana-mana waktu kerja yang terdapat di stesen kerja {1}, memecahkan operasi ke dalam pelbagai operasi"
+,Requested,Diminta
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +66,No Remarks,Tidak Catatan
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +13,Overdue,Tertunggak
+DocType: Account,Stock Received But Not Billed,Saham Diterima Tetapi Tidak Membilkan
+DocType: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,Gaji kasar + Tunggakan Jumlah + Penunaian Jumlah - Jumlah Potongan
+DocType: Monthly Distribution,Distribution Name,Nama pengedaran
+DocType: Features Setup,Sales and Purchase,Jual Beli
+DocType: Supplier Quotation Item,Material Request No,Permintaan bahan Tidak
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +221,Quality Inspection required for Item {0},Pemeriksaan kualiti yang diperlukan untuk Perkara {0}
+DocType: Quotation,Rate at which customer's currency is converted to company's base currency,Kadar di mana pelanggan mata wang ditukar kepada mata wang asas syarikat
+apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +107,{0} has been successfully unsubscribed from this list.,{0} telah berjaya henti melanggan dari senarai ini.
+DocType: Purchase Invoice Item,Net Rate (Company Currency),Kadar bersih (Syarikat mata wang)
+apps/frappe/frappe/templates/base.html +134,Added,Ditambah
+apps/erpnext/erpnext/config/crm.py +81,Manage Territory Tree.,Mengurus Wilayah Tree.
+DocType: Journal Entry Account,Sales Invoice,Invois jualan
+DocType: Journal Entry Account,Party Balance,Baki pihak
+DocType: Sales Invoice Item,Time Log Batch,Masa Log Batch
+apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +437,Please select Apply Discount On,Sila pilih Memohon Diskaun Pada
+DocType: Company,Default Receivable Account,Default Akaun Belum Terima
+DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,Buat Bank Entry untuk jumlah gaji yang dibayar bagi kriteria yang dipilih di atas
+DocType: Stock Entry,Material Transfer for Manufacture,Pemindahan Bahan untuk Pembuatan
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +18,Discount Percentage can be applied either against a Price List or for all Price List.,Peratus diskaun boleh digunakan baik dengan menentang Senarai Harga atau untuk semua Senarai Harga.
+DocType: Purchase Invoice,Half-yearly,Setengah tahun
+apps/erpnext/erpnext/accounts/report/financial_statements.py +16,Fiscal Year {0} not found.,Tahun fiskal {0} tidak dijumpai.
+DocType: Bank Reconciliation,Get Relevant Entries,Dapatkan Entri Berkaitan
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +407,Accounting Entry for Stock,Catatan Perakaunan untuk Stok
+DocType: Sales Invoice,Sales Team1,Team1 Jualan
+apps/erpnext/erpnext/stock/doctype/item/item.py +416,Item {0} does not exist,Perkara {0} tidak wujud
+DocType: Sales Invoice,Customer Address,Alamat Pelanggan
+apps/frappe/frappe/desk/query_report.py +136,Total,Jumlah
+DocType: Purchase Invoice,Apply Additional Discount On,Memohon Diskaun tambahan On
+DocType: Account,Root Type,Jenis akar
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +84,Row # {0}: Cannot return more than {1} for Item {2},Row # {0}: Tidak boleh kembali lebih daripada {1} untuk Perkara {2}
+apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +52,Plot,Plot
+DocType: Item Group,Show this slideshow at the top of the page,Menunjukkan tayangan gambar ini di bahagian atas halaman
+DocType: BOM,Item UOM,Perkara UOM
+DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),Amaun Cukai Selepas Jumlah Diskaun (Syarikat mata wang)
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +149,Target warehouse is mandatory for row {0},Gudang sasaran adalah wajib untuk berturut-turut {0}
+DocType: Quality Inspection,Quality Inspection,Pemeriksaan Kualiti
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Extra Small,Tambahan Kecil
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +458,Warning: Material Requested Qty is less than Minimum Order Qty,Amaran: Bahan Kuantiti yang diminta adalah kurang daripada Minimum Kuantiti Pesanan
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +191,Account {0} is frozen,Akaun {0} dibekukan
+DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Undang-undang Entiti / Anak Syarikat dengan Carta berasingan Akaun milik Pertubuhan.
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","Makanan, Minuman &amp; Tembakau"
+apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +20,PL or BS,PL atau BS
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +531,Can only make payment against unbilled {0},Hanya boleh membuat pembayaran terhadap belum dibilkan {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +122,Commission rate cannot be greater than 100,Kadar Suruhanjaya tidak boleh lebih besar daripada 100
+apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Minimum Inventory Level,Tahap Inventori Minimum
+DocType: Stock Entry,Subcontract,Subkontrak
+apps/erpnext/erpnext/public/js/utils/party.js +121,Please enter {0} first,Sila masukkan {0} pertama
+DocType: Production Planning Tool,Get Items From Sales Orders,Dapatkan Item Dari Jualan Pesanan
+DocType: Production Order Operation,Actual End Time,Waktu Tamat Sebenar 
+DocType: Production Planning Tool,Download Materials Required,Muat turun Bahan Diperlukan
+DocType: Item,Manufacturer Part Number,Pengeluar Bahagian Bilangan
+DocType: Production Order Operation,Estimated Time and Cost,Anggaran Masa dan Kos
+DocType: Bin,Bin,Bin
+DocType: SMS Log,No of Sent SMS,Bilangan SMS dihantar
+DocType: Account,Company,Syarikat
+DocType: Account,Expense Account,Akaun Perbelanjaan
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +49,Software,Perisian
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Colour,Warna
+DocType: Maintenance Visit,Scheduled,Berjadual
+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",Sila pilih Item mana &quot;Apakah Saham Perkara&quot; adalah &quot;Tidak&quot; dan &quot;Adakah Item Jualan&quot; adalah &quot;Ya&quot; dan tidak ada Bundle Produk lain
+DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,Pilih Pengagihan Bulanan untuk tidak sekata mengedarkan sasaran seluruh bulan.
+DocType: Purchase Invoice Item,Valuation Rate,Kadar penilaian
+apps/erpnext/erpnext/stock/get_item_details.py +281,Price List Currency not selected,Senarai harga mata wang tidak dipilih
+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,Perkara Row {0}: Resit Pembelian {1} tidak wujud dalam jadual &#39;Pembelian Resit&#39; di atas
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +145,Employee {0} has already applied for {1} between {2} and {3},Pekerja {0} telah memohon untuk {1} antara {2} dan {3}
+apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Projek Tarikh Mula
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +8,Until,Sehingga
+DocType: Rename Tool,Rename Log,Log menamakan semula
+DocType: Installation Note Item,Against Document No,Terhadap Dokumen No
+apps/erpnext/erpnext/config/selling.py +98,Manage Sales Partners.,Mengurus Jualan Partners.
+DocType: Quality Inspection,Inspection Type,Jenis Pemeriksaan
+apps/erpnext/erpnext/controllers/recurring_document.py +162,Please select {0},Sila pilih {0}
+DocType: C-Form,C-Form No,C-Borang No
+DocType: BOM,Exploded_items,Exploded_items
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Researcher,Penyelidik
+apps/frappe/frappe/custom/doctype/customize_form/customize_form.js +88,Update,Update
+apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +78,Please save the Newsletter before sending,Sila simpan Newsletter sebelum menghantar
+apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +23,Name or Email is mandatory,Nama atau E-mel adalah wajib
+apps/erpnext/erpnext/config/stock.py +74,Incoming quality inspection.,Pemeriksaan kualiti yang masuk.
+DocType: Purchase Order Item,Returned Qty,Kembali Kuantiti
+DocType: Employee,Exit,Keluar
+apps/erpnext/erpnext/accounts/doctype/account/account.py +134,Root Type is mandatory,Jenis akar adalah wajib
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +295,Serial No {0} created,No siri {0} dicipta
+DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","Untuk kemudahan pelanggan, kod-kod ini boleh digunakan dalam format cetak seperti Invois dan Nota Penghantaran"
+DocType: Employee,You can enter any date manually,Anda boleh memasuki mana-mana tarikh secara manual
+DocType: Sales Invoice,Advertisement,Iklan
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Probationary Period,Tempoh Percubaan
+DocType: Customer Group,Only leaf nodes are allowed in transaction,Hanya nod daun dibenarkan dalam urus niaga
+DocType: Expense Claim,Expense Approver,Perbelanjaan Pelulus
+DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,Resit Pembelian Item Dibekalkan
+apps/erpnext/erpnext/public/js/pos/pos.js +343,Pay,Bayar
+apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +17,To Datetime,Untuk datetime
+DocType: SMS Settings,SMS Gateway URL,URL SMS Gateway
+apps/erpnext/erpnext/config/crm.py +53,Logs for maintaining sms delivery status,Log bagi mengekalkan status penghantaran sms
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +36,Pending Activities,Sementara menunggu Aktiviti
+apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,Confirmed,Disahkan
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier > Supplier Type,Pembekal&gt; Jenis Pembekal
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +127,Please enter relieving date.,Sila masukkan tarikh melegakan.
+apps/erpnext/erpnext/controllers/trends.py +137,Amt,AMT
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +51,Only Leave Applications with status 'Approved' can be submitted,Hanya Tinggalkan Permohonan dengan status &#39;diluluskan&#39; boleh dikemukakan
+apps/erpnext/erpnext/utilities/doctype/address/address.py +21,Address Title is mandatory.,Alamat Tajuk adalah wajib.
+DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,Masukkan nama kempen jika sumber siasatan adalah kempen
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +38,Newspaper Publishers,Akhbar Penerbit
+apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,Pilih Tahun Anggaran
+apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Pesanan semula Level
+DocType: Attendance,Attendance Date,Kehadiran Tarikh
+DocType: Salary Structure,Salary breakup based on Earning and Deduction.,Perpecahan gaji berdasarkan Pendapatan dan Potongan.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +103,Account with child nodes cannot be converted to ledger,Akaun dengan nod kanak-kanak tidak boleh ditukar ke lejar
+DocType: Address,Preferred Shipping Address,Pilihan Alamat Penghantaran
+DocType: Purchase Receipt Item,Accepted Warehouse,Gudang Diterima
+DocType: Bank Reconciliation Detail,Posting Date,Penempatan Tarikh
+DocType: Item,Valuation Method,Kaedah Penilaian
+DocType: Sales Invoice,Sales Team,Pasukan Jualan
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +81,Duplicate entry,Entri pendua
+DocType: Serial No,Under Warranty,Di bawah Waranti
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +414,[Error],[Ralat]
+DocType: Sales Order,In Words will be visible once you save the Sales Order.,Dalam Perkataan akan dapat dilihat selepas anda menyimpan Perintah Jualan.
+,Employee Birthday,Pekerja Hari Lahir
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,Modal Teroka
+DocType: UOM,Must be Whole Number,Mesti Nombor Seluruh
+DocType: Leave Control Panel,New Leaves Allocated (In Days),Daun baru Diperuntukkan (Dalam Hari)
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +51,Serial No {0} does not exist,No siri {0} tidak wujud
+DocType: Pricing Rule,Discount Percentage,Peratus diskaun
+DocType: Payment Reconciliation Invoice,Invoice Number,Nombor invois
+apps/erpnext/erpnext/hooks.py +54,Orders,Pesanan
+DocType: Leave Control Panel,Employee Type,Jenis Pekerja
+DocType: Employee Leave Approver,Leave Approver,Tinggalkan Pelulus
+DocType: Manufacturing Settings,Material Transferred for Manufacture,Bahan Dipindahkan untuk Pembuatan
+DocType: Expense Claim,"A user with ""Expense Approver"" role","Pengguna dengan Peranan ""Pelulus Perbelanjaan"" "
+,Issued Items Against Production Order,Barangan yang dikeluarkan Terhadap Perintah Pengeluaran
+DocType: Pricing Rule,Purchase Manager,Pembelian Pengurus
+DocType: Payment Tool,Payment Tool,Alat pembayaran
+DocType: Target Detail,Target Detail,Detail Sasaran
+DocType: Sales Order,% of materials billed against this Sales Order,% bahan-bahan yang dibilkan terhadap Pesanan Jualan ini
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +50,Period Closing Entry,Kemasukan Tempoh Penutup
+apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +62,Cost Center with existing transactions can not be converted to group,PTJ dengan urus niaga yang sedia ada tidak boleh ditukar kepada kumpulan
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Depreciation,Susutnilai
+apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Pembekal (s)
+DocType: Customer,Credit Limit,Had Kredit
+apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,Pilih jenis transaksi
+DocType: GL Entry,Voucher No,Baucer Tiada
+DocType: Leave Allocation,Leave Allocation,Tinggalkan Peruntukan
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +396,Material Requests {0} created,Permintaan bahan {0} dicipta
+apps/erpnext/erpnext/config/selling.py +122,Template of terms or contract.,Templat istilah atau kontrak.
+DocType: Customer,Address and Contact,Alamat dan Perhubungan
+DocType: Customer,Last Day of the Next Month,Hari terakhir Bulan Depan
+DocType: Employee,Feedback,Maklumbalas
+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}","Cuti yang tidak boleh diperuntukkan sebelum {0}, sebagai baki cuti telah pun dibawa dikemukakan dalam rekod peruntukan cuti masa depan {1}"
+apps/erpnext/erpnext/accounts/party.py +284,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Nota: Disebabkan Tarikh / Rujukan melebihi dibenarkan hari kredit pelanggan dengan {0} hari (s)
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +632,Maint. Schedule,Maint. Jadual
+DocType: Stock Settings,Freeze Stock Entries,Freeze Saham Penyertaan
+DocType: Website Settings,Website Settings,Tetapan laman web
+DocType: Item,Reorder level based on Warehouse,Tahap pesanan semula berdasarkan Warehouse
+DocType: Activity Cost,Billing Rate,Kadar bil
+,Qty to Deliver,Qty untuk Menyampaikan
+DocType: Monthly Distribution Percentage,Month,Bulan
+,Stock Analytics,Saham Analytics
+DocType: Installation Note Item,Against Document Detail No,Terhadap Detail Dokumen No
+DocType: Quality Inspection,Outgoing,Keluar
+DocType: Material Request,Requested For,Diminta Untuk
+DocType: Quotation Item,Against Doctype,Terhadap DOCTYPE
+DocType: Delivery Note,Track this Delivery Note against any Project,Jejaki Penghantaran Nota ini terhadap mana-mana Projek
+apps/erpnext/erpnext/accounts/doctype/account/account.py +169,Root account can not be deleted,Akaun akar tidak boleh dihapuskan
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +75,Show Stock Entries,Show Saham Penyertaan
+,Is Primary Address,Adakah Alamat Utama
+DocType: Production Order,Work-in-Progress Warehouse,Kerja dalam Kemajuan Gudang
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Reference #{0} dated {1},Rujukan # {0} bertarikh {1}
+apps/erpnext/erpnext/templates/includes/cart/cart_address.html +13,Manage Addresses,Mengurus Alamat
+DocType: Pricing Rule,Item Code,Kod Item
+DocType: Production Planning Tool,Create Production Orders,Buat Pesanan Pengeluaran
+DocType: Serial No,Warranty / AMC Details,Waranti / AMC Butiran
+DocType: Journal Entry,User Remark,Catatan pengguna
+DocType: Lead,Market Segment,Segmen pasaran
+DocType: Communication,Phone,Telefon
+DocType: Employee Internal Work History,Employee Internal Work History,Pekerja Dalam Sejarah Kerja
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +221,Closing (Dr),Penutup (Dr)
+DocType: Contact,Passive,Pasif
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,No siri {0} tidak dalam stok
+apps/erpnext/erpnext/config/selling.py +127,Tax template for selling transactions.,Template cukai untuk menjual transaksi.
+DocType: Sales Invoice,Write Off Outstanding Amount,Tulis Off Cemerlang Jumlah
+DocType: Features Setup,"Check if you need automatic recurring invoices. After submitting any sales invoice, Recurring section will be visible.","Semak jika anda memerlukan invois berulang automatik. Selepas menyerahkan sebarang invois jualan, seksyen berulang akan dapat dilihat."
+DocType: Account,Accounts Manager,Pengurus Akaun-akaun
+apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +39,Time Log {0} must be 'Submitted',Masa Log {0} mesti &#39;Dihantar&#39;
+DocType: Stock Settings,Default Stock UOM,Default Saham UOM
+DocType: Time Log,Costing Rate based on Activity Type (per hour),Kos Kadar berdasarkan Jenis Aktiviti (sejam)
+DocType: Production Planning Tool,Create Material Requests,Buat Permintaan Bahan
+DocType: Employee Education,School/University,Sekolah / Universiti
+DocType: Sales Invoice Item,Available Qty at Warehouse,Kuantiti didapati di Gudang
+,Billed Amount,Jumlah dibilkan
+DocType: Bank Reconciliation,Bank Reconciliation,Penyesuaian Bank
+apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +9,Get Updates,Dapatkan Maklumat Terbaru
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +133,Material Request {0} is cancelled or stopped,Permintaan bahan {0} dibatalkan atau dihentikan
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Add a few sample records,Tambah rekod sampel beberapa
+apps/erpnext/erpnext/config/hr.py +210,Leave Management,Tinggalkan Pengurusan
+DocType: Event,Groups,Kumpulan
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,Kumpulan dengan Akaun
+DocType: Sales Order,Fully Delivered,Dihantar sepenuhnya
+DocType: Lead,Lower Income,Pendapatan yang lebih rendah
+DocType: Period Closing Voucher,"The account head under Liability, in which Profit/Loss will be booked","Ketua akaun di bawah Liabiliti, di mana Keuntungan / Kerugian akan diberikan kad"
+DocType: Payment Tool,Against Vouchers,Terhadap Baucar
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +23,Quick Help,Bantuan Pantas
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +168,Source and target warehouse cannot be same for row {0},Sumber dan sasaran gudang tidak boleh sama berturut-turut untuk {0}
+DocType: Features Setup,Sales Extras,Jualan Tambahan
+apps/erpnext/erpnext/accounts/utils.py +344,{0} budget for Account {1} against Cost Center {2} will exceed by {3},{0} bajet untuk Akaun {1} terhadap Kos Pusat {2} akan berlebihan sebanyak {3}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +236,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Akaun perbezaan mestilah akaun jenis Aset / Liabiliti, kerana ini adalah Penyesuaian Saham Masuk Pembukaan"
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Order number required for Item {0},Membeli nombor Perintah diperlukan untuk Perkara {0}
+apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date','Dari Tarikh' mesti selepas 'Sehingga'
+,Stock Projected Qty,Saham Unjuran Qty
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +150,Customer {0} does not belong to project {1},Pelanggan {0} bukan milik projek {1}
+DocType: Sales Order,Customer's Purchase Order,Pesanan Pelanggan
+DocType: Warranty Claim,From Company,Daripada Syarikat
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,Nilai atau Qty
+apps/erpnext/erpnext/public/js/setup_wizard.js +363,Minute,Saat
+DocType: Purchase Invoice,Purchase Taxes and Charges,Membeli Cukai dan Caj
+,Qty to Receive,Qty untuk Menerima
+DocType: Leave Block List,Leave Block List Allowed,Tinggalkan Sekat Senarai Dibenarkan
+apps/erpnext/erpnext/public/js/setup_wizard.js +108,You will use it to Login,Anda akan menggunakannya untuk Login
+DocType: Sales Partner,Retailer,Peruncit
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +99,Credit To account must be a Balance Sheet account,Kredit Untuk akaun perlu menjadi akaun Kunci Kira-kira
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,Semua Jenis Pembekal
+apps/erpnext/erpnext/stock/doctype/item/item.py +37,Item Code is mandatory because Item is not automatically numbered,Kod Item adalah wajib kerana Perkara tidak bernombor secara automatik
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +93,Quotation {0} not of type {1},Sebut Harga {0} bukan jenis {1}
+DocType: Maintenance Schedule Item,Maintenance Schedule Item,Penyelenggaraan Jadual Perkara
+DocType: Sales Order,%  Delivered,% Dihantar
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,Bank Overdraft Account,Akaun Overdraf bank
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +15,Make Salary Slip,Membuat Slip Gaji
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +18,Browse BOM,Browse BOM
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +175,Secured Loans,Pinjaman Bercagar
+apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +3,Awesome Products,Produk Awesome
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +189,Opening Balance Equity,Pembukaan Ekuiti Baki
+DocType: Appraisal,Appraisal,Penilaian
+apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +22,Date is repeated,Tarikh diulang
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +162,Leave approver must be one of {0},Tinggalkan Pelulus mestilah salah seorang daripada {0}
+DocType: Hub Settings,Seller Email,Penjual E-mel
+DocType: Project,Total Purchase Cost (via Purchase Invoice),Jumlah Kos Pembelian (melalui Invois Belian)
+DocType: Workstation Working Hour,Start Time,Waktu Mula
+DocType: Item Price,Bulk Import Help,Bulk Bantuan Import
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +200,Select Quantity,Pilih Kuantiti
+apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,Meluluskan Peranan tidak boleh sama dengan peranan peraturan adalah Terpakai Untuk
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +66,Unsubscribe from this Email Digest,Menghentikan langganan E-Digest
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +36,Message Sent,Mesej dihantar
+DocType: Production Plan Sales Order,SO Date,SO Tarikh
+DocType: Sales Invoice,Rate at which Price list currency is converted to customer's base currency,Kadar di mana Senarai harga mata wang ditukar kepada mata wang asas pelanggan
+DocType: Purchase Invoice Item,Net Amount (Company Currency),Jumlah Bersih (Syarikat mata wang)
+DocType: BOM Operation,Hour Rate,Kadar jam
+DocType: Stock Settings,Item Naming By,Perkara Menamakan Dengan
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +655,From Quotation,Dari Sebut Harga
+apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},Satu lagi Entry Tempoh Penutup {0} telah dibuat selepas {1}
+DocType: Production Order,Material Transferred for Manufacturing,Bahan Dipindahkan untuk Pembuatan
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +29,Account {0} does not exists,Akaun {0} tidak wujud
+DocType: Purchase Receipt Item,Purchase Order Item No,Pesanan Pembelian Item No
+DocType: System Settings,System Settings,Tetapan sistem
+DocType: Project,Project Type,Jenis Projek
+apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,Qty sasaran atau sasaran jumlah sama ada adalah wajib.
+apps/erpnext/erpnext/config/projects.py +38,Cost of various activities,Kos pelbagai aktiviti
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +101,Not allowed to update stock transactions older than {0},Tidak dibenarkan untuk mengemaskini transaksi saham lebih tua daripada {0}
+DocType: Item,Inspection Required,Pemeriksaan Diperlukan
+DocType: Purchase Invoice Item,PR Detail,Detail PR
+DocType: Sales Order,Fully Billed,Membilkan sepenuhnya
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +20,Cash In Hand,Tunai Dalam Tangan
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +119,Delivery warehouse required for stock item {0},Gudang penghantaran diperlukan untuk item stok {0}
+DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),Berat kasar pakej. Biasanya berat bersih + pembungkusan berat badan yang ketara. (Untuk cetak)
+DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Pengguna dengan peranan ini dibenarkan untuk menetapkan akaun beku dan mencipta / mengubahsuai entri perakaunan terhadap akaun beku
+DocType: Serial No,Is Cancelled,Apakah Dibatalkan
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +286,My Shipments,Penghantaran saya
+DocType: Journal Entry,Bill Date,Rang Undang-Undang Tarikh
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +43,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","Walaupun terdapat beberapa Peraturan Harga dengan keutamaan tertinggi, keutamaan dalaman maka berikut digunakan:"
+DocType: Supplier,Supplier Details,Butiran Pembekal
+DocType: Communication,Recipients,Penerima
+DocType: Expense Claim,Approval Status,Kelulusan Status
+DocType: Hub Settings,Publish Items to Hub,Menerbitkan item untuk Hub
+apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +44,From value must be less than to value in row {0},Dari nilai boleh kurang daripada nilai berturut-turut {0}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +133,Wire Transfer,Wire Transfer
+apps/erpnext/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py +25,Please select Bank Account,Sila pilih Akaun Bank
+DocType: Newsletter,Create and Send Newsletters,Buat dan Hantar Surat Berita
+apps/frappe/frappe/public/js/frappe/views/reports/grid_report.js +305,From Date must be before To Date,Dari Tarikh mesti sebelum Dating
+DocType: Sales Order,Recurring Order,Pesanan berulang
+DocType: Company,Default Income Account,Akaun Pendapatan Default
+apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,Kumpulan pelanggan / Pelanggan
+DocType: Item Group,Check this if you want to show in website,Semak ini jika anda mahu untuk menunjukkan di laman web
+,Welcome to ERPNext,Selamat datang ke ERPNext
+DocType: Payment Reconciliation Payment,Voucher Detail Number,Baucer Nombor Detail
+apps/erpnext/erpnext/config/crm.py +146,Lead to Quotation,Membawa kepada Sebut Harga
+DocType: Lead,From Customer,Daripada Pelanggan
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Calls,Panggilan
+DocType: Project,Total Costing Amount (via Time Logs),Jumlah Kos (melalui Time Log)
+DocType: Purchase Order Item Supplied,Stock UOM,Saham UOM
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +194,Purchase Order {0} is not submitted,Pesanan Pembelian {0} tidak dikemukakan
+,Projected,Unjuran
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},No siri {0} bukan milik Gudang {1}
+apps/erpnext/erpnext/controllers/status_updater.py +136,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Nota: Sistem tidak akan memeriksa terlebih penghantaran dan lebih-tempahan untuk Perkara {0} sebagai kuantiti atau jumlah adalah 0
+DocType: Notification Control,Quotation Message,Sebut Harga Mesej
+DocType: Issue,Opening Date,Tarikh pembukaan
+DocType: Journal Entry,Remark,Catatan
+DocType: Purchase Receipt Item,Rate and Amount,Kadar dan Jumlah
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +667,From Sales Order,Dari Jualan Pesanan
+DocType: Blog Category,Parent Website Route,Ibu Bapa Laman Web Laluan
+DocType: Sales Order,Not Billed,Tidak Membilkan
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +107,Both Warehouse must belong to same Company,Kedua-dua Gudang mestilah berada dalam Syarikat sama
+apps/erpnext/erpnext/public/js/templates/contact_list.html +31,No contacts added yet.,Ada kenalan yang ditambahkan lagi.
+apps/frappe/frappe/workflow/doctype/workflow/workflow_list.js +7,Not active,Tidak aktif
+DocType: Purchase Receipt Item,Landed Cost Voucher Amount,Kos mendarat Baucer Jumlah
+DocType: Time Log,Batched for Billing,Berkumpulan untuk Billing
+apps/erpnext/erpnext/config/accounts.py +23,Bills raised by Suppliers.,Rang Undang-undang yang dibangkitkan oleh Pembekal.
+DocType: POS Profile,Write Off Account,Tulis Off Akaun
+apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount Amount,Jumlah diskaun
+DocType: Purchase Invoice,Return Against Purchase Invoice,Kembali Terhadap Invois Belian
+DocType: Item,Warranty Period (in days),Tempoh jaminan (dalam hari)
+apps/erpnext/erpnext/public/js/setup_wizard.js +292,e.g. VAT,contohnya VAT
+apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,Perkara 4
+DocType: Journal Entry Account,Journal Entry Account,Akaun Entry jurnal
+DocType: Shopping Cart Settings,Quotation Series,Sebutharga Siri
+apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +52,"An item exists with same name ({0}), please change the item group name or rename the item","Item wujud dengan nama yang sama ({0}), sila tukar nama kumpulan item atau menamakan semula item"
+DocType: Sales Order Item,Sales Order Date,Pesanan Jualan Tarikh
+DocType: Sales Invoice Item,Delivered Qty,Dihantar Qty
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +63,Warehouse {0}: Company is mandatory,Gudang {0}: Syarikat adalah wajib
+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.",Pergi ke kumpulan yang sesuai (biasanya Sumber Dana&gt; Liabiliti Semasa&gt; Cukai dan Tugas dan membuat Akaun baru (dengan mengklik Tambah Kanak-kanak) jenis &quot;Cukai&quot; dan melakukan menyebut kadar Cukai.
+,Payment Period Based On Invoice Date,Tempoh Pembayaran Berasaskan Tarikh Invois
+apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +50,Missing Currency Exchange Rates for {0},Hilang Mata Wang Kadar Pertukaran untuk {0}
+DocType: Event,Monday,Isnin
+DocType: Journal Entry,Stock Entry,Saham Entry
+DocType: Account,Payable,Kena dibayar
+DocType: Salary Slip,Arrear Amount,Jumlah tunggakan
+apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,Pelanggan Baru
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +68,Gross Profit %,Keuntungan kasar%
+DocType: Appraisal Goal,Weightage (%),Wajaran (%)
+DocType: Bank Reconciliation Detail,Clearance Date,Clearance Tarikh
+DocType: Newsletter,Newsletter List,Senarai Newsletter
+DocType: Process Payroll,Check if you want to send salary slip in mail to each employee while submitting salary slip,Semak jika anda ingin menghantar slip gaji mel kepada setiap pekerja semasa menyerahkan slip gaji
+DocType: Lead,Address Desc,Alamat Deskripsi
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +33,Atleast one of the Selling or Buying must be selected,Atleast salah satu atau Jualan Membeli mesti dipilih
+apps/erpnext/erpnext/config/manufacturing.py +34,Where manufacturing operations are carried.,Tempat operasi pembuatan dijalankan.
+DocType: Page,All,Semua
+DocType: Stock Entry Detail,Source Warehouse,Sumber Gudang
+DocType: Installation Note,Installation Date,Tarikh pemasangan
+DocType: Employee,Confirmation Date,Pengesahan Tarikh
+DocType: C-Form,Total Invoiced Amount,Jumlah Invois
+DocType: Account,Sales User,Jualan Pengguna
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +46,Min Qty can not be greater than Max Qty,Min Qty tidak boleh lebih besar daripada Max Qty
+DocType: Stock Entry,Customer or Supplier Details,Pelanggan atau pembekal dan
+apps/frappe/frappe/core/page/permission_manager/permission_manager.js +428,Set,Tetapkan
+DocType: Lead,Lead Owner,Lead Pemilik
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +248,Warehouse is required,Gudang diperlukan
+DocType: Employee,Marital Status,Status Perkahwinan
+DocType: Stock Settings,Auto Material Request,Bahan Auto Permintaan
+DocType: Time Log,Will be updated when billed.,Akan dikemaskinikan apabila ditaksir.
+DocType: Delivery Note Item,Available Batch Qty at From Warehouse,Disediakan Kuantiti Batch di Dari Gudang
+apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +25,Current BOM and New BOM can not be same,BOM semasa dan New BOM tidak boleh sama
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +111,Date Of Retirement must be greater than Date of Joining,Tarikh Persaraan mesti lebih besar daripada Tarikh Menyertai
+DocType: Sales Invoice,Against Income Account,Terhadap Akaun Pendapatan
+apps/erpnext/erpnext/controllers/website_list_for_contact.py +69,{0}% Delivered,{0}% Dihantar
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Perkara {0}: qty Mengarahkan {1} tidak boleh kurang daripada perintah qty minimum {2} (ditakrifkan dalam Perkara).
+DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Taburan Peratus Bulanan
+DocType: Territory,Territory Targets,Sasaran Wilayah
+DocType: Delivery Note,Transporter Info,Maklumat Transporter
+DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,Pesanan Pembelian Item Dibekalkan
+apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,Ketua surat untuk template cetak.
+apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,Tajuk untuk template cetak seperti Proforma Invois.
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +140,Valuation type charges can not marked as Inclusive,Caj jenis penilaian tidak boleh ditandakan sebagai Inclusive
+DocType: POS Profile,Update Stock,Update Saham
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,UOM berbeza untuk perkara akan membawa kepada tidak betul (Jumlah) Nilai Berat Bersih. Pastikan Berat bersih setiap item adalah dalam UOM yang sama.
+apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,Kadar BOM
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +85,Please pull items from Delivery Note,Sila tarik item daripada Nota Penghantaran
+apps/erpnext/erpnext/accounts/utils.py +268,Journal Entries {0} are un-linked,Jurnal Penyertaan {0} adalah un berkaitan
+apps/erpnext/erpnext/config/crm.py +37,"Record of all communications of type email, phone, chat, visit, etc.","Rekod semua komunikasi e-mel jenis, telefon, chat, keindahan, dan lain-lain"
+apps/erpnext/erpnext/accounts/general_ledger.py +134,Please mention Round Off Cost Center in Company,Sila menyebut Round Off PTJ dalam Syarikat
+DocType: Purchase Invoice,Terms,Syarat
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +242,Create New,Buat Baru
+DocType: Buying Settings,Purchase Order Required,Pesanan Pembelian Diperlukan
+,Item-wise Sales History,Perkara-bijak Sejarah Jualan
+DocType: Expense Claim,Total Sanctioned Amount,Jumlah Diiktiraf
+,Purchase Analytics,Analytics Pembelian
+DocType: Sales Invoice Item,Delivery Note Item,Penghantaran Nota Perkara
+DocType: Expense Claim,Task,Petugas
+DocType: Purchase Taxes and Charges,Reference Row #,Rujukan Row #
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},Nombor batch adalah wajib bagi Perkara {0}
+apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js +14,This is a root sales person and cannot be edited.,Ini adalah orang jualan akar dan tidak boleh diedit.
+,Stock Ledger,Saham Lejar
+apps/erpnext/erpnext/templates/pages/order.html +59,Rate: {0},Kadar: {0}
+DocType: Salary Slip Deduction,Salary Slip Deduction,Gaji Slip Potongan
+apps/frappe/frappe/desk/doctype/note/note_list.js +3,Notes,Nota
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +199,Select a group node first.,Pilih nod kumpulan pertama.
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +74,Purpose must be one of {0},Tujuan mestilah salah seorang daripada {0}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +108,Fill the form and save it,Isi borang dan simpannya
+DocType: Production Planning Tool,Download a report containing all raw materials with their latest inventory status,Muat turun laporan yang mengandungi semua bahan-bahan mentah dengan status inventori terbaru mereka
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,Komuniti Forum
+DocType: Leave Application,Leave Balance Before Application,Tinggalkan Baki Sebelum Permohonan
+DocType: SMS Center,Send SMS,Hantar SMS
+DocType: Company,Default Letter Head,Surat Ketua Default
+DocType: Time Log,Billable,Dapat ditaksir
+DocType: Account,Rate at which this tax is applied,Kadar yang cukai ini dikenakan
+apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reorder Qty,Pesanan semula Qty
+DocType: Company,Stock Adjustment Account,Akaun Pelarasan saham
+DocType: Journal Entry,Write Off,Tulis Off
+DocType: Time Log,Operation ID,ID Operasi
+DocType: Employee,"System User (login) ID. If set, it will become default for all HR forms.","Sistem Pengguna (log masuk) ID. Jika ditetapkan, ia akan menjadi lalai untuk semua bentuk HR."
+apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}: Dari {1}
+DocType: Task,depends_on,depends_on
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +86,Opportunity Lost,Peluang Hilang
+DocType: Features Setup,"Discount Fields will be available in Purchase Order, Purchase Receipt, Purchase Invoice","Bidang diskaun boleh didapati dalam Pesanan Belian, Resit Pembelian, Invois Belian"
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +208,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,Nama Akaun baru. Nota: Sila jangan membuat akaun untuk Pelanggan dan Pembekal
+DocType: Report,Report Type,Jenis Laporan
+apps/frappe/frappe/core/doctype/user/user.js +130,Loading,Loading
+DocType: BOM Replace Tool,BOM Replace Tool,BOM Ganti Alat
+apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,Negara lalai bijak Templat Alamat
+DocType: Sales Order Item,Supplier delivers to Customer,Pembekal menyampaikan kepada Pelanggan
+apps/erpnext/erpnext/public/js/controllers/transaction.js +726,Show tax break-up,Show cukai Perpecahan
+apps/erpnext/erpnext/accounts/party.py +287,Due / Reference Date cannot be after {0},Oleh kerana / Rujukan Tarikh dan boleh dikenakan {0}
+apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,Data Import dan Eksport
+DocType: Features Setup,If you involve in manufacturing activity. Enables Item 'Is Manufactured',Jika anda terlibat dalam aktiviti pembuatan. Membolehkan Perkara &#39;dihasilkan&#39;
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +54,Invoice Posting Date,Posting Invois Tarikh
+DocType: Sales Invoice,Rounded Total,Bulat Jumlah
+DocType: Product Bundle,List items that form the package.,Senarai item yang membentuk pakej.
+apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,Peratus Peruntukan hendaklah sama dengan 100%
+DocType: Serial No,Out of AMC,Daripada AMC
+DocType: Purchase Order Item,Material Request Detail No,Permintaan Detail Bahan Tidak
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +33,Make Maintenance Visit,Buat Penyelenggaraan Lawatan
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +187,Please contact to the user who have Sales Master Manager {0} role,Sila hubungi untuk pengguna yang mempunyai Master Pengurus Jualan {0} peranan
+DocType: Company,Default Cash Account,Akaun Tunai Default
+apps/erpnext/erpnext/config/accounts.py +79,Company (not Customer or Supplier) master.,Syarikat (tidak Pelanggan atau Pembekal) induk.
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +100,Please enter 'Expected Delivery Date',Sila masukkan &#39;Jangkaan Tarikh Penghantaran&#39;
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +182,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Nota Penghantaran {0} hendaklah dibatalkan sebelum membatalkan Perintah Jualan ini
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +373,Paid amount + Write Off Amount can not be greater than Grand Total,Amaun yang dibayar + Tulis Off Jumlah tidak boleh lebih besar daripada Jumlah Besar
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} bukan Nombor Kumpulan sah untuk Perkara {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +124,Note: There is not enough leave balance for Leave Type {0},Nota: Tidak ada baki cuti yang cukup untuk Cuti Jenis {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.","Nota: Jika bayaran tidak dibuat terhadap mana-mana rujukan, membuat Journal Kemasukan secara manual."
+DocType: Item,Supplier Items,Item Pembekal
+DocType: Opportunity,Opportunity Type,Jenis Peluang
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +42,New Company,Syarikat Baru
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +56,Cost Center is required for 'Profit and Loss' account {0},Pusat Kos yang diperlukan untuk &#39;Untung Rugi akaun {0}
+apps/erpnext/erpnext/setup/doctype/company/delete_company_transactions.py +17,Transactions can only be deleted by the creator of the Company,Urusniaga hanya boleh dihapuskan oleh pencipta Syarikat
+apps/erpnext/erpnext/accounts/general_ledger.py +21,Incorrect number of General Ledger Entries found. You might have selected a wrong Account in the transaction.,Jumlah yang tidak betul Lejar Am Penyertaan dijumpai. Anda mungkin telah memilih Akaun salah dalam urus niaga.
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +31,To create a Bank Account,Untuk membuat Akaun Bank
+DocType: Hub Settings,Publish Availability,Terbitkan Ketersediaan
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +105,Date of Birth cannot be greater than today.,Tarikh Lahir tidak boleh lebih besar daripada hari ini.
+,Stock Ageing,Saham Penuaan
+apps/erpnext/erpnext/controllers/accounts_controller.py +201,{0} '{1}' is disabled,{0} '{1}' dinyahupayakan
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Ditetapkan sebagai Open
+DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Hantar e-mel automatik ke Kenalan ke atas urus niaga Mengemukakan.
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +232,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
+					Available Qty: {4}, Transfer Qty: {5}","Row {0}: Qty tidak avalable dalam gudang {1} pada {2} {3}. Terdapat Kuantiti: {4}, Pemindahan Kuantiti: {5}"
+apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,Perkara 3
+DocType: Purchase Order,Customer Contact Email,Pelanggan Hubungi E-mel
+DocType: Event,Sunday,Ahad
+DocType: Sales Team,Contribution (%),Sumbangan (%)
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +457,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,Nota: Entry Bayaran tidak akan diwujudkan sejak &#39;Tunai atau Akaun Bank tidak dinyatakan
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +171,Responsibilities,Tanggungjawab
+apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Template,Template
+DocType: Sales Person,Sales Person Name,Orang Jualan Nama
+apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,Sila masukkan atleast 1 invois dalam jadual di
+apps/erpnext/erpnext/public/js/setup_wizard.js +255,Add Users,Tambah Pengguna
+DocType: Pricing Rule,Item Group,Perkara Kumpulan
+DocType: Task,Actual Start Date (via Time Logs),Tarikh Mula Sebenar (melalui Log Masa)
+DocType: Stock Reconciliation Item,Before reconciliation,Sebelum perdamaian
+apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +12,To {0},Untuk {0}
+DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Cukai dan Caj Ditambah (Syarikat mata wang)
+apps/erpnext/erpnext/stock/doctype/item/item.py +344,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Row Perkara Cukai {0} mesti mempunyai akaun Cukai jenis atau Pendapatan atau Perbelanjaan atau bercukai
+DocType: Sales Order,Partly Billed,Sebahagiannya Membilkan
+DocType: Item,Default BOM,BOM Default
+apps/erpnext/erpnext/setup/doctype/company/company.js +22,Please re-type company name to confirm,Sila taip semula nama syarikat untuk mengesahkan
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,Jumlah Cemerlang AMT
+DocType: Time Log Batch,Total Hours,Jumlah Jam
+DocType: Journal Entry,Printing Settings,Tetapan Percetakan
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +258,Total Debit must be equal to Total Credit. The difference is {0},Jumlah Debit mesti sama dengan Jumlah Kredit. Perbezaannya ialah {0}
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,Automotif
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +684,From Delivery Note,Dari Penghantaran Nota
+DocType: Time Log,From Time,Dari Masa
+DocType: Notification Control,Custom Message,Custom Mesej
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,Perbankan Pelaburan
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +316,"Select your Country, Time Zone and Currency","Pilih Negara anda, Time Zone dan mata wang"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +369,Cash or Bank Account is mandatory for making payment entry,Tunai atau Bank Akaun adalah wajib untuk membuat catatan pembayaran
+DocType: Purchase Invoice,Price List Exchange Rate,Senarai Harga Kadar Pertukaran
+DocType: Purchase Invoice Item,Rate,Kadar
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Intern,Pelatih
+DocType: Newsletter,A Lead with this email id should exist,Satu Broker dengan id e-mel ini perlu wujud
+DocType: Stock Entry,From BOM,Dari BOM
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +34,Basic,Asas
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,Transaksi saham sebelum {0} dibekukan
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +217,Please click on 'Generate Schedule',Sila klik pada &#39;Menjana Jadual&#39;
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +61,To Date should be same as From Date for Half Day leave,Tarikh harus sama seperti Dari Tarikh untuk cuti Hari Separuh
+apps/erpnext/erpnext/config/stock.py +110,"e.g. Kg, Unit, Nos, m","contohnya Kg, Unit, No, m"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +96,Reference No is mandatory if you entered Reference Date,Rujukan adalah wajib jika anda masukkan Tarikh Rujukan
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +108,Date of Joining must be greater than Date of Birth,Tarikh Menyertai mesti lebih besar daripada Tarikh Lahir
+DocType: Salary Structure,Salary Structure,Struktur gaji
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +246,"Multiple Price Rule exists with same criteria, please resolve \
+			conflict by assigning priority. Price Rules: {0}","Peraturan Harga Multiple wujud dengan kriteria yang sama, sila menyelesaikan \ konflik dengan memberikan keutamaan. Peraturan Harga: {0}"
+DocType: Account,Bank,Bank
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,Syarikat Penerbangan
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +493,Issue Material,Isu Bahan
+DocType: Material Request Item,For Warehouse,Untuk Gudang
+DocType: Employee,Offer Date,Tawaran Tarikh
+DocType: Hub Settings,Access Token,Token Akses 
+DocType: Sales Invoice Item,Serial No,No siri
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +144,Please enter Maintaince Details first,Sila masukkan Maintaince Butiran pertama
+DocType: Item,Is Fixed Asset Item,Adalah tetap Aset Perkara
+DocType: Stock Entry,Including items for sub assemblies,Termasuk perkara untuk sub perhimpunan
+DocType: Features Setup,"If you have long print formats, this feature can be used to split the page to be printed on multiple pages with all headers and footers on each page","Jika anda mempunyai format cetakan lama, ciri ini boleh digunakan untuk berpecah halaman untuk dicetak pada beberapa halaman dengan semua pengepala dan pengaki pada setiap halaman"
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +98,All Territories,Semua Wilayah
+DocType: Purchase Invoice,Items,Item
+DocType: Fiscal Year,Year Name,Nama Tahun
+DocType: Process Payroll,Process Payroll,Proses Gaji
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +68,There are more holidays than working days this month.,Terdapat lebih daripada cuti hari bekerja bulan ini.
+DocType: Product Bundle Item,Product Bundle Item,Produk Bundle Item
+DocType: Sales Partner,Sales Partner Name,Nama Rakan Jualan
+DocType: Purchase Invoice Item,Image View,Lihat imej
+DocType: Issue,Opening Time,Masa Pembukaan
+apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,Dari dan kepada tarikh yang dikehendaki
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Sekuriti &amp; Bursa Komoditi
+DocType: Shipping Rule,Calculate Based On,Kira Based On
+DocType: Delivery Note Item,From Warehouse,Dari Gudang
+DocType: Purchase Taxes and Charges,Valuation and Total,Penilaian dan Jumlah
+DocType: Tax Rule,Shipping City,Penghantaran Bandar
+apps/erpnext/erpnext/stock/doctype/item/item.js +43,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,Perkara ini adalah Varian {0} (Template). Sifat-sifat akan disalin lebih dari template kecuali &#39;Tiada Salinan&#39; ditetapkan
+DocType: Account,Purchase User,Pembelian Pengguna
+DocType: Notification Control,Customize the Notification,Menyesuaikan Pemberitahuan
+DocType: Web Page,Slideshow,Slideshow
+apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +24,Default Address Template cannot be deleted,Templat Alamat lalai tidak boleh dipadam
+DocType: Sales Invoice,Shipping Rule,Peraturan Penghantaran
+DocType: Journal Entry,Print Heading,Cetak Kepala
+DocType: Quotation,Maintenance Manager,Pengurus Penyelenggaraan
+DocType: Workflow State,Search,Carian
+apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +54,Total cannot be zero,Jumlah tidak boleh sifar
+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,&#39;Hari Sejak Pesanan Terakhir&#39; mesti lebih besar daripada atau sama dengan sifar
+DocType: C-Form,Amended From,Pindaan Dari
+apps/erpnext/erpnext/public/js/setup_wizard.js +359,Raw Material,Bahan mentah
+DocType: Leave Application,Follow via Email,Ikut melalui E-mel
+DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Amaun Cukai Selepas Jumlah Diskaun
+apps/erpnext/erpnext/accounts/doctype/account/account.py +174,Child account exists for this account. You can not delete this account.,Akaun kanak-kanak wujud untuk akaun ini. Anda tidak boleh memadam akaun ini.
+apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,Sama ada qty sasaran atau jumlah sasaran adalah wajib
+apps/erpnext/erpnext/stock/get_item_details.py +449,No default BOM exists for Item {0},Tidak lalai BOM wujud untuk Perkara {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +335,Please select Posting Date first,Sila pilih Penempatan Tarikh pertama
+apps/erpnext/erpnext/public/js/account_tree_grid.js +211,Opening Date should be before Closing Date,Tarikh pembukaan perlu sebelum Tarikh Tutup
+DocType: Leave Control Panel,Carry Forward,Carry Forward
+apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +54,Cost Center with existing transactions can not be converted to ledger,PTJ dengan urus niaga yang sedia ada tidak boleh ditukar ke dalam lejar
+DocType: Department,Days for which Holidays are blocked for this department.,Hari yang mana Holidays disekat untuk jabatan ini.
+,Produced,Dihasilkan
+DocType: Item,Item Code for Suppliers,Kod Item untuk Pembekal
+DocType: Issue,Raised By (Email),Dibangkitkan Oleh (E-mel)
+apps/erpnext/erpnext/setup/setup_wizard/default_website.py +72,General,Ketua
+apps/erpnext/erpnext/public/js/setup_wizard.js +241,Attach Letterhead,Lampirkan Kepala Surat
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +272,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',Tidak boleh memotong apabila kategori adalah untuk &#39;Penilaian&#39; atau &#39;Penilaian dan Jumlah&#39;
+apps/erpnext/erpnext/public/js/setup_wizard.js +284,"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.","Senarai kepala cukai anda (contohnya VAT, Kastam dan lain-lain, mereka harus mempunyai nama-nama yang unik) dan kadar standard mereka. Ini akan mewujudkan templat standard, yang anda boleh menyunting dan menambah lebih kemudian."
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial Nos Required for Serialized Item {0},Serial No Diperlukan untuk Perkara bersiri {0}
+DocType: Journal Entry,Bank Entry,Bank Entry
+DocType: Authorization Rule,Applicable To (Designation),Terpakai Untuk (Jawatan)
+DocType: Blog Post,Blog Post,Blog Post
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,Group By
+apps/erpnext/erpnext/config/accounts.py +143,Enable / disable currencies.,Membolehkan / melumpuhkan mata wang.
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Postal Expenses,Perbelanjaan pos
+apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Jumlah (AMT)
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,Hiburan &amp; Leisure
+DocType: Purchase Order,The date on which recurring order will be stop,Tarikh perintah berulang akan berhenti
+DocType: Quality Inspection,Item Serial No,Item No Serial
+apps/erpnext/erpnext/controllers/status_updater.py +142,{0} must be reduced by {1} or you should increase overflow tolerance,{0} mesti dikurangkan dengan {1} atau anda perlu meningkatkan toleransi limpahan
+apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Present,Jumlah Hadir
+apps/erpnext/erpnext/public/js/setup_wizard.js +363,Hour,Jam
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +138,"Serialized Item {0} cannot be updated \
+					using Stock Reconciliation",Perkara bersiri {0} tidak boleh dikemaskini \ menggunakan Saham Penyesuaian
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +513,Transfer Material to Supplier,Pemindahan Bahan kepada Pembekal
+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,No Siri baru tidak boleh mempunyai Gudang. Gudang mesti digunakan Saham Masuk atau Resit Pembelian
+DocType: Lead,Lead Type,Jenis Lead
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +82,Create Quotation,Buat Sebut Harga
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,You are not authorized to approve leaves on Block Dates,Anda tiada kebenaran untuk meluluskan daun pada Tarikh Sekat
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +311,All these items have already been invoiced,Semua barang-barang ini telah diinvois
+apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},Boleh diluluskan oleh {0}
+DocType: Shipping Rule,Shipping Rule Conditions,Penghantaran Peraturan Syarat
+DocType: BOM Replace Tool,The new BOM after replacement,The BOM baru selepas penggantian
+DocType: Features Setup,Point of Sale,Tempat Jualan
+DocType: Account,Tax,Cukai
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +37,Row {0}: {1} is not a valid {2},Row {0}: {1} bukan sah {2}
+DocType: Production Planning Tool,Production Planning Tool,Pengeluaran Alat Perancangan
+DocType: Quality Inspection,Report Date,Laporan Tarikh
+DocType: C-Form,Invoices,Invois
+DocType: Job Opening,Job Title,Tajuk Kerja
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +54,{0} already allocated for Employee {1} for period {2} - {3},{0} telah diperuntukkan untuk pekerja {1} untuk tempoh {2} - {3}
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +80,{0} Recipients,{0} Penerima
+DocType: Features Setup,Item Groups in Details,Kumpulan item dalam Butiran
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +335,Quantity to Manufacture must be greater than 0.,Kuantiti untuk pembuatan mesti lebih besar daripada 0.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +4,Start Point-of-Sale (POS),Mula Point-of-Sale (POS)
+apps/erpnext/erpnext/config/support.py +28,Visit report for maintenance call.,Lawati laporan untuk panggilan penyelenggaraan.
+DocType: Stock Entry,Update Rate and Availability,Kadar Update dan Ketersediaan
+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.,Peratus anda dibenarkan untuk menerima atau menyampaikan lebih daripada kuantiti yang ditempah. Sebagai contoh: Jika anda telah menempah 100 unit. dan Elaun anda adalah 10% maka anda dibenarkan untuk menerima 110 unit.
+DocType: Pricing Rule,Customer Group,Kumpulan pelanggan
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +164,Expense account is mandatory for item {0},Akaun perbelanjaan adalah wajib bagi item {0}
+DocType: Item,Website Description,Laman Web Penerangan
+DocType: Serial No,AMC Expiry Date,AMC Tarikh Tamat
+,Sales Register,Jualan Daftar
+DocType: Quotation,Quotation Lost Reason,Sebut Harga Hilang Akal
+DocType: Address,Plant,Loji
+DocType: DocType,Setup,Persediaan
+apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,Ada apa-apa untuk mengedit.
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +108,Summary for this month and pending activities,Ringkasan untuk bulan ini dan aktiviti-aktiviti yang belum selesai
+DocType: Customer Group,Customer Group Name,Nama Kumpulan Pelanggan
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +410,Please remove this Invoice {0} from C-Form {1},Sila mengeluarkan Invois ini {0} dari C-Borang {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,Sila pilih Carry Forward jika anda juga mahu termasuk baki tahun fiskal yang lalu daun untuk tahun fiskal ini
+DocType: GL Entry,Against Voucher Type,Terhadap Jenis Baucar
+DocType: Item,Attributes,Sifat-sifat
+DocType: Packing Slip,Get Items,Dapatkan Item
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +187,Please enter Write Off Account,Sila masukkan Tulis Off Akaun
+apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +71,Last Order Date,Lepas Tarikh Perintah
+DocType: DocField,Image,Image
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +179,Make Excise Invoice,Buat Eksais Invois
+apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +39,Account {0} does not belongs to company {1},Akaun {0} tidak dimiliki oleh syarikat {1}
+DocType: Communication,Other,Lain-lain
+DocType: C-Form,C-Form,C-Borang
+apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +146,Operation ID not set,ID Operasi tidak ditetapkan
+DocType: Production Order,Planned Start Date,Dirancang Tarikh Mula
+DocType: Serial No,Creation Document Type,Penciptaan Dokumen Jenis
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +631,Maint. Visit,Maint. Melawat
+DocType: Leave Type,Is Encash,Adalah menunaikan
+DocType: Purchase Invoice,Mobile No,Tidak Bergerak
+DocType: Payment Tool,Make Journal Entry,Buat Journal Entry
+DocType: Leave Allocation,New Leaves Allocated,Daun baru Diperuntukkan
+apps/erpnext/erpnext/controllers/trends.py +257,Project-wise data is not available for Quotation,Data projek-bijak tidak tersedia untuk Sebutharga
+DocType: Project,Expected End Date,Tarikh Jangkaan Tamat
+DocType: Appraisal Template,Appraisal Template Title,Penilaian Templat Tajuk
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +378,Commercial,Perdagangan
+apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +23,Parent Item {0} must not be a Stock Item,Ibu Bapa Perkara {0} tidak perlu menjadi item Saham
+DocType: Cost Center,Distribution Id,Id pengedaran
+apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +14,Awesome Services,Perkhidmatan Awesome
+apps/erpnext/erpnext/config/manufacturing.py +29,All Products or Services.,Semua Produk atau Perkhidmatan.
+DocType: Purchase Invoice,Supplier Address,Alamat Pembekal
+DocType: Contact Us Settings,Address Line 2,Alamat 2
+DocType: ToDo,Reference,Rujukan
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,Keluar Qty
+apps/erpnext/erpnext/config/accounts.py +128,Rules to calculate shipping amount for a sale,Kaedah-kaedah untuk mengira jumlah penghantaran untuk jualan
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +29,Series is mandatory,Siri adalah wajib
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,Perkhidmatan Kewangan
+apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3},Nilai untuk Atribut {0} mesti berada dalam lingkungan {1} kepada {2} dalam kenaikan {3}
+DocType: Tax Rule,Sales,Jualan
+DocType: Stock Entry Detail,Basic Amount,Jumlah Asas
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +178,Warehouse required for stock Item {0},Gudang diperlukan untuk saham Perkara {0}
+DocType: Leave Allocation,Unused leaves,Daun yang tidak digunakan
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,Cr
+DocType: Customer,Default Receivable Accounts,Default Akaun Belum Terima
+DocType: Tax Rule,Billing State,Negeri Bil
+DocType: Item Reorder,Transfer,Pemindahan
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +549,Fetch exploded BOM (including sub-assemblies),Kutip BOM meletup (termasuk sub-pemasangan)
+DocType: Authorization Rule,Applicable To (Employee),Terpakai Untuk (Pekerja)
+apps/erpnext/erpnext/controllers/accounts_controller.py +101,Due Date is mandatory,Tarikh Akhir adalah wajib
+apps/erpnext/erpnext/controllers/item_variant.py +51,Increment for Attribute {0} cannot be 0,Kenaikan untuk Atribut {0} tidak boleh 0
+DocType: Journal Entry,Pay To / Recd From,Bayar Untuk / Recd Dari
+DocType: Naming Series,Setup Series,Persediaan Siri
+DocType: Supplier,Contact HTML,Hubungi HTML
+DocType: Landed Cost Voucher,Purchase Receipts,Resit Pembelian
+DocType: Payment Reconciliation,Maximum Amount,Jumlah Maksimum
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +27,How Pricing Rule is applied?,Bagaimana Harga Peraturan digunakan?
+DocType: Quality Inspection,Delivery Note No,Penghantaran Nota Tiada
+DocType: Company,Retail,Runcit
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +108,Customer {0} does not exist,Pelanggan {0} tidak wujud
+DocType: Attendance,Absent,Tidak hadir
+DocType: Product Bundle,Product Bundle,Bundle Produk
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +180,Row {0}: Invalid reference {1},Row {0}: rujukan tidak sah {1}
+DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Membeli Cukai dan Caj Template
+DocType: Upload Attendance,Download Template,Muat turun Template
+DocType: GL Entry,Remarks,Catatan
+DocType: Purchase Order Item Supplied,Raw Material Item Code,Bahan mentah Item Code
+DocType: Journal Entry,Write Off Based On,Tulis Off Based On
+DocType: Features Setup,POS View,POS Lihat
+apps/erpnext/erpnext/config/stock.py +38,Installation record for a Serial No.,Rekod pemasangan untuk No. Siri
+apps/erpnext/erpnext/public/js/queries.js +39,Please specify a,Sila nyatakan
+DocType: Offer Letter,Awaiting Response,Menunggu Response
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +53,Above,Di atas
+DocType: Salary Slip,Earning & Deduction,Pendapatan &amp; Potongan
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +76,Account {0} cannot be a Group,Akaun {0} tidak boleh menjadi Kumpulan
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +314,Region,Wilayah
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +213,Optional. This setting will be used to filter in various transactions.,Pilihan. Tetapan ini akan digunakan untuk menapis dalam pelbagai transaksi.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +104,Negative Valuation Rate is not allowed,Kadar Penilaian negatif tidak dibenarkan
+DocType: Holiday List,Weekly Off,Mingguan Off
+DocType: Fiscal Year,"For e.g. 2012, 2012-13","Untuk contoh: 2012, 2012-13"
+apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +32,Provisional Profit / Loss (Credit),Sementara Untung / Rugi (Kredit)
+DocType: Sales Invoice,Return Against Sales Invoice,Kembali Terhadap Jualan Invois
+apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +32,Item 5,Perkara 5
+apps/erpnext/erpnext/accounts/utils.py +276,Please set default value {0} in Company {1},Sila menetapkan nilai lalai {0} dalam Syarikat {1}
+DocType: Serial No,Creation Time,Penciptaan Masa
+apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +62,Total Revenue,Jumlah Pendapatan
+DocType: Sales Invoice,Product Bundle Help,Produk Bantuan Bundle
+,Monthly Attendance Sheet,Lembaran Kehadiran Bulanan
+apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +16,No record found,Rekod tidak dijumpai
+apps/erpnext/erpnext/controllers/stock_controller.py +175,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Pusat Kos adalah wajib bagi Perkara {2}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,Account {0} is inactive,Akaun {0} tidak aktif
+DocType: GL Entry,Is Advance,Adalah Advance
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,Kehadiran Dari Tarikh dan Kehadiran Untuk Tarikh adalah wajib
+apps/erpnext/erpnext/controllers/buying_controller.py +122,Please enter 'Is Subcontracted' as Yes or No,Sila masukkan &#39;Apakah Subkontrak&#39; seperti Ya atau Tidak
+DocType: Sales Team,Contact No.,Hubungi No.
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,'Profit and Loss' type account {0} not allowed in Opening Entry,'Untung dan Rugi' akaun jenis {0} tidak dibenarkan dalam Kemasukan Permulaan
+DocType: Workflow State,Time,Masa
+DocType: Features Setup,Sales Discounts,Jualan Diskaun
+DocType: Hub Settings,Seller Country,Penjual Negara
+DocType: Authorization Rule,Authorization Rule,Peraturan kebenaran
+DocType: Sales Invoice,Terms and Conditions Details,Terma dan Syarat Butiran
+DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,Jualan Cukai dan Caj Template
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,Pakaian &amp; Aksesori
+apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +67,Number of Order,Bilangan Pesanan
+DocType: Item Group,HTML / Banner that will show on the top of product list.,HTML / Banner yang akan muncul di bahagian atas senarai produk.
+DocType: Shipping Rule,Specify conditions to calculate shipping amount,Menentukan syarat-syarat untuk mengira jumlah penghantaran
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +121,Add Child,Tambah Anak
+DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,Peranan Dibenarkan untuk Set Akaun Frozen &amp; Frozen Edit Entri
+apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +52,Cannot convert Cost Center to ledger as it has child nodes,Tidak boleh menukar PTJ ke lejar kerana ia mempunyai nod anak
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +37,Serial #,Serial #
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +87,Commission on Sales,Suruhanjaya Jualan
+DocType: Offer Letter Term,Value / Description,Nilai / Penerangan
+DocType: Tax Rule,Billing Country,Bil Negara
+,Customers Not Buying Since Long Time,Pelanggan Tidak Membeli Sejak Long Time
+DocType: Production Order,Expected Delivery Date,Jangkaan Tarikh Penghantaran
+apps/erpnext/erpnext/accounts/general_ledger.py +121,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Debit dan Kredit tidak sama untuk {0} # {1}. Perbezaan adalah {2}.
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Entertainment Expenses,Perbelanjaan hiburan
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +190,Sales Invoice {0} must be cancelled before cancelling this Sales Order,Jualan Invois {0} hendaklah dibatalkan sebelum membatalkan Perintah Jualan ini
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +61,Age,Umur
+DocType: Time Log,Billing Amount,Bil Jumlah
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +84,Invalid quantity specified for item {0}. Quantity should be greater than 0.,Kuantiti yang ditentukan tidak sah untuk item {0}. Kuantiti perlu lebih besar daripada 0.
+apps/erpnext/erpnext/config/hr.py +18,Applications for leave.,Permohonan untuk kebenaran.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +172,Account with existing transaction can not be deleted,Akaun dengan urus niaga yang sedia ada tidak boleh dihapuskan
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Legal Expenses,Perbelanjaan Undang-undang
+DocType: Sales Order,"The day of the month on which auto order will be generated e.g. 05, 28 etc","Hari dalam bulan perintah automatik akan dijana contohnya 05, 28 dan lain-lain"
+DocType: Sales Invoice,Posting Time,Penempatan Masa
+DocType: Sales Order,% Amount Billed,% Jumlah Dibilkan
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Telephone Expenses,Perbelanjaan Telefon
+DocType: Sales Partner,Logo,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.,Semak ini jika anda mahu untuk memaksa pengguna untuk memilih siri sebelum menyimpan. Tidak akan ada lalai jika anda mendaftar ini.
+apps/erpnext/erpnext/stock/get_item_details.py +107,No Item with Serial No {0},No Perkara dengan Tiada Serial {0}
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +95,Open Notifications,Pemberitahuan Terbuka
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +68,Direct Expenses,Perbelanjaan langsung
+apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,New Hasil Pelanggan
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Travel Expenses,Perbelanjaan Perjalanan
+DocType: Maintenance Visit,Breakdown,Pecahan
+apps/erpnext/erpnext/controllers/accounts_controller.py +242,Account: {0} with currency: {1} can not be selected,Akaun: {0} dengan mata wang: {1} tidak boleh dipilih
+DocType: Bank Reconciliation Detail,Cheque Date,Cek Tarikh
+apps/erpnext/erpnext/accounts/doctype/account/account.py +47,Account {0}: Parent account {1} does not belong to company: {2},Akaun {0}: akaun Induk {1} bukan milik syarikat: {2}
+apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted all transactions related to this company!,Berjaya memadam semua transaksi yang berkaitan dengan syarikat ini!
+apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,Seperti pada Tarikh
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Probation,Percubaan
+apps/erpnext/erpnext/stock/doctype/item/item.py +268,Default Warehouse is mandatory for stock Item.,Gudang lalai adalah wajib bagi saham Perkara.
+DocType: Feed,Full Name,Nama Penuh
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +173,Payment of salary for the month {0} and year {1},Pembayaran gaji untuk bulan {0} dan tahun {1}
+DocType: Stock Settings,Auto insert Price List rate if missing,Masukkan Auto Kadar Senarai Harga jika hilang
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,Jumlah Amaun Dibayar
+,Transferred Qty,Dipindahkan Qty
+apps/erpnext/erpnext/config/learn.py +11,Navigating,Melayari
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +137,Planning,Perancangan
+apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +9,Make Time Log Batch,Buat Masa Log Batch
+apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Issued,Isu
+DocType: Project,Total Billing Amount (via Time Logs),Jumlah Bil (melalui Time Log)
+apps/erpnext/erpnext/public/js/setup_wizard.js +365,We sell this Item,Kami menjual Perkara ini
+apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +65,Supplier Id,Id Pembekal
+DocType: Journal Entry,Cash Entry,Entry Tunai
+DocType: Sales Partner,Contact Desc,Hubungi Deskripsi
+apps/erpnext/erpnext/config/hr.py +135,"Type of leaves like casual, sick etc.","Jenis daun seperti biasa, sakit dan lain-lain"
+DocType: Email Digest,Send regular summary reports via Email.,Hantar laporan ringkasan tetap melalui E-mel.
+DocType: Brand,Item Manager,Perkara Pengurus
+DocType: Cost Center,Add rows to set annual budgets on Accounts.,Tambah baris untuk menetapkan belanjawan tahunan pada Akaun.
+DocType: Buying Settings,Default Supplier Type,Default Jenis Pembekal
+DocType: Production Order,Total Operating Cost,Jumlah Kos Operasi
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +163,Note: Item {0} entered multiple times,Nota: Perkara {0} memasuki beberapa kali
+apps/erpnext/erpnext/config/crm.py +27,All Contacts.,Semua Kenalan.
+DocType: Newsletter,Test Email Id,Id Ujian E-mel
+apps/erpnext/erpnext/public/js/setup_wizard.js +142,Company Abbreviation,Singkatan Syarikat
+DocType: Features Setup,If you follow Quality Inspection. Enables Item QA Required and QA No in Purchase Receipt,Jika anda mengikuti Pemeriksaan Kualiti. Membolehkan Perkara QA Diperlukan dan QA Tidak dalam Resit Pembelian
+DocType: GL Entry,Party Type,Jenis Parti
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +68,Raw material cannot be same as main Item,Bahan mentah tidak boleh sama dengan Perkara utama
+DocType: Item Attribute Value,Abbreviation,Singkatan
+apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,Tidak authroized sejak {0} melebihi had
+apps/erpnext/erpnext/config/hr.py +115,Salary template master.,Master template gaji.
+DocType: Leave Type,Max Days Leave Allowed,Max Hari Cuti dibenarkan
+apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +55,Set Tax Rule for shopping cart,Menetapkan Peraturan Cukai untuk troli membeli-belah
+DocType: Payment Tool,Set Matching Amounts,Tetapkan Jumlah Matching
+DocType: Purchase Invoice,Taxes and Charges Added,Cukai dan Caj Tambahan
+,Sales Funnel,Saluran Jualan
+apps/erpnext/erpnext/setup/doctype/company/company.py +35,Abbreviation is mandatory,Singkatan adalah wajib
+apps/erpnext/erpnext/shopping_cart/utils.py +33,Cart,Dalam Troli
+apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +136,Thank you for your interest in subscribing to our updates,Terima kasih kerana berminat dengan melanggan kemas kini kami
+,Qty to Transfer,Qty untuk Pemindahan
+apps/erpnext/erpnext/config/selling.py +18,Quotes to Leads or Customers.,Petikan untuk Leads atau Pelanggan.
+DocType: Stock Settings,Role Allowed to edit frozen stock,Peranan dibenarkan untuk mengedit saham beku
+,Territory Target Variance Item Group-Wise,Wilayah Sasaran Varian Perkara Kumpulan Bijaksana
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +101,All Customer Groups,Semua Kumpulan Pelanggan
+apps/erpnext/erpnext/controllers/accounts_controller.py +475,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} adalah wajib. Mungkin rekod Pertukaran Matawang tidak dihasilkan untuk {1} hingga {2}.
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +37,Tax Template is mandatory.,Template cukai adalah wajib.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +41,Account {0}: Parent account {1} does not exist,Akaun {0}: akaun Induk {1} tidak wujud
+DocType: Purchase Invoice Item,Price List Rate (Company Currency),Senarai Harga Kadar (Syarikat mata wang)
+DocType: Account,Temporary,Sementara
+DocType: Address,Preferred Billing Address,Alamat Bil pilihan
+DocType: Monthly Distribution Percentage,Percentage Allocation,Peratus Peruntukan
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Secretary,Setiausaha
+DocType: Serial No,Distinct unit of an Item,Unit yang berbeza Perkara yang
+DocType: Pricing Rule,Buying,Membeli
+DocType: HR Settings,Employee Records to be created by,Rekod Pekerja akan diwujudkan oleh
+apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +24,This Time Log Batch has been cancelled.,Ini batch Masa Log telah dibatalkan.
+,Reqd By Date,Reqd Tarikh
+DocType: Salary Slip Earning,Salary Slip Earning,Gaji Slip Pendapatan
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Creditors,Pemiutang
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Serial No is mandatory,Row # {0}: Tiada Serial adalah wajib
+DocType: Purchase Taxes and Charges,Item Wise Tax Detail,Perkara Bijaksana Cukai Detail
+,Item-wise Price List Rate,Senarai Harga Kadar Perkara-bijak
+DocType: Purchase Order Item,Supplier Quotation,Sebutharga Pembekal
+DocType: Quotation,In Words will be visible once you save the Quotation.,Dalam Perkataan akan dapat dilihat selepas anda menyimpan Sebut Harga tersebut.
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is stopped,{0} {1} telah dihentikan
+apps/erpnext/erpnext/stock/doctype/item/item.py +356,Barcode {0} already used in Item {1},Barcode {0} telah digunakan dalam Perkara {1}
+DocType: Lead,Add to calendar on this date,Tambah ke kalendar pada tarikh ini
+apps/erpnext/erpnext/config/selling.py +132,Rules for adding shipping costs.,Peraturan untuk menambah kos penghantaran.
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,Acara akan datang
+apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,Pelanggan dikehendaki
+DocType: Letter Head,Letter Head,Surat Ketua
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +27,Quick Entry,Kemasukan Pantas
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0} adalah wajib bagi Pulangan
+DocType: Purchase Order,To Receive,Untuk Menerima
+apps/erpnext/erpnext/public/js/setup_wizard.js +266,user@example.com,user@example.com
+DocType: Email Digest,Income / Expense,Pendapatan / Perbelanjaan
+DocType: Employee,Personal Email,E-mel peribadi
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +62,Total Variance,Jumlah Varian
+DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.","Jika diaktifkan, sistem akan menghantar entri perakaunan untuk inventori secara automatik."
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +15,Brokerage,Brokerage
+DocType: Address,Postal Code,Poskod
+DocType: Production Order Operation,"in Minutes
+Updated via 'Time Log'",dalam minit dikemaskini melalui &#39;Time Log&#39;
+DocType: Customer,From Lead,Dari Lead
+apps/erpnext/erpnext/config/manufacturing.py +19,Orders released for production.,Perintah dikeluarkan untuk pengeluaran.
+apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +42,Select Fiscal Year...,Pilih Tahun Anggaran ...
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +444,POS Profile required to make POS Entry,POS Profil dikehendaki membuat POS Entry
+DocType: Hub Settings,Name Token,Nama Token
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +120,Standard Selling,Jualan Standard
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +137,Atleast one warehouse is mandatory,Atleast satu gudang adalah wajib
+DocType: Serial No,Out of Warranty,Daripada Waranti
+DocType: BOM Replace Tool,Replace,Ganti
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +316,{0} against Sales Invoice {1},{0} terhadap Invois Jualan  {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +49,Please enter default Unit of Measure,Sila masukkan Unit keingkaran Langkah
+DocType: Purchase Invoice Item,Project Name,Nama Projek
+DocType: Supplier,Mention if non-standard receivable account,Sebut jika akaun belum terima tidak standard
+DocType: Workflow State,Edit,Edit
+DocType: Journal Entry Account,If Income or Expense,Jika Pendapatan atau Perbelanjaan
+DocType: Features Setup,Item Batch Nos,Perkara Batch No.
+DocType: Stock Ledger Entry,Stock Value Difference,Nilai saham Perbezaan
+apps/erpnext/erpnext/config/learn.py +204,Human Resource,Sumber Manusia
+DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,Penyesuaian Pembayaran Pembayaran
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +36,Tax Assets,Aset Cukai
+DocType: BOM Item,BOM No,BOM Tiada
+DocType: Contact Us Settings,Pincode,Pincode
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,Journal Entry {0} does not have account {1} or already matched against other voucher,Jurnal Entry {0} tidak mempunyai akaun {1} atau sudah dipadankan dengan baucar lain
+DocType: Item,Moving Average,Purata bergerak
+DocType: BOM Replace Tool,The BOM which will be replaced,The BOM yang akan digantikan
+DocType: Account,Debit,Debit
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +44,Leaves must be allocated in multiples of 0.5,Daun mesti diperuntukkan dalam gandaan 0.5
+DocType: Production Order,Operation Cost,Operasi Kos
+apps/erpnext/erpnext/config/hr.py +71,Upload attendance from a .csv file,Memuat naik kehadiran dari fail csv
+apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,AMT Cemerlang
+DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,Sasaran yang ditetapkan Perkara Kumpulan-bijak untuk Orang Jualan ini.
+DocType: Warranty Claim,"To assign this issue, use the ""Assign"" button in the sidebar.","Untuk memberi isu ini, menggunakan &quot;Berikan&quot; butang di bar sisi."
+DocType: Stock Settings,Freeze Stocks Older Than [Days],Stok Freeze Lama Than [Hari]
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +40,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.","Jika dua atau lebih Peraturan Harga yang didapati berdasarkan syarat-syarat di atas, Keutamaan digunakan. Keutamaan adalah nombor antara 0 hingga 20 manakala nilai lalai adalah sifar (kosong). Jumlah yang lebih tinggi bermakna ia akan diberi keutamaan jika terdapat berbilang Peraturan Harga dengan keadaan yang sama."
+apps/erpnext/erpnext/controllers/trends.py +36,Fiscal Year: {0} does not exists,Tahun fiskal: {0} tidak wujud
+DocType: Currency Exchange,To Currency,Untuk Mata Wang
+DocType: Leave Block List,Allow the following users to approve Leave Applications for block days.,Membenarkan pengguna berikut untuk meluluskan Permohonan Cuti untuk hari blok.
+apps/erpnext/erpnext/config/hr.py +155,Types of Expense Claim.,Jenis-jenis Tuntutan Perbelanjaan.
+DocType: Item,Taxes,Cukai
+DocType: Project,Default Cost Center,Kos Pusat Default
+DocType: Purchase Invoice,End Date,Tarikh akhir
+DocType: Employee,Internal Work History,Sejarah Kerja Dalaman
+DocType: DocField,Column Break,Ruangan Cuti
+DocType: Event,Thursday,Khamis
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,Ekuiti Persendirian
+DocType: Maintenance Visit,Customer Feedback,Maklum Balas Pelanggan
+DocType: Account,Expense,Perbelanjaan
+DocType: Sales Invoice,Exhibition,Pameran
+DocType: Item Attribute,From Range,Dari Range
+apps/erpnext/erpnext/stock/utils.py +89,Item {0} ignored since it is not a stock item,Perkara {0} diabaikan kerana ia bukan satu perkara saham
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +29,Submit this Production Order for further processing.,Hantar Pesanan Pengeluaran ini untuk proses seterusnya.
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +21,"To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled.","Tidak memohon Peraturan Harga dalam transaksi tertentu, semua Peraturan Harga berkenaan perlu dimatikan."
+DocType: Company,Domain,Domain
+,Sales Order Trends,Trend Pesanan Jualan
+DocType: Employee,Held On,Diadakan Pada
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +33,Production Item,Pengeluaran Item
+,Employee Information,Maklumat Kakitangan
+apps/erpnext/erpnext/public/js/setup_wizard.js +294,Rate (%),Kadar (%)
+DocType: Stock Entry Detail,Additional Cost,Kos tambahan
+apps/erpnext/erpnext/public/js/setup_wizard.js +155,Financial Year End Date,Akhir Tahun Kewangan Tarikh
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Voucher No, if grouped by Voucher","Tidak boleh menapis berdasarkan Baucer Tidak, jika dikumpulkan oleh Baucar"
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +484,Make Supplier Quotation,Membuat Sebutharga Pembekal
+DocType: Quality Inspection,Incoming,Masuk
+DocType: BOM,Materials Required (Exploded),Bahan yang diperlukan (Meletup)
+DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),Mengurangkan Pendapatan untuk Cuti Tanpa Gaji (LWP)
+apps/erpnext/erpnext/public/js/setup_wizard.js +256,"Add users to your organization, other than yourself","Tambah pengguna kepada organisasi anda, selain daripada diri sendiri"
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No {1} does not match with {2} {3},Row # {0}: No Siri {1} tidak sepadan dengan {2} {3}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +44,Casual Leave,Cuti kasual
+DocType: Batch,Batch ID,ID Batch
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +336,Note: {0},Nota: {0}
+,Delivery Note Trends,Trend Penghantaran Nota
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +104,This Week's Summary,Ringkasan Minggu Ini
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +74,{0} must be a Purchased or Sub-Contracted Item in row {1},{0} mesti benda  yang Dibeli atau Sub-Kontrak di baris {1}
+apps/erpnext/erpnext/accounts/general_ledger.py +106,Account: {0} can only be updated via Stock Transactions,Akaun: {0} hanya boleh dikemaskini melalui Urusniaga Stok
+DocType: GL Entry,Party,Parti
+DocType: Sales Order,Delivery Date,Tarikh Penghantaran
+DocType: DocField,Currency,Mata Wang
+DocType: Opportunity,Opportunity Date,Peluang Tarikh
+DocType: Purchase Receipt,Return Against Purchase Receipt,Kembali Terhadap Resit Pembelian
+DocType: Purchase Order,To Bill,Rang Undang-Undang
+DocType: Material Request,% Ordered,% Mengarahkan
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Piecework,Piecework
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +64,Avg. Buying Rate,Purata. Kadar Membeli
+DocType: Task,Actual Time (in Hours),Masa sebenar (dalam jam)
+DocType: Employee,History In Company,Sejarah Dalam Syarikat
+apps/erpnext/erpnext/config/crm.py +151,Newsletters,Surat Berita
+DocType: Address,Shipping,Penghantaran
+DocType: Stock Ledger Entry,Stock Ledger Entry,Saham Lejar Entry
+DocType: Department,Leave Block List,Tinggalkan Sekat Senarai
+DocType: Customer,Tax ID,ID Cukai
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +188,Item {0} is not setup for Serial Nos. Column must be blank,Perkara {0} tidak ditetapkan untuk Serial No. Column boleh kosong
+DocType: Accounts Settings,Accounts Settings,Tetapan Akaun-akaun
+DocType: Customer,Sales Partner and Commission,Rakan Jualan dan Suruhanjaya
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +53,Plant and Machinery,Loji dan Jentera
+DocType: Sales Partner,Partner's Website,Laman Web Pasangan
+DocType: Opportunity,To Discuss,Bincang
+DocType: SMS Settings,SMS Settings,Tetapan SMS
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +60,Temporary Accounts,Akaun sementara
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Black,Black
+DocType: BOM Explosion Item,BOM Explosion Item,Letupan BOM Perkara
+DocType: Account,Auditor,Audit
+DocType: Purchase Order,End date of current order's period,Tarikh akhir tempoh perintah semasa
+apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +17,Make Offer Letter,Membuat Surat Tawaran
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +10,Return,Pulangan
+apps/erpnext/erpnext/stock/doctype/item/item.py +507,Default Unit of Measure for Variant must be same as Template,Unit keingkaran Langkah untuk Variant mesti sama dengan Template
+DocType: DocField,Fold,Lipat
+DocType: Production Order Operation,Production Order Operation,Pengeluaran Operasi Pesanan
+DocType: Pricing Rule,Disable,Melumpuhkan
+DocType: Project Task,Pending Review,Sementara menunggu Review
+apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.js +12,Please specify,Sila nyatakan
+DocType: Task,Total Expense Claim (via Expense Claim),Jumlah Tuntutan Perbelanjaan (melalui Perbelanjaan Tuntutan)
+apps/erpnext/erpnext/accounts/report/sales_register/sales_register.py +66,Customer Id,Id Pelanggan
+DocType: Page,Page Name,Page Nama
+apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +110,To Time must be greater than From Time,Untuk Masa mesti lebih besar daripada Dari Masa
+DocType: Journal Entry Account,Exchange Rate,Kadar pertukaran
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +467,Sales Order {0} is not submitted,Sales Order {0} tidak dikemukakan
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0}: Parent account {1} does not bolong to the company {2},Gudang {0}: akaun Ibu Bapa {1} tidak Bolong kepada syarikat {2}
+DocType: BOM,Last Purchase Rate,Kadar Pembelian lalu
+DocType: Account,Asset,Aset
+DocType: Project Task,Task ID,Petugas ID
+apps/erpnext/erpnext/public/js/setup_wizard.js +143,"e.g. ""MC""",contohnya &quot;MC&quot;
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,Stock cannot exist for Item {0} since has variants,Saham tidak boleh wujud untuk Perkara {0} kerana mempunyai varian
+,Sales Person-wise Transaction Summary,Jualan Orang-bijak Transaksi Ringkasan
+DocType: System Settings,Time Zone,Time Zone
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +104,Warehouse {0} does not exist,Gudang {0} tidak wujud
+apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,Daftar Untuk ERPNext Hub
+DocType: Monthly Distribution,Monthly Distribution Percentages,Peratusan Taburan Bulanan
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +16,The selected item cannot have Batch,Item yang dipilih tidak boleh mempunyai Batch
+DocType: Delivery Note,% of materials delivered against this Delivery Note,% bahan-bahan yang dihantar untuk Nota Penghantaran ini
+DocType: Customer,Customer Details,Butiran Pelanggan
+DocType: Employee,Reports to,Laporan kepada
+DocType: SMS Settings,Enter url parameter for receiver nos,Masukkan parameter url untuk penerima nos
+DocType: Sales Invoice,Paid Amount,Jumlah yang dibayar
+apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type 'Liability',Penutupan Akaun {0} mestilah dari jenis &#39;Liabiliti&#39;
+,Available Stock for Packing Items,Saham tersedia untuk Item Pembungkusan
+DocType: Item Variant,Item Variant,Perkara Varian
+apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +15,Setting this Address Template as default as there is no other default,Menetapkan Templat Alamat ini sebagai lalai kerana tidak ada default lain
+apps/erpnext/erpnext/accounts/doctype/account/account.py +89,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Baki akaun sudah dalam Debit, anda tidak dibenarkan untuk menetapkan 'Baki Mestilah' sebagai 'Kredit'"
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Quality Management,Pengurusan Kualiti
+DocType: Production Planning Tool,Filter based on customer,Filter berdasarkan pelanggan
+DocType: Payment Tool Detail,Against Voucher No,Terhadap Baucer Tiada
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +47,Please enter quantity for Item {0},Sila masukkan kuantiti untuk Perkara {0}
+DocType: Employee External Work History,Employee External Work History,Luar pekerja Sejarah Kerja
+DocType: Tax Rule,Purchase,Pembelian
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Balance Qty,Baki Kuantiti
+DocType: Item Group,Parent Item Group,Ibu Bapa Item Kumpulan
+apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +21,{0} for {1},{0} untuk {1}
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +96,Cost Centers,Pusat Kos
+apps/erpnext/erpnext/config/stock.py +115,Warehouses.,Gudang.
+DocType: Purchase Receipt,Rate at which supplier's currency is converted to company's base currency,Kadar di mana pembekal mata wang ditukar kepada mata wang asas syarikat
+apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +36,Row #{0}: Timings conflicts with row {1},Row # {0}: konflik pengaturan masa dengan barisan {1}
+DocType: Opportunity,Next Contact,Seterusnya Hubungi
+DocType: Employee,Employment Type,Jenis pekerjaan
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,Aset Tetap
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +84,Application period cannot be across two alocation records,Tempoh permohonan tidak boleh di dua rekod alocation
+DocType: Item Group,Default Expense Account,Akaun Perbelanjaan Default
+DocType: Employee,Notice (days),Notis (hari)
+DocType: Page,Yes,Ya
+DocType: Tax Rule,Sales Tax Template,Template Cukai Jualan
+DocType: Employee,Encashment Date,Penunaian Tarikh
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +179,"Against Voucher Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Terhadap Baucer Jenis mesti menjadi salah satu Pesanan Belian, Invois Belian atau Journal Entry"
+DocType: Account,Stock Adjustment,Pelarasan saham
+apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +34,Default Activity Cost exists for Activity Type - {0},Kos Aktiviti lalai wujud untuk Jenis Kegiatan - {0}
+DocType: Production Order,Planned Operating Cost,Dirancang Kos Operasi
+apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +121,New {0} Name,New {0} Nama
+apps/erpnext/erpnext/controllers/recurring_document.py +128,Please find attached {0} #{1},Dilampirkan {0} # {1}
+DocType: Job Applicant,Applicant Name,Nama pemohon
+DocType: Authorization Rule,Customer / Item Name,Pelanggan / Nama Item
+DocType: Product Bundle,"Aggregate group of **Items** into another **Item**. This is useful if you are bundling a certain **Items** into a package and you maintain stock of the packed **Items** and not the aggregate **Item**. 
+
+The package **Item** will have ""Is Stock Item"" as ""No"" and ""Is Sales Item"" as ""Yes"".
+
+For Example: If you are selling Laptops and Backpacks separately and have a special price if the customer buys both, then the Laptop + Backpack will be a new Product Bundle Item.
+
+Note: BOM = Bill of Materials","Kumpulan agregat Item ** ** kepada yang lain Item ** **. Ini berguna jika anda bundling Item ** ** tertentu ke dalam satu pakej dan anda mengekalkan saham daripada ** Item dibungkus ** dan tidak agregat ** Item **. Pakej ** ** Item akan mempunyai &quot;Adakah Saham Perkara&quot; sebagai &quot;Tidak&quot; dan &quot;Adakah Item Jualan&quot; sebagai &quot;Ya&quot;. Untuk Contoh: Jika anda jual Komputer riba dan Ransel secara berasingan dan mempunyai harga istimewa jika pelanggan membeli kedua-duanya, maka Laptop + Backpack akan menjadi baru Perkara Bundle Produk. Nota: BOM = Bill of Materials"
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Serial No is mandatory for Item {0},No siri adalah wajib bagi Perkara {0}
+DocType: Item Variant Attribute,Attribute,Atribut
+apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +21,Please specify from/to range,Sila nyatakan dari / ke berkisar
+apps/frappe/frappe/public/js/frappe/model/model.js +18,Created By,Dibuat oleh
+DocType: Serial No,Under AMC,Di bawah AMC
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +47,Item valuation rate is recalculated considering landed cost voucher amount,Perkara kadar penilaian dikira semula memandangkan jumlah baucar kos mendarat
+apps/erpnext/erpnext/config/selling.py +70,Default settings for selling transactions.,Tetapan lalai untuk menjual transaksi.
+DocType: BOM Replace Tool,Current BOM,BOM semasa
+apps/erpnext/erpnext/public/js/utils.js +57,Add Serial No,Tambah No Serial
+DocType: Production Order,Warehouses,Gudang
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Print and Stationary,Cetak dan pegun
+apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +122,Group Node,Node kumpulan
+DocType: Payment Reconciliation,Minimum Amount,Jumlah Minimum
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +71,Update Finished Goods,Update Mendapat tempat Barangan
+DocType: Workstation,per hour,sejam
+apps/frappe/frappe/core/doctype/doctype/doctype.py +106,Series {0} already used in {1},Siri {0} telah digunakan dalam {1}
+DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,Akaun untuk gudang (Inventori Kekal) yang akan diwujudkan di bawah Akaun ini.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,Gudang tidak boleh dihapuskan kerana penyertaan saham lejar wujud untuk gudang ini.
+DocType: Company,Distribution,Pengagihan
+apps/erpnext/erpnext/public/js/pos/pos.html +36,Amount Paid,Amaun Dibayar
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Project Manager,Pengurus Projek
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +72,Dispatch,Dispatch
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,Max diskaun yang dibenarkan untuk item: {0} adalah {1}%
+DocType: Customer,Default Taxes and Charges,Cukai lalai dan Caj
+DocType: Account,Receivable,Belum Terima
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +263,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,Row # {0}: Tidak dibenarkan untuk menukar pembekal sebagai Perintah Pembelian sudah wujud
+DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,Peranan yang dibenarkan menghantar transaksi yang melebihi had kredit ditetapkan.
+DocType: Sales Invoice,Supplier Reference,Rujukan Pembekal
+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.","Jika disemak, BOM untuk item sub-pemasangan akan dipertimbangkan untuk mendapatkan bahan-bahan mentah. Jika tidak, semua item sub-pemasangan akan dianggap sebagai bahan mentah."
+DocType: Material Request,Material Issue,Isu Bahan
+DocType: Hub Settings,Seller Description,Penjual Penerangan
+DocType: Employee Education,Qualification,Kelayakan
+DocType: Item Price,Item Price,Perkara Harga
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +48,Soap & Detergent,Sabun &amp; Detergen
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +36,Motion Picture & Video,Motion Picture &amp; Video
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Mengarahkan
+DocType: Warehouse,Warehouse Name,Nama Gudang
+DocType: Naming Series,Select Transaction,Pilih Transaksi
+apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +30,Please enter Approving Role or Approving User,Sila masukkan Meluluskan Peranan atau Meluluskan pengguna
+DocType: Journal Entry,Write Off Entry,Tulis Off Entry
+DocType: BOM,Rate Of Materials Based On,Kadar Bahan Based On
+apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,Analtyics Sokongan
+apps/erpnext/erpnext/accounts/doctype/accounts_settings/accounts_settings.py +27,Company is missing in warehouses {0},Syarikat yang hilang dalam gudang {0}
+DocType: POS Profile,Terms and Conditions,Terma dan Syarat
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,To Date should be within the Fiscal Year. Assuming To Date = {0},Tarikh perlu berada dalam Tahun Fiskal. Dengan mengandaikan Untuk Tarikh = {0}
+DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","Di sini anda boleh mengekalkan ketinggian, berat badan, alahan, masalah kesihatan dan lain-lain"
+DocType: Leave Block List,Applies to Company,Terpakai kepada Syarikat
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +175,Cannot cancel because submitted Stock Entry {0} exists,Tidak boleh membatalkan kerana dikemukakan Saham Entry {0} wujud
+DocType: Purchase Invoice,In Words,Dalam Perkataan
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +213,Today is {0}'s birthday!,Hari ini adalah {0} &#39;s hari jadi!
+DocType: Production Planning Tool,Material Request For Warehouse,Permintaan Bahan Untuk Gudang
+DocType: Sales Order Item,For Production,Untuk Pengeluaran
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +103,Please enter sales order in the above table,Sila masukkan perintah jualan dalam jadual di atas
+DocType: Project Task,View Task,Lihat Petugas
+apps/erpnext/erpnext/public/js/setup_wizard.js +154,Your financial year begins on,Tahun kewangan anda bermula pada
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +46,Please enter Purchase Receipts,Sila masukkan Pembelian Terimaan
+DocType: Sales Invoice,Get Advances Received,Mendapatkan Pendahuluan Diterima
+DocType: Email Digest,Add/Remove Recipients,Tambah / Buang Penerima
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +427,Transaction not allowed against stopped Production Order {0},Transaksi tidak dibenarkan terhadap Pengeluaran berhenti Perintah {0}
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","Untuk menetapkan Tahun Fiskal ini sebagai lalai, klik pada &#39;Tetapkan sebagai lalai&#39;"
+apps/erpnext/erpnext/config/support.py +54,Setup incoming server for support email id. (e.g. support@example.com),Persediaan pelayan masuk untuk id e-mel sokongan. (Contohnya support@example.com)
+apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,Kekurangan Qty
+apps/erpnext/erpnext/stock/doctype/item/item.py +532,Item variant {0} exists with same attributes,Varian item {0} wujud dengan ciri yang sama
+DocType: Salary Slip,Salary Slip,Slip Gaji
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,'Tarikh Hingga' diperlukan
+DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","Menjana slip pembungkusan untuk pakej yang akan dihantar. Digunakan untuk memberitahu jumlah pakej, kandungan pakej dan berat."
+DocType: Sales Invoice Item,Sales Order Item,Pesanan Jualan Perkara
+DocType: Salary Slip,Payment Days,Hari Pembayaran
+DocType: BOM,Manage cost of operations,Menguruskan kos operasi
+DocType: Features Setup,Item Advanced,Perkara 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.","Apabila mana-mana urus niaga yang diperiksa adalah &quot;Dihantar&quot;, e-mel pop-up secara automatik dibuka untuk menghantar e-mel kepada yang berkaitan &quot;Hubungi&quot; dalam transaksi itu, dengan transaksi itu sebagai lampiran. Pengguna mungkin atau tidak menghantar e-mel."
+apps/erpnext/erpnext/config/setup.py +14,Global Settings,Tetapan Global
+DocType: Employee Education,Employee Education,Pendidikan Pekerja
+apps/erpnext/erpnext/public/js/controllers/transaction.js +742,It is needed to fetch Item Details.,Ia diperlukan untuk mengambil Butiran Item.
+DocType: Salary Slip,Net Pay,Gaji bersih
+DocType: Account,Account,Akaun
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} has already been received,No siri {0} telah diterima
+,Requested Items To Be Transferred,Item yang diminta Akan Dipindahkan
+DocType: Purchase Invoice,Recurring Id,Id berulang
+DocType: Customer,Sales Team Details,Butiran Pasukan Jualan
+DocType: Expense Claim,Total Claimed Amount,Jumlah Jumlah Tuntutan
+apps/erpnext/erpnext/config/crm.py +22,Potential opportunities for selling.,Peluang yang berpotensi untuk jualan.
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +174,Invalid {0},Tidak sah {0}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +48,Sick Leave,Cuti Sakit
+DocType: Email Digest,Email Digest,E-mel Digest
+DocType: Delivery Note,Billing Address Name,Bil Nama Alamat
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,Kedai Jabatan
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +40,System Balance,Sistem Imbangan
+DocType: Workflow,Is Active,Adalah aktif
+apps/erpnext/erpnext/controllers/stock_controller.py +71,No accounting entries for the following warehouses,Tiada catatan perakaunan bagi gudang berikut
+apps/erpnext/erpnext/projects/doctype/project/project.js +22,Save the document first.,Simpan dokumen pertama.
+DocType: Account,Chargeable,Boleh dikenakan cukai
+DocType: Company,Change Abbreviation,Perubahan Singkatan
+DocType: Workflow State,Primary,Rendah
+DocType: Expense Claim Detail,Expense Date,Perbelanjaan Tarikh
+DocType: Item,Max Discount (%),Max Diskaun (%)
+DocType: Communication,More Information,Maklumat lanjut
+apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +70,Last Order Amount,Perintah lepas Jumlah
+DocType: Company,Warn,Beri amaran
+DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Sebarang kenyataan lain, usaha perlu diberi perhatian yang sepatutnya pergi dalam rekod."
+DocType: BOM,Manufacturing User,Pembuatan pengguna
+DocType: Purchase Order,Raw Materials Supplied,Bahan mentah yang dibekalkan
+DocType: Purchase Invoice,Recurring Print Format,Format Cetak berulang
+DocType: Communication,Series,Siri
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +54,Expected Delivery Date cannot be before Purchase Order Date,Jangkaan Tarikh Penghantaran tidak boleh sebelum Pesanan Belian Tarikh
+DocType: Appraisal,Appraisal Template,Templat Penilaian
+DocType: Communication,Email,E-mel
+DocType: Item Group,Item Classification,Item Klasifikasi
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Business Development Manager,Pengurus Pembangunan Perniagaan
+DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,Penyelenggaraan Lawatan Tujuan
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.js +15,Period,Tempoh
+,General Ledger,Lejar Am
+apps/erpnext/erpnext/selling/doctype/campaign/campaign.js +10,View Leads,Lihat Leads
+DocType: Item Attribute Value,Attribute Value,Atribut Nilai
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +65,"Email id must be unique, already exists for {0}","Id e-mel mestilah unik, telah wujud untuk {0}"
+,Itemwise Recommended Reorder Level,Itemwise lawatan Reorder Level
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +264,Please select {0} first,Sila pilih {0} pertama
+DocType: Features Setup,To get Item Group in details table,Untuk mendapatkan Item Kumpulan dalam jadual butiran
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +112,Batch {0} of Item {1} has expired.,Batch {0} Item {1} telah tamat.
+DocType: Sales Invoice,Commission,Suruhanjaya
+DocType: Address Template,"<h4>Default Template</h4>
+<p>Uses <a href=""http://jinja.pocoo.org/docs/templates/"">Jinja Templating</a> and all the fields of Address (including Custom Fields if any) will be available</p>
+<pre><code>{{ address_line1 }}&lt;br&gt;
+{% if address_line2 %}{{ address_line2 }}&lt;br&gt;{% endif -%}
+{{ city }}&lt;br&gt;
+{% if state %}{{ state }}&lt;br&gt;{% endif -%}
+{% if pincode %} PIN:  {{ pincode }}&lt;br&gt;{% endif -%}
+{{ country }}&lt;br&gt;
+{% if phone %}Phone: {{ phone }}&lt;br&gt;{% endif -%}
+{% if fax %}Fax: {{ fax }}&lt;br&gt;{% endif -%}
+{% if email_id %}Email: {{ email_id }}&lt;br&gt;{% endif -%}
+</code></pre>","<h4> Templat lalai </h4><p> Menggunakan <a href=""http://jinja.pocoo.org/docs/templates/"">Jinja template</a> dan semua bidang Alamat (termasuk Custom Fields jika ada) boleh didapati </p><pre> <code>{{ address_line1 }}&lt;br&gt; {% if address_line2 %}{{ address_line2 }}&lt;br&gt;{% endif -%} {{ city }}&lt;br&gt; {% if state %}{{ state }}&lt;br&gt;{% endif -%} {% if pincode %} PIN: {{ pincode }}&lt;br&gt;{% endif -%} {{ country }}&lt;br&gt; {% if phone %}Phone: {{ phone }}&lt;br&gt;{% endif -%} {% if fax %}Fax: {{ fax }}&lt;br&gt;{% endif -%} {% if email_id %}Email: {{ email_id }}&lt;br&gt;{% endif -%}</code> </pre>"
+DocType: Salary Slip Deduction,Default Amount,Jumlah Default
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +89,Warehouse not found in the system,Gudang tidak dijumpai di dalam sistem
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +107,This Month's Summary,Ringkasan ini Bulan ini
+DocType: Quality Inspection Reading,Quality Inspection Reading,Kualiti Pemeriksaan Reading
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +26,`Freeze Stocks Older Than` should be smaller than %d days.,`Bekukan Stok Yang Lebih Lama Dari` hendaklah lebih kecil daripada %d hari.
+DocType: Tax Rule,Purchase Tax Template,Membeli Template Cukai
+,Project wise Stock Tracking,Projek Landasan Saham bijak
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +166,Maintenance Schedule {0} exists against {0},Jadual Penyelenggaraan {0} wujud terhadap {0}
+DocType: Stock Entry Detail,Actual Qty (at source/target),Kuantiti sebenar (pada sumber / sasaran)
+DocType: Item Customer Detail,Ref Code,Ref Kod
+apps/erpnext/erpnext/config/hr.py +13,Employee records.,Rekod pekerja.
+DocType: HR Settings,Payroll Settings,Tetapan Gaji
+apps/erpnext/erpnext/config/accounts.py +58,Match non-linked Invoices and Payments.,Padankan Invois tidak berkaitan dan Pembayaran.
+apps/erpnext/erpnext/templates/pages/cart.html +13,Place Order,Meletakkan pesanan
+apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +25,Root cannot have a parent cost center,Akar tidak boleh mempunyai pusat kos ibu bapa
+apps/erpnext/erpnext/public/js/stock_analytics.js +59,Select Brand...,Pilih Jenama ...
+DocType: Sales Invoice,C-Form Applicable,C-Borang Berkaitan
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +340,Operation Time must be greater than 0 for Operation {0},Masa operasi mesti lebih besar daripada 0 untuk operasi {0}
+DocType: Supplier,Address and Contacts,Alamat dan Kenalan
+DocType: UOM Conversion Detail,UOM Conversion Detail,Detail UOM Penukaran
+apps/erpnext/erpnext/public/js/setup_wizard.js +242,Keep it web friendly 900px (w) by 100px (h),Pastikan ia web 900px mesra (w) dengan 100px (h)
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +329,Production Order cannot be raised against a Item Template,Perintah Pengeluaran tidak boleh dibangkitkan terhadap Templat Perkara
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +44,Charges are updated in Purchase Receipt against each item,Caj akan dikemas kini di Resit Pembelian terhadap setiap item
+DocType: Payment Tool,Get Outstanding Vouchers,Dapatkan Baucer Cemerlang
+DocType: Warranty Claim,Resolved By,Diselesaikan oleh
+DocType: Appraisal,Start Date,Tarikh Mula
+apps/frappe/frappe/public/js/frappe/form/link_selector.js +21,Value,Nilai
+apps/erpnext/erpnext/config/hr.py +130,Allocate leaves for a period.,Memperuntukkan daun untuk suatu tempoh.
+apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +139,Click here to verify,Klik di sini untuk mengesahkan
+apps/erpnext/erpnext/accounts/doctype/account/account.py +43,Account {0}: You can not assign itself as parent account,Akaun {0}: Anda tidak boleh menetapkan ia sendiri sebagai akaun induk
+DocType: Purchase Invoice Item,Price List Rate,Senarai Harga Kadar
+DocType: Item,"Show ""In Stock"" or ""Not in Stock"" based on stock available in this warehouse.",Menunjukkan &quot;Pada Saham&quot; atau &quot;Tidak dalam Saham&quot; berdasarkan saham yang terdapat di gudang ini.
+apps/erpnext/erpnext/config/manufacturing.py +13,Bill of Materials (BOM),Rang Undang-Undang Bahan (BOM)
+DocType: Item,Average time taken by the supplier to deliver,Purata masa yang diambil oleh pembekal untuk menyampaikan
+DocType: Time Log,Hours,Jam
+DocType: Project,Expected Start Date,Jangkaan Tarikh Mula
+DocType: ToDo,Priority,Keutamaan
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +41,Remove item if charges is not applicable to that item,Buang item jika caj tidak berkenaan dengan perkara yang
+DocType: Dropbox Backup,Dropbox Access Allowed,Dropbox Akses dibenarkan
+DocType: Dropbox Backup,Weekly,Mingguan
+DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,Contohnya. smsgateway.com/api/send_sms.cgi
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +510,Receive,Menerima
+DocType: Maintenance Visit,Fully Completed,Siap Sepenuhnya
+apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% Lengkap
+DocType: Employee,Educational Qualification,Kelayakan pendidikan
+DocType: Workstation,Operating Costs,Kos operasi
+DocType: Employee Leave Approver,Employee Leave Approver,Pekerja Cuti Pelulus
+apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,{0} has been successfully added to our Newsletter list.,{0} telah berjaya ditambah ke senarai surat berita kami.
+apps/erpnext/erpnext/stock/doctype/item/item.py +387,Row {0}: An Reorder entry already exists for this warehouse {1},Row {0}: Suatu catatan Reorder telah wujud untuk gudang ini {1}
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +67,"Cannot declare as lost, because Quotation has been made.","Tidak boleh mengaku sebagai hilang, kerana Sebutharga telah dibuat."
+DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Pembelian Master Pengurus
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +424,Production Order {0} must be submitted,Pengeluaran Pesanan {0} hendaklah dikemukakan
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +150,Please select Start Date and End Date for Item {0},Sila pilih Mula Tarikh dan Tarikh Akhir untuk Perkara {0}
+apps/erpnext/erpnext/config/stock.py +141,Main Reports,Laporan Utama
+apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,Setakat ini tidak boleh sebelum dari tarikh
+DocType: Purchase Receipt Item,Prevdoc DocType,Prevdoc DOCTYPE
+apps/erpnext/erpnext/stock/doctype/item/item.js +178,Add / Edit Prices,Tambah / Edit Harga
+apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +53,Chart of Cost Centers,Carta Pusat Kos
+,Requested Items To Be Ordered,Item yang diminta Akan Mengarahkan
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +293,My Orders,Pesanan
+DocType: Price List,Price List Name,Senarai Harga Nama
+DocType: Time Log,For Manufacturing,Untuk Pembuatan
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +174,Totals,Jumlah
+DocType: BOM,Manufacturing,Pembuatan
+,Ordered Items To Be Delivered,Item mengarahkan Akan Dihantar
+DocType: Account,Income,Pendapatan
+,Setup Wizard,Setup Wizard
+DocType: Industry Type,Industry Type,Jenis industri
+apps/erpnext/erpnext/templates/includes/cart.js +137,Something went wrong!,Sesuatu telah berlaku!
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +100,Warning: Leave application contains following block dates,Amaran: Tinggalkan permohonan mengandungi tarikh blok berikut
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +256,Sales Invoice {0} has already been submitted,Jualan Invois {0} telah diserahkan
+apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,Tarikh Siap
+DocType: Purchase Invoice Item,Amount (Company Currency),Jumlah (Syarikat mata wang)
+DocType: Email Alert,Reference Date,Tarikh Rujukan
+apps/erpnext/erpnext/config/hr.py +105,Organization unit (department) master.,Unit organisasi (jabatan) induk.
+apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +25,Please enter valid mobile nos,Sila masukkan nos bimbit sah
+DocType: Budget Detail,Budget Detail,Detail bajet
+apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +75,Please enter message before sending,Sila masukkan mesej sebelum menghantar
+DocType: Async Task,Status,Status
+DocType: Company History,Year,Tahun
+apps/erpnext/erpnext/config/accounts.py +127,Point-of-Sale Profile,Point-of-Sale Profil
+apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +68,Please Update SMS Settings,Sila Kemaskini Tetapan SMS
+apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +37,Time Log {0} already billed,Masa Log {0} telah dibilkan
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +176,Unsecured Loans,Pinjaman tidak bercagar
+DocType: Cost Center,Cost Center Name,Kos Nama Pusat
+DocType: Maintenance Schedule Detail,Scheduled Date,Tarikh yang dijadualkan
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +69,Total Paid Amt,Jumlah dibayar AMT
+DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,Mesej yang lebih besar daripada 160 aksara akan berpecah kepada berbilang mesej
+DocType: Purchase Receipt Item,Received and Accepted,Diterima dan Diterima
+,Serial No Service Contract Expiry,Serial No Kontrak Perkhidmatan tamat
+DocType: Item,Unit of Measure Conversion,Unit Langkah Penukaran
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +86,Employee can not be changed,Pekerja tidak boleh diubah
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,You cannot credit and debit same account at the same time,Anda tidak boleh kredit dan debit akaun sama pada masa yang sama
+DocType: Naming Series,Help HTML,Bantuan HTML
+apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},Jumlah wajaran yang diberikan harus 100%. Ia adalah {0}
+apps/erpnext/erpnext/controllers/status_updater.py +140,Allowance for over-{0} crossed for Item {1},Peruntukan berlebihan {0} terlintas untuk Perkara {1}
+DocType: Address,Name of person or organization that this address belongs to.,Nama orang atau organisasi yang alamat ini kepunyaan.
+apps/erpnext/erpnext/public/js/setup_wizard.js +325,Your Suppliers,Pembekal anda
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,Tidak boleh ditetapkan sebagai Kalah sebagai Sales Order dibuat.
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +65,Another Salary Structure {0} is active for employee {1}. Please make its status 'Inactive' to proceed.,Satu lagi Struktur Gaji {0} aktif untuk pekerja {1}. Sila buat statusnya &#39;tidak aktif&#39; untuk meneruskan.
+DocType: Purchase Invoice,Contact,Hubungi
+DocType: Features Setup,Exports,Eksport
+DocType: Lead,Converted,Ditukar
+DocType: Item,Has Serial No,Mempunyai No Siri
+DocType: Employee,Date of Issue,Tarikh Keluaran
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +16,{0}: From {0} for {1},{0}: Dari {0} untuk {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +149,Row #{0}: Set Supplier for item {1},Row # {0}: Tetapkan Pembekal untuk item {1}
+DocType: Issue,Content Type,Jenis kandungan
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,Komputer
+DocType: Item,List this Item in multiple groups on the website.,Senarai Item ini dalam pelbagai kumpulan di laman web.
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +285,Please check Multi Currency option to allow accounts with other currency,Sila semak pilihan mata Multi untuk membolehkan akaun dengan mata wang lain
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +62,Item: {0} does not exist in the system,Perkara: {0} tidak wujud dalam sistem
+apps/erpnext/erpnext/accounts/doctype/account/account.py +81,You are not authorized to set Frozen value,Anda tiada kebenaran untuk menetapkan nilai Beku
+DocType: Payment Reconciliation,Get Unreconciled Entries,Dapatkan belum disatukan Penyertaan
+DocType: Cost Center,Budgets,Belanjawan
+apps/frappe/frappe/core/page/modules_setup/modules_setup.py +11,Updated,Dikemaskini
+DocType: Employee,Emergency Contact Details,Butiran Hubungi Kecemasan
+apps/erpnext/erpnext/public/js/setup_wizard.js +144,What does it do?,Apa yang ia buat?
+DocType: Delivery Note,To Warehouse,Untuk Gudang
+apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +45,Account {0} has been entered more than once for fiscal year {1},Akaun {0} telah memasuki lebih daripada sekali untuk tahun fiskal {1}
+,Average Commission Rate,Purata Kadar Suruhanjaya
+apps/erpnext/erpnext/stock/doctype/item/item.py +317,'Has Serial No' can not be 'Yes' for non-stock item,'Punyai Nombor Siri' tidak boleh 'Ya' untuk  benda bukan stok
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Attendance can not be marked for future dates,Kehadiran tidak boleh ditandakan untuk masa hadapan
+DocType: Pricing Rule,Pricing Rule Help,Peraturan Harga Bantuan
+DocType: Purchase Taxes and Charges,Account Head,Kepala Akaun
+apps/erpnext/erpnext/config/stock.py +79,Update additional costs to calculate landed cost of items,Kemas kini kos tambahan untuk mengira kos mendarat barangan
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +111,Electrical,Elektrik
+DocType: Stock Entry,Total Value Difference (Out - In),Jumlah Perbezaan Nilai (Out - Dalam)
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +304,Row {0}: Exchange Rate is mandatory,Row {0}: Kadar Pertukaran adalah wajib
+apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},ID pengguna tidak ditetapkan untuk Pekerja {0}
+apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,From Warranty Claim,Dari Waranti Tuntutan
+DocType: Stock Entry,Default Source Warehouse,Default Sumber Gudang
+DocType: Item,Customer Code,Kod Pelanggan
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +212,Birthday Reminder for {0},Peringatan hari jadi untuk {0}
+apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +72,Days Since Last Order,Sejak hari Perintah lepas
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +299,Debit To account must be a Balance Sheet account,Debit Untuk akaun perlu menjadi akaun Kunci Kira-kira
+DocType: Buying Settings,Naming Series,Menamakan Siri
+DocType: Leave Block List,Leave Block List Name,Tinggalkan Nama Sekat Senarai
+DocType: User,Enabled,Membolehkan
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Aset saham
+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},Adakah anda benar-benar mahu Submit semua Slip Gaji untuk bulan {0} dan tahun {1}
+apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +8,Import Subscribers,Pelanggan Import
+DocType: Target Detail,Target Qty,Sasaran Qty
+DocType: Attendance,Present,Hadir
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Note {0} must not be submitted,Penghantaran Nota {0} tidak boleh dikemukakan
+DocType: Notification Control,Sales Invoice Message,Mesej Invois Jualan
+DocType: Authorization Rule,Based On,Berdasarkan
+DocType: Sales Order Item,Ordered Qty,Mengarahkan Qty
+apps/erpnext/erpnext/stock/doctype/item/item.py +543,Item {0} is disabled,Perkara {0} dilumpuhkan
+DocType: Stock Settings,Stock Frozen Upto,Saham beku Upto
+apps/erpnext/erpnext/controllers/recurring_document.py +166,Period From and Period To dates mandatory for recurring {0},Tempoh Dari dan Musim Ke tarikh wajib untuk berulang {0}
+apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,Aktiviti projek / tugasan.
+apps/erpnext/erpnext/config/hr.py +65,Generate Salary Slips,Menjana Gaji Slip
+apps/frappe/frappe/utils/__init__.py +79,{0} is not a valid email id,{0} bukan id e-mel yang sah
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +41,"Buying must be checked, if Applicable For is selected as {0}","Membeli hendaklah disemak, jika Terpakai Untuk dipilih sebagai {0}"
+apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,Diskaun mesti kurang daripada 100
+DocType: ToDo,Low,Rendah
+DocType: Purchase Invoice,Write Off Amount (Company Currency),Tulis Off Jumlah (Syarikat Mata Wang)
+DocType: Landed Cost Voucher,Landed Cost Voucher,Baucer Kos mendarat
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +55,Please set {0},Sila set {0}
+DocType: Purchase Invoice,Repeat on Day of Month,Ulangi pada hari Bulan
+DocType: Employee,Health Details,Kesihatan Butiran
+DocType: Offer Letter,Offer Letter Terms,Tawaran Terma Surat
+DocType: Features Setup,To track any installation or commissioning related work after sales,Untuk mengesan mana-mana pepasangan atau pentauliahan kerja yang berkaitan selepas jualan
+DocType: Project,Estimated Costing,Anggaran Kos
+DocType: Purchase Invoice Advance,Journal Entry Detail No,Entry Detail Journal Tiada
+DocType: Employee External Work History,Salary,Gaji
+DocType: Serial No,Delivery Document Type,Penghantaran Dokumen Jenis
+DocType: Process Payroll,Submit all salary slips for the above selected criteria,Hantar semua slip gaji bagi kriteria yang dipilih di atas
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +93,{0} Items synced,{0} perkara-perkara telah diselaraskan
+DocType: Sales Order,Partly Delivered,Sebahagiannya Dihantar
+DocType: Sales Invoice,Existing Customer,Pelanggan sedia ada
+DocType: Email Digest,Receivables,Penghutang
+DocType: Customer,Additional information regarding the customer.,Maklumat tambahan mengenai pelanggan.
+DocType: Quality Inspection Reading,Reading 5,Membaca 5
+DocType: Purchase Order,"Enter email id separated by commas, order will be mailed automatically on particular date","Masukkan id e-mel yang dipisahkan dengan tanda koma, pesanan akan dihantar secara automatik pada tarikh tertentu"
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +37,Campaign Name is required,Nama Kempen diperlukan
+DocType: Maintenance Visit,Maintenance Date,Penyelenggaraan Tarikh
+DocType: Purchase Receipt Item,Rejected Serial No,Tiada Serial Ditolak
+apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +40,New Newsletter,New Newsletter
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +157,Start date should be less than end date for Item {0},Tarikh mula boleh kurang daripada tarikh akhir untuk Perkara {0}
+apps/erpnext/erpnext/stock/doctype/item/item.js +17,Show Balance,Show Baki
+DocType: Item,"Example: ABCD.#####
+If series is set and Serial No is not mentioned in transactions, then automatic serial number will be created based on this series. If you always want to explicitly mention Serial Nos for this item. leave this blank.","Contoh:. ABCD ##### Jika siri ditetapkan dan No Serial tidak disebut dalam urus niaga, nombor siri maka automatik akan diwujudkan berdasarkan siri ini. Jika anda sentiasa mahu dengan jelas menyebut Serial No untuk item ini. kosongkan ini."
+DocType: Upload Attendance,Upload Attendance,Naik Kehadiran
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +119,BOM and Manufacturing Quantity are required,BOM dan Pembuatan Kuantiti dikehendaki
+apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Range Penuaan 2
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +450,Amount,Jumlah
+apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,BOM digantikan
+,Sales Analytics,Jualan Analytics
+DocType: Manufacturing Settings,Manufacturing Settings,Tetapan Pembuatan
+apps/erpnext/erpnext/config/setup.py +56,Setting up Email,Menubuhkan E-mel
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +90,Please enter default currency in Company Master,Sila masukkan mata wang lalai dalam Syarikat Induk
+DocType: Stock Entry Detail,Stock Entry Detail,Detail saham Entry
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +101,Daily Reminders,Peringatan Harian
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +82,Tax Rule Conflicts with {0},Konflik Peraturan Cukai dengan {0}
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +207,New Account Name,Nama Akaun Baru
+DocType: Purchase Invoice Item,Raw Materials Supplied Cost,Kos Bahan mentah yang dibekalkan
+DocType: Selling Settings,Settings for Selling Module,Tetapan untuk Menjual Modul
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Customer Service,Khidmat Pelanggan
+DocType: Item,Thumbnail,Thumbnail
+DocType: Item Customer Detail,Item Customer Detail,Item Pelanggan Detail
+apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +147,Confirm Your Email,Sahkan E-mel anda
+apps/erpnext/erpnext/config/hr.py +53,Offer candidate a Job.,Tawaran calon Kerja a.
+DocType: Notification Control,Prompt for Email on Submission of,Meminta untuk e-mel pada Penyerahan
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +81,Total allocated leaves are more than days in the period,Jumlah daun diperuntukkan lebih daripada hari-hari dalam tempoh yang
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +70,Item {0} must be a stock Item,Perkara {0} mestilah Perkara saham
+DocType: Manufacturing Settings,Default Work In Progress Warehouse,Kerja Lalai Dalam Kemajuan Warehouse
+apps/erpnext/erpnext/config/accounts.py +107,Default settings for accounting transactions.,Tetapan lalai untuk transaksi perakaunan.
+apps/frappe/frappe/model/naming.py +40,{0} is required,{0} diperlukan
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,Jangkaan Tarikh tidak boleh sebelum Bahan Permintaan Tarikh
+DocType: Contact Us Settings,City,City
+apps/frappe/frappe/templates/base.html +137,Error: Not a valid id?,Ralat: Bukan id sah?
+apps/erpnext/erpnext/stock/get_item_details.py +125,Item {0} must be a Sales Item,Perkara {0} mestilah Item Jualan
+DocType: Naming Series,Update Series Number,Update Siri Nombor
+DocType: Account,Equity,Ekuiti
+DocType: Sales Order,Printing Details,Percetakan Butiran
+DocType: Task,Closing Date,Tarikh Tutup
+DocType: Sales Order Item,Produced Quantity,Dihasilkan Kuantiti
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Engineer,Jurutera
+apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,Mencari Sub Dewan
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +379,Item Code required at Row No {0},Kod Item diperlukan semasa Row Tiada {0}
+DocType: Sales Partner,Partner Type,Rakan Jenis
+DocType: Purchase Taxes and Charges,Actual,Sebenar
+DocType: Authorization Rule,Customerwise Discount,Customerwise Diskaun
+DocType: Purchase Invoice,Against Expense Account,Terhadap Akaun Perbelanjaan
+DocType: Production Order,Production Order,Perintah Pengeluaran
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +263,Installation Note {0} has already been submitted,Pemasangan Nota {0} telah diserahkan
+DocType: Quotation Item,Against Docname,Terhadap Docname
+DocType: SMS Center,All Employee (Active),Semua Pekerja (Aktif)
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,Lihat Sekarang
+DocType: Purchase Invoice,Select the period when the invoice will be generated automatically,Pilih tempoh apabila invois akan dijana secara automatik
+DocType: BOM,Raw Material Cost,Kos bahan mentah
+DocType: Item,Re-Order Level,Re-Order Level
+DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,Masukkan item dan qty dirancang yang mana anda mahu untuk meningkatkan pesanan pengeluaran atau memuat turun bahan-bahan mentah untuk analisis.
+apps/frappe/frappe/public/js/frappe/views/ganttview.js +45,Gantt Chart,Carta Gantt
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,Part-time,Sambilan
+DocType: Employee,Applicable Holiday List,Senarai Holiday berkenaan
+DocType: Employee,Cheque,Cek
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,Siri Dikemaskini
+apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Report Type is mandatory,Jenis Laporan adalah wajib
+DocType: Item,Serial Number Series,Nombor Siri Siri
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},Gudang adalah wajib bagi saham Perkara {0} berturut-turut {1}
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,Runcit &amp; Borong
+DocType: Issue,First Responded On,Pertama Dijawab Pada
+DocType: Website Item Group,Cross Listing of Item in multiple groups,Penyenaraian rentas Item dalam pelbagai kumpulan
+apps/erpnext/erpnext/public/js/setup_wizard.js +101,The First User: You,Pengguna Pertama: Anda
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +48,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},Tahun Anggaran Tarikh Mula dan Tahun Anggaran Tarikh Tamat sudah ditetapkan dalam Tahun Anggaran {0}
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +119,Successfully Reconciled,Berjaya didamaikan
+DocType: Production Order,Planned End Date,Dirancang Tarikh Akhir
+apps/erpnext/erpnext/config/stock.py +43,Where items are stored.,Di mana item disimpan.
+DocType: Tax Rule,Validity,Kesahan
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +19,Invoiced Amount,Invois
+DocType: Attendance,Attendance,Kehadiran
+DocType: Page,No,Tiada
+DocType: BOM,Materials,Bahan
+DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","Jika tidak disemak, senarai itu perlu ditambah kepada setiap Jabatan di mana ia perlu digunakan."
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +520,Posting date and posting time is mandatory,Menghantar tarikh dan masa untuk menghantar adalah wajib
+apps/erpnext/erpnext/config/buying.py +79,Tax template for buying transactions.,Template cukai untuk membeli transaksi.
+,Item Prices,Harga Item
+DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,Dalam Perkataan akan dapat dilihat selepas anda menyimpan Pesanan Belian.
+DocType: Period Closing Voucher,Period Closing Voucher,Tempoh Baucer Tutup
+apps/erpnext/erpnext/config/stock.py +125,Price List master.,Senarai Harga induk.
+DocType: Task,Review Date,Tarikh Semakan
+DocType: Purchase Invoice,Advance Payments,Bayaran Pendahuluan
+DocType: DocPerm,Level,Tahap
+DocType: Purchase Taxes and Charges,On Net Total,Di Net Jumlah
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +160,Target warehouse in row {0} must be same as Production Order,Gudang sasaran berturut-turut {0} mestilah sama dengan Perintah Pengeluaran
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +97,No permission to use Payment Tool,Tiada kebenaran untuk menggunakan Alat Pembayaran
+apps/erpnext/erpnext/controllers/recurring_document.py +192,'Notification Email Addresses' not specified for recurring %s,'Alamat-alamat E-mel Makluman' tidak dinyatakan untuk %s yang berulang
+apps/erpnext/erpnext/accounts/doctype/account/account.py +99,Currency can not be changed after making entries using some other currency,Mata wang tidak boleh diubah selepas membuat masukan menggunakan beberapa mata wang lain
+DocType: Company,Round Off Account,Bundarkan Akaun
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,Perbelanjaan pentadbiran
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +18,Consulting,Consulting
+DocType: Customer Group,Parent Customer Group,Ibu Bapa Kumpulan Pelanggan
+apps/erpnext/erpnext/public/js/pos/pos.js +429,Change,Perubahan
+DocType: Purchase Invoice,Contact Email,Hubungi E-mel
+DocType: Appraisal Goal,Score Earned,Skor Diperoleh
+apps/erpnext/erpnext/public/js/setup_wizard.js +141,"e.g. ""My Company LLC""",contohnya &quot;My Syarikat LLC&quot;
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +173,Notice Period,Tempoh notis
+DocType: Bank Reconciliation Detail,Voucher ID,ID baucar
+apps/erpnext/erpnext/setup/doctype/territory/territory.js +14,This is a root territory and cannot be edited.,Ini adalah wilayah akar dan tidak boleh diedit.
+DocType: Packing Slip,Gross Weight UOM,Berat kasar UOM
+DocType: Email Digest,Receivables / Payables,Penghutang / Pemiutang
+DocType: Delivery Note Item,Against Sales Invoice,Terhadap Invois Jualan
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +457,Credit Account,Akaun Kredit
+DocType: Landed Cost Item,Landed Cost Item,Tanah Kos Item
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +56,Show zero values,Menunjukkan nilai-nilai sifar
+DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,Kuantiti item diperolehi selepas pembuatan / pembungkusan semula daripada kuantiti diberi bahan mentah
+DocType: Payment Reconciliation,Receivable / Payable Account,Belum Terima / Akaun Belum Bayar
+DocType: Delivery Note Item,Against Sales Order Item,Terhadap Sales Order Item
+apps/erpnext/erpnext/stock/doctype/item/item.py +525,Please specify Attribute Value for attribute {0},Sila nyatakan Atribut Nilai untuk atribut {0}
+DocType: Item,Default Warehouse,Gudang Default
+DocType: Task,Actual End Date (via Time Logs),Tarikh Tamat Sebenar (melalui Log Masa)
+apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +37,Budget cannot be assigned against Group Account {0},Bajet tidak boleh diberikan terhadap Akaun Kumpulan {0}
+apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +23,Please enter parent cost center,Sila masukkan induk pusat kos
+DocType: Delivery Note,Print Without Amount,Cetak Tanpa Jumlah
+apps/erpnext/erpnext/controllers/buying_controller.py +60,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,Kategori cukai tidak boleh menjadi &#39;Penilaian&#39; atau &#39;Penilaian dan Jumlah&#39; kerana semua perkara adalah perkara tanpa saham yang
+DocType: User,Last Name,Nama Akhir
+DocType: Web Page,Left,Kiri
+DocType: Event,All Day,All Day
+DocType: Issue,Support Team,Pasukan Sokongan
+DocType: Appraisal,Total Score (Out of 5),Jumlah Skor (Daripada 5)
+DocType: Contact Us Settings,State,Negeri
+DocType: Batch,Batch,Batch
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +28,Balance,Baki
+DocType: Project,Total Expense Claim (via Expense Claims),Jumlah Tuntutan Perbelanjaan (melalui Tuntutan Perbelanjaan)
+DocType: User,Gender,Jantina
+DocType: Journal Entry,Debit Note,Nota Debit
+DocType: Stock Entry,As per Stock UOM,Seperti Saham UOM
+apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +7,Not Expired,Tidak tamat
+DocType: Journal Entry,Total Debit,Jumlah Debit
+DocType: Manufacturing Settings,Default Finished Goods Warehouse,Barangan lalai Mendapat Warehouse
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Sales Person,Orang Jualan
+DocType: Sales Invoice,Cold Calling,Panggilan Dingin
+DocType: SMS Parameter,SMS Parameter,SMS Parameter
+DocType: Maintenance Schedule Item,Half Yearly,Setengah Tahunan
+DocType: Lead,Blog Subscriber,Blog Pelanggan
+apps/erpnext/erpnext/config/setup.py +88,Create rules to restrict transactions based on values.,Mewujudkan kaedah-kaedah untuk menyekat transaksi berdasarkan nilai-nilai.
+DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","Jika disemak, Jumlah no. Hari Kerja termasuk cuti, dan ini akan mengurangkan nilai Gaji Setiap Hari"
+DocType: Purchase Invoice,Total Advance,Jumlah Advance
+DocType: Workflow State,User,Pengguna
+apps/erpnext/erpnext/config/hr.py +220,Processing Payroll,Pemprosesan Payroll
+DocType: Opportunity Item,Basic Rate,Kadar asas
+DocType: GL Entry,Credit Amount,Jumlah Kredit
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +141,Set as Lost,Ditetapkan sebagai Hilang
+DocType: Customer,Credit Days Based On,Hari Kredit Berasaskan
+DocType: Tax Rule,Tax Rule,Peraturan Cukai
+DocType: Selling Settings,Maintain Same Rate Throughout Sales Cycle,Mengekalkan Kadar Sama Sepanjang Kitaran Jualan
+DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,Rancang log masa di luar Waktu Workstation Kerja.
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +95,{0} {1} has already been submitted,{0} {1} telah diserahkan
+,Items To Be Requested,Item Akan Diminta
+DocType: Purchase Order,Get Last Purchase Rate,Dapatkan lepas Kadar Pembelian
+DocType: Time Log,Billing Rate based on Activity Type (per hour),Kadar bil berdasarkan Jenis Aktiviti (sejam)
+DocType: Company,Company Info,Maklumat Syarikat
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +206,"Company Email ID not found, hence mail not sent","Syarikat E-mel ID tidak dijumpai, maka mel tidak dihantar"
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Permohonan Dana (Aset)
+DocType: Production Planning Tool,Filter based on item,Filter berdasarkan item
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +451,Debit Account,Akaun Debit
+DocType: Fiscal Year,Year Start Date,Tahun Tarikh Mula
+DocType: Attendance,Employee Name,Nama Pekerja
+DocType: Sales Invoice,Rounded Total (Company Currency),Bulat Jumlah (Syarikat mata wang)
+apps/erpnext/erpnext/accounts/doctype/account/account.py +115,Cannot covert to Group because Account Type is selected.,Tidak boleh Covert kepada Kumpulan kerana Jenis Akaun dipilih.
+DocType: Purchase Common,Purchase Common,Pembelian Bersama
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +95,{0} {1} has been modified. Please refresh.,{0} {1} telah diubah suai. Sila muat semula.
+DocType: Leave Block List,Stop users from making Leave Applications on following days.,Menghentikan pengguna daripada membuat Permohonan Cuti pada hari-hari berikut.
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +591,From Opportunity,Dari Peluang
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,Employee Benefits,Manfaat Pekerja
+DocType: Sales Invoice,Is POS,Adalah POS
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +245,Packed quantity must equal quantity for Item {0} in row {1},Makan kuantiti mestilah sama dengan kuantiti untuk Perkara {0} berturut-turut {1}
+DocType: Production Order,Manufactured Qty,Dikilangkan Qty
+DocType: Purchase Receipt Item,Accepted Quantity,Kuantiti Diterima 
+apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} tidak wujud
+apps/erpnext/erpnext/config/accounts.py +18,Bills raised to Customers.,Bil dinaikkan kepada Pelanggan.
+DocType: DocField,Default,Default
+apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Id Projek
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +468,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Row Tiada {0}: Jumlah tidak boleh lebih besar daripada Pending Jumlah Perbelanjaan terhadap Tuntutan {1}. Sementara menunggu Amaun adalah {2}
+apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +40,{0} subscribers added,{0} pelanggan ditambah
+DocType: Maintenance Schedule,Schedule,Jadual
+DocType: Cost Center,"Define Budget for this Cost Center. To set budget action, see ""Company List""","Tentukan Bajet untuk PTJ ini. Untuk menetapkan tindakan bajet, lihat &quot;Senarai Syarikat&quot;"
+DocType: Account,Parent Account,Akaun Ibu Bapa
+DocType: Quality Inspection Reading,Reading 3,Membaca 3
+,Hub,Hub
+DocType: GL Entry,Voucher Type,Baucer Jenis
+apps/erpnext/erpnext/public/js/pos/pos.js +91,Price List not found or disabled,Senarai Harga tidak dijumpai atau orang kurang upaya
+DocType: Expense Claim,Approved,Diluluskan
+DocType: Pricing Rule,Price,Harga
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +88,Employee relieved on {0} must be set as 'Left',Pekerja lega pada {0} mesti ditetapkan sebagai &#39;kiri&#39;
+DocType: Item,"Selecting ""Yes"" will give a unique identity to each entity of this item which can be viewed in the Serial No master.",Memilih &quot;Ya&quot; akan memberikan identiti yang unik untuk setiap entiti item ini yang boleh dilihat dalam Serial No induk.
+apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +39,Appraisal {0} created for Employee {1} in the given date range,Penilaian {0} dicipta untuk Pekerja {1} dalam julat tarikh yang diberikan
+DocType: Employee,Education,Pendidikan
+DocType: Selling Settings,Campaign Naming By,Menamakan Kempen Dengan
+DocType: Employee,Current Address Is,Alamat semasa
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +217,"Optional. Sets company's default currency, if not specified.","Pilihan. Set mata wang lalai syarikat, jika tidak dinyatakan."
+DocType: Address,Office,Pejabat
+apps/frappe/frappe/desk/moduleview.py +67,Standard Reports,Laporan Standard
+apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,Catatan jurnal perakaunan.
+DocType: Delivery Note Item,Available Qty at From Warehouse,Kuantiti Boleh didapati di Dari Gudang
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +224,Please select Employee Record first.,Sila pilih Rakam Pekerja pertama.
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Row {0}: Majlis / Akaun tidak sepadan dengan {1} / {2} dalam {3} {4}
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +35,To create a Tax Account,Untuk membuat Akaun Cukai
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +233,Please enter Expense Account,Sila masukkan Akaun Perbelanjaan
+DocType: Account,Stock,Saham
+DocType: Employee,Current Address,Alamat Semasa
+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","Jika item adalah variasi yang lain item maka penerangan, gambar, harga, cukai dan lain-lain akan ditetapkan dari template melainkan jika dinyatakan secara jelas"
+DocType: Serial No,Purchase / Manufacture Details,Pembelian / Butiran Pembuatan
+apps/erpnext/erpnext/config/stock.py +288,Batch Inventory,Batch Inventori
+DocType: Employee,Contract End Date,Kontrak Tarikh akhir
+DocType: Sales Order,Track this Sales Order against any Project,Jejaki Pesanan Jualan ini terhadap mana-mana Projek
+DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,Pesanan jualan Tarik (menunggu untuk menyampaikan) berdasarkan kriteria di atas
+DocType: DocShare,Document Type,Jenis dokumen
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +588,From Supplier Quotation,Dari Sebutharga Pembekal
+DocType: Deduction Type,Deduction Type,Potongan Jenis
+DocType: Attendance,Half Day,Hari separuh
+DocType: Pricing Rule,Min Qty,Min Qty
+DocType: Features Setup,"To track items in sales and purchase documents with batch nos. ""Preferred Industry: Chemicals""",Untuk mengesan barang-barang jualan dan dokumen pembelian dengan nos kelompok. &quot;Industri dipilih: Bahan kimia&quot;
+DocType: GL Entry,Transaction Date,Transaksi Tarikh
+DocType: Production Plan Item,Planned Qty,Dirancang Kuantiti
+apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +93,Total Tax,Jumlah Cukai
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +178,For Quantity (Manufactured Qty) is mandatory,Untuk Kuantiti (Dikilangkan Qty) adalah wajib
+DocType: Stock Entry,Default Target Warehouse,Default Gudang Sasaran
+DocType: Purchase Invoice,Net Total (Company Currency),Jumlah bersih (Syarikat mata wang)
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +79,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Row {0}: Jenis Parti dan Parti hanya terpakai terhadap / akaun Belum Bayar Belum Terima
+DocType: Notification Control,Purchase Receipt Message,Pembelian Resit Mesej
+DocType: Production Order,Actual Start Date,Tarikh Mula Sebenar 
+DocType: Sales Order,% of materials delivered against this Sales Order,% bahan-bahan yang dihantar untuk Pesanan Jualan ini
+apps/erpnext/erpnext/config/stock.py +23,Record item movement.,Pergerakan item rekod.
+DocType: Newsletter List Subscriber,Newsletter List Subscriber,Newsletter Senarai Pelanggan
+DocType: Email Account,Service,Perkhidmatan
+DocType: Hub Settings,Hub Settings,Tetapan Hub
+DocType: Project,Gross Margin %,Margin kasar%
+DocType: BOM,With Operations,Dengan Operasi
+apps/erpnext/erpnext/accounts/party.py +232,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Entri perakaunan telah dibuat dalam mata wang {0} untuk syarikat {1}. Sila pilih belum terima atau yang kena dibayar dengan mata wang {0}.
+,Monthly Salary Register,Gaji Bulanan Daftar
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard_page.html +17,Next,Seterusnya
+DocType: Warranty Claim,If different than customer address,Jika berbeza daripada alamat pelanggan
+DocType: BOM Operation,BOM Operation,BOM Operasi
+DocType: Purchase Taxes and Charges,On Previous Row Amount,Pada Row Jumlah Sebelumnya
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +33,Please enter Payment Amount in atleast one row,Sila masukkan Pembayaran Jumlah dalam atleast satu baris
+DocType: POS Profile,POS Profile,POS Profil
+apps/erpnext/erpnext/config/accounts.py +153,"Seasonality for setting budgets, targets etc.","Bermusim untuk menetapkan belanjawan, sasaran dan lain-lain"
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +238,Row {0}: Payment Amount cannot be greater than Outstanding Amount,Row {0}: Jumlah Bayaran tidak boleh lebih besar daripada Jumlah Cemerlang
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +46,Total Unpaid,Jumlah yang tidak dibayar
+apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +21,Time Log is not billable,Masa Log tidak dapat ditaksir
+apps/erpnext/erpnext/stock/get_item_details.py +128,"Item {0} is a template, please select one of its variants","Perkara {0} adalah template, sila pilih salah satu daripada variannya"
+apps/erpnext/erpnext/public/js/setup_wizard.js +272,Purchaser,Pembeli
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +81,Net pay cannot be negative,Gaji bersih tidak boleh negatif
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +107,Please enter the Against Vouchers manually,Sila masukkan Terhadap Baucar secara manual
+DocType: SMS Settings,Static Parameters,Parameter statik
+DocType: Purchase Order,Advance Paid,Advance Dibayar
+DocType: Item,Item Tax,Perkara Cukai
+DocType: Expense Claim,Employees Email Id,Id Pekerja E-mel
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +159,Current Liabilities,Liabiliti Semasa
+apps/erpnext/erpnext/config/crm.py +48,Send mass SMS to your contacts,Hantar SMS massa ke kenalan anda
+DocType: Purchase Taxes and Charges,Consider Tax or Charge for,Pertimbangkan Cukai atau Caj
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,Kuantiti sebenar adalah wajib
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +132,Credit Card,Kad Kredit
+DocType: BOM,Item to be manufactured or repacked,Perkara yang perlu dibuat atau dibungkus semula
+apps/erpnext/erpnext/config/stock.py +95,Default settings for stock transactions.,Tetapan lalai bagi urus niaga saham.
+DocType: Purchase Invoice,Next Date,Tarikh seterusnya
+DocType: Employee Education,Major/Optional Subjects,Subjek utama / Pilihan
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +49,Please enter Taxes and Charges,Sila masukkan Cukai dan Caj
+DocType: Sales Invoice Item,Drop Ship,Drop Ship
+DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","Di sini anda boleh mengekalkan butiran keluarga seperti nama dan pekerjaan ibu bapa, suami atau isteri dan anak-anak"
+DocType: Hub Settings,Seller Name,Nama Penjual
+DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),Cukai dan Caj Dipotong (Syarikat mata wang)
+DocType: Item Group,General Settings,Tetapan umum
+apps/erpnext/erpnext/setup/doctype/currency_exchange/currency_exchange.py +19,From Currency and To Currency cannot be same,Dari Mata Wang dan Untuk mata wang tidak boleh sama
+DocType: Stock Entry,Repack,Membungkus semula
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +6,You must Save the form before proceeding,Anda mesti Simpan bentuk sebelum meneruskan
+DocType: Item Attribute,Numeric Values,Nilai-nilai berangka
+apps/erpnext/erpnext/public/js/setup_wizard.js +246,Attach Logo,Lampirkan Logo
+DocType: Customer,Commission Rate,Kadar komisen
+apps/erpnext/erpnext/stock/doctype/item/item.js +38,Make Variant,Membuat Varian
+apps/erpnext/erpnext/config/hr.py +145,Block leave applications by department.,Permohonan cuti blok oleh jabatan.
+apps/erpnext/erpnext/templates/pages/cart.html +42,Cart is Empty,Troli kosong
+DocType: Production Order,Actual Operating Cost,Kos Sebenar Operasi
+apps/erpnext/erpnext/accounts/doctype/account/account.py +73,Root cannot be edited.,Akar tidak boleh diedit.
+apps/erpnext/erpnext/accounts/utils.py +195,Allocated amount can not greater than unadusted amount,Jumlah yang diperuntukkan tidak boleh lebih besar daripada jumlah unadusted
+DocType: Manufacturing Settings,Allow Production on Holidays,Benarkan Pengeluaran pada Cuti
+DocType: Sales Order,Customer's Purchase Order Date,Pesanan Belian Tarikh Pelanggan
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +183,Capital Stock,Modal Saham
+DocType: Packing Slip,Package Weight Details,Pakej Berat Butiran
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +105,Please select a csv file,Sila pilih fail csv
+DocType: Dropbox Backup,Send Backups to Dropbox,Hantar Backup untuk Dropbox
+DocType: Purchase Order,To Receive and Bill,Terima dan Rang Undang-undang
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Designer,Designer
+apps/erpnext/erpnext/config/selling.py +121,Terms and Conditions Template,Terma dan Syarat Template
+DocType: Serial No,Delivery Details,Penghantaran Details
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +386,Cost Center is required in row {0} in Taxes table for type {1},PTJ diperlukan berturut-turut {0} dalam Cukai meja untuk jenis {1}
+DocType: Item,Automatically create Material Request if quantity falls below this level,Mewujudkan Bahan Permintaan secara automatik jika kuantiti jatuh di bawah paras ini
+,Item-wise Purchase Register,Perkara-bijak Pembelian Daftar
+DocType: Batch,Expiry Date,Tarikh Luput
+apps/erpnext/erpnext/stock/doctype/item/item.py +379,"To set reorder level, item must be a Purchase Item or Manufacturing Item","Untuk menetapkan tahap pesanan semula, item perlu menjadi Perkara Pembelian atau Manufacturing Perkara"
+,Supplier Addresses and Contacts,Alamat Pembekal dan Kenalan
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,Sila pilih Kategori pertama
+apps/erpnext/erpnext/config/projects.py +18,Project master.,Induk projek.
+DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,Tidak menunjukkan apa-apa simbol seperti $ dsb sebelah mata wang.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +374, (Half Day),(Separuh Hari)
+DocType: Supplier,Credit Days,Hari Kredit
+DocType: Leave Type,Is Carry Forward,Apakah Carry Forward
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +478,Get Items from BOM,Dapatkan Item dari BOM
+apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Membawa Hari Masa
+apps/erpnext/erpnext/config/manufacturing.py +120,Bill of Materials,Rang Undang-Undang Bahan
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +77,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Row {0}: Jenis Parti dan Parti diperlukan untuk / akaun Dibayar Terima {1}
+DocType: Dropbox Backup,Send Notifications To,Hantar Pemberitahuan Untuk
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +54,Ref Date,Ref Tarikh
+DocType: Employee,Reason for Leaving,Sebab Berhenti
+DocType: Expense Claim Detail,Sanctioned Amount,Jumlah dibenarkan
+DocType: GL Entry,Is Opening,Adalah Membuka
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +164,Row {0}: Debit entry can not be linked with a {1},Row {0}: Debit kemasukan tidak boleh dikaitkan dengan {1}
+apps/erpnext/erpnext/accounts/doctype/account/account.py +188,Account {0} does not exist,Akaun {0} tidak wujud
+DocType: Account,Cash,Tunai
+DocType: Employee,Short biography for website and other publications.,Biografi ringkas untuk laman web dan penerbitan lain.
diff --git a/erpnext/translations/my.csv b/erpnext/translations/my.csv
index 178dc12..17b60c1 100644
--- a/erpnext/translations/my.csv
+++ b/erpnext/translations/my.csv
@@ -1,13 +1,12 @@
 DocType: Employee,Salary Mode,လစာ Mode ကို
 DocType: Cost Center,"Select Monthly Distribution, if you want to track based on seasonality.","သင်ရာသီပေါ်အခြေခံပြီးခြေရာခံချင်လျှင်, လစဉ်ဖြန့်ဖြူးကိုရွေးချယ်ပါ။"
 DocType: Employee,Divorced,ကွာရှင်း
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +86,Warning: Same item has been entered multiple times.,သတိပေးချက်: အတူတူပါပဲတဲ့ item ကိုအကြိမ်ပေါင်းများစွာသို့ဝင်ခဲ့သည်။
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +80,Warning: Same item has been entered multiple times.,သတိပေးချက်: အတူတူပါပဲတဲ့ item ကိုအကြိမ်ပေါင်းများစွာသို့ဝင်ခဲ့သည်။
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +96,Items already synced,ပြီးသား Sync လုပ်ထား items
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,ပစ္စည်းတစ်ခုအရောင်းအဝယ်အတွက်အကြိမ်ပေါင်းများစွာကဆက်ပြောသည်ခံရဖို့ Allow
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,ဒီအာမခံပြောဆိုချက်ကိုပယ်ဖျက်မီပစ္စည်းခရီးစဉ် {0} Cancel
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +19,Consumer Products,လူသုံးကုန်ထုတ်ကုန်ပစ္စည်းများ
+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,ပါတီ Type ပထမဦးဆုံးကိုရွေးပါ ကျေးဇူးပြု.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +90,Annealing,Annealing
 DocType: Item,Customer Items,customer ပစ္စည်းများ
 apps/erpnext/erpnext/accounts/doctype/account/account.py +45,Account {0}: Parent account {1} can not be a ledger,အကောင့်ကို {0}: မိဘအကောင့်ကို {1} တစ်ဦးလယ်ဂျာမဖွစျနိုငျ
 DocType: Item,Publish Item to hub.erpnext.com,hub.erpnext.com မှ Item ထုတ်ဝေ
@@ -20,15 +19,14 @@
 DocType: About Us Settings,Website,website
 DocType: POS Profile,Applicable for User,အသုံးပြုသူများအတွက်သက်ဆိုင်သော
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +169,"Stopped Production Order cannot be cancelled, Unstop it first to cancel",ထုတ်လုပ်မှုအမိန့်ကိုပယ်ဖျက်ဖို့ပထမဦးဆုံးက Unstop ဖျက်သိမ်းလိုက်ရမရနိုင်ပါရပ်တန့်
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +23,Compaction plus sintering,Compact အပေါင်း sintering
 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.,* ထိုအရောင်းအဝယ်အတွက်တွက်ချက်ခြင်းကိုခံရလိမ့်မည်။
 DocType: Purchase Order,Customer Contact,customer ဆက်သွယ်ရန်
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +549,From Material Request,ပစ္စည်းတောင်းဆိုမှုကနေ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +572,From Material Request,ပစ္စည်းတောင်းဆိုမှုကနေ
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} Tree
 DocType: Job Applicant,Job Applicant,ယောဘသည်လျှောက်ထားသူ
 apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,နောက်ထပ်ရလဒ်များမရှိပါ။
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +78,Legal,ဥပဒေကြောင်းအရ
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +34,Legal,ဥပဒေကြောင်းအရ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +114,Actual type tax cannot be included in Item rate in row {0},အမှန်တကယ် type ကိုအခွန်အတန်း {0} အတွက် Item နှုန်းကတွင်ထည့်သွင်းမရနိုင်ပါ
 DocType: C-Form,Customer,ဝယ်သူ
 DocType: Purchase Receipt Item,Required By,အားဖြင့်လိုအပ်သော
@@ -43,7 +41,6 @@
 DocType: Manufacturing Settings,Default 10 mins,10 မိနစ် default
 DocType: Leave Type,Leave Type Name,Type အမည် Leave
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +148,Series Updated Successfully,စီးရီးအောင်မြင်စွာကျင်းပပြီးစီး Updated
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +150,Stitching,ချုပ်
 DocType: Pricing Rule,Apply On,တွင် Apply
 DocType: Item Price,Multiple Item prices.,အကွိမျမြားစှာ Item ဈေးနှုန်းများ။
 ,Purchase Order Items To Be Received,ရရှိထားသည့်ခံရဖို့အမိန့်ပစ္စည်းများဝယ်ယူရန်
@@ -51,8 +48,8 @@
 DocType: Quality Inspection Reading,Parameter,parameter
 apps/erpnext/erpnext/projects/doctype/project/project.py +43,Expected End Date can not be less than Expected Start Date,မျှော်လင့်ထားသည့်အဆုံးနေ့စွဲမျှော်မှန်း Start ကိုနေ့စွဲထက်လျော့နည်းမဖွစျနိုငျ
 apps/erpnext/erpnext/utilities/transaction_base.py +104,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,row # {0}: {2} ({3} / {4}): Rate {1} အဖြစ်အတူတူသာဖြစ်ရမည်
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +189,New Leave Application,နယူးထွက်ခွာလျှောက်လွှာ
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +134,Bank Draft,ဘဏ်မှမူကြမ်း
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +204,New Leave Application,နယူးထွက်ခွာလျှောက်လွှာ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +134,Bank Draft,ဘဏ်မှမူကြမ်း
 DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,ဒီ option ကိုသူတို့ရဲ့ code ကိုအသုံးအပေါ်အခြေခံပြီး 1. ဖောက်သည်ပညာရှိသောသူကို item code ကိုထိန်းသိမ်းရန်နှင့်သူတို့ကိုရှာဖွေစေ
 DocType: Mode of Payment Account,Mode of Payment Account,ငွေပေးချေမှုရမည့်အကောင့်၏ Mode ကို
 apps/erpnext/erpnext/stock/doctype/item/item.js +34,Show Variants,Show ကို Variant
@@ -64,25 +61,23 @@
 DocType: Production Plan Item,Production Plan Item,ထုတ်လုပ်မှုစီမံကိန်း Item
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +141,User {0} is already assigned to Employee {1},အသုံးပြုသူ {0} ပြီးသားန်ထမ်း {1} မှတာဝန်ပေးသည်
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +13,Make new POS Profile,အသစ် POS Profile ကိုလုပ်ပါ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +31,Health Care,ကျန်းမာရေးစောင့်ရှောက်မှု
+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 +494,Invoice,ဝယ်ကုန်စာရင်း
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +519,Invoice,ဝယ်ကုန်စာရင်း
 DocType: Maintenance Schedule Item,Periodicity,ကာလ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +357,Email Address,အီးမေးလ်လိပ်စာ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +21,Defense,ကာကွယ်မှု
+apps/erpnext/erpnext/public/js/setup_wizard.js +107,Email Address,အီးမေးလ်လိပ်စာ
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,ကာကွယ်မှု
 DocType: Company,Abbr,Abbr
 DocType: Appraisal Goal,Score (0-5),ရမှတ် (0-5)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +193,Row {0}: {1} {2} does not match with {3},row {0}: {1} {2} {3} နှင့်အတူလိုက်ဖက်ပါဘူး
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +67,Row # {0}:,row # {0}:
 DocType: Delivery Note,Vehicle No,မော်တော်ယာဉ်မရှိပါ
 apps/erpnext/erpnext/public/js/pos/pos.js +528,Please select Price List,စျေးနှုန်း List ကို select လုပ်ပါ ကျေးဇူးပြု.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +162,Woodworking,အကယ်စင်စစ်
 DocType: Production Order Operation,Work In Progress,တိုးတက်မှုများတွင်အလုပ်
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +153,3D printing,3D ပုံနှိပ်ခြင်း
 DocType: Employee,Holiday List,အားလပ်ရက်များစာရင်း
 DocType: Time Log,Time Log,အချိန်အထဲ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +530,Accountant,စာရင်းကိုင်
+apps/erpnext/erpnext/public/js/setup_wizard.js +274,Accountant,စာရင်းကိုင်
 DocType: Cost Center,Stock User,စတော့အိတ်အသုံးပြုသူတို့၏
 DocType: Company,Phone No,Phone များမရှိပါ
 DocType: Time Log,"Log of Activities performed by users against Tasks that can be used for tracking time, billing.","ခြေရာခံချိန်, ငွေတောင်းခံရာတွင်အသုံးပြုနိုင် Tasks ကိုဆန့်ကျင်အသုံးပြုသူများဖျော်ဖြေလှုပ်ရှားမှုများ၏အထဲ။"
@@ -98,18 +93,19 @@
 DocType: Bin,Quantity Requested for Purchase,ဝယ်ယူခြင်းအဘို့အတောင်းဆိုထားသောပမာဏ
 DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name","ကော်လံနှစ်ခု, ဟောင်းနာ​​မအဘို့တယောက်နှင့်အသစ်များနာမအဘို့တယောက်နှင့်အတူ .csv file ကို Attach"
 DocType: Packed Item,Parent Detail docname,မိဘ Detail docname
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Kg,ကီလိုဂရမ်
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Kg,ကီလိုဂရမ်
 apps/erpnext/erpnext/config/hr.py +48,Opening for a Job.,တစ်ဦးယောဘသည်အဖွင့်။
 DocType: Item Attribute,Increment,increment
 apps/erpnext/erpnext/public/js/stock_analytics.js +63,Select Warehouse...,ဂိုဒေါင်ကိုရွေးပါ ...
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +6,Advertising,Advertising ကြော်ငြာ
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,Advertising ကြော်ငြာ
+apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,တူညီသော Company ကိုတစ်ကြိမ်ထက်ပိုပြီးသို့ ဝင်. ဖြစ်ပါတယ်
 DocType: Employee,Married,အိမ်ထောင်သည်
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +389,Stock cannot be updated against Delivery Note {0},စတော့အိတ် Delivery မှတ်ချက် {0} ဆန့်ကျင် updated မရနိုင်ပါ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +391,Stock cannot be updated against Delivery Note {0},စတော့အိတ် Delivery မှတ်ချက် {0} ဆန့်ကျင် updated မရနိုင်ပါ
 DocType: Payment Reconciliation,Reconcile,ပြန်လည်သင့်မြတ်
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +30,Grocery,ကုန်စုံ
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,ကုန်စုံ
 DocType: Quality Inspection Reading,Reading 1,1 Reading
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Make Bank Entry,ဘဏ်မှ Entry &#39;ပါစေ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +40,Pension Funds,ပင်စင်ရန်ပုံငွေ
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,ပင်စင်ရန်ပုံငွေ
 apps/erpnext/erpnext/accounts/doctype/account/account.py +142,Warehouse is mandatory if account type is Warehouse,အကောင့်အမျိုးအစားကိုဂိုဒေါင်လျှင်ဂိုဒေါင်မသင်မနေရ
 DocType: SMS Center,All Sales Person,အားလုံးသည်အရောင်းပုဂ္ဂိုလ်
 DocType: Lead,Person Name,လူတစ်ဦးအမည်
@@ -131,7 +127,7 @@
 DocType: Quality Inspection,Get Specification Details,Specification အသေးစိတ် Get
 DocType: Lead,Interested,စိတ်ဝင်စား
 apps/erpnext/erpnext/config/manufacturing.py +14,Bill of Material,ပစ္စည်း၏ဘီလ်
-apps/erpnext/erpnext/public/js/stock_analytics.js +45,Opening,ဖွင့်ပွဲ
+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,Item အုပ်စု မှစ. မိတ္တူ
 DocType: Journal Entry,Opening Entry,Entry &#39;ဖွင့်လှစ်
@@ -145,23 +141,22 @@
 DocType: Employee Education,Under Graduate,ဘွဲ့လွန်အောက်မှာ
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +22,Target On,Target ကတွင်
 DocType: BOM,Total Cost,စုစုပေါင်းကုန်ကျစရိတ်
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +99,Reaming,Reaming
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +9,Activity Log:,လုပ်ဆောင်ချက်အထဲ:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +199,Item {0} does not exist in the system or has expired,item {0} system ကိုအတွက်မတည်ရှိပါဘူးသို့မဟုတ်သက်တမ်း
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +44,Real Estate,အိမ်ခြံမြေရောင်းဝယ်ရေးလုပ်ငန်း
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +44,Real Estate,အိမ်ခြံမြေရောင်းဝယ်ရေးလုပ်ငန်း
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +4,Statement of Account,အကောင့်၏ထုတ်ပြန်ကြေညာချက်
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +41,Pharmaceuticals,ဆေးဝါးများ
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,ဆေးဝါးများ
 DocType: Expense Claim Detail,Claim Amount,ပြောဆိုချက်ကိုငွေပမာဏ
 DocType: Employee,Mr,ဦး
 DocType: Custom Script,Client,ဖောက်သည်
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,ပေးသွင်း Type / ပေးသွင်း
 DocType: Naming Series,Prefix,ရှေ့ဆကျတှဲ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Consumable,Consumer
+apps/erpnext/erpnext/public/js/setup_wizard.js +359,Consumable,Consumer
 DocType: Upload Attendance,Import Log,သွင်းကုန်အထဲ
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.js +19,Send,ပေးပို့
 DocType: Sales Invoice Item,Delivered By Supplier,ပေးသွင်းခြင်းအားဖြင့်ကယ်နှုတ်တော်မူ၏
 DocType: SMS Center,All Contact,အားလုံးသည်ဆက်သွယ်ရန်
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +164,Annual Salary,နှစ်ပတ်လည်လစာ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +164,Annual Salary,နှစ်ပတ်လည်လစာ
 DocType: Period Closing Voucher,Closing Fiscal Year,နိဂုံးချုပ်ဘဏ္ဍာရေးနှစ်တစ်နှစ်တာ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +69,Stock Expenses,စတော့အိတ်အသုံးစရိတ်များ
 DocType: Newsletter,Email Sent?,အီးမေးလ် Sent?
@@ -169,26 +164,24 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +92,Show Time Logs,Show ကိုအချိန် Logs
 DocType: Journal Entry Account,Credit in Company Currency,Company မှငွေကြေးစနစ်အတွက်အကြွေး
 DocType: Delivery Note,Installation Status,Installation လုပ်တဲ့နဲ့ Status
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +115,Accepted + Rejected Qty must be equal to Received quantity for Item {0},လက်ခံထားတဲ့ + Qty Item {0} သည်ရရှိထားသည့်အရေအတွက်နှင့်ညီမျှဖြစ်ရမည်ငြင်းပယ်
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +118,Accepted + Rejected Qty must be equal to Received quantity for Item {0},လက်ခံထားတဲ့ + Qty Item {0} သည်ရရှိထားသည့်အရေအတွက်နှင့်ညီမျှဖြစ်ရမည်ငြင်းပယ်
 DocType: Item,Supply Raw Materials for Purchase,ဝယ်ယူခြင်းအဘို့အ supply ကုန်ကြမ်း
 apps/erpnext/erpnext/stock/get_item_details.py +133,Item {0} must be a Purchase Item,item {0} တစ်ဦးဝယ်ယူ Item ဖြစ်ရမည်
 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","Template ကို Download, သင့်လျော်သောအချက်အလက်ဖြည့်စွက်ခြင်းနှင့်ပြုပြင်ထားသောဖိုင်ပူးတွဲ။ ရွေးချယ်ထားတဲ့ကာလအတွက်အားလုံးသည်ရက်စွဲများနှင့်ဝန်ထမ်းပေါင်းစပ်လက်ရှိတက်ရောက်သူမှတ်တမ်းများနှင့်တကွ, template မှာရောက်လိမ့်မည်"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +446,Item {0} is not active or end of life has been reached,item {0} တက်ကြွသို့မဟုတ်အသက်၏အဆုံးသည်မဖြစ်သေးရောက်ရှိခဲ့သည်
 DocType: Time Log Batch,Will be updated after Sales Invoice is Submitted.,အရောင်းပြေစာ Submitted ပြီးနောက် updated လိမ့်မည်။
-apps/erpnext/erpnext/controllers/accounts_controller.py +493,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","အခွန်ကိုထည့်သွင်းရန်အတန်းအတွက် {0} Item မှုနှုန်း, အတန်း {1} အတွက်အခွန်ကိုလည်းထည့်သွင်းရပါမည်"
+apps/erpnext/erpnext/controllers/accounts_controller.py +494,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","အခွန်ကိုထည့်သွင်းရန်အတန်းအတွက် {0} Item မှုနှုန်း, အတန်း {1} အတွက်အခွန်ကိုလည်းထည့်သွင်းရပါမည်"
 apps/erpnext/erpnext/config/hr.py +90,Settings for HR Module,HR Module သည် Settings ကို
 DocType: SMS Center,SMS Center,SMS ကို Center က
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +78,Straightening,ဖွောငျ့စေ
 DocType: BOM Replace Tool,New BOM,နယူး BOM
 apps/erpnext/erpnext/config/projects.py +28,Batch Time Logs for billing.,ငွေတောင်းခံသည် batch အချိန် Logs ။
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +15,Countergravity casting,Countergravity သွန်း
 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/setup/page/setup_wizard/fixtures/industry_type.py +14,Broadcasting,အသံလွှင့်
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +140,Execution,သတ်ခြင်း
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +364,The first user will become the System Manager (you can change this later).,ပထမဦးဆုံးအသုံးပြုသူဟာ System Manager က (သင်နောက်ပိုင်းမှာဒီပြောင်းလဲနိုင်သည်) ဖြစ်လာပါလိမ့်မယ်။
+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/public/js/setup_wizard.js +114,The first user will become the System Manager (you can change this later).,ပထမဦးဆုံးအသုံးပြုသူဟာ System Manager က (သင်နောက်ပိုင်းမှာဒီပြောင်းလဲနိုင်သည်) ဖြစ်လာပါလိမ့်မယ်။
 apps/erpnext/erpnext/config/manufacturing.py +39,Details of the operations carried out.,ထိုစစ်ဆင်ရေး၏အသေးစိတျထုတျဆောင်သွားကြ၏။
 DocType: Serial No,Maintenance Status,ပြုပြင်ထိန်းသိမ်းမှုနဲ့ Status
 apps/erpnext/erpnext/config/stock.py +263,Items and Pricing,ပစ္စည်းများနှင့်စျေးနှုန်းများ
@@ -205,7 +198,6 @@
 DocType: Pricing Rule,Discount on Price List Rate (%),စျေးနှုန်း List ကို Rate (%) အပေါ်လျှော့စျေး
 apps/frappe/frappe/public/js/frappe/form/print.js +96,Start,စတင်
 DocType: User,First Name,နာမည်
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +12,Full-mold casting,full-မှိုသွန်း
 DocType: Offer Letter,Select Terms and Conditions,စည်းကမ်းသတ်မှတ်ချက်များကိုရွေးပါ
 DocType: Production Planning Tool,Sales Orders,အရောင်းအမိန့်
 DocType: Purchase Taxes and Charges,Valuation,အဘိုးထားခြင်း
@@ -217,8 +209,7 @@
 DocType: Bank Reconciliation,Bank Account,ဘဏ်မှအကောင့်
 DocType: Leave Type,Allow Negative Balance,အပြုသဘောမဆောင်သော Balance Allow
 DocType: Selling Settings,Default Territory,default နယ်မြေတွေကို
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +53,Television,ရုပ်မြင်သံကြား
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +138,Gashing,Gashing
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,ရုပ်မြင်သံကြား
 DocType: Production Order Operation,Updated via 'Time Log',&#39;&#39; အချိန်အထဲ &#39;&#39; ကနေတဆင့် Updated
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +82,Account {0} does not belong to Company {1},အကောင့်ကို {0} ကုမ္ပဏီ {1} ပိုင်ပါဘူး
 DocType: Naming Series,Series List for this Transaction,ဒီ Transaction သည်စီးရီးများစာရင်း
@@ -233,14 +224,13 @@
 DocType: Leave Allocation,Add unused leaves from previous allocations,ယခင်ခွဲတမ်းအနေဖြင့်အသုံးမပြုတဲ့အရွက် Add
 apps/erpnext/erpnext/controllers/recurring_document.py +206,Next Recurring {0} will be created on {1},Next ကိုထပ်တလဲလဲ {0} {1} အပေါ်နေသူများကဖန်တီးလိမ့်မည်
 DocType: Newsletter List,Total Subscribers,စုစုပေါင်း Subscribers
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +575,Contact Name,ဆက်သွယ်ရန်အမည်
+,Contact Name,ဆက်သွယ်ရန်အမည်
 DocType: Production Plan Item,SO Pending Qty,SO Pend Qty
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,အထက်တွင်ဖော်ပြခဲ့သောစံသတ်မှတ်ချက်များသည်လစာစလစ်ဖန်တီးပေးပါတယ်။
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,ဝယ်ယူတောင်းဆိုခြင်း။
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +107,Double housing,နှစ်ချက်အိမ်ရာ
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +156,Only the selected Leave Approver can submit this Leave Application,ကိုသာရွေးချယ်ထားထွက်ခွာခွင့်ပြုချက်ဒီထွက်ခွာလျှောက်လွှာတင်သွင်းနိုင်
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +171,Only the selected Leave Approver can submit this Leave Application,ကိုသာရွေးချယ်ထားထွက်ခွာခွင့်ပြုချက်ဒီထွက်ခွာလျှောက်လွှာတင်သွင်းနိုင်
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,နေ့စွဲ Relieving အတူနေ့စွဲထက် သာ. ကြီးမြတ်ဖြစ်ရမည်
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +172,Leaves per Year,တစ်နှစ်တာနှုန်းအရွက်
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +172,Leaves per Year,တစ်နှစ်တာနှုန်းအရွက်
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup > Settings > Naming Series,Setup ကို&gt; Settings&gt; အမည်စီးရီးကနေတဆင့် {0} သည်စီးရီးအမည်သတ်မှတ် ကျေးဇူးပြု.
 DocType: Time Log,Will be updated when batched.,batched သည့်အခါ updated လိမ့်မည်။
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +104,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,row {0}: ဤအနေနဲ့ကြိုတင် entry ကိုဖြစ်လျှင် {1} အကောင့်ဆန့်ကျင် &#39;&#39; ကြိုတင်ထုတ် Is &#39;&#39; စစ်ဆေးပါ။
@@ -249,25 +239,24 @@
 DocType: Item Website Specification,Item Website Specification,item ဝက်ဘ်ဆိုက် Specification
 DocType: Dropbox Backup,Dropbox Access Key,Dropbox ကို Access Key ကို
 DocType: Payment Tool,Reference No,ကိုးကားစရာမရှိပါ
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +348,Leave Blocked,Leave Blocked
-apps/erpnext/erpnext/stock/doctype/item/item.py +535,Item {0} has reached its end of life on {1},item {0} {1} အပေါ်အသက်၏အဆုံးရောက်ရှိခဲ့သည်
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +392,Leave Blocked,Leave Blocked
+apps/erpnext/erpnext/stock/doctype/item/item.py +539,Item {0} has reached its end of life on {1},item {0} {1} အပေါ်အသက်၏အဆုံးရောက်ရှိခဲ့သည်
 apps/erpnext/erpnext/accounts/utils.py +339,Annual,နှစ်ပတ်လည်
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,စတော့အိတ်ပြန်လည်ရင်ကြားစေ့ရေး Item
 DocType: Stock Entry,Sales Invoice No,အရောင်းပြေစာမရှိ
 DocType: Material Request Item,Min Order Qty,min မိန့် Qty
 DocType: Lead,Do Not Contact,ဆက်သွယ်ရန်မ
 DocType: Sales Invoice,The unique id for tracking all recurring invoices. It is generated on submit.,အားလုံးထပ်တလဲလဲကုန်ပို့လွှာ tracking များအတွက်ထူးခြားသော id ။ ဒါဟာတင်ပြရန်အပေါ် generated ဖြစ်ပါတယ်။
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +93,Software Developer,Software ကို Developer
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +93,Software Developer,Software ကို Developer
 DocType: Item,Minimum Order Qty,နိမ့်ဆုံးအမိန့် Qty
 DocType: Pricing Rule,Supplier Type,ပေးသွင်း Type
 DocType: Item,Publish in Hub,Hub အတွက်ထုတ်ဝေ
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +555,Item {0} is cancelled,item {0} ဖျက်သိမ်းလိုက်
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +598,Material Request,material တောင်းဆိုခြင်း
+apps/erpnext/erpnext/stock/doctype/item/item.py +559,Item {0} is cancelled,item {0} ဖျက်သိမ်းလိုက်
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +607,Material Request,material တောင်းဆိုခြင်း
 DocType: Bank Reconciliation,Update Clearance Date,Update ကိုရှင်းလင်းရေးနေ့စွဲ
 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},item {0} ဝယ်ယူခြင်းအမိန့် {1} အတွက် &#39;&#39; ကုန်ကြမ်းထောက်ပံ့ &#39;&#39; table ထဲမှာမတှေ့
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +129,Wire brushing,ဝါယာကြိုးအမွှန်းတင်
 DocType: Employee,Relation,ဆှေမြိုး
 DocType: Shipping Rule,Worldwide Shipping,Worldwide မှသဘောင်္တင်ခ
 apps/erpnext/erpnext/config/selling.py +23,Confirmed orders from Customers.,Customer များအနေဖြင့်အတည်ပြုပြောဆိုသည်အမိန့်။
@@ -283,12 +272,11 @@
 DocType: Supplier,Address HTML,လိပ်စာက HTML
 DocType: Lead,Mobile No.,မိုဘိုင်းလ်အမှတ်
 DocType: Maintenance Schedule,Generate Schedule,ဇယား Generate
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +81,Hubbing,Hubbing
 DocType: Purchase Invoice Item,Expense Head,စရိတ်ဌာနမှူး
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +86,Please select Charge Type first,တာဝန်ခံကအမျိုးအစားပထမဦးဆုံးကိုရွေးပါ ကျေးဇူးပြု.
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,နောက်ဆုံး
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +395,Max 5 characters,max 5 ဇာတ်ကောင်
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +195,Select Your Language,Your Language ကိုရွေးပါ
+apps/erpnext/erpnext/public/js/setup_wizard.js +143,Max 5 characters,max 5 ဇာတ်ကောင်
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +245,Select Your Language,Your Language ကိုရွေးပါ
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,စာရင်းထဲတွင်ပထမဦးဆုံးထွက်ခွာခွင့်ပြုချက်ကို default ထွက်ခွာခွင့်ပြုချက်အဖြစ်သတ်မှတ်ကြလိမ့်မည်
 DocType: Manufacturing Settings,"Disables creation of time logs against Production Orders.
 Operations shall not be tracked against Production Order",ထုတ်လုပ်မှုအမိန့်ဆန့်ကျင်အချိန်သစ်လုံး၏ဖန်တီးမှုကိုဖြုတ်ပေးလိုက်။ စစ်ဆင်ရေးထုတ်လုပ်မှုအမိန့်ဆန့်ကျင်ခြေရာခံထောက်လှမ်းလိမ့်မည်မဟုတ်
@@ -300,8 +288,6 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +34,Item {0} must be Service Item,item {0} ဝန်ဆောင်မှု Item ဖြစ်ရမည်
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +303,Completed Qty can not be greater than 'Qty to Manufacture',ပြီးစီး Qty &#39;&#39; Qty ထုတ်လုပ်ခြင်းမှ &#39;&#39; ထက် သာ. ကြီးမြတ်မဖွစျနိုငျ
 DocType: DocType,Administrator,အုပ်ချုပ်သူ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +136,Laser drilling,လေဆာတူးဖော်
-DocType: Stock UOM Replace Utility,New Stock UOM,နယူးစတော့အိတ် UOM
 DocType: Period Closing Voucher,Closing Account Head,နိဂုံးချုပ်အကောင့်ဌာနမှူး
 DocType: Employee,External Work History,ပြင်ပလုပ်ငန်းခွင်သမိုင်း
 apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,မြို့ပတ်ရထားကိုးကားစရာအမှား
@@ -310,18 +296,15 @@
 DocType: Lead,Industry,စက်မှုလုပ်ငန်း
 DocType: Employee,Job Profile,ယောဘ၏ကိုယ်ရေးအချက်အလက်များ profile
 DocType: Newsletter,Newsletter,သတင်းလွှာ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +84,Hydroforming,Hydroforming
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +49,Necking,Necking
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,အော်တိုပစ္စည်းတောင်းဆိုမှု၏ဖန်တီးမှုအပေါ်အီးမေးလ်ကိုအကြောင်းကြား
 DocType: Journal Entry,Multi Currency,multi ငွေကြေးစနစ်
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +51,Item is updated,item updated ဖြစ်ပါတယ်
 DocType: Async Task,System Manager,system Manager က
 DocType: Payment Reconciliation Invoice,Invoice Type,ကုန်ပို့လွှာ Type
 DocType: Sales Invoice Item,Delivery Note,Delivery မှတ်ချက်
 DocType: Dropbox Backup,Allow Dropbox Access,Dropbox ကို Access က Allow
 apps/erpnext/erpnext/config/learn.py +72,Setting up Taxes,အခွန်ကိုတည်ဆောက်ခြင်း
 apps/erpnext/erpnext/accounts/utils.py +189,Payment Entry has been modified after you pulled it. Please pull it again.,သင်ကထွက်ခွာသွားပြီးနောက်ငွေပေးချေမှုရမည့် Entry modified သိရသည်။ တဖန်ဆွဲပေးပါ။
-apps/erpnext/erpnext/stock/doctype/item/item.py +343,{0} entered twice in Item Tax,{0} Item ခွန်အတွက်နှစ်ကြိမ်သို့ဝင်
+apps/erpnext/erpnext/stock/doctype/item/item.py +347,{0} entered twice in Item Tax,{0} Item ခွန်အတွက်နှစ်ကြိမ်သို့ဝင်
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +105,Summary for this week and pending activities,ယခုရက်သတ္တပတ်များနှင့် Pend လှုပ်ရှားမှုများအကျဉ်းချုပ်
 DocType: Workstation,Rent Cost,ငှားရန်ကုန်ကျစရိတ်
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +74,Please select month and year,လနှင့်တစ်နှစ်ကို select ကျေးဇူးပြု.
@@ -338,23 +321,21 @@
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,ဖောက်သည်ငွေကြေးဖောက်သည်ရဲ့အခြေစိုက်စခန်းငွေကြေးအဖြစ်ပြောင်းလဲသောအချိန်တွင် rate
 DocType: Features Setup,"Available in BOM, Delivery Note, Purchase Invoice, Production Order, Purchase Order, Purchase Receipt, Sales Invoice, Sales Order, Stock Entry, Timesheet","BOM, Delivery မှတ်ချက်, ဝယ်ယူခြင်းပြေစာ, ထုတ်လုပ်မှုအမိန့်, ဝယ်ယူခြင်းအမိန့်, ဝယ်ယူ Receipt, အရောင်းပြေစာ, အရောင်းအမိန့်, စတော့အိတ် Entry, Timesheet အတွက်ရရှိနိုင်"
 DocType: Item Tax,Tax Rate,အခွန်နှုန်း
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Select Item,Item ကိုရွေးပါ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +540,Select Item,Item ကိုရွေးပါ
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +143,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","item: {0} သုတ်ပညာစီမံခန့်ခွဲ, \ စတော့အိတ်ပြန်လည်ရင်ကြားစေ့ရေးကို အသုံးပြု. ပြန်. မရနိုင်ပါ, အစားစတော့အိတ် Entry &#39;ကိုသုံး"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +259,Purchase Invoice {0} is already submitted,ဝယ်ယူခြင်းပြေစာ {0} ပြီးသားတင်သွင်းတာဖြစ်ပါတယ်
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +262,Purchase Invoice {0} is already submitted,ဝယ်ယူခြင်းပြေစာ {0} ပြီးသားတင်သွင်းတာဖြစ်ပါတယ်
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Batch No must be same as {1} {2},row # {0}: Batch မရှိပါ {1} {2} အဖြစ်အတူတူဖြစ်ရပါမည်
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Convert to non-Group,Non-Group ကမှ convert
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +55,Purchase Receipt must be submitted,ဝယ်ယူခြင်းပြေစာတင်သွင်းရမည်
-DocType: Stock UOM Replace Utility,Current Stock UOM,လက်ရှိစတော့အိတ် UOM
 apps/erpnext/erpnext/config/stock.py +53,Batch (lot) of an Item.,တစ်ဦး Item ၏ batch (အများကြီး) ။
 DocType: C-Form Invoice Detail,Invoice Date,ကုန်ပို့လွှာနေ့စွဲ
 DocType: GL Entry,Debit Amount,debit ပမာဏ
 apps/erpnext/erpnext/accounts/party.py +223,There can only be 1 Account per Company in {0} {1},သာ {0} {1} အတွက် Company မှနှုန်းနဲ့ 1 အကောင့်ကိုအဲဒီမှာရှိနိုင်ပါသည်
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Your email address,သင့်အီးမေးလ်လိပ်စာ
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +194,Please see attachment,ပူးတွဲဖိုင်ကြည့်ပေးပါ
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +203,Please see attachment,ပူးတွဲဖိုင်ကြည့်ပေးပါ
 DocType: Purchase Order,% Received,% ရရှိထားသည့်
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +109,Water jet cutting,ရေဂျက်လေယာဉ်ဖြတ်တောက်ခြင်း
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +24,Setup Already Complete!!,ယခုပင်လျှင် Complete Setup ကို !!
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +20,Setup Already Complete!!,ယခုပင်လျှင် Complete Setup ကို !!
 ,Finished Goods,လက်စသတ်ကုန်စည်
 DocType: Delivery Note,Instructions,ညွှန်ကြားချက်များ
 DocType: Quality Inspection,Inspected By,အားဖြင့်ကြည့်ရှုစစ်ဆေးသည်
@@ -369,6 +350,7 @@
 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.,Customer နှင့်ပေးသွင်းသည် Accounts ကိုဖန်တီးမပါဘူးပေးပါ။ သူတို့ကဖောက်သည် / ပေးသွင်းရှင်များထံမှတိုက်ရိုက်နေသူများကဖန်တီးနေကြပါတယ်။
 DocType: Currency Exchange,Currency Exchange,ငွေကြေးလဲလှယ်မှု
 DocType: Purchase Invoice Item,Item Name,item အမည်
+DocType: Authorization Rule,Approving User  (above authorized value),(ခွင့်ပြုချက် value ကိုအထက်) အတည်ပြုအသုံးပြုသူ
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Credit Balance,ခရက်ဒစ် 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",စီမံကိန်း qty နှင့်နိမ့်ဆုံးအမိန့် qty အပေါ်အခြေခံပြီးအားလုံးသိုလှောင်ရုံစဉ်းစား &quot;စတော့အိတ်ထဲက&quot; သောမေတ္တာရပ်ခံခံရဖို့ items
@@ -378,11 +360,10 @@
 ,Purchase Register,မှတ်ပုံတင်မည်ဝယ်ယူ
 DocType: Landed Cost Item,Applicable Charges,သက်ဆိုင်စွပ်စွဲချက်
 DocType: Workstation,Consumable Cost,စားသုံးသူများကုန်ကျစရိတ်
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,{0} ({1}) must have role 'Leave Approver',{0} ({1}) အခန်းကဏ္ဍ &#39;&#39; ထွက်ခွာခွင့်ပြုချက် &#39;&#39; ရှိရမယ်
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +167,{0} ({1}) must have role 'Leave Approver',{0} ({1}) အခန်းကဏ္ဍ &#39;&#39; ထွက်ခွာခွင့်ပြုချက် &#39;&#39; ရှိရမယ်
 DocType: Purchase Receipt,Vehicle Date,မော်တော်ယာဉ်နေ့စွဲ
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +39,Medical,ဆေးဘက်ဆိုင်ရာ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +39,Medical,ဆေးဘက်ဆိုင်ရာ
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,ဆုံးရှုံးရသည့်အကြောင်းရင်း
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +36,Tube beading,tube ပုတီး
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},Workstation နှင့်အားလပ်ရက်များစာရင်းနှုန်းအဖြစ်အောက်ပါရက်စွဲများအပေါ်ပိတ်ထားသည်: {0}
 DocType: Employee,Single,တခုတည်းသော
 DocType: Issue,Attachment,attachment
@@ -403,10 +384,8 @@
 DocType: Account,Is Group,အုပ်စုဖြစ်ပါတယ်
 DocType: Stock Settings,Automatically Set Serial Nos based on FIFO,FIFO အပေါ်အခြေခံပြီးအလိုအလြောကျ Set Serial အမှတ်
 DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,ပေးသွင်းပြေစာနံပါတ်ထူးခြားသောစစ်ဆေး
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +31,Thermoforming,Thermoforming
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +66,Slitting,အလျားလိုက်အပေါက်
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +57,'To Case No.' cannot be less than 'From Case No.',&#39;&#39; အမှုအမှတ်နိုင်ရန် &#39;&#39; &#39;&#39; အမှုအမှတ် မှစ. &#39;&#39; ထက်နည်းမဖွစျနိုငျ
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +104,Non Profit,non အကျိုးအမြတ်
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +104,Non Profit,non အကျိုးအမြတ်
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_list.js +7,Not Started,Started မဟုတ်
 DocType: Lead,Channel Partner,channel Partner
 DocType: Account,Old Parent,စာဟောငျးမိဘ
@@ -415,13 +394,12 @@
 apps/erpnext/erpnext/config/manufacturing.py +74,Global settings for all manufacturing processes.,အားလုံးထုတ်လုပ်မှုလုပ်ငန်းစဉ်များသည်ကမ္ဘာလုံးဆိုင်ရာ setting ကို။
 DocType: Accounts Settings,Accounts Frozen Upto,Frozen ထိအကောင့်
 DocType: SMS Log,Sent On,တွင် Sent
-apps/erpnext/erpnext/stock/doctype/item/item.py +512,Attribute {0} selected multiple times in Attributes Table,attribute {0} Attribute တွေကစားပွဲတင်အတွက်အကြိမ်ပေါင်းများစွာကိုရှေးခယျြ
+apps/erpnext/erpnext/stock/doctype/item/item.py +516,Attribute {0} selected multiple times in Attributes Table,attribute {0} Attribute တွေကစားပွဲတင်အတွက်အကြိမ်ပေါင်းများစွာကိုရှေးခယျြ
 DocType: Sales Order,Not Applicable,မသက်ဆိုင်ပါ
 apps/erpnext/erpnext/config/hr.py +140,Holiday master.,အားလပ်ရက်မာစတာ။
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +19,Shell molding,shell အတု ယူ. ပုံသှငျး
 DocType: Material Request Item,Required Date,လိုအပ်သောနေ့စွဲ
 DocType: Delivery Note,Billing Address,ကျသင့်ငွေတောင်းခံလွှာပေးပို့မည့်လိပ်စာ
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +644,Please enter Item Code.,Item Code ကိုရိုက်ထည့်ပေးပါ။
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +648,Please enter Item Code.,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","checked အကယ်. ထားပြီးပုံနှိပ် Rate / ပုံနှိပ်ပမာဏတွင်ထည့်သွင်းသကဲ့သို့, အခွန်ပမာဏကိုထည့်သွင်းစဉ်းစားလိမ့်မည်"
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,စုစုပေါင်း Qty
@@ -431,7 +409,7 @@
 DocType: Item Attribute,To Range,Range ကိုမှ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Securities and စာရင်း
 DocType: Features Setup,Imports,သွင်းကုန်
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +144,Adhesive bonding,ကော် Bond
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +77,Total leaves allocated is mandatory,ခွဲဝေ Total ကုမ္ပဏီအရွက်မဖြစ်မနေဖြစ်ပါသည်
 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.,တက်ရောက်သူစံချိန်တင်။
@@ -439,26 +417,25 @@
 DocType: Sales Order Item,Used for Production Plan,ထုတ်လုပ်ရေးစီမံကိန်းအတွက်အသုံးပြု
 DocType: System Settings,Loading...,Loading ...
 DocType: DocField,Password,Password ကို
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +155,Fused deposition modeling,တွက် deposition မော်ဒယ်
 DocType: Manufacturing Settings,Time Between Operations (in mins),(မိနစ်အတွက်) Operations အကြားတွင်အချိန်
 DocType: Customer,Buyer of Goods and Services.,ကုန်စည်နှင့်ဝန်ဆောင်မှုများ၏ဝယ်သောသူ။
 DocType: Journal Entry,Accounts Payable,ပေးရန်ရှိသောစာရင်း
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +24,Add Subscribers,Subscribers Add
 apps/erpnext/erpnext/public/js/feature_setup.js +220,""" does not exists",&quot;တည်ရှိပါဘူး
 DocType: Pricing Rule,Valid Upto,သက်တမ်းရှိအထိ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +564,List a few of your customers. They could be organizations or individuals.,သင့်ရဲ့ဖောက်သည်၏အနည်းငယ်စာရင်း။ သူတို့ဟာအဖွဲ့အစည်းများသို့မဟုတ်လူပုဂ္ဂိုလ်တစ်ဦးချင်းဖြစ်နိုင်ပါတယ်။
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,List a few of your customers. They could be organizations or individuals.,သင့်ရဲ့ဖောက်သည်၏အနည်းငယ်စာရင်း။ သူတို့ဟာအဖွဲ့အစည်းများသို့မဟုတ်လူပုဂ္ဂိုလ်တစ်ဦးချင်းဖြစ်နိုင်ပါတယ်။
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Direct Income,တိုက်ရိုက်ဝင်ငွေခွန်
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +33,"Can not filter based on Account, if grouped by Account","အကောင့်အားဖြင့်အုပ်စုဖွဲ့လျှင်, အကောင့်ပေါ်မှာအခြေခံပြီး filter နိုင်ဘူး"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +88,Administrative Officer,စီမံခန့်ခွဲရေးဆိုင်ရာအရာရှိချုပ်
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Administrative Officer,စီမံခန့်ခွဲရေးဆိုင်ရာအရာရှိချုပ်
 DocType: Payment Tool,Received Or Paid,ရရှိထားသည့်ဒါမှမဟုတ် Paid
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +318,Please select Company,ကုမ္ပဏီကို select ကျေးဇူးပြု.
 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 +305,Please enter Warehouse for which Material Request will be raised,ဂိုဒေါင်ပစ္စည်းတောင်းဆိုမှုမွောကျလိမျ့မညျအရာအဘို့အရိုက်ထည့်ပေးပါ
 DocType: Production Order,Additional Operating Cost,နောက်ထပ် Operating ကုန်ကျစရိတ်
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +20,Cosmetics,အလှကုန်
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,အလှကုန်
 DocType: DocField,Type,ပုံစံ
-apps/erpnext/erpnext/stock/doctype/item/item.py +417,"To merge, following properties must be same for both items","ပေါင်းစည်းဖို့, အောက်ပါဂုဏ်သတ္တိနှစ်မျိုးလုံးပစ္စည်းများသည်အတူတူပင်ဖြစ်ရပါမည်"
+apps/erpnext/erpnext/stock/doctype/item/item.py +421,"To merge, following properties must be same for both items","ပေါင်းစည်းဖို့, အောက်ပါဂုဏ်သတ္တိနှစ်မျိုးလုံးပစ္စည်းများသည်အတူတူပင်ဖြစ်ရပါမည်"
 DocType: Communication,Subject,ဘာသာရပ်
 DocType: Shipping Rule,Net Weight,အသားတင်အလေးချိန်
 DocType: Employee,Emergency Phone,အရေးပေါ်ဖုန်း
@@ -468,7 +445,6 @@
 DocType: Journal Entry,Difference (Dr - Cr),ခြားနားချက် (ဒေါက်တာ - Cr)
 DocType: Account,Profit and Loss,အမြတ်နှင့်အရှုံး
 apps/erpnext/erpnext/config/stock.py +293,Managing Subcontracting,စီမံခန့်ခွဲ Subcontracting
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +58,New UOM must NOT be of type Whole Number,နယူး UOM type ကိုလုံးအရေအတွက်၏ဖြစ်မဟုတ်ပါရမယ်
 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,စျေးနှုန်းစာရင်းငွေကြေးကုမ္ပဏီ၏အခြေစိုက်စခန်းငွေကြေးအဖြစ်ပြောင်းလဲသောအချိန်တွင် rate
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Account {0} does not belong to company: {1},အကောင့်ကို {0} ကုမ္ပဏီပိုင်ပါဘူး: {1}
@@ -487,14 +463,14 @@
 DocType: Purchase Invoice,Supplier Invoice No,ပေးသွင်းပြေစာမရှိ
 DocType: Territory,For reference,ကိုးကားနိုင်ရန်
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +154,"Cannot delete Serial No {0}, as it is used in stock transactions","ဒါကြောင့်စတော့ရှယ်ယာငွေပေးငွေယူမှာအသုံးပြုတဲ့အတိုင်း, {0} Serial No မဖျက်နိုင်ပါ"
-apps/erpnext/erpnext/public/js/account_tree_grid.js +52,Closing (Cr),(Cr) ပိတ်ပစ်
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +227,Closing (Cr),(Cr) ပိတ်ပစ်
 DocType: Serial No,Warranty Period (Days),အာမခံကာလ (Days)
 DocType: Installation Note Item,Installation Note Item,Installation မှတ်ချက် Item
 ,Pending Qty,ဆိုင်းငံ့ထား Qty
 DocType: Job Applicant,Thread HTML,thread က HTML
 DocType: Company,Ignore,ဂရုမပြု
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +86,SMS sent to following numbers: {0},အောက်ပါနံပါတ်များကိုစလှေတျ SMS ကို: {0}
-apps/erpnext/erpnext/controllers/buying_controller.py +135,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,က sub-စာချုပ်ချုပ်ဆိုဝယ်ယူခြင်းပြေစာတွေအတွက်မဖြစ်မနေပေးသွင်းဂိုဒေါင်
+apps/erpnext/erpnext/controllers/buying_controller.py +126,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,က sub-စာချုပ်ချုပ်ဆိုဝယ်ယူခြင်းပြေစာတွေအတွက်မဖြစ်မနေပေးသွင်းဂိုဒေါင်
 DocType: Pricing Rule,Valid From,မှစ. သက်တမ်းရှိ
 DocType: Sales Invoice,Total Commission,စုစုပေါင်းကော်မရှင်
 DocType: Pricing Rule,Sales Partner,အရောင်း Partner
@@ -502,7 +478,7 @@
 DocType: Monthly Distribution,"**Monthly Distribution** helps you distribute your budget across months if you have seasonality in your business.
 
 To distribute a budget using this distribution, set this **Monthly Distribution** in the **Cost Center**","** လစဉ်ဖြန့်ဖြူး ** သင်သည်သင်၏စီးပွားရေးလုပ်ငန်းအတွက်ရာသီရှိပါကသင်လအတွင်းအနှံ့သင့်ရဲ့ဘတ်ဂျက်ဖြန့်ဝေကူညီပေးသည်။ , ဒီဖြန့်ဖြူးသုံးပြီးဘတ်ဂျက်ဖြန့်ဖြူးအတွက် ** ကုန်ကျစရိတ် Center မှာ ** ဒီ ** လစဉ်ဖြန့်ဖြူးတင်ထားရန် **"
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +183,No records found in the Invoice table,ထိုပြေစာ table ထဲမှာတွေ့ရှိမရှိပါမှတ်တမ်းများ
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +130,No records found in the Invoice table,ထိုပြေစာ table ထဲမှာတွေ့ရှိမရှိပါမှတ်တမ်းများ
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +20,Please select Company and Party Type first,ပထမဦးဆုံးကုမ္ပဏီနှင့်ပါတီ Type ကိုရွေးပါ ကျေးဇူးပြု.
 apps/erpnext/erpnext/config/accounts.py +84,Financial / accounting year.,ဘဏ္ဍာရေး / စာရင်းကိုင်တစ်နှစ်။
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","ဝမ်းနည်းပါတယ်, Serial အမှတ်ပေါင်းစည်းမရနိုင်ပါ"
@@ -518,25 +494,25 @@
 DocType: Sales Order,Billing and Delivery Status,ငွေတောင်းခံနှင့်ပေးပို့ခြင်းနဲ့ Status
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,repeat Customer များ
 DocType: Leave Control Panel,Allocate,နေရာချထား
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +16,Previous,လွန်ခဲ့သော
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard_page.html +16,Previous,လွန်ခဲ့သော
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +620,Sales Return,အရောင်းသို့ပြန်သွားသည်
 DocType: Production Planning Tool,Select Sales Orders from which you want to create Production Orders.,သင်ထုတ်လုပ်မှုအမိန့်ကိုဖန်တီးရန်လိုသည့်အနေဖြင့်အရောင်းအမိန့်ကိုရွေးချယ်ပါ။
 DocType: Item,Delivered by Supplier (Drop Ship),ပေးသွင်း (Drop သင်္ဘော) ဖြင့်ကယ်လွှတ်
 apps/erpnext/erpnext/config/hr.py +120,Salary components.,လစာအစိတ်အပိုင်းများ။
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,အလားအလာရှိသောဖောက်သည်၏ဒေတာဘေ့စ။
+DocType: Authorization Rule,Customer or Item,customer သို့မဟုတ် Item
 apps/erpnext/erpnext/config/crm.py +17,Customer database.,customer ဒေတာဘေ့စ။
 DocType: Quotation,Quotation To,စျေးနှုန်းရန်
 DocType: Lead,Middle Income,အလယျပိုငျးဝင်ငွေခွန်
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),ဖွင့်ပွဲ (Cr)
 apps/erpnext/erpnext/accounts/utils.py +193,Allocated amount can not be negative,ခွဲဝေငွေပမာဏအနုတ်လက္ခဏာမဖြစ်နိုင်
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +123,Tumbling,Tumbling
 DocType: Purchase Order Item,Billed Amt,Bill Amt
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,စတော့ရှယ်ယာ entries တွေကိုဖန်ဆင်းထားတဲ့ဆန့်ကျင်နေတဲ့ယုတ္တိဂိုဒေါင်။
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +92,Reference No & Reference Date is required for {0},ကိုးကားစရာမရှိပါ &amp; ကိုးကားစရာနေ့စွဲ {0} သည်လိုအပ်သည်
 DocType: Event,Wednesday,ဗုဒ္ဓဟူးနေ့
 DocType: Sales Invoice,Customer's Vendor,customer ရဲ့ vendor
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +214,Production Order is Mandatory,ထုတ်လုပ်မှုအမိန့်မသင်မနေရဖြစ်ပါသည်
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +139,Proposal Writing,အဆိုပြုချက်ကို Writing
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,Proposal Writing,အဆိုပြုချက်ကို 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/stock/stock_ledger.py +336,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},{4} {5} အတွက် {2} {3} အပေါ်ဂိုဒေါင် {1} အတွက် Item {0} သည် negative စတော့အိတ်အမှား ({6})
 DocType: Fiscal Year Company,Fiscal Year Company,ဘဏ္ဍာရေးနှစ်တစ်နှစ်တာကုမ္ပဏီ
@@ -559,7 +535,7 @@
 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.","ထိုအခါ Pricing နည်းဥပဒေများဖောက်သည်, ဖောက်သည်အုပ်စု, နယ်မြေတွေကို, ပေးသွင်း, ပေးသွင်းရေးထည့်ပြီးကင်ပိန်းစသည်တို့ကိုအရောင်း Partner အပေါ်အခြေခံပြီးထုတ် filtered နေကြတယ်"
 apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.py +179,Please install dropbox python module,dropbox အတွက် Python ရဲ့ module တစ်ခု install လုပ် ကျေးဇူးပြု.
 DocType: Employee,Passport Number,နိုင်ငံကူးလက်မှတ်နံပါတ်
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +82,Manager,Manager က
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Manager,Manager က
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +494,From Purchase Receipt,ဝယ်ယူခြင်းပြေစာထဲကနေ
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +219,Same item has been entered multiple times.,အလားတူတဲ့ item ကိုအကြိမ်ပေါင်းများစွာသို့ဝင်ခဲ့သည်။
 DocType: SMS Settings,Receiver Parameter,receiver Parameter
@@ -567,10 +543,9 @@
 DocType: Sales Person,Sales Person Targets,အရောင်းပုဂ္ဂိုလ်ပစ်မှတ်များ
 apps/frappe/frappe/public/js/frappe/form/workflow.js +116,To,ရန်
 apps/frappe/frappe/templates/base.html +145,Please enter email address,အီးမေးလ်လိပ်စာရိုက်ထည့်ပေးပါ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +35,End tube forming,အဆုံးပြွန်ဖွဲ့စည်း
 DocType: Production Order Operation,In minutes,မိနစ်
 DocType: Issue,Resolution Date,resolution နေ့စွဲ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +635,Please set default Cash or Bank account in Mode of Payment {0},ငွေပေးချေမှုရမည့်၏ Mode ကို {0} အတွက် default အနေနဲ့ငွေသို့မဟုတ်ဘဏ်မှအကောင့်ကိုသတ်မှတ်ပေးပါ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +637,Please set default Cash or Bank account in Mode of Payment {0},ငွေပေးချေမှုရမည့်၏ Mode ကို {0} အတွက် default အနေနဲ့ငွေသို့မဟုတ်ဘဏ်မှအကောင့်ကိုသတ်မှတ်ပေးပါ
 DocType: Selling Settings,Customer Naming By,အားဖြင့်ဖောက်သည် Name
 apps/erpnext/erpnext/accounts/doctype/account/account.js +67,Convert to Group,Group ကိုကူးပြောင်း
 DocType: Activity Cost,Activity Type,လုပ်ဆောင်ချက်ကအမျိုးအစား
@@ -578,12 +553,12 @@
 DocType: Customer,Fixed Days,Fixed Days
 DocType: Sales Invoice,Packing List,ကုန်ပစ္စည်းစာရင်း
 apps/erpnext/erpnext/config/buying.py +28,Purchase Orders given to Suppliers.,ပေးသွင်းမှပေးထားသောအမိန့်ဝယ်ယူအ​​သုံးပြုပါ။
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +43,Publishing,ပုံနှိပ်ထုတ်ဝေခြင်း
+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 +198,{0}: {1} not found in Invoice Details table,{0}: {1} ပြေစာအသေးစိတ် table ထဲမှာမတှေ့
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,{0}: {1} not found in Invoice Details table,{0}: {1} ပြေစာအသေးစိတ် table ထဲမှာမတှေ့
 DocType: Company,Round Off Cost Center,ကုန်ကျစရိတ် Center ကပိတ် round
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +208,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,ပြုပြင်ထိန်းသိမ်းမှုခရီးစဉ် {0} ဒီအရောင်းအမိန့်ကိုပယ်ဖျက်မီဖျက်သိမ်းရပါမည်
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +203,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),ဖွင့်ပွဲ (ဒေါက်တာ)
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},Post Timestamp ကို {0} နောက်မှာဖြစ်ရပါမည်
@@ -595,7 +570,6 @@
 DocType: Pricing Rule,Sales Manager,အရောင်းမန်နေဂျာ
 apps/frappe/frappe/public/js/frappe/model/model.js +492,Rename,Rename
 DocType: Journal Entry,Write Off Amount,ငွေပမာဏပိတ်ရေးထား
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +52,Bending,ကွေး
 apps/frappe/frappe/core/page/user_permissions/user_permissions.js +246,Allow User,အသုံးပြုသူ Allow
 DocType: Journal Entry,Bill No,ဘီလ်မရှိပါ
 DocType: Purchase Invoice,Quarterly,သုံးလတစ်ကြိမ်
@@ -605,17 +579,16 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Please enter item details,ဆောင်းပါးတပုဒ်ကအသေးစိတ်ရိုက်ထည့်ပေးပါ
 DocType: Purchase Receipt,Other Details,အခြားအသေးစိတ်
 DocType: Account,Accounts,ငွေစာရင်း
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +67,Marketing,marketing
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +65,Straight shearing,ဖြောင့်မှေးကို
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +67,Marketing,marketing
 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.,ရောင်းအားကို item ကိုခြေရာခံနှင့်၎င်းတို့၏အမှတ်စဉ် nos အပေါ်အခြေခံပြီးစာရွက်စာတမ်းများဝယ်ယူရန်။ ဤသည်ကိုလည်းထုတ်ကုန်၏အာမခံအသေးစိတ်အချက်အလက်များကိုခြေရာခံရန်အသုံးပြုနိုင်သည်။
 DocType: Purchase Receipt Item Supplied,Current Stock,လက်ရှိစတော့အိတ်
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +99,Rejected Warehouse is mandatory against regected item,ပယ်ချဂိုဒေါင် regected တဲ့ item ကိုဆန့်ကျင်မသင်မနေရ
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +102,Rejected Warehouse is mandatory against regected item,ပယ်ချဂိုဒေါင် regected တဲ့ item ကိုဆန့်ကျင်မသင်မနေရ
 DocType: Account,Expenses Included In Valuation,အကောက်ခွန်တန်ဖိုးသတ်မှတ်မည်တွင်ထည့်သွင်းကုန်ကျစရိတ်
 DocType: Employee,Provide email id registered in company,ကုမ္ပဏီမှတ်ပုံတင်အီးမေးလ်က id ပေး
 DocType: Hub Settings,Seller City,ရောင်းချသူစီးတီး
 DocType: Email Digest,Next email will be sent on:,Next ကိုအီးမေးလ်အပေါ်ကိုစလှေတျပါလိမ့်မည်:
 DocType: Offer Letter Term,Offer Letter Term,ပေးစာ Term ကိုပူဇော်
-apps/erpnext/erpnext/stock/doctype/item/item.py +492,Item has variants.,item မျိုးကွဲရှိပါတယ်။
+apps/erpnext/erpnext/stock/doctype/item/item.py +496,Item has variants.,item မျိုးကွဲရှိပါတယ်။
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,item {0} မတွေ့ရှိ
 DocType: Bin,Stock Value,စတော့အိတ် Value တစ်ခု
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,သစ်ပင်ကို Type
@@ -624,10 +597,9 @@
 DocType: Material Request Item,Quantity and Warehouse,အရေအတွက်နှင့်ဂိုဒေါင်
 DocType: Sales Invoice,Commission Rate (%),ကော်မရှင် Rate (%)
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +172,"Against Voucher Type must be one of Sales Order, Sales Invoice or Journal Entry","ဘောက်ချာ Type အရောင်းအမိန့်, အရောင်းပြေစာသို့မဟုတ်ဂျာနယ် Entry တယောက်ဖြစ်ရပါမည်ဆန့်ကျင်"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +139,Biomachining,Biomachining
 apps/erpnext/erpnext/setup/utils.py +89,Unable to find exchange rate,ငွေလဲနှုန်းကိုရှာတွေ့ဖို့မအောင်မြင်ဘူး
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +7,Aerospace,Aerospace
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +19,Welcome,ကြိုဆိုပါတယ်
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +7,Aerospace,Aerospace
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +40,Welcome,ကြိုဆိုပါတယ်
 DocType: Journal Entry,Credit Card Entry,Credit Card ကို Entry &#39;
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +18,Task Subject,Task Subject
 apps/erpnext/erpnext/config/stock.py +33,Goods received from Suppliers.,ကုန်ပစ္စည်းများပေးသွင်းထံမှလက်ခံရရှိခဲ့သည်။
@@ -650,19 +622,19 @@
 DocType: Employee,Cell Number,cell အရေအတွက်
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,ဆုံးရှုံး
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +120,You can not enter current voucher in 'Against Journal Entry' column,သင်ကကော်လံ &#39;&#39; ဂျာနယ် Entry &#39;ဆန့်ကျင်&#39; &#39;အတွက်လက်ရှိဘောက်ချာမဝင်နိုင်
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +25,Energy,စွမ်းအင်ဝန်ကြီးဌာန
+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.,လစဉ်လစာကြေငြာချက်။
 DocType: Item Group,Website Specifications,website သတ်မှတ်ချက်များ
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +205,New Account,နယူးအကောင့်
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +21,{0}: From {0} of type {1},{0}: {1} အမျိုးအစား {0} မှစ.
-apps/erpnext/erpnext/controllers/buying_controller.py +283,Row {0}: Conversion Factor is mandatory,row {0}: ကူးပြောင်းခြင်း Factor မသင်မနေရ
+apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,row {0}: ကူးပြောင်းခြင်း Factor မသင်မနေရ
 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.,စာရင်းကိုင် Entries အရွက်ဆုံမှတ်များဆန့်ကျင်စေနိုင်ပါတယ်။ အဖွဲ့တွေဆန့်ကျင် entries ခွင့်ပြုမထားပေ။
 DocType: ToDo,High,မြင့်သော
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +361,Cannot deactivate or cancel BOM as it is linked with other BOMs,ဒါကြောင့်အခြား BOMs နှင့်အတူဆက်စပ်အဖြစ် BOM ရပ်ဆိုင်းနိုင်သို့မဟုတ်ပယ်ဖျက်ခြင်းနိုင်ဘူး
 DocType: Opportunity,Maintenance,ပြုပြင်ထိန်းသိမ်းမှု
 DocType: User,Male,ယောကျာ်းလေး
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +182,Purchase Receipt number required for Item {0},Item {0} လိုအပ်ဝယ်ယူ Receipt နံပါတ်
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +183,Purchase Receipt number required for Item {0},Item {0} လိုအပ်ဝယ်ယူ Receipt နံပါတ်
 DocType: Item Attribute Value,Item Attribute Value,item Attribute Value တစ်ခု
 apps/erpnext/erpnext/config/crm.py +64,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.
@@ -691,10 +663,9 @@
 DocType: Address,Personal,ပုဂ္ဂိုလ်ရေး
 DocType: Expense Claim Detail,Expense Claim Type,စရိတ်တောင်းဆိုမှုများ Type
 DocType: Shopping Cart Settings,Default settings for Shopping Cart,စျေးဝယ်ခြင်းတွန်းလှည်းသည် default setting များ
-apps/erpnext/erpnext/controllers/accounts_controller.py +324,"Journal Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","ဂျာနယ် Entry &#39;{0} အမိန့် {1} ဆန့်ကျင်နှင့်ဆက်နွယ်နေပါသည်ကြောင့်ဒီငွေတောင်းခံလွှာအတွက်ကြိုတင်အဖြစ်ဆွဲရပါမည်ဆိုပါက, စစ်ဆေးပါ။"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +13,Biotechnology,ဇီဝနည်းပညာ
+apps/erpnext/erpnext/controllers/accounts_controller.py +325,"Journal Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","ဂျာနယ် Entry &#39;{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 ကို Maintenance အသုံးစရိတ်များ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +53,Hemming,Hemming
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +66,Please enter Item first,ပထမဦးဆုံးပစ္စည်းကိုရိုက်ထည့်ပေးပါ
 DocType: Account,Liability,တာဝန်
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +62,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,ပိတ်ဆို့ငွေပမာဏ Row {0} အတွက်တောင်းဆိုမှုများငွေပမာဏထက် သာ. ကြီးမြတ်မဖြစ်နိုင်။
@@ -707,10 +678,10 @@
 DocType: Company,Default Bank Account,default ဘဏ်မှအကောင့်
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +47,"To filter based on Party, select Party Type first",ပါတီအပေါ်အခြေခံပြီး filter မှပထမဦးဆုံးပါတီ Type ကိုရွေးပါ
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},"ပစ္စည်းများကို {0} ကနေတဆင့်ကယ်နှုတ်တော်မူ၏မဟုတ်သောကြောင့်, &#39;&#39; Update ကိုစတော့အိတ် &#39;&#39; checked မရနိုင်ပါ"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Nos,nos
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Nos,nos
 DocType: Item,Items with higher weightage will be shown higher,ပိုမိုမြင့်မားသော weightage နှင့်အတူပစ္စည်းများပိုမိုမြင့်မားပြသပါလိမ့်မည်
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,ဘဏ်မှပြန်လည်ရင်ကြားစေ့ရေး Detail
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +627,My Invoices,ငါ့အငွေတောင်းခံလွှာ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +629,My Invoices,ငါ့အငွေတောင်းခံလွှာ
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,ဝန်ထမ်းမျှမတွေ့ပါ
 DocType: Purchase Order,Stopped,ရပ်တန့်
 DocType: Item,If subcontracted to a vendor,တစ်ရောင်းချသူမှ subcontracted မယ်ဆိုရင်
@@ -729,35 +700,33 @@
 DocType: Features Setup,"To enable ""Point of Sale"" features",&quot;Point သို့ရောင်းရငွေ၏&quot; features တွေ enable လုပ်ဖို့
 DocType: Bin,Moving Average Rate,Moving ပျမ်းမျှနှုန်း
 DocType: Production Planning Tool,Select Items,ပစ္စည်းများကိုရွေးပါ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,{0} against Bill {1} dated {2},{0} ဘီလ် {1} ဆန့်ကျင် {2} ရက်စွဲပါ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +328,{0} against Bill {1} dated {2},{0} ဘီလ် {1} ဆန့်ကျင် {2} ရက်စွဲပါ
 DocType: Comment,Reference Name,ကိုးကားစရာအမည်
 DocType: Maintenance Visit,Completion Status,ပြီးစီးနဲ့ Status
 DocType: Sales Invoice Item,Target Warehouse,Target ကဂိုဒေါင်
 DocType: Item,Allow over delivery or receipt upto this percent,ဒီရာခိုင်နှုန်းအထိပေးပို့သို့မဟုတ်လက်ခံရရှိကျော် Allow
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +49,Expected Delivery Date cannot be before Sales Order Date,မျှော်လင့်ထားသည့် Delivery Date ကိုအရောင်းအမိန့်နေ့စွဲခင်မဖွစျနိုငျ
 DocType: Upload Attendance,Import Attendance,သွင်းကုန်တက်ရောက်
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +17,All Item Groups,All item အဖွဲ့များ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +17,All Item Groups,All item အဖွဲ့များ
 DocType: Process Payroll,Activity Log,လုပ်ဆောင်ချက်အထဲ
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +30,Net Profit / Loss,Net ကအမြတ်ခွန် / ပျောက်ဆုံးခြင်း
 apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,အလိုအလျှောက်ငွေကြေးလွှဲပြောင်းမှုမှာတင်သွင်းခဲ့တဲ့အပေါ်သတင်းစကား compose ။
 DocType: Production Order,Item To Manufacture,ထုတ်လုပ်ခြင်းရန် item
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +16,Permanent mold casting,အမြဲတမ်းမှိုသွန်း
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} {2} အဆင့်အတန်းဖြစ်ပါသည်
 apps/erpnext/erpnext/config/learn.py +172,Purchase Order to Payment,ငွေပေးချေမှုရမည့်ရန်အမိန့်ကိုဝယ်ယူရန်
 DocType: Sales Order Item,Projected Qty,စီမံကိန်း Qty
 DocType: Sales Invoice,Payment Due Date,ငွေပေးချေမှုရမည့်ကြောင့်နေ့စွဲ
 DocType: Newsletter,Newsletter Manager,သတင်းလွှာ Manager က
-apps/erpnext/erpnext/stock/doctype/item/item.js +229,Item Variant {0} already exists with same attributes,item Variant {0} ပြီးသားအတူတူ Attribute တွေနှင့်အတူတည်ရှိမှု့
+apps/erpnext/erpnext/stock/doctype/item/item.js +231,Item Variant {0} already exists with same attributes,item Variant {0} ပြီးသားအတူတူ Attribute တွေနှင့်အတူတည်ရှိမှု့
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening',&#39;&#39; ဖွင့်ပွဲ &#39;&#39;
 DocType: Notification Control,Delivery Note Message,Delivery Note ကို Message
 DocType: Expense Claim,Expenses,ကုန်ကျစရိတ်
 DocType: Item Variant Attribute,Item Variant Attribute,item Variant Attribute
 ,Purchase Receipt Trends,ဝယ်ယူခြင်းပြေစာခေတ်ရေစီးကြောင်း
 DocType: Appraisal,Select template from which you want to get the Goals,သင်ရည်မှန်းချက်များရရှိရန်လိုသည့်အနေဖြင့်တန်းပလိတ်ကိုရွေးပါ
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +77,Research & Development,သုတေသနနှင့်ဖွံ့ဖြိုးရေး
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Research & Development,သုတေသနနှင့်ဖွံ့ဖြိုးရေး
 ,Amount to Bill,ဘီလ်မှငွေပမာဏကို
 DocType: Company,Registration Details,မှတ်ပုံတင်ခြင်းအသေးစိတ်ကို
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +75,Staking,ရှယ်ယာ
 DocType: Item,Re-Order Qty,Re-Order Qty
 DocType: Leave Block List Date,Leave Block List Date,Block List ကိုနေ့စွဲ Leave
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +25,Scheduled to send to {0},{0} မှပို့ပေးရန်စီစဉ်ထား
@@ -768,18 +737,16 @@
 DocType: Sales Invoice Item,Stock Details,စတော့အိတ် Details ကို
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,စီမံကိန်း Value တစ်ခု
 apps/erpnext/erpnext/config/selling.py +304,Point-of-Sale,point-of-Sale
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,Cannot carry forward {0},{0} ရှေ့ဆက်မဆောင်ရွက်နိုင်သ
 apps/erpnext/erpnext/accounts/doctype/account/account.py +91,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","အကောင့်ဖွင့်ချိန်ခွင်ပြီးသားချေးငွေအတွက်, သင်တင်ထားရန်ခွင့်မပြုခဲ့ကြပါတယ် &#39;&#39; Debit &#39;အဖြစ်&#39; &#39;Balance ဖြစ်ရမည်&#39; &#39;"
 DocType: Account,Balance must be,ချိန်ခွင်ဖြစ်ရမည်
 DocType: Hub Settings,Publish Pricing,စျေးနှုန်းများထုတ်ဝေ
 DocType: Notification Control,Expense Claim Rejected Message,စရိတ်တောင်းဆိုမှုများသတင်းစကားကိုငြင်းပယ်
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +145,Nailing,သံမှို
 ,Available Qty,ရရှိနိုင်သည့် Qty
 DocType: Purchase Taxes and Charges,On Previous Row Total,ယခင် Row စုစုပေါင်းတွင်
 DocType: Salary Slip,Working Days,အလုပ်လုပ် Days
 DocType: Serial No,Incoming Rate,incoming Rate
 DocType: Packing Slip,Gross Weight,စုစုပေါင်းအလေးချိန်
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +410,The name of your company for which you are setting up this system.,သင်သည်ဤစနစ်ကတည်ထောင်ထားသည့်အဘို့အသင့်ကုမ္ပဏီ၏နာမတော်။
+apps/erpnext/erpnext/public/js/setup_wizard.js +158,The name of your company for which you are setting up this system.,သင်သည်ဤစနစ်ကတည်ထောင်ထားသည့်အဘို့အသင့်ကုမ္ပဏီ၏နာမတော်။
 DocType: HR Settings,Include holidays in Total no. of Working Days,အဘယ်သူမျှမစုစုပေါင်းအတွက်အားလပ်ရက်ပါဝင်သည်။ အလုပ်အဖွဲ့ Days ၏
 DocType: Job Applicant,Hold,ကိုင်
 DocType: Employee,Date of Joining,အတူနေ့စွဲ
@@ -789,7 +756,6 @@
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +3,View Subscribers,view Subscribers
 DocType: Purchase Invoice Item,Purchase Receipt,ဝယ်ယူခြင်း Receipt
 ,Received Items To Be Billed,ကြေညာတဲ့ခံရဖို့ရရှိထားသည့်ပစ္စည်းများ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +114,Abrasive blasting,ပွန်းစားခြင်းပေါက်ကွဲမှု
 DocType: Employee,Ms,ဒေါ်
 apps/erpnext/erpnext/config/accounts.py +148,Currency exchange rate master.,ငွေကြေးလဲလှယ်မှုနှုန်းမာစတာ။
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +253,Unable to find Time Slot in the next {0} days for Operation {1},စစ်ဆင်ရေး {1} သည်လာမည့် {0} လက်ထက်ကာလ၌အချိန်အပေါက်ရှာတွေ့ဖို့မအောင်မြင်ဘူး
@@ -801,7 +767,7 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +209,Serial No {0} does not belong to Item {1},serial No {0} Item မှ {1} ပိုင်ပါဘူး
 DocType: Purchase Receipt Item Supplied,Required Qty,မရှိမဖြစ်တဲ့ Qty
 DocType: Bank Reconciliation,Total Amount,စုစုပေါင်းတန်ဘိုး
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +32,Internet Publishing,အင်တာနက်ထုတ်ဝေရေး
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,အင်တာနက်ထုတ်ဝေရေး
 DocType: Production Planning Tool,Production Orders,ထုတ်လုပ်မှုအမိန့်
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +35,Balance Value,ချိန်ခွင် Value တစ်ခု
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,အရောင်းစျေးနှုန်းများစာရင်း
@@ -812,7 +778,7 @@
 DocType: Supplier,Default Payable Accounts,default ပေးဆောင် Accounts ကို
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,ဝန်ထမ်း {0} တက်ကြွမဟုတ်ပါဘူးသို့မဟုတ်မတည်ရှိပါဘူး
 DocType: Features Setup,Item Barcode,item Barcode
-apps/erpnext/erpnext/stock/doctype/item/item.py +487,Item Variants {0} updated,item Variant {0} updated
+apps/erpnext/erpnext/stock/doctype/item/item.py +491,Item Variants {0} updated,item Variant {0} updated
 DocType: Quality Inspection Reading,Reading 6,6 Reading
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,ဝယ်ယူခြင်းပြေစာကြိုတင်ထုတ်
 DocType: Address,Shop,ကုန်ဆိုင်
@@ -821,7 +787,7 @@
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,ဒီ mode ကိုရွေးချယ်ထားသောအခါ default ဘဏ်မှ / ငွေအကောင့်ကိုအလိုအလျှောက် POS ပြေစာအတွက် updated လိမ့်မည်။
 DocType: Employee,Permanent Address Is,အမြဲတမ်းလိပ်စာ Is
 DocType: Production Order Operation,Operation completed for how many finished goods?,စစ်ဆင်ရေးမည်မျှချောကုန်ပစ္စည်းများသည်ပြီးစီးခဲ့?
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +491,The Brand,အဆိုပါအမှတ်တံဆိပ်
+apps/erpnext/erpnext/public/js/setup_wizard.js +237,The Brand,အဆိုပါအမှတ်တံဆိပ်
 apps/erpnext/erpnext/controllers/status_updater.py +163,Allowance for over-{0} crossed for Item {1}.,{0} over- ခွင့် Item {1} သည်ကိုကူး။
 DocType: Employee,Exit Interview Details,Exit ကိုအင်တာဗျူးအသေးစိတ်ကို
 DocType: Item,Is Purchase Item,ဝယ်ယူခြင်း Item ဖြစ်ပါတယ်
@@ -841,16 +807,16 @@
 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,ငွေပေးချေမှုရမည့်ငွေပမာဏ set = ထူးချွန်ပမာဏ
 DocType: Contact Us Settings,Address Line 1,လိပ်စာစာကြောင်း 1
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Variance,ကှဲလှဲ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +392,Company Name,ကုမ္ပဏီအမည်
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +53,Variance,ကှဲလှဲ
+,Company Name,ကုမ္ပဏီအမည်
 DocType: SMS Center,Total Message(s),စုစုပေါင်း Message (s)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +515,Select Item for Transfer,လွှဲပြောင်းသည် Item ကိုရွေးပါ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +538,Select Item for Transfer,လွှဲပြောင်းသည် Item ကိုရွေးပါ
 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.,စစ်ဆေးမှုများအနည်ရာဘဏ်အကောင့်ဖွင့်ဦးခေါင်းကိုရွေးချယ်ပါ။
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,အသုံးပြုသူငွေကြေးလွှဲပြောင်းမှုမှာစျေးနှုန်း List ကို Rate တည်းဖြတ်ရန် Allow
 DocType: Pricing Rule,Max Qty,max Qty
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +106,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,row {0}: / ဝယ်ယူခြင်းအမိန့်ကိုအမြဲကြိုတင်အဖြစ်မှတ်သားထားသင့်အရောင်းဆန့်ကျင်ငွေပေးချေမှုရမည့်
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +16,Chemical,ဓါတုဗေဒ
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,ဓါတုဗေဒ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +693,All items have already been transferred for this Production Order.,ပစ္စည်းများအားလုံးပြီးပြီဒီထုတ်လုပ်မှုအမိန့်သည်ပြောင်းရွှေ့ခဲ့တာဖြစ်ပါတယ်။
 DocType: Process Payroll,Select Payroll Year and Month,လစာတစ်နှစ်တာနှင့်လကိုရွေးချယ်ပါ
 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""",အမျိုးအစား) ကလေးသူငယ် Add ကိုနှိပ်ခြင်းအားဖြင့် (&quot;Bank က&quot; သင့်လျော်သောအုပ်စု (ရန်ပုံငွေကိုပုံမှန်အားဖြင့်လျှောက်လွှာ&gt; လက်ရှိပိုင်ဆိုင်မှုများ&gt; Bank မှ Accounts ကိုသွားပြီးသစ်တစ်ခုအကောင့်ဖန်တီး
@@ -861,12 +827,12 @@
 DocType: Item,Inspection Criteria,စစ်ဆေးရေးလိုအပ်ချက်
 apps/erpnext/erpnext/config/accounts.py +101,Tree of finanial Cost Centers.,finanial ကုန်ကျစရိတ်စင်တာများ၏ပင်လည်းရှိ၏။
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,Transferable
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +492,Upload your letter head and logo. (you can edit them later).,သင့်ရဲ့စာကိုဦးခေါင်းနှင့်လိုဂို upload ။ (သင်နောက်ပိုင်းမှာသူတို့ကိုတည်းဖြတ်နိုင်သည်) ။
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +156,White,အဖြူ
+apps/erpnext/erpnext/public/js/setup_wizard.js +238,Upload your letter head and logo. (you can edit them later).,သင့်ရဲ့စာကိုဦးခေါင်းနှင့်လိုဂို upload ။ (သင်နောက်ပိုင်းမှာသူတို့ကိုတည်းဖြတ်နိုင်သည်) ။
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,White,အဖြူ
 DocType: SMS Center,All Lead (Open),အားလုံးသည်ခဲ (ပွင့်လင်း)
 DocType: Purchase Invoice,Get Advances Paid,ကြိုတင်ငွေ Paid Get
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +362,Attach Your Picture,သင်၏ရုပ်ပုံ Attach
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Make ,လုပ်ပါ
+apps/erpnext/erpnext/public/js/setup_wizard.js +112,Attach Your Picture,သင်၏ရုပ်ပုံ Attach
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +540,Make ,လုပ်ပါ
 DocType: Journal Entry,Total Amount in Words,စကားအတွက်စုစုပေါင်းပမာဏ
 DocType: Workflow State,Stop,ရပ်
 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.,ဆိုတဲ့ error ရှိခဲ့သည်။ တစျခုဖြစ်နိုင်သည်ဟုအကြောင်းပြချက်ကိုသင်ပုံစံကယ်တင်ခြင်းသို့မရောက်ကြပြီဖြစ်နိုင်ပါတယ်။ ပြဿနာရှိနေသေးလျှင် support@erpnext.com ကိုဆက်သွယ်ပါ။
@@ -875,14 +841,13 @@
 DocType: Lead,Next Contact Date,Next ကိုဆက်သွယ်ရန်နေ့စွဲ
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,Qty ဖွင့်လှစ်
 DocType: Holiday List,Holiday List Name,အားလပ်ရက် List ကိုအမည်
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +168,Stock Options,စတော့အိတ် Options ကို
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +168,Stock Options,စတော့အိတ် Options ကို
 DocType: Journal Entry Account,Expense Claim,စရိတ်တောင်းဆိုမှုများ
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +181,Qty for {0},{0} သည် Qty
 DocType: Leave Application,Leave Application,လျှောက်လွှာ Leave
 apps/erpnext/erpnext/config/hr.py +77,Leave Allocation Tool,ဖြန့်ဝေ Tool ကို Leave
 DocType: Leave Block List,Leave Block List Dates,Block List ကိုနေ့ရက်များ Leave
 DocType: Company,If Monthly Budget Exceeded (for expense account),ဒီလအတွက်ဘဏ္ဍာငွေအရအသုံး (စရိတ်အကောင့်) ကိုကျော်လွန်လိုလျှင်
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +56,Trimming,တစ်ခုကိုချုံ့ခြင်း
 DocType: Workstation,Net Hour Rate,Net ကအချိန်နာရီနှုန်း
 DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,ကုန်ကျစရိတ်ဝယ်ယူ Receipt ဆင်းသက်
 DocType: Company,Default Terms,default သက်မှတ်ချက်များ
@@ -890,10 +855,9 @@
 DocType: POS Profile,Cash/Bank Account,ငွေသား / ဘဏ်မှအကောင့်
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,Removed items with no change in quantity or value.,အရေအတွက်သို့မဟုတ်တန်ဖိုးမျှပြောင်းလဲမှုနှင့်အတူပစ္စည်းများကိုဖယ်ရှားခဲ့သည်။
 DocType: Delivery Note,Delivery To,ရန် Delivery
-apps/erpnext/erpnext/stock/doctype/item/item.py +509,Attribute table is mandatory,attribute စားပွဲပေါ်မှာမဖြစ်မနေဖြစ်ပါသည်
+apps/erpnext/erpnext/stock/doctype/item/item.py +513,Attribute table is mandatory,attribute စားပွဲပေါ်မှာမဖြစ်မနေဖြစ်ပါသည်
 DocType: Production Planning Tool,Get Sales Orders,အရောင်းအမိန့် Get
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} အနုတ်လက္ခဏာမဖြစ်နိုင်
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +103,Filing,FILE
 apps/erpnext/erpnext/templates/form_grid/item_grid.html +72,Discount,လြှော့ခွငျး
 DocType: Features Setup,Purchase Discounts,လျော့စျေးဝယ်ယူ
 DocType: Workstation,Wages,လုပ်ခလစာ
@@ -910,6 +874,7 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +112,You are the Expense Approver for this record. Please Update the 'Status' and Save,သင်သည်ဤစံချိန်များအတွက်ကုန်ကျစရိတ်အတည်ပြုချက်ဖြစ်ကြ၏။ ကို &#39;နဲ့ Status&#39; နှင့် Save ကို Update ကျေးဇူးပြု.
 DocType: Serial No,Creation Document No,ဖန်ဆင်းခြင်း Document ဖိုင်မရှိပါ
 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 +136,"Attributes for Item Variants. e.g Size, Color etc.","Item Variant သည် attributes ။ ဥပမာ Size အ, အရောင်စသည်တို့"
 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 +194,Serial No {0} is under maintenance contract upto {1},serial No {0} {1} ထိ​​ပြုပြင်ထိန်းသိမ်းမှုစာချုပ်အောက်မှာဖြစ်ပါတယ်
@@ -918,7 +883,7 @@
 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,item button ကို &#39;&#39; ဝယ်ယူလက်ခံရရှိသည့်ရက်မှပစ္စည်းများ Get &#39;&#39; ကို အသုံးပြု. ထည့်သွင်းပြောကြားခဲ့သည်ရမည်
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,အရောင်းအသုံးစရိတ်များ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Buying,စံဝယ်ယူ
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +120,Standard Buying,စံဝယ်ယူ
 DocType: GL Entry,Against,ဆန့်ကျင်
 DocType: Item,Default Selling Cost Center,default ရောင်းချသည့်ကုန်ကျစရိတ် Center က
 DocType: Sales Partner,Implementation Partner,အကောင်အထည်ဖော်ရေး Partner
@@ -939,29 +904,29 @@
 DocType: Time Log Batch,updated via Time Logs,အချိန် Logs ကနေတဆင့် updated
 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/setup/page/setup_wizard/setup_wizard.js +588,List a few of your suppliers. They could be organizations or individuals.,သင့်ရဲ့ပေးသွင်းသူများ၏အနည်းငယ်စာရင်း။ သူတို့ဟာအဖွဲ့အစည်းများသို့မဟုတ်လူပုဂ္ဂိုလ်တစ်ဦးချင်းဖြစ်နိုင်ပါတယ်။
+apps/erpnext/erpnext/public/js/setup_wizard.js +326,List a few of your suppliers. They could be organizations or individuals.,သင့်ရဲ့ပေးသွင်းသူများ၏အနည်းငယ်စာရင်း။ သူတို့ဟာအဖွဲ့အစည်းများသို့မဟုတ်လူပုဂ္ဂိုလ်တစ်ဦးချင်းဖြစ်နိုင်ပါတယ်။
 DocType: Company,Default Currency,default ငွေကြေးစနစ်
 DocType: Contact,Enter designation of this Contact,ဒီဆက်သွယ်ရန်၏သတ်မှတ်ရေး Enter
 DocType: Contact Us Settings,Address,လိပ်စာ
 DocType: Expense Claim,From Employee,န်ထမ်းအနေဖြင့်
-apps/erpnext/erpnext/controllers/accounts_controller.py +338,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,သတိပေးချက်: စနစ် Item {0} သည်ငွေပမာဏကတည်းက overbilling စစ်ဆေးမည်မဟုတ် {1} သုညဖြစ်ပါသည်အတွက်
+apps/erpnext/erpnext/controllers/accounts_controller.py +339,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,သတိပေးချက်: စနစ် Item {0} သည်ငွေပမာဏကတည်းက overbilling စစ်ဆေးမည်မဟုတ် {1} သုညဖြစ်ပါသည်အတွက်
 DocType: Journal Entry,Make Difference Entry,Difference Entry &#39;ပါစေ
 DocType: Upload Attendance,Attendance From Date,နေ့စွဲ မှစ. တက်ရောက်
 DocType: Appraisal Template Goal,Key Performance Area,Key ကိုစွမ်းဆောင်ရည်ဧရိယာ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +54,Transportation,သယ်ယူပို့ဆောင်ရေး
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +54,Transportation,သယ်ယူပို့ဆောင်ရေး
 apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +67, and year: ,နှင့်တစ်နှစ်:
 DocType: Email Digest,Annual Expense,နှစ်ပတ်လည်သုံးစွဲမှု
 DocType: SMS Center,Total Characters,စုစုပေါင်းဇာတ်ကောင်
-apps/erpnext/erpnext/controllers/buying_controller.py +139,Please select BOM in BOM field for Item {0},Item သည် BOM လယ်ပြင်၌ {0} BOM ကို select ကျေးဇူးပြု.
+apps/erpnext/erpnext/controllers/buying_controller.py +130,Please select BOM in BOM field for Item {0},Item သည် BOM လယ်ပြင်၌ {0} BOM ကို select ကျေးဇူးပြု.
 DocType: C-Form Invoice Detail,C-Form Invoice Detail,C-Form တွင်ပြေစာ Detail
 DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,ငွေပေးချေမှုရမည့်ပြန်လည်ရင်ကြားစေ့ရေးပြေစာ
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +32,Contribution %,contribution%
 DocType: Item,website page link,ဝက်ဘ်ဆိုက်စာမျက်နှာလင့်ခ်
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +192,Let's prepare the system for first use.,၏ပထမဦးဆုံးအသုံးပြုရန် system ကိုပြင်ကြကုန်အံ့။
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +242,Let's prepare the system for first use.,၏ပထမဦးဆုံးအသုံးပြုရန် system ကိုပြင်ကြကုန်အံ့။
 DocType: Company,Company registration numbers for your reference. Tax numbers etc.,သင့်ရဲ့ကိုးကားနိုင်ရန်ကုမ္ပဏီမှတ်ပုံတင်နံပါတ်များ။ အခွန်နံပါတ်များစသည်တို့
 DocType: Sales Partner,Distributor,ဖြန့်ဖြူး
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,စျေးဝယ်တွန်းလှည်း Shipping Rule
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +214,Production Order {0} must be cancelled before cancelling this Sales Order,ထုတ်လုပ်မှုအမိန့် {0} ဒီအရောင်းအမိန့်ကိုပယ်ဖျက်မီဖျက်သိမ်းရပါမည်
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +209,Production Order {0} must be cancelled before cancelling this Sales Order,ထုတ်လုပ်မှုအမိန့် {0} ဒီအရောင်းအမိန့်ကိုပယ်ဖျက်မီဖျက်သိမ်းရပါမည်
 ,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,Range ထဲထဲကနေ A မျိုးမျိုးရန်ထက်လျော့နည်းဖြစ်ဖို့ရှိပါတယ်
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +21,Select Time Logs and Submit to create a new Sales Invoice.,အချိန် Logs ကိုရွေးပြီးအသစ်တစ်ခုကိုအရောင်းပြေစာကိုဖန်တီးရန် Submit ။
@@ -981,14 +946,13 @@
 DocType: Sales Invoice Advance,Sales Invoice Advance,အရောင်းပြေစာကြိုတင်ထုတ်
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +398,Nothing to request,တောင်းဆိုရန်ဘယ်အရာမှ
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date',&#39;&#39; အမှန်တကယ် Start ကိုနေ့စွဲ &#39;&#39; အမှန်တကယ် End Date ကို &#39;&#39; ထက် သာ. ကြီးမြတ်မဖွစျနိုငျ
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +75,Management,စီမံခန့်ခွဲမှု
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +75,Management,စီမံခန့်ခွဲမှု
 apps/erpnext/erpnext/config/projects.py +33,Types of activities for Time Sheets,အချိန် Sheet များသည်လှုပ်ရှားမှုများအမျိုးအစားများ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +14,Investment casting,ရင်းနှီးမြှုပ်နှံမှုသွန်း
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +51,Either debit or credit amount is required for {0},debit သို့မဟုတ်ခရက်ဒစ်ပမာဏကို {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""","ဤသည်မူကွဲ၏ Item Code ကိုမှ appended လိမ့်မည်။ သင့်ရဲ့အတိုကောက် &quot;SM&quot; ဖြစ်ပြီး, ပစ္စည်း code ကို &quot;သည် T-shirt&quot; ဖြစ်ပါတယ်လျှင်ဥပမာ, ကိုမူကွဲ၏ပစ္စည်း code ကို &quot;သည် T-shirt-SM&quot; ဖြစ်လိမ့်မည်"
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,သင်လစာစလစ်ဖြတ်ပိုင်းပုံစံကိုကယ်တင်တခါ (စကား) Net က Pay ကိုမြင်နိုင်ပါလိမ့်မည်။
 apps/frappe/frappe/core/doctype/user/user_list.js +12,Active,active
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +154,Blue,ပြာသော
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +154,Blue,ပြာသော
 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,နောက်ထပ်ဆုံမှတ်များသာ &#39;&#39; Group မှ &#39;&#39; type ကိုဆုံမှတ်များအောက်မှာနေသူများကဖန်တီးနိုင်ပါသည်
@@ -998,18 +962,16 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +22,POS Profile {0} already created for user: {1} and company {2},POS Profile ကို {0} ပြီးသားအသုံးပြုသူဖန်တီး: {1} နှင့်ကုမ္ပဏီ {2}
 DocType: Purchase Order Item,UOM Conversion Factor,UOM ကူးပြောင်းခြင်း Factor
 DocType: Stock Settings,Default Item Group,default Item Group က
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +156,Laminated object manufacturing,ဖျင်အရာဝတ္ထုကုန်ထုတ်လုပ်မှု
 apps/erpnext/erpnext/config/buying.py +13,Supplier database.,ပေးသွင်းဒေတာဘေ့စ။
 DocType: Account,Balance Sheet,ချိန်ခွင် Sheet
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +561,Cost Center For Item with Item Code ',Item Code ကိုအတူ Item သည်ကုန်ကျစရိတ် Center က &#39;&#39;
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +45,Stretch forming,Stretch ဖွဲ့စည်း
 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 +210,"Further accounts can be made under Groups, but entries can be made against non-Groups",နောက်ထပ်အကောင့်အဖွဲ့များအောက်မှာလုပ်နိုင်ပေမယ့် entries တွေကို Non-အဖွဲ့များဆန့်ကျင်စေနိုင်ပါတယ်
 apps/erpnext/erpnext/config/hr.py +125,Tax and other salary deductions.,အခွန်နှင့်အခြားလစာဖြတ်တောက်။
 DocType: Lead,Lead,ခဲ
 DocType: Email Digest,Payables,ပေးအပ်သော
 DocType: Account,Warehouse,ကုနျလှောငျရုံ
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +90,Row #{0}: Rejected Qty can not be entered in Purchase Return,row # {0}: ငြင်းပယ် Qty ဝယ်ယူခြင်းသို့ပြန်သွားသည်ဝင်မသတ်နိုင်
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +93,Row #{0}: Rejected Qty can not be entered in Purchase Return,row # {0}: ငြင်းပယ် Qty ဝယ်ယူခြင်းသို့ပြန်သွားသည်ဝင်မသတ်နိုင်
 ,Purchase Order Items To Be Billed,ကြေညာတဲ့ခံရဖို့အမိန့်ပစ္စည်းများဝယ်ယူရန်
 DocType: Purchase Invoice Item,Net Rate,Net က Rate
 DocType: Purchase Invoice Item,Purchase Invoice Item,ဝယ်ယူခြင်းပြေစာ Item
@@ -1024,13 +986,13 @@
 DocType: Global Defaults,Current Fiscal Year,လက်ရှိဘဏ္ဍာရေးနှစ်တစ်နှစ်တာ
 DocType: Global Defaults,Disable Rounded Total,Rounded စုစုပေါင်းကို disable
 DocType: Lead,Call,တယ်လီဖုန်းဆက်
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +384,'Entries' cannot be empty,&#39;&#39; Entries &#39;လွတ်နေတဲ့မဖွစျနိုငျ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +386,'Entries' cannot be empty,&#39;&#39; Entries &#39;လွတ်နေတဲ့မဖွစျနိုငျ
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},{1} တူညီနှင့်အတူအတန်း {0} Duplicate
 ,Trial Balance,ရုံးတင်စစ်ဆေး Balance
 apps/erpnext/erpnext/config/hr.py +205,Setting up Employees,ဝန်ထမ်းများကိုတည်ဆောက်ခြင်း
 apps/erpnext/erpnext/public/js/feature_setup.js +220,"Grid """,grid &quot;
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +150,Please select prefix first,ပထမဦးဆုံးရှေ့ဆက်ကိုရွေးပါ ကျေးဇူးပြု.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +138,Research,သုတေသန
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +138,Research,သုတေသန
 DocType: Maintenance Visit Purpose,Work Done,အလုပ် Done
 apps/erpnext/erpnext/controllers/item_variant.py +25,Please specify at least one attribute in the Attributes table,ထို Attribute တွေက table ထဲမှာအနည်းဆုံးတစ်ခု attribute ကို specify ကျေးဇူးပြု.
 DocType: Contact,User ID,သုံးစွဲသူအိုင်ဒီ
@@ -1038,10 +1000,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +57,View Ledger,view လယ်ဂျာ
 DocType: File,Lft,Lft
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,အစောဆုံး
-apps/erpnext/erpnext/stock/doctype/item/item.py +394,"An Item Group exists with same name, please change the item name or rename the item group","တစ်ဦး Item Group မှအမည်တူနှင့်အတူရှိနေတယ်, ပစ္စည်းအမည်ကိုပြောင်းလဲသို့မဟုတ်ပစ္စည်းအုပ်စုအမည်ပြောင်းကျေးဇူးတင်ပါ"
+apps/erpnext/erpnext/stock/doctype/item/item.py +398,"An Item Group exists with same name, please change the item name or rename the item group","တစ်ဦး Item Group မှအမည်တူနှင့်အတူရှိနေတယ်, ပစ္စည်းအမည်ကိုပြောင်းလဲသို့မဟုတ်ပစ္စည်းအုပ်စုအမည်ပြောင်းကျေးဇူးတင်ပါ"
 DocType: Communication,Delivery Status,Delivery နဲ့ Status
 DocType: Production Order,Manufacture against Sales Order,အရောင်းအမိန့်ဆန့်ကျင်ထုတ်လုပ်
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +517,Rest Of The World,ကမ္ဘာ့အရာကြွင်းလေ
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +455,Rest Of The World,ကမ္ဘာ့အရာကြွင်းလေ
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,အဆိုပါ Item {0} Batch ရှိသည်မဟုတ်နိုင်
 ,Budget Variance Report,ဘဏ္ဍာငွေအရအသုံးကှဲလှဲအစီရင်ခံစာ
 DocType: Salary Slip,Gross Pay,gross Pay ကို
@@ -1052,13 +1014,11 @@
 DocType: BOM Item,Item Description,item ဖော်ပြချက်များ
 DocType: Payment Tool,Payment Mode,ငွေပေးချေမှုရမည့် Mode ကို
 DocType: Purchase Invoice,Is Recurring,ထပ်တလဲလဲဖြစ်ပါတယ်
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +154,Direct metal laser sintering,တိုက်ရိုက်သတ္တုလေဆာ sintering
 DocType: Purchase Order,Supplied Items,ထောက်ပံ့ရေးပစ္စည်းများ
 DocType: Production Order,Qty To Manufacture,ထုတ်လုပ်ခြင်းရန် Qty
 DocType: Buying Settings,Maintain same rate throughout purchase cycle,ဝယ်ယူသံသရာတလျှောက်လုံးအတူတူနှုန်းကထိန်းသိမ်းနည်း
 DocType: Opportunity Item,Opportunity Item,အခွင့်အလမ်း Item
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +61,Temporary Opening,ယာယီဖွင့်ပွဲ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +41,Cryorolling,Cryorolling
 ,Employee Leave Balance,ဝန်ထမ်းထွက်ခွာ Balance
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +128,Balance for Account {0} must always be {1},အကောင့်သည်ချိန်ခွင် {0} အမြဲ {1} ဖြစ်ရမည်
 DocType: Address,Address Type,လိပ်စာရိုက်ထည့်ပါ
@@ -1074,23 +1034,23 @@
 DocType: Journal Entry,Get Outstanding Invoices,ထူးချွန်ငွေတောင်းခံလွှာကိုရယူပါ
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,အရောင်းအမိန့် {0} တရားဝင်မဟုတ်
 apps/erpnext/erpnext/setup/doctype/company/company.py +172,"Sorry, companies cannot be merged","စိတ်မကောင်းပါဘူး, ကုမ္ပဏီများပေါင်းစည်းမရနိုင်ပါ"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +145,Small,သေးငယ်သော
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Small,သေးငယ်သော
 DocType: Employee,Employee Number,ဝန်ထမ်းအရေအတွက်
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},ပြီးသားအသုံးပြုမှုအတွက်အမှုအမှတ် (s) ။ Case မရှိပါ {0} ကနေကြိုးစား
 ,Invoiced Amount (Exculsive Tax),Invoiced ငွေပမာဏ (Exculsive ခွန်)
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,item 2
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +59,Account head {0} created,အကောင့်ဖွင့်ဦးခေါင်း {0} နေသူများကဖန်တီး
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +153,Green,စိမ်းလန်းသော
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Green,စိမ်းလန်းသော
 DocType: Item,Auto re-order,မော်တော်ကားပြန်လည်အမိန့်
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +57,Total Achieved,အကောင်အထည်ဖော်ခဲ့သောစုစုပေါင်း
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +59,Total Achieved,အကောင်အထည်ဖော်ခဲ့သောစုစုပေါင်း
 DocType: Employee,Place of Issue,ထုတ်ဝေသည့်နေရာ
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +59,Contract,စာချုပ်
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Contract,စာချုပ်
 DocType: Report,Disabled,ချို့ငဲသော
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +490,UOM coversion factor required for UOM: {0} in Item: {1},UOM လိုအပ် UOM ဖုံးလွှမ်းအချက်: Item အတွက် {0}: {1}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +83,Indirect Expenses,သွယ်ဝိုက်ကုန်ကျစရိတ်
 apps/erpnext/erpnext/controllers/selling_controller.py +163,Row {0}: Qty is mandatory,row {0}: Qty မသင်မနေရ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +8,Agriculture,လယ်ယာစိုက်ပျိုးရေး
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +611,Your Products or Services,သင့်ရဲ့ထုတ်ကုန်များသို့မဟုတ်န်ဆောင်မှုများ
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,လယ်ယာစိုက်ပျိုးရေး
+apps/erpnext/erpnext/public/js/setup_wizard.js +347,Your Products or Services,သင့်ရဲ့ထုတ်ကုန်များသို့မဟုတ်န်ဆောင်မှုများ
 DocType: Mode of Payment,Mode of Payment,ငွေပေးချေမှုရမည့်၏ Mode ကို
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,ဒါကအမြစ်ကို item အဖွဲ့နှင့်တည်းဖြတ်မရနိုင်ပါ။
 DocType: Journal Entry Account,Purchase Order,ကုန်ပစ္စည်းအမှာစာ
@@ -1102,7 +1062,7 @@
 DocType: Serial No,Serial No Details,serial No အသေးစိတ်ကို
 DocType: Purchase Invoice Item,Item Tax Rate,item အခွန်နှုန်း
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +113,"For {0}, only credit accounts can be linked against another debit entry",{0} သည်ကိုသာအကြွေးအကောင့်အသစ်များ၏အခြား debit entry ကိုဆန့်ကျင်နှင့်ဆက်စပ်နိုင်
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Delivery Note {0} is not submitted,Delivery မှတ်ချက် {0} တင်သွင်းသည်မဟုတ်
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +470,Delivery Note {0} is not submitted,Delivery မှတ်ချက် {0} တင်သွင်းသည်မဟုတ်
 apps/erpnext/erpnext/stock/get_item_details.py +136,Item {0} must be a Sub-contracted Item,item {0} တစ် Sub-စာချုပ်ချုပ်ဆို Item ဖြစ်ရမည်
 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.","စျေးနှုန်း Rule ပထမဦးဆုံး Item, Item အုပ်စုသို့မဟုတ်အမှတ်တံဆိပ်ဖြစ်နိုငျသောလယ်​​ပြင်၌, &#39;&#39; တွင် Apply &#39;&#39; အပေါ်အခြေခံပြီးရွေးချယ်ထားဖြစ်ပါတယ်။"
@@ -1112,7 +1072,7 @@
 DocType: Appraisal Goal,Goal,ရည်မှန်းချက်
 DocType: Sales Invoice Item,Edit Description,Edit ကိုဖော်ပြချက်
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +318,Expected Delivery Date is lesser than Planned Start Date.,မျှော်လင့်ထားသည့် Delivery Date ကိုစီစဉ်ထားသော Start ကိုနေ့စွဲထက်ယျဆုံးသောဖြစ်ပါတယ်။
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +579,For Supplier,ပေးသွင်းအကြောင်းမူကား
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +602,For Supplier,ပေးသွင်းအကြောင်းမူကား
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,Account Type ကိုချိန်ညှိခြင်းကိစ္စများကို၌ဤအကောင့်ကိုရွေးချယ်ခြင်းအတွက်ကူညီပေးသည်။
 DocType: Purchase Invoice,Grand Total (Company Currency),က Grand စုစုပေါင်း (ကုမ္ပဏီငွေကြေးစနစ်)
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,စုစုပေါင်းအထွက်
@@ -1138,10 +1098,10 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +74,"Total {0} for all items is zero, may you should change 'Distribute Charges Based On'",စုစုပေါင်း {0} ပစ္စည်းများအားလုံးသည်သုညကသင် &#39;&#39; ဖြန့်ဝေတွင် အခြေခံ. စွပ်စွဲချက် &#39;&#39; ကိုပြောင်းလဲသင့်ပါတယ်နိုင်ပါသည်
 DocType: Purchase Invoice,Taxes and Charges Calculation,အခွန်နှင့်စွပ်စွဲချက်တွက်ချက်
 DocType: BOM Operation,Workstation,Workstation နှင့်
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +112,Hardware,hardware
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +112,Hardware,hardware
 DocType: Attendance,HR Manager,HR Manager
 apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,တစ်ကုမ္ပဏီလီမိတက်ကို select ကျေးဇူးပြု.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +50,Privilege Leave,အခွင့်ထူးထွက်ခွာ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +50,Privilege Leave,အခွင့်ထူးထွက်ခွာ
 DocType: Purchase Invoice,Supplier Invoice Date,ပေးသွင်းပြေစာနေ့စွဲ
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +79,You need to enable Shopping Cart,သင်ကစျေးဝယ်ခြင်းတွန်းလှည်း enable ရန်လိုအပ်သည်
 apps/frappe/frappe/public/js/frappe/form/grid_body.html +6,No Data,အဘယ်သူမျှမအချက်အလက်
@@ -1154,7 +1114,7 @@
 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 +168,Against Journal Entry {0} is already adjusted against some other voucher,ဂျာနယ် Entry &#39;{0} ဆန့်ကျင်နေပြီအချို့သောအခြားဘောက်ချာဆန့်ကျင်ညှိယူဖြစ်ပါတယ်
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +68,Total Order Value,စုစုပေါင်းအမိန့် Value တစ်ခု
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +38,Food,အစာ
+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,Ageing Range 3
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +139,You can make a time log only against a submitted production order,သင်ကသာတင်သွင်းထုတ်လုပ်မှုအမိန့်ဆန့်ကျင်နေတဲ့အချိန် log ကိုဖြစ်စေနိုင်ပါတယ်
 DocType: Maintenance Schedule Item,No of Visits,လည်ပတ်သူများမရှိပါ
@@ -1174,6 +1134,7 @@
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,View Offer Letter,view ကမ်းလှမ်းချက်ပေးစာ
 DocType: Communication,Communication,ဆက်သွယ်ရေး
 DocType: Item,Is Service Item,ဝန်ဆောင်မှု Item ဖြစ်ပါတယ်
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +81,Application period cannot be outside leave allocation period,ပလီကေးရှင်းကာလအတွင်းပြင်ပမှာခွင့်ခွဲဝေကာလအတွင်းမဖွစျနိုငျ
 DocType: Activity Cost,Projects,စီမံကိန်းများ
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +31,Please select Fiscal Year,ဘဏ္ဍာရေးနှစ်တစ်နှစ်တာကို select ကျေးဇူးပြု.
 apps/erpnext/erpnext/controllers/buying_controller.py +23,From {0} | {1} {2},{0} ကနေ | {1} {2}
@@ -1192,7 +1153,7 @@
 DocType: Item,Maintain Stock,စတော့အိတ်ထိန်းသိမ်းနည်း
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +213,Stock Entries already created for Production Order ,ပြီးသားထုတ်လုပ်မှုအမိန့်ဖန်တီးစတော့အိတ် Entries
 DocType: Leave Control Panel,Leave blank if considered for all designations,အားလုံးပုံစံတခုစဉ်းစားလျှင်အလွတ် Leave
-apps/erpnext/erpnext/controllers/accounts_controller.py +499,Charge of type 'Actual' in row {0} cannot be included in Item Rate,&#39;&#39; အမှန်တကယ် &#39;&#39; အမျိုးအစားတာဝန်ခံအတန်းအတွက် {0} Item နှုန်းတွင်ထည့်သွင်းမရနိုင်ပါ
+apps/erpnext/erpnext/controllers/accounts_controller.py +500,Charge of type 'Actual' in row {0} cannot be included in Item Rate,&#39;&#39; အမှန်တကယ် &#39;&#39; အမျိုးအစားတာဝန်ခံအတန်းအတွက် {0} Item နှုန်းတွင်ထည့်သွင်းမရနိုင်ပါ
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,Max: {0},Max: {0}
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +16,From Datetime,Datetime ကနေ
 DocType: Email Digest,For Company,ကုမ္ပဏီ
@@ -1202,7 +1163,7 @@
 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 +471,cannot be greater than 100,100 ကိုထက် သာ. ကြီးမြတ်မဖွစျနိုငျ
-apps/erpnext/erpnext/stock/doctype/item/item.py +546,Item {0} is not a stock Item,item {0} တစ်စတော့ရှယ်ယာ Item မဟုတ်ပါဘူး
+apps/erpnext/erpnext/stock/doctype/item/item.py +550,Item {0} is not a stock Item,item {0} တစ်စတော့ရှယ်ယာ Item မဟုတ်ပါဘူး
 DocType: Maintenance Visit,Unscheduled,Unscheduled
 DocType: Employee,Owned,ပိုင်ဆိုင်
 DocType: Salary Slip Deduction,Depends on Leave Without Pay,Pay ကိုမရှိရင်ထွက်ခွာအပေါ်မူတည်
@@ -1216,30 +1177,28 @@
 DocType: HR Settings,Employee Settings,ဝန်ထမ်း Settings ကို
 ,Batch-Wise Balance History,batch-ပညာရှိ Balance သမိုင်း
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +72,To Do List,စာရင်းလုပ်ပါမှ
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +63,Apprentice,အလုပ်သင်သူ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Apprentice,အလုပ်သင်သူ
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +99,Negative Quantity is not allowed,အနုတ်လက္ခဏာပမာဏခွင့်ပြုမထားဘူး
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
 Used for Taxes and Charges",အခွန်အသေးစိတ်စားပွဲတစ် string ကို item ကိုမာစတာကနေခေါ်ယူသောအခါနှင့်ဤလယ်ပြင်၌သိုလှောင်ထား။ အခွန်နှင့်စွပ်စွဲချက်အတွက်အသုံးပြု
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +61,Lancing,Lancing
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +151,Employee cannot report to himself.,ဝန်ထမ်းကိုယ်တော်တိုင်မှသတင်းပို့လို့မရပါဘူး။
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","အကောင့်အေးခဲသည်မှန်လျှင်, entries တွေကိုကန့်သတ်အသုံးပြုသူများမှခွင့်ပြုထားသည်။"
 DocType: Email Digest,Bank Balance,ဘဏ်ကို Balance ကို
-apps/erpnext/erpnext/controllers/accounts_controller.py +435,Accounting Entry for {0}: {1} can only be made in currency: {2},{0} များအတွက်စာရင်းကိုင် Entry: {1} သာငွေကြေးကိုအတွက်ဖန်ဆင်းနိုင်ပါသည်: {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +436,Accounting Entry for {0}: {1} can only be made in currency: {2},{0} များအတွက်စာရင်းကိုင် Entry: {1} သာငွေကြေးကိုအတွက်ဖန်ဆင်းနိုင်ပါသည်: {2}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +38,No active Salary Structure found for employee {0} and the month,တက်ကြွသောလစာဝန်ထမ်း {0} တွေ့ရှိဖွဲ့စည်းပုံနှင့်တစ်လအဘယ်သူမျှမ
 DocType: Job Opening,"Job profile, qualifications required etc.","ယောဘသည် profile ကို, အရည်အချင်းများနှင့်ပြည့်စသည်တို့မလိုအပ်"
 DocType: Journal Entry Account,Account Balance,အကောင့်ကို Balance
 apps/erpnext/erpnext/config/accounts.py +112,Tax Rule for transactions.,ငွေပေးငွေယူဘို့အခွန်နည်းဥပဒေ။
 DocType: Rename Tool,Type of document to rename.,အမည်ပြောင်းရန်စာရွက်စာတမ်းအမျိုးအစား။
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +630,We buy this Item,ကျွန်ုပ်တို့သည်ဤ Item ကိုဝယ်
+apps/erpnext/erpnext/public/js/setup_wizard.js +366,We buy this Item,ကျွန်ုပ်တို့သည်ဤ Item ကိုဝယ်
 DocType: Address,Billing,ငွေတောင်းခံ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +77,Flanging,Flanging
 DocType: Bulk Email,Not Sent,Sent မဟုတ်
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +73,Explosive forming,ဖွဲ့စည်းပေါက်ကွဲ
 DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),စုစုပေါင်းအခွန်နှင့်စွပ်စွဲချက် (ကုမ္ပဏီငွေကြေးစနစ်)
 DocType: Shipping Rule,Shipping Account,သဘောင်္တင်ခအကောင့်
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +43,Scheduled to send to {0} recipients,{0} လက်ခံသူများမှပို့ပေးရန်စီစဉ်ထား
 DocType: Quality Inspection,Readings,ဖတ်
 DocType: Stock Entry,Total Additional Costs,စုစုပေါင်းအထပ်ဆောင်းကုန်ကျစရိတ်
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Sub Assemblies,sub စညျးဝေး
+apps/erpnext/erpnext/public/js/setup_wizard.js +359,Sub Assemblies,sub စညျးဝေး
 DocType: Shipping Rule Condition,To Value,Value တစ်ခုမှ
 DocType: Supplier,Stock Manager,စတော့အိတ် Manager က
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +143,Source warehouse is mandatory for row {0},source ဂိုဒေါင်အတန်း {0} သည်မသင်မနေရ
@@ -1249,44 +1208,42 @@
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,သွင်းကုန်မအောင်မြင်ပါ!
 apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,အဘယ်သူမျှမလိပ်စာသေးကဆက်ပြောသည်။
 DocType: Workstation Working Hour,Workstation Working Hour,Workstation နှင့်အလုပ်အဖွဲ့ Hour
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +83,Analyst,လေ့လာဆန်းစစ်သူ
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +202,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},row {0}: ခွဲဝေငွေပမာဏ {1} JV ငွေပမာဏ {2} ထက်လျော့နည်းသို့မဟုတ်နှင့်ထပ်တူဖြစ်ရပါမည်
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Analyst,လေ့လာဆန်းစစ်သူ
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +149,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},row {0}: ခွဲဝေငွေပမာဏ {1} JV ငွေပမာဏ {2} ထက်လျော့နည်းသို့မဟုတ်နှင့်ထပ်တူဖြစ်ရပါမည်
 DocType: Item,Inventory,စာရင်း
 DocType: Features Setup,"To enable ""Point of Sale"" view",&quot;Point သို့ရောင်းရငွေ၏&quot; အမြင် enable လုပ်ဖို့
 apps/erpnext/erpnext/public/js/pos/pos.js +402,Payment cannot be made for empty cart,ငွေပေးချေမှုရမည့်အချည်းနှီးလှည်းတို့ကိုလုပ်မပြနိုင်
 DocType: Item,Sales Details,အရောင်းအသေးစိတ်ကို
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +149,Pinning,Pinning
 DocType: Opportunity,With Items,ပစ္စည်းများနှင့်အတူ
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,Qty အတွက်
 DocType: Notification Control,Expense Claim Rejected,စရိတ်ဖြစ်သည်ဆိုခြင်းကိုပယ်ချခဲ့သည်
 DocType: Sales Invoice,"The date on which next invoice will be generated. It is generated on submit.
 ",လာမယ့်ကုန်ပို့လွှာ generated လိမ့်မည်သည့်နေ့ရက်။ ဒါဟာတင်ပြရန်အပေါ် generated ဖြစ်ပါတယ်။
 DocType: Item Attribute,Item Attribute,item Attribute
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +105,Government,အစိုးရ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Government,အစိုးရ
 apps/erpnext/erpnext/config/stock.py +268,Item Variants,item Variant
 DocType: Company,Services,န်ဆောင်မှုများ
 apps/erpnext/erpnext/accounts/report/financial_statements.py +147,Total ({0}),စုစုပေါင်း ({0})
 DocType: Cost Center,Parent Cost Center,မိဘကုန်ကျစရိတ် Center က
 DocType: Sales Invoice,Source,အရင်းအမြစ်
 DocType: Leave Type,Is Leave Without Pay,Pay ကိုမရှိရင် Leave ဖြစ်ပါတယ်
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +186,No records found in the Payment table,ထိုငွေပေးချေမှုရမည့် table ထဲမှာတွေ့ရှိမရှိပါမှတ်တမ်းများ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +405,Financial Year Start Date,ဘဏ္ဍာရေးတစ်နှစ်တာ Start ကိုနေ့စွဲ
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +133,No records found in the Payment table,ထိုငွေပေးချေမှုရမည့် table ထဲမှာတွေ့ရှိမရှိပါမှတ်တမ်းများ
+apps/erpnext/erpnext/public/js/setup_wizard.js +153,Financial Year Start Date,ဘဏ္ဍာရေးတစ်နှစ်တာ Start ကိုနေ့စွဲ
 DocType: Employee External Work History,Total Experience,စုစုပေါင်းအတွေ့အကြုံ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +100,Countersinking,Countersinking
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +271,Packing Slip(s) cancelled,ထုပ်ပိုးစလစ်ဖြတ်ပိုင်းပုံစံ (s) ဖျက်သိမ်း
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +276,Packing Slip(s) cancelled,ထုပ်ပိုးစလစ်ဖြတ်ပိုင်းပုံစံ (s) ဖျက်သိမ်း
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,ကုန်တင်နှင့် Forwarding စွပ်စွဲချက်
 DocType: Material Request Item,Sales Order No,အရောင်းအမိန့်မရှိပါ
 DocType: Item Group,Item Group Name,item Group မှအမည်
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +50,Taken,ယူ
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,ယူ
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +66,Transfer Materials for Manufacture,Manufacturing သည်ပစ္စည်းများလွှဲပြောင်း
 DocType: Pricing Rule,For Price List,စျေးနှုန်း List တွေ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +27,Executive Search,အလုပ်အမှုဆောင်ရှာရန်
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,အလုပ်အမှုဆောင်ရှာရန်
 apps/erpnext/erpnext/stock/stock_ledger.py +405,"Purchase rate for item: {0} not found, which is required to book accounting entry (expense). Please mention item price against a buying price list.","ကို item သည်ဝယ်ယူနှုန်းက: {0} မတွေ့ရှိ, entry ကို (စရိတ်) စာရင်းကိုင် book ရန်လိုအပ်သောအရာ။ တစ်ဦးဝယ်စျေးနှုန်းစာရင်းကိုဆန့်ကျင်တဲ့ item စျေးနှုန်းဖော်ပြထားခြင်းပေးပါ။"
 DocType: Maintenance Schedule,Schedules,အချိန်ဇယားများ
 DocType: Purchase Invoice Item,Net Amount,Net ကပမာဏ
 DocType: Purchase Order Item Supplied,BOM Detail No,BOM Detail မရှိပါ
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),အပိုဆောင်းလျှော့ငွေပမာဏ (ကုမ္ပဏီငွေကြေးစနစ်)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +537,Error: {0} > {1},error: {0}&gt; {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +541,Error: {0} > {1},error: {0}&gt; {1}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,ငွေစာရင်း၏ Chart ဟာကနေအကောင့်သစ်ဖန်တီးပေးပါ။
 DocType: Maintenance Visit,Maintenance Visit,ပြုပြင်ထိန်းသိမ်းမှုခရီးစဉ်
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer > Customer Group > Territory,ဖောက်သည်&gt; ဖောက်သည်အုပ်စု&gt; နယ်မြေတွေကို
@@ -1308,15 +1265,14 @@
 DocType: ToDo,Due Date,သတ်မှတ်ချိန်းရက်
 DocType: Sales Invoice Item,Brand Name,ကုန်အမှတ်တံဆိပ်အမည်
 DocType: Purchase Receipt,Transporter Details,Transporter Details ကို
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Box,သေတ္တာ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +389,The Organization,အဖွဲ့
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Box,သေတ္တာ
+apps/erpnext/erpnext/public/js/setup_wizard.js +137,The Organization,အဖွဲ့
 DocType: Monthly Distribution,Monthly Distribution,လစဉ်ဖြန့်ဖြူး
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,receiver List ကိုအချည်းနှီးပါပဲ။ Receiver များစာရင်းဖန်တီး ကျေးဇူးပြု.
 DocType: Production Plan Sales Order,Production Plan Sales Order,ထုတ်လုပ်မှုစီမံကိန်းအရောင်းအမိန့်
 DocType: Sales Partner,Sales Partner Target,အရောင်း Partner Target က
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},{1}: {0} သာငွေကြေးကိုအတွက်ဖန်ဆင်းနိုင်ပါတယ်များအတွက်စာရင်းကိုင် Entry &#39;
 DocType: Pricing Rule,Pricing Rule,စျေးနှုန်း Rule
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +58,Notching,ထစ်
 apps/erpnext/erpnext/config/learn.py +167,Material Request to Purchase Order,အမိန့်ကိုဝယ်ယူအ​​သုံးပြုမှ material တောင်းဆိုခြင်း
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +74,Row # {0}: Returned Item {1} does not exists in {2} {3},row # {0}: Return Item {1} {2} {3} ထဲမှာရှိနေပြီပါဘူး
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,ဘဏ်မှ Accounts ကို
@@ -1333,20 +1289,19 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Amounts not reflected in bank,ဘဏ်ထဲမှာထင်ဟပ်မဟုတ်ပမာဏ
 DocType: Quality Inspection Reading,Reading 4,4 Reading
 apps/erpnext/erpnext/config/hr.py +23,Claims for company expense.,ကုမ္ပဏီစရိတ်များအတွက်တောင်းဆိုမှုများ။
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +8,Centrifugal casting,Centrifugal သွန်း
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +119,Magnetic field-assisted finishing,သံလိုက်စက်ကွင်း-ကူညီပြီး
 DocType: Company,Default Holiday List,default အားလပ်ရက်များစာရင်း
 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,မိုဘိုင်းလ်မရှိဆက်သွယ်ရန်
 DocType: Production Planning Tool,Select Sales Orders,အရောင်းအမိန့်ကိုရွေးပါ
 ,Material Requests for which Supplier Quotations are not created,ပေးသွင်းကိုးကားချက်များကိုဖန်ဆင်းသည်မဟုတ်သော material တောင်းဆို
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +117,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,သငျသညျခွင့်များအတွက်လျှောက်ထားထားတဲ့နေ့ (သို့) အားလပ်ရက်ဖြစ်ကြ၏။ သငျသညျခွင့်လျှောက်ထားစရာမလိုပေ။
 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.,barcode ကို အသုံးပြု. ပစ္စည်းများခြေရာခံရန်။ သင်ဟာ item ၏ barcode scan ဖတ်ခြင်းဖြင့် Delivery Note နှင့်အရောင်းပြေစာအတွက်ပစ္စည်းများဝင်နိုင်ပါလိမ့်မည်။
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +477,Mark as Delivered,"ကယ်နှုတ်တော်မူ၏အဖြစ်, Mark"
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +497,Mark as Delivered,"ကယ်နှုတ်တော်မူ၏အဖြစ်, Mark"
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +34,Make Quotation,စျေးနှုန်းလုပ်ပါ
 DocType: Dependent Task,Dependent Task,မှီခို Task
-apps/erpnext/erpnext/stock/doctype/item/item.py +306,Conversion factor for default Unit of Measure must be 1 in row {0},တိုင်း၏ default အနေနဲ့ယူနစ်သည်ကူးပြောင်းခြင်းအချက်အတန်းအတွက် 1 {0} ဖြစ်ရမည်
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,Leave of type {0} cannot be longer than {1},{0} တော့ဘူး {1} ထက်မဖွစျနိုငျအမျိုးအစား Leave
+apps/erpnext/erpnext/stock/doctype/item/item.py +310,Conversion factor for default Unit of Measure must be 1 in row {0},တိုင်း၏ default အနေနဲ့ယူနစ်သည်ကူးပြောင်းခြင်းအချက်အတန်းအတွက် 1 {0} ဖြစ်ရမည်
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +155,Leave of type {0} cannot be longer than {1},{0} တော့ဘူး {1} ထက်မဖွစျနိုငျအမျိုးအစား Leave
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,ကြိုတင်မဲအတွက် X ကိုနေ့ရက်ကာလအဘို့စစ်ဆင်ရေးစီစဉ်ကြိုးစားပါ။
 DocType: HR Settings,Stop Birthday Reminders,မွေးနေသတိပေးချက်များကိုရပ်တန့်
 DocType: SMS Center,Receiver List,receiver များစာရင်း
@@ -1354,15 +1309,14 @@
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,စားသုံးသည့်ပမာဏ
 apps/erpnext/erpnext/public/js/pos/pos.js +491,{0} View,{0} ကြည့်ရန်
 DocType: Salary Structure Deduction,Salary Structure Deduction,လစာဖွဲ့စည်းပုံထုတ်ယူ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +158,Selective laser sintering,Selective လေဆာ sintering
-apps/erpnext/erpnext/stock/doctype/item/item.py +301,Unit of Measure {0} has been entered more than once in Conversion Factor Table,တိုင်း {0} ၏ယူနစ်တခါကူးပြောင်းခြင်း Factor ဇယားအတွက်ထက်ပိုပြီးဝသို့ဝင်ခဲ့သည်
+apps/erpnext/erpnext/stock/doctype/item/item.py +305,Unit of Measure {0} has been entered more than once in Conversion Factor Table,တိုင်း {0} ၏ယူနစ်တခါကူးပြောင်းခြင်း Factor ဇယားအတွက်ထက်ပိုပြီးဝသို့ဝင်ခဲ့သည်
 apps/frappe/frappe/core/page/data_import_tool/data_import_tool.js +108,Import Successful!,အောင်မြင်သောတင်သွင်း!
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,ထုတ်ပေးခြင်းပစ္စည်းများ၏ကုန်ကျစရိတ်
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +185,Quantity must not be more than {0},အရေအတွက် {0} ထက်ပိုပြီးမဖြစ်ရပါမည်
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +41,Age (Days),အသက်အရွယ် (နေ့ရက်များ)
 DocType: Quotation Item,Quotation Item,စျေးနှုန်း Item
 DocType: Account,Account Name,အကောင့်အမည်
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +41,From Date cannot be greater than To Date,နေ့စွဲကနေနေ့စွဲရန်ထက် သာ. ကြီးမြတ်မဖွစျနိုငျ
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +34,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,serial No {0} အရေအတွက် {1} တဲ့အစိတ်အပိုင်းမဖွစျနိုငျ
 apps/erpnext/erpnext/config/buying.py +59,Supplier Type master.,ပေးသွင်း Type မာစတာ။
 DocType: Purchase Order Item,Supplier Part Number,ပေးသွင်းအပိုင်းနံပါတ်
@@ -1371,14 +1325,14 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +247,{0} {1} is cancelled or stopped,{0} {1} ကိုဖျက်သိမ်းသို့မဟုတ်ရပ်တန့်နေသည်
 DocType: Accounts Settings,Credit Controller,ခရက်ဒစ် Controller
 DocType: Delivery Note,Vehicle Dispatch Date,မော်တော်ယာဉ် Dispatch နေ့စွဲ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +197,Purchase Receipt {0} is not submitted,ဝယ်ယူခြင်း Receipt {0} တင်သွင်းသည်မဟုတ်
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +198,Purchase Receipt {0} is not submitted,ဝယ်ယူခြင်း Receipt {0} တင်သွင်းသည်မဟုတ်
 DocType: Company,Default Payable Account,default ပေးဆောင်အကောင့်
 apps/erpnext/erpnext/config/website.py +13,"Settings for online shopping cart such as shipping rules, price list etc.","ထိုကဲ့သို့သောစသည်တို့ရေကြောင်းစည်းမျဉ်းစည်းကမ်းများ, စျေးနှုန်းစာရင်းအဖြစ်အွန်လိုင်းစျေးဝယ်လှည်းသည် Settings ကို"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +660,Setup Complete,Setup ကို Complete
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +124,Setup Complete,Setup ကို Complete
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +65,{0}% Billed,ကြေညာတဲ့ {0}%
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +17,Reserved Qty,Reserved Qty
 DocType: Party Account,Party Account,ပါတီအကောင့်
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +74,Human Resources,လူ့အင်အားအရင်းအမြစ်
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +74,Human Resources,လူ့အင်အားအရင်းအမြစ်
 DocType: Lead,Upper Income,အထက်ဝင်ငွေခွန်
 DocType: Journal Entry Account,Debit in Company Currency,Company မှငွေကြေးစနစ်အတွက် debit
 apps/erpnext/erpnext/support/doctype/issue/issue.py +58,My Issues,ငါ့အကိစ္စများ
@@ -1387,11 +1341,9 @@
 DocType: Company,Default Values,default တန်ဖိုးများ
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +236,Row {0}: Payment amount can not be negative,row {0}: ငွေပေးချေမှုရမည့်ငွေပမာဏကိုအနုတ်လက္ခဏာမဖြစ်နိုင်
 DocType: Expense Claim,Total Amount Reimbursed,စုစုပေါင်းငွေပမာဏ Reimbursed
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +152,Press fitting,သငျ့ Press မှ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +64,Against Supplier Invoice {0} dated {1},ပေးသွင်းပြေစာ {0} ဆန့်ကျင် {1} ရက်စွဲပါ
 DocType: Customer,Default Price List,default စျေးနှုန်းများစာရင်း
 DocType: Payment Reconciliation,Payments,ငွေပေးချေမှု
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +24,Hot isostatic pressing,Hot isostatic ကိုနှိပ်
 DocType: ToDo,Medium,အလယ်အလတ်
 DocType: Budget Detail,Budget Allocated,ဘဏ္ဍာငွေအရအသုံးခွဲဝေ
 DocType: Journal Entry,Entry Type,entry Type အမျိုးအစား
@@ -1404,9 +1356,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +56,None of the items have any change in quantity or value.,ထိုပစ္စည်းများကိုအဘယ်သူအားမျှအရေအတွက်သို့မဟုတ်တန်ဖိုးကိုအတွက်မည်သည့်အပြောင်းအလဲရှိသည်။
 DocType: Warranty Claim,Warranty Claim,အာမခံပြောဆိုချက်ကို
 ,Lead Details,ခဲအသေးစိတ်ကို
-DocType: Authorization Rule,Approving User,အတည်ပြုပေးသောအသုံးပြုသူတို့၏
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +37,Forging,Forge
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +126,Plating,Plating
 DocType: Purchase Invoice,End date of current invoice's period,လက်ရှိကုန်ပို့လွှာရဲ့ကာလ၏အဆုံးနေ့စွဲ
 DocType: Pricing Rule,Applicable For,အကြောင်းမူကားသက်ဆိုင်သော
 DocType: Bank Reconciliation,From Date,နေ့စွဲကနေ
@@ -1428,31 +1377,29 @@
 DocType: Sales Invoice,Paid Amount (Company Currency),Paid ပမာဏ (Company မှငွေကြေးစနစ်)
 DocType: Purchase Invoice,Additional Discount,အပိုဆောင်းလျှော့
 DocType: Selling Settings,Selling Settings,Settings ကိုရောင်းချနေ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +39,Online Auctions,အကြီးဆုံးအွန်လိုင်းအဘိဓါန်လေလံ
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,အကြီးဆုံးအွန်လိုင်းအဘိဓါန်လေလံ
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +94,Please specify either Quantity or Valuation Rate or both,ပမာဏသို့မဟုတ်အကောက်ခွန်တန်ဖိုးသတ်မှတ်မည် Rate သို့မဟုတ်နှစ်ဦးစလုံးဖြစ်စေသတ်မှတ် ကျေးဇူးပြု.
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +50,"Company, Month and Fiscal Year is mandatory","ကုမ္ပဏီ, လနှင့်ဘဏ္ဍာရေးနှစ်တစ်နှစ်တာမသင်မနေရ"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Marketing Expenses,marketing အသုံးစရိတ်များ
 ,Item Shortage Report,item ပြတ်လပ်အစီရင်ခံစာ
-apps/erpnext/erpnext/stock/doctype/item/item.js +183,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","အလေးချိန်ဖော်ပြခဲ့သောဖြစ်ပါတယ်, \ nPlease လွန်း &quot;အလေးချိန် UOM&quot; ဖော်ပြထားခြင်း"
+apps/erpnext/erpnext/stock/doctype/item/item.js +185,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","အလေးချိန်ဖော်ပြခဲ့သောဖြစ်ပါတယ်, \ nPlease လွန်း &quot;အလေးချိန် UOM&quot; ဖော်ပြထားခြင်း"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,ဒီစတော့အိတ် Entry &#39;ပါစေရန်အသုံးပြုပစ္စည်းတောင်းဆိုခြင်း
 apps/erpnext/erpnext/config/support.py +43,Single unit of an Item.,တစ်ဦး Item ၏လူပျိုယူနစ်။
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +212,Time Log Batch {0} must be 'Submitted',အချိန်အထဲ Batch {0} &#39;&#39; Submitted &#39;&#39; ရမည်
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,ကျွန်တော်စတော့အိတ်လပ်ြရြားမြသည်စာရင်းကိုင် Entry &#39;ပါစေ
 DocType: Leave Allocation,Total Leaves Allocated,ခွဲဝေစုစုပေါင်းရွက်
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +384,Warehouse required at Row No {0},Row မရှိပါ {0} မှာလိုအပ်သည့်ဂိုဒေါင်
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +386,Warehouse required at Row No {0},Row မရှိပါ {0} မှာလိုအပ်သည့်ဂိုဒေါင်
 DocType: Employee,Date Of Retirement,အငြိမ်းစားအမျိုးမျိုးနေ့စွဲ
 DocType: Upload Attendance,Get Template,Template: Get
 DocType: Address,Postal,စာတိုက်
 DocType: Item,Weightage,Weightage
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +159,Mining,သတ္တုတူးဖော်ရေး
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +17,Resin casting,ဗဓေလသစ်သွန်း
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,တစ်ဖောက်သည်အုပ်စုနာမည်တူနှင့်အတူတည်ရှိသုံးစွဲသူအမည်ကိုပြောင်းလဲဒါမှမဟုတ်ဖောက်သည်အုပ်စုအမည်ပြောင်းကျေးဇူးတင်ပါ
 apps/erpnext/erpnext/public/js/pos/pos.js +147,Please select {0} first.,ပထမဦးဆုံး {0} ကို select ပေးပါ။
 apps/erpnext/erpnext/templates/pages/order.html +57,text {0},စာသားအ {0}
 DocType: Territory,Parent Territory,မိဘနယ်မြေတွေကို
 DocType: Quality Inspection Reading,Reading 2,2 Reading
 DocType: Stock Entry,Material Receipt,material Receipt
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +622,Products,ထုတ်ကုန်များ
+apps/erpnext/erpnext/public/js/setup_wizard.js +358,Products,ထုတ်ကုန်များ
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +47,Party Type and Party is required for Receivable / Payable account {0},ပါတီ Type နှင့်ပါတီ receiver / ပေးဆောင်အကောင့်လိုအပ်သည် {0}
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.",ဒီအချက်ကိုမျိုးကွဲရှိပါတယ်လျှင်စသည်တို့အရောင်းအမိန့်အတွက်ရွေးချယ်ထားမပြနိုင်
 DocType: Lead,Next Contact By,Next ကိုဆက်သွယ်ရန်အားဖြင့်
@@ -1462,13 +1409,13 @@
 DocType: Purchase Invoice,Notification Email Address,အမိန့်ကြော်ငြာစာအီးမေးလ်လိပ်စာ
 DocType: Payment Tool,Find Invoices to Match,ပွဲစဉ်မှငွေတောင်းခံလွှာကိုရှာပါ
 ,Item-wise Sales Register,item-ပညာရှိသအရောင်းမှတ်ပုံတင်မည်
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +399,"e.g. ""XYZ National Bank""",ဥပမာ &quot;XYZ လို့အမျိုးသားဘဏ်မှ&quot;
+apps/erpnext/erpnext/public/js/setup_wizard.js +147,"e.g. ""XYZ National Bank""",ဥပမာ &quot;XYZ လို့အမျိုးသားဘဏ်မှ&quot;
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,အခြေခံပညာနှုန်းတွင်ထည့်သွင်းဒီအခွန်ဖြစ်သနည်း
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +57,Total Target,စုစုပေါင်း Target က
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Target,စုစုပေါင်း Target က
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.js +22,Shopping Cart is enabled,စျေးဝယ်လှည်း enabled ဖြစ်ပါတယ်
 DocType: Job Applicant,Applicant for a Job,တစ်ဦးယောဘသည်လျှောက်ထားသူ
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +173,No Production Orders created,created မရှိပါထုတ်လုပ်မှုအမိန့်
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +131,Salary Slip of employee {0} already created for this month,ဝန်ထမ်း၏လစာစလစ်ဖြတ်ပိုင်းပုံစံ {0} ပြီးသားဒီလဖန်တီး
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +140,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.,အများကြီးစစ်ကြောင်းများ။ အစီရင်ခံစာတင်ပို့ပြီး spreadsheet ပလီကေးရှင်းကိုအသုံးပြုခြင်းက print ထုတ်။
 DocType: Sales Invoice Item,Batch No,batch မရှိပါ
@@ -1478,14 +1425,14 @@
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +13,Variant,မူကွဲ
 apps/frappe/frappe/public/js/frappe/form/toolbar.js +165,New {0},နယူး {0}
 DocType: Naming Series,Set prefix for numbering series on your transactions,သင့်ရဲ့ငွေကြေးလွှဲပြောင်းအပေါ်စီးရီးဦးရေသည်ရှေ့ဆက် Set
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +169,Stopped order cannot be cancelled. Unstop to cancel.,ရပ်တန့်နိုင်ရန်ဖျက်သိမ်းမရနိုင်ပါ။ ဖျက်သိမ်းဖို့လှတျ။
-apps/erpnext/erpnext/stock/doctype/item/item.py +323,Default BOM ({0}) must be active for this item or its template,default BOM ({0}) ဒီအချက်ကိုသို့မဟုတ်ယင်း၏ template ကိုသည်တက်ကြွသောဖြစ်ရမည်
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +164,Stopped order cannot be cancelled. Unstop to cancel.,ရပ်တန့်နိုင်ရန်ဖျက်သိမ်းမရနိုင်ပါ။ ဖျက်သိမ်းဖို့လှတျ။
+apps/erpnext/erpnext/stock/doctype/item/item.py +327,Default BOM ({0}) must be active for this item or its template,default BOM ({0}) ဒီအချက်ကိုသို့မဟုတ်ယင်း၏ template ကိုသည်တက်ကြွသောဖြစ်ရမည်
 DocType: Employee,Leave Encashed?,Encashed Leave?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,လယ်ပြင်၌ မှစ. အခွင့်အလမ်းမသင်မနေရ
 DocType: Item,Variants,မျိုးကွဲ
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +458,Make Purchase Order,ဝယ်ယူခြင်းအမိန့်လုပ်ပါ
 DocType: SMS Center,Send To,ရန် Send
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +111,There is not enough leave balance for Leave Type {0},ထွက်ခွာ Type {0} လုံလောက်ခွင့်ချိန်ခွင်မရှိ
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +127,There is not enough leave balance for Leave Type {0},ထွက်ခွာ Type {0} လုံလောက်ခွင့်ချိန်ခွင်မရှိ
 DocType: Sales Team,Contribution to Net Total,Net ကစုစုပေါင်းမှ contribution
 DocType: Sales Invoice Item,Customer's Item Code,customer ရဲ့ Item Code ကို
 DocType: Stock Reconciliation,Stock Reconciliation,စတော့အိတ်ပြန်လည်ရင်ကြားစေ့ရေး
@@ -1522,11 +1469,11 @@
 DocType: Sales Order Item,Actual Qty,အမှန်တကယ် Qty
 DocType: Sales Invoice Item,References,ကိုးကား
 DocType: Quality Inspection Reading,Reading 10,10 Reading
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +612,"List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start.","သင်ယ်ယူရန်သို့မဟုတ်ရောင်းချကြောင်းသင့်ကုန်ပစ္စည်းသို့မဟုတ်ဝန်ဆောင်မှုစာရင်း။ သင်စတင်သောအခါ Item အုပ်စု, တိုင်းနှင့်အခြားဂုဏ်သတ္တိ၏ယူနစ်ကိုစစ်ဆေးသေချာအောင်လုပ်ပါ။"
+apps/erpnext/erpnext/public/js/setup_wizard.js +348,"List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start.","သင်ယ်ယူရန်သို့မဟုတ်ရောင်းချကြောင်းသင့်ကုန်ပစ္စည်းသို့မဟုတ်ဝန်ဆောင်မှုစာရင်း။ သင်စတင်သောအခါ Item အုပ်စု, တိုင်းနှင့်အခြားဂုဏ်သတ္တိ၏ယူနစ်ကိုစစ်ဆေးသေချာအောင်လုပ်ပါ။"
 DocType: Hub Settings,Hub Node,hub Node
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,သင်ကထပ်နေပစ္စည်းများကိုသို့ဝင်ပါပြီ။ ဆန်းစစ်နှင့်ထပ်ကြိုးစားပါ။
 apps/erpnext/erpnext/controllers/item_variant.py +65,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values,Value ကို {0} Attribute များအတွက် {1} မမှန်ကန်ပစ္စည်းများ၏စာရင်းထဲတွင်မတည်ရှိပါဘူးတန်ဖိုးများ Attribute
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +87,Associate,အပေါင်းအဖေါ်
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Associate,အပေါင်းအဖေါ်
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +46,Item {0} is not a serialized Item,item {0} တဲ့နံပါတ်စဉ်အလိုက် Item မဟုတ်ပါဘူး
 DocType: SMS Center,Create Receiver List,Receiver များစာရင်း Create
 apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +5,Expired,Expired
@@ -1535,7 +1482,7 @@
 DocType: Warranty Claim,Issue Date,ထုတ်ပြန်ရက်စွဲ
 DocType: Activity Cost,Activity Cost,လုပ်ဆောင်ချက်ကုန်ကျစရိတ်
 DocType: Purchase Receipt Item Supplied,Consumed Qty,ကျွမ်းလောင် Qty
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +52,Telecommunications,ဆက်သွယ်ရေးလုပ်ငန်း
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +52,Telecommunications,ဆက်သွယ်ရေးလုပ်ငန်း
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),(သာလျှင် Draft) ကို package ကိုဒီပို့ဆောင်မှု၏အစိတ်အပိုင်းတစ်ခုဖြစ်တယ်ဆိုတာဆိုတာကိုပြသ
 DocType: Payment Tool,Make Payment Entry,ငွေပေးချေမှုရမည့် Entry &#39;ပါစေ
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +119,Quantity for Item {0} must be less than {1},Item {0} သည်အရေအတွက် {1} ထက်နည်းရှိရမည်
@@ -1552,10 +1499,8 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +37,"Selling must be checked, if Applicable For is selected as {0}","အကြောင်းမူကားသက်ဆိုင်သော {0} အဖြစ်ရွေးချယ်လျှင်ရောင်းချခြင်း, checked ရမည်"
 DocType: Purchase Order Item,Supplier Quotation Item,ပေးသွင်းစျေးနှုန်း Item
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +27,Make Salary Structure,လစာဖွဲ့စည်းပုံပါစေ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +54,Shearing,ညှပ်
 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.,အသစ်တစ်ခုကိုအရောင်းပြေစာကိုဖန်တီးရန်ခလုတ်ကို &#39;&#39; အရောင်းပြေစာလုပ်ပါ &#39;&#39; ပေါ်တွင်ကလစ်နှိပ်ပါ။
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +166,Packaging and labeling,ထုပ်ပိုးပစ္စည်းများနှင့်တံဆိပ်ကပ်ခြင်း
 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,ကုမ္ပဏီနှင့် Master နှင့် Global Defaults ကိုအတွက်ပုံမှန်ငွေကြေးစနစ်ကိုသတ်မှတ်ပေးပါ
@@ -1566,19 +1511,18 @@
 DocType: Budget Detail,Fiscal Year,ဘဏ္ဍာရေးနှစ်
 DocType: Cost Center,Budget,ဘတ်ဂျက်
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +41,"Budget cannot be assigned against {0}, as it's not an Income or Expense account","ဒါကြောင့်တစ်ဦးဝင်ငွေခွန်သို့မဟုတ်သုံးစွဲမှုအကောင့်ကိုဖွင့်မရအဖြစ်ဘတ်ဂျက်, {0} ဆန့်ကျင်တာဝန်ပေးအပ်ရနိုင်မှာမဟုတ်ဘူး"
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Achieved,အောင်မြင်
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,အောင်မြင်
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +65,Territory / Customer,နယ်မြေတွေကို / ဖောက်သည်
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,e.g. 5,ဥပမာ 5
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +207,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},row {0}: ခွဲဝေငွေပမာဏ {1} ထက်လျော့နည်းသို့မဟုတ်ထူးချွန်ငွေပမာဏ {2} ငွေတောင်းပြေစာပို့ဖို့နဲ့ညီမျှပါတယ်ဖြစ်ရမည်
+apps/erpnext/erpnext/public/js/setup_wizard.js +294,e.g. 5,ဥပမာ 5
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},row {0}: ခွဲဝေငွေပမာဏ {1} ထက်လျော့နည်းသို့မဟုတ်ထူးချွန်ငွေပမာဏ {2} ငွေတောင်းပြေစာပို့ဖို့နဲ့ညီမျှပါတယ်ဖြစ်ရမည်
 DocType: Sales Invoice,In Words will be visible once you save the Sales Invoice.,သင်အရောင်းပြေစာကိုကယ်တင်တစ်ချိန်ကစကားမြင်နိုင်ပါလိမ့်မည်။
 DocType: Item,Is Sales Item,အရောင်း Item ဖြစ်ပါတယ်
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,item Group ကသစ်ပင်
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,item {0} Serial အမှတ်သည် setup ကိုမဟုတ်ပါဘူး။ Item မာစတာ Check
 DocType: Maintenance Visit,Maintenance Time,ပြုပြင်ထိန်းသိမ်းမှုအချိန်
 ,Amount to Deliver,လှတျတျောမူရန်ငွေပမာဏ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +620,A Product or Service,အဖြေထုတ်ကုန်ပစ္စည်းသို့မဟုတ်ဝန်ဆောင်မှု
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +158,There were errors.,အမှားများရှိကြ၏။
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +101,Tapping,ပုတ်
+apps/erpnext/erpnext/public/js/setup_wizard.js +356,A Product or Service,အဖြေထုတ်ကုန်ပစ္စည်းသို့မဟုတ်ဝန်ဆောင်မှု
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +146,There were errors.,အမှားများရှိကြ၏။
 DocType: Naming Series,Current Value,လက်ရှိ Value တစ်ခု
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +171,{0} created,{0} နေသူများကဖန်တီး
 DocType: Delivery Note Item,Against Sales Order,အရောင်းအမိန့်ဆန့်ကျင်
@@ -1592,7 +1536,7 @@
 apps/erpnext/erpnext/accounts/party.py +275,Due Date cannot be before Posting Date,ကြောင့်နေ့စွဲနေ့စွဲများသို့တင်ပြခြင်းမပြုမီမဖွစျနိုငျ
 DocType: Website Item Group,Website Item Group,website Item Group က
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Duties and Taxes,တာဝန်နှင့်အခွန်
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Please enter Reference date,ကိုးကားစရာနေ့စွဲကိုရိုက်ထည့်ပေးပါ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +312,Please enter Reference date,ကိုးကားစရာနေ့စွဲကိုရိုက်ထည့်ပေးပါ
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} ငွေပေးချေမှု entries တွေကို {1} ကြောင့် filtered မရနိုင်ပါ
 DocType: Item Website Specification,Table for Item that will be shown in Web Site,Web Site မှာပြထားတဲ့လိမ့်မည်ဟု Item သည်စားပွဲတင်
 DocType: Purchase Order Item Supplied,Supplied Qty,supply Qty
@@ -1600,7 +1544,7 @@
 apps/erpnext/erpnext/config/stock.py +103,Tree of Item Groups.,Item အဖွဲ့များ၏ပင်လည်းရှိ၏။
 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-ပညာရှိသဝယ်ယူခြင်းသမိုင်း
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +152,Red,နီသော
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Red,နီသော
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +228,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},Serial No ဆွဲယူဖို့ &#39;&#39; Generate ဇယား &#39;&#39; ကို click ပါ ကျေးဇူးပြု. Item {0} သည်ကဆက်ပြောသည်
 DocType: Account,Frozen,ရေခဲသော
 ,Open Production Orders,ပွင့်လင်းထုတ်လုပ်မှုအမိန့်
@@ -1615,7 +1559,7 @@
 DocType: Item Attribute,Attribute Name,အမည် Attribute
 apps/erpnext/erpnext/controllers/selling_controller.py +236,Item {0} must be Sales or Service Item in {1},item {0} {1} အတွက်အရောင်းသို့မဟုတ်ဝန်ဆောင်မှု Item ဖြစ်ရမည်
 DocType: Item Group,Show In Website,ဝက်ဘ်ဆိုက်များတွင် show
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +621,Group,အစု
+apps/erpnext/erpnext/public/js/setup_wizard.js +357,Group,အစု
 DocType: Task,Expected Time (in hours),(နာရီအတွင်း) မျှော်လင့်ထားအချိန်
 ,Qty to Order,ရမလဲမှ Qty
 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","အောက်ပါစာရွက်စာတမ်းများ Delivery မှတ်ချက်, အခွင့်အလမ်းများ, ပစ္စည်းတောင်းဆိုခြင်း, Item, ဝယ်ယူခြင်းအမိန့်, ဝယ်ယူ voucher, ဝယ်ယူမှု Receipt, စျေးနှုန်း, အရောင်းပြေစာ, ကုန်ပစ္စည်း Bundle ကို, အရောင်းအမိန့်, Serial No အတွက်အမှတ်တံဆိပ်နာမကိုခြေရာခံဖို့"
@@ -1625,6 +1569,7 @@
 DocType: Features Setup,Brands,ကုန်အမှတ်တံဆိပ်
 DocType: C-Form Invoice Detail,Invoice No,ကုန်ပို့လွှာမရှိပါ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +480,From Purchase Order,ဝယ်ယူခြင်းအမိန့်ကနေ
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +92,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","ခွင့်ချိန်ခွင်လျှာထားပြီးအနာဂတ်ခွင့်ခွဲဝေစံချိန် {1} အတွက် PPP ဖြင့်ချဉ်းကပ်-forward နိုင်သည်သိရသည်အဖြစ် Leave, {0} မီကကိုဖျက်သိမ်း / လျှောက်ထားမရနိုင်ပါ"
 DocType: Activity Cost,Costing Rate,ကုန်ကျ Rate
 ,Customer Addresses And Contacts,customer လိပ်စာနှင့်ဆက်သွယ်ရန်
 DocType: Employee,Resignation Letter Date,နုတ်ထွက်ပေးစာနေ့စွဲ
@@ -1632,35 +1577,31 @@
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +137,Not Set,Set မဟုတ်
 DocType: Communication,Date,နေ့စှဲ
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,repeat ဖောက်သည်အခွန်ဝန်ကြီးဌာန
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +651,Sit tight while your system is being setup. This may take a few moments.,သင့် system ဖြစ်ရခြင်း setup ကိုနေစဉ်တင်းကြပ်ထိုင်နေ။ ဤသည်အချိန်အနည်းငယ်ကြာနိုင်ပါသည်။
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +115,Sit tight while your system is being setup. This may take a few moments.,သင့် system ဖြစ်ရခြင်း setup ကိုနေစဉ်တင်းကြပ်ထိုင်နေ။ ဤသည်အချိန်အနည်းငယ်ကြာနိုင်ပါသည်။
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +51,{0} ({1}) must have role 'Expense Approver',{0} ({1}) အခန်းကဏ္ဍ &#39;&#39; သုံးစွဲမှုအတည်ပြုချက် &#39;&#39; ရှိရမယ်
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Pair,လင်မယား
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Pair,လင်မယား
 DocType: Bank Reconciliation Detail,Against Account,အကောင့်ဆန့်ကျင်
 DocType: Maintenance Schedule Detail,Actual Date,အမှန်တကယ်နေ့စွဲ
 DocType: Item,Has Batch No,Batch မရှိရှိပါတယ်
 DocType: Delivery Note,Excise Page Number,ယစ်မျိုးစာမျက်နှာနံပါတ်
 DocType: Employee,Personal Details,ပုဂ္ဂိုလ်ရေးအသေးစိတ်
 ,Maintenance Schedules,ပြုပြင်ထိန်းသိမ်းမှုအချိန်ဇယား
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +44,Embossing,Embossing
 ,Quotation Trends,စျေးနှုန်းခေတ်ရေစီးကြောင်း
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +139,Item Group not mentioned in item master for item {0},ကို item {0} သည်ကို item မာစတာတှငျဖျောပွမ item Group က
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +302,Debit To account must be a Receivable account,အကောင့်ဖွင့်ရန် debit တစ် receiver အကောင့်ကိုရှိရမည်
-apps/erpnext/erpnext/stock/doctype/item/item.py +310,"As Production Order can be made for this item, it must be a stock item.",ထုတ်လုပ်မှုအမိန့်ဒီအချက်ကိုသည်ကိုဖန်ဆင်းနိုင်ပါတယ်ကြောင့်တစ်စတော့ရှယ်ယာကို item ဖြစ်ရမည်။
 DocType: Shipping Rule Condition,Shipping Amount,သဘောင်္တင်ခပမာဏ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +140,Joining,ဝင်ရောက်
-DocType: Authorization Rule,Above Value,Value တစ်ခုအထက်
 ,Pending Amount,ဆိုင်းငံ့ထားသောငွေပမာဏ
 DocType: Purchase Invoice Item,Conversion Factor,ကူးပြောင်းခြင်း Factor
 DocType: Purchase Order,Delivered,ကယ်နှုတ်တော်မူ၏
 apps/erpnext/erpnext/config/hr.py +160,Setup incoming server for jobs email id. (e.g. jobs@example.com),အလုပ်အကိုင်အခွင့်အအီးမေးလ်က id သည် Setup ကိုအဝင် server ကို။ (ဥပမာ jobs@example.com)
 DocType: Purchase Receipt,Vehicle Number,မော်တော်ယာဉ်နံပါတ်
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,ထပ်တလဲလဲကုန်ပို့လွှာရပ်တန့်ဖြစ်ရလိမ့်မည်သည့်နေ့ရက်
+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,Total ကုမ္ပဏီခွဲဝေအရွက် {0} ကာလအဘို့ပြီးသားအတည်ပြုပြီးအရွက် {1} ထက်လျော့နည်းမဖွစျနိုငျ
 DocType: Journal Entry,Accounts Receivable,ငွေစာရင်းရရန်ရှိသော
 ,Supplier-Wise Sales Analytics,ပေးသွင်း-ပညာရှိအရောင်း Analytics
 DocType: Address Template,This format is used if country specific format is not found,တိုင်းပြည်တိကျတဲ့ format ကိုမတွေ့ရှိပါကဤ format ကိုအသုံးပြုပါတယ်
 DocType: Custom Field,Custom,ထုံးစံဓလေ့
 DocType: Production Order,Use Multi-Level BOM,Multi-Level BOM ကိုသုံးပါ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +26,Injection molding,injection အတု ယူ. ပုံသှငျး
 DocType: Bank Reconciliation,Include Reconciled Entries,ပြန်. Entries Include
 apps/erpnext/erpnext/config/accounts.py +41,Tree of finanial accounts.,finanial အကောင့်အသစ်များ၏ပင်လည်းရှိ၏။
 DocType: Leave Control Panel,Leave blank if considered for all employee types,အားလုံးန်ထမ်းအမျိုးအစားစဉ်းစားလျှင်အလွတ် Leave
@@ -1670,30 +1611,28 @@
 apps/frappe/frappe/config/setup.py +130,Printing,ပုံနှိပ်ခြင်း
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +114,Expense Claim is pending approval. Only the Expense Approver can update status.,စရိတ်တောင်းဆိုမှုများအတည်ပြုချက်ဆိုင်းငံ့ထားတာဖြစ်ပါတယ်။ ကိုသာသုံးစွဲမှုအတည်ပြုချက် status ကို update ပြုလုပ်နိုင်ပါသည်။
 DocType: Purchase Invoice,Additional Discount Amount,အပိုဆောင်းလျှော့ငွေပမာဏ
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +99,The day(s) on which you are applying for leave are holiday. You need not apply for leave.,သင်ခွင့်များအတွက်လျှောက်ထားသည့်အပေါ်အဆိုပါနေ့ရက်ကို (s) အားလပ်ရက်ဖြစ်ကြ၏။ သင်ဟာခွင့်လျှောက်ထားစရာမလိုပေ။
 apps/frappe/frappe/public/js/frappe/misc/utils.js +110,and,နှင့်
 DocType: Leave Block List Allow,Leave Block List Allow,Allow Block List ကို Leave
 apps/erpnext/erpnext/setup/doctype/company/company.py +236,Abbr can not be blank or space,Abbr အလွတ်သို့မဟုတ်အာကာသမဖွစျနိုငျ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +50,Sports,အားကစား
+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/setup/page/setup_wizard/setup_wizard.js +626,Unit,ယူနစ်
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Unit,ယူနစ်
 apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.py +182,Please set Dropbox access keys in your site config,သင့်ရဲ့ site ကို config ကိုအတွက် Dropbox ကို access ကိုသော့ထားပေးပါ
 apps/erpnext/erpnext/stock/get_item_details.py +113,Please specify Company,ကုမ္ပဏီသတ်မှတ် ကျေးဇူးပြု.
 ,Customer Acquisition and Loyalty,customer သိမ်းယူမှုနှင့်သစ္စာ
 DocType: Purchase Receipt,Warehouse where you are maintaining stock of rejected items,သင်ပယ်ချပစ္စည်းများစတော့ရှယ်ယာကိုထိန်းသိမ်းရာဂိုဒေါင်
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +408,Your financial year ends on,သင့်ရဲ့ဘဏ္ဍာရေးနှစ်တွင်အပေါ်အဆုံးသတ်
+apps/erpnext/erpnext/public/js/setup_wizard.js +156,Your financial year ends on,သင့်ရဲ့ဘဏ္ဍာရေးနှစ်တွင်အပေါ်အဆုံးသတ်
 DocType: POS Profile,Price List,စျေးနှုန်းများစာရင်း
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +20,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0} ယခုက default ဘဏ္ဍာရေးနှစ်တစ်နှစ်တာဖြစ်ပါတယ်။ အကျိုးသက်ရောက်မှုယူမှအပြောင်းအလဲအတွက်သင့် browser refresh ပေးပါ။
 apps/erpnext/erpnext/projects/doctype/project/project.js +47,Expense Claims,စရိတ်စွပ်စွဲ
 DocType: Issue,Support,ထောက်ပံ့
-DocType: Authorization Rule,Approving Role,အတည်ပြုပေးသောအခန်းက္ပ
 ,BOM Search,BOM ရှာရန်
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +176,Closing (Opening + Totals),(+ စုစုပေါင်းမှတ်တမ်းဖွင့်လှစ်) ပိတ်ပစ်
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +26,Please specify currency in Company,ကုမ္ပဏီအတွက်ငွေကြေးသတ်မှတ် ကျေးဇူးပြု.
 DocType: Workstation,Wages per hour,တစ်နာရီလုပ်ခ
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},Batch အတွက်စတော့အိတ်ချိန်ခွင် {0} ဂိုဒေါင် {3} မှာ Item {2} သည် {1} အနုတ်လက္ခဏာဖြစ်လိမ့်မည်
 apps/erpnext/erpnext/config/setup.py +83,"Show / Hide features like Serial Nos, POS etc.","စသည်တို့ Serial အမှတ်, POS စက်တို့ကဲ့သို့ပြ / ဖျောက် features တွေ"
-apps/erpnext/erpnext/controllers/accounts_controller.py +236,Account {0} is invalid. Account Currency must be {1},အကောင့်ကို {0} မမှန်ကန်ဘူး။ အကောင့်ကိုငွေကြေးစနစ် {1} ဖြစ်ရပါမည်
+apps/erpnext/erpnext/controllers/accounts_controller.py +237,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},UOM ကူးပြောင်းခြင်းအချက်အတန်း {0} အတွက်လိုအပ်သည်
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +53,Clearance date cannot be before check date in row {0},ရှင်းလင်းရေးနေ့စွဲအတန်း {0} အတွက်စစ်ဆေးခြင်းရက်စွဲမီမဖွစျနိုငျ
 DocType: Salary Slip,Deduction,သဘောအယူအဆ
@@ -1712,13 +1651,13 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +82,Item {0} has already been returned,item {0} ပြီးသားပြန်ထားပြီ
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** ဘဏ္ဍာရေးနှစ်တစ်နှစ်တာ ** တစ်ဘဏ္ဍာရေးတစ်နှစ်တာကိုကိုယ်စားပြုပါတယ်။ အားလုံးသည်စာရင်းကိုင် posts များနှင့်အခြားသောအဓိကကျသည့်ကိစ္စများကို ** ** ဘဏ္ဍာရေးနှစ်တစ်နှစ်တာဆန့်ကျင်ခြေရာခံထောက်လှမ်းနေကြပါတယ်။
 DocType: Opportunity,Customer / Lead Address,customer / ခဲလိပ်စာ
+apps/erpnext/erpnext/stock/doctype/item/item.py +112,Warning: Invalid SSL certificate on attachment {0},သတိပေးချက်: attachment ကို {0} အပေါ်မမှန်ကန်ခြင်း SSL ကိုလက်မှတ်ကို
 DocType: Production Order Operation,Actual Operation Time,အမှန်တကယ်စစ်ဆင်ရေးအချိန်
 DocType: Authorization Rule,Applicable To (User),(အသုံးပြုသူ) ရန်သက်ဆိုင်သော
 DocType: Purchase Taxes and Charges,Deduct,နှုတ်ယူ
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +170,Job Description,လုပ်ငန်းတာဝန်သတ်မှတ်ချက်
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +170,Job Description,လုပ်ငန်းတာဝန်သတ်မှတ်ချက်
 DocType: Purchase Order Item,Qty as per Stock UOM,စတော့အိတ် UOM နှုန်းအဖြစ် Qty
 apps/frappe/frappe/model/rename_doc.py +343,Please select a valid csv file with data,ဒေတာနဲ့တရားဝင် CSV ဖိုင်ကိုရွေးပေးပါ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +92,Coating,အထပ်
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +126,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","မှလွဲ. အထူးဇာတ်ကောင် &quot;-&quot;, &quot;#&quot;, &quot;။ &quot; နှင့် &quot;/&quot; စီးရီးအမည်အတွက်ခွင့်မပြု"
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","အရောင်းစည်းရုံးလှုပ်ရှားမှု၏ Track အောင်ထားပါ။ ရင်းနှီးမြှုပ်နှံမှုအပေါ်သို့ပြန်သွားသည်ကိုခန့်မှန်းရန်လှုံ့ဆော်မှုများအနေဖြင့်စသည်တို့ကိုအရောင်းအမိန့်, ကိုးကားချက်များ, ခဲခြေရာခံစောင့်ရှောက်ကြလော့။"
 DocType: Expense Claim,Approver,ခွင့်ပြုချက်
@@ -1728,12 +1667,11 @@
 DocType: Supplier Quotation,Manufacturing Manager,ကုန်ထုတ်လုပ်မှု Manager က
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},serial No {0} {1} ထိ​​အာမခံအောက်မှာဖြစ်ပါတယ်
 apps/erpnext/erpnext/config/stock.py +69,Split Delivery Note into packages.,packages များသို့ Delivery Note ကို Split ။
-apps/erpnext/erpnext/hooks.py +84,Shipments,တင်ပို့ရောင်းချမှု
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +29,Dip molding,Dip အတု ယူ. ပုံသှငျး
+apps/erpnext/erpnext/hooks.py +68,Shipments,တင်ပို့ရောင်းချမှု
 DocType: Purchase Order,To be delivered to customer,ဖောက်သည်မှကယ်နှုတ်တော်မူ၏ခံရဖို့
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,အချိန်အထဲနဲ့ Status Submitted ရမည်။
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,serial မရှိပါ {0} ဆိုဂိုဒေါင်ပိုင်ပါဘူး
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +650,Setting Up,Up ကိုပြင်ဆင်ခြင်း
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +114,Setting Up,Up ကိုပြင်ဆင်ခြင်း
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,Row # ,row #
 DocType: Purchase Invoice,In Words (Company Currency),စကား (ကုမ္ပဏီငွေကြေးစနစ်) တွင်
 DocType: Pricing Rule,Supplier,ကုန်သွင်းသူ
@@ -1741,7 +1679,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +105,Miscellaneous Expenses,အထွေထွေအသုံးစရိတ်များ
 DocType: Global Defaults,Default Company,default ကုမ္ပဏီ
 apps/erpnext/erpnext/controllers/stock_controller.py +166,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,စရိတ်သို့မဟုတ် Difference အကောင့်ကိုကသက်ရောက်မှုအဖြစ် Item {0} ခြုံငုံစတော့ရှယ်ယာတန်ဖိုးသည်တွေအတွက်မဖြစ်မနေဖြစ်ပါသည်
-apps/erpnext/erpnext/controllers/accounts_controller.py +354,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","{2} ထက် {0} အတန်းအတွက် {1} ပိုပစ္စည်းများအတွက် overbill နိုင်ဘူး။ overbilling ခွင့်ပြုပါရန်, စတ​​ော့အိတ် Settings ကိုကိုထားကိုကျေးဇူးတင်ပါ"
+apps/erpnext/erpnext/controllers/accounts_controller.py +355,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","{2} ထက် {0} အတန်းအတွက် {1} ပိုပစ္စည်းများအတွက် overbill နိုင်ဘူး။ overbilling ခွင့်ပြုပါရန်, စတ​​ော့အိတ် Settings ကိုကိုထားကိုကျေးဇူးတင်ပါ"
 DocType: Employee,Bank Name,ဘဏ်မှအမည်
 apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +27,-Above,-Above
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +135,User {0} is disabled,အသုံးပြုသူ {0} ပိတ်ထားတယ်
@@ -1754,27 +1692,26 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,{0} is mandatory for Item {1},{0} Item {1} သည်မသင်မနေရ
 DocType: Currency Exchange,From Currency,ငွေကြေးစနစ်ကနေ
 DocType: DocField,Name,နာမကို
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +211,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","atleast တယောက်အတန်းအတွက်ခွဲဝေငွေပမာဏ, ပြေစာ Type နှင့်ပြေစာနံပါတ်ကို select ကျေးဇူးပြု."
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +104,Sales Order required for Item {0},Item {0} လိုအပ်အရောင်းအမိန့်
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +158,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","atleast တယောက်အတန်းအတွက်ခွဲဝေငွေပမာဏ, ပြေစာ Type နှင့်ပြေစာနံပါတ်ကို select ကျေးဇူးပြု."
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +107,Sales Order required for Item {0},Item {0} လိုအပ်အရောင်းအမိန့်
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +43,Amounts not reflected in system,စနစ်ထဲမှာထင်ဟပ်မဟုတ်ပမာဏ
 DocType: Purchase Invoice Item,Rate (Company Currency),rate (ကုမ္ပဏီငွေကြေးစနစ်)
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +40,Others,အခြားသူများ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +40,Others,အခြားသူများ
 apps/erpnext/erpnext/templates/includes/product_page.js +80,Cannot find a matching Item. Please select some other value for {0}.,တစ်ကိုက်ညီတဲ့ပစ္စည်းရှာမတှေ့နိုငျပါသညျ။ {0} များအတွက်အချို့သောအခြား value ကို select လုပ်ပါကိုကျေးဇူးတင်ပါ။
 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,ပထမဦးဆုံးအတန်းအတွက် &#39;ယခင် Row ပမာဏတွင်&#39; သို့မဟုတ် &#39;&#39; ယခင် Row စုစုပေါင်းတွင် &#39;အဖြစ်တာဝန်ခံ type ကိုရွေးချယ်လို့မရပါဘူး
 apps/frappe/frappe/core/doctype/doctype/boilerplate/controller_list.html +31,Completed,ပြီးစီး
 DocType: Web Form,Select DocType,DOCTYPE ကိုရွေးပါ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +104,Broaching,Broaching
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +12,Banking,ဘဏ်လုပ်ငန်း
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,ဘဏ်လုပ်ငန်း
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +38,Please click on 'Generate Schedule' to get schedule,အချိန်ဇယားအရ &#39;&#39; Generate ဇယား &#39;&#39; ကို click ပါ ကျေးဇူးပြု.
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +283,New Cost Center,နယူးကုန်ကျစရိတ် Center က
 DocType: Bin,Ordered Quantity,အမိန့်ပမာဏ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +397,"e.g. ""Build tools for builders""",ဥပမာ &quot;လက်သမားသည် tools တွေကို Build&quot;
+apps/erpnext/erpnext/public/js/setup_wizard.js +145,"e.g. ""Build tools for builders""",ဥပမာ &quot;လက်သမားသည် tools တွေကို Build&quot;
 DocType: Quality Inspection,In Process,Process ကိုအတွက်
 DocType: Authorization Rule,Itemwise Discount,Itemwise လျှော့
 DocType: Purchase Order Item,Reference Document Type,ကိုးကားစရာ Document ဖိုင် Type အမျိုးအစား
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +318,{0} against Sales Order {1},{0} အရောင်းအမိန့် {1} ဆန့်ကျင်
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +320,{0} against Sales Order {1},{0} အရောင်းအမိန့် {1} ဆန့်ကျင်
 DocType: Account,Fixed Asset,ပုံသေ Asset
 apps/erpnext/erpnext/config/stock.py +283,Serialized Inventory,Serial Inventory
 DocType: Activity Type,Default Billing Rate,Default အနေနဲ့ငွေတောင်းခံလွှာနှုန်း
@@ -1789,14 +1726,13 @@
 DocType: Purchase Invoice Item,Page Break,စာမျက်နှာ Break
 DocType: Production Order Operation,Pending,လာမည့်
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,အတိအကျန်ထမ်းရဲ့ခွင့်ပလီကေးရှင်းကိုအတည်ပြုနိုင်သူသုံးစွဲသူများက
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +33,You cannot change default UOM of Variant. To change default UOM for Variant change default UOM of the Template,သငျသညျ Variant ၏ default အနေနဲ့ UOM မပြောင်းနိုင်ပါ။ Template ကို၏ Variant ပြောင်းလဲမှုကို default UOM များအတွက် default အနေနဲ့ UOM ပြောင်းလဲပစ်ရန်
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +50,Office Equipments,Office ကိုပစ္စည်းများ
 DocType: Purchase Invoice Item,Qty,Qty
 DocType: Fiscal Year,Companies,ကုမ္ပဏီများ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +24,Electronics,အီလက်ထရောနစ်
+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/support/doctype/maintenance_visit/maintenance_visit.js +18,From Maintenance Schedule,Maintenance ဇယားထဲကနေ
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +56,Full-time,အချိန်ပြည့်
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +56,Full-time,အချိန်ပြည့်
 DocType: Purchase Invoice,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.","သင်အရောင်းအခွန်နှင့်စွပ်စွဲချက် Template ထဲမှာတစ်ဦးစံ template ကိုဖန်တီးခဲ့လျှင်, တယောက်ရွေးပြီးအောက်တွင်ဖော်ပြထားသော button ကို click လုပ်ပါ။"
@@ -1808,11 +1744,12 @@
 DocType: Job Applicant,Job Opening,ယောဘသည်အဖွင့်ပွဲ
 DocType: Payment Reconciliation,Payment Reconciliation,ငွေပေးချေမှုရမည့်ပြန်လည်ရင်ကြားစေ့ရေး
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +154,Please select Incharge Person's name,Incharge ပုဂ္ဂိုလ်ရဲ့နာမညျကို select လုပ်ပါ ကျေးဇူးပြု.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +51,Technology,နည်းပညာတက္ကသိုလ်
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,နည်းပညာတက္ကသိုလ်
 DocType: Offer Letter,Offer Letter,ကမ်းလှမ်းမှုကိုပေးစာ
 apps/erpnext/erpnext/config/manufacturing.py +51,Generate Material Requests (MRP) and Production Orders.,ပစ္စည်းတောင်းဆို (MRP) နှင့်ထုတ်လုပ်မှုအမိန့် Generate ။
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +68,Total Invoiced Amt,စုစုပေါင်းငွေတောင်းခံလွှာ Amt
 DocType: Time Log,To Time,အချိန်မှ
+DocType: Authorization Rule,Approving Role (above authorized value),(ခွင့်ပြုချက် 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.",ကလေးဆုံမှတ်များထည့်ရန်သစ်ပင်ကိုလေ့လာစူးစမ်းခြင်းနှင့်သင်နောက်ထပ်ဆုံမှတ်များထည့်ချင်ရာအောက်တွင် node ကို click လုပ်ပါ။
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +102,Credit To account must be a Payable account,အကောင့်ဖွင့်ရန်အကြွေးတစ်ပေးဆောင်အကောင့်ကိုရှိရမည်
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +233,BOM recursion: {0} cannot be parent or child of {2},BOM recursion: {0} {2} ၏မိဘသို့မဟုတ်ကလေးမဖွစျနိုငျ
@@ -1825,10 +1762,8 @@
 DocType: Item,Customer Item Codes,customer Item ကုဒ်တွေဟာ
 DocType: Opportunity,Lost Reason,ပျောက်ဆုံးသွားရသည့်အကြောင်းရင်း
 apps/erpnext/erpnext/config/accounts.py +68,Create Payment Entries against Orders or Invoices.,အမိန့်သို့မဟုတ်ငွေတောင်းခံလွှာဆန့်ကျင်ငွေပေးချေမှုရမည့် Entries ဖန်တီးပါ။
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +141,Welding,ဂဟေဆော်
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +40,New Stock UOM is required,နယူးစတော့အိတ် UOM လိုအပ်သည်
 DocType: Quality Inspection,Sample Size,နမူနာ Size အ
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +443,All items have already been invoiced,ပစ္စည်းများအားလုံးပြီးသား invoiced ပြီ
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +446,All items have already been invoiced,ပစ္စည်းများအားလုံးပြီးသား invoiced ပြီ
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',&#39;&#39; အမှုအမှတ် မှစ. &#39;&#39; တရားဝင်သတ်မှတ် ကျေးဇူးပြု.
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +287,Further cost centers can be made under Groups but entries can be made against non-Groups,နောက်ထပ်ကုန်ကျစရိတ်စင်တာများအဖွဲ့များအောက်မှာလုပ်နိုင်ပေမယ့် entries တွေကို Non-အဖွဲ့များဆန့်ကျင်စေနိုင်ပါတယ်
 DocType: Project,External,external
@@ -1840,8 +1775,7 @@
 DocType: Bin,Actual Quantity,အမှန်တကယ်ပမာဏ
 DocType: Shipping Rule,example: Next Day Shipping,ဥပမာအား: Next ကိုနေ့ Shipping
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,{0} မတွေ့ရှိ serial No
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +563,Your Customers,သင့် Customer
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +27,Compression molding,compression အတု ယူ. ပုံသှငျး
+apps/erpnext/erpnext/public/js/setup_wizard.js +303,Your Customers,သင့် Customer
 DocType: Leave Block List Date,Block Date,block နေ့စွဲ
 DocType: Sales Order,Not Delivered,ကယ်နှုတ်တော်မူ၏မဟုတ်
 ,Bank Clearance Summary,ဘဏ်မှရှင်းလင်းရေးအကျဉ်းချုပ်
@@ -1862,10 +1796,10 @@
 DocType: SMS Log,Sent To,ရန်ကိုစလှေတျ
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +28,Make Sales Invoice,အရောင်းပြေစာလုပ်ပါ
 DocType: Company,For Reference Only.,သာလျှင်ကိုးကားစရာသည်။
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +29,Invalid {0}: {1},မမှန်ကန်ခြင်း {0}: {1}
+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,စွမ်းဆောင်ရည်မြှင့်စီမံကိန်း
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +49,'From Date' is required,&#39;&#39; နေ့စွဲ မှစ. &#39;&#39; လိုအပ်သည်
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +43,'From Date' is required,&#39;&#39; နေ့စွဲ မှစ. &#39;&#39; လိုအပ်သည်
 DocType: Journal Entry,Reference Number,ကိုးကားစရာနံပါတ်
 DocType: Employee,Employment Details,အလုပ်အကိုင်အခွင့်အအသေးစိတ်ကို
 DocType: Employee,New Workplace,နယူးလုပ်ငန်းခွင်
@@ -1880,7 +1814,7 @@
 DocType: Serial No,Delivery Time,ပို့ဆောင်ချိန်
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Ageing အခြေပြုတွင်
 DocType: Item,End of Life,အသက်တာ၏အဆုံး
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +41,Travel,ခရီးသွား
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +41,Travel,ခရီးသွား
 DocType: Leave Block List,Allow Users,Allow အသုံးပြုသူများ
 DocType: Purchase Order,Customer Mobile No,ဖောက်သည်ကို Mobile မရှိပါ
 DocType: Sales Invoice,Recurring,ထပ်တလဲလဲ
@@ -1894,7 +1828,7 @@
 DocType: Naming Series,User must always select,အသုံးပြုသူအမြဲရွေးချယ်ရမည်
 DocType: Stock Settings,Allow Negative Stock,အပြုသဘောမဆောင်သောစတော့အိတ် Allow
 DocType: Installation Note,Installation Note,Installation မှတ်ချက်
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +541,Add Taxes,အခွန် Add
+apps/erpnext/erpnext/public/js/setup_wizard.js +283,Add Taxes,အခွန် Add
 ,Financial Analytics,ဘဏ္ဍာရေး Analytics
 DocType: Quality Inspection,Verified By,By Verified
 DocType: Address,Subsidiary,ထောက်ခံသောကုမ္ပဏီ
@@ -1904,7 +1838,6 @@
 DocType: System Settings,In Hours,အလုပ်ချိန်အတွက်
 DocType: Process Payroll,Create Salary Slip,လစာစလစ်ဖြတ်ပိုင်းပုံစံ Create
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Expected balance as per bank,ဘဏ်နှုန်းအဖြစ်မျှော်လင့်ထားချိန်ခွင်လျှာ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +115,Buffing,Buffing
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Source of Funds (Liabilities),ရန်ပုံငွေ၏ source (စိစစ်)
 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,လုပ်သား
@@ -1921,11 +1854,11 @@
 DocType: Rename Tool,File to Rename,Rename မှ File
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +176,Purchse Order number required for Item {0},Item {0} လိုအပ် Purchse အမိန့်အရေအတွက်
 apps/erpnext/erpnext/public/js/controllers/transaction.js +136,Show Payments,ငွေပေးချေပြရန်
-apps/erpnext/erpnext/controllers/buying_controller.py +245,Specified BOM {0} does not exist for Item {1},သတ်မှတ်ထားသော BOM {0} Item {1} သည်မတည်ရှိပါဘူး
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +202,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,ပြုပြင်ထိန်းသိမ်းမှုဇယား {0} ဒီအရောင်းအမိန့်ကိုပယ်ဖျက်မီဖျက်သိမ်းရပါမည်
+apps/erpnext/erpnext/controllers/buying_controller.py +236,Specified BOM {0} does not exist for Item {1},သတ်မှတ်ထားသော BOM {0} Item {1} သည်မတည်ရှိပါဘူး
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,ပြုပြင်ထိန်းသိမ်းမှုဇယား {0} ဒီအရောင်းအမိန့်ကိုပယ်ဖျက်မီဖျက်သိမ်းရပါမည်
 apps/frappe/frappe/desk/page/backups/backups.html +13,Size,အရွယ်
 DocType: Notification Control,Expense Claim Approved,စရိတ်တောင်းဆိုမှုများ Approved
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +113,Pharmaceutical,ဆေးဝါး
+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,အရောင်းအမိန့်လိုအပ်ပါသည်
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +30,Create Customer,ဖောက်သည် Create
@@ -1935,7 +1868,6 @@
 DocType: Quality Inspection Reading,Reading 9,9 Reading
 DocType: Supplier,Is Frozen,Frozen ဖြစ်ပါသည်
 DocType: Buying Settings,Buying Settings,Settings ကိုဝယ်ယူ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +122,Mass finishing,mass ပြီး
 DocType: Stock Entry Detail,BOM No. for a Finished Good Item,တစ် Finished ကောင်း 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 သည် Setup ကိုအဝင် server ကို။ (ဥပမာ sales@example.com)
@@ -1943,7 +1875,7 @@
 DocType: Payment Tool,Payment Account,ငွေပေးချေမှုရမည့်အကောင့်
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +713,Please specify Company to proceed,ဆက်လက်ဆောင်ရွက်ရန်ကုမ္ပဏီသတ်မှတ် ကျေးဇူးပြု.
 apps/frappe/frappe/public/js/frappe/model/indicator.js +30,Draft,မူကြမ်း
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +46,Compensatory Off,ပိတ် Compensatory
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Compensatory Off,ပိတ် Compensatory
 DocType: Quality Inspection Reading,Accepted,လက်ခံထားတဲ့
 DocType: User,Female,မိန်းမ
 DocType: Journal Entry Account,Debit in Account Currency,အကောင့်ကိုငွေကြေးစနစ်အတွက် debit
@@ -1955,7 +1887,7 @@
 DocType: Shipping Rule,Shipping Rule Label,သဘောင်္တင်ခ Rule Label
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +209,Raw Materials cannot be blank.,ကုန်ကြမ်းပစ္စည်းများအလွတ်မဖြစ်နိုင်။
 DocType: Newsletter,Test,စမ်းသပ်
-apps/erpnext/erpnext/stock/doctype/item/item.py +364,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +368,"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'","လက်ရှိစတော့ရှယ်ယာအရောင်းအဒီအချက်ကိုသည်ရှိပါတယ်အမျှ \ သင် &#39;&#39; Serial No ရှိခြင်း &#39;&#39; ၏စံတန်ဖိုးများကိုပြောင်းလဲလို့မရဘူး, &#39;&#39; Batch မရှိပါဖူး &#39;&#39; နှင့် &#39;&#39; အကောက်ခွန်တန်ဖိုးသတ်မှတ်မည်နည်းနိဿယ &#39;&#39; စတော့အိတ် Item Is &#39;&#39;"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +448,Quick Journal Entry,လျင်မြန်စွာ Journal မှ Entry &#39;
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +92,You can not change rate if BOM mentioned agianst any item,BOM ဆိုတဲ့ item agianst ဖော်ပြခဲ့သောဆိုရင်နှုန်းကိုမပြောင်းနိုင်ပါ
@@ -1966,13 +1898,14 @@
 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.,အသီးအသီးကောင်းဆောင်းပါးတပုဒ်ကိုလက်စသတ်သည်သီးခြားထုတ်လုပ်မှုအမိန့်ကိုဖန်တီးလိမ့်မည်။
 DocType: Purchase Invoice,Terms and Conditions1,စည်းကမ်းချက်များနှင့် Conditions1
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +18,Complete Setup,complete ကို Setup
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard_page.html +18,Complete Setup,complete ကို Setup
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.",ဒီ up to date ဖြစ်နေအေးခဲစာရင်းကိုင် entry ကိုဘယ်သူမှလုပ်နိုင် / အောက်တွင်သတ်မှတ်ထားသောအခန်းကဏ္ဍ မှလွဲ. entry ကို modify ။
 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),အပိုငျးအမြစ်တားရန်ဤစစ်ဆေးပါ။ (အမှတ်အတွက်)
 apps/erpnext/erpnext/config/crm.py +96,Newsletter Mailing List,သတင်းလွှာစာပို့စာရင်း
 DocType: Delivery Note,Transporter Name,Transporter အမည်
+DocType: Authorization Rule,Authorized Value,Authorized Value ကို
 DocType: Contact,Enter department to which this Contact belongs,ဒီဆက်သွယ်ရန်ပိုငျဆိုငျသောဌာနကိုထည့်သွင်းပါ
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Absent,စုစုပေါင်းပျက်ကွက်
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +746,Item or Warehouse for row {0} does not match Material Request,အတန်းသည် item သို့မဟုတ်ဂိုဒေါင် {0} ပစ္စည်းတောင်းဆိုမှုနှင့်ကိုက်ညီပါဘူး
@@ -1997,16 +1930,15 @@
 DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),(စတော့အိတ် UOM နှုန်းအတိုင်း) အခြေခံပညာနှုန်း
 DocType: SMS Log,No of Requested SMS,တောင်းဆိုထားသော SMS ၏မရှိပါ
 DocType: Campaign,Campaign-.####,ကင်ပိန်း - ။ ####
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +55,Piercing,Piercing
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,Next ကိုခြေလှမ်းများ
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +117,Contract End Date must be greater than Date of Joining,စာချုပ်ကုန်ဆုံးတော့နေ့စွဲအတူနေ့စွဲထက် သာ. ကြီးမြတ်ဖြစ်ရမည်
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,ကော်မရှင်များအတွက်ကုမ္ပဏီများကထုတ်ကုန်ရောင်းချတဲ့သူတစ်ဦးကိုတတိယပါတီဖြန့်ဖြူး / အရောင်း / ကော်မရှင်အေးဂျင့် / Affiliate / ပြန်လည်ရောင်းချသူ။
 DocType: Customer Group,Has Child Node,ကလေး Node ရှိပါတယ်
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{0} against Purchase Order {1},{0} ဝယ်ယူခြင်းအမိန့် {1} ဆန့်ကျင်
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +332,{0} against Purchase Order {1},{0} ဝယ်ယူခြင်းအမိန့် {1} ဆန့်ကျင်
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","ဒီနေရာမှာ static နဲ့ url parameters တွေကိုရိုက်ထည့်ပါ (ဥပမာ။ ပေးပို့သူ = 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/page/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,ဒါဟာ ERPNext ကနေ Auto-generated ဥပမာတစ်ခုဝက်ဆိုက်
+apps/erpnext/erpnext/setup/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,ဒါဟာ ERPNext ကနေ Auto-generated ဥပမာတစ်ခုဝက်ဆိုက်
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +37,Ageing Range 1,Ageing Range 1
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +110,Photochemical machining,Photochemical machine
 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.
 
 #### Note
@@ -2032,7 +1964,7 @@
 DocType: Purchase Receipt Item,Recd Quantity,Recd ပမာဏ
 DocType: Email Account,Email Ids,အီးမေးလ် IDS
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},အရောင်းအမိန့်အရေအတွက် {1} ထက်ပိုပစ္စည်း {0} မထုတ်လုပ်နိုင်သ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +471,Stock Entry {0} is not submitted,စတော့အိတ် Entry &#39;{0} တင်သွင်းသည်မဟုတ်
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +473,Stock Entry {0} is not submitted,စတော့အိတ် Entry &#39;{0} တင်သွင်းသည်မဟုတ်
 DocType: Payment Reconciliation,Bank / Cash Account,ဘဏ်မှ / ငွေအကောင့်
 DocType: Tax Rule,Billing City,ငွေတောင်းခံစီးတီး
 DocType: Global Defaults,Hide Currency Symbol,ငွေကြေးစနစ်သင်္ကေတဝှက်
@@ -2048,7 +1980,7 @@
 DocType: Purchase Invoice,Currency and Price List,ငွေကြေးနှင့်စျေးနှုန်းကိုစာရင်း
 DocType: Opportunity,Customer / Lead Name,customer / ခဲအမည်
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +63,Clearance Date not mentioned,ရှင်းလင်းရေးနေ့စွဲဖော်ပြခဲ့သောမဟုတ်
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +71,Production,ထုတ်လုပ်မှု
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Production,ထုတ်လုပ်မှု
 DocType: Item,Allow Production Order,ထုတ်လုပ်မှုအမိန့် Allow
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +60,Row {0}:Start Date must be before End Date,row {0}: Start ကိုနေ့စွဲ End Date ကိုခင်ဖြစ်ရမည်
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),စုစုပေါင်း (Qty)
@@ -2061,7 +1993,7 @@
 apps/erpnext/erpnext/utilities/doctype/address/address.py +113,My Addresses,အကြှနျုပျ၏လိပ်စာ
 DocType: Stock Ledger Entry,Outgoing Rate,outgoing Rate
 apps/erpnext/erpnext/config/hr.py +100,Organization branch master.,"အစည်းအရုံး, အခက်အလက်မာစတာ။"
-apps/erpnext/erpnext/controllers/accounts_controller.py +237, or ,သို့မဟုတ်
+apps/erpnext/erpnext/controllers/accounts_controller.py +238, or ,သို့မဟုတ်
 DocType: Sales Order,Billing Status,ငွေတောင်းခံနဲ့ Status
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Utility Expenses,Utility ကိုအသုံးစရိတ်များ
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,90-Above,90-အထက်
@@ -2088,6 +2020,7 @@
 DocType: Stock Entry Detail,Serial No / Batch,serial No / Batch
 DocType: Product Bundle,Parent Item,မိဘ Item
 DocType: Account,Account Type,Account Type
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +113,Leave Type {0} cannot be carry-forwarded,{0} သယ်-forward နိုင်သည်မရနိုင်ပါ Type နေရာမှာ Leave
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +213,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',ပြုပြင်ထိန်းသိမ်းမှုဇယားအပေါငျးတို့သပစ္စည်းများသည် generated မဟုတ်ပါ။ &#39;&#39; Generate ဇယား &#39;&#39; ကို click ပါ ကျေးဇူးပြု.
 ,To Produce,ထုတ်လုပ်
 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","{1} အတွက် {0} အတန်းသည်။ {2} Item မှုနှုန်း, အတန်း {3} ကိုလည်းထည့်သွင်းရမည်ကိုထည့်သွင်းရန်"
@@ -2095,10 +2028,7 @@
 DocType: Bin,Reserved Quantity,Reserved ပမာဏ
 DocType: Landed Cost Voucher,Purchase Receipt Items,Receipt ပစ္စည်းများဝယ်ယူရန်
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,အထူးပြုလုပ်ခြင်း Form များ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +62,Cutting,ဖြတ်တောက်ခြင်း
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +69,Flattening,ပြစ်
 DocType: Account,Income Account,ဝင်ငွေခွန်အကောင့်
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +22,Molding,မှို
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +632,Delivery,delivery
 DocType: Stock Reconciliation Item,Current Qty,လက်ရှိ Qty
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",ပုဒ်မကုန်ကျမှာ &quot;ပစ္စည်းများအခြေတွင်အမျိုးမျိုးနှုန်း&quot; ကိုကြည့်ပါ
@@ -2108,19 +2038,18 @@
 apps/frappe/frappe/desk/moduleview.py +61,Documents,စာရွက်စာတမ်းများ
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +17,Ref,Ref
 DocType: Cost Center,Cost Center,ကုန်ကျစရိတ် Center က
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.js +48,Voucher #,ဘောက်ချာ #
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +36,Voucher #,ဘောက်ချာ #
 DocType: Notification Control,Purchase Order Message,အမိန့် Message ယ်ယူ
 DocType: Tax Rule,Shipping Country,သဘောင်္တင်ခနိုင်ငံဆိုင်ရာ
 DocType: Upload Attendance,Upload HTML,HTML ကို upload
-apps/erpnext/erpnext/controllers/accounts_controller.py +391,"Total advance ({0}) against Order {1} cannot be greater \
+apps/erpnext/erpnext/controllers/accounts_controller.py +392,"Total advance ({0}) against Order {1} cannot be greater \
 				than the Grand Total ({2})",အမိန့် {1} ကို Grand စုစုပေါင်းထက် သာ. ကြီးမြတ် \ မဖွစျနိုငျ ({2}) ဆန့်ကျင်စုစုပေါင်းကြိုတင်မဲ ({0})
 DocType: Employee,Relieving Date,နေ့စွဲ Relieving
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +12,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.","စျေးနှုန်းနည်းဥပဒေအချို့သတ်မှတ်ချက်များအပေါ်အခြေခံပြီး, လျှော့စျေးရာခိုင်နှုန်းသတ်မှတ် / စျေးနှုန်း List ကို overwrite မှလုပ်ဖြစ်ပါတယ်။"
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,ဂိုဒေါင်သာစတော့အိတ် Entry / Delivery မှတ်ချက် / ဝယ်ယူခြင်းပြေစာကနေတဆင့်ပြောင်းလဲနိုင်ပါသည်
 DocType: Employee Education,Class / Percentage,class / ရေရာခိုင်နှုန်း
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +92,Head of Marketing and Sales,ဈေးကွက်နှင့်အရောင်း၏ဦးခေါင်းကို
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +31,Income Tax,ဝင်ငွေခွန်
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +157,Laser engineered net shaping,လေဆာရာလမ်း၌ကွန်ရွက် shaping သည်အင်ဂျင်နီယာ
+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.","ရွေးချယ်ထားသည့်စျေးနှုန်းများ Rule &#39;စျေးနှုန်း&#39; &#39;အဘို့သည်ဆိုပါကစျေးနှုန်း List ကို overwrite လုပ်သွားမှာ။ စျေးနှုန်း Rule စျေးနှုန်းနောက်ဆုံးစျေးနှုန်းဖြစ်ပါတယ်, ဒါကြောင့်အဘယ်သူမျှမကနောက်ထပ်လျှော့စျေးလျှောက်ထားရပါမည်။ ဒါကွောငျ့, အရောင်းအမိန့်, ဝယ်ယူခြင်းအမိန့်စသည်တို့ကဲ့သို့သောကိစ္စများကိုအတွက်ကြောင့်မဟုတ်ဘဲ &#39;&#39; စျေးနှုန်း List ကို Rate &#39;&#39; လယ်ပြင်ထက်, &#39;&#39; Rate &#39;&#39; လယ်ပြင်၌ခေါ်ယူသောအခါလိမ့်မည်။"
 apps/erpnext/erpnext/config/selling.py +163,Track Leads by Industry Type.,Track စက်မှုလက်မှုလုပ်ငန်းရှင်များကအမျိုးအစားအားဖြင့် Leads ။
 DocType: Item Supplier,Item Supplier,item ပေးသွင်း
@@ -2143,31 +2072,28 @@
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Transaction ပြီးနောက်အမှန်တကယ် Qty
 ,Pending SO Items For Purchase Request,ဝယ်ယူခြင်းတောင်းဆိုခြင်းသည်ဆိုင်းငံ SO ပစ္စည်းများ
 DocType: Supplier,Billing Currency,ငွေတောင်းခံငွေကြေးစနစ်
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +148,Extra Large,အပိုအကြီးစား
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,Extra Large,အပိုအကြီးစား
 ,Profit and Loss Statement,အမြတ်နှင့်အရှုံးထုတ်ပြန်ကြေညာချက်
 DocType: Bank Reconciliation Detail,Cheque Number,Cheques နံပါတ်
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +43,Pressing,ဝန်လေးသော
 DocType: Payment Tool Detail,Payment Tool Detail,ငွေပေးချေမှုရမည့် Tool ကို Detail
 ,Sales Browser,အရောင်း Browser ကို
 DocType: Journal Entry,Total Credit,စုစုပေါင်းချေးငွေ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +474,Warning: Another {0} # {1} exists against stock entry {2},သတိပေးချက်: နောက်ထပ် {0} # {1} စတော့ရှယ်ယာ entry ကို {2} ဆန့်ကျင်ရှိတယျဆိုတာကို
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +459,Local,ဒေသဆိုင်ရာ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +476,Warning: Another {0} # {1} exists against stock entry {2},သတိပေးချက်: နောက်ထပ် {0} # {1} စတော့ရှယ်ယာ entry ကို {2} ဆန့်ကျင်ရှိတယျဆိုတာကို
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +397,Local,ဒေသဆိုင်ရာ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),ချေးငွေနှင့်ကြိုတင်ငွေ (ပိုင်ဆိုင်မှုများ)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,ငျြ့ရမညျအကွောငျး
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +147,Large,အကြီးစား
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +23,No employee found!,အဘယ်သူမျှမန်ထမ်းတွေ့ရှိ!
+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 +152,Please mention no of visits required,လိုအပ်သောလာရောက်လည်ပတ်သူမျှဖော်ပြထားခြင်း ကျေးဇူးပြု.
 DocType: Purchase Order,Customer Address Display,customer လိပ်စာ Display ကို
 DocType: Stock Settings,Default Valuation Method,default အကောက်ခွန်တန်ဖိုးသတ်မှတ်မည်နည်းနိဿယ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +127,Polishing,အရောင်တင်
 DocType: Production Order Operation,Planned Start Time,စီစဉ်ထား Start ကိုအချိန်
 apps/erpnext/erpnext/config/accounts.py +63,Close Balance Sheet and book Profit or Loss.,Balance Sheet နှင့်စာအုပ်အကျိုးအမြတ်သို့မဟုတ်ပျောက်ဆုံးခြင်းနီးကပ်။
-apps/erpnext/erpnext/stock/doctype/item/item.py +661,"Default Unit of Measure for Item {0} cannot be changed directly because \
+apps/erpnext/erpnext/stock/doctype/item/item.py +665,"Default Unit of Measure for Item {0} cannot be changed directly because \
 			you have already made some transaction(s) with another UOM. To change default UOM, \
 			use 'UOM Replace Utility' tool under Stock module.","ပစ္စည်းအဘို့အတိုင်း၏ default အနေနဲ့ယူနစ် {0} သင်ပြီးသားကိုအခြား UOM နှင့်အတူအချို့သောအရောင်းအဝယ် (သို့) စေပြီ \ ဘာဖြစ်လို့လဲဆိုတော့ကိုတိုက်ရိုက်ပြောင်းလဲသွားမရနိုင်ပါ။ default အနေနဲ့ UOM, \ အသုံးပြုမှုကိုပြောင်းလဲဖို့တော့အိတ် module ကိုအောက်မှ tool ကို &#39;&#39; UOM Utility ကိုအစားထိုး &#39;&#39; ။"
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,အခြားသို့တစျငွေကြေး convert မှချိန်း Rate ကိုသတ်မှတ်
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +146,Quotation {0} is cancelled,စျေးနှုန်း {0} ဖျက်သိမ်းလိုက်
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +141,Quotation {0} is cancelled,စျေးနှုန်း {0} ဖျက်သိမ်းလိုက်
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,စုစုပေါင်းထူးချွန်ငွေပမာဏ
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} was on leave on {1}. Cannot mark attendance.,ဝန်ထမ်း {0} {1} အပေါ်ခွင့်ရှိ၏။ တက်ရောက်သူအထိမ်းအမှတ်နိုင်ဘူး။
 DocType: Sales Partner,Targets,ပစ်မှတ်
@@ -2178,7 +2104,6 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +158,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,ကွန်ပျူတာများ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +112,Electro-chemical grinding,electro-ဓာတုကြိတ်
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +14,This is a root customer group and cannot be edited.,"ဒါကအမြစ်ဖောက်သည်အုပ်စုဖြစ်ပြီး, edited မရနိုင်ပါ။"
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +39,Please setup your chart of accounts before you start Accounting Entries,သင်စာရင်းကိုင် Entries စတင်ခင် setup ကိုအကောင့်အသစ်များ၏သင့်ရဲ့ဇယား ကျေးဇူးပြု.
 DocType: Purchase Invoice,Ignore Pricing Rule,စျေးနှုန်းများ Rule Ignore
@@ -2224,7 +2149,6 @@
 DocType: Maintenance Visit,Purposes,ရည်ရွယ်ချက်
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +103,Atleast one item should be entered with negative quantity in return document,Atleast တယောက်ကို item ပြန်လာစာရွက်စာတမ်းအတွက်အနုတ်လက္ခဏာအရေအတွက်နှင့်အတူသို့ဝင်သင့်ပါတယ်
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +67,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","စစ်ဆင်ရေး {0} ရှည်ကို Workstation {1} အတွက်မဆိုရရှိနိုင်အလုပ်လုပ်နာရီထက်, မျိုးစုံစစ်ဆင်ရေးသို့စစ်ဆင်ရေးဖြိုဖျက်"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +134,Electrochemical machining,electrochemical machine
 ,Requested,မေတ္တာရပ်ခံ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +66,No Remarks,အဘယ်သူမျှမမှတ်ချက်
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +13,Overdue,မပွေကုနျနသော
@@ -2233,7 +2157,7 @@
 DocType: Monthly Distribution,Distribution Name,ဖြန့်ဖြူးအမည်
 DocType: Features Setup,Sales and Purchase,အရောင်းနှင့်ဝယ်ယူခြင်း
 DocType: Supplier Quotation Item,Material Request No,material တောင်းဆိုမှုမရှိပါ
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +218,Quality Inspection required for Item {0},Item {0} သည်လိုအပ်သောအရည်အသွေးပြည့်စစ်ဆေးရေး
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +221,Quality Inspection required for Item {0},Item {0} သည်လိုအပ်သောအရည်အသွေးပြည့်စစ်ဆေးရေး
 DocType: Quotation,Rate at which customer's currency is converted to company's base currency,ဖောက်သည်ရဲ့ငွေကြေးကုမ္ပဏီ၏အခြေစိုက်စခန်းငွေကြေးအဖြစ်ပြောင်းလဲသောအချိန်တွင် rate
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +107,{0} has been successfully unsubscribed from this list.,{0} ဒီစာရင်းထဲကအောင်မြင်စွာ unsubscribe သိရသည်။
 DocType: Purchase Invoice Item,Net Rate (Company Currency),Net က Rate (ကုမ္ပဏီငွေကြေးစနစ်)
@@ -2251,9 +2175,8 @@
 apps/erpnext/erpnext/accounts/report/financial_statements.py +16,Fiscal Year {0} not found.,ဘဏ္ဍာရေးနှစ်တစ်နှစ်တာ {0} မတွေ့ရဘူး။
 DocType: Bank Reconciliation,Get Relevant Entries,သက်ဆိုင်ရာလုပ်ငန်း Entries Get
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +407,Accounting Entry for Stock,စတော့အိတ်သည်စာရင်းကိုင် Entry &#39;
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +64,Coining,Coining
 DocType: Sales Invoice,Sales Team1,အရောင်း Team1
-apps/erpnext/erpnext/stock/doctype/item/item.py +412,Item {0} does not exist,item {0} မတည်ရှိပါဘူး
+apps/erpnext/erpnext/stock/doctype/item/item.py +416,Item {0} does not exist,item {0} မတည်ရှိပါဘူး
 DocType: Sales Invoice,Customer Address,customer လိပ်စာ
 apps/frappe/frappe/desk/query_report.py +136,Total,စုစုပေါင်း
 DocType: Purchase Invoice,Apply Additional Discount On,Apply နောက်ထပ်လျှော့တွင်
@@ -2265,14 +2188,13 @@
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),လျှော့ငွေပမာဏ (ကုမ္ပဏီငွေကြေးစနစ်) ပြီးနောက်အခွန်ပမာဏ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +149,Target warehouse is mandatory for row {0},Target ကဂိုဒေါင်အတန်း {0} သည်မသင်မနေရ
 DocType: Quality Inspection,Quality Inspection,အရည်အသွေးအစစ်ဆေးရေး
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +144,Extra Small,အပိုအသေးစား
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +20,Spray forming,ဖွဲ့စည်းဖြန်းလိုက်
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Extra Small,အပိုအသေးစား
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +458,Warning: Material Requested Qty is less than Minimum Order Qty,သတိပေးချက်: Qty တောင်းဆိုထားသောပစ္စည်းအနည်းဆုံးအမိန့် Qty ထက်နည်းသော
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +191,Account {0} is frozen,အကောင့်ကို {0} အေးခဲသည်
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,အဖွဲ့ပိုင်ငွေစာရင်း၏သီးခြားဇယားနှင့်အတူဥပဒေကြောင်းအရ Entity / လုပ်ငန်းခွဲများ။
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +29,"Food, Beverage & Tobacco","အစားအစာ, Beverage &amp; ဆေးရွက်ကြီး"
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","အစားအစာ, Beverage &amp; ဆေးရွက်ကြီး"
 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 +529,Can only make payment against unbilled {0},သာ unbilled {0} ဆန့်ကျင်ငွေပေးချေမှုကိုဖြစ်စေနိုင်ပါတယ်
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +531,Can only make payment against unbilled {0},သာ unbilled {0} ဆန့်ကျင်ငွေပေးချေမှုကိုဖြစ်စေနိုင်ပါတယ်
 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,Subcontract
@@ -2283,19 +2205,18 @@
 DocType: Item,Manufacturer Part Number,ထုတ်လုပ်သူအပိုင်းနံပါတ်
 DocType: Production Order Operation,Estimated Time and Cost,ခန့်မှန်းခြေအချိန်နှင့်ကုန်ကျစရိတ်
 DocType: Bin,Bin,ကျီငယ်
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +50,Nosing,နှာခေါင်း
 DocType: SMS Log,No of Sent SMS,Sent SMS ၏မရှိပါ
 DocType: Account,Company,ကုမ္ပဏီ
 DocType: Account,Expense Account,စရိတ်အကောင့်
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +49,Software,Software များ
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +151,Colour,အရောင်
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +49,Software,Software များ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Colour,အရောင်
 DocType: Maintenance Visit,Scheduled,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",&quot;စတော့အိတ် Item ရှိ၏&quot; ဘယ်မှာ Item ကို select &quot;No&quot; ဖြစ်ပါတယ်နှင့် &quot;အရောင်း Item ရှိ၏&quot; &quot;ဟုတ်တယ်&quot; ဖြစ်ပါတယ်မှတပါးအခြားသောကုန်ပစ္စည်း Bundle ကိုလည်းရှိ၏ ကျေးဇူးပြု.
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,ညီလအတွင်းအနှံ့ပစ်မှတ်ဖြန့်ဝေရန်လစဉ်ဖြန့်ဖြူးကိုရွေးချယ်ပါ။
 DocType: Purchase Invoice Item,Valuation Rate,အဘိုးပြတ် Rate
 apps/erpnext/erpnext/stock/get_item_details.py +281,Price List Currency not selected,စျေးနှုန်း List ကိုငွေကြေးစနစ်ကိုမရွေးချယ်
 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,item Row {0}: ဝယ်ယူခြင်း Receipt {1} အထက် &#39;&#39; ဝယ်ယူလက်ခံ &#39;&#39; table ထဲမှာမတည်ရှိပါဘူး
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +134,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 +145,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,Project မှ Start ကိုနေ့စွဲ
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +8,Until,တိုငျအောငျ
 DocType: Rename Tool,Rename Log,အထဲ Rename
@@ -2305,7 +2226,7 @@
 apps/erpnext/erpnext/controllers/recurring_document.py +162,Please select {0},{0} ကို select ကျေးဇူးပြု.
 DocType: C-Form,C-Form No,C-Form တွင်မရှိပါ
 DocType: BOM,Exploded_items,Exploded_items
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +95,Researcher,သုတေသီတစ်ဦး
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Researcher,သုတေသီတစ်ဦး
 apps/frappe/frappe/custom/doctype/customize_form/customize_form.js +88,Update,Update ကို
 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 +23,Name or Email is mandatory,အမည်သို့မဟုတ်အီးမေးလ်မသင်မနေရ
@@ -2314,11 +2235,10 @@
 DocType: Employee,Exit,ထွက်ပေါက်
 apps/erpnext/erpnext/accounts/doctype/account/account.py +134,Root Type is mandatory,အမြစ်ကအမျိုးအစားမသင်မနေရ
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +295,Serial No {0} created,serial No {0} နေသူများကဖန်တီး
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +125,Vibratory finishing,Vibratory ပြီး
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes",ဖောက်သည်များအဆင်ပြေဤ codes တွေကိုငွေတောင်းခံလွှာနှင့် Delivery မှတ်စုများတူပုံနှိပ်ပုံစံများဖြင့်အသုံးပြုနိုင်
 DocType: Employee,You can enter any date manually,သင်တို့ကိုကို manually မဆိုနေ့စွဲကိုရိုက်ထည့်နိုင်ပါတယ်
 DocType: Sales Invoice,Advertisement,ကျွွောငာခကျြ
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +165,Probationary Period,Probationary Period
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Probationary Period,Probationary Period
 DocType: Customer Group,Only leaf nodes are allowed in transaction,သာအရွက်ဆုံမှတ်များအရောင်းအဝယ်အတွက်ခွင့်ပြု
 DocType: Expense Claim,Expense Approver,စရိတ်အတည်ပြုချက်
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,ထောက်ပံ့ဝယ်ယူ Receipt Item
@@ -2326,19 +2246,16 @@
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +17,To Datetime,Datetime မှ
 DocType: SMS Settings,SMS Gateway URL,SMS ကို Gateway က URL ကို
 apps/erpnext/erpnext/config/crm.py +53,Logs for maintaining sms delivery status,SMS ပေးပို့အဆင့်အတန်းကိုထိန်းသိမ်းသည် logs
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +137,Grinding,ကြိတ်
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +34,Shrink wrapping,ထုပ်ပိုးကျုံ့
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +36,Pending Activities,ဆိုင်းငံ့ထားလှုပ်ရှားမှုများ
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,Confirmed,အတည်ပြုပြောကြား
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier > Supplier Type,ပေးသွင်း&gt; ပေးသွင်း Type
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +127,Please enter relieving date.,နေ့စွဲ relieving ရိုက်ထည့်ပေးပါ။
 apps/erpnext/erpnext/controllers/trends.py +137,Amt,Amt
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' can be submitted,တင်သွင်းနိုင်ပါတယ် &#39;&#39; Approved &#39;&#39; အဆင့်အတန်းနှင့်အတူ Applications ကိုသာ Leave
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +51,Only Leave Applications with status 'Approved' can be submitted,တင်သွင်းနိုင်ပါတယ် &#39;&#39; Approved &#39;&#39; အဆင့်အတန်းနှင့်အတူ Applications ကိုသာ Leave
 apps/erpnext/erpnext/utilities/doctype/address/address.py +21,Address Title is mandatory.,လိပ်စာခေါင်းစဉ်မဖြစ်မနေဖြစ်ပါတယ်။
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,စုံစမ်းရေးအရင်းအမြစ်မဲဆွယ်စည်းရုံးရေးလျှင်ကင်ပိန်းအမည်ကိုထည့်
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +38,Newspaper Publishers,သတင်းစာထုတ်ဝေသူများ
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +38,Newspaper Publishers,သတင်းစာထုတ်ဝေသူများ
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,ဘဏ္ဍာရေးနှစ်တစ်နှစ်တာကိုရွေးပါ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +88,Smelting,ရောစပ်
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Reorder အဆင့်
 DocType: Attendance,Attendance Date,တက်ရောက်သူနေ့စွဲ
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,ဝင်ငွေနဲ့ထုတ်ယူအပေါ်အခြေခံပြီးလစာအဖြစ်ခွဲထုတ်။
@@ -2353,16 +2270,15 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +414,[Error],[အမှား]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,သင်အရောင်းအမိန့်ကိုကယ်တင်တစ်ချိန်ကစကားမြင်နိုင်ပါလိမ့်မည်။
 ,Employee Birthday,ဝန်ထမ်းမွေးနေ့
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +55,Venture Capital,အကျိုးတူ Capital ကို
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,အကျိုးတူ Capital ကို
 DocType: UOM,Must be Whole Number,လုံးနံပါတ်ဖြစ်ရမည်
 DocType: Leave Control Panel,New Leaves Allocated (In Days),(Days ခုနှစ်တွင်) ခွဲဝေနယူးရွက်
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +51,Serial No {0} does not exist,serial No {0} မတည်ရှိပါဘူး
 DocType: Pricing Rule,Discount Percentage,လျော့စျေးရာခိုင်နှုန်း
 DocType: Payment Reconciliation Invoice,Invoice Number,ကုန်ပို့လွှာနံပါတ်
-apps/erpnext/erpnext/hooks.py +70,Orders,အမိန့်
+apps/erpnext/erpnext/hooks.py +54,Orders,အမိန့်
 DocType: Leave Control Panel,Employee Type,ဝန်ထမ်းကအမျိုးအစား
 DocType: Employee Leave Approver,Leave Approver,ခွင့်ပြုချက် Leave
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +70,Swaging,Swaging
 DocType: Manufacturing Settings,Material Transferred for Manufacture,ထုတ်လုပ်ခြင်းများအတွက်သို့လွှဲပြောင်း material
 DocType: Expense Claim,"A user with ""Expense Approver"" role",&quot;သုံးစွဲမှုအတည်ပြုချက်&quot; အခန်းကဏ္ဍနှင့်အတူအသုံးပြုသူတစ်ဦး
 ,Issued Items Against Production Order,ထုတ်လုပ်မှုအမိန့်ဆန့်ကျင်ထုတ်ပေးပစ္စည်းများ
@@ -2374,7 +2290,6 @@
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +62,Cost Center with existing transactions can not be converted to group,လက်ရှိအရောင်းအနှင့်အတူကုန်ကျစရိတ် Center ကအုပ်စုအဖြစ်ပြောင်းလဲမပြနိုင်
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Depreciation,တန်ဖိုး
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),ပေးသွင်းသူ (များ)
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +29,Invalid period,မမှန်ကန်ခြင်းကာလအတွင်း
 DocType: Customer,Credit Limit,ခရက်ဒစ်ကန့်သတ်
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,အရောင်းအဝယ်အမျိုးအစားကိုရွေးပါ
 DocType: GL Entry,Voucher No,ဘောက်ချာမရှိ
@@ -2384,9 +2299,9 @@
 DocType: Customer,Address and Contact,လိပ်စာနှင့်ဆက်သွယ်ရန်
 DocType: Customer,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}","ခွင့်ချိန်ခွင်လျှာထားပြီးအနာဂတ်ခွင့်ခွဲဝေစံချိန် {1} အတွက် PPP ဖြင့်ချဉ်းကပ်-forward နိုင်သည်သိရသည်အဖြစ် Leave, {0} မီကခွဲဝေမရနိုငျ"
 apps/erpnext/erpnext/accounts/party.py +284,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),မှတ်ချက်: ကြောင့် / ကိုးကားစရာနေ့စွဲ {0} တနေ့ (များ) ကခွင့်ပြုဖောက်သည်အကြွေးရက်ပတ်လုံးထက်ကျော်လွန်
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +621,Maint. Schedule,maint ။ ဇယား
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +108,Abrasive jet machining,ပွန်းစားဂျက်လေယာဉ် machine
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +632,Maint. Schedule,maint ။ ဇယား
 DocType: Stock Settings,Freeze Stock Entries,အေးစတော့အိတ် Entries
 DocType: Website Settings,Website Settings,website Settings ကို
 DocType: Item,Reorder level based on Warehouse,ဂိုဒေါင်အပေါ်အခြေခံပြီး reorder level ကို
@@ -2403,7 +2318,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +75,Show Stock Entries,Show ကိုစတော့အိတ် Entries
 ,Is Primary Address,မူလတန်းလိပ်စာဖြစ်ပါသည်
 DocType: Production Order,Work-in-Progress Warehouse,အလုပ်လုပ်-In-တိုးတက်ရေးပါတီဂိုဒေါင်
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +308,Reference #{0} dated {1},ကိုးကားစရာ # {0} {1} ရက်စွဲပါ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Reference #{0} dated {1},ကိုးကားစရာ # {0} {1} ရက်စွဲပါ
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +13,Manage Addresses,လိပ်စာ Manage
 DocType: Pricing Rule,Item Code,item Code ကို
 DocType: Production Planning Tool,Create Production Orders,ထုတ်လုပ်မှုအမိန့် Create
@@ -2412,7 +2327,7 @@
 DocType: Lead,Market Segment,Market မှာအပိုင်း
 DocType: Communication,Phone,Phone များ
 DocType: Employee Internal Work History,Employee Internal Work History,ဝန်ထမ်းပြည်တွင်းလုပ်ငန်းခွင်သမိုင်း
-apps/erpnext/erpnext/public/js/account_tree_grid.js +50,Closing (Dr),(ဒေါက်တာ) ပိတ်ပွဲ
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +221,Closing (Dr),(ဒေါက်တာ) ပိတ်ပွဲ
 DocType: Contact,Passive,မလှုပ်မရှားနေသော
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,{0} မစတော့ရှယ်ယာအတွက် serial No
 apps/erpnext/erpnext/config/selling.py +127,Tax template for selling transactions.,အရောင်းအရောင်းချနေသည်အခွန် Simple template ။
@@ -2428,8 +2343,8 @@
 ,Billed Amount,ကြေညာတဲ့ငွေပမာဏ
 DocType: Bank Reconciliation,Bank Reconciliation,ဘဏ်မှပြန်လည်ရင်ကြားစေ့ရေး
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +9,Get Updates,Updates ကိုရယူပါ
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +129,Material Request {0} is cancelled or stopped,material တောင်းဆိုမှု {0} ကိုပယ်ဖျက်သို့မဟုတ်ရပ်တန့်နေသည်
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +641,Add a few sample records,အနည်းငယ်နမူနာမှတ်တမ်းများ Add
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +133,Material Request {0} is cancelled or stopped,material တောင်းဆိုမှု {0} ကိုပယ်ဖျက်သို့မဟုတ်ရပ်တန့်နေသည်
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Add a few sample records,အနည်းငယ်နမူနာမှတ်တမ်းများ Add
 apps/erpnext/erpnext/config/hr.py +210,Leave Management,စီမံခန့်ခွဲမှု Leave
 DocType: Event,Groups,အုပ်စုများ
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,အကောင့်အားဖြင့်အုပ်စု
@@ -2442,38 +2357,34 @@
 DocType: Features Setup,Sales Extras,အရောင်း Extras
 apps/erpnext/erpnext/accounts/utils.py +344,{0} budget for Account {1} against Cost Center {2} will exceed by {3},{0} ကုန်ကျစရိတ် Center ကဆန့်ကျင်အကောင့်အတွက်ဘတ်ဂျက် {1} {2} {3} အားဖြင့်ကျော်လွန်ပါလိမ့်မယ်
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +236,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry",ဒီစတော့အိတ်ပြန်လည်ရင်ကြားစေ့ရေးတစ်ဦးဖွင့်ပွဲ Entry ဖြစ်ပါတယ်ကတည်းကခြားနားချက်အကောင့်တစ်ခု Asset / ဆိုက်အမျိုးအစားအကောင့်ကိုရှိရမည်
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +138,Purchase Order number required for Item {0},Item {0} လိုအပ်ဝယ်ယူခြင်းအမိန့်အရေအတွက်
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Order number required for Item {0},Item {0} လိုအပ်ဝယ်ယူခြင်းအမိန့်အရေအတွက်
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',&#39;&#39; နေ့စွဲ မှစ. &#39;&#39; နေ့စွဲရန် &#39;&#39; နောက်မှာဖြစ်ရပါမည်
 ,Stock Projected Qty,စတော့အိတ် Qty စီမံကိန်း
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +147,Customer {0} does not belong to project {1},customer {0} {1} သည်စီမံကိန်းပိုင်ပါဘူး
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +150,Customer {0} does not belong to project {1},customer {0} {1} သည်စီမံကိန်းပိုင်ပါဘူး
 DocType: Sales Order,Customer's Purchase Order,customer ရဲ့အမိန့်ကိုဝယ်ယူ
 DocType: Warranty Claim,From Company,ကုမ္ပဏီအနေဖြင့်
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,Value တစ်ခုသို့မဟုတ် Qty
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Minute,မိနစ်
+apps/erpnext/erpnext/public/js/setup_wizard.js +363,Minute,မိနစ်
 DocType: Purchase Invoice,Purchase Taxes and Charges,အခွန်နှင့်စွပ်စွဲချက်ယ်ယူ
 ,Qty to Receive,လက်ခံမှ Qty
 DocType: Leave Block List,Leave Block List Allowed,Block List ကို Allowed Leave
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +61,Conversion factor cannot be in fractions,ကူးပြောင်းခြင်းအချက်အပိုငျးအရှိမဖြစ်နိုင်
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +358,You will use it to Login,သင်ဟာ Login အသုံးပြုလိမ့်မည်
+apps/erpnext/erpnext/public/js/setup_wizard.js +108,You will use it to Login,သင်ဟာ Login အသုံးပြုလိမ့်မည်
 DocType: Sales Partner,Retailer,လက်လီအရောင်းဆိုင်
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +99,Credit To account must be a Balance Sheet account,အကောင့်ကိုရန်အကြွေးတစ်ဦး Balance ကိုစာရွက်အကောင့်ကိုသူဖြစ်ရမည်
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,အားလုံးသည်ပေးသွင်းအမျိုးအစားများ
 apps/erpnext/erpnext/stock/doctype/item/item.py +37,Item Code is mandatory because Item is not automatically numbered,Item တွေကိုအလိုအလျောက်နံပါတ်အမကဘယ်ကြောင့်ဆိုသော် item Code ကိုမသင်မနေရ
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +99,Quotation {0} not of type {1},{0} မဟုတ်အမျိုးအစားစျေးနှုန်း {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +93,Quotation {0} not of type {1},{0} မဟုတ်အမျိုးအစားစျေးနှုန်း {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,ပြုပြင်ထိန်းသိမ်းမှုဇယား Item
 DocType: Sales Order,%  Delivered,% ကယ်နှုတ်တော်မူ၏
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,Bank Overdraft Account,ဘဏ်မှ Overdraft အကောင့်
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +15,Make Salary Slip,လစာစလစ်ဖြတ်ပိုင်းပုံစံလုပ်ပါ
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +18,Browse BOM,Browse ကို BOM
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +175,Secured Loans,လုံခြုံသောချေးငွေ
-apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +3,Awesome Products,Awesome ကိုထုတ်ကုန်ပစ္စည်းများ
+apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +3,Awesome Products,Awesome ကိုထုတ်ကုန်ပစ္စည်းများ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +189,Opening Balance Equity,Balance Equity ဖွင့်လှစ်
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +80,Cannot approve leave as you are not authorized to approve leaves on Block Dates,သင် Block နေ့ရက်များပေါ်တွင်အရွက်ကအတည်ပြုဖို့အခွင့်ရနေကြသည်မဟုတ်အဖြစ်ခွင့်အတည်ပြုလို့မရပါဘူး
 DocType: Appraisal,Appraisal,တန်ဖိုးခြင်း
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +13,Lost-foam casting,ဆုံးရှုံး-မြှုပ်သွန်း
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +47,Drawing,ကားပုံ
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +22,Date is repeated,နေ့စွဲထပ်ခါတလဲလဲဖြစ်ပါတယ်
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +148,Leave approver must be one of {0},{0} တယောက်ဖြစ်ရပါမည်အတည်ပြုချက် Leave
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +162,Leave approver must be one of {0},{0} တယောက်ဖြစ်ရပါမည်အတည်ပြုချက် Leave
 DocType: Hub Settings,Seller Email,ရောင်းချသူအီးမေးလ်
 DocType: Project,Total Purchase Cost (via Purchase Invoice),(ဝယ်ယူခြင်းပြေစာကနေတဆင့်) စုစုပေါင်းဝယ်ယူကုန်ကျစရိတ်
 DocType: Workstation Working Hour,Start Time,Start ကိုအချိန်
@@ -2487,7 +2398,7 @@
 DocType: Purchase Invoice Item,Net Amount (Company Currency),Net ကပမာဏ (ကုမ္ပဏီငွေကြေးစနစ်)
 DocType: BOM Operation,Hour Rate,အချိန်နာရီနှုန်း
 DocType: Stock Settings,Item Naming By,အားဖြင့်အမည် item
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +642,From Quotation,စျေးနှုန်းအနေဖြင့်
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +655,From Quotation,စျေးနှုန်းအနေဖြင့်
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},{0} {1} ပြီးနောက်ဖန်ဆင်းခဲ့နောက်ထပ်ကာလသင်တန်းဆင်းပွဲ Entry &#39;
 DocType: Production Order,Material Transferred for Manufacturing,ကုန်ထုတ်လုပ်မှုသည်လွှဲပြောင်း material
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +29,Account {0} does not exists,အကောင့်ကို {0} တည်ရှိပါဘူး
@@ -2501,21 +2412,19 @@
 DocType: Purchase Invoice Item,PR Detail,PR စနစ် Detail
 DocType: Sales Order,Fully Billed,အပြည့်အဝကြေညာ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +20,Cash In Hand,လက်၌ငွေသား
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +72,Delivery warehouse required for stock item {0},စတော့ရှယ်ယာကို item {0} များအတွက်လိုအပ်သော delivery ဂိုဒေါင်
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +119,Delivery warehouse required for stock item {0},စတော့ရှယ်ယာကို item {0} များအတွက်လိုအပ်သော delivery ဂိုဒေါင်
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),အထုပ်၏စုစုပေါင်းအလေးချိန်။ ပိုက်ကွန်ကိုအလေးချိန် + ထုပ်ပိုးပစ္စည်းအလေးချိန်များသောအားဖြင့်။ (ပုံနှိပ်သည်)
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,ဒီအခန်းကဏ္ဍနှင့်အတူအသုံးပြုသူများကအေးခဲအကောင့်အသစ်များ၏ ထား. ဖန်တီး / အေးစက်နေတဲ့အကောင့်အသစ်များ၏ဆန့်ကျင်စာရင်းကိုင် entries တွေကိုပြုပြင်မွမ်းမံဖို့ခွင့်ပြုနေကြတယ်
 DocType: Serial No,Is Cancelled,ဖျက်သိမ်းသည်
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +281,My Shipments,ငါ့အတင်ပို့မှု
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +286,My Shipments,ငါ့အတင်ပို့မှု
 DocType: Journal Entry,Bill Date,ဘီလ်နေ့စွဲ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +43,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","အမြင့်ဆုံးဦးစားပေးနှင့်အတူမျိုးစုံစျေးနှုန်းများနည်းဥပဒေများရှိပါတယ်တောင်မှလျှင်, အောက်ပါပြည်တွင်းရေးဦးစားပေးလျှောက်ထားနေကြပါတယ်:"
 DocType: Supplier,Supplier Details,ပေးသွင်းအသေးစိတ်ကို
 DocType: Communication,Recipients,လက်ခံသူများ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +146,Screwing,Screwing
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +96,Knurling,Knurling
 DocType: Expense Claim,Approval Status,ခွင့်ပြုချက်နဲ့ Status
 DocType: Hub Settings,Publish Items to Hub,Hub မှပစ္စည်းများထုတ်ဝေ
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +44,From value must be less than to value in row {0},တန်ဖိုးမြှင်ထံမှအတန်း {0} အတွက်တန်ဖိုးထက်နည်းရှိရမည်
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +133,Wire Transfer,ငွေလွှဲခြင်း
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +133,Wire Transfer,ငွေလွှဲခြင်း
 apps/erpnext/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py +25,Please select Bank Account,ဘဏ်မှအကောင့်ကို select ကျေးဇူးပြု.
 DocType: Newsletter,Create and Send Newsletters,သတင်းလွှာ Create နှင့် Send
 apps/frappe/frappe/public/js/frappe/views/reports/grid_report.js +305,From Date must be before To Date,နေ့စွဲကနေနေ့စွဲရန်မီဖြစ်ရမည်
@@ -2523,14 +2432,14 @@
 DocType: Company,Default Income Account,default ဝင်ငွေခွန်အကောင့်
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,ဖောက်သည်အုပ်စု / ဖောက်သည်
 DocType: Item Group,Check this if you want to show in website,သင်ဝက်ဘ်ဆိုက်အတွက်ကိုပြချင်တယ်ဆိုရင်ဒီစစ်ဆေး
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +190,Welcome to ERPNext,ERPNext မှလှိုက်လှဲစွာကြိုဆိုပါသည်
+,Welcome to ERPNext,ERPNext မှလှိုက်လှဲစွာကြိုဆိုပါသည်
 DocType: Payment Reconciliation Payment,Voucher Detail Number,ဘောက်ချာ Detail နံပါတ်
 apps/erpnext/erpnext/config/crm.py +146,Lead to Quotation,စျေးနှုန်းဆီသို့ဦးတည်
 DocType: Lead,From Customer,ဖောက်သည်ထံမှ
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +37,Calls,ဖုန်းခေါ်ဆိုမှု
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Calls,ဖုန်းခေါ်ဆိုမှု
 DocType: Project,Total Costing Amount (via Time Logs),(အချိန် Logs ကနေတဆင့်) စုစုပေါင်းကုန်ကျငွေပမာဏ
 DocType: Purchase Order Item Supplied,Stock UOM,စတော့အိတ် UOM
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Purchase Order {0} is not submitted,ဝယ်ယူခြင်းအမိန့် {0} တင်သွင်းသည်မဟုတ်
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +194,Purchase Order {0} is not submitted,ဝယ်ယူခြင်းအမိန့် {0} တင်သွင်းသည်မဟုတ်
 ,Projected,စီမံကိန်း
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},serial No {0} ဂိုဒေါင် {1} ပိုင်ပါဘူး
 apps/erpnext/erpnext/controllers/status_updater.py +136,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,မှတ်ချက်: System ကို Item သည်ပို့ဆောင်မှု-ထပ်ခါထပ်ခါ-ဘွတ်ကင်စစ်ဆေးမည်မဟုတ် {0} အရေအတွက်သို့မဟုတ်ပမာဏပါ 0 င်သည်အဖြစ်
@@ -2538,7 +2447,6 @@
 DocType: Issue,Opening Date,နေ့စွဲဖွင့်လှစ်
 DocType: Journal Entry,Remark,ပွောဆို
 DocType: Purchase Receipt Item,Rate and Amount,rate နှင့်ငွေပမာဏ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +95,Boring,ထွင်းဖေါက်ခြင်း
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +667,From Sales Order,အရောင်းအမိန့်ကနေ
 DocType: Blog Category,Parent Website Route,မိဘဝက်ဘ်ဆိုက်လမ်းကြောင်း
 DocType: Sales Order,Not Billed,ကြေညာတဲ့မ
@@ -2552,19 +2460,17 @@
 apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount Amount,လျော့စျေးပမာဏ
 DocType: Purchase Invoice,Return Against Purchase Invoice,ဝယ်ယူခြင်းပြေစာဆန့်ကျင်သို့ပြန်သွားသည်
 DocType: Item,Warranty Period (in days),(ရက်) ကိုအာမခံကာလ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +550,e.g. VAT,ဥပမာ VAT
+apps/erpnext/erpnext/public/js/setup_wizard.js +292,e.g. VAT,ဥပမာ VAT
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,item 4
 DocType: Journal Entry Account,Journal Entry Account,ဂျာနယ် Entry အကောင့်
 DocType: Shopping Cart Settings,Quotation Series,စျေးနှုန်းစီးရီး
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +52,"An item exists with same name ({0}), please change the item group name or rename the item","တစ်ဦးကို item နာမည်တူ ({0}) နှင့်အတူရှိနေတယ်, ပစ္စည်းအုပ်စုအမည်ကိုပြောင်းလဲသို့မဟုတ်ပစ္စည်းကိုအမည်ပြောင်းကျေးဇူးတင်ပါ"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +82,Hot metal gas forming,Hot သတ္တုဓာတ်ငွေ့ဖွဲ့စည်း
 DocType: Sales Order Item,Sales Order Date,အရောင်းအမိန့်နေ့စွဲ
 DocType: Sales Invoice Item,Delivered Qty,ကယ်နှုတ်တော်မူ၏ Qty
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +63,Warehouse {0}: Company is mandatory,ဂိုဒေါင် {0}: ကုမ္ပဏီမသင်မနေရ
 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.",သင့်လျော်သောအုပ်စုရန်ပုံငွေ&gt; လက်ရှိမှုစိစစ်&gt; အခွန်နှင့်တာဝန်၏ (များသောအားဖြင့်အရင်းအမြစ်ကိုသွားပါအသစ်တစ်ခုအကောင့်ဖန်တီး (ကလေး Add ကိုနှိပ်ခြင်းအားဖြင့်) အမျိုးအစား &quot;ခွန်&quot; ၏နှင့်အခွန်နှုန်းကိုဖော်ပြရန်လုပ်ပါ။
 ,Payment Period Based On Invoice Date,ပြေစာနေ့စွဲတွင် အခြေခံ. ငွေ​​ပေးချေမှုရမည့်ကာလ
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +50,Missing Currency Exchange Rates for {0},{0} သည်ငွေကြေးစနစ်ငွေလဲနှုန်းဦးပျောက်ဆုံးနေ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +135,Laser cutting,လေဆာဖြတ်တောက်ခြင်း
 DocType: Event,Monday,တနင်္လာနေ့
 DocType: Journal Entry,Stock Entry,စတော့အိတ် Entry &#39;
 DocType: Account,Payable,ပေးအပ်သော
@@ -2597,7 +2503,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +111,Date Of Retirement must be greater than Date of Joining,အငြိမ်းစားအမျိုးမျိုးနေ့စွဲအတူနေ့စွဲထက် သာ. ကြီးမြတ်ဖြစ်ရမည်
 DocType: Sales Invoice,Against Income Account,ဝင်ငွေခွန်အကောင့်ဆန့်ကျင်
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +69,{0}% Delivered,ကယ်နှုတ်တော်မူ၏ {0}%
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +78,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,item {0}: မိန့် qty {1} {2} (Item မှာသတ်မှတ်ထားတဲ့) နိမ့်ဆုံးအမိန့် qty ထက်နည်းမဖြစ်နိုင်။
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,item {0}: မိန့် qty {1} {2} (Item မှာသတ်မှတ်ထားတဲ့) နိမ့်ဆုံးအမိန့် qty ထက်နည်းမဖြစ်နိုင်။
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,လစဉ်ဖြန့်ဖြူးရာခိုင်နှုန်း
 DocType: Territory,Territory Targets,နယ်မြေတွေကိုပစ်မှတ်များ
 DocType: Delivery Note,Transporter Info,Transporter Info
@@ -2606,7 +2512,6 @@
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,ပုံနှိပ်တင်းပလိတ်များသည်ခေါင်းစဉ်များငွေလွှဲစာတမ်းတန်ဖိုးပြေစာဥပမာ။
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +140,Valuation type charges can not marked as Inclusive,အဘိုးပြတ်သည်အတိုင်း type ကိုစွဲချက် Inclusive အဖြစ်မှတ်သားမရပါဘူး
 DocType: POS Profile,Update Stock,စတော့အိတ် Update
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +128,Superfinishing,Superfinishing
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,ပစ္စည်းများသည်ကွဲပြားခြားနားသော UOM မမှန်ကန် (Total) Net ကအလေးချိန်တန်ဖိုးကိုဆီသို့ဦးတည်ပါလိမ့်မယ်။ အသီးအသီးကို item ၏ Net ကအလေးချိန်တူညီ UOM အတွက်ကြောင်းသေချာပါစေ။
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM Rate
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +85,Please pull items from Delivery Note,Delivery မှတ်ချက်များထံမှပစ္စည်းများကိုဆွဲ ကျေးဇူးပြု.
@@ -2621,7 +2526,6 @@
 ,Purchase Analytics,ဝယ်ယူခြင်း Analytics
 DocType: Sales Invoice Item,Delivery Note Item,Delivery မှတ်ချက် Item
 DocType: Expense Claim,Task,လုပ်ငန်း
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +57,Shaving,ရိတ်
 DocType: Purchase Taxes and Charges,Reference Row #,ကိုးကားစရာ Row #
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},batch အရေအတွက် Item {0} သည်မသင်မနေရ
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js +14,This is a root sales person and cannot be edited.,"ဒါကအမြစ်ရောင်းအားလူတစ်ဦးဖြစ်ပြီး, edited မရနိုင်ပါ။"
@@ -2633,13 +2537,11 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +74,Purpose must be one of {0},ရည်ရွယ်ချက် {0} တယောက်ဖြစ်ရပါမည်
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +108,Fill the form and save it,ပုံစံဖြည့်ခြင်းနှင့်ကယ်
 DocType: Production Planning Tool,Download a report containing all raw materials with their latest inventory status,သူတို့ရဲ့နောက်ဆုံးစာရင်းအဆင့်အတန်းနှင့်အတူအားလုံးကုန်ကြမ်းင်တစ်ဦးအစီရင်ခံစာ Download
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +94,Facing,facing
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,ကွန်မြူနတီဖိုရမ်၏
 DocType: Leave Application,Leave Balance Before Application,လျှောက်လွှာခင်မှာ Balance Leave
 DocType: SMS Center,Send SMS,SMS ပို့
 DocType: Company,Default Letter Head,default ပေးစာဌာနမှူး
 DocType: Time Log,Billable,Billable
-DocType: Authorization Rule,This will be used for setting rule in HR module,ဒါဟာ HR module တစ်ခု၌အုပ်စိုး setting တွင်အသုံးပြုလိမ့်မည်
 DocType: Account,Rate at which this tax is applied,ဒီအခွန်လျှောက်ထားသောအချိန်တွင် rate
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reorder Qty,Reorder Qty
 DocType: Company,Stock Adjustment Account,စတော့အိတ်ချိန်ညှိအကောင့်
@@ -2666,16 +2568,15 @@
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,ရာခိုင်နှုန်းဖြန့်ဝေ 100% နဲ့ညီမျှဖြစ်သင့်
 DocType: Serial No,Out of AMC,AMC ထဲက
 DocType: Purchase Order Item,Material Request Detail No,material တောင်းဆိုမှု Detail မရှိပါ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +97,Hard turning,ခဲယဉ်းလှည့်
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +33,Make Maintenance Visit,Maintenance ကိုအလည်တစ်ခေါက်လုပ်ပါ
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +187,Please contact to the user who have Sales Master Manager {0} role,အရောင်းမဟာ Manager က {0} အခန်းကဏ္ဍကိုသူအသုံးပြုသူမှဆက်သွယ်ပါ
 DocType: Company,Default Cash Account,default ငွေအကောင့်
 apps/erpnext/erpnext/config/accounts.py +79,Company (not Customer or Supplier) master.,ကုမ္ပဏီ (မဖောက်သည်သို့မဟုတ်ပေးသွင်းသူ) သခင်သည်။
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +106,Please enter 'Expected Delivery Date',&#39;&#39; မျှော်မှန်း Delivery Date ကို &#39;&#39; ကိုရိုက်ထည့်ပေးပါ
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +187,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Delivery မှတ်စုများ {0} ဒီအရောင်းအမိန့်ကိုပယ်ဖျက်မီဖျက်သိမ်းရပါမည်
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +100,Please enter 'Expected Delivery Date',&#39;&#39; မျှော်မှန်း Delivery Date ကို &#39;&#39; ကိုရိုက်ထည့်ပေးပါ
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +182,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Delivery မှတ်စုများ {0} ဒီအရောင်းအမိန့်ကိုပယ်ဖျက်မီဖျက်သိမ်းရပါမည်
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +373,Paid amount + Write Off Amount can not be greater than Grand Total,Paid ပမာဏ + ငွေပမာဏက Grand စုစုပေါင်းထက် သာ. ကြီးမြတ်မဖွစျနိုငျပိတ်ရေးထား
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} Item {1} သည်မှန်ကန်သော Batch နံပါတ်မဟုတ်ပါဘူး
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,Note: There is not enough leave balance for Leave Type {0},မှတ်ချက်: လုံလောက်တဲ့ခွင့်ချိန်ခွင်လျှာထွက်ခွာ Type {0} သည်မရှိ
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +124,Note: There is not enough leave balance for Leave Type {0},မှတ်ချက်: လုံလောက်တဲ့ခွင့်ချိန်ခွင်လျှာထွက်ခွာ Type {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.","မှတ်ချက်: ငွေပေးချေမှုဆိုကိုးကားဆန့်ကျင်တော်မသည်မှန်လျှင်, ကို manually ဂျာနယ် Entry &#39;ပါစေ။"
 DocType: Item,Supplier Items,ပေးသွင်းပစ္စည်းများ
 DocType: Opportunity,Opportunity Type,အခွင့်အလမ်းကအမျိုးအစား
@@ -2687,7 +2588,7 @@
 DocType: Hub Settings,Publish Availability,Available ထုတ်ဝေ
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +105,Date of Birth cannot be greater than today.,မွေးဖွားခြင်း၏နေ့စွဲယနေ့ထက် သာ. ကြီးမြတ်မဖြစ်နိုင်။
 ,Stock Ageing,စတော့အိတ် Ageing
-apps/erpnext/erpnext/controllers/accounts_controller.py +200,{0} '{1}' is disabled,{0} {1} &#39;&#39; ပိတ်ထားတယ်
+apps/erpnext/erpnext/controllers/accounts_controller.py +201,{0} '{1}' is disabled,{0} {1} &#39;&#39; ပိတ်ထားတယ်
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,ပွင့်လင်းအဖြစ် Set
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,မ့အရောင်းအပေါ်ဆက်သွယ်ရန်မှအလိုအလျှောက်အီးမေးလ်များကိုပေးပို့ပါ။
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +232,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
@@ -2696,44 +2597,38 @@
 DocType: Purchase Order,Customer Contact Email,customer ဆက်သွယ်ရန်အီးမေးလ်
 DocType: Event,Sunday,တနင်္ဂနွေ
 DocType: Sales Team,Contribution (%),contribution (%)
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +455,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,မှတ်ချက်: &#39;&#39; ငွေသို့မဟုတ်ဘဏ်မှအကောင့် &#39;&#39; သတ်မှတ်ထားသောမဟုတ်ခဲ့ကတည်းကငွေပေးချေမှုရမည့် Entry နေသူများကဖန်တီးမည်မဟုတ်
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +171,Responsibilities,တာဝန်ဝတ္တရားများ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +457,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,မှတ်ချက်: &#39;&#39; ငွေသို့မဟုတ်ဘဏ်မှအကောင့် &#39;&#39; သတ်မှတ်ထားသောမဟုတ်ခဲ့ကတည်းကငွေပေးချေမှုရမည့် Entry နေသူများကဖန်တီးမည်မဟုတ်
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +171,Responsibilities,တာဝန်ဝတ္တရားများ
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Template,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,table ထဲမှာ atleast 1 ငွေတောင်းခံလွှာကိုရိုက်ထည့်ပေးပါ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +511,Add Users,အသုံးပြုသူများအ Add
+apps/erpnext/erpnext/public/js/setup_wizard.js +255,Add Users,အသုံးပြုသူများအ Add
 DocType: Pricing Rule,Item Group,item Group က
 DocType: Task,Actual Start Date (via Time Logs),(အချိန် Logs ကနေတဆင့်) အမှန်တကယ် Start ကိုနေ့စွဲ
 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),Added အခွန်အခများနှင့်စွပ်စွဲချက် (ကုမ္ပဏီငွေကြေးစနစ်)
-apps/erpnext/erpnext/stock/doctype/item/item.py +340,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,item ခွန် Row {0} type ကိုခွန်သို့မဟုတ်ဝင်ငွေခွန်သို့မဟုတ်သုံးစွဲမှုသို့မဟုတ်နှော၏အကောင့်ကိုရှိရမယ်
+apps/erpnext/erpnext/stock/doctype/item/item.py +344,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,item ခွန် Row {0} type ကိုခွန်သို့မဟုတ်ဝင်ငွေခွန်သို့မဟုတ်သုံးစွဲမှုသို့မဟုတ်နှော၏အကောင့်ကိုရှိရမယ်
 DocType: Sales Order,Partly Billed,တစ်စိတ်တစ်ပိုင်းကြေညာ
 DocType: Item,Default BOM,default BOM
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +79,Decambering,Decambering
 apps/erpnext/erpnext/setup/doctype/company/company.js +22,Please re-type company name to confirm,အတည်ပြုရန်ကုမ္ပဏီ၏နာမ-type ကိုပြန်လည် ကျေးဇူးပြု.
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,စုစုပေါင်းထူးချွန် Amt
 DocType: Time Log Batch,Total Hours,စုစုပေါင်းနာ​​ရီ
 DocType: Journal Entry,Printing Settings,ပုံနှိပ်ခြင်းက Settings
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +268,Total Debit must be equal to Total Credit. The difference is {0},စုစုပေါင်း Debit စုစုပေါင်းချေးငွေတန်းတူဖြစ်ရမည်။ အဆိုပါခြားနားချက် {0} သည်
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +11,Automotive,မော်တော်ယာဉ်
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +37,Item is required,item လိုအပ်သည်
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +25,Metal injection molding,metal ဆေးထိုးအတု ယူ. ပုံသှငျး
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +258,Total Debit must be equal to Total Credit. The difference is {0},စုစုပေါင်း Debit စုစုပေါင်းချေးငွေတန်းတူဖြစ်ရမည်။ အဆိုပါခြားနားချက် {0} သည်
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,မော်တော်ယာဉ်
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +684,From Delivery Note,Delivery မှတ်ချက်ထံမှ
 DocType: Time Log,From Time,အချိန်ကနေ
 DocType: Notification Control,Custom Message,custom Message
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +33,Investment Banking,ရင်းနှီးမြှုပ်နှံမှုဘဏ်လုပ်ငန်း
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +261,"Select your Country, Time Zone and Currency","သင့်ရဲ့နိုင်ငံ, အချိန်ဇုန်နှင့်ငွေကြေးစနစ်ကိုရွေးပါ"
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,ရင်းနှီးမြှုပ်နှံမှုဘဏ်လုပ်ငန်း
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +316,"Select your Country, Time Zone and Currency","သင့်ရဲ့နိုင်ငံ, အချိန်ဇုန်နှင့်ငွေကြေးစနစ်ကိုရွေးပါ"
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +369,Cash or Bank Account is mandatory for making payment entry,ငွေသားသို့မဟုတ်ဘဏ်မှအကောင့်ငွေပေးချေမှု entry ကိုအောင်သည်မသင်မနေရ
 DocType: Purchase Invoice,Price List Exchange Rate,စျေးနှုန်း List ကိုချိန်း Rate
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +91,Pickling,ဆားစိမ်ရေ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +18,Sand casting,သဲသွန်း
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +117,Electroplating,Electroplating
 DocType: Purchase Invoice Item,Rate,rate
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +62,Intern,အလုပ်သင်ဆရာဝန်
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Intern,အလုပ်သင်ဆရာဝန်
 DocType: Newsletter,A Lead with this email id should exist,ဒီအီးမေးလ်က id နှင့်အတူတစ်ခဲတည်ရှိနေသင့်ပါတယ်
 DocType: Stock Entry,From BOM,BOM ကနေ
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +34,Basic,အခြေခံပညာ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +34,Basic,အခြေခံပညာ
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,{0} အေးခဲနေကြပါတယ်စတော့အိတ်အရောင်းအမီ
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +217,Please click on 'Generate Schedule',&#39;&#39; Generate ဇယား &#39;&#39; ကို click ပါ ကျေးဇူးပြု.
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +61,To Date should be same as From Date for Half Day leave,နေ့စွဲမှတစ်ဝက်နေ့ခွင့်ယူသည်နေ့စွဲ မှစ. အဖြစ်အတူတူဖြစ်သင့်
@@ -2741,10 +2636,10 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +96,Reference No is mandatory if you entered Reference Date,ရည်ညွန်းသင်ကိုးကားစရာနေ့စွဲသို့ဝင်လျှင်အဘယ်သူမျှမသင်မနေရ
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +108,Date of Joining must be greater than Date of Birth,အတူနေ့စွဲမွေးဖွားခြင်း၏နေ့စွဲထက် သာ. ကြီးမြတ်ဖြစ်ရမည်
 DocType: Salary Structure,Salary Structure,လစာဖွဲ့စည်းပုံ
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +242,"Multiple Price Rule exists with same criteria, please resolve \
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +246,"Multiple Price Rule exists with same criteria, please resolve \
 			conflict by assigning priority. Price Rules: {0}","အကွိမျမြားစှာစျေးနှုန်း Rule တူညီသောစံသတ်မှတ်ချက်များနှင့်အတူရှိနေတယ်, ဦးစားပေးသတ်မှတ်ခြင်းအားဖြင့်ပဋိပက္ခဖြေရှင်းရန် \ ကိုကျေးဇူးတင်ပါ။ စျေးနှုန်းနည်းဥပဒေများ: {0}"
 DocType: Account,Bank,ကမ်း
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +9,Airline,လကွောငျး
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,လကွောငျး
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +493,Issue Material,ပြဿနာပစ္စည်း
 DocType: Material Request Item,For Warehouse,ဂိုဒေါင်အကြောင်းမူကား
 DocType: Employee,Offer Date,ကမ်းလှမ်းမှုကိုနေ့စွဲ
@@ -2754,29 +2649,24 @@
 DocType: Item,Is Fixed Asset Item,Fixed Asset Item ဖြစ်ပါတယ်
 DocType: Stock Entry,Including items for sub assemblies,ခွဲများအသင်းတော်တို့အဘို့ပစ္စည်းများအပါအဝင်
 DocType: Features Setup,"If you have long print formats, this feature can be used to split the page to be printed on multiple pages with all headers and footers on each page",သင်ရှည်လျားပုံနှိပ်ပုံစံများရှိပါကဒီ feature တစ်ခုချင်းစီစာမျက်နှာပေါ်မှာရှိသမျှ headers နှင့် footer နှင့်အတူမျိုးစုံစာမျက်နှာများပေါ်တွင်ပုံနှိပ်ခံရဖို့ page ကိုခွဲထွက်ဖို့အသုံးပြုနိုင်ပါတယ်
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +131,Hobbing,Hobbing
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +98,All Territories,အားလုံးသည် Territories
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +98,All Territories,အားလုံးသည် Territories
 DocType: Purchase Invoice,Items,items
 DocType: Fiscal Year,Year Name,တစ်နှစ်တာအမည်
 DocType: Process Payroll,Process Payroll,Process ကိုလစာ
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +59,There are more holidays than working days this month.,ယခုလအလုပ်လုပ်ရက်ပတ်လုံးထက်ပိုပြီးအားလပ်ရက်ရှိပါသည်။
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +68,There are more holidays than working days this month.,ယခုလအလုပ်လုပ်ရက်ပတ်လုံးထက်ပိုပြီးအားလပ်ရက်ရှိပါသည်။
 DocType: Product Bundle Item,Product Bundle Item,ထုတ်ကုန်ပစ္စည်း Bundle ကို Item
 DocType: Sales Partner,Sales Partner Name,အရောင်း Partner အမည်
 DocType: Purchase Invoice Item,Image View,image ကိုကြည့်ရန်
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +113,Finishing & industrial finishing,Finish &amp; စက်မှုဇုန်ပြီး
 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/page/setup_wizard/fixtures/industry_type.py +46,Securities & Commodity Exchanges,Securities မှ &amp; ကုန်စည်ဒိုင်
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Securities မှ &amp; ကုန်စည်ဒိုင်
 DocType: Shipping Rule,Calculate Based On,အခြေတွင်တွက်ချက်
 DocType: Delivery Note Item,From Warehouse,ဂိုဒေါင်ထဲကနေ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +98,Drilling,ရေနံတွင်းတူး
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +28,Blow molding,ထိုးနှက်အတု ယူ. ပုံသှငျး
 DocType: Purchase Taxes and Charges,Valuation and Total,အဘိုးပြတ်နှင့်စုစုပေါင်း
 DocType: Tax Rule,Shipping City,သဘောင်္တင်ခစီးတီး
 apps/erpnext/erpnext/stock/doctype/item/item.js +43,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,ဒါဟာ Item {0} (Template) ၏ Variant ဖြစ်ပါတယ်။ &#39;မ Copy ကူး&#39; &#39;ကိုသတ်မှတ်ထားမဟုတ်လျှင် Attribute တွေတင်းပလိတ်ဖိုင်ကနေကော်ပီကူးပါလိမ့်မည်
 DocType: Account,Purchase User,ဝယ်ယူအ​​သုံးပြုသူ
 DocType: Notification Control,Customize the Notification,ထိုအမိန့်ကြော်ငြာစာ Customize
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +87,Hammering,တူ
 DocType: Web Page,Slideshow,ဆလိုက်ရှိုး
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +24,Default Address Template cannot be deleted,default လိပ်စာ Template ဖျက်ပြီးမရနိုင်ပါ
 DocType: Sales Invoice,Shipping Rule,သဘောင်္တင်ခ Rule
@@ -2785,9 +2675,8 @@
 DocType: Workflow State,Search,ရှာဖှေ
 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,ထက် သာ. ကြီးမြတ်သို့မဟုတ်သုညနဲ့ညီမျှဖြစ်ရမည် &#39;&#39; ပြီးခဲ့သည့်အမိန့် ခုနှစ်မှစ. Days &#39;ဟူ.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +142,Brazing,Brazing
 DocType: C-Form,Amended From,မှစ. ပြင်ဆင်
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Raw Material,ကုန်ကြမ်း
+apps/erpnext/erpnext/public/js/setup_wizard.js +359,Raw Material,ကုန်ကြမ်း
 DocType: Leave Application,Follow via Email,အီးမေးလ်ကနေတဆင့် Follow
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,လျှော့ငွေပမာဏပြီးနောက်အခွန်ပမာဏ
 apps/erpnext/erpnext/accounts/doctype/account/account.py +174,Child account exists for this account. You can not delete this account.,ကလေးသူငယ်အကောင့်ကိုဒီအကောင့်ရှိနေပြီ။ သင်သည်ဤအကောင့်ကိုမဖျက်နိုင်ပါ။
@@ -2801,10 +2690,10 @@
 ,Produced,ထုတ်လုပ်
 DocType: Item,Item Code for Suppliers,ပေးသွင်းသည် item Code ကို
 DocType: Issue,Raised By (Email),(အီးမေးလ်) အားဖြင့်ထမြောက်စေတော်
-apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +72,General,ယေဘုယျ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +495,Attach Letterhead,Letterhead Attach
+apps/erpnext/erpnext/setup/setup_wizard/default_website.py +72,General,ယေဘုယျ
+apps/erpnext/erpnext/public/js/setup_wizard.js +241,Attach Letterhead,Letterhead Attach
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +272,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',အမျိုးအစား &#39;&#39; အကောက်ခွန်တန်ဖိုးသတ်မှတ်မည် &#39;သို့မဟုတ်&#39; &#39;အကောက်ခွန်တန်ဖိုးသတ်မှတ်မည်နှင့်စုစုပေါင်း&#39; &#39;အဘို့ဖြစ်၏သောအခါအနှိမ်မချနိုင်
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +542,"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.","သင့်ရဲ့အခှနျဦးခေါင်းစာရင်း (ဥပမာ VAT, အကောက်ခွန်စသည်တို့ကိုကြ၏ထူးခြားသောအမည်များရှိသင့်) နှင့်သူတို့၏စံနှုန်းထားများ။ ဒါဟာသင်တည်းဖြတ်များနှင့်ပိုမိုအကြာတွင်ထည့်နိုင်သည်ဟူသောတစ်ဦးစံ template တွေဖန်တီးပေးလိမ့်မည်။"
+apps/erpnext/erpnext/public/js/setup_wizard.js +284,"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.","သင့်ရဲ့အခှနျဦးခေါင်းစာရင်း (ဥပမာ VAT, အကောက်ခွန်စသည်တို့ကိုကြ၏ထူးခြားသောအမည်များရှိသင့်) နှင့်သူတို့၏စံနှုန်းထားများ။ ဒါဟာသင်တည်းဖြတ်များနှင့်ပိုမိုအကြာတွင်ထည့်နိုင်သည်ဟူသောတစ်ဦးစံ template တွေဖန်တီးပေးလိမ့်မည်။"
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial Nos Required for Serialized Item {0},Serial Item {0} သည် serial အမှတ်လိုအပ်ပါသည်
 DocType: Journal Entry,Bank Entry,ဘဏ်မှ Entry &#39;
 DocType: Authorization Rule,Applicable To (Designation),(သတ်မှတ်ပေးထားခြင်း) ရန်သက်ဆိုင်သော
@@ -2813,30 +2702,28 @@
 apps/erpnext/erpnext/config/accounts.py +143,Enable / disable currencies.,Enable / ငွေကြေးများ disable ။
 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)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +26,Entertainment & Leisure,Entertainment က &amp; Leisure
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,Entertainment က &amp; Leisure
 DocType: Purchase Order,The date on which recurring order will be stop,ထပ်တလဲလဲအမိန့်ရပ်တန့်ဖြစ်ရလိမ့်မည်သည့်နေ့ရက်
 DocType: Quality Inspection,Item Serial No,item Serial No
 apps/erpnext/erpnext/controllers/status_updater.py +142,{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 +57,Total Present,စုစုပေါင်းလက်ရှိ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Hour,နာရီ
+apps/erpnext/erpnext/public/js/setup_wizard.js +363,Hour,နာရီ
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +138,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation",Serial Item {0} စတော့အိတ်ပြန်လည်ရင်ကြားစေ့ရေးကို အသုံးပြု. \ updated မရနိုင်ပါ
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +488,Transfer Material to Supplier,ပေးသွင်းဖို့ပစ္စည်းလွှဲပြောင်း
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +513,Transfer Material to Supplier,ပေးသွင်းဖို့ပစ္စည်းလွှဲပြောင်း
 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,နယူး Serial No ဂိုဒေါင်ရှိသည်မဟုတ်နိုင်။ ဂိုဒေါင်စတော့အိတ် Entry &#39;သို့မဟုတ်ဝယ်ယူခြင်းပြေစာအားဖြင့်သတ်မှတ်ထားရမည်
 DocType: Lead,Lead Type,ခဲ Type
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +82,Create Quotation,စျေးနှုန်း Create
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +306,All these items have already been invoiced,အားလုံးသည်ဤပစ္စည်းများကိုပြီးသား invoiced ပြီ
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,You are not authorized to approve leaves on Block Dates,သငျသညျ Block ကိုနေ့အပေါ်အရွက်အတည်ပြုခွင့်ကြသည်မဟုတ်
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +311,All these items have already been invoiced,အားလုံးသည်ဤပစ္စည်းများကိုပြီးသား invoiced ပြီ
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},{0} ကအတည်ပြုနိုင်ပါတယ်
 DocType: Shipping Rule,Shipping Rule Conditions,သဘောင်္တင်ခ Rule စည်းကမ်းချက်များ
 DocType: BOM Replace Tool,The new BOM after replacement,အစားထိုးပြီးနောက်အသစ် BOM
 DocType: Features Setup,Point of Sale,ရောင်းမည်၏ပွိုင့်
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +83,Curling,များအဖြစ်
 DocType: Account,Tax,အခွန်
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +28,Row {0}: {1} is not a valid {2},row {0}: {1} တရားဝင် {2} မဟုတ်ပါဘူး
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +89,Refining,သန့်စင်
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +37,Row {0}: {1} is not a valid {2},row {0}: {1} တရားဝင် {2} မဟုတ်ပါဘူး
 DocType: Production Planning Tool,Production Planning Tool,ထုတ်လုပ်မှုစီမံကိန်း Tool ကို
 DocType: Quality Inspection,Report Date,အစီရင်ခံစာနေ့စွဲ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +130,Routing,routing
 DocType: C-Form,Invoices,ငွေတောင်းခံလွှာ
 DocType: Job Opening,Job Title,အလုပ်အကိုင်အမည်
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +80,{0} Recipients,{0} လက်ခံရယူ
@@ -2856,14 +2743,13 @@
 DocType: DocType,Setup,တည်ဆောက်သည်
 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,ဒီလအတှကျအကျဉ်းချုပ်နှင့် Pend လှုပ်ရှားမှုများ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +39,Cold rolling,အေးလှိမ့်
 DocType: Customer Group,Customer Group Name,ဖောက်သည်အုပ်စုအမည်
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +408,Please remove this Invoice {0} from C-Form {1},C-Form တွင် {1} ကနေဒီပြေစာ {0} ကိုဖယ်ရှား ကျေးဇူးပြု.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +410,Please remove this Invoice {0} from C-Form {1},C-Form တွင် {1} ကနေဒီပြေစာ {0} ကိုဖယ်ရှား ကျေးဇူးပြု.
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,သင်တို့သည်လည်းယခင်ဘဏ္ဍာနှစ်ရဲ့ချိန်ခွင်လျှာဒီဘဏ္ဍာနှစ်မှပင်အရွက်ကိုထည့်သွင်းရန်လိုလျှင် Forward ပို့ကို select ကျေးဇူးပြု.
 DocType: GL Entry,Against Voucher Type,ဘောက်ချာ Type ဆန့်ကျင်
 DocType: Item,Attributes,Attribute တွေ
 DocType: Packing Slip,Get Items,ပစ္စည်းများ Get
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +186,Please enter Write Off Account,အကောင့်ပိတ်ရေးထားရိုက်ထည့်ပေးပါ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +187,Please enter Write Off Account,အကောင့်ပိတ်ရေးထားရိုက်ထည့်ပေးပါ
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +71,Last Order Date,နောက်ဆုံးအမိန့်နေ့စွဲ
 DocType: DocField,Image,image
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +179,Make Excise Invoice,ယစ်မျိုးပြေစာလုပ်ပါ
@@ -2873,7 +2759,7 @@
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +146,Operation ID not set,စစ်ဆင်ရေး ID ကိုစွဲလမ်းခြင်းမ
 DocType: Production Order,Planned Start Date,စီစဉ်ထား Start ကိုနေ့စွဲ
 DocType: Serial No,Creation Document Type,ဖန်ဆင်းခြင်း Document ဖိုင် Type
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +620,Maint. Visit,maint ။ အလည်အပတ်သွားရောက်
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +631,Maint. Visit,maint ။ အလည်အပတ်သွားရောက်
 DocType: Leave Type,Is Encash,Encash ဖြစ်ပါသည်
 DocType: Purchase Invoice,Mobile No,မိုဘိုင်းလ်မရှိပါ
 DocType: Payment Tool,Make Journal Entry,ဂျာနယ် Entry &#39;ပါစေ
@@ -2881,35 +2767,31 @@
 apps/erpnext/erpnext/controllers/trends.py +257,Project-wise data is not available for Quotation,Project သည်ပညာ data တွေကိုစျေးနှုန်းသည်မရရှိနိုင်ပါသည်
 DocType: Project,Expected End Date,မျှော်လင့်ထားသည့်အဆုံးနေ့စွဲ
 DocType: Appraisal Template,Appraisal Template Title,စိစစ်ရေး Template: ခေါင်းစဉ်မရှိ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +440,Commercial,ကုန်သွယ်လုပ်ငန်းခွန်
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +378,Commercial,ကုန်သွယ်လုပ်ငန်းခွန်
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +23,Parent Item {0} must not be a Stock Item,မိဘတစ် Item {0} တစ်စတော့အိတ်ပစ္စည်းမဖြစ်ရပါမည်
 DocType: Cost Center,Distribution Id,ဖြန့်ဖြူး Id
-apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +14,Awesome Services,Awesome ကိုန်ဆောင်မှုများ
+apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +14,Awesome Services,Awesome ကိုန်ဆောင်မှုများ
 apps/erpnext/erpnext/config/manufacturing.py +29,All Products or Services.,အားလုံးသည်ထုတ်ကုန်များသို့မဟုတ်န်ဆောင်မှုများ။
 DocType: Purchase Invoice,Supplier Address,ပေးသွင်းလိပ်စာ
 DocType: Contact Us Settings,Address Line 2,လိပ်စာလိုင်း 2
 DocType: ToDo,Reference,အညွှန်း
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +59,Perforating,Perforating
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,Qty out
 apps/erpnext/erpnext/config/accounts.py +128,Rules to calculate shipping amount for a sale,ရောင်းချမှုသည်ရေကြောင်းပမာဏကိုတွက်ချက်ရန်စည်းမျဉ်းများ
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +29,Series is mandatory,စီးရီးမသင်မနေရ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +28,Financial Services,ဘဏ္ဍာရေးန်ဆောင်မှုများ
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,ဘဏ္ဍာရေးန်ဆောင်မှုများ
 apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3},Attribute တန်ဖိုး {0} {1} {3} ၏ထပ်တိုး {2} မှများ၏အကွာအဝေးအတွင်းဖြစ်ရပါမည်
 DocType: Tax Rule,Sales,အရောင်း
 DocType: Stock Entry Detail,Basic Amount,အခြေခံပညာပမာဏ
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +173,Warehouse required for stock Item {0},စတော့ရှယ်ယာ Item {0} လိုအပ်ဂိုဒေါင်
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +178,Warehouse required for stock Item {0},စတော့ရှယ်ယာ Item {0} လိုအပ်ဂိုဒေါင်
 DocType: Leave Allocation,Unused leaves,အသုံးမပြုသောအရွက်
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,Cr
 DocType: Customer,Default Receivable Accounts,default receiver Accounts ကို
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +102,Sawing,Sawing
 DocType: Tax Rule,Billing State,ငွေတောင်းခံပြည်နယ်
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +32,Laminating,ဖျင်
 DocType: Item Reorder,Transfer,လွှဲပြောင်း
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +549,Fetch exploded BOM (including sub-assemblies),(Sub-အသင်းတော်များအပါအဝင်) ပေါက်ကွဲခဲ့ BOM Fetch
 DocType: Authorization Rule,Applicable To (Employee),(န်ထမ်း) ရန်သက်ဆိုင်သော
 apps/erpnext/erpnext/controllers/accounts_controller.py +101,Due Date is mandatory,ကြောင့်နေ့စွဲမသင်မနေရ
 apps/erpnext/erpnext/controllers/item_variant.py +51,Increment for Attribute {0} cannot be 0,Attribute {0} ပါ 0 င်မဖွစျနိုငျဘို့ increment
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +143,Sintering,Sintering
 DocType: Journal Entry,Pay To / Recd From,From / Recd ရန်ပေးဆောင်
 DocType: Naming Series,Setup Series,Setup ကိုစီးရီး
 DocType: Supplier,Contact HTML,ဆက်သွယ်ရန် HTML ကို
@@ -2922,7 +2804,6 @@
 DocType: Attendance,Absent,မရှိသော
 DocType: Product Bundle,Product Bundle,ထုတ်ကုန်ပစ္စည်း Bundle ကို
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +180,Row {0}: Invalid reference {1},row {0}: မမှန်ကန်ခြင်းရည်ညွှန်းကိုးကား {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +165,Crushing,ကြိတ်ခွဲ
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,အခွန်နှင့်စွပ်စွဲချက် Template ဝယ်ယူ
 DocType: Upload Attendance,Download Template,ဒေါင်းလုပ် Template:
 DocType: GL Entry,Remarks,အမှာစကား
@@ -2930,14 +2811,12 @@
 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.,တစ် Serial နံပါတ်ထည့်သွင်းခြင်းစံချိန်တင်
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +9,Continuous casting,စဉ်ဆက်မပြတ်သွန်း
 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/setup/page/setup_wizard/fixtures/operations.py +80,Cold sizing,အေးအရွယ်အစားညှိ
 DocType: Salary Slip,Earning & Deduction,ဝင်ငွေ &amp; ထုတ်ယူ
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +76,Account {0} cannot be a Group,အကောင့်ကို {0} တစ်ဦးအုပ်စုမဖွစျနိုငျ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +259,Region,ဒေသ
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +314,Region,ဒေသ
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +213,Optional. This setting will be used to filter in various transactions.,optional ။ ဒီ setting ကိုအမျိုးမျိုးသောငွေကြေးလွှဲပြောင်းမှုမှာ filter မှအသုံးပြုလိမ့်မည်။
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +104,Negative Valuation Rate is not allowed,negative အကောက်ခွန်တန်ဖိုးသတ်မှတ်မည် Rate ခွင့်မပြု
 DocType: Holiday List,Weekly Off,အပတ်စဉ်ထုတ်ပိတ်
@@ -2955,7 +2834,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,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,နေ့စွဲရန်နေ့စွဲနှင့်တက်ရောက် မှစ. တက်ရောက်သူမသင်မနေရ
-apps/erpnext/erpnext/controllers/buying_controller.py +131,Please enter 'Is Subcontracted' as Yes or No,ရိုက်ထည့်ပေးပါဟုတ်ကဲ့သို့မဟုတ်မရှိပါအဖြစ် &#39;&#39; Subcontracted သည် &#39;&#39;
+apps/erpnext/erpnext/controllers/buying_controller.py +122,Please enter 'Is Subcontracted' as Yes or No,ရိုက်ထည့်ပေးပါဟုတ်ကဲ့သို့မဟုတ်မရှိပါအဖြစ် &#39;&#39; Subcontracted သည် &#39;&#39;
 DocType: Sales Team,Contact No.,ဆက်သွယ်ရန်အမှတ်
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,'Profit and Loss' type account {0} not allowed in Opening Entry,Entry &#39;ဖွင့်လှစ်ခွင့်ပြုမ&#39; &#39;အကျိုးအမြတ်နှင့်ဆုံးရှုံးမှု&#39; &#39;type ကိုအကောင့်ကို {0}
 DocType: Workflow State,Time,အချိန်
@@ -2964,14 +2843,13 @@
 DocType: Authorization Rule,Authorization Rule,authorization Rule
 DocType: Sales Invoice,Terms and Conditions Details,စည်းကမ်းသတ်မှတ်ချက်များအသေးစိတ်ကို
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,အရောင်းအခွန်နှင့်စွပ်စွဲချက် Template:
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +10,Apparel & Accessories,အဝတ်အထည်နှင့်ဆက်စပ်ပစ္စည်းများ
+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,အမိန့်အရေအတွက်
 DocType: Item Group,HTML / Banner that will show on the top of product list.,ထုတ်ကုန်စာရင်း၏ထိပ်ပေါ်မှာပြလတံ့သောက HTML / Banner ။
 DocType: Shipping Rule,Specify conditions to calculate shipping amount,ရေကြောင်းပမာဏကိုတွက်ချက်ရန်အခြေအနေများကိုသတ်မှတ်
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +121,Add Child,ကလေး Add
 DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,Frozen Accounts ကို &amp; Edit ကိုအေးခဲ Entries Set မှ Allowed အခန်းကဏ္ဍ
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +52,Cannot convert Cost Center to ledger as it has child nodes,ဒါကြောင့်ကလေးဆုံမှတ်များရှိပါတယ်အဖြစ်လယ်ဂျာမှကုန်ကျစရိတ် Center က convert နိုင်ဘူး
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +47,Conversion Factor is required,ကူးပြောင်းခြင်း Factor လိုအပ်သည်
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +37,Serial #,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,Value တစ်ခု / ဖော်ပြချက်များ
@@ -2979,10 +2857,8 @@
 ,Customers Not Buying Since Long Time,ဖောက်သည်ကို Long အချိန်ကတည်းကဝယ်ယူမ
 DocType: Production Order,Expected Delivery Date,မျှော်လင့်ထားသည့် Delivery Date ကို
 apps/erpnext/erpnext/accounts/general_ledger.py +121,Debit and Credit not equal for {0} #{1}. Difference is {2}.,{0} # {1} တန်းတူမ debit နှင့် Credit ။ ခြားနားချက် {2} ဖြစ်ပါတယ်။
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +48,Bulging,Bulging
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +11,Evaporative-pattern casting,အငွေ့ပျံခြင်း-ပုံစံကိုသွန်း
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Entertainment Expenses,Entertainment ကအသုံးစရိတ်များ
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +195,Sales Invoice {0} must be cancelled before cancelling this Sales Order,အရောင်းပြေစာ {0} ဒီအရောင်းအမိန့်ကိုပယ်ဖျက်မီဖျက်သိမ်းရပါမည်
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +190,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.,ကို item {0} သည်သတ်မှတ်ထားသောမမှန်ကန်ခြင်းအရေအတွက်။ အရေအတွက် 0 င်ထက် သာ. ကြီးမြတ်ဖြစ်သင့်သည်။
@@ -3001,26 +2877,24 @@
 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 +241,Account: {0} with currency: {1} can not be selected,အကောင့်ဖွင်: {0} ငွေကြေးနှင့်အတူ: {1} ကိုရှေးခယျြမရနိုငျ
+apps/erpnext/erpnext/controllers/accounts_controller.py +242,Account: {0} with currency: {1} can not be selected,အကောင့်ဖွင်: {0} ငွေကြေးနှင့်အတူ: {1} ကိုရှေးခယျြမရနိုငျ
 DocType: Bank Reconciliation Detail,Cheque Date,Cheques နေ့စွဲ
 apps/erpnext/erpnext/accounts/doctype/account/account.py +47,Account {0}: Parent account {1} does not belong to company: {2},အကောင့်ကို {0}: မိဘအကောင့်ကို {1} ကုမ္ပဏီပိုင်ပါဘူး: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted all transactions related to this company!,အောင်မြင်စွာဒီကုမ္ပဏီနှင့်ဆက်စပ်သောအားလုံးအရောင်းအဖျက်ပြီး!
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,နေ့စွဲအပေါ်အဖြစ်
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +111,Honing,Honing
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +58,Probation,အစမ်းထား
-apps/erpnext/erpnext/stock/doctype/item/item.py +264,Default Warehouse is mandatory for stock Item.,default ဂိုဒေါင်စတော့ရှယ်ယာ Item တွေအတွက်မဖြစ်မနေဖြစ်ပါတယ်။
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Probation,အစမ်းထား
+apps/erpnext/erpnext/stock/doctype/item/item.py +268,Default Warehouse is mandatory for stock Item.,default ဂိုဒေါင်စတော့ရှယ်ယာ Item တွေအတွက်မဖြစ်မနေဖြစ်ပါတယ်။
 DocType: Feed,Full Name,နာမည်အပြည့်အစုံ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +148,Clinching,Clinching
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +191,Payment of salary for the month {0} and year {1},လ {0} သည်လစာ၏ငွေပေးချေမှုရမည့်နှင့်တစ်နှစ် {1}
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +173,Payment of salary for the month {0} and year {1},လ {0} သည်လစာ၏ငွေပေးချေမှုရမည့်နှင့်တစ်နှစ် {1}
 DocType: Stock Settings,Auto insert Price List rate if missing,auto INSERT စျေးနှုန်းကိုစာရင်းနှုန်းကပျောက်ဆုံးနေဆဲလျှင်
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,စုစုပေါင်း Paid ငွေပမာဏ
 ,Transferred Qty,လွှဲပြောင်း Qty
 apps/erpnext/erpnext/config/learn.py +11,Navigating,Navigator
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +137,Planning,စီမံကိန်း
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +137,Planning,စီမံကိန်း
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +9,Make Time Log Batch,အချိန်အထဲ Batch လုပ်ပါ
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Issued,ထုတ်ပြန်သည်
 DocType: Project,Total Billing Amount (via Time Logs),(အချိန် Logs ကနေတဆင့်) စုစုပေါင်း Billing ငွေပမာဏ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +629,We sell this Item,ကျွန်ုပ်တို့သည်ဤ Item ရောင်းချ
+apps/erpnext/erpnext/public/js/setup_wizard.js +365,We sell this Item,ကျွန်ုပ်တို့သည်ဤ Item ရောင်းချ
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +65,Supplier Id,ပေးသွင်း Id
 DocType: Journal Entry,Cash Entry,ငွေသား Entry &#39;
 DocType: Sales Partner,Contact Desc,ဆက်သွယ်ရန် Desc
@@ -3029,18 +2903,16 @@
 DocType: Brand,Item Manager,item Manager က
 DocType: Cost Center,Add rows to set annual budgets on Accounts.,Accounts ကိုအပေါ်နှစ်စဉ်ဘတ်ဂျက်တင်ထားရန်တန်းစီထည့်ပါ။
 DocType: Buying Settings,Default Supplier Type,default ပေးသွင်း Type
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +160,Quarrying,Quarrying
 DocType: Production Order,Total Operating Cost,စုစုပေါင်း Operating ကုန်ကျစရိတ်
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +160,Note: Item {0} entered multiple times,မှတ်စု: Item {0} အကြိမ်ပေါင်းများစွာသို့ဝင်
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +163,Note: Item {0} entered multiple times,မှတ်စု: Item {0} အကြိမ်ပေါင်းများစွာသို့ဝင်
 apps/erpnext/erpnext/config/crm.py +27,All Contacts.,အားလုံးသည်ဆက်သွယ်ရန်။
 DocType: Newsletter,Test Email Id,စမ်းသပ်မှုအီးမေးလ် Id
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +394,Company Abbreviation,ကုမ္ပဏီအတိုကောက်
+apps/erpnext/erpnext/public/js/setup_wizard.js +142,Company Abbreviation,ကုမ္ပဏီအတိုကောက်
 DocType: Features Setup,If you follow Quality Inspection. Enables Item QA Required and QA No in Purchase Receipt,သင်အရည်အသွေးစစ်ဆေးရေးအတိုင်းလိုက်နာပါ။ Item QA လိုအပ်ပါသည်နှင့် QA မရှိဝယ်ယူခြင်းပြေစာအတွက်နိုင်ပါတယ်
 DocType: GL Entry,Party Type,ပါတီ Type
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +68,Raw material cannot be same as main Item,ကုန်ကြမ်းအဓိက Item အဖြစ်အတူတူမဖွစျနိုငျ
 DocType: Item Attribute Value,Abbreviation,အကျဉ်း
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,{0} ကန့်သတ်ထက်ကျော်လွန်ပြီးကတည်းက authroized မဟုတ်
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +30,Rotational molding,Rotate အတု ယူ. ပုံသှငျး
 apps/erpnext/erpnext/config/hr.py +115,Salary template master.,လစာ template ကိုမာစတာ။
 DocType: Leave Type,Max Days Leave Allowed,max Days ထွက်ခွာခွင့်ပြု
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +55,Set Tax Rule for shopping cart,စျေးဝယ်လှည်းများအတွက်အခွန်နည်းဥပဒေ Set
@@ -3054,15 +2926,15 @@
 apps/erpnext/erpnext/config/selling.py +18,Quotes to Leads or Customers.,ခဲသို့မဟုတ် Customer များ quotes ။
 DocType: Stock Settings,Role Allowed to edit frozen stock,အေးခဲစတော့ရှယ်ယာတည်းဖြတ်ရန် Allowed အခန်းကဏ္ဍ
 ,Territory Target Variance Item Group-Wise,နယ်မြေတွေကို Target ကကှဲလှဲ Item Group မှ-ပညာရှိ
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +101,All Customer Groups,အားလုံးသည်ဖောက်သည်အဖွဲ့များ
-apps/erpnext/erpnext/controllers/accounts_controller.py +474,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} မဖြစ်မနေဖြစ်ပါတယ်။ ဖြစ်ရင်ငွေကြေးစနစ်ချိန်းစံချိန် {1} {2} မှဖန်တီးသည်မဟုတ်။
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +101,All Customer Groups,အားလုံးသည်ဖောက်သည်အဖွဲ့များ
+apps/erpnext/erpnext/controllers/accounts_controller.py +475,{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.,အခွန် Template ကိုမဖြစ်မနေဖြစ်ပါတယ်။
 apps/erpnext/erpnext/accounts/doctype/account/account.py +41,Account {0}: Parent account {1} does not exist,အကောင့်ကို {0}: မိဘအကောင့်ကို {1} မတည်ရှိပါဘူး
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),စျေးနှုန်း List ကို Rate (ကုမ္ပဏီငွေကြေးစနစ်)
 DocType: Account,Temporary,ယာယီ
 DocType: Address,Preferred Billing Address,ပိုဦးစားပေးသည် Billing လိပ်စာ
 DocType: Monthly Distribution Percentage,Percentage Allocation,ရာခိုင်နှုန်းဖြန့်ဝေ
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +86,Secretary,အတွင်းဝန်
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Secretary,အတွင်းဝန်
 DocType: Serial No,Distinct unit of an Item,တစ်ဦး Item ၏ထူးခြားသောယူနစ်
 DocType: Pricing Rule,Buying,ဝယ်
 DocType: HR Settings,Employee Records to be created by,အသုံးပြုနေသူများကဖန်တီးခံရဖို့ဝန်ထမ်းမှတ်တမ်း
@@ -3075,9 +2947,8 @@
 ,Item-wise Price List Rate,item ပညာစျေးနှုန်း List ကို Rate
 DocType: Purchase Order Item,Supplier Quotation,ပေးသွင်းစျေးနှုန်း
 DocType: Quotation,In Words will be visible once you save the Quotation.,သင်စျေးနှုန်းကိုကယ်တင်တစ်ချိန်ကစကားမြင်နိုင်ပါလိမ့်မည်။
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +68,Ironing,သံ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is stopped,{0} {1} ရပ်တန့်နေသည်
-apps/erpnext/erpnext/stock/doctype/item/item.py +352,Barcode {0} already used in Item {1},Barcode {0} ပြီးသား Item {1} များတွင်အသုံးပြု
+apps/erpnext/erpnext/stock/doctype/item/item.py +356,Barcode {0} already used in Item {1},Barcode {0} ပြီးသား Item {1} များတွင်အသုံးပြု
 DocType: Lead,Add to calendar on this date,ဒီနေ့စွဲအပေါ်ပြက္ခဒိန်မှ Add
 apps/erpnext/erpnext/config/selling.py +132,Rules for adding shipping costs.,သင်္ဘောစရိတ်ပေါင်းထည့်သည်နည်းဥပဒေများ။
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,လာမည့်အဖြစ်အပျက်များ
@@ -3086,27 +2957,25 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +27,Quick Entry,လျင်မြန်စွာ Entry &#39;
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0} သို့ပြန်သွားသည်တွေအတွက်မဖြစ်မနေဖြစ်ပါသည်
 DocType: Purchase Order,To Receive,လက်ခံမှ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +33,Shrink fitting,သငျ့ကျုံ့
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +522,user@example.com,user@example.com
+apps/erpnext/erpnext/public/js/setup_wizard.js +266,user@example.com,user@example.com
 DocType: Email Digest,Income / Expense,ဝင်ငွေခွန် / သုံးစွဲမှု
 DocType: Employee,Personal Email,ပုဂ္ဂိုလ်ရေးအီးမေးလ်
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +58,Total Variance,စုစုပေါင်းကှဲလှဲ
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +62,Total Variance,စုစုပေါင်းကှဲလှဲ
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.","enabled လျှင်, system ကိုအလိုအလျှောက်စာရင်းသည်စာရင်းကိုင် entries တွေကို post လိမ့်မည်။"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +15,Brokerage,brokerage
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +15,Brokerage,brokerage
 DocType: Address,Postal Code,စာတိုက်သင်္ကေတ
 DocType: Production Order Operation,"in Minutes
 Updated via 'Time Log'",&#39;&#39; အချိန်အထဲ &#39;&#39; ကနေတဆင့် Updated မိနစ်အနည်းငယ်အတွက်
 DocType: Customer,From Lead,ခဲကနေ
 apps/erpnext/erpnext/config/manufacturing.py +19,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 +442,POS Profile required to make POS Entry,POS Entry &#39;ပါစေရန်လိုအပ်သည် POS ကိုယ်ရေးအချက်အလက်များ profile
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +444,POS Profile required to make POS Entry,POS Entry &#39;ပါစေရန်လိုအပ်သည် POS ကိုယ်ရေးအချက်အလက်များ profile
 DocType: Hub Settings,Name Token,Token အမည်
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +106,Planing,လေယာဉ်
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Selling,စံရောင်းချသည့်
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +120,Standard Selling,စံရောင်းချသည့်
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +137,Atleast one warehouse is mandatory,Atleast တယောက်ဂိုဒေါင်မသင်မနေရ
 DocType: Serial No,Out of Warranty,အာမခံထဲက
 DocType: BOM Replace Tool,Replace,အစားထိုးဖို့
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +314,{0} against Sales Invoice {1},{0} အရောင်းပြေစာ {1} ဆန့်ကျင်
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +316,{0} against Sales Invoice {1},{0} အရောင်းပြေစာ {1} ဆန့်ကျင်
 apps/erpnext/erpnext/stock/doctype/item/item.py +49,Please enter default Unit of Measure,တိုင်း၏ default အနေနဲ့ယူနစ်ကိုရိုက်ထည့်ပေးပါ
 DocType: Purchase Invoice Item,Project Name,စီမံကိန်းအမည်
 DocType: Supplier,Mention if non-standard receivable account,Non-စံ receiver အကောင့်ကိုလျှင်ဖော်ပြထားခြင်း
@@ -3122,9 +2991,8 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,Journal Entry {0} does not have account {1} or already matched against other voucher,ဂျာနယ် Entry &#39;{0} အကောင့်ကို {1} များသို့မဟုတ်ပြီးသားအခြားဘောက်ချာဆန့်ကျင်လိုက်ဖက်ပါဘူး
 DocType: Item,Moving Average,ပျမ်းမျှ Moving
 DocType: BOM Replace Tool,The BOM which will be replaced,အဆိုပါ BOM အစားထိုးခံရလိမ့်မည်ဟူသော
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +43,New Stock UOM must be different from current stock UOM,နယူးစတော့အိတ် UOM လက်ရှိစတော့ရှယ်ယာထံမှကွဲပြားခြားနားဖြစ်ရမည် UOM
 DocType: Account,Debit,debit
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +34,Leaves must be allocated in multiples of 0.5,အရွက် 0.5 အလီလီခွဲဝေရမည်
+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 file ကိုထံမှတက်ရောက်သူ upload
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,ထူးချွန် Amt
@@ -3142,8 +3010,7 @@
 DocType: Employee,Internal Work History,internal လုပ်ငန်းသမိုင်း
 DocType: DocField,Column Break,ကော်လံ Break
 DocType: Event,Thursday,ကြာသပတေးနေ့
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +42,Private Equity,ပုဂ္ဂလိက Equity
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +93,Turning,အချိုးအကွေ့
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,ပုဂ္ဂလိက Equity
 DocType: Maintenance Visit,Customer Feedback,customer တုံ့ပြန်ချက်
 DocType: Account,Expense,သုံးငှေ
 DocType: Sales Invoice,Exhibition,ပွပှဲ
@@ -3156,19 +3023,19 @@
 DocType: Employee,Held On,တွင်ကျင်းပ
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +33,Production Item,ထုတ်လုပ်မှု Item
 ,Employee Information,ဝန်ထမ်းပြန်ကြားရေး
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,Rate (%),rate (%)
+apps/erpnext/erpnext/public/js/setup_wizard.js +294,Rate (%),rate (%)
 DocType: Stock Entry Detail,Additional Cost,အပိုဆောင်းကုန်ကျစရိတ်
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +407,Financial Year End Date,ဘဏ္ဍာရေးတစ်နှစ်တာအဆုံးနေ့စွဲ
+apps/erpnext/erpnext/public/js/setup_wizard.js +155,Financial Year End Date,ဘဏ္ဍာရေးတစ်နှစ်တာအဆုံးနေ့စွဲ
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Voucher No, if grouped by Voucher","ဘောက်ချာများကအုပ်စုဖွဲ့လျှင်, voucher မရှိပါအပေါ်အခြေခံပြီး filter နိုင်ဘူး"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +484,Make Supplier Quotation,ပေးသွင်းစျေးနှုန်းလုပ်ပါ
 DocType: Quality Inspection,Incoming,incoming
 DocType: BOM,Materials Required (Exploded),လိုအပ်သောပစ္စည်းများ (ပေါက်ကွဲ)
 DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),Pay (LWP) မရှိရင်ထွက်ခွာသည်အလုပ်လုပ်ပြီးဝင်ငွေကိုလျော့ချ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +512,"Add users to your organization, other than yourself","ကိုယ့်ကိုကိုယ်ထက်အခြား, သင့်အဖွဲ့အစည်းမှအသုံးပြုသူများကို Add"
+apps/erpnext/erpnext/public/js/setup_wizard.js +256,"Add users to your organization, other than yourself","ကိုယ့်ကိုကိုယ်ထက်အခြား, သင့်အဖွဲ့အစည်းမှအသုံးပြုသူများကို Add"
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No {1} does not match with {2} {3},row # {0}: Serial မရှိပါ {1} {2} {3} နှင့်ကိုက်ညီမပါဘူး
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +44,Casual Leave,ကျပန်းထွက်ခွာ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +44,Casual Leave,ကျပန်းထွက်ခွာ
 DocType: Batch,Batch ID,batch ID ကို
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +334,Note: {0},မှတ်စု: {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +336,Note: {0},မှတ်စု: {0}
 ,Delivery Note Trends,Delivery မှတ်ချက်ခေတ်ရေစီးကြောင်း
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +104,This Week's Summary,This Week ရဲ့အကျဉ်းချုပ်
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +74,{0} must be a Purchased or Sub-Contracted Item in row {1},{0} အတန်း {1} အတွက်ဝယ်ယူသို့မဟုတ် Sub-စာချုပ်ချုပ်ဆို Item ဖြစ်ရမည်
@@ -3180,7 +3047,7 @@
 DocType: Purchase Receipt,Return Against Purchase Receipt,ဝယ်ယူခြင်းပြေစာဆန့်ကျင်သို့ပြန်သွားသည်
 DocType: Purchase Order,To Bill,ဘီလ်မှ
 DocType: Material Request,% Ordered,% မိန့်ထုတ်
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +61,Piecework,Piecework
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Piecework,Piecework
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +64,Avg. Buying Rate,AVG ။ ဝယ်ယူ Rate
 DocType: Task,Actual Time (in Hours),(နာရီအတွက်) အမှန်တကယ်အချိန်
 DocType: Employee,History In Company,ကုမ္ပဏီခုနှစ်တွင်သမိုင်းကြောင်း
@@ -3197,13 +3064,13 @@
 DocType: Opportunity,To Discuss,ဆွေးနွေးသည်မှ
 DocType: SMS Settings,SMS Settings,SMS ကို Settings ကို
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +60,Temporary Accounts,ယာယီ Accounts ကို
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +155,Black,black
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Black,black
 DocType: BOM Explosion Item,BOM Explosion Item,BOM ပေါက်ကွဲမှုဖြစ် Item
 DocType: Account,Auditor,စာရင်းစစ်ချုပ်
 DocType: Purchase Order,End date of current order's period,လက်ရှိအမိန့်ရဲ့ကာလ၏အဆုံးနေ့စွဲ
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +17,Make Offer Letter,ကမ်းလှမ်းချက်ပေးစာလုပ်ပါ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +10,Return,ပြန်လာ
-apps/erpnext/erpnext/stock/doctype/item/item.py +503,Default Unit of Measure for Variant must be same as Template,Variant များအတွက်တိုင်း၏ default အနေနဲ့ Unit မှ Template ကိုအဖြစ်အတူတူဖြစ်ရပါမည်
+apps/erpnext/erpnext/stock/doctype/item/item.py +507,Default Unit of Measure for Variant must be same as Template,Variant များအတွက်တိုင်း၏ default အနေနဲ့ Unit မှ Template ကိုအဖြစ်အတူတူဖြစ်ရပါမည်
 DocType: DocField,Fold,ခေါက်
 DocType: Production Order Operation,Production Order Operation,ထုတ်လုပ်မှုအမိန့်စစ်ဆင်ရေး
 DocType: Pricing Rule,Disable,ကို disable
@@ -3214,13 +3081,12 @@
 DocType: Page,Page Name,စာမျက်နှာအမည်
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +110,To Time must be greater than From Time,အချိန်မှအချိန် မှစ. ထက် သာ. ကြီးမြတ်ဖြစ်ရမည်
 DocType: Journal Entry Account,Exchange Rate,ငွေလဲလှယ်နှုန်း
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +465,Sales Order {0} is not submitted,အရောင်းအမိန့် {0} တင်သွင်းသည်မဟုတ်
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +467,Sales Order {0} is not submitted,အရောင်းအမိန့် {0} တင်သွင်းသည်မဟုတ်
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0}: Parent account {1} does not bolong to the company {2},ဂိုဒေါင် {0}: မိဘအကောင့်ကို {1} ကုမ္ပဏီက {2} မှ bolong ပါဘူး
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +124,Spindle finishing,ဗိုင်းလိပ်တံပြီး
 DocType: BOM,Last Purchase Rate,နောက်ဆုံးဝယ်ယူ Rate
 DocType: Account,Asset,Asset
 DocType: Project Task,Task ID,Task ID ကို
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +395,"e.g. ""MC""",ဥပမာ &quot;MC&quot;
+apps/erpnext/erpnext/public/js/setup_wizard.js +143,"e.g. ""MC""",ဥပမာ &quot;MC&quot;
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,Stock cannot exist for Item {0} since has variants,မျိုးကွဲရှိပါတယ်ကတည်းကစတော့အိတ် Item {0} သည်မတည်ရှိနိုင်
 ,Sales Person-wise Transaction Summary,အရောင်းပုဂ္ဂိုလ်ပညာ Transaction အကျဉ်းချုပ်
 DocType: System Settings,Time Zone,အချိန်ဇုန်
@@ -3229,9 +3095,7 @@
 DocType: Monthly Distribution,Monthly Distribution Percentages,လစဉ်ဖြန့်ဖြူးရာခိုင်နှုန်း
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +16,The selected item cannot have Batch,ရွေးချယ်ထားတဲ့ item Batch ရှိသည်မဟုတ်နိုင်
 DocType: Delivery Note,% of materials delivered against this Delivery Note,ဒီ Delivery Note ကိုဆန့်ကျင်ကယ်နှုတ်တော်မူ၏ပစ္စည်း%
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +151,Stapling,Staples
 DocType: Customer,Customer Details,customer အသေးစိတ်ကို
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +105,Shaping,ပုံဖော်
 DocType: Employee,Reports to,အစီရင်ခံစာများမှ
 DocType: SMS Settings,Enter url parameter for receiver nos,လက်ခံ nos သည် url parameter ကိုရိုက်ထည့်
 DocType: Sales Invoice,Paid Amount,Paid ငွေပမာဏ
@@ -3240,13 +3104,13 @@
 DocType: Item Variant,Item Variant,item Variant
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +15,Setting this Address Template as default as there is no other default,ငါမှတပါးအခြားသော default အရှိအဖြစ်ကို default အတိုင်းဤလိပ်စာ Template ပြင်ဆင်ခြင်း
 apps/erpnext/erpnext/accounts/doctype/account/account.py +89,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'",Debit ထဲမှာရှိပြီးသားအကောင့်ကိုချိန်ခွင်ကိုသင် &#39;&#39; Credit &#39;အဖြစ်&#39; &#39;Balance ဖြစ်ရမည်&#39; &#39;တင်ထားရန်ခွင့်ပြုမနေကြ
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +76,Quality Management,အရည်အသွေးအစီမံခန့်ခွဲမှု
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Quality Management,အရည်အသွေးအစီမံခန့်ခွဲမှု
 DocType: Production Planning Tool,Filter based on customer,ဖောက်သည်အပေါ်အခြေခံပြီး filter
 DocType: Payment Tool Detail,Against Voucher No,ဘောက်ချာမရှိဆန့်ကျင်
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +47,Please enter quantity for Item {0},Item {0} သည်အရေအတွက်ရိုက်ထည့်ပေးပါ
 DocType: Employee External Work History,Employee External Work History,ဝန်ထမ်းပြင်ပလုပ်ငန်းခွင်သမိုင်း
 DocType: Tax Rule,Purchase,ဝယ်ခြမ်း
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +34,Balance Qty,ချိန်ခွင် Qty
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Balance Qty,ချိန်ခွင် Qty
 DocType: Item Group,Parent Item Group,မိဘပစ္စည်းအုပ်စု
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +21,{0} for {1},{0} {1} သည်
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +96,Cost Centers,ကုန်ကျစရိတ်စင်တာများ
@@ -3256,12 +3120,12 @@
 DocType: Opportunity,Next Contact,Next ကိုဆက်သွယ်ရန်
 DocType: Employee,Employment Type,အလုပ်အကိုင်အခွင့်အကအမျိုးအစား
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,Fixed ပိုင်ဆိုင်မှုများ
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +84,Application period cannot be across two alocation records,ပလီကေးရှင်းကာလအတွင်းနှစ်ဦး alocation မှတ်တမ်းများကိုဖြတ်ပြီးမဖွစျနိုငျ
 DocType: Item Group,Default Expense Account,default သုံးစွဲမှုအကောင့်
 DocType: Employee,Notice (days),အသိပေးစာ (ရက်)
 DocType: Page,Yes,ဟုတ်ကဲ့
 DocType: Tax Rule,Sales Tax Template,အရောင်းခွန် Template ကို
 DocType: Employee,Encashment Date,Encashment နေ့စွဲ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +74,Electroforming,Electroforming
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +179,"Against Voucher Type must be one of Purchase Order, Purchase Invoice or Journal Entry","ဘောက်ချာ Type ဝယ်ယူခြင်းအမိန့်, ဝယ်ယူခြင်းပြေစာသို့မဟုတ်ဂျာနယ် Entry တယောက်ဖြစ်ရပါမည်ဆန့်ကျင်"
 DocType: Account,Stock Adjustment,စတော့အိတ် Adjustments
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +34,Default Activity Cost exists for Activity Type - {0},{0} - default လုပ်ဆောင်ချက်ကုန်ကျစရိတ်လုပ်ဆောင်ချက်ကအမျိုးအစားသည်တည်ရှိ
@@ -3297,12 +3161,12 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,စတော့ရှယ်ယာလယ်ဂျာ entry ကိုဒီကိုဂိုဒေါင်သည်တည်ရှိအဖြစ်ဂိုဒေါင်ဖျက်ပြီးမရနိုင်ပါ။
 DocType: Company,Distribution,ဖြန့်ဝေ
 apps/erpnext/erpnext/public/js/pos/pos.html +36,Amount Paid,Paid ငွေပမာဏ
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +91,Project Manager,စီမံကိန်းမန်နေဂျာ
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +72,Dispatch,dispatch
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Project Manager,စီမံကိန်းမန်နေဂျာ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +72,Dispatch,dispatch
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,item တခုကိုခွင့်ပြုထား max ကိုလျှော့စျေး: {0} သည် {1}%
 DocType: Customer,Default Taxes and Charges,Default အနေနဲ့အခွန်နှင့်စွပ်စွဲချက်
 DocType: Account,Receivable,receiver
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +268,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,row # {0}: ဝယ်ယူအ​​မိန့်ရှိနှင့်ပြီးသားအဖြစ်ပေးသွင်းပြောင်းလဲပစ်ရန်ခွင့်ပြုခဲ့မဟုတ်
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +263,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,row # {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.","checked လျှင်, Sub-ပရိသပစ္စည်းများသည် BOM ကုန်ကြမ်းဆိုတော့စဉ်းစားရလိမ့်မည်။ ဒီလိုမှမဟုတ်ရင်အားလုံးက sub-ပရိသတ်အပစ္စည်းများကိုတစ်ကုန်ကြမ်းအဖြစ်ကုသရလိမ့်မည်။"
@@ -3310,8 +3174,8 @@
 DocType: Hub Settings,Seller Description,ရောင်းချသူဖော်ပြချက်များ
 DocType: Employee Education,Qualification,အရည်အချင်း
 DocType: Item Price,Item Price,item စျေးနှုန်း
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +48,Soap & Detergent,ဆပ်ပြာ &amp; ဆပ်ပြာ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +36,Motion Picture & Video,Motion Picture &amp; ဗီဒီယို
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +48,Soap & Detergent,ဆပ်ပြာ &amp; ဆပ်ပြာ
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +36,Motion Picture & Video,Motion Picture &amp; ဗီဒီယို
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,အမိန့်ထုတ်
 DocType: Warehouse,Warehouse Name,ဂိုဒေါင်အမည်
 DocType: Naming Series,Select Transaction,Transaction ကိုရွေးပါ
@@ -3320,7 +3184,6 @@
 DocType: BOM,Rate Of Materials Based On,ပစ္စည်းများအခြေတွင်အမျိုးမျိုး rate
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,ပံ့ပိုးမှု Analtyics
 apps/erpnext/erpnext/accounts/doctype/accounts_settings/accounts_settings.py +27,Company is missing in warehouses {0},ကုမ္ပဏီဂိုဒေါင် {0} ပျောက်ဆုံးနေသည်
-DocType: Stock UOM Replace Utility,Stock UOM Replace Utility,စတော့အိတ် UOM Utility ကိုအစားထိုးပါ
 DocType: POS Profile,Terms and Conditions,စည်းကမ်းနှင့်သတ်မှတ်ချက်များ
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,To Date should be within the Fiscal Year. Assuming To Date = {0},နေ့စွဲဖို့ဘဏ္ဍာရေးနှစ်တစ်နှစ်တာအတွင်းတွင်သာဖြစ်သင့်သည်။ နေ့စွဲ = {0} နိုင်ရန်ယူဆ
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","ဒီနေရာတွင်အမြင့်, အလေးချိန်, ဓါတ်မတည်, ဆေးဘက်ဆိုင်ရာစိုးရိမ်ပူပန်မှုများစသည်တို့ကိုထိန်းသိမ်းထားနိုင်ပါတယ်"
@@ -3332,7 +3195,7 @@
 DocType: Sales Order Item,For Production,ထုတ်လုပ်မှုများအတွက်
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +103,Please enter sales order in the above table,အထက်ပါဇယားတွင်အရောင်းအမိန့်ကိုရိုက်ထည့်ပေးပါ
 DocType: Project Task,View Task,view Task
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +406,Your financial year begins on,သင့်ရဲ့ဘဏ္ဍာရေးနှစ်တွင်အပေါ်စတင်ခဲ့သည်
+apps/erpnext/erpnext/public/js/setup_wizard.js +154,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,ကြိုတင်ငွေရရှိထားသည့် Get
 DocType: Email Digest,Add/Remove Recipients,Add / Remove လက်ခံရယူ
@@ -3340,16 +3203,14 @@
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","Default အဖြစ်ဒီဘဏ္ဍာရေးနှစ်တစ်နှစ်တာတင်ထားရန်, &#39;&#39; Default အဖြစ်သတ်မှတ်ပါ &#39;&#39; ကို click လုပ်ပါ"
 apps/erpnext/erpnext/config/support.py +54,Setup incoming server for support email id. (e.g. support@example.com),အထောက်အပံ့အီးမေးလ်က id သည် Setup ကိုအဝင် server ကို။ (ဥပမာ support@example.com)
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,ပြတ်လပ်မှု Qty
-apps/erpnext/erpnext/stock/doctype/item/item.py +528,Item variant {0} exists with same attributes,item မူကွဲ {0} အတူတူ Attribute တွေနှင့်အတူတည်ရှိမှု့
+apps/erpnext/erpnext/stock/doctype/item/item.py +532,Item variant {0} exists with same attributes,item မူကွဲ {0} အတူတူ Attribute တွေနှင့်အတူတည်ရှိမှု့
 DocType: Salary Slip,Salary Slip,လစာစလစ်ဖြတ်ပိုင်းပုံစံ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +116,Burnishing,Burnishing
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +54,'To Date' is required,&#39;&#39; နေ့စွဲရန် &#39;&#39; လိုအပ်သည်
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,&#39;&#39; နေ့စွဲရန် &#39;&#39; လိုအပ်သည်
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","ကယ်နှုတ်တော်မူ၏ခံရဖို့အစုအထုပ်ကိုတနိုင်ငံအညွန့ထုပ်ပိုး Generate ။ package ကိုနံပါတ်, package ကို contents တွေကိုနှင့်၎င်း၏အလေးချိန်အကြောင်းကြားရန်အသုံးပြုခဲ့ကြသည်။"
 DocType: Sales Invoice Item,Sales Order Item,အရောင်းအမိန့် Item
 DocType: Salary Slip,Payment Days,ငွေပေးချေမှုရမည့်ကာလသ
 DocType: BOM,Manage cost of operations,စစ်ဆင်ရေး၏ကုန်ကျစရိတ် Manage
 DocType: Features Setup,Item Advanced,item ကို Advanced
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +40,Hot rolling,Hot လှိမ့်
 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.","ထို checked ကိစ္စများကိုမဆို &quot;Submitted&quot; အခါ, အီးမေးလ် pop-up တခုအလိုအလျှောက်ပူးတွဲမှုအဖြစ်အရောင်းအဝယ်နှင့်အတူကြောင့်အရောင်းအဝယ်အတွက်ဆက်စပ် &quot;ဆက်သွယ်ရန်&quot; ရန်အီးမေးလ်ပေးပို့ဖို့ဖွင့်လှစ်ခဲ့။ အသုံးပြုသူသို့မဟုတ်မပြုစေခြင်းငှါအီးမေးလ်ပို့ပါလိမ့်မည်။"
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,ကမ္ဘာလုံးဆိုင်ရာချိန်ညှိချက်များကို
 DocType: Employee Education,Employee Education,ဝန်ထမ်းပညာရေး
@@ -3362,25 +3223,23 @@
 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/setup/page/setup_wizard/install_fixtures.py +48,Sick Leave,နေမကောင်းထွက်ခွာ
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +174,Invalid {0},မမှန်ကန်ခြင်း {0}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +48,Sick Leave,နေမကောင်းထွက်ခွာ
 DocType: Email Digest,Email Digest,အီးမေးလ် Digest မဂ္ဂဇင်း
 DocType: Delivery Note,Billing Address Name,ငွေတောင်းခံလိပ်စာအမည်
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +22,Department Stores,ဦးစီးဌာနအရောင်းဆိုင်များ
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,ဦးစီးဌာနအရောင်းဆိုင်များ
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +40,System Balance,System ကို Balance
 DocType: Workflow,Is Active,Active ဖြစ်ပါတယ်
 apps/erpnext/erpnext/controllers/stock_controller.py +71,No accounting entries for the following warehouses,အောက်ပါသိုလှောင်ရုံမရှိပါစာရင်းကိုင် posts များ
 apps/erpnext/erpnext/projects/doctype/project/project.js +22,Save the document first.,ပထမဦးဆုံးစာရွက်စာတမ်း Save လိုက်ပါ။
 DocType: Account,Chargeable,နှော
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +121,Linishing,Linishing
 DocType: Company,Change Abbreviation,ပြောင်းလဲမှုအတိုကောက်
 DocType: Workflow State,Primary,မူလတန်း
 DocType: Expense Claim Detail,Expense Date,စရိတ်နေ့စွဲ
 DocType: Item,Max Discount (%),max လျှော့ (%)
 DocType: Communication,More Information,More Information ကို
 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/setup/page/setup_wizard/fixtures/operations.py +161,Blasting,ပေါက်ကွဲမှု
 DocType: Company,Warn,အသိပေး
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +111,Item valuation updated,item အဘိုးပြတ် updated
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","အခြားမည်သည့်သဘောထားမှတ်ချက်, မှတ်တမ်းများအတွက်သွားသင့်ကြောင်းမှတ်သားဖွယ်အားထုတ်မှု။"
 DocType: BOM,Manufacturing User,ကုန်ထုတ်လုပ်မှုအသုံးပြုသူတို့၏
 DocType: Purchase Order,Raw Materials Supplied,ပေးထားသည့်ကုန်ကြမ်းပစ္စည်းများ
@@ -3390,7 +3249,7 @@
 DocType: Appraisal,Appraisal Template,စိစစ်ရေး Template:
 DocType: Communication,Email,အီးမေးလ်
 DocType: Item Group,Item Classification,item ခွဲခြား
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +89,Business Development Manager,စီးပွားရေးဖွံ့ဖြိုးတိုးတက်ရေးမန်နေဂျာ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Business Development Manager,စီးပွားရေးဖွံ့ဖြိုးတိုးတက်ရေးမန်နေဂျာ
 DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,ပြုပြင်ထိန်းသိမ်းမှုခရီးစဉ်ရည်ရွယ်ချက်
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.js +15,Period,ကာလ
 ,General Ledger,အထွေထွေလယ်ဂျာ
@@ -3400,9 +3259,7 @@
 ,Itemwise Recommended Reorder Level,Itemwise Reorder အဆင့်အကြံပြုထား
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +264,Please select {0} first,ပထမဦးဆုံး {0} ကို select ကျေးဇူးပြု.
 DocType: Features Setup,To get Item Group in details table,အသေးစိတ်အချက်အလက်များကို table ထဲမှာ Item Group မှရရန်
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +67,Redrawing,Redrawing
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +112,Batch {0} of Item {1} has expired.,batch {0} Item ၏ {1} သက်တမ်းကုန်ဆုံးခဲ့သည်။
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +120,Etching,စွဲထင်
 DocType: Sales Invoice,Commission,ကော်မရှင်
 DocType: Address Template,"<h4>Default Template</h4>
 <p>Uses <a href=""http://jinja.pocoo.org/docs/templates/"">Jinja Templating</a> and all the fields of Address (including Custom Fields if any) will be available</p>
@@ -3436,7 +3293,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +340,Operation Time must be greater than 0 for Operation {0},စစ်ဆင်ရေးအချိန်ကစစ်ဆင်ရေး {0} များအတွက် 0 င်ထက် သာ. ကြီးမြတ်ဖြစ်ရပါမည်
 DocType: Supplier,Address and Contacts,လိပ်စာနှင့်ဆက်သွယ်ရန်
 DocType: UOM Conversion Detail,UOM Conversion Detail,UOM ကူးပြောင်းခြင်း Detail
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +496,Keep it web friendly 900px (w) by 100px (h),100px (ဇ) ကဝဘ်ဖော်ရွေ 900px (w) သည်ထိုပွဲကို
+apps/erpnext/erpnext/public/js/setup_wizard.js +242,Keep it web friendly 900px (w) by 100px (h),100px (ဇ) ကဝဘ်ဖော်ရွေ 900px (w) သည်ထိုပွဲကို
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +329,Production Order cannot be raised against a Item Template,ထုတ်လုပ်မှုအမိန့်တစ်ခု Item Template ဆန့်ကျင်ထမွောကျနိုငျမညျမဟု
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +44,Charges are updated in Purchase Receipt against each item,စွဲချက်အသီးအသီးကို item ဆန့်ကျင်ဝယ်ယူခြင်းပြေစာ Update လုပ်ပေး
 DocType: Payment Tool,Get Outstanding Vouchers,ထူးချွန် voucher Get
@@ -3452,54 +3309,49 @@
 DocType: Item,Average time taken by the supplier to deliver,ပျမ်းမျှအားဖြင့်အချိန်မကယ်မလွှတ်မှပေးသွင်းခြင်းဖြင့်ယူ
 DocType: Time Log,Hours,နာရီ
 DocType: Project,Expected Start Date,မျှော်လင့်ထားသည့် Start ကိုနေ့စွဲ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +38,Rolling,Rolling
 DocType: ToDo,Priority,ဦးစားပေး
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +41,Remove item if charges is not applicable to that item,စွဲချက်က item တခုကိုသက်ဆိုင်မဖြစ်လျှင်တဲ့ item Remove
 DocType: Dropbox Backup,Dropbox Access Allowed,Dropbox ကို Access က Allowed
 DocType: Dropbox Backup,Weekly,ရက်သတ္တပတ်တကြိမ်ဖြစ်သော
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,eg ။ smsgateway.com/api/send_sms.cgi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +485,Receive,လက်ခံရရှိ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +510,Receive,လက်ခံရရှိ
 DocType: Maintenance Visit,Fully Completed,အပြည့်အဝပြီးစီး
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,Complete {0}%
 DocType: Employee,Educational Qualification,ပညာရေးဆိုင်ရာအရည်အချင်း
 DocType: Workstation,Operating Costs,operating ကုန်ကျစရိတ်
 DocType: Employee Leave Approver,Employee Leave Approver,ဝန်ထမ်းထွက်ခွာခွင့်ပြုချက်
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,{0} has been successfully added to our Newsletter list.,{0} အောင်မြင်စွာကျွန်တော်တို့ရဲ့သတင်းလွှာစာရင်းတွင်ထည့်သွင်းခဲ့သည်။
-apps/erpnext/erpnext/stock/doctype/item/item.py +383,Row {0}: An Reorder entry already exists for this warehouse {1},row {0}: An Reorder entry ကိုပြီးသားဒီကိုဂိုဒေါင် {1} သည်တည်ရှိ
+apps/erpnext/erpnext/stock/doctype/item/item.py +387,Row {0}: An Reorder entry already exists for this warehouse {1},row {0}: An Reorder entry ကိုပြီးသားဒီကိုဂိုဒေါင် {1} သည်တည်ရှိ
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +67,"Cannot declare as lost, because Quotation has been made.","ဆုံးရှုံးအဖြစ်စျေးနှုန်းကိုဖန်ဆင်းခဲ့ပြီးကြောင့်, ကြေညာလို့မရပါဘူး။"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +133,Electron beam machining,electron beam machine
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,ဝယ်ယူမဟာ 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 +150,Please select Start Date and End Date for Item {0},Item {0} သည် Start ကိုနေ့စွဲနဲ့ End Date ကို select လုပ်ပါ ကျေးဇူးပြု.
 apps/erpnext/erpnext/config/stock.py +141,Main Reports,အဓိကအစီရင်ခံစာများ
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +102,Stock Ledger entries balances updated,စတော့အိတ်လယ်ဂျာ updated ခွင် entries
 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 +176,Add / Edit Prices,Edit ကိုဈေးနှုန်းများ Add /
+apps/erpnext/erpnext/stock/doctype/item/item.js +178,Add / Edit Prices,Edit ကိုဈေးနှုန်းများ Add /
 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 +298,My Orders,ငါ့အမိ​​န့်
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +293,My Orders,ငါ့အမိ​​န့်
 DocType: Price List,Price List Name,စျေးနှုန်းစာရင်းအမည်
 DocType: Time Log,For Manufacturing,ကုန်ထုတ်လုပ်မှုများအတွက်
-apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +70,Totals,စုစုပေါင်း
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +174,Totals,စုစုပေါင်း
 DocType: BOM,Manufacturing,ကုန်ထုတ်လုပ်မှု
 ,Ordered Items To Be Delivered,လွတ်ပေးရန်အမိန့်ထုတ်ပစ္စည်းများ
 DocType: Account,Income,ဝင်ငွေခွန်
 ,Setup Wizard,Setup Wizard
 DocType: Industry Type,Industry Type,စက်မှုဝန်ကြီး Type
 apps/erpnext/erpnext/templates/includes/cart.js +137,Something went wrong!,တစ်ခုခုမှားသွားတယ်!
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +68,Warning: Leave application contains following block dates,သတိပေးချက်: Leave ပလီကေးရှင်းအောက်ပါလုပ်ကွက်ရက်စွဲများင်
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +251,Sales Invoice {0} has already been submitted,အရောင်းပြေစာ {0} ပြီးသားတင်သွင်းခဲ့
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +100,Warning: Leave application contains following block dates,သတိပေးချက်: Leave ပလီကေးရှင်းအောက်ပါလုပ်ကွက်ရက်စွဲများင်
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +256,Sales Invoice {0} has already been submitted,အရောင်းပြေစာ {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/setup/page/setup_wizard/fixtures/operations.py +10,Die casting,ချ. သေဆုံး
 DocType: Email Alert,Reference Date,ကိုးကားစရာနေ့စွဲ
 apps/erpnext/erpnext/config/hr.py +105,Organization unit (department) master.,အစည်းအရုံးယူနစ် (ဌာန၏) သခင်သည်။
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +25,Please enter valid mobile nos,တရားဝင်မိုဘိုင်း nos ရိုက်ထည့်ပေးပါ
 DocType: Budget Detail,Budget Detail,ဘဏ္ဍာငွေအရအသုံး Detail
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +75,Please enter message before sending,ပေးပို့ခြင်းမပြုမီသတင်းစကားကိုရိုက်ထည့်ပေးပါ
 DocType: Async Task,Status,အဆင့်အတန်း
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +65,Stock UOM updated for Item {0},စတော့အိတ် UOM Item {0} သည် updated
 DocType: Company History,Year,ခုနှစ်
 apps/erpnext/erpnext/config/accounts.py +127,Point-of-Sale Profile,point-of-Sale ကိုယ်ရေးအချက်အလက်များ profile
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +68,Please Update SMS Settings,SMS ကို Settings ကို Update ကျေးဇူးပြု.
@@ -3513,12 +3365,12 @@
 ,Serial No Service Contract Expiry,serial No Service ကိုစာချုပ်သက်တမ်းကုန်ဆုံး
 DocType: Item,Unit of Measure Conversion,တိုင်းကူးပြောင်းခြင်း၏ယူနစ်
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +86,Employee can not be changed,ဝန်ထမ်းမပြောင်းနိုင်ဘူး
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +259,You cannot credit and debit same account at the same time,သင်တစ်ချိန်တည်းမှာအတူတူအကောင့်ကိုချေးငွေနှင့်ငွေကြိုမပေးနိုငျ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,You cannot credit and debit same account at the same time,သင်တစ်ချိန်တည်းမှာအတူတူအကောင့်ကိုချေးငွေနှင့်ငွေကြိုမပေးနိုငျ
 DocType: Naming Series,Help HTML,HTML ကိုကူညီပါ
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},တာဝန်ပေးစုစုပေါင်း weightage 100% ဖြစ်သင့်သည်။ ဒါဟာ {0} သည်
 apps/erpnext/erpnext/controllers/status_updater.py +140,Allowance for over-{0} crossed for Item {1},{0} over- ခွင့် Item {1} သည်ကိုကူး
 DocType: Address,Name of person or organization that this address belongs to.,ဒီလိပ်စာကိုပိုင်ဆိုင်ကြောင်းလူတစ်ဦးသို့မဟုတ်အဖွဲ့အစည်း၏အမည်ပြောပါ။
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +587,Your Suppliers,သင့်ရဲ့ပေးသွင်း
+apps/erpnext/erpnext/public/js/setup_wizard.js +325,Your Suppliers,သင့်ရဲ့ပေးသွင်း
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,အရောင်းအမိန့်ကိုဖန်ဆင်းသည်အဖြစ်ပျောက်ဆုံးသွားသောအဖြစ်သတ်မှတ်လို့မရပါဘူး။
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +65,Another Salary Structure {0} is active for employee {1}. Please make its status 'Inactive' to proceed.,နောက်ထပ်လစာဖွဲ့စည်းပုံ {0} ဝန်ထမ်း {1} သည်တက်ကြွဖြစ်ပါတယ်။ သူ့ရဲ့အနေအထား &#39;&#39; မဝင် &#39;&#39; ဆက်လက်ဆောင်ရွက်စေပါလော့။
 DocType: Purchase Invoice,Contact,ထိတှေ့
@@ -3527,37 +3379,35 @@
 DocType: Item,Has Serial No,Serial No ရှိပါတယ်
 DocType: Employee,Date of Issue,ထုတ်ဝေသည့်ရက်စွဲ
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +16,{0}: From {0} for {1},{0}: {0} {1} သည် မှစ.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +154,Row #{0}: Set Supplier for item {1},row # {0}: ကို item များအတွက် Set ပေးသွင်း {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +149,Row #{0}: Set Supplier for item {1},row # {0}: ကို item များအတွက် Set ပေးသွင်း {1}
 DocType: Issue,Content Type,content Type
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +17,Computer,ကွန်ပျူတာ
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,ကွန်ပျူတာ
 DocType: Item,List this Item in multiple groups on the website.,Website တွင်အများအပြားအုပ်စုများ၌ဤ Item စာရင်း။
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +283,Please check Multi Currency option to allow accounts with other currency,အခြားအငွေကြေးကိုနှင့်အတူအကောင့်အသစ်များ၏ခွင့်ပြုပါရန်ဘက်စုံငွေကြေးစနစ် option ကိုစစ်ဆေးပါ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +285,Please check Multi Currency option to allow accounts with other currency,အခြားအငွေကြေးကိုနှင့်အတူအကောင့်အသစ်များ၏ခွင့်ပြုပါရန်ဘက်စုံငွေကြေးစနစ် option ကိုစစ်ဆေးပါ
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +62,Item: {0} does not exist in the system,item: {0} system ကိုအတွက်မတည်ရှိပါဘူး
 apps/erpnext/erpnext/accounts/doctype/account/account.py +81,You are not authorized to set Frozen value,သင်က Frozen တန်ဖိုးကိုသတ်မှတ်ခွင့်မဟုတ်
 DocType: Payment Reconciliation,Get Unreconciled Entries,Unreconciled Entries Get
 DocType: Cost Center,Budgets,ဘတ်ဂျက်
 apps/frappe/frappe/core/page/modules_setup/modules_setup.py +11,Updated,Updated
 DocType: Employee,Emergency Contact Details,အရေးပေါ်ဆက်သွယ်ရန်အသေးစိတ်
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +396,What does it do?,ဒါကြောင့်အဘယ်သို့ပြုရပါသနည်း?
+apps/erpnext/erpnext/public/js/setup_wizard.js +144,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,ပျမ်းမျှအားဖြင့်ကော်မရှင် Rate
-apps/erpnext/erpnext/stock/doctype/item/item.py +313,'Has Serial No' can not be 'Yes' for non-stock item,&#39;&#39; ဟုတ်ကဲ့ &#39;&#39; Non-စတော့ရှယ်ယာကို item သည်မဖွစျနိုငျ &#39;&#39; Serial No ရှိခြင်း &#39;&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +317,'Has Serial No' can not be 'Yes' for non-stock item,&#39;&#39; ဟုတ်ကဲ့ &#39;&#39; Non-စတော့ရှယ်ယာကို item သည်မဖွစျနိုငျ &#39;&#39; Serial No ရှိခြင်း &#39;&#39;
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Attendance can not be marked for future dates,တက်ရောက်သူအနာဂတ်ရက်စွဲများကိုချောင်းမြောင်းမရနိုင်ပါ
 DocType: Pricing Rule,Pricing Rule Help,စျေးနှုန်း Rule အကူအညီ
 DocType: Purchase Taxes and Charges,Account Head,အကောင့်ဖွင့်ဦးခေါင်း
 apps/erpnext/erpnext/config/stock.py +79,Update additional costs to calculate landed cost of items,ပစ္စည်းများဆင်းသက်ကုန်ကျစရိတ်ကိုတွက်ချက်ဖို့အပိုဆောင်းကုန်ကျစရိတ်များကို Update
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +111,Electrical,electrical
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +111,Electrical,electrical
 DocType: Stock Entry,Total Value Difference (Out - In),(- ခုနှစ်တွင် Out) စုစုပေါင်းတန်ဖိုး Difference
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +302,Row {0}: Exchange Rate is mandatory,row {0}: ငွေလဲနှုန်းမဖြစ်မနေဖြစ်ပါသည်
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +304,Row {0}: Exchange Rate is mandatory,row {0}: ငွေလဲနှုန်းမဖြစ်မနေဖြစ်ပါသည်
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},အသုံးပြုသူ ID န်ထမ်း {0} သည်စွဲလမ်းခြင်းမ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +72,Peening,Peening
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,From Warranty Claim,အာမခံပြောဆိုချက်ကိုထံမှ
 DocType: Stock Entry,Default Source Warehouse,default Source ကိုဂိုဒေါင်
 DocType: Item,Customer Code,customer Code ကို
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +212,Birthday Reminder for {0},{0} သည်မွေးနေသတိပေး
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +163,Lapping,Lapping
-apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.js +8,Days Since Last Order,ပြီးခဲ့သည့်အမိန့် ခုနှစ်မှစ. ရက်ပတ်လုံး
+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 +299,Debit To account must be a Balance Sheet account,အကောင့်ကိုရန် debit တစ်ဦး Balance ကိုစာရွက်အကောင့်ကိုသူဖြစ်ရမည်
 DocType: Buying Settings,Naming Series,စီးရီးအမည်
 DocType: Leave Block List,Leave Block List Name,Block List ကိုအမည် Leave
@@ -3571,7 +3421,7 @@
 DocType: Notification Control,Sales Invoice Message,အရောင်းပြေစာ Message
 DocType: Authorization Rule,Based On,ပေါ်အခြေခံကာ
 DocType: Sales Order Item,Ordered Qty,အမိန့် Qty
-apps/erpnext/erpnext/stock/doctype/item/item.py +539,Item {0} is disabled,item {0} ပိတ်ထားတယ်
+apps/erpnext/erpnext/stock/doctype/item/item.py +543,Item {0} is disabled,item {0} ပိတ်ထားတယ်
 DocType: Stock Settings,Stock Frozen Upto,စတော့အိတ် Frozen အထိ
 apps/erpnext/erpnext/controllers/recurring_document.py +166,Period From and Period To dates mandatory for recurring {0},မှစ. နှင့်ကာလ {0} ထပ်တလဲလဲများအတွက်မဖြစ်မနေရက်စွဲများရန် period
 apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,စီမံကိန်းလှုပ်ရှားမှု / အလုပ်တစ်ခုကို။
@@ -3581,7 +3431,6 @@
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,လျော့စျေးက 100 ထက်လျော့နည်းဖြစ်ရမည်
 DocType: ToDo,Low,အနိမျ့
 DocType: Purchase Invoice,Write Off Amount (Company Currency),ဟာ Off ရေးဖို့ပမာဏ (Company မှငွေကြေးစနစ်)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +71,Spinning,ချည်ငင်
 DocType: Landed Cost Voucher,Landed Cost Voucher,ကုန်ကျစရိတ်ဘောက်ချာဆင်းသက်
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +55,Please set {0},{0} set ကျေးဇူးပြု.
 DocType: Purchase Invoice,Repeat on Day of Month,Month ရဲ့နေ့တွင် Repeat
@@ -3603,7 +3452,6 @@
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +37,Campaign Name is required,ကင်ပိန်းအမည်လိုအပ်သည်
 DocType: Maintenance Visit,Maintenance Date,ပြုပြင်ထိန်းသိမ်းမှုနေ့စွဲ
 DocType: Purchase Receipt Item,Rejected Serial No,ပယ်ချ Serial No
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +51,Deep drawing,နက်ရှိုင်းသောပုံဆွဲ
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +40,New Newsletter,နယူးသတင်းလွှာ
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +157,Start date should be less than end date for Item {0},နေ့စွဲ Item {0} သည်အဆုံးနေ့စွဲထက်နည်းဖြစ်သင့် Start
 apps/erpnext/erpnext/stock/doctype/item/item.js +17,Show Balance,Show ကို Balance
@@ -3613,7 +3461,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +119,BOM and Manufacturing Quantity are required,BOM နှင့်ကုန်ထုတ်လုပ်မှုပမာဏလိုအပ်သည်
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Ageing Range 2
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +450,Amount,ငွေပမာဏ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +147,Riveting,Riveting
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,BOM အစားထိုး
 ,Sales Analytics,အရောင်း Analytics
 DocType: Manufacturing Settings,Manufacturing Settings,ကုန်ထုတ်လုပ်မှု Settings ကို
@@ -3625,20 +3472,19 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +207,New Account Name,နယူးအကောင့်အမည်
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,ကုန်ကြမ်းပစ္စည်းများကုန်ကျစရိတ်ထောက်ပံ့
 DocType: Selling Settings,Settings for Selling Module,ရောင်းချသည့် Module သည် Settings ကို
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +73,Customer Service,ဧည့်ဝန်ဆောင်မှု
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Customer Service,ဧည့်ဝန်ဆောင်မှု
 DocType: Item,Thumbnail,thumbnail
 DocType: Item Customer Detail,Item Customer Detail,item ဖောက်သည် Detail
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +147,Confirm Your Email,အီးမေးလ်အတည်ပြုပါ
 apps/erpnext/erpnext/config/hr.py +53,Offer candidate a Job.,ကိုယ်စားလှယ်လောင်းတစ်ဦးယောဘငှေပါ။
 DocType: Notification Control,Prompt for Email on Submission of,၏လကျအောကျခံအပေါ်အီးမေးလ်သည် Prompt ကို
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +81,Total allocated leaves are more than days in the period,Total ကုမ္ပဏီခွဲဝေအရွက်ကာလအတွက်ရက်ထက်ပိုပါတယ်
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +70,Item {0} must be a stock Item,item {0} တစ်စတော့ရှယ်ယာ Item ဖြစ်ရမည်
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,တိုးတက်ရေးပါတီဂိုဒေါင်ခုနှစ်တွင် Default အနေနဲ့သူ Work
 apps/erpnext/erpnext/config/accounts.py +107,Default settings for accounting transactions.,စာရင်းကိုင်လုပ်ငန်းတွေအတွက် default setting များ။
 apps/frappe/frappe/model/naming.py +40,{0} is required,{0} လိုအပ်သည်
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +21,Vacuum molding,လေဟာနယ်အတု ယူ. ပုံသှငျး
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,မျှော်လင့်ထားသည့်ရက်စွဲပစ္စည်းတောင်းဆိုမှုနေ့စွဲခင်မဖွစျနိုငျ
 DocType: Contact Us Settings,City,မြို့
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +132,Ultrasonic machining,Ultrasonic machine
 apps/frappe/frappe/templates/base.html +137,Error: Not a valid id?,error: မမှန်ကန်သောက id?
 apps/erpnext/erpnext/stock/get_item_details.py +125,Item {0} must be a Sales Item,item {0} တစ်ခုအရောင်း Item ဖြစ်ရမည်
 DocType: Naming Series,Update Series Number,Update ကိုစီးရီးနံပါတ်
@@ -3646,7 +3492,7 @@
 DocType: Sales Order,Printing Details,ပုံနှိပ် Details ကို
 DocType: Task,Closing Date,နိဂုံးချုပ်နေ့စွဲ
 DocType: Sales Order Item,Produced Quantity,ထုတ်လုပ်ပမာဏ
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +84,Engineer,အင်ဂျင်နီယာ
+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,ရှာဖွေရန် Sub စညျးဝေး
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +379,Item Code required at Row No {0},Row မရှိပါ {0} မှာလိုအပ်သည့် item Code ကို
 DocType: Sales Partner,Partner Type,partner ကအမျိုးအစား
@@ -3654,7 +3500,7 @@
 DocType: Authorization Rule,Customerwise Discount,Customerwise လျှော့
 DocType: Purchase Invoice,Against Expense Account,အသုံးအကောင့်ဆန့်ကျင်
 DocType: Production Order,Production Order,ထုတ်လုပ်မှုအမိန့်
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +258,Installation Note {0} has already been submitted,Installation မှတ်ချက် {0} ပြီးသားတင်သွင်းခဲ့
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +263,Installation Note {0} has already been submitted,Installation မှတ်ချက် {0} ပြီးသားတင်သွင်းခဲ့
 DocType: Quotation Item,Against Docname,Docname ဆန့်ကျင်
 DocType: SMS Center,All Employee (Active),အားလုံးသည်န်ထမ်း (Active)
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,အခုတော့ကြည့်ရန်
@@ -3663,19 +3509,19 @@
 DocType: Item,Re-Order Level,Re-Order အဆင့်
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,ပစ္စည်းများကို Enter နှင့်သင်ထုတ်လုပ်မှုအမိန့်မြှင်သို့မဟုတ်ခွဲခြမ်းစိတ်ဖြာများအတွက်ကုန်ကြမ်းကို download လုပ်လိုသည့်အဘို့အ qty စီစဉ်ခဲ့ပါတယ်။
 apps/frappe/frappe/public/js/frappe/views/ganttview.js +45,Gantt Chart,Gantt ဇယား
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +57,Part-time,အချိန်ပိုင်း
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,Part-time,အချိန်ပိုင်း
 DocType: Employee,Applicable Holiday List,သက်ဆိုင်အားလပ်ရက်များစာရင်း
 DocType: Employee,Cheque,Cheques
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,စီးရီး Updated
 apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Report Type is mandatory,အစီရင်ခံစာ Type မသင်မနေရ
 DocType: Item,Serial Number Series,serial နံပါတ်စီးရီး
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},ဂိုဒေါင်တန်းအတွက်စတော့ရှယ်ယာ Item {0} သည်မသင်မနေရ {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +45,Retail & Wholesale,လက်လီလက်ကားအရောင်းဆိုင် &amp;
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,လက်လီလက်ကားအရောင်းဆိုင် &amp;
 DocType: Issue,First Responded On,ပထမဦးဆုံးတွင်တုန့်ပြန်
 DocType: Website Item Group,Cross Listing of Item in multiple groups,မျိုးစုံအုပ်စုများအတွက် Item ၏လက်ဝါးကပ်တိုင်အိမ်ခန်းနှင့်
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +351,The First User: You,The First အသုံးပြုသူ: သင့်
+apps/erpnext/erpnext/public/js/setup_wizard.js +101,The First User: You,The First အသုံးပြုသူ: သင့်
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +48,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},ဘဏ္ဍာရေးနှစ်တစ်နှစ်တာ Start ကိုနေ့စွဲနှင့်ဘဏ္ဍာရေးနှစ်တစ်နှစ်တာ End Date ကိုပြီးသားဘဏ္ဍာရေးနှစ်တစ်နှစ်တာ {0} အတွက်သတ်မှတ်ကြသည်
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +172,Successfully Reconciled,အောင်မြင်စွာ ပြန်.
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +119,Successfully Reconciled,အောင်မြင်စွာ ပြန်.
 DocType: Production Order,Planned End Date,စီစဉ်ထားတဲ့အဆုံးနေ့စွဲ
 apps/erpnext/erpnext/config/stock.py +43,Where items are stored.,အဘယ်မှာရှိပစ္စည်းများကိုသိမ်းဆည်းထားသည်။
 DocType: Tax Rule,Validity,တရားဝင်မှု
@@ -3695,39 +3541,36 @@
 DocType: DocPerm,Level,level
 DocType: Purchase Taxes and Charges,On Net Total,Net ကစုစုပေါင်းတွင်
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +160,Target warehouse in row {0} must be same as Production Order,အတန်းအတွက်ပစ်မှတ်ဂိုဒေါင် {0} ထုတ်လုပ်မှုအမိန့်အဖြစ်အတူတူသာဖြစ်ရမည်
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +59,No permission to use Payment Tool,ငွေပေးချေမှုရမည့် Tool ကိုအသုံးပွုဖို့မရှိပါခွင့်ပြုချက်
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +97,No permission to use Payment Tool,ငွေပေးချေမှုရမည့် Tool ကိုအသုံးပွုဖို့မရှိပါခွင့်ပြုချက်
 apps/erpnext/erpnext/controllers/recurring_document.py +192,'Notification Email Addresses' not specified for recurring %s,% s ထပ်တလဲလဲသည်သတ်မှတ်ထားသောမဟုတ် &#39;&#39; အမိန့်ကြော်ငြာစာအီးမေးလ်လိပ်စာ &#39;&#39;
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +86,Milling,ကြိတ်စက်
 apps/erpnext/erpnext/accounts/doctype/account/account.py +99,Currency can not be changed after making entries using some other currency,ငွေကြေးအချို့သောအခြားငွေကြေးသုံးပြီး entries တွေကိုချမှတ်ပြီးနောက်ပြောင်းလဲသွားမရနိုငျ
 DocType: Company,Round Off Account,အကောင့်ပိတ် round
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +60,Nibbling,Nibbling
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,စီမံခန့်ခွဲရေးဆိုင်ရာအသုံးစရိတ်များ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +18,Consulting,Consulting
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +18,Consulting,Consulting
 DocType: Customer Group,Parent Customer Group,မိဘဖောက်သည်အုပ်စု
 apps/erpnext/erpnext/public/js/pos/pos.js +429,Change,ပွောငျးလဲခွငျး
 DocType: Purchase Invoice,Contact Email,ဆက်သွယ်ရန်အီးမေးလ်
 DocType: Appraisal Goal,Score Earned,ရမှတ်ရရှိခဲ့သည်
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +393,"e.g. ""My Company LLC""",ဥပမာ &quot;ကျနော့်ကုမ္ပဏီ LLC&quot;
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +173,Notice Period,သတိပေးချက်ကာလ
+apps/erpnext/erpnext/public/js/setup_wizard.js +141,"e.g. ""My Company LLC""",ဥပမာ &quot;ကျနော့်ကုမ္ပဏီ LLC&quot;
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +173,Notice Period,သတိပေးချက်ကာလ
 DocType: Bank Reconciliation Detail,Voucher ID,ဘောက်ချာ ID ကို
 apps/erpnext/erpnext/setup/doctype/territory/territory.js +14,This is a root territory and cannot be edited.,"ဒါကအမြစ်နယ်မြေဖြစ်ပြီး, edited မရနိုင်ပါ။"
 DocType: Packing Slip,Gross Weight UOM,gross အလေးချိန် UOM
 DocType: Email Digest,Receivables / Payables,receiver / ပေးဆောင်
 DocType: Delivery Note Item,Against Sales Invoice,အရောင်းပြေစာဆန့်ကျင်
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +63,Stamping,Stamping
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +457,Credit Account,ခရက်ဒစ်အကောင့်ကို
 DocType: Landed Cost Item,Landed Cost Item,ဆင်းသက်ကုန်ကျစရိတ် Item
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +56,Show zero values,သုညတန်ဖိုးများကိုပြရန်
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,ကုန်ကြမ်းပေးသောပမာဏကနေ repacking / ထုတ်လုပ်ပြီးနောက်ရရှိသောတဲ့ item ၏အရေအတွက်
 DocType: Payment Reconciliation,Receivable / Payable Account,receiver / ပေးဆောင်အကောင့်
 DocType: Delivery Note Item,Against Sales Order Item,အရောင်းအမိန့် Item ဆန့်ကျင်
-apps/erpnext/erpnext/stock/doctype/item/item.py +521,Please specify Attribute Value for attribute {0},attribute က {0} များအတွက် Value ကို Attribute ကိုသတ်မှတ် ကျေးဇူးပြု.
+apps/erpnext/erpnext/stock/doctype/item/item.py +525,Please specify Attribute Value for attribute {0},attribute က {0} များအတွက် Value ကို Attribute ကိုသတ်မှတ် ကျေးဇူးပြု.
 DocType: Item,Default Warehouse,default ဂိုဒေါင်
 DocType: Task,Actual End Date (via Time Logs),(အချိန် Logs ကနေတဆင့်) အမှန်တကယ် End Date ကို
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +37,Budget cannot be assigned against Group Account {0},ဘဏ္ဍာငွေအရအသုံး Group မှအကောင့် {0} ဆန့်ကျင်တာဝန်ပေးမရနိုင်ပါ
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +23,Please enter parent cost center,မိဘကုန်ကျစရိတ်အလယ်ဗဟိုကိုရိုက်ထည့်ပေးပါ
 DocType: Delivery Note,Print Without Amount,ငွေပမာဏမရှိရင် Print
-apps/erpnext/erpnext/controllers/buying_controller.py +69,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,အခွန်အမျိုးအစားအားလုံးပစ္စည်းများကိုအဖြစ် &#39;&#39; အကောက်ခွန်တန်ဖိုးသတ်မှတ်မည် &#39;သို့မဟုတ်&#39; &#39;အကောက်ခွန်တန်ဖိုးသတ်မှတ်မည်နှင့်စုစုပေါင်း&#39; &#39;မဖြစ်နိုင်သည် non-စတော့ရှယ်ယာပစ္စည်းများဖြစ်ကြသည်
+apps/erpnext/erpnext/controllers/buying_controller.py +60,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,အခွန်အမျိုးအစားအားလုံးပစ္စည်းများကိုအဖြစ် &#39;&#39; အကောက်ခွန်တန်ဖိုးသတ်မှတ်မည် &#39;သို့မဟုတ်&#39; &#39;အကောက်ခွန်တန်ဖိုးသတ်မှတ်မည်နှင့်စုစုပေါင်း&#39; &#39;မဖြစ်နိုင်သည် non-စတော့ရှယ်ယာပစ္စည်းများဖြစ်ကြသည်
 DocType: User,Last Name,မျိုးနွယ်အမည်
 DocType: Web Page,Left,လက်ဝဲဘက်
 DocType: Event,All Day,အားလုံးသည်နေ့
@@ -3735,7 +3578,7 @@
 DocType: Appraisal,Total Score (Out of 5),(5 ထဲက) စုစုပေါင်းရမှတ်
 DocType: Contact Us Settings,State,ပြည်နယ်
 DocType: Batch,Batch,batch
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +51,Balance,ချိန်ခွင်လျှာ
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +28,Balance,ချိန်ခွင်လျှာ
 DocType: Project,Total Expense Claim (via Expense Claims),(သုံးစွဲမှုစွပ်စွဲနေတဆင့်) စုစုပေါင်းကုန်ကျစရိတ်တောင်းဆိုမှုများ
 DocType: User,Gender,"ကျား, မ"
 DocType: Journal Entry,Debit Note,debit မှတ်ချက်
@@ -3765,8 +3608,7 @@
 DocType: Purchase Order,Get Last Purchase Rate,ပြီးခဲ့သည့်ဝယ်ယူ Rate Get
 DocType: Time Log,Billing Rate based on Activity Type (per hour),ငွေတောင်းခံနှုန်း (တစ်နာရီလျှင်) လုပ်ဆောင်ချက်ကအမျိုးအစားပေါ်အခြေခံပြီး
 DocType: Company,Company Info,ကုမ္ပဏီ Info
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +76,Seaming,ချုပ်ရိုး
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +197,"Company Email ID not found, hence mail not sent","ဤအရပ်မှပို့ပေးဖို့စလှေတျတျောကိုမတှေ့မကုမ္ပဏီသည်အီးမေးလ် ID ကို,"
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +206,"Company Email ID not found, hence mail not sent","ဤအရပ်မှပို့ပေးဖို့စလှေတျတျောကိုမတှေ့မကုမ္ပဏီသည်အီးမေးလ် ID ကို,"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),ရန်ပုံငွေ၏လျှောက်လွှာ (ပိုင်ဆိုင်မှုများ)
 DocType: Production Planning Tool,Filter based on item,item ကို select လုပ်ထားတဲ့အပေါ်အခြေခံပြီး filter
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +451,Debit Account,debit အကောင့်ကို
@@ -3778,17 +3620,16 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +95,{0} {1} has been modified. Please refresh.,{0} {1} modified သိရသည်။ refresh ပေးပါ။
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,အောက်ပါရက်ထွက်ခွာ Applications ကိုအောင်ကနေအသုံးပြုသူများကိုရပ်တန့်။
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +591,From Opportunity,အခွင့်အလမ်းအနေဖြင့်
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +46,Blanking,Blanking
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +166,Employee Benefits,ဝန်ထမ်းအကျိုးကျေးဇူးများ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,Employee Benefits,ဝန်ထမ်းအကျိုးကျေးဇူးများ
 DocType: Sales Invoice,Is POS,POS စက်ဖြစ်ပါသည်
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +240,Packed quantity must equal quantity for Item {0} in row {1},ထုပ်ပိုးအရေအတွက်အတန်း {1} အတွက် Item {0} သည်အရေအတွက်တူညီရမယ်
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +245,Packed quantity must equal quantity for Item {0} in row {1},ထုပ်ပိုးအရေအတွက်အတန်း {1} အတွက် Item {0} သည်အရေအတွက်တူညီရမယ်
 DocType: Production Order,Manufactured Qty,ထုတ်လုပ်သော 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.,Customer များကြီးပြင်းဥပဒေကြမ်းများ။
 DocType: DocField,Default,ပျက်ကွက်
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,စီမံကိန်း Id
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +466,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},အတန်းမရှိ {0}: ပမာဏသုံးစွဲမှုတောင်းဆိုမှုများ {1} ဆန့်ကျင်ငွေပမာဏဆိုင်းငံ့ထားထက် သာ. ကြီးမြတ်မဖြစ်နိုင်။ ဆိုင်းငံ့ထားသောငွေပမာဏ {2} သည်
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +468,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} လစဉ်ကြေး ပေး.
 DocType: Maintenance Schedule,Schedule,ဇယား
 DocType: Cost Center,"Define Budget for this Cost Center. To set budget action, see ""Company List""","ဒီအကုန်ကျစရိတ်စင်တာဘဏ္ဍာငွေအရအသုံး Define ။ ဘတ်ဂျက်အရေးယူတင်ထားရန်, &quot;ကုမ္ပဏီစာရင်း&quot; ကိုကြည့်ပါ"
@@ -3799,7 +3640,7 @@
 apps/erpnext/erpnext/public/js/pos/pos.js +91,Price List not found or disabled,စျေးနှုန်း List ကိုတွေ့ရှိသို့မဟုတ်မသန်မစွမ်းမဟုတ်
 DocType: Expense Claim,Approved,Approved
 DocType: Pricing Rule,Price,စျေးနှုန်း
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +79,Employee relieved on {0} must be set as 'Left',{0} &#39;&#39; လက်ဝဲ &#39;အဖြစ်သတ်မှတ်ရမည်အပေါ်စိတ်သက်သာရာန်ထမ်း
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +88,Employee relieved on {0} must be set as 'Left',{0} &#39;&#39; လက်ဝဲ &#39;အဖြစ်သတ်မှတ်ရမည်အပေါ်စိတ်သက်သာရာန်ထမ်း
 DocType: Item,"Selecting ""Yes"" will give a unique identity to each entity of this item which can be viewed in the Serial No master.",&quot;Yes&quot; ကိုရွေးချယ်ခြင်းအတွက် Serial No မာစတာအတွက်ကြည့်ရှုနိုင်ပါသည်သောဤတဲ့ item ကိုအသီးအသီး entity တစ်ခုထူးခြားသောဝိသေသလက္ခဏာကိုငါပေးမည်။
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +39,Appraisal {0} created for Employee {1} in the given date range,စိစစ်ရေး {0} ပေးထားသောနေ့စွဲအကွာအဝေးအတွက်န်ထမ်း {1} ဖန်တီး
 DocType: Employee,Education,ပညာရေး
@@ -3810,7 +3651,7 @@
 apps/frappe/frappe/desk/moduleview.py +67,Standard Reports,စံအစီရင်ခံစာများ
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,စာရင်းကိုင်ဂျာနယ် entries တွေကို။
 DocType: Delivery Note Item,Available Qty at From Warehouse,ဂိုဒေါင် မှစ. မှာရရှိနိုင်တဲ့ Qty
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +209,Please select Employee Record first.,န်ထမ်းမှတ်တမ်းပထမဦးဆုံးရွေးချယ်ပါ။
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +224,Please select Employee Record first.,န်ထမ်းမှတ်တမ်းပထမဦးဆုံးရွေးချယ်ပါ။
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},row {0}: ပါတီ / အကောင့်ကို {3} {4} အတွက် {1} / {2} နှင့်ကိုက်ညီမပါဘူး
 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 +233,Please enter Expense Account,အသုံးအကောင့်ကိုရိုက်ထည့်ပေးပါ
@@ -3823,46 +3664,43 @@
 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,အထက်ပါသတ်မှတ်ချက်များအပေါ်အခြေခံပြီးအရောင်းအမိန့် (ကယ်နှုတ်ရန်ဆိုင်းငံ့ထား) Pull
 DocType: DocShare,Document Type,စာရွက်စာတမ်းကအမျိုးအစား
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +565,From Supplier Quotation,ပေးသွင်းစျေးနှုန်းအနေဖြင့်
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +588,From Supplier Quotation,ပေးသွင်းစျေးနှုန်းအနေဖြင့်
 DocType: Deduction Type,Deduction Type,သဘောအယူအဆကအမျိုးအစား
 DocType: Attendance,Half Day,တစ်ဝက်နေ့
 DocType: Pricing Rule,Min Qty,min Qty
 DocType: Features Setup,"To track items in sales and purchase documents with batch nos. ""Preferred Industry: Chemicals""",အသုတ်နော့နှင့်အတူအရောင်းနှင့်ဝယ်ယူစာရွက်စာတမ်းများအတွက်ပစ္စည်းများကိုခြေရာခံရန်။ &quot;Preferences စက်မှုလက်မှုလုပ်ငန်းရှင်များ: ဓာတုပစ္စည်း&quot;
 DocType: GL Entry,Transaction Date,transaction နေ့စွဲ
 DocType: Production Plan Item,Planned Qty,စီစဉ်ထား Qty
-apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +91,Total Tax,စုစုပေါင်းအခွန်
+apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +93,Total Tax,စုစုပေါင်းအခွန်
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +178,For Quantity (Manufactured Qty) is mandatory,ပမာဏအတွက် (Qty ကုန်ပစ္စည်းထုတ်လုပ်) မသင်မနေရ
 DocType: Stock Entry,Default Target Warehouse,default Target ကဂိုဒေါင်
 DocType: Purchase Invoice,Net Total (Company Currency),Net ကစုစုပေါင်း (ကုမ္ပဏီငွေကြေးစနစ်)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +79,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,row {0}: ပါတီ Type နှင့်ပါတီ receiver / ပေးဆောင်အကောင့်ကိုဆန့်ကျင်သာသက်ဆိုင်သည်
 DocType: Notification Control,Purchase Receipt Message,ဝယ်ယူခြင်းပြေစာ Message
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +95,Total allocated leaves are more than period,Total ကုမ္ပဏီခွဲဝေအရွက်ကာလအတွင်းထက်ပို
 DocType: Production Order,Actual Start Date,အမှန်တကယ် Start ကိုနေ့စွဲ
 DocType: Sales Order,% of materials delivered against this Sales Order,ဒီအရောင်းအမိန့်ဆန့်ကျင်ကယ်နှုတ်တော်မူ၏ပစ္စည်း%
 apps/erpnext/erpnext/config/stock.py +23,Record item movement.,စံချိန်တင်တဲ့ item လှုပ်ရှားမှု။
 DocType: Newsletter List Subscriber,Newsletter List Subscriber,သတင်းလွှာများစာရင်းရရှိရန် Register စာရင်းပေးသွင်း
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +164,Morticing,Morticing
 DocType: Email Account,Service,ဝန်ဆောင်မှု
 DocType: Hub Settings,Hub Settings,hub Settings ကို
 DocType: Project,Gross Margin %,gross Margin%
 DocType: BOM,With Operations,စစ်ဆင်ရေးနှင့်အတူ
 apps/erpnext/erpnext/accounts/party.py +232,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,စာရင်းကိုင် entries တွေကိုပြီးသားကုမ္ပဏီတစ်ခု {1} များအတွက်ငွေကြေး {0} အတွက်ဖန်ဆင်းခဲ့ကြ။ ငွေကြေး {0} နှင့်အတူ receiver သို့မဟုတ်ပေးဆောင်အကောင့်ကို select လုပ်ပါကိုကျေးဇူးတင်ပါ။
 ,Monthly Salary Register,လစဉ်လစာမှတ်ပုံတင်မည်
-apps/frappe/frappe/website/template.py +140,Next,နောက်တစ်ခု
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard_page.html +17,Next,နောက်တစ်ခု
 DocType: Warranty Claim,If different than customer address,ဖောက်သည်လိပ်စာတခုထက်ကွဲပြားခြားနားနေလျှင်
 DocType: BOM Operation,BOM Operation,BOM စစ်ဆင်ရေး
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +118,Electropolishing,Electropolishing
 DocType: Purchase Taxes and Charges,On Previous Row Amount,ယခင် Row ပမာဏတွင်
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +24,Please enter Payment Amount in atleast one row,atleast တယောက်အတန်းအတွက်ငွေပေးချေမှုရမည့်ငွေပမာဏကိုရိုက်ထည့်ပေးပါ
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +33,Please enter Payment Amount in atleast one row,atleast တယောက်အတန်းအတွက်ငွေပေးချေမှုရမည့်ငွေပမာဏကိုရိုက်ထည့်ပေးပါ
 DocType: POS Profile,POS Profile,POS ကိုယ်ရေးအချက်အလက်များ profile
 apps/erpnext/erpnext/config/accounts.py +153,"Seasonality for setting budgets, targets etc.","ဘတ်ဂျက် setting သည်ရာသီ, ပစ်မှတ်စသည်တို့"
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +238,Row {0}: Payment Amount cannot be greater than Outstanding Amount,row {0}: ငွေပေးချေမှုရမည့်ငွေပမာဏထူးချွန်ငွေပမာဏထက် သာ. ကြီးမြတ်မဖွစျနိုငျ
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +46,Total Unpaid,စုစုပေါင်း Unpaid
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +21,Time Log is not billable,အချိန်အထဲ billable မဟုတ်ပါဘူး
 apps/erpnext/erpnext/stock/get_item_details.py +128,"Item {0} is a template, please select one of its variants",item {0} တဲ့ template ကိုသည်၎င်း၏မျိုးကွဲတွေထဲကရွေးချယ်ရန်
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +528,Purchaser,ဝယ်ယူ
+apps/erpnext/erpnext/public/js/setup_wizard.js +272,Purchaser,ဝယ်ယူ
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +81,Net pay cannot be negative,Net ကအခပေးအနုတ်လက္ခဏာမဖြစ်နိုင်
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +71,Please enter the Against Vouchers manually,ထိုဆန့်ကျင် voucher ကို manually ရိုက်ထည့်ပေးပါ
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +107,Please enter the Against Vouchers manually,ထိုဆန့်ကျင် voucher ကို manually ရိုက်ထည့်ပေးပါ
 DocType: SMS Settings,Static Parameters,static Parameter များကို
 DocType: Purchase Order,Advance Paid,ကြိုတင်မဲ Paid
 DocType: Item,Item Tax,item ခွန်
@@ -3871,14 +3709,12 @@
 apps/erpnext/erpnext/config/crm.py +48,Send mass SMS to your contacts,သင့်ရဲ့အဆက်အသွယ်မှအစုလိုက်အပြုံလိုက် SMS ပို့
 DocType: Purchase Taxes and Charges,Consider Tax or Charge for,သည်အခွန်သို့မဟုတ်တာဝန်ခံဖို့စဉ်းစားပါ
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,အမှန်တကယ် Qty မသင်မနေရ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +42,Cross-rolling,cross-လှိမ့်
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +132,Credit Card,အကြွေးဝယ်ကဒ်
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +132,Credit Card,အကြွေးဝယ်ကဒ်
 DocType: BOM,Item to be manufactured or repacked,item ထုတ်လုပ်သောသို့မဟုတ် repacked ခံရဖို့
 apps/erpnext/erpnext/config/stock.py +95,Default settings for stock transactions.,စတော့ရှယ်ယာအရောင်းအများအတွက် default setting များ။
 DocType: Purchase Invoice,Next Date,Next ကိုနေ့စွဲ
 DocType: Employee Education,Major/Optional Subjects,ဗိုလ်မှူး / မလုပ်မဖြစ်ကျအောကျခံ
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +49,Please enter Taxes and Charges,အခွန်နှင့်စွပ်စွဲချက်ကိုရိုက်ထည့်ပေးပါ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +85,Machining,machine
 DocType: Sales Invoice Item,Drop Ship,drop သင်္ဘော
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","ဒီနေရာတွင်မိဘ, အိမ်ထောင်ဖက်နှင့်ကလေးများ၏အမည်နှင့်အလုပ်အကိုင်တူမိသားစုကအသေးစိတ်ထိနျးသိမျးထားနိုငျ"
 DocType: Hub Settings,Seller Name,ရောင်းချသူအမည်
@@ -3888,7 +3724,7 @@
 DocType: Stock Entry,Repack,Repack
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +6,You must Save the form before proceeding,သင်ကအမှုတွဲရှေ့တော်၌ထိုပုံစံကို Save ရမယ်
 DocType: Item Attribute,Numeric Values,numeric တန်ဖိုးများ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +500,Attach Logo,Logo ကို Attach
+apps/erpnext/erpnext/public/js/setup_wizard.js +246,Attach Logo,Logo ကို Attach
 DocType: Customer,Commission Rate,ကော်မရှင် Rate
 apps/erpnext/erpnext/stock/doctype/item/item.js +38,Make Variant,Variant Make
 apps/erpnext/erpnext/config/hr.py +145,Block leave applications by department.,ဦးစီးဌာနကခွင့် applications များပိတ်ဆို့။
@@ -3903,19 +3739,19 @@
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +105,Please select a csv file,တစ် CSV ဖိုင်ကိုရွေးပေးပါ
 DocType: Dropbox Backup,Send Backups to Dropbox,Dropbox ကိုမှရန်များ Send
 DocType: Purchase Order,To Receive and Bill,လက်ခံနှင့်ဘီလ်မှ
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +94,Designer,ပုံစံရေးဆှဲသူ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Designer,ပုံစံရေးဆှဲသူ
 apps/erpnext/erpnext/config/selling.py +121,Terms and Conditions Template,စည်းကမ်းသတ်မှတ်ချက်များ Template:
 DocType: Serial No,Delivery Details,Delivery အသေးစိတ်ကို
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +383,Cost Center is required in row {0} in Taxes table for type {1},ကုန်ကျစရိတ် Center ကအမျိုးအစား {1} သည်အခွန် table ထဲမှာအတန်း {0} အတွက်လိုအပ်သည်
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +386,Cost Center is required in row {0} in Taxes table for type {1},ကုန်ကျစရိတ် Center ကအမျိုးအစား {1} သည်အခွန် table ထဲမှာအတန်း {0} အတွက်လိုအပ်သည်
 DocType: Item,Automatically create Material Request if quantity falls below this level,အရေအတွက်ကဤအဆင့်အောက်ကျလျှင်အလိုအလျှောက်ပစ္စည်းတောင်းဆိုမှုဖန်တီး
 ,Item-wise Purchase Register,item-ပညာရှိသောသူသည်ဝယ်ယူမှတ်ပုံတင်မည်
 DocType: Batch,Expiry Date,သက်တမ်းကုန်ဆုံးရက်
-apps/erpnext/erpnext/stock/doctype/item/item.py +375,"To set reorder level, item must be a Purchase Item or Manufacturing Item","reorder အ level ကိုတင်ထားရန်, ကို item တစ်ခုဝယ်ယူပစ္စည်းသို့မဟုတ်ထုတ်လုပ်ခြင်းပစ္စည်းဖြစ်ရပါမည်"
+apps/erpnext/erpnext/stock/doctype/item/item.py +379,"To set reorder level, item must be a Purchase Item or Manufacturing Item","reorder အ level ကိုတင်ထားရန်, ကို item တစ်ခုဝယ်ယူပစ္စည်းသို့မဟုတ်ထုတ်လုပ်ခြင်းပစ္စည်းဖြစ်ရပါမည်"
 ,Supplier Addresses and Contacts,ပေးသွင်းလိပ်စာနှင့်ဆက်သွယ်ရန်
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,ပထမဦးဆုံးအမျိုးအစားလိုက်ကို select ကျေးဇူးပြု.
 apps/erpnext/erpnext/config/projects.py +18,Project master.,Project မှမာစတာ။
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,ငွေကြေးကိုမှစသည်တို့ $ တူသောသင်္ကေတကိုလာမယ့်မပြပါနဲ့။
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +330, (Half Day),(တစ်ဝက်နေ့)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +374, (Half Day),(တစ်ဝက်နေ့)
 DocType: Supplier,Credit Days,ခရက်ဒစ် Days
 DocType: Leave Type,Is Carry Forward,Forward ယူသွားတာဖြစ်ပါတယ်
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +478,Get Items from BOM,BOM ထံမှပစ္စည်းများ Get
@@ -3923,7 +3759,7 @@
 apps/erpnext/erpnext/config/manufacturing.py +120,Bill of Materials,ပစ္စည်းများ၏ဘီလ်
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +77,Row {0}: Party Type and Party is required for Receivable / Payable account {1},row {0}: ပါတီ Type နှင့်ပါတီ receiver / ပေးဆောင်အကောင့်ကို {1} သည်လိုအပ်သည်
 DocType: Dropbox Backup,Send Notifications To,ရန်အသိပေးချက်များ Send
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html +26,Ref Date,Ref နေ့စွဲ
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +54,Ref Date,Ref နေ့စွဲ
 DocType: Employee,Reason for Leaving,ထွက်ခွာရသည့်အကြောင်းရင်း
 DocType: Expense Claim Detail,Sanctioned Amount,ပိတ်ဆို့ငွေပမာဏ
 DocType: GL Entry,Is Opening,ဖွင့်လှစ်တာဖြစ်ပါတယ်
@@ -3931,4 +3767,3 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +188,Account {0} does not exist,အကောင့်ကို {0} မတည်ရှိပါဘူး
 DocType: Account,Cash,ငွေသား
 DocType: Employee,Short biography for website and other publications.,website နှင့်အခြားပုံနှိပ်ထုတ်ဝေအတိုကောက်အတ္ထုပ္ပတ္တိ။
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +31,Please create Salary Structure for employee {0},ဝန်ထမ်း {0} သည်လစာဖွဲ့စည်းပုံဖန်တီး ကျေးဇူးပြု.
diff --git a/erpnext/translations/nl.csv b/erpnext/translations/nl.csv
index 546fa2c..1202b5e 100644
--- a/erpnext/translations/nl.csv
+++ b/erpnext/translations/nl.csv
@@ -1,13 +1,12 @@
 DocType: Employee,Salary Mode,Salaris Modus
 DocType: Cost Center,"Select Monthly Distribution, if you want to track based on seasonality.","Selecteer Maandelijkse Distributie, als je wilt volgen op basis van seizoensinvloeden."
 DocType: Employee,Divorced,Gescheiden
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +86,Warning: Same item has been entered multiple times.,Waarschuwing: Hetzelfde item is meerdere keren ingevoerd.
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +80,Warning: Same item has been entered multiple times.,Waarschuwing: Hetzelfde item is meerdere keren ingevoerd.
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +96,Items already synced,Artikelen reeds gesynchroniseerd
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,Toestaan ​​Item om meerdere keren in een transactie worden toegevoegd
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,Annuleren Materiaal Bezoek {0} voor het annuleren van deze Garantie Claim
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +19,Consumer Products,Consumentenproducten
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,Consumentenproducten
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +68,Please select Party Type first,Selecteer Party Type eerste
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +90,Annealing,Gloeien
 DocType: Item,Customer Items,Klant Items
 apps/erpnext/erpnext/accounts/doctype/account/account.py +45,Account {0}: Parent account {1} can not be a ledger,Rekening {0}: Bovenliggende rekening {1} kan geen grootboek zijn
 DocType: Item,Publish Item to hub.erpnext.com,Publiceer Item om hub.erpnext.com
@@ -20,15 +19,14 @@
 DocType: About Us Settings,Website,Website
 DocType: POS Profile,Applicable for User,Toepasselijk voor gebruiker
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +169,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Gestopt productieorder kan niet worden geannuleerd, opendraaien het eerst te annuleren"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +23,Compaction plus sintering,Verdichting plus sinteren
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,Currency is required for Price List {0},Munt is nodig voor prijslijst {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Zal worden berekend in de transactie.
 DocType: Purchase Order,Customer Contact,Customer Contact
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +549,From Material Request,Van Materiaal Aanvraag
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +572,From Material Request,Van Materiaal Aanvraag
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} Boom
 DocType: Job Applicant,Job Applicant,Sollicitant
 apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,Geen andere resultaten.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +78,Legal,Wettelijk
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +34,Legal,Wettelijk
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +114,Actual type tax cannot be included in Item rate in row {0},Werkelijke soort belasting kan niet worden opgenomen in post tarief in rij {0}
 DocType: C-Form,Customer,Klant
 DocType: Purchase Receipt Item,Required By,Benodigd op
@@ -43,7 +41,6 @@
 DocType: Manufacturing Settings,Default 10 mins,Default 10 mins
 DocType: Leave Type,Leave Type Name,Verlof Type Naam
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +148,Series Updated Successfully,Reeks succesvol bijgewerkt
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +150,Stitching,Hechten
 DocType: Pricing Rule,Apply On,toepassing op
 DocType: Item Price,Multiple Item prices.,Meerdere Artikelprijzen .
 ,Purchase Order Items To Be Received,Inkooporder Artikelen nog te ontvangen
@@ -51,8 +48,8 @@
 DocType: Quality Inspection Reading,Parameter,Parameter
 apps/erpnext/erpnext/projects/doctype/project/project.py +43,Expected End Date can not be less than Expected Start Date,Verwachte Einddatum kan niet minder dan verwacht Startdatum zijn
 apps/erpnext/erpnext/utilities/transaction_base.py +104,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Rij # {0}: Beoordeel moet hetzelfde zijn als zijn {1}: {2} ({3} / {4})
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +189,New Leave Application,Nieuwe Verlofaanvraag
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +134,Bank Draft,Bank Draft
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +204,New Leave Application,Nieuwe Verlofaanvraag
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +134,Bank Draft,Bank Draft
 DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,1. Om de klantgebaseerde artikelcode te onderhouden om ze zoekbaar te maken op basis van hun code; gebruik deze optie
 DocType: Mode of Payment Account,Mode of Payment Account,Modus van Betaalrekening
 apps/erpnext/erpnext/stock/doctype/item/item.js +34,Show Variants,Toon Varianten
@@ -64,25 +61,23 @@
 DocType: Production Plan Item,Production Plan Item,Productie Plan Artikel
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +141,User {0} is already assigned to Employee {1},Gebruiker {0} is al aan Werknemer toegewezen {1}
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +13,Make new POS Profile,Maak nieuwe POS Profiel
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +31,Health Care,Gezondheidszorg
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,Gezondheidszorg
 DocType: Purchase Invoice,Monthly,Maandelijks
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +66,Delay in payment (Days),Vertraging in de betaling (Dagen)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +494,Invoice,Factuur
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +519,Invoice,Factuur
 DocType: Maintenance Schedule Item,Periodicity,Periodiciteit
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +357,Email Address,E-mailadres
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +21,Defense,Defensie
+apps/erpnext/erpnext/public/js/setup_wizard.js +107,Email Address,E-mailadres
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,Defensie
 DocType: Company,Abbr,Afk
 DocType: Appraisal Goal,Score (0-5),Score (0-5)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +193,Row {0}: {1} {2} does not match with {3},Rij {0}: {1} {2} niet overeenkomt met {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +67,Row # {0}:,Rij # {0}:
 DocType: Delivery Note,Vehicle No,Voertuig nr.
 apps/erpnext/erpnext/public/js/pos/pos.js +528,Please select Price List,Selecteer Prijslijst
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +162,Woodworking,Houtbewerking
 DocType: Production Order Operation,Work In Progress,Onderhanden Werk
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +153,3D printing,3D printing
 DocType: Employee,Holiday List,Holiday Lijst
 DocType: Time Log,Time Log,Tijd Log
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +530,Accountant,Accountant
+apps/erpnext/erpnext/public/js/setup_wizard.js +274,Accountant,Accountant
 DocType: Cost Center,Stock User,Aandeel Gebruiker
 DocType: Company,Phone No,Telefoonnummer
 DocType: Time Log,"Log of Activities performed by users against Tasks that can be used for tracking time, billing.",Log van activiteiten van gebruikers tegen taken die kunnen worden gebruikt voor het bijhouden van tijd facturering.
@@ -98,18 +93,19 @@
 DocType: Bin,Quantity Requested for Purchase,Aantal aangevraagd voor inkoop
 DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name","Bevestig .csv-bestand met twee kolommen, één voor de oude naam en één voor de nieuwe naam"
 DocType: Packed Item,Parent Detail docname,Bovenliggende Detail docname
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Kg,kg
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Kg,kg
 apps/erpnext/erpnext/config/hr.py +48,Opening for a Job.,Vacature voor een baan.
 DocType: Item Attribute,Increment,Aanwas
 apps/erpnext/erpnext/public/js/stock_analytics.js +63,Select Warehouse...,Kies Warehouse ...
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +6,Advertising,Adverteren
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,Adverteren
+apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,Hetzelfde bedrijf is meer dan één keer ingevoerd
 DocType: Employee,Married,Getrouwd
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +389,Stock cannot be updated against Delivery Note {0},Voorraad kan niet worden bijgewerkt obv Vrachtbrief {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +391,Stock cannot be updated against Delivery Note {0},Voorraad kan niet worden bijgewerkt obv Vrachtbrief {0}
 DocType: Payment Reconciliation,Reconcile,Afletteren
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +30,Grocery,Kruidenierswinkel
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,Kruidenierswinkel
 DocType: Quality Inspection Reading,Reading 1,Meting 1
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Make Bank Entry,Maak Bank Entry
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +40,Pension Funds,pensioenfondsen
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,pensioenfondsen
 apps/erpnext/erpnext/accounts/doctype/account/account.py +142,Warehouse is mandatory if account type is Warehouse,Magazijn is verplicht als het account type Warehouse
 DocType: SMS Center,All Sales Person,Alle Sales Person
 DocType: Lead,Person Name,Persoon Naam
@@ -124,14 +120,14 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +141,You are not authorized to add or update entries before {0},U bent niet bevoegd om items toe te voegen of bij te werken voor {0}
 DocType: Item,Item Image (if not slideshow),Artikel Afbeelding (indien niet diashow)
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,Een klant bestaat met dezelfde naam
-DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(Uurtarief/60) * De werkelijke Operation Time
+DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(Uurtarief / 60) * Werkelijk Gepresteerde Tijd
 DocType: SMS Log,SMS Log,SMS Log
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,Kosten van geleverde zaken
 DocType: Blog Post,Guest,Gast
 DocType: Quality Inspection,Get Specification Details,Get Specificatie Details
 DocType: Lead,Interested,Geïnteresseerd
 apps/erpnext/erpnext/config/manufacturing.py +14,Bill of Material,Stuklijst
-apps/erpnext/erpnext/public/js/stock_analytics.js +45,Opening,Opening
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +158,Opening,Opening
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},Van {0} tot {1}
 DocType: Item,Copy From Item Group,Kopiëren van Item Group
 DocType: Journal Entry,Opening Entry,Opening Entry
@@ -145,23 +141,22 @@
 DocType: Employee Education,Under Graduate,Onder Graduate
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +22,Target On,Doel op
 DocType: BOM,Total Cost,Totale kosten
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +99,Reaming,Ruimen
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +9,Activity Log:,Activiteitenlogboek:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +199,Item {0} does not exist in the system or has expired,Artikel {0} bestaat niet in het systeem of is verlopen
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +44,Real Estate,Vastgoed
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +44,Real Estate,Vastgoed
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +4,Statement of Account,Rekeningafschrift
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +41,Pharmaceuticals,Geneesmiddelen
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,Geneesmiddelen
 DocType: Expense Claim Detail,Claim Amount,Claim Bedrag
 DocType: Employee,Mr,De heer
 DocType: Custom Script,Client,Klant
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,Leverancier Type / leverancier
 DocType: Naming Series,Prefix,Voorvoegsel
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Consumable,Verbruiksartikelen
+apps/erpnext/erpnext/public/js/setup_wizard.js +359,Consumable,Verbruiksartikelen
 DocType: Upload Attendance,Import Log,Importeren Log
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.js +19,Send,Verstuur
 DocType: Sales Invoice Item,Delivered By Supplier,Geleverd door Leverancier
 DocType: SMS Center,All Contact,Alle Contact
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +164,Annual Salary,Jaarsalaris
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +164,Annual Salary,Jaarsalaris
 DocType: Period Closing Voucher,Closing Fiscal Year,Het sluiten van het fiscale jaar
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +69,Stock Expenses,Voorraadkosten
 DocType: Newsletter,Email Sent?,E-mail verzonden?
@@ -169,26 +164,24 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +92,Show Time Logs,Show Time Logs
 DocType: Journal Entry Account,Credit in Company Currency,Credit Company in Valuta
 DocType: Delivery Note,Installation Status,Installatie Status
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +115,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Geaccepteerde + Verworpen Aantal moet gelijk zijn aan Ontvangen aantal zijn voor Artikel {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +118,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Geaccepteerde + Verworpen Aantal moet gelijk zijn aan Ontvangen aantal zijn voor Artikel {0}
 DocType: Item,Supply Raw Materials for Purchase,Supply Grondstoffen voor Aankoop
 apps/erpnext/erpnext/stock/get_item_details.py +133,Item {0} must be a Purchase Item,Artikel {0} moet een inkoopbaar artikel zijn
 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","Download de Template, vul de juiste gegevens in en voeg het gewijzigde bestand bij. Alle data en toegewezen werknemer in de geselecteerde periode zullen in de sjabloon komen, met bestaande presentielijsten"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +446,Item {0} is not active or end of life has been reached,ARtikel {0} is niet actief of heeft einde levensduur bereikt
 DocType: Time Log Batch,Will be updated after Sales Invoice is Submitted.,Zal worden bijgewerkt zodra verkoopfactuur is ingediend.
-apps/erpnext/erpnext/controllers/accounts_controller.py +493,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Om Belastingen op te nemen in het Artikeltarief in rij {0}, moeten de belastingen in rijen {1} ook worden opgenomen "
+apps/erpnext/erpnext/controllers/accounts_controller.py +494,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Om Belastingen op te nemen in het Artikeltarief in rij {0}, moeten de belastingen in rijen {1} ook worden opgenomen "
 apps/erpnext/erpnext/config/hr.py +90,Settings for HR Module,Instellingen voor HR Module
 DocType: SMS Center,SMS Center,SMS Center
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +78,Straightening,Rechttrekken
 DocType: BOM Replace Tool,New BOM,Nieuwe Eenheid
 apps/erpnext/erpnext/config/projects.py +28,Batch Time Logs for billing.,Batch Tijd Logs voor Billing.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +15,Countergravity casting,Countergravity casting
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +30,Newsletter has already been sent,Newsletter reeds verzonden
 DocType: Lead,Request Type,Aanvraag type
 DocType: Leave Application,Reason,Reden
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +14,Broadcasting,Uitzenden
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +140,Execution,Uitvoering
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +364,The first user will become the System Manager (you can change this later).,De eerste gebruiker zal de System Manager te worden (u kunt deze later wijzigen).
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,Uitzenden
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +140,Execution,Uitvoering
+apps/erpnext/erpnext/public/js/setup_wizard.js +114,The first user will become the System Manager (you can change this later).,De eerste gebruiker zal de System Manager te worden (u kunt deze later wijzigen).
 apps/erpnext/erpnext/config/manufacturing.py +39,Details of the operations carried out.,Details van de uitgevoerde handelingen.
 DocType: Serial No,Maintenance Status,Onderhoud Status
 apps/erpnext/erpnext/config/stock.py +263,Items and Pricing,Artikelen en prijzen
@@ -205,7 +198,6 @@
 DocType: Pricing Rule,Discount on Price List Rate (%),Korting op de prijslijst Rate (%)
 apps/frappe/frappe/public/js/frappe/form/print.js +96,Start,Start
 DocType: User,First Name,Voornaam
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +12,Full-mold casting,Full-mal gieten
 DocType: Offer Letter,Select Terms and Conditions,Select Voorwaarden
 DocType: Production Planning Tool,Sales Orders,Verkooporders
 DocType: Purchase Taxes and Charges,Valuation,Waardering
@@ -217,8 +209,7 @@
 DocType: Bank Reconciliation,Bank Account,Bankrekening
 DocType: Leave Type,Allow Negative Balance,Laat negatief saldo
 DocType: Selling Settings,Default Territory,Standaard Regio
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +53,Television,televisie
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +138,Gashing,Gashing
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,televisie
 DocType: Production Order Operation,Updated via 'Time Log',Bijgewerkt via 'Time Log'
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +82,Account {0} does not belong to Company {1},Rekening {0} behoort niet tot Bedrijf {1}
 DocType: Naming Series,Series List for this Transaction,Reeks voor deze transactie
@@ -233,14 +224,13 @@
 DocType: Leave Allocation,Add unused leaves from previous allocations,Voeg ongebruikte bladeren van de vorige toewijzingen
 apps/erpnext/erpnext/controllers/recurring_document.py +206,Next Recurring {0} will be created on {1},Volgende terugkerende {0} zal worden gemaakt op {1}
 DocType: Newsletter List,Total Subscribers,Totaal Abonnees
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +575,Contact Name,Contact Naam
+,Contact Name,Contact Naam
 DocType: Production Plan Item,SO Pending Qty,VO afwachting Aantal
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Maakt salarisstrook voor de bovengenoemde criteria.
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,Inkoopaanvraag
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +107,Double housing,Dubbele behuizing
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +156,Only the selected Leave Approver can submit this Leave Application,Alleen de geselecteerde Verlof Goedkeurder kan deze verlofaanvraag indienen
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +171,Only the selected Leave Approver can submit this Leave Application,Alleen de geselecteerde Verlof Goedkeurder kan deze verlofaanvraag indienen
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,Ontslagdatum moet groter zijn dan datum van indiensttreding
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +172,Leaves per Year,Verlaat per jaar
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +172,Leaves per Year,Verlaat per jaar
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup > Settings > Naming Series,Stel Naming Series voor {0} via Setup&gt; Instellingen&gt; Naamgeving Series
 DocType: Time Log,Will be updated when batched.,Zal worden bijgewerkt wanneer gedoseerd.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +104,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,Rij {0}: Kijk 'Is Advance' tegen Account {1} als dit is een voorschot binnenkomst.
@@ -249,26 +239,25 @@
 DocType: Item Website Specification,Item Website Specification,Artikel Website Specificatie
 DocType: Dropbox Backup,Dropbox Access Key,Dropbox Access Key
 DocType: Payment Tool,Reference No,Referentienummer
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +348,Leave Blocked,Verlof Geblokkeerd
-apps/erpnext/erpnext/stock/doctype/item/item.py +535,Item {0} has reached its end of life on {1},Artikel {0} heeft het einde van zijn levensduur bereikt op {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +392,Leave Blocked,Verlof Geblokkeerd
+apps/erpnext/erpnext/stock/doctype/item/item.py +539,Item {0} has reached its end of life on {1},Artikel {0} heeft het einde van zijn levensduur bereikt op {1}
 apps/erpnext/erpnext/accounts/utils.py +339,Annual,jaar-
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Voorraad Afletteren Artikel
 DocType: Stock Entry,Sales Invoice No,Verkoopfactuur nr.
 DocType: Material Request Item,Min Order Qty,Minimum Aantal
 DocType: Lead,Do Not Contact,Neem geen contact op
 DocType: Sales Invoice,The unique id for tracking all recurring invoices. It is generated on submit.,De unieke ID voor het bijhouden van alle terugkerende facturen. Het wordt gegenereerd bij het indienen.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +93,Software Developer,Software Ontwikkelaar
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +93,Software Developer,Software Ontwikkelaar
 DocType: Item,Minimum Order Qty,Minimum bestel aantal
 DocType: Pricing Rule,Supplier Type,Leverancier Type
 DocType: Item,Publish in Hub,Publiceren in Hub
 ,Terretory,Regio
-apps/erpnext/erpnext/stock/doctype/item/item.py +555,Item {0} is cancelled,Artikel {0} is geannuleerd
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +598,Material Request,"Materiaal Aanvraag
+apps/erpnext/erpnext/stock/doctype/item/item.py +559,Item {0} is cancelled,Artikel {0} is geannuleerd
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +607,Material Request,"Materiaal Aanvraag
 "
 DocType: Bank Reconciliation,Update Clearance Date,Werk Clearance Datum
 DocType: Item,Purchase Details,Inkoop 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},Item {0} niet gevonden in &#39;Raw Materials geleverd&#39; tafel in Purchase Order {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +129,Wire brushing,Staalborstel
 DocType: Employee,Relation,Relatie
 DocType: Shipping Rule,Worldwide Shipping,Wereldwijde verzending
 apps/erpnext/erpnext/config/selling.py +23,Confirmed orders from Customers.,Bevestigde orders van klanten.
@@ -284,12 +273,11 @@
 DocType: Supplier,Address HTML,Adres HTML
 DocType: Lead,Mobile No.,Mobiel nummer
 DocType: Maintenance Schedule,Generate Schedule,Genereer Plan
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +81,Hubbing,Hubbing
 DocType: Purchase Invoice Item,Expense Head,Kosten Hoofd
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +86,Please select Charge Type first,Selecteer eerst een Charge Type
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,laatst
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +395,Max 5 characters,Max. 5 tekens
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +195,Select Your Language,Selecteer uw taal
+apps/erpnext/erpnext/public/js/setup_wizard.js +143,Max 5 characters,Max. 5 tekens
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +245,Select Your Language,Selecteer uw taal
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,De eerste Verlofgoedkeurder in de lijst wordt als de standaard Verlofgoedkeurder ingesteld
 DocType: Manufacturing Settings,"Disables creation of time logs against Production Orders.
 Operations shall not be tracked against Production Order",Schakelt creatie van tijd logs tegen productieorders. Operations mag niet worden gevolgd tegen Productieorder
@@ -301,8 +289,6 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +34,Item {0} must be Service Item,Artikel {0} moet service-artikel zijn
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +303,Completed Qty can not be greater than 'Qty to Manufacture',Voltooide Aantal kan niet groter zijn dan 'Aantal aan Manufacture'
 DocType: DocType,Administrator,Beheerder
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +136,Laser drilling,Laserboren
-DocType: Stock UOM Replace Utility,New Stock UOM,Nieuwe Voorraad Eenheid
 DocType: Period Closing Voucher,Closing Account Head,Sluiten Account Hoofd
 DocType: Employee,External Work History,Externe Werk Geschiedenis
 apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,Kringverwijzing Error
@@ -311,18 +297,15 @@
 DocType: Lead,Industry,Industrie
 DocType: Employee,Job Profile,Functieprofiel
 DocType: Newsletter,Newsletter,Nieuwsbrief
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +84,Hydroforming,Hydroforming
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +49,Necking,Insnoering
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Notificeer per e-mail bij automatisch aanmaken van Materiaal Aanvraag
 DocType: Journal Entry,Multi Currency,Valuta
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +51,Item is updated,Het artikel is bijgewerkt
 DocType: Async Task,System Manager,System Manager
 DocType: Payment Reconciliation Invoice,Invoice Type,Factuur Type
 DocType: Sales Invoice Item,Delivery Note,Vrachtbrief
 DocType: Dropbox Backup,Allow Dropbox Access,Laat Dropbox Access
 apps/erpnext/erpnext/config/learn.py +72,Setting up Taxes,Het opzetten van Belastingen
 apps/erpnext/erpnext/accounts/utils.py +189,Payment Entry has been modified after you pulled it. Please pull it again.,Betaling Bericht is gewijzigd nadat u het getrokken. Neem dan trekt het weer.
-apps/erpnext/erpnext/stock/doctype/item/item.py +343,{0} entered twice in Item Tax,{0} twee keer opgenomen in Artikel BTW
+apps/erpnext/erpnext/stock/doctype/item/item.py +347,{0} entered twice in Item Tax,{0} twee keer opgenomen in Artikel BTW
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +105,Summary for this week and pending activities,Samenvatting voor deze week en in afwachting van activiteiten
 DocType: Workstation,Rent Cost,Huurkosten
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +74,Please select month and year,Selecteer maand en jaar
@@ -339,24 +322,22 @@
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,Koers waarmee de Klant Valuta wordt omgerekend naar de basisvaluta van de klant.
 DocType: Features Setup,"Available in BOM, Delivery Note, Purchase Invoice, Production Order, Purchase Order, Purchase Receipt, Sales Invoice, Sales Order, Stock Entry, Timesheet","Verkrijgbaar in BOM , Delivery Note, aankoopfactuur, Productie Order , Bestelling , Kwitantie , verkoopfactuur , Sales Order , Voorraad Entry , Rooster"
 DocType: Item Tax,Tax Rate,Belastingtarief
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Select Item,Selecteer Item
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +540,Select Item,Selecteer Item
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +143,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","Item: {0} beheerd batchgewijs, is niet te rijmen met behulp \
  Stock Verzoening, in plaats daarvan gebruik Stock Entry"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +259,Purchase Invoice {0} is already submitted,Inkoopfactuur {0} is al ingediend
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +262,Purchase Invoice {0} is already submitted,Inkoopfactuur {0} is al ingediend
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Batch No must be same as {1} {2},Rij # {0}: Batch Geen moet hetzelfde zijn als zijn {1} {2}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Convert to non-Group,Converteren naar non-Group
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +55,Purchase Receipt must be submitted,Aankoopbon moet worden ingediend
-DocType: Stock UOM Replace Utility,Current Stock UOM,Huidige voorraad eenheid
 apps/erpnext/erpnext/config/stock.py +53,Batch (lot) of an Item.,Partij van een artikel.
 DocType: C-Form Invoice Detail,Invoice Date,Factuurdatum
 DocType: GL Entry,Debit Amount,Debet Bedrag
 apps/erpnext/erpnext/accounts/party.py +223,There can only be 1 Account per Company in {0} {1},Er kan slechts 1 account per Bedrijf in zijn {0} {1}
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Your email address,Uw e-mailadres
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +194,Please see attachment,Zie bijlage
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +203,Please see attachment,Zie bijlage
 DocType: Purchase Order,% Received,% Ontvangen
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +109,Water jet cutting,Waterstraalsnijden
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +24,Setup Already Complete!!,Installatie al voltooid !
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +20,Setup Already Complete!!,Installatie al voltooid !
 ,Finished Goods,Gereed Product
 DocType: Delivery Note,Instructions,Instructies
 DocType: Quality Inspection,Inspected By,Geïnspecteerd door
@@ -371,6 +352,7 @@
 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.,Gelieve geen accounts voor klanten en leveranciers te creëren. Ze worden rechtstreeks gemaakt op basis van de klant / leverancier meesters.
 DocType: Currency Exchange,Currency Exchange,Wisselkoersen
 DocType: Purchase Invoice Item,Item Name,Artikelnaam
+DocType: Authorization Rule,Approving User  (above authorized value),Goedkeuren gebruiker (boven de toegestane waarde)
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Credit Balance,Batig saldo
 DocType: Employee,Widowed,Weduwe
 DocType: Production Planning Tool,"Items to be requested which are ""Out of Stock"" considering all warehouses based on projected qty and minimum order qty","Artikelen die worden aangevraagd die ""Niet op voorraad"" zijn, rekening houdend met alle magazijnen op basis van verwachte aantal en minimale bestelhoeveelheid"
@@ -380,11 +362,10 @@
 ,Purchase Register,Inkoop Register
 DocType: Landed Cost Item,Applicable Charges,Toepasselijke kosten
 DocType: Workstation,Consumable Cost,Verbruikskosten
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,{0} ({1}) must have role 'Leave Approver',{0} ({1}) moet rol hebben 'Verlof Goedkeurder' hebben
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +167,{0} ({1}) must have role 'Leave Approver',{0} ({1}) moet rol hebben 'Verlof Goedkeurder' hebben
 DocType: Purchase Receipt,Vehicle Date,Vehicle Data
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +39,Medical,medisch
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +39,Medical,medisch
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,Reden voor het verliezen
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +36,Tube beading,Tube kralen
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},Werkstation is gesloten op de volgende data als per Holiday Lijst: {0}
 DocType: Employee,Single,Enkele
 DocType: Issue,Attachment,Gehechtheid
@@ -405,10 +386,8 @@
 DocType: Account,Is Group,Is Group
 DocType: Stock Settings,Automatically Set Serial Nos based on FIFO,Automatisch instellen serienummers op basis van FIFO
 DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,Controleer Leverancier Factuurnummer Uniqueness
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +31,Thermoforming,Thermoforming
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +66,Slitting,Scheurende
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +57,'To Case No.' cannot be less than 'From Case No.','Tot Zaak nr' kan niet minder zijn dan 'Van Zaak nr'
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +104,Non Profit,Non-Profit
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +104,Non Profit,Non-Profit
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_list.js +7,Not Started,Niet gestart
 DocType: Lead,Channel Partner,Channel Partner
 DocType: Account,Old Parent,Oude Parent
@@ -417,13 +396,12 @@
 apps/erpnext/erpnext/config/manufacturing.py +74,Global settings for all manufacturing processes.,Algemene instellingen voor alle productieprocessen.
 DocType: Accounts Settings,Accounts Frozen Upto,Rekeningen bevroren tot
 DocType: SMS Log,Sent On,Verzonden op
-apps/erpnext/erpnext/stock/doctype/item/item.py +512,Attribute {0} selected multiple times in Attributes Table,Kenmerk {0} meerdere keren geselecteerd in Attributes Tabel
+apps/erpnext/erpnext/stock/doctype/item/item.py +516,Attribute {0} selected multiple times in Attributes Table,Kenmerk {0} meerdere keren geselecteerd in Attributes Tabel
 DocType: Sales Order,Not Applicable,Niet van toepassing
 apps/erpnext/erpnext/config/hr.py +140,Holiday master.,Vakantie meester .
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +19,Shell molding,Shell moulding
 DocType: Material Request Item,Required Date,Benodigd op datum
 DocType: Delivery Note,Billing Address,Factuuradres
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +644,Please enter Item Code.,Vul Artikelcode in.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +648,Please enter Item Code.,Vul Artikelcode in.
 DocType: BOM,Costing,Costing
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount","Indien aangevinkt, zal de BTW-bedrag worden beschouwd als reeds in de Print Tarief / Print Bedrag"
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,Totaal Aantal
@@ -433,7 +411,7 @@
 DocType: Item Attribute,To Range,Om Bereik
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Effecten en Deposito's
 DocType: Features Setup,Imports,Imports
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +144,Adhesive bonding,Lijmen
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +77,Total leaves allocated is mandatory,Totaal bladeren toegewezen is verplicht
 DocType: Job Opening,Description of a Job Opening,Omschrijving van een Vacature
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +102,Pending activities for today,Afwachting van activiteiten voor vandaag
 apps/erpnext/erpnext/config/hr.py +28,Attendance record.,Aanwezigheid record.
@@ -441,26 +419,25 @@
 DocType: Sales Order Item,Used for Production Plan,Gebruikt voor Productie Plan
 DocType: System Settings,Loading...,Laden ...
 DocType: DocField,Password,Wachtwoord
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +155,Fused deposition modeling,Fused Deposition Modeling
 DocType: Manufacturing Settings,Time Between Operations (in mins),Time Between Operations (in minuten)
 DocType: Customer,Buyer of Goods and Services.,Koper van goederen en diensten.
 DocType: Journal Entry,Accounts Payable,Crediteuren
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +24,Add Subscribers,Abonnees toevoegen
 apps/erpnext/erpnext/public/js/feature_setup.js +220,""" does not exists",""" Bestaat niet"
 DocType: Pricing Rule,Valid Upto,Geldig Tot
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +564,List a few of your customers. They could be organizations or individuals.,Lijst een paar van uw klanten. Ze kunnen organisaties of personen .
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,List a few of your customers. They could be organizations or individuals.,Lijst een paar van uw klanten. Ze kunnen organisaties of personen .
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Direct Income,Directe Inkomsten
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +33,"Can not filter based on Account, if grouped by Account","Kan niet filteren op basis van Rekening, indien gegroepeerd op Rekening"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +88,Administrative Officer,Boekhouder
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Administrative Officer,Boekhouder
 DocType: Payment Tool,Received Or Paid,Ontvangen of betaald
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +318,Please select Company,Selecteer Company
 DocType: Stock Entry,Difference Account,Verschillenrekening
 apps/erpnext/erpnext/projects/doctype/task/task.py +44,Cannot close task as its dependant task {0} is not closed.,Kan niet dicht taak als haar afhankelijke taak {0} is niet gesloten.
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +305,Please enter Warehouse for which Material Request will be raised,Vul magazijn in waarvoor Materiaal Aanvragen zullen worden ingediend.
 DocType: Production Order,Additional Operating Cost,Additionele Operationele Kosten
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +20,Cosmetics,Cosmetica
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,Cosmetica
 DocType: DocField,Type,Type
-apps/erpnext/erpnext/stock/doctype/item/item.py +417,"To merge, following properties must be same for both items","Om samen te voegen, moeten de volgende eigenschappen hetzelfde zijn voor beide artikelen"
+apps/erpnext/erpnext/stock/doctype/item/item.py +421,"To merge, following properties must be same for both items","Om samen te voegen, moeten de volgende eigenschappen hetzelfde zijn voor beide artikelen"
 DocType: Communication,Subject,Onderwerp
 DocType: Shipping Rule,Net Weight,Netto Gewicht
 DocType: Employee,Emergency Phone,Noodgeval Telefoonnummer
@@ -470,7 +447,6 @@
 DocType: Journal Entry,Difference (Dr - Cr),Verschil (Db - Cr)
 DocType: Account,Profit and Loss,Winst en Verlies
 apps/erpnext/erpnext/config/stock.py +293,Managing Subcontracting,Managing Subcontracting
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +58,New UOM must NOT be of type Whole Number,Nieuwe Eenheid mag NIET van het type Geheel getal zijn
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Furniture and Fixture,Meubilair en Inrichting
 DocType: Quotation,Rate at which Price list currency is converted to company's base currency,Koers waarmee Prijslijst valuta wordt omgerekend naar de basis bedrijfsvaluta
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Account {0} does not belong to company: {1},Rekening {0} behoort niet tot bedrijf: {1}
@@ -490,14 +466,14 @@
 DocType: Purchase Invoice,Supplier Invoice No,Factuurnr. Leverancier
 DocType: Territory,For reference,Ter referentie
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +154,"Cannot delete Serial No {0}, as it is used in stock transactions","Kan niet verwijderen Serienummer {0}, zoals het wordt gebruikt in de voorraad transacties"
-apps/erpnext/erpnext/public/js/account_tree_grid.js +52,Closing (Cr),Sluiten (Cr)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +227,Closing (Cr),Sluiten (Cr)
 DocType: Serial No,Warranty Period (Days),Garantieperiode (dagen)
 DocType: Installation Note Item,Installation Note Item,Installatie Opmerking Item
 ,Pending Qty,In afwachting Aantal
 DocType: Job Applicant,Thread HTML,Thread HTML
 DocType: Company,Ignore,Negeren
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +86,SMS sent to following numbers: {0},SMS verzonden naar volgende nummers: {0}
-apps/erpnext/erpnext/controllers/buying_controller.py +135,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Leverancier Magazijn verplicht voor uitbesteedde Ontvangstbewijs
+apps/erpnext/erpnext/controllers/buying_controller.py +126,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Leverancier Magazijn verplicht voor uitbesteedde Ontvangstbewijs
 DocType: Pricing Rule,Valid From,Geldig van
 DocType: Sales Invoice,Total Commission,Totaal Commissie
 DocType: Pricing Rule,Sales Partner,Verkoop Partner
@@ -505,7 +481,7 @@
 DocType: Monthly Distribution,"**Monthly Distribution** helps you distribute your budget across months if you have seasonality in your business.
 
 To distribute a budget using this distribution, set this **Monthly Distribution** in the **Cost Center**","**Maandelijkse Verdeling** helpt u uw budget te verdelen over maanden als u seizoensgebondenheid in uw bedrijf heeft. Om een ​​budget te verdelen met behulp van deze verdeling, stelt u deze **Maandelijkse Verdeling** in in de **Kostenplaats**"
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +183,No records found in the Invoice table,Geen records gevonden in de factuur tabel
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +130,No records found in the Invoice table,Geen records gevonden in de factuur tabel
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +20,Please select Company and Party Type first,Selecteer Company en Party Type eerste
 apps/erpnext/erpnext/config/accounts.py +84,Financial / accounting year.,Financiële / boekjaar .
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","Sorry , serienummers kunnen niet worden samengevoegd"
@@ -521,25 +497,25 @@
 DocType: Sales Order,Billing and Delivery Status,Facturering en Delivery Status
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Terugkerende klanten
 DocType: Leave Control Panel,Allocate,Toewijzen
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +16,Previous,vorig
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard_page.html +16,Previous,vorig
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +620,Sales Return,Terugkerende verkoop
 DocType: Production Planning Tool,Select Sales Orders from which you want to create Production Orders.,Selecteer Verkooporders op basis waarvan u Productie Orders wilt maken.
 DocType: Item,Delivered by Supplier (Drop Ship),Geleverd door Leverancier (Drop Ship)
 apps/erpnext/erpnext/config/hr.py +120,Salary components.,Salaris componenten.
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,Database van potentiële klanten.
+DocType: Authorization Rule,Customer or Item,Klant of Item
 apps/erpnext/erpnext/config/crm.py +17,Customer database.,Klantenbestand.
 DocType: Quotation,Quotation To,Offerte Voor
 DocType: Lead,Middle Income,Modaal Inkomen
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),Opening ( Cr )
 apps/erpnext/erpnext/accounts/utils.py +193,Allocated amount can not be negative,Toegekende bedrag kan niet negatief zijn
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +123,Tumbling,Tumbling
 DocType: Purchase Order Item,Billed Amt,Gefactureerd Bedr
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,Een logisch Magazijn waartegen voorraadboekingen worden gemaakt.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +92,Reference No & Reference Date is required for {0},Referentienummer en referentiedatum nodig is voor {0}
 DocType: Event,Wednesday,Woensdag
 DocType: Sales Invoice,Customer's Vendor,Leverancier van Klant
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +214,Production Order is Mandatory,Productie Order is Verplicht
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +139,Proposal Writing,Voorstel Schrijven
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,Proposal Writing,Voorstel Schrijven
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,Een andere Sales Person {0} bestaat met dezelfde werknemer id
 apps/erpnext/erpnext/stock/stock_ledger.py +336,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},Negatieve Voorraad Fout ({6}) voor Artikel {0} in Magazijn {1} op {2} {3} in {4} {5}
 DocType: Fiscal Year Company,Fiscal Year Company,Fiscale Jaar Company
@@ -562,7 +538,7 @@
 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.","Dan worden prijsregels uitgefilterd op basis van Klant, Klantgroep, Regio,  Leverancier, Leverancier Type, Campagne, Verkooppartner, etc."
 apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.py +179,Please install dropbox python module,Installeer dropbox python module
 DocType: Employee,Passport Number,Paspoortnummer
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +82,Manager,Manager
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Manager,Manager
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +494,From Purchase Receipt,Van Ontvangstbevestiging
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +219,Same item has been entered multiple times.,Hetzelfde item is meerdere keren ingevoerd.
 DocType: SMS Settings,Receiver Parameter,Receiver Parameter
@@ -570,10 +546,9 @@
 DocType: Sales Person,Sales Person Targets,Verkoper Doelen
 apps/frappe/frappe/public/js/frappe/form/workflow.js +116,To,naar
 apps/frappe/frappe/templates/base.html +145,Please enter email address,Vul het e-mailadres in
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +35,End tube forming,Eindbuis vormen
 DocType: Production Order Operation,In minutes,In minuten
 DocType: Issue,Resolution Date,Oplossing Datum
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +635,Please set default Cash or Bank account in Mode of Payment {0},Stel een standaard Kas- of Bankrekening in bij Betaalwijze {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +637,Please set default Cash or Bank account in Mode of Payment {0},Stel een standaard Kas- of Bankrekening in bij Betaalwijze {0}
 DocType: Selling Settings,Customer Naming By,Klant Naming Door
 apps/erpnext/erpnext/accounts/doctype/account/account.js +67,Convert to Group,Converteren naar Groep
 DocType: Activity Cost,Activity Type,Activiteit Type
@@ -581,12 +556,12 @@
 DocType: Customer,Fixed Days,Vaste Dagen
 DocType: Sales Invoice,Packing List,Paklijst
 apps/erpnext/erpnext/config/buying.py +28,Purchase Orders given to Suppliers.,Inkooporders voor leveranciers.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +43,Publishing,Publishing
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +43,Publishing,Publishing
 DocType: Activity Cost,Projects User,Projecten Gebruiker
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Consumed,Consumed
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +198,{0}: {1} not found in Invoice Details table,{0}: {1} niet gevonden in Factuur Details tabel
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,{0}: {1} not found in Invoice Details table,{0}: {1} niet gevonden in Factuur Details tabel
 DocType: Company,Round Off Cost Center,Afronden kostenplaats
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +208,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Onderhoud Bezoek {0} moet worden geannuleerd voordat het annuleren van deze verkooporder
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +203,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Onderhoud Bezoek {0} moet worden geannuleerd voordat het annuleren van deze verkooporder
 DocType: Material Request,Material Transfer,Materiaal Verplaatsing
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +56,Opening (Dr),Opening ( Dr )
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},Plaatsing timestamp moet na {0} zijn
@@ -598,7 +573,6 @@
 DocType: Pricing Rule,Sales Manager,Verkoopsmanager
 apps/frappe/frappe/public/js/frappe/model/model.js +492,Rename,Hernoemen
 DocType: Journal Entry,Write Off Amount,Afschrijvingsbedrag
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +52,Bending,Verbuiging
 apps/frappe/frappe/core/page/user_permissions/user_permissions.js +246,Allow User,Door gebruiker toestaan
 DocType: Journal Entry,Bill No,Factuur nr
 DocType: Purchase Invoice,Quarterly,Kwartaal
@@ -608,17 +582,16 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Please enter item details,Vul artikeldetails in
 DocType: Purchase Receipt,Other Details,Andere Details
 DocType: Account,Accounts,Rekeningen
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +67,Marketing,Marketing
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +65,Straight shearing,Straight scheren
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +67,Marketing,Marketing
 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.,Het bijhouden van een artikel in verkoop- en inkoopdocumenten op basis van het serienummer. U kunt hiermee ook de garantiedetails van het product bijhouden.
 DocType: Purchase Receipt Item Supplied,Current Stock,Huidige voorraad
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +99,Rejected Warehouse is mandatory against regected item,Afgewezen Magazijn is verplicht bij een afgewezen Artikel.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +102,Rejected Warehouse is mandatory against regected item,Afgewezen Magazijn is verplicht bij een afgewezen Artikel.
 DocType: Account,Expenses Included In Valuation,Kosten inbegrepen in waardering
 DocType: Employee,Provide email id registered in company,Zorg voor een bedrijfs e-mail ID
 DocType: Hub Settings,Seller City,Verkoper Stad
 DocType: Email Digest,Next email will be sent on:,Volgende e-mail wordt verzonden op:
 DocType: Offer Letter Term,Offer Letter Term,Aanbod Letter Term
-apps/erpnext/erpnext/stock/doctype/item/item.py +492,Item has variants.,Item heeft varianten.
+apps/erpnext/erpnext/stock/doctype/item/item.py +496,Item has variants.,Item heeft varianten.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Artikel {0} niet gevonden
 DocType: Bin,Stock Value,Voorraad Waarde
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,Boom Type
@@ -627,10 +600,9 @@
 DocType: Material Request Item,Quantity and Warehouse,Hoeveelheid en magazijn
 DocType: Sales Invoice,Commission Rate (%),Commissie Rate (%)
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +172,"Against Voucher Type must be one of Sales Order, Sales Invoice or Journal Entry","Tegen Voucher Typ een van Sales Order, verkoopfactuur of Inboeken moet zijn"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +139,Biomachining,Biomachining
 apps/erpnext/erpnext/setup/utils.py +89,Unable to find exchange rate,Niet in staat om wisselkoers vinden
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +7,Aerospace,Ruimtevaart
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +19,Welcome,Welkom
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +7,Aerospace,Ruimtevaart
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +40,Welcome,Welkom
 DocType: Journal Entry,Credit Card Entry,Credit Card Entry
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +18,Task Subject,Taak Onderwerp
 apps/erpnext/erpnext/config/stock.py +33,Goods received from Suppliers.,Goederen ontvangen van leveranciers.
@@ -653,19 +625,19 @@
 DocType: Employee,Cell Number,Mobiele nummer
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Verloren
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +120,You can not enter current voucher in 'Against Journal Entry' column,Je kan niet in de huidige voucher in 'Tegen Journal Entry' kolom
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +25,Energy,Energie
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,Energie
 DocType: Opportunity,Opportunity From,Opportunity Van
 apps/erpnext/erpnext/config/hr.py +33,Monthly salary statement.,Maandsalaris overzicht.
 DocType: Item Group,Website Specifications,Website Specificaties
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +205,New Account,Nieuwe Rekening
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +21,{0}: From {0} of type {1},{0}: Van {0} van type {1}
-apps/erpnext/erpnext/controllers/buying_controller.py +283,Row {0}: Conversion Factor is mandatory,Rij {0}: Conversie Factor is verplicht
+apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,Rij {0}: Conversie Factor is verplicht
 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.,Boekingen kunnen worden gemaakt tegen leaf nodes. Inzendingen tegen groepen zijn niet toegestaan.
 DocType: ToDo,High,Hoog
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +361,Cannot deactivate or cancel BOM as it is linked with other BOMs,Kan stuklijst niet deactiveren of annuleren aangezien het is gelinkt met andere stuklijsten.
 DocType: Opportunity,Maintenance,Onderhoud
 DocType: User,Male,Mannelijk
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +182,Purchase Receipt number required for Item {0},Ontvangstbevestiging nummer vereist voor Artikel {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +183,Purchase Receipt number required for Item {0},Ontvangstbevestiging nummer vereist voor Artikel {0}
 DocType: Item Attribute Value,Item Attribute Value,Item Atribuutwaarde
 apps/erpnext/erpnext/config/crm.py +64,Sales campaigns.,Verkoop campagnes
 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.
@@ -713,10 +685,9 @@
 DocType: Address,Personal,Persoonlijk
 DocType: Expense Claim Detail,Expense Claim Type,Kostendeclaratie Type
 DocType: Shopping Cart Settings,Default settings for Shopping Cart,Standaardinstellingen voor Winkelwagen
-apps/erpnext/erpnext/controllers/accounts_controller.py +324,"Journal Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Journal Entry {0} is verbonden met de Orde {1}, controleer dan of het moet worden getrokken als voorschot in deze factuur."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +13,Biotechnology,Biotechnologie
+apps/erpnext/erpnext/controllers/accounts_controller.py +325,"Journal Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Journal Entry {0} is verbonden met de Orde {1}, controleer dan of het moet worden getrokken als voorschot in deze factuur."
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +13,Biotechnology,Biotechnologie
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Office Maintenance Expenses,Gebouwen Onderhoudskosten
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +53,Hemming,Hemming
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +66,Please enter Item first,Vul eerst artikel in
 DocType: Account,Liability,Verplichting
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +62,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Gesanctioneerde bedrag kan niet groter zijn dan Claim Bedrag in Row {0}.
@@ -728,11 +699,11 @@
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +88,No Permission,Geen toestemming
 DocType: Company,Default Bank Account,Standaard bankrekening
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +47,"To filter based on Party, select Party Type first","Om te filteren op basis van Party, selecteer Party Typ eerst"
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},"'Bijwerken voorraad' kan niet worden gecontroleerd, omdat items niet worden geleverd via {0}"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Nos,Nrs
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},'Bijwerken voorraad' kan niet worden aangevinkt omdat items niet worden geleverd via {0}
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Nos,Nrs
 DocType: Item,Items with higher weightage will be shown higher,Items met een hogere weightage hoger zal worden getoond
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Bank Aflettering Detail
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +627,My Invoices,Mijn facturen
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +629,My Invoices,Mijn facturen
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,Geen werknemer gevonden
 DocType: Purchase Order,Stopped,Gestopt
 DocType: Item,If subcontracted to a vendor,Als uitbesteed aan een leverancier
@@ -751,35 +722,33 @@
 DocType: Features Setup,"To enable ""Point of Sale"" features",Naar &quot;Point of Sale&quot; functies in te schakelen
 DocType: Bin,Moving Average Rate,Moving Average Rate
 DocType: Production Planning Tool,Select Items,Selecteer Artikelen
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,{0} against Bill {1} dated {2},{0} tegen Factuur {1} ​​gedateerd {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +328,{0} against Bill {1} dated {2},{0} tegen Factuur {1} ​​gedateerd {2}
 DocType: Comment,Reference Name,Referentie Naam
 DocType: Maintenance Visit,Completion Status,Voltooiingsstatus
 DocType: Sales Invoice Item,Target Warehouse,Doel Magazijn
 DocType: Item,Allow over delivery or receipt upto this percent,Laat dan levering of ontvangst upto deze procent
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +49,Expected Delivery Date cannot be before Sales Order Date,Verwachte leverdatum kan niet voor de Verkooporder Datum
 DocType: Upload Attendance,Import Attendance,Import Toeschouwers
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +17,All Item Groups,Alle Artikel Groepen
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +17,All Item Groups,Alle Artikel Groepen
 DocType: Process Payroll,Activity Log,Activiteitenlogboek
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +30,Net Profit / Loss,Netto winst / verlies
 apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,Bericht automatisch samenstellen overlegging van transacties .
 DocType: Production Order,Item To Manufacture,Artikel te produceren
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +16,Permanent mold casting,Permanente mal gieten
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} status {2}
 apps/erpnext/erpnext/config/learn.py +172,Purchase Order to Payment,Aanschaffen om de betaling
 DocType: Sales Order Item,Projected Qty,Verwachte Aantal
 DocType: Sales Invoice,Payment Due Date,Betaling Vervaldatum
 DocType: Newsletter,Newsletter Manager,Nieuwsbrief Manager
-apps/erpnext/erpnext/stock/doctype/item/item.js +229,Item Variant {0} already exists with same attributes,Item Variant {0} bestaat al met dezelfde kenmerken
+apps/erpnext/erpnext/stock/doctype/item/item.js +231,Item Variant {0} already exists with same attributes,Item Variant {0} bestaat al met dezelfde kenmerken
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening',&#39;Opening&#39;
 DocType: Notification Control,Delivery Note Message,Vrachtbrief Bericht
 DocType: Expense Claim,Expenses,Uitgaven
 DocType: Item Variant Attribute,Item Variant Attribute,Item Variant Attribute
 ,Purchase Receipt Trends,Ontvangstbevestiging Trends
 DocType: Appraisal,Select template from which you want to get the Goals,Selecteer template van waaruit u de Doelen wilt krijgen
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +77,Research & Development,Research & Development
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Research & Development,Research & Development
 ,Amount to Bill,Neerkomen op Bill
 DocType: Company,Registration Details,Registratie Details
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +75,Staking,Staking
 DocType: Item,Re-Order Qty,Re-order Aantal
 DocType: Leave Block List Date,Leave Block List Date,Laat Block List Datum
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +25,Scheduled to send to {0},Gepland om te sturen naar {0}
@@ -790,18 +759,16 @@
 DocType: Sales Invoice Item,Stock Details,Voorraad Details
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Project Waarde
 apps/erpnext/erpnext/config/selling.py +304,Point-of-Sale,Verkooppunt
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,Cannot carry forward {0},Kan niet dragen {0}
 apps/erpnext/erpnext/accounts/doctype/account/account.py +91,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","Saldo reeds in Credit, is het niet toegestaan om 'evenwicht moet worden' als 'Debet'"
 DocType: Account,Balance must be,Saldo moet worden
 DocType: Hub Settings,Publish Pricing,Publiceer Pricing
 DocType: Notification Control,Expense Claim Rejected Message,Kostendeclaratie afgewezen Bericht
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +145,Nailing,Spijkeren
 ,Available Qty,Beschikbaar Aantal
 DocType: Purchase Taxes and Charges,On Previous Row Total,Aantal van volgende rij
 DocType: Salary Slip,Working Days,Werkdagen
 DocType: Serial No,Incoming Rate,Inkomende Rate
 DocType: Packing Slip,Gross Weight,Bruto Gewicht
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +410,The name of your company for which you are setting up this system.,De naam van uw bedrijf waar u het systeem voor op zet.
+apps/erpnext/erpnext/public/js/setup_wizard.js +158,The name of your company for which you are setting up this system.,De naam van uw bedrijf waar u het systeem voor op zet.
 DocType: HR Settings,Include holidays in Total no. of Working Days,Feestdagen opnemen in totaal aantal werkdagen.
 DocType: Job Applicant,Hold,Houden
 DocType: Employee,Date of Joining,Datum van Indiensttreding
@@ -811,7 +778,6 @@
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +3,View Subscribers,Bekijk Abonnees
 DocType: Purchase Invoice Item,Purchase Receipt,Ontvangstbevestiging
 ,Received Items To Be Billed,Ontvangen artikelen nog te factureren
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +114,Abrasive blasting,Gritstralen
 DocType: Employee,Ms,Mevrouw
 apps/erpnext/erpnext/config/accounts.py +148,Currency exchange rate master.,Wisselkoers stam.
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +253,Unable to find Time Slot in the next {0} days for Operation {1},Kan Time Slot in de volgende {0} dagen voor Operatie vinden {1}
@@ -823,7 +789,7 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +209,Serial No {0} does not belong to Item {1},Serienummer {0} behoort niet tot Artikel {1}
 DocType: Purchase Receipt Item Supplied,Required Qty,Benodigde hoeveelheid
 DocType: Bank Reconciliation,Total Amount,Totaal bedrag
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +32,Internet Publishing,internet Publishing
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,internet Publishing
 DocType: Production Planning Tool,Production Orders,Productieorders
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +35,Balance Value,Balans Waarde
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,Sales Prijslijst
@@ -834,7 +800,7 @@
 DocType: Supplier,Default Payable Accounts,Standaard Crediteuren Accounts
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,Werknemer {0} is niet actief of bestaat niet
 DocType: Features Setup,Item Barcode,Artikel Barcode
-apps/erpnext/erpnext/stock/doctype/item/item.py +487,Item Variants {0} updated,Item Varianten {0} bijgewerkt
+apps/erpnext/erpnext/stock/doctype/item/item.py +491,Item Variants {0} updated,Item Varianten {0} bijgewerkt
 DocType: Quality Inspection Reading,Reading 6,Meting 6
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Inkoopfactuur Voorschot
 DocType: Address,Shop,Winkelen
@@ -843,7 +809,7 @@
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,Standaard Kas-/Bankrekening wordt automatisch bijgewerkt in POS Factuur als deze modus is geselecteerd.
 DocType: Employee,Permanent Address Is,Vast Adres is
 DocType: Production Order Operation,Operation completed for how many finished goods?,Operatie afgerond voor hoeveel eindproducten?
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +491,The Brand,De Brand
+apps/erpnext/erpnext/public/js/setup_wizard.js +237,The Brand,De Brand
 apps/erpnext/erpnext/controllers/status_updater.py +163,Allowance for over-{0} crossed for Item {1}.,Korting voor over-{0} gekruist voor post {1}.
 DocType: Employee,Exit Interview Details,Exit Gesprek Details
 DocType: Item,Is Purchase Item,Is inkoopartikel
@@ -863,16 +829,16 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Indirect Income,Indirecte Inkomsten
 DocType: Payment Tool,Set Payment Amount = Outstanding Amount,Set Betaling Bedrag = openstaande bedrag
 DocType: Contact Us Settings,Address Line 1,Adres Lijn 1
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Variance,Variantie
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +392,Company Name,Bedrijfsnaam
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +53,Variance,Variantie
+,Company Name,Bedrijfsnaam
 DocType: SMS Center,Total Message(s),Totaal Bericht(en)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +515,Select Item for Transfer,Kies Punt voor Overdracht
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +538,Select Item for Transfer,Kies Punt voor Overdracht
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,Bekijk een overzicht van alle hulp video&#39;s
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,Selecteer hoofdrekening van de bank waar cheque werd gedeponeerd.
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,Zodat de gebruiker te bewerken prijslijst Rate bij transacties
 DocType: Pricing Rule,Max Qty,Max Aantal
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +106,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Rij {0}: Betaling tegen Sales / Purchase Order moet altijd worden gemarkeerd als voorschot
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +16,Chemical,Chemisch
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,Chemisch
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +693,All items have already been transferred for this Production Order.,Alle items zijn al overgebracht voor deze productieorder.
 DocType: Process Payroll,Select Payroll Year and Month,Selecteer Payroll Jaar en Maand
 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""",Ga naar de juiste groep (meestal Toepassing van fondsen&gt; Vlottende activa&gt; Bankrekeningen en maak een nieuwe account (door te klikken op Toevoegen kind) van het type &quot;Bank&quot;
@@ -883,12 +849,12 @@
 DocType: Item,Inspection Criteria,Inspectie Criteria
 apps/erpnext/erpnext/config/accounts.py +101,Tree of finanial Cost Centers.,Boom van financiële kostenplaatsen.
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,Overgebrachte
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +492,Upload your letter head and logo. (you can edit them later).,Upload uw brief hoofd en logo. (Je kunt ze later bewerken).
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +156,White,Wit
+apps/erpnext/erpnext/public/js/setup_wizard.js +238,Upload your letter head and logo. (you can edit them later).,Upload uw brief hoofd en logo. (Je kunt ze later bewerken).
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,White,Wit
 DocType: SMS Center,All Lead (Open),Alle Leads (Open)
 DocType: Purchase Invoice,Get Advances Paid,Get betaalde voorschotten
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +362,Attach Your Picture,Voeg uw foto toe
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Make ,Maken
+apps/erpnext/erpnext/public/js/setup_wizard.js +112,Attach Your Picture,Voeg uw foto toe
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +540,Make ,Maken
 DocType: Journal Entry,Total Amount in Words,Totaal bedrag in woorden
 DocType: Workflow State,Stop,stoppen
 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.,Er is een fout opgetreden . Een mogelijke reden zou kunnen zijn dat u het formulier niet hebt opgeslagen. Neem contact op met Support als het probleem aanhoudt .
@@ -897,14 +863,13 @@
 DocType: Lead,Next Contact Date,Volgende Contact Datum
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,Opening Aantal
 DocType: Holiday List,Holiday List Name,Holiday Lijst Naam
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +168,Stock Options,Aandelenopties
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +168,Stock Options,Aandelenopties
 DocType: Journal Entry Account,Expense Claim,Kostendeclaratie
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +181,Qty for {0},Aantal voor {0}
 DocType: Leave Application,Leave Application,Verlofaanvraag
 apps/erpnext/erpnext/config/hr.py +77,Leave Allocation Tool,Verlof Toewijzing Tool
 DocType: Leave Block List,Leave Block List Dates,Laat Block List Data
 DocType: Company,If Monthly Budget Exceeded (for expense account),Als Maandelijkse Budget overschreden (voor declaratierekening)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +56,Trimming,Garneersel
 DocType: Workstation,Net Hour Rate,Netto uurtarief
 DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,Vrachtkosten Inkoop Ontvangstbewijs
 DocType: Company,Default Terms,Default Voorwaarden
@@ -912,10 +877,9 @@
 DocType: POS Profile,Cash/Bank Account,Kas/Bankrekening
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,Removed items with no change in quantity or value.,Verwijderde items met geen verandering in de hoeveelheid of waarde.
 DocType: Delivery Note,Delivery To,Leveren Aan
-apps/erpnext/erpnext/stock/doctype/item/item.py +509,Attribute table is mandatory,Attributentabel is verplicht
+apps/erpnext/erpnext/stock/doctype/item/item.py +513,Attribute table is mandatory,Attributentabel is verplicht
 DocType: Production Planning Tool,Get Sales Orders,Get Verkooporders
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} kan niet negatief zijn
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +103,Filing,Archiveren
 apps/erpnext/erpnext/templates/form_grid/item_grid.html +72,Discount,Korting
 DocType: Features Setup,Purchase Discounts,Inkoopkortingen
 DocType: Workstation,Wages,Loon
@@ -923,7 +887,7 @@
 DocType: Project,Internal,Intern
 DocType: Task,Urgent,Dringend
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +97,Please specify a valid Row ID for row {0} in table {1},Geef een geldige rij-ID voor rij {0} in tabel {1}
-apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +23,Go to the Desktop and start using ERPNext,Ga naar het bureaublad en gebruiken ERPNext
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +23,Go to the Desktop and start using ERPNext,Ga naar het bureaublad om aan de slag te gaan met ERPNext
 DocType: Item,Manufacturer,Fabrikant
 DocType: Landed Cost Item,Purchase Receipt Item,Ontvangstbevestiging Artikel
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,Gereserveerd Magazijn in Verkooporder / Magazijn Gereed Product
@@ -932,6 +896,7 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +112,You are the Expense Approver for this record. Please Update the 'Status' and Save,U bent de Onkosten Goedkeurder voor dit record. Werk de 'Status' bij en sla op.
 DocType: Serial No,Creation Document No,Aanmaken Document nr
 DocType: Issue,Issue,Uitgifte
+apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account does not match with Company,Account komt niet overeen met de vennootschap
 apps/erpnext/erpnext/config/stock.py +136,"Attributes for Item Variants. e.g Size, Color etc.","Attributen voor post Varianten. zoals grootte, kleur etc."
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +39,WIP Warehouse,WIP Warehouse
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +194,Serial No {0} is under maintenance contract upto {1},Serienummer {0} valt binnen onderhoudscontract tot {1}
@@ -940,7 +905,7 @@
 DocType: Tax Rule,Shipping State,Scheepvaart 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,Het punt moet worden toegevoegd met behulp van 'Get Items uit Aankoopfacturen' knop
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,Verkoopkosten
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Buying,Standard kopen
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +120,Standard Buying,Standard kopen
 DocType: GL Entry,Against,Tegen
 DocType: Item,Default Selling Cost Center,Standaard Verkoop kostenplaats
 DocType: Sales Partner,Implementation Partner,Implementatie Partner
@@ -961,29 +926,29 @@
 DocType: Time Log Batch,updated via Time Logs,bijgewerkt via Time Logs
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,Gemiddelde Leeftijd
 DocType: Opportunity,Your sales person who will contact the customer in future,Uw verkopers die in de toekomst contact op zullen nemen met de klant.
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +588,List a few of your suppliers. They could be organizations or individuals.,Lijst een paar van uw leveranciers . Ze kunnen organisaties of personen .
+apps/erpnext/erpnext/public/js/setup_wizard.js +326,List a few of your suppliers. They could be organizations or individuals.,Lijst een paar van uw leveranciers . Ze kunnen organisaties of personen .
 DocType: Company,Default Currency,Standaard valuta
 DocType: Contact,Enter designation of this Contact,Voer aanduiding van deze Contactpersoon in
 DocType: Contact Us Settings,Address,Adres
 DocType: Expense Claim,From Employee,Van Medewerker
-apps/erpnext/erpnext/controllers/accounts_controller.py +338,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Waarschuwing: Het systeem zal niet controleren overbilling sinds bedrag voor post {0} in {1} nul
+apps/erpnext/erpnext/controllers/accounts_controller.py +339,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Waarschuwing: Het systeem zal niet controleren overbilling sinds bedrag voor post {0} in {1} nul
 DocType: Journal Entry,Make Difference Entry,Maak Verschil Entry
 DocType: Upload Attendance,Attendance From Date,Aanwezigheid Van Datum
 DocType: Appraisal Template Goal,Key Performance Area,Key Performance Area
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +54,Transportation,Vervoer
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +54,Transportation,Vervoer
 apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +67, and year: ,en jaar:
 DocType: Email Digest,Annual Expense,Jaarlijkse Expense
 DocType: SMS Center,Total Characters,Totaal Tekens
-apps/erpnext/erpnext/controllers/buying_controller.py +139,Please select BOM in BOM field for Item {0},Selecteer BOM in BOM veld voor post {0}
+apps/erpnext/erpnext/controllers/buying_controller.py +130,Please select BOM in BOM field for Item {0},Selecteer BOM in BOM veld voor post {0}
 DocType: C-Form Invoice Detail,C-Form Invoice Detail,C-Form Factuurspecificatie
 DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,Afletteren Factuur
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +32,Contribution %,Bijdrage%
 DocType: Item,website page link,Website Paginalink
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +192,Let's prepare the system for first use.,Laten we het voorbereiden van het systeem voor het eerste gebruik.
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +242,Let's prepare the system for first use.,Laten we het voorbereiden van het systeem voor het eerste gebruik.
 DocType: Company,Company registration numbers for your reference. Tax numbers etc.,"Registratienummers van de onderneming voor uw referentie. Fiscale nummers, enz."
 DocType: Sales Partner,Distributor,Distributeur
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Winkelwagen Verzenden Regel
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +214,Production Order {0} must be cancelled before cancelling this Sales Order,Productie Order {0} moet worden geannuleerd voor het annuleren van deze verkooporder
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +209,Production Order {0} must be cancelled before cancelling this Sales Order,Productie Order {0} moet worden geannuleerd voor het annuleren van deze verkooporder
 ,Ordered Items To Be Billed,Bestelde artikelen te factureren
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +24,From Range has to be less than To Range,Van Range moet kleiner zijn dan om het bereik
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +21,Select Time Logs and Submit to create a new Sales Invoice.,Selecteer Tijd Logs en druk op Indienen om een ​​nieuwe verkoopfactuur maken.
@@ -1003,14 +968,13 @@
 DocType: Sales Invoice Advance,Sales Invoice Advance,Verkoopfactuur Voorschot
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +398,Nothing to request,Niets aan te vragen
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date','Werkelijke Startdatum' kan niet groter zijn dan 'Werkelijke Einddatum'
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +75,Management,Beheer
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +75,Management,Beheer
 apps/erpnext/erpnext/config/projects.py +33,Types of activities for Time Sheets,Soorten activiteiten voor Time Sheets
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +14,Investment casting,Investment casting
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +51,Either debit or credit amount is required for {0},Ofwel debet of credit bedrag is nodig voor {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""","Dit zal worden toegevoegd aan de Code van het punt van de variant. Bijvoorbeeld, als je de afkorting is ""SM"", en de artikelcode is ""T-SHIRT"", de artikelcode van de variant zal worden ""T-SHIRT-SM"""
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,Nettoloon (in woorden) zal zichtbaar zijn zodra de Salarisstrook wordt opgeslagen.
 apps/frappe/frappe/core/doctype/user/user_list.js +12,Active,Actief
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +154,Blue,Blauw
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +154,Blue,Blauw
 DocType: Purchase Invoice,Is Return,Is Return
 DocType: Price List Country,Price List Country,Prijslijst Land
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +123,Further nodes can be only created under 'Group' type nodes,Verder nodes kunnen alleen worden gemaakt op grond van het type nodes 'Groep'
@@ -1020,18 +984,16 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +22,POS Profile {0} already created for user: {1} and company {2},POS Profiel {0} al gemaakt voor de gebruiker: {1} en {2} bedrijf
 DocType: Purchase Order Item,UOM Conversion Factor,Eenheid Omrekeningsfactor
 DocType: Stock Settings,Default Item Group,Standaard Artikelgroep
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +156,Laminated object manufacturing,Gelaagd object productie
 apps/erpnext/erpnext/config/buying.py +13,Supplier database.,Leverancierbestand
 DocType: Account,Balance Sheet,Balans
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +561,Cost Center For Item with Item Code ',Kostenplaats Item met Item Code '
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +45,Stretch forming,Strekvormen
 DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,Uw verkoper krijgt een herinnering op deze datum om contact op te nemen met de klant
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +210,"Further accounts can be made under Groups, but entries can be made against non-Groups","Verdere accounts kan worden gemaakt onder groepen, maar items kunnen worden gemaakt tegen niet-Groepen"
 apps/erpnext/erpnext/config/hr.py +125,Tax and other salary deductions.,Belastingen en andere inhoudingen op het salaris.
 DocType: Lead,Lead,Lead
 DocType: Email Digest,Payables,Schulden
 DocType: Account,Warehouse,Magazijn
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +90,Row #{0}: Rejected Qty can not be entered in Purchase Return,Rij # {0}: Afgekeurd Aantal niet in Purchase Return kunnen worden ingevoerd
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +93,Row #{0}: Rejected Qty can not be entered in Purchase Return,Rij # {0}: Afgekeurd Aantal niet in Purchase Return kunnen worden ingevoerd
 ,Purchase Order Items To Be Billed,Inkooporder Artikelen nog te factureren
 DocType: Purchase Invoice Item,Net Rate,Net Rate
 DocType: Purchase Invoice Item,Purchase Invoice Item,Inkoopfactuur Artikel
@@ -1046,13 +1008,13 @@
 DocType: Global Defaults,Current Fiscal Year,Huidige fiscale jaar
 DocType: Global Defaults,Disable Rounded Total,Deactiveer Afgerond Totaal
 DocType: Lead,Call,Bellen
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +384,'Entries' cannot be empty,'Invoer' kan niet leeg zijn
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +386,'Entries' cannot be empty,'Invoer' kan niet leeg zijn
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},Dubbele rij {0} met dezelfde {1}
 ,Trial Balance,Proefbalans
 apps/erpnext/erpnext/config/hr.py +205,Setting up Employees,Het opzetten van Werknemers
 apps/erpnext/erpnext/public/js/feature_setup.js +220,"Grid ""","Rooster """
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +150,Please select prefix first,Selecteer eerst een voorvoegsel
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +138,Research,onderzoek
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +138,Research,onderzoek
 DocType: Maintenance Visit Purpose,Work Done,Afgerond Werk
 apps/erpnext/erpnext/controllers/item_variant.py +25,Please specify at least one attribute in the Attributes table,Gelieve ten minste één attribuut in de tabel attributen opgeven
 DocType: Contact,User ID,Gebruikers-ID
@@ -1060,10 +1022,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +57,View Ledger,Bekijk Grootboek
 DocType: File,Lft,lft
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Vroegst
-apps/erpnext/erpnext/stock/doctype/item/item.py +394,"An Item Group exists with same name, please change the item name or rename the item group","Een artikel Group bestaat met dezelfde naam , moet u de naam van het item of de naam van de artikelgroep"
+apps/erpnext/erpnext/stock/doctype/item/item.py +398,"An Item Group exists with same name, please change the item name or rename the item group","Een artikel Group bestaat met dezelfde naam , moet u de naam van het item of de naam van de artikelgroep"
 DocType: Communication,Delivery Status,Verzendstatus
 DocType: Production Order,Manufacture against Sales Order,Produceren tegen Verkooporder
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +517,Rest Of The World,Rest van de Wereld
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +455,Rest Of The World,Rest van de Wereld
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,De Punt {0} kan niet Batch hebben
 ,Budget Variance Report,Budget Variantie Rapport
 DocType: Salary Slip,Gross Pay,Brutoloon
@@ -1074,13 +1036,11 @@
 DocType: BOM Item,Item Description,Artikelomschrijving
 DocType: Payment Tool,Payment Mode,Betaling Mode
 DocType: Purchase Invoice,Is Recurring,Is Terugkerende
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +154,Direct metal laser sintering,Direct metal lasersintering
 DocType: Purchase Order,Supplied Items,Geleverde Artikelen
 DocType: Production Order,Qty To Manufacture,Aantal te produceren
 DocType: Buying Settings,Maintain same rate throughout purchase cycle,Handhaaf zelfde tarief gedurende inkoopcyclus
 DocType: Opportunity Item,Opportunity Item,Opportunity Artikel
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +61,Temporary Opening,Tijdelijke Opening
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +41,Cryorolling,Cryorolling
 ,Employee Leave Balance,Werknemer Verlof Balans
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +128,Balance for Account {0} must always be {1},Saldo van rekening {0} moet altijd {1} zijn
 DocType: Address,Address Type,Adrestype
@@ -1096,23 +1056,23 @@
 DocType: Journal Entry,Get Outstanding Invoices,Get openstaande facturen
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,Verkooporder {0} is niet geldig
 apps/erpnext/erpnext/setup/doctype/company/company.py +172,"Sorry, companies cannot be merged","Sorry , bedrijven kunnen niet worden samengevoegd"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +145,Small,Klein
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Small,Klein
 DocType: Employee,Employee Number,Werknemer Nummer
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},Zaak nr. ( s ) al in gebruik. Probeer uit Zaak nr. {0}
 ,Invoiced Amount (Exculsive Tax),Factuurbedrag (excl BTW)
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,Punt 2
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +59,Account head {0} created,Hoofdrekening {0} aangemaakt
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +153,Green,Groen
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Green,Groen
 DocType: Item,Auto re-order,Auto re-order
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +57,Total Achieved,Totaal Bereikt
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +59,Total Achieved,Totaal Bereikt
 DocType: Employee,Place of Issue,Plaats van uitgifte
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +59,Contract,Contract
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Contract,Contract
 DocType: Report,Disabled,Uitgezet
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +490,UOM coversion factor required for UOM: {0} in Item: {1},Eenheid Omrekeningsfactor is nodig voor eenheid: {0} in Artikel: {1}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +83,Indirect Expenses,Indirecte Kosten
 apps/erpnext/erpnext/controllers/selling_controller.py +163,Row {0}: Qty is mandatory,Rij {0}: Aantal is verplicht
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +8,Agriculture,landbouw
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +611,Your Products or Services,Uw producten of diensten
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,landbouw
+apps/erpnext/erpnext/public/js/setup_wizard.js +347,Your Products or Services,Uw producten of diensten
 DocType: Mode of Payment,Mode of Payment,Wijze van betaling
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,Dit is een basis artikelgroep en kan niet worden bewerkt .
 DocType: Journal Entry Account,Purchase Order,Inkooporder
@@ -1124,7 +1084,7 @@
 DocType: Serial No,Serial No Details,Serienummer Details
 DocType: Purchase Invoice Item,Item Tax Rate,Artikel BTW-tarief
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +113,"For {0}, only credit accounts can be linked against another debit entry","Voor {0}, kan alleen credit accounts worden gekoppeld tegen een andere debetboeking"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Delivery Note {0} is not submitted,Vrachtbrief {0} is niet ingediend
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +470,Delivery Note {0} is not submitted,Vrachtbrief {0} is niet ingediend
 apps/erpnext/erpnext/stock/get_item_details.py +136,Item {0} must be a Sub-contracted Item,Artikel {0} moet een uitbesteed artikel zijn
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,Kapitaalgoederen
 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.","Prijsbepalingsregel wordt eerst geselecteerd op basis van 'Toepassen op' veld, dat kan zijn artikel, artikelgroep of merk."
@@ -1134,7 +1094,7 @@
 DocType: Appraisal Goal,Goal,Doel
 DocType: Sales Invoice Item,Edit Description,Bewerken Beschrijving
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +318,Expected Delivery Date is lesser than Planned Start Date.,Verwachte levertijd is minder dan gepland Start Date.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +579,For Supplier,voor Leverancier
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +602,For Supplier,voor Leverancier
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,Instellen Account Type helpt bij het selecteren van deze account in transacties.
 DocType: Purchase Invoice,Grand Total (Company Currency),Grand Total (Company Munt)
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,Totaal Uitgaande
@@ -1160,10 +1120,10 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +74,"Total {0} for all items is zero, may you should change 'Distribute Charges Based On'","Totaal {0} voor alle items nul is, kunt u zou moeten veranderen &#39;Verdeel Kosten op basis van&#39;"
 DocType: Purchase Invoice,Taxes and Charges Calculation,Belastingen en Toeslagen berekenen
 DocType: BOM Operation,Workstation,Werkstation
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +112,Hardware,hardware
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +112,Hardware,hardware
 DocType: Attendance,HR Manager,HR Manager
 apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,Selecteer aub een andere vennootschap
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +50,Privilege Leave,Bijzonder Verlof
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +50,Privilege Leave,Bijzonder Verlof
 DocType: Purchase Invoice,Supplier Invoice Date,Factuurdatum Leverancier
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +79,You need to enable Shopping Cart,U moet Winkelwagen activeren.
 apps/frappe/frappe/public/js/frappe/form/grid_body.html +6,No Data,Geen gegevens
@@ -1176,7 +1136,7 @@
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +81,Overlapping conditions found between:,Overlappende voorwaarden gevonden tussen :
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +168,Against Journal Entry {0} is already adjusted against some other voucher,Tegen Journal Entry {0} is al aangepast tegen enkele andere voucher
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +68,Total Order Value,Totale orderwaarde
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +38,Food,Voeding
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +38,Food,Voeding
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Vergrijzing Range 3
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +139,You can make a time log only against a submitted production order,U kunt een tijd log maken alleen tegen een ingediende productieorder
 DocType: Maintenance Schedule Item,No of Visits,Aantal bezoeken
@@ -1196,6 +1156,7 @@
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,View Offer Letter,Bekijk aanbieding Letter
 DocType: Communication,Communication,Communicatie
 DocType: Item,Is Service Item,Is service-artikel
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +81,Application period cannot be outside leave allocation period,Aanvraagperiode kan buiten verlof toewijzingsperiode niet
 DocType: Activity Cost,Projects,Projecten
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +31,Please select Fiscal Year,Selecteer boekjaar
 apps/erpnext/erpnext/controllers/buying_controller.py +23,From {0} | {1} {2},Van {0} | {1} {2}
@@ -1214,7 +1175,7 @@
 DocType: Item,Maintain Stock,Handhaaf Stock
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +213,Stock Entries already created for Production Order ,Stock Entries al gemaakt voor de productieorder
 DocType: Leave Control Panel,Leave blank if considered for all designations,Laat leeg indien overwogen voor alle aanduidingen
-apps/erpnext/erpnext/controllers/accounts_controller.py +499,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Charge van het type ' Actual ' in rij {0} kan niet worden opgenomen in Item Rate
+apps/erpnext/erpnext/controllers/accounts_controller.py +500,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Charge van het type ' Actual ' in rij {0} kan niet worden opgenomen in Item Rate
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,Max: {0},Max: {0}
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +16,From Datetime,Van Datetime
 DocType: Email Digest,For Company,Voor Bedrijf
@@ -1224,7 +1185,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +50,Chart of Accounts,Rekeningschema
 DocType: Material Request,Terms and Conditions Content,Algemene Voorwaarden Inhoud
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +471,cannot be greater than 100,mag niet groter zijn dan 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +546,Item {0} is not a stock Item,Artikel {0} is geen voorraadartikel
+apps/erpnext/erpnext/stock/doctype/item/item.py +550,Item {0} is not a stock Item,Artikel {0} is geen voorraadartikel
 DocType: Maintenance Visit,Unscheduled,Ongeplande
 DocType: Employee,Owned,Eigendom
 DocType: Salary Slip Deduction,Depends on Leave Without Pay,Afhankelijk van onbetaald verlof
@@ -1238,31 +1199,29 @@
 DocType: HR Settings,Employee Settings,Werknemer Instellingen
 ,Batch-Wise Balance History,Batchgewijze Balans Geschiedenis
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +72,To Do List,Actie Lijst
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +63,Apprentice,leerling
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Apprentice,leerling
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +99,Negative Quantity is not allowed,Negatieve Hoeveelheid is niet toegestaan
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
 Used for Taxes and Charges","Belasting detail tafel haalden van post meester als een string en opgeslagen in dit gebied.
  Gebruikt voor en -heffingen"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +61,Lancing,Lancing
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +151,Employee cannot report to himself.,Werknemer kan niet rapporteren aan zichzelf.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Als de rekening is bevroren, kunnen boekingen alleen door daartoe bevoegde gebruikers gedaan worden."
 DocType: Email Digest,Bank Balance,Banksaldo
-apps/erpnext/erpnext/controllers/accounts_controller.py +435,Accounting Entry for {0}: {1} can only be made in currency: {2},Boekhouding Entry voor {0}: {1} kan alleen worden gedaan in valuta: {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +436,Accounting Entry for {0}: {1} can only be made in currency: {2},Boekhouding Entry voor {0}: {1} kan alleen worden gedaan in valuta: {2}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +38,No active Salary Structure found for employee {0} and the month,Geen actieve salarisstructuur gevonden voor werknemer {0} en de maand
 DocType: Job Opening,"Job profile, qualifications required etc.","Functieprofiel, benodigde kwalificaties enz."
 DocType: Journal Entry Account,Account Balance,Rekeningbalans
 apps/erpnext/erpnext/config/accounts.py +112,Tax Rule for transactions.,Fiscale Regel voor transacties.
 DocType: Rename Tool,Type of document to rename.,Type document te hernoemen.
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +630,We buy this Item,We kopen dit artikel
+apps/erpnext/erpnext/public/js/setup_wizard.js +366,We buy this Item,We kopen dit artikel
 DocType: Address,Billing,Facturering
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +77,Flanging,Flanging
 DocType: Bulk Email,Not Sent,Niet verzonden
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +73,Explosive forming,Explosieve vormen
 DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),Totaal belastingen en toeslagen (Bedrijfsvaluta)
 DocType: Shipping Rule,Shipping Account,Verzending Rekening
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +43,Scheduled to send to {0} recipients,Gepland om te sturen naar {0} ontvangers
 DocType: Quality Inspection,Readings,Lezingen
 DocType: Stock Entry,Total Additional Costs,Totaal Bijkomende kosten
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Sub Assemblies,Uitbesteed werk
+apps/erpnext/erpnext/public/js/setup_wizard.js +359,Sub Assemblies,Uitbesteed werk
 DocType: Shipping Rule Condition,To Value,Tot Waarde
 DocType: Supplier,Stock Manager,Stock Manager
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +143,Source warehouse is mandatory for row {0},Bron magazijn is verplicht voor rij {0}
@@ -1272,44 +1231,42 @@
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Importeren mislukt!
 apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,Nog geen adres toegevoegd.
 DocType: Workstation Working Hour,Workstation Working Hour,Workstation Werken Hour
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +83,Analyst,analist
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +202,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Rij {0}: Toegewezen bedrag {1} moet kleiner zijn dan of gelijk aan JV hoeveelheid {2}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Analyst,analist
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +149,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Rij {0}: Toegewezen bedrag {1} moet kleiner zijn dan of gelijk aan JV hoeveelheid {2}
 DocType: Item,Inventory,Voorraad
 DocType: Features Setup,"To enable ""Point of Sale"" view",Inschakelen &quot;Point of Sale&quot; view
 apps/erpnext/erpnext/public/js/pos/pos.js +402,Payment cannot be made for empty cart,Betaling kan niet worden gemaakt voor een lege boodschappenmand
 DocType: Item,Sales Details,Verkoop Details
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +149,Pinning,Pinning
 DocType: Opportunity,With Items,Met Items
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,in Aantal
 DocType: Notification Control,Expense Claim Rejected,Kostendeclaratie afgewezen
 DocType: Sales Invoice,"The date on which next invoice will be generated. It is generated on submit.
 ",De datum waarop de volgende factuur wordt gegenereerd. Het wordt gegenereerd op te leggen.
 DocType: Item Attribute,Item Attribute,Item Attribute
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +105,Government,Overheid
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Government,Overheid
 apps/erpnext/erpnext/config/stock.py +268,Item Variants,Item Varianten
 DocType: Company,Services,Services
 apps/erpnext/erpnext/accounts/report/financial_statements.py +147,Total ({0}),Totaal ({0})
 DocType: Cost Center,Parent Cost Center,Bovenliggende kostenplaats
 DocType: Sales Invoice,Source,Bron
 DocType: Leave Type,Is Leave Without Pay,Is onbetaald verlof
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +186,No records found in the Payment table,Geen records gevonden in de betaling tabel
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +405,Financial Year Start Date,Boekjaar Startdatum
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +133,No records found in the Payment table,Geen records gevonden in de betaling tabel
+apps/erpnext/erpnext/public/js/setup_wizard.js +153,Financial Year Start Date,Boekjaar Startdatum
 DocType: Employee External Work History,Total Experience,Total Experience
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +100,Countersinking,Verzinken
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +271,Packing Slip(s) cancelled,Pakbon(en) geannuleerd
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +276,Packing Slip(s) cancelled,Pakbon(en) geannuleerd
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,Vracht-en verzendkosten
 DocType: Material Request Item,Sales Order No,Verkooporder nr.
 DocType: Item Group,Item Group Name,Artikel groepsnaam
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +50,Taken,Ingenomen
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,Ingenomen
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +66,Transfer Materials for Manufacture,Verplaats Materialen voor Productie
 DocType: Pricing Rule,For Price List,Voor Prijslijst
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +27,Executive Search,Executive Search
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,Executive Search
 apps/erpnext/erpnext/stock/stock_ledger.py +405,"Purchase rate for item: {0} not found, which is required to book accounting entry (expense). Please mention item price against a buying price list.","Aankoopkoers voor punt: {0} niet gevonden, die nodig is om boekhoudkundige afschrijving (kosten) te boeken. Vermeld post prijs tegen een aankoopprijs lijst."
 DocType: Maintenance Schedule,Schedules,Schema
 DocType: Purchase Invoice Item,Net Amount,Netto Bedrag
 DocType: Purchase Order Item Supplied,BOM Detail No,Stuklijst Detail nr.
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),Extra korting Bedrag (Company valuta)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +537,Error: {0} > {1},Fout : {0} > {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +541,Error: {0} > {1},Fout : {0} > {1}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,Maak nieuwe rekening van Rekeningschema.
 DocType: Maintenance Visit,Maintenance Visit,Onderhoud Bezoek
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer > Customer Group > Territory,Klant > Klantgroep > Regio
@@ -1320,7 +1277,6 @@
 DocType: Event,Tuesday,Dinsdag
 DocType: Leave Block List,Block Holidays on important days.,Blokeer Vakantie op belangrijke dagen.
 ,Accounts Receivable Summary,Debiteuren Samenvatting
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +43,Leaves for type {0} already allocated for Employee {1} for period {2} - {3},Bladeren voor type {0} reeds toegewezen voor Employee {1} voor periode {2} - {3}
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +187,Please set User ID field in an Employee record to set Employee Role,Stel User ID veld in een Werknemer record Werknemer Rol stellen
 DocType: UOM,UOM Name,Eenheid Naam
 DocType: Top Bar Item,Target,Doel
@@ -1332,15 +1288,14 @@
 DocType: ToDo,Due Date,Verloopdatum
 DocType: Sales Invoice Item,Brand Name,Merknaam
 DocType: Purchase Receipt,Transporter Details,Transporter Details
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Box,Doos
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +389,The Organization,De Organisatie
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Box,Doos
+apps/erpnext/erpnext/public/js/setup_wizard.js +137,The Organization,De Organisatie
 DocType: Monthly Distribution,Monthly Distribution,Maandelijkse Verdeling
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,Ontvanger Lijst is leeg. Maak Ontvanger Lijst
 DocType: Production Plan Sales Order,Production Plan Sales Order,Productie Plan Verkooporder
 DocType: Sales Partner,Sales Partner Target,Verkoop Partner Doel
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},Boekhouding Entry voor {0} kan alleen worden gemaakt in valuta: {1}
 DocType: Pricing Rule,Pricing Rule,Prijsbepalingsregel
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +58,Notching,Het kerven
 apps/erpnext/erpnext/config/learn.py +167,Material Request to Purchase Order,Materiaal aanvragen tot Purchase Order
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +74,Row # {0}: Returned Item {1} does not exists in {2} {3},Rij # {0}: Teruggekeerde Item {1} bestaat niet in {2} {3}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,Bankrekeningen
@@ -1357,20 +1312,19 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Amounts not reflected in bank,Bedragen die niet terug te vinden in de bank
 DocType: Quality Inspection Reading,Reading 4,Meting 4
 apps/erpnext/erpnext/config/hr.py +23,Claims for company expense.,Claims voor bedrijfsonkosten
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +8,Centrifugal casting,Centrifugaal gieten
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +119,Magnetic field-assisted finishing,Magnetisch veld bijgestaan ​​afwerking
 DocType: Company,Default Holiday List,Standaard Vakantiedagen Lijst
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +165,Stock Liabilities,Voorraad Verplichtingen
 DocType: Purchase Receipt,Supplier Warehouse,Leverancier Magazijn
 DocType: Opportunity,Contact Mobile No,Contact Mobiele nummer
 DocType: Production Planning Tool,Select Sales Orders,Selecteer Verkooporders
 ,Material Requests for which Supplier Quotations are not created,Materiaal Aanvragen waarvoor Leverancier Offertes niet zijn gemaakt
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +117,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,De dag (en) waarop je solliciteert verlof zijn vakantie. U hoeft niet voor verlof.
 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.,Het kunnen identificeren van artikelen mbv een streepjescode. U kunt hiermee artikelen op Vrachtbrieven en Verkoopfacturen invoeren door de streepjescode van het artikel te scannen.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +477,Mark as Delivered,Markeren als geleverd
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +497,Mark as Delivered,Markeren als geleverd
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +34,Make Quotation,Maak Offerte
 DocType: Dependent Task,Dependent Task,Afhankelijke Task
-apps/erpnext/erpnext/stock/doctype/item/item.py +306,Conversion factor for default Unit of Measure must be 1 in row {0},Conversiefactor voor Standaard meeteenheid moet 1 zijn in rij {0}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,Leave of type {0} cannot be longer than {1},Verlof van type {0} kan niet langer zijn dan {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +310,Conversion factor for default Unit of Measure must be 1 in row {0},Conversiefactor voor Standaard meeteenheid moet 1 zijn in rij {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +155,Leave of type {0} cannot be longer than {1},Verlof van type {0} kan niet langer zijn dan {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Probeer plan operaties voor X dagen van tevoren.
 DocType: HR Settings,Stop Birthday Reminders,Stop verjaardagsherinneringen
 DocType: SMS Center,Receiver List,Ontvanger Lijst
@@ -1378,15 +1332,14 @@
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Verbruikte hoeveelheid
 apps/erpnext/erpnext/public/js/pos/pos.js +491,{0} View,{0} View
 DocType: Salary Structure Deduction,Salary Structure Deduction,Salaris Structuur Aftrek
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +158,Selective laser sintering,Selectieve lasersintering
-apps/erpnext/erpnext/stock/doctype/item/item.py +301,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Eenheid {0} is meer dan eens ingevoerd in Conversie Factor Tabel
+apps/erpnext/erpnext/stock/doctype/item/item.py +305,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Eenheid {0} is meer dan eens ingevoerd in Conversie Factor Tabel
 apps/frappe/frappe/core/page/data_import_tool/data_import_tool.js +108,Import Successful!,Importeren succesvol!
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Kosten van Items Afgegeven
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +185,Quantity must not be more than {0},Hoeveelheid mag niet meer zijn dan {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +41,Age (Days),Leeftijd (dagen)
 DocType: Quotation Item,Quotation Item,Offerte Artikel
 DocType: Account,Account Name,Rekening Naam
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +41,From Date cannot be greater than To Date,Vanaf de datum kan niet groter zijn dan tot nu toe
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +34,From Date cannot be greater than To Date,Vanaf de datum kan niet groter zijn dan tot nu toe
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +194,Serial No {0} quantity {1} cannot be a fraction,Serienummer {0} hoeveelheid {1} moet een geheel getal zijn
 apps/erpnext/erpnext/config/buying.py +59,Supplier Type master.,Leverancier Type stam.
 DocType: Purchase Order Item,Supplier Part Number,Leverancier Onderdeelnummer
@@ -1395,14 +1348,14 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +247,{0} {1} is cancelled or stopped,{0} {1} is geannuleerd of gestopt
 DocType: Accounts Settings,Credit Controller,Credit Controller
 DocType: Delivery Note,Vehicle Dispatch Date,Voertuig Vertrekdatum
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +197,Purchase Receipt {0} is not submitted,Ontvangstbevestiging {0} is niet ingediend
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +198,Purchase Receipt {0} is not submitted,Ontvangstbevestiging {0} is niet ingediend
 DocType: Company,Default Payable Account,Standaard Payable Account
 apps/erpnext/erpnext/config/website.py +13,"Settings for online shopping cart such as shipping rules, price list etc.","Instellingen voor online winkelwagentje zoals scheepvaart regels, prijslijst enz."
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +660,Setup Complete,Installatie voltooid
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +124,Setup Complete,Installatie voltooid
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +65,{0}% Billed,{0}% gefactureerd
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +17,Reserved Qty,Gereserveerde Hoeveelheid
 DocType: Party Account,Party Account,Party Account
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +74,Human Resources,Human Resources
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +74,Human Resources,Human Resources
 DocType: Lead,Upper Income,Bovenste Inkomen
 DocType: Journal Entry Account,Debit in Company Currency,Debet in Company Valuta
 apps/erpnext/erpnext/support/doctype/issue/issue.py +58,My Issues,Mijn Problemen
@@ -1411,11 +1364,9 @@
 DocType: Company,Default Values,Standaard Waarden
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +236,Row {0}: Payment amount can not be negative,Rij {0}: Betaling bedrag kan niet negatief zijn
 DocType: Expense Claim,Total Amount Reimbursed,Totaal bedrag terug!
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +152,Press fitting,Press fitting
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +64,Against Supplier Invoice {0} dated {1},Tegen Leverancier Factuur {0} gedateerd {1}
 DocType: Customer,Default Price List,Standaard Prijslijst
 DocType: Payment Reconciliation,Payments,Betalingen
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +24,Hot isostatic pressing,Heet isostatisch persen
 DocType: ToDo,Medium,Medium
 DocType: Budget Detail,Budget Allocated,Budget Toegewezen
 DocType: Journal Entry,Entry Type,Entry Type
@@ -1428,9 +1379,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +56,None of the items have any change in quantity or value.,Geen van de items hebben een verandering in hoeveelheid of waarde.
 DocType: Warranty Claim,Warranty Claim,Garantie Claim
 ,Lead Details,Lead Details
-DocType: Authorization Rule,Approving User,Goedkeuren Gebruiker
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +37,Forging,Smeden
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +126,Plating,Plating
 DocType: Purchase Invoice,End date of current invoice's period,Einddatum van de huidige factuurperiode
 DocType: Pricing Rule,Applicable For,Toepasselijk voor
 DocType: Bank Reconciliation,From Date,Van Datum
@@ -1452,31 +1400,29 @@
 DocType: Sales Invoice,Paid Amount (Company Currency),Betaalde bedrag (Company Munt)
 DocType: Purchase Invoice,Additional Discount,EXTRA KORTING
 DocType: Selling Settings,Selling Settings,Verkoop Instellingen
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +39,Online Auctions,online Veilingen
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,online Veilingen
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +94,Please specify either Quantity or Valuation Rate or both,Specificeer ofwel Hoeveelheid of Waarderingstarief of beide
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +50,"Company, Month and Fiscal Year is mandatory","Bedrijf , maand en het fiscale jaar is verplicht"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Marketing Expenses,Marketingkosten
 ,Item Shortage Report,Artikel Tekort Rapport
-apps/erpnext/erpnext/stock/doctype/item/item.js +183,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Het gewicht wordt vermeld, \n Vermeld ""Gewicht UOM"" te"
+apps/erpnext/erpnext/stock/doctype/item/item.js +185,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Het gewicht wordt vermeld, \n Vermeld ""Gewicht UOM"" te"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,Materiaal Aanvraag is gebruikt om deze Voorraad  Entry te maken
 apps/erpnext/erpnext/config/support.py +43,Single unit of an Item.,Enkel stuks van een artikel. 
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +212,Time Log Batch {0} must be 'Submitted',Tijd Log Batch {0} moet worden 'Ingediend'
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,Maak boekhoudkundige afschrijving voor elke Stock Movement
 DocType: Leave Allocation,Total Leaves Allocated,Totaal Verlofdagen Toegewezen
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +384,Warehouse required at Row No {0},Warehouse vereist bij Row Geen {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +386,Warehouse required at Row No {0},Warehouse vereist bij Row Geen {0}
 DocType: Employee,Date Of Retirement,Pensioneringsdatum
 DocType: Upload Attendance,Get Template,Get Sjabloon
 DocType: Address,Postal,Post-
 DocType: Item,Weightage,Weging
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +159,Mining,Mijnbouw
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +17,Resin casting,Hars casting
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,Een Klantgroep met dezelfde naam bestaat. Gelieve de naam van de Klant of de Klantgroep  wijzigen
 apps/erpnext/erpnext/public/js/pos/pos.js +147,Please select {0} first.,Selecteer eerst {0}.
 apps/erpnext/erpnext/templates/pages/order.html +57,text {0},text {0}
 DocType: Territory,Parent Territory,Bovenliggende Regio
 DocType: Quality Inspection Reading,Reading 2,Meting 2
 DocType: Stock Entry,Material Receipt,Materiaal ontvangst
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +622,Products,producten
+apps/erpnext/erpnext/public/js/setup_wizard.js +358,Products,producten
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +47,Party Type and Party is required for Receivable / Payable account {0},Partij Type en Partij is nodig voor Debiteuren / Crediteuren rekening {0}
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.","Als dit item heeft varianten, dan kan het niet worden geselecteerd in verkooporders etc."
 DocType: Lead,Next Contact By,Volgende Contact Door
@@ -1486,13 +1432,13 @@
 DocType: Purchase Invoice,Notification Email Address,Notificatie e-mailadres
 DocType: Payment Tool,Find Invoices to Match,Vind facturen aan te passen
 ,Item-wise Sales Register,Artikelgebaseerde Verkoop Register
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +399,"e.g. ""XYZ National Bank""","bv ""XYZ Nationale Bank """
+apps/erpnext/erpnext/public/js/setup_wizard.js +147,"e.g. ""XYZ National Bank""","bv ""XYZ Nationale Bank """
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,Is dit inbegrepen in de Basic Rate?
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +57,Total Target,Totaal Doel
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Target,Totaal Doel
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.js +22,Shopping Cart is enabled,Winkelwagen is ingeschakeld
 DocType: Job Applicant,Applicant for a Job,Aanvrager van een baan
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +173,No Production Orders created,Geen productieorders aangemaakt
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +131,Salary Slip of employee {0} already created for this month,Salarisstrook van de werknemer {0} al gemaakt voor deze maand
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +140,Salary Slip of employee {0} already created for this month,Salarisstrook van de werknemer {0} al gemaakt voor deze maand
 DocType: Stock Reconciliation,Reconciliation JSON,Aflettering JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Teveel kolommen. Exporteer het rapport en druk het af via een Spreadsheet programma.
 DocType: Sales Invoice Item,Batch No,Partij nr.
@@ -1502,14 +1448,14 @@
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +13,Variant,Variant
 apps/frappe/frappe/public/js/frappe/form/toolbar.js +165,New {0},Nieuwe {0}
 DocType: Naming Series,Set prefix for numbering series on your transactions,Instellen voorvoegsel voor nummerreeksen voor uw transacties
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +169,Stopped order cannot be cancelled. Unstop to cancel.,Gestopte order kan niet worden geannuleerd. Terugdraaien om te annuleren .
-apps/erpnext/erpnext/stock/doctype/item/item.py +323,Default BOM ({0}) must be active for this item or its template,Default BOM ({0}) moet actief voor dit artikel of zijn template
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +164,Stopped order cannot be cancelled. Unstop to cancel.,Gestopte order kan niet worden geannuleerd. Terugdraaien om te annuleren .
+apps/erpnext/erpnext/stock/doctype/item/item.py +327,Default BOM ({0}) must be active for this item or its template,Default BOM ({0}) moet actief voor dit artikel of zijn template
 DocType: Employee,Leave Encashed?,Verlof verzilverd?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Opportunity Van veld is verplicht
 DocType: Item,Variants,Varianten
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +458,Make Purchase Order,Maak inkooporder
 DocType: SMS Center,Send To,Verzenden naar
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +111,There is not enough leave balance for Leave Type {0},Er is niet genoeg verlofsaldo voor Verlof type {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +127,There is not enough leave balance for Leave Type {0},Er is niet genoeg verlofsaldo voor Verlof type {0}
 DocType: Sales Team,Contribution to Net Total,Bijdrage aan Netto Totaal
 DocType: Sales Invoice Item,Customer's Item Code,Artikelcode van Klant
 DocType: Stock Reconciliation,Stock Reconciliation,Voorraad Aflettering
@@ -1546,11 +1492,11 @@
 DocType: Sales Order Item,Actual Qty,Werkelijk Aantal
 DocType: Sales Invoice Item,References,Referenties
 DocType: Quality Inspection Reading,Reading 10,Meting 10
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +612,"List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start.",Een lijst van uw producten of diensten die u koopt of verkoopt .
+apps/erpnext/erpnext/public/js/setup_wizard.js +348,"List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start.",Een lijst van uw producten of diensten die u koopt of verkoopt .
 DocType: Hub Settings,Hub Node,Hub Node
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,U hebt dubbele artikelen ingevoerd. Aub aanpassen en opnieuw proberen.
 apps/erpnext/erpnext/controllers/item_variant.py +65,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values,Waarde {0} voor Attribute {1} bestaat niet in de lijst van geldige Item attribuutwaarden
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +87,Associate,associëren
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Associate,associëren
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +46,Item {0} is not a serialized Item,Artikel {0} is geen seriegebonden artikel
 DocType: SMS Center,Create Receiver List,Maak Ontvanger Lijst
 apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +5,Expired,Verlopen
@@ -1559,7 +1505,7 @@
 DocType: Warranty Claim,Issue Date,Uitgiftedatum
 DocType: Activity Cost,Activity Cost,Activiteit Kosten
 DocType: Purchase Receipt Item Supplied,Consumed Qty,Verbruikt aantal
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +52,Telecommunications,telecommunicatie
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +52,Telecommunications,telecommunicatie
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),Geeft aan dat het pakket een onderdeel is van deze levering (alleen ontwerp)
 DocType: Payment Tool,Make Payment Entry,Betalen Entry
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +119,Quantity for Item {0} must be less than {1},Hoeveelheid voor artikel {0} moet kleiner zijn dan {1}
@@ -1576,10 +1522,8 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +37,"Selling must be checked, if Applicable For is selected as {0}","Verkoop moet zijn aangevinkt, indien ""Van toepassing voor"" is geselecteerd als {0}"
 DocType: Purchase Order Item,Supplier Quotation Item,Leverancier Offerte Artikel
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +27,Make Salary Structure,Maak salarisstructuur
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +54,Shearing,Het scheren
 DocType: Item,Has Variants,Heeft Varianten
 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.,Klik op &#39;Sales Invoice&#39; knop om een ​​nieuwe verkoopfactuur maken.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +166,Packaging and labeling,Verpakking en etikettering
 DocType: Monthly Distribution,Name of the Monthly Distribution,Naam van de verdeling per maand
 DocType: Sales Person,Parent Sales Person,Parent Sales Person
 apps/erpnext/erpnext/setup/utils.py +14,Please specify Default Currency in Company Master and Global Defaults,Specificeer een Standaard Valuta in Bedrijfsstam en Algemene Standaardwaarden
@@ -1590,19 +1534,18 @@
 DocType: Budget Detail,Fiscal Year,Boekjaar
 DocType: Cost Center,Budget,Begroting
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +41,"Budget cannot be assigned against {0}, as it's not an Income or Expense account","Budget kan niet worden toegewezen tegen {0}, want het is geen baten of lasten rekening"
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Achieved,Bereikt
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,Bereikt
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +65,Territory / Customer,Regio / Klantenservice
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,e.g. 5,bijv. 5
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +207,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},Rij {0}: Toegewezen bedrag {1} moet kleiner zijn dan of gelijk aan openstaande bedrag te factureren {2}
+apps/erpnext/erpnext/public/js/setup_wizard.js +294,e.g. 5,bijv. 5
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},Rij {0}: Toegewezen bedrag {1} moet kleiner zijn dan of gelijk aan openstaande bedrag te factureren {2}
 DocType: Sales Invoice,In Words will be visible once you save the Sales Invoice.,In Woorden zijn zichtbaar zodra u de Verkoopfactuur opslaat.
 DocType: Item,Is Sales Item,Is verkoopartikel
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,Artikel groepstructuur
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,Artikel {0} is niet ingesteld voor serienummers. Controleer Artikelstam
 DocType: Maintenance Visit,Maintenance Time,Onderhoud Tijd
 ,Amount to Deliver,Bedrag te leveren
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +620,A Product or Service,Een product of dienst
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +158,There were errors.,Er zijn fouten opgetreden.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +101,Tapping,Tapping
+apps/erpnext/erpnext/public/js/setup_wizard.js +356,A Product or Service,Een product of dienst
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +146,There were errors.,Er zijn fouten opgetreden.
 DocType: Naming Series,Current Value,Huidige waarde
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +171,{0} created,{0} aangemaakt
 DocType: Delivery Note Item,Against Sales Order,Tegen klantorder
@@ -1617,7 +1560,7 @@
 apps/erpnext/erpnext/accounts/party.py +275,Due Date cannot be before Posting Date,Verloopdatum kan niet voor de Boekingsdatum zijn
 DocType: Website Item Group,Website Item Group,Website Artikel Groep
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Duties and Taxes,Invoerrechten en Belastingen
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Please enter Reference date,Vul Peildatum in
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +312,Please enter Reference date,Vul Peildatum in
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} betaling items kunnen niet worden gefilterd door {1}
 DocType: Item Website Specification,Table for Item that will be shown in Web Site,Tafel voor post die in Web Site zal worden getoond
 DocType: Purchase Order Item Supplied,Supplied Qty,Meegeleverde Aantal
@@ -1625,7 +1568,7 @@
 apps/erpnext/erpnext/config/stock.py +103,Tree of Item Groups.,Boom van Artikelgroepen .
 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,Kan niet verwijzen rij getal groter dan of gelijk aan de huidige rijnummer voor dit type Charge
 ,Item-wise Purchase History,Artikelgebaseerde Inkoop Geschiedenis
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +152,Red,Rood
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Red,Rood
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +228,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},Klik op 'Genereer Planning' om serienummer op te halen voor Artikel {0}
 DocType: Account,Frozen,Bevroren
 ,Open Production Orders,Open productieorders
@@ -1640,16 +1583,17 @@
 DocType: Item Attribute,Attribute Name,Attribuutnaam
 apps/erpnext/erpnext/controllers/selling_controller.py +236,Item {0} must be Sales or Service Item in {1},Artikel {0} moet verkoop- of service-artikel zijn in {1}
 DocType: Item Group,Show In Website,Toon in Website
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +621,Group,Groep
+apps/erpnext/erpnext/public/js/setup_wizard.js +357,Group,Groep
 DocType: Task,Expected Time (in hours),Verwachte Tijd (in uren)
 ,Qty to Order,Aantal te bestellen
 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","Om merknaam volgen in de volgende documenten Delivery Note, Opportunity, Material Request, Item, Purchase Order, Aankoopbon, Koper ontvangst, Citaat, Sales Invoice, Goederen Bundel, Sales Order, Serienummer"
-apps/erpnext/erpnext/config/projects.py +51,Gantt chart of all tasks.,Gantt-daigram van alle taken.
+apps/erpnext/erpnext/config/projects.py +51,Gantt chart of all tasks.,Gantt-diagram van alle taken.
 DocType: Appraisal,For Employee Name,Voor Naam werknemer
 DocType: Holiday List,Clear Table,Wis Tabel
 DocType: Features Setup,Brands,Merken
 DocType: C-Form Invoice Detail,Invoice No,Factuur nr.
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +480,From Purchase Order,Van Inkooporder
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +92,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Verlaat niet kan worden toegepast / geannuleerd voordat {0}, als verlof balans al-carry doorgestuurd in de toekomst toewijzing verlof record is {1}"
 DocType: Activity Cost,Costing Rate,Costing Rate
 ,Customer Addresses And Contacts,Klant adressen en contacten
 DocType: Employee,Resignation Letter Date,Ontslagbrief Datum
@@ -1657,35 +1601,31 @@
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +137,Not Set,niet ingesteld
 DocType: Communication,Date,Datum
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,Terugkerende klanten Opbrengsten
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +651,Sit tight while your system is being setup. This may take a few moments.,Het systeem wordt nu ingericht. Dit kan even duren.
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +115,Sit tight while your system is being setup. This may take a few moments.,Het systeem wordt nu ingericht. Dit kan even duren.
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +51,{0} ({1}) must have role 'Expense Approver',{0} ({1}) moet de rol 'Onkosten Goedkeurder' hebben
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Pair,paar
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Pair,paar
 DocType: Bank Reconciliation Detail,Against Account,Tegen Rekening
 DocType: Maintenance Schedule Detail,Actual Date,Werkelijke Datum
 DocType: Item,Has Batch No,Heeft Batch nr.
 DocType: Delivery Note,Excise Page Number,Accijnzen Paginanummer
 DocType: Employee,Personal Details,Persoonlijke Gegevens
 ,Maintenance Schedules,Onderhoudsschema&#39;s
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +44,Embossing,Embossing
 ,Quotation Trends,Offerte Trends
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +139,Item Group not mentioned in item master for item {0},Artikelgroep niet genoemd in Artikelstam voor Artikel {0}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +302,Debit To account must be a Receivable account,Debet Om rekening moet een vordering-account
-apps/erpnext/erpnext/stock/doctype/item/item.py +310,"As Production Order can be made for this item, it must be a stock item.","Zoals productieorder kan worden gemaakt voor dit punt, moet het een voorraad item."
 DocType: Shipping Rule Condition,Shipping Amount,Verzendbedrag
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +140,Joining,Aansluiting
-DocType: Authorization Rule,Above Value,Boven waarde
 ,Pending Amount,In afwachting van Bedrag
 DocType: Purchase Invoice Item,Conversion Factor,Conversiefactor
 DocType: Purchase Order,Delivered,Geleverd
 apps/erpnext/erpnext/config/hr.py +160,Setup incoming server for jobs email id. (e.g. jobs@example.com),Setup inkomende server voor banen e-id . ( b.v. jobs@example.com )
 DocType: Purchase Receipt,Vehicle Number,Voertuig Aantal
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,De datum waarop terugkerende factuur stopt
+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,Totaal toegewezen bladeren {0} kan niet lager zijn dan die reeds zijn goedgekeurd bladeren {1} voor de periode
 DocType: Journal Entry,Accounts Receivable,Debiteuren
 ,Supplier-Wise Sales Analytics,Leverancier-gebaseerde Verkoop Analyse
 DocType: Address Template,This format is used if country specific format is not found,Dit formaat wordt gebruikt als landspecifiek formaat niet kan worden gevonden
 DocType: Custom Field,Custom,Aangepast
 DocType: Production Order,Use Multi-Level BOM,Gebruik Multi-Level Stuklijst
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +26,Injection molding,Spuitgieten
 DocType: Bank Reconciliation,Include Reconciled Entries,Omvatten Reconciled Entries
 apps/erpnext/erpnext/config/accounts.py +41,Tree of finanial accounts.,Boom van financiële rekeningen
 DocType: Leave Control Panel,Leave blank if considered for all employee types,Laat leeg indien overwogen voor alle werknemer soorten
@@ -1695,30 +1635,28 @@
 apps/frappe/frappe/config/setup.py +130,Printing,Afdrukken
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +114,Expense Claim is pending approval. Only the Expense Approver can update status.,Kostendeclaratie is in afwachting van goedkeuring. Alleen de Kosten Goedkeurder kan status bijwerken.
 DocType: Purchase Invoice,Additional Discount Amount,Extra korting Bedrag
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +99,The day(s) on which you are applying for leave are holiday. You need not apply for leave.,De dag(en) waarvoor je verlof aanvraagt zijn feestdagen. Hier hoef je niet voor aan te vragen.
 apps/frappe/frappe/public/js/frappe/misc/utils.js +110,and,en
 DocType: Leave Block List Allow,Leave Block List Allow,Laat Block List Laat
 apps/erpnext/erpnext/setup/doctype/company/company.py +236,Abbr can not be blank or space,Abbr kan niet leeg of ruimte
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +50,Sports,Sport
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,Sport
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Actual,Totaal Werkelijke
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Unit,eenheid
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Unit,eenheid
 apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.py +182,Please set Dropbox access keys in your site config,Stel Dropbox access keys in in uw site configuratie
 apps/erpnext/erpnext/stock/get_item_details.py +113,Please specify Company,Specificeer Bedrijf
 ,Customer Acquisition and Loyalty,Klantenwerving en behoud
 DocType: Purchase Receipt,Warehouse where you are maintaining stock of rejected items,Magazijn waar u voorraad bijhoudt van afgewezen artikelen
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +408,Your financial year ends on,Uw financiële jaar eindigt op
+apps/erpnext/erpnext/public/js/setup_wizard.js +156,Your financial year ends on,Uw financiële jaar eindigt op
 DocType: POS Profile,Price List,Prijslijst
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +20,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0} is nu het standaard Boekjaar. Ververs uw browser om de wijziging door te voeren .
 apps/erpnext/erpnext/projects/doctype/project/project.js +47,Expense Claims,Declaraties
 DocType: Issue,Support,Support
-DocType: Authorization Rule,Approving Role,Goedkeuren Rol
 ,BOM Search,BOM Zoeken
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +176,Closing (Opening + Totals),Sluiting (openen + Totalen)
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +26,Please specify currency in Company,Omschrijf valuta Company
 DocType: Workstation,Wages per hour,Loon per uur
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},Voorraadbalans in Batch {0} zal negatief worden {1} voor Artikel {2} in Magazijn {3}
 apps/erpnext/erpnext/config/setup.py +83,"Show / Hide features like Serial Nos, POS etc.","Toon / verberg functies, zoals serienummers , POS etc."
-apps/erpnext/erpnext/controllers/accounts_controller.py +236,Account {0} is invalid. Account Currency must be {1},Account {0} is ongeldig. Account Valuta moet {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +237,Account {0} is invalid. Account Currency must be {1},Account {0} is ongeldig. Account Valuta moet {1}
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +34,UOM Conversion factor is required in row {0},Eenheid Omrekeningsfactor is vereist in rij {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +53,Clearance date cannot be before check date in row {0},Klaring mag niet voor check datum in rij {0}
 DocType: Salary Slip,Deduction,Aftrek
@@ -1737,13 +1675,13 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +82,Item {0} has already been returned,Artikel {0} is al geretourneerd
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,**Boekjaar** staat voor een financieel jaar. Alle boekingen en andere belangrijke transacties worden bijgehouden in **boekjaar**.
 DocType: Opportunity,Customer / Lead Address,Klant / Lead Adres
+apps/erpnext/erpnext/stock/doctype/item/item.py +112,Warning: Invalid SSL certificate on attachment {0},Waarschuwing: Ongeldig SSL certificaat op attachment {0}
 DocType: Production Order Operation,Actual Operation Time,Werkelijke Operatie Duur
 DocType: Authorization Rule,Applicable To (User),Van toepassing zijn op (Gebruiker)
 DocType: Purchase Taxes and Charges,Deduct,Aftrekken
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +170,Job Description,Functiebeschrijving
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +170,Job Description,Functiebeschrijving
 DocType: Purchase Order Item,Qty as per Stock UOM,Aantal per Voorraad eenheid
 apps/frappe/frappe/model/rename_doc.py +343,Please select a valid csv file with data,Selecteer een geldig CSV-bestand met gegevens
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +92,Coating,Bekleding
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +126,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Speciale tekens behalve ""-"" ""."", ""#"", en ""/"" niet toegestaan ​​in de reeks"
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Blijf op de hoogte van Sales Campaigns. Blijf op de hoogte van Leads, Offertes, Sales Order etc van campagnes te meten Return on Investment. "
 DocType: Expense Claim,Approver,Goedkeurder
@@ -1753,12 +1691,11 @@
 DocType: Supplier Quotation,Manufacturing Manager,Productie Manager
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},Serienummer {0} is onder garantie tot {1}
 apps/erpnext/erpnext/config/stock.py +69,Split Delivery Note into packages.,Splits Vrachtbrief in pakketten.
-apps/erpnext/erpnext/hooks.py +84,Shipments,Zendingen
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +29,Dip molding,Dip moulding
+apps/erpnext/erpnext/hooks.py +68,Shipments,Zendingen
 DocType: Purchase Order,To be delivered to customer,Om de klant te leveren
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,Tijd Log Status moet worden ingediend.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,Serienummer {0} niet behoren tot een Warehouse
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +650,Setting Up,Opzetten
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +114,Setting Up,Opzetten
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,Row # ,Rij #
 DocType: Purchase Invoice,In Words (Company Currency),In Woorden (Bedrijfsvaluta)
 DocType: Pricing Rule,Supplier,Leverancier
@@ -1766,7 +1703,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +105,Miscellaneous Expenses,Diverse Kosten
 DocType: Global Defaults,Default Company,Standaard Bedrijf
 apps/erpnext/erpnext/controllers/stock_controller.py +166,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,Kosten- of verschillenrekening is verplicht voor artikel {0} omdat het invloed heeft op de totale voorraadwaarde
-apps/erpnext/erpnext/controllers/accounts_controller.py +354,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","Kan niet overbill voor post {0} in rij {1} meer dan {2}. Toestaan ​​overbilling, stel dan in Stock Instellingen"
+apps/erpnext/erpnext/controllers/accounts_controller.py +355,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","Kan niet overbill voor post {0} in rij {1} meer dan {2}. Toestaan ​​overbilling, stel dan in Stock Instellingen"
 DocType: Employee,Bank Name,Naam Bank
 apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +27,-Above,-Boven
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +135,User {0} is disabled,Gebruiker {0} is uitgeschakeld
@@ -1779,27 +1716,26 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,{0} is mandatory for Item {1},{0} is verplicht voor Artikel {1}
 DocType: Currency Exchange,From Currency,Van Valuta
 DocType: DocField,Name,Naam
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +211,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Selecteer toegewezen bedrag, Factuur Type en factuurnummer in tenminste één rij"
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +104,Sales Order required for Item {0},Verkooporder nodig voor Artikel {0}
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +158,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Selecteer toegewezen bedrag, Factuur Type en factuurnummer in tenminste één rij"
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +107,Sales Order required for Item {0},Verkooporder nodig voor Artikel {0}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +43,Amounts not reflected in system,Bedragen die niet terug te vinden in het systeem
 DocType: Purchase Invoice Item,Rate (Company Currency),Tarief (Bedrijfsvaluta)
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +40,Others,anderen
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +40,Others,anderen
 apps/erpnext/erpnext/templates/includes/product_page.js +80,Cannot find a matching Item. Please select some other value for {0}.,Kan een bijpassende Item niet vinden. Selecteer een andere waarde voor {0}.
 DocType: POS Profile,Taxes and Charges,Belastingen en Toeslagen
 DocType: Item,"A Product or a Service that is bought, sold or kept in stock.","Een Product of een Dienst dat wordt gekocht, verkocht of in voorraad wordt gehouden."
 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,Kan het type lading niet selecteren als 'On Vorige Row Bedrag ' of ' On Vorige Row Totaal ' voor de eerste rij
 apps/frappe/frappe/core/doctype/doctype/boilerplate/controller_list.html +31,Completed,Voltooid
 DocType: Web Form,Select DocType,Selecteer DocType
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +104,Broaching,Kotteren
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +12,Banking,Bankieren
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,Bankieren
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +38,Please click on 'Generate Schedule' to get schedule,Klik op 'Genereer Planning' om planning te krijgen
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +283,New Cost Center,Nieuwe Kostenplaats
 DocType: Bin,Ordered Quantity,Bestelde hoeveelheid
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +397,"e.g. ""Build tools for builders""","bijv. ""Bouwgereedschap voor bouwers """
+apps/erpnext/erpnext/public/js/setup_wizard.js +145,"e.g. ""Build tools for builders""","bijv. ""Bouwgereedschap voor bouwers """
 DocType: Quality Inspection,In Process,In Process
 DocType: Authorization Rule,Itemwise Discount,Artikelgebaseerde Korting
 DocType: Purchase Order Item,Reference Document Type,Referentie Document Type
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +318,{0} against Sales Order {1},{0} tegen Verkooporder {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +320,{0} against Sales Order {1},{0} tegen Verkooporder {1}
 DocType: Account,Fixed Asset,Vast Activum
 apps/erpnext/erpnext/config/stock.py +283,Serialized Inventory,Geserialiseerde Inventory
 DocType: Activity Type,Default Billing Rate,Default Billing Rate
@@ -1814,14 +1750,13 @@
 DocType: Purchase Invoice Item,Page Break,Pagina-einde
 DocType: Production Order Operation,Pending,In afwachting van
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,Gebruikers die verlofaanvragen een bepaalde werknemer kan goedkeuren
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +33,You cannot change default UOM of Variant. To change default UOM for Variant change default UOM of the Template,U kunt standaard Verpakking van Variant niet veranderen. Om standaard UOM veranderen Variant verandering standaard Verpakking van de Template
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +50,Office Equipments,Kantoor Apparatuur
 DocType: Purchase Invoice Item,Qty,Aantal
 DocType: Fiscal Year,Companies,Bedrijven
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +24,Electronics,elektronica
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +24,Electronics,elektronica
 DocType: Stock Settings,Raise Material Request when stock reaches re-order level,Maak Materiaal Aanvraag wanneer voorraad daalt tot onder het bestelniveau
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +18,From Maintenance Schedule,Van onderhoudsschema
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +56,Full-time,Full-time
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +56,Full-time,Full-time
 DocType: Purchase Invoice,Contact Details,Contactgegevens
 DocType: C-Form,Received Date,Ontvangstdatum
 DocType: Delivery Note,"If you have created a standard template in Sales Taxes and Charges Template, select one and click on the button below.","Als u een standaard template in Sales en -heffingen Template hebt gemaakt, selecteert u een en klik op de knop hieronder."
@@ -1833,11 +1768,12 @@
 DocType: Job Applicant,Job Opening,Vacature
 DocType: Payment Reconciliation,Payment Reconciliation,Afletteren
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +154,Please select Incharge Person's name,Selecteer de naam van de Verantwoordelijk Persoon
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +51,Technology,technologie
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,technologie
 DocType: Offer Letter,Offer Letter,Aanbod Letter
 apps/erpnext/erpnext/config/manufacturing.py +51,Generate Material Requests (MRP) and Production Orders.,Genereer Materiaal Aanvragen (MRP) en Productieorders.
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +68,Total Invoiced Amt,Totale gefactureerde Amt
 DocType: Time Log,To Time,Tot Tijd
+DocType: Authorization Rule,Approving Role (above authorized value),Goedkeuren Rol (boven de toegestane waarde)
 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.","Om onderliggende nodes te voegen , klap de boom uit en klik op de node waaronder u meer nodes wilt toevoegen."
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +102,Credit To account must be a Payable account,Credit Om rekening moet een betalend account zijn
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +233,BOM recursion: {0} cannot be parent or child of {2},Stuklijst recursie: {0} mag niet ouder of kind zijn van {2}
@@ -1850,10 +1786,8 @@
 DocType: Item,Customer Item Codes,Customer Item Codes
 DocType: Opportunity,Lost Reason,Reden van verlies
 apps/erpnext/erpnext/config/accounts.py +68,Create Payment Entries against Orders or Invoices.,Maak Betaling Inzendingen tegen bestellingen of facturen.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +141,Welding,Lassen
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +40,New Stock UOM is required,Nieuwe Voorraad Eenheid is verplicht
 DocType: Quality Inspection,Sample Size,Monster grootte
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +443,All items have already been invoiced,Alle items zijn reeds gefactureerde
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +446,All items have already been invoiced,Alle items zijn reeds gefactureerde
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',Geef een geldig 'Van Zaaknummer'
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +287,Further cost centers can be made under Groups but entries can be made against non-Groups,"Verdere kostenplaatsen kan in groepen worden gemaakt, maar items kunnen worden gemaakt tegen niet-Groepen"
 DocType: Project,External,Extern
@@ -1865,8 +1799,7 @@
 DocType: Bin,Actual Quantity,Werkelijke hoeveelheid
 DocType: Shipping Rule,example: Next Day Shipping,Bijvoorbeeld: Next Day Shipping
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,Serienummer {0} niet gevonden
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +563,Your Customers,Uw Klanten
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +27,Compression molding,Persgieten
+apps/erpnext/erpnext/public/js/setup_wizard.js +303,Your Customers,Uw Klanten
 DocType: Leave Block List Date,Block Date,Blokeer Datum
 DocType: Sales Order,Not Delivered,Niet geleverd
 ,Bank Clearance Summary,Bank Ontruiming Samenvatting
@@ -1887,10 +1820,10 @@
 DocType: SMS Log,Sent To,Verzenden Naar
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +28,Make Sales Invoice,Maak verkoopfactuur
 DocType: Company,For Reference Only.,Alleen voor referentie.
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +29,Invalid {0}: {1},Ongeldige {0}: {1}
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +49,Invalid {0}: {1},Ongeldige {0}: {1}
 DocType: Sales Invoice Advance,Advance Amount,Voorschot Bedrag
 DocType: Manufacturing Settings,Capacity Planning,Capaciteit Planning
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +49,'From Date' is required,'Van Datum' is vereist
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +43,'From Date' is required,'Van Datum' is vereist
 DocType: Journal Entry,Reference Number,Referentienummer
 DocType: Employee,Employment Details,Dienstverband Details
 DocType: Employee,New Workplace,Nieuwe werkplek
@@ -1905,7 +1838,7 @@
 DocType: Serial No,Delivery Time,Levertijd
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Vergrijzing Based On
 DocType: Item,End of Life,End of Life
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +41,Travel,reizen
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +41,Travel,reizen
 DocType: Leave Block List,Allow Users,Gebruikers toestaan
 DocType: Purchase Order,Customer Mobile No,Klant Mobile Geen
 DocType: Sales Invoice,Recurring,Terugkerende
@@ -1919,7 +1852,7 @@
 DocType: Naming Series,User must always select,Gebruiker moet altijd kiezen
 DocType: Stock Settings,Allow Negative Stock,Laat Negatieve voorraad
 DocType: Installation Note,Installation Note,Installatie Opmerking
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +541,Add Taxes,Belastingen toevoegen
+apps/erpnext/erpnext/public/js/setup_wizard.js +283,Add Taxes,Belastingen toevoegen
 ,Financial Analytics,Financiële Analyse
 DocType: Quality Inspection,Verified By,Geverifieerd door
 DocType: Address,Subsidiary,Dochteronderneming
@@ -1929,7 +1862,6 @@
 DocType: System Settings,In Hours,In Hours
 DocType: Process Payroll,Create Salary Slip,Maak loonstrook
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Expected balance as per bank,Verwacht banksaldo
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +115,Buffing,Buffing
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Source of Funds (Liabilities),Bron van Kapitaal (Passiva)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +347,Quantity in row {0} ({1}) must be same as manufactured quantity {2},Hoeveelheid in rij {0} ({1}) moet hetzelfde zijn als geproduceerde hoeveelheid {2}
 DocType: Appraisal,Employee,Werknemer
@@ -1939,18 +1871,18 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,{0} {1} is fully billed,{0} {1} is volledig gefactureerd
 DocType: Workstation Working Hour,End Time,Eindtijd
 apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,Standaard contractvoorwaarden voor Verkoop of Inkoop .
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +75,Group by Voucher,Groep door Voucher
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +75,Group by Voucher,Groep volgens Voucher
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Vereist op
 DocType: Sales Invoice,Mass Mailing,Mass Mailing
 DocType: Page,Standard,Standaard
 DocType: Rename Tool,File to Rename,Bestand naar hernoemen
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +176,Purchse Order number required for Item {0},Inkoopordernummer vereist voor Artikel {0}
 apps/erpnext/erpnext/public/js/controllers/transaction.js +136,Show Payments,Toon betalingen
-apps/erpnext/erpnext/controllers/buying_controller.py +245,Specified BOM {0} does not exist for Item {1},Gespecificeerde Stuklijst {0} bestaat niet voor Artikel {1}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +202,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Onderhoudsschema {0} moet worden geannuleerd voordat het annuleren van deze verkooporder
+apps/erpnext/erpnext/controllers/buying_controller.py +236,Specified BOM {0} does not exist for Item {1},Gespecificeerde Stuklijst {0} bestaat niet voor Artikel {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Onderhoudsschema {0} moet worden geannuleerd voordat het annuleren van deze verkooporder
 apps/frappe/frappe/desk/page/backups/backups.html +13,Size,Grootte
 DocType: Notification Control,Expense Claim Approved,Kostendeclaratie Goedgekeurd
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +113,Pharmaceutical,Geneesmiddel
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Pharmaceutical,Geneesmiddel
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,Kosten van gekochte artikelen
 DocType: Selling Settings,Sales Order Required,Verkooporder Vereist
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +30,Create Customer,Maak klant
@@ -1960,7 +1892,6 @@
 DocType: Quality Inspection Reading,Reading 9,Meting 9
 DocType: Supplier,Is Frozen,Is Bevroren
 DocType: Buying Settings,Buying Settings,Inkoop Instellingen
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +122,Mass finishing,Mass afwerking
 DocType: Stock Entry Detail,BOM No. for a Finished Good Item,Stuklijst nr voor een Gereed Product Artikel
 DocType: Upload Attendance,Attendance To Date,Aanwezigheid graag:
 apps/erpnext/erpnext/config/selling.py +158,Setup incoming server for sales email id. (e.g. sales@example.com),Setup inkomende server voor de verkoop e-id . ( b.v. sales@example.com )
@@ -1968,7 +1899,7 @@
 DocType: Payment Tool,Payment Account,Betaalrekening
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +713,Please specify Company to proceed,Specificeer Bedrijf om verder te gaan
 apps/frappe/frappe/public/js/frappe/model/indicator.js +30,Draft,Ontwerp
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +46,Compensatory Off,compenserende Off
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Compensatory Off,compenserende Off
 DocType: Quality Inspection Reading,Accepted,Geaccepteerd
 DocType: User,Female,Vrouwelijk
 DocType: Journal Entry Account,Debit in Account Currency,Debet in rekening Valuta
@@ -1980,7 +1911,7 @@
 DocType: Shipping Rule,Shipping Rule Label,Verzendregel Label
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +209,Raw Materials cannot be blank.,Grondstoffen kan niet leeg zijn.
 DocType: Newsletter,Test,Test
-apps/erpnext/erpnext/stock/doctype/item/item.py +364,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +368,"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'","Omdat er bestaande voorraad transacties voor deze post, \ u de waarden van het niet kunnen veranderen &#39;Heeft Serial No&#39;, &#39;Heeft Batch Nee&#39;, &#39;Is Stock Item&#39; en &#39;Valuation Method&#39;"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +448,Quick Journal Entry,Quick Journal Entry
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +92,You can not change rate if BOM mentioned agianst any item,U kunt het tarief niet veranderen als een artikel Stuklijst-gerelateerd is.
@@ -1991,13 +1922,14 @@
 apps/erpnext/erpnext/config/stock.py +18,Requests for items.,Artikelaanvragen
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,Een aparte Productie Order zal worden aangemaakt voor elk gereed product artikel
 DocType: Purchase Invoice,Terms and Conditions1,Algemene Voorwaarden1
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +18,Complete Setup,Voltooien Setup
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard_page.html +18,Complete Setup,Voltooien Setup
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","Boekingen bevroren tot deze datum, niemand kan / de boeking wijzigen behalve de hieronder gespecificeerde rol."
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +121,Please save the document before generating maintenance schedule,Sla het document op voordat u het onderhoudsschema genereert
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,Project Status
 DocType: UOM,Check this to disallow fractions. (for Nos),Aanvinken om delingen te verbieden.
 apps/erpnext/erpnext/config/crm.py +96,Newsletter Mailing List,Nieuwsbrief Mailing List
 DocType: Delivery Note,Transporter Name,Vervoerder Naam
+DocType: Authorization Rule,Authorized Value,Authorized Value
 DocType: Contact,Enter department to which this Contact belongs,Voer afdeling in waartoe deze Contactpersoon behoort
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Absent,Totaal Afwezig
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +746,Item or Warehouse for row {0} does not match Material Request,Artikel of Magazijn voor rij {0} komt niet overeen met Materiaal Aanvraag
@@ -2022,16 +1954,15 @@
 DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),Basic Rate (volgens Stock UOM)
 DocType: SMS Log,No of Requested SMS,Aantal gevraagde SMS
 DocType: Campaign,Campaign-.####,Campagne-.####
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +55,Piercing,Doordringend
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,Volgende stappen
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +117,Contract End Date must be greater than Date of Joining,Contract Einddatum moet groter zijn dan datum van indiensttreding zijn
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,Een derde partij distributeur / dealer / commissionair / affiliate / reseller die uw producten voor een commissie verkoopt.
 DocType: Customer Group,Has Child Node,Heeft onderliggende node
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{0} against Purchase Order {1},{0} tegen Inkooporder {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +332,{0} against Purchase Order {1},{0} tegen Inkooporder {1}
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","Voer statische url parameters hier in (bijv. afzender=ERPNext, username = ERPNext, wachtwoord = 1234 enz.)"
 apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,{0} {1} is niet in het actieve fiscale jaar. Voor meer informatie kijk {2}.
-apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,"Dit is een voorbeeld website, automatisch gegenereerd door ERPNext"
+apps/erpnext/erpnext/setup/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,"Dit is een voorbeeld website, automatisch gegenereerd door ERPNext"
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +37,Ageing Range 1,Vergrijzing Range 1
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +110,Photochemical machining,Fotochemische verspanen
 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.
 
 #### Note
@@ -2077,7 +2008,7 @@
 DocType: Purchase Receipt Item,Recd Quantity,Benodigde hoeveelheid
 DocType: Email Account,Email Ids,E-mail Ids
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},Kan niet meer produceren van Artikel {0} dan de Verkooporder hoeveelheid {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +471,Stock Entry {0} is not submitted,Stock Entry {0} is niet ingediend
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +473,Stock Entry {0} is not submitted,Stock Entry {0} is niet ingediend
 DocType: Payment Reconciliation,Bank / Cash Account,Bank- / Kasrekening
 DocType: Tax Rule,Billing City,Billing Stad
 DocType: Global Defaults,Hide Currency Symbol,Verberg Valutasymbool
@@ -2093,7 +2024,7 @@
 DocType: Purchase Invoice,Currency and Price List,Valuta en Prijslijst
 DocType: Opportunity,Customer / Lead Name,Klant / Lead Naam
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +63,Clearance Date not mentioned,Ontruiming Datum niet vermeld
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +71,Production,productie
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Production,productie
 DocType: Item,Allow Production Order,Laat Productieorder
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +60,Row {0}:Start Date must be before End Date,Rij {0} : Start Datum moet voor Einddatum zijn
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Totaal (Aantal)
@@ -2106,7 +2037,7 @@
 apps/erpnext/erpnext/utilities/doctype/address/address.py +113,My Addresses,Mijn Adressen
 DocType: Stock Ledger Entry,Outgoing Rate,Uitgaande Rate
 apps/erpnext/erpnext/config/hr.py +100,Organization branch master.,Organisatie tak meester .
-apps/erpnext/erpnext/controllers/accounts_controller.py +237, or ,of
+apps/erpnext/erpnext/controllers/accounts_controller.py +238, or ,of
 DocType: Sales Order,Billing Status,Factuur Status
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Utility Expenses,Utiliteitskosten
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,90-Above,90-Boven
@@ -2133,6 +2064,7 @@
 DocType: Stock Entry Detail,Serial No / Batch,Serienummer / Batch
 DocType: Product Bundle,Parent Item,Bovenliggend Artikel
 DocType: Account,Account Type,Rekening Type
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +113,Leave Type {0} cannot be carry-forwarded,Verlaat Type {0} kan niet worden doorgestuurd dragen-
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +213,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',Onderhoudsschema wordt niet gegenereerd voor alle items . Klik op ' Generate Schedule'
 ,To Produce,Produceren
 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","Voor rij {0} in {1}. Om {2} onder in punt tarief, rijen {3} moet ook opgenomen worden"
@@ -2140,10 +2072,7 @@
 DocType: Bin,Reserved Quantity,Gereserveerde Hoeveelheid
 DocType: Landed Cost Voucher,Purchase Receipt Items,Ontvangstbevestiging Artikelen
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,Aanpassen Formulieren
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +62,Cutting,Stek
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +69,Flattening,Afvlakking
 DocType: Account,Income Account,Inkomstenrekening
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +22,Molding,Lijstwerk
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +632,Delivery,Levering
 DocType: Stock Reconciliation Item,Current Qty,Huidige Aantal
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",Zie &quot;Rate Of Materials Based On&quot; in Costing Sectie
@@ -2153,20 +2082,19 @@
 apps/frappe/frappe/desk/moduleview.py +61,Documents,Documenten
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +17,Ref,Ref
 DocType: Cost Center,Cost Center,Kostenplaats
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.js +48,Voucher #,voucher nr
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +36,Voucher #,voucher nr
 DocType: Notification Control,Purchase Order Message,Inkooporder Bericht
 DocType: Tax Rule,Shipping Country,Verzenden Land
 DocType: Upload Attendance,Upload HTML,Upload HTML
-apps/erpnext/erpnext/controllers/accounts_controller.py +391,"Total advance ({0}) against Order {1} cannot be greater \
+apps/erpnext/erpnext/controllers/accounts_controller.py +392,"Total advance ({0}) against Order {1} cannot be greater \
 				than the Grand Total ({2})","Totaal vooraf ({0}) tegen Bestel {1} ​​kan niet groter zijn \
  dan de Grand Total ({2})"
 DocType: Employee,Relieving Date,Ontslagdatum
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +12,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.","Prijsbepalingsregel overschrijft de prijslijst / defininieer een kortingspercentage, gebaseerd op een aantal criteria."
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,Magazijn kan alleen via Voorraad Invoer / Vrachtbrief / Ontvangstbewijs worden veranderd
 DocType: Employee Education,Class / Percentage,Klasse / Percentage
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +92,Head of Marketing and Sales,Hoofd Marketing en Verkoop
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +31,Income Tax,Inkomstenbelasting
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +157,Laser engineered net shaping,Laser ontworpen net shaping
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Head of Marketing and Sales,Hoofd Marketing en Verkoop
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +31,Income Tax,Inkomstenbelasting
 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.","Als geselecteerde Pricing Regel is gemaakt voor 'Prijs', zal het Prijslijst overschrijven. Prijsstelling Regel prijs is de uiteindelijke prijs, dus geen verdere korting moet worden toegepast. Vandaar dat in transacties zoals Sales Order, Purchase Order etc, het zal worden opgehaald in 'tarief' veld, in plaats van het veld 'prijslijst Rate'."
 apps/erpnext/erpnext/config/selling.py +163,Track Leads by Industry Type.,Houd Leads bij per de industrie type.
 DocType: Item Supplier,Item Supplier,Artikel Leverancier
@@ -2189,31 +2117,28 @@
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Werkelijke Aantal Na Transactie
 ,Pending SO Items For Purchase Request,In afwachting van Verkoop Artikelen voor Inkoopaanvraag
 DocType: Supplier,Billing Currency,Billing Valuta
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +148,Extra Large,Extra Groot
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,Extra Large,Extra Groot
 ,Profit and Loss Statement,Winst-en verliesrekening
 DocType: Bank Reconciliation Detail,Cheque Number,Cheque nummer
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +43,Pressing,Persing
 DocType: Payment Tool Detail,Payment Tool Detail,Betaling Tool Detail
 ,Sales Browser,Verkoop verkenner
 DocType: Journal Entry,Total Credit,Totaal Krediet
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +474,Warning: Another {0} # {1} exists against stock entry {2},Waarschuwing: Een andere {0} # {1} bestaat tegen voorraad binnenkomst {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +459,Local,Lokaal
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +476,Warning: Another {0} # {1} exists against stock entry {2},Waarschuwing: Een andere {0} # {1} bestaat tegen voorraad binnenkomst {2}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +397,Local,Lokaal
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),Leningen en voorschotten (Activa)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,Debiteuren
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +147,Large,Groot
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +23,No employee found!,Geen werknemer gevonden!
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Large,Groot
 DocType: C-Form Invoice Detail,Territory,Regio
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,Vermeld het benodigde aantal bezoeken
 DocType: Purchase Order,Customer Address Display,Customer Address Weergave
 DocType: Stock Settings,Default Valuation Method,Standaard Waarderingsmethode
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +127,Polishing,Polijsten
 DocType: Production Order Operation,Planned Start Time,Geplande Starttijd
 apps/erpnext/erpnext/config/accounts.py +63,Close Balance Sheet and book Profit or Loss.,Sluiten Balans en boek Winst of verlies .
-apps/erpnext/erpnext/stock/doctype/item/item.py +661,"Default Unit of Measure for Item {0} cannot be changed directly because \
+apps/erpnext/erpnext/stock/doctype/item/item.py +665,"Default Unit of Measure for Item {0} cannot be changed directly because \
 			you have already made some transaction(s) with another UOM. To change default UOM, \
 			use 'UOM Replace Utility' tool under Stock module.","Standaard maateenheid voor post {0} kan niet direct worden gewijzigd omdat \ heb je al enkele transactie (s) met een andere UOM gemaakt. Om standaard UOM wijzigen, \ gebruik &#39;UOM Vervang Utility&#39; hulpmiddel onder Stock module."
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,Specificeer Wisselkoers om een ​​valuta om te zetten in een andere
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +146,Quotation {0} is cancelled,Offerte {0} is geannuleerd
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +141,Quotation {0} is cancelled,Offerte {0} is geannuleerd
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,Totale uitstaande bedrag
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} was on leave on {1}. Cannot mark attendance.,Werknemer {0} was met verlof op {1} . Kan aanwezigheid niet markeren .
 DocType: Sales Partner,Targets,Doelen
@@ -2224,7 +2149,6 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +158,Please create Customer from Lead {0},Maak Klant van Lead {0}
 DocType: Price List,Applicable for Countries,Toepasselijk voor Landen
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Computers,Computers
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +112,Electro-chemical grinding,Elektro-chemische slijpen
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +14,This is a root customer group and cannot be edited.,Dit is een basis klantgroep en kan niet worden bewerkt .
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +39,Please setup your chart of accounts before you start Accounting Entries,"Stel eerst uw rekeningschema op, voordat u start met het invoeren van boekingen"
 DocType: Purchase Invoice,Ignore Pricing Rule,Negeer Prijsregel
@@ -2282,7 +2206,6 @@
 DocType: Maintenance Visit,Purposes,Doeleinden
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +103,Atleast one item should be entered with negative quantity in return document,Minstens één punt moet in ruil document worden ingevoerd met een negatieve hoeveelheid
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +67,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","Operation {0} langer dan alle beschikbare werktijd in werkstation {1}, breken de operatie in meerdere operaties"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +134,Electrochemical machining,Elektrochemische bewerking
 ,Requested,Aangevraagd
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +66,No Remarks,Geen Opmerkingen
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +13,Overdue,Achterstallig
@@ -2291,7 +2214,7 @@
 DocType: Monthly Distribution,Distribution Name,Distributie Naam
 DocType: Features Setup,Sales and Purchase,Verkoop en Inkoop
 DocType: Supplier Quotation Item,Material Request No,Materiaal Aanvraag nr.
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +218,Quality Inspection required for Item {0},Kwaliteitscontrole vereist voor Artikel {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +221,Quality Inspection required for Item {0},Kwaliteitscontrole vereist voor Artikel {0}
 DocType: Quotation,Rate at which customer's currency is converted to company's base currency,Koers waarmee de Klant Valuta wordt omgerekend naar de basis bedrijfsvaluta
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +107,{0} has been successfully unsubscribed from this list.,{0} heeft met succes uitgeschreven uit deze lijst geweest.
 DocType: Purchase Invoice Item,Net Rate (Company Currency),Net Rate (Company Valuta)
@@ -2309,9 +2232,8 @@
 apps/erpnext/erpnext/accounts/report/financial_statements.py +16,Fiscal Year {0} not found.,Fiscale Jaar {0} niet gevonden.
 DocType: Bank Reconciliation,Get Relevant Entries,Haal relevante gegevens op
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +407,Accounting Entry for Stock,Boekingen voor Voorraad
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +64,Coining,Coining
 DocType: Sales Invoice,Sales Team1,Verkoop Team1
-apps/erpnext/erpnext/stock/doctype/item/item.py +412,Item {0} does not exist,Artikel {0} bestaat niet
+apps/erpnext/erpnext/stock/doctype/item/item.py +416,Item {0} does not exist,Artikel {0} bestaat niet
 DocType: Sales Invoice,Customer Address,Klant Adres
 apps/frappe/frappe/desk/query_report.py +136,Total,Totaal
 DocType: Purchase Invoice,Apply Additional Discount On,Breng Extra Korting op
@@ -2323,14 +2245,13 @@
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),Belasting Bedrag na korting Bedrag (Company valuta)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +149,Target warehouse is mandatory for row {0},Doel magazijn is verplicht voor rij {0}
 DocType: Quality Inspection,Quality Inspection,Kwaliteitscontrole
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +144,Extra Small,Extra Small
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +20,Spray forming,Spray vormen
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Extra Small,Extra Small
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +458,Warning: Material Requested Qty is less than Minimum Order Qty,Waarschuwing: Materiaal Aanvraag Aantal is minder dan Minimum Bestelhoeveelheid
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +191,Account {0} is frozen,Rekening {0} is bevroren
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Rechtspersoon / Dochteronderneming met een aparte Rekeningschema behoren tot de Organisatie.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +29,"Food, Beverage & Tobacco","Voeding, Drank en Tabak"
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","Voeding, Drank en Tabak"
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +20,PL or BS,PL of BS
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,Can only make payment against unbilled {0},Kan alleen tegen betaling te maken ongefactureerde {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +531,Can only make payment against unbilled {0},Kan alleen tegen betaling te maken ongefactureerde {0}
 apps/erpnext/erpnext/controllers/selling_controller.py +122,Commission rate cannot be greater than 100,Commissietarief kan niet groter zijn dan 100
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Minimum Inventory Level,Minimum voorraadniveau
 DocType: Stock Entry,Subcontract,Subcontract
@@ -2341,19 +2262,18 @@
 DocType: Item,Manufacturer Part Number,Onderdeelnummer fabrikant
 DocType: Production Order Operation,Estimated Time and Cost,Geschatte Tijd en Kosten
 DocType: Bin,Bin,Bak
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +50,Nosing,Metalen bescherming hiervoor
 DocType: SMS Log,No of Sent SMS,Aantal gestuurde SMS
 DocType: Account,Company,Bedrijf
 DocType: Account,Expense Account,Kostenrekening
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +49,Software,software
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +151,Colour,Colour
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +49,Software,software
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Colour,Colour
 DocType: Maintenance Visit,Scheduled,Geplande
 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","Selecteer Item, waar &quot;Is Stock Item&quot; is &quot;Nee&quot; en &quot;Is Sales Item&quot; is &quot;Ja&quot; en er is geen enkel ander product Bundle"
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,Selecteer Maandelijkse Distribution om ongelijk te verdelen doelen in heel maanden.
 DocType: Purchase Invoice Item,Valuation Rate,Waardering Tarief
 apps/erpnext/erpnext/stock/get_item_details.py +281,Price List Currency not selected,Prijslijst Valuta nog niet geselecteerd
 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,Item Rij {0}: Kwitantie {1} bestaat niet in bovenstaande tabel 'Aankoopfacturen'
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +134,Employee {0} has already applied for {1} between {2} and {3},Werknemer {0} heeft reeds gesolliciteerd voor {1} tussen {2} en {3}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +145,Employee {0} has already applied for {1} between {2} and {3},Werknemer {0} heeft reeds gesolliciteerd voor {1} tussen {2} en {3}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Project Start Datum
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +8,Until,Totdat
 DocType: Rename Tool,Rename Log,Hernoemen Log
@@ -2363,7 +2283,7 @@
 apps/erpnext/erpnext/controllers/recurring_document.py +162,Please select {0},Selecteer {0}
 DocType: C-Form,C-Form No,C-vorm nr.
 DocType: BOM,Exploded_items,Uitgeklapte Artikelen
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +95,Researcher,onderzoeker
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Researcher,onderzoeker
 apps/frappe/frappe/custom/doctype/customize_form/customize_form.js +88,Update,Bijwerken
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +78,Please save the Newsletter before sending,Sla de nieuwsbrief op voor het verzenden
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +23,Name or Email is mandatory,Naam of E-mail is verplicht
@@ -2372,11 +2292,10 @@
 DocType: Employee,Exit,Uitgang
 apps/erpnext/erpnext/accounts/doctype/account/account.py +134,Root Type is mandatory,Root Type is verplicht
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +295,Serial No {0} created,Serienummer {0} aangemaakt
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +125,Vibratory finishing,Vibratory afwerking
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","Voor het gemak van de klanten, kunnen deze codes worden gebruikt in gedrukte formaten zoals facturen en de leveringsbonnen"
 DocType: Employee,You can enter any date manually,U kunt elke datum handmatig ingeven
 DocType: Sales Invoice,Advertisement,Advertentie
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +165,Probationary Period,Proeftijd
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Probationary Period,Proeftijd
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Alleen leaf nodes zijn toegestaan ​​in transactie
 DocType: Expense Claim,Expense Approver,Onkosten Goedkeurder
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,Ontvangstbevestiging Artikel geleverd
@@ -2384,19 +2303,16 @@
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +17,To Datetime,Om Datetime
 DocType: SMS Settings,SMS Gateway URL,SMS Gateway URL
 apps/erpnext/erpnext/config/crm.py +53,Logs for maintaining sms delivery status,Logs voor het behoud van sms afleverstatus
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +137,Grinding,Slijpen
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +34,Shrink wrapping,Krimpfolie
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +36,Pending Activities,Afwachting Activiteiten
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,Confirmed,Bevestigd
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier > Supplier Type,Leverancier > Leverancier Type
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +127,Please enter relieving date.,Vul het verlichten datum .
 apps/erpnext/erpnext/controllers/trends.py +137,Amt,Amt
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' can be submitted,Alleen Verlofaanvragen met de status 'Goedgekeurd' kunnen worden ingediend
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +51,Only Leave Applications with status 'Approved' can be submitted,Alleen Verlofaanvragen met de status 'Goedgekeurd' kunnen worden ingediend
 apps/erpnext/erpnext/utilities/doctype/address/address.py +21,Address Title is mandatory.,Adres titel is verplicht.
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,Voer de naam van de campagne in als bron van onderzoek Campagne is
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +38,Newspaper Publishers,Kranten Uitgeverijen
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +38,Newspaper Publishers,Kranten Uitgeverijen
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,Selecteer het fiscale jaar
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +88,Smelting,Smelting
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Bestelniveau
 DocType: Attendance,Attendance Date,Aanwezigheid Datum
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,Salaris verbreken op basis Verdienen en Aftrek.
@@ -2411,16 +2327,15 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +414,[Error],[Fout]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,In Woorden zijn zichtbaar zodra u de Verkooporder opslaat.
 ,Employee Birthday,Werknemer Verjaardag
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +55,Venture Capital,Venture Capital
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,Venture Capital
 DocType: UOM,Must be Whole Number,Moet heel getal zijn
 DocType: Leave Control Panel,New Leaves Allocated (In Days),Nieuwe Verloven Toegewezen (in dagen)
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +51,Serial No {0} does not exist,Serienummer {0} bestaat niet
 DocType: Pricing Rule,Discount Percentage,Kortingspercentage
 DocType: Payment Reconciliation Invoice,Invoice Number,Factuurnummer
-apps/erpnext/erpnext/hooks.py +70,Orders,Bestellingen
+apps/erpnext/erpnext/hooks.py +54,Orders,Bestellingen
 DocType: Leave Control Panel,Employee Type,Type werknemer
 DocType: Employee Leave Approver,Leave Approver,Verlof goedkeurder
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +70,Swaging,Uitstampen
 DocType: Manufacturing Settings,Material Transferred for Manufacture,Overgedragen materiaal voor vervaardiging
 DocType: Expense Claim,"A user with ""Expense Approver"" role","Een gebruiker met ""Onkosten Goedkeurder"" rol"
 ,Issued Items Against Production Order,Uitgegeven Artikelen voor productieorder
@@ -2432,7 +2347,6 @@
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +62,Cost Center with existing transactions can not be converted to group,Kostenplaats met bestaande transacties kan niet worden omgezet in groep
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Depreciation,Afschrijvingskosten
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Leverancier(s)
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +29,Invalid period,Ongeldige periode
 DocType: Customer,Credit Limit,Kredietlimiet
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,Selecteer type transactie
 DocType: GL Entry,Voucher No,Voucher nr.
@@ -2442,9 +2356,9 @@
 DocType: Customer,Address and Contact,Adres en contactgegevens
 DocType: Customer,Last Day of the Next Month,Laatste dag van de volgende maand
 DocType: Employee,Feedback,Terugkoppeling
+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}","Verlof kan niet eerder worden toegewezen {0}, als verlof balans al-carry doorgestuurd in de toekomst toewijzing verlof record is {1}"
 apps/erpnext/erpnext/accounts/party.py +284,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Opmerking: Vanwege / Reference Data overschrijdt toegestaan ​​klantenkrediet dagen door {0} dag (en)
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +621,Maint. Schedule,Maint. Rooster
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +108,Abrasive jet machining,Schurende jet bewerkingscentra
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +632,Maint. Schedule,Maint. Rooster
 DocType: Stock Settings,Freeze Stock Entries,Freeze Stock Entries
 DocType: Website Settings,Website Settings,Website instellingen
 DocType: Item,Reorder level based on Warehouse,Bestelniveau gebaseerd op Warehouse
@@ -2461,7 +2375,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +75,Show Stock Entries,Toon Voorraadboekingen
 ,Is Primary Address,Is Primair Adres
 DocType: Production Order,Work-in-Progress Warehouse,Onderhanden Werk Magazijn
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +308,Reference #{0} dated {1},Referentie #{0} gedateerd {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Reference #{0} dated {1},Referentie #{0} gedateerd {1}
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +13,Manage Addresses,Beheren Adressen
 DocType: Pricing Rule,Item Code,Artikelcode
 DocType: Production Planning Tool,Create Production Orders,Maak Productieorders
@@ -2470,7 +2384,7 @@
 DocType: Lead,Market Segment,Marktsegment
 DocType: Communication,Phone,Telefoon
 DocType: Employee Internal Work History,Employee Internal Work History,Werknemer Interne Werk Geschiedenis
-apps/erpnext/erpnext/public/js/account_tree_grid.js +50,Closing (Dr),Sluiten (Db)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +221,Closing (Dr),Sluiten (Db)
 DocType: Contact,Passive,Passief
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,Serienummer {0} niet op voorraad
 apps/erpnext/erpnext/config/selling.py +127,Tax template for selling transactions.,Belasting sjabloon voor verkooptransacties.
@@ -2486,11 +2400,11 @@
 ,Billed Amount,Gefactureerd Bedrag
 DocType: Bank Reconciliation,Bank Reconciliation,Bank Aflettering
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +9,Get Updates,Krijg Updates
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +129,Material Request {0} is cancelled or stopped,Materiaal Aanvraag {0} is geannuleerd of gestopt
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +641,Add a few sample records,Voeg een paar voorbeeld records toe
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +133,Material Request {0} is cancelled or stopped,Materiaal Aanvraag {0} is geannuleerd of gestopt
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Add a few sample records,Voeg een paar voorbeeld records toe
 apps/erpnext/erpnext/config/hr.py +210,Leave Management,Laat management
 DocType: Event,Groups,Groepen
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,Groeperen per Rekening
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,Groeperen volgens Rekening
 DocType: Sales Order,Fully Delivered,Volledig geleverd
 DocType: Lead,Lower Income,Lager inkomen
 DocType: Period Closing Voucher,"The account head under Liability, in which Profit/Loss will be booked","De hoofdrekening onder Passiva, waarin Winst of Verlies zal worden geboekt"
@@ -2500,38 +2414,34 @@
 DocType: Features Setup,Sales Extras,Verkoop Extra's
 apps/erpnext/erpnext/accounts/utils.py +344,{0} budget for Account {1} against Cost Center {2} will exceed by {3},{0} budget voor Rekening {1} tegen kostenplaats {2} zal worden overschreden met {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +236,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Verschil moet Account een type Asset / Liability rekening zijn, aangezien dit Stock Verzoening is een opening Entry"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +138,Purchase Order number required for Item {0},Inkoopordernummer nodig voor Artikel {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Order number required for Item {0},Inkoopordernummer nodig voor Artikel {0}
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date','Van Datum' moet na 'Tot Datum' zijn
 ,Stock Projected Qty,Verwachte voorraad hoeveelheid
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +147,Customer {0} does not belong to project {1},Klant {0} behoort niet tot project {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +150,Customer {0} does not belong to project {1},Klant {0} behoort niet tot project {1}
 DocType: Sales Order,Customer's Purchase Order,Klant Bestelling
 DocType: Warranty Claim,From Company,Van Bedrijf
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,Waarde of Aantal
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Minute,minuut
+apps/erpnext/erpnext/public/js/setup_wizard.js +363,Minute,minuut
 DocType: Purchase Invoice,Purchase Taxes and Charges,Inkoop Belastingen en Toeslagen
 ,Qty to Receive,Aantal te ontvangen
 DocType: Leave Block List,Leave Block List Allowed,Laat toegestaan ​​Block List
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +61,Conversion factor cannot be in fractions,Conversiefactor kan niet in fracties
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +358,You will use it to Login,U zult het gebruiken om in te loggen
+apps/erpnext/erpnext/public/js/setup_wizard.js +108,You will use it to Login,U zult het gebruiken om in te loggen
 DocType: Sales Partner,Retailer,Retailer
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +99,Credit To account must be a Balance Sheet account,Credit Om rekening moet een balansrekening zijn
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,Alle Leverancier Types
 apps/erpnext/erpnext/stock/doctype/item/item.py +37,Item Code is mandatory because Item is not automatically numbered,Artikelcode is verplicht omdat Artikel niet automatisch is genummerd
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +99,Quotation {0} not of type {1},Offerte {0} niet van het type {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +93,Quotation {0} not of type {1},Offerte {0} niet van het type {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,Onderhoudsschema Item
 DocType: Sales Order,%  Delivered,% Geleverd
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,Bank Overdraft Account,Bank Kredietrekening
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +15,Make Salary Slip,Maak Salarisstrook
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +18,Browse BOM,Bladeren BOM
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +175,Secured Loans,Leningen met onderpand
-apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +3,Awesome Products,Awesome producten
+apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +3,Awesome Products,Awesome producten
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +189,Opening Balance Equity,Opening Balance Equity
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +80,Cannot approve leave as you are not authorized to approve leaves on Block Dates,Kan verlof niet goedkeuren omdat u niet bevoegd bent om verloven op Geblokkeerde Datums Data goed te keuren
 DocType: Appraisal,Appraisal,Beoordeling
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +13,Lost-foam casting,Lost-schuim casting
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +47,Drawing,Tekening
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +22,Date is repeated,Datum wordt herhaald
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +148,Leave approver must be one of {0},Verlof goedkeurder moet een zijn van {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +162,Leave approver must be one of {0},Verlof goedkeurder moet een zijn van {0}
 DocType: Hub Settings,Seller Email,Verkoper Email
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Totale aanschafkosten (via Purchase Invoice)
 DocType: Workstation Working Hour,Start Time,Starttijd
@@ -2545,7 +2455,7 @@
 DocType: Purchase Invoice Item,Net Amount (Company Currency),Nettobedrag (Company valuta)
 DocType: BOM Operation,Hour Rate,Uurtarief
 DocType: Stock Settings,Item Naming By,Artikel benoeming door
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +642,From Quotation,Van Offerte
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +655,From Quotation,Van Offerte
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},Een ander Periode sluitpost {0} is gemaakt na {1}
 DocType: Production Order,Material Transferred for Manufacturing,Materiaal Overgedragen voor Manufacturing
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +29,Account {0} does not exists,Rekening {0} bestaat niet
@@ -2559,21 +2469,19 @@
 DocType: Purchase Invoice Item,PR Detail,PR Detail
 DocType: Sales Order,Fully Billed,Volledig gefactureerd
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +20,Cash In Hand,Kasvoorraad
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +72,Delivery warehouse required for stock item {0},Levering magazijn vereist voor voorraad artikel {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +119,Delivery warehouse required for stock item {0},Levering magazijn vereist voor voorraad artikel {0}
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),Het bruto gewicht van het pakket. Meestal nettogewicht + verpakkingsmateriaal gewicht. (Voor afdrukken)
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts 
 DocType: Serial No,Is Cancelled,Is Geannuleerd
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +281,My Shipments,Mijn verzendingen
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +286,My Shipments,Mijn verzendingen
 DocType: Journal Entry,Bill Date,Factuurdatum
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +43,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","Als er meerdere Prijsbepalings Regels zijn met de hoogste prioriteit, dan wordt de volgende interene prioriteit gehanteerd:"
 DocType: Supplier,Supplier Details,Leverancier Details
 DocType: Communication,Recipients,Ontvangers
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +146,Screwing,Schroeven
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +96,Knurling,Opruwen
 DocType: Expense Claim,Approval Status,Goedkeuringsstatus
 DocType: Hub Settings,Publish Items to Hub,Publiceer Artikelen toevoegen aan Hub
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +44,From value must be less than to value in row {0},Van waarde moet minder zijn dan waarde in rij {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +133,Wire Transfer,overboeking
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +133,Wire Transfer,overboeking
 apps/erpnext/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py +25,Please select Bank Account,Selecteer Bankrekening
 DocType: Newsletter,Create and Send Newsletters,Maken en verzenden Nieuwsbrieven
 apps/frappe/frappe/public/js/frappe/views/reports/grid_report.js +305,From Date must be before To Date,Van Datum moet voor Tot Datum
@@ -2581,14 +2489,14 @@
 DocType: Company,Default Income Account,Standaard Inkomstenrekening
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,Klantengroep / Klant
 DocType: Item Group,Check this if you want to show in website,Selecteer dit als u wilt weergeven in de website
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +190,Welcome to ERPNext,Welkom bij ERPNext
+,Welcome to ERPNext,Welkom bij ERPNext
 DocType: Payment Reconciliation Payment,Voucher Detail Number,Voucher Detail Nummer
 apps/erpnext/erpnext/config/crm.py +146,Lead to Quotation,Leiden tot Offerte
 DocType: Lead,From Customer,Van Klant
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +37,Calls,Oproepen
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Calls,Oproepen
 DocType: Project,Total Costing Amount (via Time Logs),Totaal Costing bedrag (via Time Logs)
 DocType: Purchase Order Item Supplied,Stock UOM,Voorraad Eenheid
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Purchase Order {0} is not submitted,Inkooporder {0} is niet ingediend
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +194,Purchase Order {0} is not submitted,Inkooporder {0} is niet ingediend
 ,Projected,verwachte
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},Serienummer {0} behoort niet tot Magazijn {1}
 apps/erpnext/erpnext/controllers/status_updater.py +136,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Opmerking : Het systeem controleert niet over- levering en overboeking voor post {0} als hoeveelheid of bedrag 0
@@ -2596,7 +2504,6 @@
 DocType: Issue,Opening Date,Openingsdatum
 DocType: Journal Entry,Remark,Opmerking
 DocType: Purchase Receipt Item,Rate and Amount,Tarief en Bedrag
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +95,Boring,Vervelend
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +667,From Sales Order,Van Verkooporder
 DocType: Blog Category,Parent Website Route,Bovenliggende Website Route
 DocType: Sales Order,Not Billed,Niet in rekening gebracht
@@ -2610,19 +2517,17 @@
 apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount Amount,Korting Bedrag
 DocType: Purchase Invoice,Return Against Purchase Invoice,Terug Tegen Purchase Invoice
 DocType: Item,Warranty Period (in days),Garantieperiode (in dagen)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +550,e.g. VAT,bijv. BTW
+apps/erpnext/erpnext/public/js/setup_wizard.js +292,e.g. VAT,bijv. BTW
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,Punt 4
 DocType: Journal Entry Account,Journal Entry Account,Journal Entry Account
 DocType: Shopping Cart Settings,Quotation Series,Offerte Series
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +52,"An item exists with same name ({0}), please change the item group name or rename the item","Een item bestaat met dezelfde naam ( {0} ) , wijzigt u de naam van het item groep of hernoem het item"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +82,Hot metal gas forming,Hot metal gas vormen
 DocType: Sales Order Item,Sales Order Date,Verkooporder Datum
 DocType: Sales Invoice Item,Delivered Qty,Geleverd Aantal
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +63,Warehouse {0}: Company is mandatory,Magazijn {0}: Bedrijf is verplicht
 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.",Ga naar de juiste groep (meestal Bron van fondsen&gt; Kortlopende verplichtingen&gt; Belastingen en Taken en maak een nieuwe account (door op van het type &quot;Tax&quot; klikken toevoegen Kind) en doe noemen het belastingtarief.
 ,Payment Period Based On Invoice Date,Betaling Periode gebaseerd op factuurdatum
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +50,Missing Currency Exchange Rates for {0},Ontbrekende Wisselkoersen voor {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +135,Laser cutting,Lasersnijden
 DocType: Event,Monday,Maandag
 DocType: Journal Entry,Stock Entry,Voorraadtransactie
 DocType: Account,Payable,betaalbaar
@@ -2655,7 +2560,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +111,Date Of Retirement must be greater than Date of Joining,Pensioneringsdatum moet groter zijn dan Datum van Indiensttreding
 DocType: Sales Invoice,Against Income Account,Tegen Inkomstenrekening
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +69,{0}% Delivered,{0}% Geleverd
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +78,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Item {0}: Bestelde aantal {1} ​​kan niet kleiner dan de minimale afname {2} (gedefinieerd in punt) zijn.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Item {0}: Bestelde aantal {1} ​​kan niet kleiner dan de minimale afname {2} (gedefinieerd in punt) zijn.
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Maandelijkse Verdeling Percentage
 DocType: Territory,Territory Targets,Regio Doelen
 DocType: Delivery Note,Transporter Info,Vervoerder Info
@@ -2664,7 +2569,6 @@
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,Titels voor print sjablonen bijv. Proforma Factuur.
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +140,Valuation type charges can not marked as Inclusive,Soort waardering kosten kunnen niet zo Inclusive gemarkeerd
 DocType: POS Profile,Update Stock,Bijwerken Voorraad
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +128,Superfinishing,Superfinishing
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,Verschillende eenheden voor artikelen zal leiden tot een onjuiste (Totaal) Netto gewicht. Zorg ervoor dat Netto gewicht van elk artikel in dezelfde eenheid is.
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,Stuklijst tarief
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +85,Please pull items from Delivery Note,Haal aub artikelen uit de Vrachtbrief
@@ -2679,7 +2583,6 @@
 ,Purchase Analytics,Inkoop Analyse
 DocType: Sales Invoice Item,Delivery Note Item,Vrachtbrief Artikel
 DocType: Expense Claim,Task,Taak
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +57,Shaving,Het scheren
 DocType: Purchase Taxes and Charges,Reference Row #,Referentie Rij #
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},Partij nummer is verplicht voor artikel {0}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js +14,This is a root sales person and cannot be edited.,Dit is een basis verkoper en kan niet worden bewerkt .
@@ -2691,13 +2594,11 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +74,Purpose must be one of {0},Doel moet één zijn van {0}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +108,Fill the form and save it,Vul het formulier in en sla het op
 DocType: Production Planning Tool,Download a report containing all raw materials with their latest inventory status,Download een rapport met alle grondstoffen met hun laatste voorraadstatus
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +94,Facing,Facing
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,Community Forum
 DocType: Leave Application,Leave Balance Before Application,Verlofsaldo voor aanvraag
 DocType: SMS Center,Send SMS,SMS versturen
 DocType: Company,Default Letter Head,Standaard Briefhoofd
 DocType: Time Log,Billable,Factureerbaar
-DocType: Authorization Rule,This will be used for setting rule in HR module,Deze wordt gebruikt voor instelling regel HR module
 DocType: Account,Rate at which this tax is applied,Percentage waarmee deze belasting toegepast wordt
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reorder Qty,Bestelaantal
 DocType: Company,Stock Adjustment Account,Voorraad Aanpassing Rekening
@@ -2724,16 +2625,15 @@
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,Percentage toewijzing moet gelijk zijn aan 100%
 DocType: Serial No,Out of AMC,Uit AMC
 DocType: Purchase Order Item,Material Request Detail No,Materiaal Aanvraag Detail nr.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +97,Hard turning,Harddraaien
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +33,Make Maintenance Visit,Maak Maintenance Visit
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +187,Please contact to the user who have Sales Master Manager {0} role,Neem dan contact op met de gebruiker die hebben Sales Master Manager {0} rol
 DocType: Company,Default Cash Account,Standaard Kasrekening
 apps/erpnext/erpnext/config/accounts.py +79,Company (not Customer or Supplier) master.,Bedrijf ( geen klant of leverancier ) meester.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +106,Please enter 'Expected Delivery Date',Vul 'Verwachte leverdatum' in
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +187,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Vrachtbrief {0} moet worden geannuleerd voordat het annuleren van deze Verkooporder
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +100,Please enter 'Expected Delivery Date',Vul 'Verwachte leverdatum' in
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +182,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Vrachtbrief {0} moet worden geannuleerd voordat het annuleren van deze Verkooporder
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +373,Paid amount + Write Off Amount can not be greater than Grand Total,Betaald bedrag + Afgeschreven bedrag kan niet groter zijn dan Eindtotaal
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} is geen geldig batchnummer voor Artikel {1}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,Note: There is not enough leave balance for Leave Type {0},Opmerking: Er is niet genoeg verlofsaldo voor Verlof type {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +124,Note: There is not enough leave balance for Leave Type {0},Opmerking: Er is niet genoeg verlofsaldo voor Verlof type {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.","Opmerking: Als de betaling niet is gedaan tegen elke verwijzing, handmatig maken Journal Entry."
 DocType: Item,Supplier Items,Leverancier Artikelen
 DocType: Opportunity,Opportunity Type,Opportunity Type
@@ -2745,7 +2645,7 @@
 DocType: Hub Settings,Publish Availability,Publiceer Beschikbaarheid
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +105,Date of Birth cannot be greater than today.,Geboortedatum kan niet groter zijn dan vandaag.
 ,Stock Ageing,Voorraad Veroudering
-apps/erpnext/erpnext/controllers/accounts_controller.py +200,{0} '{1}' is disabled,{0} '{1}'is uitgeschakeld
+apps/erpnext/erpnext/controllers/accounts_controller.py +201,{0} '{1}' is disabled,{0} '{1}'is uitgeschakeld
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Instellen als Open
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Stuur automatische e-mails naar Contactpersonen op Indienen transacties.
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +232,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
@@ -2755,44 +2655,38 @@
 DocType: Purchase Order,Customer Contact Email,Customer Contact E-mail
 DocType: Event,Sunday,Zondag
 DocType: Sales Team,Contribution (%),Bijdrage (%)
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +455,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,"Opmerking: De betaling wordt niet aangemaakt, aangezien de 'Kas- of Bankrekening' niet gespecificeerd is."
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +171,Responsibilities,Verantwoordelijkheden
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +457,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,"Opmerking: De betaling wordt niet aangemaakt, aangezien de 'Kas- of Bankrekening' niet gespecificeerd is."
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +171,Responsibilities,Verantwoordelijkheden
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Template,Sjabloon
 DocType: Sales Person,Sales Person Name,Verkoper Naam
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,Vul tenminste 1 factuur in in de tabel
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +511,Add Users,Gebruikers toevoegen
+apps/erpnext/erpnext/public/js/setup_wizard.js +255,Add Users,Gebruikers toevoegen
 DocType: Pricing Rule,Item Group,Artikelgroep
 DocType: Task,Actual Start Date (via Time Logs),Werkelijke Startdatum (via Time Logs)
 DocType: Stock Reconciliation Item,Before reconciliation,Voordat verzoening
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +12,To {0},Naar {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Belastingen en Toeslagen toegevoegd (Bedrijfsvaluta)
-apps/erpnext/erpnext/stock/doctype/item/item.py +340,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Item Tax Rij {0} moet rekening houden met het type belasting of inkomsten of uitgaven of Chargeable
+apps/erpnext/erpnext/stock/doctype/item/item.py +344,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Item Tax Rij {0} moet rekening houden met het type belasting of inkomsten of uitgaven of Chargeable
 DocType: Sales Order,Partly Billed,Deels Gefactureerd
 DocType: Item,Default BOM,Standaard Stuklijst
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +79,Decambering,Decambering
 apps/erpnext/erpnext/setup/doctype/company/company.js +22,Please re-type company name to confirm,Gelieve re-type bedrijfsnaam te bevestigen
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,Totale uitstaande Amt
 DocType: Time Log Batch,Total Hours,Totaal Uren
 DocType: Journal Entry,Printing Settings,Instellingen afdrukken
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +268,Total Debit must be equal to Total Credit. The difference is {0},Totaal Debet moet gelijk zijn aan Totaal Credit. Het verschil is {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +11,Automotive,Automotive
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +37,Item is required,Artikel is vereist
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +25,Metal injection molding,Metal spuitgieten
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +258,Total Debit must be equal to Total Credit. The difference is {0},Totaal Debet moet gelijk zijn aan Totaal Credit. Het verschil is {0}
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,Automotive
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +684,From Delivery Note,Van Vrachtbrief
 DocType: Time Log,From Time,Van Tijd
 DocType: Notification Control,Custom Message,Aangepast bericht
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +33,Investment Banking,Investment Banking
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +261,"Select your Country, Time Zone and Currency","Selecteer uw land, tijdzone en valuta"
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,Investment Banking
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +316,"Select your Country, Time Zone and Currency","Selecteer uw land, tijdzone en valuta"
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +369,Cash or Bank Account is mandatory for making payment entry,Kas- of Bankrekening is verplicht om een  betaling aan te maken
 DocType: Purchase Invoice,Price List Exchange Rate,Prijslijst Wisselkoers
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +91,Pickling,Beitsen
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +18,Sand casting,Sand casting
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +117,Electroplating,Electroplating
 DocType: Purchase Invoice Item,Rate,Tarief
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +62,Intern,intern
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Intern,intern
 DocType: Newsletter,A Lead with this email id should exist,Een Lead met dit e-mail ID moet bestaan
 DocType: Stock Entry,From BOM,Van BOM
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +34,Basic,Basis
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +34,Basic,Basis
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,Voorraadtransacties voor {0} zijn bevroren
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +217,Please click on 'Generate Schedule',Klik op 'Genereer Planning'
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +61,To Date should be same as From Date for Half Day leave,Tot Datum moet dezelfde zijn als Van Datum voor een halve dag verlof
@@ -2800,10 +2694,10 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +96,Reference No is mandatory if you entered Reference Date,Referentienummer is verplicht als u een referentiedatum hebt ingevoerd
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +108,Date of Joining must be greater than Date of Birth,Datum van Indiensttreding moet groter zijn dan Geboortedatum
 DocType: Salary Structure,Salary Structure,Salarisstructuur
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +242,"Multiple Price Rule exists with same criteria, please resolve \
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +246,"Multiple Price Rule exists with same criteria, please resolve \
 			conflict by assigning priority. Price Rules: {0}","Er bestaan meerdere prijsbepalingsregels met dezelfde criteria, los aub op \ conflict bij het toewijzen van prioriteit. Prijsbepaling Regels: {0}"
 DocType: Account,Bank,Bank
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +9,Airline,vliegmaatschappij
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,vliegmaatschappij
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +493,Issue Material,Kwestie Materiaal
 DocType: Material Request Item,For Warehouse,Voor Magazijn
 DocType: Employee,Offer Date,Aanbieding datum
@@ -2813,29 +2707,24 @@
 DocType: Item,Is Fixed Asset Item,Is Vast Activum
 DocType: Stock Entry,Including items for sub assemblies,Inclusief items voor sub assemblies
 DocType: Features Setup,"If you have long print formats, this feature can be used to split the page to be printed on multiple pages with all headers and footers on each page","Als je al lang af te drukken formaten, kan deze functie gebruikt worden om splitsing van de pagina die moet worden afgedrukt op meerdere pagina&#39;s met alle kop-en voetteksten op elke pagina"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +131,Hobbing,Hobbing
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +98,All Territories,Alle gebieden
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +98,All Territories,Alle gebieden
 DocType: Purchase Invoice,Items,Artikelen
 DocType: Fiscal Year,Year Name,Jaar Naam
 DocType: Process Payroll,Process Payroll,Verwerk Salarisadministratie
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +59,There are more holidays than working days this month.,Er zijn meer vakanties dan werkdagen deze maand .
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +68,There are more holidays than working days this month.,Er zijn meer vakanties dan werkdagen deze maand .
 DocType: Product Bundle Item,Product Bundle Item,Product Bundle Item
 DocType: Sales Partner,Sales Partner Name,Verkoop Partner Naam
 DocType: Purchase Invoice Item,Image View,Afbeelding Bekijken
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +113,Finishing & industrial finishing,Afwerking &amp; industriële afwerking
 DocType: Issue,Opening Time,Opening Tijd
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,Van en naar data vereist
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +46,Securities & Commodity Exchanges,Securities & Commodity Exchanges
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Securities & Commodity Exchanges
 DocType: Shipping Rule,Calculate Based On,Berekenen gebaseerd op
 DocType: Delivery Note Item,From Warehouse,Van Warehouse
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +98,Drilling,Boren
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +28,Blow molding,Blow moulding
 DocType: Purchase Taxes and Charges,Valuation and Total,Waardering en Totaal
 DocType: Tax Rule,Shipping City,Verzending Stad
 apps/erpnext/erpnext/stock/doctype/item/item.js +43,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,"Dit artikel is een variant van {0} (Template). Attributen zullen worden gekopieerd uit de sjabloon, tenzij 'No Copy' is ingesteld"
 DocType: Account,Purchase User,Aankoop Gebruiker
 DocType: Notification Control,Customize the Notification,Aanpassen Kennisgeving
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +87,Hammering,Gehamer
 DocType: Web Page,Slideshow,Diashow
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +24,Default Address Template cannot be deleted,Standaard Adres Sjabloon kan niet worden verwijderd
 DocType: Sales Invoice,Shipping Rule,Verzendregel
@@ -2844,9 +2733,8 @@
 DocType: Workflow State,Search,Zoek
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +54,Total cannot be zero,Totaal kan niet nul zijn
 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,'Dagen sinds laatste opdracht' moet groter of gelijk zijn aan nul
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +142,Brazing,Solderen
 DocType: C-Form,Amended From,Gewijzigd Van
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Raw Material,grondstof
+apps/erpnext/erpnext/public/js/setup_wizard.js +359,Raw Material,grondstof
 DocType: Leave Application,Follow via Email,Volg via e-mail
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Belasting bedrag na korting
 apps/erpnext/erpnext/accounts/doctype/account/account.py +174,Child account exists for this account. You can not delete this account.,Onderliggende rekening bestaat voor deze rekening. U kunt deze niet verwijderen .
@@ -2860,45 +2748,44 @@
 ,Produced,Geproduceerd
 DocType: Item,Item Code for Suppliers,Item Code voor leveranciers
 DocType: Issue,Raised By (Email),Opgevoerd door (E-mail)
-apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +72,General,Algemeen
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +495,Attach Letterhead,Bevestig briefhoofd
+apps/erpnext/erpnext/setup/setup_wizard/default_website.py +72,General,Algemeen
+apps/erpnext/erpnext/public/js/setup_wizard.js +241,Attach Letterhead,Bevestig briefhoofd
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +272,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',Kan niet aftrekken als categorie is voor ' Valuation ' of ' Valuation en Total '
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +542,"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.","Lijst uw fiscale koppen (bv BTW, douane etc, ze moeten unieke namen hebben) en hun standaard tarieven. Dit zal een standaard template, die u kunt bewerken en voeg later meer te creëren."
+apps/erpnext/erpnext/public/js/setup_wizard.js +284,"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.","Lijst uw fiscale koppen (bv BTW, douane etc, ze moeten unieke namen hebben) en hun standaard tarieven. Dit zal een standaard template, die u kunt bewerken en voeg later meer te creëren."
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial Nos Required for Serialized Item {0},Volgnummers zijn vereist voor Seriegebonden Artikel {0}
 DocType: Journal Entry,Bank Entry,Bank Invoer
 DocType: Authorization Rule,Applicable To (Designation),Van toepassing zijn op (Benaming)
 DocType: Blog Post,Blog Post,Blog Post
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,Group By
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,Groeperen volgens
 apps/erpnext/erpnext/config/accounts.py +143,Enable / disable currencies.,In- / uitschakelen valuta .
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Postal Expenses,Portokosten
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Totaal (Amt)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +26,Entertainment & Leisure,Entertainment & Vrije Tijd
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,Entertainment & Vrije Tijd
 DocType: Purchase Order,The date on which recurring order will be stop,De datum waarop terugkerende bestelling wordt te stoppen
 DocType: Quality Inspection,Item Serial No,Artikel Serienummer
 apps/erpnext/erpnext/controllers/status_updater.py +142,{0} must be reduced by {1} or you should increase overflow tolerance,{0} moet worden verminderd met {1} of u moet de overboeking tolerantie verhogen
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Present,Totaal Present
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Hour,uur
+apps/erpnext/erpnext/public/js/setup_wizard.js +363,Hour,uur
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +138,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation","Geserialiseerde Item {0} kan niet worden bijgewerkt \
  behulp Stock Verzoening"
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +488,Transfer Material to Supplier,Transfer Material aan Leverancier
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +513,Transfer Material to Supplier,Transfer Material aan Leverancier
 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,Nieuw Serienummer kan geen Magazijn krijgen. Magazijn moet via Voorraad Invoer of Ontvangst worden ingesteld.
 DocType: Lead,Lead Type,Lead Type
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +82,Create Quotation,Maak Offerte
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +306,All these items have already been invoiced,Al deze items zijn reeds gefactureerde
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,You are not authorized to approve leaves on Block Dates,U bent niet bevoegd om te bladeren op Block Data keuren
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +311,All these items have already been invoiced,Al deze items zijn reeds gefactureerde
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},Kan door {0} worden goedgekeurd
 DocType: Shipping Rule,Shipping Rule Conditions,Verzendregel Voorwaarden
 DocType: BOM Replace Tool,The new BOM after replacement,De nieuwe Stuklijst na vervanging
 DocType: Features Setup,Point of Sale,Point of Sale
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +83,Curling,Curling
 DocType: Account,Tax,Belasting
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +28,Row {0}: {1} is not a valid {2},Rij {0}: {1} is geen geldige {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +89,Refining,Refining
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +37,Row {0}: {1} is not a valid {2},Rij {0}: {1} is geen geldige {2}
 DocType: Production Planning Tool,Production Planning Tool,Productie Planning Tool
 DocType: Quality Inspection,Report Date,Rapport datum
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +130,Routing,Routing
 DocType: C-Form,Invoices,Facturen
 DocType: Job Opening,Job Title,Functiebenaming
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +54,{0} already allocated for Employee {1} for period {2} - {3},{0} reeds toegewezen voor Employee {1} voor periode {2} - {3}
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +80,{0} Recipients,{0} Ontvangers
 DocType: Features Setup,Item Groups in Details,Artikelgroepen in Details
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +335,Quantity to Manufacture must be greater than 0.,Hoeveelheid voor fabricage moet groter dan 0 zijn.
@@ -2916,14 +2803,13 @@
 DocType: DocType,Setup,Instellingen
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,Er is niets om te bewerken .
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +108,Summary for this month and pending activities,Samenvatting voor deze maand en in afwachting van activiteiten
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +39,Cold rolling,Koudwalsen
 DocType: Customer Group,Customer Group Name,Klant Groepsnaam
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +408,Please remove this Invoice {0} from C-Form {1},Verwijder dit Invoice {0} van C-Form {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +410,Please remove this Invoice {0} from C-Form {1},Verwijder dit Invoice {0} van C-Form {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,Selecteer Carry Forward als u ook wilt opnemen vorige boekjaar uit balans laat dit fiscale jaar
 DocType: GL Entry,Against Voucher Type,Tegen Voucher Type
 DocType: Item,Attributes,Attributen
 DocType: Packing Slip,Get Items,Get Items
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +186,Please enter Write Off Account,Voer Afschrijvingenrekening in
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +187,Please enter Write Off Account,Voer Afschrijvingenrekening in
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +71,Last Order Date,Laatste Bestel Date
 DocType: DocField,Image,Afbeelding
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +179,Make Excise Invoice,Maak Accijnzen Factuur
@@ -2933,7 +2819,7 @@
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +146,Operation ID not set,Operation ID niet ingesteld
 DocType: Production Order,Planned Start Date,Geplande Startdatum
 DocType: Serial No,Creation Document Type,Aanmaken Document type
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +620,Maint. Visit,Maint. Bezoek
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +631,Maint. Visit,Maint. Bezoek
 DocType: Leave Type,Is Encash,Is incasseren
 DocType: Purchase Invoice,Mobile No,Mobiel nummer
 DocType: Payment Tool,Make Journal Entry,Maak Journal Entry
@@ -2941,35 +2827,31 @@
 apps/erpnext/erpnext/controllers/trends.py +257,Project-wise data is not available for Quotation,Projectgegevens zijn niet beschikbaar voor Offertes
 DocType: Project,Expected End Date,Verwachte einddatum
 DocType: Appraisal Template,Appraisal Template Title,Beoordeling Template titel
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +440,Commercial,commercieel
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +378,Commercial,commercieel
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +23,Parent Item {0} must not be a Stock Item,Ouder Item {0} moet een Stock Item niet
 DocType: Cost Center,Distribution Id,Distributie Id
-apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +14,Awesome Services,Awesome Services
+apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +14,Awesome Services,Awesome Services
 apps/erpnext/erpnext/config/manufacturing.py +29,All Products or Services.,Alle producten of diensten.
 DocType: Purchase Invoice,Supplier Address,Adres Leverancier
 DocType: Contact Us Settings,Address Line 2,Adres Lijn 2
 DocType: ToDo,Reference,Referentie
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +59,Perforating,Perforeren
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,out Aantal
 apps/erpnext/erpnext/config/accounts.py +128,Rules to calculate shipping amount for a sale,Regels om verzendkosten te berekenen voor een verkooptransactie
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +29,Series is mandatory,Reeks is verplicht
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +28,Financial Services,Financiële Dienstverlening
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,Financiële Dienstverlening
 apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3},Waar voor Attribute {0} moet binnen het bereik van {1} tot {2} in de stappen van {3}
 DocType: Tax Rule,Sales,Verkoop
 DocType: Stock Entry Detail,Basic Amount,Basisbedrag
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +173,Warehouse required for stock Item {0},Magazijn nodig voor voorraad Artikel {0}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +178,Warehouse required for stock Item {0},Magazijn nodig voor voorraad Artikel {0}
 DocType: Leave Allocation,Unused leaves,Ongebruikte bladeren
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,Cr
 DocType: Customer,Default Receivable Accounts,Default Debiteuren
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +102,Sawing,Zagen
 DocType: Tax Rule,Billing State,Billing State
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +32,Laminating,Lamineren
 DocType: Item Reorder,Transfer,Verplaatsen
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +549,Fetch exploded BOM (including sub-assemblies),Haal uitgeklapte Stuklijst op (inclusief onderdelen)
 DocType: Authorization Rule,Applicable To (Employee),Van toepassing zijn op (Werknemer)
 apps/erpnext/erpnext/controllers/accounts_controller.py +101,Due Date is mandatory,Due Date is verplicht
 apps/erpnext/erpnext/controllers/item_variant.py +51,Increment for Attribute {0} cannot be 0,Toename voor Attribute {0} kan niet worden 0
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +143,Sintering,Sinteren
 DocType: Journal Entry,Pay To / Recd From,Betaal aan / Ontv van
 DocType: Naming Series,Setup Series,Instellen Reeksen
 DocType: Supplier,Contact HTML,Contact HTML
@@ -2982,7 +2864,6 @@
 DocType: Attendance,Absent,Afwezig
 DocType: Product Bundle,Product Bundle,Product Bundle
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +180,Row {0}: Invalid reference {1},Rij {0}: Invalid referentie {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +165,Crushing,Breken
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Aankoop en -heffingen Template
 DocType: Upload Attendance,Download Template,Download Template
 DocType: GL Entry,Remarks,Opmerkingen
@@ -2990,14 +2871,12 @@
 DocType: Journal Entry,Write Off Based On,Afschrijving gebaseerd op
 DocType: Features Setup,POS View,POS View
 apps/erpnext/erpnext/config/stock.py +38,Installation record for a Serial No.,Installatie record voor een Serienummer
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +9,Continuous casting,Continugieten
 apps/erpnext/erpnext/public/js/queries.js +39,Please specify a,Specificeer een
 DocType: Offer Letter,Awaiting Response,Wachten op antwoord
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +53,Above,Boven
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +80,Cold sizing,Cold sizing
 DocType: Salary Slip,Earning & Deduction,Verdienen &amp; Aftrek
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +76,Account {0} cannot be a Group,Rekening {0} kan geen groep zijn
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +259,Region,Regio
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +314,Region,Regio
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +213,Optional. This setting will be used to filter in various transactions.,Optioneel. Deze instelling wordt gebruikt om te filteren op diverse transacties .
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +104,Negative Valuation Rate is not allowed,Negatieve Waarderingstarief is niet toegestaan
 DocType: Holiday List,Weekly Off,Wekelijks Vrij
@@ -3015,7 +2894,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,Account {0} is inactive,Rekening {0} is niet actief
 DocType: GL Entry,Is Advance,Is voorschot
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,Aanwezigheid Van Datum en Aanwezigheid Tot Datum zijn verplicht.
-apps/erpnext/erpnext/controllers/buying_controller.py +131,Please enter 'Is Subcontracted' as Yes or No,Vul 'Is Uitbesteed' in als Ja of Nee
+apps/erpnext/erpnext/controllers/buying_controller.py +122,Please enter 'Is Subcontracted' as Yes or No,Vul 'Is Uitbesteed' in als Ja of Nee
 DocType: Sales Team,Contact No.,Contact Nr
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,'Profit and Loss' type account {0} not allowed in Opening Entry,'Winst- en verliesrekening' rekeningtype {0} niet toegestaan ​​in Openings Invoer
 DocType: Workflow State,Time,Tijd
@@ -3024,14 +2903,13 @@
 DocType: Authorization Rule,Authorization Rule,Autorisatie Rule
 DocType: Sales Invoice,Terms and Conditions Details,Algemene Voorwaarden Details
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,Sales en -heffingen Template
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +10,Apparel & Accessories,Kleding & Toebehoren
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,Kleding & Toebehoren
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +67,Number of Order,Aantal Bestel
 DocType: Item Group,HTML / Banner that will show on the top of product list.,HTML / Banner dat zal laten zien op de bovenkant van het product lijst.
 DocType: Shipping Rule,Specify conditions to calculate shipping amount,Specificeer de voorwaarden om het verzendbedrag te berekenen
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +121,Add Child,Onderliggende toevoegen
 DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,Rol toegestaan ​​om Stel Frozen Accounts & bewerken Frozen Entries
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +52,Cannot convert Cost Center to ledger as it has child nodes,Kan kostenplaats niet omzetten naar grootboek vanwege onderliggende nodes
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +47,Conversion Factor is required,Conversiefactor is verplicht
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +37,Serial #,Serial #
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +87,Commission on Sales,Commissie op de verkoop
 DocType: Offer Letter Term,Value / Description,/ Beschrijving
@@ -3039,10 +2917,8 @@
 ,Customers Not Buying Since Long Time,Klanten Niet kopen Sinds Long Time
 DocType: Production Order,Expected Delivery Date,Verwachte leverdatum
 apps/erpnext/erpnext/accounts/general_ledger.py +121,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Debet en Credit niet gelijk voor {0} # {1}. Verschil {2}.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +48,Bulging,Uitpuilende
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +11,Evaporative-pattern casting,Evaporative-patroon casting
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Entertainment Expenses,Representatiekosten
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +195,Sales Invoice {0} must be cancelled before cancelling this Sales Order,Verkoopfactuur {0} moet worden geannuleerd voordat deze verkooporder kan worden geannuleerd.
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +190,Sales Invoice {0} must be cancelled before cancelling this Sales Order,Verkoopfactuur {0} moet worden geannuleerd voordat deze verkooporder kan worden geannuleerd.
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +61,Age,Leeftijd
 DocType: Time Log,Billing Amount,Billing Bedrag
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +84,Invalid quantity specified for item {0}. Quantity should be greater than 0.,Ongeldig aantal opgegeven voor artikel {0} . Hoeveelheid moet groter zijn dan 0 .
@@ -3061,26 +2937,24 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,Nieuwe klant Revenue
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Travel Expenses,Reiskosten
 DocType: Maintenance Visit,Breakdown,Storing
-apps/erpnext/erpnext/controllers/accounts_controller.py +241,Account: {0} with currency: {1} can not be selected,Account: {0} met valuta: {1} kan niet worden geselecteerd
+apps/erpnext/erpnext/controllers/accounts_controller.py +242,Account: {0} with currency: {1} can not be selected,Account: {0} met valuta: {1} kan niet worden geselecteerd
 DocType: Bank Reconciliation Detail,Cheque Date,Cheque Datum
 apps/erpnext/erpnext/accounts/doctype/account/account.py +47,Account {0}: Parent account {1} does not belong to company: {2},Rekening {0}: Bovenliggende rekening {1} hoort niet bij bedrijf: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted all transactions related to this company!,Succesvol verwijderd alle transacties met betrekking tot dit bedrijf!
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,Op Date
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +111,Honing,Honing
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +58,Probation,proeftijd
-apps/erpnext/erpnext/stock/doctype/item/item.py +264,Default Warehouse is mandatory for stock Item.,Standaard Magazijn is verplicht voor voorraadartikel .
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Probation,proeftijd
+apps/erpnext/erpnext/stock/doctype/item/item.py +268,Default Warehouse is mandatory for stock Item.,Standaard Magazijn is verplicht voor voorraadartikel .
 DocType: Feed,Full Name,Volledige naam
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +148,Clinching,Clinchen
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +191,Payment of salary for the month {0} and year {1},Betaling van salaris voor de maand {0} en jaar {1} 
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +173,Payment of salary for the month {0} and year {1},Betaling van salaris voor de maand {0} en jaar {1} 
 DocType: Stock Settings,Auto insert Price List rate if missing,Auto insert Prijslijst tarief als vermist
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,Totale betaalde bedrag
 ,Transferred Qty,Verplaatst Aantal
 apps/erpnext/erpnext/config/learn.py +11,Navigating,Navigeren
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +137,Planning,planning
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +137,Planning,planning
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +9,Make Time Log Batch,Maak tijd Inloggen Batch
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Issued,Uitgegeven
 DocType: Project,Total Billing Amount (via Time Logs),Totaal factuurbedrag (via Time Logs)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +629,We sell this Item,Wij verkopen dit artikel
+apps/erpnext/erpnext/public/js/setup_wizard.js +365,We sell this Item,Wij verkopen dit artikel
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +65,Supplier Id,Leverancier Id
 DocType: Journal Entry,Cash Entry,Cash Entry
 DocType: Sales Partner,Contact Desc,Contact Omschr
@@ -3089,18 +2963,16 @@
 DocType: Brand,Item Manager,Item Manager
 DocType: Cost Center,Add rows to set annual budgets on Accounts.,Rijen toevoegen om jaarlijkse begrotingen op Rekeningen in te stellen.
 DocType: Buying Settings,Default Supplier Type,Standaard Leverancier Type
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +160,Quarrying,Delfstoffen
 DocType: Production Order,Total Operating Cost,Totale exploitatiekosten
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +160,Note: Item {0} entered multiple times,Opmerking : Artikel {0} meerdere keren ingevoerd
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +163,Note: Item {0} entered multiple times,Opmerking : Artikel {0} meerdere keren ingevoerd
 apps/erpnext/erpnext/config/crm.py +27,All Contacts.,Alle contactpersonen.
 DocType: Newsletter,Test Email Id,Test E-mail ID
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +394,Company Abbreviation,Bedrijf Afkorting
+apps/erpnext/erpnext/public/js/setup_wizard.js +142,Company Abbreviation,Bedrijf Afkorting
 DocType: Features Setup,If you follow Quality Inspection. Enables Item QA Required and QA No in Purchase Receipt,Als u volgen Kwaliteitscontrole . Stelt Item QA Vereiste en QA Geen in Kwitantie
 DocType: GL Entry,Party Type,partij Type
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +68,Raw material cannot be same as main Item,Grondstof kan niet hetzelfde zijn als hoofdartikel
 DocType: Item Attribute Value,Abbreviation,Afkorting
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,Niet toegestaan aangezien {0} grenzen overschrijdt
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +30,Rotational molding,Rotatiegieten
 apps/erpnext/erpnext/config/hr.py +115,Salary template master.,Salaris sjabloon stam .
 DocType: Leave Type,Max Days Leave Allowed,Max Dagen Verlof toegestaan
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +55,Set Tax Rule for shopping cart,Stel Tax Regel voor winkelmandje
@@ -3114,15 +2986,15 @@
 apps/erpnext/erpnext/config/selling.py +18,Quotes to Leads or Customers.,Offertes naar leads of klanten.
 DocType: Stock Settings,Role Allowed to edit frozen stock,Rol toegestaan ​​om bevroren voorraden bewerken
 ,Territory Target Variance Item Group-Wise,Regio Doel Variance Artikel Groepsgewijs
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +101,All Customer Groups,Alle Doelgroepen
-apps/erpnext/erpnext/controllers/accounts_controller.py +474,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} is verplicht. Misschien is Valuta Koers record niet gemaakt voor {1} naar {2}.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +101,All Customer Groups,Alle Doelgroepen
+apps/erpnext/erpnext/controllers/accounts_controller.py +475,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} is verplicht. Misschien is Valuta Koers record niet gemaakt voor {1} naar {2}.
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +37,Tax Template is mandatory.,Belasting Template is verplicht.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +41,Account {0}: Parent account {1} does not exist,Rekening {0}: Bovenliggende rekening {1} bestaat niet
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Prijslijst Tarief (Bedrijfsvaluta)
 DocType: Account,Temporary,Tijdelijk
 DocType: Address,Preferred Billing Address,Voorkeur Factuuradres
 DocType: Monthly Distribution Percentage,Percentage Allocation,Percentage Toewijzing
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +86,Secretary,secretaresse
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Secretary,secretaresse
 DocType: Serial No,Distinct unit of an Item,Aanwijsbare eenheid van een Artikel
 DocType: Pricing Rule,Buying,Inkoop
 DocType: HR Settings,Employee Records to be created by,Werknemer Records worden gecreëerd door
@@ -3135,9 +3007,8 @@
 ,Item-wise Price List Rate,Artikelgebaseerde Prijslijst Tarief
 DocType: Purchase Order Item,Supplier Quotation,Leverancier Offerte
 DocType: Quotation,In Words will be visible once you save the Quotation.,In Woorden zijn zichtbaar zodra u de Offerte opslaat.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +68,Ironing,Strijken
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is stopped,{0} {1} is gestopt
-apps/erpnext/erpnext/stock/doctype/item/item.py +352,Barcode {0} already used in Item {1},Barcode {0} is al in gebruik in post {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +356,Barcode {0} already used in Item {1},Barcode {0} is al in gebruik in post {1}
 DocType: Lead,Add to calendar on this date,Toevoegen aan agenda op deze datum
 apps/erpnext/erpnext/config/selling.py +132,Rules for adding shipping costs.,Regels voor het toevoegen van verzendkosten.
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,aankomende evenementen
@@ -3146,13 +3017,12 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +27,Quick Entry,Snelle invoer
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0} is verplicht voor Return
 DocType: Purchase Order,To Receive,Ontvangen
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +33,Shrink fitting,Shrink fitting
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +522,user@example.com,user@example.com
+apps/erpnext/erpnext/public/js/setup_wizard.js +266,user@example.com,user@example.com
 DocType: Email Digest,Income / Expense,Inkomsten / Uitgaven
 DocType: Employee,Personal Email,Persoonlijke e-mail
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +58,Total Variance,Total Variance
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +62,Total Variance,Total Variance
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.","Indien aangevinkt, zal het systeem voorraadboekingen automatisch plaatsen."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +15,Brokerage,makelaardij
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +15,Brokerage,makelaardij
 DocType: Address,Postal Code,Postcode
 DocType: Production Order Operation,"in Minutes
 Updated via 'Time Log'","in Minuten 
@@ -3160,14 +3030,13 @@
 DocType: Customer,From Lead,Van Lead
 apps/erpnext/erpnext/config/manufacturing.py +19,Orders released for production.,Orders vrijgegeven voor productie.
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +42,Select Fiscal Year...,Selecteer boekjaar ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +442,POS Profile required to make POS Entry,POS profiel nodig om POS Entry maken
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +444,POS Profile required to make POS Entry,POS profiel nodig om POS Entry maken
 DocType: Hub Settings,Name Token,Naam Token
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +106,Planing,Schaven
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Selling,Standaard Verkoop
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +120,Standard Selling,Standaard Verkoop
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +137,Atleast one warehouse is mandatory,Tenminste een magazijn is verplicht
 DocType: Serial No,Out of Warranty,Uit de garantie
 DocType: BOM Replace Tool,Replace,Vervang
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +314,{0} against Sales Invoice {1},{0} tegen verkoopfactuur {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +316,{0} against Sales Invoice {1},{0} tegen verkoopfactuur {1}
 apps/erpnext/erpnext/stock/doctype/item/item.py +49,Please enter default Unit of Measure,Vul Standaard eenheid in
 DocType: Purchase Invoice Item,Project Name,Naam van het project
 DocType: Supplier,Mention if non-standard receivable account,Vermelden of niet-standaard te ontvangen rekening
@@ -3183,9 +3052,8 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,Journal Entry {0} does not have account {1} or already matched against other voucher,Journal Entry {0} heeft geen rekening {1} of al vergeleken met andere voucher
 DocType: Item,Moving Average,Moving Average
 DocType: BOM Replace Tool,The BOM which will be replaced,De Stuklijst die zal worden vervangen
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +43,New Stock UOM must be different from current stock UOM,Nieuwe Voorraad Eenheid moet verschillen van bestaande Eenheden
 DocType: Account,Debit,Debet
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +34,Leaves must be allocated in multiples of 0.5,"Verloven moeten in veelvouden van 0,5 worden toegewezen"
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +44,Leaves must be allocated in multiples of 0.5,"Verloven moeten in veelvouden van 0,5 worden toegewezen"
 DocType: Production Order,Operation Cost,Operatie Cost
 apps/erpnext/erpnext/config/hr.py +71,Upload attendance from a .csv file,Upload aanwezigheid uit een .csv-bestand
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,Openstaande Amt
@@ -3203,8 +3071,7 @@
 DocType: Employee,Internal Work History,Interne Werk Geschiedenis
 DocType: DocField,Column Break,Column Break
 DocType: Event,Thursday,Donderdag
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +42,Private Equity,Private Equity
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +93,Turning,Draai
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,Private Equity
 DocType: Maintenance Visit,Customer Feedback,Klantenfeedback
 DocType: Account,Expense,Kosten
 DocType: Sales Invoice,Exhibition,Tentoonstelling
@@ -3217,19 +3084,19 @@
 DocType: Employee,Held On,Held Op
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +33,Production Item,Productie Item
 ,Employee Information,Werknemer Informatie
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,Rate (%),Tarief (%)
+apps/erpnext/erpnext/public/js/setup_wizard.js +294,Rate (%),Tarief (%)
 DocType: Stock Entry Detail,Additional Cost,Bijkomende kosten
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +407,Financial Year End Date,Boekjaar Einddatum
+apps/erpnext/erpnext/public/js/setup_wizard.js +155,Financial Year End Date,Boekjaar Einddatum
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Voucher No, if grouped by Voucher","Kan niet filteren op basis van Vouchernummer, indien gegroepeerd per Voucher"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +484,Make Supplier Quotation,Maak Leverancier Offerte
 DocType: Quality Inspection,Incoming,Inkomend
 DocType: BOM,Materials Required (Exploded),Benodigde materialen (uitgeklapt)
 DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),Verminderen Inkomsten voor onbetaald verlof
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +512,"Add users to your organization, other than yourself","Gebruikers toe te voegen aan uw organisatie, anders dan jezelf"
+apps/erpnext/erpnext/public/js/setup_wizard.js +256,"Add users to your organization, other than yourself","Gebruikers toe te voegen aan uw organisatie, anders dan jezelf"
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No {1} does not match with {2} {3},Rij # {0}: Serienummer {1} komt niet overeen met {2} {3}
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +44,Casual Leave,Casual Leave
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +44,Casual Leave,Casual Leave
 DocType: Batch,Batch ID,Partij ID
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +334,Note: {0},Opmerking : {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +336,Note: {0},Opmerking : {0}
 ,Delivery Note Trends,Vrachtbrief Trends
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +104,This Week's Summary,Samenvatting van deze week
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +74,{0} must be a Purchased or Sub-Contracted Item in row {1},{0} moet een gekocht of uitbesteed artikel zijn in rij {1}
@@ -3241,7 +3108,7 @@
 DocType: Purchase Receipt,Return Against Purchase Receipt,Terug Tegen Aankoop Receipt
 DocType: Purchase Order,To Bill,Bill
 DocType: Material Request,% Ordered,% Bestelde
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +61,Piecework,stukwerk
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Piecework,stukwerk
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +64,Avg. Buying Rate,Gem. Buying Rate
 DocType: Task,Actual Time (in Hours),Werkelijke tijd (in uren)
 DocType: Employee,History In Company,Geschiedenis In Bedrijf
@@ -3258,13 +3125,13 @@
 DocType: Opportunity,To Discuss,Te bespreken
 DocType: SMS Settings,SMS Settings,SMS-instellingen
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +60,Temporary Accounts,Tijdelijke Accounts
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +155,Black,Zwart
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Black,Zwart
 DocType: BOM Explosion Item,BOM Explosion Item,Stuklijst Uitklap Artikel
 DocType: Account,Auditor,Revisor
 DocType: Purchase Order,End date of current order's period,Einddatum van de periode huidige bestelling's
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +17,Make Offer Letter,Bod uitbrengen Letter
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +10,Return,Terugkeer
-apps/erpnext/erpnext/stock/doctype/item/item.py +503,Default Unit of Measure for Variant must be same as Template,Standaard maateenheid voor Variant moet hetzelfde zijn als sjabloon
+apps/erpnext/erpnext/stock/doctype/item/item.py +507,Default Unit of Measure for Variant must be same as Template,Standaard maateenheid voor Variant moet hetzelfde zijn als sjabloon
 DocType: DocField,Fold,Vouw
 DocType: Production Order Operation,Production Order Operation,Productie Order Operatie
 DocType: Pricing Rule,Disable,Uitschakelen
@@ -3275,13 +3142,12 @@
 DocType: Page,Page Name,Page Name
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +110,To Time must be greater than From Time,Om tijd groter dan Van Time moet zijn
 DocType: Journal Entry Account,Exchange Rate,Wisselkoers
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +465,Sales Order {0} is not submitted,Verkooporder {0} is niet ingediend
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +467,Sales Order {0} is not submitted,Verkooporder {0} is niet ingediend
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0}: Parent account {1} does not bolong to the company {2},Magazijn {0}: Bovenliggende rekening {1} behoort niet tot bedrijf {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +124,Spindle finishing,Spindel afwerking
 DocType: BOM,Last Purchase Rate,Laatste inkooptarief
 DocType: Account,Asset,aanwinst
 DocType: Project Task,Task ID,Task ID
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +395,"e.g. ""MC""","bijv. ""MB"""
+apps/erpnext/erpnext/public/js/setup_wizard.js +143,"e.g. ""MC""","bijv. ""MB"""
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,Stock cannot exist for Item {0} since has variants,Voorraad kan niet bestaan ​​voor Artikel {0} omdat het varianten heeft.
 ,Sales Person-wise Transaction Summary,Verkopergebaseerd Transactie Overzicht
 DocType: System Settings,Time Zone,Tijdzone
@@ -3290,9 +3156,7 @@
 DocType: Monthly Distribution,Monthly Distribution Percentages,Maandelijkse Verdeling Percentages
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +16,The selected item cannot have Batch,Het geselecteerde item kan niet Batch hebben
 DocType: Delivery Note,% of materials delivered against this Delivery Note,% van de geleverde materialen voor deze Vrachtbrief
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +151,Stapling,Nieten
 DocType: Customer,Customer Details,Klant Details
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +105,Shaping,Vorming
 DocType: Employee,Reports to,Rapporteert aan
 DocType: SMS Settings,Enter url parameter for receiver nos,Voer URL-parameter voor de ontvanger nos
 DocType: Sales Invoice,Paid Amount,Betaald Bedrag
@@ -3301,13 +3165,13 @@
 DocType: Item Variant,Item Variant,Item Variant
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +15,Setting this Address Template as default as there is no other default,Dit adres Template instellen als standaard als er geen andere standaard
 apps/erpnext/erpnext/accounts/doctype/account/account.py +89,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Saldo reeds in Debit, is het niet toegestaan om 'evenwicht moet worden' als 'Credit'"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +76,Quality Management,Quality Management
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Quality Management,Quality Management
 DocType: Production Planning Tool,Filter based on customer,Filteren op basis van klant
 DocType: Payment Tool Detail,Against Voucher No,Tegen blad nr
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +47,Please enter quantity for Item {0},Vul het aantal in voor artikel {0}
 DocType: Employee External Work History,Employee External Work History,Werknemer Externe Werk Geschiedenis
 DocType: Tax Rule,Purchase,Inkopen
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +34,Balance Qty,Balans Aantal
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Balance Qty,Balans Aantal
 DocType: Item Group,Parent Item Group,Bovenliggende Artikelgroep
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +21,{0} for {1},{0} voor {1}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +96,Cost Centers,Kostenplaatsen
@@ -3317,12 +3181,12 @@
 DocType: Opportunity,Next Contact,Volgende Contact
 DocType: Employee,Employment Type,Dienstverband Type
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,Vaste Activa
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +84,Application period cannot be across two alocation records,Aanvraagperiode kan niet over twee alocation platen
 DocType: Item Group,Default Expense Account,Standaard Kostenrekening
 DocType: Employee,Notice (days),Kennisgeving ( dagen )
 DocType: Page,Yes,Ja
 DocType: Tax Rule,Sales Tax Template,Sales Tax Template
 DocType: Employee,Encashment Date,Betalingsdatum
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +74,Electroforming,Elektroformeren
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +179,"Against Voucher Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Tegen Voucher Typ een van Purchase Order, Aankoop Factuur of Inboeken moet zijn"
 DocType: Account,Stock Adjustment,Voorraad aanpassing
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +34,Default Activity Cost exists for Activity Type - {0},Default Activiteit Kosten bestaat voor Activity Type - {0}
@@ -3349,7 +3213,7 @@
 apps/erpnext/erpnext/public/js/utils.js +57,Add Serial No,Voeg Serienummer toe
 DocType: Production Order,Warehouses,Magazijnen
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Print and Stationary,Kantoorartikelen
-apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +122,Group Node,Groep Node
+apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +122,Group Node,Groeperingsnode
 DocType: Payment Reconciliation,Minimum Amount,Minimumbedrag
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +71,Update Finished Goods,Bijwerken Gereed Product
 DocType: Workstation,per hour,per uur
@@ -3358,12 +3222,12 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,Magazijn kan niet worden verwijderd omdat er voorraadboekingen zijn voor dit magazijn.
 DocType: Company,Distribution,Distributie
 apps/erpnext/erpnext/public/js/pos/pos.html +36,Amount Paid,Betaald bedrag
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +91,Project Manager,Project Manager
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +72,Dispatch,Dispatch
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Project Manager,Project Manager
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +72,Dispatch,Dispatch
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,Maximale korting toegestaan voor artikel: {0} is {1}%
 DocType: Customer,Default Taxes and Charges,Standaard en -heffingen
 DocType: Account,Receivable,Vordering
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +268,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,Rij # {0}: Niet toegestaan ​​om van leverancier te veranderen als bestelling al bestaat
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +263,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,Rij # {0}: Niet toegestaan ​​om van leverancier te veranderen als bestelling al bestaat
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,Rol welke is toegestaan ​​om transacties in te dienen die gestelde kredietlimieten overschrijden .
 DocType: Sales Invoice,Supplier Reference,Leverancier Referentie
 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.","Indien aangevinkt, zal BOM voor sub-assemblage zaken geacht voor het krijgen van grondstoffen. Anders zullen alle subeenheid items worden behandeld als een grondstof."
@@ -3371,8 +3235,8 @@
 DocType: Hub Settings,Seller Description,Verkoper Beschrijving
 DocType: Employee Education,Qualification,Kwalificatie
 DocType: Item Price,Item Price,Artikelprijs
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +48,Soap & Detergent,Zeep & Wasmiddel
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +36,Motion Picture & Video,Motion Picture & Video
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +48,Soap & Detergent,Zeep & Wasmiddel
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +36,Motion Picture & Video,Motion Picture & Video
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Besteld
 DocType: Warehouse,Warehouse Name,Magazijn Naam
 DocType: Naming Series,Select Transaction,Selecteer Transactie
@@ -3381,7 +3245,6 @@
 DocType: BOM,Rate Of Materials Based On,Prijs van materialen op basis van
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,Support Analyse
 apps/erpnext/erpnext/accounts/doctype/accounts_settings/accounts_settings.py +27,Company is missing in warehouses {0},Bedrijf ontbreekt in magazijnen {0}
-DocType: Stock UOM Replace Utility,Stock UOM Replace Utility,Voorraad Eenheid Vervang Utility
 DocType: POS Profile,Terms and Conditions,Algemene Voorwaarden
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,To Date should be within the Fiscal Year. Assuming To Date = {0},Tot Datum moet binnen het boekjaar vallenn. Ervan uitgaande dat Tot Datum = {0}
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","Hier kunt u onderhouden lengte, gewicht, allergieën, medische zorgen, enz."
@@ -3393,7 +3256,7 @@
 DocType: Sales Order Item,For Production,Voor Productie
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +103,Please enter sales order in the above table,Vul de verkooporder in in de bovenstaande tabel
 DocType: Project Task,View Task,Bekijk Task
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +406,Your financial year begins on,Uw financiële jaar begint op
+apps/erpnext/erpnext/public/js/setup_wizard.js +154,Your financial year begins on,Uw financiële jaar begint op
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +46,Please enter Purchase Receipts,Vul Aankoopfacturen
 DocType: Sales Invoice,Get Advances Received,Get ontvangen voorschotten
 DocType: Email Digest,Add/Remove Recipients,Toevoegen / verwijderen Ontvangers
@@ -3401,16 +3264,14 @@
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","Om dit boekjaar in te stellen als standaard, klik op 'Als standaard instellen'"
 apps/erpnext/erpnext/config/support.py +54,Setup incoming server for support email id. (e.g. support@example.com),Setup inkomende server voor ondersteuning e-id . ( b.v. support@example.com )
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,Tekort Aantal
-apps/erpnext/erpnext/stock/doctype/item/item.py +528,Item variant {0} exists with same attributes,Item variant {0} bestaat met dezelfde kenmerken
+apps/erpnext/erpnext/stock/doctype/item/item.py +532,Item variant {0} exists with same attributes,Item variant {0} bestaat met dezelfde kenmerken
 DocType: Salary Slip,Salary Slip,Salarisstrook
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +116,Burnishing,Polijsten
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +54,'To Date' is required,'Tot Datum' is vereist
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,'Tot Datum' is vereist
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","Genereren van pakbonnen voor pakketten te leveren. Gebruikt voor pakket nummer, inhoud van de verpakking en het gewicht te melden."
 DocType: Sales Invoice Item,Sales Order Item,Verkooporder Artikel
 DocType: Salary Slip,Payment Days,Betaling Dagen
 DocType: BOM,Manage cost of operations,Beheer kosten van de operaties
 DocType: Features Setup,Item Advanced,Geavanceerd Artikel
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +40,Hot rolling,Warmwalsen
 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.","Als de aangevinkte transacties worden ""Ingediend"", wordt een e-mail pop-up automatisch geopend om een ​​e-mail te sturen naar de bijbehorende ""Contact"" in deze transactie, met de transactie als bijlage. De gebruiker heeft vervolgens de optie om de e-mail wel of niet te verzenden."
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,Global Settings
 DocType: Employee Education,Employee Education,Werknemer Opleidingen
@@ -3423,25 +3284,23 @@
 DocType: Customer,Sales Team Details,Verkoop Team Details
 DocType: Expense Claim,Total Claimed Amount,Totaal gedeclareerd bedrag
 apps/erpnext/erpnext/config/crm.py +22,Potential opportunities for selling.,Potentiële mogelijkheden voor verkoop.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +48,Sick Leave,Ziekteverlof
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +174,Invalid {0},Ongeldige {0}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +48,Sick Leave,Ziekteverlof
 DocType: Email Digest,Email Digest,E-mail Digest
 DocType: Delivery Note,Billing Address Name,Factuuradres Naam
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +22,Department Stores,Warenhuizen
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,Warenhuizen
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +40,System Balance,Systeem Balans
 DocType: Workflow,Is Active,Is actief
 apps/erpnext/erpnext/controllers/stock_controller.py +71,No accounting entries for the following warehouses,Geen boekingen voor de volgende magazijnen
 apps/erpnext/erpnext/projects/doctype/project/project.js +22,Save the document first.,Sla het document eerst.
 DocType: Account,Chargeable,Oplaadbare
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +121,Linishing,Linishing
 DocType: Company,Change Abbreviation,Verandering Afkorting
 DocType: Workflow State,Primary,Primair
 DocType: Expense Claim Detail,Expense Date,Kosten Datum
 DocType: Item,Max Discount (%),Max Korting (%)
 DocType: Communication,More Information,Meer informatie
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +70,Last Order Amount,Laatste Orderbedrag
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +161,Blasting,Ontploffing
 DocType: Company,Warn,Waarschuwen
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +111,Item valuation updated,Artikelwaardering bijgewerkt
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Eventuele andere opmerkingen, noemenswaardig voor in de boekhouding, "
 DocType: BOM,Manufacturing User,Productie Gebruiker
 DocType: Purchase Order,Raw Materials Supplied,Grondstoffen Geleverd
@@ -3451,7 +3310,7 @@
 DocType: Appraisal,Appraisal Template,Beoordeling Sjabloon
 DocType: Communication,Email,E-mail
 DocType: Item Group,Item Classification,Item Classificatie
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +89,Business Development Manager,Business Development Manager
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Business Development Manager,Business Development Manager
 DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,Doel van onderhouds bezoek
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.js +15,Period,periode
 ,General Ledger,Grootboek
@@ -3461,9 +3320,7 @@
 ,Itemwise Recommended Reorder Level,Artikelgebaseerde Aanbevolen Bestelniveau
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +264,Please select {0} first,Selecteer eerst {0}
 DocType: Features Setup,To get Item Group in details table,Om Artikelgroep in details tabel te plaatsen
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +67,Redrawing,Hertekenen
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +112,Batch {0} of Item {1} has expired.,Batch {0} van Item {1} is verlopen.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +120,Etching,Ets
 DocType: Sales Invoice,Commission,commissie
 DocType: Address Template,"<h4>Default Template</h4>
 <p>Uses <a href=""http://jinja.pocoo.org/docs/templates/"">Jinja Templating</a> and all the fields of Address (including Custom Fields if any) will be available</p>
@@ -3508,7 +3365,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +340,Operation Time must be greater than 0 for Operation {0},Operatie tijd moet groter zijn dan 0 voor de operatie zijn {0}
 DocType: Supplier,Address and Contacts,Adres en Contacten
 DocType: UOM Conversion Detail,UOM Conversion Detail,Eenheid Omrekeningsfactor Detail
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +496,Keep it web friendly 900px (w) by 100px (h),Houd het web vriendelijk 900px (w) bij 100px (h)
+apps/erpnext/erpnext/public/js/setup_wizard.js +242,Keep it web friendly 900px (w) by 100px (h),Houd het web vriendelijk 900px (w) bij 100px (h)
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +329,Production Order cannot be raised against a Item Template,Productie bestelling kan niet tegen een Item Template worden verhoogd
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +44,Charges are updated in Purchase Receipt against each item,Kosten worden bijgewerkt in Kwitantie tegen elk item
 DocType: Payment Tool,Get Outstanding Vouchers,Krijg Outstanding Vouchers
@@ -3524,54 +3381,49 @@
 DocType: Item,Average time taken by the supplier to deliver,De gemiddelde tijd die door de leverancier te leveren
 DocType: Time Log,Hours,Uren
 DocType: Project,Expected Start Date,Verwachte startdatum
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +38,Rolling,Rolling
 DocType: ToDo,Priority,Prioriteit
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +41,Remove item if charges is not applicable to that item,Artikel verwijderen als de kosten niet van toepassing zijn op dat artikel
 DocType: Dropbox Backup,Dropbox Access Allowed,Dropbox Toegang toegestaan
 DocType: Dropbox Backup,Weekly,Wekelijks
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,Bijv. smsgateway.com / api / send_sms.cgi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +485,Receive,Ontvangen
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +510,Receive,Ontvangen
 DocType: Maintenance Visit,Fully Completed,Volledig afgerond
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% voltooid
 DocType: Employee,Educational Qualification,Educatieve Kwalificatie
 DocType: Workstation,Operating Costs,Bedrijfskosten
 DocType: Employee Leave Approver,Employee Leave Approver,Werknemer Verlof Fiatteur
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,{0} has been successfully added to our Newsletter list.,{0} is succesvol toegevoegd aan onze nieuwsbrief lijst.
-apps/erpnext/erpnext/stock/doctype/item/item.py +383,Row {0}: An Reorder entry already exists for this warehouse {1},Rij {0}: Er bestaat al een nabestelling voor dit magazijn {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +387,Row {0}: An Reorder entry already exists for this warehouse {1},Rij {0}: Er bestaat al een nabestelling voor dit magazijn {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +67,"Cannot declare as lost, because Quotation has been made.","Kan niet als verloren verklaren, omdat Offerte is gemaakt."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +133,Electron beam machining,Elektronenbundel bewerkingscentra
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Aankoop Master Manager
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +424,Production Order {0} must be submitted,Productie Order {0} moet worden ingediend
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +150,Please select Start Date and End Date for Item {0},Selecteer Start- en Einddatum voor Artikel {0}
 apps/erpnext/erpnext/config/stock.py +141,Main Reports,Hoofdrapporten
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +102,Stock Ledger entries balances updated,Voorraad Dagboek saldi bijgewerkt
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,Tot Datum kan niet eerder zijn dan Van Datum
 DocType: Purchase Receipt Item,Prevdoc DocType,Prevdoc DocType
-apps/erpnext/erpnext/stock/doctype/item/item.js +176,Add / Edit Prices,Toevoegen / bewerken Prijzen
+apps/erpnext/erpnext/stock/doctype/item/item.js +178,Add / Edit Prices,Toevoegen / bewerken Prijzen
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +53,Chart of Cost Centers,Kostenplaatsenschema
 ,Requested Items To Be Ordered,Aangevraagde Artikelen in te kopen
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +298,My Orders,Mijn Bestellingen
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +293,My Orders,Mijn Bestellingen
 DocType: Price List,Price List Name,Prijslijst Naam
 DocType: Time Log,For Manufacturing,Voor Manufacturing
-apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +70,Totals,Totalen
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +174,Totals,Totalen
 DocType: BOM,Manufacturing,Productie
 ,Ordered Items To Be Delivered,Bestelde artikelen te leveren
 DocType: Account,Income,Inkomsten
 ,Setup Wizard,Instellingen Wizard
 DocType: Industry Type,Industry Type,Industrie Type
 apps/erpnext/erpnext/templates/includes/cart.js +137,Something went wrong!,Er is iets fout gegaan!
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +68,Warning: Leave application contains following block dates,Waarschuwing: Verlof applicatie bevat volgende blok data
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +251,Sales Invoice {0} has already been submitted,Verkoopfactuur {0} is al ingediend
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +100,Warning: Leave application contains following block dates,Waarschuwing: Verlof applicatie bevat volgende blok data
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +256,Sales Invoice {0} has already been submitted,Verkoopfactuur {0} is al ingediend
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,Voltooiingsdatum
 DocType: Purchase Invoice Item,Amount (Company Currency),Bedrag (Company Munt)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +10,Die casting,Die casting
 DocType: Email Alert,Reference Date,Referentie Datum
 apps/erpnext/erpnext/config/hr.py +105,Organization unit (department) master.,Organisatie -eenheid (departement) meester.
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +25,Please enter valid mobile nos,Voer geldige mobiele nummers in
 DocType: Budget Detail,Budget Detail,Budget Detail
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +75,Please enter message before sending,Vul bericht in alvorens te verzenden
 DocType: Async Task,Status,Status
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +65,Stock UOM updated for Item {0},Voorraad Eenheid bijgewerkt voor Artikel {0}
 DocType: Company History,Year,Jaar
 apps/erpnext/erpnext/config/accounts.py +127,Point-of-Sale Profile,Point-of-Sale Profile
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +68,Please Update SMS Settings,Werk SMS-instellingen bij
@@ -3585,12 +3437,12 @@
 ,Serial No Service Contract Expiry,Serienummer Service Contract Afloop
 DocType: Item,Unit of Measure Conversion,Eenheid van Meet Conversie
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +86,Employee can not be changed,Werknemer kan niet worden gewijzigd
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +259,You cannot credit and debit same account at the same time,U kunt niet hetzelfde bedrag crediteren en debiteren op hetzelfde moment
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,You cannot credit and debit same account at the same time,U kunt niet hetzelfde bedrag crediteren en debiteren op hetzelfde moment
 DocType: Naming Series,Help HTML,Help HTML
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},Totaal toegewezen gewicht moet 100% zijn. Het is {0}
 apps/erpnext/erpnext/controllers/status_updater.py +140,Allowance for over-{0} crossed for Item {1},Korting voor over-{0} gekruist voor post {1}
 DocType: Address,Name of person or organization that this address belongs to.,Naam van de persoon of organisatie waartoe dit adres behoort.
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +587,Your Suppliers,Uw Leveranciers
+apps/erpnext/erpnext/public/js/setup_wizard.js +325,Your Suppliers,Uw Leveranciers
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,"Kan niet als Verloren instellen, omdat er al een Verkoop Order is gemaakt."
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +65,Another Salary Structure {0} is active for employee {1}. Please make its status 'Inactive' to proceed.,Een ander loongebouw {0} is actief voor de werknemer {1}. Maak dan de status 'Inactief' om door te gaan.
 DocType: Purchase Invoice,Contact,Contact
@@ -3599,37 +3451,35 @@
 DocType: Item,Has Serial No,Heeft Serienummer
 DocType: Employee,Date of Issue,Datum van afgifte
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +16,{0}: From {0} for {1},{0}: Van {0} voor {1}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +154,Row #{0}: Set Supplier for item {1},Rij # {0}: Stel Leverancier voor punt {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +149,Row #{0}: Set Supplier for item {1},Rij # {0}: Stel Leverancier voor punt {1}
 DocType: Issue,Content Type,Content Type
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +17,Computer,Computer
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,Computer
 DocType: Item,List this Item in multiple groups on the website.,Lijst deze post in meerdere groepen op de website.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +283,Please check Multi Currency option to allow accounts with other currency,Kijk Valuta optie om rekeningen met andere valuta toestaan
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +285,Please check Multi Currency option to allow accounts with other currency,Kijk Valuta optie om rekeningen met andere valuta toestaan
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +62,Item: {0} does not exist in the system,Item: {0} bestaat niet in het systeem
 apps/erpnext/erpnext/accounts/doctype/account/account.py +81,You are not authorized to set Frozen value,U bent niet bevoegd om Bevroren waarde in te stellen
 DocType: Payment Reconciliation,Get Unreconciled Entries,Haal onafgeletterde transacties op
 DocType: Cost Center,Budgets,Budgetten
 apps/frappe/frappe/core/page/modules_setup/modules_setup.py +11,Updated,Bijgewerkt
 DocType: Employee,Emergency Contact Details,Noodgeval Contactgegevens
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +396,What does it do?,Wat doet het?
+apps/erpnext/erpnext/public/js/setup_wizard.js +144,What does it do?,Wat doet het?
 DocType: Delivery Note,To Warehouse,Tot Magazijn
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +45,Account {0} has been entered more than once for fiscal year {1},Rekening {0} is meer dan één keer ingevoerd voor het boekjaar {1}
 ,Average Commission Rate,Gemiddelde Commissie Rate
-apps/erpnext/erpnext/stock/doctype/item/item.py +313,'Has Serial No' can not be 'Yes' for non-stock item,'Heeft Serienummer' kan niet 'ja' zijn voor niet- voorraad artikel
+apps/erpnext/erpnext/stock/doctype/item/item.py +317,'Has Serial No' can not be 'Yes' for non-stock item,'Heeft Serienummer' kan niet 'ja' zijn voor niet- voorraad artikel
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Attendance can not be marked for future dates,Aanwezigheid kan niet aangemerkt worden voor toekomstige data
 DocType: Pricing Rule,Pricing Rule Help,Prijsbepalingsregel Help
 DocType: Purchase Taxes and Charges,Account Head,Hoofdrekening
 apps/erpnext/erpnext/config/stock.py +79,Update additional costs to calculate landed cost of items,Actualiseren extra kosten voor landde kosten van artikelen te berekenen
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +111,Electrical,elektrisch
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +111,Electrical,elektrisch
 DocType: Stock Entry,Total Value Difference (Out - In),Totale waarde Verschil (Out - In)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +302,Row {0}: Exchange Rate is mandatory,Rij {0}: Wisselkoers is verplicht
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +304,Row {0}: Exchange Rate is mandatory,Rij {0}: Wisselkoers is verplicht
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},Gebruikers-ID niet ingesteld voor Werknemer {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +72,Peening,Peening
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,From Warranty Claim,Van Garantie Claim
 DocType: Stock Entry,Default Source Warehouse,Standaard Bronmagazijn
 DocType: Item,Customer Code,Klantcode
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +212,Birthday Reminder for {0},Verjaardagsherinnering voor {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +163,Lapping,Lapping
-apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.js +8,Days Since Last Order,Dagen sinds laatste Order
+apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +72,Days Since Last Order,Dagen sinds laatste Order
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +299,Debit To account must be a Balance Sheet account,Debitering van rekening moet een balansrekening zijn
 DocType: Buying Settings,Naming Series,Benoemen Series
 DocType: Leave Block List,Leave Block List Name,Laat Block List Name
@@ -3643,7 +3493,7 @@
 DocType: Notification Control,Sales Invoice Message,Verkoopfactuur bericht
 DocType: Authorization Rule,Based On,Gebaseerd op
 DocType: Sales Order Item,Ordered Qty,Besteld Aantal
-apps/erpnext/erpnext/stock/doctype/item/item.py +539,Item {0} is disabled,Punt {0} is uitgeschakeld
+apps/erpnext/erpnext/stock/doctype/item/item.py +543,Item {0} is disabled,Punt {0} is uitgeschakeld
 DocType: Stock Settings,Stock Frozen Upto,Voorraad Bevroren Tot
 apps/erpnext/erpnext/controllers/recurring_document.py +166,Period From and Period To dates mandatory for recurring {0},Periode Van en periode te data verplicht voor terugkerende {0}
 apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,Project activiteit / taak.
@@ -3653,7 +3503,6 @@
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,Korting moet minder dan 100 zijn
 DocType: ToDo,Low,Laag
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Schrijf Off Bedrag (Company Munt)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +71,Spinning,Spinning
 DocType: Landed Cost Voucher,Landed Cost Voucher,Vrachtkosten Voucher
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +55,Please set {0},Stel {0} in
 DocType: Purchase Invoice,Repeat on Day of Month,Herhaal dit op dag van de maand
@@ -3675,7 +3524,6 @@
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +37,Campaign Name is required,Campagne Naam is vereist
 DocType: Maintenance Visit,Maintenance Date,Onderhoud Datum
 DocType: Purchase Receipt Item,Rejected Serial No,Afgewezen Serienummer
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +51,Deep drawing,Dieptrekken
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +40,New Newsletter,Nieuw Nieuwsbrief
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +157,Start date should be less than end date for Item {0},Startdatum moet kleiner zijn dan einddatum voor Artikel {0}
 apps/erpnext/erpnext/stock/doctype/item/item.js +17,Show Balance,Toon Balans
@@ -3685,7 +3533,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +119,BOM and Manufacturing Quantity are required,BOM en Productie Hoeveelheid nodig
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Vergrijzing Range 2
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +450,Amount,Bedrag
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +147,Riveting,Klinken
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,Stuklijst vervangen
 ,Sales Analytics,Verkoop analyse
 DocType: Manufacturing Settings,Manufacturing Settings,Productie Instellingen
@@ -3697,20 +3544,19 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +207,New Account Name,Nieuwe Rekening Naam
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,Grondstoffen Leveringskosten
 DocType: Selling Settings,Settings for Selling Module,Instellingen voor het verkopen van Module
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +73,Customer Service,Klantenservice
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Customer Service,Klantenservice
 DocType: Item,Thumbnail,Miniatuur
 DocType: Item Customer Detail,Item Customer Detail,Artikel Klant Details
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +147,Confirm Your Email,Bevestig uw e-mail
 apps/erpnext/erpnext/config/hr.py +53,Offer candidate a Job.,Aanbieding kandidaat een baan.
 DocType: Notification Control,Prompt for Email on Submission of,Vragen om E-mail op Indiening van
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +81,Total allocated leaves are more than days in the period,Totaal toegewezen bladeren zijn meer dan dagen in de periode
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +70,Item {0} must be a stock Item,Artikel {0} moet een voorraadartikel zijn
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,Standaard Work In Progress Warehouse
 apps/erpnext/erpnext/config/accounts.py +107,Default settings for accounting transactions.,Standaardinstellingen voor boekhoudkundige transacties.
 apps/frappe/frappe/model/naming.py +40,{0} is required,{0} is verplicht
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +21,Vacuum molding,Vacuümvormen
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,Verwachte datum kan niet voor de Material Aanvraagdatum
 DocType: Contact Us Settings,City,City
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +132,Ultrasonic machining,Ultrasoon bewerken
 apps/frappe/frappe/templates/base.html +137,Error: Not a valid id?,Fout: geen geldig id?
 apps/erpnext/erpnext/stock/get_item_details.py +125,Item {0} must be a Sales Item,Artikel {0} moet een verkoopbaar artikel zijn
 DocType: Naming Series,Update Series Number,Bijwerken Serienummer
@@ -3718,7 +3564,7 @@
 DocType: Sales Order,Printing Details,Afdrukken Details
 DocType: Task,Closing Date,Afsluitingsdatum
 DocType: Sales Order Item,Produced Quantity,Geproduceerd Aantal
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +84,Engineer,Ingenieur
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Engineer,Ingenieur
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,Zoeken Sub Assemblies
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +379,Item Code required at Row No {0},Artikelcode vereist bij rijnummer {0}
 DocType: Sales Partner,Partner Type,Partner Type
@@ -3726,7 +3572,7 @@
 DocType: Authorization Rule,Customerwise Discount,Klantgebaseerde Korting
 DocType: Purchase Invoice,Against Expense Account,Tegen Kostenrekening
 DocType: Production Order,Production Order,Productieorder
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +258,Installation Note {0} has already been submitted,Installatie Opmerking {0} is al ingediend
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +263,Installation Note {0} has already been submitted,Installatie Opmerking {0} is al ingediend
 DocType: Quotation Item,Against Docname,Tegen Docname
 DocType: SMS Center,All Employee (Active),Alle medewerkers (Actief)
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,Bekijk nu
@@ -3735,19 +3581,19 @@
 DocType: Item,Re-Order Level,Re-order Niveau
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,"Voer de artikelen en geplande aantallen in waarvoor u productieorders wilt aanmaken, of grondstoffen voor analyse wilt downloaden."
 apps/frappe/frappe/public/js/frappe/views/ganttview.js +45,Gantt Chart,Gantt-diagram
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +57,Part-time,Deeltijds
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,Part-time,Deeltijds
 DocType: Employee,Applicable Holiday List,Toepasselijk Holiday Lijst
 DocType: Employee,Cheque,Cheque
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,Reeks bijgewerkt
 apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Report Type is mandatory,Rapport type is verplicht
 DocType: Item,Serial Number Series,Serienummer Reeksen
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},Magazijn is verplicht voor voorraadartikel {0} in rij {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +45,Retail & Wholesale,Retail & Groothandel
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,Retail & Groothandel
 DocType: Issue,First Responded On,Eerst gereageerd op
 DocType: Website Item Group,Cross Listing of Item in multiple groups,Kruis Notering van Punt in meerdere groepen
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +351,The First User: You,De eerste gebruiker: U
+apps/erpnext/erpnext/public/js/setup_wizard.js +101,The First User: You,De eerste gebruiker: U
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +48,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},Boekjaar Startdatum en Boekjaar Einddatum zijn al ingesteld voor het fiscale jaar {0}
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +172,Successfully Reconciled,Succesvol Afgeletterd
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +119,Successfully Reconciled,Succesvol Afgeletterd
 DocType: Production Order,Planned End Date,Geplande Einddatum
 apps/erpnext/erpnext/config/stock.py +43,Where items are stored.,Waar artikelen worden opgeslagen.
 DocType: Tax Rule,Validity,Deugdelijkheid
@@ -3767,39 +3613,36 @@
 DocType: DocPerm,Level,Niveau
 DocType: Purchase Taxes and Charges,On Net Total,Op Netto Totaal
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +160,Target warehouse in row {0} must be same as Production Order,Doel magazijn in rij {0} moet hetzelfde zijn als productieorder
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +59,No permission to use Payment Tool,Geen toestemming om Betaling Tool gebruiken
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +97,No permission to use Payment Tool,Geen toestemming om Betaling Tool gebruiken
 apps/erpnext/erpnext/controllers/recurring_document.py +192,'Notification Email Addresses' not specified for recurring %s,'Notificatie E-mailadressen' niet gespecificeerd voor terugkerende %s
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +86,Milling,Frezen
 apps/erpnext/erpnext/accounts/doctype/account/account.py +99,Currency can not be changed after making entries using some other currency,Valuta kan niet na het maken van data met behulp van een andere valuta worden veranderd
 DocType: Company,Round Off Account,Afronden Account
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +60,Nibbling,Knabbelen
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,Administratie Kosten
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +18,Consulting,Consulting
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +18,Consulting,Consulting
 DocType: Customer Group,Parent Customer Group,Bovenliggende klantgroep
 apps/erpnext/erpnext/public/js/pos/pos.js +429,Change,Verandering
 DocType: Purchase Invoice,Contact Email,Contact E-mail
 DocType: Appraisal Goal,Score Earned,Verdiende Score 
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +393,"e.g. ""My Company LLC""","bijv. ""Mijn Bedrijf BV"""
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +173,Notice Period,Opzegtermijn
+apps/erpnext/erpnext/public/js/setup_wizard.js +141,"e.g. ""My Company LLC""","bijv. ""Mijn Bedrijf BV"""
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +173,Notice Period,Opzegtermijn
 DocType: Bank Reconciliation Detail,Voucher ID,Voucher ID
 apps/erpnext/erpnext/setup/doctype/territory/territory.js +14,This is a root territory and cannot be edited.,Dit is een basis regio en kan niet worden bewerkt .
 DocType: Packing Slip,Gross Weight UOM,Bruto Gewicht Eenheid
 DocType: Email Digest,Receivables / Payables,Debiteuren / Crediteuren
 DocType: Delivery Note Item,Against Sales Invoice,Tegen Sales Invoice
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +63,Stamping,Stempelen
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +457,Credit Account,Credit Account
 DocType: Landed Cost Item,Landed Cost Item,Vrachtkosten Artikel
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +56,Show zero values,Toon nulwaarden
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,Hoeveelheid product verkregen na productie / herverpakken van de gegeven hoeveelheden grondstoffen
 DocType: Payment Reconciliation,Receivable / Payable Account,Vorderingen / Crediteuren Account
 DocType: Delivery Note Item,Against Sales Order Item,Tegen Sales Order Item
-apps/erpnext/erpnext/stock/doctype/item/item.py +521,Please specify Attribute Value for attribute {0},Geef aub attribuut Waarde voor kenmerk {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +525,Please specify Attribute Value for attribute {0},Geef aub attribuut Waarde voor kenmerk {0}
 DocType: Item,Default Warehouse,Standaard Magazijn
 DocType: Task,Actual End Date (via Time Logs),Werkelijke Einddatum (via Time Logs)
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +37,Budget cannot be assigned against Group Account {0},Budget kan niet tegen Group rekening worden toegewezen {0}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +23,Please enter parent cost center,Vul bovenliggende kostenplaats in
 DocType: Delivery Note,Print Without Amount,Printen zonder Bedrag
-apps/erpnext/erpnext/controllers/buying_controller.py +69,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,Belastingcategorie kan niet 'Waardering' of 'Waardering en Totaal' zijn als geen van de artikelen voorraadartikelen zijn
+apps/erpnext/erpnext/controllers/buying_controller.py +60,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,Belastingcategorie kan niet 'Waardering' of 'Waardering en Totaal' zijn als geen van de artikelen voorraadartikelen zijn
 DocType: User,Last Name,Achternaam
 DocType: Web Page,Left,Links
 DocType: Event,All Day,Gehele dag
@@ -3807,7 +3650,7 @@
 DocType: Appraisal,Total Score (Out of 5),Totale Score (van de 5)
 DocType: Contact Us Settings,State,Status
 DocType: Batch,Batch,Partij
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +51,Balance,Balans
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +28,Balance,Balans
 DocType: Project,Total Expense Claim (via Expense Claims),Total Expense Claim (via declaraties)
 DocType: User,Gender,Geslacht
 DocType: Journal Entry,Debit Note,Debetnota
@@ -3837,8 +3680,7 @@
 DocType: Purchase Order,Get Last Purchase Rate,Get Laatst Purchase Rate
 DocType: Time Log,Billing Rate based on Activity Type (per hour),Facturering tarief gebaseerd op Activity Type (per uur)
 DocType: Company,Company Info,Bedrijfsinformatie
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +76,Seaming,Naaien
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +197,"Company Email ID not found, hence mail not sent","Bedrijf Email-id niet gevonden, dus mail niet verzonden"
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +206,"Company Email ID not found, hence mail not sent","Bedrijf Email-id niet gevonden, dus mail niet verzonden"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Toepassing van kapitaal (Activa)
 DocType: Production Planning Tool,Filter based on item,Filteren op basis van artikel
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +451,Debit Account,Debit Account
@@ -3850,17 +3692,16 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +95,{0} {1} has been modified. Please refresh.,{0} {1} is gewijzigd. Vernieuw aub.
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,Weerhoud gebruikers van het maken van verlofaanvragen op de volgende dagen.
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +591,From Opportunity,Van Opportunity
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +46,Blanking,Blanking
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +166,Employee Benefits,Employee Benefits
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,Employee Benefits,Employee Benefits
 DocType: Sales Invoice,Is POS,Is POS
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +240,Packed quantity must equal quantity for Item {0} in row {1},Verpakt hoeveelheid moet hoeveelheid die gelijk is voor post {0} in rij {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +245,Packed quantity must equal quantity for Item {0} in row {1},Verpakt hoeveelheid moet hoeveelheid die gelijk is voor post {0} in rij {1}
 DocType: Production Order,Manufactured Qty,Geproduceerd Aantal
 DocType: Purchase Receipt Item,Accepted Quantity,Geaccepteerd Aantal
 apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} bestaat niet
 apps/erpnext/erpnext/config/accounts.py +18,Bills raised to Customers.,Factureren aan Klanten
 DocType: DocField,Default,Standaard
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Project Id
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +466,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Rij Geen {0}: Bedrag kan niet groter zijn dan afwachting Bedrag tegen Expense conclusie {1} zijn. In afwachting van Bedrag is {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +468,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Rij Geen {0}: Bedrag kan niet groter zijn dan afwachting Bedrag tegen Expense conclusie {1} zijn. In afwachting van Bedrag is {2}
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +40,{0} subscribers added,{0} abonnees toegevoegd
 DocType: Maintenance Schedule,Schedule,Plan
 DocType: Cost Center,"Define Budget for this Cost Center. To set budget action, see ""Company List""","Definieer begroting voor deze kostenplaats. De begroting actie, zie &quot;Company List&quot;"
@@ -3871,7 +3712,7 @@
 apps/erpnext/erpnext/public/js/pos/pos.js +91,Price List not found or disabled,Prijslijst niet gevonden of uitgeschakeld
 DocType: Expense Claim,Approved,Aangenomen
 DocType: Pricing Rule,Price,prijs
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +79,Employee relieved on {0} must be set as 'Left',Werknemer ontslagen op {0} moet worden ingesteld als 'Verlaten'
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +88,Employee relieved on {0} must be set as 'Left',Werknemer ontslagen op {0} moet worden ingesteld als 'Verlaten'
 DocType: Item,"Selecting ""Yes"" will give a unique identity to each entity of this item which can be viewed in the Serial No master.","Door ""Ja"" te selecteren kunt u een voorkomen van dit artikel maken welke u kunt bekijken in de Serienummer Stamdata."
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +39,Appraisal {0} created for Employee {1} in the given date range,Beoordeling {0} gemaakt voor Employee {1} in de bepaalde periode
 DocType: Employee,Education,Onderwijs
@@ -3882,7 +3723,7 @@
 apps/frappe/frappe/desk/moduleview.py +67,Standard Reports,Standaard rapporten
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,Journaalposten.
 DocType: Delivery Note Item,Available Qty at From Warehouse,Aantal beschikbaar bij Van Warehouse
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +209,Please select Employee Record first.,Selecteer eerst Werknemer Record.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +224,Please select Employee Record first.,Selecteer eerst Werknemer Record.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Rij {0}: Party / Account komt niet overeen met {1} / {2} in {3} {4}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +35,To create a Tax Account,Een belastingrekening aanmaken
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +233,Please enter Expense Account,Vul Kostenrekening in
@@ -3895,46 +3736,43 @@
 DocType: Sales Order,Track this Sales Order against any Project,Volg dit Verkooporder tegen elke Project
 DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,Haal verkooporders (in afwachting van levering) op basis van de bovengenoemde criteria
 DocType: DocShare,Document Type,Soort document
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +565,From Supplier Quotation,Van Leverancier Offerte
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +588,From Supplier Quotation,Van Leverancier Offerte
 DocType: Deduction Type,Deduction Type,Aftrek Type
 DocType: Attendance,Half Day,Halve dag
 DocType: Pricing Rule,Min Qty,min Aantal
 DocType: Features Setup,"To track items in sales and purchase documents with batch nos. ""Preferred Industry: Chemicals""",Om items in de verkoop en aankoop van documenten met batch nos volgen. &quot;Voorkeur Industrie: Chemicals&quot;
 DocType: GL Entry,Transaction Date,Transactie Datum
 DocType: Production Plan Item,Planned Qty,Gepland Aantal
-apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +91,Total Tax,Total Tax
+apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +93,Total Tax,Total Tax
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +178,For Quantity (Manufactured Qty) is mandatory,Voor Hoeveelheid (Geproduceerd Aantal) is verplicht
 DocType: Stock Entry,Default Target Warehouse,Standaard Doelmagazijn
 DocType: Purchase Invoice,Net Total (Company Currency),Netto Totaal (Bedrijfsvaluta)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +79,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Rij {0}: Party Type en Party is uitsluitend van toepassing tegen Debiteuren / Crediteuren rekening
 DocType: Notification Control,Purchase Receipt Message,Ontvangstbevestiging Bericht
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +95,Total allocated leaves are more than period,Totaal toegewezen bladeren zijn meer dan periode
 DocType: Production Order,Actual Start Date,Werkelijke Startdatum
 DocType: Sales Order,% of materials delivered against this Sales Order,% van de geleverde materialen voor deze verkooporder
 apps/erpnext/erpnext/config/stock.py +23,Record item movement.,Opnemen artikelbeweging
 DocType: Newsletter List Subscriber,Newsletter List Subscriber,Nieuwsbrief Lijst Subscriber
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +164,Morticing,Uitsteekmachines
 DocType: Email Account,Service,Service
 DocType: Hub Settings,Hub Settings,Hub Instellingen
 DocType: Project,Gross Margin %,Bruto marge %
 DocType: BOM,With Operations,Met Operations
 apps/erpnext/erpnext/accounts/party.py +232,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Boekingen zijn al gemaakt in valuta {0} voor het bedrijf {1}. Selecteer een vordering of schuld gehouden met valuta {0}.
 ,Monthly Salary Register,Maandsalaris Register
-apps/frappe/frappe/website/template.py +140,Next,volgende
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard_page.html +17,Next,volgende
 DocType: Warranty Claim,If different than customer address,Indien anders dan klantadres
 DocType: BOM Operation,BOM Operation,Stuklijst Operatie
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +118,Electropolishing,Elektrolytisch polijsten
 DocType: Purchase Taxes and Charges,On Previous Row Amount,Aantal van vorige rij
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +24,Please enter Payment Amount in atleast one row,Vul Betaling Bedrag in tenminste één rij
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +33,Please enter Payment Amount in atleast one row,Vul Betaling Bedrag in tenminste één rij
 DocType: POS Profile,POS Profile,POS Profiel
 apps/erpnext/erpnext/config/accounts.py +153,"Seasonality for setting budgets, targets etc.","Seizoensgebondenheid voor het vaststellen van budgetten, doelstellingen etc."
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +238,Row {0}: Payment Amount cannot be greater than Outstanding Amount,Rij {0}: kan Betaling bedrag niet groter is dan openstaande bedrag zijn
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +46,Total Unpaid,Totaal Onbetaalde
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +21,Time Log is not billable,Tijd Log is niet factureerbaar
 apps/erpnext/erpnext/stock/get_item_details.py +128,"Item {0} is a template, please select one of its variants","Item {0} is een sjabloon, selecteert u één van de varianten"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +528,Purchaser,Koper
+apps/erpnext/erpnext/public/js/setup_wizard.js +272,Purchaser,Koper
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +81,Net pay cannot be negative,Nettoloon kan niet negatief zijn
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +71,Please enter the Against Vouchers manually,Gelieve handmatig invoeren van de Against Vouchers
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +107,Please enter the Against Vouchers manually,Gelieve handmatig invoeren van de Against Vouchers
 DocType: SMS Settings,Static Parameters,Statische Parameters
 DocType: Purchase Order,Advance Paid,Voorschot Betaald
 DocType: Item,Item Tax,Artikel Belasting
@@ -3943,14 +3781,12 @@
 apps/erpnext/erpnext/config/crm.py +48,Send mass SMS to your contacts,Stuur massa SMS naar uw contacten
 DocType: Purchase Taxes and Charges,Consider Tax or Charge for,Overweeg belasting of heffing voor
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,Werkelijke aantal is verplicht
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +42,Cross-rolling,Cross-rollen
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +132,Credit Card,Credit Card
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +132,Credit Card,Credit Card
 DocType: BOM,Item to be manufactured or repacked,Artikel te vervaardigen of herverpakken
 apps/erpnext/erpnext/config/stock.py +95,Default settings for stock transactions.,Standaardinstellingen voor Voorraadtransacties .
 DocType: Purchase Invoice,Next Date,Volgende datum
 DocType: Employee Education,Major/Optional Subjects,Major / keuzevakken
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +49,Please enter Taxes and Charges,Voer aub Belastingen en Toeslagen in
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +85,Machining,Machining
 DocType: Sales Invoice Item,Drop Ship,Drop Ship
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","Hier kunt u onderhouden familie gegevens zoals naam en beroep van de ouder, echtgenoot en kinderen"
 DocType: Hub Settings,Seller Name,Verkoper Naam
@@ -3960,7 +3796,7 @@
 DocType: Stock Entry,Repack,Herverpakken
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +6,You must Save the form before proceeding,U moet het formulier opslaan voordat u verder gaat
 DocType: Item Attribute,Numeric Values,Numerieke waarden
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +500,Attach Logo,Bevestig Logo
+apps/erpnext/erpnext/public/js/setup_wizard.js +246,Attach Logo,Bevestig Logo
 DocType: Customer,Commission Rate,Commissie Rate
 apps/erpnext/erpnext/stock/doctype/item/item.js +38,Make Variant,Maak Variant
 apps/erpnext/erpnext/config/hr.py +145,Block leave applications by department.,Blok verlaten toepassingen per afdeling.
@@ -3975,19 +3811,19 @@
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +105,Please select a csv file,Selecteer een CSV-bestand
 DocType: Dropbox Backup,Send Backups to Dropbox,Stuur Backups naar Dropbox
 DocType: Purchase Order,To Receive and Bill,Te ontvangen en Bill
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +94,Designer,Ontwerper
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Designer,Ontwerper
 apps/erpnext/erpnext/config/selling.py +121,Terms and Conditions Template,Algemene voorwaarden Template
 DocType: Serial No,Delivery Details,Levering Details
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +383,Cost Center is required in row {0} in Taxes table for type {1},Kostenplaats is vereist in regel {0} in Belastingen tabel voor type {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +386,Cost Center is required in row {0} in Taxes table for type {1},Kostenplaats is vereist in regel {0} in Belastingen tabel voor type {1}
 DocType: Item,Automatically create Material Request if quantity falls below this level,Maak automatisch Materiaal aanvragen als de hoeveelheid lager niveau
 ,Item-wise Purchase Register,Artikelgebaseerde Inkoop Register
 DocType: Batch,Expiry Date,Vervaldatum
-apps/erpnext/erpnext/stock/doctype/item/item.py +375,"To set reorder level, item must be a Purchase Item or Manufacturing Item","Om bestelniveau stellen, moet onderdeel van een aankoop Item of Manufacturing Item zijn"
+apps/erpnext/erpnext/stock/doctype/item/item.py +379,"To set reorder level, item must be a Purchase Item or Manufacturing Item","Om bestelniveau stellen, moet onderdeel van een aankoop Item of Manufacturing Item zijn"
 ,Supplier Addresses and Contacts,Leverancier Adressen en Contacten
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,Selecteer eerst een Categorie
 apps/erpnext/erpnext/config/projects.py +18,Project master.,Project stam.
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,"Vertoon geen symbool zoals $, enz. naast valuta."
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +330, (Half Day),(Halve Dag)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +374, (Half Day),(Halve Dag)
 DocType: Supplier,Credit Days,Credit Dagen
 DocType: Leave Type,Is Carry Forward,Is Forward Carry
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +478,Get Items from BOM,Artikelen ophalen van Stuklijst
@@ -3995,7 +3831,7 @@
 apps/erpnext/erpnext/config/manufacturing.py +120,Bill of Materials,Bill of Materials
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +77,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Rij {0}: Party Type en Party is vereist voor Debiteuren / Crediteuren rekening {1}
 DocType: Dropbox Backup,Send Notifications To,Verzend Notificaties naar
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html +26,Ref Date,Ref Date
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +54,Ref Date,Ref Date
 DocType: Employee,Reason for Leaving,Reden voor vertrek
 DocType: Expense Claim Detail,Sanctioned Amount,Gesanctioneerde Bedrag
 DocType: GL Entry,Is Opening,Opent
@@ -4003,4 +3839,3 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +188,Account {0} does not exist,Rekening {0} bestaat niet
 DocType: Account,Cash,Kas
 DocType: Employee,Short biography for website and other publications.,Korte biografie voor website en andere publicaties.
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +31,Please create Salary Structure for employee {0},Maak salarisstructuur voor werknemer {0}
diff --git a/erpnext/translations/no.csv b/erpnext/translations/no.csv
index 5fbd43e..22db7b4 100644
--- a/erpnext/translations/no.csv
+++ b/erpnext/translations/no.csv
@@ -1,13 +1,12 @@
 DocType: Employee,Salary Mode,Lønn Mode
 DocType: Cost Center,"Select Monthly Distribution, if you want to track based on seasonality.","Velg Månedlig Distribution, hvis du ønsker å spore basert på sesongvariasjoner."
 DocType: Employee,Divorced,Skilt
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +86,Warning: Same item has been entered multiple times.,Advarsel: Samme element er angitt flere ganger.
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +80,Warning: Same item has been entered multiple times.,Advarsel: Samme element er angitt flere ganger.
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +96,Items already synced,Elementer allerede synkronisert
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,Tillat Element som skal legges flere ganger i en transaksjon
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,Avbryt Material Besøk {0} før den avbryter denne garantikrav
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +19,Consumer Products,Forbrukerprodukter
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,Forbrukerprodukter
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +68,Please select Party Type first,Vennligst velg Partiet Type først
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +90,Annealing,Gløding
 DocType: Item,Customer Items,Kunde Items
 apps/erpnext/erpnext/accounts/doctype/account/account.py +45,Account {0}: Parent account {1} can not be a ledger,Konto {0}: Parent konto {1} kan ikke være en hovedbok
 DocType: Item,Publish Item to hub.erpnext.com,Publiser varen til hub.erpnext.com
@@ -20,15 +19,14 @@
 DocType: About Us Settings,Website,Nettsted
 DocType: POS Profile,Applicable for User,Gjelder for User
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +169,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Stoppet produksjonsordre kan ikke avbestilles, Døves det første å avbryte"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +23,Compaction plus sintering,Press pluss sintring
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,Currency is required for Price List {0},Valuta er nødvendig for Prisliste {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Vil bli beregnet i transaksjonen.
 DocType: Purchase Order,Customer Contact,Kundekontakt
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +549,From Material Request,Fra Material Request
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +572,From Material Request,Fra Material Request
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} treet
 DocType: Job Applicant,Job Applicant,Jobbsøker
 apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,Ingen flere resultater.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +78,Legal,Juridisk
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +34,Legal,Juridisk
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +114,Actual type tax cannot be included in Item rate in row {0},Faktiske typen skatt kan ikke inkluderes i Element rente i rad {0}
 DocType: C-Form,Customer,Kunde
 DocType: Purchase Receipt Item,Required By,Kreves av
@@ -43,7 +41,6 @@
 DocType: Manufacturing Settings,Default 10 mins,Standard 10 minutter
 DocType: Leave Type,Leave Type Name,La Type Navn
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +148,Series Updated Successfully,Serien er oppdatert
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +150,Stitching,Stikk
 DocType: Pricing Rule,Apply On,Påfør på
 DocType: Item Price,Multiple Item prices.,Flere varepriser.
 ,Purchase Order Items To Be Received,Purchase Order Elementer som skal mottas
@@ -51,8 +48,8 @@
 DocType: Quality Inspection Reading,Parameter,Parameter
 apps/erpnext/erpnext/projects/doctype/project/project.py +43,Expected End Date can not be less than Expected Start Date,Forventet Sluttdato kan ikke være mindre enn Tiltredelse
 apps/erpnext/erpnext/utilities/transaction_base.py +104,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Row # {0}: Pris må være samme som {1}: {2} ({3} / {4})
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +189,New Leave Application,New La Application
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +134,Bank Draft,Bank Draft
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +204,New Leave Application,New La Application
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +134,Bank Draft,Bank Draft
 DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,1. For å opprettholde kunde kloke elementet koden og gjøre dem søkbare basert på deres bruk kode dette alternativet
 DocType: Mode of Payment Account,Mode of Payment Account,Modus for betaling konto
 apps/erpnext/erpnext/stock/doctype/item/item.js +34,Show Variants,Vis Varianter
@@ -64,25 +61,23 @@
 DocType: Production Plan Item,Production Plan Item,Produksjonsplan Sak
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +141,User {0} is already assigned to Employee {1},Bruker {0} er allerede tildelt Employee {1}
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +13,Make new POS Profile,Gjør nye POS Profile
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +31,Health Care,Helsevesen
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,Helsevesen
 DocType: Purchase Invoice,Monthly,Månedlig
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +66,Delay in payment (Days),Forsinket betaling (dager)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +494,Invoice,Faktura
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +519,Invoice,Faktura
 DocType: Maintenance Schedule Item,Periodicity,Periodisitet
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +357,Email Address,E-Post-Adresse
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +21,Defense,Forsvars
+apps/erpnext/erpnext/public/js/setup_wizard.js +107,Email Address,E-Post-Adresse
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,Forsvars
 DocType: Company,Abbr,Abbr
 DocType: Appraisal Goal,Score (0-5),Score (0-5)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +193,Row {0}: {1} {2} does not match with {3},Rad {0}: {1} {2} samsvarer ikke med {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +67,Row # {0}:,Row # {0}:
 DocType: Delivery Note,Vehicle No,Vehicle Nei
 apps/erpnext/erpnext/public/js/pos/pos.js +528,Please select Price List,Vennligst velg Prisliste
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +162,Woodworking,Trearbeid
 DocType: Production Order Operation,Work In Progress,Arbeid På Går
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +153,3D printing,3D-utskrift
 DocType: Employee,Holiday List,Holiday List
 DocType: Time Log,Time Log,Tid Logg
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +530,Accountant,Accountant
+apps/erpnext/erpnext/public/js/setup_wizard.js +274,Accountant,Accountant
 DocType: Cost Center,Stock User,Stock User
 DocType: Company,Phone No,Telefonnr
 DocType: Time Log,"Log of Activities performed by users against Tasks that can be used for tracking time, billing.","Logg av aktiviteter som utføres av brukere mot Oppgaver som kan brukes for å spore tid, fakturering."
@@ -98,18 +93,19 @@
 DocType: Bin,Quantity Requested for Purchase,Antall Spurt for Purchase
 DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name","Fest CSV-fil med to kolonner, en for det gamle navnet og en for det nye navnet"
 DocType: Packed Item,Parent Detail docname,Parent Detail docname
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Kg,Kg
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Kg,Kg
 apps/erpnext/erpnext/config/hr.py +48,Opening for a Job.,Åpning for en jobb.
 DocType: Item Attribute,Increment,Tilvekst
 apps/erpnext/erpnext/public/js/stock_analytics.js +63,Select Warehouse...,Velg Warehouse ...
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +6,Advertising,Annonsering
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,Annonsering
+apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,Samme firma er angitt mer enn én gang
 DocType: Employee,Married,Gift
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +389,Stock cannot be updated against Delivery Note {0},Stock kan ikke oppdateres mot følgeseddel {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +391,Stock cannot be updated against Delivery Note {0},Stock kan ikke oppdateres mot følgeseddel {0}
 DocType: Payment Reconciliation,Reconcile,Forsone
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +30,Grocery,Dagligvare
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,Dagligvare
 DocType: Quality Inspection Reading,Reading 1,Lesing 1
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Make Bank Entry,Gjør Bank Entry
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +40,Pension Funds,Pensjonsfondene
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,Pensjonsfondene
 apps/erpnext/erpnext/accounts/doctype/account/account.py +142,Warehouse is mandatory if account type is Warehouse,Warehouse er obligatorisk hvis kontotype er Warehouse
 DocType: SMS Center,All Sales Person,All Sales Person
 DocType: Lead,Person Name,Person Name
@@ -131,7 +127,7 @@
 DocType: Quality Inspection,Get Specification Details,Få Spesifikasjon Detaljer
 DocType: Lead,Interested,Interessert
 apps/erpnext/erpnext/config/manufacturing.py +14,Bill of Material,Bill of Material
-apps/erpnext/erpnext/public/js/stock_analytics.js +45,Opening,Åpning
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +158,Opening,Åpning
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},Fra {0} til {1}
 DocType: Item,Copy From Item Group,Kopier fra varegruppe
 DocType: Journal Entry,Opening Entry,Åpning Entry
@@ -145,23 +141,22 @@
 DocType: Employee Education,Under Graduate,Under Graduate
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +22,Target On,Target På
 DocType: BOM,Total Cost,Totalkostnad
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +99,Reaming,Rømming
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +9,Activity Log:,Aktivitetsloggen:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +199,Item {0} does not exist in the system or has expired,Element {0} finnes ikke i systemet eller er utløpt
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +44,Real Estate,Eiendom
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +44,Real Estate,Eiendom
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +4,Statement of Account,Kontoutskrift
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +41,Pharmaceuticals,Farmasi
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,Farmasi
 DocType: Expense Claim Detail,Claim Amount,Krav Beløp
 DocType: Employee,Mr,Mr
 DocType: Custom Script,Client,Client
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,Leverandør Type / leverandør
 DocType: Naming Series,Prefix,Prefix
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Consumable,Konsum
+apps/erpnext/erpnext/public/js/setup_wizard.js +359,Consumable,Konsum
 DocType: Upload Attendance,Import Log,Import Logg
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.js +19,Send,Sende
 DocType: Sales Invoice Item,Delivered By Supplier,Levert av Leverandør
 DocType: SMS Center,All Contact,All kontakt
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +164,Annual Salary,Årslønn
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +164,Annual Salary,Årslønn
 DocType: Period Closing Voucher,Closing Fiscal Year,Lukke regnskapsår
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +69,Stock Expenses,Aksje Utgifter
 DocType: Newsletter,Email Sent?,E-post sendt?
@@ -169,26 +164,24 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +92,Show Time Logs,Show Time Logger
 DocType: Journal Entry Account,Credit in Company Currency,Kreditt i selskapet Valuta
 DocType: Delivery Note,Installation Status,Installasjon Status
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +115,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Akseptert + Avvist Antall må være lik mottatt kvantum for Element {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +118,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Akseptert + Avvist Antall må være lik mottatt kvantum for Element {0}
 DocType: Item,Supply Raw Materials for Purchase,Leverer råvare til Purchase
 apps/erpnext/erpnext/stock/get_item_details.py +133,Item {0} must be a Purchase Item,Elementet {0} må være et kjøp varen
 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","Last ned mal, fyll riktige data og fest den endrede filen. Alle datoer og ansatt kombinasjon i den valgte perioden vil komme i malen, med eksisterende møteprotokoller"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +446,Item {0} is not active or end of life has been reached,Element {0} er ikke aktiv eller slutten av livet er nådd
 DocType: Time Log Batch,Will be updated after Sales Invoice is Submitted.,Vil bli oppdatert etter Sales Faktura sendes inn.
-apps/erpnext/erpnext/controllers/accounts_controller.py +493,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","For å inkludere skatt i rad {0} i Element rente, skatt i rader {1} må også inkluderes"
+apps/erpnext/erpnext/controllers/accounts_controller.py +494,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","For å inkludere skatt i rad {0} i Element rente, skatt i rader {1} må også inkluderes"
 apps/erpnext/erpnext/config/hr.py +90,Settings for HR Module,Innstillinger for HR Module
 DocType: SMS Center,SMS Center,SMS-senter
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +78,Straightening,Rette
 DocType: BOM Replace Tool,New BOM,New BOM
 apps/erpnext/erpnext/config/projects.py +28,Batch Time Logs for billing.,Batch Tid Logger for fakturering.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +15,Countergravity casting,Countergravity casting
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +30,Newsletter has already been sent,Nyhetsbrevet har allerede blitt sendt
 DocType: Lead,Request Type,Forespørsel Type
 DocType: Leave Application,Reason,Reason
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +14,Broadcasting,Kringkasting
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +140,Execution,Execution
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +364,The first user will become the System Manager (you can change this later).,Den første brukeren vil bli System Manager (du kan endre dette senere).
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,Kringkasting
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +140,Execution,Execution
+apps/erpnext/erpnext/public/js/setup_wizard.js +114,The first user will become the System Manager (you can change this later).,Den første brukeren vil bli System Manager (du kan endre dette senere).
 apps/erpnext/erpnext/config/manufacturing.py +39,Details of the operations carried out.,Detaljene for operasjonen utføres.
 DocType: Serial No,Maintenance Status,Vedlikehold Status
 apps/erpnext/erpnext/config/stock.py +263,Items and Pricing,Elementer og priser
@@ -205,7 +198,6 @@
 DocType: Pricing Rule,Discount on Price List Rate (%),Rabatt på Prisliste Rate (%)
 apps/frappe/frappe/public/js/frappe/form/print.js +96,Start,Start
 DocType: User,First Name,Fornavn
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +12,Full-mold casting,Full-mold casting
 DocType: Offer Letter,Select Terms and Conditions,Velg Vilkår
 DocType: Production Planning Tool,Sales Orders,Salgsordrer
 DocType: Purchase Taxes and Charges,Valuation,Verdivurdering
@@ -217,8 +209,7 @@
 DocType: Bank Reconciliation,Bank Account,Bankkonto
 DocType: Leave Type,Allow Negative Balance,Tillat negativ saldo
 DocType: Selling Settings,Default Territory,Standard Territory
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +53,Television,TV
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +138,Gashing,Gashing
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,TV
 DocType: Production Order Operation,Updated via 'Time Log',Oppdatert via &#39;Time Logg&#39;
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +82,Account {0} does not belong to Company {1},Konto {0} tilhører ikke selskapet {1}
 DocType: Naming Series,Series List for this Transaction,Serien Liste for denne transaksjonen
@@ -233,14 +224,13 @@
 DocType: Leave Allocation,Add unused leaves from previous allocations,Legg ubrukte blader fra tidligere bevilgninger
 apps/erpnext/erpnext/controllers/recurring_document.py +206,Next Recurring {0} will be created on {1},Neste Recurring {0} vil bli opprettet på {1}
 DocType: Newsletter List,Total Subscribers,Totalt Abonnenter
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +575,Contact Name,Kontakt Navn
+,Contact Name,Kontakt Navn
 DocType: Production Plan Item,SO Pending Qty,SO Venter Antall
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Oppretter lønn slip for ovennevnte kriterier.
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,Be for kjøp.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +107,Double housing,Double bolig
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +156,Only the selected Leave Approver can submit this Leave Application,Bare den valgte La Godkjenner kan sende dette La Application
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +171,Only the selected Leave Approver can submit this Leave Application,Bare den valgte La Godkjenner kan sende dette La Application
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,Lindrende Dato må være større enn tidspunktet for inntreden
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +172,Leaves per Year,Later per år
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +172,Leaves per Year,Later per år
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup > Settings > Naming Series,Vennligst sett Naming Series for {0} via Oppsett&gt; Innstillinger&gt; Naming Series
 DocType: Time Log,Will be updated when batched.,Vil bli oppdatert når dosert.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +104,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,Rad {0}: Vennligst sjekk &#39;Er Advance &quot;mot Account {1} hvis dette er et forskudd oppføring.
@@ -249,25 +239,24 @@
 DocType: Item Website Specification,Item Website Specification,Sak Nettsted Spesifikasjon
 DocType: Dropbox Backup,Dropbox Access Key,Dropbox Tilgang Key
 DocType: Payment Tool,Reference No,Referansenummer
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +348,Leave Blocked,La Blokkert
-apps/erpnext/erpnext/stock/doctype/item/item.py +535,Item {0} has reached its end of life on {1},Element {0} har nådd slutten av livet på {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +392,Leave Blocked,La Blokkert
+apps/erpnext/erpnext/stock/doctype/item/item.py +539,Item {0} has reached its end of life on {1},Element {0} har nådd slutten av livet på {1}
 apps/erpnext/erpnext/accounts/utils.py +339,Annual,Årlig
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Stock Avstemming Element
 DocType: Stock Entry,Sales Invoice No,Salg Faktura Nei
 DocType: Material Request Item,Min Order Qty,Min Bestill Antall
 DocType: Lead,Do Not Contact,Ikke kontakt
 DocType: Sales Invoice,The unique id for tracking all recurring invoices. It is generated on submit.,Den unike id for sporing av alle løpende fakturaer. Det genereres på send.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +93,Software Developer,Programvareutvikler
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +93,Software Developer,Programvareutvikler
 DocType: Item,Minimum Order Qty,Minimum Antall
 DocType: Pricing Rule,Supplier Type,Leverandør Type
 DocType: Item,Publish in Hub,Publisere i Hub
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +555,Item {0} is cancelled,Element {0} er kansellert
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +598,Material Request,Materialet Request
+apps/erpnext/erpnext/stock/doctype/item/item.py +559,Item {0} is cancelled,Element {0} er kansellert
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +607,Material Request,Materialet Request
 DocType: Bank Reconciliation,Update Clearance Date,Oppdater Lagersalg Dato
 DocType: Item,Purchase Details,Kjøps Detaljer
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +323,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},Element {0} ble ikke funnet i &#39;Råvare Leveres&#39; bord i innkjøpsordre {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +129,Wire brushing,Wire børsting
 DocType: Employee,Relation,Relasjon
 DocType: Shipping Rule,Worldwide Shipping,Worldwide Shipping
 apps/erpnext/erpnext/config/selling.py +23,Confirmed orders from Customers.,Bekreftede bestillinger fra kunder.
@@ -283,12 +272,11 @@
 DocType: Supplier,Address HTML,Adresse HTML
 DocType: Lead,Mobile No.,Mobile No.
 DocType: Maintenance Schedule,Generate Schedule,Generere Schedule
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +81,Hubbing,Hubbing
 DocType: Purchase Invoice Item,Expense Head,Expense Leder
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +86,Please select Charge Type first,Vennligst velg Charge Type først
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,Siste
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +395,Max 5 characters,Maks 5 tegn
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +195,Select Your Language,Velg ditt språk
+apps/erpnext/erpnext/public/js/setup_wizard.js +143,Max 5 characters,Maks 5 tegn
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +245,Select Your Language,Velg ditt språk
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,Den første La Godkjenner i listen vil bli definert som standard La Godkjenner
 DocType: Manufacturing Settings,"Disables creation of time logs against Production Orders.
 Operations shall not be tracked against Production Order",Deaktiverer etableringen av tids logger mot produksjonsordrer. Driften skal ikke spores mot produksjonsordre
@@ -300,8 +288,6 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +34,Item {0} must be Service Item,Elementet {0} må være service Element
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +303,Completed Qty can not be greater than 'Qty to Manufacture',Fullført Antall kan ikke være større enn &quot;Antall å Manufacture &#39;
 DocType: DocType,Administrator,Administrator
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +136,Laser drilling,Laser boring
-DocType: Stock UOM Replace Utility,New Stock UOM,New Stock målenheter
 DocType: Period Closing Voucher,Closing Account Head,Lukke konto Leder
 DocType: Employee,External Work History,Ekstern Work History
 apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,Rundskriv Reference Error
@@ -310,18 +296,15 @@
 DocType: Lead,Industry,Industry
 DocType: Employee,Job Profile,Job Profile
 DocType: Newsletter,Newsletter,Nyhetsbrev
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +84,Hydroforming,Hydroforming
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +49,Necking,Necking
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Varsle på e-post om opprettelse av automatisk Material Request
 DocType: Journal Entry,Multi Currency,Multi Valuta
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +51,Item is updated,Elementet oppdateres
 DocType: Async Task,System Manager,System Manager
 DocType: Payment Reconciliation Invoice,Invoice Type,Faktura Type
 DocType: Sales Invoice Item,Delivery Note,Levering Note
 DocType: Dropbox Backup,Allow Dropbox Access,Tillat Dropbox Tilgang
 apps/erpnext/erpnext/config/learn.py +72,Setting up Taxes,Sette opp skatter
 apps/erpnext/erpnext/accounts/utils.py +189,Payment Entry has been modified after you pulled it. Please pull it again.,Betaling Entry har blitt endret etter at du trakk den. Kan trekke det igjen.
-apps/erpnext/erpnext/stock/doctype/item/item.py +343,{0} entered twice in Item Tax,{0} registrert to ganger i pkt Skatte
+apps/erpnext/erpnext/stock/doctype/item/item.py +347,{0} entered twice in Item Tax,{0} registrert to ganger i pkt Skatte
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +105,Summary for this week and pending activities,Oppsummering for denne uken og ventende aktiviteter
 DocType: Workstation,Rent Cost,Rent Cost
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +74,Please select month and year,Velg måned og år
@@ -338,23 +321,21 @@
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,Hastigheten som Kunden Valuta omdannes til kundens basisvaluta
 DocType: Features Setup,"Available in BOM, Delivery Note, Purchase Invoice, Production Order, Purchase Order, Purchase Receipt, Sales Invoice, Sales Order, Stock Entry, Timesheet","Tilgjengelig i BOM, følgeseddel, fakturaen, produksjonsordre, innkjøpsordre, kvitteringen Salg Faktura, Salgsordre, Stock Entry, Timeregistrering"
 DocType: Item Tax,Tax Rate,Skattesats
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Select Item,Velg element
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +540,Select Item,Velg element
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +143,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","Sak: {0} klarte batch-messig, kan ikke forenes bruker \ Stock Forsoning, i stedet bruke Stock Entry"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +259,Purchase Invoice {0} is already submitted,Fakturaen {0} er allerede sendt
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +262,Purchase Invoice {0} is already submitted,Fakturaen {0} er allerede sendt
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Batch No must be same as {1} {2},Row # {0}: Batch No må være samme som {1} {2}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Convert to non-Group,Konverter til ikke-konsernet
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +55,Purchase Receipt must be submitted,Kvitteringen må sendes
-DocType: Stock UOM Replace Utility,Current Stock UOM,Nåværende Stock målenheter
 apps/erpnext/erpnext/config/stock.py +53,Batch (lot) of an Item.,Batch (mye) av et element.
 DocType: C-Form Invoice Detail,Invoice Date,Fakturadato
 DocType: GL Entry,Debit Amount,Debet Beløp
 apps/erpnext/erpnext/accounts/party.py +223,There can only be 1 Account per Company in {0} {1},Det kan bare være en konto per Company i {0} {1}
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Your email address,Din epostadresse
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +194,Please see attachment,Vennligst se vedlegg
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +203,Please see attachment,Vennligst se vedlegg
 DocType: Purchase Order,% Received,% Mottatt
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +109,Water jet cutting,Vannskjæring
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +24,Setup Already Complete!!,Oppsett Allerede Komplett !!
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +20,Setup Already Complete!!,Oppsett Allerede Komplett !!
 ,Finished Goods,Ferdigvarer
 DocType: Delivery Note,Instructions,Bruksanvisning
 DocType: Quality Inspection,Inspected By,Inspisert av
@@ -369,6 +350,7 @@
 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.,Vennligst ikke opprette kontoer for kunder og leverandører. De er laget direkte fra kunde / leverandør mestere.
 DocType: Currency Exchange,Currency Exchange,Valutaveksling
 DocType: Purchase Invoice Item,Item Name,Navn
+DocType: Authorization Rule,Approving User  (above authorized value),Godkjenne Bruker (ovenfor autorisert verdi)
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Credit Balance,Credit Balance
 DocType: Employee,Widowed,Enke
 DocType: Production Planning Tool,"Items to be requested which are ""Out of Stock"" considering all warehouses based on projected qty and minimum order qty",Elementer for å bli forespurt som er &quot;Utsolgt&quot; vurderer alle lagre basert på anslått stk og minimum ordreantall
@@ -378,11 +360,10 @@
 ,Purchase Register,Kjøp Register
 DocType: Landed Cost Item,Applicable Charges,Gjeldende avgifter
 DocType: Workstation,Consumable Cost,Forbrukskostnads
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,{0} ({1}) must have role 'Leave Approver',{0} ({1}) må ha rollen «La Godkjenner &#39;
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +167,{0} ({1}) must have role 'Leave Approver',{0} ({1}) må ha rollen «La Godkjenner &#39;
 DocType: Purchase Receipt,Vehicle Date,Vehicle Dato
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +39,Medical,Medisinsk
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +39,Medical,Medisinsk
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,Grunnen for å tape
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +36,Tube beading,Tube beading
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},Workstation er stengt på følgende datoer som per Holiday Liste: {0}
 DocType: Employee,Single,Enslig
 DocType: Issue,Attachment,Vedlegg
@@ -403,10 +384,8 @@
 DocType: Account,Is Group,Is Gruppe
 DocType: Stock Settings,Automatically Set Serial Nos based on FIFO,Automatisk Sett Serial Nos basert på FIFO
 DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,Sjekk Leverandør fakturanummer Unikhet
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +31,Thermoforming,Termoforming
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +66,Slitting,Slitting
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +57,'To Case No.' cannot be less than 'From Case No.',&#39;Til sak nr&#39; kan ikke være mindre enn &quot;From sak nr &#39;
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +104,Non Profit,Non Profit
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +104,Non Profit,Non Profit
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_list.js +7,Not Started,Ikke i gang
 DocType: Lead,Channel Partner,Channel Partner
 DocType: Account,Old Parent,Gammel Parent
@@ -415,13 +394,12 @@
 apps/erpnext/erpnext/config/manufacturing.py +74,Global settings for all manufacturing processes.,Globale innstillinger for alle produksjonsprosesser.
 DocType: Accounts Settings,Accounts Frozen Upto,Regnskap Frozen Opp
 DocType: SMS Log,Sent On,Sendte På
-apps/erpnext/erpnext/stock/doctype/item/item.py +512,Attribute {0} selected multiple times in Attributes Table,Attributtet {0} valgt flere ganger i attributter Table
+apps/erpnext/erpnext/stock/doctype/item/item.py +516,Attribute {0} selected multiple times in Attributes Table,Attributtet {0} valgt flere ganger i attributter Table
 DocType: Sales Order,Not Applicable,Gjelder ikke
 apps/erpnext/erpnext/config/hr.py +140,Holiday master.,Holiday mester.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +19,Shell molding,Shell molding
 DocType: Material Request Item,Required Date,Nødvendig Dato
 DocType: Delivery Note,Billing Address,Fakturaadresse
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +644,Please enter Item Code.,Skriv inn Element Code.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +648,Please enter Item Code.,Skriv inn Element Code.
 DocType: BOM,Costing,Costing
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount","Hvis det er merket, vil skattebeløpet betraktes som allerede er inkludert i Print Rate / Print Beløp"
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,Total Antall
@@ -431,7 +409,7 @@
 DocType: Item Attribute,To Range,Range
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Verdipapirer og innskudd
 DocType: Features Setup,Imports,Importen
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +144,Adhesive bonding,Liming
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +77,Total leaves allocated is mandatory,Totalt blader tildelte er obligatorisk
 DocType: Job Opening,Description of a Job Opening,Beskrivelse av en ledig jobb
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +102,Pending activities for today,Ventende aktiviteter for i dag
 apps/erpnext/erpnext/config/hr.py +28,Attendance record.,Tilskuerrekord.
@@ -439,26 +417,25 @@
 DocType: Sales Order Item,Used for Production Plan,Brukes for Produksjonsplan
 DocType: System Settings,Loading...,Laster inn ...
 DocType: DocField,Password,Passord
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +155,Fused deposition modeling,Smeltet deponering modellering
 DocType: Manufacturing Settings,Time Between Operations (in mins),Time Between Operations (i minutter)
 DocType: Customer,Buyer of Goods and Services.,Kjøper av varer og tjenester.
 DocType: Journal Entry,Accounts Payable,Leverandørgjeld
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +24,Add Subscribers,Legg Abonnenter
 apps/erpnext/erpnext/public/js/feature_setup.js +220,""" does not exists",&quot;Ikke eksisterer
 DocType: Pricing Rule,Valid Upto,Gyldig Opp
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +564,List a few of your customers. They could be organizations or individuals.,Liste noen av kundene dine. De kan være organisasjoner eller enkeltpersoner.
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,List a few of your customers. They could be organizations or individuals.,Liste noen av kundene dine. De kan være organisasjoner eller enkeltpersoner.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Direct Income,Direkte Inntekt
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +33,"Can not filter based on Account, if grouped by Account","Kan ikke filtrere basert på konto, hvis gruppert etter konto"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +88,Administrative Officer,Administrative Officer
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Administrative Officer,Administrative Officer
 DocType: Payment Tool,Received Or Paid,Mottatt eller betalt
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +318,Please select Company,Vennligst velg selskapet
 DocType: Stock Entry,Difference Account,Forskjellen konto
 apps/erpnext/erpnext/projects/doctype/task/task.py +44,Cannot close task as its dependant task {0} is not closed.,Kan ikke lukke oppgaven som sin avhengige oppgave {0} er ikke lukket.
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +305,Please enter Warehouse for which Material Request will be raised,Skriv inn Warehouse hvor Material Request vil bli hevet
 DocType: Production Order,Additional Operating Cost,Ekstra driftskostnader
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +20,Cosmetics,Kosmetikk
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,Kosmetikk
 DocType: DocField,Type,Type
-apps/erpnext/erpnext/stock/doctype/item/item.py +417,"To merge, following properties must be same for both items","Å fusjonere, må følgende egenskaper være lik for begge elementene"
+apps/erpnext/erpnext/stock/doctype/item/item.py +421,"To merge, following properties must be same for both items","Å fusjonere, må følgende egenskaper være lik for begge elementene"
 DocType: Communication,Subject,Emne
 DocType: Shipping Rule,Net Weight,Netto Vekt
 DocType: Employee,Emergency Phone,Emergency Phone
@@ -468,7 +445,6 @@
 DocType: Journal Entry,Difference (Dr - Cr),Forskjellen (Dr - Cr)
 DocType: Account,Profit and Loss,Gevinst og tap
 apps/erpnext/erpnext/config/stock.py +293,Managing Subcontracting,Administrerende Underleverandører
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +58,New UOM must NOT be of type Whole Number,New målenheter må ikke være av typen heltall
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Furniture and Fixture,Møbler og ligaen
 DocType: Quotation,Rate at which Price list currency is converted to company's base currency,Hastigheten som Prisliste valuta er konvertert til selskapets hovedvaluta
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Account {0} does not belong to company: {1},Konto {0} tilhører ikke selskapet: {1}
@@ -487,14 +463,14 @@
 DocType: Purchase Invoice,Supplier Invoice No,Leverandør Faktura Nei
 DocType: Territory,For reference,For referanse
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +154,"Cannot delete Serial No {0}, as it is used in stock transactions","Kan ikke slette Serial No {0}, slik det brukes i aksjetransaksjoner"
-apps/erpnext/erpnext/public/js/account_tree_grid.js +52,Closing (Cr),Lukking (Cr)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +227,Closing (Cr),Lukking (Cr)
 DocType: Serial No,Warranty Period (Days),Garantiperioden (dager)
 DocType: Installation Note Item,Installation Note Item,Installasjon Merk Element
 ,Pending Qty,Venter Stk
 DocType: Job Applicant,Thread HTML,Tråd HTML
 DocType: Company,Ignore,Ignorer
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +86,SMS sent to following numbers: {0},SMS sendt til følgende nummer: {0}
-apps/erpnext/erpnext/controllers/buying_controller.py +135,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Leverandør Warehouse obligatorisk for underleverandør Kjøpskvittering
+apps/erpnext/erpnext/controllers/buying_controller.py +126,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Leverandør Warehouse obligatorisk for underleverandør Kjøpskvittering
 DocType: Pricing Rule,Valid From,Gyldig Fra
 DocType: Sales Invoice,Total Commission,Total Commission
 DocType: Pricing Rule,Sales Partner,Sales Partner
@@ -502,7 +478,7 @@
 DocType: Monthly Distribution,"**Monthly Distribution** helps you distribute your budget across months if you have seasonality in your business.
 
 To distribute a budget using this distribution, set this **Monthly Distribution** in the **Cost Center**","** Månedlig Distribution ** hjelper deg fordele budsjettet over måneder hvis du har sesongvariasjoner i din virksomhet. Å distribuere et budsjett å bruke denne fordelingen, sette dette ** Månedlig Distribution ** i ** Cost Center **"
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +183,No records found in the Invoice table,Ingen poster ble funnet i Faktura tabellen
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +130,No records found in the Invoice table,Ingen poster ble funnet i Faktura tabellen
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +20,Please select Company and Party Type first,Vennligst velg først selskapet og Party Type
 apps/erpnext/erpnext/config/accounts.py +84,Financial / accounting year.,Finansiell / regnskap år.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","Sorry, kan Serial Nos ikke bli slått sammen"
@@ -518,25 +494,25 @@
 DocType: Sales Order,Billing and Delivery Status,Fakturering og levering Status
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Gjenta kunder
 DocType: Leave Control Panel,Allocate,Bevilge
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +16,Previous,Forrige
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard_page.html +16,Previous,Forrige
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +620,Sales Return,Sales Return
 DocType: Production Planning Tool,Select Sales Orders from which you want to create Production Orders.,Velg salgsordrer som du ønsker å opprette produksjonsordrer.
 DocType: Item,Delivered by Supplier (Drop Ship),Levert av Leverandør (Drop Ship)
 apps/erpnext/erpnext/config/hr.py +120,Salary components.,Lønn komponenter.
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,Database med potensielle kunder.
+DocType: Authorization Rule,Customer or Item,Kunden eller Element
 apps/erpnext/erpnext/config/crm.py +17,Customer database.,Kundedatabase.
 DocType: Quotation,Quotation To,Sitat Å
 DocType: Lead,Middle Income,Middle Income
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),Åpning (Cr)
 apps/erpnext/erpnext/accounts/utils.py +193,Allocated amount can not be negative,Bevilget beløpet kan ikke være negativ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +123,Tumbling,Tumbling
 DocType: Purchase Order Item,Billed Amt,Billed Amt
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,En logisk Warehouse mot som lager oppføringer er gjort.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +92,Reference No & Reference Date is required for {0},Referansenummer og Reference Date er nødvendig for {0}
 DocType: Event,Wednesday,Onsdag
 DocType: Sales Invoice,Customer's Vendor,Kundens Vendor
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +214,Production Order is Mandatory,Produksjonsordre er obligatorisk
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +139,Proposal Writing,Forslaget Writing
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,Proposal Writing,Forslaget Writing
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,En annen Sales Person {0} finnes med samme Employee id
 apps/erpnext/erpnext/stock/stock_ledger.py +336,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},Negative Stock Error ({6}) for Element {0} i Warehouse {1} {2} {3} i {4} {5}
 DocType: Fiscal Year Company,Fiscal Year Company,Regnskapsåret selskapet
@@ -559,7 +535,7 @@
 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.","Da reglene for prissetting filtreres ut basert på Kunden, Kundens Group, Territory, leverandør, leverandør Type, Kampanje, Sales Partner etc."
 apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.py +179,Please install dropbox python module,Vennligst installer dropbox python modul
 DocType: Employee,Passport Number,Passnummer
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +82,Manager,Manager
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Manager,Manager
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +494,From Purchase Receipt,Fra Kjøpskvittering
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +219,Same item has been entered multiple times.,Samme elementet er angitt flere ganger.
 DocType: SMS Settings,Receiver Parameter,Mottaker Parameter
@@ -567,10 +543,9 @@
 DocType: Sales Person,Sales Person Targets,Sales Person Targets
 apps/frappe/frappe/public/js/frappe/form/workflow.js +116,To,Til
 apps/frappe/frappe/templates/base.html +145,Please enter email address,Skriv inn e-postadresse
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +35,End tube forming,End rør forming
 DocType: Production Order Operation,In minutes,I løpet av minutter
 DocType: Issue,Resolution Date,Oppløsning Dato
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +635,Please set default Cash or Bank account in Mode of Payment {0},Vennligst angi standard kontanter eller bankkontoen i modus for betaling {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +637,Please set default Cash or Bank account in Mode of Payment {0},Vennligst angi standard kontanter eller bankkontoen i modus for betaling {0}
 DocType: Selling Settings,Customer Naming By,Kunden Naming Av
 apps/erpnext/erpnext/accounts/doctype/account/account.js +67,Convert to Group,Konverter til konsernet
 DocType: Activity Cost,Activity Type,Aktivitetstype
@@ -578,12 +553,12 @@
 DocType: Customer,Fixed Days,Faste Days
 DocType: Sales Invoice,Packing List,Pakkeliste
 apps/erpnext/erpnext/config/buying.py +28,Purchase Orders given to Suppliers.,Innkjøpsordrer gis til leverandører.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +43,Publishing,Publisering
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +43,Publishing,Publisering
 DocType: Activity Cost,Projects User,Prosjekter User
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Consumed,Forbrukes
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +198,{0}: {1} not found in Invoice Details table,{0}: {1} ble ikke funnet i Fakturadetaljer tabellen
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,{0}: {1} not found in Invoice Details table,{0}: {1} ble ikke funnet i Fakturadetaljer tabellen
 DocType: Company,Round Off Cost Center,Rund av kostnadssted
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +208,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Vedlikehold Besøk {0} må avbestilles før den avbryter denne salgsordre
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +203,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Vedlikehold Besøk {0} må avbestilles før den avbryter denne salgsordre
 DocType: Material Request,Material Transfer,Material Transfer
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +56,Opening (Dr),Åpning (Dr)
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},Oppslaget tidsstempel må være etter {0}
@@ -595,7 +570,6 @@
 DocType: Pricing Rule,Sales Manager,Salgssjef
 apps/frappe/frappe/public/js/frappe/model/model.js +492,Rename,Gi nytt navn
 DocType: Journal Entry,Write Off Amount,Skriv Off Beløp
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +52,Bending,Bøye
 apps/frappe/frappe/core/page/user_permissions/user_permissions.js +246,Allow User,Tillat User
 DocType: Journal Entry,Bill No,Bill Nei
 DocType: Purchase Invoice,Quarterly,Quarterly
@@ -605,17 +579,16 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Please enter item details,Skriv inn elementdetaljer
 DocType: Purchase Receipt,Other Details,Andre detaljer
 DocType: Account,Accounts,Kontoer
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +67,Marketing,Markedsføring
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +65,Straight shearing,Rett klipping
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +67,Marketing,Markedsføring
 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.,Å spore element i salgs- og kjøpsdokumenter basert på deres serie nos. Dette er kan også brukes til å spore detaljer om produktet garanti.
 DocType: Purchase Receipt Item Supplied,Current Stock,Nåværende Stock
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +99,Rejected Warehouse is mandatory against regected item,Avvist Warehouse er obligatorisk mot regected element
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +102,Rejected Warehouse is mandatory against regected item,Avvist Warehouse er obligatorisk mot regected element
 DocType: Account,Expenses Included In Valuation,Kostnader som inngår i verdivurderings
 DocType: Employee,Provide email id registered in company,Gi e-id registrert i selskap
 DocType: Hub Settings,Seller City,Selger by
 DocType: Email Digest,Next email will be sent on:,Neste post vil bli sendt på:
 DocType: Offer Letter Term,Offer Letter Term,Tilby Letter Term
-apps/erpnext/erpnext/stock/doctype/item/item.py +492,Item has variants.,Elementet har varianter.
+apps/erpnext/erpnext/stock/doctype/item/item.py +496,Item has variants.,Elementet har varianter.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Element {0} ikke funnet
 DocType: Bin,Stock Value,Stock Verdi
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,Tre Type
@@ -624,10 +597,9 @@
 DocType: Material Request Item,Quantity and Warehouse,Kvantitet og Warehouse
 DocType: Sales Invoice,Commission Rate (%),Kommisjonen Rate (%)
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +172,"Against Voucher Type must be one of Sales Order, Sales Invoice or Journal Entry","Mot Voucher Type må være en av salgsordre, salgsfaktura eller bilagsregistrering"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +139,Biomachining,Biomachining
 apps/erpnext/erpnext/setup/utils.py +89,Unable to find exchange rate,Å finne valutakursen klarer
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +7,Aerospace,Aerospace
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +19,Welcome,Velkommen
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +7,Aerospace,Aerospace
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +40,Welcome,Velkommen
 DocType: Journal Entry,Credit Card Entry,Kredittkort Entry
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +18,Task Subject,Task Subject
 apps/erpnext/erpnext/config/stock.py +33,Goods received from Suppliers.,Mottatte varer fra leverandører.
@@ -650,19 +622,19 @@
 DocType: Employee,Cell Number,Cell Number
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Mistet
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +120,You can not enter current voucher in 'Against Journal Entry' column,Du kan ikke legge inn dagens kupong i &quot;Against Journal Entry-kolonnen
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +25,Energy,Energy
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,Energy
 DocType: Opportunity,Opportunity From,Opportunity Fra
 apps/erpnext/erpnext/config/hr.py +33,Monthly salary statement.,Månedslønn uttalelse.
 DocType: Item Group,Website Specifications,Nettstedet Spesifikasjoner
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +205,New Account,Ny Konto
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +21,{0}: From {0} of type {1},{0}: Fra {0} av typen {1}
-apps/erpnext/erpnext/controllers/buying_controller.py +283,Row {0}: Conversion Factor is mandatory,Rad {0}: Omregningsfaktor er obligatorisk
+apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,Rad {0}: Omregningsfaktor er obligatorisk
 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.,Regnskaps Oppføringer kan gjøres mot bladnoder. Føringer mot grupper er ikke tillatt.
 DocType: ToDo,High,Høy
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +361,Cannot deactivate or cancel BOM as it is linked with other BOMs,Kan ikke deaktivere eller kansellere BOM som det er forbundet med andre stykklister
 DocType: Opportunity,Maintenance,Vedlikehold
 DocType: User,Male,Mann
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +182,Purchase Receipt number required for Item {0},Kvitteringen antall som kreves for Element {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +183,Purchase Receipt number required for Item {0},Kvitteringen antall som kreves for Element {0}
 DocType: Item Attribute Value,Item Attribute Value,Sak data Verdi
 apps/erpnext/erpnext/config/crm.py +64,Sales campaigns.,Salgskampanjer.
 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.
@@ -691,10 +663,9 @@
 DocType: Address,Personal,Personlig
 DocType: Expense Claim Detail,Expense Claim Type,Expense krav Type
 DocType: Shopping Cart Settings,Default settings for Shopping Cart,Standardinnstillingene for handlekurv
-apps/erpnext/erpnext/controllers/accounts_controller.py +324,"Journal Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Journal Entry {0} er knyttet mot Bestill {1}, sjekk om det bør trekkes som forskudd i denne fakturaen."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +13,Biotechnology,Bioteknologi
+apps/erpnext/erpnext/controllers/accounts_controller.py +325,"Journal Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Journal Entry {0} er knyttet mot Bestill {1}, sjekk om det bør trekkes som forskudd i denne fakturaen."
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +13,Biotechnology,Bioteknologi
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Office Maintenance Expenses,Kontor Vedlikehold Utgifter
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +53,Hemming,Hemming
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +66,Please enter Item first,Skriv inn Sak først
 DocType: Account,Liability,Ansvar
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +62,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Sanksjonert Beløpet kan ikke være større enn krav Beløp i Rad {0}.
@@ -707,10 +678,10 @@
 DocType: Company,Default Bank Account,Standard Bank Account
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +47,"To filter based on Party, select Party Type first","Hvis du vil filtrere basert på partiet, velger partiet Skriv inn først"
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},&#39;Oppdater Stock&#39; kan ikke kontrolleres fordi elementene ikke er levert via {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Nos,Nos
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Nos,Nos
 DocType: Item,Items with higher weightage will be shown higher,Elementer med høyere weightage vil bli vist høyere
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Bankavstemming Detalj
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +627,My Invoices,Mine Fakturaer
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +629,My Invoices,Mine Fakturaer
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,Ingen ansatte funnet
 DocType: Purchase Order,Stopped,Stoppet
 DocType: Item,If subcontracted to a vendor,Dersom underleverandør til en leverandør
@@ -729,35 +700,33 @@
 DocType: Features Setup,"To enable ""Point of Sale"" features",For å aktivere &quot;Point of Sale&quot; funksjoner
 DocType: Bin,Moving Average Rate,Moving Gjennomsnittlig pris
 DocType: Production Planning Tool,Select Items,Velg Items
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,{0} against Bill {1} dated {2},{0} mot Bill {1} ​​datert {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +328,{0} against Bill {1} dated {2},{0} mot Bill {1} ​​datert {2}
 DocType: Comment,Reference Name,Referanse Name
 DocType: Maintenance Visit,Completion Status,Completion Status
 DocType: Sales Invoice Item,Target Warehouse,Target Warehouse
 DocType: Item,Allow over delivery or receipt upto this percent,Tillat løpet levering eller mottak opp denne prosent
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +49,Expected Delivery Date cannot be before Sales Order Date,Forventet Leveringsdato kan ikke være før Salgsordre Dato
 DocType: Upload Attendance,Import Attendance,Import Oppmøte
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +17,All Item Groups,Alle varegrupper
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +17,All Item Groups,Alle varegrupper
 DocType: Process Payroll,Activity Log,Aktivitetsloggen
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +30,Net Profit / Loss,Netto gevinst / tap
 apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,Skriv melding automatisk ved innlevering av transaksjoner.
 DocType: Production Order,Item To Manufacture,Element for å produsere
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +16,Permanent mold casting,Permanent mold casting
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} status er {2}
 apps/erpnext/erpnext/config/learn.py +172,Purchase Order to Payment,Bestilling til betaling
 DocType: Sales Order Item,Projected Qty,Anslått Antall
 DocType: Sales Invoice,Payment Due Date,Betalingsfrist
 DocType: Newsletter,Newsletter Manager,Nyhetsbrev manager
-apps/erpnext/erpnext/stock/doctype/item/item.js +229,Item Variant {0} already exists with same attributes,Sak Variant {0} finnes allerede med samme attributtene
+apps/erpnext/erpnext/stock/doctype/item/item.js +231,Item Variant {0} already exists with same attributes,Sak Variant {0} finnes allerede med samme attributtene
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening',&quot;Opening&quot;
 DocType: Notification Control,Delivery Note Message,Levering Note Message
 DocType: Expense Claim,Expenses,Utgifter
 DocType: Item Variant Attribute,Item Variant Attribute,Sak Variant Egenskap
 ,Purchase Receipt Trends,Kvitteringen Trender
 DocType: Appraisal,Select template from which you want to get the Goals,Velg mal som du ønsker å få de målene
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +77,Research & Development,Forskning Og Utvikling
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Research & Development,Forskning Og Utvikling
 ,Amount to Bill,Beløp til Bill
 DocType: Company,Registration Details,Registrering Detaljer
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +75,Staking,Staking
 DocType: Item,Re-Order Qty,Re-Order Antall
 DocType: Leave Block List Date,Leave Block List Date,La Block List Dato
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +25,Scheduled to send to {0},Planlagt å sende til {0}
@@ -768,18 +737,16 @@
 DocType: Sales Invoice Item,Stock Details,Stock Detaljer
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Prosjektet Verdi
 apps/erpnext/erpnext/config/selling.py +304,Point-of-Sale,Utsalgssted
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,Cannot carry forward {0},Kan ikke bære frem {0}
 apps/erpnext/erpnext/accounts/doctype/account/account.py +91,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","Saldo allerede i Credit, har du ikke lov til å sette &quot;Balance må være &#39;som&#39; debet &#39;"
 DocType: Account,Balance must be,Balansen må være
 DocType: Hub Settings,Publish Pricing,Publiser Priser
 DocType: Notification Control,Expense Claim Rejected Message,Expense krav Avvist Message
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +145,Nailing,Spikring
 ,Available Qty,Tilgjengelig Antall
 DocType: Purchase Taxes and Charges,On Previous Row Total,På Forrige Row Total
 DocType: Salary Slip,Working Days,Arbeidsdager
 DocType: Serial No,Incoming Rate,Innkommende Rate
 DocType: Packing Slip,Gross Weight,Bruttovekt
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +410,The name of your company for which you are setting up this system.,Navnet på firmaet som du setter opp dette systemet.
+apps/erpnext/erpnext/public/js/setup_wizard.js +158,The name of your company for which you are setting up this system.,Navnet på firmaet som du setter opp dette systemet.
 DocType: HR Settings,Include holidays in Total no. of Working Days,Inkluder ferier i Total no. arbeidsdager
 DocType: Job Applicant,Hold,Hold
 DocType: Employee,Date of Joining,Dato for Delta
@@ -789,7 +756,6 @@
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +3,View Subscribers,Se Abonnenter
 DocType: Purchase Invoice Item,Purchase Receipt,Kvitteringen
 ,Received Items To Be Billed,Mottatte elementer å bli fakturert
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +114,Abrasive blasting,Sandblåsing
 DocType: Employee,Ms,Ms
 apps/erpnext/erpnext/config/accounts.py +148,Currency exchange rate master.,Valutakursen mester.
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +253,Unable to find Time Slot in the next {0} days for Operation {1},Å finne tidsluke i de neste {0} dager for Operation klarer {1}
@@ -801,7 +767,7 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +209,Serial No {0} does not belong to Item {1},Serial No {0} tilhører ikke Element {1}
 DocType: Purchase Receipt Item Supplied,Required Qty,Påkrevd antall
 DocType: Bank Reconciliation,Total Amount,Totalbeløp
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +32,Internet Publishing,Internett Publisering
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,Internett Publisering
 DocType: Production Planning Tool,Production Orders,Produksjonsordrer
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +35,Balance Value,Balanse Verdi
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,Salg Prisliste
@@ -812,7 +778,7 @@
 DocType: Supplier,Default Payable Accounts,Standard Leverandørgjeld
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,Ansatt {0} er ikke aktiv eller ikke eksisterer
 DocType: Features Setup,Item Barcode,Sak Barcode
-apps/erpnext/erpnext/stock/doctype/item/item.py +487,Item Variants {0} updated,Sak Varianter {0} oppdatert
+apps/erpnext/erpnext/stock/doctype/item/item.py +491,Item Variants {0} updated,Sak Varianter {0} oppdatert
 DocType: Quality Inspection Reading,Reading 6,Reading 6
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Fakturaen Advance
 DocType: Address,Shop,Butikk
@@ -821,7 +787,7 @@
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,Standard Bank / minibank konto vil automatisk bli oppdatert i POS faktura når denne modusen er valgt.
 DocType: Employee,Permanent Address Is,Permanent Adresse Er
 DocType: Production Order Operation,Operation completed for how many finished goods?,Operasjonen gjennomført for hvor mange ferdigvarer?
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +491,The Brand,The Brand
+apps/erpnext/erpnext/public/js/setup_wizard.js +237,The Brand,The Brand
 apps/erpnext/erpnext/controllers/status_updater.py +163,Allowance for over-{0} crossed for Item {1}.,Fradrag for over- {0} krysset for Element {1}.
 DocType: Employee,Exit Interview Details,Exit Intervju Detaljer
 DocType: Item,Is Purchase Item,Er Purchase Element
@@ -841,16 +807,16 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Indirect Income,Indirekte inntekt
 DocType: Payment Tool,Set Payment Amount = Outstanding Amount,Still Betalingsbeløp = utestående beløp
 DocType: Contact Us Settings,Address Line 1,Adresselinje 1
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Variance,Varians
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +392,Company Name,Selskapsnavn
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +53,Variance,Varians
+,Company Name,Selskapsnavn
 DocType: SMS Center,Total Message(s),Total melding (er)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +515,Select Item for Transfer,Velg elementet for Transfer
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +538,Select Item for Transfer,Velg elementet for Transfer
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,Vis en liste over alle hjelpevideoer
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,Velg kontoen leder av banken der sjekken ble avsatt.
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,Tillater brukeren å redigere Prisliste Rate i transaksjoner
 DocType: Pricing Rule,Max Qty,Max Antall
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +106,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Rad {0}: Betaling mot Salg / innkjøpsordre skal alltid merkes som forskudd
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +16,Chemical,Kjemisk
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,Kjemisk
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +693,All items have already been transferred for this Production Order.,Alle elementene er allerede blitt overført til denne produksjonsordre.
 DocType: Process Payroll,Select Payroll Year and Month,Velg Lønn år og måned
 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""",Gå til den aktuelle gruppen (vanligvis Application of Funds&gt; Omløpsmidler&gt; bankkontoer og opprette en ny konto (ved å klikke på Legg Child) av typen &quot;Bank&quot;
@@ -861,12 +827,12 @@
 DocType: Item,Inspection Criteria,Inspeksjon Kriterier
 apps/erpnext/erpnext/config/accounts.py +101,Tree of finanial Cost Centers.,Tree of finanial Kostnadssteder.
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,Overført
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +492,Upload your letter head and logo. (you can edit them later).,Last opp din brevhode og logo. (Du kan redigere dem senere).
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +156,White,Hvit
+apps/erpnext/erpnext/public/js/setup_wizard.js +238,Upload your letter head and logo. (you can edit them later).,Last opp din brevhode og logo. (Du kan redigere dem senere).
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,White,Hvit
 DocType: SMS Center,All Lead (Open),All Lead (Open)
 DocType: Purchase Invoice,Get Advances Paid,Få utbetalt forskudd
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +362,Attach Your Picture,Fest Your Picture
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Make ,Gjøre
+apps/erpnext/erpnext/public/js/setup_wizard.js +112,Attach Your Picture,Fest Your Picture
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +540,Make ,Gjøre
 DocType: Journal Entry,Total Amount in Words,Totalbeløp i Words
 DocType: Workflow State,Stop,Stoppe
 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.,Det var en feil. En mulig årsak kan være at du ikke har lagret skjemaet. Ta kontakt support@erpnext.com hvis problemet vedvarer.
@@ -875,14 +841,13 @@
 DocType: Lead,Next Contact Date,Neste Kontakt Dato
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,Antall åpne
 DocType: Holiday List,Holiday List Name,Holiday Listenavn
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +168,Stock Options,Aksjeopsjoner
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +168,Stock Options,Aksjeopsjoner
 DocType: Journal Entry Account,Expense Claim,Expense krav
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +181,Qty for {0},Antall for {0}
 DocType: Leave Application,Leave Application,La Application
 apps/erpnext/erpnext/config/hr.py +77,Leave Allocation Tool,La Allocation Tool
 DocType: Leave Block List,Leave Block List Dates,La Block List Datoer
 DocType: Company,If Monthly Budget Exceeded (for expense account),Hvis Månedlig budsjett Skredet (for regning)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +56,Trimming,Trimming
 DocType: Workstation,Net Hour Rate,Netto timepris
 DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,Landed Cost Kjøpskvittering
 DocType: Company,Default Terms,Standard Terms
@@ -890,10 +855,9 @@
 DocType: POS Profile,Cash/Bank Account,Cash / Bank Account
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,Removed items with no change in quantity or value.,Fjernet elementer med ingen endring i mengde eller verdi.
 DocType: Delivery Note,Delivery To,Levering Å
-apps/erpnext/erpnext/stock/doctype/item/item.py +509,Attribute table is mandatory,Attributt tabellen er obligatorisk
+apps/erpnext/erpnext/stock/doctype/item/item.py +513,Attribute table is mandatory,Attributt tabellen er obligatorisk
 DocType: Production Planning Tool,Get Sales Orders,Få salgsordrer
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} kan ikke være negativ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +103,Filing,Filing
 apps/erpnext/erpnext/templates/form_grid/item_grid.html +72,Discount,Rabatt
 DocType: Features Setup,Purchase Discounts,Kjøps Rabatter
 DocType: Workstation,Wages,Lønn
@@ -910,6 +874,7 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +112,You are the Expense Approver for this record. Please Update the 'Status' and Save,Du er den Expense Godkjenner denne posten. Oppdater &quot;Status&quot; og Lagre
 DocType: Serial No,Creation Document No,Creation Dokument nr
 DocType: Issue,Issue,Problem
+apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account does not match with Company,Kontoen samsvarer ikke med selskapet
 apps/erpnext/erpnext/config/stock.py +136,"Attributes for Item Variants. e.g Size, Color etc.","Attributter for varen Varianter. f.eks størrelse, farge etc."
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +39,WIP Warehouse,WIP Warehouse
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +194,Serial No {0} is under maintenance contract upto {1},Serial No {0} er under vedlikeholdskontrakt opp {1}
@@ -918,7 +883,7 @@
 DocType: Tax Rule,Shipping State,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,Elementet må legges til med &quot;Get Elementer fra innkjøps Receipts &#39;knappen
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,Salgs Utgifter
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Buying,Standard Kjøpe
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +120,Standard Buying,Standard Kjøpe
 DocType: GL Entry,Against,Against
 DocType: Item,Default Selling Cost Center,Standard Selling kostnadssted
 DocType: Sales Partner,Implementation Partner,Gjennomføring Partner
@@ -939,29 +904,29 @@
 DocType: Time Log Batch,updated via Time Logs,oppdatert via Tid Logger
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,Gjennomsnittsalder
 DocType: Opportunity,Your sales person who will contact the customer in future,Din selger som vil ta kontakt med kunden i fremtiden
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +588,List a few of your suppliers. They could be organizations or individuals.,Liste noen av dine leverandører. De kan være organisasjoner eller enkeltpersoner.
+apps/erpnext/erpnext/public/js/setup_wizard.js +326,List a few of your suppliers. They could be organizations or individuals.,Liste noen av dine leverandører. De kan være organisasjoner eller enkeltpersoner.
 DocType: Company,Default Currency,Standard Valuta
 DocType: Contact,Enter designation of this Contact,Angi utpeking av denne kontakten
 DocType: Contact Us Settings,Address,Adresse
 DocType: Expense Claim,From Employee,Fra Employee
-apps/erpnext/erpnext/controllers/accounts_controller.py +338,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Advarsel: System vil ikke sjekke billing siden beløpet for varen {0} i {1} er null
+apps/erpnext/erpnext/controllers/accounts_controller.py +339,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Advarsel: System vil ikke sjekke billing siden beløpet for varen {0} i {1} er null
 DocType: Journal Entry,Make Difference Entry,Gjør forskjell Entry
 DocType: Upload Attendance,Attendance From Date,Oppmøte Fra dato
 DocType: Appraisal Template Goal,Key Performance Area,Key Performance-området
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +54,Transportation,Transport
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +54,Transportation,Transport
 apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +67, and year: ,og år:
 DocType: Email Digest,Annual Expense,Årlig Expense
 DocType: SMS Center,Total Characters,Totalt tegn
-apps/erpnext/erpnext/controllers/buying_controller.py +139,Please select BOM in BOM field for Item {0},Vennligst velg BOM i BOM felt for Element {0}
+apps/erpnext/erpnext/controllers/buying_controller.py +130,Please select BOM in BOM field for Item {0},Vennligst velg BOM i BOM felt for Element {0}
 DocType: C-Form Invoice Detail,C-Form Invoice Detail,C-Form Faktura Detalj
 DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,Betaling Avstemming Faktura
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +32,Contribution %,Bidrag%
 DocType: Item,website page link,nettside lenke
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +192,Let's prepare the system for first use.,La oss klargjøre systemet for første gangs bruk.
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +242,Let's prepare the system for first use.,La oss klargjøre systemet for første gangs bruk.
 DocType: Company,Company registration numbers for your reference. Tax numbers etc.,Firmaregistreringsnumre som referanse. Skatte tall osv
 DocType: Sales Partner,Distributor,Distributør
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Handlevogn Shipping Rule
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +214,Production Order {0} must be cancelled before cancelling this Sales Order,Produksjonsordre {0} må avbestilles før den avbryter denne salgsordre
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +209,Production Order {0} must be cancelled before cancelling this Sales Order,Produksjonsordre {0} må avbestilles før den avbryter denne salgsordre
 ,Ordered Items To Be Billed,Bestilte varer til å bli fakturert
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +24,From Range has to be less than To Range,Fra Range må være mindre enn til kolleksjonen
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +21,Select Time Logs and Submit to create a new Sales Invoice.,Velg Tid Logger og Send for å opprette en ny salgsfaktura.
@@ -981,14 +946,13 @@
 DocType: Sales Invoice Advance,Sales Invoice Advance,Salg Faktura Advance
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +398,Nothing to request,Ingenting å be om
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date',&#39;Faktisk startdato&#39; ikke kan være større enn &quot;Actual End Date &#39;
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +75,Management,Ledelse
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +75,Management,Ledelse
 apps/erpnext/erpnext/config/projects.py +33,Types of activities for Time Sheets,Typer aktiviteter for timelister
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +14,Investment casting,Investeringen casting
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +51,Either debit or credit amount is required for {0},Enten debet- eller kredittbeløpet er nødvendig for {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""","Dette vil bli lagt til Element Code of varianten. For eksempel, hvis din forkortelsen er &quot;SM&quot;, og elementet kode er &quot;T-SHIRT&quot;, elementet koden til variant vil være &quot;T-SHIRT-SM&quot;"
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,Nettolønn (i ord) vil være synlig når du lagrer Lønn Slip.
 apps/frappe/frappe/core/doctype/user/user_list.js +12,Active,Aktiv
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +154,Blue,Blå
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +154,Blue,Blå
 DocType: Purchase Invoice,Is Return,Er Return
 DocType: Price List Country,Price List Country,Prisliste Land
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +123,Further nodes can be only created under 'Group' type nodes,Ytterligere noder kan bare skapt under &#39;Gruppe&#39; type noder
@@ -998,18 +962,16 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +22,POS Profile {0} already created for user: {1} and company {2},POS profil {0} allerede opprettet for user: {1} og selskapet {2}
 DocType: Purchase Order Item,UOM Conversion Factor,Målenheter Omregningsfaktor
 DocType: Stock Settings,Default Item Group,Standard varegruppe
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +156,Laminated object manufacturing,Laminert objekt produksjon
 apps/erpnext/erpnext/config/buying.py +13,Supplier database.,Leverandør database.
 DocType: Account,Balance Sheet,Balanse
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +561,Cost Center For Item with Item Code ',Koste Center For Element med Element kode &#39;
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +45,Stretch forming,Stretch forming
 DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,Din selger vil få en påminnelse på denne datoen for å kontakte kunden
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +210,"Further accounts can be made under Groups, but entries can be made against non-Groups","Ytterligere kontoer kan gjøres under grupper, men oppføringene kan gjøres mot ikke-grupper"
 apps/erpnext/erpnext/config/hr.py +125,Tax and other salary deductions.,Skatt og andre lønnstrekk.
 DocType: Lead,Lead,Lead
 DocType: Email Digest,Payables,Gjeld
 DocType: Account,Warehouse,Warehouse
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +90,Row #{0}: Rejected Qty can not be entered in Purchase Return,Row # {0}: Avvist Antall kan ikke legges inn i innkjøpsliste
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +93,Row #{0}: Rejected Qty can not be entered in Purchase Return,Row # {0}: Avvist Antall kan ikke legges inn i innkjøpsliste
 ,Purchase Order Items To Be Billed,Purchase Order Elementer som skal faktureres
 DocType: Purchase Invoice Item,Net Rate,Net Rate
 DocType: Purchase Invoice Item,Purchase Invoice Item,Fakturaen Element
@@ -1024,13 +986,13 @@
 DocType: Global Defaults,Current Fiscal Year,Værende regnskapsår
 DocType: Global Defaults,Disable Rounded Total,Deaktiver Avrundet Total
 DocType: Lead,Call,Call
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +384,'Entries' cannot be empty,&#39;Innlegg&#39; kan ikke være tomt
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +386,'Entries' cannot be empty,&#39;Innlegg&#39; kan ikke være tomt
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},Duplicate rad {0} med samme {1}
 ,Trial Balance,Balanse Trial
 apps/erpnext/erpnext/config/hr.py +205,Setting up Employees,Sette opp ansatte
 apps/erpnext/erpnext/public/js/feature_setup.js +220,"Grid """,Grid &quot;
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +150,Please select prefix first,Vennligst velg først prefiks
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +138,Research,Forskning
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +138,Research,Forskning
 DocType: Maintenance Visit Purpose,Work Done,Arbeidet Som Er Gjort
 apps/erpnext/erpnext/controllers/item_variant.py +25,Please specify at least one attribute in the Attributes table,Vennligst oppgi minst ett attributt i Attributter tabellen
 DocType: Contact,User ID,Bruker-ID
@@ -1038,10 +1000,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +57,View Ledger,Vis Ledger
 DocType: File,Lft,LFT
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Tidligste
-apps/erpnext/erpnext/stock/doctype/item/item.py +394,"An Item Group exists with same name, please change the item name or rename the item group","En varegruppe eksisterer med samme navn, må du endre elementnavnet eller endre navn varegruppen"
+apps/erpnext/erpnext/stock/doctype/item/item.py +398,"An Item Group exists with same name, please change the item name or rename the item group","En varegruppe eksisterer med samme navn, må du endre elementnavnet eller endre navn varegruppen"
 DocType: Communication,Delivery Status,Levering Status
 DocType: Production Order,Manufacture against Sales Order,Produserer mot kundeordre
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +517,Rest Of The World,Resten Av Verden
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +455,Rest Of The World,Resten Av Verden
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,Element {0} kan ikke ha Batch
 ,Budget Variance Report,Budsjett Avvik Rapporter
 DocType: Salary Slip,Gross Pay,Brutto Lønn
@@ -1052,13 +1014,11 @@
 DocType: BOM Item,Item Description,Element Beskrivelse
 DocType: Payment Tool,Payment Mode,Betaling Mode
 DocType: Purchase Invoice,Is Recurring,Er Recurring
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +154,Direct metal laser sintering,Direkte metall laser sintring
 DocType: Purchase Order,Supplied Items,Leveringen
 DocType: Production Order,Qty To Manufacture,Antall å produsere
 DocType: Buying Settings,Maintain same rate throughout purchase cycle,Opprettholde samme tempo gjennom hele kjøpssyklusen
 DocType: Opportunity Item,Opportunity Item,Opportunity Element
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +61,Temporary Opening,Midlertidig Åpning
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +41,Cryorolling,Cryorolling
 ,Employee Leave Balance,Ansatt La Balance
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +128,Balance for Account {0} must always be {1},Balanse for konto {0} må alltid være {1}
 DocType: Address,Address Type,Adressetype
@@ -1074,23 +1034,23 @@
 DocType: Journal Entry,Get Outstanding Invoices,Få utestående fakturaer
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,Salgsordre {0} er ikke gyldig
 apps/erpnext/erpnext/setup/doctype/company/company.py +172,"Sorry, companies cannot be merged","Sorry, kan selskapene ikke fusjoneres"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +145,Small,Liten
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Small,Liten
 DocType: Employee,Employee Number,Ansatt Number
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},Tilfellet Nei (e) allerede er i bruk. Prøv fra sak nr {0}
 ,Invoiced Amount (Exculsive Tax),Fakturert beløp (exculsive Tax)
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,Sak 2
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +59,Account head {0} created,Konto hodet {0} opprettet
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +153,Green,Grønn
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Green,Grønn
 DocType: Item,Auto re-order,Auto re-order
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +57,Total Achieved,Oppnådd Total
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +59,Total Achieved,Oppnådd Total
 DocType: Employee,Place of Issue,Utstedelsessted
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +59,Contract,Kontrakts
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Contract,Kontrakts
 DocType: Report,Disabled,Funksjonshemmede
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +490,UOM coversion factor required for UOM: {0} in Item: {1},Målenheter coversion faktor nødvendig for målenheter: {0} i Sak: {1}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +83,Indirect Expenses,Indirekte kostnader
 apps/erpnext/erpnext/controllers/selling_controller.py +163,Row {0}: Qty is mandatory,Rad {0}: Antall er obligatorisk
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +8,Agriculture,Landbruk
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +611,Your Products or Services,Dine produkter eller tjenester
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,Landbruk
+apps/erpnext/erpnext/public/js/setup_wizard.js +347,Your Products or Services,Dine produkter eller tjenester
 DocType: Mode of Payment,Mode of Payment,Modus for betaling
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,Dette er en rot varegruppe og kan ikke redigeres.
 DocType: Journal Entry Account,Purchase Order,Bestilling
@@ -1102,7 +1062,7 @@
 DocType: Serial No,Serial No Details,Serie ingen opplysninger
 DocType: Purchase Invoice Item,Item Tax Rate,Sak Skattesats
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +113,"For {0}, only credit accounts can be linked against another debit entry",For {0} kan bare kredittkontoer kobles mot en annen belastning oppføring
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Delivery Note {0} is not submitted,Levering Note {0} er ikke innsendt
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +470,Delivery Note {0} is not submitted,Levering Note {0} er ikke innsendt
 apps/erpnext/erpnext/stock/get_item_details.py +136,Item {0} must be a Sub-contracted Item,Elementet {0} må være en underleverandør Element
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,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.","Prising Rule først valgt basert på &quot;Apply On-feltet, som kan være varen, varegruppe eller Brand."
@@ -1112,7 +1072,7 @@
 DocType: Appraisal Goal,Goal,Mål
 DocType: Sales Invoice Item,Edit Description,Rediger Beskrivelse
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +318,Expected Delivery Date is lesser than Planned Start Date.,Forventet Leveringsdato er mindre enn planlagt startdato.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +579,For Supplier,For Leverandør
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +602,For Supplier,For Leverandør
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,Stille Kontotype hjelper i å velge denne kontoen i transaksjoner.
 DocType: Purchase Invoice,Grand Total (Company Currency),Grand Total (Selskap Valuta)
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,Total Utgående
@@ -1138,10 +1098,10 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +74,"Total {0} for all items is zero, may you should change 'Distribute Charges Based On'","Total {0} for alle elementer er null, kan det hende du bør endre &#39;Fordel Avgifter basert på &quot;"
 DocType: Purchase Invoice,Taxes and Charges Calculation,Skatter og avgifter Beregning
 DocType: BOM Operation,Workstation,Arbeidsstasjon
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +112,Hardware,Hardware
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +112,Hardware,Hardware
 DocType: Attendance,HR Manager,HR Manager
 apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,Vennligst velg et selskap
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +50,Privilege Leave,Privilege La
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +50,Privilege Leave,Privilege La
 DocType: Purchase Invoice,Supplier Invoice Date,Leverandør Fakturadato
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +79,You need to enable Shopping Cart,Du må aktivere Handlevogn
 apps/frappe/frappe/public/js/frappe/form/grid_body.html +6,No Data,Ingen Data
@@ -1154,7 +1114,7 @@
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +81,Overlapping conditions found between:,Overlappende vilkår funnet mellom:
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +168,Against Journal Entry {0} is already adjusted against some other voucher,Mot Journal Entry {0} er allerede justert mot en annen kupong
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +68,Total Order Value,Total ordreverdi
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +38,Food,Mat
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +38,Food,Mat
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Aldring Range 3
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +139,You can make a time log only against a submitted production order,Du kan lage en tidslogg bare mot en innsendt produksjonsordre
 DocType: Maintenance Schedule Item,No of Visits,Ingen av besøk
@@ -1174,6 +1134,7 @@
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,View Offer Letter,Vis tilbud Letter
 DocType: Communication,Communication,Kommunikasjon
 DocType: Item,Is Service Item,Er Tjenesten Element
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +81,Application period cannot be outside leave allocation period,Tegningsperioden kan ikke være utenfor permisjon tildeling periode
 DocType: Activity Cost,Projects,Prosjekter
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +31,Please select Fiscal Year,Vennligst velg regnskapsår
 apps/erpnext/erpnext/controllers/buying_controller.py +23,From {0} | {1} {2},Fra {0} | {1} {2}
@@ -1192,7 +1153,7 @@
 DocType: Item,Maintain Stock,Oppretthold Stock
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +213,Stock Entries already created for Production Order ,Arkiv Innlegg allerede opprettet for produksjonsordre
 DocType: Leave Control Panel,Leave blank if considered for all designations,La stå tom hvis vurderes for alle betegnelser
-apps/erpnext/erpnext/controllers/accounts_controller.py +499,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Charge of type &#39;Actual&#39; i rad {0} kan ikke inkluderes i Element Ranger
+apps/erpnext/erpnext/controllers/accounts_controller.py +500,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Charge of type &#39;Actual&#39; i rad {0} kan ikke inkluderes i Element Ranger
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,Max: {0},Max: {0}
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +16,From Datetime,Fra Datetime
 DocType: Email Digest,For Company,For selskapet
@@ -1202,7 +1163,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +50,Chart of Accounts,Konto
 DocType: Material Request,Terms and Conditions Content,Betingelser innhold
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +471,cannot be greater than 100,kan ikke være større enn 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +546,Item {0} is not a stock Item,Element {0} er ikke en lagervare
+apps/erpnext/erpnext/stock/doctype/item/item.py +550,Item {0} is not a stock Item,Element {0} er ikke en lagervare
 DocType: Maintenance Visit,Unscheduled,Ikke planlagt
 DocType: Employee,Owned,Eies
 DocType: Salary Slip Deduction,Depends on Leave Without Pay,Avhenger La Uten Pay
@@ -1216,30 +1177,28 @@
 DocType: HR Settings,Employee Settings,Medarbeider Innstillinger
 ,Batch-Wise Balance History,Batch-Wise Balance Historie
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +72,To Do List,Gjøremålsliste
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +63,Apprentice,Lærling
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Apprentice,Lærling
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +99,Negative Quantity is not allowed,Negative Antall er ikke tillatt
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
 Used for Taxes and Charges","Tax detalj tabell hentet fra elementet Hoved som en streng, og som er lagret på dette feltet. Brukes for skatter og avgifter"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +61,Lancing,Lancing
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +151,Employee cannot report to himself.,Arbeidstaker kan ikke rapportere til seg selv.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Hvis kontoen er fryst, er oppføringer lov til begrensede brukere."
 DocType: Email Digest,Bank Balance,Bank Balanse
-apps/erpnext/erpnext/controllers/accounts_controller.py +435,Accounting Entry for {0}: {1} can only be made in currency: {2},Regnskap Entry for {0}: {1} kan bare gjøres i valuta: {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +436,Accounting Entry for {0}: {1} can only be made in currency: {2},Regnskap Entry for {0}: {1} kan bare gjøres i valuta: {2}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +38,No active Salary Structure found for employee {0} and the month,Ingen aktive Lønn Struktur funnet for arbeidstaker {0} og måneden
 DocType: Job Opening,"Job profile, qualifications required etc.","Jobb profil, kvalifikasjoner som kreves etc."
 DocType: Journal Entry Account,Account Balance,Saldo
 apps/erpnext/erpnext/config/accounts.py +112,Tax Rule for transactions.,Skatteregel for transaksjoner.
 DocType: Rename Tool,Type of document to rename.,Type dokument for å endre navn.
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +630,We buy this Item,Vi kjøper denne varen
+apps/erpnext/erpnext/public/js/setup_wizard.js +366,We buy this Item,Vi kjøper denne varen
 DocType: Address,Billing,Billing
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +77,Flanging,Flensing
 DocType: Bulk Email,Not Sent,Ikke sendt
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +73,Explosive forming,Eksplosiv forming
 DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),Totale skatter og avgifter (Selskapet valuta)
 DocType: Shipping Rule,Shipping Account,Shipping konto
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +43,Scheduled to send to {0} recipients,Planlagt å sende til {0} mottakere
 DocType: Quality Inspection,Readings,Readings
 DocType: Stock Entry,Total Additional Costs,Samlede merkostnader
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Sub Assemblies,Sub Assemblies
+apps/erpnext/erpnext/public/js/setup_wizard.js +359,Sub Assemblies,Sub Assemblies
 DocType: Shipping Rule Condition,To Value,I Value
 DocType: Supplier,Stock Manager,Stock manager
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +143,Source warehouse is mandatory for row {0},Kilde lageret er obligatorisk for rad {0}
@@ -1249,44 +1208,42 @@
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Import mislyktes!
 apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,Ingen adresse er lagt til ennå.
 DocType: Workstation Working Hour,Workstation Working Hour,Arbeidsstasjon Working Hour
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +83,Analyst,Analytiker
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +202,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Rad {0}: Nummerert mengden {1} må være mindre enn eller lik JV mengden {2}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Analyst,Analytiker
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +149,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Rad {0}: Nummerert mengden {1} må være mindre enn eller lik JV mengden {2}
 DocType: Item,Inventory,Inventar
 DocType: Features Setup,"To enable ""Point of Sale"" view",For å aktivere &quot;Point of Sale&quot; view
 apps/erpnext/erpnext/public/js/pos/pos.js +402,Payment cannot be made for empty cart,Betaling kan ikke gjøres for tom handlevogn
 DocType: Item,Sales Details,Salgs Detaljer
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +149,Pinning,Låsing
 DocType: Opportunity,With Items,Med Items
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,I Antall
 DocType: Notification Control,Expense Claim Rejected,Expense krav Avvist
 DocType: Sales Invoice,"The date on which next invoice will be generated. It is generated on submit.
 ",Datoen da neste faktura vil bli generert. Det genereres på send.
 DocType: Item Attribute,Item Attribute,Sak Egenskap
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +105,Government,Regjeringen
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Government,Regjeringen
 apps/erpnext/erpnext/config/stock.py +268,Item Variants,Element Varianter
 DocType: Company,Services,Tjenester
 apps/erpnext/erpnext/accounts/report/financial_statements.py +147,Total ({0}),Total ({0})
 DocType: Cost Center,Parent Cost Center,Parent kostnadssted
 DocType: Sales Invoice,Source,Source
 DocType: Leave Type,Is Leave Without Pay,Er permisjon uten Pay
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +186,No records found in the Payment table,Ingen poster ble funnet i Payment tabellen
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +405,Financial Year Start Date,Regnskapsår Startdato
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +133,No records found in the Payment table,Ingen poster ble funnet i Payment tabellen
+apps/erpnext/erpnext/public/js/setup_wizard.js +153,Financial Year Start Date,Regnskapsår Startdato
 DocType: Employee External Work History,Total Experience,Total Experience
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +100,Countersinking,Enker
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +271,Packing Slip(s) cancelled,Pakking Slip (s) kansellert
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +276,Packing Slip(s) cancelled,Pakking Slip (s) kansellert
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,Spedisjons- og Kostnader
 DocType: Material Request Item,Sales Order No,Salgsordre Nei
 DocType: Item Group,Item Group Name,Sak Gruppenavn
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +50,Taken,Tatt
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,Tatt
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +66,Transfer Materials for Manufacture,Transfer Materialer for produksjon
 DocType: Pricing Rule,For Price List,For Prisliste
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +27,Executive Search,Executive Search
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,Executive Search
 apps/erpnext/erpnext/stock/stock_ledger.py +405,"Purchase rate for item: {0} not found, which is required to book accounting entry (expense). Please mention item price against a buying price list.","Kjøp rate for element: {0} ikke funnet, noe som er nødvendig å bestille regnskap oppføring (regning). Vennligst oppgi vareprisen mot et kjøp prisliste."
 DocType: Maintenance Schedule,Schedules,Rutetider
 DocType: Purchase Invoice Item,Net Amount,Nettobeløp
 DocType: Purchase Order Item Supplied,BOM Detail No,BOM Detail Nei
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),Ekstra rabatt Beløp (Selskap Valuta)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +537,Error: {0} > {1},Feil: {0}&gt; {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +541,Error: {0} > {1},Feil: {0}&gt; {1}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,Opprett ny konto fra kontoplanen.
 DocType: Maintenance Visit,Maintenance Visit,Vedlikehold Visit
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer > Customer Group > Territory,Kunde&gt; Kunde Group&gt; Territory
@@ -1297,7 +1254,6 @@
 DocType: Event,Tuesday,Tirsdag
 DocType: Leave Block List,Block Holidays on important days.,Block Ferie på viktige dager.
 ,Accounts Receivable Summary,Kundefordringer Sammendrag
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +43,Leaves for type {0} already allocated for Employee {1} for period {2} - {3},Later for typen {0} allerede bevilget for Employee {1} for perioden {2} - {3}
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +187,Please set User ID field in an Employee record to set Employee Role,Vennligst angi bruker-ID-feltet i en Employee rekord å sette Employee Rolle
 DocType: UOM,UOM Name,Målenheter Name
 DocType: Top Bar Item,Target,Target
@@ -1309,15 +1265,14 @@
 DocType: ToDo,Due Date,Tidsfrist
 DocType: Sales Invoice Item,Brand Name,Merkenavn
 DocType: Purchase Receipt,Transporter Details,Transporter Detaljer
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Box,Eske
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +389,The Organization,Organisasjonen
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Box,Eske
+apps/erpnext/erpnext/public/js/setup_wizard.js +137,The Organization,Organisasjonen
 DocType: Monthly Distribution,Monthly Distribution,Månedlig Distribution
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,Mottaker-listen er tom. Opprett Receiver Liste
 DocType: Production Plan Sales Order,Production Plan Sales Order,Produksjonsplan Salgsordre
 DocType: Sales Partner,Sales Partner Target,Sales Partner Target
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},Regnskap Entry for {0} kan bare gjøres i valuta: {1}
 DocType: Pricing Rule,Pricing Rule,Prising Rule
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +58,Notching,Innskjæring
 apps/erpnext/erpnext/config/learn.py +167,Material Request to Purchase Order,Materialet Request til innkjøpsordre
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +74,Row # {0}: Returned Item {1} does not exists in {2} {3},Row # {0}: Returned Element {1} ikke eksisterer i {2} {3}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,Bankkontoer
@@ -1334,20 +1289,19 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Amounts not reflected in bank,Beløp ikke reflektert i bank
 DocType: Quality Inspection Reading,Reading 4,Reading 4
 apps/erpnext/erpnext/config/hr.py +23,Claims for company expense.,Krav på bekostning av selskapet.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +8,Centrifugal casting,Sentrifugale støping
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +119,Magnetic field-assisted finishing,Magnetfelt-assistert behandling
 DocType: Company,Default Holiday List,Standard Holiday List
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +165,Stock Liabilities,Aksje Gjeld
 DocType: Purchase Receipt,Supplier Warehouse,Leverandør Warehouse
 DocType: Opportunity,Contact Mobile No,Kontakt Mobile No
 DocType: Production Planning Tool,Select Sales Orders,Velg salgsordrer
 ,Material Requests for which Supplier Quotations are not created,Materielle Forespørsler som Leverandør Sitater ikke er opprettet
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +117,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,Dagen (e) der du søker om permisjon er helligdager. Du trenger ikke søke om permisjon.
 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.,Å spore elementer ved hjelp av strekkoden. Du vil være i stand til å legge inn elementer i følgeseddel og salgsfaktura ved å skanne strekkoden på varen.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +477,Mark as Delivered,Merk som Leveres
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +497,Mark as Delivered,Merk som Leveres
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +34,Make Quotation,Gjør sitat
 DocType: Dependent Task,Dependent Task,Avhengig Task
-apps/erpnext/erpnext/stock/doctype/item/item.py +306,Conversion factor for default Unit of Measure must be 1 in row {0},Omregningsfaktor for standard Enhet må være en i rad {0}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,Leave of type {0} cannot be longer than {1},Permisjon av typen {0} kan ikke være lengre enn {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +310,Conversion factor for default Unit of Measure must be 1 in row {0},Omregningsfaktor for standard Enhet må være en i rad {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +155,Leave of type {0} cannot be longer than {1},Permisjon av typen {0} kan ikke være lengre enn {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Prøv å planlegge operasjoner for X dager i forveien.
 DocType: HR Settings,Stop Birthday Reminders,Stop bursdagspåminnelser
 DocType: SMS Center,Receiver List,Mottaker List
@@ -1355,15 +1309,14 @@
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Forbrukes Beløp
 apps/erpnext/erpnext/public/js/pos/pos.js +491,{0} View,{0} Vis
 DocType: Salary Structure Deduction,Salary Structure Deduction,Lønn Struktur Fradrag
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +158,Selective laser sintering,Selektiv laser sintring
-apps/erpnext/erpnext/stock/doctype/item/item.py +301,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Enhet {0} har blitt lagt inn mer enn én gang i omregningsfaktor tabell
+apps/erpnext/erpnext/stock/doctype/item/item.py +305,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Enhet {0} har blitt lagt inn mer enn én gang i omregningsfaktor tabell
 apps/frappe/frappe/core/page/data_import_tool/data_import_tool.js +108,Import Successful!,Import Vellykket!
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Cost of Utstedte Items
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +185,Quantity must not be more than {0},Antall må ikke være mer enn {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +41,Age (Days),Alder (dager)
 DocType: Quotation Item,Quotation Item,Sitat Element
 DocType: Account,Account Name,Brukernavn
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +41,From Date cannot be greater than To Date,Fra dato ikke kan være større enn To Date
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +34,From Date cannot be greater than To Date,Fra dato ikke kan være større enn To Date
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +194,Serial No {0} quantity {1} cannot be a fraction,Serial No {0} mengde {1} kan ikke være en brøkdel
 apps/erpnext/erpnext/config/buying.py +59,Supplier Type master.,Leverandør Type mester.
 DocType: Purchase Order Item,Supplier Part Number,Leverandør delenummer
@@ -1372,14 +1325,14 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +247,{0} {1} is cancelled or stopped,{0} {1} avbrytes eller stoppes
 DocType: Accounts Settings,Credit Controller,Credit Controller
 DocType: Delivery Note,Vehicle Dispatch Date,Vehicle Publiseringsdato
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +197,Purchase Receipt {0} is not submitted,Kvitteringen {0} er ikke innsendt
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +198,Purchase Receipt {0} is not submitted,Kvitteringen {0} er ikke innsendt
 DocType: Company,Default Payable Account,Standard Betales konto
 apps/erpnext/erpnext/config/website.py +13,"Settings for online shopping cart such as shipping rules, price list etc.","Innstillinger for online shopping cart som skipsregler, prisliste etc."
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +660,Setup Complete,Setup Complete
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +124,Setup Complete,Setup Complete
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +65,{0}% Billed,{0}% Fakturert
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +17,Reserved Qty,Reservert Antall
 DocType: Party Account,Party Account,Partiet konto
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +74,Human Resources,Menneskelige Ressurser
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +74,Human Resources,Menneskelige Ressurser
 DocType: Lead,Upper Income,Øvre Inntekt
 DocType: Journal Entry Account,Debit in Company Currency,Debet i selskapet Valuta
 apps/erpnext/erpnext/support/doctype/issue/issue.py +58,My Issues,Mine Issues
@@ -1388,11 +1341,9 @@
 DocType: Company,Default Values,Standardverdier
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +236,Row {0}: Payment amount can not be negative,Rad {0}: Betaling beløpet kan ikke være negativ
 DocType: Expense Claim,Total Amount Reimbursed,Totalbeløp Refusjon
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +152,Press fitting,Trykk fitting
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +64,Against Supplier Invoice {0} dated {1},Mot Leverandør Faktura {0} datert {1}
 DocType: Customer,Default Price List,Standard Prisliste
 DocType: Payment Reconciliation,Payments,Betalinger
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +24,Hot isostatic pressing,Varm isostatisk pressing
 DocType: ToDo,Medium,Medium
 DocType: Budget Detail,Budget Allocated,Budsjett Avsatt
 DocType: Journal Entry,Entry Type,Entry Type
@@ -1405,9 +1356,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +56,None of the items have any change in quantity or value.,Ingen av elementene har noen endring i mengde eller verdi.
 DocType: Warranty Claim,Warranty Claim,Garantikrav
 ,Lead Details,Lead Detaljer
-DocType: Authorization Rule,Approving User,Godkjenne User
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +37,Forging,Smiing
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +126,Plating,Plating
 DocType: Purchase Invoice,End date of current invoice's period,Sluttdato for gjeldende faktura periode
 DocType: Pricing Rule,Applicable For,Aktuelt For
 DocType: Bank Reconciliation,From Date,Fra Dato
@@ -1429,31 +1377,29 @@
 DocType: Sales Invoice,Paid Amount (Company Currency),Innbetalt beløp (Company Valuta)
 DocType: Purchase Invoice,Additional Discount,Ekstra rabatt
 DocType: Selling Settings,Selling Settings,Selge Innstillinger
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +39,Online Auctions,Online auksjoner
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,Online auksjoner
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +94,Please specify either Quantity or Valuation Rate or both,Vennligst oppgi enten Mengde eller Verdivurdering Rate eller begge deler
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +50,"Company, Month and Fiscal Year is mandatory","Company, Måned og regnskapsåret er obligatorisk"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Marketing Expenses,Markedsføringskostnader
 ,Item Shortage Report,Sak Mangel Rapporter
-apps/erpnext/erpnext/stock/doctype/item/item.js +183,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Vekt er nevnt, \ nVennligst nevne &quot;Weight målenheter&quot; også"
+apps/erpnext/erpnext/stock/doctype/item/item.js +185,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Vekt er nevnt, \ nVennligst nevne &quot;Weight målenheter&quot; også"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,Materialet Request brukes til å gjøre dette lager Entry
 apps/erpnext/erpnext/config/support.py +43,Single unit of an Item.,Enkelt enhet av et element.
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +212,Time Log Batch {0} must be 'Submitted',Tid Logg Batch {0} må være &quot;Skrevet&quot;
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,Gjør regnskap Entry For Hver Stock Movement
 DocType: Leave Allocation,Total Leaves Allocated,Totalt Leaves Avsatt
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +384,Warehouse required at Row No {0},Warehouse kreves ved Row Nei {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +386,Warehouse required at Row No {0},Warehouse kreves ved Row Nei {0}
 DocType: Employee,Date Of Retirement,Pensjoneringstidspunktet
 DocType: Upload Attendance,Get Template,Få Mal
 DocType: Address,Postal,Postal
 DocType: Item,Weightage,Weightage
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +159,Mining,Mining
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +17,Resin casting,Resin casting
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,En kundegruppe eksisterer med samme navn kan du endre Kundens navn eller endre navn på Kundegruppe
 apps/erpnext/erpnext/public/js/pos/pos.js +147,Please select {0} first.,Vennligst velg {0} først.
 apps/erpnext/erpnext/templates/pages/order.html +57,text {0},tekst {0}
 DocType: Territory,Parent Territory,Parent Territory
 DocType: Quality Inspection Reading,Reading 2,Reading 2
 DocType: Stock Entry,Material Receipt,Materialet Kvittering
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +622,Products,Produkter
+apps/erpnext/erpnext/public/js/setup_wizard.js +358,Products,Produkter
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +47,Party Type and Party is required for Receivable / Payable account {0},Partiet Type og Party er nødvendig for fordringer / gjeld konto {0}
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.","Hvis dette elementet har varianter, så det kan ikke velges i salgsordrer etc."
 DocType: Lead,Next Contact By,Neste Kontakt Av
@@ -1463,13 +1409,13 @@
 DocType: Purchase Invoice,Notification Email Address,Varsling e-postadresse
 DocType: Payment Tool,Find Invoices to Match,Finn Fakturaer til Match
 ,Item-wise Sales Register,Element-messig Sales Register
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +399,"e.g. ""XYZ National Bank""",f.eks &quot;XYZ National Bank&quot;
+apps/erpnext/erpnext/public/js/setup_wizard.js +147,"e.g. ""XYZ National Bank""",f.eks &quot;XYZ National Bank&quot;
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,Er dette inklusiv i Basic Rate?
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +57,Total Target,Total Target
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Target,Total Target
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.js +22,Shopping Cart is enabled,Handlevogn er aktivert
 DocType: Job Applicant,Applicant for a Job,Kandidat til en jobb
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +173,No Production Orders created,Ingen produksjonsordrer som er opprettet
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +131,Salary Slip of employee {0} already created for this month,Lønn Slip av ansattes {0} allerede opprettet for denne måneden
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +140,Salary Slip of employee {0} already created for this month,Lønn Slip av ansattes {0} allerede opprettet for denne måneden
 DocType: Stock Reconciliation,Reconciliation JSON,Avstemming JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,For mange kolonner. Eksportere rapporten og skrive den ut ved hjelp av et regnearkprogram.
 DocType: Sales Invoice Item,Batch No,Batch No
@@ -1479,14 +1425,14 @@
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +13,Variant,Variant
 apps/frappe/frappe/public/js/frappe/form/toolbar.js +165,New {0},New {0}
 DocType: Naming Series,Set prefix for numbering series on your transactions,Still prefiks for nummerering serien på dine transaksjoner
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +169,Stopped order cannot be cancelled. Unstop to cancel.,Stoppet rekkefølge kan ikke bli kansellert. Døves å avbryte.
-apps/erpnext/erpnext/stock/doctype/item/item.py +323,Default BOM ({0}) must be active for this item or its template,Standard BOM ({0}) må være aktiv for denne varen eller dens mal
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +164,Stopped order cannot be cancelled. Unstop to cancel.,Stoppet rekkefølge kan ikke bli kansellert. Døves å avbryte.
+apps/erpnext/erpnext/stock/doctype/item/item.py +327,Default BOM ({0}) must be active for this item or its template,Standard BOM ({0}) må være aktiv for denne varen eller dens mal
 DocType: Employee,Leave Encashed?,Permisjon encashed?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Opportunity Fra-feltet er obligatorisk
 DocType: Item,Variants,Varianter
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +458,Make Purchase Order,Gjør innkjøpsordre
 DocType: SMS Center,Send To,Send Til
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +111,There is not enough leave balance for Leave Type {0},Det er ikke nok permisjon balanse for La Type {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +127,There is not enough leave balance for Leave Type {0},Det er ikke nok permisjon balanse for La Type {0}
 DocType: Sales Team,Contribution to Net Total,Bidrag til Net Total
 DocType: Sales Invoice Item,Customer's Item Code,Kundens Elementkode
 DocType: Stock Reconciliation,Stock Reconciliation,Stock Avstemming
@@ -1523,11 +1469,11 @@
 DocType: Sales Order Item,Actual Qty,Selve Antall
 DocType: Sales Invoice Item,References,Referanser
 DocType: Quality Inspection Reading,Reading 10,Lese 10
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +612,"List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start.","Vise dine produkter eller tjenester som du kjøper eller selger. Sørg for å sjekke varegruppen, Enhet og andre egenskaper når du starter."
+apps/erpnext/erpnext/public/js/setup_wizard.js +348,"List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start.","Vise dine produkter eller tjenester som du kjøper eller selger. Sørg for å sjekke varegruppen, Enhet og andre egenskaper når du starter."
 DocType: Hub Settings,Hub Node,Hub Node
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,Du har skrevet inn like elementer. Vennligst utbedre og prøv igjen.
 apps/erpnext/erpnext/controllers/item_variant.py +65,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values,Verdien {0} for Egenskap {1} finnes ikke i listen over gyldige Sak attributtverdier
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +87,Associate,Forbinder
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Associate,Forbinder
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +46,Item {0} is not a serialized Item,Element {0} er ikke en serie Element
 DocType: SMS Center,Create Receiver List,Lag Receiver List
 apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +5,Expired,Utløpt
@@ -1536,7 +1482,7 @@
 DocType: Warranty Claim,Issue Date,Utgivelsesdato
 DocType: Activity Cost,Activity Cost,Aktivitet Kostnad
 DocType: Purchase Receipt Item Supplied,Consumed Qty,Forbrukes Antall
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +52,Telecommunications,Telekommunikasjon
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +52,Telecommunications,Telekommunikasjon
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),Indikerer at pakken er en del av denne leveransen (Kun Draft)
 DocType: Payment Tool,Make Payment Entry,Utfør betaling Entry
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +119,Quantity for Item {0} must be less than {1},Kvantum for Element {0} må være mindre enn {1}
@@ -1553,10 +1499,8 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +37,"Selling must be checked, if Applicable For is selected as {0}","Selling må sjekkes, hvis dette gjelder for er valgt som {0}"
 DocType: Purchase Order Item,Supplier Quotation Item,Leverandør sitat Element
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +27,Make Salary Structure,Gjør Lønn Struktur
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +54,Shearing,Shearing
 DocType: Item,Has Variants,Har Varianter
 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.,Klikk på &quot;Gjør Sales Faktura-knappen for å opprette en ny salgsfaktura.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +166,Packaging and labeling,Emballering og merking
 DocType: Monthly Distribution,Name of the Monthly Distribution,Navn på Monthly Distribution
 DocType: Sales Person,Parent Sales Person,Parent Sales Person
 apps/erpnext/erpnext/setup/utils.py +14,Please specify Default Currency in Company Master and Global Defaults,Vennligst oppgi Standardvaluta i selskapet Master og Global Defaults
@@ -1567,19 +1511,18 @@
 DocType: Budget Detail,Fiscal Year,Regnskapsår
 DocType: Cost Center,Budget,Budsjett
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +41,"Budget cannot be assigned against {0}, as it's not an Income or Expense account","Budsjettet kan ikke overdras mot {0}, som det er ikke en inntekt eller kostnad konto"
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Achieved,Oppnås
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,Oppnås
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +65,Territory / Customer,Territorium / Customer
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,e.g. 5,f.eks 5
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +207,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},Rad {0}: Nummerert mengden {1} må være mindre enn eller lik fakturere utestående beløp {2}
+apps/erpnext/erpnext/public/js/setup_wizard.js +294,e.g. 5,f.eks 5
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},Rad {0}: Nummerert mengden {1} må være mindre enn eller lik fakturere utestående beløp {2}
 DocType: Sales Invoice,In Words will be visible once you save the Sales Invoice.,I Ord vil være synlig når du lagrer salgsfaktura.
 DocType: Item,Is Sales Item,Er Sales Element
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,Varegruppe treet
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,Element {0} er ikke oppsett for Serial Nos. Sjekk Element mester
 DocType: Maintenance Visit,Maintenance Time,Vedlikehold Tid
 ,Amount to Deliver,Beløp å levere
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +620,A Product or Service,Et produkt eller tjeneste
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +158,There were errors.,Det var feil.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +101,Tapping,Tapping
+apps/erpnext/erpnext/public/js/setup_wizard.js +356,A Product or Service,Et produkt eller tjeneste
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +146,There were errors.,Det var feil.
 DocType: Naming Series,Current Value,Nåværende Verdi
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +171,{0} created,{0} opprettet
 DocType: Delivery Note Item,Against Sales Order,Mot Salgsordre
@@ -1593,7 +1536,7 @@
 apps/erpnext/erpnext/accounts/party.py +275,Due Date cannot be before Posting Date,Due Date kan ikke være før konteringsdato
 DocType: Website Item Group,Website Item Group,Website varegruppe
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Duties and Taxes,Skatter og avgifter
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Please enter Reference date,Skriv inn Reference dato
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +312,Please enter Reference date,Skriv inn Reference dato
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} oppføringer betalings kan ikke bli filtrert av {1}
 DocType: Item Website Specification,Table for Item that will be shown in Web Site,Tabell for element som vil bli vist på nettsiden
 DocType: Purchase Order Item Supplied,Supplied Qty,Medfølgende Antall
@@ -1601,7 +1544,7 @@
 apps/erpnext/erpnext/config/stock.py +103,Tree of Item Groups.,Tree of varegrupper.
 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,Kan ikke se rad tall større enn eller lik gjeldende rad nummer for denne debiteringstype
 ,Item-wise Purchase History,Element-messig Purchase History
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +152,Red,Rød
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Red,Rød
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +228,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},Vennligst klikk på &quot;Generer Schedule &#39;for å hente serienummer lagt for Element {0}
 DocType: Account,Frozen,Frozen
 ,Open Production Orders,Åpne produksjonsordrer
@@ -1616,7 +1559,7 @@
 DocType: Item Attribute,Attribute Name,Attributt navn
 apps/erpnext/erpnext/controllers/selling_controller.py +236,Item {0} must be Sales or Service Item in {1},Elementet {0} må være salgs- eller service Element i {1}
 DocType: Item Group,Show In Website,Show I Website
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +621,Group,Gruppe
+apps/erpnext/erpnext/public/js/setup_wizard.js +357,Group,Gruppe
 DocType: Task,Expected Time (in hours),Forventet tid (i timer)
 ,Qty to Order,Antall å bestille
 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","Å spore merkenavn i følgende dokumenter følgeseddel, Opportunity, Material Request, Element, innkjøpsordre, Purchase kupong, Kjøper Mottak, sitat, salgsfaktura, Product Bundle, Salgsordre, Serial No"
@@ -1626,6 +1569,7 @@
 DocType: Features Setup,Brands,Merker
 DocType: C-Form Invoice Detail,Invoice No,Faktura Nei
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +480,From Purchase Order,Fra innkjøpsordre
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +92,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","La ikke kan brukes / kansellert før {0}, som permisjon balanse har allerede vært carry-sendt i fremtiden permisjon tildeling posten {1}"
 DocType: Activity Cost,Costing Rate,Costing Rate
 ,Customer Addresses And Contacts,Kunde Adresser og kontakter
 DocType: Employee,Resignation Letter Date,Resignasjon Letter Dato
@@ -1633,35 +1577,31 @@
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +137,Not Set,Ikke sett
 DocType: Communication,Date,Dato
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,Gjenta kunden Revenue
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +651,Sit tight while your system is being setup. This may take a few moments.,Sitte mens systemet blir oppsettet. Dette kan ta en liten stund.
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +115,Sit tight while your system is being setup. This may take a few moments.,Sitte mens systemet blir oppsettet. Dette kan ta en liten stund.
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +51,{0} ({1}) must have role 'Expense Approver',{0} ({1}) må ha rollen &#39;Expense Godkjenner&#39;
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Pair,Par
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Pair,Par
 DocType: Bank Reconciliation Detail,Against Account,Mot konto
 DocType: Maintenance Schedule Detail,Actual Date,Selve Dato
 DocType: Item,Has Batch No,Har Batch No
 DocType: Delivery Note,Excise Page Number,Vesenet Page Number
 DocType: Employee,Personal Details,Personlig Informasjon
 ,Maintenance Schedules,Vedlikeholdsplaner
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +44,Embossing,Preging
 ,Quotation Trends,Anførsels Trender
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +139,Item Group not mentioned in item master for item {0},Varegruppe ikke nevnt i punkt master for elementet {0}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +302,Debit To account must be a Receivable account,Uttak fra kontoen må være en fordring konto
-apps/erpnext/erpnext/stock/doctype/item/item.py +310,"As Production Order can be made for this item, it must be a stock item.","Som produksjonsordre kan gjøres for dette, må det være en lagervare."
 DocType: Shipping Rule Condition,Shipping Amount,Fraktbeløp
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +140,Joining,Bli med
-DocType: Authorization Rule,Above Value,Fremfor Verdi
 ,Pending Amount,Avventer Beløp
 DocType: Purchase Invoice Item,Conversion Factor,Omregningsfaktor
 DocType: Purchase Order,Delivered,Levert
 apps/erpnext/erpnext/config/hr.py +160,Setup incoming server for jobs email id. (e.g. jobs@example.com),Oppsett innkommende server for jobbene e-id. (F.eks jobs@example.com)
 DocType: Purchase Receipt,Vehicle Number,Vehicle Number
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,Datoen som tilbakevendende faktura vil bli stoppe
+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,Totalt bevilget blader {0} kan ikke være mindre enn allerede godkjente blader {1} for perioden
 DocType: Journal Entry,Accounts Receivable,Kundefordringer
 ,Supplier-Wise Sales Analytics,Leverandør-Wise Salgs Analytics
 DocType: Address Template,This format is used if country specific format is not found,Dette formatet brukes hvis landet bestemt format ikke er funnet
 DocType: Custom Field,Custom,Custom
 DocType: Production Order,Use Multi-Level BOM,Bruk Multi-Level BOM
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +26,Injection molding,Innsprøyting
 DocType: Bank Reconciliation,Include Reconciled Entries,Inkluder forsonet Entries
 apps/erpnext/erpnext/config/accounts.py +41,Tree of finanial accounts.,Tree of finanial kontoer.
 DocType: Leave Control Panel,Leave blank if considered for all employee types,La stå tom hvis vurderes for alle typer medarbeider
@@ -1671,30 +1611,28 @@
 apps/frappe/frappe/config/setup.py +130,Printing,Utskrift
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +114,Expense Claim is pending approval. Only the Expense Approver can update status.,Expense krav venter på godkjenning. Bare den Expense Godkjenner kan oppdatere status.
 DocType: Purchase Invoice,Additional Discount Amount,Ekstra rabatt Beløp
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +99,The day(s) on which you are applying for leave are holiday. You need not apply for leave.,Dagen (e) der du søker om permisjon er ferie. Du trenger ikke søke om permisjon.
 apps/frappe/frappe/public/js/frappe/misc/utils.js +110,and,og
 DocType: Leave Block List Allow,Leave Block List Allow,La Block List Tillat
 apps/erpnext/erpnext/setup/doctype/company/company.py +236,Abbr can not be blank or space,Abbr kan ikke være tomt eller plass
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +50,Sports,Sport
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,Sport
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Actual,Total Actual
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Unit,Enhet
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Unit,Enhet
 apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.py +182,Please set Dropbox access keys in your site config,Vennligst sett Dropbox hurtigtaster på din config
 apps/erpnext/erpnext/stock/get_item_details.py +113,Please specify Company,Vennligst oppgi selskapet
 ,Customer Acquisition and Loyalty,Kunden Oppkjøp og Loyalty
 DocType: Purchase Receipt,Warehouse where you are maintaining stock of rejected items,Warehouse hvor du opprettholder lager avviste elementer
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +408,Your financial year ends on,Din regnskapsår avsluttes på
+apps/erpnext/erpnext/public/js/setup_wizard.js +156,Your financial year ends on,Din regnskapsår avsluttes på
 DocType: POS Profile,Price List,Pris Liste
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +20,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0} er nå standard regnskapsåret. Vennligst oppdater nettleser for at endringen skal tre i kraft.
 apps/erpnext/erpnext/projects/doctype/project/project.js +47,Expense Claims,Regninger
 DocType: Issue,Support,Support
-DocType: Authorization Rule,Approving Role,Godkjenne Rolle
 ,BOM Search,BOM Søk
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +176,Closing (Opening + Totals),Lukking (Åpning + Totals)
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +26,Please specify currency in Company,Vennligst oppgi valuta i selskapet
 DocType: Workstation,Wages per hour,Lønn per time
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},Stock balanse i Batch {0} vil bli negativ {1} for Element {2} på Warehouse {3}
 apps/erpnext/erpnext/config/setup.py +83,"Show / Hide features like Serial Nos, POS etc.","Vis / skjul funksjoner som Serial Nos, POS etc."
-apps/erpnext/erpnext/controllers/accounts_controller.py +236,Account {0} is invalid. Account Currency must be {1},Konto {0} er ugyldig. Account Valuta må være {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +237,Account {0} is invalid. Account Currency must be {1},Konto {0} er ugyldig. Account Valuta må være {1}
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +34,UOM Conversion factor is required in row {0},Målenheter Omregningsfaktor er nødvendig i rad {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +53,Clearance date cannot be before check date in row {0},Klaring dato kan ikke være før innsjekking dato i rad {0}
 DocType: Salary Slip,Deduction,Fradrag
@@ -1713,13 +1651,13 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +82,Item {0} has already been returned,Element {0} er allerede returnert
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** Regnskapsår ** representerer et regnskapsår. Alle regnskapspostene og andre store transaksjoner spores mot ** regnskapsår **.
 DocType: Opportunity,Customer / Lead Address,Kunde / Lead Adresse
+apps/erpnext/erpnext/stock/doctype/item/item.py +112,Warning: Invalid SSL certificate on attachment {0},Advarsel: Ugyldig SSL-sertifikat på vedlegg {0}
 DocType: Production Order Operation,Actual Operation Time,Selve Operasjon Tid
 DocType: Authorization Rule,Applicable To (User),Gjelder til (User)
 DocType: Purchase Taxes and Charges,Deduct,Trekke
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +170,Job Description,Stillingsbeskrivelse
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +170,Job Description,Stillingsbeskrivelse
 DocType: Purchase Order Item,Qty as per Stock UOM,Antall pr Stock målenheter
 apps/frappe/frappe/model/rename_doc.py +343,Please select a valid csv file with data,Velg en gyldig csv-fil med data
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +92,Coating,Coating
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +126,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Spesialtegn unntatt &quot;-&quot; &quot;.&quot;, &quot;#&quot;, og &quot;/&quot; ikke tillatt i navngi serie"
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Hold orden på salgskampanjer. Hold styr på Leads, Sitater, Salgsordre etc fra kampanjer for å måle avkastning på investeringen."
 DocType: Expense Claim,Approver,Godkjenner
@@ -1729,12 +1667,11 @@
 DocType: Supplier Quotation,Manufacturing Manager,Produksjonssjef
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},Serial No {0} er under garanti opptil {1}
 apps/erpnext/erpnext/config/stock.py +69,Split Delivery Note into packages.,Split følgeseddel i pakker.
-apps/erpnext/erpnext/hooks.py +84,Shipments,Forsendelser
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +29,Dip molding,Dip molding
+apps/erpnext/erpnext/hooks.py +68,Shipments,Forsendelser
 DocType: Purchase Order,To be delivered to customer,Som skal leveres til kunde
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,Tid Logg Status må sendes inn.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,Serial No {0} tilhører ikke noen Warehouse
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +650,Setting Up,Setter Opp
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +114,Setting Up,Setter Opp
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,Row # ,Row #
 DocType: Purchase Invoice,In Words (Company Currency),I Words (Company Valuta)
 DocType: Pricing Rule,Supplier,Leverandør
@@ -1742,7 +1679,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +105,Miscellaneous Expenses,Diverse utgifter
 DocType: Global Defaults,Default Company,Standard selskapet
 apps/erpnext/erpnext/controllers/stock_controller.py +166,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,Kostnad eller Difference konto er obligatorisk for Element {0} som det påvirker samlede børsverdi
-apps/erpnext/erpnext/controllers/accounts_controller.py +354,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","Kan ikke overbill for Element {0} i rad {1} mer enn {2}. Å tillate billing, vennligst sett på lager Innstillinger"
+apps/erpnext/erpnext/controllers/accounts_controller.py +355,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","Kan ikke overbill for Element {0} i rad {1} mer enn {2}. Å tillate billing, vennligst sett på lager Innstillinger"
 DocType: Employee,Bank Name,Bank Name
 apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +27,-Above,-Above
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +135,User {0} is disabled,Bruker {0} er deaktivert
@@ -1755,27 +1692,26 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,{0} is mandatory for Item {1},{0} er obligatorisk for Element {1}
 DocType: Currency Exchange,From Currency,Fra Valuta
 DocType: DocField,Name,Navn
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +211,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Vennligst velg avsatt beløp, fakturatype og fakturanummer i minst én rad"
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +104,Sales Order required for Item {0},Salgsordre kreves for Element {0}
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +158,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Vennligst velg avsatt beløp, fakturatype og fakturanummer i minst én rad"
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +107,Sales Order required for Item {0},Salgsordre kreves for Element {0}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +43,Amounts not reflected in system,Beløp ikke reflektert i system
 DocType: Purchase Invoice Item,Rate (Company Currency),Rate (Selskap Valuta)
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +40,Others,Annet
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +40,Others,Annet
 apps/erpnext/erpnext/templates/includes/product_page.js +80,Cannot find a matching Item. Please select some other value for {0}.,Kan ikke finne en matchende element. Vennligst velg en annen verdi for {0}.
 DocType: POS Profile,Taxes and Charges,Skatter og avgifter
 DocType: Item,"A Product or a Service that is bought, sold or kept in stock.","Et produkt eller en tjeneste som er kjøpt, solgt eller holdes på lager."
 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,Kan ikke velge charge type som &#39;On Forrige Row beløp &quot;eller&quot; On Forrige Row Totals for første rad
 apps/frappe/frappe/core/doctype/doctype/boilerplate/controller_list.html +31,Completed,Fullført
 DocType: Web Form,Select DocType,Velg DOCTYPE
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +104,Broaching,Rømming
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +12,Banking,Banking
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,Banking
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +38,Please click on 'Generate Schedule' to get schedule,Vennligst klikk på &quot;Generer Schedule &#39;for å få timeplanen
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +283,New Cost Center,New kostnadssted
 DocType: Bin,Ordered Quantity,Bestilte Antall
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +397,"e.g. ""Build tools for builders""",f.eks &quot;Bygg verktøy for utbyggere&quot;
+apps/erpnext/erpnext/public/js/setup_wizard.js +145,"e.g. ""Build tools for builders""",f.eks &quot;Bygg verktøy for utbyggere&quot;
 DocType: Quality Inspection,In Process,Igang
 DocType: Authorization Rule,Itemwise Discount,Itemwise Rabatt
 DocType: Purchase Order Item,Reference Document Type,Reference Document Type
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +318,{0} against Sales Order {1},{0} mot Salgsordre {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +320,{0} against Sales Order {1},{0} mot Salgsordre {1}
 DocType: Account,Fixed Asset,Fast Asset
 apps/erpnext/erpnext/config/stock.py +283,Serialized Inventory,Serialisert Lager
 DocType: Activity Type,Default Billing Rate,Standard Billing pris
@@ -1790,14 +1726,13 @@
 DocType: Purchase Invoice Item,Page Break,Page Break
 DocType: Production Order Operation,Pending,Avventer
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,Brukere som kan godkjenne en bestemt ansattes permisjon applikasjoner
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +33,You cannot change default UOM of Variant. To change default UOM for Variant change default UOM of the Template,Du kan ikke endre standardmålenheter av Variant. For å endre standardmålenheter for Variant endring standardmålenheter av Mal
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +50,Office Equipments,Kontor utstyr
 DocType: Purchase Invoice Item,Qty,Antall
 DocType: Fiscal Year,Companies,Selskaper
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +24,Electronics,Elektronikk
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +24,Electronics,Elektronikk
 DocType: Stock Settings,Raise Material Request when stock reaches re-order level,Hev Material Request når aksjen når re-order nivå
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +18,From Maintenance Schedule,Fra vedlikeholdsplan
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +56,Full-time,Fulltid
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +56,Full-time,Fulltid
 DocType: Purchase Invoice,Contact Details,Kontaktinformasjon
 DocType: C-Form,Received Date,Mottatt dato
 DocType: Delivery Note,"If you have created a standard template in Sales Taxes and Charges Template, select one and click on the button below.","Hvis du har opprettet en standard mal i salgs skatter og avgifter mal, velger du ett og klikk på knappen under."
@@ -1809,11 +1744,12 @@
 DocType: Job Applicant,Job Opening,Job Opening
 DocType: Payment Reconciliation,Payment Reconciliation,Betaling Avstemming
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +154,Please select Incharge Person's name,Vennligst velg Incharge persons navn
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +51,Technology,Teknologi
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,Teknologi
 DocType: Offer Letter,Offer Letter,Tilbudsbrev
 apps/erpnext/erpnext/config/manufacturing.py +51,Generate Material Requests (MRP) and Production Orders.,Generere Material Requests (MRP) og produksjonsordrer.
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +68,Total Invoiced Amt,Total Fakturert Amt
 DocType: Time Log,To Time,Til Time
+DocType: Authorization Rule,Approving Role (above authorized value),Godkjenne Role (ovenfor autorisert verdi)
 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.","For å legge til barnet noder, utforske treet og klikk på noden under som du vil legge til flere noder."
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +102,Credit To account must be a Payable account,Kreditt til kontoen må være en Betales konto
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +233,BOM recursion: {0} cannot be parent or child of {2},BOM rekursjon: {0} kan ikke være forelder eller barn av {2}
@@ -1826,10 +1762,8 @@
 DocType: Item,Customer Item Codes,Kunden element Codes
 DocType: Opportunity,Lost Reason,Mistet Reason
 apps/erpnext/erpnext/config/accounts.py +68,Create Payment Entries against Orders or Invoices.,Lag Betalings Entries mot bestillinger eller fakturaer.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +141,Welding,Sveising
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +40,New Stock UOM is required,New Stock målenheter er nødvendig
 DocType: Quality Inspection,Sample Size,Sample Size
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +443,All items have already been invoiced,Alle elementene er allerede blitt fakturert
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +446,All items have already been invoiced,Alle elementene er allerede blitt fakturert
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',Vennligst oppgi en gyldig &quot;Fra sak nr &#39;
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +287,Further cost centers can be made under Groups but entries can be made against non-Groups,Ytterligere kostnadsbærere kan gjøres under Grupper men oppføringene kan gjøres mot ikke-grupper
 DocType: Project,External,Ekstern
@@ -1841,8 +1775,7 @@
 DocType: Bin,Actual Quantity,Selve Antall
 DocType: Shipping Rule,example: Next Day Shipping,Eksempel: Neste Day Shipping
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,Serial No {0} ikke funnet
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +563,Your Customers,Dine kunder
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +27,Compression molding,Komprimering støping
+apps/erpnext/erpnext/public/js/setup_wizard.js +303,Your Customers,Dine kunder
 DocType: Leave Block List Date,Block Date,Block Dato
 DocType: Sales Order,Not Delivered,Ikke levert
 ,Bank Clearance Summary,Bank Lagersalg Summary
@@ -1863,10 +1796,10 @@
 DocType: SMS Log,Sent To,Sendt til
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +28,Make Sales Invoice,Gjør Sales Faktura
 DocType: Company,For Reference Only.,For referanse.
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +29,Invalid {0}: {1},Ugyldig {0}: {1}
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +49,Invalid {0}: {1},Ugyldig {0}: {1}
 DocType: Sales Invoice Advance,Advance Amount,Forskuddsbeløp
 DocType: Manufacturing Settings,Capacity Planning,Kapasitetsplanlegging
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +49,'From Date' is required,&quot;Fra dato&quot; er nødvendig
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +43,'From Date' is required,&quot;Fra dato&quot; er nødvendig
 DocType: Journal Entry,Reference Number,Referanse Nummer
 DocType: Employee,Employment Details,Sysselsetting Detaljer
 DocType: Employee,New Workplace,Nye arbeidsplassen
@@ -1881,7 +1814,7 @@
 DocType: Serial No,Delivery Time,Leveringstid
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Aldring Based On
 DocType: Item,End of Life,Slutten av livet
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +41,Travel,Reise
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +41,Travel,Reise
 DocType: Leave Block List,Allow Users,Gi brukere
 DocType: Purchase Order,Customer Mobile No,Kunden Mobile No
 DocType: Sales Invoice,Recurring,Gjentakende
@@ -1895,7 +1828,7 @@
 DocType: Naming Series,User must always select,Brukeren må alltid velge
 DocType: Stock Settings,Allow Negative Stock,Tillat Negative Stock
 DocType: Installation Note,Installation Note,Installasjon Merk
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +541,Add Taxes,Legg Skatter
+apps/erpnext/erpnext/public/js/setup_wizard.js +283,Add Taxes,Legg Skatter
 ,Financial Analytics,Finansielle Analytics
 DocType: Quality Inspection,Verified By,Verified by
 DocType: Address,Subsidiary,Datterselskap
@@ -1905,7 +1838,6 @@
 DocType: System Settings,In Hours,I Hours
 DocType: Process Payroll,Create Salary Slip,Lag Lønn Slip
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Expected balance as per bank,Forventet balanse pr bank
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +115,Buffing,Rasping
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Source of Funds (Liabilities),Source of Funds (Gjeld)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +347,Quantity in row {0} ({1}) must be same as manufactured quantity {2},Antall på rad {0} ({1}) må være det samme som produsert mengde {2}
 DocType: Appraisal,Employee,Ansatt
@@ -1922,11 +1854,11 @@
 DocType: Rename Tool,File to Rename,Filen til Rename
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +176,Purchse Order number required for Item {0},Purchse Bestill antall som kreves for Element {0}
 apps/erpnext/erpnext/public/js/controllers/transaction.js +136,Show Payments,Vis Betalinger
-apps/erpnext/erpnext/controllers/buying_controller.py +245,Specified BOM {0} does not exist for Item {1},Spesifisert BOM {0} finnes ikke for Element {1}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +202,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Vedlikeholdsplan {0} må avbestilles før den avbryter denne salgsordre
+apps/erpnext/erpnext/controllers/buying_controller.py +236,Specified BOM {0} does not exist for Item {1},Spesifisert BOM {0} finnes ikke for Element {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Vedlikeholdsplan {0} må avbestilles før den avbryter denne salgsordre
 apps/frappe/frappe/desk/page/backups/backups.html +13,Size,Størrelse
 DocType: Notification Control,Expense Claim Approved,Expense krav Godkjent
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +113,Pharmaceutical,Pharmaceutical
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Pharmaceutical,Pharmaceutical
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,Kostnad for kjøpte varer
 DocType: Selling Settings,Sales Order Required,Salgsordre Påkrevd
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +30,Create Customer,Opprett kunde
@@ -1936,7 +1868,6 @@
 DocType: Quality Inspection Reading,Reading 9,Lese 9
 DocType: Supplier,Is Frozen,Er Frozen
 DocType: Buying Settings,Buying Settings,Kjøpe Innstillinger
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +122,Mass finishing,Mass behandling
 DocType: Stock Entry Detail,BOM No. for a Finished Good Item,BOM No. for et ferdig God Sak
 DocType: Upload Attendance,Attendance To Date,Oppmøte To Date
 apps/erpnext/erpnext/config/selling.py +158,Setup incoming server for sales email id. (e.g. sales@example.com),Oppsett innkommende server for salg e-id. (F.eks sales@example.com)
@@ -1944,7 +1875,7 @@
 DocType: Payment Tool,Payment Account,Betaling konto
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +713,Please specify Company to proceed,Vennligst oppgi selskapet å fortsette
 apps/frappe/frappe/public/js/frappe/model/indicator.js +30,Draft,Draft
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +46,Compensatory Off,Kompenserende Off
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Compensatory Off,Kompenserende Off
 DocType: Quality Inspection Reading,Accepted,Akseptert
 DocType: User,Female,Kvinne
 DocType: Journal Entry Account,Debit in Account Currency,Debet i Account Valuta
@@ -1956,7 +1887,7 @@
 DocType: Shipping Rule,Shipping Rule Label,Shipping Rule Etikett
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +209,Raw Materials cannot be blank.,Råvare kan ikke være blank.
 DocType: Newsletter,Test,Test
-apps/erpnext/erpnext/stock/doctype/item/item.py +364,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +368,"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'","Ettersom det er eksisterende lagertransaksjoner for dette elementet, \ du ikke kan endre verdiene for «Har Serial No &#39;,&#39; Har Batch No &#39;,&#39; Er Stock Element&quot; og &quot;verdsettelsesmetode &#39;"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +448,Quick Journal Entry,Hurtig Journal Entry
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +92,You can not change rate if BOM mentioned agianst any item,Du kan ikke endre prisen dersom BOM nevnt agianst ethvert element
@@ -1967,13 +1898,14 @@
 apps/erpnext/erpnext/config/stock.py +18,Requests for items.,Forespørsler om elementer.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,Separat produksjonsordre vil bli opprettet for hvert ferdige godt element.
 DocType: Purchase Invoice,Terms and Conditions1,Vilkår og forhold 1
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +18,Complete Setup,Komplett Setup
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard_page.html +18,Complete Setup,Komplett Setup
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","Regnskap oppføring frosset opp til denne datoen, kan ingen gjøre / endre oppføring unntatt rolle angitt nedenfor."
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +121,Please save the document before generating maintenance schedule,Vennligst lagre dokumentet før du genererer vedlikeholdsplan
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,Prosjekt Status
 DocType: UOM,Check this to disallow fractions. (for Nos),Sjekk dette for å forby fraksjoner. (For Nos)
 apps/erpnext/erpnext/config/crm.py +96,Newsletter Mailing List,Nyhetsbrev postliste
 DocType: Delivery Note,Transporter Name,Transporter Name
+DocType: Authorization Rule,Authorized Value,Autorisert Verdi
 DocType: Contact,Enter department to which this Contact belongs,Tast avdeling som denne kontakten tilhører
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Absent,Total Fraværende
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +746,Item or Warehouse for row {0} does not match Material Request,Element eller Warehouse for rad {0} samsvarer ikke Material Request
@@ -1998,16 +1930,15 @@
 DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),Basic Rate (som per Stock målenheter)
 DocType: SMS Log,No of Requested SMS,Ingen av Spurt SMS
 DocType: Campaign,Campaign-.####,Kampanje -. ####
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +55,Piercing,Piercing
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,Neste skritt
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +117,Contract End Date must be greater than Date of Joining,Kontraktssluttdato må være større enn tidspunktet for inntreden
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,En tredjepart distributør / forhandler / kommisjonær / agent / forhandler som selger selskaper produkter for en kommisjon.
 DocType: Customer Group,Has Child Node,Har Child Node
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{0} against Purchase Order {1},{0} mot innkjøpsordre {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +332,{0} against Purchase Order {1},{0} mot innkjøpsordre {1}
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","Skriv inn statiske webadresseparametere her (F.eks. Avsender = ERPNext, brukernavn = ERPNext, passord = 1234 etc.)"
 apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,{0} {1} ikke i noen aktiv regnskapsåret. For mer informasjon sjekk {2}.
-apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,Dette er et eksempel nettsiden automatisk generert fra ERPNext
+apps/erpnext/erpnext/setup/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,Dette er et eksempel nettsiden automatisk generert fra ERPNext
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +37,Ageing Range 1,Aldring Range 1
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +110,Photochemical machining,Fotokjemisk bearbeiding
 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.
 
 #### Note
@@ -2033,7 +1964,7 @@
 DocType: Purchase Receipt Item,Recd Quantity,Recd Antall
 DocType: Email Account,Email Ids,E-IDer
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},Kan ikke produsere mer Element {0} enn Salgsordre kvantitet {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +471,Stock Entry {0} is not submitted,Stock Entry {0} er ikke innsendt
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +473,Stock Entry {0} is not submitted,Stock Entry {0} er ikke innsendt
 DocType: Payment Reconciliation,Bank / Cash Account,Bank / minibank konto
 DocType: Tax Rule,Billing City,Fakturering By
 DocType: Global Defaults,Hide Currency Symbol,Skjule Valutasymbol
@@ -2049,7 +1980,7 @@
 DocType: Purchase Invoice,Currency and Price List,Valuta og prisliste
 DocType: Opportunity,Customer / Lead Name,Kunde / Lead navn
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +63,Clearance Date not mentioned,Klaring Dato ikke nevnt
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +71,Production,Produksjon
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Production,Produksjon
 DocType: Item,Allow Production Order,Tillat produksjonsordre
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +60,Row {0}:Start Date must be before End Date,Rad {0}: Startdato må være før sluttdato
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Total (Stk)
@@ -2062,7 +1993,7 @@
 apps/erpnext/erpnext/utilities/doctype/address/address.py +113,My Addresses,Mine adresser
 DocType: Stock Ledger Entry,Outgoing Rate,Utgående Rate
 apps/erpnext/erpnext/config/hr.py +100,Organization branch master.,Organisering gren mester.
-apps/erpnext/erpnext/controllers/accounts_controller.py +237, or ,eller
+apps/erpnext/erpnext/controllers/accounts_controller.py +238, or ,eller
 DocType: Sales Order,Billing Status,Billing Status
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Utility Expenses,Utility Utgifter
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,90-Above,90-Above
@@ -2089,6 +2020,7 @@
 DocType: Stock Entry Detail,Serial No / Batch,Serial No / Batch
 DocType: Product Bundle,Parent Item,Parent Element
 DocType: Account,Account Type,Kontotype
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +113,Leave Type {0} cannot be carry-forwarded,La Type {0} kan ikke bære-videre
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +213,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',Vedlikeholdsplan genereres ikke for alle elementene. Vennligst klikk på &quot;Generer Schedule &#39;
 ,To Produce,Å Produsere
 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","For rad {0} i {1}. For å inkludere {2} i Element rate, rader {3} må også inkluderes"
@@ -2096,10 +2028,7 @@
 DocType: Bin,Reserved Quantity,Reservert Antall
 DocType: Landed Cost Voucher,Purchase Receipt Items,Kvitteringen Items
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,Tilpasse Forms
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +62,Cutting,Cutting
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +69,Flattening,Utflating
 DocType: Account,Income Account,Inntekt konto
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +22,Molding,Molding
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +632,Delivery,Levering
 DocType: Stock Reconciliation Item,Current Qty,Nåværende Antall
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",Se &quot;Rate Of materialer basert på&quot; i Costing Seksjon
@@ -2109,19 +2038,18 @@
 apps/frappe/frappe/desk/moduleview.py +61,Documents,Dokumenter
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +17,Ref,Ref
 DocType: Cost Center,Cost Center,Kostnadssted
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.js +48,Voucher #,Kupong #
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +36,Voucher #,Kupong #
 DocType: Notification Control,Purchase Order Message,Innkjøpsordre Message
 DocType: Tax Rule,Shipping Country,Shipping Land
 DocType: Upload Attendance,Upload HTML,Last opp HTML
-apps/erpnext/erpnext/controllers/accounts_controller.py +391,"Total advance ({0}) against Order {1} cannot be greater \
+apps/erpnext/erpnext/controllers/accounts_controller.py +392,"Total advance ({0}) against Order {1} cannot be greater \
 				than the Grand Total ({2})",Total forhånd ({0}) mot Bestill {1} ​​kan ikke være større \ enn Grand Total ({2})
 DocType: Employee,Relieving Date,Lindrende Dato
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +12,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.","Prising Rule er laget for å overskrive Prisliste / definere rabattprosenten, basert på noen kriterier."
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,Lageret kan bare endres via Stock Entry / følgeseddel / Kjøpskvittering
 DocType: Employee Education,Class / Percentage,Klasse / Prosent
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +92,Head of Marketing and Sales,Head of Marketing and Sales
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +31,Income Tax,Inntektsskatt
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +157,Laser engineered net shaping,Laser konstruert netto forme
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Head of Marketing and Sales,Head of Marketing and Sales
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +31,Income Tax,Inntektsskatt
 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.","Hvis valgt Pricing Rule er laget for &#39;Pris&#39;, det vil overskrive Prisliste. Priser Rule prisen er den endelige prisen, så ingen ytterligere rabatt bør påføres. Derfor, i transaksjoner som Salgsordre, innkjøpsordre osv, det vil bli hentet i &quot;Valuta-feltet, heller enn&quot; Prisliste Valuta-feltet."
 apps/erpnext/erpnext/config/selling.py +163,Track Leads by Industry Type.,Spor Leads etter bransje Type.
 DocType: Item Supplier,Item Supplier,Sak Leverandør
@@ -2144,31 +2072,28 @@
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Selve Antall Etter Transaksjons
 ,Pending SO Items For Purchase Request,Avventer SO varer for kjøp Request
 DocType: Supplier,Billing Currency,Faktureringsvaluta
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +148,Extra Large,Extra large
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,Extra Large,Extra large
 ,Profit and Loss Statement,Resultatregnskap
 DocType: Bank Reconciliation Detail,Cheque Number,Sjekk Antall
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +43,Pressing,Trykke
 DocType: Payment Tool Detail,Payment Tool Detail,Betaling Tool Detail
 ,Sales Browser,Salg Browser
 DocType: Journal Entry,Total Credit,Total Credit
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +474,Warning: Another {0} # {1} exists against stock entry {2},Advarsel: Another {0} # {1} finnes mot aksje oppføring {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +459,Local,Lokal
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +476,Warning: Another {0} # {1} exists against stock entry {2},Advarsel: Another {0} # {1} finnes mot aksje oppføring {2}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +397,Local,Lokal
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),Utlån (Eiendeler)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,Skyldnere
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +147,Large,Stor
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +23,No employee found!,Ingen ansatte funnet!
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Large,Stor
 DocType: C-Form Invoice Detail,Territory,Territorium
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,Vennligst oppgi ingen av besøk som kreves
 DocType: Purchase Order,Customer Address Display,Kunde Adresse Skjerm
 DocType: Stock Settings,Default Valuation Method,Standard verdsettelsesmetode
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +127,Polishing,Polering
 DocType: Production Order Operation,Planned Start Time,Planlagt Starttid
 apps/erpnext/erpnext/config/accounts.py +63,Close Balance Sheet and book Profit or Loss.,Lukk Balanse og bok resultatet.
-apps/erpnext/erpnext/stock/doctype/item/item.py +661,"Default Unit of Measure for Item {0} cannot be changed directly because \
+apps/erpnext/erpnext/stock/doctype/item/item.py +665,"Default Unit of Measure for Item {0} cannot be changed directly because \
 			you have already made some transaction(s) with another UOM. To change default UOM, \
 			use 'UOM Replace Utility' tool under Stock module.","Standard Enhet for Element {0} kan ikke endres direkte fordi \ du allerede har gjort noen transaksjon (er) med en annen målenheter. For å endre standardmålenheter, \ bruk &#39;målenheter Erstatt Utility &quot;verktøy i henhold Stock modul."
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,Spesifiser Exchange Rate å konvertere en valuta til en annen
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +146,Quotation {0} is cancelled,Sitat {0} er kansellert
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +141,Quotation {0} is cancelled,Sitat {0} er kansellert
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,Totalt utestående beløp
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} was on leave on {1}. Cannot mark attendance.,Ansatt {0} var på permisjon på {1}. Kan ikke merke oppmøte.
 DocType: Sales Partner,Targets,Targets
@@ -2179,7 +2104,6 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +158,Please create Customer from Lead {0},Opprett Customer fra Lead {0}
 DocType: Price List,Applicable for Countries,Gjelder for Land
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Computers,Datamaskiner
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +112,Electro-chemical grinding,Elektro-kjemisk sliping
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +14,This is a root customer group and cannot be edited.,"Dette er en rot kundegruppe, og kan ikke redigeres."
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +39,Please setup your chart of accounts before you start Accounting Entries,Vennligst oppsettet ditt kontoplan før du begynner Regnskaps Entries
 DocType: Purchase Invoice,Ignore Pricing Rule,Ignorer Pricing Rule
@@ -2225,7 +2149,6 @@
 DocType: Maintenance Visit,Purposes,Formål
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +103,Atleast one item should be entered with negative quantity in return document,Atleast ett element bør legges inn med negativt antall i retur dokument
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +67,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","Operation {0} lenger enn noen tilgjengelige arbeidstimer i arbeidsstasjonen {1}, bryte ned driften i flere operasjoner"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +134,Electrochemical machining,Elektrokjemisk bearbeiding
 ,Requested,Spurt
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +66,No Remarks,Nei Anmerkninger
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +13,Overdue,Forfalt
@@ -2234,7 +2157,7 @@
 DocType: Monthly Distribution,Distribution Name,Distribusjon Name
 DocType: Features Setup,Sales and Purchase,Salg og Innkjøp
 DocType: Supplier Quotation Item,Material Request No,Materialet Request Ingen
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +218,Quality Inspection required for Item {0},Quality Inspection nødvendig for Element {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +221,Quality Inspection required for Item {0},Quality Inspection nødvendig for Element {0}
 DocType: Quotation,Rate at which customer's currency is converted to company's base currency,Hastigheten som kundens valuta er konvertert til selskapets hovedvaluta
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +107,{0} has been successfully unsubscribed from this list.,{0} har blitt avsluttet abonnementet fra denne listen.
 DocType: Purchase Invoice Item,Net Rate (Company Currency),Netto Rate (Selskap Valuta)
@@ -2252,9 +2175,8 @@
 apps/erpnext/erpnext/accounts/report/financial_statements.py +16,Fiscal Year {0} not found.,Regnskapsår {0} ble ikke funnet.
 DocType: Bank Reconciliation,Get Relevant Entries,Få Relevante Entries
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +407,Accounting Entry for Stock,Regnskap Entry for Stock
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +64,Coining,Preging
 DocType: Sales Invoice,Sales Team1,Salg TEAM1
-apps/erpnext/erpnext/stock/doctype/item/item.py +412,Item {0} does not exist,Element {0} finnes ikke
+apps/erpnext/erpnext/stock/doctype/item/item.py +416,Item {0} does not exist,Element {0} finnes ikke
 DocType: Sales Invoice,Customer Address,Kunde Adresse
 apps/frappe/frappe/desk/query_report.py +136,Total,Total
 DocType: Purchase Invoice,Apply Additional Discount On,Påfør Ytterligere rabatt på
@@ -2266,14 +2188,13 @@
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),Skattebeløp Etter Rabattbeløp (Company Valuta)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +149,Target warehouse is mandatory for row {0},Target lageret er obligatorisk for rad {0}
 DocType: Quality Inspection,Quality Inspection,Quality Inspection
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +144,Extra Small,Extra Small
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +20,Spray forming,Spray forming
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Extra Small,Extra Small
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +458,Warning: Material Requested Qty is less than Minimum Order Qty,Advarsel: Material Requested Antall er mindre enn Minimum Antall
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +191,Account {0} is frozen,Konto {0} er frosset
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Legal Entity / Datterselskap med en egen konto tilhørighet til organisasjonen.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +29,"Food, Beverage & Tobacco","Mat, drikke og tobakk"
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","Mat, drikke og tobakk"
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +20,PL or BS,PL eller BS
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,Can only make payment against unbilled {0},Kan bare gjøre betaling mot fakturert {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +531,Can only make payment against unbilled {0},Kan bare gjøre betaling mot fakturert {0}
 apps/erpnext/erpnext/controllers/selling_controller.py +122,Commission rate cannot be greater than 100,Kommisjon kan ikke være større enn 100
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Minimum Inventory Level,Minimum lagerbeholdning
 DocType: Stock Entry,Subcontract,Underentrepriser
@@ -2284,19 +2205,18 @@
 DocType: Item,Manufacturer Part Number,Produsentens varenummer
 DocType: Production Order Operation,Estimated Time and Cost,Estimert leveringstid og pris
 DocType: Bin,Bin,Bin
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +50,Nosing,Nosing
 DocType: SMS Log,No of Sent SMS,Ingen av Sendte SMS
 DocType: Account,Company,Selskap
 DocType: Account,Expense Account,Expense konto
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +49,Software,Programvare
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +151,Colour,Farge
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +49,Software,Programvare
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Colour,Farge
 DocType: Maintenance Visit,Scheduled,Planlagt
 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","Vennligst velg Element der &quot;Er Stock Item&quot; er &quot;Nei&quot; og &quot;Er Sales Item&quot; er &quot;Ja&quot;, og det er ingen andre Product Bundle"
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,Velg Månedlig Distribusjon til ujevnt fordele målene gjennom måneder.
 DocType: Purchase Invoice Item,Valuation Rate,Verdivurdering Rate
 apps/erpnext/erpnext/stock/get_item_details.py +281,Price List Currency not selected,Prisliste Valuta ikke valgt
 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,Sak Rad {0}: Kjøpskvittering {1} finnes ikke i ovenfor &#39;innkjøps Receipts&#39; bord
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +134,Employee {0} has already applied for {1} between {2} and {3},Ansatt {0} har allerede søkt om {1} mellom {2} og {3}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +145,Employee {0} has already applied for {1} between {2} and {3},Ansatt {0} har allerede søkt om {1} mellom {2} og {3}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Prosjekt startdato
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +8,Until,Inntil
 DocType: Rename Tool,Rename Log,Rename Logg
@@ -2306,7 +2226,7 @@
 apps/erpnext/erpnext/controllers/recurring_document.py +162,Please select {0},Vennligst velg {0}
 DocType: C-Form,C-Form No,C-Form Nei
 DocType: BOM,Exploded_items,Exploded_items
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +95,Researcher,Forsker
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Researcher,Forsker
 apps/frappe/frappe/custom/doctype/customize_form/customize_form.js +88,Update,Oppdater
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +78,Please save the Newsletter before sending,Ta vare på Nyhetsbrev før sending
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +23,Name or Email is mandatory,Navn eller E-post er obligatorisk
@@ -2315,11 +2235,10 @@
 DocType: Employee,Exit,Utgang
 apps/erpnext/erpnext/accounts/doctype/account/account.py +134,Root Type is mandatory,Root Type er obligatorisk
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +295,Serial No {0} created,Serial No {0} opprettet
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +125,Vibratory finishing,Vibrasjonsbehandling
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","For det lettere for kunder, kan disse kodene brukes i trykte formater som regningene og leveringssedlene"
 DocType: Employee,You can enter any date manually,Du kan legge inn noen dato manuelt
 DocType: Sales Invoice,Advertisement,Annonse
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +165,Probationary Period,Prøvetid
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Probationary Period,Prøvetid
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Bare bladnoder er tillatt i transaksjonen
 DocType: Expense Claim,Expense Approver,Expense Godkjenner
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,Kvitteringen Sak Leveres
@@ -2327,19 +2246,16 @@
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +17,To Datetime,Til Datetime
 DocType: SMS Settings,SMS Gateway URL,SMS Gateway URL
 apps/erpnext/erpnext/config/crm.py +53,Logs for maintaining sms delivery status,Logger for å opprettholde sms leveringsstatus
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +137,Grinding,Sliping
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +34,Shrink wrapping,Krympe innpakning
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +36,Pending Activities,Ventende Aktiviteter
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,Confirmed,Bekreftet
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier > Supplier Type,Leverandør&gt; Leverandør Type
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +127,Please enter relieving date.,Skriv inn lindrende dato.
 apps/erpnext/erpnext/controllers/trends.py +137,Amt,Amt
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' can be submitted,Kun La Applikasjoner med status &quot;Godkjent&quot; kan sendes inn
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +51,Only Leave Applications with status 'Approved' can be submitted,Kun La Applikasjoner med status &quot;Godkjent&quot; kan sendes inn
 apps/erpnext/erpnext/utilities/doctype/address/address.py +21,Address Title is mandatory.,Adresse Tittel er obligatorisk.
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,Skriv inn navnet på kampanjen hvis kilden til henvendelsen er kampanje
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +38,Newspaper Publishers,Avis Publishers
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +38,Newspaper Publishers,Avis Publishers
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,Velg regnskapsår
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +88,Smelting,Smelting
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Omgjøre nivå
 DocType: Attendance,Attendance Date,Oppmøte Dato
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,Lønn breakup basert på opptjening og fradrag.
@@ -2354,16 +2270,15 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +414,[Error],[Error]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,I Ord vil være synlig når du lagrer kundeordre.
 ,Employee Birthday,Ansatt Bursdag
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +55,Venture Capital,Venture Capital
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,Venture Capital
 DocType: UOM,Must be Whole Number,Må være hele tall
 DocType: Leave Control Panel,New Leaves Allocated (In Days),Nye Løv Tildelte (i dager)
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +51,Serial No {0} does not exist,Serial No {0} finnes ikke
 DocType: Pricing Rule,Discount Percentage,Rabatt Prosent
 DocType: Payment Reconciliation Invoice,Invoice Number,Fakturanummer
-apps/erpnext/erpnext/hooks.py +70,Orders,Bestillinger
+apps/erpnext/erpnext/hooks.py +54,Orders,Bestillinger
 DocType: Leave Control Panel,Employee Type,Ansettelsesform
 DocType: Employee Leave Approver,Leave Approver,La Godkjenner
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +70,Swaging,Swaging
 DocType: Manufacturing Settings,Material Transferred for Manufacture,Materialet Overført for Produksjon
 DocType: Expense Claim,"A user with ""Expense Approver"" role",En bruker med &quot;Expense Godkjenner&quot; rolle
 ,Issued Items Against Production Order,Utstedte gjenstander mot produksjonsordre
@@ -2375,7 +2290,6 @@
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +62,Cost Center with existing transactions can not be converted to group,Kostnadssted med eksisterende transaksjoner kan ikke konverteres til gruppen
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Depreciation,Avskrivninger
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Leverandør (er)
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +29,Invalid period,Ugyldig periode
 DocType: Customer,Credit Limit,Kredittgrense
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,Velg type transaksjon
 DocType: GL Entry,Voucher No,Kupong Ingen
@@ -2385,9 +2299,9 @@
 DocType: Customer,Address and Contact,Adresse og Kontakt
 DocType: Customer,Last Day of the Next Month,Siste dag av neste måned
 DocType: Employee,Feedback,Tilbakemelding
+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}","Permisjon kan ikke tildeles før {0}, som permisjon balanse har allerede vært carry-sendt i fremtiden permisjon tildeling posten {1}"
 apps/erpnext/erpnext/accounts/party.py +284,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Merk: På grunn / Reference Date stiger tillatt kunde kreditt dager med {0} dag (er)
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +621,Maint. Schedule,Maint. Tidsplan
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +108,Abrasive jet machining,Slipende jet maskinering
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +632,Maint. Schedule,Maint. Tidsplan
 DocType: Stock Settings,Freeze Stock Entries,Freeze Stock Entries
 DocType: Website Settings,Website Settings,Nettstedinnstillinger
 DocType: Item,Reorder level based on Warehouse,Omgjøre nivå basert på Warehouse
@@ -2404,7 +2318,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +75,Show Stock Entries,Vis Arkiv Entries
 ,Is Primary Address,Er Hovedadresse
 DocType: Production Order,Work-in-Progress Warehouse,Work-in-progress Warehouse
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +308,Reference #{0} dated {1},Reference # {0} datert {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Reference #{0} dated {1},Reference # {0} datert {1}
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +13,Manage Addresses,Administrer Adresser
 DocType: Pricing Rule,Item Code,Sak Kode
 DocType: Production Planning Tool,Create Production Orders,Opprett produksjonsordrer
@@ -2413,7 +2327,7 @@
 DocType: Lead,Market Segment,Markedssegment
 DocType: Communication,Phone,Telefon
 DocType: Employee Internal Work History,Employee Internal Work History,Ansatt Intern Work History
-apps/erpnext/erpnext/public/js/account_tree_grid.js +50,Closing (Dr),Lukking (Dr)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +221,Closing (Dr),Lukking (Dr)
 DocType: Contact,Passive,Passiv
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,Serial No {0} ikke på lager
 apps/erpnext/erpnext/config/selling.py +127,Tax template for selling transactions.,Skatt mal for å selge transaksjoner.
@@ -2429,8 +2343,8 @@
 ,Billed Amount,Fakturert beløp
 DocType: Bank Reconciliation,Bank Reconciliation,Bankavstemming
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +9,Get Updates,Få oppdateringer
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +129,Material Request {0} is cancelled or stopped,Materialet Request {0} blir kansellert eller stoppet
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +641,Add a few sample records,Legg et par eksempler på poster
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +133,Material Request {0} is cancelled or stopped,Materialet Request {0} blir kansellert eller stoppet
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Add a few sample records,Legg et par eksempler på poster
 apps/erpnext/erpnext/config/hr.py +210,Leave Management,La Ledelse
 DocType: Event,Groups,Grupper
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,Grupper etter Account
@@ -2443,38 +2357,34 @@
 DocType: Features Setup,Sales Extras,Salgs Extras
 apps/erpnext/erpnext/accounts/utils.py +344,{0} budget for Account {1} against Cost Center {2} will exceed by {3},{0} budsjett for kontoen {1} mot kostnadssted {2} vil overgå ved {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +236,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Forskjellen konto må være en eiendel / forpliktelse type konto, siden dette Stock Forsoning er en åpning Entry"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +138,Purchase Order number required for Item {0},Innkjøpsordrenummeret som kreves for Element {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Order number required for Item {0},Innkjøpsordrenummeret som kreves for Element {0}
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',&quot;Fra dato&quot; må være etter &#39;To Date&#39;
 ,Stock Projected Qty,Lager Antall projiserte
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +147,Customer {0} does not belong to project {1},Kunden {0} ikke hører til prosjektet {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +150,Customer {0} does not belong to project {1},Kunden {0} ikke hører til prosjektet {1}
 DocType: Sales Order,Customer's Purchase Order,Kundens innkjøpsordre
 DocType: Warranty Claim,From Company,Fra Company
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,Verdi eller Stk
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Minute,Minutt
+apps/erpnext/erpnext/public/js/setup_wizard.js +363,Minute,Minutt
 DocType: Purchase Invoice,Purchase Taxes and Charges,Kjøpe skatter og avgifter
 ,Qty to Receive,Antall å motta
 DocType: Leave Block List,Leave Block List Allowed,La Block List tillatt
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +61,Conversion factor cannot be in fractions,Omregningsfaktor kan ikke være i fraksjoner
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +358,You will use it to Login,Du vil bruke det til innlogging
+apps/erpnext/erpnext/public/js/setup_wizard.js +108,You will use it to Login,Du vil bruke det til innlogging
 DocType: Sales Partner,Retailer,Forhandler
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +99,Credit To account must be a Balance Sheet account,Kreditt til kontoen må være en balansekonto
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,Alle Leverandør Typer
 apps/erpnext/erpnext/stock/doctype/item/item.py +37,Item Code is mandatory because Item is not automatically numbered,Elementkode er obligatorisk fordi varen ikke blir automatisk nummerert
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +99,Quotation {0} not of type {1},Sitat {0} ikke av typen {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +93,Quotation {0} not of type {1},Sitat {0} ikke av typen {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,Vedlikeholdsplan Sak
 DocType: Sales Order,%  Delivered,% Leveres
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,Bank Overdraft Account,Kassekreditt konto
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +15,Make Salary Slip,Gjør Lønn Slip
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +18,Browse BOM,Bla BOM
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +175,Secured Loans,Sikret lån
-apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +3,Awesome Products,Awesome Produkter
+apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +3,Awesome Products,Awesome Produkter
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +189,Opening Balance Equity,Åpningsbalanse Equity
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +80,Cannot approve leave as you are not authorized to approve leaves on Block Dates,Kan ikke godkjenne permisjon som du ikke er autorisert til å godkjenne bladene på Block Datoer
 DocType: Appraisal,Appraisal,Appraisal
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +13,Lost-foam casting,Lost-skum avstøpning
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +47,Drawing,Tegning
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +22,Date is repeated,Dato gjentas
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +148,Leave approver must be one of {0},La godkjenner må være en av {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +162,Leave approver must be one of {0},La godkjenner må være en av {0}
 DocType: Hub Settings,Seller Email,Selger Email
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Total anskaffelseskost (via fakturaen)
 DocType: Workstation Working Hour,Start Time,Starttid
@@ -2488,7 +2398,7 @@
 DocType: Purchase Invoice Item,Net Amount (Company Currency),Nettobeløp (Company Valuta)
 DocType: BOM Operation,Hour Rate,Time Rate
 DocType: Stock Settings,Item Naming By,Sak Naming Av
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +642,From Quotation,Fra sitat
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +655,From Quotation,Fra sitat
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},En annen periode Closing Entry {0} har blitt gjort etter {1}
 DocType: Production Order,Material Transferred for Manufacturing,Materialet Overført for Manufacturing
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +29,Account {0} does not exists,Konto {0} ikke eksisterer
@@ -2502,21 +2412,19 @@
 DocType: Purchase Invoice Item,PR Detail,PR Detalj
 DocType: Sales Order,Fully Billed,Fullt Fakturert
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +20,Cash In Hand,Kontanter
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +72,Delivery warehouse required for stock item {0},Levering lager nødvendig for lagervare {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +119,Delivery warehouse required for stock item {0},Levering lager nødvendig for lagervare {0}
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),Totalvekten av pakken. Vanligvis nettovekt + emballasjematerialet vekt. (For utskrift)
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Brukere med denne rollen har lov til å sette frosne kontoer og lage / endre regnskapspostene mot frosne kontoer
 DocType: Serial No,Is Cancelled,Er Avlyst
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +281,My Shipments,Mine Forsendelser
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +286,My Shipments,Mine Forsendelser
 DocType: Journal Entry,Bill Date,Bill Dato
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +43,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","Selv om det er flere Prising regler med høyest prioritet, deretter følgende interne prioriteringer til grunn:"
 DocType: Supplier,Supplier Details,Leverandør Detaljer
 DocType: Communication,Recipients,Mottakere
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +146,Screwing,Skruing
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +96,Knurling,Knurling
 DocType: Expense Claim,Approval Status,Godkjenningsstatus
 DocType: Hub Settings,Publish Items to Hub,Publiser varer i Hub
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +44,From value must be less than to value in row {0},Fra verdien må være mindre enn til verdien i rad {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +133,Wire Transfer,Wire Transfer
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +133,Wire Transfer,Wire Transfer
 apps/erpnext/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py +25,Please select Bank Account,Vennligst velg Bank Account
 DocType: Newsletter,Create and Send Newsletters,Lag og send nyhetsbrev
 apps/frappe/frappe/public/js/frappe/views/reports/grid_report.js +305,From Date must be before To Date,Fra dato må være før til dato
@@ -2524,14 +2432,14 @@
 DocType: Company,Default Income Account,Standard Inntekt konto
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,Kunden Group / Kunde
 DocType: Item Group,Check this if you want to show in website,Sjekk dette hvis du vil vise på nettstedet
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +190,Welcome to ERPNext,Velkommen til ERPNext
+,Welcome to ERPNext,Velkommen til ERPNext
 DocType: Payment Reconciliation Payment,Voucher Detail Number,Kupong Detalj Number
 apps/erpnext/erpnext/config/crm.py +146,Lead to Quotation,Føre til prisanslag
 DocType: Lead,From Customer,Fra Customer
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +37,Calls,Samtaler
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Calls,Samtaler
 DocType: Project,Total Costing Amount (via Time Logs),Total koster Beløp (via Time Logger)
 DocType: Purchase Order Item Supplied,Stock UOM,Stock målenheter
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Purchase Order {0} is not submitted,Purchase Order {0} ikke er sendt
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +194,Purchase Order {0} is not submitted,Purchase Order {0} ikke er sendt
 ,Projected,Prosjekterte
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},Serial No {0} tilhører ikke Warehouse {1}
 apps/erpnext/erpnext/controllers/status_updater.py +136,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Merk: Systemet vil ikke sjekke over-levering og over-booking for Element {0} som mengde eller beløpet er 0
@@ -2539,7 +2447,6 @@
 DocType: Issue,Opening Date,Åpningsdato
 DocType: Journal Entry,Remark,Bemerkning
 DocType: Purchase Receipt Item,Rate and Amount,Rate og Beløp
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +95,Boring,Boring
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +667,From Sales Order,Fra salgsordre
 DocType: Blog Category,Parent Website Route,Parent Website Route
 DocType: Sales Order,Not Billed,Ikke Fakturert
@@ -2553,19 +2460,17 @@
 apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount Amount,Rabattbeløp
 DocType: Purchase Invoice,Return Against Purchase Invoice,Tilbake mot fakturaen
 DocType: Item,Warranty Period (in days),Garantiperioden (i dager)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +550,e.g. VAT,reskontroførsel
+apps/erpnext/erpnext/public/js/setup_wizard.js +292,e.g. VAT,reskontroførsel
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,Sak 4
 DocType: Journal Entry Account,Journal Entry Account,Journal Entry konto
 DocType: Shopping Cart Settings,Quotation Series,Sitat Series
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +52,"An item exists with same name ({0}), please change the item group name or rename the item","Et element eksisterer med samme navn ({0}), må du endre navn varegruppen eller endre navn på elementet"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +82,Hot metal gas forming,Varmt metall gass forming
 DocType: Sales Order Item,Sales Order Date,Salgsordre Dato
 DocType: Sales Invoice Item,Delivered Qty,Leveres Antall
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +63,Warehouse {0}: Company is mandatory,Warehouse {0}: Selskapet er obligatorisk
 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.",Gå til den aktuelle gruppen (vanligvis finansieringskilde&gt; Kortsiktig gjeld&gt; Skatter og plikter og opprette en ny konto (ved å klikke på Legg Child) av typen &quot;Skatt&quot; og gjøre nevne skattesatsen.
 ,Payment Period Based On Invoice Date,Betaling perioden basert på Fakturadato
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +50,Missing Currency Exchange Rates for {0},Mangler valutakurser for {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +135,Laser cutting,Laser skjæring
 DocType: Event,Monday,Mandag
 DocType: Journal Entry,Stock Entry,Stock Entry
 DocType: Account,Payable,Betales
@@ -2598,7 +2503,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +111,Date Of Retirement must be greater than Date of Joining,Pensjoneringstidspunktet må være større enn tidspunktet for inntreden
 DocType: Sales Invoice,Against Income Account,Mot Inntekt konto
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +69,{0}% Delivered,{0}% Leveres
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +78,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Element {0}: Bestilte qty {1} kan ikke være mindre enn minimum ordreantall {2} (definert i punkt).
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Element {0}: Bestilte qty {1} kan ikke være mindre enn minimum ordreantall {2} (definert i punkt).
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Månedlig Distribution Prosent
 DocType: Territory,Territory Targets,Terri Targets
 DocType: Delivery Note,Transporter Info,Transporter Info
@@ -2607,7 +2512,6 @@
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,Titler for utskriftsmaler f.eks Proforma Faktura.
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +140,Valuation type charges can not marked as Inclusive,Verdsettelse typen kostnader kan ikke merket som Inclusive
 DocType: POS Profile,Update Stock,Oppdater Stock
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +128,Superfinishing,Superfinishing
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,Ulik målenheter for elementer vil føre til feil (Total) Netto vekt verdi. Sørg for at nettovekt av hvert element er i samme målenheter.
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM Rate
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +85,Please pull items from Delivery Note,Kan trekke elementer fra følgeseddel
@@ -2622,7 +2526,6 @@
 ,Purchase Analytics,Kjøps Analytics
 DocType: Sales Invoice Item,Delivery Note Item,Levering Note Element
 DocType: Expense Claim,Task,Task
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +57,Shaving,Barbering
 DocType: Purchase Taxes and Charges,Reference Row #,Referanse Row #
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},Batchnummer er obligatorisk for Element {0}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js +14,This is a root sales person and cannot be edited.,Dette er en grunnlegg salg person og kan ikke redigeres.
@@ -2634,13 +2537,11 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +74,Purpose must be one of {0},Hensikten må være en av {0}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +108,Fill the form and save it,Fyll ut skjemaet og lagre det
 DocType: Production Planning Tool,Download a report containing all raw materials with their latest inventory status,Last ned en rapport som inneholder alle råvarer med deres nyeste inventar status
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +94,Facing,Facing
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,Community Forum
 DocType: Leave Application,Leave Balance Before Application,La Balance Før Application
 DocType: SMS Center,Send SMS,Send SMS
 DocType: Company,Default Letter Head,Standard Brevhode
 DocType: Time Log,Billable,Fakturerbare
-DocType: Authorization Rule,This will be used for setting rule in HR module,Dette vil bli brukt for å sette regelen i HR-modul
 DocType: Account,Rate at which this tax is applied,Hastigheten som denne skatten er brukt
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reorder Qty,Omgjøre Antall
 DocType: Company,Stock Adjustment Account,Stock Adjustment konto
@@ -2667,16 +2568,15 @@
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,Prosentvis Tildeling skal være lik 100%
 DocType: Serial No,Out of AMC,Ut av AMC
 DocType: Purchase Order Item,Material Request Detail No,Materialet Request Detail Ingen
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +97,Hard turning,Hard vende
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +33,Make Maintenance Visit,Gjør Vedlikehold Visit
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +187,Please contact to the user who have Sales Master Manager {0} role,Ta kontakt for brukeren som har salgs Master manager {0} rolle
 DocType: Company,Default Cash Account,Standard Cash konto
 apps/erpnext/erpnext/config/accounts.py +79,Company (not Customer or Supplier) master.,Company (ikke kunde eller leverandør) mester.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +106,Please enter 'Expected Delivery Date',Skriv inn &quot;Forventet Leveringsdato &#39;
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +187,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Levering Merknader {0} må avbestilles før den avbryter denne salgsordre
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +100,Please enter 'Expected Delivery Date',Skriv inn &quot;Forventet Leveringsdato &#39;
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +182,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Levering Merknader {0} må avbestilles før den avbryter denne salgsordre
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +373,Paid amount + Write Off Amount can not be greater than Grand Total,Innbetalt beløp + avskrive Beløpet kan ikke være større enn Totalsum
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} er ikke en gyldig batchnummer for varen {1}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,Note: There is not enough leave balance for Leave Type {0},Merk: Det er ikke nok permisjon balanse for La Type {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +124,Note: There is not enough leave balance for Leave Type {0},Merk: Det er ikke nok permisjon balanse for La Type {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.","Merk: Dersom betaling ikke skjer mot noen referanse, gjøre Journal Entry manuelt."
 DocType: Item,Supplier Items,Leverandør Items
 DocType: Opportunity,Opportunity Type,Opportunity Type
@@ -2688,7 +2588,7 @@
 DocType: Hub Settings,Publish Availability,Publiser Tilgjengelighet
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +105,Date of Birth cannot be greater than today.,Fødselsdato kan ikke være større enn i dag.
 ,Stock Ageing,Stock Ageing
-apps/erpnext/erpnext/controllers/accounts_controller.py +200,{0} '{1}' is disabled,{0} {1} er deaktivert
+apps/erpnext/erpnext/controllers/accounts_controller.py +201,{0} '{1}' is disabled,{0} {1} er deaktivert
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Sett som Åpen
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Send automatisk e-poster til Kontakter på Sende transaksjoner.
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +232,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
@@ -2697,44 +2597,38 @@
 DocType: Purchase Order,Customer Contact Email,Kundekontakt E-post
 DocType: Event,Sunday,Søndag
 DocType: Sales Team,Contribution (%),Bidrag (%)
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +455,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,Merk: Betaling Entry vil ikke bli laget siden &quot;Cash eller bankkontoen ble ikke spesifisert
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +171,Responsibilities,Ansvarsområder
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +457,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,Merk: Betaling Entry vil ikke bli laget siden &quot;Cash eller bankkontoen ble ikke spesifisert
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +171,Responsibilities,Ansvarsområder
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Template,Mal
 DocType: Sales Person,Sales Person Name,Sales Person Name
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,Skriv inn atleast en faktura i tabellen
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +511,Add Users,Legg til brukere
+apps/erpnext/erpnext/public/js/setup_wizard.js +255,Add Users,Legg til brukere
 DocType: Pricing Rule,Item Group,Varegruppe
 DocType: Task,Actual Start Date (via Time Logs),Faktisk startdato (via Time Logger)
 DocType: Stock Reconciliation Item,Before reconciliation,Før avstemming
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +12,To {0},Til {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Skatter og avgifter legges (Company Valuta)
-apps/erpnext/erpnext/stock/doctype/item/item.py +340,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Sak Skatte Rad {0} må ha konto for type skatt eller inntekt eller kostnad eller Charge
+apps/erpnext/erpnext/stock/doctype/item/item.py +344,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Sak Skatte Rad {0} må ha konto for type skatt eller inntekt eller kostnad eller Charge
 DocType: Sales Order,Partly Billed,Delvis Fakturert
 DocType: Item,Default BOM,Standard BOM
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +79,Decambering,Decambering
 apps/erpnext/erpnext/setup/doctype/company/company.js +22,Please re-type company name to confirm,Vennligst re-type firmanavn for å bekrefte
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,Total Outstanding Amt
 DocType: Time Log Batch,Total Hours,Totalt antall timer
 DocType: Journal Entry,Printing Settings,Utskriftsinnstillinger
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +268,Total Debit must be equal to Total Credit. The difference is {0},Total debet må være lik samlet kreditt. Forskjellen er {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +11,Automotive,Automotive
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +37,Item is required,Elementet er påkrevd
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +25,Metal injection molding,Metal sprøytestøping
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +258,Total Debit must be equal to Total Credit. The difference is {0},Total debet må være lik samlet kreditt. Forskjellen er {0}
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,Automotive
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +684,From Delivery Note,Fra følgeseddel
 DocType: Time Log,From Time,Fra Time
 DocType: Notification Control,Custom Message,Standard melding
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +33,Investment Banking,Investment Banking
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +261,"Select your Country, Time Zone and Currency","Velg land, tidssone og valuta"
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,Investment Banking
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +316,"Select your Country, Time Zone and Currency","Velg land, tidssone og valuta"
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +369,Cash or Bank Account is mandatory for making payment entry,Kontanter eller bankkontoen er obligatorisk for å gjøre betaling oppføring
 DocType: Purchase Invoice,Price List Exchange Rate,Prisliste Exchange Rate
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +91,Pickling,Pickling
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +18,Sand casting,Sand avstøpning
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +117,Electroplating,Galvanisering
 DocType: Purchase Invoice Item,Rate,Rate
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +62,Intern,Intern
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Intern,Intern
 DocType: Newsletter,A Lead with this email id should exist,En Lead med denne e-id skal eksistere
 DocType: Stock Entry,From BOM,Fra BOM
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +34,Basic,Grunnleggende
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +34,Basic,Grunnleggende
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,Lagertransaksjoner før {0} er frosset
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +217,Please click on 'Generate Schedule',Vennligst klikk på &quot;Generer Schedule &#39;
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +61,To Date should be same as From Date for Half Day leave,To Date skal være det samme som Fra Dato for Half Day permisjon
@@ -2742,10 +2636,10 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +96,Reference No is mandatory if you entered Reference Date,Referansenummer er obligatorisk hvis du skrev Reference Date
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +108,Date of Joining must be greater than Date of Birth,Dato Bli må være større enn fødselsdato
 DocType: Salary Structure,Salary Structure,Lønn Struktur
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +242,"Multiple Price Rule exists with same criteria, please resolve \
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +246,"Multiple Price Rule exists with same criteria, please resolve \
 			conflict by assigning priority. Price Rules: {0}","Multiple Pris Regel eksisterer med samme kriteriene, kan du løse \ konflikten ved å prioritere. Pris Regler: {0}"
 DocType: Account,Bank,Bank
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +9,Airline,Flyselskap
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,Flyselskap
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +493,Issue Material,Issue Material
 DocType: Material Request Item,For Warehouse,For Warehouse
 DocType: Employee,Offer Date,Tilbudet Dato
@@ -2755,29 +2649,24 @@
 DocType: Item,Is Fixed Asset Item,Er Fixed Asset Element
 DocType: Stock Entry,Including items for sub assemblies,Inkludert elementer for sub samlinger
 DocType: Features Setup,"If you have long print formats, this feature can be used to split the page to be printed on multiple pages with all headers and footers on each page","Hvis du har lange utskriftsformater, kan denne funksjonen brukes til å splitte den siden som skal skrives ut på flere sider med alle topp- og bunntekster på hver side"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +131,Hobbing,Hobbing
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +98,All Territories,Alle Territories
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +98,All Territories,Alle Territories
 DocType: Purchase Invoice,Items,Elementer
 DocType: Fiscal Year,Year Name,År Navn
 DocType: Process Payroll,Process Payroll,Process Lønn
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +59,There are more holidays than working days this month.,Det er mer ferie enn virkedager denne måneden.
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +68,There are more holidays than working days this month.,Det er mer ferie enn virkedager denne måneden.
 DocType: Product Bundle Item,Product Bundle Item,Produktet Bundle Element
 DocType: Sales Partner,Sales Partner Name,Sales Partner Name
 DocType: Purchase Invoice Item,Image View,Bilde Vis
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +113,Finishing & industrial finishing,Finishing &amp; industribehandling
 DocType: Issue,Opening Time,Åpning Tid
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,Fra og Til dato kreves
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +46,Securities & Commodity Exchanges,Verdipapirer og råvarebørser
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Verdipapirer og råvarebørser
 DocType: Shipping Rule,Calculate Based On,Beregn basert på
 DocType: Delivery Note Item,From Warehouse,Fra Warehouse
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +98,Drilling,Drilling
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +28,Blow molding,Formblåsing
 DocType: Purchase Taxes and Charges,Valuation and Total,Verdivurdering og Total
 DocType: Tax Rule,Shipping City,Shipping by
 apps/erpnext/erpnext/stock/doctype/item/item.js +43,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,Denne varen er en variant av {0} (Mal). Attributtene vil bli kopiert over fra malen med mindre &#39;No Copy&#39; er satt
 DocType: Account,Purchase User,Kjøp User
 DocType: Notification Control,Customize the Notification,Tilpass varslings
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +87,Hammering,Hammering
 DocType: Web Page,Slideshow,Lysbildefremvisning
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +24,Default Address Template cannot be deleted,Standard adresse mal kan ikke slettes
 DocType: Sales Invoice,Shipping Rule,Shipping Rule
@@ -2786,9 +2675,8 @@
 DocType: Workflow State,Search,Søk
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +54,Total cannot be zero,Totalt kan ikke være null
 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,&#39;Dager siden siste Bestill &quot;må være større enn eller lik null
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +142,Brazing,Lodding
 DocType: C-Form,Amended From,Endret Fra
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Raw Material,Råmateriale
+apps/erpnext/erpnext/public/js/setup_wizard.js +359,Raw Material,Råmateriale
 DocType: Leave Application,Follow via Email,Følg via e-post
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Skattebeløp Etter Rabattbeløp
 apps/erpnext/erpnext/accounts/doctype/account/account.py +174,Child account exists for this account. You can not delete this account.,Barnekonto som finnes for denne kontoen. Du kan ikke slette denne kontoen.
@@ -2802,10 +2690,10 @@
 ,Produced,Produsert
 DocType: Item,Item Code for Suppliers,Sak Kode for leverandører
 DocType: Issue,Raised By (Email),Raised By (e-post)
-apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +72,General,Generelt
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +495,Attach Letterhead,Fest Brev
+apps/erpnext/erpnext/setup/setup_wizard/default_website.py +72,General,Generelt
+apps/erpnext/erpnext/public/js/setup_wizard.js +241,Attach Letterhead,Fest Brev
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +272,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',Kan ikke trekke når kategorien er for verdsetting &quot;eller&quot; Verdsettelse og Totals
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +542,"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.","List dine skatte hoder (f.eks merverdiavgift, toll etc, de bør ha unike navn) og deres standardsatser. Dette vil skape en standard mal, som du kan redigere og legge til mer senere."
+apps/erpnext/erpnext/public/js/setup_wizard.js +284,"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.","List dine skatte hoder (f.eks merverdiavgift, toll etc, de bør ha unike navn) og deres standardsatser. Dette vil skape en standard mal, som du kan redigere og legge til mer senere."
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial Nos Required for Serialized Item {0},Serial Nos Nødvendig for Serialisert Element {0}
 DocType: Journal Entry,Bank Entry,Bank Entry
 DocType: Authorization Rule,Applicable To (Designation),Gjelder til (Betegnelse)
@@ -2814,32 +2702,31 @@
 apps/erpnext/erpnext/config/accounts.py +143,Enable / disable currencies.,Aktivere / deaktivere valutaer.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Postal Expenses,Post Utgifter
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Total (Amt)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +26,Entertainment & Leisure,Entertainment &amp; Leisure
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,Entertainment &amp; Leisure
 DocType: Purchase Order,The date on which recurring order will be stop,Datoen da gjentakende ordre vil bli stoppe
 DocType: Quality Inspection,Item Serial No,Sak Serial No
 apps/erpnext/erpnext/controllers/status_updater.py +142,{0} must be reduced by {1} or you should increase overflow tolerance,{0} må reduseres med {1} eller du bør øke overløps toleranse
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Present,Total Present
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Hour,Time
+apps/erpnext/erpnext/public/js/setup_wizard.js +363,Hour,Time
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +138,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation",Serialisert Element {0} kan ikke oppdateres \ bruker Stock Avstemming
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +488,Transfer Material to Supplier,Overføre materialet til Leverandør
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +513,Transfer Material to Supplier,Overføre materialet til Leverandør
 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,New Serial No kan ikke ha Warehouse. Warehouse må settes av Stock Entry eller Kjøpskvittering
 DocType: Lead,Lead Type,Lead Type
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +82,Create Quotation,Lag sitat
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +306,All these items have already been invoiced,Alle disse elementene er allerede blitt fakturert
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,You are not authorized to approve leaves on Block Dates,Du er ikke autorisert til å godkjenne blader på Block Datoer
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +311,All these items have already been invoiced,Alle disse elementene er allerede blitt fakturert
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},Kan godkjennes av {0}
 DocType: Shipping Rule,Shipping Rule Conditions,Frakt Regel betingelser
 DocType: BOM Replace Tool,The new BOM after replacement,Den nye BOM etter utskiftning
 DocType: Features Setup,Point of Sale,Utsalgssted
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +83,Curling,Curling
 DocType: Account,Tax,Skatte
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +28,Row {0}: {1} is not a valid {2},Rad {0}: {1} er ikke en gyldig {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +89,Refining,Raffinering
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +37,Row {0}: {1} is not a valid {2},Rad {0}: {1} er ikke en gyldig {2}
 DocType: Production Planning Tool,Production Planning Tool,Produksjonsplanlegging Tool
 DocType: Quality Inspection,Report Date,Rapporter Date
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +130,Routing,Routing
 DocType: C-Form,Invoices,Fakturaer
 DocType: Job Opening,Job Title,Jobbtittel
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +54,{0} already allocated for Employee {1} for period {2} - {3},{0} allerede bevilget for Employee {1} for perioden {2} - {3}
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +80,{0} Recipients,{0} Mottakere
 DocType: Features Setup,Item Groups in Details,Varegrupper i detaljer
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +335,Quantity to Manufacture must be greater than 0.,Antall å Manufacture må være større enn 0.
@@ -2857,14 +2744,13 @@
 DocType: DocType,Setup,Setup
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,Det er ingenting å redigere.
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +108,Summary for this month and pending activities,Oppsummering for denne måneden og ventende aktiviteter
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +39,Cold rolling,Kaldvalsing
 DocType: Customer Group,Customer Group Name,Kundegruppenavn
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +408,Please remove this Invoice {0} from C-Form {1},Vennligst fjern denne Faktura {0} fra C-Form {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +410,Please remove this Invoice {0} from C-Form {1},Vennligst fjern denne Faktura {0} fra C-Form {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,Vennligst velg bære frem hvis du også vil ha med forrige regnskapsår balanse later til dette regnskapsåret
 DocType: GL Entry,Against Voucher Type,Mot Voucher Type
 DocType: Item,Attributes,Egenskaper
 DocType: Packing Slip,Get Items,Få Items
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +186,Please enter Write Off Account,Skriv inn avskrive konto
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +187,Please enter Write Off Account,Skriv inn avskrive konto
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +71,Last Order Date,Siste Order Date
 DocType: DocField,Image,Bilde
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +179,Make Excise Invoice,Gjør Vesenet Faktura
@@ -2874,7 +2760,7 @@
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +146,Operation ID not set,Operasjon ID ikke satt
 DocType: Production Order,Planned Start Date,Planlagt startdato
 DocType: Serial No,Creation Document Type,Creation dokumenttype
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +620,Maint. Visit,Maint. Besøk
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +631,Maint. Visit,Maint. Besøk
 DocType: Leave Type,Is Encash,Er encash
 DocType: Purchase Invoice,Mobile No,Mobile No
 DocType: Payment Tool,Make Journal Entry,Gjør Journal Entry
@@ -2882,35 +2768,31 @@
 apps/erpnext/erpnext/controllers/trends.py +257,Project-wise data is not available for Quotation,Prosjekt-messig data er ikke tilgjengelig for prisanslag
 DocType: Project,Expected End Date,Forventet sluttdato
 DocType: Appraisal Template,Appraisal Template Title,Appraisal Mal Tittel
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +440,Commercial,Commercial
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +378,Commercial,Commercial
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +23,Parent Item {0} must not be a Stock Item,Parent Element {0} må ikke være en lagervare
 DocType: Cost Center,Distribution Id,Distribusjon Id
-apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +14,Awesome Services,Awesome Tjenester
+apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +14,Awesome Services,Awesome Tjenester
 apps/erpnext/erpnext/config/manufacturing.py +29,All Products or Services.,Alle produkter eller tjenester.
 DocType: Purchase Invoice,Supplier Address,Leverandør Adresse
 DocType: Contact Us Settings,Address Line 2,Adresselinje 2
 DocType: ToDo,Reference,Referanse
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +59,Perforating,Perforering
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,Ut Antall
 apps/erpnext/erpnext/config/accounts.py +128,Rules to calculate shipping amount for a sale,Regler for å beregne frakt beløp for et salg
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +29,Series is mandatory,Serien er obligatorisk
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +28,Financial Services,Finansielle Tjenester
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,Finansielle Tjenester
 apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3},Verdi for Egenskap {0} må være innenfor rekkevidden av {1} til {2} i trinn på {3}
 DocType: Tax Rule,Sales,Salgs
 DocType: Stock Entry Detail,Basic Amount,Grunnbeløp
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +173,Warehouse required for stock Item {0},Warehouse nødvendig for lager Element {0}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +178,Warehouse required for stock Item {0},Warehouse nødvendig for lager Element {0}
 DocType: Leave Allocation,Unused leaves,Ubrukte blader
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,Cr
 DocType: Customer,Default Receivable Accounts,Standard Fordringer Kunde
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +102,Sawing,Saging
 DocType: Tax Rule,Billing State,Billing State
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +32,Laminating,Lamine
 DocType: Item Reorder,Transfer,Transfer
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +549,Fetch exploded BOM (including sub-assemblies),Hente eksploderte BOM (inkludert underenheter)
 DocType: Authorization Rule,Applicable To (Employee),Gjelder til (Employee)
 apps/erpnext/erpnext/controllers/accounts_controller.py +101,Due Date is mandatory,Due Date er obligatorisk
 apps/erpnext/erpnext/controllers/item_variant.py +51,Increment for Attribute {0} cannot be 0,Økning for Egenskap {0} kan ikke være 0
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +143,Sintering,Sintring
 DocType: Journal Entry,Pay To / Recd From,Betal Til / recd From
 DocType: Naming Series,Setup Series,Oppsett Series
 DocType: Supplier,Contact HTML,Kontakt HTML
@@ -2923,7 +2805,6 @@
 DocType: Attendance,Absent,Fraværende
 DocType: Product Bundle,Product Bundle,Produktet Bundle
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +180,Row {0}: Invalid reference {1},Rad {0}: Ugyldig referanse {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +165,Crushing,Knusing
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Kjøpe skatter og avgifter Mal
 DocType: Upload Attendance,Download Template,Last ned Mal
 DocType: GL Entry,Remarks,Bemerkninger
@@ -2931,14 +2812,12 @@
 DocType: Journal Entry,Write Off Based On,Skriv Off basert på
 DocType: Features Setup,POS View,POS Vis
 apps/erpnext/erpnext/config/stock.py +38,Installation record for a Serial No.,Installasjon rekord for en Serial No.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +9,Continuous casting,Kontinuerlig avstøpning
 apps/erpnext/erpnext/public/js/queries.js +39,Please specify a,Vennligst oppgi en
 DocType: Offer Letter,Awaiting Response,Venter på svar
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +53,Above,Fremfor
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +80,Cold sizing,Cold dimensjonering
 DocType: Salary Slip,Earning & Deduction,Tjene &amp; Fradrag
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +76,Account {0} cannot be a Group,Konto {0} kan ikke være en gruppe
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +259,Region,Region
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +314,Region,Region
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +213,Optional. This setting will be used to filter in various transactions.,Valgfritt. Denne innstillingen vil bli brukt for å filtrere i forskjellige transaksjoner.
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +104,Negative Valuation Rate is not allowed,Negative Verdivurdering Rate er ikke tillatt
 DocType: Holiday List,Weekly Off,Ukentlig Off
@@ -2956,7 +2835,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,Account {0} is inactive,Konto {0} er inaktiv
 DocType: GL Entry,Is Advance,Er Advance
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,Oppmøte Fra Dato og oppmøte To Date er obligatorisk
-apps/erpnext/erpnext/controllers/buying_controller.py +131,Please enter 'Is Subcontracted' as Yes or No,Skriv inn &#39;Er underleverandør&#39; som Ja eller Nei
+apps/erpnext/erpnext/controllers/buying_controller.py +122,Please enter 'Is Subcontracted' as Yes or No,Skriv inn &#39;Er underleverandør&#39; som Ja eller Nei
 DocType: Sales Team,Contact No.,Kontaktnummer.
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,'Profit and Loss' type account {0} not allowed in Opening Entry,&quot;Resultat &#39;type konto {0} ikke tillatt i Åpning Entry
 DocType: Workflow State,Time,Tid
@@ -2965,14 +2844,13 @@
 DocType: Authorization Rule,Authorization Rule,Autorisasjon Rule
 DocType: Sales Invoice,Terms and Conditions Details,Vilkår og betingelser Detaljer
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,Salgs skatter og avgifter Mal
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +10,Apparel & Accessories,Klær og tilbehør
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,Klær og tilbehør
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +67,Number of Order,Antall Bestill
 DocType: Item Group,HTML / Banner that will show on the top of product list.,HTML / Banner som vil vises på toppen av listen over produkter.
 DocType: Shipping Rule,Specify conditions to calculate shipping amount,Spesifiser forhold til å beregne frakt beløp
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +121,Add Child,Legg Child
 DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,Rolle lov til å sette Frosne Kontoer og Rediger Frosne Entries
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +52,Cannot convert Cost Center to ledger as it has child nodes,Kan ikke konvertere kostnadssted til hovedbok som den har barnet noder
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +47,Conversion Factor is required,Omregningsfaktor er nødvendig
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +37,Serial #,Serial #
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +87,Commission on Sales,Provisjon på salg
 DocType: Offer Letter Term,Value / Description,Verdi / beskrivelse
@@ -2980,10 +2858,8 @@
 ,Customers Not Buying Since Long Time,Kunder Ikke Kjøpe siden lenge
 DocType: Production Order,Expected Delivery Date,Forventet Leveringsdato
 apps/erpnext/erpnext/accounts/general_ledger.py +121,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Debet- og kredittkort ikke lik for {0} # {1}. Forskjellen er {2}.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +48,Bulging,Svulmende
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +11,Evaporative-pattern casting,Fordamping-mønster casting
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Entertainment Expenses,Underholdning Utgifter
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +195,Sales Invoice {0} must be cancelled before cancelling this Sales Order,Salg Faktura {0} må slettes før den sletter denne salgsordre
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +190,Sales Invoice {0} must be cancelled before cancelling this Sales Order,Salg Faktura {0} må slettes før den sletter denne salgsordre
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +61,Age,Alder
 DocType: Time Log,Billing Amount,Faktureringsbeløp
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +84,Invalid quantity specified for item {0}. Quantity should be greater than 0.,Ugyldig kvantum spesifisert for elementet {0}. Antall må være større enn 0.
@@ -3002,26 +2878,24 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,Ny kunde Revenue
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Travel Expenses,Reiseutgifter
 DocType: Maintenance Visit,Breakdown,Sammenbrudd
-apps/erpnext/erpnext/controllers/accounts_controller.py +241,Account: {0} with currency: {1} can not be selected,Konto: {0} med valuta: {1} kan ikke velges
+apps/erpnext/erpnext/controllers/accounts_controller.py +242,Account: {0} with currency: {1} can not be selected,Konto: {0} med valuta: {1} kan ikke velges
 DocType: Bank Reconciliation Detail,Cheque Date,Sjekk Dato
 apps/erpnext/erpnext/accounts/doctype/account/account.py +47,Account {0}: Parent account {1} does not belong to company: {2},Konto {0}: Parent konto {1} ikke tilhører selskapet: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted all transactions related to this company!,Slettet alle transaksjoner knyttet til dette selskapet!
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,Som på dato
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +111,Honing,Honing
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +58,Probation,Prøvetid
-apps/erpnext/erpnext/stock/doctype/item/item.py +264,Default Warehouse is mandatory for stock Item.,Standard Warehouse er obligatorisk for lagervare.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Probation,Prøvetid
+apps/erpnext/erpnext/stock/doctype/item/item.py +268,Default Warehouse is mandatory for stock Item.,Standard Warehouse er obligatorisk for lagervare.
 DocType: Feed,Full Name,Fullt Navn
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +148,Clinching,Clinching
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +191,Payment of salary for the month {0} and year {1},Utbetaling av lønn for måneden {0} og år {1}
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +173,Payment of salary for the month {0} and year {1},Utbetaling av lønn for måneden {0} og år {1}
 DocType: Stock Settings,Auto insert Price List rate if missing,Auto innsats Prisliste rente hvis mangler
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,Totalt innbetalt beløp
 ,Transferred Qty,Overført Antall
 apps/erpnext/erpnext/config/learn.py +11,Navigating,Navigere
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +137,Planning,Planlegging
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +137,Planning,Planlegging
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +9,Make Time Log Batch,Gjør Tid Logg Batch
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Issued,Utstedt
 DocType: Project,Total Billing Amount (via Time Logs),Total Billing Beløp (via Time Logger)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +629,We sell this Item,Vi selger denne vare
+apps/erpnext/erpnext/public/js/setup_wizard.js +365,We sell this Item,Vi selger denne vare
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +65,Supplier Id,Leverandør Id
 DocType: Journal Entry,Cash Entry,Cash Entry
 DocType: Sales Partner,Contact Desc,Kontakt Desc
@@ -3030,18 +2904,16 @@
 DocType: Brand,Item Manager,Sak manager
 DocType: Cost Center,Add rows to set annual budgets on Accounts.,Legg rekker å sette årlige budsjettene på Kontoer.
 DocType: Buying Settings,Default Supplier Type,Standard Leverandør Type
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +160,Quarrying,Bergverk
 DocType: Production Order,Total Operating Cost,Total driftskostnader
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +160,Note: Item {0} entered multiple times,Merk: Element {0} inngått flere ganger
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +163,Note: Item {0} entered multiple times,Merk: Element {0} inngått flere ganger
 apps/erpnext/erpnext/config/crm.py +27,All Contacts.,Alle kontakter.
 DocType: Newsletter,Test Email Id,Test Email Id
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +394,Company Abbreviation,Firma Forkortelse
+apps/erpnext/erpnext/public/js/setup_wizard.js +142,Company Abbreviation,Firma Forkortelse
 DocType: Features Setup,If you follow Quality Inspection. Enables Item QA Required and QA No in Purchase Receipt,Hvis du følger Quality Inspection. Aktiverer Element QA Nødvendig og QA Ingen i Kjøpskvittering
 DocType: GL Entry,Party Type,Partiet Type
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +68,Raw material cannot be same as main Item,Råstoff kan ikke være det samme som hoved Element
 DocType: Item Attribute Value,Abbreviation,Forkortelse
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,Ikke authroized siden {0} overskrider grensene
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +30,Rotational molding,Rotasjonsstøping
 apps/erpnext/erpnext/config/hr.py +115,Salary template master.,Lønn mal mester.
 DocType: Leave Type,Max Days Leave Allowed,Max Dager La tillatt
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +55,Set Tax Rule for shopping cart,Still skatteregel for shopping cart
@@ -3055,15 +2927,15 @@
 apps/erpnext/erpnext/config/selling.py +18,Quotes to Leads or Customers.,Sitater for å Leads eller kunder.
 DocType: Stock Settings,Role Allowed to edit frozen stock,Rolle tillatt å redigere frossen lager
 ,Territory Target Variance Item Group-Wise,Territorium Target Avviks varegruppe-Wise
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +101,All Customer Groups,Alle kundegrupper
-apps/erpnext/erpnext/controllers/accounts_controller.py +474,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} er obligatorisk. Kanskje Valutaveksling posten ikke er skapt for {1} til {2}.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +101,All Customer Groups,Alle kundegrupper
+apps/erpnext/erpnext/controllers/accounts_controller.py +475,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} er obligatorisk. Kanskje Valutaveksling posten ikke er skapt for {1} til {2}.
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +37,Tax Template is mandatory.,Skatt Mal er obligatorisk.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +41,Account {0}: Parent account {1} does not exist,Konto {0}: Parent konto {1} finnes ikke
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Prisliste Rate (Selskap Valuta)
 DocType: Account,Temporary,Midlertidig
 DocType: Address,Preferred Billing Address,Foretrukne faktureringsadresse
 DocType: Monthly Distribution Percentage,Percentage Allocation,Prosentvis Allocation
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +86,Secretary,Sekretær
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Secretary,Sekretær
 DocType: Serial No,Distinct unit of an Item,Distinkt enhet av et element
 DocType: Pricing Rule,Buying,Kjøpe
 DocType: HR Settings,Employee Records to be created by,Medarbeider Records å være skapt av
@@ -3076,9 +2948,8 @@
 ,Item-wise Price List Rate,Element-messig Prisliste Ranger
 DocType: Purchase Order Item,Supplier Quotation,Leverandør sitat
 DocType: Quotation,In Words will be visible once you save the Quotation.,I Ord vil være synlig når du lagrer Tilbud.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +68,Ironing,Stryke
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is stopped,{0} {1} er stoppet
-apps/erpnext/erpnext/stock/doctype/item/item.py +352,Barcode {0} already used in Item {1},Barcode {0} allerede brukt i Element {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +356,Barcode {0} already used in Item {1},Barcode {0} allerede brukt i Element {1}
 DocType: Lead,Add to calendar on this date,Legg til i kalender på denne datoen
 apps/erpnext/erpnext/config/selling.py +132,Rules for adding shipping costs.,Regler for å legge til fraktkostnader.
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,Kommende arrangementer
@@ -3087,27 +2958,25 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +27,Quick Entry,Hurtig Entry
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0} er obligatorisk for Return
 DocType: Purchase Order,To Receive,Å Motta
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +33,Shrink fitting,Krympe montering
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +522,user@example.com,user@example.com
+apps/erpnext/erpnext/public/js/setup_wizard.js +266,user@example.com,user@example.com
 DocType: Email Digest,Income / Expense,Inntekt / Kostnad
 DocType: Employee,Personal Email,Personlig e-post
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +58,Total Variance,Total Variance
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +62,Total Variance,Total Variance
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.","Hvis aktivert, vil systemet starte regnskapspostene for inventar automatisk."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +15,Brokerage,Brokerage
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +15,Brokerage,Brokerage
 DocType: Address,Postal Code,postnummer
 DocType: Production Order Operation,"in Minutes
 Updated via 'Time Log'",Minutter Oppdatert via &#39;Time Logg&#39;
 DocType: Customer,From Lead,Fra Lead
 apps/erpnext/erpnext/config/manufacturing.py +19,Orders released for production.,Bestillinger frigitt for produksjon.
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +42,Select Fiscal Year...,Velg regnskapsår ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +442,POS Profile required to make POS Entry,POS Profile nødvendig å foreta POS Entry
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +444,POS Profile required to make POS Entry,POS Profile nødvendig å foreta POS Entry
 DocType: Hub Settings,Name Token,Navn Token
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +106,Planing,Høvling
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Selling,Standard Selling
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +120,Standard Selling,Standard Selling
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +137,Atleast one warehouse is mandatory,Minst én lageret er obligatorisk
 DocType: Serial No,Out of Warranty,Ut av Garanti
 DocType: BOM Replace Tool,Replace,Erstatt
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +314,{0} against Sales Invoice {1},{0} mot Sales Faktura {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +316,{0} against Sales Invoice {1},{0} mot Sales Faktura {1}
 apps/erpnext/erpnext/stock/doctype/item/item.py +49,Please enter default Unit of Measure,Skriv inn standard måleenhet
 DocType: Purchase Invoice Item,Project Name,Prosjektnavn
 DocType: Supplier,Mention if non-standard receivable account,Nevn hvis ikke-standard fordring konto
@@ -3123,9 +2992,8 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,Journal Entry {0} does not have account {1} or already matched against other voucher,Journal Entry {0} ikke har konto {1} eller allerede matchet mot andre verdikupong
 DocType: Item,Moving Average,Glidende gjennomsnitt
 DocType: BOM Replace Tool,The BOM which will be replaced,BOM som vil bli erstattet
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +43,New Stock UOM must be different from current stock UOM,New Stock målenheter må være forskjellig fra dagens lager målenheter
 DocType: Account,Debit,Debet
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +34,Leaves must be allocated in multiples of 0.5,"Bladene skal avsettes i multipler av 0,5"
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +44,Leaves must be allocated in multiples of 0.5,"Bladene skal avsettes i multipler av 0,5"
 DocType: Production Order,Operation Cost,Operation Cost
 apps/erpnext/erpnext/config/hr.py +71,Upload attendance from a .csv file,Last opp oppmøte fra en CSV-fil
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,Enestående Amt
@@ -3143,8 +3011,7 @@
 DocType: Employee,Internal Work History,Intern Work History
 DocType: DocField,Column Break,Kolonne Break
 DocType: Event,Thursday,Torsdag
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +42,Private Equity,Private Equity
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +93,Turning,Turning
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,Private Equity
 DocType: Maintenance Visit,Customer Feedback,Customer Feedback
 DocType: Account,Expense,Expense
 DocType: Sales Invoice,Exhibition,Utstilling
@@ -3157,19 +3024,19 @@
 DocType: Employee,Held On,Avholdt
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +33,Production Item,Produksjon Element
 ,Employee Information,Informasjon ansatt
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,Rate (%),Rate (%)
+apps/erpnext/erpnext/public/js/setup_wizard.js +294,Rate (%),Rate (%)
 DocType: Stock Entry Detail,Additional Cost,Tilleggs Cost
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +407,Financial Year End Date,Regnskapsårets slutt Dato
+apps/erpnext/erpnext/public/js/setup_wizard.js +155,Financial Year End Date,Regnskapsårets slutt Dato
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Voucher No, if grouped by Voucher","Kan ikke filtrere basert på Voucher Nei, hvis gruppert etter Voucher"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +484,Make Supplier Quotation,Gjør Leverandør sitat
 DocType: Quality Inspection,Incoming,Innkommende
 DocType: BOM,Materials Required (Exploded),Materialer som er nødvendige (Exploded)
 DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),Reduser Tjene for permisjon uten lønn (LWP)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +512,"Add users to your organization, other than yourself","Legge til brukere i organisasjonen, annet enn deg selv"
+apps/erpnext/erpnext/public/js/setup_wizard.js +256,"Add users to your organization, other than yourself","Legge til brukere i organisasjonen, annet enn deg selv"
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No {1} does not match with {2} {3},Row # {0}: Serial No {1} samsvarer ikke med {2} {3}
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +44,Casual Leave,Casual La
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +44,Casual Leave,Casual La
 DocType: Batch,Batch ID,Batch ID
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +334,Note: {0},Merk: {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +336,Note: {0},Merk: {0}
 ,Delivery Note Trends,Levering Note Trender
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +104,This Week's Summary,Denne ukens oppsummering
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +74,{0} must be a Purchased or Sub-Contracted Item in row {1},{0} må være et Kjøpt eller underleverandør til element i rad {1}
@@ -3181,7 +3048,7 @@
 DocType: Purchase Receipt,Return Against Purchase Receipt,Tilbake Against Kjøpskvittering
 DocType: Purchase Order,To Bill,Til Bill
 DocType: Material Request,% Ordered,% Bestilt
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +61,Piecework,Akkord
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Piecework,Akkord
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +64,Avg. Buying Rate,Avg. Kjøpe Rate
 DocType: Task,Actual Time (in Hours),Virkelig tid (i timer)
 DocType: Employee,History In Company,Historie I selskapet
@@ -3198,13 +3065,13 @@
 DocType: Opportunity,To Discuss,Å Diskutere
 DocType: SMS Settings,SMS Settings,SMS-innstillinger
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +60,Temporary Accounts,Midlertidige kontoer
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +155,Black,Svart
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Black,Svart
 DocType: BOM Explosion Item,BOM Explosion Item,BOM Explosion Element
 DocType: Account,Auditor,Revisor
 DocType: Purchase Order,End date of current order's period,Sluttdato for dagens orden periode
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +17,Make Offer Letter,Gjør Tilbudsbrevet
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +10,Return,Return
-apps/erpnext/erpnext/stock/doctype/item/item.py +503,Default Unit of Measure for Variant must be same as Template,Standard Enhet for Variant må være samme som mal
+apps/erpnext/erpnext/stock/doctype/item/item.py +507,Default Unit of Measure for Variant must be same as Template,Standard Enhet for Variant må være samme som mal
 DocType: DocField,Fold,Brett
 DocType: Production Order Operation,Production Order Operation,Produksjon Bestill Operation
 DocType: Pricing Rule,Disable,Deaktiver
@@ -3215,13 +3082,12 @@
 DocType: Page,Page Name,Page Name
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +110,To Time must be greater than From Time,Å må Tid være større enn fra Time
 DocType: Journal Entry Account,Exchange Rate,Vekslingskurs
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +465,Sales Order {0} is not submitted,Salgsordre {0} er ikke innsendt
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +467,Sales Order {0} is not submitted,Salgsordre {0} er ikke innsendt
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0}: Parent account {1} does not bolong to the company {2},Warehouse {0}: Parent konto {1} ikke BOLONG til selskapet {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +124,Spindle finishing,Spindel behandling
 DocType: BOM,Last Purchase Rate,Siste Purchase Rate
 DocType: Account,Asset,Asset
 DocType: Project Task,Task ID,Task ID
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +395,"e.g. ""MC""",f.eks &quot;MC&quot;
+apps/erpnext/erpnext/public/js/setup_wizard.js +143,"e.g. ""MC""",f.eks &quot;MC&quot;
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,Stock cannot exist for Item {0} since has variants,Stock kan ikke eksistere for Element {0} siden har varianter
 ,Sales Person-wise Transaction Summary,Transaksjons Oppsummering Sales Person-messig
 DocType: System Settings,Time Zone,Tidssone
@@ -3230,9 +3096,7 @@
 DocType: Monthly Distribution,Monthly Distribution Percentages,Månedlig Distribusjonsprosent
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +16,The selected item cannot have Batch,Den valgte elementet kan ikke ha Batch
 DocType: Delivery Note,% of materials delivered against this Delivery Note,% Av materialer leveres mot denne følgeseddel
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +151,Stapling,Stifting
 DocType: Customer,Customer Details,Kunde Detaljer
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +105,Shaping,Forme
 DocType: Employee,Reports to,Rapporter til
 DocType: SMS Settings,Enter url parameter for receiver nos,Skriv inn url parameter for mottaker nos
 DocType: Sales Invoice,Paid Amount,Innbetalt beløp
@@ -3241,13 +3105,13 @@
 DocType: Item Variant,Item Variant,Sak Variant
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +15,Setting this Address Template as default as there is no other default,Sette dette Adressemal som standard så er det ingen andre standard
 apps/erpnext/erpnext/accounts/doctype/account/account.py +89,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Saldo allerede i debet, har du ikke lov til å sette &quot;Balance må være &#39;som&#39; Credit &#39;"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +76,Quality Management,Kvalitetsstyring
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Quality Management,Kvalitetsstyring
 DocType: Production Planning Tool,Filter based on customer,Filter basert på kundens
 DocType: Payment Tool Detail,Against Voucher No,Mot Voucher Nei
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +47,Please enter quantity for Item {0},Skriv inn antall for Element {0}
 DocType: Employee External Work History,Employee External Work History,Ansatt Ekstern Work History
 DocType: Tax Rule,Purchase,Kjøp
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +34,Balance Qty,Balanse Antall
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Balance Qty,Balanse Antall
 DocType: Item Group,Parent Item Group,Parent varegruppe
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +21,{0} for {1},{0} for {1}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +96,Cost Centers,Kostnadssteder
@@ -3257,12 +3121,12 @@
 DocType: Opportunity,Next Contact,Neste Kontakt
 DocType: Employee,Employment Type,Type stilling
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,Anleggsmidler
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +84,Application period cannot be across two alocation records,Tegningsperioden kan ikke være over to alocation poster
 DocType: Item Group,Default Expense Account,Standard kostnadskonto
 DocType: Employee,Notice (days),Varsel (dager)
 DocType: Page,Yes,Ja
 DocType: Tax Rule,Sales Tax Template,Merverdiavgift Mal
 DocType: Employee,Encashment Date,Encashment Dato
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +74,Electroforming,Electro
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +179,"Against Voucher Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Mot Voucher Type må være en av innkjøpsordre, fakturaen eller bilagsregistrering"
 DocType: Account,Stock Adjustment,Stock Adjustment
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +34,Default Activity Cost exists for Activity Type - {0},Standard Aktivitet Kostnad finnes for Aktivitetstype - {0}
@@ -3298,12 +3162,12 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,Warehouse kan ikke slettes som finnes lager hovedbok oppføring for dette lageret.
 DocType: Company,Distribution,Distribusjon
 apps/erpnext/erpnext/public/js/pos/pos.html +36,Amount Paid,Beløpet Betalt
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +91,Project Manager,Prosjektleder
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +72,Dispatch,Dispatch
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Project Manager,Prosjektleder
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +72,Dispatch,Dispatch
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,Maks rabatt tillatt for element: {0} er {1}%
 DocType: Customer,Default Taxes and Charges,Standard Skatter og avgifter
 DocType: Account,Receivable,Fordring
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +268,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,Row # {0}: Ikke lov til å endre Leverandør som innkjøpsordre allerede eksisterer
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +263,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,Row # {0}: Ikke lov til å endre Leverandør som innkjøpsordre allerede eksisterer
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,Rollen som får lov til å sende transaksjoner som overstiger kredittgrenser fastsatt.
 DocType: Sales Invoice,Supplier Reference,Leverandør 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.","Hvis det er merket, vil BOM for sub-montering elementer vurderes for å få råvarer. Ellers vil alle sub-montering elementer bli behandlet som en råvare."
@@ -3311,8 +3175,8 @@
 DocType: Hub Settings,Seller Description,Selger Beskrivelse
 DocType: Employee Education,Qualification,Kvalifisering
 DocType: Item Price,Item Price,Sak Pris
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +48,Soap & Detergent,Såpe og vaskemiddel
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +36,Motion Picture & Video,Motion Picture &amp; Video
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +48,Soap & Detergent,Såpe og vaskemiddel
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +36,Motion Picture & Video,Motion Picture &amp; Video
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Bestilt
 DocType: Warehouse,Warehouse Name,Warehouse Name
 DocType: Naming Series,Select Transaction,Velg Transaksjons
@@ -3321,7 +3185,6 @@
 DocType: BOM,Rate Of Materials Based On,Valuta materialer basert på
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,Støtte Analtyics
 apps/erpnext/erpnext/accounts/doctype/accounts_settings/accounts_settings.py +27,Company is missing in warehouses {0},Selskapet er mangler i varehus {0}
-DocType: Stock UOM Replace Utility,Stock UOM Replace Utility,Stock målenheter Erstatt Utility
 DocType: POS Profile,Terms and Conditions,Vilkår og betingelser
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,To Date should be within the Fiscal Year. Assuming To Date = {0},To Date bør være innenfor regnskapsåret. Antar To Date = {0}
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","Her kan du opprettholde høyde, vekt, allergier, medisinske bekymringer etc"
@@ -3333,7 +3196,7 @@
 DocType: Sales Order Item,For Production,For Production
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +103,Please enter sales order in the above table,Skriv inn salgsordre i tabellen ovenfor
 DocType: Project Task,View Task,Vis Task
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +406,Your financial year begins on,Din regnskapsår begynner på
+apps/erpnext/erpnext/public/js/setup_wizard.js +154,Your financial year begins on,Din regnskapsår begynner på
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +46,Please enter Purchase Receipts,Skriv inn kvitteringer
 DocType: Sales Invoice,Get Advances Received,Få Fremskritt mottatt
 DocType: Email Digest,Add/Remove Recipients,Legg til / fjern Mottakere
@@ -3341,16 +3204,14 @@
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","For å sette dette regnskapsåret som standard, klikk på &quot;Angi som standard &#39;"
 apps/erpnext/erpnext/config/support.py +54,Setup incoming server for support email id. (e.g. support@example.com),Oppsett innkommende server for støtte e-id. (F.eks support@example.com)
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,Mangel Antall
-apps/erpnext/erpnext/stock/doctype/item/item.py +528,Item variant {0} exists with same attributes,Sak variant {0} finnes med samme attributtene
+apps/erpnext/erpnext/stock/doctype/item/item.py +532,Item variant {0} exists with same attributes,Sak variant {0} finnes med samme attributtene
 DocType: Salary Slip,Salary Slip,Lønn Slip
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +116,Burnishing,Polering
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +54,'To Date' is required,&#39;To Date&#39; er påkrevd
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,&#39;To Date&#39; er påkrevd
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","Generere pakksedler for pakker som skal leveres. Brukes til å varsle pakke nummer, innholdet i pakken og vekten."
 DocType: Sales Invoice Item,Sales Order Item,Salgsordre Element
 DocType: Salary Slip,Payment Days,Betalings Days
 DocType: BOM,Manage cost of operations,Administrer driftskostnader
 DocType: Features Setup,Item Advanced,Sak Avansert
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +40,Hot rolling,Hot rullende
 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.","Når noen av de merkede transaksjonene &quot;Skrevet&quot;, en e-pop-up automatisk åpnet for å sende en e-post til den tilhørende &quot;Kontakt&quot; i at transaksjonen med transaksjonen som et vedlegg. Brukeren kan eller ikke kan sende e-posten."
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,Globale innstillinger
 DocType: Employee Education,Employee Education,Ansatt Utdanning
@@ -3363,25 +3224,23 @@
 DocType: Customer,Sales Team Details,Salgsteam Detaljer
 DocType: Expense Claim,Total Claimed Amount,Total Hevdet Beløp
 apps/erpnext/erpnext/config/crm.py +22,Potential opportunities for selling.,Potensielle muligheter for å selge.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +48,Sick Leave,Sykefravær
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +174,Invalid {0},Ugyldig {0}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +48,Sick Leave,Sykefravær
 DocType: Email Digest,Email Digest,E-post Digest
 DocType: Delivery Note,Billing Address Name,Billing Address Navn
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +22,Department Stores,Varehus
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,Varehus
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +40,System Balance,System Balance
 DocType: Workflow,Is Active,Er Aktiv
 apps/erpnext/erpnext/controllers/stock_controller.py +71,No accounting entries for the following warehouses,Ingen regnskapspostene for følgende varehus
 apps/erpnext/erpnext/projects/doctype/project/project.js +22,Save the document first.,Lagre dokumentet først.
 DocType: Account,Chargeable,Avgift
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +121,Linishing,Linishing
 DocType: Company,Change Abbreviation,Endre Forkortelse
 DocType: Workflow State,Primary,Primær
 DocType: Expense Claim Detail,Expense Date,Expense Dato
 DocType: Item,Max Discount (%),Max Rabatt (%)
 DocType: Communication,More Information,Mer informasjon
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +70,Last Order Amount,Siste ordrebeløp
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +161,Blasting,Sprengning
 DocType: Company,Warn,Advare
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +111,Item valuation updated,Sak verdivurdering oppdatert
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Eventuelle andre bemerkninger, bemerkelsesverdig innsats som bør gå i postene."
 DocType: BOM,Manufacturing User,Manufacturing User
 DocType: Purchase Order,Raw Materials Supplied,Råvare Leveres
@@ -3391,7 +3250,7 @@
 DocType: Appraisal,Appraisal Template,Appraisal Mal
 DocType: Communication,Email,E-post
 DocType: Item Group,Item Classification,Sak Klassifisering
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +89,Business Development Manager,Business Development Manager
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Business Development Manager,Business Development Manager
 DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,Vedlikehold Besøk Formål
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.js +15,Period,Periode
 ,General Ledger,General Ledger
@@ -3401,9 +3260,7 @@
 ,Itemwise Recommended Reorder Level,Itemwise Anbefalt Omgjøre nivå
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +264,Please select {0} first,Vennligst velg {0} først
 DocType: Features Setup,To get Item Group in details table,For å få varen Group i detaljer tabellen
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +67,Redrawing,Redrawing
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +112,Batch {0} of Item {1} has expired.,Batch {0} av Element {1} er utløpt.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +120,Etching,Etsing
 DocType: Sales Invoice,Commission,Kommisjon
 DocType: Address Template,"<h4>Default Template</h4>
 <p>Uses <a href=""http://jinja.pocoo.org/docs/templates/"">Jinja Templating</a> and all the fields of Address (including Custom Fields if any) will be available</p>
@@ -3437,7 +3294,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +340,Operation Time must be greater than 0 for Operation {0},Operation Tid må være større enn 0 for operasjon {0}
 DocType: Supplier,Address and Contacts,Adresse og Kontakt
 DocType: UOM Conversion Detail,UOM Conversion Detail,Målenheter Conversion Detalj
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +496,Keep it web friendly 900px (w) by 100px (h),Hold det web vennlig 900px (w) ved 100px (h)
+apps/erpnext/erpnext/public/js/setup_wizard.js +242,Keep it web friendly 900px (w) by 100px (h),Hold det web vennlig 900px (w) ved 100px (h)
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +329,Production Order cannot be raised against a Item Template,Produksjonsordre kan ikke heves mot et elementmal
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +44,Charges are updated in Purchase Receipt against each item,Kostnader er oppdatert i Purchase Mottak mot hvert element
 DocType: Payment Tool,Get Outstanding Vouchers,Få Utestående Kuponger
@@ -3453,54 +3310,49 @@
 DocType: Item,Average time taken by the supplier to deliver,Gjennomsnittlig tid tatt av leverandøren til å levere
 DocType: Time Log,Hours,Timer
 DocType: Project,Expected Start Date,Tiltredelse
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +38,Rolling,Rullende
 DocType: ToDo,Priority,Prioritet
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +41,Remove item if charges is not applicable to that item,Fjern artikkel om avgifter er ikke aktuelt til dette elementet
 DocType: Dropbox Backup,Dropbox Access Allowed,Dropbox Tilgang tillatt
 DocType: Dropbox Backup,Weekly,Ukentlig
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,Eg. smsgateway.com/api/send_sms.cgi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +485,Receive,Motta
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +510,Receive,Motta
 DocType: Maintenance Visit,Fully Completed,Fullt Fullført
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% Komplett
 DocType: Employee,Educational Qualification,Pedagogiske Kvalifikasjoner
 DocType: Workstation,Operating Costs,Driftskostnader
 DocType: Employee Leave Approver,Employee Leave Approver,Ansatt La Godkjenner
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,{0} has been successfully added to our Newsletter list.,{0} har blitt lagt inn i vår nyhetsbrevliste.
-apps/erpnext/erpnext/stock/doctype/item/item.py +383,Row {0}: An Reorder entry already exists for this warehouse {1},Rad {0}: En Omgjøre oppføring finnes allerede for dette lageret {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +387,Row {0}: An Reorder entry already exists for this warehouse {1},Rad {0}: En Omgjøre oppføring finnes allerede for dette lageret {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +67,"Cannot declare as lost, because Quotation has been made.","Kan ikke erklære som tapt, fordi tilbudet er gjort."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +133,Electron beam machining,Elektronstråle maskinering
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Kjøp Master manager
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +424,Production Order {0} must be submitted,Produksjonsordre {0} må sendes
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +150,Please select Start Date and End Date for Item {0},Vennligst velg startdato og sluttdato for Element {0}
 apps/erpnext/erpnext/config/stock.py +141,Main Reports,Hoved Reports
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +102,Stock Ledger entries balances updated,Stock Ledger oppføringer balanserer oppdatert
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,Til dags dato kan ikke være før fra dato
 DocType: Purchase Receipt Item,Prevdoc DocType,Prevdoc DOCTYPE
-apps/erpnext/erpnext/stock/doctype/item/item.js +176,Add / Edit Prices,Legg til / Rediger priser
+apps/erpnext/erpnext/stock/doctype/item/item.js +178,Add / Edit Prices,Legg til / Rediger priser
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +53,Chart of Cost Centers,Plan Kostnadssteder
 ,Requested Items To Be Ordered,Etterspør Elementer bestilles
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +298,My Orders,Mine bestillinger
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +293,My Orders,Mine bestillinger
 DocType: Price List,Price List Name,Prisliste Name
 DocType: Time Log,For Manufacturing,For Manufacturing
-apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +70,Totals,Totals
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +174,Totals,Totals
 DocType: BOM,Manufacturing,Manufacturing
 ,Ordered Items To Be Delivered,Bestilte varer som skal leveres
 DocType: Account,Income,Inntekt
 ,Setup Wizard,Setup Wizard
 DocType: Industry Type,Industry Type,Industry Type
 apps/erpnext/erpnext/templates/includes/cart.js +137,Something went wrong!,Noe gikk galt!
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +68,Warning: Leave application contains following block dates,Advarsel: La programmet inneholder følgende blokk datoer
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +251,Sales Invoice {0} has already been submitted,Salg Faktura {0} er allerede innsendt
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +100,Warning: Leave application contains following block dates,Advarsel: La programmet inneholder følgende blokk datoer
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +256,Sales Invoice {0} has already been submitted,Salg Faktura {0} er allerede innsendt
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,Ferdigstillelse Dato
 DocType: Purchase Invoice Item,Amount (Company Currency),Beløp (Selskap Valuta)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +10,Die casting,Støping
 DocType: Email Alert,Reference Date,Reference Date
 apps/erpnext/erpnext/config/hr.py +105,Organization unit (department) master.,Organisasjonsenhet (departement) mester.
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +25,Please enter valid mobile nos,Skriv inn et gyldig mobil nos
 DocType: Budget Detail,Budget Detail,Budsjett Detalj
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +75,Please enter message before sending,Skriv inn meldingen før du sender
 DocType: Async Task,Status,Status
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +65,Stock UOM updated for Item {0},Stock målenheter oppdatert for Element {0}
 DocType: Company History,Year,År
 apps/erpnext/erpnext/config/accounts.py +127,Point-of-Sale Profile,Point-of-Sale Profile
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +68,Please Update SMS Settings,Oppdater SMS-innstillinger
@@ -3514,12 +3366,12 @@
 ,Serial No Service Contract Expiry,Serial No Service kontraktsutløp
 DocType: Item,Unit of Measure Conversion,Måleenhet Conversion
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +86,Employee can not be changed,Arbeidstaker kan ikke endres
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +259,You cannot credit and debit same account at the same time,Du kan ikke kreditt- og debet samme konto samtidig
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,You cannot credit and debit same account at the same time,Du kan ikke kreditt- og debet samme konto samtidig
 DocType: Naming Series,Help HTML,Hjelp HTML
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},Total weightage tilordnet skal være 100%. Det er {0}
 apps/erpnext/erpnext/controllers/status_updater.py +140,Allowance for over-{0} crossed for Item {1},Fradrag for over- {0} krysset for Element {1}
 DocType: Address,Name of person or organization that this address belongs to.,Navn på person eller organisasjon som denne adressen tilhører.
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +587,Your Suppliers,Dine Leverandører
+apps/erpnext/erpnext/public/js/setup_wizard.js +325,Your Suppliers,Dine Leverandører
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,Kan ikke settes som tapt som Salgsordre er gjort.
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +65,Another Salary Structure {0} is active for employee {1}. Please make its status 'Inactive' to proceed.,En annen Lønn Struktur {0} er aktiv for arbeidstaker {1}. Vennligst sin status &quot;Inaktiv&quot; for å fortsette.
 DocType: Purchase Invoice,Contact,Kontakt
@@ -3528,37 +3380,35 @@
 DocType: Item,Has Serial No,Har Serial No
 DocType: Employee,Date of Issue,Utstedelsesdato
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +16,{0}: From {0} for {1},{0}: Fra {0} for {1}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +154,Row #{0}: Set Supplier for item {1},Row # {0}: Sett Leverandør for elementet {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +149,Row #{0}: Set Supplier for item {1},Row # {0}: Sett Leverandør for elementet {1}
 DocType: Issue,Content Type,Innholdstype
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +17,Computer,Datamaskin
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,Datamaskin
 DocType: Item,List this Item in multiple groups on the website.,Liste denne vare i flere grupper på nettstedet.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +283,Please check Multi Currency option to allow accounts with other currency,Vennligst sjekk Multi Valuta alternativet for å tillate kontoer med andre valuta
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +285,Please check Multi Currency option to allow accounts with other currency,Vennligst sjekk Multi Valuta alternativet for å tillate kontoer med andre valuta
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +62,Item: {0} does not exist in the system,Sak: {0} finnes ikke i systemet
 apps/erpnext/erpnext/accounts/doctype/account/account.py +81,You are not authorized to set Frozen value,Du er ikke autorisert til å sette Frozen verdi
 DocType: Payment Reconciliation,Get Unreconciled Entries,Få avstemte Entries
 DocType: Cost Center,Budgets,Budsjetter
 apps/frappe/frappe/core/page/modules_setup/modules_setup.py +11,Updated,Oppdatert
 DocType: Employee,Emergency Contact Details,Detaljer nødtelefon
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +396,What does it do?,Hva gjør det?
+apps/erpnext/erpnext/public/js/setup_wizard.js +144,What does it do?,Hva gjør det?
 DocType: Delivery Note,To Warehouse,Til Warehouse
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +45,Account {0} has been entered more than once for fiscal year {1},Konto {0} har blitt lagt inn mer enn en gang for regnskapsåret {1}
 ,Average Commission Rate,Gjennomsnittlig kommisjon
-apps/erpnext/erpnext/stock/doctype/item/item.py +313,'Has Serial No' can not be 'Yes' for non-stock item,«Har Serial No &#39;kan ikke være&#39; Ja &#39;for ikke-lagervare
+apps/erpnext/erpnext/stock/doctype/item/item.py +317,'Has Serial No' can not be 'Yes' for non-stock item,«Har Serial No &#39;kan ikke være&#39; Ja &#39;for ikke-lagervare
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Attendance can not be marked for future dates,Oppmøte kan ikke merkes for fremtidige datoer
 DocType: Pricing Rule,Pricing Rule Help,Prising Rule Hjelp
 DocType: Purchase Taxes and Charges,Account Head,Account Leder
 apps/erpnext/erpnext/config/stock.py +79,Update additional costs to calculate landed cost of items,Oppdater ekstra kostnader for å beregne inntakskost annonser
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +111,Electrical,Elektrisk
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +111,Electrical,Elektrisk
 DocType: Stock Entry,Total Value Difference (Out - In),Total verdi Difference (ut -)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +302,Row {0}: Exchange Rate is mandatory,Rad {0}: Exchange Rate er obligatorisk
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +304,Row {0}: Exchange Rate is mandatory,Rad {0}: Exchange Rate er obligatorisk
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},Bruker-ID ikke satt for Employee {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +72,Peening,Peening
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,From Warranty Claim,Fra garantikrav
 DocType: Stock Entry,Default Source Warehouse,Standardkilde Warehouse
 DocType: Item,Customer Code,Kunden Kode
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +212,Birthday Reminder for {0},Bursdag Påminnelse for {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +163,Lapping,Lapping
-apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.js +8,Days Since Last Order,Dager siden siste Bestill
+apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +72,Days Since Last Order,Dager siden siste Bestill
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +299,Debit To account must be a Balance Sheet account,Uttak fra kontoen må være en balansekonto
 DocType: Buying Settings,Naming Series,Navngi Series
 DocType: Leave Block List,Leave Block List Name,La Block List Name
@@ -3572,7 +3422,7 @@
 DocType: Notification Control,Sales Invoice Message,Salgsfaktura Message
 DocType: Authorization Rule,Based On,Basert På
 DocType: Sales Order Item,Ordered Qty,Bestilte Antall
-apps/erpnext/erpnext/stock/doctype/item/item.py +539,Item {0} is disabled,Element {0} er deaktivert
+apps/erpnext/erpnext/stock/doctype/item/item.py +543,Item {0} is disabled,Element {0} er deaktivert
 DocType: Stock Settings,Stock Frozen Upto,Stock Frozen Opp
 apps/erpnext/erpnext/controllers/recurring_document.py +166,Period From and Period To dates mandatory for recurring {0},Periode Fra og perioden Til dato obligatoriske for gjentakende {0}
 apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,Prosjektet aktivitet / oppgave.
@@ -3582,7 +3432,6 @@
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,Rabatt må være mindre enn 100
 DocType: ToDo,Low,Lav
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Skriv Off Beløp (Selskap Valuta)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +71,Spinning,Spinning
 DocType: Landed Cost Voucher,Landed Cost Voucher,Landed Cost Voucher
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +55,Please set {0},Vennligst sett {0}
 DocType: Purchase Invoice,Repeat on Day of Month,Gjenta på dag i måneden
@@ -3604,7 +3453,6 @@
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +37,Campaign Name is required,Kampanjenavn er påkrevd
 DocType: Maintenance Visit,Maintenance Date,Vedlikehold Dato
 DocType: Purchase Receipt Item,Rejected Serial No,Avvist Serial No
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +51,Deep drawing,Deep tegning
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +40,New Newsletter,Ny Nyhetsbrev
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +157,Start date should be less than end date for Item {0},Startdato skal være mindre enn sluttdato for Element {0}
 apps/erpnext/erpnext/stock/doctype/item/item.js +17,Show Balance,Vis Balance
@@ -3614,7 +3462,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +119,BOM and Manufacturing Quantity are required,BOM og Industri Antall kreves
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Aldring Range 2
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +450,Amount,Beløp
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +147,Riveting,Medrivende
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,BOM erstattet
 ,Sales Analytics,Salgs Analytics
 DocType: Manufacturing Settings,Manufacturing Settings,Produksjons Innstillinger
@@ -3626,20 +3473,19 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +207,New Account Name,New Account Name
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,Råvare Leveres Cost
 DocType: Selling Settings,Settings for Selling Module,Innstillinger for å selge Module
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +73,Customer Service,Kundeservice
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Customer Service,Kundeservice
 DocType: Item,Thumbnail,Thumbnail
 DocType: Item Customer Detail,Item Customer Detail,Sak Customer Detalj
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +147,Confirm Your Email,Bekreft Din e-post
 apps/erpnext/erpnext/config/hr.py +53,Offer candidate a Job.,Tilbudet kandidat en jobb.
 DocType: Notification Control,Prompt for Email on Submission of,Spør for E-post om innsending av
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +81,Total allocated leaves are more than days in the period,Totalt tildelte bladene er mer enn dager i perioden
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +70,Item {0} must be a stock Item,Elementet {0} må være en lagervare
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,Standard Work In Progress Warehouse
 apps/erpnext/erpnext/config/accounts.py +107,Default settings for accounting transactions.,Standardinnstillingene for regnskapsmessige transaksjoner.
 apps/frappe/frappe/model/naming.py +40,{0} is required,{0} er nødvendig
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +21,Vacuum molding,Vakuumstøping
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,Forventet Datoen kan ikke være før Material Request Dato
 DocType: Contact Us Settings,City,By
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +132,Ultrasonic machining,Ultralyd maskinering
 apps/frappe/frappe/templates/base.html +137,Error: Not a valid id?,Feil: Ikke en gyldig id?
 apps/erpnext/erpnext/stock/get_item_details.py +125,Item {0} must be a Sales Item,Elementet {0} må være en Sales Element
 DocType: Naming Series,Update Series Number,Update-serien Nummer
@@ -3647,7 +3493,7 @@
 DocType: Sales Order,Printing Details,Utskrift Detaljer
 DocType: Task,Closing Date,Avslutningsdato
 DocType: Sales Order Item,Produced Quantity,Produsert Antall
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +84,Engineer,Ingeniør
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Engineer,Ingeniør
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,Søk Sub Assemblies
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +379,Item Code required at Row No {0},Elementkode kreves ved Row Nei {0}
 DocType: Sales Partner,Partner Type,Partner Type
@@ -3655,7 +3501,7 @@
 DocType: Authorization Rule,Customerwise Discount,Customerwise Rabatt
 DocType: Purchase Invoice,Against Expense Account,Mot regning
 DocType: Production Order,Production Order,Produksjon Bestill
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +258,Installation Note {0} has already been submitted,Installasjon Merk {0} har allerede blitt sendt
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +263,Installation Note {0} has already been submitted,Installasjon Merk {0} har allerede blitt sendt
 DocType: Quotation Item,Against Docname,Mot Docname
 DocType: SMS Center,All Employee (Active),All Employee (Active)
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,Vis nå
@@ -3664,19 +3510,19 @@
 DocType: Item,Re-Order Level,Re-Order nivå
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,Skriv inn elementer og planlagt stk som du ønsker å heve produksjonsordrer eller laste råvarer for analyse.
 apps/frappe/frappe/public/js/frappe/views/ganttview.js +45,Gantt Chart,Gantt
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +57,Part-time,Deltid
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,Part-time,Deltid
 DocType: Employee,Applicable Holiday List,Gjelder Holiday List
 DocType: Employee,Cheque,Cheque
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,Serien Oppdatert
 apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Report Type is mandatory,Rapporter Type er obligatorisk
 DocType: Item,Serial Number Series,Serienummer Series
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},Warehouse er obligatorisk for lager Element {0} i rad {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +45,Retail & Wholesale,Retail &amp; Wholesale
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,Retail &amp; Wholesale
 DocType: Issue,First Responded On,Først Svarte På
 DocType: Website Item Group,Cross Listing of Item in multiple groups,Cross Notering av varen i flere grupper
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +351,The First User: You,Den første brukeren: Du
+apps/erpnext/erpnext/public/js/setup_wizard.js +101,The First User: You,Den første brukeren: Du
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +48,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},Regnskapsår Startdato og regnskapsår sluttdato er allerede satt i regnskapsåret {0}
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +172,Successfully Reconciled,Vellykket Forsonet
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +119,Successfully Reconciled,Vellykket Forsonet
 DocType: Production Order,Planned End Date,Planlagt sluttdato
 apps/erpnext/erpnext/config/stock.py +43,Where items are stored.,Hvor varene er lagret.
 DocType: Tax Rule,Validity,Gyldighet
@@ -3696,39 +3542,36 @@
 DocType: DocPerm,Level,Nivå
 DocType: Purchase Taxes and Charges,On Net Total,On Net Total
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +160,Target warehouse in row {0} must be same as Production Order,Target lager i rad {0} må være samme som produksjonsordre
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +59,No permission to use Payment Tool,Ingen tillatelse til å bruke Betaling Tool
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +97,No permission to use Payment Tool,Ingen tillatelse til å bruke Betaling Tool
 apps/erpnext/erpnext/controllers/recurring_document.py +192,'Notification Email Addresses' not specified for recurring %s,Varslings E-postadresser som ikke er spesifisert for gjentakende% s
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +86,Milling,Fresing
 apps/erpnext/erpnext/accounts/doctype/account/account.py +99,Currency can not be changed after making entries using some other currency,Valuta kan ikke endres etter at oppføringer ved hjelp av en annen valuta
 DocType: Company,Round Off Account,Rund av konto
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +60,Nibbling,Nibbling
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,Administrative utgifter
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +18,Consulting,Consulting
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +18,Consulting,Consulting
 DocType: Customer Group,Parent Customer Group,Parent Kundegruppe
 apps/erpnext/erpnext/public/js/pos/pos.js +429,Change,Endre
 DocType: Purchase Invoice,Contact Email,Kontakt Epost
 DocType: Appraisal Goal,Score Earned,Resultat tjent
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +393,"e.g. ""My Company LLC""",f.eks &quot;My Company LLC&quot;
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +173,Notice Period,Oppsigelsestid
+apps/erpnext/erpnext/public/js/setup_wizard.js +141,"e.g. ""My Company LLC""",f.eks &quot;My Company LLC&quot;
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +173,Notice Period,Oppsigelsestid
 DocType: Bank Reconciliation Detail,Voucher ID,Kupong ID
 apps/erpnext/erpnext/setup/doctype/territory/territory.js +14,This is a root territory and cannot be edited.,Dette er en rot territorium og kan ikke redigeres.
 DocType: Packing Slip,Gross Weight UOM,Bruttovekt målenheter
 DocType: Email Digest,Receivables / Payables,Fordringer / gjeld
 DocType: Delivery Note Item,Against Sales Invoice,Mot Salg Faktura
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +63,Stamping,Stempling
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +457,Credit Account,Credit konto
 DocType: Landed Cost Item,Landed Cost Item,Landed Cost Element
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +56,Show zero values,Vis nullverdier
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,Antall element oppnådd etter produksjon / nedpakking fra gitte mengder råvarer
 DocType: Payment Reconciliation,Receivable / Payable Account,Fordringer / gjeld konto
 DocType: Delivery Note Item,Against Sales Order Item,Mot kundeordreposisjon
-apps/erpnext/erpnext/stock/doctype/item/item.py +521,Please specify Attribute Value for attribute {0},Vennligst oppgi data Verdi for attributtet {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +525,Please specify Attribute Value for attribute {0},Vennligst oppgi data Verdi for attributtet {0}
 DocType: Item,Default Warehouse,Standard Warehouse
 DocType: Task,Actual End Date (via Time Logs),Selve Sluttdato (via Time Logger)
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +37,Budget cannot be assigned against Group Account {0},Budsjettet kan ikke overdras mot gruppekonto {0}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +23,Please enter parent cost center,Skriv inn forelder kostnadssted
 DocType: Delivery Note,Print Without Amount,Skriv ut Uten Beløp
-apps/erpnext/erpnext/controllers/buying_controller.py +69,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,Avgiftskategori kan ikke være &quot;Verdsettelse&quot; eller &quot;Verdsettelse og Total&quot; som alle elementene er ikke-lager
+apps/erpnext/erpnext/controllers/buying_controller.py +60,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,Avgiftskategori kan ikke være &quot;Verdsettelse&quot; eller &quot;Verdsettelse og Total&quot; som alle elementene er ikke-lager
 DocType: User,Last Name,Etternavn
 DocType: Web Page,Left,Venstre
 DocType: Event,All Day,Hele Dagen
@@ -3736,7 +3579,7 @@
 DocType: Appraisal,Total Score (Out of 5),Total poengsum (av 5)
 DocType: Contact Us Settings,State,Stat
 DocType: Batch,Batch,Parti
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +51,Balance,Balanse
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +28,Balance,Balanse
 DocType: Project,Total Expense Claim (via Expense Claims),Total Expense krav (via Utgifts Krav)
 DocType: User,Gender,Kjønn
 DocType: Journal Entry,Debit Note,Debitnota
@@ -3766,8 +3609,7 @@
 DocType: Purchase Order,Get Last Purchase Rate,Få siste kjøp Ranger
 DocType: Time Log,Billing Rate based on Activity Type (per hour),Billing pris basert på aktivitet Type (per time)
 DocType: Company,Company Info,Selskap Info
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +76,Seaming,False
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +197,"Company Email ID not found, hence mail not sent","Firma Email ID ikke funnet, derav posten sendt"
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +206,"Company Email ID not found, hence mail not sent","Firma Email ID ikke funnet, derav posten sendt"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Anvendelse av midler (aktiva)
 DocType: Production Planning Tool,Filter based on item,Filter basert på element
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +451,Debit Account,Debet konto
@@ -3779,17 +3621,16 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +95,{0} {1} has been modified. Please refresh.,{0} {1} har blitt endret. Vennligst oppdater.
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,Stoppe brukere fra å gjøre La Applications på følgende dager.
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +591,From Opportunity,Fra Opportunity
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +46,Blanking,Blanking
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +166,Employee Benefits,Ytelser til ansatte
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,Employee Benefits,Ytelser til ansatte
 DocType: Sales Invoice,Is POS,Er POS
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +240,Packed quantity must equal quantity for Item {0} in row {1},Pakket mengde må være lik mengde for Element {0} i rad {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +245,Packed quantity must equal quantity for Item {0} in row {1},Pakket mengde må være lik mengde for Element {0} i rad {1}
 DocType: Production Order,Manufactured Qty,Produsert Antall
 DocType: Purchase Receipt Item,Accepted Quantity,Akseptert Antall
 apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} ikke eksisterer
 apps/erpnext/erpnext/config/accounts.py +18,Bills raised to Customers.,Regninger hevet til kundene.
 DocType: DocField,Default,Standard
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Prosjekt Id
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +466,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Row Nei {0}: Beløpet kan ikke være større enn utestående beløpet mot Expense krav {1}. Avventer Beløp er {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +468,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Row Nei {0}: Beløpet kan ikke være større enn utestående beløpet mot Expense krav {1}. Avventer Beløp er {2}
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +40,{0} subscribers added,{0} abonnenter lagt
 DocType: Maintenance Schedule,Schedule,Tidsplan
 DocType: Cost Center,"Define Budget for this Cost Center. To set budget action, see ""Company List""","Definer Budsjett for denne kostnadssted. Slik stiller budsjett handling, se &quot;Selskapet List&quot;"
@@ -3800,7 +3641,7 @@
 apps/erpnext/erpnext/public/js/pos/pos.js +91,Price List not found or disabled,Prisliste ikke funnet eller deaktivert
 DocType: Expense Claim,Approved,Godkjent
 DocType: Pricing Rule,Price,Pris
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +79,Employee relieved on {0} must be set as 'Left',Ansatt lettet på {0} må være angitt som &quot;venstre&quot;
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +88,Employee relieved on {0} must be set as 'Left',Ansatt lettet på {0} må være angitt som &quot;venstre&quot;
 DocType: Item,"Selecting ""Yes"" will give a unique identity to each entity of this item which can be viewed in the Serial No master.",Velge &quot;Ja&quot; vil gi en unik identitet til hver enhet av dette elementet som kan sees i Serial No mester.
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +39,Appraisal {0} created for Employee {1} in the given date range,Appraisal {0} skapt for Employee {1} i den gitte datointervall
 DocType: Employee,Education,Utdanning
@@ -3811,7 +3652,7 @@
 apps/frappe/frappe/desk/moduleview.py +67,Standard Reports,Standardrapporter
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,Regnskap posteringer.
 DocType: Delivery Note Item,Available Qty at From Warehouse,Tilgjengelig Antall på From Warehouse
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +209,Please select Employee Record first.,Vennligst velg Employee Record først.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +224,Please select Employee Record first.,Vennligst velg Employee Record først.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Rad {0}: Party / Account samsvarer ikke med {1} / {2} i {3} {4}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +35,To create a Tax Account,For å opprette en Tax-konto
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +233,Please enter Expense Account,Skriv inn Expense konto
@@ -3824,46 +3665,43 @@
 DocType: Sales Order,Track this Sales Order against any Project,Spor dette Salgsordre mot ethvert prosjekt
 DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,Pull salgsordrer (pending å levere) basert på kriteriene ovenfor
 DocType: DocShare,Document Type,Document Type
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +565,From Supplier Quotation,Fra Leverandør sitat
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +588,From Supplier Quotation,Fra Leverandør sitat
 DocType: Deduction Type,Deduction Type,Fradrag Type
 DocType: Attendance,Half Day,Halv Dag
 DocType: Pricing Rule,Min Qty,Min Antall
 DocType: Features Setup,"To track items in sales and purchase documents with batch nos. ""Preferred Industry: Chemicals""",Å spore elementer i salgs- og kjøps dokumenter med batch nos. &quot;Foretrukket Bransje: Kjemikalier&quot;
 DocType: GL Entry,Transaction Date,Transaksjonsdato
 DocType: Production Plan Item,Planned Qty,Planlagt Antall
-apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +91,Total Tax,Total Skatte
+apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +93,Total Tax,Total Skatte
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +178,For Quantity (Manufactured Qty) is mandatory,For Mengde (Produsert Stk) er obligatorisk
 DocType: Stock Entry,Default Target Warehouse,Standard Target Warehouse
 DocType: Purchase Invoice,Net Total (Company Currency),Net Total (Selskap Valuta)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +79,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Rad {0}: Party Type og Party gjelder bare mot fordringer / gjeld konto
 DocType: Notification Control,Purchase Receipt Message,Kvitteringen Message
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +95,Total allocated leaves are more than period,Totalt tildelte bladene er mer enn perioden
 DocType: Production Order,Actual Start Date,Faktisk startdato
 DocType: Sales Order,% of materials delivered against this Sales Order,% Av materialer leveres mot denne kundeordre
 apps/erpnext/erpnext/config/stock.py +23,Record item movement.,Record element bevegelse.
 DocType: Newsletter List Subscriber,Newsletter List Subscriber,Nyhetsbrev List Subscriber
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +164,Morticing,Morticing
 DocType: Email Account,Service,Tjeneste
 DocType: Hub Settings,Hub Settings,Hub-innstillinger
 DocType: Project,Gross Margin %,Bruttomargin%
 DocType: BOM,With Operations,Med Operations
 apps/erpnext/erpnext/accounts/party.py +232,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Regnskapspostene har allerede blitt gjort i valuta {0} for selskap {1}. Vennligst velg en fordring eller betales konto med valuta {0}.
 ,Monthly Salary Register,Månedlig Lønn Register
-apps/frappe/frappe/website/template.py +140,Next,Neste
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard_page.html +17,Next,Neste
 DocType: Warranty Claim,If different than customer address,Hvis annerledes enn kunden adresse
 DocType: BOM Operation,BOM Operation,BOM Operation
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +118,Electropolishing,Electropolishing
 DocType: Purchase Taxes and Charges,On Previous Row Amount,På Forrige Row Beløp
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +24,Please enter Payment Amount in atleast one row,Skriv inn Betalingsbeløp i minst én rad
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +33,Please enter Payment Amount in atleast one row,Skriv inn Betalingsbeløp i minst én rad
 DocType: POS Profile,POS Profile,POS Profile
 apps/erpnext/erpnext/config/accounts.py +153,"Seasonality for setting budgets, targets etc.","Sesong for å sette budsjetter, mål etc."
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +238,Row {0}: Payment Amount cannot be greater than Outstanding Amount,Rad {0}: Betalingsbeløp kan ikke være større enn utestående beløp
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +46,Total Unpaid,Total Ubetalte
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +21,Time Log is not billable,Tid Log er ikke fakturerbar
 apps/erpnext/erpnext/stock/get_item_details.py +128,"Item {0} is a template, please select one of its variants","Element {0} er en mal, kan du velge en av variantene"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +528,Purchaser,Kjøper
+apps/erpnext/erpnext/public/js/setup_wizard.js +272,Purchaser,Kjøper
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +81,Net pay cannot be negative,Nettolønn kan ikke være negativ
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +71,Please enter the Against Vouchers manually,Vennligst oppgi Against Kuponger manuelt
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +107,Please enter the Against Vouchers manually,Vennligst oppgi Against Kuponger manuelt
 DocType: SMS Settings,Static Parameters,Statiske Parametere
 DocType: Purchase Order,Advance Paid,Advance Betalt
 DocType: Item,Item Tax,Sak Skatte
@@ -3872,14 +3710,12 @@
 apps/erpnext/erpnext/config/crm.py +48,Send mass SMS to your contacts,Sende masse SMS til kontaktene dine
 DocType: Purchase Taxes and Charges,Consider Tax or Charge for,Tenk Skatte eller Charge for
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,Selve Antall er obligatorisk
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +42,Cross-rolling,Cross-rullende
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +132,Credit Card,Kredittkort
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +132,Credit Card,Kredittkort
 DocType: BOM,Item to be manufactured or repacked,Elementet som skal produseres eller pakkes
 apps/erpnext/erpnext/config/stock.py +95,Default settings for stock transactions.,Standardinnstillingene for aksjetransaksjoner.
 DocType: Purchase Invoice,Next Date,Neste dato
 DocType: Employee Education,Major/Optional Subjects,Store / valgfrie emner
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +49,Please enter Taxes and Charges,Skriv inn skatter og avgifter
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +85,Machining,Maskinering
 DocType: Sales Invoice Item,Drop Ship,Drop Ship
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","Her kan du opprettholde familie informasjon som navn og okkupasjon av foreldre, ektefelle og barn"
 DocType: Hub Settings,Seller Name,Selger Navn
@@ -3889,7 +3725,7 @@
 DocType: Stock Entry,Repack,Pakk
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +6,You must Save the form before proceeding,Du må Lagre skjemaet før du fortsetter
 DocType: Item Attribute,Numeric Values,Numeriske verdier
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +500,Attach Logo,Fest Logo
+apps/erpnext/erpnext/public/js/setup_wizard.js +246,Attach Logo,Fest Logo
 DocType: Customer,Commission Rate,Kommisjon
 apps/erpnext/erpnext/stock/doctype/item/item.js +38,Make Variant,Gjør Variant
 apps/erpnext/erpnext/config/hr.py +145,Block leave applications by department.,Block permisjon applikasjoner ved avdelingen.
@@ -3904,19 +3740,19 @@
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +105,Please select a csv file,Vennligst velg en csv-fil
 DocType: Dropbox Backup,Send Backups to Dropbox,Send Sikkerhetskopier til Dropbox
 DocType: Purchase Order,To Receive and Bill,Å motta og Bill
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +94,Designer,Designer
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Designer,Designer
 apps/erpnext/erpnext/config/selling.py +121,Terms and Conditions Template,Betingelser Mal
 DocType: Serial No,Delivery Details,Levering Detaljer
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +383,Cost Center is required in row {0} in Taxes table for type {1},Kostnadssted er nødvendig i rad {0} i skatter tabell for typen {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +386,Cost Center is required in row {0} in Taxes table for type {1},Kostnadssted er nødvendig i rad {0} i skatter tabell for typen {1}
 DocType: Item,Automatically create Material Request if quantity falls below this level,Automatisk opprette Material Forespørsel om kvantitet faller under dette nivået
 ,Item-wise Purchase Register,Element-messig Purchase Register
 DocType: Batch,Expiry Date,Utløpsdato
-apps/erpnext/erpnext/stock/doctype/item/item.py +375,"To set reorder level, item must be a Purchase Item or Manufacturing Item","Slik stiller omgjøring nivå, må varen være en innkjøpsenhet eller Manufacturing Element"
+apps/erpnext/erpnext/stock/doctype/item/item.py +379,"To set reorder level, item must be a Purchase Item or Manufacturing Item","Slik stiller omgjøring nivå, må varen være en innkjøpsenhet eller Manufacturing Element"
 ,Supplier Addresses and Contacts,Leverandør Adresser og kontakter
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,Vennligst første velg kategori
 apps/erpnext/erpnext/config/projects.py +18,Project master.,Prosjektet mester.
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,Ikke viser noen symbol som $ etc ved siden av valutaer.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +330, (Half Day),(Halv Dag)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +374, (Half Day),(Halv Dag)
 DocType: Supplier,Credit Days,Kreditt Days
 DocType: Leave Type,Is Carry Forward,Er fremføring
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +478,Get Items from BOM,Få Elementer fra BOM
@@ -3924,7 +3760,7 @@
 apps/erpnext/erpnext/config/manufacturing.py +120,Bill of Materials,Bill of Materials
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +77,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Rad {0}: Party Type og Party er nødvendig for fordringer / gjeld kontoen {1}
 DocType: Dropbox Backup,Send Notifications To,Send varsler til
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html +26,Ref Date,Ref Dato
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +54,Ref Date,Ref Dato
 DocType: Employee,Reason for Leaving,Grunn til å forlate
 DocType: Expense Claim Detail,Sanctioned Amount,Sanksjonert Beløp
 DocType: GL Entry,Is Opening,Er Åpnings
@@ -3932,4 +3768,3 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +188,Account {0} does not exist,Konto {0} finnes ikke
 DocType: Account,Cash,Kontanter
 DocType: Employee,Short biography for website and other publications.,Kort biografi for hjemmeside og andre publikasjoner.
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +31,Please create Salary Structure for employee {0},Opprett Lønn Struktur for arbeidstaker {0}
diff --git a/erpnext/translations/pl.csv b/erpnext/translations/pl.csv
index 59acaeb..e8b2e4a 100644
--- a/erpnext/translations/pl.csv
+++ b/erpnext/translations/pl.csv
@@ -1,13 +1,12 @@
 DocType: Employee,Salary Mode,
 DocType: Cost Center,"Select Monthly Distribution, if you want to track based on seasonality.","Wybierz dystrybucji miesięcznej, jeśli chcesz śledzić oparty na sezonowość."
 DocType: Employee,Divorced,Rozwiedziony
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +86,Warning: Same item has been entered multiple times.,Ostrzeżenie: Ta sama pozycja została wprowadzona wielokrotnie.
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +80,Warning: Same item has been entered multiple times.,Ostrzeżenie: Ta sama pozycja została wprowadzona wielokrotnie.
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +96,Items already synced,Pozycje już synchronizowane
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,Zezwoli na dodał wiele razy w transakcji
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,Anuluj Materiał Odwiedź {0} zanim anuluje to roszczenia z tytułu gwarancji
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +19,Consumer Products,Produkty konsumenckie
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,Produkty konsumenckie
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +68,Please select Party Type first,Wybierz typ pierwszy Party
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +90,Annealing,Wyżarzania
 DocType: Item,Customer Items,Pozycje klientów
 apps/erpnext/erpnext/accounts/doctype/account/account.py +45,Account {0}: Parent account {1} can not be a ledger,Konto {0}: Nadrzędne konto {1} nie może być zwykłym
 DocType: Item,Publish Item to hub.erpnext.com,Publikacja na hub.erpnext.com
@@ -20,15 +19,14 @@
 DocType: About Us Settings,Website,Strona WWW
 DocType: POS Profile,Applicable for User,Zastosowanie dla użytkownika
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +169,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Zatrzymany Zamówienie produkcji nie mogą być anulowane, odetkać najpierw anulować"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +23,Compaction plus sintering,Zagęszczania oraz spiekania
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,Currency is required for Price List {0},Waluta jest wymagana dla Cenniku {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Zostanie policzony dla transakcji.
 DocType: Purchase Order,Customer Contact,Kontakt z klientem
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +549,From Material Request,Od Prośby o Materiał
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +572,From Material Request,Od Prośby o Materiał
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} Drzewo
 DocType: Job Applicant,Job Applicant,
 apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,Brak już następnych wyników.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +78,Legal,Legalnie
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +34,Legal,Legalnie
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +114,Actual type tax cannot be included in Item rate in row {0},Rzeczywista Podatek typu nie mogą być wliczone w cenę towaru w wierszu {0}
 DocType: C-Form,Customer,Klient
 DocType: Purchase Receipt Item,Required By,
@@ -43,7 +41,6 @@
 DocType: Manufacturing Settings,Default 10 mins,Domyślnie 10 minut
 DocType: Leave Type,Leave Type Name,Nazwa typu urlopu
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +148,Series Updated Successfully,
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +150,Stitching,Szycie
 DocType: Pricing Rule,Apply On,
 DocType: Item Price,Multiple Item prices.,
 ,Purchase Order Items To Be Received,Przedmioty oczekujące na potwierdzenie odbioru Zamówienia Kupna
@@ -51,8 +48,8 @@
 DocType: Quality Inspection Reading,Parameter,Parametr
 apps/erpnext/erpnext/projects/doctype/project/project.py +43,Expected End Date can not be less than Expected Start Date,Spodziewana data końcowa nie może być mniejsza od spodziewanej daty startowej
 apps/erpnext/erpnext/utilities/transaction_base.py +104,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,"Wiersz # {0}: Cena musi być taki sam, jak {1}: {2} ({3} / {4})"
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +189,New Leave Application,
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +134,Bank Draft,Przekaz bankowy
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +204,New Leave Application,
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +134,Bank Draft,Przekaz bankowy
 DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,
 DocType: Mode of Payment Account,Mode of Payment Account,Konto księgowe dla tego rodzaju płatności
 apps/erpnext/erpnext/stock/doctype/item/item.js +34,Show Variants,Pokaż Warianty
@@ -64,25 +61,23 @@
 DocType: Production Plan Item,Production Plan Item,Przedmiot planu produkcji
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +141,User {0} is already assigned to Employee {1},Użytkownik {0} jest już przyporządkowany do Pracownika {1}
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +13,Make new POS Profile,Dodaj nowy profil POS
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +31,Health Care,Opieka zdrowotna
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,Opieka zdrowotna
 DocType: Purchase Invoice,Monthly,Miesięcznie
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +66,Delay in payment (Days),Opóźnienie w płatności (dni)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +494,Invoice,Faktura
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +519,Invoice,Faktura
 DocType: Maintenance Schedule Item,Periodicity,Okresowość
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +357,Email Address,Adres e-mail
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +21,Defense,Obrona
+apps/erpnext/erpnext/public/js/setup_wizard.js +107,Email Address,Adres e-mail
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,Obrona
 DocType: Company,Abbr,Skrót
 DocType: Appraisal Goal,Score (0-5),
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +193,Row {0}: {1} {2} does not match with {3},Wiersz {0}: {1} {2} nie zgadza się z {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +67,Row # {0}:,Wiersz # {0}:
 DocType: Delivery Note,Vehicle No,Nr pojazdu
 apps/erpnext/erpnext/public/js/pos/pos.js +528,Please select Price List,Wybierz Cennik
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +162,Woodworking,Obróbka drewna
 DocType: Production Order Operation,Work In Progress,Praca w toku
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +153,3D printing,Drukowanie 3D
 DocType: Employee,Holiday List,Lista świąt
 DocType: Time Log,Time Log,
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +530,Accountant,Księgowy
+apps/erpnext/erpnext/public/js/setup_wizard.js +274,Accountant,Księgowy
 DocType: Cost Center,Stock User,Użytkownik magazynu
 DocType: Company,Phone No,Nr telefonu
 DocType: Time Log,"Log of Activities performed by users against Tasks that can be used for tracking time, billing.","Zaloguj wykonywanych przez użytkowników z zadań, które mogą być wykorzystywane do śledzenia czasu, rozliczeń."
@@ -98,18 +93,19 @@
 DocType: Bin,Quantity Requested for Purchase,Ilość zaproponowana do Zakupu
 DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name","Dołączyć plik .csv z dwoma kolumnami, po jednym dla starej nazwy i jeden dla nowej nazwy"
 DocType: Packed Item,Parent Detail docname,
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Kg,kg
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Kg,kg
 apps/erpnext/erpnext/config/hr.py +48,Opening for a Job.,Ogłoszenie o pracę
 DocType: Item Attribute,Increment,Przyrost
 apps/erpnext/erpnext/public/js/stock_analytics.js +63,Select Warehouse...,Wybierz Magazyn ...
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +6,Advertising,Reklamowanie
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,Reklamowanie
+apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,Sama Spółka wpisana jest więcej niż jeden raz
 DocType: Employee,Married,Poślubiony
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +389,Stock cannot be updated against Delivery Note {0},
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +391,Stock cannot be updated against Delivery Note {0},
 DocType: Payment Reconciliation,Reconcile,Wyrównywać
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +30,Grocery,Artykuły spożywcze
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,Artykuły spożywcze
 DocType: Quality Inspection Reading,Reading 1,Odczyt 1
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Make Bank Entry,Dodaj Bank
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +40,Pension Funds,Fundusze Emerytalne
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,Fundusze Emerytalne
 apps/erpnext/erpnext/accounts/doctype/account/account.py +142,Warehouse is mandatory if account type is Warehouse,"Magazyn jest obowiązkowe, jeżeli typ konta to Magazyn"
 DocType: SMS Center,All Sales Person,
 DocType: Lead,Person Name,Imię i nazwisko osoby
@@ -131,7 +127,7 @@
 DocType: Quality Inspection,Get Specification Details,Pobierz szczegóły specyfikacji
 DocType: Lead,Interested,
 apps/erpnext/erpnext/config/manufacturing.py +14,Bill of Material,Zestawienie materiałowe
-apps/erpnext/erpnext/public/js/stock_analytics.js +45,Opening,Otwarcie
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +158,Opening,Otwarcie
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},Od {0} do {1}
 DocType: Item,Copy From Item Group,Skopiuj z Grupy Przedmiotów
 DocType: Journal Entry,Opening Entry,Wpis początkowy
@@ -145,23 +141,22 @@
 DocType: Employee Education,Under Graduate,
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +22,Target On,
 DocType: BOM,Total Cost,Koszt całkowity
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +99,Reaming,Rozwiercanie
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +9,Activity Log:,Dziennik aktywności:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +199,Item {0} does not exist in the system or has expired,
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +44,Real Estate,Nieruchomości
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +44,Real Estate,Nieruchomości
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +4,Statement of Account,Wyciąg z rachunku
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +41,Pharmaceuticals,Farmaceutyczne
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,Farmaceutyczne
 DocType: Expense Claim Detail,Claim Amount,Kwota roszczenia
 DocType: Employee,Mr,Pan
 DocType: Custom Script,Client,Klient
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,
 DocType: Naming Series,Prefix,Prefix
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Consumable,Konsumpcyjny
+apps/erpnext/erpnext/public/js/setup_wizard.js +359,Consumable,Konsumpcyjny
 DocType: Upload Attendance,Import Log,Log operacji importu
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.js +19,Send,Wyślij
 DocType: Sales Invoice Item,Delivered By Supplier,Dostarczane przez Dostawcę
 DocType: SMS Center,All Contact,
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +164,Annual Salary,Roczne Wynagrodzenie
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +164,Annual Salary,Roczne Wynagrodzenie
 DocType: Period Closing Voucher,Closing Fiscal Year,Zamknięcie roku fiskalnego
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +69,Stock Expenses,Wydatki na składowanie
 DocType: Newsletter,Email Sent?,Wiadomość wysłana?
@@ -169,7 +164,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +92,Show Time Logs,Show Time Logi
 DocType: Journal Entry Account,Credit in Company Currency,Kredyt w walucie Spółki
 DocType: Delivery Note,Installation Status,Status instalacji
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +115,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Ilość Przyjętych + Odrzuconych musi odpowiadać ilości Odebranych (Element {0})
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +118,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Ilość Przyjętych + Odrzuconych musi odpowiadać ilości Odebranych (Element {0})
 DocType: Item,Supply Raw Materials for Purchase,Dostawa surowce Skupu
 apps/erpnext/erpnext/stock/get_item_details.py +133,Item {0} must be a Purchase Item,
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
@@ -177,19 +172,17 @@
  Wszystko daty i pracownik połączenie w wybranym okresie przyjdzie w szablonie, z istniejącymi rekordy frekwencji"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +446,Item {0} is not active or end of life has been reached,
 DocType: Time Log Batch,Will be updated after Sales Invoice is Submitted.,Zostanie zaktualizowane po wysłaniu Faktury Sprzedaży
-apps/erpnext/erpnext/controllers/accounts_controller.py +493,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included",
+apps/erpnext/erpnext/controllers/accounts_controller.py +494,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included",
 apps/erpnext/erpnext/config/hr.py +90,Settings for HR Module,
 DocType: SMS Center,SMS Center,
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +78,Straightening,Prostowanie
 DocType: BOM Replace Tool,New BOM,Nowe zestawienie materiałowe
 apps/erpnext/erpnext/config/projects.py +28,Batch Time Logs for billing.,Batch Czas Logi do fakturowania.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +15,Countergravity casting,Odlewania Countergravity
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +30,Newsletter has already been sent,Newsletter już został wysłany
 DocType: Lead,Request Type,
 DocType: Leave Application,Reason,Powód
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +14,Broadcasting,
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +140,Execution,Wykonanie
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +364,The first user will become the System Manager (you can change this later).,Pierwszy użytkownik będzie Administratorem Systemu (można to zmienić później).
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +140,Execution,Wykonanie
+apps/erpnext/erpnext/public/js/setup_wizard.js +114,The first user will become the System Manager (you can change this later).,Pierwszy użytkownik będzie Administratorem Systemu (można to zmienić później).
 apps/erpnext/erpnext/config/manufacturing.py +39,Details of the operations carried out.,Szczegóły dotyczące przeprowadzonych operacji.
 DocType: Serial No,Maintenance Status,Status Konserwacji
 apps/erpnext/erpnext/config/stock.py +263,Items and Pricing,Produkty i cennik
@@ -206,7 +199,6 @@
 DocType: Pricing Rule,Discount on Price List Rate (%),Zniżka Cennik Oceń (%)
 apps/frappe/frappe/public/js/frappe/form/print.js +96,Start,
 DocType: User,First Name,Imię
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +12,Full-mold casting,Full-formy do odlewania
 DocType: Offer Letter,Select Terms and Conditions,Wybierz Regulamin
 DocType: Production Planning Tool,Sales Orders,Zlecenia sprzedaży
 DocType: Purchase Taxes and Charges,Valuation,Wycena
@@ -218,8 +210,7 @@
 DocType: Bank Reconciliation,Bank Account,Konto bankowe
 DocType: Leave Type,Allow Negative Balance,Dozwolony ujemny bilans
 DocType: Selling Settings,Default Territory,Domyślne terytorium
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +53,Television,Telewizja
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +138,Gashing,Rozcinając
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,Telewizja
 DocType: Production Order Operation,Updated via 'Time Log',"Aktualizowana przez ""Czas Zaloguj"""
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +82,Account {0} does not belong to Company {1},Konto {0} nie jest przypisane do Firmy {1}
 DocType: Naming Series,Series List for this Transaction,
@@ -234,14 +225,13 @@
 DocType: Leave Allocation,Add unused leaves from previous allocations,Dodaj niewykorzystane urlopy z poprzednich alokacji
 apps/erpnext/erpnext/controllers/recurring_document.py +206,Next Recurring {0} will be created on {1},Następny cykliczne {0} zostanie utworzony w dniu {1}
 DocType: Newsletter List,Total Subscribers,Wszystkich zapisani
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +575,Contact Name,Nazwa kontaktu
+,Contact Name,Nazwa kontaktu
 DocType: Production Plan Item,SO Pending Qty,
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Tworzy Pasek Wypłaty dla wskazanych wyżej kryteriów.
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +107,Double housing,Podwójna obudowa
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +156,Only the selected Leave Approver can submit this Leave Application,
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +171,Only the selected Leave Approver can submit this Leave Application,
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,Data zwolnienia musi być większa od Daty Wstąpienia
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +172,Leaves per Year,Urlopy na Rok
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +172,Leaves per Year,Urlopy na Rok
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup > Settings > Naming Series,Proszę ustawić Naming Series dla {0} poprzez Konfiguracja&gt; Ustawienia&gt; Seria Naming
 DocType: Time Log,Will be updated when batched.,
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +104,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,"Wiersz {0}: Proszę sprawdzić ""Czy Advance"" przeciw konta {1}, jeśli jest to zaliczka wpis."
@@ -250,25 +240,24 @@
 DocType: Item Website Specification,Item Website Specification,
 DocType: Dropbox Backup,Dropbox Access Key,Klucz do Dostępu do Dropboxa
 DocType: Payment Tool,Reference No,Nr Odniesienia
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +348,Leave Blocked,Urlop Zablokowany
-apps/erpnext/erpnext/stock/doctype/item/item.py +535,Item {0} has reached its end of life on {1},
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +392,Leave Blocked,Urlop Zablokowany
+apps/erpnext/erpnext/stock/doctype/item/item.py +539,Item {0} has reached its end of life on {1},
 apps/erpnext/erpnext/accounts/utils.py +339,Annual,Roczny
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Uzgodnienia Stanu Pozycja
 DocType: Stock Entry,Sales Invoice No,Nr faktury sprzedażowej
 DocType: Material Request Item,Min Order Qty,Min. wartość zamówienia
 DocType: Lead,Do Not Contact,Nie Kontaktuj
 DocType: Sales Invoice,The unique id for tracking all recurring invoices. It is generated on submit.,
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +93,Software Developer,Programista
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +93,Software Developer,Programista
 DocType: Item,Minimum Order Qty,Minimalna wartość zamówienia
 DocType: Pricing Rule,Supplier Type,Typ dostawcy
 DocType: Item,Publish in Hub,Publikowanie w Hub
 ,Terretory,Terytorium
-apps/erpnext/erpnext/stock/doctype/item/item.py +555,Item {0} is cancelled,
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +598,Material Request,Zamówienie produktu
+apps/erpnext/erpnext/stock/doctype/item/item.py +559,Item {0} is cancelled,
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +607,Material Request,Zamówienie produktu
 DocType: Bank Reconciliation,Update Clearance Date,
 DocType: Item,Purchase Details,Szczegóły zakupu
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +323,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},Element {0} nie znajdują się w &quot;materiały dostarczane&quot; tabeli w Zamówieniu {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +129,Wire brushing,Drut szczotkowanie
 DocType: Employee,Relation,Relacja
 DocType: Shipping Rule,Worldwide Shipping,Wysyłka na całym świecie
 apps/erpnext/erpnext/config/selling.py +23,Confirmed orders from Customers.,Potwierdzone zamówienia od klientów
@@ -284,12 +273,11 @@
 DocType: Supplier,Address HTML,Adres HTML
 DocType: Lead,Mobile No.,Nr tel. Komórkowego
 DocType: Maintenance Schedule,Generate Schedule,Utwórz Harmonogram
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +81,Hubbing,Zagłębianie
 DocType: Purchase Invoice Item,Expense Head,Szef Wydatków
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +86,Please select Charge Type first,Najpierw wybierz typ opłaty
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,Ostatnie
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +395,Max 5 characters,Maksymalnie 5 znaków
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +195,Select Your Language,Wybierz Swój Język
+apps/erpnext/erpnext/public/js/setup_wizard.js +143,Max 5 characters,Maksymalnie 5 znaków
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +245,Select Your Language,Wybierz Swój Język
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,
 DocType: Manufacturing Settings,"Disables creation of time logs against Production Orders.
 Operations shall not be tracked against Production Order",Wyłącza tworzenie dzienników razem przeciwko zleceń produkcyjnych. Operacje nie są śledzone przed produkcja na zamówienie
@@ -301,8 +289,6 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +34,Item {0} must be Service Item,
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +303,Completed Qty can not be greater than 'Qty to Manufacture',"Zakończono Ilość nie może być większa niż ""Ilość w produkcji"""
 DocType: DocType,Administrator,Administrator
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +136,Laser drilling,Wiercenie laserowe
-DocType: Stock UOM Replace Utility,New Stock UOM,Nowa jednostka miary stanu
 DocType: Period Closing Voucher,Closing Account Head,
 DocType: Employee,External Work History,Historia Zewnętrzna Pracy
 apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,Circular Error Referencje
@@ -311,18 +297,15 @@
 DocType: Lead,Industry,
 DocType: Employee,Job Profile,Profil Pracy
 DocType: Newsletter,Newsletter,Newsletter
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +84,Hydroforming,Hydroforming
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +49,Necking,Przewężenie
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Informuj za pomocą Maila (automatyczne)
 DocType: Journal Entry,Multi Currency,Wielu Waluta
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +51,Item is updated,
 DocType: Async Task,System Manager,System Manager
 DocType: Payment Reconciliation Invoice,Invoice Type,Typ faktury
 DocType: Sales Invoice Item,Delivery Note,Dowód dostawy
 DocType: Dropbox Backup,Allow Dropbox Access,Pozwól na dostęp do Dropboksa
 apps/erpnext/erpnext/config/learn.py +72,Setting up Taxes,Konfigurowanie podatki
 apps/erpnext/erpnext/accounts/utils.py +189,Payment Entry has been modified after you pulled it. Please pull it again.,Wpis płatności został zmodyfikowany po ściągnięciu. Proszę ściągnąć ponownie.
-apps/erpnext/erpnext/stock/doctype/item/item.py +343,{0} entered twice in Item Tax,{0} dwa razy wprowadzone w podatku produktu
+apps/erpnext/erpnext/stock/doctype/item/item.py +347,{0} entered twice in Item Tax,{0} dwa razy wprowadzone w podatku produktu
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +105,Summary for this week and pending activities,Podsumowanie na ten tydzień i działań toczących
 DocType: Workstation,Rent Cost,Koszt Wynajmu
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +74,Please select month and year,Wybierz miesiąc i rok
@@ -339,24 +322,22 @@
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,Stawka przy użyciu której Waluta Klienta jest konwertowana do podstawowej waluty klienta
 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,Stawka podatku
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Select Item,Wybierz produkt
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +540,Select Item,Wybierz produkt
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +143,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","Pozycja: {0} udało partiami, nie da się pogodzić z wykorzystaniem \
  Zdjęcie Pojednania, zamiast używać Stock Entry"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +259,Purchase Invoice {0} is already submitted,Faktura zakupu {0} została już wysłana
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +262,Purchase Invoice {0} is already submitted,Faktura zakupu {0} została już wysłana
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Batch No must be same as {1} {2},"Wiersz # {0}: Batch Nie musi być taki sam, jak {1} {2}"
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Convert to non-Group,Przekształć w nie-Grupę
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +55,Purchase Receipt must be submitted,Potwierdzenie Zakupu musi zostać wysłane
-DocType: Stock UOM Replace Utility,Current Stock UOM,Bieżąca jednostka miary asortymentu
 apps/erpnext/erpnext/config/stock.py +53,Batch (lot) of an Item.,Partia (pakiet) produktu.
 DocType: C-Form Invoice Detail,Invoice Date,Data faktury
 DocType: GL Entry,Debit Amount,Kwota Debit
 apps/erpnext/erpnext/accounts/party.py +223,There can only be 1 Account per Company in {0} {1},Nie może być tylko jedno konto na Spółkę w {0} {1}
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Your email address,
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +194,Please see attachment,Proszę przejrzeć załącznik
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +203,Please see attachment,Proszę przejrzeć załącznik
 DocType: Purchase Order,% Received,% Otrzymanych
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +109,Water jet cutting,Cięcie strumieniem wody
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +24,Setup Already Complete!!,
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +20,Setup Already Complete!!,
 ,Finished Goods,Ukończone dobra
 DocType: Delivery Note,Instructions,Instrukcje
 DocType: Quality Inspection,Inspected By,Skontrolowane przez
@@ -371,6 +352,7 @@
 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.,Proszę nie tworzyć konta dla klientów i dostawców. Są one tworzone bezpośrednio od mistrzów klienta / dostawcy.
 DocType: Currency Exchange,Currency Exchange,Wymiana Walut
 DocType: Purchase Invoice Item,Item Name,Nazwa pozycji
+DocType: Authorization Rule,Approving User  (above authorized value),Zatwierdzanie autoryzowanego użytkownika (powyżej wartości)
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Credit Balance,Saldo kredytowe
 DocType: Employee,Widowed,Wdowiec / Wdowa
 DocType: Production Planning Tool,"Items to be requested which are ""Out of Stock"" considering all warehouses based on projected qty and minimum order qty",
@@ -380,11 +362,10 @@
 ,Purchase Register,
 DocType: Landed Cost Item,Applicable Charges,Obowiązujące opłaty
 DocType: Workstation,Consumable Cost,Koszt Konsumpcyjny
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,{0} ({1}) must have role 'Leave Approver',{0} ({1}) musi mieć rolę 'Leave Approver'
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +167,{0} ({1}) must have role 'Leave Approver',{0} ({1}) musi mieć rolę 'Leave Approver'
 DocType: Purchase Receipt,Vehicle Date,Pojazd Data
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +39,Medical,Medyczny
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +39,Medical,Medyczny
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,Powód straty
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +36,Tube beading,Frezowanie Tube
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},Stacja robocza jest zamknięta w następujących terminach wg listy wakacje: {0}
 DocType: Employee,Single,Pojedynczy
 DocType: Issue,Attachment,Załącznik
@@ -405,10 +386,8 @@
 DocType: Account,Is Group,Czy Grupa
 DocType: Stock Settings,Automatically Set Serial Nos based on FIFO,Nr seryjny automatycznie ustawiona w oparciu o FIFO
 DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,Sprawdź Dostawca numer faktury Wyjątkowość
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +31,Thermoforming,Kształtowanie na gorąco
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +66,Slitting,Cięcie
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +57,'To Case No.' cannot be less than 'From Case No.',
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +104,Non Profit,Brak Zysków
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +104,Non Profit,Brak Zysków
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_list.js +7,Not Started,Nie Rozpoczęte
 DocType: Lead,Channel Partner,
 DocType: Account,Old Parent,Stary obiekt nadrzędny
@@ -417,13 +396,12 @@
 apps/erpnext/erpnext/config/manufacturing.py +74,Global settings for all manufacturing processes.,Globalne ustawienia dla wszystkich procesów produkcyjnych.
 DocType: Accounts Settings,Accounts Frozen Upto,Konta zamrożone do 
 DocType: SMS Log,Sent On,
-apps/erpnext/erpnext/stock/doctype/item/item.py +512,Attribute {0} selected multiple times in Attributes Table,Atrybut {0} wybrane atrybuty kilka razy w tabeli
+apps/erpnext/erpnext/stock/doctype/item/item.py +516,Attribute {0} selected multiple times in Attributes Table,Atrybut {0} wybrane atrybuty kilka razy w tabeli
 DocType: Sales Order,Not Applicable,Nie dotyczy
 apps/erpnext/erpnext/config/hr.py +140,Holiday master.,
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +19,Shell molding,Odlewnictwo Shell
 DocType: Material Request Item,Required Date,
 DocType: Delivery Note,Billing Address,Adres Faktury
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +644,Please enter Item Code.,Proszę wpisać Kod Produktu
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +648,Please enter Item Code.,Proszę wpisać Kod Produktu
 DocType: BOM,Costing,Zestawienie kosztów
 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,Razem szt
@@ -433,7 +411,7 @@
 DocType: Item Attribute,To Range,Range
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,
 DocType: Features Setup,Imports,
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +144,Adhesive bonding,Klejenie
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +77,Total leaves allocated is mandatory,Wszystkich liście przeznaczone jest obowiązkowe
 DocType: Job Opening,Description of a Job Opening,Opis Ogłoszenia o Pracę
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +102,Pending activities for today,Działania oczekujące na dziś
 apps/erpnext/erpnext/config/hr.py +28,Attendance record.,
@@ -441,26 +419,25 @@
 DocType: Sales Order Item,Used for Production Plan,Używane do Planu Produkcji
 DocType: System Settings,Loading...,Wczytuję...
 DocType: DocField,Password,Hasło
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +155,Fused deposition modeling,Osadzanie topionego
 DocType: Manufacturing Settings,Time Between Operations (in mins),Czas między operacjami (w min)
 DocType: Customer,Buyer of Goods and Services.,Nabywca towarów i usług.
 DocType: Journal Entry,Accounts Payable,Zobowiązania
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +24,Add Subscribers,Dodaj abonentów
 apps/erpnext/erpnext/public/js/feature_setup.js +220,""" does not exists",""" nie istnieje"
 DocType: Pricing Rule,Valid Upto,Ważny do
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +564,List a few of your customers. They could be organizations or individuals.,Krótka lista Twoich klientów. Mogą to być firmy lub osoby fizyczne.
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,List a few of your customers. They could be organizations or individuals.,Krótka lista Twoich klientów. Mogą to być firmy lub osoby fizyczne.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Direct Income,Przychody bezpośrednie
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +33,"Can not filter based on Account, if grouped by Account","Nie można przefiltrować na podstawie Konta, jeśli pogrupowano z użuciem konta"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +88,Administrative Officer,
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Administrative Officer,
 DocType: Payment Tool,Received Or Paid,Otrzymane lub zapłacone
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +318,Please select Company,Proszę wybrać firmę
 DocType: Stock Entry,Difference Account,Konto Różnic
 apps/erpnext/erpnext/projects/doctype/task/task.py +44,Cannot close task as its dependant task {0} is not closed.,"Nie można zamknąć zadanie, jak jego zależne zadaniem {0} nie jest zamknięta."
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +305,Please enter Warehouse for which Material Request will be raised,
 DocType: Production Order,Additional Operating Cost,Dodatkowy koszt operacyjny
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +20,Cosmetics,Kosmetyki
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,Kosmetyki
 DocType: DocField,Type,Typ
-apps/erpnext/erpnext/stock/doctype/item/item.py +417,"To merge, following properties must be same for both items",
+apps/erpnext/erpnext/stock/doctype/item/item.py +421,"To merge, following properties must be same for both items",
 DocType: Communication,Subject,Temat
 DocType: Shipping Rule,Net Weight,Waga netto
 DocType: Employee,Emergency Phone,Telefon bezpieczeństwa
@@ -470,7 +447,6 @@
 DocType: Journal Entry,Difference (Dr - Cr),Różnica (Dr - Cr)
 DocType: Account,Profit and Loss,Zyski i Straty
 apps/erpnext/erpnext/config/stock.py +293,Managing Subcontracting,Zarządzanie Podwykonawstwo
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +58,New UOM must NOT be of type Whole Number,
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Furniture and Fixture,Meble i osprzęt
 DocType: Quotation,Rate at which Price list currency is converted to company's base currency,Stawka przy użyciu której waluta Listy Cen jest konwertowana do podstawowej waluty firmy
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Account {0} does not belong to company: {1},Konto {0} nie należy do firmy: {1}
@@ -489,14 +465,14 @@
 DocType: Purchase Invoice,Supplier Invoice No,Nr faktury dostawcy
 DocType: Territory,For reference,Dla referencji
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +154,"Cannot delete Serial No {0}, as it is used in stock transactions","Nie można usunąć nr seryjnego {0}, ponieważ jest wykorzystywany w transakcjach magazynowych"
-apps/erpnext/erpnext/public/js/account_tree_grid.js +52,Closing (Cr),Zamknięcie (Cr)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +227,Closing (Cr),Zamknięcie (Cr)
 DocType: Serial No,Warranty Period (Days),Okres gwarancji (dni)
 DocType: Installation Note Item,Installation Note Item,
 ,Pending Qty,Oczekuje szt
 DocType: Job Applicant,Thread HTML,
 DocType: Company,Ignore,Ignoruj
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +86,SMS sent to following numbers: {0},SMS wysłany do następujących liczb: {0}
-apps/erpnext/erpnext/controllers/buying_controller.py +135,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,
+apps/erpnext/erpnext/controllers/buying_controller.py +126,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,
 DocType: Pricing Rule,Valid From,Ważny od
 DocType: Sales Invoice,Total Commission,
 DocType: Pricing Rule,Sales Partner,
@@ -506,7 +482,7 @@
 To distribute a budget using this distribution, set this **Monthly Distribution** in the **Cost Center**","** Miesięczny Dystrybucja ** pozwala Ci zaplanować budżet w ciągu roku, jeśli w Twojej firmie występuje sezonowość.
 
  Aby rozplanować budżet w ** dystrybucji miesięcznej ** ustaw  Miesięczą dystrybucję w ** Centrum Kosztów **"
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +183,No records found in the Invoice table,Nie znaleziono w tabeli faktury rekordy
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +130,No records found in the Invoice table,Nie znaleziono w tabeli faktury rekordy
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +20,Please select Company and Party Type first,"Najpierw wybierz typ firmy, a Party"
 apps/erpnext/erpnext/config/accounts.py +84,Financial / accounting year.,Rok finansowy / księgowy.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged",
@@ -522,25 +498,25 @@
 DocType: Sales Order,Billing and Delivery Status,Fakturowanie i dostawy status
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Powtarzający się klient
 DocType: Leave Control Panel,Allocate,Przydziel
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +16,Previous,Wstecz
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard_page.html +16,Previous,Wstecz
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +620,Sales Return,Zwrot sprzedaży
 DocType: Production Planning Tool,Select Sales Orders from which you want to create Production Orders.,
 DocType: Item,Delivered by Supplier (Drop Ship),Dostarczane przez Dostawcę (Drop Ship)
 apps/erpnext/erpnext/config/hr.py +120,Salary components.,
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,Baza danych potencjalnych klientów.
+DocType: Authorization Rule,Customer or Item,Klient lub przedmiotu
 apps/erpnext/erpnext/config/crm.py +17,Customer database.,Baza danych klientów.
 DocType: Quotation,Quotation To,Wycena dla
 DocType: Lead,Middle Income,Średni Dochód
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),Otwarcie (Cr)
 apps/erpnext/erpnext/accounts/utils.py +193,Allocated amount can not be negative,Przydzielona kwota nie może być ujemna
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +123,Tumbling,Koziołkujący
 DocType: Purchase Order Item,Billed Amt,Rozliczona Ilość
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,Logiczny Magazyn przeciwny do zapisów.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +92,Reference No & Reference Date is required for {0},Nr Odniesienia & Data Odniesienia jest wymagana do {0}
 DocType: Event,Wednesday,Środa
 DocType: Sales Invoice,Customer's Vendor,
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +214,Production Order is Mandatory,Produkcja Zamówienie jest obowiązkowe
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +139,Proposal Writing,
+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,Inna osoba Sprzedaż {0} istnieje w tym samym identyfikator pracownika
 apps/erpnext/erpnext/stock/stock_ledger.py +336,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},
 DocType: Fiscal Year Company,Fiscal Year Company,Rok podatkowy firmy
@@ -563,7 +539,7 @@
 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.","Następnie wycena Zasady są filtrowane na podstawie Klienta, grupy klientów, Terytorium, dostawcy, dostawca, typu kampanii, Partner Sales itp"
 apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.py +179,Please install dropbox python module,
 DocType: Employee,Passport Number,
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +82,Manager,Menager
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Manager,Menager
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +494,From Purchase Receipt,Z Potwierdzenia Kupna
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +219,Same item has been entered multiple times.,Sama pozycja została wprowadzona wielokrotnie.
 DocType: SMS Settings,Receiver Parameter,Parametr Odbiorcy
@@ -571,10 +547,9 @@
 DocType: Sales Person,Sales Person Targets,
 apps/frappe/frappe/public/js/frappe/form/workflow.js +116,To,do
 apps/frappe/frappe/templates/base.html +145,Please enter email address,Proszę wpisać adres e-mail
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +35,End tube forming,Koniec rurki tworzące
 DocType: Production Order Operation,In minutes,W ciągu kilku minut
 DocType: Issue,Resolution Date,
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +635,Please set default Cash or Bank account in Mode of Payment {0},Proszę ustawić domyślne konto Gotówka lub Bank dla rodzaju płatności {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +637,Please set default Cash or Bank account in Mode of Payment {0},Proszę ustawić domyślne konto Gotówka lub Bank dla rodzaju płatności {0}
 DocType: Selling Settings,Customer Naming By,
 apps/erpnext/erpnext/accounts/doctype/account/account.js +67,Convert to Group,Przekształć w Grupę
 DocType: Activity Cost,Activity Type,Rodzaj aktywności
@@ -582,12 +557,12 @@
 DocType: Customer,Fixed Days,Stałe Dni
 DocType: Sales Invoice,Packing List,Lista przedmiotów do spakowania
 apps/erpnext/erpnext/config/buying.py +28,Purchase Orders given to Suppliers.,Zamówienia Kupna dane Dostawcom
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +43,Publishing,Działalność wydawnicza
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +43,Publishing,Działalność wydawnicza
 DocType: Activity Cost,Projects User,Użytkownik projektu
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Consumed,Skonsumowano 
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +198,{0}: {1} not found in Invoice Details table,{0}: {1} Nie znaleziono tabeli w Szczegóły faktury
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,{0}: {1} not found in Invoice Details table,{0}: {1} Nie znaleziono tabeli w Szczegóły faktury
 DocType: Company,Round Off Cost Center,Zaokrąglić centrum kosztów
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +208,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Wizyta Konserwacji {0} musi być anulowana przed usunięciem nakazu sprzedaży
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +203,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Wizyta Konserwacji {0} musi być anulowana przed usunięciem nakazu sprzedaży
 DocType: Material Request,Material Transfer,Transfer materiałów
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +56,Opening (Dr),Otwarcie (Dr)
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},
@@ -599,7 +574,6 @@
 DocType: Pricing Rule,Sales Manager,Menadżer Sprzedaży
 apps/frappe/frappe/public/js/frappe/model/model.js +492,Rename,Zmień nazwę
 DocType: Journal Entry,Write Off Amount,Wartość Odpisu
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +52,Bending,Zginanie
 apps/frappe/frappe/core/page/user_permissions/user_permissions.js +246,Allow User,
 DocType: Journal Entry,Bill No,Numer Rachunku
 DocType: Purchase Invoice,Quarterly,Kwartalnie
@@ -609,17 +583,16 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Please enter item details,Proszę wpisać Szczegóły Przedmiotu
 DocType: Purchase Receipt,Other Details,Pozostałe szczegóły
 DocType: Account,Accounts,Księgowość
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +67,Marketing,Marketing
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +65,Straight shearing,Proste cięcie
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +67,Marketing,Marketing
 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,Bieżący asortyment
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +99,Rejected Warehouse is mandatory against regected item,Odrzucony Magazyn jest obowiązkowy dla odrzuconych przedmiotów
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +102,Rejected Warehouse is mandatory against regected item,Odrzucony Magazyn jest obowiązkowy dla odrzuconych przedmiotów
 DocType: Account,Expenses Included In Valuation,Zaksięgowane wydatki w wycenie
 DocType: Employee,Provide email id registered in company,
 DocType: Hub Settings,Seller City,Sprzedawca Miasto
 DocType: Email Digest,Next email will be sent on:,
 DocType: Offer Letter Term,Offer Letter Term,Oferta List Term
-apps/erpnext/erpnext/stock/doctype/item/item.py +492,Item has variants.,Pozycja ma warianty.
+apps/erpnext/erpnext/stock/doctype/item/item.py +496,Item has variants.,Pozycja ma warianty.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,
 DocType: Bin,Stock Value,
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,
@@ -628,10 +601,9 @@
 DocType: Material Request Item,Quantity and Warehouse,Ilość i magazyn
 DocType: Sales Invoice,Commission Rate (%),Wartość prowizji (%)
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +172,"Against Voucher Type must be one of Sales Order, Sales Invoice or Journal Entry","Podstawą księgowania może być tu Zlecenie sprzedaży, Faktura sprzedaży lub Zapis księgowy"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +139,Biomachining,Biomachining
 apps/erpnext/erpnext/setup/utils.py +89,Unable to find exchange rate,Nie można znaleźć kurs
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +7,Aerospace,
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +19,Welcome,Witamy
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +7,Aerospace,
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +40,Welcome,Witamy
 DocType: Journal Entry,Credit Card Entry,Wejście kart kredytowych
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +18,Task Subject,Temat zadania
 apps/erpnext/erpnext/config/stock.py +33,Goods received from Suppliers.,Produkty otrzymane od dostawców.
@@ -654,19 +626,19 @@
 DocType: Employee,Cell Number,Numer komórki
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Straty
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +120,You can not enter current voucher in 'Against Journal Entry' column,You can not enter current voucher in 'Against Journal Entry' column
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +25,Energy,Energia
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,Energia
 DocType: Opportunity,Opportunity From,Szansa od
 apps/erpnext/erpnext/config/hr.py +33,Monthly salary statement.,Miesięczny wyciąg do wynagrodzeń.
 DocType: Item Group,Website Specifications,Specyfikacja strony WWW
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +205,New Account,Nowe konto
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +21,{0}: From {0} of type {1},{0}: od {0} typu {1}
-apps/erpnext/erpnext/controllers/buying_controller.py +283,Row {0}: Conversion Factor is mandatory,Wiersz {0}: Współczynnik konwersji jest obowiązkowe
+apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,Wiersz {0}: Współczynnik konwersji jest obowiązkowe
 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.,Zapisy księgowe mogą być wykonane na kontach podrzędnych. Wpisy wobec grupy kont nie są dozwolone.
 DocType: ToDo,High,Wysoki
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +361,Cannot deactivate or cancel BOM as it is linked with other BOMs,Nie można wyłączyć lub anulować LM jak to jest połączone z innymi LM
 DocType: Opportunity,Maintenance,Konserwacja
 DocType: User,Male,Mężczyzna
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +182,Purchase Receipt number required for Item {0},Numer Potwierdzenie Zakupu wymagany dla przedmiotu {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +183,Purchase Receipt number required for Item {0},Numer Potwierdzenie Zakupu wymagany dla przedmiotu {0}
 DocType: Item Attribute Value,Item Attribute Value,Pozycja wartość atrybutu
 apps/erpnext/erpnext/config/crm.py +64,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.
@@ -714,10 +686,9 @@
 DocType: Address,Personal,Osobiste
 DocType: Expense Claim Detail,Expense Claim Type,Typ Zwrotu Kosztów
 DocType: Shopping Cart Settings,Default settings for Shopping Cart,Domyślne ustawienia koszyku
-apps/erpnext/erpnext/controllers/accounts_controller.py +324,"Journal Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Księgowanie {0} jest związany przeciwko Zakonu {1}, sprawdzić, czy należy go wyciągnął, jak wcześniej w tej fakturze."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +13,Biotechnology,Technologia Bio
+apps/erpnext/erpnext/controllers/accounts_controller.py +325,"Journal Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Księgowanie {0} jest związany przeciwko Zakonu {1}, sprawdzić, czy należy go wyciągnął, jak wcześniej w tej fakturze."
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +13,Biotechnology,Technologia Bio
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Office Maintenance Expenses,Wydatki na obsługę biura
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +53,Hemming,Hemming
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +66,Please enter Item first,Proszę najpierw wprowadzić Przedmiot
 DocType: Account,Liability,Zobowiązania
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +62,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Usankcjonowane Kwota nie może być większa niż ilość roszczenia w wierszu {0}.
@@ -730,10 +701,10 @@
 DocType: Company,Default Bank Account,Domyślne konto bankowe
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +47,"To filter based on Party, select Party Type first","Aby filtrować na podstawie partii, wybierz Party Wpisz pierwsze"
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},"&quot;Aktualizacja Zdjęcie&quot; Nie można sprawdzić, ponieważ elementy nie są dostarczane za pośrednictwem {0}"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Nos,Numery
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Nos,Numery
 DocType: Item,Items with higher weightage will be shown higher,Produkty z wyższym weightage zostaną pokazane wyższe
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Uzgodnienia z wyciągiem bankowym - szczegóły
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +627,My Invoices,Moje Faktury
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +629,My Invoices,Moje Faktury
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,Nie znaleziono pracowników
 DocType: Purchase Order,Stopped,
 DocType: Item,If subcontracted to a vendor,Jeśli zlecona dostawcy
@@ -752,35 +723,33 @@
 DocType: Features Setup,"To enable ""Point of Sale"" features",Aby włączyć &quot;punkt sprzedaży&quot; funkcje
 DocType: Bin,Moving Average Rate,
 DocType: Production Planning Tool,Select Items,Wybierz Elementy
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,{0} against Bill {1} dated {2},{0} przed rachunkiem {1} z dnia {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +328,{0} against Bill {1} dated {2},{0} przed rachunkiem {1} z dnia {2}
 DocType: Comment,Reference Name,Nazwa Odniesienia
 DocType: Maintenance Visit,Completion Status,Status ukończenia
 DocType: Sales Invoice Item,Target Warehouse,
 DocType: Item,Allow over delivery or receipt upto this percent,Pozostawić na dostawę lub odbiór zapisu do tego procent
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +49,Expected Delivery Date cannot be before Sales Order Date,Spodziewana data odbioru przesyłki nie może być wcześniejsza od daty sprzedaży
 DocType: Upload Attendance,Import Attendance,
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +17,All Item Groups,Wszystkie grupy produktów
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +17,All Item Groups,Wszystkie grupy produktów
 DocType: Process Payroll,Activity Log,Dziennik aktywności
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +30,Net Profit / Loss,Zysk / strata netto
 apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,
 DocType: Production Order,Item To Manufacture,Rzecz do wyprodukowania
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +16,Permanent mold casting,Stałe formy odlewniczej
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} Stan jest {2}
 apps/erpnext/erpnext/config/learn.py +172,Purchase Order to Payment,Zamówienie zakupu do płatności
 DocType: Sales Order Item,Projected Qty,Prognozowana ilość
 DocType: Sales Invoice,Payment Due Date,Termin Płatności
 DocType: Newsletter,Newsletter Manager,Biuletyn Kierownik
-apps/erpnext/erpnext/stock/doctype/item/item.js +229,Item Variant {0} already exists with same attributes,Pozycja Wersja {0} istnieje już z samymi atrybutami
+apps/erpnext/erpnext/stock/doctype/item/item.js +231,Item Variant {0} already exists with same attributes,Pozycja Wersja {0} istnieje już z samymi atrybutami
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening',&quot;Otwarcie&quot;
 DocType: Notification Control,Delivery Note Message,Wiadomość z Dowodu Dostawy
 DocType: Expense Claim,Expenses,Wydatki
 DocType: Item Variant Attribute,Item Variant Attribute,Pozycja Wersja Atrybut
 ,Purchase Receipt Trends,Trendy Potwierdzenia Zakupu
 DocType: Appraisal,Select template from which you want to get the Goals,
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +77,Research & Development,Badania i rozwój
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Research & Development,Badania i rozwój
 ,Amount to Bill,
 DocType: Company,Registration Details,Szczegóły Rejestracji
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +75,Staking,Wytyczania
 DocType: Item,Re-Order Qty,Ilość w ponowieniu zamówienia
 DocType: Leave Block List Date,Leave Block List Date,
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +25,Scheduled to send to {0},
@@ -791,18 +760,16 @@
 DocType: Sales Invoice Item,Stock Details,Zdjęcie Szczegóły
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Wartość projektu
 apps/erpnext/erpnext/config/selling.py +304,Point-of-Sale,Punkt sprzedaży
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,Cannot carry forward {0},Nie można kontynuować {0} 
 apps/erpnext/erpnext/accounts/doctype/account/account.py +91,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","Już Kredyty saldo konta, nie możesz ustawić ""Równowaga musi być"" za ""Debit"""
 DocType: Account,Balance must be,Bilans powinien wynosić 
 DocType: Hub Settings,Publish Pricing,Opublikuj Ceny
 DocType: Notification Control,Expense Claim Rejected Message,Wiadomość o odrzuconym zwrocie wydatków
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +145,Nailing,Byczy
 ,Available Qty,Dostępne szt
 DocType: Purchase Taxes and Charges,On Previous Row Total,
 DocType: Salary Slip,Working Days,Dni robocze
 DocType: Serial No,Incoming Rate,
 DocType: Packing Slip,Gross Weight,Waga brutto
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +410,The name of your company for which you are setting up this system.,Nazwa firmy / organizacji dla której uruchamiasz niniejszy system.
+apps/erpnext/erpnext/public/js/setup_wizard.js +158,The name of your company for which you are setting up this system.,Nazwa firmy / organizacji dla której uruchamiasz niniejszy system.
 DocType: HR Settings,Include holidays in Total no. of Working Days,
 DocType: Job Applicant,Hold,
 DocType: Employee,Date of Joining,Data Wstąpienia
@@ -812,7 +779,6 @@
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +3,View Subscribers,Zobacz subskrybentów
 DocType: Purchase Invoice Item,Purchase Receipt,Potwierdzenia Zakupu
 ,Received Items To Be Billed,Otrzymane przedmioty czekające na zaksięgowanie
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +114,Abrasive blasting,Czyszczenie strumieniowo-ścierne
 DocType: Employee,Ms,Pani
 apps/erpnext/erpnext/config/accounts.py +148,Currency exchange rate master.,Główna wartość Wymiany walut
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +253,Unable to find Time Slot in the next {0} days for Operation {1},Nie udało się znaleźć wolnego przedziału czasu w najbliższych {0} dniach do pracy {1}
@@ -824,7 +790,7 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +209,Serial No {0} does not belong to Item {1},
 DocType: Purchase Receipt Item Supplied,Required Qty,Wymagana ilość
 DocType: Bank Reconciliation,Total Amount,Wartość całkowita
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +32,Internet Publishing,
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,
 DocType: Production Planning Tool,Production Orders,Zamówienia Produkcji
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +35,Balance Value,Wartość bilansu
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,Lista cena sprzedaży
@@ -835,7 +801,7 @@
 DocType: Supplier,Default Payable Accounts,Domyślne Konto Płatności
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,Pracownik {0} jest nieaktywny lub nie istnieje
 DocType: Features Setup,Item Barcode,Kod kreskowy
-apps/erpnext/erpnext/stock/doctype/item/item.py +487,Item Variants {0} updated,Pozycja Warianty {0} zaktualizowane
+apps/erpnext/erpnext/stock/doctype/item/item.py +491,Item Variants {0} updated,Pozycja Warianty {0} zaktualizowane
 DocType: Quality Inspection Reading,Reading 6,Odczyt 6
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,
 DocType: Address,Shop,Sklep
@@ -844,7 +810,7 @@
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,"Domyślne Konto Bank / Kasa będzie automatycznie aktualizowane za fakturą POS, gdy ten tryb zostanie wybrany."
 DocType: Employee,Permanent Address Is,Stały adres to
 DocType: Production Order Operation,Operation completed for how many finished goods?,Operacja zakończona na jak wiele wyrobów gotowych?
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +491,The Brand,Marka
+apps/erpnext/erpnext/public/js/setup_wizard.js +237,The Brand,Marka
 apps/erpnext/erpnext/controllers/status_updater.py +163,Allowance for over-{0} crossed for Item {1}.,Zniżki dla nadmiernie {0} przeszedł na pozycję {1}.
 DocType: Employee,Exit Interview Details,Wyjdź z szczegółów wywiadu
 DocType: Item,Is Purchase Item,Jest pozycją kupowalną
@@ -864,16 +830,16 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Indirect Income,Przychody pośrednie
 DocType: Payment Tool,Set Payment Amount = Outstanding Amount,Ustaw Kwota płatności = zaległej kwoty
 DocType: Contact Us Settings,Address Line 1,Adres Linia 1
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Variance,Zmienność
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +392,Company Name,Nazwa firmy
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +53,Variance,Zmienność
+,Company Name,Nazwa firmy
 DocType: SMS Center,Total Message(s),
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +515,Select Item for Transfer,Wybierz produkt Transferu
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +538,Select Item for Transfer,Wybierz produkt Transferu
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,Zobacz listę wszystkich filmów pomocy
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,
 DocType: Pricing Rule,Max Qty,Maks. Ilość
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +106,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Wiersz {0}: Płatność przeciwko sprzedaży / Zamówienia powinny być zawsze oznaczone jako góry
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +16,Chemical,Chemiczny
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,Chemiczny
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +693,All items have already been transferred for this Production Order.,Dla tego zamówienia produkcji wszystkie pozycje zostały już przeniesione.
 DocType: Process Payroll,Select Payroll Year and Month,Wybierz Płace rok i miesiąc
 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""",Idź do odpowiedniej grupy (zwykle wykorzystania funduszy&gt; Aktywa obrotowe&gt; rachunków bankowych i utworzyć nowe konto (klikając na Dodaj Child) typu &quot;Bank&quot;
@@ -884,12 +850,12 @@
 DocType: Item,Inspection Criteria,Kryteria kontrolne
 apps/erpnext/erpnext/config/accounts.py +101,Tree of finanial Cost Centers.,"Centrum kosztów, czyli Miejsca Powstawania Kosztów."
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,Przeniesione
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +492,Upload your letter head and logo. (you can edit them later).,Prześlij nagłówek firmowy i logo. (Można je edytować później).
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +156,White,Biały
+apps/erpnext/erpnext/public/js/setup_wizard.js +238,Upload your letter head and logo. (you can edit them later).,Prześlij nagłówek firmowy i logo. (Można je edytować później).
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,White,Biały
 DocType: SMS Center,All Lead (Open),
 DocType: Purchase Invoice,Get Advances Paid,Uzyskaj opłacone zaliczki
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +362,Attach Your Picture,Załącz własny obrazek (awatar)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Make ,Stwórz
+apps/erpnext/erpnext/public/js/setup_wizard.js +112,Attach Your Picture,Załącz własny obrazek (awatar)
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +540,Make ,Stwórz
 DocType: Journal Entry,Total Amount in Words,
 DocType: Workflow State,Stop,Zatrzymaj
 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.,
@@ -898,14 +864,13 @@
 DocType: Lead,Next Contact Date,
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,Ilość Otwarcia
 DocType: Holiday List,Holiday List Name,Lista imion na wakacje
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +168,Stock Options,Opcje magazynu
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +168,Stock Options,Opcje magazynu
 DocType: Journal Entry Account,Expense Claim,Zwrot Kosztów
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +181,Qty for {0},Ilość dla {0}
 DocType: Leave Application,Leave Application,Wniosek o Urlop
 apps/erpnext/erpnext/config/hr.py +77,Leave Allocation Tool,Narzędzie do przydziału urlopu
 DocType: Leave Block List,Leave Block List Dates,
 DocType: Company,If Monthly Budget Exceeded (for expense account),Jeśli budżet miesięczny Przekroczone (dla rachunku kosztów)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +56,Trimming,Przycinanie
 DocType: Workstation,Net Hour Rate,Stawka godzinowa Netto
 DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,Koszt kupionego przedmiotu
 DocType: Company,Default Terms,Regulamin domyślne
@@ -913,10 +878,9 @@
 DocType: POS Profile,Cash/Bank Account,Konto Kasa / Bank
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,Removed items with no change in quantity or value.,Usunięte pozycje bez zmian w ilości lub wartości.
 DocType: Delivery Note,Delivery To,Dostawa do
-apps/erpnext/erpnext/stock/doctype/item/item.py +509,Attribute table is mandatory,Stół atrybut jest obowiązkowy
+apps/erpnext/erpnext/stock/doctype/item/item.py +513,Attribute table is mandatory,Stół atrybut jest obowiązkowy
 DocType: Production Planning Tool,Get Sales Orders,Pobierz zamówienia sprzedaży
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} nie może być ujemna
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +103,Filing,Katalogowanie
 apps/erpnext/erpnext/templates/form_grid/item_grid.html +72,Discount,Zniżka (rabat)
 DocType: Features Setup,Purchase Discounts,Zniżki zakupu
 DocType: Workstation,Wages,Zarobki
@@ -933,6 +897,7 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +112,You are the Expense Approver for this record. Please Update the 'Status' and Save,
 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,Konto nie odpowiada Spółki
 apps/erpnext/erpnext/config/stock.py +136,"Attributes for Item Variants. e.g Size, Color etc.","Atrybuty Element wariantów. np rozmiar, kolor itd."
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +39,WIP Warehouse,WIP Magazyn
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +194,Serial No {0} is under maintenance contract upto {1},
@@ -941,7 +906,7 @@
 DocType: Tax Rule,Shipping State,Stan Shipping
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,"Rzecz musi być dodane za ""elementy z zakupu wpływy"" przycisk"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,Koszty Sprzedaży
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Buying,
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +120,Standard Buying,
 DocType: GL Entry,Against,
 DocType: Item,Default Selling Cost Center,Domyśle Centrum Kosztów Sprzedaży
 DocType: Sales Partner,Implementation Partner,
@@ -962,29 +927,29 @@
 DocType: Time Log Batch,updated via Time Logs,Zaktualizowano przed Dziennik Czasu
 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/setup/page/setup_wizard/setup_wizard.js +588,List a few of your suppliers. They could be organizations or individuals.,Krótka lista Twoich dostawców. Mogą to być firmy lub osoby fizyczne.
+apps/erpnext/erpnext/public/js/setup_wizard.js +326,List a few of your suppliers. They could be organizations or individuals.,Krótka lista Twoich dostawców. Mogą to być firmy lub osoby fizyczne.
 DocType: Company,Default Currency,Domyślna waluta
 DocType: Contact,Enter designation of this Contact,Wpisz stanowisko tego Kontaktu
 DocType: Contact Us Settings,Address,Adres
 DocType: Expense Claim,From Employee,Od Pracownika
-apps/erpnext/erpnext/controllers/accounts_controller.py +338,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,
+apps/erpnext/erpnext/controllers/accounts_controller.py +339,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,
 DocType: Journal Entry,Make Difference Entry,
 DocType: Upload Attendance,Attendance From Date,
 DocType: Appraisal Template Goal,Key Performance Area,Kluczowy obszar wyników
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +54,Transportation,
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +54,Transportation,
 apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +67, and year: ,i rok:
 DocType: Email Digest,Annual Expense,Rocznych kosztów
 DocType: SMS Center,Total Characters,Wszystkich Postacie
-apps/erpnext/erpnext/controllers/buying_controller.py +139,Please select BOM in BOM field for Item {0},Proszę wybrać LM w dziedzinie BOM dla pozycji {0}
+apps/erpnext/erpnext/controllers/buying_controller.py +130,Please select BOM in BOM field for Item {0},Proszę wybrać LM w dziedzinie BOM dla pozycji {0}
 DocType: C-Form Invoice Detail,C-Form Invoice Detail,
 DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,Płatność Wyrównawcza Faktury
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +32,Contribution %,Udział %
 DocType: Item,website page link,link do strony WWW
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +192,Let's prepare the system for first use.,Przygotujmy system do pierwszego użycia.
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +242,Let's prepare the system for first use.,Przygotujmy system do pierwszego użycia.
 DocType: Company,Company registration numbers for your reference. Tax numbers etc.,
 DocType: Sales Partner,Distributor,Dystrybutor
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Koszyk Wysyłka Reguła
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +214,Production Order {0} must be cancelled before cancelling this Sales Order,
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +209,Production Order {0} must be cancelled before cancelling this Sales Order,
 ,Ordered Items To Be Billed,Zamówione produkty do rozliczenia
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +24,From Range has to be less than To Range,Od Zakres musi być mniejsza niż do zakresu
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +21,Select Time Logs and Submit to create a new Sales Invoice.,
@@ -1004,14 +969,13 @@
 DocType: Sales Invoice Advance,Sales Invoice Advance,
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +398,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/page/setup_wizard/install_fixtures.py +75,Management,Zarząd
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +75,Management,Zarząd
 apps/erpnext/erpnext/config/projects.py +33,Types of activities for Time Sheets,
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +14,Investment casting,Odlewania
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +51,Either debit or credit amount is required for {0},Wymagana jest debetowa lub kredytowa kwota dla {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""","To będzie dołączany do Kodeksu poz wariantu. Na przykład, jeśli skrót to ""SM"", a kod element jest ""T-SHIRT"" Kod poz wariantu będzie ""T-SHIRT-SM"""
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,
 apps/frappe/frappe/core/doctype/user/user_list.js +12,Active,Aktywny
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +154,Blue,Niebieski
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +154,Blue,Niebieski
 DocType: Purchase Invoice,Is Return,Czy Wróć
 DocType: Price List Country,Price List Country,Cena Kraj
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +123,Further nodes can be only created under 'Group' type nodes,
@@ -1021,18 +985,16 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +22,POS Profile {0} already created for user: {1} and company {2},POS Profil {0} już utworzony przez użytkownika: {1} i {2} firma
 DocType: Purchase Order Item,UOM Conversion Factor,Współczynnik konwersji jednostki miary
 DocType: Stock Settings,Default Item Group,Domyślna Grupa Przedmiotów
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +156,Laminated object manufacturing,Obiekt produkcyjny laminowany
 apps/erpnext/erpnext/config/buying.py +13,Supplier database.,Baza dostawców
 DocType: Account,Balance Sheet,Arkusz Bilansu
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +561,Cost Center For Item with Item Code ',Centrum kosztów dla Przedmiotu z Kodem Przedmiotu '
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +45,Stretch forming,Stretch formowania
 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 +210,"Further accounts can be made under Groups, but entries can be made against non-Groups","Dalsze relacje mogą być wykonane w ramach grup, ale wpisy mogą być wykonane przed spoza grup"
 apps/erpnext/erpnext/config/hr.py +125,Tax and other salary deductions.,
 DocType: Lead,Lead,Trop
 DocType: Email Digest,Payables,
 DocType: Account,Warehouse,Magazyn
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +90,Row #{0}: Rejected Qty can not be entered in Purchase Return,Wiersz # {0}: Odrzucone Ilość nie może być wprowadzone w Purchase Powrót
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +93,Row #{0}: Rejected Qty can not be entered in Purchase Return,Wiersz # {0}: Odrzucone Ilość nie może być wprowadzone w Purchase Powrót
 ,Purchase Order Items To Be Billed,Przedmioty oczekujące na rachunkowość Zamówienia Kupna
 DocType: Purchase Invoice Item,Net Rate,Cena netto
 DocType: Purchase Invoice Item,Purchase Invoice Item,Przedmiot Faktury Zakupu
@@ -1048,13 +1010,13 @@
 DocType: Global Defaults,Current Fiscal Year,Obecny rok fiskalny
 DocType: Global Defaults,Disable Rounded Total,Wyłącz Zaokrąglanie Sumy
 DocType: Lead,Call,Połączenie
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +384,'Entries' cannot be empty,Pole 'Wpisy' nie może być puste
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +386,'Entries' cannot be empty,Pole 'Wpisy' nie może być puste
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},Wiersz zduplikowany {0} z tym samym {1}
 ,Trial Balance,Zestawienie obrotów i sald
 apps/erpnext/erpnext/config/hr.py +205,Setting up Employees,Konfigurowanie Pracownicy
 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/page/setup_wizard/install_fixtures.py +138,Research,Badania
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +138,Research,Badania
 DocType: Maintenance Visit Purpose,Work Done,Praca wykonana
 apps/erpnext/erpnext/controllers/item_variant.py +25,Please specify at least one attribute in the Attributes table,Proszę zaznaczyć co najmniej jeden atrybut w tabeli atrybutów
 DocType: Contact,User ID,ID Użytkownika
@@ -1062,10 +1024,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +57,View Ledger,Podgląd księgi
 DocType: File,Lft,lft
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Najwcześniejszy
-apps/erpnext/erpnext/stock/doctype/item/item.py +394,"An Item Group exists with same name, please change the item name or rename the item group",Istnieje element Grupy o takiej nazwie. Zmień nazwę elementu lub tamtej Grupy.
+apps/erpnext/erpnext/stock/doctype/item/item.py +398,"An Item Group exists with same name, please change the item name or rename the item group",Istnieje element Grupy o takiej nazwie. Zmień nazwę elementu lub tamtej Grupy.
 DocType: Communication,Delivery Status,Status dostawy
 DocType: Production Order,Manufacture against Sales Order,
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +517,Rest Of The World,Reszta świata
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +455,Rest Of The World,Reszta świata
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,Element {0} nie może mieć Batch
 ,Budget Variance Report,
 DocType: Salary Slip,Gross Pay,Płaca brutto
@@ -1076,13 +1038,11 @@
 DocType: BOM Item,Item Description,Opis produktu
 DocType: Payment Tool,Payment Mode,Tryb Płatności
 DocType: Purchase Invoice,Is Recurring,Czy cykliczne
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +154,Direct metal laser sintering,Bezpośrednie spiekania laserowego metali
 DocType: Purchase Order,Supplied Items,Dostarczone przedmioty
 DocType: Production Order,Qty To Manufacture,Ilość do wyprodukowania
 DocType: Buying Settings,Maintain same rate throughout purchase cycle,Utrzymanie stałej stawki przez cały cykl zakupu
 DocType: Opportunity Item,Opportunity Item,Przedmiot Szansy
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +61,Temporary Opening,Tymczasowe otwarcia
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +41,Cryorolling,Cryorolling
 ,Employee Leave Balance,Bilans zwolnień pracownika
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +128,Balance for Account {0} must always be {1},Bilans dla Konta {0} zawsze powinien wynosić {1}
 DocType: Address,Address Type,Typ Adresu
@@ -1098,23 +1058,23 @@
 DocType: Journal Entry,Get Outstanding Invoices,Uzyskaj zaległą fakturę
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,Zlecenie Sprzedaży {0} jest niepoprawne
 apps/erpnext/erpnext/setup/doctype/company/company.py +172,"Sorry, companies cannot be merged",
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +145,Small,Mały
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Small,Mały
 DocType: Employee,Employee Number,Numer pracownika
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},Numer(y) sprawy w użytku. Proszę spróbować Numer Sprawy {0} 
 ,Invoiced Amount (Exculsive Tax),
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,Pozycja 2
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +59,Account head {0} created,
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +153,Green,Zielony
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Green,Zielony
 DocType: Item,Auto re-order,Automatyczne ponowne zamówienie
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +57,Total Achieved,Razem Osiągnięte
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +59,Total Achieved,Razem Osiągnięte
 DocType: Employee,Place of Issue,
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +59,Contract,Kontrakt
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Contract,Kontrakt
 DocType: Report,Disabled,Wyłączony
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +490,UOM coversion factor required for UOM: {0} in Item: {1},Współczynnik konwersji jednostki miary jest wymagany dla jednostki miary: {0} w Przedmiocie: {1}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +83,Indirect Expenses,Wydatki pośrednie
 apps/erpnext/erpnext/controllers/selling_controller.py +163,Row {0}: Qty is mandatory,Wiersz {0}: Ilość jest obowiązkowe
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +8,Agriculture,Rolnictwo
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +611,Your Products or Services,Twoje Produkty lub Usługi
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,Rolnictwo
+apps/erpnext/erpnext/public/js/setup_wizard.js +347,Your Products or Services,Twoje Produkty lub Usługi
 DocType: Mode of Payment,Mode of Payment,Rodzaj płatności
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,
 DocType: Journal Entry Account,Purchase Order,Zamówienie kupna
@@ -1126,7 +1086,7 @@
 DocType: Serial No,Serial No Details,Szczegóły numeru seryjnego
 DocType: Purchase Invoice Item,Item Tax Rate,Stawka podatku dla tej pozycji
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +113,"For {0}, only credit accounts can be linked against another debit entry","Dla {0}, tylko rachunki kredytowe mogą być połączone z innym wejściem debetowej"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Delivery Note {0} is not submitted,Dowód dostawy {0} nie został wysłany
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +470,Delivery Note {0} is not submitted,Dowód dostawy {0} nie został wysłany
 apps/erpnext/erpnext/stock/get_item_details.py +136,Item {0} must be a Sub-contracted Item,
 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.","Wycena Zasada jest najpierw wybiera się na podstawie ""Zastosuj Na"" polu, które może być pozycja, poz Grupa lub Marka."
@@ -1136,7 +1096,7 @@
 DocType: Appraisal Goal,Goal,Cel
 DocType: Sales Invoice Item,Edit Description,Edytuj opis
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +318,Expected Delivery Date is lesser than Planned Start Date.,Oczekiwany Dostawa Data jest mniejszy niż planowane daty rozpoczęcia.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +579,For Supplier,Dla dostawcy
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +602,For Supplier,Dla dostawcy
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,
 DocType: Purchase Invoice,Grand Total (Company Currency),Całkowita suma (w walucie firmy)
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,Razem Wychodzące
@@ -1162,10 +1122,10 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +74,"Total {0} for all items is zero, may you should change 'Distribute Charges Based On'","Razem {0} dla wszystkich elementów jest równa zero, może powinieneś zmienić &quot;Dystrybucja opłat na podstawie&quot;"
 DocType: Purchase Invoice,Taxes and Charges Calculation,
 DocType: BOM Operation,Workstation,Stacja robocza
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +112,Hardware,
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +112,Hardware,
 DocType: Attendance,HR Manager,
 apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,Wybierz firmę
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +50,Privilege Leave,
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +50,Privilege Leave,
 DocType: Purchase Invoice,Supplier Invoice Date,
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +79,You need to enable Shopping Cart,Musisz włączyć Koszyk
 apps/frappe/frappe/public/js/frappe/form/grid_body.html +6,No Data,Brak danych
@@ -1178,7 +1138,7 @@
 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 +168,Against Journal Entry {0} is already adjusted against some other voucher,Zapis {0} jest już powiązany z innym dowodem księgowym
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +68,Total Order Value,Łączna wartość zamówienia
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +38,Food,Żywność
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +38,Food,Żywność
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Starzenie Zakres 3
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +139,You can make a time log only against a submitted production order,Możesz zrobić dziennik czasu tylko przed złożonego zlecenia produkcyjnego
 DocType: Maintenance Schedule Item,No of Visits,Numer wizyt
@@ -1198,6 +1158,7 @@
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,View Offer Letter,Zobacz List Oferty
 DocType: Communication,Communication,Komunikacja
 DocType: Item,Is Service Item,Jest usługą
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +81,Application period cannot be outside leave allocation period,Okres aplikacja nie może być okres alokacji urlopu poza
 DocType: Activity Cost,Projects,Projekty
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +31,Please select Fiscal Year,Wybierz Rok Podatkowy
 apps/erpnext/erpnext/controllers/buying_controller.py +23,From {0} | {1} {2},Od {0} | {1} {2}
@@ -1216,7 +1177,7 @@
 DocType: Item,Maintain Stock,Utrzymanie Zapasów
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +213,Stock Entries already created for Production Order ,Zbiory wpisy już utworzone dla Produkcji Zakonu
 DocType: Leave Control Panel,Leave blank if considered for all designations,Zostaw puste jeśli jest to rozważane dla wszystkich nominacji
-apps/erpnext/erpnext/controllers/accounts_controller.py +499,Charge of type 'Actual' in row {0} cannot be included in Item Rate,
+apps/erpnext/erpnext/controllers/accounts_controller.py +500,Charge of type 'Actual' in row {0} cannot be included in Item Rate,
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,Max: {0},Max: {0}
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +16,From Datetime,Od DateTime
 DocType: Email Digest,For Company,Dla firmy
@@ -1226,7 +1187,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +50,Chart of Accounts,Plan Kont
 DocType: Material Request,Terms and Conditions Content,Zawartość regulaminu
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +471,cannot be greater than 100,nie może być większa niż 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +546,Item {0} is not a stock Item,
+apps/erpnext/erpnext/stock/doctype/item/item.py +550,Item {0} is not a stock Item,
 DocType: Maintenance Visit,Unscheduled,Nieplanowany
 DocType: Employee,Owned,Zawłaszczony
 DocType: Salary Slip Deduction,Depends on Leave Without Pay,Zależy od urlopu bezpłatnego
@@ -1240,31 +1201,29 @@
 DocType: HR Settings,Employee Settings,Ustawienia pracownika
 ,Batch-Wise Balance History,
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +72,To Do List,"Lista ""Do zrobienia"""
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +63,Apprentice,Uczeń
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Apprentice,Uczeń
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +99,Negative Quantity is not allowed,Ilość nie może być wyrażana na minusie
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
 Used for Taxes and Charges","Podatki pobierane z tabeli szczegółów mistrza poz jako ciąg znaków i przechowywane w tej dziedzinie.
  Służy do podatkach i opłatach"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +61,Lancing,kopiowanie
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +151,Employee cannot report to himself.,Pracownik nie może odpowiadać do samego siebie.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Jeśli konto jest zamrożone, zapisy mogą wykonywać tylko wyznaczone osoby."
 DocType: Email Digest,Bank Balance,Saldo bankowe
-apps/erpnext/erpnext/controllers/accounts_controller.py +435,Accounting Entry for {0}: {1} can only be made in currency: {2},Wejście księgowe dla {0}: {1} może być dokonywane wyłącznie w walucie: {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +436,Accounting Entry for {0}: {1} can only be made in currency: {2},Wejście księgowe dla {0}: {1} może być dokonywane wyłącznie w walucie: {2}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +38,No active Salary Structure found for employee {0} and the month,Brak aktywnego Struktura znaleziono pracownika wynagrodzenie {0} i miesiąca
 DocType: Job Opening,"Job profile, qualifications required etc.","Profil pracy, wymagane kwalifikacje itp."
 DocType: Journal Entry Account,Account Balance,Bilans konta
 apps/erpnext/erpnext/config/accounts.py +112,Tax Rule for transactions.,Reguła podatkowa dla transakcji.
 DocType: Rename Tool,Type of document to rename.,
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +630,We buy this Item,Kupujemy ten przedmiot
+apps/erpnext/erpnext/public/js/setup_wizard.js +366,We buy this Item,Kupujemy ten przedmiot
 DocType: Address,Billing,Rozliczenie
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +77,Flanging,Wywinięcie
 DocType: Bulk Email,Not Sent,Nie wysłane
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +73,Explosive forming,Wybuchowe formowania
 DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),
 DocType: Shipping Rule,Shipping Account,
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +43,Scheduled to send to {0} recipients,
 DocType: Quality Inspection,Readings,Odczyty
 DocType: Stock Entry,Total Additional Costs,Wszystkich Dodatkowe koszty
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Sub Assemblies,
+apps/erpnext/erpnext/public/js/setup_wizard.js +359,Sub Assemblies,
 DocType: Shipping Rule Condition,To Value,
 DocType: Supplier,Stock Manager,Kierownik magazynu
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +143,Source warehouse is mandatory for row {0},
@@ -1274,44 +1233,42 @@
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,
 apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,Nie dodano jeszcze adresu.
 DocType: Workstation Working Hour,Workstation Working Hour,Godziny robocze Stacji Roboczej
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +83,Analyst,Analityk
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +202,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Wiersz {0}: Przyznana kwota {1} musi być mniejsza lub równa JV ilości {2}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Analyst,Analityk
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +149,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Wiersz {0}: Przyznana kwota {1} musi być mniejsza lub równa JV ilości {2}
 DocType: Item,Inventory,Inwentarz
 DocType: Features Setup,"To enable ""Point of Sale"" view",Aby włączyć &quot;punkt sprzedaży&quot; widzenia
 apps/erpnext/erpnext/public/js/pos/pos.js +402,Payment cannot be made for empty cart,Płatność nie może być wykonana za pusty koszyk
 DocType: Item,Sales Details,Szczegóły sprzedaży
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +149,Pinning,Przypinanie
 DocType: Opportunity,With Items,Z przedmiotami
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,
 DocType: Notification Control,Expense Claim Rejected,Zwrot wydatku odrzucony
 DocType: Sales Invoice,"The date on which next invoice will be generated. It is generated on submit.
 ","Dzień, w którym będą generowane następne faktury. Generowanie wykonywane jest na żądanie."
 DocType: Item Attribute,Item Attribute,Element Atrybut
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +105,Government,Rząd
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Government,Rząd
 apps/erpnext/erpnext/config/stock.py +268,Item Variants,Warianty artykuł
 DocType: Company,Services,Usługi
 apps/erpnext/erpnext/accounts/report/financial_statements.py +147,Total ({0}),Razem ({0})
 DocType: Cost Center,Parent Cost Center,Nadrzędny dział kalkulacji kosztów
 DocType: Sales Invoice,Source,Źródło
 DocType: Leave Type,Is Leave Without Pay,Czy urlopu bezpłatnego
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +186,No records found in the Payment table,Nie znaleziono rekordów w tabeli płatności
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +405,Financial Year Start Date,Data początku roku finansowego
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +133,No records found in the Payment table,Nie znaleziono rekordów w tabeli płatności
+apps/erpnext/erpnext/public/js/setup_wizard.js +153,Financial Year Start Date,Data początku roku finansowego
 DocType: Employee External Work History,Total Experience,
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +100,Countersinking,Pogłębianie
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +271,Packing Slip(s) cancelled,
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +276,Packing Slip(s) cancelled,
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,Koszty dostaw i przesyłek
 DocType: Material Request Item,Sales Order No,Nr Zlecenia Sprzedaży
 DocType: Item Group,Item Group Name,
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +50,Taken,Wzięty
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,Wzięty
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +66,Transfer Materials for Manufacture,Materiały transferowe dla Produkcja
 DocType: Pricing Rule,For Price List,Dla Listy Cen
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +27,Executive Search,Szukanie wykonawcze
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,Szukanie wykonawcze
 apps/erpnext/erpnext/stock/stock_ledger.py +405,"Purchase rate for item: {0} not found, which is required to book accounting entry (expense). Please mention item price against a buying price list.","Kurs kupna dla pozycji: {0} nie znaleziono, która jest wymagana do rezerwacji zapisów księgowych (koszty). Powołaj się na rzecz cena przed cennika skupu."
 DocType: Maintenance Schedule,Schedules,Harmonogramy
 DocType: Purchase Invoice Item,Net Amount,Kwota netto
 DocType: Purchase Order Item Supplied,BOM Detail No,
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),Dodatkowa kwota rabatu (waluta firmy)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +537,Error: {0} > {1},Błąd: {0} > {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +541,Error: {0} > {1},Błąd: {0} > {1}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,
 DocType: Maintenance Visit,Maintenance Visit,Wizyta Konserwacji
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer > Customer Group > Territory,Klient >  Grupa klientów > Terytorium
@@ -1322,7 +1279,6 @@
 DocType: Event,Tuesday,Wtorek
 DocType: Leave Block List,Block Holidays on important days.,Blok Wakacje na ważne dni.
 ,Accounts Receivable Summary,Należności Podsumowanie
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +43,Leaves for type {0} already allocated for Employee {1} for period {2} - {3},Pozostawia dla typu {0} już przydzielonego Pracodawcy dla {1} {2} okresu - {3}
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +187,Please set User ID field in an Employee record to set Employee Role,Proszę ustawić pole ID użytkownika w rekordzie pracownika do roli pracownika zestawu
 DocType: UOM,UOM Name,Nazwa Jednostki Miary
 DocType: Top Bar Item,Target,
@@ -1334,15 +1290,14 @@
 DocType: ToDo,Due Date,Termin
 DocType: Sales Invoice Item,Brand Name,Nazwa marki
 DocType: Purchase Receipt,Transporter Details,Szczegóły transporterów
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Box,Pudło
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +389,The Organization,Organizacja
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Box,Pudło
+apps/erpnext/erpnext/public/js/setup_wizard.js +137,The Organization,Organizacja
 DocType: Monthly Distribution,Monthly Distribution,Miesięczny Dystrybucja
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,Lista odbiorców jest pusta. Proszę stworzyć Listę Odbiorców
 DocType: Production Plan Sales Order,Production Plan Sales Order,Zamówienie sprzedaży plany produkcji
 DocType: Sales Partner,Sales Partner Target,
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},Wejście księgowe dla {0} może być dokonywane wyłącznie w walucie: {1}
 DocType: Pricing Rule,Pricing Rule,Reguła cenowa
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +58,Notching,Nacinania
 apps/erpnext/erpnext/config/learn.py +167,Material Request to Purchase Order,Materiał Wniosek o Zamówieniu
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +74,Row # {0}: Returned Item {1} does not exists in {2} {3},Wiersz # {0}: wracającą rzecz {1} nie istnieje w {2} {3}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,Konta bankowe
@@ -1359,20 +1314,19 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Amounts not reflected in bank,Kwoty nie odzwierciedlone w banku
 DocType: Quality Inspection Reading,Reading 4,Odczyt 4
 apps/erpnext/erpnext/config/hr.py +23,Claims for company expense.,Zwrot wydatków
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +8,Centrifugal casting,Odlewanie odśrodkowe
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +119,Magnetic field-assisted finishing,Wspomagane wykańczania pola magnetycznego
 DocType: Company,Default Holiday List,Domyślnie lista urlopowa
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +165,Stock Liabilities,
 DocType: Purchase Receipt,Supplier Warehouse,Magazyn dostawcy
 DocType: Opportunity,Contact Mobile No,Numer komórkowy kontaktu
 DocType: Production Planning Tool,Select Sales Orders,
 ,Material Requests for which Supplier Quotations are not created,
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +117,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,"Dzień (s), w którym starasz się o urlop jest święta. Nie musisz ubiegać się o urlop."
 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/buying/doctype/purchase_order/purchase_order.js +477,Mark as Delivered,Oznacz jako Dostawa
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +497,Mark as Delivered,Oznacz jako Dostawa
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +34,Make Quotation,Dodać Oferta
 DocType: Dependent Task,Dependent Task,Zadanie zależne
-apps/erpnext/erpnext/stock/doctype/item/item.py +306,Conversion factor for default Unit of Measure must be 1 in row {0},Współczynnikiem konwersji dla domyślnej Jednostki Pomiaru musi być 1 w rzędzie {0}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,Leave of type {0} cannot be longer than {1},Urlop typu {0} nie może być dłuższy niż {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +310,Conversion factor for default Unit of Measure must be 1 in row {0},Współczynnikiem konwersji dla domyślnej Jednostki Pomiaru musi być 1 w rzędzie {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +155,Leave of type {0} cannot be longer than {1},Urlop typu {0} nie może być dłuższy niż {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Spróbuj planowania operacji dla X dni wcześniej.
 DocType: HR Settings,Stop Birthday Reminders,
 DocType: SMS Center,Receiver List,Lista odbiorców
@@ -1380,15 +1334,14 @@
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Skonsumowana wartość
 apps/erpnext/erpnext/public/js/pos/pos.js +491,{0} View,{0} Zobacz
 DocType: Salary Structure Deduction,Salary Structure Deduction,
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +158,Selective laser sintering,Selektywne spiekanie laserowe
-apps/erpnext/erpnext/stock/doctype/item/item.py +301,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Jednostka miary {0} została wprowadzona więcej niż raz w Tabelce Współczynnika Konwersji
+apps/erpnext/erpnext/stock/doctype/item/item.py +305,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Jednostka miary {0} została wprowadzona więcej niż raz w Tabelce Współczynnika Konwersji
 apps/frappe/frappe/core/page/data_import_tool/data_import_tool.js +108,Import Successful!,
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Koszt Emitowanych Przedmiotów
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +185,Quantity must not be more than {0},Ilość nie może być większa niż {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +41,Age (Days),Wiek (dni)
 DocType: Quotation Item,Quotation Item,Przedmiot Wyceny
 DocType: Account,Account Name,Nazwa konta
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +41,From Date cannot be greater than To Date,Data od - nie może być późniejsza niż Data do
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +34,From Date cannot be greater than To Date,Data od - nie może być późniejsza niż Data do
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +194,Serial No {0} quantity {1} cannot be a fraction,
 apps/erpnext/erpnext/config/buying.py +59,Supplier Type master.,
 DocType: Purchase Order Item,Supplier Part Number,Numer katalogowy dostawcy
@@ -1397,14 +1350,14 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +247,{0} {1} is cancelled or stopped,{0} {1} jest anulowane lub wstrzymane
 DocType: Accounts Settings,Credit Controller,
 DocType: Delivery Note,Vehicle Dispatch Date,Data wysłania pojazdu
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +197,Purchase Receipt {0} is not submitted,Potwierdzenie Zakupu {0} nie zostało wysłane
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +198,Purchase Receipt {0} is not submitted,Potwierdzenie Zakupu {0} nie zostało wysłane
 DocType: Company,Default Payable Account,Domyślnie konto płatności
 apps/erpnext/erpnext/config/website.py +13,"Settings for online shopping cart such as shipping rules, price list etc.","Ustawienia dla internetowego koszyka, takie jak zasady żeglugi, cennika itp"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +660,Setup Complete,Konfiguracja zakończona
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +124,Setup Complete,Konfiguracja zakończona
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +65,{0}% Billed,{0}% rozliczono
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +17,Reserved Qty,Zarezerwowana ilość
 DocType: Party Account,Party Account,Konto Grupy
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +74,Human Resources,Kadry
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +74,Human Resources,Kadry
 DocType: Lead,Upper Income,
 DocType: Journal Entry Account,Debit in Company Currency,Debet w firmie Waluta
 apps/erpnext/erpnext/support/doctype/issue/issue.py +58,My Issues,Moje problemy
@@ -1413,11 +1366,9 @@
 DocType: Company,Default Values,Domyślne Wartości
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +236,Row {0}: Payment amount can not be negative,Wiersz {0}: kwota płatności nie może być ujemna
 DocType: Expense Claim,Total Amount Reimbursed,Całkowitej kwoty zwrotów
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +152,Press fitting,Prasa montażu
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +64,Against Supplier Invoice {0} dated {1},Przeciwko Dostawcę faktury {0} {1} dnia
 DocType: Customer,Default Price List,Domyślna List Cen
 DocType: Payment Reconciliation,Payments,Płatności
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +24,Hot isostatic pressing,Prasowanie izostatyczne na gorąco
 DocType: ToDo,Medium,Średni
 DocType: Budget Detail,Budget Allocated,
 DocType: Journal Entry,Entry Type,Rodzaj wejścia
@@ -1430,9 +1381,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +56,None of the items have any change in quantity or value.,Żaden z elementów ma żadnych zmian w ilości lub wartości.
 DocType: Warranty Claim,Warranty Claim,Roszczenie gwarancyjne
 ,Lead Details,Dane Tropu
-DocType: Authorization Rule,Approving User,Użytkownik Zatwierdzający
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +37,Forging,Kucie
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +126,Plating,Galwanizacja
 DocType: Purchase Invoice,End date of current invoice's period,Data zakończenia okresu bieżącej faktury
 DocType: Pricing Rule,Applicable For,Stosowne dla
 DocType: Bank Reconciliation,From Date,Od daty
@@ -1454,31 +1402,29 @@
 DocType: Sales Invoice,Paid Amount (Company Currency),Zapłacona kwota (waluta firmy)
 DocType: Purchase Invoice,Additional Discount,Dodatkowe zniżki
 DocType: Selling Settings,Selling Settings,Ustawienia Sprzedaży
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +39,Online Auctions,Aukcje Online
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,Aukcje Online
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +94,Please specify either Quantity or Valuation Rate or both,
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +50,"Company, Month and Fiscal Year is mandatory",
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Marketing Expenses,Wydatki marketingowe
 ,Item Shortage Report,
-apps/erpnext/erpnext/stock/doctype/item/item.js +183,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Waga jest określona, \n Ustaw także ""Wagę jednostkową"""
+apps/erpnext/erpnext/stock/doctype/item/item.js +185,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Waga jest określona, \n Ustaw także ""Wagę jednostkową"""
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,
 apps/erpnext/erpnext/config/support.py +43,Single unit of an Item.,Jednostka produktu.
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +212,Time Log Batch {0} must be 'Submitted',
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,Tworzenie Zapisów Księgowych dla każdej zmiany stanu Magazynu
 DocType: Leave Allocation,Total Leaves Allocated,
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +384,Warehouse required at Row No {0},Magazyn wymagany w wierszu nr {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +386,Warehouse required at Row No {0},Magazyn wymagany w wierszu nr {0}
 DocType: Employee,Date Of Retirement,Data przejścia na emeryturę
 DocType: Upload Attendance,Get Template,Pobierz szablon
 DocType: Address,Postal,Pocztowy
 DocType: Item,Weightage,
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +159,Mining,Górnictwo
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +17,Resin casting,Odlewy z żywicy
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,Grupa Odbiorców posiada taką nazwę - wprowadź inną nazwę Odbiorcy lub zmień nazwę Grupy  
 apps/erpnext/erpnext/public/js/pos/pos.js +147,Please select {0} first.,Proszę najpierw wybrać {0}.
 apps/erpnext/erpnext/templates/pages/order.html +57,text {0},tekst {0}
 DocType: Territory,Parent Territory,Nadrzędne terytorium
 DocType: Quality Inspection Reading,Reading 2,Odczyt 2
 DocType: Stock Entry,Material Receipt,Przyjęcie materiałów
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +622,Products,Produkty
+apps/erpnext/erpnext/public/js/setup_wizard.js +358,Products,Produkty
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +47,Party Type and Party is required for Receivable / Payable account {0},Strona Typ i Partia jest wymagany do otrzymania / rachunku Płatne {0}
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.","Jeśli ten element ma warianty, to nie może być wybrany w zleceniach sprzedaży itp"
 DocType: Lead,Next Contact By,
@@ -1488,13 +1434,13 @@
 DocType: Purchase Invoice,Notification Email Address,
 DocType: Payment Tool,Find Invoices to Match,Znajdź pasujące faktury
 ,Item-wise Sales Register,
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +399,"e.g. ""XYZ National Bank""","np ""XYZ Narodowy Bank """
+apps/erpnext/erpnext/public/js/setup_wizard.js +147,"e.g. ""XYZ National Bank""","np ""XYZ Narodowy Bank """
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +57,Total Target,Łączna docelowa
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Target,Łączna docelowa
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.js +22,Shopping Cart is enabled,Koszyk jest włączony
 DocType: Job Applicant,Applicant for a Job,Aplikant do Pracy
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +173,No Production Orders created,
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +131,Salary Slip of employee {0} already created for this month,
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +140,Salary Slip of employee {0} already created for this month,
 DocType: Stock Reconciliation,Reconciliation JSON,Wyrównywanie JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Zbyt wiele kolumn. Wyeksportować raport i wydrukować go za pomocą arkusza kalkulacyjnego.
 DocType: Sales Invoice Item,Batch No,Nr Partii
@@ -1504,14 +1450,14 @@
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +13,Variant,Wariant
 apps/frappe/frappe/public/js/frappe/form/toolbar.js +165,New {0},Nowy rekord {0}
 DocType: Naming Series,Set prefix for numbering series on your transactions,
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +169,Stopped order cannot be cancelled. Unstop to cancel.,
-apps/erpnext/erpnext/stock/doctype/item/item.py +323,Default BOM ({0}) must be active for this item or its template,Domyślnie Wykaz Materiałów ({0}) musi być aktywny dla tej pozycji lub jej szablonu
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +164,Stopped order cannot be cancelled. Unstop to cancel.,
+apps/erpnext/erpnext/stock/doctype/item/item.py +327,Default BOM ({0}) must be active for this item or its template,Domyślnie Wykaz Materiałów ({0}) musi być aktywny dla tej pozycji lub jej szablonu
 DocType: Employee,Leave Encashed?,
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Szansa Od pola jest obowiązkowe
 DocType: Item,Variants,Warianty
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +458,Make Purchase Order,
 DocType: SMS Center,Send To,
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +111,There is not enough leave balance for Leave Type {0},
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +127,There is not enough leave balance for Leave Type {0},
 DocType: Sales Team,Contribution to Net Total,
 DocType: Sales Invoice Item,Customer's Item Code,Kod Przedmiotu Klienta
 DocType: Stock Reconciliation,Stock Reconciliation,Uzgodnienia stanu
@@ -1548,11 +1494,11 @@
 DocType: Sales Order Item,Actual Qty,Rzeczywista Ilość
 DocType: Sales Invoice Item,References,Referencje
 DocType: Quality Inspection Reading,Reading 10,Odczyt 10
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +612,"List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start.","Wypełnij listę produktów lub usług, które kupujesz lub sprzedajesz. Upewnij się, czy poprawnie wybierasz kategorię oraz jednostkę miary. "
+apps/erpnext/erpnext/public/js/setup_wizard.js +348,"List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start.","Wypełnij listę produktów lub usług, które kupujesz lub sprzedajesz. Upewnij się, czy poprawnie wybierasz kategorię oraz jednostkę miary. "
 DocType: Hub Settings,Hub Node,Hub Węzeł
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,
 apps/erpnext/erpnext/controllers/item_variant.py +65,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values,Wartość {0} do {1} atrybutów nie istnieje na liście ważnej pozycji wartości atrybutów
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +87,Associate,
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Associate,
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +46,Item {0} is not a serialized Item,
 DocType: SMS Center,Create Receiver List,Stwórz listę odbiorców
 apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +5,Expired,Upłynął
@@ -1561,7 +1507,7 @@
 DocType: Warranty Claim,Issue Date,
 DocType: Activity Cost,Activity Cost,Aktywny Koszt
 DocType: Purchase Receipt Item Supplied,Consumed Qty,Skonsumowana ilość
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +52,Telecommunications,
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +52,Telecommunications,
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),"Wskazuje, że pakiet jest częścią tej dostawy (Tylko projektu)"
 DocType: Payment Tool,Make Payment Entry,
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +119,Quantity for Item {0} must be less than {1},Ilość dla Przedmiotu {0} musi być mniejsza niż {1}
@@ -1578,10 +1524,8 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +37,"Selling must be checked, if Applicable For is selected as {0}","Sprzedaż musi być sprawdzona, jeśli dotyczy wybrano jako {0}"
 DocType: Purchase Order Item,Supplier Quotation Item,
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +27,Make Salary Structure,
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +54,Shearing,Strzyżenie
 DocType: Item,Has Variants,Ma Warianty
 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.,
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +166,Packaging and labeling,Pakowania i etykietowania
 DocType: Monthly Distribution,Name of the Monthly Distribution,Nazwa dystrybucji miesięcznej
 DocType: Sales Person,Parent Sales Person,Nadrzędny Przedstawiciel Handlowy
 apps/erpnext/erpnext/setup/utils.py +14,Please specify Default Currency in Company Master and Global Defaults,Sprecyzuj domyślną walutę w ustawieniach firmy i globalnych
@@ -1592,19 +1536,18 @@
 DocType: Budget Detail,Fiscal Year,Rok Podatkowy
 DocType: Cost Center,Budget,Budżet
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +41,"Budget cannot be assigned against {0}, as it's not an Income or Expense account","Budżet nie może być przypisany przed {0}, ponieważ nie jest to konto przychodów lub kosztów"
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Achieved,Osiągnięte
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,Osiągnięte
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +65,Territory / Customer,
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,e.g. 5,
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +207,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},Wiersz {0}: Przyznana kwota {1} musi być mniejsza lub równa pozostałej kwoty faktury {2}
+apps/erpnext/erpnext/public/js/setup_wizard.js +294,e.g. 5,
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},Wiersz {0}: Przyznana kwota {1} musi być mniejsza lub równa pozostałej kwoty faktury {2}
 DocType: Sales Invoice,In Words will be visible once you save the Sales Invoice.,
 DocType: Item,Is Sales Item,Jest pozycją sprzedawalną
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,Drzewo kategorii
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,
 DocType: Maintenance Visit,Maintenance Time,Czas Konserwacji
 ,Amount to Deliver,Kwota do Deliver
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +620,A Product or Service,Produkt lub usługa
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +158,There were errors.,
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +101,Tapping,Dotykając
+apps/erpnext/erpnext/public/js/setup_wizard.js +356,A Product or Service,Produkt lub usługa
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +146,There were errors.,
 DocType: Naming Series,Current Value,Bieżąca Wartość
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +171,{0} created,{0} utworzone
 DocType: Delivery Note Item,Against Sales Order,Na podstawie zamówienia sprzedaży
@@ -1619,7 +1562,7 @@
 apps/erpnext/erpnext/accounts/party.py +275,Due Date cannot be before Posting Date,Termin nie może być po Dacie Umieszczenia
 DocType: Website Item Group,Website Item Group,Grupa przedmiotów strony WWW
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Duties and Taxes,Podatki i cła
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Please enter Reference date,
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +312,Please enter Reference date,
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} wpisy płatności nie mogą być filtrowane przez {1}
 DocType: Item Website Specification,Table for Item that will be shown in Web Site,"Tabela dla pozycji, które zostaną pokazane w Witrynie"
 DocType: Purchase Order Item Supplied,Supplied Qty,Dostarczane szt
@@ -1627,7 +1570,7 @@
 apps/erpnext/erpnext/config/stock.py +103,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,
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +152,Red,Czerwony
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Red,Czerwony
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +228,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},
 DocType: Account,Frozen,Zamrożony
 ,Open Production Orders,Otwórz zamówienia produkcji
@@ -1642,7 +1585,7 @@
 DocType: Item Attribute,Attribute Name,Nazwa atrybutu
 apps/erpnext/erpnext/controllers/selling_controller.py +236,Item {0} must be Sales or Service Item in {1},
 DocType: Item Group,Show In Website,Pokaż na stronie internetowej
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +621,Group,Grupa
+apps/erpnext/erpnext/public/js/setup_wizard.js +357,Group,Grupa
 DocType: Task,Expected Time (in hours),Oczekiwany czas (w godzinach)
 ,Qty to Order,Ilość do zamówienia
 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","Aby śledzić markę w następujących dokumentach dostawy Uwaga, Opportunity, materiał: Zapytanie, poz, Zamówienia, zakupu bonu Zamawiającego odbioru, Notowania, faktury sprzedaży, Bundle wyrobów, zlecenia sprzedaży, nr seryjny"
@@ -1652,6 +1595,7 @@
 DocType: Features Setup,Brands,Marki
 DocType: C-Form Invoice Detail,Invoice No,Nr faktury
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +480,From Purchase Order,Od Zamówienia Kupna
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +92,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Zostaw nie mogą być stosowane / anulowana przed {0}, a bilans urlopu zostało już przeniesionych przekazywane w przyszłości rekordu alokacji urlopu {1}"
 DocType: Activity Cost,Costing Rate,Wskaźnik zestawienia kosztów
 ,Customer Addresses And Contacts,
 DocType: Employee,Resignation Letter Date,
@@ -1659,35 +1603,31 @@
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +137,Not Set,Brak Ustawień
 DocType: Communication,Date,Data
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,Powtórz Przychody klienta
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +651,Sit tight while your system is being setup. This may take a few moments.,"Czekaj cierpliwie, system jest konfigurowany. To zajmie zaledwie kilka chwil."
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +115,Sit tight while your system is being setup. This may take a few moments.,"Czekaj cierpliwie, system jest konfigurowany. To zajmie zaledwie kilka chwil."
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +51,{0} ({1}) must have role 'Expense Approver',{0} ({1}) musi mieć rolę 'Zatwierdzający Koszty
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Pair,Para
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Pair,Para
 DocType: Bank Reconciliation Detail,Against Account,Konto korespondujące
 DocType: Maintenance Schedule Detail,Actual Date,Rzeczywista Data
 DocType: Item,Has Batch No,Posada numer partii (batch)
 DocType: Delivery Note,Excise Page Number,Akcyza numeru strony
 DocType: Employee,Personal Details,Dane Osobowe
 ,Maintenance Schedules,Plany Konserwacji
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +44,Embossing,Tłoczenie
 ,Quotation Trends,Trendy Wyceny
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +139,Item Group not mentioned in item master for item {0},Pozycja Grupa nie wymienione w pozycji do pozycji mistrza {0}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +302,Debit To account must be a Receivable account,Debet na konto musi być rachunkiem otrzymującym
-apps/erpnext/erpnext/stock/doctype/item/item.py +310,"As Production Order can be made for this item, it must be a stock item.",
 DocType: Shipping Rule Condition,Shipping Amount,
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +140,Joining,Łączący
-DocType: Authorization Rule,Above Value,Wartość Powyżej
 ,Pending Amount,Kwota Oczekiwana
 DocType: Purchase Invoice Item,Conversion Factor,Współczynnik konwersji
 DocType: Purchase Order,Delivered,Dostarczono
 apps/erpnext/erpnext/config/hr.py +160,Setup incoming server for jobs email id. (e.g. jobs@example.com),
 DocType: Purchase Receipt,Vehicle Number,Numer pojazdu
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,
+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,Liczba przyznanych liście {0} nie może być mniejsza niż już zatwierdzonych liści {1} w okresie
 DocType: Journal Entry,Accounts Receivable,Należności
 ,Supplier-Wise Sales Analytics,
 DocType: Address Template,This format is used if country specific format is not found,"Format ten jest używany, jeśli Format danego kraju nie znaleziono"
 DocType: Custom Field,Custom,Niestandardowy
 DocType: Production Order,Use Multi-Level BOM,Używaj wielopoziomowych zestawień materiałowych
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +26,Injection molding,Formowanie wtryskowe
 DocType: Bank Reconciliation,Include Reconciled Entries,Dołącz uzgodnione wpisy
 apps/erpnext/erpnext/config/accounts.py +41,Tree of finanial accounts.,Rejestr operacji gospodarczych.
 DocType: Leave Control Panel,Leave blank if considered for all employee types,Zostaw puste jeśli jest to rozważane dla wszystkich typów pracowników
@@ -1697,30 +1637,28 @@
 apps/frappe/frappe/config/setup.py +130,Printing,Druk
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +114,Expense Claim is pending approval. Only the Expense Approver can update status.,Zwrot Kosztów jest w oczekiwaniu na potwierdzenie. Tylko osoba zatwierdzająca wydatki może uaktualnić status.
 DocType: Purchase Invoice,Additional Discount Amount,Kwota dodatkowego rabatu
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +99,The day(s) on which you are applying for leave are holiday. You need not apply for leave.,
 apps/frappe/frappe/public/js/frappe/misc/utils.js +110,and,i
 DocType: Leave Block List Allow,Leave Block List Allow,
 apps/erpnext/erpnext/setup/doctype/company/company.py +236,Abbr can not be blank or space,Skrót nie może być pusty lub być spacją
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +50,Sports,
+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,Razem Rzeczywisty
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Unit,szt.
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Unit,szt.
 apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.py +182,Please set Dropbox access keys in your site config,
 apps/erpnext/erpnext/stock/get_item_details.py +113,Please specify Company,Sprecyzuj Firmę
 ,Customer Acquisition and Loyalty,
 DocType: Purchase Receipt,Warehouse where you are maintaining stock of rejected items,Magazyn w którym zarządzasz odrzuconymi przedmiotami
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +408,Your financial year ends on,Zakończenie roku podatkowego
+apps/erpnext/erpnext/public/js/setup_wizard.js +156,Your financial year ends on,Zakończenie roku podatkowego
 DocType: POS Profile,Price List,Cennik
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +20,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0} jest teraz domyślnym rokiem finansowym. Odśwież swoją przeglądarkę aby zmiana weszła w życie
 apps/erpnext/erpnext/projects/doctype/project/project.js +47,Expense Claims,Roszczenia wydatków
 DocType: Issue,Support,Wsparcie
-DocType: Authorization Rule,Approving Role,
 ,BOM Search,BOM Szukaj
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +176,Closing (Opening + Totals),Zamknięcie (otwarcie + suma)
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +26,Please specify currency in Company,Proszę określić walutę w Spółce
 DocType: Workstation,Wages per hour,Zarobki na godzinę
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},Saldo Zdjęcie w serii {0} będzie negatywna {1} dla pozycji {2} w hurtowni {3}
 apps/erpnext/erpnext/config/setup.py +83,"Show / Hide features like Serial Nos, POS etc.",
-apps/erpnext/erpnext/controllers/accounts_controller.py +236,Account {0} is invalid. Account Currency must be {1},Konto {0} jest nieprawidłowy. Waluta konto musi być {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +237,Account {0} is invalid. Account Currency must be {1},Konto {0} jest nieprawidłowy. Waluta konto musi być {1}
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +34,UOM Conversion factor is required in row {0},Współczynnik konwersji jednostki miary jest wymagany w rzędzie {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +53,Clearance date cannot be before check date in row {0},
 DocType: Salary Slip,Deduction,Odliczenie
@@ -1739,13 +1677,13 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +82,Item {0} has already been returned,
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** Rok finansowy** reprezentuje rok finansowy. Wszystkie zapisy księgowe oraz inne znaczące transakcje są śledzone przed ** roku podatkowego **.
 DocType: Opportunity,Customer / Lead Address,Adres Klienta / Tropu
+apps/erpnext/erpnext/stock/doctype/item/item.py +112,Warning: Invalid SSL certificate on attachment {0},Ostrzeżenie: Nieprawidłowy certyfikat SSL na przywiązanie {0}
 DocType: Production Order Operation,Actual Operation Time,Rzeczywisty Czas pracy
 DocType: Authorization Rule,Applicable To (User),Stosowne dla (Użytkownik)
 DocType: Purchase Taxes and Charges,Deduct,Odlicz
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +170,Job Description,Opis Pracy
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +170,Job Description,Opis Pracy
 DocType: Purchase Order Item,Qty as per Stock UOM,Ilość wg. Jednostki Miary
 apps/frappe/frappe/model/rename_doc.py +343,Please select a valid csv file with data,Proszę wybrać poprawny plik .csv z danymi
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +92,Coating,Powłoka
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +126,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Znaki specjalne z wyjątkiem ""-"", ""."", ""#"", i ""/"" nie jest dozwolona w serii nazywania"
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Śledź kampanię sprzedażową. Śledź Tropy, Wyceny, Zamówienia Sprzedaży etc. z kampanii by zmierzyć zwrot z inwestycji."
 DocType: Expense Claim,Approver,Osoba zatwierdzająca
@@ -1755,12 +1693,11 @@
 DocType: Supplier Quotation,Manufacturing Manager,Kierownik Produkcji
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},
 apps/erpnext/erpnext/config/stock.py +69,Split Delivery Note into packages.,
-apps/erpnext/erpnext/hooks.py +84,Shipments,Przesyłki
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +29,Dip molding,Odlewnictwo DIP
+apps/erpnext/erpnext/hooks.py +68,Shipments,Przesyłki
 DocType: Purchase Order,To be delivered to customer,Być dostarczone do klienta
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,Czas Zaloguj status musi być złożony.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,Numer seryjny: {0} nie należy do żadnej Warehouse
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +650,Setting Up,Konfigurowanie
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +114,Setting Up,Konfigurowanie
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,Row # ,Wiersz #
 DocType: Purchase Invoice,In Words (Company Currency),
 DocType: Pricing Rule,Supplier,Dostawca
@@ -1768,7 +1705,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +105,Miscellaneous Expenses,Pozostałe drobne wydatki
 DocType: Global Defaults,Default Company,Domyślna Firma
 apps/erpnext/erpnext/controllers/stock_controller.py +166,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,Wydatek albo różnica w koncie jest obowiązkowa dla przedmiotu {0} jako że ma wpływ na końcową wartość zapasów
-apps/erpnext/erpnext/controllers/accounts_controller.py +354,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","Nie można overbill dla pozycji {0} w wierszu {1} więcej niż {2}. Aby umożliwić zawyżonych cen, należy ustawić w Ustawieniach stockowe"
+apps/erpnext/erpnext/controllers/accounts_controller.py +355,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","Nie można overbill dla pozycji {0} w wierszu {1} więcej niż {2}. Aby umożliwić zawyżonych cen, należy ustawić w Ustawieniach stockowe"
 DocType: Employee,Bank Name,Nazwa banku
 apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +27,-Above,-Powyżej
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +135,User {0} is disabled,Użytkownik {0} jest wyłączony
@@ -1781,27 +1718,26 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,{0} is mandatory for Item {1},{0} jest obowiązkowe dla elementu {1}
 DocType: Currency Exchange,From Currency,Od Waluty
 DocType: DocField,Name,Imię
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +211,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Proszę wybrać Przyznana kwota, faktury i faktury Rodzaj numer w conajmniej jednym rzędzie"
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +104,Sales Order required for Item {0},Zlecenie Sprzedaży jest wymagane dla Elementu {0}
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +158,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Proszę wybrać Przyznana kwota, faktury i faktury Rodzaj numer w conajmniej jednym rzędzie"
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +107,Sales Order required for Item {0},Zlecenie Sprzedaży jest wymagane dla Elementu {0}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +43,Amounts not reflected in system,Kwoty nie odzwierciedlone w systemie
 DocType: Purchase Invoice Item,Rate (Company Currency),Stawka (waluta firmy)
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +40,Others,Inni
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +40,Others,Inni
 apps/erpnext/erpnext/templates/includes/product_page.js +80,Cannot find a matching Item. Please select some other value for {0}.,Nie możesz znaleźć pasujący element. Proszę wybrać jakąś inną wartość dla {0}.
 DocType: POS Profile,Taxes and Charges,Podatki i opłaty
 DocType: Item,"A Product or a Service that is bought, sold or kept in stock.","Produkt lub usługa, która jest kupiona, sprzedana lub przechowywana w magazynie."
 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/frappe/frappe/core/doctype/doctype/boilerplate/controller_list.html +31,Completed,Zakończono
 DocType: Web Form,Select DocType,
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +104,Broaching,Przeciągarki
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +12,Banking,Bankowość
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,Bankowość
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +38,Please click on 'Generate Schedule' to get schedule,
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +283,New Cost Center,Nowe Centrum Kosztów
 DocType: Bin,Ordered Quantity,Zamówiona Ilość
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +397,"e.g. ""Build tools for builders""","np. ""Buduj narzędzia dla budowniczych"""
+apps/erpnext/erpnext/public/js/setup_wizard.js +145,"e.g. ""Build tools for builders""","np. ""Buduj narzędzia dla budowniczych"""
 DocType: Quality Inspection,In Process,
 DocType: Authorization Rule,Itemwise Discount,
 DocType: Purchase Order Item,Reference Document Type,Oznaczenie typu dokumentu
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +318,{0} against Sales Order {1},{0} przed Zleceniem Sprzedaży {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +320,{0} against Sales Order {1},{0} przed Zleceniem Sprzedaży {1}
 DocType: Account,Fixed Asset,Trwała własność
 apps/erpnext/erpnext/config/stock.py +283,Serialized Inventory,Inwentaryzacja w odcinkach
 DocType: Activity Type,Default Billing Rate,Domyślnie Cena płatności
@@ -1816,14 +1752,13 @@
 DocType: Purchase Invoice Item,Page Break,Znak końca strony
 DocType: Production Order Operation,Pending,W toku
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,Użytkownicy którzy mogą zatwierdzić wnioski o urlop konkretnych użytkowników
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +33,You cannot change default UOM of Variant. To change default UOM for Variant change default UOM of the Template,Nie można zmienić domyślnej UOM wariantu. Aby zmienić domyślny Jednostka miary dla wariantu zmiany domyślnej UOM szablonu
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +50,Office Equipments,Urządzenie Biura
 DocType: Purchase Invoice Item,Qty,Ilość
 DocType: Fiscal Year,Companies,Firmy
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +24,Electronics,Elektronika
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +24,Electronics,Elektronika
 DocType: Stock Settings,Raise Material Request when stock reaches re-order level,"Wywołaj Prośbę Materiałową, gdy stan osiągnie próg ponowienia zlecenia"
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +18,From Maintenance Schedule,Od Planu Konserwacji
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +56,Full-time,Na cały etet
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +56,Full-time,Na cały etet
 DocType: Purchase Invoice,Contact Details,Szczegóły kontaktu
 DocType: C-Form,Received Date,Data Otrzymania
 DocType: Delivery Note,"If you have created a standard template in Sales Taxes and Charges Template, select one and click on the button below.","Jeśli utworzono standardowy szablon w podatku od sprzedaży i Prowizji szablonu, wybierz jedną i kliknij na przycisk poniżej."
@@ -1835,11 +1770,12 @@
 DocType: Job Applicant,Job Opening,
 DocType: Payment Reconciliation,Payment Reconciliation,Uzgodnienie płatności
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +154,Please select Incharge Person's name,
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +51,Technology,Technologia
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,Technologia
 DocType: Offer Letter,Offer Letter,Oferta List
 apps/erpnext/erpnext/config/manufacturing.py +51,Generate Material Requests (MRP) and Production Orders.,Utwórz Zamówienia Materiałowe (MRP) i Zamówienia Produkcji.
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +68,Total Invoiced Amt,Razem zafakturowane Amt
 DocType: Time Log,To Time,
+DocType: Authorization Rule,Approving Role (above authorized value),Zatwierdzanie rolę (powyżej dopuszczonego wartości)
 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.",
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +102,Credit To account must be a Payable account,Credit To account must be a Payable account
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +233,BOM recursion: {0} cannot be parent or child of {2},
@@ -1852,10 +1788,8 @@
 DocType: Item,Customer Item Codes,Kody Pozycja klienta
 DocType: Opportunity,Lost Reason,
 apps/erpnext/erpnext/config/accounts.py +68,Create Payment Entries against Orders or Invoices.,Utwórz zapisy płatności dla Zamówień lub Faktur.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +141,Welding,Spawanie
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +40,New Stock UOM is required,Wymagana jest nowa jednostka miary stanu
 DocType: Quality Inspection,Sample Size,Wielkość próby
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +443,All items have already been invoiced,Wszystkie pozycje zostały już zafakturowane
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +446,All items have already been invoiced,Wszystkie pozycje zostały już zafakturowane
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +287,Further cost centers can be made under Groups but entries can be made against non-Groups,"Kolejne centra kosztów mogą być wykonane w ramach grup, ale wpisy mogą być wykonane przed spoza grup"
 DocType: Project,External,Zewnętrzny
@@ -1867,8 +1801,7 @@
 DocType: Bin,Actual Quantity,Rzeczywista Ilość
 DocType: Shipping Rule,example: Next Day Shipping,przykład: Wysyłka następnego dnia
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,Numer seryjny: {0} Nie znaleziono
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +563,Your Customers,Twoi Klienci
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +27,Compression molding,Formowanie tłoczne
+apps/erpnext/erpnext/public/js/setup_wizard.js +303,Your Customers,Twoi Klienci
 DocType: Leave Block List Date,Block Date,
 DocType: Sales Order,Not Delivered,Nie dostarczony
 ,Bank Clearance Summary,
@@ -1889,10 +1822,10 @@
 DocType: SMS Log,Sent To,Wysłane Do
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +28,Make Sales Invoice,Nowa faktura sprzedaży
 DocType: Company,For Reference Only.,Wyłącznie w celach informacyjnych.
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +29,Invalid {0}: {1},Nieprawidłowy {0}: {1}
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +49,Invalid {0}: {1},Nieprawidłowy {0}: {1}
 DocType: Sales Invoice Advance,Advance Amount,Kwota Zaliczki
 DocType: Manufacturing Settings,Capacity Planning,Planowanie zdolności
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +49,'From Date' is required,Pole 'Od daty' jest wymagane
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +43,'From Date' is required,Pole 'Od daty' jest wymagane
 DocType: Journal Entry,Reference Number,Numer Odniesienia
 DocType: Employee,Employment Details,Szczegóły zatrudnienia
 DocType: Employee,New Workplace,Nowe Miejsce Pracy
@@ -1907,7 +1840,7 @@
 DocType: Serial No,Delivery Time,Czas dostawy
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,
 DocType: Item,End of Life,Zakończenie okresu eksploatacji
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +41,Travel,Podróż
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +41,Travel,Podróż
 DocType: Leave Block List,Allow Users,
 DocType: Purchase Order,Customer Mobile No,Komórka klienta Nie
 DocType: Sales Invoice,Recurring,Powtarzający się
@@ -1921,7 +1854,7 @@
 DocType: Naming Series,User must always select,Użytkownik musi zawsze zaznaczyć
 DocType: Stock Settings,Allow Negative Stock,Dozwolony ujemny stan
 DocType: Installation Note,Installation Note,
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +541,Add Taxes,Definiowanie podatków
+apps/erpnext/erpnext/public/js/setup_wizard.js +283,Add Taxes,Definiowanie podatków
 ,Financial Analytics,Analityka finansowa
 DocType: Quality Inspection,Verified By,Zweryfikowane przez
 DocType: Address,Subsidiary,
@@ -1931,7 +1864,6 @@
 DocType: System Settings,In Hours,
 DocType: Process Payroll,Create Salary Slip,Utwórz pasek wynagrodzenia
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Expected balance as per bank,Oczekiwane saldo wg banków
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +115,Buffing,Polerowanie
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Source of Funds (Liabilities),Pasywa
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +347,Quantity in row {0} ({1}) must be same as manufactured quantity {2},Ilość w rzędzie  {0} ({1}) musi być taka sama jak wyprodukowana ilość {2}
 DocType: Appraisal,Employee,Pracownik
@@ -1948,11 +1880,11 @@
 DocType: Rename Tool,File to Rename,Plik to zmiany nazwy
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +176,Purchse Order number required for Item {0},
 apps/erpnext/erpnext/public/js/controllers/transaction.js +136,Show Payments,Pokaż Płatności
-apps/erpnext/erpnext/controllers/buying_controller.py +245,Specified BOM {0} does not exist for Item {1},Określone BOM {0} nie istnieje dla pozycji {1}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +202,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Plan Konserwacji {0} musi być anulowany przed usunięciem tego zamówienia
+apps/erpnext/erpnext/controllers/buying_controller.py +236,Specified BOM {0} does not exist for Item {1},Określone BOM {0} nie istnieje dla pozycji {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Plan Konserwacji {0} musi być anulowany przed usunięciem tego zamówienia
 apps/frappe/frappe/desk/page/backups/backups.html +13,Size,Rozmiar
 DocType: Notification Control,Expense Claim Approved,Zwrot Kosztów zatwierdzony
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +113,Pharmaceutical,Farmaceutyczny
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Pharmaceutical,Farmaceutyczny
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,Koszt zakupionych towarów
 DocType: Selling Settings,Sales Order Required,
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +30,Create Customer,Utwórz klienta
@@ -1962,7 +1894,6 @@
 DocType: Quality Inspection Reading,Reading 9,Odczyt 9
 DocType: Supplier,Is Frozen,Jest Zamrożony
 DocType: Buying Settings,Buying Settings,Ustawienia Kupna
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +122,Mass finishing,Msza wykończenie
 DocType: Stock Entry Detail,BOM No. for a Finished Good Item,
 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),
@@ -1970,7 +1901,7 @@
 DocType: Payment Tool,Payment Account,Konto Płatność
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +713,Please specify Company to proceed,Sprecyzuj firmę aby przejść dalej
 apps/frappe/frappe/public/js/frappe/model/indicator.js +30,Draft,Wersja robocza
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +46,Compensatory Off,
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Compensatory Off,
 DocType: Quality Inspection Reading,Accepted,Przyjęte
 DocType: User,Female,Kobieta
 DocType: Journal Entry Account,Debit in Account Currency,Polecenie zapłaty w walucie rachunku
@@ -1982,7 +1913,7 @@
 DocType: Shipping Rule,Shipping Rule Label,
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +209,Raw Materials cannot be blank.,Surowce nie może być puste.
 DocType: Newsletter,Test,
-apps/erpnext/erpnext/stock/doctype/item/item.py +364,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +368,"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'","Jak są istniejące transakcji giełdowych dla tej pozycji, \ nie można zmienić wartości &quot;Czy numer seryjny&quot;, &quot;Czy Batch Nie &#39;,&#39; Czy Pozycja Zdjęcie&quot; i &quot;Metoda wyceny&quot;"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +448,Quick Journal Entry,Szybkie Księgowanie
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +92,You can not change rate if BOM mentioned agianst any item,
@@ -1993,13 +1924,14 @@
 apps/erpnext/erpnext/config/stock.py +18,Requests for items.,Zamówienia produktów.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,
 DocType: Purchase Invoice,Terms and Conditions1,
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +18,Complete Setup,Pełna konfiguracja
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard_page.html +18,Complete Setup,Pełna konfiguracja
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","Zapisywanie kont zostało zamrożone do tej daty, nikt  nie może tworzyć / modyfikować zapisów poza uprawnionymi użytkownikami wymienionymi poniżej."
 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,Status projektu
 DocType: UOM,Check this to disallow fractions. (for Nos),Zaznacz to by zakazać ułamków (dla liczby jednostek)
 apps/erpnext/erpnext/config/crm.py +96,Newsletter Mailing List,Biuletyn Mailing List
 DocType: Delivery Note,Transporter Name,Nazwa przewoźnika
+DocType: Authorization Rule,Authorized Value,Autoryzowany Wartość
 DocType: Contact,Enter department to which this Contact belongs,"Wpisz dział, to którego należy ten kontakt"
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Absent,Razem Nieobecny
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +746,Item or Warehouse for row {0} does not match Material Request,
@@ -2024,16 +1956,15 @@
 DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),Stawki podstawowej (zgodnie Stock UOM)
 DocType: SMS Log,No of Requested SMS,Numer wymaganego SMS
 DocType: Campaign,Campaign-.####,Kampania-.####
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +55,Piercing,Piercing
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,Następne kroki
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +117,Contract End Date must be greater than Date of Joining,Końcowa data kontraktu musi być większa od Daty Członkowstwa
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,"Dystrybutor strona trzecia / handlowiec / prowizji agenta / partner / sprzedawcę, który sprzedaje produkty firm z tytułu prowizji."
 DocType: Customer Group,Has Child Node,
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{0} against Purchase Order {1},{0} przed Zamówieniem Zakupu  {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +332,{0} against Purchase Order {1},{0} przed Zamówieniem Zakupu  {1}
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","Wpisz parametry statycznego URL tutaj (np. nadawca=ERPNext, nazwa użytkownika=ERPNext, hasło=1234 itd.)"
 apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,{0} {1} nie w każdym aktywnym roku podatkowego. Aby uzyskać więcej informacji sprawdź {2}.
-apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,
+apps/erpnext/erpnext/setup/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +37,Ageing Range 1,Starzenie Zakres 1
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +110,Photochemical machining,Obróbka fotochemiczna
 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.
 
 #### Note
@@ -2079,7 +2010,7 @@
 DocType: Purchase Receipt Item,Recd Quantity,Zapisana Ilość
 DocType: Email Account,Email Ids,E-mail identyfikatory
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},Nie można wyprodukować więcej przedmiotów {0} niż wartość {1} na Zamówieniu
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +471,Stock Entry {0} is not submitted,Zdjęcie Wejście {0} nie jest składany
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +473,Stock Entry {0} is not submitted,Zdjęcie Wejście {0} nie jest składany
 DocType: Payment Reconciliation,Bank / Cash Account,Konto Bank / Gotówka
 DocType: Tax Rule,Billing City,Rozliczenia Miasto
 DocType: Global Defaults,Hide Currency Symbol,Ukryj symbol walutowy
@@ -2095,7 +2026,7 @@
 DocType: Purchase Invoice,Currency and Price List,Waluta i cennik
 DocType: Opportunity,Customer / Lead Name,Nazwa Klienta / Tropu
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +63,Clearance Date not mentioned,
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +71,Production,Produkcja
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Production,Produkcja
 DocType: Item,Allow Production Order,
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +60,Row {0}:Start Date must be before End Date,
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Razem (szt)
@@ -2108,7 +2039,7 @@
 apps/erpnext/erpnext/utilities/doctype/address/address.py +113,My Addresses,Moje adresy
 DocType: Stock Ledger Entry,Outgoing Rate,Wychodzące Cena
 apps/erpnext/erpnext/config/hr.py +100,Organization branch master.,
-apps/erpnext/erpnext/controllers/accounts_controller.py +237, or ,lub
+apps/erpnext/erpnext/controllers/accounts_controller.py +238, or ,lub
 DocType: Sales Order,Billing Status,Status Faktury
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Utility Expenses,Wydatki na usługi komunalne
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,90-Above,90-Ponad
@@ -2135,6 +2066,7 @@
 DocType: Stock Entry Detail,Serial No / Batch,
 DocType: Product Bundle,Parent Item,Element nadrzędny
 DocType: Account,Account Type,Typ konta
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +113,Leave Type {0} cannot be carry-forwarded,Zostaw typu {0} nie może być przenoszenie przekazywane
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +213,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',"Plan Konserwacji nie jest generowany dla wszystkich przedmiotów. Proszę naciśnij ""generuj plan"""
 ,To Produce,
 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","Do rzędu {0} w {1}. Aby dołączyć {2} w cenę towaru, wiersze {3} musi być włączone"
@@ -2142,10 +2074,7 @@
 DocType: Bin,Reserved Quantity,Zarezerwowana ilość
 DocType: Landed Cost Voucher,Purchase Receipt Items,Przedmioty Potwierdzenia Zakupu
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,Dostosowywanie formularzy
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +62,Cutting,Cięcie
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +69,Flattening,Spłaszczenie
 DocType: Account,Income Account,Konto przychodów
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +22,Molding,Odlewanie
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +632,Delivery,Dostarczanie
 DocType: Stock Reconciliation Item,Current Qty,Obecna ilość
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",
@@ -2155,21 +2084,20 @@
 apps/frappe/frappe/desk/moduleview.py +61,Documents,Dokumenty
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +17,Ref,Ref
 DocType: Cost Center,Cost Center,Centrum kosztów
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.js +48,Voucher #,Bon #
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +36,Voucher #,Bon #
 DocType: Notification Control,Purchase Order Message,"Wiadomość Zamówienia Kupna
 "
 DocType: Tax Rule,Shipping Country,Wysyłka Kraj
 DocType: Upload Attendance,Upload HTML,Wyślij HTML
-apps/erpnext/erpnext/controllers/accounts_controller.py +391,"Total advance ({0}) against Order {1} cannot be greater \
+apps/erpnext/erpnext/controllers/accounts_controller.py +392,"Total advance ({0}) against Order {1} cannot be greater \
 				than the Grand Total ({2})","Suma zaliczki ({0}) przeciwko Zakonu {1} nie może być większa niż Wielkie \
  Razem ({2})"
 DocType: Employee,Relieving Date,Data zwolnienia
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +12,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.","Wycena Zasada jest nadpisanie cennik / określenie procentowego rabatu, w oparciu o pewne kryteria."
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,Magazyn może być tylko zmieniony poprzez Wpis Asortymentu / Notę Dostawy / Potwierdzenie zakupu
 DocType: Employee Education,Class / Percentage,
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +92,Head of Marketing and Sales,
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +31,Income Tax,Podatek dochodowy
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +157,Laser engineered net shaping,Laser zaprojektowany na kształtowanie siatki
+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,Podatek dochodowy
 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.","Jeśli wybrana reguła Wycena jest dla 'Cena' spowoduje zastąpienie cennik. Zasada jest cena Wycena ostateczna cena, więc dalsze zniżki powinny być stosowane. W związku z tym, w transakcjach takich jak zlecenia sprzedaży, zamówienia itp, będzie pobrana w polu ""stopa"", a nie polu ""Cennik stopa""."
 apps/erpnext/erpnext/config/selling.py +163,Track Leads by Industry Type.,
 DocType: Item Supplier,Item Supplier,Dostawca
@@ -2192,31 +2120,28 @@
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Rzeczywista Ilość Po Transakcji
 ,Pending SO Items For Purchase Request,Oczekiwane elementy Zamówień Sprzedaży na Prośbę Zakupu
 DocType: Supplier,Billing Currency,Waluta Rozliczenia
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +148,Extra Large,Bardzo Duży
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,Extra Large,Bardzo Duży
 ,Profit and Loss Statement,Rachunek zysków i strat
 DocType: Bank Reconciliation Detail,Cheque Number,Numer czeku
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +43,Pressing,Naciśnięcie
 DocType: Payment Tool Detail,Payment Tool Detail,Szczegóły Narzędzia Płatności
 ,Sales Browser,
 DocType: Journal Entry,Total Credit,
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +474,Warning: Another {0} # {1} exists against stock entry {2},Ostrzeżenie: Inny {0} # {1} istnieje we wpisie asortymentu {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +459,Local,Lokalne
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +476,Warning: Another {0} # {1} exists against stock entry {2},Ostrzeżenie: Inny {0} # {1} istnieje we wpisie asortymentu {2}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +397,Local,Lokalne
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),Inwestycje finansowe i udzielone pożyczki (aktywa)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,Dłużnicy
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +147,Large,Duży
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +23,No employee found!,Nie znaleziono pracowników!
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Large,Duży
 DocType: C-Form Invoice Detail,Territory,Terytorium
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,
 DocType: Purchase Order,Customer Address Display,Adres klienta Wyświetlacz
 DocType: Stock Settings,Default Valuation Method,Domyślna metoda wyceny
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +127,Polishing,Polerowanie
 DocType: Production Order Operation,Planned Start Time,Planowany czas rozpoczęcia
 apps/erpnext/erpnext/config/accounts.py +63,Close Balance Sheet and book Profit or Loss.,Sporządzenie Bilansu oraz Rachunku zysków i strat.
-apps/erpnext/erpnext/stock/doctype/item/item.py +661,"Default Unit of Measure for Item {0} cannot be changed directly because \
+apps/erpnext/erpnext/stock/doctype/item/item.py +665,"Default Unit of Measure for Item {0} cannot be changed directly because \
 			you have already made some transaction(s) with another UOM. To change default UOM, \
 			use 'UOM Replace Utility' tool under Stock module.","Domyślnie Jednostka miary dla pozycji {0} nie może być zmieniony bezpośrednio, ponieważ \ masz już jakąś transakcję (y) z innym UOM. Aby zmienić domyślny UOM, \ stosowanie &quot;Jednostka miary&quot; Utility wymienić narzędzie pod modułem Seryjna."
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,Określ Kursy walut konwersji jednej waluty w drugą
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +146,Quotation {0} is cancelled,Wycena {0} jest anulowana
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +141,Quotation {0} is cancelled,Wycena {0} jest anulowana
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,Łączna kwota
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} was on leave on {1}. Cannot mark attendance.,Pracownik {0} był na zwolnieniu {1}. Nie można zaznaczyć obecności.
 DocType: Sales Partner,Targets,Cele
@@ -2227,7 +2152,6 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +158,Please create Customer from Lead {0},
 DocType: Price List,Applicable for Countries,Zastosowanie dla krajów
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Computers,Komputery
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +112,Electro-chemical grinding,Szlif elektrochemikaliów
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +14,This is a root customer group and cannot be edited.,
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +39,Please setup your chart of accounts before you start Accounting Entries,Należy ustalić własny Plan Kont zanim rozpocznie się księgowanie
 DocType: Purchase Invoice,Ignore Pricing Rule,Ignoruj Reguły ​​Cen
@@ -2285,7 +2209,6 @@
 DocType: Maintenance Visit,Purposes,Cele
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +103,Atleast one item should be entered with negative quantity in return document,Conajmniej jedna pozycja powinna być wpisana w ilości negatywnej w dokumencie powrotnej
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +67,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","Operacja {0} dłużej niż wszelkie dostępne w godzinach pracy stacji roboczej {1}, rozbić na kilka operacji operacji"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +134,Electrochemical machining,Obróbka elektrochemiczna
 ,Requested,
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +66,No Remarks,Brak Uwag
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +13,Overdue,Zaległy
@@ -2294,7 +2217,7 @@
 DocType: Monthly Distribution,Distribution Name,Nazwa Dystrybucji
 DocType: Features Setup,Sales and Purchase,
 DocType: Supplier Quotation Item,Material Request No,
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +218,Quality Inspection required for Item {0},Kontrola jakości wymagana dla Przedmiotu {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +221,Quality Inspection required for Item {0},Kontrola jakości wymagana dla Przedmiotu {0}
 DocType: Quotation,Rate at which customer's currency is converted to company's base currency,Stawka przy użyciu której Waluta Klienta jest konwertowana do podstawowej waluty firmy
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +107,{0} has been successfully unsubscribed from this list.,{0} została pomyślnie wypisany z listy.
 DocType: Purchase Invoice Item,Net Rate (Company Currency),Cena netto (Spółka Waluta)
@@ -2312,9 +2235,8 @@
 apps/erpnext/erpnext/accounts/report/financial_statements.py +16,Fiscal Year {0} not found.,Rok podatkowy {0} nie został znaleziony.
 DocType: Bank Reconciliation,Get Relevant Entries,Pobierz odpowiednie pozycje
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +407,Accounting Entry for Stock,Zapis księgowy dla zapasów
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +64,Coining,Coining
 DocType: Sales Invoice,Sales Team1,
-apps/erpnext/erpnext/stock/doctype/item/item.py +412,Item {0} does not exist,
+apps/erpnext/erpnext/stock/doctype/item/item.py +416,Item {0} does not exist,
 DocType: Sales Invoice,Customer Address,Adres klienta
 apps/frappe/frappe/desk/query_report.py +136,Total,
 DocType: Purchase Invoice,Apply Additional Discount On,Zastosuj dodatkowe zniżki na
@@ -2326,14 +2248,13 @@
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),Kwota podatku po uwzględnieniu rabatu (waluta firmy)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +149,Target warehouse is mandatory for row {0},
 DocType: Quality Inspection,Quality Inspection,Kontrola jakości
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +144,Extra Small,Extra Small
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +20,Spray forming,Spray formowania
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Extra Small,Extra Small
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +458,Warning: Material Requested Qty is less than Minimum Order Qty,Ostrzeżenie: Ilość Zapotrzebowanego Materiału jest mniejsza niż minimalna ilość na zamówieniu
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +191,Account {0} is frozen,Konto {0} jest zamrożone
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Osobowość prawna / Filia w oddzielny planu kont należących do Organizacji.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +29,"Food, Beverage & Tobacco","Żywność, Trunki i Tytoń"
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","Żywność, Trunki i Tytoń"
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +20,PL or BS,PL albo BS
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,Can only make payment against unbilled {0},Mogą jedynie wpłaty przed Unbilled {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +531,Can only make payment against unbilled {0},Mogą jedynie wpłaty przed Unbilled {0}
 apps/erpnext/erpnext/controllers/selling_controller.py +122,Commission rate cannot be greater than 100,Wartość prowizji nie może być większa niż 100
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Minimum Inventory Level,Minimalny poziom zapasów
 DocType: Stock Entry,Subcontract,Zlecenie
@@ -2344,19 +2265,18 @@
 DocType: Item,Manufacturer Part Number,Numer katalogowy producenta
 DocType: Production Order Operation,Estimated Time and Cost,Szacowany czas i koszt
 DocType: Bin,Bin,Kosz
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +50,Nosing,Noski
 DocType: SMS Log,No of Sent SMS,Numer wysłanego Sms
 DocType: Account,Company,Firma
 DocType: Account,Expense Account,Konto Wydatków
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +49,Software,Oprogramowanie
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +151,Colour,Kolor
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +49,Software,Oprogramowanie
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Colour,Kolor
 DocType: Maintenance Visit,Scheduled,Zaplanowane
 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","Proszę wybrać produkt, gdzie &quot;Czy Pozycja Zdjęcie&quot; brzmi &quot;Nie&quot; i &quot;Czy Sales Item&quot; brzmi &quot;Tak&quot;, a nie ma innego Bundle wyrobów"
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,Wybierz dystrybucji miesięcznej się nierównomiernie rozprowadzić cele całej miesięcy.
 DocType: Purchase Invoice Item,Valuation Rate,Wskaźnik wyceny
 apps/erpnext/erpnext/stock/get_item_details.py +281,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,Pozycja Wiersz {0}: Zakup Otrzymanie {1} nie istnieje w tabeli powyżej Zakup kwitów ''
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +134,Employee {0} has already applied for {1} between {2} and {3},Pracownik {0} już się ubiegał o {1} między {2} a {3} 
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +145,Employee {0} has already applied for {1} between {2} and {3},Pracownik {0} już się ubiegał o {1} między {2} a {3} 
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Data startu projektu
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +8,Until,Do
 DocType: Rename Tool,Rename Log,Zmień nazwę dziennika
@@ -2366,7 +2286,7 @@
 apps/erpnext/erpnext/controllers/recurring_document.py +162,Please select {0},Proszę wybrać {0}
 DocType: C-Form,C-Form No,
 DocType: BOM,Exploded_items,Exploded_items
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +95,Researcher,
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Researcher,
 apps/frappe/frappe/custom/doctype/customize_form/customize_form.js +88,Update,Aktualizacja
 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 +23,Name or Email is mandatory,Imię lub E-mail jest obowiązkowe
@@ -2375,11 +2295,10 @@
 DocType: Employee,Exit,Wyjście
 apps/erpnext/erpnext/accounts/doctype/account/account.py +134,Root Type is mandatory,
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +295,Serial No {0} created,
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +125,Vibratory finishing,Wykańczanie wibracyjne
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","Dla wygody klientów, te kody mogą być użyte w formacie drukowania jak faktury czy dowody dostawy"
 DocType: Employee,You can enter any date manually,Możesz wprowadzić jakąkolwiek datę ręcznie
 DocType: Sales Invoice,Advertisement,Reklama
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +165,Probationary Period,Okres próbny
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Probationary Period,Okres próbny
 DocType: Customer Group,Only leaf nodes are allowed in transaction,
 DocType: Expense Claim,Expense Approver,Osoba zatwierdzająca wydatki
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,
@@ -2387,19 +2306,16 @@
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +17,To Datetime,Aby DateTime
 DocType: SMS Settings,SMS Gateway URL,
 apps/erpnext/erpnext/config/crm.py +53,Logs for maintaining sms delivery status,Logi do utrzymania sms stan przesyłki
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +137,Grinding,Szlifowanie
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +34,Shrink wrapping,Pakowania w folię termokurczliwą
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +36,Pending Activities,Oczekujące Inne
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,Confirmed,Potwierdzone
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier > Supplier Type,Dostawca> Typ dostawcy
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +127,Please enter relieving date.,
 apps/erpnext/erpnext/controllers/trends.py +137,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/hr/doctype/leave_application/leave_application.py +51,Only Leave Applications with status 'Approved' can be submitted,
 apps/erpnext/erpnext/utilities/doctype/address/address.py +21,Address Title is mandatory.,
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,Wpisz nazwę przeprowadzanej kampanii jeżeli źródło pytania jest kampanią
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +38,Newspaper Publishers,
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +38,Newspaper Publishers,
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,Wybierz rok podatkowy
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +88,Smelting,Wytapianie
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Poziom Uporządkowania
 DocType: Attendance,Attendance Date,
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,
@@ -2414,16 +2330,15 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +414,[Error],[Błąd]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,
 ,Employee Birthday,Data urodzenia pracownika
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +55,Venture Capital,Kapitał wysokiego ryzyka
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,Kapitał wysokiego ryzyka
 DocType: UOM,Must be Whole Number,Musi być liczbą całkowitą
 DocType: Leave Control Panel,New Leaves Allocated (In Days),
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +51,Serial No {0} does not exist,
 DocType: Pricing Rule,Discount Percentage,Procent zniżki
 DocType: Payment Reconciliation Invoice,Invoice Number,Numer faktury
-apps/erpnext/erpnext/hooks.py +70,Orders,Zamówienia
+apps/erpnext/erpnext/hooks.py +54,Orders,Zamówienia
 DocType: Leave Control Panel,Employee Type,Typ pracownika
 DocType: Employee Leave Approver,Leave Approver,Zatwierdzający Urlop
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +70,Swaging,Kucie
 DocType: Manufacturing Settings,Material Transferred for Manufacture,Materiał Przeniesione dla Produkcja
 DocType: Expense Claim,"A user with ""Expense Approver"" role","Użytkownik z ""Koszty zatwierdzająca"" roli"
 ,Issued Items Against Production Order,
@@ -2435,7 +2350,6 @@
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +62,Cost Center with existing transactions can not be converted to group,Centrum Kosztów z istniejącą transakcją nie może być przekształcone w grupę
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Depreciation,Spadek wartości
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Dostawca(y)
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +29,Invalid period,Nieprawidłowy okres
 DocType: Customer,Credit Limit,
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,Wybierz rodzaj transakcji
 DocType: GL Entry,Voucher No,Nr Podstawy księgowania
@@ -2445,9 +2359,9 @@
 DocType: Customer,Address and Contact,Adres i Kontakt
 DocType: Customer,Last Day of the Next Month,Ostatni dzień następnego miesiąca
 DocType: Employee,Feedback,Informacja zwrotna
+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}","Urlopu nie może być przyznane przed {0}, a bilans urlopu zostało już przeniesionych przekazywane w przyszłości rekordu alokacji urlopu {1}"
 apps/erpnext/erpnext/accounts/party.py +284,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Uwaga: Ze względu / Data odniesienia przekracza dozwolony dzień kredytowej klienta przez {0} dni (s)
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +621,Maint. Schedule,Maint. Harmonogram
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +108,Abrasive jet machining,Obróbka strumieniowa ścierne
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +632,Maint. Schedule,Maint. Harmonogram
 DocType: Stock Settings,Freeze Stock Entries,Zamroź Wpisy do Asortymentu
 DocType: Website Settings,Website Settings,Ustawienia strony internetowej
 DocType: Item,Reorder level based on Warehouse,Zmiana kolejności w oparciu o poziom Magazynu
@@ -2464,7 +2378,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +75,Show Stock Entries,Pokaż zapisy stanu
 ,Is Primary Address,Czy Podstawowy Adres
 DocType: Production Order,Work-in-Progress Warehouse,Magazyn z produkcją w toku
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +308,Reference #{0} dated {1},Odnośnik #{0} wpisano z datą {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Reference #{0} dated {1},Odnośnik #{0} wpisano z datą {1}
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +13,Manage Addresses,Zarządzaj adresy
 DocType: Pricing Rule,Item Code,Kod identyfikacyjny
 DocType: Production Planning Tool,Create Production Orders,Utwórz Zamówienie produkcji
@@ -2473,7 +2387,7 @@
 DocType: Lead,Market Segment,
 DocType: Communication,Phone,Telefon
 DocType: Employee Internal Work History,Employee Internal Work History,Historia zatrudnienia pracownika w firmie
-apps/erpnext/erpnext/public/js/account_tree_grid.js +50,Closing (Dr),Zamknięcie (Dr)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +221,Closing (Dr),Zamknięcie (Dr)
 DocType: Contact,Passive,
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,
 apps/erpnext/erpnext/config/selling.py +127,Tax template for selling transactions.,
@@ -2489,8 +2403,8 @@
 ,Billed Amount,Ilość Rozliczenia
 DocType: Bank Reconciliation,Bank Reconciliation,Uzgodnienia z wyciągiem bankowym
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +9,Get Updates,Pobierz aktualizacje
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +129,Material Request {0} is cancelled or stopped,
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +641,Add a few sample records,Dodaj kilka rekordów przykładowe
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +133,Material Request {0} is cancelled or stopped,
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Add a few sample records,Dodaj kilka rekordów przykładowe
 apps/erpnext/erpnext/config/hr.py +210,Leave Management,Zarządzanie urlopami
 DocType: Event,Groups,Grupy
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,Grupuj według konta
@@ -2503,38 +2417,34 @@
 DocType: Features Setup,Sales Extras,
 apps/erpnext/erpnext/accounts/utils.py +344,{0} budget for Account {1} against Cost Center {2} will exceed by {3},{0} Budżet dla konta {1} z MPK {2} będzie przekroczony o {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +236,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Konto różnica musi być kontem typu aktywami / pasywami, ponieważ Zdjęcie Pojednanie jest Wejście otwarcia"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +138,Purchase Order number required for Item {0},Numer Zamówienia Kupna wymagany do {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Order number required for Item {0},Numer Zamówienia Kupna wymagany do {0}
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',Pole 'Od daty' musi następować później niż 'Do daty'
 ,Stock Projected Qty,
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +147,Customer {0} does not belong to project {1},Klient {0} nie należy do projektu {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +150,Customer {0} does not belong to project {1},Klient {0} nie należy do projektu {1}
 DocType: Sales Order,Customer's Purchase Order,Klienta Zamówienia
 DocType: Warranty Claim,From Company,Od Firmy
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,Wartość albo Ilość
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Minute,Minuta
+apps/erpnext/erpnext/public/js/setup_wizard.js +363,Minute,Minuta
 DocType: Purchase Invoice,Purchase Taxes and Charges,Podatki i opłaty kupna
 ,Qty to Receive,Ilość do otrzymania
 DocType: Leave Block List,Leave Block List Allowed,
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +61,Conversion factor cannot be in fractions,Współczynnik konwersji nie może być ułamkiem
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +358,You will use it to Login,Będzie go używać do logowania
+apps/erpnext/erpnext/public/js/setup_wizard.js +108,You will use it to Login,Będzie go używać do logowania
 DocType: Sales Partner,Retailer,
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +99,Credit To account must be a Balance Sheet account,Kredyty na konto musi być kontem Bilans
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,Typy wszystkich dostawców
 apps/erpnext/erpnext/stock/doctype/item/item.py +37,Item Code is mandatory because Item is not automatically numbered,
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +99,Quotation {0} not of type {1},Wycena {0} nie jest typem {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +93,Quotation {0} not of type {1},Wycena {0} nie jest typem {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,Przedmiot Planu Konserwacji
 DocType: Sales Order,%  Delivered,% dostarczono
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,Bank Overdraft Account,Kredyt w rachunku bankowym
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +15,Make Salary Slip,
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +18,Browse BOM,Przeglądaj BOM
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +175,Secured Loans,Pożyczki
-apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +3,Awesome Products,
+apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +3,Awesome Products,
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +189,Opening Balance Equity,Bilans otwarcia Kapitału własnego
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +80,Cannot approve leave as you are not authorized to approve leaves on Block Dates,Nie można potwierdzić zwolnienia bo nie jesteś autoryzowany do zatwierdzania zwolnienia podczas Zablokowanych Dat
 DocType: Appraisal,Appraisal,Ocena
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +13,Lost-foam casting,Pianka do odlewania Lost-
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +47,Drawing,Rysunek
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +22,Date is repeated,Data jest powtórzona
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +148,Leave approver must be one of {0},Zatwierdzający urlop musi być jednym z {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +162,Leave approver must be one of {0},Zatwierdzający urlop musi być jednym z {0}
 DocType: Hub Settings,Seller Email,Sprzedawca email
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Całkowity koszt zakupu (faktura zakupu za pośrednictwem)
 DocType: Workstation Working Hour,Start Time,Czas rozpoczęcia
@@ -2548,7 +2458,7 @@
 DocType: Purchase Invoice Item,Net Amount (Company Currency),Kwota netto (Waluta Spółki)
 DocType: BOM Operation,Hour Rate,Stawka godzinowa
 DocType: Stock Settings,Item Naming By,
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +642,From Quotation,Z Wyceny
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +655,From Quotation,Z Wyceny
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},
 DocType: Production Order,Material Transferred for Manufacturing,Materiał Przeniesiony do Manufacturing
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +29,Account {0} does not exists,Konto {0} nie istnieje
@@ -2562,21 +2472,19 @@
 DocType: Purchase Invoice Item,PR Detail,
 DocType: Sales Order,Fully Billed,Całkowicie Rozliczone
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +20,Cash In Hand,
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +72,Delivery warehouse required for stock item {0},Dostawa wymagane dla magazynu pozycji magazynie {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +119,Delivery warehouse required for stock item {0},Dostawa wymagane dla magazynu pozycji magazynie {0}
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Użytkownicy z tą rolą mogą ustawiać zamrożone konta i tworzyć / modyfikować wpisy księgowe dla zamrożonych kont
 DocType: Serial No,Is Cancelled,
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +281,My Shipments,Moje Przesyłki
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +286,My Shipments,Moje Przesyłki
 DocType: Journal Entry,Bill Date,Data Rachunku
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +43,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","Nawet jeśli istnieje wiele przepisów dotyczących cen o najwyższym priorytecie, a następnie następujące priorytety wewnętrznej są stosowane:"
 DocType: Supplier,Supplier Details,Szczegóły dostawcy
 DocType: Communication,Recipients,Adresaci
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +146,Screwing,Przykręcenie
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +96,Knurling,Radełkowanie
 DocType: Expense Claim,Approval Status,Status Zatwierdzenia
 DocType: Hub Settings,Publish Items to Hub,Publikowanie produkty do Hub
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +44,From value must be less than to value in row {0},"Wartość ""od"" musi być mniejsza niż wartość w rzędzie {0}"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +133,Wire Transfer,Przelew
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +133,Wire Transfer,Przelew
 apps/erpnext/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py +25,Please select Bank Account,Wybierz konto Bankowe
 DocType: Newsletter,Create and Send Newsletters,Utwórz i wyślij biuletyny
 apps/frappe/frappe/public/js/frappe/views/reports/grid_report.js +305,From Date must be before To Date,Data od musi być przed datą do
@@ -2584,14 +2492,14 @@
 DocType: Company,Default Income Account,Domyślne konto przychodów
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,Grupa Klientów / Klient
 DocType: Item Group,Check this if you want to show in website,Zaznacz czy chcesz uwidocznić to na stronie WWW
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +190,Welcome to ERPNext,Zapraszamy do ERPNext
+,Welcome to ERPNext,Zapraszamy do ERPNext
 DocType: Payment Reconciliation Payment,Voucher Detail Number,Numer Szczegółu Bonu
 apps/erpnext/erpnext/config/crm.py +146,Lead to Quotation,Trop do Wyceny
 DocType: Lead,From Customer,Od klienta
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +37,Calls,Połączenia
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Calls,Połączenia
 DocType: Project,Total Costing Amount (via Time Logs),Całkowita ilość Costing (przez Time Logs)
 DocType: Purchase Order Item Supplied,Stock UOM,Jednostka
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Purchase Order {0} is not submitted,Zamówienia Kupna {0} nie zostało wysłane
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +194,Purchase Order {0} is not submitted,Zamówienia Kupna {0} nie zostało wysłane
 ,Projected,Prognozowany
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},
 apps/erpnext/erpnext/controllers/status_updater.py +136,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,
@@ -2599,7 +2507,6 @@
 DocType: Issue,Opening Date,Data Otwarcia
 DocType: Journal Entry,Remark,Uwaga
 DocType: Purchase Receipt Item,Rate and Amount,Stawka i Ilość
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +95,Boring,Nudny
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +667,From Sales Order,Od Zamówienia Sprzedaży
 DocType: Blog Category,Parent Website Route,Nadrzędna Trasa Strony WWW
 DocType: Sales Order,Not Billed,Nie zaksięgowany
@@ -2613,19 +2520,17 @@
 apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount Amount,Wartość zniżki
 DocType: Purchase Invoice,Return Against Purchase Invoice,Powrót Against dowodu zakupu
 DocType: Item,Warranty Period (in days),Okres gwarancji (w dniach)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +550,e.g. VAT,np. VAT
+apps/erpnext/erpnext/public/js/setup_wizard.js +292,e.g. VAT,np. VAT
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,Pozycja 4
 DocType: Journal Entry Account,Journal Entry Account,Konto zapisu
 DocType: Shopping Cart Settings,Quotation Series,Serie Wyeceny
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +52,"An item exists with same name ({0}), please change the item group name or rename the item",Istnieje element  o takiej nazwie. Zmień nazwę Grupy lub tego elementu.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +82,Hot metal gas forming,Gorący gaz formowania metali
 DocType: Sales Order Item,Sales Order Date,Data Zlecenia
 DocType: Sales Invoice Item,Delivered Qty,Dostarczona Liczba jednostek
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +63,Warehouse {0}: Company is mandatory,Magazyn {0}: Firma jest obowiązkowa
 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.","Idź do odpowiedniej grupy (zwykle źródło funduszy> Zobowiązania krótkoterminowe> Podatki i cła i utworzyć nowe konto (klikając na Dodaj Child) typu ""podatek"" i ustal stawkę podatku."
 ,Payment Period Based On Invoice Date,Termin Płatności oparty na dacie faktury
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +50,Missing Currency Exchange Rates for {0},Brakujące Wymiana walut stawki dla {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +135,Laser cutting,Cięcie laserowe
 DocType: Event,Monday,Poniedziałek
 DocType: Journal Entry,Stock Entry,Zapis magazynowy
 DocType: Account,Payable,
@@ -2658,7 +2563,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +111,Date Of Retirement must be greater than Date of Joining,Data przejścia na emeryturę musi być większa niż Data wstąpienia
 DocType: Sales Invoice,Against Income Account,Konto przychodów
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +69,{0}% Delivered,{0}% dostarczono
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +78,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Element {0}: Zamówione szt {1} nie może być mniejsza niż minimalna Ilość zamówień {2} (określonego w pkt).
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Element {0}: Zamówione szt {1} nie może być mniejsza niż minimalna Ilość zamówień {2} (określonego w pkt).
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Miesięczny rozkład procentowy
 DocType: Territory,Territory Targets,
 DocType: Delivery Note,Transporter Info,Informacje dotyczące przewoźnika
@@ -2667,7 +2572,6 @@
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +140,Valuation type charges can not marked as Inclusive,Opłaty typu Wycena nie oznaczone jako Inclusive
 DocType: POS Profile,Update Stock,Zaktualizuj Asortyment
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +128,Superfinishing,Dogładzenie
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM Kursy
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +85,Please pull items from Delivery Note,
@@ -2682,7 +2586,6 @@
 ,Purchase Analytics,Analiza Zakupów
 DocType: Sales Invoice Item,Delivery Note Item,Przedmiot z dowodu dostawy
 DocType: Expense Claim,Task,Zadanie
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +57,Shaving,Golenie
 DocType: Purchase Taxes and Charges,Reference Row #,Rząd Odniesienia #
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},Numer partii jest obowiązkowy dla produktu {0}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js +14,This is a root sales person and cannot be edited.,
@@ -2694,13 +2597,11 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +74,Purpose must be one of {0},Cel musi być jednym z {0}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +108,Fill the form and save it,Wypełnij formularz i zapisz
 DocType: Production Planning Tool,Download a report containing all raw materials with their latest inventory status,Ściągnij raport zawierający surowe dokumenty z najnowszym statusem zapasu
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +94,Facing,Facing
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,Społeczność Forum
 DocType: Leave Application,Leave Balance Before Application,Status Urlopu przed Wnioskiem
 DocType: SMS Center,Send SMS,
 DocType: Company,Default Letter Head,Domyślny nagłówek Listowy
 DocType: Time Log,Billable,Rozliczalny
-DocType: Authorization Rule,This will be used for setting rule in HR module,
 DocType: Account,Rate at which this tax is applied,Stawka przy użyciu której ten podatek jest aplikowany
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reorder Qty,Ilość do ponownego zamówienia
 DocType: Company,Stock Adjustment Account,
@@ -2727,16 +2628,15 @@
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,Przydział Procentowy powinien wynosić 100%
 DocType: Serial No,Out of AMC,
 DocType: Purchase Order Item,Material Request Detail No,
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +97,Hard turning,Trudno zwrotnym
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +33,Make Maintenance Visit,Stwórz Wizytę Konserwacji
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +187,Please contact to the user who have Sales Master Manager {0} role,Proszę się skontaktować z użytkownikiem pełniącym rolę Główny Menadżer Sprzedaży {0}
 DocType: Company,Default Cash Account,Domyślne Konto Gotówkowe
 apps/erpnext/erpnext/config/accounts.py +79,Company (not Customer or Supplier) master.,
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +106,Please enter 'Expected Delivery Date',
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +187,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Dowody Dostawy {0} muszą być anulowane przed anulowanie Zamówienia Sprzedaży
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +100,Please enter 'Expected Delivery Date',
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +182,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Dowody Dostawy {0} muszą być anulowane przed anulowanie Zamówienia Sprzedaży
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +373,Paid amount + Write Off Amount can not be greater than Grand Total,Wartość zapłaty + Wartość odliczenia nie może być większa niż Cała Kwota
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,Note: There is not enough leave balance for Leave Type {0},
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +124,Note: There is not enough leave balance for Leave Type {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.","Uwaga: Jeżeli płatność nie posiada jakiegokolwiek odniesienia, należy ręcznie dokonać wpisu do dziennika."
 DocType: Item,Supplier Items,Dostawca przedmioty
 DocType: Opportunity,Opportunity Type,Typ szansy
@@ -2748,7 +2648,7 @@
 DocType: Hub Settings,Publish Availability,Publikowanie dostępność
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +105,Date of Birth cannot be greater than today.,Data urodzenia nie może być większa niż data dzisiejsza.
 ,Stock Ageing,
-apps/erpnext/erpnext/controllers/accounts_controller.py +200,{0} '{1}' is disabled,{0} '{1}' jest wyłączony
+apps/erpnext/erpnext/controllers/accounts_controller.py +201,{0} '{1}' is disabled,{0} '{1}' jest wyłączony
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Ustaw jako Rozwinąć
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Automatycznie wysyłać e-maile do kontaktów z transakcji Zgłaszanie.
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +232,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
@@ -2757,44 +2657,38 @@
 DocType: Purchase Order,Customer Contact Email,Kontakt z klientem e-mail
 DocType: Event,Sunday,Niedziela
 DocType: Sales Team,Contribution (%),Udział (%)
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +455,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +171,Responsibilities,Obowiązki
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +457,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,Obowiązki
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Template,Szablon
 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/setup/page/setup_wizard/setup_wizard.js +511,Add Users,Dodaj użytkowników
+apps/erpnext/erpnext/public/js/setup_wizard.js +255,Add Users,Dodaj użytkowników
 DocType: Pricing Rule,Item Group,Kategoria
 DocType: Task,Actual Start Date (via Time Logs),Rzeczywista Data Rozpoczęcia (przez Time Logs)
 DocType: Stock Reconciliation Item,Before reconciliation,Przed pojednania
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +12,To {0},Do {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),
-apps/erpnext/erpnext/stock/doctype/item/item.py +340,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,
+apps/erpnext/erpnext/stock/doctype/item/item.py +344,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,
 DocType: Sales Order,Partly Billed,Częściowo Zapłacono
 DocType: Item,Default BOM,Domyślny Wykaz Materiałów
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +79,Decambering,Decambering
 apps/erpnext/erpnext/setup/doctype/company/company.js +22,Please re-type company name to confirm,"Proszę ponownie wpisz nazwę firmy, aby potwierdzić"
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,Razem Najlepszy Amt
 DocType: Time Log Batch,Total Hours,
 DocType: Journal Entry,Printing Settings,Ustawienia drukowania
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +268,Total Debit must be equal to Total Credit. The difference is {0},
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +11,Automotive,
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +37,Item is required,
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +25,Metal injection molding,Wtrysk Metal
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +258,Total Debit must be equal to Total Credit. The difference is {0},
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +684,From Delivery Note,Od Dowodu Dostawy
 DocType: Time Log,From Time,Od czasu
 DocType: Notification Control,Custom Message,Niestandardowa wiadomość
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +33,Investment Banking,
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +261,"Select your Country, Time Zone and Currency","Wybierz swój kraj, strefę czasową i walutę"
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +316,"Select your Country, Time Zone and Currency","Wybierz swój kraj, strefę czasową i walutę"
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +369,Cash or Bank Account is mandatory for making payment entry,Konto Kasa lub Bank jest wymagane dla tworzenia zapisów Płatności
 DocType: Purchase Invoice,Price List Exchange Rate,
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +91,Pickling,Marynowanie
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +18,Sand casting,Odlewy piaskowe
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +117,Electroplating,Galwanotechnika
 DocType: Purchase Invoice Item,Rate,Stawka
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +62,Intern,
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Intern,
 DocType: Newsletter,A Lead with this email id should exist,Sygnał z tym adresem e-mail powinien istnieć
 DocType: Stock Entry,From BOM,Od BOM
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +34,Basic,Podstawowy
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +34,Basic,Podstawowy
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,Transakcji giełdowych przed {0} są zamrożone
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +217,Please click on 'Generate Schedule',"Proszę kliknąć na ""Wygeneruj Plan"""
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +61,To Date should be same as From Date for Half Day leave,
@@ -2802,11 +2696,11 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +96,Reference No is mandatory if you entered Reference Date,Nr Odniesienia jest obowiązkowy jest wprowadzono Datę Odniesienia
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +108,Date of Joining must be greater than Date of Birth,Data Wstąpienie musi być większa niż Data Urodzenia
 DocType: Salary Structure,Salary Structure,
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +242,"Multiple Price Rule exists with same criteria, please resolve \
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +246,"Multiple Price Rule exists with same criteria, please resolve \
 			conflict by assigning priority. Price Rules: {0}","Stwardnienie Cena Zasada istnieje z samych kryteriów, proszę rozwiązać \
  konfliktu przez wyznaczenie priorytet. Cena Zasady: {0}"
 DocType: Account,Bank,Bank
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +9,Airline,Linia lotnicza
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,Linia lotnicza
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +493,Issue Material,Wydanie Materiał
 DocType: Material Request Item,For Warehouse,Dla magazynu
 DocType: Employee,Offer Date,Data oferty
@@ -2816,29 +2710,24 @@
 DocType: Item,Is Fixed Asset Item,Jest stałą pozycją aktywów
 DocType: Stock Entry,Including items for sub assemblies,W tym elementów dla zespołów sub
 DocType: Features Setup,"If you have long print formats, this feature can be used to split the page to be printed on multiple pages with all headers and footers on each page",
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +131,Hobbing,Hobbing
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +98,All Territories,Wszystkie obszary
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +98,All Territories,Wszystkie obszary
 DocType: Purchase Invoice,Items,Produkty
 DocType: Fiscal Year,Year Name,Nazwa roku
 DocType: Process Payroll,Process Payroll,
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +59,There are more holidays than working days this month.,
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +68,There are more holidays than working days this month.,
 DocType: Product Bundle Item,Product Bundle Item,Pakiet produktów Artykuł
 DocType: Sales Partner,Sales Partner Name,
 DocType: Purchase Invoice Item,Image View,
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +113,Finishing & industrial finishing,Wykończenie i wykańczanie przemysłowe
 DocType: Issue,Opening Time,Czas Otwarcia
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,Daty Od i Do są wymagane
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +46,Securities & Commodity Exchanges,
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,
 DocType: Shipping Rule,Calculate Based On,Obliczone na podstawie
 DocType: Delivery Note Item,From Warehouse,Od Warehouse
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +98,Drilling,Wiercenie
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +28,Blow molding,Regranulat
 DocType: Purchase Taxes and Charges,Valuation and Total,Wycena i kwota całkowita
 DocType: Tax Rule,Shipping City,Wysyłka Miasto
 apps/erpnext/erpnext/stock/doctype/item/item.js +43,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,"Pozycja ta jest Wariant {0} (szablonu). Atrybuty zostaną skopiowane z szablonu, chyba że ""Nie Kopiuj"" jest ustawiony"
 DocType: Account,Purchase User,Zakup użytkownika
 DocType: Notification Control,Customize the Notification,Dostosuj powiadomienie
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +87,Hammering,Kucie
 DocType: Web Page,Slideshow,
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +24,Default Address Template cannot be deleted,Szablon domyślny Adresu nie może być usunięty
 DocType: Sales Invoice,Shipping Rule,
@@ -2847,9 +2736,8 @@
 DocType: Workflow State,Search,Szukaj
 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,Pole 'Dni od ostatniego zamówienia' musi być większe bądź równe zero
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +142,Brazing,Lutowanie
 DocType: C-Form,Amended From,
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Raw Material,Surowiec
+apps/erpnext/erpnext/public/js/setup_wizard.js +359,Raw Material,Surowiec
 DocType: Leave Application,Follow via Email,Odpowiedz za pomocą E-maila
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,
 apps/erpnext/erpnext/accounts/doctype/account/account.py +174,Child account exists for this account. You can not delete this account.,To konto zawiera konta podrzędne. Nie można usunąć takiego konta.
@@ -2863,10 +2751,10 @@
 ,Produced,Wyprodukowany
 DocType: Item,Item Code for Suppliers,Rzecz kod dla dostawców
 DocType: Issue,Raised By (Email),Wywołany przez (Email)
-apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +72,General,Ogólne
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +495,Attach Letterhead,
+apps/erpnext/erpnext/setup/setup_wizard/default_website.py +72,General,Ogólne
+apps/erpnext/erpnext/public/js/setup_wizard.js +241,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/setup/page/setup_wizard/setup_wizard.js +542,"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.","Lista głowy podatkowe (np podatku VAT, ceł itp powinny mieć unikatowe nazwy) i ich standardowe stawki. Spowoduje to utworzenie standardowego szablonu, który można edytować i dodać później."
+apps/erpnext/erpnext/public/js/setup_wizard.js +284,"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.","Lista głowy podatkowe (np podatku VAT, ceł itp powinny mieć unikatowe nazwy) i ich standardowe stawki. Spowoduje to utworzenie standardowego szablonu, który można edytować i dodać później."
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial Nos Required for Serialized Item {0},
 DocType: Journal Entry,Bank Entry,Wpis Banku
 DocType: Authorization Rule,Applicable To (Designation),Stosowne dla (Nominacja)
@@ -2875,33 +2763,32 @@
 apps/erpnext/erpnext/config/accounts.py +143,Enable / disable currencies.,Włącz/wyłącz waluty.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Postal Expenses,Wydatki pocztowe
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Razem (Amt)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +26,Entertainment & Leisure,Rozrywka i relaks
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,Rozrywka i relaks
 DocType: Purchase Order,The date on which recurring order will be stop,Data powracającym zamówienie zostanie zatrzymać
 DocType: Quality Inspection,Item Serial No,Nr seryjny
 apps/erpnext/erpnext/controllers/status_updater.py +142,{0} must be reduced by {1} or you should increase overflow tolerance,{0} musi być zmniejszona o {1} lub należy zwiększyć tolerancję nadmiaru
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Present,Razem Present
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Hour,Godzina
+apps/erpnext/erpnext/public/js/setup_wizard.js +363,Hour,Godzina
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +138,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation","Odcinkach Element {0} nie może być aktualizowana \
  Zdjęcie Pojednania za pomocą"
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +488,Transfer Material to Supplier,Przenieść materiał do dostawcy
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +513,Transfer Material to Supplier,Przenieść materiał do dostawcy
 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,Typ Tropu
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +82,Create Quotation,Utwórz ofertę
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +306,All these items have already been invoiced,Na wszystkie te przedmioty już została wystawiona faktura
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,You are not authorized to approve leaves on Block Dates,Nie masz uprawnień do zatwierdzania liście na bloku Daty
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +311,All these items have already been invoiced,Na wszystkie te przedmioty już została wystawiona faktura
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},Może być zatwierdzone przez {0}
 DocType: Shipping Rule,Shipping Rule Conditions,
 DocType: BOM Replace Tool,The new BOM after replacement,
 DocType: Features Setup,Point of Sale,Punkt Sprzedaży (POS)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +83,Curling,Curling
 DocType: Account,Tax,Podatek
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +28,Row {0}: {1} is not a valid {2},Wiersz {0}: {1} nie jest ważne {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +89,Refining,Doskonalenie
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +37,Row {0}: {1} is not a valid {2},Wiersz {0}: {1} nie jest ważne {2}
 DocType: Production Planning Tool,Production Planning Tool,Narzędzie do planowania produkcji
 DocType: Quality Inspection,Report Date,Data raportu
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +130,Routing,Routing
 DocType: C-Form,Invoices,Faktury
 DocType: Job Opening,Job Title,Tytuł Pracy
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +54,{0} already allocated for Employee {1} for period {2} - {3},{0} już przydzielone Pracodawcy dla {1} {2} okresu - {3}
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +80,{0} Recipients,{0} - Odbiorcy
 DocType: Features Setup,Item Groups in Details,
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +335,Quantity to Manufacture must be greater than 0.,Ilość do produkcji musi być większy niż 0 ° C.
@@ -2919,14 +2806,13 @@
 DocType: DocType,Setup,Ustawienia
 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,Podsumowanie dla tego miesiąca i działań toczących
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +39,Cold rolling,Walcowanie na zimno
 DocType: Customer Group,Customer Group Name,Nazwa Grupy Klientów
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +408,Please remove this Invoice {0} from C-Form {1},Proszę usunąć tę fakturę {0} z C-Form {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +410,Please remove this Invoice {0} from C-Form {1},Proszę usunąć tę fakturę {0} z C-Form {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,Rodzaj dowodu
 DocType: Item,Attributes,Atrybuty
 DocType: Packing Slip,Get Items,Pobierz produkty
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +186,Please enter Write Off Account,Proszę zdefiniować konto odpisów (strat)
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +187,Please enter Write Off Account,Proszę zdefiniować konto odpisów (strat)
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +71,Last Order Date,Data Ostatniego Zamówienia
 DocType: DocField,Image,Obrazek
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +179,Make Excise Invoice,
@@ -2936,7 +2822,7 @@
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +146,Operation ID not set,ID operacji nie zostało ustawione
 DocType: Production Order,Planned Start Date,Planowana data rozpoczęcia
 DocType: Serial No,Creation Document Type,
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +620,Maint. Visit,Maint. Odwiedzić
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +631,Maint. Visit,Maint. Odwiedzić
 DocType: Leave Type,Is Encash,
 DocType: Purchase Invoice,Mobile No,Nr tel. Komórkowego
 DocType: Payment Tool,Make Journal Entry,Dodać Journal Entry
@@ -2944,35 +2830,31 @@
 apps/erpnext/erpnext/controllers/trends.py +257,Project-wise data is not available for Quotation,
 DocType: Project,Expected End Date,Spodziewana data końcowa
 DocType: Appraisal Template,Appraisal Template Title,Tytuł szablonu oceny
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +440,Commercial,Komercyjny
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +378,Commercial,Komercyjny
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +23,Parent Item {0} must not be a Stock Item,Dominująca pozycja {0} nie może być pozycja Zdjęcie
 DocType: Cost Center,Distribution Id,ID Dystrybucji
-apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +14,Awesome Services,
+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.,Wszystkie produkty i usługi.
 DocType: Purchase Invoice,Supplier Address,Adres dostawcy
 DocType: Contact Us Settings,Address Line 2,Adres Linia 2
 DocType: ToDo,Reference,Odnośnik (np. identyfikator przelewu bankowego)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +59,Perforating,Perforowanie
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,
 apps/erpnext/erpnext/config/accounts.py +128,Rules to calculate shipping amount for a sale,Zasady obliczeń kwot przesyłki przy sprzedaży
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +29,Series is mandatory,
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +28,Financial Services,Usługi finansowe
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,Usługi finansowe
 apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3},Wartość atrybutu {0} musi mieścić się w zakresie {1} do {2} w przyrostach {3}
 DocType: Tax Rule,Sales,Sprzedaż
 DocType: Stock Entry Detail,Basic Amount,Kwota podstawowa
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +173,Warehouse required for stock Item {0},Magazyn wymagany dla przedmiotu {0}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +178,Warehouse required for stock Item {0},Magazyn wymagany dla przedmiotu {0}
 DocType: Leave Allocation,Unused leaves,Niewykorzystane urlopy
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,Kr
 DocType: Customer,Default Receivable Accounts,Domyślne konta należności
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +102,Sawing,Piłowanie
 DocType: Tax Rule,Billing State,Stan Billing
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +32,Laminating,Laminowanie
 DocType: Item Reorder,Transfer,
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +549,Fetch exploded BOM (including sub-assemblies),
 DocType: Authorization Rule,Applicable To (Employee),Stosowne dla (Pracownik)
 apps/erpnext/erpnext/controllers/accounts_controller.py +101,Due Date is mandatory,Due Date jest obowiązkowe
 apps/erpnext/erpnext/controllers/item_variant.py +51,Increment for Attribute {0} cannot be 0,Przyrost dla atrybutu {0} nie może być 0
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +143,Sintering,Spiekania
 DocType: Journal Entry,Pay To / Recd From,
 DocType: Naming Series,Setup Series,
 DocType: Supplier,Contact HTML,HTML kontaktu
@@ -2985,7 +2867,6 @@
 DocType: Attendance,Absent,Nieobecny
 DocType: Product Bundle,Product Bundle,Pakiet produktów
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +180,Row {0}: Invalid reference {1},Wiersz {0}: Nieprawidłowy odniesienia {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +165,Crushing,Miażdżący
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Szablon Podatków i Opłat kupna
 DocType: Upload Attendance,Download Template,Ściągnij Szablon
 DocType: GL Entry,Remarks,Uwagi
@@ -2993,14 +2874,12 @@
 DocType: Journal Entry,Write Off Based On,Odpis bazowano na
 DocType: Features Setup,POS View,
 apps/erpnext/erpnext/config/stock.py +38,Installation record for a Serial No.,
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +9,Continuous casting,Odlewanie ciągłe
 apps/erpnext/erpnext/public/js/queries.js +39,Please specify a,Sprecyzuj 
 DocType: Offer Letter,Awaiting Response,Oczekuje na Odpowiedź
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +53,Above,Powyżej
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +80,Cold sizing,Zimna rozmiaru
 DocType: Salary Slip,Earning & Deduction,Dochód i Odliczenie
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +76,Account {0} cannot be a Group,Konto {0} nie może być Grupą (kontem dzielonym)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +259,Region,Region
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +314,Region,Region
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +213,Optional. This setting will be used to filter in various transactions.,Opcjonalne. Te Ustawienie będzie użyte w filtrze dla różnych transacji.
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +104,Negative Valuation Rate is not allowed,
 DocType: Holiday List,Weekly Off,
@@ -3018,7 +2897,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,Account {0} is inactive,Konto {0} jest nieaktywne
 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,
-apps/erpnext/erpnext/controllers/buying_controller.py +131,Please enter 'Is Subcontracted' as Yes or No,
+apps/erpnext/erpnext/controllers/buying_controller.py +122,Please enter 'Is Subcontracted' as Yes or No,
 DocType: Sales Team,Contact No.,Numer Kontaktu
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,'Profit and Loss' type account {0} not allowed in Opening Entry,Konto typu 'Zyski i Straty' ({0}) nie może być wpisem otwierającym rok
 DocType: Workflow State,Time,
@@ -3027,14 +2906,13 @@
 DocType: Authorization Rule,Authorization Rule,
 DocType: Sales Invoice,Terms and Conditions Details,Szczegóły regulaminu
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,Podatki od sprzedaży i opłaty Szablon
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +10,Apparel & Accessories,
+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,Numer zlecenia
 DocType: Item Group,HTML / Banner that will show on the top of product list.,
 DocType: Shipping Rule,Specify conditions to calculate shipping amount,Określ warunki do obliczenia kwoty wysyłki
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +121,Add Child,
 DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,Rola dozwolone ustawić zamrożonych kont i Edytuj Mrożone wpisy
 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/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +47,Conversion Factor is required,Współczynnik konwersji jest wymagany
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +37,Serial #,Serial #
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +87,Commission on Sales,Prowizja od sprzedaży
 DocType: Offer Letter Term,Value / Description,Wartość / Opis
@@ -3042,10 +2920,8 @@
 ,Customers Not Buying Since Long Time,Klient nie kupuje od dłuższego czasu
 DocType: Production Order,Expected Delivery Date,Spodziewana data odbioru przesyłki
 apps/erpnext/erpnext/accounts/general_ledger.py +121,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Debetowe i kredytowe nie równe dla {0} # {1}. Różnica jest {2}.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +48,Bulging,Wypukły
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +11,Evaporative-pattern casting,Wzór odlewania parowanie-
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Entertainment Expenses,Wydatki na reprezentację
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +195,Sales Invoice {0} must be cancelled before cancelling this Sales Order,Faktura Sprzedaży {0} powinna być anulowana przed anulowaniem samego Zlecenia Sprzedaży
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +190,Sales Invoice {0} must be cancelled before cancelling this Sales Order,Faktura Sprzedaży {0} powinna być anulowana przed anulowaniem samego Zlecenia Sprzedaży
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +61,Age,Wiek
 DocType: Time Log,Billing Amount,Kwota Rozliczenia
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +84,Invalid quantity specified for item {0}. Quantity should be greater than 0.,
@@ -3064,26 +2940,24 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,Nowy Przychody klienta
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Travel Expenses,Wydatki na podróże
 DocType: Maintenance Visit,Breakdown,
-apps/erpnext/erpnext/controllers/accounts_controller.py +241,Account: {0} with currency: {1} can not be selected,Konto: {0} z waluty: nie można wybrać {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +242,Account: {0} with currency: {1} can not be selected,Konto: {0} z waluty: nie można wybrać {1}
 DocType: Bank Reconciliation Detail,Cheque Date,Data czeku
 apps/erpnext/erpnext/accounts/doctype/account/account.py +47,Account {0}: Parent account {1} does not belong to company: {2},Konto {0}: Konto nadrzędne {1} nie należy do firmy: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted all transactions related to this company!,Pomyślnie usunięte wszystkie transakcje związane z tą firmą!
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,W sprawie daty
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +111,Honing,Gładzenia
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +58,Probation,
-apps/erpnext/erpnext/stock/doctype/item/item.py +264,Default Warehouse is mandatory for stock Item.,Domyślny magazyn jest obowiązkowy dla przedmiotu z asortymentu.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Probation,
+apps/erpnext/erpnext/stock/doctype/item/item.py +268,Default Warehouse is mandatory for stock Item.,Domyślny magazyn jest obowiązkowy dla przedmiotu z asortymentu.
 DocType: Feed,Full Name,Imię i nazwisko
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +148,Clinching,Zaciskanie
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +191,Payment of salary for the month {0} and year {1},Płatność pensji za miesiąć {0} i rok {1} 
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +173,Payment of salary for the month {0} and year {1},Płatność pensji za miesiąć {0} i rok {1} 
 DocType: Stock Settings,Auto insert Price List rate if missing,"Cennik stopy wkładka auto, jeśli brakuje"
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,Kwota całkowita Płatny
 ,Transferred Qty,
 apps/erpnext/erpnext/config/learn.py +11,Navigating,Nawigacja
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +137,Planning,Planowanie
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +137,Planning,Planowanie
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +9,Make Time Log Batch,Dodać Czas Zaloguj Batch
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Issued,Wydany
 DocType: Project,Total Billing Amount (via Time Logs),Łączna kwota płatności (przez Time Logs)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +629,We sell this Item,Sprzedajemy ten przedmiot
+apps/erpnext/erpnext/public/js/setup_wizard.js +365,We sell this Item,Sprzedajemy ten przedmiot
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +65,Supplier Id,ID Dostawcy
 DocType: Journal Entry,Cash Entry,Wpis gotówkowy
 DocType: Sales Partner,Contact Desc,Opis kontaktu
@@ -3092,18 +2966,16 @@
 DocType: Brand,Item Manager,Pozycja menedżera
 DocType: Cost Center,Add rows to set annual budgets on Accounts.,
 DocType: Buying Settings,Default Supplier Type,Domyślny Typ Dostawcy
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +160,Quarrying,Wydobywanie
 DocType: Production Order,Total Operating Cost,Całkowity koszt operacyjny
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +160,Note: Item {0} entered multiple times,Uwaga: Element {0} wpisano kilka razy
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +163,Note: Item {0} entered multiple times,Uwaga: Element {0} wpisano kilka razy
 apps/erpnext/erpnext/config/crm.py +27,All Contacts.,Wszystkie kontakty.
 DocType: Newsletter,Test Email Id,
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +394,Company Abbreviation,Nazwa skrótowa firmy
+apps/erpnext/erpnext/public/js/setup_wizard.js +142,Company Abbreviation,Nazwa skrótowa firmy
 DocType: Features Setup,If you follow Quality Inspection. Enables Item QA Required and QA No in Purchase Receipt,
 DocType: GL Entry,Party Type,Typ Grupy
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +68,Raw material cannot be same as main Item,Surowiec nie może być taki sam jak główny Przedmiot
 DocType: Item Attribute Value,Abbreviation,Skrót
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +30,Rotational molding,Formowanie rotacyjne
 apps/erpnext/erpnext/config/hr.py +115,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,Ustaw Reguła podatkowa do koszyka
@@ -3117,15 +2989,15 @@
 apps/erpnext/erpnext/config/selling.py +18,Quotes to Leads or Customers.,Wycena dla Tropów albo Klientów
 DocType: Stock Settings,Role Allowed to edit frozen stock,
 ,Territory Target Variance Item Group-Wise,
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +101,All Customer Groups,Wszystkie grupy klientów
-apps/erpnext/erpnext/controllers/accounts_controller.py +474,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,"{0} jest obowiązkowe. Możliwe, że rekord Wymiana walut nie jest utworzony dla {1} do {2}."
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +101,All Customer Groups,Wszystkie grupy klientów
+apps/erpnext/erpnext/controllers/accounts_controller.py +475,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,"{0} jest obowiązkowe. Możliwe, że rekord Wymiana walut nie jest utworzony dla {1} do {2}."
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +37,Tax Template is mandatory.,Szablon podatkowa jest obowiązkowe.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +41,Account {0}: Parent account {1} does not exist,Konto {0}: Konto nadrzędne {1} nie istnieje
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Wartość w cenniku (waluta firmy)
 DocType: Account,Temporary,Tymczasowy
 DocType: Address,Preferred Billing Address,
 DocType: Monthly Distribution Percentage,Percentage Allocation,Przydział Procentowy
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +86,Secretary,
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Secretary,
 DocType: Serial No,Distinct unit of an Item,Odrębna jednostka przedmiotu
 DocType: Pricing Rule,Buying,Zakupy
 DocType: HR Settings,Employee Records to be created by,Rekordy pracownika do utworzenia przez
@@ -3138,9 +3010,8 @@
 ,Item-wise Price List Rate,
 DocType: Purchase Order Item,Supplier Quotation,
 DocType: Quotation,In Words will be visible once you save the Quotation.,
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +68,Ironing,Prasowanie
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is stopped,{0} {1} jest zatrzymany
-apps/erpnext/erpnext/stock/doctype/item/item.py +352,Barcode {0} already used in Item {1},Kod kreskowy {0} jest już używana dla przedmiotu {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +356,Barcode {0} already used in Item {1},Kod kreskowy {0} jest już używana dla przedmiotu {1}
 DocType: Lead,Add to calendar on this date,Dodaj do kalendarza pod tą datą
 apps/erpnext/erpnext/config/selling.py +132,Rules for adding shipping costs.,
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,nadchodzące wydarzenia
@@ -3149,13 +3020,12 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +27,Quick Entry,Szybkie wejścia
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0} jest obowiązkowe Powrót
 DocType: Purchase Order,To Receive,Otrzymać
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +33,Shrink fitting,Shrink montażu
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +522,user@example.com,user@example.com
+apps/erpnext/erpnext/public/js/setup_wizard.js +266,user@example.com,user@example.com
 DocType: Email Digest,Income / Expense,
 DocType: Employee,Personal Email,Osobisty E-mail
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +58,Total Variance,Całkowitej wariancji
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +62,Total Variance,Całkowitej wariancji
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.",
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +15,Brokerage,
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +15,Brokerage,
 DocType: Address,Postal Code,kod pocztowy
 DocType: Production Order Operation,"in Minutes
 Updated via 'Time Log'","w minutach 
@@ -3163,14 +3033,13 @@
 DocType: Customer,From Lead,Od Tropu
 apps/erpnext/erpnext/config/manufacturing.py +19,Orders released for production.,Zamówienia puszczone do produkcji.
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +42,Select Fiscal Year...,Wybierz rok finansowy ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +442,POS Profile required to make POS Entry,Profil POS wymagany do tworzenia wpisu z POS
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +444,POS Profile required to make POS Entry,Profil POS wymagany do tworzenia wpisu z POS
 DocType: Hub Settings,Name Token,Nazwa jest już w użyciu
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +106,Planing,Struganie
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Selling,
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +120,Standard Selling,
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +137,Atleast one warehouse is mandatory,
 DocType: Serial No,Out of Warranty,Poza Gwarancją
 DocType: BOM Replace Tool,Replace,
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +314,{0} against Sales Invoice {1},{0} na fakturę sprzedaży {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +316,{0} against Sales Invoice {1},{0} na fakturę sprzedaży {1}
 apps/erpnext/erpnext/stock/doctype/item/item.py +49,Please enter default Unit of Measure,Proszę wpisać domyślną jednostkę miary
 DocType: Purchase Invoice Item,Project Name,Nazwa projektu
 DocType: Supplier,Mention if non-standard receivable account,"Wspomnieć, jeśli nie standardowe konto należności"
@@ -3186,9 +3055,8 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,Journal Entry {0} does not have account {1} or already matched against other voucher,Księgowanie {0} nie masz konta {1} lub już porównywane inne bon
 DocType: Item,Moving Average,
 DocType: BOM Replace Tool,The BOM which will be replaced,
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +43,New Stock UOM must be different from current stock UOM,
 DocType: Account,Debit,Debet
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +34,Leaves must be allocated in multiples of 0.5,Urlop musi by przyporządkowany w mnożniku 0.5
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +44,Leaves must be allocated in multiples of 0.5,Urlop musi by przyporządkowany w mnożniku 0.5
 DocType: Production Order,Operation Cost,Koszt operacji
 apps/erpnext/erpnext/config/hr.py +71,Upload attendance from a .csv file,Prześlij Frekwencję z pliku .csv
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,Zaległa wartość
@@ -3206,8 +3074,7 @@
 DocType: Employee,Internal Work History,Wewnętrzne Historia Pracuj
 DocType: DocField,Column Break,
 DocType: Event,Thursday,Czwartek
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +42,Private Equity,Kapitał prywatny
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +93,Turning,Obrócenie
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,Kapitał prywatny
 DocType: Maintenance Visit,Customer Feedback,Informacja zwrotna Klienta
 DocType: Account,Expense,Koszt
 DocType: Sales Invoice,Exhibition,Wystawa
@@ -3220,19 +3087,19 @@
 DocType: Employee,Held On,
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +33,Production Item,Pozycja Produkcja
 ,Employee Information,Informacja o pracowniku
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,Rate (%),Stawka (%)
+apps/erpnext/erpnext/public/js/setup_wizard.js +294,Rate (%),Stawka (%)
 DocType: Stock Entry Detail,Additional Cost,Dodatkowy koszt
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +407,Financial Year End Date,Data końca roku finansowego
+apps/erpnext/erpnext/public/js/setup_wizard.js +155,Financial Year End Date,Data końca roku finansowego
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Voucher No, if grouped by Voucher","Nie można przefiltrować wg Podstawy, jeśli pogrupowano z użyciem Podstawy"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +484,Make Supplier Quotation,
 DocType: Quality Inspection,Incoming,
 DocType: BOM,Materials Required (Exploded),
 DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),Zmniejsz wypłatę za Bezpłatny Urlop
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +512,"Add users to your organization, other than yourself","Dodaj użytkowników do swojej organizacji, innych niż siebie"
+apps/erpnext/erpnext/public/js/setup_wizard.js +256,"Add users to your organization, other than yourself","Dodaj użytkowników do swojej organizacji, innych niż siebie"
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No {1} does not match with {2} {3},Wiersz # {0}: Numer seryjny: {1} nie jest zgodny z {2} {3}
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +44,Casual Leave,Urlop okolicznościowy
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +44,Casual Leave,Urlop okolicznościowy
 DocType: Batch,Batch ID,Identyfikator Partii
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +334,Note: {0},Uwaga: {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +336,Note: {0},Uwaga: {0}
 ,Delivery Note Trends,Trendy Dowodów Dostawy
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +104,This Week's Summary,Podsumowanie W tym tygodniu
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +74,{0} must be a Purchased or Sub-Contracted Item in row {1},
@@ -3244,7 +3111,7 @@
 DocType: Purchase Receipt,Return Against Purchase Receipt,Powrót Przeciwko ZAKUPU
 DocType: Purchase Order,To Bill,Bill
 DocType: Material Request,% Ordered,% Zamówione
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +61,Piecework,
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Piecework,
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +64,Avg. Buying Rate,Średnia. Kupno Cena
 DocType: Task,Actual Time (in Hours),Rzeczywisty czas (w godzinach)
 DocType: Employee,History In Company,Historia Firmy
@@ -3261,13 +3128,13 @@
 DocType: Opportunity,To Discuss,
 DocType: SMS Settings,SMS Settings,
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +60,Temporary Accounts,Rachunki tymczasowe
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +155,Black,Czarny
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Black,Czarny
 DocType: BOM Explosion Item,BOM Explosion Item,
 DocType: Account,Auditor,Audytor
 DocType: Purchase Order,End date of current order's period,Data zakończenia okresu bieżącego zlecenia
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +17,Make Offer Letter,Złóż ofertę 
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +10,Return,Powrót
-apps/erpnext/erpnext/stock/doctype/item/item.py +503,Default Unit of Measure for Variant must be same as Template,Domyślne jednostki miary dla Variant musi być taki sam jak szablon
+apps/erpnext/erpnext/stock/doctype/item/item.py +507,Default Unit of Measure for Variant must be same as Template,Domyślne jednostki miary dla Variant musi być taki sam jak szablon
 DocType: DocField,Fold,Zagiąć
 DocType: Production Order Operation,Production Order Operation,Produkcja Zamówienie Praca
 DocType: Pricing Rule,Disable,Wyłącz
@@ -3278,13 +3145,12 @@
 DocType: Page,Page Name,Nazwa strony
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +110,To Time must be greater than From Time,Do czasu musi być większy niż czas From
 DocType: Journal Entry Account,Exchange Rate,Kurs wymiany
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +465,Sales Order {0} is not submitted,Zlecenie Sprzedaży {0} nie jest jeszcze złożone
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +467,Sales Order {0} is not submitted,Zlecenie Sprzedaży {0} nie jest jeszcze złożone
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0}: Parent account {1} does not bolong to the company {2},Magazyn {0}: Konto nadrzędne {1} nie należy do firmy {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +124,Spindle finishing,Wykończenie wrzeciona
 DocType: BOM,Last Purchase Rate,Data Ostatniego Zakupu
 DocType: Account,Asset,Składnik aktywów
 DocType: Project Task,Task ID,Identyfikator zadania
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +395,"e.g. ""MC""","np. ""MC"""
+apps/erpnext/erpnext/public/js/setup_wizard.js +143,"e.g. ""MC""","np. ""MC"""
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,Stock cannot exist for Item {0} since has variants,"Zdjęcie nie może istnieć dla pozycji {0}, ponieważ ma warianty"
 ,Sales Person-wise Transaction Summary,
 DocType: System Settings,Time Zone,
@@ -3293,9 +3159,7 @@
 DocType: Monthly Distribution,Monthly Distribution Percentages,Miesięczne Procenty Dystrybucja
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +16,The selected item cannot have Batch,Wybrany element nie może mieć Batch
 DocType: Delivery Note,% of materials delivered against this Delivery Note,% materiałów dostarczonych w stosunku do dowodu dostawy
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +151,Stapling,Zszywanie
 DocType: Customer,Customer Details,Dane Klienta
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +105,Shaping,Kształtowanie
 DocType: Employee,Reports to,
 DocType: SMS Settings,Enter url parameter for receiver nos,Wpisz URL dla odbiorcy numeru
 DocType: Sales Invoice,Paid Amount,Zapłacona kwota
@@ -3304,13 +3168,13 @@
 DocType: Item Variant,Item Variant,Pozycja Wersja
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +15,Setting this Address Template as default as there is no other default,"Ustawienie tego adresu jako domyślnego szablonu, ponieważ nie ma innej domyślnej"
 apps/erpnext/erpnext/accounts/doctype/account/account.py +89,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Stan konta już Debit, nie możesz ustawić ""waga musi być"" jako ""Kredyty"""
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +76,Quality Management,Zarządzanie jakością
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Quality Management,Zarządzanie jakością
 DocType: Production Planning Tool,Filter based on customer,Filtr bazujący na kliencie
 DocType: Payment Tool Detail,Against Voucher No,Dowód nr
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +47,Please enter quantity for Item {0},
 DocType: Employee External Work History,Employee External Work History,Historia zatrudnienia pracownika poza firmą
 DocType: Tax Rule,Purchase,Zakup
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +34,Balance Qty,Ilość bilansu
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Balance Qty,Ilość bilansu
 DocType: Item Group,Parent Item Group,Grupa Elementu nadrzędnego
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +21,{0} for {1},{0} do {1}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +96,Cost Centers,Centra Kosztów
@@ -3320,12 +3184,12 @@
 DocType: Opportunity,Next Contact,Następnie Kontakt
 DocType: Employee,Employment Type,Typ zatrudnienia
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,Środki trwałe
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +84,Application period cannot be across two alocation records,Okres aplikacja nie może być w dwóch zapisów alocation
 DocType: Item Group,Default Expense Account,Domyślne konto rozchodów
 DocType: Employee,Notice (days),Wymówienie (dni)
 DocType: Page,Yes,Tak
 DocType: Tax Rule,Sales Tax Template,Szablon Podatek od sprzedaży
 DocType: Employee,Encashment Date,Data Inkaso
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +74,Electroforming,Galwanoplastyka
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +179,"Against Voucher Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Podstawą księgowania może być tu Zamówienie zakupu, Faktura zakupu lub Zapis księgowy"
 DocType: Account,Stock Adjustment,Koszty braków
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +34,Default Activity Cost exists for Activity Type - {0},Istnieje Domyślnie aktywny Koszt rodzajów działalności - {0}
@@ -3361,12 +3225,12 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,Magazyn nie może być skasowany tak długo jak długo istnieją zapisy w księdze stanu dla tego magazynu.
 DocType: Company,Distribution,Dystrybucja
 apps/erpnext/erpnext/public/js/pos/pos.html +36,Amount Paid,Kwota zapłacona
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +91,Project Manager,
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +72,Dispatch,Wyślij
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Project Manager,
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +72,Dispatch,Wyślij
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,Maksymalna zniżka pozwoliło na pozycji: {0} jest {1}%
 DocType: Customer,Default Taxes and Charges,Domyślne podatków i opłat
 DocType: Account,Receivable,Należności
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +268,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,"Wiersz # {0}: Nie wolno zmienić dostawcę, jak już istnieje Zamówienie"
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +263,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,"Wiersz # {0}: Nie wolno zmienić dostawcę, jak już istnieje Zamówienie"
 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.",
@@ -3374,8 +3238,8 @@
 DocType: Hub Settings,Seller Description,Sprzedawca Opis
 DocType: Employee Education,Qualification,Kwalifikacja
 DocType: Item Price,Item Price,Cena
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +48,Soap & Detergent,
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +36,Motion Picture & Video,
+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,"Zamówione
 "
 DocType: Warehouse,Warehouse Name,Nazwa magazynu
@@ -3385,7 +3249,6 @@
 DocType: BOM,Rate Of Materials Based On,Stawka Materiałów Wzorowana na
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,
 apps/erpnext/erpnext/accounts/doctype/accounts_settings/accounts_settings.py +27,Company is missing in warehouses {0},Brakująca firma w magazynach {0}
-DocType: Stock UOM Replace Utility,Stock UOM Replace Utility,
 DocType: POS Profile,Terms and Conditions,Regulamin
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,To Date should be within the Fiscal Year. Assuming To Date = {0},Aby Data powinna być w tym roku podatkowym. Zakładając To Date = {0}
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc",
@@ -3397,7 +3260,7 @@
 DocType: Sales Order Item,For Production,Dla Produkcji
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +103,Please enter sales order in the above table,
 DocType: Project Task,View Task,Zobacz Zadanie
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +406,Your financial year begins on,Rozpoczęcie roku podatkowego
+apps/erpnext/erpnext/public/js/setup_wizard.js +154,Your financial year begins on,Rozpoczęcie roku podatkowego
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +46,Please enter Purchase Receipts,Wprowadź dokumenty zakupu
 DocType: Sales Invoice,Get Advances Received,Uzyskaj otrzymane zaliczki
 DocType: Email Digest,Add/Remove Recipients,Dodaj / Usuń odbiorców
@@ -3405,16 +3268,14 @@
 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),
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,Niedobór szt
-apps/erpnext/erpnext/stock/doctype/item/item.py +528,Item variant {0} exists with same attributes,Pozycja wariant {0} istnieje z samymi atrybutami
+apps/erpnext/erpnext/stock/doctype/item/item.py +532,Item variant {0} exists with same attributes,Pozycja wariant {0} istnieje z samymi atrybutami
 DocType: Salary Slip,Salary Slip,
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +116,Burnishing,Nagniatania
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +54,'To Date' is required,'Do daty' jest wymaganym polem
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,'Do daty' jest wymaganym polem
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","Utwórz paski na opakowania do dostawy. Używane do informacji o numerze opakowania, zawartości i wadze."
 DocType: Sales Invoice Item,Sales Order Item,Pozycja Zlecenia Sprzedaży
 DocType: Salary Slip,Payment Days,Dni Płatności
 DocType: BOM,Manage cost of operations,Zarządzaj kosztami działań
 DocType: Features Setup,Item Advanced,
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +40,Hot rolling,Walcowanie na gorąco
 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,Ustawienia globalne
 DocType: Employee Education,Employee Education,Wykształcenie pracownika
@@ -3427,25 +3288,23 @@
 DocType: Customer,Sales Team Details,
 DocType: Expense Claim,Total Claimed Amount,
 apps/erpnext/erpnext/config/crm.py +22,Potential opportunities for selling.,Potencjalne szanse na sprzedaż.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +48,Sick Leave,Urlop chorobowy
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +174,Invalid {0},Nieprawidłowy {0}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +48,Sick Leave,Urlop chorobowy
 DocType: Email Digest,Email Digest,przetwarzanie emaila
 DocType: Delivery Note,Billing Address Name,Nazwa Adresu do Faktury
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +22,Department Stores,
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +40,System Balance,Bilans systemu
 DocType: Workflow,Is Active,Jest aktywny
 apps/erpnext/erpnext/controllers/stock_controller.py +71,No accounting entries for the following warehouses,
 apps/erpnext/erpnext/projects/doctype/project/project.js +22,Save the document first.,Zapisz dokument jako pierwszy.
 DocType: Account,Chargeable,Odpowedni do pobierania opłaty.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +121,Linishing,Linishing
 DocType: Company,Change Abbreviation,Zmień Skrót
 DocType: Workflow State,Primary,Podstawowy
 DocType: Expense Claim Detail,Expense Date,Data wydatku
 DocType: Item,Max Discount (%),Maksymalny rabat (%)
 DocType: Communication,More Information,Więcej informacji
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +70,Last Order Amount,Kwota ostatniego zamówienia
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +161,Blasting,Wybuchowych
 DocType: Company,Warn,Ostrzeż
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +111,Item valuation updated,
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Wszelkie inne uwagi, zauważyć, że powinien iść nakładu w ewidencji."
 DocType: BOM,Manufacturing User,Produkcja użytkownika
 DocType: Purchase Order,Raw Materials Supplied,Dostarczone surowce
@@ -3455,7 +3314,7 @@
 DocType: Appraisal,Appraisal Template,Szablon oceny
 DocType: Communication,Email,Email
 DocType: Item Group,Item Classification,Pozycja Klasyfikacja
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +89,Business Development Manager,
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Business Development Manager,
 DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,Cel Wizyty Konserwacji
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.js +15,Period,Okres
 ,General Ledger,Księga główna
@@ -3465,9 +3324,7 @@
 ,Itemwise Recommended Reorder Level,
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +264,Please select {0} first,Proszę najpierw wybrać {0}
 DocType: Features Setup,To get Item Group in details table,
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +67,Redrawing,Odświeżanie
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +112,Batch {0} of Item {1} has expired.,Batch {0} pozycji {1} wygasł.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +120,Etching,Akwaforta
 DocType: Sales Invoice,Commission,Prowizja
 DocType: Address Template,"<h4>Default Template</h4>
 <p>Uses <a href=""http://jinja.pocoo.org/docs/templates/"">Jinja Templating</a> and all the fields of Address (including Custom Fields if any) will be available</p>
@@ -3512,7 +3369,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +340,Operation Time must be greater than 0 for Operation {0},Czas działania musi być większy niż 0 do operacji {0}
 DocType: Supplier,Address and Contacts,Adres i Kontakt
 DocType: UOM Conversion Detail,UOM Conversion Detail,Szczegóły konwersji jednostki miary
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +496,Keep it web friendly 900px (w) by 100px (h),Staraj się być przyjazny dla WWW 900px (szerokość) na 100px (wysokość)
+apps/erpnext/erpnext/public/js/setup_wizard.js +242,Keep it web friendly 900px (w) by 100px (h),Staraj się być przyjazny dla WWW 900px (szerokość) na 100px (wysokość)
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +329,Production Order cannot be raised against a Item Template,Produkcja Zamówienie nie może zostać podniesiona przed Szablon Element
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +44,Charges are updated in Purchase Receipt against each item,Opłaty są aktualizowane w ZAKUPU każdej pozycji
 DocType: Payment Tool,Get Outstanding Vouchers,Pobierz zaległe Kupony
@@ -3528,54 +3385,49 @@
 DocType: Item,Average time taken by the supplier to deliver,Średni czas podjęte przez dostawcę do dostarczenia
 DocType: Time Log,Hours,Godziny
 DocType: Project,Expected Start Date,Spodziewana data startowa
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +38,Rolling,Walcówka
 DocType: ToDo,Priority,Priorytet
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +41,Remove item if charges is not applicable to that item,"Usuń element, jeśli opłata nie ma zastosowania do tej pozycji"
 DocType: Dropbox Backup,Dropbox Access Allowed,Dostęp do Dropboxa Dopuszczony
 DocType: Dropbox Backup,Weekly,Tygodniowo
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,np. smsgateway.com/api/send_sms.cgi 
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +485,Receive,Odbierać
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +510,Receive,Odbierać
 DocType: Maintenance Visit,Fully Completed,Całkowicie ukończono
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% kompletne
 DocType: Employee,Educational Qualification,Kwalifikacje edukacyjne
 DocType: Workstation,Operating Costs,Koszty operacyjne
 DocType: Employee Leave Approver,Employee Leave Approver,Zgoda na zwolnienie dla pracownika
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,{0} has been successfully added to our Newsletter list.,{0} został pomyślnie dodany do naszego newslettera.
-apps/erpnext/erpnext/stock/doctype/item/item.py +383,Row {0}: An Reorder entry already exists for this warehouse {1},"Wiersz {0}: Zapis ponownego zamawiania dla tego magazynu, {1}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +387,Row {0}: An Reorder entry already exists for this warehouse {1},"Wiersz {0}: Zapis ponownego zamawiania dla tego magazynu, {1}"
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +67,"Cannot declare as lost, because Quotation has been made.",Nie można zadeklarować jako zagubiony z powodu utworzenia kwotacji
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +133,Electron beam machining,Obróbka wiązką elektronów
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Główny Menadżer Zakupów
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +424,Production Order {0} must be submitted,
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +150,Please select Start Date and End Date for Item {0},
 apps/erpnext/erpnext/config/stock.py +141,Main Reports,Raporty główne
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +102,Stock Ledger entries balances updated,
 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,
-apps/erpnext/erpnext/stock/doctype/item/item.js +176,Add / Edit Prices,Dodaj / Edytuj ceny
+apps/erpnext/erpnext/stock/doctype/item/item.js +178,Add / Edit Prices,Dodaj / Edytuj ceny
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +53,Chart of Cost Centers,Struktura kosztów (MPK)
 ,Requested Items To Be Ordered,
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +298,My Orders,Moje Zamówienia
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +293,My Orders,Moje Zamówienia
 DocType: Price List,Price List Name,Nazwa cennika
 DocType: Time Log,For Manufacturing,Dla Produkcji
-apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +70,Totals,Sumy całkowite
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +174,Totals,Sumy całkowite
 DocType: BOM,Manufacturing,Produkcja
 ,Ordered Items To Be Delivered,Zamówione produkty do dostarczenia
 DocType: Account,Income,Przychody
 ,Setup Wizard,
 DocType: Industry Type,Industry Type,
 apps/erpnext/erpnext/templates/includes/cart.js +137,Something went wrong!,Coś poszło nie tak!
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +68,Warning: Leave application contains following block dates,Ostrzeżenie: Aplikacja o urlop zawiera następujące zablokowane daty
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +251,Sales Invoice {0} has already been submitted,Faktura Sprzedaży {0} została już wprowadzona
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +100,Warning: Leave application contains following block dates,Ostrzeżenie: Aplikacja o urlop zawiera następujące zablokowane daty
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +256,Sales Invoice {0} has already been submitted,Faktura Sprzedaży {0} została już wprowadzona
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,Data ukończenia
 DocType: Purchase Invoice Item,Amount (Company Currency),Kwota (Waluta firmy)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +10,Die casting,Odlewów
 DocType: Email Alert,Reference Date,Data Odniesienia
 apps/erpnext/erpnext/config/hr.py +105,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,Szczegóły Budżetu
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +75,Please enter message before sending,Proszę wpisać wiadomość przed wysłaniem
 DocType: Async Task,Status,
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +65,Stock UOM updated for Item {0},Zaktualizowano jednostkę miary zapasów dla pozycji {0}
 DocType: Company History,Year,Rok
 apps/erpnext/erpnext/config/accounts.py +127,Point-of-Sale Profile,Point-of-Sale profil
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +68,Please Update SMS Settings,Zaktualizuj Ustawienia SMS
@@ -3589,12 +3441,12 @@
 ,Serial No Service Contract Expiry,
 DocType: Item,Unit of Measure Conversion,Jednostka miary Conversion
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +86,Employee can not be changed,Pracownik nie może być zmieniony
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +259,You cannot credit and debit same account at the same time,Nie można wykonywać zapisów po stronie debetowej oraz kredytowej tego samego konta w jednym czasie
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,You cannot credit and debit same account at the same time,Nie można wykonywać zapisów po stronie debetowej oraz kredytowej tego samego konta w jednym czasie
 DocType: Naming Series,Help HTML,
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},
 apps/erpnext/erpnext/controllers/status_updater.py +140,Allowance for over-{0} crossed for Item {1},Zniżki dla nadmiernie {0} przeszedł na pozycję {1}
 DocType: Address,Name of person or organization that this address belongs to.,Imię odoby lub organizacji do której należy adres.
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +587,Your Suppliers,Twoi Dostawcy
+apps/erpnext/erpnext/public/js/setup_wizard.js +325,Your Suppliers,Twoi Dostawcy
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +65,Another Salary Structure {0} is active for employee {1}. Please make its status 'Inactive' to proceed.,"Innym Wynagrodzenie Struktura {0} jest aktywny przez pracownika {1}. Należy się jej status ""nieaktywny"", aby kontynuować."
 DocType: Purchase Invoice,Contact,Kontakt
@@ -3604,37 +3456,35 @@
 DocType: Item,Has Serial No,Posiada numer seryjny
 DocType: Employee,Date of Issue,Data wydania
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +16,{0}: From {0} for {1},{0}: od {0} do {1}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +154,Row #{0}: Set Supplier for item {1},Wiersz # {0}: Ustaw Dostawca dla pozycji {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +149,Row #{0}: Set Supplier for item {1},Wiersz # {0}: Ustaw Dostawca dla pozycji {1}
 DocType: Issue,Content Type,Typ zawartości
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +17,Computer,Komputer
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,Komputer
 DocType: Item,List this Item in multiple groups on the website.,
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +283,Please check Multi Currency option to allow accounts with other currency,"Proszę sprawdzić multi opcji walutowych, aby umożliwić rachunki w innych walutach"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +285,Please check Multi Currency option to allow accounts with other currency,"Proszę sprawdzić multi opcji walutowych, aby umożliwić rachunki w innych walutach"
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +62,Item: {0} does not exist in the system,Pozycja: {0} nie istnieje w systemie
 apps/erpnext/erpnext/accounts/doctype/account/account.py +81,You are not authorized to set Frozen value,Nie masz uprawnień do ustawienia zamrożenej wartości
 DocType: Payment Reconciliation,Get Unreconciled Entries,Pobierz Wpisy nieuzgodnione
 DocType: Cost Center,Budgets,Budżety
 apps/frappe/frappe/core/page/modules_setup/modules_setup.py +11,Updated,Zaktualizowano
 DocType: Employee,Emergency Contact Details,Kontakt na wypadek nieszczęśliwych wypadków - szczegóły
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +396,What does it do?,Co to robi?
+apps/erpnext/erpnext/public/js/setup_wizard.js +144,What does it do?,Co to robi?
 DocType: Delivery Note,To Warehouse,Do magazynu
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +45,Account {0} has been entered more than once for fiscal year {1},Konto {0} zostało wprowadzone więcej niż raz dla roku podatkowego {1} 
 ,Average Commission Rate,Średnia prowizja
-apps/erpnext/erpnext/stock/doctype/item/item.py +313,'Has Serial No' can not be 'Yes' for non-stock item,Numer seryjny nie jest dostępny dla pozycji niemagazynowych
+apps/erpnext/erpnext/stock/doctype/item/item.py +317,'Has Serial No' can not be 'Yes' for non-stock item,Numer seryjny nie jest dostępny dla pozycji niemagazynowych
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Attendance can not be marked for future dates,
 DocType: Pricing Rule,Pricing Rule Help,Wycena Zasada Pomoc
 DocType: Purchase Taxes and Charges,Account Head,
 apps/erpnext/erpnext/config/stock.py +79,Update additional costs to calculate landed cost of items,Zaktualizuj dodatkowe koszty do obliczenia całkowitego kosztu operacji
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +111,Electrical,Elektryczne
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +111,Electrical,Elektryczne
 DocType: Stock Entry,Total Value Difference (Out - In),Całkowita Wartość Różnica (Out - In)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +302,Row {0}: Exchange Rate is mandatory,Wiersz {0}: Kurs wymiany jest obowiązkowe
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +304,Row {0}: Exchange Rate is mandatory,Wiersz {0}: Kurs wymiany jest obowiązkowe
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},ID Użytkownika nie ustawiony dla Pracownika {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +72,Peening,Kulkowania
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,From Warranty Claim,Od Reklamacji
 DocType: Stock Entry,Default Source Warehouse,Domyślny magazyn źródłowy
 DocType: Item,Customer Code,Kod Klienta
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +212,Birthday Reminder for {0},Przypomnienie o Urodzinach dla {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +163,Lapping,Docieranie
-apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.js +8,Days Since Last Order,Dni od ostatniego zamówienia
+apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +72,Days Since Last Order,Dni od ostatniego zamówienia
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +299,Debit To account must be a Balance Sheet account,Obciążenie rachunku musi być kontem Bilans
 DocType: Buying Settings,Naming Series,Seria nazw
 DocType: Leave Block List,Leave Block List Name,
@@ -3648,7 +3498,7 @@
 DocType: Notification Control,Sales Invoice Message,
 DocType: Authorization Rule,Based On,Bazujący na
 DocType: Sales Order Item,Ordered Qty,Ilość Zamówiona
-apps/erpnext/erpnext/stock/doctype/item/item.py +539,Item {0} is disabled,Element {0} jest wyłączony
+apps/erpnext/erpnext/stock/doctype/item/item.py +543,Item {0} is disabled,Element {0} jest wyłączony
 DocType: Stock Settings,Stock Frozen Upto,
 apps/erpnext/erpnext/controllers/recurring_document.py +166,Period From and Period To dates mandatory for recurring {0},Okres Okres Od i Do dat obowiązkowych dla powtarzających {0}
 apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,Czynność / zadanie projektu
@@ -3658,7 +3508,6 @@
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,Zniżka musi wynosić mniej niż 100
 DocType: ToDo,Low,Niski
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Napisz Off Kwota (Spółka Waluta)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +71,Spinning,Spinning
 DocType: Landed Cost Voucher,Landed Cost Voucher,Koszt kuponu
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +55,Please set {0},Ustaw {0}
 DocType: Purchase Invoice,Repeat on Day of Month,
@@ -3680,7 +3529,6 @@
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +37,Campaign Name is required,Nazwa kampanii jest wymagana
 DocType: Maintenance Visit,Maintenance Date,Data Konserwacji
 DocType: Purchase Receipt Item,Rejected Serial No,Odrzucony Nr Seryjny
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +51,Deep drawing,Głębokie tłoczenie
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +40,New Newsletter,Nowy biuletyn
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +157,Start date should be less than end date for Item {0},
 apps/erpnext/erpnext/stock/doctype/item/item.js +17,Show Balance,Pokaż Saldo
@@ -3691,7 +3539,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +119,BOM and Manufacturing Quantity are required,BOM i ilości są wymagane Manufacturing
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Starzenie Zakres 2
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +450,Amount,Wartość
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +147,Riveting,Nitowania
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,
 ,Sales Analytics,Analityka sprzedaży
 DocType: Manufacturing Settings,Manufacturing Settings,Ustawienia produkcyjne
@@ -3703,20 +3550,19 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +207,New Account Name,Nowa nazwa konta
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,Koszt dostarczonych surowców
 DocType: Selling Settings,Settings for Selling Module,Ustawienia modułu sprzedaży
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +73,Customer Service,Obsługa Klienta
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Customer Service,Obsługa Klienta
 DocType: Item,Thumbnail,Miniaturka
 DocType: Item Customer Detail,Item Customer Detail,
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +147,Confirm Your Email,Potwierdź Swój Email
 apps/erpnext/erpnext/config/hr.py +53,Offer candidate a Job.,Zaproponuj kandydatowi pracę
 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,Liczba przyznanych liście są więcej niż dni w okresie
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +70,Item {0} must be a stock Item,
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,Domyślnie Work In Progress Warehouse
 apps/erpnext/erpnext/config/accounts.py +107,Default settings for accounting transactions.,Domyślne ustawienia dla transakcji księgowych
 apps/frappe/frappe/model/naming.py +40,{0} is required,{0} is wymagany
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +21,Vacuum molding,Formowanie próżniowe
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,Spodziewana data nie może być wcześniejsza od daty prośby o materiał
 DocType: Contact Us Settings,City,Miasto
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +132,Ultrasonic machining,Obróbka ultradźwiękowa
 apps/frappe/frappe/templates/base.html +137,Error: Not a valid id?,Błąd: Nie ważne id?
 apps/erpnext/erpnext/stock/get_item_details.py +125,Item {0} must be a Sales Item,
 DocType: Naming Series,Update Series Number,Zaktualizuj Numer Serii
@@ -3724,7 +3570,7 @@
 DocType: Sales Order,Printing Details,Szczegóły Drukarnie
 DocType: Task,Closing Date,Data zamknięcia
 DocType: Sales Order Item,Produced Quantity,Wyprodukowana ilość
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +84,Engineer,Inżynier
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Engineer,Inżynier
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,Zespoły Szukaj Sub
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +379,Item Code required at Row No {0},
 DocType: Sales Partner,Partner Type,Typ Partnera
@@ -3732,7 +3578,7 @@
 DocType: Authorization Rule,Customerwise Discount,Zniżka dla klienta
 DocType: Purchase Invoice,Against Expense Account,Konto wydatków
 DocType: Production Order,Production Order,Zamówinie produkcji
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +258,Installation Note {0} has already been submitted,
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +263,Installation Note {0} has already been submitted,
 DocType: Quotation Item,Against Docname,
 DocType: SMS Center,All Employee (Active),Wszyscy pracownicy (aktywni)
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,Zobacz teraz
@@ -3741,19 +3587,19 @@
 DocType: Item,Re-Order Level,Próg ponowienia zamówienia
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,Wpisz nazwy przedmiotów i planowaną ilość dla której chcesz zwiększyć produkcję zamówień lub ściągnąć surowe elementy dla analizy.
 apps/frappe/frappe/public/js/frappe/views/ganttview.js +45,Gantt Chart,Wykres Gantta
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +57,Part-time,Niepełnoetatowy
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,Part-time,Niepełnoetatowy
 DocType: Employee,Applicable Holiday List,Stosowna Lista Urlopów
 DocType: Employee,Cheque,Czek
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,
 apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Report Type is mandatory,Typ raportu jest wymagany
 DocType: Item,Serial Number Series,
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},Magazyn jest obowiązkowy dla Przedmiotu {0} w rzędzie {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +45,Retail & Wholesale,
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,
 DocType: Issue,First Responded On,Data pierwszej odpowiedzi
 DocType: Website Item Group,Cross Listing of Item in multiple groups,Krzyż Notowania pozycji w wielu grupach
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +351,The First User: You,Pierwszy użytkownik: to Ty!
+apps/erpnext/erpnext/public/js/setup_wizard.js +101,The First User: You,Pierwszy użytkownik: to Ty!
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +48,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},Rok obrotowy Data rozpoczęcia i Data zakończenia roku obrotowego są już ustawione w roku podatkowym {0}
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +172,Successfully Reconciled,Pomyślnie uzgodnione
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +119,Successfully Reconciled,Pomyślnie uzgodnione
 DocType: Production Order,Planned End Date,Planowana data zakończenia
 apps/erpnext/erpnext/config/stock.py +43,Where items are stored.,Gdzie produkty są przechowywane.
 DocType: Tax Rule,Validity,Ważność
@@ -3773,39 +3619,36 @@
 DocType: DocPerm,Level,Poziom
 DocType: Purchase Taxes and Charges,On Net Total,Na podstawie Kwoty Netto
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +160,Target warehouse in row {0} must be same as Production Order,
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +59,No permission to use Payment Tool,Brak uprawnień do korzystania z narzędzi płatności
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +97,No permission to use Payment Tool,Brak uprawnień do korzystania z narzędzi płatności
 apps/erpnext/erpnext/controllers/recurring_document.py +192,'Notification Email Addresses' not specified for recurring %s,Adres e-mail dla 'Powiadomień' nie został podany dla powracających %s
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +86,Milling,Przemiał
 apps/erpnext/erpnext/accounts/doctype/account/account.py +99,Currency can not be changed after making entries using some other currency,Waluta nie może być zmieniony po dokonaniu wpisów używając innej walucie
 DocType: Company,Round Off Account,Konto kwot zaokrągleń
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +60,Nibbling,Gryząc
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,Wydatki na podstawową działalność
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +18,Consulting,Konsulting
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +18,Consulting,Konsulting
 DocType: Customer Group,Parent Customer Group,Nadrzędna Grupa Klientów
 apps/erpnext/erpnext/public/js/pos/pos.js +429,Change,Reszta
 DocType: Purchase Invoice,Contact Email,E-mail kontaktu
 DocType: Appraisal Goal,Score Earned,
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +393,"e.g. ""My Company LLC""","np. ""Moja Firma LLC"""
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +173,Notice Period,Okres wypowiedzenia
+apps/erpnext/erpnext/public/js/setup_wizard.js +141,"e.g. ""My Company LLC""","np. ""Moja Firma LLC"""
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +173,Notice Period,Okres wypowiedzenia
 DocType: Bank Reconciliation Detail,Voucher ID,ID Bonu
 apps/erpnext/erpnext/setup/doctype/territory/territory.js +14,This is a root territory and cannot be edited.,
 DocType: Packing Slip,Gross Weight UOM,
 DocType: Email Digest,Receivables / Payables,Należności / Zobowiązania
 DocType: Delivery Note Item,Against Sales Invoice,Na podstawie faktury sprzedaży
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +63,Stamping,Cechowanie
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +457,Credit Account,Konto kredytowe
 DocType: Landed Cost Item,Landed Cost Item,Koszt Przedmiotu
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +56,Show zero values,Pokaż wartości zerowe
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,Ilość produktu otrzymanego po produkcji / przepakowaniu z podanych ilości surowców
 DocType: Payment Reconciliation,Receivable / Payable Account,Konto Należności / Zobowiązań
 DocType: Delivery Note Item,Against Sales Order Item,Na podstawie pozycji zamówienia sprzedaży
-apps/erpnext/erpnext/stock/doctype/item/item.py +521,Please specify Attribute Value for attribute {0},Proszę podać wartość atrybutu dla atrybutu {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +525,Please specify Attribute Value for attribute {0},Proszę podać wartość atrybutu dla atrybutu {0}
 DocType: Item,Default Warehouse,Domyślny magazyn
 DocType: Task,Actual End Date (via Time Logs),Rzeczywista Data zakończenia (przez Time Logs)
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +37,Budget cannot be assigned against Group Account {0},Budżet nie może być przypisany do rachunku grupy {0}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +23,Please enter parent cost center,
 DocType: Delivery Note,Print Without Amount,Drukuj bez wartości
-apps/erpnext/erpnext/controllers/buying_controller.py +69,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,
+apps/erpnext/erpnext/controllers/buying_controller.py +60,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,
 DocType: User,Last Name,Nazwisko
 DocType: Web Page,Left,Opuścił
 DocType: Event,All Day,Cały Dzień
@@ -3813,7 +3656,7 @@
 DocType: Appraisal,Total Score (Out of 5),
 DocType: Contact Us Settings,State,Stan
 DocType: Batch,Batch,Partia
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +51,Balance,Bilans
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +28,Balance,Bilans
 DocType: Project,Total Expense Claim (via Expense Claims),Łączny koszt roszczenie (przez Zastrzeżeń koszty)
 DocType: User,Gender,Płeć
 DocType: Journal Entry,Debit Note,Nota debetowa
@@ -3843,8 +3686,7 @@
 DocType: Purchase Order,Get Last Purchase Rate,Uzyskaj stawkę z ostatniego zakupu
 DocType: Time Log,Billing Rate based on Activity Type (per hour),Kursy rozliczeniowe na podstawie rodzajów działalności (za godzinę)
 DocType: Company,Company Info,Informacje o firmie
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +76,Seaming,Ząbkowanie
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +197,"Company Email ID not found, hence mail not sent","Email ID Firmy nie został znaleziony, w wyniku czego e-mail nie został wysłany"
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +206,"Company Email ID not found, hence mail not sent","Email ID Firmy nie został znaleziony, w wyniku czego e-mail nie został wysłany"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Aktywa
 DocType: Production Planning Tool,Filter based on item,Filtr bazujący na Przedmiocie
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +451,Debit Account,Konto debetowe
@@ -3856,17 +3698,16 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +95,{0} {1} has been modified. Please refresh.,{0} {1} został zmodyfikowany. Proszę odświeżyć.
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +591,From Opportunity,Od Szansy
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +46,Blanking,Wykrawanie
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +166,Employee Benefits,Świadczenia pracownicze
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,Employee Benefits,Świadczenia pracownicze
 DocType: Sales Invoice,Is POS,
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +240,Packed quantity must equal quantity for Item {0} in row {1},Wartość spakowana musi równać się ilości dla przedmiotu {0} w rzędzie {1} 
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +245,Packed quantity must equal quantity for Item {0} in row {1},Wartość spakowana musi równać się ilości dla przedmiotu {0} w rzędzie {1} 
 DocType: Production Order,Manufactured Qty,
 DocType: Purchase Receipt Item,Accepted Quantity,Przyjęta Ilość
 apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} nie istnieje
 apps/erpnext/erpnext/config/accounts.py +18,Bills raised to Customers.,Rachunki dla klientów.
 DocType: DocField,Default,Domyślny
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Projekt Id
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +466,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Wiersz nr {0}: Kwota nie może być większa niż oczekiwaniu Kwota wobec Kosztów zastrzeżenia {1}. W oczekiwaniu Kwota jest {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +468,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Wiersz nr {0}: Kwota nie może być większa niż oczekiwaniu Kwota wobec Kosztów zastrzeżenia {1}. W oczekiwaniu Kwota jest {2}
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +40,{0} subscribers added,{0} abonentów dodano
 DocType: Maintenance Schedule,Schedule,Harmonogram
 DocType: Cost Center,"Define Budget for this Cost Center. To set budget action, see ""Company List""","Definiowanie budżetu tego centrum kosztów. Aby ustawić działania budżetu, patrz &quot;Lista Spółka&quot;"
@@ -3877,7 +3718,7 @@
 apps/erpnext/erpnext/public/js/pos/pos.js +91,Price List not found or disabled,Cennik nie został znaleziony lub wyłączone
 DocType: Expense Claim,Approved,Zatwierdzono
 DocType: Pricing Rule,Price,Cena
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +79,Employee relieved on {0} must be set as 'Left',pracownik zwalnia się na {0} musi być ustawiony jako 'opuścił'
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +88,Employee relieved on {0} must be set as 'Left',pracownik zwalnia się na {0} musi być ustawiony jako 'opuścił'
 DocType: Item,"Selecting ""Yes"" will give a unique identity to each entity of this item which can be viewed in the Serial No master.","Wybranie ""Tak"" pozwoli w unikalny sposób identyfikować każdą pojedynczą sztukę tej rzeczy i która będzie mogła być przeglądana w sekcji Nr Seryjny"
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +39,Appraisal {0} created for Employee {1} in the given date range,Ocena {0} utworzona dla Pracownika {1} w datach od-do
 DocType: Employee,Education,Wykształcenie
@@ -3888,7 +3729,7 @@
 apps/frappe/frappe/desk/moduleview.py +67,Standard Reports,Raporty standardowe
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,Dziennik zapisów księgowych.
 DocType: Delivery Note Item,Available Qty at From Warehouse,Dostępne szt co z magazynu
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +209,Please select Employee Record first.,Proszę wybrać pierwszego pracownika
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +224,Please select Employee Record first.,Proszę wybrać pierwszego pracownika
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Wiersz {0}: Party / konto nie jest zgodny z {1} / {2} w {3} {4}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +35,To create a Tax Account,Aby utworzyć konto podatkowe
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +233,Please enter Expense Account,Wprowadź konto Wydatków
@@ -3901,46 +3742,43 @@
 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,
 DocType: DocShare,Document Type,Typ Dokumentu
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +565,From Supplier Quotation,Od Wyceny Kupna
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +588,From Supplier Quotation,Od Wyceny Kupna
 DocType: Deduction Type,Deduction Type,Typ odliczenia
 DocType: Attendance,Half Day,Pół Dnia
 DocType: Pricing Rule,Min Qty,Min. ilość
 DocType: Features Setup,"To track items in sales and purchase documents with batch nos. ""Preferred Industry: Chemicals""",Do śledzenia produktów w sprzedaży i dokumentów zakupu z numerach partii. &quot;Preferowane Branża: Chemia&quot;
 DocType: GL Entry,Transaction Date,Data transakcji
 DocType: Production Plan Item,Planned Qty,Planowana ilość
-apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +91,Total Tax,Razem podatkowa
+apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +93,Total Tax,Razem podatkowa
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +178,For Quantity (Manufactured Qty) is mandatory,Do Ilość (Wyprodukowano kopie) są obowiązkowe
 DocType: Stock Entry,Default Target Warehouse,Domyślny magazyn docelowy
 DocType: Purchase Invoice,Net Total (Company Currency),Łączna wartość netto (waluta firmy)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +79,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Wiersz {0}: Typ i Partia Partia ma zastosowanie tylko w stosunku do otrzymania / rachunku Płatne
 DocType: Notification Control,Purchase Receipt Message,Wiadomość Potwierdzenia Zakupu
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +95,Total allocated leaves are more than period,Liczba przyznanych liście są więcej niż okres
 DocType: Production Order,Actual Start Date,Rzeczywista data rozpoczęcia
 DocType: Sales Order,% of materials delivered against this Sales Order,% materiałów dostarczonych w ramach zlecenia sprzedaży
 apps/erpnext/erpnext/config/stock.py +23,Record item movement.,Zapisz ruch produktu.
 DocType: Newsletter List Subscriber,Newsletter List Subscriber,Biuletyn Lista Abonent
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +164,Morticing,Dłutarki
 DocType: Email Account,Service,Usługa
 DocType: Hub Settings,Hub Settings,Ustawienia Hub
 DocType: Project,Gross Margin %,Marża brutto %
 DocType: BOM,With Operations,Wraz z działaniami
 apps/erpnext/erpnext/accounts/party.py +232,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Zapisy księgowe zostały już dokonane w walucie {0} dla firmy {1}. Proszę wybrać należności lub zobowiązania konto w walucie {0}.
 ,Monthly Salary Register,
-apps/frappe/frappe/website/template.py +140,Next,Dalej
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard_page.html +17,Next,Dalej
 DocType: Warranty Claim,If different than customer address,
 DocType: BOM Operation,BOM Operation,
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +118,Electropolishing,Elektropolerowanie
 DocType: Purchase Taxes and Charges,On Previous Row Amount,
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +24,Please enter Payment Amount in atleast one row,Podaj płatności Kwota w conajmniej jednym rzędzie
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +33,Please enter Payment Amount in atleast one row,Podaj płatności Kwota w conajmniej jednym rzędzie
 DocType: POS Profile,POS Profile,POS profilu
 apps/erpnext/erpnext/config/accounts.py +153,"Seasonality for setting budgets, targets etc.","Sezonowość ustalania budżetów, cele itd."
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +238,Row {0}: Payment Amount cannot be greater than Outstanding Amount,Wiersz {0}: Płatność Kwota nie może być większa niż kwota kredytu pozostała
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +46,Total Unpaid,Razem Niezapłacone
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +21,Time Log is not billable,Czas nie jest rozliczanych Zaloguj
 apps/erpnext/erpnext/stock/get_item_details.py +128,"Item {0} is a template, please select one of its variants","Element {0} jest szablon, należy wybrać jedną z jego odmian"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +528,Purchaser,Kupujący
+apps/erpnext/erpnext/public/js/setup_wizard.js +272,Purchaser,Kupujący
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +81,Net pay cannot be negative,Stawka Netto nie może być na minusie
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +71,Please enter the Against Vouchers manually,Proszę wprowadzić ręcznie z dowodami
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +107,Please enter the Against Vouchers manually,Proszę wprowadzić ręcznie z dowodami
 DocType: SMS Settings,Static Parameters,
 DocType: Purchase Order,Advance Paid,Zaliczka
 DocType: Item,Item Tax,Podatek dla tej pozycji
@@ -3949,14 +3787,12 @@
 apps/erpnext/erpnext/config/crm.py +48,Send mass SMS to your contacts,
 DocType: Purchase Taxes and Charges,Consider Tax or Charge for,Rozwać Podatek albo Opłatę za
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,Rzeczywista Ilość jest obowiązkowa
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +42,Cross-rolling,Cross-walcówka
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +132,Credit Card,
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +132,Credit Card,
 DocType: BOM,Item to be manufactured or repacked,"Produkt, który ma zostać wyprodukowany lub przepakowany"
 apps/erpnext/erpnext/config/stock.py +95,Default settings for stock transactions.,Domyślne ustawienia dla transakcji asortymentu
 DocType: Purchase Invoice,Next Date,
 DocType: Employee Education,Major/Optional Subjects,Główne/Opcjonalne Tematy
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +49,Please enter Taxes and Charges,Proszę wprowadzić podatki i opłaty
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +85,Machining,Obróbka
 DocType: Sales Invoice Item,Drop Ship,Drop Ship
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children",
 DocType: Hub Settings,Seller Name,Sprzedawca Nazwa
@@ -3966,7 +3802,7 @@
 DocType: Stock Entry,Repack,Przepakowanie
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +6,You must Save the form before proceeding,Zapisz formularz aby kontynuować
 DocType: Item Attribute,Numeric Values,Wartości liczbowe
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +500,Attach Logo,Załącz Logo
+apps/erpnext/erpnext/public/js/setup_wizard.js +246,Attach Logo,Załącz Logo
 DocType: Customer,Commission Rate,Wartość prowizji
 apps/erpnext/erpnext/stock/doctype/item/item.js +38,Make Variant,Bądź Variant
 apps/erpnext/erpnext/config/hr.py +145,Block leave applications by department.,
@@ -3981,19 +3817,19 @@
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +105,Please select a csv file,Proszę wybrać plik .csv
 DocType: Dropbox Backup,Send Backups to Dropbox,Wyślij kopie zapasowe na Dropbox
 DocType: Purchase Order,To Receive and Bill,Do odbierania i Bill
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +94,Designer,Projektant
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Designer,Projektant
 apps/erpnext/erpnext/config/selling.py +121,Terms and Conditions Template,Szablony warunków i regulaminów
 DocType: Serial No,Delivery Details,Szczegóły dostawy
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +383,Cost Center is required in row {0} in Taxes table for type {1},
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +386,Cost Center is required in row {0} in Taxes table for type {1},
 DocType: Item,Automatically create Material Request if quantity falls below this level,"Automatyczne tworzenie Materiał wniosku, jeżeli ilość spada poniżej tego poziomu"
 ,Item-wise Purchase Register,
 DocType: Batch,Expiry Date,Data ważności
-apps/erpnext/erpnext/stock/doctype/item/item.py +375,"To set reorder level, item must be a Purchase Item or Manufacturing Item","Aby ustawić poziom zmienić kolejność, element musi być pozycja nabycia lub przedmiotu"
+apps/erpnext/erpnext/stock/doctype/item/item.py +379,"To set reorder level, item must be a Purchase Item or Manufacturing Item","Aby ustawić poziom zmienić kolejność, element musi być pozycja nabycia lub przedmiotu"
 ,Supplier Addresses and Contacts,
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,Proszę najpierw wybrać kategorię
 apps/erpnext/erpnext/config/projects.py +18,Project master.,Dyrektor projektu
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,"Nie pokazuj żadnych symboli przy walutach, takich jak $"
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +330, (Half Day),(Pół dnia)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +374, (Half Day),(Pół dnia)
 DocType: Supplier,Credit Days,
 DocType: Leave Type,Is Carry Forward,
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +478,Get Items from BOM,Weź produkty z zestawienia materiałowego
@@ -4001,7 +3837,7 @@
 apps/erpnext/erpnext/config/manufacturing.py +120,Bill of Materials,Zestawienie materiałów
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +77,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Wiersz {0}: Typ i Partia Partia jest wymagane w przypadku otrzymania / rachunku Płatne {1}
 DocType: Dropbox Backup,Send Notifications To,
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html +26,Ref Date,Ref Data
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +54,Ref Date,Ref Data
 DocType: Employee,Reason for Leaving,Powód odejścia
 DocType: Expense Claim Detail,Sanctioned Amount,
 DocType: GL Entry,Is Opening,
@@ -4009,4 +3845,3 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +188,Account {0} does not exist,Konto {0} nie istnieje
 DocType: Account,Cash,Gotówka
 DocType: Employee,Short biography for website and other publications.,
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +31,Please create Salary Structure for employee {0},
diff --git a/erpnext/translations/pt-BR.csv b/erpnext/translations/pt-BR.csv
index 049ac33..da703ff 100644
--- a/erpnext/translations/pt-BR.csv
+++ b/erpnext/translations/pt-BR.csv
@@ -1,13 +1,12 @@
 DocType: Employee,Salary Mode,Modo de salário
 DocType: Cost Center,"Select Monthly Distribution, if you want to track based on seasonality.","Selecione distribuição mensal, se você quer acompanhar com base na sazonalidade."
 DocType: Employee,Divorced,Divorciado
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +86,Warning: Same item has been entered multiple times.,Atenção: O mesmo artigo foi introduzido várias vezes.
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +80,Warning: Same item has been entered multiple times.,Atenção: O mesmo artigo foi introduzido várias vezes.
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +96,Items already synced,Itens já sincronizado
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,Permitir item a ser adicionado várias vezes em uma transação
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,Anular Material de Visita {0} antes de cancelar esta solicitação de garantia
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +19,Consumer Products,Produtos para o Consumidor
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,Produtos para o Consumidor
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +68,Please select Party Type first,"Por favor, selecione Partido Tipo primeiro"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +90,Annealing,Recozimento
 DocType: Item,Customer Items,Itens de clientes
 apps/erpnext/erpnext/accounts/doctype/account/account.py +45,Account {0}: Parent account {1} can not be a ledger,Conta {0}: A Conta Pai {1} não pode ser um livro-razão
 DocType: Item,Publish Item to hub.erpnext.com,Publicar Item para hub.erpnext.com
@@ -20,15 +19,14 @@
 DocType: About Us Settings,Website,Site
 DocType: POS Profile,Applicable for User,Aplicável para o usuário
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +169,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Parou ordem de produção não pode ser cancelado, desentupir-lo primeiro para cancelar"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +23,Compaction plus sintering,Compactação mais sinterização
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,Currency is required for Price List {0},É necessário informar a Moeda na Lista de Preço {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Será calculado na transação.
 DocType: Purchase Order,Customer Contact,Contato do cliente
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +549,From Material Request,Do Pedido de materiais
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +572,From Material Request,Do Pedido de materiais
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} Árvore
 DocType: Job Applicant,Job Applicant,Candidato a emprego
 apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,Não há mais resultados.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +78,Legal,legal
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +34,Legal,legal
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +114,Actual type tax cannot be included in Item rate in row {0},Tipo de imposto real não pode ser incluído na tarifa do item na linha {0}
 DocType: C-Form,Customer,Cliente
 DocType: Purchase Receipt Item,Required By,Exigido por
@@ -43,7 +41,6 @@
 DocType: Manufacturing Settings,Default 10 mins,Padrão 10 minutos
 DocType: Leave Type,Leave Type Name,Nome do Tipo de Licença
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +148,Series Updated Successfully,Série atualizado com sucesso
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +150,Stitching,Costura
 DocType: Pricing Rule,Apply On,Aplicar Em
 DocType: Item Price,Multiple Item prices.,Vários preços item.
 ,Purchase Order Items To Be Received,Comprar itens para ser recebido
@@ -51,8 +48,8 @@
 DocType: Quality Inspection Reading,Parameter,Parâmetro
 apps/erpnext/erpnext/projects/doctype/project/project.py +43,Expected End Date can not be less than Expected Start Date,Data prevista End não pode ser menor do que o esperado Data de Início
 apps/erpnext/erpnext/utilities/transaction_base.py +104,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Fila # {0}: Taxa deve ser o mesmo que {1}: {2} ({3} / {4})
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +189,New Leave Application,Aplicação deixar Nova
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +134,Bank Draft,Cheque Administrativo
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +204,New Leave Application,Aplicação deixar Nova
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +134,Bank Draft,Cheque Administrativo
 DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,1. Para manter o código de item do cliente e para torná-los pesquisáveis ​​com base em seu código use esta opção
 DocType: Mode of Payment Account,Mode of Payment Account,Modo de pagamento da conta
 apps/erpnext/erpnext/stock/doctype/item/item.js +34,Show Variants,Mostrar Variantes
@@ -64,25 +61,23 @@
 DocType: Production Plan Item,Production Plan Item,Item do plano de produção
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +141,User {0} is already assigned to Employee {1},Usuário {0} já está atribuído ao funcionário {1}
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +13,Make new POS Profile,Faça novo perfil POS
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +31,Health Care,Atenção à Saúde
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,Atenção à Saúde
 DocType: Purchase Invoice,Monthly,Mensal
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +66,Delay in payment (Days),Atraso no pagamento (Dias)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +494,Invoice,Fatura
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +519,Invoice,Fatura
 DocType: Maintenance Schedule Item,Periodicity,Periodicidade
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +357,Email Address,Endereço De Email
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +21,Defense,Defesa
+apps/erpnext/erpnext/public/js/setup_wizard.js +107,Email Address,Endereço De Email
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,Defesa
 DocType: Company,Abbr,Abrev
 DocType: Appraisal Goal,Score (0-5),Pontuação (0-5)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +193,Row {0}: {1} {2} does not match with {3},Row {0}: {1} {2} não corresponde com {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +67,Row # {0}:,Fila # {0}:
 DocType: Delivery Note,Vehicle No,No veículo
 apps/erpnext/erpnext/public/js/pos/pos.js +528,Please select Price List,"Por favor, selecione Lista de Preço"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +162,Woodworking,Carpintaria
 DocType: Production Order Operation,Work In Progress,Trabalho em andamento
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +153,3D printing,Impressão 3D
 DocType: Employee,Holiday List,Lista de feriado
 DocType: Time Log,Time Log,Tempo Log
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +530,Accountant,Contador
+apps/erpnext/erpnext/public/js/setup_wizard.js +274,Accountant,Contador
 DocType: Cost Center,Stock User,Estoque de Usuário
 DocType: Company,Phone No,Nº de telefone
 DocType: Time Log,"Log of Activities performed by users against Tasks that can be used for tracking time, billing.","Log de atividades realizadas por usuários contra as tarefas que podem ser usados ​​para controle de tempo, de faturamento."
@@ -98,18 +93,19 @@
 DocType: Bin,Quantity Requested for Purchase,Quantidade Solicitada para Compra
 DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name","Anexar arquivo .csv com duas colunas, uma para o nome antigo e um para o novo nome"
 DocType: Packed Item,Parent Detail docname,Docname do Detalhe pai
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Kg,Kg.
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Kg,Kg.
 apps/erpnext/erpnext/config/hr.py +48,Opening for a Job.,Vaga de emprego.
 DocType: Item Attribute,Increment,Incremento
 apps/erpnext/erpnext/public/js/stock_analytics.js +63,Select Warehouse...,Selecione Warehouse ...
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +6,Advertising,Publicidade
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,Publicidade
+apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,Mesma empresa está inscrita mais de uma vez
 DocType: Employee,Married,Casado
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +389,Stock cannot be updated against Delivery Note {0},Banco não pode ser atualizado contra entrega Nota {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +391,Stock cannot be updated against Delivery Note {0},Banco não pode ser atualizado contra entrega Nota {0}
 DocType: Payment Reconciliation,Reconcile,conciliar
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +30,Grocery,mercearia
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,mercearia
 DocType: Quality Inspection Reading,Reading 1,Leitura 1
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Make Bank Entry,Faça Banco Entry
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +40,Pension Funds,Fundos de Pensão
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,Fundos de Pensão
 apps/erpnext/erpnext/accounts/doctype/account/account.py +142,Warehouse is mandatory if account type is Warehouse,Armazém é obrigatória se o tipo de conta é Armazém
 DocType: SMS Center,All Sales Person,Todos os Vendedores
 DocType: Lead,Person Name,Nome Pessoa
@@ -131,7 +127,7 @@
 DocType: Quality Inspection,Get Specification Details,Obter detalhes da Especificação
 DocType: Lead,Interested,Interessado
 apps/erpnext/erpnext/config/manufacturing.py +14,Bill of Material,Lista de Materiais
-apps/erpnext/erpnext/public/js/stock_analytics.js +45,Opening,Abertura
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +158,Opening,Abertura
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},A partir de {0} a {1}
 DocType: Item,Copy From Item Group,Copiar do item do grupo
 DocType: Journal Entry,Opening Entry,Abertura Entry
@@ -145,23 +141,22 @@
 DocType: Employee Education,Under Graduate,Em Graduação
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +22,Target On,Alvo Em
 DocType: BOM,Total Cost,Custo Total
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +99,Reaming,Mandrilagem
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +9,Activity Log:,Log de Atividade:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +199,Item {0} does not exist in the system or has expired,Item {0} não existe no sistema ou expirou
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +44,Real Estate,imóveis
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +44,Real Estate,imóveis
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +4,Statement of Account,Extrato de conta
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +41,Pharmaceuticals,Pharmaceuticals
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,Pharmaceuticals
 DocType: Expense Claim Detail,Claim Amount,Valor Requerido
 DocType: Employee,Mr,Sr.
 DocType: Custom Script,Client,Cliente
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,Fornecedor Tipo / Fornecedor
 DocType: Naming Series,Prefix,Prefixo
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Consumable,Consumíveis
+apps/erpnext/erpnext/public/js/setup_wizard.js +359,Consumable,Consumíveis
 DocType: Upload Attendance,Import Log,Importar Log
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.js +19,Send,Enviar
 DocType: Sales Invoice Item,Delivered By Supplier,Proferido por Fornecedor
 DocType: SMS Center,All Contact,Todo o Contato
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +164,Annual Salary,Salário Anual
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +164,Annual Salary,Salário Anual
 DocType: Period Closing Voucher,Closing Fiscal Year,Encerramento do exercício fiscal
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +69,Stock Expenses,despesas Stock
 DocType: Newsletter,Email Sent?,E-mail enviado?
@@ -169,7 +164,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +92,Show Time Logs,Show Time Logs
 DocType: Journal Entry Account,Credit in Company Currency,Crédito em Moeda Empresa
 DocType: Delivery Note,Installation Status,Estado da Instalação
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +115,Accepted + Rejected Qty must be equal to Received quantity for Item {0},A qtd Aceita + Rejeitado deve ser igual a quantidade recebida para o item {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +118,Accepted + Rejected Qty must be equal to Received quantity for Item {0},A qtd Aceita + Rejeitado deve ser igual a quantidade recebida para o item {0}
 DocType: Item,Supply Raw Materials for Purchase,Abastecimento de Matérias-Primas para a Compra
 apps/erpnext/erpnext/stock/get_item_details.py +133,Item {0} must be a Purchase Item,Item {0} deve ser um item de compra
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
@@ -177,19 +172,17 @@
  Todas as datas e empregado combinação no período selecionado virá no modelo, com registros de freqüência existentes"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +446,Item {0} is not active or end of life has been reached,Item {0} não está ativo ou fim de vida útil foi atingido
 DocType: Time Log Batch,Will be updated after Sales Invoice is Submitted.,Será atualizado após a fatura de vendas ser Submetida.
-apps/erpnext/erpnext/controllers/accounts_controller.py +493,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Para incluir impostos na linha {0} na taxa de Item, os impostos em linhas {1} também deve ser incluída"
+apps/erpnext/erpnext/controllers/accounts_controller.py +494,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Para incluir impostos na linha {0} na taxa de Item, os impostos em linhas {1} também deve ser incluída"
 apps/erpnext/erpnext/config/hr.py +90,Settings for HR Module,Configurações para o Módulo de RH
 DocType: SMS Center,SMS Center,Centro de SMS
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +78,Straightening,Endireitando
 DocType: BOM Replace Tool,New BOM,Nova LDM
 apps/erpnext/erpnext/config/projects.py +28,Batch Time Logs for billing.,Batch Logs Tempo para o faturamento.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +15,Countergravity casting,Fundição Countergravity
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +30,Newsletter has already been sent,Boletim informativo já foi enviado
 DocType: Lead,Request Type,Tipo de Solicitação
 DocType: Leave Application,Reason,Motivo
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +14,Broadcasting,Radio-difusão
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +140,Execution,execução
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +364,The first user will become the System Manager (you can change this later).,O primeiro usuário será o System Manager (você pode mudar isso mais tarde).
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,Radio-difusão
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +140,Execution,execução
+apps/erpnext/erpnext/public/js/setup_wizard.js +114,The first user will become the System Manager (you can change this later).,O primeiro usuário será o System Manager (você pode mudar isso mais tarde).
 apps/erpnext/erpnext/config/manufacturing.py +39,Details of the operations carried out.,Os detalhes das operações realizadas.
 DocType: Serial No,Maintenance Status,Estado da manutenção
 apps/erpnext/erpnext/config/stock.py +263,Items and Pricing,Itens e Preços
@@ -206,7 +199,6 @@
 DocType: Pricing Rule,Discount on Price List Rate (%),% de Desconto sobre o Preço da Lista de Preços
 apps/frappe/frappe/public/js/frappe/form/print.js +96,Start,começo
 DocType: User,First Name,Nome
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +12,Full-mold casting,De fundição de molde completa
 DocType: Offer Letter,Select Terms and Conditions,Selecione os Termos e Condições
 DocType: Production Planning Tool,Sales Orders,Pedidos de Vendas
 DocType: Purchase Taxes and Charges,Valuation,Avaliação
@@ -218,8 +210,7 @@
 DocType: Bank Reconciliation,Bank Account,Conta Bancária
 DocType: Leave Type,Allow Negative Balance,Permitir saldo negativo
 DocType: Selling Settings,Default Territory,Território padrão
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +53,Television,televisão
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +138,Gashing,Rasgando
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,televisão
 DocType: Production Order Operation,Updated via 'Time Log',Atualizado via 'Time Log'
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +82,Account {0} does not belong to Company {1},A Conta {0} não pertence à Empresa {1}
 DocType: Naming Series,Series List for this Transaction,Lista de séries para esta transação
@@ -234,14 +225,13 @@
 DocType: Leave Allocation,Add unused leaves from previous allocations,Acrescente as folhas não utilizadas de atribuições anteriores
 apps/erpnext/erpnext/controllers/recurring_document.py +206,Next Recurring {0} will be created on {1},Próximo Recorrente {0} será criado em {1}
 DocType: Newsletter List,Total Subscribers,Total de Assinantes
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +575,Contact Name,Nome do Contato
+,Contact Name,Nome do Contato
 DocType: Production Plan Item,SO Pending Qty,Qtde. pendente na OV
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Cria folha de pagamento para os critérios mencionados acima.
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,Pedido de Compra.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +107,Double housing,Caixa de duas
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +156,Only the selected Leave Approver can submit this Leave Application,Somente o Leave aprovador selecionado pode enviar este pedido de férias
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +171,Only the selected Leave Approver can submit this Leave Application,Somente o Leave aprovador selecionado pode enviar este pedido de férias
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,Aliviar A data deve ser maior que Data de Juntando
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +172,Leaves per Year,Folhas por ano
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +172,Leaves per Year,Folhas por ano
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup > Settings > Naming Series,"Por favor, defina Naming Series para {0} em Configurar&gt; Configurações&gt; Naming Series"
 DocType: Time Log,Will be updated when batched.,Será atualizado quando agrupadas.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +104,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,Row {0}: Verifique 'É Advance' contra Conta {1} se esta é uma entrada antecedência.
@@ -250,25 +240,24 @@
 DocType: Item Website Specification,Item Website Specification,Especificação do Site do Item
 DocType: Dropbox Backup,Dropbox Access Key,Dropbox Chave de Acesso
 DocType: Payment Tool,Reference No,Número de referência
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +348,Leave Blocked,Deixe Bloqueados
-apps/erpnext/erpnext/stock/doctype/item/item.py +535,Item {0} has reached its end of life on {1},Item {0} chegou ao fim da vida em {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +392,Leave Blocked,Deixe Bloqueados
+apps/erpnext/erpnext/stock/doctype/item/item.py +539,Item {0} has reached its end of life on {1},Item {0} chegou ao fim da vida em {1}
 apps/erpnext/erpnext/accounts/utils.py +339,Annual,Anual
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Da Reconciliação item
 DocType: Stock Entry,Sales Invoice No,Nº da Nota Fiscal de Venda
 DocType: Material Request Item,Min Order Qty,Pedido Mínimo
 DocType: Lead,Do Not Contact,Não entre em contato
 DocType: Sales Invoice,The unique id for tracking all recurring invoices. It is generated on submit.,A ID exclusiva para acompanhar todas as facturas recorrentes. Ele é gerado em enviar.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +93,Software Developer,Software Developer
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +93,Software Developer,Software Developer
 DocType: Item,Minimum Order Qty,Pedido Mínimo
 DocType: Pricing Rule,Supplier Type,Tipo de Fornecedor
 DocType: Item,Publish in Hub,Publicar em Hub
 ,Terretory,terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +555,Item {0} is cancelled,Item {0} é cancelada
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +598,Material Request,Pedido de material
+apps/erpnext/erpnext/stock/doctype/item/item.py +559,Item {0} is cancelled,Item {0} é cancelada
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +607,Material Request,Pedido de material
 DocType: Bank Reconciliation,Update Clearance Date,Atualizar Data Liquidação
 DocType: Item,Purchase Details,Detalhes da compra
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +323,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},Item {0} não encontrado em &#39;matérias-primas fornecidas &quot;na tabela Ordem de Compra {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +129,Wire brushing,Escova de aço
 DocType: Employee,Relation,Relação
 DocType: Shipping Rule,Worldwide Shipping,Envio para todo o planeta
 apps/erpnext/erpnext/config/selling.py +23,Confirmed orders from Customers.,Pedidos confirmados de clientes.
@@ -284,12 +273,11 @@
 DocType: Supplier,Address HTML,Endereço HTML
 DocType: Lead,Mobile No.,Telefone Celular.
 DocType: Maintenance Schedule,Generate Schedule,Gerar Agenda
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +81,Hubbing,Hubbing
 DocType: Purchase Invoice Item,Expense Head,Conta de despesas
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +86,Please select Charge Type first,Por favor seleccione Carga Tipo primeiro
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,Latest
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +395,Max 5 characters,Max 5 caracteres
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +195,Select Your Language,Selecione seu idioma
+apps/erpnext/erpnext/public/js/setup_wizard.js +143,Max 5 characters,Max 5 caracteres
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +245,Select Your Language,Selecione seu idioma
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,O primeiro Deixe Approver na lista vai ser definido como o Leave Approver padrão
 DocType: Manufacturing Settings,"Disables creation of time logs against Production Orders.
 Operations shall not be tracked against Production Order",Desabilita a criação de logs de tempo contra ordens de produção. As operações não devem ser rastreados contra a ordem de produção
@@ -301,8 +289,6 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +34,Item {0} must be Service Item,Item {0} deve ser item de serviço
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +303,Completed Qty can not be greater than 'Qty to Manufacture',"Qtde concluida não pode ser maior do que ""Qtde de Fabricação"""
 DocType: DocType,Administrator,Administrador
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +136,Laser drilling,Perfuração laser
-DocType: Stock UOM Replace Utility,New Stock UOM,Nova UDM de estoque
 DocType: Period Closing Voucher,Closing Account Head,Conta de Fechamento
 DocType: Employee,External Work History,Histórico Profissional no Exterior
 apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,Erro de referência circular
@@ -311,18 +297,15 @@
 DocType: Lead,Industry,Indústria
 DocType: Employee,Job Profile,Perfil da Vaga
 DocType: Newsletter,Newsletter,Boletim informativo
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +84,Hydroforming,Hydroforming
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +49,Necking,Carícias
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Notificar por e-mail sobre a criação de Pedido de material automático
 DocType: Journal Entry,Multi Currency,Multi Moeda
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +51,Item is updated,Item é atualizado
 DocType: Async Task,System Manager,System Manager
 DocType: Payment Reconciliation Invoice,Invoice Type,Tipo de Fatura
 DocType: Sales Invoice Item,Delivery Note,Guia de Remessa
 DocType: Dropbox Backup,Allow Dropbox Access,Permitir Acesso Dropbox
 apps/erpnext/erpnext/config/learn.py +72,Setting up Taxes,Configurando Impostos
 apps/erpnext/erpnext/accounts/utils.py +189,Payment Entry has been modified after you pulled it. Please pull it again.,"Entrada de pagamento foi modificado depois que você puxou-o. Por favor, puxe-o novamente."
-apps/erpnext/erpnext/stock/doctype/item/item.py +343,{0} entered twice in Item Tax,{0} entrou duas vezes no Imposto do Item
+apps/erpnext/erpnext/stock/doctype/item/item.py +347,{0} entered twice in Item Tax,{0} entrou duas vezes no Imposto do Item
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +105,Summary for this week and pending activities,Resumo para esta semana e atividades pendentes
 DocType: Workstation,Rent Cost,Rent Custo
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +74,Please select month and year,Selecione mês e ano
@@ -339,24 +322,22 @@
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,Taxa na qual a moeda do cliente é convertida para a moeda base do cliente
 DocType: Features Setup,"Available in BOM, Delivery Note, Purchase Invoice, Production Order, Purchase Order, Purchase Receipt, Sales Invoice, Sales Order, Stock Entry, Timesheet","Disponível em LDM, Nota de Entrega, Fatura de Compra, Ordem de Produção, Ordem de Compra, Recibo de compra, Nota Fiscal de Venda, Ordem de Venda, Entrada no Estoque, Quadro de Horários"
 DocType: Item Tax,Tax Rate,Taxa de Imposto
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Select Item,Selecionar item
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +540,Select Item,Selecionar item
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +143,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","Item: {0} gerido por lotes, não pode ser conciliada com \
  da Reconciliação, em vez usar da Entry"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +259,Purchase Invoice {0} is already submitted,Compra Invoice {0} já é submetido
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +262,Purchase Invoice {0} is already submitted,Compra Invoice {0} já é submetido
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Batch No must be same as {1} {2},Fila # {0}: Lote n deve ser o mesmo que {1} {2}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Convert to non-Group,Converter para não-Grupo
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +55,Purchase Receipt must be submitted,Recibo de compra devem ser apresentados
-DocType: Stock UOM Replace Utility,Current Stock UOM,Unidade de Medida do Estoque Atual
 apps/erpnext/erpnext/config/stock.py +53,Batch (lot) of an Item.,Lote de um item.
 DocType: C-Form Invoice Detail,Invoice Date,Data da nota fiscal
 DocType: GL Entry,Debit Amount,Débito Montante
 apps/erpnext/erpnext/accounts/party.py +223,There can only be 1 Account per Company in {0} {1},Pode haver apenas uma conta por empresa em {0} {1}
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Your email address,Seu endereço de email
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +194,Please see attachment,"Por favor, veja anexo"
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +203,Please see attachment,"Por favor, veja anexo"
 DocType: Purchase Order,% Received,Recebido %
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +109,Water jet cutting,Corte do jato de água
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +24,Setup Already Complete!!,Instalação já está completa !
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +20,Setup Already Complete!!,Instalação já está completa !
 ,Finished Goods,Produtos Acabados
 DocType: Delivery Note,Instructions,Instruções
 DocType: Quality Inspection,Inspected By,Inspecionado por
@@ -371,6 +352,7 @@
 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.,"Por favor, não criar contas para clientes e fornecedores. Eles são criados diretamente do cliente / fornecedor mestres."
 DocType: Currency Exchange,Currency Exchange,Câmbio
 DocType: Purchase Invoice Item,Item Name,Nome do Item
+DocType: Authorization Rule,Approving User  (above authorized value),Aprovando Usuário (acima do valor autorizado)
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Credit Balance,Saldo credor
 DocType: Employee,Widowed,Viúvo(a)
 DocType: Production Planning Tool,"Items to be requested which are ""Out of Stock"" considering all warehouses based on projected qty and minimum order qty","Os itens a serem solicitados que estão &quot;Fora de Estoque&quot;, considerando todos os almoxarifados com base na quantidade projetada e pedido mínimo"
@@ -380,11 +362,10 @@
 ,Purchase Register,Compra Registre
 DocType: Landed Cost Item,Applicable Charges,Encargos aplicáveis
 DocType: Workstation,Consumable Cost,Custo dos consumíveis
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,{0} ({1}) must have role 'Leave Approver',{0} ({1}) deve ter papel 'Liberador'
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +167,{0} ({1}) must have role 'Leave Approver',{0} ({1}) deve ter papel 'Liberador'
 DocType: Purchase Receipt,Vehicle Date,Veículo Data
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +39,Medical,Medicamentos
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +39,Medical,Medicamentos
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,Motivo para perder
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +36,Tube beading,Tubo beading
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},"Workstation é fechado nas seguintes datas, conforme lista do feriado: {0}"
 DocType: Employee,Single,Único
 DocType: Issue,Attachment,Anexos
@@ -405,10 +386,8 @@
 DocType: Account,Is Group,É o grupo
 DocType: Stock Settings,Automatically Set Serial Nos based on FIFO,Serial N ° s automaticamente definido com base na FIFO
 DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,Verificar Fornecedor Nota Fiscal Número Unicidade
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +31,Thermoforming,Termoformagem
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +66,Slitting,Cortando
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +57,'To Case No.' cannot be less than 'From Case No.','Número do Caso Final' não pode ser menor que o 'Número do Caso Inicial'
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +104,Non Profit,sem Fins Lucrativos
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +104,Non Profit,sem Fins Lucrativos
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_list.js +7,Not Started,Não Iniciado
 DocType: Lead,Channel Partner,Parceiro de Canal
 DocType: Account,Old Parent,Pai Velho
@@ -417,13 +396,12 @@
 apps/erpnext/erpnext/config/manufacturing.py +74,Global settings for all manufacturing processes.,As configurações globais para todos os processos de fabricação.
 DocType: Accounts Settings,Accounts Frozen Upto,Contas congeladas até
 DocType: SMS Log,Sent On,Enviado em
-apps/erpnext/erpnext/stock/doctype/item/item.py +512,Attribute {0} selected multiple times in Attributes Table,Atributo {0} selecionada várias vezes na tabela de atributos
+apps/erpnext/erpnext/stock/doctype/item/item.py +516,Attribute {0} selected multiple times in Attributes Table,Atributo {0} selecionada várias vezes na tabela de atributos
 DocType: Sales Order,Not Applicable,Não Aplicável
 apps/erpnext/erpnext/config/hr.py +140,Holiday master.,Mestre férias .
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +19,Shell molding,Moldagem Shell
 DocType: Material Request Item,Required Date,Data Obrigatória
 DocType: Delivery Note,Billing Address,Endereço de Cobrança
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +644,Please enter Item Code.,"Por favor, insira o Código Item."
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +648,Please enter Item Code.,"Por favor, insira o Código Item."
 DocType: BOM,Costing,Custeio
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount","Se marcado, o valor do imposto será considerado como já incluído na Impressão de Taxa / Impressão do Valor"
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,Qtde
@@ -433,7 +411,7 @@
 DocType: Item Attribute,To Range,Para Gama
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Títulos e depósitos
 DocType: Features Setup,Imports,Importações
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +144,Adhesive bonding,Ligação adesiva
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +77,Total leaves allocated is mandatory,Total de folhas alocados é obrigatória
 DocType: Job Opening,Description of a Job Opening,Descrição de uma vaga de emprego
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +102,Pending activities for today,Atividades pendentes para hoje
 apps/erpnext/erpnext/config/hr.py +28,Attendance record.,Registro de comparecimento.
@@ -441,26 +419,25 @@
 DocType: Sales Order Item,Used for Production Plan,Usado para o Plano de Produção
 DocType: System Settings,Loading...,Carregando ...
 DocType: DocField,Password,Senha
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +155,Fused deposition modeling,Modelagem deposição fundida
 DocType: Manufacturing Settings,Time Between Operations (in mins),Time Between Operações (em minutos)
 DocType: Customer,Buyer of Goods and Services.,Comprador de Produtos e Serviços.
 DocType: Journal Entry,Accounts Payable,Contas a Pagar
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +24,Add Subscribers,Adicionar Inscritos
 apps/erpnext/erpnext/public/js/feature_setup.js +220,""" does not exists",""" não existe"
 DocType: Pricing Rule,Valid Upto,Válido até
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +564,List a few of your customers. They could be organizations or individuals.,Lista de alguns de seus clientes. Eles podem ser empresas ou pessoas físicas.
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,List a few of your customers. They could be organizations or individuals.,Lista de alguns de seus clientes. Eles podem ser empresas ou pessoas físicas.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Direct Income,Resultado direto
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +33,"Can not filter based on Account, if grouped by Account","Não é possível filtrar com base em conta , se agrupados por Conta"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +88,Administrative Officer,Escritório Administrativo
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Administrative Officer,Escritório Administrativo
 DocType: Payment Tool,Received Or Paid,Recebidos ou pagos
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +318,Please select Company,"Por favor, selecione Empresa"
 DocType: Stock Entry,Difference Account,Conta Diferença
 apps/erpnext/erpnext/projects/doctype/task/task.py +44,Cannot close task as its dependant task {0} is not closed.,Não pode fechar tarefa como sua tarefa dependente {0} não está fechado.
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +305,Please enter Warehouse for which Material Request will be raised,"Por favor, indique Armazém para que Pedido de materiais serão levantados"
 DocType: Production Order,Additional Operating Cost,Custo Operacional Adicional
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +20,Cosmetics,Cosméticos
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,Cosméticos
 DocType: DocField,Type,Tipo
-apps/erpnext/erpnext/stock/doctype/item/item.py +417,"To merge, following properties must be same for both items","Para mesclar , seguintes propriedades devem ser os mesmos para ambos os itens"
+apps/erpnext/erpnext/stock/doctype/item/item.py +421,"To merge, following properties must be same for both items","Para mesclar , seguintes propriedades devem ser os mesmos para ambos os itens"
 DocType: Communication,Subject,Assunto
 DocType: Shipping Rule,Net Weight,Peso Líquido
 DocType: Employee,Emergency Phone,Telefone de emergência
@@ -470,7 +447,6 @@
 DocType: Journal Entry,Difference (Dr - Cr),Diferença ( Dr - Cr)
 DocType: Account,Profit and Loss,Lucros e perdas
 apps/erpnext/erpnext/config/stock.py +293,Managing Subcontracting,Gerenciando Subcontratação
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +58,New UOM must NOT be of type Whole Number,Nova UOM NÃO deve ser do tipo inteiro Número
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Furniture and Fixture,Móveis e utensílios
 DocType: Quotation,Rate at which Price list currency is converted to company's base currency,Taxa na qual a moeda da lista de preços é convertida para a moeda base da empresa
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Account {0} does not belong to company: {1},A Conta {0} não pertence à Empresa: {1}
@@ -489,14 +465,14 @@
 DocType: Purchase Invoice,Supplier Invoice No,Fornecedor factura n
 DocType: Territory,For reference,Para referência
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +154,"Cannot delete Serial No {0}, as it is used in stock transactions","Não é possível excluir Serial No {0}, como ele é usado em transações de ações"
-apps/erpnext/erpnext/public/js/account_tree_grid.js +52,Closing (Cr),Fechamento (Cr)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +227,Closing (Cr),Fechamento (Cr)
 DocType: Serial No,Warranty Period (Days),Período de Garantia (Dias)
 DocType: Installation Note Item,Installation Note Item,Item da Nota de Instalação
 ,Pending Qty,Pendente Qtde
 DocType: Job Applicant,Thread HTML,Tópico HTML
 DocType: Company,Ignore,Ignorar
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +86,SMS sent to following numbers: {0},SMS enviado a seguintes números: {0}
-apps/erpnext/erpnext/controllers/buying_controller.py +135,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Fornecedor Armazém obrigatório para sub- contratados Recibo de compra
+apps/erpnext/erpnext/controllers/buying_controller.py +126,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Fornecedor Armazém obrigatório para sub- contratados Recibo de compra
 DocType: Pricing Rule,Valid From,Válido de
 DocType: Sales Invoice,Total Commission,Total da Comissão
 DocType: Pricing Rule,Sales Partner,Parceiro de Vendas
@@ -504,7 +480,7 @@
 DocType: Monthly Distribution,"**Monthly Distribution** helps you distribute your budget across months if you have seasonality in your business.
 
 To distribute a budget using this distribution, set this **Monthly Distribution** in the **Cost Center**","A **Distribuição Mensal** ajuda a ratear o seu orçamento através dos meses, se você possui sazonalidade em seu negócio. Para ratear um orçamento usando esta distribuição, defina a**Distribuição Mensal** no **Centro de Custo**"
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +183,No records found in the Invoice table,Nenhum registro encontrado na tabela de fatura
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +130,No records found in the Invoice table,Nenhum registro encontrado na tabela de fatura
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +20,Please select Company and Party Type first,"Por favor, selecione Companhia e Festa Tipo primeiro"
 apps/erpnext/erpnext/config/accounts.py +84,Financial / accounting year.,Exercício / contabilidade.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","Desculpe, os números de ordem não podem ser mescladas"
@@ -520,25 +496,25 @@
 DocType: Sales Order,Billing and Delivery Status,Faturamento e Entrega Estado
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Repita os clientes
 DocType: Leave Control Panel,Allocate,Alocar
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +16,Previous,Anterior
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard_page.html +16,Previous,Anterior
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +620,Sales Return,Retorno de Vendas
 DocType: Production Planning Tool,Select Sales Orders from which you want to create Production Orders.,Selecione as Ordens de Venda a partir das quais você deseja criar Ordens de Produção.
 DocType: Item,Delivered by Supplier (Drop Ship),Entregue por Fornecedor (Drop Ship)
 apps/erpnext/erpnext/config/hr.py +120,Salary components.,Componentes salariais.
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,Banco de dados de clientes potenciais.
+DocType: Authorization Rule,Customer or Item,Cliente ou Item
 apps/erpnext/erpnext/config/crm.py +17,Customer database.,Banco de Dados de Clientes
 DocType: Quotation,Quotation To,Cotação para
 DocType: Lead,Middle Income,Rendimento Médio
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),Abertura (Cr)
 apps/erpnext/erpnext/accounts/utils.py +193,Allocated amount can not be negative,Montante alocado não pode ser negativo
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +123,Tumbling,Tombo
 DocType: Purchase Order Item,Billed Amt,Valor Faturado
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,Um Depósito lógico contra o qual as entradas de estoque são feitas.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +92,Reference No & Reference Date is required for {0},Número de referência e Referência Data é necessário para {0}
 DocType: Event,Wednesday,Quarta-feira
 DocType: Sales Invoice,Customer's Vendor,Vendedor do cliente
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +214,Production Order is Mandatory,Ordem de produção é obrigatória
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +139,Proposal Writing,Proposta Redação
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,Proposal Writing,Proposta Redação
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,Outro Vendas Pessoa {0} existe com o mesmo ID de Employee
 apps/erpnext/erpnext/stock/stock_ledger.py +336,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},Negativo Banco de Erro ( {6} ) para item {0} no Armazém {1} em {2} {3} em {4} {5}
 DocType: Fiscal Year Company,Fiscal Year Company,Ano Fiscal Empresa
@@ -561,7 +537,7 @@
 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.","Então Preços Regras são filtradas com base no Cliente, Grupo de Clientes, Território, fornecedor, fornecedor Tipo, Campanha, Parceiro de vendas etc"
 apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.py +179,Please install dropbox python module,"Por favor, instale o Dropbox módulo python"
 DocType: Employee,Passport Number,Número do Passaporte
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +82,Manager,Gerente
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Manager,Gerente
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +494,From Purchase Receipt,De Recibo de compra
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +219,Same item has been entered multiple times.,O mesmo artigo foi introduzido várias vezes.
 DocType: SMS Settings,Receiver Parameter,Parâmetro do recebedor
@@ -569,10 +545,9 @@
 DocType: Sales Person,Sales Person Targets,Metas do Vendedor
 apps/frappe/frappe/public/js/frappe/form/workflow.js +116,To,para
 apps/frappe/frappe/templates/base.html +145,Please enter email address,Por favor insira o endereço de email
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +35,End tube forming,Extremidade de tubo formando
 DocType: Production Order Operation,In minutes,Em questão de minutos
 DocType: Issue,Resolution Date,Data da Resolução
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +635,Please set default Cash or Bank account in Mode of Payment {0},Defina Caixa padrão ou conta bancária no Modo de pagamento {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +637,Please set default Cash or Bank account in Mode of Payment {0},Defina Caixa padrão ou conta bancária no Modo de pagamento {0}
 DocType: Selling Settings,Customer Naming By,Cliente de nomeação
 apps/erpnext/erpnext/accounts/doctype/account/account.js +67,Convert to Group,Converter em Grupo
 DocType: Activity Cost,Activity Type,Tipo da Atividade
@@ -580,12 +555,12 @@
 DocType: Customer,Fixed Days,Dias Fixos
 DocType: Sales Invoice,Packing List,Lista de embalagem
 apps/erpnext/erpnext/config/buying.py +28,Purchase Orders given to Suppliers.,Ordens de Compra dadas a fornecedores.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +43,Publishing,Publishing
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +43,Publishing,Publishing
 DocType: Activity Cost,Projects User,Projetos de Usuário
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Consumed,Consumido
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +198,{0}: {1} not found in Invoice Details table,{0}: {1} não foi encontrado na tabela Detalhes da Nota Fiscal
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,{0}: {1} not found in Invoice Details table,{0}: {1} não foi encontrado na tabela Detalhes da Nota Fiscal
 DocType: Company,Round Off Cost Center,Termine Centro de Custo
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +208,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Visita de manutenção {0} deve ser cancelado antes de cancelar esta ordem de venda
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +203,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Visita de manutenção {0} deve ser cancelado antes de cancelar esta ordem de venda
 DocType: Material Request,Material Transfer,Transferência de material
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +56,Opening (Dr),Abertura (Dr)
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},Postando timestamp deve ser posterior a {0}
@@ -597,7 +572,6 @@
 DocType: Pricing Rule,Sales Manager,Gerente De Vendas
 apps/frappe/frappe/public/js/frappe/model/model.js +492,Rename,renomear
 DocType: Journal Entry,Write Off Amount,Eliminar Valor
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +52,Bending,Dobrando
 apps/frappe/frappe/core/page/user_permissions/user_permissions.js +246,Allow User,Permitir que o usuário
 DocType: Journal Entry,Bill No,Fatura Nº
 DocType: Purchase Invoice,Quarterly,Trimestralmente
@@ -607,17 +581,16 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Please enter item details,Por favor insira os detalhes do item
 DocType: Purchase Receipt,Other Details,Outros detalhes
 DocType: Account,Accounts,Contas
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +67,Marketing,marketing
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +65,Straight shearing,Em linha reta de corte
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +67,Marketing,marketing
 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.,Para acompanhar o item em documentos de vendas e de compras com base em seus números de série. Isso também pode ser usado para rastrear detalhes sobre a garantia do produto.
 DocType: Purchase Receipt Item Supplied,Current Stock,Estoque Atual
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +99,Rejected Warehouse is mandatory against regected item,Armazém Rejeitado é obrigatória na rubrica regected
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +102,Rejected Warehouse is mandatory against regected item,Armazém Rejeitado é obrigatória na rubrica regected
 DocType: Account,Expenses Included In Valuation,Despesas incluídos na avaliação
 DocType: Employee,Provide email id registered in company,Fornecer Endereço de E-mail registrado na empresa
 DocType: Hub Settings,Seller City,Cidade do Vendedor
 DocType: Email Digest,Next email will be sent on:,Próximo e-mail será enviado em:
 DocType: Offer Letter Term,Offer Letter Term,Oferecer Carta Term
-apps/erpnext/erpnext/stock/doctype/item/item.py +492,Item has variants.,Item tem variantes.
+apps/erpnext/erpnext/stock/doctype/item/item.py +496,Item has variants.,Item tem variantes.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Item {0} não foi encontrado
 DocType: Bin,Stock Value,Valor do Estoque
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,Tipo de árvore
@@ -626,10 +599,9 @@
 DocType: Material Request Item,Quantity and Warehouse,Quantidade e Armazém
 DocType: Sales Invoice,Commission Rate (%),Taxa de Comissão (%)
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +172,"Against Voucher Type must be one of Sales Order, Sales Invoice or Journal Entry","Contra Comprovante Tipo deve ser um dos Pedidos de Vendas, Vendas Nota Fiscal ou do Diário"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +139,Biomachining,Biomachining
 apps/erpnext/erpnext/setup/utils.py +89,Unable to find exchange rate,Incapaz de encontrar taxa de câmbio
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +7,Aerospace,Aeroespacial
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +19,Welcome,Bem vindo
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +7,Aerospace,Aeroespacial
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +40,Welcome,Bem vindo
 DocType: Journal Entry,Credit Card Entry,Registro de cartão de crédito
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +18,Task Subject,Assunto da Tarefa
 apps/erpnext/erpnext/config/stock.py +33,Goods received from Suppliers.,Mercadorias recebidas de fornecedores.
@@ -652,19 +624,19 @@
 DocType: Employee,Cell Number,Telefone Celular
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,perdido
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +120,You can not enter current voucher in 'Against Journal Entry' column,Você não pode lançar o comprovante atual na coluna 'Contra Entrada do Livro Diário'
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +25,Energy,energia
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,energia
 DocType: Opportunity,Opportunity From,Oportunidade De
 apps/erpnext/erpnext/config/hr.py +33,Monthly salary statement.,Declaração salarial mensal.
 DocType: Item Group,Website Specifications,Especificações do site
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +205,New Account,Nova Conta
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +21,{0}: From {0} of type {1},{0}: A partir de {0} do tipo {1}
-apps/erpnext/erpnext/controllers/buying_controller.py +283,Row {0}: Conversion Factor is mandatory,Row {0}: Fator de Conversão é obrigatório
+apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,Row {0}: Fator de Conversão é obrigatório
 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.,Lançamentos contábeis podem ser feitas contra nós folha. Entradas contra grupos não são permitidos.
 DocType: ToDo,High,Alto
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +361,Cannot deactivate or cancel BOM as it is linked with other BOMs,Não é possível desativar ou cancelar BOM vez que está associada com outras BOMs
 DocType: Opportunity,Maintenance,Manutenção
 DocType: User,Male,Masculino
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +182,Purchase Receipt number required for Item {0},Número Recibo de compra necessário para item {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +183,Purchase Receipt number required for Item {0},Número Recibo de compra necessário para item {0}
 DocType: Item Attribute Value,Item Attribute Value,Item Atributo Valor
 apps/erpnext/erpnext/config/crm.py +64,Sales campaigns.,Campanhas de vendas .
 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.
@@ -712,10 +684,9 @@
 DocType: Address,Personal,Pessoal
 DocType: Expense Claim Detail,Expense Claim Type,Tipo de Pedido de Reembolso de Despesas
 DocType: Shopping Cart Settings,Default settings for Shopping Cart,As configurações padrão para Carrinho de Compras
-apps/erpnext/erpnext/controllers/accounts_controller.py +324,"Journal Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Journal Entry {0} está ligado contra a Ordem {1}, verificar se ele deve ser puxado como avanço nessa fatura."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +13,Biotechnology,Biotecnologia
+apps/erpnext/erpnext/controllers/accounts_controller.py +325,"Journal Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Journal Entry {0} está ligado contra a Ordem {1}, verificar se ele deve ser puxado como avanço nessa fatura."
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +13,Biotechnology,Biotecnologia
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Office Maintenance Expenses,Despesas de manutenção de escritório
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +53,Hemming,Hemming
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +66,Please enter Item first,"Por favor, indique primeiro item"
 DocType: Account,Liability,responsabilidade
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +62,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Montante Sanctioned não pode ser maior do que na Reivindicação Montante Fila {0}.
@@ -728,10 +699,10 @@
 DocType: Company,Default Bank Account,Conta Bancária Padrão
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +47,"To filter based on Party, select Party Type first","Para filtrar baseado em Festa, selecione Partido Escreva primeiro"
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},"""Atualização do Estoque 'não pode ser verificado porque os itens não são entregues via {0}"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Nos,Nos
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Nos,Nos
 DocType: Item,Items with higher weightage will be shown higher,Os itens com maior weightage será mostrado maior
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Detalhe da Reconciliação Bancária
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +627,My Invoices,Minhas Faturas
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +629,My Invoices,Minhas Faturas
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,Nenhum funcionário encontrado
 DocType: Purchase Order,Stopped,Parado
 DocType: Item,If subcontracted to a vendor,Se subcontratada a um fornecedor
@@ -750,35 +721,33 @@
 DocType: Features Setup,"To enable ""Point of Sale"" features",Para ativar &quot;Point of Sale&quot; recursos
 DocType: Bin,Moving Average Rate,Taxa da Média Móvel
 DocType: Production Planning Tool,Select Items,Selecione itens
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,{0} against Bill {1} dated {2},{0} contra duplicata {1} na data ​​{2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +328,{0} against Bill {1} dated {2},{0} contra duplicata {1} na data ​​{2}
 DocType: Comment,Reference Name,Nome de Referência
 DocType: Maintenance Visit,Completion Status,Estado de Conclusão
 DocType: Sales Invoice Item,Target Warehouse,Almoxarifado de destino
 DocType: Item,Allow over delivery or receipt upto this percent,Permitir sobre a entrega ou recebimento até esta cento
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +49,Expected Delivery Date cannot be before Sales Order Date,Previsão de Entrega A data não pode ser antes de Ordem de Vendas Data
 DocType: Upload Attendance,Import Attendance,Importação de Atendimento
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +17,All Item Groups,Todos os grupos de itens
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +17,All Item Groups,Todos os grupos de itens
 DocType: Process Payroll,Activity Log,Log de Atividade
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +30,Net Profit / Loss,Lucro / Prejuízo Líquido
 apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,Compor automaticamente mensagem no envio de transações.
 DocType: Production Order,Item To Manufacture,Item Para Fabricação
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +16,Permanent mold casting,Fundição com Molde Permanente
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} estatuto é {2}
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},O estado {0} {1} é {2}
 apps/erpnext/erpnext/config/learn.py +172,Purchase Order to Payment,Ordem de Compra para pagamento
 DocType: Sales Order Item,Projected Qty,Qtde. Projetada
 DocType: Sales Invoice,Payment Due Date,Data de Vencimento
 DocType: Newsletter,Newsletter Manager,Boletim Gerente
-apps/erpnext/erpnext/stock/doctype/item/item.js +229,Item Variant {0} already exists with same attributes,Variant item {0} já existe com mesmos atributos
+apps/erpnext/erpnext/stock/doctype/item/item.js +231,Item Variant {0} already exists with same attributes,Variant item {0} já existe com mesmos atributos
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening','Abrindo'
 DocType: Notification Control,Delivery Note Message,Mensagem da Guia de Remessa
 DocType: Expense Claim,Expenses,Despesas
 DocType: Item Variant Attribute,Item Variant Attribute,Variant item Atributo
 ,Purchase Receipt Trends,Compra Trends Recibo
 DocType: Appraisal,Select template from which you want to get the Goals,Selecione o modelo a partir do qual você deseja obter as Metas
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +77,Research & Development,Pesquisa e Desenvolvimento
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Research & Development,Pesquisa e Desenvolvimento
 ,Amount to Bill,Valor a ser Faturado
 DocType: Company,Registration Details,Detalhes de Registro
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +75,Staking,Estacando
 DocType: Item,Re-Order Qty,Re-order Qtde
 DocType: Leave Block List Date,Leave Block List Date,Deixe Data Lista de Bloqueios
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +25,Scheduled to send to {0},Programado para enviar para {0}
@@ -789,18 +758,16 @@
 DocType: Sales Invoice Item,Stock Details,Detalhes da
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Valor do Projeto
 apps/erpnext/erpnext/config/selling.py +304,Point-of-Sale,Ponto de venda
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,Cannot carry forward {0},Não é possível levar adiante {0}
 apps/erpnext/erpnext/accounts/doctype/account/account.py +91,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","O saldo já  está em crédito, você não tem a permissão para definir 'saldo deve ser' como 'débito'"
 DocType: Account,Balance must be,O Saldo deve ser
 DocType: Hub Settings,Publish Pricing,Publicar Pricing
 DocType: Notification Control,Expense Claim Rejected Message,Mensagem de recusa do Pedido de Reembolso de Despesas
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +145,Nailing,Pregando
 ,Available Qty,Disponível Qtde
 DocType: Purchase Taxes and Charges,On Previous Row Total,No Total na linha anterior
 DocType: Salary Slip,Working Days,Dias de Trabalho
 DocType: Serial No,Incoming Rate,Valor de Entrada
 DocType: Packing Slip,Gross Weight,Peso bruto
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +410,The name of your company for which you are setting up this system.,O nome da sua empresa para a qual você está configurando o sistema.
+apps/erpnext/erpnext/public/js/setup_wizard.js +158,The name of your company for which you are setting up this system.,O nome da sua empresa para a qual você está configurando o sistema.
 DocType: HR Settings,Include holidays in Total no. of Working Days,Incluir feriados em nenhuma total. de dias de trabalho
 DocType: Job Applicant,Hold,Segurar
 DocType: Employee,Date of Joining,Data da Efetivação
@@ -810,7 +777,6 @@
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +3,View Subscribers,Exibir Inscritos
 DocType: Purchase Invoice Item,Purchase Receipt,Recibo de Compra
 ,Received Items To Be Billed,Itens recebidos a ser cobrado
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +114,Abrasive blasting,Jateamento abrasivo
 DocType: Employee,Ms,Sra.
 apps/erpnext/erpnext/config/accounts.py +148,Currency exchange rate master.,Taxa de Câmbio Mestre
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +253,Unable to find Time Slot in the next {0} days for Operation {1},Incapaz de encontrar entalhe Tempo nos próximos {0} dias para a Operação {1}
@@ -822,7 +788,7 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +209,Serial No {0} does not belong to Item {1},Serial Não {0} não pertence ao item {1}
 DocType: Purchase Receipt Item Supplied,Required Qty,Quantidade requerida
 DocType: Bank Reconciliation,Total Amount,Valor Total
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +32,Internet Publishing,Publishing Internet
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,Publishing Internet
 DocType: Production Planning Tool,Production Orders,Ordens de Produção
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +35,Balance Value,Valor Patrimonial
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,Lista de Preço de Venda
@@ -833,7 +799,7 @@
 DocType: Supplier,Default Payable Accounts,Contas a Pagar Padrão
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,Empregado {0} não está ativo ou não existe
 DocType: Features Setup,Item Barcode,Código de barras do Item
-apps/erpnext/erpnext/stock/doctype/item/item.py +487,Item Variants {0} updated,Variantes item {0} atualizado
+apps/erpnext/erpnext/stock/doctype/item/item.py +491,Item Variants {0} updated,Variantes item {0} atualizado
 DocType: Quality Inspection Reading,Reading 6,Leitura 6
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Antecipação da Nota Fiscal de Compra
 DocType: Address,Shop,Loja
@@ -842,7 +808,7 @@
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,Conta do Banco/Caixa padrão será atualizada automaticamente na nota fiscal do PDV quando este modo for selecionado.
 DocType: Employee,Permanent Address Is,Endereço permanente é
 DocType: Production Order Operation,Operation completed for how many finished goods?,Operação concluída por quantos produtos acabados?
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +491,The Brand,A Marca
+apps/erpnext/erpnext/public/js/setup_wizard.js +237,The Brand,A Marca
 apps/erpnext/erpnext/controllers/status_updater.py +163,Allowance for over-{0} crossed for Item {1}.,Provisão para over-{0} cruzou para item {1}.
 DocType: Employee,Exit Interview Details,Detalhes da Entrevista de saída
 DocType: Item,Is Purchase Item,É item de compra
@@ -854,7 +820,7 @@
 DocType: Payment Tool,Paid,Pago
 DocType: Salary Slip,Total in words,Total por extenso
 DocType: Material Request Item,Lead Time Date,Prazo de entrega
-apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +54, is mandatory. Maybe Currency Exchange record is not created for ,é mandatório. Talvez recorde de câmbios não é criado para
+apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +54, is mandatory. Maybe Currency Exchange record is not created for ,é mandatório. Talvez o registro de taxas de câmbios não está criado para
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +111,Row #{0}: Please specify Serial No for Item {1},Row # {0}: Favor especificar Sem Serial para item {1}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +538,"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.","Para os itens &#39;pacote de produtos &quot;, Armazém, Serial e não há Batch Não será considerada a partir do&#39; Packing List &#39;tabela. Se Warehouse e Batch Não são as mesmas para todos os itens de embalagem para qualquer item de &#39;Bundle Produto&#39;, esses valores podem ser inseridos na tabela do item principal, os valores serão copiados para &#39;Packing List&#39; tabela."
 apps/erpnext/erpnext/config/stock.py +28,Shipments to customers.,Os embarques para os clientes.
@@ -862,16 +828,16 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Indirect Income,Resultado indirecto
 DocType: Payment Tool,Set Payment Amount = Outstanding Amount,Definir Valor do Pagamento = Valor Excepcional
 DocType: Contact Us Settings,Address Line 1,Endereço
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Variance,Variação
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +392,Company Name,Nome da Empresa
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +53,Variance,Variação
+,Company Name,Nome da Empresa
 DocType: SMS Center,Total Message(s),Mensagem total ( s )
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +515,Select Item for Transfer,Selecionar item para Transferência
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +538,Select Item for Transfer,Selecionar item para Transferência
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,Veja uma lista de todos os vídeos de ajuda
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,Selecione a Conta do banco onde o cheque foi depositado.
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,Permitir ao usuário editar Taxa da Lista de Preços em transações
 DocType: Pricing Rule,Max Qty,Max Qtde
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +106,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Row {0}: O pagamento contra Vendas / Ordem de Compra deve ser sempre marcado como antecedência
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +16,Chemical,químico
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,químico
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +693,All items have already been transferred for this Production Order.,Todos os itens já foram transferidos para esta ordem de produção.
 DocType: Process Payroll,Select Payroll Year and Month,Selecione Payroll ano e mês
 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""",Vá para o grupo apropriado (geralmente Aplicação de Fundos&gt; Ativo Circulante&gt; Contas Bancárias e criar uma nova conta (clicando em Adicionar filho) do tipo &quot;Banco&quot;
@@ -883,12 +849,12 @@
 DocType: Item,Inspection Criteria,Critérios de Inspeção
 apps/erpnext/erpnext/config/accounts.py +101,Tree of finanial Cost Centers.,Árvore de Centros de custo finanial .
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,Transferido
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +492,Upload your letter head and logo. (you can edit them later).,Publique sua cabeça letra e logotipo. (Você pode editá-las mais tarde).
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +156,White,Branco
+apps/erpnext/erpnext/public/js/setup_wizard.js +238,Upload your letter head and logo. (you can edit them later).,Publique sua cabeça letra e logotipo. (Você pode editá-las mais tarde).
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,White,Branco
 DocType: SMS Center,All Lead (Open),Todos Prospectos (Abertos)
 DocType: Purchase Invoice,Get Advances Paid,Obter adiantamentos pagos
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +362,Attach Your Picture,Anexe sua imagem
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Make ,Fazer
+apps/erpnext/erpnext/public/js/setup_wizard.js +112,Attach Your Picture,Anexe sua imagem
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +540,Make ,Fazer
 DocType: Journal Entry,Total Amount in Words,Valor Total por extenso
 DocType: Workflow State,Stop,pare
 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.,Houve um erro . Uma razão provável pode ser que você não tenha salvo o formulário. Entre em contato com support@erpnext.com se o problema persistir .
@@ -897,14 +863,13 @@
 DocType: Lead,Next Contact Date,Data do próximo Contato
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,Qtde abertura
 DocType: Holiday List,Holiday List Name,Nome da lista de feriados
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +168,Stock Options,Opções de Compra
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +168,Stock Options,Opções de Compra
 DocType: Journal Entry Account,Expense Claim,Pedido de Reembolso de Despesas
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +181,Qty for {0},Qtde para {0}
 DocType: Leave Application,Leave Application,Solicitação de Licenças
 apps/erpnext/erpnext/config/hr.py +77,Leave Allocation Tool,Ferramenta de Alocação de Licenças
 DocType: Leave Block List,Leave Block List Dates,Deixe as datas Lista de Bloqueios
 DocType: Company,If Monthly Budget Exceeded (for expense account),Se orçamento mensal excedido (por conta de despesas)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +56,Trimming,Aparar
 DocType: Workstation,Net Hour Rate,Net Hour Taxa
 DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,Recibo de compra do custo de desembarque
 DocType: Company,Default Terms,Termos Padrão
@@ -912,10 +877,9 @@
 DocType: POS Profile,Cash/Bank Account,Conta do Caixa/Banco
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,Removed items with no change in quantity or value.,Itens removidos sem nenhuma alteração na quantidade ou valor.
 DocType: Delivery Note,Delivery To,Entregar a
-apps/erpnext/erpnext/stock/doctype/item/item.py +509,Attribute table is mandatory,Tabela de atributo é obrigatório
+apps/erpnext/erpnext/stock/doctype/item/item.py +513,Attribute table is mandatory,Tabela de atributo é obrigatório
 DocType: Production Planning Tool,Get Sales Orders,Obter Ordens de Venda
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} não pode ser negativo
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +103,Filing,Arquivamento
 apps/erpnext/erpnext/templates/form_grid/item_grid.html +72,Discount,Desconto
 DocType: Features Setup,Purchase Discounts,Descontos da compra
 DocType: Workstation,Wages,Salário
@@ -932,6 +896,7 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +112,You are the Expense Approver for this record. Please Update the 'Status' and Save,Você é o aprovador de despesa para esse registro. Atualize o 'Estado' e salvar
 DocType: Serial No,Creation Document No,Número de Criação do Documento
 DocType: Issue,Issue,Questão
+apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account does not match with Company,Conta não coincidir com a Empresa
 apps/erpnext/erpnext/config/stock.py +136,"Attributes for Item Variants. e.g Size, Color etc.","Atributos para item variantes. por exemplo, tamanho, cor etc."
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +39,WIP Warehouse,WIP Warehouse
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +194,Serial No {0} is under maintenance contract upto {1},Serial Não {0} está sob contrato de manutenção até {1}
@@ -940,7 +905,7 @@
 DocType: Tax Rule,Shipping State,Estado Envio
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,"O artigo deve ser adicionado usando ""Obter itens de recibos de compra 'botão"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,Despesas com Vendas
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Buying,Compra padrão
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +120,Standard Buying,Compra padrão
 DocType: GL Entry,Against,Contra
 DocType: Item,Default Selling Cost Center,Venda Padrão Centro de Custo
 DocType: Sales Partner,Implementation Partner,Parceiro de implementação
@@ -961,29 +926,29 @@
 DocType: Time Log Batch,updated via Time Logs,atualizado via Time Logs
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,Idade Média
 DocType: Opportunity,Your sales person who will contact the customer in future,Seu vendedor entrará em contato com o cliente no futuro
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +588,List a few of your suppliers. They could be organizations or individuals.,Lista de alguns de seus fornecedores. Eles podem ser empresas ou pessoas físicas.
+apps/erpnext/erpnext/public/js/setup_wizard.js +326,List a few of your suppliers. They could be organizations or individuals.,Lista de alguns de seus fornecedores. Eles podem ser empresas ou pessoas físicas.
 DocType: Company,Default Currency,Moeda padrão
 DocType: Contact,Enter designation of this Contact,Digite a designação deste contato
 DocType: Contact Us Settings,Address,Endereço
 DocType: Expense Claim,From Employee,De Empregado
-apps/erpnext/erpnext/controllers/accounts_controller.py +338,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Aviso : O sistema não irá verificar superfaturamento desde montante para item {0} em {1} é zero
+apps/erpnext/erpnext/controllers/accounts_controller.py +339,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Aviso : O sistema não irá verificar superfaturamento desde montante para item {0} em {1} é zero
 DocType: Journal Entry,Make Difference Entry,Criar diferença de lançamento
 DocType: Upload Attendance,Attendance From Date,Data Inicial de Comparecimento
 DocType: Appraisal Template Goal,Key Performance Area,Área Chave de Performance
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +54,Transportation,transporte
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +54,Transportation,transporte
 apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +67, and year: ,e ano:
 DocType: Email Digest,Annual Expense,Despesa anual
 DocType: SMS Center,Total Characters,Total de Personagens
-apps/erpnext/erpnext/controllers/buying_controller.py +139,Please select BOM in BOM field for Item {0},"Por favor, selecione no campo BOM BOM por item {0}"
+apps/erpnext/erpnext/controllers/buying_controller.py +130,Please select BOM in BOM field for Item {0},"Por favor, selecione no campo BOM BOM por item {0}"
 DocType: C-Form Invoice Detail,C-Form Invoice Detail,Detalhe Fatura do Formulário-C
 DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,Reconciliação O pagamento da fatura
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +32,Contribution %,Contribuição%
 DocType: Item,website page link,link da página do site
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +192,Let's prepare the system for first use.,Vamos preparar o sistema para a primeira utilização.
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +242,Let's prepare the system for first use.,Vamos preparar o sistema para a primeira utilização.
 DocType: Company,Company registration numbers for your reference. Tax numbers etc.,"Números de registro da empresa para sua referência. Exemplo: CNPJ, IE, etc"
 DocType: Sales Partner,Distributor,Distribuidor
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Carrinho Rule Envio
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +214,Production Order {0} must be cancelled before cancelling this Sales Order,Ordem de produção {0} deve ser cancelado antes de cancelar esta ordem de venda
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +209,Production Order {0} must be cancelled before cancelling this Sales Order,Ordem de produção {0} deve ser cancelado antes de cancelar esta ordem de venda
 ,Ordered Items To Be Billed,Itens encomendados a serem faturados
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +24,From Range has to be less than To Range,De Gama tem de ser inferior à gama
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +21,Select Time Logs and Submit to create a new Sales Invoice.,Selecione Time Logs e enviar para criar uma nova factura de venda.
@@ -1002,15 +967,14 @@
 apps/erpnext/erpnext/config/learn.py +77,Opening Accounting Balance,Saldo de Contabilidade
 DocType: Sales Invoice Advance,Sales Invoice Advance,Antecipação da Nota Fiscal de Venda
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +398,Nothing to request,Nada de pedir
-apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date',A 'Data de Início Real' não pode ser superior que a 'Data Final Real'
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +75,Management,Gestão
+apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date',A 'Data de Início Real' não pode ser maior que a 'Data Final Real'
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +75,Management,Gestão
 apps/erpnext/erpnext/config/projects.py +33,Types of activities for Time Sheets,Tipos de atividades para quadro de horários
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +14,Investment casting,Carcaça de investimento
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +51,Either debit or credit amount is required for {0},De qualquer débito ou valor do crédito é necessário para {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""","Isso vai ser anexado ao Código do item da variante. Por exemplo, se a sua abreviatura é ""SM"", e o código do item é ""t-shirt"", o código do item da variante será ""T-shirt-SM"""
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,Pagamento líquido (por extenso) será visível quando você salvar a folha de pagamento.
 apps/frappe/frappe/core/doctype/user/user_list.js +12,Active,Ativo
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +154,Blue,Azul
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +154,Blue,Azul
 DocType: Purchase Invoice,Is Return,É Retorno
 DocType: Price List Country,Price List Country,Preço da lista País
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +123,Further nodes can be only created under 'Group' type nodes,"Outros nós só pode ser criado sob os nós do tipo ""grupo"""
@@ -1020,18 +984,16 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +22,POS Profile {0} already created for user: {1} and company {2},POS perfil {0} já criado para o usuário: {1} e {2} empresa
 DocType: Purchase Order Item,UOM Conversion Factor,Fator de Conversão da UDM
 DocType: Stock Settings,Default Item Group,Grupo de Itens padrão
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +156,Laminated object manufacturing,Objeto de fabricação laminado
 apps/erpnext/erpnext/config/buying.py +13,Supplier database.,Banco de dados do Fornecedor.
 DocType: Account,Balance Sheet,Balanço
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +561,Cost Center For Item with Item Code ',Centro de Custos para Item com Código '
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +45,Stretch forming,Estiramento formando
 DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,Seu vendedor receberá um lembrete nesta data para contatar o cliente
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +210,"Further accounts can be made under Groups, but entries can be made against non-Groups","Outras contas podem ser feitas em grupos, mas as entradas podem ser feitas contra os não-Groups"
 apps/erpnext/erpnext/config/hr.py +125,Tax and other salary deductions.,Impostos e outras deduções salariais.
 DocType: Lead,Lead,Prospecto
 DocType: Email Digest,Payables,Contas a pagar
 DocType: Account,Warehouse,Armazém
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +90,Row #{0}: Rejected Qty can not be entered in Purchase Return,Row # {0}: Rejeitado Qtde não pode ser inscrita no retorno de compra
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +93,Row #{0}: Rejected Qty can not be entered in Purchase Return,Row # {0}: Rejeitado Qtde não pode ser inscrita no retorno de compra
 ,Purchase Order Items To Be Billed,Ordem de Compra itens a serem faturados
 DocType: Purchase Invoice Item,Net Rate,Taxa Net
 DocType: Purchase Invoice Item,Purchase Invoice Item,Item da Nota Fiscal de Compra
@@ -1046,13 +1008,13 @@
 DocType: Global Defaults,Current Fiscal Year,Ano Fiscal Atual
 DocType: Global Defaults,Disable Rounded Total,Desativar total arredondado
 DocType: Lead,Call,Chamar
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +384,'Entries' cannot be empty,'Entradas' não pode estar vazio
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +386,'Entries' cannot be empty,'Entradas' não pode estar vazio
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},Linha duplicada {0} com o mesmo {1}
 ,Trial Balance,Balancete
 apps/erpnext/erpnext/config/hr.py +205,Setting up Employees,Configurando Empregados
 apps/erpnext/erpnext/public/js/feature_setup.js +220,"Grid ""","Grid """
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +150,Please select prefix first,Por favor seleccione prefixo primeiro
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +138,Research,pesquisa
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +138,Research,pesquisa
 DocType: Maintenance Visit Purpose,Work Done,Trabalho feito
 apps/erpnext/erpnext/controllers/item_variant.py +25,Please specify at least one attribute in the Attributes table,Especifique pelo menos um atributo na tabela de atributos
 DocType: Contact,User ID,ID de Usuário
@@ -1060,10 +1022,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +57,View Ledger,Ver Ledger
 DocType: File,Lft,LFT
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Mais antigas
-apps/erpnext/erpnext/stock/doctype/item/item.py +394,"An Item Group exists with same name, please change the item name or rename the item group","Um grupo de itens existe com o mesmo nome, por favor, mude o nome do item ou mude o nome do grupo de itens"
+apps/erpnext/erpnext/stock/doctype/item/item.py +398,"An Item Group exists with same name, please change the item name or rename the item group","Um grupo de itens existe com o mesmo nome, por favor, mude o nome do item ou mude o nome do grupo de itens"
 DocType: Communication,Delivery Status,Estado da entrega
 DocType: Production Order,Manufacture against Sales Order,Fabricação contra a Ordem de Venda
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +517,Rest Of The World,Resto do mundo
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +455,Rest Of The World,Resto do mundo
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,O item {0} não pode ter Batch
 ,Budget Variance Report,Relatório de Variação de Orçamento
 DocType: Salary Slip,Gross Pay,Salário bruto
@@ -1074,13 +1036,11 @@
 DocType: BOM Item,Item Description,Descrição do Item
 DocType: Payment Tool,Payment Mode,O modo de pagamento
 DocType: Purchase Invoice,Is Recurring,É recorrente
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +154,Direct metal laser sintering,Direto de metal sinterização a laser
 DocType: Purchase Order,Supplied Items,Itens fornecidos
 DocType: Production Order,Qty To Manufacture,Qtde. Para Fabricação
 DocType: Buying Settings,Maintain same rate throughout purchase cycle,Manter o mesmo valor através de todo o ciclo de compra
 DocType: Opportunity Item,Opportunity Item,Item da oportunidade
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +61,Temporary Opening,Abertura temporária
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +41,Cryorolling,Cryorolling
 ,Employee Leave Balance,Equilíbrio Leave empregado
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +128,Balance for Account {0} must always be {1},Saldo da Conta {0} deve ser sempre {1}
 DocType: Address,Address Type,Tipo de Endereço
@@ -1096,23 +1056,23 @@
 DocType: Journal Entry,Get Outstanding Invoices,Obter faturas pendentes
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,Ordem de Vendas {0} não é válido
 apps/erpnext/erpnext/setup/doctype/company/company.py +172,"Sorry, companies cannot be merged","Desculpe , as empresas não podem ser mescladas"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +145,Small,Pequeno
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Small,Pequeno
 DocType: Employee,Employee Number,Número do Funcionário
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},Processo n º (s) já está em uso . Tente de Processo n {0}
 ,Invoiced Amount (Exculsive Tax),Valor faturado ( Exculsive Tributário)
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,Número 2
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +59,Account head {0} created,Conta {0} criado
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +153,Green,Verde
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Green,Verde
 DocType: Item,Auto re-order,Re-ordenar Automaticamente
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +57,Total Achieved,Total de Alcançados
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +59,Total Achieved,Total de Alcançados
 DocType: Employee,Place of Issue,Local de Emissão
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +59,Contract,Contrato
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Contract,Contrato
 DocType: Report,Disabled,Desativado
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +490,UOM coversion factor required for UOM: {0} in Item: {1},Fator coversion UOM necessário para UOM: {0} no Item: {1}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +83,Indirect Expenses,Despesas Indiretas
 apps/erpnext/erpnext/controllers/selling_controller.py +163,Row {0}: Qty is mandatory,Row {0}: Quantidade é obrigatório
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +8,Agriculture,Agricultura
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +611,Your Products or Services,Seus produtos ou serviços
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,Agricultura
+apps/erpnext/erpnext/public/js/setup_wizard.js +347,Your Products or Services,Seus produtos ou serviços
 DocType: Mode of Payment,Mode of Payment,Forma de Pagamento
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,Este é um grupo de itens de raiz e não pode ser editada.
 DocType: Journal Entry Account,Purchase Order,Ordem de Compra
@@ -1124,7 +1084,7 @@
 DocType: Serial No,Serial No Details,Detalhes do Nº de Série
 DocType: Purchase Invoice Item,Item Tax Rate,Taxa de Imposto do Item
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +113,"For {0}, only credit accounts can be linked against another debit entry","Por {0}, apenas as contas de crédito pode ser ligado contra outro lançamento de débito"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Delivery Note {0} is not submitted,Guia de Remessa {0} não foi submetida
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +470,Delivery Note {0} is not submitted,Guia de Remessa {0} não foi submetida
 apps/erpnext/erpnext/stock/get_item_details.py +136,Item {0} must be a Sub-contracted Item,Item {0} deve ser um item do sub- contratados
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,Equipamentos Capitais
 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.","Regra de Preços é o primeiro selecionado com base em ""Aplicar On 'campo, que pode ser Item, item de grupo ou Marca."
@@ -1134,7 +1094,7 @@
 DocType: Appraisal Goal,Goal,Meta
 DocType: Sales Invoice Item,Edit Description,Editar Descrição
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +318,Expected Delivery Date is lesser than Planned Start Date.,Data de entrega esperada é menor do que o planejado Data de Início.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +579,For Supplier,para Fornecedor
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +602,For Supplier,para Fornecedor
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,Definir o Tipo de Conta ajuda na seleção desta Conta nas transações.
 DocType: Purchase Invoice,Grand Total (Company Currency),Grande Total (moeda da empresa)
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,Sainte total
@@ -1160,10 +1120,10 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +74,"Total {0} for all items is zero, may you should change 'Distribute Charges Based On'","Total de {0} para todos os itens é zero, pode você deve mudar &quot;Distribuir taxas sobre &#39;"
 DocType: Purchase Invoice,Taxes and Charges Calculation,Cálculo de Impostos e Encargos
 DocType: BOM Operation,Workstation,Estação de Trabalho
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +112,Hardware,ferragens
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +112,Hardware,ferragens
 DocType: Attendance,HR Manager,Gerente de RH
 apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,"Por favor, selecione uma empresa"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +50,Privilege Leave,Privilege Deixar
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +50,Privilege Leave,Privilege Deixar
 DocType: Purchase Invoice,Supplier Invoice Date,Fornecedor Data Fatura
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +79,You need to enable Shopping Cart,É preciso ativar o Carrinho de Compras
 apps/frappe/frappe/public/js/frappe/form/grid_body.html +6,No Data,No Data
@@ -1176,7 +1136,7 @@
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +81,Overlapping conditions found between:,Condições sobreposição encontradas entre :
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +168,Against Journal Entry {0} is already adjusted against some other voucher,Contra Journal Entry {0} já é ajustado contra algum outro comprovante
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +68,Total Order Value,Valor total da ordem
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +38,Food,comida
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +38,Food,comida
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Faixa de Envelhecimento 3
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +139,You can make a time log only against a submitted production order,Você pode fazer um registro de tempo apenas contra uma ordem de produção apresentada
 DocType: Maintenance Schedule Item,No of Visits,Nº de Visitas
@@ -1196,6 +1156,7 @@
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,View Offer Letter,Vista Oferta Letter
 DocType: Communication,Communication,Comunicação
 DocType: Item,Is Service Item,É item de serviço
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +81,Application period cannot be outside leave allocation period,Período de aplicação não pode ser período de atribuição de licença fora
 DocType: Activity Cost,Projects,Projetos
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +31,Please select Fiscal Year,Por favor seleccione o Ano Fiscal
 apps/erpnext/erpnext/controllers/buying_controller.py +23,From {0} | {1} {2},A partir de {0} | {1} {2}
@@ -1214,7 +1175,7 @@
 DocType: Item,Maintain Stock,Manter Estoque
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +213,Stock Entries already created for Production Order ,Banco de entradas já criadas para ordem de produção
 DocType: Leave Control Panel,Leave blank if considered for all designations,Deixe em branco se considerado para todas as designações
-apps/erpnext/erpnext/controllers/accounts_controller.py +499,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Charge do tipo ' real ' na linha {0} não pode ser incluído no item Taxa
+apps/erpnext/erpnext/controllers/accounts_controller.py +500,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Charge do tipo ' real ' na linha {0} não pode ser incluído no item Taxa
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,Max: {0},Max: {0}
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +16,From Datetime,A partir de data e hora
 DocType: Email Digest,For Company,Para a Empresa
@@ -1224,7 +1185,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +50,Chart of Accounts,Plano de Contas
 DocType: Material Request,Terms and Conditions Content,Conteúdos dos Termos e Condições
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +471,cannot be greater than 100,não pode ser maior do que 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +546,Item {0} is not a stock Item,Item {0} não é um item de estoque
+apps/erpnext/erpnext/stock/doctype/item/item.py +550,Item {0} is not a stock Item,Item {0} não é um item de estoque
 DocType: Maintenance Visit,Unscheduled,Sem agendamento
 DocType: Employee,Owned,Pertencente
 DocType: Salary Slip Deduction,Depends on Leave Without Pay,Depende de licença sem vencimento
@@ -1238,31 +1199,29 @@
 DocType: HR Settings,Employee Settings,Configurações Empregado
 ,Batch-Wise Balance History,Balanço por Histórico de Lotes
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +72,To Do List,Lista de Tarefas
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +63,Apprentice,Aprendiz
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Apprentice,Aprendiz
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +99,Negative Quantity is not allowed,Negativo Quantidade não é permitido
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
 Used for Taxes and Charges","Detalhe da tabela de imposto obtido a partir mestre como uma string e armazenado neste campo.
  Usado para Tributos e Encargos"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +61,Lancing,Lancing
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +151,Employee cannot report to himself.,Empregado não pode denunciar a si mesmo.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Se a conta for congelada , as entradas são permitidos aos usuários restritos."
 DocType: Email Digest,Bank Balance,Saldo bancário
-apps/erpnext/erpnext/controllers/accounts_controller.py +435,Accounting Entry for {0}: {1} can only be made in currency: {2},Contabilidade de entrada para {0}: {1} só pode ser feito em moeda: {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +436,Accounting Entry for {0}: {1} can only be made in currency: {2},Contabilidade de entrada para {0}: {1} só pode ser feito em moeda: {2}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +38,No active Salary Structure found for employee {0} and the month,Sem Estrutura salarial para o empregado ativo encontrado {0} eo mês
 DocType: Job Opening,"Job profile, qualifications required etc.","Perfil da Vaga , qualificações exigidas , etc"
 DocType: Journal Entry Account,Account Balance,Saldo da conta
 apps/erpnext/erpnext/config/accounts.py +112,Tax Rule for transactions.,Regra de imposto para transações.
 DocType: Rename Tool,Type of document to rename.,Tipo de documento a ser renomeado.
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +630,We buy this Item,Nós compramos este item
+apps/erpnext/erpnext/public/js/setup_wizard.js +366,We buy this Item,Nós compramos este item
 DocType: Address,Billing,Faturamento
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +77,Flanging,Flanging
 DocType: Bulk Email,Not Sent,Não Enviados
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +73,Explosive forming,Explosivo formando
 DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),Total de Impostos e Taxas (moeda da empresa)
 DocType: Shipping Rule,Shipping Account,Conta de Envio
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +43,Scheduled to send to {0} recipients,Programado para enviar para {0} destinatários
 DocType: Quality Inspection,Readings,Leituras
 DocType: Stock Entry,Total Additional Costs,Total de Custos Adicionais
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Sub Assemblies,Sub Assembléias
+apps/erpnext/erpnext/public/js/setup_wizard.js +359,Sub Assemblies,Sub Assembléias
 DocType: Shipping Rule Condition,To Value,Ao Valor
 DocType: Supplier,Stock Manager,Da Gerente
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +143,Source warehouse is mandatory for row {0},Origem do Warehouse é obrigatória para a linha {0}
@@ -1272,44 +1231,42 @@
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Falha na importação !
 apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,Nenhum endereço adicionado ainda.
 DocType: Workstation Working Hour,Workstation Working Hour,Hora de Trabalho Workstation
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +83,Analyst,Analista
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +202,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Fila {0}: quantidade atribuídos {1} tem de ser menor ou igual à quantidade JV {2}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Analyst,Analista
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +149,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Fila {0}: quantidade atribuídos {1} tem de ser menor ou igual à quantidade JV {2}
 DocType: Item,Inventory,Inventário
 DocType: Features Setup,"To enable ""Point of Sale"" view",Para ativar &quot;Point of Sale&quot; vista
 apps/erpnext/erpnext/public/js/pos/pos.js +402,Payment cannot be made for empty cart,O pagamento não pode ser feito para carrinho vazio
 DocType: Item,Sales Details,Detalhes de Vendas
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +149,Pinning,Fixando
 DocType: Opportunity,With Items,Com Itens
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,No Qt
 DocType: Notification Control,Expense Claim Rejected,Pedido de Reembolso de Despesas Rejeitado
 DocType: Sales Invoice,"The date on which next invoice will be generated. It is generated on submit.
 ",A data na qual próxima fatura será gerada. Ele é gerado em enviar.
 DocType: Item Attribute,Item Attribute,Atributo item
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +105,Government,governo
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Government,governo
 apps/erpnext/erpnext/config/stock.py +268,Item Variants,As variantes de item
 DocType: Company,Services,Serviços
 apps/erpnext/erpnext/accounts/report/financial_statements.py +147,Total ({0}),Total ({0})
 DocType: Cost Center,Parent Cost Center,Centro de Custo pai
 DocType: Sales Invoice,Source,Fonte
 DocType: Leave Type,Is Leave Without Pay,É licença sem vencimento
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +186,No records found in the Payment table,Nenhum registro encontrado na tabela de pagamento
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +405,Financial Year Start Date,Exercício Data de Início
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +133,No records found in the Payment table,Nenhum registro encontrado na tabela de pagamento
+apps/erpnext/erpnext/public/js/setup_wizard.js +153,Financial Year Start Date,Exercício Data de Início
 DocType: Employee External Work History,Total Experience,Experiência total
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +100,Countersinking,Escareaï¿½o
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +271,Packing Slip(s) cancelled,Deslizamento (s) de embalagem cancelado
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +276,Packing Slip(s) cancelled,Deslizamento (s) de embalagem cancelado
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,Freight Forwarding e Encargos
 DocType: Material Request Item,Sales Order No,Nº da Ordem de Venda
 DocType: Item Group,Item Group Name,Nome do Grupo de Itens
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +50,Taken,Tomado
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,Tomado
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +66,Transfer Materials for Manufacture,Materiais de transferência para Fabricação
 DocType: Pricing Rule,For Price List,Para Lista de Preço
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +27,Executive Search,Executive Search
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,Executive Search
 apps/erpnext/erpnext/stock/stock_ledger.py +405,"Purchase rate for item: {0} not found, which is required to book accounting entry (expense). Please mention item price against a buying price list.","Taxa de compra para o item: {0} não foi encontrado, o que é necessário para reservar a entrada de contabilidade (despesa). Por favor, mencione preço do item em uma lista de preços de compra."
 DocType: Maintenance Schedule,Schedules,Horários
 DocType: Purchase Invoice Item,Net Amount,Valor Líquido
 DocType: Purchase Order Item Supplied,BOM Detail No,Nº do detalhe da LDM
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),Montante desconto adicional (moeda da empresa)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +537,Error: {0} > {1},Erro: {0} > {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +541,Error: {0} > {1},Erro: {0} > {1}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,"Por favor, crie uma nova conta de Plano de Contas ."
 DocType: Maintenance Visit,Maintenance Visit,Visita de manutenção
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer > Customer Group > Territory,Cliente> Grupo Cliente> Território
@@ -1320,7 +1277,6 @@
 DocType: Event,Tuesday,Terça-feira
 DocType: Leave Block List,Block Holidays on important days.,Bloco Feriados em dias importantes.
 ,Accounts Receivable Summary,Resumo do Contas a Receber
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +43,Leaves for type {0} already allocated for Employee {1} for period {2} - {3},Deixa para o tipo {0} já alocado para Employee {1} para {2} período - {3}
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +187,Please set User ID field in an Employee record to set Employee Role,"Por favor, defina o campo ID do usuário em um registro de empregado para definir Função Funcionário"
 DocType: UOM,UOM Name,Nome da UDM
 DocType: Top Bar Item,Target,Meta
@@ -1332,15 +1288,14 @@
 DocType: ToDo,Due Date,Data de Vencimento
 DocType: Sales Invoice Item,Brand Name,Nome da Marca
 DocType: Purchase Receipt,Transporter Details,Detalhes Transporter
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Box,Caixa
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +389,The Organization,a Organização
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Box,Caixa
+apps/erpnext/erpnext/public/js/setup_wizard.js +137,The Organization,a Organização
 DocType: Monthly Distribution,Monthly Distribution,Distribuição Mensal
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,"Lista Receiver está vazio. Por favor, crie Lista Receiver"
 DocType: Production Plan Sales Order,Production Plan Sales Order,Ordem de Venda do Plano de Produção
 DocType: Sales Partner,Sales Partner Target,Metas do Parceiro de Vendas
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},Entrada Contabilidade para {0} só pode ser feito em moeda: {1}
 DocType: Pricing Rule,Pricing Rule,Regra de Preços
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +58,Notching,Notching
 apps/erpnext/erpnext/config/learn.py +167,Material Request to Purchase Order,Pedido de material a Ordem de Compra
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +74,Row # {0}: Returned Item {1} does not exists in {2} {3},Row # {0}: Item devolvido {1} não existe em {2} {3}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,Contas Bancárias
@@ -1357,20 +1312,19 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Amounts not reflected in bank,Valores não reflete em banco
 DocType: Quality Inspection Reading,Reading 4,Leitura 4
 apps/erpnext/erpnext/config/hr.py +23,Claims for company expense.,Os pedidos de despesa da empresa.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +8,Centrifugal casting,Fundição centrífuga
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +119,Magnetic field-assisted finishing,Magnetic acabamento assistida-campo
 DocType: Company,Default Holiday List,Lista Padrão de Feriados
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +165,Stock Liabilities,Passivo estoque
 DocType: Purchase Receipt,Supplier Warehouse,Almoxarifado do Fornecedor
 DocType: Opportunity,Contact Mobile No,Celular do Contato
 DocType: Production Planning Tool,Select Sales Orders,Selecione as Ordens de Venda
 ,Material Requests for which Supplier Quotations are not created,Os pedidos de materiais para os quais Fornecedor Quotations não são criados
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +117,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,No dia (s) em que você está se candidatando a licença são feriados. Você não precisa solicitar uma licença.
 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.,Para rastrear itens usando código de barras. Você será capaz de inserir itens na Guia de Remessa e Nota Fiscal de Venda através do escaneamento do código de barras do item.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +477,Mark as Delivered,Marcar como Proferido
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +497,Mark as Delivered,Marcar como Proferido
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +34,Make Quotation,Faça Cotação
 DocType: Dependent Task,Dependent Task,Tarefa dependente
-apps/erpnext/erpnext/stock/doctype/item/item.py +306,Conversion factor for default Unit of Measure must be 1 in row {0},Fator de conversão de unidade de medida padrão deve ser 1 na linha {0}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,Leave of type {0} cannot be longer than {1},Deixar do tipo {0} não pode ser maior que {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +310,Conversion factor for default Unit of Measure must be 1 in row {0},Fator de conversão de unidade de medida padrão deve ser 1 na linha {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +155,Leave of type {0} cannot be longer than {1},Deixar do tipo {0} não pode ser maior que {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Tente planear operações para X dias de antecedência.
 DocType: HR Settings,Stop Birthday Reminders,Parar Aniversário Lembretes
 DocType: SMS Center,Receiver List,Lista de recebedores
@@ -1378,15 +1332,14 @@
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Quantidade consumida
 apps/erpnext/erpnext/public/js/pos/pos.js +491,{0} View,{0} Visão
 DocType: Salary Structure Deduction,Salary Structure Deduction,Dedução da Estrutura Salarial
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +158,Selective laser sintering,Seletiva sinterização a laser
-apps/erpnext/erpnext/stock/doctype/item/item.py +301,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Unidade de Medida {0} foi inserida mais de uma vez na Tabela de Conversão de Fator
+apps/erpnext/erpnext/stock/doctype/item/item.py +305,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Unidade de Medida {0} foi inserida mais de uma vez na Tabela de Conversão de Fator
 apps/frappe/frappe/core/page/data_import_tool/data_import_tool.js +108,Import Successful!,Importe com sucesso!
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Custo dos Produtos Enviados
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +185,Quantity must not be more than {0},Quantidade não deve ser mais do que {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +41,Age (Days),Idade (Dias)
 DocType: Quotation Item,Quotation Item,Item da Cotação
 DocType: Account,Account Name,Nome da Conta
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +41,From Date cannot be greater than To Date,A partir de data não pode ser maior que a Data
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +34,From Date cannot be greater than To Date,A partir de data não pode ser maior que a Data
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +194,Serial No {0} quantity {1} cannot be a fraction,Serial Não {0} {1} quantidade não pode ser uma fração
 apps/erpnext/erpnext/config/buying.py +59,Supplier Type master.,Fornecedor Tipo de mestre.
 DocType: Purchase Order Item,Supplier Part Number,Número da peça do Fornecedor
@@ -1395,14 +1348,14 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +247,{0} {1} is cancelled or stopped,{0} {1} é cancelado ou interrompido
 DocType: Accounts Settings,Credit Controller,Controlador de crédito
 DocType: Delivery Note,Vehicle Dispatch Date,Veículo Despacho Data
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +197,Purchase Receipt {0} is not submitted,Recibo de compra {0} não é submetido
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +198,Purchase Receipt {0} is not submitted,Recibo de compra {0} não é submetido
 DocType: Company,Default Payable Account,Conta a Pagar Padrão
 apps/erpnext/erpnext/config/website.py +13,"Settings for online shopping cart such as shipping rules, price list etc.","Definições para carrinho de compras on-line, tais como regras de navegação, lista de preços etc."
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +660,Setup Complete,Instalação concluída
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +124,Setup Complete,Instalação concluída
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +65,{0}% Billed,{0}% Cobrada
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +17,Reserved Qty,reservados Qtde
 DocType: Party Account,Party Account,Conta Party
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +74,Human Resources,Recursos Humanos
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +74,Human Resources,Recursos Humanos
 DocType: Lead,Upper Income,Renda superior
 DocType: Journal Entry Account,Debit in Company Currency,Débito em Empresa de moeda
 apps/erpnext/erpnext/support/doctype/issue/issue.py +58,My Issues,Meus Problemas
@@ -1411,11 +1364,9 @@
 DocType: Company,Default Values,Valores Padrão
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +236,Row {0}: Payment amount can not be negative,Row {0}: Valor do pagamento não pode ser negativo
 DocType: Expense Claim,Total Amount Reimbursed,Montante total reembolsado
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +152,Press fitting,Uni de press de
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +64,Against Supplier Invoice {0} dated {1},Contra Fornecedor Invoice {0} {1} datada
 DocType: Customer,Default Price List,Lista de Preços padrão
 DocType: Payment Reconciliation,Payments,Pagamentos
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +24,Hot isostatic pressing,Prensagem isostática a quente
 DocType: ToDo,Medium,Médio
 DocType: Budget Detail,Budget Allocated,Orçamento Alocado
 DocType: Journal Entry,Entry Type,Tipo de entrada
@@ -1428,9 +1379,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +56,None of the items have any change in quantity or value.,Nenhum dos itens tiver qualquer mudança na quantidade ou valor.
 DocType: Warranty Claim,Warranty Claim,Reclamação de Garantia
 ,Lead Details,Detalhes do Prospecto
-DocType: Authorization Rule,Approving User,Usuário Aprovador
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +37,Forging,Forjar
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +126,Plating,Galvanização
 DocType: Purchase Invoice,End date of current invoice's period,Data final do período de fatura atual
 DocType: Pricing Rule,Applicable For,aplicável
 DocType: Bank Reconciliation,From Date,A partir da data
@@ -1452,31 +1400,29 @@
 DocType: Sales Invoice,Paid Amount (Company Currency),Valor pago (Empresa de moeda)
 DocType: Purchase Invoice,Additional Discount,Desconto adicional
 DocType: Selling Settings,Selling Settings,Vendendo Configurações
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +39,Online Auctions,Leilões Online
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,Leilões Online
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +94,Please specify either Quantity or Valuation Rate or both,"Por favor, especifique a quantidade ou Taxa de Valorização ou ambos"
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +50,"Company, Month and Fiscal Year is mandatory","Empresa , Mês e Ano Fiscal é obrigatória"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Marketing Expenses,Despesas de Marketing
 ,Item Shortage Report,Item de relatório Escassez
-apps/erpnext/erpnext/stock/doctype/item/item.js +183,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Peso é mencionado, \n Mencione ""Peso UOM"" too"
+apps/erpnext/erpnext/stock/doctype/item/item.js +185,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Peso é mencionado, \n Mencione ""Peso UOM"" too"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,Pedido de material usado para fazer essa entrada de material
 apps/erpnext/erpnext/config/support.py +43,Single unit of an Item.,Unidade única de um item.
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +212,Time Log Batch {0} must be 'Submitted',Tempo Log Batch {0} deve ser ' enviado '
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,Faça Contabilidade entrada para cada Banco de Movimento
 DocType: Leave Allocation,Total Leaves Allocated,Total de licenças alocadas
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +384,Warehouse required at Row No {0},Armazém necessária no Row Nenhuma {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +386,Warehouse required at Row No {0},Armazém necessária no Row Nenhuma {0}
 DocType: Employee,Date Of Retirement,Data da aposentadoria
 DocType: Upload Attendance,Get Template,Obter Modelo
 DocType: Address,Postal,Postal
 DocType: Item,Weightage,Peso
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +159,Mining,Mineração
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +17,Resin casting,De moldagem de resina
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"Existe um grupo de clientes com o mesmo nome, por favor modifique o nome do cliente ou renomeie o grupo de clientes"
 apps/erpnext/erpnext/public/js/pos/pos.js +147,Please select {0} first.,Por favor seleccione {0} primeiro.
 apps/erpnext/erpnext/templates/pages/order.html +57,text {0},texto {0}
 DocType: Territory,Parent Territory,Território pai
 DocType: Quality Inspection Reading,Reading 2,Leitura 2
 DocType: Stock Entry,Material Receipt,Recebimento de material
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +622,Products,produtos
+apps/erpnext/erpnext/public/js/setup_wizard.js +358,Products,produtos
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +47,Party Type and Party is required for Receivable / Payable account {0},Festa Tipo and Party é necessário para receber / pagar contas {0}
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.","Se este item tem variantes, então ele não pode ser selecionado em ordens de venda etc."
 DocType: Lead,Next Contact By,Próximo Contato Por
@@ -1486,13 +1432,13 @@
 DocType: Purchase Invoice,Notification Email Address,Endereço de email de notificação
 DocType: Payment Tool,Find Invoices to Match,Encontre Faturas para combinar
 ,Item-wise Sales Register,Vendas de item sábios Registrar
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +399,"e.g. ""XYZ National Bank""","ex: ""XYZ National Bank """
+apps/erpnext/erpnext/public/js/setup_wizard.js +147,"e.g. ""XYZ National Bank""","ex: ""XYZ National Bank """
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,Este imposto está incluído no Valor Base?
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +57,Total Target,Alvo total
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Target,Alvo total
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.js +22,Shopping Cart is enabled,Carrinho de Compras está habilitado
 DocType: Job Applicant,Applicant for a Job,Candidato a um emprego
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +173,No Production Orders created,Não há ordens de produção criadas
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +131,Salary Slip of employee {0} already created for this month,Folha de salário de empregado {0} já criado para este mês
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +140,Salary Slip of employee {0} already created for this month,Folha de salário de empregado {0} já criado para este mês
 DocType: Stock Reconciliation,Reconciliation JSON,Reconciliação JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Muitas colunas. Exportar o relatório e imprimi-lo usando um aplicativo de planilha.
 DocType: Sales Invoice Item,Batch No,Nº do Lote
@@ -1502,14 +1448,14 @@
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +13,Variant,Variante
 apps/frappe/frappe/public/js/frappe/form/toolbar.js +165,New {0},Nova {0}
 DocType: Naming Series,Set prefix for numbering series on your transactions,Definir prefixo para séries de numeração em suas transações
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +169,Stopped order cannot be cancelled. Unstop to cancel.,Parado ordem não pode ser cancelado. Desentupir para cancelar.
-apps/erpnext/erpnext/stock/doctype/item/item.py +323,Default BOM ({0}) must be active for this item or its template,BOM padrão ({0}) deve estar ativo para este item ou o seu modelo
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +164,Stopped order cannot be cancelled. Unstop to cancel.,Parado ordem não pode ser cancelado. Desentupir para cancelar.
+apps/erpnext/erpnext/stock/doctype/item/item.py +327,Default BOM ({0}) must be active for this item or its template,BOM padrão ({0}) deve estar ativo para este item ou o seu modelo
 DocType: Employee,Leave Encashed?,Licenças cobradas?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Oportunidade De O campo é obrigatório
 DocType: Item,Variants,Variantes
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +458,Make Purchase Order,Criar ordem de compra
 DocType: SMS Center,Send To,Enviar para
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +111,There is not enough leave balance for Leave Type {0},Não há o suficiente equilíbrio pela licença Tipo {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +127,There is not enough leave balance for Leave Type {0},Não há o suficiente equilíbrio pela licença Tipo {0}
 DocType: Sales Team,Contribution to Net Total,Contribuição para o Total Líquido
 DocType: Sales Invoice Item,Customer's Item Code,Código do Item do Cliente
 DocType: Stock Reconciliation,Stock Reconciliation,Reconciliação de Estoque
@@ -1546,11 +1492,11 @@
 DocType: Sales Order Item,Actual Qty,Qtde Real
 DocType: Sales Invoice Item,References,Referências
 DocType: Quality Inspection Reading,Reading 10,Leitura 10
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +612,"List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start.",Liste seus produtos ou serviços que você comprar ou vender .
+apps/erpnext/erpnext/public/js/setup_wizard.js +348,"List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start.",Liste seus produtos ou serviços que você comprar ou vender .
 DocType: Hub Settings,Hub Node,Hub Node
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,"Você digitou itens duplicados . Por favor, corrigir e tentar novamente."
 apps/erpnext/erpnext/controllers/item_variant.py +65,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values,Valor {0} para o atributo {1} não existe na lista de item válido Valores de Atributo
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +87,Associate,Associado
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Associate,Associado
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +46,Item {0} is not a serialized Item,Item {0} não é um item serializado
 DocType: SMS Center,Create Receiver List,Criar Lista de Receptor
 apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +5,Expired,Expirado
@@ -1559,7 +1505,7 @@
 DocType: Warranty Claim,Issue Date,Data da Questão
 DocType: Activity Cost,Activity Cost,Custo de atividade
 DocType: Purchase Receipt Item Supplied,Consumed Qty,Qtde consumida
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +52,Telecommunications,Telecomunicações
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +52,Telecommunications,Telecomunicações
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),Indica que o pacote é uma parte desta entrega (Só Projecto)
 DocType: Payment Tool,Make Payment Entry,Criar entrada de pagamento
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +119,Quantity for Item {0} must be less than {1},Quantidade de item {0} deve ser inferior a {1}
@@ -1576,10 +1522,8 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +37,"Selling must be checked, if Applicable For is selected as {0}","Venda deve ser verificada, se for caso disso for selecionado como {0}"
 DocType: Purchase Order Item,Supplier Quotation Item,Item da Cotação do Fornecedor
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +27,Make Salary Structure,Criar estrutura salarial
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +54,Shearing,Shearing
 DocType: Item,Has Variants,Tem Variantes
 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.,Clique em &#39;Criar Fatura de vendas&#39; botão para criar uma nova factura de venda.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +166,Packaging and labeling,Embalagem e rotulagem
 DocType: Monthly Distribution,Name of the Monthly Distribution,Nome da distribuição mensal
 DocType: Sales Person,Parent Sales Person,Vendedor pai
 apps/erpnext/erpnext/setup/utils.py +14,Please specify Default Currency in Company Master and Global Defaults,"Por favor, especifique Moeda predefinida in Company Mestre e padrões globais"
@@ -1590,19 +1534,18 @@
 DocType: Budget Detail,Fiscal Year,Exercício fiscal
 DocType: Cost Center,Budget,Orçamento
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +41,"Budget cannot be assigned against {0}, as it's not an Income or Expense account","Orçamento não pode ser atribuído contra {0}, pois não é uma conta de renda ou despesa"
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Achieved,Alcançados
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,Alcançados
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +65,Territory / Customer,Território / Cliente
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,e.g. 5,por exemplo 5
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +207,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},Row {0}: quantidade atribuídos {1} deve ser menor ou igual a facturar saldo {2}
+apps/erpnext/erpnext/public/js/setup_wizard.js +294,e.g. 5,por exemplo 5
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},Row {0}: quantidade atribuídos {1} deve ser menor ou igual a facturar saldo {2}
 DocType: Sales Invoice,In Words will be visible once you save the Sales Invoice.,Por extenso será visível quando você salvar a Nota Fiscal de Venda.
 DocType: Item,Is Sales Item,É item de venda
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,Item Tree grupo
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,Item {0} não está configurado para n º s de série mestre check item
 DocType: Maintenance Visit,Maintenance Time,Tempo da manutenção
 ,Amount to Deliver,Valor a entregar
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +620,A Product or Service,Um produto ou serviço
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +158,There were errors.,Ocorreram erros .
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +101,Tapping,Tapping
+apps/erpnext/erpnext/public/js/setup_wizard.js +356,A Product or Service,Um produto ou serviço
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +146,There were errors.,Ocorreram erros .
 DocType: Naming Series,Current Value,Valor Atual
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +171,{0} created,{0} criado
 DocType: Delivery Note Item,Against Sales Order,Contra a Ordem de Vendas
@@ -1617,7 +1560,7 @@
 apps/erpnext/erpnext/accounts/party.py +275,Due Date cannot be before Posting Date,Due Date não pode ser antes de Postar Data
 DocType: Website Item Group,Website Item Group,Grupo de Itens do site
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Duties and Taxes,Impostos e Contribuições
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Please enter Reference date,"Por favor, indique data de referência"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +312,Please enter Reference date,"Por favor, indique data de referência"
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} entradas de pagamento não podem ser filtrados por {1}
 DocType: Item Website Specification,Table for Item that will be shown in Web Site,Tabela para o item que será mostrado no Web Site
 DocType: Purchase Order Item Supplied,Supplied Qty,Fornecido Qtde
@@ -1625,7 +1568,7 @@
 apps/erpnext/erpnext/config/stock.py +103,Tree of Item Groups.,Árvore de Grupos de itens .
 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,Não é possível consultar número da linha superior ou igual ao número da linha atual para este tipo de carga
 ,Item-wise Purchase History,Item-wise Histórico de compras
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +152,Red,Vermelho
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Red,Vermelho
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +228,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},"Por favor, clique em "" Gerar Cronograma ' para buscar Serial Sem adição de item {0}"
 DocType: Account,Frozen,Congelado
 ,Open Production Orders,Pedidos em aberto Produção
@@ -1640,7 +1583,7 @@
 DocType: Item Attribute,Attribute Name,Nome do atributo
 apps/erpnext/erpnext/controllers/selling_controller.py +236,Item {0} must be Sales or Service Item in {1},Item {0} deve ser de Vendas ou Atendimento item em {1}
 DocType: Item Group,Show In Website,Mostrar No Site
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +621,Group,Grupo
+apps/erpnext/erpnext/public/js/setup_wizard.js +357,Group,Grupo
 DocType: Task,Expected Time (in hours),Tempo esperado (em horas)
 ,Qty to Order,Qtde encomendar
 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","Para rastrear marca no seguintes documentos Nota de Entrega, Oportunidade, Pedir Material, Item, Pedido de Compra, Compra de Vouchers, o Comprador Receipt, cotação, Vendas fatura, Pacote de Produtos, Pedido de Vendas, Serial No"
@@ -1650,6 +1593,7 @@
 DocType: Features Setup,Brands,Marcas
 DocType: C-Form Invoice Detail,Invoice No,Nota Fiscal nº
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +480,From Purchase Order,Da Ordem de Compra
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +92,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Deixe não pode ser aplicada / cancelada antes {0}, como saldo licença já tenha sido no futuro recorde alocação licença encaminhadas-carry {1}"
 DocType: Activity Cost,Costing Rate,Preço de Custo
 ,Customer Addresses And Contacts,Endereços e Contatos do Cliente
 DocType: Employee,Resignation Letter Date,Data da carta de demissão
@@ -1657,35 +1601,31 @@
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +137,Not Set,não informado
 DocType: Communication,Date,Data
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,Receita Cliente Repita
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +651,Sit tight while your system is being setup. This may take a few moments.,Sente-se apertado enquanto o sistema está sendo configurado . Isso pode demorar alguns instantes.
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +115,Sit tight while your system is being setup. This may take a few moments.,Sente-se apertado enquanto o sistema está sendo configurado . Isso pode demorar alguns instantes.
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +51,{0} ({1}) must have role 'Expense Approver',{0} ({1}) deve ter o papel 'Aprovador de Despesas'
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Pair,par
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Pair,par
 DocType: Bank Reconciliation Detail,Against Account,Contra à Conta
 DocType: Maintenance Schedule Detail,Actual Date,Data Real
 DocType: Item,Has Batch No,Tem nº de Lote
 DocType: Delivery Note,Excise Page Number,Número de página do imposto
 DocType: Employee,Personal Details,Detalhes pessoais
 ,Maintenance Schedules,Horários de Manutenção
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +44,Embossing,Gravação em relevo
 ,Quotation Trends,Tendências de cotação
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +139,Item Group not mentioned in item master for item {0},Grupo item não mencionado no mestre de item para item {0}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +302,Debit To account must be a Receivable account,De débito em conta deve ser uma conta a receber
-apps/erpnext/erpnext/stock/doctype/item/item.py +310,"As Production Order can be made for this item, it must be a stock item.","Como ordem de produção pode ser feita para este item, ele deve ser um item de estoque."
 DocType: Shipping Rule Condition,Shipping Amount,Valor do transporte
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +140,Joining,Juntando
-DocType: Authorization Rule,Above Value,Acima do Valor
 ,Pending Amount,Enquanto aguarda Valor
 DocType: Purchase Invoice Item,Conversion Factor,Fator de Conversão
 DocType: Purchase Order,Delivered,Entregue
 apps/erpnext/erpnext/config/hr.py +160,Setup incoming server for jobs email id. (e.g. jobs@example.com),Configuração do servidor de entrada para os trabalhos de identificação do email . ( por exemplo jobs@example.com )
 DocType: Purchase Receipt,Vehicle Number,Número de veículos
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,A data em que fatura recorrente será interrompida
+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,Total de folhas alocados {0} não pode ser menos do que as folhas já aprovados {1} para o período
 DocType: Journal Entry,Accounts Receivable,Contas a Receber
 ,Supplier-Wise Sales Analytics,Fornecedor -wise vendas Analytics
 DocType: Address Template,This format is used if country specific format is not found,Este formato é usado se o formato específico país não é encontrado
 DocType: Custom Field,Custom,Personalizado
 DocType: Production Order,Use Multi-Level BOM,Utilize LDM de Vários Níveis
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +26,Injection molding,Moldagem por injeção
 DocType: Bank Reconciliation,Include Reconciled Entries,Incluir entradas Reconciliados
 apps/erpnext/erpnext/config/accounts.py +41,Tree of finanial accounts.,Árvore de contas finanial .
 DocType: Leave Control Panel,Leave blank if considered for all employee types,Deixe em branco se considerado para todos os tipos de empregados
@@ -1695,30 +1635,28 @@
 apps/frappe/frappe/config/setup.py +130,Printing,Impressão
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +114,Expense Claim is pending approval. Only the Expense Approver can update status.,Despesa reivindicação está pendente de aprovação . Somente o aprovador Despesa pode atualizar status.
 DocType: Purchase Invoice,Additional Discount Amount,Montante desconto adicional
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +99,The day(s) on which you are applying for leave are holiday. You need not apply for leave.,No dia (s) em que você está se candidatando para a licença estão de férias. Você não precisa solicitar uma licença .
 apps/frappe/frappe/public/js/frappe/misc/utils.js +110,and,e
 DocType: Leave Block List Allow,Leave Block List Allow,Deixe Lista de Bloqueios Permitir
 apps/erpnext/erpnext/setup/doctype/company/company.py +236,Abbr can not be blank or space,Abbr não pode estar em branco ou espaço
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +50,Sports,esportes
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,esportes
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Actual,Total real
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Unit,unidade
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Unit,unidade
 apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.py +182,Please set Dropbox access keys in your site config,Defina teclas de acesso Dropbox em sua configuração local
 apps/erpnext/erpnext/stock/get_item_details.py +113,Please specify Company,"Por favor, especifique Empresa"
 ,Customer Acquisition and Loyalty,Aquisição de Clientes e Fidelização
 DocType: Purchase Receipt,Warehouse where you are maintaining stock of rejected items,Almoxarifado onde você está mantendo estoque de itens rejeitados
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +408,Your financial year ends on,Seu exercício termina em
+apps/erpnext/erpnext/public/js/setup_wizard.js +156,Your financial year ends on,Seu exercício termina em
 DocType: POS Profile,Price List,Lista de Preços
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +20,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,"{0} é agora o Ano Fiscal padrão. Por favor, atualize seu navegador para que a alteração tenha efeito."
 apps/erpnext/erpnext/projects/doctype/project/project.js +47,Expense Claims,Os relatórios de despesas
 DocType: Issue,Support,Suporte
-DocType: Authorization Rule,Approving Role,Perfil de Aprovador
 ,BOM Search,BOM Pesquisa
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +176,Closing (Opening + Totals),Fechando (abertura + Totais)
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +26,Please specify currency in Company,"Por favor, especifique moeda in Company"
 DocType: Workstation,Wages per hour,salário por hora
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},Da balança em Batch {0} se tornará negativo {1} para item {2} no Armazém {3}
 apps/erpnext/erpnext/config/setup.py +83,"Show / Hide features like Serial Nos, POS etc.","Mostrar / Ocultar recursos como os números de ordem , POS , etc"
-apps/erpnext/erpnext/controllers/accounts_controller.py +236,Account {0} is invalid. Account Currency must be {1},Conta {0} é inválido. Conta de moeda deve ser {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +237,Account {0} is invalid. Account Currency must be {1},Conta {0} é inválido. Conta de moeda deve ser {1}
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +34,UOM Conversion factor is required in row {0},UOM fator de conversão é necessária na linha {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +53,Clearance date cannot be before check date in row {0},Apuramento data não pode ser anterior à data de verificação na linha {0}
 DocType: Salary Slip,Deduction,Dedução
@@ -1737,13 +1675,13 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +82,Item {0} has already been returned,Item {0} já foi devolvido
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,O **Ano Fiscal** representa um exercício financeiro. Todos os lançamentos contábeis e outras transações principais são rastreadas contra o **Ano Fiscal**.
 DocType: Opportunity,Customer / Lead Address,Endereço do Cliente/Cliente em Potencial
+apps/erpnext/erpnext/stock/doctype/item/item.py +112,Warning: Invalid SSL certificate on attachment {0},Aviso: certificado SSL inválido no anexo {0}
 DocType: Production Order Operation,Actual Operation Time,Tempo Real da Operação
 DocType: Authorization Rule,Applicable To (User),Aplicável Para (Usuário)
 DocType: Purchase Taxes and Charges,Deduct,Deduzir
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +170,Job Description,Descrição do trabalho
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +170,Job Description,Descrição do trabalho
 DocType: Purchase Order Item,Qty as per Stock UOM,Qtde. como por UDM de estoque
 apps/frappe/frappe/model/rename_doc.py +343,Please select a valid csv file with data,"Por favor, selecione um arquivo csv com dados válidos"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +92,Coating,Revestimento
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +126,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Caracteres especiais, exceto ""-"" ""."", ""#"", e ""/"" não é permitido em série nomeando"
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Mantenha o controle de campanhas de vendas. Mantenha o controle de Leads, cotações, Pedido de Vendas etc de Campanhas para medir retorno sobre o investimento. "
 DocType: Expense Claim,Approver,Aprovador
@@ -1753,12 +1691,11 @@
 DocType: Supplier Quotation,Manufacturing Manager,Gerente de Manufatura
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},Serial Não {0} está na garantia até {1}
 apps/erpnext/erpnext/config/stock.py +69,Split Delivery Note into packages.,Dividir Guia de Remessa em pacotes.
-apps/erpnext/erpnext/hooks.py +84,Shipments,Os embarques
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +29,Dip molding,Moldagem Dip
+apps/erpnext/erpnext/hooks.py +68,Shipments,Os embarques
 DocType: Purchase Order,To be delivered to customer,Para ser entregue ao cliente
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,Tempo Log Estado devem ser apresentadas.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,O Serial No {0} não pertence a nenhum Warehouse
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +650,Setting Up,Configurando
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +114,Setting Up,Configurando
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,Row # ,Row #
 DocType: Purchase Invoice,In Words (Company Currency),In Words (Moeda Company)
 DocType: Pricing Rule,Supplier,Fornecedor
@@ -1766,7 +1703,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +105,Miscellaneous Expenses,Despesas Diversas
 DocType: Global Defaults,Default Company,Empresa padrão
 apps/erpnext/erpnext/controllers/stock_controller.py +166,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,Despesa ou Diferença conta é obrigatória para item {0} como ela afeta o valor das ações em geral
-apps/erpnext/erpnext/controllers/accounts_controller.py +354,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","Não é possível para overbill item {0} na linha {1} mais de {2}. Para permitir superfaturamento, por favor, defina em estoque Configurações"
+apps/erpnext/erpnext/controllers/accounts_controller.py +355,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","Não é possível para overbill item {0} na linha {1} mais de {2}. Para permitir superfaturamento, por favor, defina em estoque Configurações"
 DocType: Employee,Bank Name,Nome do Banco
 apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +27,-Above,-Acima
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +135,User {0} is disabled,Usuário {0} está desativado
@@ -1779,27 +1716,26 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,{0} is mandatory for Item {1},{0} é obrigatório para o item {1}
 DocType: Currency Exchange,From Currency,De Moeda
 DocType: DocField,Name,Nome
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +211,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Por favor, selecione montante atribuído, tipo de fatura e número da fatura em pelo menos uma fileira"
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +104,Sales Order required for Item {0},Ordem de venda necessário para item {0}
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +158,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Por favor, selecione montante atribuído, tipo de fatura e número da fatura em pelo menos uma fileira"
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +107,Sales Order required for Item {0},Ordem de venda necessário para item {0}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +43,Amounts not reflected in system,Valores não reflete em sistema
 DocType: Purchase Invoice Item,Rate (Company Currency),Preço (moeda da empresa)
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +40,Others,outros
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +40,Others,outros
 apps/erpnext/erpnext/templates/includes/product_page.js +80,Cannot find a matching Item. Please select some other value for {0}.,"Não consegue encontrar um item correspondente. Por favor, selecione algum outro valor para {0}."
 DocType: POS Profile,Taxes and Charges,Impostos e Encargos
 DocType: Item,"A Product or a Service that is bought, sold or kept in stock.","Um produto ou um serviço que é comprado, vendido ou mantido em estoque."
 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,"Não é possível selecionar o tipo de carga como "" Valor Em linha anterior ' ou ' On Anterior Row Total ' para a primeira linha"
 apps/frappe/frappe/core/doctype/doctype/boilerplate/controller_list.html +31,Completed,Concluído
 DocType: Web Form,Select DocType,Selecione o DocType
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +104,Broaching,Brochar
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +12,Banking,Bancário
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,Bancário
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +38,Please click on 'Generate Schedule' to get schedule,"Por favor, clique em "" Gerar Agenda "" para obter cronograma"
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +283,New Cost Center,Novo Centro de Custo
 DocType: Bin,Ordered Quantity,Quantidade encomendada
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +397,"e.g. ""Build tools for builders""","por exemplo ""Construa ferramentas para os construtores """
+apps/erpnext/erpnext/public/js/setup_wizard.js +145,"e.g. ""Build tools for builders""","por exemplo ""Construa ferramentas para os construtores """
 DocType: Quality Inspection,In Process,Em Processo
 DocType: Authorization Rule,Itemwise Discount,Desconto relativo ao Item
 DocType: Purchase Order Item,Reference Document Type,Referência Tipo de Documento
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +318,{0} against Sales Order {1},{0} contra a Ordem de Venda {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +320,{0} against Sales Order {1},{0} contra a Ordem de Venda {1}
 DocType: Account,Fixed Asset,ativos Fixos
 apps/erpnext/erpnext/config/stock.py +283,Serialized Inventory,Inventário Serialized
 DocType: Activity Type,Default Billing Rate,Preço de Faturamento Padrão
@@ -1814,14 +1750,13 @@
 DocType: Purchase Invoice Item,Page Break,Quebra de página
 DocType: Production Order Operation,Pending,Pendente
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,Usuários que podem aprovar pedidos de licença de um funcionário específico
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +33,You cannot change default UOM of Variant. To change default UOM for Variant change default UOM of the Template,Você não pode mudar UOM padrão de Variant. Para alterar UOM padrão para Variant UOM mudança padrão do modelo
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +50,Office Equipments,Equipamentos de escritório
 DocType: Purchase Invoice Item,Qty,Qtde.
 DocType: Fiscal Year,Companies,Empresas
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +24,Electronics,eletrônica
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +24,Electronics,eletrônica
 DocType: Stock Settings,Raise Material Request when stock reaches re-order level,Levante solicitar material quando o estoque atinge novo pedido de nível
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +18,From Maintenance Schedule,Do Programa de Manutenção
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +56,Full-time,Tempo integral
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +56,Full-time,Tempo integral
 DocType: Purchase Invoice,Contact Details,Detalhes do Contato
 DocType: C-Form,Received Date,Data de recebimento
 DocType: Delivery Note,"If you have created a standard template in Sales Taxes and Charges Template, select one and click on the button below.","Se você criou um modelo padrão de Impostos e Taxas de Vendas Modelo, selecione um e clique no botão abaixo."
@@ -1833,11 +1768,12 @@
 DocType: Job Applicant,Job Opening,Vaga de emprego
 DocType: Payment Reconciliation,Payment Reconciliation,Reconciliação Pagamento
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +154,Please select Incharge Person's name,"Por favor, selecione o nome do Incharge Pessoa"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +51,Technology,tecnologia
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,tecnologia
 DocType: Offer Letter,Offer Letter,Oferecer Letter
 apps/erpnext/erpnext/config/manufacturing.py +51,Generate Material Requests (MRP) and Production Orders.,Gerar Pedidos de Materiais (MRP) e ordens de produção.
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +68,Total Invoiced Amt,Total facturado Amt
 DocType: Time Log,To Time,Para Tempo
+DocType: Authorization Rule,Approving Role (above authorized value),Aprovando Papel (acima do valor autorizado)
 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.","Para adicionar nós filho, explorar árvore e clique no nó em que você deseja adicionar mais nós."
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +102,Credit To account must be a Payable account,A conta de Crédito deve ser uma conta do Contas à Pagar
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +233,BOM recursion: {0} cannot be parent or child of {2},LDM recursão: {0} não pode ser pai ou filho de {2}
@@ -1850,10 +1786,8 @@
 DocType: Item,Customer Item Codes,Item de cliente Códigos
 DocType: Opportunity,Lost Reason,Razão da perda
 apps/erpnext/erpnext/config/accounts.py +68,Create Payment Entries against Orders or Invoices.,Criar registro de pagamento para as Ordens ou Faturas.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +141,Welding,Soldadura
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +40,New Stock UOM is required,Novo Estoque UOM é necessária
 DocType: Quality Inspection,Sample Size,Tamanho da amostra
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +443,All items have already been invoiced,Todos os itens já foram faturados
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +446,All items have already been invoiced,Todos os itens já foram faturados
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',"Por favor, especifique um válido &#39;De Caso No.&#39;"
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +287,Further cost centers can be made under Groups but entries can be made against non-Groups,"Mais centros de custo podem ser feitas em grupos, mas as entradas podem ser feitas contra os não-Groups"
 DocType: Project,External,Externo
@@ -1865,8 +1799,7 @@
 DocType: Bin,Actual Quantity,Quantidade Real
 DocType: Shipping Rule,example: Next Day Shipping,exemplo: Next Day envio
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,Serial No {0} não foi encontrado
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +563,Your Customers,Clientes
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +27,Compression molding,Moldagem por compressão
+apps/erpnext/erpnext/public/js/setup_wizard.js +303,Your Customers,Clientes
 DocType: Leave Block List Date,Block Date,Bloquear Data
 DocType: Sales Order,Not Delivered,Não Entregue
 ,Bank Clearance Summary,Banco Resumo Clearance
@@ -1887,10 +1820,10 @@
 DocType: SMS Log,Sent To,Enviado Para
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +28,Make Sales Invoice,Criar fatura de vendas
 DocType: Company,For Reference Only.,Apenas para referência.
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +29,Invalid {0}: {1},Inválido {0}: {1}
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +49,Invalid {0}: {1},Inválido {0}: {1}
 DocType: Sales Invoice Advance,Advance Amount,Quantidade Antecipada
 DocType: Manufacturing Settings,Capacity Planning,Planejamento de capacidade
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +49,'From Date' is required,Informe a 'Data Inicial'
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +43,'From Date' is required,Informe a 'Data Inicial'
 DocType: Journal Entry,Reference Number,Número de Referência
 DocType: Employee,Employment Details,Detalhes de emprego
 DocType: Employee,New Workplace,Novo local de trabalho
@@ -1905,7 +1838,7 @@
 DocType: Serial No,Delivery Time,Prazo de entrega
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Envelhecimento Baseado em
 DocType: Item,End of Life,Fim de Vida
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +41,Travel,viagem
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +41,Travel,viagem
 DocType: Leave Block List,Allow Users,Permitir que os usuários
 DocType: Purchase Order,Customer Mobile No,Cliente Móvel Nenhum
 DocType: Sales Invoice,Recurring,Recorrente
@@ -1919,7 +1852,7 @@
 DocType: Naming Series,User must always select,O Usuário deve sempre selecionar
 DocType: Stock Settings,Allow Negative Stock,Permitir Estoque Negativo
 DocType: Installation Note,Installation Note,Nota de Instalação
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +541,Add Taxes,Adicionar Impostos
+apps/erpnext/erpnext/public/js/setup_wizard.js +283,Add Taxes,Adicionar Impostos
 ,Financial Analytics,Análise Financeira
 DocType: Quality Inspection,Verified By,Verificado Por
 DocType: Address,Subsidiary,Subsidiário
@@ -1929,7 +1862,6 @@
 DocType: System Settings,In Hours,Em Horas
 DocType: Process Payroll,Create Salary Slip,Criar Folha de Pagamento
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Expected balance as per bank,Equilíbrio esperado como por banco
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +115,Buffing,Buffing
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Source of Funds (Liabilities),Fonte de Recursos ( Passivo)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +347,Quantity in row {0} ({1}) must be same as manufactured quantity {2},Quantidade em linha {0} ( {1} ) deve ser a mesma quantidade fabricada {2}
 DocType: Appraisal,Employee,Funcionário
@@ -1946,11 +1878,11 @@
 DocType: Rename Tool,File to Rename,Arquivo para renomear
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +176,Purchse Order number required for Item {0},Número de pedido purchse necessário para item {0}
 apps/erpnext/erpnext/public/js/controllers/transaction.js +136,Show Payments,Mostrar Pagamentos
-apps/erpnext/erpnext/controllers/buying_controller.py +245,Specified BOM {0} does not exist for Item {1},Especificada BOM {0} não existe para item {1}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +202,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Programação de manutenção {0} deve ser cancelado antes de cancelar esta ordem de venda
+apps/erpnext/erpnext/controllers/buying_controller.py +236,Specified BOM {0} does not exist for Item {1},Especificada BOM {0} não existe para item {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Programação de manutenção {0} deve ser cancelado antes de cancelar esta ordem de venda
 apps/frappe/frappe/desk/page/backups/backups.html +13,Size,Tamanho
 DocType: Notification Control,Expense Claim Approved,Pedido de Reembolso de Despesas Aprovado
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +113,Pharmaceutical,farmacêutico
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Pharmaceutical,farmacêutico
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,Custo de Produtos Comprados
 DocType: Selling Settings,Sales Order Required,Ordem de Venda Obrigatória
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +30,Create Customer,Criar Cliente
@@ -1960,7 +1892,6 @@
 DocType: Quality Inspection Reading,Reading 9,Leitura 9
 DocType: Supplier,Is Frozen,Está Congelado
 DocType: Buying Settings,Buying Settings,Configurações de Compras
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +122,Mass finishing,Acabamento em massa
 DocType: Stock Entry Detail,BOM No. for a Finished Good Item,Nº da LDM para um Item Bom Acabado
 DocType: Upload Attendance,Attendance To Date,Data Final de Comparecimento
 apps/erpnext/erpnext/config/selling.py +158,Setup incoming server for sales email id. (e.g. sales@example.com),Configuração do servidor de entrada de e-mail id vendas. ( por exemplo sales@example.com )
@@ -1968,7 +1899,7 @@
 DocType: Payment Tool,Payment Account,Conta de Pagamento
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +713,Please specify Company to proceed,"Por favor, especifique Empresa proceder"
 apps/frappe/frappe/public/js/frappe/model/indicator.js +30,Draft,Rascunho
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +46,Compensatory Off,compensatória Off
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Compensatory Off,compensatória Off
 DocType: Quality Inspection Reading,Accepted,Aceito
 DocType: User,Female,Feminino
 DocType: Journal Entry Account,Debit in Account Currency,Débito em Conta de moeda
@@ -1980,7 +1911,7 @@
 DocType: Shipping Rule,Shipping Rule Label,Rótudo da Regra de Envio
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +209,Raw Materials cannot be blank.,Matérias-primas não pode ficar em branco.
 DocType: Newsletter,Test,Teste
-apps/erpnext/erpnext/stock/doctype/item/item.py +364,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +368,"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'","Como existem transações com ações existentes para este item, \ não é possível alterar os valores de &#39;não tem Serial&#39;, &#39;Tem Lote n&#39;, &#39;é Stock item &quot;e&quot; Método de avaliação&#39;"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +448,Quick Journal Entry,Breve Journal Entry
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +92,You can not change rate if BOM mentioned agianst any item,Você não pode alterar a taxa de se BOM mencionado em algum item
@@ -1991,13 +1922,14 @@
 apps/erpnext/erpnext/config/stock.py +18,Requests for items.,Os pedidos de itens.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,Uma Ordem de Produção separada será criada para cada item acabado.
 DocType: Purchase Invoice,Terms and Conditions1,Termos e Condições
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +18,Complete Setup,Instalação concluída
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard_page.html +18,Complete Setup,Instalação concluída
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","Registros contábeis congelados até a presente data, ninguém pode criar/modificar registros com exceção do perfil especificado abaixo."
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +121,Please save the document before generating maintenance schedule,"Por favor, salve o documento antes de gerar programação de manutenção"
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,Status do Projeto
 DocType: UOM,Check this to disallow fractions. (for Nos),Marque esta opção para não permitir frações. (Para n)
 apps/erpnext/erpnext/config/crm.py +96,Newsletter Mailing List,Mailing List Boletim informativo
 DocType: Delivery Note,Transporter Name,Nome da Transportadora
+DocType: Authorization Rule,Authorized Value,Valor Autorizado
 DocType: Contact,Enter department to which this Contact belongs,Entre com o departamento a que este contato pertence
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Absent,Total de Absent
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +746,Item or Warehouse for row {0} does not match Material Request,Item ou Armazém para linha {0} não corresponde Pedido de materiais
@@ -2023,16 +1955,15 @@
 DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),Preço Unitário (de acordo da UOM)
 DocType: SMS Log,No of Requested SMS,Nº de SMS pedidos
 DocType: Campaign,Campaign-.####,Campanha - . # # # #
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +55,Piercing,Perfurante
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,Próximos passos
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +117,Contract End Date must be greater than Date of Joining,Data de Encerramento do Contrato deve ser maior que Data de Inicio
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,Um distribuidor de terceiros / revendedor / comissão do agente / filial / revendedor que vende os produtos de empresas de uma comissão.
 DocType: Customer Group,Has Child Node,Tem nó filho
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{0} against Purchase Order {1},{0} contra a Ordem de Compra {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +332,{0} against Purchase Order {1},{0} contra a Ordem de Compra {1}
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","Digite os parâmetros da URL estática aqui (por exemplo remetente=ERPNext, usuario=ERPNext, senha=1234, etc)"
 apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,{0} {1} não consta em nenhum Ano Fiscal Ativo. Para mais detalhes consulte {2}.
-apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,Este é um exemplo website auto- gerada a partir ERPNext
+apps/erpnext/erpnext/setup/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,Este é um exemplo website auto- gerada a partir ERPNext
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +37,Ageing Range 1,Faixa Envelhecimento 1
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +110,Photochemical machining,Usinagem fotoquímica
 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.
 
 #### Note
@@ -2078,7 +2009,7 @@
 DocType: Purchase Receipt Item,Recd Quantity,Quantidade Recebida
 DocType: Email Account,Email Ids,Email Ids
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},Não é possível produzir mais item {0} do que a quantidade Ordem de Vendas {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +471,Stock Entry {0} is not submitted,Da entrada {0} não é apresentado
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +473,Stock Entry {0} is not submitted,Da entrada {0} não é apresentado
 DocType: Payment Reconciliation,Bank / Cash Account,Banco / Conta Caixa
 DocType: Tax Rule,Billing City,Faturamento Cidade
 DocType: Global Defaults,Hide Currency Symbol,Ocultar Símbolo de Moeda
@@ -2094,7 +2025,7 @@
 DocType: Purchase Invoice,Currency and Price List,Moeda e Preço
 DocType: Opportunity,Customer / Lead Name,Nome do Cliente/Cliente em Potencial
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +63,Clearance Date not mentioned,Apuramento data não mencionada
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +71,Production,Produção
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Production,Produção
 DocType: Item,Allow Production Order,Permitir Ordem de Produção
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +60,Row {0}:Start Date must be before End Date,Row {0}: Data de início deve ser anterior a data de término
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Total (Qtde)
@@ -2107,7 +2038,7 @@
 apps/erpnext/erpnext/utilities/doctype/address/address.py +113,My Addresses,Os meus endereços
 DocType: Stock Ledger Entry,Outgoing Rate,Taxa de saída
 apps/erpnext/erpnext/config/hr.py +100,Organization branch master.,Mestre Organização ramo .
-apps/erpnext/erpnext/controllers/accounts_controller.py +237, or ,ou
+apps/erpnext/erpnext/controllers/accounts_controller.py +238, or ,ou
 DocType: Sales Order,Billing Status,Estado do Faturamento
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Utility Expenses,Despesas com Serviços Públicos
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,90-Above,Acima de 90
@@ -2134,6 +2065,7 @@
 DocType: Stock Entry Detail,Serial No / Batch,N º de Série / lote
 DocType: Product Bundle,Parent Item,Item Pai
 DocType: Account,Account Type,Tipo de Conta
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +113,Leave Type {0} cannot be carry-forwarded,Deixe tipo {0} não pode ser encaminhado carry-
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +213,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',"Programação de manutenção não é gerado para todos os itens. Por favor, clique em "" Gerar Agenda """
 ,To Produce,para Produzir
 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","Para linha {0} em {1}. Para incluir {2} na taxa de Item, linhas {3} também devem ser incluídos"
@@ -2141,10 +2073,7 @@
 DocType: Bin,Reserved Quantity,Quantidade Reservada
 DocType: Landed Cost Voucher,Purchase Receipt Items,Itens do Recibo de Compra
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,Formas de personalização
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +62,Cutting,Corte
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +69,Flattening,Achatamento
 DocType: Account,Income Account,Conta de Receitas
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +22,Molding,Modelagem
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +632,Delivery,Entrega
 DocType: Stock Reconciliation Item,Current Qty,Qtde atual
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",Consulte &quot;taxa de materiais baseados em&quot; no Custeio Seção
@@ -2154,20 +2083,19 @@
 apps/frappe/frappe/desk/moduleview.py +61,Documents,Documentos
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +17,Ref,Reference
 DocType: Cost Center,Cost Center,Centro de Custos
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.js +48,Voucher #,vale #
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +36,Voucher #,vale #
 DocType: Notification Control,Purchase Order Message,Mensagem da Ordem de Compra
 DocType: Tax Rule,Shipping Country,O envio País
 DocType: Upload Attendance,Upload HTML,Carregar HTML
-apps/erpnext/erpnext/controllers/accounts_controller.py +391,"Total advance ({0}) against Order {1} cannot be greater \
+apps/erpnext/erpnext/controllers/accounts_controller.py +392,"Total advance ({0}) against Order {1} cannot be greater \
 				than the Grand Total ({2})","Antecedência Total ({0}) contra a Ordem {1} não pode ser maior do que o Grand \
  Total ({2})"
 DocType: Employee,Relieving Date,Data da Liberação
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +12,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.","Regra de preços é feita para substituir Lista de Preços / define percentual de desconto, com base em alguns critérios."
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,Armazém só pode ser alterado através de entrada / entrega  da nota / recibo de compra
 DocType: Employee Education,Class / Percentage,Classe / Percentual
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +92,Head of Marketing and Sales,Diretor de Marketing e Vendas
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +31,Income Tax,Imposto de Renda
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +157,Laser engineered net shaping,Laser engenharia shaping net
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Head of Marketing and Sales,Diretor de Marketing e Vendas
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +31,Income Tax,Imposto de Renda
 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.","Se regra de preços selecionado é feita por 'preço', ele irá substituir Lista de Preços. Preço regra de preço é o preço final, de forma que nenhum desconto adicional deve ser aplicada. Assim, em operações como a Ordem de Vendas, Ordem de Compra etc, será buscado no campo ""taxa"", ao invés de campo ""Lista de Preços Rate '."
 apps/erpnext/erpnext/config/selling.py +163,Track Leads by Industry Type.,Trilha leva por setor Type.
 DocType: Item Supplier,Item Supplier,Fornecedor do Item
@@ -2190,31 +2118,28 @@
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Qtde Real Após a Transação
 ,Pending SO Items For Purchase Request,"Itens Pendentes Assim, por solicitação de compra"
 DocType: Supplier,Billing Currency,Faturamento Moeda
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +148,Extra Large,Extra-grande
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,Extra Large,Extra-grande
 ,Profit and Loss Statement,Demonstração dos Resultados
 DocType: Bank Reconciliation Detail,Cheque Number,Número do cheque
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +43,Pressing,Premente
 DocType: Payment Tool Detail,Payment Tool Detail,Detalhe ferramenta de pagamento
 ,Sales Browser,Navegador de Vendas
 DocType: Journal Entry,Total Credit,Crédito Total
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +474,Warning: Another {0} # {1} exists against stock entry {2},Aviso: Outra {0} # {1} existe contra entrada de material {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +459,Local,local
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +476,Warning: Another {0} # {1} exists against stock entry {2},Aviso: Outra {0} # {1} existe contra entrada de material {2}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +397,Local,local
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),Empréstimos e Adiantamentos (Ativo )
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,Devedores
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +147,Large,Grande
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +23,No employee found!,Nenhum funcionário encontrado!
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Large,Grande
 DocType: C-Form Invoice Detail,Territory,Território
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,"Por favor, não mencione de visitas necessárias"
 DocType: Purchase Order,Customer Address Display,Exibir endereço do cliente
 DocType: Stock Settings,Default Valuation Method,Método de Avaliação padrão
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +127,Polishing,Polimento
 DocType: Production Order Operation,Planned Start Time,Planned Start Time
 apps/erpnext/erpnext/config/accounts.py +63,Close Balance Sheet and book Profit or Loss.,Fechar Balanço e livro ou perda .
-apps/erpnext/erpnext/stock/doctype/item/item.py +661,"Default Unit of Measure for Item {0} cannot be changed directly because \
+apps/erpnext/erpnext/stock/doctype/item/item.py +665,"Default Unit of Measure for Item {0} cannot be changed directly because \
 			you have already made some transaction(s) with another UOM. To change default UOM, \
 			use 'UOM Replace Utility' tool under Stock module.","Unidade de medida padrão para item {0} não pode ser alterado diretamente porque \ você já fez alguma transação (s) com outro UOM. Para alterar UOM padrão, \ uso &#39;UOM Substitua Utility &quot;ferramenta abaixo Stock módulo."
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,Especifique Taxa de Câmbio para converter uma moeda em outra
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +146,Quotation {0} is cancelled,Cotação {0} esta cancelada
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +141,Quotation {0} is cancelled,Cotação {0} esta cancelada
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,Montante total em dívida
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} was on leave on {1}. Cannot mark attendance.,Empregado {0} estava de licença em {1} . Não pode marcar presença.
 DocType: Sales Partner,Targets,Metas
@@ -2225,7 +2150,6 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +158,Please create Customer from Lead {0},"Por favor, crie Cliente de chumbo {0}"
 DocType: Price List,Applicable for Countries,Aplicável para os Países
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Computers,Computadores
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +112,Electro-chemical grinding,Electro-química de moagem
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +14,This is a root customer group and cannot be edited.,Este é um grupo de clientes de raiz e não pode ser editada.
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +39,Please setup your chart of accounts before you start Accounting Entries,"Por favor, configure o seu plano de contas antes de começar a lançamentos contábeis"
 DocType: Purchase Invoice,Ignore Pricing Rule,Ignorar regra de preços
@@ -2283,7 +2207,6 @@
 DocType: Maintenance Visit,Purposes,Fins
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +103,Atleast one item should be entered with negative quantity in return document,Pelo menos um item deve ser inserido com quantidade negativa no documento de devolução
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +67,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","Operação {0} mais do que as horas de trabalho disponíveis na estação de trabalho {1}, quebrar a operação em várias operações"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +134,Electrochemical machining,Maquinagem electroquimica
 ,Requested,solicitado
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +66,No Remarks,Não Observações
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +13,Overdue,Vencido
@@ -2292,7 +2215,7 @@
 DocType: Monthly Distribution,Distribution Name,Nome da distribuição
 DocType: Features Setup,Sales and Purchase,Vendas e Compra
 DocType: Supplier Quotation Item,Material Request No,Pedido de material no
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +218,Quality Inspection required for Item {0},Inspeção de Qualidade exigido para item {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +221,Quality Inspection required for Item {0},Inspeção de Qualidade exigido para item {0}
 DocType: Quotation,Rate at which customer's currency is converted to company's base currency,Taxa na qual a moeda do cliente é convertida para a moeda base da empresa
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +107,{0} has been successfully unsubscribed from this list.,{0} foi retirado com sucesso desta lista.
 DocType: Purchase Invoice Item,Net Rate (Company Currency),Taxa Líquida (Companhia de moeda)
@@ -2310,9 +2233,8 @@
 apps/erpnext/erpnext/accounts/report/financial_statements.py +16,Fiscal Year {0} not found.,Ano Fiscal {0} não foi encontrado.
 DocType: Bank Reconciliation,Get Relevant Entries,Obter entradas relevantes
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +407,Accounting Entry for Stock,Lançamento Contábil de Estoque
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +64,Coining,Cunhagem
 DocType: Sales Invoice,Sales Team1,Equipe de Vendas 1
-apps/erpnext/erpnext/stock/doctype/item/item.py +412,Item {0} does not exist,Item {0} não existe
+apps/erpnext/erpnext/stock/doctype/item/item.py +416,Item {0} does not exist,Item {0} não existe
 DocType: Sales Invoice,Customer Address,Endereço do Cliente
 apps/frappe/frappe/desk/query_report.py +136,Total,Total
 DocType: Purchase Invoice,Apply Additional Discount On,Aplicar desconto adicional em
@@ -2324,14 +2246,13 @@
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),Valor do imposto Valor Depois de desconto (Companhia de moeda)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +149,Target warehouse is mandatory for row {0},Destino do Warehouse é obrigatória para a linha {0}
 DocType: Quality Inspection,Quality Inspection,Inspeção de Qualidade
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +144,Extra Small,Muito Pequeno
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +20,Spray forming,Spray de formação
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Extra Small,Muito Pequeno
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +458,Warning: Material Requested Qty is less than Minimum Order Qty,Aviso: Quantidade de material solicitado é menor do que a ordem mínima 
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +191,Account {0} is frozen,A Conta {0} está congelada
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Entidade Legal / Subsidiária com um gráfico separado de Contas pertencente à Organização.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +29,"Food, Beverage & Tobacco","Alimentos, Bebidas e Fumo"
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","Alimentos, Bebidas e Fumo"
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +20,PL or BS,PL ou BS
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,Can only make payment against unbilled {0},Só pode fazer o pagamento contra a faturar {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +531,Can only make payment against unbilled {0},Só pode fazer o pagamento contra a faturar {0}
 apps/erpnext/erpnext/controllers/selling_controller.py +122,Commission rate cannot be greater than 100,Taxa de comissão não pode ser maior do que 100
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Minimum Inventory Level,Nível Mínimo Inventory
 DocType: Stock Entry,Subcontract,Subcontratar
@@ -2342,19 +2263,18 @@
 DocType: Item,Manufacturer Part Number,Número de peça do fabricante
 DocType: Production Order Operation,Estimated Time and Cost,Tempo estimado e Custo
 DocType: Bin,Bin,Caixa
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +50,Nosing,Astrágalo
 DocType: SMS Log,No of Sent SMS,Nº de SMS enviados
 DocType: Account,Company,Empresa
 DocType: Account,Expense Account,Conta de Despesas
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +49,Software,Software
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +151,Colour,Cor
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +49,Software,Software
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Colour,Cor
 DocType: Maintenance Visit,Scheduled,Agendado
 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","Por favor, selecione o item em que &quot;é o estoque item&quot; é &quot;Não&quot; e &quot;é o item Vendas&quot; é &quot;Sim&quot; e não há nenhum outro pacote de produtos"
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,Selecione distribuição mensal para distribuir desigualmente alvos através meses.
 DocType: Purchase Invoice Item,Valuation Rate,Taxa de Avaliação
 apps/erpnext/erpnext/stock/get_item_details.py +281,Price List Currency not selected,Lista de Preço Moeda não selecionado
 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,Row item {0}: Recibo de compra {1} não existe em cima da tabela 'recibos de compra'
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +134,Employee {0} has already applied for {1} between {2} and {3},Empregado {0} já solicitou {1} {2} entre e {3}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +145,Employee {0} has already applied for {1} between {2} and {3},Empregado {0} já solicitou {1} {2} entre e {3}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Data de início do Projeto
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +8,Until,Até
 DocType: Rename Tool,Rename Log,Renomeie Entrar
@@ -2364,7 +2284,7 @@
 apps/erpnext/erpnext/controllers/recurring_document.py +162,Please select {0},Por favor seleccione {0}
 DocType: C-Form,C-Form No,Nº do Formulário-C
 DocType: BOM,Exploded_items,Exploded_items
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +95,Researcher,investigador
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Researcher,investigador
 apps/frappe/frappe/custom/doctype/customize_form/customize_form.js +88,Update,Atualizar
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +78,Please save the Newsletter before sending,"Por favor, salve o Boletim informativo antes de enviar"
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +23,Name or Email is mandatory,Nome ou E-mail é obrigatório
@@ -2373,11 +2293,10 @@
 DocType: Employee,Exit,Sair
 apps/erpnext/erpnext/accounts/doctype/account/account.py +134,Root Type is mandatory,Tipo de Raiz é obrigatório
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +295,Serial No {0} created,Serial Não {0} criado
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +125,Vibratory finishing,Vibroacabamento
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","Para a comodidade dos clientes, estes códigos podem ser usados ​​em formatos de impressão, como Notas Fiscais e Guias de Remessa"
 DocType: Employee,You can enter any date manually,Você pode entrar qualquer data manualmente
 DocType: Sales Invoice,Advertisement,Anúncio
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +165,Probationary Period,Período Probatório
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Probationary Period,Período Probatório
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Somente nós-folha são permitidos em transações
 DocType: Expense Claim,Expense Approver,Despesa Approver
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,Item do Recibo de Compra Fornecido
@@ -2385,19 +2304,16 @@
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +17,To Datetime,Para Datetime
 DocType: SMS Settings,SMS Gateway URL,URL de Gateway para SMS
 apps/erpnext/erpnext/config/crm.py +53,Logs for maintaining sms delivery status,Logs para a manutenção de status de entrega sms
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +137,Grinding,Moagem
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +34,Shrink wrapping,Retráctil
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +36,Pending Activities,Atividades pendentes
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,Confirmed,Confirmado
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier > Supplier Type,Fornecedor> Fornecedor Tipo
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +127,Please enter relieving date.,"Por favor, indique data alívio ."
 apps/erpnext/erpnext/controllers/trends.py +137,Amt,Amt
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' can be submitted,"Só Deixar Aplicações com status ""Aprovado"" podem ser submetidos"
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +51,Only Leave Applications with status 'Approved' can be submitted,"Só Deixar Aplicações com status ""Aprovado"" podem ser submetidos"
 apps/erpnext/erpnext/utilities/doctype/address/address.py +21,Address Title is mandatory.,Titulo do Endereço é obrigatório.
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,Digite o nome da campanha se o motivo da consulta foi uma campanha.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +38,Newspaper Publishers,Editores de Jornais
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +38,Newspaper Publishers,Editores de Jornais
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,Selecione Ano Fiscal
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +88,Smelting,Smelting
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Reordenar Nível
 DocType: Attendance,Attendance Date,Data de Comparecimento
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,Separação Salário com base em salário e dedução.
@@ -2412,16 +2328,15 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +414,[Error],[Erro]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,Por extenso será visível quando você salvar a Ordem de Venda.
 ,Employee Birthday,Aniversário empregado
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +55,Venture Capital,Capital de Risco
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,Capital de Risco
 DocType: UOM,Must be Whole Number,Deve ser Número inteiro
 DocType: Leave Control Panel,New Leaves Allocated (In Days),Novas Licenças alocadas (em dias)
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +51,Serial No {0} does not exist,Serial Não {0} não existe
 DocType: Pricing Rule,Discount Percentage,Percentagem de Desconto
 DocType: Payment Reconciliation Invoice,Invoice Number,Número da Fatura
-apps/erpnext/erpnext/hooks.py +70,Orders,Encomendas
+apps/erpnext/erpnext/hooks.py +54,Orders,Encomendas
 DocType: Leave Control Panel,Employee Type,Tipo de empregado
 DocType: Employee Leave Approver,Leave Approver,Aprovador de Licenças
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +70,Swaging,Deformação
 DocType: Manufacturing Settings,Material Transferred for Manufacture,Material transferido para Fabricação
 DocType: Expense Claim,"A user with ""Expense Approver"" role","Um usuário com o papel ""Aprovador de Despesas"""
 ,Issued Items Against Production Order,Itens emitida contra Ordem de Produção
@@ -2433,7 +2348,6 @@
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +62,Cost Center with existing transactions can not be converted to group,Centro de custo com as operações existentes não podem ser convertidos em grupo
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Depreciation,depreciação
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Fornecedor (s)
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +29,Invalid period,Período inválido
 DocType: Customer,Credit Limit,Limite de Crédito
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,Selecione o tipo de transação
 DocType: GL Entry,Voucher No,Nº do comprovante
@@ -2443,9 +2357,9 @@
 DocType: Customer,Address and Contact,Endereço e Contato
 DocType: Customer,Last Day of the Next Month,Último dia do mês seguinte
 DocType: Employee,Feedback,Comentários
+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}","Deixe não pode ser alocado antes {0}, como saldo licença já tenha sido no futuro recorde alocação licença encaminhadas-carry {1}"
 apps/erpnext/erpnext/accounts/party.py +284,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Nota: Devido / Reference Data excede dias de crédito de clientes permitidos por {0} dia (s)
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +621,Maint. Schedule,Manut. Cronograma
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +108,Abrasive jet machining,Usinagem jato abrasivo
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +632,Maint. Schedule,Manut. Cronograma
 DocType: Stock Settings,Freeze Stock Entries,Congelar da Entries
 DocType: Website Settings,Website Settings,Configurações do site
 DocType: Item,Reorder level based on Warehouse,Nível de reabastecimento baseado em Armazém
@@ -2462,7 +2376,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +75,Show Stock Entries,Mostrar Banco de Entradas
 ,Is Primary Address,É primário Endereço
 DocType: Production Order,Work-in-Progress Warehouse,Armazém Work-in-Progress
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +308,Reference #{0} dated {1},Referência # {0} {1} datado
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Reference #{0} dated {1},Referência # {0} {1} datado
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +13,Manage Addresses,Gerenciar endereços
 DocType: Pricing Rule,Item Code,Código do Item
 DocType: Production Planning Tool,Create Production Orders,Criar Ordens de Produção
@@ -2471,7 +2385,7 @@
 DocType: Lead,Market Segment,Segmento de mercado
 DocType: Communication,Phone,Telefone
 DocType: Employee Internal Work History,Employee Internal Work History,Histórico de trabalho interno do Funcionário
-apps/erpnext/erpnext/public/js/account_tree_grid.js +50,Closing (Dr),Fechamento (Dr)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +221,Closing (Dr),Fechamento (Dr)
 DocType: Contact,Passive,Indiferente
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,Serial Não {0} não em estoque
 apps/erpnext/erpnext/config/selling.py +127,Tax template for selling transactions.,Modelo imposto pela venda de transações.
@@ -2487,8 +2401,8 @@
 ,Billed Amount,valor faturado
 DocType: Bank Reconciliation,Bank Reconciliation,Reconciliação Bancária
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +9,Get Updates,Obter atualizações
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +129,Material Request {0} is cancelled or stopped,Pedido de material {0} é cancelado ou interrompido
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +641,Add a few sample records,Adicione alguns registros de exemplo
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +133,Material Request {0} is cancelled or stopped,Pedido de material {0} é cancelado ou interrompido
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Add a few sample records,Adicione alguns registros de exemplo
 apps/erpnext/erpnext/config/hr.py +210,Leave Management,Deixar de Gestão
 DocType: Event,Groups,Grupos
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,Grupo por Conta
@@ -2501,38 +2415,34 @@
 DocType: Features Setup,Sales Extras,Extras de Vendas
 apps/erpnext/erpnext/accounts/utils.py +344,{0} budget for Account {1} against Cost Center {2} will exceed by {3},Orçamento {0} para conta {1} contra Centro de Custo {2} excederá por {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +236,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Conta diferença deve ser uma conta de tipo ativo / passivo, uma vez que este da reconciliação é uma entrada de Abertura"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +138,Purchase Order number required for Item {0},Número do pedido requerido para item {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Order number required for Item {0},Número do pedido requerido para item {0}
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',A 'Data Final' deve ser posterior a 'Data Inicial'
 ,Stock Projected Qty,Banco Projetada Qtde
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +147,Customer {0} does not belong to project {1},Cliente {0} não pertence ao projeto {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +150,Customer {0} does not belong to project {1},Cliente {0} não pertence ao projeto {1}
 DocType: Sales Order,Customer's Purchase Order,Ordem de Compra do Cliente
 DocType: Warranty Claim,From Company,Da Empresa
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,Valor ou Quantidade
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Minute,Minuto
+apps/erpnext/erpnext/public/js/setup_wizard.js +363,Minute,Minuto
 DocType: Purchase Invoice,Purchase Taxes and Charges,Impostos e Encargos sobre Compras
 ,Qty to Receive,Qt para receber
 DocType: Leave Block List,Leave Block List Allowed,Deixe Lista de Bloqueios admitidos
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +61,Conversion factor cannot be in fractions,Fator de conversão não pode estar em frações
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +358,You will use it to Login,Você usará isso para o Login
+apps/erpnext/erpnext/public/js/setup_wizard.js +108,You will use it to Login,Você usará isso para o Login
 DocType: Sales Partner,Retailer,Varejista
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +99,Credit To account must be a Balance Sheet account,Para crédito de conta deve ser uma conta de Balanço
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,Todos os Tipos de Fornecedores
 apps/erpnext/erpnext/stock/doctype/item/item.py +37,Item Code is mandatory because Item is not automatically numbered,Código do item é obrigatório porque Item não é numerada automaticamente
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +99,Quotation {0} not of type {1},Cotação {0} não é do tipo {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +93,Quotation {0} not of type {1},Cotação {0} não é do tipo {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,Ítem da Programação da Manutenção
 DocType: Sales Order,%  Delivered,% Entregue
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,Bank Overdraft Account,Conta Bancária Garantida
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +15,Make Salary Slip,Criar folha de salário
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +18,Browse BOM,Navegar BOM
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +175,Secured Loans,Empréstimos garantidos
-apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +3,Awesome Products,Principais Produtos
+apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +3,Awesome Products,Principais Produtos
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +189,Opening Balance Equity,Abertura Patrimônio Balance
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +80,Cannot approve leave as you are not authorized to approve leaves on Block Dates,Não foi possível aprovar a licença que você não está autorizado a aprovar folhas em datas Bloco
 DocType: Appraisal,Appraisal,Avaliação
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +13,Lost-foam casting,De fundição de espuma perdida
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +47,Drawing,Desenho
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +22,Date is repeated,Data é repetida
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +148,Leave approver must be one of {0},Deixe aprovador deve ser um dos {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +162,Leave approver must be one of {0},Deixe aprovador deve ser um dos {0}
 DocType: Hub Settings,Seller Email,Email do Vendedor
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Custo total de compra (Purchase via da fatura)
 DocType: Workstation Working Hour,Start Time,Start Time
@@ -2546,7 +2456,7 @@
 DocType: Purchase Invoice Item,Net Amount (Company Currency),Valor Líquido (Companhia de moeda)
 DocType: BOM Operation,Hour Rate,Valor por hora
 DocType: Stock Settings,Item Naming By,Item de nomeação
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +642,From Quotation,De Citação
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +655,From Quotation,De Citação
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},Outra entrada no Período de Encerramento {0} foi feita após {1}
 DocType: Production Order,Material Transferred for Manufacturing,Material transferido para Manufatura
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +29,Account {0} does not exists,Conta {0} não existe
@@ -2560,21 +2470,19 @@
 DocType: Purchase Invoice Item,PR Detail,Detalhe PR
 DocType: Sales Order,Fully Billed,Totalmente Anunciado
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +20,Cash In Hand,Dinheiro na mão
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +72,Delivery warehouse required for stock item {0},Armazém de entrega necessário para estoque item {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +119,Delivery warehouse required for stock item {0},Armazém de entrega necessário para estoque item {0}
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),O peso bruto do pacote. Normalmente peso líquido + peso do material de embalagem. (Para impressão)
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Os usuários com esta função são autorizados a estabelecer contas congeladas e criar / modificar lançamentos contábeis contra contas congeladas
 DocType: Serial No,Is Cancelled,É cancelado
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +281,My Shipments,Minhas remessas
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +286,My Shipments,Minhas remessas
 DocType: Journal Entry,Bill Date,Data de Faturamento
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +43,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","Mesmo se houver várias regras de preços com maior prioridade, então seguintes prioridades internas são aplicadas:"
 DocType: Supplier,Supplier Details,Detalhes do Fornecedor
 DocType: Communication,Recipients,Destinatários
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +146,Screwing,Enroscando
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +96,Knurling,Knurling
 DocType: Expense Claim,Approval Status,Estado da Aprovação
 DocType: Hub Settings,Publish Items to Hub,Publicar itens ao Hub
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +44,From value must be less than to value in row {0},Do valor deve ser menor do que o valor na linha {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +133,Wire Transfer,por transferência bancária
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +133,Wire Transfer,por transferência bancária
 apps/erpnext/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py +25,Please select Bank Account,Por favor selecione a Conta Bancária
 DocType: Newsletter,Create and Send Newsletters,Criar e enviar email marketing
 apps/frappe/frappe/public/js/frappe/views/reports/grid_report.js +305,From Date must be before To Date,A data inicial deve ser anterior a data final
@@ -2582,14 +2490,14 @@
 DocType: Company,Default Income Account,Conta de Rendimento padrão
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,Grupo de Cliente/Cliente
 DocType: Item Group,Check this if you want to show in website,Marque esta opção se você deseja mostrar no site
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +190,Welcome to ERPNext,Bem vindo ao ERPNext
+,Welcome to ERPNext,Bem vindo ao ERPNext
 DocType: Payment Reconciliation Payment,Voucher Detail Number,Número Detalhe voucher
 apps/erpnext/erpnext/config/crm.py +146,Lead to Quotation,Levar a cotação
 DocType: Lead,From Customer,Do Cliente
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +37,Calls,chamadas
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Calls,chamadas
 DocType: Project,Total Costing Amount (via Time Logs),Montante Custeio Total (via Time Logs)
 DocType: Purchase Order Item Supplied,Stock UOM,UDM do Estoque
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Purchase Order {0} is not submitted,Ordem de Compra {0} não é submetido
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +194,Purchase Order {0} is not submitted,Ordem de Compra {0} não é submetido
 ,Projected,projetado
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},Serial Não {0} não pertence ao Armazém {1}
 apps/erpnext/erpnext/controllers/status_updater.py +136,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Nota : O sistema não irá verificar o excesso de entrega e sobre- reserva para item {0} como quantidade ou valor é 0
@@ -2597,7 +2505,6 @@
 DocType: Issue,Opening Date,Data de abertura
 DocType: Journal Entry,Remark,Observação
 DocType: Purchase Receipt Item,Rate and Amount,Preço e Total
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +95,Boring,Chato
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +667,From Sales Order,Da Ordem de Vendas
 DocType: Blog Category,Parent Website Route,Pai site Route
 DocType: Sales Order,Not Billed,Não Faturado
@@ -2611,19 +2518,17 @@
 apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount Amount,Montante do Desconto
 DocType: Purchase Invoice,Return Against Purchase Invoice,Regresso contra factura de compra
 DocType: Item,Warranty Period (in days),Período de Garantia (em dias)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +550,e.g. VAT,por exemplo IVA
+apps/erpnext/erpnext/public/js/setup_wizard.js +292,e.g. VAT,por exemplo IVA
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,Item 4
 DocType: Journal Entry Account,Journal Entry Account,Conta Journal Entry
 DocType: Shopping Cart Settings,Quotation Series,Cotação Series
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +52,"An item exists with same name ({0}), please change the item group name or rename the item","Um item existe com o mesmo nome ( {0}) , por favor, altere o nome do grupo de itens ou renomeie o item"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +82,Hot metal gas forming,Gás de metais a quente
 DocType: Sales Order Item,Sales Order Date,Data da Ordem de Venda
 DocType: Sales Invoice Item,Delivered Qty,Qtde entregue
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +63,Warehouse {0}: Company is mandatory,Armazém {0}: Empresa é obrigatório
 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.",Vá para o grupo apropriado (geralmente Fonte de Recursos&gt;&gt; Passivo Circulante Impostos e Taxas e criar uma nova conta (clicando em Adicionar Criança) do tipo &quot;imposto&quot; e fazer mencionar a taxa de imposto.
 ,Payment Period Based On Invoice Date,Período de pagamento com base no fatura Data
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +50,Missing Currency Exchange Rates for {0},Faltando Taxas de câmbio para {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +135,Laser cutting,Corte a laser
 DocType: Event,Monday,Segunda-feira
 DocType: Journal Entry,Stock Entry,Lançamento no Estoque
 DocType: Account,Payable,a pagar
@@ -2656,7 +2561,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +111,Date Of Retirement must be greater than Date of Joining,Data da aposentadoria deve ser maior que Data de Efetivação
 DocType: Sales Invoice,Against Income Account,Contra a Conta de Rendimentos
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +69,{0}% Delivered,{0}% Entregue
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +78,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Item {0}: Quant Pedi {1} não pode ser inferior a qty mínimo de pedido {2} (definido no Item).
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Item {0}: Quant Pedi {1} não pode ser inferior a qty mínimo de pedido {2} (definido no Item).
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Distribuição percentual mensal
 DocType: Territory,Territory Targets,Metas do Território
 DocType: Delivery Note,Transporter Info,Informações da Transportadora
@@ -2665,7 +2570,6 @@
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,"Títulos para modelos de impressão , por exemplo, Proforma Invoice ."
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +140,Valuation type charges can not marked as Inclusive,Encargos tipo de avaliação não pode marcado como Inclusive
 DocType: POS Profile,Update Stock,Atualizar Estoque
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +128,Superfinishing,Superfinishing
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,UOM diferente para itens levará a incorreta valor Peso Líquido (Total ) . Certifique-se de que o peso líquido de cada item está na mesma UOM .
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM Taxa
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +85,Please pull items from Delivery Note,"Por favor, puxar itens de entrega Nota"
@@ -2680,7 +2584,6 @@
 ,Purchase Analytics,Análise de compras
 DocType: Sales Invoice Item,Delivery Note Item,Item da Guia de Remessa
 DocType: Expense Claim,Task,Tarefa
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +57,Shaving,Barbear
 DocType: Purchase Taxes and Charges,Reference Row #,Referência Row #
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},Número do lote é obrigatória para item {0}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js +14,This is a root sales person and cannot be edited.,Esta é uma pessoa de vendas de raiz e não pode ser editado .
@@ -2692,13 +2595,11 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +74,Purpose must be one of {0},Objetivo deve ser um dos {0}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +108,Fill the form and save it,Preencha o formulário e salvá-lo
 DocType: Production Planning Tool,Download a report containing all raw materials with their latest inventory status,Baixar um relatório contendo todas as matérias-primas com o seu estado mais recente do inventário
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +94,Facing,Revestimento
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,Community Forum
 DocType: Leave Application,Leave Balance Before Application,Saldo de Licenças antes da solicitação
 DocType: SMS Center,Send SMS,Envie SMS
 DocType: Company,Default Letter Head,Cabeçalho Padrão
 DocType: Time Log,Billable,Faturável
-DocType: Authorization Rule,This will be used for setting rule in HR module,Isso será usado para a definição de regras no módulo RH
 DocType: Account,Rate at which this tax is applied,Taxa em que este imposto é aplicado
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reorder Qty,Reordenar Qtde
 DocType: Company,Stock Adjustment Account,Banco de Acerto de Contas
@@ -2725,16 +2626,15 @@
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,Percentual de alocação deve ser igual a 100%
 DocType: Serial No,Out of AMC,Fora do CAM
 DocType: Purchase Order Item,Material Request Detail No,Detalhe materiais Pedido Não
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +97,Hard turning,Torneamento duro
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +33,Make Maintenance Visit,Criar visita de manutenção
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +187,Please contact to the user who have Sales Master Manager {0} role,"Por favor, entre em contato com o usuário que tem Vendas Mestre Gerente {0} papel"
 DocType: Company,Default Cash Account,Conta Caixa padrão
 apps/erpnext/erpnext/config/accounts.py +79,Company (not Customer or Supplier) master.,"Empresa  (a própria companhia, não se refere ao cliente, nem ao fornecedor)"
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +106,Please enter 'Expected Delivery Date',"Por favor, digite ' Data prevista de entrega '"
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +187,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Notas de entrega {0} deve ser cancelado antes de cancelar esta ordem de venda
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +100,Please enter 'Expected Delivery Date',"Por favor, digite ' Data prevista de entrega '"
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +182,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Notas de entrega {0} deve ser cancelado antes de cancelar esta ordem de venda
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +373,Paid amount + Write Off Amount can not be greater than Grand Total,Valor pago + Write Off Valor não pode ser maior do que o total geral
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} não é um número de lote válido para o item {1}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,Note: There is not enough leave balance for Leave Type {0},Nota: Não é suficiente equilíbrio pela licença Tipo {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +124,Note: There is not enough leave balance for Leave Type {0},Nota: Não é suficiente equilíbrio pela licença Tipo {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.","Nota: Se o pagamento não é feito contra qualquer referência, fazer Journal Entry manualmente."
 DocType: Item,Supplier Items,Fornecedor Itens
 DocType: Opportunity,Opportunity Type,Tipo de Oportunidade
@@ -2746,7 +2646,7 @@
 DocType: Hub Settings,Publish Availability,Publicar Disponibilidade
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +105,Date of Birth cannot be greater than today.,Data de nascimento não pode ser maior do que hoje.
 ,Stock Ageing,Envelhecimento do Estoque
-apps/erpnext/erpnext/controllers/accounts_controller.py +200,{0} '{1}' is disabled,{0} '{1}' é desativada
+apps/erpnext/erpnext/controllers/accounts_controller.py +201,{0} '{1}' is disabled,{0} '{1}' é desativada
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Definir como Open
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Enviar e-mails automáticos para Contatos sobre transações de enviar.
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +232,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
@@ -2756,44 +2656,38 @@
 DocType: Purchase Order,Customer Contact Email,Cliente Fale Email
 DocType: Event,Sunday,Domingo
 DocType: Sales Team,Contribution (%),Contribuição (%)
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +455,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,Nota: Entrada pagamento não será criado desde 'Cash ou conta bancária ' não foi especificado
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +171,Responsibilities,Responsabilidades
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +457,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,Nota: Entrada pagamento não será criado desde 'Cash ou conta bancária ' não foi especificado
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +171,Responsibilities,Responsabilidades
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Template,Modelo
 DocType: Sales Person,Sales Person Name,Nome do Vendedor
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,"Por favor, indique pelo menos uma fatura na tabela"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +511,Add Users,Adicionar usuários
+apps/erpnext/erpnext/public/js/setup_wizard.js +255,Add Users,Adicionar usuários
 DocType: Pricing Rule,Item Group,Grupo de Itens
 DocType: Task,Actual Start Date (via Time Logs),Data de início real (via Time Logs)
 DocType: Stock Reconciliation Item,Before reconciliation,Antes de reconciliação
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +12,To {0},Para {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Impostos e taxas Adicionado (Moeda Company)
-apps/erpnext/erpnext/stock/doctype/item/item.py +340,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Item Imposto Row {0} deve ter em conta tipo de imposto ou de renda ou de despesa ou carregável
+apps/erpnext/erpnext/stock/doctype/item/item.py +344,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Item Imposto Row {0} deve ter em conta tipo de imposto ou de renda ou de despesa ou carregável
 DocType: Sales Order,Partly Billed,Parcialmente faturado
 DocType: Item,Default BOM,LDM padrão
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +79,Decambering,Decambering
 apps/erpnext/erpnext/setup/doctype/company/company.js +22,Please re-type company name to confirm,"Por favor, re-tipo o nome da empresa para confirmar"
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,Total de Outstanding Amt
 DocType: Time Log Batch,Total Hours,Total de Horas
 DocType: Journal Entry,Printing Settings,Configurações de impressão
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +268,Total Debit must be equal to Total Credit. The difference is {0},Débito total deve ser igual ao total de crédito.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +11,Automotive,automotivo
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +37,Item is required,Item é necessário
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +25,Metal injection molding,Moldagem por injeção de metal
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +258,Total Debit must be equal to Total Credit. The difference is {0},Débito total deve ser igual ao total de crédito.
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,automotivo
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +684,From Delivery Note,De Nota de Entrega
 DocType: Time Log,From Time,From Time
 DocType: Notification Control,Custom Message,Mensagem personalizada
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +33,Investment Banking,Investimento Bancário
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +261,"Select your Country, Time Zone and Currency","Escolha o seu país, fuso horário e moeda"
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,Investimento Bancário
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +316,"Select your Country, Time Zone and Currency","Escolha o seu país, fuso horário e moeda"
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +369,Cash or Bank Account is mandatory for making payment entry,Dinheiro ou conta bancária é obrigatória para a tomada de entrada de pagamento
 DocType: Purchase Invoice,Price List Exchange Rate,Taxa de Câmbio da Lista de Preços
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +91,Pickling,Decapagem
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +18,Sand casting,A fundição em areia
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +117,Electroplating,Galvanoplastia
 DocType: Purchase Invoice Item,Rate,Preço
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +62,Intern,internar
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Intern,internar
 DocType: Newsletter,A Lead with this email id should exist,Deve existir um Prospecto com esse endereço de e-mail
 DocType: Stock Entry,From BOM,De BOM
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +34,Basic,Básico
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +34,Basic,Básico
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,Transações com ações antes {0} são congelados
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +217,Please click on 'Generate Schedule',"Por favor, clique em "" Gerar Agenda '"
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +61,To Date should be same as From Date for Half Day leave,Para data deve ser mesmo a partir da data de licença Meio Dia
@@ -2801,11 +2695,11 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +96,Reference No is mandatory if you entered Reference Date,Referência Não é obrigatório se você entrou Data de Referência
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +108,Date of Joining must be greater than Date of Birth,Data de Efetivação deve ser maior do que a Data de Nascimento
 DocType: Salary Structure,Salary Structure,Estrutura Salarial
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +242,"Multiple Price Rule exists with same criteria, please resolve \
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +246,"Multiple Price Rule exists with same criteria, please resolve \
 			conflict by assigning priority. Price Rules: {0}","Multiple regra de preço existe com os mesmos critérios, por favor resolver \
  conflito, atribuindo prioridade. Regras Preço: {0}"
 DocType: Account,Bank,Banco
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +9,Airline,Companhia Aérea
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,Companhia Aérea
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +493,Issue Material,Material Issue
 DocType: Material Request Item,For Warehouse,Para Almoxarifado
 DocType: Employee,Offer Date,Oferta Data
@@ -2815,29 +2709,24 @@
 DocType: Item,Is Fixed Asset Item,É item de Imobilização
 DocType: Stock Entry,Including items for sub assemblies,Incluindo itens para subconjuntos
 DocType: Features Setup,"If you have long print formats, this feature can be used to split the page to be printed on multiple pages with all headers and footers on each page","Se você formatos longos de impressão, esse recurso pode ser usado para dividir a página a ser impressa em várias páginas com todos os cabeçalhos e rodapés em cada página"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +131,Hobbing,Hobbing
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +98,All Territories,Todos os Territórios
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +98,All Territories,Todos os Territórios
 DocType: Purchase Invoice,Items,Itens
 DocType: Fiscal Year,Year Name,Nome do ano
 DocType: Process Payroll,Process Payroll,Processa folha de pagamento
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +59,There are more holidays than working days this month.,Há mais feriados do que dias úteis do mês.
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +68,There are more holidays than working days this month.,Há mais feriados do que dias úteis do mês.
 DocType: Product Bundle Item,Product Bundle Item,Produto Bundle item
 DocType: Sales Partner,Sales Partner Name,Nome do Parceiro de Vendas
 DocType: Purchase Invoice Item,Image View,Ver imagem
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +113,Finishing & industrial finishing,Acabamento e acabamento industrial
 DocType: Issue,Opening Time,Horário de abertura
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,De e datas necessárias
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +46,Securities & Commodity Exchanges,Valores Mobiliários e Bolsas de Mercadorias
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Valores Mobiliários e Bolsas de Mercadorias
 DocType: Shipping Rule,Calculate Based On,Calcule Baseado em
 DocType: Delivery Note Item,From Warehouse,Do Armazém
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +98,Drilling,Perfuração
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +28,Blow molding,A moldagem por sopro
 DocType: Purchase Taxes and Charges,Valuation and Total,Valorização e Total
 DocType: Tax Rule,Shipping City,O envio da Cidade
 apps/erpnext/erpnext/stock/doctype/item/item.js +43,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,"Este artigo é um Variant de {0} (modelo). Atributos serão copiados a partir do modelo, a menos que 'No Copy' é definido"
 DocType: Account,Purchase User,Compra de Usuário
 DocType: Notification Control,Customize the Notification,Personalize a Notificação
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +87,Hammering,Batimento
 DocType: Web Page,Slideshow,Apresentação de slides
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +24,Default Address Template cannot be deleted,Template endereço padrão não pode ser excluído
 DocType: Sales Invoice,Shipping Rule,Regra de envio
@@ -2846,9 +2735,8 @@
 DocType: Workflow State,Search,Pesquisar
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +54,Total cannot be zero,Total não pode ser 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,'Dias desde a última Ordem' deve ser maior ou igual a zero
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +142,Brazing,Soldadura
 DocType: C-Form,Amended From,Corrigido a partir de
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Raw Material,Matéria-prima
+apps/erpnext/erpnext/public/js/setup_wizard.js +359,Raw Material,Matéria-prima
 DocType: Leave Application,Follow via Email,Siga por e-mail
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Total de Impostos Depois Montante do Desconto
 apps/erpnext/erpnext/accounts/doctype/account/account.py +174,Child account exists for this account. You can not delete this account.,Conta Criança existe para esta conta. Você não pode excluir esta conta.
@@ -2862,10 +2750,10 @@
 ,Produced,produzido
 DocType: Item,Item Code for Suppliers,Código do item para fornecedores
 DocType: Issue,Raised By (Email),Levantadas por (e-mail)
-apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +72,General,Geral
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +495,Attach Letterhead,Anexar Timbrado
+apps/erpnext/erpnext/setup/setup_wizard/default_website.py +72,General,Geral
+apps/erpnext/erpnext/public/js/setup_wizard.js +241,Attach Letterhead,Anexar Timbrado
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +272,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',Não pode deduzir quando é para categoria ' Avaliação ' ou ' Avaliação e Total'
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +542,"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.","Lista de suas cabeças fiscais (por exemplo, IVA, etc aduaneiras; eles devem ter nomes exclusivos) e suas taxas normais. Isto irá criar um modelo padrão, que você pode editar e adicionar mais tarde."
+apps/erpnext/erpnext/public/js/setup_wizard.js +284,"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.","Lista de suas cabeças fiscais (por exemplo, IVA, etc aduaneiras; eles devem ter nomes exclusivos) e suas taxas normais. Isto irá criar um modelo padrão, que você pode editar e adicionar mais tarde."
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial Nos Required for Serialized Item {0},Serial Nos Obrigatório para Serialized item {0}
 DocType: Journal Entry,Bank Entry,Banco Entry
 DocType: Authorization Rule,Applicable To (Designation),Aplicável Para (Designação)
@@ -2874,33 +2762,32 @@
 apps/erpnext/erpnext/config/accounts.py +143,Enable / disable currencies.,Ativar / desativar moedas.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Postal Expenses,Despesas Postais
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Total (Amt)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +26,Entertainment & Leisure,Entretenimento & Lazer
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,Entretenimento & Lazer
 DocType: Purchase Order,The date on which recurring order will be stop,A data em que ordem recorrente será parar
 DocType: Quality Inspection,Item Serial No,Nº de série do Item
 apps/erpnext/erpnext/controllers/status_updater.py +142,{0} must be reduced by {1} or you should increase overflow tolerance,{0} deve ser reduzido em {1} ou você deve aumentar a tolerância ao excesso
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Present,Presente total
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Hour,hora
+apps/erpnext/erpnext/public/js/setup_wizard.js +363,Hour,hora
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +138,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation","Item Serialized {0} não pode ser atualizado utilizando \
  da Reconciliação"
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +488,Transfer Material to Supplier,Transferência de material para Fornecedor
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +513,Transfer Material to Supplier,Transferência de material para Fornecedor
 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,"New Serial Não, não pode ter Warehouse. Warehouse deve ser definida pelo Banco de entrada ou Recibo de compra"
 DocType: Lead,Lead Type,Tipo de Prospecto
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +82,Create Quotation,Criar Orçamento
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +306,All these items have already been invoiced,Todos esses itens já foram faturados
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,You are not authorized to approve leaves on Block Dates,Você não está autorizado a aprovar folhas em datas Bloco
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +311,All these items have already been invoiced,Todos esses itens já foram faturados
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},Pode ser aprovado pelo {0}
 DocType: Shipping Rule,Shipping Rule Conditions,Regra Condições de envio
 DocType: BOM Replace Tool,The new BOM after replacement,A nova LDM após substituição
 DocType: Features Setup,Point of Sale,Ponto de Venda
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +83,Curling,Ondulação
 DocType: Account,Tax,Imposto
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +28,Row {0}: {1} is not a valid {2},Row {0}: {1} não é um válido {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +89,Refining,Refino
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +37,Row {0}: {1} is not a valid {2},Row {0}: {1} não é um válido {2}
 DocType: Production Planning Tool,Production Planning Tool,Ferramenta de Planejamento da Produção
 DocType: Quality Inspection,Report Date,Data do Relatório
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +130,Routing,Encaminhamento
 DocType: C-Form,Invoices,Faturas
 DocType: Job Opening,Job Title,Cargo
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +54,{0} already allocated for Employee {1} for period {2} - {3},{0} já alocado para Employee {1} para {2} período - {3}
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +80,{0} Recipients,{0} Destinatários
 DocType: Features Setup,Item Groups in Details,Detalhes dos Grupos de Itens
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +335,Quantity to Manufacture must be greater than 0.,Quantidade de Fabricação deve ser maior que 0.
@@ -2918,14 +2805,13 @@
 DocType: DocType,Setup,Configuração
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,Não há nada a ser editado.
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +108,Summary for this month and pending activities,Resumo para este mês e atividades pendentes
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +39,Cold rolling,Laminação a frio
 DocType: Customer Group,Customer Group Name,Nome do Grupo de Clientes
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +408,Please remove this Invoice {0} from C-Form {1},"Por favor, remova esta Invoice {0} a partir de C-Form {1}"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +410,Please remove this Invoice {0} from C-Form {1},"Por favor, remova esta Invoice {0} a partir de C-Form {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,Por favor selecione Encaminhar se você também quer incluir o saldo de licenças do ano fiscal anterior neste ano fiscal
 DocType: GL Entry,Against Voucher Type,Contra o Tipo de Comprovante
 DocType: Item,Attributes,Atributos
 DocType: Packing Slip,Get Items,Obter itens
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +186,Please enter Write Off Account,"Por favor, indique Escrever Off Conta"
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +187,Please enter Write Off Account,"Por favor, indique Escrever Off Conta"
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +71,Last Order Date,Última data do pedido
 DocType: DocField,Image,Imagem
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +179,Make Excise Invoice,Criar imposto de fatura
@@ -2935,7 +2821,7 @@
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +146,Operation ID not set,Operação ID não definida
 DocType: Production Order,Planned Start Date,Planejado Start Date
 DocType: Serial No,Creation Document Type,Tipo de Criação do Documento
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +620,Maint. Visit,Manut. Visita
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +631,Maint. Visit,Manut. Visita
 DocType: Leave Type,Is Encash,É cobrança
 DocType: Purchase Invoice,Mobile No,Telefone Celular
 DocType: Payment Tool,Make Journal Entry,Faça Journal Entry
@@ -2943,35 +2829,31 @@
 apps/erpnext/erpnext/controllers/trends.py +257,Project-wise data is not available for Quotation,Dados do projecto -wise não está disponível para Cotação
 DocType: Project,Expected End Date,Data Final prevista
 DocType: Appraisal Template,Appraisal Template Title,Título do Modelo de Avaliação
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +440,Commercial,Comercial
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +378,Commercial,Comercial
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +23,Parent Item {0} must not be a Stock Item,Pai item {0} não deve ser um item da
 DocType: Cost Center,Distribution Id,Id da distribuição
-apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +14,Awesome Services,Principais Serviços
+apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +14,Awesome Services,Principais Serviços
 apps/erpnext/erpnext/config/manufacturing.py +29,All Products or Services.,Todos os Produtos ou Serviços.
 DocType: Purchase Invoice,Supplier Address,Endereço do Fornecedor
 DocType: Contact Us Settings,Address Line 2,Complemento
 DocType: ToDo,Reference,Referência
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +59,Perforating,Perfurante
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,Fora Qtde
 apps/erpnext/erpnext/config/accounts.py +128,Rules to calculate shipping amount for a sale,Regras para calcular valor de frete para uma venda
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +29,Series is mandatory,Série é obrigatório
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +28,Financial Services,Serviços Financeiros
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,Serviços Financeiros
 apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3},Valor para o atributo {0} deve estar dentro da gama de {1} a {2} nos incrementos de {3}
 DocType: Tax Rule,Sales,Vendas
 DocType: Stock Entry Detail,Basic Amount,Montante de base
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +173,Warehouse required for stock Item {0},Armazém necessário para o ítem de estoque {0}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +178,Warehouse required for stock Item {0},Armazém necessário para o ítem de estoque {0}
 DocType: Leave Allocation,Unused leaves,Folhas não utilizadas
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,Cr
 DocType: Customer,Default Receivable Accounts,Padrão Contas a Receber
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +102,Sawing,Serrar
 DocType: Tax Rule,Billing State,Estado de faturamento
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +32,Laminating,Laminação
 DocType: Item Reorder,Transfer,Transferir
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +549,Fetch exploded BOM (including sub-assemblies),Fetch BOM explodiu (incluindo sub-conjuntos )
 DocType: Authorization Rule,Applicable To (Employee),Aplicável Para (Funcionário)
 apps/erpnext/erpnext/controllers/accounts_controller.py +101,Due Date is mandatory,Due Date é obrigatória
 apps/erpnext/erpnext/controllers/item_variant.py +51,Increment for Attribute {0} cannot be 0,Atributo incremento para {0} não pode ser 0
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +143,Sintering,Sinterização
 DocType: Journal Entry,Pay To / Recd From,Pagar Para/ Recebido De
 DocType: Naming Series,Setup Series,Configuração de Séries
 DocType: Supplier,Contact HTML,Contato HTML
@@ -2984,7 +2866,6 @@
 DocType: Attendance,Absent,Ausente
 DocType: Product Bundle,Product Bundle,Bundle produto
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +180,Row {0}: Invalid reference {1},Row {0}: Referência inválida {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +165,Crushing,Esmagador
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Comprar Impostos e Taxas Template
 DocType: Upload Attendance,Download Template,Baixar o Modelo
 DocType: GL Entry,Remarks,Observações
@@ -2992,14 +2873,12 @@
 DocType: Journal Entry,Write Off Based On,Eliminar Baseado em
 DocType: Features Setup,POS View,Visualizar PDV
 apps/erpnext/erpnext/config/stock.py +38,Installation record for a Serial No.,Registro de instalação de um nº de série
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +9,Continuous casting,Lingotamento contínuo
 apps/erpnext/erpnext/public/js/queries.js +39,Please specify a,"Por favor, especifique um"
 DocType: Offer Letter,Awaiting Response,Aguardando resposta
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +53,Above,Acima
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +80,Cold sizing,Dimensionamento frio
 DocType: Salary Slip,Earning & Deduction,Ganho &amp; Dedução
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +76,Account {0} cannot be a Group,A Conta {0} não pode ser um Grupo
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +259,Region,Região
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +314,Region,Região
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +213,Optional. This setting will be used to filter in various transactions.,Opcional . Esta configuração será usada para filtrar em várias transações.
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +104,Negative Valuation Rate is not allowed,Negativa Avaliação Taxa não é permitido
 DocType: Holiday List,Weekly Off,Descanso semanal
@@ -3017,7 +2896,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,Account {0} is inactive,A Conta {0} está inativa
 DocType: GL Entry,Is Advance,É antecipado
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,Data de Início do Comparecimento e Data Final de Comparecimento é obrigatória
-apps/erpnext/erpnext/controllers/buying_controller.py +131,Please enter 'Is Subcontracted' as Yes or No,"Por favor, digite ' é subcontratado ""como Sim ou Não"
+apps/erpnext/erpnext/controllers/buying_controller.py +122,Please enter 'Is Subcontracted' as Yes or No,"Por favor, digite ' é subcontratado ""como Sim ou Não"
 DocType: Sales Team,Contact No.,Nº Contato.
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,'Profit and Loss' type account {0} not allowed in Opening Entry,A conta {0} tipo 'Lucros e Perdas' não é permitida na Abertura do Período
 DocType: Workflow State,Time,Tempo
@@ -3026,14 +2905,13 @@
 DocType: Authorization Rule,Authorization Rule,Regra de autorização
 DocType: Sales Invoice,Terms and Conditions Details,Detalhes dos Termos e Condições
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,Impostos de vendas e de modelo Encargos
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +10,Apparel & Accessories,Vestuário e Acessórios
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,Vestuário e Acessórios
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +67,Number of Order,Número de Ordem
 DocType: Item Group,HTML / Banner that will show on the top of product list.,HTML / Faixa que vai ser mostrada no topo da lista de produtos.
 DocType: Shipping Rule,Specify conditions to calculate shipping amount,Especificar condições para calcular valor de frete
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +121,Add Child,Adicionar sub-item
 DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,Papel permissão para definir as contas congeladas e editar entradas congeladas
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +52,Cannot convert Cost Center to ledger as it has child nodes,"Não é possível converter Centro de Custo de contabilidade , uma vez que tem nós filhos"
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +47,Conversion Factor is required,Fator de Conversão é obrigatório
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +37,Serial #,Serial #
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +87,Commission on Sales,Comissão sobre Vendas
 DocType: Offer Letter Term,Value / Description,Valor / Descrição
@@ -3041,10 +2919,8 @@
 ,Customers Not Buying Since Long Time,Os clientes não compra desde há muito tempo
 DocType: Production Order,Expected Delivery Date,Data de entrega prevista
 apps/erpnext/erpnext/accounts/general_ledger.py +121,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Débito e Crédito é igual para {0} # {1}. A diferença é {2}.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +48,Bulging,Bojudo
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +11,Evaporative-pattern casting,Evaporativo-padrão de elenco
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Entertainment Expenses,despesas de representação
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +195,Sales Invoice {0} must be cancelled before cancelling this Sales Order,Fatura de vendas {0} deve ser cancelado antes de cancelar esta ordem de venda
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +190,Sales Invoice {0} must be cancelled before cancelling this Sales Order,Fatura de vendas {0} deve ser cancelado antes de cancelar esta ordem de venda
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +61,Age,Idade
 DocType: Time Log,Billing Amount,Faturamento Montante
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +84,Invalid quantity specified for item {0}. Quantity should be greater than 0.,Quantidade inválido especificado para o item {0} . Quantidade deve ser maior do que 0 .
@@ -3063,26 +2939,24 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,Nova Receita Cliente
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Travel Expenses,Despesas de viagem
 DocType: Maintenance Visit,Breakdown,Colapso
-apps/erpnext/erpnext/controllers/accounts_controller.py +241,Account: {0} with currency: {1} can not be selected,Conta: {0} com moeda: {1} não pode ser seleccionado
+apps/erpnext/erpnext/controllers/accounts_controller.py +242,Account: {0} with currency: {1} can not be selected,Conta: {0} com moeda: {1} não pode ser seleccionado
 DocType: Bank Reconciliation Detail,Cheque Date,Data do Cheque
 apps/erpnext/erpnext/accounts/doctype/account/account.py +47,Account {0}: Parent account {1} does not belong to company: {2},Conta {0}: A Conta Pai {1} não pertence à empresa: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted all transactions related to this company!,Excluído com sucesso todas as transacções relacionadas com esta empresa!
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,Como em Data
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +111,Honing,Afiando
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +58,Probation,provação
-apps/erpnext/erpnext/stock/doctype/item/item.py +264,Default Warehouse is mandatory for stock Item.,Armazém padrão é obrigatório para estoque Item.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Probation,provação
+apps/erpnext/erpnext/stock/doctype/item/item.py +268,Default Warehouse is mandatory for stock Item.,Armazém padrão é obrigatório para estoque Item.
 DocType: Feed,Full Name,Nome Completo
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +148,Clinching,Conquistar
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +191,Payment of salary for the month {0} and year {1},Pagamento de salário para o mês {0} e {1} ano
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +173,Payment of salary for the month {0} and year {1},Pagamento de salário para o mês {0} e {1} ano
 DocType: Stock Settings,Auto insert Price List rate if missing,Inserir automaticamente o preço na lista de preço se não houver nenhum.
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,Montante total pago
 ,Transferred Qty,transferido Qtde
 apps/erpnext/erpnext/config/learn.py +11,Navigating,Navegação
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +137,Planning,planejamento
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +137,Planning,planejamento
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +9,Make Time Log Batch,Criar tempo de log
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Issued,Emitido
 DocType: Project,Total Billing Amount (via Time Logs),Valor Total do faturamento (via Time Logs)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +629,We sell this Item,Nós vendemos este item
+apps/erpnext/erpnext/public/js/setup_wizard.js +365,We sell this Item,Nós vendemos este item
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +65,Supplier Id,Fornecedor Id
 DocType: Journal Entry,Cash Entry,Entrada de Caixa
 DocType: Sales Partner,Contact Desc,Descrição do Contato
@@ -3091,18 +2965,16 @@
 DocType: Brand,Item Manager,Item Manager
 DocType: Cost Center,Add rows to set annual budgets on Accounts.,Adicione linhas para definir orçamentos anuais nas Contas.
 DocType: Buying Settings,Default Supplier Type,Padrão de Tipo de Fornecedor
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +160,Quarrying,Pedreiras
 DocType: Production Order,Total Operating Cost,Custo de Operacional Total
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +160,Note: Item {0} entered multiple times,Nota : Item {0} entrou várias vezes
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +163,Note: Item {0} entered multiple times,Nota : Item {0} entrou várias vezes
 apps/erpnext/erpnext/config/crm.py +27,All Contacts.,Todos os Contatos.
 DocType: Newsletter,Test Email Id,Endereço de Email de Teste
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +394,Company Abbreviation,Sigla da Empresa
+apps/erpnext/erpnext/public/js/setup_wizard.js +142,Company Abbreviation,Sigla da Empresa
 DocType: Features Setup,If you follow Quality Inspection. Enables Item QA Required and QA No in Purchase Receipt,Se você seguir Inspeção de Qualidade . Permite item QA Obrigatório e QA Não no Recibo de compra
 DocType: GL Entry,Party Type,Tipo de Festa
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +68,Raw material cannot be same as main Item,Matéria-prima não pode ser o mesmo como o principal item
 DocType: Item Attribute Value,Abbreviation,Abreviatura
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,Não authroized desde {0} excede os limites
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +30,Rotational molding,Rotomoldagem
 apps/erpnext/erpnext/config/hr.py +115,Salary template master.,Modelo Mestre de Salário .
 DocType: Leave Type,Max Days Leave Allowed,Período máximo de Licença
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +55,Set Tax Rule for shopping cart,Conjunto de regras de imposto por carrinho de compras
@@ -3116,15 +2988,15 @@
 apps/erpnext/erpnext/config/selling.py +18,Quotes to Leads or Customers.,Cotações para Prospectos ou Clientes.
 DocType: Stock Settings,Role Allowed to edit frozen stock,Papel permissão para editar estoque congelado
 ,Territory Target Variance Item Group-Wise,Território Alvo Variance item Group-wise
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +101,All Customer Groups,Todos os grupos de clientes
-apps/erpnext/erpnext/controllers/accounts_controller.py +474,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} é obrigatório. Talvez o valor de câmbio não exista de {1} para {2}.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +101,All Customer Groups,Todos os grupos de clientes
+apps/erpnext/erpnext/controllers/accounts_controller.py +475,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} é obrigatório. Talvez o valor de câmbio não exista de {1} para {2}.
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +37,Tax Template is mandatory.,Template imposto é obrigatório.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +41,Account {0}: Parent account {1} does not exist,Conta {0}: A Conta Pai {1} não existe
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Preço Taxa List (moeda da empresa)
 DocType: Account,Temporary,Temporário
 DocType: Address,Preferred Billing Address,Preferred Endereço de Cobrança
 DocType: Monthly Distribution Percentage,Percentage Allocation,Alocação percentual
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +86,Secretary,secretário
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Secretary,secretário
 DocType: Serial No,Distinct unit of an Item,Unidade distinta de um item
 DocType: Pricing Rule,Buying,Compras
 DocType: HR Settings,Employee Records to be created by,Empregado Records para ser criado por
@@ -3137,9 +3009,8 @@
 ,Item-wise Price List Rate,-Item sábio Preço de Taxa
 DocType: Purchase Order Item,Supplier Quotation,Cotação do Fornecedor
 DocType: Quotation,In Words will be visible once you save the Quotation.,Por extenso será visível quando você salvar a cotação.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +68,Ironing,Engomadoria
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is stopped,{0} {1} está parado
-apps/erpnext/erpnext/stock/doctype/item/item.py +352,Barcode {0} already used in Item {1},Código de barras {0} já utilizado em item {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +356,Barcode {0} already used in Item {1},Código de barras {0} já utilizado em item {1}
 DocType: Lead,Add to calendar on this date,Adicionar ao calendário nesta data
 apps/erpnext/erpnext/config/selling.py +132,Rules for adding shipping costs.,Regras para adicionar os custos de envio .
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,próximos eventos
@@ -3148,13 +3019,12 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +27,Quick Entry,Entrada Rápida
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0} é obrigatório para Retorno
 DocType: Purchase Order,To Receive,Receber
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +33,Shrink fitting,Encolher montagem
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +522,user@example.com,user@example.com
+apps/erpnext/erpnext/public/js/setup_wizard.js +266,user@example.com,user@example.com
 DocType: Email Digest,Income / Expense,Receitas / Despesas
 DocType: Employee,Personal Email,E-mail pessoal
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +58,Total Variance,Variância total
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +62,Total Variance,Variância total
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.","Se ativado, o sistema irá postar lançamentos contábeis para o inventário automaticamente."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +15,Brokerage,Corretagem
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +15,Brokerage,Corretagem
 DocType: Address,Postal Code,Código postal
 DocType: Production Order Operation,"in Minutes
 Updated via 'Time Log'","em Minutos 
@@ -3162,14 +3032,13 @@
 DocType: Customer,From Lead,Do Lead
 apps/erpnext/erpnext/config/manufacturing.py +19,Orders released for production.,Ordens liberadas para produção.
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +42,Select Fiscal Year...,Selecione o ano fiscal ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +442,POS Profile required to make POS Entry,POS perfil necessário para fazer POS Entry
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +444,POS Profile required to make POS Entry,POS perfil necessário para fazer POS Entry
 DocType: Hub Settings,Name Token,Nome do token
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +106,Planing,Planing
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Selling,venda padrão
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +120,Standard Selling,venda padrão
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +137,Atleast one warehouse is mandatory,Pelo menos um almoxarifado é obrigatório
 DocType: Serial No,Out of Warranty,Fora de Garantia
 DocType: BOM Replace Tool,Replace,Substituir
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +314,{0} against Sales Invoice {1},{0} contra Nota Fiscal de Vendas {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +316,{0} against Sales Invoice {1},{0} contra Nota Fiscal de Vendas {1}
 apps/erpnext/erpnext/stock/doctype/item/item.py +49,Please enter default Unit of Measure,Por favor entre unidade de medida padrão
 DocType: Purchase Invoice Item,Project Name,Nome do Projeto
 DocType: Supplier,Mention if non-standard receivable account,Mencione se não padronizado conta a receber
@@ -3185,9 +3054,8 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,Journal Entry {0} does not have account {1} or already matched against other voucher,Journal Entry {0} não tem conta {1} ou já comparado com outro comprovante
 DocType: Item,Moving Average,Média móvel
 DocType: BOM Replace Tool,The BOM which will be replaced,A LDM que será substituída
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +43,New Stock UOM must be different from current stock UOM,Novo Estoque UOM deve ser diferente do atual UOM estoque
 DocType: Account,Debit,Débito
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +34,Leaves must be allocated in multiples of 0.5,"Folhas devem ser alocados em múltiplos de 0,5"
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +44,Leaves must be allocated in multiples of 0.5,"Folhas devem ser alocados em múltiplos de 0,5"
 DocType: Production Order,Operation Cost,Operação Custo
 apps/erpnext/erpnext/config/hr.py +71,Upload attendance from a .csv file,Carregar comparecimento a partir de um arquivo CSV.
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,Outstanding Amt
@@ -3205,8 +3073,7 @@
 DocType: Employee,Internal Work History,História Trabalho Interno
 DocType: DocField,Column Break,Quebra de coluna
 DocType: Event,Thursday,Quinta-feira
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +42,Private Equity,Private Equity
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +93,Turning,Volta
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,Private Equity
 DocType: Maintenance Visit,Customer Feedback,Comentário do Cliente
 DocType: Account,Expense,despesa
 DocType: Sales Invoice,Exhibition,Exposição
@@ -3219,19 +3086,19 @@
 DocType: Employee,Held On,Realizada em
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +33,Production Item,Bem de Produção
 ,Employee Information,Informações do Funcionário
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,Rate (%),Taxa (%)
+apps/erpnext/erpnext/public/js/setup_wizard.js +294,Rate (%),Taxa (%)
 DocType: Stock Entry Detail,Additional Cost,Custo adicional
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +407,Financial Year End Date,Encerramento do Exercício Social Data
+apps/erpnext/erpnext/public/js/setup_wizard.js +155,Financial Year End Date,Encerramento do Exercício Social Data
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Voucher No, if grouped by Voucher","Não é possível filtrar com base no Comprovante Não, se agrupados por voucher"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +484,Make Supplier Quotation,Criar cotação com fornecedor
 DocType: Quality Inspection,Incoming,Entrada
 DocType: BOM,Materials Required (Exploded),Materiais necessários (explodida)
 DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),Reduzir a Geração de Renda para sair sem pagar (LWP)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +512,"Add users to your organization, other than yourself","Adicionar usuários à sua organização, além de si mesmo"
+apps/erpnext/erpnext/public/js/setup_wizard.js +256,"Add users to your organization, other than yourself","Adicionar usuários à sua organização, além de si mesmo"
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No {1} does not match with {2} {3},Row # {0}: Número de ordem {1} não coincide com {2} {3}
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +44,Casual Leave,Casual Deixar
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +44,Casual Leave,Casual Deixar
 DocType: Batch,Batch ID,ID do Lote
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +334,Note: {0},Nota : {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +336,Note: {0},Nota : {0}
 ,Delivery Note Trends,Nota de entrega Trends
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +104,This Week's Summary,Resumo da Semana
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +74,{0} must be a Purchased or Sub-Contracted Item in row {1},{0} deve ser um item comprado ou subcontratado na linha {1}
@@ -3243,7 +3110,7 @@
 DocType: Purchase Receipt,Return Against Purchase Receipt,Retorno Contra Recibo de compra
 DocType: Purchase Order,To Bill,Para Bill
 DocType: Material Request,% Ordered,% Ordenado
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +61,Piecework,trabalho por peça
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Piecework,trabalho por peça
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +64,Avg. Buying Rate,Méd. Taxa de Compra
 DocType: Task,Actual Time (in Hours),Tempo real (em horas)
 DocType: Employee,History In Company,Histórico na Empresa
@@ -3260,13 +3127,13 @@
 DocType: Opportunity,To Discuss,Para Discutir
 DocType: SMS Settings,SMS Settings,Definições de SMS
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +60,Temporary Accounts,Contas temporárias
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +155,Black,Preto
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Black,Preto
 DocType: BOM Explosion Item,BOM Explosion Item,Item da Explosão da LDM
 DocType: Account,Auditor,Auditor
 DocType: Purchase Order,End date of current order's period,A data de término do período da ordem atual
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +17,Make Offer Letter,Faça uma oferta Letter
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +10,Return,Retorna
-apps/erpnext/erpnext/stock/doctype/item/item.py +503,Default Unit of Measure for Variant must be same as Template,Unidade de medida padrão para Variant deve ser o mesmo como modelo
+apps/erpnext/erpnext/stock/doctype/item/item.py +507,Default Unit of Measure for Variant must be same as Template,Unidade de medida padrão para Variant deve ser o mesmo como modelo
 DocType: DocField,Fold,Dobrar
 DocType: Production Order Operation,Production Order Operation,Ordem de produção Operation
 DocType: Pricing Rule,Disable,Desativar
@@ -3277,13 +3144,12 @@
 DocType: Page,Page Name,Nome da Página
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +110,To Time must be greater than From Time,Para Tempo deve ser maior From Time
 DocType: Journal Entry Account,Exchange Rate,Taxa de Câmbio
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +465,Sales Order {0} is not submitted,Ordem de Vendas {0} não é submetido
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +467,Sales Order {0} is not submitted,Ordem de Vendas {0} não é submetido
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0}: Parent account {1} does not bolong to the company {2},Armazém {0}: Conta Mestre {1} não pertence à empresa {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +124,Spindle finishing,Acabamento Spindle
 DocType: BOM,Last Purchase Rate,Valor da última compra
 DocType: Account,Asset,Ativo
 DocType: Project Task,Task ID,ID Tarefa
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +395,"e.g. ""MC""","por exemplo "" MC """
+apps/erpnext/erpnext/public/js/setup_wizard.js +143,"e.g. ""MC""","por exemplo "" MC """
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,Stock cannot exist for Item {0} since has variants,Stock não pode existir por item {0} já que tem variantes
 ,Sales Person-wise Transaction Summary,Resumo da transação Pessoa-wise vendas
 DocType: System Settings,Time Zone,Fuso horário
@@ -3292,9 +3158,7 @@
 DocType: Monthly Distribution,Monthly Distribution Percentages,Percentagens distribuição mensal
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +16,The selected item cannot have Batch,O item selecionado não pode ter Batch
 DocType: Delivery Note,% of materials delivered against this Delivery Note,% do material entregue contra esta Guia de Remessa
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +151,Stapling,Stapling
 DocType: Customer,Customer Details,Detalhes do Cliente
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +105,Shaping,Formação
 DocType: Employee,Reports to,Relatórios para
 DocType: SMS Settings,Enter url parameter for receiver nos,Digite o parâmetro da url para os números de receptores
 DocType: Sales Invoice,Paid Amount,Valor pago
@@ -3303,13 +3167,13 @@
 DocType: Item Variant,Item Variant,Item Variant
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +15,Setting this Address Template as default as there is no other default,"A definição desse modelo de endereço como padrão, pois não há outro padrão"
 apps/erpnext/erpnext/accounts/doctype/account/account.py +89,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","O saldo já está em débito, você não tem permissão para definir 'saldo deve ser' como 'crédito'"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +76,Quality Management,Gestão da Qualidade
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Quality Management,Gestão da Qualidade
 DocType: Production Planning Tool,Filter based on customer,Filtrar baseado em cliente
 DocType: Payment Tool Detail,Against Voucher No,Contra a folha no
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +47,Please enter quantity for Item {0},"Por favor, indique a quantidade de item {0}"
 DocType: Employee External Work History,Employee External Work History,Histórico de trabalho externo do Funcionário
 DocType: Tax Rule,Purchase,Compras
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +34,Balance Qty,Balanço Qtde
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Balance Qty,Balanço Qtde
 DocType: Item Group,Parent Item Group,Grupo de item pai
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +21,{0} for {1},{0} para {1}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +96,Cost Centers,Centros de custo
@@ -3319,12 +3183,12 @@
 DocType: Opportunity,Next Contact,Próximo Contato
 DocType: Employee,Employment Type,Tipo de emprego
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,Imobilizado
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +84,Application period cannot be across two alocation records,Período de aplicação não pode ser através de dois registros de alocação
 DocType: Item Group,Default Expense Account,Conta Padrão de Despesa
 DocType: Employee,Notice (days),Notice ( dias)
 DocType: Page,Yes,Sim
 DocType: Tax Rule,Sales Tax Template,Template Imposto sobre Vendas
 DocType: Employee,Encashment Date,Data da cobrança
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +74,Electroforming,Electroforming
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +179,"Against Voucher Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Contra Comprovante Tipo deve ser um dos Pedido de Compra, nota fiscal de compra ou do Diário"
 DocType: Account,Stock Adjustment,Banco de Ajuste
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +34,Default Activity Cost exists for Activity Type - {0},Existe Atividade Custo Padrão para o Tipo de Atividade - {0}
@@ -3360,12 +3224,12 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,Armazém não pode ser excluído pois existe entrada de material para este armazém.
 DocType: Company,Distribution,Distribuição
 apps/erpnext/erpnext/public/js/pos/pos.html +36,Amount Paid,Valor pago
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +91,Project Manager,Gerente de Projetos
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +72,Dispatch,expedição
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Project Manager,Gerente de Projetos
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +72,Dispatch,expedição
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,Max desconto permitido para o item: {0} é {1}%
 DocType: Customer,Default Taxes and Charges,Impostos e Encargos padrão
 DocType: Account,Receivable,a receber
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +268,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,Row # {0}: Não é permitido mudar de fornecedor como ordem de compra já existe
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +263,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,Row # {0}: Não é permitido mudar de fornecedor como ordem de compra já existe
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,Papel que é permitido submeter transações que excedam os limites de crédito estabelecidos.
 DocType: Sales Invoice,Supplier Reference,Referência do Fornecedor
 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.","Se marcado, os itens da LDM para a Sub-Montagem serão considerados para obter matérias-primas. Caso contrário, todos os itens da sub-montagem vão ser tratados como matéria-prima."
@@ -3373,8 +3237,8 @@
 DocType: Hub Settings,Seller Description,Descrição do Vendedor
 DocType: Employee Education,Qualification,Qualificação
 DocType: Item Price,Item Price,Preço do Item
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +48,Soap & Detergent,Soap & detergente
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +36,Motion Picture & Video,Motion Picture & Video
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +48,Soap & Detergent,Soap & detergente
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +36,Motion Picture & Video,Motion Picture & Video
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,pedido
 DocType: Warehouse,Warehouse Name,Nome do Almoxarifado
 DocType: Naming Series,Select Transaction,Selecione a Transação
@@ -3383,7 +3247,6 @@
 DocType: BOM,Rate Of Materials Based On,Taxa de materiais com base em
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,Analtyics Suporte
 apps/erpnext/erpnext/accounts/doctype/accounts_settings/accounts_settings.py +27,Company is missing in warehouses {0},Não exite uma empresa relacionada nos armazéns {0}
-DocType: Stock UOM Replace Utility,Stock UOM Replace Utility,Utilitário para Substituir UDM do Estoque
 DocType: POS Profile,Terms and Conditions,Termos e Condições
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,To Date should be within the Fiscal Year. Assuming To Date = {0},Para data deve ser dentro do exercício social. Assumindo Para Date = {0}
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","Aqui você pode manter a altura, peso, alergias, preocupações médica, etc"
@@ -3395,7 +3258,7 @@
 DocType: Sales Order Item,For Production,Para Produção
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +103,Please enter sales order in the above table,Por favor entre pedidos de vendas na tabela acima
 DocType: Project Task,View Task,Ver Tarefa
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +406,Your financial year begins on,O ano financeiro inicia em
+apps/erpnext/erpnext/public/js/setup_wizard.js +154,Your financial year begins on,O ano financeiro inicia em
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +46,Please enter Purchase Receipts,Digite recibos de compra
 DocType: Sales Invoice,Get Advances Received,Obter adiantamentos recebidos
 DocType: Email Digest,Add/Remove Recipients,Adicionar / Remover Destinatários
@@ -3403,16 +3266,14 @@
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","Para definir esse Ano Fiscal como padrão , clique em ' Definir como padrão '"
 apps/erpnext/erpnext/config/support.py +54,Setup incoming server for support email id. (e.g. support@example.com),Configuração do servidor de entrada para suporte e-mail id . ( por exemplo support@example.com )
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,Escassez Qtde
-apps/erpnext/erpnext/stock/doctype/item/item.py +528,Item variant {0} exists with same attributes,Variante item {0} existe com os mesmos atributos
+apps/erpnext/erpnext/stock/doctype/item/item.py +532,Item variant {0} exists with same attributes,Variante item {0} existe com os mesmos atributos
 DocType: Salary Slip,Salary Slip,Folha de pagamento
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +116,Burnishing,Polimento
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +54,'To Date' is required,'Data Final' é necessária
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,'Data Final' é necessária
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","Gerar deslizamentos de embalagem para os pacotes a serem entregues. Usado para notificar número do pacote, o conteúdo do pacote e seu peso."
 DocType: Sales Invoice Item,Sales Order Item,Item da Ordem de Venda
 DocType: Salary Slip,Payment Days,Datas de Pagamento
 DocType: BOM,Manage cost of operations,Gerenciar custo das operações
 DocType: Features Setup,Item Advanced,Item antecipado
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +40,Hot rolling,Laminação a quente
 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.","Quando qualquer uma das operações marcadas são &quot;Enviadas&quot;, um pop-up abre automaticamente para enviar um e-mail para o &quot;Contato&quot; associado a transação, com a transação como um anexo. O usuário pode ou não enviar o e-mail."
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,Definições Globais
 DocType: Employee Education,Employee Education,Escolaridade do Funcionário
@@ -3425,25 +3286,23 @@
 DocType: Customer,Sales Team Details,Detalhes da Equipe de Vendas
 DocType: Expense Claim,Total Claimed Amount,Montante Total Requerido
 apps/erpnext/erpnext/config/crm.py +22,Potential opportunities for selling.,Oportunidades potenciais para a venda.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +48,Sick Leave,doente Deixar
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +174,Invalid {0},Inválido {0}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +48,Sick Leave,doente Deixar
 DocType: Email Digest,Email Digest,Resumo por E-mail
 DocType: Delivery Note,Billing Address Name,Nome do Endereço de Faturamento
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +22,Department Stores,Lojas de Departamento
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,Lojas de Departamento
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +40,System Balance,Equilíbrio sistema
 DocType: Workflow,Is Active,É Ativo
 apps/erpnext/erpnext/controllers/stock_controller.py +71,No accounting entries for the following warehouses,Nenhuma entrada de contabilidade para os seguintes armazéns
 apps/erpnext/erpnext/projects/doctype/project/project.js +22,Save the document first.,Salve o documento pela primeira vez.
 DocType: Account,Chargeable,Taxável
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +121,Linishing,Linishing
 DocType: Company,Change Abbreviation,Mudança abreviação
 DocType: Workflow State,Primary,Primário
 DocType: Expense Claim Detail,Expense Date,Data da despesa
 DocType: Item,Max Discount (%),Desconto Máx. (%)
 DocType: Communication,More Information,Mais informação
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +70,Last Order Amount,Last Order Montante
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +161,Blasting,Jateamento
 DocType: Company,Warn,Avisar
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +111,Item valuation updated,Valorização item atualizado
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Quaisquer outras observações, esforço digno de nota que deve ir nos registros."
 DocType: BOM,Manufacturing User,Manufacturing Usuário
 DocType: Purchase Order,Raw Materials Supplied,Matérias-primas em actualização
@@ -3453,7 +3312,7 @@
 DocType: Appraisal,Appraisal Template,Modelo de Avaliação
 DocType: Communication,Email,Email
 DocType: Item Group,Item Classification,Classificação do Item
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +89,Business Development Manager,Gerente de Desenvolvimento de Negócios
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Business Development Manager,Gerente de Desenvolvimento de Negócios
 DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,Finalidade da visita de manutenção
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.js +15,Period,período
 ,General Ledger,Razão Geral
@@ -3463,9 +3322,7 @@
 ,Itemwise Recommended Reorder Level,Itemwise Recomendado nível de reposição
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +264,Please select {0} first,Por favor seleccione {0} primeiro
 DocType: Features Setup,To get Item Group in details table,Para obter Grupo de Itens na tabela de detalhes
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +67,Redrawing,Redesenhar
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +112,Batch {0} of Item {1} has expired.,Lote {0} de {1} item expirou.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +120,Etching,Gravura a água forte
 DocType: Sales Invoice,Commission,Comissão
 DocType: Address Template,"<h4>Default Template</h4>
 <p>Uses <a href=""http://jinja.pocoo.org/docs/templates/"">Jinja Templating</a> and all the fields of Address (including Custom Fields if any) will be available</p>
@@ -3510,7 +3367,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +340,Operation Time must be greater than 0 for Operation {0},Tempo de Operação deve ser maior que 0 para a operação {0}
 DocType: Supplier,Address and Contacts,Endereços e contatos
 DocType: UOM Conversion Detail,UOM Conversion Detail,Detalhe da Conversão de UDM
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +496,Keep it web friendly 900px (w) by 100px (h),Mantenha- web 900px amigável (w) por 100px ( h )
+apps/erpnext/erpnext/public/js/setup_wizard.js +242,Keep it web friendly 900px (w) by 100px (h),Mantenha- web 900px amigável (w) por 100px ( h )
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +329,Production Order cannot be raised against a Item Template,Ordem de produção não pode ser levantada contra um modelo de item
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +44,Charges are updated in Purchase Receipt against each item,Encargos são atualizados em Recibo de compra para cada item
 DocType: Payment Tool,Get Outstanding Vouchers,Obter Circulação Vouchers
@@ -3526,54 +3383,49 @@
 DocType: Item,Average time taken by the supplier to deliver,Tempo médio necessário por parte do fornecedor para entregar
 DocType: Time Log,Hours,Horas
 DocType: Project,Expected Start Date,Data Inicial prevista
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +38,Rolling,Rolando
 DocType: ToDo,Priority,Prioridade
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +41,Remove item if charges is not applicable to that item,"Remover item, se as cargas não é aplicável a esse elemento"
 DocType: Dropbox Backup,Dropbox Access Allowed,Dropbox acesso permitido
 DocType: Dropbox Backup,Weekly,Semanalmente
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,Por exemplo: smsgateway.com / api / send_sms.cgi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +485,Receive,Receber
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +510,Receive,Receber
 DocType: Maintenance Visit,Fully Completed,Totalmente concluída
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% concluída
 DocType: Employee,Educational Qualification,Qualificação Educacional
 DocType: Workstation,Operating Costs,Custos Operacionais
 DocType: Employee Leave Approver,Employee Leave Approver,Empregado Leave Approver
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,{0} has been successfully added to our Newsletter list.,{0} foi adicionada com sucesso à nossa lista Newsletter.
-apps/erpnext/erpnext/stock/doctype/item/item.py +383,Row {0}: An Reorder entry already exists for this warehouse {1},Row {0}: Uma entrada de reabastecimento já existe para este armazém {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +387,Row {0}: An Reorder entry already exists for this warehouse {1},Row {0}: Uma entrada de reabastecimento já existe para este armazém {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +67,"Cannot declare as lost, because Quotation has been made.","Não pode declarar como perdido , porque Cotação foi feita."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +133,Electron beam machining,Electron usinagem feixe
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Compra Mestre Gerente
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +424,Production Order {0} must be submitted,Ordem de produção {0} deve ser apresentado
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +150,Please select Start Date and End Date for Item {0},Por favor seleccione Data de início e data de término do item {0}
 apps/erpnext/erpnext/config/stock.py +141,Main Reports,Relatórios principais
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +102,Stock Ledger entries balances updated,Banco de Ledger Entradas saldos atualizados
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,Até o momento não pode ser antes a partir da data
 DocType: Purchase Receipt Item,Prevdoc DocType,Prevdoc DocType
-apps/erpnext/erpnext/stock/doctype/item/item.js +176,Add / Edit Prices,Adicionar / Editar preços
+apps/erpnext/erpnext/stock/doctype/item/item.js +178,Add / Edit Prices,Adicionar / Editar preços
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +53,Chart of Cost Centers,Plano de Centros de Custo
 ,Requested Items To Be Ordered,Itens solicitados devem ser pedidos
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +298,My Orders,Meus pedidos
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +293,My Orders,Meus pedidos
 DocType: Price List,Price List Name,Nome da Lista de Preços
 DocType: Time Log,For Manufacturing,Para Manufacturing
-apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +70,Totals,Totais
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +174,Totals,Totais
 DocType: BOM,Manufacturing,Fabricação
 ,Ordered Items To Be Delivered,Itens encomendados a serem entregues
 DocType: Account,Income,Receitas
 ,Setup Wizard,Assistente de Configuração
 DocType: Industry Type,Industry Type,Tipo de indústria
 apps/erpnext/erpnext/templates/includes/cart.js +137,Something went wrong!,Algo deu errado!
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +68,Warning: Leave application contains following block dates,Aviso: pedido de férias contém as datas de intervalos 
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +251,Sales Invoice {0} has already been submitted,Fatura de vendas {0} já foi apresentado
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +100,Warning: Leave application contains following block dates,Aviso: pedido de férias contém as datas de intervalos 
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +256,Sales Invoice {0} has already been submitted,Fatura de vendas {0} já foi apresentado
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,Data de Conclusão
 DocType: Purchase Invoice Item,Amount (Company Currency),Amount (Moeda Company)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +10,Die casting,Fundição
 DocType: Email Alert,Reference Date,Data de Referência
 apps/erpnext/erpnext/config/hr.py +105,Organization unit (department) master.,Organização unidade (departamento) mestre.
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +25,Please enter valid mobile nos,"Por favor, indique nn móveis válidos"
 DocType: Budget Detail,Budget Detail,Detalhe do Orçamento
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +75,Please enter message before sending,Por favor introduza a mensagem antes de enviá-
 DocType: Async Task,Status,Estado
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +65,Stock UOM updated for Item {0},Da UOM atualizado do número {0}
 DocType: Company History,Year,Ano
 apps/erpnext/erpnext/config/accounts.py +127,Point-of-Sale Profile,Point-of-Sale Perfil
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +68,Please Update SMS Settings,Atualize Configurações SMS
@@ -3587,12 +3439,12 @@
 ,Serial No Service Contract Expiry,Vencimento do Contrato de Serviço com Nº de Série
 DocType: Item,Unit of Measure Conversion,Unidade de Conversão de Medida
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +86,Employee can not be changed,Empregado não pode ser alterado
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +259,You cannot credit and debit same account at the same time,Você não pode ter débito e crédito na mesma conta
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,You cannot credit and debit same account at the same time,Você não pode ter débito e crédito na mesma conta
 DocType: Naming Series,Help HTML,Ajuda HTML
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},Weightage total atribuído deve ser de 100 %. É {0}
 apps/erpnext/erpnext/controllers/status_updater.py +140,Allowance for over-{0} crossed for Item {1},Provisão para over-{0} cruzou para item {1}
 DocType: Address,Name of person or organization that this address belongs to.,Nome da pessoa ou organização a que este endereço pertence.
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +587,Your Suppliers,Seus Fornecedores
+apps/erpnext/erpnext/public/js/setup_wizard.js +325,Your Suppliers,Seus Fornecedores
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,Não é possível definir como perdida como ordem de venda é feita.
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +65,Another Salary Structure {0} is active for employee {1}. Please make its status 'Inactive' to proceed.,"Outra estrutura Salário {0} está ativo para empregado {1}. Por favor, faça o seu estatuto ""inativos"" para prosseguir."
 DocType: Purchase Invoice,Contact,Contato
@@ -3601,37 +3453,35 @@
 DocType: Item,Has Serial No,Tem nº de Série
 DocType: Employee,Date of Issue,Data de Emissão
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +16,{0}: From {0} for {1},{0}: A partir de {0} para {1}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +154,Row #{0}: Set Supplier for item {1},Row # {0}: Jogo Fornecedor para o item {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +149,Row #{0}: Set Supplier for item {1},Row # {0}: Jogo Fornecedor para o item {1}
 DocType: Issue,Content Type,Tipo de Conteúdo
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +17,Computer,Computador
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,Computador
 DocType: Item,List this Item in multiple groups on the website.,Listar este item em vários grupos no site.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +283,Please check Multi Currency option to allow accounts with other currency,"Por favor, verifique multi opção de moeda para permitir que contas com outra moeda"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +285,Please check Multi Currency option to allow accounts with other currency,"Por favor, verifique multi opção de moeda para permitir que contas com outra moeda"
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +62,Item: {0} does not exist in the system,Item: {0} não existe no sistema
 apps/erpnext/erpnext/accounts/doctype/account/account.py +81,You are not authorized to set Frozen value,Você não está autorizado para definir o valor congelado
 DocType: Payment Reconciliation,Get Unreconciled Entries,Obter Unreconciled Entradas
 DocType: Cost Center,Budgets,Orçamentos
 apps/frappe/frappe/core/page/modules_setup/modules_setup.py +11,Updated,Atualizado
 DocType: Employee,Emergency Contact Details,Detalhes do contato de emergência
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +396,What does it do?,O que isto faz ?
+apps/erpnext/erpnext/public/js/setup_wizard.js +144,What does it do?,O que isto faz ?
 DocType: Delivery Note,To Warehouse,Para Almoxarifado
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +45,Account {0} has been entered more than once for fiscal year {1},A Conta {0} foi inserida mais de uma vez para o ano fiscal {1}
 ,Average Commission Rate,Taxa de Comissão Média
-apps/erpnext/erpnext/stock/doctype/item/item.py +313,'Has Serial No' can not be 'Yes' for non-stock item,'Tem Número Serial' não pode ser confirmado para itens sem controle de estoque
+apps/erpnext/erpnext/stock/doctype/item/item.py +317,'Has Serial No' can not be 'Yes' for non-stock item,'Tem Número Serial' não pode ser confirmado para itens sem controle de estoque
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Attendance can not be marked for future dates,Comparecimento não pode ser marcado para datas futuras
 DocType: Pricing Rule,Pricing Rule Help,Regra Preços Ajuda
 DocType: Purchase Taxes and Charges,Account Head,Conta
 apps/erpnext/erpnext/config/stock.py +79,Update additional costs to calculate landed cost of items,Atualize custos adicionais para calcular o custo desembarcado de itens
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +111,Electrical,elétrico
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +111,Electrical,elétrico
 DocType: Stock Entry,Total Value Difference (Out - In),Diferença Valor Total (Out - In)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +302,Row {0}: Exchange Rate is mandatory,Row {0}: Taxa de Câmbio é obrigatória
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +304,Row {0}: Exchange Rate is mandatory,Row {0}: Taxa de Câmbio é obrigatória
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},ID do usuário não definido para Funcionário {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +72,Peening,Peening
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,From Warranty Claim,A partir da solicitação de garantia
 DocType: Stock Entry,Default Source Warehouse,Almoxarifado da origem padrão
 DocType: Item,Customer Code,Código do Cliente
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +212,Birthday Reminder for {0},Lembrete de aniversário para {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +163,Lapping,Dobrando
-apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.js +8,Days Since Last Order,Dias desde a última ordem
+apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +72,Days Since Last Order,Dias desde a última ordem
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +299,Debit To account must be a Balance Sheet account,Débito em conta deve ser uma conta de Balanço
 DocType: Buying Settings,Naming Series,Séries nomeadas
 DocType: Leave Block List,Leave Block List Name,Deixe o nome Lista de Bloqueios
@@ -3645,7 +3495,7 @@
 DocType: Notification Control,Sales Invoice Message,Mensagem da Nota Fiscal de Venda
 DocType: Authorization Rule,Based On,Baseado em
 DocType: Sales Order Item,Ordered Qty,ordenada Qtde
-apps/erpnext/erpnext/stock/doctype/item/item.py +539,Item {0} is disabled,Item {0} está desativada
+apps/erpnext/erpnext/stock/doctype/item/item.py +543,Item {0} is disabled,Item {0} está desativada
 DocType: Stock Settings,Stock Frozen Upto,Estoque congelado até
 apps/erpnext/erpnext/controllers/recurring_document.py +166,Period From and Period To dates mandatory for recurring {0},Período Do período Para datas e obrigatórias para os recorrentes {0}
 apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,Atividade / tarefa do projeto.
@@ -3655,7 +3505,6 @@
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,Desconto deve ser inferior a 100
 DocType: ToDo,Low,Baixo
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Escrever Off Montante (Companhia de moeda)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +71,Spinning,Fiação
 DocType: Landed Cost Voucher,Landed Cost Voucher,Landed Comprovante Custo
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +55,Please set {0},Defina {0}
 DocType: Purchase Invoice,Repeat on Day of Month,Repita no Dia do Mês
@@ -3677,7 +3526,6 @@
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +37,Campaign Name is required,Nome da campanha é necessária
 DocType: Maintenance Visit,Maintenance Date,Data de manutenção
 DocType: Purchase Receipt Item,Rejected Serial No,Nº de Série Rejeitado
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +51,Deep drawing,Desenho profundo
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +40,New Newsletter,Novo Boletim informativo
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +157,Start date should be less than end date for Item {0},Data de início deve ser inferior a data final para o item {0}
 apps/erpnext/erpnext/stock/doctype/item/item.js +17,Show Balance,Mostrar Balance
@@ -3688,7 +3536,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +119,BOM and Manufacturing Quantity are required,BOM e Manufatura Quantidade são obrigatórios
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Faixa Envelhecimento 2
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +450,Amount,Quantidade
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +147,Riveting,Riveting
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,LDM substituída
 ,Sales Analytics,Analítico de Vendas
 DocType: Manufacturing Settings,Manufacturing Settings,Configurações de Fabricação
@@ -3700,20 +3547,19 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +207,New Account Name,Novo Nome da conta
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,Custo de fornecimento de Matérias-Primas
 DocType: Selling Settings,Settings for Selling Module,Definições para vender Module
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +73,Customer Service,atendimento ao cliente
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Customer Service,atendimento ao cliente
 DocType: Item,Thumbnail,Miniatura
 DocType: Item Customer Detail,Item Customer Detail,Detalhe do Cliente do Item
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +147,Confirm Your Email,Confirme Seu Email
 apps/erpnext/erpnext/config/hr.py +53,Offer candidate a Job.,Oferta candidato a Job.
 DocType: Notification Control,Prompt for Email on Submission of,Solicitar e-mail no envio da
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +81,Total allocated leaves are more than days in the period,Total de folhas alocados são mais do que dias no período
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +70,Item {0} must be a stock Item,Item {0} deve ser um item de estoque
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,Padrão trabalho no armazém Progresso
 apps/erpnext/erpnext/config/accounts.py +107,Default settings for accounting transactions.,As configurações padrão para as transações contábeis.
 apps/frappe/frappe/model/naming.py +40,{0} is required,{0} é necessária
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +21,Vacuum molding,Moldagem a vácuo
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,Data prevista não pode ser antes de Material Data do Pedido
 DocType: Contact Us Settings,City,Cidade
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +132,Ultrasonic machining,Ultrasonic usinagem
 apps/frappe/frappe/templates/base.html +137,Error: Not a valid id?,Erro: Não é um ID válido?
 apps/erpnext/erpnext/stock/get_item_details.py +125,Item {0} must be a Sales Item,Item {0} deve ser um item de vendas
 DocType: Naming Series,Update Series Number,Atualizar Números de Séries
@@ -3721,7 +3567,7 @@
 DocType: Sales Order,Printing Details,Imprimir detalhes
 DocType: Task,Closing Date,Data de Encerramento
 DocType: Sales Order Item,Produced Quantity,Quantidade produzida
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +84,Engineer,engenheiro
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Engineer,engenheiro
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,Pesquisa subconjuntos
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +379,Item Code required at Row No {0},Código do item exigido no Row Não {0}
 DocType: Sales Partner,Partner Type,Tipo de parceiro
@@ -3729,7 +3575,7 @@
 DocType: Authorization Rule,Customerwise Discount,Desconto referente ao Cliente
 DocType: Purchase Invoice,Against Expense Account,Contra a Conta de Despesas
 DocType: Production Order,Production Order,Ordem de Produção
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +258,Installation Note {0} has already been submitted,Instalação Nota {0} já foi apresentado
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +263,Installation Note {0} has already been submitted,Instalação Nota {0} já foi apresentado
 DocType: Quotation Item,Against Docname,Contra o Docname
 DocType: SMS Center,All Employee (Active),Todos os Empregados (Ativos)
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,Ver Agora
@@ -3738,19 +3584,19 @@
 DocType: Item,Re-Order Level,Re-order Nível
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,Digite itens e qtde. planejada para o qual você quer levantar ordens de produção ou fazer o download de matérias-primas para a análise.
 apps/frappe/frappe/public/js/frappe/views/ganttview.js +45,Gantt Chart,Gráfico de Gantt
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +57,Part-time,De meio expediente
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,Part-time,De meio expediente
 DocType: Employee,Applicable Holiday List,Lista de Férias Aplicável
 DocType: Employee,Cheque,Cheque
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,Série Atualizado
 apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Report Type is mandatory,Tipo de relatório é obrigatória
 DocType: Item,Serial Number Series,Serial Series Número
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},Armazém é obrigatória para stock o item {0} na linha {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +45,Retail & Wholesale,Varejo e Atacado
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,Varejo e Atacado
 DocType: Issue,First Responded On,Primeira resposta em
 DocType: Website Item Group,Cross Listing of Item in multiple groups,Listagem cruzada dos produtos que pertencem à vários grupos
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +351,The First User: You,O primeiro usuário : Você
+apps/erpnext/erpnext/public/js/setup_wizard.js +101,The First User: You,O primeiro usuário : Você
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +48,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},Ano Fiscal Data de Início e Término do Exercício Social Data já estão definidos no ano fiscal de {0}
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +172,Successfully Reconciled,Reconciliados com sucesso
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +119,Successfully Reconciled,Reconciliados com sucesso
 DocType: Production Order,Planned End Date,Planejado Data de Término
 apps/erpnext/erpnext/config/stock.py +43,Where items are stored.,Onde os itens são armazenados.
 DocType: Tax Rule,Validity,Validade
@@ -3770,39 +3616,36 @@
 DocType: DocPerm,Level,Nível
 DocType: Purchase Taxes and Charges,On Net Total,No Total Líquido
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +160,Target warehouse in row {0} must be same as Production Order,Warehouse de destino na linha {0} deve ser o mesmo que ordem de produção
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +59,No permission to use Payment Tool,Sem permissão para usar ferramenta de pagamento
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +97,No permission to use Payment Tool,Sem permissão para usar ferramenta de pagamento
 apps/erpnext/erpnext/controllers/recurring_document.py +192,'Notification Email Addresses' not specified for recurring %s,O 'Endereço de Email para Notificação' não foi especificado para %s recorrente
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +86,Milling,Fresagem
 apps/erpnext/erpnext/accounts/doctype/account/account.py +99,Currency can not be changed after making entries using some other currency,Moeda não pode ser alterada depois de fazer entradas usando alguma outra moeda
 DocType: Company,Round Off Account,Termine Conta
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +60,Nibbling,Mordiscando
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,Despesas Administrativas
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +18,Consulting,Consultoria
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +18,Consulting,Consultoria
 DocType: Customer Group,Parent Customer Group,Grupo de Clientes pai
 apps/erpnext/erpnext/public/js/pos/pos.js +429,Change,Mudança
 DocType: Purchase Invoice,Contact Email,E-mail do Contato
 DocType: Appraisal Goal,Score Earned,Pontuação Obtida
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +393,"e.g. ""My Company LLC""","por exemplo "" My Company LLC"""
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +173,Notice Period,Período de aviso prévio
+apps/erpnext/erpnext/public/js/setup_wizard.js +141,"e.g. ""My Company LLC""","por exemplo "" My Company LLC"""
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +173,Notice Period,Período de aviso prévio
 DocType: Bank Reconciliation Detail,Voucher ID,ID do Comprovante
 apps/erpnext/erpnext/setup/doctype/territory/territory.js +14,This is a root territory and cannot be edited.,Este é um território de raiz e não pode ser editada.
 DocType: Packing Slip,Gross Weight UOM,UDM do Peso Bruto
 DocType: Email Digest,Receivables / Payables,Contas a receber / contas a pagar
 DocType: Delivery Note Item,Against Sales Invoice,Contra a Nota Fiscal de Venda
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +63,Stamping,Estampagem
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +457,Credit Account,Conta de crédito
 DocType: Landed Cost Item,Landed Cost Item,Custo de desembarque do Item
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +56,Show zero values,Mostrar valores de zero
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,Quantidade do item obtido após a fabricação / reembalagem a partir de determinadas quantidades de matéria-prima
 DocType: Payment Reconciliation,Receivable / Payable Account,Receber Conta / Payable
 DocType: Delivery Note Item,Against Sales Order Item,Contra a Ordem de venda do item
-apps/erpnext/erpnext/stock/doctype/item/item.py +521,Please specify Attribute Value for attribute {0},"Por favor, especifique Atributo Valor para o atributo {0}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +525,Please specify Attribute Value for attribute {0},"Por favor, especifique Atributo Valor para o atributo {0}"
 DocType: Item,Default Warehouse,Armazém padrão
 DocType: Task,Actual End Date (via Time Logs),Data Real End (via Time Logs)
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +37,Budget cannot be assigned against Group Account {0},Orçamento não pode ser atribuído contra a conta de grupo {0}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +23,Please enter parent cost center,Por favor entre o centro de custo pai
 DocType: Delivery Note,Print Without Amount,Imprimir Sem Quantia
-apps/erpnext/erpnext/controllers/buying_controller.py +69,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,"Categoria imposto não pode ser ' Avaliação ' ou ' Avaliação e total "", como todos os itens não são itens de estoque"
+apps/erpnext/erpnext/controllers/buying_controller.py +60,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,"Categoria imposto não pode ser ' Avaliação ' ou ' Avaliação e total "", como todos os itens não são itens de estoque"
 DocType: User,Last Name,Sobrenome
 DocType: Web Page,Left,Esquerda
 DocType: Event,All Day,Todo o Dia
@@ -3810,7 +3653,7 @@
 DocType: Appraisal,Total Score (Out of 5),Pontuação total (sobre 5)
 DocType: Contact Us Settings,State,Estado
 DocType: Batch,Batch,Lote
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +51,Balance,Equilíbrio
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +28,Balance,Equilíbrio
 DocType: Project,Total Expense Claim (via Expense Claims),Reivindicação de Despesa Total (via relatórios de despesas)
 DocType: User,Gender,Sexo
 DocType: Journal Entry,Debit Note,Nota de Débito
@@ -3840,8 +3683,7 @@
 DocType: Purchase Order,Get Last Purchase Rate,Obter Valor da Última Compra
 DocType: Time Log,Billing Rate based on Activity Type (per hour),Preço para Facturação com base no tipo de atividade (por hora)
 DocType: Company,Company Info,Informações da Empresa
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +76,Seaming,Costura
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +197,"Company Email ID not found, hence mail not sent","E-mail ID da Empresa não foi encontrado , portanto o e-mail não pode ser enviado"
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +206,"Company Email ID not found, hence mail not sent","E-mail ID da Empresa não foi encontrado , portanto o e-mail não pode ser enviado"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Fundos de Aplicação ( Ativos )
 DocType: Production Planning Tool,Filter based on item,Filtrar baseado no item
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +451,Debit Account,Conta de debito
@@ -3853,17 +3695,16 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +95,{0} {1} has been modified. Please refresh.,"{0} {1} foi modificado . Por favor, atualize ."
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,Pare de usuários de fazer aplicações deixam nos dias seguintes.
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +591,From Opportunity,De Opportunity
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +46,Blanking,Branqueamento
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +166,Employee Benefits,Benefícios a Empregados
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,Employee Benefits,Benefícios a Empregados
 DocType: Sales Invoice,Is POS,É PDV
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +240,Packed quantity must equal quantity for Item {0} in row {1},Embalado quantidade deve ser igual a quantidade de item {0} na linha {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +245,Packed quantity must equal quantity for Item {0} in row {1},Embalado quantidade deve ser igual a quantidade de item {0} na linha {1}
 DocType: Production Order,Manufactured Qty,Qtde. fabricada
 DocType: Purchase Receipt Item,Accepted Quantity,Quantidade Aceita
 apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} não existe
 apps/erpnext/erpnext/config/accounts.py +18,Bills raised to Customers.,Faturas levantdas para Clientes.
 DocType: DocField,Default,Padrão
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Id Projeto
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +466,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Nenhuma linha {0}: Valor não pode ser superior a pendência Montante contra Despesa reivindicação {1}. Montante pendente é {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +468,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Nenhuma linha {0}: Valor não pode ser superior a pendência Montante contra Despesa reivindicação {1}. Montante pendente é {2}
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +40,{0} subscribers added,{0} assinantes acrescentados
 DocType: Maintenance Schedule,Schedule,Agendar
 DocType: Cost Center,"Define Budget for this Cost Center. To set budget action, see ""Company List""","Definir orçamento para este centro de custo. Para definir a ação orçamento, consulte &quot;Lista de Empresas&quot;"
@@ -3874,7 +3715,7 @@
 apps/erpnext/erpnext/public/js/pos/pos.js +91,Price List not found or disabled,Preço de tabela não encontrado ou deficientes
 DocType: Expense Claim,Approved,Aprovado
 DocType: Pricing Rule,Price,Preço
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +79,Employee relieved on {0} must be set as 'Left',Empregado aliviada em {0} deve ser definido como 'Esquerda'
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +88,Employee relieved on {0} must be set as 'Left',Empregado aliviada em {0} deve ser definido como 'Esquerda'
 DocType: Item,"Selecting ""Yes"" will give a unique identity to each entity of this item which can be viewed in the Serial No master.",Selecionando &quot;Sim&quot; vai dar uma identificação única para cada entidade deste item que pode ser vista no cadastro do Número de Série.
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +39,Appraisal {0} created for Employee {1} in the given date range,Avaliação {0} criado para Empregado {1} no intervalo de datas informado
 DocType: Employee,Education,educação
@@ -3885,7 +3726,7 @@
 apps/frappe/frappe/desk/moduleview.py +67,Standard Reports,Relatórios padrão
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,Lançamentos no livro Diário.
 DocType: Delivery Note Item,Available Qty at From Warehouse,Quantidade disponível no Armazém A partir de
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +209,Please select Employee Record first.,"Por favor, selecione Employee primeiro registro."
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +224,Please select Employee Record first.,"Por favor, selecione Employee primeiro registro."
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Row {0}: Party / conta não coincide com {1} / {2} em {3} {4}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +35,To create a Tax Account,Para criar uma conta de impostos
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +233,Please enter Expense Account,Por favor insira Conta Despesa
@@ -3898,46 +3739,43 @@
 DocType: Sales Order,Track this Sales Order against any Project,Acompanhar este Ordem de Venda contra qualquer projeto
 DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,Puxar as Ordens de Venda (pendentes de entrega) com base nos critérios acima
 DocType: DocShare,Document Type,Tipo de Documento
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +565,From Supplier Quotation,De Fornecedor Cotação
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +588,From Supplier Quotation,De Fornecedor Cotação
 DocType: Deduction Type,Deduction Type,Tipo de dedução
 DocType: Attendance,Half Day,Meio Dia
 DocType: Pricing Rule,Min Qty,Quantidade mínima
 DocType: Features Setup,"To track items in sales and purchase documents with batch nos. ""Preferred Industry: Chemicals""",Para controlar os itens em documentos de vendas e de compra com nsa lote. &quot;Indústria preferida: Chemicals&quot;
 DocType: GL Entry,Transaction Date,Data da Transação
 DocType: Production Plan Item,Planned Qty,Qtde. planejada
-apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +91,Total Tax,Fiscal total
+apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +93,Total Tax,Fiscal total
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +178,For Quantity (Manufactured Qty) is mandatory,Para Quantidade (fabricado Qtde) é obrigatório
 DocType: Stock Entry,Default Target Warehouse,Almoxarifado de destino padrão
 DocType: Purchase Invoice,Net Total (Company Currency),Total Líquido (Moeda Company)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +79,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Row {0}: Party Tipo e partido só é aplicável contra a receber / a pagar contas
 DocType: Notification Control,Purchase Receipt Message,Mensagem do Recibo de Compra
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +95,Total allocated leaves are more than period,Total de folhas alocados mais de período
 DocType: Production Order,Actual Start Date,Data de Início Real
 DocType: Sales Order,% of materials delivered against this Sales Order,% do material entregue contra esta Ordem de Venda
 apps/erpnext/erpnext/config/stock.py +23,Record item movement.,Gravar o movimento item.
 DocType: Newsletter List Subscriber,Newsletter List Subscriber,Boletim lista assinante
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +164,Morticing,Escatelar
 DocType: Email Account,Service,Serviço
 DocType: Hub Settings,Hub Settings,Configurações Hub
 DocType: Project,Gross Margin %,Margem Bruta %
 DocType: BOM,With Operations,Com Operações
 apps/erpnext/erpnext/accounts/party.py +232,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,"Lançamentos contábeis já foram feitas em moeda {0} para {1} empresa. Por favor, selecione uma conta a receber ou a pagar com a moeda {0}."
 ,Monthly Salary Register,Registrar salário mensal
-apps/frappe/frappe/website/template.py +140,Next,próximo
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard_page.html +17,Next,próximo
 DocType: Warranty Claim,If different than customer address,Se diferente do endereço do cliente
 DocType: BOM Operation,BOM Operation,Operação da LDM
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +118,Electropolishing,Electropolimento
 DocType: Purchase Taxes and Charges,On Previous Row Amount,No Valor na linha anterior
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +24,Please enter Payment Amount in atleast one row,Digite valor do pagamento em pelo menos uma fileira
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +33,Please enter Payment Amount in atleast one row,Digite valor do pagamento em pelo menos uma fileira
 DocType: POS Profile,POS Profile,POS Perfil
 apps/erpnext/erpnext/config/accounts.py +153,"Seasonality for setting budgets, targets etc.","Sazonalidade para definição de orçamentos, metas etc."
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +238,Row {0}: Payment Amount cannot be greater than Outstanding Amount,Row {0}: valor do pagamento não pode ser maior do que a quantidade Outstanding
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +46,Total Unpaid,Total de Unpaid
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +21,Time Log is not billable,Tempo Log não é cobrável
 apps/erpnext/erpnext/stock/get_item_details.py +128,"Item {0} is a template, please select one of its variants","Item {0} é um modelo, por favor selecione uma de suas variantes"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +528,Purchaser,Comprador
+apps/erpnext/erpnext/public/js/setup_wizard.js +272,Purchaser,Comprador
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +81,Net pay cannot be negative,Salário líquido não pode ser negativo
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +71,Please enter the Against Vouchers manually,"Por favor, indique o Contra Vouchers manualmente"
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +107,Please enter the Against Vouchers manually,"Por favor, indique o Contra Vouchers manualmente"
 DocType: SMS Settings,Static Parameters,Parâmetros estáticos
 DocType: Purchase Order,Advance Paid,Adiantamento pago
 DocType: Item,Item Tax,Imposto do Item
@@ -3946,14 +3784,12 @@
 apps/erpnext/erpnext/config/crm.py +48,Send mass SMS to your contacts,Enviar SMS em massa para seus contatos
 DocType: Purchase Taxes and Charges,Consider Tax or Charge for,Considere Imposto ou Encargo para
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,Quant. Real é obrigatória
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +42,Cross-rolling,Cross-rolamento
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +132,Credit Card,Cartão de crédito
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +132,Credit Card,Cartão de crédito
 DocType: BOM,Item to be manufactured or repacked,Item a ser fabricado ou reembalado
 apps/erpnext/erpnext/config/stock.py +95,Default settings for stock transactions.,As configurações padrão para transações com ações .
 DocType: Purchase Invoice,Next Date,Próxima data
 DocType: Employee Education,Major/Optional Subjects,Assuntos Principais / Opcionais
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +49,Please enter Taxes and Charges,Digite Impostos e Taxas
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +85,Machining,Usinagem
 DocType: Sales Invoice Item,Drop Ship,Drop Ship
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","Aqui você pode manter detalhes familiares como o nome e ocupação do cônjuge, pai e filhos"
 DocType: Hub Settings,Seller Name,Nome do Vendedor
@@ -3963,7 +3799,7 @@
 DocType: Stock Entry,Repack,Reembalar
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +6,You must Save the form before proceeding,Você deve salvar o formulário antes de continuar
 DocType: Item Attribute,Numeric Values,Os valores numéricos
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +500,Attach Logo,Anexar Logo
+apps/erpnext/erpnext/public/js/setup_wizard.js +246,Attach Logo,Anexar Logo
 DocType: Customer,Commission Rate,Taxa de Comissão
 apps/erpnext/erpnext/stock/doctype/item/item.js +38,Make Variant,Faça Variant
 apps/erpnext/erpnext/config/hr.py +145,Block leave applications by department.,Bloquear licenças por departamento.
@@ -3978,19 +3814,19 @@
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +105,Please select a csv file,"Por favor, selecione um arquivo csv"
 DocType: Dropbox Backup,Send Backups to Dropbox,Enviar Backups para Dropbox
 DocType: Purchase Order,To Receive and Bill,Para receber e Bill
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +94,Designer,estilista
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Designer,estilista
 apps/erpnext/erpnext/config/selling.py +121,Terms and Conditions Template,Modelo de Termos e Condições
 DocType: Serial No,Delivery Details,Detalhes da entrega
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +383,Cost Center is required in row {0} in Taxes table for type {1},Centro de Custo é necessária na linha {0} no Imposto de mesa para o tipo {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +386,Cost Center is required in row {0} in Taxes table for type {1},Centro de Custo é necessária na linha {0} no Imposto de mesa para o tipo {1}
 DocType: Item,Automatically create Material Request if quantity falls below this level,Criar automaticamente um pedido de material se a quantidade for inferior a este nível
 ,Item-wise Purchase Register,Item-wise Compra Register
 DocType: Batch,Expiry Date,Data de validade
-apps/erpnext/erpnext/stock/doctype/item/item.py +375,"To set reorder level, item must be a Purchase Item or Manufacturing Item","Para definir o nível de reabastecimento, o item deve ser um item de compra ou Manufacturing item"
+apps/erpnext/erpnext/stock/doctype/item/item.py +379,"To set reorder level, item must be a Purchase Item or Manufacturing Item","Para definir o nível de reabastecimento, o item deve ser um item de compra ou Manufacturing item"
 ,Supplier Addresses and Contacts,Fornecedor Endereços e contatos
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,Por favor seleccione Categoria primeira
 apps/erpnext/erpnext/config/projects.py +18,Project master.,Cadastro de Projeto.
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,Não mostrar qualquer símbolo como US $ etc ao lado de moedas.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +330, (Half Day),(Meio Dia)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +374, (Half Day),(Meio Dia)
 DocType: Supplier,Credit Days,Dias de Crédito
 DocType: Leave Type,Is Carry Forward,É encaminhado
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +478,Get Items from BOM,Obter itens de BOM
@@ -3998,7 +3834,7 @@
 apps/erpnext/erpnext/config/manufacturing.py +120,Bill of Materials,Bill of Materials
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +77,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Row {0}: Party Tipo e partido é necessário para receber / pagar conta {1}
 DocType: Dropbox Backup,Send Notifications To,Enviar notificações para
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html +26,Ref Date,Ref Data
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +54,Ref Date,Ref Data
 DocType: Employee,Reason for Leaving,Motivo da saída
 DocType: Expense Claim Detail,Sanctioned Amount,Quantidade sancionada
 DocType: GL Entry,Is Opening,É abertura
@@ -4006,4 +3842,3 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +188,Account {0} does not exist,A Conta {0} não existe
 DocType: Account,Cash,Numerário
 DocType: Employee,Short biography for website and other publications.,Breve biografia para o site e outras publicações.
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +31,Please create Salary Structure for employee {0},"Por favor, crie estrutura salarial por empregado {0}"
diff --git a/erpnext/translations/pt.csv b/erpnext/translations/pt.csv
index 2bb619f..959e935 100644
--- a/erpnext/translations/pt.csv
+++ b/erpnext/translations/pt.csv
@@ -1,13 +1,12 @@
 DocType: Employee,Salary Mode,Modo de salário
 DocType: Cost Center,"Select Monthly Distribution, if you want to track based on seasonality.","Selecione distribuição mensal, se você quer acompanhar com base na sazonalidade."
 DocType: Employee,Divorced,Divorciado
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +86,Warning: Same item has been entered multiple times.,Atenção: O mesmo artigo foi introduzido várias vezes.
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +80,Warning: Same item has been entered multiple times.,Atenção: O mesmo artigo foi introduzido várias vezes.
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +96,Items already synced,Itens já sincronizado
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,Permitir item a ser adicionado várias vezes em uma transação
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,Anular Material de Visita {0} antes de cancelar esta solicitação de garantia
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +19,Consumer Products,produtos para o Consumidor
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,produtos para o Consumidor
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +68,Please select Party Type first,"Por favor, selecione Partido Tipo primeiro"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +90,Annealing,Recozimento
 DocType: Item,Customer Items,Itens de clientes
 apps/erpnext/erpnext/accounts/doctype/account/account.py +45,Account {0}: Parent account {1} can not be a ledger,Conta {0}: conta principal {1} não pode ser um livro
 DocType: Item,Publish Item to hub.erpnext.com,Publicar Item para hub.erpnext.com
@@ -20,15 +19,14 @@
 DocType: About Us Settings,Website,Site
 DocType: POS Profile,Applicable for User,Aplicável para o usuário
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +169,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Parou ordem de produção não pode ser cancelado, desentupir-lo primeiro para cancelar"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +23,Compaction plus sintering,Compactação mais sinterização
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,Currency is required for Price List {0},Moeda é necessário para Preço de {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Será calculado na transação.
 DocType: Purchase Order,Customer Contact,Contato do cliente
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +549,From Material Request,Van Materiaal Request
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +572,From Material Request,Van Materiaal Request
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} Árvore
 DocType: Job Applicant,Job Applicant,Candidato a emprego
 apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,Não há mais resultados.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +78,Legal,legal
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +34,Legal,legal
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +114,Actual type tax cannot be included in Item rate in row {0},Tipo de imposto real não pode ser incluído na tarifa do item na linha {0}
 DocType: C-Form,Customer,Cliente
 DocType: Purchase Receipt Item,Required By,Exigido por
@@ -43,7 +41,6 @@
 DocType: Manufacturing Settings,Default 10 mins,Padrão 10 minutos
 DocType: Leave Type,Leave Type Name,Deixe Nome Tipo
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +148,Series Updated Successfully,Série atualizado com sucesso
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +150,Stitching,Costura
 DocType: Pricing Rule,Apply On,aplicar Em
 DocType: Item Price,Multiple Item prices.,Meerdere Artikelprijzen .
 ,Purchase Order Items To Be Received,Comprar itens para ser recebido
@@ -51,8 +48,8 @@
 DocType: Quality Inspection Reading,Parameter,Parâmetro
 apps/erpnext/erpnext/projects/doctype/project/project.py +43,Expected End Date can not be less than Expected Start Date,Data prevista End não pode ser menor do que o esperado Data de Início
 apps/erpnext/erpnext/utilities/transaction_base.py +104,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Fila # {0}: Taxa deve ser o mesmo que {1}: {2} ({3} / {4})
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +189,New Leave Application,Aplicação deixar Nova
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +134,Bank Draft,cheque administrativo
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +204,New Leave Application,Aplicação deixar Nova
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +134,Bank Draft,cheque administrativo
 DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,1. Usar esta opção para manter o código do item a nível de clientes e para torná-los pesquisáveis ​​com base em seu código
 DocType: Mode of Payment Account,Mode of Payment Account,Modo de pagamento da conta
 apps/erpnext/erpnext/stock/doctype/item/item.js +34,Show Variants,Mostrar Variantes
@@ -64,25 +61,23 @@
 DocType: Production Plan Item,Production Plan Item,Item do plano de produção
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +141,User {0} is already assigned to Employee {1},Utilizador {0} já está atribuído a Empregado {1}
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +13,Make new POS Profile,Faça novo perfil POS
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +31,Health Care,Cuidados de Saúde
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,Cuidados de Saúde
 DocType: Purchase Invoice,Monthly,Mensal
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +66,Delay in payment (Days),Atraso no pagamento (Dias)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +494,Invoice,Fatura
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +519,Invoice,Fatura
 DocType: Maintenance Schedule Item,Periodicity,Periodicidade
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +357,Email Address,Endereço De Email
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +21,Defense,defesa
+apps/erpnext/erpnext/public/js/setup_wizard.js +107,Email Address,Endereço De Email
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,defesa
 DocType: Company,Abbr,Abrv
 DocType: Appraisal Goal,Score (0-5),Pontuação (0-5)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +193,Row {0}: {1} {2} does not match with {3},Row {0}: {1} {2} não corresponde com {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +67,Row # {0}:,Fila # {0}:
 DocType: Delivery Note,Vehicle No,No veículo
 apps/erpnext/erpnext/public/js/pos/pos.js +528,Please select Price List,"Por favor, selecione Lista de Preço"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +162,Woodworking,Carpintaria
 DocType: Production Order Operation,Work In Progress,Trabalho em andamento
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +153,3D printing,Impressão 3D
 DocType: Employee,Holiday List,Lista de Feriados
 DocType: Time Log,Time Log,Tempo Log
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +530,Accountant,Contabilista
+apps/erpnext/erpnext/public/js/setup_wizard.js +274,Accountant,Contabilista
 DocType: Cost Center,Stock User,Estoque de Usuário
 DocType: Company,Phone No,N º de telefone
 DocType: Time Log,"Log of Activities performed by users against Tasks that can be used for tracking time, billing.","Log de atividades realizadas por usuários contra as tarefas que podem ser usados ​​para controle de tempo, de faturamento."
@@ -98,18 +93,19 @@
 DocType: Bin,Quantity Requested for Purchase,Quantidade Solicitada para Compra
 DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name","Anexar arquivo .csv com duas colunas, uma para o nome antigo e um para o novo nome"
 DocType: Packed Item,Parent Detail docname,Docname Detalhe pai
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Kg,Kg.
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Kg,Kg.
 apps/erpnext/erpnext/config/hr.py +48,Opening for a Job.,A abertura para um trabalho.
 DocType: Item Attribute,Increment,Incremento
 apps/erpnext/erpnext/public/js/stock_analytics.js +63,Select Warehouse...,Selecione Warehouse ...
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +6,Advertising,publicidade
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,publicidade
+apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,Mesma empresa está inscrita mais de uma vez
 DocType: Employee,Married,Casado
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +389,Stock cannot be updated against Delivery Note {0},Banco não pode ser atualizado contra entrega Nota {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +391,Stock cannot be updated against Delivery Note {0},Banco não pode ser atualizado contra entrega Nota {0}
 DocType: Payment Reconciliation,Reconcile,conciliar
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +30,Grocery,Mercearia
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,Mercearia
 DocType: Quality Inspection Reading,Reading 1,Leitura 1
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Make Bank Entry,Faça Banco Entry
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +40,Pension Funds,Fundos de Pensão
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,Fundos de Pensão
 apps/erpnext/erpnext/accounts/doctype/account/account.py +142,Warehouse is mandatory if account type is Warehouse,Warehouse é obrigatória se o tipo de conta é Warehouse
 DocType: SMS Center,All Sales Person,Todos os vendedores
 DocType: Lead,Person Name,Nome Pessoa
@@ -131,7 +127,7 @@
 DocType: Quality Inspection,Get Specification Details,Obtenha detalhes de Especificação
 DocType: Lead,Interested,Interessado
 apps/erpnext/erpnext/config/manufacturing.py +14,Bill of Material,Lista de Materiais
-apps/erpnext/erpnext/public/js/stock_analytics.js +45,Opening,Abertura
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +158,Opening,Abertura
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},A partir de {0} a {1}
 DocType: Item,Copy From Item Group,Copiar do item do grupo
 DocType: Journal Entry,Opening Entry,Abertura Entry
@@ -145,23 +141,22 @@
 DocType: Employee Education,Under Graduate,Sob graduação
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +22,Target On,Target On
 DocType: BOM,Total Cost,Custo Total
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +99,Reaming,Mandrilagem
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +9,Activity Log:,Registro de Atividade:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +199,Item {0} does not exist in the system or has expired,Item {0} não existe no sistema ou expirou
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +44,Real Estate,imóveis
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +44,Real Estate,imóveis
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +4,Statement of Account,Extrato de conta
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +41,Pharmaceuticals,Pharmaceuticals
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,Pharmaceuticals
 DocType: Expense Claim Detail,Claim Amount,Quantidade reivindicação
 DocType: Employee,Mr,Sr.
 DocType: Custom Script,Client,Cliente
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,Leverancier Type / leverancier
 DocType: Naming Series,Prefix,Prefixo
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Consumable,Consumíveis
+apps/erpnext/erpnext/public/js/setup_wizard.js +359,Consumable,Consumíveis
 DocType: Upload Attendance,Import Log,Importar Log
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.js +19,Send,Enviar
 DocType: Sales Invoice Item,Delivered By Supplier,Proferido por Fornecedor
 DocType: SMS Center,All Contact,Todos os Contactos
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +164,Annual Salary,Salário Anual
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +164,Annual Salary,Salário Anual
 DocType: Period Closing Voucher,Closing Fiscal Year,Encerramento do exercício social
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +69,Stock Expenses,despesas Stock
 DocType: Newsletter,Email Sent?,E-mail enviado?
@@ -169,7 +164,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +92,Show Time Logs,Show Time Logs
 DocType: Journal Entry Account,Credit in Company Currency,Crédito em Moeda Empresa
 DocType: Delivery Note,Installation Status,Status da instalação
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +115,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Aceite + Qty Rejeitada deve ser igual a quantidade recebida por item {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +118,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Aceite + Qty Rejeitada deve ser igual a quantidade recebida por item {0}
 DocType: Item,Supply Raw Materials for Purchase,Abastecimento de Matérias-Primas para a Compra
 apps/erpnext/erpnext/stock/get_item_details.py +133,Item {0} must be a Purchase Item,Item {0} deve ser um item de compra
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
@@ -177,19 +172,17 @@
  Todas as datas e empregado combinação no período selecionado virá no modelo, com registros de freqüência existentes"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +446,Item {0} is not active or end of life has been reached,Item {0} não está ativo ou fim de vida útil foi atingido
 DocType: Time Log Batch,Will be updated after Sales Invoice is Submitted.,Será atualizado após a factura de venda é submetido.
-apps/erpnext/erpnext/controllers/accounts_controller.py +493,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Para incluir impostos na linha {0} na taxa de Item, os impostos em linhas {1} também deve ser incluída"
+apps/erpnext/erpnext/controllers/accounts_controller.py +494,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Para incluir impostos na linha {0} na taxa de Item, os impostos em linhas {1} também deve ser incluída"
 apps/erpnext/erpnext/config/hr.py +90,Settings for HR Module,Configurações para o Módulo HR
 DocType: SMS Center,SMS Center,SMS Center
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +78,Straightening,Endireitando
 DocType: BOM Replace Tool,New BOM,Novo BOM
 apps/erpnext/erpnext/config/projects.py +28,Batch Time Logs for billing.,Batch Logs Tempo para o faturamento.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +15,Countergravity casting,Fundição Countergravity
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +30,Newsletter has already been sent,Boletim informativo já foi enviado
 DocType: Lead,Request Type,Tipo de Solicitação
 DocType: Leave Application,Reason,Razão
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +14,Broadcasting,radiodifusão
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +140,Execution,execução
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +364,The first user will become the System Manager (you can change this later).,O primeiro usuário será o System Manager (você pode mudar isso mais tarde).
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,radiodifusão
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +140,Execution,execução
+apps/erpnext/erpnext/public/js/setup_wizard.js +114,The first user will become the System Manager (you can change this later).,O primeiro usuário será o System Manager (você pode mudar isso mais tarde).
 apps/erpnext/erpnext/config/manufacturing.py +39,Details of the operations carried out.,Os detalhes das operações realizadas.
 DocType: Serial No,Maintenance Status,Estado de manutenção
 apps/erpnext/erpnext/config/stock.py +263,Items and Pricing,Itens e Preços
@@ -206,7 +199,6 @@
 DocType: Pricing Rule,Discount on Price List Rate (%),Desconto no preço de lista Taxa (%)
 apps/frappe/frappe/public/js/frappe/form/print.js +96,Start,begin
 DocType: User,First Name,Nome
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +12,Full-mold casting,De fundição de molde completa
 DocType: Offer Letter,Select Terms and Conditions,Selecione os Termos e Condições
 DocType: Production Planning Tool,Sales Orders,Pedidos de Vendas
 DocType: Purchase Taxes and Charges,Valuation,Avaliação
@@ -218,8 +210,7 @@
 DocType: Bank Reconciliation,Bank Account,Conta bancária
 DocType: Leave Type,Allow Negative Balance,Permitir saldo negativo
 DocType: Selling Settings,Default Territory,Território padrão
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +53,Television,televisão
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +138,Gashing,Rasgando
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,televisão
 DocType: Production Order Operation,Updated via 'Time Log',Atualizado via 'Time Log'
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +82,Account {0} does not belong to Company {1},Conta {0} não pertence à empresa {1}
 DocType: Naming Series,Series List for this Transaction,Lista de séries para esta transação
@@ -234,14 +225,13 @@
 DocType: Leave Allocation,Add unused leaves from previous allocations,Acrescente as folhas não utilizadas de atribuições anteriores
 apps/erpnext/erpnext/controllers/recurring_document.py +206,Next Recurring {0} will be created on {1},Próximo Recorrente {0} será criado em {1}
 DocType: Newsletter List,Total Subscribers,Total de Assinantes
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +575,Contact Name,Nome de Contato
+,Contact Name,Nome de Contato
 DocType: Production Plan Item,SO Pending Qty,Está pendente de Qtde
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Cria folha de salário para os critérios acima mencionados.
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,Pedido de compra.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +107,Double housing,Caixa de duas
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +156,Only the selected Leave Approver can submit this Leave Application,Somente o Leave aprovador selecionado pode enviar este pedido de férias
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +171,Only the selected Leave Approver can submit this Leave Application,Somente o Leave aprovador selecionado pode enviar este pedido de férias
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,Aliviar A data deve ser maior que Data de Juntando
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +172,Leaves per Year,Folhas por ano
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +172,Leaves per Year,Folhas por ano
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup > Settings > Naming Series,"Por favor, defina Naming Series para {0} em Configurar&gt; Configurações&gt; Naming Series"
 DocType: Time Log,Will be updated when batched.,Será atualizado quando agrupadas.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +104,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,Row {0}: Verifique 'É Advance' contra Conta {1} se esta é uma entrada antecedência.
@@ -250,25 +240,24 @@
 DocType: Item Website Specification,Item Website Specification,Especificação Site item
 DocType: Dropbox Backup,Dropbox Access Key,Dropbox Chave de Acesso
 DocType: Payment Tool,Reference No,Número de referência
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +348,Leave Blocked,Deixe Bloqueados
-apps/erpnext/erpnext/stock/doctype/item/item.py +535,Item {0} has reached its end of life on {1},Item {0} chegou ao fim da vida em {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +392,Leave Blocked,Deixe Bloqueados
+apps/erpnext/erpnext/stock/doctype/item/item.py +539,Item {0} has reached its end of life on {1},Item {0} chegou ao fim da vida em {1}
 apps/erpnext/erpnext/accounts/utils.py +339,Annual,anual
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Da Reconciliação item
 DocType: Stock Entry,Sales Invoice No,Vendas factura n
 DocType: Material Request Item,Min Order Qty,Min Qty Ordem
 DocType: Lead,Do Not Contact,Neem geen contact op
 DocType: Sales Invoice,The unique id for tracking all recurring invoices. It is generated on submit.,A ID exclusiva para acompanhar todas as facturas recorrentes. Ele é gerado em enviar.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +93,Software Developer,Software Developer
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +93,Software Developer,Software Developer
 DocType: Item,Minimum Order Qty,Qtde mínima
 DocType: Pricing Rule,Supplier Type,Tipo de fornecedor
 DocType: Item,Publish in Hub,Publicar em Hub
 ,Terretory,terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +555,Item {0} is cancelled,Item {0} é cancelada
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +598,Material Request,Pedido de material
+apps/erpnext/erpnext/stock/doctype/item/item.py +559,Item {0} is cancelled,Item {0} é cancelada
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +607,Material Request,Pedido de material
 DocType: Bank Reconciliation,Update Clearance Date,Atualize Data Liquidação
 DocType: Item,Purchase Details,Detalhes de compra
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +323,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},Item {0} não encontrado em &#39;matérias-primas fornecidas &quot;na tabela Ordem de Compra {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +129,Wire brushing,Escova de aço
 DocType: Employee,Relation,Relação
 DocType: Shipping Rule,Worldwide Shipping,Envio para todo o planeta
 apps/erpnext/erpnext/config/selling.py +23,Confirmed orders from Customers.,Confirmado encomendas de clientes.
@@ -284,12 +273,11 @@
 DocType: Supplier,Address HTML,Endereço HTML
 DocType: Lead,Mobile No.,Mobile No.
 DocType: Maintenance Schedule,Generate Schedule,Gerar Agende
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +81,Hubbing,Hubbing
 DocType: Purchase Invoice Item,Expense Head,Chefe despesa
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +86,Please select Charge Type first,Selecteer Charge Type eerste
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,Último
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +395,Max 5 characters,Max 5 caracteres
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +195,Select Your Language,Selecione seu idioma
+apps/erpnext/erpnext/public/js/setup_wizard.js +143,Max 5 characters,Max 5 caracteres
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +245,Select Your Language,Selecione seu idioma
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,O primeiro Deixe Approver na lista vai ser definido como o Leave Approver padrão
 DocType: Manufacturing Settings,"Disables creation of time logs against Production Orders.
 Operations shall not be tracked against Production Order",Desabilita a criação de logs de tempo contra ordens de produção. As operações não devem ser rastreados contra a ordem de produção
@@ -301,8 +289,6 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +34,Item {0} must be Service Item,Item {0} deve ser item de serviço
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +303,Completed Qty can not be greater than 'Qty to Manufacture',"Concluído Qtde não pode ser maior do que ""Qtde de Fabricação"""
 DocType: DocType,Administrator,Administrador
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +136,Laser drilling,Perfuração laser
-DocType: Stock UOM Replace Utility,New Stock UOM,Nova da UOM
 DocType: Period Closing Voucher,Closing Account Head,Fechando Chefe Conta
 DocType: Employee,External Work History,Histórico Profissional no Exterior
 apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,Erro de referência circular
@@ -311,18 +297,15 @@
 DocType: Lead,Industry,Indústria
 DocType: Employee,Job Profile,Perfil
 DocType: Newsletter,Newsletter,Boletim informativo
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +84,Hydroforming,Hydroforming
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +49,Necking,Carícias
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Notificar por e-mail sobre a criação de Pedido de material automático
 DocType: Journal Entry,Multi Currency,Multi Moeda
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +51,Item is updated,Item é atualizado
 DocType: Async Task,System Manager,System Manager
 DocType: Payment Reconciliation Invoice,Invoice Type,Tipo de Fatura
 DocType: Sales Invoice Item,Delivery Note,Guia de remessa
 DocType: Dropbox Backup,Allow Dropbox Access,Permitir Dropbox Acesso
 apps/erpnext/erpnext/config/learn.py +72,Setting up Taxes,Configurando Impostos
 apps/erpnext/erpnext/accounts/utils.py +189,Payment Entry has been modified after you pulled it. Please pull it again.,"Entrada de pagamento foi modificado depois que você puxou-o. Por favor, puxe-o novamente."
-apps/erpnext/erpnext/stock/doctype/item/item.py +343,{0} entered twice in Item Tax,{0} entrou duas vezes no item Imposto
+apps/erpnext/erpnext/stock/doctype/item/item.py +347,{0} entered twice in Item Tax,{0} entrou duas vezes no item Imposto
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +105,Summary for this week and pending activities,Resumo para esta semana e atividades pendentes
 DocType: Workstation,Rent Cost,Kosten huur
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +74,Please select month and year,Selecione mês e ano
@@ -339,24 +322,22 @@
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,Taxa em que moeda do cliente é convertido para a moeda base de cliente
 DocType: Features Setup,"Available in BOM, Delivery Note, Purchase Invoice, Production Order, Purchase Order, Purchase Receipt, Sales Invoice, Sales Order, Stock Entry, Timesheet","Disponível em BOM, nota de entrega , factura de compra , ordem de produção , ordem de compra , Recibo de compra , nota fiscal de venda , ordem de venda , Stock entrada , quadro de horários"
 DocType: Item Tax,Tax Rate,Taxa de Imposto
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Select Item,Selecionar item
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +540,Select Item,Selecionar item
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +143,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","Item: {0} gerido por lotes, não pode ser conciliada com \
  da Reconciliação, em vez usar da Entry"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +259,Purchase Invoice {0} is already submitted,Compra Invoice {0} já é submetido
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +262,Purchase Invoice {0} is already submitted,Compra Invoice {0} já é submetido
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Batch No must be same as {1} {2},Fila # {0}: Lote n deve ser o mesmo que {1} {2}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Convert to non-Group,Converter para não-Grupo
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +55,Purchase Receipt must be submitted,Recibo de compra devem ser apresentados
-DocType: Stock UOM Replace Utility,Current Stock UOM,UOM Stock atual
 apps/erpnext/erpnext/config/stock.py +53,Batch (lot) of an Item.,Batch (lote) de um item.
 DocType: C-Form Invoice Detail,Invoice Date,Data da fatura
 DocType: GL Entry,Debit Amount,Débito Montante
 apps/erpnext/erpnext/accounts/party.py +223,There can only be 1 Account per Company in {0} {1},Pode haver apenas uma conta por empresa em {0} {1}
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Your email address,Seu endereço de email
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +194,Please see attachment,"Por favor, veja anexo"
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +203,Please see attachment,"Por favor, veja anexo"
 DocType: Purchase Order,% Received,% Recebido
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +109,Water jet cutting,Corte do jato de água
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +24,Setup Already Complete!!,Setup al voltooid !
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +20,Setup Already Complete!!,Setup al voltooid !
 ,Finished Goods,afgewerkte producten
 DocType: Delivery Note,Instructions,Instruções
 DocType: Quality Inspection,Inspected By,Inspecionado por
@@ -371,6 +352,7 @@
 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.,"Por favor, não criar contas para clientes e fornecedores. Eles são criados diretamente do cliente / fornecedor mestres."
 DocType: Currency Exchange,Currency Exchange,Câmbio
 DocType: Purchase Invoice Item,Item Name,Nome do item
+DocType: Authorization Rule,Approving User  (above authorized value),Aprovando Usuário (acima do valor autorizado)
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Credit Balance,Saldo credor
 DocType: Employee,Widowed,Viúva
 DocType: Production Planning Tool,"Items to be requested which are ""Out of Stock"" considering all warehouses based on projected qty and minimum order qty","Os itens a serem solicitados que estão &quot;fora de estoque&quot;, considerando todos os armazéns com base no qty projetada e qty mínimo"
@@ -380,11 +362,10 @@
 ,Purchase Register,Compra Registre
 DocType: Landed Cost Item,Applicable Charges,Encargos aplicáveis
 DocType: Workstation,Consumable Cost,verbruiksartikelen Cost
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,{0} ({1}) must have role 'Leave Approver',{0} ({1}) deve ter regra 'Aprovar ausência'
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +167,{0} ({1}) must have role 'Leave Approver',{0} ({1}) deve ter regra 'Aprovar ausência'
 DocType: Purchase Receipt,Vehicle Date,Veículo Data
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +39,Medical,médico
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +39,Medical,médico
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,Reden voor het verliezen
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +36,Tube beading,Tubo beading
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},"Workstation é fechado nas seguintes datas, conforme lista do feriado: {0}"
 DocType: Employee,Single,Único
 DocType: Issue,Attachment,Acessório
@@ -405,10 +386,8 @@
 DocType: Account,Is Group,É o grupo
 DocType: Stock Settings,Automatically Set Serial Nos based on FIFO,Serial N ° s automaticamente definido com base na FIFO
 DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,Verificar Fornecedor Nota Fiscal Número Unicidade
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +31,Thermoforming,Termoformagem
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +66,Slitting,Cortando
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +57,'To Case No.' cannot be less than 'From Case No.',"""Para o número de Processo' não pode ser inferior a 'De número de Processo'"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +104,Non Profit,sem Fins Lucrativos
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +104,Non Profit,sem Fins Lucrativos
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_list.js +7,Not Started,Não Iniciado
 DocType: Lead,Channel Partner,Parceiro de Canal
 DocType: Account,Old Parent,Pai Velho
@@ -417,13 +396,12 @@
 apps/erpnext/erpnext/config/manufacturing.py +74,Global settings for all manufacturing processes.,As configurações globais para todos os processos de fabricação.
 DocType: Accounts Settings,Accounts Frozen Upto,Contas congeladas Upto
 DocType: SMS Log,Sent On,Enviado em
-apps/erpnext/erpnext/stock/doctype/item/item.py +512,Attribute {0} selected multiple times in Attributes Table,Atributo {0} selecionada várias vezes na tabela de atributos
+apps/erpnext/erpnext/stock/doctype/item/item.py +516,Attribute {0} selected multiple times in Attributes Table,Atributo {0} selecionada várias vezes na tabela de atributos
 DocType: Sales Order,Not Applicable,Não Aplicável
 apps/erpnext/erpnext/config/hr.py +140,Holiday master.,Férias Principais.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +19,Shell molding,Moldagem Shell
 DocType: Material Request Item,Required Date,Data Obrigatória
 DocType: Delivery Note,Billing Address,Endereço de Cobrança
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +644,Please enter Item Code.,Vul Item Code .
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +648,Please enter Item Code.,Vul Item Code .
 DocType: BOM,Costing,Custeio
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount","Se selecionado, o valor do imposto será considerado como já incluído na tarifa Impressão / Quantidade de impressão"
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,Qtde
@@ -433,7 +411,7 @@
 DocType: Item Attribute,To Range,Para Gama
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Títulos e depósitos
 DocType: Features Setup,Imports,Importações
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +144,Adhesive bonding,Ligação adesiva
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +77,Total leaves allocated is mandatory,Total de folhas alocados é obrigatória
 DocType: Job Opening,Description of a Job Opening,Descrição de uma vaga de emprego
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +102,Pending activities for today,Atividades pendentes para hoje
 apps/erpnext/erpnext/config/hr.py +28,Attendance record.,Recorde de público.
@@ -441,26 +419,25 @@
 DocType: Sales Order Item,Used for Production Plan,Usado para o Plano de Produção
 DocType: System Settings,Loading...,Loading ...
 DocType: DocField,Password,Palavra Passe
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +155,Fused deposition modeling,Modelagem deposição fundida
 DocType: Manufacturing Settings,Time Between Operations (in mins),Time Between Operações (em minutos)
 DocType: Customer,Buyer of Goods and Services.,Comprador de Produtos e Serviços.
 DocType: Journal Entry,Accounts Payable,Contas a Pagar
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +24,Add Subscribers,Adicionar Inscritos
 apps/erpnext/erpnext/public/js/feature_setup.js +220,""" does not exists","""Não existe"""
 DocType: Pricing Rule,Valid Upto,Válido Upto
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +564,List a few of your customers. They could be organizations or individuals.,Lijst een paar van uw klanten. Ze kunnen organisaties of personen .
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,List a few of your customers. They could be organizations or individuals.,Lijst een paar van uw klanten. Ze kunnen organisaties of personen .
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Direct Income,Resultado direto
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +33,"Can not filter based on Account, if grouped by Account",Kan niet filteren op basis van account als gegroepeerd per account
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +88,Administrative Officer,Diretor Administrativo
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Administrative Officer,Diretor Administrativo
 DocType: Payment Tool,Received Or Paid,Recebidos ou pagos
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +318,Please select Company,"Por favor, selecione Empresa"
 DocType: Stock Entry,Difference Account,verschil Account
 apps/erpnext/erpnext/projects/doctype/task/task.py +44,Cannot close task as its dependant task {0} is not closed.,Não pode fechar tarefa como sua tarefa dependente {0} não está fechado.
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +305,Please enter Warehouse for which Material Request will be raised,Vul Warehouse waarvoor Materiaal Request zal worden verhoogd
 DocType: Production Order,Additional Operating Cost,Custo Operacional adicionais
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +20,Cosmetics,Cosméticos
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,Cosméticos
 DocType: DocField,Type,Tipo
-apps/erpnext/erpnext/stock/doctype/item/item.py +417,"To merge, following properties must be same for both items","Te fuseren , moeten volgende eigenschappen hetzelfde zijn voor beide posten"
+apps/erpnext/erpnext/stock/doctype/item/item.py +421,"To merge, following properties must be same for both items","Te fuseren , moeten volgende eigenschappen hetzelfde zijn voor beide posten"
 DocType: Communication,Subject,Assunto
 DocType: Shipping Rule,Net Weight,Peso Líquido
 DocType: Employee,Emergency Phone,Emergency Phone
@@ -470,7 +447,6 @@
 DocType: Journal Entry,Difference (Dr - Cr),Diferença ( Dr - Cr)
 DocType: Account,Profit and Loss,Lucros e perdas
 apps/erpnext/erpnext/config/stock.py +293,Managing Subcontracting,Gerenciando Subcontratação
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +58,New UOM must NOT be of type Whole Number,Nova UOM NÃO deve ser do tipo inteiro Número
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Furniture and Fixture,Móveis e utensílios
 DocType: Quotation,Rate at which Price list currency is converted to company's base currency,Taxa em que moeda lista de preços é convertido para a moeda da empresa de base
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Account {0} does not belong to company: {1},Conta {0} não pertence à empresa: {1}
@@ -490,14 +466,14 @@
 DocType: Purchase Invoice,Supplier Invoice No,Fornecedor factura n
 DocType: Territory,For reference,Para referência
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +154,"Cannot delete Serial No {0}, as it is used in stock transactions","Não é possível excluir Serial No {0}, como ele é usado em transações de ações"
-apps/erpnext/erpnext/public/js/account_tree_grid.js +52,Closing (Cr),Fechamento (Cr)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +227,Closing (Cr),Fechamento (Cr)
 DocType: Serial No,Warranty Period (Days),Período de Garantia (Dias)
 DocType: Installation Note Item,Installation Note Item,Item Nota de Instalação
 ,Pending Qty,Pendente Qtde
 DocType: Job Applicant,Thread HTML,Tópico HTML
 DocType: Company,Ignore,Ignorar
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +86,SMS sent to following numbers: {0},SMS enviado a seguintes números: {0}
-apps/erpnext/erpnext/controllers/buying_controller.py +135,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Fornecedor Armazém obrigatório para sub- contratados Recibo de compra
+apps/erpnext/erpnext/controllers/buying_controller.py +126,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Fornecedor Armazém obrigatório para sub- contratados Recibo de compra
 DocType: Pricing Rule,Valid From,Válido de
 DocType: Sales Invoice,Total Commission,Total Comissão
 DocType: Pricing Rule,Sales Partner,Parceiro de vendas
@@ -507,7 +483,7 @@
 To distribute a budget using this distribution, set this **Monthly Distribution** in the **Cost Center**","**Distribuição Mensal** ajuda a distribuir o seu orçamento durante meses, se você tem a sazonalidade em seu negócio.
 
  Para distribuir um orçamento usando esta distribuição, introduzir o campo **Distribuição Mensal** no **Centro de Custo **"
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +183,No records found in the Invoice table,Nenhum registro encontrado na tabela de fatura
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +130,No records found in the Invoice table,Nenhum registro encontrado na tabela de fatura
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +20,Please select Company and Party Type first,"Por favor, selecione Companhia e Festa Tipo primeiro"
 apps/erpnext/erpnext/config/accounts.py +84,Financial / accounting year.,Exercício / contabilidade.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","Sorry , kan de serienummers niet worden samengevoegd"
@@ -523,25 +499,25 @@
 DocType: Sales Order,Billing and Delivery Status,Faturamento e Entrega Estado
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Repita os clientes
 DocType: Leave Control Panel,Allocate,Atribuír
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +16,Previous,anterior
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard_page.html +16,Previous,anterior
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +620,Sales Return,Vendas Retorno
 DocType: Production Planning Tool,Select Sales Orders from which you want to create Production Orders.,Selecione Ordens de venda a partir do qual você deseja criar ordens de produção.
 DocType: Item,Delivered by Supplier (Drop Ship),Entregue por Fornecedor (Drop Ship)
 apps/erpnext/erpnext/config/hr.py +120,Salary components.,Componentes salariais.
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,Banco de dados de clientes potenciais.
+DocType: Authorization Rule,Customer or Item,Cliente ou Item
 apps/erpnext/erpnext/config/crm.py +17,Customer database.,Banco de dados do cliente.
 DocType: Quotation,Quotation To,Para citação
 DocType: Lead,Middle Income,Rendimento Médio
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),Abertura (Cr)
 apps/erpnext/erpnext/accounts/utils.py +193,Allocated amount can not be negative,Montante atribuído não pode ser negativo
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +123,Tumbling,Tombo
 DocType: Purchase Order Item,Billed Amt,Faturado Amt
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,Um armazém lógico contra o qual as entradas em existências são feitas.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +92,Reference No & Reference Date is required for {0},Número de referência e Referência Data é necessário para {0}
 DocType: Event,Wednesday,Quarta-feira
 DocType: Sales Invoice,Customer's Vendor,Vendedor cliente
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +214,Production Order is Mandatory,Ordem de produção é obrigatória
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +139,Proposal Writing,Proposta Redação
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,Proposal Writing,Proposta Redação
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,Outro Vendas Pessoa {0} existe com o mesmo ID de Employee
 apps/erpnext/erpnext/stock/stock_ledger.py +336,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},Negativo Banco de Erro ( {6} ) para item {0} no Armazém {1} em {2} {3} em {4} {5}
 DocType: Fiscal Year Company,Fiscal Year Company,Ano Fiscal Empresa
@@ -564,7 +540,7 @@
 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.","Então Preços Regras são filtradas com base no Cliente, Grupo de Clientes, Território, fornecedor, fornecedor Tipo, Campanha, Parceiro de vendas etc"
 apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.py +179,Please install dropbox python module,"Por favor, instale o Dropbox módulo python"
 DocType: Employee,Passport Number,Número do Passaporte
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +82,Manager,gerente
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Manager,gerente
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +494,From Purchase Receipt,De Recibo de compra
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +219,Same item has been entered multiple times.,O mesmo artigo foi introduzido várias vezes.
 DocType: SMS Settings,Receiver Parameter,Parâmetro receptor
@@ -572,10 +548,9 @@
 DocType: Sales Person,Sales Person Targets,Metas de vendas Pessoa
 apps/frappe/frappe/public/js/frappe/form/workflow.js +116,To,para
 apps/frappe/frappe/templates/base.html +145,Please enter email address,Por favor insira o endereço de email
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +35,End tube forming,Extremidade de tubo formando
 DocType: Production Order Operation,In minutes,Em questão de minutos
 DocType: Issue,Resolution Date,Data resolução
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +635,Please set default Cash or Bank account in Mode of Payment {0},Defina Caixa padrão ou conta bancária no Modo de pagamento {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +637,Please set default Cash or Bank account in Mode of Payment {0},Defina Caixa padrão ou conta bancária no Modo de pagamento {0}
 DocType: Selling Settings,Customer Naming By,Cliente de nomeação
 apps/erpnext/erpnext/accounts/doctype/account/account.js +67,Convert to Group,Converteren naar Groep
 DocType: Activity Cost,Activity Type,Tipo de Atividade
@@ -583,12 +558,12 @@
 DocType: Customer,Fixed Days,Dias Fixos
 DocType: Sales Invoice,Packing List,Lista de embalagem
 apps/erpnext/erpnext/config/buying.py +28,Purchase Orders given to Suppliers.,As ordens de compra dadas a fornecedores.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +43,Publishing,Publishing
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +43,Publishing,Publishing
 DocType: Activity Cost,Projects User,Projetos de Usuário
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Consumed,Consumido
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +198,{0}: {1} not found in Invoice Details table,{0}: {1} não foi encontrado na tabela detalhes da fatura.
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,{0}: {1} not found in Invoice Details table,{0}: {1} não foi encontrado na tabela detalhes da fatura.
 DocType: Company,Round Off Cost Center,Termine Centro de Custo
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +208,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Manutenção Visita {0} deve ser cancelado antes de cancelar esta ordem de venda
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +203,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Manutenção Visita {0} deve ser cancelado antes de cancelar esta ordem de venda
 DocType: Material Request,Material Transfer,Transferência de Material
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +56,Opening (Dr),Abertura (Dr)
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},Postando timestamp deve ser posterior a {0}
@@ -600,7 +575,6 @@
 DocType: Pricing Rule,Sales Manager,Gerente De Vendas
 apps/frappe/frappe/public/js/frappe/model/model.js +492,Rename,andere naam geven
 DocType: Journal Entry,Write Off Amount,Escreva Off Quantidade
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +52,Bending,Dobrando
 apps/frappe/frappe/core/page/user_permissions/user_permissions.js +246,Allow User,Permitir utilizador
 DocType: Journal Entry,Bill No,Projeto de Lei n
 DocType: Purchase Invoice,Quarterly,Trimestral
@@ -610,17 +584,16 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Please enter item details,Por favor insira os detalhes do item
 DocType: Purchase Receipt,Other Details,Outros detalhes
 DocType: Account,Accounts,Contas
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +67,Marketing,marketing
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +65,Straight shearing,Em linha reta de corte
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +67,Marketing,marketing
 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.,Para acompanhar o item em documentos de vendas e de compras com base em seus números de ordem. Este é também pode ser usada para rastrear detalhes sobre a garantia do produto.
 DocType: Purchase Receipt Item Supplied,Current Stock,Stock atual
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +99,Rejected Warehouse is mandatory against regected item,Verworpen Warehouse is verplicht tegen regected post
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +102,Rejected Warehouse is mandatory against regected item,Verworpen Warehouse is verplicht tegen regected post
 DocType: Account,Expenses Included In Valuation,Despesas incluídos na avaliação
 DocType: Employee,Provide email id registered in company,Fornecer ID e-mail registrado na empresa
 DocType: Hub Settings,Seller City,Vendedor Cidade
 DocType: Email Digest,Next email will be sent on:,Próximo e-mail será enviado em:
 DocType: Offer Letter Term,Offer Letter Term,Oferecer Carta Term
-apps/erpnext/erpnext/stock/doctype/item/item.py +492,Item has variants.,Item tem variantes.
+apps/erpnext/erpnext/stock/doctype/item/item.py +496,Item has variants.,Item tem variantes.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Item {0} não foi encontrado
 DocType: Bin,Stock Value,Valor da
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,boom Type
@@ -629,10 +602,9 @@
 DocType: Material Request Item,Quantity and Warehouse,Quantidade e Armazém
 DocType: Sales Invoice,Commission Rate (%),Comissão Taxa (%)
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +172,"Against Voucher Type must be one of Sales Order, Sales Invoice or Journal Entry","Contra Comprovante Tipo deve ser um dos Ordem de Vendas, Fatura ou Diário"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +139,Biomachining,Biomachining
 apps/erpnext/erpnext/setup/utils.py +89,Unable to find exchange rate,Incapaz de encontrar taxa de câmbio
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +7,Aerospace,aeroespaço
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +19,Welcome,bem-vindo
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +7,Aerospace,aeroespaço
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +40,Welcome,bem-vindo
 DocType: Journal Entry,Credit Card Entry,Entrada de cartão de crédito
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +18,Task Subject,Tarefa Assunto
 apps/erpnext/erpnext/config/stock.py +33,Goods received from Suppliers.,Mercadorias recebidas de fornecedores.
@@ -655,19 +627,19 @@
 DocType: Employee,Cell Number,Número de células
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Perdido
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +120,You can not enter current voucher in 'Against Journal Entry' column,Você não pode entrar comprovante atual em 'Against Journal Entry' coluna
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +25,Energy,energia
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,energia
 DocType: Opportunity,Opportunity From,Oportunidade De
 apps/erpnext/erpnext/config/hr.py +33,Monthly salary statement.,Declaração salário mensal.
 DocType: Item Group,Website Specifications,Especificações do site
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +205,New Account,Nova Conta
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +21,{0}: From {0} of type {1},{0}: A partir de {0} do tipo {1}
-apps/erpnext/erpnext/controllers/buying_controller.py +283,Row {0}: Conversion Factor is mandatory,Row {0}: Fator de Conversão é obrigatório
+apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,Row {0}: Fator de Conversão é obrigatório
 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.,Lançamentos contábeis podem ser feitas contra nós folha. Entradas contra grupos não são permitidos.
 DocType: ToDo,High,Alto
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +361,Cannot deactivate or cancel BOM as it is linked with other BOMs,Não é possível desativar ou cancelar BOM vez que está associada com outras BOMs
 DocType: Opportunity,Maintenance,Manutenção
 DocType: User,Male,Masculino
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +182,Purchase Receipt number required for Item {0},Número Recibo de compra necessário para item {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +183,Purchase Receipt number required for Item {0},Número Recibo de compra necessário para item {0}
 DocType: Item Attribute Value,Item Attribute Value,Item Atributo Valor
 apps/erpnext/erpnext/config/crm.py +64,Sales campaigns.,Campanhas de vendas .
 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.
@@ -715,10 +687,9 @@
 DocType: Address,Personal,Pessoal
 DocType: Expense Claim Detail,Expense Claim Type,Tipo de reembolso de despesas
 DocType: Shopping Cart Settings,Default settings for Shopping Cart,As configurações padrão para Carrinho de Compras
-apps/erpnext/erpnext/controllers/accounts_controller.py +324,"Journal Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Diário de entrada {0} está ligado contra a Ordem {1}, verificar se ele deve ser puxado como avanço nessa fatura."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +13,Biotechnology,biotecnologia
+apps/erpnext/erpnext/controllers/accounts_controller.py +325,"Journal Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Diário de entrada {0} está ligado contra a Ordem {1}, verificar se ele deve ser puxado como avanço nessa fatura."
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +13,Biotechnology,biotecnologia
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Office Maintenance Expenses,Despesas de manutenção de escritório
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +53,Hemming,Hemming
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +66,Please enter Item first,Gelieve eerst in Item
 DocType: Account,Liability,responsabilidade
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +62,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Montante Sanctioned não pode ser maior do que na Reivindicação Montante Fila {0}.
@@ -731,10 +702,10 @@
 DocType: Company,Default Bank Account,Conta Bancária Padrão
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +47,"To filter based on Party, select Party Type first","Para filtrar baseado em Festa, selecione Partido Escreva primeiro"
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},&quot;Atualização da &#39;não pode ser verificado porque os itens não são entregues via {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Nos,Nos
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Nos,Nos
 DocType: Item,Items with higher weightage will be shown higher,Os itens com maior weightage será mostrado maior
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Banco Detalhe Reconciliação
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +627,My Invoices,Minhas Faturas
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +629,My Invoices,Minhas Faturas
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,Nenhum funcionário encontrado
 DocType: Purchase Order,Stopped,Parado
 DocType: Item,If subcontracted to a vendor,Se subcontratada a um fornecedor
@@ -753,35 +724,33 @@
 DocType: Features Setup,"To enable ""Point of Sale"" features",Para ativar &quot;Point of Sale&quot; recursos
 DocType: Bin,Moving Average Rate,Movendo Taxa Média
 DocType: Production Planning Tool,Select Items,Selecione itens
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,{0} against Bill {1} dated {2},{0} contra conta {1} ​​com a data de {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +328,{0} against Bill {1} dated {2},{0} contra conta {1} ​​com a data de {2}
 DocType: Comment,Reference Name,Nome de referência
 DocType: Maintenance Visit,Completion Status,Status de conclusão
 DocType: Sales Invoice Item,Target Warehouse,Armazém alvo
 DocType: Item,Allow over delivery or receipt upto this percent,Permitir sobre a entrega ou recebimento até esta cento
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +49,Expected Delivery Date cannot be before Sales Order Date,Previsão de Entrega A data não pode ser antes de Ordem de Vendas Data
 DocType: Upload Attendance,Import Attendance,Importação de Atendimento
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +17,All Item Groups,Todos os grupos de itens
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +17,All Item Groups,Todos os grupos de itens
 DocType: Process Payroll,Activity Log,Registro de Atividade
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +30,Net Profit / Loss,Lucro / Prejuízo Líquido
 apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,Compor automaticamente mensagem na apresentação de transações.
 DocType: Production Order,Item To Manufacture,Item Para Fabricação
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +16,Permanent mold casting,Fundição com Molde Permanente
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} estatuto é {2}
 apps/erpnext/erpnext/config/learn.py +172,Purchase Order to Payment,Ordem de Compra para pagamento
 DocType: Sales Order Item,Projected Qty,Qtde Projetada
 DocType: Sales Invoice,Payment Due Date,Betaling Due Date
 DocType: Newsletter,Newsletter Manager,Boletim Gerente
-apps/erpnext/erpnext/stock/doctype/item/item.js +229,Item Variant {0} already exists with same attributes,Variant item {0} já existe com mesmos atributos
+apps/erpnext/erpnext/stock/doctype/item/item.js +231,Item Variant {0} already exists with same attributes,Variant item {0} já existe com mesmos atributos
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening','Abertura'
 DocType: Notification Control,Delivery Note Message,Mensagem Nota de Entrega
 DocType: Expense Claim,Expenses,Despesas
 DocType: Item Variant Attribute,Item Variant Attribute,Variant item Atributo
 ,Purchase Receipt Trends,Compra Trends Recibo
 DocType: Appraisal,Select template from which you want to get the Goals,Selecione o modelo a partir do qual você deseja obter as Metas
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +77,Research & Development,Pesquisa e Desenvolvimento
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Research & Development,Pesquisa e Desenvolvimento
 ,Amount to Bill,Neerkomen op Bill
 DocType: Company,Registration Details,Detalhes registro
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +75,Staking,Estacando
 DocType: Item,Re-Order Qty,Re-order Qtde
 DocType: Leave Block List Date,Leave Block List Date,Deixe Data Lista de Bloqueios
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +25,Scheduled to send to {0},Programado para enviar para {0}
@@ -792,18 +761,16 @@
 DocType: Sales Invoice Item,Stock Details,Detalhes da
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Valor do projeto
 apps/erpnext/erpnext/config/selling.py +304,Point-of-Sale,Ponto de venda
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,Cannot carry forward {0},Não é possível levar adiante {0}
 apps/erpnext/erpnext/accounts/doctype/account/account.py +91,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","Saldo já em crédito, você não tem permissão para definir 'saldo deve ser' como 'débito'"
 DocType: Account,Balance must be,Equilíbrio deve ser
 DocType: Hub Settings,Publish Pricing,Publicar Pricing
 DocType: Notification Control,Expense Claim Rejected Message,Relatório de Despesas Rejeitado Mensagem
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +145,Nailing,Pregando
 ,Available Qty,Qtde Disponível
 DocType: Purchase Taxes and Charges,On Previous Row Total,No total linha anterior
 DocType: Salary Slip,Working Days,Dias de trabalho
 DocType: Serial No,Incoming Rate,Taxa de entrada
 DocType: Packing Slip,Gross Weight,Peso bruto
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +410,The name of your company for which you are setting up this system.,De naam van uw bedrijf waar u het opzetten van dit systeem .
+apps/erpnext/erpnext/public/js/setup_wizard.js +158,The name of your company for which you are setting up this system.,De naam van uw bedrijf waar u het opzetten van dit systeem .
 DocType: HR Settings,Include holidays in Total no. of Working Days,Incluir feriados em nenhuma total. de dias de trabalho
 DocType: Job Applicant,Hold,Segurar
 DocType: Employee,Date of Joining,Data da Unir
@@ -813,7 +780,6 @@
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +3,View Subscribers,Exibir Inscritos
 DocType: Purchase Invoice Item,Purchase Receipt,Compra recibo
 ,Received Items To Be Billed,Itens recebidos a ser cobrado
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +114,Abrasive blasting,Jateamento abrasivo
 DocType: Employee,Ms,Ms
 apps/erpnext/erpnext/config/accounts.py +148,Currency exchange rate master.,Mestre taxa de câmbio .
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +253,Unable to find Time Slot in the next {0} days for Operation {1},Incapaz de encontrar entalhe Tempo nos próximos {0} dias para a Operação {1}
@@ -825,7 +791,7 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +209,Serial No {0} does not belong to Item {1},Serial Não {0} não pertence ao item {1}
 DocType: Purchase Receipt Item Supplied,Required Qty,Quantidade requerida
 DocType: Bank Reconciliation,Total Amount,Valor Total
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +32,Internet Publishing,Publishing Internet
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,Publishing Internet
 DocType: Production Planning Tool,Production Orders,Ordens de Produção
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +35,Balance Value,Balance Waarde
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,Lista de Preço de Venda
@@ -836,7 +802,7 @@
 DocType: Supplier,Default Payable Accounts,Contas a Pagar Padrão
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,Empregado {0} não está ativo ou não existe
 DocType: Features Setup,Item Barcode,Código de barras do item
-apps/erpnext/erpnext/stock/doctype/item/item.py +487,Item Variants {0} updated,Variantes item {0} atualizado
+apps/erpnext/erpnext/stock/doctype/item/item.py +491,Item Variants {0} updated,Variantes item {0} atualizado
 DocType: Quality Inspection Reading,Reading 6,Leitura 6
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Compra Antecipada Fatura
 DocType: Address,Shop,Loja
@@ -845,7 +811,7 @@
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,Conta padrão Banco / Cash será atualizado automaticamente na fatura POS quando este modo for selecionado.
 DocType: Employee,Permanent Address Is,Vast adres
 DocType: Production Order Operation,Operation completed for how many finished goods?,Operação concluída por quantos produtos acabados?
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +491,The Brand,A Marca
+apps/erpnext/erpnext/public/js/setup_wizard.js +237,The Brand,A Marca
 apps/erpnext/erpnext/controllers/status_updater.py +163,Allowance for over-{0} crossed for Item {1}.,Provisão para over-{0} cruzou para item {1}.
 DocType: Employee,Exit Interview Details,Sair Detalhes Entrevista
 DocType: Item,Is Purchase Item,É item de compra
@@ -865,16 +831,16 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Indirect Income,Resultado indirecto
 DocType: Payment Tool,Set Payment Amount = Outstanding Amount,Definir Valor do Pagamento = Valor Excepcional
 DocType: Contact Us Settings,Address Line 1,Endereço Linha 1
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Variance,Variação
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +392,Company Name,Nome da empresa
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +53,Variance,Variação
+,Company Name,Nome da empresa
 DocType: SMS Center,Total Message(s),Mensagem total ( s )
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +515,Select Item for Transfer,Selecionar item para Transferência
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +538,Select Item for Transfer,Selecionar item para Transferência
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,Veja uma lista de todos os vídeos de ajuda
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,Selecione cabeça conta do banco onde cheque foi depositado.
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,Permitir ao utilizador editar Taxa de Lista de Preços em transações
 DocType: Pricing Rule,Max Qty,Max Qtde
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +106,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Row {0}: O pagamento contra Vendas / Ordem de Compra deve ser sempre marcado como antecedência
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +16,Chemical,químico
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,químico
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +693,All items have already been transferred for this Production Order.,Todos os itens já foram transferidos para esta ordem de produção.
 DocType: Process Payroll,Select Payroll Year and Month,Selecione Payroll ano e mês
 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""",Vá para o grupo apropriado (geralmente Aplicação de Fundos&gt; Ativo Circulante&gt; Contas Bancárias e criar uma nova conta (clicando em Adicionar filho) do tipo &quot;Banco&quot;
@@ -885,12 +851,12 @@
 DocType: Item,Inspection Criteria,Critérios de inspeção
 apps/erpnext/erpnext/config/accounts.py +101,Tree of finanial Cost Centers.,Árvore de Centros de custo finanial .
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,Transferido
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +492,Upload your letter head and logo. (you can edit them later).,Publique sua cabeça letra e logotipo. (Você pode editá-las mais tarde).
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +156,White,Branco
+apps/erpnext/erpnext/public/js/setup_wizard.js +238,Upload your letter head and logo. (you can edit them later).,Publique sua cabeça letra e logotipo. (Você pode editá-las mais tarde).
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,White,Branco
 DocType: SMS Center,All Lead (Open),Todos chumbo (Aberto)
 DocType: Purchase Invoice,Get Advances Paid,Obter adiantamentos pagos
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +362,Attach Your Picture,Anexar a sua imagem
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Make ,Fazer
+apps/erpnext/erpnext/public/js/setup_wizard.js +112,Attach Your Picture,Anexar a sua imagem
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +540,Make ,Fazer
 DocType: Journal Entry,Total Amount in Words,Valor Total em Palavras
 DocType: Workflow State,Stop,pare
 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.,Er is een fout opgetreden . Een mogelijke reden zou kunnen zijn dat je niet hebt opgeslagen het formulier . Neem dan contact support@erpnext.com als het probleem aanhoudt .
@@ -899,14 +865,13 @@
 DocType: Lead,Next Contact Date,Data Contato próximo
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,Opening Aantal
 DocType: Holiday List,Holiday List Name,Lista de Nomes de Feriados
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +168,Stock Options,Opções de Compra
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +168,Stock Options,Opções de Compra
 DocType: Journal Entry Account,Expense Claim,Relatório de Despesas
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +181,Qty for {0},Qtde para {0}
 DocType: Leave Application,Leave Application,Deixe Aplicação
 apps/erpnext/erpnext/config/hr.py +77,Leave Allocation Tool,Deixe Ferramenta de Alocação
 DocType: Leave Block List,Leave Block List Dates,Deixe as datas Lista de Bloqueios
 DocType: Company,If Monthly Budget Exceeded (for expense account),Se orçamento mensal excedido (por conta de despesas)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +56,Trimming,Aparar
 DocType: Workstation,Net Hour Rate,Net Hour Taxa
 DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,Recibo de compra Landed Cost
 DocType: Company,Default Terms,Termos Padrão
@@ -914,10 +879,9 @@
 DocType: POS Profile,Cash/Bank Account,Caixa / Banco Conta
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,Removed items with no change in quantity or value.,Itens removidos sem nenhuma alteração na quantidade ou valor.
 DocType: Delivery Note,Delivery To,Entrega
-apps/erpnext/erpnext/stock/doctype/item/item.py +509,Attribute table is mandatory,Tabela de atributo é obrigatório
+apps/erpnext/erpnext/stock/doctype/item/item.py +513,Attribute table is mandatory,Tabela de atributo é obrigatório
 DocType: Production Planning Tool,Get Sales Orders,Obter Ordem de Vendas
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} não pode ser negativo
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +103,Filing,Arquivamento
 apps/erpnext/erpnext/templates/form_grid/item_grid.html +72,Discount,Desconto
 DocType: Features Setup,Purchase Discounts,Descontos de compra
 DocType: Workstation,Wages,Salário
@@ -934,6 +898,7 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +112,You are the Expense Approver for this record. Please Update the 'Status' and Save,U bent de Expense Approver voor dit record . Werk van de 'Status' en opslaan
 DocType: Serial No,Creation Document No,Creatie Document No
 DocType: Issue,Issue,Questão
+apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account does not match with Company,Conta não coincidir com a Empresa
 apps/erpnext/erpnext/config/stock.py +136,"Attributes for Item Variants. e.g Size, Color etc.","Atributos para item variantes. por exemplo, tamanho, cor etc."
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +39,WIP Warehouse,WIP Warehouse
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +194,Serial No {0} is under maintenance contract upto {1},Serial Não {0} está sob contrato de manutenção até {1}
@@ -942,7 +907,7 @@
 DocType: Tax Rule,Shipping State,Estado Envio
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,"O artigo deve ser adicionado usando ""Obter itens de recibos de compra 'botão"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,Despesas com Vendas
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Buying,Compra padrão
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +120,Standard Buying,Compra padrão
 DocType: GL Entry,Against,Contra
 DocType: Item,Default Selling Cost Center,Venda Padrão Centro de Custo
 DocType: Sales Partner,Implementation Partner,Parceiro de implementação
@@ -963,29 +928,29 @@
 DocType: Time Log Batch,updated via Time Logs,atualizado via Time Logs
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,Média de Idade
 DocType: Opportunity,Your sales person who will contact the customer in future,Sua pessoa de vendas que entrará em contato com o cliente no futuro
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +588,List a few of your suppliers. They could be organizations or individuals.,Lijst een paar van uw leveranciers . Ze kunnen organisaties of personen .
+apps/erpnext/erpnext/public/js/setup_wizard.js +326,List a few of your suppliers. They could be organizations or individuals.,Lijst een paar van uw leveranciers . Ze kunnen organisaties of personen .
 DocType: Company,Default Currency,Moeda padrão
 DocType: Contact,Enter designation of this Contact,Digite designação de este contato
 DocType: Contact Us Settings,Address,Endereço
 DocType: Expense Claim,From Employee,De Empregado
-apps/erpnext/erpnext/controllers/accounts_controller.py +338,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Aviso : O sistema não irá verificar superfaturamento desde montante para item {0} em {1} é zero
+apps/erpnext/erpnext/controllers/accounts_controller.py +339,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Aviso : O sistema não irá verificar superfaturamento desde montante para item {0} em {1} é zero
 DocType: Journal Entry,Make Difference Entry,Faça Entrada Diferença
 DocType: Upload Attendance,Attendance From Date,Presença de Data
 DocType: Appraisal Template Goal,Key Performance Area,Performance de Área Chave 
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +54,Transportation,transporte
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +54,Transportation,transporte
 apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +67, and year: ,e ano:
 DocType: Email Digest,Annual Expense,Despesa anual
 DocType: SMS Center,Total Characters,Total de Personagens
-apps/erpnext/erpnext/controllers/buying_controller.py +139,Please select BOM in BOM field for Item {0},"Por favor, selecione no campo BOM BOM por item {0}"
+apps/erpnext/erpnext/controllers/buying_controller.py +130,Please select BOM in BOM field for Item {0},"Por favor, selecione no campo BOM BOM por item {0}"
 DocType: C-Form Invoice Detail,C-Form Invoice Detail,C-Form Detalhe Fatura
 DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,Reconciliação O pagamento da fatura
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +32,Contribution %,Contribuição%
 DocType: Item,website page link,link da página site
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +192,Let's prepare the system for first use.,Vamos preparar o sistema para a primeira utilização.
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +242,Let's prepare the system for first use.,Vamos preparar o sistema para a primeira utilização.
 DocType: Company,Company registration numbers for your reference. Tax numbers etc.,"Números da empresa de registro para sua referência. Números fiscais, etc"
 DocType: Sales Partner,Distributor,Distribuidor
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Carrinho Rule Envio
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +214,Production Order {0} must be cancelled before cancelling this Sales Order,Ordem de produção {0} deve ser cancelado antes de cancelar esta ordem de venda
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +209,Production Order {0} must be cancelled before cancelling this Sales Order,Ordem de produção {0} deve ser cancelado antes de cancelar esta ordem de venda
 ,Ordered Items To Be Billed,Itens ordenados a ser cobrado
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +24,From Range has to be less than To Range,De Gama tem de ser inferior à gama
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +21,Select Time Logs and Submit to create a new Sales Invoice.,Selecione Time Logs e enviar para criar uma nova factura de venda.
@@ -1005,14 +970,13 @@
 DocType: Sales Invoice Advance,Sales Invoice Advance,Vendas antecipadas Fatura
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +398,Nothing to request,Niets aan te vragen
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date',' Data de início' não pode ser maior que 'Data Final '
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +75,Management,gestão
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +75,Management,gestão
 apps/erpnext/erpnext/config/projects.py +33,Types of activities for Time Sheets,Tipos de atividades para folhas de tempo
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +14,Investment casting,Carcaça de investimento
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +51,Either debit or credit amount is required for {0},É requerido um valor de débito ou crédito para {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""","Isso vai ser anexado ao Código do item da variante. Por exemplo, se a sua abreviatura é ""SM"", e o código do item é ""t-shirt"", o código do item da variante será ""T-shirt-SM"""
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,Pagamento líquido (em palavras) será visível quando você salvar a folha de salário.
 apps/frappe/frappe/core/doctype/user/user_list.js +12,Active,Ativo
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +154,Blue,Azul
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +154,Blue,Azul
 DocType: Purchase Invoice,Is Return,É Retorno
 DocType: Price List Country,Price List Country,Preço da lista País
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +123,Further nodes can be only created under 'Group' type nodes,Verder nodes kunnen alleen worden gemaakt op grond van het type nodes 'Groep'
@@ -1022,18 +986,16 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +22,POS Profile {0} already created for user: {1} and company {2},POS perfil {0} já criado para o usuário: {1} e {2} empresa
 DocType: Purchase Order Item,UOM Conversion Factor,UOM Fator de Conversão
 DocType: Stock Settings,Default Item Group,Grupo Item padrão
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +156,Laminated object manufacturing,Objeto de fabricação laminado
 apps/erpnext/erpnext/config/buying.py +13,Supplier database.,Banco de dados de fornecedores.
 DocType: Account,Balance Sheet,Balanço
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +561,Cost Center For Item with Item Code ',Centro de custo para item com o Código do item '
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +45,Stretch forming,Estiramento formando
 DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,Seu vendedor receberá um lembrete sobre esta data para contato com o cliente
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +210,"Further accounts can be made under Groups, but entries can be made against non-Groups","Outras contas podem ser feitas em grupos, mas as entradas podem ser feitas contra os não-Groups"
 apps/erpnext/erpnext/config/hr.py +125,Tax and other salary deductions.,Fiscais e deduções salariais outros.
 DocType: Lead,Lead,Conduzir
 DocType: Email Digest,Payables,Contas a pagar
 DocType: Account,Warehouse,Armazém
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +90,Row #{0}: Rejected Qty can not be entered in Purchase Return,Row # {0}: Rejeitado Qtde não pode ser inscrita no retorno de compra
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +93,Row #{0}: Rejected Qty can not be entered in Purchase Return,Row # {0}: Rejeitado Qtde não pode ser inscrita no retorno de compra
 ,Purchase Order Items To Be Billed,Ordem de Compra itens a serem faturados
 DocType: Purchase Invoice Item,Net Rate,Taxa Net
 DocType: Purchase Invoice Item,Purchase Invoice Item,Comprar item Fatura
@@ -1048,13 +1010,13 @@
 DocType: Global Defaults,Current Fiscal Year,Atual Exercício
 DocType: Global Defaults,Disable Rounded Total,Desativar total arredondado
 DocType: Lead,Call,Chamar
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +384,'Entries' cannot be empty,' Entradas ' não pode estar vazio
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +386,'Entries' cannot be empty,' Entradas ' não pode estar vazio
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},Linha duplicada {0} com o mesmo {1}
 ,Trial Balance,Balancete
 apps/erpnext/erpnext/config/hr.py +205,Setting up Employees,Configurando Empregados
 apps/erpnext/erpnext/public/js/feature_setup.js +220,"Grid ""","Grid """
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +150,Please select prefix first,Por favor seleccione prefixo primeiro
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +138,Research,pesquisa
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +138,Research,pesquisa
 DocType: Maintenance Visit Purpose,Work Done,Trabalho feito
 apps/erpnext/erpnext/controllers/item_variant.py +25,Please specify at least one attribute in the Attributes table,Especifique pelo menos um atributo na tabela de atributos
 DocType: Contact,User ID,ID de utilizador
@@ -1062,10 +1024,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +57,View Ledger,Ver Diário
 DocType: File,Lft,LFT
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Mais Cedo
-apps/erpnext/erpnext/stock/doctype/item/item.py +394,"An Item Group exists with same name, please change the item name or rename the item group","Um grupo de itens existe com o mesmo nome, por favor, mude o nome do item ou mudar o nome do grupo de itens"
+apps/erpnext/erpnext/stock/doctype/item/item.py +398,"An Item Group exists with same name, please change the item name or rename the item group","Um grupo de itens existe com o mesmo nome, por favor, mude o nome do item ou mudar o nome do grupo de itens"
 DocType: Communication,Delivery Status,Estado entrega
 DocType: Production Order,Manufacture against Sales Order,Fabricação contra a Ordem de Vendas
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +517,Rest Of The World,Resto do mundo
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +455,Rest Of The World,Resto do mundo
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,O item {0} não pode ter Batch
 ,Budget Variance Report,Relatório Variance Orçamento
 DocType: Salary Slip,Gross Pay,Salário bruto
@@ -1076,13 +1038,11 @@
 DocType: BOM Item,Item Description,Item Descrição
 DocType: Payment Tool,Payment Mode,O modo de pagamento
 DocType: Purchase Invoice,Is Recurring,É recorrente
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +154,Direct metal laser sintering,Direto de metal sinterização a laser
 DocType: Purchase Order,Supplied Items,Itens fornecidos
 DocType: Production Order,Qty To Manufacture,Qtde Para Fabricação
 DocType: Buying Settings,Maintain same rate throughout purchase cycle,Manter mesmo ritmo durante todo o ciclo de compra
 DocType: Opportunity Item,Opportunity Item,Item oportunidade
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +61,Temporary Opening,Abertura temporária
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +41,Cryorolling,Cryorolling
 ,Employee Leave Balance,Empregado Leave Balance
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +128,Balance for Account {0} must always be {1},Saldo Conta {0} deve ser sempre {1}
 DocType: Address,Address Type,Tipo de endereço
@@ -1098,23 +1058,23 @@
 DocType: Journal Entry,Get Outstanding Invoices,Obter Facturas Pendentes
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,Ordem de Vendas {0} não é válido
 apps/erpnext/erpnext/setup/doctype/company/company.py +172,"Sorry, companies cannot be merged","Sorry , bedrijven kunnen niet worden samengevoegd"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +145,Small,Pequeno
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Small,Pequeno
 DocType: Employee,Employee Number,Número de empregado
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},Processo n º (s) já está em uso . Tente de Processo n {0}
 ,Invoiced Amount (Exculsive Tax),Factuurbedrag ( Exculsive BTW )
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,Número 2
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +59,Account head {0} created,Conta principal {0} criada
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +153,Green,Verde
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Green,Verde
 DocType: Item,Auto re-order,Auto re-fim
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +57,Total Achieved,Total de Alcançados
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +59,Total Achieved,Total de Alcançados
 DocType: Employee,Place of Issue,Local de Emissão
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +59,Contract,contrato
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Contract,contrato
 DocType: Report,Disabled,Inválido
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +490,UOM coversion factor required for UOM: {0} in Item: {1},Fator coversion UOM necessário para UOM: {0} no Item: {1}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +83,Indirect Expenses,Despesas Indiretas
 apps/erpnext/erpnext/controllers/selling_controller.py +163,Row {0}: Qty is mandatory,Row {0}: Quantidade é obrigatório
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +8,Agriculture,Agricultura
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +611,Your Products or Services,Uw producten of diensten
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,Agricultura
+apps/erpnext/erpnext/public/js/setup_wizard.js +347,Your Products or Services,Uw producten of diensten
 DocType: Mode of Payment,Mode of Payment,Modo de Pagamento
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,Dit is een hoofditem groep en kan niet worden bewerkt .
 DocType: Journal Entry Account,Purchase Order,Ordem de Compra
@@ -1126,7 +1086,7 @@
 DocType: Serial No,Serial No Details,Serial Detalhes Nenhum
 DocType: Purchase Invoice Item,Item Tax Rate,Taxa de Imposto item
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +113,"For {0}, only credit accounts can be linked against another debit entry","Por {0}, apenas as contas de crédito pode ser ligado contra outro lançamento de débito"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Delivery Note {0} is not submitted,Entrega Nota {0} não é submetido
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +470,Delivery Note {0} is not submitted,Entrega Nota {0} não é submetido
 apps/erpnext/erpnext/stock/get_item_details.py +136,Item {0} must be a Sub-contracted Item,Item {0} deve ser um item do sub- contratados
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,Equipamentos Capitais
 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.","Regra de Preços é o primeiro selecionado com base em ""Aplicar On 'campo, que pode ser Item, item de grupo ou Marca."
@@ -1136,7 +1096,7 @@
 DocType: Appraisal Goal,Goal,Meta
 DocType: Sales Invoice Item,Edit Description,Editar Descrição
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +318,Expected Delivery Date is lesser than Planned Start Date.,Data de entrega esperada é menor do que o planejado Data de Início.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +579,For Supplier,voor Leverancier
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +602,For Supplier,voor Leverancier
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,Tipo de conta Definir ajuda na seleção desta conta em transações.
 DocType: Purchase Invoice,Grand Total (Company Currency),Grande Total (moeda da empresa)
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,Sainte total
@@ -1162,10 +1122,10 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +74,"Total {0} for all items is zero, may you should change 'Distribute Charges Based On'","Total de {0} para todos os itens é zero, pode você deve mudar &quot;Distribuir taxas sobre &#39;"
 DocType: Purchase Invoice,Taxes and Charges Calculation,Impostos e Encargos de Cálculo
 DocType: BOM Operation,Workstation,Estação de trabalho
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +112,Hardware,Hardware
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +112,Hardware,Hardware
 DocType: Attendance,HR Manager,Gestor de RH
 apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,"Por favor, selecione uma empresa"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +50,Privilege Leave,Privilege Deixar
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +50,Privilege Leave,Privilege Deixar
 DocType: Purchase Invoice,Supplier Invoice Date,Fornecedor Data Fatura
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +79,You need to enable Shopping Cart,É preciso ativar o Carrinho de Compras
 apps/frappe/frappe/public/js/frappe/form/grid_body.html +6,No Data,No Data
@@ -1178,7 +1138,7 @@
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +81,Overlapping conditions found between:,Condições sobreposição encontradas entre :
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +168,Against Journal Entry {0} is already adjusted against some other voucher,Contra Diário {0} já é ajustado contra algum outro comprovante
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +68,Total Order Value,Valor total da ordem
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +38,Food,Comida
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +38,Food,Comida
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Faixa de Envelhecimento 3
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +139,You can make a time log only against a submitted production order,Você pode fazer um registro de tempo apenas contra uma ordem de produção apresentado
 DocType: Maintenance Schedule Item,No of Visits,N º de Visitas
@@ -1198,6 +1158,7 @@
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,View Offer Letter,Vista Oferta Letter
 DocType: Communication,Communication,Comunicação
 DocType: Item,Is Service Item,É item de serviço
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +81,Application period cannot be outside leave allocation period,Período de aplicação não pode ser período de atribuição de licença fora
 DocType: Activity Cost,Projects,Projetos
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +31,Please select Fiscal Year,Por favor seleccione o Ano Fiscal
 apps/erpnext/erpnext/controllers/buying_controller.py +23,From {0} | {1} {2},A partir de {0} | {1} {2}
@@ -1216,7 +1177,7 @@
 DocType: Item,Maintain Stock,Manter da
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +213,Stock Entries already created for Production Order ,Banco de entradas já criadas para ordem de produção
 DocType: Leave Control Panel,Leave blank if considered for all designations,Deixe em branco se considerado para todas as designações
-apps/erpnext/erpnext/controllers/accounts_controller.py +499,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Charge do tipo ' real ' na linha {0} não pode ser incluído no item Taxa
+apps/erpnext/erpnext/controllers/accounts_controller.py +500,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Charge do tipo ' real ' na linha {0} não pode ser incluído no item Taxa
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,Max: {0},Max: {0}
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +16,From Datetime,A partir de data e hora
 DocType: Email Digest,For Company,Para a Empresa
@@ -1226,7 +1187,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +50,Chart of Accounts,Plano de Contas
 DocType: Material Request,Terms and Conditions Content,Termos e Condições conteúdo
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +471,cannot be greater than 100,não pode ser maior do que 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +546,Item {0} is not a stock Item,Item {0} não é um item de estoque
+apps/erpnext/erpnext/stock/doctype/item/item.py +550,Item {0} is not a stock Item,Item {0} não é um item de estoque
 DocType: Maintenance Visit,Unscheduled,Sem marcação
 DocType: Employee,Owned,Possuído
 DocType: Salary Slip Deduction,Depends on Leave Without Pay,Depende de licença sem vencimento
@@ -1240,31 +1201,29 @@
 DocType: HR Settings,Employee Settings,werknemer Instellingen
 ,Batch-Wise Balance History,Por lotes História Balance
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +72,To Do List,Para fazer a lista
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +63,Apprentice,aprendiz
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Apprentice,aprendiz
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +99,Negative Quantity is not allowed,Negativo Quantidade não é permitido
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
 Used for Taxes and Charges","Detalhe da tabela de imposto obtido a partir mestre como uma string e armazenado neste campo.
  Usado para Tributos e Encargos"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +61,Lancing,Lancing
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +151,Employee cannot report to himself.,Empregado não pode denunciar a si mesmo.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Als de account wordt gepauzeerd, blijven inzendingen mogen gebruikers met beperkte rechten ."
 DocType: Email Digest,Bank Balance,Saldo bancário
-apps/erpnext/erpnext/controllers/accounts_controller.py +435,Accounting Entry for {0}: {1} can only be made in currency: {2},Contabilidade de entrada para {0}: {1} só pode ser feito em moeda: {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +436,Accounting Entry for {0}: {1} can only be made in currency: {2},Contabilidade de entrada para {0}: {1} só pode ser feito em moeda: {2}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +38,No active Salary Structure found for employee {0} and the month,Sem Estrutura salarial para o empregado ativo encontrado {0} eo mês
 DocType: Job Opening,"Job profile, qualifications required etc.","Perfil, qualificações exigidas , etc"
 DocType: Journal Entry Account,Account Balance,Saldo da Conta
 apps/erpnext/erpnext/config/accounts.py +112,Tax Rule for transactions.,Regra de imposto para transações.
 DocType: Rename Tool,Type of document to rename.,Tipo de documento a ser renomeado.
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +630,We buy this Item,Nós compramos este item
+apps/erpnext/erpnext/public/js/setup_wizard.js +366,We buy this Item,Nós compramos este item
 DocType: Address,Billing,Faturamento
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +77,Flanging,Flanging
 DocType: Bulk Email,Not Sent,Não Enviados
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +73,Explosive forming,Explosivo formando
 DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),Total de Impostos e Taxas (moeda da empresa)
 DocType: Shipping Rule,Shipping Account,Conta de Envio
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +43,Scheduled to send to {0} recipients,Programado para enviar para {0} destinatários
 DocType: Quality Inspection,Readings,Leituras
 DocType: Stock Entry,Total Additional Costs,Total de Custos Adicionais
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Sub Assemblies,Sub Assembléias
+apps/erpnext/erpnext/public/js/setup_wizard.js +359,Sub Assemblies,Sub Assembléias
 DocType: Shipping Rule Condition,To Value,Ao Valor
 DocType: Supplier,Stock Manager,Da Gerente
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +143,Source warehouse is mandatory for row {0},Origem do Warehouse é obrigatória para a linha {0}
@@ -1274,44 +1233,42 @@
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Import mislukt!
 apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,Nenhum endereço adicionado ainda.
 DocType: Workstation Working Hour,Workstation Working Hour,Hora de Trabalho Workstation
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +83,Analyst,Analista
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +202,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Fila {0}: quantidade atribuídos {1} tem de ser menor ou igual à quantidade JV {2}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Analyst,Analista
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +149,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Fila {0}: quantidade atribuídos {1} tem de ser menor ou igual à quantidade JV {2}
 DocType: Item,Inventory,Inventário
 DocType: Features Setup,"To enable ""Point of Sale"" view",Para ativar &quot;Point of Sale&quot; vista
 apps/erpnext/erpnext/public/js/pos/pos.js +402,Payment cannot be made for empty cart,O pagamento não pode ser feito para carrinho vazio
 DocType: Item,Sales Details,Detalhes de vendas
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +149,Pinning,Fixando
 DocType: Opportunity,With Items,Com Itens
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,in Aantal
 DocType: Notification Control,Expense Claim Rejected,Relatório de Despesas Rejeitado
 DocType: Sales Invoice,"The date on which next invoice will be generated. It is generated on submit.
 ",A data na qual próxima fatura será gerada. Ele é gerado em enviar.
 DocType: Item Attribute,Item Attribute,Atributo item
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +105,Government,Governo
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Government,Governo
 apps/erpnext/erpnext/config/stock.py +268,Item Variants,As variantes de item
 DocType: Company,Services,Serviços
 apps/erpnext/erpnext/accounts/report/financial_statements.py +147,Total ({0}),Total ({0})
 DocType: Cost Center,Parent Cost Center,Centro de Custo pai
 DocType: Sales Invoice,Source,Fonte
 DocType: Leave Type,Is Leave Without Pay,É licença sem vencimento
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +186,No records found in the Payment table,Nenhum registro encontrado na tabela de pagamento
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +405,Financial Year Start Date,Exercício Data de Início
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +133,No records found in the Payment table,Nenhum registro encontrado na tabela de pagamento
+apps/erpnext/erpnext/public/js/setup_wizard.js +153,Financial Year Start Date,Exercício Data de Início
 DocType: Employee External Work History,Total Experience,Experiência total
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +100,Countersinking,Escareaï¿½o
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +271,Packing Slip(s) cancelled,Deslizamento (s) de embalagem cancelado
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +276,Packing Slip(s) cancelled,Deslizamento (s) de embalagem cancelado
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,Freight Forwarding e Encargos
 DocType: Material Request Item,Sales Order No,Vendas decreto n º
 DocType: Item Group,Item Group Name,Nome do Grupo item
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +50,Taken,Tomado
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,Tomado
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +66,Transfer Materials for Manufacture,Materiais de transferência para Fabricação
 DocType: Pricing Rule,For Price List,Para Lista de Preço
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +27,Executive Search,Executive Search
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,Executive Search
 apps/erpnext/erpnext/stock/stock_ledger.py +405,"Purchase rate for item: {0} not found, which is required to book accounting entry (expense). Please mention item price against a buying price list.","Taxa de compra para o item: {0} não foi encontrado, o que é necessário para reservar a entrada de contabilidade (despesa). Por favor, mencione preço do item em uma lista de preços de compra."
 DocType: Maintenance Schedule,Schedules,Horários
 DocType: Purchase Invoice Item,Net Amount,Valor Líquido
 DocType: Purchase Order Item Supplied,BOM Detail No,BOM nenhum detalhe
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),Montante desconto adicional (moeda da empresa)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +537,Error: {0} > {1},Erro: {0} > {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +541,Error: {0} > {1},Erro: {0} > {1}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,"Por favor, crie uma nova conta do Plano de Contas ."
 DocType: Maintenance Visit,Maintenance Visit,Visita de manutenção
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer > Customer Group > Territory,Cliente> Grupo Cliente> Território
@@ -1322,7 +1279,6 @@
 DocType: Event,Tuesday,Terça-feira
 DocType: Leave Block List,Block Holidays on important days.,Bloco Feriados em dias importantes.
 ,Accounts Receivable Summary,Resumo das Contas a Receber
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +43,Leaves for type {0} already allocated for Employee {1} for period {2} - {3},Deixa para o tipo {0} já alocado para Employee {1} para {2} período - {3}
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +187,Please set User ID field in an Employee record to set Employee Role,"Por favor, defina o campo ID do usuário em um registro de empregado para definir Função Funcionário"
 DocType: UOM,UOM Name,Nome UOM
 DocType: Top Bar Item,Target,Alvo
@@ -1334,15 +1290,14 @@
 DocType: ToDo,Due Date,Data de Vencimento
 DocType: Sales Invoice Item,Brand Name,Marca
 DocType: Purchase Receipt,Transporter Details,Detalhes Transporter
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Box,caixa
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +389,The Organization,de Organisatie
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Box,caixa
+apps/erpnext/erpnext/public/js/setup_wizard.js +137,The Organization,de Organisatie
 DocType: Monthly Distribution,Monthly Distribution,Distribuição Mensal
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,"Lista Receiver está vazio. Por favor, crie Lista Receiver"
 DocType: Production Plan Sales Order,Production Plan Sales Order,Produção Plano de Ordem de Vendas
 DocType: Sales Partner,Sales Partner Target,Vendas Alvo Parceiro
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},Entrada Contabilidade para {0} só pode ser feito em moeda: {1}
 DocType: Pricing Rule,Pricing Rule,Regra de Preços
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +58,Notching,Notching
 apps/erpnext/erpnext/config/learn.py +167,Material Request to Purchase Order,Pedido de material a Ordem de Compra
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +74,Row # {0}: Returned Item {1} does not exists in {2} {3},Row # {0}: Item devolvido {1} não existe em {2} {3}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,bankrekeningen
@@ -1359,20 +1314,19 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Amounts not reflected in bank,Valores não reflete em banco
 DocType: Quality Inspection Reading,Reading 4,Reading 4
 apps/erpnext/erpnext/config/hr.py +23,Claims for company expense.,Os pedidos de despesa da empresa.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +8,Centrifugal casting,Fundição centrífuga
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +119,Magnetic field-assisted finishing,Magnetic acabamento assistida-campo
 DocType: Company,Default Holiday List,Padrão Lista de férias
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +165,Stock Liabilities,Passivo stock
 DocType: Purchase Receipt,Supplier Warehouse,Armazém fornecedor
 DocType: Opportunity,Contact Mobile No,Contato móveis não
 DocType: Production Planning Tool,Select Sales Orders,Selecione Pedidos de Vendas
 ,Material Requests for which Supplier Quotations are not created,Materiaal Verzoeken waarvoor Leverancier Offertes worden niet gemaakt
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +117,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,No dia (s) em que você está se candidatando a licença são feriados. Você não precisa solicitar uma licença.
 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.,Para rastrear itens usando código de barras. Você será capaz de inserir itens na nota de entrega e nota fiscal de venda pela digitalização de código de barras do item.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +477,Mark as Delivered,Marcar como Proferido
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +497,Mark as Delivered,Marcar como Proferido
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +34,Make Quotation,Faça Cotação
 DocType: Dependent Task,Dependent Task,Tarefa dependente
-apps/erpnext/erpnext/stock/doctype/item/item.py +306,Conversion factor for default Unit of Measure must be 1 in row {0},Fator de conversão de unidade de medida padrão deve ser 1 na linha {0}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,Leave of type {0} cannot be longer than {1},Deixar do tipo {0} não pode ser maior que {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +310,Conversion factor for default Unit of Measure must be 1 in row {0},Fator de conversão de unidade de medida padrão deve ser 1 na linha {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +155,Leave of type {0} cannot be longer than {1},Deixar do tipo {0} não pode ser maior que {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Tente planear operações para X dias de antecedência.
 DocType: HR Settings,Stop Birthday Reminders,Stop verjaardagsherinneringen
 DocType: SMS Center,Receiver List,Lista de receptor
@@ -1380,15 +1334,14 @@
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Quantidade consumida
 apps/erpnext/erpnext/public/js/pos/pos.js +491,{0} View,{0} Vista
 DocType: Salary Structure Deduction,Salary Structure Deduction,Dedução Estrutura Salarial
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +158,Selective laser sintering,Seletiva sinterização a laser
-apps/erpnext/erpnext/stock/doctype/item/item.py +301,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Unidade de Medida {0} foi inserido mais de uma vez na Tabela de Conversão de Fator
+apps/erpnext/erpnext/stock/doctype/item/item.py +305,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Unidade de Medida {0} foi inserido mais de uma vez na Tabela de Conversão de Fator
 apps/frappe/frappe/core/page/data_import_tool/data_import_tool.js +108,Import Successful!,Importeer Succesvol!
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Custo de itens emitidos
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +185,Quantity must not be more than {0},Quantidade não deve ser mais do que {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +41,Age (Days),Idade (Dias)
 DocType: Quotation Item,Quotation Item,Item citação
 DocType: Account,Account Name,Nome da conta
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +41,From Date cannot be greater than To Date,A partir de data não pode ser maior que a Data
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +34,From Date cannot be greater than To Date,A partir de data não pode ser maior que a Data
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +194,Serial No {0} quantity {1} cannot be a fraction,Serial Não {0} {1} quantidade não pode ser uma fração
 apps/erpnext/erpnext/config/buying.py +59,Supplier Type master.,Fornecedor Tipo de mestre.
 DocType: Purchase Order Item,Supplier Part Number,Número da peça de fornecedor
@@ -1397,14 +1350,14 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +247,{0} {1} is cancelled or stopped,{0} {1} é cancelado ou interrompido
 DocType: Accounts Settings,Credit Controller,Controlador de crédito
 DocType: Delivery Note,Vehicle Dispatch Date,Veículo Despacho Data
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +197,Purchase Receipt {0} is not submitted,Recibo de compra {0} não é submetido
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +198,Purchase Receipt {0} is not submitted,Recibo de compra {0} não é submetido
 DocType: Company,Default Payable Account,Conta a Pagar Padrão
 apps/erpnext/erpnext/config/website.py +13,"Settings for online shopping cart such as shipping rules, price list etc.","Definições para carrinho de compras on-line, tais como regras de navegação, lista de preços etc."
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +660,Setup Complete,Instalação concluída
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +124,Setup Complete,Instalação concluída
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +65,{0}% Billed,{0}% Tida
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +17,Reserved Qty,Gereserveerd Aantal
 DocType: Party Account,Party Account,Conta Party
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +74,Human Resources,Recursos Humanos
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +74,Human Resources,Recursos Humanos
 DocType: Lead,Upper Income,Renda superior
 DocType: Journal Entry Account,Debit in Company Currency,Débito em Empresa de moeda
 apps/erpnext/erpnext/support/doctype/issue/issue.py +58,My Issues,Meus Problemas
@@ -1413,11 +1366,9 @@
 DocType: Company,Default Values,Valores Padrão
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +236,Row {0}: Payment amount can not be negative,Row {0}: Valor do pagamento não pode ser negativo
 DocType: Expense Claim,Total Amount Reimbursed,Montante total reembolsado
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +152,Press fitting,Uni de press de
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +64,Against Supplier Invoice {0} dated {1},Contra Fatura de Fornecedor {0} {1} datada
 DocType: Customer,Default Price List,Lista de Preços padrão
 DocType: Payment Reconciliation,Payments,Pagamentos
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +24,Hot isostatic pressing,Prensagem isostática a quente
 DocType: ToDo,Medium,Médio
 DocType: Budget Detail,Budget Allocated,Orçamento alocado
 DocType: Journal Entry,Entry Type,Tipo de entrada
@@ -1430,9 +1381,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +56,None of the items have any change in quantity or value.,Nenhum dos itens tiver qualquer mudança na quantidade ou valor.
 DocType: Warranty Claim,Warranty Claim,Reclamação de Garantia
 ,Lead Details,Chumbo Detalhes
-DocType: Authorization Rule,Approving User,Aprovar Utilizador
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +37,Forging,Forjar
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +126,Plating,Galvanização
 DocType: Purchase Invoice,End date of current invoice's period,Data final do período de fatura atual
 DocType: Pricing Rule,Applicable For,Aplicável para
 DocType: Bank Reconciliation,From Date,A partir da data
@@ -1454,31 +1402,29 @@
 DocType: Sales Invoice,Paid Amount (Company Currency),Valor pago (Empresa de moeda)
 DocType: Purchase Invoice,Additional Discount,Desconto adicional
 DocType: Selling Settings,Selling Settings,Vendendo Configurações
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +39,Online Auctions,Leilões Online
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,Leilões Online
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +94,Please specify either Quantity or Valuation Rate or both,"Por favor, especifique a quantidade ou Taxa de Valorização ou ambos"
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +50,"Company, Month and Fiscal Year is mandatory","Bedrijf , maand en het fiscale jaar is verplicht"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Marketing Expenses,Despesas de Marketing
 ,Item Shortage Report,Punt Tekort Report
-apps/erpnext/erpnext/stock/doctype/item/item.js +183,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Peso é mencionado, \n Mencione ""Peso UOM"" too"
+apps/erpnext/erpnext/stock/doctype/item/item.js +185,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Peso é mencionado, \n Mencione ""Peso UOM"" too"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,Pedido de material usado para fazer isto Stock Entry
 apps/erpnext/erpnext/config/support.py +43,Single unit of an Item.,Única unidade de um item.
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +212,Time Log Batch {0} must be 'Submitted',Tempo Log Batch {0} deve ser ' enviado '
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,Maak boekhoudkundige afschrijving voor elke Stock Movement
 DocType: Leave Allocation,Total Leaves Allocated,Folhas total atribuído
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +384,Warehouse required at Row No {0},Armazém necessária no Row Nenhuma {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +386,Warehouse required at Row No {0},Armazém necessária no Row Nenhuma {0}
 DocType: Employee,Date Of Retirement,Data da aposentadoria
 DocType: Upload Attendance,Get Template,Obter modelo
 DocType: Address,Postal,Postal
 DocType: Item,Weightage,Weightage
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +159,Mining,Mineração
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +17,Resin casting,De moldagem de resina
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"Um grupo de clientes existente com o mesmo nome, por favor altere o nome do cliente ou renomear o grupo de clientes"
 apps/erpnext/erpnext/public/js/pos/pos.js +147,Please select {0} first.,Por favor seleccione {0} primeiro.
 apps/erpnext/erpnext/templates/pages/order.html +57,text {0},texto {0}
 DocType: Territory,Parent Territory,Território pai
 DocType: Quality Inspection Reading,Reading 2,Leitura 2
 DocType: Stock Entry,Material Receipt,Recebimento de materiais
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +622,Products,produtos
+apps/erpnext/erpnext/public/js/setup_wizard.js +358,Products,produtos
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +47,Party Type and Party is required for Receivable / Payable account {0},Festa Tipo and Party é necessário para receber / pagar contas {0}
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.","Se este item tem variantes, então ele não pode ser selecionado em ordens de venda etc."
 DocType: Lead,Next Contact By,Contato Próxima Por
@@ -1488,13 +1434,13 @@
 DocType: Purchase Invoice,Notification Email Address,Endereço de email de notificação
 DocType: Payment Tool,Find Invoices to Match,Encontre Faturas para combinar
 ,Item-wise Sales Register,Vendas de item sábios Registrar
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +399,"e.g. ""XYZ National Bank""","eg ""XYZ National Bank """
+apps/erpnext/erpnext/public/js/setup_wizard.js +147,"e.g. ""XYZ National Bank""","eg ""XYZ National Bank """
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,É este imposto incluído na Taxa Básica?
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +57,Total Target,Alvo total
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Target,Alvo total
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.js +22,Shopping Cart is enabled,Carrinho de Compras está habilitado
 DocType: Job Applicant,Applicant for a Job,Candidato a um emprego
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +173,No Production Orders created,Não há ordens de produção criadas
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +131,Salary Slip of employee {0} already created for this month,Folha de salário de empregado {0} já criado para este mês
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +140,Salary Slip of employee {0} already created for this month,Folha de salário de empregado {0} já criado para este mês
 DocType: Stock Reconciliation,Reconciliation JSON,Reconciliação JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Muitas colunas. Exportar o relatório e imprimi-lo usando um aplicativo de planilha.
 DocType: Sales Invoice Item,Batch No,No lote
@@ -1504,14 +1450,14 @@
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +13,Variant,Variante
 apps/frappe/frappe/public/js/frappe/form/toolbar.js +165,New {0},Nova {0}
 DocType: Naming Series,Set prefix for numbering series on your transactions,Definir prefixo para numeração de série em suas transações
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +169,Stopped order cannot be cancelled. Unstop to cancel.,Parado ordem não pode ser cancelado. Desentupir para cancelar.
-apps/erpnext/erpnext/stock/doctype/item/item.py +323,Default BOM ({0}) must be active for this item or its template,BOM padrão ({0}) deve estar ativo para este item ou o seu modelo
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +164,Stopped order cannot be cancelled. Unstop to cancel.,Parado ordem não pode ser cancelado. Desentupir para cancelar.
+apps/erpnext/erpnext/stock/doctype/item/item.py +327,Default BOM ({0}) must be active for this item or its template,BOM padrão ({0}) deve estar ativo para este item ou o seu modelo
 DocType: Employee,Leave Encashed?,Deixe cobradas?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Oportunidade De O campo é obrigatório
 DocType: Item,Variants,Variantes
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +458,Make Purchase Order,Maak Bestelling
 DocType: SMS Center,Send To,Enviar para
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +111,There is not enough leave balance for Leave Type {0},Não há o suficiente equilíbrio pela licença Tipo {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +127,There is not enough leave balance for Leave Type {0},Não há o suficiente equilíbrio pela licença Tipo {0}
 DocType: Sales Team,Contribution to Net Total,Contribuição para o Total Líquido
 DocType: Sales Invoice Item,Customer's Item Code,Código do Cliente item
 DocType: Stock Reconciliation,Stock Reconciliation,Da Reconciliação
@@ -1548,11 +1494,11 @@
 DocType: Sales Order Item,Actual Qty,Qtde Atual
 DocType: Sales Invoice Item,References,Referências
 DocType: Quality Inspection Reading,Reading 10,Leitura 10
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +612,"List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start.",Liste seus produtos ou serviços que você comprar ou vender .
+apps/erpnext/erpnext/public/js/setup_wizard.js +348,"List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start.",Liste seus produtos ou serviços que você comprar ou vender .
 DocType: Hub Settings,Hub Node,Hub Node
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,U heeft dubbele items ingevoerd. Aub verwijderen en probeer het opnieuw .
 apps/erpnext/erpnext/controllers/item_variant.py +65,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values,Valor {0} para o atributo {1} não existe na lista de item válido Valores de Atributo
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +87,Associate,Associado
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Associate,Associado
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +46,Item {0} is not a serialized Item,Item {0} não é um item serializado
 DocType: SMS Center,Create Receiver List,Criar Lista de Receptor
 apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +5,Expired,Expirado
@@ -1561,7 +1507,7 @@
 DocType: Warranty Claim,Issue Date,Data de Emissão
 DocType: Activity Cost,Activity Cost,Atividade Custo
 DocType: Purchase Receipt Item Supplied,Consumed Qty,Qtde consumida
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +52,Telecommunications,Telecomunicações
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +52,Telecommunications,Telecomunicações
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),Indica que o pacote é uma parte desta entrega (Só Projecto)
 DocType: Payment Tool,Make Payment Entry,Betalen Entry
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +119,Quantity for Item {0} must be less than {1},Quantidade de item {0} deve ser inferior a {1}
@@ -1578,10 +1524,8 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +37,"Selling must be checked, if Applicable For is selected as {0}","Venda deve ser verificada, se for caso disso for selecionado como {0}"
 DocType: Purchase Order Item,Supplier Quotation Item,Cotação do item fornecedor
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +27,Make Salary Structure,Maak salarisstructuur
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +54,Shearing,Shearing
 DocType: Item,Has Variants,Tem Variantes
 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.,Clique em &#39;Criar Fatura de vendas&#39; botão para criar uma nova factura de venda.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +166,Packaging and labeling,Embalagem e rotulagem
 DocType: Monthly Distribution,Name of the Monthly Distribution,Nome da distribuição mensal
 DocType: Sales Person,Parent Sales Person,Vendas Pessoa pai
 apps/erpnext/erpnext/setup/utils.py +14,Please specify Default Currency in Company Master and Global Defaults,"Por favor, especifique Moeda predefinida in Company Mestre e padrões globais"
@@ -1592,19 +1536,18 @@
 DocType: Budget Detail,Fiscal Year,Ano Fiscal
 DocType: Cost Center,Budget,Orçamento
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +41,"Budget cannot be assigned against {0}, as it's not an Income or Expense account","Orçamento não pode ser atribuído contra {0}, pois não é uma conta de renda ou despesa"
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Achieved,Alcançados
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,Alcançados
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +65,Territory / Customer,Grondgebied / Klantenservice
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,e.g. 5,por exemplo 5
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +207,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},Row {0}: quantidade atribuídos {1} deve ser menor ou igual a facturar saldo {2}
+apps/erpnext/erpnext/public/js/setup_wizard.js +294,e.g. 5,por exemplo 5
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},Row {0}: quantidade atribuídos {1} deve ser menor ou igual a facturar saldo {2}
 DocType: Sales Invoice,In Words will be visible once you save the Sales Invoice.,Em Palavras será visível quando você salvar a nota fiscal de venda.
 DocType: Item,Is Sales Item,É item de vendas
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,Punt Groepsstructuur
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,Item {0} não está configurado para n º s de série mestre check item
 DocType: Maintenance Visit,Maintenance Time,Tempo de Manutenção
 ,Amount to Deliver,Valor a entregar
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +620,A Product or Service,Um produto ou serviço
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +158,There were errors.,Er waren fouten .
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +101,Tapping,Tapping
+apps/erpnext/erpnext/public/js/setup_wizard.js +356,A Product or Service,Um produto ou serviço
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +146,There were errors.,Er waren fouten .
 DocType: Naming Series,Current Value,Valor Atual
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +171,{0} created,{0} criado
 DocType: Delivery Note Item,Against Sales Order,Contra Ordem de Venda
@@ -1619,7 +1562,7 @@
 apps/erpnext/erpnext/accounts/party.py +275,Due Date cannot be before Posting Date,Due Date não pode ser antes de Postar Data
 DocType: Website Item Group,Website Item Group,Grupo Item site
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Duties and Taxes,Impostos e Contribuições
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Please enter Reference date,"Por favor, indique data de referência"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +312,Please enter Reference date,"Por favor, indique data de referência"
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} entradas de pagamento não podem ser filtrados por {1}
 DocType: Item Website Specification,Table for Item that will be shown in Web Site,Tabela para o item que será mostrado no Web Site
 DocType: Purchase Order Item Supplied,Supplied Qty,Fornecido Qtde
@@ -1627,7 +1570,7 @@
 apps/erpnext/erpnext/config/stock.py +103,Tree of Item Groups.,Árvore de Grupos de itens .
 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,Não é possível consultar número da linha superior ou igual ao número da linha atual para este tipo de carga
 ,Item-wise Purchase History,Item-wise Histórico de compras
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +152,Red,Vermelho
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Red,Vermelho
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +228,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},"Por favor, clique em "" Gerar Cronograma ' para buscar Serial Sem adição de item {0}"
 DocType: Account,Frozen,Congelado
 ,Open Production Orders,Open productieorders
@@ -1642,7 +1585,7 @@
 DocType: Item Attribute,Attribute Name,Nome do atributo
 apps/erpnext/erpnext/controllers/selling_controller.py +236,Item {0} must be Sales or Service Item in {1},Item {0} deve ser de Vendas ou Atendimento item em {1}
 DocType: Item Group,Show In Website,Mostrar No Site
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +621,Group,Grupo
+apps/erpnext/erpnext/public/js/setup_wizard.js +357,Group,Grupo
 DocType: Task,Expected Time (in hours),Tempo esperado (em horas)
 ,Qty to Order,Aantal te bestellen
 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","Para rastrear marca no seguintes documentos Nota de Entrega, Oportunidade, Pedir Material, Item, Pedido de Compra, Compra de Vouchers, o Comprador Receipt, cotação, Vendas fatura, Pacote de Produtos, Pedido de Vendas, Serial No"
@@ -1652,6 +1595,7 @@
 DocType: Features Setup,Brands,Marcas
 DocType: C-Form Invoice Detail,Invoice No,A factura n º
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +480,From Purchase Order,Da Ordem de Compra
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +92,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Deixe não pode ser aplicada / cancelada antes {0}, como saldo licença já tenha sido no futuro recorde alocação licença encaminhadas-carry {1}"
 DocType: Activity Cost,Costing Rate,Custando Classificação
 ,Customer Addresses And Contacts,Endereços e contatos de clientes
 DocType: Employee,Resignation Letter Date,Data carta de demissão
@@ -1659,35 +1603,31 @@
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +137,Not Set,niet instellen
 DocType: Communication,Date,Data
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,Receita Cliente Repita
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +651,Sit tight while your system is being setup. This may take a few moments.,Hou je vast terwijl uw systeem wordt setup. Dit kan even duren .
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +115,Sit tight while your system is being setup. This may take a few moments.,Hou je vast terwijl uw systeem wordt setup. Dit kan even duren .
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +51,{0} ({1}) must have role 'Expense Approver',{0} ({1}) deve ter a regra de 'Aprovador de Despesas'
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Pair,par
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Pair,par
 DocType: Bank Reconciliation Detail,Against Account,Contra Conta
 DocType: Maintenance Schedule Detail,Actual Date,Data atual
 DocType: Item,Has Batch No,Não tem Batch
 DocType: Delivery Note,Excise Page Number,Número de página especial sobre o consumo
 DocType: Employee,Personal Details,Detalhes pessoais
 ,Maintenance Schedules,Horários de Manutenção
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +44,Embossing,Gravação em relevo
 ,Quotation Trends,Tendências cotação
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +139,Item Group not mentioned in item master for item {0},Grupo item não mencionado no mestre de item para item {0}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +302,Debit To account must be a Receivable account,De débito em conta deve ser uma conta a receber
-apps/erpnext/erpnext/stock/doctype/item/item.py +310,"As Production Order can be made for this item, it must be a stock item.","Como ordem de produção pode ser feita para este item , deve ser um item de estoque."
 DocType: Shipping Rule Condition,Shipping Amount,Valor do transporte
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +140,Joining,Juntando
-DocType: Authorization Rule,Above Value,Acima de Valor
 ,Pending Amount,In afwachting van Bedrag
 DocType: Purchase Invoice Item,Conversion Factor,Fator de Conversão
 DocType: Purchase Order,Delivered,Entregue
 apps/erpnext/erpnext/config/hr.py +160,Setup incoming server for jobs email id. (e.g. jobs@example.com),Configuração do servidor de entrada para os trabalhos de identificação do email . ( por exemplo jobs@example.com )
 DocType: Purchase Receipt,Vehicle Number,Número de veículos
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,A data em que fatura recorrente será parar
+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,Total de folhas alocados {0} não pode ser menos do que as folhas já aprovados {1} para o período
 DocType: Journal Entry,Accounts Receivable,Contas a receber
 ,Supplier-Wise Sales Analytics,Leveranciers Wise Sales Analytics
 DocType: Address Template,This format is used if country specific format is not found,Este formato é usado se o formato específico país não é encontrado
 DocType: Custom Field,Custom,Personalizado
 DocType: Production Order,Use Multi-Level BOM,Utilize Multi-Level BOM
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +26,Injection molding,Moldagem por injeção
 DocType: Bank Reconciliation,Include Reconciled Entries,Incluir entradas Reconciliados
 apps/erpnext/erpnext/config/accounts.py +41,Tree of finanial accounts.,Árvore de contas financeiras.
 DocType: Leave Control Panel,Leave blank if considered for all employee types,Deixe em branco se considerado para todos os tipos de empregados
@@ -1697,30 +1637,28 @@
 apps/frappe/frappe/config/setup.py +130,Printing,Impressão
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +114,Expense Claim is pending approval. Only the Expense Approver can update status.,Declaratie is in afwachting van goedkeuring . Alleen de Expense Approver kan status bijwerken .
 DocType: Purchase Invoice,Additional Discount Amount,Montante desconto adicional
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +99,The day(s) on which you are applying for leave are holiday. You need not apply for leave.,No dia (s) em que você está se candidatando para a licença estão de férias. Você não precisa solicitar uma licença .
 apps/frappe/frappe/public/js/frappe/misc/utils.js +110,and,e
 DocType: Leave Block List Allow,Leave Block List Allow,Deixe Lista de Bloqueios Permitir
 apps/erpnext/erpnext/setup/doctype/company/company.py +236,Abbr can not be blank or space,Abbr não pode estar em branco ou espaço
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +50,Sports,esportes
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,esportes
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Actual,Total real
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Unit,unidade
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Unit,unidade
 apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.py +182,Please set Dropbox access keys in your site config,Defina teclas de acesso Dropbox em sua configuração local
 apps/erpnext/erpnext/stock/get_item_details.py +113,Please specify Company,"Por favor, especifique Empresa"
 ,Customer Acquisition and Loyalty,Klantenwerving en Loyalty
 DocType: Purchase Receipt,Warehouse where you are maintaining stock of rejected items,Armazém onde você está mantendo estoque de itens rejeitados
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +408,Your financial year ends on,Seu exercício termina em
+apps/erpnext/erpnext/public/js/setup_wizard.js +156,Your financial year ends on,Seu exercício termina em
 DocType: POS Profile,Price List,Lista de Preços
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +20,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,"{0} é agora o padrão Ano Fiscal. Por favor, atualize seu navegador para que a alteração tenha efeito."
 apps/erpnext/erpnext/projects/doctype/project/project.js +47,Expense Claims,Os relatórios de despesas
 DocType: Issue,Support,Apoiar
-DocType: Authorization Rule,Approving Role,Aprovar Responsabilidade
 ,BOM Search,BOM Pesquisa
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +176,Closing (Opening + Totals),Fechando (abertura + Totais)
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +26,Please specify currency in Company,"Por favor, especifique moeda in Company"
 DocType: Workstation,Wages per hour,Os salários por hora
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},Da balança em Batch {0} se tornará negativo {1} para item {2} no Armazém {3}
 apps/erpnext/erpnext/config/setup.py +83,"Show / Hide features like Serial Nos, POS etc.","Mostrar / Ocultar recursos como os números de ordem , POS , etc"
-apps/erpnext/erpnext/controllers/accounts_controller.py +236,Account {0} is invalid. Account Currency must be {1},Conta {0} é inválido. Conta de moeda deve ser {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +237,Account {0} is invalid. Account Currency must be {1},Conta {0} é inválido. Conta de moeda deve ser {1}
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +34,UOM Conversion factor is required in row {0},UOM fator de conversão é necessária na linha {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +53,Clearance date cannot be before check date in row {0},Apuramento data não pode ser anterior à data de verificação na linha {0}
 DocType: Salary Slip,Deduction,Dedução
@@ -1739,13 +1677,13 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +82,Item {0} has already been returned,Item {0} já foi devolvido
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** Ano Fiscal ** representa um exercício financeiro. Todos os lançamentos contábeis e outras transações principais são rastreadas contra ** Ano Fiscal **.
 DocType: Opportunity,Customer / Lead Address,Klant / Lead Adres
+apps/erpnext/erpnext/stock/doctype/item/item.py +112,Warning: Invalid SSL certificate on attachment {0},Aviso: certificado SSL inválido no anexo {0}
 DocType: Production Order Operation,Actual Operation Time,Actual Tempo Operação
 DocType: Authorization Rule,Applicable To (User),Para aplicável (Utilizador)
 DocType: Purchase Taxes and Charges,Deduct,Subtrair
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +170,Job Description,Descrição do trabalho
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +170,Job Description,Descrição do trabalho
 DocType: Purchase Order Item,Qty as per Stock UOM,Qtde como por Ação UOM
 apps/frappe/frappe/model/rename_doc.py +343,Please select a valid csv file with data,"Por favor, selecione um arquivo csv com dados válidos"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +92,Coating,Revestimento
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +126,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Caracteres especiais, exceto ""-"" ""."", ""#"", e ""/"" não é permitido em série nomeando"
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Mantenha o controle de campanhas de vendas. Mantenha o controle de Leads, cotações, Pedido de Vendas etc de Campanhas para medir retorno sobre o investimento. "
 DocType: Expense Claim,Approver,Aprovador
@@ -1755,12 +1693,11 @@
 DocType: Supplier Quotation,Manufacturing Manager,Gerente de Manufatura
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},Serial Não {0} está na garantia até {1}
 apps/erpnext/erpnext/config/stock.py +69,Split Delivery Note into packages.,Nota de Entrega dividir em pacotes.
-apps/erpnext/erpnext/hooks.py +84,Shipments,Os embarques
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +29,Dip molding,Moldagem Dip
+apps/erpnext/erpnext/hooks.py +68,Shipments,Os embarques
 DocType: Purchase Order,To be delivered to customer,Para ser entregue ao cliente
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,Tempo Log Estado devem ser apresentadas.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,O Serial No {0} não pertence a nenhum Warehouse
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +650,Setting Up,Configurando
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +114,Setting Up,Configurando
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,Row # ,Row #
 DocType: Purchase Invoice,In Words (Company Currency),In Words (Moeda Company)
 DocType: Pricing Rule,Supplier,Fornecedor
@@ -1768,7 +1705,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +105,Miscellaneous Expenses,Despesas Diversas
 DocType: Global Defaults,Default Company,Empresa padrão
 apps/erpnext/erpnext/controllers/stock_controller.py +166,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,Despesa ou Diferença conta é obrigatória para item {0} como ela afeta o valor das ações em geral
-apps/erpnext/erpnext/controllers/accounts_controller.py +354,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","Não é possível para overbill item {0} na linha {1} mais de {2}. Para permitir superfaturamento, por favor, defina em estoque Configurações"
+apps/erpnext/erpnext/controllers/accounts_controller.py +355,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","Não é possível para overbill item {0} na linha {1} mais de {2}. Para permitir superfaturamento, por favor, defina em estoque Configurações"
 DocType: Employee,Bank Name,Nome do banco
 apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +27,-Above,-Acima
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +135,User {0} is disabled,Utilizador {0} está desativado
@@ -1781,27 +1718,26 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,{0} is mandatory for Item {1},{0} é obrigatório para item {1}
 DocType: Currency Exchange,From Currency,De Moeda
 DocType: DocField,Name,Nome
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +211,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Por favor, selecione montante atribuído, tipo de fatura e número da fatura em pelo menos uma fileira"
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +104,Sales Order required for Item {0},Ordem de venda necessário para item {0}
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +158,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Por favor, selecione montante atribuído, tipo de fatura e número da fatura em pelo menos uma fileira"
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +107,Sales Order required for Item {0},Ordem de venda necessário para item {0}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +43,Amounts not reflected in system,Valores não reflete em sistema
 DocType: Purchase Invoice Item,Rate (Company Currency),Rate (moeda da empresa)
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +40,Others,outros
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +40,Others,outros
 apps/erpnext/erpnext/templates/includes/product_page.js +80,Cannot find a matching Item. Please select some other value for {0}.,"Não consegue encontrar um item correspondente. Por favor, selecione algum outro valor para {0}."
 DocType: POS Profile,Taxes and Charges,Impostos e Encargos
 DocType: Item,"A Product or a Service that is bought, sold or kept in stock.","Um produto ou serviço que é comprado, vendido ou mantido em 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,"Não é possível selecionar o tipo de carga como "" Valor Em linha anterior ' ou ' On Anterior Row Total ' para a primeira linha"
 apps/frappe/frappe/core/doctype/doctype/boilerplate/controller_list.html +31,Completed,Concluído
 DocType: Web Form,Select DocType,Selecione DocType
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +104,Broaching,Brochar
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +12,Banking,bancário
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,bancário
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +38,Please click on 'Generate Schedule' to get schedule,"Por favor, clique em "" Gerar Agenda "" para obter cronograma"
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +283,New Cost Center,Novo Centro de Custo
 DocType: Bin,Ordered Quantity,Quantidade pedida
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +397,"e.g. ""Build tools for builders""","Ex: ""Ferramentas de construção para construtores """
+apps/erpnext/erpnext/public/js/setup_wizard.js +145,"e.g. ""Build tools for builders""","Ex: ""Ferramentas de construção para construtores """
 DocType: Quality Inspection,In Process,Em Processo
 DocType: Authorization Rule,Itemwise Discount,Desconto Itemwise
 DocType: Purchase Order Item,Reference Document Type,Referência Tipo de Documento
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +318,{0} against Sales Order {1},{0} contra a Ordem de Vendas {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +320,{0} against Sales Order {1},{0} contra a Ordem de Vendas {1}
 DocType: Account,Fixed Asset,Activos Fixos
 apps/erpnext/erpnext/config/stock.py +283,Serialized Inventory,Inventário Serialized
 DocType: Activity Type,Default Billing Rate,Faturamento Taxa de Inadimplência
@@ -1816,14 +1752,13 @@
 DocType: Purchase Invoice Item,Page Break,Quebra de página
 DocType: Production Order Operation,Pending,Pendente
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,Usuários que podem aprovar pedidos de licença de um funcionário específico
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +33,You cannot change default UOM of Variant. To change default UOM for Variant change default UOM of the Template,Você não pode mudar UOM padrão de Variant. Para alterar UOM padrão para Variant UOM mudança padrão do modelo
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +50,Office Equipments,Equipamentos de escritório
 DocType: Purchase Invoice Item,Qty,Qty
 DocType: Fiscal Year,Companies,Empresas
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +24,Electronics,eletrônica
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +24,Electronics,eletrônica
 DocType: Stock Settings,Raise Material Request when stock reaches re-order level,Levante solicitar material quando o estoque atinge novo pedido de nível
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +18,From Maintenance Schedule,Da Manutenção Agendada
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +56,Full-time,De tempo integral
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +56,Full-time,De tempo integral
 DocType: Purchase Invoice,Contact Details,Contacto
 DocType: C-Form,Received Date,Data de recebimento
 DocType: Delivery Note,"If you have created a standard template in Sales Taxes and Charges Template, select one and click on the button below.","Se você criou um modelo padrão de Impostos e Taxas de Vendas Modelo, selecione um e clique no botão abaixo."
@@ -1835,11 +1770,12 @@
 DocType: Job Applicant,Job Opening,Oferta de emprego
 DocType: Payment Reconciliation,Payment Reconciliation,Reconciliação Pagamento
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +154,Please select Incharge Person's name,"Por favor, selecione o nome do Incharge Pessoa"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +51,Technology,tecnologia
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,tecnologia
 DocType: Offer Letter,Offer Letter,Oferecer Letter
 apps/erpnext/erpnext/config/manufacturing.py +51,Generate Material Requests (MRP) and Production Orders.,Gerar Pedidos de Materiais (MRP) e Ordens de Produção.
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +68,Total Invoiced Amt,Total facturado Amt
 DocType: Time Log,To Time,Para Tempo
+DocType: Authorization Rule,Approving Role (above authorized value),Aprovando Papel (acima do valor autorizado)
 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.","Om onderliggende nodes te voegen , te verkennen boom en klik op het knooppunt waar u wilt meer knooppunten toe te voegen ."
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +102,Credit To account must be a Payable account,Crédito em conta deve ser uma conta a pagar
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +233,BOM recursion: {0} cannot be parent or child of {2},BOM recursão: {0} não pode ser pai ou filho de {2}
@@ -1852,10 +1788,8 @@
 DocType: Item,Customer Item Codes,Item de cliente Códigos
 DocType: Opportunity,Lost Reason,Razão perdido
 apps/erpnext/erpnext/config/accounts.py +68,Create Payment Entries against Orders or Invoices.,Criar entradas de pagamento contra as ordens ou Faturas.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +141,Welding,Soldadura
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +40,New Stock UOM is required,Novo stock UOM é necessária
 DocType: Quality Inspection,Sample Size,Tamanho da amostra
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +443,All items have already been invoiced,Todos os itens já foram faturados
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +446,All items have already been invoiced,Todos os itens já foram faturados
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',"Por favor, especifique um válido &#39;De Caso No.&#39;"
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +287,Further cost centers can be made under Groups but entries can be made against non-Groups,"Mais centros de custo podem ser feitas em grupos, mas as entradas podem ser feitas contra os não-Groups"
 DocType: Project,External,Externo
@@ -1867,8 +1801,7 @@
 DocType: Bin,Actual Quantity,Quantidade Atual
 DocType: Shipping Rule,example: Next Day Shipping,exemplo: Next Day envio
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,Serial No {0} não foi encontrado
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +563,Your Customers,Os seus Clientes
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +27,Compression molding,Moldagem por compressão
+apps/erpnext/erpnext/public/js/setup_wizard.js +303,Your Customers,Os seus Clientes
 DocType: Leave Block List Date,Block Date,Bloquear Data
 DocType: Sales Order,Not Delivered,Não entregue
 ,Bank Clearance Summary,Banco Resumo Clearance
@@ -1889,10 +1822,10 @@
 DocType: SMS Log,Sent To,Enviado Para
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +28,Make Sales Invoice,Maak verkoopfactuur
 DocType: Company,For Reference Only.,Apenas para referência.
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +29,Invalid {0}: {1},Inválido {0}: {1}
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +49,Invalid {0}: {1},Inválido {0}: {1}
 DocType: Sales Invoice Advance,Advance Amount,Quantidade Adiantada
 DocType: Manufacturing Settings,Capacity Planning,Planejamento de capacidade
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +49,'From Date' is required,'Data de' é necessário
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +43,'From Date' is required,'Data de' é necessário
 DocType: Journal Entry,Reference Number,Número de Referência
 DocType: Employee,Employment Details,Detalhes de emprego
 DocType: Employee,New Workplace,Novo local de trabalho
@@ -1907,7 +1840,7 @@
 DocType: Serial No,Delivery Time,Prazo de entrega
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Antiguidade Baseado em
 DocType: Item,End of Life,Fim da Vida
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +41,Travel,viagem
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +41,Travel,viagem
 DocType: Leave Block List,Allow Users,Permitir utilizadores
 DocType: Purchase Order,Customer Mobile No,Cliente Móvel Nenhum
 DocType: Sales Invoice,Recurring,Recorrente
@@ -1921,7 +1854,7 @@
 DocType: Naming Series,User must always select,O usuário deve sempre escolher
 DocType: Stock Settings,Allow Negative Stock,Permitir stock negativo
 DocType: Installation Note,Installation Note,Nota de Instalação
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +541,Add Taxes,Adicionar impostos
+apps/erpnext/erpnext/public/js/setup_wizard.js +283,Add Taxes,Adicionar impostos
 ,Financial Analytics,Análise Financeira
 DocType: Quality Inspection,Verified By,Verificado Por
 DocType: Address,Subsidiary,Subsidiário
@@ -1931,7 +1864,6 @@
 DocType: System Settings,In Hours,Em Horas
 DocType: Process Payroll,Create Salary Slip,Criar folha de salário
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Expected balance as per bank,Equilíbrio esperado como por banco
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +115,Buffing,Buffing
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Source of Funds (Liabilities),Fonte de Recursos ( Passivo)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +347,Quantity in row {0} ({1}) must be same as manufactured quantity {2},Quantidade em linha {0} ( {1} ) deve ser a mesma quantidade fabricada {2}
 DocType: Appraisal,Employee,Empregado
@@ -1948,11 +1880,11 @@
 DocType: Rename Tool,File to Rename,Arquivo para renomear
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +176,Purchse Order number required for Item {0},Número de pedido purchse necessário para item {0}
 apps/erpnext/erpnext/public/js/controllers/transaction.js +136,Show Payments,Mostrar Pagamentos
-apps/erpnext/erpnext/controllers/buying_controller.py +245,Specified BOM {0} does not exist for Item {1},Especificada BOM {0} não existe para item {1}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +202,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Programação de manutenção {0} deve ser cancelado antes de cancelar esta ordem de venda
+apps/erpnext/erpnext/controllers/buying_controller.py +236,Specified BOM {0} does not exist for Item {1},Especificada BOM {0} não existe para item {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Programação de manutenção {0} deve ser cancelado antes de cancelar esta ordem de venda
 apps/frappe/frappe/desk/page/backups/backups.html +13,Size,Tamanho
 DocType: Notification Control,Expense Claim Approved,Relatório de Despesas Aprovado
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +113,Pharmaceutical,farmacêutico
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Pharmaceutical,farmacêutico
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,Custo de itens comprados
 DocType: Selling Settings,Sales Order Required,Ordem vendas Obrigatório
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +30,Create Customer,Maak de klant
@@ -1962,7 +1894,6 @@
 DocType: Quality Inspection Reading,Reading 9,Leitura 9
 DocType: Supplier,Is Frozen,Está Congelado
 DocType: Buying Settings,Buying Settings,Comprar Configurações
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +122,Mass finishing,Acabamento em massa
 DocType: Stock Entry Detail,BOM No. for a Finished Good Item,BOM Não. para um item acabado
 DocType: Upload Attendance,Attendance To Date,Atendimento para a data
 apps/erpnext/erpnext/config/selling.py +158,Setup incoming server for sales email id. (e.g. sales@example.com),Configuração do servidor de entrada de e-mail id vendas. ( por exemplo sales@example.com )
@@ -1970,7 +1901,7 @@
 DocType: Payment Tool,Payment Account,Conta de Pagamento
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +713,Please specify Company to proceed,"Por favor, especifique Empresa proceder"
 apps/frappe/frappe/public/js/frappe/model/indicator.js +30,Draft,Rascunho
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +46,Compensatory Off,compensatória Off
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Compensatory Off,compensatória Off
 DocType: Quality Inspection Reading,Accepted,Aceite
 DocType: User,Female,Feminino
 DocType: Journal Entry Account,Debit in Account Currency,Débito em Conta de moeda
@@ -1982,7 +1913,7 @@
 DocType: Shipping Rule,Shipping Rule Label,Regra envio Rótulo
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +209,Raw Materials cannot be blank.,Matérias-primas não pode ficar em branco.
 DocType: Newsletter,Test,Teste
-apps/erpnext/erpnext/stock/doctype/item/item.py +364,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +368,"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'","Como existem transações com ações existentes para este item, \ não é possível alterar os valores de &#39;não tem Serial&#39;, &#39;Tem Lote n&#39;, &#39;é Stock item &quot;e&quot; Método de avaliação&#39;"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +448,Quick Journal Entry,Breve Journal Entry
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +92,You can not change rate if BOM mentioned agianst any item,U kunt geen koers veranderen als BOM agianst een item genoemd
@@ -1993,13 +1924,14 @@
 apps/erpnext/erpnext/config/stock.py +18,Requests for items.,Os pedidos de itens.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,Ordem de produção separado será criado para cada item acabado.
 DocType: Purchase Invoice,Terms and Conditions1,Termos e Conditions1
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +18,Complete Setup,Instalação concluída
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard_page.html +18,Complete Setup,Instalação concluída
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","Registo contábil congelado até à presente data, ninguém pode fazer / modificar entrada exceto para as funções especificadas abaixo."
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +121,Please save the document before generating maintenance schedule,Bewaar het document voordat het genereren van onderhoudsschema
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,Status do Projeto
 DocType: UOM,Check this to disallow fractions. (for Nos),Marque esta opção para não permitir frações. (Para n)
 apps/erpnext/erpnext/config/crm.py +96,Newsletter Mailing List,Mailing List Boletim informativo
 DocType: Delivery Note,Transporter Name,Nome Transporter
+DocType: Authorization Rule,Authorized Value,Valor Autorizado
 DocType: Contact,Enter department to which this Contact belongs,Entre com o departamento a que pertence este contato
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Absent,Total de Absent
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +746,Item or Warehouse for row {0} does not match Material Request,Item ou Armazém para linha {0} não corresponde Pedido de materiais
@@ -2024,16 +1956,15 @@
 DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),Taxa básica (de acordo da UOM)
 DocType: SMS Log,No of Requested SMS,No pedido de SMS
 DocType: Campaign,Campaign-.####,Campanha - . # # # #
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +55,Piercing,Perfurante
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,Próximos passos
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +117,Contract End Date must be greater than Date of Joining,Data Contrato Final deve ser maior que Data de Participar
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,Um distribuidor de terceiros / revendedor / comissão do agente / filial / revendedor que vende os produtos de empresas de uma comissão.
 DocType: Customer Group,Has Child Node,Tem nó filho
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{0} against Purchase Order {1},{0} contra a Ordem de Compra {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +332,{0} against Purchase Order {1},{0} contra a Ordem de Compra {1}
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","Digite os parâmetros URL estática aqui (por exemplo remetente = ERPNext, username = ERPNext, password = 1234, etc)"
 apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,{0} {1} não em qualquer ano fiscal ativa. Para mais detalhes consulte {2}.
-apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,Este é um exemplo website auto- gerada a partir ERPNext
+apps/erpnext/erpnext/setup/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,Este é um exemplo website auto- gerada a partir ERPNext
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +37,Ageing Range 1,Faixa Envelhecimento 1
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +110,Photochemical machining,Usinagem fotoquímica
 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.
 
 #### Note
@@ -2079,7 +2010,7 @@
 DocType: Purchase Receipt Item,Recd Quantity,Quantidade RECD
 DocType: Email Account,Email Ids,Email Ids
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},Não é possível produzir mais item {0} do que a quantidade Ordem de Vendas {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +471,Stock Entry {0} is not submitted,Da entrada {0} não é apresentado
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +473,Stock Entry {0} is not submitted,Da entrada {0} não é apresentado
 DocType: Payment Reconciliation,Bank / Cash Account,Banco / Conta Caixa
 DocType: Tax Rule,Billing City,Faturamento Cidade
 DocType: Global Defaults,Hide Currency Symbol,Ocultar Símbolo de Moeda
@@ -2095,7 +2026,7 @@
 DocType: Purchase Invoice,Currency and Price List,Moeda e Lista de Preço
 DocType: Opportunity,Customer / Lead Name,Cliente / Nome de chumbo
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +63,Clearance Date not mentioned,Apuramento data não mencionada
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +71,Production,produção
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Production,produção
 DocType: Item,Allow Production Order,Permitir Ordem de Produção
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +60,Row {0}:Start Date must be before End Date,Row {0}: Data de início deve ser anterior a data de término
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Total (Qtde)
@@ -2108,7 +2039,7 @@
 apps/erpnext/erpnext/utilities/doctype/address/address.py +113,My Addresses,Os meus endereços
 DocType: Stock Ledger Entry,Outgoing Rate,Taxa de saída
 apps/erpnext/erpnext/config/hr.py +100,Organization branch master.,Mestre Organização ramo .
-apps/erpnext/erpnext/controllers/accounts_controller.py +237, or ,ou
+apps/erpnext/erpnext/controllers/accounts_controller.py +238, or ,ou
 DocType: Sales Order,Billing Status,Estado de faturamento
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Utility Expenses,Despesas de Utilidade
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,90-Above,Acima de 90
@@ -2135,6 +2066,7 @@
 DocType: Stock Entry Detail,Serial No / Batch,Serienummer / Batch
 DocType: Product Bundle,Parent Item,Item Pai
 DocType: Account,Account Type,Tipo de conta
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +113,Leave Type {0} cannot be carry-forwarded,Deixe tipo {0} não pode ser encaminhado carry-
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +213,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',"Programação de manutenção não é gerado para todos os itens. Por favor, clique em "" Gerar Agenda '"
 ,To Produce,Produce
 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","Para linha {0} em {1}. Para incluir {2} na taxa de Item, linhas {3} também devem ser incluídos"
@@ -2142,10 +2074,7 @@
 DocType: Bin,Reserved Quantity,Quantidade reservados
 DocType: Landed Cost Voucher,Purchase Receipt Items,Comprar Itens Recibo
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,Formas de personalização
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +62,Cutting,Corte
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +69,Flattening,Achatamento
 DocType: Account,Income Account,Conta Renda
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +22,Molding,Modelagem
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +632,Delivery,Entrega
 DocType: Stock Reconciliation Item,Current Qty,Qtde atual
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",Consulte &quot;taxa de materiais baseados em&quot; no Custeio Seção
@@ -2155,20 +2084,19 @@
 apps/frappe/frappe/desk/moduleview.py +61,Documents,Documentos
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +17,Ref,Ref
 DocType: Cost Center,Cost Center,Centro de Custos
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.js +48,Voucher #,voucher #
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +36,Voucher #,voucher #
 DocType: Notification Control,Purchase Order Message,Mensagem comprar Ordem
 DocType: Tax Rule,Shipping Country,O envio País
 DocType: Upload Attendance,Upload HTML,Carregar HTML
-apps/erpnext/erpnext/controllers/accounts_controller.py +391,"Total advance ({0}) against Order {1} cannot be greater \
+apps/erpnext/erpnext/controllers/accounts_controller.py +392,"Total advance ({0}) against Order {1} cannot be greater \
 				than the Grand Total ({2})","Antecedência Total ({0}) contra a Ordem {1} não pode ser maior do que o Grand \
  Total ({2})"
 DocType: Employee,Relieving Date,Aliviar Data
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +12,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.","Regra de preços é feita para substituir Lista de Preços / define percentual de desconto, com base em alguns critérios."
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,Magazijn kan alleen via Stock Entry / Delivery Note / Kwitantie worden veranderd
 DocType: Employee Education,Class / Percentage,Classe / Percentual
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +92,Head of Marketing and Sales,Diretor de Marketing e Vendas
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +31,Income Tax,Imposto de Renda
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +157,Laser engineered net shaping,Laser engenharia shaping net
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Head of Marketing and Sales,Diretor de Marketing e Vendas
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +31,Income Tax,Imposto de Renda
 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.","Se regra de preços selecionado é feita por 'preço', ele irá substituir Lista de Preços. Preço regra de preço é o preço final, de forma que nenhum desconto adicional deve ser aplicada. Assim, em operações como a Ordem de Vendas, Ordem de Compra etc, será buscado no campo ""taxa"", ao invés de campo ""Lista de Preços Rate '."
 apps/erpnext/erpnext/config/selling.py +163,Track Leads by Industry Type.,Trilha leva por setor Type.
 DocType: Item Supplier,Item Supplier,Fornecedor item
@@ -2191,31 +2119,28 @@
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Qtde atual após a transação
 ,Pending SO Items For Purchase Request,"Itens Pendentes Assim, por solicitação de compra"
 DocType: Supplier,Billing Currency,Faturamento Moeda
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +148,Extra Large,Extra-grande
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,Extra Large,Extra-grande
 ,Profit and Loss Statement,Demonstração dos Resultados
 DocType: Bank Reconciliation Detail,Cheque Number,Número de cheques
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +43,Pressing,Premente
 DocType: Payment Tool Detail,Payment Tool Detail,Detalhe ferramenta de pagamento
 ,Sales Browser,Navegador Vendas
 DocType: Journal Entry,Total Credit,Crédito Total
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +474,Warning: Another {0} # {1} exists against stock entry {2},Aviso: Outra {0} # {1} existe contra entrada de material {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +459,Local,local
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +476,Warning: Another {0} # {1} exists against stock entry {2},Aviso: Outra {0} # {1} existe contra entrada de material {2}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +397,Local,local
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),Empréstimos e Adiantamentos (Ativo )
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,Devedores
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +147,Large,Grande
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +23,No employee found!,Nenhum funcionário encontrado!
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Large,Grande
 DocType: C-Form Invoice Detail,Territory,Território
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,"Por favor, não mencione de visitas necessárias"
 DocType: Purchase Order,Customer Address Display,Exibir endereço do cliente
 DocType: Stock Settings,Default Valuation Method,Método de Avaliação padrão
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +127,Polishing,Polimento
 DocType: Production Order Operation,Planned Start Time,Planned Start Time
 apps/erpnext/erpnext/config/accounts.py +63,Close Balance Sheet and book Profit or Loss.,Sluiten Balans en boek Winst of verlies .
-apps/erpnext/erpnext/stock/doctype/item/item.py +661,"Default Unit of Measure for Item {0} cannot be changed directly because \
+apps/erpnext/erpnext/stock/doctype/item/item.py +665,"Default Unit of Measure for Item {0} cannot be changed directly because \
 			you have already made some transaction(s) with another UOM. To change default UOM, \
 			use 'UOM Replace Utility' tool under Stock module.","Unidade de medida padrão para item {0} não pode ser alterado diretamente porque \ você já fez alguma transação (s) com outro UOM. Para alterar UOM padrão, \ uso &#39;UOM Substitua Utility &quot;ferramenta abaixo Stock módulo."
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,Especifique Taxa de Câmbio para converter uma moeda em outra
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +146,Quotation {0} is cancelled,Cotação {0} é cancelada
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +141,Quotation {0} is cancelled,Cotação {0} é cancelada
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,Montante total em dívida
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} was on leave on {1}. Cannot mark attendance.,Empregado {0} estava de licença em {1} . Não pode marcar presença.
 DocType: Sales Partner,Targets,Metas
@@ -2226,7 +2151,6 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +158,Please create Customer from Lead {0},"Por favor, crie Cliente de chumbo {0}"
 DocType: Price List,Applicable for Countries,Aplicável para os Países
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Computers,informática
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +112,Electro-chemical grinding,Electro-química de moagem
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +14,This is a root customer group and cannot be edited.,Dit is een wortel klantgroep en kan niet worden bewerkt .
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +39,Please setup your chart of accounts before you start Accounting Entries,"Por favor, configure o seu plano de contas antes de começar a fazer lançamentos contabilísticos"
 DocType: Purchase Invoice,Ignore Pricing Rule,Ignorar regra de preços
@@ -2284,7 +2208,6 @@
 DocType: Maintenance Visit,Purposes,Fins
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +103,Atleast one item should be entered with negative quantity in return document,Pelo menos um item deve ser inserido com quantidade negativa no documento de devolução
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +67,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","Operação {0} mais do que as horas de trabalho disponíveis na estação de trabalho {1}, quebrar a operação em várias operações"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +134,Electrochemical machining,Maquinagem electroquimica
 ,Requested,gevraagd
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +66,No Remarks,Não Observações
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +13,Overdue,Vencido
@@ -2293,7 +2216,7 @@
 DocType: Monthly Distribution,Distribution Name,Nome de distribuição
 DocType: Features Setup,Sales and Purchase,Vendas e Compras
 DocType: Supplier Quotation Item,Material Request No,Pedido de material no
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +218,Quality Inspection required for Item {0},Inspeção de Qualidade exigido para item {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +221,Quality Inspection required for Item {0},Inspeção de Qualidade exigido para item {0}
 DocType: Quotation,Rate at which customer's currency is converted to company's base currency,Taxa na qual a moeda do cliente é convertido para a moeda da empresa de base
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +107,{0} has been successfully unsubscribed from this list.,{0} foi retirado com sucesso a partir desta lista.
 DocType: Purchase Invoice Item,Net Rate (Company Currency),Taxa Líquida (Companhia de moeda)
@@ -2311,9 +2234,8 @@
 apps/erpnext/erpnext/accounts/report/financial_statements.py +16,Fiscal Year {0} not found.,Ano Fiscal {0} não foi encontrado.
 DocType: Bank Reconciliation,Get Relevant Entries,Obter entradas relevantes
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +407,Accounting Entry for Stock,Entrada de Contabilidade da
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +64,Coining,Cunhagem
 DocType: Sales Invoice,Sales Team1,Vendas team1
-apps/erpnext/erpnext/stock/doctype/item/item.py +412,Item {0} does not exist,Item {0} não existe
+apps/erpnext/erpnext/stock/doctype/item/item.py +416,Item {0} does not exist,Item {0} não existe
 DocType: Sales Invoice,Customer Address,Endereço do cliente
 apps/frappe/frappe/desk/query_report.py +136,Total,Total
 DocType: Purchase Invoice,Apply Additional Discount On,Aplicar desconto adicional em
@@ -2325,14 +2247,13 @@
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),Valor do imposto Valor Depois de desconto (Companhia de moeda)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +149,Target warehouse is mandatory for row {0},Destino do Warehouse é obrigatória para a linha {0}
 DocType: Quality Inspection,Quality Inspection,Inspeção de Qualidade
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +144,Extra Small,Muito Pequeno
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +20,Spray forming,Spray de formação
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Extra Small,Muito Pequeno
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +458,Warning: Material Requested Qty is less than Minimum Order Qty,Waarschuwing : Materiaal gevraagde Aantal minder dan Minimum afname
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +191,Account {0} is frozen,Conta {0} está congelada
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Entidade Legal / Subsidiária com um gráfico separado de Contas pertencente à Organização.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +29,"Food, Beverage & Tobacco","Alimentos, Bebidas e Tabaco"
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","Alimentos, Bebidas e Tabaco"
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +20,PL or BS,PL of BS
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,Can only make payment against unbilled {0},Só pode fazer o pagamento contra a faturar {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +531,Can only make payment against unbilled {0},Só pode fazer o pagamento contra a faturar {0}
 apps/erpnext/erpnext/controllers/selling_controller.py +122,Commission rate cannot be greater than 100,Taxa de comissão não pode ser maior do que 100
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Minimum Inventory Level,Nível Mínimo Inventory
 DocType: Stock Entry,Subcontract,Subcontratar
@@ -2343,19 +2264,18 @@
 DocType: Item,Manufacturer Part Number,Número da peça de fabricante
 DocType: Production Order Operation,Estimated Time and Cost,Tempo estimado e Custo
 DocType: Bin,Bin,Caixa
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +50,Nosing,Astrágalo
 DocType: SMS Log,No of Sent SMS,N º de SMS enviados
 DocType: Account,Company,Companhia
 DocType: Account,Expense Account,Conta Despesa
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +49,Software,Software
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +151,Colour,Cor
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +49,Software,Software
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Colour,Cor
 DocType: Maintenance Visit,Scheduled,Programado
 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","Por favor, selecione o item em que &quot;é o estoque item&quot; é &quot;Não&quot; e &quot;é o item Vendas&quot; é &quot;Sim&quot; e não há nenhum outro pacote de produtos"
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,Selecione distribuição mensal para distribuir desigualmente alvos através meses.
 DocType: Purchase Invoice Item,Valuation Rate,Taxa de valorização
 apps/erpnext/erpnext/stock/get_item_details.py +281,Price List Currency not selected,Não foi indicada uma Moeda para a Lista de Preços
 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,Row item {0}: Recibo de compra {1} não existe em cima da tabela 'recibos de compra'
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +134,Employee {0} has already applied for {1} between {2} and {3},Empregado {0} já solicitou {1} {2} entre e {3}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +145,Employee {0} has already applied for {1} between {2} and {3},Empregado {0} já solicitou {1} {2} entre e {3}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Data de início do projeto
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +8,Until,Até
 DocType: Rename Tool,Rename Log,Renomeie Entrar
@@ -2365,7 +2285,7 @@
 apps/erpnext/erpnext/controllers/recurring_document.py +162,Please select {0},Por favor seleccione {0}
 DocType: C-Form,C-Form No,C-Forma Não
 DocType: BOM,Exploded_items,Exploded_items
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +95,Researcher,investigador
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Researcher,investigador
 apps/frappe/frappe/custom/doctype/customize_form/customize_form.js +88,Update,Atualizar
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +78,Please save the Newsletter before sending,"Por favor, salve o Boletim informativo antes de enviar"
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +23,Name or Email is mandatory,Nome ou E-mail é obrigatório
@@ -2374,11 +2294,10 @@
 DocType: Employee,Exit,Sair
 apps/erpnext/erpnext/accounts/doctype/account/account.py +134,Root Type is mandatory,Tipo de Raiz é obrigatório
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +295,Serial No {0} created,Serial Não {0} criado
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +125,Vibratory finishing,Vibroacabamento
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","Para a comodidade dos clientes, estes códigos podem ser usados ​​em formatos de impressão, como facturas e guias de entrega"
 DocType: Employee,You can enter any date manually,Você pode entrar em qualquer data manualmente
 DocType: Sales Invoice,Advertisement,Anúncio
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +165,Probationary Period,Período Probatório
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Probationary Period,Período Probatório
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Nós folha apenas são permitidos em operação
 DocType: Expense Claim,Expense Approver,Despesa Approver
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,Recibo de compra do item em actualização
@@ -2386,19 +2305,16 @@
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +17,To Datetime,Para Datetime
 DocType: SMS Settings,SMS Gateway URL,SMS Gateway de URL
 apps/erpnext/erpnext/config/crm.py +53,Logs for maintaining sms delivery status,Logs para a manutenção de status de entrega sms
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +137,Grinding,Moagem
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +34,Shrink wrapping,Retráctil
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +36,Pending Activities,Atividades pendentes
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,Confirmed,Confirmado
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier > Supplier Type,Fornecedor> Fornecedor Tipo
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +127,Please enter relieving date.,"Por favor, indique data alívio ."
 apps/erpnext/erpnext/controllers/trends.py +137,Amt,Amt
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' can be submitted,"Só Deixar Aplicações com status ""Aprovado"" podem ser submetidos"
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +51,Only Leave Applications with status 'Approved' can be submitted,"Só Deixar Aplicações com status ""Aprovado"" podem ser submetidos"
 apps/erpnext/erpnext/utilities/doctype/address/address.py +21,Address Title is mandatory.,O título do Endereço é obrigatório.
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,Digite o nome da campanha se fonte de pesquisa é a campanha
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +38,Newspaper Publishers,Editores de Jornais
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +38,Newspaper Publishers,Editores de Jornais
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,Selecione Ano Fiscal
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +88,Smelting,Smelting
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Reordenar Nível
 DocType: Attendance,Attendance Date,Data de atendimento
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,Separação Salário com base em salário e dedução.
@@ -2413,16 +2329,15 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +414,[Error],[Erro]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,Em Palavras será visível quando você salvar a Ordem de Vendas.
 ,Employee Birthday,Aniversário empregado
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +55,Venture Capital,Capital de Risco
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,Capital de Risco
 DocType: UOM,Must be Whole Number,Deve ser Número inteiro
 DocType: Leave Control Panel,New Leaves Allocated (In Days),Folhas novas atribuído (em dias)
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +51,Serial No {0} does not exist,Serial Não {0} não existe
 DocType: Pricing Rule,Discount Percentage,Percentagem de Desconto
 DocType: Payment Reconciliation Invoice,Invoice Number,Número da fatura
-apps/erpnext/erpnext/hooks.py +70,Orders,Encomendas
+apps/erpnext/erpnext/hooks.py +54,Orders,Encomendas
 DocType: Leave Control Panel,Employee Type,Tipo de empregado
 DocType: Employee Leave Approver,Leave Approver,Deixe Aprovador
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +70,Swaging,Deformação
 DocType: Manufacturing Settings,Material Transferred for Manufacture,Material transferido para Fabricação
 DocType: Expense Claim,"A user with ""Expense Approver"" role","Um utilizador com responsabilidade de ""Aprovar Despesas"""
 ,Issued Items Against Production Order,Itens emitida contra Ordem de Produção
@@ -2434,7 +2349,6 @@
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +62,Cost Center with existing transactions can not be converted to group,Centro de custo com as operações existentes não podem ser convertidos em grupo
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Depreciation,depreciação
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Fornecedor (s)
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +29,Invalid period,Período inválido
 DocType: Customer,Credit Limit,Limite de Crédito
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,Selecione o tipo de transação
 DocType: GL Entry,Voucher No,Vale No.
@@ -2444,9 +2358,9 @@
 DocType: Customer,Address and Contact,Endereço e Contato
 DocType: Customer,Last Day of the Next Month,Último dia do mês seguinte
 DocType: Employee,Feedback,Comentários
+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}","Deixe não pode ser alocado antes {0}, como saldo licença já tenha sido no futuro recorde alocação licença encaminhadas-carry {1}"
 apps/erpnext/erpnext/accounts/party.py +284,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Nota: Devido / Reference Data excede dias de crédito de clientes permitidos por {0} dia (s)
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +621,Maint. Schedule,Manut. Cronograma
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +108,Abrasive jet machining,Usinagem jato abrasivo
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +632,Maint. Schedule,Manut. Cronograma
 DocType: Stock Settings,Freeze Stock Entries,Congelar da Entries
 DocType: Website Settings,Website Settings,Configurações do site
 DocType: Item,Reorder level based on Warehouse,Nível de reabastecimento baseado em Armazém
@@ -2463,7 +2377,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +75,Show Stock Entries,Mostrar Banco de Entradas
 ,Is Primary Address,É primário Endereço
 DocType: Production Order,Work-in-Progress Warehouse,Armazém Work-in-Progress
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +308,Reference #{0} dated {1},Referência # {0} {1} datado
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Reference #{0} dated {1},Referência # {0} {1} datado
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +13,Manage Addresses,Gerenciar endereços
 DocType: Pricing Rule,Item Code,Código do artigo
 DocType: Production Planning Tool,Create Production Orders,Criar ordens de produção
@@ -2472,7 +2386,7 @@
 DocType: Lead,Market Segment,Segmento de mercado
 DocType: Communication,Phone,Telefone
 DocType: Employee Internal Work History,Employee Internal Work History,Empregado História Trabalho Interno
-apps/erpnext/erpnext/public/js/account_tree_grid.js +50,Closing (Dr),Fechamento (Dr)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +221,Closing (Dr),Fechamento (Dr)
 DocType: Contact,Passive,Passiva
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,Serial Não {0} não em estoque
 apps/erpnext/erpnext/config/selling.py +127,Tax template for selling transactions.,Modelo imposto pela venda de transações.
@@ -2488,8 +2402,8 @@
 ,Billed Amount,gefactureerde bedrag
 DocType: Bank Reconciliation,Bank Reconciliation,Banco Reconciliação
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +9,Get Updates,Obter atualizações
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +129,Material Request {0} is cancelled or stopped,Pedido de material {0} é cancelado ou interrompido
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +641,Add a few sample records,Adicione alguns registros de exemplo
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +133,Material Request {0} is cancelled or stopped,Pedido de material {0} é cancelado ou interrompido
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Add a few sample records,Adicione alguns registros de exemplo
 apps/erpnext/erpnext/config/hr.py +210,Leave Management,Deixar de Gestão
 DocType: Event,Groups,Grupos
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,Grupo por Conta
@@ -2502,38 +2416,34 @@
 DocType: Features Setup,Sales Extras,Extras de vendas
 apps/erpnext/erpnext/accounts/utils.py +344,{0} budget for Account {1} against Cost Center {2} will exceed by {3},{0} orçamento para conta {1} contra Centro de Custo {2} excederá por {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +236,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Conta diferença deve ser uma conta de tipo ativo / passivo, uma vez que este da reconciliação é uma entrada de Abertura"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +138,Purchase Order number required for Item {0},Número do pedido requerido para item {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Order number required for Item {0},Número do pedido requerido para item {0}
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date','A Data de ' deve ser depois de ' Para Data '
 ,Stock Projected Qty,Verwachte voorraad Aantal
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +147,Customer {0} does not belong to project {1},Cliente {0} não pertence ao projeto {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +150,Customer {0} does not belong to project {1},Cliente {0} não pertence ao projeto {1}
 DocType: Sales Order,Customer's Purchase Order,Ordem de Compra do Cliente
 DocType: Warranty Claim,From Company,Da Empresa
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,Valor ou Quantidade
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Minute,minuto
+apps/erpnext/erpnext/public/js/setup_wizard.js +363,Minute,minuto
 DocType: Purchase Invoice,Purchase Taxes and Charges,Impostos e Encargos de compra
 ,Qty to Receive,Aantal te ontvangen
 DocType: Leave Block List,Leave Block List Allowed,Deixe Lista de Bloqueios admitidos
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +61,Conversion factor cannot be in fractions,Fator de conversão não pode estar em frações
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +358,You will use it to Login,Você vai usá-lo para o Login
+apps/erpnext/erpnext/public/js/setup_wizard.js +108,You will use it to Login,Você vai usá-lo para o Login
 DocType: Sales Partner,Retailer,Varejista
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +99,Credit To account must be a Balance Sheet account,Para crédito de conta deve ser uma conta de Balanço
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,Todos os tipos de fornecedores
 apps/erpnext/erpnext/stock/doctype/item/item.py +37,Item Code is mandatory because Item is not automatically numbered,Código do item é obrigatório porque Item não é numerada automaticamente
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +99,Quotation {0} not of type {1},Cotação {0} não é do tipo {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +93,Quotation {0} not of type {1},Cotação {0} não é do tipo {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,Item Programa de Manutenção
 DocType: Sales Order,%  Delivered,% Entregue
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,Bank Overdraft Account,Conta Garantida Banco
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +15,Make Salary Slip,Maak loonstrook
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +18,Browse BOM,Navegar BOM
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +175,Secured Loans,Empréstimos garantidos
-apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +3,Awesome Products,produtos impressionantes
+apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +3,Awesome Products,produtos impressionantes
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +189,Opening Balance Equity,Abertura Patrimônio Balance
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +80,Cannot approve leave as you are not authorized to approve leaves on Block Dates,Não foi possível aprovar a licença que você não está autorizado a aprovar folhas em datas Bloco
 DocType: Appraisal,Appraisal,Avaliação
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +13,Lost-foam casting,De fundição de espuma perdida
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +47,Drawing,Desenho
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +22,Date is repeated,Data é repetido
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +148,Leave approver must be one of {0},Deixe aprovador deve ser um dos {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +162,Leave approver must be one of {0},Deixe aprovador deve ser um dos {0}
 DocType: Hub Settings,Seller Email,Vendedor Email
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Custo total de compra (Purchase via da fatura)
 DocType: Workstation Working Hour,Start Time,Start Time
@@ -2547,7 +2457,7 @@
 DocType: Purchase Invoice Item,Net Amount (Company Currency),Valor Líquido (Companhia de moeda)
 DocType: BOM Operation,Hour Rate,Taxa à hora
 DocType: Stock Settings,Item Naming By,Item de nomeação
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +642,From Quotation,De Orçamento
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +655,From Quotation,De Orçamento
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},Outra entrada Período de Encerramento {0} foi feita após {1}
 DocType: Production Order,Material Transferred for Manufacturing,Material transferido para Manufatura
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +29,Account {0} does not exists,Conta {0} não existe
@@ -2561,21 +2471,19 @@
 DocType: Purchase Invoice Item,PR Detail,Detalhe PR
 DocType: Sales Order,Fully Billed,Totalmente Anunciado
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +20,Cash In Hand,Dinheiro na mão
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +72,Delivery warehouse required for stock item {0},Armazém de entrega necessário para estoque item {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +119,Delivery warehouse required for stock item {0},Armazém de entrega necessário para estoque item {0}
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),O peso bruto do pacote. Normalmente peso líquido + peso do material de embalagem. (Para impressão)
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Gebruikers met deze rol mogen bevroren accounts en maak / boekingen tegen bevroren rekeningen wijzigen
 DocType: Serial No,Is Cancelled,É cancelado
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +281,My Shipments,Minhas remessas
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +286,My Shipments,Minhas remessas
 DocType: Journal Entry,Bill Date,Data Bill
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +43,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","Mesmo se houver várias regras de preços com maior prioridade, então seguintes prioridades internas são aplicadas:"
 DocType: Supplier,Supplier Details,Detalhes fornecedor
 DocType: Communication,Recipients,Destinatários
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +146,Screwing,Enroscando
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +96,Knurling,Knurling
 DocType: Expense Claim,Approval Status,Status de Aprovação
 DocType: Hub Settings,Publish Items to Hub,Publicar itens ao Hub
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +44,From value must be less than to value in row {0},Do valor deve ser menor do que o valor na linha {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +133,Wire Transfer,por transferência bancária
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +133,Wire Transfer,por transferência bancária
 apps/erpnext/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py +25,Please select Bank Account,Por favor seleccione Conta Bancária
 DocType: Newsletter,Create and Send Newsletters,Criar e enviar Newsletters
 apps/frappe/frappe/public/js/frappe/views/reports/grid_report.js +305,From Date must be before To Date,A partir da data deve ser anterior a Data
@@ -2583,14 +2491,14 @@
 DocType: Company,Default Income Account,Conta Rendimento padrão
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,Customer Group / Klantenservice
 DocType: Item Group,Check this if you want to show in website,Marque esta opção se você deseja mostrar no site
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +190,Welcome to ERPNext,Bem-vindo ao ERPNext
+,Welcome to ERPNext,Bem-vindo ao ERPNext
 DocType: Payment Reconciliation Payment,Voucher Detail Number,Número Detalhe voucher
 apps/erpnext/erpnext/config/crm.py +146,Lead to Quotation,Levar a cotação
 DocType: Lead,From Customer,Do Cliente
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +37,Calls,chamadas
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Calls,chamadas
 DocType: Project,Total Costing Amount (via Time Logs),Montante Custeio Total (via Time Logs)
 DocType: Purchase Order Item Supplied,Stock UOM,Estoque UOM
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Purchase Order {0} is not submitted,Ordem de Compra {0} não é submetido
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +194,Purchase Order {0} is not submitted,Ordem de Compra {0} não é submetido
 ,Projected,verwachte
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},Serial Não {0} não pertence ao Armazém {1}
 apps/erpnext/erpnext/controllers/status_updater.py +136,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Nota : O sistema não irá verificar o excesso de entrega e sobre- reserva para item {0} como quantidade ou valor é 0
@@ -2598,7 +2506,6 @@
 DocType: Issue,Opening Date,Data de abertura
 DocType: Journal Entry,Remark,Observação
 DocType: Purchase Receipt Item,Rate and Amount,Taxa e montante
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +95,Boring,Chato
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +667,From Sales Order,Da Ordem de Vendas
 DocType: Blog Category,Parent Website Route,Pai site Route
 DocType: Sales Order,Not Billed,Não faturado
@@ -2612,19 +2519,17 @@
 apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount Amount,Montante do Desconto
 DocType: Purchase Invoice,Return Against Purchase Invoice,Regresso contra factura de compra
 DocType: Item,Warranty Period (in days),Período de Garantia (em dias)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +550,e.g. VAT,por exemplo IVA
+apps/erpnext/erpnext/public/js/setup_wizard.js +292,e.g. VAT,por exemplo IVA
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,Item 4
 DocType: Journal Entry Account,Journal Entry Account,Conta Diário de entrada
 DocType: Shopping Cart Settings,Quotation Series,Cotação Series
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +52,"An item exists with same name ({0}), please change the item group name or rename the item","Um item existe com o mesmo nome ( {0}) , por favor, altere o nome do grupo de itens ou renomear o item"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +82,Hot metal gas forming,Gás de metais a quente
 DocType: Sales Order Item,Sales Order Date,Vendas Data Ordem
 DocType: Sales Invoice Item,Delivered Qty,Qtde entregue
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +63,Warehouse {0}: Company is mandatory,Armazém {0}: Empresa é obrigatório
 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.",Vá para o grupo apropriado (geralmente Fonte de Recursos&gt;&gt; Passivo Circulante Impostos e Taxas e criar uma nova conta (clicando em Adicionar Criança) do tipo &quot;imposto&quot; e fazer mencionar a taxa de imposto.
 ,Payment Period Based On Invoice Date,Betaling Periode Based On Factuurdatum
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +50,Missing Currency Exchange Rates for {0},Faltando Taxas de câmbio para {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +135,Laser cutting,Corte a laser
 DocType: Event,Monday,Segunda-feira
 DocType: Journal Entry,Stock Entry,Entrada stock
 DocType: Account,Payable,a pagar
@@ -2657,7 +2562,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +111,Date Of Retirement must be greater than Date of Joining,Data da aposentadoria deve ser maior que Data de Juntando
 DocType: Sales Invoice,Against Income Account,Contra Conta a Receber
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +69,{0}% Delivered,{0}% Proferido
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +78,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Item {0}: Quant Pedi {1} não pode ser inferior a qty mínimo de pedido {2} (definido no Item).
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Item {0}: Quant Pedi {1} não pode ser inferior a qty mínimo de pedido {2} (definido no Item).
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Distribuição percentual mensal
 DocType: Territory,Territory Targets,Metas território
 DocType: Delivery Note,Transporter Info,Informações Transporter
@@ -2666,7 +2571,6 @@
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,"Títulos para modelos de impressão , por exemplo, Proforma Invoice ."
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +140,Valuation type charges can not marked as Inclusive,Encargos tipo de avaliação não pode marcado como Inclusive
 DocType: POS Profile,Update Stock,Actualização de stock
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +128,Superfinishing,Superfinishing
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,UOM diferente para itens levará a incorreta valor Peso Líquido (Total ) . Certifique-se de que o peso líquido de cada item está na mesma UOM .
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM Taxa
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +85,Please pull items from Delivery Note,"Por favor, puxar itens de entrega Nota"
@@ -2681,7 +2585,6 @@
 ,Purchase Analytics,Analytics compra
 DocType: Sales Invoice Item,Delivery Note Item,Item Nota de Entrega
 DocType: Expense Claim,Task,Tarefa
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +57,Shaving,Barbear
 DocType: Purchase Taxes and Charges,Reference Row #,Referência Row #
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},Número do lote é obrigatória para item {0}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js +14,This is a root sales person and cannot be edited.,Dit is een wortel verkoper en kan niet worden bewerkt .
@@ -2693,13 +2596,11 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +74,Purpose must be one of {0},Objetivo deve ser um dos {0}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +108,Fill the form and save it,Preencha o formulário e guarde-o
 DocType: Production Planning Tool,Download a report containing all raw materials with their latest inventory status,Baixe um relatório contendo todas as matérias-primas com o seu estado mais recente inventário
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +94,Facing,Revestimento
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,Community Forum
 DocType: Leave Application,Leave Balance Before Application,Deixe Equilíbrio Antes da aplicação
 DocType: SMS Center,Send SMS,Envie SMS
 DocType: Company,Default Letter Head,Cabeça Padrão Letter
 DocType: Time Log,Billable,Faturável
-DocType: Authorization Rule,This will be used for setting rule in HR module,Isso será usado para fixação de regras no módulo HR
 DocType: Account,Rate at which this tax is applied,Taxa em que este imposto é aplicado
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reorder Qty,Reordenar Qtde
 DocType: Company,Stock Adjustment Account,Banco de Acerto de Contas
@@ -2726,16 +2627,15 @@
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,Percentual de alocação deve ser igual a 100%
 DocType: Serial No,Out of AMC,Fora da AMC
 DocType: Purchase Order Item,Material Request Detail No,Detalhe materiais Pedido Não
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +97,Hard turning,Torneamento duro
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +33,Make Maintenance Visit,Maak Maintenance Visit
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +187,Please contact to the user who have Sales Master Manager {0} role,"Por favor, entre em contato com o usuário que tem Vendas Mestre Gerente {0} papel"
 DocType: Company,Default Cash Account,Conta Caixa padrão
 apps/erpnext/erpnext/config/accounts.py +79,Company (not Customer or Supplier) master.,Company ( não cliente ou fornecedor ) mestre.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +106,Please enter 'Expected Delivery Date',"Por favor, digite ' Data prevista de entrega '"
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +187,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Notas de entrega {0} deve ser cancelado antes de cancelar esta ordem de venda
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +100,Please enter 'Expected Delivery Date',"Por favor, digite ' Data prevista de entrega '"
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +182,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Notas de entrega {0} deve ser cancelado antes de cancelar esta ordem de venda
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +373,Paid amount + Write Off Amount can not be greater than Grand Total,Valor pago + Write Off Valor não pode ser maior do que o total geral
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} não é um número de lote válido por item {1}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,Note: There is not enough leave balance for Leave Type {0},Nota: Não é suficiente equilíbrio pela licença Tipo {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +124,Note: There is not enough leave balance for Leave Type {0},Nota: Não é suficiente equilíbrio pela licença Tipo {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.","Nota: Se o pagamento não é feito contra qualquer referência, crie manualmente uma entrada no diário."
 DocType: Item,Supplier Items,Fornecedor Itens
 DocType: Opportunity,Opportunity Type,Tipo de Oportunidade
@@ -2747,7 +2647,7 @@
 DocType: Hub Settings,Publish Availability,Publicar Disponibilidade
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +105,Date of Birth cannot be greater than today.,Data de nascimento não pode ser maior do que hoje.
 ,Stock Ageing,Envelhecimento estoque
-apps/erpnext/erpnext/controllers/accounts_controller.py +200,{0} '{1}' is disabled,{0} '{1}' está desativada
+apps/erpnext/erpnext/controllers/accounts_controller.py +201,{0} '{1}' is disabled,{0} '{1}' está desativada
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Definir como Open
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Enviar e-mails automáticos para Contatos sobre transações de enviar.
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +232,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
@@ -2757,44 +2657,38 @@
 DocType: Purchase Order,Customer Contact Email,Cliente Fale Email
 DocType: Event,Sunday,Domingo
 DocType: Sales Team,Contribution (%),Contribuição (%)
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +455,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,Nota: Entrada pagamento não será criado desde 'Cash ou conta bancária ' não foi especificado
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +171,Responsibilities,Responsabilidades
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +457,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,Nota: Entrada pagamento não será criado desde 'Cash ou conta bancária ' não foi especificado
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +171,Responsibilities,Responsabilidades
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Template,Modelo
 DocType: Sales Person,Sales Person Name,Vendas Nome Pessoa
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,"Por favor, indique pelo menos uma fatura na tabela"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +511,Add Users,Adicionar usuários
+apps/erpnext/erpnext/public/js/setup_wizard.js +255,Add Users,Adicionar usuários
 DocType: Pricing Rule,Item Group,Grupo Item
 DocType: Task,Actual Start Date (via Time Logs),Data de início real (via Time Logs)
 DocType: Stock Reconciliation Item,Before reconciliation,Antes de reconciliação
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +12,To {0},Para {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Impostos e taxas Adicionado (Moeda Company)
-apps/erpnext/erpnext/stock/doctype/item/item.py +340,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Item Imposto Row {0} deve ter em conta tipo de imposto ou de renda ou de despesa ou carregável
+apps/erpnext/erpnext/stock/doctype/item/item.py +344,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Item Imposto Row {0} deve ter em conta tipo de imposto ou de renda ou de despesa ou carregável
 DocType: Sales Order,Partly Billed,Parcialmente faturado
 DocType: Item,Default BOM,BOM padrão
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +79,Decambering,Decambering
 apps/erpnext/erpnext/setup/doctype/company/company.js +22,Please re-type company name to confirm,"Por favor, re-tipo o nome da empresa para confirmar"
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,Total de Outstanding Amt
 DocType: Time Log Batch,Total Hours,Total de Horas
 DocType: Journal Entry,Printing Settings,Configurações de impressão
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +268,Total Debit must be equal to Total Credit. The difference is {0},Débito total deve ser igual ao total de crédito.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +11,Automotive,automotivo
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +37,Item is required,Item é necessário
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +25,Metal injection molding,Moldagem por injeção de metal
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +258,Total Debit must be equal to Total Credit. The difference is {0},Débito total deve ser igual ao total de crédito.
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,automotivo
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +684,From Delivery Note,De Nota de Entrega
 DocType: Time Log,From Time,From Time
 DocType: Notification Control,Custom Message,Mensagem personalizada
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +33,Investment Banking,Banca de Investimento
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +261,"Select your Country, Time Zone and Currency","Escolha o seu país, fuso horário e moeda"
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,Banca de Investimento
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +316,"Select your Country, Time Zone and Currency","Escolha o seu país, fuso horário e moeda"
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +369,Cash or Bank Account is mandatory for making payment entry,Dinheiro ou conta bancária é obrigatória para a tomada de entrada de pagamento
 DocType: Purchase Invoice,Price List Exchange Rate,Preço Lista de Taxa de Câmbio
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +91,Pickling,Decapagem
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +18,Sand casting,A fundição em areia
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +117,Electroplating,Galvanoplastia
 DocType: Purchase Invoice Item,Rate,Taxa
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +62,Intern,internar
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Intern,internar
 DocType: Newsletter,A Lead with this email id should exist,Um Lead com esse ID de e-mail deve existir
 DocType: Stock Entry,From BOM,De BOM
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +34,Basic,básico
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +34,Basic,básico
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,Transações com ações antes {0} são congelados
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +217,Please click on 'Generate Schedule',"Por favor, clique em "" Gerar Agenda '"
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +61,To Date should be same as From Date for Half Day leave,Om datum moet dezelfde zijn als Van Datum voor halve dag verlof zijn
@@ -2802,11 +2696,11 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +96,Reference No is mandatory if you entered Reference Date,Referência Não é obrigatório se você entrou Data de Referência
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +108,Date of Joining must be greater than Date of Birth,Data de Juntando deve ser maior do que o Data de Nascimento
 DocType: Salary Structure,Salary Structure,Estrutura Salarial
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +242,"Multiple Price Rule exists with same criteria, please resolve \
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +246,"Multiple Price Rule exists with same criteria, please resolve \
 			conflict by assigning priority. Price Rules: {0}","Multiple regra de preço existe com os mesmos critérios, por favor resolver \
  conflito, atribuindo prioridade. Regras Preço: {0}"
 DocType: Account,Bank,Banco
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +9,Airline,Companhia aérea
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,Companhia aérea
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +493,Issue Material,Material Issue
 DocType: Material Request Item,For Warehouse,Para Armazém
 DocType: Employee,Offer Date,aanbieding Datum
@@ -2816,29 +2710,24 @@
 DocType: Item,Is Fixed Asset Item,É item de Imobilização
 DocType: Stock Entry,Including items for sub assemblies,Incluindo itens para subconjuntos
 DocType: Features Setup,"If you have long print formats, this feature can be used to split the page to be printed on multiple pages with all headers and footers on each page","Se você tem muito tempo imprimir formatos, esse recurso pode ser usado para dividir a página a ser impressa em várias páginas com todos os cabeçalhos e rodapés em cada página"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +131,Hobbing,Hobbing
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +98,All Territories,Todos os Territórios
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +98,All Territories,Todos os Territórios
 DocType: Purchase Invoice,Items,Itens
 DocType: Fiscal Year,Year Name,Nome do Ano
 DocType: Process Payroll,Process Payroll,Payroll processo
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +59,There are more holidays than working days this month.,Há mais feriados do que dias úteis do mês.
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +68,There are more holidays than working days this month.,Há mais feriados do que dias úteis do mês.
 DocType: Product Bundle Item,Product Bundle Item,Produto Bundle item
 DocType: Sales Partner,Sales Partner Name,Vendas Nome do parceiro
 DocType: Purchase Invoice Item,Image View,Ver imagem
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +113,Finishing & industrial finishing,Acabamento e acabamento industrial
 DocType: Issue,Opening Time,Tempo de abertura
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,De e datas necessárias
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +46,Securities & Commodity Exchanges,Valores Mobiliários e Bolsas de Mercadorias
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Valores Mobiliários e Bolsas de Mercadorias
 DocType: Shipping Rule,Calculate Based On,Calcule Baseado em
 DocType: Delivery Note Item,From Warehouse,Do Armazém
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +98,Drilling,Perfuração
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +28,Blow molding,A moldagem por sopro
 DocType: Purchase Taxes and Charges,Valuation and Total,Avaliação e Total
 DocType: Tax Rule,Shipping City,O envio da Cidade
 apps/erpnext/erpnext/stock/doctype/item/item.js +43,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,"Este artigo é um Variant de {0} (modelo). Atributos serão copiados a partir do modelo, a menos que 'No Copy' é definido"
 DocType: Account,Purchase User,Compra de Usuário
 DocType: Notification Control,Customize the Notification,Personalize a Notificação
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +87,Hammering,Batimento
 DocType: Web Page,Slideshow,Slideshow
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +24,Default Address Template cannot be deleted,Template endereço padrão não pode ser excluído
 DocType: Sales Invoice,Shipping Rule,Regra de envio
@@ -2847,9 +2736,8 @@
 DocType: Workflow State,Search,Pesquisar
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +54,Total cannot be zero,Total não pode ser 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,'Dias desde a última encomenda deve ser maior ou igual a zero
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +142,Brazing,Soldadura
 DocType: C-Form,Amended From,Alterado De
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Raw Material,Matéria-prima
+apps/erpnext/erpnext/public/js/setup_wizard.js +359,Raw Material,Matéria-prima
 DocType: Leave Application,Follow via Email,Enviar por e-mail
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Total de Impostos Depois Montante do Desconto
 apps/erpnext/erpnext/accounts/doctype/account/account.py +174,Child account exists for this account. You can not delete this account.,Conta Criança existe para esta conta. Você não pode excluir esta conta.
@@ -2863,10 +2751,10 @@
 ,Produced,geproduceerd
 DocType: Item,Item Code for Suppliers,Código do item para fornecedores
 DocType: Issue,Raised By (Email),Levantadas por (e-mail)
-apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +72,General,Geral
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +495,Attach Letterhead,anexar timbrado
+apps/erpnext/erpnext/setup/setup_wizard/default_website.py +72,General,Geral
+apps/erpnext/erpnext/public/js/setup_wizard.js +241,Attach Letterhead,anexar timbrado
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +272,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',Não pode deduzir quando é para categoria ' Avaliação ' ou ' Avaliação e Total'
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +542,"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.","Lista de suas cabeças fiscais (por exemplo, IVA, etc aduaneiras; eles devem ter nomes exclusivos) e suas taxas normais. Isto irá criar um modelo padrão, que você pode editar e adicionar mais tarde."
+apps/erpnext/erpnext/public/js/setup_wizard.js +284,"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.","Lista de suas cabeças fiscais (por exemplo, IVA, etc aduaneiras; eles devem ter nomes exclusivos) e suas taxas normais. Isto irá criar um modelo padrão, que você pode editar e adicionar mais tarde."
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial Nos Required for Serialized Item {0},Serial Nos Obrigatório para Serialized item {0}
 DocType: Journal Entry,Bank Entry,Banco Entry
 DocType: Authorization Rule,Applicable To (Designation),Para aplicável (Designação)
@@ -2875,33 +2763,32 @@
 apps/erpnext/erpnext/config/accounts.py +143,Enable / disable currencies.,Ativar / desativar moedas.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Postal Expenses,despesas postais
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Total (Amt)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +26,Entertainment & Leisure,Entretenimento & Lazer
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,Entretenimento & Lazer
 DocType: Purchase Order,The date on which recurring order will be stop,A data em que ordem recorrente será parar
 DocType: Quality Inspection,Item Serial No,No item de série
 apps/erpnext/erpnext/controllers/status_updater.py +142,{0} must be reduced by {1} or you should increase overflow tolerance,{0} deve ser reduzido em {1} ou você deve aumentar a tolerância ao excesso
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Present,Presente total
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Hour,Hora
+apps/erpnext/erpnext/public/js/setup_wizard.js +363,Hour,Hora
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +138,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation","Item Serialized {0} não pode ser atualizado utilizando \
  da Reconciliação"
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +488,Transfer Material to Supplier,Transferência de material para Fornecedor
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +513,Transfer Material to Supplier,Transferência de material para Fornecedor
 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,"New Serial Não, não pode ter Warehouse. Warehouse deve ser definida pelo Banco de entrada ou Recibo de compra"
 DocType: Lead,Lead Type,Chumbo Tipo
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +82,Create Quotation,Maak Offerte
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +306,All these items have already been invoiced,Todos esses itens já foram faturados
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,You are not authorized to approve leaves on Block Dates,Você não está autorizado a aprovar folhas em datas Bloco
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +311,All these items have already been invoiced,Todos esses itens já foram faturados
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},Pode ser aprovado por {0}
 DocType: Shipping Rule,Shipping Rule Conditions,Regra Condições de envio
 DocType: BOM Replace Tool,The new BOM after replacement,O BOM novo após substituição
 DocType: Features Setup,Point of Sale,Ponto de Venda
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +83,Curling,Ondulação
 DocType: Account,Tax,Imposto
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +28,Row {0}: {1} is not a valid {2},Row {0}: {1} não é um válido {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +89,Refining,Refino
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +37,Row {0}: {1} is not a valid {2},Row {0}: {1} não é um válido {2}
 DocType: Production Planning Tool,Production Planning Tool,Ferramenta de Planejamento da Produção
 DocType: Quality Inspection,Report Date,Relatório Data
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +130,Routing,Encaminhamento
 DocType: C-Form,Invoices,Faturas
 DocType: Job Opening,Job Title,Cargo
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +54,{0} already allocated for Employee {1} for period {2} - {3},{0} já alocado para Employee {1} para {2} período - {3}
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +80,{0} Recipients,{0} Destinatários
 DocType: Features Setup,Item Groups in Details,Grupos de itens em Detalhes
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +335,Quantity to Manufacture must be greater than 0.,Quantidade de Fabricação deve ser maior que 0.
@@ -2919,14 +2806,13 @@
 DocType: DocType,Setup,Instalação
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,Er is niets om te bewerken .
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +108,Summary for this month and pending activities,Resumo para este mês e atividades pendentes
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +39,Cold rolling,Laminação a frio
 DocType: Customer Group,Customer Group Name,Nome do grupo de clientes
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +408,Please remove this Invoice {0} from C-Form {1},"Por favor, remova esta Invoice {0} a partir de C-Form {1}"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +410,Please remove this Invoice {0} from C-Form {1},"Por favor, remova esta Invoice {0} a partir de C-Form {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,Por favor seleccione Carry Forward se você também quer incluir equilíbrio ano fiscal anterior deixa para este ano fiscal
 DocType: GL Entry,Against Voucher Type,Tipo contra Vale
 DocType: Item,Attributes,Atributos
 DocType: Packing Slip,Get Items,Obter itens
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +186,Please enter Write Off Account,"Por favor, indique Escrever Off Conta"
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +187,Please enter Write Off Account,"Por favor, indique Escrever Off Conta"
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +71,Last Order Date,Última data do pedido
 DocType: DocField,Image,Imagem
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +179,Make Excise Invoice,Maak Accijnzen Factuur
@@ -2936,7 +2822,7 @@
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +146,Operation ID not set,Operação ID não definida
 DocType: Production Order,Planned Start Date,Planejado Start Date
 DocType: Serial No,Creation Document Type,Type het maken van documenten
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +620,Maint. Visit,Manut. Visita
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +631,Maint. Visit,Manut. Visita
 DocType: Leave Type,Is Encash,É cobrar
 DocType: Purchase Invoice,Mobile No,No móvel
 DocType: Payment Tool,Make Journal Entry,Crie Diário de entrada 
@@ -2944,35 +2830,31 @@
 apps/erpnext/erpnext/controllers/trends.py +257,Project-wise data is not available for Quotation,Dados do projecto -wise não está disponível para Cotação
 DocType: Project,Expected End Date,Data final esperado
 DocType: Appraisal Template,Appraisal Template Title,Título do modelo de avaliação
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +440,Commercial,comercial
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +378,Commercial,comercial
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +23,Parent Item {0} must not be a Stock Item,Pai item {0} não deve ser um item da
 DocType: Cost Center,Distribution Id,Id distribuição
-apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +14,Awesome Services,Serviços impressionante
+apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +14,Awesome Services,Serviços impressionante
 apps/erpnext/erpnext/config/manufacturing.py +29,All Products or Services.,Todos os produtos ou serviços.
 DocType: Purchase Invoice,Supplier Address,Endereço do Fornecedor
 DocType: Contact Us Settings,Address Line 2,Endereço Linha 2
 DocType: ToDo,Reference,Referência
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +59,Perforating,Perfurante
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,out Aantal
 apps/erpnext/erpnext/config/accounts.py +128,Rules to calculate shipping amount for a sale,Regras para calcular valor de frete para uma venda
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +29,Series is mandatory,Série é obrigatório
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +28,Financial Services,Serviços Financeiros
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,Serviços Financeiros
 apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3},Valor para o atributo {0} deve estar dentro da gama de {1} a {2} nos incrementos de {3}
 DocType: Tax Rule,Sales,Vendas
 DocType: Stock Entry Detail,Basic Amount,Montante de base
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +173,Warehouse required for stock Item {0},Armazém necessário para stock o item {0}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +178,Warehouse required for stock Item {0},Armazém necessário para stock o item {0}
 DocType: Leave Allocation,Unused leaves,Folhas não utilizadas
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,Cr
 DocType: Customer,Default Receivable Accounts,Padrão Contas a Receber
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +102,Sawing,Serrar
 DocType: Tax Rule,Billing State,Estado de faturamento
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +32,Laminating,Laminação
 DocType: Item Reorder,Transfer,Transferir
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +549,Fetch exploded BOM (including sub-assemblies),Fetch ontplofte BOM ( inclusief onderdelen )
 DocType: Authorization Rule,Applicable To (Employee),Aplicável a (Empregado)
 apps/erpnext/erpnext/controllers/accounts_controller.py +101,Due Date is mandatory,Due Date é obrigatória
 apps/erpnext/erpnext/controllers/item_variant.py +51,Increment for Attribute {0} cannot be 0,Atributo incremento para {0} não pode ser 0
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +143,Sintering,Sinterização
 DocType: Journal Entry,Pay To / Recd From,Para pagar / RECD De
 DocType: Naming Series,Setup Series,Série de configuração
 DocType: Supplier,Contact HTML,Contato HTML
@@ -2985,7 +2867,6 @@
 DocType: Attendance,Absent,Ausente
 DocType: Product Bundle,Product Bundle,Bundle produto
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +180,Row {0}: Invalid reference {1},Row {0}: Referência inválida {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +165,Crushing,Esmagador
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Comprar Impostos e Taxas Template
 DocType: Upload Attendance,Download Template,Baixe Template
 DocType: GL Entry,Remarks,Observações
@@ -2993,14 +2874,12 @@
 DocType: Journal Entry,Write Off Based On,Escreva Off Baseado em
 DocType: Features Setup,POS View,POS Ver
 apps/erpnext/erpnext/config/stock.py +38,Installation record for a Serial No.,Registro de instalação de um n º de série
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +9,Continuous casting,Lingotamento contínuo
 apps/erpnext/erpnext/public/js/queries.js +39,Please specify a,"Por favor, especifique um"
 DocType: Offer Letter,Awaiting Response,Aguardando resposta
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +53,Above,Acima
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +80,Cold sizing,Dimensionamento frio
 DocType: Salary Slip,Earning & Deduction,Ganhar &amp; Dedução
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +76,Account {0} cannot be a Group,Conta {0} não pode ser um grupo
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +259,Region,Região
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +314,Region,Região
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +213,Optional. This setting will be used to filter in various transactions.,Optioneel. Deze instelling wordt gebruikt om te filteren op diverse transacties .
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +104,Negative Valuation Rate is not allowed,Negativa Avaliação Taxa não é permitido
 DocType: Holiday List,Weekly Off,Weekly Off
@@ -3018,7 +2897,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,Account {0} is inactive,Conta {0} está inativa
 DocType: GL Entry,Is Advance,É o avanço
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,Aanwezigheid Van Datum en tot op heden opkomst is verplicht
-apps/erpnext/erpnext/controllers/buying_controller.py +131,Please enter 'Is Subcontracted' as Yes or No,"Por favor, digite ' é subcontratado ""como Sim ou Não"
+apps/erpnext/erpnext/controllers/buying_controller.py +122,Please enter 'Is Subcontracted' as Yes or No,"Por favor, digite ' é subcontratado ""como Sim ou Não"
 DocType: Sales Team,Contact No.,Fale Não.
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,'Profit and Loss' type account {0} not allowed in Opening Entry,"""Lucros e Perdas "" tipo de conta {0} não é permitido na abertura de entrada"
 DocType: Workflow State,Time,Tempo
@@ -3027,14 +2906,13 @@
 DocType: Authorization Rule,Authorization Rule,Regra autorização
 DocType: Sales Invoice,Terms and Conditions Details,Termos e Condições Detalhes
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,Impostos de vendas e de modelo Encargos
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +10,Apparel & Accessories,Vestuário e Acessórios
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,Vestuário e Acessórios
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +67,Number of Order,Número de Ordem
 DocType: Item Group,HTML / Banner that will show on the top of product list.,HTML bandeira / que vai mostrar no topo da lista de produtos.
 DocType: Shipping Rule,Specify conditions to calculate shipping amount,Especificar condições para calcular valor de frete
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +121,Add Child,Adicionar Descendente
 DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,Papel permissão para definir as contas congeladas e editar entradas congeladas
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +52,Cannot convert Cost Center to ledger as it has child nodes,"Não é possível converter Centro de Custo de contabilidade , uma vez que tem nós filhos"
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +47,Conversion Factor is required,Fator de Conversão é necessária
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +37,Serial #,Serial #
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +87,Commission on Sales,Comissão sobre Vendas
 DocType: Offer Letter Term,Value / Description,Valor / Descrição
@@ -3042,10 +2920,8 @@
 ,Customers Not Buying Since Long Time,Os clientes não compra desde há muito tempo
 DocType: Production Order,Expected Delivery Date,Data de entrega prevista
 apps/erpnext/erpnext/accounts/general_ledger.py +121,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Débito e Crédito é igual para {0} # {1}. A diferença é {2}.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +48,Bulging,Bojudo
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +11,Evaporative-pattern casting,Evaporativo-padrão de elenco
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Entertainment Expenses,despesas de representação
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +195,Sales Invoice {0} must be cancelled before cancelling this Sales Order,Fatura de vendas {0} deve ser cancelado antes de cancelar esta ordem de venda
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +190,Sales Invoice {0} must be cancelled before cancelling this Sales Order,Fatura de vendas {0} deve ser cancelado antes de cancelar esta ordem de venda
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +61,Age,Idade
 DocType: Time Log,Billing Amount,Faturamento Montante
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +84,Invalid quantity specified for item {0}. Quantity should be greater than 0.,Quantidade inválido especificado para o item {0} . Quantidade deve ser maior do que 0 .
@@ -3064,26 +2940,24 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,Nova Receita Cliente
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Travel Expenses,Despesas de viagem
 DocType: Maintenance Visit,Breakdown,Colapso
-apps/erpnext/erpnext/controllers/accounts_controller.py +241,Account: {0} with currency: {1} can not be selected,Conta: {0} com moeda: {1} não pode ser seleccionado
+apps/erpnext/erpnext/controllers/accounts_controller.py +242,Account: {0} with currency: {1} can not be selected,Conta: {0} com moeda: {1} não pode ser seleccionado
 DocType: Bank Reconciliation Detail,Cheque Date,Data Cheque
 apps/erpnext/erpnext/accounts/doctype/account/account.py +47,Account {0}: Parent account {1} does not belong to company: {2},Conta {0}: conta principal {1} não pertence à empresa: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted all transactions related to this company!,Excluído com sucesso todas as transacções relacionadas com esta empresa!
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,Como em Data
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +111,Honing,Afiando
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +58,Probation,provação
-apps/erpnext/erpnext/stock/doctype/item/item.py +264,Default Warehouse is mandatory for stock Item.,Armazém padrão é obrigatório para estoque Item.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Probation,provação
+apps/erpnext/erpnext/stock/doctype/item/item.py +268,Default Warehouse is mandatory for stock Item.,Armazém padrão é obrigatório para estoque Item.
 DocType: Feed,Full Name,Nome Completo
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +148,Clinching,Conquistar
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +191,Payment of salary for the month {0} and year {1},Pagamento de salário para o mês {0} e {1} ano
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +173,Payment of salary for the month {0} and year {1},Pagamento de salário para o mês {0} e {1} ano
 DocType: Stock Settings,Auto insert Price List rate if missing,Inserção automática taxa de lista de preços se ausente
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,Montante total pago
 ,Transferred Qty,overgedragen hoeveelheid
 apps/erpnext/erpnext/config/learn.py +11,Navigating,Navegação
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +137,Planning,planejamento
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +137,Planning,planejamento
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +9,Make Time Log Batch,Make Time Log Batch
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Issued,Emitido
 DocType: Project,Total Billing Amount (via Time Logs),Valor Total do faturamento (via Time Logs)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +629,We sell this Item,Nós vendemos este item
+apps/erpnext/erpnext/public/js/setup_wizard.js +365,We sell this Item,Nós vendemos este item
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +65,Supplier Id,Fornecedor Id
 DocType: Journal Entry,Cash Entry,Entrada de Caixa
 DocType: Sales Partner,Contact Desc,Contato Descr
@@ -3092,18 +2966,16 @@
 DocType: Brand,Item Manager,Item Manager
 DocType: Cost Center,Add rows to set annual budgets on Accounts.,Adicionar linhas para definir orçamentos anuais nas contas.
 DocType: Buying Settings,Default Supplier Type,Tipo de fornecedor padrão
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +160,Quarrying,Pedreiras
 DocType: Production Order,Total Operating Cost,Custo Operacional Total
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +160,Note: Item {0} entered multiple times,Nota : Item {0} entrou várias vezes
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +163,Note: Item {0} entered multiple times,Nota : Item {0} entrou várias vezes
 apps/erpnext/erpnext/config/crm.py +27,All Contacts.,Todos os contactos.
 DocType: Newsletter,Test Email Id,Email Id teste
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +394,Company Abbreviation,bedrijf Afkorting
+apps/erpnext/erpnext/public/js/setup_wizard.js +142,Company Abbreviation,bedrijf Afkorting
 DocType: Features Setup,If you follow Quality Inspection. Enables Item QA Required and QA No in Purchase Receipt,Se você seguir Inspeção de Qualidade . Permite item QA Obrigatório e QA Não no Recibo de compra
 DocType: GL Entry,Party Type,Tipo de Festa
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +68,Raw material cannot be same as main Item,Matéria-prima não pode ser o mesmo como o principal item
 DocType: Item Attribute Value,Abbreviation,Abreviatura
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,Não authroized desde {0} excede os limites
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +30,Rotational molding,Rotomoldagem
 apps/erpnext/erpnext/config/hr.py +115,Salary template master.,Mestre modelo Salário .
 DocType: Leave Type,Max Days Leave Allowed,Dias Max Deixe admitidos
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +55,Set Tax Rule for shopping cart,Conjunto de regras de imposto por carrinho de compras
@@ -3117,15 +2989,15 @@
 apps/erpnext/erpnext/config/selling.py +18,Quotes to Leads or Customers.,Cotações para Leads ou Clientes.
 DocType: Stock Settings,Role Allowed to edit frozen stock,Papel permissão para editar estoque congelado
 ,Territory Target Variance Item Group-Wise,Território Alvo Variance item Group-wise
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +101,All Customer Groups,Todos os grupos de clientes
-apps/erpnext/erpnext/controllers/accounts_controller.py +474,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} é obrigatório. Talvez recorde Câmbios não é criado para {1} de {2}.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +101,All Customer Groups,Todos os grupos de clientes
+apps/erpnext/erpnext/controllers/accounts_controller.py +475,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} é obrigatório. Talvez recorde Câmbios não é criado para {1} de {2}.
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +37,Tax Template is mandatory.,Template imposto é obrigatório.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +41,Account {0}: Parent account {1} does not exist,Conta {0}: conta principal {1} não existe
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Preço Taxa List (moeda da empresa)
 DocType: Account,Temporary,Temporário
 DocType: Address,Preferred Billing Address,Preferred Endereço de Cobrança
 DocType: Monthly Distribution Percentage,Percentage Allocation,Alocação percentual
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +86,Secretary,secretário
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Secretary,secretário
 DocType: Serial No,Distinct unit of an Item,Unidade distinta de um item
 DocType: Pricing Rule,Buying,Comprar
 DocType: HR Settings,Employee Records to be created by,Registros de funcionário devem ser criados por
@@ -3138,9 +3010,8 @@
 ,Item-wise Price List Rate,Item- wise Prijslijst Rate
 DocType: Purchase Order Item,Supplier Quotation,Cotação fornecedor
 DocType: Quotation,In Words will be visible once you save the Quotation.,Em Palavras será visível quando você salvar a cotação.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +68,Ironing,Engomadoria
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is stopped,{0} {1} está parado
-apps/erpnext/erpnext/stock/doctype/item/item.py +352,Barcode {0} already used in Item {1},Barcode {0} já utilizado em item {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +356,Barcode {0} already used in Item {1},Barcode {0} já utilizado em item {1}
 DocType: Lead,Add to calendar on this date,Adicionar ao calendário nesta data
 apps/erpnext/erpnext/config/selling.py +132,Rules for adding shipping costs.,Regras para adicionar os custos de envio .
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,próximos eventos
@@ -3149,13 +3020,12 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +27,Quick Entry,Entrada Rápida
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0} é obrigatório para retorno
 DocType: Purchase Order,To Receive,Receber
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +33,Shrink fitting,Encolher montagem
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +522,user@example.com,user@example.com
+apps/erpnext/erpnext/public/js/setup_wizard.js +266,user@example.com,user@example.com
 DocType: Email Digest,Income / Expense,Receitas / Despesas
 DocType: Employee,Personal Email,E-mail pessoal
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +58,Total Variance,Variância total
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +62,Total Variance,Variância total
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.","Se ativado, o sistema irá postar lançamentos contábeis para o inventário automaticamente."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +15,Brokerage,corretagem
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +15,Brokerage,corretagem
 DocType: Address,Postal Code,Código postal
 DocType: Production Order Operation,"in Minutes
 Updated via 'Time Log'","em Minutos 
@@ -3163,14 +3033,13 @@
 DocType: Customer,From Lead,De Chumbo
 apps/erpnext/erpnext/config/manufacturing.py +19,Orders released for production.,Ordens liberado para produção.
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +42,Select Fiscal Year...,Selecione o ano fiscal ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +442,POS Profile required to make POS Entry,POS perfil necessário para fazer POS Entry
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +444,POS Profile required to make POS Entry,POS perfil necessário para fazer POS Entry
 DocType: Hub Settings,Name Token,Nome do token
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +106,Planing,Planing
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Selling,venda padrão
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +120,Standard Selling,venda padrão
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +137,Atleast one warehouse is mandatory,Pelo menos um armazém é obrigatório
 DocType: Serial No,Out of Warranty,Fora de Garantia
 DocType: BOM Replace Tool,Replace,Substituir
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +314,{0} against Sales Invoice {1},{0} contra Faturas {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +316,{0} against Sales Invoice {1},{0} contra Faturas {1}
 apps/erpnext/erpnext/stock/doctype/item/item.py +49,Please enter default Unit of Measure,Por favor entre unidade de medida padrão
 DocType: Purchase Invoice Item,Project Name,Nome do projeto
 DocType: Supplier,Mention if non-standard receivable account,Mencione se não padronizado conta a receber
@@ -3186,9 +3055,8 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,Journal Entry {0} does not have account {1} or already matched against other voucher,Diário de entrada {0} não tem conta {1} ou já comparado com outro comprovante
 DocType: Item,Moving Average,Média móvel
 DocType: BOM Replace Tool,The BOM which will be replaced,O BOM que será substituído
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +43,New Stock UOM must be different from current stock UOM,Novo stock UOM deve ser diferente do atual UOM stock
 DocType: Account,Debit,Débito
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +34,Leaves must be allocated in multiples of 0.5,"Folhas devem ser alocados em múltiplos de 0,5"
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +44,Leaves must be allocated in multiples of 0.5,"Folhas devem ser alocados em múltiplos de 0,5"
 DocType: Production Order,Operation Cost,Operação Custo
 apps/erpnext/erpnext/config/hr.py +71,Upload attendance from a .csv file,Carregar atendimento de um arquivo CSV.
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,Outstanding Amt
@@ -3206,8 +3074,7 @@
 DocType: Employee,Internal Work History,História Trabalho Interno
 DocType: DocField,Column Break,Quebra de coluna
 DocType: Event,Thursday,Quinta-feira
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +42,Private Equity,Private Equity
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +93,Turning,Volta
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,Private Equity
 DocType: Maintenance Visit,Customer Feedback,Comentário do cliente
 DocType: Account,Expense,despesa
 DocType: Sales Invoice,Exhibition,Exposição
@@ -3220,19 +3087,19 @@
 DocType: Employee,Held On,Realizada em
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +33,Production Item,Bem de Produção
 ,Employee Information,Informações do Funcionário
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,Rate (%),Taxa (%)
+apps/erpnext/erpnext/public/js/setup_wizard.js +294,Rate (%),Taxa (%)
 DocType: Stock Entry Detail,Additional Cost,Custo adicional
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +407,Financial Year End Date,Encerramento do Exercício Social Data
+apps/erpnext/erpnext/public/js/setup_wizard.js +155,Financial Year End Date,Encerramento do Exercício Social Data
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Voucher No, if grouped by Voucher","Kan niet filteren op basis van Voucher Nee, als gegroepeerd per Voucher"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +484,Make Supplier Quotation,Maak Leverancier Offerte
 DocType: Quality Inspection,Incoming,Entrada
 DocType: BOM,Materials Required (Exploded),Materiais necessários (explodida)
 DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),Reduzir a Geração de Renda para sair sem pagar (LWP)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +512,"Add users to your organization, other than yourself","Adicionar usuários à sua organização, além de si mesmo"
+apps/erpnext/erpnext/public/js/setup_wizard.js +256,"Add users to your organization, other than yourself","Adicionar usuários à sua organização, além de si mesmo"
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No {1} does not match with {2} {3},Row # {0}: Número de ordem {1} não coincide com {2} {3}
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +44,Casual Leave,Casual Deixar
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +44,Casual Leave,Casual Deixar
 DocType: Batch,Batch ID,Lote ID
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +334,Note: {0},Nota : {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +336,Note: {0},Nota : {0}
 ,Delivery Note Trends,Nota de entrega Trends
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +104,This Week's Summary,Resumo da Semana
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +74,{0} must be a Purchased or Sub-Contracted Item in row {1},{0} deve ser um item comprado ou subcontratadas na linha {1}
@@ -3244,7 +3111,7 @@
 DocType: Purchase Receipt,Return Against Purchase Receipt,Retorno Contra Recibo de compra
 DocType: Purchase Order,To Bill,Para Bill
 DocType: Material Request,% Ordered,Ordem%
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +61,Piecework,trabalho por peça
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Piecework,trabalho por peça
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +64,Avg. Buying Rate,Méd. Taxa de Compra
 DocType: Task,Actual Time (in Hours),Tempo real (em horas)
 DocType: Employee,History In Company,Historial na Empresa
@@ -3261,13 +3128,13 @@
 DocType: Opportunity,To Discuss,Para Discutir
 DocType: SMS Settings,SMS Settings,Definições SMS
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +60,Temporary Accounts,Contas temporárias
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +155,Black,Preto
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Black,Preto
 DocType: BOM Explosion Item,BOM Explosion Item,BOM item explosão
 DocType: Account,Auditor,Auditor
 DocType: Purchase Order,End date of current order's period,A data de término do período da ordem atual
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +17,Make Offer Letter,Faça uma oferta Letter
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +10,Return,Retorna
-apps/erpnext/erpnext/stock/doctype/item/item.py +503,Default Unit of Measure for Variant must be same as Template,Unidade de medida padrão para Variant deve ser o mesmo como modelo
+apps/erpnext/erpnext/stock/doctype/item/item.py +507,Default Unit of Measure for Variant must be same as Template,Unidade de medida padrão para Variant deve ser o mesmo como modelo
 DocType: DocField,Fold,Dobra
 DocType: Production Order Operation,Production Order Operation,Ordem de produção Operation
 DocType: Pricing Rule,Disable,incapacitar
@@ -3278,13 +3145,12 @@
 DocType: Page,Page Name,Nome da Página
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +110,To Time must be greater than From Time,Para Tempo deve ser maior From Time
 DocType: Journal Entry Account,Exchange Rate,Taxa de Câmbio
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +465,Sales Order {0} is not submitted,Ordem de Vendas {0} não é submetido
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +467,Sales Order {0} is not submitted,Ordem de Vendas {0} não é submetido
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0}: Parent account {1} does not bolong to the company {2},Armazém {0}: conta Parent {1} não Bolong à empresa {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +124,Spindle finishing,Acabamento Spindle
 DocType: BOM,Last Purchase Rate,Compra de última
 DocType: Account,Asset,ativos
 DocType: Project Task,Task ID,Task ID
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +395,"e.g. ""MC""","Ex: "" MC """
+apps/erpnext/erpnext/public/js/setup_wizard.js +143,"e.g. ""MC""","Ex: "" MC """
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,Stock cannot exist for Item {0} since has variants,Stock não pode existir por item {0} já que tem variantes
 ,Sales Person-wise Transaction Summary,Resumo da transação Pessoa-wise vendas
 DocType: System Settings,Time Zone,Fuso horário
@@ -3293,9 +3159,7 @@
 DocType: Monthly Distribution,Monthly Distribution Percentages,Percentagens distribuição mensal
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +16,The selected item cannot have Batch,O item selecionado não pode ter Batch
 DocType: Delivery Note,% of materials delivered against this Delivery Note,% dos materiais entregues contra esta Nota de Entrega
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +151,Stapling,Stapling
 DocType: Customer,Customer Details,Detalhes do cliente
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +105,Shaping,Formação
 DocType: Employee,Reports to,Relatórios para
 DocType: SMS Settings,Enter url parameter for receiver nos,Digite o parâmetro url para nn receptor
 DocType: Sales Invoice,Paid Amount,Valor pago
@@ -3304,13 +3168,13 @@
 DocType: Item Variant,Item Variant,Item Variant
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +15,Setting this Address Template as default as there is no other default,"A definição desse modelo de endereço como padrão, pois não há outro padrão"
 apps/erpnext/erpnext/accounts/doctype/account/account.py +89,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Saldo já em débito, não tem permissão para definir 'saldo deve ser' como 'crédito'"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +76,Quality Management,Gestão da Qualidade
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Quality Management,Gestão da Qualidade
 DocType: Production Planning Tool,Filter based on customer,Filtrar baseado em cliente
 DocType: Payment Tool Detail,Against Voucher No,Contra a folha nº
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +47,Please enter quantity for Item {0},"Por favor, indique a quantidade de item {0}"
 DocType: Employee External Work History,Employee External Work History,Empregado história de trabalho externo
 DocType: Tax Rule,Purchase,Comprar
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +34,Balance Qty,Balance Aantal
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Balance Qty,Balance Aantal
 DocType: Item Group,Parent Item Group,Grupo item pai
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +21,{0} for {1},{0} para {1}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +96,Cost Centers,Centros de custo
@@ -3320,12 +3184,12 @@
 DocType: Opportunity,Next Contact,Próximo Contato
 DocType: Employee,Employment Type,Tipo de emprego
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,Imobilizado
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +84,Application period cannot be across two alocation records,Período de aplicação não pode ser através de dois registros de alocação
 DocType: Item Group,Default Expense Account,Conta Despesa padrão
 DocType: Employee,Notice (days),Notice ( dagen )
 DocType: Page,Yes,Sim
 DocType: Tax Rule,Sales Tax Template,Template Imposto sobre Vendas
 DocType: Employee,Encashment Date,Data cobrança
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +74,Electroforming,Electroforming
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +179,"Against Voucher Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Contra Comprovante Tipo deve ser um dos Pedido de Compra, nota fiscal de compra ou do Diário"
 DocType: Account,Stock Adjustment,Banco de Ajuste
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +34,Default Activity Cost exists for Activity Type - {0},Existe Atividade Custo Padrão para o Tipo de Atividade - {0}
@@ -3361,12 +3225,12 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,Warehouse não pode ser excluído como existe entrada de material de contabilidade para este armazém.
 DocType: Company,Distribution,Distribuição
 apps/erpnext/erpnext/public/js/pos/pos.html +36,Amount Paid,Valor pago
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +91,Project Manager,Gerente de Projetos
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +72,Dispatch,expedição
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Project Manager,Gerente de Projetos
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +72,Dispatch,expedição
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,Max desconto permitido para o item: {0} é {1}%
 DocType: Customer,Default Taxes and Charges,Impostos e Encargos padrão
 DocType: Account,Receivable,a receber
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +268,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,Row # {0}: Não é permitido mudar de fornecedor como ordem de compra já existe
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +263,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,Row # {0}: Não é permitido mudar de fornecedor como ordem de compra já existe
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,Papel que é permitido submeter transações que excedam os limites de crédito estabelecidos.
 DocType: Sales Invoice,Supplier Reference,Referência fornecedor
 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.","Se selecionado, o BOM para a sub-montagem itens serão considerados para obter matérias-primas. Caso contrário, todos os itens de sub-montagem vai ser tratado como uma matéria-prima."
@@ -3374,8 +3238,8 @@
 DocType: Hub Settings,Seller Description,Vendedor Descrição
 DocType: Employee Education,Qualification,Qualificação
 DocType: Item Price,Item Price,Item Preço
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +48,Soap & Detergent,Soap & detergente
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +36,Motion Picture & Video,Motion Picture & Video
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +48,Soap & Detergent,Soap & detergente
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +36,Motion Picture & Video,Motion Picture & Video
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,bestelde
 DocType: Warehouse,Warehouse Name,Nome Armazém
 DocType: Naming Series,Select Transaction,Selecione Transação
@@ -3384,7 +3248,6 @@
 DocType: BOM,Rate Of Materials Based On,Taxa de materiais com base
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,ondersteuning Analtyics
 apps/erpnext/erpnext/accounts/doctype/accounts_settings/accounts_settings.py +27,Company is missing in warehouses {0},Empresa está em falta nos armazéns {0}
-DocType: Stock UOM Replace Utility,Stock UOM Replace Utility,Utilitário da Substituir UOM
 DocType: POS Profile,Terms and Conditions,Termos e Condições
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,To Date should be within the Fiscal Year. Assuming To Date = {0},Para data deve ser dentro do exercício social. Assumindo Para Date = {0}
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","Aqui você pode manter a altura, peso, alergias, etc preocupações médica"
@@ -3396,7 +3259,7 @@
 DocType: Sales Order Item,For Production,Para Produção
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +103,Please enter sales order in the above table,Vul de verkooporder in de bovenstaande tabel
 DocType: Project Task,View Task,Ver Task
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +406,Your financial year begins on,O ano financeiro tem início a
+apps/erpnext/erpnext/public/js/setup_wizard.js +154,Your financial year begins on,O ano financeiro tem início a
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +46,Please enter Purchase Receipts,Digite recibos de compra
 DocType: Sales Invoice,Get Advances Received,Obter adiantamentos recebidos
 DocType: Email Digest,Add/Remove Recipients,Adicionar / Remover Destinatários
@@ -3404,16 +3267,14 @@
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","Om dit fiscale jaar ingesteld als standaard , klik op ' Als standaard instellen '"
 apps/erpnext/erpnext/config/support.py +54,Setup incoming server for support email id. (e.g. support@example.com),Configuração do servidor de entrada para suporte e-mail id . ( por exemplo support@example.com )
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,Escassez Qtde
-apps/erpnext/erpnext/stock/doctype/item/item.py +528,Item variant {0} exists with same attributes,Variante item {0} existe com os mesmos atributos
+apps/erpnext/erpnext/stock/doctype/item/item.py +532,Item variant {0} exists with same attributes,Variante item {0} existe com os mesmos atributos
 DocType: Salary Slip,Salary Slip,Folha de salário
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +116,Burnishing,Polimento
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +54,'To Date' is required,' O campo Para Data ' é necessária
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,' O campo Para Data ' é necessária
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","Gerar deslizamentos de embalagem para os pacotes a serem entregues. Usado para notificar número do pacote, o conteúdo do pacote e seu peso."
 DocType: Sales Invoice Item,Sales Order Item,Vendas item Ordem
 DocType: Salary Slip,Payment Days,Datas de Pagamento
 DocType: BOM,Manage cost of operations,Gerenciar custo das operações
 DocType: Features Setup,Item Advanced,Item Avançado
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +40,Hot rolling,Laminação a quente
 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.","Quando qualquer uma das operações verificadas estão &quot;Enviado&quot;, um e-mail pop-up aberta automaticamente para enviar um e-mail para o associado &quot;Contato&quot;, em que a transação, com a transação como um anexo. O usuário pode ou não enviar o e-mail."
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,Definições Globais
 DocType: Employee Education,Employee Education,Educação empregado
@@ -3426,25 +3287,23 @@
 DocType: Customer,Sales Team Details,Vendas Team Detalhes
 DocType: Expense Claim,Total Claimed Amount,Montante reclamado total
 apps/erpnext/erpnext/config/crm.py +22,Potential opportunities for selling.,Oportunidades potenciais para a venda.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +48,Sick Leave,doente Deixar
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +174,Invalid {0},Inválido {0}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +48,Sick Leave,doente Deixar
 DocType: Email Digest,Email Digest,E-mail Digest
 DocType: Delivery Note,Billing Address Name,Faturamento Nome Endereço
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +22,Department Stores,Lojas de Departamento
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,Lojas de Departamento
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +40,System Balance,Equilíbrio sistema
 DocType: Workflow,Is Active,É Ativo
 apps/erpnext/erpnext/controllers/stock_controller.py +71,No accounting entries for the following warehouses,Nenhuma entrada de contabilidade para os seguintes armazéns
 apps/erpnext/erpnext/projects/doctype/project/project.js +22,Save the document first.,Salve o documento pela primeira vez.
 DocType: Account,Chargeable,Imputável
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +121,Linishing,Linishing
 DocType: Company,Change Abbreviation,Mudança abreviação
 DocType: Workflow State,Primary,Primário
 DocType: Expense Claim Detail,Expense Date,Data despesa
 DocType: Item,Max Discount (%),Max Desconto (%)
 DocType: Communication,More Information,Mais informação
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +70,Last Order Amount,Last Order Montante
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +161,Blasting,Jateamento
 DocType: Company,Warn,Avisar
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +111,Item valuation updated,Valorização item atualizado
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Quaisquer outras observações, esforço digno de nota que deve ir nos registros."
 DocType: BOM,Manufacturing User,Manufacturing Usuário
 DocType: Purchase Order,Raw Materials Supplied,Matérias-primas em actualização
@@ -3454,7 +3313,7 @@
 DocType: Appraisal,Appraisal Template,Modelo de avaliação
 DocType: Communication,Email,Email
 DocType: Item Group,Item Classification,Classificação do Item
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +89,Business Development Manager,Gerente de Desenvolvimento de Negócios
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Business Development Manager,Gerente de Desenvolvimento de Negócios
 DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,Finalidade visita de manutenção
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.js +15,Period,periode
 ,General Ledger,Razão
@@ -3464,9 +3323,7 @@
 ,Itemwise Recommended Reorder Level,Itemwise Recomendado nível de reposição
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +264,Please select {0} first,Por favor seleccione {0} primeiro
 DocType: Features Setup,To get Item Group in details table,Para obter Grupo item na tabela de detalhes
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +67,Redrawing,Redesenhar
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +112,Batch {0} of Item {1} has expired.,Lote {0} de {1} item expirou.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +120,Etching,Gravura a água forte
 DocType: Sales Invoice,Commission,comissão
 DocType: Address Template,"<h4>Default Template</h4>
 <p>Uses <a href=""http://jinja.pocoo.org/docs/templates/"">Jinja Templating</a> and all the fields of Address (including Custom Fields if any) will be available</p>
@@ -3511,7 +3368,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +340,Operation Time must be greater than 0 for Operation {0},Tempo de Operação deve ser maior que 0 para a operação {0}
 DocType: Supplier,Address and Contacts,Endereços e contatos
 DocType: UOM Conversion Detail,UOM Conversion Detail,UOM Detalhe Conversão
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +496,Keep it web friendly 900px (w) by 100px (h),Mantenha- web 900px amigável (w) por 100px ( h )
+apps/erpnext/erpnext/public/js/setup_wizard.js +242,Keep it web friendly 900px (w) by 100px (h),Mantenha- web 900px amigável (w) por 100px ( h )
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +329,Production Order cannot be raised against a Item Template,Ordem de produção não pode ser levantada contra um modelo de item
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +44,Charges are updated in Purchase Receipt against each item,Encargos são atualizados em Recibo de compra para cada item
 DocType: Payment Tool,Get Outstanding Vouchers,Obter Vales Pendentes
@@ -3527,54 +3384,49 @@
 DocType: Item,Average time taken by the supplier to deliver,Tempo médio necessário por parte do fornecedor para entregar
 DocType: Time Log,Hours,Horas
 DocType: Project,Expected Start Date,Data de Início do esperado
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +38,Rolling,Rolando
 DocType: ToDo,Priority,Prioridade
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +41,Remove item if charges is not applicable to that item,"Remover item, se as cargas não é aplicável a esse elemento"
 DocType: Dropbox Backup,Dropbox Access Allowed,Dropbox acesso permitido
 DocType: Dropbox Backup,Weekly,Semanal
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,Ex:. smsgateway.com/api/send_sms.cgi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +485,Receive,Receber
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +510,Receive,Receber
 DocType: Maintenance Visit,Fully Completed,Totalmente concluída
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% concluído
 DocType: Employee,Educational Qualification,Qualificação Educacional
 DocType: Workstation,Operating Costs,Custos Operacionais
 DocType: Employee Leave Approver,Employee Leave Approver,Empregado Leave Approver
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,{0} has been successfully added to our Newsletter list.,{0} foi adicionada com sucesso à nossa lista Newsletter.
-apps/erpnext/erpnext/stock/doctype/item/item.py +383,Row {0}: An Reorder entry already exists for this warehouse {1},Row {0}: Uma entrada de reabastecimento já existe para este armazém {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +387,Row {0}: An Reorder entry already exists for this warehouse {1},Row {0}: Uma entrada de reabastecimento já existe para este armazém {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +67,"Cannot declare as lost, because Quotation has been made.","Kan niet verklaren als verloren , omdat Offerte is gemaakt."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +133,Electron beam machining,Electron usinagem feixe
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Compra Mestre Gerente
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +424,Production Order {0} must be submitted,Ordem de produção {0} deve ser apresentado
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +150,Please select Start Date and End Date for Item {0},Por favor seleccione Data de início e data de término do item {0}
 apps/erpnext/erpnext/config/stock.py +141,Main Reports,Relatórios principais
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +102,Stock Ledger entries balances updated,Banco de Ledger Entradas saldos atualizados
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,Tot op heden kan niet eerder worden vanaf datum
 DocType: Purchase Receipt Item,Prevdoc DocType,Prevdoc DocType
-apps/erpnext/erpnext/stock/doctype/item/item.js +176,Add / Edit Prices,Adicionar / Editar preços
+apps/erpnext/erpnext/stock/doctype/item/item.js +178,Add / Edit Prices,Adicionar / Editar preços
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +53,Chart of Cost Centers,Plano de Centros de Custo
 ,Requested Items To Be Ordered,Itens solicitados devem ser pedidos
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +298,My Orders,Meus pedidos
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +293,My Orders,Meus pedidos
 DocType: Price List,Price List Name,Nome da lista de preços
 DocType: Time Log,For Manufacturing,Para Manufacturing
-apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +70,Totals,Totais
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +174,Totals,Totais
 DocType: BOM,Manufacturing,Fabrico
 ,Ordered Items To Be Delivered,Itens ordenados a ser entregue
 DocType: Account,Income,renda
 ,Setup Wizard,Assistente de Configuração
 DocType: Industry Type,Industry Type,Tipo indústria
 apps/erpnext/erpnext/templates/includes/cart.js +137,Something went wrong!,Algo deu errado!
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +68,Warning: Leave application contains following block dates,Atenção: Deixe o aplicativo contém seguintes datas bloco
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +251,Sales Invoice {0} has already been submitted,Fatura de vendas {0} já foi apresentado
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +100,Warning: Leave application contains following block dates,Atenção: Deixe o aplicativo contém seguintes datas bloco
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +256,Sales Invoice {0} has already been submitted,Fatura de vendas {0} já foi apresentado
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,Data de Conclusão
 DocType: Purchase Invoice Item,Amount (Company Currency),Quantidade (Moeda da Empresa)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +10,Die casting,Fundição
 DocType: Email Alert,Reference Date,Data de Referência
 apps/erpnext/erpnext/config/hr.py +105,Organization unit (department) master.,Organização unidade (departamento) mestre.
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +25,Please enter valid mobile nos,"Por favor, indique nn móveis válidos"
 DocType: Budget Detail,Budget Detail,Detalhe orçamento
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +75,Please enter message before sending,Por favor introduza a mensagem antes de enviá-
 DocType: Async Task,Status,Estado
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +65,Stock UOM updated for Item {0},Da UOM atualizado do número {0}
 DocType: Company History,Year,Ano
 apps/erpnext/erpnext/config/accounts.py +127,Point-of-Sale Profile,Point-of-Sale Perfil
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +68,Please Update SMS Settings,Atualize as Configurações relacionadas com o SMS
@@ -3588,12 +3440,12 @@
 ,Serial No Service Contract Expiry,N º de Série Vencimento Contrato de Serviço
 DocType: Item,Unit of Measure Conversion,Unidade de Conversão de Medida
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +86,Employee can not be changed,Empregado não pode ser alterado
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +259,You cannot credit and debit same account at the same time,Você não pode de crédito e débito mesma conta ao mesmo tempo
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,You cannot credit and debit same account at the same time,Você não pode de crédito e débito mesma conta ao mesmo tempo
 DocType: Naming Series,Help HTML,Ajuda HTML
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},Weightage total atribuído deve ser de 100 %. É {0}
 apps/erpnext/erpnext/controllers/status_updater.py +140,Allowance for over-{0} crossed for Item {1},Provisão para over-{0} cruzou para item {1}
 DocType: Address,Name of person or organization that this address belongs to.,Nome da pessoa ou organização que este endereço pertence.
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +587,Your Suppliers,uw Leveranciers
+apps/erpnext/erpnext/public/js/setup_wizard.js +325,Your Suppliers,uw Leveranciers
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,Kan niet ingesteld als Lost als Sales Order wordt gemaakt .
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +65,Another Salary Structure {0} is active for employee {1}. Please make its status 'Inactive' to proceed.,"Outra estrutura Salário {0} está ativo para empregado {1}. Por favor, faça o seu estatuto ""inativos"" para prosseguir."
 DocType: Purchase Invoice,Contact,Contato
@@ -3602,37 +3454,35 @@
 DocType: Item,Has Serial No,Não tem número de série
 DocType: Employee,Date of Issue,Data de Emissão
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +16,{0}: From {0} for {1},{0}: A partir de {0} para {1}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +154,Row #{0}: Set Supplier for item {1},Row # {0}: Jogo Fornecedor para o item {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +149,Row #{0}: Set Supplier for item {1},Row # {0}: Jogo Fornecedor para o item {1}
 DocType: Issue,Content Type,Tipo de conteúdo
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +17,Computer,computador
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,computador
 DocType: Item,List this Item in multiple groups on the website.,Lista este item em vários grupos no site.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +283,Please check Multi Currency option to allow accounts with other currency,"Por favor, verifique multi opção de moeda para permitir que contas com outra moeda"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +285,Please check Multi Currency option to allow accounts with other currency,"Por favor, verifique multi opção de moeda para permitir que contas com outra moeda"
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +62,Item: {0} does not exist in the system,Item: {0} não existe no sistema
 apps/erpnext/erpnext/accounts/doctype/account/account.py +81,You are not authorized to set Frozen value,U bent niet bevoegd om Frozen waarde in te stellen
 DocType: Payment Reconciliation,Get Unreconciled Entries,Obter Entradas não reconciliadas
 DocType: Cost Center,Budgets,Orçamentos
 apps/frappe/frappe/core/page/modules_setup/modules_setup.py +11,Updated,Atualizado
 DocType: Employee,Emergency Contact Details,Detalhes de contato de emergência
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +396,What does it do?,Wat doet het?
+apps/erpnext/erpnext/public/js/setup_wizard.js +144,What does it do?,Wat doet het?
 DocType: Delivery Note,To Warehouse,Para Armazém
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +45,Account {0} has been entered more than once for fiscal year {1},Conta {0} foi inserida mais de uma vez para o ano fiscal {1}
 ,Average Commission Rate,Taxa de Comissão Média
-apps/erpnext/erpnext/stock/doctype/item/item.py +313,'Has Serial No' can not be 'Yes' for non-stock item,'Tem número de série ' não pode ser 'Sim' para o item sem stock
+apps/erpnext/erpnext/stock/doctype/item/item.py +317,'Has Serial No' can not be 'Yes' for non-stock item,'Tem número de série ' não pode ser 'Sim' para o item sem stock
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Attendance can not be marked for future dates,Atendimento não pode ser marcado para datas futuras
 DocType: Pricing Rule,Pricing Rule Help,Regra Preços Ajuda
 DocType: Purchase Taxes and Charges,Account Head,Conta principal
 apps/erpnext/erpnext/config/stock.py +79,Update additional costs to calculate landed cost of items,Atualize custos adicionais para calcular o custo desembarcado de itens
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +111,Electrical,elétrico
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +111,Electrical,elétrico
 DocType: Stock Entry,Total Value Difference (Out - In),Diferença Valor Total (Out - In)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +302,Row {0}: Exchange Rate is mandatory,Row {0}: Taxa de Câmbio é obrigatória
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +304,Row {0}: Exchange Rate is mandatory,Row {0}: Taxa de Câmbio é obrigatória
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},ID do usuário não definido para Employee {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +72,Peening,Peening
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,From Warranty Claim,A partir da solicitação de garantia
 DocType: Stock Entry,Default Source Warehouse,Armazém da fonte padrão
 DocType: Item,Customer Code,Código Cliente
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +212,Birthday Reminder for {0},Lembrete de aniversário para {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +163,Lapping,Dobrando
-apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.js +8,Days Since Last Order,Dagen sinds vorige Bestel
+apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +72,Days Since Last Order,Dagen sinds vorige Bestel
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +299,Debit To account must be a Balance Sheet account,Débito em conta deve ser uma conta de Balanço
 DocType: Buying Settings,Naming Series,Nomeando Series
 DocType: Leave Block List,Leave Block List Name,Deixe o nome Lista de Bloqueios
@@ -3646,7 +3496,7 @@
 DocType: Notification Control,Sales Invoice Message,Vendas Mensagem Fatura
 DocType: Authorization Rule,Based On,Baseado em
 DocType: Sales Order Item,Ordered Qty,bestelde Aantal
-apps/erpnext/erpnext/stock/doctype/item/item.py +539,Item {0} is disabled,Item {0} está desativada
+apps/erpnext/erpnext/stock/doctype/item/item.py +543,Item {0} is disabled,Item {0} está desativada
 DocType: Stock Settings,Stock Frozen Upto,Fotografia congelada Upto
 apps/erpnext/erpnext/controllers/recurring_document.py +166,Period From and Period To dates mandatory for recurring {0},Período Do período Para datas e obrigatórias para os recorrentes {0}
 apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,Atividade de projeto / tarefa.
@@ -3656,7 +3506,6 @@
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,Desconto deve ser inferior a 100
 DocType: ToDo,Low,Baixo
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Escrever Off Montante (Companhia de moeda)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +71,Spinning,Fiação
 DocType: Landed Cost Voucher,Landed Cost Voucher,Landed Comprovante Custo
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +55,Please set {0},Defina {0}
 DocType: Purchase Invoice,Repeat on Day of Month,Repita no Dia do Mês
@@ -3678,7 +3527,6 @@
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +37,Campaign Name is required,Nome da campanha é necessária
 DocType: Maintenance Visit,Maintenance Date,Data de manutenção
 DocType: Purchase Receipt Item,Rejected Serial No,Rejeitado Não Serial
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +51,Deep drawing,Desenho profundo
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +40,New Newsletter,Novo Boletim informativo
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +157,Start date should be less than end date for Item {0},Data de início deve ser inferior a data final para o item {0}
 apps/erpnext/erpnext/stock/doctype/item/item.js +17,Show Balance,Mostrar Balance
@@ -3689,7 +3537,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +119,BOM and Manufacturing Quantity are required,BOM e Manufatura Quantidade são obrigatórios
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Faixa Envelhecimento 2
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +450,Amount,Quantidade
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +147,Riveting,Riveting
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,BOM substituído
 ,Sales Analytics,Sales Analytics
 DocType: Manufacturing Settings,Manufacturing Settings,Configurações de Fabricação
@@ -3701,20 +3548,19 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +207,New Account Name,Nieuw account Naam
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,Matérias-primas fornecidas Custo
 DocType: Selling Settings,Settings for Selling Module,Definições para vender Module
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +73,Customer Service,atendimento ao cliente
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Customer Service,atendimento ao cliente
 DocType: Item,Thumbnail,Miniatura
 DocType: Item Customer Detail,Item Customer Detail,Detalhe Cliente item
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +147,Confirm Your Email,Confirme Seu Email
 apps/erpnext/erpnext/config/hr.py +53,Offer candidate a Job.,Oferta candidato a Job.
 DocType: Notification Control,Prompt for Email on Submission of,Solicitar-mail mediante a apresentação da
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +81,Total allocated leaves are more than days in the period,Total de folhas alocados são mais do que dias no período
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +70,Item {0} must be a stock Item,Item {0} deve ser um item de stock
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,Padrão trabalho no armazém Progresso
 apps/erpnext/erpnext/config/accounts.py +107,Default settings for accounting transactions.,As configurações padrão para as transações contábeis.
 apps/frappe/frappe/model/naming.py +40,{0} is required,{0} é necessária
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +21,Vacuum molding,Moldagem a vácuo
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,Verwachte datum kan niet voor de Material Aanvraagdatum
 DocType: Contact Us Settings,City,Cidade
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +132,Ultrasonic machining,Ultrasonic usinagem
 apps/frappe/frappe/templates/base.html +137,Error: Not a valid id?,Erro: Não é um ID válido?
 apps/erpnext/erpnext/stock/get_item_details.py +125,Item {0} must be a Sales Item,Item {0} deve ser um item de vendas
 DocType: Naming Series,Update Series Number,Atualização de Número de Série
@@ -3722,7 +3568,7 @@
 DocType: Sales Order,Printing Details,Imprimir detalhes
 DocType: Task,Closing Date,Data de Encerramento
 DocType: Sales Order Item,Produced Quantity,Quantidade produzida
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +84,Engineer,engenheiro
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Engineer,engenheiro
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,Pesquisa subconjuntos
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +379,Item Code required at Row No {0},Código do item exigido no Row Não {0}
 DocType: Sales Partner,Partner Type,Tipo de parceiro
@@ -3730,7 +3576,7 @@
 DocType: Authorization Rule,Customerwise Discount,Desconto Customerwise
 DocType: Purchase Invoice,Against Expense Account,Contra a conta de despesas
 DocType: Production Order,Production Order,Ordem de Produção
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +258,Installation Note {0} has already been submitted,Instalação Nota {0} já foi apresentado
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +263,Installation Note {0} has already been submitted,Instalação Nota {0} já foi apresentado
 DocType: Quotation Item,Against Docname,Contra Docname
 DocType: SMS Center,All Employee (Active),Todos os Empregados (Ativo)
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,Ver Já
@@ -3739,19 +3585,19 @@
 DocType: Item,Re-Order Level,Re-order Nível
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,Digite itens e qty planejada para o qual você quer levantar ordens de produção ou fazer o download de matérias-primas para a análise.
 apps/frappe/frappe/public/js/frappe/views/ganttview.js +45,Gantt Chart,Gráfico Gantt
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +57,Part-time,Part-time
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,Part-time,Part-time
 DocType: Employee,Applicable Holiday List,Lista de férias aplicável
 DocType: Employee,Cheque,Cheque
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,Série Atualizado
 apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Report Type is mandatory,Tipo de relatório é obrigatória
 DocType: Item,Serial Number Series,Serienummer Series
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},Armazém é obrigatória para stock o item {0} na linha {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +45,Retail & Wholesale,Varejo e Atacado
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,Varejo e Atacado
 DocType: Issue,First Responded On,Primeiro respondeu em
 DocType: Website Item Group,Cross Listing of Item in multiple groups,Cruz de Listagem do item em vários grupos
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +351,The First User: You,De eerste gebruiker : U
+apps/erpnext/erpnext/public/js/setup_wizard.js +101,The First User: You,De eerste gebruiker : U
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +48,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},Ano Fiscal Data de Início e Término do Exercício Social Data já estão definidos no ano fiscal de {0}
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +172,Successfully Reconciled,Reconciliados com sucesso
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +119,Successfully Reconciled,Reconciliados com sucesso
 DocType: Production Order,Planned End Date,Planejado Data de Término
 apps/erpnext/erpnext/config/stock.py +43,Where items are stored.,Onde os itens são armazenados.
 DocType: Tax Rule,Validity,Validade
@@ -3771,40 +3617,37 @@
 DocType: DocPerm,Level,Nível
 DocType: Purchase Taxes and Charges,On Net Total,Em Líquida Total
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +160,Target warehouse in row {0} must be same as Production Order,Warehouse de destino na linha {0} deve ser o mesmo que ordem de produção
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +59,No permission to use Payment Tool,Sem permissão para usar ferramenta de pagamento
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +97,No permission to use Payment Tool,Sem permissão para usar ferramenta de pagamento
 apps/erpnext/erpnext/controllers/recurring_document.py +192,'Notification Email Addresses' not specified for recurring %s,"'Notificação Endereços de e-mail"" não especificado para o recorrente %s"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +86,Milling,Fresagem
 apps/erpnext/erpnext/accounts/doctype/account/account.py +99,Currency can not be changed after making entries using some other currency,Moeda não pode ser alterada depois de fazer entradas usando alguma outra moeda
 DocType: Company,Round Off Account,Termine Conta
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +60,Nibbling,Mordiscando
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,Despesas Administrativas
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +18,Consulting,consultor
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +18,Consulting,consultor
 DocType: Customer Group,Parent Customer Group,Grupo de Clientes pai
 apps/erpnext/erpnext/public/js/pos/pos.js +429,Change,Mudança
 DocType: Purchase Invoice,Contact Email,Contato E-mail
 DocType: Appraisal Goal,Score Earned,Pontuação Agregado
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +393,"e.g. ""My Company LLC""","por exemplo "" My Company LLC"""
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +173,Notice Period,Período de aviso prévio
+apps/erpnext/erpnext/public/js/setup_wizard.js +141,"e.g. ""My Company LLC""","por exemplo "" My Company LLC"""
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +173,Notice Period,Período de aviso prévio
 DocType: Bank Reconciliation Detail,Voucher ID,"ID de Vale
 "
 apps/erpnext/erpnext/setup/doctype/territory/territory.js +14,This is a root territory and cannot be edited.,Dit is een wortel grondgebied en kan niet worden bewerkt .
 DocType: Packing Slip,Gross Weight UOM,UOM Peso Bruto
 DocType: Email Digest,Receivables / Payables,Contas a receber / contas a pagar
 DocType: Delivery Note Item,Against Sales Invoice,Contra a nota fiscal de venda
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +63,Stamping,Estampagem
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +457,Credit Account,Conta de crédito
 DocType: Landed Cost Item,Landed Cost Item,Item de custo Landed
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +56,Show zero values,Mostrar valores de zero
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,Quantidade do item obtido após a fabricação / reembalagem de determinadas quantidades de matérias-primas
 DocType: Payment Reconciliation,Receivable / Payable Account,Receber Conta / Payable
 DocType: Delivery Note Item,Against Sales Order Item,Contra a Ordem de venda do item
-apps/erpnext/erpnext/stock/doctype/item/item.py +521,Please specify Attribute Value for attribute {0},"Por favor, especifique Atributo Valor para o atributo {0}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +525,Please specify Attribute Value for attribute {0},"Por favor, especifique Atributo Valor para o atributo {0}"
 DocType: Item,Default Warehouse,Armazém padrão
 DocType: Task,Actual End Date (via Time Logs),Data Real End (via Time Logs)
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +37,Budget cannot be assigned against Group Account {0},Orçamento não pode ser atribuído contra a conta de grupo {0}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +23,Please enter parent cost center,Por favor entre o centro de custo pai
 DocType: Delivery Note,Print Without Amount,Imprimir Sem Quantia
-apps/erpnext/erpnext/controllers/buying_controller.py +69,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,Fiscale categorie kan ' Valuation ' of ' Valuation en Total ' als alle items zijn niet-voorraadartikelen niet
+apps/erpnext/erpnext/controllers/buying_controller.py +60,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,Fiscale categorie kan ' Valuation ' of ' Valuation en Total ' als alle items zijn niet-voorraadartikelen niet
 DocType: User,Last Name,Sobrenome
 DocType: Web Page,Left,Esquerda
 DocType: Event,All Day,Todo o Dia
@@ -3812,7 +3655,7 @@
 DocType: Appraisal,Total Score (Out of 5),Pontuação total (em 5)
 DocType: Contact Us Settings,State,Estado
 DocType: Batch,Batch,Fornada
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +51,Balance,Equilíbrio
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +28,Balance,Equilíbrio
 DocType: Project,Total Expense Claim (via Expense Claims),Reivindicação de Despesa Total (via relatórios de despesas)
 DocType: User,Gender,Sexo
 DocType: Journal Entry,Debit Note,Nota de Débito
@@ -3842,8 +3685,7 @@
 DocType: Purchase Order,Get Last Purchase Rate,Obter Última Tarifa de Compra
 DocType: Time Log,Billing Rate based on Activity Type (per hour),Taxa de facturação com base no tipo de atividade (por hora)
 DocType: Company,Company Info,Informações da empresa
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +76,Seaming,Costura
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +197,"Company Email ID not found, hence mail not sent","Empresa E-mail ID não foi encontrado , daí mail não enviado"
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +206,"Company Email ID not found, hence mail not sent","Empresa E-mail ID não foi encontrado , daí mail não enviado"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Aplicações de Recursos ( Ativos )
 DocType: Production Planning Tool,Filter based on item,Filtrar com base no item
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +451,Debit Account,Conta de debito
@@ -3855,17 +3697,16 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +95,{0} {1} has been modified. Please refresh.,"{0} {1} foi modificado . Por favor, atualize ."
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,Pare de usuários de fazer aplicações deixam nos dias seguintes.
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +591,From Opportunity,van Opportunity
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +46,Blanking,Branqueamento
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +166,Employee Benefits,Benefícios a Empregados
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,Employee Benefits,Benefícios a Empregados
 DocType: Sales Invoice,Is POS,É POS
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +240,Packed quantity must equal quantity for Item {0} in row {1},Embalado quantidade deve ser igual a quantidade de item {0} na linha {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +245,Packed quantity must equal quantity for Item {0} in row {1},Embalado quantidade deve ser igual a quantidade de item {0} na linha {1}
 DocType: Production Order,Manufactured Qty,Qtde fabricados
 DocType: Purchase Receipt Item,Accepted Quantity,Quantidade Aceite
 apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} não existe
 apps/erpnext/erpnext/config/accounts.py +18,Bills raised to Customers.,Contas levantou a Clientes.
 DocType: DocField,Default,Omissão
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Id Projeto
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +466,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Nenhuma linha {0}: Valor não pode ser superior a pendência Montante contra Despesa reivindicação {1}. Montante pendente é {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +468,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Nenhuma linha {0}: Valor não pode ser superior a pendência Montante contra Despesa reivindicação {1}. Montante pendente é {2}
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +40,{0} subscribers added,{0} assinantes acrescentado
 DocType: Maintenance Schedule,Schedule,Programar
 DocType: Cost Center,"Define Budget for this Cost Center. To set budget action, see ""Company List""","Definir orçamento para este centro de custo. Para definir a ação orçamento, consulte &quot;Lista de Empresas&quot;"
@@ -3876,7 +3717,7 @@
 apps/erpnext/erpnext/public/js/pos/pos.js +91,Price List not found or disabled,Preço de tabela não encontrado ou deficientes
 DocType: Expense Claim,Approved,Aprovado
 DocType: Pricing Rule,Price,Preço
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +79,Employee relieved on {0} must be set as 'Left',Empregado aliviada em {0} deve ser definido como 'Esquerda'
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +88,Employee relieved on {0} must be set as 'Left',Empregado aliviada em {0} deve ser definido como 'Esquerda'
 DocType: Item,"Selecting ""Yes"" will give a unique identity to each entity of this item which can be viewed in the Serial No master.",Selecionando &quot;Sim&quot; vai dar uma identidade única para cada entidade deste item que pode ser visto no mestre Número de ordem.
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +39,Appraisal {0} created for Employee {1} in the given date range,Appraisal {0} criado para Employee {1} no intervalo de datas
 DocType: Employee,Education,educação
@@ -3887,7 +3728,7 @@
 apps/frappe/frappe/desk/moduleview.py +67,Standard Reports,Relatórios padrão
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,Lançamentos contábeis em diários
 DocType: Delivery Note Item,Available Qty at From Warehouse,Quantidade disponível no Armazém A partir de
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +209,Please select Employee Record first.,"Por favor, selecione Employee primeiro registro."
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +224,Please select Employee Record first.,"Por favor, selecione Employee primeiro registro."
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Row {0}: Party / conta não coincide com {1} / {2} em {3} {4}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +35,To create a Tax Account,Para criar uma conta de impostos
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +233,Please enter Expense Account,Por favor insira Conta Despesa
@@ -3900,46 +3741,43 @@
 DocType: Sales Order,Track this Sales Order against any Project,Acompanhar este Ordem de vendas contra qualquer projeto
 DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,Puxe pedidos de vendas pendentes (de entregar) com base nos critérios acima
 DocType: DocShare,Document Type,Tipo de Documento
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +565,From Supplier Quotation,Do Orçamento de Fornecedor
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +588,From Supplier Quotation,Do Orçamento de Fornecedor
 DocType: Deduction Type,Deduction Type,Tipo de dedução
 DocType: Attendance,Half Day,Meio Dia
 DocType: Pricing Rule,Min Qty,min Qty
 DocType: Features Setup,"To track items in sales and purchase documents with batch nos. ""Preferred Industry: Chemicals""",Para controlar os itens em documentos de vendas e de compra com nsa lote. &quot;Indústria preferida: Chemicals&quot;
 DocType: GL Entry,Transaction Date,Data Transação
 DocType: Production Plan Item,Planned Qty,Qtde planejada
-apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +91,Total Tax,Fiscal total
+apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +93,Total Tax,Fiscal total
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +178,For Quantity (Manufactured Qty) is mandatory,Para Quantidade (fabricado Qtde) é obrigatório
 DocType: Stock Entry,Default Target Warehouse,Armazém alvo padrão
 DocType: Purchase Invoice,Net Total (Company Currency),Total Líquido (Moeda Company)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +79,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Row {0}: Party Tipo e partido só é aplicável contra a receber / a pagar contas
 DocType: Notification Control,Purchase Receipt Message,Mensagem comprar Recebimento
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +95,Total allocated leaves are more than period,Total de folhas alocados mais de período
 DocType: Production Order,Actual Start Date,Atual Data de início
 DocType: Sales Order,% of materials delivered against this Sales Order,% dos materiais entregues contra esta Ordem de Vendas
 apps/erpnext/erpnext/config/stock.py +23,Record item movement.,Gravar o movimento item.
 DocType: Newsletter List Subscriber,Newsletter List Subscriber,Boletim lista assinante
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +164,Morticing,Escatelar
 DocType: Email Account,Service,serviço
 DocType: Hub Settings,Hub Settings,Configurações Hub
 DocType: Project,Gross Margin %,Margem Bruta%
 DocType: BOM,With Operations,Com Operações
 apps/erpnext/erpnext/accounts/party.py +232,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,"Lançamentos contábeis já foram feitas em moeda {0} para {1} empresa. Por favor, selecione uma conta a receber ou a pagar com a moeda {0}."
 ,Monthly Salary Register,Salário mensal Registrar
-apps/frappe/frappe/website/template.py +140,Next,próximo
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard_page.html +17,Next,próximo
 DocType: Warranty Claim,If different than customer address,Se diferente do endereço do cliente
 DocType: BOM Operation,BOM Operation,Operação BOM
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +118,Electropolishing,Electropolimento
 DocType: Purchase Taxes and Charges,On Previous Row Amount,Quantidade em linha anterior
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +24,Please enter Payment Amount in atleast one row,Digite valor do pagamento em pelo menos uma fileira
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +33,Please enter Payment Amount in atleast one row,Digite valor do pagamento em pelo menos uma fileira
 DocType: POS Profile,POS Profile,POS Perfil
 apps/erpnext/erpnext/config/accounts.py +153,"Seasonality for setting budgets, targets etc.","Sazonalidade para definição de orçamentos, metas etc."
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +238,Row {0}: Payment Amount cannot be greater than Outstanding Amount,Row {0}: valor do pagamento não pode ser maior do que a quantidade Outstanding
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +46,Total Unpaid,Total de Unpaid
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +21,Time Log is not billable,Tempo Log não é cobrável
 apps/erpnext/erpnext/stock/get_item_details.py +128,"Item {0} is a template, please select one of its variants","Item {0} é um modelo, por favor selecione uma de suas variantes"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +528,Purchaser,Comprador
+apps/erpnext/erpnext/public/js/setup_wizard.js +272,Purchaser,Comprador
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +81,Net pay cannot be negative,Salário líquido não pode ser negativo
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +71,Please enter the Against Vouchers manually,"Por favor, indique o Contra Vouchers manualmente"
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +107,Please enter the Against Vouchers manually,"Por favor, indique o Contra Vouchers manualmente"
 DocType: SMS Settings,Static Parameters,Parâmetros estáticos
 DocType: Purchase Order,Advance Paid,Adiantamento pago
 DocType: Item,Item Tax,Imposto item
@@ -3948,14 +3786,12 @@
 apps/erpnext/erpnext/config/crm.py +48,Send mass SMS to your contacts,Enviar SMS em massa para seus contatos
 DocType: Purchase Taxes and Charges,Consider Tax or Charge for,Considere imposto ou encargo para
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,Qtde real é obrigatória
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +42,Cross-rolling,Cross-rolamento
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +132,Credit Card,cartão de crédito
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +132,Credit Card,cartão de crédito
 DocType: BOM,Item to be manufactured or repacked,Item a ser fabricados ou reembalados
 apps/erpnext/erpnext/config/stock.py +95,Default settings for stock transactions.,As configurações padrão para transações com ações .
 DocType: Purchase Invoice,Next Date,Data próxima
 DocType: Employee Education,Major/Optional Subjects,Assuntos Principais / Opcional
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +49,Please enter Taxes and Charges,Digite Impostos e Taxas
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +85,Machining,Usinagem
 DocType: Sales Invoice Item,Drop Ship,Drop Ship
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","Aqui você pode manter detalhes como o nome da família e ocupação do cônjuge, pai e filhos"
 DocType: Hub Settings,Seller Name,Vendedor Nome
@@ -3965,7 +3801,7 @@
 DocType: Stock Entry,Repack,Reembalar
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +6,You must Save the form before proceeding,Você deve salvar o formulário antes de continuar
 DocType: Item Attribute,Numeric Values,Os valores numéricos
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +500,Attach Logo,anexar Logo
+apps/erpnext/erpnext/public/js/setup_wizard.js +246,Attach Logo,anexar Logo
 DocType: Customer,Commission Rate,Taxa de Comissão
 apps/erpnext/erpnext/stock/doctype/item/item.js +38,Make Variant,Faça Variant
 apps/erpnext/erpnext/config/hr.py +145,Block leave applications by department.,Bloquear deixar aplicações por departamento.
@@ -3980,19 +3816,19 @@
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +105,Please select a csv file,"Por favor, selecione um arquivo csv"
 DocType: Dropbox Backup,Send Backups to Dropbox,Enviar Backups para Dropbox
 DocType: Purchase Order,To Receive and Bill,Para receber e Bill
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +94,Designer,estilista
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Designer,estilista
 apps/erpnext/erpnext/config/selling.py +121,Terms and Conditions Template,Termos e Condições de modelo
 DocType: Serial No,Delivery Details,Detalhes da entrega
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +383,Cost Center is required in row {0} in Taxes table for type {1},Centro de Custo é necessária na linha {0} no Imposto de mesa para o tipo {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +386,Cost Center is required in row {0} in Taxes table for type {1},Centro de Custo é necessária na linha {0} no Imposto de mesa para o tipo {1}
 DocType: Item,Automatically create Material Request if quantity falls below this level,Criar automaticamente um pedido de material se a quantidade for inferior a este nível
 ,Item-wise Purchase Register,Item-wise Compra Register
 DocType: Batch,Expiry Date,Data de validade
-apps/erpnext/erpnext/stock/doctype/item/item.py +375,"To set reorder level, item must be a Purchase Item or Manufacturing Item","Para definir o nível de reabastecimento, o item deve ser um item de compra ou Manufacturing item"
+apps/erpnext/erpnext/stock/doctype/item/item.py +379,"To set reorder level, item must be a Purchase Item or Manufacturing Item","Para definir o nível de reabastecimento, o item deve ser um item de compra ou Manufacturing item"
 ,Supplier Addresses and Contacts,Leverancier Adressen en Contacten
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,Selecteer Categorie eerst
 apps/erpnext/erpnext/config/projects.py +18,Project master.,Projeto mestre.
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,Não mostrar qualquer símbolo como US $ etc ao lado de moedas.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +330, (Half Day),(Meio Dia)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +374, (Half Day),(Meio Dia)
 DocType: Supplier,Credit Days,Dias de crédito
 DocType: Leave Type,Is Carry Forward,É Carry Forward
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +478,Get Items from BOM,Obter itens da Lista de Material
@@ -4000,7 +3836,7 @@
 apps/erpnext/erpnext/config/manufacturing.py +120,Bill of Materials,Bill of Materials
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +77,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Row {0}: Party Tipo e partido é necessário para receber / pagar conta {1}
 DocType: Dropbox Backup,Send Notifications To,Enviar notificações para
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html +26,Ref Date,Ref Data
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +54,Ref Date,Ref Data
 DocType: Employee,Reason for Leaving,Motivo da saída
 DocType: Expense Claim Detail,Sanctioned Amount,Quantidade sancionada
 DocType: GL Entry,Is Opening,Está abrindo
@@ -4008,4 +3844,3 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +188,Account {0} does not exist,Conta {0} não existe
 DocType: Account,Cash,Numerário
 DocType: Employee,Short biography for website and other publications.,Breve biografia para o site e outras publicações.
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +31,Please create Salary Structure for employee {0},"Por favor, crie estrutura salarial por empregado {0}"
diff --git a/erpnext/translations/ro.csv b/erpnext/translations/ro.csv
index b25f750..130a9f0 100644
--- a/erpnext/translations/ro.csv
+++ b/erpnext/translations/ro.csv
@@ -1,13 +1,12 @@
 DocType: Employee,Salary Mode,Mod de salariu
 DocType: Cost Center,"Select Monthly Distribution, if you want to track based on seasonality.","Selectați Distributie lunar, dacă doriți să urmăriți bazat pe sezonalitate."
 DocType: Employee,Divorced,Divorțat/a
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +86,Warning: Same item has been entered multiple times.,Atenție: Same articol a fost introdus de mai multe ori.
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +80,Warning: Same item has been entered multiple times.,Atenție: Same articol a fost introdus de mai multe ori.
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +96,Items already synced,Articole deja sincronizate
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,Permiteți Element care trebuie adăugate mai multe ori într-o tranzacție
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,Anulează Stivuitoare Vizitați {0} înainte de a anula acest revendicarea Garanție
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +19,Consumer Products,Produse consumator
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,Produse consumator
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +68,Please select Party Type first,Vă rugăm să selectați Party Type primul
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +90,Annealing,Refacere
 DocType: Item,Customer Items,Articole clientului
 apps/erpnext/erpnext/accounts/doctype/account/account.py +45,Account {0}: Parent account {1} can not be a ledger,Contul {0}: cont Părinte {1} nu poate fi un registru
 DocType: Item,Publish Item to hub.erpnext.com,Publica Postul de hub.erpnext.com
@@ -20,15 +19,14 @@
 DocType: About Us Settings,Website,Site web
 DocType: POS Profile,Applicable for User,Aplicabil pentru utilizator
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +169,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Oprit comandă de producție nu poate fi anulat, acesta unstop întâi pentru a anula"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +23,Compaction plus sintering,Compactare plus sinterizare
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,Currency is required for Price List {0},Moneda este necesară pentru lista de prețuri {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Va fi calculat în cadrul tranzacției.
 DocType: Purchase Order,Customer Contact,Clientul A lua legatura
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +549,From Material Request,Din Cerere de Material
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +572,From Material Request,Din Cerere de Material
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} arbore
 DocType: Job Applicant,Job Applicant,Solicitant loc de muncă
 apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,Nu mai multe rezultate.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +78,Legal,Juridic
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +34,Legal,Juridic
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +114,Actual type tax cannot be included in Item rate in row {0},Taxa efectivă de tip nu poate fi inclusă în tariful articolului din rândul {0}
 DocType: C-Form,Customer,Client
 DocType: Purchase Receipt Item,Required By,Cerute de
@@ -43,7 +41,6 @@
 DocType: Manufacturing Settings,Default 10 mins,Implicit 10 minute
 DocType: Leave Type,Leave Type Name,Denumire Tip Concediu
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +148,Series Updated Successfully,Seria Actualizat cu succes
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +150,Stitching,Broșat
 DocType: Pricing Rule,Apply On,Se aplică pe
 DocType: Item Price,Multiple Item prices.,Mai multe prețuri element.
 ,Purchase Order Items To Be Received,Achiziția comandă elementele de încasat
@@ -51,8 +48,8 @@
 DocType: Quality Inspection Reading,Parameter,Parametru
 apps/erpnext/erpnext/projects/doctype/project/project.py +43,Expected End Date can not be less than Expected Start Date,Așteptat Data de încheiere nu poate fi mai mică de Data de începere așteptată
 apps/erpnext/erpnext/utilities/transaction_base.py +104,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Row # {0}: Rata trebuie să fie aceeași ca și {1}: {2} ({3} / {4})
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +189,New Leave Application,Noua cerere de concediu
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +134,Bank Draft,Ciorna bancară
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +204,New Leave Application,Noua cerere de concediu
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +134,Bank Draft,Ciorna bancară
 DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,1 Pentru a menține codul de client element înțelept și pentru a le face pe baza utilizării lor cod de această opțiune
 DocType: Mode of Payment Account,Mode of Payment Account,Modul de cont de plăți
 apps/erpnext/erpnext/stock/doctype/item/item.js +34,Show Variants,Arată Variante
@@ -64,25 +61,23 @@
 DocType: Production Plan Item,Production Plan Item,Planul de producție Articol
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +141,User {0} is already assigned to Employee {1},Utilizatorul {0} este deja alocat Angajat {1}
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +13,Make new POS Profile,Face noi POS profil
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +31,Health Care,Servicii de Sanatate
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,Servicii de Sanatate
 DocType: Purchase Invoice,Monthly,Lunar
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +66,Delay in payment (Days),Întârziere de plată (zile)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +494,Invoice,Factură
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +519,Invoice,Factură
 DocType: Maintenance Schedule Item,Periodicity,Periodicitate
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +357,Email Address,Adresa De E-Mail
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +21,Defense,Apărare
+apps/erpnext/erpnext/public/js/setup_wizard.js +107,Email Address,Adresa De E-Mail
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,Apărare
 DocType: Company,Abbr,Presc
 DocType: Appraisal Goal,Score (0-5),Scor (0-5)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +193,Row {0}: {1} {2} does not match with {3},Rând {0}: {1} {2} nu se potrivește cu {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +67,Row # {0}:,
 DocType: Delivery Note,Vehicle No,Vehicul Nici
 apps/erpnext/erpnext/public/js/pos/pos.js +528,Please select Price List,Vă rugăm să selectați lista de prețuri
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +162,Woodworking,Prelucrarea lemnului
 DocType: Production Order Operation,Work In Progress,Lucrări în curs
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +153,3D printing,Imprimare 3D
 DocType: Employee,Holiday List,Lista de Vacanță
 DocType: Time Log,Time Log,Timp Conectare
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +530,Accountant,Contabil
+apps/erpnext/erpnext/public/js/setup_wizard.js +274,Accountant,Contabil
 DocType: Cost Center,Stock User,Stoc de utilizare
 DocType: Company,Phone No,Nu telefon
 DocType: Time Log,"Log of Activities performed by users against Tasks that can be used for tracking time, billing.","Log activităților efectuate de utilizatori, contra Sarcinile care pot fi utilizate pentru timpul de urmărire, facturare."
@@ -97,18 +92,19 @@
 DocType: Bin,Quantity Requested for Purchase,Cantitate solicitată de cumparare
 DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name","Atașați fișier .csv cu două coloane, una pentru denumirea veche și unul pentru denumirea nouă"
 DocType: Packed Item,Parent Detail docname,Părinte Detaliu docname
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Kg,Kg
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Kg,Kg
 apps/erpnext/erpnext/config/hr.py +48,Opening for a Job.,Deschidere pentru un loc de muncă.
 DocType: Item Attribute,Increment,Creștere
 apps/erpnext/erpnext/public/js/stock_analytics.js +63,Select Warehouse...,Selectați Depozit ...
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +6,Advertising,Publicitate
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,Publicitate
+apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,Aceeași societate este înscris de mai multe ori
 DocType: Employee,Married,Căsătorit
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +389,Stock cannot be updated against Delivery Note {0},Stock nu poate fi actualizat împotriva livrare Nota {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +391,Stock cannot be updated against Delivery Note {0},Stock nu poate fi actualizat împotriva livrare Nota {0}
 DocType: Payment Reconciliation,Reconcile,Reconcilierea
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +30,Grocery,Băcănie
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,Băcănie
 DocType: Quality Inspection Reading,Reading 1,Reading 1
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Make Bank Entry,Asigurați-Bank intrare
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +40,Pension Funds,Fondurile de pensii
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,Fondurile de pensii
 apps/erpnext/erpnext/accounts/doctype/account/account.py +142,Warehouse is mandatory if account type is Warehouse,Depozit este obligatorie dacă tipul de cont este de depozit
 DocType: SMS Center,All Sales Person,Toate persoanele de vânzăril
 DocType: Lead,Person Name,Nume persoană
@@ -130,7 +126,7 @@
 DocType: Quality Inspection,Get Specification Details,Obține detaliile specificațiilor
 DocType: Lead,Interested,Interesat
 apps/erpnext/erpnext/config/manufacturing.py +14,Bill of Material,Factură de material
-apps/erpnext/erpnext/public/js/stock_analytics.js +45,Opening,Deschidere
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +158,Opening,Deschidere
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},De la {0} {1} la
 DocType: Item,Copy From Item Group,Copiere din Grupul de Articole
 DocType: Journal Entry,Opening Entry,Deschiderea de intrare
@@ -144,23 +140,22 @@
 DocType: Employee Education,Under Graduate,Sub Absolvent
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +22,Target On,Țintă pe
 DocType: BOM,Total Cost,Cost total
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +99,Reaming,Alezaj
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +9,Activity Log:,Jurnal Activitati:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +199,Item {0} does not exist in the system or has expired,Articolul {0} nu există în sistem sau a expirat
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +44,Real Estate,Imobiliare
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +44,Real Estate,Imobiliare
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +4,Statement of Account,Extras de cont
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +41,Pharmaceuticals,Produse farmaceutice
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,Produse farmaceutice
 DocType: Expense Claim Detail,Claim Amount,Suma Cerere
 DocType: Employee,Mr,Mr
 DocType: Custom Script,Client,Client
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,Furnizor Tip / Furnizor
 DocType: Naming Series,Prefix,Prefix
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Consumable,Consumabile
+apps/erpnext/erpnext/public/js/setup_wizard.js +359,Consumable,Consumabile
 DocType: Upload Attendance,Import Log,Import Conectare
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.js +19,Send,Trimiteți
 DocType: Sales Invoice Item,Delivered By Supplier,Livrate de Furnizor
 DocType: SMS Center,All Contact,Toate contactele
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +164,Annual Salary,Salariu anual
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +164,Annual Salary,Salariu anual
 DocType: Period Closing Voucher,Closing Fiscal Year,Închiderea Anului Fiscal
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +69,Stock Expenses,Cheltuieli stoc
 DocType: Newsletter,Email Sent?,Email Trimis?
@@ -168,7 +163,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +92,Show Time Logs,Arată timp Busteni
 DocType: Journal Entry Account,Credit in Company Currency,Credit în companie valutar
 DocType: Delivery Note,Installation Status,Starea de instalare
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +115,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Cant acceptată + respinsă trebuie să fie egală cu cantitatea recepționată pentru articolul {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +118,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Cant acceptată + respinsă trebuie să fie egală cu cantitatea recepționată pentru articolul {0}
 DocType: Item,Supply Raw Materials for Purchase,Materii prime de alimentare pentru cumparare
 apps/erpnext/erpnext/stock/get_item_details.py +133,Item {0} must be a Purchase Item,Articolul {0} trebuie să fie un Articol de Cumparare
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
@@ -176,19 +171,17 @@
  Toate datele și angajat combinație în perioada selectata va veni în șablon, cu înregistrări nervi existente"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +446,Item {0} is not active or end of life has been reached,Articolul {0} nu este activ sau sfarsitul ciclului sau de viata a fost atins
 DocType: Time Log Batch,Will be updated after Sales Invoice is Submitted.,Vor fi actualizate după Factura Vanzare este prezentat.
-apps/erpnext/erpnext/controllers/accounts_controller.py +493,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Pentru a include taxa în rândul {0} în rata articol, impozitele în rânduri {1} trebuie de asemenea să fie incluse"
+apps/erpnext/erpnext/controllers/accounts_controller.py +494,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Pentru a include taxa în rândul {0} în rata articol, impozitele în rânduri {1} trebuie de asemenea să fie incluse"
 apps/erpnext/erpnext/config/hr.py +90,Settings for HR Module,Setările pentru modul HR
 DocType: SMS Center,SMS Center,SMS Center
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +78,Straightening,Îndreptare
 DocType: BOM Replace Tool,New BOM,Nou BOM
 apps/erpnext/erpnext/config/projects.py +28,Batch Time Logs for billing.,Înregistrarile temporale aferente lotului pentru facturare.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +15,Countergravity casting,Turnare Countergravity
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +30,Newsletter has already been sent,Newsletter-ul a fost deja trimis
 DocType: Lead,Request Type,Cerere tip
 DocType: Leave Application,Reason,motiv
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +14,Broadcasting,Transminiune
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +140,Execution,Executie
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +364,The first user will become the System Manager (you can change this later).,Primul Utilizatorul va deveni System Manager (puteți schimba asta mai târziu).
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,Transminiune
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +140,Execution,Executie
+apps/erpnext/erpnext/public/js/setup_wizard.js +114,The first user will become the System Manager (you can change this later).,Primul Utilizatorul va deveni System Manager (puteți schimba asta mai târziu).
 apps/erpnext/erpnext/config/manufacturing.py +39,Details of the operations carried out.,Detalii privind operațiunile efectuate.
 DocType: Serial No,Maintenance Status,Stare Mentenanta
 apps/erpnext/erpnext/config/stock.py +263,Items and Pricing,Articole și Prețuri
@@ -205,7 +198,6 @@
 DocType: Pricing Rule,Discount on Price List Rate (%),Reducere la Lista de preturi Rate (%)
 apps/frappe/frappe/public/js/frappe/form/print.js +96,Start,Început(Pornire)
 DocType: User,First Name,Prenume
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +12,Full-mold casting,Turnare full-mucegai
 DocType: Offer Letter,Select Terms and Conditions,Selectați Termeni și condiții
 DocType: Production Planning Tool,Sales Orders,Comenzi de vânzări
 DocType: Purchase Taxes and Charges,Valuation,Evaluare
@@ -217,8 +209,7 @@
 DocType: Bank Reconciliation,Bank Account,Cont bancar
 DocType: Leave Type,Allow Negative Balance,Permiteţi sold negativ
 DocType: Selling Settings,Default Territory,Teritoriu Implicit
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +53,Television,Televiziune
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +138,Gashing,Tăiere prin tranșare
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,Televiziune
 DocType: Production Order Operation,Updated via 'Time Log',"Actualizat prin ""Ora Log"""
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +82,Account {0} does not belong to Company {1},Contul {0} nu aparține Companiei {1}
 DocType: Naming Series,Series List for this Transaction,Lista de serie pentru această tranzacție
@@ -233,14 +224,13 @@
 DocType: Leave Allocation,Add unused leaves from previous allocations,Adauga frunze neutilizate de alocări anterioare
 apps/erpnext/erpnext/controllers/recurring_document.py +206,Next Recurring {0} will be created on {1},Urmatoarea recurent {0} va fi creat pe {1}
 DocType: Newsletter List,Total Subscribers,Abonații totale
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +575,Contact Name,Nume Persoana de Contact
+,Contact Name,Nume Persoana de Contact
 DocType: Production Plan Item,SO Pending Qty,SO așteptare Cantitate
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Creare fluturas de salariu pentru criteriile mentionate mai sus.
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,Cere pentru cumpărare.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +107,Double housing,Locuințe dublu
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +156,Only the selected Leave Approver can submit this Leave Application,Numai selectat concediu aprobator poate înainta această aplicație Leave
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +171,Only the selected Leave Approver can submit this Leave Application,Numai selectat concediu aprobator poate înainta această aplicație Leave
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,Alinarea Data trebuie să fie mai mare decât Data aderării
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +172,Leaves per Year,Frunze pe an
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +172,Leaves per Year,Frunze pe an
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup > Settings > Naming Series,Vă rugăm să setați Numirea Series pentru {0} prin Configurare&gt; Setări&gt; Seria Naming
 DocType: Time Log,Will be updated when batched.,Vor fi actualizate atunci când dozate.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +104,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,"Rând {0}: Vă rugăm să verificați ""Este Advance"" împotriva Cont {1} dacă aceasta este o intrare în avans."
@@ -249,25 +239,24 @@
 DocType: Item Website Specification,Item Website Specification,Specificație Site Articol
 DocType: Dropbox Backup,Dropbox Access Key,Cheie de Acces Dropbox 
 DocType: Payment Tool,Reference No,De referință nr
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +348,Leave Blocked,Concediu Blocat
-apps/erpnext/erpnext/stock/doctype/item/item.py +535,Item {0} has reached its end of life on {1},Articolul {0} a ajuns la sfârșitul cliclului sau de viață in {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +392,Leave Blocked,Concediu Blocat
+apps/erpnext/erpnext/stock/doctype/item/item.py +539,Item {0} has reached its end of life on {1},Articolul {0} a ajuns la sfârșitul cliclului sau de viață in {1}
 apps/erpnext/erpnext/accounts/utils.py +339,Annual,Anual
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Stock reconciliere Articol
 DocType: Stock Entry,Sales Invoice No,Factură de vânzări Nu
 DocType: Material Request Item,Min Order Qty,Min Ordine Cantitate
 DocType: Lead,Do Not Contact,Nu contactati
 DocType: Sales Invoice,The unique id for tracking all recurring invoices. It is generated on submit.,Id-ul unic pentru urmărirea toate facturile recurente. Acesta este generat pe prezinte.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +93,Software Developer,Software Developer
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +93,Software Developer,Software Developer
 DocType: Item,Minimum Order Qty,Comanda minima Cantitate
 DocType: Pricing Rule,Supplier Type,Furnizor Tip
 DocType: Item,Publish in Hub,Publica in Hub
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +555,Item {0} is cancelled,Articolul {0} este anulat
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +598,Material Request,Cerere de material
+apps/erpnext/erpnext/stock/doctype/item/item.py +559,Item {0} is cancelled,Articolul {0} este anulat
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +607,Material Request,Cerere de material
 DocType: Bank Reconciliation,Update Clearance Date,Actualizare Clearance Data
 DocType: Item,Purchase Details,Detalii de cumpărare
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +323,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},Postul {0} nu a fost găsit în &quot;Materii prime furnizate&quot; masă în Comandă {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +129,Wire brushing,Sârmă periaj
 DocType: Employee,Relation,Relație
 DocType: Shipping Rule,Worldwide Shipping,Expediere
 apps/erpnext/erpnext/config/selling.py +23,Confirmed orders from Customers.,Comenzi confirmate de la clienți.
@@ -283,12 +272,11 @@
 DocType: Supplier,Address HTML,Adresă HTML
 DocType: Lead,Mobile No.,Mobil Nu.
 DocType: Maintenance Schedule,Generate Schedule,Generează orar
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +81,Hubbing,Hubbing
 DocType: Purchase Invoice Item,Expense Head,Beneficiar Cheltuiala
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +86,Please select Charge Type first,Vă rugăm să selectați tipul de taxă în primul rând
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,Ultimul
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +395,Max 5 characters,Max 5 caractere
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +195,Select Your Language,Selectați limba
+apps/erpnext/erpnext/public/js/setup_wizard.js +143,Max 5 characters,Max 5 caractere
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +245,Select Your Language,Selectați limba
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,Primul Aprobatorul Lăsați în lista va fi setat ca implicit concediu aprobator
 DocType: Manufacturing Settings,"Disables creation of time logs against Production Orders.
 Operations shall not be tracked against Production Order",Dezactivează crearea de busteni de timp împotriva ordinelor de producție. Operațiuni nu sunt urmărite în producție Ordine
@@ -300,8 +288,6 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +34,Item {0} must be Service Item,Articolul {0} trebuie să fie un Articol de Service
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +303,Completed Qty can not be greater than 'Qty to Manufacture',"Finalizat Cantitate nu poate fi mai mare decât ""Cantitate de Fabricare"""
 DocType: DocType,Administrator,Administrator
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +136,Laser drilling,Foraj Laser
-DocType: Stock UOM Replace Utility,New Stock UOM,Nou Stock UOM
 DocType: Period Closing Voucher,Closing Account Head,Închidere Cont Principal
 DocType: Employee,External Work History,Istoricul lucrului externă
 apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,Eroare de referință Circular
@@ -310,18 +296,15 @@
 DocType: Lead,Industry,Industrie
 DocType: Employee,Job Profile,Profilul postului
 DocType: Newsletter,Newsletter,Newsletter
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +84,Hydroforming,Hidroformare
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +49,Necking,Necking
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Notifica prin e-mail la crearea de cerere automată Material
 DocType: Journal Entry,Multi Currency,Multi valutar
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +51,Item is updated,Articolul este Actualizat
 DocType: Async Task,System Manager,System Manager
 DocType: Payment Reconciliation Invoice,Invoice Type,Factura Tip
 DocType: Sales Invoice Item,Delivery Note,Nota de Livrare
 DocType: Dropbox Backup,Allow Dropbox Access,Permiteţi accesul Dropbox
 apps/erpnext/erpnext/config/learn.py +72,Setting up Taxes,Configurarea Impozite
 apps/erpnext/erpnext/accounts/utils.py +189,Payment Entry has been modified after you pulled it. Please pull it again.,Plata intrare a fost modificat după ce-l tras. Vă rugăm să trage din nou.
-apps/erpnext/erpnext/stock/doctype/item/item.py +343,{0} entered twice in Item Tax,{0} a fost introdus de două ori în taxa articolului
+apps/erpnext/erpnext/stock/doctype/item/item.py +347,{0} entered twice in Item Tax,{0} a fost introdus de două ori în taxa articolului
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +105,Summary for this week and pending activities,Rezumat pentru această săptămână și a activităților în curs
 DocType: Workstation,Rent Cost,Chirie Cost
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +74,Please select month and year,Vă rugăm selectați luna și anul
@@ -338,24 +321,22 @@
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,Rata la care Clientul valuta este convertită în valuta de bază a clientului
 DocType: Features Setup,"Available in BOM, Delivery Note, Purchase Invoice, Production Order, Purchase Order, Purchase Receipt, Sales Invoice, Sales Order, Stock Entry, Timesheet","Disponibil în BOM, nota de livrare, factura de cumparare, comanda de producție, comanda de cumparare, chitanţa de cumpărare, factura de vânzare,comanda de vânzare, intrare de stoc, pontaj"
 DocType: Item Tax,Tax Rate,Cota de impozitare
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Select Item,Selectați articol
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +540,Select Item,Selectați articol
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +143,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","Postul: {0} în șarje, nu pot fi reconciliate cu ajutorul \
  stoc reconciliere, utilizați în schimb stoc intrare gestionate"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +259,Purchase Invoice {0} is already submitted,Factura de cumpărare {0} este deja depusă
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +262,Purchase Invoice {0} is already submitted,Factura de cumpărare {0} este deja depusă
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Batch No must be same as {1} {2},Row # {0}: Lot nr trebuie să fie aceeași ca și {1} {2}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Convert to non-Group,Converti la non-Group
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +55,Purchase Receipt must be submitted,Primirea cumparare trebuie depuse
-DocType: Stock UOM Replace Utility,Current Stock UOM,Stoc Curent UOM
 apps/erpnext/erpnext/config/stock.py +53,Batch (lot) of an Item.,Lotul (lot) unui articol.
 DocType: C-Form Invoice Detail,Invoice Date,Data facturii
 DocType: GL Entry,Debit Amount,Suma debit
 apps/erpnext/erpnext/accounts/party.py +223,There can only be 1 Account per Company in {0} {1},Nu poate fi doar un cont per companie în {0} {1}
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Your email address,Adresa dvs. de e-mail
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +194,Please see attachment,Vă rugăm să consultați atașament
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +203,Please see attachment,Vă rugăm să consultați atașament
 DocType: Purchase Order,% Received,% Primit
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +109,Water jet cutting,Tăiere cu jet de apă
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +24,Setup Already Complete!!,Setup deja complet!
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +20,Setup Already Complete!!,Setup deja complet!
 ,Finished Goods,Produse Finite
 DocType: Delivery Note,Instructions,Instrucţiuni
 DocType: Quality Inspection,Inspected By,Inspectat de
@@ -370,6 +351,7 @@
 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.,Vă rugăm să nu creeze conturi pentru clienți și furnizori. Ele sunt create direct de la masterat Client / furnizor.
 DocType: Currency Exchange,Currency Exchange,Schimb valutar
 DocType: Purchase Invoice Item,Item Name,Denumire Articol
+DocType: Authorization Rule,Approving User  (above authorized value),Aprobarea utilizator (mai mare decât valoarea autorizată)
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Credit Balance,Balanța de credit
 DocType: Employee,Widowed,Văduvit
 DocType: Production Planning Tool,"Items to be requested which are ""Out of Stock"" considering all warehouses based on projected qty and minimum order qty",
@@ -379,11 +361,10 @@
 ,Purchase Register,Cumpărare Inregistrare
 DocType: Landed Cost Item,Applicable Charges,Taxe aplicabile
 DocType: Workstation,Consumable Cost,Cost Consumabile
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,{0} ({1}) must have role 'Leave Approver',"{0} ({1}) trebuie să dețină rolul ""aprobator concediu"""
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +167,{0} ({1}) must have role 'Leave Approver',"{0} ({1}) trebuie să dețină rolul ""aprobator concediu"""
 DocType: Purchase Receipt,Vehicle Date,Vehicul Data
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +39,Medical,Medical
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +39,Medical,Medical
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,Motiv pentru a pierde
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +36,Tube beading,Tub ciubuc
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},Workstation este închis la următoarele date ca pe lista de vacanta: {0}
 DocType: Employee,Single,Celibatar
 DocType: Issue,Attachment,Atașament
@@ -404,10 +385,8 @@
 DocType: Account,Is Group,Is Group
 DocType: Stock Settings,Automatically Set Serial Nos based on FIFO,Setat automat Serial nr bazat pe FIFO
 DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,Cec Furnizor Numărul facturii Unicitatea
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +31,Thermoforming,Termoformare
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +66,Slitting,Tăiere
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +57,'To Case No.' cannot be less than 'From Case No.','Până la situația nr.' nu poate fi mai mică decât 'De la situația nr.'
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +104,Non Profit,Non-Profit
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +104,Non Profit,Non-Profit
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_list.js +7,Not Started,Neînceput
 DocType: Lead,Channel Partner,Partner Canal
 DocType: Account,Old Parent,Vechi mamă
@@ -416,13 +395,12 @@
 apps/erpnext/erpnext/config/manufacturing.py +74,Global settings for all manufacturing processes.,Setările globale pentru toate procesele de producție.
 DocType: Accounts Settings,Accounts Frozen Upto,Conturile sunt Blocate Până la
 DocType: SMS Log,Sent On,A trimis pe
-apps/erpnext/erpnext/stock/doctype/item/item.py +512,Attribute {0} selected multiple times in Attributes Table,Atribut {0} selectat de mai multe ori în tabelul Atribute
+apps/erpnext/erpnext/stock/doctype/item/item.py +516,Attribute {0} selected multiple times in Attributes Table,Atribut {0} selectat de mai multe ori în tabelul Atribute
 DocType: Sales Order,Not Applicable,Nu se aplică
 apps/erpnext/erpnext/config/hr.py +140,Holiday master.,Maestru de vacanta.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +19,Shell molding,Shell laminat
 DocType: Material Request Item,Required Date,Date necesare
 DocType: Delivery Note,Billing Address,Adresa de facturare
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +644,Please enter Item Code.,Vă rugăm să introduceți Cod produs.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +648,Please enter Item Code.,Vă rugăm să introduceți Cod produs.
 DocType: BOM,Costing,Cost
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount","In cazul in care se bifeaza, suma taxelor va fi considerată ca fiind deja inclusa în Rata de Imprimare / Suma de Imprimare"
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,Raport Cantitate
@@ -432,7 +410,7 @@
 DocType: Item Attribute,To Range,La gama
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Titluri de valoare și depozite
 DocType: Features Setup,Imports,Importurile
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +144,Adhesive bonding,Lipire
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +77,Total leaves allocated is mandatory,Total frunze alocate este obligatorie
 DocType: Job Opening,Description of a Job Opening,Descrierea unei slujbe
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +102,Pending activities for today,Activități în așteptare pentru ziua de azi
 apps/erpnext/erpnext/config/hr.py +28,Attendance record.,Record de prezenţă.
@@ -440,26 +418,25 @@
 DocType: Sales Order Item,Used for Production Plan,Folosit pentru Planul de producție
 DocType: System Settings,Loading...,Se încarcă...
 DocType: DocField,Password,Parolă
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +155,Fused deposition modeling,Modelare depunere condensat
 DocType: Manufacturing Settings,Time Between Operations (in mins),Timp între operațiuni (în minute)
 DocType: Customer,Buyer of Goods and Services.,Cumpărător de produse și servicii.
 DocType: Journal Entry,Accounts Payable,Conturi de plată
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +24,Add Subscribers,Adăugaţi Abonați
 apps/erpnext/erpnext/public/js/feature_setup.js +220,""" does not exists",""" nu există"
 DocType: Pricing Rule,Valid Upto,Valid Până la
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +564,List a few of your customers. They could be organizations or individuals.,Listeaza cativa din clienții dvs. Ei ar putea fi organizații sau persoane fizice.
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,List a few of your customers. They could be organizations or individuals.,Listeaza cativa din clienții dvs. Ei ar putea fi organizații sau persoane fizice.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Direct Income,Venituri Directe
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +33,"Can not filter based on Account, if grouped by Account","Nu se poate filtra pe baza de cont, în cazul gruparii in functie de Cont"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +88,Administrative Officer,Ofițer administrativ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Administrative Officer,Ofițer administrativ
 DocType: Payment Tool,Received Or Paid,Primite sau plătite
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +318,Please select Company,Vă rugăm să selectați Company
 DocType: Stock Entry,Difference Account,Diferența de Cont
 apps/erpnext/erpnext/projects/doctype/task/task.py +44,Cannot close task as its dependant task {0} is not closed.,Nu poate sarcină aproape ca misiune dependente {0} nu este închis.
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +305,Please enter Warehouse for which Material Request will be raised,Va rugam sa introduceti Depozit pentru care va fi ridicat Material Cerere
 DocType: Production Order,Additional Operating Cost,Costuri de operare adiţionale
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +20,Cosmetics,Cosmetică
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,Cosmetică
 DocType: DocField,Type,Tip
-apps/erpnext/erpnext/stock/doctype/item/item.py +417,"To merge, following properties must be same for both items","Pentru a îmbina, următoarele proprietăți trebuie să fie aceeași pentru ambele elemente"
+apps/erpnext/erpnext/stock/doctype/item/item.py +421,"To merge, following properties must be same for both items","Pentru a îmbina, următoarele proprietăți trebuie să fie aceeași pentru ambele elemente"
 DocType: Communication,Subject,Subiect
 DocType: Shipping Rule,Net Weight,Greutate netă
 DocType: Employee,Emergency Phone,Telefon de Urgență
@@ -469,7 +446,6 @@
 DocType: Journal Entry,Difference (Dr - Cr),Diferența (Dr - Cr)
 DocType: Account,Profit and Loss,Profit și pierdere
 apps/erpnext/erpnext/config/stock.py +293,Managing Subcontracting,Gestionarea Subcontractarea
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +58,New UOM must NOT be of type Whole Number,New UOM nu trebuie să fie de tip Număr întreg
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Furniture and Fixture,Mobilier si Accesorii
 DocType: Quotation,Rate at which Price list currency is converted to company's base currency,Rata la care lista de prețuri moneda este convertit în moneda de bază a companiei
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Account {0} does not belong to company: {1},Contul {0} nu apartine companiei: {1}
@@ -488,14 +464,14 @@
 DocType: Purchase Invoice,Supplier Invoice No,Furnizor Factura Nu
 DocType: Territory,For reference,Pentru referință
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +154,"Cannot delete Serial No {0}, as it is used in stock transactions","Nu se poate șterge de serie nr {0}, așa cum este utilizat în tranzacțiile bursiere"
-apps/erpnext/erpnext/public/js/account_tree_grid.js +52,Closing (Cr),De închidere (Cr)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +227,Closing (Cr),De închidere (Cr)
 DocType: Serial No,Warranty Period (Days),Perioada de garanție (zile)
 DocType: Installation Note Item,Installation Note Item,Instalare Notă Postul
 ,Pending Qty,Așteptare Cantitate
 DocType: Job Applicant,Thread HTML,HTML fir
 DocType: Company,Ignore,Ignora
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +86,SMS sent to following numbers: {0},SMS expediat la următoarele numere: {0}
-apps/erpnext/erpnext/controllers/buying_controller.py +135,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Furnizor Depozit obligatoriu pentru contractate sub-cumparare Primirea
+apps/erpnext/erpnext/controllers/buying_controller.py +126,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Furnizor Depozit obligatoriu pentru contractate sub-cumparare Primirea
 DocType: Pricing Rule,Valid From,Valabil de la
 DocType: Sales Invoice,Total Commission,Total de Comisie
 DocType: Pricing Rule,Sales Partner,Partener de vânzări
@@ -503,7 +479,7 @@
 DocType: Monthly Distribution,"**Monthly Distribution** helps you distribute your budget across months if you have seasonality in your business.
 
 To distribute a budget using this distribution, set this **Monthly Distribution** in the **Cost Center**","**Distribuție lunară** vă ajută să vă distribuiți bugetul pe luni, dacă aveți sezonalitate în afacerea dvs. Pentru a distribui un buget folosind această distribuție, configurați această **distribuție lunară** în **centrul de cost**"
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +183,No records found in the Invoice table,Nu sunt găsite în tabelul de factură înregistrări
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +130,No records found in the Invoice table,Nu sunt găsite în tabelul de factură înregistrări
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +20,Please select Company and Party Type first,Vă rugăm să selectați Company și Partidul Tip primul
 apps/erpnext/erpnext/config/accounts.py +84,Financial / accounting year.,An financiar / contabil.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","Ne pare rău, Serial nr nu se pot uni"
@@ -519,25 +495,25 @@
 DocType: Sales Order,Billing and Delivery Status,Facturare și de livrare Starea
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Clienții repetate
 DocType: Leave Control Panel,Allocate,Alocaţi
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +16,Previous,Precedenta
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard_page.html +16,Previous,Precedenta
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +620,Sales Return,Vânzări de returnare
 DocType: Production Planning Tool,Select Sales Orders from which you want to create Production Orders.,Selectați comenzi de vânzări de la care doriți să creați comenzi de producție.
 DocType: Item,Delivered by Supplier (Drop Ship),Livrate de Furnizor (Drop navelor)
 apps/erpnext/erpnext/config/hr.py +120,Salary components.,Componente salariale.
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,Baza de date cu clienți potențiali.
+DocType: Authorization Rule,Customer or Item,Client sau un element
 apps/erpnext/erpnext/config/crm.py +17,Customer database.,Baza de Date Client.
 DocType: Quotation,Quotation To,Citat Pentru a
 DocType: Lead,Middle Income,Venituri medii
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),Deschidere (Cr)
 apps/erpnext/erpnext/accounts/utils.py +193,Allocated amount can not be negative,Suma alocată nu poate fi negativă
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +123,Tumbling,Tumbling
 DocType: Purchase Order Item,Billed Amt,Suma facturată
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,Un depozit logic față de care se efectuează înregistrări de stoc.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +92,Reference No & Reference Date is required for {0},Nu referință și de referință Data este necesar pentru {0}
 DocType: Event,Wednesday,Miercuri
 DocType: Sales Invoice,Customer's Vendor,Vanzator Client
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +214,Production Order is Mandatory,Producția Comanda este obligatorie
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +139,Proposal Writing,Propunere de scriere
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,Proposal Writing,Propunere de scriere
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,Un alt Sales Person {0} există cu același ID Angajat
 apps/erpnext/erpnext/stock/stock_ledger.py +336,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},Eroare negativ Stock ({6}) pentru postul {0} în Depozit {1} la {2} {3} în {4} {5}
 DocType: Fiscal Year Company,Fiscal Year Company,Anul fiscal companie
@@ -560,7 +536,7 @@
 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.","Apoi normelor privind prețurile sunt filtrate pe baza Customer, Client Group, Territory, furnizor, furnizor de tip, Campania, Vanzari Partener etc"
 apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.py +179,Please install dropbox python module,Vă rugăm să instalați dropbox modul python
 DocType: Employee,Passport Number,Numărul de pașaport
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +82,Manager,Manager
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Manager,Manager
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +494,From Purchase Receipt,Din Chitanta de Cumparare
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +219,Same item has been entered multiple times.,Same articol a fost introdus de mai multe ori.
 DocType: SMS Settings,Receiver Parameter,Receptor Parametru
@@ -568,10 +544,9 @@
 DocType: Sales Person,Sales Person Targets,Obiective de vânzări Persoana
 apps/frappe/frappe/public/js/frappe/form/workflow.js +116,To,Până la data
 apps/frappe/frappe/templates/base.html +145,Please enter email address,Introduceți adresa de e-mail
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +35,End tube forming,Tub de formare a capetelor
 DocType: Production Order Operation,In minutes,In cateva minute
 DocType: Issue,Resolution Date,Data rezoluție
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +635,Please set default Cash or Bank account in Mode of Payment {0},Vă rugăm să setați Cash implicit sau cont bancar în modul de plată {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +637,Please set default Cash or Bank account in Mode of Payment {0},Vă rugăm să setați Cash implicit sau cont bancar în modul de plată {0}
 DocType: Selling Settings,Customer Naming By,Numire Client de catre
 apps/erpnext/erpnext/accounts/doctype/account/account.js +67,Convert to Group,Transforma in grup
 DocType: Activity Cost,Activity Type,Tip Activitate
@@ -579,12 +554,12 @@
 DocType: Customer,Fixed Days,Zilele fixe
 DocType: Sales Invoice,Packing List,Lista de ambalare
 apps/erpnext/erpnext/config/buying.py +28,Purchase Orders given to Suppliers.,A achiziționa ordine de date Furnizori.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +43,Publishing,Editare
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +43,Publishing,Editare
 DocType: Activity Cost,Projects User,Proiecte de utilizare
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Consumed,Consumat
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +198,{0}: {1} not found in Invoice Details table,{0}: {1} nu a fost găsit în tabelul detalii factură
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,{0}: {1} not found in Invoice Details table,{0}: {1} nu a fost găsit în tabelul detalii factură
 DocType: Company,Round Off Cost Center,Rotunji cost Center
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +208,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Vizita de Mentenanta {0} trebuie sa fie anulată înainte de a anula această Comandă de Vânzări
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +203,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Vizita de Mentenanta {0} trebuie sa fie anulată înainte de a anula această Comandă de Vânzări
 DocType: Material Request,Material Transfer,Transfer de material
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +56,Opening (Dr),Deschidere (Dr)
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},Timestamp postarea trebuie să fie după {0}
@@ -596,7 +571,6 @@
 DocType: Pricing Rule,Sales Manager,Director De Vânzări
 apps/frappe/frappe/public/js/frappe/model/model.js +492,Rename,Redenumire
 DocType: Journal Entry,Write Off Amount,Scrie Off Suma
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +52,Bending,Îndoire
 apps/frappe/frappe/core/page/user_permissions/user_permissions.js +246,Allow User,Permiteţi utilizator
 DocType: Journal Entry,Bill No,Factură nr.
 DocType: Purchase Invoice,Quarterly,Trimestrial
@@ -606,17 +580,16 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Please enter item details,Va rugam sa introduceti detalii element
 DocType: Purchase Receipt,Other Details,Alte detalii
 DocType: Account,Accounts,Conturi
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +67,Marketing,Marketing
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +65,Straight shearing,Forfecare drept
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +67,Marketing,Marketing
 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.,"Pentru a urmări element în vânzări și a documentelor de achiziție, pe baza lor de serie nr. Acest lucru se poate, de asemenea, utilizat pentru a urmări detalii de garanție ale produsului."
 DocType: Purchase Receipt Item Supplied,Current Stock,Stoc curent
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +99,Rejected Warehouse is mandatory against regected item,Warehouse respins este obligatorie împotriva articol regected
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +102,Rejected Warehouse is mandatory against regected item,Warehouse respins este obligatorie împotriva articol regected
 DocType: Account,Expenses Included In Valuation,Cheltuieli Incluse în Evaluare
 DocType: Employee,Provide email id registered in company,Furnizarea id-ul de e-mail înregistrată în societate
 DocType: Hub Settings,Seller City,Vânzător oraș
 DocType: Email Digest,Next email will be sent on:,E-mail viitor va fi trimis la:
 DocType: Offer Letter Term,Offer Letter Term,Oferta Scrisoare Termen
-apps/erpnext/erpnext/stock/doctype/item/item.py +492,Item has variants.,Element are variante.
+apps/erpnext/erpnext/stock/doctype/item/item.py +496,Item has variants.,Element are variante.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Articolul {0} nu a fost găsit
 DocType: Bin,Stock Value,Valoare stoc
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,Arbore Tip
@@ -625,10 +598,9 @@
 DocType: Material Request Item,Quantity and Warehouse,Cantitatea și Warehouse
 DocType: Sales Invoice,Commission Rate (%),Rata de Comision (%)
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +172,"Against Voucher Type must be one of Sales Order, Sales Invoice or Journal Entry","Comparativ tipului de voucher trebuie să fie o opțiune dintre următoarele: ordin de vânzări, factură de vânzări sau intrare în jurnal"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +139,Biomachining,Bioprelucrare
 apps/erpnext/erpnext/setup/utils.py +89,Unable to find exchange rate,Imposibil de găsit cursului de schimb
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +7,Aerospace,Spaţiul aerian
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +19,Welcome,Bine ați venit
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +7,Aerospace,Spaţiul aerian
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +40,Welcome,Bine ați venit
 DocType: Journal Entry,Credit Card Entry,Card de credit intrare
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +18,Task Subject,Sarcina Subiect
 apps/erpnext/erpnext/config/stock.py +33,Goods received from Suppliers.,Bunuri primite de la furnizori.
@@ -651,19 +623,19 @@
 DocType: Employee,Cell Number,Număr Celula
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Pierdut
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +120,You can not enter current voucher in 'Against Journal Entry' column,"Nu puteți introduce voucher curent în ""Împotriva Jurnalul intrare"" coloană"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +25,Energy,Energie
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,Energie
 DocType: Opportunity,Opportunity From,Oportunitate de la
 apps/erpnext/erpnext/config/hr.py +33,Monthly salary statement.,Declarația salariu lunar.
 DocType: Item Group,Website Specifications,Site-ul Specificații
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +205,New Account,Cont nou
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +21,{0}: From {0} of type {1},{0}: de la {0} de tipul {1}
-apps/erpnext/erpnext/controllers/buying_controller.py +283,Row {0}: Conversion Factor is mandatory,Rând {0}: Factorul de conversie este obligatorie
+apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,Rând {0}: Factorul de conversie este obligatorie
 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.,Intrările contabile pot fi create comparativ nodurilor frunză. Intrările comparativ grupurilor nu sunt permise.
 DocType: ToDo,High,Ridicat
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +361,Cannot deactivate or cancel BOM as it is linked with other BOMs,"Nu se poate deactiva sau anula FDM, deoarece este conectat cu alte FDM-uri"
 DocType: Opportunity,Maintenance,Mentenanţă
 DocType: User,Male,Masculin
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +182,Purchase Receipt number required for Item {0},Număr Primirea de achiziție necesar pentru postul {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +183,Purchase Receipt number required for Item {0},Număr Primirea de achiziție necesar pentru postul {0}
 DocType: Item Attribute Value,Item Attribute Value,Postul caracteristicii Valoarea
 apps/erpnext/erpnext/config/crm.py +64,Sales campaigns.,Campanii de vanzari.
 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.
@@ -711,10 +683,9 @@
 DocType: Address,Personal,Trader
 DocType: Expense Claim Detail,Expense Claim Type,Tip Revendicare Cheltuieli
 DocType: Shopping Cart Settings,Default settings for Shopping Cart,Setările implicite pentru Cosul de cumparaturi
-apps/erpnext/erpnext/controllers/accounts_controller.py +324,"Journal Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Jurnal de intrare {0} este legată de Ordine {1}, verificați dacă aceasta ar trebui să fie tras ca avans în această factură."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +13,Biotechnology,Biotehnologie
+apps/erpnext/erpnext/controllers/accounts_controller.py +325,"Journal Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Jurnal de intrare {0} este legată de Ordine {1}, verificați dacă aceasta ar trebui să fie tras ca avans în această factură."
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +13,Biotechnology,Biotehnologie
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Office Maintenance Expenses,Cheltuieli de întreținere birou
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +53,Hemming,Tivitură
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +66,Please enter Item first,Va rugam sa introduceti Articol primul
 DocType: Account,Liability,Răspundere
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +62,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Sancționat Suma nu poate fi mai mare decât revendicarea Suma în rândul {0}.
@@ -727,10 +698,10 @@
 DocType: Company,Default Bank Account,Cont Bancar Implicit
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +47,"To filter based on Party, select Party Type first","Pentru a filtra pe baza Party, selectați Party Tip primul"
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},"&quot;Actualizare Stock&quot; nu pot fi verificate, deoarece obiectele nu sunt livrate prin {0}"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Nos,Nos
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Nos,Nos
 DocType: Item,Items with higher weightage will be shown higher,Articole cu weightage mare va fi afișat mai mare
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Detaliu reconciliere bancară
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +627,My Invoices,Facturile mele
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +629,My Invoices,Facturile mele
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,Nu a fost gasit angajat
 DocType: Purchase Order,Stopped,Oprita
 DocType: Item,If subcontracted to a vendor,Dacă subcontractat la un furnizor
@@ -749,35 +720,33 @@
 DocType: Features Setup,"To enable ""Point of Sale"" features",Pentru a activa &quot;punct de vânzare&quot; caracteristici
 DocType: Bin,Moving Average Rate,Rata medie mobilă
 DocType: Production Planning Tool,Select Items,Selectați Elemente
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,{0} against Bill {1} dated {2},{0} comparativ cu factura {1} ​​din data de {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +328,{0} against Bill {1} dated {2},{0} comparativ cu factura {1} ​​din data de {2}
 DocType: Comment,Reference Name,Nume de referință
 DocType: Maintenance Visit,Completion Status,Stare Finalizare
 DocType: Sales Invoice Item,Target Warehouse,Țintă Warehouse
 DocType: Item,Allow over delivery or receipt upto this percent,Permiteți peste livrare sau primire pana la acest procent
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +49,Expected Delivery Date cannot be before Sales Order Date,Data de Livrare Preconizata nu poate fi anterioara Datei Ordinului de Vanzare
 DocType: Upload Attendance,Import Attendance,Import Spectatori
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +17,All Item Groups,Toate grupurile articolului
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +17,All Item Groups,Toate grupurile articolului
 DocType: Process Payroll,Activity Log,Jurnal Activitate
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +30,Net Profit / Loss,Profit / pierdere net
 apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,Compune în mod automat un mesaj la introducere de tranzacții.
 DocType: Production Order,Item To Manufacture,Articol pentru Fabricare
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +16,Permanent mold casting,Turnare mucegai permanent
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} stare este {2}
 apps/erpnext/erpnext/config/learn.py +172,Purchase Order to Payment,Comandă de aprovizionare de plata
 DocType: Sales Order Item,Projected Qty,Proiectat Cantitate
 DocType: Sales Invoice,Payment Due Date,Data scadentă de plată
 DocType: Newsletter,Newsletter Manager,Newsletter Director
-apps/erpnext/erpnext/stock/doctype/item/item.js +229,Item Variant {0} already exists with same attributes,Postul Varianta {0} există deja cu aceleași atribute
+apps/erpnext/erpnext/stock/doctype/item/item.js +231,Item Variant {0} already exists with same attributes,Postul Varianta {0} există deja cu aceleași atribute
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening',&quot;Deschiderea&quot;
 DocType: Notification Control,Delivery Note Message,Nota de Livrare Mesaj
 DocType: Expense Claim,Expenses,Cheltuieli
 DocType: Item Variant Attribute,Item Variant Attribute,Varianta element Atribut
 ,Purchase Receipt Trends,Tendințe Primirea de cumpărare
 DocType: Appraisal,Select template from which you want to get the Goals,Selectați șablonul din care doriți să obțineți Obiectivelor
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +77,Research & Development,Cercetare & Dezvoltare
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Research & Development,Cercetare & Dezvoltare
 ,Amount to Bill,Sumă pentru facturare
 DocType: Company,Registration Details,Detalii de înregistrare
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +75,Staking,Staking
 DocType: Item,Re-Order Qty,Re-comanda Cantitate
 DocType: Leave Block List Date,Leave Block List Date,Data Lista Concedii Blocate
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +25,Scheduled to send to {0},Programat pentru a trimite la {0}
@@ -788,18 +757,16 @@
 DocType: Sales Invoice Item,Stock Details,Stoc Detalii
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Valoare proiect
 apps/erpnext/erpnext/config/selling.py +304,Point-of-Sale,Punct de vânzare
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,Cannot carry forward {0},Nu se poate duce mai departe {0}
 apps/erpnext/erpnext/accounts/doctype/account/account.py +91,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","Soldul contului este deja în credit, nu vă este permis să setați ""Balanța trebuie să fie"" drept ""Debit""."
 DocType: Account,Balance must be,Bilanţul trebuie să fie
 DocType: Hub Settings,Publish Pricing,Publica Prețuri
 DocType: Notification Control,Expense Claim Rejected Message,Mesaj Respingere Revendicare Cheltuieli
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +145,Nailing,Cuie
 ,Available Qty,Cantitate disponibilă
 DocType: Purchase Taxes and Charges,On Previous Row Total,Inapoi la rândul Total
 DocType: Salary Slip,Working Days,Zile lucratoare
 DocType: Serial No,Incoming Rate,Rate de intrare
 DocType: Packing Slip,Gross Weight,Greutate brută
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +410,The name of your company for which you are setting up this system.,Numele companiei dumneavoastră pentru care vă sunt configurarea acestui sistem.
+apps/erpnext/erpnext/public/js/setup_wizard.js +158,The name of your company for which you are setting up this system.,Numele companiei dumneavoastră pentru care vă sunt configurarea acestui sistem.
 DocType: HR Settings,Include holidays in Total no. of Working Days,Includ vacanțe în total nr. de zile lucrătoare
 DocType: Job Applicant,Hold,Păstrarea / Ţinerea / Deţinerea
 DocType: Employee,Date of Joining,Data Aderării
@@ -809,7 +776,6 @@
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +3,View Subscribers,Vezi Abonații
 DocType: Purchase Invoice Item,Purchase Receipt,Primirea de cumpărare
 ,Received Items To Be Billed,Articole primite Pentru a fi facturat
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +114,Abrasive blasting,Sablare
 DocType: Employee,Ms,Ms
 apps/erpnext/erpnext/config/accounts.py +148,Currency exchange rate master.,Maestru cursului de schimb valutar.
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +253,Unable to find Time Slot in the next {0} days for Operation {1},Imposibilitatea de a găsi timp Slot în următorii {0} zile pentru Operațiunea {1}
@@ -821,7 +787,7 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +209,Serial No {0} does not belong to Item {1},Serial Nu {0} nu aparține postul {1}
 DocType: Purchase Receipt Item Supplied,Required Qty,Necesar Cantitate
 DocType: Bank Reconciliation,Total Amount,Suma totală
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +32,Internet Publishing,Editura Internet
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,Editura Internet
 DocType: Production Planning Tool,Production Orders,Comenzi de producție
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +35,Balance Value,Valoarea bilanţului
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,Lista de prețuri de vânzare
@@ -832,7 +798,7 @@
 DocType: Supplier,Default Payable Accounts,Implicit conturi de plătit
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,Angajatul {0} nu este activ sau nu există
 DocType: Features Setup,Item Barcode,Element de coduri de bare
-apps/erpnext/erpnext/stock/doctype/item/item.py +487,Item Variants {0} updated,Postul variante {0} actualizat
+apps/erpnext/erpnext/stock/doctype/item/item.py +491,Item Variants {0} updated,Postul variante {0} actualizat
 DocType: Quality Inspection Reading,Reading 6,Reading 6
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Factura de cumpărare în avans
 DocType: Address,Shop,Magazin
@@ -841,7 +807,7 @@
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,Contul Bancar / de Numerar implicit va fi actualizat automat în Factura POS atunci când acest mod este selectat.
 DocType: Employee,Permanent Address Is,Adresa permanentă este
 DocType: Production Order Operation,Operation completed for how many finished goods?,Funcționare completat de cât de multe bunuri finite?
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +491,The Brand,Marca
+apps/erpnext/erpnext/public/js/setup_wizard.js +237,The Brand,Marca
 apps/erpnext/erpnext/controllers/status_updater.py +163,Allowance for over-{0} crossed for Item {1}.,Alocație mai mare decât -{0} anulată pentru articolul {1}.
 DocType: Employee,Exit Interview Details,Detalii Interviu de Iesire
 DocType: Item,Is Purchase Item,Este de cumparare Articol
@@ -861,16 +827,16 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Indirect Income,Venituri indirecte
 DocType: Payment Tool,Set Payment Amount = Outstanding Amount,Set de plată Suma = suma restantă
 DocType: Contact Us Settings,Address Line 1,Adresă Linie 1
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Variance,Variație
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +392,Company Name,Denumire Companie
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +53,Variance,Variație
+,Company Name,Denumire Companie
 DocType: SMS Center,Total Message(s),Total mesaj(e)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +515,Select Item for Transfer,Selectați Element de Transfer
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +538,Select Item for Transfer,Selectați Element de Transfer
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,Vizualizați o listă cu toate filmele de ajutor
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,"Selectați contul șef al băncii, unde de verificare a fost depus."
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,Permiteţi utilizatorului să editeze lista ratelor preturilor din tranzacții
 DocType: Pricing Rule,Max Qty,Max Cantitate
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +106,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Rând {0}: Plata împotriva Vânzări / Ordinului de Procurare ar trebui să fie întotdeauna marcate ca avans
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +16,Chemical,Chimic
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,Chimic
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +693,All items have already been transferred for this Production Order.,Toate articolele acestei comenzi de producție au fost deja transferate.
 DocType: Process Payroll,Select Payroll Year and Month,Selectați Salarizare anul și luna
 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""","Du-te la grupul corespunzător (de obicei, de aplicare fondurilor&gt; Active curente&gt; Conturi bancare și de a crea un nou cont (făcând clic pe Adăugați pentru copii) de tip &quot;Banca&quot;"
@@ -881,12 +847,12 @@
 DocType: Item,Inspection Criteria,Criteriile de inspecție
 apps/erpnext/erpnext/config/accounts.py +101,Tree of finanial Cost Centers.,Arborele de centre de cost finanial.
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,Transferat
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +492,Upload your letter head and logo. (you can edit them later).,Încărcați capul scrisoare și logo-ul. (Le puteți edita mai târziu).
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +156,White,Alb
+apps/erpnext/erpnext/public/js/setup_wizard.js +238,Upload your letter head and logo. (you can edit them later).,Încărcați capul scrisoare și logo-ul. (Le puteți edita mai târziu).
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,White,Alb
 DocType: SMS Center,All Lead (Open),Toate articolele de top (deschise)
 DocType: Purchase Invoice,Get Advances Paid,Obtine Avansurile Achitate
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +362,Attach Your Picture,Atașați imaginea dvs.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Make ,Realizare
+apps/erpnext/erpnext/public/js/setup_wizard.js +112,Attach Your Picture,Atașați imaginea dvs.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +540,Make ,Realizare
 DocType: Journal Entry,Total Amount in Words,Suma totală în cuvinte
 DocType: Workflow State,Stop,Oprire
 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.,Nu a fost o eroare. Un motiv probabil ar putea fi că nu ați salvat formularul. Vă rugăm să contactați support@erpnext.com dacă problema persistă.
@@ -895,14 +861,13 @@
 DocType: Lead,Next Contact Date,Următor Contact Data
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,Deschiderea Cantitate
 DocType: Holiday List,Holiday List Name,Denumire Lista de Vacanță
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +168,Stock Options,Opțiuni pe acțiuni
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +168,Stock Options,Opțiuni pe acțiuni
 DocType: Journal Entry Account,Expense Claim,Revendicare Cheltuieli
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +181,Qty for {0},Cantitate pentru {0}
 DocType: Leave Application,Leave Application,Aplicatie pentru Concediu
 apps/erpnext/erpnext/config/hr.py +77,Leave Allocation Tool,Mijloc pentru Alocare Concediu
 DocType: Leave Block List,Leave Block List Dates,Date Lista Concedii Blocate
 DocType: Company,If Monthly Budget Exceeded (for expense account),Dacă bugetul lunar depășită (pentru contul de cheltuieli)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +56,Trimming,Aranjare
 DocType: Workstation,Net Hour Rate,Net Rata de ore
 DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,Chitanta de Cumparare aferent Costului Final
 DocType: Company,Default Terms,Termeni implicite
@@ -910,10 +875,9 @@
 DocType: POS Profile,Cash/Bank Account,Numerar/Cont Bancar
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,Removed items with no change in quantity or value.,Articole eliminate cu nici o schimbare în cantitate sau de valoare.
 DocType: Delivery Note,Delivery To,De Livrare la
-apps/erpnext/erpnext/stock/doctype/item/item.py +509,Attribute table is mandatory,Tabelul atribut este obligatoriu
+apps/erpnext/erpnext/stock/doctype/item/item.py +513,Attribute table is mandatory,Tabelul atribut este obligatoriu
 DocType: Production Planning Tool,Get Sales Orders,Obține comenzile de vânzări
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} nu poate fi negativ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +103,Filing,Depozit
 apps/erpnext/erpnext/templates/form_grid/item_grid.html +72,Discount,Reducere
 DocType: Features Setup,Purchase Discounts,Cumpărare Reduceri
 DocType: Workstation,Wages,Salarizare
@@ -930,6 +894,7 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +112,You are the Expense Approver for this record. Please Update the 'Status' and Save,"Sunteți aprobator cheltuieli pentru acest record. Vă rugăm Actualizați ""statutul"" și Salvare"
 DocType: Serial No,Creation Document No,Creare Document Nr.
 DocType: Issue,Issue,Problem
+apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account does not match with Company,Cont nu se potrivește cu Compania
 apps/erpnext/erpnext/config/stock.py +136,"Attributes for Item Variants. e.g Size, Color etc.","Atributele pentru variante articol. de exemplu  dimensiune, culoare etc."
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +39,WIP Warehouse,WIP Depozit
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +194,Serial No {0} is under maintenance contract upto {1},Serial Nu {0} este sub contract de întreținere pana {1}
@@ -938,7 +903,7 @@
 DocType: Tax Rule,Shipping State,Stat de transport maritim
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,"Postul trebuie să fie adăugate folosind ""obține elemente din Cumpără Încasări"" buton"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,Cheltuieli de vânzare
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Buying,Cumpararea Standard
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +120,Standard Buying,Cumpararea Standard
 DocType: GL Entry,Against,Comparativ
 DocType: Item,Default Selling Cost Center,Centru de Cost Vanzare Implicit
 DocType: Sales Partner,Implementation Partner,Partener de punere în aplicare
@@ -959,29 +924,29 @@
 DocType: Time Log Batch,updated via Time Logs,actualizat prin timp Busteni
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,Vârstă medie
 DocType: Opportunity,Your sales person who will contact the customer in future,Persoana de vânzări care va contacta clientul în viitor
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +588,List a few of your suppliers. They could be organizations or individuals.,Listeaza cativa din furnizorii dvs. Ei ar putea fi organizații sau persoane fizice.
+apps/erpnext/erpnext/public/js/setup_wizard.js +326,List a few of your suppliers. They could be organizations or individuals.,Listeaza cativa din furnizorii dvs. Ei ar putea fi organizații sau persoane fizice.
 DocType: Company,Default Currency,Monedă implicită
 DocType: Contact,Enter designation of this Contact,Introduceți destinatia acestui Contact
 DocType: Contact Us Settings,Address,Adresă
 DocType: Expense Claim,From Employee,Din Angajat
-apps/erpnext/erpnext/controllers/accounts_controller.py +338,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Atenție: Sistemul nu va verifica supraîncărcată din sumă pentru postul {0} din {1} este zero
+apps/erpnext/erpnext/controllers/accounts_controller.py +339,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Atenție: Sistemul nu va verifica supraîncărcată din sumă pentru postul {0} din {1} este zero
 DocType: Journal Entry,Make Difference Entry,Realizeaza Intrare de Diferenta
 DocType: Upload Attendance,Attendance From Date,Prezenţa del la data
 DocType: Appraisal Template Goal,Key Performance Area,Domeniu de Performanță Cheie
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +54,Transportation,Transport
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +54,Transportation,Transport
 apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +67, and year: ,și anul:
 DocType: Email Digest,Annual Expense,Cheltuieli anuale
 DocType: SMS Center,Total Characters,Total de caractere
-apps/erpnext/erpnext/controllers/buying_controller.py +139,Please select BOM in BOM field for Item {0},Vă rugăm să selectați BOM BOM în domeniu pentru postul {0}
+apps/erpnext/erpnext/controllers/buying_controller.py +130,Please select BOM in BOM field for Item {0},Vă rugăm să selectați BOM BOM în domeniu pentru postul {0}
 DocType: C-Form Invoice Detail,C-Form Invoice Detail,Detaliu factură formular-C
 DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,Reconcilierea plata facturii
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +32,Contribution %,Contribuția%
 DocType: Item,website page link,pagina site-ului link-ul
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +192,Let's prepare the system for first use.,Să se pregătească sistemul de prima utilizare.
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +242,Let's prepare the system for first use.,Să se pregătească sistemul de prima utilizare.
 DocType: Company,Company registration numbers for your reference. Tax numbers etc.,Numerele de înregistrare companie pentru referință. Numerele fiscale etc
 DocType: Sales Partner,Distributor,Distribuitor
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Cosul de cumparaturi Articolul Transport
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +214,Production Order {0} must be cancelled before cancelling this Sales Order,Producția de Ordine {0} trebuie anulată înainte de a anula această comandă de vânzări
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +209,Production Order {0} must be cancelled before cancelling this Sales Order,Producția de Ordine {0} trebuie anulată înainte de a anula această comandă de vânzări
 ,Ordered Items To Be Billed,Comandat de Articole Pentru a fi facturat
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +24,From Range has to be less than To Range,Din Gama trebuie să fie mai mică de la gama
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +21,Select Time Logs and Submit to create a new Sales Invoice.,Selectați Timp Busteni Trimite pentru a crea o nouă factură de vânzare.
@@ -1001,14 +966,13 @@
 DocType: Sales Invoice Advance,Sales Invoice Advance,Factura Vanzare Advance
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +398,Nothing to request,Nimic de a solicita
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date','Data efectivă de început' nu poate fi ulterioară datei 'Data efectivă de sfârșit'
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +75,Management,Management
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +75,Management,Management
 apps/erpnext/erpnext/config/projects.py +33,Types of activities for Time Sheets,Tipuri de activități de fișe de pontaj
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +14,Investment casting,Turnare de investiții
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +51,Either debit or credit amount is required for {0},Suma de Debit sau de Credit este necesar pentru {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""","Acest lucru va fi adăugat la Codul punctul de varianta. De exemplu, în cazul în care abrevierea este ""SM"", iar codul produs face ""T-SHIRT"", codul punctul de varianta va fi ""T-SHIRT-SM"""
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,Pay net (în cuvinte) vor fi vizibile după ce salvați fluturasul de salariu.
 apps/frappe/frappe/core/doctype/user/user_list.js +12,Active,Activ
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +154,Blue,Albastru
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +154,Blue,Albastru
 DocType: Purchase Invoice,Is Return,Este de returnare
 DocType: Price List Country,Price List Country,Lista de preturi Țară
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +123,Further nodes can be only created under 'Group' type nodes,Noduri suplimentare pot fi create numai în noduri de tip 'Grup'
@@ -1018,18 +982,16 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +22,POS Profile {0} already created for user: {1} and company {2},POS Profile {0} deja creat pentru utilizator: {1} și compania {2}
 DocType: Purchase Order Item,UOM Conversion Factor,Factorul de conversie UOM
 DocType: Stock Settings,Default Item Group,Group Articol Implicit
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +156,Laminated object manufacturing,Fabricație obiect laminat
 apps/erpnext/erpnext/config/buying.py +13,Supplier database.,Baza de date furnizor.
 DocType: Account,Balance Sheet,Bilant
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +561,Cost Center For Item with Item Code ',Centrul de cost pentru postul cu codul Postul '
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +45,Stretch forming,Întindere de formare
 DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,Persoană de vânzări va primi un memento la această dată pentru a lua legătura cu clientul
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +210,"Further accounts can be made under Groups, but entries can be made against non-Groups","Conturile suplimentare pot fi făcute sub Groups, dar intrările pot fi făcute împotriva non-Grupuri"
 apps/erpnext/erpnext/config/hr.py +125,Tax and other salary deductions.,Impozitul și alte rețineri salariale.
 DocType: Lead,Lead,Conducere
 DocType: Email Digest,Payables,Datorii
 DocType: Account,Warehouse,Depozit
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +90,Row #{0}: Rejected Qty can not be entered in Purchase Return,Row # {0}: Respins Cantitate nu pot fi introduse în Purchase Întoarcere
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +93,Row #{0}: Rejected Qty can not be entered in Purchase Return,Row # {0}: Respins Cantitate nu pot fi introduse în Purchase Întoarcere
 ,Purchase Order Items To Be Billed,Cumparare Ordine Articole Pentru a fi facturat
 DocType: Purchase Invoice Item,Net Rate,Rata netă
 DocType: Purchase Invoice Item,Purchase Invoice Item,Factura de cumpărare Postul
@@ -1044,13 +1006,13 @@
 DocType: Global Defaults,Current Fiscal Year,An Fiscal Curent
 DocType: Global Defaults,Disable Rounded Total,Dezactivati Totalul Rotunjit
 DocType: Lead,Call,Apelaţi
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +384,'Entries' cannot be empty,'Intrările' nu pot fi vide
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +386,'Entries' cannot be empty,'Intrările' nu pot fi vide
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},Inregistrare {0} este duplicata cu aceeași {1}
 ,Trial Balance,Balanta
 apps/erpnext/erpnext/config/hr.py +205,Setting up Employees,Configurarea angajati
 apps/erpnext/erpnext/public/js/feature_setup.js +220,"Grid ""","Grid """
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +150,Please select prefix first,Vă rugăm să selectați prefix întâi
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +138,Research,Cercetarea
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +138,Research,Cercetarea
 DocType: Maintenance Visit Purpose,Work Done,Activitatea desfășurată
 apps/erpnext/erpnext/controllers/item_variant.py +25,Please specify at least one attribute in the Attributes table,Vă rugăm să specificați cel puțin un atribut în tabelul Atribute
 DocType: Contact,User ID,ID-ul de utilizator
@@ -1058,10 +1020,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +57,View Ledger,Vezi Ledger
 DocType: File,Lft,LFT
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Cel mai devreme
-apps/erpnext/erpnext/stock/doctype/item/item.py +394,"An Item Group exists with same name, please change the item name or rename the item group","Există un grup de articole cu aceeaşi denumire, vă rugăm să schimbați denumirea articolului sau să redenumiţi grupul articolului"
+apps/erpnext/erpnext/stock/doctype/item/item.py +398,"An Item Group exists with same name, please change the item name or rename the item group","Există un grup de articole cu aceeaşi denumire, vă rugăm să schimbați denumirea articolului sau să redenumiţi grupul articolului"
 DocType: Communication,Delivery Status,Starea de Livrare
 DocType: Production Order,Manufacture against Sales Order,Fabricarea de comandă de vânzări
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +517,Rest Of The World,Restul lumii
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +455,Rest Of The World,Restul lumii
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,Postul {0} nu poate avea Lot
 ,Budget Variance Report,Raport de variaţie buget
 DocType: Salary Slip,Gross Pay,Plata Bruta
@@ -1072,13 +1034,11 @@
 DocType: BOM Item,Item Description,Descriere Articol
 DocType: Payment Tool,Payment Mode,Modul de plată
 DocType: Purchase Invoice,Is Recurring,Este recurent
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +154,Direct metal laser sintering,Metalice directă sinterizare cu laser
 DocType: Purchase Order,Supplied Items,Articole furnizate
 DocType: Production Order,Qty To Manufacture,Cantitate pentru fabricare
 DocType: Buying Settings,Maintain same rate throughout purchase cycle,Menține aceeași cată in cursul ciclului de cumpărare
 DocType: Opportunity Item,Opportunity Item,Oportunitate Articol
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +61,Temporary Opening,Deschiderea temporară
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +41,Cryorolling,Cryorolling
 ,Employee Leave Balance,Bilant Concediu Angajat
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +128,Balance for Account {0} must always be {1},Bilanţă pentru contul {0} trebuie să fie întotdeauna {1}
 DocType: Address,Address Type,Tip adresă
@@ -1094,23 +1054,23 @@
 DocType: Journal Entry,Get Outstanding Invoices,Obtine Facturi Neachitate
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,Comandă de vânzări {0} nu este valid
 apps/erpnext/erpnext/setup/doctype/company/company.py +172,"Sorry, companies cannot be merged","Ne pare rău, companiile nu se pot uni"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +145,Small,Mic
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Small,Mic
 DocType: Employee,Employee Number,Numar angajat
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},Cazul nr. (s) este deja utilizat. Încercați din cazul nr. {s}
 ,Invoiced Amount (Exculsive Tax),Facturate Suma (Exculsive Tax)
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,Punctul 2
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +59,Account head {0} created,Titularul contului {0} creat
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +153,Green,Verde
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Green,Verde
 DocType: Item,Auto re-order,Auto re-comanda
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +57,Total Achieved,Raport Realizat
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +59,Total Achieved,Raport Realizat
 DocType: Employee,Place of Issue,Locul eliberării
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +59,Contract,Contract
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Contract,Contract
 DocType: Report,Disabled,Dezactivat
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +490,UOM coversion factor required for UOM: {0} in Item: {1},Factor coversion UOM UOM necesare pentru: {0} in articol: {1}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +83,Indirect Expenses,Cheltuieli indirecte
 apps/erpnext/erpnext/controllers/selling_controller.py +163,Row {0}: Qty is mandatory,Rând {0}: Cant este obligatorie
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +8,Agriculture,Agricultură
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +611,Your Products or Services,Produsele sau serviciile dvs.
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,Agricultură
+apps/erpnext/erpnext/public/js/setup_wizard.js +347,Your Products or Services,Produsele sau serviciile dvs.
 DocType: Mode of Payment,Mode of Payment,Mod de plata
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,Acesta este un grup element rădăcină și nu pot fi editate.
 DocType: Journal Entry Account,Purchase Order,Comandă de aprovizionare
@@ -1122,7 +1082,7 @@
 DocType: Serial No,Serial No Details,Serial Nu Detalii
 DocType: Purchase Invoice Item,Item Tax Rate,Rata de Impozitare Articol
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +113,"For {0}, only credit accounts can be linked against another debit entry","Pentru {0}, numai conturi de credit poate fi legat de o altă intrare în debit"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Delivery Note {0} is not submitted,Nota de Livrare {0} nu este introdusa
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +470,Delivery Note {0} is not submitted,Nota de Livrare {0} nu este introdusa
 apps/erpnext/erpnext/stock/get_item_details.py +136,Item {0} must be a Sub-contracted Item,Articolul {0} trebuie să fie un Articol Sub-contractat
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,Echipamente de Capital
 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.","Regula de stabilire a prețurilor este selectat în primul rând bazat pe ""Aplicați pe"" teren, care poate fi produs, Grupa de articole sau de brand."
@@ -1132,7 +1092,7 @@
 DocType: Appraisal Goal,Goal,Obiectiv
 DocType: Sales Invoice Item,Edit Description,Edit Descriere
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +318,Expected Delivery Date is lesser than Planned Start Date.,Așteptat Data de livrare este mai mică decât era planificat Începere Data.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +579,For Supplier,Pentru furnizor
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +602,For Supplier,Pentru furnizor
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,Setarea Tipul de cont ajută în selectarea acest cont în tranzacții.
 DocType: Purchase Invoice,Grand Total (Company Currency),Total general (Valuta Companie)
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,Raport de ieșire
@@ -1158,10 +1118,10 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +74,"Total {0} for all items is zero, may you should change 'Distribute Charges Based On'","Total {0} pentru toate elementele este zero, se poate ar trebui să se schimbe &quot;Distribuirea taxelor pe baza&quot;"
 DocType: Purchase Invoice,Taxes and Charges Calculation,Impozite și Taxe Calcul
 DocType: BOM Operation,Workstation,Stație de lucru
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +112,Hardware,Hardware
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +112,Hardware,Hardware
 DocType: Attendance,HR Manager,Manager Resurse Umane
 apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,Vă rugăm să selectați o companie
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +50,Privilege Leave,Privilege concediu
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +50,Privilege Leave,Privilege concediu
 DocType: Purchase Invoice,Supplier Invoice Date,Furnizor Data facturii
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +79,You need to enable Shopping Cart,Trebuie să activați Cosul de cumparaturi
 apps/frappe/frappe/public/js/frappe/form/grid_body.html +6,No Data,No Data
@@ -1174,7 +1134,7 @@
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +81,Overlapping conditions found between:,Condiții se suprapun găsite între:
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +168,Against Journal Entry {0} is already adjusted against some other voucher,Comparativ intrării {0} în jurnal este deja ajustată comparativ altui voucher
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +68,Total Order Value,Valoarea totală Comanda
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +38,Food,Produse Alimentare
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +38,Food,Produse Alimentare
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Clasă de uzură 3
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +139,You can make a time log only against a submitted production order,Puteți face un jurnal de timp doar împotriva unui ordin de producție prezentată
 DocType: Maintenance Schedule Item,No of Visits,Nu de vizite
@@ -1194,6 +1154,7 @@
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,View Offer Letter,Vezi Scrisoare Oferta
 DocType: Communication,Communication,Comunicare
 DocType: Item,Is Service Item,Este Serviciul Articol
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +81,Application period cannot be outside leave allocation period,Perioada de aplicare nu poate fi perioadă de alocare concediu în afara
 DocType: Activity Cost,Projects,Proiecte
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +31,Please select Fiscal Year,Vă rugăm să selectați Anul fiscal
 apps/erpnext/erpnext/controllers/buying_controller.py +23,From {0} | {1} {2},De la {0} | {1} {2}
@@ -1212,7 +1173,7 @@
 DocType: Item,Maintain Stock,Menține Stock
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +213,Stock Entries already created for Production Order ,
 DocType: Leave Control Panel,Leave blank if considered for all designations,Lăsați necompletat dacă se consideră pentru toate denumirile
-apps/erpnext/erpnext/controllers/accounts_controller.py +499,Charge of type 'Actual' in row {0} cannot be included in Item Rate,"Taxa de tip 'Efectiv' în inregistrarea {0} nu poate fi inclus în Rata Articol"""
+apps/erpnext/erpnext/controllers/accounts_controller.py +500,Charge of type 'Actual' in row {0} cannot be included in Item Rate,"Taxa de tip 'Efectiv' în inregistrarea {0} nu poate fi inclus în Rata Articol"""
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,Max: {0},Max: {0}
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +16,From Datetime,De la Datetime
 DocType: Email Digest,For Company,Pentru Companie
@@ -1222,7 +1183,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +50,Chart of Accounts,Grafic Conturi
 DocType: Material Request,Terms and Conditions Content,Termeni și condiții de conținut
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +471,cannot be greater than 100,nu poate fi mai mare de 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +546,Item {0} is not a stock Item,Articolul{0} nu este un element de stoc
+apps/erpnext/erpnext/stock/doctype/item/item.py +550,Item {0} is not a stock Item,Articolul{0} nu este un element de stoc
 DocType: Maintenance Visit,Unscheduled,Neprogramat
 DocType: Employee,Owned,Deținut
 DocType: Salary Slip Deduction,Depends on Leave Without Pay,Depinde de concediu fără plată
@@ -1236,31 +1197,29 @@
 DocType: HR Settings,Employee Settings,Setări Angajat
 ,Batch-Wise Balance History,Istoricul balanţei principale aferente lotului
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +72,To Do List,To do list
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +63,Apprentice,Începător
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Apprentice,Începător
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +99,Negative Quantity is not allowed,Nu este permisă cantitate negativă
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
 Used for Taxes and Charges","Taxa detaliu tabel preluat de la maestru articol ca un șir și stocate în acest domeniu.
  Folosit pentru Impozite și Taxe"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +61,Lancing,Intepare
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +151,Employee cannot report to himself.,Angajat nu pot raporta la sine.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","În cazul în care contul este blocat, intrările sunt permite utilizatorilor restricționati."
 DocType: Email Digest,Bank Balance,Banca Balance
-apps/erpnext/erpnext/controllers/accounts_controller.py +435,Accounting Entry for {0}: {1} can only be made in currency: {2},Contabilitate de intrare pentru {0}: {1} se poate face numai în valută: {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +436,Accounting Entry for {0}: {1} can only be made in currency: {2},Contabilitate de intrare pentru {0}: {1} se poate face numai în valută: {2}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +38,No active Salary Structure found for employee {0} and the month,O structură Salariul activ găsite pentru angajat {0} și luna
 DocType: Job Opening,"Job profile, qualifications required etc.","Profilul postului, calificări necesare, etc"
 DocType: Journal Entry Account,Account Balance,Soldul contului
 apps/erpnext/erpnext/config/accounts.py +112,Tax Rule for transactions.,Regula de impozit pentru tranzacțiile.
 DocType: Rename Tool,Type of document to rename.,Tip de document pentru a redenumi.
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +630,We buy this Item,Cumparam acest articol
+apps/erpnext/erpnext/public/js/setup_wizard.js +366,We buy this Item,Cumparam acest articol
 DocType: Address,Billing,Facturare
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +77,Flanging,Bordurare
 DocType: Bulk Email,Not Sent,Nu a fost trimis
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +73,Explosive forming,Exploziv formarea
 DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),Total Impozite si Taxe (Compania valutar)
 DocType: Shipping Rule,Shipping Account,Contul de transport maritim
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +43,Scheduled to send to {0} recipients,Programat pentru a trimite la {0} destinatari
 DocType: Quality Inspection,Readings,Lecturi
 DocType: Stock Entry,Total Additional Costs,Costuri totale suplimentare
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Sub Assemblies,Sub Assemblies
+apps/erpnext/erpnext/public/js/setup_wizard.js +359,Sub Assemblies,Sub Assemblies
 DocType: Shipping Rule Condition,To Value,La valoarea
 DocType: Supplier,Stock Manager,Stock Manager
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +143,Source warehouse is mandatory for row {0},Depozit sursă este obligatorie pentru rând {0}
@@ -1270,43 +1229,41 @@
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Import a eșuat!
 apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,Nici adresa adăugat încă.
 DocType: Workstation Working Hour,Workstation Working Hour,Statie de lucru de ore de lucru
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +83,Analyst,Analist
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Analyst,Analist
 DocType: Item,Inventory,Inventarierea
 DocType: Features Setup,"To enable ""Point of Sale"" view",Pentru a activa &quot;punct de vânzare&quot; vedere
 apps/erpnext/erpnext/public/js/pos/pos.js +402,Payment cannot be made for empty cart,Plata nu se poate face pentru cart gol
 DocType: Item,Sales Details,Detalii vânzări
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +149,Pinning,Fixarea
 DocType: Opportunity,With Items,Cu articole
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,În Cantitate
 DocType: Notification Control,Expense Claim Rejected,Revendicare Cheltuieli Respinsa
 DocType: Sales Invoice,"The date on which next invoice will be generated. It is generated on submit.
 ",Data la care va fi generat următoarea factură. Acesta este generată pe prezinte.
 DocType: Item Attribute,Item Attribute,Postul Atribut
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +105,Government,Guvern
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Government,Guvern
 apps/erpnext/erpnext/config/stock.py +268,Item Variants,Variante Postul
 DocType: Company,Services,Servicii
 apps/erpnext/erpnext/accounts/report/financial_statements.py +147,Total ({0}),Total ({0})
 DocType: Cost Center,Parent Cost Center,Părinte Cost Center
 DocType: Sales Invoice,Source,Sursă
 DocType: Leave Type,Is Leave Without Pay,Este concediu fără plată
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +186,No records found in the Payment table,Nu sunt găsite în tabelul de plăți înregistrări
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +405,Financial Year Start Date,Data de Inceput An Financiar
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +133,No records found in the Payment table,Nu sunt găsite în tabelul de plăți înregistrări
+apps/erpnext/erpnext/public/js/setup_wizard.js +153,Financial Year Start Date,Data de Inceput An Financiar
 DocType: Employee External Work History,Total Experience,Experiența totală
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +100,Countersinking,Zencuire
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +271,Packing Slip(s) cancelled,Slip de ambalare (e) anulate
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +276,Packing Slip(s) cancelled,Slip de ambalare (e) anulate
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,Incarcatura și Taxe de Expediere
 DocType: Material Request Item,Sales Order No,Vânzări Ordinul nr
 DocType: Item Group,Item Group Name,Denumire Grup Articol
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +50,Taken,Luate
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,Luate
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +66,Transfer Materials for Manufacture,Materiale de transfer de Fabricare
 DocType: Pricing Rule,For Price List,Pentru Lista de Preturi
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +27,Executive Search,Cautare Executiva
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,Cautare Executiva
 apps/erpnext/erpnext/stock/stock_ledger.py +405,"Purchase rate for item: {0} not found, which is required to book accounting entry (expense). Please mention item price against a buying price list.","Rata de cumparare pentru articol: {0} nu a fost găsit, care este necesară pentru a face rezervarea intrare contabilitate (cheltuieli). Va rugam mentionati preț articol de o listă de prețuri de cumpărare."
 DocType: Maintenance Schedule,Schedules,Orarele
 DocType: Purchase Invoice Item,Net Amount,Cantitate netă
 DocType: Purchase Order Item Supplied,BOM Detail No,Detaliu BOM nr.
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),Discount suplimentar Suma (companie de valuta)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +537,Error: {0} > {1},Eroare: {0}> {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +541,Error: {0} > {1},Eroare: {0}> {1}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,Vă rugăm să creați un cont nou de Planul de conturi.
 DocType: Maintenance Visit,Maintenance Visit,Vizita Mentenanta
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer > Customer Group > Territory,Client> Client Group> Teritoriul
@@ -1317,7 +1274,6 @@
 DocType: Event,Tuesday,Marți
 DocType: Leave Block List,Block Holidays on important days.,Blocaţi zile de sărbătoare în zilele importante.
 ,Accounts Receivable Summary,Rezumat conturi de încasare
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +43,Leaves for type {0} already allocated for Employee {1} for period {2} - {3},Frunze de tip {0} deja alocate pentru Angajat {1} pentru perioada {2} - {3}
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +187,Please set User ID field in an Employee record to set Employee Role,Vă rugăm să setați câmp ID de utilizator într-o înregistrare angajat să stabilească Angajat rol
 DocType: UOM,UOM Name,Numele UOM
 DocType: Top Bar Item,Target,Țintă
@@ -1329,15 +1285,14 @@
 DocType: ToDo,Due Date,Data Limita 
 DocType: Sales Invoice Item,Brand Name,Denumire marcă
 DocType: Purchase Receipt,Transporter Details,Detalii Transporter
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Box,Cutie
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +389,The Organization,Organizația
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Box,Cutie
+apps/erpnext/erpnext/public/js/setup_wizard.js +137,The Organization,Organizația
 DocType: Monthly Distribution,Monthly Distribution,Distributie lunar
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,Receptor Lista goala. Vă rugăm să creați Receiver Lista
 DocType: Production Plan Sales Order,Production Plan Sales Order,Planul de producție comandă de vânzări
 DocType: Sales Partner,Sales Partner Target,Vânzări Partner țintă
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},Intrarea contabilitate pentru {0} se poate face numai în valută: {1}
 DocType: Pricing Rule,Pricing Rule,Regula de stabilire a prețurilor
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +58,Notching,Crestare
 apps/erpnext/erpnext/config/learn.py +167,Material Request to Purchase Order,Cerere de material de cumpărare Ordine
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,Conturi bancare
 ,Bank Reconciliation Statement,Extras de cont reconciliere bancară
@@ -1353,20 +1308,19 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Amounts not reflected in bank,Sumele nu sunt corespunzătoare cu banca
 DocType: Quality Inspection Reading,Reading 4,Reading 4
 apps/erpnext/erpnext/config/hr.py +23,Claims for company expense.,Cererile pentru cheltuieli companie.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +8,Centrifugal casting,Turnare centrifugală
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +119,Magnetic field-assisted finishing,Asistată de câmp magnetic de finisare
 DocType: Company,Default Holiday List,Implicit Listă de vacanță
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +165,Stock Liabilities,Pasive stoc
 DocType: Purchase Receipt,Supplier Warehouse,Furnizor Warehouse
 DocType: Opportunity,Contact Mobile No,Nr. Mobil Persoana de Contact
 DocType: Production Planning Tool,Select Sales Orders,Selectați comenzi de vânzări
 ,Material Requests for which Supplier Quotations are not created,Cererile de materiale pentru care nu sunt create Cotațiile Furnizor
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +117,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,A doua zi (e) pe care se aplica pentru concediu sunt sărbători. Nu trebuie să se aplice pentru concediu.
 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.,Pentru a urmări elemente utilizând coduri de bare. Va fi capabil de a intra articole în nota de livrare și factură de vânzare prin scanarea codului de bare de element.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +477,Mark as Delivered,Mark livrate
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +497,Mark as Delivered,Mark livrate
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +34,Make Quotation,Face ofertă
 DocType: Dependent Task,Dependent Task,Sarcina dependent
-apps/erpnext/erpnext/stock/doctype/item/item.py +306,Conversion factor for default Unit of Measure must be 1 in row {0},Factor de Conversie pentru Unitatea de Măsură implicita trebuie să fie 1 pentru inregistrarea {0}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,Leave of type {0} cannot be longer than {1},Concediul de tip {0} nu poate dura mai mare de {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +310,Conversion factor for default Unit of Measure must be 1 in row {0},Factor de Conversie pentru Unitatea de Măsură implicita trebuie să fie 1 pentru inregistrarea {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +155,Leave of type {0} cannot be longer than {1},Concediul de tip {0} nu poate dura mai mare de {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Încercați planificarea operațiunilor de X zile în avans.
 DocType: HR Settings,Stop Birthday Reminders,De oprire de naștere Memento
 DocType: SMS Center,Receiver List,Receptor Lista
@@ -1374,15 +1328,14 @@
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Consumat Suma
 apps/erpnext/erpnext/public/js/pos/pos.js +491,{0} View,{0} Vezi
 DocType: Salary Structure Deduction,Salary Structure Deduction,Structura Salariul Deducerea
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +158,Selective laser sintering,Sinterizare cu laser selectivă
-apps/erpnext/erpnext/stock/doctype/item/item.py +301,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Unitate de măsură {0} a fost introdus mai mult de o dată în Factor de conversie Tabelul
+apps/erpnext/erpnext/stock/doctype/item/item.py +305,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Unitate de măsură {0} a fost introdus mai mult de o dată în Factor de conversie Tabelul
 apps/frappe/frappe/core/page/data_import_tool/data_import_tool.js +108,Import Successful!,Importa cu succes!
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Costul de articole emise
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +185,Quantity must not be more than {0},Cantitatea nu trebuie să fie mai mare de {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +41,Age (Days),Vârstă (zile)
 DocType: Quotation Item,Quotation Item,Citat Articol
 DocType: Account,Account Name,Numele Contului
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +41,From Date cannot be greater than To Date,De la data nu poate fi mai mare decât la data
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +34,From Date cannot be greater than To Date,De la data nu poate fi mai mare decât la data
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +194,Serial No {0} quantity {1} cannot be a fraction,Serial Nu {0} {1} cantitate nu poate fi o fracțiune
 apps/erpnext/erpnext/config/buying.py +59,Supplier Type master.,Furnizor de tip maestru.
 DocType: Purchase Order Item,Supplier Part Number,Furnizor Număr
@@ -1391,14 +1344,14 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +247,{0} {1} is cancelled or stopped,{0} {1} este anulată sau oprită
 DocType: Accounts Settings,Credit Controller,Controler de Credit
 DocType: Delivery Note,Vehicle Dispatch Date,Dispeceratul vehicul Data
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +197,Purchase Receipt {0} is not submitted,Primirea de cumpărare {0} nu este prezentat
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +198,Purchase Receipt {0} is not submitted,Primirea de cumpărare {0} nu este prezentat
 DocType: Company,Default Payable Account,Implicit cont furnizori
 apps/erpnext/erpnext/config/website.py +13,"Settings for online shopping cart such as shipping rules, price list etc.","Setări pentru cosul de cumparaturi on-line, cum ar fi normele de transport maritim, lista de preturi, etc."
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +660,Setup Complete,Configurare complet
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +124,Setup Complete,Configurare complet
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +65,{0}% Billed,{0}% Taxat
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +17,Reserved Qty,Rezervate Cantitate
 DocType: Party Account,Party Account,Party Account
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +74,Human Resources,Resurse umane
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +74,Human Resources,Resurse umane
 DocType: Lead,Upper Income,Venituri de sus
 DocType: Journal Entry Account,Debit in Company Currency,Debit în companie valutar
 apps/erpnext/erpnext/support/doctype/issue/issue.py +58,My Issues,Problemele mele
@@ -1407,11 +1360,9 @@
 DocType: Company,Default Values,Valori implicite
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +236,Row {0}: Payment amount can not be negative,Rând {0}: Suma de plată nu poate fi negativ
 DocType: Expense Claim,Total Amount Reimbursed,Total suma rambursată
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +152,Press fitting,Presa de montare
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +64,Against Supplier Invoice {0} dated {1},Comparativ facturii furnizorului {0} din data {1}
 DocType: Customer,Default Price List,Lista de Prețuri Implicita
 DocType: Payment Reconciliation,Payments,Plăți
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +24,Hot isostatic pressing,Izostatice la cald presare
 DocType: ToDo,Medium,Medie
 DocType: Budget Detail,Budget Allocated,Buget alocat
 DocType: Journal Entry,Entry Type,Tipul de intrare
@@ -1424,9 +1375,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +56,None of the items have any change in quantity or value.,Nici unul din elementele au nici o schimbare în cantitate sau de valoare.
 DocType: Warranty Claim,Warranty Claim,Garanție revendicarea
 ,Lead Details,Detalii Conducere
-DocType: Authorization Rule,Approving User,Aprobare utilizator
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +37,Forging,Forjare
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +126,Plating,Placare
 DocType: Purchase Invoice,End date of current invoice's period,Data de încheiere a perioadei facturii curente
 DocType: Pricing Rule,Applicable For,Aplicabil pentru
 DocType: Bank Reconciliation,From Date,Din data
@@ -1448,31 +1396,29 @@
 DocType: Sales Invoice,Paid Amount (Company Currency),Plătit Suma (Compania de valuta)
 DocType: Purchase Invoice,Additional Discount,Discount suplimentar
 DocType: Selling Settings,Selling Settings,Vanzarea Setări
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +39,Online Auctions,Licitatii Online
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,Licitatii Online
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +94,Please specify either Quantity or Valuation Rate or both,Vă rugăm să specificați fie Cantitate sau Evaluează evaluare sau ambele
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +50,"Company, Month and Fiscal Year is mandatory","Compania, Luna și Anul fiscal sunt obligatorii"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Marketing Expenses,Cheltuieli de marketing
 ,Item Shortage Report,Raport Articole Lipsa
-apps/erpnext/erpnext/stock/doctype/item/item.js +183,"Weight is mentioned,\nPlease mention ""Weight UOM"" too",
+apps/erpnext/erpnext/stock/doctype/item/item.js +185,"Weight is mentioned,\nPlease mention ""Weight UOM"" too",
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,Cerere de material utilizat pentru a face acest stoc de intrare
 apps/erpnext/erpnext/config/support.py +43,Single unit of an Item.,Unitate unică a unui articol.
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +212,Time Log Batch {0} must be 'Submitted',"Ora Log Lot {0} trebuie să fie ""Înscris"""
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,Realizeaza Intrare de Contabilitate Pentru Fiecare Modificare a Stocului
 DocType: Leave Allocation,Total Leaves Allocated,Totalul Frunze alocate
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +384,Warehouse required at Row No {0},Depozit necesar la Row Nu {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +386,Warehouse required at Row No {0},Depozit necesar la Row Nu {0}
 DocType: Employee,Date Of Retirement,Data Pensionare
 DocType: Upload Attendance,Get Template,Obține șablon
 DocType: Address,Postal,Poștal
 DocType: Item,Weightage,Weightage
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +159,Mining,Minerit
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +17,Resin casting,Turnare de rășină
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,Există un grup de clienți cu același nume vă rugăm să schimbați numele clientului sau să redenumiți grupul de clienți
 apps/erpnext/erpnext/public/js/pos/pos.js +147,Please select {0} first.,Vă rugăm să selectați {0} primul.
 apps/erpnext/erpnext/templates/pages/order.html +57,text {0},Textul {0}
 DocType: Territory,Parent Territory,Teritoriul părinte
 DocType: Quality Inspection Reading,Reading 2,Reading 2
 DocType: Stock Entry,Material Receipt,Primirea de material
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +622,Products,Instrumente
+apps/erpnext/erpnext/public/js/setup_wizard.js +358,Products,Instrumente
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +47,Party Type and Party is required for Receivable / Payable account {0},Partidul Tipul și Partidul este necesar pentru creanțe / cont plateste {0}
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.","Dacă acest element are variante, atunci nu poate fi selectat în comenzile de vânzări, etc."
 DocType: Lead,Next Contact By,Următor Contact Prin
@@ -1482,13 +1428,13 @@
 DocType: Purchase Invoice,Notification Email Address,Notificarea Adresa de e-mail
 DocType: Payment Tool,Find Invoices to Match,Găsiți Facturi pentru a se potrivi
 ,Item-wise Sales Register,Registru Vanzari Articol-Avizat
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +399,"e.g. ""XYZ National Bank""","de exemplu, ""XYZ Banca Națională """
+apps/erpnext/erpnext/public/js/setup_wizard.js +147,"e.g. ""XYZ National Bank""","de exemplu, ""XYZ Banca Națională """
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,Este acest fiscală inclusă în rata de bază?
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +57,Total Target,Raport țintă
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Target,Raport țintă
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.js +22,Shopping Cart is enabled,Cosul de cumparaturi este activat
 DocType: Job Applicant,Applicant for a Job,Solicitant pentru un loc de muncă
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +173,No Production Orders created,Nu sunt comenzile de producție create
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +131,Salary Slip of employee {0} already created for this month,Salariul alunecare de angajat {0} deja creat pentru această lună
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +140,Salary Slip of employee {0} already created for this month,Salariul alunecare de angajat {0} deja creat pentru această lună
 DocType: Stock Reconciliation,Reconciliation JSON,Reconciliere JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Prea multe coloane. Exporta raportul și imprima utilizând o aplicație de calcul tabelar.
 DocType: Sales Invoice Item,Batch No,Lot nr.
@@ -1498,14 +1444,14 @@
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +13,Variant,Variantă
 apps/frappe/frappe/public/js/frappe/form/toolbar.js +165,New {0},Nou {0}
 DocType: Naming Series,Set prefix for numbering series on your transactions,Set prefix pentru seria de numerotare pe tranzacțiile dvs.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +169,Stopped order cannot be cancelled. Unstop to cancel.,Pentru a opri nu pot fi anulate. Unstop pentru a anula.
-apps/erpnext/erpnext/stock/doctype/item/item.py +323,Default BOM ({0}) must be active for this item or its template,Implicit BOM ({0}) trebuie să fie activ pentru acest element sau șablon de
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +164,Stopped order cannot be cancelled. Unstop to cancel.,Pentru a opri nu pot fi anulate. Unstop pentru a anula.
+apps/erpnext/erpnext/stock/doctype/item/item.py +327,Default BOM ({0}) must be active for this item or its template,Implicit BOM ({0}) trebuie să fie activ pentru acest element sau șablon de
 DocType: Employee,Leave Encashed?,Concediu Incasat ?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Oportunitatea de la câmp este obligatoriu
 DocType: Item,Variants,Variante
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +458,Make Purchase Order,Realizeaza Comanda de Cumparare
 DocType: SMS Center,Send To,Trimite la
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +111,There is not enough leave balance for Leave Type {0},Nu există echilibru concediu suficient pentru concediul de tip {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +127,There is not enough leave balance for Leave Type {0},Nu există echilibru concediu suficient pentru concediul de tip {0}
 DocType: Sales Team,Contribution to Net Total,Contribuție la Total Net
 DocType: Sales Invoice Item,Customer's Item Code,Cod Articol Client
 DocType: Stock Reconciliation,Stock Reconciliation,Stoc Reconciliere
@@ -1542,11 +1488,11 @@
 DocType: Sales Order Item,Actual Qty,Cant efectivă
 DocType: Sales Invoice Item,References,Referințe
 DocType: Quality Inspection Reading,Reading 10,Reading 10
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +612,"List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start.","Lista de produse sau servicii pe care doriti sa le cumparati sau vindeti. Asigurați-vă că ati verificat Grupul Articolului, Unitatea de Măsură și alte proprietăți atunci când incepeti."
+apps/erpnext/erpnext/public/js/setup_wizard.js +348,"List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start.","Lista de produse sau servicii pe care doriti sa le cumparati sau vindeti. Asigurați-vă că ati verificat Grupul Articolului, Unitatea de Măsură și alte proprietăți atunci când incepeti."
 DocType: Hub Settings,Hub Node,Hub Node
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,Ați introdus elemente cu dubluri. Vă rugăm să rectifice și să încercați din nou.
 apps/erpnext/erpnext/controllers/item_variant.py +65,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values,Valoarea {0} pentru {1} Atribut nu există în lista de la punctul valabile Valorile atributelor
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +87,Associate,Asociaţi
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Associate,Asociaţi
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +46,Item {0} is not a serialized Item,Articolul {0} nu este un articol serializat
 DocType: SMS Center,Create Receiver List,Creare Lista Recipienti
 apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +5,Expired,Expirat
@@ -1555,7 +1501,7 @@
 DocType: Warranty Claim,Issue Date,Data emiterii
 DocType: Activity Cost,Activity Cost,Cost activitate
 DocType: Purchase Receipt Item Supplied,Consumed Qty,Cantitate Consumata
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +52,Telecommunications,Telecomunicații
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +52,Telecommunications,Telecomunicații
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),Indică faptul că pachetul este o parte din această livrare (Proiect de numai)
 DocType: Payment Tool,Make Payment Entry,Realizeaza Intrare de Plati
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +119,Quantity for Item {0} must be less than {1},Cantitatea pentru postul {0} trebuie să fie mai mică de {1}
@@ -1572,10 +1518,8 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +37,"Selling must be checked, if Applicable For is selected as {0}","De vânzare trebuie să fie verificate, dacă este cazul Pentru este selectat ca {0}"
 DocType: Purchase Order Item,Supplier Quotation Item,Furnizor ofertă Articol
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +27,Make Salary Structure,Realizeaza Structura Salariala
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +54,Shearing,Tuns
 DocType: Item,Has Variants,Are variante
 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.,Clic pe butonul 'Intocmeste Factura Vanzare' pentru a crea o nouă Factură de Vânzare.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +166,Packaging and labeling,Ambalare și etichetare
 DocType: Monthly Distribution,Name of the Monthly Distribution,Numele de Distributie lunar
 DocType: Sales Person,Parent Sales Person,Mamă Sales Person
 apps/erpnext/erpnext/setup/utils.py +14,Please specify Default Currency in Company Master and Global Defaults,Vă rugăm să precizați implicit de valuta în Compania de Master și setări implicite globale
@@ -1586,18 +1530,17 @@
 DocType: Budget Detail,Fiscal Year,An Fiscal
 DocType: Cost Center,Budget,Buget
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +41,"Budget cannot be assigned against {0}, as it's not an Income or Expense account","Bugetul nu pot fi atribuite în {0}, deoarece nu este un cont venituri sau cheltuieli"
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Achieved,Realizat
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,Realizat
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +65,Territory / Customer,Teritoriu / client
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,e.g. 5,de exemplu 5
+apps/erpnext/erpnext/public/js/setup_wizard.js +294,e.g. 5,de exemplu 5
 DocType: Sales Invoice,In Words will be visible once you save the Sales Invoice.,În cuvinte va fi vizibil după ce a salva de vânzări factură.
 DocType: Item,Is Sales Item,Este produs de vânzări
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,Ramificatie Grup Articole
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,Articolul {0} nu este configurat pentru Numerotare Seriala. Verificati Articolul Principal.
 DocType: Maintenance Visit,Maintenance Time,Timp Mentenanta
 ,Amount to Deliver,Sumă pentru livrare
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +620,A Product or Service,Un Produs sau Serviciu
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +158,There were errors.,Au fost erori.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +101,Tapping,Atingând
+apps/erpnext/erpnext/public/js/setup_wizard.js +356,A Product or Service,Un Produs sau Serviciu
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +146,There were errors.,Au fost erori.
 DocType: Naming Series,Current Value,Valoare curenta
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +171,{0} created,{0} creat
 DocType: Delivery Note Item,Against Sales Order,Comparativ comenzii de vânzări
@@ -1611,7 +1554,7 @@
 apps/erpnext/erpnext/accounts/party.py +275,Due Date cannot be before Posting Date,Data Limita nu poate fi anterioara Datei de POstare
 DocType: Website Item Group,Website Item Group,Site-ul Grupa de articole
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Duties and Taxes,Impozite și taxe
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Please enter Reference date,Vă rugăm să introduceți data de referință
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +312,Please enter Reference date,Vă rugăm să introduceți data de referință
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} înregistrări de plată nu pot fi filtrate de {1}
 DocType: Item Website Specification,Table for Item that will be shown in Web Site,Tabelul pentru postul care va fi afișat în site-ul
 DocType: Purchase Order Item Supplied,Supplied Qty,Furnizat Cantitate
@@ -1619,7 +1562,7 @@
 apps/erpnext/erpnext/config/stock.py +103,Tree of Item Groups.,Arborele de Postul grupuri.
 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,Nu se poate face referire la un număr de inregistare mai mare sau egal cu numărul curent de inregistrare pentru acest tip de Incasare
 ,Item-wise Purchase History,Istoric Achizitii Articol-Avizat
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +152,Red,Roșu
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Red,Roșu
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +228,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},"Vă rugăm să faceți clic pe ""Generate Program"", pentru a aduce ordine adăugat pentru postul {0}"
 DocType: Account,Frozen,Congelat
 ,Open Production Orders,Comenzi deschis de producție
@@ -1634,7 +1577,7 @@
 DocType: Item Attribute,Attribute Name,Denumire atribut
 apps/erpnext/erpnext/controllers/selling_controller.py +236,Item {0} must be Sales or Service Item in {1},Articolul {0} trebuie să fie un Articol de Vanzari sau de Service in {1}
 DocType: Item Group,Show In Website,Arata pe site-ul
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +621,Group,Grup
+apps/erpnext/erpnext/public/js/setup_wizard.js +357,Group,Grup
 DocType: Task,Expected Time (in hours),Timp de așteptat (în ore)
 ,Qty to Order,Cantitate pentru comandă
 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","Pentru a urmări nume de brand în următoarele documente de însoțire a mărfii, oportunitate, cerere Material, Postul, comanda de achiziție, Cumpărare Voucherul, Cumpărătorul Primirea, cotatie, vânzări factură, produse Bundle, comandă de vânzări, ordine"
@@ -1644,6 +1587,7 @@
 DocType: Features Setup,Brands,Mărci
 DocType: C-Form Invoice Detail,Invoice No,Factura Nu
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +480,From Purchase Order, Din Ordinul de Comanda
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +92,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Lasă nu poate fi aplicat / anulata pana la {0}, ca echilibru concediu a fost deja carry transmise în viitor înregistrarea alocare concediu {1}"
 DocType: Activity Cost,Costing Rate,Costing Rate
 ,Customer Addresses And Contacts,Adrese de clienți și Contacte
 DocType: Employee,Resignation Letter Date,Scrisoare de demisie Data
@@ -1651,35 +1595,31 @@
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +137,Not Set,Nu a fost setat
 DocType: Communication,Date,Dată
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,Repetați Venituri Clienți
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +651,Sit tight while your system is being setup. This may take a few moments.,Stai bine în timp ce sistemul este în curs de instalare. Acest lucru poate dura câteva momente.
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +115,Sit tight while your system is being setup. This may take a few moments.,Stai bine în timp ce sistemul este în curs de instalare. Acest lucru poate dura câteva momente.
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +51,{0} ({1}) must have role 'Expense Approver',"{0} ({1}) trebuie să dețină rolul de ""aprobator cheltuieli"""
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Pair,Pereche
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Pair,Pereche
 DocType: Bank Reconciliation Detail,Against Account,Comparativ contului
 DocType: Maintenance Schedule Detail,Actual Date,Data efectiva
 DocType: Item,Has Batch No,Are nr. de Lot
 DocType: Delivery Note,Excise Page Number,Numărul paginii accize
 DocType: Employee,Personal Details,Detalii personale
 ,Maintenance Schedules,Program Mentenanta
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +44,Embossing,Ștanțare
 ,Quotation Trends,Cotație Tendințe
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +139,Item Group not mentioned in item master for item {0},Grupa de articole care nu sunt menționate la punctul de master pentru element {0}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +302,Debit To account must be a Receivable account,Debit cont trebuie să fie un cont de creanțe
-apps/erpnext/erpnext/stock/doctype/item/item.py +310,"As Production Order can be made for this item, it must be a stock item.","Deoarece se poate întocmi ordin de producție aferent acestui articol, acesta trebuie să fie un articol de stoc."
 DocType: Shipping Rule Condition,Shipping Amount,Suma de transport maritim
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +140,Joining,Aderarea
-DocType: Authorization Rule,Above Value,Valoarea de mai sus
 ,Pending Amount,În așteptarea Suma
 DocType: Purchase Invoice Item,Conversion Factor,Factor de conversie
 DocType: Purchase Order,Delivered,Livrat
 apps/erpnext/erpnext/config/hr.py +160,Setup incoming server for jobs email id. (e.g. jobs@example.com),Configurare de server de intrare pentru ocuparea forței de muncă id-ul de e-mail. (De exemplu jobs@example.com)
 DocType: Purchase Receipt,Vehicle Number,Numărul de vehicule
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,La data la care factura recurente vor fi opri
+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,Total frunze alocate {0} nu poate fi mai mic de frunze deja aprobate {1} pentru perioada
 DocType: Journal Entry,Accounts Receivable,Conturi de Incasare
 ,Supplier-Wise Sales Analytics,Furnizor înțelept Vânzări Analytics
 DocType: Address Template,This format is used if country specific format is not found,Acest format este utilizat în cazul în format specific țării nu este găsit
 DocType: Custom Field,Custom,Personalizat
 DocType: Production Order,Use Multi-Level BOM,Utilizarea Multi-Level BOM
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +26,Injection molding,Injectarea
 DocType: Bank Reconciliation,Include Reconciled Entries,Includ intrările împăcat
 apps/erpnext/erpnext/config/accounts.py +41,Tree of finanial accounts.,Arborele de conturi finanial.
 DocType: Leave Control Panel,Leave blank if considered for all employee types,Lăsați necompletat dacă se consideră pentru toate tipurile de angajați
@@ -1689,29 +1629,27 @@
 apps/frappe/frappe/config/setup.py +130,Printing,Tipărire
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +114,Expense Claim is pending approval. Only the Expense Approver can update status.,Revendicarea Cheltuielilor este în curs de aprobare. Doar Aprobatorul de Cheltuieli poate actualiza statusul.
 DocType: Purchase Invoice,Additional Discount Amount,Reducere suplimentară Suma
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +99,The day(s) on which you are applying for leave are holiday. You need not apply for leave.,A doua zi (e) pe care aplici pentru concediu sunt vacanță. Tu nu trebuie să se aplice pentru concediu.
 apps/frappe/frappe/public/js/frappe/misc/utils.js +110,and,și
 DocType: Leave Block List Allow,Leave Block List Allow,Permite Lista Concedii Blocate
 apps/erpnext/erpnext/setup/doctype/company/company.py +236,Abbr can not be blank or space,Abbr nu poate fi gol sau spațiu
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +50,Sports,Sport
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,Sport
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Actual,Raport real
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Unit,Unitate
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Unit,Unitate
 apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.py +182,Please set Dropbox access keys in your site config,Vă rugăm să setați tastele de acces Dropbox pe site-ul dvs. de configurare
 apps/erpnext/erpnext/stock/get_item_details.py +113,Please specify Company,Vă rugăm să specificați companiei
 ,Customer Acquisition and Loyalty,Achiziționare și Loialitate Client
 DocType: Purchase Receipt,Warehouse where you are maintaining stock of rejected items,Depozit în cazul în care se menține stocul de articole respinse
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +408,Your financial year ends on,Anul dvs. financiar se încheie pe
+apps/erpnext/erpnext/public/js/setup_wizard.js +156,Your financial year ends on,Anul dvs. financiar se încheie pe
 DocType: POS Profile,Price List,Lista de prețuri
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +20,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0} este acum implicit anul fiscal. Vă rugăm să reîmprospătați browser-ul dvs. pentru ca modificarea să aibă efect.
 apps/erpnext/erpnext/projects/doctype/project/project.js +47,Expense Claims,Creanțe cheltuieli
 DocType: Issue,Support,Suport
-DocType: Authorization Rule,Approving Role,Aprobare rol
 ,BOM Search,BOM Căutare
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +176,Closing (Opening + Totals),Închiderea (deschidere + Totaluri)
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +26,Please specify currency in Company,Vă rugăm să specificați în valută companie
 DocType: Workstation,Wages per hour,Salarii pe oră
 apps/erpnext/erpnext/config/setup.py +83,"Show / Hide features like Serial Nos, POS etc.","Arată / Ascunde caracteristici cum ar fi de serie nr, POS etc"
-apps/erpnext/erpnext/controllers/accounts_controller.py +236,Account {0} is invalid. Account Currency must be {1},Contul {0} nu este valid. Contul valutar trebuie să fie {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +237,Account {0} is invalid. Account Currency must be {1},Contul {0} nu este valid. Contul valutar trebuie să fie {1}
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +34,UOM Conversion factor is required in row {0},Factor UOM de conversie este necesară în rândul {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +53,Clearance date cannot be before check date in row {0},Data Aprobare nu poate fi anterioara datei de verificare pentru inregistrarea {0}
 DocType: Salary Slip,Deduction,Deducere
@@ -1730,13 +1668,13 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +82,Item {0} has already been returned,Articolul {0} a fost deja returnat
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,**Anul fiscal** reprezintă un an financiar. Toate intrările contabile și alte tranzacții majore sunt monitorizate comparativ cu ** Anul fiscal **.
 DocType: Opportunity,Customer / Lead Address,Client / Adresa principala
+apps/erpnext/erpnext/stock/doctype/item/item.py +112,Warning: Invalid SSL certificate on attachment {0},Atenție: certificat SSL invalid pe atașament {0}
 DocType: Production Order Operation,Actual Operation Time,Timp efectiv de funcționare
 DocType: Authorization Rule,Applicable To (User),Aplicabil pentru (utilizator)
 DocType: Purchase Taxes and Charges,Deduct,Deduce
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +170,Job Description,Descrierea postului
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +170,Job Description,Descrierea postului
 DocType: Purchase Order Item,Qty as per Stock UOM,Cantitate conform Stock UOM
 apps/frappe/frappe/model/rename_doc.py +343,Please select a valid csv file with data,Vă rugăm să selectați un fișier csv valid cu date
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +92,Coating,Strat
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +126,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Caractere speciale in afara ""-"" ""."", ""#"", și ""/"" nu este permis în denumirea serie"
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Păstra Tractor de campanii de vanzari. Țineți evidența de afaceri, Cotațiile, comandă de vânzări, etc de la Campanii pentru a evalua Return on Investment. "
 DocType: Expense Claim,Approver,Aprobator
@@ -1746,12 +1684,11 @@
 DocType: Supplier Quotation,Manufacturing Manager,Manufacturing Manager de
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},Serial Nu {0} este în garanție pana {1}
 apps/erpnext/erpnext/config/stock.py +69,Split Delivery Note into packages.,Împărțit de livrare Notă în pachete.
-apps/erpnext/erpnext/hooks.py +84,Shipments,Transporturile
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +29,Dip molding,Formare prin imersie
+apps/erpnext/erpnext/hooks.py +68,Shipments,Transporturile
 DocType: Purchase Order,To be delivered to customer,Pentru a fi livrat clientului
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,Ora Log Starea trebuie să fie prezentate.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,Serial nr {0} nu apartine nici unei Warehouse
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +650,Setting Up,Configurarea
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +114,Setting Up,Configurarea
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,Row # ,
 DocType: Purchase Invoice,In Words (Company Currency),În cuvinte (Compania valutar)
 DocType: Pricing Rule,Supplier,Furnizor
@@ -1759,7 +1696,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +105,Miscellaneous Expenses,Cheltuieli diverse
 DocType: Global Defaults,Default Company,Companie Implicita
 apps/erpnext/erpnext/controllers/stock_controller.py +166,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,"Cheltuială sau Diferența cont este obligatorie pentru postul {0}, deoarece impactul valoare totală de stoc"
-apps/erpnext/erpnext/controllers/accounts_controller.py +354,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","Nu pot overbill pentru postul {0} în rândul {1} ​​mai mult {2}. Pentru a permite supraîncărcată, vă rugăm să setați în stoc Setări"
+apps/erpnext/erpnext/controllers/accounts_controller.py +355,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","Nu pot overbill pentru postul {0} în rândul {1} ​​mai mult {2}. Pentru a permite supraîncărcată, vă rugăm să setați în stoc Setări"
 DocType: Employee,Bank Name,Denumire bancă
 apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +27,-Above,de mai sus
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +135,User {0} is disabled,Utilizatorul {0} este dezactivat
@@ -1772,27 +1709,26 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,{0} is mandatory for Item {1},{0} este obligatoriu pentru articolul {1}
 DocType: Currency Exchange,From Currency,Din moneda
 DocType: DocField,Name,Nume
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +211,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Vă rugăm să selectați suma alocată, de tip Factură și factură Numărul din atleast rând una"
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +104,Sales Order required for Item {0},Ordinul de vânzări necesar pentru postul {0}
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +158,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Vă rugăm să selectați suma alocată, de tip Factură și factură Numărul din atleast rând una"
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +107,Sales Order required for Item {0},Ordinul de vânzări necesar pentru postul {0}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +43,Amounts not reflected in system,Sumele nu sunt corespunzătoare cu sistemul
 DocType: Purchase Invoice Item,Rate (Company Currency),Rata de (Compania de valuta)
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +40,Others,Altel
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +40,Others,Altel
 apps/erpnext/erpnext/templates/includes/product_page.js +80,Cannot find a matching Item. Please select some other value for {0}.,Nu pot găsi o potrivire articol. Vă rugăm să selectați o altă valoare pentru {0}.
 DocType: POS Profile,Taxes and Charges,Impozite și Taxe
 DocType: Item,"A Product or a Service that is bought, sold or kept in stock.","Un produs sau un serviciu care este cumpărat, vândut sau păstrat în stoc."
 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,Nu se poate selecta tipul de incasare ca 'Suma inregistrare precedenta' sau 'Total inregistrare precedenta' pentru prima inregistrare
 apps/frappe/frappe/core/doctype/doctype/boilerplate/controller_list.html +31,Completed,Finalizat
 DocType: Web Form,Select DocType,Selectați DocType
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +104,Broaching,Broșare
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +12,Banking,Bancar
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,Bancar
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +38,Please click on 'Generate Schedule' to get schedule,"Vă rugăm să faceți clic pe ""Generate Program"", pentru a obține programul"
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +283,New Cost Center,Centru de cost nou
 DocType: Bin,Ordered Quantity,Ordonat Cantitate
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +397,"e.g. ""Build tools for builders""","de exemplu ""Construi instrumente de constructori """
+apps/erpnext/erpnext/public/js/setup_wizard.js +145,"e.g. ""Build tools for builders""","de exemplu ""Construi instrumente de constructori """
 DocType: Quality Inspection,In Process,În procesul de
 DocType: Authorization Rule,Itemwise Discount,Reducere Articol-Avizat
 DocType: Purchase Order Item,Reference Document Type,Referință Document Type
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +318,{0} against Sales Order {1},{0} comparativ cu comanda de vânzări {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +320,{0} against Sales Order {1},{0} comparativ cu comanda de vânzări {1}
 DocType: Account,Fixed Asset,Activ Fix
 apps/erpnext/erpnext/config/stock.py +283,Serialized Inventory,Inventarul serializat
 DocType: Activity Type,Default Billing Rate,Rata de facturare implicit
@@ -1807,14 +1743,13 @@
 DocType: Purchase Invoice Item,Page Break,Page Break
 DocType: Production Order Operation,Pending,În așteptarea
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,Utilizatorii care poate aproba cererile de concediu o anumită angajatilor
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +33,You cannot change default UOM of Variant. To change default UOM for Variant change default UOM of the Template,Nu puteți modifica implicit UOM a variantei. Pentru a modifica implicit UOM pentru Variant schimbare implicit UOM a șablonului
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +50,Office Equipments,Echipamente de birou
 DocType: Purchase Invoice Item,Qty,Cantitate
 DocType: Fiscal Year,Companies,Companii
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +24,Electronics,Electronică
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +24,Electronics,Electronică
 DocType: Stock Settings,Raise Material Request when stock reaches re-order level,Ridica Material Cerere atunci când stocul ajunge la nivelul re-comandă
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +18,From Maintenance Schedule,Din Program de Intretinere
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +56,Full-time,Permanent
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +56,Full-time,Permanent
 DocType: Purchase Invoice,Contact Details,Detalii Persoana de Contact
 DocType: C-Form,Received Date,Data primit
 DocType: Delivery Note,"If you have created a standard template in Sales Taxes and Charges Template, select one and click on the button below.","Dacă ați creat un model standard la taxele de vânzare și taxe Format, selectați una și faceți clic pe butonul de mai jos."
@@ -1826,11 +1761,12 @@
 DocType: Job Applicant,Job Opening,Deschidere Loc de Muncă
 DocType: Payment Reconciliation,Payment Reconciliation,Reconcilierea plată
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +154,Please select Incharge Person's name,Vă rugăm să selectați numele Incharge Persoana
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +51,Technology,Tehnologia nou-aparuta
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,Tehnologia nou-aparuta
 DocType: Offer Letter,Offer Letter,Oferta Scrisoare
 apps/erpnext/erpnext/config/manufacturing.py +51,Generate Material Requests (MRP) and Production Orders.,Genereaza Cereri de Material (MRP) și Comenzi de Producție.
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +68,Total Invoiced Amt,Totală facturată Amt
 DocType: Time Log,To Time,La timp
+DocType: Authorization Rule,Approving Role (above authorized value),Aprobarea Rol (mai mare decât valoarea autorizată)
 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.","Pentru a adăuga noduri copil, explora copac și faceți clic pe nodul în care doriți să adăugați mai multe noduri."
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +102,Credit To account must be a Payable account,Credit Pentru cont trebuie să fie un cont de plati
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +233,BOM recursion: {0} cannot be parent or child of {2},Recursivitate FDM: {0} nu poate fi parinte sau copil lui {2}
@@ -1843,10 +1779,8 @@
 DocType: Item,Customer Item Codes,Coduri client Postul
 DocType: Opportunity,Lost Reason,Motiv Pierdere
 apps/erpnext/erpnext/config/accounts.py +68,Create Payment Entries against Orders or Invoices.,Creați Intrările de plată împotriva comenzi sau facturi.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +141,Welding,Sudare
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +40,New Stock UOM is required,New Stock UOM este necesar
 DocType: Quality Inspection,Sample Size,Eșantionul de dimensiune
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +443,All items have already been invoiced,Toate articolele au fost deja facturate
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +446,All items have already been invoiced,Toate articolele au fost deja facturate
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',"Vă rugăm să specificați un valabil ""Din cauza nr"""
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +287,Further cost centers can be made under Groups but entries can be made against non-Groups,"Centre de costuri pot fi realizate în grupuri, dar intrările pot fi făcute împotriva non-Grupuri"
 DocType: Project,External,Extern
@@ -1858,8 +1792,7 @@
 DocType: Bin,Actual Quantity,Cantitate Efectivă
 DocType: Shipping Rule,example: Next Day Shipping,exemplu: Next Day Shipping
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,Serial nr {0} nu a fost găsit
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +563,Your Customers,Clienții dvs.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +27,Compression molding,Turnare prin compresie
+apps/erpnext/erpnext/public/js/setup_wizard.js +303,Your Customers,Clienții dvs.
 DocType: Leave Block List Date,Block Date,Dată blocare
 DocType: Sales Order,Not Delivered,Nu Pronunțată
 ,Bank Clearance Summary,Sumar aprobare bancă
@@ -1880,10 +1813,10 @@
 DocType: SMS Log,Sent To,Trimis La
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +28,Make Sales Invoice,Realizeaza Factura de Vanzare
 DocType: Company,For Reference Only.,Numai Pentru referință.
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +29,Invalid {0}: {1},Invalid {0}: {1}
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +49,Invalid {0}: {1},Invalid {0}: {1}
 DocType: Sales Invoice Advance,Advance Amount,Sumă în avans
 DocType: Manufacturing Settings,Capacity Planning,Planificarea capacității
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +49,'From Date' is required,'Din Data' este necesar
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +43,'From Date' is required,'Din Data' este necesar
 DocType: Journal Entry,Reference Number,Numărul de referință
 DocType: Employee,Employment Details,Detalii angajare
 DocType: Employee,New Workplace,Nou loc de muncă
@@ -1898,7 +1831,7 @@
 DocType: Serial No,Delivery Time,Timp de Livrare
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Uzură bazată pe
 DocType: Item,End of Life,Sfârsitul vieții
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +41,Travel,Călători
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +41,Travel,Călători
 DocType: Leave Block List,Allow Users,Permiteți utilizatori
 DocType: Purchase Order,Customer Mobile No,Client Mobile Nu
 DocType: Sales Invoice,Recurring,Recurent
@@ -1912,7 +1845,7 @@
 DocType: Naming Series,User must always select,Utilizatorul trebuie să selecteze întotdeauna
 DocType: Stock Settings,Allow Negative Stock,Permiteţi stoc negativ
 DocType: Installation Note,Installation Note,Instalare Notă
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +541,Add Taxes,Adăugaţi Taxe
+apps/erpnext/erpnext/public/js/setup_wizard.js +283,Add Taxes,Adăugaţi Taxe
 ,Financial Analytics,Analitica Financiara
 DocType: Quality Inspection,Verified By,Verificate de
 DocType: Address,Subsidiary,Filială
@@ -1922,7 +1855,6 @@
 DocType: System Settings,In Hours,În ore
 DocType: Process Payroll,Create Salary Slip,Crea Fluturasul de Salariul
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Expected balance as per bank,Sold estimat ca pe bancă
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +115,Buffing,Şlefuire
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Source of Funds (Liabilities),Sursa fondurilor (pasive)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +347,Quantity in row {0} ({1}) must be same as manufactured quantity {2},"Cantitatea în rândul {0} ({1}), trebuie să fie aceeași ca și cantitatea produsă {2}"
 DocType: Appraisal,Employee,Angajat
@@ -1939,11 +1871,11 @@
 DocType: Rename Tool,File to Rename,Fișier de Redenumiți
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +176,Purchse Order number required for Item {0},Număr de ordine Purchse necesar pentru postul {0}
 apps/erpnext/erpnext/public/js/controllers/transaction.js +136,Show Payments,Afiseaza Plati
-apps/erpnext/erpnext/controllers/buying_controller.py +245,Specified BOM {0} does not exist for Item {1},BOM specificată {0} nu există pentru postul {1}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +202,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Programul de Mentenanta {0} trebuie anulat înainte de a anula aceasta Comandă de Vânzări
+apps/erpnext/erpnext/controllers/buying_controller.py +236,Specified BOM {0} does not exist for Item {1},BOM specificată {0} nu există pentru postul {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Programul de Mentenanta {0} trebuie anulat înainte de a anula aceasta Comandă de Vânzări
 apps/frappe/frappe/desk/page/backups/backups.html +13,Size,Dimensiune
 DocType: Notification Control,Expense Claim Approved,Revendicare Cheltuieli Aprobata
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +113,Pharmaceutical,Farmaceutic
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Pharmaceutical,Farmaceutic
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,Costul de produsele cumparate
 DocType: Selling Settings,Sales Order Required,Comandă de vânzări obligatorii
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +30,Create Customer,Creare Client
@@ -1953,7 +1885,6 @@
 DocType: Quality Inspection Reading,Reading 9,Lectură 9
 DocType: Supplier,Is Frozen,Este înghețat
 DocType: Buying Settings,Buying Settings,Configurări cumparare
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +122,Mass finishing,Finisare masă
 DocType: Stock Entry Detail,BOM No. for a Finished Good Item,Nr. BOM pentru un articol tip produs finalizat
 DocType: Upload Attendance,Attendance To Date,Prezenţa până la data
 apps/erpnext/erpnext/config/selling.py +158,Setup incoming server for sales email id. (e.g. sales@example.com),Configurare de server de intrare pentru ID-ul de e-mail de vânzări. (De exemplu sales@example.com)
@@ -1961,7 +1892,7 @@
 DocType: Payment Tool,Payment Account,Cont de plăți
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +713,Please specify Company to proceed,Vă rugăm să specificați companiei pentru a continua
 apps/frappe/frappe/public/js/frappe/model/indicator.js +30,Draft,Ciornă
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +46,Compensatory Off,Fara Masuri Compensatorii
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Compensatory Off,Fara Masuri Compensatorii
 DocType: Quality Inspection Reading,Accepted,Acceptat
 DocType: User,Female,Feminin
 DocType: Journal Entry Account,Debit in Account Currency,Debit în contul valutar
@@ -1973,7 +1904,7 @@
 DocType: Shipping Rule,Shipping Rule Label,Regula de transport maritim Label
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +209,Raw Materials cannot be blank.,Materii prime nu poate fi gol.
 DocType: Newsletter,Test,Test
-apps/erpnext/erpnext/stock/doctype/item/item.py +364,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +368,"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'","Deoarece există tranzacții bursiere existente pentru acest element, \ nu puteți schimba valorile &quot;nu are nici o serie&quot;, &quot;are lot nr&quot;, &quot;Este Piesa&quot; și &quot;Metoda de evaluare&quot;"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +448,Quick Journal Entry,Quick Jurnal de intrare
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +92,You can not change rate if BOM mentioned agianst any item,Nu puteți schimba rata dacă BOM menționat agianst orice element
@@ -1984,13 +1915,14 @@
 apps/erpnext/erpnext/config/stock.py +18,Requests for items.,Cererile de elemente.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,Pentru producerea separată va fi creat pentru fiecare articol bun finit.
 DocType: Purchase Invoice,Terms and Conditions1,Termeni și Conditions1
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +18,Complete Setup, Setare Finalizata
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard_page.html +18,Complete Setup, Setare Finalizata
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","Intrare contabilitate blocată până la această dată, nimeni nu poate crea / modifica intrarea cu excepția rolului specificat mai jos."
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +121,Please save the document before generating maintenance schedule,Vă rugăm să salvați documentul înainte de a genera programul de întreținere
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,Stare de proiect
 DocType: UOM,Check this to disallow fractions. (for Nos),Bifati pentru a nu permite fracțiuni. (Pentru Nos)
 apps/erpnext/erpnext/config/crm.py +96,Newsletter Mailing List,Newsletter Mailing List
 DocType: Delivery Note,Transporter Name,Transporter Nume
+DocType: Authorization Rule,Authorized Value,Valoarea autorizată
 DocType: Contact,Enter department to which this Contact belongs,Introduceti departamentul de care apartine acest Contact
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Absent,Raport Absent
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +746,Item or Warehouse for row {0} does not match Material Request,Articolul sau Depozitul aferent inregistrariii {0} nu se potrivește cu Cererea de Material
@@ -2015,16 +1947,15 @@
 DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),Rata de bază (conform Stock UOM)
 DocType: SMS Log,No of Requested SMS,Nu de SMS solicitat
 DocType: Campaign,Campaign-.####,Campanie-.####
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +55,Piercing,Pătrunzător
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,Pasii urmatori
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +117,Contract End Date must be greater than Date of Joining,Data de Incheiere Contract trebuie să fie ulterioara Datei Aderării
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,Un distribuitor terță parte / dealer / agent comision / afiliat / reseller care vinde produsele companiilor pentru un comision.
 DocType: Customer Group,Has Child Node,Are nod fiu
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{0} against Purchase Order {1},{0} comparativ cu comanda de cumpărare {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +332,{0} against Purchase Order {1},{0} comparativ cu comanda de cumpărare {1}
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","Introduceți parametrii url statici aici (de exemplu, expeditor = ERPNext, numele de utilizator = ERPNext, parola = 1234, etc)"
 apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,{0} {1} nu în nici un activ anul fiscal. Pentru mai multe detalii verifica {2}.
-apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,Acesta este un site web exemplu auto-generat de ERPNext
+apps/erpnext/erpnext/setup/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,Acesta este un site web exemplu auto-generat de ERPNext
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +37,Ageing Range 1,Clasă de uzură 1
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +110,Photochemical machining,Prelucrare fotochimic
 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.
 
 #### Note
@@ -2070,7 +2001,7 @@
 DocType: Purchase Receipt Item,Recd Quantity,Recd Cantitate
 DocType: Email Account,Email Ids,Email Id-urile
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},Nu se pot produce mai multe Articole {0} decât cantitatea din Ordinul de Vânzări {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +471,Stock Entry {0} is not submitted,Stock intrare {0} nu este prezentat
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +473,Stock Entry {0} is not submitted,Stock intrare {0} nu este prezentat
 DocType: Payment Reconciliation,Bank / Cash Account,Cont bancă / numerar 
 DocType: Tax Rule,Billing City,Oraș de facturare
 DocType: Global Defaults,Hide Currency Symbol,Ascunde simbol moneda
@@ -2086,7 +2017,7 @@
 DocType: Purchase Invoice,Currency and Price List,Valută și lista de prețuri
 DocType: Opportunity,Customer / Lead Name,Client / Nume Principal
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +63,Clearance Date not mentioned,Data Aprobare nespecificata
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +71,Production,Producţie
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Production,Producţie
 DocType: Item,Allow Production Order,Permiteţi comandă de producţie
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +60,Row {0}:Start Date must be before End Date,Rând {0}: Data începerii trebuie să fie înainte de Data de încheiere
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Total (Cantitate)
@@ -2099,7 +2030,7 @@
 apps/erpnext/erpnext/utilities/doctype/address/address.py +113,My Addresses,Adresele mele
 DocType: Stock Ledger Entry,Outgoing Rate,Rata de ieșire
 apps/erpnext/erpnext/config/hr.py +100,Organization branch master.,Ramură organizație maestru.
-apps/erpnext/erpnext/controllers/accounts_controller.py +237, or ,sau
+apps/erpnext/erpnext/controllers/accounts_controller.py +238, or ,sau
 DocType: Sales Order,Billing Status,Stare facturare
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Utility Expenses,Cheltuieli de utilitate
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,90-Above,90-sus
@@ -2126,6 +2057,7 @@
 DocType: Stock Entry Detail,Serial No / Batch,Serial No / lot
 DocType: Product Bundle,Parent Item,Părinte Articol
 DocType: Account,Account Type,Tipul Contului
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +113,Leave Type {0} cannot be carry-forwarded,Lasă Tipul {0} nu poate fi transporta-transmise
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +213,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',Programul de Mentenanta nu este generat pentru toate articolele. Vă rugăm să faceți clic pe 'Generare Program'
 ,To Produce,Pentru a produce
 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","Pentru rândul {0} în {1}. Pentru a include {2} ratei punctul, randuri {3} De asemenea, trebuie să fie incluse"
@@ -2133,10 +2065,7 @@
 DocType: Bin,Reserved Quantity,Rezervat Cantitate
 DocType: Landed Cost Voucher,Purchase Receipt Items,Primirea de cumpărare Articole
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,Formulare Personalizarea
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +62,Cutting,Tăiere
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +69,Flattening,Aplatizare
 DocType: Account,Income Account,Contul de venit
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +22,Molding,Turnare
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +632,Delivery,Livrare
 DocType: Stock Reconciliation Item,Current Qty,Cantitate curentă
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section","A se vedea ""Rate de materiale bazate pe"" în Costing Secțiunea"
@@ -2146,20 +2075,19 @@
 apps/frappe/frappe/desk/moduleview.py +61,Documents,Documente
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +17,Ref,Re
 DocType: Cost Center,Cost Center,Centrul de cost
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.js +48,Voucher #,Voucher #
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +36,Voucher #,Voucher #
 DocType: Notification Control,Purchase Order Message,Purchase Order Mesaj
 DocType: Tax Rule,Shipping Country,Transport Tara
 DocType: Upload Attendance,Upload HTML,Încărcați HTML
-apps/erpnext/erpnext/controllers/accounts_controller.py +391,"Total advance ({0}) against Order {1} cannot be greater \
+apps/erpnext/erpnext/controllers/accounts_controller.py +392,"Total advance ({0}) against Order {1} cannot be greater \
 				than the Grand Total ({2})","Raport avans ({0}) împotriva Comanda {1} nu poate fi mai mare decât \
  totalul ({2})"
 DocType: Employee,Relieving Date,Alinarea Data
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +12,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.","Regula de stabilire a prețurilor se face pentru a suprascrie Pret / defini procent de reducere, pe baza unor criterii."
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,Depozit poate fi modificat numai prin Bursa de primire de intrare / livrare Nota / cumparare
 DocType: Employee Education,Class / Percentage,Clasă / Procent
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +92,Head of Marketing and Sales,Director de Marketing și Vânzări
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +31,Income Tax,Impozit pe venit
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +157,Laser engineered net shaping,Laser proiectat modelarea net
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Head of Marketing and Sales,Director de Marketing și Vânzări
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +31,Income Tax,Impozit pe venit
 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.","În cazul în care articolul Prețuri selectat se face pentru ""Pret"", se va suprascrie lista de prețuri. Prețul Articolul Prețuri este prețul final, deci ar trebui să se aplice mai departe reducere. Prin urmare, în cazul tranzacțiilor, cum ar fi comandă de vânzări, Ordinului de Procurare, etc, acesta va fi preluat în câmpul ""Rate"", mai degrabă decât câmpul ""Lista de prețuri Rata""."
 apps/erpnext/erpnext/config/selling.py +163,Track Leads by Industry Type.,Track conduce de Industrie tip.
 DocType: Item Supplier,Item Supplier,Furnizor Articol
@@ -2182,31 +2110,28 @@
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Cant efectivă după tranzacție
 ,Pending SO Items For Purchase Request,Până la SO articole pentru cerere de oferta
 DocType: Supplier,Billing Currency,Moneda de facturare
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +148,Extra Large,Extra mare
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,Extra Large,Extra mare
 ,Profit and Loss Statement,Profit și pierdere
 DocType: Bank Reconciliation Detail,Cheque Number,Număr Cec
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +43,Pressing,Presare
 DocType: Payment Tool Detail,Payment Tool Detail,Plata Instrumentul Detalii
 ,Sales Browser,Vânzări Browser
 DocType: Journal Entry,Total Credit,Total credit
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +474,Warning: Another {0} # {1} exists against stock entry {2},Atenție: Un alt {0} # {1} există împotriva intrării stoc {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +459,Local,Local
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +476,Warning: Another {0} # {1} exists against stock entry {2},Atenție: Un alt {0} # {1} există împotriva intrării stoc {2}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +397,Local,Local
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),Împrumuturi și Avansuri (Active)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,Debitorii
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +147,Large,Mare
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +23,No employee found!,Nici un angajat nu a fost gasit!
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Large,Mare
 DocType: C-Form Invoice Detail,Territory,Teritoriu
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,Vă rugăm să menționați nici de vizite necesare
 DocType: Purchase Order,Customer Address Display,Adresa de afișare client
 DocType: Stock Settings,Default Valuation Method,Metoda de Evaluare Implicită
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +127,Polishing,Lustruire
 DocType: Production Order Operation,Planned Start Time,Planificate Ora de începere
 apps/erpnext/erpnext/config/accounts.py +63,Close Balance Sheet and book Profit or Loss.,Inchideti Bilanțul și registrul Profit sau Pierdere.
-apps/erpnext/erpnext/stock/doctype/item/item.py +661,"Default Unit of Measure for Item {0} cannot be changed directly because \
+apps/erpnext/erpnext/stock/doctype/item/item.py +665,"Default Unit of Measure for Item {0} cannot be changed directly because \
 			you have already made some transaction(s) with another UOM. To change default UOM, \
 			use 'UOM Replace Utility' tool under Stock module.","Unitatea de măsură implicită pentru postul {0} nu poate fi schimbată în mod direct, deoarece \ aveti si voi deja unele tranzacții (i) cu un alt UOM. Pentru a schimba implicit UOM, \ utilizarea &quot;UOM Înlocuiți Utility&quot; instrument în modul stoc."
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,Precizați Rata de schimb a converti o monedă în alta
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +146,Quotation {0} is cancelled,Citat {0} este anulat
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +141,Quotation {0} is cancelled,Citat {0} este anulat
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,Total Suma Impresionant
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} was on leave on {1}. Cannot mark attendance.,Angajatul {0} a fost în concediu pe {1}. Nu se poate marca prezență.
 DocType: Sales Partner,Targets,Obiective
@@ -2217,7 +2142,6 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +158,Please create Customer from Lead {0},Vă rugăm să creați client de plumb {0}
 DocType: Price List,Applicable for Countries,Aplicabile pentru țările
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Computers,Computere
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +112,Electro-chemical grinding,Electro-chimice de slefuire
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +14,This is a root customer group and cannot be edited.,Acesta este un grup de clienți rădăcină și nu pot fi editate.
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +39,Please setup your chart of accounts before you start Accounting Entries,Vă rugăm configurarea diagrama de conturi înainte de a începe înregistrările contabile
 DocType: Purchase Invoice,Ignore Pricing Rule,Ignora Regula Preturi
@@ -2275,7 +2199,6 @@
 DocType: Maintenance Visit,Purposes,Scopuri
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +103,Atleast one item should be entered with negative quantity in return document,Cel puțin un element ar trebui să fie introduse cu cantitate negativa în documentul de returnare
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +67,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","Operațiunea {0} mai mult decât orice ore de lucru disponibile în stație de lucru {1}, descompun operațiunea în mai multe operațiuni"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +134,Electrochemical machining,Prelucrare electrochimică
 ,Requested,Solicitată
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +66,No Remarks,Nu Observații
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +13,Overdue,Întârziat
@@ -2284,7 +2207,7 @@
 DocType: Monthly Distribution,Distribution Name,Denumire Distribuție
 DocType: Features Setup,Sales and Purchase,Vanzari si cumparare
 DocType: Supplier Quotation Item,Material Request No,Cerere de material Nu
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +218,Quality Inspection required for Item {0},Inspecție de calitate necesare pentru postul {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +221,Quality Inspection required for Item {0},Inspecție de calitate necesare pentru postul {0}
 DocType: Quotation,Rate at which customer's currency is converted to company's base currency,Rata la care moneda clientului este convertită în valuta de bază a companiei
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +107,{0} has been successfully unsubscribed from this list.,{0} a fost dezabonat cu succes din această listă.
 DocType: Purchase Invoice Item,Net Rate (Company Currency),Rata netă (companie de valuta)
@@ -2302,9 +2225,8 @@
 apps/erpnext/erpnext/accounts/report/financial_statements.py +16,Fiscal Year {0} not found.,Anul fiscal {0} nu a fost găsit.
 DocType: Bank Reconciliation,Get Relevant Entries,Obține intrările relevante
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +407,Accounting Entry for Stock,Intrare contabilitate pentru stoc
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +64,Coining,Coining
 DocType: Sales Invoice,Sales Team1,Vânzări TEAM1
-apps/erpnext/erpnext/stock/doctype/item/item.py +412,Item {0} does not exist,Articolul {0} nu există
+apps/erpnext/erpnext/stock/doctype/item/item.py +416,Item {0} does not exist,Articolul {0} nu există
 DocType: Sales Invoice,Customer Address,Adresă client
 apps/frappe/frappe/desk/query_report.py +136,Total,Total
 DocType: Purchase Invoice,Apply Additional Discount On,Aplicați Discount suplimentare La
@@ -2316,14 +2238,13 @@
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),Suma impozitului pe urma Discount Suma (companie de valuta)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +149,Target warehouse is mandatory for row {0},Depozit țintă este obligatorie pentru rând {0}
 DocType: Quality Inspection,Quality Inspection,Inspecție de calitate
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +144,Extra Small,Extra Small
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +20,Spray forming,Spray de formare
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Extra Small,Extra Small
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +458,Warning: Material Requested Qty is less than Minimum Order Qty,Atenție: Materialul solicitat Cant este mai mică decât minima pentru comanda Cantitate
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +191,Account {0} is frozen,Contul {0} este Blocat
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Entitate juridică / Filiala cu o Grafic separat de conturi aparținând Organizației.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +29,"Food, Beverage & Tobacco","Produse Alimentare, Bauturi si Tutun"
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","Produse Alimentare, Bauturi si Tutun"
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +20,PL or BS,PL sau BS
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,Can only make payment against unbilled {0},Poate face doar plata împotriva facturată {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +531,Can only make payment against unbilled {0},Poate face doar plata împotriva facturată {0}
 apps/erpnext/erpnext/controllers/selling_controller.py +122,Commission rate cannot be greater than 100,Rata de comision nu poate fi mai mare decat 100
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Minimum Inventory Level,Nivelul minim Inventarul
 DocType: Stock Entry,Subcontract,Subcontract
@@ -2334,18 +2255,17 @@
 DocType: Item,Manufacturer Part Number,Numarul de piesa
 DocType: Production Order Operation,Estimated Time and Cost,Timpul estimat și cost
 DocType: Bin,Bin,Coş
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +50,Nosing,Nosing
 DocType: SMS Log,No of Sent SMS,Nu de SMS-uri trimise
 DocType: Account,Company,Compania
 DocType: Account,Expense Account,Cont de cheltuieli
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +49,Software,Software
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +151,Colour,Culoare
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +49,Software,Software
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Colour,Culoare
 DocType: Maintenance Visit,Scheduled,Programat
 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",Vă rugăm să selectați postul unde &quot;Este Piesa&quot; este &quot;nu&quot; și &quot;Este punctul de vânzare&quot; este &quot;da&quot; și nu este nici un alt produs Bundle
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,Selectați Distributie lunar pentru a distribui neuniform obiective pe luni.
 DocType: Purchase Invoice Item,Valuation Rate,Rata de evaluare
 apps/erpnext/erpnext/stock/get_item_details.py +281,Price List Currency not selected,Lista de pret Valuta nu selectat
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +134,Employee {0} has already applied for {1} between {2} and {3},Angajatul {0} a aplicat deja pentru {1} între {2} și {3}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +145,Employee {0} has already applied for {1} between {2} and {3},Angajatul {0} a aplicat deja pentru {1} între {2} și {3}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Data de începere a proiectului
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +8,Until,Până la
 DocType: Rename Tool,Rename Log,Redenumi Conectare
@@ -2355,7 +2275,7 @@
 apps/erpnext/erpnext/controllers/recurring_document.py +162,Please select {0},Vă rugăm să selectați {0}
 DocType: C-Form,C-Form No,Nr. formular-C
 DocType: BOM,Exploded_items,Exploded_items
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +95,Researcher,Cercetător
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Researcher,Cercetător
 apps/frappe/frappe/custom/doctype/customize_form/customize_form.js +88,Update,Actualizare
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +78,Please save the Newsletter before sending,Vă rugăm să salvați Newsletter înainte de a trimite
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +23,Name or Email is mandatory,Nume sau E-mail este obligatorie
@@ -2364,11 +2284,10 @@
 DocType: Employee,Exit,Iesire
 apps/erpnext/erpnext/accounts/doctype/account/account.py +134,Root Type is mandatory,Rădăcină de tip este obligatorie
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +295,Serial No {0} created,Serial Nu {0} a creat
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +125,Vibratory finishing,Finisare vibratorie
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","Pentru comoditatea clienților, aceste coduri pot fi utilizate în formate de imprimare cum ar fi Facturi și Note de Livrare"
 DocType: Employee,You can enter any date manually,Puteți introduce manual orice dată
 DocType: Sales Invoice,Advertisement,Reclamă
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +165,Probationary Period,Perioadă De Probă
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Probationary Period,Perioadă De Probă
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Numai noduri frunze sunt permise în tranzacție
 DocType: Expense Claim,Expense Approver,Cheltuieli aprobator
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,Primirea de cumpărare Articol Livrat
@@ -2376,19 +2295,16 @@
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +17,To Datetime,Pentru a Datetime
 DocType: SMS Settings,SMS Gateway URL,SMS Gateway URL
 apps/erpnext/erpnext/config/crm.py +53,Logs for maintaining sms delivery status,Busteni pentru menținerea statutului de livrare sms
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +137,Grinding,Măcinare
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +34,Shrink wrapping,Shrink ambalaj
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +36,Pending Activities,Activități în curs
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,Confirmed,Confirmat
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier > Supplier Type,Furnizor> Furnizor Tip
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +127,Please enter relieving date.,Vă rugăm să introduceți data alinarea.
 apps/erpnext/erpnext/controllers/trends.py +137,Amt,Amt
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' can be submitted,"Lasă doar Aplicatii cu statutul de ""Aprobat"" pot fi depuse"
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +51,Only Leave Applications with status 'Approved' can be submitted,"Lasă doar Aplicatii cu statutul de ""Aprobat"" pot fi depuse"
 apps/erpnext/erpnext/utilities/doctype/address/address.py +21,Address Title is mandatory.,Titlul adresei este obligatoriu.
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,Introduceți numele de campanie dacă sursa de anchetă este campanie
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +38,Newspaper Publishers,Editorii de ziare
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +38,Newspaper Publishers,Editorii de ziare
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,Selectați anul fiscal
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +88,Smelting,Metalurgie
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Reordonare nivel
 DocType: Attendance,Attendance Date,Dată prezenţă
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,Salariul despartire bazat privind câștigul salarial și deducere.
@@ -2403,16 +2319,15 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +414,[Error],[Eroare]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,În cuvinte va fi vizibil după ce a salva comanda de vânzări.
 ,Employee Birthday,Zi de naștere angajat
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +55,Venture Capital,Capital de Risc
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,Capital de Risc
 DocType: UOM,Must be Whole Number,Trebuie să fie Număr întreg
 DocType: Leave Control Panel,New Leaves Allocated (In Days),Frunze noi alocate (în zile)
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +51,Serial No {0} does not exist,Serial Nu {0} nu există
 DocType: Pricing Rule,Discount Percentage,Procentul de Reducere
 DocType: Payment Reconciliation Invoice,Invoice Number,Numar factura
-apps/erpnext/erpnext/hooks.py +70,Orders,Comenzi
+apps/erpnext/erpnext/hooks.py +54,Orders,Comenzi
 DocType: Leave Control Panel,Employee Type,Tip angajat
 DocType: Employee Leave Approver,Leave Approver,Aprobator Concediu
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +70,Swaging,Forjare la cald
 DocType: Manufacturing Settings,Material Transferred for Manufacture,Material Transferat pentru fabricarea
 DocType: Expense Claim,"A user with ""Expense Approver"" role","Un utilizator cu rol de ""aprobator cheltuieli"""
 ,Issued Items Against Production Order,Emise Articole împotriva producției de comandă
@@ -2424,7 +2339,6 @@
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +62,Cost Center with existing transactions can not be converted to group,Centrul de Cost cu tranzacții existente nu poate fi transformat în grup
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Depreciation,Depreciere
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Furnizor (e)
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +29,Invalid period,Perioada de invalid
 DocType: Customer,Credit Limit,Limita de Credit
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,Selectați tipul de tranzacție
 DocType: GL Entry,Voucher No,Voletul nr
@@ -2434,9 +2348,9 @@
 DocType: Customer,Address and Contact,Adresa si Contact
 DocType: Customer,Last Day of the Next Month,Ultima zi a lunii următoare
 DocType: Employee,Feedback,Reactie
+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}","Concediu nu poate fi repartizat înainte {0}, ca echilibru concediu a fost deja carry transmise în viitor înregistrarea alocare concediu {1}"
 apps/erpnext/erpnext/accounts/party.py +284,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Notă: Datorită / Reference Data depășește de companie zile de credit client de {0} zi (le)
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +621,Maint. Schedule,Maint. Program
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +108,Abrasive jet machining,Prelucrare cu jet abraziv
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +632,Maint. Schedule,Maint. Program
 DocType: Stock Settings,Freeze Stock Entries,Blocheaza Intrarile in Stoc
 DocType: Website Settings,Website Settings,Setarile site-ului
 DocType: Item,Reorder level based on Warehouse,Nivel reordona pe baza Warehouse
@@ -2453,7 +2367,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +75,Show Stock Entries,Arată stoc Entries
 ,Is Primary Address,Este primar Adresa
 DocType: Production Order,Work-in-Progress Warehouse,De lucru-in-Progress Warehouse
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +308,Reference #{0} dated {1},Reference # {0} din {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Reference #{0} dated {1},Reference # {0} din {1}
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +13,Manage Addresses,Gestionați Adrese
 DocType: Pricing Rule,Item Code,Cod articol
 DocType: Production Planning Tool,Create Production Orders,Creare Comenzi de Producție
@@ -2462,7 +2376,7 @@
 DocType: Lead,Market Segment,Segmentul de piață
 DocType: Communication,Phone,Telefon
 DocType: Employee Internal Work History,Employee Internal Work History,Istoric Intern Locuri de Munca Angajat
-apps/erpnext/erpnext/public/js/account_tree_grid.js +50,Closing (Dr),De închidere (Dr)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +221,Closing (Dr),De închidere (Dr)
 DocType: Contact,Passive,Pasiv
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,Serial Nu {0} nu este în stoc
 apps/erpnext/erpnext/config/selling.py +127,Tax template for selling transactions.,Șablon impozit pentru tranzacțiile de vânzare.
@@ -2478,8 +2392,8 @@
 ,Billed Amount,Sumă facturată
 DocType: Bank Reconciliation,Bank Reconciliation,Reconciliere bancară
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +9,Get Updates,Obțineți actualizări
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +129,Material Request {0} is cancelled or stopped,Cerere de material {0} este anulată sau oprită
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +641,Add a few sample records,Adaugă câteva înregistrări eșantion
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +133,Material Request {0} is cancelled or stopped,Cerere de material {0} este anulată sau oprită
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Add a few sample records,Adaugă câteva înregistrări eșantion
 apps/erpnext/erpnext/config/hr.py +210,Leave Management,Lasă Managementul
 DocType: Event,Groups,Grupuri
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,Grup in functie de Cont
@@ -2492,38 +2406,34 @@
 DocType: Features Setup,Sales Extras,Extras de vânzare
 apps/erpnext/erpnext/accounts/utils.py +344,{0} budget for Account {1} against Cost Center {2} will exceed by {3},bugetul {0} pentru contul {1} ​​comparativ centrului de cost {2} va fi depășit cu {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +236,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Diferența cont trebuie să fie un cont de tip activ / pasiv, deoarece acest stoc Reconcilierea este un intrare de deschidere"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +138,Purchase Order number required for Item {0},Număr de comandă de aprovizionare necesare pentru postul {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Order number required for Item {0},Număr de comandă de aprovizionare necesare pentru postul {0}
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date','Din Data' trebuie să fie ulterior 'Până în Data'
 ,Stock Projected Qty,Stoc proiectată Cantitate
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +147,Customer {0} does not belong to project {1},Clientul {0} nu apartine proiectului {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +150,Customer {0} does not belong to project {1},Clientul {0} nu apartine proiectului {1}
 DocType: Sales Order,Customer's Purchase Order,Comandă clientului
 DocType: Warranty Claim,From Company,De la Compania
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,Valoare sau Cantitate
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Minute,Minut
+apps/erpnext/erpnext/public/js/setup_wizard.js +363,Minute,Minut
 DocType: Purchase Invoice,Purchase Taxes and Charges,Taxele de cumpărare și Taxe
 ,Qty to Receive,Cantitate de a primi
 DocType: Leave Block List,Leave Block List Allowed,Lista Concedii Blocate Permise
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +61,Conversion factor cannot be in fractions,Factorul de conversie nu pot fi în fracțiuni
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +358,You will use it to Login,Îl veti folosi pentru autentificare
+apps/erpnext/erpnext/public/js/setup_wizard.js +108,You will use it to Login,Îl veti folosi pentru autentificare
 DocType: Sales Partner,Retailer,Vânzător cu amănuntul
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +99,Credit To account must be a Balance Sheet account,Credit în contul trebuie să fie un cont de bilanț
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,Toate tipurile de furnizor
 apps/erpnext/erpnext/stock/doctype/item/item.py +37,Item Code is mandatory because Item is not automatically numbered,"Cod articol este obligatorie, deoarece postul nu este numerotat automat"
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +99,Quotation {0} not of type {1},Citat {0} nu de tip {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +93,Quotation {0} not of type {1},Citat {0} nu de tip {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,Articol Program Mentenanta
 DocType: Sales Order,%  Delivered,% Livrat
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,Bank Overdraft Account,Descoperire cont bancar
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +15,Make Salary Slip,Realizeaza Fluturas de Salar
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +18,Browse BOM,Navigare BOM
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +175,Secured Loans,Împrumuturi garantate
-apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +3,Awesome Products,Produse extraordinare
+apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +3,Awesome Products,Produse extraordinare
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +189,Opening Balance Equity,Sold Equity
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +80,Cannot approve leave as you are not authorized to approve leaves on Block Dates,Nu se poate aproba concediu deoarece nu sunteti autorizat să aprobati concedii in Date Blocate
 DocType: Appraisal,Appraisal,Expertiză
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +13,Lost-foam casting,Turnare a pierdut-spumă
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +47,Drawing,Desen
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +22,Date is repeated,Data se repetă
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +148,Leave approver must be one of {0},Aprobator Concediu trebuie să fie unul din {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +162,Leave approver must be one of {0},Aprobator Concediu trebuie să fie unul din {0}
 DocType: Hub Settings,Seller Email,Vânzător de e-mail
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Cost total de achiziție (prin cumparare factură)
 DocType: Workstation Working Hour,Start Time,Ora de începere
@@ -2537,7 +2447,7 @@
 DocType: Purchase Invoice Item,Net Amount (Company Currency),Suma netă (companie de valuta)
 DocType: BOM Operation,Hour Rate,Rata Oră
 DocType: Stock Settings,Item Naming By,Denumire Articol Prin
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +642,From Quotation,Din Ofertă
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +655,From Quotation,Din Ofertă
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},O altă intrare închidere de perioada {0} a fost efectuată după {1}
 DocType: Production Order,Material Transferred for Manufacturing,Material Transferat pentru Manufacturing
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +29,Account {0} does not exists,Contul {0} nu există
@@ -2551,21 +2461,19 @@
 DocType: Purchase Invoice Item,PR Detail,PR Detaliu
 DocType: Sales Order,Fully Billed,Complet Taxat
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +20,Cash In Hand,Bani în mână
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +72,Delivery warehouse required for stock item {0},Depozit de livrare necesar pentru articol stoc {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +119,Delivery warehouse required for stock item {0},Depozit de livrare necesar pentru articol stoc {0}
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),"Greutatea brută a pachetului. Greutate + ambalare, de obicei, greutate netă de material. (Pentru imprimare)"
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Utilizatorii cu acest rol li se permite să stabilească în conturile înghețate și de a crea / modifica intrări contabile împotriva conturile înghețate
 DocType: Serial No,Is Cancelled,Este anulat
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +281,My Shipments,Livrările mele
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +286,My Shipments,Livrările mele
 DocType: Journal Entry,Bill Date,Dată factură
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +43,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","Chiar dacă există mai multe reguli de stabilire a prețurilor, cu cea mai mare prioritate, se aplică apoi următoarele priorități interne:"
 DocType: Supplier,Supplier Details,Detalii furnizor
 DocType: Communication,Recipients,Destinatarii
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +146,Screwing,Înșurubare
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +96,Knurling,Knurling
 DocType: Expense Claim,Approval Status,Status aprobare
 DocType: Hub Settings,Publish Items to Hub,Publica produse în Hub
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +44,From value must be less than to value in row {0},Din valoare trebuie să fie mai mică decat in valoare pentru inregistrarea {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +133,Wire Transfer,Transfer
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +133,Wire Transfer,Transfer
 apps/erpnext/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py +25,Please select Bank Account,Vă rugăm să selectați cont bancar
 DocType: Newsletter,Create and Send Newsletters,A crea și trimite Buletine
 apps/frappe/frappe/public/js/frappe/views/reports/grid_report.js +305,From Date must be before To Date,Din Data trebuie să fie anterioara Pana la Data
@@ -2573,14 +2481,14 @@
 DocType: Company,Default Income Account,Contul Venituri Implicit
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,Grup Client / Client
 DocType: Item Group,Check this if you want to show in website,Bifati dacă doriți să fie afisat în site
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +190,Welcome to ERPNext,Bine ati venit la ERPNext
+,Welcome to ERPNext,Bine ati venit la ERPNext
 DocType: Payment Reconciliation Payment,Voucher Detail Number,Voucher Numărul de Detaliu
 apps/erpnext/erpnext/config/crm.py +146,Lead to Quotation,Duce la ofertă
 DocType: Lead,From Customer,De la Client
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +37,Calls,Apeluri
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Calls,Apeluri
 DocType: Project,Total Costing Amount (via Time Logs),Suma totală Costing (prin timp Busteni)
 DocType: Purchase Order Item Supplied,Stock UOM,Stoc UOM
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Purchase Order {0} is not submitted,Comandă {0} nu este prezentat
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +194,Purchase Order {0} is not submitted,Comandă {0} nu este prezentat
 ,Projected,Proiectat
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},Serial Nu {0} nu apartine Warehouse {1}
 apps/erpnext/erpnext/controllers/status_updater.py +136,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,"Notă: Sistemul nu va verifica peste, livrare și supra-rezervări pentru postul {0} ca și cantitatea sau valoarea este 0"
@@ -2588,7 +2496,6 @@
 DocType: Issue,Opening Date,Data deschiderii
 DocType: Journal Entry,Remark,Remarcă
 DocType: Purchase Receipt Item,Rate and Amount,Rata și volumul
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +95,Boring,Plictisitor
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +667,From Sales Order,Din Comanda de Vânzări
 DocType: Blog Category,Parent Website Route,Părinte Site Route
 DocType: Sales Order,Not Billed,Nu Taxat
@@ -2602,19 +2509,17 @@
 apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount Amount,Reducere Suma
 DocType: Purchase Invoice,Return Against Purchase Invoice,Reveni Împotriva cumparare factură
 DocType: Item,Warranty Period (in days),Perioada de garanție (în zile)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +550,e.g. VAT,"de exemplu, TVA"
+apps/erpnext/erpnext/public/js/setup_wizard.js +292,e.g. VAT,"de exemplu, TVA"
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,Punctul 4
 DocType: Journal Entry Account,Journal Entry Account,Jurnal de cont intrare
 DocType: Shopping Cart Settings,Quotation Series,Ofertă Series
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +52,"An item exists with same name ({0}), please change the item group name or rename the item","Există un articol cu aceeaşi denumire ({0}), vă rugăm să schimbați denumirea grupului articolului sau să redenumiţi articolul"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +82,Hot metal gas forming,Gaz de metal la cald
 DocType: Sales Order Item,Sales Order Date,Comandă de vânzări Data
 DocType: Sales Invoice Item,Delivered Qty,Cantitate Livrata
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +63,Warehouse {0}: Company is mandatory,Depozit {0}: Compania este obligatorie
 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.","Du-te la grupul corespunzător (de obicei, sursa fondurilor&gt; Pasive curente&gt; taxelor și impozitelor și a crea un nou cont (făcând clic pe Adăugați pentru copii) de tip &quot;fiscal&quot; și de a face mai vorbim rata de impozitare."
 ,Payment Period Based On Invoice Date,Perioada de plată Bazat pe Data facturii
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +50,Missing Currency Exchange Rates for {0},Lipsește Schimb valutar prețul pentru {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +135,Laser cutting,Tăiere cu laser
 DocType: Event,Monday,Luni
 DocType: Journal Entry,Stock Entry,Stoc de intrare
 DocType: Account,Payable,Plătibil
@@ -2655,7 +2560,6 @@
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,"Titluri de șabloane de imprimare, de exemplu proforma Factura."
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +140,Valuation type charges can not marked as Inclusive,Taxele de tip evaluare nu poate marcate ca Inclusive
 DocType: POS Profile,Update Stock,Actualizare stock
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +128,Superfinishing,Superfinisare
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,Un UOM diferit pentru articole va conduce la o valoare incorecta pentru Greutate Neta (Total). Asigurați-vă că Greutatea Netă a fiecărui articol este în același UOM.
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,Rată BOM
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +85,Please pull items from Delivery Note,Vă rugăm să trage elemente de livrare Nota
@@ -2670,7 +2574,6 @@
 ,Purchase Analytics,Analytics de cumpărare
 DocType: Sales Invoice Item,Delivery Note Item,Nota de Livrare Articol
 DocType: Expense Claim,Task,Sarcină
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +57,Shaving,Ras
 DocType: Purchase Taxes and Charges,Reference Row #,Reference Row #
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},Numărul aferent lotului este obligatoriu pentru articolul {0}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js +14,This is a root sales person and cannot be edited.,Aceasta este o persoană de vânzări rădăcină și nu pot fi editate.
@@ -2682,13 +2585,11 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +74,Purpose must be one of {0},Scopul trebuie să fie una dintre {0}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +108,Fill the form and save it,Completați formularul și salvați-l
 DocType: Production Planning Tool,Download a report containing all raw materials with their latest inventory status,Descărcati un raport care conține toate materiile prime cu ultimul lor status de inventar
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +94,Facing,Cu care se confruntă
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,Community Forum
 DocType: Leave Application,Leave Balance Before Application,Balanta Concediu Inainte de Aplicare
 DocType: SMS Center,Send SMS,Trimite SMS
 DocType: Company,Default Letter Head,Implicit Scrisoare Șef
 DocType: Time Log,Billable,Facturabil
-DocType: Authorization Rule,This will be used for setting rule in HR module,Aceasta va fi utilizată pentru stabilirea regulă în modul de HR
 DocType: Account,Rate at which this tax is applied,Rata la care se aplică acest impozit
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reorder Qty,Reordonare Cantitate
 DocType: Company,Stock Adjustment Account,Cont Ajustarea stoc
@@ -2827,16 +2728,15 @@
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,Alocarea procent ar trebui să fie egală cu 100%
 DocType: Serial No,Out of AMC,Din AMC
 DocType: Purchase Order Item,Material Request Detail No,Material Cerere Detaliu Nu
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +97,Hard turning,Greu de cotitură
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +33,Make Maintenance Visit,Realizeaza Vizita de Mentenanta
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +187,Please contact to the user who have Sales Master Manager {0} role,Vă rugăm să contactați pentru utilizatorul care au Sales Maestru de Management {0} rol
 DocType: Company,Default Cash Account,Cont de Numerar Implicit
 apps/erpnext/erpnext/config/accounts.py +79,Company (not Customer or Supplier) master.,Directorul Companiei(nu al Clientului sau al Furnizorui).
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +106,Please enter 'Expected Delivery Date',"Vă rugăm să introduceți ""Data de livrare așteptată"""
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +187,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Nota de Livrare {0} trebuie sa fie anulată înainte de a anula aceasta Comandă de Vânzări
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +100,Please enter 'Expected Delivery Date',"Vă rugăm să introduceți ""Data de livrare așteptată"""
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +182,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Nota de Livrare {0} trebuie sa fie anulată înainte de a anula aceasta Comandă de Vânzări
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +373,Paid amount + Write Off Amount can not be greater than Grand Total,Suma plătită + Scrie Off Suma nu poate fi mai mare decât Grand total
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} nu este un număr de lot valid aferent articolului {1}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,Note: There is not enough leave balance for Leave Type {0},Notă: Nu este echilibrul concediu suficient pentru concediul de tip {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +124,Note: There is not enough leave balance for Leave Type {0},Notă: Nu este echilibrul concediu suficient pentru concediul de tip {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.","Notă: În cazul în care plata nu se face împotriva oricărei referire, face manual Jurnal intrare."
 DocType: Item,Supplier Items,Furnizor Articole
 DocType: Opportunity,Opportunity Type,Tip de oportunitate
@@ -2848,7 +2748,7 @@
 DocType: Hub Settings,Publish Availability,Publica Disponibilitate
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +105,Date of Birth cannot be greater than today.,Data nașterii nu poate fi mai mare decât în ​​prezent.
 ,Stock Ageing,Stoc Îmbătrânirea
-apps/erpnext/erpnext/controllers/accounts_controller.py +200,{0} '{1}' is disabled,{0} '{1}' este dezactivat
+apps/erpnext/erpnext/controllers/accounts_controller.py +201,{0} '{1}' is disabled,{0} '{1}' este dezactivat
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Setați ca Deschis
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Trimite prin email automate de contact pe tranzacțiile Depunerea.
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +232,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
@@ -2858,44 +2758,38 @@
 DocType: Purchase Order,Customer Contact Email,Contact Email client
 DocType: Event,Sunday,Duminică
 DocType: Sales Team,Contribution (%),Contribuție (%)
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +455,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,"Notă: Plata de intrare nu va fi creat deoarece ""Cash sau cont bancar"" nu a fost specificat"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +171,Responsibilities,Responsabilitati
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +457,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,"Notă: Plata de intrare nu va fi creat deoarece ""Cash sau cont bancar"" nu a fost specificat"
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +171,Responsibilities,Responsabilitati
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Template,Șablon
 DocType: Sales Person,Sales Person Name,Sales Person Nume
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,Va rugam sa introduceti cel putin 1 factura în tabelul
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +511,Add Users,Adauga utilizatori
+apps/erpnext/erpnext/public/js/setup_wizard.js +255,Add Users,Adauga utilizatori
 DocType: Pricing Rule,Item Group,Grup Articol
 DocType: Task,Actual Start Date (via Time Logs),Data efectivă de început (prin Jurnale de Timp)
 DocType: Stock Reconciliation Item,Before reconciliation,Premergător reconcilierii
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +12,To {0},Pentru a {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Impozite și Taxe adăugate (Compania de valuta)
-apps/erpnext/erpnext/stock/doctype/item/item.py +340,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Taxa Articol pentru inregistrarea {0} trebuie sa detina un cont de tip Fiscal sau De Venituri sau De Cheltuieli sau Taxabil
+apps/erpnext/erpnext/stock/doctype/item/item.py +344,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Taxa Articol pentru inregistrarea {0} trebuie sa detina un cont de tip Fiscal sau De Venituri sau De Cheltuieli sau Taxabil
 DocType: Sales Order,Partly Billed,Parțial Taxat
 DocType: Item,Default BOM,FDM Implicit
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +79,Decambering,Decambering
 apps/erpnext/erpnext/setup/doctype/company/company.js +22,Please re-type company name to confirm,Vă rugăm să re-tip numele companiei pentru a confirma
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,Totală restantă Amt
 DocType: Time Log Batch,Total Hours,Total ore
 DocType: Journal Entry,Printing Settings,Setări de imprimare
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +268,Total Debit must be equal to Total Credit. The difference is {0},Totală de debit trebuie să fie egal cu total Credit. Diferența este {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +11,Automotive,Autopropulsat
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +37,Item is required,Este necesară Articol
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +25,Metal injection molding,De turnare prin injecție de metal
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +258,Total Debit must be equal to Total Credit. The difference is {0},Totală de debit trebuie să fie egal cu total Credit. Diferența este {0}
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,Autopropulsat
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +684,From Delivery Note,Din Nota de Livrare
 DocType: Time Log,From Time,Din Time
 DocType: Notification Control,Custom Message,Mesaj Personalizat
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +33,Investment Banking,Investment Banking
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +261,"Select your Country, Time Zone and Currency","Selectați țara ta, fusul orar și valutar"
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,Investment Banking
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +316,"Select your Country, Time Zone and Currency","Selectați țara ta, fusul orar și valutar"
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +369,Cash or Bank Account is mandatory for making payment entry,Pentru a face o inregistrare de plată este obligatoriu numerar sau cont bancar
 DocType: Purchase Invoice,Price List Exchange Rate,Lista de prețuri Cursul de schimb
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +91,Pickling,Decapare
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +18,Sand casting,Turnarea în nisip
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +117,Electroplating,Galvanizare
 DocType: Purchase Invoice Item,Rate,
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +62,Intern,Interna
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Intern,Interna
 DocType: Newsletter,A Lead with this email id should exist,Un Lider cu acest id de e-mail ar trebui să existe
 DocType: Stock Entry,From BOM,De la BOM
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +34,Basic,Elementar
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +34,Basic,Elementar
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,Tranzacțiilor bursiere înainte de {0} sunt înghețate
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +217,Please click on 'Generate Schedule',"Vă rugăm să faceți clic pe ""Generate Program"""
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +61,To Date should be same as From Date for Half Day leave,Pentru a Data trebuie să fie aceeași ca la data de concediu de jumatate de zi
@@ -2903,11 +2797,11 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +96,Reference No is mandatory if you entered Reference Date,De referință nu este obligatorie în cazul în care ați introdus Reference Data
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +108,Date of Joining must be greater than Date of Birth,Data Aderării trebuie să fie ulterioara Datei Nașterii
 DocType: Salary Structure,Salary Structure,Structura salariu
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +242,"Multiple Price Rule exists with same criteria, please resolve \
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +246,"Multiple Price Rule exists with same criteria, please resolve \
 			conflict by assigning priority. Price Rules: {0}","Există Preț multiple articolul cu aceleași criterii, vă rugăm să rezolve conflictele \
  prin atribuirea prioritate. Reguli Pret: {0}"
 DocType: Account,Bank,Bancă
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +9,Airline,Linie aeriană
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,Linie aeriană
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +493,Issue Material,Eliberarea Material
 DocType: Material Request Item,For Warehouse,Pentru Depozit
 DocType: Employee,Offer Date,Oferta Date
@@ -2917,29 +2811,24 @@
 DocType: Item,Is Fixed Asset Item,Este fixă Asset Postul
 DocType: Stock Entry,Including items for sub assemblies,Inclusiv articole pentru subansambluri
 DocType: Features Setup,"If you have long print formats, this feature can be used to split the page to be printed on multiple pages with all headers and footers on each page","Dacă aveți formate de imprimare lungi, această caracteristică poate fi folosita pentru a împărți pagina pentru imprimare pe mai multe pagini, cu toate anteturile și subsolurile de pe fiecare pagină"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +131,Hobbing,Hobbing
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +98,All Territories,Toate teritoriile
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +98,All Territories,Toate teritoriile
 DocType: Purchase Invoice,Items,Articole
 DocType: Fiscal Year,Year Name,An Denumire
 DocType: Process Payroll,Process Payroll,Salarizare proces
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +59,There are more holidays than working days this month.,Există mai multe sărbători decât de zile de lucru în această lună.
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +68,There are more holidays than working days this month.,Există mai multe sărbători decât de zile de lucru în această lună.
 DocType: Product Bundle Item,Product Bundle Item,Produs Bundle Postul
 DocType: Sales Partner,Sales Partner Name,Numele Partner Sales
 DocType: Purchase Invoice Item,Image View,Imagine Vizualizare
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +113,Finishing & industrial finishing,Finisare și finisare industriale
 DocType: Issue,Opening Time,Timp de deschidere
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,Datele De La și Pana La necesare
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +46,Securities & Commodity Exchanges,A Valorilor Mobiliare și Burselor de Mărfuri
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,A Valorilor Mobiliare și Burselor de Mărfuri
 DocType: Shipping Rule,Calculate Based On,Calculaţi pe baza
 DocType: Delivery Note Item,From Warehouse,Din depozitul
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +98,Drilling,Foraj
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +28,Blow molding,Modelare prin suflare
 DocType: Purchase Taxes and Charges,Valuation and Total,Evaluare și Total
 DocType: Tax Rule,Shipping City,Transport Oraș
 apps/erpnext/erpnext/stock/doctype/item/item.js +43,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,"Acest post este o variantă de {0} (Template). Atributele vor fi copiate pe de modelul cu excepția cazului este setat ""Nu Copy"""
 DocType: Account,Purchase User,Cumpărare de utilizare
 DocType: Notification Control,Customize the Notification,Personalizare Notificare
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +87,Hammering,Ciocănitură
 DocType: Web Page,Slideshow,Slideshow
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +24,Default Address Template cannot be deleted,Format implicit Adresa nu poate fi șters
 DocType: Sales Invoice,Shipping Rule,Regula de transport maritim
@@ -2948,9 +2837,8 @@
 DocType: Workflow State,Search,Căutare
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +54,Total cannot be zero,Totalul nu poate să fie 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,'Zile de la ultima comandă' trebuie să fie mai mare sau egal cu zero
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +142,Brazing,Lipire
 DocType: C-Form,Amended From,Modificat din
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Raw Material,Material brut
+apps/erpnext/erpnext/public/js/setup_wizard.js +359,Raw Material,Material brut
 DocType: Leave Application,Follow via Email,Urmați prin e-mail
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Suma taxa După Discount Suma
 apps/erpnext/erpnext/accounts/doctype/account/account.py +174,Child account exists for this account. You can not delete this account.,Contul copil există pentru acest cont. Nu puteți șterge acest cont.
@@ -2964,10 +2852,10 @@
 ,Produced,Produs
 DocType: Item,Item Code for Suppliers,Articol Cod pentru Furnizori
 DocType: Issue,Raised By (Email),Ridicate de (e-mail)
-apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +72,General,General
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +495,Attach Letterhead,Atașați antet
+apps/erpnext/erpnext/setup/setup_wizard/default_website.py +72,General,General
+apps/erpnext/erpnext/public/js/setup_wizard.js +241,Attach Letterhead,Atașați antet
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +272,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',Nu se poate deduce când categoria este de 'Evaluare' sau 'Evaluare și total'
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +542,"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.","Lista capetele fiscale (de exemplu, TVA, vamale etc., ei ar trebui să aibă nume unice) și ratele lor standard. Acest lucru va crea un model standard, pe care le puteți edita și adăuga mai târziu."
+apps/erpnext/erpnext/public/js/setup_wizard.js +284,"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.","Lista capetele fiscale (de exemplu, TVA, vamale etc., ei ar trebui să aibă nume unice) și ratele lor standard. Acest lucru va crea un model standard, pe care le puteți edita și adăuga mai târziu."
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial Nos Required for Serialized Item {0},Serial nr necesare pentru postul serializat {0}
 DocType: Journal Entry,Bank Entry,Intrare bancară
 DocType: Authorization Rule,Applicable To (Designation),Aplicabil pentru (destinaţie)
@@ -2976,33 +2864,32 @@
 apps/erpnext/erpnext/config/accounts.py +143,Enable / disable currencies.,Activare / dezactivare valute.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Postal Expenses,Cheltuieli poștale
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Total (Amt)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +26,Entertainment & Leisure,Divertisment & Relaxare
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,Divertisment & Relaxare
 DocType: Purchase Order,The date on which recurring order will be stop,Data la care comanda recurent va fi opri
 DocType: Quality Inspection,Item Serial No,Nr. de Serie Articol
 apps/erpnext/erpnext/controllers/status_updater.py +142,{0} must be reduced by {1} or you should increase overflow tolerance,{0} trebuie să fie redus cu {1} sau dvs. ar trebui să incrementați toleranța în exces
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Present,Raport Prezent
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Hour,Oră
+apps/erpnext/erpnext/public/js/setup_wizard.js +363,Hour,Oră
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +138,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation","Postul serializate {0} nu poate fi actualizat \
  folosind stoc Reconciliere"
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +488,Transfer Material to Supplier,Transfer de material la furnizor
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +513,Transfer Material to Supplier,Transfer de material la furnizor
 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,Noua ordine nu pot avea Warehouse. Depozit trebuie să fie stabilite de către Bursa de intrare sau de primire de cumparare
 DocType: Lead,Lead Type,Tip Conducere
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +82,Create Quotation,Creare Ofertă
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +306,All these items have already been invoiced,Toate aceste articole au fost deja facturate
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,You are not authorized to approve leaves on Block Dates,Tu nu sunt autorizate să aprobe frunze pe bloc Perioada
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +311,All these items have already been invoiced,Toate aceste articole au fost deja facturate
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},Poate fi aprobat/a de către {0}
 DocType: Shipping Rule,Shipping Rule Conditions,Condiții Regula de transport maritim
 DocType: BOM Replace Tool,The new BOM after replacement,Noul BOM după înlocuirea
 DocType: Features Setup,Point of Sale,Point of Sale
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +83,Curling,Curling
 DocType: Account,Tax,Impozite
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +28,Row {0}: {1} is not a valid {2},Rând {0}: {1} nu este valid {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +89,Refining,Rafinare
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +37,Row {0}: {1} is not a valid {2},Rând {0}: {1} nu este valid {2}
 DocType: Production Planning Tool,Production Planning Tool,Producție instrument de planificare
 DocType: Quality Inspection,Report Date,Data raportului
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +130,Routing,Rutare
 DocType: C-Form,Invoices,Facturi
 DocType: Job Opening,Job Title,Denumire post
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +54,{0} already allocated for Employee {1} for period {2} - {3},{0} deja alocate pentru Angajat {1} pentru perioada {2} - {3}
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +80,{0} Recipients,{0} Destinatari
 DocType: Features Setup,Item Groups in Details,Grup Articol în Detalii
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +335,Quantity to Manufacture must be greater than 0.,Cantitatea să Fabricare trebuie sa fie mai mare decât 0.
@@ -3020,14 +2907,13 @@
 DocType: DocType,Setup,Setare
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,Nu este nimic pentru a edita.
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +108,Summary for this month and pending activities,Rezumat pentru această lună și activități în așteptarea
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +39,Cold rolling,Rulare la rece
 DocType: Customer Group,Customer Group Name,Nume Group Client
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +408,Please remove this Invoice {0} from C-Form {1},Vă rugăm să eliminați acest factură {0} de la C-Form {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +410,Please remove this Invoice {0} from C-Form {1},Vă rugăm să eliminați acest factură {0} de la C-Form {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,Vă rugăm să selectați reporta dacă doriți și să includă echilibrul de anul precedent fiscal lasă în acest an fiscal
 DocType: GL Entry,Against Voucher Type,Comparativ tipului de voucher
 DocType: Item,Attributes,Atribute
 DocType: Packing Slip,Get Items,Obtine Articole
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +186,Please enter Write Off Account,Va rugam sa introduceti Scrie Off cont
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +187,Please enter Write Off Account,Va rugam sa introduceti Scrie Off cont
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +71,Last Order Date,Ultima comandă Data
 DocType: DocField,Image,Imagine
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +179,Make Excise Invoice,Realizeaza Factura de Accize
@@ -3037,7 +2923,7 @@
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +146,Operation ID not set,ID operațiune nu este setat
 DocType: Production Order,Planned Start Date,Start data planificată
 DocType: Serial No,Creation Document Type,Tip de document creație
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +620,Maint. Visit,Maint. Vizita
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +631,Maint. Visit,Maint. Vizita
 DocType: Leave Type,Is Encash,Este încasa
 DocType: Purchase Invoice,Mobile No,Mobil Nu
 DocType: Payment Tool,Make Journal Entry,Asigurați Jurnal intrare
@@ -3045,35 +2931,31 @@
 apps/erpnext/erpnext/controllers/trends.py +257,Project-wise data is not available for Quotation,Date proiect-înțelept nu este disponibilă pentru ofertă
 DocType: Project,Expected End Date,Data de Incheiere Preconizata
 DocType: Appraisal Template,Appraisal Template Title,Titlu model expertivă
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +440,Commercial,Comercial
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +378,Commercial,Comercial
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +23,Parent Item {0} must not be a Stock Item,Postul părinte {0} nu trebuie să fie un articol stoc
 DocType: Cost Center,Distribution Id,Id distribuție
-apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +14,Awesome Services,Servicii extraordinare
+apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +14,Awesome Services,Servicii extraordinare
 apps/erpnext/erpnext/config/manufacturing.py +29,All Products or Services.,Toate produsele sau serviciile.
 DocType: Purchase Invoice,Supplier Address,Furnizor Adresa
 DocType: Contact Us Settings,Address Line 2,Adresă Linie 2
 DocType: ToDo,Reference,Referinta
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +59,Perforating,Perforare
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,Out Cantitate
 apps/erpnext/erpnext/config/accounts.py +128,Rules to calculate shipping amount for a sale,Reguli pentru a calcula suma de transport maritim pentru o vânzare
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +29,Series is mandatory,Seria este obligatorie
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +28,Financial Services,Servicii financiare
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,Servicii financiare
 apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3},Valoare pentru Atribut {0} trebuie să fie în intervalul de {1} la {2} în trepte de {3}
 DocType: Tax Rule,Sales,Vânzări
 DocType: Stock Entry Detail,Basic Amount,Suma de bază
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +173,Warehouse required for stock Item {0},Depozit necesar pentru stocul de postul {0}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +178,Warehouse required for stock Item {0},Depozit necesar pentru stocul de postul {0}
 DocType: Leave Allocation,Unused leaves,Frunze neutilizate
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,Cr
 DocType: Customer,Default Receivable Accounts,Implicit Conturi creanțe
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +102,Sawing,Tăierea
 DocType: Tax Rule,Billing State,Stat de facturare
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +32,Laminating,Laminare
 DocType: Item Reorder,Transfer,Transfer
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +549,Fetch exploded BOM (including sub-assemblies),Obtine FDM expandat (inclusiv subansamblurile)
 DocType: Authorization Rule,Applicable To (Employee),Aplicabil pentru (angajat)
 apps/erpnext/erpnext/controllers/accounts_controller.py +101,Due Date is mandatory,Due Date este obligatorie
 apps/erpnext/erpnext/controllers/item_variant.py +51,Increment for Attribute {0} cannot be 0,Creștere pentru Atribut {0} nu poate fi 0
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +143,Sintering,Sinterizarea
 DocType: Journal Entry,Pay To / Recd From,Pentru a plăti / Recd de la
 DocType: Naming Series,Setup Series,Seria de configurare
 DocType: Supplier,Contact HTML,HTML Persoana de Contact
@@ -3085,7 +2967,6 @@
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +108,Customer {0} does not exist,Clientul {0} nu există
 DocType: Attendance,Absent,Absent
 DocType: Product Bundle,Product Bundle,Bundle produs
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +165,Crushing,Zdrobitor
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Achiziționa impozite și taxe Template
 DocType: Upload Attendance,Download Template,Descărcați Sablon
 DocType: GL Entry,Remarks,Remarci
@@ -3093,14 +2974,12 @@
 DocType: Journal Entry,Write Off Based On,Scrie Off bazat pe
 DocType: Features Setup,POS View,POS View
 apps/erpnext/erpnext/config/stock.py +38,Installation record for a Serial No.,Înregistrare de instalare pentru un nr de serie
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +9,Continuous casting,Turnare continuă
 apps/erpnext/erpnext/public/js/queries.js +39,Please specify a,Vă rugăm să specificați un
 DocType: Offer Letter,Awaiting Response,Se aşteaptă răspuns
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +53,Above,Sus
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +80,Cold sizing,Dimensionarea rece
 DocType: Salary Slip,Earning & Deduction,Câștig Salarial si Deducere
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +76,Account {0} cannot be a Group,Contul {0} nu poate fi un Grup
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +259,Region,Regiune
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +314,Region,Regiune
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +213,Optional. This setting will be used to filter in various transactions.,Opțional. Această setare va fi utilizat pentru a filtra în diverse tranzacții.
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +104,Negative Valuation Rate is not allowed,Negativ Rata de evaluare nu este permis
 DocType: Holiday List,Weekly Off,Săptămânal Off
@@ -3118,7 +2997,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,Account {0} is inactive,Contul {0} este inactiv
 DocType: GL Entry,Is Advance,Este Advance
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,Prezenţa de la data și prezența până la data sunt obligatorii
-apps/erpnext/erpnext/controllers/buying_controller.py +131,Please enter 'Is Subcontracted' as Yes or No,"Va rugam sa introduceti ""este subcontractată"" ca Da sau Nu"
+apps/erpnext/erpnext/controllers/buying_controller.py +122,Please enter 'Is Subcontracted' as Yes or No,"Va rugam sa introduceti ""este subcontractată"" ca Da sau Nu"
 DocType: Sales Team,Contact No.,Nr. Persoana de Contact
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,'Profit and Loss' type account {0} not allowed in Opening Entry,"'Tipul de cont 'Profit și pierdere' {0} nu este permis în intrarea de deschidere"""
 DocType: Workflow State,Time,Oră
@@ -3127,14 +3006,13 @@
 DocType: Authorization Rule,Authorization Rule,Regulă de autorizare
 DocType: Sales Invoice,Terms and Conditions Details,Termeni și condiții Detalii
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,Impozite vânzări și șabloane Taxe
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +10,Apparel & Accessories,Îmbrăcăminte și accesorii
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,Îmbrăcăminte și accesorii
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +67,Number of Order,Numărul de comandă
 DocType: Item Group,HTML / Banner that will show on the top of product list.,"HTML / Banner, care va arăta pe partea de sus a listei de produse."
 DocType: Shipping Rule,Specify conditions to calculate shipping amount,Precizați condițiile de calcul cantitate de transport maritim
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +121,Add Child,Adăugaţi fiu
 DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,Rolul pot organiza conturile înghețate și congelate Editați intrările
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +52,Cannot convert Cost Center to ledger as it has child nodes,"Nu se poate converti de cost Centrul de registru, deoarece are noduri copil"
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +47,Conversion Factor is required,Factorul de Conversie este necesar
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +37,Serial #,Serial #
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +87,Commission on Sales,Comision pentru Vânzări
 DocType: Offer Letter Term,Value / Description,Valoare / Descriere
@@ -3142,10 +3020,8 @@
 ,Customers Not Buying Since Long Time,Clienții care nu au efectuat cumparaturi de foarte mult timp
 DocType: Production Order,Expected Delivery Date,Data de Livrare Preconizata
 apps/erpnext/erpnext/accounts/general_ledger.py +121,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Debit și credit nu este egal pentru {0} # {1}. Diferența este {2}.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +48,Bulging,Lărgire
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +11,Evaporative-pattern casting,Turnare evaporare-model
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Entertainment Expenses,Cheltuieli de Divertisment
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +195,Sales Invoice {0} must be cancelled before cancelling this Sales Order,Factură de vânzări {0} trebuie anulată înainte de a anula această comandă de vânzări
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +190,Sales Invoice {0} must be cancelled before cancelling this Sales Order,Factură de vânzări {0} trebuie anulată înainte de a anula această comandă de vânzări
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +61,Age,Vârstă
 DocType: Time Log,Billing Amount,Suma de facturare
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +84,Invalid quantity specified for item {0}. Quantity should be greater than 0.,Cantitate nevalidă specificată pentru element {0}. Cantitatea ar trebui să fie mai mare decât 0.
@@ -3164,26 +3040,24 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,Noi surse de venit pentru clienți
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Travel Expenses,Cheltuieli de călătorie
 DocType: Maintenance Visit,Breakdown,Avarie
-apps/erpnext/erpnext/controllers/accounts_controller.py +241,Account: {0} with currency: {1} can not be selected,Contul: {0} cu moneda: {1} nu poate fi selectat
+apps/erpnext/erpnext/controllers/accounts_controller.py +242,Account: {0} with currency: {1} can not be selected,Contul: {0} cu moneda: {1} nu poate fi selectat
 DocType: Bank Reconciliation Detail,Cheque Date,Data Cec
 apps/erpnext/erpnext/accounts/doctype/account/account.py +47,Account {0}: Parent account {1} does not belong to company: {2},Contul {0}: cont Părinte {1} nu apartine companiei: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted all transactions related to this company!,Șters cu succes toate tranzacțiile legate de aceasta companie!
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,Ca pe data
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +111,Honing,Finisare
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +58,Probation,Probă
-apps/erpnext/erpnext/stock/doctype/item/item.py +264,Default Warehouse is mandatory for stock Item.,Depozitul Implicit este obligatoriu pentru articol din stoc.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Probation,Probă
+apps/erpnext/erpnext/stock/doctype/item/item.py +268,Default Warehouse is mandatory for stock Item.,Depozitul Implicit este obligatoriu pentru articol din stoc.
 DocType: Feed,Full Name,Nume complet
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +148,Clinching,Concludent
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +191,Payment of salary for the month {0} and year {1},Plata salariului pentru luna {0} și {1 an}
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +173,Payment of salary for the month {0} and year {1},Plata salariului pentru luna {0} și {1 an}
 DocType: Stock Settings,Auto insert Price List rate if missing,"Inserați Auto rata Lista de prețuri, dacă lipsește"
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,Total Suma plătită
 ,Transferred Qty,Transferat Cantitate
 apps/erpnext/erpnext/config/learn.py +11,Navigating,Navigarea
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +137,Planning,Planificare
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +137,Planning,Planificare
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +9,Make Time Log Batch,Ora face Log lot
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Issued,Emis
 DocType: Project,Total Billing Amount (via Time Logs),Suma totală de facturare (prin timp Busteni)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +629,We sell this Item,Vindem acest articol
+apps/erpnext/erpnext/public/js/setup_wizard.js +365,We sell this Item,Vindem acest articol
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +65,Supplier Id,Furnizor Id
 DocType: Journal Entry,Cash Entry,Cash intrare
 DocType: Sales Partner,Contact Desc,Persoana de Contact Desc
@@ -3192,18 +3066,16 @@
 DocType: Brand,Item Manager,Postul de manager
 DocType: Cost Center,Add rows to set annual budgets on Accounts.,Adaugaţi rânduri pentru a stabili bugete anuale pentru Conturi.
 DocType: Buying Settings,Default Supplier Type,Tip Furnizor Implicit
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +160,Quarrying,Cariere
 DocType: Production Order,Total Operating Cost,Cost total de operare
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +160,Note: Item {0} entered multiple times,Notă: Articolul {0} a intrat de mai multe ori
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +163,Note: Item {0} entered multiple times,Notă: Articolul {0} a intrat de mai multe ori
 apps/erpnext/erpnext/config/crm.py +27,All Contacts.,Toate contactele.
 DocType: Newsletter,Test Email Id,Test de e-mail Id-ul
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +394,Company Abbreviation,Abreviere Companie
+apps/erpnext/erpnext/public/js/setup_wizard.js +142,Company Abbreviation,Abreviere Companie
 DocType: Features Setup,If you follow Quality Inspection. Enables Item QA Required and QA No in Purchase Receipt,In cazul in care urmați Inspecție de calitate. Activeaza Articol QA solicitat și nr. QA din Chitanta de Cumparare
 DocType: GL Entry,Party Type,Tip de partid
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +68,Raw material cannot be same as main Item,Materii prime nu poate fi la fel ca Item principal
 DocType: Item Attribute Value,Abbreviation,Abreviere
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,Nu authroized din {0} depășește limitele
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +30,Rotational molding,Turnare prin rotație
 apps/erpnext/erpnext/config/hr.py +115,Salary template master.,Maestru șablon salariu.
 DocType: Leave Type,Max Days Leave Allowed,Max zile de concediu de companie
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +55,Set Tax Rule for shopping cart,Set Regula fiscală pentru coșul de cumpărături
@@ -3217,15 +3089,15 @@
 apps/erpnext/erpnext/config/selling.py +18,Quotes to Leads or Customers.,Citate la Oportunitati sau clienți.
 DocType: Stock Settings,Role Allowed to edit frozen stock,Rol permise pentru a edita stoc congelate
 ,Territory Target Variance Item Group-Wise,Teritoriul țintă Variance Articol Grupa Înțelept
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +101,All Customer Groups,Toate grupurile de clienți
-apps/erpnext/erpnext/controllers/accounts_controller.py +474,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} este obligatoriu. Este posibil ca înregistrarea schimbului valutar nu este creată pentru {1} până la {2}.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +101,All Customer Groups,Toate grupurile de clienți
+apps/erpnext/erpnext/controllers/accounts_controller.py +475,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} este obligatoriu. Este posibil ca înregistrarea schimbului valutar nu este creată pentru {1} până la {2}.
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +37,Tax Template is mandatory.,Format de impozitare este obligatorie.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +41,Account {0}: Parent account {1} does not exist,Contul {0}: cont părinte {1} nu există
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Lista de prețuri Rate (Compania de valuta)
 DocType: Account,Temporary,Temporar
 DocType: Address,Preferred Billing Address,Adresa de facturare preferat
 DocType: Monthly Distribution Percentage,Percentage Allocation,Alocarea procent
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +86,Secretary,Secretar
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Secretary,Secretar
 DocType: Serial No,Distinct unit of an Item,Unitate distinctă de Postul
 DocType: Pricing Rule,Buying,Cumpărare
 DocType: HR Settings,Employee Records to be created by,Inregistrari Angajaților pentru a fi create prin
@@ -3238,9 +3110,8 @@
 ,Item-wise Price List Rate,Rata Lista de Pret Articol-Avizat
 DocType: Purchase Order Item,Supplier Quotation,Furnizor ofertă
 DocType: Quotation,In Words will be visible once you save the Quotation.,În cuvinte va fi vizibil după ce salvați citat.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +68,Ironing,Calcat
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is stopped,{0} {1} este oprit
-apps/erpnext/erpnext/stock/doctype/item/item.py +352,Barcode {0} already used in Item {1},Cod de bare {0} deja folosit pentru articolul {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +356,Barcode {0} already used in Item {1},Cod de bare {0} deja folosit pentru articolul {1}
 DocType: Lead,Add to calendar on this date,Adăugaţi în calendar la această dată
 apps/erpnext/erpnext/config/selling.py +132,Rules for adding shipping costs.,Reguli pentru a adăuga costurile de transport maritim.
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,evenimente viitoare
@@ -3249,13 +3120,12 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +27,Quick Entry,Intrarea rapidă
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0} este obligatorie pentru returnare
 DocType: Purchase Order,To Receive,A Primi
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +33,Shrink fitting,Shrink montaj
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +522,user@example.com,user@example.com
+apps/erpnext/erpnext/public/js/setup_wizard.js +266,user@example.com,user@example.com
 DocType: Email Digest,Income / Expense,Venituri / cheltuieli
 DocType: Employee,Personal Email,Personal de e-mail
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +58,Total Variance,Raport Variance
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +62,Total Variance,Raport Variance
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.","Dacă este activat, sistemul va posta automat înregistrări contabile pentru inventar."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +15,Brokerage,Brokeraj
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +15,Brokerage,Brokeraj
 DocType: Address,Postal Code,Cod poștal
 DocType: Production Order Operation,"in Minutes
 Updated via 'Time Log'","în procesul-verbal 
@@ -3263,14 +3133,13 @@
 DocType: Customer,From Lead,Din Conducere
 apps/erpnext/erpnext/config/manufacturing.py +19,Orders released for production.,Comenzi lansat pentru producție.
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +42,Select Fiscal Year...,Selectați anul fiscal ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +442,POS Profile required to make POS Entry,POS Profil necesare pentru a face POS intrare
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +444,POS Profile required to make POS Entry,POS Profil necesare pentru a face POS intrare
 DocType: Hub Settings,Name Token,Numele Token
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +106,Planing,"Masini pentru dimensionat,"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Selling,Vanzarea Standard
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +120,Standard Selling,Vanzarea Standard
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +137,Atleast one warehouse is mandatory,Cel puţin un depozit este obligatoriu
 DocType: Serial No,Out of Warranty,Ieșit din garanție
 DocType: BOM Replace Tool,Replace,Înlocuirea
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +314,{0} against Sales Invoice {1},{0} comparativ cu factura de vânzări {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +316,{0} against Sales Invoice {1},{0} comparativ cu factura de vânzări {1}
 apps/erpnext/erpnext/stock/doctype/item/item.py +49,Please enter default Unit of Measure,Va rugam sa introduceti Unitatea de măsură prestabilită
 DocType: Purchase Invoice Item,Project Name,Denumirea proiectului
 DocType: Supplier,Mention if non-standard receivable account,Mentionati daca non-standard cont de primit
@@ -3286,9 +3155,8 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,Journal Entry {0} does not have account {1} or already matched against other voucher,Jurnal de intrare {0} nu are cont {1} sau deja comparate cu alte voucher
 DocType: Item,Moving Average,Mutarea medie
 DocType: BOM Replace Tool,The BOM which will be replaced,BOM care va fi înlocuit
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +43,New Stock UOM must be different from current stock UOM,New Stock UOM trebuie să fie diferit de curent stoc UOM
 DocType: Account,Debit,Debitare
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +34,Leaves must be allocated in multiples of 0.5,"Concediile trebuie să fie alocate în multipli de 0.5"""
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +44,Leaves must be allocated in multiples of 0.5,"Concediile trebuie să fie alocate în multipli de 0.5"""
 DocType: Production Order,Operation Cost,Funcționare cost
 apps/erpnext/erpnext/config/hr.py +71,Upload attendance from a .csv file,Încărcați de participare dintr-un fișier csv.
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,Impresionant Amt
@@ -3306,8 +3174,7 @@
 DocType: Employee,Internal Work History,Istoria interne de lucru
 DocType: DocField,Column Break,Coloana Break
 DocType: Event,Thursday,Joi
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +42,Private Equity,Private Equity
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +93,Turning,Cotitură
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,Private Equity
 DocType: Maintenance Visit,Customer Feedback,Feedback Client
 DocType: Account,Expense,Cheltuială
 DocType: Sales Invoice,Exhibition,Expoziție
@@ -3320,18 +3187,18 @@
 DocType: Employee,Held On,Organizat In
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +33,Production Item,Producția Postul
 ,Employee Information,Informații angajat
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,Rate (%),Rate (%)
+apps/erpnext/erpnext/public/js/setup_wizard.js +294,Rate (%),Rate (%)
 DocType: Stock Entry Detail,Additional Cost,Cost aditional
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +407,Financial Year End Date,Data de Incheiere An Financiar
+apps/erpnext/erpnext/public/js/setup_wizard.js +155,Financial Year End Date,Data de Incheiere An Financiar
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Voucher No, if grouped by Voucher","Nu se poate filtra pe baza voucher Nr., în cazul gruparii in functie de Voucher"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +484,Make Supplier Quotation,Realizeaza Ofertă Furnizor
 DocType: Quality Inspection,Incoming,Primite
 DocType: BOM,Materials Required (Exploded),Materiale necesare (explodat)
 DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),Reduce Câștigul salarial de concediu fără plată (LWP)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +512,"Add users to your organization, other than yourself","Adăugați utilizatori la organizația dvs., altele decât tine"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +44,Casual Leave,Concediu Aleator
+apps/erpnext/erpnext/public/js/setup_wizard.js +256,"Add users to your organization, other than yourself","Adăugați utilizatori la organizația dvs., altele decât tine"
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +44,Casual Leave,Concediu Aleator
 DocType: Batch,Batch ID,ID-ul lotului
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +334,Note: {0},Notă: {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +336,Note: {0},Notă: {0}
 ,Delivery Note Trends,Tendințe Nota de Livrare
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +104,This Week's Summary,Rezumat această săptămână
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +74,{0} must be a Purchased or Sub-Contracted Item in row {1},{0} trebuie sa fie un articol cumpărat sau subcontractat în rândul {1}
@@ -3343,7 +3210,7 @@
 DocType: Purchase Receipt,Return Against Purchase Receipt,Reveni cu confirmare de primire cumparare
 DocType: Purchase Order,To Bill,Pentru a Bill
 DocType: Material Request,% Ordered,Comandat%
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +61,Piecework,Muncă în acord
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Piecework,Muncă în acord
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +64,Avg. Buying Rate,Rată de cumparare medie
 DocType: Task,Actual Time (in Hours),Timpul efectiv (în ore)
 DocType: Employee,History In Company,Istoric In Companie
@@ -3360,13 +3227,13 @@
 DocType: Opportunity,To Discuss,Pentru a discuta
 DocType: SMS Settings,SMS Settings,Setări SMS
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +60,Temporary Accounts,Conturi temporare
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +155,Black,Negru
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Black,Negru
 DocType: BOM Explosion Item,BOM Explosion Item,Explozie articol BOM
 DocType: Account,Auditor,Auditor
 DocType: Purchase Order,End date of current order's period,Data de încheiere a perioadei ordin curent
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +17,Make Offer Letter,Face Scrisoare Oferta
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +10,Return,Întoarcere
-apps/erpnext/erpnext/stock/doctype/item/item.py +503,Default Unit of Measure for Variant must be same as Template,Unitatea implicit de măsură pentru Variant trebuie să fie aceeași ca șablon
+apps/erpnext/erpnext/stock/doctype/item/item.py +507,Default Unit of Measure for Variant must be same as Template,Unitatea implicit de măsură pentru Variant trebuie să fie aceeași ca șablon
 DocType: DocField,Fold,Plia
 DocType: Production Order Operation,Production Order Operation,Producția Comanda Funcționare
 DocType: Pricing Rule,Disable,Dezactivati
@@ -3377,13 +3244,12 @@
 DocType: Page,Page Name,Nume pagină
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +110,To Time must be greater than From Time,A timpului trebuie să fie mai mare decât la timp
 DocType: Journal Entry Account,Exchange Rate,Rata de schimb
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +465,Sales Order {0} is not submitted,Comandă de vânzări {0} nu este prezentat
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +467,Sales Order {0} is not submitted,Comandă de vânzări {0} nu este prezentat
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0}: Parent account {1} does not bolong to the company {2},Depozit {0}: contul părinte {1} nu apartine  companiei {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +124,Spindle finishing,Finisare ax
 DocType: BOM,Last Purchase Rate,Ultima Rate de Cumparare
 DocType: Account,Asset,Valoare
 DocType: Project Task,Task ID,Sarcina ID
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +395,"e.g. ""MC""","de exemplu ""MC """
+apps/erpnext/erpnext/public/js/setup_wizard.js +143,"e.g. ""MC""","de exemplu ""MC """
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,Stock cannot exist for Item {0} since has variants,Stock nu poate exista pentru postul {0} deoarece are variante
 ,Sales Person-wise Transaction Summary,Persoana de vânzări-înțelept Rezumat Transaction
 DocType: System Settings,Time Zone,Time Zone
@@ -3392,9 +3258,7 @@
 DocType: Monthly Distribution,Monthly Distribution Percentages,Procente de distribuție lunare
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +16,The selected item cannot have Batch,Elementul selectat nu poate avea Lot
 DocType: Delivery Note,% of materials delivered against this Delivery Note,% din materialele livrate comparativ cu această notă de Livrare
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +151,Stapling,Capsare
 DocType: Customer,Customer Details,Detalii Client
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +105,Shaping,Modelarea
 DocType: Employee,Reports to,Rapoarte
 DocType: SMS Settings,Enter url parameter for receiver nos,Introduceți parametru url pentru receptor nos
 DocType: Sales Invoice,Paid Amount,Suma plătită
@@ -3403,13 +3267,13 @@
 DocType: Item Variant,Item Variant,Postul Varianta
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +15,Setting this Address Template as default as there is no other default,Setarea acestei Format Adresa implicit ca nu exista nici un alt implicit
 apps/erpnext/erpnext/accounts/doctype/account/account.py +89,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Soldul contului este deja în credit, nu vă este permis să setați ""Balanța trebuie să fie"" drept ""Credit""."
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +76,Quality Management,Managementul calității
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Quality Management,Managementul calității
 DocType: Production Planning Tool,Filter based on customer,Filtru bazat pe client
 DocType: Payment Tool Detail,Against Voucher No,Comparativ voucherului nr
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +47,Please enter quantity for Item {0},Va rugam sa introduceti cantitatea pentru postul {0}
 DocType: Employee External Work History,Employee External Work History,Istoric Extern Locuri de Munca Angajat
 DocType: Tax Rule,Purchase,Cumpărarea
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +34,Balance Qty,Cantitate de bilanţ
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Balance Qty,Cantitate de bilanţ
 DocType: Item Group,Parent Item Group,Părinte Grupa de articole
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +21,{0} for {1},{0} pentru {1}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +96,Cost Centers,Centre de cost
@@ -3419,12 +3283,12 @@
 DocType: Opportunity,Next Contact,Următor Contact
 DocType: Employee,Employment Type,Tip angajare
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,Active Fixe
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +84,Application period cannot be across two alocation records,Perioada de aplicare nu poate fi peste două înregistrări alocation
 DocType: Item Group,Default Expense Account,Cont de Cheltuieli Implicit
 DocType: Employee,Notice (days),Preaviz (zile)
 DocType: Page,Yes,Da
 DocType: Tax Rule,Sales Tax Template,Format impozitul pe vânzări
 DocType: Employee,Encashment Date,Data plata in Numerar
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +74,Electroforming,Electroforming
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +179,"Against Voucher Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Comparativ tipului de voucher trebuie să fie o opțiune dintre următoarele: ordin de cumparare, factură de cumpărare sau intrare în jurnal"
 DocType: Account,Stock Adjustment,Ajustarea stoc
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +34,Default Activity Cost exists for Activity Type - {0},Există implicit Activitate Cost de activitate de tip - {0}
@@ -3460,12 +3324,12 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,Depozit nu pot fi șterse ca exista intrare stoc registrul pentru acest depozit.
 DocType: Company,Distribution,Distribuire
 apps/erpnext/erpnext/public/js/pos/pos.html +36,Amount Paid,Sumă plătită
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +91,Project Manager,Manager de Proiect
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +72,Dispatch,Expediere
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Project Manager,Manager de Proiect
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +72,Dispatch,Expediere
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,Discount maxim permis pentru articol: {0} este {1}%
 DocType: Customer,Default Taxes and Charges,Impozite și taxe prestabilite
 DocType: Account,Receivable,De încasat
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +268,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,Row # {0}: Nu este permis să schimbe furnizorul ca Comandă există deja
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +263,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,Row # {0}: Nu este permis să schimbe furnizorul ca Comandă există deja
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,Rol care i se permite să prezinte tranzacțiile care depășesc limitele de credit stabilite.
 DocType: Sales Invoice,Supplier Reference,Furnizor de referință
 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.","In cazul in care se bifeaza, FDM pentru un articol sub-asamblare va fi luat în considerare pentru obținere materii prime. În caz contrar, toate articolele de sub-asamblare vor fi tratate ca si materie primă."
@@ -3473,8 +3337,8 @@
 DocType: Hub Settings,Seller Description,Descriere vânzător
 DocType: Employee Education,Qualification,Calificare
 DocType: Item Price,Item Price,Pret Articol
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +48,Soap & Detergent,Soap & Detergent
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +36,Motion Picture & Video,Motion Picture & Video
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +48,Soap & Detergent,Soap & Detergent
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +36,Motion Picture & Video,Motion Picture & Video
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Ordonat
 DocType: Warehouse,Warehouse Name,Denumire depozit
 DocType: Naming Series,Select Transaction,Selectați Transaction
@@ -3483,7 +3347,6 @@
 DocType: BOM,Rate Of Materials Based On,Rate de materiale bazate pe
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,Analtyics Suport
 apps/erpnext/erpnext/accounts/doctype/accounts_settings/accounts_settings.py +27,Company is missing in warehouses {0},Compania lipsește din depozitul {0}
-DocType: Stock UOM Replace Utility,Stock UOM Replace Utility,Stoc UOM Înlocuiți Utility
 DocType: POS Profile,Terms and Conditions,Termeni şi condiţii
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,To Date should be within the Fiscal Year. Assuming To Date = {0},Pentru a Data ar trebui să fie în anul fiscal. Presupunând Pentru a Data = {0}
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","Aici puteți stoca informatii despre inaltime, greutate, alergii, probleme medicale etc"
@@ -3495,7 +3358,7 @@
 DocType: Sales Order Item,For Production,Pentru Producție
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +103,Please enter sales order in the above table,Vă rugăm să introduceți comenzi de vânzări în tabelul de mai sus
 DocType: Project Task,View Task,Vezi Sarcina
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +406,Your financial year begins on,Anul dvs. financiar începe la data de
+apps/erpnext/erpnext/public/js/setup_wizard.js +154,Your financial year begins on,Anul dvs. financiar începe la data de
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +46,Please enter Purchase Receipts,Va rugam sa introduceti cumparare Încasări
 DocType: Sales Invoice,Get Advances Received,Obtine Avansurile Primite
 DocType: Email Digest,Add/Remove Recipients,Adăugaţi/Stergeţi Destinatari
@@ -3503,16 +3366,14 @@
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","Pentru a seta acest an fiscal ca implicit, faceți clic pe ""Set as Default"""
 apps/erpnext/erpnext/config/support.py +54,Setup incoming server for support email id. (e.g. support@example.com),Configurare de server de intrare pentru suport de e-mail id. (De exemplu support@example.com)
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,Lipsă Cantitate
-apps/erpnext/erpnext/stock/doctype/item/item.py +528,Item variant {0} exists with same attributes,Postul varianta {0} există cu aceleași atribute
+apps/erpnext/erpnext/stock/doctype/item/item.py +532,Item variant {0} exists with same attributes,Postul varianta {0} există cu aceleași atribute
 DocType: Salary Slip,Salary Slip,Salariul Slip
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +116,Burnishing,Lustruire
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +54,'To Date' is required,'Până la data' este necesară
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,'Până la data' este necesară
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","Generarea de ambalare slip pentru pachetele de a fi livrate. Folosit pentru a notifica numărul pachet, conținutul pachetului și greutatea sa."
 DocType: Sales Invoice Item,Sales Order Item,Comandă de vânzări Postul
 DocType: Salary Slip,Payment Days,Zile de plată
 DocType: BOM,Manage cost of operations,Gestioneaza costul operațiunilor
 DocType: Features Setup,Item Advanced,Articol avansate
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +40,Hot rolling,Laminarea la cald
 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.","Atunci când oricare dintre tranzacțiile verificate sunt ""Trimis"", un e-mail de tip pop-up a deschis în mod automat pentru a trimite un e-mail la ""Contact"", asociat în această operațiune, cu tranzacția ca un atașament. Utilizatorul poate sau nu poate trimite e-mail."
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,Setări globale
 DocType: Employee Education,Employee Education,Educație Angajat
@@ -3525,25 +3386,23 @@
 DocType: Customer,Sales Team Details,Detalii de vânzări Echipa
 DocType: Expense Claim,Total Claimed Amount,Total suma pretinsă
 apps/erpnext/erpnext/config/crm.py +22,Potential opportunities for selling.,Potențiale oportunități de vânzare.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +48,Sick Leave,A concediului medical
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +174,Invalid {0},Invalid {0}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +48,Sick Leave,A concediului medical
 DocType: Email Digest,Email Digest,Email Digest
 DocType: Delivery Note,Billing Address Name,Numele din adresa de facturare
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +22,Department Stores,Magazine Departament
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,Magazine Departament
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +40,System Balance,Sistemul Balanța
 DocType: Workflow,Is Active,Este activ
 apps/erpnext/erpnext/controllers/stock_controller.py +71,No accounting entries for the following warehouses,Nici o intrare contabile pentru următoarele depozite
 apps/erpnext/erpnext/projects/doctype/project/project.js +22,Save the document first.,Salvați documentul primul.
 DocType: Account,Chargeable,Taxabil/a
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +121,Linishing,Linishing
 DocType: Company,Change Abbreviation,Schimbarea abreviere
 DocType: Workflow State,Primary,Principal:
 DocType: Expense Claim Detail,Expense Date,Data cheltuieli
 DocType: Item,Max Discount (%),Max Discount (%)
 DocType: Communication,More Information,Mai multe informatii
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +70,Last Order Amount,Ultima cantitate
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +161,Blasting,Sablare
 DocType: Company,Warn,Avertiza
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +111,Item valuation updated,Evaluare Articol Actualizata
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Orice alte observații, efort remarcabil care ar trebui înregistrate."
 DocType: BOM,Manufacturing User,Producție de utilizare
 DocType: Purchase Order,Raw Materials Supplied,Materii prime furnizate
@@ -3553,7 +3412,7 @@
 DocType: Appraisal,Appraisal Template,Model expertiză
 DocType: Communication,Email,Email
 DocType: Item Group,Item Classification,Postul Clasificare
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +89,Business Development Manager,Manager pentru Dezvoltarea Afacerilor
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Business Development Manager,Manager pentru Dezvoltarea Afacerilor
 DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,Scop Vizita Mentenanta
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.js +15,Period,Perioada
 ,General Ledger,Registru Contabil General
@@ -3563,9 +3422,7 @@
 ,Itemwise Recommended Reorder Level,Nivel de Reordonare Recomandat al Articolului-Awesome
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +264,Please select {0} first,Vă rugăm selectați 0} {întâi
 DocType: Features Setup,To get Item Group in details table,Pentru a obține Grupa de articole în detalii de masă
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +67,Redrawing,Retrasarea
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +112,Batch {0} of Item {1} has expired.,Lot {0} din {1} Postul a expirat.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +120,Etching,Gravură
 DocType: Sales Invoice,Commission,Comision
 DocType: Address Template,"<h4>Default Template</h4>
 <p>Uses <a href=""http://jinja.pocoo.org/docs/templates/"">Jinja Templating</a> and all the fields of Address (including Custom Fields if any) will be available</p>
@@ -3610,7 +3467,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +340,Operation Time must be greater than 0 for Operation {0},Funcționarea timp trebuie să fie mai mare decât 0 pentru funcționare {0}
 DocType: Supplier,Address and Contacts,Adresa si contact
 DocType: UOM Conversion Detail,UOM Conversion Detail,Detaliu UOM de conversie
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +496,Keep it web friendly 900px (w) by 100px (h),Păstrați-l in parametrii web amiabili si anume 900px (w) pe 100px (h)
+apps/erpnext/erpnext/public/js/setup_wizard.js +242,Keep it web friendly 900px (w) by 100px (h),Păstrați-l in parametrii web amiabili si anume 900px (w) pe 100px (h)
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +329,Production Order cannot be raised against a Item Template,Producția Comanda nu poate fi ridicată pe un șablon Postul
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +44,Charges are updated in Purchase Receipt against each item,Tarifele sunt actualizate în Primirea cumparare pentru fiecare articol
 DocType: Payment Tool,Get Outstanding Vouchers,Ia restante Tichete
@@ -3626,54 +3483,49 @@
 DocType: Item,Average time taken by the supplier to deliver,Timpul mediu luate de către furnizor de a livra
 DocType: Time Log,Hours,Ore
 DocType: Project,Expected Start Date,Data de Incepere Preconizata
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +38,Rolling,Rulare
 DocType: ToDo,Priority,Prioritate
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +41,Remove item if charges is not applicable to that item,Eliminați element cazul în care costurile nu se aplică în acest element
 DocType: Dropbox Backup,Dropbox Access Allowed,Acces Dropbox Permis
 DocType: Dropbox Backup,Weekly,Săptămânal
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,De exemplu. smsgateway.com / API / send_sms.cgi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +485,Receive,Primi
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +510,Receive,Primi
 DocType: Maintenance Visit,Fully Completed,Completat in Intregime
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% complet
 DocType: Employee,Educational Qualification,Detalii Calificare de Învățământ
 DocType: Workstation,Operating Costs,Costuri de operare
 DocType: Employee Leave Approver,Employee Leave Approver,Aprobator Concediu Angajat
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,{0} has been successfully added to our Newsletter list.,{0} a fost adăugat cu succes la lista noastră Newsletter.
-apps/erpnext/erpnext/stock/doctype/item/item.py +383,Row {0}: An Reorder entry already exists for this warehouse {1},Rând {0}: O intrare de Comandă există deja pentru acest depozit {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +387,Row {0}: An Reorder entry already exists for this warehouse {1},Rând {0}: O intrare de Comandă există deja pentru acest depozit {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +67,"Cannot declare as lost, because Quotation has been made.","Nu se poate declara pierdut, pentru că Oferta a fost realizata."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +133,Electron beam machining,Electron prelucrare cu fascicul
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Cumpărare Maestru de Management
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +424,Production Order {0} must be submitted,Producția de Ordine {0} trebuie să fie prezentate
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +150,Please select Start Date and End Date for Item {0},Vă rugăm să selectați data de început și Data de final pentru postul {0}
 apps/erpnext/erpnext/config/stock.py +141,Main Reports,Rapoarte Principale
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +102,Stock Ledger entries balances updated,Stoc Ledger intrări solduri actualizate
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,Până în prezent nu poate fi înainte de data
 DocType: Purchase Receipt Item,Prevdoc DocType,Prevdoc Doctype
-apps/erpnext/erpnext/stock/doctype/item/item.js +176,Add / Edit Prices,Adăugați / editați preturi
+apps/erpnext/erpnext/stock/doctype/item/item.js +178,Add / Edit Prices,Adăugați / editați preturi
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +53,Chart of Cost Centers,Grafic Centre de Cost
 ,Requested Items To Be Ordered,Elemente solicitate să fie comandate
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +298,My Orders,Comenzile mele
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +293,My Orders,Comenzile mele
 DocType: Price List,Price List Name,Lista de prețuri Nume
 DocType: Time Log,For Manufacturing,Pentru Producție
-apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +70,Totals,Totaluri
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +174,Totals,Totaluri
 DocType: BOM,Manufacturing,De fabricație
 ,Ordered Items To Be Delivered,Comandat de elemente pentru a fi livrate
 DocType: Account,Income,Venit
 ,Setup Wizard,Setup Wizard
 DocType: Industry Type,Industry Type,Industrie Tip
 apps/erpnext/erpnext/templates/includes/cart.js +137,Something went wrong!,Ceva a mers prost!
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +68,Warning: Leave application contains following block dates,Atenție: Lăsați aplicație conține următoarele date de bloc
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +251,Sales Invoice {0} has already been submitted,Factură de vânzări {0} a fost deja prezentat
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +100,Warning: Leave application contains following block dates,Atenție: Lăsați aplicație conține următoarele date de bloc
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +256,Sales Invoice {0} has already been submitted,Factură de vânzări {0} a fost deja prezentat
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,Data Finalizare
 DocType: Purchase Invoice Item,Amount (Company Currency),Sumă (monedă companie)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +10,Die casting,Turnarea
 DocType: Email Alert,Reference Date,Data de referință
 apps/erpnext/erpnext/config/hr.py +105,Organization unit (department) master.,Unitate de organizare (departament) maestru.
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +25,Please enter valid mobile nos,Va rugam sa introduceti nos mobile valabile
 DocType: Budget Detail,Budget Detail,Detaliu buget
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +75,Please enter message before sending,Vă rugăm să introduceți mesajul înainte de trimitere
 DocType: Async Task,Status,Stare
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +65,Stock UOM updated for Item {0},Stoc UOM actualizate pentru postul {0}
 DocType: Company History,Year,An
 apps/erpnext/erpnext/config/accounts.py +127,Point-of-Sale Profile,Punctul de vânzare profil
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +68,Please Update SMS Settings,Vă rugăm să actualizați Setări SMS
@@ -3687,12 +3539,12 @@
 ,Serial No Service Contract Expiry,Serial Nu Service Contract de expirare
 DocType: Item,Unit of Measure Conversion,Unitate de măsură de conversie
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +86,Employee can not be changed,Angajat nu poate fi schimbat
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +259,You cannot credit and debit same account at the same time,"Nu puteți credit și de debit același cont, în același timp,"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,You cannot credit and debit same account at the same time,"Nu puteți credit și de debit același cont, în același timp,"
 DocType: Naming Series,Help HTML,Ajutor HTML
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},Weightage total alocat este de 100%. Este {0}
 apps/erpnext/erpnext/controllers/status_updater.py +140,Allowance for over-{0} crossed for Item {1},Alocație mai mare decât -{0} anulată pentru articolul {1}
 DocType: Address,Name of person or organization that this address belongs to.,Nume de persoană sau organizație care această adresă aparține.
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +587,Your Suppliers,Furnizorii dumneavoastră
+apps/erpnext/erpnext/public/js/setup_wizard.js +325,Your Suppliers,Furnizorii dumneavoastră
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,Nu se poate seta pierdut deoarece se intocmeste comandă de vânzări.
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +65,Another Salary Structure {0} is active for employee {1}. Please make its status 'Inactive' to proceed.,"O altă structură salarială {0} este activă pentru angajatul {1}. Vă rugăm să îi setaţi statusul ""inactiv"" pentru a continua."
 DocType: Purchase Invoice,Contact,Persoana de Contact
@@ -3701,37 +3553,35 @@
 DocType: Item,Has Serial No,Are nr. de serie
 DocType: Employee,Date of Issue,Data Problemei
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +16,{0}: From {0} for {1},{0}: de la {0} pentru {1}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +154,Row #{0}: Set Supplier for item {1},Row # {0}: Set Furnizor de produs {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +149,Row #{0}: Set Supplier for item {1},Row # {0}: Set Furnizor de produs {1}
 DocType: Issue,Content Type,Tip Conținut
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +17,Computer,Computer
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,Computer
 DocType: Item,List this Item in multiple groups on the website.,Listeaza acest articol in grupuri multiple de pe site-ul.\
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +283,Please check Multi Currency option to allow accounts with other currency,Vă rugăm să verificați Multi opțiune de valuta pentru a permite conturi cu altă valută
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +285,Please check Multi Currency option to allow accounts with other currency,Vă rugăm să verificați Multi opțiune de valuta pentru a permite conturi cu altă valută
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +62,Item: {0} does not exist in the system,Postul: {0} nu există în sistemul
 apps/erpnext/erpnext/accounts/doctype/account/account.py +81,You are not authorized to set Frozen value,Nu esti autorizat pentru a configura valoarea Congelat
 DocType: Payment Reconciliation,Get Unreconciled Entries,Ia nereconciliate Entries
 DocType: Cost Center,Budgets,Bugete
 apps/frappe/frappe/core/page/modules_setup/modules_setup.py +11,Updated,Actualizat
 DocType: Employee,Emergency Contact Details,Detalii Contact de Urgență
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +396,What does it do?,Ce face?
+apps/erpnext/erpnext/public/js/setup_wizard.js +144,What does it do?,Ce face?
 DocType: Delivery Note,To Warehouse,Pentru Warehouse
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +45,Account {0} has been entered more than once for fiscal year {1},Contul {0} a fost introdus de mai multe ori pentru anul fiscal {1}
 ,Average Commission Rate,Rată de comision medie
-apps/erpnext/erpnext/stock/doctype/item/item.py +313,'Has Serial No' can not be 'Yes' for non-stock item,'Are numarul de serie' nu poate fi 'Da' pentru articolele care nu sunt in stoc
+apps/erpnext/erpnext/stock/doctype/item/item.py +317,'Has Serial No' can not be 'Yes' for non-stock item,'Are numarul de serie' nu poate fi 'Da' pentru articolele care nu sunt in stoc
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Attendance can not be marked for future dates,Prezenţa nu poate fi consemnată pentru date viitoare
 DocType: Pricing Rule,Pricing Rule Help,Regula de stabilire a prețurilor de ajutor
 DocType: Purchase Taxes and Charges,Account Head,Titularul Contului
 apps/erpnext/erpnext/config/stock.py +79,Update additional costs to calculate landed cost of items,Actualizati costuri suplimentare pentru a calcula costul aterizat de articole
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +111,Electrical,Electric
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +111,Electrical,Electric
 DocType: Stock Entry,Total Value Difference (Out - In),Diferența Valoarea totală (Out - In)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +302,Row {0}: Exchange Rate is mandatory,Row {0}: Exchange Rate este obligatorie
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +304,Row {0}: Exchange Rate is mandatory,Row {0}: Exchange Rate este obligatorie
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},ID-ul de utilizator nu este setat pentru Angajat {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +72,Peening,Prelucrare stropire
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,From Warranty Claim,De la garanție revendicarea
 DocType: Stock Entry,Default Source Warehouse,Depozit Sursa Implicit
 DocType: Item,Customer Code,Cod client
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +212,Birthday Reminder for {0},Memento dată naştere pentru {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +163,Lapping,Lepuit
-apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.js +8,Days Since Last Order,Zile de la ultima comandă
+apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +72,Days Since Last Order,Zile de la ultima comandă
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +299,Debit To account must be a Balance Sheet account,Debit la contul trebuie să fie un cont de bilanț
 DocType: Buying Settings,Naming Series,Naming Series
 DocType: Leave Block List,Leave Block List Name,Denumire Lista Concedii Blocate
@@ -3745,7 +3595,7 @@
 DocType: Notification Control,Sales Invoice Message,Factură de vânzări Mesaj
 DocType: Authorization Rule,Based On,Bazat pe
 DocType: Sales Order Item,Ordered Qty,Ordonat Cantitate
-apps/erpnext/erpnext/stock/doctype/item/item.py +539,Item {0} is disabled,Postul {0} este dezactivat
+apps/erpnext/erpnext/stock/doctype/item/item.py +543,Item {0} is disabled,Postul {0} este dezactivat
 DocType: Stock Settings,Stock Frozen Upto,Stoc Frozen Până la
 apps/erpnext/erpnext/controllers/recurring_document.py +166,Period From and Period To dates mandatory for recurring {0},Perioada de la si perioadă la datele obligatorii pentru recurente {0}
 apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,Activitatea de proiect / sarcină.
@@ -3755,7 +3605,6 @@
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,Reducerea trebuie să fie mai mică de 100
 DocType: ToDo,Low,Scăzut
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Scrie Off Suma (Compania de valuta)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +71,Spinning,Spinning
 DocType: Landed Cost Voucher,Landed Cost Voucher,Voucher Cost Landed
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +55,Please set {0},Vă rugăm să setați {0}
 DocType: Purchase Invoice,Repeat on Day of Month,Repetați în ziua de Luna
@@ -3777,7 +3626,6 @@
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +37,Campaign Name is required,Denumirea campaniei este necesară
 DocType: Maintenance Visit,Maintenance Date,Data Mentenanta
 DocType: Purchase Receipt Item,Rejected Serial No,Respins de ordine
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +51,Deep drawing,Ambutisare
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +40,New Newsletter,Noi Newsletter
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +157,Start date should be less than end date for Item {0},Data de începere trebuie să fie mai mică decât data de sfârșit pentru postul {0}
 apps/erpnext/erpnext/stock/doctype/item/item.js +17,Show Balance,Arată Balanța
@@ -3788,7 +3636,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +119,BOM and Manufacturing Quantity are required,BOM și cantitatea de producție sunt necesare
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Clasă de uzură 2
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +450,Amount,Sumă
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +147,Riveting,Nituire
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,BOM înlocuit
 ,Sales Analytics,Analytics de vânzare
 DocType: Manufacturing Settings,Manufacturing Settings,Setări de fabricație
@@ -3800,20 +3647,19 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +207,New Account Name,Nume nou cont
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,Costul materiilor prime livrate
 DocType: Selling Settings,Settings for Selling Module,Setări pentru vânzare Modulul
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +73,Customer Service,Service Client
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Customer Service,Service Client
 DocType: Item,Thumbnail,Miniatură
 DocType: Item Customer Detail,Item Customer Detail,Detaliu Articol Client
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +147,Confirm Your Email,Confirmați Email-ul dvs.
 apps/erpnext/erpnext/config/hr.py +53,Offer candidate a Job.,Oferta candidat un loc de muncă.
 DocType: Notification Control,Prompt for Email on Submission of,Prompt de e-mail pe Depunerea
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +81,Total allocated leaves are more than days in the period,TOTAL frunze alocate sunt mai mult decât zile în perioada
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +70,Item {0} must be a stock Item,Articolul {0} trebuie să fie un Articol de Stoc
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,Implicit Lucrări în depozit Progress
 apps/erpnext/erpnext/config/accounts.py +107,Default settings for accounting transactions.,Setări implicite pentru tranzacțiile de contabilitate.
 apps/frappe/frappe/model/naming.py +40,{0} is required,{0} este necesar
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +21,Vacuum molding,Turnare sub vid
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,Data Preconizata nu poate fi anterioara Datei Cererii de Materiale
 DocType: Contact Us Settings,City,Oraș
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +132,Ultrasonic machining,Prelucrare cu ultrasunete
 apps/frappe/frappe/templates/base.html +137,Error: Not a valid id?,Eroare: Nu a id valid?
 apps/erpnext/erpnext/stock/get_item_details.py +125,Item {0} must be a Sales Item,Articolul {0} trebuie să fie un Articol de Vânzări
 DocType: Naming Series,Update Series Number,Actualizare Serii Număr
@@ -3821,7 +3667,7 @@
 DocType: Sales Order,Printing Details,Imprimare Detalii
 DocType: Task,Closing Date,Data de Inchidere
 DocType: Sales Order Item,Produced Quantity,Produs Cantitate
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +84,Engineer,Inginer
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Engineer,Inginer
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,Căutare subansambluri
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +379,Item Code required at Row No {0},Cod Articol necesar la inregistrarea Nr. {0}
 DocType: Sales Partner,Partner Type,Tip partener
@@ -3829,7 +3675,7 @@
 DocType: Authorization Rule,Customerwise Discount,Reducere Client
 DocType: Purchase Invoice,Against Expense Account,Comparativ contului de cheltuieli
 DocType: Production Order,Production Order,Număr Comandă Producţie:
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +258,Installation Note {0} has already been submitted,Instalarea Nota {0} a fost deja prezentat
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +263,Installation Note {0} has already been submitted,Instalarea Nota {0} a fost deja prezentat
 DocType: Quotation Item,Against Docname,Comparativ denumirii documentului
 DocType: SMS Center,All Employee (Active),Toți angajații (activi)
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,Vizualizează acum
@@ -3838,19 +3684,19 @@
 DocType: Item,Re-Order Level,Nivelul de re-comandă
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,Introduceti articole și cant planificată pentru care doriți să intocmiti ordine de producție sau sa descărcati materii prime pentru analiză.
 apps/frappe/frappe/public/js/frappe/views/ganttview.js +45,Gantt Chart,Diagrama Gantt
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +57,Part-time,Part-time
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,Part-time,Part-time
 DocType: Employee,Applicable Holiday List,Listă de concedii aplicabile
 DocType: Employee,Cheque,Cheque
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,Seria Actualizat
 apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Report Type is mandatory,Tip de raport este obligatorie
 DocType: Item,Serial Number Series,Serial Number Series
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},Depozit este obligatorie pentru stocul de postul {0} în rândul {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +45,Retail & Wholesale,Retail & Wholesale
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,Retail & Wholesale
 DocType: Issue,First Responded On,Primul Răspuns la
 DocType: Website Item Group,Cross Listing of Item in multiple groups,Crucea Listarea de punctul în mai multe grupuri
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +351,The First User: You,Primul utilizator:
+apps/erpnext/erpnext/public/js/setup_wizard.js +101,The First User: You,Primul utilizator:
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +48,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},Data începerii anului fiscal și se termină anul fiscal la data sunt deja stabilite în anul fiscal {0}
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +172,Successfully Reconciled,Împăcați cu succes
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +119,Successfully Reconciled,Împăcați cu succes
 DocType: Production Order,Planned End Date,Planificate Data de încheiere
 apps/erpnext/erpnext/config/stock.py +43,Where items are stored.,În cazul în care elementele sunt stocate.
 DocType: Tax Rule,Validity,Valabilitate
@@ -3870,39 +3716,36 @@
 DocType: DocPerm,Level,Nivel
 DocType: Purchase Taxes and Charges,On Net Total,Pe net total
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +160,Target warehouse in row {0} must be same as Production Order,Depozit țintă în rândul {0} trebuie să fie același ca și de producție de comandă
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +59,No permission to use Payment Tool,Nu permisiunea de a utiliza plată Tool
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +97,No permission to use Payment Tool,Nu permisiunea de a utiliza plată Tool
 apps/erpnext/erpnext/controllers/recurring_document.py +192,'Notification Email Addresses' not specified for recurring %s,"'Adresele de email pentru notificari', nespecificate pentru factura recurenta %s"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +86,Milling,Frezare
 apps/erpnext/erpnext/accounts/doctype/account/account.py +99,Currency can not be changed after making entries using some other currency,Moneda nu poate fi schimbat după efectuarea înregistrări folosind un altă valută
 DocType: Company,Round Off Account,Rotunji cont
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +60,Nibbling,Ciugulit
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,Cheltuieli administrative
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +18,Consulting,Consilia
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +18,Consulting,Consilia
 DocType: Customer Group,Parent Customer Group,Părinte Client Group
 apps/erpnext/erpnext/public/js/pos/pos.js +429,Change,Schimbare
 DocType: Purchase Invoice,Contact Email,Email Persoana de Contact
 DocType: Appraisal Goal,Score Earned,Scor Earned
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +393,"e.g. ""My Company LLC""","de exemplu ""My Company LLC """
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +173,Notice Period,Perioada De Preaviz
+apps/erpnext/erpnext/public/js/setup_wizard.js +141,"e.g. ""My Company LLC""","de exemplu ""My Company LLC """
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +173,Notice Period,Perioada De Preaviz
 DocType: Bank Reconciliation Detail,Voucher ID,ID Voucher
 apps/erpnext/erpnext/setup/doctype/territory/territory.js +14,This is a root territory and cannot be edited.,Acesta este un teritoriu rădăcină și nu pot fi editate.
 DocType: Packing Slip,Gross Weight UOM,Greutate Brută UOM
 DocType: Email Digest,Receivables / Payables,Creanțe / Datorii
 DocType: Delivery Note Item,Against Sales Invoice,Comparativ facturii de vânzări
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +63,Stamping,Ștanțare
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +457,Credit Account,Cont de credit
 DocType: Landed Cost Item,Landed Cost Item,Cost Final Articol 
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +56,Show zero values,Afiseaza valorile nule
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,Cantitatea de produs obținut după fabricarea / reambalare de la cantități date de materii prime
 DocType: Payment Reconciliation,Receivable / Payable Account,De încasat de cont / de plătit
 DocType: Delivery Note Item,Against Sales Order Item,Comparativ articolului comenzii de vânzări
-apps/erpnext/erpnext/stock/doctype/item/item.py +521,Please specify Attribute Value for attribute {0},Vă rugăm să specificați Atribut Valoare pentru atribut {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +525,Please specify Attribute Value for attribute {0},Vă rugăm să specificați Atribut Valoare pentru atribut {0}
 DocType: Item,Default Warehouse,Depozit Implicit
 DocType: Task,Actual End Date (via Time Logs),Dată efectivă de sfârşit (prin Jurnale de Timp)
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +37,Budget cannot be assigned against Group Account {0},Buget nu pot fi atribuite în Grupa Contul {0}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +23,Please enter parent cost center,Vă rugăm să introduceți centru de cost părinte
 DocType: Delivery Note,Print Without Amount,Imprima Fără Suma
-apps/erpnext/erpnext/controllers/buying_controller.py +69,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,"Taxa Categoria nu poate fi ""de evaluare"" sau ""de evaluare și total"", ca toate elementele sunt produse non-stoc"
+apps/erpnext/erpnext/controllers/buying_controller.py +60,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,"Taxa Categoria nu poate fi ""de evaluare"" sau ""de evaluare și total"", ca toate elementele sunt produse non-stoc"
 DocType: User,Last Name,Nume
 DocType: Web Page,Left,Stânga
 DocType: Event,All Day,Toată ziua
@@ -3910,7 +3753,7 @@
 DocType: Appraisal,Total Score (Out of 5),Scor total (din 5)
 DocType: Contact Us Settings,State,Stat
 DocType: Batch,Batch,Lot
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +51,Balance,Bilanţ
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +28,Balance,Bilanţ
 DocType: Project,Total Expense Claim (via Expense Claims),Revendicarea Total cheltuieli (prin formularele de decont)
 DocType: User,Gender,Sex
 DocType: Journal Entry,Debit Note,Nota de Debit
@@ -3940,8 +3783,7 @@
 DocType: Purchase Order,Get Last Purchase Rate,Obtine Ultima Rate de Cumparare
 DocType: Time Log,Billing Rate based on Activity Type (per hour),Rata de facturare bazat pe activitatea de tip (pe oră)
 DocType: Company,Company Info,Informatii Companie
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +76,Seaming,Fălțuire
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +197,"Company Email ID not found, hence mail not sent","ID-ul de e-mail al Companiei nu a fost găsit, prin urmare, e-mail nu a fost trimis"
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +206,"Company Email ID not found, hence mail not sent","ID-ul de e-mail al Companiei nu a fost găsit, prin urmare, e-mail nu a fost trimis"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Aplicţie a fondurilor (active)
 DocType: Production Planning Tool,Filter based on item,Filtru bazata pe articol
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +451,Debit Account,Contul debit
@@ -3953,17 +3795,16 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +95,{0} {1} has been modified. Please refresh.,{0} {1} a fost modificat. Vă rugăm să reîmprospătați.
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,Opri utilizatorii de la a face aplicații concediu pentru următoarele zile.
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +591,From Opportunity,Din Oportunitate
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +46,Blanking,Înnegrire
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +166,Employee Benefits,Beneficiile angajatului
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,Employee Benefits,Beneficiile angajatului
 DocType: Sales Invoice,Is POS,Este POS
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +240,Packed quantity must equal quantity for Item {0} in row {1},Cantitate ambalate trebuie să fie egală cantitate pentru postul {0} în rândul {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +245,Packed quantity must equal quantity for Item {0} in row {1},Cantitate ambalate trebuie să fie egală cantitate pentru postul {0} în rândul {1}
 DocType: Production Order,Manufactured Qty,Produs Cantitate
 DocType: Purchase Receipt Item,Accepted Quantity,Cantitatea Acceptata
 apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} nu există
 apps/erpnext/erpnext/config/accounts.py +18,Bills raised to Customers.,Facturi cu valoarea ridicată pentru clienți.
 DocType: DocField,Default,Implicit
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Id-ul proiectului
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +466,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Rândul nr {0}: Suma nu poate fi mai mare decât așteptarea Suma împotriva revendicării cheltuieli {1}. În așteptarea Suma este {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +468,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Rândul nr {0}: Suma nu poate fi mai mare decât așteptarea Suma împotriva revendicării cheltuieli {1}. În așteptarea Suma este {2}
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +40,{0} subscribers added,{0} abonați adăugați
 DocType: Maintenance Schedule,Schedule,Program
 DocType: Cost Center,"Define Budget for this Cost Center. To set budget action, see ""Company List""","Definirea Bugetul pentru acest centru de cost. Pentru a seta o acțiune buget, consultați &quot;Lista Firme&quot;"
@@ -3974,7 +3815,7 @@
 apps/erpnext/erpnext/public/js/pos/pos.js +91,Price List not found or disabled,Lista de preturi nu a fost găsit sau cu handicap
 DocType: Expense Claim,Approved,Aprobat
 DocType: Pricing Rule,Price,Preț
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +79,Employee relieved on {0} must be set as 'Left',Angajat eliberat din finctie pe {0} trebuie să fie setat ca 'Plecat'
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +88,Employee relieved on {0} must be set as 'Left',Angajat eliberat din finctie pe {0} trebuie să fie setat ca 'Plecat'
 DocType: Item,"Selecting ""Yes"" will give a unique identity to each entity of this item which can be viewed in the Serial No master.","Selectând ""Da"", va da o identitate unică pentru fiecare entitate din acest articol, care poate fi vizualizat în ordine maestru."
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +39,Appraisal {0} created for Employee {1} in the given date range,Expertiza {0} creată pentru angajatul {1} în intervalul de timp dat
 DocType: Employee,Education,Educație
@@ -3985,7 +3826,7 @@
 apps/frappe/frappe/desk/moduleview.py +67,Standard Reports,Rapoarte standard
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,Inregistrari contabile de jurnal.
 DocType: Delivery Note Item,Available Qty at From Warehouse,Cantitate Disponibil la Depozitul
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +209,Please select Employee Record first.,Vă rugăm să selectați Angajat Înregistrare întâi.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +224,Please select Employee Record first.,Vă rugăm să selectați Angajat Înregistrare întâi.
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +35,To create a Tax Account,Pentru a crea un cont fiscală
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +233,Please enter Expense Account,Va rugam sa introduceti cont de cheltuieli
 DocType: Account,Stock,Stoc
@@ -3997,46 +3838,43 @@
 DocType: Sales Order,Track this Sales Order against any Project,Urmareste acest Ordin de vânzări față de orice proiect
 DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,"Trage comenzi de vânzări (în curs de a livra), pe baza criteriilor de mai sus"
 DocType: DocShare,Document Type,Tip Document
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +565,From Supplier Quotation,Din Furnizor de Ofertă
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +588,From Supplier Quotation,Din Furnizor de Ofertă
 DocType: Deduction Type,Deduction Type,Tip Deducerea
 DocType: Attendance,Half Day,Jumătate de zi
 DocType: Pricing Rule,Min Qty,Min Cantitate
 DocType: Features Setup,"To track items in sales and purchase documents with batch nos. ""Preferred Industry: Chemicals""","Pentru a urmări articolele din acte vânzare-cumpărare, cu nr de lot. &quot;Industrie preferate: Produse chimice&quot;"
 DocType: GL Entry,Transaction Date,Data tranzacției
 DocType: Production Plan Item,Planned Qty,Planificate Cantitate
-apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +91,Total Tax,Taxa totală
+apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +93,Total Tax,Taxa totală
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +178,For Quantity (Manufactured Qty) is mandatory,Pentru Cantitate (fabricat Cant) este obligatorie
 DocType: Stock Entry,Default Target Warehouse,Depozit Tinta Implicit
 DocType: Purchase Invoice,Net Total (Company Currency),Net total (Compania de valuta)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +79,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Row {0}: Partidul Tip și Partidul se aplică numai împotriva creanțe / cont de plati
 DocType: Notification Control,Purchase Receipt Message,Primirea de cumpărare Mesaj
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +95,Total allocated leaves are more than period,Total frunze alocate sunt mai mult decât perioada de
 DocType: Production Order,Actual Start Date,Dată Efectivă de Început
 DocType: Sales Order,% of materials delivered against this Sales Order,% din materialele livrate comparativ cu această comandă de vânzări
 apps/erpnext/erpnext/config/stock.py +23,Record item movement.,Mișcare element înregistrare.
 DocType: Newsletter List Subscriber,Newsletter List Subscriber,Newsletter Listă Abonat
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +164,Morticing,Mortezat
 DocType: Email Account,Service,Servicii
 DocType: Hub Settings,Hub Settings,Setări Hub
 DocType: Project,Gross Margin %,Marja Bruta%
 DocType: BOM,With Operations,Cu Operațiuni
 apps/erpnext/erpnext/accounts/party.py +232,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Înregistrări contabile au fost deja efectuate în valută {0} pentru compania {1}. Vă rugăm să selectați un cont de primit sau de plătit cu moneda {0}.
 ,Monthly Salary Register,Salariul lunar Inregistrare
-apps/frappe/frappe/website/template.py +140,Next,Următor
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard_page.html +17,Next,Următor
 DocType: Warranty Claim,If different than customer address,In cazul in care difera de adresa clientului
 DocType: BOM Operation,BOM Operation,Operațiune BOM
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +118,Electropolishing,Electrochimică
 DocType: Purchase Taxes and Charges,On Previous Row Amount,La rândul precedent Suma
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +24,Please enter Payment Amount in atleast one row,Va rugam sa introduceti Plata Suma în atleast rând una
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +33,Please enter Payment Amount in atleast one row,Va rugam sa introduceti Plata Suma în atleast rând una
 DocType: POS Profile,POS Profile,POS Profil
 apps/erpnext/erpnext/config/accounts.py +153,"Seasonality for setting budgets, targets etc.","Sezonalitatea pentru stabilirea bugetelor, obiective etc."
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +238,Row {0}: Payment Amount cannot be greater than Outstanding Amount,Rând {0}: Plata Suma nu poate fi mai mare de Impresionant Suma
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +46,Total Unpaid,Totală neremunerată
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +21,Time Log is not billable,Timpul Conectare nu este facturabile
 apps/erpnext/erpnext/stock/get_item_details.py +128,"Item {0} is a template, please select one of its variants","Postul {0} este un șablon, vă rugăm să selectați unul dintre variantele sale"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +528,Purchaser,Cumpărător
+apps/erpnext/erpnext/public/js/setup_wizard.js +272,Purchaser,Cumpărător
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +81,Net pay cannot be negative,Salariul net nu poate fi negativ
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +71,Please enter the Against Vouchers manually,Va rugam sa introduceti pe baza documentelor justificative manual
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +107,Please enter the Against Vouchers manually,Va rugam sa introduceti pe baza documentelor justificative manual
 DocType: SMS Settings,Static Parameters,Parametrii statice
 DocType: Purchase Order,Advance Paid,Avans plătit
 DocType: Item,Item Tax,Taxa Articol
@@ -4045,14 +3883,12 @@
 apps/erpnext/erpnext/config/crm.py +48,Send mass SMS to your contacts,Trimite SMS-uri în masă a persoanelor de contact
 DocType: Purchase Taxes and Charges,Consider Tax or Charge for,Considerare Taxa sau Cost pentru
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,Cantitatea efectivă este obligatorie
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +42,Cross-rolling,Cross-laminare
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +132,Credit Card,Card de Credit
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +132,Credit Card,Card de Credit
 DocType: BOM,Item to be manufactured or repacked,Articol care urmează să fie fabricat sau reambalat
 apps/erpnext/erpnext/config/stock.py +95,Default settings for stock transactions.,Setări implicite pentru tranzacțiile bursiere.
 DocType: Purchase Invoice,Next Date,Data viitoare
 DocType: Employee Education,Major/Optional Subjects,Subiecte Majore / Opționale
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +49,Please enter Taxes and Charges,Va rugam sa introduceti impozite și taxe
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +85,Machining,Prelucrare
 DocType: Sales Invoice Item,Drop Ship,Drop navelor
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","Aici puteți stoca detalii despre familie, cum ar fi numele și ocupația parintelui, sotului/sotiei și copiilor"
 DocType: Hub Settings,Seller Name,Nume vânzător
@@ -4062,7 +3898,7 @@
 DocType: Stock Entry,Repack,Reambalați
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +6,You must Save the form before proceeding,Trebuie să salvați formularul înainte de a începe
 DocType: Item Attribute,Numeric Values,Valori numerice
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +500,Attach Logo,Atașați logo
+apps/erpnext/erpnext/public/js/setup_wizard.js +246,Attach Logo,Atașați logo
 DocType: Customer,Commission Rate,Rata de Comision
 apps/erpnext/erpnext/stock/doctype/item/item.js +38,Make Variant,Face Varianta
 apps/erpnext/erpnext/config/hr.py +145,Block leave applications by department.,Blocaţi cereri de concediu pe departamente.
@@ -4077,19 +3913,19 @@
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +105,Please select a csv file,Vă rugăm să selectați un fișier csv
 DocType: Dropbox Backup,Send Backups to Dropbox,Trimite Backup pentru Dropbox
 DocType: Purchase Order,To Receive and Bill,Pentru a primi și Bill
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +94,Designer,Proiectant
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Designer,Proiectant
 apps/erpnext/erpnext/config/selling.py +121,Terms and Conditions Template,Termeni și condiții Format
 DocType: Serial No,Delivery Details,Detalii Livrare
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +383,Cost Center is required in row {0} in Taxes table for type {1},Centrul de Cost este necesar pentru inregistrarea {0} din tabelul Taxe pentru tipul {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +386,Cost Center is required in row {0} in Taxes table for type {1},Centrul de Cost este necesar pentru inregistrarea {0} din tabelul Taxe pentru tipul {1}
 DocType: Item,Automatically create Material Request if quantity falls below this level,Crea automat Material Cerere dacă cantitate scade sub acest nivel
 ,Item-wise Purchase Register,Registru Achizitii Articol-Avizat
 DocType: Batch,Expiry Date,Data expirării
-apps/erpnext/erpnext/stock/doctype/item/item.py +375,"To set reorder level, item must be a Purchase Item or Manufacturing Item","Pentru a seta nivelul de reordona, element trebuie să fie un articol de cumparare sau de fabricație Postul"
+apps/erpnext/erpnext/stock/doctype/item/item.py +379,"To set reorder level, item must be a Purchase Item or Manufacturing Item","Pentru a seta nivelul de reordona, element trebuie să fie un articol de cumparare sau de fabricație Postul"
 ,Supplier Addresses and Contacts,Adrese furnizorului și de Contacte
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,Vă rugăm să selectați categoria întâi
 apps/erpnext/erpnext/config/projects.py +18,Project master.,Maestru proiect.
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,Nu afisa nici un simbol de genul $ etc alături de valute.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +330, (Half Day),(Jumatate de zi)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +374, (Half Day),(Jumatate de zi)
 DocType: Supplier,Credit Days,Zile de Credit
 DocType: Leave Type,Is Carry Forward,Este Carry Forward
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +478,Get Items from BOM,Obține articole din FDM
@@ -4097,7 +3933,7 @@
 apps/erpnext/erpnext/config/manufacturing.py +120,Bill of Materials,Proiect de lege de materiale
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +77,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Row {0}: Partidul Tipul și Partidul este necesar pentru creanțe / cont plateste {1}
 DocType: Dropbox Backup,Send Notifications To,Trimite notificări
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html +26,Ref Date,Ref Data
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +54,Ref Date,Ref Data
 DocType: Employee,Reason for Leaving,Motiv pentru Lăsând
 DocType: Expense Claim Detail,Sanctioned Amount,Sancționate Suma
 DocType: GL Entry,Is Opening,Se deschide
@@ -4105,4 +3941,3 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +188,Account {0} does not exist,Contul {0} nu există
 DocType: Account,Cash,Numerar
 DocType: Employee,Short biography for website and other publications.,Scurta biografie pentru site-ul web și alte publicații.
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +31,Please create Salary Structure for employee {0},Vă rugăm să creați Structura Salariul pentru angajat {0}
diff --git a/erpnext/translations/ru.csv b/erpnext/translations/ru.csv
index 8527e27..f2a1c16 100644
--- a/erpnext/translations/ru.csv
+++ b/erpnext/translations/ru.csv
@@ -1,13 +1,12 @@
 DocType: Employee,Salary Mode,Режим Зарплата
 DocType: Cost Center,"Select Monthly Distribution, if you want to track based on seasonality.","Выберите ежемесячное распределение, если вы хотите, чтобы отслеживать на основе сезонности."
 DocType: Employee,Divorced,Разведенный
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +86,Warning: Same item has been entered multiple times.,Внимание: То же пункт был введен несколько раз.
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +80,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,Разрешить пункт будет добавлен несколько раз в сделке
 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/page/setup_wizard/fixtures/industry_type.py +19,Consumer Products,Потребительские товары
+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,"Пожалуйста, выберите партии первого типа"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +90,Annealing,Отжиг
 DocType: Item,Customer Items,Предметы клиентов
 apps/erpnext/erpnext/accounts/doctype/account/account.py +45,Account {0}: Parent account {1} can not be a ledger,Счет {0}: Родительский счет {1} не может быть регистром
 DocType: Item,Publish Item to hub.erpnext.com,Опубликовать деталь к hub.erpnext.com
@@ -20,15 +19,14 @@
 DocType: About Us Settings,Website,Сайт
 DocType: POS Profile,Applicable for User,Применимо для пользователя
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +169,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Остановился производственного заказа не может быть отменено, откупоривать сначала отменить"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +23,Compaction plus sintering,Уплотнение плюс спекания
 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.,* Будет рассчитана в сделке.
 DocType: Purchase Order,Customer Contact,Контакты с клиентами
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +549,From Material Request,Из материалов запрос
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +572,From Material Request,Из материалов запрос
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} Дерево
 DocType: Job Applicant,Job Applicant,Соискатель работы
 apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,Нет больше результатов.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +78,Legal,Легальный
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +34,Legal,Легальный
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +114,Actual type tax cannot be included in Item rate in row {0},Фактический тип налога не могут быть включены в стоимость товара в строке {0}
 DocType: C-Form,Customer,Клиент
 DocType: Purchase Receipt Item,Required By,Требуется По
@@ -43,7 +41,6 @@
 DocType: Manufacturing Settings,Default 10 mins,По умолчанию 10 минут
 DocType: Leave Type,Leave Type Name,Оставьте Тип Название
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +148,Series Updated Successfully,Серия Обновлено Успешно
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +150,Stitching,Сшивание
 DocType: Pricing Rule,Apply On,Нанесите на
 DocType: Item Price,Multiple Item prices.,Несколько цены товара.
 ,Purchase Order Items To Be Received,"Покупка Заказ позиции, которые будут получены"
@@ -51,8 +48,8 @@
 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 +104,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 +189,New Leave Application,Новый Оставить заявку
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +134,Bank Draft,Банковский счет
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +204,New Leave Application,Новый Оставить заявку
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +134,Bank Draft,Банковский счет
 DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,1. Используйте данную опцию для поддержания клиентско-удобных кодов и для возможности удобного поиска по ним
 DocType: Mode of Payment Account,Mode of Payment Account,Форма оплаты счета
 apps/erpnext/erpnext/stock/doctype/item/item.js +34,Show Variants,Показать варианты
@@ -64,25 +61,23 @@
 DocType: Production Plan Item,Production Plan Item,Производственный план Пункт
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +141,User {0} is already assigned to Employee {1},Пользователь {0} уже назначен сотрудником {1}
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +13,Make new POS Profile,Создайте новый POS профиля
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +31,Health Care,Здравоохранение
+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 +494,Invoice,Счет-фактура
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +519,Invoice,Счет-фактура
 DocType: Maintenance Schedule Item,Periodicity,Периодичность
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +357,Email Address,Адрес Электронной Почты
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +21,Defense,Оборона
+apps/erpnext/erpnext/public/js/setup_wizard.js +107,Email Address,Адрес Электронной Почты
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,Оборона
 DocType: Company,Abbr,Аббревиатура
 DocType: Appraisal Goal,Score (0-5),Оценка (0-5)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +193,Row {0}: {1} {2} does not match with {3},Ряд {0}: {1} {2} не соответствует {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +67,Row # {0}:,Ряд # {0}:
 DocType: Delivery Note,Vehicle No,Автомобиль №
 apps/erpnext/erpnext/public/js/pos/pos.js +528,Please select Price List,"Пожалуйста, выберите прайс-лист"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +162,Woodworking,Деревообрабатывающий
 DocType: Production Order Operation,Work In Progress,Работа продолжается
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +153,3D printing,3D-печать
 DocType: Employee,Holiday List,Список праздников
 DocType: Time Log,Time Log,Журнал учета времени
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +530,Accountant,Бухгалтер
+apps/erpnext/erpnext/public/js/setup_wizard.js +274,Accountant,Бухгалтер
 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.","Журнал деятельность, осуществляемая пользователей от задач, которые могут быть использованы для отслеживания времени, биллинга."
@@ -98,18 +93,19 @@
 DocType: Bin,Quantity Requested for Purchase,Количество Потребовал для покупки
 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/setup/page/setup_wizard/setup_wizard.js +626,Kg,кг
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Kg,кг
 apps/erpnext/erpnext/config/hr.py +48,Opening for a Job.,Открытие на работу.
 DocType: Item Attribute,Increment,Приращение
 apps/erpnext/erpnext/public/js/stock_analytics.js +63,Select Warehouse...,Выберите Склад ...
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +6,Advertising,Реклама
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,Реклама
+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/doctype/sales_invoice/sales_invoice.py +389,Stock cannot be updated against Delivery Note {0},Фото не могут быть обновлены против накладной {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +391,Stock cannot be updated against Delivery Note {0},Фото не могут быть обновлены против накладной {0}
 DocType: Payment Reconciliation,Reconcile,Согласовать
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +30,Grocery,Продуктовый
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,Продуктовый
 DocType: Quality Inspection Reading,Reading 1,Чтение 1
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Make Bank Entry,Сделать Банк Стажер
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +40,Pension Funds,Пенсионные фонды
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,Пенсионные фонды
 apps/erpnext/erpnext/accounts/doctype/account/account.py +142,Warehouse is mandatory if account type is Warehouse,"Склад является обязательным, если тип учетной записи: Склад"
 DocType: SMS Center,All Sales Person,Все менеджеры по продажам
 DocType: Lead,Person Name,Имя лица
@@ -131,7 +127,7 @@
 DocType: Quality Inspection,Get Specification Details,Получить спецификации подробно
 DocType: Lead,Interested,Заинтересованный
 apps/erpnext/erpnext/config/manufacturing.py +14,Bill of Material,Накладная на материалы
-apps/erpnext/erpnext/public/js/stock_analytics.js +45,Opening,Открытие
+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,Скопируйте Из группы товаров
 DocType: Journal Entry,Opening Entry,Открытие запись
@@ -145,23 +141,22 @@
 DocType: Employee Education,Under Graduate,Под Выпускник
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +22,Target On,Целевая На
 DocType: BOM,Total Cost,Общая стоимость
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +99,Reaming,Развертывание
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +9,Activity Log:,Журнал активности:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +199,Item {0} does not exist in the system or has expired,"Пункт {0} не существует в системе, или истек"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +44,Real Estate,Недвижимость
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +44,Real Estate,Недвижимость
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +4,Statement of Account,Выписка по счету
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +41,Pharmaceuticals,Фармацевтика
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,Фармацевтика
 DocType: Expense Claim Detail,Claim Amount,Сумма претензии
 DocType: Employee,Mr,Г-н
 DocType: Custom Script,Client,Клиент
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,Тип Поставщик / Поставщик
 DocType: Naming Series,Prefix,Префикс
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Consumable,Потребляемый
+apps/erpnext/erpnext/public/js/setup_wizard.js +359,Consumable,Потребляемый
 DocType: Upload Attendance,Import Log,Лог импорта
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.js +19,Send,Отправить
 DocType: Sales Invoice Item,Delivered By Supplier,Поставляется Поставщиком
 DocType: SMS Center,All Contact,Все Связаться
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +164,Annual Salary,Годовой оклад
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +164,Annual Salary,Годовой оклад
 DocType: Period Closing Voucher,Closing Fiscal Year,Закрытие финансового года
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +69,Stock Expenses,Акции Расходы
 DocType: Newsletter,Email Sent?,Отправки сообщения?
@@ -169,7 +164,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +92,Show Time Logs,Показать журналы Время
 DocType: Journal Entry Account,Credit in Company Currency,Кредит в валюте компании
 DocType: Delivery Note,Installation Status,Состояние установки
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +115,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Принято + Отклоненные Кол-во должно быть равно полученного количества по пункту {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +118,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 +133,Item {0} must be a Purchase Item,Пункт {0} должен быть Покупка товара
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
@@ -177,19 +172,17 @@
  Все даты и сотрудник сочетание в выбранный период придет в шаблоне, с существующими посещаемости"
 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 +493,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Для учета налога в строке {0} в размере Item, налоги в строках должны быть также включены {1}"
+apps/erpnext/erpnext/controllers/accounts_controller.py +494,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Для учета налога в строке {0} в размере Item, налоги в строках должны быть также включены {1}"
 apps/erpnext/erpnext/config/hr.py +90,Settings for HR Module,Настройки для модуля HR
 DocType: SMS Center,SMS Center,SMS центр
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +78,Straightening,Выпрямление
 DocType: BOM Replace Tool,New BOM,Новый BOM
 apps/erpnext/erpnext/config/projects.py +28,Batch Time Logs for billing.,Пакетная Журналы Время для оплаты.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +15,Countergravity casting,Литье сифонной
 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/setup/page/setup_wizard/fixtures/industry_type.py +14,Broadcasting,Вещание
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +140,Execution,Реализация
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +364,The first user will become the System Manager (you can change this later).,Первый пользователь будет System Manager (вы можете изменить это позже).
+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/public/js/setup_wizard.js +114,The first user will become the System Manager (you can change this later).,Первый пользователь будет System Manager (вы можете изменить это позже).
 apps/erpnext/erpnext/config/manufacturing.py +39,Details of the operations carried out.,Информация о выполненных операциях.
 DocType: Serial No,Maintenance Status,Техническое обслуживание Статус
 apps/erpnext/erpnext/config/stock.py +263,Items and Pricing,Предметы и Цены
@@ -206,7 +199,6 @@
 DocType: Pricing Rule,Discount on Price List Rate (%),Скидка на Прайс-лист ставка (%)
 apps/frappe/frappe/public/js/frappe/form/print.js +96,Start,Начать
 DocType: User,First Name,Имя
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +12,Full-mold casting,Литье Полное формы
 DocType: Offer Letter,Select Terms and Conditions,Выберите Сроки и условия
 DocType: Production Planning Tool,Sales Orders,Заказы
 DocType: Purchase Taxes and Charges,Valuation,Оценка
@@ -218,8 +210,7 @@
 DocType: Bank Reconciliation,Bank Account,Банковский счет
 DocType: Leave Type,Allow Negative Balance,Разрешить отрицательное сальдо
 DocType: Selling Settings,Default Territory,По умолчанию Территория
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +53,Television,Телевидение
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +138,Gashing,Наносящий разрез
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,Телевидение
 DocType: Production Order Operation,Updated via 'Time Log',"Обновлено помощью ""Time Вход"""
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +82,Account {0} does not belong to Company {1},Аккаунт {0} не принадлежит компании {1}
 DocType: Naming Series,Series List for this Transaction,Список Серия для этого сделки
@@ -234,14 +225,13 @@
 DocType: Leave Allocation,Add unused leaves from previous allocations,Добавить неиспользуемые листья от предыдущих ассигнований
 apps/erpnext/erpnext/controllers/recurring_document.py +206,Next Recurring {0} will be created on {1},Следующая Периодическая {0} будет создан на {1}
 DocType: Newsletter List,Total Subscribers,Всего Подписчики
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +575,Contact Name,Имя Контакта
+,Contact Name,Имя Контакта
 DocType: Production Plan Item,SO Pending Qty,ТАК В ожидании Кол-во
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Создает ведомость расчета зарплаты за вышеуказанные критерии.
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,Запрос на покупку.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +107,Double housing,Двухместный жилья
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +156,Only the selected Leave Approver can submit this Leave Application,Только выбранный Оставить утверждающий мог представить этот Оставить заявку
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +171,Only the selected Leave Approver can submit this Leave Application,Только выбранный Оставить утверждающий мог представить этот Оставить заявку
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,Освобождение Дата должна быть больше даты присоединения
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +172,Leaves per Year,Листья в год
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +172,Leaves per Year,Листья в год
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup > Settings > Naming Series,"Пожалуйста, установите именования серия для {0} через Setup&gt; Настройки&gt; именования серии"
 DocType: Time Log,Will be updated when batched.,Будет обновляться при пакетном.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +104,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,"Ряд {0}: Пожалуйста, проверьте 'Как Advance ""против счета {1}, если это заранее запись."
@@ -250,25 +240,24 @@
 DocType: Item Website Specification,Item Website Specification,Пункт Сайт Спецификация
 DocType: Dropbox Backup,Dropbox Access Key,Dropbox Ключ доступа
 DocType: Payment Tool,Reference No,Ссылка Нет
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +348,Leave Blocked,Оставьте Заблокированные
-apps/erpnext/erpnext/stock/doctype/item/item.py +535,Item {0} has reached its end of life on {1},Пункт {0} достигла своей жизни на {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +392,Leave Blocked,Оставьте Заблокированные
+apps/erpnext/erpnext/stock/doctype/item/item.py +539,Item {0} has reached its end of life on {1},Пункт {0} достигла своей жизни на {1}
 apps/erpnext/erpnext/accounts/utils.py +339,Annual,За год
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Фото Примирение товара
 DocType: Stock Entry,Sales Invoice No,Счет Продажи Нет
 DocType: Material Request Item,Min Order Qty,Минимальный заказ Кол-во
 DocType: Lead,Do Not Contact,Не обращайтесь
 DocType: Sales Invoice,The unique id for tracking all recurring invoices. It is generated on submit.,Уникальный идентификатор для отслеживания все повторяющиеся счетов-фактур. Он создается на представить.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +93,Software Developer,Разработчик Программного обеспечения
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +93,Software Developer,Разработчик Программного обеспечения
 DocType: Item,Minimum Order Qty,Минимальное количество заказа
 DocType: Pricing Rule,Supplier Type,Тип поставщика
 DocType: Item,Publish in Hub,Опубликовать в Hub
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +555,Item {0} is cancelled,Пункт {0} отменяется
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +598,Material Request,Заказ материалов
+apps/erpnext/erpnext/stock/doctype/item/item.py +559,Item {0} is cancelled,Пункт {0} отменяется
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +607,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} не найден в &quot;давальческое сырье&quot; таблицы в Заказе {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +129,Wire brushing,Проволочной щеткой
 DocType: Employee,Relation,Relation
 DocType: Shipping Rule,Worldwide Shipping,Доставка по всему миру
 apps/erpnext/erpnext/config/selling.py +23,Confirmed orders from Customers.,Подтвержденные заказы от клиентов.
@@ -284,12 +273,11 @@
 DocType: Supplier,Address HTML,Адрес HTML
 DocType: Lead,Mobile No.,Мобильный номер
 DocType: Maintenance Schedule,Generate Schedule,Создать расписание
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +81,Hubbing,Вдавливания
 DocType: Purchase Invoice Item,Expense Head,Расходов Глава
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +86,Please select Charge Type first,"Пожалуйста, выберите Charge Тип первый"
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,Последние
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +395,Max 5 characters,Макс 5 символов
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +195,Select Your Language,Выбор языка
+apps/erpnext/erpnext/public/js/setup_wizard.js +143,Max 5 characters,Макс 5 символов
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +245,Select Your Language,Выбор языка
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,Оставить утверждающий в списке будет установлен по умолчанию Оставить утверждающего
 DocType: Manufacturing Settings,"Disables creation of time logs against Production Orders.
 Operations shall not be tracked against Production Order","Отключение создание временных журналов против производственных заказов. Операции, не будет отслеживаться в отношении производственного заказа"
@@ -301,8 +289,6 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +34,Item {0} must be Service Item,Пункт {0} должно быть Service Элемент
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +303,Completed Qty can not be greater than 'Qty to Manufacture',"Завершен Кол-во не может быть больше, чем ""Кол-во для изготовления"""
 DocType: DocType,Administrator,Администратор
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +136,Laser drilling,Лазерное бурение
-DocType: Stock UOM Replace Utility,New Stock UOM,Новый фонда UOM
 DocType: Period Closing Voucher,Closing Account Head,Закрытие счета руководитель
 DocType: Employee,External Work History,Внешний Работа История
 apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,Циклическая ссылка Ошибка
@@ -311,18 +297,15 @@
 DocType: Lead,Industry,Промышленность
 DocType: Employee,Job Profile,Профиль работы
 DocType: Newsletter,Newsletter,Рассылка новостей
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +84,Hydroforming,Дегидрогенизация нефтепродуктов
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +49,Necking,Образование шейки
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Сообщите по электронной почте по созданию автоматической запрос материалов
 DocType: Journal Entry,Multi Currency,Мульти валюта
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +51,Item is updated,Пункт обновляется
 DocType: Async Task,System Manager,System Manager
 DocType: Payment Reconciliation Invoice,Invoice Type,Тип счета
 DocType: Sales Invoice Item,Delivery Note,· Отметки о доставке
 DocType: Dropbox Backup,Allow Dropbox Access,Разрешить Dropbox Access
 apps/erpnext/erpnext/config/learn.py +72,Setting up Taxes,Настройка Налоги
 apps/erpnext/erpnext/accounts/utils.py +189,Payment Entry has been modified after you pulled it. Please pull it again.,"Оплата запись была изменена после того, как вытащил его. Пожалуйста, вытащить его снова."
-apps/erpnext/erpnext/stock/doctype/item/item.py +343,{0} entered twice in Item Tax,{0} вводится дважды в пункт налог
+apps/erpnext/erpnext/stock/doctype/item/item.py +347,{0} entered twice in Item Tax,{0} вводится дважды в пункт налог
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +105,Summary for this week and pending activities,Резюме на этой неделе и в ожидании деятельности
 DocType: Workstation,Rent Cost,Стоимость аренды
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +74,Please select month and year,"Пожалуйста, выберите месяц и год"
@@ -339,24 +322,22 @@
 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/buying/doctype/purchase_order/purchase_order.js +517,Select Item,Выбрать пункт
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +540,Select Item,Выбрать пункт
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +143,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","Пункт: {0} удалось порционно, не могут быть согласованы с помощью \
  со примирения, вместо этого использовать со запись"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +259,Purchase Invoice {0} is already submitted,Покупка Счет {0} уже подано
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +262,Purchase Invoice {0} is already submitted,Покупка Счет {0} уже подано
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Batch No must be same as {1} {2},"Ряд # {0}: Пакетное Нет должно быть таким же, как {1} {2}"
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Convert to non-Group,Преобразовать в негрупповой
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +55,Purchase Receipt must be submitted,Покупка Получение должны быть представлены
-DocType: Stock UOM Replace Utility,Current Stock UOM,Наличие на складе Единица измерения
 apps/erpnext/erpnext/config/stock.py +53,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}
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Your email address,Ваш адрес электронной почты
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +194,Please see attachment,"Пожалуйста, см. приложение"
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +203,Please see attachment,"Пожалуйста, см. приложение"
 DocType: Purchase Order,% Received,% Получено
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +109,Water jet cutting,Резка струей воды
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +24,Setup Already Complete!!,Настройка Уже завершена!!
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +20,Setup Already Complete!!,Настройка Уже завершена!!
 ,Finished Goods,Готовая продукция
 DocType: Delivery Note,Instructions,Инструкции
 DocType: Quality Inspection,Inspected By,Проверено
@@ -371,6 +352,7 @@
 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,Курс обмена валюты
 DocType: Purchase Invoice Item,Item Name,Название элемента
+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","Пункты, запрашиваемые которые ""Нет на месте"" с учетом всех складов на основе прогнозируемого Кол-во и Минимальное количество заказа"
@@ -380,11 +362,10 @@
 ,Purchase Register,Покупка Становиться на учет
 DocType: Landed Cost Item,Applicable Charges,Взимаемых платежах
 DocType: Workstation,Consumable Cost,Расходные Стоимость
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,{0} ({1}) must have role 'Leave Approver',"{0} ({1}) должен иметь роль ""Подтверждающего Отсутствие"""
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +167,{0} ({1}) must have role 'Leave Approver',"{0} ({1}) должен иметь роль ""Подтверждающего Отсутствие"""
 DocType: Purchase Receipt,Vehicle Date,Дата
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +39,Medical,Медицинский
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +39,Medical,Медицинский
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,Причина потери
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +36,Tube beading,Труба бисером
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},Рабочая станция закрыта в следующие сроки согласно Список праздников: {0}
 DocType: Employee,Single,Единственный
 DocType: Issue,Attachment,Привязанность
@@ -405,10 +386,8 @@
 DocType: Account,Is Group,Является Группа
 DocType: Stock Settings,Automatically Set Serial Nos based on FIFO,Автоматически указан серийный пп на основе FIFO
 DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,Проверьте Поставщик Номер счета Уникальность
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +31,Thermoforming,Термоформования
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +66,Slitting,Продольная резка
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +57,'To Case No.' cannot be less than 'From Case No.',"""До Дела №"" не может быть меньше, чем ""От Дела №"""
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +104,Non Profit,Некоммерческое предприятие
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +104,Non Profit,Некоммерческое предприятие
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_list.js +7,Not Started,Не начато
 DocType: Lead,Channel Partner,Channel ДУrtner
 DocType: Account,Old Parent,Старый родительский
@@ -417,13 +396,12 @@
 apps/erpnext/erpnext/config/manufacturing.py +74,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 +512,Attribute {0} selected multiple times in Attributes Table,Атрибут {0} выбрано несколько раз в таблице атрибутов
+apps/erpnext/erpnext/stock/doctype/item/item.py +516,Attribute {0} selected multiple times in Attributes Table,Атрибут {0} выбрано несколько раз в таблице атрибутов
 DocType: Sales Order,Not Applicable,Не применяется
 apps/erpnext/erpnext/config/hr.py +140,Holiday master.,Мастер отдыха.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +19,Shell molding,Shell литье
 DocType: Material Request Item,Required Date,Требуется Дата
 DocType: Delivery Note,Billing Address,Адрес для выставления счетов
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +644,Please enter Item Code.,"Пожалуйста, введите Код товара."
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +648,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,Всего Кол-во
@@ -433,7 +411,7 @@
 DocType: Item Attribute,To Range,В диапазоне
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Ценные бумаги и депозиты
 DocType: Features Setup,Imports,Импорт
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +144,Adhesive bonding,Склеивание
+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.,Информация о посещаемости.
@@ -441,26 +419,25 @@
 DocType: Sales Order Item,Used for Production Plan,Используется для производственного плана
 DocType: System Settings,Loading...,Загрузка...
 DocType: DocField,Password,Пароль
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +155,Fused deposition modeling,Плавленый осаждение Моделирование
 DocType: Manufacturing Settings,Time Between Operations (in mins),Время между операциями (в мин)
 DocType: Customer,Buyer of Goods and Services.,Покупатель товаров и услуг.
 DocType: Journal Entry,Accounts Payable,Счета к оплате
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +24,Add Subscribers,Добавить Подписчики
 apps/erpnext/erpnext/public/js/feature_setup.js +220,""" does not exists",""" не существует"
 DocType: Pricing Rule,Valid Upto,Действительно До
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +564,List a few of your customers. They could be organizations or individuals.,Перечислите несколько ваших клиентов. Они могут быть организации или частные лица.
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,List a few of your customers. They could be organizations or individuals.,Перечислите несколько ваших клиентов. Они могут быть организации или частные лица.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Direct Income,Прямая прибыль
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +33,"Can not filter based on Account, if grouped by Account","Не можете фильтровать на основе счета, если сгруппированы по Счет"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +88,Administrative Officer,Администратор
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Administrative Officer,Администратор
 DocType: Payment Tool,Received Or Paid,Полученные или уплаченные
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +318,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 +305,Please enter Warehouse for which Material Request will be raised,"Пожалуйста, введите Склад для которых Материал Запрос будет поднят"
 DocType: Production Order,Additional Operating Cost,Дополнительные Эксплуатационные расходы
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +20,Cosmetics,Косметика
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,Косметика
 DocType: DocField,Type,Тип
-apps/erpnext/erpnext/stock/doctype/item/item.py +417,"To merge, following properties must be same for both items","Чтобы объединить, следующие свойства должны быть одинаковыми для обоих пунктов"
+apps/erpnext/erpnext/stock/doctype/item/item.py +421,"To merge, following properties must be same for both items","Чтобы объединить, следующие свойства должны быть одинаковыми для обоих пунктов"
 DocType: Communication,Subject,Тема
 DocType: Shipping Rule,Net Weight,Вес нетто
 DocType: Employee,Emergency Phone,В случае чрезвычайных ситуаций
@@ -470,7 +447,6 @@
 DocType: Journal Entry,Difference (Dr - Cr),Отличия (д-р - Cr)
 DocType: Account,Profit and Loss,Прибыль и убытки
 apps/erpnext/erpnext/config/stock.py +293,Managing Subcontracting,Управление субподряда
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +58,New UOM must NOT be of type Whole Number,Новая единица измерения НЕ должна быть целочисленной
 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 +47,Account {0} does not belong to company: {1},Аккаунт {0} не принадлежит компании: {1}
@@ -489,14 +465,14 @@
 DocType: Purchase Invoice,Supplier Invoice No,Поставщик Счет Нет
 DocType: Territory,For reference,Для справки
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +154,"Cannot delete Serial No {0}, as it is used in stock transactions","Не удается удалить Серийный номер {0}, так как он используется в сделках с акциями"
-apps/erpnext/erpnext/public/js/account_tree_grid.js +52,Closing (Cr),Закрытие (Cr)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +227,Closing (Cr),Закрытие (Cr)
 DocType: Serial No,Warranty Period (Days),Гарантийный срок (дней)
 DocType: Installation Note Item,Installation Note Item,Установка Примечание Пункт
 ,Pending Qty,В ожидании Кол-во
 DocType: Job Applicant,Thread HTML,Тема HTML
 DocType: Company,Ignore,Игнорировать
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +86,SMS sent to following numbers: {0},SMS отправлено следующих номеров: {0}
-apps/erpnext/erpnext/controllers/buying_controller.py +135,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Поставщик Склад обязательным для субподрядчиком ТОВАРНЫЙ ЧЕК
+apps/erpnext/erpnext/controllers/buying_controller.py +126,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Поставщик Склад обязательным для субподрядчиком ТОВАРНЫЙ ЧЕК
 DocType: Pricing Rule,Valid From,Действительно с
 DocType: Sales Invoice,Total Commission,Всего комиссия
 DocType: Pricing Rule,Sales Partner,Торговый партнер
@@ -506,7 +482,7 @@
 To distribute a budget using this distribution, set this **Monthly Distribution** in the **Cost Center**","** Ежемесячная абонентская распространения ** помогает распространять свой бюджет через месяцев, если у вас есть сезонность в вашем бизнесе.
 
  Чтобы распределить бюджет с помощью этого распределения, установите этот ** ежемесячное распределение ** в ** МВЗ **"
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +183,No records found in the Invoice table,Не записи не найдено в таблице счетов
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +130,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 +84,Financial / accounting year.,Финансовый / отчетного года.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","К сожалению, серийные номера не могут быть объединены"
@@ -522,25 +498,25 @@
 DocType: Sales Order,Billing and Delivery Status,Биллинг и доставка Статус
 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/setup/page/setup_wizard/setup_wizard_page.html +16,Previous,Предыдущая
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard_page.html +16,Previous,Предыдущая
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +620,Sales Return,Продажи Вернуться
 DocType: Production Planning Tool,Select Sales Orders from which you want to create Production Orders.,Выберите Заказы из которого вы хотите создать производственных заказов.
 DocType: Item,Delivered by Supplier (Drop Ship),Поставляется Поставщиком (Drop кораблей)
 apps/erpnext/erpnext/config/hr.py +120,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.,База данных клиентов.
 DocType: Quotation,Quotation To,Цитата Для
 DocType: Lead,Middle Income,Средний доход
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),Открытие (Cr)
 apps/erpnext/erpnext/accounts/utils.py +193,Allocated amount can not be negative,Выделенные сумма не может быть отрицательным
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +123,Tumbling,Акробатика
 DocType: Purchase Order Item,Billed Amt,Счетов выдано кол-во
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,"Логика Склада,по которому сделаны складские записи"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +92,Reference No & Reference Date is required for {0},Ссылка № & Ссылка Дата необходим для {0}
 DocType: Event,Wednesday,Среда
 DocType: Sales Invoice,Customer's Vendor,Производитель Клиентам
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +214,Production Order is Mandatory,Заказ продукции является обязательным
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +139,Proposal Writing,Предложение Написание
+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} существует с тем же идентификатором Сотрудника
 apps/erpnext/erpnext/stock/stock_ledger.py +336,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},Отрицательный Ошибка со ({6}) по пункту {0} в Склад {1} на {2} {3} в {4} {5}
 DocType: Fiscal Year Company,Fiscal Year Company,Финансовый год компании
@@ -563,7 +539,7 @@
 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/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.py +179,Please install dropbox python module,"Пожалуйста, установите модуль питона Dropbox"
 DocType: Employee,Passport Number,Номер паспорта
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +82,Manager,Менеджер
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Manager,Менеджер
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +494,From Purchase Receipt,От купли получении
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +219,Same item has been entered multiple times.,Такой же деталь был введен несколько раз.
 DocType: SMS Settings,Receiver Parameter,Приемник Параметр
@@ -571,10 +547,9 @@
 DocType: Sales Person,Sales Person Targets,Менеджера по продажам Цели
 apps/frappe/frappe/public/js/frappe/form/workflow.js +116,To,для
 apps/frappe/frappe/templates/base.html +145,Please enter email address,"Пожалуйста, введите адрес электронной почты,"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +35,End tube forming,Конец трубки формирования
 DocType: Production Order Operation,In minutes,Через несколько минут
 DocType: Issue,Resolution Date,Разрешение Дата
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +635,Please set default Cash or Bank account in Mode of Payment {0},"Пожалуйста, установите Cash умолчанию или банковский счет в режим оплаты {0}"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +637,Please set default Cash or Bank account in Mode of Payment {0},"Пожалуйста, установите Cash умолчанию или банковский счет в режим оплаты {0}"
 DocType: Selling Settings,Customer Naming By,Именование клиентов По
 apps/erpnext/erpnext/accounts/doctype/account/account.js +67,Convert to Group,Преобразовать в группе
 DocType: Activity Cost,Activity Type,Тип активности
@@ -582,12 +557,12 @@
 DocType: Customer,Fixed Days,Основные Дни
 DocType: Sales Invoice,Packing List,Комплект поставки
 apps/erpnext/erpnext/config/buying.py +28,Purchase Orders given to Suppliers.,"Заказы, выданные поставщикам."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +43,Publishing,Публикация
+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 +198,{0}: {1} not found in Invoice Details table,{0} {1} не найден в  таблице счета
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,{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 +208,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Техническое обслуживание Посетить {0} должно быть отменено до отмены этого заказ клиента
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +203,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),Открытие (д-р)
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},Средняя отметка должна быть после {0}
@@ -599,7 +574,6 @@
 DocType: Pricing Rule,Sales Manager,Менеджер По Продажам
 apps/frappe/frappe/public/js/frappe/model/model.js +492,Rename,Переименовать
 DocType: Journal Entry,Write Off Amount,Списание Количество
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +52,Bending,Изгиб
 apps/frappe/frappe/core/page/user_permissions/user_permissions.js +246,Allow User,Разрешить пользователю
 DocType: Journal Entry,Bill No,Номер накладной
 DocType: Purchase Invoice,Quarterly,Ежеквартально
@@ -609,17 +583,16 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Please enter item details,"Пожалуйста, введите детали деталя"
 DocType: Purchase Receipt,Other Details,Другие детали
 DocType: Account,Accounts,Учётные записи
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +67,Marketing,Маркетинг
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +65,Straight shearing,Прямо ножницы
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +67,Marketing,Маркетинг
 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.,Чтобы отслеживать пункт в купли-продажи документов по их серийных NOS. Это также может использоваться для отслеживания гарантийные детали продукта.
 DocType: Purchase Receipt Item Supplied,Current Stock,Наличие на складе
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +99,Rejected Warehouse is mandatory against regected item,Отклонен Склад является обязательным против regected пункта
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +102,Rejected Warehouse is mandatory against regected item,Отклонен Склад является обязательным против regected пункта
 DocType: Account,Expenses Included In Valuation,"Затрат, включаемых в оценке"
 DocType: Employee,Provide email id registered in company,Обеспечить электронный идентификатор зарегистрирован в компании
 DocType: Hub Settings,Seller City,Продавец Город
 DocType: Email Digest,Next email will be sent on:,Следующее письмо будет отправлено на:
 DocType: Offer Letter Term,Offer Letter Term,Предложение Письмо срок
-apps/erpnext/erpnext/stock/doctype/item/item.py +492,Item has variants.,Пункт имеет варианты.
+apps/erpnext/erpnext/stock/doctype/item/item.py +496,Item has variants.,Пункт имеет варианты.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Пункт {0} не найден
 DocType: Bin,Stock Value,Стоимость акций
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,Дерево Тип
@@ -628,10 +601,9 @@
 DocType: Material Request Item,Quantity and Warehouse,Количество и Склад
 DocType: Sales Invoice,Commission Rate (%),Комиссия ставка (%)
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +172,"Against Voucher Type must be one of Sales Order, Sales Invoice or Journal Entry","На ваучере Тип должен быть одним из заказа клиента, накладная или Запись в журнале"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +139,Biomachining,Biomachining
 apps/erpnext/erpnext/setup/utils.py +89,Unable to find exchange rate,Невозможно найти обменный курс
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +7,Aerospace,Авиационно-космический
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +19,Welcome,Добро пожаловать
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +7,Aerospace,Авиационно-космический
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +40,Welcome,Добро пожаловать
 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.,"Товары, полученные от поставщиков."
@@ -654,19 +626,19 @@
 DocType: Employee,Cell Number,Количество звонков
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Поражений
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +120,You can not enter current voucher in 'Against Journal Entry' column,Вы не можете ввести текущий ваучер в «Против Запись в журнале 'колонке
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +25,Energy,Энергоэффективность
+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.,Ежемесячная выписка зарплата.
 DocType: Item Group,Website Specifications,Сайт характеристики
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +205,New Account,Новая учетная запись
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +21,{0}: From {0} of type {1},{0}: С {0} типа {1}
-apps/erpnext/erpnext/controllers/buying_controller.py +283,Row {0}: Conversion Factor is mandatory,Ряд {0}: Коэффициент преобразования является обязательным
+apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,Ряд {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.,Бухгалтерские записи можно с листовыми узлами. Записи против групп не допускаются.
 DocType: ToDo,High,Высокий
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +361,Cannot deactivate or cancel BOM as it is linked with other BOMs,"Не можете отключить или отменить спецификации, как она связана с другими спецификациями"
 DocType: Opportunity,Maintenance,Обслуживание
 DocType: User,Male,Мужчина
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +182,Purchase Receipt number required for Item {0},"Покупка Получение число, необходимое для Пункт {0}"
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +183,Purchase Receipt number required for Item {0},"Покупка Получение число, необходимое для Пункт {0}"
 DocType: Item Attribute Value,Item Attribute Value,Пункт Значение атрибута
 apps/erpnext/erpnext/config/crm.py +64,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.
@@ -714,10 +686,9 @@
 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 +324,"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/page/setup_wizard/fixtures/industry_type.py +13,Biotechnology,Биотехнологии
+apps/erpnext/erpnext/controllers/accounts_controller.py +325,"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,Офис эксплуатационные расходы
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +53,Hemming,Хемминг
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +66,Please enter Item first,"Пожалуйста, введите пункт первый"
 DocType: Account,Liability,Ответственность сторон
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +62,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,"Санкционированный сумма не может быть больше, чем претензии Сумма в строке {0}."
@@ -730,10 +701,10 @@
 DocType: Company,Default Bank Account,По умолчанию Банковский счет
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +47,"To filter based on Party, select Party Type first","Чтобы отфильтровать на основе партии, выберите партия первого типа"
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},"""Обновления Склада"" не могут быть проверены, так как позиция не поставляется через {0}"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Nos,кол-во
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Nos,кол-во
 DocType: Item,Items with higher weightage will be shown higher,"Элементы с более высокой weightage будет показано выше,"
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Банковская сверка подробно
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +627,My Invoices,Мои Счета
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +629,My Invoices,Мои Счета
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,Сотрудник не найден
 DocType: Purchase Order,Stopped,Приостановлено
 DocType: Item,If subcontracted to a vendor,Если по субподряду поставщика
@@ -752,35 +723,33 @@
 DocType: Features Setup,"To enable ""Point of Sale"" features",Чтобы включить &quot;Точки продаж&quot; Особенности
 DocType: Bin,Moving Average Rate,Moving Average Rate
 DocType: Production Planning Tool,Select Items,Выберите товары
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,{0} against Bill {1} dated {2},{0} по Счету {1} от {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +328,{0} against Bill {1} dated {2},{0} по Счету {1} от {2}
 DocType: Comment,Reference Name,Ссылка Имя
 DocType: Maintenance Visit,Completion Status,Статус завершения
 DocType: Sales Invoice Item,Target Warehouse,Целевая Склад
 DocType: Item,Allow over delivery or receipt upto this percent,Разрешить доставку на получение или Шифрование до этого процента
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +49,Expected Delivery Date cannot be before Sales Order Date,Ожидаемая дата поставки не может быть до даты заказа на продажу
 DocType: Upload Attendance,Import Attendance,Импорт Посещаемость
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +17,All Item Groups,Все группы товаров
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +17,All Item Groups,Все группы товаров
 DocType: Process Payroll,Activity Log,Журнал активности
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +30,Net Profit / Loss,Чистая прибыль / убытки
 apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,Автоматически создавать сообщение о подаче сделок.
 DocType: Production Order,Item To Manufacture,Элемент Производство
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +16,Permanent mold casting,Постоянная форма
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} статус {2}
 apps/erpnext/erpnext/config/learn.py +172,Purchase Order to Payment,Заказ на Оплата
 DocType: Sales Order Item,Projected Qty,Прогнозируемый Количество
 DocType: Sales Invoice,Payment Due Date,Дата платежа
 DocType: Newsletter,Newsletter Manager,Рассылка менеджер
-apps/erpnext/erpnext/stock/doctype/item/item.js +229,Item Variant {0} already exists with same attributes,Пункт Вариант {0} уже существует же атрибутами
+apps/erpnext/erpnext/stock/doctype/item/item.js +231,Item Variant {0} already exists with same attributes,Пункт Вариант {0} уже существует же атрибутами
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening',&quot;Открытие&quot;
 DocType: Notification Control,Delivery Note Message,Доставка Примечание сообщение
 DocType: Expense Claim,Expenses,Расходы
 DocType: Item Variant Attribute,Item Variant Attribute,Вариант Пункт Атрибут
 ,Purchase Receipt Trends,Покупка чеков тенденции
 DocType: Appraisal,Select template from which you want to get the Goals,"Выберите шаблон, из которого вы хотите получить Целей"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +77,Research & Development,Научно-исследовательские и опытно-конструкторские работы
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Research & Development,Научно-исследовательские и опытно-конструкторские работы
 ,Amount to Bill,"Сумма, Биллу"
 DocType: Company,Registration Details,Регистрационные данные
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +75,Staking,Разбивка
 DocType: Item,Re-Order Qty,Re порядка Кол-во
 DocType: Leave Block List Date,Leave Block List Date,Оставьте Блок-лист Дата
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +25,Scheduled to send to {0},Планируется отправить {0}
@@ -791,18 +760,16 @@
 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/hr/doctype/leave_allocation/leave_allocation.py +71,Cannot carry forward {0},Не можете переносить {0}
 apps/erpnext/erpnext/accounts/doctype/account/account.py +91,"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,Расходов претензии Отклонен Сообщение
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +145,Nailing,Замечательный
 ,Available Qty,Доступные Кол-во
 DocType: Purchase Taxes and Charges,On Previous Row Total,На предыдущей строки Всего
 DocType: Salary Slip,Working Days,В рабочие дни
 DocType: Serial No,Incoming Rate,Входящий Оценить
 DocType: Packing Slip,Gross Weight,Вес брутто
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +410,The name of your company for which you are setting up this system.,"Название вашей компании, для которой вы настраиваете эту систему."
+apps/erpnext/erpnext/public/js/setup_wizard.js +158,The name of your company for which you are setting up this system.,"Название вашей компании, для которой вы настраиваете эту систему."
 DocType: HR Settings,Include holidays in Total no. of Working Days,Включите праздники в общей сложности не. рабочих дней
 DocType: Job Applicant,Hold,Удержание
 DocType: Employee,Date of Joining,Дата вступления
@@ -812,7 +779,6 @@
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +3,View Subscribers,Посмотреть Подписчики
 DocType: Purchase Invoice Item,Purchase Receipt,Покупка Получение
 ,Received Items To Be Billed,Полученные товары быть выставлен счет
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +114,Abrasive blasting,Абразивоструйное
 DocType: Employee,Ms,Госпожа
 apps/erpnext/erpnext/config/accounts.py +148,Currency exchange rate master.,Мастер Валютный курс.
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +253,Unable to find Time Slot in the next {0} days for Operation {1},Не удается найти временной интервал в ближайшие {0} дней для работы {1}
@@ -824,7 +790,7 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +209,Serial No {0} does not belong to Item {1},Серийный номер {0} не принадлежит Пункт {1}
 DocType: Purchase Receipt Item Supplied,Required Qty,Обязательные Кол-во
 DocType: Bank Reconciliation,Total Amount,Общая сумма
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +32,Internet Publishing,Интернет издания
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,Интернет издания
 DocType: Production Planning Tool,Production Orders,Производственные заказы
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +35,Balance Value,Валюта баланса
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,Продажи Прайс-лист
@@ -835,7 +801,7 @@
 DocType: Supplier,Default Payable Accounts,По умолчанию задолженность Кредиторская
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,Сотрудник {0} не активен или не существует
 DocType: Features Setup,Item Barcode,Пункт Штрих
-apps/erpnext/erpnext/stock/doctype/item/item.py +487,Item Variants {0} updated,Пункт Варианты {0} обновляются
+apps/erpnext/erpnext/stock/doctype/item/item.py +491,Item Variants {0} updated,Пункт Варианты {0} обновляются
 DocType: Quality Inspection Reading,Reading 6,Чтение 6
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Счета-фактуры Advance
 DocType: Address,Shop,Магазин
@@ -844,7 +810,7 @@
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,По умолчанию Счет в банке / Наличные будут автоматически обновляться в POS фактуре когда выбран этот режим.
 DocType: Employee,Permanent Address Is,Постоянный адрес Является
 DocType: Production Order Operation,Operation completed for how many finished goods?,Операция выполнена На сколько готовой продукции?
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +491,The Brand,Марка
+apps/erpnext/erpnext/public/js/setup_wizard.js +237,The Brand,Марка
 apps/erpnext/erpnext/controllers/status_updater.py +163,Allowance for over-{0} crossed for Item {1}.,Учет по-{0} скрещенными за Пункт {1}.
 DocType: Employee,Exit Interview Details,Выход Интервью Подробности
 DocType: Item,Is Purchase Item,Является Покупка товара
@@ -864,16 +830,16 @@
 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,Установите Сумма платежа = сумма Выдающийся
 DocType: Contact Us Settings,Address Line 1,Адрес (1-я строка)
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Variance,Дисперсия
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +392,Company Name,Название компании
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +53,Variance,Дисперсия
+,Company Name,Название компании
 DocType: SMS Center,Total Message(s),Всего сообщений (ы)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +515,Select Item for Transfer,Выбрать пункт трансфера
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +538,Select Item for Transfer,Выбрать пункт трансфера
 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.,"Выберите учетную запись глава банка, в котором проверка была размещена."
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,Разрешить пользователю редактировать Прайс-лист Оценить в сделках
 DocType: Pricing Rule,Max Qty,Макс Кол-во
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +106,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Ряд {0}: Платеж по покупке / продаже порядок должен всегда быть помечены как заранее
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +16,Chemical,Химический
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,Химический
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +693,All items have already been transferred for this Production Order.,Все детали уже были переданы для этого производственного заказа.
 DocType: Process Payroll,Select Payroll Year and Month,Выберите Payroll год и месяц
 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""",Перейти к соответствующей группе (обычно использования средств&gt; Текущие активы&gt; Банковские счета и создать новый аккаунт (нажав на Добавить Ребенка) типа &quot;банк&quot;
@@ -884,12 +850,12 @@
 DocType: Item,Inspection Criteria,Осмотр Критерии
 apps/erpnext/erpnext/config/accounts.py +101,Tree of finanial Cost Centers.,Дерево finanial центры Стоимость.
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,Все передаваемые
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +492,Upload your letter head and logo. (you can edit them later).,Загрузить письмо голову и логотип. (Вы можете редактировать их позже).
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +156,White,Белый
+apps/erpnext/erpnext/public/js/setup_wizard.js +238,Upload your letter head and logo. (you can edit them later).,Загрузить письмо голову и логотип. (Вы можете редактировать их позже).
+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/setup/page/setup_wizard/setup_wizard.js +362,Attach Your Picture,Прикрепите свою фотографию
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Make ,Сделать
+apps/erpnext/erpnext/public/js/setup_wizard.js +112,Attach Your Picture,Прикрепите свою фотографию
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +540,Make ,Сделать
 DocType: Journal Entry,Total Amount in Words,Общая сумма в словах
 DocType: Workflow State,Stop,стоп
 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 если проблема не устранена."
@@ -898,14 +864,13 @@
 DocType: Lead,Next Contact Date,Следующая контакты
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,Открытие Кол-во
 DocType: Holiday List,Holiday List Name,Имя Список праздников
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +168,Stock Options,Опционы
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +168,Stock Options,Опционы
 DocType: Journal Entry Account,Expense Claim,Расходов претензии
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +181,Qty for {0},Кол-во для {0}
 DocType: Leave Application,Leave Application,Оставить заявку
 apps/erpnext/erpnext/config/hr.py +77,Leave Allocation Tool,Оставьте Allocation Tool
 DocType: Leave Block List,Leave Block List Dates,Оставьте черных списков Даты
 DocType: Company,If Monthly Budget Exceeded (for expense account),Если Ежемесячный бюджет превышен (за счет расходов)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +56,Trimming,Обрезки
 DocType: Workstation,Net Hour Rate,Чистая час Цена
 DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,Посадка стоимости покупки Квитанция
 DocType: Company,Default Terms,По умолчанию Условия
@@ -913,10 +878,9 @@
 DocType: POS Profile,Cash/Bank Account, Наличные / Банковский счет
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,Removed items with no change in quantity or value.,Удалены пункты без изменения в количестве или стоимости.
 DocType: Delivery Note,Delivery To,Доставка Для
-apps/erpnext/erpnext/stock/doctype/item/item.py +509,Attribute table is mandatory,Атрибут стол является обязательным
+apps/erpnext/erpnext/stock/doctype/item/item.py +513,Attribute table is mandatory,Атрибут стол является обязательным
 DocType: Production Planning Tool,Get Sales Orders,Получить заказов клиента
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} не может быть отрицательным
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +103,Filing,Подача
 apps/erpnext/erpnext/templates/form_grid/item_grid.html +72,Discount,Скидка
 DocType: Features Setup,Purchase Discounts,Покупка Скидки
 DocType: Workstation,Wages,Заработная плата
@@ -933,6 +897,7 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +112,You are the Expense Approver for this record. Please Update the 'Status' and Save,"Вы Утверждающий Расходы для этой записи. Пожалуйста, Обновите ""Статус"" и Сохраните"
 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 +136,"Attributes for Item Variants. e.g Size, Color etc.","Атрибуты для товара Variant. например, размер, цвет и т.д."
 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 +194,Serial No {0} is under maintenance contract upto {1},Серийный номер {0} находится под контрактом на техническое обслуживание ДО {1}
@@ -941,7 +906,7 @@
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,Расходы на продажи
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Buying,Стандартный Покупка
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +120,Standard Buying,Стандартный Покупка
 DocType: GL Entry,Against,Против
 DocType: Item,Default Selling Cost Center,По умолчанию Продажа Стоимость центр
 DocType: Sales Partner,Implementation Partner,Реализация Партнер
@@ -962,29 +927,29 @@
 DocType: Time Log Batch,updated via Time Logs,обновляется через журналы Time
 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/setup/page/setup_wizard/setup_wizard.js +588,List a few of your suppliers. They could be organizations or individuals.,Перечислите несколько ваших поставщиков. Они могут быть организации или частные лица.
+apps/erpnext/erpnext/public/js/setup_wizard.js +326,List a few of your suppliers. They could be organizations or individuals.,Перечислите несколько ваших поставщиков. Они могут быть организации или частные лица.
 DocType: Company,Default Currency,Базовая валюта
 DocType: Contact,Enter designation of this Contact,Введите обозначение этому контактному
 DocType: Contact Us Settings,Address,Адрес
 DocType: Expense Claim,From Employee,От работника
-apps/erpnext/erpnext/controllers/accounts_controller.py +338,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Внимание: Система не будет проверять overbilling с суммы по пункту {0} в {1} равна нулю
+apps/erpnext/erpnext/controllers/accounts_controller.py +339,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Внимание: Система не будет проверять overbilling с суммы по пункту {0} в {1} равна нулю
 DocType: Journal Entry,Make Difference Entry,Сделать Разница запись
 DocType: Upload Attendance,Attendance From Date,Посещаемость С Дата
 DocType: Appraisal Template Goal,Key Performance Area,Ключ Площадь Производительность
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +54,Transportation,Транспортные расходы
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +54,Transportation,Транспортные расходы
 apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +67, and year: ,конец года
 DocType: Email Digest,Annual Expense,Годовые расходы
 DocType: SMS Center,Total Characters,Персонажей
-apps/erpnext/erpnext/controllers/buying_controller.py +139,Please select BOM in BOM field for Item {0},"Пожалуйста, выберите спецификации в спецификации поля для пункта {0}"
+apps/erpnext/erpnext/controllers/buying_controller.py +130,Please select BOM in BOM field for Item {0},"Пожалуйста, выберите спецификации в спецификации поля для пункта {0}"
 DocType: C-Form Invoice Detail,C-Form Invoice Detail,C-образный Счет Подробно
 DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,Оплата Примирение Счет
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +32,Contribution %,Вклад%
 DocType: Item,website page link,сайт ссылку
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +192,Let's prepare the system for first use.,Давайте подготовить систему для первого использования.
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +242,Let's prepare the system for first use.,Давайте подготовить систему для первого использования.
 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 +214,Production Order {0} must be cancelled before cancelling this Sales Order,Производственный заказ {0} должно быть отменено до отмены этого заказ клиента
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +209,Production Order {0} must be cancelled before cancelling this Sales Order,Производственный заказ {0} должно быть отменено до отмены этого заказ клиента
 ,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.,Выберите Журналы время и предоставить для создания нового счета-фактуры.
@@ -1004,14 +969,13 @@
 DocType: Sales Invoice Advance,Sales Invoice Advance,Расходная накладная Advance
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +398,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/page/setup_wizard/install_fixtures.py +75,Management,Управление
+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/setup/page/setup_wizard/fixtures/operations.py +14,Investment casting,Литье по выплавляемым моделям
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +51,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-SM"""
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,"Чистая Платное (прописью) будут видны, как только вы сохраните Зарплата Слип."
 apps/frappe/frappe/core/doctype/user/user_list.js +12,Active,Активен
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +154,Blue,Синий
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +154,Blue,Синий
 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,Дальнейшие узлы могут быть созданы только под узлами типа «Группа»
@@ -1021,18 +985,16 @@
 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/setup/page/setup_wizard/fixtures/operations.py +156,Laminated object manufacturing,Производство многослойного объекта
 apps/erpnext/erpnext/config/buying.py +13,Supplier database.,Поставщик базы данных.
 DocType: Account,Balance Sheet,Балансовый отчет
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +561,Cost Center For Item with Item Code ',Центр Стоимость для элемента данных с Код товара '
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +45,Stretch forming,Стретч формирования
 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 +210,"Further accounts can be made under Groups, but entries can be made against non-Groups","Дальнейшие счета могут быть сделаны в соответствии с группами, но Вы можете быть против не-групп"
 apps/erpnext/erpnext/config/hr.py +125,Tax and other salary deductions.,Налоговые и иные отчисления заработной платы.
 DocType: Lead,Lead,Лид
 DocType: Email Digest,Payables,Кредиторская задолженность
 DocType: Account,Warehouse,Склад
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +90,Row #{0}: Rejected Qty can not be entered in Purchase Return,Ряд # {0}: Отклонено Кол-во не может быть введен в приобретении Вернуться
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +93,Row #{0}: Rejected Qty can not be entered in Purchase Return,Ряд # {0}: Отклонено Кол-во не может быть введен в приобретении Вернуться
 ,Purchase Order Items To Be Billed,Покупка Заказ позиции быть выставлен счет
 DocType: Purchase Invoice Item,Net Rate,Нетто-ставка
 DocType: Purchase Invoice Item,Purchase Invoice Item,Покупка Счет Пункт
@@ -1047,13 +1009,13 @@
 DocType: Global Defaults,Current Fiscal Year,Текущий финансовый год
 DocType: Global Defaults,Disable Rounded Total,Отключение закругленными Итого
 DocType: Lead,Call,Звонок
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +384,'Entries' cannot be empty,"""Записи"" не могут быть пустыми"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +386,'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 +205,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/page/setup_wizard/install_fixtures.py +138,Research,Исследования
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +138,Research,Исследования
 DocType: Maintenance Visit Purpose,Work Done,Сделано
 apps/erpnext/erpnext/controllers/item_variant.py +25,Please specify at least one attribute in the Attributes table,"Пожалуйста, укажите как минимум один атрибут в таблице атрибутов"
 DocType: Contact,User ID,ID пользователя
@@ -1061,10 +1023,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +57,View Ledger,Посмотреть Леджер
 DocType: File,Lft,LFT
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Старейшие
-apps/erpnext/erpnext/stock/doctype/item/item.py +394,"An Item Group exists with same name, please change the item name or rename the item group","Пункт Группа существует с тем же именем, пожалуйста, измените имя элемента или переименовать группу товаров"
+apps/erpnext/erpnext/stock/doctype/item/item.py +398,"An Item Group exists with same name, please change the item name or rename the item group","Пункт Группа существует с тем же именем, пожалуйста, измените имя элемента или переименовать группу товаров"
 DocType: Communication,Delivery Status,Статус доставки
 DocType: Production Order,Manufacture against Sales Order,Производство против заказ клиента
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +517,Rest Of The World,Остальной мир
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +455,Rest Of The World,Остальной мир
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,Пункт {0} не может иметь Batch
 ,Budget Variance Report,Бюджет Разница Сообщить
 DocType: Salary Slip,Gross Pay,Зарплата до вычетов
@@ -1075,13 +1037,11 @@
 DocType: BOM Item,Item Description,Описание позиции
 DocType: Payment Tool,Payment Mode,Режим компенсации
 DocType: Purchase Invoice,Is Recurring,Повторяется
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +154,Direct metal laser sintering,Прямая металлическая лазерное спекание
 DocType: Purchase Order,Supplied Items,Поставляемые товары
 DocType: Production Order,Qty To Manufacture,Кол-во для производства
 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,Временное открытие
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +41,Cryorolling,Cryorolling
 ,Employee Leave Balance,Сотрудник Оставить Баланс
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +128,Balance for Account {0} must always be {1},Весы для счета {0} должен быть всегда {1}
 DocType: Address,Address Type,Тип адреса
@@ -1097,23 +1057,23 @@
 DocType: Journal Entry,Get Outstanding Invoices,Получить неоплаченных счетов-фактур
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,Заказ на продажу {0} не является допустимым
 apps/erpnext/erpnext/setup/doctype/company/company.py +172,"Sorry, companies cannot be merged","К сожалению, компании не могут быть объединены"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +145,Small,Небольшой
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Small,Небольшой
 DocType: Employee,Employee Number,Общее число сотрудников
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},Случай Нет (ы) уже используется. Попробуйте из дела № {0}
 ,Invoiced Amount (Exculsive Tax),Сумма по счетам (Exculsive стоимость)
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,Пункт 2
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +59,Account head {0} created,Основной счет {0} создан
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +153,Green,Зеленый
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Green,Зеленый
 DocType: Item,Auto re-order,Авто повторного заказа
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +57,Total Achieved,Всего Выполнено
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +59,Total Achieved,Всего Выполнено
 DocType: Employee,Place of Issue,Место выдачи
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +59,Contract,Контракт
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Contract,Контракт
 DocType: Report,Disabled,Отключено
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +490,UOM coversion factor required for UOM: {0} in Item: {1},Единица измерения фактором Конверсия требуется для UOM: {0} в пункте: {1}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +83,Indirect Expenses,Косвенные расходы
 apps/erpnext/erpnext/controllers/selling_controller.py +163,Row {0}: Qty is mandatory,Ряд {0}: Кол-во является обязательным
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +8,Agriculture,Сельское хозяйство
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +611,Your Products or Services,Ваши продукты или услуги
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,Сельское хозяйство
+apps/erpnext/erpnext/public/js/setup_wizard.js +347,Your Products or Services,Ваши продукты или услуги
 DocType: Mode of Payment,Mode of Payment,Способ оплаты
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,Это корень группу товаров и не могут быть изменены.
 DocType: Journal Entry Account,Purchase Order,Заказ на покупку
@@ -1125,7 +1085,7 @@
 DocType: Serial No,Serial No Details,Серийный номер подробнее
 DocType: Purchase Invoice Item,Item Tax Rate,Пункт Налоговая ставка
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +113,"For {0}, only credit accounts can be linked against another debit entry","Для {0}, только кредитные счета могут быть связаны с другой дебету"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Delivery Note {0} is not submitted,Доставка Примечание {0} не представлено
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +470,Delivery Note {0} is not submitted,Доставка Примечание {0} не представлено
 apps/erpnext/erpnext/stock/get_item_details.py +136,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.","Цены Правило сначала выбирается на основе ""Применить На"" поле, которое может быть Пункт, Пункт Группа или Марка."
@@ -1135,7 +1095,7 @@
 DocType: Appraisal Goal,Goal,Цель
 DocType: Sales Invoice Item,Edit Description,Редактировать описание
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +318,Expected Delivery Date is lesser than Planned Start Date.,"Ожидаемая дата поставки меньше, чем Запланированная дата начала."
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +579,For Supplier,Для поставщиков
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +602,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,Всего Исходящие
@@ -1161,10 +1121,10 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +74,"Total {0} for all items is zero, may you should change 'Distribute Charges Based On'","Всего {0} для всех элементов равна нулю, может, вы должны изменить &quot;Распределить плату на основе&quot;"
 DocType: Purchase Invoice,Taxes and Charges Calculation,Налоги и сборы Расчет
 DocType: BOM Operation,Workstation,Рабочая станция
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +112,Hardware,Оборудование
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +112,Hardware,Оборудование
 DocType: Attendance,HR Manager,Менеджер по подбору кадров
 apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,"Пожалуйста, выберите компанию"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +50,Privilege Leave,Привилегированный Оставить
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +50,Privilege Leave,Привилегированный Оставить
 DocType: Purchase Invoice,Supplier Invoice Date,Поставщик Дата выставления счета
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +79,You need to enable Shopping Cart,Вам необходимо включить Корзину
 apps/frappe/frappe/public/js/frappe/form/grid_body.html +6,No Data,нет данных
@@ -1177,7 +1137,7 @@
 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 +168,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/setup/page/setup_wizard/install_fixtures.py +38,Food,Еда
+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 +139,You can make a time log only against a submitted production order,"Вы можете сделать журнал времени только против представленной продукции для того,"
 DocType: Maintenance Schedule Item,No of Visits,Нет посещений
@@ -1197,6 +1157,7 @@
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,View Offer Letter,Посмотреть предложение Письмо
 DocType: Communication,Communication,Общение
 DocType: Item,Is Service Item,Является Service Элемент
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +81,Application period cannot be outside leave allocation period,Срок подачи заявлений не может быть период распределения пределами отпуск
 DocType: Activity Cost,Projects,Проекты
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +31,Please select Fiscal Year,"Пожалуйста, выберите финансовый год"
 apps/erpnext/erpnext/controllers/buying_controller.py +23,From {0} | {1} {2},С {0} | {1} {2}
@@ -1215,7 +1176,7 @@
 DocType: Item,Maintain Stock,Поддержание складе
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +213,Stock Entries already created for Production Order ,Сток записи уже созданные для производственного заказа
 DocType: Leave Control Panel,Leave blank if considered for all designations,"Оставьте пустым, если рассматривать для всех обозначений"
-apps/erpnext/erpnext/controllers/accounts_controller.py +499,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Начисление типа «Актуальные 'в строке {0} не могут быть включены в пункт Оценить
+apps/erpnext/erpnext/controllers/accounts_controller.py +500,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Начисление типа «Актуальные 'в строке {0} не могут быть включены в пункт Оценить
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,Max: {0},Max: {0}
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +16,From Datetime,С DateTime
 DocType: Email Digest,For Company,За компанию
@@ -1225,7 +1186,7 @@
 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 +471,cannot be greater than 100,"не может быть больше, чем 100"
-apps/erpnext/erpnext/stock/doctype/item/item.py +546,Item {0} is not a stock Item,Пункт {0} не является акционерным Пункт
+apps/erpnext/erpnext/stock/doctype/item/item.py +550,Item {0} is not a stock Item,Пункт {0} не является акционерным Пункт
 DocType: Maintenance Visit,Unscheduled,Незапланированный
 DocType: Employee,Owned,Присвоено
 DocType: Salary Slip Deduction,Depends on Leave Without Pay,Зависит от отпуска без сохранения заработной платы
@@ -1239,31 +1200,29 @@
 DocType: HR Settings,Employee Settings,Работники Настройки
 ,Batch-Wise Balance History,Партиями Баланс История
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +72,To Do List,Список задач
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +63,Apprentice,Ученик
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Apprentice,Ученик
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +99,Negative Quantity is not allowed,Отрицательный Количество не допускается
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
 Used for Taxes and Charges","Налоговый Подробная таблица выбирается из мастера элемента в виде строки и хранится в этой области.
  Используется по налогам и сборам"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +61,Lancing,Вскрытие
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +151,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 +435,Accounting Entry for {0}: {1} can only be made in currency: {2},Учет Вход для {0}: {1} могут быть сделаны только в валюте: {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +436,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 +38,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 +112,Tax Rule for transactions.,Налоговый Правило для сделок.
 DocType: Rename Tool,Type of document to rename.,"Вид документа, переименовать."
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +630,We buy this Item,Мы Купить этот товар
+apps/erpnext/erpnext/public/js/setup_wizard.js +366,We buy this Item,Мы Купить этот товар
 DocType: Address,Billing,Выставление счетов
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +77,Flanging,Загибание
 DocType: Bulk Email,Not Sent,Не Отправлено
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +73,Explosive forming,Взрывная формирования
 DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),Всего Налоги и сборы (Компания Валюты)
 DocType: Shipping Rule,Shipping Account,Доставка счета
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +43,Scheduled to send to {0} recipients,Планируется отправить {0} получателей
 DocType: Quality Inspection,Readings,Показания
 DocType: Stock Entry,Total Additional Costs,Всего Дополнительные расходы
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Sub Assemblies,Sub сборки
+apps/erpnext/erpnext/public/js/setup_wizard.js +359,Sub Assemblies,Sub сборки
 DocType: Shipping Rule Condition,To Value,Произвести оценку
 DocType: Supplier,Stock Manager,Фото менеджер
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +143,Source warehouse is mandatory for row {0},Источник склад является обязательным для ряда {0}
@@ -1273,44 +1232,42 @@
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Ошибка при импортировании!
 apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,Адрес не добавлено ни.
 DocType: Workstation Working Hour,Workstation Working Hour,Рабочая станция Рабочие часы
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +83,Analyst,Аналитик
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +202,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Строка {0}: С номером количество {1} должен быть меньше или равен количеству СП {2}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Analyst,Аналитик
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +149,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Строка {0}: С номером количество {1} должен быть меньше или равен количеству СП {2}
 DocType: Item,Inventory,Инвентаризация
 DocType: Features Setup,"To enable ""Point of Sale"" view",Чтобы включить &quot;Точка зрения&quot; Продажа
 apps/erpnext/erpnext/public/js/pos/pos.js +402,Payment cannot be made for empty cart,Оплата не может быть сделано для пустого корзину
 DocType: Item,Sales Details,Продажи Подробности
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +149,Pinning,Закрепление
 DocType: Opportunity,With Items,С элементами
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,В Кол-во
 DocType: Notification Control,Expense Claim Rejected,Расходов претензии Отклонен
 DocType: Sales Invoice,"The date on which next invoice will be generated. It is generated on submit.
 ","Дата, на которую будет генерироваться следующий счет-фактура. Он создается на форму."
 DocType: Item Attribute,Item Attribute,Пункт Атрибут
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +105,Government,Правительство
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Government,Правительство
 apps/erpnext/erpnext/config/stock.py +268,Item Variants,Предмет Варианты
 DocType: Company,Services,Услуги
 apps/erpnext/erpnext/accounts/report/financial_statements.py +147,Total ({0}),Всего ({0})
 DocType: Cost Center,Parent Cost Center,Родитель МВЗ
 DocType: Sales Invoice,Source,Источник
 DocType: Leave Type,Is Leave Without Pay,Является отпуск без
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +186,No records found in the Payment table,Не записи не найдено в таблице оплаты
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +405,Financial Year Start Date,Начало финансового периода
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +133,No records found in the Payment table,Не записи не найдено в таблице оплаты
+apps/erpnext/erpnext/public/js/setup_wizard.js +153,Financial Year Start Date,Начало финансового периода
 DocType: Employee External Work History,Total Experience,Суммарный опыт
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +100,Countersinking,Зенкование
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +271,Packing Slip(s) cancelled,Упаковочный лист (ы) отменяется
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +276,Packing Slip(s) cancelled,Упаковочный лист (ы) отменяется
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,Грузовые и экспедиторские Сборы
 DocType: Material Request Item,Sales Order No,Заказ на продажу Нет
 DocType: Item Group,Item Group Name,Пункт Название группы
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +50,Taken,Взятый
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,Взятый
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +66,Transfer Materials for Manufacture,Передача материалов для производства
 DocType: Pricing Rule,For Price List,Для Прейскурантом
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +27,Executive Search,Executive Search
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,Executive Search
 apps/erpnext/erpnext/stock/stock_ledger.py +405,"Purchase rate for item: {0} not found, which is required to book accounting entry (expense). Please mention item price against a buying price list.","Курс покупки по пункту: {0} не найден, который необходим для ведения бухгалтерского учета запись (счет). Пожалуйста, укажите цена товара против цены покупки списке."
 DocType: Maintenance Schedule,Schedules,Расписание
 DocType: Purchase Invoice Item,Net Amount,Чистая сумма
 DocType: Purchase Order Item Supplied,BOM Detail No,BOM детали №
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),Дополнительная скидка Сумма (валюта компании)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +537,Error: {0} > {1},Ошибка: {0}> {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +541,Error: {0} > {1},Ошибка: {0}> {1}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,"Пожалуйста, создайте новую учетную запись с Планом счетов бухгалтерского учета."
 DocType: Maintenance Visit,Maintenance Visit,Техническое обслуживание Посетить
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer > Customer Group > Territory,Клиент> Группа клиентов> Территория
@@ -1321,7 +1278,6 @@
 DocType: Event,Tuesday,Вторник
 DocType: Leave Block List,Block Holidays on important days.,Блок Отдых на важных дней.
 ,Accounts Receivable Summary,Дебиторская задолженность Резюме
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +43,Leaves for type {0} already allocated for Employee {1} for period {2} - {3},"Листья для типа {0}, уже выделенных на работника {1} для периода {2} - {3}"
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +187,Please set User ID field in an Employee record to set Employee Role,"Пожалуйста, установите поле идентификатора пользователя в Сотрудника Запись, чтобы настроить Employee роль"
 DocType: UOM,UOM Name,Имя единица измерения
 DocType: Top Bar Item,Target,цель
@@ -1333,15 +1289,14 @@
 DocType: ToDo,Due Date,Дата выполнения
 DocType: Sales Invoice Item,Brand Name,Имя Бренда
 DocType: Purchase Receipt,Transporter Details,Transporter Детали
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Box,Рамка
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +389,The Organization,Организация
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Box,Рамка
+apps/erpnext/erpnext/public/js/setup_wizard.js +137,The Organization,Организация
 DocType: Monthly Distribution,Monthly Distribution,Ежемесячно дистрибуция
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,"Приемник Список пуст. Пожалуйста, создайте приемник Список"
 DocType: Production Plan Sales Order,Production Plan Sales Order,Производственный план по продажам Заказать
 DocType: Sales Partner,Sales Partner Target,Партнеры по сбыту целям
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},Учет Вход для {0} могут быть сделаны только в валюте: {1}
 DocType: Pricing Rule,Pricing Rule,Цены Правило
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +58,Notching,Насечка
 apps/erpnext/erpnext/config/learn.py +167,Material Request to Purchase Order,Материал Заказать орденом
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +74,Row # {0}: Returned Item {1} does not exists in {2} {3},Ряд # {0}: возвращенный деталь {1} не существует в {2} {3}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,Банковские счета
@@ -1358,20 +1313,19 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Amounts not reflected in bank,Суммы не отражается в банке
 DocType: Quality Inspection Reading,Reading 4,Чтение 4
 apps/erpnext/erpnext/config/hr.py +23,Claims for company expense.,Претензии по счет компании.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +8,Centrifugal casting,Центробежное литье
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +119,Magnetic field-assisted finishing,Магнитное поле при содействии отделка
 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,Связаться Мобильный Нет
 DocType: Production Planning Tool,Select Sales Orders,Выберите заказы на продажу
 ,Material Requests for which Supplier Quotations are not created,"Материал Запросы, для которых Поставщик Котировки не создаются"
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +117,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,"На следующий день (с), на которой вы подаете заявление на отпуск праздники. Вам не нужно обратиться за разрешением."
 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/buying/doctype/purchase_order/purchase_order.js +477,Mark as Delivered,Отметить как при поставке
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +497,Mark as Delivered,Отметить как при поставке
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +34,Make Quotation,Сделать цитаты
 DocType: Dependent Task,Dependent Task,Зависит Задача
-apps/erpnext/erpnext/stock/doctype/item/item.py +306,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 +141,Leave of type {0} cannot be longer than {1},"Оставить типа {0} не может быть больше, чем {1}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +310,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 +155,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,Приемник Список
@@ -1379,15 +1333,14 @@
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Израсходованное количество
 apps/erpnext/erpnext/public/js/pos/pos.js +491,{0} View,{0} Просмотр
 DocType: Salary Structure Deduction,Salary Structure Deduction,Зарплата Структура Вычет
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +158,Selective laser sintering,Селективный лазерного спекания
-apps/erpnext/erpnext/stock/doctype/item/item.py +301,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Единица измерения {0} был введен более чем один раз в таблицу преобразования Factor
+apps/erpnext/erpnext/stock/doctype/item/item.py +305,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Единица измерения {0} был введен более чем один раз в таблицу преобразования Factor
 apps/frappe/frappe/core/page/data_import_tool/data_import_tool.js +108,Import Successful!,Успешно импортированно!
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Стоимость эмиссионных пунктов
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +185,Quantity must not be more than {0},Количество должно быть не более {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +41,Age (Days),Возраст (дней)
 DocType: Quotation Item,Quotation Item,Цитата Пункт
 DocType: Account,Account Name,Имя Учетной Записи
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +41,From Date cannot be greater than To Date,"С даты не может быть больше, чем к дате"
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +34,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.,Тип Поставщик мастер.
 DocType: Purchase Order Item,Supplier Part Number,Поставщик Номер детали
@@ -1396,14 +1349,14 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +247,{0} {1} is cancelled or stopped,{0} {1} отменён или остановлен
 DocType: Accounts Settings,Credit Controller,Кредитная контроллер
 DocType: Delivery Note,Vehicle Dispatch Date,Автомобиль Отправка Дата
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +197,Purchase Receipt {0} is not submitted,Покупка Получение {0} не представлено
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +198,Purchase Receipt {0} is not submitted,Покупка Получение {0} не представлено
 DocType: Company,Default Payable Account,По умолчанию оплачивается аккаунт
 apps/erpnext/erpnext/config/website.py +13,"Settings for online shopping cart such as shipping rules, price list etc.","Настройки для онлайн корзины, такие как правилами перевозок, прайс-лист и т.д."
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +660,Setup Complete,Завершение установки
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +124,Setup Complete,Завершение установки
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +65,{0}% Billed,{0}% Объявленный
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +17,Reserved Qty,Зарезервированное кол-во
 DocType: Party Account,Party Account,Партия аккаунт
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +74,Human Resources,Кадры
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +74,Human Resources,Кадры
 DocType: Lead,Upper Income,Верхний Доход
 DocType: Journal Entry Account,Debit in Company Currency,Дебет в валюте компании
 apps/erpnext/erpnext/support/doctype/issue/issue.py +58,My Issues,Мои вопросы
@@ -1412,11 +1365,9 @@
 DocType: Company,Default Values,Значения По Умолчанию
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +236,Row {0}: Payment amount can not be negative,Ряд {0}: Сумма платежа не может быть отрицательным
 DocType: Expense Claim,Total Amount Reimbursed,Общая сумма возмещаются
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +152,Press fitting,Пресс-фитинг
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +64,Against Supplier Invoice {0} dated {1},Против поставщика счет-фактура {0} от {1}
 DocType: Customer,Default Price List,По умолчанию Прайс-лист
 DocType: Payment Reconciliation,Payments,Оплата
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +24,Hot isostatic pressing,Горячая изостатического прессования
 DocType: ToDo,Medium,Средний
 DocType: Budget Detail,Budget Allocated,"Бюджет, выделенный"
 DocType: Journal Entry,Entry Type,Тип записи
@@ -1429,9 +1380,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +56,None of the items have any change in quantity or value.,Ни один из пунктов не имеют каких-либо изменений в количестве или стоимости.
 DocType: Warranty Claim,Warranty Claim,Претензия по гарантии
 ,Lead Details,Лид Подробности
-DocType: Authorization Rule,Approving User,Утверждении Пользователь
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +37,Forging,Ковка
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +126,Plating,Обшивка
 DocType: Purchase Invoice,End date of current invoice's period,Дата и время окончания периода текущего счета-фактуры в
 DocType: Pricing Rule,Applicable For,Применимо для
 DocType: Bank Reconciliation,From Date,С Даты
@@ -1453,31 +1401,29 @@
 DocType: Sales Invoice,Paid Amount (Company Currency),Платные Сумма (Компания валют)
 DocType: Purchase Invoice,Additional Discount,Дополнительная скидка
 DocType: Selling Settings,Selling Settings,Продажа Настройки
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +39,Online Auctions,Аукционы в Интернете
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,Аукционы в Интернете
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +94,Please specify either Quantity or Valuation Rate or both,"Пожалуйста, сформулируйте либо Количество или оценка Оценить или оба"
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +50,"Company, Month and Fiscal Year is mandatory","Компания, месяц и финансовый год является обязательным"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Marketing Expenses,Маркетинговые расходы
 ,Item Shortage Report,Пункт Нехватка Сообщить
-apps/erpnext/erpnext/stock/doctype/item/item.js +183,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Вес упоминается, \n Пожалуйста, укажите ""Вес Единица измерения"" слишком"
+apps/erpnext/erpnext/stock/doctype/item/item.js +185,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Вес упоминается, \n Пожалуйста, укажите ""Вес Единица измерения"" слишком"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,"Материал Запрос используется, чтобы сделать эту Stock запись"
 apps/erpnext/erpnext/config/support.py +43,Single unit of an Item.,Одно устройство элемента.
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +212,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 +384,Warehouse required at Row No {0},Склад требуется в строке Нет {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +386,Warehouse required at Row No {0},Склад требуется в строке Нет {0}
 DocType: Employee,Date Of Retirement,Дата выбытия
 DocType: Upload Attendance,Get Template,Получить шаблон
 DocType: Address,Postal,Почтовый
 DocType: Item,Weightage,Weightage
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +159,Mining,Добыча
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +17,Resin casting,Литье смолы
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"Группа клиентов с таким именем уже существует. Пожалуйста, измените имя клиента или имя группы клиентов"
 apps/erpnext/erpnext/public/js/pos/pos.js +147,Please select {0} first.,"Пожалуйста, выберите {0} в первую очередь."
 apps/erpnext/erpnext/templates/pages/order.html +57,text {0},Текст {0}
 DocType: Territory,Parent Territory,Родитель Территория
 DocType: Quality Inspection Reading,Reading 2,Чтение 2
 DocType: Stock Entry,Material Receipt,Материал Поступление
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +622,Products,Продукты
+apps/erpnext/erpnext/public/js/setup_wizard.js +358,Products,Продукты
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +47,Party Type and Party is required for Receivable / Payable account {0},Партия Тип и Сторона обязана в течение / дебиторская задолженность внимание {0}
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.","Если этот пункт имеет варианты, то она не может быть выбран в заказах и т.д."
 DocType: Lead,Next Contact By,Следующая Контактные По
@@ -1487,13 +1433,13 @@
 DocType: Purchase Invoice,Notification Email Address,E-mail адрес для уведомлений
 DocType: Payment Tool,Find Invoices to Match,"Найти счетов, чтобы соответствовать"
 ,Item-wise Sales Register,Пункт мудрый Продажи Зарегистрироваться
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +399,"e.g. ""XYZ National Bank""","например ""XYZ Национальный банк """
+apps/erpnext/erpnext/public/js/setup_wizard.js +147,"e.g. ""XYZ National Bank""","например ""XYZ Национальный банк """
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,Этот налог Входит ли в базовой ставки?
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +57,Total Target,Всего Target
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Target,Всего Target
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.js +22,Shopping Cart is enabled,Корзина включена
 DocType: Job Applicant,Applicant for a Job,Заявитель на вакансию
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +173,No Production Orders created,"Нет Производственные заказы, созданные"
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +131,Salary Slip of employee {0} already created for this month,Зарплата скольжения работника {0} уже создано за этот месяц
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +140,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.,Слишком много столбцов. Экспорт отчета и распечатать его с помощью приложения электронной таблицы.
 DocType: Sales Invoice Item,Batch No,№ партии
@@ -1503,14 +1449,14 @@
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +13,Variant,Вариант
 apps/frappe/frappe/public/js/frappe/form/toolbar.js +165,New {0},Новый {0}
 DocType: Naming Series,Set prefix for numbering series on your transactions,Установить префикс для нумерации серии на ваших сделок
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +169,Stopped order cannot be cancelled. Unstop to cancel.,"Приостановленный заказ не может быть отменен. Снимите с заказа статус ""Приостановлено"" для отмены"
-apps/erpnext/erpnext/stock/doctype/item/item.py +323,Default BOM ({0}) must be active for this item or its template,По умолчанию BOM ({0}) должен быть активным для данного элемента или в шаблоне
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +164,Stopped order cannot be cancelled. Unstop to cancel.,"Приостановленный заказ не может быть отменен. Снимите с заказа статус ""Приостановлено"" для отмены"
+apps/erpnext/erpnext/stock/doctype/item/item.py +327,Default BOM ({0}) must be active for this item or its template,По умолчанию BOM ({0}) должен быть активным для данного элемента или в шаблоне
 DocType: Employee,Leave Encashed?,Оставьте инкассированы?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Возможность поле От обязательна
 DocType: Item,Variants,Варианты
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +458,Make Purchase Order,Сделать Заказ
 DocType: SMS Center,Send To,Отправить
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +111,There is not enough leave balance for Leave Type {0},Существует не хватает отпуск баланс для отпуске Тип {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +127,There is not enough leave balance for Leave Type {0},Существует не хватает отпуск баланс для отпуске Тип {0}
 DocType: Sales Team,Contribution to Net Total,Вклад в Net Всего
 DocType: Sales Invoice Item,Customer's Item Code,Клиентам Код товара
 DocType: Stock Reconciliation,Stock Reconciliation,Фото со Примирение
@@ -1547,11 +1493,11 @@
 DocType: Sales Order Item,Actual Qty,Фактический Кол-во
 DocType: Sales Invoice Item,References,Рекомендации
 DocType: Quality Inspection Reading,Reading 10,Чтение 10
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +612,"List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start.","Перечислите ваши продукты или услуги, которые вы покупаете или продаете. Убедитесь в том, чтобы проверить позицию Group, единицу измерения и других свойств при запуске."
+apps/erpnext/erpnext/public/js/setup_wizard.js +348,"List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start.","Перечислите ваши продукты или услуги, которые вы покупаете или продаете. Убедитесь в том, чтобы проверить позицию Group, единицу измерения и других свойств при запуске."
 DocType: Hub Settings,Hub Node,Узел Hub
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,"Вы ввели повторяющихся элементов. Пожалуйста, исправить и попробовать еще раз."
 apps/erpnext/erpnext/controllers/item_variant.py +65,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values,Значение {0} для атрибута {1} не существует в списке действительного значения Пункт Атрибут
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +87,Associate,Помощник
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Associate,Помощник
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +46,Item {0} is not a serialized Item,Пункт {0} не сериализованным Пункт
 DocType: SMS Center,Create Receiver List,Создание приемника Список
 apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +5,Expired,Истек срок действия
@@ -1560,7 +1506,7 @@
 DocType: Warranty Claim,Issue Date,Дата выдачи
 DocType: Activity Cost,Activity Cost,Стоимость активность
 DocType: Purchase Receipt Item Supplied,Consumed Qty,Потребляемая Кол-во
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +52,Telecommunications,Телекоммуникации
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +52,Telecommunications,Телекоммуникации
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),"Указывает, что пакет является частью этой поставки (только проект)"
 DocType: Payment Tool,Make Payment Entry,Произвести оплату запись
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +119,Quantity for Item {0} must be less than {1},Количество по пункту {0} должно быть меньше {1}
@@ -1577,10 +1523,8 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +37,"Selling must be checked, if Applicable For is selected as {0}","Продажа должна быть проверена, если выбран Применимо для как {0}"
 DocType: Purchase Order Item,Supplier Quotation Item,Поставщик Цитата Пункт
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +27,Make Salary Structure,Сделать Зарплата Структура
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +54,Shearing,Сдвиг
 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.,"Нажмите на кнопку ""Создать Расходная накладная», чтобы создать новый счет-фактуру."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +166,Packaging and labeling,Упаковка и маркировка
 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,"Пожалуйста, сформулируйте Базовая валюта в компании Мастер и общие настройки по умолчанию"
@@ -1591,19 +1535,18 @@
 DocType: Budget Detail,Fiscal Year,Отчетный год
 DocType: Cost Center,Budget,Бюджет
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +41,"Budget cannot be assigned against {0}, as it's not an Income or Expense account","Бюджет не может быть назначен на {0}, так как это не доход или расход счета"
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Achieved,Достигнутый
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,Достигнутый
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +65,Territory / Customer,Область / клиентов
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,e.g. 5,"например, 5"
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +207,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},"Ряд {0}: суммы, выделенной {1} должен быть меньше или равен счета-фактуры сумма задолженности {2}"
+apps/erpnext/erpnext/public/js/setup_wizard.js +294,e.g. 5,"например, 5"
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},"Ряд {0}: суммы, выделенной {1} должен быть меньше или равен счета-фактуры сумма задолженности {2}"
 DocType: Sales Invoice,In Words will be visible once you save the Sales Invoice.,По словам будет виден только вы сохраните Расходная накладная.
 DocType: Item,Is Sales Item,Является продаж товара
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,Пункт Group Tree
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,Пункт {0} не установка для мастера серийные номера Проверить товара
 DocType: Maintenance Visit,Maintenance Time,Техническое обслуживание Время
 ,Amount to Deliver,Сумма Доставка
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +620,A Product or Service,Продукт или сервис
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +158,There were errors.,Были ошибки.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +101,Tapping,Нажатие
+apps/erpnext/erpnext/public/js/setup_wizard.js +356,A Product or Service,Продукт или сервис
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +146,There were errors.,Были ошибки.
 DocType: Naming Series,Current Value,Текущее значение
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +171,{0} created,{0} создан
 DocType: Delivery Note Item,Against Sales Order,Против заказ клиента
@@ -1618,7 +1561,7 @@
 apps/erpnext/erpnext/accounts/party.py +275,Due Date cannot be before Posting Date,"Впритык не может быть, прежде чем отправлять Дата"
 DocType: Website Item Group,Website Item Group,Сайт Пункт Группа
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Duties and Taxes,Пошлины и налоги
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Please enter Reference date,"Пожалуйста, введите дату Ссылка"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +312,Please enter Reference date,"Пожалуйста, введите дату Ссылка"
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} записи оплаты не могут быть отфильтрованы по {1}
 DocType: Item Website Specification,Table for Item that will be shown in Web Site,"Таблица для элемента, который будет показан на веб-сайте"
 DocType: Purchase Order Item Supplied,Supplied Qty,Поставляется Кол-во
@@ -1626,7 +1569,7 @@
 apps/erpnext/erpnext/config/stock.py +103,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,Пункт мудрый История покупок
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +152,Red,Красный
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Red,Красный
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +228,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},"Пожалуйста, нажмите на кнопку ""Generate Расписание"", чтобы принести Серийный номер добавлен для Пункт {0}"
 DocType: Account,Frozen,замороженные
 ,Open Production Orders,Открыть Производственные заказы
@@ -1641,7 +1584,7 @@
 DocType: Item Attribute,Attribute Name,Имя атрибута
 apps/erpnext/erpnext/controllers/selling_controller.py +236,Item {0} must be Sales or Service Item in {1},Пункт {0} должно быть продажи или в пункте СЕРВИС {1}
 DocType: Item Group,Show In Website,Показать на сайте
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +621,Group,Группа
+apps/erpnext/erpnext/public/js/setup_wizard.js +357,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","Для отслеживания бренд в следующие документы накладной, редкая возможность, материал запрос, Пункт, покупка заказ, покупка ваучера, Покупатель получении, Котировальный, накладная, товаров Bundle, Продажи заказа, Серийный номер"
@@ -1651,6 +1594,7 @@
 DocType: Features Setup,Brands,Бренды
 DocType: C-Form Invoice Detail,Invoice No,Счет-фактура Нет
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +480,From Purchase Order,От Заказа
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +92,"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,Отставка Письмо Дата
@@ -1658,35 +1602,31 @@
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +137,Not Set,Не указано
 DocType: Communication,Date,Дата
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,Повторите Выручка клиентов
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +651,Sit tight while your system is being setup. This may take a few moments.,"Сиди, пока система в настоящее время установки. Это может занять несколько секунд."
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +115,Sit tight while your system is being setup. This may take a few moments.,"Сиди, пока система в настоящее время установки. Это может занять несколько секунд."
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +51,{0} ({1}) must have role 'Expense Approver',"{0} ({1}) должен иметь роль ""Утверждающего Расходы"""
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Pair,Носите
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Pair,Носите
 DocType: Bank Reconciliation Detail,Against Account,Против Счет
 DocType: Maintenance Schedule Detail,Actual Date,Фактическая дата
 DocType: Item,Has Batch No,"Имеет, серия №"
 DocType: Delivery Note,Excise Page Number,Количество Акцизный Страница
 DocType: Employee,Personal Details,Личные Данные
 ,Maintenance Schedules,Графики технического обслуживания
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +44,Embossing,Чеканка
 ,Quotation Trends,Котировочные тенденции
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +139,Item Group not mentioned in item master for item {0},Пункт Группа не упоминается в мастера пункт по пункту {0}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +302,Debit To account must be a Receivable account,Дебету счета должны быть задолженность счет
-apps/erpnext/erpnext/stock/doctype/item/item.py +310,"As Production Order can be made for this item, it must be a stock item.","Как Производственный заказ можно сделать по этой статье, он должен быть запас пункт."
 DocType: Shipping Rule Condition,Shipping Amount,Доставка Количество
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +140,Joining,Присоединение
-DocType: Authorization Rule,Above Value,Выше стоимости
 ,Pending Amount,В ожидании Сумма
 DocType: Purchase Invoice Item,Conversion Factor,Коэффициент преобразования
 DocType: Purchase Order,Delivered,Доставлено
 apps/erpnext/erpnext/config/hr.py +160,Setup incoming server for jobs email id. (e.g. jobs@example.com),Настройка сервера входящей подрабатывать электронный идентификатор. (Например jobs@example.com)
 DocType: Purchase Receipt,Vehicle Number,Количество транспортных средств
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,"Дата, на которую повторяющихся счет будет остановить"
+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,Дебиторская задолженность
 ,Supplier-Wise Sales Analytics,Поставщик-Wise продаж Аналитика
 DocType: Address Template,This format is used if country specific format is not found,"Этот формат используется, если конкретный формат страна не найден"
 DocType: Custom Field,Custom,Пользовательские
 DocType: Production Order,Use Multi-Level BOM,Использование Multi-Level BOM
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +26,Injection molding,Литье под давлением
 DocType: Bank Reconciliation,Include Reconciled Entries,Включите примириться Записи
 apps/erpnext/erpnext/config/accounts.py +41,Tree of finanial accounts.,Дерево finanial счетов.
 DocType: Leave Control Panel,Leave blank if considered for all employee types,"Оставьте пустым, если считать для всех типов сотрудников"
@@ -1696,30 +1636,28 @@
 apps/frappe/frappe/config/setup.py +130,Printing,Печать
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +114,Expense Claim is pending approval. Only the Expense Approver can update status.,Расходов претензии ожидает одобрения. Только расходов утверждающий можете обновить статус.
 DocType: Purchase Invoice,Additional Discount Amount,Дополнительная скидка Сумма
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +99,The day(s) on which you are applying for leave are holiday. You need not apply for leave.,"День (дни), на котором вы подаете заявление на отпуск, отпуск. Вам не нужно обратиться за разрешением."
 apps/frappe/frappe/public/js/frappe/misc/utils.js +110,and,и
 DocType: Leave Block List Allow,Leave Block List Allow,Оставьте Черный список Разрешить
 apps/erpnext/erpnext/setup/doctype/company/company.py +236,Abbr can not be blank or space,Аббревиатура не может быть пустой или пробелом
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +50,Sports,Спорт
+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/setup/page/setup_wizard/setup_wizard.js +626,Unit,Единица
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Unit,Единица
 apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.py +182,Please set Dropbox access keys in your site config,"Пожалуйста, установите ключи доступа Dropbox на своем сайте конфигурации"
 apps/erpnext/erpnext/stock/get_item_details.py +113,Please specify Company,"Пожалуйста, сформулируйте Компания"
 ,Customer Acquisition and Loyalty,Приобретение и лояльности клиентов
 DocType: Purchase Receipt,Warehouse where you are maintaining stock of rejected items,"Склад, где вы работаете запас отклоненных элементов"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +408,Your financial year ends on,Ваш финансовый год заканчивается
+apps/erpnext/erpnext/public/js/setup_wizard.js +156,Your financial year ends on,Ваш финансовый год заканчивается
 DocType: POS Profile,Price List,Прайс-лист
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +20,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,"{0} теперь используется как основной Фискальный Год. Пожалуйста, обновите страницу в браузере, чтобы изменения вступили в силу."
 apps/erpnext/erpnext/projects/doctype/project/project.js +47,Expense Claims,Расходные Претензии
 DocType: Issue,Support,Поддержка
-DocType: Authorization Rule,Approving Role,Утверждении Роль
 ,BOM Search,Спецификация Поиск
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +176,Closing (Opening + Totals),Закрытие (открытие + Итоги)
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +26,Please specify currency in Company,"Пожалуйста, сформулируйте валюту в обществе"
 DocType: Workstation,Wages per hour,Заработная плата в час
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,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/controllers/accounts_controller.py +236,Account {0} is invalid. Account Currency must be {1},Счет {0} является недопустимым. Валюта счета должны быть {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +237,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}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +53,Clearance date cannot be before check date in row {0},Дата просвет не может быть до даты регистрации в строке {0}
 DocType: Salary Slip,Deduction,Вычет
@@ -1738,13 +1676,13 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +82,Item {0} has already been returned,Пункт {0} уже вернулся
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,**Фискальный год** представляет собой финансовый год. Все бухгалтерские записи и другие крупные сделки отслеживаются по **Фискальному году**.
 DocType: Opportunity,Customer / Lead Address,Заказчик / Ведущий Адрес
+apps/erpnext/erpnext/stock/doctype/item/item.py +112,Warning: Invalid SSL certificate on attachment {0},Внимание: Неверный сертификат SSL на привязанности {0}
 DocType: Production Order Operation,Actual Operation Time,Фактическая Время работы
 DocType: Authorization Rule,Applicable To (User),Применимо к (Пользователь)
 DocType: Purchase Taxes and Charges,Deduct,Вычеты €
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +170,Job Description,Описание Работы
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +170,Job Description,Описание Работы
 DocType: Purchase Order Item,Qty as per Stock UOM,Кол-во в соответствии со UOM
 apps/frappe/frappe/model/rename_doc.py +343,Please select a valid csv file with data,"Пожалуйста, выберите правильный файл CSV с данными"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +92,Coating,Покрытие
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +126,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Специальные символы, кроме ""-"" ""."", ""#"", и ""/"" не пускают в серию имен"
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Следите продаж кампаний. Следите за проводами, цитаты, заказа на закупку и т.д. из кампаний, чтобы оценить отдачу от инвестиций. "
 DocType: Expense Claim,Approver,Утверждаю
@@ -1754,12 +1692,11 @@
 DocType: Supplier Quotation,Manufacturing Manager,Производство менеджер
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},Серийный номер {0} находится на гарантии ДО {1}
 apps/erpnext/erpnext/config/stock.py +69,Split Delivery Note into packages.,Сплит Delivery Note в пакеты.
-apps/erpnext/erpnext/hooks.py +84,Shipments,Поставки
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +29,Dip molding,Окунитесь литье
+apps/erpnext/erpnext/hooks.py +68,Shipments,Поставки
 DocType: Purchase Order,To be delivered to customer,Для поставляться заказчику
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,Время входа Статус должен быть представлен.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,Серийный номер {0} не принадлежит ни к одной Склад
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +650,Setting Up,Настройка
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +114,Setting Up,Настройка
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,Row # ,Ряд #
 DocType: Purchase Invoice,In Words (Company Currency),В Слов (Компания валюте)
 DocType: Pricing Rule,Supplier,Поставщик
@@ -1767,7 +1704,7 @@
 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 +166,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,"Расходов или Разница счета является обязательным для п. {0}, поскольку это влияет общая стоимость акции"
-apps/erpnext/erpnext/controllers/accounts_controller.py +354,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","Не можете overbill для пункта {0} в строке {1} более {2}. Чтобы overbilling, пожалуйста, установите в акционерных Настройки"
+apps/erpnext/erpnext/controllers/accounts_controller.py +355,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","Не можете overbill для пункта {0} в строке {1} более {2}. Чтобы overbilling, пожалуйста, установите в акционерных Настройки"
 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 +135,User {0} is disabled,Пользователь {0} отключен
@@ -1780,27 +1717,26 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,{0} is mandatory for Item {1},{0} является обязательным для п. {1}
 DocType: Currency Exchange,From Currency,Из валюты
 DocType: DocField,Name,Имя
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +211,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Пожалуйста, выберите выделенной суммы, счет-фактура Тип и номер счета-фактуры в по крайней мере одном ряду"
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +104,Sales Order required for Item {0},Заказать продаж требуется для Пункт {0}
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +158,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Пожалуйста, выберите выделенной суммы, счет-фактура Тип и номер счета-фактуры в по крайней мере одном ряду"
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +107,Sales Order required for Item {0},Заказать продаж требуется для Пункт {0}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +43,Amounts not reflected in system,Суммы не отражается в системе
 DocType: Purchase Invoice Item,Rate (Company Currency),Тариф (Компания Валюта)
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +40,Others,Другое
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +40,Others,Другое
 apps/erpnext/erpnext/templates/includes/product_page.js +80,Cannot find a matching Item. Please select some other value for {0}.,"Не можете найти соответствующий пункт. Пожалуйста, выберите другое значение для {0}."
 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/frappe/frappe/core/doctype/doctype/boilerplate/controller_list.html +31,Completed,Завершено
 DocType: Web Form,Select DocType,Выберите тип документа
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +104,Broaching,Протяжные
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +12,Banking,Банковские операции
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,Банковские операции
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +38,Please click on 'Generate Schedule' to get schedule,"Пожалуйста, нажмите на кнопку ""Generate Расписание"", чтобы получить график"
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +283,New Cost Center,Новый Центр Стоимость
 DocType: Bin,Ordered Quantity,Заказанное количество
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +397,"e.g. ""Build tools for builders""","например ""Построить инструменты для строителей """
+apps/erpnext/erpnext/public/js/setup_wizard.js +145,"e.g. ""Build tools for builders""","например ""Построить инструменты для строителей """
 DocType: Quality Inspection,In Process,В процессе
 DocType: Authorization Rule,Itemwise Discount,Itemwise Скидка
 DocType: Purchase Order Item,Reference Document Type,Ссылка Тип документа
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +318,{0} against Sales Order {1},{0} против заказов клиентов {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +320,{0} against Sales Order {1},{0} против заказов клиентов {1}
 DocType: Account,Fixed Asset,Исправлена активами
 apps/erpnext/erpnext/config/stock.py +283,Serialized Inventory,Серийный Инвентарь
 DocType: Activity Type,Default Billing Rate,По умолчанию Платежная Оценить
@@ -1815,14 +1751,13 @@
 DocType: Purchase Invoice Item,Page Break,Разрыв страницы
 DocType: Production Order Operation,Pending,В ожидании
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,"Пользователи, которые могут утвердить отпуска приложения конкретного работника"
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +33,You cannot change default UOM of Variant. To change default UOM for Variant change default UOM of the Template,Вы не можете изменить по умолчанию Единица измерения варианта. Чтобы изменить стандартную UOM для Variant изменение по умолчанию Единица измерения шаблона
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +50,Office Equipments,Оборудование офиса
 DocType: Purchase Invoice Item,Qty,Кол-во
 DocType: Fiscal Year,Companies,Компании
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +24,Electronics,Электроника
+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/support/doctype/maintenance_visit/maintenance_visit.js +18,From Maintenance Schedule,С графиком технического обслуживания
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +56,Full-time,Полный рабочий день
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +56,Full-time,Полный рабочий день
 DocType: Purchase Invoice,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.","Если вы создали стандартный шаблон в продажах налоги и сборы шаблон, выберите одну и нажмите на кнопку ниже."
@@ -1834,11 +1769,12 @@
 DocType: Job Applicant,Job Opening,Работа Открытие
 DocType: Payment Reconciliation,Payment Reconciliation,Оплата Примирение
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +154,Please select Incharge Person's name,"Пожалуйста, выберите имя InCharge Лица"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +51,Technology,Технология
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,Технология
 DocType: Offer Letter,Offer Letter,Предложение письмо
 apps/erpnext/erpnext/config/manufacturing.py +51,Generate Material Requests (MRP) and Production Orders.,Создать запросы Материал (ППМ) и производственных заказов.
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +68,Total Invoiced Amt,Всего в счете-фактуре 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.","Чтобы добавить дочерние узлы, изучить дерево и нажмите на узле, при которых вы хотите добавить больше узлов."
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +102,Credit To account must be a Payable account,Кредит на счету должно быть оплачивается счет
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +233,BOM recursion: {0} cannot be parent or child of {2},BOM рекурсия: {0} не может быть родитель или ребенок {2}
@@ -1851,10 +1787,8 @@
 DocType: Item,Customer Item Codes,Заказчик Предмет коды
 DocType: Opportunity,Lost Reason,Забыли Причина
 apps/erpnext/erpnext/config/accounts.py +68,Create Payment Entries against Orders or Invoices.,Создание записей оплаты по заказам или счетов-фактур.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +141,Welding,Сварка
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +40,New Stock UOM is required,Новый фонда Единица измерения требуется
 DocType: Quality Inspection,Sample Size,Размер выборки
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +443,All items have already been invoiced,На все товары уже выставлены счета
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +446,All items have already been invoiced,На все товары уже выставлены счета
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',"Пожалуйста, сформулируйте действительный 'От делу №'"
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +287,Further cost centers can be made under Groups but entries can be made against non-Groups,"Дальнейшие МВЗ можно сделать под групп, но записи могут быть сделаны в отношении не-групп"
 DocType: Project,External,Внешний  GPS с RS232
@@ -1866,8 +1800,7 @@
 DocType: Bin,Actual Quantity,Фактическое Количество
 DocType: Shipping Rule,example: Next Day Shipping,пример: Следующий день доставка
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,Серийный номер {0} не найден
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +563,Your Customers,Ваши клиенты
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +27,Compression molding,Прессование
+apps/erpnext/erpnext/public/js/setup_wizard.js +303,Your Customers,Ваши клиенты
 DocType: Leave Block List Date,Block Date,Блок Дата
 DocType: Sales Order,Not Delivered,Не доставлен
 ,Bank Clearance Summary,Банк уплата по счетам итого
@@ -1888,10 +1821,10 @@
 DocType: SMS Log,Sent To,Отправить
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +28,Make Sales Invoice,Сделать Расходная накладная
 DocType: Company,For Reference Only.,Только для справки.
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +29,Invalid {0}: {1},Неверный {0}: {1}
+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,Планирование мощностей
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +49,'From Date' is required,"Поле ""С даты"" является обязательным для заполнения"
+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,Новый Место работы
@@ -1906,7 +1839,7 @@
 DocType: Serial No,Delivery Time,Время доставки
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,"Проблемам старения, на основе"
 DocType: Item,End of Life,Конец срока службы
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +41,Travel,Путешествия
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +41,Travel,Путешествия
 DocType: Leave Block List,Allow Users,Разрешить пользователям
 DocType: Purchase Order,Customer Mobile No,Заказчик Мобильная Нет
 DocType: Sales Invoice,Recurring,Периодическая
@@ -1920,7 +1853,7 @@
 DocType: Naming Series,User must always select,Пользователь всегда должен выбирать
 DocType: Stock Settings,Allow Negative Stock,Разрешить негативных складе
 DocType: Installation Note,Installation Note,Установка Примечание
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +541,Add Taxes,Добавить налоги
+apps/erpnext/erpnext/public/js/setup_wizard.js +283,Add Taxes,Добавить налоги
 ,Financial Analytics,Финансовая аналитика
 DocType: Quality Inspection,Verified By,Verified By
 DocType: Address,Subsidiary,Филиал
@@ -1930,7 +1863,6 @@
 DocType: System Settings,In Hours,В час
 DocType: Process Payroll,Create Salary Slip,Создание Зарплата Слип
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Expected balance as per bank,Ожидаемое сальдо по состоянию на банк
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +115,Buffing,Полировка
 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,Сотрудник
@@ -1947,11 +1879,11 @@
 DocType: Rename Tool,File to Rename,Файл Переименовать
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +176,Purchse Order number required for Item {0},Число Purchse Заказать требуется для Пункт {0}
 apps/erpnext/erpnext/public/js/controllers/transaction.js +136,Show Payments,Показать платежи
-apps/erpnext/erpnext/controllers/buying_controller.py +245,Specified BOM {0} does not exist for Item {1},Указано BOM {0} не существует для п {1}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +202,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,График обслуживания {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 +197,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,График обслуживания {0} должно быть отменено до отмены этого заказ клиента
 apps/frappe/frappe/desk/page/backups/backups.html +13,Size,Размер
 DocType: Notification Control,Expense Claim Approved,Расходов претензии Утверждено
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +113,Pharmaceutical,Фармацевтический
+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,Заказ на продажу Требуемые
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +30,Create Customer,Создание клиентов
@@ -1961,7 +1893,6 @@
 DocType: Quality Inspection Reading,Reading 9,Чтение 9
 DocType: Supplier,Is Frozen,Замерз
 DocType: Buying Settings,Buying Settings,Настройка покупки
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +122,Mass finishing,Масса отделка
 DocType: Stock Entry Detail,BOM No. for a Finished Good Item,BOM номер для позиции готового изделия
 DocType: Upload Attendance,Attendance To Date,Посещаемость To Date
 apps/erpnext/erpnext/config/selling.py +158,Setup incoming server for sales email id. (e.g. sales@example.com),Настройка сервера входящей для продажи электронный идентификатор. (Например sales@example.com)
@@ -1969,7 +1900,7 @@
 DocType: Payment Tool,Payment Account,Оплата счета
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +713,Please specify Company to proceed,"Пожалуйста, сформулируйте Компания приступить"
 apps/frappe/frappe/public/js/frappe/model/indicator.js +30,Draft,Черновик
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +46,Compensatory Off,Компенсационные Выкл
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Compensatory Off,Компенсационные Выкл
 DocType: Quality Inspection Reading,Accepted,Принято
 DocType: User,Female,Жен
 DocType: Journal Entry Account,Debit in Account Currency,Дебет в валюте счета
@@ -1981,7 +1912,7 @@
 DocType: Shipping Rule,Shipping Rule Label,Правило ярлыке
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +209,Raw Materials cannot be blank.,Сырье не может быть пустым.
 DocType: Newsletter,Test,Тест
-apps/erpnext/erpnext/stock/doctype/item/item.py +364,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +368,"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'","Как есть существующие биржевые операции по этому пункту, \ вы не можете изменить значения &#39;Имеет серийный номер &quot;,&quot; Имеет Batch Нет »,« Является ли со Пункт &quot;и&quot; Оценка Метод &quot;"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +448,Quick Journal Entry,Быстрый журнал запись
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +92,You can not change rate if BOM mentioned agianst any item,"Вы не можете изменить скорость, если спецификации упоминается agianst любого элемента"
@@ -1992,13 +1923,14 @@
 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.,Отдельный производственный заказ будет создан для каждого готового хорошего пункта.
 DocType: Purchase Invoice,Terms and Conditions1,Сроки и условиях1
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +18,Complete Setup,Завершение установки
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard_page.html +18,Complete Setup,Завершение установки
 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),"Проверьте это, чтобы запретить фракции. (Для №)"
 apps/erpnext/erpnext/config/crm.py +96,Newsletter Mailing List,Рассылка список рассылки
 DocType: Delivery Note,Transporter Name,Transporter Имя
+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 +57,Total Absent,Всего Отсутствует
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +746,Item or Warehouse for row {0} does not match Material Request,Пункт или Склад для строки {0} не соответствует запросу материал
@@ -2023,16 +1955,15 @@
 DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),Basic Rate (как в фондовой UOM)
 DocType: SMS Log,No of Requested SMS,Нет запрашиваемых SMS
 DocType: Campaign,Campaign-.####,Кампания-.# # # #
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +55,Piercing,Пронзительный
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,Следующие шаги
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +117,Contract End Date must be greater than Date of Joining,"Конец контракта Дата должна быть больше, чем дата вступления"
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,"Третья сторона дистрибьютор / дилер / комиссионер / филиал / реселлера, который продает продукты компании для комиссии."
 DocType: Customer Group,Has Child Node,Имеет дочерний узел
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{0} against Purchase Order {1},{0} против Заказа {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +332,{0} against Purchase Order {1},{0} против Заказа {1}
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","Введите статические параметры адрес здесь (Например отправитель = 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/page/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
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +110,Photochemical machining,Фотохимические обработки
 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.
 
 #### Note
@@ -2078,7 +2009,7 @@
 DocType: Purchase Receipt Item,Recd Quantity,RECD Количество
 DocType: Email Account,Email Ids,E-mail идентификаторы
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},"Не можете производить больше элемент {0}, чем количество продаж Заказать {1}"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +471,Stock Entry {0} is not submitted,Фото Элемент {0} не представлены
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +473,Stock Entry {0} is not submitted,Фото Элемент {0} не представлены
 DocType: Payment Reconciliation,Bank / Cash Account,Банк / Расчетный счет
 DocType: Tax Rule,Billing City,Биллинг Город
 DocType: Global Defaults,Hide Currency Symbol,Скрыть Символ Валюты
@@ -2094,7 +2025,7 @@
 DocType: Purchase Invoice,Currency and Price List,Валюта и прайс-лист
 DocType: Opportunity,Customer / Lead Name,Заказчик / Ведущий Имя
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +63,Clearance Date not mentioned,Клиренс Дата не упоминается
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +71,Production,Производство
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Production,Производство
 DocType: Item,Allow Production Order,Разрешить производственного заказа
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +60,Row {0}:Start Date must be before End Date,Ряд {0}: Дата начала должна быть раньше даты окончания
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Всего (кол-во)
@@ -2107,7 +2038,7 @@
 apps/erpnext/erpnext/utilities/doctype/address/address.py +113,My Addresses,Мои Адреса
 DocType: Stock Ledger Entry,Outgoing Rate,Исходящие Оценить
 apps/erpnext/erpnext/config/hr.py +100,Organization branch master.,Организация филиал мастер.
-apps/erpnext/erpnext/controllers/accounts_controller.py +237, or ,или
+apps/erpnext/erpnext/controllers/accounts_controller.py +238, 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-Над
@@ -2134,6 +2065,7 @@
 DocType: Stock Entry Detail,Serial No / Batch,Серийный номер / Партия
 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 +213,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',"График обслуживания не генерируется для всех элементов. Пожалуйста, нажмите на кнопку ""Generate Расписание"""
 ,To Produce,Чтобы продукты
 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} в размере Item ряды также должны быть включены {3}
@@ -2141,10 +2073,7 @@
 DocType: Bin,Reserved Quantity,Зарезервировано Количество
 DocType: Landed Cost Voucher,Purchase Receipt Items,Покупка чеков товары
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,Настройка формы
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +62,Cutting,Резка
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +69,Flattening,Уплощение
 DocType: Account,Income Account,Счет Доходов
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +22,Molding,Молдинг
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +632,Delivery,Доставка
 DocType: Stock Reconciliation Item,Current Qty,Текущий Кол-во
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section","См. ""Оценить материалов на основе"" в калькуляции раздел"
@@ -2154,20 +2083,19 @@
 apps/frappe/frappe/desk/moduleview.py +61,Documents,Документы
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +17,Ref,N
 DocType: Cost Center,Cost Center,Центр учета затрат
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.js +48,Voucher #,Ваучер #
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +36,Voucher #,Ваучер #
 DocType: Notification Control,Purchase Order Message,Заказ на сообщение
 DocType: Tax Rule,Shipping Country,Доставка Страна
 DocType: Upload Attendance,Upload HTML,Загрузить HTML
-apps/erpnext/erpnext/controllers/accounts_controller.py +391,"Total advance ({0}) against Order {1} cannot be greater \
+apps/erpnext/erpnext/controllers/accounts_controller.py +392,"Total advance ({0}) against Order {1} cannot be greater \
 				than the Grand Total ({2})","Всего продвижение ({0}) Под заказ {1} не может быть больше \
  чем ВСЕГО ({2})"
 DocType: Employee,Relieving Date,Освобождение Дата
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +12,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.","Цены Правило состоит перезаписать Прайс-лист / определить скидка процент, на основе некоторых критериев."
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,Склад может быть изменен только с помощью со входа / накладной / Покупка получении
 DocType: Employee Education,Class / Percentage,Класс / в процентах
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +92,Head of Marketing and Sales,Начальник отдела маркетинга и продаж
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +31,Income Tax,Подоходный налог
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +157,Laser engineered net shaping,Лазерная инженерии чистый формирование
+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.","Если выбран Цены правила делается для ""цена"", это приведет к перезаписи прайс-лист. Цены Правило цена окончательная цена, поэтому никакого скидка не следует применять. Таким образом, в таких сделках, как заказ клиента, Заказ и т.д., это будет выбрано в поле 'Rate', а не поле ""Прайс-лист Rate '."
 apps/erpnext/erpnext/config/selling.py +163,Track Leads by Industry Type.,Трек Ведет по Отрасль Тип.
 DocType: Item Supplier,Item Supplier,Пункт Поставщик
@@ -2190,31 +2118,28 @@
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Остаток после проведения
 ,Pending SO Items For Purchase Request,В ожидании SO предметы для покупки запрос
 DocType: Supplier,Billing Currency,Платежная валют
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +148,Extra Large,Очень Большой
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,Extra Large,Очень Большой
 ,Profit and Loss Statement,Счет прибылей и убытков
 DocType: Bank Reconciliation Detail,Cheque Number,Чек Количество
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +43,Pressing,Прессование
 DocType: Payment Tool Detail,Payment Tool Detail,"Деталь платежный инструмент,"
 ,Sales Browser,Браузер по продажам
 DocType: Journal Entry,Total Credit,Всего очков
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +474,Warning: Another {0} # {1} exists against stock entry {2},Внимание: Еще {0} # {1} существует против вступления фондовой {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +459,Local,Локальные
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +476,Warning: Another {0} # {1} exists against stock entry {2},Внимание: Еще {0} # {1} существует против вступления фондовой {2}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +397,Local,Локальные
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),Кредиты и авансы (активы)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,Должники
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +147,Large,Большой
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +23,No employee found!,Сотрудник не найден!
+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 +152,Please mention no of visits required,"Пожалуйста, укажите кол-во посещений, необходимых"
 DocType: Purchase Order,Customer Address Display,Заказчик Адрес Показать
 DocType: Stock Settings,Default Valuation Method,Метод по умолчанию Оценка
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +127,Polishing,Полировка
 DocType: Production Order Operation,Planned Start Time,Планируемые Время
 apps/erpnext/erpnext/config/accounts.py +63,Close Balance Sheet and book Profit or Loss.,Закрыть баланс и книга прибыли или убытка.
-apps/erpnext/erpnext/stock/doctype/item/item.py +661,"Default Unit of Measure for Item {0} cannot be changed directly because \
+apps/erpnext/erpnext/stock/doctype/item/item.py +665,"Default Unit of Measure for Item {0} cannot be changed directly because \
 			you have already made some transaction(s) with another UOM. To change default UOM, \
 			use 'UOM Replace Utility' tool under Stock module.","По умолчанию Единица измерения для п {0} не может быть изменен непосредственно, потому что \ вы уже сделали некоторые сделки (сделок) с другим UOM. Чтобы изменить стандартную UOM, \ использование &quot;Единица измерения Заменить Utility &#39;инструмент под фондовой модуля."
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,Укажите Курс конвертировать одну валюту в другую
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +146,Quotation {0} is cancelled,Цитата {0} отменяется
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +141,Quotation {0} is cancelled,Цитата {0} отменяется
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,Общей суммой задолженности
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} was on leave on {1}. Cannot mark attendance.,Сотрудник {0} был в отпусках по {1}. Невозможно отметить посещаемость.
 DocType: Sales Partner,Targets,Цели
@@ -2225,7 +2150,6 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +158,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,Компьютеры
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +112,Electro-chemical grinding,Электро-химический шлифование
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +14,This is a root customer group and cannot be edited.,Это корневая группа клиентов и не могут быть изменены.
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +39,Please setup your chart of accounts before you start Accounting Entries,"Пожалуйста, установите свой план счетов, прежде чем начать бухгалтерских проводок"
 DocType: Purchase Invoice,Ignore Pricing Rule,Игнорировать Цены Правило
@@ -2283,7 +2207,6 @@
 DocType: Maintenance Visit,Purposes,Цели
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +103,Atleast one item should be entered with negative quantity in return document,По крайней мере один элемент должен быть введен с отрицательным количеством в обратном документа
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +67,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","Операция {0} больше, чем каких-либо имеющихся рабочих часов в рабочей станции {1}, сломать операции в несколько операций"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +134,Electrochemical machining,Анодно-химическая обработка
 ,Requested,Запрошено
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +66,No Remarks,Нет Замечания
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +13,Overdue,Просроченный
@@ -2292,7 +2215,7 @@
 DocType: Monthly Distribution,Distribution Name,Распределение Имя
 DocType: Features Setup,Sales and Purchase,Купли-продажи
 DocType: Supplier Quotation Item,Material Request No,Материал Запрос Нет
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +218,Quality Inspection required for Item {0},"Контроль качества, необходимые для Пункт {0}"
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +221,Quality Inspection required for Item {0},"Контроль качества, необходимые для Пункт {0}"
 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),Чистая скорость (Компания валют)
@@ -2310,9 +2233,8 @@
 apps/erpnext/erpnext/accounts/report/financial_statements.py +16,Fiscal Year {0} not found.,Финансовый год {0} не найден.
 DocType: Bank Reconciliation,Get Relevant Entries,Получить соответствующие записи
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +407,Accounting Entry for Stock,Бухгалтерский учет Вход для запасе
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +64,Coining,Coining
 DocType: Sales Invoice,Sales Team1,Команда1 продаж
-apps/erpnext/erpnext/stock/doctype/item/item.py +412,Item {0} does not exist,Пункт {0} не существует
+apps/erpnext/erpnext/stock/doctype/item/item.py +416,Item {0} does not exist,Пункт {0} не существует
 DocType: Sales Invoice,Customer Address,Клиент Адрес
 apps/frappe/frappe/desk/query_report.py +136,Total,Общая сумма
 DocType: Purchase Invoice,Apply Additional Discount On,Применить Дополнительная скидка на
@@ -2324,14 +2246,13 @@
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),Сумма налога после скидки Сумма (Компания валют)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +149,Target warehouse is mandatory for row {0},Целевая склад является обязательным для ряда {0}
 DocType: Quality Inspection,Quality Inspection,Контроль качества
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +144,Extra Small,Очень Маленький
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +20,Spray forming,Спрей формирования
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Extra Small,Очень Маленький
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +458,Warning: Material Requested Qty is less than Minimum Order Qty,Внимание: Материал просил Кол меньше Минимальное количество заказа
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +191,Account {0} is frozen,Счет {0} заморожен
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,"Юридическое лицо / Вспомогательный с отдельным Планом счетов бухгалтерского учета, принадлежащего Организации."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +29,"Food, Beverage & Tobacco","Продукты питания, напитки и табак"
+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 +529,Can only make payment against unbilled {0},Могу только осуществить платеж против нефактурированных {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +531,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/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Minimum Inventory Level,Минимальный уровень запасов
 DocType: Stock Entry,Subcontract,Субподряд
@@ -2342,19 +2263,18 @@
 DocType: Item,Manufacturer Part Number,Номенклатурный код производителя
 DocType: Production Order Operation,Estimated Time and Cost,Расчетное время и стоимость
 DocType: Bin,Bin,Bin
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +50,Nosing,Капотирование
 DocType: SMS Log,No of Sent SMS,Нет отправленных SMS
 DocType: Account,Company,Организация
 DocType: Account,Expense Account,Расходов счета
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +49,Software,Программное обеспечение
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +151,Colour,Цвет
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +49,Software,Программное обеспечение
+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","Пожалуйста, выберите пункт, где &quot;ли со Пункт&quot; &quot;Нет&quot; и &quot;является продажа товара&quot; &quot;Да&quot;, и нет никакой другой Связка товаров"
 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 +281,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,"Пункт Row {0}: Покупка Получение {1}, не существует в таблице выше ""Купить ПОСТУПЛЕНИЯ"""
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +134,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 +145,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,Переименовать Входить
@@ -2364,7 +2284,7 @@
 apps/erpnext/erpnext/controllers/recurring_document.py +162,Please select {0},"Пожалуйста, выберите {0}"
 DocType: C-Form,C-Form No,C-образный Нет
 DocType: BOM,Exploded_items,Exploded_items
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +95,Researcher,Исследователь
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Researcher,Исследователь
 apps/frappe/frappe/custom/doctype/customize_form/customize_form.js +88,Update,Обновить
 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 +23,Name or Email is mandatory,Имя E-mail или является обязательным
@@ -2373,11 +2293,10 @@
 DocType: Employee,Exit,Выход
 apps/erpnext/erpnext/accounts/doctype/account/account.py +134,Root Type is mandatory,Корневая Тип является обязательным
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +295,Serial No {0} created,Серийный номер {0} создан
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +125,Vibratory finishing,Вибрационный отделка
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","Для удобства клиентов, эти коды могут быть использованы в печатных форматов, таких как счета-фактуры и накладных"
 DocType: Employee,You can enter any date manually,Вы можете ввести любую дату вручную
 DocType: Sales Invoice,Advertisement,Реклама
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +165,Probationary Period,Испытательный Срок
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Probationary Period,Испытательный Срок
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Только листовые узлы допускаются в сделке
 DocType: Expense Claim,Expense Approver,Расходы утверждающим
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,Покупка Получение товара Поставляется
@@ -2385,19 +2304,16 @@
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +17,To Datetime,Для DateTime
 DocType: SMS Settings,SMS Gateway URL,SMS Gateway URL
 apps/erpnext/erpnext/config/crm.py +53,Logs for maintaining sms delivery status,Журналы для просмотра статуса доставки смс
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +137,Grinding,Измельчение
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +34,Shrink wrapping,Упаковка в термоусадочную пленку
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +36,Pending Activities,В ожидании Деятельность
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,Confirmed,Подтвердил
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier > Supplier Type,Поставщик > Тип поставщика
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +127,Please enter relieving date.,"Пожалуйста, введите даты снятия."
 apps/erpnext/erpnext/controllers/trends.py +137,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/hr/doctype/leave_application/leave_application.py +51,Only Leave Applications with status 'Approved' can be submitted,"Только Оставьте приложений с статуса ""Одобрено"" могут быть представлены"
 apps/erpnext/erpnext/utilities/doctype/address/address.py +21,Address Title is mandatory.,Название адреса является обязательным.
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,"Введите имя кампании, если источником исследования является кампания"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +38,Newspaper Publishers,Газетных издателей
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +38,Newspaper Publishers,Газетных издателей
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,Выберите финансовый год
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +88,Smelting,Выплавка
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Изменить порядок Уровень
 DocType: Attendance,Attendance Date,Посещаемость Дата
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,Зарплата распада на основе Заработок и дедукции.
@@ -2412,16 +2328,15 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +414,[Error],[Ошибка]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,По словам будет виден только вы сохраните заказ клиента.
 ,Employee Birthday,Сотрудник День рождения
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +55,Venture Capital,Венчурный капитал
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,Венчурный капитал
 DocType: UOM,Must be Whole Number,Должно быть Целое число
 DocType: Leave Control Panel,New Leaves Allocated (In Days),Новые листья Выделенные (в днях)
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +51,Serial No {0} does not exist,Серийный номер {0} не существует
 DocType: Pricing Rule,Discount Percentage,Скидка в процентах
 DocType: Payment Reconciliation Invoice,Invoice Number,Номер накладной
-apps/erpnext/erpnext/hooks.py +70,Orders,Заказы
+apps/erpnext/erpnext/hooks.py +54,Orders,Заказы
 DocType: Leave Control Panel,Employee Type,Сотрудник Тип
 DocType: Employee Leave Approver,Leave Approver,Оставьте утверждающего
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +70,Swaging,Ковка
 DocType: Manufacturing Settings,Material Transferred for Manufacture,"Материал, переданный для производства"
 DocType: Expense Claim,"A user with ""Expense Approver"" role","Пользователь с ""Расходы утверждающий"" роли"
 ,Issued Items Against Production Order,Выпущенные товары против производственного заказа
@@ -2433,7 +2348,6 @@
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +62,Cost Center with existing transactions can not be converted to group,МВЗ с существующими сделок не могут быть преобразованы в группе
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Depreciation,Амортизация
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Поставщик (и)
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +29,Invalid period,Неверный период
 DocType: Customer,Credit Limit,{0}{/0} {1}Кредитный лимит {/1}
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,Выберите тип сделки
 DocType: GL Entry,Voucher No,Ваучер №
@@ -2443,9 +2357,9 @@
 DocType: Customer,Address and Contact,Адрес и контактная
 DocType: Customer,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}"
 apps/erpnext/erpnext/accounts/party.py +284,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Примечание: Из-за / Reference Дата превышает разрешенный лимит клиент дня на {0} сутки (ы)
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +621,Maint. Schedule,Maint. График
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +108,Abrasive jet machining,Абразивной обработки струя
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +632,Maint. Schedule,Maint. График
 DocType: Stock Settings,Freeze Stock Entries,Замораживание акций Записи
 DocType: Website Settings,Website Settings,Настройки сайта
 DocType: Item,Reorder level based on Warehouse,Уровень Изменение порядка на основе Склад
@@ -2462,7 +2376,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +75,Show Stock Entries,Показать изображения в дневнике
 ,Is Primary Address,Является первичным Адрес
 DocType: Production Order,Work-in-Progress Warehouse,Работа-в-Прогресс Склад
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +308,Reference #{0} dated {1},Ссылка # {0} от {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Reference #{0} dated {1},Ссылка # {0} от {1}
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +13,Manage Addresses,Управление адресов
 DocType: Pricing Rule,Item Code,Код элемента
 DocType: Production Planning Tool,Create Production Orders,Создание производственных заказов
@@ -2471,7 +2385,7 @@
 DocType: Lead,Market Segment,Сегмент рынка
 DocType: Communication,Phone,Телефон
 DocType: Employee Internal Work History,Employee Internal Work History,Сотрудник внутреннего Работа История
-apps/erpnext/erpnext/public/js/account_tree_grid.js +50,Closing (Dr),Закрытие (д-р)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +221,Closing (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.,Налоговый шаблон для продажи сделок.
@@ -2487,8 +2401,8 @@
 ,Billed Amount,Счетов выдано количество
 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 +129,Material Request {0} is cancelled or stopped,Материал Запрос {0} отменяется или остановлен
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +641,Add a few sample records,Добавить несколько пробных записей
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +133,Material Request {0} is cancelled or stopped,Материал Запрос {0} отменяется или остановлен
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Add a few sample records,Добавить несколько пробных записей
 apps/erpnext/erpnext/config/hr.py +210,Leave Management,Оставить управления
 DocType: Event,Groups,Группы
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,Группа по Счет
@@ -2501,38 +2415,34 @@
 DocType: Features Setup,Sales Extras,Продажи Дополнительно
 apps/erpnext/erpnext/accounts/utils.py +344,{0} budget for Account {1} against Cost Center {2} will exceed by {3},{0} бюджет на счет {1} к МВЗ {2} будет превышать {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +236,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Разница аккаунт должен быть тип счета активов / пассивов, так как это со Примирение запись Открытие"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +138,Purchase Order number required for Item {0},Число Заказ требуется для Пункт {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Order number required for Item {0},Число Заказ требуется для Пункт {0}
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',"Поле ""С даты"" должно быть после ""До даты"""
 ,Stock Projected Qty,Фото со Прогнозируемый Количество
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +147,Customer {0} does not belong to project {1},Клиент {0} не принадлежит к проекту {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +150,Customer {0} does not belong to project {1},Клиент {0} не принадлежит к проекту {1}
 DocType: Sales Order,Customer's Purchase Order,Заказ клиента
 DocType: Warranty Claim,From Company,От компании
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,Значение или Кол-во
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Minute,Минута
+apps/erpnext/erpnext/public/js/setup_wizard.js +363,Minute,Минута
 DocType: Purchase Invoice,Purchase Taxes and Charges,Покупка Налоги и сборы
 ,Qty to Receive,Кол-во на получение
 DocType: Leave Block List,Leave Block List Allowed,Оставьте Черный список животных
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +61,Conversion factor cannot be in fractions,Коэффициент пересчета не может быть в долях
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +358,You will use it to Login,Вы будете использовать его в Вход
+apps/erpnext/erpnext/public/js/setup_wizard.js +108,You will use it to Login,Вы будете использовать его в Вход
 DocType: Sales Partner,Retailer,Розничный торговец
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +99,Credit To account must be a Balance Sheet account,Кредит на счету должен быть баланс счета
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,Все типы поставщиков
 apps/erpnext/erpnext/stock/doctype/item/item.py +37,Item Code is mandatory because Item is not automatically numbered,"Код товара является обязательным, поскольку Деталь не автоматически нумеруются"
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +99,Quotation {0} not of type {1},Цитата {0} не типа {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +93,Quotation {0} not of type {1},Цитата {0} не типа {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,График обслуживания позиции
 DocType: Sales Order,%  Delivered,% Доставлен
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,Bank Overdraft Account,Банк овердрафтовый счет
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +15,Make Salary Slip,Сделать Зарплата Слип
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +18,Browse BOM,Просмотр спецификации
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +175,Secured Loans,Обеспеченные кредиты
-apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +3,Awesome Products,Потрясающие продукты
+apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +3,Awesome Products,Потрясающие продукты
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +189,Opening Balance Equity,Открытие Баланс акций
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +80,Cannot approve leave as you are not authorized to approve leaves on Block Dates,"Не можете одобрить отпуск, пока вы не уполномочен утверждать листья на блоке Даты"
 DocType: Appraisal,Appraisal,Оценка
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +13,Lost-foam casting,Литья по выплавляемым пены
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +47,Drawing,Рисунок
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +22,Date is repeated,Дата повторяется
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +148,Leave approver must be one of {0},Оставьте утверждающий должен быть одним из {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +162,Leave approver must be one of {0},Оставьте утверждающий должен быть одним из {0}
 DocType: Hub Settings,Seller Email,Продавец Email
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Общая стоимость покупки (через счет покупки)
 DocType: Workstation Working Hour,Start Time,Время
@@ -2546,7 +2456,7 @@
 DocType: Purchase Invoice Item,Net Amount (Company Currency),Чистая сумма (Компания валют)
 DocType: BOM Operation,Hour Rate,Часовой разряд
 DocType: Stock Settings,Item Naming By,Пункт Именование По
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +642,From Quotation,Из цитаты
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +655,From Quotation,Из цитаты
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},Другой Период Окончание Вступление {0} был сделан после {1}
 DocType: Production Order,Material Transferred for Manufacturing,Материал переведен на Производство
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +29,Account {0} does not exists,Счет {0} не существует
@@ -2560,21 +2470,19 @@
 DocType: Purchase Invoice Item,PR Detail,PR Подробно
 DocType: Sales Order,Fully Billed,Полностью Объявленный
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +20,Cash In Hand,Наличность кассы
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +72,Delivery warehouse required for stock item {0},Склад Доставка требуется для фондового пункта {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +119,Delivery warehouse required for stock item {0},Склад Доставка требуется для фондового пункта {0}
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),Общий вес пакета. Обычно вес нетто + упаковочный материал вес. (Для печати)
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,"Пользователи с этой ролью могут замороживать счета, а также создавать / изменять бухгалтерские проводки замороженных счетов"
 DocType: Serial No,Is Cancelled,Является Отмененные
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +281,My Shipments,Мои заказы
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +286,My Shipments,Мои заказы
 DocType: Journal Entry,Bill Date,Дата оплаты
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +43,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","Даже если есть несколько правил ценообразования с наивысшим приоритетом, то следующие внутренние приоритеты применяются:"
 DocType: Supplier,Supplier Details,Подробная информация о поставщике
 DocType: Communication,Recipients,Получатели
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +146,Screwing,Завинчивание
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +96,Knurling,Накатки
 DocType: Expense Claim,Approval Status,Статус утверждения
 DocType: Hub Settings,Publish Items to Hub,Опубликовать товары в Hub
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +44,From value must be less than to value in row {0},"От значение должно быть меньше, чем значение в строке {0}"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +133,Wire Transfer,Банковский перевод
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +133,Wire Transfer,Банковский перевод
 apps/erpnext/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py +25,Please select Bank Account,"Пожалуйста, выберите банковский счет"
 DocType: Newsletter,Create and Send Newsletters,Создание и отправка рассылки
 apps/frappe/frappe/public/js/frappe/views/reports/grid_report.js +305,From Date must be before To Date,"С даты должны быть, прежде чем к дате"
@@ -2582,14 +2490,14 @@
 DocType: Company,Default Income Account,По умолчанию Счет Доходы
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,Группа клиентов / клиентов
 DocType: Item Group,Check this if you want to show in website,"Проверьте это, если вы хотите показать в веб-сайт"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +190,Welcome to ERPNext,Добро пожаловать в ERPNext
+,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/page/setup_wizard/install_fixtures.py +37,Calls,Звонки
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Calls,Звонки
 DocType: Project,Total Costing Amount (via Time Logs),Всего Калькуляция Сумма (с помощью журналов Time)
 DocType: Purchase Order Item Supplied,Stock UOM,Фото со UOM
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Purchase Order {0} is not submitted,Заказ на {0} не представлено
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +194,Purchase Order {0} is not submitted,Заказ на {0} не представлено
 ,Projected,Проектированный
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},Серийный номер {0} не принадлежит Склад {1}
 apps/erpnext/erpnext/controllers/status_updater.py +136,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Примечание: Система не будет проверять по-доставки и избыточного бронирования по пункту {0} как количестве 0
@@ -2597,7 +2505,6 @@
 DocType: Issue,Opening Date,Открытие Дата
 DocType: Journal Entry,Remark,Примечание
 DocType: Purchase Receipt Item,Rate and Amount,Ставку и сумму
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +95,Boring,Скучный
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +667,From Sales Order,От заказа клиента
 DocType: Blog Category,Parent Website Route,Родитель Сайт Маршрут
 DocType: Sales Order,Not Billed,Не Объявленный
@@ -2611,19 +2518,17 @@
 apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount Amount,Сумма скидки
 DocType: Purchase Invoice,Return Against Purchase Invoice,Вернуться против счет покупки
 DocType: Item,Warranty Period (in days),Гарантийный срок (в днях)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +550,e.g. VAT,"например, НДС"
+apps/erpnext/erpnext/public/js/setup_wizard.js +292,e.g. VAT,"например, НДС"
 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,Цитата серии
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +52,"An item exists with same name ({0}), please change the item group name or rename the item","Элемент существует с тем же именем ({0}), пожалуйста, измените название группы или переименовать пункт"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +82,Hot metal gas forming,Горячая металла газа формирования
 DocType: Sales Order Item,Sales Order Date,Продажи Порядок Дата
 DocType: Sales Invoice Item,Delivered Qty,Поставляется Кол-во
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +63,Warehouse {0}: Company is mandatory,Склад {0}: Компания является обязательным
 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.",Перейти к соответствующей группе (обычно источник средств&gt; Краткосрочные обязательства&gt; налогам и сборам и создать новую учетную запись (нажав на Добавить Ребенка) типа &quot;Налог&quot; и упоминают ставка налога.
 ,Payment Period Based On Invoice Date,Оплата период на основе Накладная Дата
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +50,Missing Currency Exchange Rates for {0},Пропавших без вести Курсы валют на {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +135,Laser cutting,Лазерная резка
 DocType: Event,Monday,Понедельник
 DocType: Journal Entry,Stock Entry,Складская запись
 DocType: Account,Payable,К оплате
@@ -2656,7 +2561,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +111,Date Of Retirement must be greater than Date of Joining,Дата выхода на пенсию должен быть больше даты присоединения
 DocType: Sales Invoice,Against Income Account,Против ДОХОДОВ
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +69,{0}% Delivered,{0}% Поставляется
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +78,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Пункт {0}: Заказал Кол-во {1} не может быть меньше минимального заказа Кол-во {2} (определенной в пункте).
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Пункт {0}: Заказал Кол-во {1} не может быть меньше минимального заказа Кол-во {2} (определенной в пункте).
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Ежемесячный Процентное распределение
 DocType: Territory,Territory Targets,Территория Цели
 DocType: Delivery Note,Transporter Info,Transporter информация
@@ -2665,7 +2570,6 @@
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,"Титулы для шаблонов печати, например, счет-проформа."
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +140,Valuation type charges can not marked as Inclusive,Обвинения типа Оценка не может отмечен как включено
 DocType: POS Profile,Update Stock,Обновление стока
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +128,Superfinishing,Суперфиниширование
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,"Различные Единица измерения для элементов приведет к некорректному (Всего) значение массы нетто. Убедитесь, что вес нетто каждого элемента находится в том же UOM."
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM Оценить
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +85,Please pull items from Delivery Note,Пожалуйста вытяните элементов из накладной
@@ -2680,7 +2584,6 @@
 ,Purchase Analytics,Покупка Аналитика
 DocType: Sales Invoice Item,Delivery Note Item,Доставка Примечание Пункт
 DocType: Expense Claim,Task,Задача
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +57,Shaving,Бритье
 DocType: Purchase Taxes and Charges,Reference Row #,Ссылка строка #
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},Серийный номер является обязательным для п {0}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js +14,This is a root sales person and cannot be edited.,Это корень продавец и не могут быть изменены.
@@ -2692,13 +2595,11 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +74,Purpose must be one of {0},Цель должна быть одна из {0}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +108,Fill the form and save it,Заполните форму и сохранить его
 DocType: Production Planning Tool,Download a report containing all raw materials with their latest inventory status,Скачать отчет содержащий все материал со статусом  последней инвентаризации
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +94,Facing,Облицовочный
 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,Отправить SMS
 DocType: Company,Default Letter Head,По умолчанию бланке
 DocType: Time Log,Billable,Оплачиваемый
-DocType: Authorization Rule,This will be used for setting rule in HR module,Эта информация будет использоваться для установки правило в модуле HR
 DocType: Account,Rate at which this tax is applied,"Скорость, с которой этот налог применяется"
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reorder Qty,Изменить порядок Кол-во
 DocType: Company,Stock Adjustment Account,Регулирование счета запасов
@@ -2725,16 +2626,15 @@
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,Процент Распределение должно быть равно 100%
 DocType: Serial No,Out of AMC,Из КУА
 DocType: Purchase Order Item,Material Request Detail No,Материал Запрос Деталь №
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +97,Hard turning,Жесткий поворотным
 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,"Свяжитесь с нами для пользователя, который имеет в продаже Master Менеджер {0} роль"
 DocType: Company,Default Cash Account,Расчетный счет по умолчанию
 apps/erpnext/erpnext/config/accounts.py +79,Company (not Customer or Supplier) master.,Компания (не клиента или поставщика) хозяин.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +106,Please enter 'Expected Delivery Date',"Пожалуйста, введите 'ожидаемой даты поставки """
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +187,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Примечания Доставка {0} должно быть отменено до отмены этого заказ клиента
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +100,Please enter 'Expected Delivery Date',"Пожалуйста, введите 'ожидаемой даты поставки """
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +182,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Примечания Доставка {0} должно быть отменено до отмены этого заказ клиента
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +373,Paid amount + Write Off Amount can not be greater than Grand Total,"Платные сумма + списания сумма не может быть больше, чем общий итог"
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} не является допустимым Номером Партии для позиции {1}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,Note: There is not enough leave balance for Leave Type {0},Примечание: Существует не хватает отпуск баланс для отпуске Тип {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +124,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,Возможность Тип
@@ -2746,7 +2646,7 @@
 DocType: Hub Settings,Publish Availability,Опубликовать Наличие
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +105,Date of Birth cannot be greater than today.,"Дата рождения не может быть больше, чем сегодня."
 ,Stock Ageing,Старение запасов
-apps/erpnext/erpnext/controllers/accounts_controller.py +200,{0} '{1}' is disabled,{0} '{1}' отключен
+apps/erpnext/erpnext/controllers/accounts_controller.py +201,{0} '{1}' is disabled,{0} '{1}' отключен
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Установить как Open
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Отправить автоматические письма на Контакты О представлении операций.
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +232,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
@@ -2756,44 +2656,38 @@
 DocType: Purchase Order,Customer Contact Email,Контакты с клиентами E-mail
 DocType: Event,Sunday,Воскресенье
 DocType: Sales Team,Contribution (%),Вклад (%)
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +455,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,"Примечание: Оплата Вступление не будет создана, так как ""Наличные или Банковский счет"" не был указан"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +171,Responsibilities,Обязанности
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +457,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 +11,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,"Пожалуйста, введите не менее чем 1-фактуру в таблице"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +511,Add Users,Добавить пользователей
+apps/erpnext/erpnext/public/js/setup_wizard.js +255,Add Users,Добавить пользователей
 DocType: Pricing Rule,Item Group,Пункт Группа
 DocType: Task,Actual Start Date (via Time Logs),Фактическая дата начала (с помощью журналов Time)
 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),Налоги и сборы Добавил (Компания Валюта)
-apps/erpnext/erpnext/stock/doctype/item/item.py +340,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Пункт Налоговый ряд {0} должен иметь учетную запись типа налога или доходов или расходов или платная
+apps/erpnext/erpnext/stock/doctype/item/item.py +344,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Пункт Налоговый ряд {0} должен иметь учетную запись типа налога или доходов или расходов или платная
 DocType: Sales Order,Partly Billed,Небольшая Объявленный
 DocType: Item,Default BOM,По умолчанию BOM
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +79,Decambering,Decambering
 apps/erpnext/erpnext/setup/doctype/company/company.js +22,Please re-type company name to confirm,"Пожалуйста, повторите ввод название компании, чтобы подтвердить"
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,Общая сумма задолженности по Amt
 DocType: Time Log Batch,Total Hours,Общее количество часов
 DocType: Journal Entry,Printing Settings,Настройки печати
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +268,Total Debit must be equal to Total Credit. The difference is {0},"Всего Дебет должна быть равна общей выработке. Разница в том, {0}"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +11,Automotive,Автомобилестроение
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +37,Item is required,Пункт требуется
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +25,Metal injection molding,Металл литья под давлением
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +258,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/accounts/doctype/sales_invoice/sales_invoice.js +684,From Delivery Note,Из накладной
 DocType: Time Log,From Time,От времени
 DocType: Notification Control,Custom Message,Текст сообщения
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +33,Investment Banking,Инвестиционно-банковская деятельность
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +261,"Select your Country, Time Zone and Currency","Выберите страну, часовой пояс и валюта"
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,Инвестиционно-банковская деятельность
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +316,"Select your Country, Time Zone and Currency","Выберите страну, часовой пояс и валюта"
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +369,Cash or Bank Account is mandatory for making payment entry,Наличными или банковский счет является обязательным для внесения записи платежей
 DocType: Purchase Invoice,Price List Exchange Rate,Прайс-лист валютный курс
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +91,Pickling,Маринование
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +18,Sand casting,Литье в песчаные
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +117,Electroplating,Гальванопокрытие
 DocType: Purchase Invoice Item,Rate,Оценить
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +62,Intern,Стажер
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Intern,Стажер
 DocType: Newsletter,A Lead with this email id should exist,Руководитеть с таким email должен существовать
 DocType: Stock Entry,From BOM,Из спецификации
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +34,Basic,Основной
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +34,Basic,Основной
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,Биржевые операции до {0} заморожены
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +217,Please click on 'Generate Schedule',"Пожалуйста, нажмите на кнопку ""Generate Расписание"""
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +61,To Date should be same as From Date for Half Day leave,"Чтобы Дата должна быть такой же, как С даты в течение половины дня отпуска"
@@ -2801,11 +2695,11 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +96,Reference No is mandatory if you entered Reference Date,"Ссылка № является обязательным, если вы ввели Исходной дате"
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +108,Date of Joining must be greater than Date of Birth,Дата Присоединение должно быть больше Дата рождения
 DocType: Salary Structure,Salary Structure,Зарплата Структура
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +242,"Multiple Price Rule exists with same criteria, please resolve \
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +246,"Multiple Price Rule exists with same criteria, please resolve \
 			conflict by assigning priority. Price Rules: {0}","Несколько Цена Правило существует с теми же критериями,, пожалуйста, решить \
  конфликта отдавая приоритет. Цена Правила: {0}"
 DocType: Account,Bank,Банк:
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +9,Airline,Авиалиния
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,Авиалиния
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +493,Issue Material,Материал Выпуск
 DocType: Material Request Item,For Warehouse,Для Склада
 DocType: Employee,Offer Date,Предложение Дата
@@ -2815,29 +2709,24 @@
 DocType: Item,Is Fixed Asset Item,Является основного средства дня Пункт
 DocType: Stock Entry,Including items for sub assemblies,В том числе предметы для суб собраний
 DocType: Features Setup,"If you have long print formats, this feature can be used to split the page to be printed on multiple pages with all headers and footers on each page","Если у вас длинные форматы печати, эта функция может быть использована для разрезки страницу, которая будет напечатана на нескольких страниц со всеми верхние и нижние колонтитулы на каждой странице"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +131,Hobbing,Hobbing
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +98,All Territories,Все Территории
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +98,All Territories,Все Территории
 DocType: Purchase Invoice,Items,Элементы
 DocType: Fiscal Year,Year Name,Имя года
 DocType: Process Payroll,Process Payroll,Процесс расчета заработной платы
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +59,There are more holidays than working days this month.,"Есть больше праздников, чем рабочих дней в этом месяце."
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +68,There are more holidays than working days this month.,"Есть больше праздников, чем рабочих дней в этом месяце."
 DocType: Product Bundle Item,Product Bundle Item,Продукт Связка товара
 DocType: Sales Partner,Sales Partner Name,Партнер по продажам Имя
 DocType: Purchase Invoice Item,Image View,Просмотр изображения
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +113,Finishing & industrial finishing,Отделочные и промышленного отделка
 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/page/setup_wizard/fixtures/industry_type.py +46,Securities & Commodity Exchanges,Ценные бумаги и товарных бирж
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Ценные бумаги и товарных бирж
 DocType: Shipping Rule,Calculate Based On,Рассчитать на основе
 DocType: Delivery Note Item,From Warehouse,От Склад
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +98,Drilling,Бурение
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +28,Blow molding,Удар литье
 DocType: Purchase Taxes and Charges,Valuation and Total,Оценка и Всего
 DocType: Tax Rule,Shipping City,Доставка Город
 apps/erpnext/erpnext/stock/doctype/item/item.js +43,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,"Этот деталь Вариант {0} (шаблон). Атрибуты будет скопирован из шаблона, если ""не копировать"" не установлен"
 DocType: Account,Purchase User,Покупка пользователя
 DocType: Notification Control,Customize the Notification,Настроить уведомления
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +87,Hammering,Стук
 DocType: Web Page,Slideshow,Слайд-шоу
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +24,Default Address Template cannot be deleted,Адрес по умолчанию шаблона не может быть удален
 DocType: Sales Invoice,Shipping Rule,Правило Доставка
@@ -2846,9 +2735,8 @@
 DocType: Workflow State,Search,Поиск
 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,"""Дней с последнего Заказа"" должно быть больше или равно 0"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +142,Brazing,Пайка
 DocType: C-Form,Amended From,Измененный С
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Raw Material,Спецификации сырья
+apps/erpnext/erpnext/public/js/setup_wizard.js +359,Raw Material,Спецификации сырья
 DocType: Leave Application,Follow via Email,Следуйте по электронной почте
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Сумма налога После скидка сумма
 apps/erpnext/erpnext/accounts/doctype/account/account.py +174,Child account exists for this account. You can not delete this account.,Детский учетная запись существует для этой учетной записи. Вы не можете удалить этот аккаунт.
@@ -2862,10 +2750,10 @@
 ,Produced,Произведено
 DocType: Item,Item Code for Suppliers,Код товара для поставщиков
 DocType: Issue,Raised By (Email),Поднятый силу (Email)
-apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +72,General,Основное
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +495,Attach Letterhead,Прикрепить бланк
+apps/erpnext/erpnext/setup/setup_wizard/default_website.py +72,General,Основное
+apps/erpnext/erpnext/public/js/setup_wizard.js +241,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/setup/page/setup_wizard/setup_wizard.js +542,"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/public/js/setup_wizard.js +284,"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}
 DocType: Journal Entry,Bank Entry,Банк Стажер
 DocType: Authorization Rule,Applicable To (Designation),Применимо к (Обозначение)
@@ -2874,33 +2762,32 @@
 apps/erpnext/erpnext/config/accounts.py +143,Enable / disable currencies.,Включение / отключение валюты.
 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),Всего (АМТ)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +26,Entertainment & Leisure,Развлечения и досуг
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,Развлечения и досуг
 DocType: Purchase Order,The date on which recurring order will be stop,"Дата, на которую повторяющееся заказ будет остановить"
 DocType: Quality Inspection,Item Serial No,Пункт Серийный номер
 apps/erpnext/erpnext/controllers/status_updater.py +142,{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 +57,Total Present,Итого Текущая
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Hour,Час
+apps/erpnext/erpnext/public/js/setup_wizard.js +363,Hour,Час
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +138,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation","Серийный товара {0} не может быть обновлен \
  использованием Stock примирения"
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +488,Transfer Material to Supplier,Перевести Материал Поставщику
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +513,Transfer Material to Supplier,Перевести Материал Поставщику
 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/crm/doctype/opportunity/opportunity.js +82,Create Quotation,Создание цитаты
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +306,All these items have already been invoiced,Все эти предметы уже выставлен счет
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,You are not authorized to approve leaves on Block Dates,Вы не уполномочен утверждать листья на Блок Сроки
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +311,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/setup/page/setup_wizard/fixtures/operations.py +83,Curling,Керлинг
 DocType: Account,Tax,Налог
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +28,Row {0}: {1} is not a valid {2},Ряд {0}: {1} не является допустимым {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +89,Refining,Рафинирование
+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,Планирование производства инструмента
 DocType: Quality Inspection,Report Date,Дата отчета
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +130,Routing,Маршрутизация
 DocType: C-Form,Invoices,Счета
 DocType: Job Opening,Job Title,Должность
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +54,{0} already allocated for Employee {1} for period {2} - {3},{0} уже выделено Требуются {1} для периода {2} - {3}
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +80,{0} Recipients,{0} Получатели
 DocType: Features Setup,Item Groups in Details,Группы товаров в деталях
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +335,Quantity to Manufacture must be greater than 0.,"Количество, Изготовление должны быть больше, чем 0."
@@ -2918,14 +2805,13 @@
 DocType: DocType,Setup,Настройки
 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,Резюме для этого месяца и в ожидании деятельности
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +39,Cold rolling,Холодная прокатка
 DocType: Customer Group,Customer Group Name,Группа Имя клиента
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +408,Please remove this Invoice {0} from C-Form {1},"Пожалуйста, удалите этот счет {0} из C-Form {1}"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +410,Please remove this Invoice {0} from C-Form {1},"Пожалуйста, удалите этот счет {0} из C-Form {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,Атрибуты
 DocType: Packing Slip,Get Items,Получить товары
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +186,Please enter Write Off Account,"Пожалуйста, введите списать счет"
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +187,Please enter Write Off Account,"Пожалуйста, введите списать счет"
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +71,Last Order Date,Последняя дата заказа
 DocType: DocField,Image,Изображение
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +179,Make Excise Invoice,Сделать акцизного счет-фактура
@@ -2935,7 +2821,7 @@
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +146,Operation ID not set,Код операции не установлен
 DocType: Production Order,Planned Start Date,Планируемая дата начала
 DocType: Serial No,Creation Document Type,Создание типа документа
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +620,Maint. Visit,Maint. Посещение
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +631,Maint. Visit,Maint. Посещение
 DocType: Leave Type,Is Encash,Является Обналичивание
 DocType: Purchase Invoice,Mobile No,Мобильный номер
 DocType: Payment Tool,Make Journal Entry,Сделать запись журнала
@@ -2943,35 +2829,31 @@
 apps/erpnext/erpnext/controllers/trends.py +257,Project-wise data is not available for Quotation,Проект мудрый данные не доступны для коммерческого предложения
 DocType: Project,Expected End Date,Ожидаемая дата завершения
 DocType: Appraisal Template,Appraisal Template Title,Оценка шаблона Название
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +440,Commercial,Коммерческий сектор
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +378,Commercial,Коммерческий сектор
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +23,Parent Item {0} must not be a Stock Item,Родитель товара {0} не должны быть со пункт
 DocType: Cost Center,Distribution Id,Распределение Id
-apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +14,Awesome Services,Потрясающие услуги
+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,Адрес поставщика
 DocType: Contact Us Settings,Address Line 2,Адрес (2-я строка)
 DocType: ToDo,Reference,Ссылка на
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +59,Perforating,Перфорирование
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,Из Кол-во
 apps/erpnext/erpnext/config/accounts.py +128,Rules to calculate shipping amount for a sale,Правила для расчета количества груза для продажи
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +29,Series is mandatory,Серия является обязательным
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +28,Financial Services,Финансовые услуги
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,Финансовые услуги
 apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3},Соответствие атрибутов {0} должно быть в пределах {1} до {2} в приращений {3}
 DocType: Tax Rule,Sales,Скидки
 DocType: Stock Entry Detail,Basic Amount,Основное количество
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +173,Warehouse required for stock Item {0},Склад требуется для складе Пункт {0}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +178,Warehouse required for stock Item {0},Склад требуется для складе Пункт {0}
 DocType: Leave Allocation,Unused leaves,Неиспользованные листья
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,Cr
 DocType: Customer,Default Receivable Accounts,По умолчанию Дебиторская задолженность
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +102,Sawing,Распиловка
 DocType: Tax Rule,Billing State,Государственный счетов
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +32,Laminating,Ламинирование
 DocType: Item Reorder,Transfer,Переложить
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +549,Fetch exploded BOM (including sub-assemblies),Fetch разобранном BOM (в том числе узлов)
 DocType: Authorization Rule,Applicable To (Employee),Применимо к (Сотрудник)
 apps/erpnext/erpnext/controllers/accounts_controller.py +101,Due Date is mandatory,Благодаря Дата является обязательным
 apps/erpnext/erpnext/controllers/item_variant.py +51,Increment for Attribute {0} cannot be 0,Прирост за атрибут {0} не может быть 0
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +143,Sintering,Спекание
 DocType: Journal Entry,Pay To / Recd From,Pay To / RECD С
 DocType: Naming Series,Setup Series,Серия установки
 DocType: Supplier,Contact HTML,Связаться с HTML
@@ -2984,7 +2866,6 @@
 DocType: Attendance,Absent,Отсутствует
 DocType: Product Bundle,Product Bundle,Связка товаров
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +180,Row {0}: Invalid reference {1},Ряд {0}: Недопустимая ссылка {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +165,Crushing,Дробление
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Купить налоги и сборы шаблон
 DocType: Upload Attendance,Download Template,Скачать шаблон
 DocType: GL Entry,Remarks,Примечания
@@ -2992,14 +2873,12 @@
 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/setup/page/setup_wizard/fixtures/operations.py +9,Continuous casting,Непрерывная разливка
 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/setup/page/setup_wizard/fixtures/operations.py +80,Cold sizing,Холодная размеров
 DocType: Salary Slip,Earning & Deduction,Заработок & Вычет
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +76,Account {0} cannot be a Group,Счет {0} не может быть группой
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +259,Region,Область
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +314,Region,Область
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +213,Optional. This setting will be used to filter in various transactions.,Факультативно. Эта установка будет использоваться для фильтрации в различных сделок.
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +104,Negative Valuation Rate is not allowed,Отрицательный Оценка курс не допускается
 DocType: Holiday List,Weekly Off,Еженедельный Выкл
@@ -3017,7 +2896,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,Account {0} is inactive,Счет {0} неактивен
 DocType: GL Entry,Is Advance,Является Advance
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,Посещаемость С Дата и посещаемости на сегодняшний день является обязательным
-apps/erpnext/erpnext/controllers/buying_controller.py +131,Please enter 'Is Subcontracted' as Yes or No,"Пожалуйста, введите 'Является субподряду "", как Да или Нет"
+apps/erpnext/erpnext/controllers/buying_controller.py +122,Please enter 'Is Subcontracted' as Yes or No,"Пожалуйста, введите 'Является субподряду "", как Да или Нет"
 DocType: Sales Team,Contact No.,Контактный номер
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,'Profit and Loss' type account {0} not allowed in Opening Entry,"Учетной записи типа {0} не позволено открытие ""Прибыль и Убытки"""
 DocType: Workflow State,Time,Время
@@ -3026,14 +2905,13 @@
 DocType: Authorization Rule,Authorization Rule,Авторизация Правило
 DocType: Sales Invoice,Terms and Conditions Details,Условия Подробности
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,Продажи Налоги и сборы шаблона
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +10,Apparel & Accessories,Одежда и аксессуары
+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,Номер заказа
 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 +121,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/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +47,Conversion Factor is required,Коэффициент преобразования требуется
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +37,Serial #,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,Значение / Описание
@@ -3041,10 +2919,8 @@
 ,Customers Not Buying Since Long Time,Клиенты не покупать так как долгое время
 DocType: Production Order,Expected Delivery Date,Ожидаемая дата поставки
 apps/erpnext/erpnext/accounts/general_ledger.py +121,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Дебет и Кредит не равны для {0} # {1}. Разница {2}.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +48,Bulging,Выпуклый
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +11,Evaporative-pattern casting,Литье испарительного-модель
 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 +195,Sales Invoice {0} must be cancelled before cancelling this Sales Order,Счет Продажи {0} должно быть отменено до отмены этого заказ клиента
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +190,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."
@@ -3063,26 +2939,24 @@
 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,Командировочные Pасходы
 DocType: Maintenance Visit,Breakdown,Разбивка
-apps/erpnext/erpnext/controllers/accounts_controller.py +241,Account: {0} with currency: {1} can not be selected,Счет: {0} с валютой: {1} не может быть выбран
+apps/erpnext/erpnext/controllers/accounts_controller.py +242,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 +47,Account {0}: Parent account {1} does not belong to company: {2},Счет {0}: Родитель счета {1} не принадлежит компании: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted all transactions related to this company!,"Успешно удален все сделки, связанные с этой компанией!"
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,По состоянию на Дата
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +111,Honing,Хонингование
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +58,Probation,Испытательный срок
-apps/erpnext/erpnext/stock/doctype/item/item.py +264,Default Warehouse is mandatory for stock Item.,По умолчанию Склад является обязательным для складе Пункт.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Probation,Испытательный срок
+apps/erpnext/erpnext/stock/doctype/item/item.py +268,Default Warehouse is mandatory for stock Item.,По умолчанию Склад является обязательным для складе Пункт.
 DocType: Feed,Full Name,Полное имя
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +148,Clinching,Клинч
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +191,Payment of salary for the month {0} and year {1},Выплата заработной платы за месяц {0} и год {1}
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +173,Payment of salary for the month {0} and year {1},Выплата заработной платы за месяц {0} и год {1}
 DocType: Stock Settings,Auto insert Price List rate if missing,"Авто вставка Скорость Цены, если не хватает"
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,Всего уплаченной суммы
 ,Transferred Qty,Переведен Кол-во
 apps/erpnext/erpnext/config/learn.py +11,Navigating,Навигационный
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +137,Planning,Планирование
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +137,Planning,Планирование
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +9,Make Time Log Batch,Найдите время Войдите Batch
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Issued,Выпущен
 DocType: Project,Total Billing Amount (via Time Logs),Всего счетов Сумма (с помощью журналов Time)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +629,We sell this Item,Мы продаем этот товар
+apps/erpnext/erpnext/public/js/setup_wizard.js +365,We sell this Item,Мы продаем этот товар
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +65,Supplier Id,Поставщик Id
 DocType: Journal Entry,Cash Entry,Денежные запись
 DocType: Sales Partner,Contact Desc,Связаться Описание изделия
@@ -3091,18 +2965,16 @@
 DocType: Brand,Item Manager,Состояние менеджер
 DocType: Cost Center,Add rows to set annual budgets on Accounts.,"Добавьте строки, чтобы установить годовые бюджеты на счетах."
 DocType: Buying Settings,Default Supplier Type,По умолчанию Тип Поставщик
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +160,Quarrying,Карьер
 DocType: Production Order,Total Operating Cost,Общие эксплуатационные расходы
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +160,Note: Item {0} entered multiple times,Примечание: Пункт {0} имеет несколько вхождений
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +163,Note: Item {0} entered multiple times,Примечание: Пункт {0} имеет несколько вхождений
 apps/erpnext/erpnext/config/crm.py +27,All Contacts.,Все контакты.
 DocType: Newsletter,Test Email Id,Тест электронный идентификатор
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +394,Company Abbreviation,Аббревиатура компании
+apps/erpnext/erpnext/public/js/setup_wizard.js +142,Company Abbreviation,Аббревиатура компании
 DocType: Features Setup,If you follow Quality Inspection. Enables Item QA Required and QA No in Purchase Receipt,Если вы будете следовать осмотра качества. Разрешает Item требуется и QA QA Нет в ТОВАРНЫЙ ЧЕК
 DocType: GL Entry,Party Type,Партия Тип
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +68,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,Не Authroized с {0} превышает пределы
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +30,Rotational molding,Ротационного формования
 apps/erpnext/erpnext/config/hr.py +115,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,Установите Налоговый Правило корзине
@@ -3116,15 +2988,15 @@
 apps/erpnext/erpnext/config/selling.py +18,Quotes to Leads or Customers.,Котировки в снабжении или клиентов.
 DocType: Stock Settings,Role Allowed to edit frozen stock,Роль разрешено редактировать Замороженный исходный
 ,Territory Target Variance Item Group-Wise,Территория Целевая Разница Пункт Группа Мудрого
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +101,All Customer Groups,Все Группы клиентов
-apps/erpnext/erpnext/controllers/accounts_controller.py +474,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,"{0} является обязательным. Может быть, запись Обмен валюты не создана для {1} по {2}."
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +101,All Customer Groups,Все Группы клиентов
+apps/erpnext/erpnext/controllers/accounts_controller.py +475,{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 +41,Account {0}: Parent account {1} does not exist,Счет {0}: Родитель счета {1} не существует
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Прайс-лист Тариф (Компания Валюта)
 DocType: Account,Temporary,Временный
 DocType: Address,Preferred Billing Address,Популярные Адрес для выставления счета
 DocType: Monthly Distribution Percentage,Percentage Allocation,Процент Распределение
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +86,Secretary,Секретарь
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Secretary,Секретарь
 DocType: Serial No,Distinct unit of an Item,Отдельного подразделения из пункта
 DocType: Pricing Rule,Buying,Покупка
 DocType: HR Settings,Employee Records to be created by,Сотрудник отчеты должны быть созданные
@@ -3137,9 +3009,8 @@
 ,Item-wise Price List Rate,Пункт мудрый Прайс-лист Оценить
 DocType: Purchase Order Item,Supplier Quotation,Поставщик цитаты
 DocType: Quotation,In Words will be visible once you save the Quotation.,По словам будет виден только вы сохраните цитаты.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +68,Ironing,По глажению одежды
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is stopped,{0} {1} остановлен
-apps/erpnext/erpnext/stock/doctype/item/item.py +352,Barcode {0} already used in Item {1},Штрихкод {0} уже используется в позиции {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +356,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/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,Предстоящие События
@@ -3148,13 +3019,12 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +27,Quick Entry,Быстрый доступ
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0} является обязательным для возврата
 DocType: Purchase Order,To Receive,Получить
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +33,Shrink fitting,Термоусадочная Место
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +522,user@example.com,user@example.com
+apps/erpnext/erpnext/public/js/setup_wizard.js +266,user@example.com,user@example.com
 DocType: Email Digest,Income / Expense,Доходы / расходы
 DocType: Employee,Personal Email,Личная E-mail
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +58,Total Variance,Общей дисперсии
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +62,Total Variance,Общей дисперсии
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.","Если включен, то система будет отправлять бухгалтерских проводок для инвентаризации автоматически."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +15,Brokerage,Посредничество
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +15,Brokerage,Посредничество
 DocType: Address,Postal Code,Почтовый индекс
 DocType: Production Order Operation,"in Minutes
 Updated via 'Time Log'","в минутах 
@@ -3162,14 +3032,13 @@
 DocType: Customer,From Lead,От Ведущий
 apps/erpnext/erpnext/config/manufacturing.py +19,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 +442,POS Profile required to make POS Entry,"POS-профиля требуется, чтобы сделать запись POS"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +444,POS Profile required to make POS Entry,"POS-профиля требуется, чтобы сделать запись POS"
 DocType: Hub Settings,Name Token,Имя маркера
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +106,Planing,Строгание
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Selling,Стандартный Продажа
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +120,Standard Selling,Стандартный Продажа
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +137,Atleast one warehouse is mandatory,"По крайней мере, один склад является обязательным"
 DocType: Serial No,Out of Warranty,По истечении гарантийного срока
 DocType: BOM Replace Tool,Replace,Заменить
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +314,{0} against Sales Invoice {1},{0} против чека {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +316,{0} against Sales Invoice {1},{0} против чека {1}
 apps/erpnext/erpnext/stock/doctype/item/item.py +49,Please enter default Unit of Measure,"Пожалуйста, введите умолчанию единицу измерения"
 DocType: Purchase Invoice Item,Project Name,Название проекта
 DocType: Supplier,Mention if non-standard receivable account,Упоминание если нестандартная задолженность счет
@@ -3185,9 +3054,8 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,Journal Entry {0} does not have account {1} or already matched against other voucher,Запись в журнале {0} не имеете учет {1} или уже сравнивается с другой ваучер
 DocType: Item,Moving Average,Скользящее среднее
 DocType: BOM Replace Tool,The BOM which will be replaced,"В спецификации, которые будут заменены"
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +43,New Stock UOM must be different from current stock UOM,Новый фонда единица измерения должна отличаться от текущей фондовой UOM
 DocType: Account,Debit,Дебет
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +34,Leaves must be allocated in multiples of 0.5,"Листья должны быть выделены несколько 0,5"
+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/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,Выдающийся Amt
@@ -3205,8 +3073,7 @@
 DocType: Employee,Internal Work History,Внутренняя история Работа
 DocType: DocField,Column Break,Разрыв столбца
 DocType: Event,Thursday,Четверг
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +42,Private Equity,Private Equity
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +93,Turning,Превращение
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,Private Equity
 DocType: Maintenance Visit,Customer Feedback,Обратная связь с клиентами
 DocType: Account,Expense,Расходы
 DocType: Sales Invoice,Exhibition,Показательный
@@ -3219,19 +3086,19 @@
 DocType: Employee,Held On,Состоявшемся
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +33,Production Item,Производство товара
 ,Employee Information,Сотрудник Информация
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,Rate (%),Ставка (%)
+apps/erpnext/erpnext/public/js/setup_wizard.js +294,Rate (%),Ставка (%)
 DocType: Stock Entry Detail,Additional Cost,Дополнительная стоимость
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +407,Financial Year End Date,Окончание финансового периода 
+apps/erpnext/erpnext/public/js/setup_wizard.js +155,Financial Year End Date,Окончание финансового периода 
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Voucher No, if grouped by Voucher","Не можете фильтровать на основе ваучером Нет, если сгруппированы по ваучером"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +484,Make Supplier Quotation,Сделать Поставщик цитаты
 DocType: Quality Inspection,Incoming,Входящий
 DocType: BOM,Materials Required (Exploded),Необходимые материалы (в разобранном)
 DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),Уменьшите Набор для отпуска без сохранения (LWP)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +512,"Add users to your organization, other than yourself","Добавить других пользователей в Вашу организация, не считая Вас."
+apps/erpnext/erpnext/public/js/setup_wizard.js +256,"Add users to your organization, other than yourself","Добавить других пользователей в Вашу организация, не считая Вас."
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No {1} does not match with {2} {3},"Ряд # {0}: Серийный номер {1}, не соответствует {2} {3}"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +44,Casual Leave,Повседневная Оставить
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +44,Casual Leave,Повседневная Оставить
 DocType: Batch,Batch ID,ID партии
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +334,Note: {0},Примечание: {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +336,Note: {0},Примечание: {0}
 ,Delivery Note Trends,Доставка Примечание тенденции
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +104,This Week's Summary,Резюме этой недели
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +74,{0} must be a Purchased or Sub-Contracted Item in row {1},{0} позиция должна быть куплена или получена на основе субподряда в строке {1}
@@ -3243,7 +3110,7 @@
 DocType: Purchase Receipt,Return Against Purchase Receipt,Вернуться Против покупки получении
 DocType: Purchase Order,To Bill,Для Билла
 DocType: Material Request,% Ordered,% Приказал
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +61,Piecework,Сдельная работа
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Piecework,Сдельная работа
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +64,Avg. Buying Rate,Ср. Покупка Оценить
 DocType: Task,Actual Time (in Hours),Фактическое время (в часах)
 DocType: Employee,History In Company,История В компании
@@ -3260,13 +3127,13 @@
 DocType: Opportunity,To Discuss,Для Обсудить
 DocType: SMS Settings,SMS Settings,Настройки SMS
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +60,Temporary Accounts,Временные счета
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +155,Black,Черный
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Black,Черный
 DocType: BOM Explosion Item,BOM Explosion Item,BOM Взрыв Пункт
 DocType: Account,Auditor,Аудитор
 DocType: Purchase Order,End date of current order's period,Дата окончания периода текущего заказа
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +17,Make Offer Letter,Сделать предложение письмо
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +10,Return,Возвращение
-apps/erpnext/erpnext/stock/doctype/item/item.py +503,Default Unit of Measure for Variant must be same as Template,"По умолчанию Единица измерения для варианта должны быть такими же, как шаблон"
+apps/erpnext/erpnext/stock/doctype/item/item.py +507,Default Unit of Measure for Variant must be same as Template,"По умолчанию Единица измерения для варианта должны быть такими же, как шаблон"
 DocType: DocField,Fold,Сложить
 DocType: Production Order Operation,Production Order Operation,Производство Порядок работы
 DocType: Pricing Rule,Disable,Отключить
@@ -3277,13 +3144,12 @@
 DocType: Page,Page Name,Имя страницы
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +110,To Time must be greater than From Time,"Времени должен быть больше, чем от времени"
 DocType: Journal Entry Account,Exchange Rate,Курс обмена
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +465,Sales Order {0} is not submitted,Заказ на продажу {0} не представлено
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +467,Sales Order {0} is not submitted,Заказ на продажу {0} не представлено
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0}: Parent account {1} does not bolong to the company {2},Склад {0}: Родитель счета {1} не Bolong компании {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +124,Spindle finishing,Шпиндель отделка
 DocType: BOM,Last Purchase Rate,Последний Покупка Оценить
 DocType: Account,Asset,Актив
 DocType: Project Task,Task ID,Задача ID
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +395,"e.g. ""MC""","например ""MC """
+apps/erpnext/erpnext/public/js/setup_wizard.js +143,"e.g. ""MC""","например ""MC """
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,Stock cannot exist for Item {0} since has variants,"Фото существовать не может Пункт {0}, так как имеет варианты"
 ,Sales Person-wise Transaction Summary,Человек мудрый продаж Общая информация по сделкам
 DocType: System Settings,Time Zone,Часовой Пояс
@@ -3292,9 +3158,7 @@
 DocType: Monthly Distribution,Monthly Distribution Percentages,Ежемесячные Проценты распределения
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +16,The selected item cannot have Batch,Выбранный элемент не может быть Batch
 DocType: Delivery Note,% of materials delivered against this Delivery Note,% материалов доставлено по данной Накладной
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +151,Stapling,Сшивание
 DocType: Customer,Customer Details,Данные клиента
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +105,Shaping,Формирование
 DocType: Employee,Reports to,Доклады
 DocType: SMS Settings,Enter url parameter for receiver nos,Введите параметр URL для приемника NOS
 DocType: Sales Invoice,Paid Amount,Выплаченная сумма
@@ -3303,13 +3167,13 @@
 DocType: Item Variant,Item Variant,Пункт Вариант
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +15,Setting this Address Template as default as there is no other default,"Установка этого Адрес шаблон по умолчанию, поскольку нет никакого другого умолчанию"
 apps/erpnext/erpnext/accounts/doctype/account/account.py +89,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Баланс счета в Дебете, запрещена установка 'Баланс должен быть' как 'Кредит'"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +76,Quality Management,Управление качеством
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Quality Management,Управление качеством
 DocType: Production Planning Tool,Filter based on customer,Фильтр на основе клиента
 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}"
 DocType: Employee External Work History,Employee External Work History,Сотрудник Внешний Работа История
 DocType: Tax Rule,Purchase,Купить
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +34,Balance Qty,Баланс Кол-во
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Balance Qty,Баланс Кол-во
 DocType: Item Group,Parent Item Group,Родитель Пункт Группа
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +21,{0} for {1},{0} для {1}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +96,Cost Centers,МВЗ
@@ -3319,12 +3183,12 @@
 DocType: Opportunity,Next Contact,Следующая Контактные
 DocType: Employee,Employment Type,Вид занятости
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,Капитальные активы
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +84,Application period cannot be across two alocation records,Срок подачи заявлений не может быть по двум alocation записей
 DocType: Item Group,Default Expense Account,По умолчанию расходов счета
 DocType: Employee,Notice (days),Уведомление (дней)
 DocType: Page,Yes,Да
 DocType: Tax Rule,Sales Tax Template,Налог с продаж шаблона
 DocType: Employee,Encashment Date,Инкассация Дата
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +74,Electroforming,Гальванопластика
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +179,"Against Voucher Type must be one of Purchase Order, Purchase Invoice or Journal Entry","На ваучере Тип должен быть одним из Заказа, накладная или Запись в журнале"
 DocType: Account,Stock Adjustment,Регулирование запасов
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +34,Default Activity Cost exists for Activity Type - {0},По умолчанию активность Стоимость существует для вида деятельности - {0}
@@ -3360,12 +3224,12 @@
 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,Распределение
 apps/erpnext/erpnext/public/js/pos/pos.html +36,Amount Paid,Выплачиваемая сумма
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +91,Project Manager,Руководитель проекта
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +72,Dispatch,Отправка
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Project Manager,Руководитель проекта
+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: Customer,Default Taxes and Charges,По умолчанию Налоги и сборы
 DocType: Account,Receivable,Дебиторская задолженность
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +268,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,Ряд # {0}: Не разрешено изменять Поставщик как уже существует заказа
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +263,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.","Если отмечено, спецификации для суб-монтажными деталями будут рассмотрены для получения сырья. В противном случае, все элементы В сборе будет рассматриваться в качестве сырья."
@@ -3373,8 +3237,8 @@
 DocType: Hub Settings,Seller Description,Продавец Описание
 DocType: Employee Education,Qualification,Квалификаци
 DocType: Item Price,Item Price,Пункт Цена
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +48,Soap & Detergent,Мыло и моющих средств
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +36,Motion Picture & Video,Кинофильм & Видео
+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,В обработке
 DocType: Warehouse,Warehouse Name,Название склада
 DocType: Naming Series,Select Transaction,Выберите операцию
@@ -3383,7 +3247,6 @@
 DocType: BOM,Rate Of Materials Based On,Оценить материалов на основе
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,Поддержка Analtyics
 apps/erpnext/erpnext/accounts/doctype/accounts_settings/accounts_settings.py +27,Company is missing in warehouses {0},Компания на складах отсутствует {0}
-DocType: Stock UOM Replace Utility,Stock UOM Replace Utility,Фото со UOM Заменить Utility
 DocType: POS Profile,Terms and Conditions,Правила и условия
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,To Date should be within the Fiscal Year. Assuming To Date = {0},Чтобы Дата должна быть в пределах финансового года. Предполагая To Date = {0}
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","Здесь вы можете поддерживать рост, вес, аллергии, медицинские проблемы и т.д."
@@ -3395,7 +3258,7 @@
 DocType: Sales Order Item,For Production,Для производства
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +103,Please enter sales order in the above table,"Пожалуйста, введите заказ клиента в таблице выше"
 DocType: Project Task,View Task,Посмотреть Задача
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +406,Your financial year begins on,Ваш финансовый год начинается
+apps/erpnext/erpnext/public/js/setup_wizard.js +154,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: Email Digest,Add/Remove Recipients,Добавить / Удалить получателей
@@ -3403,16 +3266,14 @@
 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),Настройка сервера входящей для поддержки электронный идентификатор. (Например 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 +528,Item variant {0} exists with same attributes,Состояние вариант {0} существует с теми же атрибутами
+apps/erpnext/erpnext/stock/doctype/item/item.py +532,Item variant {0} exists with same attributes,Состояние вариант {0} существует с теми же атрибутами
 DocType: Salary Slip,Salary Slip,Зарплата скольжения
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +116,Burnishing,Полировальный
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +54,'To Date' is required,"Поле ""До Даты"" является обязательным для заполнения"
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,"Поле ""До Даты"" является обязательным для заполнения"
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","Создание упаковочные листы для пакетов будет доставлено. Используется для уведомления номер пакета, содержимое пакета и его вес."
 DocType: Sales Invoice Item,Sales Order Item,Заказ на продажу товара
 DocType: Salary Slip,Payment Days,Платежные дней
 DocType: BOM,Manage cost of operations,Управление стоимость операций
 DocType: Features Setup,Item Advanced,Пункт Расширенный
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +40,Hot rolling,Горячая прокатка
 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,Сотрудник Образование
@@ -3425,25 +3286,23 @@
 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/setup/page/setup_wizard/install_fixtures.py +48,Sick Leave,Отпуск по болезни
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +174,Invalid {0},Неверный {0}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +48,Sick Leave,Отпуск по болезни
 DocType: Email Digest,Email Digest,E-mail Дайджест
 DocType: Delivery Note,Billing Address Name,Адрес для выставления счета Имя
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +22,Department Stores,Универмаги
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,Универмаги
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +40,System Balance,Система Баланс
 DocType: Workflow,Is Active,Активен
 apps/erpnext/erpnext/controllers/stock_controller.py +71,No accounting entries for the following warehouses,Нет учетной записи для следующих складов
 apps/erpnext/erpnext/projects/doctype/project/project.js +22,Save the document first.,Сохранить документ в первую очередь.
 DocType: Account,Chargeable,Ответственный
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +121,Linishing,Linishing
 DocType: Company,Change Abbreviation,Изменить Аббревиатура
 DocType: Workflow State,Primary,Основной
 DocType: Expense Claim Detail,Expense Date,Дата расхода
 DocType: Item,Max Discount (%),Макс Скидка (%)
 DocType: Communication,More Information,Больше информации
 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/setup/page/setup_wizard/fixtures/operations.py +161,Blasting,Взрывные работы
 DocType: Company,Warn,Warn
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +111,Item valuation updated,Пункт оценка обновляются
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Любые другие замечания, отметить усилия, которые должны идти в записях."
 DocType: BOM,Manufacturing User,Производство пользователя
 DocType: Purchase Order,Raw Materials Supplied,Давальческого сырья
@@ -3453,7 +3312,7 @@
 DocType: Appraisal,Appraisal Template,Оценка шаблона
 DocType: Communication,Email,E-mail
 DocType: Item Group,Item Classification,Пункт Классификация
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +89,Business Development Manager,Менеджер по развитию бизнеса
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Business Development Manager,Менеджер по развитию бизнеса
 DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,Техническое обслуживание Посетить Цель
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.js +15,Period,Период обновления
 ,General Ledger,Бухгалтерская книга
@@ -3463,9 +3322,7 @@
 ,Itemwise Recommended Reorder Level,Itemwise Рекомендуем изменить порядок Уровень
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +264,Please select {0} first,"Пожалуйста, выберите {0} первый"
 DocType: Features Setup,To get Item Group in details table,Чтобы получить группу товаров в детали таблице
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +67,Redrawing,Перерисовка
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +112,Batch {0} of Item {1} has expired.,Пакетная {0} Пункт {1} истек.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +120,Etching,Травление
 DocType: Sales Invoice,Commission,Комиссионный сбор
 DocType: Address Template,"<h4>Default Template</h4>
 <p>Uses <a href=""http://jinja.pocoo.org/docs/templates/"">Jinja Templating</a> and all the fields of Address (including Custom Fields if any) will be available</p>
@@ -3510,7 +3367,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +340,Operation Time must be greater than 0 for Operation {0},"Время работы должно быть больше, чем 0 для операции {0}"
 DocType: Supplier,Address and Contacts,Адрес и контакты
 DocType: UOM Conversion Detail,UOM Conversion Detail,Единица измерения Преобразование Подробно
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +496,Keep it web friendly 900px (w) by 100px (h),Держите его веб дружелюбны 900px (ш) на 100px (ч)
+apps/erpnext/erpnext/public/js/setup_wizard.js +242,Keep it web friendly 900px (w) by 100px (h),Держите его веб дружелюбны 900px (ш) на 100px (ч)
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +329,Production Order cannot be raised against a Item Template,Производственный заказ не может быть поднят против Item Шаблон
 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,Высочайшая ваучеры
@@ -3526,54 +3383,49 @@
 DocType: Item,Average time taken by the supplier to deliver,Среднее время принято поставщика доставить
 DocType: Time Log,Hours,Часов
 DocType: Project,Expected Start Date,Ожидаемая дата начала
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +38,Rolling,Подвижной
 DocType: ToDo,Priority,Приоритет
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +41,Remove item if charges is not applicable to that item,"Удалить элемент, если обвинения не относится к этому пункту"
 DocType: Dropbox Backup,Dropbox Access Allowed,Dropbox доступ разрешен
 DocType: Dropbox Backup,Weekly,Еженедельно
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,Например. smsgateway.com / API / send_sms.cgi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +485,Receive,Получать
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +510,Receive,Получать
 DocType: Maintenance Visit,Fully Completed,Полностью завершен
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}%
 DocType: Employee,Educational Qualification,Образовательный ценз
 DocType: Workstation,Operating Costs,Операционные расходы
 DocType: Employee Leave Approver,Employee Leave Approver,Сотрудник Оставить утверждающий
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,{0} has been successfully added to our Newsletter list.,{0} был успешно добавлен в список наших новостей.
-apps/erpnext/erpnext/stock/doctype/item/item.py +383,Row {0}: An Reorder entry already exists for this warehouse {1},Ряд {0}: запись Изменить порядок уже существует для этого склада {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +387,Row {0}: An Reorder entry already exists for this warehouse {1},Ряд {0}: запись Изменить порядок уже существует для этого склада {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +67,"Cannot declare as lost, because Quotation has been made.","Не можете объявить как потерял, потому что цитаты было сделано."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +133,Electron beam machining,Электронно-лучевая обработка
 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 +150,Please select Start Date and End Date for Item {0},"Пожалуйста, выберите дату начала и дату окончания Пункт {0}"
 apps/erpnext/erpnext/config/stock.py +141,Main Reports,Основные отчеты
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +102,Stock Ledger entries balances updated,Фото со Леджер записей остатки обновляются
 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 +176,Add / Edit Prices,Добавить / Изменить цены
+apps/erpnext/erpnext/stock/doctype/item/item.js +178,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 +298,My Orders,Мои Заказы
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +293,My Orders,Мои Заказы
 DocType: Price List,Price List Name,Цена Имя
 DocType: Time Log,For Manufacturing,Для изготовления
-apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +70,Totals,Всего:
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +174,Totals,Всего:
 DocType: BOM,Manufacturing,Производство
 ,Ordered Items To Be Delivered,Заказал детали быть поставленным
 DocType: Account,Income,Доход
 ,Setup Wizard,Мастер установки
 DocType: Industry Type,Industry Type,Промышленность Тип
 apps/erpnext/erpnext/templates/includes/cart.js +137,Something went wrong!,Что-то пошло не так!
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +68,Warning: Leave application contains following block dates,Предупреждение: Оставьте приложение содержит следующие даты блок
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +251,Sales Invoice {0} has already been submitted,Счет Продажи {0} уже представлен
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +100,Warning: Leave application contains following block dates,Предупреждение: Оставьте приложение содержит следующие даты блок
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +256,Sales Invoice {0} has already been submitted,Счет Продажи {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/setup/page/setup_wizard/fixtures/operations.py +10,Die casting,Литье под давлением
 DocType: Email Alert,Reference Date,Ссылка Дата
 apps/erpnext/erpnext/config/hr.py +105,Organization unit (department) master.,Название подразделения (департамент) хозяин.
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +25,Please enter valid mobile nos,Введите действительные мобильных NOS
 DocType: Budget Detail,Budget Detail,Бюджет Подробно
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +75,Please enter message before sending,"Пожалуйста, введите сообщение перед отправкой"
 DocType: Async Task,Status,Статус
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +65,Stock UOM updated for Item {0},Фото Единица измерения обновляется Пункт {0}
 DocType: Company History,Year,Год
 apps/erpnext/erpnext/config/accounts.py +127,Point-of-Sale Profile,Точка-в-продажи профиля
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +68,Please Update SMS Settings,Обновите SMS Настройки
@@ -3587,12 +3439,12 @@
 ,Serial No Service Contract Expiry,Серийный номер Сервисный контракт Срок
 DocType: Item,Unit of Measure Conversion,Единица измерения конверсии
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +86,Employee can not be changed,Сотрудник не может быть изменен
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +259,You cannot credit and debit same account at the same time,Вы не можете кредитные и дебетовые же учетную запись в то же время
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,You cannot credit and debit same account at the same time,Вы не можете кредитные и дебетовые же учетную запись в то же время
 DocType: Naming Series,Help HTML,Помощь HTML
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},Всего Weightage назначен должна быть 100%. Это {0}
 apps/erpnext/erpnext/controllers/status_updater.py +140,Allowance for over-{0} crossed for Item {1},Учет по-{0} скрещенными за Пункт {1}
 DocType: Address,Name of person or organization that this address belongs to.,"Имя лица или организации, что этот адрес принадлежит."
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +587,Your Suppliers,Ваши Поставщики
+apps/erpnext/erpnext/public/js/setup_wizard.js +325,Your Suppliers,Ваши Поставщики
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,"Невозможно установить, как Остаться в живых, как заказ клиента производится."
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +65,Another Salary Structure {0} is active for employee {1}. Please make its status 'Inactive' to proceed.,"Еще Зарплата Структура {0} будет активна в течение сотрудника {1}. Пожалуйста, убедитесь, его статус «неактивные», чтобы продолжить."
 DocType: Purchase Invoice,Contact,Контакты
@@ -3601,37 +3453,35 @@
 DocType: Item,Has Serial No,Имеет Серийный номер
 DocType: Employee,Date of Issue,Дата выдачи
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +16,{0}: From {0} for {1},{0}: С {0} для {1}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +154,Row #{0}: Set Supplier for item {1},Ряд # {0}: Установить Поставщик по пункту {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +149,Row #{0}: Set Supplier for item {1},Ряд # {0}: Установить Поставщик по пункту {1}
 DocType: Issue,Content Type,Тип контента
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +17,Computer,Компьютер
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,Компьютер
 DocType: Item,List this Item in multiple groups on the website.,Перечислите этот пункт в нескольких группах на веб-сайте.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +283,Please check Multi Currency option to allow accounts with other currency,"Пожалуйста, проверьте мультивалютный вариант, позволяющий счета другой валюте"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +285,Please check Multi Currency option to allow accounts with other currency,"Пожалуйста, проверьте мультивалютный вариант, позволяющий счета другой валюте"
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +62,Item: {0} does not exist in the system,Состояние: {0} не существует в системе
 apps/erpnext/erpnext/accounts/doctype/account/account.py +81,You are not authorized to set Frozen value,Ваши настройки доступа не позволяют замораживать значения
 DocType: Payment Reconciliation,Get Unreconciled Entries,Получить непримиримыми Записи
 DocType: Cost Center,Budgets,Бюджеты
 apps/frappe/frappe/core/page/modules_setup/modules_setup.py +11,Updated,Обновлено
 DocType: Employee,Emergency Contact Details,Аварийный Контактные данные
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +396,What does it do?,Что оно делает?
+apps/erpnext/erpnext/public/js/setup_wizard.js +144,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,Средний Комиссия курс
-apps/erpnext/erpnext/stock/doctype/item/item.py +313,'Has Serial No' can not be 'Yes' for non-stock item,"""Имеет Серийный номер"" не может быть ""Да"" для не складской позиции"
+apps/erpnext/erpnext/stock/doctype/item/item.py +317,'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/setup/page/setup_wizard/install_fixtures.py +111,Electrical,Электрический
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +111,Electrical,Электрический
 DocType: Stock Entry,Total Value Difference (Out - In),Общая стоимость Разница (Out - In)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +302,Row {0}: Exchange Rate is mandatory,Ряд {0}: Курс является обязательным
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +304,Row {0}: Exchange Rate is mandatory,Ряд {0}: Курс является обязательным
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},ID пользователя не установлен для сотрудника {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +72,Peening,Упрочнения
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,From Warranty Claim,От претензий по гарантии
 DocType: Stock Entry,Default Source Warehouse,По умолчанию Источник Склад
 DocType: Item,Customer Code,Код клиента
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +212,Birthday Reminder for {0},Напоминание о дне рождения для {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +163,Lapping,Притирка
-apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.js +8,Days Since Last Order,Дни с последнего Заказать
+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 +299,Debit To account must be a Balance Sheet account,Дебету счета должны быть баланс счета
 DocType: Buying Settings,Naming Series,Наименование серии
 DocType: Leave Block List,Leave Block List Name,Оставьте Имя Блок-лист
@@ -3646,7 +3496,7 @@
 DocType: Notification Control,Sales Invoice Message,Счет по продажам Написать письмо
 DocType: Authorization Rule,Based On,На основании
 DocType: Sales Order Item,Ordered Qty,Заказал Кол-во
-apps/erpnext/erpnext/stock/doctype/item/item.py +539,Item {0} is disabled,Пункт {0} отключена
+apps/erpnext/erpnext/stock/doctype/item/item.py +543,Item {0} is disabled,Пункт {0} отключена
 DocType: Stock Settings,Stock Frozen Upto,Фото Замороженные До
 apps/erpnext/erpnext/controllers/recurring_document.py +166,Period From and Period To dates mandatory for recurring {0},Период с Период и датам обязательных для повторяющихся {0}
 apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,Проектная деятельность / задачи.
@@ -3656,7 +3506,6 @@
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,Скидка должна быть меньше 100
 DocType: ToDo,Low,Низкий
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Списание Сумма (Компания валют)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +71,Spinning,Спиннинг
 DocType: Landed Cost Voucher,Landed Cost Voucher,Земельные стоимости путевки
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +55,Please set {0},"Пожалуйста, установите {0}"
 DocType: Purchase Invoice,Repeat on Day of Month,Повторите с Днем Ежемесячно
@@ -3678,7 +3527,6 @@
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +37,Campaign Name is required,Необходимо ввести имя компании
 DocType: Maintenance Visit,Maintenance Date,Техническое обслуживание Дата
 DocType: Purchase Receipt Item,Rejected Serial No,Отклонен Серийный номер
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +51,Deep drawing,Глубокий рисунок
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +40,New Newsletter,Новый бюллетень
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +157,Start date should be less than end date for Item {0},Дата начала должна быть меньше даты окончания для Пункт {0}
 apps/erpnext/erpnext/stock/doctype/item/item.js +17,Show Balance,Показать Баланс
@@ -3689,7 +3537,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +119,BOM and Manufacturing Quantity are required,Спецификация и производство Количество требуется
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Старение Диапазон 2
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +450,Amount,Сумма
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +147,Riveting,Клепка
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,BOM заменить
 ,Sales Analytics,Продажи Аналитика
 DocType: Manufacturing Settings,Manufacturing Settings,Настройки Производство
@@ -3701,20 +3548,19 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +207,New Account Name,Новый Имя счета
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,Сырье Поставляется Стоимость
 DocType: Selling Settings,Settings for Selling Module,Настройки по продаже модуля
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +73,Customer Service,Обслуживание Клиентов
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Customer Service,Обслуживание Клиентов
 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.,Предложение кандидата Работа.
 DocType: Notification Control,Prompt for Email on Submission of,Запрашивать Email по подаче
+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 +70,Item {0} must be a stock Item,Пункт {0} должен быть запас товара
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,По умолчанию работы на складе Прогресс
 apps/erpnext/erpnext/config/accounts.py +107,Default settings for accounting transactions.,Настройки по умолчанию для бухгалтерских операций.
 apps/frappe/frappe/model/naming.py +40,{0} is required,{0} требуется
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +21,Vacuum molding,Вакуумная формовка
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,Ожидаемая дата не может быть до Материал Дата заказа
 DocType: Contact Us Settings,City,Город
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +132,Ultrasonic machining,Ультразвуковой обработки
 apps/frappe/frappe/templates/base.html +137,Error: Not a valid id?,Ошибка: Не действует ID?
 apps/erpnext/erpnext/stock/get_item_details.py +125,Item {0} must be a Sales Item,Пункт {0} должен быть Продажи товара
 DocType: Naming Series,Update Series Number,Обновление Номер серии
@@ -3722,7 +3568,7 @@
 DocType: Sales Order,Printing Details,Печать Подробности
 DocType: Task,Closing Date,Дата закрытия
 DocType: Sales Order Item,Produced Quantity,Добытое количество
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +84,Engineer,Инженер
+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,Поиск Sub сборки
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +379,Item Code required at Row No {0},Код товара требуется на Row Нет {0}
 DocType: Sales Partner,Partner Type,Тип Партнер
@@ -3730,7 +3576,7 @@
 DocType: Authorization Rule,Customerwise Discount,Customerwise Скидка
 DocType: Purchase Invoice,Against Expense Account,Против Expense Счет
 DocType: Production Order,Production Order,Производственный заказ
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +258,Installation Note {0} has already been submitted,Установка Примечание {0} уже представлен
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +263,Installation Note {0} has already been submitted,Установка Примечание {0} уже представлен
 DocType: Quotation Item,Against Docname,Против DOCNAME
 DocType: SMS Center,All Employee (Active),Все Сотрудник (Активный)
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,Просмотр сейчас
@@ -3739,19 +3585,19 @@
 DocType: Item,Re-Order Level,Re-ордера и уровней
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,"Введите предметы и плановый Количество, для которых необходимо повысить производственные заказы или скачать сырье для анализа."
 apps/frappe/frappe/public/js/frappe/views/ganttview.js +45,Gantt Chart,Диаграмма Ганта
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +57,Part-time,Неполная занятость
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,Part-time,Неполная занятость
 DocType: Employee,Applicable Holiday List,Применимо Список праздников
 DocType: Employee,Cheque,Чек
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,Серия Обновлено
 apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Report Type is mandatory,Тип отчета является обязательным
 DocType: Item,Serial Number Series,Серийный Номер серии
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},Склад является обязательным для складе Пункт {0} в строке {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +45,Retail & Wholesale,Розничная и оптовая торговля
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,Розничная и оптовая торговля
 DocType: Issue,First Responded On,Впервые Ответил на
 DocType: Website Item Group,Cross Listing of Item in multiple groups,Крест Листинг пункта в нескольких группах
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +351,The First User: You,Первый пользователя: Вы
+apps/erpnext/erpnext/public/js/setup_wizard.js +101,The First User: You,Первый пользователя: Вы
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +48,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 +172,Successfully Reconciled,Успешно Примирение
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +119,Successfully Reconciled,Успешно Примирение
 DocType: Production Order,Planned End Date,Планируемая Дата завершения
 apps/erpnext/erpnext/config/stock.py +43,Where items are stored.,Где элементы хранятся.
 DocType: Tax Rule,Validity,Период действия
@@ -3771,39 +3617,36 @@
 DocType: DocPerm,Level,Уровень
 DocType: Purchase Taxes and Charges,On Net Total,On Net Всего
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +160,Target warehouse in row {0} must be same as Production Order,"Целевая склад в строке {0} должно быть таким же, как производственного заказа"
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +59,No permission to use Payment Tool,Нет разрешения на использование платежного инструмента
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +97,No permission to use Payment Tool,Нет разрешения на использование платежного инструмента
 apps/erpnext/erpnext/controllers/recurring_document.py +192,'Notification Email Addresses' not specified for recurring %s,"""Email адрес для уведомлений"" не указан для повторяющихся %s"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +86,Milling,Фрезерный
 apps/erpnext/erpnext/accounts/doctype/account/account.py +99,Currency can not be changed after making entries using some other currency,"Валюта не может быть изменена после внесения записи, используя другой валюты"
 DocType: Company,Round Off Account,Округление аккаунт
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +60,Nibbling,Нарезки
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,Административные затраты
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +18,Consulting,Консалтинг
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +18,Consulting,Консалтинг
 DocType: Customer Group,Parent Customer Group,Родительский клиент Группа
 apps/erpnext/erpnext/public/js/pos/pos.js +429,Change,Изменение
 DocType: Purchase Invoice,Contact Email,Эл. адрес
 DocType: Appraisal Goal,Score Earned,Оценка Заработано
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +393,"e.g. ""My Company LLC""","например ""Моя компания ООО """
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +173,Notice Period,Срок Уведомления
+apps/erpnext/erpnext/public/js/setup_wizard.js +141,"e.g. ""My Company LLC""","например ""Моя компания ООО """
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +173,Notice Period,Срок Уведомления
 DocType: Bank Reconciliation Detail,Voucher ID,ID ваучера
 apps/erpnext/erpnext/setup/doctype/territory/territory.js +14,This is a root territory and cannot be edited.,Это корень территории и не могут быть изменены.
 DocType: Packing Slip,Gross Weight UOM,Вес брутто Единица измерения
 DocType: Email Digest,Receivables / Payables,Кредиторской / дебиторской задолженности
 DocType: Delivery Note Item,Against Sales Invoice,Против продаж счета-фактуры
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +63,Stamping,Тиснение
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +457,Credit Account,Кредитный счет
 DocType: Landed Cost Item,Landed Cost Item,Посадка Статьи затрат
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +56,Show zero values,Показать нулевые значения
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,Количество пункта получены после изготовления / переупаковка от заданных величин сырья
 DocType: Payment Reconciliation,Receivable / Payable Account,/ Дебиторская задолженность аккаунт
 DocType: Delivery Note Item,Against Sales Order Item,На Sales Order Пункт
-apps/erpnext/erpnext/stock/doctype/item/item.py +521,Please specify Attribute Value for attribute {0},"Пожалуйста, сформулируйте Значение атрибута для атрибута {0}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +525,Please specify Attribute Value for attribute {0},"Пожалуйста, сформулируйте Значение атрибута для атрибута {0}"
 DocType: Item,Default Warehouse,По умолчанию Склад
 DocType: Task,Actual End Date (via Time Logs),Фактическая Дата окончания (через журналы Time)
 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,Распечатать без суммы
-apps/erpnext/erpnext/controllers/buying_controller.py +69,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,"Налоговый Категория не может быть ""Оценка"" или ""Оценка и Всего», как все детали, нет в наличии"
+apps/erpnext/erpnext/controllers/buying_controller.py +60,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,"Налоговый Категория не может быть ""Оценка"" или ""Оценка и Всего», как все детали, нет в наличии"
 DocType: User,Last Name,Фамилия
 DocType: Web Page,Left,Слева
 DocType: Event,All Day,Весь день
@@ -3811,7 +3654,7 @@
 DocType: Appraisal,Total Score (Out of 5),Всего рейтинг (из 5)
 DocType: Contact Us Settings,State,Состояние
 DocType: Batch,Batch,Партия
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +51,Balance,Баланс
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +28,Balance,Баланс
 DocType: Project,Total Expense Claim (via Expense Claims),Всего расходов претензии (с помощью расходные Претензии)
 DocType: User,Gender,Пол
 DocType: Journal Entry,Debit Note,Дебет-нота
@@ -3841,8 +3684,7 @@
 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/setup/page/setup_wizard/fixtures/operations.py +76,Seaming,Закатки
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +197,"Company Email ID not found, hence mail not sent","Не найден e-mail ID предприятия, поэтому почта не отправляется"
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +206,"Company Email ID not found, hence mail not sent","Не найден e-mail ID предприятия, поэтому почта не отправляется"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Применение средств (активов)
 DocType: Production Planning Tool,Filter based on item,Фильтр на основе пункта
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +451,Debit Account,Дебетовый счет
@@ -3854,17 +3696,16 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +95,{0} {1} has been modified. Please refresh.,"{0} {1} был изменен. Пожалуйста, обновите."
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,Остановить пользователям вносить Leave приложений на последующие дни.
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +591,From Opportunity,Из возможностей
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +46,Blanking,Гашение
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +166,Employee Benefits,Вознаграждения работникам
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,Employee Benefits,Вознаграждения работникам
 DocType: Sales Invoice,Is POS,Является POS
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +240,Packed quantity must equal quantity for Item {0} in row {1},Упакованные количество должно равняться количество для Пункт {0} в строке {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +245,Packed quantity must equal quantity for Item {0} in row {1},Упакованные количество должно равняться количество для Пункт {0} в строке {1}
 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.,"Законопроекты, поднятые для клиентов."
 DocType: DocField,Default,По умолчанию
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Проект Id
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +466,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},"Ряд Нет {0}: Сумма не может быть больше, чем ожидании Сумма против Расход претензии {1}. В ожидании сумма {2}"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +468,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} подписчики добавлены
 DocType: Maintenance Schedule,Schedule,Расписание
 DocType: Cost Center,"Define Budget for this Cost Center. To set budget action, see ""Company List""",Определить бюджет для этого МВЗ. Чтобы установить бюджета действие см &quot;Список компании&quot;
@@ -3875,7 +3716,7 @@
 apps/erpnext/erpnext/public/js/pos/pos.js +91,Price List not found or disabled,Прайс-лист не найден или отключен
 DocType: Expense Claim,Approved,Утверждено
 DocType: Pricing Rule,Price,Цена
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +79,Employee relieved on {0} must be set as 'Left',"Сотрудник освобожден от {0} должен быть установлен как ""левые"""
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +88,Employee relieved on {0} must be set as 'Left',"Сотрудник освобожден от {0} должен быть установлен как ""левые"""
 DocType: Item,"Selecting ""Yes"" will give a unique identity to each entity of this item which can be viewed in the Serial No master.","Выбор ""Да"" даст уникальную идентичность для каждого субъекта этого пункта, который можно рассматривать в серийный номер мастера."
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +39,Appraisal {0} created for Employee {1} in the given date range,Оценка {0} создан Требуются {1} в указанный диапазон дат
 DocType: Employee,Education,Образование
@@ -3886,7 +3727,7 @@
 apps/frappe/frappe/desk/moduleview.py +67,Standard Reports,Стандартные отчеты
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,Журнал бухгалтерских записей.
 DocType: Delivery Note Item,Available Qty at From Warehouse,Доступно Кол-во на со склада
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +209,Please select Employee Record first.,"Пожалуйста, выберите Employee Record первым."
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +224,Please select Employee Record first.,"Пожалуйста, выберите Employee Record первым."
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,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 +233,Please enter Expense Account,"Пожалуйста, введите Expense счет"
@@ -3899,46 +3740,43 @@
 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,"Потяните заказы на продажу (в ожидании, чтобы доставить) на основе вышеуказанных критериев"
 DocType: DocShare,Document Type,Тип документа
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +565,From Supplier Quotation,От поставщика цитаты
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +588,From Supplier Quotation,От поставщика цитаты
 DocType: Deduction Type,Deduction Type,Вычет Тип
 DocType: Attendance,Half Day,Полдня
 DocType: Pricing Rule,Min Qty,Мин Кол-во
 DocType: Features Setup,"To track items in sales and purchase documents with batch nos. ""Preferred Industry: Chemicals""",Чтобы отслеживать элементы в покупки и продажи документов с пакетных пп. &quot;Предпочтительный Промышленность: Химия&quot;
 DocType: GL Entry,Transaction Date,Сделка Дата
 DocType: Production Plan Item,Planned Qty,Планируемые Кол-во
-apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +91,Total Tax,Совокупная налоговая
+apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +93,Total Tax,Совокупная налоговая
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +178,For Quantity (Manufactured Qty) is mandatory,Для Количество (Изготовитель Количество) является обязательным
 DocType: Stock Entry,Default Target Warehouse,Цель по умолчанию Склад
 DocType: Purchase Invoice,Net Total (Company Currency),Чистая Всего (Компания Валюта)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +79,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Ряд {0}: Партия Тип и партия применяется только в отношении / дебиторская задолженность счет
 DocType: Notification Control,Purchase Receipt Message,Покупка Получение Сообщение
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +95,Total allocated leaves are more than period,Суммарное количество выделенных листья более периода
 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.,Запись движений предмета.
 DocType: Newsletter List Subscriber,Newsletter List Subscriber,Рассылка подписчика
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +164,Morticing,Morticing
 DocType: Email Account,Service,Услуга
 DocType: Hub Settings,Hub Settings,Настройки Hub
 DocType: Project,Gross Margin %,Валовая маржа %
 DocType: BOM,With Operations,С операций
 apps/erpnext/erpnext/accounts/party.py +232,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,"Бухгалтерские уже были сделаны в валюте {0} для компании {1}. Пожалуйста, выберите дебиторской или кредиторской задолженности счет с валютой {0}."
 ,Monthly Salary Register,Заработная плата Зарегистрироваться
-apps/frappe/frappe/website/template.py +140,Next,Далее
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard_page.html +17,Next,Далее
 DocType: Warranty Claim,If different than customer address,Если отличается от адреса клиента
 DocType: BOM Operation,BOM Operation,BOM Операция
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +118,Electropolishing,Электрополировка
 DocType: Purchase Taxes and Charges,On Previous Row Amount,На предыдущей балансовой Row
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +24,Please enter Payment Amount in atleast one row,"Пожалуйста, введите Сумма платежа в по крайней мере одном ряду"
+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-профиля
 apps/erpnext/erpnext/config/accounts.py +153,"Seasonality for setting budgets, targets etc.","Сезонность для установки бюджеты, целевые и т.п."
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +238,Row {0}: Payment Amount cannot be greater than Outstanding Amount,"Ряд {0}: Сумма платежа не может быть больше, чем непогашенная сумма"
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +46,Total Unpaid,Всего Неоплаченный
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +21,Time Log is not billable,Время входа не оплачиваемое
 apps/erpnext/erpnext/stock/get_item_details.py +128,"Item {0} is a template, please select one of its variants","Пункт {0} шаблона, выберите один из его вариантов"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +528,Purchaser,Покупатель
+apps/erpnext/erpnext/public/js/setup_wizard.js +272,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 +71,Please enter the Against Vouchers manually,"Пожалуйста, введите против Ваучеры вручную"
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +107,Please enter the Against Vouchers manually,"Пожалуйста, введите против Ваучеры вручную"
 DocType: SMS Settings,Static Parameters,Статические параметры
 DocType: Purchase Order,Advance Paid,Авансовая выплата
 DocType: Item,Item Tax,Пункт Налоговый
@@ -3947,14 +3785,12 @@
 apps/erpnext/erpnext/config/crm.py +48,Send mass SMS to your contacts,Отправить массовый SMS в список контактов
 DocType: Purchase Taxes and Charges,Consider Tax or Charge for,Рассмотрим налога или сбора для
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,Фактическая Кол-во обязательно
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +42,Cross-rolling,Кросс-прокатки
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +132,Credit Card,Кредитная карта
+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 +95,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,"Пожалуйста, введите налогов и сборов"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +85,Machining,Обработка
 DocType: Sales Invoice Item,Drop Ship,Корабль падения
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","Здесь Вы можете сохранить семейные подробности, как имя и оккупации родитель, супруг и детей"
 DocType: Hub Settings,Seller Name,Продавец Имя
@@ -3964,7 +3800,7 @@
 DocType: Stock Entry,Repack,Перепаковать
 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/setup/page/setup_wizard/setup_wizard.js +500,Attach Logo,Прикрепить логотип
+apps/erpnext/erpnext/public/js/setup_wizard.js +246,Attach Logo,Прикрепить логотип
 DocType: Customer,Commission Rate,Комиссия
 apps/erpnext/erpnext/stock/doctype/item/item.js +38,Make Variant,Сделать Variant
 apps/erpnext/erpnext/config/hr.py +145,Block leave applications by department.,Блок отпуска приложений отделом.
@@ -3979,19 +3815,19 @@
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +105,Please select a csv file,Выберите файл CSV
 DocType: Dropbox Backup,Send Backups to Dropbox,Отправить резервных копий в Dropbox
 DocType: Purchase Order,To Receive and Bill,Для приема и Билл
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +94,Designer,Дизайнер
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Designer,Дизайнер
 apps/erpnext/erpnext/config/selling.py +121,Terms and Conditions Template,Условия шаблона
 DocType: Serial No,Delivery Details,Подробности доставки
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +383,Cost Center is required in row {0} in Taxes table for type {1},МВЗ требуется в строке {0} в виде налогов таблицы для типа {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +386,Cost Center is required in row {0} in Taxes table for type {1},МВЗ требуется в строке {0} в виде налогов таблицы для типа {1}
 DocType: Item,Automatically create Material Request if quantity falls below this level,"Автоматическое создание материала Запрос если количество падает ниже этого уровня,"
 ,Item-wise Purchase Register,Пункт мудрый Покупка Зарегистрироваться
 DocType: Batch,Expiry Date,Срок годности:
-apps/erpnext/erpnext/stock/doctype/item/item.py +375,"To set reorder level, item must be a Purchase Item or Manufacturing Item","Чтобы установить уровень повторного заказа, деталь должна быть Покупка товара или товара Производство"
+apps/erpnext/erpnext/stock/doctype/item/item.py +379,"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.,Мастер проекта.
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,Не показывать любой символ вроде $ и т.д. рядом с валютами.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +330, (Half Day),(Полдня)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +374, (Half Day),(Полдня)
 DocType: Supplier,Credit Days,Кредитные дней
 DocType: Leave Type,Is Carry Forward,Является ли переносить
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +478,Get Items from BOM,Получить элементов из спецификации
@@ -3999,7 +3835,7 @@
 apps/erpnext/erpnext/config/manufacturing.py +120,Bill of Materials,Ведомость материалов
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +77,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Ряд {0}: Партия Тип и партия необходима для / дебиторская задолженность внимание {1}
 DocType: Dropbox Backup,Send Notifications To,Отправлять уведомления
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html +26,Ref Date,Ссылка Дата
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +54,Ref Date,Ссылка Дата
 DocType: Employee,Reason for Leaving,Причина увольнения
 DocType: Expense Claim Detail,Sanctioned Amount,Санкционированный Количество
 DocType: GL Entry,Is Opening,Открывает
@@ -4007,4 +3843,3 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +188,Account {0} does not exist,Аккаунт {0} не существует
 DocType: Account,Cash,Наличные
 DocType: Employee,Short biography for website and other publications.,Краткая биография для веб-сайта и других изданий.
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +31,Please create Salary Structure for employee {0},"Пожалуйста, создайте Зарплата Структура для работника {0}"
diff --git a/erpnext/translations/sk.csv b/erpnext/translations/sk.csv
index 349e238..e8f75ae 100644
--- a/erpnext/translations/sk.csv
+++ b/erpnext/translations/sk.csv
@@ -1,13 +1,12 @@
 DocType: Employee,Salary Mode,Mode Plat
 DocType: Cost Center,"Select Monthly Distribution, if you want to track based on seasonality.","Vyberte měsíční výplatou, pokud chcete sledovat na základě sezónnosti."
 DocType: Employee,Divorced,Rozvedený
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +86,Warning: Same item has been entered multiple times.,Upozornenie: Rovnaké položky bol zadaný viackrát.
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +80,Warning: Same item has been entered multiple times.,Upozornenie: Rovnaké položky bol zadaný viackrát.
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +96,Items already synced,Položky již synchronizovat
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,"Povoliť položky, ktoré sa pridávajú viackrát v transakcii"
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,Materiál Navštivte {0} před zrušením této záruční reklamaci Zrušit
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +19,Consumer Products,Spotřební zboží
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,Spotřební zboží
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +68,Please select Party Type first,"Prosím, vyberte typ Party prvý"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +90,Annealing,Žíhanie
 DocType: Item,Customer Items,Zákazník položky
 apps/erpnext/erpnext/accounts/doctype/account/account.py +45,Account {0}: Parent account {1} can not be a ledger,Účet {0}: Nadřazený účet {1} nemůže být hlavní kniha
 DocType: Item,Publish Item to hub.erpnext.com,Publikování položku do hub.erpnext.com
@@ -20,15 +19,14 @@
 DocType: About Us Settings,Website,Stránky
 DocType: POS Profile,Applicable for User,Použiteľné pre Užívateľa
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +169,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Zastavil výrobu Objednať nemožno zrušiť, uvoľniť ho najprv zrušiť"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +23,Compaction plus sintering,Zhutňovanie a spekanie
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,Currency is required for Price List {0},Měna je vyžadováno pro Ceníku {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Bude se vypočítá v transakci.
 DocType: Purchase Order,Customer Contact,Kontakt so zákazníkmi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +549,From Material Request,Z materiálu Poptávka
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +572,From Material Request,Z materiálu Poptávka
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} Strom
 DocType: Job Applicant,Job Applicant,Job Žadatel
 apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,Žádné další výsledky.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +78,Legal,Právní
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +34,Legal,Právní
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +114,Actual type tax cannot be included in Item rate in row {0},Aktuálny typ daň nemôže byť zahrnutý v cene Položka v riadku {0}
 DocType: C-Form,Customer,Zákazník
 DocType: Purchase Receipt Item,Required By,Vyžadováno
@@ -43,7 +41,6 @@
 DocType: Manufacturing Settings,Default 10 mins,Predvolené 10 min
 DocType: Leave Type,Leave Type Name,Nechte Typ Jméno
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +148,Series Updated Successfully,Řada Aktualizováno Úspěšně
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +150,Stitching,Šitie
 DocType: Pricing Rule,Apply On,Naneste na
 DocType: Item Price,Multiple Item prices.,Více ceny položku.
 ,Purchase Order Items To Be Received,Položky vydané objednávky k přijetí
@@ -51,8 +48,8 @@
 DocType: Quality Inspection Reading,Parameter,Parametr
 apps/erpnext/erpnext/projects/doctype/project/project.py +43,Expected End Date can not be less than Expected Start Date,"Očakávané Dátum ukončenia nemôže byť nižšia, než sa očakávalo dáta začatia"
 apps/erpnext/erpnext/utilities/transaction_base.py +104,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,"Riadok # {0}: Cena musí byť rovnaké, ako {1}: {2} ({3} / {4})"
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +189,New Leave Application,New Leave Application
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +134,Bank Draft,Bank Návrh
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +204,New Leave Application,New Leave Application
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +134,Bank Draft,Bank Návrh
 DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,"1.Chcete-li zachovat zákazníkovo produktové číslo a také podle něj vyhledávat, použijte tuto možnost"
 DocType: Mode of Payment Account,Mode of Payment Account,Způsob platby účtu
 apps/erpnext/erpnext/stock/doctype/item/item.js +34,Show Variants,Zobraziť Varianty
@@ -64,25 +61,23 @@
 DocType: Production Plan Item,Production Plan Item,Výrobní program Item
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +141,User {0} is already assigned to Employee {1},Uživatel {0} je již přiřazena k Employee {1}
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +13,Make new POS Profile,Vykonajte nové POS profil
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +31,Health Care,Péče o zdraví
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,Péče o zdraví
 DocType: Purchase Invoice,Monthly,Měsíčně
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +66,Delay in payment (Days),Oneskorenie s platbou (dni)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +494,Invoice,Faktúra
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +519,Invoice,Faktúra
 DocType: Maintenance Schedule Item,Periodicity,Periodicita
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +357,Email Address,E-mailová adresa
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +21,Defense,Obrana
+apps/erpnext/erpnext/public/js/setup_wizard.js +107,Email Address,E-mailová adresa
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,Obrana
 DocType: Company,Abbr,Zkr
 DocType: Appraisal Goal,Score (0-5),Score (0-5)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +193,Row {0}: {1} {2} does not match with {3},Řádek {0}: {1} {2} se neshoduje s {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +67,Row # {0}:,Řádek # {0}:
 DocType: Delivery Note,Vehicle No,Vozidle
 apps/erpnext/erpnext/public/js/pos/pos.js +528,Please select Price List,"Prosím, vyberte Ceník"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +162,Woodworking,Spracovanie dreva
 DocType: Production Order Operation,Work In Progress,Work in Progress
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +153,3D printing,3D tlač
 DocType: Employee,Holiday List,Dovolená Seznam
 DocType: Time Log,Time Log,Time Log
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +530,Accountant,Účetní
+apps/erpnext/erpnext/public/js/setup_wizard.js +274,Accountant,Účetní
 DocType: Cost Center,Stock User,Sklad Užívateľ
 DocType: Company,Phone No,Telefon
 DocType: Time Log,"Log of Activities performed by users against Tasks that can be used for tracking time, billing.","Log činností vykonávaných uživateli proti úkoly, které mohou být použity pro sledování času, fakturaci."
@@ -98,18 +93,19 @@
 DocType: Bin,Quantity Requested for Purchase,Požadovaného množství na nákup
 DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name","Pripojiť CSV súbor s dvomi stĺpci, jeden pre starý názov a jeden pre nový názov"
 DocType: Packed Item,Parent Detail docname,Parent Detail docname
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Kg,Kg
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Kg,Kg
 apps/erpnext/erpnext/config/hr.py +48,Opening for a Job.,Otevření o zaměstnání.
 DocType: Item Attribute,Increment,Prírastok
 apps/erpnext/erpnext/public/js/stock_analytics.js +63,Select Warehouse...,Vyberte Warehouse ...
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +6,Advertising,Reklama
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,Reklama
+apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,Rovnaký Spoločnosť je zapísaná viac ako raz
 DocType: Employee,Married,Ženatý
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +389,Stock cannot be updated against Delivery Note {0},Sklad nelze aktualizovat na dodací list {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +391,Stock cannot be updated against Delivery Note {0},Sklad nelze aktualizovat na dodací list {0}
 DocType: Payment Reconciliation,Reconcile,Srovnat
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +30,Grocery,Potraviny
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,Potraviny
 DocType: Quality Inspection Reading,Reading 1,Čtení 1
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Make Bank Entry,Proveďte Bank Vstup
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +40,Pension Funds,Penzijní fondy
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,Penzijní fondy
 apps/erpnext/erpnext/accounts/doctype/account/account.py +142,Warehouse is mandatory if account type is Warehouse,"Sklad je povinné, pokud typ účtu je Warehouse"
 DocType: SMS Center,All Sales Person,Všichni obchodní zástupci
 DocType: Lead,Person Name,Osoba Meno
@@ -131,7 +127,7 @@
 DocType: Quality Inspection,Get Specification Details,Získat Specifikace Podrobnosti
 DocType: Lead,Interested,Zájemci
 apps/erpnext/erpnext/config/manufacturing.py +14,Bill of Material,Bill of materiálu
-apps/erpnext/erpnext/public/js/stock_analytics.js +45,Opening,Otvor
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +158,Opening,Otvor
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},Od {0} do {1}
 DocType: Item,Copy From Item Group,Kopírovat z bodu Group
 DocType: Journal Entry,Opening Entry,Otevření Entry
@@ -145,23 +141,22 @@
 DocType: Employee Education,Under Graduate,Za absolventa
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +22,Target On,Target On
 DocType: BOM,Total Cost,Celkové náklady
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +99,Reaming,Vystružovanie
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +9,Activity Log:,Aktivita Log:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +199,Item {0} does not exist in the system or has expired,Bod {0} neexistuje v systému nebo vypršela
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +44,Real Estate,Nemovitost
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +44,Real Estate,Nemovitost
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +4,Statement of Account,Výpis z účtu
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +41,Pharmaceuticals,Farmaceutické
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,Farmaceutické
 DocType: Expense Claim Detail,Claim Amount,Nárok Částka
 DocType: Employee,Mr,Pan
 DocType: Custom Script,Client,Klient
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,Dodavatel Typ / dovozce
 DocType: Naming Series,Prefix,Prefix
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Consumable,Spotřební
+apps/erpnext/erpnext/public/js/setup_wizard.js +359,Consumable,Spotřební
 DocType: Upload Attendance,Import Log,Záznam importu
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.js +19,Send,Odeslat
 DocType: Sales Invoice Item,Delivered By Supplier,Dodáva sa podľa dodávateľa
 DocType: SMS Center,All Contact,Vše Kontakt
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +164,Annual Salary,Ročné Plat
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +164,Annual Salary,Ročné Plat
 DocType: Period Closing Voucher,Closing Fiscal Year,Uzavření fiskálního roku
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +69,Stock Expenses,Stock Náklady
 DocType: Newsletter,Email Sent?,E-mail odeslán?
@@ -169,7 +164,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +92,Show Time Logs,Show Time Záznamy
 DocType: Journal Entry Account,Credit in Company Currency,Úverové spoločnosti v mene
 DocType: Delivery Note,Installation Status,Stav instalace
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +115,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Schválené + Zamítnuté množství se musí rovnat množství Přijaté u položky {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +118,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Schválené + Zamítnuté množství se musí rovnat množství Přijaté u položky {0}
 DocType: Item,Supply Raw Materials for Purchase,Dodávky suroviny pre nákup
 apps/erpnext/erpnext/stock/get_item_details.py +133,Item {0} must be a Purchase Item,Bod {0} musí být Nákup položky
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
@@ -177,19 +172,17 @@
  Všechny termíny a zaměstnanec kombinaci ve zvoleném období přijde v šabloně, se stávajícími evidence docházky"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +446,Item {0} is not active or end of life has been reached,"Bod {0} není aktivní, nebo byl dosažen konec života"
 DocType: Time Log Batch,Will be updated after Sales Invoice is Submitted.,Bude aktualizováno po odeslání faktury.
-apps/erpnext/erpnext/controllers/accounts_controller.py +493,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Chcete-li zahrnout daně na řádku v poměru Položka {0}, daně v řádcích {1} musí být zahrnuty"
+apps/erpnext/erpnext/controllers/accounts_controller.py +494,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Chcete-li zahrnout daně na řádku v poměru Položka {0}, daně v řádcích {1} musí být zahrnuty"
 apps/erpnext/erpnext/config/hr.py +90,Settings for HR Module,Nastavenie modulu HR
 DocType: SMS Center,SMS Center,SMS centrum
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +78,Straightening,Rovnacie
 DocType: BOM Replace Tool,New BOM,New BOM
 apps/erpnext/erpnext/config/projects.py +28,Batch Time Logs for billing.,Batch čas Záznamy pro fakturaci.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +15,Countergravity casting,Countergravity liatie
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +30,Newsletter has already been sent,Newsletter již byla odeslána
 DocType: Lead,Request Type,Typ požadavku
 DocType: Leave Application,Reason,Důvod
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +14,Broadcasting,Vysílání
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +140,Execution,Provedení
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +364,The first user will become the System Manager (you can change this later).,První uživatel bude System Manager (lze později změnit).
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,Vysílání
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +140,Execution,Provedení
+apps/erpnext/erpnext/public/js/setup_wizard.js +114,The first user will become the System Manager (you can change this later).,První uživatel bude System Manager (lze později změnit).
 apps/erpnext/erpnext/config/manufacturing.py +39,Details of the operations carried out.,Podrobnosti o prováděných operací.
 DocType: Serial No,Maintenance Status,Status Maintenance
 apps/erpnext/erpnext/config/stock.py +263,Items and Pricing,Položky a Ceny
@@ -206,7 +199,6 @@
 DocType: Pricing Rule,Discount on Price List Rate (%),Zľava na Cenník Rate (%)
 apps/frappe/frappe/public/js/frappe/form/print.js +96,Start,Start
 DocType: User,First Name,Meno
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +12,Full-mold casting,Liatie Full-forma
 DocType: Offer Letter,Select Terms and Conditions,Vyberte Podmienky
 DocType: Production Planning Tool,Sales Orders,Prodejní objednávky
 DocType: Purchase Taxes and Charges,Valuation,Ocenění
@@ -218,8 +210,7 @@
 DocType: Bank Reconciliation,Bank Account,Bankovní účet
 DocType: Leave Type,Allow Negative Balance,Povolit záporný zůstatek
 DocType: Selling Settings,Default Territory,Výchozí Territory
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +53,Television,Televize
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +138,Gashing,Rozsekne
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,Televize
 DocType: Production Order Operation,Updated via 'Time Log',"Aktualizováno přes ""Time Log"""
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +82,Account {0} does not belong to Company {1},Účet {0} nepatří do společnosti {1}
 DocType: Naming Series,Series List for this Transaction,Řada seznam pro tuto transakci
@@ -234,14 +225,13 @@
 DocType: Leave Allocation,Add unused leaves from previous allocations,Pridať nevyužité listy z predchádzajúcich prídelov
 apps/erpnext/erpnext/controllers/recurring_document.py +206,Next Recurring {0} will be created on {1},Další Opakující {0} bude vytvořen na {1}
 DocType: Newsletter List,Total Subscribers,Celkom Odberatelia
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +575,Contact Name,Kontakt Meno
+,Contact Name,Kontakt Meno
 DocType: Production Plan Item,SO Pending Qty,SO Pending Množství
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Vytvoří výplatní pásku na výše uvedených kritérií.
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,Žádost o koupi.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +107,Double housing,Double bývanie
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +156,Only the selected Leave Approver can submit this Leave Application,Pouze vybraný Leave schvalovač může podat této dovolené aplikaci
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +171,Only the selected Leave Approver can submit this Leave Application,Pouze vybraný Leave schvalovač může podat této dovolené aplikaci
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,Uvolnění Datum musí být větší než Datum spojování
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +172,Leaves per Year,Listy za rok
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +172,Leaves per Year,Listy za rok
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup > Settings > Naming Series,Prosím nastavte Pomenovanie Series pre {0} cez Nastavenia&gt; Nastavenia&gt; Naming Séria
 DocType: Time Log,Will be updated when batched.,Bude aktualizována při dávkově.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +104,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,"Row {0}: Zkontrolujte ""Je Advance"" proti účtu {1}, pokud je to záloha záznam."
@@ -250,25 +240,24 @@
 DocType: Item Website Specification,Item Website Specification,Položka webových stránek Specifikace
 DocType: Dropbox Backup,Dropbox Access Key,Dropbox Access Key
 DocType: Payment Tool,Reference No,Referenční číslo
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +348,Leave Blocked,Nechte Blokováno
-apps/erpnext/erpnext/stock/doctype/item/item.py +535,Item {0} has reached its end of life on {1},Položka {0} dosáhla konce své životnosti na {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +392,Leave Blocked,Nechte Blokováno
+apps/erpnext/erpnext/stock/doctype/item/item.py +539,Item {0} has reached its end of life on {1},Položka {0} dosáhla konce své životnosti na {1}
 apps/erpnext/erpnext/accounts/utils.py +339,Annual,Roční
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Reklamní Odsouhlasení Item
 DocType: Stock Entry,Sales Invoice No,Prodejní faktuře č
 DocType: Material Request Item,Min Order Qty,Min Objednané množství
 DocType: Lead,Do Not Contact,Nekontaktujte
 DocType: Sales Invoice,The unique id for tracking all recurring invoices. It is generated on submit.,Unikátní ID pro sledování všech opakující faktury. To je generován na odeslat.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +93,Software Developer,Software Developer
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +93,Software Developer,Software Developer
 DocType: Item,Minimum Order Qty,Minimální objednávka Množství
 DocType: Pricing Rule,Supplier Type,Dodavatel Type
 DocType: Item,Publish in Hub,Publikovat v Hub
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +555,Item {0} is cancelled,Položka {0} je zrušená
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +598,Material Request,Požadavek na materiál
+apps/erpnext/erpnext/stock/doctype/item/item.py +559,Item {0} is cancelled,Položka {0} je zrušená
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +607,Material Request,Požadavek na materiál
 DocType: Bank Reconciliation,Update Clearance Date,Aktualizace Výprodej Datum
 DocType: Item,Purchase Details,Nákup Podrobnosti
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +323,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},Položka {0} nebol nájdený v &quot;suroviny dodanej&quot; tabuľky v objednávke {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +129,Wire brushing,Wire kefovanie
 DocType: Employee,Relation,Vztah
 DocType: Shipping Rule,Worldwide Shipping,Celosvetovo doprava
 apps/erpnext/erpnext/config/selling.py +23,Confirmed orders from Customers.,Potvrzené objednávky od zákazníků.
@@ -284,12 +273,11 @@
 DocType: Supplier,Address HTML,Adresa HTML
 DocType: Lead,Mobile No.,Mobile No.
 DocType: Maintenance Schedule,Generate Schedule,Generování plán
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +81,Hubbing,Hubbing
 DocType: Purchase Invoice Item,Expense Head,Náklady Head
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +86,Please select Charge Type first,"Prosím, vyberte druh tarifu první"
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,Nejnovější
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +395,Max 5 characters,Max 5 znaků
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +195,Select Your Language,Zvolit jazyk
+apps/erpnext/erpnext/public/js/setup_wizard.js +143,Max 5 characters,Max 5 znaků
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +245,Select Your Language,Zvolit jazyk
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,První Leave schvalovač v seznamu bude nastaven jako výchozí Leave schvalujícího
 DocType: Manufacturing Settings,"Disables creation of time logs against Production Orders.
 Operations shall not be tracked against Production Order",Zakáže vytváranie časových protokolov proti výrobnej zákazky. Transakcie nesmú byť sledovaná proti výrobnej zákazky
@@ -301,8 +289,6 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +34,Item {0} must be Service Item,Položka {0} musí být Service Item
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +303,Completed Qty can not be greater than 'Qty to Manufacture',"Dokončené množství nemůže být větší než ""Množství do výroby"""
 DocType: DocType,Administrator,Správce
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +136,Laser drilling,Laserové vŕtanie
-DocType: Stock UOM Replace Utility,New Stock UOM,Nová skladová MJ
 DocType: Period Closing Voucher,Closing Account Head,Závěrečný účet hlava
 DocType: Employee,External Work History,Vnější práce History
 apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,Kruhové Referenčné Chyba
@@ -311,18 +297,15 @@
 DocType: Lead,Industry,Průmysl
 DocType: Employee,Job Profile,Job Profile
 DocType: Newsletter,Newsletter,Newsletter
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +84,Hydroforming,Hydroforming
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +49,Necking,Zúženie
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Upozornit e-mailem na tvorbu automatických Materiál Poptávka
 DocType: Journal Entry,Multi Currency,Viac mien
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +51,Item is updated,Položka je aktualizována
 DocType: Async Task,System Manager,Správce systému
 DocType: Payment Reconciliation Invoice,Invoice Type,Typ faktúry
 DocType: Sales Invoice Item,Delivery Note,Dodací list
 DocType: Dropbox Backup,Allow Dropbox Access,Povolit přístup Dropbox
 apps/erpnext/erpnext/config/learn.py +72,Setting up Taxes,Nastavenie Dane
 apps/erpnext/erpnext/accounts/utils.py +189,Payment Entry has been modified after you pulled it. Please pull it again.,"Vstup Platba byla změněna poté, co ji vytáhl. Prosím, vytáhněte ji znovu."
-apps/erpnext/erpnext/stock/doctype/item/item.py +343,{0} entered twice in Item Tax,{0} vloženo dvakrát v Daňové Položce
+apps/erpnext/erpnext/stock/doctype/item/item.py +347,{0} entered twice in Item Tax,{0} vloženo dvakrát v Daňové Položce
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +105,Summary for this week and pending activities,Zhrnutie pre tento týždeň a prebiehajúcim činnostiam
 DocType: Workstation,Rent Cost,Rent Cost
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +74,Please select month and year,Vyberte měsíc a rok
@@ -339,24 +322,22 @@
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,"Sazba, za kterou je zákazník měny převeden na zákazníka základní měny"
 DocType: Features Setup,"Available in BOM, Delivery Note, Purchase Invoice, Production Order, Purchase Order, Purchase Receipt, Sales Invoice, Sales Order, Stock Entry, Timesheet","K dispozici v BOM, dodací list, fakturu, výrobní zakázky, objednávky, doklad o koupi, prodejní faktury odběratele, Stock vstupu, časový rozvrh"
 DocType: Item Tax,Tax Rate,Sadzba dane
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Select Item,Select Položka
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +540,Select Item,Select Položka
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +143,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","Item: {0} podařilo dávkové, nemůže být v souladu s použitím \
  Stock usmíření, použijte Reklamní Entry"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +259,Purchase Invoice {0} is already submitted,Přijatá faktura {0} je již odeslána
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +262,Purchase Invoice {0} is already submitted,Přijatá faktura {0} je již odeslána
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Batch No must be same as {1} {2},"Row # {0}: Batch No musí byť rovnaké, ako {1} {2}"
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Convert to non-Group,Previesť na non-Group
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +55,Purchase Receipt must be submitted,Příjmka musí být odeslána
-DocType: Stock UOM Replace Utility,Current Stock UOM,Terajšia skladová MJ
 apps/erpnext/erpnext/config/stock.py +53,Batch (lot) of an Item.,Batch (lot) položky.
 DocType: C-Form Invoice Detail,Invoice Date,Dátum fakturácie
 DocType: GL Entry,Debit Amount,Debetné Suma
 apps/erpnext/erpnext/accounts/party.py +223,There can only be 1 Account per Company in {0} {1},Tam môže byť len 1 účet na spoločnosti v {0} {1}
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Your email address,Vaše e-mailová adresa
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +194,Please see attachment,"Prosím, viz příloha"
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +203,Please see attachment,"Prosím, viz příloha"
 DocType: Purchase Order,% Received,% Přijaté
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +109,Water jet cutting,Rezanie vodným lúčom
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +24,Setup Already Complete!!,Setup již dokončen !!
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +20,Setup Already Complete!!,Setup již dokončen !!
 ,Finished Goods,Hotové zboží
 DocType: Delivery Note,Instructions,Instrukce
 DocType: Quality Inspection,Inspected By,Zkontrolován
@@ -371,6 +352,7 @@
 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.,"Prosím, nie vytvárať účty pre zákazníkov a dodávateľmi. Sú vytvorené priamo od zákazníka / dodávateľa majstrov."
 DocType: Currency Exchange,Currency Exchange,Směnárna
 DocType: Purchase Invoice Item,Item Name,Název položky
+DocType: Authorization Rule,Approving User  (above authorized value),Schválenie užívateľa (nad oprávnenej hodnoty)
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Credit Balance,Credit Balance
 DocType: Employee,Widowed,Ovdovělý
 DocType: Production Planning Tool,"Items to be requested which are ""Out of Stock"" considering all warehouses based on projected qty and minimum order qty","Položky, které je třeba požádat, které jsou ""Není skladem"" s ohledem na veškeré sklady na základě předpokládaného Množství a minimální Objednané množství"
@@ -380,11 +362,10 @@
 ,Purchase Register,Nákup Register
 DocType: Landed Cost Item,Applicable Charges,Použitelné Poplatky
 DocType: Workstation,Consumable Cost,Spotřební Cost
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,{0} ({1}) must have role 'Leave Approver',"{0} ({1}), musí mít roli ""Schvalovatel dovolených"""
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +167,{0} ({1}) must have role 'Leave Approver',"{0} ({1}), musí mít roli ""Schvalovatel dovolených"""
 DocType: Purchase Receipt,Vehicle Date,Dátum Vehicle
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +39,Medical,Lékařský
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +39,Medical,Lékařský
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,Důvod ztráty
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +36,Tube beading,Tube navliekanie korálok
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},Workstation je uzavřena v následujících dnech podle Prázdninový Seznam: {0}
 DocType: Employee,Single,Jednolůžkový
 DocType: Issue,Attachment,Príloha
@@ -405,10 +386,8 @@
 DocType: Account,Is Group,Is Group
 DocType: Stock Settings,Automatically Set Serial Nos based on FIFO,Automaticky nastaviť sériových čísel na základe FIFO
 DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,"Skontrolujte, či dodávateľské faktúry Počet Jedinečnosť"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +31,Thermoforming,Tvarovanie
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +66,Slitting,Kotúčová
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +57,'To Case No.' cannot be less than 'From Case No.',"""DO Případu č ' nesmí být menší než ""Od Případu č '"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +104,Non Profit,Non Profit
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +104,Non Profit,Non Profit
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_list.js +7,Not Started,Nezahájeno
 DocType: Lead,Channel Partner,Channel Partner
 DocType: Account,Old Parent,Staré nadřazené
@@ -417,13 +396,12 @@
 apps/erpnext/erpnext/config/manufacturing.py +74,Global settings for all manufacturing processes.,Globální nastavení pro všechny výrobní procesy.
 DocType: Accounts Settings,Accounts Frozen Upto,Účty Frozen aľ
 DocType: SMS Log,Sent On,Poslán na
-apps/erpnext/erpnext/stock/doctype/item/item.py +512,Attribute {0} selected multiple times in Attributes Table,Atribút {0} vybraný niekoľkokrát v atribútoch tabuľke
+apps/erpnext/erpnext/stock/doctype/item/item.py +516,Attribute {0} selected multiple times in Attributes Table,Atribút {0} vybraný niekoľkokrát v atribútoch tabuľke
 DocType: Sales Order,Not Applicable,Nehodí se
 apps/erpnext/erpnext/config/hr.py +140,Holiday master.,Holiday master.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +19,Shell molding,Shell liatie
 DocType: Material Request Item,Required Date,Požadovaná data
 DocType: Delivery Note,Billing Address,Fakturační adresa
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +644,Please enter Item Code.,"Prosím, zadejte kód položky."
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +648,Please enter Item Code.,"Prosím, zadejte kód položky."
 DocType: BOM,Costing,Rozpočet
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount","Je-li zaškrtnuto, bude částka daně považovat za již zahrnuty v tisku Rate / Tisk Částka"
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,Celkem Množství
@@ -433,7 +411,7 @@
 DocType: Item Attribute,To Range,K Rozsah
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Cenné papíry a vklady
 DocType: Features Setup,Imports,Importy
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +144,Adhesive bonding,Lepenie
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +77,Total leaves allocated is mandatory,Celkom listy pridelené je povinné
 DocType: Job Opening,Description of a Job Opening,Popis jednoho volných pozic
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +102,Pending activities for today,Nevybavené aktivity pre dnešok
 apps/erpnext/erpnext/config/hr.py +28,Attendance record.,Účast rekord.
@@ -441,26 +419,25 @@
 DocType: Sales Order Item,Used for Production Plan,Používá se pro výrobní plán
 DocType: System Settings,Loading...,Nahrávám...
 DocType: DocField,Password,Heslo
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +155,Fused deposition modeling,Nánosové modelovanie depozície
 DocType: Manufacturing Settings,Time Between Operations (in mins),Doba medzi operáciou (v min)
 DocType: Customer,Buyer of Goods and Services.,Kupující zboží a služeb.
 DocType: Journal Entry,Accounts Payable,Účty za úplatu
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +24,Add Subscribers,Pridať predplatitelia
 apps/erpnext/erpnext/public/js/feature_setup.js +220,""" does not exists",""" Neexistuje"
 DocType: Pricing Rule,Valid Upto,Valid aľ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +564,List a few of your customers. They could be organizations or individuals.,"Vypíšte zopár svojich zákazníkov. Môžu to byť organizácie, ale aj jednotlivci."
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,List a few of your customers. They could be organizations or individuals.,"Vypíšte zopár svojich zákazníkov. Môžu to byť organizácie, ale aj jednotlivci."
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Direct Income,Přímý příjmů
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +33,"Can not filter based on Account, if grouped by Account","Nelze filtrovat na základě účtu, pokud seskupeny podle účtu"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +88,Administrative Officer,Správní ředitel
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Administrative Officer,Správní ředitel
 DocType: Payment Tool,Received Or Paid,Přijaté nebo placené
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +318,Please select Company,"Prosím, vyberte Company"
 DocType: Stock Entry,Difference Account,Rozdíl účtu
 apps/erpnext/erpnext/projects/doctype/task/task.py +44,Cannot close task as its dependant task {0} is not closed.,"Nedá zatvoriť úloha, ako jeho závislý úloha {0} nie je uzavretý."
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +305,Please enter Warehouse for which Material Request will be raised,"Prosím, zadejte sklad, který bude materiál žádosti předložené"
 DocType: Production Order,Additional Operating Cost,Další provozní náklady
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +20,Cosmetics,Kosmetika
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,Kosmetika
 DocType: DocField,Type,Typ
-apps/erpnext/erpnext/stock/doctype/item/item.py +417,"To merge, following properties must be same for both items","Chcete-li sloučit, tyto vlastnosti musí být stejné pro obě položky"
+apps/erpnext/erpnext/stock/doctype/item/item.py +421,"To merge, following properties must be same for both items","Chcete-li sloučit, tyto vlastnosti musí být stejné pro obě položky"
 DocType: Communication,Subject,Předmět
 DocType: Shipping Rule,Net Weight,Hmotnost
 DocType: Employee,Emergency Phone,Nouzový telefon
@@ -470,7 +447,6 @@
 DocType: Journal Entry,Difference (Dr - Cr),Rozdíl (Dr - Cr)
 DocType: Account,Profit and Loss,Zisky a ztráty
 apps/erpnext/erpnext/config/stock.py +293,Managing Subcontracting,Správa Subdodávky
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +58,New UOM must NOT be of type Whole Number,Nová MJ NESMIE byť typu Celé číslo
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Furniture and Fixture,Nábytek
 DocType: Quotation,Rate at which Price list currency is converted to company's base currency,"Sazba, za kterou Ceník měna je převedena na společnosti základní měny"
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Account {0} does not belong to company: {1},Účet {0} nepatří k firmě: {1}
@@ -490,14 +466,14 @@
 DocType: Purchase Invoice,Supplier Invoice No,Dodávateľská faktúra č
 DocType: Territory,For reference,Pro srovnání
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +154,"Cannot delete Serial No {0}, as it is used in stock transactions","Nemožno odstrániť Poradové číslo {0}, ktorý sa používa na sklade transakciách"
-apps/erpnext/erpnext/public/js/account_tree_grid.js +52,Closing (Cr),Uzavření (Cr)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +227,Closing (Cr),Uzavření (Cr)
 DocType: Serial No,Warranty Period (Days),Záruční doba (dny)
 DocType: Installation Note Item,Installation Note Item,Poznámka k instalaci bod
 ,Pending Qty,Čakajúci Množstvo
 DocType: Job Applicant,Thread HTML,Thread HTML
 DocType: Company,Ignore,Ignorovat
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +86,SMS sent to following numbers: {0},SMS poslal do nasledujúcich čísel: {0}
-apps/erpnext/erpnext/controllers/buying_controller.py +135,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Dodavatel Warehouse povinné pro subdodavatelskou doklad o zakoupení
+apps/erpnext/erpnext/controllers/buying_controller.py +126,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Dodavatel Warehouse povinné pro subdodavatelskou doklad o zakoupení
 DocType: Pricing Rule,Valid From,Platnost od
 DocType: Sales Invoice,Total Commission,Celkem Komise
 DocType: Pricing Rule,Sales Partner,Sales Partner
@@ -507,7 +483,7 @@
 To distribute a budget using this distribution, set this **Monthly Distribution** in the **Cost Center**","** Měsíční rozložení** vám pomůže váš rozpočet distribuovat do více měsíců, pokud Vaše podnikání ovlivňuje sezónnost.
 
  Chcete-li distribuovat rozpočet pomocí tohoto rozdělení, nastavte toto ** měsíční rozložení ** v ** nákladovém středisku **"
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +183,No records found in the Invoice table,Nalezené v tabulce faktury Žádné záznamy
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +130,No records found in the Invoice table,Nalezené v tabulce faktury Žádné záznamy
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +20,Please select Company and Party Type first,Vyberte první společnost a Party Typ
 apps/erpnext/erpnext/config/accounts.py +84,Financial / accounting year.,Finanční / Účetní rok.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","Je nám líto, sériových čísel nelze sloučit"
@@ -523,25 +499,25 @@
 DocType: Sales Order,Billing and Delivery Status,Fakturácie a Delivery Status
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Opakujte zákazníci
 DocType: Leave Control Panel,Allocate,Přidělit
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +16,Previous,Predchádzajúci
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard_page.html +16,Previous,Predchádzajúci
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +620,Sales Return,Sales Return
 DocType: Production Planning Tool,Select Sales Orders from which you want to create Production Orders.,"Vyberte prodejní objednávky, ze kterého chcete vytvořit výrobní zakázky."
 DocType: Item,Delivered by Supplier (Drop Ship),Dodáva Dodávateľom (Drop Ship)
 apps/erpnext/erpnext/config/hr.py +120,Salary components.,Mzdové složky.
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,Databáze potenciálních zákazníků.
+DocType: Authorization Rule,Customer or Item,Zákazník alebo položka
 apps/erpnext/erpnext/config/crm.py +17,Customer database.,Databáze zákazníků.
 DocType: Quotation,Quotation To,Ponuka k
 DocType: Lead,Middle Income,Středními příjmy
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),Otvor (Cr)
 apps/erpnext/erpnext/accounts/utils.py +193,Allocated amount can not be negative,Přidělená částka nemůže být záporná
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +123,Tumbling,Tumbling
 DocType: Purchase Order Item,Billed Amt,Účtovaného Amt
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,"Logická Warehouse na položky, které mohou být vyrobeny."
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +92,Reference No & Reference Date is required for {0},Referenční číslo a referenční datum je nutné pro {0}
 DocType: Event,Wednesday,Středa
 DocType: Sales Invoice,Customer's Vendor,Prodejce zákazníka
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +214,Production Order is Mandatory,Výrobní zakázka je povinné
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +139,Proposal Writing,Návrh Psaní
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,Proposal Writing,Návrh Psaní
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,Ďalšia predaja osoba {0} existuje s rovnakým id zamestnanca
 apps/erpnext/erpnext/stock/stock_ledger.py +336,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},Negativní Sklad Error ({6}) k bodu {0} ve skladu {1} na {2} {3} v {4} {5}
 DocType: Fiscal Year Company,Fiscal Year Company,Fiskální rok Společnosti
@@ -564,7 +540,7 @@
 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.","Pak se pravidla pro tvorbu cen jsou odfiltrovány založeny na zákazníka, skupiny zákazníků, území, dodavatel, dodavatel typ, kampaň, obchodní partner atd"
 apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.py +179,Please install dropbox python module,"Prosím, nainstalujte dropbox python modul"
 DocType: Employee,Passport Number,Číslo pasu
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +82,Manager,Manažer
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Manager,Manažer
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +494,From Purchase Receipt,Z příjemky
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +219,Same item has been entered multiple times.,Stejný bod byl zadán vícekrát.
 DocType: SMS Settings,Receiver Parameter,Přijímač parametrů
@@ -572,10 +548,9 @@
 DocType: Sales Person,Sales Person Targets,Obchodník cíle
 apps/frappe/frappe/public/js/frappe/form/workflow.js +116,To,na
 apps/frappe/frappe/templates/base.html +145,Please enter email address,Zadejte e-mailovou adresu
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +35,End tube forming,Koniec trubice tvoriaci
 DocType: Production Order Operation,In minutes,V minutách
 DocType: Issue,Resolution Date,Rozlišení Datum
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +635,Please set default Cash or Bank account in Mode of Payment {0},Prosím nastavte výchozí v hotovosti nebo bankovním účtu v způsob platby {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +637,Please set default Cash or Bank account in Mode of Payment {0},Prosím nastavte výchozí v hotovosti nebo bankovním účtu v způsob platby {0}
 DocType: Selling Settings,Customer Naming By,Zákazník Pojmenování By
 apps/erpnext/erpnext/accounts/doctype/account/account.js +67,Convert to Group,Převést do skupiny
 DocType: Activity Cost,Activity Type,Druh činnosti
@@ -583,12 +558,12 @@
 DocType: Customer,Fixed Days,Pevné Dni
 DocType: Sales Invoice,Packing List,Balení Seznam
 apps/erpnext/erpnext/config/buying.py +28,Purchase Orders given to Suppliers.,Nákupní Objednávky odeslané Dodavatelům.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +43,Publishing,Publikování
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +43,Publishing,Publikování
 DocType: Activity Cost,Projects User,Projekty uživatele
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Consumed,Spotřeba
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +198,{0}: {1} not found in Invoice Details table,{0}: {1} nebyla nalezena v tabulce Podrobnosti Faktury
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,{0}: {1} not found in Invoice Details table,{0}: {1} nebyla nalezena v tabulce Podrobnosti Faktury
 DocType: Company,Round Off Cost Center,Zaokrúhliť nákladové stredisko
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +208,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Údržba Navštivte {0} musí být zrušena před zrušením této prodejní objednávky
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +203,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Údržba Navštivte {0} musí být zrušena před zrušením této prodejní objednávky
 DocType: Material Request,Material Transfer,Přesun materiálu
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +56,Opening (Dr),Opening (Dr)
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},Časová značka zadání musí být po {0}
@@ -600,7 +575,6 @@
 DocType: Pricing Rule,Sales Manager,Manažer prodeje
 apps/frappe/frappe/public/js/frappe/model/model.js +492,Rename,Přejmenovat
 DocType: Journal Entry,Write Off Amount,Odepsat Částka
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +52,Bending,Ohýbanie
 apps/frappe/frappe/core/page/user_permissions/user_permissions.js +246,Allow User,Umožňuje uživateli
 DocType: Journal Entry,Bill No,Bill No
 DocType: Purchase Invoice,Quarterly,Čtvrtletně
@@ -610,17 +584,16 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Please enter item details,"Prosím, zadejte podrobnosti položky"
 DocType: Purchase Receipt,Other Details,Ďalšie podrobnosti
 DocType: Account,Accounts,Účty
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +67,Marketing,Marketing
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +65,Straight shearing,Straight strihanie
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +67,Marketing,Marketing
 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.,Chcete-li sledovat položky v oblasti prodeje a nákupu dokumentů na základě jejich sériových čísel. To je možné také použít ke sledování detailů produktu záruční.
 DocType: Purchase Receipt Item Supplied,Current Stock,Current skladem
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +99,Rejected Warehouse is mandatory against regected item,Zamítnuto Warehouse je povinná proti regected položky
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +102,Rejected Warehouse is mandatory against regected item,Zamítnuto Warehouse je povinná proti regected položky
 DocType: Account,Expenses Included In Valuation,Náklady ceně oceňování
 DocType: Employee,Provide email id registered in company,Poskytnout e-mail id zapsané ve firmě
 DocType: Hub Settings,Seller City,Prodejce City
 DocType: Email Digest,Next email will be sent on:,Další e-mail bude odeslán dne:
 DocType: Offer Letter Term,Offer Letter Term,Ponuka Letter Term
-apps/erpnext/erpnext/stock/doctype/item/item.py +492,Item has variants.,Položka má varianty.
+apps/erpnext/erpnext/stock/doctype/item/item.py +496,Item has variants.,Položka má varianty.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Položka {0} nebyl nalezen
 DocType: Bin,Stock Value,Reklamní Value
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,Tree Type
@@ -629,10 +602,9 @@
 DocType: Material Request Item,Quantity and Warehouse,Množství a sklad
 DocType: Sales Invoice,Commission Rate (%),Výše provize (%)
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +172,"Against Voucher Type must be one of Sales Order, Sales Invoice or Journal Entry","Proti poukazu Type musí být jedním z prodejní objednávky, prodejní faktury nebo Journal Entry"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +139,Biomachining,Biomachining
 apps/erpnext/erpnext/setup/utils.py +89,Unable to find exchange rate,Nepodarilo sa nájsť kurz
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +7,Aerospace,Aerospace
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +19,Welcome,Vítejte
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +7,Aerospace,Aerospace
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +40,Welcome,Vítejte
 DocType: Journal Entry,Credit Card Entry,Vstup Kreditní karta
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +18,Task Subject,Úkol Předmět
 apps/erpnext/erpnext/config/stock.py +33,Goods received from Suppliers.,Zboží od dodavatelů.
@@ -655,19 +627,19 @@
 DocType: Employee,Cell Number,Číslo buňky
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Ztracený
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +120,You can not enter current voucher in 'Against Journal Entry' column,"Nelze zadat aktuální poukaz v ""Proti Zápis do deníku"" sloupci"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +25,Energy,Energie
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,Energie
 DocType: Opportunity,Opportunity From,Příležitost Z
 apps/erpnext/erpnext/config/hr.py +33,Monthly salary statement.,Měsíční plat prohlášení.
 DocType: Item Group,Website Specifications,Webových stránek Specifikace
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +205,New Account,Nový účet
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +21,{0}: From {0} of type {1},{0}: Od {0} typu {1}
-apps/erpnext/erpnext/controllers/buying_controller.py +283,Row {0}: Conversion Factor is mandatory,Row {0}: Konverzní faktor je povinné
+apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,Row {0}: Konverzní faktor je povinné
 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.,Účtovné Prihlášky možno proti koncovej uzly. Záznamy proti skupinám nie sú povolené.
 DocType: ToDo,High,Vysoké
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +361,Cannot deactivate or cancel BOM as it is linked with other BOMs,"Nelze deaktivovat nebo zrušit BOM, jak to souvisí s ostatními kusovníky"
 DocType: Opportunity,Maintenance,Údržba
 DocType: User,Male,Muž
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +182,Purchase Receipt number required for Item {0},Číslo příjmky je potřeba pro položku {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +183,Purchase Receipt number required for Item {0},Číslo příjmky je potřeba pro položku {0}
 DocType: Item Attribute Value,Item Attribute Value,Položka Hodnota atributu
 apps/erpnext/erpnext/config/crm.py +64,Sales campaigns.,Prodej kampaně.
 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.
@@ -715,10 +687,9 @@
 DocType: Address,Personal,Osobní
 DocType: Expense Claim Detail,Expense Claim Type,Náklady na pojistná Type
 DocType: Shopping Cart Settings,Default settings for Shopping Cart,Výchozí nastavení Košík
-apps/erpnext/erpnext/controllers/accounts_controller.py +324,"Journal Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Zápis do deníku {0} je spojen proti řádu {1}, zkontrolujte, zda by měl být tažen za pokrok v této faktuře."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +13,Biotechnology,Biotechnologie
+apps/erpnext/erpnext/controllers/accounts_controller.py +325,"Journal Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Zápis do deníku {0} je spojen proti řádu {1}, zkontrolujte, zda by měl být tažen za pokrok v této faktuře."
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +13,Biotechnology,Biotechnologie
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Office Maintenance Expenses,Náklady Office údržby
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +53,Hemming,Hemming
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +66,Please enter Item first,"Prosím, nejdřív zadejte položku"
 DocType: Account,Liability,Odpovědnost
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +62,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Sankcionovaná Čiastka nemôže byť väčšia ako reklamácia Suma v riadku {0}.
@@ -731,10 +702,10 @@
 DocType: Company,Default Bank Account,Výchozí Bankovní účet
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +47,"To filter based on Party, select Party Type first","Ak chcete filtrovať na základe Party, vyberte typ Party prvý"
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},"&quot;Aktualizácia Sklad &#39;nedá skontrolovať, pretože položky nie sú dodané cez {0}"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Nos,Nos
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Nos,Nos
 DocType: Item,Items with higher weightage will be shown higher,Položky s vyšším weightage budú zobrazené vyššie
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Bank Odsouhlasení Detail
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +627,My Invoices,Moje Faktúry
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +629,My Invoices,Moje Faktúry
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,Žádný zaměstnanec nalezeno
 DocType: Purchase Order,Stopped,Zastaveno
 DocType: Item,If subcontracted to a vendor,Ak sa subdodávky na dodávateľa
@@ -753,35 +724,33 @@
 DocType: Features Setup,"To enable ""Point of Sale"" features",Ak chcete povoliť &quot;Point of Sale&quot; predstavuje
 DocType: Bin,Moving Average Rate,Klouzavý průměr
 DocType: Production Planning Tool,Select Items,Vyberte položky
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,{0} against Bill {1} dated {2},{0} proti účtu {1} ze dne {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +328,{0} against Bill {1} dated {2},{0} proti účtu {1} ze dne {2}
 DocType: Comment,Reference Name,Název reference
 DocType: Maintenance Visit,Completion Status,Dokončení Status
 DocType: Sales Invoice Item,Target Warehouse,Target Warehouse
 DocType: Item,Allow over delivery or receipt upto this percent,Nechajte cez dodávku alebo príjem aľ tohto percenta
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +49,Expected Delivery Date cannot be before Sales Order Date,"Očekávané datum dodání, nemůže být před Sales pořadí Datum"
 DocType: Upload Attendance,Import Attendance,Importovat Docházku
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +17,All Item Groups,Všechny skupiny položek
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +17,All Item Groups,Všechny skupiny položek
 DocType: Process Payroll,Activity Log,Aktivita Log
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +30,Net Profit / Loss,Čistý zisk / strata
 apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,Automaticky napsat vzkaz na předkládání transakcí.
 DocType: Production Order,Item To Manufacture,Bod K výrobě
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +16,Permanent mold casting,Trvalé odlievanie foriem
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} je stav {2}
 apps/erpnext/erpnext/config/learn.py +172,Purchase Order to Payment,Objednávka na platobné
 DocType: Sales Order Item,Projected Qty,Předpokládané množství
 DocType: Sales Invoice,Payment Due Date,Splatno dne
 DocType: Newsletter,Newsletter Manager,Newsletter Manažér
-apps/erpnext/erpnext/stock/doctype/item/item.js +229,Item Variant {0} already exists with same attributes,Variant Položky {0} už existuje s rovnakými vlastnosťami
+apps/erpnext/erpnext/stock/doctype/item/item.js +231,Item Variant {0} already exists with same attributes,Variant Položky {0} už existuje s rovnakými vlastnosťami
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening',&quot;Otvorenie&quot;
 DocType: Notification Control,Delivery Note Message,Delivery Note Message
 DocType: Expense Claim,Expenses,Výdaje
 DocType: Item Variant Attribute,Item Variant Attribute,Vlastnosť Variantu Položky
 ,Purchase Receipt Trends,Doklad o koupi Trendy
 DocType: Appraisal,Select template from which you want to get the Goals,"Vyberte šablonu, ze kterého chcete získat cílů"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +77,Research & Development,Výzkum a vývoj
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Research & Development,Výzkum a vývoj
 ,Amount to Bill,Částka k Fakturaci
 DocType: Company,Registration Details,Registrace Podrobnosti
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +75,Staking,Sadiť
 DocType: Item,Re-Order Qty,Re-Order Množství
 DocType: Leave Block List Date,Leave Block List Date,Nechte Block List Datum
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +25,Scheduled to send to {0},Plánované poslat na {0}
@@ -792,18 +761,16 @@
 DocType: Sales Invoice Item,Stock Details,Sklad Podrobnosti
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Hodnota projektu
 apps/erpnext/erpnext/config/selling.py +304,Point-of-Sale,Mieste predaja
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,Cannot carry forward {0},Nelze převést {0}
 apps/erpnext/erpnext/accounts/doctype/account/account.py +91,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","Zůstatek na účtu již v Credit, není dovoleno stanovit ""Balance musí být"" jako ""debet"""
 DocType: Account,Balance must be,Zůstatek musí být
 DocType: Hub Settings,Publish Pricing,Publikovat Ceník
 DocType: Notification Control,Expense Claim Rejected Message,Zpráva o zamítnutí úhrady výdajů
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +145,Nailing,Báječný
 ,Available Qty,Množství k dispozici
 DocType: Purchase Taxes and Charges,On Previous Row Total,Na předchozí řady Celkem
 DocType: Salary Slip,Working Days,Pracovní dny
 DocType: Serial No,Incoming Rate,Příchozí Rate
 DocType: Packing Slip,Gross Weight,Hrubá hmotnost
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +410,The name of your company for which you are setting up this system.,"Název vaší společnosti, pro kterou nastavení tohoto systému."
+apps/erpnext/erpnext/public/js/setup_wizard.js +158,The name of your company for which you are setting up this system.,"Název vaší společnosti, pro kterou nastavení tohoto systému."
 DocType: HR Settings,Include holidays in Total no. of Working Days,Zahrnout dovolenou v celkovém. pracovních dní
 DocType: Job Applicant,Hold,Držet
 DocType: Employee,Date of Joining,Datum přistoupení
@@ -813,7 +780,6 @@
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +3,View Subscribers,Zobraziť Odberatelia
 DocType: Purchase Invoice Item,Purchase Receipt,Příjemka
 ,Received Items To Be Billed,"Přijaté položek, které mají být účtovány"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +114,Abrasive blasting,Abrazívne tryskanie
 DocType: Employee,Ms,Paní
 apps/erpnext/erpnext/config/accounts.py +148,Currency exchange rate master.,Devizový kurz master.
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +253,Unable to find Time Slot in the next {0} days for Operation {1},Nemožno nájsť časový úsek v najbližších {0} dní na prevádzku {1}
@@ -825,7 +791,7 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +209,Serial No {0} does not belong to Item {1},Pořadové číslo {0} nepatří k bodu {1}
 DocType: Purchase Receipt Item Supplied,Required Qty,Požadované množství
 DocType: Bank Reconciliation,Total Amount,Celková částka
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +32,Internet Publishing,Internet Publishing
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,Internet Publishing
 DocType: Production Planning Tool,Production Orders,Výrobní Objednávky
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +35,Balance Value,Zůstatek Hodnota
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,Sales Ceník
@@ -836,7 +802,7 @@
 DocType: Supplier,Default Payable Accounts,Výchozí úplatu účty
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,Zaměstnanec {0} není aktivní nebo neexistuje
 DocType: Features Setup,Item Barcode,Položka Barcode
-apps/erpnext/erpnext/stock/doctype/item/item.py +487,Item Variants {0} updated,Varianty Položky {0} aktualizované
+apps/erpnext/erpnext/stock/doctype/item/item.py +491,Item Variants {0} updated,Varianty Položky {0} aktualizované
 DocType: Quality Inspection Reading,Reading 6,Čtení 6
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Záloha přijaté faktury
 DocType: Address,Shop,Obchod
@@ -845,7 +811,7 @@
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,"Výchozí účet Bank / Cash budou automaticky aktualizovány v POS faktury, pokud je zvolen tento režim."
 DocType: Employee,Permanent Address Is,Trvalé bydliště je
 DocType: Production Order Operation,Operation completed for how many finished goods?,Provoz dokončeno kolika hotových výrobků?
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +491,The Brand,Značka
+apps/erpnext/erpnext/public/js/setup_wizard.js +237,The Brand,Značka
 apps/erpnext/erpnext/controllers/status_updater.py +163,Allowance for over-{0} crossed for Item {1}.,Příspěvek na nadměrné {0} přešel k bodu {1}.
 DocType: Employee,Exit Interview Details,Exit Rozhovor Podrobnosti
 DocType: Item,Is Purchase Item,je Nákupní Položka
@@ -865,16 +831,16 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Indirect Income,Nepřímé příjmy
 DocType: Payment Tool,Set Payment Amount = Outstanding Amount,Set Čiastka platby = dlžnej čiastky
 DocType: Contact Us Settings,Address Line 1,Adresní řádek 1
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Variance,Odchylka
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +392,Company Name,Název společnosti
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +53,Variance,Odchylka
+,Company Name,Název společnosti
 DocType: SMS Center,Total Message(s),Celkem zpráv (y)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +515,Select Item for Transfer,Vybrať položku pre prevod
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +538,Select Item for Transfer,Vybrať položku pre prevod
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,Zobraziť zoznam všetkých nápovedy videí
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,"Vyberte účet šéf banky, kde byla uložena kontrola."
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,Povolit uživateli upravovat Ceník Cena při transakcích
 DocType: Pricing Rule,Max Qty,Max Množství
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +106,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Row {0}: Platba na prodejní / nákupní objednávce by měly být vždy označeny jako předem
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +16,Chemical,Chemický
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,Chemický
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +693,All items have already been transferred for this Production Order.,Všechny položky již byly převedeny na výrobu tohoto řádu.
 DocType: Process Payroll,Select Payroll Year and Month,Vyberte Payroll rok a mesiac
 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""",Prejdite na príslušnej skupiny (zvyčajne využitia finančných prostriedkov&gt; obežných aktív&gt; bankových účtov a vytvoriť nový účet (kliknutím na Pridať dieťa) typu &quot;Bank&quot;
@@ -885,12 +851,12 @@
 DocType: Item,Inspection Criteria,Inspekční Kritéria
 apps/erpnext/erpnext/config/accounts.py +101,Tree of finanial Cost Centers.,Strom finanial nákladových středisek.
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,Prevedené
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +492,Upload your letter head and logo. (you can edit them later).,Nahrajte svoju hlavičku a logo pre dokumenty. (Môžete ich upravovať neskôr.)
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +156,White,Biela
+apps/erpnext/erpnext/public/js/setup_wizard.js +238,Upload your letter head and logo. (you can edit them later).,Nahrajte svoju hlavičku a logo pre dokumenty. (Môžete ich upravovať neskôr.)
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,White,Biela
 DocType: SMS Center,All Lead (Open),Všetky Iniciatívy (Otvorené)
 DocType: Purchase Invoice,Get Advances Paid,Získejte zaplacené zálohy
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +362,Attach Your Picture,Pripojiť svoj obrázok
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Make ,Dělat 
+apps/erpnext/erpnext/public/js/setup_wizard.js +112,Attach Your Picture,Pripojiť svoj obrázok
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +540,Make ,Dělat 
 DocType: Journal Entry,Total Amount in Words,Celková částka slovy
 DocType: Workflow State,Stop,Stop
 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.,"Došlo k chybě. Jedním z důvodů by mohlo být pravděpodobné, že jste uložili formulář. Obraťte se prosím na support@erpnext.com Pokud problém přetrvává."
@@ -899,14 +865,13 @@
 DocType: Lead,Next Contact Date,Další Kontakt Datum
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,Otevření POČET
 DocType: Holiday List,Holiday List Name,Jméno Holiday Seznam
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +168,Stock Options,Akciové opcie
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +168,Stock Options,Akciové opcie
 DocType: Journal Entry Account,Expense Claim,Hrazení nákladů
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +181,Qty for {0},Množství pro {0}
 DocType: Leave Application,Leave Application,Leave Application
 apps/erpnext/erpnext/config/hr.py +77,Leave Allocation Tool,Nechte přidělení nástroj
 DocType: Leave Block List,Leave Block List Dates,Nechte Block List termíny
 DocType: Company,If Monthly Budget Exceeded (for expense account),Ak Mesačný rozpočet prekročený (pre výdavkového účtu)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +56,Trimming,Orezávanie
 DocType: Workstation,Net Hour Rate,Net Hour Rate
 DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,Přistál Náklady doklad o koupi
 DocType: Company,Default Terms,Východiskové podmienky
@@ -914,10 +879,9 @@
 DocType: POS Profile,Cash/Bank Account,Hotovostní / Bankovní účet
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,Removed items with no change in quantity or value.,Odstránené položky bez zmeny množstva alebo hodnoty.
 DocType: Delivery Note,Delivery To,Doručení do
-apps/erpnext/erpnext/stock/doctype/item/item.py +509,Attribute table is mandatory,Atribút tabuľka je povinné
+apps/erpnext/erpnext/stock/doctype/item/item.py +513,Attribute table is mandatory,Atribút tabuľka je povinné
 DocType: Production Planning Tool,Get Sales Orders,Získat Prodejní objednávky
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} nemůže být negativní
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +103,Filing,Podanie
 apps/erpnext/erpnext/templates/form_grid/item_grid.html +72,Discount,Sleva
 DocType: Features Setup,Purchase Discounts,Nákup Slevy
 DocType: Workstation,Wages,Mzdy
@@ -934,6 +898,7 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +112,You are the Expense Approver for this record. Please Update the 'Status' and Save,"Jste Expense schvalujícím pro tento záznam. Prosím aktualizujte ""stavu"" a Uložit"
 DocType: Serial No,Creation Document No,Tvorba dokument č
 DocType: Issue,Issue,Problém
+apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account does not match with Company,Účet nezodpovedá Company
 apps/erpnext/erpnext/config/stock.py +136,"Attributes for Item Variants. e.g Size, Color etc.","Atributy pro položky varianty. například velikost, barva atd."
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +39,WIP Warehouse,WIP Warehouse
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +194,Serial No {0} is under maintenance contract upto {1},Pořadové číslo {0} je na základě smlouvy o údržbě aľ {1}
@@ -942,7 +907,7 @@
 DocType: Tax Rule,Shipping State,Prepravné 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,"Položka musí být přidány pomocí ""získat předměty z kupní příjmy"" tlačítkem"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,Prodejní náklady
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Buying,Standardní Nakupování
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +120,Standard Buying,Standardní Nakupování
 DocType: GL Entry,Against,Proti
 DocType: Item,Default Selling Cost Center,Výchozí Center Prodejní cena
 DocType: Sales Partner,Implementation Partner,Implementačního partnera
@@ -963,29 +928,29 @@
 DocType: Time Log Batch,updated via Time Logs,aktualizovať cez čas Záznamy
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,Průměrný věk
 DocType: Opportunity,Your sales person who will contact the customer in future,"Váš obchodní zástupce, který bude kontaktovat zákazníka v budoucnu"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +588,List a few of your suppliers. They could be organizations or individuals.,"Napíšte niekoľkých svojich dodávateľov. Môžu to byť organizácie, ale aj jednotlivci."
+apps/erpnext/erpnext/public/js/setup_wizard.js +326,List a few of your suppliers. They could be organizations or individuals.,"Napíšte niekoľkých svojich dodávateľov. Môžu to byť organizácie, ale aj jednotlivci."
 DocType: Company,Default Currency,Predvolená mena
 DocType: Contact,Enter designation of this Contact,Zadejte označení této Kontakt
 DocType: Contact Us Settings,Address,Adresa
 DocType: Expense Claim,From Employee,Od Zaměstnance
-apps/erpnext/erpnext/controllers/accounts_controller.py +338,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,"Upozornění: Systém nebude kontrolovat nadfakturace, protože částka za položku na {1} je nula {0}"
+apps/erpnext/erpnext/controllers/accounts_controller.py +339,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,"Upozornění: Systém nebude kontrolovat nadfakturace, protože částka za položku na {1} je nula {0}"
 DocType: Journal Entry,Make Difference Entry,Učinit vstup Rozdíl
 DocType: Upload Attendance,Attendance From Date,Účast Datum od
 DocType: Appraisal Template Goal,Key Performance Area,Key Performance Area
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +54,Transportation,Doprava
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +54,Transportation,Doprava
 apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +67, and year: ,a rok: 
 DocType: Email Digest,Annual Expense,Ročná Expense
 DocType: SMS Center,Total Characters,Celkový počet znaků
-apps/erpnext/erpnext/controllers/buying_controller.py +139,Please select BOM in BOM field for Item {0},Vyberte kusovník Bom oblasti k bodu {0}
+apps/erpnext/erpnext/controllers/buying_controller.py +130,Please select BOM in BOM field for Item {0},Vyberte kusovník Bom oblasti k bodu {0}
 DocType: C-Form Invoice Detail,C-Form Invoice Detail,C-Form Faktura Detail
 DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,Platba Odsouhlasení faktury
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +32,Contribution %,Příspěvek%
 DocType: Item,website page link,webové stránky odkaz na stránku
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +192,Let's prepare the system for first use.,Pojďme připravit systém pro první použití.
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +242,Let's prepare the system for first use.,Pojďme připravit systém pro první použití.
 DocType: Company,Company registration numbers for your reference. Tax numbers etc.,Registrace firmy čísla pro váš odkaz. Daňové čísla atd
 DocType: Sales Partner,Distributor,Distributor
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Nákupní košík Shipping Rule
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +214,Production Order {0} must be cancelled before cancelling this Sales Order,Výrobní zakázka {0} musí být zrušena před zrušením této prodejní objednávky
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +209,Production Order {0} must be cancelled before cancelling this Sales Order,Výrobní zakázka {0} musí být zrušena před zrušením této prodejní objednávky
 ,Ordered Items To Be Billed,Objednané zboží fakturovaných
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +24,From Range has to be less than To Range,"Z rozsahu, musí byť nižšia ako na 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.,Vyberte Time protokolů a předložit k vytvoření nové prodejní faktury.
@@ -1005,14 +970,13 @@
 DocType: Sales Invoice Advance,Sales Invoice Advance,Prodejní faktury Advance
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +398,Nothing to request,Nic požadovat
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date',"""Skutečné datum zahájení"" nemůže být větší než ""Aktuální datum ukončení"""
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +75,Management,Řízení
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +75,Management,Řízení
 apps/erpnext/erpnext/config/projects.py +33,Types of activities for Time Sheets,Typy činností pro Time listy
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +14,Investment casting,Investičné liatie
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +51,Either debit or credit amount is required for {0},Buď debetní nebo kreditní částka je vyžadována pro {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""","To bude připojen na položku zákoníku varianty. Například, pokud vaše zkratka je ""SM"", a položka je kód ""T-SHIRT"", položka kód varianty bude ""T-SHIRT-SM"""
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,"Čistá Pay (slovy) budou viditelné, jakmile uložíte výplatní pásce."
 apps/frappe/frappe/core/doctype/user/user_list.js +12,Active,Aktivní
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +154,Blue,Modrý
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +154,Blue,Modrý
 DocType: Purchase Invoice,Is Return,Je Return
 DocType: Price List Country,Price List Country,Cenník Krajina
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +123,Further nodes can be only created under 'Group' type nodes,"Další uzly mohou být pouze vytvořena v uzlech typu ""skupiny"""
@@ -1022,18 +986,16 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +22,POS Profile {0} already created for user: {1} and company {2},POS Profile {0} už vytvorili pre užívateľov: {1} a spoločnosť {2}
 DocType: Purchase Order Item,UOM Conversion Factor,Faktor konverzie MJ
 DocType: Stock Settings,Default Item Group,Výchozí bod Group
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +156,Laminated object manufacturing,Vrstvené objektu výrobnej
 apps/erpnext/erpnext/config/buying.py +13,Supplier database.,Databáze dodavatelů.
 DocType: Account,Balance Sheet,Rozvaha
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +561,Cost Center For Item with Item Code ',"Nákladové středisko u položky s Kód položky """
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +45,Stretch forming,Stretch tvárnenie
 DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,"Váš obchodní zástupce dostane upomínku na tento den, aby kontaktoval zákazníka"
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +210,"Further accounts can be made under Groups, but entries can be made against non-Groups","Ďalšie účty môžu byť vyrobené v rámci skupiny, ale údaje je možné proti non-skupín"
 apps/erpnext/erpnext/config/hr.py +125,Tax and other salary deductions.,Daňové a jiné platové srážky.
 DocType: Lead,Lead,Obchodná iniciatíva
 DocType: Email Digest,Payables,Závazky
 DocType: Account,Warehouse,Sklad
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +90,Row #{0}: Rejected Qty can not be entered in Purchase Return,Riadok # {0}: zamietnutie Množstvo nemôže byť zapísaný do kúpnej Návrat
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +93,Row #{0}: Rejected Qty can not be entered in Purchase Return,Riadok # {0}: zamietnutie Množstvo nemôže byť zapísaný do kúpnej Návrat
 ,Purchase Order Items To Be Billed,Položky vydané objednávky k fakturaci
 DocType: Purchase Invoice Item,Net Rate,Čistá miera
 DocType: Purchase Invoice Item,Purchase Invoice Item,Položka přijaté faktury
@@ -1048,13 +1010,13 @@
 DocType: Global Defaults,Current Fiscal Year,Aktuální fiskální rok
 DocType: Global Defaults,Disable Rounded Total,Zakázat Zaoblený Celkem
 DocType: Lead,Call,Volání
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +384,'Entries' cannot be empty,"""Položky"" nemôžu býť prázdne"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +386,'Entries' cannot be empty,"""Položky"" nemôžu býť prázdne"
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},Duplicitný riadok {0} s rovnakým {1}
 ,Trial Balance,Trial Balance
 apps/erpnext/erpnext/config/hr.py +205,Setting up Employees,Nastavenia pre modul Zamestnanci
 apps/erpnext/erpnext/public/js/feature_setup.js +220,"Grid ""","Grid """
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +150,Please select prefix first,"Prosím, vyberte první prefix"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +138,Research,Výzkum
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +138,Research,Výzkum
 DocType: Maintenance Visit Purpose,Work Done,Odvedenou práci
 apps/erpnext/erpnext/controllers/item_variant.py +25,Please specify at least one attribute in the Attributes table,Uveďte aspoň jeden atribút v tabuľke atribúty
 DocType: Contact,User ID,User ID
@@ -1062,10 +1024,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +57,View Ledger,View Ledger
 DocType: File,Lft,LFT
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Nejstarší
-apps/erpnext/erpnext/stock/doctype/item/item.py +394,"An Item Group exists with same name, please change the item name or rename the item group","Položka Group existuje se stejným názvem, prosím, změnit název položky nebo přejmenovat skupinu položek"
+apps/erpnext/erpnext/stock/doctype/item/item.py +398,"An Item Group exists with same name, please change the item name or rename the item group","Položka Group existuje se stejným názvem, prosím, změnit název položky nebo přejmenovat skupinu položek"
 DocType: Communication,Delivery Status,Delivery Status
 DocType: Production Order,Manufacture against Sales Order,Výroba na odběratele
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +517,Rest Of The World,Zbytek světa
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +455,Rest Of The World,Zbytek světa
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,Položka {0} nemůže mít dávku
 ,Budget Variance Report,Rozpočet Odchylka Report
 DocType: Salary Slip,Gross Pay,Hrubé mzdy
@@ -1076,13 +1038,11 @@
 DocType: BOM Item,Item Description,Položka Popis
 DocType: Payment Tool,Payment Mode,Způsob platby
 DocType: Purchase Invoice,Is Recurring,Je Opakující
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +154,Direct metal laser sintering,Priamy plechu laserom spekanie
 DocType: Purchase Order,Supplied Items,Dodávané položky
 DocType: Production Order,Qty To Manufacture,Množství K výrobě
 DocType: Buying Settings,Maintain same rate throughout purchase cycle,Udržovat stejnou sazbu po celou kupní cyklu
 DocType: Opportunity Item,Opportunity Item,Položka Příležitosti
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +61,Temporary Opening,Dočasné Otvorenie
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +41,Cryorolling,Cryorolling
 ,Employee Leave Balance,Zaměstnanec Leave Balance
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +128,Balance for Account {0} must always be {1},Zůstatek na účtě {0} musí být vždy {1}
 DocType: Address,Address Type,Typ adresy
@@ -1098,23 +1058,23 @@
 DocType: Journal Entry,Get Outstanding Invoices,Získat neuhrazených faktur
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,Prodejní objednávky {0} není platný
 apps/erpnext/erpnext/setup/doctype/company/company.py +172,"Sorry, companies cannot be merged","Je nám líto, společnosti nemohou být sloučeny"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +145,Small,Malý
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Small,Malý
 DocType: Employee,Employee Number,Počet zaměstnanců
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},Případ číslo (čísla) již v provozu. Zkuste se věc č {0}
 ,Invoiced Amount (Exculsive Tax),Fakturovaná částka (bez daně)
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,Položka 2
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +59,Account head {0} created,Hlava účtu {0} vytvořil
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +153,Green,Zelená
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Green,Zelená
 DocType: Item,Auto re-order,Auto re-order
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +57,Total Achieved,Celkem Dosažená
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +59,Total Achieved,Celkem Dosažená
 DocType: Employee,Place of Issue,Místo vydání
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +59,Contract,Smlouva
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Contract,Smlouva
 DocType: Report,Disabled,Vypnuto
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +490,UOM coversion factor required for UOM: {0} in Item: {1},UOM coversion faktor potřebný k nerozpuštěných: {0} v bodě: {1}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +83,Indirect Expenses,Nepřímé náklady
 apps/erpnext/erpnext/controllers/selling_controller.py +163,Row {0}: Qty is mandatory,Row {0}: Množství je povinný
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +8,Agriculture,Zemědělství
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +611,Your Products or Services,Vaše Produkty nebo Služby
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,Zemědělství
+apps/erpnext/erpnext/public/js/setup_wizard.js +347,Your Products or Services,Vaše Produkty nebo Služby
 DocType: Mode of Payment,Mode of Payment,Způsob platby
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,Jedná se o skupinu kořen položky a nelze upravovat.
 DocType: Journal Entry Account,Purchase Order,Vydaná objednávka
@@ -1126,7 +1086,7 @@
 DocType: Serial No,Serial No Details,Serial No Podrobnosti
 DocType: Purchase Invoice Item,Item Tax Rate,Sazba daně položky
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +113,"For {0}, only credit accounts can be linked against another debit entry","Pro {0}, tak úvěrové účty mohou být propojeny na jinou položku debetní"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Delivery Note {0} is not submitted,Delivery Note {0} není předložena
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +470,Delivery Note {0} is not submitted,Delivery Note {0} není předložena
 apps/erpnext/erpnext/stock/get_item_details.py +136,Item {0} must be a Sub-contracted Item,Položka {0} musí být Subdodavatelské Item
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,Kapitálové Vybavení
 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.","Ceny Pravidlo je nejprve vybrána na základě ""Použít na"" oblasti, které mohou být položky, položky skupiny nebo značky."
@@ -1136,7 +1096,7 @@
 DocType: Appraisal Goal,Goal,Cieľ
 DocType: Sales Invoice Item,Edit Description,Upraviť popis
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +318,Expected Delivery Date is lesser than Planned Start Date.,Očakávané dátum dodania je menšia ako plánovaný dátum začatia.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +579,For Supplier,Pro Dodavatele
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +602,For Supplier,Pro Dodavatele
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,Nastavení typu účtu pomáhá při výběru tohoto účtu v transakcích.
 DocType: Purchase Invoice,Grand Total (Company Currency),Celkový součet (Měna společnosti)
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,Celkem Odchozí
@@ -1162,10 +1122,10 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +74,"Total {0} for all items is zero, may you should change 'Distribute Charges Based On'","Celkom {0} pre všetky položky je nula, môžete mali zmeniť &quot;Distribuovať poplatkov na základe&quot;"
 DocType: Purchase Invoice,Taxes and Charges Calculation,Daně a poplatky výpočet
 DocType: BOM Operation,Workstation,pracovna stanica
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +112,Hardware,Technické vybavení
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +112,Hardware,Technické vybavení
 DocType: Attendance,HR Manager,HR Manager
 apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,Vyberte spoločnosť
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +50,Privilege Leave,Privilege Leave
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +50,Privilege Leave,Privilege Leave
 DocType: Purchase Invoice,Supplier Invoice Date,Dátum dodávateľskej faktúry
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +79,You need to enable Shopping Cart,Musíte povolit Nákupní košík
 apps/frappe/frappe/public/js/frappe/form/grid_body.html +6,No Data,No Data
@@ -1178,7 +1138,7 @@
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +81,Overlapping conditions found between:,Překrývající podmínky nalezeno mezi:
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +168,Against Journal Entry {0} is already adjusted against some other voucher,Proti věstníku Entry {0} je již nastavena proti jiným poukaz
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +68,Total Order Value,Celková hodnota objednávky
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +38,Food,Jídlo
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +38,Food,Jídlo
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Stárnutí Rozsah 3
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +139,You can make a time log only against a submitted production order,Můžete udělat časový záznam pouze proti předložené výrobní objednávce
 DocType: Maintenance Schedule Item,No of Visits,Počet návštěv
@@ -1198,6 +1158,7 @@
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,View Offer Letter,View Ponuka List
 DocType: Communication,Communication,Komunikace
 DocType: Item,Is Service Item,Je Service Item
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +81,Application period cannot be outside leave allocation period,Obdobie podávania žiadostí nemôže byť alokačné obdobie vonku voľno
 DocType: Activity Cost,Projects,Projekty
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +31,Please select Fiscal Year,"Prosím, vyberte Fiskální rok"
 apps/erpnext/erpnext/controllers/buying_controller.py +23,From {0} | {1} {2},Od {0} | {1} {2}
@@ -1216,7 +1177,7 @@
 DocType: Item,Maintain Stock,Udržiavať Zásoby
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +213,Stock Entries already created for Production Order ,Fotky Položky již vytvořené pro výrobní zakázku
 DocType: Leave Control Panel,Leave blank if considered for all designations,"Ponechte prázdné, pokud se to považuje za všechny označení"
-apps/erpnext/erpnext/controllers/accounts_controller.py +499,Charge of type 'Actual' in row {0} cannot be included in Item Rate,"Obvinění z typu ""Aktuální"" v řádku {0} nemůže být zařazena do položky Rate"
+apps/erpnext/erpnext/controllers/accounts_controller.py +500,Charge of type 'Actual' in row {0} cannot be included in Item Rate,"Obvinění z typu ""Aktuální"" v řádku {0} nemůže být zařazena do položky Rate"
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,Max: {0},Max: {0}
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +16,From Datetime,Od datetime
 DocType: Email Digest,For Company,Pro Společnost
@@ -1226,7 +1187,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +50,Chart of Accounts,Diagram účtů
 DocType: Material Request,Terms and Conditions Content,Podmínky Content
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +471,cannot be greater than 100,nemůže být větší než 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +546,Item {0} is not a stock Item,Položka {0} není skladem
+apps/erpnext/erpnext/stock/doctype/item/item.py +550,Item {0} is not a stock Item,Položka {0} není skladem
 DocType: Maintenance Visit,Unscheduled,Neplánovaná
 DocType: Employee,Owned,Vlastník
 DocType: Salary Slip Deduction,Depends on Leave Without Pay,Závisí na dovolenke bez nároku na mzdu
@@ -1240,31 +1201,29 @@
 DocType: HR Settings,Employee Settings,Nastavení zaměstnanců
 ,Batch-Wise Balance History,Batch-Wise Balance History
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +72,To Do List,Do List
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +63,Apprentice,Učeň
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Apprentice,Učeň
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +99,Negative Quantity is not allowed,Záporné množství nie je dovolené
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
 Used for Taxes and Charges","Tax detail tabulka staženy z položky pána jako řetězec a uložené v této oblasti.
  Používá se daní a poplatků"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +61,Lancing,Lancing
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +151,Employee cannot report to himself.,Zaměstnanec nemůže odpovídat sám sobě.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","V případě, že účet je zamrzlý, položky mohou omezeným uživatelům."
 DocType: Email Digest,Bank Balance,Bank Balance
-apps/erpnext/erpnext/controllers/accounts_controller.py +435,Accounting Entry for {0}: {1} can only be made in currency: {2},Účtovný záznam pre {0}: {1} môžu vykonávať len v mene: {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +436,Accounting Entry for {0}: {1} can only be made in currency: {2},Účtovný záznam pre {0}: {1} môžu vykonávať len v mene: {2}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +38,No active Salary Structure found for employee {0} and the month,Žiadny aktívny Štruktúra Plat nájdených pre zamestnancov {0} a mesiac
 DocType: Job Opening,"Job profile, qualifications required etc.","Profil Job, požadované kvalifikace atd."
 DocType: Journal Entry Account,Account Balance,Zůstatek na účtu
 apps/erpnext/erpnext/config/accounts.py +112,Tax Rule for transactions.,Daňové Pravidlo pre transakcie.
 DocType: Rename Tool,Type of document to rename.,Typ dokumentu přejmenovat.
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +630,We buy this Item,Táto položka sa kupuje
+apps/erpnext/erpnext/public/js/setup_wizard.js +366,We buy this Item,Táto položka sa kupuje
 DocType: Address,Billing,Fakturace
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +77,Flanging,Obrubovanie
 DocType: Bulk Email,Not Sent,Neodesláno
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +73,Explosive forming,Výbušné tvárnenie
 DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),Celkem Daně a poplatky (Company Měnové)
 DocType: Shipping Rule,Shipping Account,Přepravní účtu
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +43,Scheduled to send to {0} recipients,Plánované poslat na {0} příjemci
 DocType: Quality Inspection,Readings,Čtení
 DocType: Stock Entry,Total Additional Costs,Celkom Dodatočné náklady
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Sub Assemblies,Podsestavy
+apps/erpnext/erpnext/public/js/setup_wizard.js +359,Sub Assemblies,Podsestavy
 DocType: Shipping Rule Condition,To Value,Chcete-li hodnota
 DocType: Supplier,Stock Manager,Reklamný manažér
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +143,Source warehouse is mandatory for row {0},Source sklad je povinná pro řadu {0}
@@ -1274,44 +1233,42 @@
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Import se nezdařil!
 apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,Žádná adresa přidán dosud.
 DocType: Workstation Working Hour,Workstation Working Hour,Pracovní stanice Pracovní Hour
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +83,Analyst,Analytik
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +202,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},"Řádek {0}: přidělené množství {1}, musí být menší než nebo se rovná hodnotě JV {2}"
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Analyst,Analytik
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +149,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},"Řádek {0}: přidělené množství {1}, musí být menší než nebo se rovná hodnotě JV {2}"
 DocType: Item,Inventory,Inventář
 DocType: Features Setup,"To enable ""Point of Sale"" view",Ak chcete povoliť &quot;Point of Sale&quot; pohľadu
 apps/erpnext/erpnext/public/js/pos/pos.js +402,Payment cannot be made for empty cart,Platba nemůže být pro prázdný košík
 DocType: Item,Sales Details,Prodejní Podrobnosti
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +149,Pinning,Pripne
 DocType: Opportunity,With Items,S položkami
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,V Množství
 DocType: Notification Control,Expense Claim Rejected,Uhrazení výdajů zamítnuto
 DocType: Sales Invoice,"The date on which next invoice will be generated. It is generated on submit.
 ","Dátum, kedy bude vygenerovaný budúci faktúry. To je generovaný na odoslať."
 DocType: Item Attribute,Item Attribute,Položka Atribut
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +105,Government,Vláda
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Government,Vláda
 apps/erpnext/erpnext/config/stock.py +268,Item Variants,Varianty Položky
 DocType: Company,Services,Služby
 apps/erpnext/erpnext/accounts/report/financial_statements.py +147,Total ({0}),Celkem ({0})
 DocType: Cost Center,Parent Cost Center,Nadřazené Nákladové středisko
 DocType: Sales Invoice,Source,Zdroj
 DocType: Leave Type,Is Leave Without Pay,Je odísť bez Pay
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +186,No records found in the Payment table,Nalezené v tabulce platby Žádné záznamy
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +405,Financial Year Start Date,Finanční rok Datum zahájení
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +133,No records found in the Payment table,Nalezené v tabulce platby Žádné záznamy
+apps/erpnext/erpnext/public/js/setup_wizard.js +153,Financial Year Start Date,Finanční rok Datum zahájení
 DocType: Employee External Work History,Total Experience,Celková zkušenost
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +100,Countersinking,Zahlbovanie
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +271,Packing Slip(s) cancelled,Balení Slip (y) zrušeno
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +276,Packing Slip(s) cancelled,Balení Slip (y) zrušeno
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,Nákladní a Spediční Poplatky
 DocType: Material Request Item,Sales Order No,Prodejní objednávky No
 DocType: Item Group,Item Group Name,Položka Název skupiny
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +50,Taken,Zaujatý
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,Zaujatý
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +66,Transfer Materials for Manufacture,Přenos Materiály pro výrobu
 DocType: Pricing Rule,For Price List,Pro Ceník
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +27,Executive Search,Executive Search
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,Executive Search
 apps/erpnext/erpnext/stock/stock_ledger.py +405,"Purchase rate for item: {0} not found, which is required to book accounting entry (expense). Please mention item price against a buying price list.","Cena při platbě za položku: {0} nebyl nalezen, který je povinen si účetní položka (náklady). Prosím, uveďte zboží Cena podle seznamu kupní cenou."
 DocType: Maintenance Schedule,Schedules,Plány
 DocType: Purchase Invoice Item,Net Amount,Čistá suma
 DocType: Purchase Order Item Supplied,BOM Detail No,BOM Detail No
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),Dodatočná zľava Suma (Mena Company)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +537,Error: {0} > {1},Chyba: {0}> {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +541,Error: {0} > {1},Chyba: {0}> {1}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,"Prosím, vytvořte nový účet z grafu účtů."
 DocType: Maintenance Visit,Maintenance Visit,Maintenance Visit
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer > Customer Group > Territory,Zákazník> Zákazník Group> Territory
@@ -1322,7 +1279,6 @@
 DocType: Event,Tuesday,Úterý
 DocType: Leave Block List,Block Holidays on important days.,Blokové Dovolená na významných dnů.
 ,Accounts Receivable Summary,Pohledávky Shrnutí
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +43,Leaves for type {0} already allocated for Employee {1} for period {2} - {3},Listy typu {0} už pridelené pre zamestnancov {1} na dobu {2} - {3}
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +187,Please set User ID field in an Employee record to set Employee Role,Prosím nastavte uživatelské ID pole v záznamu zaměstnanců nastavit role zaměstnance
 DocType: UOM,UOM Name,Názov Mernej Jednotky
 DocType: Top Bar Item,Target,Cíl
@@ -1334,15 +1290,14 @@
 DocType: ToDo,Due Date,Datum splatnosti
 DocType: Sales Invoice Item,Brand Name,Jméno značky
 DocType: Purchase Receipt,Transporter Details,Transporter Podrobnosti
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Box,Krabice
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +389,The Organization,Organizace
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Box,Krabice
+apps/erpnext/erpnext/public/js/setup_wizard.js +137,The Organization,Organizace
 DocType: Monthly Distribution,Monthly Distribution,Měsíční Distribution
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,Přijímač Seznam je prázdný. Prosím vytvořte přijímače Seznam
 DocType: Production Plan Sales Order,Production Plan Sales Order,Výrobní program prodejní objednávky
 DocType: Sales Partner,Sales Partner Target,Sales Partner Target
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},Účtovný záznam pre {0} možno vykonávať iba v mene: {1}
 DocType: Pricing Rule,Pricing Rule,Ceny Pravidlo
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +58,Notching,Vystrihovanie
 apps/erpnext/erpnext/config/learn.py +167,Material Request to Purchase Order,Materiál Žiadosť o príkaze k nákupu
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +74,Row # {0}: Returned Item {1} does not exists in {2} {3},Riadok # {0}: vrátenej položky {1} neexistuje v {2} {3}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,Bankové účty
@@ -1359,20 +1314,19 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Amounts not reflected in bank,Částky nezohledněny v bance
 DocType: Quality Inspection Reading,Reading 4,Čtení 4
 apps/erpnext/erpnext/config/hr.py +23,Claims for company expense.,Nároky na náklady firmy.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +8,Centrifugal casting,Odstredivé liatie
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +119,Magnetic field-assisted finishing,Magnetické pole-assisted dokončovanie
 DocType: Company,Default Holiday List,Výchozí Holiday Seznam
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +165,Stock Liabilities,Stock Závazky
 DocType: Purchase Receipt,Supplier Warehouse,Dodavatel Warehouse
 DocType: Opportunity,Contact Mobile No,Kontakt Mobil
 DocType: Production Planning Tool,Select Sales Orders,Vyberte Prodejní objednávky
 ,Material Requests for which Supplier Quotations are not created,Materiál Žádosti o které Dodavatel citace nejsou vytvořeny
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +117,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,"V deň, keď (y), na ktoré žiadate o povolenie sú prázdniny. Nemusíte požiadať o voľno."
 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.,Chcete-li sledovat položky pomocí čárového kódu. Budete mít možnost zadat položky dodacího listu a prodejní faktury snímáním čárového kódu položky.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +477,Mark as Delivered,Označiť ako Dodáva
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +497,Mark as Delivered,Označiť ako Dodáva
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +34,Make Quotation,Značka Citácia
 DocType: Dependent Task,Dependent Task,Závislý Task
-apps/erpnext/erpnext/stock/doctype/item/item.py +306,Conversion factor for default Unit of Measure must be 1 in row {0},"Konverzní faktor pro výchozí měrnou jednotku, musí být 1 v řádku {0}"
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,Leave of type {0} cannot be longer than {1},Leave typu {0} nemůže být delší než {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +310,Conversion factor for default Unit of Measure must be 1 in row {0},"Konverzní faktor pro výchozí měrnou jednotku, musí být 1 v řádku {0}"
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +155,Leave of type {0} cannot be longer than {1},Leave typu {0} nemůže být delší než {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Skúste plánovanie operácií pre X dní vopred.
 DocType: HR Settings,Stop Birthday Reminders,Zastavit připomenutí narozenin
 DocType: SMS Center,Receiver List,Přijímač Seznam
@@ -1380,15 +1334,14 @@
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Spotřebovaném množství
 apps/erpnext/erpnext/public/js/pos/pos.js +491,{0} View,{0} Zobraziť
 DocType: Salary Structure Deduction,Salary Structure Deduction,Plat Struktura Odpočet
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +158,Selective laser sintering,Selektívne laserové spekanie
-apps/erpnext/erpnext/stock/doctype/item/item.py +301,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Měrná jednotka {0} byl zadán více než jednou v konverzním faktorem tabulce
+apps/erpnext/erpnext/stock/doctype/item/item.py +305,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Měrná jednotka {0} byl zadán více než jednou v konverzním faktorem tabulce
 apps/frappe/frappe/core/page/data_import_tool/data_import_tool.js +108,Import Successful!,Import byl úspěšný!
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Náklady na vydaných položek
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +185,Quantity must not be more than {0},Množství nesmí být větší než {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +41,Age (Days),Staroba (dni)
 DocType: Quotation Item,Quotation Item,Položka ponuky
 DocType: Account,Account Name,Název účtu
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +41,From Date cannot be greater than To Date,Datum OD nemůže být vetší než datum DO
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +34,From Date cannot be greater than To Date,Datum OD nemůže být vetší než datum DO
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +194,Serial No {0} quantity {1} cannot be a fraction,Pořadové číslo {0} {1} množství nemůže být zlomek
 apps/erpnext/erpnext/config/buying.py +59,Supplier Type master.,Dodavatel Type master.
 DocType: Purchase Order Item,Supplier Part Number,Dodavatel Číslo dílu
@@ -1397,14 +1350,14 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +247,{0} {1} is cancelled or stopped,{0} {1} je zrušená alebo zastavená
 DocType: Accounts Settings,Credit Controller,Credit Controller
 DocType: Delivery Note,Vehicle Dispatch Date,Vozidlo Dispatch Datum
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +197,Purchase Receipt {0} is not submitted,Doklad o koupi {0} není předložena
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +198,Purchase Receipt {0} is not submitted,Doklad o koupi {0} není předložena
 DocType: Company,Default Payable Account,Výchozí Splatnost účtu
 apps/erpnext/erpnext/config/website.py +13,"Settings for online shopping cart such as shipping rules, price list etc.","Nastavení pro on-line nákupního košíku, jako jsou pravidla dopravu, ceník atd"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +660,Setup Complete,Setup Complete
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +124,Setup Complete,Setup Complete
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +65,{0}% Billed,{0}% účtovaný
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +17,Reserved Qty,Reserved Množství
 DocType: Party Account,Party Account,Party účtu
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +74,Human Resources,Lidské zdroje
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +74,Human Resources,Lidské zdroje
 DocType: Lead,Upper Income,Horní příjmů
 DocType: Journal Entry Account,Debit in Company Currency,Debetnej v spoločnosti Mena
 apps/erpnext/erpnext/support/doctype/issue/issue.py +58,My Issues,Moje problémy
@@ -1413,11 +1366,9 @@
 DocType: Company,Default Values,Predvolené hodnoty
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +236,Row {0}: Payment amount can not be negative,Row {0}: Částka platby nemůže být záporný
 DocType: Expense Claim,Total Amount Reimbursed,Celkovej sumy vyplatenej
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +152,Press fitting,Tlačová kovania
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +64,Against Supplier Invoice {0} dated {1},Proti faktuře dodavatele {0} ze dne {1}
 DocType: Customer,Default Price List,Výchozí Ceník
 DocType: Payment Reconciliation,Payments,Platby
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +24,Hot isostatic pressing,Izostatické lisovanie
 DocType: ToDo,Medium,Střední
 DocType: Budget Detail,Budget Allocated,Přidělený Rozpočet
 DocType: Journal Entry,Entry Type,Entry Type
@@ -1430,9 +1381,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +56,None of the items have any change in quantity or value.,Žiadny z týchto položiek má žiadnu zmenu v množstve alebo hodnote.
 DocType: Warranty Claim,Warranty Claim,Záruční reklamace
 ,Lead Details,Podrobnosti Obchodnej iniciatívy
-DocType: Authorization Rule,Approving User,Schvalování Uživatel
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +37,Forging,Kovania
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +126,Plating,Pokovovanie
 DocType: Purchase Invoice,End date of current invoice's period,Datum ukončení doby aktuální faktury je
 DocType: Pricing Rule,Applicable For,Použitelné pro
 DocType: Bank Reconciliation,From Date,Od data
@@ -1454,31 +1402,29 @@
 DocType: Sales Invoice,Paid Amount (Company Currency),Zaplatená suma (Company meny)
 DocType: Purchase Invoice,Additional Discount,Ďalšie zľavy
 DocType: Selling Settings,Selling Settings,Nastavenia pre Predaj
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +39,Online Auctions,Aukce online
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,Aukce online
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +94,Please specify either Quantity or Valuation Rate or both,"Uveďte prosím buď Množství nebo ocenění Cena, nebo obojí"
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +50,"Company, Month and Fiscal Year is mandatory","Společnost, měsíc a fiskální rok je povinný"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Marketing Expenses,Marketingové náklady
 ,Item Shortage Report,Položka Nedostatek Report
-apps/erpnext/erpnext/stock/doctype/item/item.js +183,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Hmotnost je uvedeno, \n uveďte prosím ""váha UOM"" příliš"
+apps/erpnext/erpnext/stock/doctype/item/item.js +185,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Hmotnost je uvedeno, \n uveďte prosím ""váha UOM"" příliš"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,Materiál Žádost používá k výrobě této populace Entry
 apps/erpnext/erpnext/config/support.py +43,Single unit of an Item.,Single jednotka položky.
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +212,Time Log Batch {0} must be 'Submitted',"Time Log Batch {0} musí být ""Odesláno"""
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,Ujistěte se účetní položka pro každý pohyb zásob
 DocType: Leave Allocation,Total Leaves Allocated,Celkem Leaves Přidělené
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +384,Warehouse required at Row No {0},Warehouse vyžadované pri Row No {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +386,Warehouse required at Row No {0},Warehouse vyžadované pri Row No {0}
 DocType: Employee,Date Of Retirement,Datum odchodu do důchodu
 DocType: Upload Attendance,Get Template,Získat šablonu
 DocType: Address,Postal,Poštovní
 DocType: Item,Weightage,Weightage
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +159,Mining,Baníctvo
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +17,Resin casting,Resin liatie
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"Zákaznická Skupina existuje se stejným názvem, prosím změnit název zákazníka nebo přejmenujte skupinu zákazníků"
 apps/erpnext/erpnext/public/js/pos/pos.js +147,Please select {0} first.,"Prosím, vyberte {0} jako první."
 apps/erpnext/erpnext/templates/pages/order.html +57,text {0},Text {0}
 DocType: Territory,Parent Territory,Parent Territory
 DocType: Quality Inspection Reading,Reading 2,Čtení 2
 DocType: Stock Entry,Material Receipt,Příjem materiálu
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +622,Products,Výrobky
+apps/erpnext/erpnext/public/js/setup_wizard.js +358,Products,Výrobky
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +47,Party Type and Party is required for Receivable / Payable account {0},Zadejte Party Party a je nutné pro pohledávky / závazky na účtu {0}
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.","Ak je táto položka má varianty, potom to nemôže byť vybraná v predajných objednávok atď"
 DocType: Lead,Next Contact By,Další Kontakt By
@@ -1488,13 +1434,13 @@
 DocType: Purchase Invoice,Notification Email Address,Oznámení e-mailová adresa
 DocType: Payment Tool,Find Invoices to Match,Nájsť faktúry zápas
 ,Item-wise Sales Register,Item-moudrý Sales Register
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +399,"e.g. ""XYZ National Bank""","napríklad ""XYZ Národná Banka"""
+apps/erpnext/erpnext/public/js/setup_wizard.js +147,"e.g. ""XYZ National Bank""","napríklad ""XYZ Národná Banka"""
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,Je to poplatek v ceně základní sazbě?
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +57,Total Target,Celkem Target
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Target,Celkem Target
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.js +22,Shopping Cart is enabled,Nákupný košík je povolené
 DocType: Job Applicant,Applicant for a Job,Žadatel o zaměstnání
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +173,No Production Orders created,Žádné výrobní zakázky vytvořené
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +131,Salary Slip of employee {0} already created for this month,Plat Slip of zaměstnance {0} již vytvořili pro tento měsíc
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +140,Salary Slip of employee {0} already created for this month,Plat Slip of zaměstnance {0} již vytvořili pro tento měsíc
 DocType: Stock Reconciliation,Reconciliation JSON,Odsouhlasení JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Příliš mnoho sloupců. Export zprávu a vytiskněte jej pomocí aplikace tabulky.
 DocType: Sales Invoice Item,Batch No,Č. šarže
@@ -1504,14 +1450,14 @@
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +13,Variant,Varianta
 apps/frappe/frappe/public/js/frappe/form/toolbar.js +165,New {0},Nový: {0}
 DocType: Naming Series,Set prefix for numbering series on your transactions,Nastavit prefix pro číslování série na vašich transakcí
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +169,Stopped order cannot be cancelled. Unstop to cancel.,Zastaveno příkaz nelze zrušit. Uvolnit zrušit.
-apps/erpnext/erpnext/stock/doctype/item/item.py +323,Default BOM ({0}) must be active for this item or its template,Predvolené BOM ({0}) musí byť aktívna pre túto položku alebo jeho šablóny
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +164,Stopped order cannot be cancelled. Unstop to cancel.,Zastaveno příkaz nelze zrušit. Uvolnit zrušit.
+apps/erpnext/erpnext/stock/doctype/item/item.py +327,Default BOM ({0}) must be active for this item or its template,Predvolené BOM ({0}) musí byť aktívna pre túto položku alebo jeho šablóny
 DocType: Employee,Leave Encashed?,Ponechte zpeněžení?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Opportunity Ze hřiště je povinné
 DocType: Item,Variants,Varianty
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +458,Make Purchase Order,Proveďte objednávky
 DocType: SMS Center,Send To,Odeslat
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +111,There is not enough leave balance for Leave Type {0},Není dost bilance dovolenou na vstup typ {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +127,There is not enough leave balance for Leave Type {0},Není dost bilance dovolenou na vstup typ {0}
 DocType: Sales Team,Contribution to Net Total,Příspěvek na celkových čistých
 DocType: Sales Invoice Item,Customer's Item Code,Zákazníka Kód položky
 DocType: Stock Reconciliation,Stock Reconciliation,Reklamní Odsouhlasení
@@ -1548,11 +1494,11 @@
 DocType: Sales Order Item,Actual Qty,Skutečné Množství
 DocType: Sales Invoice Item,References,Referencie
 DocType: Quality Inspection Reading,Reading 10,Čtení 10
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +612,"List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start.","Seznam vaše produkty nebo služby, které jste koupit nebo prodat. Ujistěte se, že zkontrolovat položky Group, měrná jednotka a dalších vlastností při spuštění."
+apps/erpnext/erpnext/public/js/setup_wizard.js +348,"List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start.","Seznam vaše produkty nebo služby, které jste koupit nebo prodat. Ujistěte se, že zkontrolovat položky Group, měrná jednotka a dalších vlastností při spuštění."
 DocType: Hub Settings,Hub Node,Hub Node
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,"Zadali jste duplicitní položky. Prosím, opravu a zkuste to znovu."
 apps/erpnext/erpnext/controllers/item_variant.py +65,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values,Hodnota {0} pre atribút {1} neexistuje v zozname platného bodu Hodnoty atribútov
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +87,Associate,Spolupracovník
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Associate,Spolupracovník
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +46,Item {0} is not a serialized Item,Položka {0} není serializovat položky
 DocType: SMS Center,Create Receiver List,Vytvořit přijímače seznam
 apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +5,Expired,Vypršela
@@ -1561,7 +1507,7 @@
 DocType: Warranty Claim,Issue Date,Datum vydání
 DocType: Activity Cost,Activity Cost,Náklady Aktivita
 DocType: Purchase Receipt Item Supplied,Consumed Qty,Spotřeba Množství
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +52,Telecommunications,Telekomunikace
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +52,Telecommunications,Telekomunikace
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),"Označuje, že balíček je součástí této dodávky (Pouze návrhu)"
 DocType: Payment Tool,Make Payment Entry,Učinit vstup platby
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +119,Quantity for Item {0} must be less than {1},Množství k bodu {0} musí být menší než {1}
@@ -1578,10 +1524,8 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +37,"Selling must be checked, if Applicable For is selected as {0}","Prodej musí být zkontrolováno, v případě potřeby pro vybrán jako {0}"
 DocType: Purchase Order Item,Supplier Quotation Item,Položka dodávateľskej ponuky
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +27,Make Salary Structure,Proveďte platovou strukturu
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +54,Shearing,Strihanie
 DocType: Item,Has Variants,Má varianty
 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.,"Klikněte na tlačítko "", aby se prodej na faktuře"" vytvořit nový prodejní faktury."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +166,Packaging and labeling,Balenie a označovanie
 DocType: Monthly Distribution,Name of the Monthly Distribution,Název měsíční výplatou
 DocType: Sales Person,Parent Sales Person,Parent obchodník
 apps/erpnext/erpnext/setup/utils.py +14,Please specify Default Currency in Company Master and Global Defaults,"Uveďte prosím výchozí měnu, ve společnosti Master and Global výchozí"
@@ -1592,19 +1536,18 @@
 DocType: Budget Detail,Fiscal Year,Fiskální rok
 DocType: Cost Center,Budget,Rozpočet
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +41,"Budget cannot be assigned against {0}, as it's not an Income or Expense account","Rozpočet nemožno priradiť proti {0}, pretože to nie je výnos alebo náklad účet"
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Achieved,Dosažená
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,Dosažená
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +65,Territory / Customer,Territory / Customer
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,e.g. 5,napríklad 5
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +207,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},Row {0}: Přidělená částka {1} musí být menší než nebo se rovná fakturovat dlužné částky {2}
+apps/erpnext/erpnext/public/js/setup_wizard.js +294,e.g. 5,napríklad 5
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},Row {0}: Přidělená částka {1} musí být menší než nebo se rovná fakturovat dlužné částky {2}
 DocType: Sales Invoice,In Words will be visible once you save the Sales Invoice.,"Ve slovech budou viditelné, jakmile uložíte prodejní faktury."
 DocType: Item,Is Sales Item,Je Sales Item
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,Položka Group Tree
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,"Položka {0} není nastavení pro Serial č. Zkontrolujte, zda master položku"
 DocType: Maintenance Visit,Maintenance Time,Údržba Time
 ,Amount to Deliver,"Suma, ktorá má dodávať"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +620,A Product or Service,Produkt nebo Služba
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +158,There were errors.,Byly tam chyby.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +101,Tapping,Výčapné
+apps/erpnext/erpnext/public/js/setup_wizard.js +356,A Product or Service,Produkt nebo Služba
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +146,There were errors.,Byly tam chyby.
 DocType: Naming Series,Current Value,Current Value
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +171,{0} created,{0} vytvořil
 DocType: Delivery Note Item,Against Sales Order,Proti přijaté objednávce
@@ -1619,7 +1562,7 @@
 apps/erpnext/erpnext/accounts/party.py +275,Due Date cannot be before Posting Date,Datum splatnosti nesmí být před odesláním Datum
 DocType: Website Item Group,Website Item Group,Website Item Group
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Duties and Taxes,Odvody a dane
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Please enter Reference date,"Prosím, zadejte Referenční den"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +312,Please enter Reference date,"Prosím, zadejte Referenční den"
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} platobné položky môžu nie je možné filtrovať {1}
 DocType: Item Website Specification,Table for Item that will be shown in Web Site,"Tabulka k bodu, který se zobrazí na webových stránkách"
 DocType: Purchase Order Item Supplied,Supplied Qty,Dodávané Množstvo
@@ -1627,7 +1570,7 @@
 apps/erpnext/erpnext/config/stock.py +103,Tree of Item Groups.,Strom skupiny položek.
 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,Nelze odkazovat číslo řádku větší nebo rovnou aktuální číslo řádku pro tento typ Charge
 ,Item-wise Purchase History,Item-moudrý Historie nákupů
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +152,Red,Červená
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Red,Červená
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +228,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},"Prosím, klikněte na ""Generovat Schedule"", aby přinesla Pořadové číslo přidán k bodu {0}"
 DocType: Account,Frozen,Zmražený
 ,Open Production Orders,Otevřené výrobní zakázky
@@ -1642,7 +1585,7 @@
 DocType: Item Attribute,Attribute Name,Název atributu
 apps/erpnext/erpnext/controllers/selling_controller.py +236,Item {0} must be Sales or Service Item in {1},Položka {0} musí být prodej či servis položku v {1}
 DocType: Item Group,Show In Website,Show pro webové stránky
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +621,Group,Skupina
+apps/erpnext/erpnext/public/js/setup_wizard.js +357,Group,Skupina
 DocType: Task,Expected Time (in hours),Predpokladaná doba (v hodinách)
 ,Qty to Order,Množství k objednávce
 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","Ak chcete sledovať značku v nasledujúcich dokumentoch dodacom liste Opportunity, materiál Request, položka, objednávke, kúpnej poukazu, nakupujú potvrdenka, cenovú ponuku, predajné faktúry, Product Bundle, predajné objednávky, poradové číslo"
@@ -1652,6 +1595,7 @@
 DocType: Features Setup,Brands,Značky
 DocType: C-Form Invoice Detail,Invoice No,Faktúra č.
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +480,From Purchase Order,Z vydané objednávky
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +92,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Nechajte nemožno aplikovať / zrušená pred {0}, pretože rovnováha dovolenky už bolo carry-odovzdávané v budúcej pridelenie dovolenku záznamu {1}"
 DocType: Activity Cost,Costing Rate,Kalkulácie Rate
 ,Customer Addresses And Contacts,Adresy zákazníkov a kontakty
 DocType: Employee,Resignation Letter Date,Rezignace Letter Datum
@@ -1659,35 +1603,31 @@
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +137,Not Set,Není nastaveno
 DocType: Communication,Date,Datum
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,Repeat Customer Příjmy
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +651,Sit tight while your system is being setup. This may take a few moments.,"Vydržte, kým sa váš systém nastaví. Môže to pár chvíľ trvať."
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +115,Sit tight while your system is being setup. This may take a few moments.,"Vydržte, kým sa váš systém nastaví. Môže to pár chvíľ trvať."
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +51,{0} ({1}) must have role 'Expense Approver',"{0} ({1}), musí mít roli ""Schvalovatel výdajů"""
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Pair,Pár
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Pair,Pár
 DocType: Bank Reconciliation Detail,Against Account,Proti účet
 DocType: Maintenance Schedule Detail,Actual Date,Skutečné datum
 DocType: Item,Has Batch No,Má číslo šarže
 DocType: Delivery Note,Excise Page Number,Spotřební Číslo stránky
 DocType: Employee,Personal Details,Osobní data
 ,Maintenance Schedules,Plány údržby
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +44,Embossing,Razba
 ,Quotation Trends,Vývoje ponúk
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +139,Item Group not mentioned in item master for item {0},Položka Group není uvedeno v položce mistra na položku {0}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +302,Debit To account must be a Receivable account,"Debetní Chcete-li v úvahu, musí být pohledávka účet"
-apps/erpnext/erpnext/stock/doctype/item/item.py +310,"As Production Order can be made for this item, it must be a stock item.","Jako výrobní objednávce lze provést za tuto položku, musí být skladem."
 DocType: Shipping Rule Condition,Shipping Amount,Přepravní Částka
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +140,Joining,Spájanie
-DocType: Authorization Rule,Above Value,Výše uvedená hodnota
 ,Pending Amount,Čeká Částka
 DocType: Purchase Invoice Item,Conversion Factor,Konverzní faktor
 DocType: Purchase Order,Delivered,Dodává
 apps/erpnext/erpnext/config/hr.py +160,Setup incoming server for jobs email id. (e.g. jobs@example.com),Nastavenie serveru prichádzajúcej pošty s ID emailom pre uchádzačov o prácu. (Napríklad praca@priklad.com)
 DocType: Purchase Receipt,Vehicle Number,Číslo vozidla
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,"Datum, kdy opakující se faktura bude zastaví"
+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,Celkové pridelené listy {0} nemôže byť nižšia ako už schválených listy {1} pre obdobie
 DocType: Journal Entry,Accounts Receivable,Pohledávky
 ,Supplier-Wise Sales Analytics,Dodavatel-Wise Prodej Analytics
 DocType: Address Template,This format is used if country specific format is not found,"Tento formát se používá, když specifický formát země není nalezen"
 DocType: Custom Field,Custom,Zvyk
 DocType: Production Order,Use Multi-Level BOM,Použijte Multi-Level BOM
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +26,Injection molding,Vstrekovanie
 DocType: Bank Reconciliation,Include Reconciled Entries,Zahrnout odsouhlasené zápisy
 apps/erpnext/erpnext/config/accounts.py +41,Tree of finanial accounts.,Strom finanial účtů.
 DocType: Leave Control Panel,Leave blank if considered for all employee types,"Ponechte prázdné, pokud se to považuje za ubytování ve všech typech zaměstnanců"
@@ -1697,30 +1637,28 @@
 apps/frappe/frappe/config/setup.py +130,Printing,Tisk
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +114,Expense Claim is pending approval. Only the Expense Approver can update status.,Úhrada výdajů čeká na schválení. Pouze schalovatel výdajů může aktualizovat stav.
 DocType: Purchase Invoice,Additional Discount Amount,Dodatočná zľava Suma
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +99,The day(s) on which you are applying for leave are holiday. You need not apply for leave.,"Den (y), na které žádáte o dovolené jsou dovolenou. Potřebujete nevztahuje na dovolenou."
 apps/frappe/frappe/public/js/frappe/misc/utils.js +110,and,a
 DocType: Leave Block List Allow,Leave Block List Allow,Nechte Block List Povolit
 apps/erpnext/erpnext/setup/doctype/company/company.py +236,Abbr can not be blank or space,Skrátená nemôže byť prázdne alebo priestor
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +50,Sports,Sportovní
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,Sportovní
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Actual,Celkem Aktuální
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Unit,Jednotka
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Unit,Jednotka
 apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.py +182,Please set Dropbox access keys in your site config,"Prosím, nastavení přístupových klíčů Dropbox ve vašem webu config"
 apps/erpnext/erpnext/stock/get_item_details.py +113,Please specify Company,"Uveďte prosím, firmu"
 ,Customer Acquisition and Loyalty,Zákazník Akvizice a loajality
 DocType: Purchase Receipt,Warehouse where you are maintaining stock of rejected items,"Sklad, kde se udržují zásoby odmítnutých položek"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +408,Your financial year ends on,Váš finanční rok končí
+apps/erpnext/erpnext/public/js/setup_wizard.js +156,Your financial year ends on,Váš finanční rok končí
 DocType: POS Profile,Price List,Ceník
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +20,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0} je nyní výchozí fiskální rok. Prosím aktualizujte svůj prohlížeč aby se změny projevily.
 apps/erpnext/erpnext/projects/doctype/project/project.js +47,Expense Claims,Nákladové Pohľadávky
 DocType: Issue,Support,Podpora
-DocType: Authorization Rule,Approving Role,Schvalování roli
 ,BOM Search,BOM Search
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +176,Closing (Opening + Totals),Uzavretie (Otvorenie + súčty)
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +26,Please specify currency in Company,"Uveďte prosím měnu, ve společnosti"
 DocType: Workstation,Wages per hour,Mzda za hodinu
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},Sklad bilance v dávce {0} se zhorší {1} k bodu {2} ve skladu {3}
 apps/erpnext/erpnext/config/setup.py +83,"Show / Hide features like Serial Nos, POS etc.","Zobrazit / skrýt funkce, jako pořadová čísla, POS atd"
-apps/erpnext/erpnext/controllers/accounts_controller.py +236,Account {0} is invalid. Account Currency must be {1},Účet {0} je neplatná. Mena účtu musí byť {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +237,Account {0} is invalid. Account Currency must be {1},Účet {0} je neplatná. Mena účtu musí byť {1}
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +34,UOM Conversion factor is required in row {0},UOM Konverzní faktor je nutné v řadě {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +53,Clearance date cannot be before check date in row {0},Datum vůle nemůže být před přihlášením dnem v řadě {0}
 DocType: Salary Slip,Deduction,Dedukce
@@ -1739,13 +1677,13 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +82,Item {0} has already been returned,Bod {0} již byla vrácena
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** Fiskální rok ** představuje finanční rok. Veškeré účetní záznamy a další významné transakce jsou sledovány proti ** fiskální rok **.
 DocType: Opportunity,Customer / Lead Address,Zákazník / Iniciatíva Adresa
+apps/erpnext/erpnext/stock/doctype/item/item.py +112,Warning: Invalid SSL certificate on attachment {0},Varovanie: Neplatný certifikát SSL na prílohu {0}
 DocType: Production Order Operation,Actual Operation Time,Aktuální Provozní doba
 DocType: Authorization Rule,Applicable To (User),Vztahující se na (Uživatel)
 DocType: Purchase Taxes and Charges,Deduct,Odečíst
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +170,Job Description,Popis Práca
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +170,Job Description,Popis Práca
 DocType: Purchase Order Item,Qty as per Stock UOM,Množstvo podľa skladovej MJ
 apps/frappe/frappe/model/rename_doc.py +343,Please select a valid csv file with data,Vyberte prosím platný CSV soubor s daty
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +92,Coating,Náter
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +126,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Speciální znaky kromě ""-"". """", ""#"", a ""/"" není povoleno v pojmenování řady"
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Mějte přehled o prodejních kampaní. Mějte přehled o Leads, citace, prodejní objednávky atd z kampaně, aby zjistily, návratnost investic. "
 DocType: Expense Claim,Approver,Schvalovatel
@@ -1755,12 +1693,11 @@
 DocType: Supplier Quotation,Manufacturing Manager,Výrobní ředitel
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},Pořadové číslo {0} je v záruce aľ {1}
 apps/erpnext/erpnext/config/stock.py +69,Split Delivery Note into packages.,Rozdělit dodací list do balíčků.
-apps/erpnext/erpnext/hooks.py +84,Shipments,Zásielky
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +29,Dip molding,Dip liatie
+apps/erpnext/erpnext/hooks.py +68,Shipments,Zásielky
 DocType: Purchase Order,To be delivered to customer,Ak chcete byť doručený zákazníkovi
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,Time Log Status musí být předloženy.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,"Poradové číslo {0} nepatrí do skladu,"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +650,Setting Up,Nastavenia
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +114,Setting Up,Nastavenia
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,Row # ,Row # 
 DocType: Purchase Invoice,In Words (Company Currency),Slovy (měna společnosti)
 DocType: Pricing Rule,Supplier,Dodavatel
@@ -1768,7 +1705,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +105,Miscellaneous Expenses,Různé výdaje
 DocType: Global Defaults,Default Company,Výchozí Company
 apps/erpnext/erpnext/controllers/stock_controller.py +166,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,Náklady nebo Rozdíl účet je povinné k bodu {0} jako budou mít dopad na celkovou hodnotu zásob
-apps/erpnext/erpnext/controllers/accounts_controller.py +354,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","Nelze overbill k bodu {0} v řadě {1} více než {2}. Chcete-li povolit nadfakturace, prosím nastavte na skladě Nastavení"
+apps/erpnext/erpnext/controllers/accounts_controller.py +355,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","Nelze overbill k bodu {0} v řadě {1} více než {2}. Chcete-li povolit nadfakturace, prosím nastavte na skladě Nastavení"
 DocType: Employee,Bank Name,Název banky
 apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +27,-Above,-Nad
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +135,User {0} is disabled,Uživatel {0} je zakázána
@@ -1781,27 +1718,26 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,{0} is mandatory for Item {1},{0} je povinná k položce {1}
 DocType: Currency Exchange,From Currency,Od Měny
 DocType: DocField,Name,Meno
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +211,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Prosím, vyberte alokovaná částka, typ faktury a číslo faktury v aspoň jedné řadě"
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +104,Sales Order required for Item {0},Prodejní objednávky potřebný k bodu {0}
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +158,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Prosím, vyberte alokovaná částka, typ faktury a číslo faktury v aspoň jedné řadě"
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +107,Sales Order required for Item {0},Prodejní objednávky potřebný k bodu {0}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +43,Amounts not reflected in system,Částky nejsou zohledněny v systému
 DocType: Purchase Invoice Item,Rate (Company Currency),Cena (Měna Společnosti)
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +40,Others,Ostatní
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +40,Others,Ostatní
 apps/erpnext/erpnext/templates/includes/product_page.js +80,Cannot find a matching Item. Please select some other value for {0}.,Nemožno nájsť zodpovedajúce položku. Vyberte nejakú inú hodnotu pre {0}.
 DocType: POS Profile,Taxes and Charges,Daně a poplatky
 DocType: Item,"A Product or a Service that is bought, sold or kept in stock.","Produkt nebo služba, která se Nakupuje, Prodává nebo Skladuje."
 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,"Nelze vybrat druh náboje jako ""On předchozí řady Částka"" nebo ""On předchozí řady Celkem"" pro první řadu"
 apps/frappe/frappe/core/doctype/doctype/boilerplate/controller_list.html +31,Completed,Dokončeno
 DocType: Web Form,Select DocType,Zvolte DocType
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +104,Broaching,Preťahovanie
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +12,Banking,Bankovnictví
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,Bankovnictví
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +38,Please click on 'Generate Schedule' to get schedule,"Prosím, klikněte na ""Generovat Schedule"", aby se plán"
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +283,New Cost Center,Nové Nákladové Středisko
 DocType: Bin,Ordered Quantity,Objednané množství
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +397,"e.g. ""Build tools for builders""","napríklad ""Nástroje pre stavbárov """
+apps/erpnext/erpnext/public/js/setup_wizard.js +145,"e.g. ""Build tools for builders""","napríklad ""Nástroje pre stavbárov """
 DocType: Quality Inspection,In Process,V procesu
 DocType: Authorization Rule,Itemwise Discount,Itemwise Sleva
 DocType: Purchase Order Item,Reference Document Type,Referenčná Typ dokumentu
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +318,{0} against Sales Order {1},{0} proti Prodejní Objednávce {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +320,{0} against Sales Order {1},{0} proti Prodejní Objednávce {1}
 DocType: Account,Fixed Asset,Základní Jmění
 apps/erpnext/erpnext/config/stock.py +283,Serialized Inventory,Serialized Zásoby
 DocType: Activity Type,Default Billing Rate,Predvolené fakturácia Rate
@@ -1816,14 +1752,13 @@
 DocType: Purchase Invoice Item,Page Break,Zalomení stránky
 DocType: Production Order Operation,Pending,Až do
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,"Uživatelé, kteří si vyhoví žádosti konkrétního zaměstnance volno"
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +33,You cannot change default UOM of Variant. To change default UOM for Variant change default UOM of the Template,Nemôžete zmeniť predvolenú MJ pre Variant produktu. Ak chcete zmeniť predvolenú MJ pre Variant zmeňte predvolenú MJ šablóny produktu
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +50,Office Equipments,Kancelářské Vybavení
 DocType: Purchase Invoice Item,Qty,Množství
 DocType: Fiscal Year,Companies,Společnosti
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +24,Electronics,Elektronika
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +24,Electronics,Elektronika
 DocType: Stock Settings,Raise Material Request when stock reaches re-order level,Zvýšit Materiál vyžádání při stock dosáhne úrovně re-order
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +18,From Maintenance Schedule,Z plánu údržby
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +56,Full-time,Na plný úvazek
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +56,Full-time,Na plný úvazek
 DocType: Purchase Invoice,Contact Details,Kontaktní údaje
 DocType: C-Form,Received Date,Datum přijetí
 DocType: Delivery Note,"If you have created a standard template in Sales Taxes and Charges Template, select one and click on the button below.","Ak ste vytvorili štandardné šablónu v predaji daní a poplatkov šablóny, vyberte jednu a kliknite na tlačidlo nižšie."
@@ -1835,11 +1770,12 @@
 DocType: Job Applicant,Job Opening,Job Zahájení
 DocType: Payment Reconciliation,Payment Reconciliation,Platba Odsouhlasení
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +154,Please select Incharge Person's name,"Prosím, vyberte incharge jméno osoby"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +51,Technology,Technologie
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,Technologie
 DocType: Offer Letter,Offer Letter,Ponuka Letter
 apps/erpnext/erpnext/config/manufacturing.py +51,Generate Material Requests (MRP) and Production Orders.,Generování materiálu Požadavky (MRP) a výrobní zakázky.
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +68,Total Invoiced Amt,Celkové fakturované Amt
 DocType: Time Log,To Time,Chcete-li čas
+DocType: Authorization Rule,Approving Role (above authorized value),Schválenie role (nad oprávnenej hodnoty)
 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.","Chcete-li přidat podřízené uzly, prozkoumat stromu a klepněte na položku, pod kterou chcete přidat více uzlů."
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +102,Credit To account must be a Payable account,Připsat na účet musí být Splatnost účet
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +233,BOM recursion: {0} cannot be parent or child of {2},BOM rekurze: {0} nemůže být rodič nebo dítě {2}
@@ -1852,10 +1788,8 @@
 DocType: Item,Customer Item Codes,Zákazník Položka Kódy
 DocType: Opportunity,Lost Reason,Ztracené Důvod
 apps/erpnext/erpnext/config/accounts.py +68,Create Payment Entries against Orders or Invoices.,Vytvořte Platební záznamy proti objednávky nebo faktury.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +141,Welding,Zváranie
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +40,New Stock UOM is required,Je potrebná nová skladová MJ
 DocType: Quality Inspection,Sample Size,Velikost vzorku
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +443,All items have already been invoiced,Všechny položky již byly fakturovány
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +446,All items have already been invoiced,Všechny položky již byly fakturovány
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',"Uveďte prosím platný ""Od věci č '"
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +287,Further cost centers can be made under Groups but entries can be made against non-Groups,"Ďalšie nákladové strediská môžu byť vyrobené v rámci skupiny, ale položky môžu byť vykonané proti non-skupín"
 DocType: Project,External,Externí
@@ -1867,8 +1801,7 @@
 DocType: Bin,Actual Quantity,Skutečné Množství
 DocType: Shipping Rule,example: Next Day Shipping,Příklad: Next Day Shipping
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,Pořadové číslo {0} nebyl nalezen
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +563,Your Customers,Vaši Zákazníci
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +27,Compression molding,Lisovanie
+apps/erpnext/erpnext/public/js/setup_wizard.js +303,Your Customers,Vaši Zákazníci
 DocType: Leave Block List Date,Block Date,Block Datum
 DocType: Sales Order,Not Delivered,Ne vyhlášeno
 ,Bank Clearance Summary,Souhrn bankovního zúčtování
@@ -1889,10 +1822,10 @@
 DocType: SMS Log,Sent To,Odoslaná
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +28,Make Sales Invoice,Proveďte prodejní faktuře
 DocType: Company,For Reference Only.,Pouze orientační.
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +29,Invalid {0}: {1},Neplatný {0}: {1}
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +49,Invalid {0}: {1},Neplatný {0}: {1}
 DocType: Sales Invoice Advance,Advance Amount,Záloha ve výši
 DocType: Manufacturing Settings,Capacity Planning,Plánovanie kapacít
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +49,'From Date' is required,"""Dátum od"" je povinný"
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +43,'From Date' is required,"""Dátum od"" je povinný"
 DocType: Journal Entry,Reference Number,Referenční číslo
 DocType: Employee,Employment Details,Informace o zaměstnání
 DocType: Employee,New Workplace,Nové pracoviště
@@ -1907,7 +1840,7 @@
 DocType: Serial No,Delivery Time,Dodací lhůta
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Stárnutí dle
 DocType: Item,End of Life,Konec životnosti
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +41,Travel,Cestování
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +41,Travel,Cestování
 DocType: Leave Block List,Allow Users,Povolit uživatele
 DocType: Purchase Order,Customer Mobile No,Zákazník Mobile Žiadne
 DocType: Sales Invoice,Recurring,Opakujúce sa
@@ -1921,7 +1854,7 @@
 DocType: Naming Series,User must always select,Uživatel musí vždy vybrat
 DocType: Stock Settings,Allow Negative Stock,Povolit Negativní Sklad
 DocType: Installation Note,Installation Note,Poznámka k instalaci
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +541,Add Taxes,Pridajte dane
+apps/erpnext/erpnext/public/js/setup_wizard.js +283,Add Taxes,Pridajte dane
 ,Financial Analytics,Finanční Analýza
 DocType: Quality Inspection,Verified By,Verified By
 DocType: Address,Subsidiary,Dceřiný
@@ -1931,7 +1864,6 @@
 DocType: System Settings,In Hours,V hodinách
 DocType: Process Payroll,Create Salary Slip,Vytvořit výplatní pásce
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Expected balance as per bank,Očekávaný zůstatek podle banky
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +115,Buffing,Leštenie
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Source of Funds (Liabilities),Zdrojem finančních prostředků (závazků)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +347,Quantity in row {0} ({1}) must be same as manufactured quantity {2},"Množství v řadě {0} ({1}), musí být stejné jako množství vyrobené {2}"
 DocType: Appraisal,Employee,Zaměstnanec
@@ -1948,11 +1880,11 @@
 DocType: Rename Tool,File to Rename,Súbor premenovať
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +176,Purchse Order number required for Item {0},Purchse Objednací číslo potřebný k bodu {0}
 apps/erpnext/erpnext/public/js/controllers/transaction.js +136,Show Payments,Zobraziť Platby
-apps/erpnext/erpnext/controllers/buying_controller.py +245,Specified BOM {0} does not exist for Item {1},Stanovená BOM {0} neexistuje k bodu {1}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +202,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Plán údržby {0} musí být zrušena před zrušením této prodejní objednávky
+apps/erpnext/erpnext/controllers/buying_controller.py +236,Specified BOM {0} does not exist for Item {1},Stanovená BOM {0} neexistuje k bodu {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Plán údržby {0} musí být zrušena před zrušením této prodejní objednávky
 apps/frappe/frappe/desk/page/backups/backups.html +13,Size,Veľkosť
 DocType: Notification Control,Expense Claim Approved,Uhrazení výdajů schváleno
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +113,Pharmaceutical,Farmaceutické
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Pharmaceutical,Farmaceutické
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,Náklady na zakoupené zboží
 DocType: Selling Settings,Sales Order Required,Prodejní objednávky Povinné
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +30,Create Customer,Vytvořit zákazníka
@@ -1962,7 +1894,6 @@
 DocType: Quality Inspection Reading,Reading 9,Čtení 9
 DocType: Supplier,Is Frozen,Je Frozen
 DocType: Buying Settings,Buying Settings,Nákup Nastavení
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +122,Mass finishing,Mass dokončovacie
 DocType: Stock Entry Detail,BOM No. for a Finished Good Item,BOM Ne pro hotový dobré položce
 DocType: Upload Attendance,Attendance To Date,Účast na data
 apps/erpnext/erpnext/config/selling.py +158,Setup incoming server for sales email id. (e.g. sales@example.com),Nastavenie serveru prichádzajúcej pošty s ID emailom pre Predaj. (Napríklad obchod@priklad.com)
@@ -1970,7 +1901,7 @@
 DocType: Payment Tool,Payment Account,Platební účet
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +713,Please specify Company to proceed,Uveďte prosím společnost pokračovat
 apps/frappe/frappe/public/js/frappe/model/indicator.js +30,Draft,Návrh
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +46,Compensatory Off,Vyrovnávací Off
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Compensatory Off,Vyrovnávací Off
 DocType: Quality Inspection Reading,Accepted,Přijato
 DocType: User,Female,Žena
 DocType: Journal Entry Account,Debit in Account Currency,Debetné v mene účtu
@@ -1982,7 +1913,7 @@
 DocType: Shipping Rule,Shipping Rule Label,Přepravní Pravidlo Label
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +209,Raw Materials cannot be blank.,Suroviny nemůže být prázdný.
 DocType: Newsletter,Test,Test
-apps/erpnext/erpnext/stock/doctype/item/item.py +364,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +368,"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'","Ako tam sú existujúce skladové transakcie pre túto položku, \ nemôžete zmeniť hodnoty &quot;Má sériové číslo&quot;, &quot;má Batch Nie&quot;, &quot;Je skladom&quot; a &quot;ocenenie Method&quot;"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +448,Quick Journal Entry,Rýchly vstup Journal
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +92,You can not change rate if BOM mentioned agianst any item,"Nemůžete změnit sazbu, kdyby BOM zmínil agianst libovolné položky"
@@ -1993,13 +1924,14 @@
 apps/erpnext/erpnext/config/stock.py +18,Requests for items.,Žádosti o položky.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,Samostatná výroba objednávka bude vytvořena pro každého hotového dobrou položku.
 DocType: Purchase Invoice,Terms and Conditions1,Podmínky a podmínek1
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +18,Complete Setup,Dokončiť nastavenie
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard_page.html +18,Complete Setup,Dokončiť nastavenie
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","Účetní záznam zmrazeny až do tohoto data, nikdo nemůže dělat / upravit položku kromě role uvedeno níže."
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +121,Please save the document before generating maintenance schedule,"Prosím, uložit dokument před generováním plán údržby"
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,Stav projektu
 DocType: UOM,Check this to disallow fractions. (for Nos),"Zkontrolujte, zda to zakázat frakce. (U č)"
 apps/erpnext/erpnext/config/crm.py +96,Newsletter Mailing List,Newsletter adresár
 DocType: Delivery Note,Transporter Name,Přepravce Název
+DocType: Authorization Rule,Authorized Value,Autorizovaný Hodnota
 DocType: Contact,Enter department to which this Contact belongs,"Zadejte útvar, který tento kontaktní patří"
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Absent,Celkem Absent
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +746,Item or Warehouse for row {0} does not match Material Request,Položka nebo Warehouse na řádku {0} neodpovídá Materiál Poptávka
@@ -2024,16 +1956,15 @@
 DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),Základná sadzba (podľa skladovej MJ)
 DocType: SMS Log,No of Requested SMS,Počet žádaným SMS
 DocType: Campaign,Campaign-.####,Kampaň-.####
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +55,Piercing,Prenikavý
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,Ďalšie kroky
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +117,Contract End Date must be greater than Date of Joining,Smlouva Datum ukončení musí být větší než Datum spojování
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,"Distributor / dealer / jednatel / partner / prodejce, který prodává produkty společnosti za provizi."
 DocType: Customer Group,Has Child Node,Má děti Node
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{0} against Purchase Order {1},{0} proti Nákupní Objednávce {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +332,{0} against Purchase Order {1},{0} proti Nákupní Objednávce {1}
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","Zadejte statické parametry url zde (Např odesílatel = ERPNext, username = ERPNext, password. = 1234 atd.),"
 apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,{0} {1} nie je v žiadnom aktívnom fiškálny rok. Pre zistiť viac informácií {2}.
-apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,To je příklad webové stránky automaticky generované z ERPNext
+apps/erpnext/erpnext/setup/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,To je příklad webové stránky automaticky generované z ERPNext
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +37,Ageing Range 1,Stárnutí Rozsah 1
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +110,Photochemical machining,Fotochemický obrábanie
 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.
 
 #### Note
@@ -2079,7 +2010,7 @@
 DocType: Purchase Receipt Item,Recd Quantity,Recd Množství
 DocType: Email Account,Email Ids,Email IDS
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},Nelze produkují více položku {0} než prodejní objednávky množství {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +471,Stock Entry {0} is not submitted,Sklad Entry {0} nie je predložená
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +473,Stock Entry {0} is not submitted,Sklad Entry {0} nie je predložená
 DocType: Payment Reconciliation,Bank / Cash Account,Bank / Peněžní účet
 DocType: Tax Rule,Billing City,Fakturácia City
 DocType: Global Defaults,Hide Currency Symbol,Skrýt symbol měny
@@ -2095,7 +2026,7 @@
 DocType: Purchase Invoice,Currency and Price List,Mana a cenník
 DocType: Opportunity,Customer / Lead Name,Zákazník / Iniciatíva Meno
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +63,Clearance Date not mentioned,Výprodej Datum není uvedeno
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +71,Production,Výroba
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Production,Výroba
 DocType: Item,Allow Production Order,Povolit výrobní objednávky
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +60,Row {0}:Start Date must be before End Date,"Row {0}: datum zahájení, musí být před koncem roku Datum"
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Total (ks)
@@ -2108,7 +2039,7 @@
 apps/erpnext/erpnext/utilities/doctype/address/address.py +113,My Addresses,Moje Adresy
 DocType: Stock Ledger Entry,Outgoing Rate,Odchádzajúce Rate
 apps/erpnext/erpnext/config/hr.py +100,Organization branch master.,Organizace větev master.
-apps/erpnext/erpnext/controllers/accounts_controller.py +237, or ,alebo
+apps/erpnext/erpnext/controllers/accounts_controller.py +238, or ,alebo
 DocType: Sales Order,Billing Status,Status Fakturace
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Utility Expenses,Utility Náklady
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,90-Above,90 Nad
@@ -2135,6 +2066,7 @@
 DocType: Stock Entry Detail,Serial No / Batch,Výrobní číslo / Batch
 DocType: Product Bundle,Parent Item,Nadřazená položka
 DocType: Account,Account Type,Typ účtu
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +113,Leave Type {0} cannot be carry-forwarded,Nechajte typ {0} nemožno vykonávať odovzdávané
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +213,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',"Plán údržby není generován pro všechny položky. Prosím, klikněte na ""Generovat Schedule"""
 ,To Produce,K výrobě
 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","Pre riadok {0} v {1}. Ak chcete v rýchlosti položku sú {2}, riadky {3} musí byť tiež zahrnuté"
@@ -2142,10 +2074,7 @@
 DocType: Bin,Reserved Quantity,Vyhrazeno Množství
 DocType: Landed Cost Voucher,Purchase Receipt Items,Položky příjemky
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,Prispôsobenie Formuláre
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +62,Cutting,Výstrižok
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +69,Flattening,Sploštenie
 DocType: Account,Income Account,Účet příjmů
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +22,Molding,Liatie
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +632,Delivery,Dodávka
 DocType: Stock Reconciliation Item,Current Qty,Aktuálne Množstvo
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section","Viz ""Hodnotit materiálů na bázi"" v kapitole Costing"
@@ -2155,20 +2084,19 @@
 apps/frappe/frappe/desk/moduleview.py +61,Documents,Dokumenty
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +17,Ref,Ref
 DocType: Cost Center,Cost Center,Nákladové středisko
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.js +48,Voucher #,Voucher #
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +36,Voucher #,Voucher #
 DocType: Notification Control,Purchase Order Message,Zprávy vydané objenávky
 DocType: Tax Rule,Shipping Country,Prepravné Krajina
 DocType: Upload Attendance,Upload HTML,Nahrát HTML
-apps/erpnext/erpnext/controllers/accounts_controller.py +391,"Total advance ({0}) against Order {1} cannot be greater \
+apps/erpnext/erpnext/controllers/accounts_controller.py +392,"Total advance ({0}) against Order {1} cannot be greater \
 				than the Grand Total ({2})","Celkem předem ({0}) na objednávku {1} nemůže být větší než \
  celkovém součtu ({2})"
 DocType: Employee,Relieving Date,Uvolnění Datum
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +12,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.","Ceny Pravidlo je vyrobena přepsat Ceník / definovat slevy procenta, na základě určitých kritérií."
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,Sklad je možné provést pouze prostřednictvím Burzy Entry / dodací list / doklad o zakoupení
 DocType: Employee Education,Class / Percentage,Třída / Procento
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +92,Head of Marketing and Sales,Vedoucí marketingu a prodeje
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +31,Income Tax,Daň z příjmů
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +157,Laser engineered net shaping,Laser technicky čisté tvarovanie
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Head of Marketing and Sales,Vedoucí marketingu a prodeje
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +31,Income Tax,Daň z příjmů
 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.","Je-li zvolena Ceny pravidlo je určen pro ""Cena"", přepíše ceníku. Ceny Pravidlo cena je konečná cena, a proto by měla být použita žádná další sleva. Proto, v transakcích, jako odběratele, objednávky atd, bude stažen v oboru ""sazbou"", spíše než poli ""Ceník sazby""."
 apps/erpnext/erpnext/config/selling.py +163,Track Leads by Industry Type.,Trasa vede od průmyslu typu.
 DocType: Item Supplier,Item Supplier,Položka Dodavatel
@@ -2191,31 +2119,28 @@
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Skutečné Množství Po transakci
 ,Pending SO Items For Purchase Request,"Do doby, než SO položky k nákupu Poptávka"
 DocType: Supplier,Billing Currency,Mena fakturácie
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +148,Extra Large,Extra Veľké
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,Extra Large,Extra Veľké
 ,Profit and Loss Statement,Výkaz zisků a ztrát
 DocType: Bank Reconciliation Detail,Cheque Number,Šek číslo
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +43,Pressing,Stlačení
 DocType: Payment Tool Detail,Payment Tool Detail,Detail platební nástroj
 ,Sales Browser,Sales Browser
 DocType: Journal Entry,Total Credit,Celkový Credit
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +474,Warning: Another {0} # {1} exists against stock entry {2},Upozornenie: Ďalším {0} # {1} existuje proti akciovej vstupu {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +459,Local,Místní
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +476,Warning: Another {0} # {1} exists against stock entry {2},Upozornenie: Ďalším {0} # {1} existuje proti akciovej vstupu {2}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +397,Local,Místní
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),Úvěrů a půjček (aktiva)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,Dlužníci
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +147,Large,Veľký
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +23,No employee found!,Žádný zaměstnanec našel!
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Large,Veľký
 DocType: C-Form Invoice Detail,Territory,Území
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,"Prosím, uveďte počet požadovaných návštěv"
 DocType: Purchase Order,Customer Address Display,Customer Address Display
 DocType: Stock Settings,Default Valuation Method,Výchozí metoda ocenění
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +127,Polishing,Leštenie
 DocType: Production Order Operation,Planned Start Time,Plánované Start Time
 apps/erpnext/erpnext/config/accounts.py +63,Close Balance Sheet and book Profit or Loss.,Zavřete Rozvahu a zapiš účetní zisk nebo ztrátu.
-apps/erpnext/erpnext/stock/doctype/item/item.py +661,"Default Unit of Measure for Item {0} cannot be changed directly because \
+apps/erpnext/erpnext/stock/doctype/item/item.py +665,"Default Unit of Measure for Item {0} cannot be changed directly because \
 			you have already made some transaction(s) with another UOM. To change default UOM, \
 			use 'UOM Replace Utility' tool under Stock module.","Východzia merná jednotka položky {0} nemôže byť zmenená priamo, pretože \ ste už urobili nejaké transakcie s inou MJ. Ak chcete zmeniť predvolenú MJ, \ použite ""Nástroj na náhradu MJ"" v skladovom module."
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,Zadejte Exchange Rate převést jednu měnu na jinou
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +146,Quotation {0} is cancelled,Ponuka {0} je zrušená
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +141,Quotation {0} is cancelled,Ponuka {0} je zrušená
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,Celková dlužná částka
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} was on leave on {1}. Cannot mark attendance.,Zaměstnanec {0} byl na dovolené na {1}. Nelze označit účast.
 DocType: Sales Partner,Targets,Cíle
@@ -2226,7 +2151,6 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +158,Please create Customer from Lead {0},Prosím vytvorte Zákazníka z Obchodnej iniciatívy {0}
 DocType: Price List,Applicable for Countries,Pre krajiny
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Computers,Počítače
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +112,Electro-chemical grinding,Electro-chemické brúsenie
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +14,This is a root customer group and cannot be edited.,"To je kořen skupiny zákazníků, a nelze upravovat."
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +39,Please setup your chart of accounts before you start Accounting Entries,"Prosím, nastavit svůj účtový rozvrh, než začnete účetních zápisů"
 DocType: Purchase Invoice,Ignore Pricing Rule,Ignorovat Ceny pravidlo
@@ -2284,7 +2208,6 @@
 DocType: Maintenance Visit,Purposes,Cíle
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +103,Atleast one item should be entered with negative quantity in return document,Aspon jedna položka by mala byť zadaná s negatívnym množstvo vo vratnom dokumente
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +67,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","Prevádzka {0} dlhšie, než všetkých dostupných pracovných hodín v pracovnej stanici {1}, rozložiť prevádzku do niekoľkých operácií"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +134,Electrochemical machining,Elektrochemické obrábanie
 ,Requested,Požadované
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +66,No Remarks,Žádné poznámky
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +13,Overdue,Zpožděný
@@ -2293,7 +2216,7 @@
 DocType: Monthly Distribution,Distribution Name,Distribuce Name
 DocType: Features Setup,Sales and Purchase,Prodej a nákup
 DocType: Supplier Quotation Item,Material Request No,Materiál Poptávka No
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +218,Quality Inspection required for Item {0},Kontrola kvality potřebný k bodu {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +221,Quality Inspection required for Item {0},Kontrola kvality potřebný k bodu {0}
 DocType: Quotation,Rate at which customer's currency is converted to company's base currency,"Sazba, za kterou zákazník měny je převeden na společnosti základní měny"
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +107,{0} has been successfully unsubscribed from this list.,{0} bol úspešne odhlásený z tohto zoznamu.
 DocType: Purchase Invoice Item,Net Rate (Company Currency),Čistý Rate (Company meny)
@@ -2311,9 +2234,8 @@
 apps/erpnext/erpnext/accounts/report/financial_statements.py +16,Fiscal Year {0} not found.,Fiskální rok {0} nebyl nalezen.
 DocType: Bank Reconciliation,Get Relevant Entries,Získat příslušné zápisy
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +407,Accounting Entry for Stock,Účetní položka na skladě
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +64,Coining,Razenie
 DocType: Sales Invoice,Sales Team1,Sales Team1
-apps/erpnext/erpnext/stock/doctype/item/item.py +412,Item {0} does not exist,Bod {0} neexistuje
+apps/erpnext/erpnext/stock/doctype/item/item.py +416,Item {0} does not exist,Bod {0} neexistuje
 DocType: Sales Invoice,Customer Address,Zákazník Address
 apps/frappe/frappe/desk/query_report.py +136,Total,Celkem
 DocType: Purchase Invoice,Apply Additional Discount On,Použiť dodatočné Zľava na
@@ -2325,14 +2247,13 @@
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),Suma dane po zľave Suma (Company meny)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +149,Target warehouse is mandatory for row {0},Target sklad je povinná pro řadu {0}
 DocType: Quality Inspection,Quality Inspection,Kontrola kvality
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +144,Extra Small,Extra Malé
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +20,Spray forming,Spray tvárnenie
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Extra Small,Extra Malé
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +458,Warning: Material Requested Qty is less than Minimum Order Qty,Upozornění: Materiál Požadované množství je menší než minimální objednávka Množství
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +191,Account {0} is frozen,Účet {0} je zmrazen
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,"Právní subjekt / dceřiná společnost s oddělenou Graf účtů, které patří do organizace."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +29,"Food, Beverage & Tobacco","Potraviny, nápoje a tabák"
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","Potraviny, nápoje a tabák"
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +20,PL or BS,PL nebo BS
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,Can only make payment against unbilled {0},Možno vykonať len platbu proti nevyfakturované {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +531,Can only make payment against unbilled {0},Možno vykonať len platbu proti nevyfakturované {0}
 apps/erpnext/erpnext/controllers/selling_controller.py +122,Commission rate cannot be greater than 100,Rychlost Komise nemůže být větší než 100
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Minimum Inventory Level,Minimální úroveň zásob
 DocType: Stock Entry,Subcontract,Subdodávka
@@ -2343,19 +2264,18 @@
 DocType: Item,Manufacturer Part Number,Typové označení
 DocType: Production Order Operation,Estimated Time and Cost,Odhadovná doba a náklady
 DocType: Bin,Bin,Popelnice
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +50,Nosing,Zaoblená hrana
 DocType: SMS Log,No of Sent SMS,Počet odeslaných SMS
 DocType: Account,Company,Spoločnosť
 DocType: Account,Expense Account,Účtet nákladů
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +49,Software,Software
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +151,Colour,Farebné
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +49,Software,Software
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Colour,Farebné
 DocType: Maintenance Visit,Scheduled,Plánované
 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","Prosím, vyberte položku, kde &quot;Je skladom,&quot; je &quot;Nie&quot; a &quot;je Sales Item&quot; &quot;Áno&quot; a nie je tam žiadny iný produkt Bundle"
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,Vyberte měsíční výplatou na nerovnoměrně distribuovat cílů napříč měsíců.
 DocType: Purchase Invoice Item,Valuation Rate,Ocenění Rate
 apps/erpnext/erpnext/stock/get_item_details.py +281,Price List Currency not selected,Ceníková Měna není zvolena
 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,"Bod Row {0}: doklad o koupi, {1} neexistuje v tabulce ""kupní příjmy"""
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +134,Employee {0} has already applied for {1} between {2} and {3},Zaměstnanec {0} již požádal o {1} mezi {2} a {3}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +145,Employee {0} has already applied for {1} between {2} and {3},Zaměstnanec {0} již požádal o {1} mezi {2} a {3}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Datum zahájení projektu
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +8,Until,Dokud
 DocType: Rename Tool,Rename Log,Přejmenovat Přihlásit
@@ -2365,7 +2285,7 @@
 apps/erpnext/erpnext/controllers/recurring_document.py +162,Please select {0},"Prosím, vyberte {0}"
 DocType: C-Form,C-Form No,C-Form No
 DocType: BOM,Exploded_items,Exploded_items
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +95,Researcher,Výzkumník
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Researcher,Výzkumník
 apps/frappe/frappe/custom/doctype/customize_form/customize_form.js +88,Update,Aktualizovat
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +78,Please save the Newsletter before sending,Uložte Newsletter před odesláním
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +23,Name or Email is mandatory,Meno alebo e-mail je povinné
@@ -2374,11 +2294,10 @@
 DocType: Employee,Exit,Východ
 apps/erpnext/erpnext/accounts/doctype/account/account.py +134,Root Type is mandatory,Root Type je povinné
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +295,Serial No {0} created,Pořadové číslo {0} vytvořil
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +125,Vibratory finishing,Vibračné dokončovacie
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","Pro pohodlí zákazníků, tyto kódy mohou být použity v tiskových formátech, jako na fakturách a dodacích listech"
 DocType: Employee,You can enter any date manually,Můžete zadat datum ručně
 DocType: Sales Invoice,Advertisement,Reklama
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +165,Probationary Period,Skúšobná doba
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Probationary Period,Skúšobná doba
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Pouze koncové uzly jsou povoleny v transakci
 DocType: Expense Claim,Expense Approver,Schvalovatel výdajů
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,Doklad o koupi Item Dodávané
@@ -2386,19 +2305,16 @@
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +17,To Datetime,Chcete-li datetime
 DocType: SMS Settings,SMS Gateway URL,SMS brána URL
 apps/erpnext/erpnext/config/crm.py +53,Logs for maintaining sms delivery status,Protokoly pre udržanie stavu doručenia sms
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +137,Grinding,Brúsenie
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +34,Shrink wrapping,Zmenšiť balenia
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +36,Pending Activities,Nevybavené Aktivity
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,Confirmed,Potvrdené
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier > Supplier Type,Dodavatel> Dodavatel Type
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +127,Please enter relieving date.,Zadejte zmírnění datum.
 apps/erpnext/erpnext/controllers/trends.py +137,Amt,Amt
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' can be submitted,"Nechte pouze aplikace s status ""schváleno"" může být předloženy"
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +51,Only Leave Applications with status 'Approved' can be submitted,"Nechte pouze aplikace s status ""schváleno"" může být předloženy"
 apps/erpnext/erpnext/utilities/doctype/address/address.py +21,Address Title is mandatory.,Adresa Název je povinný.
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,"Zadejte název kampaně, pokud zdroj šetření je kampaň"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +38,Newspaper Publishers,Vydavatelé novin
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +38,Newspaper Publishers,Vydavatelé novin
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,Vyberte Fiskální rok
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +88,Smelting,Tavenie rudy
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Změna pořadí Level
 DocType: Attendance,Attendance Date,Účast Datum
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,Plat rozpad na základě Zisk a dedukce.
@@ -2413,16 +2329,15 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +414,[Error],[Chyba]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,"Ve slovech budou viditelné, jakmile uložíte prodejní objednávky."
 ,Employee Birthday,Narozeniny zaměstnance
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +55,Venture Capital,Venture Capital
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,Venture Capital
 DocType: UOM,Must be Whole Number,Musí být celé číslo
 DocType: Leave Control Panel,New Leaves Allocated (In Days),Nové Listy Přidělené (ve dnech)
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +51,Serial No {0} does not exist,Pořadové číslo {0} neexistuje
 DocType: Pricing Rule,Discount Percentage,Sleva v procentech
 DocType: Payment Reconciliation Invoice,Invoice Number,Číslo faktúry
-apps/erpnext/erpnext/hooks.py +70,Orders,Objednávky
+apps/erpnext/erpnext/hooks.py +54,Orders,Objednávky
 DocType: Leave Control Panel,Employee Type,Type zaměstnanců
 DocType: Employee Leave Approver,Leave Approver,Nechte schvalovač
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +70,Swaging,Zužovanie
 DocType: Manufacturing Settings,Material Transferred for Manufacture,Prevádza jadrový materiál pre Výroba
 DocType: Expense Claim,"A user with ""Expense Approver"" role","Uživatel s rolí ""Schvalovatel výdajů"""
 ,Issued Items Against Production Order,Vydané předmětů proti výrobní zakázky
@@ -2434,7 +2349,6 @@
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +62,Cost Center with existing transactions can not be converted to group,Nákladové středisko se stávajícími transakcemi nelze převést do skupiny
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Depreciation,Znehodnocení
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Dodavatel (é)
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +29,Invalid period,Neplatné obdobie
 DocType: Customer,Credit Limit,Úvěrový limit
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,Vyberte typ transakce
 DocType: GL Entry,Voucher No,Voucher No
@@ -2444,9 +2358,9 @@
 DocType: Customer,Address and Contact,Adresa a Kontakt
 DocType: Customer,Last Day of the Next Month,Posledný deň nasledujúceho mesiaca
 DocType: Employee,Feedback,Zpětná vazba
+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}","Dovolenka nemôže byť pridelené pred {0}, pretože rovnováha dovolenky už bolo carry-odovzdávané v budúcej pridelenie dovolenku záznamu {1}"
 apps/erpnext/erpnext/accounts/party.py +284,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Poznámka: Z důvodu / Referenční datum překračuje povolené zákazníků úvěrové dní od {0} den (s)
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +621,Maint. Schedule,Maint. Časový plán
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +108,Abrasive jet machining,Brúsne jet obrábanie
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +632,Maint. Schedule,Maint. Časový plán
 DocType: Stock Settings,Freeze Stock Entries,Freeze Stock Příspěvky
 DocType: Website Settings,Website Settings,Nastavení www stránky
 DocType: Item,Reorder level based on Warehouse,Úroveň Zmena poradia na základe Warehouse
@@ -2463,7 +2377,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +75,Show Stock Entries,Zobrazit Stock Příspěvky
 ,Is Primary Address,Je Hlavný adresa
 DocType: Production Order,Work-in-Progress Warehouse,Work-in-Progress sklad
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +308,Reference #{0} dated {1},Reference # {0} ze dne {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Reference #{0} dated {1},Reference # {0} ze dne {1}
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +13,Manage Addresses,Správa adries
 DocType: Pricing Rule,Item Code,Kód položky
 DocType: Production Planning Tool,Create Production Orders,Vytvoření výrobní zakázky
@@ -2472,7 +2386,7 @@
 DocType: Lead,Market Segment,Segment trhu
 DocType: Communication,Phone,Telefon
 DocType: Employee Internal Work History,Employee Internal Work History,Interní historie práce zaměstnance
-apps/erpnext/erpnext/public/js/account_tree_grid.js +50,Closing (Dr),Uzavření (Dr)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +221,Closing (Dr),Uzavření (Dr)
 DocType: Contact,Passive,Pasivní
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,Pořadové číslo {0} není skladem
 apps/erpnext/erpnext/config/selling.py +127,Tax template for selling transactions.,Daňové šablona na prodej transakce.
@@ -2488,8 +2402,8 @@
 ,Billed Amount,Fakturovaná částka
 DocType: Bank Reconciliation,Bank Reconciliation,Bank Odsouhlasení
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +9,Get Updates,Získať aktualizácie
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +129,Material Request {0} is cancelled or stopped,Materiál Request {0} je zrušena nebo zastavena
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +641,Add a few sample records,Pridať niekoľko ukážkových záznamov
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +133,Material Request {0} is cancelled or stopped,Materiál Request {0} je zrušena nebo zastavena
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Add a few sample records,Pridať niekoľko ukážkových záznamov
 apps/erpnext/erpnext/config/hr.py +210,Leave Management,Nechajte Správa
 DocType: Event,Groups,Skupiny
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,Seskupit podle účtu
@@ -2502,38 +2416,34 @@
 DocType: Features Setup,Sales Extras,Prodejní Extras
 apps/erpnext/erpnext/accounts/utils.py +344,{0} budget for Account {1} against Cost Center {2} will exceed by {3},{0} rozpočt na účet {1} proti nákladovému středisku {2} bude vyšší o {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +236,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Rozdiel účet musí byť typu aktív / Zodpovednosť účet, pretože to Reklamná Zmierenie je Entry Otvorenie"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +138,Purchase Order number required for Item {0},Číslo vydané objednávky je potřebné k položce {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Order number required for Item {0},Číslo vydané objednávky je potřebné k položce {0}
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',"""Dátum DO"" musí byť po ""Dátum OD"""
 ,Stock Projected Qty,Reklamní Plánovaná POČET
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +147,Customer {0} does not belong to project {1},Zákazník {0} nepatří k projektu {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +150,Customer {0} does not belong to project {1},Zákazník {0} nepatří k projektu {1}
 DocType: Sales Order,Customer's Purchase Order,Zákazníka Objednávka
 DocType: Warranty Claim,From Company,Od Společnosti
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,Hodnota nebo Množství
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Minute,Minuta
+apps/erpnext/erpnext/public/js/setup_wizard.js +363,Minute,Minuta
 DocType: Purchase Invoice,Purchase Taxes and Charges,Nákup Daně a poplatky
 ,Qty to Receive,Množství pro příjem
 DocType: Leave Block List,Leave Block List Allowed,Nechte Block List povolena
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +61,Conversion factor cannot be in fractions,Konverzní faktor nemůže být ve zlomcích
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +358,You will use it to Login,Budete ho používat k přihlášení
+apps/erpnext/erpnext/public/js/setup_wizard.js +108,You will use it to Login,Budete ho používat k přihlášení
 DocType: Sales Partner,Retailer,Maloobchodník
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +99,Credit To account must be a Balance Sheet account,Pripísať na účet musí byť účtu Súvaha
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,Všechny typy Dodavatele
 apps/erpnext/erpnext/stock/doctype/item/item.py +37,Item Code is mandatory because Item is not automatically numbered,"Kód položky je povinné, protože položka není automaticky číslovány"
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +99,Quotation {0} not of type {1},Ponuka {0} nie je typu {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +93,Quotation {0} not of type {1},Ponuka {0} nie je typu {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,Plán údržby Item
 DocType: Sales Order,%  Delivered,% Dodaných
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,Bank Overdraft Account,Kontokorentní úvěr na účtu
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +15,Make Salary Slip,Proveďte výplatní pásce
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +18,Browse BOM,Prechádzať BOM
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +175,Secured Loans,Zajištěné úvěry
-apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +3,Awesome Products,Skvělé produkty
+apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +3,Awesome Products,Skvělé produkty
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +189,Opening Balance Equity,Počiatočný stav Equity
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +80,Cannot approve leave as you are not authorized to approve leaves on Block Dates,Nelze schválit dovolenou si nejste oprávněna schvalovat listy na blok Termíny
 DocType: Appraisal,Appraisal,Ocenění
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +13,Lost-foam casting,Lost-pena liatie
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +47,Drawing,Výkres
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +22,Date is repeated,Datum se opakuje
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +148,Leave approver must be one of {0},Nechte Schvalující musí být jedním z {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +162,Leave approver must be one of {0},Nechte Schvalující musí být jedním z {0}
 DocType: Hub Settings,Seller Email,Prodávající E-mail
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Celkové obstarávacie náklady (cez nákupné faktúry)
 DocType: Workstation Working Hour,Start Time,Start Time
@@ -2547,7 +2457,7 @@
 DocType: Purchase Invoice Item,Net Amount (Company Currency),Čistá suma (Company Mena)
 DocType: BOM Operation,Hour Rate,Hodinová sadzba
 DocType: Stock Settings,Item Naming By,Položka Pojmenování By
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +642,From Quotation,Z ponuky
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +655,From Quotation,Z ponuky
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},Další období Uzávěrka Entry {0} byla podána po {1}
 DocType: Production Order,Material Transferred for Manufacturing,Materiál Prenesená pre výrobu
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +29,Account {0} does not exists,Účet {0} neexistuje
@@ -2561,21 +2471,19 @@
 DocType: Purchase Invoice Item,PR Detail,PR Detail
 DocType: Sales Order,Fully Billed,Plně Fakturovaný
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +20,Cash In Hand,Pokladní hotovost
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +72,Delivery warehouse required for stock item {0},Dodávka sklad potrebný pre živočíšnu položku {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +119,Delivery warehouse required for stock item {0},Dodávka sklad potrebný pre živočíšnu položku {0}
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),Celková hmotnost balení. Obvykle se čistá hmotnost + obalového materiálu hmotnosti. (Pro tisk)
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Uživatelé s touto rolí se mohou nastavit na zmrazené účty a vytvořit / upravit účetní zápisy proti zmrazených účtů
 DocType: Serial No,Is Cancelled,Je zrušené
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +281,My Shipments,Moje dodávky
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +286,My Shipments,Moje dodávky
 DocType: Journal Entry,Bill Date,Bill Datum
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +43,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","I když existuje více pravidla pro tvorbu cen s nejvyšší prioritou, pak následující interní priority jsou použity:"
 DocType: Supplier,Supplier Details,Dodavatele Podrobnosti
 DocType: Communication,Recipients,Příjemci
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +146,Screwing,Skrutkovanie
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +96,Knurling,Vrúbkovanie
 DocType: Expense Claim,Approval Status,Stav schválení
 DocType: Hub Settings,Publish Items to Hub,Publikování položky do Hub
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +44,From value must be less than to value in row {0},Z hodnota musí být menší než hodnota v řadě {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +133,Wire Transfer,Bankovní převod
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +133,Wire Transfer,Bankovní převod
 apps/erpnext/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py +25,Please select Bank Account,"Prosím, vyberte bankovní účet"
 DocType: Newsletter,Create and Send Newsletters,Vytvoření a odeslání Zpravodaje
 apps/frappe/frappe/public/js/frappe/views/reports/grid_report.js +305,From Date must be before To Date,Datum od musí být dříve než datum do
@@ -2583,14 +2491,14 @@
 DocType: Company,Default Income Account,Účet Default příjmů
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,Zákazník Group / Customer
 DocType: Item Group,Check this if you want to show in website,"Zaškrtněte, pokud chcete zobrazit v webové stránky"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +190,Welcome to ERPNext,Vitajte v ERPNext
+,Welcome to ERPNext,Vitajte v ERPNext
 DocType: Payment Reconciliation Payment,Voucher Detail Number,Voucher Detail Počet
 apps/erpnext/erpnext/config/crm.py +146,Lead to Quotation,Obchodná iniciatíva na Ponuku
 DocType: Lead,From Customer,Od Zákazníka
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +37,Calls,Volá
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Calls,Volá
 DocType: Project,Total Costing Amount (via Time Logs),Celková kalkulácie Čiastka (cez Time Záznamy)
 DocType: Purchase Order Item Supplied,Stock UOM,Skladová MJ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Purchase Order {0} is not submitted,Vydaná objednávka {0} není odeslána
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +194,Purchase Order {0} is not submitted,Vydaná objednávka {0} není odeslána
 ,Projected,Plánovaná
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},Pořadové číslo {0} nepatří do skladu {1}
 apps/erpnext/erpnext/controllers/status_updater.py +136,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Poznámka: Systém nebude kontrolovat přes dobírku a over-rezervace pro item {0} jako množství nebo částka je 0
@@ -2598,7 +2506,6 @@
 DocType: Issue,Opening Date,Datum otevření
 DocType: Journal Entry,Remark,Poznámka
 DocType: Purchase Receipt Item,Rate and Amount,Sadzba a množstvo
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +95,Boring,Nudný
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +667,From Sales Order,Z přijaté objednávky
 DocType: Blog Category,Parent Website Route,nadřazená cesta internetové stránky
 DocType: Sales Order,Not Billed,Ne Účtovaný
@@ -2612,19 +2519,17 @@
 apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount Amount,Částka slevy
 DocType: Purchase Invoice,Return Against Purchase Invoice,Návrat proti nákupnej faktúry
 DocType: Item,Warranty Period (in days),Záruční doba (ve dnech)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +550,e.g. VAT,napríklad DPH
+apps/erpnext/erpnext/public/js/setup_wizard.js +292,e.g. VAT,napríklad DPH
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,Bod 4
 DocType: Journal Entry Account,Journal Entry Account,Zápis do deníku Účet
 DocType: Shopping Cart Settings,Quotation Series,Číselná rada ponúk
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +52,"An item exists with same name ({0}), please change the item group name or rename the item","Položka existuje se stejným názvem ({0}), prosím, změnit název skupiny položky nebo přejmenovat položku"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +82,Hot metal gas forming,Tvárnenie Hot metal plyn
 DocType: Sales Order Item,Sales Order Date,Prodejní objednávky Datum
 DocType: Sales Invoice Item,Delivered Qty,Dodává Množství
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +63,Warehouse {0}: Company is mandatory,Sklad {0}: Společnost je povinná
 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.",Prejdite na príslušnej skupiny (zvyčajne zdrojom finančných prostriedkov&gt; krátkodobých záväzkov&gt; daní a poplatkov a vytvoriť nový účet (kliknutím na Pridať dieťa) typu &quot;dane&quot; a to nehovorím o daňovú sadzbu.
 ,Payment Period Based On Invoice Date,Platební období na základě data vystavení faktury
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +50,Missing Currency Exchange Rates for {0},Chybí Směnárna Kurzy pro {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +135,Laser cutting,Laserové rezanie
 DocType: Event,Monday,Pondělí
 DocType: Journal Entry,Stock Entry,Reklamní Entry
 DocType: Account,Payable,Splatný
@@ -2657,7 +2562,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +111,Date Of Retirement must be greater than Date of Joining,"Datum odchodu do důchodu, musí být větší než Datum spojování"
 DocType: Sales Invoice,Against Income Account,Proti účet příjmů
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +69,{0}% Delivered,{0}% vyhlásené
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +78,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Položka {0}: Objednané množstvo {1} nemôže byť nižšia ako minimálna Objednané množstvo {2} (definovanej v bode).
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Položka {0}: Objednané množstvo {1} nemôže byť nižšia ako minimálna Objednané množstvo {2} (definovanej v bode).
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Měsíční Distribution Procento
 DocType: Territory,Territory Targets,Území Cíle
 DocType: Delivery Note,Transporter Info,Transporter Info
@@ -2666,7 +2571,6 @@
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,"Tituly na tiskových šablon, např zálohové faktury."
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +140,Valuation type charges can not marked as Inclusive,Poplatky typu ocenenie môže nie je označený ako Inclusive
 DocType: POS Profile,Update Stock,Aktualizace skladem
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +128,Superfinishing,Načisto
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,"Různé UOM položky povede k nesprávné (celkem) Čistá hmotnost hodnoty. Ujistěte se, že čistá hmotnost každé položky je ve stejném nerozpuštěných."
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM Rate
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +85,Please pull items from Delivery Note,"Prosím, vytáhněte položky z dodací list"
@@ -2681,7 +2585,6 @@
 ,Purchase Analytics,Nákup Analytika
 DocType: Sales Invoice Item,Delivery Note Item,Delivery Note Item
 DocType: Expense Claim,Task,Úkol
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +57,Shaving,Holenie
 DocType: Purchase Taxes and Charges,Reference Row #,Referenční Row #
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},Číslo šarže je povinné pro položku {0}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js +14,This is a root sales person and cannot be edited.,To je kořen prodejní člověk a nelze upravovat.
@@ -2693,13 +2596,11 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +74,Purpose must be one of {0},Cíl musí být jedním z {0}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +108,Fill the form and save it,Vyplňte formulář a uložte jej
 DocType: Production Planning Tool,Download a report containing all raw materials with their latest inventory status,"Stáhněte si zprávu, která obsahuje všechny suroviny s jejich aktuální stav zásob"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +94,Facing,Obloženie
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,Forum Community
 DocType: Leave Application,Leave Balance Before Application,Nechte zůstatek před aplikací
 DocType: SMS Center,Send SMS,Pošlete SMS
 DocType: Company,Default Letter Head,Výchozí hlavičkový
 DocType: Time Log,Billable,Zúčtovatelná
-DocType: Authorization Rule,This will be used for setting rule in HR module,Tato adresa bude použita pro nastavení pravidlo HR modul
 DocType: Account,Rate at which this tax is applied,"Rychlost, při které se používá tato daň"
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reorder Qty,Změna pořadí Množství
 DocType: Company,Stock Adjustment Account,Reklamní Nastavení účtu
@@ -2726,16 +2627,15 @@
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,Podíl alokace by měla být ve výši 100%
 DocType: Serial No,Out of AMC,Out of AMC
 DocType: Purchase Order Item,Material Request Detail No,Materiál Poptávka Detail No
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +97,Hard turning,Hard sústruženie
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +33,Make Maintenance Visit,Proveďte návštěv údržby
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +187,Please contact to the user who have Sales Master Manager {0} role,"Prosím, kontaktujte pro uživatele, kteří mají obchodní manažer ve skupině Master {0} roli"
 DocType: Company,Default Cash Account,Výchozí Peněžní účet
 apps/erpnext/erpnext/config/accounts.py +79,Company (not Customer or Supplier) master.,Company (nikoliv zákazník nebo dodavatel) master.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +106,Please enter 'Expected Delivery Date',"Prosím, zadejte ""Očekávaná Datum dodání"""
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +187,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Dodací listy {0} musí být zrušena před zrušením této prodejní objednávky
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +100,Please enter 'Expected Delivery Date',"Prosím, zadejte ""Očekávaná Datum dodání"""
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +182,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Dodací listy {0} musí být zrušena před zrušením této prodejní objednávky
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +373,Paid amount + Write Off Amount can not be greater than Grand Total,Placená částka + odepsat Částka nesmí být větší než Grand Total
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} není platná Šarže pro Položku {1}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,Note: There is not enough leave balance for Leave Type {0},Poznámka: Není k dispozici dostatek zůstatek dovolené dovolená za kalendářní typ {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +124,Note: There is not enough leave balance for Leave Type {0},Poznámka: Není k dispozici dostatek zůstatek dovolené dovolená za kalendářní typ {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.","Poznámka: Není-li platba provedena proti jakémukoli rozhodnutí, jak položka deníku ručně."
 DocType: Item,Supplier Items,Dodavatele položky
 DocType: Opportunity,Opportunity Type,Typ Příležitosti
@@ -2747,7 +2647,7 @@
 DocType: Hub Settings,Publish Availability,Publikování Dostupnost
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +105,Date of Birth cannot be greater than today.,Dátum narodenia nemôže byť väčšia ako dnes.
 ,Stock Ageing,Reklamní Stárnutí
-apps/erpnext/erpnext/controllers/accounts_controller.py +200,{0} '{1}' is disabled, {0} '{1}' je zakázána
+apps/erpnext/erpnext/controllers/accounts_controller.py +201,{0} '{1}' is disabled, {0} '{1}' je zakázána
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Nastaviť ako Otvoriť
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Posílat automatické e-maily na Kontakty na předložení transakcí.
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +232,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
@@ -2757,44 +2657,38 @@
 DocType: Purchase Order,Customer Contact Email,Zákazník Kontaktný e-mail
 DocType: Event,Sunday,Neděle
 DocType: Sales Team,Contribution (%),Příspěvek (%)
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +455,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,"Poznámka: Položka Platba nebude vytvořili, protože ""v hotovosti nebo bankovním účtu"" nebyl zadán"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +171,Responsibilities,Zodpovednosť
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +457,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,"Poznámka: Položka Platba nebude vytvořili, protože ""v hotovosti nebo bankovním účtu"" nebyl zadán"
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +171,Responsibilities,Zodpovednosť
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Template,Šablona
 DocType: Sales Person,Sales Person Name,Prodej Osoba Name
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,Zadejte prosím aspoň 1 fakturu v tabulce
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +511,Add Users,Pridať užívateľa
+apps/erpnext/erpnext/public/js/setup_wizard.js +255,Add Users,Pridať užívateľa
 DocType: Pricing Rule,Item Group,Položka Group
 DocType: Task,Actual Start Date (via Time Logs),Skutočný dátum Start (cez Time Záznamy)
 DocType: Stock Reconciliation Item,Before reconciliation,Pred zmierenie
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +12,To {0},Chcete-li {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Daně a poplatky Přidal (Company měna)
-apps/erpnext/erpnext/stock/doctype/item/item.py +340,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,"Položka Tax Row {0} musí mít účet typu daní či výnosů nebo nákladů, nebo Vyměřovací"
+apps/erpnext/erpnext/stock/doctype/item/item.py +344,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,"Položka Tax Row {0} musí mít účet typu daní či výnosů nebo nákladů, nebo Vyměřovací"
 DocType: Sales Order,Partly Billed,Částečně Účtovaný
 DocType: Item,Default BOM,Výchozí BOM
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +79,Decambering,Decambering
 apps/erpnext/erpnext/setup/doctype/company/company.js +22,Please re-type company name to confirm,Prosím re-typ názov spoločnosti na potvrdenie
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,Celkem Vynikající Amt
 DocType: Time Log Batch,Total Hours,Celkem hodin
 DocType: Journal Entry,Printing Settings,Nastavenie tlače
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +268,Total Debit must be equal to Total Credit. The difference is {0},Celkové inkaso musí rovnat do celkového kreditu. Rozdíl je {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +11,Automotive,Automobilový
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +37,Item is required,Položka je povinná
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +25,Metal injection molding,Kovové vstrekovanie
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +258,Total Debit must be equal to Total Credit. The difference is {0},Celkové inkaso musí rovnat do celkového kreditu. Rozdíl je {0}
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,Automobilový
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +684,From Delivery Note,Z Dodacího Listu
 DocType: Time Log,From Time,Času od
 DocType: Notification Control,Custom Message,Custom Message
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +33,Investment Banking,Investiční bankovnictví
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +261,"Select your Country, Time Zone and Currency","Vyberte svou zemi, časové pásmo a měnu"
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,Investiční bankovnictví
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +316,"Select your Country, Time Zone and Currency","Vyberte svou zemi, časové pásmo a měnu"
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +369,Cash or Bank Account is mandatory for making payment entry,V hotovosti nebo bankovním účtu je povinný pro výrobu zadání platebního
 DocType: Purchase Invoice,Price List Exchange Rate,Katalogová cena Exchange Rate
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +91,Pickling,Morenie
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +18,Sand casting,Liatia do piesku
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +117,Electroplating,Electroplating
 DocType: Purchase Invoice Item,Rate,Sadzba
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +62,Intern,Internovat
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Intern,Internovat
 DocType: Newsletter,A Lead with this email id should exist,Obchodná iniciatíva s touto emailovou adresou by už mala existovať
 DocType: Stock Entry,From BOM,Od BOM
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +34,Basic,Základní
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +34,Basic,Základní
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,Fotky transakce před {0} jsou zmrazeny
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +217,Please click on 'Generate Schedule',"Prosím, klikněte na ""Generovat Schedule"""
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +61,To Date should be same as From Date for Half Day leave,Chcete-li data by měla být stejná jako u Datum od půl dne volno
@@ -2802,11 +2696,11 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +96,Reference No is mandatory if you entered Reference Date,"Referenční číslo je povinné, pokud jste zadali k rozhodnému dni"
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +108,Date of Joining must be greater than Date of Birth,Datum přistoupení musí být větší než Datum narození
 DocType: Salary Structure,Salary Structure,Plat struktura
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +242,"Multiple Price Rule exists with same criteria, please resolve \
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +246,"Multiple Price Rule exists with same criteria, please resolve \
 			conflict by assigning priority. Price Rules: {0}","Multiple Cena existuje pravidlo se stejnými kritérii, prosím vyřešit \
  konflikt přiřazením prioritu. Cena Pravidla: {0}"
 DocType: Account,Bank,Banka
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +9,Airline,Letecká linka
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,Letecká linka
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +493,Issue Material,Vydání Material
 DocType: Material Request Item,For Warehouse,Pro Sklad
 DocType: Employee,Offer Date,Dátum Ponuky
@@ -2816,29 +2710,24 @@
 DocType: Item,Is Fixed Asset Item,Je dlouhodobého majetku Item
 DocType: Stock Entry,Including items for sub assemblies,Vrátane položiek pre montážnych podskupín
 DocType: Features Setup,"If you have long print formats, this feature can be used to split the page to be printed on multiple pages with all headers and footers on each page","Máte-li dlouhé formáty tisku, tato funkce může být použita k rozdělení stránku se bude tisknout na více stránek se všemi záhlaví a zápatí na každé straně"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +131,Hobbing,Odvalovacie
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +98,All Territories,Všechny území
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +98,All Territories,Všechny území
 DocType: Purchase Invoice,Items,Položky
 DocType: Fiscal Year,Year Name,Meno roku
 DocType: Process Payroll,Process Payroll,Proces Payroll
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +59,There are more holidays than working days this month.,Existují další svátky než pracovních dnů tento měsíc.
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +68,There are more holidays than working days this month.,Existují další svátky než pracovních dnů tento měsíc.
 DocType: Product Bundle Item,Product Bundle Item,Product Bundle Item
 DocType: Sales Partner,Sales Partner Name,Sales Partner Name
 DocType: Purchase Invoice Item,Image View,Image View
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +113,Finishing & industrial finishing,Povrchová úprava a priemyselného spracovania
 DocType: Issue,Opening Time,Otevírací doba
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,Data OD a DO jsou vyžadována
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +46,Securities & Commodity Exchanges,Cenné papíry a komoditních burzách
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Cenné papíry a komoditních burzách
 DocType: Shipping Rule,Calculate Based On,Vypočítat založené na
 DocType: Delivery Note Item,From Warehouse,Zo skladu
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +98,Drilling,Vŕtanie
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +28,Blow molding,Vyfukovanie
 DocType: Purchase Taxes and Charges,Valuation and Total,Oceňování a Total
 DocType: Tax Rule,Shipping City,Prepravné City
 apps/erpnext/erpnext/stock/doctype/item/item.js +43,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,"Tento bod je varianta {0} (šablony). Atributy budou zkopírovány z šablony, pokud je nastaveno ""No Copy"""
 DocType: Account,Purchase User,Nákup Uživatel
 DocType: Notification Control,Customize the Notification,Přizpůsobit oznámení
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +87,Hammering,Vyklepaní
 DocType: Web Page,Slideshow,Promítání obrázků
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +24,Default Address Template cannot be deleted,Výchozí šablony adresy nemůže být smazán
 DocType: Sales Invoice,Shipping Rule,Přepravní Pravidlo
@@ -2847,9 +2736,8 @@
 DocType: Workflow State,Search,Hledat
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +54,Total cannot be zero,Celkem nemůže být nula
 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,"""Dny od posledního Objednávky"" musí být větší nebo rovny nule"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +142,Brazing,Spájkovanie
 DocType: C-Form,Amended From,Platném znění
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Raw Material,Surovina
+apps/erpnext/erpnext/public/js/setup_wizard.js +359,Raw Material,Surovina
 DocType: Leave Application,Follow via Email,Sledovat e-mailem
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Částka daně po slevě Částka
 apps/erpnext/erpnext/accounts/doctype/account/account.py +174,Child account exists for this account. You can not delete this account.,Dětské konto existuje pro tento účet. Nemůžete smazat tento účet.
@@ -2863,10 +2751,10 @@
 ,Produced,Produkoval
 DocType: Item,Item Code for Suppliers,Položka Kód pre dodávateľa
 DocType: Issue,Raised By (Email),Vznesené (e-mail)
-apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +72,General,Všeobecný
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +495,Attach Letterhead,Pripojiť Hlavičku
+apps/erpnext/erpnext/setup/setup_wizard/default_website.py +72,General,Všeobecný
+apps/erpnext/erpnext/public/js/setup_wizard.js +241,Attach Letterhead,Pripojiť Hlavičku
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +272,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',"Nelze odečíst, pokud kategorie je určena pro ""ocenění"" nebo ""oceňování a celkový"""
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +542,"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.","Vypíšte vaše používané dane (napr DPH, Clo atď; mali by mať jedinečné názvy) a ich štandardné sadzby. Týmto sa vytvorí štandardná šablóna, ktorú môžete upraviť a pridať ďalšie neskôr."
+apps/erpnext/erpnext/public/js/setup_wizard.js +284,"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.","Vypíšte vaše používané dane (napr DPH, Clo atď; mali by mať jedinečné názvy) a ich štandardné sadzby. Týmto sa vytvorí štandardná šablóna, ktorú môžete upraviť a pridať ďalšie neskôr."
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial Nos Required for Serialized Item {0},Serial Nos Požadováno pro serializovaném bodu {0}
 DocType: Journal Entry,Bank Entry,Bank Entry
 DocType: Authorization Rule,Applicable To (Designation),Vztahující se na (označení)
@@ -2875,33 +2763,32 @@
 apps/erpnext/erpnext/config/accounts.py +143,Enable / disable currencies.,Povolit / zakázat měny.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Postal Expenses,Poštovní náklady
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Total (Amt)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +26,Entertainment & Leisure,Entertainment & Leisure
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,Entertainment & Leisure
 DocType: Purchase Order,The date on which recurring order will be stop,"Datum, ke kterému se opakující objednávka bude zastaví"
 DocType: Quality Inspection,Item Serial No,Položka Výrobní číslo
 apps/erpnext/erpnext/controllers/status_updater.py +142,{0} must be reduced by {1} or you should increase overflow tolerance,{0} musí být sníženy o {1} nebo byste měli zvýšit toleranci přesahu
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Present,Celkem Present
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Hour,Hodina
+apps/erpnext/erpnext/public/js/setup_wizard.js +363,Hour,Hodina
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +138,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation","Serialized Položka {0} nelze aktualizovat \
  pomocí Reklamní Odsouhlasení"
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +488,Transfer Material to Supplier,Preneste materiál Dodávateľovi
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +513,Transfer Material to Supplier,Preneste materiál Dodávateľovi
 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,"New Pořadové číslo nemůže mít Warehouse. Warehouse musí být nastaveny Stock vstupním nebo doklad o koupi,"
 DocType: Lead,Lead Type,Lead Type
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +82,Create Quotation,Vytvoriť Ponuku
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +306,All these items have already been invoiced,Všechny tyto položky již byly fakturovány
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,You are not authorized to approve leaves on Block Dates,Nie ste oprávnení schvaľovať lístie na bloku Termíny
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +311,All these items have already been invoiced,Všechny tyto položky již byly fakturovány
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},Může být schválena {0}
 DocType: Shipping Rule,Shipping Rule Conditions,Přepravní Článek Podmínky
 DocType: BOM Replace Tool,The new BOM after replacement,Nový BOM po výměně
 DocType: Features Setup,Point of Sale,Místo Prodeje
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +83,Curling,Metaná
 DocType: Account,Tax,Daň
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +28,Row {0}: {1} is not a valid {2},Řádek {0}: {1} není platný {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +89,Refining,Rafinácia
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +37,Row {0}: {1} is not a valid {2},Řádek {0}: {1} není platný {2}
 DocType: Production Planning Tool,Production Planning Tool,Plánování výroby Tool
 DocType: Quality Inspection,Report Date,Datum Reportu
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +130,Routing,Smerovanie
 DocType: C-Form,Invoices,Faktúry
 DocType: Job Opening,Job Title,Název pozice
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +54,{0} already allocated for Employee {1} for period {2} - {3},{0} už pridelené pre zamestnancov {1} na dobu {2} - {3}
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +80,{0} Recipients,{0} příjemci
 DocType: Features Setup,Item Groups in Details,Položka skupiny v detailech
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +335,Quantity to Manufacture must be greater than 0.,"Množstvo, ktoré má výroba musí byť väčšia ako 0 ° C."
@@ -2919,14 +2806,13 @@
 DocType: DocType,Setup,Nastavenie
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,Není nic upravovat.
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +108,Summary for this month and pending activities,Zhrnutie pre tento mesiac a prebiehajúcim činnostiam
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +39,Cold rolling,Valcovanie za studena
 DocType: Customer Group,Customer Group Name,Zákazník Group Name
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +408,Please remove this Invoice {0} from C-Form {1},Odeberte Tato faktura {0} z C-Form {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +410,Please remove this Invoice {0} from C-Form {1},Odeberte Tato faktura {0} z C-Form {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,"Prosím, vyberte převádět pokud chcete také zahrnout uplynulý fiskální rok bilance listy tohoto fiskálního roku"
 DocType: GL Entry,Against Voucher Type,Proti poukazu typu
 DocType: Item,Attributes,Atribúty
 DocType: Packing Slip,Get Items,Získat položky
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +186,Please enter Write Off Account,"Prosím, zadejte odepsat účet"
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +187,Please enter Write Off Account,"Prosím, zadejte odepsat účet"
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +71,Last Order Date,Posledná Dátum objednávky
 DocType: DocField,Image,Obrázok
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +179,Make Excise Invoice,Proveďte Spotřební faktury
@@ -2936,7 +2822,7 @@
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +146,Operation ID not set,Prevádzka ID nie je nastavené
 DocType: Production Order,Planned Start Date,Plánované datum zahájení
 DocType: Serial No,Creation Document Type,Tvorba Typ dokumentu
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +620,Maint. Visit,Maint. Návšteva
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +631,Maint. Visit,Maint. Návšteva
 DocType: Leave Type,Is Encash,Je inkasovat
 DocType: Purchase Invoice,Mobile No,Mobile No
 DocType: Payment Tool,Make Journal Entry,Proveďte položka deníku
@@ -2944,35 +2830,31 @@
 apps/erpnext/erpnext/controllers/trends.py +257,Project-wise data is not available for Quotation,Data dle projektu nejsou k dispozici pro nabídku
 DocType: Project,Expected End Date,Očekávané datum ukončení
 DocType: Appraisal Template,Appraisal Template Title,Posouzení Template Název
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +440,Commercial,Obchodní
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +378,Commercial,Obchodní
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +23,Parent Item {0} must not be a Stock Item,Parent Item {0} nesmie byť skladom
 DocType: Cost Center,Distribution Id,Distribuce Id
-apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +14,Awesome Services,Skvělé služby
+apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +14,Awesome Services,Skvělé služby
 apps/erpnext/erpnext/config/manufacturing.py +29,All Products or Services.,Všechny výrobky nebo služby.
 DocType: Purchase Invoice,Supplier Address,Dodavatel Address
 DocType: Contact Us Settings,Address Line 2,Adresní řádek 2
 DocType: ToDo,Reference,reference
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +59,Perforating,Perforující
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,Out Množství
 apps/erpnext/erpnext/config/accounts.py +128,Rules to calculate shipping amount for a sale,Pravidla pro výpočet výše přepravní na prodej
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +29,Series is mandatory,Série je povinné
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +28,Financial Services,Finanční služby
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,Finanční služby
 apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3},Pomer atribút {0} musí byť v rozmedzí od {1} až {2} v krokoch po {3}
 DocType: Tax Rule,Sales,Prodej
 DocType: Stock Entry Detail,Basic Amount,Základná čiastka
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +173,Warehouse required for stock Item {0},Sklad je vyžadován pro skladovou položku {0}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +178,Warehouse required for stock Item {0},Sklad je vyžadován pro skladovou položku {0}
 DocType: Leave Allocation,Unused leaves,Nepoužité listy
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,Cr
 DocType: Customer,Default Receivable Accounts,Výchozí pohledávka účty
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +102,Sawing,Rezanie
 DocType: Tax Rule,Billing State,Fakturácia State
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +32,Laminating,Laminovanie
 DocType: Item Reorder,Transfer,Převod
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +549,Fetch exploded BOM (including sub-assemblies),Fetch explodovala kusovníku (včetně montážních podskupin)
 DocType: Authorization Rule,Applicable To (Employee),Vztahující se na (Employee)
 apps/erpnext/erpnext/controllers/accounts_controller.py +101,Due Date is mandatory,Dátum splatnosti je povinné
 apps/erpnext/erpnext/controllers/item_variant.py +51,Increment for Attribute {0} cannot be 0,Prírastok pre atribút {0} nemôže byť 0
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +143,Sintering,Spekaniu
 DocType: Journal Entry,Pay To / Recd From,Platit K / Recd Z
 DocType: Naming Series,Setup Series,Řada Setup
 DocType: Supplier,Contact HTML,Kontakt HTML
@@ -2985,7 +2867,6 @@
 DocType: Attendance,Absent,Nepřítomný
 DocType: Product Bundle,Product Bundle,Bundle Product
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +180,Row {0}: Invalid reference {1},Riadok {0}: Neplatné referencie {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +165,Crushing,Zdrvujúcu
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Kúpte Dane a poplatky šablóny
 DocType: Upload Attendance,Download Template,Stáhnout šablonu
 DocType: GL Entry,Remarks,Poznámky
@@ -2993,14 +2874,12 @@
 DocType: Journal Entry,Write Off Based On,Odepsat založené na
 DocType: Features Setup,POS View,Zobrazení POS
 apps/erpnext/erpnext/config/stock.py +38,Installation record for a Serial No.,Instalace rekord pro sériové číslo
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +9,Continuous casting,Kontinuálne liatie
 apps/erpnext/erpnext/public/js/queries.js +39,Please specify a,Uveďte prosím
 DocType: Offer Letter,Awaiting Response,Čaká odpoveď
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +53,Above,Vyššie
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +80,Cold sizing,Cold veľkosti
 DocType: Salary Slip,Earning & Deduction,Výdělek a dedukce
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +76,Account {0} cannot be a Group,Účet {0} nemůže být skupina
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +259,Region,Kraj
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +314,Region,Kraj
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +213,Optional. This setting will be used to filter in various transactions.,Volitelné. Toto nastavení bude použito k filtrování v různých transakcí.
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +104,Negative Valuation Rate is not allowed,Negativní ocenění Rate není povoleno
 DocType: Holiday List,Weekly Off,Týdenní Off
@@ -3018,7 +2897,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,Account {0} is inactive,Účet {0} je neaktivní
 DocType: GL Entry,Is Advance,Je Zálohová
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,Účast Datum od a docházky do dnešního dne je povinná
-apps/erpnext/erpnext/controllers/buying_controller.py +131,Please enter 'Is Subcontracted' as Yes or No,"Prosím, zadejte ""subdodavatelům"" jako Ano nebo Ne"
+apps/erpnext/erpnext/controllers/buying_controller.py +122,Please enter 'Is Subcontracted' as Yes or No,"Prosím, zadejte ""subdodavatelům"" jako Ano nebo Ne"
 DocType: Sales Team,Contact No.,Kontakt Číslo
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,'Profit and Loss' type account {0} not allowed in Opening Entry,"""Výkaz zisku a ztráty"" typ účtu {0} není povoleno pro Vstupní Údaj"
 DocType: Workflow State,Time,Čas
@@ -3027,14 +2906,13 @@
 DocType: Authorization Rule,Authorization Rule,Autorizační pravidlo
 DocType: Sales Invoice,Terms and Conditions Details,Podmínky podrobnosti
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,Predaj Dane a poplatky šablóny
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +10,Apparel & Accessories,Oblečení a doplňky
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,Oblečení a doplňky
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +67,Number of Order,Číslo objednávky
 DocType: Item Group,HTML / Banner that will show on the top of product list.,"HTML / Banner, které se zobrazí na první místo v seznamu výrobků."
 DocType: Shipping Rule,Specify conditions to calculate shipping amount,Stanovení podmínek pro vypočítat výši poštovného
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +121,Add Child,Přidat dítě
 DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,Role povoleno nastavit zmrazené účty a upravit Mražené Příspěvky
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +52,Cannot convert Cost Center to ledger as it has child nodes,"Nelze převést nákladového střediska na knihy, protože má podřízené uzly"
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +47,Conversion Factor is required,Je nutná konverzní faktor
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +37,Serial #,Serial #
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +87,Commission on Sales,Provize z prodeje
 DocType: Offer Letter Term,Value / Description,Hodnota / Popis
@@ -3042,10 +2920,8 @@
 ,Customers Not Buying Since Long Time,Zákazníci nekupujete Po dlouhou dobu
 DocType: Production Order,Expected Delivery Date,Očekávané datum dodání
 apps/erpnext/erpnext/accounts/general_ledger.py +121,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Debetné a kreditné nerovná za {0} # {1}. Rozdiel je v tom {2}.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +48,Bulging,Vydutý
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +11,Evaporative-pattern casting,Liatie Evaporative-pattern
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Entertainment Expenses,Výdaje na reprezentaci
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +195,Sales Invoice {0} must be cancelled before cancelling this Sales Order,Prodejní faktury {0} musí být zrušena před zrušením této prodejní objednávky
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +190,Sales Invoice {0} must be cancelled before cancelling this Sales Order,Prodejní faktury {0} musí být zrušena před zrušením této prodejní objednávky
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +61,Age,Věk
 DocType: Time Log,Billing Amount,Fakturácia Suma
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +84,Invalid quantity specified for item {0}. Quantity should be greater than 0.,Neplatný množství uvedené na položku {0}. Množství by mělo být větší než 0.
@@ -3064,26 +2940,24 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,Nový zákazník Příjmy
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Travel Expenses,Cestovní výdaje
 DocType: Maintenance Visit,Breakdown,Rozbor
-apps/erpnext/erpnext/controllers/accounts_controller.py +241,Account: {0} with currency: {1} can not be selected,Účet: {0} s menou: {1} nemožno vybrať
+apps/erpnext/erpnext/controllers/accounts_controller.py +242,Account: {0} with currency: {1} can not be selected,Účet: {0} s menou: {1} nemožno vybrať
 DocType: Bank Reconciliation Detail,Cheque Date,Šek Datum
 apps/erpnext/erpnext/accounts/doctype/account/account.py +47,Account {0}: Parent account {1} does not belong to company: {2},Účet {0}: Nadřazený účet {1} nepatří ke společnosti: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted all transactions related to this company!,Úspešne vypúšťa všetky transakcie súvisiace s týmto spoločnosti!
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,Rovnako ako u Date
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +111,Honing,Honovanie
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +58,Probation,Zkouška
-apps/erpnext/erpnext/stock/doctype/item/item.py +264,Default Warehouse is mandatory for stock Item.,Výchozí Sklad je povinný pro živočišnou položky.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Probation,Zkouška
+apps/erpnext/erpnext/stock/doctype/item/item.py +268,Default Warehouse is mandatory for stock Item.,Výchozí Sklad je povinný pro živočišnou položky.
 DocType: Feed,Full Name,Celé jméno/název
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +148,Clinching,Clinching
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +191,Payment of salary for the month {0} and year {1},Platba platu za měsíc {0} a rok {1}
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +173,Payment of salary for the month {0} and year {1},Platba platu za měsíc {0} a rok {1}
 DocType: Stock Settings,Auto insert Price List rate if missing,"Auto vložka Cenník miera, ak chýba"
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,Celkem uhrazené částky
 ,Transferred Qty,Přenesená Množství
 apps/erpnext/erpnext/config/learn.py +11,Navigating,Navigácia
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +137,Planning,Plánování
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +137,Planning,Plánování
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +9,Make Time Log Batch,Udělejte si čas Log Batch
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Issued,Vydané
 DocType: Project,Total Billing Amount (via Time Logs),Celkom Billing Suma (cez Time Záznamy)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +629,We sell this Item,Táto položka je na predaj
+apps/erpnext/erpnext/public/js/setup_wizard.js +365,We sell this Item,Táto položka je na predaj
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +65,Supplier Id,Dodavatel Id
 DocType: Journal Entry,Cash Entry,Cash Entry
 DocType: Sales Partner,Contact Desc,Kontakt Popis
@@ -3092,18 +2966,16 @@
 DocType: Brand,Item Manager,Manažér Položka
 DocType: Cost Center,Add rows to set annual budgets on Accounts.,Přidat řádky stanovit roční rozpočty na účtech.
 DocType: Buying Settings,Default Supplier Type,Výchozí typ Dodavatel
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +160,Quarrying,Ťažba
 DocType: Production Order,Total Operating Cost,Celkové provozní náklady
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +160,Note: Item {0} entered multiple times,Poznámka: Položka {0} vstoupil vícekrát
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +163,Note: Item {0} entered multiple times,Poznámka: Položka {0} vstoupil vícekrát
 apps/erpnext/erpnext/config/crm.py +27,All Contacts.,Všechny kontakty.
 DocType: Newsletter,Test Email Id,Testovací Email Id
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +394,Company Abbreviation,Zkratka Company
+apps/erpnext/erpnext/public/js/setup_wizard.js +142,Company Abbreviation,Zkratka Company
 DocType: Features Setup,If you follow Quality Inspection. Enables Item QA Required and QA No in Purchase Receipt,"Pokud se budete řídit kontroly jakosti. Umožňuje položky QA požadovány, a QA No v dokladu o koupi"
 DocType: GL Entry,Party Type,Typ Party
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +68,Raw material cannot be same as main Item,Surovina nemůže být stejný jako hlavní bod
 DocType: Item Attribute Value,Abbreviation,Zkratka
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,Není authroized od {0} překročí limity
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +30,Rotational molding,Rotačné tvárnenie
 apps/erpnext/erpnext/config/hr.py +115,Salary template master.,Plat master šablona.
 DocType: Leave Type,Max Days Leave Allowed,Max Days Leave povolena
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +55,Set Tax Rule for shopping cart,Sada Daňové Pravidlo pre nákupného košíka
@@ -3117,15 +2989,15 @@
 apps/erpnext/erpnext/config/selling.py +18,Quotes to Leads or Customers.,Ponuka z Obchodnej Iniciatívy alebo pre Zákazníka
 DocType: Stock Settings,Role Allowed to edit frozen stock,Role povoleno upravovat zmrazené zásoby
 ,Territory Target Variance Item Group-Wise,Území Cílová Odchylka Item Group-Wise
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +101,All Customer Groups,Všechny skupiny zákazníků
-apps/erpnext/erpnext/controllers/accounts_controller.py +474,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} je povinné. Možná není vytvořen Měnový Směnný záznam pro {1} až {2}.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +101,All Customer Groups,Všechny skupiny zákazníků
+apps/erpnext/erpnext/controllers/accounts_controller.py +475,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} je povinné. Možná není vytvořen Měnový Směnný záznam pro {1} až {2}.
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +37,Tax Template is mandatory.,Daňová šablóna je povinné.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +41,Account {0}: Parent account {1} does not exist,Účet {0}: Nadřazený účet {1} neexistuje
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Ceník Rate (Company měny)
 DocType: Account,Temporary,Dočasný
 DocType: Address,Preferred Billing Address,Preferovaná Fakturační Adresa
 DocType: Monthly Distribution Percentage,Percentage Allocation,Procento přidělení
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +86,Secretary,Sekretářka
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Secretary,Sekretářka
 DocType: Serial No,Distinct unit of an Item,Samostatnou jednotku z položky
 DocType: Pricing Rule,Buying,Nákupy
 DocType: HR Settings,Employee Records to be created by,"Zaměstnanec Záznamy, které vytvořil"
@@ -3138,9 +3010,8 @@
 ,Item-wise Price List Rate,Item-moudrý Ceník Rate
 DocType: Purchase Order Item,Supplier Quotation,Dodávateľská ponuka
 DocType: Quotation,In Words will be visible once you save the Quotation.,"Ve slovech budou viditelné, jakmile uložíte nabídku."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +68,Ironing,Žehlenie
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is stopped,{0} {1} je zastaven
-apps/erpnext/erpnext/stock/doctype/item/item.py +352,Barcode {0} already used in Item {1},Čárový kód {0} již použit u položky {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +356,Barcode {0} already used in Item {1},Čárový kód {0} již použit u položky {1}
 DocType: Lead,Add to calendar on this date,Přidat do kalendáře k tomuto datu
 apps/erpnext/erpnext/config/selling.py +132,Rules for adding shipping costs.,Pravidla pro přidávání náklady na dopravu.
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,Pripravované akcie
@@ -3149,13 +3020,12 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +27,Quick Entry,Rýchly vstup
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0} je povinné pre návrat
 DocType: Purchase Order,To Receive,Obdržať
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +33,Shrink fitting,Zmenšiť kovania
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +522,user@example.com,user@example.com
+apps/erpnext/erpnext/public/js/setup_wizard.js +266,user@example.com,user@example.com
 DocType: Email Digest,Income / Expense,Výnosy / náklady
 DocType: Employee,Personal Email,Osobní e-mail
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +58,Total Variance,Celkový rozptyl
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +62,Total Variance,Celkový rozptyl
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.","Pokud je povoleno, bude systém odesílat účetní položky k zásobám automaticky."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +15,Brokerage,Makléřská
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +15,Brokerage,Makléřská
 DocType: Address,Postal Code,poštové smerovacie číslo
 DocType: Production Order Operation,"in Minutes
 Updated via 'Time Log'","v minutách 
@@ -3163,14 +3033,13 @@
 DocType: Customer,From Lead,Od Obchodnej iniciatívy
 apps/erpnext/erpnext/config/manufacturing.py +19,Orders released for production.,Objednávky uvolněna pro výrobu.
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +42,Select Fiscal Year...,Vyberte fiskálního roku ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +442,POS Profile required to make POS Entry,"POS Profile požadované, aby POS Vstup"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +444,POS Profile required to make POS Entry,"POS Profile požadované, aby POS Vstup"
 DocType: Hub Settings,Name Token,Jméno Token
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +106,Planing,Hobľovanie
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Selling,Standardní prodejní
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +120,Standard Selling,Standardní prodejní
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +137,Atleast one warehouse is mandatory,Alespoň jeden sklad je povinný
 DocType: Serial No,Out of Warranty,Out of záruky
 DocType: BOM Replace Tool,Replace,Vyměnit
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +314,{0} against Sales Invoice {1},{0} na Prodejní Faktuře {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +316,{0} against Sales Invoice {1},{0} na Prodejní Faktuře {1}
 apps/erpnext/erpnext/stock/doctype/item/item.py +49,Please enter default Unit of Measure,"Prosím, zadejte výchozí měrnou jednotku"
 DocType: Purchase Invoice Item,Project Name,Název projektu
 DocType: Supplier,Mention if non-standard receivable account,Zmienka v prípade neštandardnej pohľadávky účet
@@ -3186,9 +3055,8 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,Journal Entry {0} does not have account {1} or already matched against other voucher,Zápis do deníku {0} nemá účet {1} nebo již uzavřeno proti ostatním poukaz
 DocType: Item,Moving Average,Klouzavý průměr
 DocType: BOM Replace Tool,The BOM which will be replaced,"BOM, který bude nahrazen"
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +43,New Stock UOM must be different from current stock UOM,Nová skladová MJ musí byť odlišná od existujúcich MJ
 DocType: Account,Debit,Debet
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +34,Leaves must be allocated in multiples of 0.5,"Listy musí být přiděleny v násobcích 0,5"
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +44,Leaves must be allocated in multiples of 0.5,"Listy musí být přiděleny v násobcích 0,5"
 DocType: Production Order,Operation Cost,Provozní náklady
 apps/erpnext/erpnext/config/hr.py +71,Upload attendance from a .csv file,Nahrajte účast ze souboru CSV
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,Vynikající Amt
@@ -3206,8 +3074,7 @@
 DocType: Employee,Internal Work History,Vnitřní práce History
 DocType: DocField,Column Break,Zalomení sloupce
 DocType: Event,Thursday,Čtvrtek
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +42,Private Equity,Private Equity
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +93,Turning,Turning
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,Private Equity
 DocType: Maintenance Visit,Customer Feedback,Zpětná vazba od zákazníků
 DocType: Account,Expense,Výdaj
 DocType: Sales Invoice,Exhibition,Výstava
@@ -3220,19 +3087,19 @@
 DocType: Employee,Held On,Které se konalo dne
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +33,Production Item,Výrobní položka
 ,Employee Information,Informace o zaměstnanci
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,Rate (%),Sadzba (%)
+apps/erpnext/erpnext/public/js/setup_wizard.js +294,Rate (%),Sadzba (%)
 DocType: Stock Entry Detail,Additional Cost,Dodatočné náklady
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +407,Financial Year End Date,Finanční rok Datum ukončení
+apps/erpnext/erpnext/public/js/setup_wizard.js +155,Financial Year End Date,Finanční rok Datum ukončení
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Voucher No, if grouped by Voucher","Nelze filtrovat na základě poukazu ne, pokud seskupeny podle poukazu"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +484,Make Supplier Quotation,Vytvořit nabídku dodavatele
 DocType: Quality Inspection,Incoming,Přicházející
 DocType: BOM,Materials Required (Exploded),Potřebný materiál (Rozložený)
 DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),Snížit Zisk na vstup bez nároku na mzdu (LWP)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +512,"Add users to your organization, other than yourself","Pridanie používateľov do vašej organizácie, iné ako vy"
+apps/erpnext/erpnext/public/js/setup_wizard.js +256,"Add users to your organization, other than yourself","Pridanie používateľov do vašej organizácie, iné ako vy"
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No {1} does not match with {2} {3},Riadok # {0}: Výrobné číslo {1} nezodpovedá {2} {3}
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +44,Casual Leave,Casual Leave
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +44,Casual Leave,Casual Leave
 DocType: Batch,Batch ID,Šarže ID
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +334,Note: {0},Poznámka: {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +336,Note: {0},Poznámka: {0}
 ,Delivery Note Trends,Dodací list Trendy
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +104,This Week's Summary,Tento týždeň Zhrnutie
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +74,{0} must be a Purchased or Sub-Contracted Item in row {1},"{0} musí být Zakoupená, nebo Subdodavatelská položka v řádku {1}"
@@ -3244,7 +3111,7 @@
 DocType: Purchase Receipt,Return Against Purchase Receipt,Návrat Proti doklad o kúpe
 DocType: Purchase Order,To Bill,Billa
 DocType: Material Request,% Ordered,Objednané%
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +61,Piecework,Úkolová práce
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Piecework,Úkolová práce
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +64,Avg. Buying Rate,Avg. Nákup Rate
 DocType: Task,Actual Time (in Hours),Skutočná doba (v hodinách)
 DocType: Employee,History In Company,Historie ve Společnosti
@@ -3261,13 +3128,13 @@
 DocType: Opportunity,To Discuss,K projednání
 DocType: SMS Settings,SMS Settings,Nastavenie SMS
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +60,Temporary Accounts,Dočasné Účty
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +155,Black,Čierna
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Black,Čierna
 DocType: BOM Explosion Item,BOM Explosion Item,BOM Explosion Item
 DocType: Account,Auditor,Auditor
 DocType: Purchase Order,End date of current order's period,Datum ukončení doby aktuální objednávky
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +17,Make Offer Letter,Vytvorte ponuku Letter
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +10,Return,Spiatočná
-apps/erpnext/erpnext/stock/doctype/item/item.py +503,Default Unit of Measure for Variant must be same as Template,Východzí merná jednotka varianty musia byť rovnaké ako šablónu
+apps/erpnext/erpnext/stock/doctype/item/item.py +507,Default Unit of Measure for Variant must be same as Template,Východzí merná jednotka varianty musia byť rovnaké ako šablónu
 DocType: DocField,Fold,Fold
 DocType: Production Order Operation,Production Order Operation,Výrobní zakázka Operace
 DocType: Pricing Rule,Disable,Zakázat
@@ -3278,13 +3145,12 @@
 DocType: Page,Page Name,Název stránky
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +110,To Time must be greater than From Time,Ak chcete čas musí byť väčší ako From Time
 DocType: Journal Entry Account,Exchange Rate,Výmenný kurz
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +465,Sales Order {0} is not submitted,Prodejní objednávky {0} není předložena
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +467,Sales Order {0} is not submitted,Prodejní objednávky {0} není předložena
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0}: Parent account {1} does not bolong to the company {2},Sklad {0}: Nadřazený účet {1} napatří společnosti {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +124,Spindle finishing,Úprava vretena
 DocType: BOM,Last Purchase Rate,Last Cena při platbě
 DocType: Account,Asset,Majetek
 DocType: Project Task,Task ID,Task ID
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +395,"e.g. ""MC""","napríklad ""MC """
+apps/erpnext/erpnext/public/js/setup_wizard.js +143,"e.g. ""MC""","napríklad ""MC """
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,Stock cannot exist for Item {0} since has variants,"Sklad nemůže existovat k bodu {0}, protože má varianty"
 ,Sales Person-wise Transaction Summary,Prodej Person-moudrý Shrnutí transakce
 DocType: System Settings,Time Zone,Časové pásmo
@@ -3293,9 +3159,7 @@
 DocType: Monthly Distribution,Monthly Distribution Percentages,Měsíční Distribuční Procenta
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +16,The selected item cannot have Batch,Vybraná položka nemůže mít dávku
 DocType: Delivery Note,% of materials delivered against this Delivery Note,% Materiálů doručeno proti tomuto dodacímu listu
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +151,Stapling,Zošívanie
 DocType: Customer,Customer Details,Podrobnosti zákazníků
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +105,Shaping,Tvarovanie
 DocType: Employee,Reports to,Zprávy
 DocType: SMS Settings,Enter url parameter for receiver nos,Zadejte url parametr pro přijímače nos
 DocType: Sales Invoice,Paid Amount,Uhrazené částky
@@ -3304,13 +3168,13 @@
 DocType: Item Variant,Item Variant,Variant Položky
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +15,Setting this Address Template as default as there is no other default,"Nastavení Tato adresa šablonu jako výchozí, protože není jiná výchozí"
 apps/erpnext/erpnext/accounts/doctype/account/account.py +89,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Zůstatek na účtu již v inkasa, není dovoleno stanovit ""Balance musí být"" jako ""úvěru"""
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +76,Quality Management,Řízení kvality
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Quality Management,Řízení kvality
 DocType: Production Planning Tool,Filter based on customer,Filtr dle zákazníka
 DocType: Payment Tool Detail,Against Voucher No,Proti poukaz č
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +47,Please enter quantity for Item {0},"Zadejte prosím množství produktů, bod {0}"
 DocType: Employee External Work History,Employee External Work History,Zaměstnanec vnější práce History
 DocType: Tax Rule,Purchase,Nákup
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +34,Balance Qty,Zůstatek Množství
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Balance Qty,Zůstatek Množství
 DocType: Item Group,Parent Item Group,Parent Item Group
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +21,{0} for {1},{0} na {1}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +96,Cost Centers,Nákladové středisko
@@ -3320,12 +3184,12 @@
 DocType: Opportunity,Next Contact,Nasledujúce Kontakt
 DocType: Employee,Employment Type,Typ zaměstnání
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,Dlouhodobý majetek
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +84,Application period cannot be across two alocation records,Obdobie podávania žiadostí nemôže byť na dvoch alokácie záznamy
 DocType: Item Group,Default Expense Account,Výchozí výdajového účtu
 DocType: Employee,Notice (days),Oznámení (dny)
 DocType: Page,Yes,Ano
 DocType: Tax Rule,Sales Tax Template,Daň z predaja Template
 DocType: Employee,Encashment Date,Inkaso Datum
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +74,Electroforming,Electroforming
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +179,"Against Voucher Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Proti poukazu Type musí být jedním z objednávky, faktury nebo Journal Entry"
 DocType: Account,Stock Adjustment,Úprava skladových zásob
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +34,Default Activity Cost exists for Activity Type - {0},Existuje Náklady Predvolené aktivity pre Typ aktivity - {0}
@@ -3361,12 +3225,12 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,"Warehouse nelze vypustit, neboť existuje zásob, kniha pro tento sklad."
 DocType: Company,Distribution,Distribuce
 apps/erpnext/erpnext/public/js/pos/pos.html +36,Amount Paid,Zaplacené částky
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +91,Project Manager,Project Manager
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +72,Dispatch,Odeslání
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Project Manager,Project Manager
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +72,Dispatch,Odeslání
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,Max sleva povoleno položku: {0} {1}%
 DocType: Customer,Default Taxes and Charges,Východiskové Dane a poplatky
 DocType: Account,Receivable,Pohledávky
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +268,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,"Riadok # {0}: Nie je povolené meniť dodávateľa, objednávky už existuje"
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +263,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,"Riadok # {0}: Nie je povolené meniť dodávateľa, objednávky už existuje"
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,"Role, která se nechá podat transakcí, které přesahují úvěrové limity."
 DocType: Sales Invoice,Supplier Reference,Dodavatel Označení
 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.","Je-li zaškrtnuto, bude BOM pro sub-montážní položky považují pro získání surovin. V opačném případě budou všechny sub-montážní položky být zacházeno jako surovinu."
@@ -3374,8 +3238,8 @@
 DocType: Hub Settings,Seller Description,Prodejce Popis
 DocType: Employee Education,Qualification,Kvalifikace
 DocType: Item Price,Item Price,Položka Cena
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +48,Soap & Detergent,Soap & Detergent
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +36,Motion Picture & Video,Motion Picture & Video
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +48,Soap & Detergent,Soap & Detergent
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +36,Motion Picture & Video,Motion Picture & Video
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Objednáno
 DocType: Warehouse,Warehouse Name,Název Skladu
 DocType: Naming Series,Select Transaction,Vybrat Transaction
@@ -3384,7 +3248,6 @@
 DocType: BOM,Rate Of Materials Based On,Hodnotit materiálů na bázi
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,Podpora Analtyics
 apps/erpnext/erpnext/accounts/doctype/accounts_settings/accounts_settings.py +27,Company is missing in warehouses {0},Společnost chybí ve skladech {0}
-DocType: Stock UOM Replace Utility,Stock UOM Replace Utility,Nástroj na náhradu MJ
 DocType: POS Profile,Terms and Conditions,Podmínky
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,To Date should be within the Fiscal Year. Assuming To Date = {0},"Chcete-li data by měla být v rámci fiskálního roku. Za předpokladu, že To Date = {0}"
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","Zde si můžete udržet výšku, váhu, alergie, zdravotní problémy atd"
@@ -3396,7 +3259,7 @@
 DocType: Sales Order Item,For Production,Pro Výrobu
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +103,Please enter sales order in the above table,"Prosím, zadejte prodejní objednávky v tabulce výše"
 DocType: Project Task,View Task,Zobraziť Task
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +406,Your financial year begins on,Váš finanční rok začíná
+apps/erpnext/erpnext/public/js/setup_wizard.js +154,Your financial year begins on,Váš finanční rok začíná
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +46,Please enter Purchase Receipts,"Prosím, zadejte Nákup Příjmy"
 DocType: Sales Invoice,Get Advances Received,Získat přijaté zálohy
 DocType: Email Digest,Add/Remove Recipients,Přidat / Odebrat příjemce
@@ -3404,16 +3267,14 @@
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","Chcete-li nastavit tento fiskální rok jako výchozí, klikněte na tlačítko ""Nastavit jako výchozí"""
 apps/erpnext/erpnext/config/support.py +54,Setup incoming server for support email id. (e.g. support@example.com),Nastavenie serveru prichádzajúcej pošty pre email podpory. (Napríklad podpora@priklad.com)
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,Nedostatek Množství
-apps/erpnext/erpnext/stock/doctype/item/item.py +528,Item variant {0} exists with same attributes,Variant Položky {0} existuje s rovnakými vlastnosťami
+apps/erpnext/erpnext/stock/doctype/item/item.py +532,Item variant {0} exists with same attributes,Variant Položky {0} existuje s rovnakými vlastnosťami
 DocType: Salary Slip,Salary Slip,Plat Slip
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +116,Burnishing,Leštenie
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +54,'To Date' is required,"""Datum DO"" je povinné"
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,"""Datum DO"" je povinné"
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","Generování balení pásky pro obaly mají být dodány. Používá se k oznámit číslo balíku, obsah balení a jeho hmotnost."
 DocType: Sales Invoice Item,Sales Order Item,Prodejní objednávky Item
 DocType: Salary Slip,Payment Days,Platební dny
 DocType: BOM,Manage cost of operations,Správa nákladů na provoz
 DocType: Features Setup,Item Advanced,Položka Advanced
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +40,Hot rolling,Valcovanie
 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.","Když některý z kontrolovaných operací je ""Odesláno"", email pop-up automaticky otevřeny poslat e-mail na přidružené ""Kontakt"" v této transakci, s transakcí jako přílohu. Uživatel může, ale nemusí odeslat e-mail."
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,Globálne nastavenia
 DocType: Employee Education,Employee Education,Vzdělávání zaměstnanců
@@ -3426,25 +3287,23 @@
 DocType: Customer,Sales Team Details,Podrobnosti prodejní tým
 DocType: Expense Claim,Total Claimed Amount,Celkem žalované částky
 apps/erpnext/erpnext/config/crm.py +22,Potential opportunities for selling.,Potenciální příležitosti pro prodej.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +48,Sick Leave,Zdravotní dovolená
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +174,Invalid {0},Neplatný {0}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +48,Sick Leave,Zdravotní dovolená
 DocType: Email Digest,Email Digest,Email Digest
 DocType: Delivery Note,Billing Address Name,Jméno Fakturační adresy
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +22,Department Stores,Obchodní domy
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,Obchodní domy
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +40,System Balance,System Balance
 DocType: Workflow,Is Active,Je Aktivní
 apps/erpnext/erpnext/controllers/stock_controller.py +71,No accounting entries for the following warehouses,Žádné účetní záznamy pro následující sklady
 apps/erpnext/erpnext/projects/doctype/project/project.js +22,Save the document first.,Uložte dokument ako prvý.
 DocType: Account,Chargeable,Vyměřovací
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +121,Linishing,Linishing
 DocType: Company,Change Abbreviation,Zmeniť skratku
 DocType: Workflow State,Primary,Primární
 DocType: Expense Claim Detail,Expense Date,Datum výdaje
 DocType: Item,Max Discount (%),Max sleva (%)
 DocType: Communication,More Information,Viac informácií
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +70,Last Order Amount,Poslední částka objednávky
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +161,Blasting,Odstrel
 DocType: Company,Warn,Varovat
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +111,Item valuation updated,Ocenění Item aktualizováno
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Akékoľvek iné poznámky, pozoruhodné úsilie, ktoré by mali ísť v záznamoch."
 DocType: BOM,Manufacturing User,Výroba Uživatel
 DocType: Purchase Order,Raw Materials Supplied,Dodává suroviny
@@ -3454,7 +3313,7 @@
 DocType: Appraisal,Appraisal Template,Posouzení Template
 DocType: Communication,Email,Email
 DocType: Item Group,Item Classification,Položka Klasifikace
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +89,Business Development Manager,Business Development Manager
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Business Development Manager,Business Development Manager
 DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,Maintenance Visit Účel
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.js +15,Period,Období
 ,General Ledger,Hlavná Účtovná Kniha
@@ -3464,9 +3323,7 @@
 ,Itemwise Recommended Reorder Level,Itemwise Doporučené Změna pořadí Level
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +264,Please select {0} first,"Prosím, nejprve vyberte {0} "
 DocType: Features Setup,To get Item Group in details table,Chcete-li získat položku Group v tabulce Rozpis
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +67,Redrawing,Prekreslenie
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +112,Batch {0} of Item {1} has expired.,Batch {0} z {1} bodu vypršala.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +120,Etching,Lept
 DocType: Sales Invoice,Commission,Provize
 DocType: Address Template,"<h4>Default Template</h4>
 <p>Uses <a href=""http://jinja.pocoo.org/docs/templates/"">Jinja Templating</a> and all the fields of Address (including Custom Fields if any) will be available</p>
@@ -3511,7 +3368,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +340,Operation Time must be greater than 0 for Operation {0},Prevádzková doba musí byť väčšia ako 0 pre prevádzku {0}
 DocType: Supplier,Address and Contacts,Adresa a kontakty
 DocType: UOM Conversion Detail,UOM Conversion Detail,Detail konverzie MJ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +496,Keep it web friendly 900px (w) by 100px (h),Snaťte sa o rozmer vhodný na web: 900px šírka a 100px výška
+apps/erpnext/erpnext/public/js/setup_wizard.js +242,Keep it web friendly 900px (w) by 100px (h),Snaťte sa o rozmer vhodný na web: 900px šírka a 100px výška
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +329,Production Order cannot be raised against a Item Template,Výrobná zákazka nemôže byť vznesená proti šablóny položky
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +44,Charges are updated in Purchase Receipt against each item,Poplatky jsou aktualizovány v dokladu o koupi na každou položku
 DocType: Payment Tool,Get Outstanding Vouchers,Získejte Vynikající poukazy
@@ -3527,54 +3384,49 @@
 DocType: Item,Average time taken by the supplier to deliver,Priemerná doba zhotovená dodávateľom dodať
 DocType: Time Log,Hours,Hodiny
 DocType: Project,Expected Start Date,Očekávané datum zahájení
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +38,Rolling,Rolling
 DocType: ToDo,Priority,Priorita
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +41,Remove item if charges is not applicable to that item,Odebrat pokud poplatků není pro tuto položku
 DocType: Dropbox Backup,Dropbox Access Allowed,Dropbox Přístup povolen
 DocType: Dropbox Backup,Weekly,Týdenní
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,Např. smsgateway.com/api/send-sms.cgi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +485,Receive,Príjem
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +510,Receive,Príjem
 DocType: Maintenance Visit,Fully Completed,Plně Dokončeno
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% Hotovo
 DocType: Employee,Educational Qualification,Vzdělávací Kvalifikace
 DocType: Workstation,Operating Costs,Provozní náklady
 DocType: Employee Leave Approver,Employee Leave Approver,Zaměstnanec Leave schvalovač
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,{0} has been successfully added to our Newsletter list.,{0} bol úspešne pridaný do nášho zoznamu noviniek.
-apps/erpnext/erpnext/stock/doctype/item/item.py +383,Row {0}: An Reorder entry already exists for this warehouse {1},Row {0}: Položka Změna pořadí již pro tento sklad existuje {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +387,Row {0}: An Reorder entry already exists for this warehouse {1},Row {0}: Položka Změna pořadí již pro tento sklad existuje {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +67,"Cannot declare as lost, because Quotation has been made.","Nelze prohlásit za ztracený, protože citace byla provedena."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +133,Electron beam machining,Lúč obrábanie Electron
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Nákup Hlavní manažer
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +424,Production Order {0} must be submitted,Výrobní zakázka {0} musí být předloženy
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +150,Please select Start Date and End Date for Item {0},"Prosím, vyberte Počáteční datum a koncové datum pro položku {0}"
 apps/erpnext/erpnext/config/stock.py +141,Main Reports,Hlavné správy
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +102,Stock Ledger entries balances updated,Sklad Ledger položky bilancí aktualizováno
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,K dnešnímu dni nemůže být dříve od data
 DocType: Purchase Receipt Item,Prevdoc DocType,Prevdoc DOCTYPE
-apps/erpnext/erpnext/stock/doctype/item/item.js +176,Add / Edit Prices,Přidat / Upravit ceny
+apps/erpnext/erpnext/stock/doctype/item/item.js +178,Add / Edit Prices,Přidat / Upravit ceny
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +53,Chart of Cost Centers,Diagram nákladových středisek
 ,Requested Items To Be Ordered,Požadované položky je třeba objednat
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +298,My Orders,Moje objednávky
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +293,My Orders,Moje objednávky
 DocType: Price List,Price List Name,Ceník Jméno
 DocType: Time Log,For Manufacturing,Pre výrobu
-apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +70,Totals,Súčty
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +174,Totals,Súčty
 DocType: BOM,Manufacturing,Výroba
 ,Ordered Items To Be Delivered,"Objednané zboží, které mají být dodány"
 DocType: Account,Income,Příjem
 ,Setup Wizard,Sprievodca nastavením
 DocType: Industry Type,Industry Type,Typ Průmyslu
 apps/erpnext/erpnext/templates/includes/cart.js +137,Something went wrong!,Něco se pokazilo!
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +68,Warning: Leave application contains following block dates,Upozornění: Nechte Aplikace obsahuje následující data bloku
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +251,Sales Invoice {0} has already been submitted,Prodejní faktury {0} již byla odeslána
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +100,Warning: Leave application contains following block dates,Upozornění: Nechte Aplikace obsahuje následující data bloku
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +256,Sales Invoice {0} has already been submitted,Prodejní faktury {0} již byla odeslána
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,Dokončení Datum
 DocType: Purchase Invoice Item,Amount (Company Currency),Částka (Měna Společnosti)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +10,Die casting,Die liatie
 DocType: Email Alert,Reference Date,Referenční data
 apps/erpnext/erpnext/config/hr.py +105,Organization unit (department) master.,Organizace jednotka (departement) master.
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +25,Please enter valid mobile nos,Zadejte platné mobilní nos
 DocType: Budget Detail,Budget Detail,Detail Rozpočtu
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +75,Please enter message before sending,"Prosím, zadejte zprávu před odesláním"
 DocType: Async Task,Status,Stav
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +65,Stock UOM updated for Item {0},Skladová MJ pre položku {0} aktualizovaná
 DocType: Company History,Year,Rok
 apps/erpnext/erpnext/config/accounts.py +127,Point-of-Sale Profile,Point-of-Sale Profil
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +68,Please Update SMS Settings,Aktualizujte prosím nastavení SMS
@@ -3588,12 +3440,12 @@
 ,Serial No Service Contract Expiry,Pořadové číslo Servisní smlouva vypršení platnosti
 DocType: Item,Unit of Measure Conversion,Jednotka miery konverzie
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +86,Employee can not be changed,Zaměstnanec nemůže být změněn
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +259,You cannot credit and debit same account at the same time,Nemůžete dělat kreditní a debetní záznam na stejný účet ve stejnou dobu.
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,You cannot credit and debit same account at the same time,Nemůžete dělat kreditní a debetní záznam na stejný účet ve stejnou dobu.
 DocType: Naming Series,Help HTML,Nápověda HTML
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},Celková weightage přiřazen by měla být 100%. Je {0}
 apps/erpnext/erpnext/controllers/status_updater.py +140,Allowance for over-{0} crossed for Item {1},Příspěvek na nadměrné {0} přešel k bodu {1}
 DocType: Address,Name of person or organization that this address belongs to.,"Meno osoby alebo organizácie, ktorej patrí táto adresa."
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +587,Your Suppliers,Vaši Dodávatelia
+apps/erpnext/erpnext/public/js/setup_wizard.js +325,Your Suppliers,Vaši Dodávatelia
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,"Nelze nastavit jako Ztraceno, protože je přijata objednávka."
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +65,Another Salary Structure {0} is active for employee {1}. Please make its status 'Inactive' to proceed.,"Další platovou strukturu {0} je aktivní pro zaměstnance {1}. Prosím, aby jeho stav ""neaktivní"" pokračovat."
 DocType: Purchase Invoice,Contact,Kontakt
@@ -3602,37 +3454,35 @@
 DocType: Item,Has Serial No,Má Sériové číslo
 DocType: Employee,Date of Issue,Datum vydání
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +16,{0}: From {0} for {1},{0}: Od {0} do {1}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +154,Row #{0}: Set Supplier for item {1},Riadok # {0}: Nastavte Dodávateľ pre položku {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +149,Row #{0}: Set Supplier for item {1},Riadok # {0}: Nastavte Dodávateľ pre položku {1}
 DocType: Issue,Content Type,Typ obsahu
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +17,Computer,Počítač
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,Počítač
 DocType: Item,List this Item in multiple groups on the website.,Seznam tuto položku ve více skupinách na internetových stránkách.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +283,Please check Multi Currency option to allow accounts with other currency,"Prosím, skontrolujte viac mien možnosť povoliť účty s inú menu"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +285,Please check Multi Currency option to allow accounts with other currency,"Prosím, skontrolujte viac mien možnosť povoliť účty s inú menu"
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +62,Item: {0} does not exist in the system,Položka: {0} neexistuje v systému
 apps/erpnext/erpnext/accounts/doctype/account/account.py +81,You are not authorized to set Frozen value,Nejste oprávněni stanovit hodnotu Zmražení
 DocType: Payment Reconciliation,Get Unreconciled Entries,Získat smířit záznamů
 DocType: Cost Center,Budgets,Rozpočty
 apps/frappe/frappe/core/page/modules_setup/modules_setup.py +11,Updated,Aktualizováno
 DocType: Employee,Emergency Contact Details,Nouzové kontaktní údaje
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +396,What does it do?,Čo to robí?
+apps/erpnext/erpnext/public/js/setup_wizard.js +144,What does it do?,Čo to robí?
 DocType: Delivery Note,To Warehouse,Do skladu
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +45,Account {0} has been entered more than once for fiscal year {1},Účet {0} byl zadán více než jednou za fiskální rok {1}
 ,Average Commission Rate,Průměrná cena Komise
-apps/erpnext/erpnext/stock/doctype/item/item.py +313,'Has Serial No' can not be 'Yes' for non-stock item,"""Má sériové číslo"", nemůže být ""ano"" pro neskladové zboží"
+apps/erpnext/erpnext/stock/doctype/item/item.py +317,'Has Serial No' can not be 'Yes' for non-stock item,"""Má sériové číslo"", nemůže být ""ano"" pro neskladové zboží"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Attendance can not be marked for future dates,Účast nemůže být označen pro budoucí data
 DocType: Pricing Rule,Pricing Rule Help,Ceny Pravidlo Help
 DocType: Purchase Taxes and Charges,Account Head,Účet Head
 apps/erpnext/erpnext/config/stock.py +79,Update additional costs to calculate landed cost of items,Aktualizace dodatečné náklady pro výpočet vyložené náklady položek
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +111,Electrical,Elektrický
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +111,Electrical,Elektrický
 DocType: Stock Entry,Total Value Difference (Out - In),Celková hodnota Rozdíl (Out - In)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +302,Row {0}: Exchange Rate is mandatory,Riadok {0}: Exchange Rate je povinné
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +304,Row {0}: Exchange Rate is mandatory,Riadok {0}: Exchange Rate je povinné
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},User ID není nastavena pro zaměstnance {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +72,Peening,Peening
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,From Warranty Claim,Od reklamačnímu
 DocType: Stock Entry,Default Source Warehouse,Výchozí zdroj Warehouse
 DocType: Item,Customer Code,Code zákazníků
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +212,Birthday Reminder for {0},Narozeninová připomínka pro {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +163,Lapping,Zabrušovací
-apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.js +8,Days Since Last Order,Počet dnů od poslední objednávky
+apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +72,Days Since Last Order,Počet dnů od poslední objednávky
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +299,Debit To account must be a Balance Sheet account,Debetné Na účet musí byť účtu Súvaha
 DocType: Buying Settings,Naming Series,Číselné řady
 DocType: Leave Block List,Leave Block List Name,Nechte Jméno Block List
@@ -3646,7 +3496,7 @@
 DocType: Notification Control,Sales Invoice Message,Prodejní faktury Message
 DocType: Authorization Rule,Based On,Založeno na
 DocType: Sales Order Item,Ordered Qty,Objednáno Množství
-apps/erpnext/erpnext/stock/doctype/item/item.py +539,Item {0} is disabled,Položka {0} je zakázaná
+apps/erpnext/erpnext/stock/doctype/item/item.py +543,Item {0} is disabled,Položka {0} je zakázaná
 DocType: Stock Settings,Stock Frozen Upto,Reklamní Frozen aľ
 apps/erpnext/erpnext/controllers/recurring_document.py +166,Period From and Period To dates mandatory for recurring {0},"Obdobie od a obdobia, k dátam povinné pre opakované {0}"
 apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,Projektová činnost / úkol.
@@ -3656,7 +3506,6 @@
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,Sleva musí být menší než 100
 DocType: ToDo,Low,Nízké
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Odpísať Suma (Company meny)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +71,Spinning,Spinning
 DocType: Landed Cost Voucher,Landed Cost Voucher,Přistálo Náklady Voucher
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +55,Please set {0},Prosím nastavte {0}
 DocType: Purchase Invoice,Repeat on Day of Month,Opakujte na den v měsíci
@@ -3678,7 +3527,6 @@
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +37,Campaign Name is required,Je zapotřebí Název kampaně
 DocType: Maintenance Visit,Maintenance Date,Datum údržby
 DocType: Purchase Receipt Item,Rejected Serial No,Zamítnuto Serial No
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +51,Deep drawing,Hlboké ťahanie
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +40,New Newsletter,New Newsletter
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +157,Start date should be less than end date for Item {0},Datum zahájení by měla být menší než konečné datum pro bod {0}
 apps/erpnext/erpnext/stock/doctype/item/item.js +17,Show Balance,Show Balance
@@ -3689,7 +3537,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +119,BOM and Manufacturing Quantity are required,BOM a výroba množstva sú povinné
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Stárnutí rozsah 2
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +450,Amount,Částka
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +147,Riveting,Nitovanie
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,BOM nahradil
 ,Sales Analytics,Prodejní Analytics
 DocType: Manufacturing Settings,Manufacturing Settings,Nastavenia Výroby
@@ -3701,20 +3548,19 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +207,New Account Name,Nový název účtu
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,Dodává se nákladů na suroviny
 DocType: Selling Settings,Settings for Selling Module,Nastavenie modulu Predaj
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +73,Customer Service,Služby zákazníkům
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Customer Service,Služby zákazníkům
 DocType: Item,Thumbnail,Thumbnail
 DocType: Item Customer Detail,Item Customer Detail,Položka Detail Zákazník
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +147,Confirm Your Email,Potvrdiť Váš e-mail
 apps/erpnext/erpnext/config/hr.py +53,Offer candidate a Job.,Ponuka kandidát Job.
 DocType: Notification Control,Prompt for Email on Submission of,Výzva pro e-mail na předkládání
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +81,Total allocated leaves are more than days in the period,Celkové pridelené listy sú viac ako dní v období
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +70,Item {0} must be a stock Item,Položka {0} musí být skladem
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,Východiskové prácu v sklade Progress
 apps/erpnext/erpnext/config/accounts.py +107,Default settings for accounting transactions.,Výchozí nastavení účetních transakcí.
 apps/frappe/frappe/model/naming.py +40,{0} is required,{0} je vyžadováno
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +21,Vacuum molding,Vákuové tvarovanie
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,Očekávané datum nemůže být před Materiál Poptávka Datum
 DocType: Contact Us Settings,City,Město
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +132,Ultrasonic machining,Ultrazvukové obrábanie
 apps/frappe/frappe/templates/base.html +137,Error: Not a valid id?,Chyba: Nie je platný id?
 apps/erpnext/erpnext/stock/get_item_details.py +125,Item {0} must be a Sales Item,Bod {0} musí být prodejní položky
 DocType: Naming Series,Update Series Number,Aktualizace Series Number
@@ -3722,7 +3568,7 @@
 DocType: Sales Order,Printing Details,Tlač detailov
 DocType: Task,Closing Date,Uzávěrka Datum
 DocType: Sales Order Item,Produced Quantity,Produkoval Množství
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +84,Engineer,Inženýr
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Engineer,Inženýr
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,Vyhľadávanie Sub Assemblies
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +379,Item Code required at Row No {0},Kód položky třeba na řádku č {0}
 DocType: Sales Partner,Partner Type,Partner Type
@@ -3730,7 +3576,7 @@
 DocType: Authorization Rule,Customerwise Discount,Sleva podle zákazníka
 DocType: Purchase Invoice,Against Expense Account,Proti výdajového účtu
 DocType: Production Order,Production Order,Výrobní Objednávka
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +258,Installation Note {0} has already been submitted,Poznámka k instalaci {0} již byla odeslána
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +263,Installation Note {0} has already been submitted,Poznámka k instalaci {0} již byla odeslána
 DocType: Quotation Item,Against Docname,Proti Docname
 DocType: SMS Center,All Employee (Active),Všichni zaměstnanci (Aktivní)
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,Zobrazit nyní
@@ -3739,19 +3585,19 @@
 DocType: Item,Re-Order Level,Re-Order Level
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,"Zadejte položky a plánované ks, pro které chcete získat zakázky na výrobu, nebo stáhnout suroviny pro analýzu."
 apps/frappe/frappe/public/js/frappe/views/ganttview.js +45,Gantt Chart,Pruhový diagram
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +57,Part-time,Part-time
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,Part-time,Part-time
 DocType: Employee,Applicable Holiday List,Použitelný Seznam Svátků
 DocType: Employee,Cheque,Šek
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,Řada Aktualizováno
 apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Report Type is mandatory,Report Type je povinné
 DocType: Item,Serial Number Series,Sériové číslo Series
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},Sklad je povinný pro skladovou položku {0} na řádku {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +45,Retail & Wholesale,Maloobchod a velkoobchod
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,Maloobchod a velkoobchod
 DocType: Issue,First Responded On,Prvně odpovězeno dne
 DocType: Website Item Group,Cross Listing of Item in multiple groups,Cross Výpis zboží v několika skupinách
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +351,The First User: You,První Uživatel: Vy
+apps/erpnext/erpnext/public/js/setup_wizard.js +101,The First User: You,První Uživatel: Vy
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +48,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},Datum zahájení a  Datum ukončení Fiskálního roku jsou již stanoveny ve fiskálním roce {0}
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +172,Successfully Reconciled,Úspěšně smířeni
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +119,Successfully Reconciled,Úspěšně smířeni
 DocType: Production Order,Planned End Date,Plánované datum ukončení
 apps/erpnext/erpnext/config/stock.py +43,Where items are stored.,"Tam, kde jsou uloženy předměty."
 DocType: Tax Rule,Validity,Platnosť
@@ -3771,39 +3617,36 @@
 DocType: DocPerm,Level,Úroveň
 DocType: Purchase Taxes and Charges,On Net Total,On Net Celkem
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +160,Target warehouse in row {0} must be same as Production Order,Target sklad v řádku {0} musí být stejná jako výrobní zakázky
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +59,No permission to use Payment Tool,Nemáte oprávnění k použití platební nástroj
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +97,No permission to use Payment Tool,Nemáte oprávnění k použití platební nástroj
 apps/erpnext/erpnext/controllers/recurring_document.py +192,'Notification Email Addresses' not specified for recurring %s,"""E-mailové adresy pro Oznámení"", které nejsou uvedeny na opakující se %s"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +86,Milling,Frézovanie
 apps/erpnext/erpnext/accounts/doctype/account/account.py +99,Currency can not be changed after making entries using some other currency,Mena nemôže byť zmenený po vykonaní položky pomocou inej mene
 DocType: Company,Round Off Account,Zaokrúhliť účet
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +60,Nibbling,Okusovanie
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,Administrativní náklady
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +18,Consulting,Consulting
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +18,Consulting,Consulting
 DocType: Customer Group,Parent Customer Group,Parent Customer Group
 apps/erpnext/erpnext/public/js/pos/pos.js +429,Change,Zmena
 DocType: Purchase Invoice,Contact Email,Kontaktní e-mail
 DocType: Appraisal Goal,Score Earned,Skóre Zasloužené
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +393,"e.g. ""My Company LLC""","napríklad ""Moja spoločnosť LLC """
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +173,Notice Period,Výpovedná Lehota
+apps/erpnext/erpnext/public/js/setup_wizard.js +141,"e.g. ""My Company LLC""","napríklad ""Moja spoločnosť LLC """
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +173,Notice Period,Výpovedná Lehota
 DocType: Bank Reconciliation Detail,Voucher ID,Voucher ID
 apps/erpnext/erpnext/setup/doctype/territory/territory.js +14,This is a root territory and cannot be edited.,To je kořen území a nelze upravovat.
 DocType: Packing Slip,Gross Weight UOM,Hrubá Hmotnosť MJ
 DocType: Email Digest,Receivables / Payables,Pohledávky / Závazky
 DocType: Delivery Note Item,Against Sales Invoice,Proti prodejní faktuře
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +63,Stamping,Lisovanie
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +457,Credit Account,Úverový účet
 DocType: Landed Cost Item,Landed Cost Item,Přistálo nákladovou položkou
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +56,Show zero values,Ukázat nulové hodnoty
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,Množství položky získané po výrobě / přebalení z daných množství surovin
 DocType: Payment Reconciliation,Receivable / Payable Account,Pohledávky / závazky účet
 DocType: Delivery Note Item,Against Sales Order Item,Proti položce přijaté objednávky
-apps/erpnext/erpnext/stock/doctype/item/item.py +521,Please specify Attribute Value for attribute {0},Uveďte atribútu Hodnota atribútu {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +525,Please specify Attribute Value for attribute {0},Uveďte atribútu Hodnota atribútu {0}
 DocType: Item,Default Warehouse,Výchozí Warehouse
 DocType: Task,Actual End Date (via Time Logs),Skutočné Dátum ukončenia (cez Time Záznamy)
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +37,Budget cannot be assigned against Group Account {0},Rozpočet nemôže byť priradená na skupinový účet {0}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +23,Please enter parent cost center,"Prosím, zadejte nákladové středisko mateřský"
 DocType: Delivery Note,Print Without Amount,Tisknout bez Částka
-apps/erpnext/erpnext/controllers/buying_controller.py +69,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,"Daň z kategorie nemůže být ""Ocenění"" nebo ""Ocenění a celkový"", protože všechny položky jsou běžně skladem"
+apps/erpnext/erpnext/controllers/buying_controller.py +60,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,"Daň z kategorie nemůže být ""Ocenění"" nebo ""Ocenění a celkový"", protože všechny položky jsou běžně skladem"
 DocType: User,Last Name,Priezvisko
 DocType: Web Page,Left,Vlevo
 DocType: Event,All Day,Celý den
@@ -3811,7 +3654,7 @@
 DocType: Appraisal,Total Score (Out of 5),Celkové skóre (Out of 5)
 DocType: Contact Us Settings,State,Stav
 DocType: Batch,Batch,Šarže
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +51,Balance,Zůstatek
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +28,Balance,Zůstatek
 DocType: Project,Total Expense Claim (via Expense Claims),Total Expense Claim (via Expense nárokov)
 DocType: User,Gender,Pohlavie
 DocType: Journal Entry,Debit Note,Debit Note
@@ -3841,8 +3684,7 @@
 DocType: Purchase Order,Get Last Purchase Rate,Získejte posledního nákupu Cena
 DocType: Time Log,Billing Rate based on Activity Type (per hour),Účtovaná sadzba založená na typ aktivity (za hodinu)
 DocType: Company,Company Info,Informácie o spoločnosti
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +76,Seaming,Zošívanie
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +197,"Company Email ID not found, hence mail not sent","Společnost E-mail ID nebyl nalezen, proto pošta neodeslána"
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +206,"Company Email ID not found, hence mail not sent","Společnost E-mail ID nebyl nalezen, proto pošta neodeslána"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Aplikace fondů (aktiv)
 DocType: Production Planning Tool,Filter based on item,Filtr dle položek
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +451,Debit Account,Debetné účet
@@ -3854,17 +3696,16 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +95,{0} {1} has been modified. Please refresh.,{0} {1} byl změněn. Prosím aktualizujte.
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,Přestaňte uživatelům provádět Nechat aplikací v následujících dnech.
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +591,From Opportunity,Od Opportunity
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +46,Blanking,Zaclonení
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +166,Employee Benefits,Zamestnanecké benefity
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,Employee Benefits,Zamestnanecké benefity
 DocType: Sales Invoice,Is POS,Je POS
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +240,Packed quantity must equal quantity for Item {0} in row {1},Balíčky množství se musí rovnat množství pro položku {0} v řadě {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +245,Packed quantity must equal quantity for Item {0} in row {1},Balíčky množství se musí rovnat množství pro položku {0} v řadě {1}
 DocType: Production Order,Manufactured Qty,Vyrobeno Množství
 DocType: Purchase Receipt Item,Accepted Quantity,Schválené Množství
 apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} neexistuje
 apps/erpnext/erpnext/config/accounts.py +18,Bills raised to Customers.,Směnky vznesené zákazníkům.
 DocType: DocField,Default,Výchozí
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,ID projektu
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +466,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},"Riadok č {0}: Čiastka nemôže byť väčšia ako Čakajúci Suma proti Expense nároku {1}. Do doby, než množstvo je {2}"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +468,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},"Riadok č {0}: Čiastka nemôže byť väčšia ako Čakajúci Suma proti Expense nároku {1}. Do doby, než množstvo je {2}"
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +40,{0} subscribers added,{0} odberatelia z pridanej
 DocType: Maintenance Schedule,Schedule,Plán
 DocType: Cost Center,"Define Budget for this Cost Center. To set budget action, see ""Company List""","Definovať rozpočtu pre tento nákladového strediska. Ak chcete nastaviť rozpočet akcie, pozri &quot;Zoznam firiem&quot;"
@@ -3875,7 +3716,7 @@
 apps/erpnext/erpnext/public/js/pos/pos.js +91,Price List not found or disabled,Ceník nebyl nalezen nebo zakázán
 DocType: Expense Claim,Approved,Schválený
 DocType: Pricing Rule,Price,Cena
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +79,Employee relieved on {0} must be set as 'Left',"Zaměstnanec úlevu na {0} musí být nastaven jako ""Left"""
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +88,Employee relieved on {0} must be set as 'Left',"Zaměstnanec úlevu na {0} musí být nastaven jako ""Left"""
 DocType: Item,"Selecting ""Yes"" will give a unique identity to each entity of this item which can be viewed in the Serial No master.","Výběrem ""Yes"" dá jedinečnou identitu každého subjektu této položky, které lze zobrazit v sériové číslo mistra."
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +39,Appraisal {0} created for Employee {1} in the given date range,Posouzení {0} vytvořil pro zaměstnance {1} v daném časovém období
 DocType: Employee,Education,Vzdělání
@@ -3886,7 +3727,7 @@
 apps/frappe/frappe/desk/moduleview.py +67,Standard Reports,Standardní výpisy
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,Zápisy v účetním deníku.
 DocType: Delivery Note Item,Available Qty at From Warehouse,K dispozícii Množstvo na Od Warehouse
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +209,Please select Employee Record first.,"Prosím, vyberte zamestnanca záznam prvý."
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +224,Please select Employee Record first.,"Prosím, vyberte zamestnanca záznam prvý."
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Riadok {0}: Party / Account nezhoduje s {1} / {2} do {3} {4}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +35,To create a Tax Account,Chcete-li vytvořit daňovém účtu
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +233,Please enter Expense Account,"Prosím, zadejte výdajového účtu"
@@ -3899,46 +3740,43 @@
 DocType: Sales Order,Track this Sales Order against any Project,Sledovat tento prodejní objednávky na jakýkoli projekt
 DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,"Prodejní Pull zakázky (čeká dodat), na základě výše uvedených kritérií"
 DocType: DocShare,Document Type,Typ dokumentu
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +565,From Supplier Quotation,Z ponuky dodávateľa
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +588,From Supplier Quotation,Z ponuky dodávateľa
 DocType: Deduction Type,Deduction Type,Odpočet Type
 DocType: Attendance,Half Day,Půl den
 DocType: Pricing Rule,Min Qty,Min Množství
 DocType: Features Setup,"To track items in sales and purchase documents with batch nos. ""Preferred Industry: Chemicals""",Ak chcete sledovať položky v oblasti predaja a nákupných dokladoch s číslami šarží. &quot;Výhodné Priemysel: Chemicals&quot;
 DocType: GL Entry,Transaction Date,Transakce Datum
 DocType: Production Plan Item,Planned Qty,Plánované Množství
-apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +91,Total Tax,Total Tax
+apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +93,Total Tax,Total Tax
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +178,For Quantity (Manufactured Qty) is mandatory,Pre Množstvo (Vyrobené ks) je povinné
 DocType: Stock Entry,Default Target Warehouse,Výchozí Target Warehouse
 DocType: Purchase Invoice,Net Total (Company Currency),Net Total (Company Měna)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +79,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Riadok {0}: Typ Party Party a je použiteľná len proti pohľadávky / záväzky účtu
 DocType: Notification Control,Purchase Receipt Message,Zpráva příjemky
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +95,Total allocated leaves are more than period,Celkom pridelené listy sú viac než obdobie
 DocType: Production Order,Actual Start Date,Skutečné datum zahájení
 DocType: Sales Order,% of materials delivered against this Sales Order,% Materiálů doručeno proti tomuto odběrateli
 apps/erpnext/erpnext/config/stock.py +23,Record item movement.,Záznam pohybu položka.
 DocType: Newsletter List Subscriber,Newsletter List Subscriber,Newsletter zoznamu účastníkov
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +164,Morticing,Dlabačky
 DocType: Email Account,Service,Služba
 DocType: Hub Settings,Hub Settings,Nastavení Hub
 DocType: Project,Gross Margin %,Hrubá Marža %
 DocType: BOM,With Operations,S operacemi
 apps/erpnext/erpnext/accounts/party.py +232,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,"Položky účtovníctva už boli vykonané v mene, {0} pre firmu {1}. Vyberte pohľadávky a záväzku účet s menou {0}."
 ,Monthly Salary Register,Měsíční plat Register
-apps/frappe/frappe/website/template.py +140,Next,Ďalej
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard_page.html +17,Next,Ďalej
 DocType: Warranty Claim,If different than customer address,Pokud se liší od adresy zákazníka
 DocType: BOM Operation,BOM Operation,BOM Operation
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +118,Electropolishing,Elektrolytické
 DocType: Purchase Taxes and Charges,On Previous Row Amount,Na předchozí řady Částka
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +24,Please enter Payment Amount in atleast one row,"Prosím, zadejte částku platby aspoň jedné řadě"
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +33,Please enter Payment Amount in atleast one row,"Prosím, zadejte částku platby aspoň jedné řadě"
 DocType: POS Profile,POS Profile,POS Profile
 apps/erpnext/erpnext/config/accounts.py +153,"Seasonality for setting budgets, targets etc.","Sezónnost pro nastavení rozpočtů, cíle atd."
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +238,Row {0}: Payment Amount cannot be greater than Outstanding Amount,Row {0}: Platba Částka nesmí být vyšší než dlužná částka
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +46,Total Unpaid,Celkom Neplatené
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +21,Time Log is not billable,Time Log není zúčtovatelné
 apps/erpnext/erpnext/stock/get_item_details.py +128,"Item {0} is a template, please select one of its variants","Položka {0} je šablóna, prosím vyberte jednu z jeho variantov"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +528,Purchaser,Kupec
+apps/erpnext/erpnext/public/js/setup_wizard.js +272,Purchaser,Kupec
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +81,Net pay cannot be negative,Net plat nemůže být záporný
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +71,Please enter the Against Vouchers manually,Zadejte prosím podle dokladů ručně
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +107,Please enter the Against Vouchers manually,Zadejte prosím podle dokladů ručně
 DocType: SMS Settings,Static Parameters,Statické parametry
 DocType: Purchase Order,Advance Paid,Vyplacené zálohy
 DocType: Item,Item Tax,Daň Položky
@@ -3947,14 +3785,12 @@
 apps/erpnext/erpnext/config/crm.py +48,Send mass SMS to your contacts,Posílat hromadné SMS vašim kontaktům
 DocType: Purchase Taxes and Charges,Consider Tax or Charge for,Zvažte daň či poplatek za
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,Skutečné Množství je povinné
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +42,Cross-rolling,Cross-valcovanie
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +132,Credit Card,Kreditní karta
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +132,Credit Card,Kreditní karta
 DocType: BOM,Item to be manufactured or repacked,Položka být vyráběn nebo znovu zabalena
 apps/erpnext/erpnext/config/stock.py +95,Default settings for stock transactions.,Výchozí nastavení pro akciových transakcí.
 DocType: Purchase Invoice,Next Date,Další data
 DocType: Employee Education,Major/Optional Subjects,Hlavní / Volitelné předměty
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +49,Please enter Taxes and Charges,"Prosím, zadejte Daně a poplatky"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +85,Machining,Obrábanie
 DocType: Sales Invoice Item,Drop Ship,Drop Loď
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","Zde si můžete udržovat rodinné detailů, jako jsou jméno a povolání rodičem, manželem a dětmi"
 DocType: Hub Settings,Seller Name,Prodejce Name
@@ -3964,7 +3800,7 @@
 DocType: Stock Entry,Repack,Přebalit
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +6,You must Save the form before proceeding,Musíte Uložte formulář před pokračováním
 DocType: Item Attribute,Numeric Values,Číselné hodnoty
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +500,Attach Logo,Pripojiť Logo
+apps/erpnext/erpnext/public/js/setup_wizard.js +246,Attach Logo,Pripojiť Logo
 DocType: Customer,Commission Rate,Výše provize
 apps/erpnext/erpnext/stock/doctype/item/item.js +38,Make Variant,Vytvoriť Variant
 apps/erpnext/erpnext/config/hr.py +145,Block leave applications by department.,Aplikace Block dovolené podle oddělení.
@@ -3979,19 +3815,19 @@
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +105,Please select a csv file,Vyberte soubor csv
 DocType: Dropbox Backup,Send Backups to Dropbox,Poslať zálohy na Dropbox
 DocType: Purchase Order,To Receive and Bill,Prijímať a Bill
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +94,Designer,Návrhář
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Designer,Návrhář
 apps/erpnext/erpnext/config/selling.py +121,Terms and Conditions Template,Podmínky Template
 DocType: Serial No,Delivery Details,Zasílání
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +383,Cost Center is required in row {0} in Taxes table for type {1},Nákladové středisko je nutné v řadě {0} na daních tabulka typu {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +386,Cost Center is required in row {0} in Taxes table for type {1},Nákladové středisko je nutné v řadě {0} na daních tabulka typu {1}
 DocType: Item,Automatically create Material Request if quantity falls below this level,"Automatické vytvorenie Materiál žiadosti, pokiaľ množstvo klesne pod túto úroveň"
 ,Item-wise Purchase Register,Item-moudrý Nákup Register
 DocType: Batch,Expiry Date,Datum vypršení platnosti
-apps/erpnext/erpnext/stock/doctype/item/item.py +375,"To set reorder level, item must be a Purchase Item or Manufacturing Item","Ak chcete nastaviť úroveň objednávacie, položka musí byť Nákup položka alebo výrobné položky"
+apps/erpnext/erpnext/stock/doctype/item/item.py +379,"To set reorder level, item must be a Purchase Item or Manufacturing Item","Ak chcete nastaviť úroveň objednávacie, položka musí byť Nákup položka alebo výrobné položky"
 ,Supplier Addresses and Contacts,Dodavatel Adresy a kontakty
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,Nejdřív vyberte kategorii
 apps/erpnext/erpnext/config/projects.py +18,Project master.,Master Project.
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,Neukazovať žiadny symbol ako $ atď vedľa meny.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +330, (Half Day),(Half Day)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +374, (Half Day),(Half Day)
 DocType: Supplier,Credit Days,Úvěrové dny
 DocType: Leave Type,Is Carry Forward,Je převádět
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +478,Get Items from BOM,Získat předměty z BOM
@@ -3999,7 +3835,7 @@
 apps/erpnext/erpnext/config/manufacturing.py +120,Bill of Materials,Kusovník
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +77,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Riadok {0}: Typ Party Party a je nutné pre pohľadávky / záväzky na účte {1}
 DocType: Dropbox Backup,Send Notifications To,Odeslat upozornění
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html +26,Ref Date,Ref Datum
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +54,Ref Date,Ref Datum
 DocType: Employee,Reason for Leaving,Důvod Leaving
 DocType: Expense Claim Detail,Sanctioned Amount,Sankcionována Částka
 DocType: GL Entry,Is Opening,Se otevírá
@@ -4007,4 +3843,3 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +188,Account {0} does not exist,Účet {0} neexistuje
 DocType: Account,Cash,V hotovosti
 DocType: Employee,Short biography for website and other publications.,Krátký životopis na internetové stránky a dalších publikací.
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +31,Please create Salary Structure for employee {0},Prosím vytvořte platovou strukturu pro zaměstnance {0}
diff --git a/erpnext/translations/sl.csv b/erpnext/translations/sl.csv
index 9f30f11..2aaef00 100644
--- a/erpnext/translations/sl.csv
+++ b/erpnext/translations/sl.csv
@@ -1,13 +1,12 @@
 DocType: Employee,Salary Mode,Način plače
 DocType: Cost Center,"Select Monthly Distribution, if you want to track based on seasonality.","Izberite mesečnim izplačilom, če želite spremljati glede na sezono."
 DocType: Employee,Divorced,Ločen
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +86,Warning: Same item has been entered multiple times.,Opozorilo: Same postavka je bila vpisana večkrat.
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +80,Warning: Same item has been entered multiple times.,Opozorilo: Same postavka je bila vpisana večkrat.
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +96,Items already synced,Postavke že sinhronizirano
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,"Dovoli Postavka, ki se doda večkrat v transakciji"
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,Opusti Material obisk {0} pred preklicem te garancije
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +19,Consumer Products,Consumer Products
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,Consumer Products
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +68,Please select Party Type first,Izberite Party Vrsta najprej
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +90,Annealing,Žarjenje
 DocType: Item,Customer Items,Točke strank
 apps/erpnext/erpnext/accounts/doctype/account/account.py +45,Account {0}: Parent account {1} can not be a ledger,Račun {0}: Matično račun {1} ne more biti knjiga
 DocType: Item,Publish Item to hub.erpnext.com,Objavite element na hub.erpnext.com
@@ -20,15 +19,14 @@
 DocType: About Us Settings,Website,Spletna stran
 DocType: POS Profile,Applicable for User,Velja za člane
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +169,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Ustavljen Proizvodnja naročite ni mogoče preklicati, ga najprej Odčepiti preklicati"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +23,Compaction plus sintering,Zbijanje plus sintranje
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,Currency is required for Price List {0},Valuta je potrebna za tečajnico {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Bo izračunana v transakciji.
 DocType: Purchase Order,Customer Contact,Stranka Kontakt
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +549,From Material Request,Od Material zahtevo
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +572,From Material Request,Od Material zahtevo
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} Tree
 DocType: Job Applicant,Job Applicant,Job Predlagatelj
 apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,Ni več zadetkov.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +78,Legal,Pravna
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +34,Legal,Pravna
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +114,Actual type tax cannot be included in Item rate in row {0},Dejanska davčna vrsta ne more biti vključen v ceno postavko v vrstici {0}
 DocType: C-Form,Customer,Stranka
 DocType: Purchase Receipt Item,Required By,Zahtevani Z
@@ -43,7 +41,6 @@
 DocType: Manufacturing Settings,Default 10 mins,Privzeto 10 minut
 DocType: Leave Type,Leave Type Name,Pustite Tip Ime
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +148,Series Updated Successfully,Serija Posodobljeno Uspešno
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +150,Stitching,Šivi
 DocType: Pricing Rule,Apply On,Nanesite na
 DocType: Item Price,Multiple Item prices.,Več cene postavko.
 ,Purchase Order Items To Be Received,Naročilnica Postavke da bodo prejete
@@ -51,8 +48,8 @@
 DocType: Quality Inspection Reading,Parameter,Parameter
 apps/erpnext/erpnext/projects/doctype/project/project.py +43,Expected End Date can not be less than Expected Start Date,Pričakuje Končni datum ne more biti manjši od pričakovanega začetka Datum
 apps/erpnext/erpnext/utilities/transaction_base.py +104,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Vrstica # {0}: Stopnja mora biti enaka kot {1}: {2} ({3} / {4})
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +189,New Leave Application,New Leave Application
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +134,Bank Draft,Bank Osnutek
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +204,New Leave Application,New Leave Application
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +134,Bank Draft,Bank Osnutek
 DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,"1. Da bi ohranili stranke pametno Koda in da bi jim iskanje, ki temelji na njihovi kode uporabite to možnost"
 DocType: Mode of Payment Account,Mode of Payment Account,Način plačilnega računa
 apps/erpnext/erpnext/stock/doctype/item/item.js +34,Show Variants,Prikaži Variante
@@ -64,25 +61,23 @@
 DocType: Production Plan Item,Production Plan Item,Proizvodni načrt Postavka
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +141,User {0} is already assigned to Employee {1},Uporabnik {0} je že dodeljen Employee {1}
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +13,Make new POS Profile,Naredite nov POS Profile
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +31,Health Care,Skrb za zdravje
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,Skrb za zdravje
 DocType: Purchase Invoice,Monthly,Mesečni
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +66,Delay in payment (Days),Zamuda pri plačilu (dnevi)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +494,Invoice,Račun
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +519,Invoice,Račun
 DocType: Maintenance Schedule Item,Periodicity,Periodičnost
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +357,Email Address,Email naslov
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +21,Defense,Obramba
+apps/erpnext/erpnext/public/js/setup_wizard.js +107,Email Address,Email naslov
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,Obramba
 DocType: Company,Abbr,Abbr
 DocType: Appraisal Goal,Score (0-5),Ocena (0-5)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +193,Row {0}: {1} {2} does not match with {3},Vrstica {0}: {1} {2} ne ujema s {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +67,Row # {0}:,Vrstica # {0}:
 DocType: Delivery Note,Vehicle No,Nobeno vozilo
 apps/erpnext/erpnext/public/js/pos/pos.js +528,Please select Price List,Izberite Cenik
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +162,Woodworking,Lesno
 DocType: Production Order Operation,Work In Progress,V razvoju
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +153,3D printing,3D tiskanje
 DocType: Employee,Holiday List,Holiday Seznam
 DocType: Time Log,Time Log,Čas Log
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +530,Accountant,Računovodja
+apps/erpnext/erpnext/public/js/setup_wizard.js +274,Accountant,Računovodja
 DocType: Cost Center,Stock User,Stock Uporabnik
 DocType: Company,Phone No,Telefon Ni
 DocType: Time Log,"Log of Activities performed by users against Tasks that can be used for tracking time, billing.","Dnevnik aktivnosti, ki jih uporabniki zoper Naloge, ki se lahko uporabljajo za sledenje časa, zaračunavanje izvedli."
@@ -98,18 +93,19 @@
 DocType: Bin,Quantity Requested for Purchase,Količina za nabavo
 DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name","Pripni datoteko .csv z dvema stolpcema, eno za staro ime in enega za novim imenom"
 DocType: Packed Item,Parent Detail docname,Parent Detail docname
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Kg,Kg
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Kg,Kg
 apps/erpnext/erpnext/config/hr.py +48,Opening for a Job.,Odpiranje za službo.
 DocType: Item Attribute,Increment,Prirastek
 apps/erpnext/erpnext/public/js/stock_analytics.js +63,Select Warehouse...,Izberite Skladišče ...
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +6,Advertising,Oglaševanje
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,Oglaševanje
+apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,Ista družba je vpisana več kot enkrat
 DocType: Employee,Married,Poročen
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +389,Stock cannot be updated against Delivery Note {0},Stock ni mogoče posodobiti proti dobavnica {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +391,Stock cannot be updated against Delivery Note {0},Stock ni mogoče posodobiti proti dobavnica {0}
 DocType: Payment Reconciliation,Reconcile,Uskladite
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +30,Grocery,Trgovina z živili
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,Trgovina z živili
 DocType: Quality Inspection Reading,Reading 1,Branje 1
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Make Bank Entry,Naredite Bank Entry
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +40,Pension Funds,Pokojninski skladi
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,Pokojninski skladi
 apps/erpnext/erpnext/accounts/doctype/account/account.py +142,Warehouse is mandatory if account type is Warehouse,"Skladišče je obvezna, če tip račun skladišče"
 DocType: SMS Center,All Sales Person,Vse Sales oseba
 DocType: Lead,Person Name,Ime oseba
@@ -130,8 +126,8 @@
 DocType: Blog Post,Guest,Gost
 DocType: Quality Inspection,Get Specification Details,Pridobite Specification Podrobnosti
 DocType: Lead,Interested,Zanima
-apps/erpnext/erpnext/config/manufacturing.py +14,Bill of Material,Bill of Material
-apps/erpnext/erpnext/public/js/stock_analytics.js +45,Opening,Otvoritev
+apps/erpnext/erpnext/config/manufacturing.py +14,Bill of Material,Kosovnica
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +158,Opening,Otvoritev
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},Od {0} do {1}
 DocType: Item,Copy From Item Group,Kopiranje iz postavke skupine
 DocType: Journal Entry,Opening Entry,Otvoritev Začetek
@@ -145,23 +141,22 @@
 DocType: Employee Education,Under Graduate,Pod Graduate
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +22,Target On,Ciljna Na
 DocType: BOM,Total Cost,Skupni stroški
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +99,Reaming,Povrtavanje
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +9,Activity Log:,Dnevnik aktivnosti:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +199,Item {0} does not exist in the system or has expired,Element {0} ne obstaja v sistemu ali je potekla
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +44,Real Estate,Nepremičnina
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +44,Real Estate,Nepremičnina
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +4,Statement of Account,Izkaz računa
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +41,Pharmaceuticals,Farmacevtski izdelki
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,Farmacevtski izdelki
 DocType: Expense Claim Detail,Claim Amount,Trditev Znesek
 DocType: Employee,Mr,gospod
 DocType: Custom Script,Client,Client
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,Dobavitelj Vrsta / dobavitelj
 DocType: Naming Series,Prefix,Predpona
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Consumable,Potrošni
+apps/erpnext/erpnext/public/js/setup_wizard.js +359,Consumable,Potrošni
 DocType: Upload Attendance,Import Log,Uvoz Log
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.js +19,Send,Pošlji
 DocType: Sales Invoice Item,Delivered By Supplier,Delivered dobavitelj
 DocType: SMS Center,All Contact,Vse Kontakt
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +164,Annual Salary,Letne plače
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +164,Annual Salary,Letne plače
 DocType: Period Closing Voucher,Closing Fiscal Year,Zapiranje poslovno leto
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +69,Stock Expenses,Zaloga Stroški
 DocType: Newsletter,Email Sent?,Email Sent?
@@ -169,26 +164,24 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +92,Show Time Logs,Prikaži Čas Dnevniki
 DocType: Journal Entry Account,Credit in Company Currency,Kredit v podjetju valuti
 DocType: Delivery Note,Installation Status,Namestitev Status
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +115,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Sprejeta + Zavrnjeno Količina mora biti enaka Prejeto količini za postavko {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +118,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Sprejeta + Zavrnjeno Količina mora biti enaka Prejeto količini za postavko {0}
 DocType: Item,Supply Raw Materials for Purchase,Dobava surovine za nakup
 apps/erpnext/erpnext/stock/get_item_details.py +133,Item {0} must be a Purchase Item,Postavka {0} mora biti Nakup postavka
 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","Prenesite predloge, izpolnite ustrezne podatke in priložite spremenjeno datoteko. Vsi datumi in zaposleni kombinacija v izbranem obdobju, bo prišel v predlogo, z obstoječimi zapisi postrežbo"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +446,Item {0} is not active or end of life has been reached,Postavka {0} ni aktiven ali je bil dosežen konec življenja
 DocType: Time Log Batch,Will be updated after Sales Invoice is Submitted.,Bo treba posodobiti po Sales predložen račun.
-apps/erpnext/erpnext/controllers/accounts_controller.py +493,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Da vključujejo davek v vrstici {0} v stopnji Element, davki v vrsticah {1} je treba vključiti tudi"
+apps/erpnext/erpnext/controllers/accounts_controller.py +494,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Da vključujejo davek v vrstici {0} v stopnji Element, davki v vrsticah {1} je treba vključiti tudi"
 apps/erpnext/erpnext/config/hr.py +90,Settings for HR Module,Nastavitve za HR modula
 DocType: SMS Center,SMS Center,SMS center
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +78,Straightening,Ravnanje
 DocType: BOM Replace Tool,New BOM,New BOM
 apps/erpnext/erpnext/config/projects.py +28,Batch Time Logs for billing.,Serija Čas Hlodovina za zaračunavanje.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +15,Countergravity casting,Countergravity litje
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +30,Newsletter has already been sent,Glasilo je bilo že poslano
 DocType: Lead,Request Type,Zahteva Type
 DocType: Leave Application,Reason,Razlog
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +14,Broadcasting,Broadcasting
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +140,Execution,Izvedba
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +364,The first user will become the System Manager (you can change this later).,Prvi uporabnik bo postala System Manager (lahko spremenite kasneje).
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,Broadcasting
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +140,Execution,Izvedba
+apps/erpnext/erpnext/public/js/setup_wizard.js +114,The first user will become the System Manager (you can change this later).,Prvi uporabnik bo postala System Manager (lahko spremenite kasneje).
 apps/erpnext/erpnext/config/manufacturing.py +39,Details of the operations carried out.,Podrobnosti o poslovanju izvajajo.
 DocType: Serial No,Maintenance Status,Status vzdrževanje
 apps/erpnext/erpnext/config/stock.py +263,Items and Pricing,Predmeti in Pricing
@@ -205,7 +198,6 @@
 DocType: Pricing Rule,Discount on Price List Rate (%),Popust na ceno iz cenika Stopnja (%)
 apps/frappe/frappe/public/js/frappe/form/print.js +96,Start,Začetek
 DocType: User,First Name,Ime
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +12,Full-mold casting,Full-plesni litje
 DocType: Offer Letter,Select Terms and Conditions,Izberite Pogoji
 DocType: Production Planning Tool,Sales Orders,Prodajni Naročila
 DocType: Purchase Taxes and Charges,Valuation,Vrednotenje
@@ -217,8 +209,7 @@
 DocType: Bank Reconciliation,Bank Account,Bančni račun
 DocType: Leave Type,Allow Negative Balance,Dovoli negativni saldo
 DocType: Selling Settings,Default Territory,Privzeto Territory
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +53,Television,Televizija
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +138,Gashing,Zarezam
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,Televizija
 DocType: Production Order Operation,Updated via 'Time Log',Posodobljeno preko &quot;Čas Logu&quot;
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +82,Account {0} does not belong to Company {1},Račun {0} ne pripada družbi {1}
 DocType: Naming Series,Series List for this Transaction,Serija Seznam za to transakcijo
@@ -233,14 +224,13 @@
 DocType: Leave Allocation,Add unused leaves from previous allocations,Dodaj neuporabljene liste iz prejšnjih dodelitev
 apps/erpnext/erpnext/controllers/recurring_document.py +206,Next Recurring {0} will be created on {1},Naslednja Ponavljajoči {0} se bo ustvaril na {1}
 DocType: Newsletter List,Total Subscribers,Skupaj Naročniki
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +575,Contact Name,Kontaktno ime
+,Contact Name,Kontaktno ime
 DocType: Production Plan Item,SO Pending Qty,SO Do Kol
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Ustvari plačilni list za zgoraj omenjenih kriterijev.
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,Zaprosi za nakup.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +107,Double housing,Dvojno ohišje
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +156,Only the selected Leave Approver can submit this Leave Application,Le izbrani Leave odobritelj lahko predloži pustite to Application
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +171,Only the selected Leave Approver can submit this Leave Application,Le izbrani Leave odobritelj lahko predloži pustite to Application
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,Lajšanje Datum mora biti večja od Datum pridružitve
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +172,Leaves per Year,Listi na leto
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +172,Leaves per Year,Listi na leto
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup > Settings > Naming Series,"Prosim, nastavite Poimenovanje Series za {0} preko Nastavitev&gt; Nastavitve&gt; za poimenovanje Series"
 DocType: Time Log,Will be updated when batched.,"Bo treba posodobiti, če Posodi."
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +104,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,"Vrstica {0}: Prosimo, preverite &quot;Je Advance&quot; proti račun {1}, če je to predujem vnos."
@@ -249,25 +239,24 @@
 DocType: Item Website Specification,Item Website Specification,Element Spletna stran Specifikacija
 DocType: Dropbox Backup,Dropbox Access Key,Dropbox Dostop Key
 DocType: Payment Tool,Reference No,Referenčna številka
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +348,Leave Blocked,Pustite blokiranih
-apps/erpnext/erpnext/stock/doctype/item/item.py +535,Item {0} has reached its end of life on {1},Postavka {0} je konec življenja na {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +392,Leave Blocked,Pustite blokiranih
+apps/erpnext/erpnext/stock/doctype/item/item.py +539,Item {0} has reached its end of life on {1},Postavka {0} je konec življenja na {1}
 apps/erpnext/erpnext/accounts/utils.py +339,Annual,Letno
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Stock Sprava Postavka
 DocType: Stock Entry,Sales Invoice No,Prodaja Račun Ne
 DocType: Material Request Item,Min Order Qty,Min naročilo Kol
 DocType: Lead,Do Not Contact,Ne Pišite
 DocType: Sales Invoice,The unique id for tracking all recurring invoices. It is generated on submit.,Edinstven ID za sledenje vse ponavljajoče račune. To je ustvarila na oddajte.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +93,Software Developer,Razvijalec programske opreme
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +93,Software Developer,Razvijalec programske opreme
 DocType: Item,Minimum Order Qty,Najmanjše naročilo Kol
 DocType: Pricing Rule,Supplier Type,Dobavitelj Type
 DocType: Item,Publish in Hub,Objavite v Hub
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +555,Item {0} is cancelled,Postavka {0} je odpovedan
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +598,Material Request,Material Zahteva
+apps/erpnext/erpnext/stock/doctype/item/item.py +559,Item {0} is cancelled,Postavka {0} je odpovedan
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +607,Material Request,Material Zahteva
 DocType: Bank Reconciliation,Update Clearance Date,Posodobitev Potrditev Datum
 DocType: Item,Purchase Details,Nakup Podrobnosti
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +323,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},"Postavka {0} ni bilo mogoče najti v &quot;surovin, dobavljenih&quot; mizo v narocilo {1}"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +129,Wire brushing,Wire ščetkanje
 DocType: Employee,Relation,Razmerje
 DocType: Shipping Rule,Worldwide Shipping,Dostava po celem svetu
 apps/erpnext/erpnext/config/selling.py +23,Confirmed orders from Customers.,Potrjeni naročila od strank.
@@ -283,12 +272,11 @@
 DocType: Supplier,Address HTML,Naslov HTML
 DocType: Lead,Mobile No.,Mobilni No.
 DocType: Maintenance Schedule,Generate Schedule,Ustvarjajo Urnik
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +81,Hubbing,Hubbing
 DocType: Purchase Invoice Item,Expense Head,Expense Head
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +86,Please select Charge Type first,"Prosimo, izberite Charge Vrsta najprej"
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,Zadnje
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +395,Max 5 characters,Max 5 znakov
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +195,Select Your Language,Izberite svoj jezik
+apps/erpnext/erpnext/public/js/setup_wizard.js +143,Max 5 characters,Max 5 znakov
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +245,Select Your Language,Izberite svoj jezik
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,"Prvi Leave odobritelj na seznamu, bo nastavljen kot privzeti Leave odobritelja"
 DocType: Manufacturing Settings,"Disables creation of time logs against Production Orders.
 Operations shall not be tracked against Production Order",Onemogoči oblikovanje časovnih dnevnikov proti proizvodnji naročil. Operacije se ne gosenicami proti Production reda
@@ -300,8 +288,6 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +34,Item {0} must be Service Item,Postavka {0} mora biti storitev Postavka
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +303,Completed Qty can not be greater than 'Qty to Manufacture',Dopolnil Količina ne sme biti večja od &quot;Kol za Izdelava&quot;
 DocType: DocType,Administrator,Administrator
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +136,Laser drilling,Lasersko vrtanje
-DocType: Stock UOM Replace Utility,New Stock UOM,New Stock UOM
 DocType: Period Closing Voucher,Closing Account Head,Zapiranje računa Head
 DocType: Employee,External Work History,Zunanji Delo Zgodovina
 apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,Krožna Reference Error
@@ -310,18 +296,15 @@
 DocType: Lead,Industry,Industrija
 DocType: Employee,Job Profile,Job profila
 DocType: Newsletter,Newsletter,Newsletter
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +84,Hydroforming,Hidroformiranjem
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +49,Necking,Necking
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Obvesti po e-pošti na ustvarjanje avtomatičnega Material dogovoru
 DocType: Journal Entry,Multi Currency,Multi Valuta
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +51,Item is updated,Točka je posodobljen
 DocType: Async Task,System Manager,System Manager
 DocType: Payment Reconciliation Invoice,Invoice Type,Račun Type
 DocType: Sales Invoice Item,Delivery Note,Poročilo o dostavi
 DocType: Dropbox Backup,Allow Dropbox Access,Dovoli Dropbox dostop
 apps/erpnext/erpnext/config/learn.py +72,Setting up Taxes,Postavitev Davki
 apps/erpnext/erpnext/accounts/utils.py +189,Payment Entry has been modified after you pulled it. Please pull it again.,"Začetek Plačilo je bil spremenjen, ko je potegnil. Prosimo, še enkrat vleči."
-apps/erpnext/erpnext/stock/doctype/item/item.py +343,{0} entered twice in Item Tax,{0} dvakrat vpisana v postavki davku
+apps/erpnext/erpnext/stock/doctype/item/item.py +347,{0} entered twice in Item Tax,{0} dvakrat vpisana v postavki davku
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +105,Summary for this week and pending activities,Povzetek za ta teden in ki potekajo dejavnosti
 DocType: Workstation,Rent Cost,Najem Stroški
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +74,Please select month and year,"Prosimo, izberite mesec in leto"
@@ -338,23 +321,21 @@
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,"Stopnjo, po kateri je naročnik Valuta pretvori v osnovni valuti kupca"
 DocType: Features Setup,"Available in BOM, Delivery Note, Purchase Invoice, Production Order, Purchase Order, Purchase Receipt, Sales Invoice, Sales Order, Stock Entry, Timesheet","Na voljo v BOM, dobavnica, računu o nakupu, proizvodnje reda, narocilo, Potrdilo o nakupu, prodajni fakturi, Sales Order, Stock vstopu, Timesheet"
 DocType: Item Tax,Tax Rate,Davčna stopnja
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Select Item,Izberite Item
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +540,Select Item,Izberite Item
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +143,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","Postavka: {0} je uspelo šaržno, ni mogoče uskladiti z uporabo \ zaloge sprave, namesto tega uporabite zaloge Entry"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +259,Purchase Invoice {0} is already submitted,Nakup Račun {0} je že predložila
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +262,Purchase Invoice {0} is already submitted,Nakup Račun {0} je že predložila
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Batch No must be same as {1} {2},Vrstica # {0}: mora Serija Ne biti enaka kot {1} {2}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Convert to non-Group,"Pretvarjanje, da non-Group"
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +55,Purchase Receipt must be submitted,Potrdilo o nakupu je treba predložiti
-DocType: Stock UOM Replace Utility,Current Stock UOM,Trenutni Stock UOM
 apps/erpnext/erpnext/config/stock.py +53,Batch (lot) of an Item.,Serija (lot) postavke.
 DocType: C-Form Invoice Detail,Invoice Date,Datum računa
 DocType: GL Entry,Debit Amount,Debetne Znesek
 apps/erpnext/erpnext/accounts/party.py +223,There can only be 1 Account per Company in {0} {1},"Ne more biti samo 1 račun na podjetje, v {0} {1}"
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Your email address,Vaš email naslov
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +194,Please see attachment,Glej prilogo
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +203,Please see attachment,Glej prilogo
 DocType: Purchase Order,% Received,% Prejeto
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +109,Water jet cutting,Vodnim curkom
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +24,Setup Already Complete!!,Setup Že Complete !!
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +20,Setup Already Complete!!,Setup Že Complete !!
 ,Finished Goods,"Končnih izdelkov,"
 DocType: Delivery Note,Instructions,Navodila
 DocType: Quality Inspection,Inspected By,Pregledajo
@@ -369,6 +350,7 @@
 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.,"Prosimo, da ne ustvarjajo računov za kupce in dobavitelje. Ti so ustvarili neposredno od Stranka / dobavitelj mojstrov."
 DocType: Currency Exchange,Currency Exchange,Menjalnica
 DocType: Purchase Invoice Item,Item Name,Ime izdelka
+DocType: Authorization Rule,Approving User  (above authorized value),Odobritvi uporabnik (zgoraj pooblaščeni vrednosti)
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Credit Balance,Credit Balance
 DocType: Employee,Widowed,Ovdovela
 DocType: Production Planning Tool,"Items to be requested which are ""Out of Stock"" considering all warehouses based on projected qty and minimum order qty","Postavke, ki bodo zahtevana ki so &quot;Razprodan&quot; ob upoštevanju vseh skladišč, ki temelji na predvidenem kol in minimalnega naročila Kol"
@@ -378,11 +360,10 @@
 ,Purchase Register,Nakup Register
 DocType: Landed Cost Item,Applicable Charges,Veljavnih cenah
 DocType: Workstation,Consumable Cost,Potrošni Stroški
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,{0} ({1}) must have role 'Leave Approver',{0} ({1}) mora imeti vlogo &quot;Leave odobritelj&quot;
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +167,{0} ({1}) must have role 'Leave Approver',{0} ({1}) mora imeti vlogo &quot;Leave odobritelj&quot;
 DocType: Purchase Receipt,Vehicle Date,Datum vozilo
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +39,Medical,Medical
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +39,Medical,Medical
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,Razlog za izgubo
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +36,Tube beading,Tube Nizanje perli
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},Workstation je zaprt na naslednje datume kot na Holiday Seznam: {0}
 DocType: Employee,Single,Samski
 DocType: Issue,Attachment,Attachment
@@ -403,10 +384,8 @@
 DocType: Account,Is Group,Is Group
 DocType: Stock Settings,Automatically Set Serial Nos based on FIFO,Samodejno nastavi Serijska št temelji na FIFO
 DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,Preverite Dobavitelj Številka računa Edinstvenost
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +31,Thermoforming,Toplo
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +66,Slitting,Rezanje
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +57,'To Case No.' cannot be less than 'From Case No.',&quot;Da Case No.&quot; ne more biti nižja od &quot;Od zadevi št &#39;
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +104,Non Profit,Non Profit
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +104,Non Profit,Non Profit
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_list.js +7,Not Started,Ni začelo
 DocType: Lead,Channel Partner,Channel Partner
 DocType: Account,Old Parent,Stara Parent
@@ -415,13 +394,12 @@
 apps/erpnext/erpnext/config/manufacturing.py +74,Global settings for all manufacturing processes.,Globalne nastavitve za vseh proizvodnih procesov.
 DocType: Accounts Settings,Accounts Frozen Upto,Računi Zamrznjena Stanuje
 DocType: SMS Log,Sent On,Pošlje On
-apps/erpnext/erpnext/stock/doctype/item/item.py +512,Attribute {0} selected multiple times in Attributes Table,Lastnost {0} izbrana večkrat v atributih tabeli
+apps/erpnext/erpnext/stock/doctype/item/item.py +516,Attribute {0} selected multiple times in Attributes Table,Lastnost {0} izbrana večkrat v atributih tabeli
 DocType: Sales Order,Not Applicable,Se ne uporablja
 apps/erpnext/erpnext/config/hr.py +140,Holiday master.,Holiday gospodar.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +19,Shell molding,Shell modeliranje
 DocType: Material Request Item,Required Date,Zahtevani Datum
 DocType: Delivery Note,Billing Address,Naslov za pošiljanje računa
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +644,Please enter Item Code.,Vnesite Koda.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +648,Please enter Item Code.,Vnesite Koda.
 DocType: BOM,Costing,Stanejo
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount","Če je omogočeno, se bo štela za znesek davka, kot je že vključena v Print Oceni / Print Znesek"
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,Skupaj Kol
@@ -431,7 +409,7 @@
 DocType: Item Attribute,To Range,Da Domet
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Vrednostne papirje in depozite
 DocType: Features Setup,Imports,Uvoz
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +144,Adhesive bonding,Lepljenje
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +77,Total leaves allocated is mandatory,Skupaj listi dodeljena je obvezna
 DocType: Job Opening,Description of a Job Opening,Opis službo Otvoritev
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +102,Pending activities for today,V čakanju na aktivnosti za danes
 apps/erpnext/erpnext/config/hr.py +28,Attendance record.,Šivih.
@@ -439,26 +417,25 @@
 DocType: Sales Order Item,Used for Production Plan,Uporablja se za proizvodnjo načrta
 DocType: System Settings,Loading...,Nalaganje ...
 DocType: DocField,Password,Geslo
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +155,Fused deposition modeling,Taljenega modeliranje odlaganje
 DocType: Manufacturing Settings,Time Between Operations (in mins),Čas med dejavnostmi (v minutah)
 DocType: Customer,Buyer of Goods and Services.,Kupec blaga in storitev.
 DocType: Journal Entry,Accounts Payable,Računi se plačuje
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +24,Add Subscribers,Dodaj naročnikov
 apps/erpnext/erpnext/public/js/feature_setup.js +220,""" does not exists",&quot;Ne obstaja
 DocType: Pricing Rule,Valid Upto,Valid Stanuje
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +564,List a few of your customers. They could be organizations or individuals.,Naštejte nekaj vaših strank. Ti bi se lahko organizacije ali posamezniki.
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,List a few of your customers. They could be organizations or individuals.,Naštejte nekaj vaših strank. Ti bi se lahko organizacije ali posamezniki.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Direct Income,Neposredne dohodkovne
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +33,"Can not filter based on Account, if grouped by Account","Filter ne more temeljiti na račun, če je združena s račun"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +88,Administrative Officer,Upravni uradnik
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Administrative Officer,Upravni uradnik
 DocType: Payment Tool,Received Or Paid,Prejete ali plačane
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +318,Please select Company,"Prosimo, izberite Company"
 DocType: Stock Entry,Difference Account,Razlika račun
 apps/erpnext/erpnext/projects/doctype/task/task.py +44,Cannot close task as its dependant task {0} is not closed.,"Ne more blizu naloga, saj je njena odvisna Naloga {0} ni zaprt."
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +305,Please enter Warehouse for which Material Request will be raised,"Vnesite skladišče, za katere se bo dvignjeno Material Zahteva"
 DocType: Production Order,Additional Operating Cost,Dodatne operacijski stroškov
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +20,Cosmetics,Kozmetika
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,Kozmetika
 DocType: DocField,Type,Tip
-apps/erpnext/erpnext/stock/doctype/item/item.py +417,"To merge, following properties must be same for both items","Za pripojitev, mora naslednje lastnosti biti enaka za oba predmetov"
+apps/erpnext/erpnext/stock/doctype/item/item.py +421,"To merge, following properties must be same for both items","Za pripojitev, mora naslednje lastnosti biti enaka za oba predmetov"
 DocType: Communication,Subject,Predmet
 DocType: Shipping Rule,Net Weight,Neto teža
 DocType: Employee,Emergency Phone,Zasilna Telefon
@@ -468,7 +445,6 @@
 DocType: Journal Entry,Difference (Dr - Cr),Razlika (Dr - Cr)
 DocType: Account,Profit and Loss,Dobiček in izguba
 apps/erpnext/erpnext/config/stock.py +293,Managing Subcontracting,Upravljanje Podizvajalci
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +58,New UOM must NOT be of type Whole Number,New UOM ne sme biti tipa celo število
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Furniture and Fixture,Pohištvo in koledarjev
 DocType: Quotation,Rate at which Price list currency is converted to company's base currency,"Obrestna mera, po kateri Cenik valuti, se pretvori v osnovni valuti družbe"
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Account {0} does not belong to company: {1},Račun {0} ne pripada podjetju: {1}
@@ -487,14 +463,14 @@
 DocType: Purchase Invoice,Supplier Invoice No,Dobavitelj Račun Ne
 DocType: Territory,For reference,Za sklic
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +154,"Cannot delete Serial No {0}, as it is used in stock transactions","Ne morem izbrisati Serijska št {0}, saj je uporabljen v transakcijah zalogi"
-apps/erpnext/erpnext/public/js/account_tree_grid.js +52,Closing (Cr),Zapiranje (Cr)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +227,Closing (Cr),Zapiranje (Cr)
 DocType: Serial No,Warranty Period (Days),Garancijski rok (dni)
 DocType: Installation Note Item,Installation Note Item,Namestitev Opomba Postavka
 ,Pending Qty,Pending Kol
 DocType: Job Applicant,Thread HTML,Nit HTML
 DocType: Company,Ignore,Ignoriraj
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +86,SMS sent to following numbers: {0},SMS poslan na naslednjih številkah: {0}
-apps/erpnext/erpnext/controllers/buying_controller.py +135,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Dobavitelj Skladišče obvezno za podizvajalcev Potrdilo o nakupu
+apps/erpnext/erpnext/controllers/buying_controller.py +126,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Dobavitelj Skladišče obvezno za podizvajalcev Potrdilo o nakupu
 DocType: Pricing Rule,Valid From,Velja od
 DocType: Sales Invoice,Total Commission,Skupaj Komisija
 DocType: Pricing Rule,Sales Partner,Prodaja Partner
@@ -502,7 +478,7 @@
 DocType: Monthly Distribution,"**Monthly Distribution** helps you distribute your budget across months if you have seasonality in your business.
 
 To distribute a budget using this distribution, set this **Monthly Distribution** in the **Cost Center**","** Mesečni Distribution ** vam pomaga pri razporejanju proračuna po mesecih, če imate sezonskost v vašem podjetju. Distribuirati proračun z uporabo te distribucije, nastavite to ** mesečnim izplačilom ** v ** Center stroškov **"
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +183,No records found in the Invoice table,Ni najdenih v tabeli računa zapisov
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +130,No records found in the Invoice table,Ni najdenih v tabeli računa zapisov
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +20,Please select Company and Party Type first,Izberite podjetja in Zabava Vrsta najprej
 apps/erpnext/erpnext/config/accounts.py +84,Financial / accounting year.,Finančni / računovodstvo leto.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","Oprostite, Serijska št ni mogoče združiti"
@@ -518,25 +494,25 @@
 DocType: Sales Order,Billing and Delivery Status,Zaračunavanje in Delivery Status
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Ponovite Stranke
 DocType: Leave Control Panel,Allocate,Dodeli
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +16,Previous,Prejšnja
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard_page.html +16,Previous,Prejšnja
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +620,Sales Return,Prodaja Return
 DocType: Production Planning Tool,Select Sales Orders from which you want to create Production Orders.,"Izberite prodajnih nalogov, iz katerega želite ustvariti naročila za proizvodnjo."
 DocType: Item,Delivered by Supplier (Drop Ship),Dostavi dobavitelja (Drop Ship)
 apps/erpnext/erpnext/config/hr.py +120,Salary components.,Deli plače.
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,Podatkovna baza potencialnih strank.
+DocType: Authorization Rule,Customer or Item,Stranka ali Postavka
 apps/erpnext/erpnext/config/crm.py +17,Customer database.,Baza podatkov o strankah.
 DocType: Quotation,Quotation To,Kotacija Da
 DocType: Lead,Middle Income,Bližnji Prihodki
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),Odprtino (Cr)
 apps/erpnext/erpnext/accounts/utils.py +193,Allocated amount can not be negative,Dodeljen znesek ne more biti negativna
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +123,Tumbling,Gimnastika
 DocType: Purchase Order Item,Billed Amt,Bremenjenega Amt
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,"Logično Warehouse, zoper katerega so narejeni vnosov zalog."
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +92,Reference No & Reference Date is required for {0},Referenčna št &amp; Referenčni datum je potrebna za {0}
 DocType: Event,Wednesday,Sreda
 DocType: Sales Invoice,Customer's Vendor,Prodajalec stranke
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +214,Production Order is Mandatory,Proizvodnja naročilo je Obvezno
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +139,Proposal Writing,Predlog Pisanje
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,Proposal Writing,Predlog Pisanje
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,Obstaja še ena Sales Oseba {0} z enako id zaposlenih
 apps/erpnext/erpnext/stock/stock_ledger.py +336,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},Negativno Stock Error ({6}) za postavko {0} v skladišču {1} na {2} {3} v {4} {5}
 DocType: Fiscal Year Company,Fiscal Year Company,Fiskalna Leto Company
@@ -559,7 +535,7 @@
 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.","Potem Označevanje cen Pravila se filtrirajo temeljijo na stranke, skupine kupcev, ozemlje, dobavitelja, dobavitelj Type, kampanje, prodajnemu partnerju itd"
 apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.py +179,Please install dropbox python module,Prosimo namestite varno shrambo python modul
 DocType: Employee,Passport Number,Številka potnega lista
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +82,Manager,Manager
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Manager,Manager
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +494,From Purchase Receipt,Od Potrdilo o nakupu
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +219,Same item has been entered multiple times.,Enako postavka je bila vpisana večkrat.
 DocType: SMS Settings,Receiver Parameter,Sprejemnik Parameter
@@ -567,10 +543,9 @@
 DocType: Sales Person,Sales Person Targets,Prodaja Osebni cilji
 apps/frappe/frappe/public/js/frappe/form/workflow.js +116,To,Če želite
 apps/frappe/frappe/templates/base.html +145,Please enter email address,Vnesite e-poštni naslov
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +35,End tube forming,Konec cevarne
 DocType: Production Order Operation,In minutes,V minutah
 DocType: Issue,Resolution Date,Resolucija Datum
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +635,Please set default Cash or Bank account in Mode of Payment {0},"Prosim, nastavite privzeto gotovinski ali bančni račun v načinu plačevanja {0}"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +637,Please set default Cash or Bank account in Mode of Payment {0},"Prosim, nastavite privzeto gotovinski ali bančni račun v načinu plačevanja {0}"
 DocType: Selling Settings,Customer Naming By,Stranka Imenovanje Z
 apps/erpnext/erpnext/accounts/doctype/account/account.js +67,Convert to Group,Pretvarjanje skupini
 DocType: Activity Cost,Activity Type,Vrsta dejavnosti
@@ -578,12 +553,12 @@
 DocType: Customer,Fixed Days,Fiksni dnevi
 DocType: Sales Invoice,Packing List,Seznam pakiranja
 apps/erpnext/erpnext/config/buying.py +28,Purchase Orders given to Suppliers.,Naročila dati dobaviteljev.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +43,Publishing,Založništvo
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +43,Publishing,Založništvo
 DocType: Activity Cost,Projects User,Projekti Uporabnik
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Consumed,Porabljeno
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +198,{0}: {1} not found in Invoice Details table,{0}: {1} ni mogoče najti v računa Podrobnosti tabeli
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,{0}: {1} not found in Invoice Details table,{0}: {1} ni mogoče najti v računa Podrobnosti tabeli
 DocType: Company,Round Off Cost Center,Zaokrožijo stroškovni center
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +208,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Vzdrževanje obisk {0} je treba odpovedati pred preklicem te Sales Order
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +203,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Vzdrževanje obisk {0} je treba odpovedati pred preklicem te Sales Order
 DocType: Material Request,Material Transfer,Prenos materialov
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +56,Opening (Dr),Odprtje (Dr)
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},Napotitev žig mora biti po {0}
@@ -595,7 +570,6 @@
 DocType: Pricing Rule,Sales Manager,Vodja prodaje
 apps/frappe/frappe/public/js/frappe/model/model.js +492,Rename,Preimenovanje
 DocType: Journal Entry,Write Off Amount,Napišite enkratnem znesku
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +52,Bending,Upogibanje
 apps/frappe/frappe/core/page/user_permissions/user_permissions.js +246,Allow User,Dovoli Uporabnik
 DocType: Journal Entry,Bill No,Bill Ne
 DocType: Purchase Invoice,Quarterly,Četrtletno
@@ -605,17 +579,16 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Please enter item details,"Prosimo, vnesite podatke točko"
 DocType: Purchase Receipt,Other Details,Drugi podatki
 DocType: Account,Accounts,Računi
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +67,Marketing,Trženje
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +65,Straight shearing,Naravnost striženje
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +67,Marketing,Trženje
 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.,"Slediti element pri prodaji in nakupu listin, ki temelji na njihovih serijskih nos. To je mogoče uporabiti tudi za sledenje podrobnosti garancijske izdelka."
 DocType: Purchase Receipt Item Supplied,Current Stock,Trenutna zaloga
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +99,Rejected Warehouse is mandatory against regected item,Zavrnjeno Skladišče je obvezna proti regected postavki
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +102,Rejected Warehouse is mandatory against regected item,Zavrnjeno Skladišče je obvezna proti regected postavki
 DocType: Account,Expenses Included In Valuation,Stroški Vključeno v vrednotenju
 DocType: Employee,Provide email id registered in company,"Zagotovite email id, registrirano v družbi"
 DocType: Hub Settings,Seller City,Prodajalec Mesto
 DocType: Email Digest,Next email will be sent on:,Naslednje sporočilo bo poslano na:
 DocType: Offer Letter Term,Offer Letter Term,Pisna ponudba Term
-apps/erpnext/erpnext/stock/doctype/item/item.py +492,Item has variants.,Element ima variante.
+apps/erpnext/erpnext/stock/doctype/item/item.py +496,Item has variants.,Element ima variante.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Postavka {0} ni bilo mogoče najti
 DocType: Bin,Stock Value,Stock Value
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,Tree Type
@@ -624,10 +597,9 @@
 DocType: Material Request Item,Quantity and Warehouse,Količina in skladišča
 DocType: Sales Invoice,Commission Rate (%),Komisija Stopnja (%)
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +172,"Against Voucher Type must be one of Sales Order, Sales Invoice or Journal Entry","Proti bon mora Vrsta biti eden od prodaje reda, Sales računa ali list Začetek"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +139,Biomachining,Biomachining
 apps/erpnext/erpnext/setup/utils.py +89,Unable to find exchange rate,Ni mogoče najti tečaja
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +7,Aerospace,Aerospace
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +19,Welcome,Dobrodošli
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +7,Aerospace,Aerospace
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +40,Welcome,Dobrodošli
 DocType: Journal Entry,Credit Card Entry,Začetek Credit Card
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +18,Task Subject,Naloga Predmet
 apps/erpnext/erpnext/config/stock.py +33,Goods received from Suppliers.,"Blago, prejetih od dobaviteljev."
@@ -650,19 +622,19 @@
 DocType: Employee,Cell Number,Število celic
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Lost
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +120,You can not enter current voucher in 'Against Journal Entry' column,"Ne, ne more vstopiti trenutno bon v &quot;Proti listu vstopa&quot; stolpcu"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +25,Energy,Energy
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,Energy
 DocType: Opportunity,Opportunity From,Priložnost Od
 apps/erpnext/erpnext/config/hr.py +33,Monthly salary statement.,Mesečno poročilo o izplačanih plačah.
 DocType: Item Group,Website Specifications,Spletna Specifikacije
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +205,New Account,Nov račun
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +21,{0}: From {0} of type {1},{0}: Od {0} tipa {1}
-apps/erpnext/erpnext/controllers/buying_controller.py +283,Row {0}: Conversion Factor is mandatory,Vrstica {0}: Factor Pretvorba je obvezna
+apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,Vrstica {0}: Factor Pretvorba je obvezna
 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.,Vknjižbe se lahko izvede pred listnimi vozlišč. Vpisi zoper skupin niso dovoljeni.
 DocType: ToDo,High,Visoka
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +361,Cannot deactivate or cancel BOM as it is linked with other BOMs,Ne more izključiti ali preklicati BOM saj je povezan z drugimi BOMs
 DocType: Opportunity,Maintenance,Vzdrževanje
 DocType: User,Male,Moški
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +182,Purchase Receipt number required for Item {0},Potrdilo o nakupu številka potreben za postavko {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +183,Purchase Receipt number required for Item {0},Potrdilo o nakupu številka potreben za postavko {0}
 DocType: Item Attribute Value,Item Attribute Value,Postavka Lastnost Vrednost
 apps/erpnext/erpnext/config/crm.py +64,Sales campaigns.,Prodajne akcije.
 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.
@@ -691,10 +663,9 @@
 DocType: Address,Personal,Osebni
 DocType: Expense Claim Detail,Expense Claim Type,Expense Zahtevek Type
 DocType: Shopping Cart Settings,Default settings for Shopping Cart,Privzete nastavitve za Košarica
-apps/erpnext/erpnext/controllers/accounts_controller.py +324,"Journal Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Journal Entry {0} je povezano proti odredbi {1}, preverite, če je treba potegniti kot vnaprej v tem računu."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +13,Biotechnology,Biotehnologija
+apps/erpnext/erpnext/controllers/accounts_controller.py +325,"Journal Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Journal Entry {0} je povezano proti odredbi {1}, preverite, če je treba potegniti kot vnaprej v tem računu."
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +13,Biotechnology,Biotehnologija
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Office Maintenance Expenses,Pisarniška Vzdrževanje Stroški
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +53,Hemming,Hemming
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +66,Please enter Item first,"Prosimo, da najprej vnesete artikel"
 DocType: Account,Liability,Odgovornost
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +62,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Sankcionirano Znesek ne sme biti večja od škodnega Znesek v vrstici {0}.
@@ -707,10 +678,10 @@
 DocType: Company,Default Bank Account,Privzeto bančnega računa
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +47,"To filter based on Party, select Party Type first","Za filtriranje, ki temelji na stranke, da izberete Party Vnesite prvi"
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},"&quot;Update Stock&quot;, ni mogoče preveriti, ker so predmeti, ki niso dostavljena prek {0}"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Nos,Nos
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Nos,Nos
 DocType: Item,Items with higher weightage will be shown higher,Postavke z višjo weightage bo prikazan višje
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Banka Sprava Detail
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +627,My Invoices,Moji računi
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +629,My Invoices,Moji računi
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,Najdenih ni delavec
 DocType: Purchase Order,Stopped,Ustavljen
 DocType: Item,If subcontracted to a vendor,Če podizvajanje prodajalca
@@ -729,35 +700,33 @@
 DocType: Features Setup,"To enable ""Point of Sale"" features",Da bi omogočili &quot;prodajno mesto&quot; funkcije
 DocType: Bin,Moving Average Rate,Moving Average Rate
 DocType: Production Planning Tool,Select Items,Izberite Items
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,{0} against Bill {1} dated {2},{0} proti Bill {1} ​​dne {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +328,{0} against Bill {1} dated {2},{0} proti Bill {1} ​​dne {2}
 DocType: Comment,Reference Name,Referenca Ime
 DocType: Maintenance Visit,Completion Status,Zaključek Status
 DocType: Sales Invoice Item,Target Warehouse,Ciljna Skladišče
 DocType: Item,Allow over delivery or receipt upto this percent,Dovoli nad dostavo ali prejem upto tem odstotkov
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +49,Expected Delivery Date cannot be before Sales Order Date,Pričakuje Dostava datum ne more biti pred Sales Order Datum
 DocType: Upload Attendance,Import Attendance,Uvoz Udeležba
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +17,All Item Groups,Vse Postavka Skupine
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +17,All Item Groups,Vse Postavka Skupine
 DocType: Process Payroll,Activity Log,Dnevnik aktivnosti
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +30,Net Profit / Loss,Čisti dobiček / izguba
 apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,Samodejno sestavite sporočilo o predložitvi transakcij.
 DocType: Production Order,Item To Manufacture,Postavka za izdelavo
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +16,Permanent mold casting,Kalup za vlivanje
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} status {2}
 apps/erpnext/erpnext/config/learn.py +172,Purchase Order to Payment,Nakup naročila do plačila
 DocType: Sales Order Item,Projected Qty,Predvidoma Kol
 DocType: Sales Invoice,Payment Due Date,Plačilo Zaradi Datum
 DocType: Newsletter,Newsletter Manager,Newsletter Manager
-apps/erpnext/erpnext/stock/doctype/item/item.js +229,Item Variant {0} already exists with same attributes,Postavka Variant {0} že obstaja z enakimi atributi
+apps/erpnext/erpnext/stock/doctype/item/item.js +231,Item Variant {0} already exists with same attributes,Postavka Variant {0} že obstaja z enakimi atributi
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening',&quot;Odpiranje&quot;
 DocType: Notification Control,Delivery Note Message,Dostava Opomba Sporočilo
 DocType: Expense Claim,Expenses,Stroški
 DocType: Item Variant Attribute,Item Variant Attribute,Postavka Variant Lastnost
 ,Purchase Receipt Trends,Nakup Prejem Trendi
 DocType: Appraisal,Select template from which you want to get the Goals,"Izberite predlogo, iz katere želite, da bi dobili tisočletja"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +77,Research & Development,Raziskave in razvoj
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Research & Development,Raziskave in razvoj
 ,Amount to Bill,Znesek za Bill
 DocType: Company,Registration Details,Registracija Podrobnosti
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +75,Staking,Upravičuje
 DocType: Item,Re-Order Qty,Ponovno naročila Kol
 DocType: Leave Block List Date,Leave Block List Date,Pustite Block List Datum
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +25,Scheduled to send to {0},Načrtovano poslati {0}
@@ -768,18 +737,16 @@
 DocType: Sales Invoice Item,Stock Details,Stock Podrobnosti
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Project Value
 apps/erpnext/erpnext/config/selling.py +304,Point-of-Sale,Prodajno mesto
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,Cannot carry forward {0},"Ne morejo opravljati naprej, {0}"
 apps/erpnext/erpnext/accounts/doctype/account/account.py +91,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","Stanje na računu že v kreditu, ki vam ni dovoljeno, da nastavite &quot;Stanje mora biti&quot; kot &quot;bremenitev&quot;"
 DocType: Account,Balance must be,Ravnotežju mora biti
 DocType: Hub Settings,Publish Pricing,Objavite Pricing
 DocType: Notification Control,Expense Claim Rejected Message,Expense zahtevek zavrnjen Sporočilo
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +145,Nailing,Žeblji
 ,Available Qty,Na voljo Količina
 DocType: Purchase Taxes and Charges,On Previous Row Total,Na prejšnje vrstice Skupaj
 DocType: Salary Slip,Working Days,Delovni dnevi
 DocType: Serial No,Incoming Rate,Dohodni Rate
 DocType: Packing Slip,Gross Weight,Bruto Teža
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +410,The name of your company for which you are setting up this system.,"Ime vašega podjetja, za katero ste vzpostavitvijo tega sistema."
+apps/erpnext/erpnext/public/js/setup_wizard.js +158,The name of your company for which you are setting up this system.,"Ime vašega podjetja, za katero ste vzpostavitvijo tega sistema."
 DocType: HR Settings,Include holidays in Total no. of Working Days,Vključi počitnice v Total no. delovnih dni
 DocType: Job Applicant,Hold,Držite
 DocType: Employee,Date of Joining,Datum pridružitve
@@ -789,7 +756,6 @@
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +3,View Subscribers,Poglej Naročniki
 DocType: Purchase Invoice Item,Purchase Receipt,Potrdilo o nakupu
 ,Received Items To Be Billed,Prejete Postavke placevali
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +114,Abrasive blasting,Abrazivnega sredstva
 DocType: Employee,Ms,gospa
 apps/erpnext/erpnext/config/accounts.py +148,Currency exchange rate master.,Menjalnega tečaja valute gospodar.
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +253,Unable to find Time Slot in the next {0} days for Operation {1},Ni mogoče najti terminu v naslednjih {0} dni za delovanje {1}
@@ -801,7 +767,7 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +209,Serial No {0} does not belong to Item {1},Serijska št {0} ne pripada postavki {1}
 DocType: Purchase Receipt Item Supplied,Required Qty,Zahtevani Kol
 DocType: Bank Reconciliation,Total Amount,Skupni znesek
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +32,Internet Publishing,Internet Založništvo
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,Internet Založništvo
 DocType: Production Planning Tool,Production Orders,Proizvodne Naročila
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +35,Balance Value,Balance Vrednost
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,Prodaja Cenik
@@ -812,7 +778,7 @@
 DocType: Supplier,Default Payable Accounts,Privzete plačuje računov
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,Employee {0} ni aktiven ali pa ne obstaja
 DocType: Features Setup,Item Barcode,Postavka Barcode
-apps/erpnext/erpnext/stock/doctype/item/item.py +487,Item Variants {0} updated,Postavka Variante {0} posodobljen
+apps/erpnext/erpnext/stock/doctype/item/item.py +491,Item Variants {0} updated,Postavka Variante {0} posodobljen
 DocType: Quality Inspection Reading,Reading 6,Branje 6
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Nakup računa Advance
 DocType: Address,Shop,Trgovina
@@ -821,7 +787,7 @@
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,"Privzeto Bank / Cash račun bo samodejno posodobi v POS računa, ko je izbrana ta način."
 DocType: Employee,Permanent Address Is,Stalni naslov je
 DocType: Production Order Operation,Operation completed for how many finished goods?,"Operacija zaključena, za koliko končnih izdelkov?"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +491,The Brand,Brand
+apps/erpnext/erpnext/public/js/setup_wizard.js +237,The Brand,Brand
 apps/erpnext/erpnext/controllers/status_updater.py +163,Allowance for over-{0} crossed for Item {1}.,Dodatek za prekomerno {0} prečkal za postavko {1}.
 DocType: Employee,Exit Interview Details,Exit Intervju Podrobnosti
 DocType: Item,Is Purchase Item,Je Nakup Postavka
@@ -841,16 +807,16 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Indirect Income,Posredna Prihodki
 DocType: Payment Tool,Set Payment Amount = Outstanding Amount,Nastavite Znesek plačila = neporavnanega zneska
 DocType: Contact Us Settings,Address Line 1,Naslov Line 1
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Variance,Variance
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +392,Company Name,ime podjetja
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +53,Variance,Variance
+,Company Name,ime podjetja
 DocType: SMS Center,Total Message(s),Skupaj sporočil (-i)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +515,Select Item for Transfer,Izberite Postavka za prenos
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +538,Select Item for Transfer,Izberite Postavka za prenos
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,Oglejte si seznam vseh videoposnetkov pomočjo
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,"Izberite račun vodja banke, kjer je bila deponirana pregled."
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,"Dovoli uporabniku, da uredite Cenik Ocenite v transakcijah"
 DocType: Pricing Rule,Max Qty,Max Kol
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +106,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Vrstica {0}: morala Plačilo proti prodaja / narocilo vedno označen kot vnaprej
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +16,Chemical,Chemical
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,Chemical
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +693,All items have already been transferred for this Production Order.,Vsi predmeti so že prenesli za to Production Order.
 DocType: Process Payroll,Select Payroll Year and Month,Izberite Payroll leto in mesec
 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""",Pojdi na ustrezno skupino (običajno uporabo sredstev&gt; obratnih sredstev&gt; bančnih računov in ustvarite nov račun (s klikom na Dodaj Child) tipa &quot;banka&quot;
@@ -861,12 +827,12 @@
 DocType: Item,Inspection Criteria,Merila Inšpekcijske
 apps/erpnext/erpnext/config/accounts.py +101,Tree of finanial Cost Centers.,Drevo finanial centrov stalo.
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,Prenese
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +492,Upload your letter head and logo. (you can edit them later).,Naložite svoje pismo glavo in logotip. (lahko jih uredite kasneje).
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +156,White,Bela
+apps/erpnext/erpnext/public/js/setup_wizard.js +238,Upload your letter head and logo. (you can edit them later).,Naložite svoje pismo glavo in logotip. (lahko jih uredite kasneje).
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,White,Bela
 DocType: SMS Center,All Lead (Open),Vse Lead (Open)
 DocType: Purchase Invoice,Get Advances Paid,Get plačanih predplačil
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +362,Attach Your Picture,Priložite svojo sliko
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Make ,Poskrbite
+apps/erpnext/erpnext/public/js/setup_wizard.js +112,Attach Your Picture,Priložite svojo sliko
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +540,Make ,Poskrbite
 DocType: Journal Entry,Total Amount in Words,Skupni znesek v besedi
 DocType: Workflow State,Stop,Stop
 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.,"Prišlo je do napake. Eden verjeten razlog je lahko, da niste shranili obrazec. Obrnite support@erpnext.com če je težava odpravljena."
@@ -875,14 +841,13 @@
 DocType: Lead,Next Contact Date,Naslednja Stik Datum
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,Odpiranje Količina
 DocType: Holiday List,Holiday List Name,Ime Holiday Seznam
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +168,Stock Options,Delniških opcij
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +168,Stock Options,Delniških opcij
 DocType: Journal Entry Account,Expense Claim,Expense zahtevek
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +181,Qty for {0},Količina za {0}
 DocType: Leave Application,Leave Application,Zapusti Application
 apps/erpnext/erpnext/config/hr.py +77,Leave Allocation Tool,Pustite Orodje razdelitve emisijskih
 DocType: Leave Block List,Leave Block List Dates,Pustite Block List termini
 DocType: Company,If Monthly Budget Exceeded (for expense account),Če Mesečni proračun Presežena (za odhodek račun)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +56,Trimming,Obrezovanje
 DocType: Workstation,Net Hour Rate,Neto urna postavka
 DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,Pristali Stroški Potrdilo o nakupu
 DocType: Company,Default Terms,Privzete Pogoji
@@ -890,10 +855,9 @@
 DocType: POS Profile,Cash/Bank Account,Gotovina / bančni račun
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,Removed items with no change in quantity or value.,Odstranjeni deli brez spremembe količine ali vrednosti.
 DocType: Delivery Note,Delivery To,Dostava
-apps/erpnext/erpnext/stock/doctype/item/item.py +509,Attribute table is mandatory,Lastnost miza je obvezna
+apps/erpnext/erpnext/stock/doctype/item/item.py +513,Attribute table is mandatory,Lastnost miza je obvezna
 DocType: Production Planning Tool,Get Sales Orders,Pridobite prodajnih nalogov
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} ne more biti negativna
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +103,Filing,Vložitev
 apps/erpnext/erpnext/templates/form_grid/item_grid.html +72,Discount,Popust
 DocType: Features Setup,Purchase Discounts,Odkupne Popusti
 DocType: Workstation,Wages,Plače
@@ -910,6 +874,7 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +112,You are the Expense Approver for this record. Please Update the 'Status' and Save,Ste Expense odobritelj za ta zapis. Prosimo Posodobite &quot;status&quot; in Shrani
 DocType: Serial No,Creation Document No,Za ustvarjanje dokumentov ni
 DocType: Issue,Issue,Težava
+apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account does not match with Company,Račun se ne ujema z družbo
 apps/erpnext/erpnext/config/stock.py +136,"Attributes for Item Variants. e.g Size, Color etc.","Atributi za postavko variant. primer velikost, barvo itd"
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +39,WIP Warehouse,WIP Skladišče
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +194,Serial No {0} is under maintenance contract upto {1},Serijska št {0} je pod vzdrževalne pogodbe stanuje {1}
@@ -918,7 +883,7 @@
 DocType: Tax Rule,Shipping State,Dostava država
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,Postavka je treba dodati uporabo &quot;dobili predmetov iz nakupu prejemki&quot; gumb
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,Prodajna Stroški
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Buying,Standardna Nakup
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +120,Standard Buying,Standardna Nakup
 DocType: GL Entry,Against,Proti
 DocType: Item,Default Selling Cost Center,Privzeto Center Prodajni Stroški
 DocType: Sales Partner,Implementation Partner,Izvajanje Partner
@@ -939,29 +904,29 @@
 DocType: Time Log Batch,updated via Time Logs,posodablja preko Čas Dnevniki
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,Povprečna starost
 DocType: Opportunity,Your sales person who will contact the customer in future,"Vaš prodajni oseba, ki bo stopil v stik v prihodnosti"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +588,List a few of your suppliers. They could be organizations or individuals.,Naštejte nekaj vaših dobaviteljev. Ti bi se lahko organizacije ali posamezniki.
+apps/erpnext/erpnext/public/js/setup_wizard.js +326,List a few of your suppliers. They could be organizations or individuals.,Naštejte nekaj vaših dobaviteljev. Ti bi se lahko organizacije ali posamezniki.
 DocType: Company,Default Currency,Privzeta valuta
 DocType: Contact,Enter designation of this Contact,Vnesite poimenovanje te Kontakt
 DocType: Contact Us Settings,Address,Naslov
 DocType: Expense Claim,From Employee,Od zaposlenega
-apps/erpnext/erpnext/controllers/accounts_controller.py +338,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Opozorilo: Sistem ne bo preveril previsokih saj znesek za postavko {0} v {1} je nič
+apps/erpnext/erpnext/controllers/accounts_controller.py +339,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Opozorilo: Sistem ne bo preveril previsokih saj znesek za postavko {0} v {1} je nič
 DocType: Journal Entry,Make Difference Entry,Naredite Razlika Entry
 DocType: Upload Attendance,Attendance From Date,Udeležba Od datuma
 DocType: Appraisal Template Goal,Key Performance Area,Key Uspešnost Area
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +54,Transportation,Prevoz
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +54,Transportation,Prevoz
 apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +67, and year: ,in leto:
 DocType: Email Digest,Annual Expense,Letno Expense
 DocType: SMS Center,Total Characters,Skupaj Znaki
-apps/erpnext/erpnext/controllers/buying_controller.py +139,Please select BOM in BOM field for Item {0},"Prosimo, izberite BOM BOM v polju za postavko {0}"
+apps/erpnext/erpnext/controllers/buying_controller.py +130,Please select BOM in BOM field for Item {0},"Prosimo, izberite BOM BOM v polju za postavko {0}"
 DocType: C-Form Invoice Detail,C-Form Invoice Detail,C-Form Račun Detail
 DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,Plačilo Sprava Račun
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +32,Contribution %,Prispevek%
 DocType: Item,website page link,spletna stran link
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +192,Let's prepare the system for first use.,Oglejmo pripraviti sistem za prvo uporabo.
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +242,Let's prepare the system for first use.,Oglejmo pripraviti sistem za prvo uporabo.
 DocType: Company,Company registration numbers for your reference. Tax numbers etc.,Registracija podjetja številke za vaše reference. Davčne številke itd
 DocType: Sales Partner,Distributor,Distributer
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Košarica Dostava Pravilo
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +214,Production Order {0} must be cancelled before cancelling this Sales Order,Proizvodnja naročite {0} je treba preklicati pred preklicem te Sales Order
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +209,Production Order {0} must be cancelled before cancelling this Sales Order,Proizvodnja naročite {0} je treba preklicati pred preklicem te Sales Order
 ,Ordered Items To Be Billed,Naročeno Postavke placevali
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +24,From Range has to be less than To Range,Od mora biti manj Razpon kot gibala
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +21,Select Time Logs and Submit to create a new Sales Invoice.,Izberite Time Dnevniki in predložiti ustvariti nov prodajni fakturi.
@@ -981,14 +946,13 @@
 DocType: Sales Invoice Advance,Sales Invoice Advance,Prodaja Račun Advance
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +398,Nothing to request,Nič zahtevati
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date',&quot;Dejanski datum začetka&quot; ne more biti večja od &quot;dejanskim koncem Datum&quot;
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +75,Management,Vodstvo
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +75,Management,Vodstvo
 apps/erpnext/erpnext/config/projects.py +33,Types of activities for Time Sheets,Vrste dejavnosti za delo in odhodov
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +14,Investment casting,Litja
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +51,Either debit or credit amount is required for {0},Bodisi debetna ali kreditna znesek je potreben za {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""","To bo dodan Točka Kodeksa variante. Na primer, če je vaša kratica je &quot;SM&quot;, in oznaka postavka je &quot;T-shirt&quot;, postavka koda varianto bo &quot;T-SHIRT-SM&quot;"
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,"Neto Pay (z besedami), bo viden, ko boste shranite plačilnega lista."
 apps/frappe/frappe/core/doctype/user/user_list.js +12,Active,Active
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +154,Blue,Modra
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +154,Blue,Modra
 DocType: Purchase Invoice,Is Return,Je Return
 DocType: Price List Country,Price List Country,Cenik Država
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +123,Further nodes can be only created under 'Group' type nodes,Nadaljnje vozlišča lahko ustvari samo na podlagi tipa vozlišča &quot;skupina&quot;
@@ -998,18 +962,16 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +22,POS Profile {0} already created for user: {1} and company {2},POS Profil {0} že ustvarili za uporabnika: {1} in podjetje {2}
 DocType: Purchase Order Item,UOM Conversion Factor,UOM Conversion Factor
 DocType: Stock Settings,Default Item Group,Privzeto Element Group
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +156,Laminated object manufacturing,Lepljeno objekt za proizvodnjo
 apps/erpnext/erpnext/config/buying.py +13,Supplier database.,Dobavitelj baze podatkov.
 DocType: Account,Balance Sheet,Bilanca stanja
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +561,Cost Center For Item with Item Code ',Stalo Center za postavko s točko zakonika &quot;
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +45,Stretch forming,Natezno preoblikovanje
 DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,"Vaš prodajni oseba bo dobil opomin na ta dan, da se obrnete na stranko"
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +210,"Further accounts can be made under Groups, but entries can be made against non-Groups","Nadaljnje računi se lahko izvede v skupinah, vendar vnosi lahko zoper niso skupin"
 apps/erpnext/erpnext/config/hr.py +125,Tax and other salary deductions.,Davčna in drugi odbitki plače.
 DocType: Lead,Lead,Svinec
 DocType: Email Digest,Payables,Obveznosti
 DocType: Account,Warehouse,Skladišče
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +90,Row #{0}: Rejected Qty can not be entered in Purchase Return,Vrstica # {0}: Zavrnjena Kol ne more biti vpisana v Nabava Nazaj
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +93,Row #{0}: Rejected Qty can not be entered in Purchase Return,Vrstica # {0}: Zavrnjena Kol ne more biti vpisana v Nabava Nazaj
 ,Purchase Order Items To Be Billed,Naročilnica Postavke placevali
 DocType: Purchase Invoice Item,Net Rate,Net Rate
 DocType: Purchase Invoice Item,Purchase Invoice Item,Nakup računa item
@@ -1024,13 +986,13 @@
 DocType: Global Defaults,Current Fiscal Year,Tekočem proračunskem letu
 DocType: Global Defaults,Disable Rounded Total,Onemogoči Zaobljeni Skupaj
 DocType: Lead,Call,Call
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +384,'Entries' cannot be empty,&quot;Navedbe&quot; ne more biti prazna
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +386,'Entries' cannot be empty,&quot;Navedbe&quot; ne more biti prazna
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},Dvojnik vrstica {0} z enako {1}
 ,Trial Balance,Trial Balance
 apps/erpnext/erpnext/config/hr.py +205,Setting up Employees,Postavitev Zaposleni
 apps/erpnext/erpnext/public/js/feature_setup.js +220,"Grid """,Mreža &quot;
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +150,Please select prefix first,"Prosimo, izberite predpono najprej"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +138,Research,Raziskave
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +138,Research,Raziskave
 DocType: Maintenance Visit Purpose,Work Done,Delo končano
 apps/erpnext/erpnext/controllers/item_variant.py +25,Please specify at least one attribute in the Attributes table,Prosimo navedite vsaj en atribut v tabeli Atributi
 DocType: Contact,User ID,Uporabniško ime
@@ -1038,10 +1000,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +57,View Ledger,Ogled Ledger
 DocType: File,Lft,LFT
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Najzgodnejša
-apps/erpnext/erpnext/stock/doctype/item/item.py +394,"An Item Group exists with same name, please change the item name or rename the item group","Element, skupina obstaja z istim imenom, vas prosimo, spremenite ime elementa ali preimenovati skupino element"
+apps/erpnext/erpnext/stock/doctype/item/item.py +398,"An Item Group exists with same name, please change the item name or rename the item group","Element, skupina obstaja z istim imenom, vas prosimo, spremenite ime elementa ali preimenovati skupino element"
 DocType: Communication,Delivery Status,Dostava Status
 DocType: Production Order,Manufacture against Sales Order,Izdelava zoper Sales Order
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +517,Rest Of The World,Ostali svet
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +455,Rest Of The World,Ostali svet
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,Postavki {0} ne more imeti Batch
 ,Budget Variance Report,Proračun Varianca Poročilo
 DocType: Salary Slip,Gross Pay,Bruto Pay
@@ -1052,13 +1014,11 @@
 DocType: BOM Item,Item Description,Postavka Opis
 DocType: Payment Tool,Payment Mode,Način Plačilo
 DocType: Purchase Invoice,Is Recurring,Je Ponavljajoči
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +154,Direct metal laser sintering,Neposrednega laserskega sintranja kovinskih
 DocType: Purchase Order,Supplied Items,Priložena Items
 DocType: Production Order,Qty To Manufacture,Količina za izdelavo
 DocType: Buying Settings,Maintain same rate throughout purchase cycle,Ohraniti enako stopnjo celotni nabavni cikel
 DocType: Opportunity Item,Opportunity Item,Priložnost Postavka
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +61,Temporary Opening,Začasna Otvoritev
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +41,Cryorolling,Cryorolling
 ,Employee Leave Balance,Zaposleni Leave Balance
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +128,Balance for Account {0} must always be {1},"Saldo račun {0}, morajo biti vedno {1}"
 DocType: Address,Address Type,Naslov Type
@@ -1074,23 +1034,23 @@
 DocType: Journal Entry,Get Outstanding Invoices,Pridobite neplačanih računov
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,Sales Order {0} ni veljaven
 apps/erpnext/erpnext/setup/doctype/company/company.py +172,"Sorry, companies cannot be merged","Oprostite, podjetja ne morejo biti združeni"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +145,Small,Majhno
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Small,Majhno
 DocType: Employee,Employee Number,Število zaposlenih
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},Zadeva št (y) že v uporabi. Poskusite z zadevo št {0}
 ,Invoiced Amount (Exculsive Tax),Obračunani znesek (Exculsive Tax)
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,Postavka 2
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +59,Account head {0} created,Glava račun {0} ustvaril
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +153,Green,Green
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Green,Green
 DocType: Item,Auto re-order,Auto re-order
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +57,Total Achieved,Skupaj Doseženi
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +59,Total Achieved,Skupaj Doseženi
 DocType: Employee,Place of Issue,Kraj izdaje
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +59,Contract,Naročilo
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Contract,Naročilo
 DocType: Report,Disabled,Onemogočeno
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +490,UOM coversion factor required for UOM: {0} in Item: {1},"UOM coversion dejavnik, potreben za UOM: {0} v postavki: {1}"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +83,Indirect Expenses,Posredni stroški
 apps/erpnext/erpnext/controllers/selling_controller.py +163,Row {0}: Qty is mandatory,Vrstica {0}: Kol je obvezna
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +8,Agriculture,Kmetijstvo
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +611,Your Products or Services,Svoje izdelke ali storitve
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,Kmetijstvo
+apps/erpnext/erpnext/public/js/setup_wizard.js +347,Your Products or Services,Svoje izdelke ali storitve
 DocType: Mode of Payment,Mode of Payment,Način plačila
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,"To je skupina, root element in ga ni mogoče urejati."
 DocType: Journal Entry Account,Purchase Order,Naročilnica
@@ -1102,7 +1062,7 @@
 DocType: Serial No,Serial No Details,Serijska št Podrobnosti
 DocType: Purchase Invoice Item,Item Tax Rate,Postavka Davčna stopnja
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +113,"For {0}, only credit accounts can be linked against another debit entry","Za {0}, lahko le kreditne račune povezati proti drugemu vstop trajnika"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Delivery Note {0} is not submitted,Dobavnica {0} ni predložila
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +470,Delivery Note {0} is not submitted,Dobavnica {0} ni predložila
 apps/erpnext/erpnext/stock/get_item_details.py +136,Item {0} must be a Sub-contracted Item,Postavka {0} mora biti podizvajalcev item
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,Kapitalski Oprema
 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.","Cen Pravilo je najprej treba izbrati glede na &quot;Uporabi On &#39;polju, ki je lahko točka, točka Group ali Brand."
@@ -1112,7 +1072,7 @@
 DocType: Appraisal Goal,Goal,Cilj
 DocType: Sales Invoice Item,Edit Description,Uredi Opis
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +318,Expected Delivery Date is lesser than Planned Start Date.,Pričakuje Dobavni rok je manj od načrtovanega začetni datum.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +579,For Supplier,Za dobavitelja
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +602,For Supplier,Za dobavitelja
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,Nastavitev Vrsta računa pomaga pri izbiri ta račun v transakcijah.
 DocType: Purchase Invoice,Grand Total (Company Currency),Grand Total (družba Valuta)
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,Skupaj Odhodni
@@ -1130,7 +1090,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +432,BOM {0} does not belong to Item {1},BOM {0} ne pripada postavki {1}
 DocType: Sales Partner,Target Distribution,Target Distribution
 apps/frappe/frappe/public/js/frappe/model/model.js +25,Comments,Komentarji
-DocType: Salary Slip,Bank Account No.,Bančni račun No.
+DocType: Salary Slip,Bank Account No.,Št. bančnega računa
 DocType: Naming Series,This is the number of the last created transaction with this prefix,To je številka zadnjega ustvarjene transakcijo s tem predpono
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +172,Valuation Rate required for Item {0},Oceni Vrednotenje potreben za postavko {0}
 DocType: Quality Inspection Reading,Reading 8,Branje 8
@@ -1138,10 +1098,10 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +74,"Total {0} for all items is zero, may you should change 'Distribute Charges Based On'","Skupno {0} za vse postavke je nič, morda bi morali spremeniti &quot;Razdeli pristojbin na podlagi&quot;"
 DocType: Purchase Invoice,Taxes and Charges Calculation,Davki in dajatve Izračun
 DocType: BOM Operation,Workstation,Workstation
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +112,Hardware,Strojna oprema
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +112,Hardware,Strojna oprema
 DocType: Attendance,HR Manager,HR Manager
 apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,Prosimo izberite Company
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +50,Privilege Leave,Privilege Zapusti
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +50,Privilege Leave,Privilege Zapusti
 DocType: Purchase Invoice,Supplier Invoice Date,Dobavitelj Datum računa
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +79,You need to enable Shopping Cart,Morate omogočiti Košarica
 apps/frappe/frappe/public/js/frappe/form/grid_body.html +6,No Data,Ni podatkov
@@ -1154,7 +1114,7 @@
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +81,Overlapping conditions found between:,Prekrivajoča pogoji najdemo med:
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +168,Against Journal Entry {0} is already adjusted against some other voucher,Proti listu Začetek {0} je že prilagojena proti neki drugi kupon
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +68,Total Order Value,Skupna vrednost naročila
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +38,Food,Hrana
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +38,Food,Hrana
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Staranje Območje 3
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +139,You can make a time log only against a submitted production order,"Lahko naredite časovni dnevnik le zoper predložene proizvodnje, da bi"
 DocType: Maintenance Schedule Item,No of Visits,Število obiskov
@@ -1174,6 +1134,7 @@
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,View Offer Letter,Ogled Ponudba Letter
 DocType: Communication,Communication,Sporočilo
 DocType: Item,Is Service Item,Je Service Postavka
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +81,Application period cannot be outside leave allocation period,Prijavni rok ne more biti obdobje dodelitve izven dopusta
 DocType: Activity Cost,Projects,Projekti
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +31,Please select Fiscal Year,"Prosimo, izberite poslovno leto"
 apps/erpnext/erpnext/controllers/buying_controller.py +23,From {0} | {1} {2},Od {0} | {1} {2}
@@ -1192,7 +1153,7 @@
 DocType: Item,Maintain Stock,Ohraniti park
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +213,Stock Entries already created for Production Order ,Zaloga Vpisi že ustvarjene za proizvodnjo red
 DocType: Leave Control Panel,Leave blank if considered for all designations,"Pustite prazno, če velja za vse označb"
-apps/erpnext/erpnext/controllers/accounts_controller.py +499,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Naboj tip &quot;Dejanski&quot; v vrstici {0} ni mogoče vključiti v postavko Rate
+apps/erpnext/erpnext/controllers/accounts_controller.py +500,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Naboj tip &quot;Dejanski&quot; v vrstici {0} ni mogoče vključiti v postavko Rate
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,Max: {0},Max: {0}
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +16,From Datetime,Od datetime
 DocType: Email Digest,For Company,Za podjetja
@@ -1202,7 +1163,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +50,Chart of Accounts,Kontnem
 DocType: Material Request,Terms and Conditions Content,Pogoji in vsebina
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +471,cannot be greater than 100,ne more biti večja kot 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +546,Item {0} is not a stock Item,Postavka {0} ni zaloge Item
+apps/erpnext/erpnext/stock/doctype/item/item.py +550,Item {0} is not a stock Item,Postavka {0} ni zaloge Item
 DocType: Maintenance Visit,Unscheduled,Nenačrtovana
 DocType: Employee,Owned,Lasti
 DocType: Salary Slip Deduction,Depends on Leave Without Pay,Odvisno od dopusta brez plačila
@@ -1216,30 +1177,28 @@
 DocType: HR Settings,Employee Settings,Nastavitve zaposlenih
 ,Batch-Wise Balance History,Serija-Wise Balance Zgodovina
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +72,To Do List,Seznam opravil
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +63,Apprentice,Vajenec
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Apprentice,Vajenec
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +99,Negative Quantity is not allowed,Negativno Količina ni dovoljeno
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
 Used for Taxes and Charges",Davčna podrobnosti tabela nerealne iz postavke mojstra kot vrvico in shranjena na tem področju. Uporablja se za davki in dajatve
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +61,Lancing,Lancing
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +151,Employee cannot report to himself.,Delavec ne more poročati zase.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Če računa je zamrznjeno, so vpisi dovoljeni omejenih uporabnikov."
 DocType: Email Digest,Bank Balance,Banka Balance
-apps/erpnext/erpnext/controllers/accounts_controller.py +435,Accounting Entry for {0}: {1} can only be made in currency: {2},"Računovodstvo Vstop za {0}: lahko {1}, se izvede le v valuti: {2}"
+apps/erpnext/erpnext/controllers/accounts_controller.py +436,Accounting Entry for {0}: {1} can only be made in currency: {2},"Računovodstvo Vstop za {0}: lahko {1}, se izvede le v valuti: {2}"
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +38,No active Salary Structure found for employee {0} and the month,Ni aktivnega iskanja za zaposlenega {0} in meseca Plača Struktura
 DocType: Job Opening,"Job profile, qualifications required etc.","Profil delovnega mesta, potrebna usposobljenost itd"
 DocType: Journal Entry Account,Account Balance,Stanje na računu
 apps/erpnext/erpnext/config/accounts.py +112,Tax Rule for transactions.,Davčna pravilo za transakcije.
 DocType: Rename Tool,Type of document to rename.,Vrsta dokumenta preimenovati.
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +630,We buy this Item,Kupimo ta artikel
+apps/erpnext/erpnext/public/js/setup_wizard.js +366,We buy this Item,Kupimo ta artikel
 DocType: Address,Billing,Zaračunavanje
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +77,Flanging,Flanging
 DocType: Bulk Email,Not Sent,Ni Poslano
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +73,Explosive forming,Eksplozivno oblikovanje
 DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),Skupaj davki in dajatve (Company valuti)
 DocType: Shipping Rule,Shipping Account,Dostava račun
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +43,Scheduled to send to {0} recipients,Načrtovano poslati {0} prejemnikov
 DocType: Quality Inspection,Readings,Readings
 DocType: Stock Entry,Total Additional Costs,Skupaj Dodatni stroški
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Sub Assemblies,Sklope
+apps/erpnext/erpnext/public/js/setup_wizard.js +359,Sub Assemblies,Sklope
 DocType: Shipping Rule Condition,To Value,Do vrednosti
 DocType: Supplier,Stock Manager,Stock Manager
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +143,Source warehouse is mandatory for row {0},Vir skladišče je obvezna za vrstico {0}
@@ -1249,44 +1208,42 @@
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Uvoz uspelo!
 apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,Še ni naslov dodal.
 DocType: Workstation Working Hour,Workstation Working Hour,Workstation delovno uro
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +83,Analyst,Analitik
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +202,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},"Vrstica {0}: Dodeljena količina {1}, mora biti manjša ali enaka JV znesku {2}"
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Analyst,Analitik
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +149,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},"Vrstica {0}: Dodeljena količina {1}, mora biti manjša ali enaka JV znesku {2}"
 DocType: Item,Inventory,Popis
 DocType: Features Setup,"To enable ""Point of Sale"" view",Da bi omogočili &quot;prodajno mesto&quot; pogled
 apps/erpnext/erpnext/public/js/pos/pos.js +402,Payment cannot be made for empty cart,Plačilo ne more biti narejen za prazen voziček
 DocType: Item,Sales Details,Prodajna Podrobnosti
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +149,Pinning,Pripenjanje
 DocType: Opportunity,With Items,Z Items
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,V Kol
 DocType: Notification Control,Expense Claim Rejected,Expense zahtevek zavrnjen
 DocType: Sales Invoice,"The date on which next invoice will be generated. It is generated on submit.
 ","Datum, na katerega se bo ustvarila naslednji račun. To je ustvarila na oddajte."
 DocType: Item Attribute,Item Attribute,Postavka Lastnost
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +105,Government,Vlada
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Government,Vlada
 apps/erpnext/erpnext/config/stock.py +268,Item Variants,Artikel Variante
 DocType: Company,Services,Storitve
 apps/erpnext/erpnext/accounts/report/financial_statements.py +147,Total ({0}),Skupaj ({0})
 DocType: Cost Center,Parent Cost Center,Parent Center Stroški
 DocType: Sales Invoice,Source,Vir
 DocType: Leave Type,Is Leave Without Pay,Se Leave brez plačila
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +186,No records found in the Payment table,Ni najdenih v tabeli plačil zapisov
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +405,Financial Year Start Date,Proračunsko leto Start Date
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +133,No records found in the Payment table,Ni najdenih v tabeli plačil zapisov
+apps/erpnext/erpnext/public/js/setup_wizard.js +153,Financial Year Start Date,Proračunsko leto Start Date
 DocType: Employee External Work History,Total Experience,Skupaj Izkušnje
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +100,Countersinking,Grezenju
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +271,Packing Slip(s) cancelled,Dobavnico (e) odpovedan
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +276,Packing Slip(s) cancelled,Dobavnico (e) odpovedan
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,Tovorni in Forwarding Stroški
 DocType: Material Request Item,Sales Order No,Prodaja Zaporedna številka
 DocType: Item Group,Item Group Name,Item Name Group
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +50,Taken,Taken
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,Taken
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +66,Transfer Materials for Manufacture,Transferji Materiali za Izdelava
 DocType: Pricing Rule,For Price List,Za cenik
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +27,Executive Search,Executive Search
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,Executive Search
 apps/erpnext/erpnext/stock/stock_ledger.py +405,"Purchase rate for item: {0} not found, which is required to book accounting entry (expense). Please mention item price against a buying price list.","Nakupni tečaj za postavko: {0} ni mogoče najti, ki je potrebna za rezervacijo knjižbo (odhodki). Navedite ceno artikla proti seznama za nakupno ceno."
 DocType: Maintenance Schedule,Schedules,Urniki
 DocType: Purchase Invoice Item,Net Amount,Neto znesek
 DocType: Purchase Order Item Supplied,BOM Detail No,BOM Detail Ne
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),Dodatni popust Znesek (Valuta Company)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +537,Error: {0} > {1},Napaka: {0}&gt; {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +541,Error: {0} > {1},Napaka: {0}&gt; {1}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,"Prosimo, ustvarite nov račun iz kontnega načrta."
 DocType: Maintenance Visit,Maintenance Visit,Vzdrževanje obisk
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer > Customer Group > Territory,Stranka&gt; Skupina Customer&gt; Territory
@@ -1297,7 +1254,6 @@
 DocType: Event,Tuesday,Torek
 DocType: Leave Block List,Block Holidays on important days.,Blokiranje Počitnice na pomembnih dni.
 ,Accounts Receivable Summary,Terjatve Povzetek
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +43,Leaves for type {0} already allocated for Employee {1} for period {2} - {3},Listi za tip {0} že dodeljene za Employee {1} za obdobje {2} - {3}
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +187,Please set User ID field in an Employee record to set Employee Role,"Prosim, nastavite ID uporabnika polje v zapisu zaposlenih za določen Vloga zaposlenih"
 DocType: UOM,UOM Name,UOM Name
 DocType: Top Bar Item,Target,Target
@@ -1309,15 +1265,14 @@
 DocType: ToDo,Due Date,Datum zapadlosti
 DocType: Sales Invoice Item,Brand Name,Blagovna znamka
 DocType: Purchase Receipt,Transporter Details,Transporter Podrobnosti
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Box,Škatla
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +389,The Organization,Organizacija
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Box,Škatla
+apps/erpnext/erpnext/public/js/setup_wizard.js +137,The Organization,Organizacija
 DocType: Monthly Distribution,Monthly Distribution,Mesečni Distribution
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,"Sprejemnik Seznam je prazen. Prosimo, da ustvarite sprejemnik seznam"
 DocType: Production Plan Sales Order,Production Plan Sales Order,Proizvodni načrt Sales Order
 DocType: Sales Partner,Sales Partner Target,Prodaja Partner Target
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},Računovodstvo Vstop za {0} se lahko izvede samo v valuti: {1}
 DocType: Pricing Rule,Pricing Rule,Cen Pravilo
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +58,Notching,Prepuščanjem
 apps/erpnext/erpnext/config/learn.py +167,Material Request to Purchase Order,Material Zahteva za narocilo
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +74,Row # {0}: Returned Item {1} does not exists in {2} {3},Vrstica # {0}: Vrnjeno Postavka {1} ne obstaja v {2} {3}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,Bančni računi
@@ -1334,20 +1289,19 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Amounts not reflected in bank,"Zneski, ki se ne odraža v banki"
 DocType: Quality Inspection Reading,Reading 4,Branje 4
 apps/erpnext/erpnext/config/hr.py +23,Claims for company expense.,Terjatve za račun družbe.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +8,Centrifugal casting,Centrifugalno litje
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +119,Magnetic field-assisted finishing,Magnetno polje pomaga oplemenitenje
 DocType: Company,Default Holiday List,Privzeto Holiday seznam
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +165,Stock Liabilities,Zaloga Obveznosti
 DocType: Purchase Receipt,Supplier Warehouse,Dobavitelj Skladišče
 DocType: Opportunity,Contact Mobile No,Kontakt Mobile No
 DocType: Production Planning Tool,Select Sales Orders,Izberite prodajnih nalogov
 ,Material Requests for which Supplier Quotations are not created,Material Prošnje za katere so Dobavitelj Citati ni ustvaril
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +117,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,"Dan (s), na kateri se prijavljate za dopust, so prazniki. Vam ni treba zaprositi za dopust."
 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.,Za sledenje predmetov s pomočjo črtne kode. Morda ne boste mogli vnesti elemente v dobavnice in prodajne fakture s skeniranjem črtne kode elementa.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +477,Mark as Delivered,Označi kot Delivered
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +497,Mark as Delivered,Označi kot Delivered
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +34,Make Quotation,Naredite predračun
 DocType: Dependent Task,Dependent Task,Odvisna Task
-apps/erpnext/erpnext/stock/doctype/item/item.py +306,Conversion factor for default Unit of Measure must be 1 in row {0},"Faktor pretvorbe za privzeto mersko enoto, mora biti 1 v vrstici {0}"
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,Leave of type {0} cannot be longer than {1},Dopust tipa {0} ne more biti daljši od {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +310,Conversion factor for default Unit of Measure must be 1 in row {0},"Faktor pretvorbe za privzeto mersko enoto, mora biti 1 v vrstici {0}"
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +155,Leave of type {0} cannot be longer than {1},Dopust tipa {0} ne more biti daljši od {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Poskusite načrtovanju operacij za X dni vnaprej.
 DocType: HR Settings,Stop Birthday Reminders,Stop Birthday opomniki
 DocType: SMS Center,Receiver List,Sprejemnik Seznam
@@ -1355,15 +1309,14 @@
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Porabljeni znesek
 apps/erpnext/erpnext/public/js/pos/pos.js +491,{0} View,{0} Pogled
 DocType: Salary Structure Deduction,Salary Structure Deduction,Plača Struktura Odbitek
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +158,Selective laser sintering,Selektivno lasersko sintranje
-apps/erpnext/erpnext/stock/doctype/item/item.py +301,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Merska enota {0} je v pretvorbeni faktor tabeli vpisana več kot enkrat
+apps/erpnext/erpnext/stock/doctype/item/item.py +305,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Merska enota {0} je v pretvorbeni faktor tabeli vpisana več kot enkrat
 apps/frappe/frappe/core/page/data_import_tool/data_import_tool.js +108,Import Successful!,Uvoz uspešno!
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Strošek izdanih postavk
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +185,Quantity must not be more than {0},Količina ne sme biti več kot {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +41,Age (Days),Starost (dnevi)
 DocType: Quotation Item,Quotation Item,Kotacija Postavka
 DocType: Account,Account Name,Ime računa
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +41,From Date cannot be greater than To Date,Od datum ne more biti večja kot doslej
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +34,From Date cannot be greater than To Date,Od datum ne more biti večja kot doslej
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +194,Serial No {0} quantity {1} cannot be a fraction,Serijska št {0} količina {1} ne more biti del
 apps/erpnext/erpnext/config/buying.py +59,Supplier Type master.,Dobavitelj Type gospodar.
 DocType: Purchase Order Item,Supplier Part Number,Dobavitelj Številka dela
@@ -1372,14 +1325,14 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +247,{0} {1} is cancelled or stopped,{0} {1} je odpovedan ali ustavi
 DocType: Accounts Settings,Credit Controller,Credit Controller
 DocType: Delivery Note,Vehicle Dispatch Date,Vozilo Dispatch Datum
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +197,Purchase Receipt {0} is not submitted,Potrdilo o nakupu {0} ni predložila
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +198,Purchase Receipt {0} is not submitted,Potrdilo o nakupu {0} ni predložila
 DocType: Company,Default Payable Account,Privzeto plačljivo račun
 apps/erpnext/erpnext/config/website.py +13,"Settings for online shopping cart such as shipping rules, price list etc.","Nastavitve za spletni košarici, kot so predpisi v pomorskem prometu, cenik itd"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +660,Setup Complete,Setup Complete
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +124,Setup Complete,Setup Complete
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +65,{0}% Billed,{0}% zaračunali
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +17,Reserved Qty,Rezervirano Kol
 DocType: Party Account,Party Account,Račun Party
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +74,Human Resources,Človeški viri
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +74,Human Resources,Človeški viri
 DocType: Lead,Upper Income,Zgornja Prihodki
 DocType: Journal Entry Account,Debit in Company Currency,Debetno v podjetju valuti
 apps/erpnext/erpnext/support/doctype/issue/issue.py +58,My Issues,Moja vprašanja
@@ -1388,11 +1341,9 @@
 DocType: Company,Default Values,Privzete vrednosti
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +236,Row {0}: Payment amount can not be negative,Vrstica {0}: Znesek plačila ne more biti negativna
 DocType: Expense Claim,Total Amount Reimbursed,"Skupnega zneska, povrnjenega"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +152,Press fitting,Sporočilo za vgradnjo
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +64,Against Supplier Invoice {0} dated {1},Zoper dobavitelja Račun {0} dne {1}
 DocType: Customer,Default Price List,Privzeto Cenik
 DocType: Payment Reconciliation,Payments,Plačila
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +24,Hot isostatic pressing,Vroče izostatično stiskanje
 DocType: ToDo,Medium,Medium
 DocType: Budget Detail,Budget Allocated,Proračun Dodeljena
 DocType: Journal Entry,Entry Type,Začetek Type
@@ -1405,9 +1356,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +56,None of the items have any change in quantity or value.,Nobena od postavk imate kakršne koli spremembe v količini ali vrednosti.
 DocType: Warranty Claim,Warranty Claim,Garancija zahtevek
 ,Lead Details,Svinec Podrobnosti
-DocType: Authorization Rule,Approving User,Odobritvi Uporabnik
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +37,Forging,Kovanje
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +126,Plating,Plating
 DocType: Purchase Invoice,End date of current invoice's period,Končni datum obdobja tekočega faktura je
 DocType: Pricing Rule,Applicable For,Velja za
 DocType: Bank Reconciliation,From Date,Od datuma
@@ -1429,31 +1377,29 @@
 DocType: Sales Invoice,Paid Amount (Company Currency),Plačan znesek (družba Valuta)
 DocType: Purchase Invoice,Additional Discount,Dodatni popust
 DocType: Selling Settings,Selling Settings,Prodaja Nastavitve
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +39,Online Auctions,Online Dražbe
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,Online Dražbe
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +94,Please specify either Quantity or Valuation Rate or both,"Prosimo, navedite bodisi količina ali Ocenite vrednotenja ali oboje"
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +50,"Company, Month and Fiscal Year is mandatory","Podjetje, Mesec in poslovno leto je obvezna"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Marketing Expenses,Marketing Stroški
 ,Item Shortage Report,Postavka Pomanjkanje Poročilo
-apps/erpnext/erpnext/stock/doctype/item/item.js +183,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Teža je omenjeno, \ nProsim omenja &quot;Teža UOM&quot; preveč"
+apps/erpnext/erpnext/stock/doctype/item/item.js +185,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Teža je omenjeno, \ nProsim omenja &quot;Teža UOM&quot; preveč"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,Material Zahteva se uporablja za izdelavo tega staleža Entry
 apps/erpnext/erpnext/config/support.py +43,Single unit of an Item.,Enotni enota točke.
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +212,Time Log Batch {0} must be 'Submitted',Čas Log Serija {0} je treba &quot;Submitted&quot;
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,Naredite vknjižba Za vsako borzno gibanje
 DocType: Leave Allocation,Total Leaves Allocated,Skupaj Listi Dodeljena
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +384,Warehouse required at Row No {0},Skladišče zahteva pri Row št {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +386,Warehouse required at Row No {0},Skladišče zahteva pri Row št {0}
 DocType: Employee,Date Of Retirement,Datum upokojitve
 DocType: Upload Attendance,Get Template,Get predlogo
 DocType: Address,Postal,Postal
 DocType: Item,Weightage,Weightage
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +159,Mining,Rudarstvo
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +17,Resin casting,Resin litje
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"A Skupina kupcev obstaja z istim imenom, prosimo spremenite ime stranke ali preimenovati skupino odjemalcev"
 apps/erpnext/erpnext/public/js/pos/pos.js +147,Please select {0} first.,"Prosimo, izberite {0} prvi."
 apps/erpnext/erpnext/templates/pages/order.html +57,text {0},Besedilo {0}
 DocType: Territory,Parent Territory,Parent Territory
 DocType: Quality Inspection Reading,Reading 2,Branje 2
 DocType: Stock Entry,Material Receipt,Material Prejem
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +622,Products,Izdelki
+apps/erpnext/erpnext/public/js/setup_wizard.js +358,Products,Izdelki
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +47,Party Type and Party is required for Receivable / Payable account {0},"Vrsta stranka in stranka, ki je potrebna za terjatve / obveznosti račun {0}"
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.","Če ima ta postavka variante, potem ne more biti izbran v prodajnih naročil itd"
 DocType: Lead,Next Contact By,Naslednja Kontakt Z
@@ -1463,13 +1409,13 @@
 DocType: Purchase Invoice,Notification Email Address,Obvestilo e-poštni naslov
 DocType: Payment Tool,Find Invoices to Match,"Najdi račune, da se ujemajo"
 ,Item-wise Sales Register,Element-pametno Sales Registriraj se
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +399,"e.g. ""XYZ National Bank""",npr &quot;XYZ National Bank&quot;
+apps/erpnext/erpnext/public/js/setup_wizard.js +147,"e.g. ""XYZ National Bank""",npr &quot;XYZ National Bank&quot;
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,Je to DDV vključen v osnovni stopnji?
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +57,Total Target,Skupaj Target
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Target,Skupaj Target
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.js +22,Shopping Cart is enabled,Košarica je omogočena
 DocType: Job Applicant,Applicant for a Job,Kandidat za službo
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +173,No Production Orders created,Ni Proizvodne Naročila ustvarjena
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +131,Salary Slip of employee {0} already created for this month,Plača listek delavca {0} že ustvarjena za ta mesec
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +140,Salary Slip of employee {0} already created for this month,Plača listek delavca {0} že ustvarjena za ta mesec
 DocType: Stock Reconciliation,Reconciliation JSON,Sprava JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Preveč stolpcev. Izvoziti poročilo in ga natisnete s pomočjo aplikacije za preglednice.
 DocType: Sales Invoice Item,Batch No,Serija Ne
@@ -1479,14 +1425,14 @@
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +13,Variant,Variant
 apps/frappe/frappe/public/js/frappe/form/toolbar.js +165,New {0},New {0}
 DocType: Naming Series,Set prefix for numbering series on your transactions,Nastavite predpona za številčenje serij na vaše transakcije
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +169,Stopped order cannot be cancelled. Unstop to cancel.,Ustavil naročila ni mogoče preklicati. Odčepiti preklicati.
-apps/erpnext/erpnext/stock/doctype/item/item.py +323,Default BOM ({0}) must be active for this item or its template,Privzeto BOM ({0}) mora biti aktiven za to postavko ali njeno predlogo
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +164,Stopped order cannot be cancelled. Unstop to cancel.,Ustavil naročila ni mogoče preklicati. Odčepiti preklicati.
+apps/erpnext/erpnext/stock/doctype/item/item.py +327,Default BOM ({0}) must be active for this item or its template,Privzeto BOM ({0}) mora biti aktiven za to postavko ali njeno predlogo
 DocType: Employee,Leave Encashed?,Dopusta unovčijo?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Priložnost Iz polja je obvezno
 DocType: Item,Variants,Variante
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +458,Make Purchase Order,Naredite narocilo
 DocType: SMS Center,Send To,Pošlji
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +111,There is not enough leave balance for Leave Type {0},Ni dovolj bilanca dopust za dopust tipa {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +127,There is not enough leave balance for Leave Type {0},Ni dovolj bilanca dopust za dopust tipa {0}
 DocType: Sales Team,Contribution to Net Total,Prispevek k Net Total
 DocType: Sales Invoice Item,Customer's Item Code,Koda artikla stranke
 DocType: Stock Reconciliation,Stock Reconciliation,Stock Sprava
@@ -1523,11 +1469,11 @@
 DocType: Sales Order Item,Actual Qty,Dejanska Količina
 DocType: Sales Invoice Item,References,Reference
 DocType: Quality Inspection Reading,Reading 10,Branje 10
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +612,"List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start.","Seznam vaših izdelkov ali storitev, ki jih kupujejo ali prodajajo. Poskrbite, da preverite skupino item, merska enota in ostalih nepremičninah, ko začnete."
+apps/erpnext/erpnext/public/js/setup_wizard.js +348,"List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start.","Seznam vaših izdelkov ali storitev, ki jih kupujejo ali prodajajo. Poskrbite, da preverite skupino item, merska enota in ostalih nepremičninah, ko začnete."
 DocType: Hub Settings,Hub Node,Hub Node
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,"Vnesli ste podvojene elemente. Prosimo, popravi in ​​poskusite znova."
 apps/erpnext/erpnext/controllers/item_variant.py +65,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values,Vrednost {0} za Attribute {1} ne obstaja na seznamu veljavnega Postavka vrednosti atributov
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +87,Associate,Sodelavec
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Associate,Sodelavec
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +46,Item {0} is not a serialized Item,Postavka {0} ni serialized postavka
 DocType: SMS Center,Create Receiver List,Ustvarite sprejemnik seznam
 apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +5,Expired,Potekel
@@ -1536,7 +1482,7 @@
 DocType: Warranty Claim,Issue Date,Datum izdaje
 DocType: Activity Cost,Activity Cost,Stroški dejavnost
 DocType: Purchase Receipt Item Supplied,Consumed Qty,Porabljeno Kol
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +52,Telecommunications,Telekomunikacije
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +52,Telecommunications,Telekomunikacije
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),"Kaže, da je paket del tega dostave (samo osnutka)"
 DocType: Payment Tool,Make Payment Entry,Naredite Entry plačila
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +119,Quantity for Item {0} must be less than {1},Količina za postavko {0} sme biti manjša od {1}
@@ -1553,10 +1499,8 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +37,"Selling must be checked, if Applicable For is selected as {0}","Prodajanje je treba preveriti, če se uporablja za izbrana kot {0}"
 DocType: Purchase Order Item,Supplier Quotation Item,Dobavitelj Kotacija Postavka
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +27,Make Salary Structure,Naredite plač Struktura
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +54,Shearing,Striženje
 DocType: Item,Has Variants,Ima Variante
 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.,"S klikom na gumb &quot;Make Sales računu&quot;, da ustvarite nov prodajni fakturi."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +166,Packaging and labeling,Pakiranje in označevanje
 DocType: Monthly Distribution,Name of the Monthly Distribution,Ime mesečnim izplačilom
 DocType: Sales Person,Parent Sales Person,Nadrejena Sales oseba
 apps/erpnext/erpnext/setup/utils.py +14,Please specify Default Currency in Company Master and Global Defaults,"Prosimo, navedite privzeta valuta v podjetju mojstrom in globalne privzetih"
@@ -1567,19 +1511,18 @@
 DocType: Budget Detail,Fiscal Year,Poslovno leto
 DocType: Cost Center,Budget,Proračun
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +41,"Budget cannot be assigned against {0}, as it's not an Income or Expense account","Proračun ne more biti dodeljena pred {0}, ker to ni prihodek ali odhodek račun"
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Achieved,Doseženi
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,Doseženi
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +65,Territory / Customer,Territory / Stranka
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,e.g. 5,na primer 5
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +207,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},"Vrstica {0}: Dodeljena količina {1}, mora biti manjša ali enaka zaračunati neodplačanega {2}"
+apps/erpnext/erpnext/public/js/setup_wizard.js +294,e.g. 5,na primer 5
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},"Vrstica {0}: Dodeljena količina {1}, mora biti manjša ali enaka zaračunati neodplačanega {2}"
 DocType: Sales Invoice,In Words will be visible once you save the Sales Invoice.,"V besedi bo viden, ko boste prihranili prodajni fakturi."
 DocType: Item,Is Sales Item,Je Sales Postavka
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,Element Group Tree
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,Postavka {0} ni setup za Serijska št. Preverite item mojster
 DocType: Maintenance Visit,Maintenance Time,Vzdrževanje čas
 ,Amount to Deliver,"Znesek, Deliver"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +620,A Product or Service,Izdelek ali storitev
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +158,There were errors.,Tam so bile napake.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +101,Tapping,Prisluškovanje
+apps/erpnext/erpnext/public/js/setup_wizard.js +356,A Product or Service,Izdelek ali storitev
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +146,There were errors.,Tam so bile napake.
 DocType: Naming Series,Current Value,Trenutna vrednost
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +171,{0} created,{0} ustvaril
 DocType: Delivery Note Item,Against Sales Order,Proti Sales Order
@@ -1593,7 +1536,7 @@
 apps/erpnext/erpnext/accounts/party.py +275,Due Date cannot be before Posting Date,Rok ne more biti pred datumom knjiženja
 DocType: Website Item Group,Website Item Group,Spletna stran Element Group
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Duties and Taxes,Dajatve in davki
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Please enter Reference date,Vnesite Referenčni datum
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +312,Please enter Reference date,Vnesite Referenčni datum
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} vnosov plačil ni mogoče filtrirati s {1}
 DocType: Item Website Specification,Table for Item that will be shown in Web Site,"Tabela za postavko, ki bo prikazana na spletni strani"
 DocType: Purchase Order Item Supplied,Supplied Qty,Priložena Kol
@@ -1601,7 +1544,7 @@
 apps/erpnext/erpnext/config/stock.py +103,Tree of Item Groups.,Drevo Artikel skupin.
 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,Ne more sklicevati številko vrstice večja ali enaka do trenutne številke vrstice za to vrsto Charge
 ,Item-wise Purchase History,Element-pametno Zgodovina nakupov
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +152,Red,Red
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Red,Red
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +228,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},"Prosimo, kliknite na &quot;ustvarjajo Seznamu&quot; puščati Serijska št dodal za postavko {0}"
 DocType: Account,Frozen,Frozen
 ,Open Production Orders,Odprte Proizvodne Naročila
@@ -1616,7 +1559,7 @@
 DocType: Item Attribute,Attribute Name,Ime atributa
 apps/erpnext/erpnext/controllers/selling_controller.py +236,Item {0} must be Sales or Service Item in {1},Postavka {0} mora biti prodaja ali storitev postavka v {1}
 DocType: Item Group,Show In Website,Pokaži V Website
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +621,Group,Skupina
+apps/erpnext/erpnext/public/js/setup_wizard.js +357,Group,Skupina
 DocType: Task,Expected Time (in hours),Pričakovani čas (v urah)
 ,Qty to Order,Količina naročiti
 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","Za sledenje blagovno znamko v naslednjih dokumentih dobavnica, Priložnost, Industrijska zahtevo postavki, narocilo, nakup kupona, kupec prejemu, navajanje, prodajne fakture, Product Bundle, Sales Order Zaporedna številka"
@@ -1626,6 +1569,7 @@
 DocType: Features Setup,Brands,Blagovne znamke
 DocType: C-Form Invoice Detail,Invoice No,Račun št
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +480,From Purchase Order,Od narocilo
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +92,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Pustite se ne more uporabiti / preklicana pred {0}, saj je bilanca dopust že-carry posredujejo v evidenco dodeljevanja dopust prihodnji {1}"
 DocType: Activity Cost,Costing Rate,Stanejo Rate
 ,Customer Addresses And Contacts,Naslovi strank in kontakti
 DocType: Employee,Resignation Letter Date,Odstop pismo Datum
@@ -1633,35 +1577,31 @@
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +137,Not Set,Ni nastavljeno
 DocType: Communication,Date,Datum
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,Ponovite Customer Prihodki
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +651,Sit tight while your system is being setup. This may take a few moments.,"Sit tesen, medtem ko je vaš sistem pa nastavitev. To lahko traja nekaj trenutkov."
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +115,Sit tight while your system is being setup. This may take a few moments.,"Sit tesen, medtem ko je vaš sistem pa nastavitev. To lahko traja nekaj trenutkov."
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +51,{0} ({1}) must have role 'Expense Approver',{0} ({1}) mora imeti vlogo &quot;Expense odobritelju&quot;
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Pair,Par
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Pair,Par
 DocType: Bank Reconciliation Detail,Against Account,Proti račun
 DocType: Maintenance Schedule Detail,Actual Date,Dejanski datum
 DocType: Item,Has Batch No,Ima Serija Ne
 DocType: Delivery Note,Excise Page Number,Trošarinska Številka strani
 DocType: Employee,Personal Details,Osebne podrobnosti
 ,Maintenance Schedules,Vzdrževanje Urniki
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +44,Embossing,Embossing
 ,Quotation Trends,Narekovaj Trendi
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +139,Item Group not mentioned in item master for item {0},"Element Group, ki niso navedeni v točki mojster za postavko {0}"
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +302,Debit To account must be a Receivable account,Bremenitev računa mora biti Terjatve račun
-apps/erpnext/erpnext/stock/doctype/item/item.py +310,"As Production Order can be made for this item, it must be a stock item.","Kot je Produkcija naročilo lahko izvede za to postavko, mora biti točka parka."
 DocType: Shipping Rule Condition,Shipping Amount,Dostava Znesek
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +140,Joining,Pridružitev
-DocType: Authorization Rule,Above Value,Nad vrednostjo
 ,Pending Amount,Dokler Znesek
 DocType: Purchase Invoice Item,Conversion Factor,Faktor pretvorbe
 DocType: Purchase Order,Delivered,Delivered
 apps/erpnext/erpnext/config/hr.py +160,Setup incoming server for jobs email id. (e.g. jobs@example.com),Setup dohodni strežnik za delovna mesta email id. (npr jobs@example.com)
 DocType: Purchase Receipt,Vehicle Number,Število vozil
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,"Datum, na katerega se bodo ponavljajoče račun stop"
+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,Skupaj dodeljena listi {0} ne sme biti manjši od že odobrenih listov {1} za obdobje
 DocType: Journal Entry,Accounts Receivable,Terjatve
 ,Supplier-Wise Sales Analytics,Dobavitelj-Wise Prodajna Analytics
 DocType: Address Template,This format is used if country specific format is not found,"Ta oblika se uporablja, če je ni mogoče najti poseben format državo"
 DocType: Custom Field,Custom,Po meri
 DocType: Production Order,Use Multi-Level BOM,Uporabite Multi-Level BOM
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +26,Injection molding,Vbrizgavanje
 DocType: Bank Reconciliation,Include Reconciled Entries,Vključi uskladiti Entries
 apps/erpnext/erpnext/config/accounts.py +41,Tree of finanial accounts.,Drevo finanial računov.
 DocType: Leave Control Panel,Leave blank if considered for all employee types,"Pustite prazno, če velja za vse vrste zaposlenih"
@@ -1671,30 +1611,28 @@
 apps/frappe/frappe/config/setup.py +130,Printing,Tiskanje
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +114,Expense Claim is pending approval. Only the Expense Approver can update status.,Expense Terjatev čaka na odobritev. Samo Expense odobritelj lahko posodobite stanje.
 DocType: Purchase Invoice,Additional Discount Amount,Dodatni popust Količina
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +99,The day(s) on which you are applying for leave are holiday. You need not apply for leave.,"Dan (s), na kateri se prijavljate za dopust, so počitnice. Vam ni treba zaprositi za dopust."
 apps/frappe/frappe/public/js/frappe/misc/utils.js +110,and,in
 DocType: Leave Block List Allow,Leave Block List Allow,Pustite Block List Dovoli
 apps/erpnext/erpnext/setup/doctype/company/company.py +236,Abbr can not be blank or space,Abbr ne more biti prazen ali prostor
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +50,Sports,Šport
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,Šport
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Actual,Skupaj Actual
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Unit,Enota
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Unit,Enota
 apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.py +182,Please set Dropbox access keys in your site config,"Prosim, nastavite tipke za dostop Dropbox v vašem mestu config"
 apps/erpnext/erpnext/stock/get_item_details.py +113,Please specify Company,"Prosimo, navedite Company"
 ,Customer Acquisition and Loyalty,Stranka Pridobivanje in zvestobe
 DocType: Purchase Receipt,Warehouse where you are maintaining stock of rejected items,"Skladišče, kjer ste vzdrževanje zalog zavrnjenih predmetov"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +408,Your financial year ends on,Vaš proračunsko leto konča na
+apps/erpnext/erpnext/public/js/setup_wizard.js +156,Your financial year ends on,Vaš proračunsko leto konča na
 DocType: POS Profile,Price List,Cenik
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +20,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,"{0} je zdaj privzeta poslovno leto. Prosimo, osvežite brskalnik za spremembe začele veljati."
 apps/erpnext/erpnext/projects/doctype/project/project.js +47,Expense Claims,Odhodkov Terjatve
 DocType: Issue,Support,Podpora
-DocType: Authorization Rule,Approving Role,Odobritvi vloge
 ,BOM Search,BOM Iskanje
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +176,Closing (Opening + Totals),Zapiranje (Odpiranje + vsote)
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +26,Please specify currency in Company,"Prosimo, navedite valuto v družbi"
 DocType: Workstation,Wages per hour,Plače na uro
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},Stock ravnotežje Serija {0} bo postal negativen {1} za postavko {2} v skladišču {3}
 apps/erpnext/erpnext/config/setup.py +83,"Show / Hide features like Serial Nos, POS etc.","Prikaži / Skrij funkcije, kot zaporedne številke, POS itd"
-apps/erpnext/erpnext/controllers/accounts_controller.py +236,Account {0} is invalid. Account Currency must be {1},Račun {0} ni veljavna. Valuta računa mora biti {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +237,Account {0} is invalid. Account Currency must be {1},Račun {0} ni veljavna. Valuta računa mora biti {1}
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +34,UOM Conversion factor is required in row {0},Faktor UOM Pretvorba je potrebno v vrstici {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +53,Clearance date cannot be before check date in row {0},Datum razdalja ne more biti pred datumom check zapored {0}
 DocType: Salary Slip,Deduction,Odbitek
@@ -1713,13 +1651,13 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +82,Item {0} has already been returned,Postavka {0} je bil že vrnjen
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** Fiscal Year ** predstavlja poslovno leto. Vse vknjižbe in druge velike transakcije so gosenicami proti ** poslovnega leta **.
 DocType: Opportunity,Customer / Lead Address,Stranka / Lead Naslov
+apps/erpnext/erpnext/stock/doctype/item/item.py +112,Warning: Invalid SSL certificate on attachment {0},Opozorilo: Neveljavno potrdilo SSL za pritrditev {0}
 DocType: Production Order Operation,Actual Operation Time,Dejanska Operacija čas
 DocType: Authorization Rule,Applicable To (User),Ki se uporabljajo za (Uporabnik)
 DocType: Purchase Taxes and Charges,Deduct,Odbitka
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +170,Job Description,Opis dela
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +170,Job Description,Opis dela
 DocType: Purchase Order Item,Qty as per Stock UOM,Kol kot na borzi UOM
 apps/frappe/frappe/model/rename_doc.py +343,Please select a valid csv file with data,Izberite veljavno datoteko CSV s podatki
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +92,Coating,Premaz
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +126,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Posebni znaki razen &quot;-&quot; &quot;.&quot;, &quot;#&quot;, in &quot;/&quot; ni dovoljena v poimenovanju serijo"
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Spremljajte prodajnih akcij. Spremljajte Interesenti, citatov, Sales Order itd iz akcije, da bi ocenili donosnost naložbe."
 DocType: Expense Claim,Approver,Odobritelj
@@ -1729,12 +1667,11 @@
 DocType: Supplier Quotation,Manufacturing Manager,Proizvodnja Manager
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},Serijska št {0} je pod garancijo stanuje {1}
 apps/erpnext/erpnext/config/stock.py +69,Split Delivery Note into packages.,Split Dostava Opomba v pakete.
-apps/erpnext/erpnext/hooks.py +84,Shipments,Pošiljke
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +29,Dip molding,Dip modeliranje
+apps/erpnext/erpnext/hooks.py +68,Shipments,Pošiljke
 DocType: Purchase Order,To be delivered to customer,Ki jih je treba dostaviti kupcu
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,Status čas Prijava je treba predložiti.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,Serijska št {0} ne pripada nobeni Warehouse
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +650,Setting Up,Nastavitev
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +114,Setting Up,Nastavitev
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,Row # ,Vrstica #
 DocType: Purchase Invoice,In Words (Company Currency),V besedi (družba Valuta)
 DocType: Pricing Rule,Supplier,Dobavitelj
@@ -1742,8 +1679,8 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +105,Miscellaneous Expenses,Razni stroški
 DocType: Global Defaults,Default Company,Privzeto Company
 apps/erpnext/erpnext/controllers/stock_controller.py +166,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,Odhodek ali Razlika račun je obvezna za postavko {0} saj to vpliva na skupna vrednost zalog
-apps/erpnext/erpnext/controllers/accounts_controller.py +354,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","Ne more overbill za postavko {0} v vrstici {1} več kot {2}. Da bi omogočili previsokih računov, vas prosimo, nastavite na zalogi Nastavitve"
-DocType: Employee,Bank Name,Ime Bank
+apps/erpnext/erpnext/controllers/accounts_controller.py +355,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","Ne more overbill za postavko {0} v vrstici {1} več kot {2}. Da bi omogočili previsokih računov, vas prosimo, nastavite na zalogi Nastavitve"
+DocType: Employee,Bank Name,Ime Banke
 apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +27,-Above,-Nad
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +135,User {0} is disabled,Uporabnik {0} je onemogočena
 DocType: Leave Application,Total Leave Days,Skupaj dni dopusta
@@ -1755,27 +1692,26 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,{0} is mandatory for Item {1},{0} je obvezna za postavko {1}
 DocType: Currency Exchange,From Currency,Iz valute
 DocType: DocField,Name,Name
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +211,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Prosimo, izberite Dodeljeni znesek, fakture Vrsta in številka računa v atleast eno vrstico"
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +104,Sales Order required for Item {0},Sales Order potreben za postavko {0}
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +158,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Prosimo, izberite Dodeljeni znesek, fakture Vrsta in številka računa v atleast eno vrstico"
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +107,Sales Order required for Item {0},Sales Order potreben za postavko {0}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +43,Amounts not reflected in system,"Zneski, ki se ne odraža v sistemu"
 DocType: Purchase Invoice Item,Rate (Company Currency),Oceni (družba Valuta)
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +40,Others,Drugi
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +40,Others,Drugi
 apps/erpnext/erpnext/templates/includes/product_page.js +80,Cannot find a matching Item. Please select some other value for {0}.,"Ne morete najti ujemanja artikel. Prosimo, izberite kakšno drugo vrednost za {0}."
 DocType: POS Profile,Taxes and Charges,Davki in dajatve
 DocType: Item,"A Product or a Service that is bought, sold or kept in stock.","Izdelek ali storitev, ki je kupil, prodal ali jih hranijo na zalogi."
 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,Ne morete izbrati vrsto naboja kot &quot;On prejšnje vrstice Znesek&quot; ali &quot;Na prejšnje vrstice Total&quot; za prvi vrsti
 apps/frappe/frappe/core/doctype/doctype/boilerplate/controller_list.html +31,Completed,Dopolnil
 DocType: Web Form,Select DocType,Izberite DOCTYPE
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +104,Broaching,Posnemanje
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +12,Banking,Bančništvo
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,Bančništvo
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +38,Please click on 'Generate Schedule' to get schedule,"Prosimo, kliknite na &quot;ustvarjajo Seznamu&quot;, da bi dobili razpored"
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +283,New Cost Center,New Center Stroški
 DocType: Bin,Ordered Quantity,Naročeno Količina
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +397,"e.g. ""Build tools for builders""",npr &quot;Build orodja za gradbenike&quot;
+apps/erpnext/erpnext/public/js/setup_wizard.js +145,"e.g. ""Build tools for builders""",npr &quot;Build orodja za gradbenike&quot;
 DocType: Quality Inspection,In Process,V postopku
 DocType: Authorization Rule,Itemwise Discount,Itemwise Popust
 DocType: Purchase Order Item,Reference Document Type,Referenčni dokument Type
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +318,{0} against Sales Order {1},{0} proti Sales Order {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +320,{0} against Sales Order {1},{0} proti Sales Order {1}
 DocType: Account,Fixed Asset,Osnovno sredstvo
 apps/erpnext/erpnext/config/stock.py +283,Serialized Inventory,Zaporednimi Inventory
 DocType: Activity Type,Default Billing Rate,Privzeto Oceni plačevanja
@@ -1790,14 +1726,13 @@
 DocType: Purchase Invoice Item,Page Break,Page Break
 DocType: Production Order Operation,Pending,V teku
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,"Uporabniki, ki lahko potrdijo zahtevke zapustiti določenega zaposlenega"
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +33,You cannot change default UOM of Variant. To change default UOM for Variant change default UOM of the Template,Ne morete spremeniti privzeto UOM variante. Če želite spremeniti privzeto UOM za Variant privzeto sprememba UOM na predlogo
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +50,Office Equipments,Pisarniška oprema
 DocType: Purchase Invoice Item,Qty,Količina
 DocType: Fiscal Year,Companies,Podjetja
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +24,Electronics,Electronics
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +24,Electronics,Electronics
 DocType: Stock Settings,Raise Material Request when stock reaches re-order level,Dvignite Material Zahtevaj ko stock doseže stopnjo ponovnega naročila
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +18,From Maintenance Schedule,Od razporedom vzdrževanja
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +56,Full-time,Polni delovni čas
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +56,Full-time,Polni delovni čas
 DocType: Purchase Invoice,Contact Details,Kontaktni podatki
 DocType: C-Form,Received Date,Prejela Datum
 DocType: Delivery Note,"If you have created a standard template in Sales Taxes and Charges Template, select one and click on the button below.","Če ste ustvarili standardno predlogo v prodaji davkov in dajatev predlogo, izberite eno in kliknite na gumb spodaj."
@@ -1809,11 +1744,12 @@
 DocType: Job Applicant,Job Opening,Job Otvoritev
 DocType: Payment Reconciliation,Payment Reconciliation,Plačilo Sprava
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +154,Please select Incharge Person's name,"Prosimo, izberite ime zadolžen osebe"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +51,Technology,Tehnologija
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,Tehnologija
 DocType: Offer Letter,Offer Letter,Ponujamo Letter
 apps/erpnext/erpnext/config/manufacturing.py +51,Generate Material Requests (MRP) and Production Orders.,Ustvarjajo Materialne zahteve (MRP) in naročila za proizvodnjo.
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +68,Total Invoiced Amt,Skupaj Fakturna Amt
 DocType: Time Log,To Time,Time
+DocType: Authorization Rule,Approving Role (above authorized value),Odobritvi vloge (nad pooblaščeni vrednosti)
 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.","Če želite dodati otrok vozlišča, raziskovanje drevo in kliknite na vozlišču, pod katero želite dodati več vozlišč."
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +102,Credit To account must be a Payable account,Credit Za računu mora biti plačljivo račun
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +233,BOM recursion: {0} cannot be parent or child of {2},BOM rekurzija: {0} ne more biti starš ali otrok {2}
@@ -1826,10 +1762,8 @@
 DocType: Item,Customer Item Codes,Stranka Postavka Kode
 DocType: Opportunity,Lost Reason,Lost Razlog
 apps/erpnext/erpnext/config/accounts.py +68,Create Payment Entries against Orders or Invoices.,Ustvarite Plačilni Entries proti odločitvam ali računih.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +141,Welding,Varjenje
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +40,New Stock UOM is required,New Stock UOM je potrebno
 DocType: Quality Inspection,Sample Size,Velikost vzorca
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +443,All items have already been invoiced,Vsi predmeti so bili že obračunano
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +446,All items have already been invoiced,Vsi predmeti so bili že obračunano
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',"Prosimo, navedite veljaven &quot;Od zadevi št &#39;"
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +287,Further cost centers can be made under Groups but entries can be made against non-Groups,"Nadaljnje stroškovna mesta se lahko izvede v skupinah, vendar vnosi lahko zoper niso skupin"
 DocType: Project,External,Zunanji
@@ -1841,8 +1775,7 @@
 DocType: Bin,Actual Quantity,Dejanska količina
 DocType: Shipping Rule,example: Next Day Shipping,Primer: Next Day Shipping
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,Serijska št {0} ni bilo mogoče najti
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +563,Your Customers,Vaše stranke
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +27,Compression molding,Stiskanjem
+apps/erpnext/erpnext/public/js/setup_wizard.js +303,Your Customers,Vaše stranke
 DocType: Leave Block List Date,Block Date,Block Datum
 DocType: Sales Order,Not Delivered,Ne Delivered
 ,Bank Clearance Summary,Banka Potrditev Povzetek
@@ -1863,10 +1796,10 @@
 DocType: SMS Log,Sent To,Poslano
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +28,Make Sales Invoice,Naredite prodajni fakturi
 DocType: Company,For Reference Only.,Samo za referenco.
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +29,Invalid {0}: {1},Neveljavna {0}: {1}
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +49,Invalid {0}: {1},Neveljavna {0}: {1}
 DocType: Sales Invoice Advance,Advance Amount,Advance Znesek
 DocType: Manufacturing Settings,Capacity Planning,Načrtovanje zmogljivosti
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +49,'From Date' is required,"&quot;Od datuma&quot;, je potrebno"
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +43,'From Date' is required,"&quot;Od datuma&quot;, je potrebno"
 DocType: Journal Entry,Reference Number,Referenčna številka
 DocType: Employee,Employment Details,Podatki o zaposlitvi
 DocType: Employee,New Workplace,Novo delovno mesto
@@ -1881,7 +1814,7 @@
 DocType: Serial No,Delivery Time,Čas dostave
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,"Staranje, ki temelji na"
 DocType: Item,End of Life,End of Life
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +41,Travel,Potovanja
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +41,Travel,Potovanja
 DocType: Leave Block List,Allow Users,Dovoli uporabnike
 DocType: Purchase Order,Customer Mobile No,Stranka Mobile No
 DocType: Sales Invoice,Recurring,Ponavljajoči
@@ -1895,7 +1828,7 @@
 DocType: Naming Series,User must always select,Uporabnik mora vedno izbrati
 DocType: Stock Settings,Allow Negative Stock,Dovoli Negative Stock
 DocType: Installation Note,Installation Note,Namestitev Opomba
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +541,Add Taxes,Dodaj Davki
+apps/erpnext/erpnext/public/js/setup_wizard.js +283,Add Taxes,Dodaj Davki
 ,Financial Analytics,Finančni Analytics
 DocType: Quality Inspection,Verified By,Verified by
 DocType: Address,Subsidiary,Hčerinska družba
@@ -1905,7 +1838,6 @@
 DocType: System Settings,In Hours,V urah
 DocType: Process Payroll,Create Salary Slip,Ustvarite plačilnega lista
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Expected balance as per bank,Pričakovana višina kot na banko
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +115,Buffing,Brušenju
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Source of Funds (Liabilities),Vir sredstev (obveznosti)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +347,Quantity in row {0} ({1}) must be same as manufactured quantity {2},Količina v vrstici {0} ({1}) mora biti enaka kot je bila proizvedena količina {2}
 DocType: Appraisal,Employee,Zaposleni
@@ -1922,11 +1854,11 @@
 DocType: Rename Tool,File to Rename,Datoteka Preimenuj
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +176,Purchse Order number required for Item {0},Purchse Zaporedna številka potreben za postavko {0}
 apps/erpnext/erpnext/public/js/controllers/transaction.js +136,Show Payments,Prikaži Plačila
-apps/erpnext/erpnext/controllers/buying_controller.py +245,Specified BOM {0} does not exist for Item {1},Določeno BOM {0} ne obstaja za postavko {1}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +202,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Vzdrževanje Urnik {0} je treba odpovedati pred preklicem te Sales Order
+apps/erpnext/erpnext/controllers/buying_controller.py +236,Specified BOM {0} does not exist for Item {1},Določeno BOM {0} ne obstaja za postavko {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Vzdrževanje Urnik {0} je treba odpovedati pred preklicem te Sales Order
 apps/frappe/frappe/desk/page/backups/backups.html +13,Size,Velikost
 DocType: Notification Control,Expense Claim Approved,Expense Zahtevek Odobreno
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +113,Pharmaceutical,Pharmaceutical
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Pharmaceutical,Pharmaceutical
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,Nabavna vrednost kupljene izdelke
 DocType: Selling Settings,Sales Order Required,Sales Order Zahtevano
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +30,Create Customer,Ustvarite stranko
@@ -1936,7 +1868,6 @@
 DocType: Quality Inspection Reading,Reading 9,Branje 9
 DocType: Supplier,Is Frozen,Je zamrznjena
 DocType: Buying Settings,Buying Settings,Nastavitve odkup
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +122,Mass finishing,Mass Dodelava
 DocType: Stock Entry Detail,BOM No. for a Finished Good Item,BOM No. za Končni Good postavki
 DocType: Upload Attendance,Attendance To Date,Udeležba na tekočem
 apps/erpnext/erpnext/config/selling.py +158,Setup incoming server for sales email id. (e.g. sales@example.com),Setup dohodni strežnik za prodajo email id. (npr sales@example.com)
@@ -1944,7 +1875,7 @@
 DocType: Payment Tool,Payment Account,Plačilo računa
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +713,Please specify Company to proceed,"Prosimo, navedite Company nadaljevati"
 apps/frappe/frappe/public/js/frappe/model/indicator.js +30,Draft,Osnutek
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +46,Compensatory Off,Kompenzacijske Off
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Compensatory Off,Kompenzacijske Off
 DocType: Quality Inspection Reading,Accepted,Sprejeto
 DocType: User,Female,Ženska
 DocType: Journal Entry Account,Debit in Account Currency,Debetno v Valuta računa
@@ -1956,7 +1887,7 @@
 DocType: Shipping Rule,Shipping Rule Label,Dostava Pravilo Label
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +209,Raw Materials cannot be blank.,Surovine ne more biti prazno.
 DocType: Newsletter,Test,Testna
-apps/erpnext/erpnext/stock/doctype/item/item.py +364,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +368,"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'","Kot že obstajajo transakcije zalog za to postavko, \ ne morete spremeniti vrednote &quot;Ima Zaporedna številka&quot;, &quot;Ima serija ni &#39;,&quot; je Stock Postavka &quot;in&quot; metoda vrednotenja &quot;"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +448,Quick Journal Entry,Hitro Journal Entry
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +92,You can not change rate if BOM mentioned agianst any item,"Vi stopnje ni mogoče spremeniti, če BOM omenjeno agianst vsako postavko"
@@ -1967,13 +1898,14 @@
 apps/erpnext/erpnext/config/stock.py +18,Requests for items.,Prošnje za artikle.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,Ločena proizvodnja naročilo bo ustvarjen za vsakega končnega dobro točko.
 DocType: Purchase Invoice,Terms and Conditions1,Pogoji in razmer1
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +18,Complete Setup,Popolna Setup
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard_page.html +18,Complete Setup,Popolna Setup
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","Vknjižba zamrzniti do tega datuma, nihče ne more narediti / spremeniti vnos razen vlogi določeno spodaj."
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +121,Please save the document before generating maintenance schedule,"Prosimo, shranite dokument pred ustvarjanjem razpored vzdrževanja"
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,Status projekta
 DocType: UOM,Check this to disallow fractions. (for Nos),"Preverite, da je to prepoveste frakcij. (za številkami)"
 apps/erpnext/erpnext/config/crm.py +96,Newsletter Mailing List,Newsletter Mailing List
 DocType: Delivery Note,Transporter Name,Transporter Name
+DocType: Authorization Rule,Authorized Value,Dovoljena vrednost
 DocType: Contact,Enter department to which this Contact belongs,"Vnesite oddelek, v katerem ta Kontakt pripada"
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Absent,Skupaj Odsoten
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +746,Item or Warehouse for row {0} does not match Material Request,Postavka ali skladišča za vrstico {0} ne ujema Material dogovoru
@@ -1998,16 +1930,15 @@
 DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),Osnovni tečaj (kot na borzi UOM)
 DocType: SMS Log,No of Requested SMS,Št zaprošene SMS
 DocType: Campaign,Campaign-.####,Akcija -. ####
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +55,Piercing,Piercing
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,Naslednji koraki
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +117,Contract End Date must be greater than Date of Joining,Naročilo Končni datum mora biti večja od Datum pridružitve
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,"Distributer tretja oseba / trgovec / provizije agent / podružnica / prodajalec, ki prodaja podjetja, izdelke za provizijo."
 DocType: Customer Group,Has Child Node,Ima otrok Node
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{0} against Purchase Order {1},{0} proti narocilo {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +332,{0} against Purchase Order {1},{0} proti narocilo {1}
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","Vnesite statične parametre url tukaj (npr. Pošiljatelj = ERPNext, username = ERPNext, geslo = 1234 itd)"
 apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,{0} {1} ni v nobeni aktivnem poslovnem letu. Za več podrobnosti preverite {2}.
-apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,To je primer spletne strani samodejno ustvari iz ERPNext
+apps/erpnext/erpnext/setup/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,To je primer spletne strani samodejno ustvari iz ERPNext
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +37,Ageing Range 1,Staranje Razpon 1
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +110,Photochemical machining,Fotokemično strojna obdelava
 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.
 
 #### Note
@@ -2033,7 +1964,7 @@
 DocType: Purchase Receipt Item,Recd Quantity,Recd Količina
 DocType: Email Account,Email Ids,E-pošta ID-ji
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},Ne more proizvajati več item {0} od prodaje kol {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +471,Stock Entry {0} is not submitted,Stock Začetek {0} ni predložila
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +473,Stock Entry {0} is not submitted,Stock Začetek {0} ni predložila
 DocType: Payment Reconciliation,Bank / Cash Account,Banka / Gotovinski račun
 DocType: Tax Rule,Billing City,Zaračunavanje Mesto
 DocType: Global Defaults,Hide Currency Symbol,Skrij valutni simbol
@@ -2049,7 +1980,7 @@
 DocType: Purchase Invoice,Currency and Price List,Gotovina in Cenik
 DocType: Opportunity,Customer / Lead Name,Stranka / Lead Name
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +63,Clearance Date not mentioned,Potrditev Datum ni omenjena
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +71,Production,Proizvodnja
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Production,Proizvodnja
 DocType: Item,Allow Production Order,Dovoli Proizvodnja naročilo
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +60,Row {0}:Start Date must be before End Date,Vrstica {0}: Začetni datum mora biti pred končnim datumom
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Skupaj (Kol)
@@ -2062,7 +1993,7 @@
 apps/erpnext/erpnext/utilities/doctype/address/address.py +113,My Addresses,Moji Naslovi
 DocType: Stock Ledger Entry,Outgoing Rate,Odhodni Rate
 apps/erpnext/erpnext/config/hr.py +100,Organization branch master.,Organizacija podružnica gospodar.
-apps/erpnext/erpnext/controllers/accounts_controller.py +237, or ,ali
+apps/erpnext/erpnext/controllers/accounts_controller.py +238, or ,ali
 DocType: Sales Order,Billing Status,Status zaračunavanje
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Utility Expenses,Pomožni Stroški
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,90-Above,90-Nad
@@ -2089,6 +2020,7 @@
 DocType: Stock Entry Detail,Serial No / Batch,Zaporedna številka / Batch
 DocType: Product Bundle,Parent Item,Parent Item
 DocType: Account,Account Type,Vrsta računa
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +113,Leave Type {0} cannot be carry-forwarded,"Pustite Type {0} ni mogoče izvajati, posredovati"
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +213,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',"Vzdrževanje Urnik se ne ustvari za vse postavke. Prosimo, kliknite na &quot;ustvarjajo Seznamu&quot;"
 ,To Produce,Za izdelavo
 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","Za vrstico {0} v {1}. Če želite vključiti {2} v stopnji Element, {3}, mora biti vključena tudi vrstice"
@@ -2096,10 +2028,7 @@
 DocType: Bin,Reserved Quantity,Rezervirano Količina
 DocType: Landed Cost Voucher,Purchase Receipt Items,Nakup Prejem Items
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,Prilagajanje Obrazci
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +62,Cutting,Rezanje
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +69,Flattening,Uravnavanjem
 DocType: Account,Income Account,Prihodki račun
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +22,Molding,Modeliranje
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +632,Delivery,Dostava
 DocType: Stock Reconciliation Item,Current Qty,Trenutni Kol
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",Glejte &quot;Oceni materialov na osnovi&quot; v stanejo oddelku
@@ -2109,19 +2038,18 @@
 apps/frappe/frappe/desk/moduleview.py +61,Documents,Dokumenti
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +17,Ref,Ref
 DocType: Cost Center,Cost Center,Stroškovno Center
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.js +48,Voucher #,Voucher #
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +36,Voucher #,Voucher #
 DocType: Notification Control,Purchase Order Message,Naročilnica sporočilo
 DocType: Tax Rule,Shipping Country,Dostava Država
 DocType: Upload Attendance,Upload HTML,Naloži HTML
-apps/erpnext/erpnext/controllers/accounts_controller.py +391,"Total advance ({0}) against Order {1} cannot be greater \
+apps/erpnext/erpnext/controllers/accounts_controller.py +392,"Total advance ({0}) against Order {1} cannot be greater \
 				than the Grand Total ({2})",Skupaj predplačilo ({0}) proti odredbi {1} ne more biti večja \ od Grand Total ({2})
 DocType: Employee,Relieving Date,Lajšanje Datum
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +12,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.","Cen Pravilo je narejen prepisati Cenik / določiti diskontno odstotek, na podlagi nekaterih kriterijev."
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,Skladišče je mogoče spremeniti samo prek borze Vstop / Delivery Note / Potrdilo o nakupu
 DocType: Employee Education,Class / Percentage,Razred / Odstotek
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +92,Head of Marketing and Sales,Vodja marketinga in prodaje
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +31,Income Tax,Davek na prihodek
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +157,Laser engineered net shaping,Laser inženirstva neto oblikovanje
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Head of Marketing and Sales,Vodja marketinga in prodaje
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +31,Income Tax,Davek na prihodek
 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.","Če je izbrana Cene pravilo narejen za &quot;cena&quot;, bo prepisalo Cenik. Cen Pravilo cena je končna cena, zato je treba uporabiti pravšnji za popust. Zato v transakcijah, kot Sales Order, narocilo itd, da bodo nerealne v polje &quot;obrestna mera&quot;, namesto da polje »Cenik rate&quot;."
 apps/erpnext/erpnext/config/selling.py +163,Track Leads by Industry Type.,Track Interesenti ga Industry Type.
 DocType: Item Supplier,Item Supplier,Postavka Dobavitelj
@@ -2144,31 +2072,28 @@
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Dejanska Kol Po Transaction
 ,Pending SO Items For Purchase Request,Dokler SO Točke za nakup dogovoru
 DocType: Supplier,Billing Currency,Zaračunavanje Valuta
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +148,Extra Large,Extra Large
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,Extra Large,Extra Large
 ,Profit and Loss Statement,Izkaz poslovnega izida
 DocType: Bank Reconciliation Detail,Cheque Number,Ček Število
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +43,Pressing,Pritiskom
 DocType: Payment Tool Detail,Payment Tool Detail,Plačilo Tool Podrobnosti
 ,Sales Browser,Prodaja Browser
 DocType: Journal Entry,Total Credit,Skupaj Credit
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +474,Warning: Another {0} # {1} exists against stock entry {2},Opozorilo: Drug {0} # {1} obstaja pred vstopom parka {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +459,Local,Lokalno
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +476,Warning: Another {0} # {1} exists against stock entry {2},Opozorilo: Drug {0} # {1} obstaja pred vstopom parka {2}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +397,Local,Lokalno
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),Posojila in predujmi (sredstva)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,Dolžniki
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +147,Large,Velika
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +23,No employee found!,Noben delavec našel!
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Large,Velika
 DocType: C-Form Invoice Detail,Territory,Ozemlje
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,Navedite ni obiskov zahtevanih
 DocType: Purchase Order,Customer Address Display,Stranka Naslov Display
 DocType: Stock Settings,Default Valuation Method,Način Privzeto Vrednotenje
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +127,Polishing,Poliranje
 DocType: Production Order Operation,Planned Start Time,Načrtovano Start Time
 apps/erpnext/erpnext/config/accounts.py +63,Close Balance Sheet and book Profit or Loss.,Zapri Bilanca stanja in rezervirajte poslovnem izidu.
-apps/erpnext/erpnext/stock/doctype/item/item.py +661,"Default Unit of Measure for Item {0} cannot be changed directly because \
+apps/erpnext/erpnext/stock/doctype/item/item.py +665,"Default Unit of Measure for Item {0} cannot be changed directly because \
 			you have already made some transaction(s) with another UOM. To change default UOM, \
 			use 'UOM Replace Utility' tool under Stock module.","Privzeto mersko enoto za postavko {0} ni mogoče neposredno spremeniti, ker \ ste že naredili nekaj transakcije (-e) z drugo UOM. Če želite spremeniti privzeto UOM \ uporaba &quot;UOM Zamenjaj Utility&quot; orodje v okviru borze modula."
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,Določite Menjalni tečaj za pretvorbo ene valute v drugo
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +146,Quotation {0} is cancelled,Kotacija {0} je odpovedan
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +141,Quotation {0} is cancelled,Kotacija {0} je odpovedan
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,Skupni preostali znesek
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} was on leave on {1}. Cannot mark attendance.,Employee {0} je bil na dopustu {1}. Ne more označiti prisotnost.
 DocType: Sales Partner,Targets,Cilji
@@ -2179,7 +2104,6 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +158,Please create Customer from Lead {0},"Prosimo, da ustvarite strank iz svinca {0}"
 DocType: Price List,Applicable for Countries,Velja za države
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Computers,Računalniki
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +112,Electro-chemical grinding,Electro-kemično brušenje
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +14,This is a root customer group and cannot be edited.,To je skupina koren stranke in jih ni mogoče urejati.
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +39,Please setup your chart of accounts before you start Accounting Entries,"Prosimo nastavitev vaš kontni načrt, preden začnete vknjižbe"
 DocType: Purchase Invoice,Ignore Pricing Rule,Ignoriraj Pricing pravilo
@@ -2225,7 +2149,6 @@
 DocType: Maintenance Visit,Purposes,Nameni
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +103,Atleast one item should be entered with negative quantity in return document,"Atleast en element, se vpiše z negativnim količino v povratni dokument"
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +67,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","Operacija {0} dlje od vseh razpoložljivih delovnih ur v delovni postaji {1}, razčleniti operacijo na več operacij"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +134,Electrochemical machining,Elektrokemični strojna obdelava
 ,Requested,Zahteval
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +66,No Remarks,Ni Opombe
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +13,Overdue,Zapadle
@@ -2234,7 +2157,7 @@
 DocType: Monthly Distribution,Distribution Name,Porazdelitev Name
 DocType: Features Setup,Sales and Purchase,Prodaja in nakup
 DocType: Supplier Quotation Item,Material Request No,Material Zahteva Ne
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +218,Quality Inspection required for Item {0},Inšpekcija kakovosti potrebna za postavko {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +221,Quality Inspection required for Item {0},Inšpekcija kakovosti potrebna za postavko {0}
 DocType: Quotation,Rate at which customer's currency is converted to company's base currency,"Obrestna mera, po kateri kupec je valuti, se pretvori v osnovni valuti družbe"
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +107,{0} has been successfully unsubscribed from this list.,{0} je bil uspešno odjavili iz tega seznama.
 DocType: Purchase Invoice Item,Net Rate (Company Currency),Net Rate (družba Valuta)
@@ -2252,9 +2175,8 @@
 apps/erpnext/erpnext/accounts/report/financial_statements.py +16,Fiscal Year {0} not found.,Poslovno leto {0} ni bilo mogoče najti.
 DocType: Bank Reconciliation,Get Relevant Entries,Pridobite ustreznimi vnosi
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +407,Accounting Entry for Stock,Računovodstvo Vstop za zalogi
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +64,Coining,Kovanje
 DocType: Sales Invoice,Sales Team1,Prodaja TEAM1
-apps/erpnext/erpnext/stock/doctype/item/item.py +412,Item {0} does not exist,Element {0} ne obstaja
+apps/erpnext/erpnext/stock/doctype/item/item.py +416,Item {0} does not exist,Element {0} ne obstaja
 DocType: Sales Invoice,Customer Address,Stranka Naslov
 apps/frappe/frappe/desk/query_report.py +136,Total,Skupaj
 DocType: Purchase Invoice,Apply Additional Discount On,Uporabi dodatni popust na
@@ -2266,14 +2188,13 @@
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),Davčna Znesek Po Popust Znesek (družba Valuta)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +149,Target warehouse is mandatory for row {0},Ciljna skladišče je obvezna za vrstico {0}
 DocType: Quality Inspection,Quality Inspection,Quality Inspection
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +144,Extra Small,Extra Small
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +20,Spray forming,Spray oblikovanje
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Extra Small,Extra Small
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +458,Warning: Material Requested Qty is less than Minimum Order Qty,"Opozorilo: Material Zahtevana Količina je manj kot minimalna, da Kol"
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +191,Account {0} is frozen,Račun {0} je zamrznjen
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Pravna oseba / Hčerinska družba z ločenim kontnem pripada organizaciji.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +29,"Food, Beverage & Tobacco","Hrana, pijača, tobak"
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","Hrana, pijača, tobak"
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +20,PL or BS,PL ali BS
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,Can only make payment against unbilled {0},Lahko le plačilo proti neobračunano {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +531,Can only make payment against unbilled {0},Lahko le plačilo proti neobračunano {0}
 apps/erpnext/erpnext/controllers/selling_controller.py +122,Commission rate cannot be greater than 100,Stopnja Komisija ne more biti večja od 100
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Minimum Inventory Level,Minimalna Inventory Raven
 DocType: Stock Entry,Subcontract,Podizvajalska pogodba
@@ -2284,19 +2205,18 @@
 DocType: Item,Manufacturer Part Number,Številka dela proizvajalca
 DocType: Production Order Operation,Estimated Time and Cost,Predvideni čas in stroški
 DocType: Bin,Bin,Bin
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +50,Nosing,Njuškanje
 DocType: SMS Log,No of Sent SMS,Število poslanih SMS
 DocType: Account,Company,Podjetje
 DocType: Account,Expense Account,Expense račun
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +49,Software,Programska oprema
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +151,Colour,Barva
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +49,Software,Programska oprema
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Colour,Barva
 DocType: Maintenance Visit,Scheduled,Načrtovano
 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","Prosimo, izberite postavko, kjer &quot;Stock postavka je&quot; &quot;Ne&quot; in &quot;Je Sales Postavka&quot; je &quot;Yes&quot; in ni druge Bundle izdelka"
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,Izberite mesečnim izplačilom neenakomerno distribucijo ciljev po mesecih.
 DocType: Purchase Invoice Item,Valuation Rate,Oceni Vrednotenje
 apps/erpnext/erpnext/stock/get_item_details.py +281,Price List Currency not selected,Cenik Valuta ni izbran
 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,Postavka Row {0}: Potrdilo o nakupu {1} ne obstaja v zgornji tabeli &quot;nakup prejemki&quot;
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +134,Employee {0} has already applied for {1} between {2} and {3},Employee {0} je že zaprosil za {1} med {2} in {3}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +145,Employee {0} has already applied for {1} between {2} and {3},Employee {0} je že zaprosil za {1} med {2} in {3}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Projekt Start Date
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +8,Until,Do
 DocType: Rename Tool,Rename Log,Preimenovanje Prijava
@@ -2306,7 +2226,7 @@
 apps/erpnext/erpnext/controllers/recurring_document.py +162,Please select {0},"Prosimo, izberite {0}"
 DocType: C-Form,C-Form No,C-forma
 DocType: BOM,Exploded_items,Exploded_items
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +95,Researcher,Raziskovalec
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Researcher,Raziskovalec
 apps/frappe/frappe/custom/doctype/customize_form/customize_form.js +88,Update,Update
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +78,Please save the Newsletter before sending,"Prosimo, shranite Newsletter pred pošiljanjem"
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +23,Name or Email is mandatory,Ime ali E-pošta je obvezna
@@ -2315,11 +2235,10 @@
 DocType: Employee,Exit,Exit
 apps/erpnext/erpnext/accounts/doctype/account/account.py +134,Root Type is mandatory,Root Tip je obvezna
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +295,Serial No {0} created,Serijska št {0} ustvaril
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +125,Vibratory finishing,Vibracijski zaključna
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","Za udobje kupcev lahko te kode se uporabljajo v tiskanih oblikah, kot so na računih in dobavnicah"
 DocType: Employee,You can enter any date manually,Lahko jih vnesete nobenega datuma
 DocType: Sales Invoice,Advertisement,Oglaševanje
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +165,Probationary Period,Poskusna doba
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Probationary Period,Poskusna doba
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Samo leaf vozlišča so dovoljene v transakciji
 DocType: Expense Claim,Expense Approver,Expense odobritelj
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,Potrdilo o nakupu Postavka Priložena
@@ -2327,19 +2246,16 @@
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +17,To Datetime,Da datetime
 DocType: SMS Settings,SMS Gateway URL,SMS Gateway URL
 apps/erpnext/erpnext/config/crm.py +53,Logs for maintaining sms delivery status,Dnevniki za ohranjanje statusa dostave sms
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +137,Grinding,Brušenje
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +34,Shrink wrapping,Shrink zavijanje
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +36,Pending Activities,Čakanju Dejavnosti
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,Confirmed,Potrjen
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier > Supplier Type,Dobavitelj&gt; dobavitelj Type
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +127,Please enter relieving date.,Vnesite lajšanje datum.
 apps/erpnext/erpnext/controllers/trends.py +137,Amt,Amt
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' can be submitted,Pustite samo aplikacije s statusom &quot;Approved&quot; mogoče predložiti
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +51,Only Leave Applications with status 'Approved' can be submitted,Pustite samo aplikacije s statusom &quot;Approved&quot; mogoče predložiti
 apps/erpnext/erpnext/utilities/doctype/address/address.py +21,Address Title is mandatory.,Naslov Naslov je obvezen.
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,"Vnesite ime oglaševalske akcije, če je vir preiskovalne akcije"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +38,Newspaper Publishers,Newspaper Publishers
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +38,Newspaper Publishers,Newspaper Publishers
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,Izberite Fiscal Year
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +88,Smelting,Taljenje
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Preureditev Raven
 DocType: Attendance,Attendance Date,Udeležba Datum
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,Plača razpadu temelji na zaslužek in odbitka.
@@ -2354,16 +2270,15 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +414,[Error],[Error]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,"V besedi bo viden, ko boste shranite Sales Order."
 ,Employee Birthday,Zaposleni Rojstni dan
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +55,Venture Capital,Tveganega kapitala
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,Tveganega kapitala
 DocType: UOM,Must be Whole Number,Mora biti celo število
 DocType: Leave Control Panel,New Leaves Allocated (In Days),Nove Listi Dodeljena (v dnevih)
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +51,Serial No {0} does not exist,Serijska št {0} ne obstaja
 DocType: Pricing Rule,Discount Percentage,Popust Odstotek
 DocType: Payment Reconciliation Invoice,Invoice Number,Številka računa
-apps/erpnext/erpnext/hooks.py +70,Orders,Naročila
+apps/erpnext/erpnext/hooks.py +54,Orders,Naročila
 DocType: Leave Control Panel,Employee Type,Vrsta delavec
 DocType: Employee Leave Approver,Leave Approver,Pustite odobritelju
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +70,Swaging,Litje
 DocType: Manufacturing Settings,Material Transferred for Manufacture,Material Preneseno za Izdelava
 DocType: Expense Claim,"A user with ""Expense Approver"" role",Uporabnik z &quot;Expense odobritelj&quot; vlogi
 ,Issued Items Against Production Order,Izdane Postavke proti proizvodnji reda
@@ -2375,7 +2290,6 @@
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +62,Cost Center with existing transactions can not be converted to group,Stroškovno Center z obstoječimi transakcij ni mogoče pretvoriti v skupini
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Depreciation,Amortizacija
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Dobavitelj (-i)
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +29,Invalid period,Neveljavna obdobje
 DocType: Customer,Credit Limit,Kreditni limit
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,Izberite vrsto posla
 DocType: GL Entry,Voucher No,Voucher ni
@@ -2385,9 +2299,9 @@
 DocType: Customer,Address and Contact,Naslov in Stik
 DocType: Customer,Last Day of the Next Month,Zadnji dan v naslednjem mesecu
 DocType: Employee,Feedback,Povratne informacije
+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}","Dopusta ni mogoče dodeliti pred {0}, saj je bilanca dopust že-carry posredujejo v evidenco dodeljevanja dopust prihodnji {1}"
 apps/erpnext/erpnext/accounts/party.py +284,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Opomba: Zaradi / Referenčni datum presega dovoljene kreditnih stranka dni s {0} dan (s)
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +621,Maint. Schedule,Vzdrževalec. Urnik
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +108,Abrasive jet machining,Abrazivni curek strojna obdelava
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +632,Maint. Schedule,Vzdrževalec. Urnik
 DocType: Stock Settings,Freeze Stock Entries,Freeze Stock Vnosi
 DocType: Website Settings,Website Settings,Spletna stran Nastavitve
 DocType: Item,Reorder level based on Warehouse,Raven Preureditev temelji na Warehouse
@@ -2404,7 +2318,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +75,Show Stock Entries,Prikaži Stock Vnosi
 ,Is Primary Address,Je primarni naslov
 DocType: Production Order,Work-in-Progress Warehouse,Work-in-Progress Warehouse
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +308,Reference #{0} dated {1},Referenčna # {0} dne {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Reference #{0} dated {1},Referenčna # {0} dne {1}
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +13,Manage Addresses,Upravljanje naslovov
 DocType: Pricing Rule,Item Code,Oznaka
 DocType: Production Planning Tool,Create Production Orders,Ustvarjanje naročila za proizvodnjo
@@ -2413,7 +2327,7 @@
 DocType: Lead,Market Segment,Tržni segment
 DocType: Communication,Phone,Telefon
 DocType: Employee Internal Work History,Employee Internal Work History,Zaposleni Notranji Delo Zgodovina
-apps/erpnext/erpnext/public/js/account_tree_grid.js +50,Closing (Dr),Zapiranje (Dr)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +221,Closing (Dr),Zapiranje (Dr)
 DocType: Contact,Passive,Pasivna
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,Serijska št {0} ni na zalogi
 apps/erpnext/erpnext/config/selling.py +127,Tax template for selling transactions.,Davčna predlogo za prodajo transakcije.
@@ -2429,8 +2343,8 @@
 ,Billed Amount,Zaračunavajo Znesek
 DocType: Bank Reconciliation,Bank Reconciliation,Banka Sprava
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +9,Get Updates,Dobite posodobitve
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +129,Material Request {0} is cancelled or stopped,Material Zahteva {0} je odpovedan ali ustavi
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +641,Add a few sample records,Dodajte nekaj zapisov vzorčnih
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +133,Material Request {0} is cancelled or stopped,Material Zahteva {0} je odpovedan ali ustavi
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Add a few sample records,Dodajte nekaj zapisov vzorčnih
 apps/erpnext/erpnext/config/hr.py +210,Leave Management,Pustite upravljanje
 DocType: Event,Groups,Skupine
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,"Skupina, ki jo račun"
@@ -2443,38 +2357,34 @@
 DocType: Features Setup,Sales Extras,Prodajna Extras
 apps/erpnext/erpnext/accounts/utils.py +344,{0} budget for Account {1} against Cost Center {2} will exceed by {3},{0} proračun za račun {1} proti centru Cost {2} bo presegel s {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +236,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Razlika računa mora biti tip Asset / Liability račun, saj je ta Stock Sprava je Entry Otvoritev"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +138,Purchase Order number required for Item {0},Naročilnica zahtevanega števila za postavko {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Order number required for Item {0},Naročilnica zahtevanega števila za postavko {0}
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',&quot;Od datuma&quot; mora biti po &quot;Da Datum &#39;
 ,Stock Projected Qty,Stock Predvidena Količina
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +147,Customer {0} does not belong to project {1},"Stranka {0} ne pripada, da projekt {1}"
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +150,Customer {0} does not belong to project {1},"Stranka {0} ne pripada, da projekt {1}"
 DocType: Sales Order,Customer's Purchase Order,Stranke Naročilo
 DocType: Warranty Claim,From Company,Od družbe
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,Vrednost ali Kol
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Minute,Minute
+apps/erpnext/erpnext/public/js/setup_wizard.js +363,Minute,Minute
 DocType: Purchase Invoice,Purchase Taxes and Charges,Nakup davki in dajatve
 ,Qty to Receive,Količina za prejemanje
 DocType: Leave Block List,Leave Block List Allowed,Pustite Block Seznam Dovoljeno
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +61,Conversion factor cannot be in fractions,Faktor konverzije ne more biti v frakcijah
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +358,You will use it to Login,Lahko ga bodo uporabljali za prijavo
+apps/erpnext/erpnext/public/js/setup_wizard.js +108,You will use it to Login,Lahko ga bodo uporabljali za prijavo
 DocType: Sales Partner,Retailer,Retailer
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +99,Credit To account must be a Balance Sheet account,Credit Za računu mora biti bilanca računa
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,Vse vrste Dobavitelj
 apps/erpnext/erpnext/stock/doctype/item/item.py +37,Item Code is mandatory because Item is not automatically numbered,"Oznaka je obvezna, ker se postavka samodejno ni oštevilčen"
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +99,Quotation {0} not of type {1},Kotacija {0} ni tipa {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +93,Quotation {0} not of type {1},Kotacija {0} ni tipa {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,Vzdrževanje Urnik Postavka
 DocType: Sales Order,%  Delivered,% Delivered
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,Bank Overdraft Account,Bančnem računu računa
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +15,Make Salary Slip,Naredite plačilnega lista
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +18,Browse BOM,Prebrskaj BOM
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +175,Secured Loans,Secured Posojila
-apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +3,Awesome Products,Super izdelki
+apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +3,Awesome Products,Super izdelki
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +189,Opening Balance Equity,Otvoritev Balance Equity
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +80,Cannot approve leave as you are not authorized to approve leaves on Block Dates,"Ne more odobriti dopusta, kot si ne dovoli, da odobri liste o skupinskih termini"
 DocType: Appraisal,Appraisal,Cenitev
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +13,Lost-foam casting,Izgubljene pena litje
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +47,Drawing,Risanje
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +22,Date is repeated,Datum se ponovi
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +148,Leave approver must be one of {0},Pustite odobritelj mora biti eden od {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +162,Leave approver must be one of {0},Pustite odobritelj mora biti eden od {0}
 DocType: Hub Settings,Seller Email,Prodajalec Email
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Skupaj Nakup Cost (via računu o nakupu)
 DocType: Workstation Working Hour,Start Time,Začetni čas
@@ -2488,7 +2398,7 @@
 DocType: Purchase Invoice Item,Net Amount (Company Currency),Neto znesek (družba Valuta)
 DocType: BOM Operation,Hour Rate,Urni tečaj
 DocType: Stock Settings,Item Naming By,Postavka Poimenovanje S
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +642,From Quotation,Od Kotacija
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +655,From Quotation,Od Kotacija
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},Drug zaključnem obdobju Začetek {0} je bil dosežen po {1}
 DocType: Production Order,Material Transferred for Manufacturing,Material Preneseno za Manufacturing
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +29,Account {0} does not exists,Račun {0} ne obstaja
@@ -2502,21 +2412,19 @@
 DocType: Purchase Invoice Item,PR Detail,PR Detail
 DocType: Sales Order,Fully Billed,Popolnoma zaračunavajo
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +20,Cash In Hand,Denarna sredstva v blagajni
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +72,Delivery warehouse required for stock item {0},Dostava skladišče potreben za postavko parka {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +119,Delivery warehouse required for stock item {0},Dostava skladišče potreben za postavko parka {0}
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),Bruto teža paketa. Ponavadi neto teža + embalaža teže. (za tisk)
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Uporabniki s to vlogo dovoljeno postaviti na zamrznjene račune in ustvariti / spreminjanje vknjižbe zoper zamrznjenih računih
 DocType: Serial No,Is Cancelled,Je Preklicana
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +281,My Shipments,Moje pošiljke
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +286,My Shipments,Moje pošiljke
 DocType: Journal Entry,Bill Date,Bill Datum
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +43,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","Tudi če obstaja več cenovnih Pravila z najvišjo prioriteto, se uporabljajo nato naslednji notranje prednostne naloge:"
 DocType: Supplier,Supplier Details,Dobavitelj Podrobnosti
 DocType: Communication,Recipients,Prejemniki
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +146,Screwing,Vijačenje
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +96,Knurling,Narebričenju
 DocType: Expense Claim,Approval Status,Stanje odobritve
 DocType: Hub Settings,Publish Items to Hub,Objavite artikel v Hub
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +44,From value must be less than to value in row {0},Iz mora biti vrednost manj kot na vrednosti v vrstici {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +133,Wire Transfer,Wire Transfer
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +133,Wire Transfer,Wire Transfer
 apps/erpnext/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py +25,Please select Bank Account,Izberite bančni račun
 DocType: Newsletter,Create and Send Newsletters,Ustvarjanje in pošiljanje glasila
 apps/frappe/frappe/public/js/frappe/views/reports/grid_report.js +305,From Date must be before To Date,Od datuma mora biti pred Do Datum
@@ -2524,14 +2432,14 @@
 DocType: Company,Default Income Account,Privzeto Prihodki račun
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,Skupina kupec / stranka
 DocType: Item Group,Check this if you want to show in website,"Označite to, če želite, da kažejo na spletni strani"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +190,Welcome to ERPNext,Dobrodošli na ERPNext
+,Welcome to ERPNext,Dobrodošli na ERPNext
 DocType: Payment Reconciliation Payment,Voucher Detail Number,Bon Detail Število
 apps/erpnext/erpnext/config/crm.py +146,Lead to Quotation,Privede do Kotacija
 DocType: Lead,From Customer,Od kupca
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +37,Calls,Poziva
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Calls,Poziva
 DocType: Project,Total Costing Amount (via Time Logs),Skupaj Stanejo Znesek (preko Čas Dnevniki)
 DocType: Purchase Order Item Supplied,Stock UOM,Stock UOM
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Purchase Order {0} is not submitted,Naročilnica {0} ni predložila
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +194,Purchase Order {0} is not submitted,Naročilnica {0} ni predložila
 ,Projected,Predvidoma
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},Serijska št {0} ne pripada Warehouse {1}
 apps/erpnext/erpnext/controllers/status_updater.py +136,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Opomba: Sistem ne bo preveril čez povzetju in over-rezervacije za postavko {0} kot količina ali znesek je 0
@@ -2539,7 +2447,6 @@
 DocType: Issue,Opening Date,Otvoritev Datum
 DocType: Journal Entry,Remark,Pripomba
 DocType: Purchase Receipt Item,Rate and Amount,Stopnja in znesek
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +95,Boring,Boring
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +667,From Sales Order,Od Sales Order
 DocType: Blog Category,Parent Website Route,Parent Website Route
 DocType: Sales Order,Not Billed,Ne zaračunavajo
@@ -2553,19 +2460,17 @@
 apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount Amount,Popust Količina
 DocType: Purchase Invoice,Return Against Purchase Invoice,Vrni proti Račun za nakup
 DocType: Item,Warranty Period (in days),Garancijski rok (v dnevih)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +550,e.g. VAT,npr DDV
+apps/erpnext/erpnext/public/js/setup_wizard.js +292,e.g. VAT,npr DDV
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,Postavka 4
 DocType: Journal Entry Account,Journal Entry Account,Journal Entry račun
 DocType: Shopping Cart Settings,Quotation Series,Kotacija Series
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +52,"An item exists with same name ({0}), please change the item group name or rename the item","Element obstaja z istim imenom ({0}), prosimo, spremenite ime postavka skupine ali preimenovanje postavke"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +82,Hot metal gas forming,Hot metal plin oblikovanje
 DocType: Sales Order Item,Sales Order Date,Sales Order Date
 DocType: Sales Invoice Item,Delivered Qty,Delivered Kol
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +63,Warehouse {0}: Company is mandatory,Skladišče {0}: Podjetje je obvezna
 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.",Pojdi na ustrezno skupino (običajno vir sredstev&gt; kratkoročnimi obveznostmi&gt; davkov in dajatev ter ustvariti nov račun (s klikom na Dodaj Child) tipa &quot;davek&quot; in ne omenjam davčna stopnja.
 ,Payment Period Based On Invoice Date,Plačilo obdobju na podlagi računa Datum
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +50,Missing Currency Exchange Rates for {0},Manjka Menjalni tečaji za {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +135,Laser cutting,Laserski razrez
 DocType: Event,Monday,Ponedeljek
 DocType: Journal Entry,Stock Entry,Stock Začetek
 DocType: Account,Payable,Plačljivo
@@ -2598,7 +2503,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +111,Date Of Retirement must be greater than Date of Joining,Datum upokojitve sme biti večja od Datum pridružitve
 DocType: Sales Invoice,Against Income Account,Proti dohodkov
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +69,{0}% Delivered,{0}% Delivered
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +78,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Postavka {0}: Ž Kol {1} ​​ne more biti nižja od minimalne naročila Kol {2} (opredeljeno v točki).
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Postavka {0}: Ž Kol {1} ​​ne more biti nižja od minimalne naročila Kol {2} (opredeljeno v točki).
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Mesečni Distribution Odstotek
 DocType: Territory,Territory Targets,Territory cilji
 DocType: Delivery Note,Transporter Info,Transporter Info
@@ -2607,7 +2512,6 @@
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,"Naslovi za tiskane predloge, npr predračunu."
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +140,Valuation type charges can not marked as Inclusive,Stroški Tip vrednotenje ni mogoče označiti kot Inclusive
 DocType: POS Profile,Update Stock,Posodobitev Stock
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +128,Superfinishing,Superfinishing
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,"Drugačna UOM za artikle bo privedlo do napačne (skupno) Neto teža vrednosti. Prepričajte se, da je neto teža vsake postavke v istem UOM."
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM Rate
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +85,Please pull items from Delivery Note,Prosimo povlecite predmete iz dobavnice
@@ -2622,7 +2526,6 @@
 ,Purchase Analytics,Odkupne Analytics
 DocType: Sales Invoice Item,Delivery Note Item,Dostava Opomba Postavka
 DocType: Expense Claim,Task,Naloga
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +57,Shaving,Britje
 DocType: Purchase Taxes and Charges,Reference Row #,Referenčna Row #
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},Serijska številka je obvezna za postavko {0}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js +14,This is a root sales person and cannot be edited.,To je koren prodaje oseba in jih ni mogoče urejati.
@@ -2634,13 +2537,11 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +74,Purpose must be one of {0},Cilj mora biti eden od {0}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +108,Fill the form and save it,Izpolnite obrazec in ga shranite
 DocType: Production Planning Tool,Download a report containing all raw materials with their latest inventory status,"Prenesite poročilo, ki vsebuje vse surovine s svojo najnovejšo stanja zalog"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +94,Facing,Soočenje
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,Forum Skupnost
 DocType: Leave Application,Leave Balance Before Application,Pustite Stanje pred uporabo
 DocType: SMS Center,Send SMS,Pošlji SMS
 DocType: Company,Default Letter Head,Privzeto glavi pisma
 DocType: Time Log,Billable,Plačljivo
-DocType: Authorization Rule,This will be used for setting rule in HR module,Ta se bo uporabljal za vzpostavitev vladavine v HR modula
 DocType: Account,Rate at which this tax is applied,"Hitrost, s katero se ta davek"
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reorder Qty,Preureditev Kol
 DocType: Company,Stock Adjustment Account,Račun Prilagoditev Stock
@@ -2667,16 +2568,15 @@
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,Odstotek dodelitve mora biti enaka 100%
 DocType: Serial No,Out of AMC,Od AMC
 DocType: Purchase Order Item,Material Request Detail No,Material Zahteva Detail Ne
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +97,Hard turning,Hard turning
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +33,Make Maintenance Visit,Naredite Maintenance obisk
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +187,Please contact to the user who have Sales Master Manager {0} role,"Prosimo, obrnite se na uporabnika, ki imajo Sales Master Manager {0} vlogo"
 DocType: Company,Default Cash Account,Privzeto Cash račun
 apps/erpnext/erpnext/config/accounts.py +79,Company (not Customer or Supplier) master.,Company (ne stranka ali dobavitelj) gospodar.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +106,Please enter 'Expected Delivery Date',"Prosimo, vpišite &quot;Pričakovana Dostava Date&quot;"
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +187,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Dobavnic {0} je treba preklicati pred preklicem te Sales Order
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +100,Please enter 'Expected Delivery Date',"Prosimo, vpišite &quot;Pričakovana Dostava Date&quot;"
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +182,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Dobavnic {0} je treba preklicati pred preklicem te Sales Order
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +373,Paid amount + Write Off Amount can not be greater than Grand Total,Plačan znesek + odpis Znesek ne sme biti večja od Grand Skupaj
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} ni veljavna številka serije za postavko {1}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,Note: There is not enough leave balance for Leave Type {0},Opomba: Ni dovolj bilanca dopust za dopust tipa {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +124,Note: There is not enough leave balance for Leave Type {0},Opomba: Ni dovolj bilanca dopust za dopust tipa {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.","Opomba: Če se plačilo ni izvedeno pred kakršno koli sklicevanje, da Journal Entry ročno."
 DocType: Item,Supplier Items,Dobavitelj Items
 DocType: Opportunity,Opportunity Type,Priložnost Type
@@ -2688,7 +2588,7 @@
 DocType: Hub Settings,Publish Availability,Objavite Razpoložljivost
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +105,Date of Birth cannot be greater than today.,"Datum rojstva ne more biti večja, kot je danes."
 ,Stock Ageing,Stock Staranje
-apps/erpnext/erpnext/controllers/accounts_controller.py +200,{0} '{1}' is disabled,{0} {1} &quot;je onemogočena
+apps/erpnext/erpnext/controllers/accounts_controller.py +201,{0} '{1}' is disabled,{0} {1} &quot;je onemogočena
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Nastavi kot Odpri
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Pošlji samodejne elektronske pošte v Contacts o posredovanju transakcij.
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +232,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
@@ -2697,44 +2597,38 @@
 DocType: Purchase Order,Customer Contact Email,Customer Contact Email
 DocType: Event,Sunday,Nedelja
 DocType: Sales Team,Contribution (%),Prispevek (%)
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +455,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,"Opomba: Začetek Plačilo se ne bodo ustvarili, saj &quot;gotovinski ali bančni račun&quot; ni bil podan"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +171,Responsibilities,Odgovornosti
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +457,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,"Opomba: Začetek Plačilo se ne bodo ustvarili, saj &quot;gotovinski ali bančni račun&quot; ni bil podan"
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +171,Responsibilities,Odgovornosti
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Template,Predloga
 DocType: Sales Person,Sales Person Name,Prodaja Oseba Name
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,Vnesite atleast 1 račun v tabeli
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +511,Add Users,Dodaj uporabnike
+apps/erpnext/erpnext/public/js/setup_wizard.js +255,Add Users,Dodaj uporabnike
 DocType: Pricing Rule,Item Group,Element Group
 DocType: Task,Actual Start Date (via Time Logs),Actual Start Date (via Čas Dnevniki)
 DocType: Stock Reconciliation Item,Before reconciliation,Pred sprave
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +12,To {0},Za {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Davki in dajatve na dodano vrednost (Company Valuta)
-apps/erpnext/erpnext/stock/doctype/item/item.py +340,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Postavka Davčna Row {0} morajo upoštevati vrste davka ali prihodek ali odhodek ali Obdavčljivi
+apps/erpnext/erpnext/stock/doctype/item/item.py +344,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Postavka Davčna Row {0} morajo upoštevati vrste davka ali prihodek ali odhodek ali Obdavčljivi
 DocType: Sales Order,Partly Billed,Delno zaračunavajo
 DocType: Item,Default BOM,Privzeto BOM
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +79,Decambering,Decambering
 apps/erpnext/erpnext/setup/doctype/company/company.js +22,Please re-type company name to confirm,"Prosimo, ponovno tip firma za potrditev"
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,Skupaj Izjemna Amt
 DocType: Time Log Batch,Total Hours,Skupaj ure
 DocType: Journal Entry,Printing Settings,Printing Settings
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +268,Total Debit must be equal to Total Credit. The difference is {0},Skupaj obremenitve mora biti enaka celotnemu kreditnemu. Razlika je {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +11,Automotive,Avtomobilizem
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +37,Item is required,Je potrebno postavko
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +25,Metal injection molding,Metal brizganje
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +258,Total Debit must be equal to Total Credit. The difference is {0},Skupaj obremenitve mora biti enaka celotnemu kreditnemu. Razlika je {0}
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,Avtomobilizem
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +684,From Delivery Note,Od dobavnica
 DocType: Time Log,From Time,Od časa
 DocType: Notification Control,Custom Message,Sporočilo po meri
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +33,Investment Banking,Investicijsko bančništvo
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +261,"Select your Country, Time Zone and Currency","Izberite vašo državo, časovni pas in valuto"
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,Investicijsko bančništvo
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +316,"Select your Country, Time Zone and Currency","Izberite vašo državo, časovni pas in valuto"
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +369,Cash or Bank Account is mandatory for making payment entry,Gotovina ali bančnega računa je obvezen za izdelavo vnos plačila
 DocType: Purchase Invoice,Price List Exchange Rate,Cenik Exchange Rate
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +91,Pickling,Dekapiranje
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +18,Sand casting,Pesek litje
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +117,Electroplating,Galvanizacije
 DocType: Purchase Invoice Item,Rate,Stopnja
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +62,Intern,Intern
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Intern,Intern
 DocType: Newsletter,A Lead with this email id should exist,Vodilno vlogo pri tem email id morala obstajati
 DocType: Stock Entry,From BOM,Od BOM
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +34,Basic,Osnovni
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +34,Basic,Osnovni
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,Zaloga transakcije pred {0} so zamrznjeni
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +217,Please click on 'Generate Schedule',"Prosimo, kliknite na &quot;ustvarjajo Seznamu&quot;"
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +61,To Date should be same as From Date for Half Day leave,Do datuma mora biti enaka kot Od datuma za pol dneva dopusta
@@ -2742,10 +2636,10 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +96,Reference No is mandatory if you entered Reference Date,"Referenčna številka je obvezna, če ste vnesli Referenčni datum"
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +108,Date of Joining must be greater than Date of Birth,Datum Pridružil sme biti večja od Datum rojstva
 DocType: Salary Structure,Salary Structure,Plača Struktura
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +242,"Multiple Price Rule exists with same criteria, please resolve \
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +246,"Multiple Price Rule exists with same criteria, please resolve \
 			conflict by assigning priority. Price Rules: {0}","Multiple Cena pravilo obstaja z istimi merili, prosim rešiti \ konflikt z dodeljevanjem prednost. Cena Pravila: {0}"
 DocType: Account,Bank,Banka
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +9,Airline,Airline
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,Airline
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +493,Issue Material,Vprašanje Material
 DocType: Material Request Item,For Warehouse,Za Skladišče
 DocType: Employee,Offer Date,Ponudba Datum
@@ -2755,29 +2649,24 @@
 DocType: Item,Is Fixed Asset Item,Je osnovno sredstvo Item
 DocType: Stock Entry,Including items for sub assemblies,"Vključno s postavkami, za sklope"
 DocType: Features Setup,"If you have long print formats, this feature can be used to split the page to be printed on multiple pages with all headers and footers on each page","Če imate dolge oblike tiskanja, lahko ta funkcija se uporablja za razdeliti stran se natisne na več straneh z vsemi glave in noge na vsaki strani"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +131,Hobbing,Hobbing
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +98,All Territories,Vse Territories
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +98,All Territories,Vse Territories
 DocType: Purchase Invoice,Items,Predmeti
 DocType: Fiscal Year,Year Name,Leto Name
 DocType: Process Payroll,Process Payroll,Proces na izplačane plače
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +59,There are more holidays than working days this month.,Obstaja več prazniki od delovnih dneh tega meseca.
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +68,There are more holidays than working days this month.,Obstaja več prazniki od delovnih dneh tega meseca.
 DocType: Product Bundle Item,Product Bundle Item,Izdelek Bundle Postavka
 DocType: Sales Partner,Sales Partner Name,Prodaja Partner Name
 DocType: Purchase Invoice Item,Image View,Image View
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +113,Finishing & industrial finishing,Dodelava in industrijsko obdelavo
 DocType: Issue,Opening Time,Otvoritev čas
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,Od in Do datumov zahtevanih
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +46,Securities & Commodity Exchanges,Vrednostnih papirjev in blagovne borze
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Vrednostnih papirjev in blagovne borze
 DocType: Shipping Rule,Calculate Based On,Izračun temelji na
 DocType: Delivery Note Item,From Warehouse,Iz skladišča
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +98,Drilling,Vrtanje
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +28,Blow molding,Pihanje
 DocType: Purchase Taxes and Charges,Valuation and Total,Vrednotenje in Total
 DocType: Tax Rule,Shipping City,Dostava Mesto
 apps/erpnext/erpnext/stock/doctype/item/item.js +43,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,"Ta postavka je varianta {0} (Template). Atributi bodo kopirali več iz predloge, če je nastavljen &quot;Ne Kopiraj«"
 DocType: Account,Purchase User,Nakup Uporabnik
 DocType: Notification Control,Customize the Notification,Prilagodite Obvestilo
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +87,Hammering,Kovanje
 DocType: Web Page,Slideshow,Slideshow
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +24,Default Address Template cannot be deleted,Privzeto Naslov Predloga ni mogoče izbrisati
 DocType: Sales Invoice,Shipping Rule,Dostava Pravilo
@@ -2786,9 +2675,8 @@
 DocType: Workflow State,Search,Iskanje
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +54,Total cannot be zero,Skupaj ne more biti nič
 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,&quot;Dnevi od zadnjega reda&quot; mora biti večji ali enak nič
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +142,Brazing,Spajkanje
 DocType: C-Form,Amended From,Spremenjeni Od
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Raw Material,Surovina
+apps/erpnext/erpnext/public/js/setup_wizard.js +359,Raw Material,Surovina
 DocType: Leave Application,Follow via Email,Sledite preko e-maila
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Davčna Znesek Po Popust Znesek
 apps/erpnext/erpnext/accounts/doctype/account/account.py +174,Child account exists for this account. You can not delete this account.,"Otrok račun obstaja za ta račun. Ne, ne moreš izbrisati ta račun."
@@ -2802,10 +2690,10 @@
 ,Produced,Proizvedena
 DocType: Item,Item Code for Suppliers,Oznaka za dobavitelje
 DocType: Issue,Raised By (Email),Postavljeno Z (e-naslov)
-apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +72,General,Splošno
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +495,Attach Letterhead,Priložite pisemski
+apps/erpnext/erpnext/setup/setup_wizard/default_website.py +72,General,Splošno
+apps/erpnext/erpnext/public/js/setup_wizard.js +241,Attach Letterhead,Priložite pisemski
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +272,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',"Ne more odbiti, če je kategorija za &quot;vrednotenje&quot; ali &quot;Vrednotenje in Total&quot;"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +542,"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.","Seznam vaših davčnih glave (npr DDV, carine itd, morajo imeti edinstvena imena) in njihovi standardni normativi. To bo ustvarilo standardno predlogo, ki jo lahko urediti in dodati več kasneje."
+apps/erpnext/erpnext/public/js/setup_wizard.js +284,"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.","Seznam vaših davčnih glave (npr DDV, carine itd, morajo imeti edinstvena imena) in njihovi standardni normativi. To bo ustvarilo standardno predlogo, ki jo lahko urediti in dodati več kasneje."
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial Nos Required for Serialized Item {0},Serijska št Zahtevano za zaporednimi postavki {0}
 DocType: Journal Entry,Bank Entry,Banka Začetek
 DocType: Authorization Rule,Applicable To (Designation),Ki se uporabljajo za (Oznaka)
@@ -2814,32 +2702,31 @@
 apps/erpnext/erpnext/config/accounts.py +143,Enable / disable currencies.,Omogoči / onemogoči valute.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Postal Expenses,Poštni stroški
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Skupaj (Amt)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +26,Entertainment & Leisure,Zabava &amp; prosti čas
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,Zabava &amp; prosti čas
 DocType: Purchase Order,The date on which recurring order will be stop,"Datum, na katerega se bodo ponavljajoče se naročilo ustavi"
 DocType: Quality Inspection,Item Serial No,Postavka Zaporedna številka
 apps/erpnext/erpnext/controllers/status_updater.py +142,{0} must be reduced by {1} or you should increase overflow tolerance,{0} je treba zmanjšati za {1} ali pa bi se morala povečati strpnost preliva
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Present,Skupaj Present
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Hour,Ura
+apps/erpnext/erpnext/public/js/setup_wizard.js +363,Hour,Ura
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +138,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation",Zaporednimi Postavka {0} ni mogoče posodobiti \ uporabo zaloge sprave
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +488,Transfer Material to Supplier,Prenos Material za dobavitelja
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +513,Transfer Material to Supplier,Prenos Material za dobavitelja
 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,Nova serijska številka ne more imeti skladišče. Skladišče mora nastaviti borze vstopu ali Potrdilo o nakupu
 DocType: Lead,Lead Type,Svinec Type
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +82,Create Quotation,Ustvarite predračun
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +306,All these items have already been invoiced,Vsi ti predmeti so bili že obračunano
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,You are not authorized to approve leaves on Block Dates,Niste pooblaščeni za odobritev liste na Block termini
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +311,All these items have already been invoiced,Vsi ti predmeti so bili že obračunano
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},Mogoče odobriti {0}
 DocType: Shipping Rule,Shipping Rule Conditions,Dostava Pravilo Pogoji
 DocType: BOM Replace Tool,The new BOM after replacement,Novi BOM po zamenjavi
 DocType: Features Setup,Point of Sale,Prodajno mesto
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +83,Curling,Curling
 DocType: Account,Tax,Davčna
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +28,Row {0}: {1} is not a valid {2},Vrstica {0}: {1} ni veljaven {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +89,Refining,Rafiniranje
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +37,Row {0}: {1} is not a valid {2},Vrstica {0}: {1} ni veljaven {2}
 DocType: Production Planning Tool,Production Planning Tool,Production Planning Tool
 DocType: Quality Inspection,Report Date,Poročilo Datum
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +130,Routing,Usmerjanje
 DocType: C-Form,Invoices,Računi
 DocType: Job Opening,Job Title,Job Naslov
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +54,{0} already allocated for Employee {1} for period {2} - {3},{0} že dodeljenih za Employee {1} za obdobje {2} - {3}
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +80,{0} Recipients,{0} Prejemniki
 DocType: Features Setup,Item Groups in Details,Postavka Skupine v Podrobnosti
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +335,Quantity to Manufacture must be greater than 0.,Količina na Izdelava mora biti večja od 0.
@@ -2857,14 +2744,13 @@
 DocType: DocType,Setup,Nastaviti
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,Nič ni za urejanje.
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +108,Summary for this month and pending activities,Povzetek za ta mesec in v teku dejavnosti
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +39,Cold rolling,Hladno valjanje
 DocType: Customer Group,Customer Group Name,Skupina Ime stranke
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +408,Please remove this Invoice {0} from C-Form {1},"Prosimo, odstranite tej fakturi {0} od C-Form {1}"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +410,Please remove this Invoice {0} from C-Form {1},"Prosimo, odstranite tej fakturi {0} od C-Form {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,"Prosimo, izberite Carry Forward, če želite vključiti tudi v preteklem poslovnem letu je bilanca prepušča tem fiskalnem letu"
 DocType: GL Entry,Against Voucher Type,Proti bon Type
 DocType: Item,Attributes,Atributi
 DocType: Packing Slip,Get Items,Pridobite Items
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +186,Please enter Write Off Account,Vnesite Napišite Off račun
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +187,Please enter Write Off Account,Vnesite Napišite Off račun
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +71,Last Order Date,Zadnja Datum naročila
 DocType: DocField,Image,Image
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +179,Make Excise Invoice,Naredite trošarine fakturo
@@ -2874,7 +2760,7 @@
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +146,Operation ID not set,Operacija ID ni nastavljen
 DocType: Production Order,Planned Start Date,Načrtovani datum začetka
 DocType: Serial No,Creation Document Type,Creation Document Type
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +620,Maint. Visit,Vzdrževalec. Obisk
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +631,Maint. Visit,Vzdrževalec. Obisk
 DocType: Leave Type,Is Encash,Je vnovči
 DocType: Purchase Invoice,Mobile No,Mobile No
 DocType: Payment Tool,Make Journal Entry,Naredite Journal Entry
@@ -2882,35 +2768,31 @@
 apps/erpnext/erpnext/controllers/trends.py +257,Project-wise data is not available for Quotation,Podatki projekt pametno ni na voljo za ponudbo
 DocType: Project,Expected End Date,Pričakovani datum zaključka
 DocType: Appraisal Template,Appraisal Template Title,Cenitev Predloga Naslov
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +440,Commercial,Commercial
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +378,Commercial,Commercial
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +23,Parent Item {0} must not be a Stock Item,Parent Item {0} ne sme biti Stock Postavka
 DocType: Cost Center,Distribution Id,Porazdelitev Id
-apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +14,Awesome Services,Super Storitve
+apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +14,Awesome Services,Super Storitve
 apps/erpnext/erpnext/config/manufacturing.py +29,All Products or Services.,Vse izdelke ali storitve.
 DocType: Purchase Invoice,Supplier Address,Dobavitelj Naslov
 DocType: Contact Us Settings,Address Line 2,Naslov Line 2
 DocType: ToDo,Reference,Sklicevanje
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +59,Perforating,Perforiranje
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,Out Kol
 apps/erpnext/erpnext/config/accounts.py +128,Rules to calculate shipping amount for a sale,Pravila za izračun zneska ladijskega za prodajo
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +29,Series is mandatory,Serija je obvezna
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +28,Financial Services,Finančne storitve
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,Finančne storitve
 apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3},Vrednost za Attribute {0} mora biti v razponu od {1} na {2} v korakih po {3}
 DocType: Tax Rule,Sales,Prodaja
 DocType: Stock Entry Detail,Basic Amount,Osnovni znesek
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +173,Warehouse required for stock Item {0},Skladišče je potrebna za borzo postavki {0}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +178,Warehouse required for stock Item {0},Skladišče je potrebna za borzo postavki {0}
 DocType: Leave Allocation,Unused leaves,Neizkoriščene listi
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,Cr
 DocType: Customer,Default Receivable Accounts,Privzeto Terjatev računov
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +102,Sawing,Žaganje
 DocType: Tax Rule,Billing State,Država za zaračunavanje
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +32,Laminating,Laminiranje
 DocType: Item Reorder,Transfer,Prenos
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +549,Fetch exploded BOM (including sub-assemblies),Fetch eksplodiral BOM (vključno podsklopov)
 DocType: Authorization Rule,Applicable To (Employee),Ki se uporabljajo za (zaposlenih)
 apps/erpnext/erpnext/controllers/accounts_controller.py +101,Due Date is mandatory,Datum zapadlosti je obvezno
 apps/erpnext/erpnext/controllers/item_variant.py +51,Increment for Attribute {0} cannot be 0,Prirastek za Attribute {0} ne more biti 0
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +143,Sintering,Sintranje
 DocType: Journal Entry,Pay To / Recd From,Pay / Recd Od
 DocType: Naming Series,Setup Series,Setup Series
 DocType: Supplier,Contact HTML,Kontakt HTML
@@ -2923,7 +2805,6 @@
 DocType: Attendance,Absent,Odsoten
 DocType: Product Bundle,Product Bundle,Bundle izdelek
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +180,Row {0}: Invalid reference {1},Vrstica {0}: Neveljavna referenčna {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +165,Crushing,Drobljenje
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Nakup davki in dajatve Template
 DocType: Upload Attendance,Download Template,Download Predloga
 DocType: GL Entry,Remarks,Opombe
@@ -2931,14 +2812,12 @@
 DocType: Journal Entry,Write Off Based On,Odpisuje temelji na
 DocType: Features Setup,POS View,POS View
 apps/erpnext/erpnext/config/stock.py +38,Installation record for a Serial No.,Namestitev rekord Serial No.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +9,Continuous casting,Kontinuirano litje
 apps/erpnext/erpnext/public/js/queries.js +39,Please specify a,"Prosimo, določite"
 DocType: Offer Letter,Awaiting Response,Čakanje na odgovor
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +53,Above,Nad
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +80,Cold sizing,Hladno dimenzioniranje
 DocType: Salary Slip,Earning & Deduction,Zaslužek &amp; Odbitek
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +76,Account {0} cannot be a Group,Upoštevati {0} ne more biti skupina
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +259,Region,Regija
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +314,Region,Regija
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +213,Optional. This setting will be used to filter in various transactions.,Neobvezno. Ta nastavitev bo uporabljena za filtriranje v različnih poslih.
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +104,Negative Valuation Rate is not allowed,Negativno Oceni Vrednotenje ni dovoljeno
 DocType: Holiday List,Weekly Off,Tedenski Off
@@ -2956,7 +2835,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,Account {0} is inactive,Račun {0} je neaktiven
 DocType: GL Entry,Is Advance,Je Advance
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,Udeležba Od datuma in udeležba na Datum je obvezna
-apps/erpnext/erpnext/controllers/buying_controller.py +131,Please enter 'Is Subcontracted' as Yes or No,"Prosimo, vpišite &quot;Je v podizvajanje&quot;, kot DA ali NE"
+apps/erpnext/erpnext/controllers/buying_controller.py +122,Please enter 'Is Subcontracted' as Yes or No,"Prosimo, vpišite &quot;Je v podizvajanje&quot;, kot DA ali NE"
 DocType: Sales Team,Contact No.,Kontakt No.
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,'Profit and Loss' type account {0} not allowed in Opening Entry,&quot;Izkaz poslovnega izida&quot; tip račun {0} ni dovoljen v vstopna odprtina
 DocType: Workflow State,Time,Čas
@@ -2965,14 +2844,13 @@
 DocType: Authorization Rule,Authorization Rule,Dovoljenje Pravilo
 DocType: Sales Invoice,Terms and Conditions Details,Pogoji in Podrobnosti
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,Prodajne Davki in dajatve predloge
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +10,Apparel & Accessories,Oblačila in dodatki
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,Oblačila in dodatki
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +67,Number of Order,Število reda
 DocType: Item Group,HTML / Banner that will show on the top of product list.,"HTML / Banner, ki se bo prikazal na vrhu seznama izdelkov."
 DocType: Shipping Rule,Specify conditions to calculate shipping amount,Navedite pogoje za izračun zneska ladijskega
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +121,Add Child,Dodaj Child
 DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,"Vloga dovoliti, da določijo zamrznjenih računih in uredi Zamrznjen Entries"
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +52,Cannot convert Cost Center to ledger as it has child nodes,"Ni mogoče pretvoriti v stroškovni center za knjigo, saj ima otrok vozlišč"
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +47,Conversion Factor is required,Je potrebna pretvorba Factor
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +37,Serial #,Serial #
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +87,Commission on Sales,Komisija za prodajo
 DocType: Offer Letter Term,Value / Description,Vrednost / Opis
@@ -2980,10 +2858,8 @@
 ,Customers Not Buying Since Long Time,"Kupci ne kupujejo, saj dolgo časa"
 DocType: Production Order,Expected Delivery Date,Pričakuje Dostava Datum
 apps/erpnext/erpnext/accounts/general_ledger.py +121,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Debetnih in kreditnih ni enaka za {0} # {1}. Razlika je {2}.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +48,Bulging,Izbuljene
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +11,Evaporative-pattern casting,Izhlapevanja-vzorec litje
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Entertainment Expenses,Zabava Stroški
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +195,Sales Invoice {0} must be cancelled before cancelling this Sales Order,Prodaja Račun {0} je treba preklicati pred ukinitvijo te Sales Order
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +190,Sales Invoice {0} must be cancelled before cancelling this Sales Order,Prodaja Račun {0} je treba preklicati pred ukinitvijo te Sales Order
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +61,Age,Starost
 DocType: Time Log,Billing Amount,Zaračunavanje Znesek
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +84,Invalid quantity specified for item {0}. Quantity should be greater than 0.,"Neveljavna količina, določena za postavko {0}. Količina mora biti večja od 0."
@@ -3002,26 +2878,24 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,New Customer Prihodki
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Travel Expenses,Potni stroški
 DocType: Maintenance Visit,Breakdown,Zlomiti se
-apps/erpnext/erpnext/controllers/accounts_controller.py +241,Account: {0} with currency: {1} can not be selected,Račun: {0} z valuti: ne more biti izbran {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +242,Account: {0} with currency: {1} can not be selected,Račun: {0} z valuti: ne more biti izbran {1}
 DocType: Bank Reconciliation Detail,Cheque Date,Ček Datum
 apps/erpnext/erpnext/accounts/doctype/account/account.py +47,Account {0}: Parent account {1} does not belong to company: {2},Račun {0}: Matično račun {1} ne pripada podjetju: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted all transactions related to this company!,Uspešno izbrisana vse transakcije v zvezi s to družbo!
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,Kot na datum
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +111,Honing,Honanje
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +58,Probation,Poskusno delo
-apps/erpnext/erpnext/stock/doctype/item/item.py +264,Default Warehouse is mandatory for stock Item.,Privzeto Skladišče je obvezna za borzo točki.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Probation,Poskusno delo
+apps/erpnext/erpnext/stock/doctype/item/item.py +268,Default Warehouse is mandatory for stock Item.,Privzeto Skladišče je obvezna za borzo točki.
 DocType: Feed,Full Name,Polno ime
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +148,Clinching,Clinching
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +191,Payment of salary for the month {0} and year {1},Izplačilo plače za mesec {0} in leto {1}
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +173,Payment of salary for the month {0} and year {1},Izplačilo plače za mesec {0} in leto {1}
 DocType: Stock Settings,Auto insert Price List rate if missing,Auto insert stopnja Cenik če manjka
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,Skupaj Plačan znesek
 ,Transferred Qty,Prenese Kol
 apps/erpnext/erpnext/config/learn.py +11,Navigating,Krmarjenje
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +137,Planning,Načrtovanje
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +137,Planning,Načrtovanje
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +9,Make Time Log Batch,Naredite Čas Log Batch
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Issued,Izdala
 DocType: Project,Total Billing Amount (via Time Logs),Skupni znesek plačevanja (preko Čas Dnevniki)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +629,We sell this Item,Prodamo ta artikel
+apps/erpnext/erpnext/public/js/setup_wizard.js +365,We sell this Item,Prodamo ta artikel
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +65,Supplier Id,Dobavitelj Id
 DocType: Journal Entry,Cash Entry,Cash Začetek
 DocType: Sales Partner,Contact Desc,Kontakt opis izdelka
@@ -3030,18 +2904,16 @@
 DocType: Brand,Item Manager,Element Manager
 DocType: Cost Center,Add rows to set annual budgets on Accounts.,"Dodajte vrstice, da določijo letne proračune na računih."
 DocType: Buying Settings,Default Supplier Type,Privzeta Dobavitelj Type
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +160,Quarrying,Kamnolomi
 DocType: Production Order,Total Operating Cost,Skupni operativni stroški
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +160,Note: Item {0} entered multiple times,Opomba: Točka {0} vpisana večkrat
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +163,Note: Item {0} entered multiple times,Opomba: Točka {0} vpisana večkrat
 apps/erpnext/erpnext/config/crm.py +27,All Contacts.,Vsi stiki.
 DocType: Newsletter,Test Email Id,Testna Email Id
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +394,Company Abbreviation,Kratica podjetje
+apps/erpnext/erpnext/public/js/setup_wizard.js +142,Company Abbreviation,Kratica podjetja
 DocType: Features Setup,If you follow Quality Inspection. Enables Item QA Required and QA No in Purchase Receipt,Če sledite kontrolo kakovosti. Omogoča item QA obvezno in ZK ni v Potrdilo o nakupu
 DocType: GL Entry,Party Type,Vrsta Party
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +68,Raw material cannot be same as main Item,"Surovina, ne more biti isto kot glavni element"
 DocType: Item Attribute Value,Abbreviation,Kratica
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,"Ne authroized saj je {0}, presega meje"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +30,Rotational molding,Rotacijsko oblikovanje
 apps/erpnext/erpnext/config/hr.py +115,Salary template master.,Plača predlogo gospodar.
 DocType: Leave Type,Max Days Leave Allowed,Max dni dopusta Dovoljeno
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +55,Set Tax Rule for shopping cart,Nastavite Davčna pravilo za nakupovalno košarico
@@ -3055,15 +2927,15 @@
 apps/erpnext/erpnext/config/selling.py +18,Quotes to Leads or Customers.,Citati za Interesenti ali stranke.
 DocType: Stock Settings,Role Allowed to edit frozen stock,Vloga Dovoljeno urediti zamrznjeno zalog
 ,Territory Target Variance Item Group-Wise,Ozemlje Ciljna Varianca Postavka Group-Wise
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +101,All Customer Groups,Vse skupine strank
-apps/erpnext/erpnext/controllers/accounts_controller.py +474,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} je obvezna. Mogoče je Menjalni zapis ni ustvarjen za {1} na {2}.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +101,All Customer Groups,Vse skupine strank
+apps/erpnext/erpnext/controllers/accounts_controller.py +475,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} je obvezna. Mogoče je Menjalni zapis ni ustvarjen za {1} na {2}.
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +37,Tax Template is mandatory.,Davčna Predloga je obvezna.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +41,Account {0}: Parent account {1} does not exist,Račun {0}: Matično račun {1} ne obstaja
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Cenik Rate (družba Valuta)
 DocType: Account,Temporary,Začasna
 DocType: Address,Preferred Billing Address,Želeni plačevanja Naslov
 DocType: Monthly Distribution Percentage,Percentage Allocation,Odstotek dodelitve
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +86,Secretary,Sekretar
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Secretary,Sekretar
 DocType: Serial No,Distinct unit of an Item,Ločena enota Postavka
 DocType: Pricing Rule,Buying,Odkup
 DocType: HR Settings,Employee Records to be created by,"Zapisi zaposlenih, ki ga povzročajo"
@@ -3076,9 +2948,8 @@
 ,Item-wise Price List Rate,Element-pametno Cenik Rate
 DocType: Purchase Order Item,Supplier Quotation,Dobavitelj za predračun
 DocType: Quotation,In Words will be visible once you save the Quotation.,"V besedi bo viden, ko boste prihranili citata."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +68,Ironing,Likanje
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is stopped,{0} {1} je ustavila
-apps/erpnext/erpnext/stock/doctype/item/item.py +352,Barcode {0} already used in Item {1},Barcode {0} že uporabljajo v postavki {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +356,Barcode {0} already used in Item {1},Barcode {0} že uporabljajo v postavki {1}
 DocType: Lead,Add to calendar on this date,Dodaj v koledar na ta dan
 apps/erpnext/erpnext/config/selling.py +132,Rules for adding shipping costs.,Pravila za dodajanje stroškov dostave.
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,Prihajajoči dogodki
@@ -3087,27 +2958,25 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +27,Quick Entry,Quick Entry
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0} je obvezna za vrnitev
 DocType: Purchase Order,To Receive,Prejeti
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +33,Shrink fitting,Shrink opremljanje
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +522,user@example.com,user@example.com
+apps/erpnext/erpnext/public/js/setup_wizard.js +266,user@example.com,user@example.com
 DocType: Email Digest,Income / Expense,Prihodki / odhodki
 DocType: Employee,Personal Email,Osebna Email
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +58,Total Variance,Skupne variance
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +62,Total Variance,Skupne variance
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.","Če je omogočeno, bo sistem objavili računovodske vnose za popis samodejno."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +15,Brokerage,Posredništvo
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +15,Brokerage,Posredništvo
 DocType: Address,Postal Code,Poštna številka
 DocType: Production Order Operation,"in Minutes
 Updated via 'Time Log'",v minutah Posodobljeno preko &quot;Čas Logu&quot;
 DocType: Customer,From Lead,Iz svinca
 apps/erpnext/erpnext/config/manufacturing.py +19,Orders released for production.,Naročila sprosti za proizvodnjo.
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +42,Select Fiscal Year...,Izberite poslovno leto ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +442,POS Profile required to make POS Entry,"POS Profil zahteva, da POS Entry"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +444,POS Profile required to make POS Entry,"POS Profil zahteva, da POS Entry"
 DocType: Hub Settings,Name Token,Ime Token
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +106,Planing,Inženiring
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Selling,Standardna Prodaja
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +120,Standard Selling,Standardna Prodaja
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +137,Atleast one warehouse is mandatory,Atleast eno skladišče je obvezna
 DocType: Serial No,Out of Warranty,Iz garancije
 DocType: BOM Replace Tool,Replace,Zamenjaj
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +314,{0} against Sales Invoice {1},{0} proti prodajne fakture {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +316,{0} against Sales Invoice {1},{0} proti prodajne fakture {1}
 apps/erpnext/erpnext/stock/doctype/item/item.py +49,Please enter default Unit of Measure,Vnesite privzeto mersko enoto
 DocType: Purchase Invoice Item,Project Name,Ime projekta
 DocType: Supplier,Mention if non-standard receivable account,Omemba če nestandardno terjatve račun
@@ -3123,9 +2992,8 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,Journal Entry {0} does not have account {1} or already matched against other voucher,Journal Entry {0} nima računa {1} ali že primerjali z drugimi kupon
 DocType: Item,Moving Average,Moving Average
 DocType: BOM Replace Tool,The BOM which will be replaced,BOM ki bo nadomestila
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +43,New Stock UOM must be different from current stock UOM,New Stock UOM mora biti drugačna od trenutne zaloge UOM
 DocType: Account,Debit,Debetne
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +34,Leaves must be allocated in multiples of 0.5,Listi morajo biti dodeljen v večkratnikih 0.5
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +44,Leaves must be allocated in multiples of 0.5,Listi morajo biti dodeljen v večkratnikih 0.5
 DocType: Production Order,Operation Cost,Delovanje Stroški
 apps/erpnext/erpnext/config/hr.py +71,Upload attendance from a .csv file,Naloži udeležbo iz .csv datoteke
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,Izjemna Amt
@@ -3143,8 +3011,7 @@
 DocType: Employee,Internal Work History,Notranji Delo Zgodovina
 DocType: DocField,Column Break,Stolpec Break
 DocType: Event,Thursday,Četrtek
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +42,Private Equity,Private Equity
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +93,Turning,Obračanja
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,Private Equity
 DocType: Maintenance Visit,Customer Feedback,Customer Feedback
 DocType: Account,Expense,Expense
 DocType: Sales Invoice,Exhibition,Razstava
@@ -3157,19 +3024,19 @@
 DocType: Employee,Held On,Potekala v
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +33,Production Item,Proizvodnja Postavka
 ,Employee Information,Informacije zaposleni
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,Rate (%),Stopnja (%)
+apps/erpnext/erpnext/public/js/setup_wizard.js +294,Rate (%),Stopnja (%)
 DocType: Stock Entry Detail,Additional Cost,Dodatne Stroški
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +407,Financial Year End Date,Proračunsko leto End Date
+apps/erpnext/erpnext/public/js/setup_wizard.js +155,Financial Year End Date,Proračunsko leto End Date
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Voucher No, if grouped by Voucher","Filter ne more temeljiti na kupona št, če je združena s Voucher"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +484,Make Supplier Quotation,Naredite Dobavitelj predračun
 DocType: Quality Inspection,Incoming,Dohodni
 DocType: BOM,Materials Required (Exploded),Potreben materiali (eksplodirala)
 DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),Zmanjšajte Služenje za dopust brez plačila (md)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +512,"Add users to your organization, other than yourself","Dodati uporabnike za vašo organizacijo, razen sebe"
+apps/erpnext/erpnext/public/js/setup_wizard.js +256,"Add users to your organization, other than yourself","Dodati uporabnike za vašo organizacijo, razen sebe"
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No {1} does not match with {2} {3},Vrstica # {0}: Serijska št {1} ne ujema z {2} {3}
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +44,Casual Leave,Casual Zapusti
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +44,Casual Leave,Casual Zapusti
 DocType: Batch,Batch ID,Serija ID
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +334,Note: {0},Opomba: {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +336,Note: {0},Opomba: {0}
 ,Delivery Note Trends,Dobavnica Trendi
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +104,This Week's Summary,Povzetek Ta teden je
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +74,{0} must be a Purchased or Sub-Contracted Item in row {1},{0} mora biti kupljena ali podizvajalcev Postavka v vrstici {1}
@@ -3181,7 +3048,7 @@
 DocType: Purchase Receipt,Return Against Purchase Receipt,Vrni Proti Potrdilo o nakupu
 DocType: Purchase Order,To Bill,Billu
 DocType: Material Request,% Ordered,% Ž
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +61,Piecework,Akord
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Piecework,Akord
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +64,Avg. Buying Rate,Avg. Odkup tečaj
 DocType: Task,Actual Time (in Hours),Dejanski čas (v urah)
 DocType: Employee,History In Company,Zgodovina V družbi
@@ -3198,13 +3065,13 @@
 DocType: Opportunity,To Discuss,Razpravljati
 DocType: SMS Settings,SMS Settings,Nastavitve SMS
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +60,Temporary Accounts,Začasni računi
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +155,Black,Črna
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Black,Črna
 DocType: BOM Explosion Item,BOM Explosion Item,BOM Eksplozija Postavka
 DocType: Account,Auditor,Revizor
 DocType: Purchase Order,End date of current order's period,Končni datum obdobja Trenutni vrstni red je
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +17,Make Offer Letter,Naredite Pisna ponudba
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +10,Return,Return
-apps/erpnext/erpnext/stock/doctype/item/item.py +503,Default Unit of Measure for Variant must be same as Template,Privzeto mersko enoto za Variant mora biti enaka kot predlogo
+apps/erpnext/erpnext/stock/doctype/item/item.py +507,Default Unit of Measure for Variant must be same as Template,Privzeto mersko enoto za Variant mora biti enaka kot predlogo
 DocType: DocField,Fold,Zložite
 DocType: Production Order Operation,Production Order Operation,Proizvodnja naročite Delovanje
 DocType: Pricing Rule,Disable,Onemogoči
@@ -3215,13 +3082,12 @@
 DocType: Page,Page Name,Page Name
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +110,To Time must be greater than From Time,Da mora biti čas biti večja od od časa
 DocType: Journal Entry Account,Exchange Rate,Menjalni tečaj
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +465,Sales Order {0} is not submitted,Sales Order {0} ni predložila
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +467,Sales Order {0} is not submitted,Sales Order {0} ni predložila
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0}: Parent account {1} does not bolong to the company {2},Skladišče {0}: Matično račun {1} ne Bolong podjetju {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +124,Spindle finishing,Vreteno Dodelava
 DocType: BOM,Last Purchase Rate,Zadnja Purchase Rate
 DocType: Account,Asset,Asset
 DocType: Project Task,Task ID,Naloga ID
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +395,"e.g. ""MC""",npr &quot;MC&quot;
+apps/erpnext/erpnext/public/js/setup_wizard.js +143,"e.g. ""MC""",npr &quot;MC&quot;
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,Stock cannot exist for Item {0} since has variants,"Stock ne more obstajati za postavko {0}, saj ima variant"
 ,Sales Person-wise Transaction Summary,Prodaja Oseba pametno Transakcijski Povzetek
 DocType: System Settings,Time Zone,Časovni pas
@@ -3230,9 +3096,7 @@
 DocType: Monthly Distribution,Monthly Distribution Percentages,Mesečni Distribucijski Odstotki
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +16,The selected item cannot have Batch,Izbrana postavka ne more imeti Batch
 DocType: Delivery Note,% of materials delivered against this Delivery Note,% Materialov podal proti tej dobavnici
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +151,Stapling,Spenjanje
 DocType: Customer,Customer Details,Podrobnosti strank
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +105,Shaping,Oblikovanje
 DocType: Employee,Reports to,Poročila
 DocType: SMS Settings,Enter url parameter for receiver nos,Vnesite url parameter za sprejemnik nos
 DocType: Sales Invoice,Paid Amount,Plačan znesek
@@ -3241,13 +3105,13 @@
 DocType: Item Variant,Item Variant,Postavka Variant
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +15,Setting this Address Template as default as there is no other default,Nastavitev ta naslov predlogo kot privzeto saj ni druge privzeto
 apps/erpnext/erpnext/accounts/doctype/account/account.py +89,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Stanje na računu že v obremenitve, se vam ni dovoljeno, da nastavite &quot;Stanje mora biti&quot; kot &quot;kredit&quot;"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +76,Quality Management,Upravljanje kakovosti
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Quality Management,Upravljanje kakovosti
 DocType: Production Planning Tool,Filter based on customer,"Filter, ki temelji na kupca"
 DocType: Payment Tool Detail,Against Voucher No,Proti kupona št
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +47,Please enter quantity for Item {0},Vnesite količino za postavko {0}
 DocType: Employee External Work History,Employee External Work History,Delavec Zunanji Delo Zgodovina
 DocType: Tax Rule,Purchase,Nakup
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +34,Balance Qty,Balance Kol
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Balance Qty,Balance Kol
 DocType: Item Group,Parent Item Group,Parent Item Group
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +21,{0} for {1},{0} za {1}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +96,Cost Centers,Stroškovnih mestih
@@ -3257,12 +3121,12 @@
 DocType: Opportunity,Next Contact,Naslednja Kontakt
 DocType: Employee,Employment Type,Vrsta zaposlovanje
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,Osnovna sredstva
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +84,Application period cannot be across two alocation records,Prijavni rok ne more biti čez dve Razporejanje zapisov
 DocType: Item Group,Default Expense Account,Privzeto Expense račun
 DocType: Employee,Notice (days),Obvestilo (dni)
 DocType: Page,Yes,Da
 DocType: Tax Rule,Sales Tax Template,Sales Tax Predloga
 DocType: Employee,Encashment Date,Vnovčevanje Datum
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +74,Electroforming,Electroforming
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +179,"Against Voucher Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Proti bon mora Vrsta biti eden narocilo, Nakup računa ali list Začetek"
 DocType: Account,Stock Adjustment,Prilagoditev Stock
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +34,Default Activity Cost exists for Activity Type - {0},Obstaja Stroški Privzeta aktivnost za vrsto dejavnosti - {0}
@@ -3298,12 +3162,12 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,"Skladišče ni mogoče črtati, saj obstaja vnos stock knjiga za to skladišče."
 DocType: Company,Distribution,Porazdelitev
 apps/erpnext/erpnext/public/js/pos/pos.html +36,Amount Paid,Plačani znesek
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +91,Project Manager,Project Manager
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +72,Dispatch,Dispatch
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Project Manager,Project Manager
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +72,Dispatch,Dispatch
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,Max popust dovoljena za postavko: {0} je {1}%
 DocType: Customer,Default Taxes and Charges,Privzete Davki in dajatve
 DocType: Account,Receivable,Terjatev
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +268,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,Vrstica # {0}: ni dovoljeno spreminjati Dobavitelj kot Naročilo že obstaja
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +263,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,Vrstica # {0}: ni dovoljeno spreminjati Dobavitelj kot Naročilo že obstaja
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,"Vloga, ki jo je dovoljeno vložiti transakcije, ki presegajo omejitve posojil zastavili."
 DocType: Sales Invoice,Supplier Reference,Dobavitelj 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.","Če je omogočeno, bo BOM za podsklopov postavk šteti za pridobivanje surovin. V nasprotnem primeru bodo vsi podsklopi postavke se obravnavajo kot surovino."
@@ -3311,8 +3175,8 @@
 DocType: Hub Settings,Seller Description,Prodajalec Opis
 DocType: Employee Education,Qualification,Kvalifikacije
 DocType: Item Price,Item Price,Item Cena
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +48,Soap & Detergent,Soap &amp; Detergent
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +36,Motion Picture & Video,Motion Picture &amp; Video
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +48,Soap & Detergent,Soap &amp; Detergent
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +36,Motion Picture & Video,Motion Picture &amp; Video
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Naročeno
 DocType: Warehouse,Warehouse Name,Skladišče Name
 DocType: Naming Series,Select Transaction,Izberite Transaction
@@ -3321,7 +3185,6 @@
 DocType: BOM,Rate Of Materials Based On,Oceni materialov na osnovi
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,Podpora Analtyics
 apps/erpnext/erpnext/accounts/doctype/accounts_settings/accounts_settings.py +27,Company is missing in warehouses {0},Podjetje manjka v skladiščih {0}
-DocType: Stock UOM Replace Utility,Stock UOM Replace Utility,Stock UOM Zamenjaj Utility
 DocType: POS Profile,Terms and Conditions,Pravila in pogoji
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,To Date should be within the Fiscal Year. Assuming To Date = {0},"Do datuma mora biti v poslovnem letu. Ob predpostavki, da želite Datum = {0}"
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","Tukaj lahko ohranijo višino, težo, alergije, zdravstvene pomisleke itd"
@@ -3333,7 +3196,7 @@
 DocType: Sales Order Item,For Production,Za proizvodnjo
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +103,Please enter sales order in the above table,"Prosimo, vnesite prodajno naročilo v zgornji tabeli"
 DocType: Project Task,View Task,Ogled Task
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +406,Your financial year begins on,Vaš proračunsko leto se začne na
+apps/erpnext/erpnext/public/js/setup_wizard.js +154,Your financial year begins on,Vaš proračunsko leto se začne na
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +46,Please enter Purchase Receipts,Vnesite Nakup Prejemki
 DocType: Sales Invoice,Get Advances Received,Get prejeti predujmi
 DocType: Email Digest,Add/Remove Recipients,Dodaj / Odstrani prejemnike
@@ -3341,16 +3204,14 @@
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","Če želite nastaviti to poslovno leto kot privzeto, kliknite na &quot;Set as Default&quot;"
 apps/erpnext/erpnext/config/support.py +54,Setup incoming server for support email id. (e.g. support@example.com),Setup dohodni strežnik za podporo email id. (npr support@example.com)
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,Pomanjkanje Kol
-apps/erpnext/erpnext/stock/doctype/item/item.py +528,Item variant {0} exists with same attributes,Obstaja postavka varianta {0} z enakimi atributi
+apps/erpnext/erpnext/stock/doctype/item/item.py +532,Item variant {0} exists with same attributes,Obstaja postavka varianta {0} z enakimi atributi
 DocType: Salary Slip,Salary Slip,Plača listek
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +116,Burnishing,Bruniranje
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +54,'To Date' is required,&quot;Da Datum&quot; je potrebno
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,&quot;Da Datum&quot; je potrebno
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","Ustvarjajo dobavnic, da paketi dostavi. Uporablja se za uradno številko paketa, vsebino paketa in njegovo težo."
 DocType: Sales Invoice Item,Sales Order Item,Sales Order Postavka
 DocType: Salary Slip,Payment Days,Plačilni dnevi
 DocType: BOM,Manage cost of operations,Upravljati stroške poslovanja
 DocType: Features Setup,Item Advanced,Postavka Napredno
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +40,Hot rolling,Toplo valjanje
 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.","Ko kateri koli od pregledanih transakcij &quot;Objavil&quot;, e-pop-up samodejno odpre, da pošljete e-pošto s pripadajočim &quot;stik&quot; v tem poslu, s poslom, kot prilogo. Uporabnik lahko ali pa ne pošljete e-pošto."
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,Globalni Nastavitve
 DocType: Employee Education,Employee Education,Izobraževanje delavec
@@ -3363,25 +3224,23 @@
 DocType: Customer,Sales Team Details,Sales Team Podrobnosti
 DocType: Expense Claim,Total Claimed Amount,Skupaj zahtevani znesek
 apps/erpnext/erpnext/config/crm.py +22,Potential opportunities for selling.,Potencialne možnosti za prodajo.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +48,Sick Leave,Bolniški dopust
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +174,Invalid {0},Neveljavna {0}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +48,Sick Leave,Bolniški dopust
 DocType: Email Digest,Email Digest,Email Digest
 DocType: Delivery Note,Billing Address Name,Zaračunavanje Naslov Name
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +22,Department Stores,Veleblagovnice
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,Veleblagovnice
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +40,System Balance,Sistem Balance
 DocType: Workflow,Is Active,Je aktiven
 apps/erpnext/erpnext/controllers/stock_controller.py +71,No accounting entries for the following warehouses,Ni vknjižbe za naslednjih skladiščih
 apps/erpnext/erpnext/projects/doctype/project/project.js +22,Save the document first.,Shranite dokument na prvem mestu.
 DocType: Account,Chargeable,Obračuna
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +121,Linishing,Linishing
 DocType: Company,Change Abbreviation,Spremeni Kratica
 DocType: Workflow State,Primary,Primarni
 DocType: Expense Claim Detail,Expense Date,Expense Datum
 DocType: Item,Max Discount (%),Max Popust (%)
 DocType: Communication,More Information,Več informacij
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +70,Last Order Amount,Zadnja naročite Znesek
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +161,Blasting,Miniranje
 DocType: Company,Warn,Opozori
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +111,Item valuation updated,Postavka vrednotenje posodobljeni
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Kakršne koli druge pripombe, omembe vredna napora, da bi moral iti v evidencah."
 DocType: BOM,Manufacturing User,Proizvodnja Uporabnik
 DocType: Purchase Order,Raw Materials Supplied,"Surovin, dobavljenih"
@@ -3391,7 +3250,7 @@
 DocType: Appraisal,Appraisal Template,Cenitev Predloga
 DocType: Communication,Email,E-naslov
 DocType: Item Group,Item Classification,Postavka Razvrstitev
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +89,Business Development Manager,Business Development Manager
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Business Development Manager,Business Development Manager
 DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,Vzdrževanje Obiščite Namen
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.js +15,Period,Obdobje
 ,General Ledger,Glavna knjiga
@@ -3401,9 +3260,7 @@
 ,Itemwise Recommended Reorder Level,Itemwise Priporočena Preureditev Raven
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +264,Please select {0} first,"Prosimo, izberite {0} najprej"
 DocType: Features Setup,To get Item Group in details table,Da bi dobili item Group v podrobnosti tabeli
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +67,Redrawing,Redrawing
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +112,Batch {0} of Item {1} has expired.,Serija {0} od Postavka {1} je potekla.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +120,Etching,Jedkanje
 DocType: Sales Invoice,Commission,Komisija
 DocType: Address Template,"<h4>Default Template</h4>
 <p>Uses <a href=""http://jinja.pocoo.org/docs/templates/"">Jinja Templating</a> and all the fields of Address (including Custom Fields if any) will be available</p>
@@ -3437,7 +3294,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +340,Operation Time must be greater than 0 for Operation {0},"Delovanje Čas mora biti večja od 0, za obratovanje {0}"
 DocType: Supplier,Address and Contacts,Naslov in kontakti
 DocType: UOM Conversion Detail,UOM Conversion Detail,UOM Conversion Detail
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +496,Keep it web friendly 900px (w) by 100px (h),"Imejte to spletno prijazno 900px (w), ki ga 100px (h)"
+apps/erpnext/erpnext/public/js/setup_wizard.js +242,Keep it web friendly 900px (w) by 100px (h),"Imejte to spletno prijazno 900px (w), ki ga 100px (h)"
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +329,Production Order cannot be raised against a Item Template,Proizvodnja naročilo ne more biti postavljeno pred Predloga Postavka
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +44,Charges are updated in Purchase Receipt against each item,Dajatve so posodobljeni v Potrdilo o nakupu ob vsaki postavki
 DocType: Payment Tool,Get Outstanding Vouchers,Pridobite Neporavnane bonov
@@ -3453,54 +3310,49 @@
 DocType: Item,Average time taken by the supplier to deliver,"Povprečen čas, ki ga dobavitelj dostaviti"
 DocType: Time Log,Hours,Ur
 DocType: Project,Expected Start Date,Pričakovani datum začetka
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +38,Rolling,Valjanje
 DocType: ToDo,Priority,Prednost
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +41,Remove item if charges is not applicable to that item,"Odstranite element, če stroški ne nanaša na to postavko"
 DocType: Dropbox Backup,Dropbox Access Allowed,Dropbox dostop dovoljen
 DocType: Dropbox Backup,Weekly,Tedenski
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,Npr. smsgateway.com/api/send_sms.cgi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +485,Receive,Prejeti
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +510,Receive,Prejeti
 DocType: Maintenance Visit,Fully Completed,V celoti končana
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% Complete
 DocType: Employee,Educational Qualification,Izobraževalni Kvalifikacije
 DocType: Workstation,Operating Costs,Obratovalni stroški
 DocType: Employee Leave Approver,Employee Leave Approver,Zaposleni Leave odobritelj
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,{0} has been successfully added to our Newsletter list.,{0} je bil uspešno dodan v seznam novice.
-apps/erpnext/erpnext/stock/doctype/item/item.py +383,Row {0}: An Reorder entry already exists for this warehouse {1},Vrstica {0}: Vpis Preureditev že obstaja za to skladišče {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +387,Row {0}: An Reorder entry already exists for this warehouse {1},Vrstica {0}: Vpis Preureditev že obstaja za to skladišče {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +67,"Cannot declare as lost, because Quotation has been made.","Ne more razglasiti kot izgubljena, ker je bil predračun postavil."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +133,Electron beam machining,Strojna žarek elektronov
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Nakup Master Manager
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +424,Production Order {0} must be submitted,Proizvodnja naročite {0} je treba predložiti
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +150,Please select Start Date and End Date for Item {0},"Prosimo, izberite Start in končni datum za postavko {0}"
 apps/erpnext/erpnext/config/stock.py +141,Main Reports,Glavni Poročila
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +102,Stock Ledger entries balances updated,Stock Ledger vnosi bilanc posodobljene
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,Do danes ne more biti pred od datuma
 DocType: Purchase Receipt Item,Prevdoc DocType,Prevdoc DOCTYPE
-apps/erpnext/erpnext/stock/doctype/item/item.js +176,Add / Edit Prices,Dodaj / Uredi Cene
+apps/erpnext/erpnext/stock/doctype/item/item.js +178,Add / Edit Prices,Dodaj / Uredi Cene
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +53,Chart of Cost Centers,Grafikon stroškovnih mest
 ,Requested Items To Be Ordered,Zahtevane Postavke naloži
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +298,My Orders,Moja naročila
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +293,My Orders,Moja naročila
 DocType: Price List,Price List Name,Cenik Ime
 DocType: Time Log,For Manufacturing,Za Manufacturing
-apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +70,Totals,Pri zaokrožanju
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +174,Totals,Pri zaokrožanju
 DocType: BOM,Manufacturing,Predelovalne dejavnosti
 ,Ordered Items To Be Delivered,Naročeno Točke je treba dostaviti
 DocType: Account,Income,Prihodki
 ,Setup Wizard,Setup Wizard
 DocType: Industry Type,Industry Type,Industrija Type
 apps/erpnext/erpnext/templates/includes/cart.js +137,Something went wrong!,Nekaj ​​je šlo narobe!
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +68,Warning: Leave application contains following block dates,Opozorilo: Pustite prijava vsebuje naslednje datume blok
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +251,Sales Invoice {0} has already been submitted,Prodaja Račun {0} je že bila predložena
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +100,Warning: Leave application contains following block dates,Opozorilo: Pustite prijava vsebuje naslednje datume blok
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +256,Sales Invoice {0} has already been submitted,Prodaja Račun {0} je že bila predložena
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,datum dokončanja
 DocType: Purchase Invoice Item,Amount (Company Currency),Znesek (družba Valuta)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +10,Die casting,Litja
 DocType: Email Alert,Reference Date,Referenčni datum
 apps/erpnext/erpnext/config/hr.py +105,Organization unit (department) master.,"Organizacijska enota (oddelek), master."
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +25,Please enter valid mobile nos,Vnesite veljavne mobilne nos
 DocType: Budget Detail,Budget Detail,Proračun Detail
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +75,Please enter message before sending,Vnesite sporočilo pred pošiljanjem
 DocType: Async Task,Status,Status
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +65,Stock UOM updated for Item {0},Stock UOM posodobljena za postavko {0}
 DocType: Company History,Year,Leto
 apps/erpnext/erpnext/config/accounts.py +127,Point-of-Sale Profile,Point-of-Sale profila
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +68,Please Update SMS Settings,Prosimo Posodobite Nastavitve SMS
@@ -3514,12 +3366,12 @@
 ,Serial No Service Contract Expiry,Zaporedna številka Service Contract preteka
 DocType: Item,Unit of Measure Conversion,Merska enota konverzijo
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +86,Employee can not be changed,Delavec se ne more spremeniti
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +259,You cannot credit and debit same account at the same time,"Ne, ne moreš kreditnih in debetnih isti račun ob istem času"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,You cannot credit and debit same account at the same time,"Ne, ne moreš kreditnih in debetnih isti račun ob istem času"
 DocType: Naming Series,Help HTML,Pomoč HTML
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},Skupaj weightage dodeljena mora biti 100%. To je {0}
 apps/erpnext/erpnext/controllers/status_updater.py +140,Allowance for over-{0} crossed for Item {1},Dodatek za prekomerno {0} prečkal za postavko {1}
 DocType: Address,Name of person or organization that this address belongs to.,"Ime osebe ali organizacije, ki ta naslov pripada."
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +587,Your Suppliers,Vaše Dobavitelji
+apps/erpnext/erpnext/public/js/setup_wizard.js +325,Your Suppliers,Vaše Dobavitelji
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,"Ni mogoče nastaviti kot izgubili, kot je narejena Sales Order."
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +65,Another Salary Structure {0} is active for employee {1}. Please make its status 'Inactive' to proceed.,"Drug Plača Struktura {0} je aktiven na zaposlenega {1}. Prosimo, da se njegov status &quot;neaktivno&quot; za nadaljevanje."
 DocType: Purchase Invoice,Contact,Kontakt
@@ -3528,37 +3380,35 @@
 DocType: Item,Has Serial No,Ima Serijska št
 DocType: Employee,Date of Issue,Datum izdaje
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +16,{0}: From {0} for {1},{0}: Od {0} za {1}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +154,Row #{0}: Set Supplier for item {1},Vrstica # {0}: Nastavite Dobavitelj za postavko {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +149,Row #{0}: Set Supplier for item {1},Vrstica # {0}: Nastavite Dobavitelj za postavko {1}
 DocType: Issue,Content Type,Vrsta vsebine
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +17,Computer,Računalnik
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,Računalnik
 DocType: Item,List this Item in multiple groups on the website.,Seznam ta postavka v več skupinah na spletni strani.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +283,Please check Multi Currency option to allow accounts with other currency,"Prosimo, preverite Multi Valuta možnost, da se omogoči račune pri drugi valuti"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +285,Please check Multi Currency option to allow accounts with other currency,"Prosimo, preverite Multi Valuta možnost, da se omogoči račune pri drugi valuti"
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +62,Item: {0} does not exist in the system,Postavka: {0} ne obstaja v sistemu
 apps/erpnext/erpnext/accounts/doctype/account/account.py +81,You are not authorized to set Frozen value,Nimate dovoljenja za nastavitev Zamrznjena vrednost
 DocType: Payment Reconciliation,Get Unreconciled Entries,Pridobite Unreconciled Entries
 DocType: Cost Center,Budgets,Proračuni
 apps/frappe/frappe/core/page/modules_setup/modules_setup.py +11,Updated,Posodobljeno
 DocType: Employee,Emergency Contact Details,Zasilna Kontaktni podatki
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +396,What does it do?,Kaj to naredi?
+apps/erpnext/erpnext/public/js/setup_wizard.js +144,What does it do?,Kaj to naredi?
 DocType: Delivery Note,To Warehouse,Za skladišča
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +45,Account {0} has been entered more than once for fiscal year {1},Račun {0} je bila vpisan več kot enkrat za fiskalno leto {1}
 ,Average Commission Rate,Povprečen Komisija Rate
-apps/erpnext/erpnext/stock/doctype/item/item.py +313,'Has Serial No' can not be 'Yes' for non-stock item,&quot;Ima Serial ne&quot; ne more biti &#39;Da&#39; za ne-parka postavko
+apps/erpnext/erpnext/stock/doctype/item/item.py +317,'Has Serial No' can not be 'Yes' for non-stock item,&quot;Ima Serial ne&quot; ne more biti &#39;Da&#39; za ne-parka postavko
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Attendance can not be marked for future dates,Udeležba ni mogoče označiti za prihodnje datume
 DocType: Pricing Rule,Pricing Rule Help,Cen Pravilo Pomoč
 DocType: Purchase Taxes and Charges,Account Head,Račun Head
 apps/erpnext/erpnext/config/stock.py +79,Update additional costs to calculate landed cost of items,Posodobite dodatnih stroškov za izračun iztovori stroške predmetov
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +111,Electrical,Električno
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +111,Electrical,Električno
 DocType: Stock Entry,Total Value Difference (Out - In),Skupna vrednost Razlika (Out - IN)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +302,Row {0}: Exchange Rate is mandatory,Vrstica {0}: Menjalni tečaj je obvezen
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +304,Row {0}: Exchange Rate is mandatory,Vrstica {0}: Menjalni tečaj je obvezen
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},ID uporabnika ni nastavljena za Employee {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +72,Peening,Peening
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,From Warranty Claim,Iz garancijskega zahtevka
 DocType: Stock Entry,Default Source Warehouse,Privzeto Vir Skladišče
 DocType: Item,Customer Code,Koda za stranke
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +212,Birthday Reminder for {0},"Opomnik za rojstni dan, za {0}"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +163,Lapping,Lepanje
-apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.js +8,Days Since Last Order,Dni od zadnjega reda
+apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +72,Days Since Last Order,Dni od zadnjega reda
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +299,Debit To account must be a Balance Sheet account,Bremenitev računa mora biti bilanca računa
 DocType: Buying Settings,Naming Series,Poimenovanje serije
 DocType: Leave Block List,Leave Block List Name,Pustite Ime Block List
@@ -3572,7 +3422,7 @@
 DocType: Notification Control,Sales Invoice Message,Prodaja Račun Sporočilo
 DocType: Authorization Rule,Based On,Temelji na
 DocType: Sales Order Item,Ordered Qty,Naročeno Kol
-apps/erpnext/erpnext/stock/doctype/item/item.py +539,Item {0} is disabled,Postavka {0} je onemogočena
+apps/erpnext/erpnext/stock/doctype/item/item.py +543,Item {0} is disabled,Postavka {0} je onemogočena
 DocType: Stock Settings,Stock Frozen Upto,Stock Zamrznjena Stanuje
 apps/erpnext/erpnext/controllers/recurring_document.py +166,Period From and Period To dates mandatory for recurring {0},"Obdobje Od in obdobje, da datumi obvezne za ponavljajoče {0}"
 apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,Projektna dejavnost / naloga.
@@ -3582,7 +3432,6 @@
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,"Popust, mora biti manj kot 100"
 DocType: ToDo,Low,Nizka
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Napišite enkratni znesek (družba Valuta)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +71,Spinning,Spinning
 DocType: Landed Cost Voucher,Landed Cost Voucher,Pristali Stroški bon
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +55,Please set {0},"Prosim, nastavite {0}"
 DocType: Purchase Invoice,Repeat on Day of Month,Ponovite na dan Meseca
@@ -3604,7 +3453,6 @@
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +37,Campaign Name is required,Je potrebno Ime akcija
 DocType: Maintenance Visit,Maintenance Date,Vzdrževanje Datum
 DocType: Purchase Receipt Item,Rejected Serial No,Zavrnjeno Zaporedna številka
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +51,Deep drawing,Globoko vlečenje
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +40,New Newsletter,New Newsletter
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +157,Start date should be less than end date for Item {0},Začetni datum mora biti manjša od končnega datuma za postavko {0}
 apps/erpnext/erpnext/stock/doctype/item/item.js +17,Show Balance,Prikaži Balance
@@ -3614,7 +3462,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +119,BOM and Manufacturing Quantity are required,BOM and Manufacturing Količina so obvezna
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Staranje Razpon 2
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +450,Amount,Znesek
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +147,Riveting,Kovičenje
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,BOM nadomesti
 ,Sales Analytics,Prodajna Analytics
 DocType: Manufacturing Settings,Manufacturing Settings,Proizvodne Nastavitve
@@ -3626,20 +3473,19 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +207,New Account Name,New Ime računa
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,"Surovin, dobavljenih Stroški"
 DocType: Selling Settings,Settings for Selling Module,Nastavitve za prodajo Module
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +73,Customer Service,Storitev za stranke
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Customer Service,Storitev za stranke
 DocType: Item,Thumbnail,Thumbnail
 DocType: Item Customer Detail,Item Customer Detail,Postavka Detail Stranka
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +147,Confirm Your Email,Potrdite svoj e-poštni
 apps/erpnext/erpnext/config/hr.py +53,Offer candidate a Job.,Ponudba kandidat Job.
 DocType: Notification Control,Prompt for Email on Submission of,Vprašal za e-poštni ob predložitvi
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +81,Total allocated leaves are more than days in the period,Skupaj dodeljena listi so več kot dni v obdobju
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +70,Item {0} must be a stock Item,Postavka {0} mora biti stock postavka
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,Privzeto Delo v skladišču napredku
 apps/erpnext/erpnext/config/accounts.py +107,Default settings for accounting transactions.,Privzete nastavitve za računovodske posle.
 apps/frappe/frappe/model/naming.py +40,{0} is required,{0} je potrebno
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +21,Vacuum molding,Vacuum modeliranje
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,Pričakovani datum ne more biti pred Material Request Datum
-DocType: Contact Us Settings,City,Kraj
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +132,Ultrasonic machining,Ultrasonic strojna obdelava
+DocType: Contact Us Settings,City,Mesto
 apps/frappe/frappe/templates/base.html +137,Error: Not a valid id?,Napaka: Ni veljaven id?
 apps/erpnext/erpnext/stock/get_item_details.py +125,Item {0} must be a Sales Item,Postavka {0} mora biti Sales postavka
 DocType: Naming Series,Update Series Number,Posodobitev Series Število
@@ -3647,7 +3493,7 @@
 DocType: Sales Order,Printing Details,Tiskanje Podrobnosti
 DocType: Task,Closing Date,Zapiranje Datum
 DocType: Sales Order Item,Produced Quantity,Proizvedena količina
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +84,Engineer,Inženir
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Engineer,Inženir
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,Iskanje sklope
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +379,Item Code required at Row No {0},Oznaka zahteva pri Row št {0}
 DocType: Sales Partner,Partner Type,Partner Type
@@ -3655,7 +3501,7 @@
 DocType: Authorization Rule,Customerwise Discount,Customerwise Popust
 DocType: Purchase Invoice,Against Expense Account,Proti Expense račun
 DocType: Production Order,Production Order,Proizvodnja naročilo
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +258,Installation Note {0} has already been submitted,Je že bil predložen Namestitev Opomba {0}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +263,Installation Note {0} has already been submitted,Je že bil predložen Namestitev Opomba {0}
 DocType: Quotation Item,Against Docname,Proti Docname
 DocType: SMS Center,All Employee (Active),Vsi zaposlenih (Active)
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,Oglejte si zdaj
@@ -3664,19 +3510,19 @@
 DocType: Item,Re-Order Level,Ponovno naročila ravni
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,"Vnesite predmete in načrtovano kol, za katere želite, da dvig proizvodnih nalogov ali prenos surovin za analizo."
 apps/frappe/frappe/public/js/frappe/views/ganttview.js +45,Gantt Chart,Gantogram
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +57,Part-time,Krajši delovni čas
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,Part-time,Krajši delovni čas
 DocType: Employee,Applicable Holiday List,Velja Holiday Seznam
 DocType: Employee,Cheque,Ček
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,Serija Posodobljeno
 apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Report Type is mandatory,Vrsta poročila je obvezna
 DocType: Item,Serial Number Series,Serijska številka serije
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},Skladišče je obvezna za borzo postavki {0} v vrstici {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +45,Retail & Wholesale,Trgovina na drobno in na debelo
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,Trgovina na drobno in na debelo
 DocType: Issue,First Responded On,Najprej odgovorila
 DocType: Website Item Group,Cross Listing of Item in multiple groups,Cross Uvrstitev točke v več skupinah
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +351,The First User: You,Prva Uporabnik: You
+apps/erpnext/erpnext/public/js/setup_wizard.js +101,The First User: You,Prva Uporabnik: You
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +48,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},Fiskalna Leto Start Date in fiskalno leto End Date so že določeni v proračunskem letu {0}
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +172,Successfully Reconciled,Uspešno Pobotano
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +119,Successfully Reconciled,Uspešno Pobotano
 DocType: Production Order,Planned End Date,Načrtovan End Date
 apps/erpnext/erpnext/config/stock.py +43,Where items are stored.,Če so predmeti shranjeni.
 DocType: Tax Rule,Validity,Veljavnost
@@ -3696,39 +3542,36 @@
 DocType: DocPerm,Level,Stopnja
 DocType: Purchase Taxes and Charges,On Net Total,On Net Total
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +160,Target warehouse in row {0} must be same as Production Order,Ciljna skladišče v vrstici {0} mora biti enaka kot Production reda
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +59,No permission to use Payment Tool,Ni dovoljenja za uporabo plačilnega orodje
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +97,No permission to use Payment Tool,Ni dovoljenja za uporabo plačilnega orodje
 apps/erpnext/erpnext/controllers/recurring_document.py +192,'Notification Email Addresses' not specified for recurring %s,&quot;Obvestilo o e-poštni naslovi&quot; niso določeni za ponavljajoče% s
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +86,Milling,Rezkanje
 apps/erpnext/erpnext/accounts/doctype/account/account.py +99,Currency can not be changed after making entries using some other currency,"Valuta ni mogoče spremeniti, potem ko vnose uporabljate kakšno drugo valuto"
 DocType: Company,Round Off Account,Zaokrožijo račun
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +60,Nibbling,Grizljanjem
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,Administrativni stroški
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +18,Consulting,Consulting
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +18,Consulting,Consulting
 DocType: Customer Group,Parent Customer Group,Parent Customer Group
 apps/erpnext/erpnext/public/js/pos/pos.js +429,Change,Spremeni
 DocType: Purchase Invoice,Contact Email,Kontakt E-pošta
 DocType: Appraisal Goal,Score Earned,Rezultat Zaslužili
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +393,"e.g. ""My Company LLC""",na primer &quot;My Company LLC&quot;
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +173,Notice Period,Odpovedni rok
+apps/erpnext/erpnext/public/js/setup_wizard.js +141,"e.g. ""My Company LLC""",na primer &quot;My Company LLC&quot;
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +173,Notice Period,Odpovedni rok
 DocType: Bank Reconciliation Detail,Voucher ID,Bon ID
 apps/erpnext/erpnext/setup/doctype/territory/territory.js +14,This is a root territory and cannot be edited.,To je koren ozemlje in ga ni mogoče urejati.
 DocType: Packing Slip,Gross Weight UOM,Bruto Teža UOM
 DocType: Email Digest,Receivables / Payables,Terjatve / obveznosti
 DocType: Delivery Note Item,Against Sales Invoice,Proti prodajni fakturi
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +63,Stamping,Žigosanje
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +457,Credit Account,Credit račun
 DocType: Landed Cost Item,Landed Cost Item,Pristali Stroški Postavka
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +56,Show zero values,Prikaži ničelnimi vrednostmi
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,Količina postavke pridobljeno po proizvodnji / prepakiranja iz danih količin surovin
 DocType: Payment Reconciliation,Receivable / Payable Account,Terjatve / plačljivo račun
 DocType: Delivery Note Item,Against Sales Order Item,Proti Sales Order Postavka
-apps/erpnext/erpnext/stock/doctype/item/item.py +521,Please specify Attribute Value for attribute {0},"Prosimo, navedite Lastnost vrednost za atribut {0}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +525,Please specify Attribute Value for attribute {0},"Prosimo, navedite Lastnost vrednost za atribut {0}"
 DocType: Item,Default Warehouse,Privzeto Skladišče
 DocType: Task,Actual End Date (via Time Logs),Dejanski končni datum (via Čas Dnevniki)
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +37,Budget cannot be assigned against Group Account {0},Proračun ne more biti dodeljena pred Group račun {0}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +23,Please enter parent cost center,Vnesite stroškovno mesto matično
 DocType: Delivery Note,Print Without Amount,Natisni Brez Znesek
-apps/erpnext/erpnext/controllers/buying_controller.py +69,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,"Davčna kategorija ne more biti &quot;Vrednotenje&quot; ali &quot;Vrednotenje in celokupni&quot;, saj so vsi predmeti brez zalogi"
+apps/erpnext/erpnext/controllers/buying_controller.py +60,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,"Davčna kategorija ne more biti &quot;Vrednotenje&quot; ali &quot;Vrednotenje in celokupni&quot;, saj so vsi predmeti brez zalogi"
 DocType: User,Last Name,Priimek
 DocType: Web Page,Left,Levo
 DocType: Event,All Day,Cel dan
@@ -3736,7 +3579,7 @@
 DocType: Appraisal,Total Score (Out of 5),Skupna ocena (od 5)
 DocType: Contact Us Settings,State,Država
 DocType: Batch,Batch,Serija
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +51,Balance,Balance
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +28,Balance,Bilanca
 DocType: Project,Total Expense Claim (via Expense Claims),Total Expense zahtevek (preko Expense zahtevkov)
 DocType: User,Gender,Spol
 DocType: Journal Entry,Debit Note,Opomin
@@ -3765,9 +3608,8 @@
 ,Items To Be Requested,"Predmeti, ki bodo zahtevana"
 DocType: Purchase Order,Get Last Purchase Rate,Get zadnjega nakupa Rate
 DocType: Time Log,Billing Rate based on Activity Type (per hour),Zaračunavanje Ocena temelji na vrsto dejavnosti (na uro)
-DocType: Company,Company Info,Podjetje Info
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +76,Seaming,Seaming
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +197,"Company Email ID not found, hence mail not sent","Družba E-pošta ID ni mogoče najti, zato pošta ni poslala"
+DocType: Company,Company Info,Informacije o podjetju
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +206,"Company Email ID not found, hence mail not sent","Družba E-pošta ID ni mogoče najti, zato pošta ni poslala"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Uporaba sredstev (sredstva)
 DocType: Production Planning Tool,Filter based on item,"Filter, ki temelji na točki"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +451,Debit Account,Debetni račun
@@ -3779,17 +3621,16 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +95,{0} {1} has been modified. Please refresh.,{0} {1} je bila spremenjena. Osvežite.
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,Stop uporabnike iz česar dopusta aplikacij na naslednjih dneh.
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +591,From Opportunity,Od Priložnost
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +46,Blanking,Slepimi
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +166,Employee Benefits,Zaslužki zaposlencev
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,Employee Benefits,Zaslužki zaposlencev
 DocType: Sales Invoice,Is POS,Je POS
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +240,Packed quantity must equal quantity for Item {0} in row {1},Pakirana količina mora biti enaka količini za postavko {0} v vrstici {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +245,Packed quantity must equal quantity for Item {0} in row {1},Pakirana količina mora biti enaka količini za postavko {0} v vrstici {1}
 DocType: Production Order,Manufactured Qty,Izdelano Kol
 DocType: Purchase Receipt Item,Accepted Quantity,Accepted Količina
 apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} ne obstaja
 apps/erpnext/erpnext/config/accounts.py +18,Bills raised to Customers.,Računi zbrana strankam.
 DocType: DocField,Default,Privzeto
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Id projekt
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +466,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Vrstica št {0}: količina ne more biti večja od Dokler Znesek proti Expense zahtevka {1}. Dokler Znesek je {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +468,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Vrstica št {0}: količina ne more biti večja od Dokler Znesek proti Expense zahtevka {1}. Dokler Znesek je {2}
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +40,{0} subscribers added,{0} naročnikov dodane
 DocType: Maintenance Schedule,Schedule,Urnik
 DocType: Cost Center,"Define Budget for this Cost Center. To set budget action, see ""Company List""","Določite proračun za to stroškovno mesto. Če želite nastaviti proračunske ukrepe, glejte &quot;Seznam Company&quot;"
@@ -3800,7 +3641,7 @@
 apps/erpnext/erpnext/public/js/pos/pos.js +91,Price List not found or disabled,Cenik ni mogoče najti ali onemogočena
 DocType: Expense Claim,Approved,Odobreno
 DocType: Pricing Rule,Price,Cena
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +79,Employee relieved on {0} must be set as 'Left',Zaposleni razrešen na {0} mora biti nastavljen kot &quot;levo&quot;
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +88,Employee relieved on {0} must be set as 'Left',Zaposleni razrešen na {0} mora biti nastavljen kot &quot;levo&quot;
 DocType: Item,"Selecting ""Yes"" will give a unique identity to each entity of this item which can be viewed in the Serial No master.","Izbira &quot;Yes&quot; bo dala edinstveno identiteto za vse subjekte te točke, ki jih lahko preberete v Serijska št mojstra."
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +39,Appraisal {0} created for Employee {1} in the given date range,Cenitev {0} ustvarjena za Employee {1} v določenem časovnem obdobju
 DocType: Employee,Education,Izobraževanje
@@ -3811,7 +3652,7 @@
 apps/frappe/frappe/desk/moduleview.py +67,Standard Reports,Standardne Poročila
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,Vpisi računovodstvo lista.
 DocType: Delivery Note Item,Available Qty at From Warehouse,Na voljo Količina na IZ SKLADIŠČA
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +209,Please select Employee Record first.,"Prosimo, izberite Employee Snemaj prvi."
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +224,Please select Employee Record first.,"Prosimo, izberite Employee Snemaj prvi."
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Vrstica {0}: Party / račun se ne ujema z {1} / {2} v {3} {4}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +35,To create a Tax Account,Če želite ustvariti davčnem obračunu
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +233,Please enter Expense Account,Vnesite Expense račun
@@ -3824,46 +3665,43 @@
 DocType: Sales Order,Track this Sales Order against any Project,Sledi tej Sales Order proti kateri koli projekt
 DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,"Prodajne Pull naročil (v pričakovanju, da poda), na podlagi zgornjih meril"
 DocType: DocShare,Document Type,Vrsta dokumenta
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +565,From Supplier Quotation,Od dobavitelja Kotacija
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +588,From Supplier Quotation,Od dobavitelja Kotacija
 DocType: Deduction Type,Deduction Type,Odbitek Type
 DocType: Attendance,Half Day,Poldnevni
 DocType: Pricing Rule,Min Qty,Min Kol
 DocType: Features Setup,"To track items in sales and purchase documents with batch nos. ""Preferred Industry: Chemicals""",Za sledenje izdelkov v prodajnih in nabavnih dokumentov z šaržnih nos. &quot;Prednostna industrija: Kemikalije&quot;
 DocType: GL Entry,Transaction Date,Transakcijski Datum
 DocType: Production Plan Item,Planned Qty,Načrtovano Kol
-apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +91,Total Tax,Skupna davčna
+apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +93,Total Tax,Skupna davčna
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +178,For Quantity (Manufactured Qty) is mandatory,Za Količina (Izdelano Kol) obvezna
 DocType: Stock Entry,Default Target Warehouse,Privzeto Target Skladišče
 DocType: Purchase Invoice,Net Total (Company Currency),Net Total (družba Valuta)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +79,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Vrstica {0}: Vrsta stranka in stranka se uporablja samo zoper terjatve / obveznosti račun
 DocType: Notification Control,Purchase Receipt Message,Potrdilo o nakupu Sporočilo
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +95,Total allocated leaves are more than period,Skupaj dodeljena listi so bolj kot obdobje
 DocType: Production Order,Actual Start Date,Dejanski datum začetka
 DocType: Sales Order,% of materials delivered against this Sales Order,% Materialov podal proti tej Sales Order
 apps/erpnext/erpnext/config/stock.py +23,Record item movement.,Record gibanje postavka.
 DocType: Newsletter List Subscriber,Newsletter List Subscriber,Newsletter Seznam Subscriber
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +164,Morticing,Dolbenje
 DocType: Email Account,Service,Storitev
 DocType: Hub Settings,Hub Settings,Nastavitve Hub
 DocType: Project,Gross Margin %,Gross Margin%
 DocType: BOM,With Operations,Pri poslovanju
 apps/erpnext/erpnext/accounts/party.py +232,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Vknjižbe so že bili sprejeti v valuti {0} za družbo {1}. Izberite terjatve ali obveznosti račun z valuto {0}.
 ,Monthly Salary Register,Mesečni Plača Register
-apps/frappe/frappe/website/template.py +140,Next,Naslednja
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard_page.html +17,Next,Naslednja
 DocType: Warranty Claim,If different than customer address,Če je drugačen od naslova kupca
 DocType: BOM Operation,BOM Operation,BOM Delovanje
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +118,Electropolishing,Electropolishing
 DocType: Purchase Taxes and Charges,On Previous Row Amount,Na prejšnje vrstice Znesek
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +24,Please enter Payment Amount in atleast one row,Vnesite znesek plačila v atleast eno vrstico
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +33,Please enter Payment Amount in atleast one row,Vnesite znesek plačila v atleast eno vrstico
 DocType: POS Profile,POS Profile,POS profila
 apps/erpnext/erpnext/config/accounts.py +153,"Seasonality for setting budgets, targets etc.","Sezonskost za nastavitev proračunov, cilji itd"
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +238,Row {0}: Payment Amount cannot be greater than Outstanding Amount,Vrstica {0}: Plačilo Znesek ne sme biti večja od neporavnanega zneska
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +46,Total Unpaid,Skupaj Neplačana
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +21,Time Log is not billable,Čas Log ni plačljivih
 apps/erpnext/erpnext/stock/get_item_details.py +128,"Item {0} is a template, please select one of its variants","Postavka {0} je predlogo, izberite eno od njenih različic"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +528,Purchaser,Kupec
+apps/erpnext/erpnext/public/js/setup_wizard.js +272,Purchaser,Kupec
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +81,Net pay cannot be negative,Neto plača ne more biti negativna
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +71,Please enter the Against Vouchers manually,Prosimo ročno vnesti s knjigovodskimi
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +107,Please enter the Against Vouchers manually,Prosimo ročno vnesti s knjigovodskimi
 DocType: SMS Settings,Static Parameters,Statični Parametri
 DocType: Purchase Order,Advance Paid,Advance Paid
 DocType: Item,Item Tax,Postavka Tax
@@ -3872,14 +3710,12 @@
 apps/erpnext/erpnext/config/crm.py +48,Send mass SMS to your contacts,Pošlji množično SMS vaših stikov
 DocType: Purchase Taxes and Charges,Consider Tax or Charge for,Razmislite davek ali dajatev za
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,Dejanska Količina je obvezna
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +42,Cross-rolling,Cross-rolling
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +132,Credit Card,Credit Card
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +132,Credit Card,Credit Card
 DocType: BOM,Item to be manufactured or repacked,"Postavka, ki se proizvaja ali prepakirana"
 apps/erpnext/erpnext/config/stock.py +95,Default settings for stock transactions.,Privzete nastavitve za transakcije vrednostnih papirjev.
 DocType: Purchase Invoice,Next Date,Naslednja Datum
 DocType: Employee Education,Major/Optional Subjects,Major / Izbirni predmeti
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +49,Please enter Taxes and Charges,Vnesite davki in dajatve
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +85,Machining,Strojna
 DocType: Sales Invoice Item,Drop Ship,Drop Ship
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","Tukaj lahko vzdržujejo družinske podrobnosti, kot so ime in poklic staršev, zakonca in otrok"
 DocType: Hub Settings,Seller Name,Prodajalec Name
@@ -3889,7 +3725,7 @@
 DocType: Stock Entry,Repack,Zapakirajte
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +6,You must Save the form before proceeding,"Morate Shranite obrazec, preden nadaljujete"
 DocType: Item Attribute,Numeric Values,Numerične vrednosti
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +500,Attach Logo,Priložite Logo
+apps/erpnext/erpnext/public/js/setup_wizard.js +246,Attach Logo,Priložite Logo
 DocType: Customer,Commission Rate,Komisija Rate
 apps/erpnext/erpnext/stock/doctype/item/item.js +38,Make Variant,Naredite Variant
 apps/erpnext/erpnext/config/hr.py +145,Block leave applications by department.,Aplikacije blok dopustu oddelka.
@@ -3904,27 +3740,27 @@
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +105,Please select a csv file,Izberite csv datoteko
 DocType: Dropbox Backup,Send Backups to Dropbox,Pošlji varnostne kopije na Dropbox
 DocType: Purchase Order,To Receive and Bill,Za prejemanje in Bill
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +94,Designer,Oblikovalec
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Designer,Oblikovalec
 apps/erpnext/erpnext/config/selling.py +121,Terms and Conditions Template,Pogoji Template
 DocType: Serial No,Delivery Details,Dostava Podrobnosti
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +383,Cost Center is required in row {0} in Taxes table for type {1},"Stroškov Center, je potrebno v vrstici {0} v Davki miza za tip {1}"
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +386,Cost Center is required in row {0} in Taxes table for type {1},"Stroškov Center, je potrebno v vrstici {0} v Davki miza za tip {1}"
 DocType: Item,Automatically create Material Request if quantity falls below this level,Samodejno ustvari Material Zahtevaj če količina pade pod to raven
 ,Item-wise Purchase Register,Element-pametno Nakup Registriraj se
 DocType: Batch,Expiry Date,Rok uporabnosti
-apps/erpnext/erpnext/stock/doctype/item/item.py +375,"To set reorder level, item must be a Purchase Item or Manufacturing Item","Če želite nastaviti raven naročanje, mora postavka biti Nakup Postavka ali Manufacturing Postavka"
+apps/erpnext/erpnext/stock/doctype/item/item.py +379,"To set reorder level, item must be a Purchase Item or Manufacturing Item","Če želite nastaviti raven naročanje, mora postavka biti Nakup Postavka ali Manufacturing Postavka"
 ,Supplier Addresses and Contacts,Dobavitelj Naslovi
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,"Prosimo, izberite kategorijo najprej"
 apps/erpnext/erpnext/config/projects.py +18,Project master.,Master projekt.
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,"Ne kažejo vsak simbol, kot $ itd zraven valute."
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +330, (Half Day),(Poldnevni)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +374, (Half Day),(Poldnevni)
 DocType: Supplier,Credit Days,Kreditne dnevi
 DocType: Leave Type,Is Carry Forward,Se Carry Forward
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +478,Get Items from BOM,Dobili predmetov iz BOM
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Dobavni rok dni
-apps/erpnext/erpnext/config/manufacturing.py +120,Bill of Materials,Bill of Materials
+apps/erpnext/erpnext/config/manufacturing.py +120,Bill of Materials,Kosovnica
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +77,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Vrstica {0}: Vrsta stranka in stranka je potrebna za terjatve / obveznosti račun {1}
 DocType: Dropbox Backup,Send Notifications To,Pošiljanje obvestil
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html +26,Ref Date,Ref Datum
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +54,Ref Date,Ref Datum
 DocType: Employee,Reason for Leaving,Razlog za odhod
 DocType: Expense Claim Detail,Sanctioned Amount,Sankcionirano Znesek
 DocType: GL Entry,Is Opening,Je Odpiranje
@@ -3932,4 +3768,3 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +188,Account {0} does not exist,Račun {0} ne obstaja
 DocType: Account,Cash,Gotovina
 DocType: Employee,Short biography for website and other publications.,Kratka biografija za spletne strani in drugih publikacij.
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +31,Please create Salary Structure for employee {0},"Prosimo, da ustvarite plač strukturo za zaposlenega {0}"
diff --git a/erpnext/translations/sq.csv b/erpnext/translations/sq.csv
index 5790c36..43cb057 100644
--- a/erpnext/translations/sq.csv
+++ b/erpnext/translations/sq.csv
@@ -1,13 +1,12 @@
 DocType: Employee,Salary Mode,Mode paga
 DocType: Cost Center,"Select Monthly Distribution, if you want to track based on seasonality.","Zgjidh Shpërndarja mujore, në qoftë se ju doni për të ndjekur në bazë të sezonalitetit."
 DocType: Employee,Divorced,I divorcuar
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +86,Warning: Same item has been entered multiple times.,Warning: Same artikull është futur shumë herë.
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +80,Warning: Same item has been entered multiple times.,Warning: Same artikull është futur shumë herë.
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +96,Items already synced,Gjërat tashmë synced
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,Lejoni Pika për të shtuar disa herë në një transaksion
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,Cancel materiale Vizitoni {0} para se anulimi këtë kërkuar garancinë
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +19,Consumer Products,Consumer Products
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,Consumer Products
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +68,Please select Party Type first,"Ju lutem, përzgjidhni Partisë Lloji i parë"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +90,Annealing,Pjekja
 DocType: Item,Customer Items,Items të konsumatorëve
 apps/erpnext/erpnext/accounts/doctype/account/account.py +45,Account {0}: Parent account {1} can not be a ledger,Llogaria {0}: llogari Parent {1} nuk mund të jetë libri
 DocType: Item,Publish Item to hub.erpnext.com,Publikojë pika për hub.erpnext.com
@@ -20,15 +19,14 @@
 DocType: About Us Settings,Website,Faqja kryesore
 DocType: POS Profile,Applicable for User,E aplikueshme për anëtarët
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +169,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Ndaloi Rendit prodhimit nuk mund të anulohet, tapën atë më parë për të anulluar"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +23,Compaction plus sintering,Compaction plus sintering
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,Currency is required for Price List {0},Valuta është e nevojshme për Lista Çmimi {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Do të llogaritet në transaksion.
 DocType: Purchase Order,Customer Contact,Customer Contact
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +549,From Material Request,Nga Kërkesë materiale
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +572,From Material Request,Nga Kërkesë materiale
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} Tree
 DocType: Job Applicant,Job Applicant,Job Aplikuesi
 apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,Nuk ka rezultate shumë.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +78,Legal,Legal
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +34,Legal,Legal
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +114,Actual type tax cannot be included in Item rate in row {0},Tatimi aktual lloji nuk mund të përfshihen në normë Item në rresht {0}
 DocType: C-Form,Customer,Klient
 DocType: Purchase Receipt Item,Required By,Kërkohet nga
@@ -43,7 +41,6 @@
 DocType: Manufacturing Settings,Default 10 mins,Default 10 minuta
 DocType: Leave Type,Leave Type Name,Lini Lloji Emri
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +148,Series Updated Successfully,Seria Përditësuar sukses
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +150,Stitching,Qepur
 DocType: Pricing Rule,Apply On,Apliko On
 DocType: Item Price,Multiple Item prices.,Çmimet shumta artikull.
 ,Purchase Order Items To Be Received,Items Rendit Blerje të pranohen
@@ -51,8 +48,8 @@
 DocType: Quality Inspection Reading,Parameter,Parametër
 apps/erpnext/erpnext/projects/doctype/project/project.py +43,Expected End Date can not be less than Expected Start Date,Pritet Data e Përfundimit nuk mund të jetë më pak se sa pritej Data e fillimit
 apps/erpnext/erpnext/utilities/transaction_base.py +104,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Row # {0}: Norma duhet të jetë i njëjtë si {1}: {2} ({3} / {4})
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +189,New Leave Application,New Pushimi Aplikimi
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +134,Bank Draft,Draft Bank
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +204,New Leave Application,New Pushimi Aplikimi
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +134,Bank Draft,Draft Bank
 DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,"1. Për të ruajtur të konsumatorëve kodin mençur pika dhe për t&#39;i bërë ato të kërkueshme në bazë të përdorimit të tyre të Kodit, ky opsion"
 DocType: Mode of Payment Account,Mode of Payment Account,Mënyra e Llogarisë Pagesave
 apps/erpnext/erpnext/stock/doctype/item/item.js +34,Show Variants,Shfaq Variantet
@@ -64,25 +61,23 @@
 DocType: Production Plan Item,Production Plan Item,Prodhimit Plani i artikullit
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +141,User {0} is already assigned to Employee {1},Përdoruesi {0} është caktuar tashmë për punonjësit {1}
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +13,Make new POS Profile,Bëni POS re Profilin
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +31,Health Care,Kujdes shëndetësor
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,Kujdes shëndetësor
 DocType: Purchase Invoice,Monthly,Mujor
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +66,Delay in payment (Days),Vonesa në pagesa (ditë)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +494,Invoice,Faturë
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +519,Invoice,Faturë
 DocType: Maintenance Schedule Item,Periodicity,Periodicitet
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +357,Email Address,Email Adresa
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +21,Defense,Mbrojtje
+apps/erpnext/erpnext/public/js/setup_wizard.js +107,Email Address,Email Adresa
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,Mbrojtje
 DocType: Company,Abbr,Abbr
 DocType: Appraisal Goal,Score (0-5),Rezultati (0-5)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +193,Row {0}: {1} {2} does not match with {3},Row {0}: {1} {2} nuk përputhet me {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +67,Row # {0}:,Row # {0}:
 DocType: Delivery Note,Vehicle No,Automjeteve Nuk ka
 apps/erpnext/erpnext/public/js/pos/pos.js +528,Please select Price List,"Ju lutem, përzgjidhni Lista e Çmimeve"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +162,Woodworking,Njoftime
 DocType: Production Order Operation,Work In Progress,Punë në vazhdim
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +153,3D printing,Shtypjen 3D
 DocType: Employee,Holiday List,Festa Lista
 DocType: Time Log,Time Log,Koha Identifikohu
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +530,Accountant,Llogaritar
+apps/erpnext/erpnext/public/js/setup_wizard.js +274,Accountant,Llogaritar
 DocType: Cost Center,Stock User,Stock User
 DocType: Company,Phone No,Telefoni Asnjë
 DocType: Time Log,"Log of Activities performed by users against Tasks that can be used for tracking time, billing.","Log të aktiviteteve të kryera nga përdoruesit ndaj detyrave që mund të përdoret për ndjekjen kohë, faturimit."
@@ -98,18 +93,19 @@
 DocType: Bin,Quantity Requested for Purchase,Sasia e kërkuar për Blerje
 DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name","Bashkangjit CSV fotografi me dy kolona, ​​njëra për emrin e vjetër dhe një për emrin e ri"
 DocType: Packed Item,Parent Detail docname,Docname prind Detail
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Kg,Kg
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Kg,Kg
 apps/erpnext/erpnext/config/hr.py +48,Opening for a Job.,Hapja për një punë.
 DocType: Item Attribute,Increment,Rritje
 apps/erpnext/erpnext/public/js/stock_analytics.js +63,Select Warehouse...,Zgjidh Magazina ...
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +6,Advertising,Reklamat
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,Reklamat
+apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,Njëjta kompani është futur më shumë se një herë
 DocType: Employee,Married,I martuar
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +389,Stock cannot be updated against Delivery Note {0},Stock nuk mund të rifreskohet kundër dorëzimit Shënim {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +391,Stock cannot be updated against Delivery Note {0},Stock nuk mund të rifreskohet kundër dorëzimit Shënim {0}
 DocType: Payment Reconciliation,Reconcile,Pajtojë
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +30,Grocery,Ushqimore
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,Ushqimore
 DocType: Quality Inspection Reading,Reading 1,Leximi 1
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Make Bank Entry,Bëni Banka Hyrja
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +40,Pension Funds,Fondet pensionale
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,Fondet pensionale
 apps/erpnext/erpnext/accounts/doctype/account/account.py +142,Warehouse is mandatory if account type is Warehouse,Magazina është i detyrueshëm nëse lloji i llogarisë është Magazina
 DocType: SMS Center,All Sales Person,Të gjitha Person Sales
 DocType: Lead,Person Name,Emri personi
@@ -131,7 +127,7 @@
 DocType: Quality Inspection,Get Specification Details,Get Specifikimi Details
 DocType: Lead,Interested,I interesuar
 apps/erpnext/erpnext/config/manufacturing.py +14,Bill of Material,Bill e materialit
-apps/erpnext/erpnext/public/js/stock_analytics.js +45,Opening,Hapje
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +158,Opening,Hapje
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},Nga {0} në {1}
 DocType: Item,Copy From Item Group,Kopje nga grupi Item
 DocType: Journal Entry,Opening Entry,Hyrja Hapja
@@ -145,23 +141,22 @@
 DocType: Employee Education,Under Graduate,Nën diplomuar
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +22,Target On,Target Në
 DocType: BOM,Total Cost,Kostoja Totale
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +99,Reaming,Reaming
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +9,Activity Log:,Identifikohu Aktiviteti:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +199,Item {0} does not exist in the system or has expired,Item {0} nuk ekziston në sistemin apo ka skaduar
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +44,Real Estate,Real Estate
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +44,Real Estate,Real Estate
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +4,Statement of Account,Deklarata e llogarisë
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +41,Pharmaceuticals,Farmaceutike
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,Farmaceutike
 DocType: Expense Claim Detail,Claim Amount,Shuma Claim
 DocType: Employee,Mr,Mr
 DocType: Custom Script,Client,Klient
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,Furnizuesi Lloji / Furnizuesi
 DocType: Naming Series,Prefix,Parashtesë
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Consumable,Harxhuese
+apps/erpnext/erpnext/public/js/setup_wizard.js +359,Consumable,Harxhuese
 DocType: Upload Attendance,Import Log,Import Identifikohu
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.js +19,Send,Dërgoj
 DocType: Sales Invoice Item,Delivered By Supplier,Dorëzuar nga furnizuesi
 DocType: SMS Center,All Contact,Të gjitha Kontakt
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +164,Annual Salary,Paga vjetore
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +164,Annual Salary,Paga vjetore
 DocType: Period Closing Voucher,Closing Fiscal Year,Mbyllja e Vitit Fiskal
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +69,Stock Expenses,Stock Shpenzimet
 DocType: Newsletter,Email Sent?,Email dërguar?
@@ -169,26 +164,24 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +92,Show Time Logs,Shfaq Koha Shkrime
 DocType: Journal Entry Account,Credit in Company Currency,Kreditit në kompanisë Valuta
 DocType: Delivery Note,Installation Status,Instalimi Statusi
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +115,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Pranuar + Refuzuar Qty duhet të jetë e barabartë me sasinë e pranuara për Item {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +118,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Pranuar + Refuzuar Qty duhet të jetë e barabartë me sasinë e pranuara për Item {0}
 DocType: Item,Supply Raw Materials for Purchase,Furnizimit të lëndëve të para për Blerje
 apps/erpnext/erpnext/stock/get_item_details.py +133,Item {0} must be a Purchase Item,Item {0} duhet të jetë një Item Blerje
 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","Shkarko template, plotësoni të dhënat e duhura dhe të bashkëngjitni e tanishëm. Të gjitha datat dhe punonjës kombinim në periudhën e zgjedhur do të vijë në template, me të dhënat ekzistuese frekuentimit"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +446,Item {0} is not active or end of life has been reached,Item {0} nuk është aktiv apo fundi i jetës është arritur
 DocType: Time Log Batch,Will be updated after Sales Invoice is Submitted.,Do të rifreskohet pas Sales Fatura është dorëzuar.
-apps/erpnext/erpnext/controllers/accounts_controller.py +493,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Të përfshijnë tatimin në rresht {0} në shkallën Item, taksat në rreshtat {1} duhet të përfshihen edhe"
+apps/erpnext/erpnext/controllers/accounts_controller.py +494,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Të përfshijnë tatimin në rresht {0} në shkallën Item, taksat në rreshtat {1} duhet të përfshihen edhe"
 apps/erpnext/erpnext/config/hr.py +90,Settings for HR Module,Cilësimet për HR Module
 DocType: SMS Center,SMS Center,SMS Center
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +78,Straightening,Straightening
 DocType: BOM Replace Tool,New BOM,Bom i ri
 apps/erpnext/erpnext/config/projects.py +28,Batch Time Logs for billing.,Batch Koha Shkrime për faturim.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +15,Countergravity casting,Hedh Countergravity
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +30,Newsletter has already been sent,Newsletter tashmë është dërguar
 DocType: Lead,Request Type,Kërkesë Type
 DocType: Leave Application,Reason,Arsye
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +14,Broadcasting,Transmetimi
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +140,Execution,Ekzekutim
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +364,The first user will become the System Manager (you can change this later).,Përdorues i parë do të bëhet i Sistemit Menaxher (ju mund ta ndryshoni këtë më vonë).
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,Transmetimi
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +140,Execution,Ekzekutim
+apps/erpnext/erpnext/public/js/setup_wizard.js +114,The first user will become the System Manager (you can change this later).,Përdorues i parë do të bëhet i Sistemit Menaxher (ju mund ta ndryshoni këtë më vonë).
 apps/erpnext/erpnext/config/manufacturing.py +39,Details of the operations carried out.,Detajet e operacioneve të kryera.
 DocType: Serial No,Maintenance Status,Mirëmbajtja Statusi
 apps/erpnext/erpnext/config/stock.py +263,Items and Pricing,Artikuj dhe Çmimeve
@@ -205,7 +198,6 @@
 DocType: Pricing Rule,Discount on Price List Rate (%),Zbritje në listën e çmimeve Norma (%)
 apps/frappe/frappe/public/js/frappe/form/print.js +96,Start,Fillim
 DocType: User,First Name,Emri
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +12,Full-mold casting,Hedh plotë-myk
 DocType: Offer Letter,Select Terms and Conditions,Zgjidhni Termat dhe Kushtet
 DocType: Production Planning Tool,Sales Orders,Sales Urdhërat
 DocType: Purchase Taxes and Charges,Valuation,Vlerësim
@@ -217,8 +209,7 @@
 DocType: Bank Reconciliation,Bank Account,Llogarisë Bankare
 DocType: Leave Type,Allow Negative Balance,Lejo bilancit negativ
 DocType: Selling Settings,Default Territory,Gabim Territorit
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +53,Television,Televizion
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +138,Gashing,Gashing
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,Televizion
 DocType: Production Order Operation,Updated via 'Time Log',Përditësuar nëpërmjet &#39;Koha Identifikohu &quot;
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +82,Account {0} does not belong to Company {1},Llogaria {0} nuk i përket kompanisë {1}
 DocType: Naming Series,Series List for this Transaction,Lista Seria për këtë transaksion
@@ -233,14 +224,13 @@
 DocType: Leave Allocation,Add unused leaves from previous allocations,Shtoni gjethe të papërdorura nga alokimet e mëparshme
 apps/erpnext/erpnext/controllers/recurring_document.py +206,Next Recurring {0} will be created on {1},Tjetër Periodik {0} do të krijohet në {1}
 DocType: Newsletter List,Total Subscribers,Totali i regjistruar
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +575,Contact Name,Kontakt Emri
+,Contact Name,Kontakt Emri
 DocType: Production Plan Item,SO Pending Qty,SO pritje Qty
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Krijon shqip pagave për kriteret e përmendura më sipër.
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,Kërkesë për blerje.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +107,Double housing,Strehim të dyfishtë
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +156,Only the selected Leave Approver can submit this Leave Application,Vetëm aprovuesi zgjedhur Pushimi mund ta paraqesë këtë kërkesë lini
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +171,Only the selected Leave Approver can submit this Leave Application,Vetëm aprovuesi zgjedhur Pushimi mund ta paraqesë këtë kërkesë lini
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,Lehtësimin Data duhet të jetë më i madh se data e bashkimit
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +172,Leaves per Year,Lë në vit
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +172,Leaves per Year,Lë në vit
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup > Settings > Naming Series,Ju lutemi të vendosur Emërtimi Seria për {0} nëpërmjet Setup&gt; Cilësimet&gt; Emërtimi Series
 DocType: Time Log,Will be updated when batched.,Do të përditësohet kur batched.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +104,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,Row {0}: Ju lutem kontrolloni &#39;A Advance&#39; kundër llogaria {1} në qoftë se kjo është një hyrje paraprakisht.
@@ -249,25 +239,24 @@
 DocType: Item Website Specification,Item Website Specification,Item Faqja Specifikimi
 DocType: Dropbox Backup,Dropbox Access Key,Dropbox Qasja kryesore
 DocType: Payment Tool,Reference No,Referenca Asnjë
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +348,Leave Blocked,Lini Blocked
-apps/erpnext/erpnext/stock/doctype/item/item.py +535,Item {0} has reached its end of life on {1},Item {0} ka arritur në fund të saj të jetës në {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +392,Leave Blocked,Lini Blocked
+apps/erpnext/erpnext/stock/doctype/item/item.py +539,Item {0} has reached its end of life on {1},Item {0} ka arritur në fund të saj të jetës në {1}
 apps/erpnext/erpnext/accounts/utils.py +339,Annual,Vjetor
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Stock Pajtimi Item
 DocType: Stock Entry,Sales Invoice No,Shitjet Faturë Asnjë
 DocType: Material Request Item,Min Order Qty,Rendit min Qty
 DocType: Lead,Do Not Contact,Mos Kontaktoni
 DocType: Sales Invoice,The unique id for tracking all recurring invoices. It is generated on submit.,ID unike për ndjekjen e të gjitha faturave të përsëritura. Ajo është krijuar për të paraqitur.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +93,Software Developer,Software Developer
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +93,Software Developer,Software Developer
 DocType: Item,Minimum Order Qty,Minimale Rendit Qty
 DocType: Pricing Rule,Supplier Type,Furnizuesi Type
 DocType: Item,Publish in Hub,Publikojë në Hub
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +555,Item {0} is cancelled,Item {0} është anuluar
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +598,Material Request,Kërkesë materiale
+apps/erpnext/erpnext/stock/doctype/item/item.py +559,Item {0} is cancelled,Item {0} është anuluar
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +607,Material Request,Kërkesë materiale
 DocType: Bank Reconciliation,Update Clearance Date,Update Pastrimi Data
 DocType: Item,Purchase Details,Detajet Blerje
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +323,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},Item {0} nuk u gjet në &#39;e para materiale të furnizuara &quot;tryezë në Rendit Blerje {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +129,Wire brushing,Wire brushing
 DocType: Employee,Relation,Lidhje
 DocType: Shipping Rule,Worldwide Shipping,Shipping në mbarë botën
 apps/erpnext/erpnext/config/selling.py +23,Confirmed orders from Customers.,Urdhra të konfirmuara nga konsumatorët.
@@ -283,12 +272,11 @@
 DocType: Supplier,Address HTML,Adresa HTML
 DocType: Lead,Mobile No.,Mobile Nr
 DocType: Maintenance Schedule,Generate Schedule,Generate Orari
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +81,Hubbing,Hubbing
 DocType: Purchase Invoice Item,Expense Head,Shpenzim Shef
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +86,Please select Charge Type first,"Ju lutem, përzgjidhni Ngarkesa Lloji i parë"
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,Fundit
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +395,Max 5 characters,Max 5 karaktere
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +195,Select Your Language,Zgjidh Gjuhën
+apps/erpnext/erpnext/public/js/setup_wizard.js +143,Max 5 characters,Max 5 karaktere
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +245,Select Your Language,Zgjidh Gjuhën
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,Aprovuesi i parë Leave në listë do të jetë vendosur si default Leave aprovuesi
 DocType: Manufacturing Settings,"Disables creation of time logs against Production Orders.
 Operations shall not be tracked against Production Order",Pamundëson krijimin e kohës shkrimet kundër urdhërat e prodhimit. Operacionet nuk do të gjurmuar kundër Rendit Production
@@ -300,8 +288,6 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +34,Item {0} must be Service Item,Item {0} duhet të jetë i Shërbimit Item
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +303,Completed Qty can not be greater than 'Qty to Manufacture',Kompletuar Qty nuk mund të jetë më i madh se &quot;Qty për Prodhimi&quot;
 DocType: DocType,Administrator,Administrator
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +136,Laser drilling,Shpimit Laser
-DocType: Stock UOM Replace Utility,New Stock UOM,New Stock UOM
 DocType: Period Closing Voucher,Closing Account Head,Mbyllja Shef Llogaria
 DocType: Employee,External Work History,Historia e jashtme
 apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,Qarkorja Referenca Gabim
@@ -310,18 +296,15 @@
 DocType: Lead,Industry,Industri
 DocType: Employee,Job Profile,Profile Job
 DocType: Newsletter,Newsletter,Newsletter
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +84,Hydroforming,HYDROFORMING
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +49,Necking,Puthje
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Njoftojë me email për krijimin e kërkesës automatike materiale
 DocType: Journal Entry,Multi Currency,Multi Valuta
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +51,Item is updated,Item është përditësuar
 DocType: Async Task,System Manager,Sistemi Menaxher
 DocType: Payment Reconciliation Invoice,Invoice Type,Lloji Faturë
 DocType: Sales Invoice Item,Delivery Note,Ofrimit Shënim
 DocType: Dropbox Backup,Allow Dropbox Access,Lejo Dropbox Qasja
 apps/erpnext/erpnext/config/learn.py +72,Setting up Taxes,Ngritja Tatimet
 apps/erpnext/erpnext/accounts/utils.py +189,Payment Entry has been modified after you pulled it. Please pull it again.,"Pagesa Hyrja është ndryshuar, pasi që ju nxorrën atë. Ju lutemi të tërheqë atë përsëri."
-apps/erpnext/erpnext/stock/doctype/item/item.py +343,{0} entered twice in Item Tax,{0} hyrë dy herë në Tatimin Item
+apps/erpnext/erpnext/stock/doctype/item/item.py +347,{0} entered twice in Item Tax,{0} hyrë dy herë në Tatimin Item
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +105,Summary for this week and pending activities,Përmbledhje për këtë javë dhe aktivitete në pritje
 DocType: Workstation,Rent Cost,Qira Kosto
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +74,Please select month and year,"Ju lutem, përzgjidhni muaji dhe viti"
@@ -338,23 +321,21 @@
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,Shkalla në të cilën Valuta Customer është konvertuar në bazë monedhën klientit
 DocType: Features Setup,"Available in BOM, Delivery Note, Purchase Invoice, Production Order, Purchase Order, Purchase Receipt, Sales Invoice, Sales Order, Stock Entry, Timesheet","Në dispozicion në bom, ofrimit Shënim, Blerje Faturës, Rendit Prodhimi, Rendit Blerje, pranimin Blerje, Sales Faturës, Sales Rendit, Stock Hyrja, pasqyrë e mungesave"
 DocType: Item Tax,Tax Rate,Shkalla e tatimit
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Select Item,Zgjidh Item
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +540,Select Item,Zgjidh Item
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +143,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","Item: {0} menaxhohet grumbull-i mençur, nuk mund të pajtohen duke përdorur \ Stock pajtimit, në vend që të përdorin Stock Hyrja"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +259,Purchase Invoice {0} is already submitted,Blerje Fatura {0} është dorëzuar tashmë
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +262,Purchase Invoice {0} is already submitted,Blerje Fatura {0} është dorëzuar tashmë
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Batch No must be same as {1} {2},Row # {0}: Batch Nuk duhet të jetë i njëjtë si {1} {2}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Convert to non-Group,Convert për të jo-Group
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +55,Purchase Receipt must be submitted,Pranimi blerje duhet të dorëzohet
-DocType: Stock UOM Replace Utility,Current Stock UOM,Aktuale Stock UOM
 apps/erpnext/erpnext/config/stock.py +53,Batch (lot) of an Item.,Batch (shumë) e një artikulli.
 DocType: C-Form Invoice Detail,Invoice Date,Data e faturës
 DocType: GL Entry,Debit Amount,Shuma Debi
 apps/erpnext/erpnext/accounts/party.py +223,There can only be 1 Account per Company in {0} {1},Nuk mund të jetë vetëm 1 Llogaria për Kompaninë në {0} {1}
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Your email address,Adresa juaj e-mail
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +194,Please see attachment,Ju lutem shikoni shtojcën
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +203,Please see attachment,Ju lutem shikoni shtojcën
 DocType: Purchase Order,% Received,% Marra
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +109,Water jet cutting,Jet uji prerja
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +24,Setup Already Complete!!,Setup Tashmë komplet !!
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +20,Setup Already Complete!!,Setup Tashmë komplet !!
 ,Finished Goods,Mallrat përfunduar
 DocType: Delivery Note,Instructions,Udhëzime
 DocType: Quality Inspection,Inspected By,Inspektohen nga
@@ -369,6 +350,7 @@
 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.,Ju lutem mos krijojnë llogaritë për klientët dhe furnizuesit. Ata janë krijuar direkt nga zotërit Customer / Furnizuesi.
 DocType: Currency Exchange,Currency Exchange,Currency Exchange
 DocType: Purchase Invoice Item,Item Name,Item Emri
+DocType: Authorization Rule,Approving User  (above authorized value),Miratimi përdoruesin (mbi vlerën e autorizuar)
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Credit Balance,Bilanci krediti
 DocType: Employee,Widowed,Ve
 DocType: Production Planning Tool,"Items to be requested which are ""Out of Stock"" considering all warehouses based on projected qty and minimum order qty","Gjërat që do të kërkohet të cilat janë &quot;jashtë të aksioneve&quot;, duke marrë parasysh të gjitha depot e bazuar në Qty projektuar dhe rendit Qty minimale"
@@ -378,11 +360,10 @@
 ,Purchase Register,Blerje Regjistrohu
 DocType: Landed Cost Item,Applicable Charges,Akuzat e aplikueshme
 DocType: Workstation,Consumable Cost,Kosto harxhuese
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,{0} ({1}) must have role 'Leave Approver',{0} ({1}) duhet të ketë rol &#39;Leave aprovuesi&#39;
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +167,{0} ({1}) must have role 'Leave Approver',{0} ({1}) duhet të ketë rol &#39;Leave aprovuesi&#39;
 DocType: Purchase Receipt,Vehicle Date,Data e Automjeteve
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +39,Medical,Mjekësor
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +39,Medical,Mjekësor
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,Arsyeja për humbjen
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +36,Tube beading,Tube beading
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},Workstation është i mbyllur në datat e mëposhtme sipas Holiday Lista: {0}
 DocType: Employee,Single,I vetëm
 DocType: Issue,Attachment,Attachment
@@ -403,10 +384,8 @@
 DocType: Account,Is Group,Është grup
 DocType: Stock Settings,Automatically Set Serial Nos based on FIFO,Automatikisht Set Serial Nos bazuar në FIFO
 DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,Kontrolloni Furnizuesi faturës Numri Unike
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +31,Thermoforming,Thermoforming
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +66,Slitting,Prerë
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +57,'To Case No.' cannot be less than 'From Case No.',&quot;Për Rasti Nr &#39; nuk mund të jetë më pak se &quot;nga rasti nr &#39;
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +104,Non Profit,Non Profit
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +104,Non Profit,Non Profit
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_list.js +7,Not Started,Nuk ka filluar
 DocType: Lead,Channel Partner,Channel Partner
 DocType: Account,Old Parent,Vjetër Parent
@@ -415,13 +394,12 @@
 apps/erpnext/erpnext/config/manufacturing.py +74,Global settings for all manufacturing processes.,Konfigurimet Global për të gjitha proceset e prodhimit.
 DocType: Accounts Settings,Accounts Frozen Upto,Llogaritë ngrira Upto
 DocType: SMS Log,Sent On,Dërguar në
-apps/erpnext/erpnext/stock/doctype/item/item.py +512,Attribute {0} selected multiple times in Attributes Table,Atribut {0} zgjedhur disa herë në atributet Tabelën
+apps/erpnext/erpnext/stock/doctype/item/item.py +516,Attribute {0} selected multiple times in Attributes Table,Atribut {0} zgjedhur disa herë në atributet Tabelën
 DocType: Sales Order,Not Applicable,Nuk aplikohet
 apps/erpnext/erpnext/config/hr.py +140,Holiday master.,Mjeshtër pushime.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +19,Shell molding,Shell derdhur
 DocType: Material Request Item,Required Date,Data e nevojshme
 DocType: Delivery Note,Billing Address,Faturimi Adresa
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +644,Please enter Item Code.,Ju lutemi shkruani kodin artikull.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +648,Please enter Item Code.,Ju lutemi shkruani kodin artikull.
 DocType: BOM,Costing,Kushton
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount","Nëse kontrolluar, shuma e taksave do të konsiderohen si të përfshirë tashmë në Printo Tarifa / Shuma Shtyp"
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,Gjithsej Qty
@@ -431,7 +409,7 @@
 DocType: Item Attribute,To Range,Në rang
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Të letrave me vlerë dhe depozita
 DocType: Features Setup,Imports,Importet
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +144,Adhesive bonding,Lidhjes ngjitëse
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +77,Total leaves allocated is mandatory,Gjithsej lë alokuara është i detyrueshëm
 DocType: Job Opening,Description of a Job Opening,Përshkrimi i një Hapja Job
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +102,Pending activities for today,Aktivitetet në pritje për sot
 apps/erpnext/erpnext/config/hr.py +28,Attendance record.,Pjesëmarrja rekord.
@@ -439,26 +417,25 @@
 DocType: Sales Order Item,Used for Production Plan,Përdoret për Planin e prodhimit
 DocType: System Settings,Loading...,Duke u ngarkuar ...
 DocType: DocField,Password,Fjalëkalim
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +155,Fused deposition modeling,Modelimit te perziera depozitimi
 DocType: Manufacturing Settings,Time Between Operations (in mins),Koha Midis Operacioneve (në minuta)
 DocType: Customer,Buyer of Goods and Services.,Blerësi i mallrave dhe shërbimeve.
 DocType: Journal Entry,Accounts Payable,Llogaritë e pagueshme
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +24,Add Subscribers,Shto abonentë
 apps/erpnext/erpnext/public/js/feature_setup.js +220,""" does not exists",&quot;Nuk ekziston
 DocType: Pricing Rule,Valid Upto,Valid Upto
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +564,List a few of your customers. They could be organizations or individuals.,Lista disa nga klientët tuaj. Ata mund të jenë organizata ose individë.
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,List a few of your customers. They could be organizations or individuals.,Lista disa nga klientët tuaj. Ata mund të jenë organizata ose individë.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Direct Income,Të ardhurat direkte
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +33,"Can not filter based on Account, if grouped by Account","Nuk mund të filtruar në bazë të llogarisë, në qoftë se të grupuara nga Llogaria"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +88,Administrative Officer,Zyrtar Administrativ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Administrative Officer,Zyrtar Administrativ
 DocType: Payment Tool,Received Or Paid,Marrë ose e paguar
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +318,Please select Company,"Ju lutem, përzgjidhni Company"
 DocType: Stock Entry,Difference Account,Llogaria Diferenca
 apps/erpnext/erpnext/projects/doctype/task/task.py +44,Cannot close task as its dependant task {0} is not closed.,Nuk mund detyrë afër sa detyra e saj të varur {0} nuk është e mbyllur.
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +305,Please enter Warehouse for which Material Request will be raised,Ju lutem shkruani Magazina për të cilat do të ngrihen materiale Kërkesë
 DocType: Production Order,Additional Operating Cost,Shtesë Kosto Operative
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +20,Cosmetics,Kozmetikë
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,Kozmetikë
 DocType: DocField,Type,Lloj
-apps/erpnext/erpnext/stock/doctype/item/item.py +417,"To merge, following properties must be same for both items","Të bashkojë, pronat e mëposhtme duhet të jenë të njëjta për të dy artikujve"
+apps/erpnext/erpnext/stock/doctype/item/item.py +421,"To merge, following properties must be same for both items","Të bashkojë, pronat e mëposhtme duhet të jenë të njëjta për të dy artikujve"
 DocType: Communication,Subject,Subjekt
 DocType: Shipping Rule,Net Weight,Net Weight
 DocType: Employee,Emergency Phone,Urgjencës Telefon
@@ -468,7 +445,6 @@
 DocType: Journal Entry,Difference (Dr - Cr),Diferenca (Dr - Cr)
 DocType: Account,Profit and Loss,Fitimi dhe Humbja
 apps/erpnext/erpnext/config/stock.py +293,Managing Subcontracting,Menaxhimi Nënkontraktimi
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +58,New UOM must NOT be of type Whole Number,New UOM nuk duhet të jetë e tipit Numri Whole
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Furniture and Fixture,Mobilje dhe instalime
 DocType: Quotation,Rate at which Price list currency is converted to company's base currency,Shkalla në të cilën listë Çmimi monedhës është konvertuar në monedhën bazë kompanisë
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Account {0} does not belong to company: {1},Llogaria {0} nuk i përkasin kompanisë: {1}
@@ -487,14 +463,14 @@
 DocType: Purchase Invoice,Supplier Invoice No,Furnizuesi Fatura Asnjë
 DocType: Territory,For reference,Për referencë
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +154,"Cannot delete Serial No {0}, as it is used in stock transactions","Nuk mund të fshini serial {0}, ashtu siç është përdorur në transaksionet e aksioneve"
-apps/erpnext/erpnext/public/js/account_tree_grid.js +52,Closing (Cr),Mbyllja (Cr)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +227,Closing (Cr),Mbyllja (Cr)
 DocType: Serial No,Warranty Period (Days),Garanci Periudha (ditë)
 DocType: Installation Note Item,Installation Note Item,Instalimi Shënim Item
 ,Pending Qty,Në pritje Qty
 DocType: Job Applicant,Thread HTML,Temë HTML
 DocType: Company,Ignore,Injoroj
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +86,SMS sent to following numbers: {0},SMS dërguar në numrat e mëposhtëm: {0}
-apps/erpnext/erpnext/controllers/buying_controller.py +135,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Furnizuesi Magazina i detyrueshëm për të nën-kontraktuar Blerje marrjes
+apps/erpnext/erpnext/controllers/buying_controller.py +126,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Furnizuesi Magazina i detyrueshëm për të nën-kontraktuar Blerje marrjes
 DocType: Pricing Rule,Valid From,Valid Nga
 DocType: Sales Invoice,Total Commission,Komisioni i përgjithshëm
 DocType: Pricing Rule,Sales Partner,Sales Partner
@@ -502,7 +478,7 @@
 DocType: Monthly Distribution,"**Monthly Distribution** helps you distribute your budget across months if you have seasonality in your business.
 
 To distribute a budget using this distribution, set this **Monthly Distribution** in the **Cost Center**","** Shpërndarja mujore ** ju ndihmon të shpërndajë buxhetin tuaj në të gjithë muajt e nëse ju keni sezonalitetin në biznesin tuaj. Për të shpërndarë një buxhet të përdorur këtë shpërndarje, vendosur kjo shpërndarje ** ** mujore në ** Qendra Kosto **"
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +183,No records found in the Invoice table,Nuk u gjetën në tabelën Faturë të dhënat
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +130,No records found in the Invoice table,Nuk u gjetën në tabelën Faturë të dhënat
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +20,Please select Company and Party Type first,"Ju lutem, përzgjidhni kompanisë dhe Partisë Lloji i parë"
 apps/erpnext/erpnext/config/accounts.py +84,Financial / accounting year.,Financiare / vit kontabilitetit.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","Na vjen keq, Serial Nos nuk mund të bashkohen"
@@ -518,25 +494,25 @@
 DocType: Sales Order,Billing and Delivery Status,Faturimi dhe dorëzimit Statusi
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Konsumatorët të përsëritur
 DocType: Leave Control Panel,Allocate,Alokimi
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +16,Previous,I mëparshëm
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard_page.html +16,Previous,I mëparshëm
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +620,Sales Return,Shitjet Kthehu
 DocType: Production Planning Tool,Select Sales Orders from which you want to create Production Orders.,Zgjidh urdhëron shitjet nga të cilat ju doni të krijoni urdhërat e prodhimit.
 DocType: Item,Delivered by Supplier (Drop Ship),Dorëzuar nga Furnizuesi (Drop Ship)
 apps/erpnext/erpnext/config/hr.py +120,Salary components.,Komponentët e pagave.
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,Baza e të dhënave të konsumatorëve potencial.
+DocType: Authorization Rule,Customer or Item,Customer ose Item
 apps/erpnext/erpnext/config/crm.py +17,Customer database.,Baza e të dhënave të konsumatorëve.
 DocType: Quotation,Quotation To,Citat Për
 DocType: Lead,Middle Income,Të ardhurat e Mesme
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),Hapja (Cr)
 apps/erpnext/erpnext/accounts/utils.py +193,Allocated amount can not be negative,Shuma e ndarë nuk mund të jetë negative
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +123,Tumbling,Akrobaci
 DocType: Purchase Order Item,Billed Amt,Faturuar Amt
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,Një Magazina logjik kundër të cilit janë bërë të hyra të aksioneve.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +92,Reference No & Reference Date is required for {0},Referenca Nuk &amp; Referenca Data është e nevojshme për {0}
 DocType: Event,Wednesday,E mërkurë
 DocType: Sales Invoice,Customer's Vendor,Vendor konsumatorit
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +214,Production Order is Mandatory,Prodhimi Rendit është i detyrueshëm
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +139,Proposal Writing,Propozimi Shkrimi
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,Proposal Writing,Propozimi Shkrimi
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,Një person tjetër Sales {0} ekziston me të njëjtin id punonjës
 apps/erpnext/erpnext/stock/stock_ledger.py +336,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},Negative Stock Gabim ({6}) për Item {0} në Magazina {1} në {2} {3} në {4} {5}
 DocType: Fiscal Year Company,Fiscal Year Company,Fiskale Viti i kompanisë
@@ -559,7 +535,7 @@
 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.","Pastaj Çmimeve Rregullat janë filtruar në bazë të konsumatorëve, Grupi Customer, Territorit, Furnizuesin, Furnizuesi Lloji, fushatën, Sales Partner etj"
 apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.py +179,Please install dropbox python module,Ju lutem instaloni Dropbox python modulin
 DocType: Employee,Passport Number,Pasaporta Numri
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +82,Manager,Menaxher
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Manager,Menaxher
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +494,From Purchase Receipt,Nga marrja Blerje
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +219,Same item has been entered multiple times.,Njëjti artikull është futur shumë herë.
 DocType: SMS Settings,Receiver Parameter,Marresit Parametri
@@ -567,10 +543,9 @@
 DocType: Sales Person,Sales Person Targets,Synimet Sales Person
 apps/frappe/frappe/public/js/frappe/form/workflow.js +116,To,Në
 apps/frappe/frappe/templates/base.html +145,Please enter email address,Ju lutemi shkruani adresën e-mail
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +35,End tube forming,Tub në fund formimin
 DocType: Production Order Operation,In minutes,Në minuta
 DocType: Issue,Resolution Date,Rezoluta Data
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +635,Please set default Cash or Bank account in Mode of Payment {0},Ju lutemi të vendosur Cash parazgjedhur apo llogari bankare në mënyra e pagesës {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +637,Please set default Cash or Bank account in Mode of Payment {0},Ju lutemi të vendosur Cash parazgjedhur apo llogari bankare në mënyra e pagesës {0}
 DocType: Selling Settings,Customer Naming By,Emërtimi Customer Nga
 apps/erpnext/erpnext/accounts/doctype/account/account.js +67,Convert to Group,Convert të Grupit
 DocType: Activity Cost,Activity Type,Aktiviteti Type
@@ -578,12 +553,12 @@
 DocType: Customer,Fixed Days,Ditët fikse
 DocType: Sales Invoice,Packing List,Lista paketim
 apps/erpnext/erpnext/config/buying.py +28,Purchase Orders given to Suppliers.,Blerje Urdhërat jepet Furnizuesit.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +43,Publishing,Botime
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +43,Publishing,Botime
 DocType: Activity Cost,Projects User,Projektet i përdoruesit
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Consumed,Konsumuar
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +198,{0}: {1} not found in Invoice Details table,{0}: {1} nuk u gjet në detaje Fatura tryezë
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,{0}: {1} not found in Invoice Details table,{0}: {1} nuk u gjet në detaje Fatura tryezë
 DocType: Company,Round Off Cost Center,Rrumbullakët Off Qendra Kosto
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +208,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Mirëmbajtja Vizitoni {0} duhet të anulohet para se anulimi këtë Radhit Sales
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +203,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Mirëmbajtja Vizitoni {0} duhet të anulohet para se anulimi këtë Radhit Sales
 DocType: Material Request,Material Transfer,Transferimi materiale
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +56,Opening (Dr),Hapja (Dr)
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},Timestamp postimi duhet të jetë pas {0}
@@ -595,7 +570,6 @@
 DocType: Pricing Rule,Sales Manager,Sales Manager
 apps/frappe/frappe/public/js/frappe/model/model.js +492,Rename,Riemërtoj
 DocType: Journal Entry,Write Off Amount,Shkruani Off Shuma
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +52,Bending,Lakimi
 apps/frappe/frappe/core/page/user_permissions/user_permissions.js +246,Allow User,Lejojë përdoruesin
 DocType: Journal Entry,Bill No,Bill Asnjë
 DocType: Purchase Invoice,Quarterly,Tremujor
@@ -605,17 +579,16 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Please enter item details,Ju lutem shkruani të dhënat pika
 DocType: Purchase Receipt,Other Details,Detaje të tjera
 DocType: Account,Accounts,Llogaritë
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +67,Marketing,Marketing
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +65,Straight shearing,Krasitje Drejt
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +67,Marketing,Marketing
 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.,Për të gjetur pika në shitje dhe dokumentet e blerjes bazuar në nr e tyre serik. Kjo është gjithashtu mund të përdoret për të gjetur detajet garanci e produktit.
 DocType: Purchase Receipt Item Supplied,Current Stock,Stock tanishme
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +99,Rejected Warehouse is mandatory against regected item,Magazina refuzuar është e detyrueshme kundër artikull regected
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +102,Rejected Warehouse is mandatory against regected item,Magazina refuzuar është e detyrueshme kundër artikull regected
 DocType: Account,Expenses Included In Valuation,Shpenzimet e përfshira në Vlerësimit
 DocType: Employee,Provide email id registered in company,Sigurojë id mail regjistruar në kompaninë
 DocType: Hub Settings,Seller City,Shitës qytetit
 DocType: Email Digest,Next email will be sent on:,Email ardhshëm do të dërgohet në:
 DocType: Offer Letter Term,Offer Letter Term,Oferta Letër Term
-apps/erpnext/erpnext/stock/doctype/item/item.py +492,Item has variants.,Item ka variante.
+apps/erpnext/erpnext/stock/doctype/item/item.py +496,Item has variants.,Item ka variante.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Item {0} nuk u gjet
 DocType: Bin,Stock Value,Stock Vlera
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,Tree Type
@@ -624,10 +597,9 @@
 DocType: Material Request Item,Quantity and Warehouse,Sasia dhe Magazina
 DocType: Sales Invoice,Commission Rate (%),Vlerësoni komision (%)
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +172,"Against Voucher Type must be one of Sales Order, Sales Invoice or Journal Entry","Kundër Bonon Lloji duhet të jetë një nga Sales Rendit, Sales Fatura ose Journal Hyrja"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +139,Biomachining,Biomachining
 apps/erpnext/erpnext/setup/utils.py +89,Unable to find exchange rate,Në pamundësi për të gjetur kursin e këmbimit
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +7,Aerospace,Hapësirës ajrore
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +19,Welcome,I mirëpritur
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +7,Aerospace,Hapësirës ajrore
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +40,Welcome,I mirëpritur
 DocType: Journal Entry,Credit Card Entry,Credit Card Hyrja
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +18,Task Subject,Detyra Subjekt
 apps/erpnext/erpnext/config/stock.py +33,Goods received from Suppliers.,Mallrat e marra nga furnizuesit.
@@ -650,19 +622,19 @@
 DocType: Employee,Cell Number,Numri Cell
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,I humbur
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +120,You can not enter current voucher in 'Against Journal Entry' column,Ju nuk mund të hyjë kupon aktual në &quot;Kundër Journal hyrjes &#39;kolonë
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +25,Energy,Energji
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,Energji
 DocType: Opportunity,Opportunity From,Opportunity Nga
 apps/erpnext/erpnext/config/hr.py +33,Monthly salary statement.,Deklarata mujore e pagave.
 DocType: Item Group,Website Specifications,Specifikimet Website
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +205,New Account,Llogaria e Re
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +21,{0}: From {0} of type {1},{0}: Nga {0} nga lloji {1}
-apps/erpnext/erpnext/controllers/buying_controller.py +283,Row {0}: Conversion Factor is mandatory,Row {0}: Konvertimi Faktori është e detyrueshme
+apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,Row {0}: Konvertimi Faktori është e detyrueshme
 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.,Hyrjet e kontabilitetit mund të bëhet kundër nyjet fletë. Entries kundër grupeve nuk janë të lejuara.
 DocType: ToDo,High,I lartë
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +361,Cannot deactivate or cancel BOM as it is linked with other BOMs,Nuk mund të çaktivizuar ose të anulojë bom si ajo është e lidhur me BOM-in e tjera
 DocType: Opportunity,Maintenance,Mirëmbajtje
 DocType: User,Male,Mashkull
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +182,Purchase Receipt number required for Item {0},Numri i Marrjes Blerje nevojshme për Item {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +183,Purchase Receipt number required for Item {0},Numri i Marrjes Blerje nevojshme për Item {0}
 DocType: Item Attribute Value,Item Attribute Value,Item atribut Vlera
 apps/erpnext/erpnext/config/crm.py +64,Sales campaigns.,Shitjet fushata.
 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.
@@ -691,10 +663,9 @@
 DocType: Address,Personal,Personal
 DocType: Expense Claim Detail,Expense Claim Type,Shpenzimet e kërkesës Lloji
 DocType: Shopping Cart Settings,Default settings for Shopping Cart,Default settings për Shportë
-apps/erpnext/erpnext/controllers/accounts_controller.py +324,"Journal Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Gazeta {0} Hyrja është e lidhur kundër Rendit {1}, kontrolloni nëse ajo duhet të largohen sa më parë në këtë faturë."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +13,Biotechnology,Bioteknologji
+apps/erpnext/erpnext/controllers/accounts_controller.py +325,"Journal Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Gazeta {0} Hyrja është e lidhur kundër Rendit {1}, kontrolloni nëse ajo duhet të largohen sa më parë në këtë faturë."
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +13,Biotechnology,Bioteknologji
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Office Maintenance Expenses,Shpenzimet Zyra Mirëmbajtja
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +53,Hemming,Hemming
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +66,Please enter Item first,Ju lutemi shkruani pika e parë
 DocType: Account,Liability,Detyrim
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +62,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Shuma e sanksionuar nuk mund të jetë më e madhe se shuma e kërkesës në Row {0}.
@@ -707,10 +678,10 @@
 DocType: Company,Default Bank Account,Gabim Llogarisë Bankare
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +47,"To filter based on Party, select Party Type first","Për të filtruar në bazë të Partisë, Partia zgjidhni llojin e parë"
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},"&#39;Update Stock &quot;nuk mund të kontrollohet, sepse sendet nuk janë dorëzuar nëpërmjet {0}"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Nos,Nos
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Nos,Nos
 DocType: Item,Items with higher weightage will be shown higher,Gjërat me weightage më të lartë do të tregohet më e lartë
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Detail Banka Pajtimit
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +627,My Invoices,Faturat e mia
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +629,My Invoices,Faturat e mia
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,Asnjë punonjës gjetur
 DocType: Purchase Order,Stopped,U ndal
 DocType: Item,If subcontracted to a vendor,Në qoftë se nënkontraktuar për një shitës
@@ -729,35 +700,33 @@
 DocType: Features Setup,"To enable ""Point of Sale"" features",Për të mundësuar &quot;Pika e Shitjes&quot; karakteristika
 DocType: Bin,Moving Average Rate,Moving norma mesatare
 DocType: Production Planning Tool,Select Items,Zgjidhni Items
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,{0} against Bill {1} dated {2},"{0} kundër Bill {1} ​​{2}, datë"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +328,{0} against Bill {1} dated {2},"{0} kundër Bill {1} ​​{2}, datë"
 DocType: Comment,Reference Name,Referenca Emri
 DocType: Maintenance Visit,Completion Status,Përfundimi Statusi
 DocType: Sales Invoice Item,Target Warehouse,Target Magazina
 DocType: Item,Allow over delivery or receipt upto this percent,Lejo mbi ofrimin ose pranimin upto këtë qind
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +49,Expected Delivery Date cannot be before Sales Order Date,Pritet Data e dorëzimit nuk mund të jetë e para Sales Rendit Data
 DocType: Upload Attendance,Import Attendance,Pjesëmarrja e importit
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +17,All Item Groups,Të gjitha Item Grupet
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +17,All Item Groups,Të gjitha Item Grupet
 DocType: Process Payroll,Activity Log,Aktiviteti Identifikohu
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +30,Net Profit / Loss,Fitimi neto / Humbja
 apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,Automatikisht shkruaj mesazh për dorëzimin e transaksioneve.
 DocType: Production Order,Item To Manufacture,Item Për Prodhimi
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +16,Permanent mold casting,Hedh Përhershëm myk
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} statusi është {2}
 apps/erpnext/erpnext/config/learn.py +172,Purchase Order to Payment,Blerje Rendit për Pagesa
 DocType: Sales Order Item,Projected Qty,Projektuar Qty
 DocType: Sales Invoice,Payment Due Date,Afati i pageses
 DocType: Newsletter,Newsletter Manager,Newsletter Menaxher
-apps/erpnext/erpnext/stock/doctype/item/item.js +229,Item Variant {0} already exists with same attributes,Item Varianti {0} tashmë ekziston me atributet e njëjta
+apps/erpnext/erpnext/stock/doctype/item/item.js +231,Item Variant {0} already exists with same attributes,Item Varianti {0} tashmë ekziston me atributet e njëjta
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening',&quot;Hapja&quot;
 DocType: Notification Control,Delivery Note Message,Ofrimit Shënim Mesazh
 DocType: Expense Claim,Expenses,Shpenzim
 DocType: Item Variant Attribute,Item Variant Attribute,Item Varianti Atributi
 ,Purchase Receipt Trends,Trendet Receipt Blerje
 DocType: Appraisal,Select template from which you want to get the Goals,Zgjidh shabllonin nga të cilat ju doni të merrni Objektivave
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +77,Research & Development,Hulumtim dhe Zhvillim
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Research & Development,Hulumtim dhe Zhvillim
 ,Amount to Bill,Shuma për Bill
 DocType: Company,Registration Details,Detajet e regjistrimit
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +75,Staking,Staking
 DocType: Item,Re-Order Qty,Re-Rendit Qty
 DocType: Leave Block List Date,Leave Block List Date,Dërgo Block Lista Data
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +25,Scheduled to send to {0},Planifikuar për të dërguar për {0}
@@ -768,18 +737,16 @@
 DocType: Sales Invoice Item,Stock Details,Stock Detajet
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Vlera e Projektit
 apps/erpnext/erpnext/config/selling.py +304,Point-of-Sale,Point-of-Sale
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,Cannot carry forward {0},Nuk mund të bart {0}
 apps/erpnext/erpnext/accounts/doctype/account/account.py +91,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","Bilanci i llogarisë tashmë në kredi, ju nuk jeni i lejuar për të vendosur &quot;Bilanci Must Be &#39;si&#39; Debitimit &#39;"
 DocType: Account,Balance must be,Bilanci duhet të jetë
 DocType: Hub Settings,Publish Pricing,Publikimi i Çmimeve
 DocType: Notification Control,Expense Claim Rejected Message,Shpenzim Kërkesa Refuzuar mesazh
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +145,Nailing,Ngulje
 ,Available Qty,Qty në dispozicion
 DocType: Purchase Taxes and Charges,On Previous Row Total,Në Previous Row Total
 DocType: Salary Slip,Working Days,Ditët e punës
 DocType: Serial No,Incoming Rate,Hyrëse Rate
 DocType: Packing Slip,Gross Weight,Peshë Bruto
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +410,The name of your company for which you are setting up this system.,Emri i kompanisë suaj për të cilën ju jeni të vendosur këtë sistem.
+apps/erpnext/erpnext/public/js/setup_wizard.js +158,The name of your company for which you are setting up this system.,Emri i kompanisë suaj për të cilën ju jeni të vendosur këtë sistem.
 DocType: HR Settings,Include holidays in Total no. of Working Days,Përfshijnë pushimet në total nr. i ditëve të punës
 DocType: Job Applicant,Hold,Mbaj
 DocType: Employee,Date of Joining,Data e Bashkimi
@@ -789,7 +756,6 @@
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +3,View Subscribers,Shiko Subscribers
 DocType: Purchase Invoice Item,Purchase Receipt,Pranimi Blerje
 ,Received Items To Be Billed,Items marra Për të faturohet
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +114,Abrasive blasting,Prish gërryes
 DocType: Employee,Ms,Ms
 apps/erpnext/erpnext/config/accounts.py +148,Currency exchange rate master.,Kursi i këmbimit të monedhës mjeshtër.
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +253,Unable to find Time Slot in the next {0} days for Operation {1},Në pamundësi për të gjetur vend i caktuar kohë në {0} ditëve të ardhshme për funksionimin {1}
@@ -801,7 +767,7 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +209,Serial No {0} does not belong to Item {1},Serial Asnjë {0} nuk i përkasin Item {1}
 DocType: Purchase Receipt Item Supplied,Required Qty,Kerkohet Qty
 DocType: Bank Reconciliation,Total Amount,Shuma totale
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +32,Internet Publishing,Botime Internet
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,Botime Internet
 DocType: Production Planning Tool,Production Orders,Urdhërat e prodhimit
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +35,Balance Value,Vlera e bilancit
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,Lista Sales Çmimi
@@ -812,7 +778,7 @@
 DocType: Supplier,Default Payable Accounts,Default Llogaritë e pagueshme
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,Punonjës {0} nuk është aktiv apo nuk ekziston
 DocType: Features Setup,Item Barcode,Item Barkodi
-apps/erpnext/erpnext/stock/doctype/item/item.py +487,Item Variants {0} updated,Item Variantet {0} përditësuar
+apps/erpnext/erpnext/stock/doctype/item/item.py +491,Item Variants {0} updated,Item Variantet {0} përditësuar
 DocType: Quality Inspection Reading,Reading 6,Leximi 6
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Blerje Faturë Advance
 DocType: Address,Shop,Dyqan
@@ -821,7 +787,7 @@
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,Parazgjedhur llogari Banka / Cash do të rifreskohet automatikisht në POS Faturës kur kjo mënyrë është zgjedhur.
 DocType: Employee,Permanent Address Is,Adresa e përhershme është
 DocType: Production Order Operation,Operation completed for how many finished goods?,Operacioni përfundoi për mënyrën se si shumë mallra të gatshme?
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +491,The Brand,Markë
+apps/erpnext/erpnext/public/js/setup_wizard.js +237,The Brand,Markë
 apps/erpnext/erpnext/controllers/status_updater.py +163,Allowance for over-{0} crossed for Item {1}.,Kompensimi për tejkalimin {0} kaloi për Item {1}.
 DocType: Employee,Exit Interview Details,Detajet Dil Intervista
 DocType: Item,Is Purchase Item,Është Blerje Item
@@ -841,16 +807,16 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Indirect Income,Të ardhurat indirekte
 DocType: Payment Tool,Set Payment Amount = Outstanding Amount,Set Shuma e pagesës = shumën e papaguar
 DocType: Contact Us Settings,Address Line 1,Adresa Line 1
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Variance,Grindje
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +392,Company Name,Emri i kompanisë
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +53,Variance,Grindje
+,Company Name,Emri i kompanisë
 DocType: SMS Center,Total Message(s),Përgjithshme mesazh (s)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +515,Select Item for Transfer,Përzgjidh Item për transferimin
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +538,Select Item for Transfer,Përzgjidh Item për transferimin
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,Shiko një listë të të gjitha ndihmë videot
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,Zgjidh llogaria kreu i bankës ku kontrolli ishte depozituar.
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,Lejo përdoruesit të redaktoni listën e çmimeve Vlerësoni në transaksionet
 DocType: Pricing Rule,Max Qty,Max Qty
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +106,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Row {0}: Pagesa kundër Sales / Rendit Blerje gjithmonë duhet të shënohet si më parë
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +16,Chemical,Kimik
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,Kimik
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +693,All items have already been transferred for this Production Order.,Të gjitha sendet janë tashmë të transferuar për këtë Rendit Production.
 DocType: Process Payroll,Select Payroll Year and Month,Zgjidh pagave vit dhe Muaji
 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""",Shko në grupin e duhur (zakonisht Aplikimi i Fondeve&gt; asetet aktuale&gt; llogaritë bankare dhe për të krijuar një llogari të re (duke klikuar mbi Shto fëmijë) të tipit &quot;Banka&quot;
@@ -861,12 +827,12 @@
 DocType: Item,Inspection Criteria,Kriteret e Inspektimit
 apps/erpnext/erpnext/config/accounts.py +101,Tree of finanial Cost Centers.,Pema e Qendrave finanial kostos.
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,Transferuar
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +492,Upload your letter head and logo. (you can edit them later).,Ngarko kokën tuaj letër dhe logo. (Ju mund të modifikoni ato më vonë).
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +156,White,E bardhë
+apps/erpnext/erpnext/public/js/setup_wizard.js +238,Upload your letter head and logo. (you can edit them later).,Ngarko kokën tuaj letër dhe logo. (Ju mund të modifikoni ato më vonë).
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,White,E bardhë
 DocType: SMS Center,All Lead (Open),Të gjitha Lead (Open)
 DocType: Purchase Invoice,Get Advances Paid,Get Paid Përparimet
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +362,Attach Your Picture,Bashkangjit foton tuaj
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Make ,Bëj
+apps/erpnext/erpnext/public/js/setup_wizard.js +112,Attach Your Picture,Bashkangjit foton tuaj
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +540,Make ,Bëj
 DocType: Journal Entry,Total Amount in Words,Shuma totale në fjalë
 DocType: Workflow State,Stop,Stop
 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.,Pati një gabim. Një arsye e mundshme mund të jetë që ju nuk e keni ruajtur formën. Ju lutemi te kontaktoni support@erpnext.com nëse problemi vazhdon.
@@ -875,14 +841,13 @@
 DocType: Lead,Next Contact Date,Tjetër Kontakt Data
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,Hapja Qty
 DocType: Holiday List,Holiday List Name,Festa Lista Emri
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +168,Stock Options,Stock Options
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +168,Stock Options,Stock Options
 DocType: Journal Entry Account,Expense Claim,Shpenzim Claim
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +181,Qty for {0},Qty për {0}
 DocType: Leave Application,Leave Application,Lini Aplikimi
 apps/erpnext/erpnext/config/hr.py +77,Leave Allocation Tool,Lini Alokimi Tool
 DocType: Leave Block List,Leave Block List Dates,Dërgo Block Lista Datat
 DocType: Company,If Monthly Budget Exceeded (for expense account),Nëse tejkaluar buxhetin mujor (për llogari shpenzim)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +56,Trimming,Zvogëlimin
 DocType: Workstation,Net Hour Rate,Shkalla neto Ore
 DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,Kosto zbarkoi Blerje Receipt
 DocType: Company,Default Terms,Kushtet Default
@@ -890,10 +855,9 @@
 DocType: POS Profile,Cash/Bank Account,Cash / Llogarisë Bankare
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,Removed items with no change in quantity or value.,Artikuj hequr me asnjë ndryshim në sasi ose në vlerë.
 DocType: Delivery Note,Delivery To,Ofrimit të
-apps/erpnext/erpnext/stock/doctype/item/item.py +509,Attribute table is mandatory,Tabela atribut është i detyrueshëm
+apps/erpnext/erpnext/stock/doctype/item/item.py +513,Attribute table is mandatory,Tabela atribut është i detyrueshëm
 DocType: Production Planning Tool,Get Sales Orders,Get Sales urdhëron
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} nuk mund të jetë negative
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +103,Filing,Arkivimi
 apps/erpnext/erpnext/templates/form_grid/item_grid.html +72,Discount,Zbritje
 DocType: Features Setup,Purchase Discounts,Blerje Zbritje
 DocType: Workstation,Wages,Pagat
@@ -910,6 +874,7 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +112,You are the Expense Approver for this record. Please Update the 'Status' and Save,Ju jeni aprovuesi Shpenzimet për këtë rekord. Ju lutem Update &#39;Status&#39; dhe për të shpëtuar
 DocType: Serial No,Creation Document No,Krijimi Dokumenti Asnjë
 DocType: Issue,Issue,Çështje
+apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account does not match with Company,Llogaria nuk përputhet me Kompaninë
 apps/erpnext/erpnext/config/stock.py +136,"Attributes for Item Variants. e.g Size, Color etc.","Atributet për Item variante. p.sh. madhësia, ngjyra etj"
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +39,WIP Warehouse,WIP Magazina
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +194,Serial No {0} is under maintenance contract upto {1},Serial Asnjë {0} është nën kontratë të mirëmbajtjes upto {1}
@@ -918,7 +883,7 @@
 DocType: Tax Rule,Shipping State,Shteti Shipping
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,Item duhet të shtohen duke përdorur &#39;të marrë sendet nga blerjen Pranimet&#39; button
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,Shitjet Shpenzimet
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Buying,Blerja Standard
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +120,Standard Buying,Blerja Standard
 DocType: GL Entry,Against,Kundër
 DocType: Item,Default Selling Cost Center,Gabim Qendra Shitja Kosto
 DocType: Sales Partner,Implementation Partner,Partner Zbatimi
@@ -939,29 +904,29 @@
 DocType: Time Log Batch,updated via Time Logs,updated nëpërmjet Koha Shkrime
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,Mesatare Moshë
 DocType: Opportunity,Your sales person who will contact the customer in future,Shitjes person i juaj i cili do të kontaktojë e konsumatorit në të ardhmen
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +588,List a few of your suppliers. They could be organizations or individuals.,Lista disa nga furnizuesit tuaj. Ata mund të jenë organizata ose individë.
+apps/erpnext/erpnext/public/js/setup_wizard.js +326,List a few of your suppliers. They could be organizations or individuals.,Lista disa nga furnizuesit tuaj. Ata mund të jenë organizata ose individë.
 DocType: Company,Default Currency,Gabim Valuta
 DocType: Contact,Enter designation of this Contact,Shkruani përcaktimin e këtij Kontakt
 DocType: Contact Us Settings,Address,Adresë
 DocType: Expense Claim,From Employee,Nga punonjësi
-apps/erpnext/erpnext/controllers/accounts_controller.py +338,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Kujdes: Sistemi nuk do të kontrollojë overbilling që shuma për Item {0} në {1} është zero
+apps/erpnext/erpnext/controllers/accounts_controller.py +339,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Kujdes: Sistemi nuk do të kontrollojë overbilling që shuma për Item {0} në {1} është zero
 DocType: Journal Entry,Make Difference Entry,Bëni Diferenca Hyrja
 DocType: Upload Attendance,Attendance From Date,Pjesëmarrja Nga Data
 DocType: Appraisal Template Goal,Key Performance Area,Key Zona Performance
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +54,Transportation,Transport
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +54,Transportation,Transport
 apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +67, and year: ,dhe vit:
 DocType: Email Digest,Annual Expense,Shpenzimet vjetore
 DocType: SMS Center,Total Characters,Totali Figurë
-apps/erpnext/erpnext/controllers/buying_controller.py +139,Please select BOM in BOM field for Item {0},"Ju lutem, përzgjidhni bom në fushën BOM për Item {0}"
+apps/erpnext/erpnext/controllers/buying_controller.py +130,Please select BOM in BOM field for Item {0},"Ju lutem, përzgjidhni bom në fushën BOM për Item {0}"
 DocType: C-Form Invoice Detail,C-Form Invoice Detail,Detail C-Forma Faturë
 DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,Pagesa Pajtimi Faturë
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +32,Contribution %,Kontributi%
 DocType: Item,website page link,faqe e internetit lidhje
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +192,Let's prepare the system for first use.,Le të përgatisë sistemin e përdorimit të parë.
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +242,Let's prepare the system for first use.,Le të përgatisë sistemin e përdorimit të parë.
 DocType: Company,Company registration numbers for your reference. Tax numbers etc.,Numrat e regjistrimit kompani për referencë tuaj. Numrat e taksave etj
 DocType: Sales Partner,Distributor,Shpërndarës
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Shporta Transporti Rregulla
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +214,Production Order {0} must be cancelled before cancelling this Sales Order,Prodhimi Rendit {0} duhet të anulohet para se anulimi këtë Radhit Sales
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +209,Production Order {0} must be cancelled before cancelling this Sales Order,Prodhimi Rendit {0} duhet të anulohet para se anulimi këtë Radhit Sales
 ,Ordered Items To Be Billed,Items urdhëruar të faturuar
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +24,From Range has to be less than To Range,Nga një distancë duhet të jetë më pak se në rang
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +21,Select Time Logs and Submit to create a new Sales Invoice.,Zgjidh Koha Shkrime dhe Submit për të krijuar një Sales re Faturë.
@@ -981,14 +946,13 @@
 DocType: Sales Invoice Advance,Sales Invoice Advance,Shitjet Faturë Advance
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +398,Nothing to request,Asgjë për të kërkuar
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date',&#39;Aktual Data e Fillimit&#39; nuk mund të jetë më i madh se &#39;Lajme End Date&#39;
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +75,Management,Drejtuesit
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +75,Management,Drejtuesit
 apps/erpnext/erpnext/config/projects.py +33,Types of activities for Time Sheets,Llojet e aktiviteteve për kohën Sheets
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +14,Investment casting,Hedh e investimeve
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +51,Either debit or credit amount is required for {0},Ose debiti ose krediti shuma është e nevojshme për {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""","Kjo do t&#39;i bashkëngjitet Kodit Pika e variant. Për shembull, në qoftë se shkurtim juaj është &quot;SM&quot;, dhe kodin pika është &quot;T-shirt&quot;, kodi pika e variantit do të jetë &quot;T-shirt-SM&quot;"
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,Neto Pay (me fjalë) do të jetë i dukshëm një herë ju ruani gabim pagave.
 apps/frappe/frappe/core/doctype/user/user_list.js +12,Active,Aktiv
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +154,Blue,Blu
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +154,Blue,Blu
 DocType: Purchase Invoice,Is Return,Është Kthimi
 DocType: Price List Country,Price List Country,Lista e Çmimeve Vendi
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +123,Further nodes can be only created under 'Group' type nodes,Nyjet e mëtejshme mund të krijohet vetëm në nyjet e tipit &#39;Grupit&#39;
@@ -998,18 +962,16 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +22,POS Profile {0} already created for user: {1} and company {2},POS Profilin {0} krijuar tashmë për përdorues: {1} dhe kompani {2}
 DocType: Purchase Order Item,UOM Conversion Factor,UOM Konvertimi Faktori
 DocType: Stock Settings,Default Item Group,Gabim Item Grupi
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +156,Laminated object manufacturing,Objekti prodhimit laminuara
 apps/erpnext/erpnext/config/buying.py +13,Supplier database.,Bazës së të dhënave Furnizuesi.
 DocType: Account,Balance Sheet,Bilanci i gjendjes
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +561,Cost Center For Item with Item Code ',Qendra Kosto Per Item me Kodin Item &quot;
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +45,Stretch forming,Stretch formimin
 DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,Personi i shitjes juaj do të merrni një kujtesë në këtë datë të kontaktoni klientin
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +210,"Further accounts can be made under Groups, but entries can be made against non-Groups","Llogaritë e mëtejshme mund të bëhen në bazë të grupeve, por hyra mund të bëhet kundër jo-grupeve"
 apps/erpnext/erpnext/config/hr.py +125,Tax and other salary deductions.,Tatimore dhe zbritjet e tjera të pagave.
 DocType: Lead,Lead,Lead
 DocType: Email Digest,Payables,Pagueshme
 DocType: Account,Warehouse,Depo
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +90,Row #{0}: Rejected Qty can not be entered in Purchase Return,Row # {0}: Refuzuar Qty nuk mund të futen në Blerje Kthim
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +93,Row #{0}: Rejected Qty can not be entered in Purchase Return,Row # {0}: Refuzuar Qty nuk mund të futen në Blerje Kthim
 ,Purchase Order Items To Be Billed,Items Rendit Blerje Për të faturohet
 DocType: Purchase Invoice Item,Net Rate,Net Rate
 DocType: Purchase Invoice Item,Purchase Invoice Item,Blerje Item Faturë
@@ -1024,13 +986,13 @@
 DocType: Global Defaults,Current Fiscal Year,Vitin aktual fiskal
 DocType: Global Defaults,Disable Rounded Total,Disable rrumbullakosura Total
 DocType: Lead,Call,Thirrje
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +384,'Entries' cannot be empty,&quot;Hyrjet&quot; nuk mund të jetë bosh
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +386,'Entries' cannot be empty,&quot;Hyrjet&quot; nuk mund të jetë bosh
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},Duplicate rresht {0} me të njëjtën {1}
 ,Trial Balance,Bilanci gjyqi
 apps/erpnext/erpnext/config/hr.py +205,Setting up Employees,Ngritja Punonjësit
 apps/erpnext/erpnext/public/js/feature_setup.js +220,"Grid """,Grid &quot;
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +150,Please select prefix first,"Ju lutem, përzgjidhni prefiks parë"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +138,Research,Hulumtim
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +138,Research,Hulumtim
 DocType: Maintenance Visit Purpose,Work Done,Punën e bërë
 apps/erpnext/erpnext/controllers/item_variant.py +25,Please specify at least one attribute in the Attributes table,Ju lutem specifikoni të paktën një atribut në tabelë Atributet
 DocType: Contact,User ID,User ID
@@ -1038,10 +1000,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +57,View Ledger,Shiko Ledger
 DocType: File,Lft,LFT
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Hershme
-apps/erpnext/erpnext/stock/doctype/item/item.py +394,"An Item Group exists with same name, please change the item name or rename the item group","Një Grup Item ekziston me të njëjtin emër, ju lutemi të ndryshojë emrin pika ose riemërtoj grupin pika"
+apps/erpnext/erpnext/stock/doctype/item/item.py +398,"An Item Group exists with same name, please change the item name or rename the item group","Një Grup Item ekziston me të njëjtin emër, ju lutemi të ndryshojë emrin pika ose riemërtoj grupin pika"
 DocType: Communication,Delivery Status,Ofrimit Statusi
 DocType: Production Order,Manufacture against Sales Order,Prodhimi kundër Sales Rendit
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +517,Rest Of The World,Pjesa tjetër e botës
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +455,Rest Of The World,Pjesa tjetër e botës
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,Item {0} nuk mund të ketë Serisë
 ,Budget Variance Report,Buxheti Varianca Raport
 DocType: Salary Slip,Gross Pay,Pay Bruto
@@ -1052,13 +1014,11 @@
 DocType: BOM Item,Item Description,Përshkrimi i artikullit
 DocType: Payment Tool,Payment Mode,Mode Pagesa
 DocType: Purchase Invoice,Is Recurring,Është i vazhdueshëm
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +154,Direct metal laser sintering,Lazer metalike drejtpërdrejtë sintering
 DocType: Purchase Order,Supplied Items,Artikujve të furnizuara
 DocType: Production Order,Qty To Manufacture,Qty Për Prodhimi
 DocType: Buying Settings,Maintain same rate throughout purchase cycle,Ruajtja njëjtin ritëm gjatë gjithë ciklit të blerjes
 DocType: Opportunity Item,Opportunity Item,Mundësi Item
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +61,Temporary Opening,Hapja e përkohshme
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +41,Cryorolling,Cryorolling
 ,Employee Leave Balance,Punonjës Pushimi Bilanci
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +128,Balance for Account {0} must always be {1},Gjendjen e llogarisë {0} duhet të jetë gjithmonë {1}
 DocType: Address,Address Type,Adresa Type
@@ -1074,23 +1034,23 @@
 DocType: Journal Entry,Get Outstanding Invoices,Get Faturat e papaguara
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,Sales Order {0} nuk është e vlefshme
 apps/erpnext/erpnext/setup/doctype/company/company.py +172,"Sorry, companies cannot be merged","Na vjen keq, kompanitë nuk mund të bashkohen"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +145,Small,I vogël
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Small,I vogël
 DocType: Employee,Employee Number,Numri punonjës
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},Rast No (s) në përdorim. Provoni nga Rasti Nr {0}
 ,Invoiced Amount (Exculsive Tax),Shuma e faturuar (Tax Exculsive)
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,Item 2
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +59,Account head {0} created,Kreu i llogarisë {0} krijuar
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +153,Green,E gjelbër
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Green,E gjelbër
 DocType: Item,Auto re-order,Auto ri-qëllim
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +57,Total Achieved,Gjithsej Arritur
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +59,Total Achieved,Gjithsej Arritur
 DocType: Employee,Place of Issue,Vendi i lëshimit
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +59,Contract,Kontratë
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Contract,Kontratë
 DocType: Report,Disabled,I paaftë
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +490,UOM coversion factor required for UOM: {0} in Item: {1},Faktori UOM Coversion nevojshme për UOM: {0} në Item: {1}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +83,Indirect Expenses,Shpenzimet indirekte
 apps/erpnext/erpnext/controllers/selling_controller.py +163,Row {0}: Qty is mandatory,Row {0}: Qty është e detyrueshme
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +8,Agriculture,Bujqësi
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +611,Your Products or Services,Produktet ose shërbimet tuaja
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,Bujqësi
+apps/erpnext/erpnext/public/js/setup_wizard.js +347,Your Products or Services,Produktet ose shërbimet tuaja
 DocType: Mode of Payment,Mode of Payment,Mënyra e pagesës
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,Ky është një grup artikull rrënjë dhe nuk mund të redaktohen.
 DocType: Journal Entry Account,Purchase Order,Rendit Blerje
@@ -1102,7 +1062,7 @@
 DocType: Serial No,Serial No Details,Serial No Detajet
 DocType: Purchase Invoice Item,Item Tax Rate,Item Tax Rate
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +113,"For {0}, only credit accounts can be linked against another debit entry","Për {0}, vetëm llogaritë e kreditit mund të jetë i lidhur kundër një tjetër hyrje debiti"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Delivery Note {0} is not submitted,Ofrimit Shënim {0} nuk është dorëzuar
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +470,Delivery Note {0} is not submitted,Ofrimit Shënim {0} nuk është dorëzuar
 apps/erpnext/erpnext/stock/get_item_details.py +136,Item {0} must be a Sub-contracted Item,Item {0} duhet të jetë një nënkontraktohet Item
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,Pajisje kapitale
 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.","Rregulla e Çmimeve është zgjedhur për herë të parë në bazë të &quot;Apliko në &#39;fushë, të cilat mund të jenë të artikullit, Grupi i artikullit ose markë."
@@ -1112,7 +1072,7 @@
 DocType: Appraisal Goal,Goal,Qëllim
 DocType: Sales Invoice Item,Edit Description,Ndrysho Përshkrimi
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +318,Expected Delivery Date is lesser than Planned Start Date.,Pritet Data e dorëzimit është më e vogël se sa ishte planifikuar Data e fillimit.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +579,For Supplier,Për Furnizuesin
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +602,For Supplier,Për Furnizuesin
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,Vendosja Tipi Llogarisë ndihmon në zgjedhjen e kësaj llogarie në transaksionet.
 DocType: Purchase Invoice,Grand Total (Company Currency),Grand Total (Kompania Valuta)
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,Largohet Total
@@ -1138,10 +1098,10 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +74,"Total {0} for all items is zero, may you should change 'Distribute Charges Based On'","Gjithsej {0} për të gjitha sendet është zero, mund të ju duhet të ndryshojë &quot;Shpërndani akuzat Bazuar Në &#39;"
 DocType: Purchase Invoice,Taxes and Charges Calculation,Taksat dhe Tarifat Llogaritja
 DocType: BOM Operation,Workstation,Workstation
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +112,Hardware,Hardware
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +112,Hardware,Hardware
 DocType: Attendance,HR Manager,Menaxher HR
 apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,Ju lutem zgjidhni një Company
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +50,Privilege Leave,Privilegj Leave
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +50,Privilege Leave,Privilegj Leave
 DocType: Purchase Invoice,Supplier Invoice Date,Furnizuesi Data e faturës
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +79,You need to enable Shopping Cart,Ju duhet të mundësojnë Shporta
 apps/frappe/frappe/public/js/frappe/form/grid_body.html +6,No Data,Nuk ka të dhëna
@@ -1154,7 +1114,7 @@
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +81,Overlapping conditions found between:,Kushtet e mbivendosjes gjenden në mes:
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +168,Against Journal Entry {0} is already adjusted against some other voucher,Kundër Fletoren Hyrja {0} është përshtatur tashmë kundër një kupon tjetër
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +68,Total Order Value,Vlera Totale Rendit
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +38,Food,Ushqim
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +38,Food,Ushqim
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Gama plakjen 3
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +139,You can make a time log only against a submitted production order,Ju mund të bëni një regjistër kohë vetëm kundër një urdhër paraqitur prodhimit
 DocType: Maintenance Schedule Item,No of Visits,Nr i vizitave
@@ -1174,6 +1134,7 @@
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,View Offer Letter,Shiko Oferta Letër
 DocType: Communication,Communication,Komunikim
 DocType: Item,Is Service Item,Është Shërbimi i artikullit
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +81,Application period cannot be outside leave allocation period,Periudha e aplikimit nuk mund të jetë periudhë ndarja leje jashtë
 DocType: Activity Cost,Projects,Projektet
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +31,Please select Fiscal Year,"Ju lutem, përzgjidhni Viti Fiskal"
 apps/erpnext/erpnext/controllers/buying_controller.py +23,From {0} | {1} {2},Nga {0} | {1} {2}
@@ -1192,7 +1153,7 @@
 DocType: Item,Maintain Stock,Ruajtja Stock
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +213,Stock Entries already created for Production Order ,Stock Entries krijuar tashmë për Rendin Production
 DocType: Leave Control Panel,Leave blank if considered for all designations,Lini bosh nëse konsiderohet për të gjitha përcaktimeve
-apps/erpnext/erpnext/controllers/accounts_controller.py +499,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Ngarkesa e tipit &#39;aktuale&#39; në rresht {0} nuk mund të përfshihen në Item Rate
+apps/erpnext/erpnext/controllers/accounts_controller.py +500,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Ngarkesa e tipit &#39;aktuale&#39; në rresht {0} nuk mund të përfshihen në Item Rate
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,Max: {0},Max: {0}
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +16,From Datetime,Nga datetime
 DocType: Email Digest,For Company,Për Kompaninë
@@ -1202,7 +1163,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +50,Chart of Accounts,Lista e Llogarive
 DocType: Material Request,Terms and Conditions Content,Termat dhe Kushtet Përmbajtja
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +471,cannot be greater than 100,nuk mund të jetë më i madh se 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +546,Item {0} is not a stock Item,Item {0} nuk është një gjendje Item
+apps/erpnext/erpnext/stock/doctype/item/item.py +550,Item {0} is not a stock Item,Item {0} nuk është një gjendje Item
 DocType: Maintenance Visit,Unscheduled,Paplanifikuar
 DocType: Employee,Owned,Pronësi
 DocType: Salary Slip Deduction,Depends on Leave Without Pay,Varet në pushim pa pagesë
@@ -1216,30 +1177,28 @@
 DocType: HR Settings,Employee Settings,Cilësimet e punonjësve
 ,Batch-Wise Balance History,Batch-urti Historia Bilanci
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +72,To Do List,Për të bërë lista
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +63,Apprentice,Nxënës
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Apprentice,Nxënës
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +99,Negative Quantity is not allowed,Sasi negativ nuk është e lejuar
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
 Used for Taxes and Charges",Detaje taksave tryezë sforcuar nga mjeshtri pika si një varg dhe të depozituara në këtë fushë. Përdoret për taksat dhe tatimet
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +61,Lancing,Lancing
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +151,Employee cannot report to himself.,Punonjësi nuk mund të raportojnë për veten e tij.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Në qoftë se llogaria është e ngrirë, shënimet janë të lejuar për përdoruesit të kufizuara."
 DocType: Email Digest,Bank Balance,Bilanci bankë
-apps/erpnext/erpnext/controllers/accounts_controller.py +435,Accounting Entry for {0}: {1} can only be made in currency: {2},Hyrja Kontabiliteti për {0}: {1} mund të bëhen vetëm në monedhën: {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +436,Accounting Entry for {0}: {1} can only be made in currency: {2},Hyrja Kontabiliteti për {0}: {1} mund të bëhen vetëm në monedhën: {2}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +38,No active Salary Structure found for employee {0} and the month,Asnjë Struktura Paga aktiv gjetur për punonjës {0} dhe muajit
 DocType: Job Opening,"Job profile, qualifications required etc.","Profili i punës, kualifikimet e nevojshme etj"
 DocType: Journal Entry Account,Account Balance,Bilanci i llogarisë
 apps/erpnext/erpnext/config/accounts.py +112,Tax Rule for transactions.,Rregulla taksë për transaksionet.
 DocType: Rename Tool,Type of document to rename.,Lloji i dokumentit për të riemërtoni.
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +630,We buy this Item,Ne blerë këtë artikull
+apps/erpnext/erpnext/public/js/setup_wizard.js +366,We buy this Item,Ne blerë këtë artikull
 DocType: Address,Billing,Faturimi
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +77,Flanging,Flanging
 DocType: Bulk Email,Not Sent,Jo dërguar
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +73,Explosive forming,Eksploziv formimin
 DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),Totali Taksat dhe Tarifat (Kompania Valuta)
 DocType: Shipping Rule,Shipping Account,Llogaria anijeve
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +43,Scheduled to send to {0} recipients,Planifikuar për të dërguar për {0} marrësit
 DocType: Quality Inspection,Readings,Lexime
 DocType: Stock Entry,Total Additional Costs,Gjithsej kosto shtesë
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Sub Assemblies,Kuvendet Nën
+apps/erpnext/erpnext/public/js/setup_wizard.js +359,Sub Assemblies,Kuvendet Nën
 DocType: Shipping Rule Condition,To Value,Të vlerës
 DocType: Supplier,Stock Manager,Stock Menaxher
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +143,Source warehouse is mandatory for row {0},Depo Burimi është i detyrueshëm për rresht {0}
@@ -1249,44 +1208,42 @@
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Import dështoi!
 apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,Ka adresë shtuar ende.
 DocType: Workstation Working Hour,Workstation Working Hour,Workstation orë pune
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +83,Analyst,Analist
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +202,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Row {0}: Shuma e ndarë {1} duhet të jetë më pak se ose e barabartë me shumën e JV {2}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Analyst,Analist
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +149,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Row {0}: Shuma e ndarë {1} duhet të jetë më pak se ose e barabartë me shumën e JV {2}
 DocType: Item,Inventory,Inventar
 DocType: Features Setup,"To enable ""Point of Sale"" view",Për të mundësuar &quot;Pika e Shitjes&quot; pikëpamje
 apps/erpnext/erpnext/public/js/pos/pos.js +402,Payment cannot be made for empty cart,Pagesa nuk mund të bëhet për karrocë bosh
 DocType: Item,Sales Details,Shitjet Detajet
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +149,Pinning,Pinning
 DocType: Opportunity,With Items,Me Items
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,Në Qty
 DocType: Notification Control,Expense Claim Rejected,Shpenzim Kërkesa Refuzuar
 DocType: Sales Invoice,"The date on which next invoice will be generated. It is generated on submit.
 ",Data në të cilën fatura e ardhshme do të gjenerohet. Ajo është krijuar për të paraqitur.
 DocType: Item Attribute,Item Attribute,Item Attribute
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +105,Government,Qeveri
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Government,Qeveri
 apps/erpnext/erpnext/config/stock.py +268,Item Variants,Variantet pika
 DocType: Company,Services,Sherbime
 apps/erpnext/erpnext/accounts/report/financial_statements.py +147,Total ({0}),Total ({0})
 DocType: Cost Center,Parent Cost Center,Qendra prind Kosto
 DocType: Sales Invoice,Source,Burim
 DocType: Leave Type,Is Leave Without Pay,Lini është pa pagesë
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +186,No records found in the Payment table,Nuk u gjetën në tabelën e Pagesave të dhënat
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +405,Financial Year Start Date,Viti Financiar Data e Fillimit
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +133,No records found in the Payment table,Nuk u gjetën në tabelën e Pagesave të dhënat
+apps/erpnext/erpnext/public/js/setup_wizard.js +153,Financial Year Start Date,Viti Financiar Data e Fillimit
 DocType: Employee External Work History,Total Experience,Përvoja Total
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +100,Countersinking,Countersinking
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +271,Packing Slip(s) cancelled,Paketimi Shqip (s) anulluar
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +276,Packing Slip(s) cancelled,Paketimi Shqip (s) anulluar
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,Mallrave dhe Forwarding Pagesat
 DocType: Material Request Item,Sales Order No,Rendit Sales Asnjë
 DocType: Item Group,Item Group Name,Item Emri i Grupit
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +50,Taken,Marrë
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,Marrë
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +66,Transfer Materials for Manufacture,Materialet Transferimi për prodhimin e
 DocType: Pricing Rule,For Price List,Për listën e çmimeve
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +27,Executive Search,Ekzekutiv Kërko
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,Ekzekutiv Kërko
 apps/erpnext/erpnext/stock/stock_ledger.py +405,"Purchase rate for item: {0} not found, which is required to book accounting entry (expense). Please mention item price against a buying price list.","Shkalla Blerje për artikull: {0} nuk u gjet, e cila është e nevojshme për të librit hyrje të Kontabilitetit (shpenzimeve). Ju lutemi të përmendim së çmimit të artikullit kundër një listë të çmimeve blerjen."
 DocType: Maintenance Schedule,Schedules,Oraret
 DocType: Purchase Invoice Item,Net Amount,Shuma neto
 DocType: Purchase Order Item Supplied,BOM Detail No,Bom Detail Asnjë
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),Shtesë Shuma Discount (Valuta Company)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +537,Error: {0} > {1},Gabim: {0}&gt; {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +541,Error: {0} > {1},Gabim: {0}&gt; {1}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,Ju lutem të krijuar një llogari të re nga Chart e Llogarive.
 DocType: Maintenance Visit,Maintenance Visit,Mirëmbajtja Vizitoni
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer > Customer Group > Territory,Customer&gt; Grupi Customer&gt; Territori
@@ -1297,7 +1254,6 @@
 DocType: Event,Tuesday,E martë
 DocType: Leave Block List,Block Holidays on important days.,Festat bllok në ditë të rëndësishme.
 ,Accounts Receivable Summary,Llogaritë Arkëtueshme Përmbledhje
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +43,Leaves for type {0} already allocated for Employee {1} for period {2} - {3},Lë për llojin {0} ndarë tashmë për punonjësit {1} për periudhën {2} - {3}
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +187,Please set User ID field in an Employee record to set Employee Role,Ju lutemi të vendosur User fushë ID në një rekord të Punonjësve të vendosur Roli punonjës
 DocType: UOM,UOM Name,Emri UOM
 DocType: Top Bar Item,Target,Objektiv
@@ -1309,15 +1265,14 @@
 DocType: ToDo,Due Date,Për shkak Date
 DocType: Sales Invoice Item,Brand Name,Brand Name
 DocType: Purchase Receipt,Transporter Details,Detajet Transporter
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Box,Kuti
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +389,The Organization,Organizata
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Box,Kuti
+apps/erpnext/erpnext/public/js/setup_wizard.js +137,The Organization,Organizata
 DocType: Monthly Distribution,Monthly Distribution,Shpërndarja mujore
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,Marresit Lista është e zbrazët. Ju lutem krijoni Marresit Lista
 DocType: Production Plan Sales Order,Production Plan Sales Order,Prodhimit Plani Rendit Sales
 DocType: Sales Partner,Sales Partner Target,Sales Partner Target
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},Hyrja Kontabiliteti për {0} mund të bëhen vetëm në monedhën: {1}
 DocType: Pricing Rule,Pricing Rule,Rregulla e Çmimeve
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +58,Notching,E prerë
 apps/erpnext/erpnext/config/learn.py +167,Material Request to Purchase Order,Kërkesë materiale për të blerë Radhit
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +74,Row # {0}: Returned Item {1} does not exists in {2} {3},Row # {0}: kthye Item {1} nuk ekziston në {2} {3}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,Llogaritë bankare
@@ -1334,20 +1289,19 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Amounts not reflected in bank,Shuma nuk pasqyrohet në bankë
 DocType: Quality Inspection Reading,Reading 4,Leximi 4
 apps/erpnext/erpnext/config/hr.py +23,Claims for company expense.,Kërkesat për shpenzimet e kompanisë.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +8,Centrifugal casting,Hedh centrifugale
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +119,Magnetic field-assisted finishing,Magnetike fushë-asistuar mbarimit
 DocType: Company,Default Holiday List,Default Festa Lista
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +165,Stock Liabilities,Stock Detyrimet
 DocType: Purchase Receipt,Supplier Warehouse,Furnizuesi Magazina
 DocType: Opportunity,Contact Mobile No,Kontaktoni Mobile Asnjë
 DocType: Production Planning Tool,Select Sales Orders,Zgjidh Sales urdhëron
 ,Material Requests for which Supplier Quotations are not created,Kërkesat materiale për të cilat Kuotimet Furnizuesi nuk janë krijuar
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +117,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,Dita (s) në të cilin ju po aplikoni për leje janë festa. Ju nuk duhet të aplikoni për leje.
 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.,Për të gjetur objekte duke përdorur barcode. Ju do të jenë në gjendje për të hyrë artikuj në Shënimin shitjes dhe ofrimit të Faturës nga skanimi barcode e sendit.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +477,Mark as Delivered,Mark si Dorëzuar
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +497,Mark as Delivered,Mark si Dorëzuar
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +34,Make Quotation,Bëni Kuotim
 DocType: Dependent Task,Dependent Task,Detyra e varur
-apps/erpnext/erpnext/stock/doctype/item/item.py +306,Conversion factor for default Unit of Measure must be 1 in row {0},Faktori i konvertimit për Njësinë e parazgjedhur të Masës duhet të jetë 1 në rreshtin e {0}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,Leave of type {0} cannot be longer than {1},Pushimi i tipit {0} nuk mund të jetë më i gjatë se {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +310,Conversion factor for default Unit of Measure must be 1 in row {0},Faktori i konvertimit për Njësinë e parazgjedhur të Masës duhet të jetë 1 në rreshtin e {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +155,Leave of type {0} cannot be longer than {1},Pushimi i tipit {0} nuk mund të jetë më i gjatë se {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Provoni planifikimin e operacioneve për ditë X paraprakisht.
 DocType: HR Settings,Stop Birthday Reminders,Stop Ditëlindja Harroni
 DocType: SMS Center,Receiver List,Marresit Lista
@@ -1355,15 +1309,14 @@
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Shuma konsumuar
 apps/erpnext/erpnext/public/js/pos/pos.js +491,{0} View,{0} Shiko
 DocType: Salary Structure Deduction,Salary Structure Deduction,Struktura e pagave Zbritje
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +158,Selective laser sintering,Sintering selektive lazer
-apps/erpnext/erpnext/stock/doctype/item/item.py +301,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Njësia e masës {0} ka hyrë më shumë se një herë në Konvertimi Faktori Tabelën
+apps/erpnext/erpnext/stock/doctype/item/item.py +305,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Njësia e masës {0} ka hyrë më shumë se një herë në Konvertimi Faktori Tabelën
 apps/frappe/frappe/core/page/data_import_tool/data_import_tool.js +108,Import Successful!,Importi i suksesshëm!
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Kostoja e Artikujve emetuara
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +185,Quantity must not be more than {0},Sasia nuk duhet të jetë më shumë se {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +41,Age (Days),Mosha (ditë)
 DocType: Quotation Item,Quotation Item,Citat Item
 DocType: Account,Account Name,Emri i llogarisë
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +41,From Date cannot be greater than To Date,Nga Data nuk mund të jetë më i madh se deri më sot
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +34,From Date cannot be greater than To Date,Nga Data nuk mund të jetë më i madh se deri më sot
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +194,Serial No {0} quantity {1} cannot be a fraction,Serial No {0} sasi {1} nuk mund të jetë një pjesë
 apps/erpnext/erpnext/config/buying.py +59,Supplier Type master.,Furnizuesi Lloji mjeshtër.
 DocType: Purchase Order Item,Supplier Part Number,Furnizuesi Pjesa Numër
@@ -1372,14 +1325,14 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +247,{0} {1} is cancelled or stopped,{0} {1} është anuluar ose ndaluar
 DocType: Accounts Settings,Credit Controller,Kontrolluesi krediti
 DocType: Delivery Note,Vehicle Dispatch Date,Automjeteve Dërgimi Data
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +197,Purchase Receipt {0} is not submitted,Blerje Pranimi {0} nuk është dorëzuar
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +198,Purchase Receipt {0} is not submitted,Blerje Pranimi {0} nuk është dorëzuar
 DocType: Company,Default Payable Account,Gabim Llogaria pagueshme
 apps/erpnext/erpnext/config/website.py +13,"Settings for online shopping cart such as shipping rules, price list etc.","Cilësimet për internet shopping cart tilla si rregullat e transportit detar, lista e çmimeve etj"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +660,Setup Complete,Setup Complete
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +124,Setup Complete,Setup Complete
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +65,{0}% Billed,{0}% faturuar
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +17,Reserved Qty,Qty rezervuara
 DocType: Party Account,Party Account,Llogaria Partia
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +74,Human Resources,Burimeve Njerëzore
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +74,Human Resources,Burimeve Njerëzore
 DocType: Lead,Upper Income,Të ardhurat e sipërme
 DocType: Journal Entry Account,Debit in Company Currency,Debit në kompanisë Valuta
 apps/erpnext/erpnext/support/doctype/issue/issue.py +58,My Issues,Çështjet e mia
@@ -1388,11 +1341,9 @@
 DocType: Company,Default Values,Vlerat Default
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +236,Row {0}: Payment amount can not be negative,Row {0}: Shuma e pagesës nuk mund të jetë negative
 DocType: Expense Claim,Total Amount Reimbursed,Shuma totale rimbursohen
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +152,Press fitting,Montim shtyp
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +64,Against Supplier Invoice {0} dated {1},Kundër Furnizuesin Fatura {0} datë {1}
 DocType: Customer,Default Price List,E albumit Lista e Çmimeve
 DocType: Payment Reconciliation,Payments,Pagesat
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +24,Hot isostatic pressing,Hot isostatic ngutshme
 DocType: ToDo,Medium,Medium
 DocType: Budget Detail,Budget Allocated,Buxheti i alokuar
 DocType: Journal Entry,Entry Type,Hyrja Lloji
@@ -1405,9 +1356,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +56,None of the items have any change in quantity or value.,Asnjë nga pikat ketë ndonjë ndryshim në sasi ose vlerë.
 DocType: Warranty Claim,Warranty Claim,Garanci Claim
 ,Lead Details,Detajet Lead
-DocType: Authorization Rule,Approving User,Miratimi i përdoruesit
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +37,Forging,Falsifikim
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +126,Plating,Plating
 DocType: Purchase Invoice,End date of current invoice's period,Data e fundit e periudhës së fatura aktual
 DocType: Pricing Rule,Applicable For,Të zbatueshme për
 DocType: Bank Reconciliation,From Date,Nga Data
@@ -1429,31 +1377,29 @@
 DocType: Sales Invoice,Paid Amount (Company Currency),Paid Shuma (Kompania Valuta)
 DocType: Purchase Invoice,Additional Discount,Discount shtesë
 DocType: Selling Settings,Selling Settings,Shitja Settings
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +39,Online Auctions,Auctions Online
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,Auctions Online
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +94,Please specify either Quantity or Valuation Rate or both,Ju lutem specifikoni ose Sasia apo vlerësimin Vlerësoni apo të dyja
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +50,"Company, Month and Fiscal Year is mandatory","Kompani, muaji dhe viti fiskal është i detyrueshëm"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Marketing Expenses,Shpenzimet e marketingut
 ,Item Shortage Report,Item Mungesa Raport
-apps/erpnext/erpnext/stock/doctype/item/item.js +183,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Pesha është përmendur, \ nJu lutemi të përmendim &quot;Weight UOM&quot; shumë"
+apps/erpnext/erpnext/stock/doctype/item/item.js +185,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Pesha është përmendur, \ nJu lutemi të përmendim &quot;Weight UOM&quot; shumë"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,Kërkesa material përdoret për të bërë këtë Stock Hyrja
 apps/erpnext/erpnext/config/support.py +43,Single unit of an Item.,Njësi e vetme e një artikulli.
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +212,Time Log Batch {0} must be 'Submitted',Koha Identifikohu Batch {0} duhet të jetë &#39;Dërguar&#39;
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,Bëni hyrje të kontabilitetit për çdo veprim Stock
 DocType: Leave Allocation,Total Leaves Allocated,Totali Lë alokuar
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +384,Warehouse required at Row No {0},Magazina kërkohet në radhë nr {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +386,Warehouse required at Row No {0},Magazina kërkohet në radhë nr {0}
 DocType: Employee,Date Of Retirement,Data e daljes në pension
 DocType: Upload Attendance,Get Template,Get Template
 DocType: Address,Postal,Postar
 DocType: Item,Weightage,Weightage
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +159,Mining,Miniere
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +17,Resin casting,Hedh rrëshirë
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"Një grup të konsumatorëve ekziston me të njëjtin emër, ju lutem të ndryshojë emrin Customer ose riemërtoni grup të konsumatorëve"
 apps/erpnext/erpnext/public/js/pos/pos.js +147,Please select {0} first.,"Ju lutem, përzgjidhni {0} parë."
 apps/erpnext/erpnext/templates/pages/order.html +57,text {0},Teksti {0}
 DocType: Territory,Parent Territory,Territori prind
 DocType: Quality Inspection Reading,Reading 2,Leximi 2
 DocType: Stock Entry,Material Receipt,Pranimi materiale
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +622,Products,Produkte
+apps/erpnext/erpnext/public/js/setup_wizard.js +358,Products,Produkte
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +47,Party Type and Party is required for Receivable / Payable account {0},Partia Lloji dhe Partia është e nevojshme për arkëtueshme / pagueshme llogarisë {0}
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.","Nëse ky artikull ka variante, atëherë ajo nuk mund të zgjidhen në shitje urdhrat etj"
 DocType: Lead,Next Contact By,Kontakt Next By
@@ -1463,13 +1409,13 @@
 DocType: Purchase Invoice,Notification Email Address,Njoftimi Email Adresa
 DocType: Payment Tool,Find Invoices to Match,Gjej Faturat për ndeshjen
 ,Item-wise Sales Register,Pika-mençur Sales Regjistrohu
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +399,"e.g. ""XYZ National Bank""",p.sh. &quot;XYZ Banka Kombëtare&quot;
+apps/erpnext/erpnext/public/js/setup_wizard.js +147,"e.g. ""XYZ National Bank""",p.sh. &quot;XYZ Banka Kombëtare&quot;
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,A është kjo Tatimore të përfshira në normën bazë?
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +57,Total Target,Target Total
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Target,Target Total
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.js +22,Shopping Cart is enabled,Shporta është aktivizuar
 DocType: Job Applicant,Applicant for a Job,Aplikuesi për një punë
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +173,No Production Orders created,Nuk urdhërat e prodhimit të krijuara
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +131,Salary Slip of employee {0} already created for this month,Shqip paga e punëtorit {0} krijuar tashmë për këtë muaj
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +140,Salary Slip of employee {0} already created for this month,Shqip paga e punëtorit {0} krijuar tashmë për këtë muaj
 DocType: Stock Reconciliation,Reconciliation JSON,Pajtimi JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Shumë kolona. Eksportit raportin dhe të shtypura duke përdorur një aplikim spreadsheet.
 DocType: Sales Invoice Item,Batch No,Batch Asnjë
@@ -1479,14 +1425,14 @@
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +13,Variant,Variant
 apps/frappe/frappe/public/js/frappe/form/toolbar.js +165,New {0},New {0}
 DocType: Naming Series,Set prefix for numbering series on your transactions,Prefiksi vendosur për numëron seri mbi transaksionet tuaja
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +169,Stopped order cannot be cancelled. Unstop to cancel.,Urdhri u ndal nuk mund të anulohet. Heq tapën për të anulluar.
-apps/erpnext/erpnext/stock/doctype/item/item.py +323,Default BOM ({0}) must be active for this item or its template,Gabim BOM ({0}) duhet të jetë aktiv për këtë artikull ose template saj
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +164,Stopped order cannot be cancelled. Unstop to cancel.,Urdhri u ndal nuk mund të anulohet. Heq tapën për të anulluar.
+apps/erpnext/erpnext/stock/doctype/item/item.py +327,Default BOM ({0}) must be active for this item or its template,Gabim BOM ({0}) duhet të jetë aktiv për këtë artikull ose template saj
 DocType: Employee,Leave Encashed?,Dërgo arkëtuar?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Opportunity Nga fushë është e detyrueshme
 DocType: Item,Variants,Variantet
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +458,Make Purchase Order,Bëni Rendit Blerje
 DocType: SMS Center,Send To,Send To
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +111,There is not enough leave balance for Leave Type {0},Nuk ka bilanc mjaft leje për pushim Lloji {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +127,There is not enough leave balance for Leave Type {0},Nuk ka bilanc mjaft leje për pushim Lloji {0}
 DocType: Sales Team,Contribution to Net Total,Kontributi në Net Total
 DocType: Sales Invoice Item,Customer's Item Code,Item Kodi konsumatorit
 DocType: Stock Reconciliation,Stock Reconciliation,Stock Pajtimit
@@ -1523,11 +1469,11 @@
 DocType: Sales Order Item,Actual Qty,Aktuale Qty
 DocType: Sales Invoice Item,References,Referencat
 DocType: Quality Inspection Reading,Reading 10,Leximi 10
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +612,"List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start.","Lista produktet ose shërbimet tuaja që ju të blerë ose shitur. Sigurohuni që të kontrolloni Grupin artikull, Njësia e masës dhe pronat e tjera, kur ju filloni."
+apps/erpnext/erpnext/public/js/setup_wizard.js +348,"List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start.","Lista produktet ose shërbimet tuaja që ju të blerë ose shitur. Sigurohuni që të kontrolloni Grupin artikull, Njësia e masës dhe pronat e tjera, kur ju filloni."
 DocType: Hub Settings,Hub Node,Hub Nyja
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,Ju keni hyrë artikuj kopjuar. Ju lutemi të ndrequr dhe provoni përsëri.
 apps/erpnext/erpnext/controllers/item_variant.py +65,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values,Vlera {0} për Atributit {1} nuk ekziston në listën e artikullit vlefshme Atributeve Vlerat
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +87,Associate,Koleg
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Associate,Koleg
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +46,Item {0} is not a serialized Item,Item {0} nuk është një Item serialized
 DocType: SMS Center,Create Receiver List,Krijo Marresit Lista
 apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +5,Expired,Skaduar
@@ -1536,7 +1482,7 @@
 DocType: Warranty Claim,Issue Date,Çështja Data
 DocType: Activity Cost,Activity Cost,Kosto Aktiviteti
 DocType: Purchase Receipt Item Supplied,Consumed Qty,Konsumuar Qty
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +52,Telecommunications,Telekomunikacionit
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +52,Telecommunications,Telekomunikacionit
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),Tregon se paketa është pjesë e këtij ofrimit (Vetëm draft)
 DocType: Payment Tool,Make Payment Entry,Kryej pagesa Hyrja
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +119,Quantity for Item {0} must be less than {1},Sasia e artikullit {0} duhet të jetë më pak se {1}
@@ -1553,10 +1499,8 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +37,"Selling must be checked, if Applicable For is selected as {0}","Shitja duhet të kontrollohet, nëse është e aplikueshme për të është zgjedhur si {0}"
 DocType: Purchase Order Item,Supplier Quotation Item,Citat Furnizuesi Item
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +27,Make Salary Structure,Bëni strukturën e pagave
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +54,Shearing,Krasitje
 DocType: Item,Has Variants,Ka Variantet
 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.,Klikoni mbi &#39;të shitjes Faturë &quot;butonin për të krijuar një Sales re Faturë.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +166,Packaging and labeling,Paketimin dhe etiketimin
 DocType: Monthly Distribution,Name of the Monthly Distribution,Emri i Shpërndarjes Mujore
 DocType: Sales Person,Parent Sales Person,Shitjet prind Person
 apps/erpnext/erpnext/setup/utils.py +14,Please specify Default Currency in Company Master and Global Defaults,Ju lutem specifikoni albumit Valuta në kompaninë Master dhe Defaults Global
@@ -1567,19 +1511,18 @@
 DocType: Budget Detail,Fiscal Year,Viti Fiskal
 DocType: Cost Center,Budget,Buxhet
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +41,"Budget cannot be assigned against {0}, as it's not an Income or Expense account","Buxheti nuk mund të caktohet {0} kundër, pasi kjo nuk është një llogari të ardhura ose shpenzime"
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Achieved,Arritur
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,Arritur
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +65,Territory / Customer,Territori / Customer
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,e.g. 5,p.sh. 5
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +207,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},Row {0}: Shuma e ndarë {1} duhet të jetë më pak se ose e barabartë me shumën e faturës papaguar {2}
+apps/erpnext/erpnext/public/js/setup_wizard.js +294,e.g. 5,p.sh. 5
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},Row {0}: Shuma e ndarë {1} duhet të jetë më pak se ose e barabartë me shumën e faturës papaguar {2}
 DocType: Sales Invoice,In Words will be visible once you save the Sales Invoice.,Me fjalë do të jetë i dukshëm një herë ju ruani Sales Faturë.
 DocType: Item,Is Sales Item,Është Item Sales
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,Item Group Tree
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,Item {0} nuk është setup për Serial Nr. Kontrolloni mjeshtër Item
 DocType: Maintenance Visit,Maintenance Time,Mirëmbajtja Koha
 ,Amount to Deliver,Shuma për të Ofruar
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +620,A Product or Service,Një produkt apo shërbim
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +158,There were errors.,Ka pasur gabime.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +101,Tapping,Prerje
+apps/erpnext/erpnext/public/js/setup_wizard.js +356,A Product or Service,Një produkt apo shërbim
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +146,There were errors.,Ka pasur gabime.
 DocType: Naming Series,Current Value,Vlera e tanishme
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +171,{0} created,{0} krijuar
 DocType: Delivery Note Item,Against Sales Order,Kundër Sales Rendit
@@ -1593,7 +1536,7 @@
 apps/erpnext/erpnext/accounts/party.py +275,Due Date cannot be before Posting Date,Për shkak Data nuk mund të jetë para se të postimi Data
 DocType: Website Item Group,Website Item Group,Faqja kryesore Item Grupi
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Duties and Taxes,Detyrat dhe Taksat
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Please enter Reference date,Ju lutem shkruani datën Reference
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +312,Please enter Reference date,Ju lutem shkruani datën Reference
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} shënimet e pagesës nuk mund të filtrohen nga {1}
 DocType: Item Website Specification,Table for Item that will be shown in Web Site,Tabela për çështje që do të shfaqet në Web Site
 DocType: Purchase Order Item Supplied,Supplied Qty,Furnizuar Qty
@@ -1601,7 +1544,7 @@
 apps/erpnext/erpnext/config/stock.py +103,Tree of Item Groups.,Pema e sendit grupeve.
 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,"Nuk mund t&#39;i referohet numrit rresht më të madhe se, ose të barabartë me numrin e tanishëm rresht për këtë lloj Ngarkesa"
 ,Item-wise Purchase History,Historia Blerje pika-mençur
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +152,Red,I kuq
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Red,I kuq
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +228,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},Ju lutem klikoni në &quot;Generate&quot; Listën për të shkoj të marr Serial Asnjë shtuar për Item {0}
 DocType: Account,Frozen,I ngrirë
 ,Open Production Orders,Urdhërat e hapur e prodhimit
@@ -1616,7 +1559,7 @@
 DocType: Item Attribute,Attribute Name,Atribut Emri
 apps/erpnext/erpnext/controllers/selling_controller.py +236,Item {0} must be Sales or Service Item in {1},Item {0} duhet të jetë i Sales ose shërbimi i artikullit në {1}
 DocType: Item Group,Show In Website,Shfaq Në Website
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +621,Group,Grup
+apps/erpnext/erpnext/public/js/setup_wizard.js +357,Group,Grup
 DocType: Task,Expected Time (in hours),Koha pritet (në orë)
 ,Qty to Order,Qty të Rendit
 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","Për të gjetur emrin e markës në Shënimin dokumentet e mëposhtme për dorëzim, Mundësi, Kërkesë materiale, Item, Rendit Blerje, Blerje Bonon, blerësi pranimin, citat, Sales Fatura, Produkt Bundle, Sales Rendit, Serial Asnjë"
@@ -1626,6 +1569,7 @@
 DocType: Features Setup,Brands,Markat
 DocType: C-Form Invoice Detail,Invoice No,Fatura Asnjë
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +480,From Purchase Order,Nga Rendit Blerje
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +92,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Lini nuk mund të zbatohet / anulohet {0} para, si bilanci leja ka qenë tashmë copë dërgohet në regjistrin e ardhshëm alokimit Pushimi {1}"
 DocType: Activity Cost,Costing Rate,Kushton Rate
 ,Customer Addresses And Contacts,Adresat dhe kontaktet Customer
 DocType: Employee,Resignation Letter Date,Dorëheqja Letër Data
@@ -1633,35 +1577,31 @@
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +137,Not Set,Nuk është caktuar
 DocType: Communication,Date,Data
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,Përsëriteni ardhurat Klientit
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +651,Sit tight while your system is being setup. This may take a few moments.,Uluni të shtrënguar ndërsa sistemi juaj është duke u Setup. Kjo mund të marrë disa momente.
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +115,Sit tight while your system is being setup. This may take a few moments.,Uluni të shtrënguar ndërsa sistemi juaj është duke u Setup. Kjo mund të marrë disa momente.
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +51,{0} ({1}) must have role 'Expense Approver',{0} ({1}) duhet të ketë rol &#39;aprovuesi kurriz&#39;
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Pair,Palë
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Pair,Palë
 DocType: Bank Reconciliation Detail,Against Account,Kundër Llogaria
 DocType: Maintenance Schedule Detail,Actual Date,Aktuale Data
 DocType: Item,Has Batch No,Ka Serisë Asnjë
 DocType: Delivery Note,Excise Page Number,Akciza Faqja Numër
 DocType: Employee,Personal Details,Detajet personale
 ,Maintenance Schedules,Mirëmbajtja Oraret
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +44,Embossing,Embossing
 ,Quotation Trends,Kuotimit Trendet
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +139,Item Group not mentioned in item master for item {0},Grupi pika nuk përmendet në pikën për të zotëruar pikën {0}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +302,Debit To account must be a Receivable account,Debiti te llogaria duhet të jetë një llogari të arkëtueshme
-apps/erpnext/erpnext/stock/doctype/item/item.py +310,"As Production Order can be made for this item, it must be a stock item.","Si mund të bëhet Urdhër prodhimit për këtë artikull, ajo duhet të jetë një çështje e aksioneve."
 DocType: Shipping Rule Condition,Shipping Amount,Shuma e anijeve
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +140,Joining,Bashkim
-DocType: Authorization Rule,Above Value,Mbi Vlerën
 ,Pending Amount,Në pritje Shuma
 DocType: Purchase Invoice Item,Conversion Factor,Konvertimi Faktori
 DocType: Purchase Order,Delivered,Dorëzuar
 apps/erpnext/erpnext/config/hr.py +160,Setup incoming server for jobs email id. (e.g. jobs@example.com),Setup server hyrje për Punë email id. (P.sh. jobs@example.com)
 DocType: Purchase Receipt,Vehicle Number,Numri i Automjeteve
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,Data në të cilën përsëritura fatura do të ndalet
+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,Gjithsej gjethet e ndara {0} nuk mund të jetë më pak se gjethet tashmë të miratuara {1} për periudhën
 DocType: Journal Entry,Accounts Receivable,Llogaritë e arkëtueshme
 ,Supplier-Wise Sales Analytics,Furnizuesi-i mençur Sales Analytics
 DocType: Address Template,This format is used if country specific format is not found,Ky format përdoret në qoftë se format specifik i vendit nuk është gjetur
 DocType: Custom Field,Custom,Me porosi
 DocType: Production Order,Use Multi-Level BOM,Përdorni Multi-Level bom
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +26,Injection molding,I derdhur injeksion
 DocType: Bank Reconciliation,Include Reconciled Entries,Përfshini gjitha pajtuar
 apps/erpnext/erpnext/config/accounts.py +41,Tree of finanial accounts.,Pema e llogarive finanial.
 DocType: Leave Control Panel,Leave blank if considered for all employee types,Lini bosh nëse konsiderohet për të gjitha llojet e punonjësve
@@ -1671,30 +1611,28 @@
 apps/frappe/frappe/config/setup.py +130,Printing,Shtypje
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +114,Expense Claim is pending approval. Only the Expense Approver can update status.,Shpenzim Kërkesa është në pritje të miratimit. Vetëm aprovuesi shpenzimeve mund update statusin.
 DocType: Purchase Invoice,Additional Discount Amount,Shtesë Shuma Discount
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +99,The day(s) on which you are applying for leave are holiday. You need not apply for leave.,Një ditë (s) në të cilin ju po aplikoni për leje janë pushime. Ju nuk duhet të aplikoni për leje.
 apps/frappe/frappe/public/js/frappe/misc/utils.js +110,and,dhe
 DocType: Leave Block List Allow,Leave Block List Allow,Dërgo Block Lista Lejoni
 apps/erpnext/erpnext/setup/doctype/company/company.py +236,Abbr can not be blank or space,Abbr nuk mund të jetë bosh ose hapësirë
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +50,Sports,Sportiv
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,Sportiv
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Actual,Gjithsej aktuale
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Unit,Njësi
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Unit,Njësi
 apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.py +182,Please set Dropbox access keys in your site config,Ju lutemi të vendosur çelësat Dropbox akses ne faqen config tuaj
 apps/erpnext/erpnext/stock/get_item_details.py +113,Please specify Company,Ju lutem specifikoni Company
 ,Customer Acquisition and Loyalty,Customer Blerja dhe Besnik
 DocType: Purchase Receipt,Warehouse where you are maintaining stock of rejected items,Magazina ku ju jeni mbajtjen e aksioneve të artikujve refuzuar
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +408,Your financial year ends on,Vitin e juaj financiare përfundon në
+apps/erpnext/erpnext/public/js/setup_wizard.js +156,Your financial year ends on,Vitin e juaj financiare përfundon në
 DocType: POS Profile,Price List,Tarifë
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +20,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0} është tani default Viti Fiskal. Ju lutemi të rifreskoni shfletuesin tuaj për ndryshim të hyjnë në fuqi.
 apps/erpnext/erpnext/projects/doctype/project/project.js +47,Expense Claims,Kërkesat e shpenzimeve
 DocType: Issue,Support,Mbështetje
-DocType: Authorization Rule,Approving Role,Miratimi Rolit
 ,BOM Search,Bom Kërko
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +176,Closing (Opening + Totals),Mbyllja (Hapja + arrin)
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +26,Please specify currency in Company,Ju lutem specifikoni monedhës në Kompaninë
 DocType: Workstation,Wages per hour,Rrogat në orë
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},Bilanci aksioneve në Serisë {0} do të bëhet negative {1} për Item {2} në {3} Magazina
 apps/erpnext/erpnext/config/setup.py +83,"Show / Hide features like Serial Nos, POS etc.","Trego / Fshih karakteristika si Serial Nr, POS etj"
-apps/erpnext/erpnext/controllers/accounts_controller.py +236,Account {0} is invalid. Account Currency must be {1},Llogari {0} është i pavlefshëm. Llogaria Valuta duhet të jetë {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +237,Account {0} is invalid. Account Currency must be {1},Llogari {0} është i pavlefshëm. Llogaria Valuta duhet të jetë {1}
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +34,UOM Conversion factor is required in row {0},Faktori UOM Konvertimi është e nevojshme në rresht {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +53,Clearance date cannot be before check date in row {0},Data Pastrimi nuk mund të jetë para datës Kontrolloni në rresht {0}
 DocType: Salary Slip,Deduction,Zbritje
@@ -1713,13 +1651,13 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +82,Item {0} has already been returned,Item {0} tashmë është kthyer
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** Viti Fiskal ** përfaqëson një viti financiar. Të gjitha shënimet e kontabilitetit dhe transaksionet tjera të mëdha janë gjurmuar kundër Vitit Fiskal ** **.
 DocType: Opportunity,Customer / Lead Address,Customer / Adresa Lead
+apps/erpnext/erpnext/stock/doctype/item/item.py +112,Warning: Invalid SSL certificate on attachment {0},Warning: certifikatë SSL Invalid në shtojcën {0}
 DocType: Production Order Operation,Actual Operation Time,Aktuale Operacioni Koha
 DocType: Authorization Rule,Applicable To (User),Për të zbatueshme (User)
 DocType: Purchase Taxes and Charges,Deduct,Zbres
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +170,Job Description,Përshkrimi i punës
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +170,Job Description,Përshkrimi i punës
 DocType: Purchase Order Item,Qty as per Stock UOM,Qty sipas Stock UOM
 apps/frappe/frappe/model/rename_doc.py +343,Please select a valid csv file with data,"Ju lutem, përzgjidhni një skedar CSV vlefshme me të dhënat"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +92,Coating,Shtresë
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +126,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Karaktere speciale përveç &quot;-&quot; &quot;.&quot;, &quot;#&quot;, dhe &quot;/&quot; nuk lejohet në emërtimin seri"
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Mbani gjurmët e Fushatave Sales. Mbani gjurmët e kryeson, citatet, Sales Rendit etj nga Fushata për të vlerësuar kthimit mbi investimin."
 DocType: Expense Claim,Approver,Aprovuesi
@@ -1729,12 +1667,11 @@
 DocType: Supplier Quotation,Manufacturing Manager,Prodhim Menaxher
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},Serial Asnjë {0} është nën garanci upto {1}
 apps/erpnext/erpnext/config/stock.py +69,Split Delivery Note into packages.,Shënim Split dorëzimit në pako.
-apps/erpnext/erpnext/hooks.py +84,Shipments,Dërgesat
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +29,Dip molding,Derdhur Dip
+apps/erpnext/erpnext/hooks.py +68,Shipments,Dërgesat
 DocType: Purchase Order,To be delivered to customer,Që do të dërgohen për të klientit
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,Koha Identifikohu Statusi duhet të dorëzohet.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,Serial Asnjë {0} nuk i përkasin ndonjë Magazina
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +650,Setting Up,Setting Up
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +114,Setting Up,Setting Up
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,Row # ,Row #
 DocType: Purchase Invoice,In Words (Company Currency),Me fjalë (Kompania Valuta)
 DocType: Pricing Rule,Supplier,Furnizuesi
@@ -1742,7 +1679,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +105,Miscellaneous Expenses,Shpenzimet Ndryshme
 DocType: Global Defaults,Default Company,Gabim i kompanisë
 apps/erpnext/erpnext/controllers/stock_controller.py +166,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,Shpenzim apo llogari Diferenca është e detyrueshme për Item {0} si ndikon vlerën e përgjithshme e aksioneve
-apps/erpnext/erpnext/controllers/accounts_controller.py +354,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","Nuk mund të overbill për Item {0} në {1} rresht më shumë se {2}. Për të lejuar overbilling, ju lutem vendosur në Stock Settings"
+apps/erpnext/erpnext/controllers/accounts_controller.py +355,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","Nuk mund të overbill për Item {0} në {1} rresht më shumë se {2}. Për të lejuar overbilling, ju lutem vendosur në Stock Settings"
 DocType: Employee,Bank Name,Emri i Bankës
 apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +27,-Above,-Siper
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +135,User {0} is disabled,Përdoruesi {0} është me aftësi të kufizuara
@@ -1755,27 +1692,26 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,{0} is mandatory for Item {1},{0} është e detyrueshme për Item {1}
 DocType: Currency Exchange,From Currency,Nga Valuta
 DocType: DocField,Name,Emër
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +211,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Ju lutem, përzgjidhni Shuma e ndarë, tip fature, si dhe numrin e faturës në atleast një rresht"
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +104,Sales Order required for Item {0},Rendit Shitjet e nevojshme për Item {0}
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +158,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Ju lutem, përzgjidhni Shuma e ndarë, tip fature, si dhe numrin e faturës në atleast një rresht"
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +107,Sales Order required for Item {0},Rendit Shitjet e nevojshme për Item {0}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +43,Amounts not reflected in system,Shuma nuk reflektohet në sistemin e
 DocType: Purchase Invoice Item,Rate (Company Currency),Shkalla (Kompania Valuta)
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +40,Others,Të tjerët
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +40,Others,Të tjerët
 apps/erpnext/erpnext/templates/includes/product_page.js +80,Cannot find a matching Item. Please select some other value for {0}.,Nuk mund të gjeni një përputhen Item. Ju lutem zgjidhni një vlerë tjetër {0} për.
 DocType: POS Profile,Taxes and Charges,Taksat dhe Tarifat
 DocType: Item,"A Product or a Service that is bought, sold or kept in stock.","Një produkt apo një shërbim që është blerë, shitur apo mbajtur në magazinë."
 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,Nuk mund të zgjidhni llojin e ngarkuar si &quot;Për Shuma Previous Row &#39;ose&#39; Në Previous Row Total&quot; për rreshtin e parë
 apps/frappe/frappe/core/doctype/doctype/boilerplate/controller_list.html +31,Completed,I përfunduar
 DocType: Web Form,Select DocType,Zgjidh DOCTYPE
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +104,Broaching,Broaching
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +12,Banking,Bankar
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,Bankar
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +38,Please click on 'Generate Schedule' to get schedule,Ju lutem klikoni në &quot;Generate&quot; Listën për të marrë orarin
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +283,New Cost Center,Qendra e re e kostos
 DocType: Bin,Ordered Quantity,Sasi të Urdhërohet
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +397,"e.g. ""Build tools for builders""",p.sh. &quot;Ndërtimi mjetet për ndërtuesit&quot;
+apps/erpnext/erpnext/public/js/setup_wizard.js +145,"e.g. ""Build tools for builders""",p.sh. &quot;Ndërtimi mjetet për ndërtuesit&quot;
 DocType: Quality Inspection,In Process,Në Procesin
 DocType: Authorization Rule,Itemwise Discount,Itemwise Discount
 DocType: Purchase Order Item,Reference Document Type,Referenca Document Type
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +318,{0} against Sales Order {1},{0} kundër Sales Rendit {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +320,{0} against Sales Order {1},{0} kundër Sales Rendit {1}
 DocType: Account,Fixed Asset,Aseteve fikse
 apps/erpnext/erpnext/config/stock.py +283,Serialized Inventory,Inventar serialized
 DocType: Activity Type,Default Billing Rate,Default Faturimi Vlerësoni
@@ -1790,14 +1726,13 @@
 DocType: Purchase Invoice Item,Page Break,Faqe Pushim
 DocType: Production Order Operation,Pending,Në pritje të
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,Përdoruesit të cilët mund të miratojë aplikacione të lënë një punonjës të veçantë për
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +33,You cannot change default UOM of Variant. To change default UOM for Variant change default UOM of the Template,Ju nuk mund të ndryshoni parazgjedhje UOM e Varianti. Për të ndryshuar parazgjedhje UOM për Variant ndryshim parazgjedhur UOM të Template
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +50,Office Equipments,Zyra Pajisje
 DocType: Purchase Invoice Item,Qty,Qty
 DocType: Fiscal Year,Companies,Kompanitë
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +24,Electronics,Elektronikë
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +24,Electronics,Elektronikë
 DocType: Stock Settings,Raise Material Request when stock reaches re-order level,Ngritja materiale Kërkesë kur bursës arrin nivel të ri-rendit
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +18,From Maintenance Schedule,Nga Mirëmbajtja Listën
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +56,Full-time,Me kohë të plotë
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +56,Full-time,Me kohë të plotë
 DocType: Purchase Invoice,Contact Details,Detajet Kontakt
 DocType: C-Form,Received Date,Data e marra
 DocType: Delivery Note,"If you have created a standard template in Sales Taxes and Charges Template, select one and click on the button below.","Nëse keni krijuar një template standarde në shitje taksave dhe detyrimeve Stampa, përzgjidh njërin dhe klikoni mbi butonin më poshtë."
@@ -1809,11 +1744,12 @@
 DocType: Job Applicant,Job Opening,Hapja Job
 DocType: Payment Reconciliation,Payment Reconciliation,Pajtimi Pagesa
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +154,Please select Incharge Person's name,"Ju lutem, përzgjidhni emrin incharge personi"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +51,Technology,Teknologji
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,Teknologji
 DocType: Offer Letter,Offer Letter,Oferta Letër
 apps/erpnext/erpnext/config/manufacturing.py +51,Generate Material Requests (MRP) and Production Orders.,Generate Kërkesat materiale (MRP) dhe urdhërat e prodhimit.
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +68,Total Invoiced Amt,Gjithsej faturuara Amt
 DocType: Time Log,To Time,Për Koha
+DocType: Authorization Rule,Approving Role (above authorized value),Miratimi Rolit (mbi vlerën e autorizuar)
 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.","Për të shtuar nyje fëmijë, të shqyrtojë pemë dhe klikoni në nyjen nën të cilën ju doni të shtoni më shumë nyje."
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +102,Credit To account must be a Payable account,Kredia për llogari duhet të jetë një llogari e pagueshme
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +233,BOM recursion: {0} cannot be parent or child of {2},BOM recursion: {0} nuk mund të jetë prindi ose fëmija i {2}
@@ -1826,10 +1762,8 @@
 DocType: Item,Customer Item Codes,Kodet Customer Item
 DocType: Opportunity,Lost Reason,Humbur Arsyeja
 apps/erpnext/erpnext/config/accounts.py +68,Create Payment Entries against Orders or Invoices.,Krijo Entries pagesës ndaj urdhrave ose faturave.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +141,Welding,Saldim
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +40,New Stock UOM is required,New Stock UOM është e nevojshme
 DocType: Quality Inspection,Sample Size,Shembull Madhësi
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +443,All items have already been invoiced,Të gjitha sendet janë tashmë faturohen
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +446,All items have already been invoiced,Të gjitha sendet janë tashmë faturohen
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',Ju lutem specifikoni një të vlefshme &#39;nga rasti Jo&#39;
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +287,Further cost centers can be made under Groups but entries can be made against non-Groups,Qendrat e mëtejshme e kostos mund të bëhet në bazë të Grupeve por hyra mund të bëhet kundër jo-grupeve
 DocType: Project,External,I jashtëm
@@ -1841,8 +1775,7 @@
 DocType: Bin,Actual Quantity,Sasia aktuale
 DocType: Shipping Rule,example: Next Day Shipping,shembull: Transporti Dita e ardhshme
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,Serial Asnjë {0} nuk u gjet
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +563,Your Customers,Konsumatorët tuaj
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +27,Compression molding,Derdhur Compression
+apps/erpnext/erpnext/public/js/setup_wizard.js +303,Your Customers,Konsumatorët tuaj
 DocType: Leave Block List Date,Block Date,Data bllok
 DocType: Sales Order,Not Delivered,Jo Dorëzuar
 ,Bank Clearance Summary,Pastrimi Përmbledhje Banka
@@ -1863,10 +1796,10 @@
 DocType: SMS Log,Sent To,Dërguar në
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +28,Make Sales Invoice,Bëni Sales Faturë
 DocType: Company,For Reference Only.,Vetëm për referencë.
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +29,Invalid {0}: {1},Invalid {0}: {1}
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +49,Invalid {0}: {1},Invalid {0}: {1}
 DocType: Sales Invoice Advance,Advance Amount,Advance Shuma
 DocType: Manufacturing Settings,Capacity Planning,Planifikimi i kapacitetit
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +49,'From Date' is required,&#39;Nga Data &quot;është e nevojshme
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +43,'From Date' is required,&#39;Nga Data &quot;është e nevojshme
 DocType: Journal Entry,Reference Number,Numri i referencës
 DocType: Employee,Employment Details,Detajet e punësimit
 DocType: Employee,New Workplace,New Workplace
@@ -1881,7 +1814,7 @@
 DocType: Serial No,Delivery Time,Koha e dorëzimit
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Plakjen Bazuar Në
 DocType: Item,End of Life,Fundi i jetës
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +41,Travel,Udhëtim
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +41,Travel,Udhëtim
 DocType: Leave Block List,Allow Users,Lejojnë përdoruesit
 DocType: Purchase Order,Customer Mobile No,Customer Mobile Asnjë
 DocType: Sales Invoice,Recurring,Periodik
@@ -1895,7 +1828,7 @@
 DocType: Naming Series,User must always select,Përdoruesi duhet të zgjidhni gjithmonë
 DocType: Stock Settings,Allow Negative Stock,Lejo Negativ Stock
 DocType: Installation Note,Installation Note,Instalimi Shënim
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +541,Add Taxes,Shto Tatimet
+apps/erpnext/erpnext/public/js/setup_wizard.js +283,Add Taxes,Shto Tatimet
 ,Financial Analytics,Analytics Financiare
 DocType: Quality Inspection,Verified By,Verifikuar nga
 DocType: Address,Subsidiary,Ndihmës
@@ -1905,7 +1838,6 @@
 DocType: System Settings,In Hours,Në orët
 DocType: Process Payroll,Create Salary Slip,Krijo Kuponi pagave
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Expected balance as per bank,Bilanci pritet si për banka
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +115,Buffing,Buffing
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Source of Funds (Liabilities),Burimi i Fondeve (obligimeve) të papaguara
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +347,Quantity in row {0} ({1}) must be same as manufactured quantity {2},Sasia në rresht {0} ({1}) duhet të jetë e njëjtë me sasinë e prodhuar {2}
 DocType: Appraisal,Employee,Punonjës
@@ -1922,11 +1854,11 @@
 DocType: Rename Tool,File to Rename,Paraqesë për Rename
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +176,Purchse Order number required for Item {0},Numri i purchse Rendit nevojshme për Item {0}
 apps/erpnext/erpnext/public/js/controllers/transaction.js +136,Show Payments,Trego Pagesat
-apps/erpnext/erpnext/controllers/buying_controller.py +245,Specified BOM {0} does not exist for Item {1},Specifikuar BOM {0} nuk ekziston për Item {1}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +202,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Mirëmbajtja Orari {0} duhet të anulohet para se anulimi këtë Radhit Sales
+apps/erpnext/erpnext/controllers/buying_controller.py +236,Specified BOM {0} does not exist for Item {1},Specifikuar BOM {0} nuk ekziston për Item {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Mirëmbajtja Orari {0} duhet të anulohet para se anulimi këtë Radhit Sales
 apps/frappe/frappe/desk/page/backups/backups.html +13,Size,Madhësi
 DocType: Notification Control,Expense Claim Approved,Shpenzim Kërkesa Miratuar
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +113,Pharmaceutical,Farmaceutike
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Pharmaceutical,Farmaceutike
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,Kostoja e artikujve të blerë
 DocType: Selling Settings,Sales Order Required,Sales Rendit kërkuar
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +30,Create Customer,Krijo Customer
@@ -1936,7 +1868,6 @@
 DocType: Quality Inspection Reading,Reading 9,Leximi 9
 DocType: Supplier,Is Frozen,Është ngrira
 DocType: Buying Settings,Buying Settings,Blerja Cilësimet
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +122,Mass finishing,Mass mbarimit
 DocType: Stock Entry Detail,BOM No. for a Finished Good Item,BOM Jo për një artikull përfundoi mirë
 DocType: Upload Attendance,Attendance To Date,Pjesëmarrja në datën
 apps/erpnext/erpnext/config/selling.py +158,Setup incoming server for sales email id. (e.g. sales@example.com),Setup server hyrje për shitjet email id. (P.sh. sales@example.com)
@@ -1944,7 +1875,7 @@
 DocType: Payment Tool,Payment Account,Llogaria e pagesës
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +713,Please specify Company to proceed,Ju lutemi specifikoni kompanisë për të vazhduar
 apps/frappe/frappe/public/js/frappe/model/indicator.js +30,Draft,Draft
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +46,Compensatory Off,Kompensues Off
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Compensatory Off,Kompensues Off
 DocType: Quality Inspection Reading,Accepted,Pranuar
 DocType: User,Female,Femër
 DocType: Journal Entry Account,Debit in Account Currency,Debi në llogarinë në valutë
@@ -1956,7 +1887,7 @@
 DocType: Shipping Rule,Shipping Rule Label,Rregulla Transporti Label
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +209,Raw Materials cannot be blank.,Lëndëve të para nuk mund të jetë bosh.
 DocType: Newsletter,Test,Provë
-apps/erpnext/erpnext/stock/doctype/item/item.py +364,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +368,"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'","Si ka transaksione ekzistuese të aksioneve për këtë artikull, \ ju nuk mund të ndryshojë vlerat e &#39;ka Serial&#39;, &#39;Has Serisë Jo&#39;, &#39;A Stock Item&#39; dhe &#39;Metoda Vlerësimi&#39;"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +448,Quick Journal Entry,Quick Journal Hyrja
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +92,You can not change rate if BOM mentioned agianst any item,Ju nuk mund të ndryshoni normës nëse bom përmendur agianst çdo send
@@ -1967,13 +1898,14 @@
 apps/erpnext/erpnext/config/stock.py +18,Requests for items.,Kërkesat për sendet.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,Mënyrë e veçantë prodhimi do të krijohen për secilin artikull përfunduar mirë.
 DocType: Purchase Invoice,Terms and Conditions1,Termat dhe Conditions1
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +18,Complete Setup,Setup Complete
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard_page.html +18,Complete Setup,Setup Complete
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","Rregjistrimi kontabël ngrirë deri në këtë datë, askush nuk mund të bëjë / modifikoj hyrjen përveç rolit të specifikuar më poshtë."
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +121,Please save the document before generating maintenance schedule,Ju lutemi ruani dokumentin para se të gjeneruar orar të mirëmbajtjes
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,Statusi i Projektit
 DocType: UOM,Check this to disallow fractions. (for Nos),Kontrolloni këtë për të moslejuar fraksionet. (Për Nos)
 apps/erpnext/erpnext/config/crm.py +96,Newsletter Mailing List,Newsletter Mailing List
 DocType: Delivery Note,Transporter Name,Transporter Emri
+DocType: Authorization Rule,Authorized Value,Vlera e autorizuar
 DocType: Contact,Enter department to which this Contact belongs,Shkruani departamentin për të cilin kjo Kontakt takon
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Absent,Gjithsej Mungon
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +746,Item or Warehouse for row {0} does not match Material Request,Item ose Magazina për rresht {0} nuk përputhet Materiale Kërkesë
@@ -1998,16 +1930,15 @@
 DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),Norma bazë (sipas Stock UOM)
 DocType: SMS Log,No of Requested SMS,Nr i SMS kërkuar
 DocType: Campaign,Campaign-.####,Fushata -. ####
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +55,Piercing,Depërtues
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,Hapat e ardhshëm
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +117,Contract End Date must be greater than Date of Joining,Kontrata Data e përfundimit duhet të jetë më i madh se data e bashkimit
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,Një shpërndarës i palës së tretë / tregtari / komision agjent / degë / reseller që shet produkte kompani për një komision.
 DocType: Customer Group,Has Child Node,Ka Nyja e fëmijëve
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{0} against Purchase Order {1},{0} kundër Rendit Blerje {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +332,{0} against Purchase Order {1},{0} kundër Rendit Blerje {1}
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","Shkruani parametrave statike url këtu (P.sh.. Dërguesi = ERPNext, emrin = ERPNext, fjalëkalimi = 1234, etj)"
 apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,{0} {1} jo në çdo Viti Fiskal aktive. Për më shumë detaje shikoni {2}.
-apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,Kjo është një website shembull auto-generated nga ERPNext
+apps/erpnext/erpnext/setup/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,Kjo është një website shembull auto-generated nga ERPNext
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +37,Ageing Range 1,Gama plakjen 1
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +110,Photochemical machining,Machining fotokimik
 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.
 
 #### Note
@@ -2033,7 +1964,7 @@
 DocType: Purchase Receipt Item,Recd Quantity,Recd Sasia
 DocType: Email Account,Email Ids,Email IDS
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},Nuk mund të prodhojë më shumë Item {0} se sasia Sales Rendit {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +471,Stock Entry {0} is not submitted,Stock Hyrja {0} nuk është dorëzuar
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +473,Stock Entry {0} is not submitted,Stock Hyrja {0} nuk është dorëzuar
 DocType: Payment Reconciliation,Bank / Cash Account,Llogarisë Bankare / Cash
 DocType: Tax Rule,Billing City,Faturimi i qytetit
 DocType: Global Defaults,Hide Currency Symbol,Fshih Valuta size
@@ -2049,7 +1980,7 @@
 DocType: Purchase Invoice,Currency and Price List,Valuta dhe Lista e Çmimeve
 DocType: Opportunity,Customer / Lead Name,Customer / Emri Lead
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +63,Clearance Date not mentioned,Pastrimi Data nuk përmendet
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +71,Production,Prodhim
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Production,Prodhim
 DocType: Item,Allow Production Order,Lejo Rendit Prodhimit
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +60,Row {0}:Start Date must be before End Date,Row {0}: Filloni Data duhet të jetë përpara End Date
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Gjithsej (Qty)
@@ -2062,7 +1993,7 @@
 apps/erpnext/erpnext/utilities/doctype/address/address.py +113,My Addresses,Adresat e mia
 DocType: Stock Ledger Entry,Outgoing Rate,Largohet Rate
 apps/erpnext/erpnext/config/hr.py +100,Organization branch master.,Mjeshtër degë organizatë.
-apps/erpnext/erpnext/controllers/accounts_controller.py +237, or ,ose
+apps/erpnext/erpnext/controllers/accounts_controller.py +238, or ,ose
 DocType: Sales Order,Billing Status,Faturimi Statusi
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Utility Expenses,Shpenzimet komunale
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,90-Above,90-Mbi
@@ -2089,6 +2020,7 @@
 DocType: Stock Entry Detail,Serial No / Batch,Serial No / Batch
 DocType: Product Bundle,Parent Item,Item prind
 DocType: Account,Account Type,Lloji i Llogarisë
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +113,Leave Type {0} cannot be carry-forwarded,"Dërgo Type {0} nuk mund të kryejë, përcillet"
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +213,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',Mirëmbajtja Orari nuk është krijuar për të gjitha sendet. Ju lutem klikoni në &quot;Generate Listën &#39;
 ,To Produce,Për të prodhuar
 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","Për rresht {0} në {1}. Të përfshijnë {2} në shkallën Item, {3} duhet të përfshihen edhe rreshtave"
@@ -2096,10 +2028,7 @@
 DocType: Bin,Reserved Quantity,Sasia e rezervuara
 DocType: Landed Cost Voucher,Purchase Receipt Items,Items Receipt Blerje
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,Format customizing
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +62,Cutting,Prerje
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +69,Flattening,Rrafshim
 DocType: Account,Income Account,Llogaria ardhurat
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +22,Molding,I derdhur
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +632,Delivery,Ofrimit të
 DocType: Stock Reconciliation Item,Current Qty,Qty tanishme
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",Shih &quot;Shkalla e materialeve në bazë të&quot; në nenin kushton
@@ -2109,19 +2038,18 @@
 apps/frappe/frappe/desk/moduleview.py +61,Documents,Dokumentet
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +17,Ref,Ref
 DocType: Cost Center,Cost Center,Qendra Kosto
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.js +48,Voucher #,Kupon #
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +36,Voucher #,Kupon #
 DocType: Notification Control,Purchase Order Message,Rendit Blerje mesazh
 DocType: Tax Rule,Shipping Country,Shipping Vendi
 DocType: Upload Attendance,Upload HTML,Ngarko HTML
-apps/erpnext/erpnext/controllers/accounts_controller.py +391,"Total advance ({0}) against Order {1} cannot be greater \
+apps/erpnext/erpnext/controllers/accounts_controller.py +392,"Total advance ({0}) against Order {1} cannot be greater \
 				than the Grand Total ({2})",Gjithsej paraprakisht ({0}) kundër Rendit {1} nuk mund të jetë më e madhe \ se Grand Total ({2})
 DocType: Employee,Relieving Date,Lehtësimin Data
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +12,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.","Rregulla e Çmimeve është bërë për të prishësh LISTA E ÇMIMEVE / definojnë përqindje zbritje, në bazë të disa kritereve."
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,Magazina mund të ndryshohet vetëm përmes Stock Hyrja / dorëzimit Shënim / Pranimi Blerje
 DocType: Employee Education,Class / Percentage,Klasa / Përqindja
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +92,Head of Marketing and Sales,Shef i Marketingut dhe Shitjes
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +31,Income Tax,Tatimi mbi të ardhurat
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +157,Laser engineered net shaping,Laser engineered neto formësimin
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Head of Marketing and Sales,Shef i Marketingut dhe Shitjes
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +31,Income Tax,Tatimi mbi të ardhurat
 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.","Nëse Rregulla zgjedhur Çmimeve është bërë për &#39;Çmimi&#39;, ajo do të prishësh listën e çmimeve. Çmimi Rregulla e Çmimeve është çmimi përfundimtar, kështu që nuk ka zbritje të mëtejshme duhet të zbatohet. Për këtë arsye, në transaksione si Sales Rendit, Rendit Blerje etj, ajo do të sjellë në fushën e &#39;norma&#39;, në vend se të fushës &quot;listën e çmimeve normë &#39;."
 apps/erpnext/erpnext/config/selling.py +163,Track Leads by Industry Type.,Track kryeson nga Industrisë Type.
 DocType: Item Supplier,Item Supplier,Item Furnizuesi
@@ -2144,31 +2072,28 @@
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Qty aktual Pas Transaksionit
 ,Pending SO Items For Purchase Request,Në pritje SO artikuj për Kërkesë Blerje
 DocType: Supplier,Billing Currency,Faturimi Valuta
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +148,Extra Large,Shumë i madh
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,Extra Large,Shumë i madh
 ,Profit and Loss Statement,Fitimi dhe Humbja Deklarata
 DocType: Bank Reconciliation Detail,Cheque Number,Numri çek
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +43,Pressing,I ngutshëm
 DocType: Payment Tool Detail,Payment Tool Detail,Detail Tool Pagesa
 ,Sales Browser,Shitjet Browser
 DocType: Journal Entry,Total Credit,Gjithsej Credit
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +474,Warning: Another {0} # {1} exists against stock entry {2},Warning: Një tjetër {0} # {1} ekziston kundër hyrjes aksioneve {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +459,Local,Lokal
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +476,Warning: Another {0} # {1} exists against stock entry {2},Warning: Një tjetër {0} # {1} ekziston kundër hyrjes aksioneve {2}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +397,Local,Lokal
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),Kreditë dhe paradhëniet (aktiveve)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,Debitorët
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +147,Large,I madh
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +23,No employee found!,Asnjë punonjës gjetur!
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Large,I madh
 DocType: C-Form Invoice Detail,Territory,Territor
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,Ju lutemi përmendni i vizitave të kërkuara
 DocType: Purchase Order,Customer Address Display,Customer Adresa Display
 DocType: Stock Settings,Default Valuation Method,Gabim Vlerësimi Metoda
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +127,Polishing,Lustrim
 DocType: Production Order Operation,Planned Start Time,Planifikuar Koha e fillimit
 apps/erpnext/erpnext/config/accounts.py +63,Close Balance Sheet and book Profit or Loss.,Mbylle Bilanci dhe Fitimi libër ose humbja.
-apps/erpnext/erpnext/stock/doctype/item/item.py +661,"Default Unit of Measure for Item {0} cannot be changed directly because \
+apps/erpnext/erpnext/stock/doctype/item/item.py +665,"Default Unit of Measure for Item {0} cannot be changed directly because \
 			you have already made some transaction(s) with another UOM. To change default UOM, \
 			use 'UOM Replace Utility' tool under Stock module.","Default njësinë e matjes për artikullit {0} nuk mund të ndryshohet drejtpërdrejt sepse \ keni bërë tashmë një transaksioni (et) me një tjetër UOM. Për të ndryshuar parazgjedhje UOM, \ përdorimi &#39;UOM Replace Utility&#39; mjet nën Stock modul."
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,Specifikoni Exchange Rate për të kthyer një monedhë në një tjetër
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +146,Quotation {0} is cancelled,Citat {0} është anuluar
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +141,Quotation {0} is cancelled,Citat {0} është anuluar
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,Shuma totale Outstanding
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} was on leave on {1}. Cannot mark attendance.,Punonjës {0} ka qenë në pushim në {1}. Nuk mund të shënojë pjesëmarrjen.
 DocType: Sales Partner,Targets,Synimet
@@ -2179,7 +2104,6 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +158,Please create Customer from Lead {0},Ju lutem të krijuar Customer nga Lead {0}
 DocType: Price List,Applicable for Countries,Të zbatueshme për vendet
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Computers,Kompjuter
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +112,Electro-chemical grinding,Elektro-kimike rëndë
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +14,This is a root customer group and cannot be edited.,Ky është një grup të konsumatorëve rrënjë dhe nuk mund të redaktohen.
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +39,Please setup your chart of accounts before you start Accounting Entries,Ju lutem Setup kartelën tuaj të llogarive të para se të fillojë regjistrimeve kontabël
 DocType: Purchase Invoice,Ignore Pricing Rule,Ignore Rregulla e Çmimeve
@@ -2225,7 +2149,6 @@
 DocType: Maintenance Visit,Purposes,Qëllimet
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +103,Atleast one item should be entered with negative quantity in return document,Atleast një artikull duhet të lidhet me sasinë negativ në dokumentin e kthimit
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +67,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","Operacioni {0} gjatë se çdo orë në dispozicion të punës në workstation {1}, prishen operacionin në operacione të shumta"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +134,Electrochemical machining,Përpunimit elektrokimik
 ,Requested,Kërkuar
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +66,No Remarks,Asnjë Vërejtje
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +13,Overdue,I vonuar
@@ -2234,7 +2157,7 @@
 DocType: Monthly Distribution,Distribution Name,Emri shpërndarja
 DocType: Features Setup,Sales and Purchase,Shitjet dhe Blerje
 DocType: Supplier Quotation Item,Material Request No,Materiali Kërkesë Asnjë
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +218,Quality Inspection required for Item {0},Inspektimi Cilësia e nevojshme për Item {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +221,Quality Inspection required for Item {0},Inspektimi Cilësia e nevojshme për Item {0}
 DocType: Quotation,Rate at which customer's currency is converted to company's base currency,Shkalla në të cilën konsumatori e valutës është e konvertuar në monedhën bazë kompanisë
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +107,{0} has been successfully unsubscribed from this list.,{0} ka qenë sukses unsubscribed nga kjo listë.
 DocType: Purchase Invoice Item,Net Rate (Company Currency),Net Rate (Kompania Valuta)
@@ -2252,9 +2175,8 @@
 apps/erpnext/erpnext/accounts/report/financial_statements.py +16,Fiscal Year {0} not found.,Viti Fiskal {0} nuk u gjet.
 DocType: Bank Reconciliation,Get Relevant Entries,Get gjitha relevante
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +407,Accounting Entry for Stock,Hyrja kontabilitetit për magazinë
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +64,Coining,Coining
 DocType: Sales Invoice,Sales Team1,Shitjet Team1
-apps/erpnext/erpnext/stock/doctype/item/item.py +412,Item {0} does not exist,Item {0} nuk ekziston
+apps/erpnext/erpnext/stock/doctype/item/item.py +416,Item {0} does not exist,Item {0} nuk ekziston
 DocType: Sales Invoice,Customer Address,Customer Adresa
 apps/frappe/frappe/desk/query_report.py +136,Total,Total
 DocType: Purchase Invoice,Apply Additional Discount On,Aplikoni shtesë zbritje në
@@ -2266,14 +2188,13 @@
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),Shuma e taksave Pas Shuma ulje (Kompania Valuta)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +149,Target warehouse is mandatory for row {0},Depo objektiv është i detyrueshëm për rresht {0}
 DocType: Quality Inspection,Quality Inspection,Cilësia Inspektimi
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +144,Extra Small,Extra Vogla
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +20,Spray forming,Spray formimin
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Extra Small,Extra Vogla
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +458,Warning: Material Requested Qty is less than Minimum Order Qty,Warning: Materiali kërkuar Qty është më pak se minimale Rendit Qty
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +191,Account {0} is frozen,Llogaria {0} është ngrirë
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Personit juridik / subsidiare me një tabelë të veçantë e llogarive i përkasin Organizatës.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +29,"Food, Beverage & Tobacco","Ushqim, Pije &amp; Duhani"
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","Ushqim, Pije &amp; Duhani"
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +20,PL or BS,PL ose BS
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,Can only make payment against unbilled {0},Vetëm mund të bëni pagesën kundër pafaturuar {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +531,Can only make payment against unbilled {0},Vetëm mund të bëni pagesën kundër pafaturuar {0}
 apps/erpnext/erpnext/controllers/selling_controller.py +122,Commission rate cannot be greater than 100,Shkalla e Komisionit nuk mund të jetë më e madhe se 100
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Minimum Inventory Level,Niveli minimal Inventari
 DocType: Stock Entry,Subcontract,Nënkontratë
@@ -2284,19 +2205,18 @@
 DocType: Item,Manufacturer Part Number,Prodhuesi Pjesa Numër
 DocType: Production Order Operation,Estimated Time and Cost,Koha e vlerësuar dhe Kosto
 DocType: Bin,Bin,Bin
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +50,Nosing,Nosing
 DocType: SMS Log,No of Sent SMS,Nr i SMS dërguar
 DocType: Account,Company,Kompani
 DocType: Account,Expense Account,Llogaria shpenzim
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +49,Software,Program
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +151,Colour,Ngjyra
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +49,Software,Program
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Colour,Ngjyra
 DocType: Maintenance Visit,Scheduled,Planifikuar
 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","Ju lutem zgjidhni Item ku &quot;A Stock Pika&quot; është &quot;Jo&quot; dhe &quot;është pika e shitjes&quot; është &quot;Po&quot;, dhe nuk ka asnjë tjetër Bundle Produktit"
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,Zgjidh Shpërndarja mujore të pabarabartë shpërndarë objektiva të gjithë muajve.
 DocType: Purchase Invoice Item,Valuation Rate,Vlerësimi Rate
 apps/erpnext/erpnext/stock/get_item_details.py +281,Price List Currency not selected,Lista e Çmimeve Valuta nuk zgjidhet
 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,Item Row {0}: Pranimi Blerje {1} nuk ekziston në tabelën e mësipërme &quot;Blerje Pranimet &#39;
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +134,Employee {0} has already applied for {1} between {2} and {3},Punonjës {0} ka aplikuar tashmë për {1} midis {2} dhe {3}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +145,Employee {0} has already applied for {1} between {2} and {3},Punonjës {0} ka aplikuar tashmë për {1} midis {2} dhe {3}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Projekti Data e Fillimit
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +8,Until,Deri
 DocType: Rename Tool,Rename Log,Rename Kyçu
@@ -2306,7 +2226,7 @@
 apps/erpnext/erpnext/controllers/recurring_document.py +162,Please select {0},"Ju lutem, përzgjidhni {0}"
 DocType: C-Form,C-Form No,C-Forma Nuk ka
 DocType: BOM,Exploded_items,Exploded_items
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +95,Researcher,Studiues
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Researcher,Studiues
 apps/frappe/frappe/custom/doctype/customize_form/customize_form.js +88,Update,Update
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +78,Please save the Newsletter before sending,Ju lutemi ruani Newsletter para se të dërgonte
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +23,Name or Email is mandatory,Emri ose adresa është e detyrueshme
@@ -2315,11 +2235,10 @@
 DocType: Employee,Exit,Dalje
 apps/erpnext/erpnext/accounts/doctype/account/account.py +134,Root Type is mandatory,Root Lloji është i detyrueshëm
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +295,Serial No {0} created,Serial Asnjë {0} krijuar
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +125,Vibratory finishing,Dridhës mbarimit
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","Për komoditetin e klientëve, këto kode mund të përdoren në formate të shtypura si faturat dhe ofrimit të shënimeve"
 DocType: Employee,You can enter any date manually,Ju mund të hyjë në çdo datë me dorë
 DocType: Sales Invoice,Advertisement,Reklamë
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +165,Probationary Period,Periudha provuese
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Probationary Period,Periudha provuese
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Vetëm nyjet fletë janë të lejuara në transaksion
 DocType: Expense Claim,Expense Approver,Shpenzim aprovuesi
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,Fatura Blerje Item furnizuar
@@ -2327,19 +2246,16 @@
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +17,To Datetime,Për datetime
 DocType: SMS Settings,SMS Gateway URL,SMS Gateway URL
 apps/erpnext/erpnext/config/crm.py +53,Logs for maintaining sms delivery status,Shkrime për ruajtjen e statusit të dorëzimit SMS
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +137,Grinding,Bluarje
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +34,Shrink wrapping,Tkurret mbështjellës
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +36,Pending Activities,Aktivitetet në pritje
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,Confirmed,I konfirmuar
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier > Supplier Type,Furnizuesi&gt; Furnizuesi Type
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +127,Please enter relieving date.,Ju lutemi të hyrë në lehtësimin datën.
 apps/erpnext/erpnext/controllers/trends.py +137,Amt,Sasia
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' can be submitted,Vetëm Dërgo Aplikacione me status &#39;miratuar&#39; mund të dorëzohet
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +51,Only Leave Applications with status 'Approved' can be submitted,Vetëm Dërgo Aplikacione me status &#39;miratuar&#39; mund të dorëzohet
 apps/erpnext/erpnext/utilities/doctype/address/address.py +21,Address Title is mandatory.,Adresa Titulli është i detyrueshëm.
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,Shkruani emrin e fushatës nëse burimi i hetimit është fushatë
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +38,Newspaper Publishers,Gazeta Botuesit
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +38,Newspaper Publishers,Gazeta Botuesit
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,Zgjidh Viti Fiskal
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +88,Smelting,Bashkëshkrirje
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Reorder Niveli
 DocType: Attendance,Attendance Date,Pjesëmarrja Data
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,Shpërbërjes paga në bazë të fituar dhe zbritje.
@@ -2354,16 +2270,15 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +414,[Error],[Gabim]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,Me fjalë do të jetë i dukshëm një herë ju ruani Rendit Sales.
 ,Employee Birthday,Punonjës Ditëlindja
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +55,Venture Capital,Venture Capital
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,Venture Capital
 DocType: UOM,Must be Whole Number,Duhet të jetë numër i plotë
 DocType: Leave Control Panel,New Leaves Allocated (In Days),Lë të reja alokuara (në ditë)
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +51,Serial No {0} does not exist,Serial Asnjë {0} nuk ekziston
 DocType: Pricing Rule,Discount Percentage,Përqindja Discount
 DocType: Payment Reconciliation Invoice,Invoice Number,Numri i faturës
-apps/erpnext/erpnext/hooks.py +70,Orders,Urdhërat
+apps/erpnext/erpnext/hooks.py +54,Orders,Urdhërat
 DocType: Leave Control Panel,Employee Type,Lloji punonjës
 DocType: Employee Leave Approver,Leave Approver,Lini aprovuesi
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +70,Swaging,Swaging
 DocType: Manufacturing Settings,Material Transferred for Manufacture,Material Transferuar për Prodhime
 DocType: Expense Claim,"A user with ""Expense Approver"" role",Një përdorues me &quot;Shpenzimi aprovuesi&quot; rolin
 ,Issued Items Against Production Order,Items lëshuara kundër rendit Production
@@ -2375,7 +2290,6 @@
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +62,Cost Center with existing transactions can not be converted to group,Qendra Kosto me transaksionet ekzistuese nuk mund të konvertohet në grup
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Depreciation,Amortizim
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Furnizuesi (s)
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +29,Invalid period,Periudha e pavlefshme
 DocType: Customer,Credit Limit,Limit Credit
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,Përzgjidhni llojin e transaksionit
 DocType: GL Entry,Voucher No,Voucher Asnjë
@@ -2385,9 +2299,9 @@
 DocType: Customer,Address and Contact,Adresa dhe Kontakt
 DocType: Customer,Last Day of the Next Month,Dita e fundit e muajit të ardhshëm
 DocType: Employee,Feedback,Reagim
+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}","Lënë nuk mund të ndahen përpara {0}, si bilanci leja ka qenë tashmë copë dërgohet në regjistrin e ardhshëm alokimit Pushimi {1}"
 apps/erpnext/erpnext/accounts/party.py +284,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Shënim: Për shkak / Data Referenca kalon lejuar ditët e kreditit të konsumatorëve nga {0} ditë (s)
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +621,Maint. Schedule,Maint. Orar
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +108,Abrasive jet machining,Përpunimit gërryes jet
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +632,Maint. Schedule,Maint. Orar
 DocType: Stock Settings,Freeze Stock Entries,Freeze Stock Entries
 DocType: Website Settings,Website Settings,Website Cilësimet
 DocType: Item,Reorder level based on Warehouse,Niveli Reorder bazuar në Magazina
@@ -2404,7 +2318,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +75,Show Stock Entries,Shfaq Stock Entries
 ,Is Primary Address,Është Adresimi Fillor
 DocType: Production Order,Work-in-Progress Warehouse,Puna në progres Magazina
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +308,Reference #{0} dated {1},Referenca # {0} datë {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Reference #{0} dated {1},Referenca # {0} datë {1}
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +13,Manage Addresses,Manage Adresat
 DocType: Pricing Rule,Item Code,Kodi i artikullit
 DocType: Production Planning Tool,Create Production Orders,Krijo urdhërat e prodhimit
@@ -2413,7 +2327,7 @@
 DocType: Lead,Market Segment,Segmenti i Tregut
 DocType: Communication,Phone,Telefon
 DocType: Employee Internal Work History,Employee Internal Work History,Punonjës historia e Brendshme
-apps/erpnext/erpnext/public/js/account_tree_grid.js +50,Closing (Dr),Mbyllja (Dr)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +221,Closing (Dr),Mbyllja (Dr)
 DocType: Contact,Passive,Pasiv
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,Serial Asnjë {0} nuk në magazinë
 apps/erpnext/erpnext/config/selling.py +127,Tax template for selling transactions.,Template taksave për shitjen e transaksioneve.
@@ -2429,8 +2343,8 @@
 ,Billed Amount,Shuma e faturuar
 DocType: Bank Reconciliation,Bank Reconciliation,Banka Pajtimit
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +9,Get Updates,Get Updates
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +129,Material Request {0} is cancelled or stopped,Materiali Kërkesë {0} është anuluar ose ndërprerë
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +641,Add a few sample records,Shto një pak të dhënat mostër
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +133,Material Request {0} is cancelled or stopped,Materiali Kërkesë {0} është anuluar ose ndërprerë
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Add a few sample records,Shto një pak të dhënat mostër
 apps/erpnext/erpnext/config/hr.py +210,Leave Management,Lini Menaxhimi
 DocType: Event,Groups,Grupet
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,Grupi nga Llogaria
@@ -2443,38 +2357,34 @@
 DocType: Features Setup,Sales Extras,Shitjet Extras
 apps/erpnext/erpnext/accounts/utils.py +344,{0} budget for Account {1} against Cost Center {2} will exceed by {3},{0} buxheti për llogaria {1} kundër Qendra Kosto {2} do të kalojë nga {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +236,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Llogaria ndryshim duhet të jetë një llogari lloj Aseteve / Detyrimeve, pasi kjo Stock Pajtimi është një Hyrja Hapja"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +138,Purchase Order number required for Item {0},Blerje numrin urdhër që nevojitet për artikullit {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Order number required for Item {0},Blerje numrin urdhër që nevojitet për artikullit {0}
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',&#39;Nga Data &quot;duhet të jetë pas&quot; deri më sot &quot;
 ,Stock Projected Qty,Stock Projektuar Qty
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +147,Customer {0} does not belong to project {1},Customer {0} nuk i përket projektit {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +150,Customer {0} does not belong to project {1},Customer {0} nuk i përket projektit {1}
 DocType: Sales Order,Customer's Purchase Order,Rendit Blerje konsumatorit
 DocType: Warranty Claim,From Company,Nga kompanisë
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,Vlera ose Qty
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Minute,Minutë
+apps/erpnext/erpnext/public/js/setup_wizard.js +363,Minute,Minutë
 DocType: Purchase Invoice,Purchase Taxes and Charges,Blerje taksat dhe tatimet
 ,Qty to Receive,Qty të marrin
 DocType: Leave Block List,Leave Block List Allowed,Dërgo Block Lista Lejohet
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +61,Conversion factor cannot be in fractions,Faktor konvertimit nuk mund të jetë në fraksione
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +358,You will use it to Login,Ju do të përdorin atë për Hyr
+apps/erpnext/erpnext/public/js/setup_wizard.js +108,You will use it to Login,Ju do të përdorin atë për Hyr
 DocType: Sales Partner,Retailer,Shitës me pakicë
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +99,Credit To account must be a Balance Sheet account,Kredi në llogarinë duhet të jetë një llogari Bilanci i Gjendjes
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,Gjitha llojet Furnizuesi
 apps/erpnext/erpnext/stock/doctype/item/item.py +37,Item Code is mandatory because Item is not automatically numbered,Kodi i artikullit është i detyrueshëm për shkak Item nuk është numëruar në mënyrë automatike
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +99,Quotation {0} not of type {1},Citat {0} nuk e tipit {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +93,Quotation {0} not of type {1},Citat {0} nuk e tipit {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,Orari Mirëmbajtja Item
 DocType: Sales Order,%  Delivered,% Dorëzuar
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,Bank Overdraft Account,Llogaria Overdraft Banka
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +15,Make Salary Slip,Bëni Kuponi pagave
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +18,Browse BOM,Shfleto bom
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +175,Secured Loans,Kredi të siguruara
-apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +3,Awesome Products,Produkte tmerrshëm
+apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +3,Awesome Products,Produkte tmerrshëm
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +189,Opening Balance Equity,Hapja Bilanci ekuitetit
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +80,Cannot approve leave as you are not authorized to approve leaves on Block Dates,Nuk mund të miratojë lejen e si ju nuk jeni i autorizuar të miratojë lë në datat Block
 DocType: Appraisal,Appraisal,Vlerësim
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +13,Lost-foam casting,Hedh humbur-shkumë
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +47,Drawing,Vizatim
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +22,Date is repeated,Data përsëritet
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +148,Leave approver must be one of {0},Dërgo aprovuesi duhet të jetë një nga {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +162,Leave approver must be one of {0},Dërgo aprovuesi duhet të jetë një nga {0}
 DocType: Hub Settings,Seller Email,Shitës Email
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Gjithsej Kosto Blerje (nëpërmjet Blerje Faturës)
 DocType: Workstation Working Hour,Start Time,Koha e fillimit
@@ -2488,7 +2398,7 @@
 DocType: Purchase Invoice Item,Net Amount (Company Currency),Shuma neto (Kompania Valuta)
 DocType: BOM Operation,Hour Rate,Ore Rate
 DocType: Stock Settings,Item Naming By,Item Emërtimi By
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +642,From Quotation,Nga Kuotim
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +655,From Quotation,Nga Kuotim
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},Një tjetër Periudha Mbyllja Hyrja {0} është bërë pas {1}
 DocType: Production Order,Material Transferred for Manufacturing,Materiali Transferuar për Prodhim
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +29,Account {0} does not exists,Llogaria {0} nuk ekziston
@@ -2502,21 +2412,19 @@
 DocType: Purchase Invoice Item,PR Detail,PR Detail
 DocType: Sales Order,Fully Billed,Faturuar plotësisht
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +20,Cash In Hand,Para në dorë
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +72,Delivery warehouse required for stock item {0},Depo ofrimit të nevojshme për pikën e aksioneve {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +119,Delivery warehouse required for stock item {0},Depo ofrimit të nevojshme për pikën e aksioneve {0}
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),Pesha bruto e paketës. Zakonisht pesha neto + paketimin pesha materiale. (Për shtyp)
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Përdoruesit me këtë rol janë të lejuara për të ngritur llogaritë ngrirë dhe për të krijuar / modifikuar shënimet e kontabilitetit kundrejt llogarive të ngrira
 DocType: Serial No,Is Cancelled,Është anuluar
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +281,My Shipments,Dërgesat e mia
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +286,My Shipments,Dërgesat e mia
 DocType: Journal Entry,Bill Date,Bill Data
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +43,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","Edhe në qoftë se ka rregulla të shumta çmimeve me prioritet më të lartë, prioritetet e brendshme atëherë në vijim aplikohen:"
 DocType: Supplier,Supplier Details,Detajet Furnizuesi
 DocType: Communication,Recipients,Marrësit
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +146,Screwing,Vidhosje
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +96,Knurling,Knurling
 DocType: Expense Claim,Approval Status,Miratimi Statusi
 DocType: Hub Settings,Publish Items to Hub,Botojë artikuj për Hub
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +44,From value must be less than to value in row {0},Nga Vlera duhet të jetë më pak se të vlerës në rresht {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +133,Wire Transfer,Wire Transfer
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +133,Wire Transfer,Wire Transfer
 apps/erpnext/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py +25,Please select Bank Account,"Ju lutem, përzgjidhni llogarinë bankare"
 DocType: Newsletter,Create and Send Newsletters,Krijoni dhe dërgoni Buletinet
 apps/frappe/frappe/public/js/frappe/views/reports/grid_report.js +305,From Date must be before To Date,Nga Data duhet të jetë përpara se deri më sot
@@ -2524,14 +2432,14 @@
 DocType: Company,Default Income Account,Llogaria e albumit ardhurat
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,Grupi Customer / Customer
 DocType: Item Group,Check this if you want to show in website,Kontrolloni këtë në qoftë se ju doni të tregojnë në faqen e internetit
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +190,Welcome to ERPNext,Mirë se vini në ERPNext
+,Welcome to ERPNext,Mirë se vini në ERPNext
 DocType: Payment Reconciliation Payment,Voucher Detail Number,Numri Detail Voucher
 apps/erpnext/erpnext/config/crm.py +146,Lead to Quotation,Lead për Kuotim
 DocType: Lead,From Customer,Nga Klientit
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +37,Calls,Telefonatat
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Calls,Telefonatat
 DocType: Project,Total Costing Amount (via Time Logs),Shuma kushton (nëpërmjet Koha Shkrime)
 DocType: Purchase Order Item Supplied,Stock UOM,Stock UOM
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Purchase Order {0} is not submitted,Blerje Rendit {0} nuk është dorëzuar
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +194,Purchase Order {0} is not submitted,Blerje Rendit {0} nuk është dorëzuar
 ,Projected,Projektuar
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},Serial Asnjë {0} nuk i përkasin Magazina {1}
 apps/erpnext/erpnext/controllers/status_updater.py +136,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Shënim: Sistemi nuk do të kontrollojë mbi-ofrimit dhe mbi-prenotim për Item {0} si sasi apo shumë është 0
@@ -2539,7 +2447,6 @@
 DocType: Issue,Opening Date,Hapja Data
 DocType: Journal Entry,Remark,Vërejtje
 DocType: Purchase Receipt Item,Rate and Amount,Shkalla dhe Shuma
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +95,Boring,I mërzitshëm
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +667,From Sales Order,Nga Sales Rendit
 DocType: Blog Category,Parent Website Route,Prind Faqja Route
 DocType: Sales Order,Not Billed,Jo faturuar
@@ -2553,19 +2460,17 @@
 apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount Amount,Shuma Discount
 DocType: Purchase Invoice,Return Against Purchase Invoice,Kthehu kundër Blerje Faturë
 DocType: Item,Warranty Period (in days),Garanci Periudha (në ditë)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +550,e.g. VAT,p.sh. TVSH
+apps/erpnext/erpnext/public/js/setup_wizard.js +292,e.g. VAT,p.sh. TVSH
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,Pika 4
 DocType: Journal Entry Account,Journal Entry Account,Llogaria Journal Hyrja
 DocType: Shopping Cart Settings,Quotation Series,Citat Series
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +52,"An item exists with same name ({0}), please change the item group name or rename the item","Një artikull ekziston me të njëjtin emër ({0}), ju lutemi të ndryshojë emrin e grupit pika ose riemërtoj pika"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +82,Hot metal gas forming,Metalike të nxehtë gazit formimin
 DocType: Sales Order Item,Sales Order Date,Sales Order Data
 DocType: Sales Invoice Item,Delivered Qty,Dorëzuar Qty
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +63,Warehouse {0}: Company is mandatory,Magazina {0}: Kompania është e detyrueshme
 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.",Shko në grupin e duhur (zakonisht burimin e fondeve&gt; detyrime rrjedhëse&gt; tatimet dhe taksat dhe për të krijuar një llogari të re (duke klikuar mbi Shto Fëmija) i tipit &quot;tatim&quot; dhe të bëjë përmend normën tatimore.
 ,Payment Period Based On Invoice Date,Periudha e pagesës bazuar në datën Faturë
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +50,Missing Currency Exchange Rates for {0},Missing Currency Exchange Rates për {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +135,Laser cutting,Laser prerja
 DocType: Event,Monday,E hënë
 DocType: Journal Entry,Stock Entry,Stock Hyrja
 DocType: Account,Payable,Për t&#39;u paguar
@@ -2598,7 +2503,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +111,Date Of Retirement must be greater than Date of Joining,Data e daljes në pension duhet të jetë më i madh se data e bashkimit
 DocType: Sales Invoice,Against Income Account,Kundër llogarisë së të ardhurave
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +69,{0}% Delivered,{0}% Dorëzuar
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +78,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Item {0}: Qty Urdhërohet {1} nuk mund të jetë më pak se Qty mënyrë minimale {2} (përcaktuar në pikën).
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Item {0}: Qty Urdhërohet {1} nuk mund të jetë më pak se Qty mënyrë minimale {2} (përcaktuar në pikën).
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Mujor Përqindja e shpërndarjes
 DocType: Territory,Territory Targets,Synimet Territory
 DocType: Delivery Note,Transporter Info,Transporter Informacion
@@ -2607,7 +2512,6 @@
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,Titujt për shtypura templates p.sh. ProFORMA faturë.
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +140,Valuation type charges can not marked as Inclusive,Akuzat lloj vlerësimi nuk mund të shënuar si gjithëpërfshirës
 DocType: POS Profile,Update Stock,Update Stock
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +128,Superfinishing,Superfinishing
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,UOM ndryshme për sendet do të çojë në të gabuar (Total) vlerën neto Pesha. Sigurohuni që pesha neto e çdo send është në të njëjtën UOM.
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,Bom Rate
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +85,Please pull items from Delivery Note,Ju lutemi të tërheqë sendet nga i dorëzimit Shënim
@@ -2622,7 +2526,6 @@
 ,Purchase Analytics,Analytics Blerje
 DocType: Sales Invoice Item,Delivery Note Item,Ofrimit Shënim Item
 DocType: Expense Claim,Task,Detyrë
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +57,Shaving,Rruajtje
 DocType: Purchase Taxes and Charges,Reference Row #,Referenca Row #
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},Numri i Batch është i detyrueshëm për Item {0}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js +14,This is a root sales person and cannot be edited.,Ky është një person i shitjes rrënjë dhe nuk mund të redaktohen.
@@ -2634,13 +2537,11 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +74,Purpose must be one of {0},Qëllimi duhet të jetë një nga {0}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +108,Fill the form and save it,Plotësoni formularin dhe për të shpëtuar atë
 DocType: Production Planning Tool,Download a report containing all raw materials with their latest inventory status,Shkarko një raport që përmban të gjitha lëndëve të para me statusin e tyre të fundit inventar
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +94,Facing,Duke u përballur me
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,Forumi Komuniteti
 DocType: Leave Application,Leave Balance Before Application,Dërgo Bilanci para aplikimit
 DocType: SMS Center,Send SMS,Dërgo SMS
 DocType: Company,Default Letter Head,Default Letër Shef
 DocType: Time Log,Billable,Billable
-DocType: Authorization Rule,This will be used for setting rule in HR module,Kjo do të përdoren për vendosjen e sundimit në modulin HR
 DocType: Account,Rate at which this tax is applied,Shkalla në të cilën kjo taksë aplikohet
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reorder Qty,Reorder Qty
 DocType: Company,Stock Adjustment Account,Llogaria aksioneve Rregullimit
@@ -2667,16 +2568,15 @@
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,Alokimi përqindje duhet të jetë e barabartë me 100%
 DocType: Serial No,Out of AMC,Nga AMC
 DocType: Purchase Order Item,Material Request Detail No,Detail materiale Kërkesë Jo
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +97,Hard turning,Hard kthese
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +33,Make Maintenance Visit,Bëni Mirëmbajtja vizitë
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +187,Please contact to the user who have Sales Master Manager {0} role,Ju lutem kontaktoni për përdoruesit të cilët kanë Sales Master Menaxher {0} rol
 DocType: Company,Default Cash Account,Gabim Llogaria Cash
 apps/erpnext/erpnext/config/accounts.py +79,Company (not Customer or Supplier) master.,Kompani (jo Customer ose Furnizuesi) mjeshtër.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +106,Please enter 'Expected Delivery Date',Ju lutemi shkruani &#39;datës së pritshme dorëzimit&#39;
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +187,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Shënime ofrimit {0} duhet të anulohet para se anulimi këtë Radhit Sales
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +100,Please enter 'Expected Delivery Date',Ju lutemi shkruani &#39;datës së pritshme dorëzimit&#39;
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +182,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Shënime ofrimit {0} duhet të anulohet para se anulimi këtë Radhit Sales
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +373,Paid amount + Write Off Amount can not be greater than Grand Total,Shuma e paguar + anullojë Shuma nuk mund të jetë më i madh se Grand Total
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} nuk është një numër i vlefshëm Batch për Item {1}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,Note: There is not enough leave balance for Leave Type {0},Shënim: Nuk ka bilanc mjaft leje për pushim Lloji {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +124,Note: There is not enough leave balance for Leave Type {0},Shënim: Nuk ka bilanc mjaft leje për pushim Lloji {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.","Shënim: Në qoftë se pagesa nuk është bërë kundër çdo referencë, e bëjnë Journal Hyrja dorë."
 DocType: Item,Supplier Items,Items Furnizuesi
 DocType: Opportunity,Opportunity Type,Mundësi Type
@@ -2688,7 +2588,7 @@
 DocType: Hub Settings,Publish Availability,Publikimi i Disponueshmëria
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +105,Date of Birth cannot be greater than today.,Data e lindjes nuk mund të jetë më e madhe se sa sot.
 ,Stock Ageing,Stock plakjen
-apps/erpnext/erpnext/controllers/accounts_controller.py +200,{0} '{1}' is disabled,{0} &#39;{1}&#39; është me aftësi të kufizuara
+apps/erpnext/erpnext/controllers/accounts_controller.py +201,{0} '{1}' is disabled,{0} &#39;{1}&#39; është me aftësi të kufizuara
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Bëje si Open
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Dërgo email automatike në Kontaktet për transaksionet Dorëzimi.
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +232,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
@@ -2697,44 +2597,38 @@
 DocType: Purchase Order,Customer Contact Email,Customer Contact Email
 DocType: Event,Sunday,E diel
 DocType: Sales Team,Contribution (%),Kontributi (%)
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +455,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,Shënim: Pagesa Hyrja nuk do të jetë krijuar që nga &#39;Cash ose Llogarisë Bankare &quot;nuk ishte specifikuar
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +171,Responsibilities,Përgjegjësitë
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +457,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,Shënim: Pagesa Hyrja nuk do të jetë krijuar që nga &#39;Cash ose Llogarisë Bankare &quot;nuk ishte specifikuar
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +171,Responsibilities,Përgjegjësitë
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Template,Shabllon
 DocType: Sales Person,Sales Person Name,Sales Person Emri
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,Ju lutemi shkruani atleast 1 faturën në tryezë
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +511,Add Users,Shto Përdoruesit
+apps/erpnext/erpnext/public/js/setup_wizard.js +255,Add Users,Shto Përdoruesit
 DocType: Pricing Rule,Item Group,Grupi i artikullit
 DocType: Task,Actual Start Date (via Time Logs),Aktuale Data e Fillimit (nëpërmjet Koha Shkrime)
 DocType: Stock Reconciliation Item,Before reconciliation,Para se të pajtimit
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +12,To {0},Për {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Taksat dhe Tarifat Shtuar (Kompania Valuta)
-apps/erpnext/erpnext/stock/doctype/item/item.py +340,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Row Tatimore pika {0} duhet të keni një llogari te tipit Tatimit ose e ardhur ose shpenzim ose ngarkimit
+apps/erpnext/erpnext/stock/doctype/item/item.py +344,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Row Tatimore pika {0} duhet të keni një llogari te tipit Tatimit ose e ardhur ose shpenzim ose ngarkimit
 DocType: Sales Order,Partly Billed,Faturuar Pjesërisht
 DocType: Item,Default BOM,Gabim bom
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +79,Decambering,Decambering
 apps/erpnext/erpnext/setup/doctype/company/company.js +22,Please re-type company name to confirm,Ju lutem ri-lloj emri i kompanisë për të konfirmuar
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,Outstanding Amt Total
 DocType: Time Log Batch,Total Hours,Totali Orë
 DocType: Journal Entry,Printing Settings,Printime Cilësimet
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +268,Total Debit must be equal to Total Credit. The difference is {0},Debiti i përgjithshëm duhet të jetë e barabartë me totalin e kredisë. Dallimi është {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +11,Automotive,Automobilistik
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +37,Item is required,Item është e nevojshme
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +25,Metal injection molding,Injeksion i derdhur metalike
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +258,Total Debit must be equal to Total Credit. The difference is {0},Debiti i përgjithshëm duhet të jetë e barabartë me totalin e kredisë. Dallimi është {0}
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,Automobilistik
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +684,From Delivery Note,Nga dorëzim Shënim
 DocType: Time Log,From Time,Nga koha
 DocType: Notification Control,Custom Message,Custom Mesazh
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +33,Investment Banking,Investimeve Bankare
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +261,"Select your Country, Time Zone and Currency","Zgjidh vendin tuaj, Time Zone dhe monedhës"
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,Investimeve Bankare
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +316,"Select your Country, Time Zone and Currency","Zgjidh vendin tuaj, Time Zone dhe monedhës"
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +369,Cash or Bank Account is mandatory for making payment entry,Cash ose Banka Llogaria është e detyrueshme për të bërë hyrjen e pagesës
 DocType: Purchase Invoice,Price List Exchange Rate,Lista e Çmimeve Exchange Rate
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +91,Pickling,Pickling
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +18,Sand casting,Hedh rërë
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +117,Electroplating,Electroplating
 DocType: Purchase Invoice Item,Rate,Normë
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +62,Intern,Mjek praktikant
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Intern,Mjek praktikant
 DocType: Newsletter,A Lead with this email id should exist,Një Lead me këtë id email duhet të ekzistojë
 DocType: Stock Entry,From BOM,Nga bom
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +34,Basic,Themelor
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +34,Basic,Themelor
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,Transaksionet e aksioneve para {0} janë të ngrira
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +217,Please click on 'Generate Schedule',Ju lutem klikoni në &quot;Generate Listën &#39;
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +61,To Date should be same as From Date for Half Day leave,Deri më sot duhet të jetë i njëjtë si Nga Data për pushim gjysmë dite
@@ -2742,10 +2636,10 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +96,Reference No is mandatory if you entered Reference Date,"Referenca Nuk është e detyrueshme, nëse keni hyrë Reference Data"
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +108,Date of Joining must be greater than Date of Birth,Data e bashkuar duhet të jetë më i madh se Data e lindjes
 DocType: Salary Structure,Salary Structure,Struktura e pagave
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +242,"Multiple Price Rule exists with same criteria, please resolve \
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +246,"Multiple Price Rule exists with same criteria, please resolve \
 			conflict by assigning priority. Price Rules: {0}","Multiple Rregulla Çmimi ekziston me kritere të njëjta, ju lutemi të zgjidhur \ konfliktin me jepte prioritet. Rregullat Çmimi: {0}"
 DocType: Account,Bank,Banka
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +9,Airline,Linjë ajrore
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,Linjë ajrore
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +493,Issue Material,Materiali çështje
 DocType: Material Request Item,For Warehouse,Për Magazina
 DocType: Employee,Offer Date,Oferta Data
@@ -2755,29 +2649,24 @@
 DocType: Item,Is Fixed Asset Item,Është pika fikse të aseteve
 DocType: Stock Entry,Including items for sub assemblies,Duke përfshirë edhe artikuj për nën kuvendet
 DocType: Features Setup,"If you have long print formats, this feature can be used to split the page to be printed on multiple pages with all headers and footers on each page","Nëse keni formate të gjata të shtypura, ky funksion mund të përdoret për të ndarë faqe të jenë të shtypura në faqet e shumta me të gjitha headers dhe footers në çdo faqe"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +131,Hobbing,Hobbing
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +98,All Territories,Të gjitha Territoret
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +98,All Territories,Të gjitha Territoret
 DocType: Purchase Invoice,Items,Artikuj
 DocType: Fiscal Year,Year Name,Viti Emri
 DocType: Process Payroll,Process Payroll,Procesi i Pagave
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +59,There are more holidays than working days this month.,Ka më shumë pushimet sesa ditëve pune këtë muaj.
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +68,There are more holidays than working days this month.,Ka më shumë pushimet sesa ditëve pune këtë muaj.
 DocType: Product Bundle Item,Product Bundle Item,Produkt Bundle Item
 DocType: Sales Partner,Sales Partner Name,Emri Sales Partner
 DocType: Purchase Invoice Item,Image View,Image Shiko
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +113,Finishing & industrial finishing,Mbarimi &amp; industriale mbarimit
 DocType: Issue,Opening Time,Koha e hapjes
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,Nga dhe në datat e kërkuara
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +46,Securities & Commodity Exchanges,Letrave me Vlerë dhe Shkëmbimeve të Mallrave
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Letrave me Vlerë dhe Shkëmbimeve të Mallrave
 DocType: Shipping Rule,Calculate Based On,Llogaritur bazuar në
 DocType: Delivery Note Item,From Warehouse,Nga Magazina
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +98,Drilling,Shpim
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +28,Blow molding,Goditje derdhur
 DocType: Purchase Taxes and Charges,Valuation and Total,Vlerësimi dhe Total
 DocType: Tax Rule,Shipping City,Shipping Qyteti
 apps/erpnext/erpnext/stock/doctype/item/item.js +43,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,Ky artikull është një variant i {0} (Stampa). Atributet do të kopjohet gjatë nga template nëse &#39;Jo Copy &quot;është vendosur
 DocType: Account,Purchase User,Blerje User
 DocType: Notification Control,Customize the Notification,Customize Njoftimin
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +87,Hammering,Goditje me çekan
 DocType: Web Page,Slideshow,Slideshow
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +24,Default Address Template cannot be deleted,Default Adresa Template nuk mund të fshihet
 DocType: Sales Invoice,Shipping Rule,Rregulla anijeve
@@ -2786,9 +2675,8 @@
 DocType: Workflow State,Search,Kërkim
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +54,Total cannot be zero,Gjithsej nuk mund të jetë 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,&quot;Ditët Që Rendit Fundit&quot; duhet të jetë më e madhe se ose e barabartë me zero
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +142,Brazing,Brazing
 DocType: C-Form,Amended From,Ndryshuar Nga
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Raw Material,Raw Material
+apps/erpnext/erpnext/public/js/setup_wizard.js +359,Raw Material,Raw Material
 DocType: Leave Application,Follow via Email,Ndiqni nëpërmjet Email
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Shuma e taksave Pas Shuma ulje
 apps/erpnext/erpnext/accounts/doctype/account/account.py +174,Child account exists for this account. You can not delete this account.,Llogari fëmijë ekziston për këtë llogari. Ju nuk mund të fshini këtë llogari.
@@ -2802,10 +2690,10 @@
 ,Produced,Prodhuar
 DocType: Item,Item Code for Suppliers,Item Kodi për Furnizuesit
 DocType: Issue,Raised By (Email),Ngritur nga (Email)
-apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +72,General,I përgjithshëm
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +495,Attach Letterhead,Bashkangjit letër me kokë
+apps/erpnext/erpnext/setup/setup_wizard/default_website.py +72,General,I përgjithshëm
+apps/erpnext/erpnext/public/js/setup_wizard.js +241,Attach Letterhead,Bashkangjit letër me kokë
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +272,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',Nuk mund të zbres kur kategori është për &#39;vlerësimit&#39; ose &#39;Vlerësimit dhe Total &quot;
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +542,"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.","Lista kokat tuaja tatimore (p.sh. TVSH, doganore etj, ata duhet të kenë emra të veçantë) dhe normat e tyre standarde. Kjo do të krijojë një template standarde, të cilat ju mund të redaktoni dhe shtoni më vonë."
+apps/erpnext/erpnext/public/js/setup_wizard.js +284,"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.","Lista kokat tuaja tatimore (p.sh. TVSH, doganore etj, ata duhet të kenë emra të veçantë) dhe normat e tyre standarde. Kjo do të krijojë një template standarde, të cilat ju mund të redaktoni dhe shtoni më vonë."
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial Nos Required for Serialized Item {0},Serial Nos kërkuar për Item serialized {0}
 DocType: Journal Entry,Bank Entry,Banka Hyrja
 DocType: Authorization Rule,Applicable To (Designation),Për të zbatueshme (Përcaktimi)
@@ -2814,32 +2702,31 @@
 apps/erpnext/erpnext/config/accounts.py +143,Enable / disable currencies.,Enable / disable monedhave.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Postal Expenses,Shpenzimet postare
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Gjithsej (Amt)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +26,Entertainment & Leisure,Entertainment &amp; Leisure
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,Entertainment &amp; Leisure
 DocType: Purchase Order,The date on which recurring order will be stop,Data në të cilën mënyrë periodike do të ndalet
 DocType: Quality Inspection,Item Serial No,Item Nr Serial
 apps/erpnext/erpnext/controllers/status_updater.py +142,{0} must be reduced by {1} or you should increase overflow tolerance,{0} duhet të reduktohet me {1} ose ju duhet të rritet toleranca del nga shtrati
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Present,I pranishëm Total
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Hour,Orë
+apps/erpnext/erpnext/public/js/setup_wizard.js +363,Hour,Orë
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +138,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation",Item serialized {0} nuk mund të rifreskohet \ përdorur Stock Pajtimin
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +488,Transfer Material to Supplier,Transferimi materiale të Furnizuesit
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +513,Transfer Material to Supplier,Transferimi materiale të Furnizuesit
 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,Jo i ri Serial nuk mund të ketë depo. Magazina duhet të përcaktohen nga Bursa e hyrjes ose marrjes Blerje
 DocType: Lead,Lead Type,Lead Type
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +82,Create Quotation,Krijo Kuotim
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +306,All these items have already been invoiced,Të gjitha këto objekte janë tashmë faturohen
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,You are not authorized to approve leaves on Block Dates,Ju nuk jeni i autorizuar të miratojë lë në datat Block
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +311,All these items have already been invoiced,Të gjitha këto objekte janë tashmë faturohen
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},Mund të miratohet nga {0}
 DocType: Shipping Rule,Shipping Rule Conditions,Shipping Rregulla Kushte
 DocType: BOM Replace Tool,The new BOM after replacement,BOM ri pas zëvendësimit
 DocType: Features Setup,Point of Sale,Pika e Shitjes
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +83,Curling,Për të bërë kaçurrela
 DocType: Account,Tax,Tatim
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +28,Row {0}: {1} is not a valid {2},Rresht {0}: {1} nuk eshte e vlefshme {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +89,Refining,Rafinim
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +37,Row {0}: {1} is not a valid {2},Rresht {0}: {1} nuk eshte e vlefshme {2}
 DocType: Production Planning Tool,Production Planning Tool,Planifikimi Tool prodhimit
 DocType: Quality Inspection,Report Date,Raporti Data
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +130,Routing,Kurs
 DocType: C-Form,Invoices,Faturat
 DocType: Job Opening,Job Title,Titulli Job
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +54,{0} already allocated for Employee {1} for period {2} - {3},{0} ndarë tashmë për punonjësit {1} për periudhën {2} - {3}
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +80,{0} Recipients,{0} Marrësit
 DocType: Features Setup,Item Groups in Details,Grupet pika në detaje
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +335,Quantity to Manufacture must be greater than 0.,Sasi të Prodhimi duhet të jetë më e madhe se 0.
@@ -2857,14 +2744,13 @@
 DocType: DocType,Setup,Setup
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,Nuk ka asgjë për të redaktuar.
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +108,Summary for this month and pending activities,Përmbledhje për këtë muaj dhe aktivitetet në pritje
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +39,Cold rolling,Rolling Ftohtë
 DocType: Customer Group,Customer Group Name,Emri Grupi Klientit
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +408,Please remove this Invoice {0} from C-Form {1},Ju lutem hiqni këtë Faturë {0} nga C-Form {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +410,Please remove this Invoice {0} from C-Form {1},Ju lutem hiqni këtë Faturë {0} nga C-Form {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,"Ju lutem, përzgjidhni Mbaj përpara në qoftë se ju të dëshironi që të përfshijë bilancit vitit të kaluar fiskal lë të këtij viti fiskal"
 DocType: GL Entry,Against Voucher Type,Kundër Voucher Type
 DocType: Item,Attributes,Atributet
 DocType: Packing Slip,Get Items,Get Items
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +186,Please enter Write Off Account,"Ju lutem, jepini të anullojë Llogari"
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +187,Please enter Write Off Account,"Ju lutem, jepini të anullojë Llogari"
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +71,Last Order Date,Rendit fundit Date
 DocType: DocField,Image,Imazh
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +179,Make Excise Invoice,Bëni Akciza Faturë
@@ -2874,7 +2760,7 @@
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +146,Operation ID not set,Operacioni ID nuk është caktuar
 DocType: Production Order,Planned Start Date,Planifikuar Data e Fillimit
 DocType: Serial No,Creation Document Type,Krijimi Dokumenti Type
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +620,Maint. Visit,Maint. Vizitë
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +631,Maint. Visit,Maint. Vizitë
 DocType: Leave Type,Is Encash,Është marr me para në dorë
 DocType: Purchase Invoice,Mobile No,Mobile Asnjë
 DocType: Payment Tool,Make Journal Entry,Bëni Journal Hyrja
@@ -2882,35 +2768,31 @@
 apps/erpnext/erpnext/controllers/trends.py +257,Project-wise data is not available for Quotation,Të dhënat Project-i mençur nuk është në dispozicion për Kuotim
 DocType: Project,Expected End Date,Pritet Data e Përfundimit
 DocType: Appraisal Template,Appraisal Template Title,Vlerësimi Template Titulli
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +440,Commercial,Komercial
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +378,Commercial,Komercial
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +23,Parent Item {0} must not be a Stock Item,Prind Item {0} nuk duhet të jetë një Stock Item
 DocType: Cost Center,Distribution Id,Shpërndarja Id
-apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +14,Awesome Services,Sherbime tmerrshëm
+apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +14,Awesome Services,Sherbime tmerrshëm
 apps/erpnext/erpnext/config/manufacturing.py +29,All Products or Services.,Të gjitha prodhimet ose shërbimet.
 DocType: Purchase Invoice,Supplier Address,Furnizuesi Adresa
 DocType: Contact Us Settings,Address Line 2,Adresa Line 2
 DocType: ToDo,Reference,Referim
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +59,Perforating,Perforating
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,Nga Qty
 apps/erpnext/erpnext/config/accounts.py +128,Rules to calculate shipping amount for a sale,Rregullat për të llogaritur shumën e anijeve për një shitje
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +29,Series is mandatory,Seria është i detyrueshëm
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +28,Financial Services,Shërbimet Financiare
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,Shërbimet Financiare
 apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3},Vlera për atribut {0} duhet të jetë brenda intervalit {1} të {2} në increments e {3}
 DocType: Tax Rule,Sales,Shitjet
 DocType: Stock Entry Detail,Basic Amount,Shuma bazë
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +173,Warehouse required for stock Item {0},Magazina e nevojshme për aksioneve Item {0}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +178,Warehouse required for stock Item {0},Magazina e nevojshme për aksioneve Item {0}
 DocType: Leave Allocation,Unused leaves,Gjethet e papërdorura
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,Cr
 DocType: Customer,Default Receivable Accounts,Default llogarive të arkëtueshme
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +102,Sawing,Rrethore
 DocType: Tax Rule,Billing State,Shteti Faturimi
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +32,Laminating,Laminating
 DocType: Item Reorder,Transfer,Transferim
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +549,Fetch exploded BOM (including sub-assemblies),Fetch bom shpërtheu (përfshirë nën-kuvendet)
 DocType: Authorization Rule,Applicable To (Employee),Për të zbatueshme (punonjës)
 apps/erpnext/erpnext/controllers/accounts_controller.py +101,Due Date is mandatory,Për shkak Data është e detyrueshme
 apps/erpnext/erpnext/controllers/item_variant.py +51,Increment for Attribute {0} cannot be 0,Rritja për Atributit {0} nuk mund të jetë 0
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +143,Sintering,Sintering
 DocType: Journal Entry,Pay To / Recd From,Për të paguar / Recd Nga
 DocType: Naming Series,Setup Series,Setup Series
 DocType: Supplier,Contact HTML,Kontakt HTML
@@ -2923,7 +2805,6 @@
 DocType: Attendance,Absent,Që mungon
 DocType: Product Bundle,Product Bundle,Bundle produkt
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +180,Row {0}: Invalid reference {1},Row {0}: referencë Invalid {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +165,Crushing,Shkatërrimtar
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Blerje taksat dhe tatimet Template
 DocType: Upload Attendance,Download Template,Shkarko Template
 DocType: GL Entry,Remarks,Vërejtje
@@ -2931,14 +2812,12 @@
 DocType: Journal Entry,Write Off Based On,Shkruani Off bazuar në
 DocType: Features Setup,POS View,POS Shiko
 apps/erpnext/erpnext/config/stock.py +38,Installation record for a Serial No.,Rekord Instalimi për një Nr Serial
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +9,Continuous casting,Derdhjen e vazhdueshme
 apps/erpnext/erpnext/public/js/queries.js +39,Please specify a,Ju lutem specifikoni një
 DocType: Offer Letter,Awaiting Response,Në pritje të përgjigjes
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +53,Above,Sipër
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +80,Cold sizing,Sizing Ftohtë
 DocType: Salary Slip,Earning & Deduction,Fituar dhe Zbritje
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +76,Account {0} cannot be a Group,Llogaria {0} nuk mund të jetë një grup
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +259,Region,Rajon
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +314,Region,Rajon
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +213,Optional. This setting will be used to filter in various transactions.,Fakultative. Ky rregullim do të përdoret për të filtruar në transaksionet e ndryshme.
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +104,Negative Valuation Rate is not allowed,Negativ Rate Vlerësimi nuk është e lejuar
 DocType: Holiday List,Weekly Off,Weekly Off
@@ -2956,7 +2835,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,Account {0} is inactive,Llogaria {0} është joaktiv
 DocType: GL Entry,Is Advance,Është Advance
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,Pjesëmarrja Nga Data dhe Pjesëmarrja deri më sot është e detyrueshme
-apps/erpnext/erpnext/controllers/buying_controller.py +131,Please enter 'Is Subcontracted' as Yes or No,Ju lutemi shkruani &#39;është nënkontraktuar&#39; si Po apo Jo
+apps/erpnext/erpnext/controllers/buying_controller.py +122,Please enter 'Is Subcontracted' as Yes or No,Ju lutemi shkruani &#39;është nënkontraktuar&#39; si Po apo Jo
 DocType: Sales Team,Contact No.,Kontakt Nr
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,'Profit and Loss' type account {0} not allowed in Opening Entry,&quot;Fitimi dhe Humbja &#39;llogaria lloj {0} nuk lejohen në Hapja Hyrja
 DocType: Workflow State,Time,Kohë
@@ -2965,14 +2844,13 @@
 DocType: Authorization Rule,Authorization Rule,Rregulla Autorizimi
 DocType: Sales Invoice,Terms and Conditions Details,Termat dhe Kushtet Detajet
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,Shitjet Taksat dhe Tarifat Stampa
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +10,Apparel & Accessories,Veshmbathje &amp; Aksesorë
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,Veshmbathje &amp; Aksesorë
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +67,Number of Order,Numri i Rendit
 DocType: Item Group,HTML / Banner that will show on the top of product list.,HTML / Banner që do të tregojnë në krye të listës së produktit.
 DocType: Shipping Rule,Specify conditions to calculate shipping amount,Specifikoni kushtet për të llogaritur shumën e anijeve
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +121,Add Child,Shto Fëmija
 DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,Roli i lejohet të Accounts ngrirë dhe Edit ngrira gjitha
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +52,Cannot convert Cost Center to ledger as it has child nodes,Nuk mund të konvertohet Qendra Kosto të librit si ajo ka nyje fëmijë
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +47,Conversion Factor is required,Faktori i konvertimit është e nevojshme
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +37,Serial #,Serial #
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +87,Commission on Sales,Komisioni për Shitje
 DocType: Offer Letter Term,Value / Description,Vlera / Përshkrim
@@ -2980,10 +2858,8 @@
 ,Customers Not Buying Since Long Time,Konsumatorët Jo Blerja Që nga kohë të gjatë
 DocType: Production Order,Expected Delivery Date,Pritet Data e dorëzimit
 apps/erpnext/erpnext/accounts/general_ledger.py +121,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Debi dhe Kredi jo të barabartë për {0} # {1}. Dallimi është {2}.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +48,Bulging,I fryrë
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +11,Evaporative-pattern casting,Hedhjes avullues-model
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Entertainment Expenses,Shpenzimet Argëtim
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +195,Sales Invoice {0} must be cancelled before cancelling this Sales Order,Shitjet Faturë {0} duhet të anulohet para anulimit këtë Radhit Sales
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +190,Sales Invoice {0} must be cancelled before cancelling this Sales Order,Shitjet Faturë {0} duhet të anulohet para anulimit këtë Radhit Sales
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +61,Age,Moshë
 DocType: Time Log,Billing Amount,Shuma Faturimi
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +84,Invalid quantity specified for item {0}. Quantity should be greater than 0.,Sasia e pavlefshme specifikuar për pika {0}. Sasia duhet të jetë më i madh se 0.
@@ -3002,26 +2878,24 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,Të ardhurat New Customer
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Travel Expenses,Shpenzimet e udhëtimit
 DocType: Maintenance Visit,Breakdown,Avari
-apps/erpnext/erpnext/controllers/accounts_controller.py +241,Account: {0} with currency: {1} can not be selected,Llogaria: {0} me monedhën: {1} nuk mund të zgjidhen
+apps/erpnext/erpnext/controllers/accounts_controller.py +242,Account: {0} with currency: {1} can not be selected,Llogaria: {0} me monedhën: {1} nuk mund të zgjidhen
 DocType: Bank Reconciliation Detail,Cheque Date,Çek Data
 apps/erpnext/erpnext/accounts/doctype/account/account.py +47,Account {0}: Parent account {1} does not belong to company: {2},Llogaria {0}: llogari Parent {1} nuk i përkasin kompanisë: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted all transactions related to this company!,Sukses të fshihen të gjitha transaksionet që lidhen me këtë kompani!
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,Si në Data
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +111,Honing,Honing
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +58,Probation,Provë
-apps/erpnext/erpnext/stock/doctype/item/item.py +264,Default Warehouse is mandatory for stock Item.,Gabim Magazina është e detyrueshme për aksioneve Item.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Probation,Provë
+apps/erpnext/erpnext/stock/doctype/item/item.py +268,Default Warehouse is mandatory for stock Item.,Gabim Magazina është e detyrueshme për aksioneve Item.
 DocType: Feed,Full Name,Emri i plotë
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +148,Clinching,Clinching
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +191,Payment of salary for the month {0} and year {1},Pagesa e pagës për muajin {0} dhe vitin {1}
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +173,Payment of salary for the month {0} and year {1},Pagesa e pagës për muajin {0} dhe vitin {1}
 DocType: Stock Settings,Auto insert Price List rate if missing,Auto insert Shkalla Lista e Çmimeve nëse mungon
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,Gjithsej shuma e paguar
 ,Transferred Qty,Transferuar Qty
 apps/erpnext/erpnext/config/learn.py +11,Navigating,Vozitja
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +137,Planning,Planifikim
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +137,Planning,Planifikim
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +9,Make Time Log Batch,Bëni Koha Identifikohu Batch
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Issued,Lëshuar
 DocType: Project,Total Billing Amount (via Time Logs),Shuma totale Faturimi (nëpërmjet Koha Shkrime)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +629,We sell this Item,Ne shesim këtë artikull
+apps/erpnext/erpnext/public/js/setup_wizard.js +365,We sell this Item,Ne shesim këtë artikull
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +65,Supplier Id,Furnizuesi Id
 DocType: Journal Entry,Cash Entry,Hyrja Cash
 DocType: Sales Partner,Contact Desc,Kontakt Përshkrimi
@@ -3030,18 +2904,16 @@
 DocType: Brand,Item Manager,Item Menaxher
 DocType: Cost Center,Add rows to set annual budgets on Accounts.,Shto rreshtave për të vendosur buxhetet vjetore në llogaritë.
 DocType: Buying Settings,Default Supplier Type,Gabim Furnizuesi Type
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +160,Quarrying,Gurore
 DocType: Production Order,Total Operating Cost,Gjithsej Kosto Operative
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +160,Note: Item {0} entered multiple times,Shënim: Item {0} hyrë herë të shumta
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +163,Note: Item {0} entered multiple times,Shënim: Item {0} hyrë herë të shumta
 apps/erpnext/erpnext/config/crm.py +27,All Contacts.,Të gjitha kontaktet.
 DocType: Newsletter,Test Email Id,Test Email Id
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +394,Company Abbreviation,Shkurtesa kompani
+apps/erpnext/erpnext/public/js/setup_wizard.js +142,Company Abbreviation,Shkurtesa kompani
 DocType: Features Setup,If you follow Quality Inspection. Enables Item QA Required and QA No in Purchase Receipt,Në qoftë se ju ndiqni të Cilësisë Inspektimit. Mundëson Item QA nevojshme dhe QA Jo në pranimin Blerje
 DocType: GL Entry,Party Type,Lloji Partia
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +68,Raw material cannot be same as main Item,Lëndë e parë nuk mund të jetë i njëjtë si pika kryesore
 DocType: Item Attribute Value,Abbreviation,Shkurtim
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,Jo Authroized që nga {0} tejkalon kufijtë
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +30,Rotational molding,Formim rrotulluese
 apps/erpnext/erpnext/config/hr.py +115,Salary template master.,Mjeshtër paga template.
 DocType: Leave Type,Max Days Leave Allowed,Max Ditët Pushimi Lejohet
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +55,Set Tax Rule for shopping cart,Set Rregulla Taksa për shopping cart
@@ -3055,15 +2927,15 @@
 apps/erpnext/erpnext/config/selling.py +18,Quotes to Leads or Customers.,Kuotat për kryeson apo klientët.
 DocType: Stock Settings,Role Allowed to edit frozen stock,Roli i lejuar për të redaktuar aksioneve të ngrirë
 ,Territory Target Variance Item Group-Wise,Territori i synuar Varianca Item Grupi i urti
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +101,All Customer Groups,Të gjitha grupet e konsumatorëve
-apps/erpnext/erpnext/controllers/accounts_controller.py +474,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} është i detyrueshëm. Ndoshta rekord Currency Exchange nuk është krijuar për {1} të {2}.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +101,All Customer Groups,Të gjitha grupet e konsumatorëve
+apps/erpnext/erpnext/controllers/accounts_controller.py +475,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} është i detyrueshëm. Ndoshta rekord Currency Exchange nuk është krijuar për {1} të {2}.
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +37,Tax Template is mandatory.,Template tatimi është i detyrueshëm.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +41,Account {0}: Parent account {1} does not exist,Llogaria {0}: llogari Parent {1} nuk ekziston
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Lista e Çmimeve Rate (Kompania Valuta)
 DocType: Account,Temporary,I përkohshëm
 DocType: Address,Preferred Billing Address,Preferuar Faturimi Adresa
 DocType: Monthly Distribution Percentage,Percentage Allocation,Alokimi Përqindja
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +86,Secretary,Sekretar
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Secretary,Sekretar
 DocType: Serial No,Distinct unit of an Item,Njësi të dallueshme nga një artikull
 DocType: Pricing Rule,Buying,Blerje
 DocType: HR Settings,Employee Records to be created by,Të dhënat e punonjësve që do të krijohet nga
@@ -3076,9 +2948,8 @@
 ,Item-wise Price List Rate,Pika-mençur Lista e Çmimeve Rate
 DocType: Purchase Order Item,Supplier Quotation,Furnizuesi Citat
 DocType: Quotation,In Words will be visible once you save the Quotation.,Me fjalë do të jetë i dukshëm një herë ju ruani Kuotim.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +68,Ironing,Hekurosje
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is stopped,{0} {1} është ndalur
-apps/erpnext/erpnext/stock/doctype/item/item.py +352,Barcode {0} already used in Item {1},Barkodi {0} përdorur tashmë në pikën {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +356,Barcode {0} already used in Item {1},Barkodi {0} përdorur tashmë në pikën {1}
 DocType: Lead,Add to calendar on this date,Shtoni në kalendarin në këtë datë
 apps/erpnext/erpnext/config/selling.py +132,Rules for adding shipping costs.,Rregullat për të shtuar shpenzimet e transportit detar.
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,Ngjarje të ardhshme
@@ -3087,27 +2958,25 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +27,Quick Entry,Hyrja shpejtë
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0} është e detyrueshme për Kthim
 DocType: Purchase Order,To Receive,Për të marrë
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +33,Shrink fitting,Shrink përshtatshëm
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +522,user@example.com,user@example.com
+apps/erpnext/erpnext/public/js/setup_wizard.js +266,user@example.com,user@example.com
 DocType: Email Digest,Income / Expense,Të ardhurat / shpenzimeve
 DocType: Employee,Personal Email,Personale Email
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +58,Total Variance,Ndryshimi Total
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +62,Total Variance,Ndryshimi Total
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.","Nëse aktivizuar, sistemi do të shpallë shënimet e kontabilitetit për inventarizimin automatikisht."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +15,Brokerage,Brokerimi
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +15,Brokerage,Brokerimi
 DocType: Address,Postal Code,Kodi Postar
 DocType: Production Order Operation,"in Minutes
 Updated via 'Time Log'",në minuta Përditësuar nëpërmjet &#39;Koha Identifikohu &quot;
 DocType: Customer,From Lead,Nga Lead
 apps/erpnext/erpnext/config/manufacturing.py +19,Orders released for production.,Urdhërat lëshuar për prodhim.
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +42,Select Fiscal Year...,Zgjidh Vitin Fiskal ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +442,POS Profile required to make POS Entry,POS Profilin nevojshme për të bërë POS Hyrja
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +444,POS Profile required to make POS Entry,POS Profilin nevojshme për të bërë POS Hyrja
 DocType: Hub Settings,Name Token,Emri Token
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +106,Planing,Planifikim
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Selling,Shitja Standard
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +120,Standard Selling,Shitja Standard
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +137,Atleast one warehouse is mandatory,Atleast një depo është e detyrueshme
 DocType: Serial No,Out of Warranty,Nga Garanci
 DocType: BOM Replace Tool,Replace,Zëvendësoj
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +314,{0} against Sales Invoice {1},{0} kundër Shitjeve Faturës {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +316,{0} against Sales Invoice {1},{0} kundër Shitjeve Faturës {1}
 apps/erpnext/erpnext/stock/doctype/item/item.py +49,Please enter default Unit of Measure,Ju lutem shkruani Njësia e parazgjedhur e Masës
 DocType: Purchase Invoice Item,Project Name,Emri i Projektit
 DocType: Supplier,Mention if non-standard receivable account,Përmend në qoftë se jo-standarde llogari të arkëtueshme
@@ -3123,9 +2992,8 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,Journal Entry {0} does not have account {1} or already matched against other voucher,Journal Hyrja {0} nuk ka llogari {1} ose tashmë krahasohen me kupon tjetër
 DocType: Item,Moving Average,Moving Mesatare
 DocType: BOM Replace Tool,The BOM which will be replaced,BOM i cili do të zëvendësohet
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +43,New Stock UOM must be different from current stock UOM,New Stock UOM duhet të jenë të ndryshme nga e aksioneve UOM tanishme
 DocType: Account,Debit,Debi
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +34,Leaves must be allocated in multiples of 0.5,Lë duhet të ndahen në shumëfisha e 0.5
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +44,Leaves must be allocated in multiples of 0.5,Lë duhet të ndahen në shumëfisha e 0.5
 DocType: Production Order,Operation Cost,Operacioni Kosto
 apps/erpnext/erpnext/config/hr.py +71,Upload attendance from a .csv file,Ngarko pjesëmarrjen nga një skedar CSV
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,Amt Outstanding
@@ -3143,8 +3011,7 @@
 DocType: Employee,Internal Work History,Historia e brendshme
 DocType: DocField,Column Break,Pushim Column
 DocType: Event,Thursday,E enjte
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +42,Private Equity,Ekuiteti privat
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +93,Turning,Duke u kthyer
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,Ekuiteti privat
 DocType: Maintenance Visit,Customer Feedback,Feedback Customer
 DocType: Account,Expense,Shpenzim
 DocType: Sales Invoice,Exhibition,Ekspozitë
@@ -3157,19 +3024,19 @@
 DocType: Employee,Held On,Mbajtur më
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +33,Production Item,Prodhimi Item
 ,Employee Information,Informacione punonjës
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,Rate (%),Shkalla (%)
+apps/erpnext/erpnext/public/js/setup_wizard.js +294,Rate (%),Shkalla (%)
 DocType: Stock Entry Detail,Additional Cost,Kosto shtesë
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +407,Financial Year End Date,Viti Financiar End Date
+apps/erpnext/erpnext/public/js/setup_wizard.js +155,Financial Year End Date,Viti Financiar End Date
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Voucher No, if grouped by Voucher","Nuk mund të filtruar në bazë të Voucher Jo, qoftë të grupuara nga Bonon"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +484,Make Supplier Quotation,Bëjnë Furnizuesi Kuotim
 DocType: Quality Inspection,Incoming,Hyrje
 DocType: BOM,Materials Required (Exploded),Materialet e nevojshme (Shpërtheu)
 DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),Ulja e Fituar për pushim pa pagesë (LWP)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +512,"Add users to your organization, other than yourself","Shto përdoruesve për organizatën tuaj, përveç vetes"
+apps/erpnext/erpnext/public/js/setup_wizard.js +256,"Add users to your organization, other than yourself","Shto përdoruesve për organizatën tuaj, përveç vetes"
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No {1} does not match with {2} {3},Row # {0}: serial {1} ​​nuk përputhet me {2} {3}
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +44,Casual Leave,Lini Rastesishme
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +44,Casual Leave,Lini Rastesishme
 DocType: Batch,Batch ID,ID Batch
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +334,Note: {0},Shënim: {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +336,Note: {0},Shënim: {0}
 ,Delivery Note Trends,Trendet ofrimit Shënim
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +104,This Week's Summary,Përmbledhja e kësaj jave
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +74,{0} must be a Purchased or Sub-Contracted Item in row {1},{0} duhet të jetë një element i blerë ose nën-kontraktuar në rresht {1}
@@ -3181,7 +3048,7 @@
 DocType: Purchase Receipt,Return Against Purchase Receipt,Kthehu përkundrejt marrjes Blerje
 DocType: Purchase Order,To Bill,Për Bill
 DocType: Material Request,% Ordered,% Urdhërohet
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +61,Piecework,Punë me copë
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Piecework,Punë me copë
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +64,Avg. Buying Rate,Avg. Blerja Rate
 DocType: Task,Actual Time (in Hours),Koha aktuale (në orë)
 DocType: Employee,History In Company,Historia Në kompanisë
@@ -3198,13 +3065,13 @@
 DocType: Opportunity,To Discuss,Për të diskutuar
 DocType: SMS Settings,SMS Settings,SMS Cilësimet
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +60,Temporary Accounts,Llogaritë e përkohshme
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +155,Black,E zezë
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Black,E zezë
 DocType: BOM Explosion Item,BOM Explosion Item,Bom Shpërthimi i artikullit
 DocType: Account,Auditor,Revizor
 DocType: Purchase Order,End date of current order's period,Data e fundit e periudhës së urdhrit aktual
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +17,Make Offer Letter,Të bëjë ofertën Letër
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +10,Return,Kthimi
-apps/erpnext/erpnext/stock/doctype/item/item.py +503,Default Unit of Measure for Variant must be same as Template,Default njësinë e matjes për Varianti duhet të jetë i njëjtë si Template
+apps/erpnext/erpnext/stock/doctype/item/item.py +507,Default Unit of Measure for Variant must be same as Template,Default njësinë e matjes për Varianti duhet të jetë i njëjtë si Template
 DocType: DocField,Fold,Dele
 DocType: Production Order Operation,Production Order Operation,Prodhimit Rendit Operacioni
 DocType: Pricing Rule,Disable,Disable
@@ -3215,13 +3082,12 @@
 DocType: Page,Page Name,Faqe
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +110,To Time must be greater than From Time,Për Koha duhet të jetë më e madhe se sa nga koha
 DocType: Journal Entry Account,Exchange Rate,Exchange Rate
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +465,Sales Order {0} is not submitted,Sales Order {0} nuk është dorëzuar
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +467,Sales Order {0} is not submitted,Sales Order {0} nuk është dorëzuar
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0}: Parent account {1} does not bolong to the company {2},Magazina {0}: llogari Parent {1} nuk Bolong të kompanisë {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +124,Spindle finishing,Gisht mbarimit
 DocType: BOM,Last Purchase Rate,Rate fundit Blerje
 DocType: Account,Asset,Pasuri
 DocType: Project Task,Task ID,Detyra ID
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +395,"e.g. ""MC""",p.sh. &quot;MC&quot;
+apps/erpnext/erpnext/public/js/setup_wizard.js +143,"e.g. ""MC""",p.sh. &quot;MC&quot;
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,Stock cannot exist for Item {0} since has variants,Stock nuk mund të ekzistojë për Item {0} pasi ka variante
 ,Sales Person-wise Transaction Summary,Sales Person-i mençur Përmbledhje Transaction
 DocType: System Settings,Time Zone,Time Zone
@@ -3230,9 +3096,7 @@
 DocType: Monthly Distribution,Monthly Distribution Percentages,Përqindjet mujore Shpërndarjes
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +16,The selected item cannot have Batch,Elementi i përzgjedhur nuk mund të ketë Serisë
 DocType: Delivery Note,% of materials delivered against this Delivery Note,% E materialeve dorëzuar kundër këtij notën shpërndarëse
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +151,Stapling,Stapling
 DocType: Customer,Customer Details,Detajet e klientit
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +105,Shaping,Formësimin
 DocType: Employee,Reports to,Raportet për
 DocType: SMS Settings,Enter url parameter for receiver nos,Shkruani parametër url për pranuesit nos
 DocType: Sales Invoice,Paid Amount,Paid Shuma
@@ -3241,13 +3105,13 @@
 DocType: Item Variant,Item Variant,Item Variant
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +15,Setting this Address Template as default as there is no other default,Vendosja këtë adresë Template si default pasi nuk ka asnjë mungesë tjetër
 apps/erpnext/erpnext/accounts/doctype/account/account.py +89,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Bilanci i llogarisë tashmë në Debitimit, ju nuk jeni i lejuar për të vendosur &quot;Bilanci Must Be &#39;si&#39; Credit&quot;"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +76,Quality Management,Menaxhimit të Cilësisë
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Quality Management,Menaxhimit të Cilësisë
 DocType: Production Planning Tool,Filter based on customer,Filter bazuar në klient
 DocType: Payment Tool Detail,Against Voucher No,Kundër Voucher Nr
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +47,Please enter quantity for Item {0},Ju lutemi shkruani sasine e artikullit {0}
 DocType: Employee External Work History,Employee External Work History,Punonjës historia e jashtme
 DocType: Tax Rule,Purchase,Blerje
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +34,Balance Qty,Bilanci Qty
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Balance Qty,Bilanci Qty
 DocType: Item Group,Parent Item Group,Grupi prind Item
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +21,{0} for {1},{0} për {1}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +96,Cost Centers,Qendrat e kostos
@@ -3257,12 +3121,12 @@
 DocType: Opportunity,Next Contact,Kontaktoni Next
 DocType: Employee,Employment Type,Lloji Punësimi
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,Mjetet themelore
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +84,Application period cannot be across two alocation records,Periudha e aplikimit nuk mund të jetë në dy regjistrave alokimin
 DocType: Item Group,Default Expense Account,Llogaria e albumit shpenzimeve
 DocType: Employee,Notice (days),Njoftim (ditë)
 DocType: Page,Yes,Po
 DocType: Tax Rule,Sales Tax Template,Template Sales Tax
 DocType: Employee,Encashment Date,Arkëtim Data
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +74,Electroforming,Elektroformim
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +179,"Against Voucher Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Kundër Bonon Lloji duhet të jetë një e Rendit Blerje, Blerje Faturë ose Journal Hyrja"
 DocType: Account,Stock Adjustment,Stock Rregullimit
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +34,Default Activity Cost exists for Activity Type - {0},Kosto e albumit Aktiviteti ekziston për Aktivizimi Tipi - {0}
@@ -3298,12 +3162,12 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,Depo nuk mund të fshihet si ekziston hyrja aksioneve librit për këtë depo.
 DocType: Company,Distribution,Shpërndarje
 apps/erpnext/erpnext/public/js/pos/pos.html +36,Amount Paid,Shuma e paguar
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +91,Project Manager,Menaxher i Projektit
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +72,Dispatch,Dërgim
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Project Manager,Menaxher i Projektit
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +72,Dispatch,Dërgim
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,Max zbritje lejohet për artikull: {0} është {1}%
 DocType: Customer,Default Taxes and Charges,Taksat dhe tarifat Default
 DocType: Account,Receivable,Arkëtueshme
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +268,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,Row # {0}: Nuk lejohet të ndryshojë Furnizuesit si Urdhër Blerje tashmë ekziston
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +263,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,Row # {0}: Nuk lejohet të ndryshojë Furnizuesit si Urdhër Blerje tashmë ekziston
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,Roli që i lejohet të paraqesë transaksionet që tejkalojnë limitet e kreditit përcaktuara.
 DocType: Sales Invoice,Supplier Reference,Furnizuesi Referenca
 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.","Nëse kontrolluar, bom për artikujt nën-kuvendit do të konsiderohen për marrjen e lëndëve të para. Përndryshe, të gjitha sendet nën-kuvendit do të trajtohen si lëndë e parë."
@@ -3311,8 +3175,8 @@
 DocType: Hub Settings,Seller Description,Shitës Përshkrim
 DocType: Employee Education,Qualification,Kualifikim
 DocType: Item Price,Item Price,Item Çmimi
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +48,Soap & Detergent,Sapun dhe detergjent
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +36,Motion Picture & Video,Motion Picture &amp; Video
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +48,Soap & Detergent,Sapun dhe detergjent
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +36,Motion Picture & Video,Motion Picture &amp; Video
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Urdhërohet
 DocType: Warehouse,Warehouse Name,Magazina Emri
 DocType: Naming Series,Select Transaction,Përzgjedhjen e transaksioneve
@@ -3321,7 +3185,6 @@
 DocType: BOM,Rate Of Materials Based On,Shkalla e materialeve në bazë të
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,Analtyics Mbështetje
 apps/erpnext/erpnext/accounts/doctype/accounts_settings/accounts_settings.py +27,Company is missing in warehouses {0},Kompania është e humbur në depo {0}
-DocType: Stock UOM Replace Utility,Stock UOM Replace Utility,Stock UOM Replace komunale
 DocType: POS Profile,Terms and Conditions,Termat dhe Kushtet
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,To Date should be within the Fiscal Year. Assuming To Date = {0},Deri më sot duhet të jetë brenda vitit fiskal. Duke supozuar në datën = {0}
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","Këtu ju mund të mbajë lartësia, pesha, alergji, shqetësimet mjekësore etj"
@@ -3333,7 +3196,7 @@
 DocType: Sales Order Item,For Production,Për Prodhimit
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +103,Please enter sales order in the above table,Ju lutem shkruani e rendit të shitjes në tabelën e mësipërme
 DocType: Project Task,View Task,Shiko Task
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +406,Your financial year begins on,Vitin e juaj financiare fillon më
+apps/erpnext/erpnext/public/js/setup_wizard.js +154,Your financial year begins on,Vitin e juaj financiare fillon më
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +46,Please enter Purchase Receipts,Ju lutemi shkruani Pranimet Blerje
 DocType: Sales Invoice,Get Advances Received,Get Përparimet marra
 DocType: Email Digest,Add/Remove Recipients,Add / Remove Recipients
@@ -3341,16 +3204,14 @@
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","Për të vendosur këtë vit fiskal si default, klikoni mbi &#39;Bëje si Default&#39;"
 apps/erpnext/erpnext/config/support.py +54,Setup incoming server for support email id. (e.g. support@example.com),Setup server hyrje për mbështetjen e email id. (P.sh. support@example.com)
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,Mungesa Qty
-apps/erpnext/erpnext/stock/doctype/item/item.py +528,Item variant {0} exists with same attributes,Item variant {0} ekziston me atributet e njëjta
+apps/erpnext/erpnext/stock/doctype/item/item.py +532,Item variant {0} exists with same attributes,Item variant {0} ekziston me atributet e njëjta
 DocType: Salary Slip,Salary Slip,Shqip paga
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +116,Burnishing,Burnishing
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +54,'To Date' is required,&quot;Deri më sot&quot; është e nevojshme
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,&quot;Deri më sot&quot; është e nevojshme
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","Generate paketim rrëshqet për paketat që do të dërgohen. Përdoret për të njoftuar numrin paketë, paketë përmbajtjen dhe peshën e saj."
 DocType: Sales Invoice Item,Sales Order Item,Sales Rendit Item
 DocType: Salary Slip,Payment Days,Ditët e pagesës
 DocType: BOM,Manage cost of operations,Menaxhuar koston e operacioneve
 DocType: Features Setup,Item Advanced,Item Avancuar
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +40,Hot rolling,Kodrina Hot
 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.","Kur ndonjë nga transaksionet e kontrolluara janë &quot;Dërguar&quot;, një email pop-up u hap automatikisht për të dërguar një email tek të lidhur &quot;Kontakt&quot; në këtë transaksion, me transaksionin si një shtojcë. Ky përdorues mund ose nuk mund të dërgoni email."
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,Cilësimet globale
 DocType: Employee Education,Employee Education,Arsimimi punonjës
@@ -3363,25 +3224,23 @@
 DocType: Customer,Sales Team Details,Detajet shitjet e ekipit
 DocType: Expense Claim,Total Claimed Amount,Shuma totale Pohoi
 apps/erpnext/erpnext/config/crm.py +22,Potential opportunities for selling.,Mundësi potenciale për të shitur.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +48,Sick Leave,Pushimi mjekësor
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +174,Invalid {0},Invalid {0}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +48,Sick Leave,Pushimi mjekësor
 DocType: Email Digest,Email Digest,Email Digest
 DocType: Delivery Note,Billing Address Name,Faturimi Adresa Emri
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +22,Department Stores,Dyqane
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,Dyqane
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +40,System Balance,Bilanci i Sistemit
 DocType: Workflow,Is Active,Është Aktiv
 apps/erpnext/erpnext/controllers/stock_controller.py +71,No accounting entries for the following warehouses,Nuk ka hyrje të kontabilitetit për magazinat e mëposhtme
 apps/erpnext/erpnext/projects/doctype/project/project.js +22,Save the document first.,Ruaj dokumentin e parë.
 DocType: Account,Chargeable,I dënueshëm
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +121,Linishing,Linishing
 DocType: Company,Change Abbreviation,Ndryshimi Shkurtesa
 DocType: Workflow State,Primary,Kryesor
 DocType: Expense Claim Detail,Expense Date,Shpenzim Data
 DocType: Item,Max Discount (%),Max Discount (%)
 DocType: Communication,More Information,Me shume informacion
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +70,Last Order Amount,Shuma Rendit Fundit
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +161,Blasting,Që prish
 DocType: Company,Warn,Paralajmëroj
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +111,Item valuation updated,Vlerësimi Item updated
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Çdo vërejtje të tjera, përpjekje të përmendet se duhet të shkoni në të dhënat."
 DocType: BOM,Manufacturing User,Prodhim i përdoruesit
 DocType: Purchase Order,Raw Materials Supplied,Lëndëve të para furnizuar
@@ -3391,7 +3250,7 @@
 DocType: Appraisal,Appraisal Template,Vlerësimi Template
 DocType: Communication,Email,Email
 DocType: Item Group,Item Classification,Klasifikimi i artikullit
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +89,Business Development Manager,Zhvillimin e Biznesit Manager
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Business Development Manager,Zhvillimin e Biznesit Manager
 DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,Mirëmbajtja Vizitoni Qëllimi
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.js +15,Period,Periudhë
 ,General Ledger,Përgjithshëm Ledger
@@ -3401,9 +3260,7 @@
 ,Itemwise Recommended Reorder Level,Itemwise Recommended reorder Niveli
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +264,Please select {0} first,"Ju lutem, përzgjidhni {0} parë"
 DocType: Features Setup,To get Item Group in details table,Për të marrë Group send në detaje tabelën e
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +67,Redrawing,Rishikimin
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +112,Batch {0} of Item {1} has expired.,Batch {0} i artikullit {1} ka skaduar.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +120,Etching,Gravurë
 DocType: Sales Invoice,Commission,Komision
 DocType: Address Template,"<h4>Default Template</h4>
 <p>Uses <a href=""http://jinja.pocoo.org/docs/templates/"">Jinja Templating</a> and all the fields of Address (including Custom Fields if any) will be available</p>
@@ -3437,7 +3294,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +340,Operation Time must be greater than 0 for Operation {0},Operacioni Koha duhet të jetë më e madhe se 0 për Operacionin {0}
 DocType: Supplier,Address and Contacts,Adresa dhe Kontakte
 DocType: UOM Conversion Detail,UOM Conversion Detail,UOM Konvertimi Detail
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +496,Keep it web friendly 900px (w) by 100px (h),Keep it web 900px miqësore (w) nga 100px (h)
+apps/erpnext/erpnext/public/js/setup_wizard.js +242,Keep it web friendly 900px (w) by 100px (h),Keep it web 900px miqësore (w) nga 100px (h)
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +329,Production Order cannot be raised against a Item Template,Rendit prodhimi nuk mund të ngrihet kundër një Template Item
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +44,Charges are updated in Purchase Receipt against each item,Akuzat janë përditësuar në pranimin Blerje kundër çdo send
 DocType: Payment Tool,Get Outstanding Vouchers,Get Vauçera papaguara
@@ -3453,54 +3310,49 @@
 DocType: Item,Average time taken by the supplier to deliver,Koha mesatare e marra nga furnizuesi për të ofruar
 DocType: Time Log,Hours,Orë
 DocType: Project,Expected Start Date,Pritet Data e Fillimit
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +38,Rolling,Rolling
 DocType: ToDo,Priority,Prioritet
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +41,Remove item if charges is not applicable to that item,Hiq pika në qoftë se akuza nuk është i zbatueshëm për këtë artikull
 DocType: Dropbox Backup,Dropbox Access Allowed,Dropbox Qasja e lejuar
 DocType: Dropbox Backup,Weekly,Javor
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,P.sh.. smsgateway.com/api/send_sms.cgi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +485,Receive,Merre
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +510,Receive,Merre
 DocType: Maintenance Visit,Fully Completed,Përfunduar Plotësisht
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% Complete
 DocType: Employee,Educational Qualification,Kualifikimi arsimor
 DocType: Workstation,Operating Costs,Shpenzimet Operative
 DocType: Employee Leave Approver,Employee Leave Approver,Punonjës Pushimi aprovuesi
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,{0} has been successfully added to our Newsletter list.,{0} është shtuar me sukses në listën tonë Newsletter.
-apps/erpnext/erpnext/stock/doctype/item/item.py +383,Row {0}: An Reorder entry already exists for this warehouse {1},Row {0}: Një hyrje Reorder tashmë ekziston për këtë depo {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +387,Row {0}: An Reorder entry already exists for this warehouse {1},Row {0}: Një hyrje Reorder tashmë ekziston për këtë depo {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +67,"Cannot declare as lost, because Quotation has been made.","Nuk mund të deklarojë si të humbur, sepse Kuotim i është bërë."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +133,Electron beam machining,Machining rreze elektron
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Blerje Master Menaxher
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +424,Production Order {0} must be submitted,Prodhimi Rendit {0} duhet të dorëzohet
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +150,Please select Start Date and End Date for Item {0},"Ju lutem, përzgjidhni Data e Fillimit Data e Përfundimit Kohëzgjatja për Item {0}"
 apps/erpnext/erpnext/config/stock.py +141,Main Reports,Raportet kryesore
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +102,Stock Ledger entries balances updated,Stock Ledger entries balancat updated
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,Deri më sot nuk mund të jetë e para nga data e
 DocType: Purchase Receipt Item,Prevdoc DocType,Prevdoc DOCTYPE
-apps/erpnext/erpnext/stock/doctype/item/item.js +176,Add / Edit Prices,Add / Edit Çmimet
+apps/erpnext/erpnext/stock/doctype/item/item.js +178,Add / Edit Prices,Add / Edit Çmimet
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +53,Chart of Cost Centers,Grafiku i Qendrave te Kostos
 ,Requested Items To Be Ordered,Items kërkuar të Urdhërohet
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +298,My Orders,Urdhërat e mia
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +293,My Orders,Urdhërat e mia
 DocType: Price List,Price List Name,Lista e Çmimeve Emri
 DocType: Time Log,For Manufacturing,Për Prodhim
-apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +70,Totals,Totalet
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +174,Totals,Totalet
 DocType: BOM,Manufacturing,Prodhim
 ,Ordered Items To Be Delivered,Items urdhëroi që do të dërgohen
 DocType: Account,Income,Të ardhura
 ,Setup Wizard,Setup Wizard
 DocType: Industry Type,Industry Type,Industria Type
 apps/erpnext/erpnext/templates/includes/cart.js +137,Something went wrong!,Diçka shkoi keq!
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +68,Warning: Leave application contains following block dates,Warning: Lini aplikimi përmban datat e mëposhtme bllok
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +251,Sales Invoice {0} has already been submitted,Shitjet Faturë {0} tashmë është dorëzuar
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +100,Warning: Leave application contains following block dates,Warning: Lini aplikimi përmban datat e mëposhtme bllok
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +256,Sales Invoice {0} has already been submitted,Shitjet Faturë {0} tashmë është dorëzuar
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,Data e përfundimit
 DocType: Purchase Invoice Item,Amount (Company Currency),Shuma (Kompania Valuta)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +10,Die casting,Hedh vdesin
 DocType: Email Alert,Reference Date,Referenca Data
 apps/erpnext/erpnext/config/hr.py +105,Organization unit (department) master.,Njësia Organizata (departamenti) mjeshtër.
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +25,Please enter valid mobile nos,Ju lutemi shkruani nos celular vlefshme
 DocType: Budget Detail,Budget Detail,Detail Buxheti
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +75,Please enter message before sending,Ju lutem shkruani mesazhin para se të dërgonte
 DocType: Async Task,Status,Gjendje
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +65,Stock UOM updated for Item {0},Stock UOM përditësuar për Item {0}
 DocType: Company History,Year,Vit
 apps/erpnext/erpnext/config/accounts.py +127,Point-of-Sale Profile,Point-of-Sale Profilin
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +68,Please Update SMS Settings,Ju lutem Update SMS Settings
@@ -3514,12 +3366,12 @@
 ,Serial No Service Contract Expiry,Serial Asnjë Shërbimit Kontratë Expiry
 DocType: Item,Unit of Measure Conversion,Njësia e masës këmbimit
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +86,Employee can not be changed,Punonjësi nuk mund të ndryshohet
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +259,You cannot credit and debit same account at the same time,Ju nuk mund të kreditit dhe debitit njëjtën llogari në të njëjtën kohë
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,You cannot credit and debit same account at the same time,Ju nuk mund të kreditit dhe debitit njëjtën llogari në të njëjtën kohë
 DocType: Naming Series,Help HTML,Ndihmë HTML
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},Weightage Gjithsej caktuar duhet të jetë 100%. Kjo është {0}
 apps/erpnext/erpnext/controllers/status_updater.py +140,Allowance for over-{0} crossed for Item {1},Kompensimi për tejkalimin {0} kaloi për Item {1}
 DocType: Address,Name of person or organization that this address belongs to.,Emri i personit ose organizatës që kjo adresë takon.
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +587,Your Suppliers,Furnizuesit tuaj
+apps/erpnext/erpnext/public/js/setup_wizard.js +325,Your Suppliers,Furnizuesit tuaj
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,Nuk mund të vendosur si Humbur si Sales Order është bërë.
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +65,Another Salary Structure {0} is active for employee {1}. Please make its status 'Inactive' to proceed.,Një tjetër Struktura Paga {0} është aktive për punonjës {1}. Ju lutemi të bëjë statusi i saj &quot;jo aktive&quot; për të vazhduar.
 DocType: Purchase Invoice,Contact,Kontakt
@@ -3528,37 +3380,35 @@
 DocType: Item,Has Serial No,Nuk ka Serial
 DocType: Employee,Date of Issue,Data e lëshimit
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +16,{0}: From {0} for {1},{0}: Nga {0} për {1}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +154,Row #{0}: Set Supplier for item {1},Row # {0}: Furnizuesi Set për pika {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +149,Row #{0}: Set Supplier for item {1},Row # {0}: Furnizuesi Set për pika {1}
 DocType: Issue,Content Type,Përmbajtja Type
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +17,Computer,Kompjuter
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,Kompjuter
 DocType: Item,List this Item in multiple groups on the website.,Lista këtë artikull në grupe të shumta në faqen e internetit.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +283,Please check Multi Currency option to allow accounts with other currency,Ju lutem kontrolloni opsionin Multi Valuta për të lejuar llogaritë me valutë tjetër
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +285,Please check Multi Currency option to allow accounts with other currency,Ju lutem kontrolloni opsionin Multi Valuta për të lejuar llogaritë me valutë tjetër
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +62,Item: {0} does not exist in the system,Item: {0} nuk ekziston në sistemin
 apps/erpnext/erpnext/accounts/doctype/account/account.py +81,You are not authorized to set Frozen value,Ju nuk jeni i autorizuar për të vendosur vlerën e ngrira
 DocType: Payment Reconciliation,Get Unreconciled Entries,Get Unreconciled Entries
 DocType: Cost Center,Budgets,Buxhetet
 apps/frappe/frappe/core/page/modules_setup/modules_setup.py +11,Updated,Përditësuar
 DocType: Employee,Emergency Contact Details,Detajet emergjente Kontakt
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +396,What does it do?,Çfarë do të bëni?
+apps/erpnext/erpnext/public/js/setup_wizard.js +144,What does it do?,Çfarë do të bëni?
 DocType: Delivery Note,To Warehouse,Për Magazina
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +45,Account {0} has been entered more than once for fiscal year {1},Llogaria {0} ka hyrë më shumë se një herë për vitin fiskal {1}
 ,Average Commission Rate,Mesatare Rate Komisioni
-apps/erpnext/erpnext/stock/doctype/item/item.py +313,'Has Serial No' can not be 'Yes' for non-stock item,&#39;Nuk ka Serial&#39; nuk mund të jetë &#39;Po&#39; për jo-aksioneve artikull
+apps/erpnext/erpnext/stock/doctype/item/item.py +317,'Has Serial No' can not be 'Yes' for non-stock item,&#39;Nuk ka Serial&#39; nuk mund të jetë &#39;Po&#39; për jo-aksioneve artikull
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Attendance can not be marked for future dates,Pjesëmarrja nuk mund të shënohet për datat e ardhshme
 DocType: Pricing Rule,Pricing Rule Help,Rregulla e Çmimeve Ndihmë
 DocType: Purchase Taxes and Charges,Account Head,Shef llogari
 apps/erpnext/erpnext/config/stock.py +79,Update additional costs to calculate landed cost of items,Update shpenzimet shtesë për të llogaritur koston ul të artikujve
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +111,Electrical,Elektrik
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +111,Electrical,Elektrik
 DocType: Stock Entry,Total Value Difference (Out - In),Gjithsej Diferenca Vlera (Out - In)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +302,Row {0}: Exchange Rate is mandatory,Row {0}: Exchange Rate është i detyrueshëm
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +304,Row {0}: Exchange Rate is mandatory,Row {0}: Exchange Rate është i detyrueshëm
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},Përdoruesi ID nuk është caktuar për punonjësit {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +72,Peening,Peening
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,From Warranty Claim,Nga Garanci Kërkesës
 DocType: Stock Entry,Default Source Warehouse,Gabim Burimi Magazina
 DocType: Item,Customer Code,Kodi Klientit
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +212,Birthday Reminder for {0},Vërejtje ditëlindjen për {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +163,Lapping,Lapping
-apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.js +8,Days Since Last Order,Ditët Që Rendit Fundit
+apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +72,Days Since Last Order,Ditët Që Rendit Fundit
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +299,Debit To account must be a Balance Sheet account,Debi Për shkak duhet të jetë një llogari Bilanci i Gjendjes
 DocType: Buying Settings,Naming Series,Emërtimi Series
 DocType: Leave Block List,Leave Block List Name,Dërgo Block Lista Emri
@@ -3572,7 +3422,7 @@
 DocType: Notification Control,Sales Invoice Message,Mesazh Shitjet Faturë
 DocType: Authorization Rule,Based On,Bazuar në
 DocType: Sales Order Item,Ordered Qty,Urdhërohet Qty
-apps/erpnext/erpnext/stock/doctype/item/item.py +539,Item {0} is disabled,Item {0} është me aftësi të kufizuara
+apps/erpnext/erpnext/stock/doctype/item/item.py +543,Item {0} is disabled,Item {0} është me aftësi të kufizuara
 DocType: Stock Settings,Stock Frozen Upto,Stock ngrira Upto
 apps/erpnext/erpnext/controllers/recurring_document.py +166,Period From and Period To dates mandatory for recurring {0},Periudha nga dhe periudha në datat e detyrueshme për të përsëritura {0}
 apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,Aktiviteti i projekt / detyra.
@@ -3582,7 +3432,6 @@
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,Discount duhet të jetë më pak se 100
 DocType: ToDo,Low,Ulët
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Shkruaj Off Shuma (Kompania Valuta)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +71,Spinning,Tjerrje
 DocType: Landed Cost Voucher,Landed Cost Voucher,Zbarkoi Voucher Kosto
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +55,Please set {0},Ju lutemi të vendosur {0}
 DocType: Purchase Invoice,Repeat on Day of Month,Përsëriteni në Ditën e Muajit
@@ -3604,7 +3453,6 @@
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +37,Campaign Name is required,Emri Fushata është e nevojshme
 DocType: Maintenance Visit,Maintenance Date,Mirëmbajtja Data
 DocType: Purchase Receipt Item,Rejected Serial No,Refuzuar Nuk Serial
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +51,Deep drawing,Vizatim të thellë
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +40,New Newsletter,New Newsletter
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +157,Start date should be less than end date for Item {0},Data e fillimit duhet të jetë më pak se data përfundimtare e artikullit {0}
 apps/erpnext/erpnext/stock/doctype/item/item.js +17,Show Balance,Shfaq Bilanci
@@ -3614,7 +3462,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +119,BOM and Manufacturing Quantity are required,BOM dhe Prodhim Sasi janë të nevojshme
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Gama plakjen 2
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +450,Amount,Sasi
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +147,Riveting,Riveting
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,Bom zëvendësohet
 ,Sales Analytics,Sales Analytics
 DocType: Manufacturing Settings,Manufacturing Settings,Prodhim Cilësimet
@@ -3626,20 +3473,19 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +207,New Account Name,New Emri i llogarisë
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,Kosto të lëndëve të para furnizuar
 DocType: Selling Settings,Settings for Selling Module,Cilësimet për shitjen Module
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +73,Customer Service,Shërbimi ndaj klientit
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Customer Service,Shërbimi ndaj klientit
 DocType: Item,Thumbnail,Thumbnail
 DocType: Item Customer Detail,Item Customer Detail,Item Detail Klientit
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +147,Confirm Your Email,Konfirmo Email juaj
 apps/erpnext/erpnext/config/hr.py +53,Offer candidate a Job.,Oferta kandidat a Job.
 DocType: Notification Control,Prompt for Email on Submission of,Prompt për Dërgoje në dorëzimin e
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +81,Total allocated leaves are more than days in the period,Gjithsej gjethet e ndara janë më shumë se ditë në periudhën
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +70,Item {0} must be a stock Item,Item {0} duhet të jetë një gjendje Item
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,Default Puna Në Magazina Progresit
 apps/erpnext/erpnext/config/accounts.py +107,Default settings for accounting transactions.,Default settings për transaksionet e kontabilitetit.
 apps/frappe/frappe/model/naming.py +40,{0} is required,{0} është e nevojshme
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +21,Vacuum molding,Vakum i derdhur
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,Data e pritshme nuk mund të jetë e para materiale Kërkesë Data
 DocType: Contact Us Settings,City,Qytet
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +132,Ultrasonic machining,Përpunimit tejzanor
 apps/frappe/frappe/templates/base.html +137,Error: Not a valid id?,Gabim: Nuk është një ID të vlefshme?
 apps/erpnext/erpnext/stock/get_item_details.py +125,Item {0} must be a Sales Item,Item {0} duhet të jetë një Sales Item
 DocType: Naming Series,Update Series Number,Update Seria Numri
@@ -3647,7 +3493,7 @@
 DocType: Sales Order,Printing Details,Shtypi Detajet
 DocType: Task,Closing Date,Data e mbylljes
 DocType: Sales Order Item,Produced Quantity,Sasia e prodhuar
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +84,Engineer,Inxhinier
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Engineer,Inxhinier
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,Kuvendet Kërko Nën
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +379,Item Code required at Row No {0},Kodi i artikullit kërkohet në radhë nr {0}
 DocType: Sales Partner,Partner Type,Lloji Partner
@@ -3655,7 +3501,7 @@
 DocType: Authorization Rule,Customerwise Discount,Customerwise Discount
 DocType: Purchase Invoice,Against Expense Account,Kundër Llogaria shpenzimeve
 DocType: Production Order,Production Order,Rendit prodhimit
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +258,Installation Note {0} has already been submitted,Instalimi Shënim {0} tashmë është dorëzuar
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +263,Installation Note {0} has already been submitted,Instalimi Shënim {0} tashmë është dorëzuar
 DocType: Quotation Item,Against Docname,Kundër Docname
 DocType: SMS Center,All Employee (Active),Të gjitha Punonjës (Aktive)
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,Shiko Tani
@@ -3664,19 +3510,19 @@
 DocType: Item,Re-Order Level,Re-Rendit nivel
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,Shkruani artikuj dhe Qty planifikuar për të cilën ju doni të rritur urdhërat e prodhimit ose shkarkoni materiale të papërpunuara për analizë.
 apps/frappe/frappe/public/js/frappe/views/ganttview.js +45,Gantt Chart,Gantt Chart
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +57,Part-time,Me kohë të pjesshme
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,Part-time,Me kohë të pjesshme
 DocType: Employee,Applicable Holiday List,Zbatueshme Lista Holiday
 DocType: Employee,Cheque,Çek
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,Seria Përditësuar
 apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Report Type is mandatory,Raporti Lloji është i detyrueshëm
 DocType: Item,Serial Number Series,Serial Number Series
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},Depoja është e detyrueshme për aksioneve Item {0} në rresht {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +45,Retail & Wholesale,Shitje me pakicë dhe shumicë
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,Shitje me pakicë dhe shumicë
 DocType: Issue,First Responded On,Së pari u përgjigj më
 DocType: Website Item Group,Cross Listing of Item in multiple groups,Kryqi Listimi i artikullit në grupe të shumta
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +351,The First User: You,Së pari Përdoruesi: Ju
+apps/erpnext/erpnext/public/js/setup_wizard.js +101,The First User: You,Së pari Përdoruesi: Ju
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +48,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},Viti Fiskal Data e Fillimit dhe Viti Fiskal Fundi Data e janë vendosur tashmë në vitin fiskal {0}
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +172,Successfully Reconciled,Harmonizuar me sukses
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +119,Successfully Reconciled,Harmonizuar me sukses
 DocType: Production Order,Planned End Date,Planifikuar Data e Përfundimit
 apps/erpnext/erpnext/config/stock.py +43,Where items are stored.,Ku sendet janë ruajtur.
 DocType: Tax Rule,Validity,Vlefshmëri
@@ -3696,39 +3542,36 @@
 DocType: DocPerm,Level,Nivel
 DocType: Purchase Taxes and Charges,On Net Total,On Net Total
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +160,Target warehouse in row {0} must be same as Production Order,Magazinë synuar në radhë {0} duhet të jetë i njëjtë si Rendit Prodhimi
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +59,No permission to use Payment Tool,Nuk ka leje për të përdorur mjet pagese
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +97,No permission to use Payment Tool,Nuk ka leje për të përdorur mjet pagese
 apps/erpnext/erpnext/controllers/recurring_document.py +192,'Notification Email Addresses' not specified for recurring %s,&quot;Njoftimi Email Adresat &#39;jo të specifikuara për përsëritura% s
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +86,Milling,Mulliri
 apps/erpnext/erpnext/accounts/doctype/account/account.py +99,Currency can not be changed after making entries using some other currency,"Valuta nuk mund të ndryshohet, pasi duke e bërë shënimet duke përdorur disa valutë tjetër"
 DocType: Company,Round Off Account,Rrumbullakët Off Llogari
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +60,Nibbling,Nibbling
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,Shpenzimet administrative
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +18,Consulting,Këshillues
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +18,Consulting,Këshillues
 DocType: Customer Group,Parent Customer Group,Grupi prind Klientit
 apps/erpnext/erpnext/public/js/pos/pos.js +429,Change,Ndryshim
 DocType: Purchase Invoice,Contact Email,Kontakti Email
 DocType: Appraisal Goal,Score Earned,Vota fituara
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +393,"e.g. ""My Company LLC""",p.sh. &quot;My Company LLC&quot;
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +173,Notice Period,Periudha Njoftim
+apps/erpnext/erpnext/public/js/setup_wizard.js +141,"e.g. ""My Company LLC""",p.sh. &quot;My Company LLC&quot;
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +173,Notice Period,Periudha Njoftim
 DocType: Bank Reconciliation Detail,Voucher ID,Voucher ID
 apps/erpnext/erpnext/setup/doctype/territory/territory.js +14,This is a root territory and cannot be edited.,Kjo është një territor rrënjë dhe nuk mund të redaktohen.
 DocType: Packing Slip,Gross Weight UOM,Bruto Pesha UOM
 DocType: Email Digest,Receivables / Payables,Arketueshme / Te Pagueshme
 DocType: Delivery Note Item,Against Sales Invoice,Kundër Sales Faturës
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +63,Stamping,Vulosje
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +457,Credit Account,Llogaria e Kredisë
 DocType: Landed Cost Item,Landed Cost Item,Kosto zbarkoi Item
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +56,Show zero values,Trego zero vlerat
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,Sasia e sendit të marra pas prodhimit / ripaketimin nga sasi të caktuara të lëndëve të para
 DocType: Payment Reconciliation,Receivable / Payable Account,Arkëtueshme / pagueshme Llogaria
 DocType: Delivery Note Item,Against Sales Order Item,Kundër Sales Rendit Item
-apps/erpnext/erpnext/stock/doctype/item/item.py +521,Please specify Attribute Value for attribute {0},Ju lutem specifikoni atribut Vlera për atribut {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +525,Please specify Attribute Value for attribute {0},Ju lutem specifikoni atribut Vlera për atribut {0}
 DocType: Item,Default Warehouse,Gabim Magazina
 DocType: Task,Actual End Date (via Time Logs),Aktuale End Date (nëpërmjet Koha Shkrime)
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +37,Budget cannot be assigned against Group Account {0},Buxheti nuk mund të caktohet kundër Llogaria Grupit {0}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +23,Please enter parent cost center,Ju lutemi shkruani qendra kosto prind
 DocType: Delivery Note,Print Without Amount,Print Pa Shuma
-apps/erpnext/erpnext/controllers/buying_controller.py +69,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,Tatimore Kategoria nuk mund të jetë &#39;vlerësim të&#39; ose &#39;Vlerësimi dhe Total&#39; si të gjitha sendet janë objekte jo-aksioneve
+apps/erpnext/erpnext/controllers/buying_controller.py +60,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,Tatimore Kategoria nuk mund të jetë &#39;vlerësim të&#39; ose &#39;Vlerësimi dhe Total&#39; si të gjitha sendet janë objekte jo-aksioneve
 DocType: User,Last Name,Mbiemër
 DocType: Web Page,Left,Majtas
 DocType: Event,All Day,Të gjitha Day
@@ -3736,7 +3579,7 @@
 DocType: Appraisal,Total Score (Out of 5),Rezultati i përgjithshëm (nga 5)
 DocType: Contact Us Settings,State,Shtet
 DocType: Batch,Batch,Grumbull
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +51,Balance,Ekuilibër
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +28,Balance,Ekuilibër
 DocType: Project,Total Expense Claim (via Expense Claims),Gjithsej Kërkesa shpenzimeve (nëpërmjet kërkesave shpenzime)
 DocType: User,Gender,Gjini
 DocType: Journal Entry,Debit Note,Debiti Shënim
@@ -3766,8 +3609,7 @@
 DocType: Purchase Order,Get Last Purchase Rate,Get fundit Blerje Vlerësoni
 DocType: Time Log,Billing Rate based on Activity Type (per hour),Vlerësoni Faturimi bazuar në aktivitet të llojit (në orë)
 DocType: Company,Company Info,Company Info
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +76,Seaming,Seaming
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +197,"Company Email ID not found, hence mail not sent","Kompania Email ID nuk u gjet, prandaj nuk mail dërguar"
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +206,"Company Email ID not found, hence mail not sent","Kompania Email ID nuk u gjet, prandaj nuk mail dërguar"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Aplikimi i mjeteve (aktiveve)
 DocType: Production Planning Tool,Filter based on item,Filter bazuar në pikën
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +451,Debit Account,Llogaria Debiti
@@ -3779,17 +3621,16 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +95,{0} {1} has been modified. Please refresh.,{0} {1} është modifikuar. Ju lutem refresh.
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,Stop përdoruesit nga bërja Dërgo Aplikacione në ditët në vijim.
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +591,From Opportunity,Nga Opportunity
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +46,Blanking,Boshatisjes
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +166,Employee Benefits,Përfitimet e Punonjësve
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,Employee Benefits,Përfitimet e Punonjësve
 DocType: Sales Invoice,Is POS,Është POS
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +240,Packed quantity must equal quantity for Item {0} in row {1},Sasia e mbushur duhet të barabartë sasi për Item {0} në rresht {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +245,Packed quantity must equal quantity for Item {0} in row {1},Sasia e mbushur duhet të barabartë sasi për Item {0} në rresht {1}
 DocType: Production Order,Manufactured Qty,Prodhuar Qty
 DocType: Purchase Receipt Item,Accepted Quantity,Sasi të pranuar
 apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} nuk ekziston
 apps/erpnext/erpnext/config/accounts.py +18,Bills raised to Customers.,Faturat e ngritura për të Konsumatorëve.
 DocType: DocField,Default,Mospagim
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Projekti Id
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +466,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Row Asnjë {0}: Shuma nuk mund të jetë më e madhe se pritje Shuma kundër shpenzimeve sipas Pretendimit {1}. Në pritje Shuma është {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +468,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Row Asnjë {0}: Shuma nuk mund të jetë më e madhe se pritje Shuma kundër shpenzimeve sipas Pretendimit {1}. Në pritje Shuma është {2}
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +40,{0} subscribers added,{0} abonentë shtuar
 DocType: Maintenance Schedule,Schedule,Orar
 DocType: Cost Center,"Define Budget for this Cost Center. To set budget action, see ""Company List""","Define Buxheti për këtë qendër kosto. Për të vendosur veprimin e buxhetit, shih &quot;Lista e Kompanive&quot;"
@@ -3800,7 +3641,7 @@
 apps/erpnext/erpnext/public/js/pos/pos.js +91,Price List not found or disabled,Lista e Çmimeve nuk u gjet ose me aftësi të kufizuara
 DocType: Expense Claim,Approved,I miratuar
 DocType: Pricing Rule,Price,Çmim
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +79,Employee relieved on {0} must be set as 'Left',Punonjës lirohet për {0} duhet të jetë vendosur si &#39;majtë&#39;
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +88,Employee relieved on {0} must be set as 'Left',Punonjës lirohet për {0} duhet të jetë vendosur si &#39;majtë&#39;
 DocType: Item,"Selecting ""Yes"" will give a unique identity to each entity of this item which can be viewed in the Serial No master.",Përzgjedhja &quot;Po&quot; do të japë një identitet unik për çdo subjekt të këtij artikulli i cili mund të shihet në Serial Nr mjeshtri.
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +39,Appraisal {0} created for Employee {1} in the given date range,Vlerësimi {0} krijuar për punonjësit {1} në datën e caktuar varg
 DocType: Employee,Education,Arsim
@@ -3811,7 +3652,7 @@
 apps/frappe/frappe/desk/moduleview.py +67,Standard Reports,Raportet Standard
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,Rregjistrimet në ditar të kontabilitetit.
 DocType: Delivery Note Item,Available Qty at From Warehouse,Qty në dispozicion në nga depo
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +209,Please select Employee Record first.,"Ju lutem, përzgjidhni Record punonjës parë."
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +224,Please select Employee Record first.,"Ju lutem, përzgjidhni Record punonjës parë."
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Row {0}: Partia / Llogaria nuk përputhet me {1} / {2} në {3} {4}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +35,To create a Tax Account,Për të krijuar një Llogari Tatimore
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +233,Please enter Expense Account,Ju lutemi shkruani Llogari kurriz
@@ -3824,46 +3665,43 @@
 DocType: Sales Order,Track this Sales Order against any Project,Përcjell këtë Urdhër Sales kundër çdo Projektit
 DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,"Shitjes tërheq urdhëron (në pritje për të ofruar), bazuar në kriteret e mësipërme"
 DocType: DocShare,Document Type,Dokumenti Type
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +565,From Supplier Quotation,Nga furnizuesi Kuotim
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +588,From Supplier Quotation,Nga furnizuesi Kuotim
 DocType: Deduction Type,Deduction Type,Zbritja Type
 DocType: Attendance,Half Day,Gjysma Dita
 DocType: Pricing Rule,Min Qty,Min Qty
 DocType: Features Setup,"To track items in sales and purchase documents with batch nos. ""Preferred Industry: Chemicals""",Për të ndjekur artikuj në shitje dhe dokumentet e blerjes me nr grumbull. &quot;Industria e preferuar: Kimikatet&quot;
 DocType: GL Entry,Transaction Date,Transaksioni Data
 DocType: Production Plan Item,Planned Qty,Planifikuar Qty
-apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +91,Total Tax,Tatimi Total
+apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +93,Total Tax,Tatimi Total
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +178,For Quantity (Manufactured Qty) is mandatory,Për sasinë (Prodhuar Qty) është i detyrueshëm
 DocType: Stock Entry,Default Target Warehouse,Gabim Magazina Target
 DocType: Purchase Invoice,Net Total (Company Currency),Net Total (Kompania Valuta)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +79,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Row {0}: Partia Lloji dhe Partia është i zbatueshëm vetëm kundër arkëtueshme / pagueshme llogari
 DocType: Notification Control,Purchase Receipt Message,Blerje Pranimi Mesazh
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +95,Total allocated leaves are more than period,Gjithsej gjethet e ndara janë më shumë se periudha
 DocType: Production Order,Actual Start Date,Aktuale Data e Fillimit
 DocType: Sales Order,% of materials delivered against this Sales Order,% E materialeve dorëzuar kundër këtij Rendit Shitje
 apps/erpnext/erpnext/config/stock.py +23,Record item movement.,Lëvizja rekord pika.
 DocType: Newsletter List Subscriber,Newsletter List Subscriber,Newsletter Lista Subscriber
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +164,Morticing,Morticing
 DocType: Email Account,Service,Shërbim
 DocType: Hub Settings,Hub Settings,Hub Cilësimet
 DocType: Project,Gross Margin %,Marzhi bruto%
 DocType: BOM,With Operations,Me Operacioneve
 apps/erpnext/erpnext/accounts/party.py +232,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,"Regjistrimet kontabël tashmë janë bërë në monedhën {0} për kompaninë {1}. Ju lutem, përzgjidhni një llogari arkëtueshëm ose të pagueshëm me monedhën {0}."
 ,Monthly Salary Register,Paga mujore Regjistrohu
-apps/frappe/frappe/website/template.py +140,Next,Tjetër
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard_page.html +17,Next,Tjetër
 DocType: Warranty Claim,If different than customer address,Nëse është e ndryshme se sa adresën e konsumatorëve
 DocType: BOM Operation,BOM Operation,Bom Operacioni
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +118,Electropolishing,Electropolishing
 DocType: Purchase Taxes and Charges,On Previous Row Amount,Në Shuma Previous Row
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +24,Please enter Payment Amount in atleast one row,Ju lutem shkruani Shuma për pagesë në atleast një rresht
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +33,Please enter Payment Amount in atleast one row,Ju lutem shkruani Shuma për pagesë në atleast një rresht
 DocType: POS Profile,POS Profile,POS Profilin
 apps/erpnext/erpnext/config/accounts.py +153,"Seasonality for setting budgets, targets etc.","Sezonalitetit për vendosjen buxhetet, objektivat etj"
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +238,Row {0}: Payment Amount cannot be greater than Outstanding Amount,Row {0}: Shuma e pagesës nuk mund të jetë më e madhe se shuma e papaguar
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +46,Total Unpaid,Gjithsej papaguar
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +21,Time Log is not billable,Koha Identifikohu nuk është billable
 apps/erpnext/erpnext/stock/get_item_details.py +128,"Item {0} is a template, please select one of its variants","Item {0} është një template, ju lutem zgjidhni një nga variantet e saj"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +528,Purchaser,Blerës
+apps/erpnext/erpnext/public/js/setup_wizard.js +272,Purchaser,Blerës
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +81,Net pay cannot be negative,Paguajnë neto nuk mund të jetë negative
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +71,Please enter the Against Vouchers manually,Ju lutem shkruani kundër Vauçera dorë
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +107,Please enter the Against Vouchers manually,Ju lutem shkruani kundër Vauçera dorë
 DocType: SMS Settings,Static Parameters,Parametrat statike
 DocType: Purchase Order,Advance Paid,Advance Paid
 DocType: Item,Item Tax,Tatimi i artikullit
@@ -3872,14 +3710,12 @@
 apps/erpnext/erpnext/config/crm.py +48,Send mass SMS to your contacts,Dërgo SMS në masë për kontaktet tuaja
 DocType: Purchase Taxes and Charges,Consider Tax or Charge for,Konsideroni tatimit apo detyrimit për
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,Aktuale Qty është e detyrueshme
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +42,Cross-rolling,Cross-kodrina
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +132,Credit Card,Credit Card
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +132,Credit Card,Credit Card
 DocType: BOM,Item to be manufactured or repacked,Pika për të prodhuar apo ripaketohen
 apps/erpnext/erpnext/config/stock.py +95,Default settings for stock transactions.,Default settings për transaksionet e aksioneve.
 DocType: Purchase Invoice,Next Date,Next Data
 DocType: Employee Education,Major/Optional Subjects,/ Subjektet e mëdha fakultative
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +49,Please enter Taxes and Charges,Ju lutemi shkruani taksat dhe tatimet
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +85,Machining,Machining
 DocType: Sales Invoice Item,Drop Ship,Drop Ship
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","Këtu ju mund të mbajë të dhënat e familjes si emrin dhe profesionin e prindërve, bashkëshortit dhe fëmijëve"
 DocType: Hub Settings,Seller Name,Shitës Emri
@@ -3889,7 +3725,7 @@
 DocType: Stock Entry,Repack,Ripaketoi
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +6,You must Save the form before proceeding,Ju duhet të ruani formën para se të vazhdoni
 DocType: Item Attribute,Numeric Values,Vlerat numerike
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +500,Attach Logo,Bashkangjit Logo
+apps/erpnext/erpnext/public/js/setup_wizard.js +246,Attach Logo,Bashkangjit Logo
 DocType: Customer,Commission Rate,Rate Komisioni
 apps/erpnext/erpnext/stock/doctype/item/item.js +38,Make Variant,Bëni Variant
 apps/erpnext/erpnext/config/hr.py +145,Block leave applications by department.,Aplikacionet pushimit bllok nga departamenti.
@@ -3904,19 +3740,19 @@
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +105,Please select a csv file,"Ju lutem, përzgjidhni një skedar CSV"
 DocType: Dropbox Backup,Send Backups to Dropbox,Dërgo Backups të Dropbox
 DocType: Purchase Order,To Receive and Bill,Për të marrë dhe Bill
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +94,Designer,Projektues
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Designer,Projektues
 apps/erpnext/erpnext/config/selling.py +121,Terms and Conditions Template,Termat dhe Kushtet Template
 DocType: Serial No,Delivery Details,Detajet e ofrimit të
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +383,Cost Center is required in row {0} in Taxes table for type {1},Qendra Kosto është e nevojshme në rresht {0} në Tatimet tryezë për llojin {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +386,Cost Center is required in row {0} in Taxes table for type {1},Qendra Kosto është e nevojshme në rresht {0} në Tatimet tryezë për llojin {1}
 DocType: Item,Automatically create Material Request if quantity falls below this level,Automatikisht të krijojë materiale Kërkesë nëse sasia bie nën këtë nivel
 ,Item-wise Purchase Register,Pika-mençur Blerje Regjistrohu
 DocType: Batch,Expiry Date,Data e Mbarimit
-apps/erpnext/erpnext/stock/doctype/item/item.py +375,"To set reorder level, item must be a Purchase Item or Manufacturing Item","Për të vendosur nivelin Reorder, pika duhet të jetë një artikull i blerë ose Prodhim Item"
+apps/erpnext/erpnext/stock/doctype/item/item.py +379,"To set reorder level, item must be a Purchase Item or Manufacturing Item","Për të vendosur nivelin Reorder, pika duhet të jetë një artikull i blerë ose Prodhim Item"
 ,Supplier Addresses and Contacts,Adresat Furnizues dhe Kontaktet
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,Ju lutemi zgjidhni kategorinë e parë
 apps/erpnext/erpnext/config/projects.py +18,Project master.,Mjeshtër projekt.
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,A nuk tregojnë ndonjë simbol si $ etj ardhshëm të valutave.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +330, (Half Day),(Gjysme Dite)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +374, (Half Day),(Gjysme Dite)
 DocType: Supplier,Credit Days,Ditët e kreditit
 DocType: Leave Type,Is Carry Forward,Është Mbaj Forward
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +478,Get Items from BOM,Të marrë sendet nga bom
@@ -3924,7 +3760,7 @@
 apps/erpnext/erpnext/config/manufacturing.py +120,Bill of Materials,Bill e materialeve
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +77,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Row {0}: Partia Lloji dhe Partia është e nevojshme për arkëtueshme / pagueshme llogari {1}
 DocType: Dropbox Backup,Send Notifications To,Dërgo Lajmërimet Për
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html +26,Ref Date,Ref Data
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +54,Ref Date,Ref Data
 DocType: Employee,Reason for Leaving,Arsyeja e largimit
 DocType: Expense Claim Detail,Sanctioned Amount,Shuma e sanksionuar
 DocType: GL Entry,Is Opening,Është Hapja
@@ -3932,4 +3768,3 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +188,Account {0} does not exist,Llogaria {0} nuk ekziston
 DocType: Account,Cash,Para
 DocType: Employee,Short biography for website and other publications.,Biografia e shkurtër për faqen e internetit dhe botime të tjera.
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +31,Please create Salary Structure for employee {0},Ju lutem të krijuar strukturën e pagave për punonjës {0}
diff --git a/erpnext/translations/sr.csv b/erpnext/translations/sr.csv
index cb07383..0f570c1 100644
--- a/erpnext/translations/sr.csv
+++ b/erpnext/translations/sr.csv
@@ -1,13 +1,12 @@
 DocType: Employee,Salary Mode,Плата режим
 DocType: Cost Center,"Select Monthly Distribution, if you want to track based on seasonality.","Изаберите мјесечни, ако желите да пратите на основу сезонског."
 DocType: Employee,Divorced,Разведен
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +86,Warning: Same item has been entered multiple times.,Упозорење: Исти предмет је ушао више пута.
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +80,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,Дозволите тачка треба додати више пута у трансакцији
 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/page/setup_wizard/fixtures/industry_type.py +19,Consumer Products,Производи широке потрошње
+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,Молимо Вас да одаберете Парти Типе први
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +90,Annealing,Прекаљивање
 DocType: Item,Customer Items,Предмети Цустомер
 apps/erpnext/erpnext/accounts/doctype/account/account.py +45,Account {0}: Parent account {1} can not be a ledger,Рачун {0}: {1 Родитељ рачун} не може бити књига
 DocType: Item,Publish Item to hub.erpnext.com,Објављивање ставку да хуб.ерпнект.цом
@@ -20,15 +19,14 @@
 DocType: About Us Settings,Website,Вебсајт
 DocType: POS Profile,Applicable for User,Важи за кориснике
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +169,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Стоппед Производња поредак не може бити поништен, то Унстоп прво да откажете"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +23,Compaction plus sintering,Набијања плус синтерирање
 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.,* Биће обрачунато у овој трансакцији.
 DocType: Purchase Order,Customer Contact,Кориснички Контакт
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +549,From Material Request,Од материјала захтеву
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +572,From Material Request,Од материјала захтеву
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} Дрво
 DocType: Job Applicant,Job Applicant,Посао захтева
 apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,Нема више резултата.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +78,Legal,правни
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +34,Legal,правни
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +114,Actual type tax cannot be included in Item rate in row {0},Актуелне тип порез не може бити укључен у стопу тачка у низу {0}
 DocType: C-Form,Customer,Купац
 DocType: Purchase Receipt Item,Required By,Обавезно Би
@@ -43,7 +41,6 @@
 DocType: Manufacturing Settings,Default 10 mins,Уобичајено 10 минс
 DocType: Leave Type,Leave Type Name,Оставите Име Вид
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +148,Series Updated Successfully,Серия Обновлено Успешно
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +150,Stitching,Шивење
 DocType: Pricing Rule,Apply On,Нанесите на
 DocType: Item Price,Multiple Item prices.,Више цене аукцији .
 ,Purchase Order Items To Be Received,Налог за куповину ставке које се примају
@@ -51,8 +48,8 @@
 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 +104,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 +189,New Leave Application,Нова апликација одсуство
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +134,Bank Draft,Банка Нацрт
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +204,New Leave Application,Нова апликација одсуство
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +134,Bank Draft,Банка Нацрт
 DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,1. Да бисте задржали купца мудрог код ставке и да их претраживати на основу њиховог кода користили ову опцију
 DocType: Mode of Payment Account,Mode of Payment Account,Начин плаћања налог
 apps/erpnext/erpnext/stock/doctype/item/item.js +34,Show Variants,Схов Варијанте
@@ -64,25 +61,23 @@
 DocType: Production Plan Item,Production Plan Item,Производња план шифра
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +141,User {0} is already assigned to Employee {1},Пользователь {0} уже назначен Employee {1}
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +13,Make new POS Profile,Направите нови ПОС Профиле
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +31,Health Care,здравство
+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 +494,Invoice,Фактура
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +519,Invoice,Фактура
 DocType: Maintenance Schedule Item,Periodicity,Периодичност
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +357,Email Address,Е-маил адреса
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +21,Defense,одбрана
+apps/erpnext/erpnext/public/js/setup_wizard.js +107,Email Address,Е-маил адреса
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,одбрана
 DocType: Company,Abbr,Аббр
 DocType: Appraisal Goal,Score (0-5),Оцена (0-5)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +193,Row {0}: {1} {2} does not match with {3},Ров {0}: {1} {2} не поклапа са {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +67,Row # {0}:,Ров # {0}:
 DocType: Delivery Note,Vehicle No,Нема возила
 apps/erpnext/erpnext/public/js/pos/pos.js +528,Please select Price List,Изаберите Ценовник
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +162,Woodworking,Обрада дрвета
 DocType: Production Order Operation,Work In Progress,Ворк Ин Прогресс
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +153,3D printing,3Д штампање
 DocType: Employee,Holiday List,Холидаи Листа
 DocType: Time Log,Time Log,Време Лог
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +530,Accountant,рачуновођа
+apps/erpnext/erpnext/public/js/setup_wizard.js +274,Accountant,рачуновођа
 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.","Лог активности обављају корисници против Задаци који се могу користити за праћење времена, наплату."
@@ -98,18 +93,19 @@
 DocType: Bin,Quantity Requested for Purchase,Количина Затражено за куповину
 DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name","Причврстите .цсв датотеку са две колоне, једна за старим именом и један за ново име"
 DocType: Packed Item,Parent Detail docname,Родитељ Детаљ доцнаме
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Kg,кг
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Kg,кг
 apps/erpnext/erpnext/config/hr.py +48,Opening for a Job.,Отварање за посао.
 DocType: Item Attribute,Increment,Повећање
 apps/erpnext/erpnext/public/js/stock_analytics.js +63,Select Warehouse...,Изабери Варехоусе ...
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +6,Advertising,оглашавање
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,оглашавање
+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/doctype/sales_invoice/sales_invoice.py +389,Stock cannot be updated against Delivery Note {0},Фото не могут быть обновлены против накладной {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +391,Stock cannot be updated against Delivery Note {0},Фото не могут быть обновлены против накладной {0}
 DocType: Payment Reconciliation,Reconcile,помирити
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +30,Grocery,бакалница
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,бакалница
 DocType: Quality Inspection Reading,Reading 1,Читање 1
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Make Bank Entry,Маке Банк Ентри
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +40,Pension Funds,Пензиони фондови
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,Пензиони фондови
 apps/erpnext/erpnext/accounts/doctype/account/account.py +142,Warehouse is mandatory if account type is Warehouse,Магацин је обавезна ако аццоунт типе Магацин
 DocType: SMS Center,All Sales Person,Све продаје Особа
 DocType: Lead,Person Name,Особа Име
@@ -131,7 +127,7 @@
 DocType: Quality Inspection,Get Specification Details,Гет Детаљи Спецификација
 DocType: Lead,Interested,Заинтересован
 apps/erpnext/erpnext/config/manufacturing.py +14,Bill of Material,Счет за материалы
-apps/erpnext/erpnext/public/js/stock_analytics.js +45,Opening,Отварање
+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,Копирање из ставке групе
 DocType: Journal Entry,Opening Entry,Отварање Ентри
@@ -145,23 +141,22 @@
 DocType: Employee Education,Under Graduate,Под Дипломац
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +22,Target On,Циљна На
 DocType: BOM,Total Cost,Укупни трошкови
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +99,Reaming,Развртање
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +9,Activity Log:,Активност Пријављивање :
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +199,Item {0} does not exist in the system or has expired,"Пункт {0} не существует в системе, или истек"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +44,Real Estate,Некретнине
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +44,Real Estate,Некретнине
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +4,Statement of Account,Изјава рачуна
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +41,Pharmaceuticals,Фармација
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,Фармација
 DocType: Expense Claim Detail,Claim Amount,Захтев Износ
 DocType: Employee,Mr,Господин
 DocType: Custom Script,Client,Клијент
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,Добављач Тип / Добављач
 DocType: Naming Series,Prefix,Префикс
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Consumable,потребляемый
+apps/erpnext/erpnext/public/js/setup_wizard.js +359,Consumable,потребляемый
 DocType: Upload Attendance,Import Log,Увоз се
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.js +19,Send,Послати
 DocType: Sales Invoice Item,Delivered By Supplier,Деливеред добављач
 DocType: SMS Center,All Contact,Све Контакт
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +164,Annual Salary,Годишња плата
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +164,Annual Salary,Годишња плата
 DocType: Period Closing Voucher,Closing Fiscal Year,Затварање Фискална година
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +69,Stock Expenses,Акции Расходы
 DocType: Newsletter,Email Sent?,Емаил Сент?
@@ -169,7 +164,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +92,Show Time Logs,Схов Тиме Протоколи
 DocType: Journal Entry Account,Credit in Company Currency,Кредит у валути Компанија
 DocType: Delivery Note,Installation Status,Инсталација статус
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +115,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Принято + Отклоненные Кол-во должно быть равно полученного количества по пункту {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +118,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 +133,Item {0} must be a Purchase Item,Пункт {0} должен быть Покупка товара
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
@@ -177,19 +172,17 @@
  Све датуми и запослени комбинација у одабраном периоду ће доћи у шаблону, са постојећим евиденцију"
 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 +493,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Для учета налога в строке {0} в размере Item , налоги в строках должны быть также включены {1}"
+apps/erpnext/erpnext/controllers/accounts_controller.py +494,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Для учета налога в строке {0} в размере Item , налоги в строках должны быть также включены {1}"
 apps/erpnext/erpnext/config/hr.py +90,Settings for HR Module,Настройки для модуля HR
 DocType: SMS Center,SMS Center,СМС центар
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +78,Straightening,Исправљање
 DocType: BOM Replace Tool,New BOM,Нови БОМ
 apps/erpnext/erpnext/config/projects.py +28,Batch Time Logs for billing.,Батцх Тиме трупци за наплату.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +15,Countergravity casting,Цоунтергравити ливење
 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/setup/page/setup_wizard/fixtures/industry_type.py +14,Broadcasting,радиодифузија
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +140,Execution,извршење
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +364,The first user will become the System Manager (you can change this later).,Први корисник ће постати систем менаџер (можете променити ово касније).
+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/public/js/setup_wizard.js +114,The first user will become the System Manager (you can change this later).,Први корисник ће постати систем менаџер (можете променити ово касније).
 apps/erpnext/erpnext/config/manufacturing.py +39,Details of the operations carried out.,Детаљи о пословању спроведена.
 DocType: Serial No,Maintenance Status,Одржавање статус
 apps/erpnext/erpnext/config/stock.py +263,Items and Pricing,Предмети и цене
@@ -206,7 +199,6 @@
 DocType: Pricing Rule,Discount on Price List Rate (%),Попуст на цену Лист стопа (%)
 apps/frappe/frappe/public/js/frappe/form/print.js +96,Start,старт
 DocType: User,First Name,Име
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +12,Full-mold casting,Пуно радно калупима
 DocType: Offer Letter,Select Terms and Conditions,Изаберите Услови
 DocType: Production Planning Tool,Sales Orders,Салес Ордерс
 DocType: Purchase Taxes and Charges,Valuation,Вредновање
@@ -218,8 +210,7 @@
 DocType: Bank Reconciliation,Bank Account,Банковни рачун
 DocType: Leave Type,Allow Negative Balance,Дозволи негативан салдо
 DocType: Selling Settings,Default Territory,Уобичајено Територија
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +53,Television,телевизија
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +138,Gashing,Гасхинг
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,телевизија
 DocType: Production Order Operation,Updated via 'Time Log',Упдатед преко 'Време Приступи'
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +82,Account {0} does not belong to Company {1},Счет {0} не принадлежит компании {1}
 DocType: Naming Series,Series List for this Transaction,Серија Листа за ову трансакције
@@ -234,14 +225,13 @@
 DocType: Leave Allocation,Add unused leaves from previous allocations,Додај неискоришћене листове из претходних алокација
 apps/erpnext/erpnext/controllers/recurring_document.py +206,Next Recurring {0} will be created on {1},Следећа Поновни {0} ће бити креирана на {1}
 DocType: Newsletter List,Total Subscribers,Укупно Претплатници
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +575,Contact Name,Контакт Име
+,Contact Name,Контакт Име
 DocType: Production Plan Item,SO Pending Qty,СО чекању КТИ
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Ствара плата листић за горе наведених критеријума.
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,Захтев за куповину.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +107,Double housing,Дупли становање
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +156,Only the selected Leave Approver can submit this Leave Application,Только выбранный Оставить утверждающий мог представить этот Оставить заявку
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +171,Only the selected Leave Approver can submit this Leave Application,Только выбранный Оставить утверждающий мог представить этот Оставить заявку
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,Освобождение Дата должна быть больше даты присоединения
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +172,Leaves per Year,Леавес по години
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +172,Leaves per Year,Леавес по години
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup > Settings > Naming Series,Молимо поставите Именовање серију за {0} подешавањем&gt; Сеттингс&gt; именовања серије
 DocType: Time Log,Will be updated when batched.,Да ли ће се ажурирати када дозирају.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +104,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,"Ров {0}: Проверите 'Да ли је напредно ""против налог {1} ако је ово унапред унос."
@@ -250,25 +240,24 @@
 DocType: Item Website Specification,Item Website Specification,Ставка Сајт Спецификација
 DocType: Dropbox Backup,Dropbox Access Key,Дропбок Приступни тастер
 DocType: Payment Tool,Reference No,Референца број
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +348,Leave Blocked,Оставите Блокирани
-apps/erpnext/erpnext/stock/doctype/item/item.py +535,Item {0} has reached its end of life on {1},Пункт {0} достигла своей жизни на {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +392,Leave Blocked,Оставите Блокирани
+apps/erpnext/erpnext/stock/doctype/item/item.py +539,Item {0} has reached its end of life on {1},Пункт {0} достигла своей жизни на {1}
 apps/erpnext/erpnext/accounts/utils.py +339,Annual,годовой
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Стоцк Помирење артикла
 DocType: Stock Entry,Sales Invoice No,Продаја Рачун Нема
 DocType: Material Request Item,Min Order Qty,Минимална количина за поручивање
 DocType: Lead,Do Not Contact,Немојте Контакт
 DocType: Sales Invoice,The unique id for tracking all recurring invoices. It is generated on submit.,Стеам ИД за праћење свих понавља фактуре. Генерише се на субмит.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +93,Software Developer,Софтваре Девелопер
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +93,Software Developer,Софтваре Девелопер
 DocType: Item,Minimum Order Qty,Минимална количина за поручивање
 DocType: Pricing Rule,Supplier Type,Снабдевач Тип
 DocType: Item,Publish in Hub,Објављивање у Хуб
 ,Terretory,Терретори
-apps/erpnext/erpnext/stock/doctype/item/item.py +555,Item {0} is cancelled,Пункт {0} отменяется
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +598,Material Request,Материјал Захтев
+apps/erpnext/erpnext/stock/doctype/item/item.py +559,Item {0} is cancelled,Пункт {0} отменяется
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +607,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} није пронађен у &quot;сировине Испоручује се &#39;сто у нарудзбенице {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +129,Wire brushing,Металном жицом
 DocType: Employee,Relation,Однос
 DocType: Shipping Rule,Worldwide Shipping,Широм света Достава
 apps/erpnext/erpnext/config/selling.py +23,Confirmed orders from Customers.,Потврђена наређења од купаца.
@@ -284,12 +273,11 @@
 DocType: Supplier,Address HTML,Адреса ХТМЛ
 DocType: Lead,Mobile No.,Мобиле Но
 DocType: Maintenance Schedule,Generate Schedule,Генериши Распоред
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +81,Hubbing,Хуббинг
 DocType: Purchase Invoice Item,Expense Head,Расходи шеф
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +86,Please select Charge Type first,Изаберите Тип пуњења први
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,најновији
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +395,Max 5 characters,Макс 5 знакова
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +195,Select Your Language,Выбор языка
+apps/erpnext/erpnext/public/js/setup_wizard.js +143,Max 5 characters,Макс 5 знакова
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +245,Select Your Language,Выбор языка
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,Први одсуство одобраватељ на листи ће бити постављен као подразумевани Аппровер Леаве
 DocType: Manufacturing Settings,"Disables creation of time logs against Production Orders.
 Operations shall not be tracked against Production Order",Онемогућава стварање временских трупаца против производних налога. Операције неће бити праћени против Продуцтион Ордер
@@ -301,8 +289,6 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +34,Item {0} must be Service Item,Пункт {0} должно быть Service Элемент
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +303,Completed Qty can not be greater than 'Qty to Manufacture',Завршен ком не може бити већи од 'Количина за производњу'
 DocType: DocType,Administrator,Администратор
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +136,Laser drilling,Ласерски бушење
-DocType: Stock UOM Replace Utility,New Stock UOM,Нова берза УОМ
 DocType: Period Closing Voucher,Closing Account Head,Затварање рачуна Хеад
 DocType: Employee,External Work History,Спољни власници
 apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,Циркуларне референце Грешка
@@ -311,18 +297,15 @@
 DocType: Lead,Industry,Индустрија
 DocType: Employee,Job Profile,Профиль работы
 DocType: Newsletter,Newsletter,Билтен
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +84,Hydroforming,Хидроформинг
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +49,Necking,Љубакање
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Обавестити путем емаила на стварању аутоматског материјала захтеву
 DocType: Journal Entry,Multi Currency,Тема Валута
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +51,Item is updated,Пункт обновляется
 DocType: Async Task,System Manager,Систем менаџер
 DocType: Payment Reconciliation Invoice,Invoice Type,Фактура Тип
 DocType: Sales Invoice Item,Delivery Note,Обавештење о пријему пошиљке
 DocType: Dropbox Backup,Allow Dropbox Access,Дозволи Дропбок Аццесс
 apps/erpnext/erpnext/config/learn.py +72,Setting up Taxes,Подешавање Порези
 apps/erpnext/erpnext/accounts/utils.py +189,Payment Entry has been modified after you pulled it. Please pull it again.,Плаћање Ступање је модификована након што га извукао. Молимо вас да га опет повуците.
-apps/erpnext/erpnext/stock/doctype/item/item.py +343,{0} entered twice in Item Tax,{0} вводится дважды в пункт налоге
+apps/erpnext/erpnext/stock/doctype/item/item.py +347,{0} entered twice in Item Tax,{0} вводится дважды в пункт налоге
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +105,Summary for this week and pending activities,Преглед за ову недељу и чекају активности
 DocType: Workstation,Rent Cost,Издавање Трошкови
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +74,Please select month and year,Изаберите месец и годину
@@ -339,24 +322,22 @@
 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/buying/doctype/purchase_order/purchase_order.js +517,Select Item,Избор артикла
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +540,Select Item,Избор артикла
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +143,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","Итем: {0} је успео серија-мудар, не може да се помири користећи \
  Стоцк помирење, уместо коришћење Сток Ентри"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +259,Purchase Invoice {0} is already submitted,Покупка Счет {0} уже подано
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +262,Purchase Invoice {0} is already submitted,Покупка Счет {0} уже подано
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Batch No must be same as {1} {2},Ред # {0}: Серијски бр морају бити исти као {1} {2}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Convert to non-Group,Претвори у не-Гроуп
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +55,Purchase Receipt must be submitted,Куповина Потврда мора да се поднесе
-DocType: Stock UOM Replace Utility,Current Stock UOM,Тренутне залихе УОМ
 apps/erpnext/erpnext/config/stock.py +53,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}
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Your email address,Ваша имејл адреса
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +194,Please see attachment,Молимо погледајте прилог
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +203,Please see attachment,Молимо погледајте прилог
 DocType: Purchase Order,% Received,% Примљено
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +109,Water jet cutting,Воденим млазом
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +24,Setup Already Complete!!,Подешавање Већ Комплетна !
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +20,Setup Already Complete!!,Подешавање Већ Комплетна !
 ,Finished Goods,готове робе
 DocType: Delivery Note,Instructions,Инструкције
 DocType: Quality Inspection,Inspected By,Контролисано Би
@@ -371,6 +352,7 @@
 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,Мењачница
 DocType: Purchase Invoice Item,Item Name,Назив
+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",Ставке се тражени који су &quot;Оут оф Стоцк&quot; с обзиром на све магацине засноване на пројектованом Кти и Минимална количина за поручивање
@@ -380,11 +362,10 @@
 ,Purchase Register,Куповина Регистрација
 DocType: Landed Cost Item,Applicable Charges,Накнаде применљиво
 DocType: Workstation,Consumable Cost,Потрошни трошкова
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,{0} ({1}) must have role 'Leave Approver',{0} ({1}) мора имати улогу 'Напусти Аппровер
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +167,{0} ({1}) must have role 'Leave Approver',{0} ({1}) мора имати улогу 'Напусти Аппровер
 DocType: Purchase Receipt,Vehicle Date,Датум возила
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +39,Medical,медицинский
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +39,Medical,медицинский
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,Разлог за губљење
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +36,Tube beading,Тубе извлачење
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},Радна станица је затворена на следеће датуме по Холидаи Лист: {0}
 DocType: Employee,Single,Самац
 DocType: Issue,Attachment,Прилог
@@ -405,10 +386,8 @@
 DocType: Account,Is Group,Је група
 DocType: Stock Settings,Automatically Set Serial Nos based on FIFO,Аутоматски подешава серијски бр на основу ФИФО
 DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,Одлазак добављача Фактура број јединственост
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +31,Thermoforming,Термоформирање
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +66,Slitting,Резање
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +57,'To Case No.' cannot be less than 'From Case No.',&#39;Да Предмет бр&#39; не може бити мањи од &#39;Од Предмет бр&#39;
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +104,Non Profit,Некоммерческое
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +104,Non Profit,Некоммерческое
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_list.js +7,Not Started,Није Стартед
 DocType: Lead,Channel Partner,Цханнел Партнер
 DocType: Account,Old Parent,Стари Родитељ
@@ -417,13 +396,12 @@
 apps/erpnext/erpnext/config/manufacturing.py +74,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 +512,Attribute {0} selected multiple times in Attributes Table,Атрибут {0} изабран више пута у атрибутима табели
+apps/erpnext/erpnext/stock/doctype/item/item.py +516,Attribute {0} selected multiple times in Attributes Table,Атрибут {0} изабран више пута у атрибутима табели
 DocType: Sales Order,Not Applicable,Није применљиво
 apps/erpnext/erpnext/config/hr.py +140,Holiday master.,Мастер отдыха .
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +19,Shell molding,Схелл лајсне
 DocType: Material Request Item,Required Date,Потребан датум
 DocType: Delivery Note,Billing Address,Адреса за наплату
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +644,Please enter Item Code.,Унесите Шифра .
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +648,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,Укупно ком
@@ -433,7 +411,7 @@
 DocType: Item Attribute,To Range,У распону
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Ценные бумаги и депозиты
 DocType: Features Setup,Imports,Увоз
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +144,Adhesive bonding,Лепљења
+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.,Гледалаца рекорд.
@@ -441,26 +419,25 @@
 DocType: Sales Order Item,Used for Production Plan,Користи се за производни план
 DocType: System Settings,Loading...,Учитавање ...
 DocType: DocField,Password,Шифра
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +155,Fused deposition modeling,Фусед таложење моделирање
 DocType: Manufacturing Settings,Time Between Operations (in mins),Време између операција (у минута)
 DocType: Customer,Buyer of Goods and Services.,Купац робе и услуга.
 DocType: Journal Entry,Accounts Payable,Обавезе према добављачима
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +24,Add Subscribers,Додај претплатника
 apps/erpnext/erpnext/public/js/feature_setup.js +220,""" does not exists",""" Не постоји"
 DocType: Pricing Rule,Valid Upto,Важи до
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +564,List a few of your customers. They could be organizations or individuals.,Листанеколико ваших клијената . Они могу бити организације и појединци .
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,List a few of your customers. They could be organizations or individuals.,Листанеколико ваших клијената . Они могу бити организације и појединци .
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Direct Income,Прямая прибыль
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +33,"Can not filter based on Account, if grouped by Account","Не можете да филтрирате на основу налога , ако груписани по налогу"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +88,Administrative Officer,Административни службеник
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Administrative Officer,Административни службеник
 DocType: Payment Tool,Received Or Paid,Прими или исплати
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +318,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 +305,Please enter Warehouse for which Material Request will be raised,Унесите складиште за које Материјал Захтев ће бити подигнута
 DocType: Production Order,Additional Operating Cost,Додатни Оперативни трошкови
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +20,Cosmetics,козметика
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,козметика
 DocType: DocField,Type,Тип
-apps/erpnext/erpnext/stock/doctype/item/item.py +417,"To merge, following properties must be same for both items","Да бисте објединили , следеће особине морају бити исти за обе ставке"
+apps/erpnext/erpnext/stock/doctype/item/item.py +421,"To merge, following properties must be same for both items","Да бисте објединили , следеће особине морају бити исти за обе ставке"
 DocType: Communication,Subject,Предмет
 DocType: Shipping Rule,Net Weight,Нето тежина
 DocType: Employee,Emergency Phone,Хитна Телефон
@@ -470,7 +447,6 @@
 DocType: Journal Entry,Difference (Dr - Cr),Разлика ( др - Кр )
 DocType: Account,Profit and Loss,Прибыль и убытки
 apps/erpnext/erpnext/config/stock.py +293,Managing Subcontracting,Управљање Подуговарање
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +58,New UOM must NOT be of type Whole Number,Новый UOM НЕ должен иметь тип целого числа
 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 +47,Account {0} does not belong to company: {1},Рачун {0} не припада компанији: {1}
@@ -490,14 +466,14 @@
 DocType: Purchase Invoice,Supplier Invoice No,Снабдевач фактура бр
 DocType: Territory,For reference,За референце
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +154,"Cannot delete Serial No {0}, as it is used in stock transactions","Не могу да избришем серијски број {0}, као што се користи у промету акција"
-apps/erpnext/erpnext/public/js/account_tree_grid.js +52,Closing (Cr),Затварање (Цр)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +227,Closing (Cr),Затварање (Цр)
 DocType: Serial No,Warranty Period (Days),Гарантни период (дани)
 DocType: Installation Note Item,Installation Note Item,Инсталација Напомена Ставка
 ,Pending Qty,Кол чекању
 DocType: Job Applicant,Thread HTML,Тема ХТМЛ
 DocType: Company,Ignore,Игнорисати
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +86,SMS sent to following numbers: {0},СМС порука на следеће бројеве телефона: {0}
-apps/erpnext/erpnext/controllers/buying_controller.py +135,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Поставщик Склад обязательным для субподрядчиком ТОВАРНЫЙ ЧЕК
+apps/erpnext/erpnext/controllers/buying_controller.py +126,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Поставщик Склад обязательным для субподрядчиком ТОВАРНЫЙ ЧЕК
 DocType: Pricing Rule,Valid From,Важи од
 DocType: Sales Invoice,Total Commission,Укупно Комисија
 DocType: Pricing Rule,Sales Partner,Продаја Партнер
@@ -507,7 +483,7 @@
 To distribute a budget using this distribution, set this **Monthly Distribution** in the **Cost Center**","**Месечна Дистрибуција** помаже распоредите свој буџет по месецима ако је ваш посао сезонског типа.
 
  Да распоредите буџет користећи ову расподелу, поставите **Месечна расподела** у **Трошковни Центар**"
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +183,No records found in the Invoice table,Нема резултата у фактури табели записи
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +130,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 +84,Financial / accounting year.,Финансовый / отчетного года .
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","Извини , Серијски Нос не може да се споје"
@@ -523,25 +499,25 @@
 DocType: Sales Order,Billing and Delivery Status,Обрачун и Статус испоруке
 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/setup/page/setup_wizard/setup_wizard_page.html +16,Previous,предыдущий
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard_page.html +16,Previous,предыдущий
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +620,Sales Return,Продаја Ретурн
 DocType: Production Planning Tool,Select Sales Orders from which you want to create Production Orders.,Изаберите продајних налога из које желите да креирате налоге производњу.
 DocType: Item,Delivered by Supplier (Drop Ship),Деливеред би добављача (Дроп Схип)
 apps/erpnext/erpnext/config/hr.py +120,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.,Кориснички базе података.
 DocType: Quotation,Quotation To,Цитат
 DocType: Lead,Middle Income,Средњи приход
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),Открытие (Cr)
 apps/erpnext/erpnext/accounts/utils.py +193,Allocated amount can not be negative,Додељена сума не може бити негативан
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +123,Tumbling,Гимнастика
 DocType: Purchase Order Item,Billed Amt,Фактурисане Амт
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,Логичан Магацин против које уноси хартије су направљени.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +92,Reference No & Reference Date is required for {0},Ссылка № & Ссылка Дата необходим для {0}
 DocType: Event,Wednesday,Среда
 DocType: Sales Invoice,Customer's Vendor,Купца Продавац
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +214,Production Order is Mandatory,Производња налог обавезујући
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +139,Proposal Writing,Писање предлога
+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} постоји са истим запослених ид
 apps/erpnext/erpnext/stock/stock_ledger.py +336,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},Отрицательный Ошибка со ( {6} ) по пункту {0} в Склад {1} на {2} {3} в {4} {5}
 DocType: Fiscal Year Company,Fiscal Year Company,Фискална година Компанија
@@ -564,7 +540,7 @@
 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/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.py +179,Please install dropbox python module,Молимо вас да инсталирате Дропбок питон модул
 DocType: Employee,Passport Number,Пасош Број
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +82,Manager,менаџер
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Manager,менаџер
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +494,From Purchase Receipt,Од рачуном
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +219,Same item has been entered multiple times.,Исто аукција је ушао више пута.
 DocType: SMS Settings,Receiver Parameter,Пријемник Параметар
@@ -572,10 +548,9 @@
 DocType: Sales Person,Sales Person Targets,Продаја Персон Мете
 apps/frappe/frappe/public/js/frappe/form/workflow.js +116,To,на
 apps/frappe/frappe/templates/base.html +145,Please enter email address,"Пожалуйста, введите адрес электронной почты,"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +35,End tube forming,Крај цеви формирање
 DocType: Production Order Operation,In minutes,У минута
 DocType: Issue,Resolution Date,Резолуција Датум
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +635,Please set default Cash or Bank account in Mode of Payment {0},"Пожалуйста, установите Cash умолчанию или банковский счет в режим оплаты {0}"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +637,Please set default Cash or Bank account in Mode of Payment {0},"Пожалуйста, установите Cash умолчанию или банковский счет в режим оплаты {0}"
 DocType: Selling Settings,Customer Naming By,Кориснички назив под
 apps/erpnext/erpnext/accounts/doctype/account/account.js +67,Convert to Group,Претвори у групи
 DocType: Activity Cost,Activity Type,Активност Тип
@@ -583,12 +558,12 @@
 DocType: Customer,Fixed Days,Фиксни дана
 DocType: Sales Invoice,Packing List,Паковање Лист
 apps/erpnext/erpnext/config/buying.py +28,Purchase Orders given to Suppliers.,Куповина наређења према добављачима.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +43,Publishing,објављивање
+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 +198,{0}: {1} not found in Invoice Details table,{0}: {1} није пронађен у табели Фактура Детаљи
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,{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 +208,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Техническое обслуживание Посетить {0} должно быть отменено до отмены этого заказ клиента
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +203,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),Открытие (д-р )
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},Средняя отметка должна быть после {0}
@@ -600,7 +575,6 @@
 DocType: Pricing Rule,Sales Manager,Менаџер продаје
 apps/frappe/frappe/public/js/frappe/model/model.js +492,Rename,Преименовање
 DocType: Journal Entry,Write Off Amount,Отпис Износ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +52,Bending,Савијање
 apps/frappe/frappe/core/page/user_permissions/user_permissions.js +246,Allow User,Дозволите кориснику
 DocType: Journal Entry,Bill No,Бил Нема
 DocType: Purchase Invoice,Quarterly,Тромесечни
@@ -610,17 +584,16 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Please enter item details,"Пожалуйста, введите детали деталя"
 DocType: Purchase Receipt,Other Details,Остали детаљи
 DocType: Account,Accounts,Рачуни
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +67,Marketing,маркетинг
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +65,Straight shearing,Равно сечење
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +67,Marketing,маркетинг
 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/stock/doctype/purchase_receipt/purchase_receipt.py +99,Rejected Warehouse is mandatory against regected item,Одбијен Магацин је обавезна против регецтед ставке
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +102,Rejected Warehouse is mandatory against regected item,Одбијен Магацин је обавезна против регецтед ставке
 DocType: Account,Expenses Included In Valuation,Трошкови укључени у процене
 DocType: Employee,Provide email id registered in company,Обезбедити ид е регистрован у предузећу
 DocType: Hub Settings,Seller City,Продавац Град
 DocType: Email Digest,Next email will be sent on:,Следећа порука ће бити послата на:
 DocType: Offer Letter Term,Offer Letter Term,Понуда Леттер Терм
-apps/erpnext/erpnext/stock/doctype/item/item.py +492,Item has variants.,Тачка има варијанте.
+apps/erpnext/erpnext/stock/doctype/item/item.py +496,Item has variants.,Тачка има варијанте.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Пункт {0} не найден
 DocType: Bin,Stock Value,Вредност акције
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,Дрво Тип
@@ -629,10 +602,9 @@
 DocType: Material Request Item,Quantity and Warehouse,Количина и Магацин
 DocType: Sales Invoice,Commission Rate (%),Комисија Стопа (%)
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +172,"Against Voucher Type must be one of Sales Order, Sales Invoice or Journal Entry","Против Ваучер Тип мора бити један од продаје Реда, продаја Фактура или Јоурнал Ентри"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +139,Biomachining,Биомацхининг
 apps/erpnext/erpnext/setup/utils.py +89,Unable to find exchange rate,Није могуће пронаћи курса
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +7,Aerospace,ваздушно-космички простор
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +19,Welcome,добро пожаловать
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +7,Aerospace,ваздушно-космички простор
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +40,Welcome,добро пожаловать
 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.,Роба примљена од добављача.
@@ -655,19 +627,19 @@
 DocType: Employee,Cell Number,Мобилни број
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,изгубљен
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +120,You can not enter current voucher in 'Against Journal Entry' column,Не можете ући у тренутну ваучер 'против' Јоурнал Ентри колону
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +25,Energy,енергија
+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.,Месечна плата изјава.
 DocType: Item Group,Website Specifications,Сајт Спецификације
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +205,New Account,Нови налог
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +21,{0}: From {0} of type {1},{0}: Од {0} типа {1}
-apps/erpnext/erpnext/controllers/buying_controller.py +283,Row {0}: Conversion Factor is mandatory,Ред {0}: Фактор конверзије је обавезно
+apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,Ред {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.,Аццоунтинг прилога може се против листа чворова. Записи против групе нису дозвољени.
 DocType: ToDo,High,Висок
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +361,Cannot deactivate or cancel BOM as it is linked with other BOMs,Не можете деактивирати или отказати БОМ јер је повезан са другим саставница
 DocType: Opportunity,Maintenance,Одржавање
 DocType: User,Male,Мушки
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +182,Purchase Receipt number required for Item {0},"Покупка Получение число , необходимое для Пункт {0}"
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +183,Purchase Receipt number required for Item {0},"Покупка Получение число , необходимое для Пункт {0}"
 DocType: Item Attribute Value,Item Attribute Value,Итем Вредност атрибута
 apps/erpnext/erpnext/config/crm.py +64,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.
@@ -715,10 +687,9 @@
 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 +324,"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/page/setup_wizard/fixtures/industry_type.py +13,Biotechnology,биотехнологија
+apps/erpnext/erpnext/controllers/accounts_controller.py +325,"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,Офис эксплуатационные расходы
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +53,Hemming,Хемминг
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +66,Please enter Item first,Молимо унесите прва тачка
 DocType: Account,Liability,одговорност
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +62,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Санкционисани износ не може бити већи од износ потраживања у низу {0}.
@@ -731,10 +702,10 @@
 DocType: Company,Default Bank Account,Уобичајено банковног рачуна
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +47,"To filter based on Party, select Party Type first","Филтрирање на основу партије, изаберите партија Типе први"
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},"&#39;Ажурирање Сток &quot;не може се проверити, јер ствари нису достављене преко {0}"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Nos,Нос
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,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 +627,My Invoices,Моји рачуни
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +629,My Invoices,Моји рачуни
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,Не работник не найдено
 DocType: Purchase Order,Stopped,Заустављен
 DocType: Item,If subcontracted to a vendor,Ако подизвођење на продавца
@@ -753,35 +724,33 @@
 DocType: Features Setup,"To enable ""Point of Sale"" features",Да бисте омогућили &quot;Поинт оф Сале&quot; Феатурес
 DocType: Bin,Moving Average Rate,Мовинг Авераге рате
 DocType: Production Planning Tool,Select Items,Изаберите ставке
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,{0} against Bill {1} dated {2},{0} против Предлога закона {1} {2} од
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +328,{0} against Bill {1} dated {2},{0} против Предлога закона {1} {2} од
 DocType: Comment,Reference Name,Референтни Име
 DocType: Maintenance Visit,Completion Status,Завршетак статус
 DocType: Sales Invoice Item,Target Warehouse,Циљна Магацин
 DocType: Item,Allow over delivery or receipt upto this percent,Дозволите преко испоруку или пријем упто овом одсто
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +49,Expected Delivery Date cannot be before Sales Order Date,Ожидаемая дата поставки не может быть до даты заказа на продажу
 DocType: Upload Attendance,Import Attendance,Увоз Гледалаца
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +17,All Item Groups,Все Группы товаров
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +17,All Item Groups,Все Группы товаров
 DocType: Process Payroll,Activity Log,Активност Пријава
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +30,Net Profit / Loss,Нето добит / губитак
 apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,Автоматически создавать сообщение о подаче сделок .
 DocType: Production Order,Item To Manufacture,Ставка за производњу
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +16,Permanent mold casting,Стална калупима
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} статус {2}
 apps/erpnext/erpnext/config/learn.py +172,Purchase Order to Payment,Налог за куповину на исплату
 DocType: Sales Order Item,Projected Qty,Пројектовани Кол
 DocType: Sales Invoice,Payment Due Date,Плаћање Дуе Дате
 DocType: Newsletter,Newsletter Manager,Билтен директор
-apps/erpnext/erpnext/stock/doctype/item/item.js +229,Item Variant {0} already exists with same attributes,Тачка Варијанта {0} већ постоји са истим атрибутима
+apps/erpnext/erpnext/stock/doctype/item/item.js +231,Item Variant {0} already exists with same attributes,Тачка Варијанта {0} већ постоји са истим атрибутима
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening',&#39;Отварање&#39;
 DocType: Notification Control,Delivery Note Message,Испорука Напомена порука
 DocType: Expense Claim,Expenses,расходы
 DocType: Item Variant Attribute,Item Variant Attribute,Тачка Варијанта Атрибут
 ,Purchase Receipt Trends,Куповина Трендови Пријем
 DocType: Appraisal,Select template from which you want to get the Goals,Изаберите шаблон из којег желите да добијете циљеве
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +77,Research & Development,Истраживање и развој
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Research & Development,Истраживање и развој
 ,Amount to Bill,Износ на Предлог закона
 DocType: Company,Registration Details,Регистрација Детаљи
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +75,Staking,Стакинг
 DocType: Item,Re-Order Qty,Поново поручивање
 DocType: Leave Block List Date,Leave Block List Date,Оставите Датум листу блокираних
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +25,Scheduled to send to {0},Планируется отправить {0}
@@ -792,18 +761,16 @@
 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/hr/doctype/leave_allocation/leave_allocation.py +71,Cannot carry forward {0},Не можете переносить {0}
 apps/erpnext/erpnext/accounts/doctype/account/account.py +91,"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,Расходи потраживање Одбијен поруку
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +145,Nailing,Закуцавање
 ,Available Qty,Доступно ком
 DocType: Purchase Taxes and Charges,On Previous Row Total,На претходни ред Укупно
 DocType: Salary Slip,Working Days,Радних дана
 DocType: Serial No,Incoming Rate,Долазни Оцени
 DocType: Packing Slip,Gross Weight,Бруто тежина
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +410,The name of your company for which you are setting up this system.,Име ваше компаније за коју сте се постављање овог система .
+apps/erpnext/erpnext/public/js/setup_wizard.js +158,The name of your company for which you are setting up this system.,Име ваше компаније за коју сте се постављање овог система .
 DocType: HR Settings,Include holidays in Total no. of Working Days,Укључи одмор у Укупан бр. радних дана
 DocType: Job Applicant,Hold,Држати
 DocType: Employee,Date of Joining,Датум Придруживање
@@ -813,7 +780,6 @@
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +3,View Subscribers,Погледај Претплатници
 DocType: Purchase Invoice Item,Purchase Receipt,Куповина Пријем
 ,Received Items To Be Billed,Примљени артикала буду наплаћени
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +114,Abrasive blasting,Брусни минирања
 DocType: Employee,Ms,Мс
 apps/erpnext/erpnext/config/accounts.py +148,Currency exchange rate master.,Мастер Валютный курс .
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +253,Unable to find Time Slot in the next {0} days for Operation {1},Није могуће пронаћи време за наредних {0} дана за рад {1}
@@ -825,7 +791,7 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +209,Serial No {0} does not belong to Item {1},Серийный номер {0} не принадлежит Пункт {1}
 DocType: Purchase Receipt Item Supplied,Required Qty,Обавезно Кол
 DocType: Bank Reconciliation,Total Amount,Укупан износ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +32,Internet Publishing,Интернет издаваштво
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,Интернет издаваштво
 DocType: Production Planning Tool,Production Orders,Налога за производњу
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +35,Balance Value,Биланс Вредност
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,Продаја Ценовник
@@ -836,7 +802,7 @@
 DocType: Supplier,Default Payable Accounts,Уобичајено се плаћају рачуни
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,Сотрудник {0} не активен или не существует
 DocType: Features Setup,Item Barcode,Ставка Баркод
-apps/erpnext/erpnext/stock/doctype/item/item.py +487,Item Variants {0} updated,Ставка Варијанте {0} ажурирани
+apps/erpnext/erpnext/stock/doctype/item/item.py +491,Item Variants {0} updated,Ставка Варијанте {0} ажурирани
 DocType: Quality Inspection Reading,Reading 6,Читање 6
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Фактури Адванце
 DocType: Address,Shop,Продавница
@@ -845,7 +811,7 @@
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,"Уобичајено банка / Готовина налог ће аутоматски бити ажуриран у ПОС фактура, када је овај режим изабран."
 DocType: Employee,Permanent Address Is,Стална адреса је
 DocType: Production Order Operation,Operation completed for how many finished goods?,Операција завршена за колико готове робе?
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +491,The Brand,Бренд
+apps/erpnext/erpnext/public/js/setup_wizard.js +237,The Brand,Бренд
 apps/erpnext/erpnext/controllers/status_updater.py +163,Allowance for over-{0} crossed for Item {1}.,Исправка за преко-{0} прешао за пункт {1}.
 DocType: Employee,Exit Interview Details,Екит Детаљи Интервју
 DocType: Item,Is Purchase Item,Да ли је куповина артикла
@@ -865,16 +831,16 @@
 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,Сет износ уплате преостали износ =
 DocType: Contact Us Settings,Address Line 1,Аддресс Лине 1
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Variance,Варијација
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +392,Company Name,Име компаније
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +53,Variance,Варијација
+,Company Name,Име компаније
 DocType: SMS Center,Total Message(s),Всего сообщений (ы)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +515,Select Item for Transfer,Избор тачка за трансфер
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +538,Select Item for Transfer,Избор тачка за трансфер
 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.,Изаберите главу рачуна банке у којој је депонован чек.
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,Дозволите кориснику да измените Рате Ценовник у трансакцијама
 DocType: Pricing Rule,Max Qty,Макс Кол-во
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +106,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Ров {0}: Плаћање по куповном / продајном Реда треба увек бити означен као унапред
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +16,Chemical,хемијски
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,хемијски
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +693,All items have already been transferred for this Production Order.,Сви артикли су већ пребачени за ову производњу Реда.
 DocType: Process Payroll,Select Payroll Year and Month,Изабери Паиролл година и месец
 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""",Иди на одговарајуће групе (обично Примена средстава&gt; обртна имовина&gt; банковне рачуне и креирати нови налог (кликом на Додај Цхилд) типа &quot;Банка&quot;
@@ -885,12 +851,12 @@
 DocType: Item,Inspection Criteria,Инспекцијски Критеријуми
 apps/erpnext/erpnext/config/accounts.py +101,Tree of finanial Cost Centers.,Дерево finanial центры Стоимость .
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,Преносе
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +492,Upload your letter head and logo. (you can edit them later).,Уплоад главу писмо и лого. (Можете их уредити касније).
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +156,White,Бео
+apps/erpnext/erpnext/public/js/setup_wizard.js +238,Upload your letter head and logo. (you can edit them later).,Уплоад главу писмо и лого. (Можете их уредити касније).
+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/setup/page/setup_wizard/setup_wizard.js +362,Attach Your Picture,Прикрепите свою фотографию
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Make ,Правити
+apps/erpnext/erpnext/public/js/setup_wizard.js +112,Attach Your Picture,Прикрепите свою фотографию
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +540,Make ,Правити
 DocType: Journal Entry,Total Amount in Words,Укупан износ у речи
 DocType: Workflow State,Stop,стани
 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.,Дошло је до грешке . Један могући разлог би могао бити да нисте сачували форму . Молимо контактирајте суппорт@ерпнект.цом акопроблем и даље постоји .
@@ -899,14 +865,13 @@
 DocType: Lead,Next Contact Date,Следеће Контакт Датум
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,Отварање Кол
 DocType: Holiday List,Holiday List Name,Холидаи Листа Име
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +168,Stock Options,Сток Опције
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +168,Stock Options,Сток Опције
 DocType: Journal Entry Account,Expense Claim,Расходи потраживање
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +181,Qty for {0},Количина за {0}
 DocType: Leave Application,Leave Application,Оставите апликацију
 apps/erpnext/erpnext/config/hr.py +77,Leave Allocation Tool,Оставите Тоол доделе
 DocType: Leave Block List,Leave Block List Dates,Оставите Датуми листу блокираних
 DocType: Company,If Monthly Budget Exceeded (for expense account),Ако Месечни буџет Прекорачено (за расход рачун)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +56,Trimming,Скраћивање
 DocType: Workstation,Net Hour Rate,Нет час курс
 DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,Слетео набавну Пријем
 DocType: Company,Default Terms,Уобичајено Правила
@@ -914,10 +879,9 @@
 DocType: POS Profile,Cash/Bank Account,Готовина / банковног рачуна
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,Removed items with no change in quantity or value.,Уклоњене ствари без промене у количини или вриједности.
 DocType: Delivery Note,Delivery To,Достава Да
-apps/erpnext/erpnext/stock/doctype/item/item.py +509,Attribute table is mandatory,Атрибут сто је обавезно
+apps/erpnext/erpnext/stock/doctype/item/item.py +513,Attribute table is mandatory,Атрибут сто је обавезно
 DocType: Production Planning Tool,Get Sales Orders,Гет продајних налога
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} не може бити негативан
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +103,Filing,Подношење
 apps/erpnext/erpnext/templates/form_grid/item_grid.html +72,Discount,Попуст
 DocType: Features Setup,Purchase Discounts,Куповина Попусти
 DocType: Workstation,Wages,Плате
@@ -934,6 +898,7 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +112,You are the Expense Approver for this record. Please Update the 'Status' and Save,Ви стеТрошак одобраватељ за овај запис . Молимо Ажурирајте 'статус' и Саве
 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 +136,"Attributes for Item Variants. e.g Size, Color etc.","Атрибути за тачка варијанти. нпр Величина, Боја итд"
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +39,WIP Warehouse,ВИП Магацин
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +194,Serial No {0} is under maintenance contract upto {1},Серийный номер {0} находится под контрактом на техническое обслуживание ДО {1}
@@ -942,7 +907,7 @@
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,Коммерческие расходы
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Buying,Стандардна Куповина
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +120,Standard Buying,Стандардна Куповина
 DocType: GL Entry,Against,Против
 DocType: Item,Default Selling Cost Center,По умолчанию Продажа Стоимость центр
 DocType: Sales Partner,Implementation Partner,Имплементација Партнер
@@ -963,29 +928,29 @@
 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/setup/page/setup_wizard/setup_wizard.js +588,List a few of your suppliers. They could be organizations or individuals.,Листанеколико ваших добављача . Они могу бити организације и појединци .
+apps/erpnext/erpnext/public/js/setup_wizard.js +326,List a few of your suppliers. They could be organizations or individuals.,Листанеколико ваших добављача . Они могу бити организације и појединци .
 DocType: Company,Default Currency,Уобичајено валута
 DocType: Contact,Enter designation of this Contact,Унесите назив овог контакта
 DocType: Contact Us Settings,Address,Адреса
 DocType: Expense Claim,From Employee,Од запосленог
-apps/erpnext/erpnext/controllers/accounts_controller.py +338,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Внимание: Система не будет проверять overbilling с суммы по пункту {0} в {1} равна нулю
+apps/erpnext/erpnext/controllers/accounts_controller.py +339,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Внимание: Система не будет проверять overbilling с суммы по пункту {0} в {1} равна нулю
 DocType: Journal Entry,Make Difference Entry,Направите унос Дифференце
 DocType: Upload Attendance,Attendance From Date,Гледалаца Од датума
 DocType: Appraisal Template Goal,Key Performance Area,Кључна Перформансе Област
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +54,Transportation,транспорт
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +54,Transportation,транспорт
 apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +67, and year: ,и година:
 DocType: Email Digest,Annual Expense,Годишњи трошак
 DocType: SMS Center,Total Characters,Укупно Карактери
-apps/erpnext/erpnext/controllers/buying_controller.py +139,Please select BOM in BOM field for Item {0},Молимо Вас да изаберете БОМ БОМ у пољу за ставку {0}
+apps/erpnext/erpnext/controllers/buying_controller.py +130,Please select BOM in BOM field for Item {0},Молимо Вас да изаберете БОМ БОМ у пољу за ставку {0}
 DocType: C-Form Invoice Detail,C-Form Invoice Detail,Ц-Форм Рачун Детаљ
 DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,Плаћање Помирење Фактура
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +32,Contribution %,Допринос%
 DocType: Item,website page link,веб страница веза
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +192,Let's prepare the system for first use.,Хајде да припреми систем за прве употребе.
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +242,Let's prepare the system for first use.,Хајде да припреми систем за прве употребе.
 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 +214,Production Order {0} must be cancelled before cancelling this Sales Order,Производственный заказ {0} должно быть отменено до отмены этого заказ клиента
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +209,Production Order {0} must be cancelled before cancelling this Sales Order,Производственный заказ {0} должно быть отменено до отмены этого заказ клиента
 ,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.,Изаберите Протоколи време и слање да створи нову продајну фактуру.
@@ -1005,14 +970,13 @@
 DocType: Sales Invoice Advance,Sales Invoice Advance,Продаја Рачун Адванце
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +398,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/page/setup_wizard/install_fixtures.py +75,Management,управљање
+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/setup/page/setup_wizard/fixtures/operations.py +14,Investment casting,Ливење
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +51,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""","Ово ће бити прикључена на Кодекса тачка на варијанте. На пример, ако је ваш скраћеница је ""СМ"", а код ставка је ""МАЈИЦА"", ставка код варијанте ће бити ""МАЈИЦА-СМ"""
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,Нето плата (у речи) ће бити видљив када сачувате Слип плату.
 apps/frappe/frappe/core/doctype/user/user_list.js +12,Active,Активан
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +154,Blue,Плава
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +154,Blue,Плава
 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,Даље чворови могу бити само створена под ' групе' типа чворова
@@ -1021,18 +985,16 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +57,Item Code cannot be changed for Serial No.,Шифра не може се мењати за серијским бројем
 DocType: Purchase Order Item,UOM Conversion Factor,УОМ конверзије фактор
 DocType: Stock Settings,Default Item Group,Уобичајено тачка Група
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +156,Laminated object manufacturing,Ламинирано објекат производња
 apps/erpnext/erpnext/config/buying.py +13,Supplier database.,Снабдевач базе података.
 DocType: Account,Balance Sheet,баланс
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +561,Cost Center For Item with Item Code ',Цост Центер За ставку са Код товара '
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +45,Stretch forming,Пружи формирање
 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 +210,"Further accounts can be made under Groups, but entries can be made against non-Groups","Даље рачуни могу бити у групама, али уноса можете извршити над несрпским групама"
 apps/erpnext/erpnext/config/hr.py +125,Tax and other salary deductions.,Порески и други плата одбитака.
 DocType: Lead,Lead,Довести
 DocType: Email Digest,Payables,Обавезе
 DocType: Account,Warehouse,Магацин
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +90,Row #{0}: Rejected Qty can not be entered in Purchase Return,Ред # {0}: Одбијен количина не може се уписати у откупу Повратак
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +93,Row #{0}: Rejected Qty can not be entered in Purchase Return,Ред # {0}: Одбијен количина не може се уписати у откупу Повратак
 ,Purchase Order Items To Be Billed,Налог за куповину артикала буду наплаћени
 DocType: Purchase Invoice Item,Net Rate,Нето курс
 DocType: Purchase Invoice Item,Purchase Invoice Item,Фактури Итем
@@ -1047,13 +1009,13 @@
 DocType: Global Defaults,Current Fiscal Year,Текуће фискалне године
 DocType: Global Defaults,Disable Rounded Total,Онемогући Роундед Укупно
 DocType: Lead,Call,Позив
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +384,'Entries' cannot be empty,"""Уноси"" не могу бити празни"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +386,'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 +205,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/page/setup_wizard/install_fixtures.py +138,Research,истраживање
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +138,Research,истраживање
 DocType: Maintenance Visit Purpose,Work Done,Рад Доне
 apps/erpnext/erpnext/controllers/item_variant.py +25,Please specify at least one attribute in the Attributes table,Наведите бар један атрибут у табели Атрибутима
 DocType: Contact,User ID,Кориснички ИД
@@ -1061,10 +1023,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +57,View Ledger,Погледај Леџер
 DocType: File,Lft,ЛФТ
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Најраније
-apps/erpnext/erpnext/stock/doctype/item/item.py +394,"An Item Group exists with same name, please change the item name or rename the item group","Пункт Группа существует с тем же именем , пожалуйста, измените имя элемента или переименовать группу товаров"
+apps/erpnext/erpnext/stock/doctype/item/item.py +398,"An Item Group exists with same name, please change the item name or rename the item group","Пункт Группа существует с тем же именем , пожалуйста, измените имя элемента или переименовать группу товаров"
 DocType: Communication,Delivery Status,Статус испоруке
 DocType: Production Order,Manufacture against Sales Order,Производња против налога за продају
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +517,Rest Of The World,Остальной мир
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +455,Rest Of The World,Остальной мир
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,Ставка {0} не може имати Батцх
 ,Budget Variance Report,Буџет Разлика извештај
 DocType: Salary Slip,Gross Pay,Бруто Паи
@@ -1075,13 +1037,11 @@
 DocType: BOM Item,Item Description,Ставка Опис
 DocType: Payment Tool,Payment Mode,Режим плаћања
 DocType: Purchase Invoice,Is Recurring,Је се понавља
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +154,Direct metal laser sintering,Директан метални ласерски синтерирање
 DocType: Purchase Order,Supplied Items,Додатна артикала
 DocType: Production Order,Qty To Manufacture,Кол Да Производња
 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,Привремени Отварање
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +41,Cryorolling,Цриороллинг
 ,Employee Leave Balance,Запослени одсуство Биланс
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +128,Balance for Account {0} must always be {1},Весы для счета {0} должен быть всегда {1}
 DocType: Address,Address Type,Врста адресе
@@ -1097,23 +1057,23 @@
 DocType: Journal Entry,Get Outstanding Invoices,Гет неплаћене рачуне
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,Заказ на продажу {0} не является допустимым
 apps/erpnext/erpnext/setup/doctype/company/company.py +172,"Sorry, companies cannot be merged","Жао нам је , компаније не могу да се споје"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +145,Small,Мали
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Small,Мали
 DocType: Employee,Employee Number,Запослени Број
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},Случай Нет (ы) уже используется. Попробуйте из дела № {0}
 ,Invoiced Amount (Exculsive Tax),Износ фактуре ( Екцулсиве Пореска )
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,Тачка 2
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +59,Account head {0} created,Глава счета {0} создан
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +153,Green,Зелен
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Green,Зелен
 DocType: Item,Auto re-order,Ауто поново реда
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +57,Total Achieved,Укупно Постигнута
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +59,Total Achieved,Укупно Постигнута
 DocType: Employee,Place of Issue,Место издавања
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +59,Contract,уговор
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Contract,уговор
 DocType: Report,Disabled,Онеспособљен
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +490,UOM coversion factor required for UOM: {0} in Item: {1},УОМ цоверсион фактор потребан за УЦГ: {0} тачке: {1}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +83,Indirect Expenses,косвенные расходы
 apps/erpnext/erpnext/controllers/selling_controller.py +163,Row {0}: Qty is mandatory,Ред {0}: Кол је обавезно
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +8,Agriculture,пољопривреда
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +611,Your Products or Services,Ваши производи или услуге
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,пољопривреда
+apps/erpnext/erpnext/public/js/setup_wizard.js +347,Your Products or Services,Ваши производи или услуге
 DocType: Mode of Payment,Mode of Payment,Начин плаћања
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,То јекорен ставка група и не може се мењати .
 DocType: Journal Entry Account,Purchase Order,Налог за куповину
@@ -1125,7 +1085,7 @@
 DocType: Serial No,Serial No Details,Серијска Нема детаља
 DocType: Purchase Invoice Item,Item Tax Rate,Ставка Пореска стопа
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +113,"For {0}, only credit accounts can be linked against another debit entry","За {0}, само кредитне рачуни могу бити повезани против неке друге ставке дебитне"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Delivery Note {0} is not submitted,Доставка Примечание {0} не представлено
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +470,Delivery Note {0} is not submitted,Доставка Примечание {0} не представлено
 apps/erpnext/erpnext/stock/get_item_details.py +136,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.","Правилник о ценама је први изабран на основу 'Примени на ""терену, који могу бити артикла, шифра групе или Марка."
@@ -1135,7 +1095,7 @@
 DocType: Appraisal Goal,Goal,Циљ
 DocType: Sales Invoice Item,Edit Description,Измени опис
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +318,Expected Delivery Date is lesser than Planned Start Date.,Очекивани Датум испоруке је мањи од планираног почетка Датум.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +579,For Supplier,За добављача
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +602,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,Укупно Одлазећи
@@ -1161,10 +1121,10 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +74,"Total {0} for all items is zero, may you should change 'Distribute Charges Based On'","Укупно {0} за све ставке је нула, може ли треба променити &quot;дистрибуира пријава по &#39;"
 DocType: Purchase Invoice,Taxes and Charges Calculation,Порези и накнаде израчунавање
 DocType: BOM Operation,Workstation,Воркстатион
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +112,Hardware,аппаратные средства
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +112,Hardware,аппаратные средства
 DocType: Attendance,HR Manager,ХР Менаџер
 apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,Изаберите Цомпани
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +50,Privilege Leave,Привилегированный Оставить
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +50,Privilege Leave,Привилегированный Оставить
 DocType: Purchase Invoice,Supplier Invoice Date,Датум фактуре добављача
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +79,You need to enable Shopping Cart,Потребно је да омогућите Корпа
 apps/frappe/frappe/public/js/frappe/form/grid_body.html +6,No Data,Нема података
@@ -1177,7 +1137,7 @@
 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 +168,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/setup/page/setup_wizard/install_fixtures.py +38,Food,еда
+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 +139,You can make a time log only against a submitted production order,Можете направити временску дневник само против поднетом производног како
 DocType: Maintenance Schedule Item,No of Visits,Број посета
@@ -1197,6 +1157,7 @@
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,View Offer Letter,Погледај Понуда Писмо
 DocType: Communication,Communication,Комуникација
 DocType: Item,Is Service Item,Да ли је услуга шифра
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +81,Application period cannot be outside leave allocation period,Период примене не може бити изван одсуство расподела Период
 DocType: Activity Cost,Projects,Пројекти
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +31,Please select Fiscal Year,"Пожалуйста, выберите финансовый год"
 apps/erpnext/erpnext/controllers/buying_controller.py +23,From {0} | {1} {2},Од {0} | {1} {2}
@@ -1215,7 +1176,7 @@
 DocType: Item,Maintain Stock,Одржавајте Стоцк
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +213,Stock Entries already created for Production Order ,Сток уноси већ створене за производно Реда
 DocType: Leave Control Panel,Leave blank if considered for all designations,Оставите празно ако се сматра за све ознакама
-apps/erpnext/erpnext/controllers/accounts_controller.py +499,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Начисление типа «Актуальные ' в строке {0} не могут быть включены в пункт Оценить
+apps/erpnext/erpnext/controllers/accounts_controller.py +500,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Начисление типа «Актуальные ' в строке {0} не могут быть включены в пункт Оценить
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,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,За компаније
@@ -1225,7 +1186,7 @@
 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 +471,cannot be greater than 100,не може бити већи од 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +546,Item {0} is not a stock Item,Пункт {0} не является акционерным Пункт
+apps/erpnext/erpnext/stock/doctype/item/item.py +550,Item {0} is not a stock Item,Пункт {0} не является акционерным Пункт
 DocType: Maintenance Visit,Unscheduled,Неплански
 DocType: Employee,Owned,Овнед
 DocType: Salary Slip Deduction,Depends on Leave Without Pay,Зависи оставити без Паи
@@ -1239,31 +1200,29 @@
 DocType: HR Settings,Employee Settings,Подешавања запослених
 ,Batch-Wise Balance History,Групно-Висе Стање Историја
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +72,To Do List,То до лист
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +63,Apprentice,шегрт
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Apprentice,шегрт
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +99,Negative Quantity is not allowed,Негативна Количина није дозвољено
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
 Used for Taxes and Charges","Пореска детаљ сто учитани из тачка мајстора у виду стринг и складиште у овој области.
  Користи се за таксама и накнадама"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +61,Lancing,Ланцинг
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +151,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 +435,Accounting Entry for {0}: {1} can only be made in currency: {2},Књиговодство Ступање на {0}: {1} може се вршити само у валути: {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +436,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 +38,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 +112,Tax Rule for transactions.,Пореска Правило за трансакције.
 DocType: Rename Tool,Type of document to rename.,Врста документа да преименујете.
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +630,We buy this Item,Купујемо ову ставку
+apps/erpnext/erpnext/public/js/setup_wizard.js +366,We buy this Item,Купујемо ову ставку
 DocType: Address,Billing,Обрачун
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +77,Flanging,Флангинг
 DocType: Bulk Email,Not Sent,Није Сент
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +73,Explosive forming,Експлозив формирање
 DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),Укупни порези и таксе (Друштво валута)
 DocType: Shipping Rule,Shipping Account,Достава рачуна
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +43,Scheduled to send to {0} recipients,Планируется отправить {0} получателей
 DocType: Quality Inspection,Readings,Читања
 DocType: Stock Entry,Total Additional Costs,Укупно Додатни трошкови
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Sub Assemblies,Sub сборки
+apps/erpnext/erpnext/public/js/setup_wizard.js +359,Sub Assemblies,Sub сборки
 DocType: Shipping Rule Condition,To Value,Да вредност
 DocType: Supplier,Stock Manager,Сток директор
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +143,Source warehouse is mandatory for row {0},Источник склад является обязательным для ряда {0}
@@ -1273,44 +1232,42 @@
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Увоз није успело !
 apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,Адреса додао.
 DocType: Workstation Working Hour,Workstation Working Hour,Воркстатион радни сат
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +83,Analyst,аналитичар
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +202,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Ред {0}: Додељени износ {1} мора бити мања или једнака количини ЈВ {2}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Analyst,аналитичар
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +149,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Ред {0}: Додељени износ {1} мора бити мања или једнака количини ЈВ {2}
 DocType: Item,Inventory,Инвентар
 DocType: Features Setup,"To enable ""Point of Sale"" view",Да бисте омогућили &quot;Поинт Оф Сале&quot; поглед
 apps/erpnext/erpnext/public/js/pos/pos.js +402,Payment cannot be made for empty cart,Плаћање не може се за празан корпу
 DocType: Item,Sales Details,Детаљи продаје
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +149,Pinning,Пиннинг
 DocType: Opportunity,With Items,Са ставкама
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,У Кол
 DocType: Notification Control,Expense Claim Rejected,Расходи потраживање Одбијен
 DocType: Sales Invoice,"The date on which next invoice will be generated. It is generated on submit.
 ",Датум који ће бити генерисан следећи рачун. То се генерише на достави.
 DocType: Item Attribute,Item Attribute,Итем Атрибут
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +105,Government,правительство
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Government,правительство
 apps/erpnext/erpnext/config/stock.py +268,Item Variants,Ставка Варијанте
 DocType: Company,Services,Услуге
 apps/erpnext/erpnext/accounts/report/financial_statements.py +147,Total ({0}),Укупно ({0})
 DocType: Cost Center,Parent Cost Center,Родитељ Трошкови центар
 DocType: Sales Invoice,Source,Извор
 DocType: Leave Type,Is Leave Without Pay,Да ли је Оставите без плате
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +186,No records found in the Payment table,Нема резултата у табели плаћања записи
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +405,Financial Year Start Date,Финансовый год Дата начала
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +133,No records found in the Payment table,Нема резултата у табели плаћања записи
+apps/erpnext/erpnext/public/js/setup_wizard.js +153,Financial Year Start Date,Финансовый год Дата начала
 DocType: Employee External Work History,Total Experience,Укупно Искуство
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +100,Countersinking,Упуштања
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +271,Packing Slip(s) cancelled,Упаковочный лист (ы) отменяется
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +276,Packing Slip(s) cancelled,Упаковочный лист (ы) отменяется
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,Грузовые и экспедиторские Сборы
 DocType: Material Request Item,Sales Order No,Продаја Наручите Нема
 DocType: Item Group,Item Group Name,Ставка Назив групе
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +50,Taken,Такен
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,Такен
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +66,Transfer Materials for Manufacture,Трансфер материјал за производњу
 DocType: Pricing Rule,For Price List,Для Прейскурантом
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +27,Executive Search,Екецутиве Сеарцх
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,Екецутиве Сеарцх
 apps/erpnext/erpnext/stock/stock_ledger.py +405,"Purchase rate for item: {0} not found, which is required to book accounting entry (expense). Please mention item price against a buying price list.","Куповина стопа за ставку: {0} није пронађен, који је потребан да резервишете рачуноводствене унос (расход). Молимо вас да позовете цену артикла, против листе куповна цена."
 DocType: Maintenance Schedule,Schedules,Распореди
 DocType: Purchase Invoice Item,Net Amount,Нето износ
 DocType: Purchase Order Item Supplied,BOM Detail No,БОМ Детаљ Нема
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),Додатне Износ попуста (Фирма валута)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +537,Error: {0} > {1},Ошибка: {0} > {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +541,Error: {0} > {1},Ошибка: {0} > {1}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,Молимо креирајте нови налог из контном оквиру .
 DocType: Maintenance Visit,Maintenance Visit,Одржавање посета
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer > Customer Group > Territory,Кориснички> Кориснички Група> Територија
@@ -1332,15 +1289,14 @@
 DocType: ToDo,Due Date,Дуе Дате
 DocType: Sales Invoice Item,Brand Name,Бранд Наме
 DocType: Purchase Receipt,Transporter Details,Транспортер Детаљи
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Box,коробка
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +389,The Organization,Организација
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Box,коробка
+apps/erpnext/erpnext/public/js/setup_wizard.js +137,The Organization,Организација
 DocType: Monthly Distribution,Monthly Distribution,Месечни Дистрибуција
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,"Приемник Список пуст . Пожалуйста, создайте приемник Список"
 DocType: Production Plan Sales Order,Production Plan Sales Order,Производња Продаја план Наручи
 DocType: Sales Partner,Sales Partner Target,Продаја Партнер Циљна
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},Књиговодство Ступање на {0} може се вршити само у валути: {1}
 DocType: Pricing Rule,Pricing Rule,Цены Правило
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +58,Notching,Угаоно исецање
 apps/erpnext/erpnext/config/learn.py +167,Material Request to Purchase Order,Материјал захтјев за откуп Ордер
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +74,Row # {0}: Returned Item {1} does not exists in {2} {3},Ред # {0}: враћено артикла {1} не постоји у {2} {3}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,Банковни рачуни
@@ -1357,20 +1313,19 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Amounts not reflected in bank,Износи не огледа у банци
 DocType: Quality Inspection Reading,Reading 4,Читање 4
 apps/erpnext/erpnext/config/hr.py +23,Claims for company expense.,Захтеви за рачун предузећа.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +8,Centrifugal casting,Центрифугална ливење
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +119,Magnetic field-assisted finishing,Магнетно поље уз помоћ завршни
 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,Контакт Мобиле Нема
 DocType: Production Planning Tool,Select Sales Orders,Избор продајних налога
 ,Material Requests for which Supplier Quotations are not created,Материјални Захтеви за који Супплиер Цитати нису створени
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +117,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,Дан (и) на коју се пријављујете за дозволу су празници. Не морате пријавити за одмор.
 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/buying/doctype/purchase_order/purchase_order.js +477,Mark as Delivered,Означи као Деливеред
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +497,Mark as Delivered,Означи као Деливеред
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +34,Make Quotation,Направи понуду
 DocType: Dependent Task,Dependent Task,Зависна Задатак
-apps/erpnext/erpnext/stock/doctype/item/item.py +306,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 +141,Leave of type {0} cannot be longer than {1},"Оставить типа {0} не может быть больше, чем {1}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +310,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 +155,Leave of type {0} cannot be longer than {1},"Оставить типа {0} не может быть больше, чем {1}"
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Покушајте планирање операција за Кс дана унапред.
 DocType: HR Settings,Stop Birthday Reminders,Стани Рођендан Подсетници
 DocType: SMS Center,Receiver List,Пријемник Листа
@@ -1378,15 +1333,14 @@
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Цонсумед Износ
 apps/erpnext/erpnext/public/js/pos/pos.js +491,{0} View,{0} Погледај
 DocType: Salary Structure Deduction,Salary Structure Deduction,Плата Структура Одбитак
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +158,Selective laser sintering,Селективно ласерски синтерирање
-apps/erpnext/erpnext/stock/doctype/item/item.py +301,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Единица измерения {0} был введен более чем один раз в таблицу преобразования Factor
+apps/erpnext/erpnext/stock/doctype/item/item.py +305,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Единица измерения {0} был введен более чем один раз в таблицу преобразования Factor
 apps/frappe/frappe/core/page/data_import_tool/data_import_tool.js +108,Import Successful!,Увоз Успешна !
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Трошкови издатих ставки
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +185,Quantity must not be more than {0},Количина не сме бити више од {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +41,Age (Days),Старост (Дани)
 DocType: Quotation Item,Quotation Item,Понуда шифра
 DocType: Account,Account Name,Име налога
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +41,From Date cannot be greater than To Date,Од датума не може бити већа него до сада
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +34,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.,Тип Поставщик мастер .
 DocType: Purchase Order Item,Supplier Part Number,Снабдевач Број дела
@@ -1395,14 +1349,14 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +247,{0} {1} is cancelled or stopped,{0} {1} отказан или заустављен
 DocType: Accounts Settings,Credit Controller,Кредитни контролер
 DocType: Delivery Note,Vehicle Dispatch Date,Отпрема Возила Датум
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +197,Purchase Receipt {0} is not submitted,Покупка Получение {0} не представлено
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +198,Purchase Receipt {0} is not submitted,Покупка Получение {0} не представлено
 DocType: Company,Default Payable Account,Уобичајено оплате рачуна
 apps/erpnext/erpnext/config/website.py +13,"Settings for online shopping cart such as shipping rules, price list etc.","Подешавања за онлине куповину као што су испоруке правила, ценовник итд"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +660,Setup Complete,Завершение установки
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +124,Setup Complete,Завершение установки
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +65,{0}% Billed,{0}% Приходована
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +17,Reserved Qty,Резервисано Кол
 DocType: Party Account,Party Account,Странка налог
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +74,Human Resources,Человеческие ресурсы
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +74,Human Resources,Человеческие ресурсы
 DocType: Lead,Upper Income,Горња прихода
 DocType: Journal Entry Account,Debit in Company Currency,Дебитна у Компанија валути
 apps/erpnext/erpnext/support/doctype/issue/issue.py +58,My Issues,Моји проблеми
@@ -1411,11 +1365,9 @@
 DocType: Company,Default Values,Уобичајено Вредности
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +236,Row {0}: Payment amount can not be negative,Ров {0}: Плаћање износ не може бити негативан
 DocType: Expense Claim,Total Amount Reimbursed,Укупан износ рефундирају
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +152,Press fitting,Притисните Фиттинг
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +64,Against Supplier Invoice {0} dated {1},Против добављача Фактура {0} {1} од
 DocType: Customer,Default Price List,Уобичајено Ценовник
 DocType: Payment Reconciliation,Payments,Исплате
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +24,Hot isostatic pressing,Хот изостатичко пресовање
 DocType: ToDo,Medium,Средњи
 DocType: Budget Detail,Budget Allocated,Буџет Издвојена
 DocType: Journal Entry,Entry Type,Ступање Тип
@@ -1428,9 +1380,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +56,None of the items have any change in quantity or value.,Ниједан од ставки имају било какву промену у количини или вриједности.
 DocType: Warranty Claim,Warranty Claim,Гаранција Цлаим
 ,Lead Details,Олово Детаљи
-DocType: Authorization Rule,Approving User,Одобравање корисника
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +37,Forging,Фалсификовање
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +126,Plating,Позлаћивање
 DocType: Purchase Invoice,End date of current invoice's period,Крајњи датум периода актуелне фактуре за
 DocType: Pricing Rule,Applicable For,Применимо для
 DocType: Bank Reconciliation,From Date,Од датума
@@ -1452,31 +1401,29 @@
 DocType: Sales Invoice,Paid Amount (Company Currency),Уплаћеног износа (Фирма валута)
 DocType: Purchase Invoice,Additional Discount,Додатни попуст
 DocType: Selling Settings,Selling Settings,Продаја Сеттингс
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +39,Online Auctions,Онлине Аукције
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,Онлине Аукције
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +94,Please specify either Quantity or Valuation Rate or both,Наведите било Количина или вредновања оцену или обоје
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +50,"Company, Month and Fiscal Year is mandatory","Компанија , месец и Фискална година је обавезно"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Marketing Expenses,Маркетинговые расходы
 ,Item Shortage Report,Ставка о несташици извештај
-apps/erpnext/erpnext/stock/doctype/item/item.js +183,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Тежина се спомиње, \n Молимо вас да се позовете на ""Тежина УОМ"" превише"
+apps/erpnext/erpnext/stock/doctype/item/item.js +185,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Тежина се спомиње, \n Молимо вас да се позовете на ""Тежина УОМ"" превише"
 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 +212,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 +384,Warehouse required at Row No {0},Магацин потребно на Ров Но {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +386,Warehouse required at Row No {0},Магацин потребно на Ров Но {0}
 DocType: Employee,Date Of Retirement,Датум одласка у пензију
 DocType: Upload Attendance,Get Template,Гет шаблона
 DocType: Address,Postal,Поштански
 DocType: Item,Weightage,Веигхтаге
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +159,Mining,Рударство
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +17,Resin casting,Смола ливење
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"Группа клиентов существует с тем же именем , пожалуйста изменить имя клиентов или переименовать группу клиентов"
 apps/erpnext/erpnext/public/js/pos/pos.js +147,Please select {0} first.,Изаберите {0} прво.
 apps/erpnext/erpnext/templates/pages/order.html +57,text {0},Текст {0}
 DocType: Territory,Parent Territory,Родитељ Територија
 DocType: Quality Inspection Reading,Reading 2,Читање 2
 DocType: Stock Entry,Material Receipt,Материјал Пријем
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +622,Products,Продукты
+apps/erpnext/erpnext/public/js/setup_wizard.js +358,Products,Продукты
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +47,Party Type and Party is required for Receivable / Payable account {0},Странка Тип и Странка је потребан за примања / обавезе обзир {0}
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.","Ако ова ставка има варијанте, онда не може бити изабран у налозима продаје итд"
 DocType: Lead,Next Contact By,Следеће Контакт По
@@ -1486,13 +1433,13 @@
 DocType: Purchase Invoice,Notification Email Address,Обавештење е-маил адреса
 DocType: Payment Tool,Find Invoices to Match,Пронађи фактуре да одговара
 ,Item-wise Sales Register,Предмет продаје-мудре Регистрација
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +399,"e.g. ""XYZ National Bank""","нпр ""КСИЗ Народна банка """
+apps/erpnext/erpnext/public/js/setup_wizard.js +147,"e.g. ""XYZ National Bank""","нпр ""КСИЗ Народна банка """
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,Да ли је то такса у Основном Рате?
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +57,Total Target,Укупно Циљна
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Target,Укупно Циљна
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.js +22,Shopping Cart is enabled,Корпа је омогућено
 DocType: Job Applicant,Applicant for a Job,Подносилац захтева за посао
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +173,No Production Orders created,"Нет Производственные заказы , созданные"
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +131,Salary Slip of employee {0} already created for this month,Зарплата скольжения работника {0} уже создано за этот месяц
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +140,Salary Slip of employee {0} already created for this month,Зарплата скольжения работника {0} уже создано за этот месяц
 DocType: Stock Reconciliation,Reconciliation JSON,Помирење ЈСОН
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Превише колоне. Извоз извештај и одштампајте га помоћу тих апликација.
 DocType: Sales Invoice Item,Batch No,Групно Нема
@@ -1502,14 +1449,14 @@
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +13,Variant,Варијанта
 apps/frappe/frappe/public/js/frappe/form/toolbar.js +165,New {0},Нови {0}
 DocType: Naming Series,Set prefix for numbering series on your transactions,Сет префикс за нумерисање серију на својим трансакцијама
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +169,Stopped order cannot be cancelled. Unstop to cancel.,Остановился заказ не может быть отменен. Unstop отменить .
-apps/erpnext/erpnext/stock/doctype/item/item.py +323,Default BOM ({0}) must be active for this item or its template,Уобичајено БОМ ({0}) мора бити активан за ову ставку или његовог шаблон
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +164,Stopped order cannot be cancelled. Unstop to cancel.,Остановился заказ не может быть отменен. Unstop отменить .
+apps/erpnext/erpnext/stock/doctype/item/item.py +327,Default BOM ({0}) must be active for this item or its template,Уобичајено БОМ ({0}) мора бити активан за ову ставку или његовог шаблон
 DocType: Employee,Leave Encashed?,Оставите Енцасхед?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Прилика Од пољу је обавезна
 DocType: Item,Variants,Варијанте
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +458,Make Purchase Order,Маке наруџбенице
 DocType: SMS Center,Send To,Пошаљи
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +111,There is not enough leave balance for Leave Type {0},Существует не хватает отпуск баланс для отпуске Тип {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +127,There is not enough leave balance for Leave Type {0},Существует не хватает отпуск баланс для отпуске Тип {0}
 DocType: Sales Team,Contribution to Net Total,Допринос нето укупни
 DocType: Sales Invoice Item,Customer's Item Code,Шифра купца
 DocType: Stock Reconciliation,Stock Reconciliation,Берза помирење
@@ -1546,11 +1493,11 @@
 DocType: Sales Order Item,Actual Qty,Стварна Кол
 DocType: Sales Invoice Item,References,Референце
 DocType: Quality Inspection Reading,Reading 10,Читање 10
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +612,"List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start.",Наведите своје производе или услуге које купују или продају .
+apps/erpnext/erpnext/public/js/setup_wizard.js +348,"List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start.",Наведите своје производе или услуге које купују или продају .
 DocType: Hub Settings,Hub Node,Хуб Ноде
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,Унели дупликате . Молимо исправи и покушајте поново .
 apps/erpnext/erpnext/controllers/item_variant.py +65,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values,Вредност {0} за Аттрибуте {1} не постоји у листи важећег тачке вредности атрибута
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +87,Associate,помоћник
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Associate,помоћник
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +46,Item {0} is not a serialized Item,Пункт {0} не сериализованным Пункт
 DocType: SMS Center,Create Receiver List,Направите листу пријемника
 apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +5,Expired,Истекло
@@ -1559,7 +1506,7 @@
 DocType: Warranty Claim,Issue Date,Датум емитовања
 DocType: Activity Cost,Activity Cost,Активност Трошкови
 DocType: Purchase Receipt Item Supplied,Consumed Qty,Потрошено Кол
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +52,Telecommunications,телекомуникација
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +52,Telecommunications,телекомуникација
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),Указује на то да пакет је део ове испоруке (само нацрт)
 DocType: Payment Tool,Make Payment Entry,Уплатите Ентри
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +119,Quantity for Item {0} must be less than {1},Количество по пункту {0} должно быть меньше {1}
@@ -1576,10 +1523,8 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +37,"Selling must be checked, if Applicable For is selected as {0}","Продаја се мора проверити, ако је применљиво Јер је изабрана као {0}"
 DocType: Purchase Order Item,Supplier Quotation Item,Снабдевач Понуда шифра
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +27,Make Salary Structure,Маке плата Структура
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +54,Shearing,Стрижа
 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.,Кликните на &#39;да продаје Фактура&#39; дугме да бисте креирали нову продајну фактуру.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +166,Packaging and labeling,Паковање и етикетирање
 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,"Пожалуйста, сформулируйте Базовая валюта в компании Мастер и общие настройки по умолчанию"
@@ -1590,19 +1535,18 @@
 DocType: Budget Detail,Fiscal Year,Фискална година
 DocType: Cost Center,Budget,Буџет
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +41,"Budget cannot be assigned against {0}, as it's not an Income or Expense account","Буџет не може се одредити према {0}, јер то није прихода или расхода рачун"
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Achieved,Постигнута
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,Постигнута
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +65,Territory / Customer,Територија / Кориснички
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,e.g. 5,например 5
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +207,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},Ред {0}: Додељени износ {1} мора бити мања или једнака фактурише изузетну количину {2}
+apps/erpnext/erpnext/public/js/setup_wizard.js +294,e.g. 5,например 5
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},Ред {0}: Додељени износ {1} мора бити мања или једнака фактурише изузетну количину {2}
 DocType: Sales Invoice,In Words will be visible once you save the Sales Invoice.,У речи ће бити видљив када сачувате продаје фактуру.
 DocType: Item,Is Sales Item,Да ли продаје артикла
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,Ставка Група дрво
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,Пункт {0} не установка для мастера серийные номера Проверить товара
 DocType: Maintenance Visit,Maintenance Time,Одржавање време
 ,Amount to Deliver,Износ на Избави
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +620,A Product or Service,Продукт или сервис
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +158,There were errors.,Било је грешака .
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +101,Tapping,Таппинг
+apps/erpnext/erpnext/public/js/setup_wizard.js +356,A Product or Service,Продукт или сервис
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +146,There were errors.,Било је грешака .
 DocType: Naming Series,Current Value,Тренутна вредност
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +171,{0} created,{0} создан
 DocType: Delivery Note Item,Against Sales Order,Против продаје налога
@@ -1616,7 +1560,7 @@
 apps/erpnext/erpnext/accounts/party.py +275,Due Date cannot be before Posting Date,"Впритык не может быть , прежде чем отправлять Дата"
 DocType: Website Item Group,Website Item Group,Сајт тачка Група
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Duties and Taxes,Пошлины и налоги
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Please enter Reference date,"Пожалуйста, введите дату Ссылка"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +312,Please enter Reference date,"Пожалуйста, введите дату Ссылка"
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} уноса плаћања не може да се филтрира од {1}
 DocType: Item Website Specification,Table for Item that will be shown in Web Site,Табела за ставку која ће бити приказана у веб сајта
 DocType: Purchase Order Item Supplied,Supplied Qty,Додатна количина
@@ -1624,7 +1568,7 @@
 apps/erpnext/erpnext/config/stock.py +103,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,Тачка-мудар Историја куповине
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +152,Red,Црвен
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Red,Црвен
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +228,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},"Пожалуйста, нажмите на кнопку "" Generate Расписание "" , чтобы принести Серийный номер добавлен для Пункт {0}"
 DocType: Account,Frozen,Фрозен
 ,Open Production Orders,Отворена Продуцтион Поруџбине
@@ -1639,7 +1583,7 @@
 DocType: Item Attribute,Attribute Name,Назив атрибута
 apps/erpnext/erpnext/controllers/selling_controller.py +236,Item {0} must be Sales or Service Item in {1},Пункт {0} должно быть продажи или в пункте СЕРВИС {1}
 DocType: Item Group,Show In Website,Схов у сајт
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +621,Group,Група
+apps/erpnext/erpnext/public/js/setup_wizard.js +357,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","Да бисте пратили бренд име у следећим документима испоруци, прилика, материјалној Захтев тачка, нарудзбенице, купите ваучер, Наручилац пријему, цитат, Продаја фактура, Производ Бундле, Салес Ордер, Сериал Но"
@@ -1649,6 +1593,7 @@
 DocType: Features Setup,Brands,Брендови
 DocType: C-Form Invoice Detail,Invoice No,Рачун Нема
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +480,From Purchase Order,Од наруџбеницу
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +92,"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,Оставка Писмо Датум
@@ -1656,35 +1601,31 @@
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +137,Not Set,Нот Сет
 DocType: Communication,Date,Датум
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,Поновите Кориснички Приход
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +651,Sit tight while your system is being setup. This may take a few moments.,Стрпите се док ваш систем бити подешавање . Ово може да потраје неколико тренутака .
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +115,Sit tight while your system is being setup. This may take a few moments.,Стрпите се док ваш систем бити подешавање . Ово може да потраје неколико тренутака .
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +51,{0} ({1}) must have role 'Expense Approver',{0} ({1}) мора имати улогу 'Екпенсе одобраватељ'
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Pair,пара
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Pair,пара
 DocType: Bank Reconciliation Detail,Against Account,Против налога
 DocType: Maintenance Schedule Detail,Actual Date,Стварни датум
 DocType: Item,Has Batch No,Има Батцх Нема
 DocType: Delivery Note,Excise Page Number,Акцизе Број странице
 DocType: Employee,Personal Details,Лични детаљи
 ,Maintenance Schedules,Планове одржавања
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +44,Embossing,Ембоссинг
 ,Quotation Trends,Котировочные тенденции
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +139,Item Group not mentioned in item master for item {0},Ставка група не помиње у тачки мајстор за ставку {0}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +302,Debit To account must be a Receivable account,Дебитна Да рачуну мора бити потраживања рачун
-apps/erpnext/erpnext/stock/doctype/item/item.py +310,"As Production Order can be made for this item, it must be a stock item.","Как Производственный заказ можно сделать по этой статье, он должен быть запас пункт ."
 DocType: Shipping Rule Condition,Shipping Amount,Достава Износ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +140,Joining,Спајање
-DocType: Authorization Rule,Above Value,Изнад Вредност
 ,Pending Amount,Чека Износ
 DocType: Purchase Invoice Item,Conversion Factor,Конверзија Фактор
 DocType: Purchase Order,Delivered,Испоручено
 apps/erpnext/erpnext/config/hr.py +160,Setup incoming server for jobs email id. (e.g. jobs@example.com),Настройка сервера входящей подрабатывать электронный идентификатор . (например jobs@example.com )
 DocType: Purchase Receipt,Vehicle Number,Број возила
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,Датум на који се понавља фактура ће бити зауставити
+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,Потраживања
 ,Supplier-Wise Sales Analytics,Добављач - Висе Салес Аналитика
 DocType: Address Template,This format is used if country specific format is not found,Овај формат се користи ако земља специфична формат није пронађен
 DocType: Custom Field,Custom,Обичај
 DocType: Production Order,Use Multi-Level BOM,Користите Мулти-Левел бом
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +26,Injection molding,Бризгање
 DocType: Bank Reconciliation,Include Reconciled Entries,Укључи помирили уносе
 apps/erpnext/erpnext/config/accounts.py +41,Tree of finanial accounts.,Дерево finanial счетов.
 DocType: Leave Control Panel,Leave blank if considered for all employee types,Оставите празно ако се сматра за све типове запослених
@@ -1694,30 +1635,28 @@
 apps/frappe/frappe/config/setup.py +130,Printing,Штампање
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +114,Expense Claim is pending approval. Only the Expense Approver can update status.,Расходи Тужба се чека на одобрење . СамоРасходи одобраватељ да ажурирате статус .
 DocType: Purchase Invoice,Additional Discount Amount,Додатне Износ попуста
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +99,The day(s) on which you are applying for leave are holiday. You need not apply for leave.,"День (дни) , на котором вы подаете заявление на отпуск , отпуск . Вам не нужно обратиться за разрешением ."
 apps/frappe/frappe/public/js/frappe/misc/utils.js +110,and,и
 DocType: Leave Block List Allow,Leave Block List Allow,Оставите листу блокираних Аллов
 apps/erpnext/erpnext/setup/doctype/company/company.py +236,Abbr can not be blank or space,Аббр не може бити празно или простор
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +50,Sports,спортски
+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/setup/page/setup_wizard/setup_wizard.js +626,Unit,блок
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Unit,блок
 apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.py +182,Please set Dropbox access keys in your site config,"Пожалуйста, установите ключи доступа Dropbox на своем сайте конфигурации"
 apps/erpnext/erpnext/stock/get_item_details.py +113,Please specify Company,Молимо наведите фирму
 ,Customer Acquisition and Loyalty,Кориснички Стицање и лојалности
 DocType: Purchase Receipt,Warehouse where you are maintaining stock of rejected items,Магацин где се одржава залихе одбачених предмета
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +408,Your financial year ends on,Ваша финансијска година се завршава
+apps/erpnext/erpnext/public/js/setup_wizard.js +156,Your financial year ends on,Ваша финансијска година се завршава
 DocType: POS Profile,Price List,Ценовник
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +20,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,"{0} теперь используется по умолчанию финансовый год . Пожалуйста, обновите страницу в браузере , чтобы изменения вступили в силу."
 apps/erpnext/erpnext/projects/doctype/project/project.js +47,Expense Claims,Расходи Потраживања
 DocType: Issue,Support,Подршка
-DocType: Authorization Rule,Approving Role,Одобравање улоге
 ,BOM Search,БОМ Тражи
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +176,Closing (Opening + Totals),Затварање (Опенинг + износи)
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +26,Please specify currency in Company,Молимо наведите валуту у Друштву
 DocType: Workstation,Wages per hour,Сатнице
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,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/controllers/accounts_controller.py +236,Account {0} is invalid. Account Currency must be {1},Рачун {0} је неважећа. Рачун валута мора да буде {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +237,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}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +53,Clearance date cannot be before check date in row {0},Дата просвет не может быть до даты регистрации в строке {0}
 DocType: Salary Slip,Deduction,Одузимање
@@ -1736,13 +1675,13 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +82,Item {0} has already been returned,Пункт {0} уже вернулся
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,**Фискална година** представља Финансијску годину. Све рачуноводствене уносе и остале главне трансакције се прате наспрам **Фискалне фодине**.
 DocType: Opportunity,Customer / Lead Address,Кориснички / Олово Адреса
+apps/erpnext/erpnext/stock/doctype/item/item.py +112,Warning: Invalid SSL certificate on attachment {0},Упозорење: Неважећи сертификат ССЛ на везаности {0}
 DocType: Production Order Operation,Actual Operation Time,Стварна Операција време
 DocType: Authorization Rule,Applicable To (User),Важећи Да (Корисник)
 DocType: Purchase Taxes and Charges,Deduct,Одбити
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +170,Job Description,Опис посла
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +170,Job Description,Опис посла
 DocType: Purchase Order Item,Qty as per Stock UOM,Кол по залихама ЗОЦГ
 apps/frappe/frappe/model/rename_doc.py +343,Please select a valid csv file with data,"Пожалуйста, выберите правильный файл CSV с данными"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +92,Coating,Превлака
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +126,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Специјални знакови осим ""-"" ""."", ""#"", и ""/"" није дозвољено у именовању серије"
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Пратите продајне акције. Пратите води, Куотатионс, продаја Ордер итд из кампање да измери повраћај инвестиције. "
 DocType: Expense Claim,Approver,Одобраватељ
@@ -1752,12 +1691,11 @@
 DocType: Supplier Quotation,Manufacturing Manager,Производња директор
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +191,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/hooks.py +84,Shipments,Пошиљке
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +29,Dip molding,Дип лајсне
+apps/erpnext/erpnext/hooks.py +68,Shipments,Пошиљке
 DocType: Purchase Order,To be delivered to customer,Који ће бити достављен купца
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,Време Пријави статус мора да се поднесе.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,Серијски број {0} не припада ниједној Варехоусе
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +650,Setting Up,Подешавање
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +114,Setting Up,Подешавање
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,Row # ,Ров #
 DocType: Purchase Invoice,In Words (Company Currency),Речима (Друштво валута)
 DocType: Pricing Rule,Supplier,Добављач
@@ -1777,27 +1715,26 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,{0} is mandatory for Item {1},{0} является обязательным для п. {1}
 DocType: Currency Exchange,From Currency,Од валутног
 DocType: DocField,Name,Име
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +211,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Молимо Вас да изаберете издвајају, Тип фактуре и број фактуре у атлеаст једном реду"
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +104,Sales Order required for Item {0},Заказать продаж требуется для Пункт {0}
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +158,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Молимо Вас да изаберете издвајају, Тип фактуре и број фактуре у атлеаст једном реду"
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +107,Sales Order required for Item {0},Заказать продаж требуется для Пункт {0}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +43,Amounts not reflected in system,Износи не огледа у систему
 DocType: Purchase Invoice Item,Rate (Company Currency),Стопа (Друштво валута)
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +40,Others,другие
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +40,Others,другие
 apps/erpnext/erpnext/templates/includes/product_page.js +80,Cannot find a matching Item. Please select some other value for {0}.,Не могу да нађем ставку која се подудара. Молимо Вас да одаберете неку другу вредност за {0}.
 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/frappe/frappe/core/doctype/doctype/boilerplate/controller_list.html +31,Completed,Завршен
 DocType: Web Form,Select DocType,Изаберите ДОЦТИПЕ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +104,Broaching,Броацхинг
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +12,Banking,банкарство
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,банкарство
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +38,Please click on 'Generate Schedule' to get schedule,"Пожалуйста, нажмите на кнопку "" Generate Расписание "" , чтобы получить график"
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +283,New Cost Center,Нови Трошкови Центар
 DocType: Bin,Ordered Quantity,Наручено Количина
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +397,"e.g. ""Build tools for builders""","например ""Build инструменты для строителей """
+apps/erpnext/erpnext/public/js/setup_wizard.js +145,"e.g. ""Build tools for builders""","например ""Build инструменты для строителей """
 DocType: Quality Inspection,In Process,У процесу
 DocType: Authorization Rule,Itemwise Discount,Итемвисе Попуст
 DocType: Purchase Order Item,Reference Document Type,Референтна Тип документа
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +318,{0} against Sales Order {1},{0} против Салес Ордер {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +320,{0} against Sales Order {1},{0} против Салес Ордер {1}
 DocType: Account,Fixed Asset,Исправлена ​​активами
 apps/erpnext/erpnext/config/stock.py +283,Serialized Inventory,Серијализоване Инвентар
 DocType: Activity Type,Default Billing Rate,Уобичајено обрачуна курс
@@ -1812,14 +1749,13 @@
 DocType: Purchase Invoice Item,Page Break,Страна Пауза
 DocType: Production Order Operation,Pending,Нерешен
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,Корисници који могу одобри одсуство апликације у конкретној запосленог
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +33,You cannot change default UOM of Variant. To change default UOM for Variant change default UOM of the Template,Ви не можете да промените подразумевани УЦГ варијанте. Да бисте променили подразумевани УЦГ за варијанту промене подразумевани УЦГ на Шаблон
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +50,Office Equipments,оборудование офиса
 DocType: Purchase Invoice Item,Qty,Кол
 DocType: Fiscal Year,Companies,Компаније
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +24,Electronics,електроника
+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/support/doctype/maintenance_visit/maintenance_visit.js +18,From Maintenance Schedule,Од распореду одржавања
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +56,Full-time,Пуно радно време
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +56,Full-time,Пуно радно време
 DocType: Purchase Invoice,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.","Ако сте направили стандардни образац у продаји порези и таксе Темплате, изаберите један и кликните на дугме испод."
@@ -1831,11 +1767,12 @@
 DocType: Job Applicant,Job Opening,Посао Отварање
 DocType: Payment Reconciliation,Payment Reconciliation,Плаћање Помирење
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +154,Please select Incharge Person's name,"Пожалуйста, выберите имя InCharge Лица"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +51,Technology,технологија
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,технологија
 DocType: Offer Letter,Offer Letter,Понуда Леттер
 apps/erpnext/erpnext/config/manufacturing.py +51,Generate Material Requests (MRP) and Production Orders.,Генеришите Захтеви материјал (МРП) и производних налога.
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +68,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.","Да бисте додали дете чворове , истражују дрво и кликните на чвору под којим желите да додате још чворова ."
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +102,Credit To account must be a Payable account,Кредит на рачун мора бити Плаћа рачун
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +233,BOM recursion: {0} cannot be parent or child of {2},BOM рекурсия : {0} не может быть родитель или ребенок {2}
@@ -1848,10 +1785,8 @@
 DocType: Item,Customer Item Codes,Кориснички кодова
 DocType: Opportunity,Lost Reason,Лост Разлог
 apps/erpnext/erpnext/config/accounts.py +68,Create Payment Entries against Orders or Invoices.,Направи Оплата записи против налога или фактурама.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +141,Welding,Заваривање
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +40,New Stock UOM is required,Новый фонда Единица измерения требуется
 DocType: Quality Inspection,Sample Size,Величина узорка
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +443,All items have already been invoiced,Све ставке су већ фактурисано
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +446,All items have already been invoiced,Све ставке су већ фактурисано
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',Наведите тачну &#39;Од Предмет бр&#39;
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +287,Further cost centers can be made under Groups but entries can be made against non-Groups,"Даље трошкова центри могу да буду под групама, али уноса можете извршити над несрпским групама"
 DocType: Project,External,Спољни
@@ -1863,8 +1798,7 @@
 DocType: Bin,Actual Quantity,Стварна Количина
 DocType: Shipping Rule,example: Next Day Shipping,Пример: Нект Даи Схиппинг
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,Серијски број {0} није пронађен
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +563,Your Customers,Ваши Купци
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +27,Compression molding,Компресија лајсне
+apps/erpnext/erpnext/public/js/setup_wizard.js +303,Your Customers,Ваши Купци
 DocType: Leave Block List Date,Block Date,Блоцк Дате
 DocType: Sales Order,Not Delivered,Није Испоручено
 ,Bank Clearance Summary,Банка Чишћење Резиме
@@ -1885,10 +1819,10 @@
 DocType: SMS Log,Sent To,Послат
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +28,Make Sales Invoice,Маке Салес фактура
 DocType: Company,For Reference Only.,За справки.
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +29,Invalid {0}: {1},Неважећи {0}: {1}
+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,Капацитет Планирање
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +49,'From Date' is required,"""Од датума"" је обавезно"
+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,Новом радном месту
@@ -1903,7 +1837,7 @@
 DocType: Serial No,Delivery Time,Време испоруке
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Старење Басед Он
 DocType: Item,End of Life,Крај живота
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +41,Travel,путешествие
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +41,Travel,путешествие
 DocType: Leave Block List,Allow Users,Дозволи корисницима
 DocType: Purchase Order,Customer Mobile No,Кориснички Мобилни број
 DocType: Sales Invoice,Recurring,Који се враћа
@@ -1917,7 +1851,7 @@
 DocType: Naming Series,User must always select,Корисник мора увек изабрати
 DocType: Stock Settings,Allow Negative Stock,Дозволи Негативно Стоцк
 DocType: Installation Note,Installation Note,Инсталација Напомена
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +541,Add Taxes,Додај Порези
+apps/erpnext/erpnext/public/js/setup_wizard.js +283,Add Taxes,Додај Порези
 ,Financial Analytics,Финансијски Аналитика
 DocType: Quality Inspection,Verified By,Верифиед би
 DocType: Address,Subsidiary,Подружница
@@ -1927,7 +1861,6 @@
 DocType: System Settings,In Hours,У часовима
 DocType: Process Payroll,Create Salary Slip,Направи Слип платама
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Expected balance as per bank,Очекује стање као по банци
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +115,Buffing,Брушење
 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,Запосленик
@@ -1944,11 +1877,11 @@
 DocType: Rename Tool,File to Rename,Филе Ренаме да
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +176,Purchse Order number required for Item {0},Число Purchse Заказать требуется для Пункт {0}
 apps/erpnext/erpnext/public/js/controllers/transaction.js +136,Show Payments,Схов Плаћања
-apps/erpnext/erpnext/controllers/buying_controller.py +245,Specified BOM {0} does not exist for Item {1},Указано БОМ {0} не постоји за ставку {1}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +202,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,График обслуживания {0} должно быть отменено до отмены этого заказ клиента
+apps/erpnext/erpnext/controllers/buying_controller.py +236,Specified BOM {0} does not exist for Item {1},Указано БОМ {0} не постоји за ставку {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,График обслуживания {0} должно быть отменено до отмены этого заказ клиента
 apps/frappe/frappe/desk/page/backups/backups.html +13,Size,Величина
 DocType: Notification Control,Expense Claim Approved,Расходи потраживање одобрено
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +113,Pharmaceutical,фармацевтический
+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,Продаја Наручите Обавезно
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +30,Create Customer,Креирање корисника
@@ -1958,7 +1891,6 @@
 DocType: Quality Inspection Reading,Reading 9,Читање 9
 DocType: Supplier,Is Frozen,Је замрзнут
 DocType: Buying Settings,Buying Settings,Куповина Сеттингс
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +122,Mass finishing,Маса обрада
 DocType: Stock Entry Detail,BOM No. for a Finished Good Item,БОМ Но за готових добре тачке
 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),Настройка сервера входящей для продажи электронный идентификатор . (например sales@example.com )
@@ -1966,7 +1898,7 @@
 DocType: Payment Tool,Payment Account,Плаћање рачуна
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +713,Please specify Company to proceed,Наведите компанија наставити
 apps/frappe/frappe/public/js/frappe/model/indicator.js +30,Draft,Нацрт
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +46,Compensatory Off,Компенсационные Выкл
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Compensatory Off,Компенсационные Выкл
 DocType: Quality Inspection Reading,Accepted,Примљен
 DocType: User,Female,Женски
 DocType: Journal Entry Account,Debit in Account Currency,Дебитна у обзир Валута
@@ -1978,7 +1910,7 @@
 DocType: Shipping Rule,Shipping Rule Label,Достава Правило Лабел
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +209,Raw Materials cannot be blank.,Сировине не може бити празан.
 DocType: Newsletter,Test,Тест
-apps/erpnext/erpnext/stock/doctype/item/item.py +364,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +368,"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'","Као што постоје постојеће трансакције стоцк за ову ставку, \ не можете променити вредности &#39;има серијски Не&#39;, &#39;Има серијски бр&#39;, &#39;Да ли лагеру предмета&#39; и &#39;Процена Метод&#39;"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +448,Quick Journal Entry,Брзо Јоурнал Ентри
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +92,You can not change rate if BOM mentioned agianst any item,Не можете променити стопу ако бом помиње агианст било које ставке
@@ -1989,13 +1921,14 @@
 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.,Одвојена производња поруџбина ће бити направљен за сваку готовог добар ставке.
 DocType: Purchase Invoice,Terms and Conditions1,Услови и Цондитионс1
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +18,Complete Setup,завершение установки
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard_page.html +18,Complete Setup,завершение установки
 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),Проверите то тако да одбаци фракција. (За НОС)
 apps/erpnext/erpnext/config/crm.py +96,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 +57,Total Absent,Укупно Абсент
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +746,Item or Warehouse for row {0} does not match Material Request,Пункт или Склад для строки {0} не соответствует запросу материал
@@ -2020,16 +1953,15 @@
 DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),Основни курс (по Стоцк УЦГ)
 DocType: SMS Log,No of Requested SMS,Нема тражених СМС
 DocType: Campaign,Campaign-.####,Кампания - . # # # #
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +55,Piercing,Продоран
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,Следећи кораци
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +117,Contract End Date must be greater than Date of Joining,"Конец контракта Дата должна быть больше, чем дата вступления"
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,Треће лице дистрибутер / дилер / заступника / сарадник / дистрибутер који продаје компанијама производе за провизију.
 DocType: Customer Group,Has Child Node,Има деце Ноде
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{0} against Purchase Order {1},{0} против нарудзбенице {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +332,{0} against Purchase Order {1},{0} против нарудзбенице {1}
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","Унесите статичке параметре овде УРЛ адресу (нпр. пошиљалац = ЕРПНект, усернаме = ЕРПНект, лозинком = 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/page/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
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +110,Photochemical machining,Фотохемијског машинска обрада
 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.
 
 #### Note
@@ -2075,7 +2007,7 @@
 DocType: Purchase Receipt Item,Recd Quantity,Рецд Количина
 DocType: Email Account,Email Ids,Е-маил Идс
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},"Не можете производить больше элемент {0} , чем количество продаж Заказать {1}"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +471,Stock Entry {0} is not submitted,Сток Ступање {0} не поднесе
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +473,Stock Entry {0} is not submitted,Сток Ступање {0} не поднесе
 DocType: Payment Reconciliation,Bank / Cash Account,Банка / готовински рачун
 DocType: Tax Rule,Billing City,Биллинг Цити
 DocType: Global Defaults,Hide Currency Symbol,Сакриј симбол валуте
@@ -2091,7 +2023,7 @@
 DocType: Purchase Invoice,Currency and Price List,Валута и Ценовник
 DocType: Opportunity,Customer / Lead Name,Заказчик / Ведущий Имя
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +63,Clearance Date not mentioned,Клиренс Дата не упоминается
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +71,Production,производња
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Production,производња
 DocType: Item,Allow Production Order,Дозволи Ордер Производња
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +60,Row {0}:Start Date must be before End Date,Ред {0} : Датум почетка мора да буде пре крајњег датума
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Укупно (ком)
@@ -2104,7 +2036,7 @@
 apps/erpnext/erpnext/utilities/doctype/address/address.py +113,My Addresses,Моје адресе
 DocType: Stock Ledger Entry,Outgoing Rate,Одлазећи курс
 apps/erpnext/erpnext/config/hr.py +100,Organization branch master.,Организация филиал мастер .
-apps/erpnext/erpnext/controllers/accounts_controller.py +237, or ,или
+apps/erpnext/erpnext/controllers/accounts_controller.py +238, 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-Изнад
@@ -2131,6 +2063,7 @@
 DocType: Stock Entry Detail,Serial No / Batch,Серијски бр / Серије
 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 +213,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',"График обслуживания не генерируется для всех элементов . Пожалуйста, нажмите на кнопку "" Generate Расписание """
 ,To Produce,за производњу
 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} морају бити укључени"
@@ -2138,10 +2071,7 @@
 DocType: Bin,Reserved Quantity,Резервисани Количина
 DocType: Landed Cost Voucher,Purchase Receipt Items,Куповина Ставке пријема
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,Прилагођавање Облици
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +62,Cutting,Сечење
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +69,Flattening,Равнање
 DocType: Account,Income Account,Приходи рачуна
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +22,Molding,Обликовање
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +632,Delivery,Испорука
 DocType: Stock Reconciliation Item,Current Qty,Тренутни ком
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",Погледајте &quot;стопа материјала на бази&quot; у Цостинг одељак
@@ -2151,20 +2081,19 @@
 apps/frappe/frappe/desk/moduleview.py +61,Documents,Документи
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +17,Ref,Реф
 DocType: Cost Center,Cost Center,Трошкови центар
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.js +48,Voucher #,Ваучер #
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +36,Voucher #,Ваучер #
 DocType: Notification Control,Purchase Order Message,Куповина поруку Ордер
 DocType: Tax Rule,Shipping Country,Достава Земља
 DocType: Upload Attendance,Upload HTML,Уплоад ХТМЛ
-apps/erpnext/erpnext/controllers/accounts_controller.py +391,"Total advance ({0}) against Order {1} cannot be greater \
+apps/erpnext/erpnext/controllers/accounts_controller.py +392,"Total advance ({0}) against Order {1} cannot be greater \
 				than the Grand Total ({2})","Укупно унапред ({0}) против Реда {1} не може бити већи од Великог \
  Укупно ({2})"
 DocType: Employee,Relieving Date,Разрешење Дате
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +12,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.","Правилник о ценама је направљен да замени Ценовник / дефинисати попуст проценат, на основу неких критеријума."
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,Складиште може да се промени само преко Сток Улаз / Испорука Напомена / рачуном
 DocType: Employee Education,Class / Percentage,Класа / Проценат
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +92,Head of Marketing and Sales,Шеф маркетинга и продаје
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +31,Income Tax,подоходный налог
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +157,Laser engineered net shaping,Ласерски пројектована нето обликовање
+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.,Стаза води од индустрије Типе .
 DocType: Item Supplier,Item Supplier,Ставка Снабдевач
@@ -2187,31 +2116,28 @@
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Стварна Кол Након трансакције
 ,Pending SO Items For Purchase Request,Чекању СО Артикли за куповину захтеву
 DocType: Supplier,Billing Currency,Обрачун Валута
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +148,Extra Large,Екстра велики
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,Extra Large,Екстра велики
 ,Profit and Loss Statement,Биланс успјеха
 DocType: Bank Reconciliation Detail,Cheque Number,Чек Број
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +43,Pressing,Притиском
 DocType: Payment Tool Detail,Payment Tool Detail,Плаћање Алат Детаљ
 ,Sales Browser,Браузер по продажам
 DocType: Journal Entry,Total Credit,Укупна кредитна
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +474,Warning: Another {0} # {1} exists against stock entry {2},Упозорење: Још једна {0} # {1} постоји против уласка залиха {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +459,Local,местный
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +476,Warning: Another {0} # {1} exists against stock entry {2},Упозорење: Још једна {0} # {1} постоји против уласка залиха {2}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +397,Local,местный
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),Кредиты и авансы ( активы )
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,Дужници
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +147,Large,Велики
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +23,No employee found!,Ниједан запослени фоунд !
+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 +152,Please mention no of visits required,"Пожалуйста, укажите кол-во посещений , необходимых"
 DocType: Purchase Order,Customer Address Display,Кориснички Адреса Приказ
 DocType: Stock Settings,Default Valuation Method,Уобичајено Процена Метод
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +127,Polishing,Полирање
 DocType: Production Order Operation,Planned Start Time,Планирано Почетак Време
 apps/erpnext/erpnext/config/accounts.py +63,Close Balance Sheet and book Profit or Loss.,Затвори Биланс стања и књига добитак или губитак .
-apps/erpnext/erpnext/stock/doctype/item/item.py +661,"Default Unit of Measure for Item {0} cannot be changed directly because \
+apps/erpnext/erpnext/stock/doctype/item/item.py +665,"Default Unit of Measure for Item {0} cannot be changed directly because \
 			you have already made some transaction(s) with another UOM. To change default UOM, \
 			use 'UOM Replace Utility' tool under Stock module.","Уобичајено јединица мере за тачке {0} не могу директно мењати, јер \ већ сте направили неку трансакцију (с) са другим УЦГ. Да бисте променили подразумевани УЦГ, \ употреба &#39;УОМ Замените Утилити &quot;функције под Стоцк модула."
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,Наведите курс према претворити једну валуту у другу
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +146,Quotation {0} is cancelled,Цитата {0} отменяется
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +141,Quotation {0} is cancelled,Цитата {0} отменяется
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,Преостали дио кредита
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} was on leave on {1}. Cannot mark attendance.,Сотрудник {0} был в отпусках по {1} . Невозможно отметить посещаемость.
 DocType: Sales Partner,Targets,Мете
@@ -2222,7 +2148,6 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +158,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,Компьютеры
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +112,Electro-chemical grinding,Електро-хемијска брушење
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +14,This is a root customer group and cannot be edited.,То јекорен група купац и не може се мењати .
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +39,Please setup your chart of accounts before you start Accounting Entries,Молимо Поставите свој контни пре него што почнете Рачуноводство уносе
 DocType: Purchase Invoice,Ignore Pricing Rule,Игноре Правилник о ценама
@@ -2280,7 +2205,6 @@
 DocType: Maintenance Visit,Purposes,Сврхе
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +103,Atleast one item should be entered with negative quantity in return document,Барем једна ставка треба унети у негативном количином у повратном документа
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +67,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","Операција {0} дуже него што је било на располагању радног времена у станици {1}, разбити операцију у више операција"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +134,Electrochemical machining,Електрохемиски машинска обрада
 ,Requested,Тражени
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +66,No Remarks,Но Примедбе
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +13,Overdue,Презадужен
@@ -2289,7 +2213,7 @@
 DocType: Monthly Distribution,Distribution Name,Дистрибуција Име
 DocType: Features Setup,Sales and Purchase,Продаја и Куповина
 DocType: Supplier Quotation Item,Material Request No,Материјал Захтев Нема
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +218,Quality Inspection required for Item {0},"Контроль качества , необходимые для Пункт {0}"
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +221,Quality Inspection required for Item {0},"Контроль качества , необходимые для Пункт {0}"
 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),Нето курс (Фирма валута)
@@ -2307,9 +2231,8 @@
 apps/erpnext/erpnext/accounts/report/financial_statements.py +16,Fiscal Year {0} not found.,Фискална година {0} није пронађен.
 DocType: Bank Reconciliation,Get Relevant Entries,Гет Релевантне уносе
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +407,Accounting Entry for Stock,Рачуноводство Ентри за Деонице
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +64,Coining,Ковања
 DocType: Sales Invoice,Sales Team1,Продаја Теам1
-apps/erpnext/erpnext/stock/doctype/item/item.py +412,Item {0} does not exist,Пункт {0} не существует
+apps/erpnext/erpnext/stock/doctype/item/item.py +416,Item {0} does not exist,Пункт {0} не существует
 DocType: Sales Invoice,Customer Address,Кориснички Адреса
 apps/frappe/frappe/desk/query_report.py +136,Total,Укупан
 DocType: Purchase Invoice,Apply Additional Discount On,Нанесите додатни попуст Он
@@ -2320,14 +2243,13 @@
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),Износ пореза Након Износ попуста (Фирма валута)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +149,Target warehouse is mandatory for row {0},Целевая склад является обязательным для ряда {0}
 DocType: Quality Inspection,Quality Inspection,Провера квалитета
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +144,Extra Small,Ектра Смалл
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +20,Spray forming,Спраи формирање
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Extra Small,Ектра Смалл
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +458,Warning: Material Requested Qty is less than Minimum Order Qty,Упозорење : Материјал Тражени Кол је мање од Минимална количина за поручивање
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +191,Account {0} is frozen,Счет {0} заморожен
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Правно лице / Подружница са посебном контном припада организацији.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +29,"Food, Beverage & Tobacco","Храна , пиће и дуван"
+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,ПЛ или БС
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,Can only make payment against unbilled {0},Може само извршити уплату против ненаплаћене {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +531,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/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Minimum Inventory Level,Минимална Инвентар Ниво
 DocType: Stock Entry,Subcontract,Подуговор
@@ -2338,19 +2260,18 @@
 DocType: Item,Manufacturer Part Number,Произвођач Број дела
 DocType: Production Order Operation,Estimated Time and Cost,Процењена Вријеме и трошкови
 DocType: Bin,Bin,Бункер
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +50,Nosing,Испуст
 DocType: SMS Log,No of Sent SMS,Број послатих СМС
 DocType: Account,Company,Компанија
 DocType: Account,Expense Account,Трошкови налога
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +49,Software,софтвер
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +151,Colour,Боја
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +49,Software,софтвер
+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",Молимо одаберите ставку где &quot;је акционарско тачка&quot; је &quot;Не&quot; и &quot;Да ли је продаје Тачка&quot; &quot;Да&quot; и нема другог производа Бундле
 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 +281,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 +134,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 +145,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,Преименовање Лог
@@ -2360,7 +2281,7 @@
 apps/erpnext/erpnext/controllers/recurring_document.py +162,Please select {0},"Пожалуйста, выберите {0}"
 DocType: C-Form,C-Form No,Ц-Образац бр
 DocType: BOM,Exploded_items,Екплодед_итемс
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +95,Researcher,истраживач
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Researcher,истраживач
 apps/frappe/frappe/custom/doctype/customize_form/customize_form.js +88,Update,Ажурирање
 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 +23,Name or Email is mandatory,Име или е-маил је обавезан
@@ -2369,11 +2290,10 @@
 DocType: Employee,Exit,Излаз
 apps/erpnext/erpnext/accounts/doctype/account/account.py +134,Root Type is mandatory,Корен Тип је обавезно
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +295,Serial No {0} created,Серийный номер {0} создан
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +125,Vibratory finishing,Вибро дораде
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","За практичност потрошача, ови кодови могу да се користе у штампаним форматима као што су фактуре и отпремнице"
 DocType: Employee,You can enter any date manually,Можете да ручно унесете било који датум
 DocType: Sales Invoice,Advertisement,Реклама
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +165,Probationary Period,Пробни период
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Probationary Period,Пробни период
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Само листа чворови су дозвољени у трансакцији
 DocType: Expense Claim,Expense Approver,Расходи одобраватељ
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,Куповина Потврда јединице у комплету
@@ -2381,19 +2301,16 @@
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +17,To Datetime,Да датетиме
 DocType: SMS Settings,SMS Gateway URL,СМС Гатеваи УРЛ адреса
 apps/erpnext/erpnext/config/crm.py +53,Logs for maintaining sms delivery status,Протоколи за одржавање смс статус испоруке
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +137,Grinding,Млевење
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +34,Shrink wrapping,Скупи враппинг
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +36,Pending Activities,Пендинг Активности
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,Confirmed,Потврђен
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier > Supplier Type,Добављач> Добављач Тип
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +127,Please enter relieving date.,"Пожалуйста, введите даты снятия ."
 apps/erpnext/erpnext/controllers/trends.py +137,Amt,Амт
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' can be submitted,"Только Оставьте приложений с статуса ""Одобрено"" могут быть представлены"
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +51,Only Leave Applications with status 'Approved' can be submitted,"Только Оставьте приложений с статуса ""Одобрено"" могут быть представлены"
 apps/erpnext/erpnext/utilities/doctype/address/address.py +21,Address Title is mandatory.,Адрес Название является обязательным.
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,"Унесите назив кампање, ако извор истраге је кампања"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +38,Newspaper Publishers,Новински издавачи
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +38,Newspaper Publishers,Новински издавачи
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,Изаберите Фискална година
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +88,Smelting,Топљење
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Реордер Ниво
 DocType: Attendance,Attendance Date,Гледалаца Датум
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,Плата распада на основу зараде и дедукције.
@@ -2408,16 +2325,15 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +414,[Error],[Грешка]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,У речи ће бити видљив када сачувате продајних налога.
 ,Employee Birthday,Запослени Рођендан
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +55,Venture Capital,Вентуре Цапитал
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,Вентуре Цапитал
 DocType: UOM,Must be Whole Number,Мора да буде цео број
 DocType: Leave Control Panel,New Leaves Allocated (In Days),Нове Лишће Издвојена (у данима)
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +51,Serial No {0} does not exist,Серийный номер {0} не существует
 DocType: Pricing Rule,Discount Percentage,Скидка в процентах
 DocType: Payment Reconciliation Invoice,Invoice Number,Фактура број
-apps/erpnext/erpnext/hooks.py +70,Orders,Поруџбине
+apps/erpnext/erpnext/hooks.py +54,Orders,Поруџбине
 DocType: Leave Control Panel,Employee Type,Запослени Тип
 DocType: Employee Leave Approver,Leave Approver,Оставите Аппровер
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +70,Swaging,Машина за савијање
 DocType: Manufacturing Settings,Material Transferred for Manufacture,Материјал Пребачен за производњу
 DocType: Expense Claim,"A user with ""Expense Approver"" role","Корисник са ""Расходи одобраватељ"" улози"
 ,Issued Items Against Production Order,Издате Артикли против редоследа израде
@@ -2429,7 +2345,6 @@
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +62,Cost Center with existing transactions can not be converted to group,МВЗ с существующими сделок не могут быть преобразованы в группе
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Depreciation,амортизация
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Супплиер (с)
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +29,Invalid period,Неважећи Период
 DocType: Customer,Credit Limit,Кредитни лимит
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,Изаберите тип трансакције
 DocType: GL Entry,Voucher No,Ваучер Бр.
@@ -2439,9 +2354,9 @@
 DocType: Customer,Address and Contact,Адреса и контакт
 DocType: Customer,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}"
 apps/erpnext/erpnext/accounts/party.py +284,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Напомена: Због / Референтни Датум прелази дозвољене кредитним купац дана од {0} дана (и)
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +621,Maint. Schedule,Инцл. Распоред
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +108,Abrasive jet machining,Брусни Јет машинска обрада
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +632,Maint. Schedule,Инцл. Распоред
 DocType: Stock Settings,Freeze Stock Entries,Фреезе уносе берза
 DocType: Website Settings,Website Settings,Сајт Подешавања
 DocType: Item,Reorder level based on Warehouse,Промени редослед ниво на основу Варехоусе
@@ -2458,7 +2373,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +75,Show Stock Entries,Схов Сток уноси
 ,Is Primary Address,Примарна Адреса
 DocType: Production Order,Work-in-Progress Warehouse,Рад у прогресу Магацин
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +308,Reference #{0} dated {1},Ссылка # {0} от {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Reference #{0} dated {1},Ссылка # {0} от {1}
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +13,Manage Addresses,Управљање адресе
 DocType: Pricing Rule,Item Code,Шифра
 DocType: Production Planning Tool,Create Production Orders,Креирање налога Производне
@@ -2467,7 +2382,7 @@
 DocType: Lead,Market Segment,Сегмент тржишта
 DocType: Communication,Phone,Телефон
 DocType: Employee Internal Work History,Employee Internal Work History,Запослени Интерна Рад Историја
-apps/erpnext/erpnext/public/js/account_tree_grid.js +50,Closing (Dr),Затварање (др)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +221,Closing (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.,Налоговый шаблон для продажи сделок.
@@ -2483,8 +2398,8 @@
 ,Billed Amount,Изграђена Износ
 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 +129,Material Request {0} is cancelled or stopped,Материал Запрос {0} отменяется или остановлен
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +641,Add a few sample records,Додајте неколико узорака евиденцију
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +133,Material Request {0} is cancelled or stopped,Материал Запрос {0} отменяется или остановлен
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Add a few sample records,Додајте неколико узорака евиденцију
 apps/erpnext/erpnext/config/hr.py +210,Leave Management,Оставите Манагемент
 DocType: Event,Groups,Групе
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,Группа по Счет
@@ -2497,38 +2412,34 @@
 DocType: Features Setup,Sales Extras,Продаја Екстра
 apps/erpnext/erpnext/accounts/utils.py +344,{0} budget for Account {1} against Cost Center {2} will exceed by {3},{0} бюджет на счет {1} против МВЗ {2} будет превышать {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +236,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Разлика Рачун мора бити тип активом / одговорношћу рачуна, јер Сток Помирење је отварање Ступање"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +138,Purchase Order number required for Item {0},Число Заказ требуется для Пункт {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Order number required for Item {0},Число Заказ требуется для Пункт {0}
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',"""Од датума"" мора бити након ""До датума"""
 ,Stock Projected Qty,Пројектовани Стоцк Кти
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +147,Customer {0} does not belong to project {1},Клиент {0} не принадлежит к проекту {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +150,Customer {0} does not belong to project {1},Клиент {0} не принадлежит к проекту {1}
 DocType: Sales Order,Customer's Purchase Order,Куповина нарудзбини
 DocType: Warranty Claim,From Company,Из компаније
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,Вредност или Кол
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Minute,минут
+apps/erpnext/erpnext/public/js/setup_wizard.js +363,Minute,минут
 DocType: Purchase Invoice,Purchase Taxes and Charges,Куповина Порези и накнаде
 ,Qty to Receive,Количина за примање
 DocType: Leave Block List,Leave Block List Allowed,Оставите Блоцк Лист Дозвољени
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +61,Conversion factor cannot be in fractions,Коэффициент пересчета не может быть в долях
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +358,You will use it to Login,Ви ћете га користити за Пријављивање
+apps/erpnext/erpnext/public/js/setup_wizard.js +108,You will use it to Login,Ви ћете га користити за Пријављивање
 DocType: Sales Partner,Retailer,Продавац на мало
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +99,Credit To account must be a Balance Sheet account,Кредит на рачун мора да буде биланса стања
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,Сви Типови добављача
 apps/erpnext/erpnext/stock/doctype/item/item.py +37,Item Code is mandatory because Item is not automatically numbered,"Код товара является обязательным, поскольку Деталь не автоматически нумеруются"
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +99,Quotation {0} not of type {1},Цитата {0} не типа {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +93,Quotation {0} not of type {1},Цитата {0} не типа {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,Одржавање Распоред шифра
 DocType: Sales Order,%  Delivered,Испоручено %
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,Bank Overdraft Account,Банк Овердрафт счета
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +15,Make Salary Slip,Маке плата Слип
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +18,Browse BOM,Бровсе БОМ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +175,Secured Loans,Обеспеченные кредиты
-apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +3,Awesome Products,Потрясающие Продукты
+apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +3,Awesome Products,Потрясающие Продукты
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +189,Opening Balance Equity,Почетно стање Капитал
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +80,Cannot approve leave as you are not authorized to approve leaves on Block Dates,"Не можете одобрить отпуск , пока вы не уполномочен утверждать листья на блоке Даты"
 DocType: Appraisal,Appraisal,Процена
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +13,Lost-foam casting,Лост-пена ливење
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +47,Drawing,Цртеж
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +22,Date is repeated,Датум се понавља
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +148,Leave approver must be one of {0},Оставьте утверждающий должен быть одним из {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +162,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,Почетак Време
@@ -2542,7 +2453,7 @@
 DocType: Purchase Invoice Item,Net Amount (Company Currency),Нето износ (Фирма валута)
 DocType: BOM Operation,Hour Rate,Стопа час
 DocType: Stock Settings,Item Naming By,Шифра назив под
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +642,From Quotation,Од понуде
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +655,From Quotation,Од понуде
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},Другой Период Окончание Вступление {0} был сделан после {1}
 DocType: Production Order,Material Transferred for Manufacturing,Материјал пребачени на Мануфацтуринг
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +29,Account {0} does not exists,Рачун {0} не постоји
@@ -2556,21 +2467,19 @@
 DocType: Purchase Invoice Item,PR Detail,ПР Детаљ
 DocType: Sales Order,Fully Billed,Потпуно Изграђена
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +20,Cash In Hand,Наличность кассовая
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +72,Delivery warehouse required for stock item {0},Испорука складиште потребно за лагеру предмета {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +119,Delivery warehouse required for stock item {0},Испорука складиште потребно за лагеру предмета {0}
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),Бруто тежина пакета. Обично нето тежина + амбалаже тежина. (За штампу)
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Корисници са овом улогом је дозвољено да подесите замрзнуте рачуне и створити / модификује рачуноводствене уносе против замрзнутим рачунима
 DocType: Serial No,Is Cancelled,Да ли Отказан
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +281,My Shipments,Моје пошиљке
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +286,My Shipments,Моје пошиљке
 DocType: Journal Entry,Bill Date,Бил Датум
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +43,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","Чак и ако постоји више Цене правила са највишим приоритетом, онда следећи интерни приоритети се примењују:"
 DocType: Supplier,Supplier Details,Добављачи Детаљи
 DocType: Communication,Recipients,Примаоци
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +146,Screwing,Сцревинг
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +96,Knurling,Кнурлинг
 DocType: Expense Claim,Approval Status,Статус одобравања
 DocType: Hub Settings,Publish Items to Hub,Објављивање артикле у Хуб
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +44,From value must be less than to value in row {0},"От значение должно быть меньше , чем значение в строке {0}"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +133,Wire Transfer,Вире Трансфер
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +133,Wire Transfer,Вире Трансфер
 apps/erpnext/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py +25,Please select Bank Account,Изаберите банковни рачун
 DocType: Newsletter,Create and Send Newsletters,Стварање и слање Билтен
 apps/frappe/frappe/public/js/frappe/views/reports/grid_report.js +305,From Date must be before To Date,Од датума мора да буде пре датума
@@ -2578,14 +2487,14 @@
 DocType: Company,Default Income Account,Уобичајено прихода Рачун
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,Кориснички Група / Кориснички
 DocType: Item Group,Check this if you want to show in website,Проверите ово ако желите да прикажете у Веб
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +190,Welcome to ERPNext,Добродошли у ЕРПНект
+,Welcome to 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/page/setup_wizard/install_fixtures.py +37,Calls,Звонки
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Calls,Звонки
 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 +193,Purchase Order {0} is not submitted,Заказ на {0} не представлено
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +194,Purchase Order {0} is not submitted,Заказ на {0} не представлено
 ,Projected,пројектован
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},Серийный номер {0} не принадлежит Склад {1}
 apps/erpnext/erpnext/controllers/status_updater.py +136,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Примечание: Система не будет проверять по - доставки и избыточного бронирования по пункту {0} как количестве 0
@@ -2593,7 +2502,6 @@
 DocType: Issue,Opening Date,Датум отварања
 DocType: Journal Entry,Remark,Примедба
 DocType: Purchase Receipt Item,Rate and Amount,Стопа и износ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +95,Boring,Досадан
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +667,From Sales Order,Од продајних налога
 DocType: Blog Category,Parent Website Route,Родитель Сайт Маршрут
 DocType: Sales Order,Not Billed,Није Изграђена
@@ -2607,19 +2515,17 @@
 apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount Amount,Сумма скидки
 DocType: Purchase Invoice,Return Against Purchase Invoice,Повратак против фактури
 DocType: Item,Warranty Period (in days),Гарантни период (у данима)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +550,e.g. VAT,например НДС
+apps/erpnext/erpnext/public/js/setup_wizard.js +292,e.g. VAT,например НДС
 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,Цитат Серија
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +52,"An item exists with same name ({0}), please change the item group name or rename the item","Элемент существует с тем же именем ({0} ) , пожалуйста, измените название группы или переименовать пункт"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +82,Hot metal gas forming,Врелог метала гаса формирање
 DocType: Sales Order Item,Sales Order Date,Продаја Датум поруџбине
 DocType: Sales Invoice Item,Delivered Qty,Испоручено Кол
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +63,Warehouse {0}: Company is mandatory,Магацин {0}: Фирма је обавезна
 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.",Иди на одговарајуће групе (обично извор средстава&gt; садашње пасиве&gt; порезе и царине и креирати нови налог (кликом на Додај Цхилд) типа &quot;порез&quot; и помињу пореска стопа.
 ,Payment Period Based On Invoice Date,Период отплате Басед Он Фактура Дате
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +50,Missing Currency Exchange Rates for {0},Миссинг валутниј курс за {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +135,Laser cutting,Ласерски сечење
 DocType: Event,Monday,Понедељак
 DocType: Journal Entry,Stock Entry,Берза Ступање
 DocType: Account,Payable,к оплате
@@ -2652,7 +2558,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +111,Date Of Retirement must be greater than Date of Joining,Дата выхода на пенсию должен быть больше даты присоединения
 DocType: Sales Invoice,Against Income Account,Против приход
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +69,{0}% Delivered,{0}% Испоручено
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +78,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Ставка {0}: Ж ком {1} не може бити мањи од Минимална количина за поручивање {2} (дефинисан у тачки).
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Ставка {0}: Ж ком {1} не може бити мањи од Минимална количина за поручивање {2} (дефинисан у тачки).
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Месечни Дистрибуција Проценат
 DocType: Territory,Territory Targets,Територија Мете
 DocType: Delivery Note,Transporter Info,Транспортер Инфо
@@ -2661,7 +2567,6 @@
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,Титулы для шаблонов печатных например Фактуры Proforma .
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +140,Valuation type charges can not marked as Inclusive,Тип Процена трошкови не могу означити као инцлусиве
 DocType: POS Profile,Update Stock,Упдате Стоцк
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +128,Superfinishing,Суперфинисхинг
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,"Различные Единица измерения для элементов приведет к некорректному (Всего) значение массы нетто . Убедитесь, что вес нетто каждого элемента находится в том же UOM ."
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,БОМ курс
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +85,Please pull items from Delivery Note,Пожалуйста вытяните элементов из накладной
@@ -2676,7 +2581,6 @@
 ,Purchase Analytics,Куповина Аналитика
 DocType: Sales Invoice Item,Delivery Note Item,Испорука Напомена Ставка
 DocType: Expense Claim,Task,Задатак
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +57,Shaving,Бријање
 DocType: Purchase Taxes and Charges,Reference Row #,Ссылка Row #
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},Број партије је обавезна за ставку {0}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js +14,This is a root sales person and cannot be edited.,То јекорен продаје човек и не може се мењати .
@@ -2688,13 +2592,11 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +74,Purpose must be one of {0},Цель должна быть одна из {0}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +108,Fill the form and save it,Попуните формулар и да га сачувате
 DocType: Production Planning Tool,Download a report containing all raw materials with their latest inventory status,Преузмите извештај садржи све сировине са њиховим најновијим инвентара статусу
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +94,Facing,Фацинг
 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: Time Log,Billable,Уплатилац
-DocType: Authorization Rule,This will be used for setting rule in HR module,Ово ће се користити за постављање правила у ХР модулу
 DocType: Account,Rate at which this tax is applied,Стопа по којој се примењује овај порез
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reorder Qty,Реордер ком
 DocType: Company,Stock Adjustment Account,Стоцк Подешавање налога
@@ -2721,16 +2623,15 @@
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,Процент Распределение должно быть равно 100%
 DocType: Serial No,Out of AMC,Од АМЦ
 DocType: Purchase Order Item,Material Request Detail No,Материјал Захтев Детаљ Нема
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +97,Hard turning,Хард окретања
 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 +79,Company (not Customer or Supplier) master.,Компания ( не клиента или поставщика ) хозяин.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +106,Please enter 'Expected Delivery Date',"Пожалуйста, введите ' ожидаемой даты поставки """
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +187,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Примечания Доставка {0} должно быть отменено до отмены этого заказ клиента
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +100,Please enter 'Expected Delivery Date',"Пожалуйста, введите ' ожидаемой даты поставки """
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +182,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Примечания Доставка {0} должно быть отменено до отмены этого заказ клиента
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +373,Paid amount + Write Off Amount can not be greater than Grand Total,"Платные сумма + списания сумма не может быть больше, чем общий итог"
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} не является допустимым номер партии по пункту {1}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,Note: There is not enough leave balance for Leave Type {0},Примечание: Существует не хватает отпуск баланс для отпуске Тип {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +124,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,Прилика Тип
@@ -2742,51 +2643,45 @@
 DocType: Hub Settings,Publish Availability,Објављивање Доступност
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +105,Date of Birth cannot be greater than today.,Датум рођења не може бити већи него данас.
 ,Stock Ageing,Берза Старење
-apps/erpnext/erpnext/controllers/accounts_controller.py +200,{0} '{1}' is disabled,{0} '{1}' је онемогућен
+apps/erpnext/erpnext/controllers/accounts_controller.py +201,{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.,Пошаљи аутоматске поруке е-поште у Контакте о достављању трансакцијама.
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,Тачка 3
 DocType: Purchase Order,Customer Contact Email,Кориснички Контакт Е-маил
 DocType: Event,Sunday,Недеља
 DocType: Sales Team,Contribution (%),Учешће (%)
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +455,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,"Примечание: Оплата Вступление не будет создана , так как "" Наличные или Банковский счет "" не был указан"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +171,Responsibilities,Одговорности
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +457,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 +11,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,"Пожалуйста, введите не менее чем 1 -фактуру в таблице"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +511,Add Users,Додај корисника
+apps/erpnext/erpnext/public/js/setup_wizard.js +255,Add Users,Додај корисника
 DocType: Pricing Rule,Item Group,Ставка Група
 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),Порези и накнаде додавања (Друштво валута)
-apps/erpnext/erpnext/stock/doctype/item/item.py +340,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Пункт Налоговый ряд {0} должен иметь учетную запись типа налога или доходов или расходов или платная
+apps/erpnext/erpnext/stock/doctype/item/item.py +344,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Пункт Налоговый ряд {0} должен иметь учетную запись типа налога или доходов или расходов или платная
 DocType: Sales Order,Partly Billed,Делимично Изграђена
 DocType: Item,Default BOM,Уобичајено БОМ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +79,Decambering,Децамберинг
 apps/erpnext/erpnext/setup/doctype/company/company.js +22,Please re-type company name to confirm,Молимо Вас да поново тип цомпани наме да потврди
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,Укупно Изванредна Амт
 DocType: Time Log Batch,Total Hours,Укупно време
 DocType: Journal Entry,Printing Settings,Принтинг Подешавања
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +268,Total Debit must be equal to Total Credit. The difference is {0},Укупно задуживање мора бити једнак укупном кредитном .
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +11,Automotive,аутомобилски
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +37,Item is required,Пункт требуется
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +25,Metal injection molding,Метални бризгање
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +258,Total Debit must be equal to Total Credit. The difference is {0},Укупно задуживање мора бити једнак укупном кредитном .
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,аутомобилски
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +684,From Delivery Note,Из доставница
 DocType: Time Log,From Time,Од времена
 DocType: Notification Control,Custom Message,Прилагођена порука
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +33,Investment Banking,Инвестиционо банкарство
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +261,"Select your Country, Time Zone and Currency","Изаберите своју земљу, временску зону и валуту"
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,Инвестиционо банкарство
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +316,"Select your Country, Time Zone and Currency","Изаберите своју земљу, временску зону и валуту"
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +369,Cash or Bank Account is mandatory for making payment entry,Наличными или банковский счет является обязательным для внесения записи платежей
 DocType: Purchase Invoice,Price List Exchange Rate,Цена курсној листи
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +91,Pickling,Стављање у туршију
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +18,Sand casting,Песак ливење
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +117,Electroplating,Елецтроплатинг
 DocType: Purchase Invoice Item,Rate,Стопа
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +62,Intern,стажиста
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Intern,стажиста
 DocType: Newsletter,A Lead with this email id should exist,Олово са овом е ид треба да постоје
 DocType: Stock Entry,From BOM,Од БОМ
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +34,Basic,основной
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +34,Basic,основной
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,Сток трансакције пре {0} су замрзнути
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +217,Please click on 'Generate Schedule',"Пожалуйста, нажмите на кнопку "" Generate Расписание """
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +61,To Date should be same as From Date for Half Day leave,Да Дате треба да буде исти као Од датума за полудневни одсуство
@@ -2794,11 +2689,11 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +96,Reference No is mandatory if you entered Reference Date,"Ссылка № является обязательным, если вы ввели Исходной дате"
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +108,Date of Joining must be greater than Date of Birth,Дата Присоединение должно быть больше Дата рождения
 DocType: Salary Structure,Salary Structure,Плата Структура
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +242,"Multiple Price Rule exists with same criteria, please resolve \
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +246,"Multiple Price Rule exists with same criteria, please resolve \
 			conflict by assigning priority. Price Rules: {0}","Вишеструки Цена Правило постоји са истим критеријумима, молимо реши конфликт \
 , са приоритетом. Цена Правила: {0}"
 DocType: Account,Bank,Банка
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +9,Airline,ваздушна линија
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,ваздушна линија
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +493,Issue Material,Питање Материјал
 DocType: Material Request Item,For Warehouse,За Варехоусе
 DocType: Employee,Offer Date,Понуда Датум
@@ -2808,29 +2703,24 @@
 DocType: Item,Is Fixed Asset Item,Является основного средства дня Пункт
 DocType: Stock Entry,Including items for sub assemblies,Укључујући ставке за под скупштине
 DocType: Features Setup,"If you have long print formats, this feature can be used to split the page to be printed on multiple pages with all headers and footers on each page","Ако сте дуго штампање формата, ова функција може да се користи да подели страница на којој се штампа на више страница са свим заглавља и подножја на свакој страници"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +131,Hobbing,Хоббинг
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +98,All Territories,Все территории
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +98,All Territories,Все территории
 DocType: Purchase Invoice,Items,Артикли
 DocType: Fiscal Year,Year Name,Име године
 DocType: Process Payroll,Process Payroll,Процес Паиролл
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +59,There are more holidays than working days this month.,"Есть больше праздников , чем рабочих дней в этом месяце."
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +68,There are more holidays than working days this month.,"Есть больше праздников , чем рабочих дней в этом месяце."
 DocType: Product Bundle Item,Product Bundle Item,Производ Бундле артикла
 DocType: Sales Partner,Sales Partner Name,Продаја Име партнера
 DocType: Purchase Invoice Item,Image View,Слика Погледај
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +113,Finishing & industrial finishing,Дорада и индустријска обрада
 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/page/setup_wizard/fixtures/industry_type.py +46,Securities & Commodity Exchanges,Хартије од вредности и робним берзама
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Хартије од вредности и робним берзама
 DocType: Shipping Rule,Calculate Based On,Израчунајте Басед Он
 DocType: Delivery Note Item,From Warehouse,Од Варехоусе
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +98,Drilling,Бушење
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +28,Blow molding,Дување
 DocType: Purchase Taxes and Charges,Valuation and Total,Вредновање и Тотал
 DocType: Tax Rule,Shipping City,Достава Град
 apps/erpnext/erpnext/stock/doctype/item/item.js +43,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,Ово артикла је варијанта {0} (Темплате). Атрибути ће бити копирани са шаблона осим 'Нема Копирање' постављено
 DocType: Account,Purchase User,Куповина Корисник
 DocType: Notification Control,Customize the Notification,Прилагођавање обавештења
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +87,Hammering,Закуцавање
 DocType: Web Page,Slideshow,Слидесхов
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +24,Default Address Template cannot be deleted,Уобичајено Адреса Шаблон не може бити обрисан
 DocType: Sales Invoice,Shipping Rule,Достава Правило
@@ -2839,9 +2729,8 @@
 DocType: Workflow State,Search,Претрага
 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/setup/page/setup_wizard/fixtures/operations.py +142,Brazing,Лемљење
 DocType: C-Form,Amended From,Измењена од
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Raw Material,сырье
+apps/erpnext/erpnext/public/js/setup_wizard.js +359,Raw Material,сырье
 DocType: Leave Application,Follow via Email,Пратите преко е-поште
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Сумма налога После скидка сумма
 apps/erpnext/erpnext/accounts/doctype/account/account.py +174,Child account exists for this account. You can not delete this account.,Детский учетная запись существует для этой учетной записи . Вы не можете удалить этот аккаунт .
@@ -2855,10 +2744,10 @@
 ,Produced,произведен
 DocType: Item,Item Code for Suppliers,Код за добављаче артикла
 DocType: Issue,Raised By (Email),Подигао (Е-маил)
-apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +72,General,Општи
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +495,Attach Letterhead,Прикрепите бланке
+apps/erpnext/erpnext/setup/setup_wizard/default_website.py +72,General,Општи
+apps/erpnext/erpnext/public/js/setup_wizard.js +241,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/setup/page/setup_wizard/setup_wizard.js +542,"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/public/js/setup_wizard.js +284,"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}
 DocType: Journal Entry,Bank Entry,Банка Унос
 DocType: Authorization Rule,Applicable To (Designation),Важећи Да (Именовање)
@@ -2867,31 +2756,29 @@
 apps/erpnext/erpnext/config/accounts.py +143,Enable / disable currencies.,Включение / отключение валюты.
 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),Укупно (Амт)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +26,Entertainment & Leisure,Забава и слободно време
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,Забава и слободно време
 DocType: Purchase Order,The date on which recurring order will be stop,Датум када се понавља налог ће бити зауставити
 DocType: Quality Inspection,Item Serial No,Ставка Сериал но
 apps/erpnext/erpnext/controllers/status_updater.py +142,{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 +57,Total Present,Укупно Поклон
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Hour,час
+apps/erpnext/erpnext/public/js/setup_wizard.js +363,Hour,час
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +138,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation","Серијализованом артикла {0} не може да се ажурира \
  користећи Сток помирење"
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +488,Transfer Material to Supplier,Пребаци Материјал добављачу
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +513,Transfer Material to Supplier,Пребаци Материјал добављачу
 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/crm/doctype/opportunity/opportunity.js +82,Create Quotation,Направи понуду
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +306,All these items have already been invoiced,Все эти предметы уже выставлен счет
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,You are not authorized to approve leaves on Block Dates,Нисте ауторизовани да одобри лишће на блок Датуми
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +311,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/setup/page/setup_wizard/fixtures/operations.py +83,Curling,Коврђжаст
 DocType: Account,Tax,Порез
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +28,Row {0}: {1} is not a valid {2},Ред {0}: {1} није валидан {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +89,Refining,Прерада
+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,Планирање производње алата
 DocType: Quality Inspection,Report Date,Извештај Дате
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +130,Routing,Роутинг
 DocType: C-Form,Invoices,Рачуни
 DocType: Job Opening,Job Title,Звање
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +80,{0} Recipients,{0} Примаоци
@@ -2911,14 +2798,13 @@
 DocType: DocType,Setup,Намештаљка
 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,Преглед за овај месец и чекају активности
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +39,Cold rolling,Хладно ваљање
 DocType: Customer Group,Customer Group Name,Кориснички Назив групе
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +408,Please remove this Invoice {0} from C-Form {1},Молимо вас да уклоните ову фактуру {0} од Ц-Форм {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +410,Please remove this Invoice {0} from C-Form {1},Молимо вас да уклоните ову фактуру {0} од Ц-Форм {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,Атрибути
 DocType: Packing Slip,Get Items,Гет ставке
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +186,Please enter Write Off Account,"Пожалуйста, введите списать счет"
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +187,Please enter Write Off Account,"Пожалуйста, введите списать счет"
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +71,Last Order Date,Последњи Низ Датум
 DocType: DocField,Image,Слика
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +179,Make Excise Invoice,Маке Акциза фактура
@@ -2928,7 +2814,7 @@
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +146,Operation ID not set,Операција ИД није сет
 DocType: Production Order,Planned Start Date,Планирани датум почетка
 DocType: Serial No,Creation Document Type,Документ регистрације Тип
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +620,Maint. Visit,Инцл. Посета
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +631,Maint. Visit,Инцл. Посета
 DocType: Leave Type,Is Encash,Да ли уновчити
 DocType: Purchase Invoice,Mobile No,Мобилни Нема
 DocType: Payment Tool,Make Journal Entry,Маке Јоурнал Ентри
@@ -2936,35 +2822,31 @@
 apps/erpnext/erpnext/controllers/trends.py +257,Project-wise data is not available for Quotation,Проект мудрый данные не доступны для коммерческого предложения
 DocType: Project,Expected End Date,Очекивани датум завршетка
 DocType: Appraisal Template,Appraisal Template Title,Процена Шаблон Наслов
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +440,Commercial,коммерческий
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +378,Commercial,коммерческий
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +23,Parent Item {0} must not be a Stock Item,Родитељ артикла {0} не сме бити лагеру предмета
 DocType: Cost Center,Distribution Id,Дистрибуција Ид
-apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +14,Awesome Services,Потрясающие услуги
+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,Снабдевач Адреса
 DocType: Contact Us Settings,Address Line 2,Аддресс Лине 2
 DocType: ToDo,Reference,Упућивање
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +59,Perforating,Перфоратинг
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,Од Кол
 apps/erpnext/erpnext/config/accounts.py +128,Rules to calculate shipping amount for a sale,Правила за израчунавање износа испоруке за продају
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +29,Series is mandatory,Серия является обязательным
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +28,Financial Services,Финансијске услуге
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,Финансијске услуге
 apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3},Вредност атрибута за {0} мора бити у распону од {1} {2} да у корацима од {3}
 DocType: Tax Rule,Sales,Продајни
 DocType: Stock Entry Detail,Basic Amount,Основни Износ
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +173,Warehouse required for stock Item {0},Склад требуется для складе Пункт {0}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +178,Warehouse required for stock Item {0},Склад требуется для складе Пункт {0}
 DocType: Leave Allocation,Unused leaves,Неискоришћени листови
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,Кр
 DocType: Customer,Default Receivable Accounts,Уобичајено Рецеивабле Аццоунтс
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +102,Sawing,Тестерисање
 DocType: Tax Rule,Billing State,Тецх Стате
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +32,Laminating,Ламинација
 DocType: Item Reorder,Transfer,Пренос
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +549,Fetch exploded BOM (including sub-assemblies),Фетцх експлодирала бом ( укључујући подсклопова )
 DocType: Authorization Rule,Applicable To (Employee),Важећи Да (запослених)
 apps/erpnext/erpnext/controllers/accounts_controller.py +101,Due Date is mandatory,Дуе Дате обавезна
 apps/erpnext/erpnext/controllers/item_variant.py +51,Increment for Attribute {0} cannot be 0,Повећање за Аттрибуте {0} не може бити 0
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +143,Sintering,Синтеровање
 DocType: Journal Entry,Pay To / Recd From,Плати Да / Рецд Од
 DocType: Naming Series,Setup Series,Подешавање Серија
 DocType: Supplier,Contact HTML,Контакт ХТМЛ
@@ -2977,7 +2859,6 @@
 DocType: Attendance,Absent,Одсутан
 DocType: Product Bundle,Product Bundle,Производ Бундле
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +180,Row {0}: Invalid reference {1},Ред {0}: Погрешна референца {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +165,Crushing,Црусхинг
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Купите порези и таксе Темплате
 DocType: Upload Attendance,Download Template,Преузмите шаблон
 DocType: GL Entry,Remarks,Примедбе
@@ -2985,14 +2866,12 @@
 DocType: Journal Entry,Write Off Based On,Отпис Басед Он
 DocType: Features Setup,POS View,ПОС Погледај
 apps/erpnext/erpnext/config/stock.py +38,Installation record for a Serial No.,Инсталација рекорд за серијским бр
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +9,Continuous casting,Континуирано ливење
 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/setup/page/setup_wizard/fixtures/operations.py +80,Cold sizing,Хладно димензионисање
 DocType: Salary Slip,Earning & Deduction,Зарада и дедукције
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +76,Account {0} cannot be a Group,Счет {0} не может быть группа
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +259,Region,Регија
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +314,Region,Регија
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +213,Optional. This setting will be used to filter in various transactions.,Опционо . Ова поставка ће се користити за филтрирање у различитим трансакцијама .
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +104,Negative Valuation Rate is not allowed,Негативно Вредновање курс није дозвољен
 DocType: Holiday List,Weekly Off,Недељни Искључено
@@ -3010,7 +2889,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,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,Гледалаца Од Датум и радног То Дате је обавезна
-apps/erpnext/erpnext/controllers/buying_controller.py +131,Please enter 'Is Subcontracted' as Yes or No,"Пожалуйста, введите ' Является субподряду "", как Да или Нет"
+apps/erpnext/erpnext/controllers/buying_controller.py +122,Please enter 'Is Subcontracted' as Yes or No,"Пожалуйста, введите ' Является субподряду "", как Да или Нет"
 DocType: Sales Team,Contact No.,Контакт број
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,'Profit and Loss' type account {0} not allowed in Opening Entry,""" Прибыль и убытки "" тип счета {0} не допускаются в Открытие запись"
 DocType: Workflow State,Time,Време
@@ -3019,14 +2898,13 @@
 DocType: Authorization Rule,Authorization Rule,Овлашћење Правило
 DocType: Sales Invoice,Terms and Conditions Details,Услови Детаљи
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,Продаја Порези и накнаде Темплате
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +10,Apparel & Accessories,Одећа и прибор
+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,Број Реда
 DocType: Item Group,HTML / Banner that will show on the top of product list.,ХТМЛ / банер који ће се појавити на врху листе производа.
 DocType: Shipping Rule,Specify conditions to calculate shipping amount,Наведите услове да може да израчуна испоруку износ
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +121,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/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +47,Conversion Factor is required,Коэффициент преобразования требуется
 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,Вредност / Опис
@@ -3034,10 +2912,8 @@
 ,Customers Not Buying Since Long Time,Купци не купују јер дуго времена
 DocType: Production Order,Expected Delivery Date,Очекивани Датум испоруке
 apps/erpnext/erpnext/accounts/general_ledger.py +121,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Дебитне и кредитне није једнака за {0} # {1}. Разлика је {2}.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +48,Bulging,Испупчен
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +11,Evaporative-pattern casting,Евапоративе-образац ливење
 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 +195,Sales Invoice {0} must be cancelled before cancelling this Sales Order,Счет Продажи {0} должно быть отменено до отмены этого заказ клиента
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +190,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 ."
@@ -3056,26 +2932,24 @@
 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 +241,Account: {0} with currency: {1} can not be selected,Рачун: {0} са валутом: {1} не може бити изабран
+apps/erpnext/erpnext/controllers/accounts_controller.py +242,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 +47,Account {0}: Parent account {1} does not belong to company: {2},Рачун {0}: {1 Родитељ рачун} не припада компанији: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted all transactions related to this company!,Успешно избрисали све трансакције везане за ову компанију!
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,Као и на датум
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +111,Honing,Хонинг
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +58,Probation,пробни рад
-apps/erpnext/erpnext/stock/doctype/item/item.py +264,Default Warehouse is mandatory for stock Item.,По умолчанию Склад является обязательным для складе Пункт .
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Probation,пробни рад
+apps/erpnext/erpnext/stock/doctype/item/item.py +268,Default Warehouse is mandatory for stock Item.,По умолчанию Склад является обязательным для складе Пункт .
 DocType: Feed,Full Name,Пуно име
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +148,Clinching,Цлинцхинг
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +191,Payment of salary for the month {0} and year {1},Выплата заработной платы за месяц {0} и год {1}
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +173,Payment of salary for the month {0} and year {1},Выплата заработной платы за месяц {0} и год {1}
 DocType: Stock Settings,Auto insert Price List rate if missing,Аутоматско уметак Ценовник стопа ако недостаје
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,Укупно Плаћени износ
 ,Transferred Qty,Пренето Кти
 apps/erpnext/erpnext/config/learn.py +11,Navigating,Навигација
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +137,Planning,планирање
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +137,Planning,планирање
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +9,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),Укупно цард Износ (преко Тиме Протоколи)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +629,We sell this Item,Ми продајемо ову ставку
+apps/erpnext/erpnext/public/js/setup_wizard.js +365,We sell this Item,Ми продајемо ову ставку
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +65,Supplier Id,Добављач Ид
 DocType: Journal Entry,Cash Entry,Готовина Ступање
 DocType: Sales Partner,Contact Desc,Контакт Десц
@@ -3084,18 +2958,16 @@
 DocType: Brand,Item Manager,Тачка директор
 DocType: Cost Center,Add rows to set annual budgets on Accounts.,Додајте редове одређује годишње буџете на рачунима.
 DocType: Buying Settings,Default Supplier Type,Уобичајено Снабдевач Тип
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +160,Quarrying,Вађење
 DocType: Production Order,Total Operating Cost,Укупни оперативни трошкови
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +160,Note: Item {0} entered multiple times,Примечание: Пункт {0} вошли несколько раз
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +163,Note: Item {0} entered multiple times,Примечание: Пункт {0} вошли несколько раз
 apps/erpnext/erpnext/config/crm.py +27,All Contacts.,Сви контакти.
 DocType: Newsletter,Test Email Id,Тест маил Ид
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +394,Company Abbreviation,Компанија Скраћеница
+apps/erpnext/erpnext/public/js/setup_wizard.js +142,Company Abbreviation,Компанија Скраћеница
 DocType: Features Setup,If you follow Quality Inspection. Enables Item QA Required and QA No in Purchase Receipt,Если вы будете следовать осмотра качества . Разрешает Item требуется и QA QA Нет в ТОВАРНЫЙ ЧЕК
 DocType: GL Entry,Party Type,партия Тип
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +68,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,Не Authroized с {0} превышает пределы
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +30,Rotational molding,Ротациона лајсне
 apps/erpnext/erpnext/config/hr.py +115,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,Сет Пореска Правило за куповину
@@ -3109,15 +2981,15 @@
 apps/erpnext/erpnext/config/selling.py +18,Quotes to Leads or Customers.,Цитати на води или клијената.
 DocType: Stock Settings,Role Allowed to edit frozen stock,Улога дозвољено да мењате замрзнуте залихе
 ,Territory Target Variance Item Group-Wise,Территория Целевая Разница Пункт Группа Мудрого
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +101,All Customer Groups,Все Группы клиентов
-apps/erpnext/erpnext/controllers/accounts_controller.py +474,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} је обавезно. Можда Мењачница запис није створен за {1} на {2}.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +101,All Customer Groups,Все Группы клиентов
+apps/erpnext/erpnext/controllers/accounts_controller.py +475,{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 +41,Account {0}: Parent account {1} does not exist,Рачун {0}: {1 Родитељ рачун} не постоји
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Ценовник Цена (Друштво валута)
 DocType: Account,Temporary,Привремен
 DocType: Address,Preferred Billing Address,Жељени Адреса за наплату
 DocType: Monthly Distribution Percentage,Percentage Allocation,Проценат расподеле
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +86,Secretary,секретар
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Secretary,секретар
 DocType: Serial No,Distinct unit of an Item,Разликује јединица стране јединице
 DocType: Pricing Rule,Buying,Куповина
 DocType: HR Settings,Employee Records to be created by,Евиденција запослених које ће креирати
@@ -3130,9 +3002,8 @@
 ,Item-wise Price List Rate,Ставка - мудар Ценовник курс
 DocType: Purchase Order Item,Supplier Quotation,Снабдевач Понуда
 DocType: Quotation,In Words will be visible once you save the Quotation.,У речи ће бити видљив када сачувате цитат.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +68,Ironing,Пеглање
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is stopped,{0} {1} је заустављена
-apps/erpnext/erpnext/stock/doctype/item/item.py +352,Barcode {0} already used in Item {1},Штрих {0} уже используется в пункте {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +356,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/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,Предстојећи догађаји
@@ -3141,13 +3012,12 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +27,Quick Entry,Брзо Ступање
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0} је обавезна за повратак
 DocType: Purchase Order,To Receive,Примити
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +33,Shrink fitting,Скупи Фиттинг
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +522,user@example.com,усер@екампле.цом
+apps/erpnext/erpnext/public/js/setup_wizard.js +266,user@example.com,усер@екампле.цом
 DocType: Email Digest,Income / Expense,Приходи / расходи
 DocType: Employee,Personal Email,Лични Е-маил
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +58,Total Variance,Укупна разлика
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +62,Total Variance,Укупна разлика
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.","Ако је укључен, систем ће писати уносе рачуноводствене инвентар аутоматски."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +15,Brokerage,посредништво
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +15,Brokerage,посредништво
 DocType: Address,Postal Code,поштански код
 DocType: Production Order Operation,"in Minutes
 Updated via 'Time Log'","у Минутес 
@@ -3155,14 +3025,13 @@
 DocType: Customer,From Lead,Од Леад
 apps/erpnext/erpnext/config/manufacturing.py +19,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 +442,POS Profile required to make POS Entry,ПОС Профил потребно да ПОС Ентри
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +444,POS Profile required to make POS Entry,ПОС Профил потребно да ПОС Ентри
 DocType: Hub Settings,Name Token,Име токен
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +106,Planing,Планирање
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Selling,Стандардна Продаја
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +120,Standard Selling,Стандардна Продаја
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +137,Atleast one warehouse is mandatory,Атлеаст једно складиште је обавезно
 DocType: Serial No,Out of Warranty,Од гаранције
 DocType: BOM Replace Tool,Replace,Заменити
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +314,{0} against Sales Invoice {1},{0} против продаје фактуре {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +316,{0} against Sales Invoice {1},{0} против продаје фактуре {1}
 apps/erpnext/erpnext/stock/doctype/item/item.py +49,Please enter default Unit of Measure,"Пожалуйста, введите умолчанию единицу измерения"
 DocType: Purchase Invoice Item,Project Name,Назив пројекта
 DocType: Supplier,Mention if non-standard receivable account,Спомените ако нестандардни потраживања рачуна
@@ -3178,9 +3047,8 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,Journal Entry {0} does not have account {1} or already matched against other voucher,Јоурнал Ентри {0} нема налог {1} или већ упарен против другог ваучера
 DocType: Item,Moving Average,Мовинг Авераге
 DocType: BOM Replace Tool,The BOM which will be replaced,БОМ који ће бити замењен
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +43,New Stock UOM must be different from current stock UOM,Новый фонда единица измерения должна отличаться от текущей фондовой UOM
 DocType: Account,Debit,Задужење
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +34,Leaves must be allocated in multiples of 0.5,"Листья должны быть выделены несколько 0,5"
+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,Постави присуство из ЦСВ датотеке.
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,Изузетан Амт
@@ -3198,8 +3066,7 @@
 DocType: Employee,Internal Work History,Интерни Рад Историја
 DocType: DocField,Column Break,Колона Пауза
 DocType: Event,Thursday,Четвртак
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +42,Private Equity,Приватни капитал
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +93,Turning,Скретање
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,Приватни капитал
 DocType: Maintenance Visit,Customer Feedback,Кориснички Феедбацк
 DocType: Account,Expense,расход
 DocType: Sales Invoice,Exhibition,Изложба
@@ -3212,19 +3079,19 @@
 DocType: Employee,Held On,Одржана
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +33,Production Item,Производња артикла
 ,Employee Information,Запослени Информације
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,Rate (%),Ставка (%)
+apps/erpnext/erpnext/public/js/setup_wizard.js +294,Rate (%),Ставка (%)
 DocType: Stock Entry Detail,Additional Cost,Додатни трошак
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +407,Financial Year End Date,Финансовый год Дата окончания
+apps/erpnext/erpnext/public/js/setup_wizard.js +155,Financial Year End Date,Финансовый год Дата окончания
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Voucher No, if grouped by Voucher","Не можете да филтрирате на основу ваучер Не , ако груписани по ваучер"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +484,Make Supplier Quotation,Направи понуду добављача
 DocType: Quality Inspection,Incoming,Долазни
 DocType: BOM,Materials Required (Exploded),Материјали Обавезно (Екплодед)
 DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),Смањите Зарада за дозволу без плате (ЛВП)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +512,"Add users to your organization, other than yourself","Додај корисника у вашој организацији, осим себе"
+apps/erpnext/erpnext/public/js/setup_wizard.js +256,"Add users to your organization, other than yourself","Додај корисника у вашој организацији, осим себе"
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No {1} does not match with {2} {3},Ред # {0}: Серијски број {1} не одговара {2} {3}
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +44,Casual Leave,Повседневная Оставить
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +44,Casual Leave,Повседневная Оставить
 DocType: Batch,Batch ID,Батцх ИД
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +334,Note: {0},Примечание: {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +336,Note: {0},Примечание: {0}
 ,Delivery Note Trends,Достава Напомена трендови
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +104,This Week's Summary,Овонедељном Преглед
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +74,{0} must be a Purchased or Sub-Contracted Item in row {1},{0} должен быть куплены или субподрядчиком Пункт в строке {1}
@@ -3236,7 +3103,7 @@
 DocType: Purchase Receipt,Return Against Purchase Receipt,Повратак против рачуном
 DocType: Purchase Order,To Bill,Билу
 DocType: Material Request,% Ordered,% Од А до Ж
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +61,Piecework,рад плаћен на акорд
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Piecework,рад плаћен на акорд
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +64,Avg. Buying Rate,Про. Куповни
 DocType: Task,Actual Time (in Hours),Тренутно време (у сатима)
 DocType: Employee,History In Company,Историја У друштву
@@ -3253,13 +3120,13 @@
 DocType: Opportunity,To Discuss,Да Дисцусс
 DocType: SMS Settings,SMS Settings,СМС подешавања
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +60,Temporary Accounts,Привремене рачуни
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +155,Black,Црн
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Black,Црн
 DocType: BOM Explosion Item,BOM Explosion Item,БОМ Експлозија шифра
 DocType: Account,Auditor,Ревизор
 DocType: Purchase Order,End date of current order's period,Датум завршетка периода постојећи поредак је
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +17,Make Offer Letter,Маке Оффер Леттер
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +10,Return,Повратак
-apps/erpnext/erpnext/stock/doctype/item/item.py +503,Default Unit of Measure for Variant must be same as Template,Уобичајено Јединица мере за варијанту морају бити исти као шаблон
+apps/erpnext/erpnext/stock/doctype/item/item.py +507,Default Unit of Measure for Variant must be same as Template,Уобичајено Јединица мере за варијанту морају бити исти као шаблон
 DocType: DocField,Fold,Преклопити
 DocType: Production Order Operation,Production Order Operation,Производња Ордер Операција
 DocType: Pricing Rule,Disable,запрещать
@@ -3270,13 +3137,12 @@
 DocType: Page,Page Name,Страница Име
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +110,To Time must be greater than From Time,Да Време мора бити већи од Фром Тиме
 DocType: Journal Entry Account,Exchange Rate,Курс
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +465,Sales Order {0} is not submitted,Заказ на продажу {0} не представлено
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +467,Sales Order {0} is not submitted,Заказ на продажу {0} не представлено
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0}: Parent account {1} does not bolong to the company {2},Магацин {0}: {1 Родитељ рачун} не Болонг предузећу {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +124,Spindle finishing,Вретена обрада
 DocType: BOM,Last Purchase Rate,Последња куповина Стопа
 DocType: Account,Asset,преимућство
 DocType: Project Task,Task ID,Задатак ИД
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +395,"e.g. ""MC""","например ""МС """
+apps/erpnext/erpnext/public/js/setup_wizard.js +143,"e.g. ""MC""","например ""МС """
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,Stock cannot exist for Item {0} since has variants,Стоцк не може постојати за ставку {0} од има варијанте
 ,Sales Person-wise Transaction Summary,Продавац у питању трансакција Преглед
 DocType: System Settings,Time Zone,Временска зона
@@ -3285,9 +3151,7 @@
 DocType: Monthly Distribution,Monthly Distribution Percentages,Месечни Дистрибуција Проценти
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +16,The selected item cannot have Batch,Изабрана опција не може имати Батцх
 DocType: Delivery Note,% of materials delivered against this Delivery Note,% испоручених материјала на основу ове Отпремнице
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +151,Stapling,Стаплинг
 DocType: Customer,Customer Details,Кориснички Детаљи
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +105,Shaping,Обликовање
 DocType: Employee,Reports to,Извештаји
 DocType: SMS Settings,Enter url parameter for receiver nos,Унесите УРЛ параметар за пријемник бр
 DocType: Sales Invoice,Paid Amount,Плаћени Износ
@@ -3296,13 +3160,13 @@
 DocType: Item Variant,Item Variant,Итем Варијанта
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +15,Setting this Address Template as default as there is no other default,"Постављање Ова адреса шаблон као подразумевани, јер не постоји други подразумевани"
 apps/erpnext/erpnext/accounts/doctype/account/account.py +89,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Стање рачуна већ у задуживање, није вам дозвољено да поставите 'Стање Муст Бе' као 'Кредит'"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +76,Quality Management,Управљање квалитетом
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Quality Management,Управљање квалитетом
 DocType: Production Planning Tool,Filter based on customer,Филтер на бази купца
 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}"
 DocType: Employee External Work History,Employee External Work History,Запослени Спољни Рад Историја
 DocType: Tax Rule,Purchase,Куповина
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +34,Balance Qty,Стање Кол
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Balance Qty,Стање Кол
 DocType: Item Group,Parent Item Group,Родитељ тачка Група
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +21,{0} for {1},{0} за {1}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +96,Cost Centers,Цост центри
@@ -3312,12 +3176,12 @@
 DocType: Opportunity,Next Contact,Следећа Контакт
 DocType: Employee,Employment Type,Тип запослења
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,капитальные активы
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +84,Application period cannot be across two alocation records,Период примене не могу бити на два намјена евиденције
 DocType: Item Group,Default Expense Account,Уобичајено Трошкови налога
 DocType: Employee,Notice (days),Обавештење ( дана )
 DocType: Page,Yes,Да
 DocType: Tax Rule,Sales Tax Template,Порез на промет Шаблон
 DocType: Employee,Encashment Date,Датум Енцасхмент
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +74,Electroforming,Елецтроформинг
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +179,"Against Voucher Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Против Ваучер Тип мора бити један од нарудзбенице, фактури или Јоурнал Ентри"
 DocType: Account,Stock Adjustment,Фото со Регулировка
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +34,Default Activity Cost exists for Activity Type - {0},Уобичајено активност Трошкови постоји за тип активности - {0}
@@ -3353,12 +3217,12 @@
 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,Дистрибуција
 apps/erpnext/erpnext/public/js/pos/pos.html +36,Amount Paid,Износ Плаћени
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +91,Project Manager,Пројецт Манагер
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +72,Dispatch,депеша
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Project Manager,Пројецт Манагер
+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: Customer,Default Taxes and Charges,Уобичајено таксе и накнаде
 DocType: Account,Receivable,Дебиторская задолженность
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +268,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,Ред # {0}: Није дозвољено да промени снабдевача као Пурцхасе Ордер већ постоји
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +263,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.","Ако је проверен, бом за под-монтаже ставки ће бити узети у обзир за добијање сировина. Иначе, сви суб-монтажни ставке ће бити третирани као сировина."
@@ -3366,8 +3230,8 @@
 DocType: Hub Settings,Seller Description,Продавац Опис
 DocType: Employee Education,Qualification,Квалификација
 DocType: Item Price,Item Price,Артикал Цена
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +48,Soap & Detergent,Сапун и детерџент
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +36,Motion Picture & Video,Мотион Пицтуре & Видео
+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,Ж
 DocType: Warehouse,Warehouse Name,Магацин Име
 DocType: Naming Series,Select Transaction,Изаберите трансакцију
@@ -3376,7 +3240,6 @@
 DocType: BOM,Rate Of Materials Based On,Стопа материјала на бази
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,Подршка Аналтиицс
 apps/erpnext/erpnext/accounts/doctype/accounts_settings/accounts_settings.py +27,Company is missing in warehouses {0},Компания на складах отсутствует {0}
-DocType: Stock UOM Replace Utility,Stock UOM Replace Utility,Берза УОМ Замени комунално
 DocType: POS Profile,Terms and Conditions,Услови
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,To Date should be within the Fiscal Year. Assuming To Date = {0},Да би требало да буде дата у фискалну годину. Под претпоставком То Дате = {0}
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","Овде можете одржавати висина, тежина, алергија, медицинску забринутост сл"
@@ -3388,7 +3251,7 @@
 DocType: Sales Order Item,For Production,За производњу
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +103,Please enter sales order in the above table,Унесите продаје ред у табели
 DocType: Project Task,View Task,Погледај Задатак
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +406,Your financial year begins on,Ваша финансијска година почиње
+apps/erpnext/erpnext/public/js/setup_wizard.js +154,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: Email Digest,Add/Remove Recipients,Адд / Ремове прималаца
@@ -3396,16 +3259,14 @@
 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),Настройка сервера входящей для поддержки электронный идентификатор . (например 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 +528,Item variant {0} exists with same attributes,Тачка варијанта {0} постоји са истим атрибутима
+apps/erpnext/erpnext/stock/doctype/item/item.py +532,Item variant {0} exists with same attributes,Тачка варијанта {0} постоји са истим атрибутима
 DocType: Salary Slip,Salary Slip,Плата Слип
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +116,Burnishing,Брунирање
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +54,'To Date' is required,' To Date ' требуется
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,' To Date ' требуется
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","Генерисати паковање признанице за да буде испоручена пакети. Користи се за обавијести пакет број, Садржај пакета и његову тежину."
 DocType: Sales Invoice Item,Sales Order Item,Продаја Наручите артикла
 DocType: Salary Slip,Payment Days,Дана исплате
 DocType: BOM,Manage cost of operations,Управљање трошкове пословања
 DocType: Features Setup,Item Advanced,Ставка Напредна
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +40,Hot rolling,Топло ваљање
 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.","Када неки од селектираних трансакција &quot;Послао&quot;, е поп-уп аутоматски отворила послати емаил на вези &quot;Контакт&quot; у тој трансакцији, са трансакцијом као прилог. Корисник може или не може да пошаље поруку."
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,Глобальные настройки
 DocType: Employee Education,Employee Education,Запослени Образовање
@@ -3418,25 +3279,23 @@
 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/setup/page/setup_wizard/install_fixtures.py +48,Sick Leave,Отпуск по болезни
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +174,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/page/setup_wizard/fixtures/industry_type.py +22,Department Stores,Робне куце
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,Робне куце
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +40,System Balance,Систем Стање
 DocType: Workflow,Is Active,Је активан
 apps/erpnext/erpnext/controllers/stock_controller.py +71,No accounting entries for the following warehouses,Нет учетной записи для следующих складов
 apps/erpnext/erpnext/projects/doctype/project/project.js +22,Save the document first.,Први Сачувајте документ.
 DocType: Account,Chargeable,Наплатив
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +121,Linishing,Линисхинг
 DocType: Company,Change Abbreviation,Промена скраћеница
 DocType: Workflow State,Primary,Основни
 DocType: Expense Claim Detail,Expense Date,Расходи Датум
 DocType: Item,Max Discount (%),Максимална Попуст (%)
 DocType: Communication,More Information,Више информација
 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/setup/page/setup_wizard/fixtures/operations.py +161,Blasting,Бластинг
 DocType: Company,Warn,Упозорити
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +111,Item valuation updated,Пункт оценка обновляются
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Било који други примедбе, напоменути напор који треба да иде у евиденцији."
 DocType: BOM,Manufacturing User,Производња Корисник
 DocType: Purchase Order,Raw Materials Supplied,Сировине комплету
@@ -3446,7 +3305,7 @@
 DocType: Appraisal,Appraisal Template,Процена Шаблон
 DocType: Communication,Email,Е-маил
 DocType: Item Group,Item Classification,Итем Класификација
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +89,Business Development Manager,Менаџер за пословни развој
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Business Development Manager,Менаџер за пословни развој
 DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,Одржавање посета Сврха
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.js +15,Period,период
 ,General Ledger,Главна књига
@@ -3456,9 +3315,7 @@
 ,Itemwise Recommended Reorder Level,Препоручени ниво Итемвисе Реордер
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +264,Please select {0} first,Изаберите {0} први
 DocType: Features Setup,To get Item Group in details table,Да бисте добили групу ставка у табели детаљније
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +67,Redrawing,Прекрајање
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +112,Batch {0} of Item {1} has expired.,Батцх {0} од тачке {1} је истекао.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +120,Etching,Гравура
 DocType: Sales Invoice,Commission,комисија
 DocType: Address Template,"<h4>Default Template</h4>
 <p>Uses <a href=""http://jinja.pocoo.org/docs/templates/"">Jinja Templating</a> and all the fields of Address (including Custom Fields if any) will be available</p>
@@ -3503,7 +3360,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +340,Operation Time must be greater than 0 for Operation {0},Операција време мора бити већи од 0 за операцију {0}
 DocType: Supplier,Address and Contacts,Адреса и контакти
 DocType: UOM Conversion Detail,UOM Conversion Detail,УОМ Конверзија Детаљ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +496,Keep it web friendly 900px (w) by 100px (h),Држите га веб пријатељски 900пк ( В ) од 100пк ( х )
+apps/erpnext/erpnext/public/js/setup_wizard.js +242,Keep it web friendly 900px (w) by 100px (h),Држите га веб пријатељски 900пк ( В ) од 100пк ( х )
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +329,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,Гет Изванредна ваучери
@@ -3519,54 +3376,49 @@
 DocType: Item,Average time taken by the supplier to deliver,Просечно време које је добављач за испоруку
 DocType: Time Log,Hours,Радно време
 DocType: Project,Expected Start Date,Очекивани датум почетка
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +38,Rolling,Роллинг
 DocType: ToDo,Priority,Приоритет
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +41,Remove item if charges is not applicable to that item,Уклоните ставку ако оптужбе се не примењује на ту ставку
 DocType: Dropbox Backup,Dropbox Access Allowed,Дропбок дозвољен приступ
 DocType: Dropbox Backup,Weekly,Недељни
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,Нпр. смсгатеваи.цом / апи / сенд_смс.цги
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +485,Receive,Пријем
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +510,Receive,Пријем
 DocType: Maintenance Visit,Fully Completed,Потпуно Завршено
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% Комплетна
 DocType: Employee,Educational Qualification,Образовни Квалификације
 DocType: Workstation,Operating Costs,Оперативни трошкови
 DocType: Employee Leave Approver,Employee Leave Approver,Запослени одсуство одобраватељ
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,{0} has been successfully added to our Newsletter list.,{0} је успешно додат у нашој листи билтен.
-apps/erpnext/erpnext/stock/doctype/item/item.py +383,Row {0}: An Reorder entry already exists for this warehouse {1},Ров {0}: Унос Прераспоређивање већ постоји у овој магацин {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +387,Row {0}: An Reorder entry already exists for this warehouse {1},Ров {0}: Унос Прераспоређивање већ постоји у овој магацин {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +67,"Cannot declare as lost, because Quotation has been made.","Не могу прогласити као изгубљен , јер Понуда је учињен ."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +133,Electron beam machining,Електронски сноп машинска обрада
 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 +150,Please select Start Date and End Date for Item {0},"Пожалуйста, выберите дату начала и дату окончания Пункт {0}"
 apps/erpnext/erpnext/config/stock.py +141,Main Reports,Главни Извештаји
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +102,Stock Ledger entries balances updated,Фото со Леджер записей остатки обновляются
 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,Превдоц ДОЦТИПЕ
-apps/erpnext/erpnext/stock/doctype/item/item.js +176,Add / Edit Prices,Додај / измени Прицес
+apps/erpnext/erpnext/stock/doctype/item/item.js +178,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 +298,My Orders,Ми Ордерс
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +293,My Orders,Ми Ордерс
 DocType: Price List,Price List Name,Ценовник Име
 DocType: Time Log,For Manufacturing,За производњу
-apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +70,Totals,Укупно
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +174,Totals,Укупно
 DocType: BOM,Manufacturing,Производња
 ,Ordered Items To Be Delivered,Ж Ставке да буде испоручена
 DocType: Account,Income,доход
 ,Setup Wizard,Мастер установки
 DocType: Industry Type,Industry Type,Индустрија Тип
 apps/erpnext/erpnext/templates/includes/cart.js +137,Something went wrong!,Нешто није у реду!
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +68,Warning: Leave application contains following block dates,Упозорење: Оставите пријава садржи следеће датуме блок
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +251,Sales Invoice {0} has already been submitted,Счет Продажи {0} уже представлен
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +100,Warning: Leave application contains following block dates,Упозорење: Оставите пријава садржи следеће датуме блок
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +256,Sales Invoice {0} has already been submitted,Счет Продажи {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/setup/page/setup_wizard/fixtures/operations.py +10,Die casting,Ливеног
 DocType: Email Alert,Reference Date,Референтни датум
 apps/erpnext/erpnext/config/hr.py +105,Organization unit (department) master.,Название подразделения (департамент) хозяин.
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +25,Please enter valid mobile nos,Введите действительные мобильных NOS
 DocType: Budget Detail,Budget Detail,Буџет Детаљ
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +75,Please enter message before sending,"Пожалуйста, введите сообщение перед отправкой"
 DocType: Async Task,Status,Статус
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +65,Stock UOM updated for Item {0},Стоцк УОМ упдатед за ставку {0}
 DocType: Company History,Year,Година
 apps/erpnext/erpnext/config/accounts.py +127,Point-of-Sale Profile,Поинт-оф-Сале Профиле
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +68,Please Update SMS Settings,Молимо Упдате СМС Сеттингс
@@ -3580,12 +3432,12 @@
 ,Serial No Service Contract Expiry,Серијски број услуга Уговор Истек
 DocType: Item,Unit of Measure Conversion,Јединица мере Цонверсион
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +86,Employee can not be changed,Запослени не може да се промени
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +259,You cannot credit and debit same account at the same time,Ви не можете кредитних и дебитних исти налог у исто време
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,You cannot credit and debit same account at the same time,Ви не можете кредитних и дебитних исти налог у исто време
 DocType: Naming Series,Help HTML,Помоћ ХТМЛ
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},Всего Weightage назначен должна быть 100% . Это {0}
 apps/erpnext/erpnext/controllers/status_updater.py +140,Allowance for over-{0} crossed for Item {1},Исправка за преко-{0} {прешао за тачке 1}
 DocType: Address,Name of person or organization that this address belongs to.,Име особе или организације која је ова адреса припада.
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +587,Your Suppliers,Ваши Добављачи
+apps/erpnext/erpnext/public/js/setup_wizard.js +325,Your Suppliers,Ваши Добављачи
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,Не можете поставити као Лост као Продаја Наручите је направљен .
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +65,Another Salary Structure {0} is active for employee {1}. Please make its status 'Inactive' to proceed.,Још један Плата Структура {0} је активан за запосленог {1}. Молимо вас да се његов статус као неактивне за наставак.
 DocType: Purchase Invoice,Contact,Контакт
@@ -3594,37 +3446,35 @@
 DocType: Item,Has Serial No,Има Серијски број
 DocType: Employee,Date of Issue,Датум издавања
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +16,{0}: From {0} for {1},{0}: Од {0} {1} за
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +154,Row #{0}: Set Supplier for item {1},Ред # {0}: Сет добављача за ставку {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +149,Row #{0}: Set Supplier for item {1},Ред # {0}: Сет добављача за ставку {1}
 DocType: Issue,Content Type,Тип садржаја
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +17,Computer,рачунар
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,рачунар
 DocType: Item,List this Item in multiple groups on the website.,Наведи ову ставку у више група на сајту.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +283,Please check Multi Currency option to allow accounts with other currency,Молимо вас да проверите Мулти валута опцију да дозволи рачуне са другој валути
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +285,Please check Multi Currency option to allow accounts with other currency,Молимо вас да проверите Мулти валута опцију да дозволи рачуне са другој валути
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +62,Item: {0} does not exist in the system,Итем: {0} не постоји у систему
 apps/erpnext/erpnext/accounts/doctype/account/account.py +81,You are not authorized to set Frozen value,Нисте овлашћени да подесите вредност Фрозен
 DocType: Payment Reconciliation,Get Unreconciled Entries,Гет неусаглашених уносе
 DocType: Cost Center,Budgets,Буџети
 apps/frappe/frappe/core/page/modules_setup/modules_setup.py +11,Updated,Ажурирано
 DocType: Employee,Emergency Contact Details,Хитна Контакт
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +396,What does it do?,Шта он ради ?
+apps/erpnext/erpnext/public/js/setup_wizard.js +144,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,Просечан курс Комисија
-apps/erpnext/erpnext/stock/doctype/item/item.py +313,'Has Serial No' can not be 'Yes' for non-stock item,"""Има серијски број"" не може бити ""Да"" за артикл који није на залихама"
+apps/erpnext/erpnext/stock/doctype/item/item.py +317,'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/setup/page/setup_wizard/install_fixtures.py +111,Electrical,электрический
+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 +302,Row {0}: Exchange Rate is mandatory,Ред {0}: курс је обавезна
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +304,Row {0}: Exchange Rate is mandatory,Ред {0}: курс је обавезна
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},ID пользователя не установлен Требуются {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +72,Peening,Бомбирању
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,From Warranty Claim,Од право на гаранцију
 DocType: Stock Entry,Default Source Warehouse,Уобичајено Извор Магацин
 DocType: Item,Customer Code,Кориснички Код
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +212,Birthday Reminder for {0},Подсетник за рођендан за {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +163,Lapping,Лаппинг
-apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.js +8,Days Since Last Order,Дана Од Последња Наручи
+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 +299,Debit To account must be a Balance Sheet account,Дебитна на рачун мора да буде биланса стања
 DocType: Buying Settings,Naming Series,Именовање Сериес
 DocType: Leave Block List,Leave Block List Name,Оставите Име листу блокираних
@@ -3638,7 +3488,7 @@
 DocType: Notification Control,Sales Invoice Message,Продаја Рачун Порука
 DocType: Authorization Rule,Based On,На Дана
 DocType: Sales Order Item,Ordered Qty,Ж Кол
-apps/erpnext/erpnext/stock/doctype/item/item.py +539,Item {0} is disabled,Ставка {0} је онемогућен
+apps/erpnext/erpnext/stock/doctype/item/item.py +543,Item {0} is disabled,Ставка {0} је онемогућен
 DocType: Stock Settings,Stock Frozen Upto,Берза Фрозен Упто
 apps/erpnext/erpnext/controllers/recurring_document.py +166,Period From and Period To dates mandatory for recurring {0},Период од периода до датума и обавезних се понављају {0}
 apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,Пројекат активност / задатак.
@@ -3648,7 +3498,6 @@
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,Скидка должна быть меньше 100
 DocType: ToDo,Low,Низак
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Отпис Износ (Фирма валута)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +71,Spinning,Предење
 DocType: Landed Cost Voucher,Landed Cost Voucher,Слетео Трошкови Ваучер
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +55,Please set {0},"Пожалуйста, установите {0}"
 DocType: Purchase Invoice,Repeat on Day of Month,Поновите на дан у месецу
@@ -3670,7 +3519,6 @@
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +37,Campaign Name is required,Название кампании требуется
 DocType: Maintenance Visit,Maintenance Date,Одржавање Датум
 DocType: Purchase Receipt Item,Rejected Serial No,Одбијен Серијски број
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +51,Deep drawing,Дубоко уздисање
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +40,New Newsletter,Нови билтен
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +157,Start date should be less than end date for Item {0},Дата начала должна быть меньше даты окончания для Пункт {0}
 apps/erpnext/erpnext/stock/doctype/item/item.js +17,Show Balance,Схов Стање
@@ -3681,7 +3529,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +119,BOM and Manufacturing Quantity are required,БОМ и Производња Количина се тражи
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Старење Опсег 2
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +450,Amount,Износ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +147,Riveting,Риветинг
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,БОМ заменио
 ,Sales Analytics,Продаја Аналитика
 DocType: Manufacturing Settings,Manufacturing Settings,Производња Подешавања
@@ -3693,20 +3540,19 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +207,New Account Name,Нови налог Име
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,Сировине комплету Цост
 DocType: Selling Settings,Settings for Selling Module,Подешавања за Селлинг Модуле
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +73,Customer Service,Кориснички сервис
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Customer Service,Кориснички сервис
 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.,Понуда кандидат посла.
 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 +70,Item {0} must be a stock Item,Пункт {0} должен быть запас товара
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,Уобичајено Ворк Ин Прогресс Варехоусе
 apps/erpnext/erpnext/config/accounts.py +107,Default settings for accounting transactions.,Настройки по умолчанию для бухгалтерских операций .
 apps/frappe/frappe/model/naming.py +40,{0} is required,{0} требуется
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +21,Vacuum molding,Вакуумско калупљење
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,Очекивани датум не може бити пре Материјал Захтев Датум
 DocType: Contact Us Settings,City,Град
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +132,Ultrasonic machining,Ултразвучна машинска обрада
 apps/frappe/frappe/templates/base.html +137,Error: Not a valid id?,Грешка: Не важи? Ид?
 apps/erpnext/erpnext/stock/get_item_details.py +125,Item {0} must be a Sales Item,Пункт {0} должен быть Продажи товара
 DocType: Naming Series,Update Series Number,Упдате Број
@@ -3714,7 +3560,7 @@
 DocType: Sales Order,Printing Details,Штампање Детаљи
 DocType: Task,Closing Date,Датум затварања
 DocType: Sales Order Item,Produced Quantity,Произведена количина
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +84,Engineer,инжењер
+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 +379,Item Code required at Row No {0},Код товара требуется на Row Нет {0}
 DocType: Sales Partner,Partner Type,Партнер Тип
@@ -3722,7 +3568,7 @@
 DocType: Authorization Rule,Customerwise Discount,Цустомервисе Попуст
 DocType: Purchase Invoice,Against Expense Account,Против трошковником налог
 DocType: Production Order,Production Order,Продуцтион Ордер
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +258,Installation Note {0} has already been submitted,Установка Примечание {0} уже представлен
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +263,Installation Note {0} has already been submitted,Установка Примечание {0} уже представлен
 DocType: Quotation Item,Against Docname,Против Доцнаме
 DocType: SMS Center,All Employee (Active),Све Запослени (активна)
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,Погледај Сада
@@ -3731,19 +3577,19 @@
 DocType: Item,Re-Order Level,Поново би Левел
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,Унесите ставке и планирани Кол за које желите да подигне наређења производне или преузети сировине за анализу.
 apps/frappe/frappe/public/js/frappe/views/ganttview.js +45,Gantt Chart,Гантт Цхарт
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +57,Part-time,Скраћено
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,Part-time,Скраћено
 DocType: Employee,Applicable Holiday List,Важећи Холидаи Листа
 DocType: Employee,Cheque,Чек
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,Серия Обновлено
 apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Report Type is mandatory,Тип отчета является обязательным
 DocType: Item,Serial Number Series,Серијски број серија
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},Склад является обязательным для складе Пункт {0} в строке {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +45,Retail & Wholesale,Малопродаја и велепродаја
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,Малопродаја и велепродаја
 DocType: Issue,First Responded On,Прво одговорила
 DocType: Website Item Group,Cross Listing of Item in multiple groups,Оглас крст од предмета на више група
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +351,The First User: You,Први Корисник : Ви
+apps/erpnext/erpnext/public/js/setup_wizard.js +101,The First User: You,Први Корисник : Ви
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +48,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 +172,Successfully Reconciled,Успешно помирили
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +119,Successfully Reconciled,Успешно помирили
 DocType: Production Order,Planned End Date,Планирани Датум Крај
 apps/erpnext/erpnext/config/stock.py +43,Where items are stored.,Где ставке су ускладиштене.
 DocType: Tax Rule,Validity,Рок важења
@@ -3763,39 +3609,36 @@
 DocType: DocPerm,Level,Ниво
 DocType: Purchase Taxes and Charges,On Net Total,Он Нет Укупно
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +160,Target warehouse in row {0} must be same as Production Order,"Целевая склад в строке {0} должно быть таким же , как производственного заказа"
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +59,No permission to use Payment Tool,Нема дозволе за коришћење средства наплате
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +97,No permission to use Payment Tool,Нема дозволе за коришћење средства наплате
 apps/erpnext/erpnext/controllers/recurring_document.py +192,'Notification Email Addresses' not specified for recurring %s,'Нотифицатион Емаил Аддрессес' не указано се понављају и% с
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +86,Milling,Глодање
 apps/erpnext/erpnext/accounts/doctype/account/account.py +99,Currency can not be changed after making entries using some other currency,Валута не може да се промени након што уносе користите неки други валуте
 DocType: Company,Round Off Account,Заокружити рачун
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +60,Nibbling,Нибловање
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,административные затраты
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +18,Consulting,Консалтинг
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +18,Consulting,Консалтинг
 DocType: Customer Group,Parent Customer Group,Родитељ групу потрошача
 apps/erpnext/erpnext/public/js/pos/pos.js +429,Change,Промена
 DocType: Purchase Invoice,Contact Email,Контакт Емаил
 DocType: Appraisal Goal,Score Earned,Оцена Еарнед
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +393,"e.g. ""My Company LLC""","например "" Моя компания ООО """
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +173,Notice Period,Отказни рок
+apps/erpnext/erpnext/public/js/setup_wizard.js +141,"e.g. ""My Company LLC""","например "" Моя компания ООО """
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +173,Notice Period,Отказни рок
 DocType: Bank Reconciliation Detail,Voucher ID,Шифра ваучера
 apps/erpnext/erpnext/setup/doctype/territory/territory.js +14,This is a root territory and cannot be edited.,То јекорен територија и не могу да се мењају .
 DocType: Packing Slip,Gross Weight UOM,Бруто тежина УОМ
 DocType: Email Digest,Receivables / Payables,Потраживања / Обавезе
 DocType: Delivery Note Item,Against Sales Invoice,Против продаје фактура
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +63,Stamping,Жигосање
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +457,Credit Account,Кредитни рачун
 DocType: Landed Cost Item,Landed Cost Item,Слетео Цена артикла
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +56,Show zero values,Схов нула вредности
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,Количина тачке добија након производњи / препакивање од датих количине сировина
 DocType: Payment Reconciliation,Receivable / Payable Account,Примања / обавезе налог
 DocType: Delivery Note Item,Against Sales Order Item,Против продаје Ордер тачком
-apps/erpnext/erpnext/stock/doctype/item/item.py +521,Please specify Attribute Value for attribute {0},Наведите Вредност атрибута за атрибут {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +525,Please specify Attribute Value for attribute {0},Наведите Вредност атрибута за атрибут {0}
 DocType: Item,Default Warehouse,Уобичајено Магацин
 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,Принт Без Износ
-apps/erpnext/erpnext/controllers/buying_controller.py +69,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,"Пореска Категорија не може бити "" Процена "" или "" Вредновање и Тотал "" , као сви предмети су не- залихама"
+apps/erpnext/erpnext/controllers/buying_controller.py +60,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,"Пореска Категорија не може бити "" Процена "" или "" Вредновање и Тотал "" , као сви предмети су не- залихама"
 DocType: User,Last Name,Презиме
 DocType: Web Page,Left,Лево
 DocType: Event,All Day,Целодневни
@@ -3803,7 +3646,7 @@
 DocType: Appraisal,Total Score (Out of 5),Укупна оцена (Оут оф 5)
 DocType: Contact Us Settings,State,Држава
 DocType: Batch,Batch,Серија
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +51,Balance,Баланс
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +28,Balance,Баланс
 DocType: Project,Total Expense Claim (via Expense Claims),Укупни расходи Цлаим (преко Расходи потраживања)
 DocType: User,Gender,Пол
 DocType: Journal Entry,Debit Note,Задужењу
@@ -3833,8 +3676,7 @@
 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/setup/page/setup_wizard/fixtures/operations.py +76,Seaming,СЕАМИНГ
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +197,"Company Email ID not found, hence mail not sent","Компании e-mail ID не найден, следовательно, Почта не отправляется"
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +206,"Company Email ID not found, hence mail not sent","Компании e-mail ID не найден, следовательно, Почта не отправляется"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Применение средств ( активов )
 DocType: Production Planning Tool,Filter based on item,Филтер на бази ставке
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +451,Debit Account,Текући рачуни
@@ -3846,17 +3688,16 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +95,{0} {1} has been modified. Please refresh.,{0} {1} был изменен. Обновите .
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,Стоп кориснике од доношења Леаве апликација на наредним данима.
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +591,From Opportunity,Оппортунити
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +46,Blanking,Слепи
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +166,Employee Benefits,Примања запослених
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,Employee Benefits,Примања запослених
 DocType: Sales Invoice,Is POS,Да ли је ПОС
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +240,Packed quantity must equal quantity for Item {0} in row {1},Упакованные количество должно равняться количество для Пункт {0} в строке {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +245,Packed quantity must equal quantity for Item {0} in row {1},Упакованные количество должно равняться количество для Пункт {0} в строке {1}
 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.,Рачуни подигао купцима.
 DocType: DocField,Default,Уобичајено
 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 +466,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Ред Не {0}: Износ не може бити већи од очекивању износ од трошковником потраживања {1}. У очекивању Износ је {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +468,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} је додао претплатници
 DocType: Maintenance Schedule,Schedule,Распоред
 DocType: Cost Center,"Define Budget for this Cost Center. To set budget action, see ""Company List""","Дефинисати буџет за ову трошкова Центра. Да бисте поставили буџета акцију, погледајте &quot;Компанија Листа&quot;"
@@ -3867,7 +3708,7 @@
 apps/erpnext/erpnext/public/js/pos/pos.js +91,Price List not found or disabled,Ценовник није пронађен или онемогућен
 DocType: Expense Claim,Approved,Одобрено
 DocType: Pricing Rule,Price,цена
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +79,Employee relieved on {0} must be set as 'Left',"Сотрудник освобожден от {0} должен быть установлен как "" левые"""
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +88,Employee relieved on {0} must be set as 'Left',"Сотрудник освобожден от {0} должен быть установлен как "" левые"""
 DocType: Item,"Selecting ""Yes"" will give a unique identity to each entity of this item which can be viewed in the Serial No master.",Избор &quot;Да&quot; ће дати јединствени идентитет сваком ентитету ове тачке које се могу видети у серијским Но мајстора.
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +39,Appraisal {0} created for Employee {1} in the given date range,Оценка {0} создан Требуются {1} в указанный диапазон дат
 DocType: Employee,Education,образовање
@@ -3878,7 +3719,7 @@
 apps/frappe/frappe/desk/moduleview.py +67,Standard Reports,Стандартные отчеты
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,Рачуноводствене ставке дневника.
 DocType: Delivery Note Item,Available Qty at From Warehouse,Доступно на ком Од Варехоусе
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +209,Please select Employee Record first.,Молимо изаберите Емплоиее Рецорд први.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +224,Please select Employee Record first.,Молимо изаберите Емплоиее Рецорд први.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,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 +233,Please enter Expense Account,Унесите налог Екпенсе
@@ -3891,46 +3732,43 @@
 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,Повуците продајне налоге (чека да испоручи) на основу наведених критеријума
 DocType: DocShare,Document Type,Доцумент Типе
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +565,From Supplier Quotation,Од понуде добављача
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +588,From Supplier Quotation,Од понуде добављача
 DocType: Deduction Type,Deduction Type,Одбитак Тип
 DocType: Attendance,Half Day,Пола дана
 DocType: Pricing Rule,Min Qty,Мин Кол-во
 DocType: Features Setup,"To track items in sales and purchase documents with batch nos. ""Preferred Industry: Chemicals""",Да бисте пратили ставке у продаји и куповини документе у којима батцх бр. &quot;Преферред Индустрија Хемија&quot;
 DocType: GL Entry,Transaction Date,Трансакција Датум
 DocType: Production Plan Item,Planned Qty,Планирани Кол
-apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +91,Total Tax,Укупно Пореска
+apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +93,Total Tax,Укупно Пореска
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +178,For Quantity (Manufactured Qty) is mandatory,За Количина (Мануфацтуред Кти) је обавезан
 DocType: Stock Entry,Default Target Warehouse,Уобичајено Циљна Магацин
 DocType: Purchase Invoice,Net Total (Company Currency),Нето Укупно (Друштво валута)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +79,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Ред {0}: Партија Тип и странка се примењује само против примања / обавезе рачуна
 DocType: Notification Control,Purchase Receipt Message,Куповина примање порука
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +95,Total allocated leaves are more than period,Укупно издвојена листови су више од периода
 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.,Снимање покрета ставку.
 DocType: Newsletter List Subscriber,Newsletter List Subscriber,Билтен Листа претплатника
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +164,Morticing,Дубљење
 DocType: Email Account,Service,служба
 DocType: Hub Settings,Hub Settings,Хуб Подешавања
 DocType: Project,Gross Margin %,Бруто маржа%
 DocType: BOM,With Operations,Са операције
 apps/erpnext/erpnext/accounts/party.py +232,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Рачуноводствене ставке су већ учињени у валути {0} за компанију {1}. Изаберите обавеза или примања рачун са валутом {0}.
 ,Monthly Salary Register,Месечна плата Регистрација
-apps/frappe/frappe/website/template.py +140,Next,следующий
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard_page.html +17,Next,следующий
 DocType: Warranty Claim,If different than customer address,Если отличается от адреса клиента
 DocType: BOM Operation,BOM Operation,БОМ Операција
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +118,Electropolishing,Електрополирање
 DocType: Purchase Taxes and Charges,On Previous Row Amount,На претходни ред Износ
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +24,Please enter Payment Amount in atleast one row,Молимо вас да унесете Износ уплате у атлеаст једном реду
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +33,Please enter Payment Amount in atleast one row,Молимо вас да унесете Износ уплате у атлеаст једном реду
 DocType: POS Profile,POS Profile,ПОС Профил
 apps/erpnext/erpnext/config/accounts.py +153,"Seasonality for setting budgets, targets etc.","Сезонски за постављање буџети, мете итд"
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +238,Row {0}: Payment Amount cannot be greater than Outstanding Amount,Ров {0}: Плаћање Износ не може бити већи од преосталог износа
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +46,Total Unpaid,Укупно Неплаћено
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +21,Time Log is not billable,Време Пријави се не наплаћују
 apps/erpnext/erpnext/stock/get_item_details.py +128,"Item {0} is a template, please select one of its variants","Ставка {0} је шаблон, изаберите једну од својих варијанти"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +528,Purchaser,Купац
+apps/erpnext/erpnext/public/js/setup_wizard.js +272,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 +71,Please enter the Against Vouchers manually,Молимо Вас да унесете против ваучери ручно
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +107,Please enter the Against Vouchers manually,Молимо Вас да унесете против ваучери ручно
 DocType: SMS Settings,Static Parameters,Статички параметри
 DocType: Purchase Order,Advance Paid,Адванце Паид
 DocType: Item,Item Tax,Ставка Пореска
@@ -3939,14 +3777,12 @@
 apps/erpnext/erpnext/config/crm.py +48,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 +57,Actual Qty is mandatory,Стварна ком је обавезна
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +42,Cross-rolling,Цросс-ваљање
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +132,Credit Card,кредитна картица
+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 +95,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,Молимо вас да унесете таксе и трошкове
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +85,Machining,Обрада
 DocType: Sales Invoice Item,Drop Ship,Дроп Схип
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","Овде можете одржавати детаље породице као име и окупације родитеља, брачног друга и деце"
 DocType: Hub Settings,Seller Name,Продавац Име
@@ -3956,7 +3792,7 @@
 DocType: Stock Entry,Repack,Препаковати
 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/setup/page/setup_wizard/setup_wizard.js +500,Attach Logo,Прикрепите логотип
+apps/erpnext/erpnext/public/js/setup_wizard.js +246,Attach Logo,Прикрепите логотип
 DocType: Customer,Commission Rate,Комисија Оцени
 apps/erpnext/erpnext/stock/doctype/item/item.js +38,Make Variant,Маке Вариант
 apps/erpnext/erpnext/config/hr.py +145,Block leave applications by department.,Блок оставите апликације по одељењу.
@@ -3971,19 +3807,19 @@
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +105,Please select a csv file,Изаберите ЦСВ датотеку
 DocType: Dropbox Backup,Send Backups to Dropbox,Пошаљи Бацкупи на Дропбок
 DocType: Purchase Order,To Receive and Bill,За примање и Бил
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +94,Designer,дизајнер
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Designer,дизајнер
 apps/erpnext/erpnext/config/selling.py +121,Terms and Conditions Template,Услови коришћења шаблона
 DocType: Serial No,Delivery Details,Достава Детаљи
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +383,Cost Center is required in row {0} in Taxes table for type {1},МВЗ требуется в строке {0} в виде налогов таблицы для типа {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +386,Cost Center is required in row {0} in Taxes table for type {1},МВЗ требуется в строке {0} в виде налогов таблицы для типа {1}
 DocType: Item,Automatically create Material Request if quantity falls below this level,Аутоматско креирање Материал захтев ако количина падне испод тог нивоа
 ,Item-wise Purchase Register,Тачка-мудар Куповина Регистрација
 DocType: Batch,Expiry Date,Датум истека
-apps/erpnext/erpnext/stock/doctype/item/item.py +375,"To set reorder level, item must be a Purchase Item or Manufacturing Item",Да бисте поставили ниво преусмеравање тачка мора бити Куповина јединица или Производња артикла
+apps/erpnext/erpnext/stock/doctype/item/item.py +379,"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.,Пројекат господар.
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,Не показују као симбол $ итд поред валутама.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +330, (Half Day),(Пола дана)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +374, (Half Day),(Пола дана)
 DocType: Supplier,Credit Days,Кредитни Дана
 DocType: Leave Type,Is Carry Forward,Је напред Царри
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +478,Get Items from BOM,Се ставке из БОМ
@@ -3991,7 +3827,7 @@
 apps/erpnext/erpnext/config/manufacturing.py +120,Bill of Materials,Саставница
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +77,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Ред {0}: Партија Тип и Странка је потребно за примања / обавезе рачуна {1}
 DocType: Dropbox Backup,Send Notifications To,Слање обавештења
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html +26,Ref Date,Реф Датум
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +54,Ref Date,Реф Датум
 DocType: Employee,Reason for Leaving,Разлог за напуштање
 DocType: Expense Claim Detail,Sanctioned Amount,Санкционисани Износ
 DocType: GL Entry,Is Opening,Да ли Отварање
@@ -3999,4 +3835,3 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +188,Account {0} does not exist,Счет {0} не существует
 DocType: Account,Cash,Готовина
 DocType: Employee,Short biography for website and other publications.,Кратка биографија за сајт и других публикација.
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +31,Please create Salary Structure for employee {0},"Пожалуйста, создайте Зарплата Структура для работника {0}"
diff --git a/erpnext/translations/sv.csv b/erpnext/translations/sv.csv
index ef7f88c..54b50cb 100644
--- a/erpnext/translations/sv.csv
+++ b/erpnext/translations/sv.csv
@@ -1,13 +1,12 @@
 DocType: Employee,Salary Mode,Lön Läge
 DocType: Cost Center,"Select Monthly Distribution, if you want to track based on seasonality.","Välj Månads Distribution, om du vill spåra beroende på årstider."
 DocType: Employee,Divorced,Skild
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +86,Warning: Same item has been entered multiple times.,Varning: Samma objekt har angetts flera gånger.
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +80,Warning: Same item has been entered multiple times.,Varning: Samma objekt har angetts flera gånger.
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +96,Items already synced,Produkter redan synkroniserade
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,Tillåt Punkt som ska läggas till flera gånger i en transaktion
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,Avbryt Material {0} innan du avbryter denna garantianspråk
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +19,Consumer Products,Konsumentprodukter
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,Konsumentprodukter
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +68,Please select Party Type first,Välj Partityp först
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +90,Annealing,Glödgning
 DocType: Item,Customer Items,Kundartiklar
 apps/erpnext/erpnext/accounts/doctype/account/account.py +45,Account {0}: Parent account {1} can not be a ledger,Kontot {0}: Förälder kontot {1} kan inte vara en liggare
 DocType: Item,Publish Item to hub.erpnext.com,Publish Post som hub.erpnext.com
@@ -20,15 +19,14 @@
 DocType: About Us Settings,Website,Webbplats
 DocType: POS Profile,Applicable for User,Tillämplig för Användare
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +169,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Stoppad produktionsorder kan inte återkallas, unstop det första att avbryta"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +23,Compaction plus sintering,Vibrator plus sintring
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,Currency is required for Price List {0},Valuta krävs för prislista {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Kommer att beräknas i transaktionen.
 DocType: Purchase Order,Customer Contact,Kundkontakt
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +549,From Material Request,Från Materialförfrågan
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +572,From Material Request,Från Materialförfrågan
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} Trä
 DocType: Job Applicant,Job Applicant,Arbetssökande
 apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,Inga fler resultat.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +78,Legal,Rättslig
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +34,Legal,Rättslig
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +114,Actual type tax cannot be included in Item rate in row {0},Verklig typskatt kan inte ingå i produktomsättning i rad {0}
 DocType: C-Form,Customer,Kunden
 DocType: Purchase Receipt Item,Required By,Krävs av
@@ -43,7 +41,6 @@
 DocType: Manufacturing Settings,Default 10 mins,Standard 10 minuter
 DocType: Leave Type,Leave Type Name,Ledighetstyp namn
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +148,Series Updated Successfully,Serie uppdaterats
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +150,Stitching,Sömmar
 DocType: Pricing Rule,Apply On,Applicera på
 DocType: Item Price,Multiple Item prices.,Flera produktpriser.
 ,Purchase Order Items To Be Received,Inköpsorder Artiklar att ta emot
@@ -51,8 +48,8 @@
 DocType: Quality Inspection Reading,Parameter,Parameter
 apps/erpnext/erpnext/projects/doctype/project/project.py +43,Expected End Date can not be less than Expected Start Date,Förväntad Slutdatum kan inte vara mindre än förväntat startdatum
 apps/erpnext/erpnext/utilities/transaction_base.py +104,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Rad # {0}: Pris måste vara samma som {1}: {2} ({3} / {4})
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +189,New Leave Application,Ny Ledighets ansökningan
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +134,Bank Draft,Bankväxel
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +204,New Leave Application,Ny Ledighets ansökningan
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +134,Bank Draft,Bankväxel
 DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,"1. För att upprätthålla kunden unika prodkt kod och att göra den sökbar baseras på deras kod, använd detta alternativ"
 DocType: Mode of Payment Account,Mode of Payment Account,Betalningssätt konto
 apps/erpnext/erpnext/stock/doctype/item/item.js +34,Show Variants,Visar varianter
@@ -64,25 +61,23 @@
 DocType: Production Plan Item,Production Plan Item,Produktionsplan för artikel
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +141,User {0} is already assigned to Employee {1},Användare {0} är redan tilldelad anställd {1}
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +13,Make new POS Profile,Skapa ny POS Profil
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +31,Health Care,Sjukvård
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,Sjukvård
 DocType: Purchase Invoice,Monthly,Månadsvis
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +66,Delay in payment (Days),Försenad betalning (dagar)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +494,Invoice,Faktura
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +519,Invoice,Faktura
 DocType: Maintenance Schedule Item,Periodicity,Periodicitet
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +357,Email Address,E-Postadress
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +21,Defense,Försvar
+apps/erpnext/erpnext/public/js/setup_wizard.js +107,Email Address,E-Postadress
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,Försvar
 DocType: Company,Abbr,Förkortning
 DocType: Appraisal Goal,Score (0-5),Poäng (0-5)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +193,Row {0}: {1} {2} does not match with {3},Rad {0}: {1} {2} matchar inte med {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +67,Row # {0}:,Rad # {0}:
 DocType: Delivery Note,Vehicle No,Fordons nr
 apps/erpnext/erpnext/public/js/pos/pos.js +528,Please select Price List,Välj Prislista
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +162,Woodworking,Träbearbetning
 DocType: Production Order Operation,Work In Progress,Pågående Arbete
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +153,3D printing,3D-utskrift
 DocType: Employee,Holiday List,Holiday Lista
 DocType: Time Log,Time Log,Tid Log
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +530,Accountant,Revisor
+apps/erpnext/erpnext/public/js/setup_wizard.js +274,Accountant,Revisor
 DocType: Cost Center,Stock User,Lager Användar
 DocType: Company,Phone No,Telefonnr
 DocType: Time Log,"Log of Activities performed by users against Tasks that can be used for tracking time, billing.","Loggar av aktiviteter som utförs av användare mot uppgifter som kan användas för att spåra tid, fakturering."
@@ -98,18 +93,19 @@
 DocType: Bin,Quantity Requested for Purchase,Mängder som begärs för inköp
 DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name","Bifoga CSV-fil med två kolumner, en för det gamla namnet och en för det nya namnet"
 DocType: Packed Item,Parent Detail docname,Överordnat Detalj doknamn
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Kg,Kg
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Kg,Kg
 apps/erpnext/erpnext/config/hr.py +48,Opening for a Job.,Öppning för ett jobb.
 DocType: Item Attribute,Increment,Inkrement
 apps/erpnext/erpnext/public/js/stock_analytics.js +63,Select Warehouse...,Välj Warehouse ...
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +6,Advertising,Reklam
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,Reklam
+apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,Samma Företaget anges mer än en gång
 DocType: Employee,Married,Gift
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +389,Stock cannot be updated against Delivery Note {0},Stock kan inte uppdateras mot följesedel {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +391,Stock cannot be updated against Delivery Note {0},Stock kan inte uppdateras mot följesedel {0}
 DocType: Payment Reconciliation,Reconcile,Avstämma
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +30,Grocery,Matvaror
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,Matvaror
 DocType: Quality Inspection Reading,Reading 1,Avläsning 1
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Make Bank Entry,Skapa Bank inlägg
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +40,Pension Funds,Pensionsfonder
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,Pensionsfonder
 apps/erpnext/erpnext/accounts/doctype/account/account.py +142,Warehouse is mandatory if account type is Warehouse,Lagret är obligatoriskt om kontotyp är Lager
 DocType: SMS Center,All Sales Person,Alla försäljningspersonal
 DocType: Lead,Person Name,Namn
@@ -131,7 +127,7 @@
 DocType: Quality Inspection,Get Specification Details,Hämta Specifikation Detaljer
 DocType: Lead,Interested,Intresserad
 apps/erpnext/erpnext/config/manufacturing.py +14,Bill of Material,Bill of Material
-apps/erpnext/erpnext/public/js/stock_analytics.js +45,Opening,Öppning
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +158,Opening,Öppning
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},Från {0} till {1}
 DocType: Item,Copy From Item Group,Kopiera från artikelgrupp
 DocType: Journal Entry,Opening Entry,Öppnings post
@@ -145,23 +141,22 @@
 DocType: Employee Education,Under Graduate,Enligt Graduate
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +22,Target On,Mål på
 DocType: BOM,Total Cost,Total Kostnad
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +99,Reaming,Brotschning
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +9,Activity Log:,Aktivitets Logg:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +199,Item {0} does not exist in the system or has expired,Objektet existerar inte {0} i systemet eller har löpt ut
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +44,Real Estate,Fastighet
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +44,Real Estate,Fastighet
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +4,Statement of Account,Kontoutdrag
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +41,Pharmaceuticals,Läkemedel
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,Läkemedel
 DocType: Expense Claim Detail,Claim Amount,Fordringsbelopp
 DocType: Employee,Mr,Herr
 DocType: Custom Script,Client,Klient
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,Leverantör Typ / leverantör
 DocType: Naming Series,Prefix,Prefix
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Consumable,Förbrukningsartiklar
+apps/erpnext/erpnext/public/js/setup_wizard.js +359,Consumable,Förbrukningsartiklar
 DocType: Upload Attendance,Import Log,Import logg
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.js +19,Send,Skicka
 DocType: Sales Invoice Item,Delivered By Supplier,Levereras av Supplier
 DocType: SMS Center,All Contact,Alla Kontakter
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +164,Annual Salary,Årslön
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +164,Annual Salary,Årslön
 DocType: Period Closing Voucher,Closing Fiscal Year,Stänger Räkenskapsårets
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +69,Stock Expenses,Stock Kostnader
 DocType: Newsletter,Email Sent?,E-post Skickat?
@@ -169,26 +164,24 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +92,Show Time Logs,Visa Time Loggar
 DocType: Journal Entry Account,Credit in Company Currency,Kredit i bolaget Valuta
 DocType: Delivery Note,Installation Status,Installationsstatus
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +115,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Godkända + Avvisad Antal måste vara lika med mottagna kvantiteten för punkt {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +118,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Godkända + Avvisad Antal måste vara lika med mottagna kvantiteten för punkt {0}
 DocType: Item,Supply Raw Materials for Purchase,Leverera råvaror för köp
 apps/erpnext/erpnext/stock/get_item_details.py +133,Item {0} must be a Purchase Item,Produkt {0} måste vara en beställningsprodukt
 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","Hämta mallen, fyll lämpliga uppgifter och bifoga den modifierade filen. Alla datum och anställdas kombinationer i den valda perioden kommer i mallen, med befintliga närvaroutdrag"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +446,Item {0} is not active or end of life has been reached,Produkt {0} är inte aktiv eller uttjänta har nåtts
 DocType: Time Log Batch,Will be updated after Sales Invoice is Submitted.,Kommer att uppdateras efter fakturan skickas.
-apps/erpnext/erpnext/controllers/accounts_controller.py +493,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Om du vill inkludera skatt i rad {0} i punkt hastighet, skatter i rader {1} måste också inkluderas"
+apps/erpnext/erpnext/controllers/accounts_controller.py +494,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Om du vill inkludera skatt i rad {0} i punkt hastighet, skatter i rader {1} måste också inkluderas"
 apps/erpnext/erpnext/config/hr.py +90,Settings for HR Module,Inställningar för HR-modul
 DocType: SMS Center,SMS Center,SMS Center
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +78,Straightening,Räta
 DocType: BOM Replace Tool,New BOM,Ny BOM
 apps/erpnext/erpnext/config/projects.py +28,Batch Time Logs for billing.,Batch tidsloggar för fakturering.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +15,Countergravity casting,Antigravitions gjutning
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +30,Newsletter has already been sent,Nyhetsbrev har redan skickats
 DocType: Lead,Request Type,Typ av förfrågan
 DocType: Leave Application,Reason,Anledning
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +14,Broadcasting,Sändning
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +140,Execution,Exekvering
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +364,The first user will become the System Manager (you can change this later).,Den första användaren blir System Manager (du kan ändra detta senare).
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,Sändning
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +140,Execution,Exekvering
+apps/erpnext/erpnext/public/js/setup_wizard.js +114,The first user will become the System Manager (you can change this later).,Den första användaren blir System Manager (du kan ändra detta senare).
 apps/erpnext/erpnext/config/manufacturing.py +39,Details of the operations carried out.,Detaljer om de åtgärder som genomförs.
 DocType: Serial No,Maintenance Status,Underhåll Status
 apps/erpnext/erpnext/config/stock.py +263,Items and Pricing,Produkter och prissättning
@@ -205,7 +198,6 @@
 DocType: Pricing Rule,Discount on Price List Rate (%),Rabatt på Prislista Andel (%)
 apps/frappe/frappe/public/js/frappe/form/print.js +96,Start,Start
 DocType: User,First Name,Förnamn
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +12,Full-mold casting,Full-formgjutning
 DocType: Offer Letter,Select Terms and Conditions,Välj Villkor
 DocType: Production Planning Tool,Sales Orders,Kundorder
 DocType: Purchase Taxes and Charges,Valuation,Värdering
@@ -217,8 +209,7 @@
 DocType: Bank Reconciliation,Bank Account,Bankkonto
 DocType: Leave Type,Allow Negative Balance,Tillåt negativt saldo
 DocType: Selling Settings,Default Territory,Standard Område
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +53,Television,Tv
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +138,Gashing,Gashing
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,Tv
 DocType: Production Order Operation,Updated via 'Time Log',Uppdaterad via &quot;Time Log&quot;
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +82,Account {0} does not belong to Company {1},Kontot {0} tillhör inte ett företag {1}
 DocType: Naming Series,Series List for this Transaction,Serie Lista för denna transaktion
@@ -233,14 +224,13 @@
 DocType: Leave Allocation,Add unused leaves from previous allocations,Lägg oanvända blad från tidigare tilldelningar
 apps/erpnext/erpnext/controllers/recurring_document.py +206,Next Recurring {0} will be created on {1},Nästa Återkommande {0} kommer att skapas på {1}
 DocType: Newsletter List,Total Subscribers,Totalt Medlemmar
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +575,Contact Name,Kontaktnamn
+,Contact Name,Kontaktnamn
 DocType: Production Plan Item,SO Pending Qty,SO Väntar Antal
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Skapar lönebesked för ovan nämnda kriterier.
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,Begäran om köp.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +107,Double housing,Dubbel hölje
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +156,Only the selected Leave Approver can submit this Leave Application,Endast den valda Ledighets ansvarig kan lämna denna ledighets applikationen
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +171,Only the selected Leave Approver can submit this Leave Application,Endast den valda Ledighets ansvarig kan lämna denna ledighets applikationen
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,Avgångs Datum måste vara större än Datum för anställningsdatum
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +172,Leaves per Year,Avgångar per år
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +172,Leaves per Year,Avgångar per år
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup > Settings > Naming Series,Ställ in namnserie för {0} via Inställningar> Inställningar> Namnge Serier
 DocType: Time Log,Will be updated when batched.,Kommer att uppdateras när den tillverkas.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +104,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,"Rad {0}: Kontrollera ""Är i förskott"" mot konto {1} om det är ett förskotts post."
@@ -249,25 +239,24 @@
 DocType: Item Website Specification,Item Website Specification,Produkt hemsidespecifikation
 DocType: Dropbox Backup,Dropbox Access Key,Dropbox Åtkomstnyckel
 DocType: Payment Tool,Reference No,Referensnummer
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +348,Leave Blocked,Lämna Blockerad
-apps/erpnext/erpnext/stock/doctype/item/item.py +535,Item {0} has reached its end of life on {1},Punkt {0} har nått slutet av sin livslängd på {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +392,Leave Blocked,Lämna Blockerad
+apps/erpnext/erpnext/stock/doctype/item/item.py +539,Item {0} has reached its end of life on {1},Punkt {0} har nått slutet av sin livslängd på {1}
 apps/erpnext/erpnext/accounts/utils.py +339,Annual,Årlig
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Lager Avstämning Punkt
 DocType: Stock Entry,Sales Invoice No,Försäljning Faktura nr
 DocType: Material Request Item,Min Order Qty,Min Order kvantitet
 DocType: Lead,Do Not Contact,Kontakta ej
 DocType: Sales Invoice,The unique id for tracking all recurring invoices. It is generated on submit.,Den unika ID för att spåra alla återkommande fakturor. Det genereras på skicka.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +93,Software Developer,Mjukvaruutvecklare
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +93,Software Developer,Mjukvaruutvecklare
 DocType: Item,Minimum Order Qty,Minimum Antal
 DocType: Pricing Rule,Supplier Type,Leverantör Typ
 DocType: Item,Publish in Hub,Publicera i Hub
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +555,Item {0} is cancelled,Punkt {0} avbryts
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +598,Material Request,Materialförfrågan
+apps/erpnext/erpnext/stock/doctype/item/item.py +559,Item {0} is cancelled,Punkt {0} avbryts
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +607,Material Request,Materialförfrågan
 DocType: Bank Reconciliation,Update Clearance Date,Uppdatera Clearance Datum
 DocType: Item,Purchase Details,Inköpsdetaljer
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +323,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},"Produkt  {0} hittades inte i ""råvaror som levereras""  i beställning {1}"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +129,Wire brushing,Stålborstning
 DocType: Employee,Relation,Förhållande
 DocType: Shipping Rule,Worldwide Shipping,Världsomspännande sändnings
 apps/erpnext/erpnext/config/selling.py +23,Confirmed orders from Customers.,Bekräftade ordrar från kunder.
@@ -283,12 +272,11 @@
 DocType: Supplier,Address HTML,Adress HTML
 DocType: Lead,Mobile No.,Mobilnummer.
 DocType: Maintenance Schedule,Generate Schedule,Generera Schema
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +81,Hubbing,Hubbing
 DocType: Purchase Invoice Item,Expense Head,Utgiftshuvud
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +86,Please select Charge Type first,Välj Avgiftstyp först
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,Senaste
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +395,Max 5 characters,Max 5 tecken
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +195,Select Your Language,Välj Ditt Språk
+apps/erpnext/erpnext/public/js/setup_wizard.js +143,Max 5 characters,Max 5 tecken
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +245,Select Your Language,Välj Ditt Språk
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,Den första Lämna godkännare i listan kommer att anges som standard Lämna godkännare
 DocType: Manufacturing Settings,"Disables creation of time logs against Production Orders.
 Operations shall not be tracked against Production Order",Inaktiverar skapandet av tids stockar mot produktionsorder . Verksamheten får inte spåras mot produktionsorder
@@ -300,8 +288,6 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +34,Item {0} must be Service Item,Produkt  {0} måste vara serviceprodukt
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +303,Completed Qty can not be greater than 'Qty to Manufacture',"Avslutade Antal kan inte vara större än ""antal för Tillverkning '"
 DocType: DocType,Administrator,Administratör
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +136,Laser drilling,Laserborrning
-DocType: Stock UOM Replace Utility,New Stock UOM,Ny Lager UOM
 DocType: Period Closing Voucher,Closing Account Head,Stänger Konto Huvud
 DocType: Employee,External Work History,Extern Arbetserfarenhet
 apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,Cirkelreferens fel
@@ -310,18 +296,15 @@
 DocType: Lead,Industry,Industri
 DocType: Employee,Job Profile,Jobbprofilen
 DocType: Newsletter,Newsletter,Nyhetsbrev
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +84,Hydroforming,Hydroformning
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +49,Necking,Insnörning
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Meddela via e-post om skapandet av automatisk Material Begäran
 DocType: Journal Entry,Multi Currency,Flera valutor
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +51,Item is updated,Produkten uppdateras
 DocType: Async Task,System Manager,System Manager
 DocType: Payment Reconciliation Invoice,Invoice Type,Faktura Typ
 DocType: Sales Invoice Item,Delivery Note,Följesedel
 DocType: Dropbox Backup,Allow Dropbox Access,Tillåt Dropbox Tillgång
 apps/erpnext/erpnext/config/learn.py +72,Setting up Taxes,Ställa in skatter
 apps/erpnext/erpnext/accounts/utils.py +189,Payment Entry has been modified after you pulled it. Please pull it again.,Betalningsposten har ändrats efter att du hämtade den. Vänligen hämta igen.
-apps/erpnext/erpnext/stock/doctype/item/item.py +343,{0} entered twice in Item Tax,{0} inlagd två gånger under punkten Skatt
+apps/erpnext/erpnext/stock/doctype/item/item.py +347,{0} entered twice in Item Tax,{0} inlagd två gånger under punkten Skatt
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +105,Summary for this week and pending activities,Sammanfattning för denna vecka och pågående aktiviteter
 DocType: Workstation,Rent Cost,Hyr Kostnad
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +74,Please select month and year,Välj månad och år
@@ -338,23 +321,21 @@
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,I takt med vilket kundens Valuta omvandlas till kundens basvaluta
 DocType: Features Setup,"Available in BOM, Delivery Note, Purchase Invoice, Production Order, Purchase Order, Purchase Receipt, Sales Invoice, Sales Order, Stock Entry, Timesheet","Finns i BOM, följesedel, Inköp Faktura, produktionsorder, inköpsorder, inköpskvitto, Försäljning Faktura, kundorder, införande i lager, Tidrapport"
 DocType: Item Tax,Tax Rate,Skattesats
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Select Item,Välj Punkt
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +540,Select Item,Välj Punkt
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +143,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","Produkt: {0} förvaltade satsvis, kan inte förenas med \ Lagersammansättning, använd istället Lageranteckning"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +259,Purchase Invoice {0} is already submitted,Inköpsfakturan {0} är redan lämnad
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +262,Purchase Invoice {0} is already submitted,Inköpsfakturan {0} är redan lämnad
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Batch No must be same as {1} {2},Rad # {0}: Batch nr måste vara samma som {1} {2}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Convert to non-Group,Konvertera till icke-gruppen
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +55,Purchase Receipt must be submitted,Inköpskvitto måste lämnas in
-DocType: Stock UOM Replace Utility,Current Stock UOM,Nuvarande lager UOM
 apps/erpnext/erpnext/config/stock.py +53,Batch (lot) of an Item.,Batch (parti) i en punkt.
 DocType: C-Form Invoice Detail,Invoice Date,Fakturadatum
 DocType: GL Entry,Debit Amount,Debit Belopp
 apps/erpnext/erpnext/accounts/party.py +223,There can only be 1 Account per Company in {0} {1},Det kan bara finnas ett konto per Company i {0} {1}
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Your email address,Din e-postadress
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +194,Please see attachment,Se bifogad fil
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +203,Please see attachment,Se bifogad fil
 DocType: Purchase Order,% Received,% Emot
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +109,Water jet cutting,Vattenskärning
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +24,Setup Already Complete!!,Inställning Redan Komplett !!
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +20,Setup Already Complete!!,Inställning Redan Komplett !!
 ,Finished Goods,Färdiga Varor
 DocType: Delivery Note,Instructions,Instruktioner
 DocType: Quality Inspection,Inspected By,Inspekteras av
@@ -369,6 +350,7 @@
 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.,Vänligen skapa inte konton för kunder och leverantörer. De skapas direkt från kund / leverantörsledning.
 DocType: Currency Exchange,Currency Exchange,Valutaväxling
 DocType: Purchase Invoice Item,Item Name,Produktnamn
+DocType: Authorization Rule,Approving User  (above authorized value),Godkännande Användare (ovan auktoriserad värde)
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Credit Balance,Tillgodohavande
 DocType: Employee,Widowed,Änka
 DocType: Production Planning Tool,"Items to be requested which are ""Out of Stock"" considering all warehouses based on projected qty and minimum order qty","Produkter som skall begäras som är ""Slut på lagret"" med tanke på alla lager på kalkylerade antal och minsta beställningsantal"
@@ -378,11 +360,10 @@
 ,Purchase Register,Inköpsregistret
 DocType: Landed Cost Item,Applicable Charges,Tillämpliga avgifter
 DocType: Workstation,Consumable Cost,Förbrukningsartiklar Kostnad
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,{0} ({1}) must have role 'Leave Approver',"{0} ({1}) måste ha rollen ""Ledighetsgodkännare"""
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +167,{0} ({1}) must have role 'Leave Approver',"{0} ({1}) måste ha rollen ""Ledighetsgodkännare"""
 DocType: Purchase Receipt,Vehicle Date,Fordons Datum
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +39,Medical,Medicinsk
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +39,Medical,Medicinsk
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,Anledning till att förlora
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +36,Tube beading,Tube beading
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},Arbetsstation är stängd på följande datum enligt kalender: {0}
 DocType: Employee,Single,Singel
 DocType: Issue,Attachment,Bifogning
@@ -403,10 +384,8 @@
 DocType: Account,Is Group,Är grupperad
 DocType: Stock Settings,Automatically Set Serial Nos based on FIFO,Automatiskt Serial Nos baserat på FIFO
 DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,Kontrollera Leverantörens unika Fakturanummer 
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +31,Thermoforming,Termoformning
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +66,Slitting,Skärsystem
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +57,'To Case No.' cannot be less than 'From Case No.',"""Till Ärende nr."" kan inte vara mindre än ""Från ärende nr"""
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +104,Non Profit,Välgörenhets
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +104,Non Profit,Välgörenhets
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_list.js +7,Not Started,Inte Startat
 DocType: Lead,Channel Partner,Kanalpartner
 DocType: Account,Old Parent,Gammalt mål
@@ -415,13 +394,12 @@
 apps/erpnext/erpnext/config/manufacturing.py +74,Global settings for all manufacturing processes.,Globala inställningar för alla tillverkningsprocesser.
 DocType: Accounts Settings,Accounts Frozen Upto,Konton frysta upp till
 DocType: SMS Log,Sent On,Skickas på
-apps/erpnext/erpnext/stock/doctype/item/item.py +512,Attribute {0} selected multiple times in Attributes Table,Attribut {0} valda flera gånger i attribut Tabell
+apps/erpnext/erpnext/stock/doctype/item/item.py +516,Attribute {0} selected multiple times in Attributes Table,Attribut {0} valda flera gånger i attribut Tabell
 DocType: Sales Order,Not Applicable,Inte Tillämpbar
 apps/erpnext/erpnext/config/hr.py +140,Holiday master.,Semester topp.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +19,Shell molding,Skalformning
 DocType: Material Request Item,Required Date,Obligatorisk Datum
 DocType: Delivery Note,Billing Address,Fakturaadress
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +644,Please enter Item Code.,Ange Artikelkod.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +648,Please enter Item Code.,Ange Artikelkod.
 DocType: BOM,Costing,Kostar
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount","Om markerad, kommer skattebeloppet anses redan ingå i Skriv värdet / Skriv beloppet"
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,Totalt Antal
@@ -431,7 +409,7 @@
 DocType: Item Attribute,To Range,Range
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Värdepapper och inlåning
 DocType: Features Setup,Imports,Import
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +144,Adhesive bonding,Limning
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +77,Total leaves allocated is mandatory,Totalt blad tilldelats är obligatorisk
 DocType: Job Opening,Description of a Job Opening,Beskrivning av ett jobb
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +102,Pending activities for today,I avvaktan på aktiviteter för dag
 apps/erpnext/erpnext/config/hr.py +28,Attendance record.,Närvaro lista
@@ -439,26 +417,25 @@
 DocType: Sales Order Item,Used for Production Plan,Används för produktionsplan
 DocType: System Settings,Loading...,Laddar ...
 DocType: DocField,Password,Lösenord
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +155,Fused deposition modeling,Fused Deposition modellering
 DocType: Manufacturing Settings,Time Between Operations (in mins),Time Between Operations (i minuter)
 DocType: Customer,Buyer of Goods and Services.,Köpare av varor och tjänster.
 DocType: Journal Entry,Accounts Payable,Leverantörsreskontra
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +24,Add Subscribers,Lägg till Abonnenter
 apps/erpnext/erpnext/public/js/feature_setup.js +220,""" does not exists",&quot;Existerar inte
 DocType: Pricing Rule,Valid Upto,Giltig Upp till
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +564,List a few of your customers. They could be organizations or individuals.,Lista några av dina kunder. De kunde vara organisationer eller privatpersoner.
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,List a few of your customers. They could be organizations or individuals.,Lista några av dina kunder. De kunde vara organisationer eller privatpersoner.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Direct Income,Direkt inkomst
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +33,"Can not filter based on Account, if grouped by Account","Kan inte filtrera baserat på konto, om grupperad efter konto"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +88,Administrative Officer,Handläggare
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Administrative Officer,Handläggare
 DocType: Payment Tool,Received Or Paid,Erhålls eller betalas
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +318,Please select Company,Välj Företag
 DocType: Stock Entry,Difference Account,Differenskonto
 apps/erpnext/erpnext/projects/doctype/task/task.py +44,Cannot close task as its dependant task {0} is not closed.,Det går inte att stänga uppgiften då dess huvuduppgift {0} inte är stängd.
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +305,Please enter Warehouse for which Material Request will be raised,Ange vilket lager som Material Begäran kommer att anges mot
 DocType: Production Order,Additional Operating Cost,Ytterligare driftkostnader
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +20,Cosmetics,Kosmetika
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,Kosmetika
 DocType: DocField,Type,Typ
-apps/erpnext/erpnext/stock/doctype/item/item.py +417,"To merge, following properties must be same for both items","För att sammanfoga, måste följande egenskaper vara samma för båda objekten"
+apps/erpnext/erpnext/stock/doctype/item/item.py +421,"To merge, following properties must be same for both items","För att sammanfoga, måste följande egenskaper vara samma för båda objekten"
 DocType: Communication,Subject,Ämne
 DocType: Shipping Rule,Net Weight,Nettovikt
 DocType: Employee,Emergency Phone,Nödtelefon
@@ -468,7 +445,6 @@
 DocType: Journal Entry,Difference (Dr - Cr),Skillnad (Dr - Cr)
 DocType: Account,Profit and Loss,Resultaträkning
 apps/erpnext/erpnext/config/stock.py +293,Managing Subcontracting,Hantera Underleverantörer
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +58,New UOM must NOT be of type Whole Number,Ny UOM får inte vara av typen heltal
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Furniture and Fixture,Möbler och Armaturer
 DocType: Quotation,Rate at which Price list currency is converted to company's base currency,I takt med vilket Prislistans valuta omvandlas till företagets basvaluta
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Account {0} does not belong to company: {1},Kontot {0} tillhör inte företaget: {1}
@@ -487,14 +463,14 @@
 DocType: Purchase Invoice,Supplier Invoice No,Leverantörsfaktura Nej
 DocType: Territory,For reference,Som referens
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +154,"Cannot delete Serial No {0}, as it is used in stock transactions","Kan inte ta bort Löpnummer {0}, eftersom det används i aktietransaktioner"
-apps/erpnext/erpnext/public/js/account_tree_grid.js +52,Closing (Cr),Closing (Cr)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +227,Closing (Cr),Closing (Cr)
 DocType: Serial No,Warranty Period (Days),Garantiperiod (dagar)
 DocType: Installation Note Item,Installation Note Item,Installeringsnotis objekt
 ,Pending Qty,Väntar Antal
 DocType: Job Applicant,Thread HTML,Gäng HTML
 DocType: Company,Ignore,Ignorera
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +86,SMS sent to following numbers: {0},SMS skickas till följande nummer: {0}
-apps/erpnext/erpnext/controllers/buying_controller.py +135,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Leverantör Warehouse obligatorisk för underleverantörer inköpskvitto
+apps/erpnext/erpnext/controllers/buying_controller.py +126,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Leverantör Warehouse obligatorisk för underleverantörer inköpskvitto
 DocType: Pricing Rule,Valid From,Giltig Från
 DocType: Sales Invoice,Total Commission,Totalt kommissionen
 DocType: Pricing Rule,Sales Partner,Försäljnings Partner
@@ -502,7 +478,7 @@
 DocType: Monthly Distribution,"**Monthly Distribution** helps you distribute your budget across months if you have seasonality in your business.
 
 To distribute a budget using this distribution, set this **Monthly Distribution** in the **Cost Center**","** Månatlig Distribution ** hjälper dig att distribuera din budget över månader om du har säsonger i din verksamhet. För att fördela en budget med hjälp av denna fördelning, ställ in ** Månatlig Distribution ** i ** Kostnadscenter **"
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +183,No records found in the Invoice table,Inga träffar i Faktura tabellen
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +130,No records found in the Invoice table,Inga träffar i Faktura tabellen
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +20,Please select Company and Party Type first,Välj Företag och parti typ först
 apps/erpnext/erpnext/config/accounts.py +84,Financial / accounting year.,Budget / räkenskapsåret.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","Tyvärr, kan serienumren inte slås samman"
@@ -518,25 +494,25 @@
 DocType: Sales Order,Billing and Delivery Status,Fakturering och leveransstatus
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Återkommande kunder
 DocType: Leave Control Panel,Allocate,Fördela
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +16,Previous,Föregående
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard_page.html +16,Previous,Föregående
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +620,Sales Return,Sales Return
 DocType: Production Planning Tool,Select Sales Orders from which you want to create Production Orders.,Välj kundorder som du vill skapa produktionsorder.
 DocType: Item,Delivered by Supplier (Drop Ship),Levereras av leverantören (Drop Ship)
 apps/erpnext/erpnext/config/hr.py +120,Salary components.,Lönedelar.
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,Databas för potentiella kunder.
+DocType: Authorization Rule,Customer or Item,Kund eller föremål
 apps/erpnext/erpnext/config/crm.py +17,Customer database.,Kunddatabas.
 DocType: Quotation,Quotation To,Offert Till
 DocType: Lead,Middle Income,Medelinkomst
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),Öppning (Cr)
 apps/erpnext/erpnext/accounts/utils.py +193,Allocated amount can not be negative,Avsatt belopp kan inte vara negativ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +123,Tumbling,Trumling
 DocType: Purchase Order Item,Billed Amt,Fakturerat ant.
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,Ett aktuell lagerlokal mot vilken lager noteringar görs.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +92,Reference No & Reference Date is required for {0},Referensnummer och referens Datum krävs för {0}
 DocType: Event,Wednesday,Onsdag
 DocType: Sales Invoice,Customer's Vendor,Kundens Säljare
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +214,Production Order is Mandatory,Produktionsorder är Obligatorisk
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +139,Proposal Writing,Förslagsskrivning
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,Proposal Writing,Förslagsskrivning
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,En annan säljare {0} finns med samma anställningsid
 apps/erpnext/erpnext/stock/stock_ledger.py +336,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},Negativt lager Fel ({6}) till punkt {0} i centrallager {1} på {2} {3} i {4} {5}
 DocType: Fiscal Year Company,Fiscal Year Company,Räkenskapsårets Företag
@@ -559,7 +535,7 @@
 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.","Sedan prissättningsregler filtreras bort baserat på kundens, Customer Group, Territory, leverantör, leverantör typ, kampanj, Sales Partner etc."
 apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.py +179,Please install dropbox python module,Installera dropbox python-modul
 DocType: Employee,Passport Number,Passnummer
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +82,Manager,Chef
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Manager,Chef
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +494,From Purchase Receipt,Från inköpskvitto
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +219,Same item has been entered multiple times.,Samma objekt har angetts flera gånger.
 DocType: SMS Settings,Receiver Parameter,Mottagare Parameter
@@ -567,10 +543,9 @@
 DocType: Sales Person,Sales Person Targets,Försäljnings Person Mål
 apps/frappe/frappe/public/js/frappe/form/workflow.js +116,To,Till
 apps/frappe/frappe/templates/base.html +145,Please enter email address,Ange e-postadress
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +35,End tube forming,Ändröret bildande
 DocType: Production Order Operation,In minutes,På några minuter
 DocType: Issue,Resolution Date,Åtgärds Datum
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +635,Please set default Cash or Bank account in Mode of Payment {0},Ställ in standard Kontant eller bankkonto i betalningssätt {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +637,Please set default Cash or Bank account in Mode of Payment {0},Ställ in standard Kontant eller bankkonto i betalningssätt {0}
 DocType: Selling Settings,Customer Naming By,Kundnamn på
 apps/erpnext/erpnext/accounts/doctype/account/account.js +67,Convert to Group,Konvertera till gruppen
 DocType: Activity Cost,Activity Type,Aktivitetstyp
@@ -578,12 +553,12 @@
 DocType: Customer,Fixed Days,Fasta Dagar
 DocType: Sales Invoice,Packing List,Packlista
 apps/erpnext/erpnext/config/buying.py +28,Purchase Orders given to Suppliers.,Inköprsorder som ges till leverantörer.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +43,Publishing,Publicering
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +43,Publishing,Publicering
 DocType: Activity Cost,Projects User,Projekt Användare
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Consumed,Förbrukat
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +198,{0}: {1} not found in Invoice Details table,{0}: {1} hittades inte i Fakturainformationslistan
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,{0}: {1} not found in Invoice Details table,{0}: {1} hittades inte i Fakturainformationslistan
 DocType: Company,Round Off Cost Center,Avrunda kostnadsställe
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +208,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Servicebesök {0} måste avbrytas innan man kan avbryta kundorder
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +203,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Servicebesök {0} måste avbrytas innan man kan avbryta kundorder
 DocType: Material Request,Material Transfer,Material Transfer
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +56,Opening (Dr),Öppning (Dr)
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},Bokningstidsstämpel måste vara efter {0}
@@ -595,7 +570,6 @@
 DocType: Pricing Rule,Sales Manager,FÖRSÄLJNINGSCHEF
 apps/frappe/frappe/public/js/frappe/model/model.js +492,Rename,Byt namn
 DocType: Journal Entry,Write Off Amount,Avskrivningsbelopp
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +52,Bending,Böjning
 apps/frappe/frappe/core/page/user_permissions/user_permissions.js +246,Allow User,Tillåt användaren
 DocType: Journal Entry,Bill No,Fakturanr
 DocType: Purchase Invoice,Quarterly,Kvartals
@@ -605,17 +579,16 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Please enter item details,Ange produktdetaljer
 DocType: Purchase Receipt,Other Details,Övriga detaljer
 DocType: Account,Accounts,Konton
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +67,Marketing,Marknadsföring
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +65,Straight shearing,Rak skjuvning
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +67,Marketing,Marknadsföring
 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.,Om du vill spåra objekt i försäljnings- och inköps dokument som grundar sig på deras serienummer nos. Detta är kan också användas för att spåra garanti detaljerad information om produkten.
 DocType: Purchase Receipt Item Supplied,Current Stock,Nuvarande lager
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +99,Rejected Warehouse is mandatory against regected item,Avvisade Lager är obligatoriskt mot avvisade artiklar
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +102,Rejected Warehouse is mandatory against regected item,Avvisade Lager är obligatoriskt mot avvisade artiklar
 DocType: Account,Expenses Included In Valuation,Kostnader ingår i rapporten
 DocType: Employee,Provide email id registered in company,Ange E-post ID registrerat i bolaget
 DocType: Hub Settings,Seller City,Säljaren stad
 DocType: Email Digest,Next email will be sent on:,Nästa e-post kommer att skickas på:
 DocType: Offer Letter Term,Offer Letter Term,Erbjudande Brev Villkor
-apps/erpnext/erpnext/stock/doctype/item/item.py +492,Item has variants.,Produkten har varianter.
+apps/erpnext/erpnext/stock/doctype/item/item.py +496,Item has variants.,Produkten har varianter.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Produkt  {0} hittades inte
 DocType: Bin,Stock Value,Stock Värde
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,Tree Typ
@@ -624,10 +597,9 @@
 DocType: Material Request Item,Quantity and Warehouse,Kvantitet och Lager
 DocType: Sales Invoice,Commission Rate (%),Provisionsandel (%)
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +172,"Against Voucher Type must be one of Sales Order, Sales Invoice or Journal Entry","Mot kupongtyp måste vara en av kundorder, försäljningsfakturan eller journalanteckning"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +139,Biomachining,Biomachining
 apps/erpnext/erpnext/setup/utils.py +89,Unable to find exchange rate,Det går inte att hitta växelkurs
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +7,Aerospace,Aerospace
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +19,Welcome,Välkommen
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +7,Aerospace,Aerospace
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +40,Welcome,Välkommen
 DocType: Journal Entry,Credit Card Entry,Kreditkorts logg
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +18,Task Subject,Uppgift Ämne
 apps/erpnext/erpnext/config/stock.py +33,Goods received from Suppliers.,Varor som erhållits från leverantörer.
@@ -650,19 +622,19 @@
 DocType: Employee,Cell Number,Mobilnummer
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Förlorade
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +120,You can not enter current voucher in 'Against Journal Entry' column,Du kan inte ange aktuell kupong i 'Mot Journalposter' kolumnen
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +25,Energy,Energi
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,Energi
 DocType: Opportunity,Opportunity From,Möjlighet Från
 apps/erpnext/erpnext/config/hr.py +33,Monthly salary statement.,Månadslön uttalande.
 DocType: Item Group,Website Specifications,Webbplats Specifikationer
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +205,New Account,Nytt Konto
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +21,{0}: From {0} of type {1},{0}: Från {0} av typen {1}
-apps/erpnext/erpnext/controllers/buying_controller.py +283,Row {0}: Conversion Factor is mandatory,Rad {0}: Omvandlingsfaktor är obligatoriskt
+apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,Rad {0}: Omvandlingsfaktor är obligatoriskt
 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.,Bokföringsposter kan göras mot huvudnoder. Inlägg mot grupper är inte tillåtna.
 DocType: ToDo,High,Hög
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +361,Cannot deactivate or cancel BOM as it is linked with other BOMs,Det går inte att inaktivera eller avbryta BOM eftersom det är kopplat till andra stycklistor
 DocType: Opportunity,Maintenance,Underhåll
 DocType: User,Male,Man
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +182,Purchase Receipt number required for Item {0},Inköpskvitto nummer som krävs för artikel {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +183,Purchase Receipt number required for Item {0},Inköpskvitto nummer som krävs för artikel {0}
 DocType: Item Attribute Value,Item Attribute Value,Produkt Attribut Värde
 apps/erpnext/erpnext/config/crm.py +64,Sales campaigns.,Säljkampanjer.
 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.
@@ -691,10 +663,9 @@
 DocType: Address,Personal,Personligt
 DocType: Expense Claim Detail,Expense Claim Type,Räknings Typ
 DocType: Shopping Cart Settings,Default settings for Shopping Cart,Standardinställningarna för Varukorgen
-apps/erpnext/erpnext/controllers/accounts_controller.py +324,"Journal Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Journalanteckning {0} är kopplad mot Beställning {1}, kolla om det ska dras i förskott i denna faktura."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +13,Biotechnology,Biotechnology
+apps/erpnext/erpnext/controllers/accounts_controller.py +325,"Journal Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Journalanteckning {0} är kopplad mot Beställning {1}, kolla om det ska dras i förskott i denna faktura."
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +13,Biotechnology,Biotechnology
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Office Maintenance Expenses,Kontor underhållskostnader
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +53,Hemming,Hemming
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +66,Please enter Item first,Ange Artikel först
 DocType: Account,Liability,Ansvar
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +62,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Sanktionerade Belopp kan inte vara större än fordringsbelopp i raden {0}.
@@ -707,10 +678,10 @@
 DocType: Company,Default Bank Account,Standard bankkonto
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +47,"To filter based on Party, select Party Type first","För att filtrera baserat på partiet, väljer Party Typ först"
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},"""Uppdatera Stock"" kan inte kontrolleras eftersom produkter som inte levereras via {0}"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Nos,Nos
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Nos,Nos
 DocType: Item,Items with higher weightage will be shown higher,Produkter med högre medelvikt kommer att visas högre
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Bankavstämning Detalj
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +627,My Invoices,Mina Fakturor
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +629,My Invoices,Mina Fakturor
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,Ingen anställd hittades
 DocType: Purchase Order,Stopped,Stoppad
 DocType: Item,If subcontracted to a vendor,Om underleverantörer till en leverantör
@@ -729,35 +700,33 @@
 DocType: Features Setup,"To enable ""Point of Sale"" features",För att aktivera &quot;Point of Sale&quot; funktioner
 DocType: Bin,Moving Average Rate,Rörligt medelvärdes hastighet
 DocType: Production Planning Tool,Select Items,Välj objekt
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,{0} against Bill {1} dated {2},{0} mot räkning {1} ​​daterad {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +328,{0} against Bill {1} dated {2},{0} mot räkning {1} ​​daterad {2}
 DocType: Comment,Reference Name,Referensnamn
 DocType: Maintenance Visit,Completion Status,Slutförande Status
 DocType: Sales Invoice Item,Target Warehouse,Target Lager
 DocType: Item,Allow over delivery or receipt upto this percent,Tillåt överleverans eller mottagande upp till denna procent
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +49,Expected Delivery Date cannot be before Sales Order Date,Förväntad leveransdatum kan inte vara före säljorders datum
 DocType: Upload Attendance,Import Attendance,Import Närvaro
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +17,All Item Groups,Alla artikelgrupper
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +17,All Item Groups,Alla artikelgrupper
 DocType: Process Payroll,Activity Log,Aktivitets Logg
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +30,Net Profit / Loss,Netto Vinst / Förlust
 apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,Komponera meddelandet automatiskt mot uppvisande av transaktioner.
 DocType: Production Order,Item To Manufacture,Produkt för att tillverka
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +16,Permanent mold casting,Permanent formgjutning
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} status är {2}
 apps/erpnext/erpnext/config/learn.py +172,Purchase Order to Payment,Inköpsorder till betalning
 DocType: Sales Order Item,Projected Qty,Projicerad Antal
 DocType: Sales Invoice,Payment Due Date,Förfallodag
 DocType: Newsletter,Newsletter Manager,Nyhetsbrevsansvarig
-apps/erpnext/erpnext/stock/doctype/item/item.js +229,Item Variant {0} already exists with same attributes,Punkt Variant {0} finns redan med samma attribut
+apps/erpnext/erpnext/stock/doctype/item/item.js +231,Item Variant {0} already exists with same attributes,Punkt Variant {0} finns redan med samma attribut
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening',&quot;Öppna&quot;
 DocType: Notification Control,Delivery Note Message,Följesedel Meddelande
 DocType: Expense Claim,Expenses,Kostnader
 DocType: Item Variant Attribute,Item Variant Attribute,Punkt Variant Attribut
 ,Purchase Receipt Trends,Kvitto Trender
 DocType: Appraisal,Select template from which you want to get the Goals,Välj mall som du vill få mål
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +77,Research & Development,Forskning &amp; Utveckling
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Research & Development,Forskning &amp; Utveckling
 ,Amount to Bill,Belopp till fakturera
 DocType: Company,Registration Details,Registreringsdetaljer
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +75,Staking,Utsättning
 DocType: Item,Re-Order Qty,Återuppta Antal
 DocType: Leave Block List Date,Leave Block List Date,Lämna Blockeringslista Datum
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +25,Scheduled to send to {0},Planerad att skicka till {0}
@@ -768,18 +737,16 @@
 DocType: Sales Invoice Item,Stock Details,Lager Detaljer
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Projekt Värde
 apps/erpnext/erpnext/config/selling.py +304,Point-of-Sale,Butiksförsäljnig
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,Cannot carry forward {0},Det går inte att föra fram {0}
 apps/erpnext/erpnext/accounts/doctype/account/account.py +91,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","Kontosaldo redan i Kredit,du är inte tillåten att ställa in ""Balans måste vara"" som ""Debet '"
 DocType: Account,Balance must be,Balans måste vara
 DocType: Hub Settings,Publish Pricing,Publicera prissättning
 DocType: Notification Control,Expense Claim Rejected Message,Räkning avvisas meddelande
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +145,Nailing,Spikning
 ,Available Qty,Tillgång Antal
 DocType: Purchase Taxes and Charges,On Previous Row Total,På föregående v Totalt
 DocType: Salary Slip,Working Days,Arbetsdagar
 DocType: Serial No,Incoming Rate,Inkommande betyg
 DocType: Packing Slip,Gross Weight,Bruttovikt
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +410,The name of your company for which you are setting up this system.,Namnet på ditt företag som du ställer in det här systemet.
+apps/erpnext/erpnext/public/js/setup_wizard.js +158,The name of your company for which you are setting up this system.,Namnet på ditt företag som du ställer in det här systemet.
 DocType: HR Settings,Include holidays in Total no. of Working Days,Inkludera semester i Totalt antal. Arbetsdagar
 DocType: Job Applicant,Hold,Håll
 DocType: Employee,Date of Joining,Datum för att delta
@@ -789,7 +756,6 @@
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +3,View Subscribers,Se Medlemmar
 DocType: Purchase Invoice Item,Purchase Receipt,Inköpskvitto
 ,Received Items To Be Billed,Mottagna objekt som ska faktureras
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +114,Abrasive blasting,Blästring
 DocType: Employee,Ms,Fröken
 apps/erpnext/erpnext/config/accounts.py +148,Currency exchange rate master.,Valutakurs mästare.
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +253,Unable to find Time Slot in the next {0} days for Operation {1},Det går inte att hitta tidslucka i de närmaste {0} dagar för Operation {1}
@@ -801,7 +767,7 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +209,Serial No {0} does not belong to Item {1},Löpnummer {0} inte tillhör punkt {1}
 DocType: Purchase Receipt Item Supplied,Required Qty,Obligatorisk Antal
 DocType: Bank Reconciliation,Total Amount,Totala Summan
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +32,Internet Publishing,Internet Publishing
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,Internet Publishing
 DocType: Production Planning Tool,Production Orders,Produktionsorder
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +35,Balance Value,Balans Värde
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,Försäljning Prislista
@@ -812,7 +778,7 @@
 DocType: Supplier,Default Payable Accounts,Standard avgiftskonton
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,Medarbetare {0} är inte aktiv eller existerar inte
 DocType: Features Setup,Item Barcode,Produkt Streckkod
-apps/erpnext/erpnext/stock/doctype/item/item.py +487,Item Variants {0} updated,Produkt Varianter {0} uppdaterad
+apps/erpnext/erpnext/stock/doctype/item/item.py +491,Item Variants {0} updated,Produkt Varianter {0} uppdaterad
 DocType: Quality Inspection Reading,Reading 6,Avläsning 6
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Inköpsfakturan Advancerat
 DocType: Address,Shop,Shop
@@ -821,7 +787,7 @@
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,Standard Bank / Kontant konto kommer att uppdateras automatiskt i POS faktura när detta läge är valt.
 DocType: Employee,Permanent Address Is,Permanent Adress är
 DocType: Production Order Operation,Operation completed for how many finished goods?,Driften färdig för hur många färdiga varor?
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +491,The Brand,Varumärket
+apps/erpnext/erpnext/public/js/setup_wizard.js +237,The Brand,Varumärket
 apps/erpnext/erpnext/controllers/status_updater.py +163,Allowance for over-{0} crossed for Item {1}.,Ersättning för över {0} korsade till punkt {1}.
 DocType: Employee,Exit Interview Details,Avsluta intervju Detaljer
 DocType: Item,Is Purchase Item,Är beställningsobjekt
@@ -841,16 +807,16 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Indirect Income,Indirekt inkomst
 DocType: Payment Tool,Set Payment Amount = Outstanding Amount,Ställ Betalningsbelopp = utestående belopp
 DocType: Contact Us Settings,Address Line 1,Adress Linje 1
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Variance,Varians
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +392,Company Name,Företagsnamn
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +53,Variance,Varians
+,Company Name,Företagsnamn
 DocType: SMS Center,Total Message(s),Totalt Meddelande (er)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +515,Select Item for Transfer,Välj föremål för Transfer
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +538,Select Item for Transfer,Välj föremål för Transfer
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,Visa en lista över alla hjälp videos
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,"Välj konto chefen för banken, där kontrollen avsattes."
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,Tillåt användare att redigera prislista i transaktioner
 DocType: Pricing Rule,Max Qty,Max Antal
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +106,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Rad {0}: Betalning mot Försäljning / inköpsorder bör alltid märkas i förskott
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +16,Chemical,Kemisk
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,Kemisk
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +693,All items have already been transferred for this Production Order.,Alla objekt har redan överförts till denna produktionsorder.
 DocType: Process Payroll,Select Payroll Year and Month,Välj Lön År och Månad
 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""","Gå till lämplig grupp (vanligtvis Tillämpning av fonder> Omsättningstillgångar> bankkonton och skapa ett nytt konto (genom att klicka på Lägg till typ) av typen ""Bank"""
@@ -861,12 +827,12 @@
 DocType: Item,Inspection Criteria,Inspektionskriterier
 apps/erpnext/erpnext/config/accounts.py +101,Tree of finanial Cost Centers.,Tree of finanial kostnadsställen.
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,Överfört
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +492,Upload your letter head and logo. (you can edit them later).,Ladda upp din brevhuvud och logotyp. (Du kan redigera dem senare).
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +156,White,Vit
+apps/erpnext/erpnext/public/js/setup_wizard.js +238,Upload your letter head and logo. (you can edit them later).,Ladda upp din brevhuvud och logotyp. (Du kan redigera dem senare).
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,White,Vit
 DocType: SMS Center,All Lead (Open),Alla Ledare (Öppna)
 DocType: Purchase Invoice,Get Advances Paid,Få utbetalda förskott
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +362,Attach Your Picture,Bifoga din bild
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Make ,Göra
+apps/erpnext/erpnext/public/js/setup_wizard.js +112,Attach Your Picture,Bifoga din bild
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +540,Make ,Göra
 DocType: Journal Entry,Total Amount in Words,Total mängd i ord
 DocType: Workflow State,Stop,Stoppa
 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.,Det var ett problem. En trolig orsak kan vara att du inte har sparat formuläret. Vänligen kontakta support@erpnext.com om problemet kvarstår.
@@ -875,14 +841,13 @@
 DocType: Lead,Next Contact Date,Nästa Kontakt Datum
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,Öppning Antal
 DocType: Holiday List,Holiday List Name,Semester Listnamn
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +168,Stock Options,Optioner
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +168,Stock Options,Optioner
 DocType: Journal Entry Account,Expense Claim,Utgiftsräkning
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +181,Qty for {0},Antal för {0}
 DocType: Leave Application,Leave Application,Ledighetsansöknan
 apps/erpnext/erpnext/config/hr.py +77,Leave Allocation Tool,Ledighet Tilldelningsverktyget
 DocType: Leave Block List,Leave Block List Dates,Lämna Block Lista Datum
 DocType: Company,If Monthly Budget Exceeded (for expense account),Om månadsbudgeten överskrids (för utgiftskonto)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +56,Trimming,Putsning
 DocType: Workstation,Net Hour Rate,Netto timmekostnad
 DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,Landad kostnad inköpskvitto
 DocType: Company,Default Terms,Standardvillkor
@@ -890,10 +855,9 @@
 DocType: POS Profile,Cash/Bank Account,Kontant / Bankkonto
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,Removed items with no change in quantity or value.,Borttagna objekt med någon förändring i kvantitet eller värde.
 DocType: Delivery Note,Delivery To,Leverans till
-apps/erpnext/erpnext/stock/doctype/item/item.py +509,Attribute table is mandatory,Attributtabell är obligatoriskt
+apps/erpnext/erpnext/stock/doctype/item/item.py +513,Attribute table is mandatory,Attributtabell är obligatoriskt
 DocType: Production Planning Tool,Get Sales Orders,Hämta kundorder
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} kan inte vara negativ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +103,Filing,Arkivering
 apps/erpnext/erpnext/templates/form_grid/item_grid.html +72,Discount,Rabatt
 DocType: Features Setup,Purchase Discounts,Inköpsrabatter
 DocType: Workstation,Wages,Löner
@@ -910,6 +874,7 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +112,You are the Expense Approver for this record. Please Update the 'Status' and Save,"Du har ansvar för utgifterna för denna post. Vänligen Uppdatera ""Status"" och spara"
 DocType: Serial No,Creation Document No,Skapande Dokument nr
 DocType: Issue,Issue,Problem
+apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account does not match with Company,Kontot inte överens med bolaget
 apps/erpnext/erpnext/config/stock.py +136,"Attributes for Item Variants. e.g Size, Color etc.","Egenskaper för produktvarianter. t.ex. storlek, färg etc."
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +39,WIP Warehouse,WIP Lager
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +194,Serial No {0} is under maintenance contract upto {1},Löpnummer {0} är under underhållsavtal upp {1}
@@ -918,7 +883,7 @@
 DocType: Tax Rule,Shipping State,Frakt 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,"Produkt måste tillsättas med hjälp av ""få produkter  från kvitton"" -knappen"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,Försäljnings Kostnader
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Buying,Standard handla
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +120,Standard Buying,Standard handla
 DocType: GL Entry,Against,Mot
 DocType: Item,Default Selling Cost Center,Standard Kostnadsställe Försäljning
 DocType: Sales Partner,Implementation Partner,Genomförande Partner
@@ -939,29 +904,29 @@
 DocType: Time Log Batch,updated via Time Logs,uppdateras via Time Loggar
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,Medelålder
 DocType: Opportunity,Your sales person who will contact the customer in future,Din säljare som kommer att kontakta kunden i framtiden
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +588,List a few of your suppliers. They could be organizations or individuals.,Lista några av dina leverantörer. De kunde vara organisationer eller privatpersoner.
+apps/erpnext/erpnext/public/js/setup_wizard.js +326,List a few of your suppliers. They could be organizations or individuals.,Lista några av dina leverantörer. De kunde vara organisationer eller privatpersoner.
 DocType: Company,Default Currency,Standard Valuta
 DocType: Contact,Enter designation of this Contact,Ange beteckning för denna Kontakt
 DocType: Contact Us Settings,Address,Adress
 DocType: Expense Claim,From Employee,Från anställd
-apps/erpnext/erpnext/controllers/accounts_controller.py +338,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,"Varning: Systemet kommer inte att kontrollera överdebitering, eftersom belopp för punkt {0} i {1} är noll"
+apps/erpnext/erpnext/controllers/accounts_controller.py +339,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,"Varning: Systemet kommer inte att kontrollera överdebitering, eftersom belopp för punkt {0} i {1} är noll"
 DocType: Journal Entry,Make Difference Entry,Skapa Differensinlägg
 DocType: Upload Attendance,Attendance From Date,Närvaro Från datum
 DocType: Appraisal Template Goal,Key Performance Area,Nyckelperformance Områden
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +54,Transportation,Transportfordon
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +54,Transportation,Transportfordon
 apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +67, and year: ,och år:
 DocType: Email Digest,Annual Expense,Årlig Expense
 DocType: SMS Center,Total Characters,Totalt Tecken
-apps/erpnext/erpnext/controllers/buying_controller.py +139,Please select BOM in BOM field for Item {0},Välj BOM i BOM fältet för produkt{0}
+apps/erpnext/erpnext/controllers/buying_controller.py +130,Please select BOM in BOM field for Item {0},Välj BOM i BOM fältet för produkt{0}
 DocType: C-Form Invoice Detail,C-Form Invoice Detail,C-Form faktura Detalj
 DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,Betalning Avstämning Faktura
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +32,Contribution %,Bidrag%
 DocType: Item,website page link,webbsida länk
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +192,Let's prepare the system for first use.,Låt oss förbereda systemet för första användning.
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +242,Let's prepare the system for first use.,Låt oss förbereda systemet för första användning.
 DocType: Company,Company registration numbers for your reference. Tax numbers etc.,Organisationsnummer som referens. Skattenummer etc.
 DocType: Sales Partner,Distributor,Distributör
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Varukorgen frakt Regel
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +214,Production Order {0} must be cancelled before cancelling this Sales Order,Produktionsorder {0} måste avbrytas innan du kan avbryta kundorder
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +209,Production Order {0} must be cancelled before cancelling this Sales Order,Produktionsorder {0} måste avbrytas innan du kan avbryta kundorder
 ,Ordered Items To Be Billed,Beställda varor att faktureras
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +24,From Range has to be less than To Range,Från Range måste vara mindre än ligga
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +21,Select Time Logs and Submit to create a new Sales Invoice.,Välj Time Loggar och skicka för att skapa en ny försäljnings faktura.
@@ -981,14 +946,13 @@
 DocType: Sales Invoice Advance,Sales Invoice Advance,Försäljning Faktura Advance
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +398,Nothing to request,Ingenting att begära
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date',&quot;Faktiskt startdatum&quot; inte kan vara större än &quot;Faktiskt slutdatum&quot;
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +75,Management,Ledning
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +75,Management,Ledning
 apps/erpnext/erpnext/config/projects.py +33,Types of activities for Time Sheets,Olika typer av aktiviteter för tidrapporter
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +14,Investment casting,Investeringar gjutning
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +51,Either debit or credit amount is required for {0},Antingen betal- eller kreditbeloppet krävs för {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""","Detta kommer att läggas till den punkt koden varianten. Till exempel, om din förkortning är &quot;SM&quot;, och försändelsekoden är &quot;T-TRÖJA&quot;, posten kod varianten kommer att vara &quot;T-Shirt-SM&quot;"
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,Nettolön (i ord) kommer att vara synliga när du sparar lönebeskedet.
 apps/frappe/frappe/core/doctype/user/user_list.js +12,Active,Aktiv
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +154,Blue,Blå
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +154,Blue,Blå
 DocType: Purchase Invoice,Is Return,Är Returnerad
 DocType: Price List Country,Price List Country,Prislista Land
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +123,Further nodes can be only created under 'Group' type nodes,Ytterligare noder kan endast skapas under &quot;grupp&quot; typ noder
@@ -998,18 +962,16 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +22,POS Profile {0} already created for user: {1} and company {2},POS Profil {0} redan skapats för användare: {1} och företag {2}
 DocType: Purchase Order Item,UOM Conversion Factor,UOM Omvandlingsfaktor
 DocType: Stock Settings,Default Item Group,Standard Varugrupp
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +156,Laminated object manufacturing,Laminerad objekt tillverkning
 apps/erpnext/erpnext/config/buying.py +13,Supplier database.,Leverantörsdatabas.
 DocType: Account,Balance Sheet,Balansräkning
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +561,Cost Center For Item with Item Code ',"Kostnadcenter för artikel med artikelkod """
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +45,Stretch forming,Sträckformning
 DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,Din säljare kommer att få en påminnelse om detta datum att kontakta kunden
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +210,"Further accounts can be made under Groups, but entries can be made against non-Groups","Ytterligare konton kan göras inom ramen för grupper, men poster kan göras mot icke-grupper"
 apps/erpnext/erpnext/config/hr.py +125,Tax and other salary deductions.,Skatt och andra löneavdrag.
 DocType: Lead,Lead,Prospekt
 DocType: Email Digest,Payables,Skulder
 DocType: Account,Warehouse,Lager
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +90,Row #{0}: Rejected Qty can not be entered in Purchase Return,Rad # {0}:  avvisat antal kan inte anmälas för retur
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +93,Row #{0}: Rejected Qty can not be entered in Purchase Return,Rad # {0}:  avvisat antal kan inte anmälas för retur
 ,Purchase Order Items To Be Billed,Inköpsorder Artiklar att faktureras
 DocType: Purchase Invoice Item,Net Rate,Netto kostnad
 DocType: Purchase Invoice Item,Purchase Invoice Item,Inköpsfaktura Artiklar
@@ -1024,13 +986,13 @@
 DocType: Global Defaults,Current Fiscal Year,Innevarande räkenskapsår
 DocType: Global Defaults,Disable Rounded Total,Inaktivera avrundat Totalbelopp
 DocType: Lead,Call,Ring
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +384,'Entries' cannot be empty,&#39;poster&#39; kan inte vara tomt
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +386,'Entries' cannot be empty,&#39;poster&#39; kan inte vara tomt
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},Duplicate raden {0} med samma {1}
 ,Trial Balance,Trial Balans
 apps/erpnext/erpnext/config/hr.py +205,Setting up Employees,Ställa in Anställda
 apps/erpnext/erpnext/public/js/feature_setup.js +220,"Grid """,Grid &quot;
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +150,Please select prefix first,Välj prefix först
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +138,Research,Forskning
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +138,Research,Forskning
 DocType: Maintenance Visit Purpose,Work Done,Arbete Gjort
 apps/erpnext/erpnext/controllers/item_variant.py +25,Please specify at least one attribute in the Attributes table,Ange minst ett attribut i tabellen attribut
 DocType: Contact,User ID,Användar ID
@@ -1038,10 +1000,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +57,View Ledger,Se journal
 DocType: File,Lft,Lft
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Tidigast
-apps/erpnext/erpnext/stock/doctype/item/item.py +394,"An Item Group exists with same name, please change the item name or rename the item group","Ett varugrupp finns med samma namn, ändra objektets namn eller byta namn på varugrupp"
+apps/erpnext/erpnext/stock/doctype/item/item.py +398,"An Item Group exists with same name, please change the item name or rename the item group","Ett varugrupp finns med samma namn, ändra objektets namn eller byta namn på varugrupp"
 DocType: Communication,Delivery Status,Leveransstatus
 DocType: Production Order,Manufacture against Sales Order,Tillverkning mot kundorder
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +517,Rest Of The World,Resten av världen
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +455,Rest Of The World,Resten av världen
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,Item {0} kan inte ha Batch
 ,Budget Variance Report,Budget Variationsrapport
 DocType: Salary Slip,Gross Pay,Bruttolön
@@ -1052,13 +1014,11 @@
 DocType: BOM Item,Item Description,Produktbeskrivning
 DocType: Payment Tool,Payment Mode,Betalningsläget
 DocType: Purchase Invoice,Is Recurring,Är återkommande
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +154,Direct metal laser sintering,Direkt metall lasersintring
 DocType: Purchase Order,Supplied Items,Medföljande tillbehör
 DocType: Production Order,Qty To Manufacture,Antal att tillverka
 DocType: Buying Settings,Maintain same rate throughout purchase cycle,Behåll samma takt hela inköpscykeln
 DocType: Opportunity Item,Opportunity Item,Möjlighet Punkt
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +61,Temporary Opening,Tillfällig Öppning
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +41,Cryorolling,Cryorolling
 ,Employee Leave Balance,Anställd Avgångskostnad
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +128,Balance for Account {0} must always be {1},Saldo konto {0} måste alltid vara {1}
 DocType: Address,Address Type,Adresstyp
@@ -1074,23 +1034,23 @@
 DocType: Journal Entry,Get Outstanding Invoices,Hämta utestående fakturor
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,Kundorder {0} är inte giltig
 apps/erpnext/erpnext/setup/doctype/company/company.py +172,"Sorry, companies cannot be merged","Tyvärr, kan företagen inte slås samman"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +145,Small,Liten
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Small,Liten
 DocType: Employee,Employee Number,Anställningsnummer
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},Ärendenr är redani bruk. Försök från ärende nr {0}
 ,Invoiced Amount (Exculsive Tax),Fakturerat belopp (Exklusive skatt)
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,Produkt  2
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +59,Account head {0} created,Konto huvudet {0} skapades
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +153,Green,Grön
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Green,Grön
 DocType: Item,Auto re-order,Auto återbeställning
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +57,Total Achieved,Totalt Uppnått
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +59,Total Achieved,Totalt Uppnått
 DocType: Employee,Place of Issue,Utgivningsplats
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +59,Contract,Kontrakt
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Contract,Kontrakt
 DocType: Report,Disabled,Inaktiverad
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +490,UOM coversion factor required for UOM: {0} in Item: {1},UOM coverfaktor krävs för UOM: {0} i punkt: {1}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +83,Indirect Expenses,Indirekta kostnader
 apps/erpnext/erpnext/controllers/selling_controller.py +163,Row {0}: Qty is mandatory,Rad {0}: Antal är obligatoriskt
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +8,Agriculture,Jordbruk
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +611,Your Products or Services,Dina produkter eller tjänster
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,Jordbruk
+apps/erpnext/erpnext/public/js/setup_wizard.js +347,Your Products or Services,Dina produkter eller tjänster
 DocType: Mode of Payment,Mode of Payment,Betalningssätt
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,Detta är en rot varugrupp och kan inte ändras.
 DocType: Journal Entry Account,Purchase Order,Inköpsorder
@@ -1102,7 +1062,7 @@
 DocType: Serial No,Serial No Details,Serial Inga detaljer
 DocType: Purchase Invoice Item,Item Tax Rate,Produkt Skattesats
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +113,"For {0}, only credit accounts can be linked against another debit entry",För {0} kan endast kreditkonton länkas mot en annan debitering
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Delivery Note {0} is not submitted,Följesedel {0} är inte lämnad
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +470,Delivery Note {0} is not submitted,Följesedel {0} är inte lämnad
 apps/erpnext/erpnext/stock/get_item_details.py +136,Item {0} must be a Sub-contracted Item,Produkt  {0} måste vara ett underleverantörs produkt
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,Kapital Utrustning
 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.","Prissättning regel baseras först på ""Lägg till på' fälten, som kan vara artikel, artikelgrupp eller Märke."
@@ -1112,7 +1072,7 @@
 DocType: Appraisal Goal,Goal,Mål
 DocType: Sales Invoice Item,Edit Description,Redigera Beskrivning
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +318,Expected Delivery Date is lesser than Planned Start Date.,Förväntad leveransdatum är mindre än planerat startdatum.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +579,For Supplier,För Leverantör
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +602,For Supplier,För Leverantör
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,Ställa Kontotyp hjälper i att välja detta konto i transaktioner.
 DocType: Purchase Invoice,Grand Total (Company Currency),Totalsumma (Företagsvaluta)
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,Totalt Utgående
@@ -1138,10 +1098,10 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +74,"Total {0} for all items is zero, may you should change 'Distribute Charges Based On'","Totalt {0} för alla objekt är noll, kan du bör ändra &quot;Fördela avgifter som grundas på&quot;"
 DocType: Purchase Invoice,Taxes and Charges Calculation,Skatter och avgifter Beräkning
 DocType: BOM Operation,Workstation,Arbetsstation
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +112,Hardware,Hårdvara
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +112,Hardware,Hårdvara
 DocType: Attendance,HR Manager,HR-chef
 apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,Välj ett företag
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +50,Privilege Leave,Enskild ledighet
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +50,Privilege Leave,Enskild ledighet
 DocType: Purchase Invoice,Supplier Invoice Date,Leverantörsfakturadatum
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +79,You need to enable Shopping Cart,Du måste aktivera Varukorgen
 apps/frappe/frappe/public/js/frappe/form/grid_body.html +6,No Data,Inga Data
@@ -1154,7 +1114,7 @@
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +81,Overlapping conditions found between:,Överlappande förhållanden som råder mellan:
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +168,Against Journal Entry {0} is already adjusted against some other voucher,Mot Journal anteckning{0} är redan anpassat mot någon annan kupong
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +68,Total Order Value,Totalt ordervärde
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +38,Food,Mat
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +38,Food,Mat
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Åldringsräckvidd 3
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +139,You can make a time log only against a submitted production order,Du kan endast göra tidsloggar mot en inlämnad produktionsorder
 DocType: Maintenance Schedule Item,No of Visits,Antal besök
@@ -1174,6 +1134,7 @@
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,View Offer Letter,Visa erbjudande
 DocType: Communication,Communication,Kommunikation
 DocType: Item,Is Service Item,Är Serviceobjekt
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +81,Application period cannot be outside leave allocation period,Ansökningstiden kan inte vara utanför ledighet fördelningsperioden
 DocType: Activity Cost,Projects,Projekt
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +31,Please select Fiscal Year,Välj Räkenskapsårets
 apps/erpnext/erpnext/controllers/buying_controller.py +23,From {0} | {1} {2},Från {0} | {1} {2}
@@ -1192,7 +1153,7 @@
 DocType: Item,Maintain Stock,Behåll Lager
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +213,Stock Entries already created for Production Order ,Aktie Inlägg redan skapats för produktionsorder
 DocType: Leave Control Panel,Leave blank if considered for all designations,Lämna tomt om det anses vara för alla beteckningar
-apps/erpnext/erpnext/controllers/accounts_controller.py +499,Charge of type 'Actual' in row {0} cannot be included in Item Rate,"Avgift av typ ""faktiska"" i raden {0} kan inte ingå i artikelomsättningen"
+apps/erpnext/erpnext/controllers/accounts_controller.py +500,Charge of type 'Actual' in row {0} cannot be included in Item Rate,"Avgift av typ ""faktiska"" i raden {0} kan inte ingå i artikelomsättningen"
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,Max: {0},Max: {0}
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +16,From Datetime,Från Daterad tid
 DocType: Email Digest,For Company,För Företag
@@ -1202,7 +1163,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +50,Chart of Accounts,Kontoplan
 DocType: Material Request,Terms and Conditions Content,Villkor Innehåll
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +471,cannot be greater than 100,kan inte vara större än 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +546,Item {0} is not a stock Item,Produkt  {0} är inte en lagervara
+apps/erpnext/erpnext/stock/doctype/item/item.py +550,Item {0} is not a stock Item,Produkt  {0} är inte en lagervara
 DocType: Maintenance Visit,Unscheduled,Ledig
 DocType: Employee,Owned,Ägs
 DocType: Salary Slip Deduction,Depends on Leave Without Pay,Beror på avgång utan lön
@@ -1216,30 +1177,28 @@
 DocType: HR Settings,Employee Settings,Personal Inställningar
 ,Batch-Wise Balance History,Batchvis Balans Historik
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +72,To Do List,Att Göra Lista
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +63,Apprentice,Lärling
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Apprentice,Lärling
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +99,Negative Quantity is not allowed,Negativ Antal är inte tillåtet
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
 Used for Taxes and Charges",Skatte detalj tabell hämtas från punkt mästare som en sträng och lagras i detta område. Används för skatter och avgifter
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +61,Lancing,Lancing
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +151,Employee cannot report to himself.,Anställd kan inte anmäla sig själv.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Om kontot är fruset, är poster endast tillgängligt för begränsade användare."
 DocType: Email Digest,Bank Balance,BANKTILLGODOHAVANDE
-apps/erpnext/erpnext/controllers/accounts_controller.py +435,Accounting Entry for {0}: {1} can only be made in currency: {2},Kontering för {0}: {1} kan endast göras i valuta: {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +436,Accounting Entry for {0}: {1} can only be made in currency: {2},Kontering för {0}: {1} kan endast göras i valuta: {2}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +38,No active Salary Structure found for employee {0} and the month,Ingen aktiv lönesättning hittades för anställd {0} och månaden
 DocType: Job Opening,"Job profile, qualifications required etc.","Jobb profil, kvalifikationer som krävs osv"
 DocType: Journal Entry Account,Account Balance,Balanskonto
 apps/erpnext/erpnext/config/accounts.py +112,Tax Rule for transactions.,Skatte Regel för transaktioner.
 DocType: Rename Tool,Type of document to rename.,Typ av dokument för att byta namn.
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +630,We buy this Item,Vi köper detta objekt
+apps/erpnext/erpnext/public/js/setup_wizard.js +366,We buy this Item,Vi köper detta objekt
 DocType: Address,Billing,Fakturering
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +77,Flanging,Flänsning
 DocType: Bulk Email,Not Sent,Inte Skickade
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +73,Explosive forming,Explosivt formning
 DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),Totala skatter och avgifter (Företags valuta)
 DocType: Shipping Rule,Shipping Account,Frakt konto
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +43,Scheduled to send to {0} recipients,Planerad att skicka till {0} mottagare
 DocType: Quality Inspection,Readings,Avläsningar
 DocType: Stock Entry,Total Additional Costs,Totalt Merkostnader
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Sub Assemblies,Sub Assemblies
+apps/erpnext/erpnext/public/js/setup_wizard.js +359,Sub Assemblies,Sub Assemblies
 DocType: Shipping Rule Condition,To Value,Att Värdera
 DocType: Supplier,Stock Manager,Lagrets direktör
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +143,Source warehouse is mandatory for row {0},Källa lager är obligatoriskt för rad {0}
@@ -1249,44 +1208,42 @@
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Import misslyckades!
 apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,Ingen adress inlagd ännu.
 DocType: Workstation Working Hour,Workstation Working Hour,Arbetsstation arbetstimme
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +83,Analyst,Analytiker
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +202,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Rad {0}: Tilldelad mängd {1} måste vara mindre än eller lika med JV mängd {2}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Analyst,Analytiker
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +149,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Rad {0}: Tilldelad mängd {1} måste vara mindre än eller lika med JV mängd {2}
 DocType: Item,Inventory,Inventering
 DocType: Features Setup,"To enable ""Point of Sale"" view",För att aktivera &quot;Point of Sale&quot; view
 apps/erpnext/erpnext/public/js/pos/pos.js +402,Payment cannot be made for empty cart,Betalning kan inte göras för tomma kundvagnar
 DocType: Item,Sales Details,Försäljnings Detaljer
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +149,Pinning,Nålning
 DocType: Opportunity,With Items,Med artiklar
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,I Antal
 DocType: Notification Control,Expense Claim Rejected,Räkning avvisas
 DocType: Sales Invoice,"The date on which next invoice will be generated. It is generated on submit.
 ",Det datum då nästa faktura kommer att genereras. Det genereras på skicka.
 DocType: Item Attribute,Item Attribute,Produkt Attribut
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +105,Government,Regeringen
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Government,Regeringen
 apps/erpnext/erpnext/config/stock.py +268,Item Variants,Produkt Varianter
 DocType: Company,Services,Tjänster
 apps/erpnext/erpnext/accounts/report/financial_statements.py +147,Total ({0}),Totalt ({0})
 DocType: Cost Center,Parent Cost Center,Överordnat kostnadsställe
 DocType: Sales Invoice,Source,Källa
 DocType: Leave Type,Is Leave Without Pay,Är ledighet utan lön
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +186,No records found in the Payment table,Inga träffar i betalningstabellen
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +405,Financial Year Start Date,Budgetåret Startdatum
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +133,No records found in the Payment table,Inga träffar i betalningstabellen
+apps/erpnext/erpnext/public/js/setup_wizard.js +153,Financial Year Start Date,Budgetåret Startdatum
 DocType: Employee External Work History,Total Experience,Total Experience
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +100,Countersinking,Försänkning
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +271,Packing Slip(s) cancelled,Följesedlar avbryts
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +276,Packing Slip(s) cancelled,Följesedlar avbryts
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,"Frakt, spedition Avgifter"
 DocType: Material Request Item,Sales Order No,Kundorder Ingen
 DocType: Item Group,Item Group Name,Produkt  Gruppnamn
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +50,Taken,Taken
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,Taken
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +66,Transfer Materials for Manufacture,Överför Material Tillverkning
 DocType: Pricing Rule,For Price List,För prislista
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +27,Executive Search,Executive Search
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,Executive Search
 apps/erpnext/erpnext/stock/stock_ledger.py +405,"Purchase rate for item: {0} not found, which is required to book accounting entry (expense). Please mention item price against a buying price list.","Inköpsomsätting för artikel: {0} hittades inte, som krävs för att boka konterings (kostnad). Nämn artikelpris mot en inköpslista."
 DocType: Maintenance Schedule,Schedules,Scheman
 DocType: Purchase Invoice Item,Net Amount,Nettobelopp
 DocType: Purchase Order Item Supplied,BOM Detail No,BOM Detalj nr
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),Ytterligare rabattbeloppet (Företagsvaluta)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +537,Error: {0} > {1},Fel: {0}&gt; {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +541,Error: {0} > {1},Fel: {0}&gt; {1}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,Skapa nytt konto från kontoplan.
 DocType: Maintenance Visit,Maintenance Visit,Servicebesök
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer > Customer Group > Territory,Kund> Kundgrupp > Område
@@ -1297,7 +1254,6 @@
 DocType: Event,Tuesday,Tisdag
 DocType: Leave Block List,Block Holidays on important days.,Block Semester på viktiga dagar.
 ,Accounts Receivable Summary,Kundfordringar Sammanfattning
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +43,Leaves for type {0} already allocated for Employee {1} for period {2} - {3},Lämnar för typ {0} redan avsatts för anställd {1} för perioden {2} - {3}
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +187,Please set User ID field in an Employee record to set Employee Role,Ställ in användar-ID fältet i en anställd post för att ställa in anställdes Roll
 DocType: UOM,UOM Name,UOM Namn
 DocType: Top Bar Item,Target,Mål
@@ -1309,15 +1265,14 @@
 DocType: ToDo,Due Date,Förfallodatum
 DocType: Sales Invoice Item,Brand Name,Varumärke
 DocType: Purchase Receipt,Transporter Details,Transporter Detaljer
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Box,Låda
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +389,The Organization,Organisationen
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Box,Låda
+apps/erpnext/erpnext/public/js/setup_wizard.js +137,The Organization,Organisationen
 DocType: Monthly Distribution,Monthly Distribution,Månads Fördelning
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,Mottagare Lista är tom. Skapa Mottagare Lista
 DocType: Production Plan Sales Order,Production Plan Sales Order,Produktionsplan för kundorder
 DocType: Sales Partner,Sales Partner Target,Sales Partner Target
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},Kontering för {0} kan endast göras i valuta: {1}
 DocType: Pricing Rule,Pricing Rule,Prissättning Regel
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +58,Notching,Stansning
 apps/erpnext/erpnext/config/learn.py +167,Material Request to Purchase Order,Material begäran om att inköpsorder
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +74,Row # {0}: Returned Item {1} does not exists in {2} {3},Rad # {0}: Returnerad artikel {1} existerar inte i {2} {3}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,Bankkonton
@@ -1334,20 +1289,19 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Amounts not reflected in bank,Belopp som inte återspeglas i bank
 DocType: Quality Inspection Reading,Reading 4,Avläsning 4
 apps/erpnext/erpnext/config/hr.py +23,Claims for company expense.,Anspråk på företagets bekostnad.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +8,Centrifugal casting,Centrifugalgjutning
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +119,Magnetic field-assisted finishing,Magnetfält assisterad efterbehandling
 DocType: Company,Default Holiday List,Standard kalender
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +165,Stock Liabilities,Stock Skulder
 DocType: Purchase Receipt,Supplier Warehouse,Leverantör Lager
 DocType: Opportunity,Contact Mobile No,Kontakt Mobil nr
 DocType: Production Planning Tool,Select Sales Orders,Välj kundorder
 ,Material Requests for which Supplier Quotations are not created,Material Begäran för vilka leverantörsofferter är inte skapade
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +117,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,Dagen (s) som du ansöker om ledighet är helgdagar. Du behöver inte ansöka om tjänstledighet.
 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.,Om du vill spåra objekt med streckkod. Du kommer att kunna komma in poster i följesedeln och fakturan genom att skanna streckkoder av objekt.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +477,Mark as Delivered,Markera som levereras
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +497,Mark as Delivered,Markera som levereras
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +34,Make Quotation,Skapa offert
 DocType: Dependent Task,Dependent Task,Beroende Uppgift
-apps/erpnext/erpnext/stock/doctype/item/item.py +306,Conversion factor for default Unit of Measure must be 1 in row {0},Omvandlingsfaktor för standardmåttenhet måste vara en i raden {0}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,Leave of type {0} cannot be longer than {1},Ledighet av typen {0} inte kan vara längre än {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +310,Conversion factor for default Unit of Measure must be 1 in row {0},Omvandlingsfaktor för standardmåttenhet måste vara en i raden {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +155,Leave of type {0} cannot be longer than {1},Ledighet av typen {0} inte kan vara längre än {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Försök att planera verksamheten för X dagar i förväg.
 DocType: HR Settings,Stop Birthday Reminders,Stop födelsedag Påminnelser
 DocType: SMS Center,Receiver List,Mottagare Lista
@@ -1355,15 +1309,14 @@
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Förbrukad mängd
 apps/erpnext/erpnext/public/js/pos/pos.js +491,{0} View,{0} Visa
 DocType: Salary Structure Deduction,Salary Structure Deduction,Lönestruktur Avdrag
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +158,Selective laser sintering,Selektiv lasersintring
-apps/erpnext/erpnext/stock/doctype/item/item.py +301,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Mätenhet {0} har angetts mer än en gång i Omvandlingsfaktor Tabell
+apps/erpnext/erpnext/stock/doctype/item/item.py +305,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Mätenhet {0} har angetts mer än en gång i Omvandlingsfaktor Tabell
 apps/frappe/frappe/core/page/data_import_tool/data_import_tool.js +108,Import Successful!,Import lyckades!
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Kostnad för utfärdade artiklar
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +185,Quantity must not be more than {0},Antal får inte vara mer än {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +41,Age (Days),Ålder (dagar)
 DocType: Quotation Item,Quotation Item,Offert Artikel
 DocType: Account,Account Name,Kontonamn
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +41,From Date cannot be greater than To Date,Från Datum kan inte vara större än Till Datum
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +34,From Date cannot be greater than To Date,Från Datum kan inte vara större än Till Datum
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +194,Serial No {0} quantity {1} cannot be a fraction,Serienummer {0} kvantitet {1} inte kan vara en fraktion
 apps/erpnext/erpnext/config/buying.py +59,Supplier Type master.,Leverantör Typ mästare.
 DocType: Purchase Order Item,Supplier Part Number,Leverantör Artikelnummer
@@ -1372,14 +1325,14 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +247,{0} {1} is cancelled or stopped,{0} {1} avbryts eller stoppas
 DocType: Accounts Settings,Credit Controller,Kreditcontroller
 DocType: Delivery Note,Vehicle Dispatch Date,Fordon Avgångs Datum
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +197,Purchase Receipt {0} is not submitted,Inköpskvitto {0} är inte lämnat
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +198,Purchase Receipt {0} is not submitted,Inköpskvitto {0} är inte lämnat
 DocType: Company,Default Payable Account,Standard betalkonto
 apps/erpnext/erpnext/config/website.py +13,"Settings for online shopping cart such as shipping rules, price list etc.","Inställningar för webbutik som fraktregler, prislista mm"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +660,Setup Complete,Installationen är klar
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +124,Setup Complete,Installationen är klar
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +65,{0}% Billed,{0}% Fakturerad
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +17,Reserved Qty,Reserverad Antal
 DocType: Party Account,Party Account,Parti-konto
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +74,Human Resources,Personal Resurser
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +74,Human Resources,Personal Resurser
 DocType: Lead,Upper Income,Övre inkomst
 DocType: Journal Entry Account,Debit in Company Currency,Debet i bolaget Valuta
 apps/erpnext/erpnext/support/doctype/issue/issue.py +58,My Issues,Mina Frågor
@@ -1388,11 +1341,9 @@
 DocType: Company,Default Values,Standardvärden
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +236,Row {0}: Payment amount can not be negative,Rad {0}: Betalningsbelopp kan inte vara negativ
 DocType: Expense Claim,Total Amount Reimbursed,Totala belopp som ersatts
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +152,Press fitting,Presspassning
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +64,Against Supplier Invoice {0} dated {1},Mot leverantörsfakturor {0} den {1}
 DocType: Customer,Default Price List,Standard Prislista
 DocType: Payment Reconciliation,Payments,Betalningar
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +24,Hot isostatic pressing,Varm isostatisk pressning
 DocType: ToDo,Medium,Medium
 DocType: Budget Detail,Budget Allocated,Budget
 DocType: Journal Entry,Entry Type,Entry Type
@@ -1405,9 +1356,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +56,None of the items have any change in quantity or value.,Inget av objekten har någon förändring i kvantitet eller värde.
 DocType: Warranty Claim,Warranty Claim,Garantianspråk
 ,Lead Details,Prospekt Detaljer
-DocType: Authorization Rule,Approving User,Godkänn användare
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +37,Forging,Smide
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +126,Plating,Plätering
 DocType: Purchase Invoice,End date of current invoice's period,Slutdatum för aktuell faktura period
 DocType: Pricing Rule,Applicable For,Tillämplig för
 DocType: Bank Reconciliation,From Date,Från Datum
@@ -1429,31 +1377,29 @@
 DocType: Sales Invoice,Paid Amount (Company Currency),Betald Belopp (Company valuta)
 DocType: Purchase Invoice,Additional Discount,Ytterligare rabatt
 DocType: Selling Settings,Selling Settings,Försälja Inställningar
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +39,Online Auctions,Online Auktioner
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,Online Auktioner
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +94,Please specify either Quantity or Valuation Rate or both,Ange antingen Kvantitet eller Värderingsomsättning eller båda
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +50,"Company, Month and Fiscal Year is mandatory","Företag, månad och räkenskapsår är obligatorisk"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Marketing Expenses,Marknadsföringskostnader
 ,Item Shortage Report,Produkt Brist Rapportera
-apps/erpnext/erpnext/stock/doctype/item/item.js +183,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Vikt nämns \ Vänligen ange ""Vikt UOM"" också"
+apps/erpnext/erpnext/stock/doctype/item/item.js +185,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Vikt nämns \ Vänligen ange ""Vikt UOM"" också"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,Material Begäran används för att göra detta Lagerinlägg
 apps/erpnext/erpnext/config/support.py +43,Single unit of an Item.,Enda enhet av ett objekt.
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +212,Time Log Batch {0} must be 'Submitted',Tid Log Batch {0} måste &quot;Avsändare&quot;
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,Skapa kontering för varje lagerförändring
 DocType: Leave Allocation,Total Leaves Allocated,Totala Löv Avsatt
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +384,Warehouse required at Row No {0},Lager krävs vid Rad nr {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +386,Warehouse required at Row No {0},Lager krävs vid Rad nr {0}
 DocType: Employee,Date Of Retirement,Datum för pensionering
 DocType: Upload Attendance,Get Template,Hämta mall
 DocType: Address,Postal,Post
 DocType: Item,Weightage,Vikt
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +159,Mining,Gruv
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +17,Resin casting,Hartsgjutning
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"En kundgrupp finns med samma namn, ändra Kundens namn eller döp om kundgruppen"
 apps/erpnext/erpnext/public/js/pos/pos.js +147,Please select {0} first.,Välj {0} först.
 apps/erpnext/erpnext/templates/pages/order.html +57,text {0},text {0}
 DocType: Territory,Parent Territory,Överordnat område
 DocType: Quality Inspection Reading,Reading 2,Avläsning 2
 DocType: Stock Entry,Material Receipt,Material Kvitto
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +622,Products,Produkter
+apps/erpnext/erpnext/public/js/setup_wizard.js +358,Products,Produkter
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +47,Party Type and Party is required for Receivable / Payable account {0},Partityp och Parti krävs för mottagare / Betalnings konto {0}
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.","Om denna artikel har varianter, så det kan inte väljas i kundorder etc."
 DocType: Lead,Next Contact By,Nästa Kontakt Vid
@@ -1463,13 +1409,13 @@
 DocType: Purchase Invoice,Notification Email Address,Anmälan E-postadress
 DocType: Payment Tool,Find Invoices to Match,Hitta fakturor för att matcha
 ,Item-wise Sales Register,Produktvis säljregister
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +399,"e.g. ""XYZ National Bank""","t.ex. ""Swedbank"""
+apps/erpnext/erpnext/public/js/setup_wizard.js +147,"e.g. ""XYZ National Bank""","t.ex. ""Swedbank"""
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,Är denna skatt inkluderar i Basic kursen?
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +57,Total Target,Totalt Target
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Target,Totalt Target
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.js +22,Shopping Cart is enabled,Varukorgen är aktiverad
 DocType: Job Applicant,Applicant for a Job,Sökande för ett jobb
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +173,No Production Orders created,Inga produktionsorder skapas
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +131,Salary Slip of employee {0} already created for this month,Lönebesked av personal {0} redan skapats för denna månad
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +140,Salary Slip of employee {0} already created for this month,Lönebesked av personal {0} redan skapats för denna månad
 DocType: Stock Reconciliation,Reconciliation JSON,Avstämning JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Alltför många kolumner. Exportera rapporten och skriva ut det med hjälp av ett kalkylprogram.
 DocType: Sales Invoice Item,Batch No,Batch nr
@@ -1479,14 +1425,14 @@
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +13,Variant,Variant
 apps/frappe/frappe/public/js/frappe/form/toolbar.js +165,New {0},Ny {0}
 DocType: Naming Series,Set prefix for numbering series on your transactions,Ställ prefix för nummerserie på dina transaktioner
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +169,Stopped order cannot be cancelled. Unstop to cancel.,Stoppad ordning kan inte avbrytas. Unstop att avbryta.
-apps/erpnext/erpnext/stock/doctype/item/item.py +323,Default BOM ({0}) must be active for this item or its template,Standard BOM ({0}) måste vara aktiv för denna artikel eller dess mall
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +164,Stopped order cannot be cancelled. Unstop to cancel.,Stoppad ordning kan inte avbrytas. Unstop att avbryta.
+apps/erpnext/erpnext/stock/doctype/item/item.py +327,Default BOM ({0}) must be active for this item or its template,Standard BOM ({0}) måste vara aktiv för denna artikel eller dess mall
 DocType: Employee,Leave Encashed?,Lämna inlösen?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Möjlighet Från fältet är obligatoriskt
 DocType: Item,Variants,Varianter
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +458,Make Purchase Order,Skapa beställning
 DocType: SMS Center,Send To,Skicka Till
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +111,There is not enough leave balance for Leave Type {0},Det finns inte tillräckligt ledighet balans för Lämna typ {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +127,There is not enough leave balance for Leave Type {0},Det finns inte tillräckligt ledighet balans för Lämna typ {0}
 DocType: Sales Team,Contribution to Net Total,Bidrag till Net Total
 DocType: Sales Invoice Item,Customer's Item Code,Kundens Artikelkod
 DocType: Stock Reconciliation,Stock Reconciliation,Lager Avstämning
@@ -1523,11 +1469,11 @@
 DocType: Sales Order Item,Actual Qty,Faktiska Antal
 DocType: Sales Invoice Item,References,Referenser
 DocType: Quality Inspection Reading,Reading 10,Avläsning 10
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +612,"List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start.","Lista dina produkter eller tjänster som du köper eller säljer. Se till att kontrollera varugruppen, mätenhet och andra egenskaper när du startar."
+apps/erpnext/erpnext/public/js/setup_wizard.js +348,"List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start.","Lista dina produkter eller tjänster som du köper eller säljer. Se till att kontrollera varugruppen, mätenhet och andra egenskaper när du startar."
 DocType: Hub Settings,Hub Node,Nav Nod
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,Du har angett dubbletter. Vänligen rätta och försök igen.
 apps/erpnext/erpnext/controllers/item_variant.py +65,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values,Värde {0} för Attribut {1} finns inte i listan över giltiga Punkt Attribut Värderingar
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +87,Associate,Associate
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Associate,Associate
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +46,Item {0} is not a serialized Item,Produktt {0} är inte en serialiserad Produkt
 DocType: SMS Center,Create Receiver List,Skapa Mottagare Lista
 apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +5,Expired,Utgånget
@@ -1536,7 +1482,7 @@
 DocType: Warranty Claim,Issue Date,Utgivningsdatum
 DocType: Activity Cost,Activity Cost,Aktivitetskostnad
 DocType: Purchase Receipt Item Supplied,Consumed Qty,Förbrukad Antal
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +52,Telecommunications,Telekommunikation
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +52,Telecommunications,Telekommunikation
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),Anger att paketet är en del av denna leverans (endast utkast)
 DocType: Payment Tool,Make Payment Entry,Skapa inbetalninginlägg
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +119,Quantity for Item {0} must be less than {1},Kvantitet för artikel {0} måste vara mindre än {1}
@@ -1553,10 +1499,8 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +37,"Selling must be checked, if Applicable For is selected as {0}","Försäljnings måste kontrolleras, i förekommande fall för väljs som {0}"
 DocType: Purchase Order Item,Supplier Quotation Item,Leverantör offert Punkt
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +27,Make Salary Structure,Skapa lönestruktur
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +54,Shearing,Klippning
 DocType: Item,Has Variants,Har Varianter
 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.,"Klicka på ""Skapa försäljningsfakturan"" knappen för att skapa en ny försäljnings faktura."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +166,Packaging and labeling,Förpackning och märkning
 DocType: Monthly Distribution,Name of the Monthly Distribution,Namn på månadens distribution
 DocType: Sales Person,Parent Sales Person,Överordnad Försäljningsperson
 apps/erpnext/erpnext/setup/utils.py +14,Please specify Default Currency in Company Master and Global Defaults,Ange standardvaluta i huvudbolaget och Global inställningar
@@ -1567,19 +1511,18 @@
 DocType: Budget Detail,Fiscal Year,Räkenskapsår
 DocType: Cost Center,Budget,Budget
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +41,"Budget cannot be assigned against {0}, as it's not an Income or Expense account","Budget kan inte tilldelas mot {0}, eftersom det inte är en intäkt eller kostnad konto"
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Achieved,Uppnått
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,Uppnått
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +65,Territory / Customer,Territorium / Kund
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,e.g. 5,t.ex. 5
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +207,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},Rad {0}: Tilldelad mängd {1} måste vara mindre än eller lika med att fakturerat utestående belopp {2}
+apps/erpnext/erpnext/public/js/setup_wizard.js +294,e.g. 5,t.ex. 5
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},Rad {0}: Tilldelad mängd {1} måste vara mindre än eller lika med att fakturerat utestående belopp {2}
 DocType: Sales Invoice,In Words will be visible once you save the Sales Invoice.,I Ord kommer att synas när du sparar fakturan.
 DocType: Item,Is Sales Item,Är Försäljningsobjekt
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,Produktgruppträdet
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,Produkt {0} är inte inställt för Serial Nos. Kontrollera huvudprodukt
 DocType: Maintenance Visit,Maintenance Time,Servicetid
 ,Amount to Deliver,Belopp att leverera
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +620,A Product or Service,En produkt eller tjänst
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +158,There were errors.,Det fanns fel.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +101,Tapping,Gäng
+apps/erpnext/erpnext/public/js/setup_wizard.js +356,A Product or Service,En produkt eller tjänst
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +146,There were errors.,Det fanns fel.
 DocType: Naming Series,Current Value,Nuvarande Värde
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +171,{0} created,{0} skapad
 DocType: Delivery Note Item,Against Sales Order,Mot kundorder
@@ -1593,7 +1536,7 @@
 apps/erpnext/erpnext/accounts/party.py +275,Due Date cannot be before Posting Date,Förfallodatum kan inte vara före Publiceringsdatum
 DocType: Website Item Group,Website Item Group,Webbplats Produkt Grupp
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Duties and Taxes,Tullar och skatter
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Please enter Reference date,Ange Referensdatum
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +312,Please enter Reference date,Ange Referensdatum
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} betalningsposter kan inte filtreras genom {1}
 DocType: Item Website Specification,Table for Item that will be shown in Web Site,Tabell för punkt som kommer att visas i Web Site
 DocType: Purchase Order Item Supplied,Supplied Qty,Medföljande Antal
@@ -1601,7 +1544,7 @@
 apps/erpnext/erpnext/config/stock.py +103,Tree of Item Groups.,Träd artikelgrupper.
 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,Det går inte att hänvisa till radnr större än eller lika med aktuell rad nummer för denna avgiftstyp
 ,Item-wise Purchase History,Produktvis Köphistorik
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +152,Red,Röd
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Red,Röd
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +228,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},"Klicka på ""Skapa schema"" för att hämta Löpnummer inlagt för artikel {0}"
 DocType: Account,Frozen,Fryst
 ,Open Production Orders,Öppna produktionsorder
@@ -1616,7 +1559,7 @@
 DocType: Item Attribute,Attribute Name,Attribut Namn
 apps/erpnext/erpnext/controllers/selling_controller.py +236,Item {0} must be Sales or Service Item in {1},Produkt {0} måste vara försäljning eller serviceprodukt i {1}
 DocType: Item Group,Show In Website,Visa i Webbsida
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +621,Group,Grupp
+apps/erpnext/erpnext/public/js/setup_wizard.js +357,Group,Grupp
 DocType: Task,Expected Time (in hours),Förväntad tid (i timmar)
 ,Qty to Order,Antal till Ordern
 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","Om du vill spåra varumärke i följande dokument följesedel, Möjlighet, Materialhantering Request, punkt, inköpsorder, inköps Voucher, inköpare Kvitto, Offert, Försäljning Faktura, Produkt Bundle, kundorder, Löpnummer"
@@ -1626,6 +1569,7 @@
 DocType: Features Setup,Brands,Varumärken
 DocType: C-Form Invoice Detail,Invoice No,Faktura Nr
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +480,From Purchase Order,Från beställning
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +92,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Lämna inte kan tillämpas / avbryts innan {0}, som ledighet balans redan har carry-vidarebefordras i framtiden ledighet tilldelningspost {1}"
 DocType: Activity Cost,Costing Rate,Kalkylfrekvens
 ,Customer Addresses And Contacts,Kund adresser och kontakter
 DocType: Employee,Resignation Letter Date,Avskedsbrev Datum
@@ -1633,35 +1577,31 @@
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +137,Not Set,Inte Inställd
 DocType: Communication,Date,Datum
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,Upprepa kund Intäkter
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +651,Sit tight while your system is being setup. This may take a few moments.,Sitt tight medan systemet håller på att installationsprogrammet. Det kan ta en liten stund.
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +115,Sit tight while your system is being setup. This may take a few moments.,Sitt tight medan systemet håller på att installationsprogrammet. Det kan ta en liten stund.
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +51,{0} ({1}) must have role 'Expense Approver',"{0} ({1}) måste ha rollen ""Utgiftsgodkännare"""
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Pair,Par
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Pair,Par
 DocType: Bank Reconciliation Detail,Against Account,Mot Konto
 DocType: Maintenance Schedule Detail,Actual Date,Faktiskt Datum
 DocType: Item,Has Batch No,Har Sats nr
 DocType: Delivery Note,Excise Page Number,Punktnotering sidnummer
 DocType: Employee,Personal Details,Personliga Detaljer
 ,Maintenance Schedules,Underhålls scheman
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +44,Embossing,Prägling
 ,Quotation Trends,Offert Trender
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +139,Item Group not mentioned in item master for item {0},Produktgruppen nämns inte i huvudprodukten för objektet {0}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +302,Debit To account must be a Receivable account,Debitering av konto måste vara ett mottagarkonto
-apps/erpnext/erpnext/stock/doctype/item/item.py +310,"As Production Order can be made for this item, it must be a stock item.","Som produktionsorder kan göras för denna post, måste det vara en lagervara."
 DocType: Shipping Rule Condition,Shipping Amount,Fraktbelopp
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +140,Joining,Går med
-DocType: Authorization Rule,Above Value,Ovan Värde
 ,Pending Amount,Väntande antal
 DocType: Purchase Invoice Item,Conversion Factor,Omvandlingsfaktor
 DocType: Purchase Order,Delivered,Levereras
 apps/erpnext/erpnext/config/hr.py +160,Setup incoming server for jobs email id. (e.g. jobs@example.com),Inställning inkommande server jobb e-id. (T.ex. jobs@example.com)
 DocType: Purchase Receipt,Vehicle Number,Fordonsnummer
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,Den dag då återkommande faktura kommer att stoppa
+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,Totalt tilldelade blad {0} kan inte vara mindre än redan godkända blad {1} för perioden
 DocType: Journal Entry,Accounts Receivable,Kundreskontra
 ,Supplier-Wise Sales Analytics,Leverantör-Wise Sales Analytics
 DocType: Address Template,This format is used if country specific format is not found,Det här formatet används om landsspecifika format inte hittas
 DocType: Custom Field,Custom,Anpassad
 DocType: Production Order,Use Multi-Level BOM,Använd Multi-Level BOM
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +26,Injection molding,Formsprutning
 DocType: Bank Reconciliation,Include Reconciled Entries,Inkludera avstämnignsanteckningar
 apps/erpnext/erpnext/config/accounts.py +41,Tree of finanial accounts.,Träd finanial konton.
 DocType: Leave Control Panel,Leave blank if considered for all employee types,Lämna tomt om det anses vara för alla typer  av anställda
@@ -1671,30 +1611,28 @@
 apps/frappe/frappe/config/setup.py +130,Printing,Tryckning
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +114,Expense Claim is pending approval. Only the Expense Approver can update status.,Räkning väntar på godkännande. Endast Utgiftsgodkännare kan uppdatera status.
 DocType: Purchase Invoice,Additional Discount Amount,Ytterligare rabatt Belopp
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +99,The day(s) on which you are applying for leave are holiday. You need not apply for leave.,Dagen (er) som du ansöker om ledighet är semester. Du behöver inte ansöka om tjänstledighet.
 apps/frappe/frappe/public/js/frappe/misc/utils.js +110,and,och
 DocType: Leave Block List Allow,Leave Block List Allow,Lämna Block List Tillåt
 apps/erpnext/erpnext/setup/doctype/company/company.py +236,Abbr can not be blank or space,Förkortning kan inte vara tomt
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +50,Sports,Sport
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,Sport
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Actual,Totalt Faktisk
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Unit,Enhet
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Unit,Enhet
 apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.py +182,Please set Dropbox access keys in your site config,Ställ Dropbox snabbtangenter på din sida config
 apps/erpnext/erpnext/stock/get_item_details.py +113,Please specify Company,Ange Företag
 ,Customer Acquisition and Loyalty,Kundförvärv och Lojalitet
 DocType: Purchase Receipt,Warehouse where you are maintaining stock of rejected items,Lager där du hanterar lager av avvisade föremål
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +408,Your financial year ends on,Din räkenskapsår slutar
+apps/erpnext/erpnext/public/js/setup_wizard.js +156,Your financial year ends on,Din räkenskapsår slutar
 DocType: POS Profile,Price List,Prislista
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +20,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0} är nu standard räkenskapsår. Vänligen uppdatera din webbläsare för att ändringen ska träda i kraft.
 apps/erpnext/erpnext/projects/doctype/project/project.js +47,Expense Claims,Räkningar
 DocType: Issue,Support,Stöd
-DocType: Authorization Rule,Approving Role,Godkännande Roll
 ,BOM Search,BOM Sök
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +176,Closing (Opening + Totals),Stänger (Öppna + Totals)
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +26,Please specify currency in Company,Ange valuta i bolaget
 DocType: Workstation,Wages per hour,Löner per timme
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},Lagersaldo i Batch {0} kommer att bli negativ {1} till punkt {2} på Warehouse {3}
 apps/erpnext/erpnext/config/setup.py +83,"Show / Hide features like Serial Nos, POS etc.","Visa / Göm funktioner som serienumren, POS etc."
-apps/erpnext/erpnext/controllers/accounts_controller.py +236,Account {0} is invalid. Account Currency must be {1},Konto {0} är ogiltig. Konto Valuta måste vara {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +237,Account {0} is invalid. Account Currency must be {1},Konto {0} är ogiltig. Konto Valuta måste vara {1}
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +34,UOM Conversion factor is required in row {0},UOM omräkningsfaktor i rad {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +53,Clearance date cannot be before check date in row {0},Utförsäljningsdatumet kan inte vara före markerat datum i rad {0}
 DocType: Salary Slip,Deduction,Avdrag
@@ -1713,13 +1651,13 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +82,Item {0} has already been returned,Punkt {0} redan har returnerat
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** Räkenskapsårets ** representerar budgetåret. Alla bokföringsposter och andra större transaktioner spåras mot ** räkenskapsår **.
 DocType: Opportunity,Customer / Lead Address,Kund / Huvudadress
+apps/erpnext/erpnext/stock/doctype/item/item.py +112,Warning: Invalid SSL certificate on attachment {0},Varning: Ogiltig SSL-certifikat på fäst {0}
 DocType: Production Order Operation,Actual Operation Time,Faktisk driftstid
 DocType: Authorization Rule,Applicable To (User),Är tillämpligt för (Användare)
 DocType: Purchase Taxes and Charges,Deduct,Dra av
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +170,Job Description,Arbetsbeskrivning
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +170,Job Description,Arbetsbeskrivning
 DocType: Purchase Order Item,Qty as per Stock UOM,Antal per lager UOM
 apps/frappe/frappe/model/rename_doc.py +343,Please select a valid csv file with data,Välj en giltig csv-fil med data
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +92,Coating,Beläggning
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +126,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Specialtecken utom &quot;-&quot; &quot;.&quot;, &quot;#&quot;, och &quot;/&quot; inte tillåtet att namnge serie"
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Håll koll på säljkampanjer. Håll koll på Prospekter, Offerter, kundorder etc från kampanjer för att mäta avkastning på investeringen."
 DocType: Expense Claim,Approver,Godkännare
@@ -1729,12 +1667,11 @@
 DocType: Supplier Quotation,Manufacturing Manager,Tillverkningsansvarig
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},Löpnummer {0} är under garanti upp till {1}
 apps/erpnext/erpnext/config/stock.py +69,Split Delivery Note into packages.,Split följesedel i paket.
-apps/erpnext/erpnext/hooks.py +84,Shipments,Transporter
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +29,Dip molding,Doppgjutning
+apps/erpnext/erpnext/hooks.py +68,Shipments,Transporter
 DocType: Purchase Order,To be delivered to customer,Som skall levereras till kund
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,Tid Log Status måste lämnas in.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,Löpnummer {0} inte tillhör någon Warehouse
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +650,Setting Up,Konfigurera
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +114,Setting Up,Konfigurera
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,Row # ,Rad #
 DocType: Purchase Invoice,In Words (Company Currency),I ord (Företagsvaluta)
 DocType: Pricing Rule,Supplier,Leverantör
@@ -1742,7 +1679,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +105,Miscellaneous Expenses,Diverse Utgifter
 DocType: Global Defaults,Default Company,Standard Company
 apps/erpnext/erpnext/controllers/stock_controller.py +166,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,Utgift eller differens konto är obligatoriskt för punkt {0} som den påverkar totala lagervärdet
-apps/erpnext/erpnext/controllers/accounts_controller.py +354,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","Kan inte överdebitera till punkt {0} i rad {1} mer än {2}. För att möjliggöra överdebitering, ställ in i lager Inställningar"
+apps/erpnext/erpnext/controllers/accounts_controller.py +355,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","Kan inte överdebitera till punkt {0} i rad {1} mer än {2}. För att möjliggöra överdebitering, ställ in i lager Inställningar"
 DocType: Employee,Bank Name,Bank Namn
 apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +27,-Above,-Ovan
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +135,User {0} is disabled,Användare {0} är inaktiverad
@@ -1755,27 +1692,26 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,{0} is mandatory for Item {1},{0} är obligatoriskt för punkt {1}
 DocType: Currency Exchange,From Currency,Från Valuta
 DocType: DocField,Name,Namn
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +211,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Välj tilldelade beloppet, Faktura Typ och fakturanumret i minst en rad"
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +104,Sales Order required for Item {0},Kundorder krävs för punkt {0}
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +158,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Välj tilldelade beloppet, Faktura Typ och fakturanumret i minst en rad"
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +107,Sales Order required for Item {0},Kundorder krävs för punkt {0}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +43,Amounts not reflected in system,Belopp som inte återspeglas i systemet
 DocType: Purchase Invoice Item,Rate (Company Currency),Andel (Företagsvaluta)
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +40,Others,Annat
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +40,Others,Annat
 apps/erpnext/erpnext/templates/includes/product_page.js +80,Cannot find a matching Item. Please select some other value for {0}.,Det går inte att hitta en matchande objekt. Välj något annat värde för {0}.
 DocType: POS Profile,Taxes and Charges,Skatter och avgifter
 DocType: Item,"A Product or a Service that is bought, sold or kept in stock.","En produkt eller en tjänst som köps, säljs eller hålls i lager."
 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,"Det går inte att välja avgiftstyp som ""På föregående v Belopp"" eller ""På föregående v Total"" för första raden"
 apps/frappe/frappe/core/doctype/doctype/boilerplate/controller_list.html +31,Completed,Avslutade
 DocType: Web Form,Select DocType,Välj DocType
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +104,Broaching,Brotschning
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +12,Banking,Bank
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,Bank
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +38,Please click on 'Generate Schedule' to get schedule,"Klicka på ""Skapa schema"" för att få schemat"
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +283,New Cost Center,Nytt kostnadsställe
 DocType: Bin,Ordered Quantity,Beställd kvantitet
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +397,"e.g. ""Build tools for builders""",t.ex. &quot;Bygg verktyg för byggare&quot;
+apps/erpnext/erpnext/public/js/setup_wizard.js +145,"e.g. ""Build tools for builders""",t.ex. &quot;Bygg verktyg för byggare&quot;
 DocType: Quality Inspection,In Process,Pågående
 DocType: Authorization Rule,Itemwise Discount,Produktvis rabatt
 DocType: Purchase Order Item,Reference Document Type,Referensdokument Typ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +318,{0} against Sales Order {1},{0} mot kundorder {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +320,{0} against Sales Order {1},{0} mot kundorder {1}
 DocType: Account,Fixed Asset,Fast tillgångar
 apps/erpnext/erpnext/config/stock.py +283,Serialized Inventory,Serial numrerade Inventory
 DocType: Activity Type,Default Billing Rate,Standardfakturerings betyg
@@ -1790,14 +1726,13 @@
 DocType: Purchase Invoice Item,Page Break,Sidbrytning
 DocType: Production Order Operation,Pending,Väntar
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,Användare som kan godkänna en specifik arbetstagarens ledighet applikationer
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +33,You cannot change default UOM of Variant. To change default UOM for Variant change default UOM of the Template,Du kan inte ändra standard UOM av variant. Om du vill ändra standard UOM för Variant ändra standard UOM av mall
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +50,Office Equipments,Kontorsutrustning
 DocType: Purchase Invoice Item,Qty,Antal
 DocType: Fiscal Year,Companies,Företag
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +24,Electronics,Elektronik
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +24,Electronics,Elektronik
 DocType: Stock Settings,Raise Material Request when stock reaches re-order level,Höj material Begäran när lager når ombeställningsnivåer
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +18,From Maintenance Schedule,Från underhållsschema
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +56,Full-time,Heltid
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +56,Full-time,Heltid
 DocType: Purchase Invoice,Contact Details,Kontaktuppgifter
 DocType: C-Form,Received Date,Mottaget Datum
 DocType: Delivery Note,"If you have created a standard template in Sales Taxes and Charges Template, select one and click on the button below.","Om du har skapat en standardmall i skatter och avgifter Mall, välj en och klicka på knappen nedan."
@@ -1809,11 +1744,12 @@
 DocType: Job Applicant,Job Opening,Arbetsöppning
 DocType: Payment Reconciliation,Payment Reconciliation,Betalning Avstämning
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +154,Please select Incharge Person's name,Välj Ansvariges namn
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +51,Technology,Teknik
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,Teknik
 DocType: Offer Letter,Offer Letter,Erbjudande Brev
 apps/erpnext/erpnext/config/manufacturing.py +51,Generate Material Requests (MRP) and Production Orders.,Generera Material Begäran (GMB) och produktionsorder.
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +68,Total Invoiced Amt,Sammanlagt fakturerat Amt
 DocType: Time Log,To Time,Till Time
+DocType: Authorization Rule,Approving Role (above authorized value),Godkännande Roll (ovan auktoriserad värde)
 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.","Om du vill lägga ordnade noder, utforska träd och klicka på noden där du vill lägga till fler noder."
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +102,Credit To account must be a Payable account,Kredit till konto måste vara en skuld konto
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +233,BOM recursion: {0} cannot be parent or child of {2},BOM rekursion: {0} kan inte vara över eller barn under {2}
@@ -1826,10 +1762,8 @@
 DocType: Item,Customer Item Codes,Kund artikelnummer
 DocType: Opportunity,Lost Reason,Förlorad Anledning
 apps/erpnext/erpnext/config/accounts.py +68,Create Payment Entries against Orders or Invoices.,Skapa Betalnings inlägg mot Order eller Fakturor.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +141,Welding,Svetsning
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +40,New Stock UOM is required,Nytt Lager UOM krävs
 DocType: Quality Inspection,Sample Size,Provstorlek
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +443,All items have already been invoiced,Alla objekt har redan fakturerats
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +446,All items have already been invoiced,Alla objekt har redan fakturerats
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',Ange ett giltigt Från ärende nr &quot;
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +287,Further cost centers can be made under Groups but entries can be made against non-Groups,Ytterligare kostnadsställen kan göras i grupperna men poster kan göras mot icke-grupper
 DocType: Project,External,Extern
@@ -1841,8 +1775,7 @@
 DocType: Bin,Actual Quantity,Verklig Kvantitet
 DocType: Shipping Rule,example: Next Day Shipping,exempel: Nästa dag Leverans
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,Löpnummer {0} hittades inte
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +563,Your Customers,Dina kunder
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +27,Compression molding,Formpressning
+apps/erpnext/erpnext/public/js/setup_wizard.js +303,Your Customers,Dina kunder
 DocType: Leave Block List Date,Block Date,Block Datum
 DocType: Sales Order,Not Delivered,Inte Levererad
 ,Bank Clearance Summary,Banken Clearance Sammanfattning
@@ -1863,10 +1796,10 @@
 DocType: SMS Log,Sent To,Skickat Till
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +28,Make Sales Invoice,Skapa fakturan
 DocType: Company,For Reference Only.,För referens.
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +29,Invalid {0}: {1},Ogiltigt {0}: {1}
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +49,Invalid {0}: {1},Ogiltigt {0}: {1}
 DocType: Sales Invoice Advance,Advance Amount,Förskottsmängd
 DocType: Manufacturing Settings,Capacity Planning,Kapacitetsplanering
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +49,'From Date' is required,&quot;Från datum&quot; krävs
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +43,'From Date' is required,&quot;Från datum&quot; krävs
 DocType: Journal Entry,Reference Number,Referensnummer
 DocType: Employee,Employment Details,Personaldetaljer
 DocType: Employee,New Workplace,Ny Arbetsplats
@@ -1881,7 +1814,7 @@
 DocType: Serial No,Delivery Time,Leveranstid
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Åldring Baserad på
 DocType: Item,End of Life,Uttjänta
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +41,Travel,Resa
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +41,Travel,Resa
 DocType: Leave Block List,Allow Users,Tillåt användare
 DocType: Purchase Order,Customer Mobile No,Kund Mobil nr
 DocType: Sales Invoice,Recurring,Återkommande
@@ -1895,7 +1828,7 @@
 DocType: Naming Series,User must always select,Användaren måste alltid välja
 DocType: Stock Settings,Allow Negative Stock,Tillåt Negativ lager
 DocType: Installation Note,Installation Note,Installeringsnotis
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +541,Add Taxes,Lägg till skatter
+apps/erpnext/erpnext/public/js/setup_wizard.js +283,Add Taxes,Lägg till skatter
 ,Financial Analytics,Finansiella Analyser
 DocType: Quality Inspection,Verified By,Verifierad Av
 DocType: Address,Subsidiary,Dotterbolag
@@ -1905,7 +1838,6 @@
 DocType: System Settings,In Hours,I Timmar
 DocType: Process Payroll,Create Salary Slip,Skapa lönebeskedet
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Expected balance as per bank,Förväntad balans per bank
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +115,Buffing,Buffing
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Source of Funds (Liabilities),Källa fonderna (skulder)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +347,Quantity in row {0} ({1}) must be same as manufactured quantity {2},Kvantitet i rad {0} ({1}) måste vara samma som tillverkad mängd {2}
 DocType: Appraisal,Employee,Anställd
@@ -1922,11 +1854,11 @@
 DocType: Rename Tool,File to Rename,Fil att byta namn på
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +176,Purchse Order number required for Item {0},Inköp Beställningsnummer krävs för artikel {0}
 apps/erpnext/erpnext/public/js/controllers/transaction.js +136,Show Payments,Visa Betalningar
-apps/erpnext/erpnext/controllers/buying_controller.py +245,Specified BOM {0} does not exist for Item {1},Fastställt BOM {0} finns inte till punkt {1}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +202,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Underhållsschema {0} måste avbrytas innanman kan dra avbryta kundorder
+apps/erpnext/erpnext/controllers/buying_controller.py +236,Specified BOM {0} does not exist for Item {1},Fastställt BOM {0} finns inte till punkt {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Underhållsschema {0} måste avbrytas innanman kan dra avbryta kundorder
 apps/frappe/frappe/desk/page/backups/backups.html +13,Size,Storlek
 DocType: Notification Control,Expense Claim Approved,Räkningen Godkänd
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +113,Pharmaceutical,Farmaceutiska
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Pharmaceutical,Farmaceutiska
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,Kostnad för köpta varor
 DocType: Selling Settings,Sales Order Required,Kundorder krävs
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +30,Create Customer,Skapa kund
@@ -1936,7 +1868,6 @@
 DocType: Quality Inspection Reading,Reading 9,Avläsning 9
 DocType: Supplier,Is Frozen,Är Frozen
 DocType: Buying Settings,Buying Settings,Köpinställningar
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +122,Mass finishing,Mäss efterbehandling
 DocType: Stock Entry Detail,BOM No. for a Finished Good Item,BOM nr för ett Färdigt objekt
 DocType: Upload Attendance,Attendance To Date,Närvaro Till Datum
 apps/erpnext/erpnext/config/selling.py +158,Setup incoming server for sales email id. (e.g. sales@example.com),Inställning inkommande server för försäljning e-id. (T.ex. sales@example.com)
@@ -1944,7 +1875,7 @@
 DocType: Payment Tool,Payment Account,Betalningskonto
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +713,Please specify Company to proceed,Ange vilket bolag för att fortsätta
 apps/frappe/frappe/public/js/frappe/model/indicator.js +30,Draft,Förslag
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +46,Compensatory Off,Kompensations Av
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Compensatory Off,Kompensations Av
 DocType: Quality Inspection Reading,Accepted,Godkända
 DocType: User,Female,Kvinna
 DocType: Journal Entry Account,Debit in Account Currency,Betal i konto Valuta
@@ -1956,7 +1887,7 @@
 DocType: Shipping Rule,Shipping Rule Label,Frakt Regel Etikett
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +209,Raw Materials cannot be blank.,Råvaror kan inte vara tomt.
 DocType: Newsletter,Test,Test
-apps/erpnext/erpnext/stock/doctype/item/item.py +364,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +368,"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'","Eftersom det redan finns lagertransaktioner för denna artikel, \ kan du inte ändra värdena för ""Har Löpnummer"", ""Har Batch Nej"", ""Är Lagervara"" och ""Värderingsmetod"""
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +448,Quick Journal Entry,Quick Journal Entry
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +92,You can not change rate if BOM mentioned agianst any item,Du kan inte ändra kurs om BOM nämnts mot någon artikel
@@ -1967,13 +1898,14 @@
 apps/erpnext/erpnext/config/stock.py +18,Requests for items.,Begäran efter artiklar
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,Separat produktionsorder kommer att skapas för varje färdig bra objekt.
 DocType: Purchase Invoice,Terms and Conditions1,Villkor och Conditions1
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +18,Complete Setup,Avsluta Setup
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard_page.html +18,Complete Setup,Avsluta Setup
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","Kontering frysta fram till detta datum, ingen kan göra / ändra posten förutom ange roll nedan."
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +121,Please save the document before generating maintenance schedule,Vänligen spara dokumentet innan du skapar underhållsschema
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,Projektstatus
 DocType: UOM,Check this to disallow fractions. (for Nos),Markera att tillåta bråkdelar. (För NOS)
 apps/erpnext/erpnext/config/crm.py +96,Newsletter Mailing List,Nyhetsbrev e-postlista
 DocType: Delivery Note,Transporter Name,Transportör Namn
+DocType: Authorization Rule,Authorized Value,Auktoriserad Värde
 DocType: Contact,Enter department to which this Contact belongs,Ange avdelning som denna Kontakt tillhör
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Absent,Totalt Frånvarande
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +746,Item or Warehouse for row {0} does not match Material Request,Produkt eller Lager för rad {0} matchar inte Materialförfrågan
@@ -1998,16 +1930,15 @@
 DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),Basic Rate (enligt Stock UOM)
 DocType: SMS Log,No of Requested SMS,Antal Begärd SMS
 DocType: Campaign,Campaign-.####,Kampanj -. ####
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +55,Piercing,Piercing
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,Nästa steg
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +117,Contract End Date must be greater than Date of Joining,Kontraktets Slutdatum måste vara större än Datum för inträde
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,En tredje parts distributör / återförsäljare / bonusagent / affiliate / återförsäljare som säljer företagens produkter för en provision.
 DocType: Customer Group,Has Child Node,Har Under Node
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{0} against Purchase Order {1},{0} mot beställning {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +332,{0} against Purchase Order {1},{0} mot beställning {1}
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","Ange statiska url parametrar här (T.ex.. Avsändare = ERPNext, användarnamn = ERPNext, lösenord = 1234 mm)"
 apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,{0} {1} inte någon aktiv räkenskapsår. För mer information kolla {2}.
-apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,Detta är ett exempel webbplats automatiskt genererade från ERPNext
+apps/erpnext/erpnext/setup/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,Detta är ett exempel webbplats automatiskt genererade från ERPNext
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +37,Ageing Range 1,Åldringsräckvidd 1
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +110,Photochemical machining,Fotokemisk bearbetning
 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.
 
 #### Note
@@ -2033,7 +1964,7 @@
 DocType: Purchase Receipt Item,Recd Quantity,Recd Kvantitet
 DocType: Email Account,Email Ids,E-post Ids
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},Det går inte att producera mer artiklar {0} än kundorderns mängd {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +471,Stock Entry {0} is not submitted,Stock Entry {0} är inte lämnat
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +473,Stock Entry {0} is not submitted,Stock Entry {0} är inte lämnat
 DocType: Payment Reconciliation,Bank / Cash Account,Bank / Konto
 DocType: Tax Rule,Billing City,Fakturerings Ort
 DocType: Global Defaults,Hide Currency Symbol,Dölj Valutasymbol
@@ -2049,7 +1980,7 @@
 DocType: Purchase Invoice,Currency and Price List,Valuta och prislista
 DocType: Opportunity,Customer / Lead Name,Kund / Huvudnamn
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +63,Clearance Date not mentioned,Utförsäljningsdatum inte nämnt
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +71,Production,Produktion
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Production,Produktion
 DocType: Item,Allow Production Order,Tillåt produktionsorder
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +60,Row {0}:Start Date must be before End Date,Rad {0}: Startdatum måste vara före slutdatum
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Totalt (Antal)
@@ -2062,7 +1993,7 @@
 apps/erpnext/erpnext/utilities/doctype/address/address.py +113,My Addresses,Mina adresser
 DocType: Stock Ledger Entry,Outgoing Rate,Utgående betyg
 apps/erpnext/erpnext/config/hr.py +100,Organization branch master.,Organisation gren ledare.
-apps/erpnext/erpnext/controllers/accounts_controller.py +237, or ,eller
+apps/erpnext/erpnext/controllers/accounts_controller.py +238, or ,eller
 DocType: Sales Order,Billing Status,Faktureringsstatus
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Utility Expenses,Utility Kostnader
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,90-Above,90-Ovan
@@ -2089,6 +2020,7 @@
 DocType: Stock Entry Detail,Serial No / Batch,Löpnummer / Batch
 DocType: Product Bundle,Parent Item,Överordnad produkt
 DocType: Account,Account Type,Användartyp
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +113,Leave Type {0} cannot be carry-forwarded,Lämna typ {0} kan inte bära vidarebefordrade
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +213,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',"Underhållsschema genereras inte för alla objekt. Klicka på ""Generera Schema '"
 ,To Produce,Att Producera
 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","För rad {0} i {1}. Om du vill inkludera {2} i punkt hastighet, rader {3} måste också inkluderas"
@@ -2096,10 +2028,7 @@
 DocType: Bin,Reserved Quantity,Reserverad Kvantitet
 DocType: Landed Cost Voucher,Purchase Receipt Items,Inköpskvitto artiklar
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,Anpassa formulären
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +62,Cutting,Skärning
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +69,Flattening,Plattning
 DocType: Account,Income Account,Inkomst konto
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +22,Molding,Formning
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +632,Delivery,Leverans
 DocType: Stock Reconciliation Item,Current Qty,Aktuellt Antal
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",Se &quot;Rate of Materials Based On&quot; i kalkyl avsnitt
@@ -2109,19 +2038,18 @@
 apps/frappe/frappe/desk/moduleview.py +61,Documents,Dokument
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +17,Ref,Ref
 DocType: Cost Center,Cost Center,Kostnadscenter
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.js +48,Voucher #,Rabatt #
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +36,Voucher #,Rabatt #
 DocType: Notification Control,Purchase Order Message,Inköpsorder Meddelande
 DocType: Tax Rule,Shipping Country,Frakt Land
 DocType: Upload Attendance,Upload HTML,Ladda upp HTML
-apps/erpnext/erpnext/controllers/accounts_controller.py +391,"Total advance ({0}) against Order {1} cannot be greater \
+apps/erpnext/erpnext/controllers/accounts_controller.py +392,"Total advance ({0}) against Order {1} cannot be greater \
 				than the Grand Total ({2})",Totalt förskott ({0}) mot Beställ {1} ​​kan inte vara större \ än totalsumma ({2})
 DocType: Employee,Relieving Date,Avgångs Datum
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +12,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.",Prissättning regel görs för att skriva Prislista / definiera rabatt procentsats baserad på vissa kriterier.
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,Lager kan endast ändras via lagerposter / följesedel / inköpskvitto
 DocType: Employee Education,Class / Percentage,Klass / Procent
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +92,Head of Marketing and Sales,Chef för Marknad och Försäljning
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +31,Income Tax,Inkomstskatt
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +157,Laser engineered net shaping,Laser engineered nettoformnings
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Head of Marketing and Sales,Chef för Marknad och Försäljning
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +31,Income Tax,Inkomstskatt
 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.","Om du väljer prissättningsregel för ""Pris"", kommer det att överskriva Prislistas. Prissättningsregel priset är det slutliga priset, så ingen ytterligare rabatt bör tillämpas. Därför, i de transaktioner som kundorder, inköpsorder mm, kommer det att hämtas i ""Betygsätt fältet, snarare än"" Prislistavärde fältet."
 apps/erpnext/erpnext/config/selling.py +163,Track Leads by Industry Type.,Spår leder med Industry Type.
 DocType: Item Supplier,Item Supplier,Produkt Leverantör
@@ -2144,31 +2072,28 @@
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Faktiska Antal Efter transaktion
 ,Pending SO Items For Purchase Request,I avvaktan på SO Artiklar till inköpsanmodan
 DocType: Supplier,Billing Currency,Faktureringsvaluta
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +148,Extra Large,Extra Stor
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,Extra Large,Extra Stor
 ,Profit and Loss Statement,Resultaträkning
 DocType: Bank Reconciliation Detail,Cheque Number,Check Nummer
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +43,Pressing,Genom att trycka
 DocType: Payment Tool Detail,Payment Tool Detail,Betalning Verktygs Detalj
 ,Sales Browser,Försäljnings Webbläsare
 DocType: Journal Entry,Total Credit,Total Credit
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +474,Warning: Another {0} # {1} exists against stock entry {2},Varning: En annan {0} # {1} finns mot införande i lager {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +459,Local,Lokal
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +476,Warning: Another {0} # {1} exists against stock entry {2},Varning: En annan {0} # {1} finns mot införande i lager {2}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +397,Local,Lokal
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),Utlåning (tillgångar)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,Gäldenärer
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +147,Large,Stor
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +23,No employee found!,Ingen anställd hittas!
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Large,Stor
 DocType: C-Form Invoice Detail,Territory,Territorium
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,Ange antal besökare (krävs)
 DocType: Purchase Order,Customer Address Display,Kund Adress Display
 DocType: Stock Settings,Default Valuation Method,Standardvärderingsmetod
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +127,Polishing,Polering
 DocType: Production Order Operation,Planned Start Time,Planerad starttid
 apps/erpnext/erpnext/config/accounts.py +63,Close Balance Sheet and book Profit or Loss.,Stäng balansräkning och bokföringsmässig vinst eller förlust.
-apps/erpnext/erpnext/stock/doctype/item/item.py +661,"Default Unit of Measure for Item {0} cannot be changed directly because \
+apps/erpnext/erpnext/stock/doctype/item/item.py +665,"Default Unit of Measure for Item {0} cannot be changed directly because \
 			you have already made some transaction(s) with another UOM. To change default UOM, \
 			use 'UOM Replace Utility' tool under Stock module.","Standard mätenhet för punkt {0} kan inte ändras direkt eftersom \ du redan har gjort vissa transaktioner (s) med en annan UOM. Om du vill ändra standard UOM, \ användning &quot;UOM Byt Utility&quot; verktyg i Stock-modul."
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,Ange växelkursen för att konvertera en valuta till en annan
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +146,Quotation {0} is cancelled,Offert {0} avbryts
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +141,Quotation {0} is cancelled,Offert {0} avbryts
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,Totala utestående beloppet
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} was on leave on {1}. Cannot mark attendance.,Anställd {0} var på permission på {1}. Det går inte att markera närvaro.
 DocType: Sales Partner,Targets,Mål
@@ -2179,7 +2104,6 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +158,Please create Customer from Lead {0},Skapa Kunden från Prospekt {0}
 DocType: Price List,Applicable for Countries,Gäller Länder
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Computers,Datorer
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +112,Electro-chemical grinding,Elektrokemisk slipning
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +14,This is a root customer group and cannot be edited.,Detta är en rot kundgrupp och kan inte ändras.
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +39,Please setup your chart of accounts before you start Accounting Entries,Vänligen ställa in dina kontoplaner innan du börjar bokföringsposter
 DocType: Purchase Invoice,Ignore Pricing Rule,Ignorera Prisregler
@@ -2225,7 +2149,6 @@
 DocType: Maintenance Visit,Purposes,Ändamål
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +103,Atleast one item should be entered with negative quantity in return document,Minst ett objekt ska anges med negativt kvantitet i returdokument
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +67,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","Operation {0} längre än alla tillgängliga arbetstiden i arbetsstation {1}, bryta ner verksamheten i flera operationer"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +134,Electrochemical machining,Elektrokemiska bearbetnings
 ,Requested,Begärd
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +66,No Remarks,Anmärkningar
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +13,Overdue,Försenad
@@ -2234,7 +2157,7 @@
 DocType: Monthly Distribution,Distribution Name,Distributions Namn
 DocType: Features Setup,Sales and Purchase,Försäljning och Inköp
 DocType: Supplier Quotation Item,Material Request No,Material Ansökaningsnr
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +218,Quality Inspection required for Item {0},Kvalitetskontroll krävs för punkt {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +221,Quality Inspection required for Item {0},Kvalitetskontroll krävs för punkt {0}
 DocType: Quotation,Rate at which customer's currency is converted to company's base currency,I takt med vilket vilken kundens valuta omvandlas till företagets basvaluta
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +107,{0} has been successfully unsubscribed from this list.,{0} har avslutat prenumerationen på den här listan.
 DocType: Purchase Invoice Item,Net Rate (Company Currency),Netto kostnad (Företagsvaluta)
@@ -2252,9 +2175,8 @@
 apps/erpnext/erpnext/accounts/report/financial_statements.py +16,Fiscal Year {0} not found.,Räkenskapsårets {0} hittades inte.
 DocType: Bank Reconciliation,Get Relevant Entries,Hämta relevanta uppgifter
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +407,Accounting Entry for Stock,Kontering för lager
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +64,Coining,Prägling
 DocType: Sales Invoice,Sales Team1,Försäljnings Team1
-apps/erpnext/erpnext/stock/doctype/item/item.py +412,Item {0} does not exist,Punkt {0} inte existerar
+apps/erpnext/erpnext/stock/doctype/item/item.py +416,Item {0} does not exist,Punkt {0} inte existerar
 DocType: Sales Invoice,Customer Address,Kundadress
 apps/frappe/frappe/desk/query_report.py +136,Total,Totalt
 DocType: Purchase Invoice,Apply Additional Discount On,Applicera ytterligare rabatt på
@@ -2266,14 +2188,13 @@
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),Skattebelopp efter rabatt Belopp (Company valuta)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +149,Target warehouse is mandatory for row {0},Target lager är obligatoriskt för rad {0}
 DocType: Quality Inspection,Quality Inspection,Kvalitetskontroll
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +144,Extra Small,Extra Liten
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +20,Spray forming,Spray bildande
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Extra Small,Extra Liten
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +458,Warning: Material Requested Qty is less than Minimum Order Qty,Varning: Material Begärt Antal är mindre än Minimum Antal
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +191,Account {0} is frozen,Kontot {0} är fruset
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Juridisk person / Dotterbolag med en separat kontoplan som tillhör organisationen.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +29,"Food, Beverage & Tobacco","Mat, dryck och tobak"
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","Mat, dryck och tobak"
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +20,PL or BS,PL eller BS
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,Can only make payment against unbilled {0},Kan bara göra betalning mot ofakturerade {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +531,Can only make payment against unbilled {0},Kan bara göra betalning mot ofakturerade {0}
 apps/erpnext/erpnext/controllers/selling_controller.py +122,Commission rate cannot be greater than 100,Provisionshastighet kan inte vara större än 100
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Minimum Inventory Level,Minsta lagernivå
 DocType: Stock Entry,Subcontract,Subkontrakt
@@ -2284,19 +2205,18 @@
 DocType: Item,Manufacturer Part Number,Tillverkarens varunummer
 DocType: Production Order Operation,Estimated Time and Cost,Beräknad tid och kostnad
 DocType: Bin,Bin,Bin
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +50,Nosing,Nosing
 DocType: SMS Log,No of Sent SMS,Antal skickade SMS
 DocType: Account,Company,Företaget
 DocType: Account,Expense Account,Utgiftskonto
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +49,Software,Programvara
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +151,Colour,Färg
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +49,Software,Programvara
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Colour,Färg
 DocType: Maintenance Visit,Scheduled,Planerad
 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","Välj punkt där ""Är Lagervara"" är ""Nej"" och ""Är försäljningsprodukt"" är ""Ja"" och det finns ingen annat produktpaket"
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,Välj Månads Distribution till ojämnt fördela målen mellan månader.
 DocType: Purchase Invoice Item,Valuation Rate,Värderings betyg
 apps/erpnext/erpnext/stock/get_item_details.py +281,Price List Currency not selected,Prislista Valuta inte valt
 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,"Produktrad {0}: inköpskvitto {1} finns inte i ovanstående ""kvitton"""
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +134,Employee {0} has already applied for {1} between {2} and {3},Anställd {0} har redan ansökt om {1} mellan {2} och {3}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +145,Employee {0} has already applied for {1} between {2} and {3},Anställd {0} har redan ansökt om {1} mellan {2} och {3}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Projekt Startdatum
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +8,Until,Tills
 DocType: Rename Tool,Rename Log,Ändra logg
@@ -2306,7 +2226,7 @@
 apps/erpnext/erpnext/controllers/recurring_document.py +162,Please select {0},Välj {0}
 DocType: C-Form,C-Form No,C-form Nr
 DocType: BOM,Exploded_items,Vidgade_artiklar
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +95,Researcher,Forskare
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Researcher,Forskare
 apps/frappe/frappe/custom/doctype/customize_form/customize_form.js +88,Update,Uppdatera
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +78,Please save the Newsletter before sending,Spara nyhetsbrevet innan du skickar
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +23,Name or Email is mandatory,Namn eller e-post är obligatoriskt
@@ -2315,11 +2235,10 @@
 DocType: Employee,Exit,Utgång
 apps/erpnext/erpnext/accounts/doctype/account/account.py +134,Root Type is mandatory,Root Type är obligatorisk
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +295,Serial No {0} created,Löpnummer {0} skapades
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +125,Vibratory finishing,Vibrerande efterbehandling
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","För att underlätta för kunderna, kan dessa koder användas i utskriftsformat som fakturor och följesedlar"
 DocType: Employee,You can enter any date manually,Du kan ange något datum manuellt
 DocType: Sales Invoice,Advertisement,Annons
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +165,Probationary Period,Provanställning
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Probationary Period,Provanställning
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Endast huvudnoder är tillåtna i transaktionen
 DocType: Expense Claim,Expense Approver,Utgiftsgodkännare
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,Inköpskvitto Artikel Levereras
@@ -2327,19 +2246,16 @@
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +17,To Datetime,Till Datetime
 DocType: SMS Settings,SMS Gateway URL,SMS Gateway webbadress
 apps/erpnext/erpnext/config/crm.py +53,Logs for maintaining sms delivery status,Loggar för att upprätthålla sms leveransstatus
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +137,Grinding,Slipning
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +34,Shrink wrapping,Krymp inslag
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +36,Pending Activities,Väntande Verksamhet
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,Confirmed,Bekräftat
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier > Supplier Type,Leverantör&gt; Leverantör Typ
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +127,Please enter relieving date.,Ange avlösningsdatum.
 apps/erpnext/erpnext/controllers/trends.py +137,Amt,Ant
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' can be submitted,"Endast ledighets applikationer med status ""Godkänd"" kan lämnas in"
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +51,Only Leave Applications with status 'Approved' can be submitted,"Endast ledighets applikationer med status ""Godkänd"" kan lämnas in"
 apps/erpnext/erpnext/utilities/doctype/address/address.py +21,Address Title is mandatory.,Adress titel är obligatorisk.
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,Ange namnet på kampanjen om källförfrågan är kampanjen
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +38,Newspaper Publishers,Tidningsutgivarna
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +38,Newspaper Publishers,Tidningsutgivarna
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,Välj Räkenskapsårets
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +88,Smelting,Smältning
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Ombeställningsnivå
 DocType: Attendance,Attendance Date,Närvaro Datum
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,Lön upplösning baserat på inkomster och avdrag.
@@ -2354,16 +2270,15 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +414,[Error],[Fel]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,I Ord kommer att synas när du sparar kundorder.
 ,Employee Birthday,Anställd Födelsedag
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +55,Venture Capital,Tilldelningskapital
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,Tilldelningskapital
 DocType: UOM,Must be Whole Number,Måste vara heltal
 DocType: Leave Control Panel,New Leaves Allocated (In Days),Nya Ledigheter Tilldelade (i dagar)
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +51,Serial No {0} does not exist,Serienummer {0} inte existerar
 DocType: Pricing Rule,Discount Percentage,Rabatt Procent
 DocType: Payment Reconciliation Invoice,Invoice Number,Fakturanummer
-apps/erpnext/erpnext/hooks.py +70,Orders,Beställningar
+apps/erpnext/erpnext/hooks.py +54,Orders,Beställningar
 DocType: Leave Control Panel,Employee Type,Anställningstyp
 DocType: Employee Leave Approver,Leave Approver,Ledighetsgodkännare
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +70,Swaging,Stukning
 DocType: Manufacturing Settings,Material Transferred for Manufacture,Material Överfört för tillverkning
 DocType: Expense Claim,"A user with ""Expense Approver"" role","En användare med ""Utgiftsgodkännare"" roll"
 ,Issued Items Against Production Order,Utfärdarde objekt mot produktionsorder
@@ -2375,7 +2290,6 @@
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +62,Cost Center with existing transactions can not be converted to group,Kostnadsställe med befintliga transaktioner kan inte omvandlas till grupp
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Depreciation,Avskrivningar
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Leverantör (s)
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +29,Invalid period,Ogiltig period
 DocType: Customer,Credit Limit,Kreditgräns
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,Välj typ av transaktion
 DocType: GL Entry,Voucher No,Rabatt nr
@@ -2385,9 +2299,9 @@
 DocType: Customer,Address and Contact,Adress och Kontakt
 DocType: Customer,Last Day of the Next Month,Sista dagen i nästa månad
 DocType: Employee,Feedback,Respons
+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}","Lämna inte kan fördelas före {0}, som ledighet balans redan har carry-vidarebefordras i framtiden ledighet tilldelningspost {1}"
 apps/erpnext/erpnext/accounts/party.py +284,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),OBS: På grund / Referens Datum överstiger tillåtna kundkreditdagar från {0} dag (ar)
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +621,Maint. Schedule,Maint. Tidtabell
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +108,Abrasive jet machining,Maskinbearbetning Stråle
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +632,Maint. Schedule,Maint. Tidtabell
 DocType: Stock Settings,Freeze Stock Entries,Frys Lager Inlägg
 DocType: Website Settings,Website Settings,Webbplatsinställningar
 DocType: Item,Reorder level based on Warehouse,Beställningsnivå baserat på Warehouse
@@ -2404,7 +2318,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +75,Show Stock Entries,Visa Stock Inlägg
 ,Is Primary Address,Är Primär adress
 DocType: Production Order,Work-in-Progress Warehouse,Pågående Arbete - Lager
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +308,Reference #{0} dated {1},Referens # {0} den {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Reference #{0} dated {1},Referens # {0} den {1}
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +13,Manage Addresses,Hantera Adresser
 DocType: Pricing Rule,Item Code,Produktkod
 DocType: Production Planning Tool,Create Production Orders,Skapa produktionsorder
@@ -2413,7 +2327,7 @@
 DocType: Lead,Market Segment,Marknadssegment
 DocType: Communication,Phone,Telefon
 DocType: Employee Internal Work History,Employee Internal Work History,Anställd interna arbetshistoria
-apps/erpnext/erpnext/public/js/account_tree_grid.js +50,Closing (Dr),Closing (Dr)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +221,Closing (Dr),Closing (Dr)
 DocType: Contact,Passive,Passiv
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,Löpnummer {0} inte i lager
 apps/erpnext/erpnext/config/selling.py +127,Tax template for selling transactions.,Skatte mall för att sälja transaktioner.
@@ -2429,8 +2343,8 @@
 ,Billed Amount,Fakturerat antal
 DocType: Bank Reconciliation,Bank Reconciliation,Bankavstämning
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +9,Get Updates,Hämta uppdateringar
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +129,Material Request {0} is cancelled or stopped,Material Begäran {0} avbryts eller stoppas
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +641,Add a few sample records,Lägg till några exempeldokument
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +133,Material Request {0} is cancelled or stopped,Material Begäran {0} avbryts eller stoppas
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Add a few sample records,Lägg till några exempeldokument
 apps/erpnext/erpnext/config/hr.py +210,Leave Management,Lämna ledning
 DocType: Event,Groups,Grupper
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,Grupp per konto
@@ -2443,38 +2357,34 @@
 DocType: Features Setup,Sales Extras,Försäljnings Extras
 apps/erpnext/erpnext/accounts/utils.py +344,{0} budget for Account {1} against Cost Center {2} will exceed by {3},{0} budget för Konto {1} mot kostnadsställe {2} kommer att överstiga med {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +236,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Differenskonto måste vara en tillgång / skuld kontotyp, eftersom denna lageravstämning är en öppnings post"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +138,Purchase Order number required for Item {0},Inköpsordernr som krävs för punkt {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Order number required for Item {0},Inköpsordernr som krävs för punkt {0}
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',&quot;Från datum&quot; måste vara efter &quot;Till datum&quot;
 ,Stock Projected Qty,Lager Projicerad Antal
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +147,Customer {0} does not belong to project {1},Kund {0} tillhör inte projektet {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +150,Customer {0} does not belong to project {1},Kund {0} tillhör inte projektet {1}
 DocType: Sales Order,Customer's Purchase Order,Kundens beställning
 DocType: Warranty Claim,From Company,Från Företag
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,Värde eller Antal
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Minute,Minut
+apps/erpnext/erpnext/public/js/setup_wizard.js +363,Minute,Minut
 DocType: Purchase Invoice,Purchase Taxes and Charges,Inköp skatter och avgifter
 ,Qty to Receive,Antal att ta emot
 DocType: Leave Block List,Leave Block List Allowed,Lämna Block List tillåtna
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +61,Conversion factor cannot be in fractions,Omvandlingsfaktor kan inte vara i fraktioner
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +358,You will use it to Login,Du kommer att använda den för att logga in
+apps/erpnext/erpnext/public/js/setup_wizard.js +108,You will use it to Login,Du kommer att använda den för att logga in
 DocType: Sales Partner,Retailer,Återförsäljare
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +99,Credit To account must be a Balance Sheet account,Tack till kontot måste vara ett balanskonto
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,Alla Leverantörs Typer
 apps/erpnext/erpnext/stock/doctype/item/item.py +37,Item Code is mandatory because Item is not automatically numbered,Produktkod är obligatoriskt eftersom Varan inte är automatiskt numrerad
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +99,Quotation {0} not of type {1},Offert {0} inte av typen {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +93,Quotation {0} not of type {1},Offert {0} inte av typen {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,Underhållsschema Produkt
 DocType: Sales Order,%  Delivered,% Levereras
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,Bank Overdraft Account,Checkräknings konto
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +15,Make Salary Slip,Skapa lönebeskedet
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +18,Browse BOM,Bläddra BOM
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +175,Secured Loans,Säkrade lån
-apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +3,Awesome Products,Grymma Produkter
+apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +3,Awesome Products,Grymma Produkter
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +189,Opening Balance Equity,Ingående balans kapital
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +80,Cannot approve leave as you are not authorized to approve leaves on Block Dates,Det går inte att godkänna ledighet eftersom du inte har behörighet att godkänna lediget på Block Datum
 DocType: Appraisal,Appraisal,Värdering
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +13,Lost-foam casting,Lost-skum gjutning
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +47,Drawing,Ritning
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +22,Date is repeated,Datum upprepas
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +148,Leave approver must be one of {0},Ledighetsgodkännare måste vara en av {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +162,Leave approver must be one of {0},Ledighetsgodkännare måste vara en av {0}
 DocType: Hub Settings,Seller Email,Säljare E-post
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Totala inköpskostnaden (via inköpsfaktura)
 DocType: Workstation Working Hour,Start Time,Starttid
@@ -2488,7 +2398,7 @@
 DocType: Purchase Invoice Item,Net Amount (Company Currency),Nettobelopp (Företagsvaluta)
 DocType: BOM Operation,Hour Rate,Tim värde
 DocType: Stock Settings,Item Naming By,Produktnamn Genom
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +642,From Quotation,Från Offert
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +655,From Quotation,Från Offert
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},En annan period Utgående anteckning {0} har gjorts efter {1}
 DocType: Production Order,Material Transferred for Manufacturing,Material Överfört för tillverkning
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +29,Account {0} does not exists,Konto {0} existerar inte
@@ -2502,21 +2412,19 @@
 DocType: Purchase Invoice Item,PR Detail,PR Detalj
 DocType: Sales Order,Fully Billed,Fullt fakturerad
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +20,Cash In Hand,Kontant i hand
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +72,Delivery warehouse required for stock item {0},Leverans lager som krävs för Beställningsvara {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +119,Delivery warehouse required for stock item {0},Leverans lager som krävs för Beställningsvara {0}
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),Bruttovikten på paketet. Vanligtvis nettovikt + förpackningsmaterial vikt. (För utskrift)
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Användare med den här rollen får ställa frysta konton och skapa / ändra bokföringsposter mot frysta konton
 DocType: Serial No,Is Cancelled,Är Inställd
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +281,My Shipments,Mina Transporter
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +286,My Shipments,Mina Transporter
 DocType: Journal Entry,Bill Date,Faktureringsdatum
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +43,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","Även om det finns flera prissättningsregler med högsta prioritet, kommer följande interna prioriteringar tillämpas:"
 DocType: Supplier,Supplier Details,Leverantör Detaljer
 DocType: Communication,Recipients,Mottagare
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +146,Screwing,Skruvning
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +96,Knurling,Räffling
 DocType: Expense Claim,Approval Status,Godkännandestatus
 DocType: Hub Settings,Publish Items to Hub,Publicera produkter i Hub
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +44,From value must be less than to value in row {0},Från Talet måste vara lägre än värdet i rad {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +133,Wire Transfer,Elektronisk Överföring
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +133,Wire Transfer,Elektronisk Överföring
 apps/erpnext/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py +25,Please select Bank Account,Välj bankkonto
 DocType: Newsletter,Create and Send Newsletters,Skapa och skicka nyhetsbrev
 apps/frappe/frappe/public/js/frappe/views/reports/grid_report.js +305,From Date must be before To Date,Från Datum måste vara före Till Datum
@@ -2524,14 +2432,14 @@
 DocType: Company,Default Income Account,Standard Inkomstkonto
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,Kundgrupp / Kunder
 DocType: Item Group,Check this if you want to show in website,Markera det här om du vill visa i hemsida
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +190,Welcome to ERPNext,Välkommen till oss
+,Welcome to ERPNext,Välkommen till oss
 DocType: Payment Reconciliation Payment,Voucher Detail Number,Rabatt Detalj Antal
 apps/erpnext/erpnext/config/crm.py +146,Lead to Quotation,Prospekt till offert
 DocType: Lead,From Customer,Från Kunden
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +37,Calls,Samtal
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Calls,Samtal
 DocType: Project,Total Costing Amount (via Time Logs),Totalt kalkyl Belopp (via Time Loggar)
 DocType: Purchase Order Item Supplied,Stock UOM,Lager UOM
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Purchase Order {0} is not submitted,Inköpsorder {0} inte lämnad
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +194,Purchase Order {0} is not submitted,Inköpsorder {0} inte lämnad
 ,Projected,Projicerad
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},Serienummer {0} tillhör inte Lager {1}
 apps/erpnext/erpnext/controllers/status_updater.py +136,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Obs: Systemet kommer inte att kontrollera över leverans och överbokning till punkt {0} då kvantitet eller belopp är 0
@@ -2539,7 +2447,6 @@
 DocType: Issue,Opening Date,Öppningsdatum
 DocType: Journal Entry,Remark,Anmärkning
 DocType: Purchase Receipt Item,Rate and Amount,Andel och Belopp
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +95,Boring,Borning
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +667,From Sales Order,Från kundorder
 DocType: Blog Category,Parent Website Route,Överordnad Webbplatsrutt
 DocType: Sales Order,Not Billed,Inte Billed
@@ -2553,19 +2460,17 @@
 apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount Amount,Rabattbelopp
 DocType: Purchase Invoice,Return Against Purchase Invoice,Återgå mot inköpsfaktura
 DocType: Item,Warranty Period (in days),Garantitiden (i dagar)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +550,e.g. VAT,t.ex. moms
+apps/erpnext/erpnext/public/js/setup_wizard.js +292,e.g. VAT,t.ex. moms
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,Produkt  4
 DocType: Journal Entry Account,Journal Entry Account,Journalanteckning konto
 DocType: Shopping Cart Settings,Quotation Series,Offert Serie
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +52,"An item exists with same name ({0}), please change the item group name or rename the item","Ett objekt finns med samma namn ({0}), ändra objektets varugrupp eller byt namn på objektet"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +82,Hot metal gas forming,Hot metal gas bildar
 DocType: Sales Order Item,Sales Order Date,Kundorder Datum
 DocType: Sales Invoice Item,Delivered Qty,Levererat Antal
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +63,Warehouse {0}: Company is mandatory,Lager {0}: Företaget är obligatoriskt
 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.","Gå till lämplig grupp (vanligtvis Kostnadskälla> Kortfristiga skulder> skatter och avgifter och skapa ett nytt konto (genom att klicka på Lägg till typ) av typen ""skatt"" och nämn skattesatsen."
 ,Payment Period Based On Invoice Date,Betalningstiden Baserad på Fakturadatum
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +50,Missing Currency Exchange Rates for {0},Saknas valutakurser för {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +135,Laser cutting,Laserskärning
 DocType: Event,Monday,Måndag
 DocType: Journal Entry,Stock Entry,Stock Entry
 DocType: Account,Payable,Betalning sker
@@ -2598,7 +2503,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +111,Date Of Retirement must be greater than Date of Joining,Datum för pensionering måste vara större än Datum för att delta
 DocType: Sales Invoice,Against Income Account,Mot Inkomst konto
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +69,{0}% Delivered,{0}% Levererad
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +78,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Produkt  {0}: Beställd st {1} kan inte vara mindre än minimiorder st {2} (definierat i punkt).
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Produkt  {0}: Beställd st {1} kan inte vara mindre än minimiorder st {2} (definierat i punkt).
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Månadsdistributions Procent
 DocType: Territory,Territory Targets,Territorium Mål
 DocType: Delivery Note,Transporter Info,Transporter info
@@ -2607,7 +2512,6 @@
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,Titlar för utskriftsmallar t.ex. Proforma faktura.
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +140,Valuation type charges can not marked as Inclusive,Värderingsavgifter kan inte markerats som inklusive
 DocType: POS Profile,Update Stock,Uppdatera lager
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +128,Superfinishing,Superfinishing
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,Olika UOM för produkter kommer att leda till felaktiga (Total) Nettovikts värden. Se till att Nettovikt för varje post är i samma UOM.
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM betyg
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +85,Please pull items from Delivery Note,Vänligen hämta artikel från följesedel
@@ -2622,7 +2526,6 @@
 ,Purchase Analytics,Inköps analyser
 DocType: Sales Invoice Item,Delivery Note Item,Följesedel Anteckningspunkt
 DocType: Expense Claim,Task,Uppgift
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +57,Shaving,Rakning
 DocType: Purchase Taxes and Charges,Reference Row #,Referens Rad #
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},Batchnummer är obligatoriskt för punkt {0}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js +14,This is a root sales person and cannot be edited.,Detta är en rot säljare och kan inte ändras.
@@ -2634,13 +2537,11 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +74,Purpose must be one of {0},Syfte måste vara en av {0}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +108,Fill the form and save it,Fyll i formuläret och spara det
 DocType: Production Planning Tool,Download a report containing all raw materials with their latest inventory status,Hämta en rapport som innehåller alla råvaror med deras senaste lagerstatus
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +94,Facing,Facing
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,Community Forum
 DocType: Leave Application,Leave Balance Before Application,Ledighets balans innan Ansökan
 DocType: SMS Center,Send SMS,Skicka SMS
 DocType: Company,Default Letter Head,Standard Brev
 DocType: Time Log,Billable,Fakturerbar
-DocType: Authorization Rule,This will be used for setting rule in HR module,Detta kommer att användas för att ställa in regeln i HR-modul
 DocType: Account,Rate at which this tax is applied,I takt med vilken denna skatt tillämpas
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reorder Qty,Ombeställningskvantitet
 DocType: Company,Stock Adjustment Account,Lager Justering Konto
@@ -2667,16 +2568,15 @@
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,Procentuell Fördelning bör vara lika med 100%
 DocType: Serial No,Out of AMC,Slut på AMC
 DocType: Purchase Order Item,Material Request Detail No,Material Begär Detalj nr
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +97,Hard turning,Hårdsvarvning
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +33,Make Maintenance Visit,Skapa Servicebesök
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +187,Please contact to the user who have Sales Master Manager {0} role,Vänligen kontakta för användaren som har roll försäljningschef {0} 
 DocType: Company,Default Cash Account,Standard Konto
 apps/erpnext/erpnext/config/accounts.py +79,Company (not Customer or Supplier) master.,Företag (inte kund eller leverantör) ledare.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +106,Please enter 'Expected Delivery Date',Ange &quot;Förväntat leveransdatum&quot;
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +187,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Följesedelsnoteringar {0} måste avbrytas innan du kan avbryta denna kundorder
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +100,Please enter 'Expected Delivery Date',Ange &quot;Förväntat leveransdatum&quot;
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +182,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Följesedelsnoteringar {0} måste avbrytas innan du kan avbryta denna kundorder
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +373,Paid amount + Write Off Amount can not be greater than Grand Total,Betald belopp + Avskrivningsbelopp kan inte vara större än Totalsumma
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} är inte en giltig batchnummer för punkt {1}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,Note: There is not enough leave balance for Leave Type {0},Obs: Det finns inte tillräckligt med ledighetdagar för ledighet typ {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +124,Note: There is not enough leave balance for Leave Type {0},Obs: Det finns inte tillräckligt med ledighetdagar för ledighet typ {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.","Notera: Om betalning inte sker mot någon referens, gör Journalpost manuellt."
 DocType: Item,Supplier Items,Leverantör artiklar
 DocType: Opportunity,Opportunity Type,Möjlighet Typ
@@ -2688,7 +2588,7 @@
 DocType: Hub Settings,Publish Availability,Publicera tillgänglighet
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +105,Date of Birth cannot be greater than today.,Födelsedatum kan inte vara längre fram än i dag.
 ,Stock Ageing,Lager Åldrande
-apps/erpnext/erpnext/controllers/accounts_controller.py +200,{0} '{1}' is disabled,{0} {1} &quot;är inaktiverad
+apps/erpnext/erpnext/controllers/accounts_controller.py +201,{0} '{1}' is disabled,{0} {1} &quot;är inaktiverad
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Ange som Open
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Skicka automatiska meddelanden till kontakter på Skickar transaktioner.
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +232,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
@@ -2697,44 +2597,38 @@
 DocType: Purchase Order,Customer Contact Email,Kundkontakt Email
 DocType: Event,Sunday,Söndag
 DocType: Sales Team,Contribution (%),Bidrag (%)
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +455,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,"Obs: Betalningpost kommer inte skapas eftersom ""Kontanter eller bankkonto"" angavs inte"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +171,Responsibilities,Ansvarsområden
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +457,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,"Obs: Betalningpost kommer inte skapas eftersom ""Kontanter eller bankkonto"" angavs inte"
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +171,Responsibilities,Ansvarsområden
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Template,Mall
 DocType: Sales Person,Sales Person Name,Försäljnings Person Namn
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,Ange minst 1 faktura i tabellen
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +511,Add Users,Lägg till användare
+apps/erpnext/erpnext/public/js/setup_wizard.js +255,Add Users,Lägg till användare
 DocType: Pricing Rule,Item Group,Produkt Grupp
 DocType: Task,Actual Start Date (via Time Logs),Faktiskt startdatum (via Tidslogg)
 DocType: Stock Reconciliation Item,Before reconciliation,Innan avstämning
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +12,To {0},Till {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Skatter och avgifter Added (Company valuta)
-apps/erpnext/erpnext/stock/doctype/item/item.py +340,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Produkt Skatte Rad {0} måste ha typen Skatt eller intäkt eller kostnad eller Avgiftsbelagd
+apps/erpnext/erpnext/stock/doctype/item/item.py +344,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Produkt Skatte Rad {0} måste ha typen Skatt eller intäkt eller kostnad eller Avgiftsbelagd
 DocType: Sales Order,Partly Billed,Delvis Faktuerard
 DocType: Item,Default BOM,Standard BOM
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +79,Decambering,Decambering
 apps/erpnext/erpnext/setup/doctype/company/company.js +22,Please re-type company name to confirm,Vänligen ange företagsnamn igen för att bekräfta
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,Totalt Utestående Amt
 DocType: Time Log Batch,Total Hours,Totalt antal timmar
 DocType: Journal Entry,Printing Settings,Utskriftsinställningar
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +268,Total Debit must be equal to Total Credit. The difference is {0},Totalt Betal måste vara lika med de sammanlagda kredit. Skillnaden är {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +11,Automotive,Fordon
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +37,Item is required,Produkt krävs
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +25,Metal injection molding,Metall formsprutning
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +258,Total Debit must be equal to Total Credit. The difference is {0},Totalt Betal måste vara lika med de sammanlagda kredit. Skillnaden är {0}
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,Fordon
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +684,From Delivery Note,Från Följesedel
 DocType: Time Log,From Time,Från Tid
 DocType: Notification Control,Custom Message,Anpassat Meddelande
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +33,Investment Banking,Investment Banking
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +261,"Select your Country, Time Zone and Currency","Välj ditt land, tidszon och valuta"
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,Investment Banking
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +316,"Select your Country, Time Zone and Currency","Välj ditt land, tidszon och valuta"
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +369,Cash or Bank Account is mandatory for making payment entry,Kontant eller bankkonto är obligatoriskt för utbetalningensposten
 DocType: Purchase Invoice,Price List Exchange Rate,Prislista Växelkurs
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +91,Pickling,Betning
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +18,Sand casting,Sandgjutning
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +117,Electroplating,Elektroplätering
 DocType: Purchase Invoice Item,Rate,Betygsätt
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +62,Intern,Intern
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Intern,Intern
 DocType: Newsletter,A Lead with this email id should exist,En start med denna epost-id ska finnas
 DocType: Stock Entry,From BOM,Från BOM
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +34,Basic,Grundläggande
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +34,Basic,Grundläggande
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,Arkiv transaktioner före {0} är frysta
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +217,Please click on 'Generate Schedule',"Klicka på ""Skapa schema '"
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +61,To Date should be same as From Date for Half Day leave,Till Datum bör vara densamma som från Datum för halv dag ledighet
@@ -2742,10 +2636,10 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +96,Reference No is mandatory if you entered Reference Date,Referensnummer är obligatoriskt om du har angett referens Datum
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +108,Date of Joining must be greater than Date of Birth,Datum för att delta måste vara större än Födelsedatum
 DocType: Salary Structure,Salary Structure,Lönestruktur
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +242,"Multiple Price Rule exists with same criteria, please resolve \
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +246,"Multiple Price Rule exists with same criteria, please resolve \
 			conflict by assigning priority. Price Rules: {0}","Flera prisregler finns med samma kriterier, vänligen lös \ konflikten genom att prioritera. Pris Regler: {0}"
 DocType: Account,Bank,Bank
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +9,Airline,Flygbolag
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,Flygbolag
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +493,Issue Material,Problem Material
 DocType: Material Request Item,For Warehouse,För Lager
 DocType: Employee,Offer Date,Erbjudandet Datum
@@ -2755,29 +2649,24 @@
 DocType: Item,Is Fixed Asset Item,Är Fast tillgångspost
 DocType: Stock Entry,Including items for sub assemblies,Inklusive poster för underheter
 DocType: Features Setup,"If you have long print formats, this feature can be used to split the page to be printed on multiple pages with all headers and footers on each page","Om du har långa utskriftsformat, kan denna funktionen användas för att dela sidan som ska skrivas ut på flera sidor med alla sidhuvud och sidfot på varje sida"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +131,Hobbing,Hobbing
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +98,All Territories,Alla territorierna
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +98,All Territories,Alla territorierna
 DocType: Purchase Invoice,Items,Produkter
 DocType: Fiscal Year,Year Name,År namn
 DocType: Process Payroll,Process Payroll,Process Lön
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +59,There are more holidays than working days this month.,Det finns mer semester än arbetsdagar denna månad.
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +68,There are more holidays than working days this month.,Det finns mer semester än arbetsdagar denna månad.
 DocType: Product Bundle Item,Product Bundle Item,Produktpaket Punkt
 DocType: Sales Partner,Sales Partner Name,Försäljnings Partner Namn
 DocType: Purchase Invoice Item,Image View,Visa bild
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +113,Finishing & industrial finishing,Finishing &amp; industriell ytbehandling
 DocType: Issue,Opening Time,Öppnings Tid
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,Från och Till datum krävs
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +46,Securities & Commodity Exchanges,Värdepapper och råvarubörserna
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Värdepapper och råvarubörserna
 DocType: Shipping Rule,Calculate Based On,Beräkna baserad på
 DocType: Delivery Note Item,From Warehouse,Från Warehouse
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +98,Drilling,Borrning
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +28,Blow molding,Formblåsning
 DocType: Purchase Taxes and Charges,Valuation and Total,Värdering och Total
 DocType: Tax Rule,Shipping City,Shipping stad
 apps/erpnext/erpnext/stock/doctype/item/item.js +43,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,Denna punkt är en variant av {0} (Template). Attribut kopieras över från mallen om &quot;No Copy &#39;är inställd
 DocType: Account,Purchase User,Inköpsanvändare
 DocType: Notification Control,Customize the Notification,Anpassa Anmälan
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +87,Hammering,Hammrering
 DocType: Web Page,Slideshow,Bildspel
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +24,Default Address Template cannot be deleted,Standard Adress mall kan inte tas bort
 DocType: Sales Invoice,Shipping Rule,Frakt Regel
@@ -2786,9 +2675,8 @@
 DocType: Workflow State,Search,Sök
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +54,Total cannot be zero,Totalt kan inte vara noll
 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,"""Dagar sedan senaste order"" måste vara större än eller lika med noll"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +142,Brazing,Hårdlödning
 DocType: C-Form,Amended From,Ändrat Från
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Raw Material,Råmaterial
+apps/erpnext/erpnext/public/js/setup_wizard.js +359,Raw Material,Råmaterial
 DocType: Leave Application,Follow via Email,Följ via e-post
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Skattebelopp efter rabatt Belopp
 apps/erpnext/erpnext/accounts/doctype/account/account.py +174,Child account exists for this account. You can not delete this account.,Underkonto existerar för det här kontot. Du kan inte ta bort det här kontot.
@@ -2802,10 +2690,10 @@
 ,Produced,Producerat
 DocType: Item,Item Code for Suppliers,Produkt kod för leverantörer
 DocType: Issue,Raised By (Email),Höjt av (e-post)
-apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +72,General,Allmänt
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +495,Attach Letterhead,Fäst Brev
+apps/erpnext/erpnext/setup/setup_wizard/default_website.py +72,General,Allmänt
+apps/erpnext/erpnext/public/js/setup_wizard.js +241,Attach Letterhead,Fäst Brev
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +272,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',"Det går inte att dra bort när kategorin är angedd ""Värdering"" eller ""Värdering och Total"""
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +542,"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.","Lista dina skattehuvuden (t.ex. moms, tull etc, de bör ha unika namn) och deras standardpriser. Detta kommer att skapa en standardmall som du kan redigera och lägga till fler senare."
+apps/erpnext/erpnext/public/js/setup_wizard.js +284,"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.","Lista dina skattehuvuden (t.ex. moms, tull etc, de bör ha unika namn) och deras standardpriser. Detta kommer att skapa en standardmall som du kan redigera och lägga till fler senare."
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial Nos Required for Serialized Item {0},Serial Nos krävs för Serialiserad Punkt {0}
 DocType: Journal Entry,Bank Entry,Bank anteckning
 DocType: Authorization Rule,Applicable To (Designation),Är tillämpligt för (Destination)
@@ -2814,32 +2702,31 @@
 apps/erpnext/erpnext/config/accounts.py +143,Enable / disable currencies.,Aktivera / inaktivera valutor.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Postal Expenses,Post Kostnader
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Totalt (Amt)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +26,Entertainment & Leisure,Underhållning &amp; Fritid
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,Underhållning &amp; Fritid
 DocType: Purchase Order,The date on which recurring order will be stop,Den dag då återkommande beställning kommer att stoppa
 DocType: Quality Inspection,Item Serial No,Produkt Löpnummer
 apps/erpnext/erpnext/controllers/status_updater.py +142,{0} must be reduced by {1} or you should increase overflow tolerance,{0} måste minskas med {1} eller om du bör öka överfödstolerans
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Present,Totalt Närvarande
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Hour,Timme
+apps/erpnext/erpnext/public/js/setup_wizard.js +363,Hour,Timme
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +138,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation",Serie Punkt {0} kan inte uppdateras \ använder Stock Avstämning
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +488,Transfer Material to Supplier,Överföra material till leverantören
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +513,Transfer Material to Supplier,Överföra material till leverantören
 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,Nya Löpnummer kan inte ha Lager. Lagermåste ställas in av lagerpost eller inköpskvitto
 DocType: Lead,Lead Type,Prospekt Typ
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +82,Create Quotation,Skapa offert
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +306,All these items have already been invoiced,Alla dessa punkter har redan fakturerats
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,You are not authorized to approve leaves on Block Dates,Du har inte behörighet att godkänna löv på Block Datum
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +311,All these items have already been invoiced,Alla dessa punkter har redan fakturerats
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},Kan godkännas av {0}
 DocType: Shipping Rule,Shipping Rule Conditions,Frakt härskar Villkor
 DocType: BOM Replace Tool,The new BOM after replacement,Den nya BOM efter byte
 DocType: Features Setup,Point of Sale,Butiksförsäljning
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +83,Curling,Curling
 DocType: Account,Tax,Skatt
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +28,Row {0}: {1} is not a valid {2},Rad {0}: {1} är inte en giltig {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +89,Refining,Raffinering
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +37,Row {0}: {1} is not a valid {2},Rad {0}: {1} är inte en giltig {2}
 DocType: Production Planning Tool,Production Planning Tool,Produktionsplaneringsverktyg
 DocType: Quality Inspection,Report Date,Rapportdatum
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +130,Routing,Routing
 DocType: C-Form,Invoices,Fakturor
 DocType: Job Opening,Job Title,Jobbtitel
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +54,{0} already allocated for Employee {1} for period {2} - {3},{0} som redan tilldelats för anställd {1} för perioden {2} - {3}
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +80,{0} Recipients,{0} Mottagare
 DocType: Features Setup,Item Groups in Details,Produktgrupper i Detaljer
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +335,Quantity to Manufacture must be greater than 0.,Kvantitet som Tillverkning måste vara större än 0.
@@ -2857,14 +2744,13 @@
 DocType: DocType,Setup,Inställning
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,Det finns inget att redigera.
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +108,Summary for this month and pending activities,Sammanfattning för denna månad och pågående aktiviteter
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +39,Cold rolling,Kallvals
 DocType: Customer Group,Customer Group Name,Kundgruppnamn
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +408,Please remove this Invoice {0} from C-Form {1},Ta bort denna faktura {0} från C-Form {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +410,Please remove this Invoice {0} from C-Form {1},Ta bort denna faktura {0} från C-Form {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,Välj Överföring om du även vill inkludera föregående räkenskapsårs balans till detta räkenskapsår
 DocType: GL Entry,Against Voucher Type,Mot Kupongtyp
 DocType: Item,Attributes,Attributer
 DocType: Packing Slip,Get Items,Hämta artiklar
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +186,Please enter Write Off Account,Ange avskrivningskonto
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +187,Please enter Write Off Account,Ange avskrivningskonto
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +71,Last Order Date,Sista beställningsdatum
 DocType: DocField,Image,Bild
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +179,Make Excise Invoice,Skapa punktfaktura
@@ -2874,7 +2760,7 @@
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +146,Operation ID not set,Drift ID inte satt
 DocType: Production Order,Planned Start Date,Planerat startdatum
 DocType: Serial No,Creation Document Type,Skapande Dokumenttyp
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +620,Maint. Visit,Maint. Besök
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +631,Maint. Visit,Maint. Besök
 DocType: Leave Type,Is Encash,Är incheckad
 DocType: Purchase Invoice,Mobile No,Mobilnummer
 DocType: Payment Tool,Make Journal Entry,Skapa journalanteckning
@@ -2882,35 +2768,31 @@
 apps/erpnext/erpnext/controllers/trends.py +257,Project-wise data is not available for Quotation,Projektvis uppgifter finns inte tillgängligt för Offert
 DocType: Project,Expected End Date,Förväntad Slutdatum
 DocType: Appraisal Template,Appraisal Template Title,Bedömning mall Titel
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +440,Commercial,Kommersiell
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +378,Commercial,Kommersiell
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +23,Parent Item {0} must not be a Stock Item,Moderbolaget Punkt {0} får inte vara en lagervara
 DocType: Cost Center,Distribution Id,Fördelning Id
-apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +14,Awesome Services,Grymma Tjänster
+apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +14,Awesome Services,Grymma Tjänster
 apps/erpnext/erpnext/config/manufacturing.py +29,All Products or Services.,Alla produkter eller tjänster.
 DocType: Purchase Invoice,Supplier Address,Leverantör Adress
 DocType: Contact Us Settings,Address Line 2,Adress Linje 2
 DocType: ToDo,Reference,Referens
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +59,Perforating,Perforerings
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,Ut Antal
 apps/erpnext/erpnext/config/accounts.py +128,Rules to calculate shipping amount for a sale,Regler för att beräkna fraktbeloppet för en försäljning
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +29,Series is mandatory,Serien är obligatorisk
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +28,Financial Services,Finansiella Tjänster
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,Finansiella Tjänster
 apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3},Värde för Attribut {0} måste vara inom intervallet {1} till {2} i steg om {3}
 DocType: Tax Rule,Sales,Försäljning
 DocType: Stock Entry Detail,Basic Amount,BASBELOPP
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +173,Warehouse required for stock Item {0},Lager krävs för Lagervara {0}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +178,Warehouse required for stock Item {0},Lager krävs för Lagervara {0}
 DocType: Leave Allocation,Unused leaves,Oanvända blad
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,Cr
 DocType: Customer,Default Receivable Accounts,Standard Mottagarkonton
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +102,Sawing,Sågning
 DocType: Tax Rule,Billing State,Faktureringsstaten
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +32,Laminating,Lamine
 DocType: Item Reorder,Transfer,Överföring
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +549,Fetch exploded BOM (including sub-assemblies),Fetch expanderande BOM (inklusive underenheter)
 DocType: Authorization Rule,Applicable To (Employee),Är tillämpligt för (anställd)
 apps/erpnext/erpnext/controllers/accounts_controller.py +101,Due Date is mandatory,Förfallodatum är obligatorisk
 apps/erpnext/erpnext/controllers/item_variant.py +51,Increment for Attribute {0} cannot be 0,Påslag för Attribut {0} inte kan vara 0
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +143,Sintering,Sintring
 DocType: Journal Entry,Pay To / Recd From,Betala Till / RECD Från
 DocType: Naming Series,Setup Series,Inställnings Serie
 DocType: Supplier,Contact HTML,Kontakta HTML
@@ -2923,7 +2805,6 @@
 DocType: Attendance,Absent,Frånvarande
 DocType: Product Bundle,Product Bundle,Produktpaket
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +180,Row {0}: Invalid reference {1},Rad {0}: Ogiltig referens {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +165,Crushing,Krossning
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Inköp Skatter och avgifter Mall
 DocType: Upload Attendance,Download Template,Hämta mall
 DocType: GL Entry,Remarks,Anmärkningar
@@ -2931,14 +2812,12 @@
 DocType: Journal Entry,Write Off Based On,Avskrivning Baseras på
 DocType: Features Setup,POS View,POS Vy
 apps/erpnext/erpnext/config/stock.py +38,Installation record for a Serial No.,Installationsinfo för ett serienummer
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +9,Continuous casting,Stränggjutning
 apps/erpnext/erpnext/public/js/queries.js +39,Please specify a,Ange en
 DocType: Offer Letter,Awaiting Response,Väntar på svar
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +53,Above,Ovan
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +80,Cold sizing,Kall limnings
 DocType: Salary Slip,Earning & Deduction,Vinst &amp; Avdrag
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +76,Account {0} cannot be a Group,Kontot {0} kan inte vara en grupp
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +259,Region,Region
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +314,Region,Region
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +213,Optional. This setting will be used to filter in various transactions.,Tillval. Denna inställning kommer att användas för att filtrera i olika transaktioner.
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +104,Negative Valuation Rate is not allowed,Negativt Värderingsvärde är inte tillåtet
 DocType: Holiday List,Weekly Off,Veckovis Av
@@ -2956,7 +2835,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,Account {0} is inactive,Konto {0} är inaktivt
 DocType: GL Entry,Is Advance,Är Advancerad
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,Närvaro Från Datum och närvaro hittills är obligatorisk
-apps/erpnext/erpnext/controllers/buying_controller.py +131,Please enter 'Is Subcontracted' as Yes or No,"Ange ""Är underleverantör"" som Ja eller Nej"
+apps/erpnext/erpnext/controllers/buying_controller.py +122,Please enter 'Is Subcontracted' as Yes or No,"Ange ""Är underleverantör"" som Ja eller Nej"
 DocType: Sales Team,Contact No.,Kontakt nr
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,'Profit and Loss' type account {0} not allowed in Opening Entry,"""Resultaträkning"" kontotyp {0} inte tillåtna i öppna poster"
 DocType: Workflow State,Time,Tid
@@ -2965,14 +2844,13 @@
 DocType: Authorization Rule,Authorization Rule,Auktoriseringsregel
 DocType: Sales Invoice,Terms and Conditions Details,Villkor Detaljer
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,Försäljnings Skatter och avgifter Mall
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +10,Apparel & Accessories,Kläder &amp; tillbehör
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,Kläder &amp; tillbehör
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +67,Number of Order,Antal Beställningar
 DocType: Item Group,HTML / Banner that will show on the top of product list.,HTML / Banner som visar på toppen av produktlista.
 DocType: Shipping Rule,Specify conditions to calculate shipping amount,Ange villkor för att beräkna fraktbeloppet
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +121,Add Child,Lägg till underval
 DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,Roll tillåtas att fastställa frysta konton och Redigera Frysta Inlägg
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +52,Cannot convert Cost Center to ledger as it has child nodes,Det går inte att konvertera kostnadsställe till huvudbok då den har underordnade noder
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +47,Conversion Factor is required,Omräkningsfaktor
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +37,Serial #,Seriell #
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +87,Commission on Sales,Försäljningsprovision
 DocType: Offer Letter Term,Value / Description,Värde / Beskrivning
@@ -2980,10 +2858,8 @@
 ,Customers Not Buying Since Long Time,Kunder köper inte sedan lång tid
 DocType: Production Order,Expected Delivery Date,Förväntat leveransdatum
 apps/erpnext/erpnext/accounts/general_ledger.py +121,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Debet och kredit inte är lika för {0} # {1}. Skillnaden är {2}.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +48,Bulging,Utbuktning
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +11,Evaporative-pattern casting,Evaporativ mönster gjutning
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Entertainment Expenses,Representationskostnader
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +195,Sales Invoice {0} must be cancelled before cancelling this Sales Order,Fakturan {0} måste ställas in innan avbryta denna kundorder
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +190,Sales Invoice {0} must be cancelled before cancelling this Sales Order,Fakturan {0} måste ställas in innan avbryta denna kundorder
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +61,Age,Ålder
 DocType: Time Log,Billing Amount,Fakturerings Mängd
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +84,Invalid quantity specified for item {0}. Quantity should be greater than 0.,Ogiltig mängd som anges för produkten {0}. Kvantitet bör vara större än 0.
@@ -3002,26 +2878,24 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,Nya kund Intäkter
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Travel Expenses,Resekostnader
 DocType: Maintenance Visit,Breakdown,Nedbrytning
-apps/erpnext/erpnext/controllers/accounts_controller.py +241,Account: {0} with currency: {1} can not be selected,Konto: {0} med valuta: kan inte väljas {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +242,Account: {0} with currency: {1} can not be selected,Konto: {0} med valuta: kan inte väljas {1}
 DocType: Bank Reconciliation Detail,Cheque Date,Check Datum
 apps/erpnext/erpnext/accounts/doctype/account/account.py +47,Account {0}: Parent account {1} does not belong to company: {2},Konto {0}: Förälder konto {1} tillhör inte företaget: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted all transactions related to this company!,Framgångsrikt bort alla transaktioner i samband med detta företag!
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,Som på Date
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +111,Honing,Hening
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +58,Probation,Skyddstillsyn
-apps/erpnext/erpnext/stock/doctype/item/item.py +264,Default Warehouse is mandatory for stock Item.,Standard Lager är obligatoriskt för lagervara.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Probation,Skyddstillsyn
+apps/erpnext/erpnext/stock/doctype/item/item.py +268,Default Warehouse is mandatory for stock Item.,Standard Lager är obligatoriskt för lagervara.
 DocType: Feed,Full Name,Fullständigt Namn
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +148,Clinching,Clinching
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +191,Payment of salary for the month {0} and year {1},Utbetalning av lön för månaden {0} och år {1}
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +173,Payment of salary for the month {0} and year {1},Utbetalning av lön för månaden {0} och år {1}
 DocType: Stock Settings,Auto insert Price List rate if missing,Diskinmatning Prislista ränta om saknas
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,Sammanlagda belopp som betalats
 ,Transferred Qty,Överfört Antal
 apps/erpnext/erpnext/config/learn.py +11,Navigating,Navigera
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +137,Planning,Planering
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +137,Planning,Planering
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +9,Make Time Log Batch,Skapa tidsloggsbatch
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Issued,Utfärdad
 DocType: Project,Total Billing Amount (via Time Logs),Totalt Billing Belopp (via Time Loggar)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +629,We sell this Item,Vi säljer detta objekt
+apps/erpnext/erpnext/public/js/setup_wizard.js +365,We sell this Item,Vi säljer detta objekt
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +65,Supplier Id,Leverantör Id
 DocType: Journal Entry,Cash Entry,Kontantinlägg
 DocType: Sales Partner,Contact Desc,Kontakt Desc
@@ -3030,18 +2904,16 @@
 DocType: Brand,Item Manager,Produktansvarig
 DocType: Cost Center,Add rows to set annual budgets on Accounts.,Lägg rader för att ställa in årsbudgetar på konton.
 DocType: Buying Settings,Default Supplier Type,Standard Leverantörstyp
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +160,Quarrying,Brytning
 DocType: Production Order,Total Operating Cost,Totala driftskostnaderna
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +160,Note: Item {0} entered multiple times,Obs: Punkt {0} inlagd flera gånger
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +163,Note: Item {0} entered multiple times,Obs: Punkt {0} inlagd flera gånger
 apps/erpnext/erpnext/config/crm.py +27,All Contacts.,Alla kontakter.
 DocType: Newsletter,Test Email Id,Test e-post ID
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +394,Company Abbreviation,Företagetsförkortning
+apps/erpnext/erpnext/public/js/setup_wizard.js +142,Company Abbreviation,Företagetsförkortning
 DocType: Features Setup,If you follow Quality Inspection. Enables Item QA Required and QA No in Purchase Receipt,Om du följer kvalitetskontroll. Aktiverar Punkt QA krävs och QA nr i inköpskvitto
 DocType: GL Entry,Party Type,Parti Typ
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +68,Raw material cannot be same as main Item,Råvaror kan inte vara samma som huvudartikel
 DocType: Item Attribute Value,Abbreviation,Förkortning
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,Inte auktoriserad eftersom {0} överskrider gränser
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +30,Rotational molding,Rotationsgjutning
 apps/erpnext/erpnext/config/hr.py +115,Salary template master.,Lön mall mästare.
 DocType: Leave Type,Max Days Leave Allowed,Max dagars ledighet tillåtna
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +55,Set Tax Rule for shopping cart,Ställ skatt Regel för varukorgen
@@ -3055,15 +2927,15 @@
 apps/erpnext/erpnext/config/selling.py +18,Quotes to Leads or Customers.,Offerter till prospekt eller kunder
 DocType: Stock Settings,Role Allowed to edit frozen stock,Roll tillåtet att redigera fryst lager
 ,Territory Target Variance Item Group-Wise,Territory Mål Varians Post Group-Wise
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +101,All Customer Groups,Alla kundgrupper
-apps/erpnext/erpnext/controllers/accounts_controller.py +474,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} är obligatorisk. Kanske Valutaväxlingsposten  inte är skapad för {1} till {2}.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +101,All Customer Groups,Alla kundgrupper
+apps/erpnext/erpnext/controllers/accounts_controller.py +475,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} är obligatorisk. Kanske Valutaväxlingsposten  inte är skapad för {1} till {2}.
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +37,Tax Template is mandatory.,Skatte Mall är obligatorisk.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +41,Account {0}: Parent account {1} does not exist,Konto {0}: Förälder konto {1} existerar inte
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Prislista värde (Företagsvaluta)
 DocType: Account,Temporary,Tillfällig
 DocType: Address,Preferred Billing Address,Önskad faktureringsadress
 DocType: Monthly Distribution Percentage,Percentage Allocation,Procentuell Fördelning
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +86,Secretary,Sekreterare
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Secretary,Sekreterare
 DocType: Serial No,Distinct unit of an Item,Distinkt enhet för en försändelse
 DocType: Pricing Rule,Buying,Köpa
 DocType: HR Settings,Employee Records to be created by,Personal register som skall skapas av
@@ -3076,9 +2948,8 @@
 ,Item-wise Price List Rate,Produktvis Prislistavärde
 DocType: Purchase Order Item,Supplier Quotation,Leverantör Offert
 DocType: Quotation,In Words will be visible once you save the Quotation.,I Ord kommer att synas när du sparar offerten.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +68,Ironing,Stryk
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is stopped,{0} {1} är stoppad
-apps/erpnext/erpnext/stock/doctype/item/item.py +352,Barcode {0} already used in Item {1},Streckkod {0} används redan i punkt {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +356,Barcode {0} already used in Item {1},Streckkod {0} används redan i punkt {1}
 DocType: Lead,Add to calendar on this date,Lägg till i kalender på denna dag
 apps/erpnext/erpnext/config/selling.py +132,Rules for adding shipping costs.,Regler för att lägga fraktkostnader.
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,uppkommande händelser
@@ -3087,27 +2958,25 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +27,Quick Entry,Snabbinmatning
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0} är obligatorisk för Retur
 DocType: Purchase Order,To Receive,Att Motta
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +33,Shrink fitting,Krymppassning
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +522,user@example.com,user@example.com
+apps/erpnext/erpnext/public/js/setup_wizard.js +266,user@example.com,user@example.com
 DocType: Email Digest,Income / Expense,Intäkt / kostnad
 DocType: Employee,Personal Email,Personligt E-post
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +58,Total Variance,Totalt Varians
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +62,Total Variance,Totalt Varians
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.","Om det är aktiverat, kommer systemet att skicka bokföringsposter för inventering automatiskt."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +15,Brokerage,Brokerage
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +15,Brokerage,Brokerage
 DocType: Address,Postal Code,Postkod
 DocType: Production Order Operation,"in Minutes
 Updated via 'Time Log'","i protokollet Uppdaterad via ""Tidslog"""
 DocType: Customer,From Lead,Från Prospekt
 apps/erpnext/erpnext/config/manufacturing.py +19,Orders released for production.,Order släppts för produktion.
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +42,Select Fiscal Year...,Välj räkenskapsår ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +442,POS Profile required to make POS Entry,POS profil som krävs för att göra POS inlägg
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +444,POS Profile required to make POS Entry,POS profil som krävs för att göra POS inlägg
 DocType: Hub Settings,Name Token,Namn token
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +106,Planing,Hyvla
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Selling,Standardförsäljnings
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +120,Standard Selling,Standardförsäljnings
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +137,Atleast one warehouse is mandatory,Minst ett lager är obligatorisk
 DocType: Serial No,Out of Warranty,Ingen garanti
 DocType: BOM Replace Tool,Replace,Ersätt
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +314,{0} against Sales Invoice {1},{0} mot faktura {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +316,{0} against Sales Invoice {1},{0} mot faktura {1}
 apps/erpnext/erpnext/stock/doctype/item/item.py +49,Please enter default Unit of Measure,Ange standardmåttenhet
 DocType: Purchase Invoice Item,Project Name,Projektnamn
 DocType: Supplier,Mention if non-standard receivable account,Nämn om icke-standardiserade fordran konto
@@ -3123,9 +2992,8 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,Journal Entry {0} does not have account {1} or already matched against other voucher,Journalanteckning {0} har inte konto {1} eller redan matchad mot andra kuponger
 DocType: Item,Moving Average,Rörligt medelvärde
 DocType: BOM Replace Tool,The BOM which will be replaced,BOM som kommer att ersättas
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +43,New Stock UOM must be different from current stock UOM,Nytt Lager UOM måste skilja sig från nuvarande Lager UOM
 DocType: Account,Debit,Debit-
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +34,Leaves must be allocated in multiples of 0.5,"Ledigheter ska fördelas i multiplar av 0,5"
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +44,Leaves must be allocated in multiples of 0.5,"Ledigheter ska fördelas i multiplar av 0,5"
 DocType: Production Order,Operation Cost,Driftkostnad
 apps/erpnext/erpnext/config/hr.py +71,Upload attendance from a .csv file,Ladda upp närvaro från en CSV-fil
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,Utestående Amt
@@ -3143,8 +3011,7 @@
 DocType: Employee,Internal Work History,Intern Arbetserfarenhet
 DocType: DocField,Column Break,Spaltbrytning
 DocType: Event,Thursday,Torsdag
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +42,Private Equity,Privatkapital
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +93,Turning,Turning
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,Privatkapital
 DocType: Maintenance Visit,Customer Feedback,Kund Feedback
 DocType: Account,Expense,Utgift
 DocType: Sales Invoice,Exhibition,Utställning
@@ -3157,19 +3024,19 @@
 DocType: Employee,Held On,Höll På
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +33,Production Item,Produktions artikel
 ,Employee Information,Anställd Information
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,Rate (%),Andel (%)
+apps/erpnext/erpnext/public/js/setup_wizard.js +294,Rate (%),Andel (%)
 DocType: Stock Entry Detail,Additional Cost,Extra kostnad
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +407,Financial Year End Date,Budgetåret Slutdatum
+apps/erpnext/erpnext/public/js/setup_wizard.js +155,Financial Year End Date,Budgetåret Slutdatum
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Voucher No, if grouped by Voucher",Kan inte filtrera baserat på kupong nr om grupperad efter kupong
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +484,Make Supplier Quotation,Skapa Leverantörsoffert
 DocType: Quality Inspection,Incoming,Inkommande
 DocType: BOM,Materials Required (Exploded),Material som krävs (Expanderad)
 DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),Minska tjänat belopp för ledighet utan lön (LWP)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +512,"Add users to your organization, other than yourself","Lägg till användare till din organisation, annan än dig själv"
+apps/erpnext/erpnext/public/js/setup_wizard.js +256,"Add users to your organization, other than yourself","Lägg till användare till din organisation, annan än dig själv"
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No {1} does not match with {2} {3},Rad # {0}: Löpnummer {1} inte stämmer överens med {2} {3}
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +44,Casual Leave,Tillfällig ledighet
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +44,Casual Leave,Tillfällig ledighet
 DocType: Batch,Batch ID,Batch-ID
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +334,Note: {0},Obs: {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +336,Note: {0},Obs: {0}
 ,Delivery Note Trends,Följesedel Trender
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +104,This Week's Summary,Veckans Sammanfattning
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +74,{0} must be a Purchased or Sub-Contracted Item in row {1},{0} måste vara ett Köpt eller underleverantörers föremål i rad {1}
@@ -3181,7 +3048,7 @@
 DocType: Purchase Receipt,Return Against Purchase Receipt,Återgå mot inköpskvitto
 DocType: Purchase Order,To Bill,Till Bill
 DocType: Material Request,% Ordered,% Beordrade
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +61,Piecework,Ackord
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Piecework,Ackord
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +64,Avg. Buying Rate,Avg. Köpkurs
 DocType: Task,Actual Time (in Hours),Faktisk tid (i timmar)
 DocType: Employee,History In Company,Historia Företaget
@@ -3198,13 +3065,13 @@
 DocType: Opportunity,To Discuss,Att Diskutera
 DocType: SMS Settings,SMS Settings,SMS Inställningar
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +60,Temporary Accounts,Tillfälliga konton
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +155,Black,Svart
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Black,Svart
 DocType: BOM Explosion Item,BOM Explosion Item,BOM Explosions Punkt
 DocType: Account,Auditor,Redigerare
 DocType: Purchase Order,End date of current order's period,Slutdatum för nuvarande order period
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +17,Make Offer Letter,Skapa ett anbudsbrev
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +10,Return,Återgå
-apps/erpnext/erpnext/stock/doctype/item/item.py +503,Default Unit of Measure for Variant must be same as Template,Standard mätenhet för Variant måste vara densamma som mall
+apps/erpnext/erpnext/stock/doctype/item/item.py +507,Default Unit of Measure for Variant must be same as Template,Standard mätenhet för Variant måste vara densamma som mall
 DocType: DocField,Fold,Vika
 DocType: Production Order Operation,Production Order Operation,Produktionsorder Drift
 DocType: Pricing Rule,Disable,Inaktivera
@@ -3215,13 +3082,12 @@
 DocType: Page,Page Name,Sidnamn
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +110,To Time must be greater than From Time,Till tid måste vara större än From Time
 DocType: Journal Entry Account,Exchange Rate,Växelkurs
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +465,Sales Order {0} is not submitted,Kundorder {0} är inte lämnat
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +467,Sales Order {0} is not submitted,Kundorder {0} är inte lämnat
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0}: Parent account {1} does not bolong to the company {2},Lager {0}: Moderbolaget konto {1} tillhör inte företaget {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +124,Spindle finishing,Spindel efterbehandling
 DocType: BOM,Last Purchase Rate,Senaste Beställningsvärde
 DocType: Account,Asset,Tillgång
 DocType: Project Task,Task ID,Aktivitets-ID
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +395,"e.g. ""MC""",t.ex. &quot;MC&quot;
+apps/erpnext/erpnext/public/js/setup_wizard.js +143,"e.g. ""MC""",t.ex. &quot;MC&quot;
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,Stock cannot exist for Item {0} since has variants,Stock kan inte existera till punkt {0} sedan har varianter
 ,Sales Person-wise Transaction Summary,Försäljningen person visa transaktion Sammanfattning
 DocType: System Settings,Time Zone,Tidszon
@@ -3230,9 +3096,7 @@
 DocType: Monthly Distribution,Monthly Distribution Percentages,Månadsdistributions Procentsatser
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +16,The selected item cannot have Batch,Det valda alternativet kan inte ha Batch
 DocType: Delivery Note,% of materials delivered against this Delivery Note,% Av material som levereras mot detta följesedel
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +151,Stapling,Häftning
 DocType: Customer,Customer Details,Kunduppgifter
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +105,Shaping,Formning
 DocType: Employee,Reports to,Rapporter till
 DocType: SMS Settings,Enter url parameter for receiver nos,Ange url parameter för mottagaren
 DocType: Sales Invoice,Paid Amount,Betalt belopp
@@ -3241,13 +3105,13 @@
 DocType: Item Variant,Item Variant,Produkt Variant
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +15,Setting this Address Template as default as there is no other default,Ställa den här adressen mall som standard eftersom det inte finns någon annan standard
 apps/erpnext/erpnext/accounts/doctype/account/account.py +89,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Kontosaldo redan i Debit, du är inte tillåten att ställa ""Balans måste vara"" som ""Kredit"""
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +76,Quality Management,Kvalitetshantering
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Quality Management,Kvalitetshantering
 DocType: Production Planning Tool,Filter based on customer,Filter utifrån kundernas
 DocType: Payment Tool Detail,Against Voucher No,Mot kupongnr
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +47,Please enter quantity for Item {0},Vänligen ange antal förpackningar för artikel {0}
 DocType: Employee External Work History,Employee External Work History,Anställd Extern Arbetserfarenhet
 DocType: Tax Rule,Purchase,Inköp
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +34,Balance Qty,Balans Antal
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Balance Qty,Balans Antal
 DocType: Item Group,Parent Item Group,Överordnad produktgrupp
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +21,{0} for {1},{0} för {1}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +96,Cost Centers,Kostnadsställen
@@ -3257,12 +3121,12 @@
 DocType: Opportunity,Next Contact,Nästa Kontakta
 DocType: Employee,Employment Type,Anställnings Typ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,Fasta tillgångar
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +84,Application period cannot be across two alocation records,Ansökningstiden kan inte vara över två alocation register
 DocType: Item Group,Default Expense Account,Standardutgiftskonto
 DocType: Employee,Notice (days),Observera (dagar)
 DocType: Page,Yes,Ja
 DocType: Tax Rule,Sales Tax Template,Moms Mall
 DocType: Employee,Encashment Date,Inlösnings Datum
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +74,Electroforming,Elektroformning
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +179,"Against Voucher Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Mot kupongtyp måste vara en av inköpsorder, inköpsfaktura eller journalanteckning"
 DocType: Account,Stock Adjustment,Lager för justering
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +34,Default Activity Cost exists for Activity Type - {0},Standard Aktivitetskostnad existerar för Aktivitetstyp - {0}
@@ -3298,12 +3162,12 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,Lager kan inte tas bort som lagrets huvudbok  existerar för det här lagret.
 DocType: Company,Distribution,Fördelning
 apps/erpnext/erpnext/public/js/pos/pos.html +36,Amount Paid,Betald Summa
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +91,Project Manager,Projektledare
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +72,Dispatch,Skicka
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Project Manager,Projektledare
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +72,Dispatch,Skicka
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,Max rabatt tillåtet för objektet: {0} är {1}%
 DocType: Customer,Default Taxes and Charges,Standard skatter och avgifter
 DocType: Account,Receivable,Fordran
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +268,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,Rad # {0}: Inte tillåtet att byta leverantör som beställning redan existerar
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +263,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,Rad # {0}: Inte tillåtet att byta leverantör som beställning redan existerar
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,Roll som får godkänna transaktioner som överstiger kreditgränser.
 DocType: Sales Invoice,Supplier Reference,Leverantör Referens
 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.","Om markerad, kommer BOM för underenhet poster övervägas för att få råvaror. Annars kommer alla undermonterings poster behandlas som en råvara."
@@ -3311,8 +3175,8 @@
 DocType: Hub Settings,Seller Description,Säljare Beskrivning
 DocType: Employee Education,Qualification,Kvalifikation
 DocType: Item Price,Item Price,Produkt Pris
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +48,Soap & Detergent,Soap &amp; tvättmedel
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +36,Motion Picture & Video,Motion Picture &amp; Video
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +48,Soap & Detergent,Soap &amp; tvättmedel
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +36,Motion Picture & Video,Motion Picture &amp; Video
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Beställde
 DocType: Warehouse,Warehouse Name,Lager Namn
 DocType: Naming Series,Select Transaction,Välj transaktion
@@ -3321,7 +3185,6 @@
 DocType: BOM,Rate Of Materials Based On,Hastighet av material baserade på
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,Stöd Analtyics
 apps/erpnext/erpnext/accounts/doctype/accounts_settings/accounts_settings.py +27,Company is missing in warehouses {0},Företaget saknas i lager {0}
-DocType: Stock UOM Replace Utility,Stock UOM Replace Utility,Lager UOM Ersätt Utility
 DocType: POS Profile,Terms and Conditions,Villkor
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,To Date should be within the Fiscal Year. Assuming To Date = {0},Till Datum bör ligga inom räkenskapsåret. Förutsatt att Dag = {0}
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","Här kan du behålla längd, vikt, allergier, medicinska problem etc"
@@ -3333,7 +3196,7 @@
 DocType: Sales Order Item,For Production,För produktion
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +103,Please enter sales order in the above table,Ange kundorder i ovanstående tabell
 DocType: Project Task,View Task,Se uppgifter
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +406,Your financial year begins on,Din räkenskapsår som börjar på
+apps/erpnext/erpnext/public/js/setup_wizard.js +154,Your financial year begins on,Din räkenskapsår som börjar på
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +46,Please enter Purchase Receipts,Ange kvitton
 DocType: Sales Invoice,Get Advances Received,Få erhållna förskott
 DocType: Email Digest,Add/Remove Recipients,Lägg till / ta bort mottagare
@@ -3341,16 +3204,14 @@
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","För att ställa denna verksamhetsåret som standard, klicka på &quot;Ange som standard&quot;"
 apps/erpnext/erpnext/config/support.py +54,Setup incoming server for support email id. (e.g. support@example.com),Inställning inkommande server stöd e-id. (T.ex. support@example.com)
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,Brist Antal
-apps/erpnext/erpnext/stock/doctype/item/item.py +528,Item variant {0} exists with same attributes,Punkt variant {0} finns med samma attribut
+apps/erpnext/erpnext/stock/doctype/item/item.py +532,Item variant {0} exists with same attributes,Punkt variant {0} finns med samma attribut
 DocType: Salary Slip,Salary Slip,Lön Slip
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +116,Burnishing,Polerings
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +54,'To Date' is required,&quot;Till datum&quot; krävs
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,&quot;Till datum&quot; krävs
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","Skapa följesedlar efter paket som skall levereras. Används för att meddela kollinummer, paketets innehåll och dess vikt."
 DocType: Sales Invoice Item,Sales Order Item,Försäljning Beställningsvara
 DocType: Salary Slip,Payment Days,Betalningsdagar
 DocType: BOM,Manage cost of operations,Hantera kostnaderna för verksamheten
 DocType: Features Setup,Item Advanced,Produkt Avancerad
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +40,Hot rolling,Varmvalsning
 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.","När någon av de kontrollerade transaktionerna  är""Skickat"", en e-post pop-up öppnas automatiskt för att skicka ett mail till den tillhörande ""Kontakt"" i denna transaktion, med transaktionen som en bifogad fil. Användaren kan eller inte kan skicka e-post."
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,Globala inställningar
 DocType: Employee Education,Employee Education,Anställd Utbildning
@@ -3363,25 +3224,23 @@
 DocType: Customer,Sales Team Details,Försäljnings Team Detaljer
 DocType: Expense Claim,Total Claimed Amount,Totalt yrkade beloppet
 apps/erpnext/erpnext/config/crm.py +22,Potential opportunities for selling.,Potentiella möjligheter för att sälja.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +48,Sick Leave,Sjukskriven
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +174,Invalid {0},Ogiltigt {0}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +48,Sick Leave,Sjukskriven
 DocType: Email Digest,Email Digest,E-postutskick
 DocType: Delivery Note,Billing Address Name,Faktureringsadress Namn
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +22,Department Stores,Varuhus
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,Varuhus
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +40,System Balance,System Balance
 DocType: Workflow,Is Active,Är Aktiv
 apps/erpnext/erpnext/controllers/stock_controller.py +71,No accounting entries for the following warehouses,Inga bokföringsposter för följande lager
 apps/erpnext/erpnext/projects/doctype/project/project.js +22,Save the document first.,Spara dokumentet först.
 DocType: Account,Chargeable,Avgift
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +121,Linishing,Linishing
 DocType: Company,Change Abbreviation,Ändra Förkortning
 DocType: Workflow State,Primary,Primär
 DocType: Expense Claim Detail,Expense Date,Utgiftsdatum
 DocType: Item,Max Discount (%),Max rabatt (%)
 DocType: Communication,More Information,Mer information
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +70,Last Order Amount,Sista beställningsmängd
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +161,Blasting,Blästring
 DocType: Company,Warn,Varna
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +111,Item valuation updated,Produkt beräkning uppdateras
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Alla andra anmärkningar, anmärkningsvärt ansträngning som ska gå i registren."
 DocType: BOM,Manufacturing User,Tillverkningsanvändare
 DocType: Purchase Order,Raw Materials Supplied,Råvaror Levereras
@@ -3391,7 +3250,7 @@
 DocType: Appraisal,Appraisal Template,Bedömning mall
 DocType: Communication,Email,E-post
 DocType: Item Group,Item Classification,Produkt Klassificering
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +89,Business Development Manager,Business Development Manager
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Business Development Manager,Business Development Manager
 DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,Servicebesökets syfte
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.js +15,Period,Period
 ,General Ledger,Allmän huvudbok
@@ -3401,9 +3260,7 @@
 ,Itemwise Recommended Reorder Level,Produktvis Rekommenderad Ombeställningsnivå
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +264,Please select {0} first,Välj {0} först
 DocType: Features Setup,To get Item Group in details table,För att få Post Group i detalj tabellen
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +67,Redrawing,Omritning
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +112,Batch {0} of Item {1} has expired.,Batch {0} av Punkt {1} har löpt ut.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +120,Etching,Etsning
 DocType: Sales Invoice,Commission,Kommissionen
 DocType: Address Template,"<h4>Default Template</h4>
 <p>Uses <a href=""http://jinja.pocoo.org/docs/templates/"">Jinja Templating</a> and all the fields of Address (including Custom Fields if any) will be available</p>
@@ -3437,7 +3294,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +340,Operation Time must be greater than 0 for Operation {0},Operation Time måste vara större än 0 för drift {0}
 DocType: Supplier,Address and Contacts,Adress och kontakter
 DocType: UOM Conversion Detail,UOM Conversion Detail,UOM Omvandlings Detalj
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +496,Keep it web friendly 900px (w) by 100px (h),Håll det webb vänligt 900px (w) med 100px (h)
+apps/erpnext/erpnext/public/js/setup_wizard.js +242,Keep it web friendly 900px (w) by 100px (h),Håll det webb vänligt 900px (w) med 100px (h)
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +329,Production Order cannot be raised against a Item Template,Produktionsorder kan inte skickas till en objektmall
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +44,Charges are updated in Purchase Receipt against each item,Avgifter uppdateras i inköpskvitto för varje post
 DocType: Payment Tool,Get Outstanding Vouchers,Hämta Utestående Kuponger
@@ -3453,54 +3310,49 @@
 DocType: Item,Average time taken by the supplier to deliver,Genomsnittlig tid det tar för leverantören att leverera
 DocType: Time Log,Hours,Timmar
 DocType: Project,Expected Start Date,Förväntat startdatum
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +38,Rolling,Rullande
 DocType: ToDo,Priority,Prioritet
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +41,Remove item if charges is not applicable to that item,Ta bort alternativ om avgifter inte är tillämpade för denna post
 DocType: Dropbox Backup,Dropbox Access Allowed,Dropbox Tillträde tillåtet
 DocType: Dropbox Backup,Weekly,Veckovis
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,T.ex. smsgateway.com/api/send_sms.cgi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +485,Receive,Receive
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +510,Receive,Receive
 DocType: Maintenance Visit,Fully Completed,Helt Avslutad
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% Färdig
 DocType: Employee,Educational Qualification,Utbildnings Kvalificering
 DocType: Workstation,Operating Costs,Operations Kostnader
 DocType: Employee Leave Approver,Employee Leave Approver,Anställd Lämna godkännare
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,{0} has been successfully added to our Newsletter list.,{0} har lagts till vårt nyhetsbrev lista.
-apps/erpnext/erpnext/stock/doctype/item/item.py +383,Row {0}: An Reorder entry already exists for this warehouse {1},Rad {0}: En Beställnings post finns redan för detta lager {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +387,Row {0}: An Reorder entry already exists for this warehouse {1},Rad {0}: En Beställnings post finns redan för detta lager {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +67,"Cannot declare as lost, because Quotation has been made.","Det går inte att ange som förlorad, eftersom Offert har gjorts."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +133,Electron beam machining,Elektronstråle bearbetning
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Inköpschef
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +424,Production Order {0} must be submitted,Produktionsorder {0} måste lämnas in
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +150,Please select Start Date and End Date for Item {0},Välj startdatum och slutdatum för punkt {0}
 apps/erpnext/erpnext/config/stock.py +141,Main Reports,Huvud Rapporter
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +102,Stock Ledger entries balances updated,Lager Ledger inmatningar balanser uppdaterade
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,Hittills inte kan vara före startdatum
 DocType: Purchase Receipt Item,Prevdoc DocType,Prevdoc DocType
-apps/erpnext/erpnext/stock/doctype/item/item.js +176,Add / Edit Prices,Lägg till / redigera priser
+apps/erpnext/erpnext/stock/doctype/item/item.js +178,Add / Edit Prices,Lägg till / redigera priser
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +53,Chart of Cost Centers,Kontoplan på Kostnadsställen
 ,Requested Items To Be Ordered,Efterfrågade artiklar Beställningsvara
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +298,My Orders,Mina beställningar
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +293,My Orders,Mina beställningar
 DocType: Price List,Price List Name,Pris Listnamn
 DocType: Time Log,For Manufacturing,För tillverkning
-apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +70,Totals,Totals
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +174,Totals,Totals
 DocType: BOM,Manufacturing,Tillverkning
 ,Ordered Items To Be Delivered,Beställda varor som skall levereras
 DocType: Account,Income,Inkomst
 ,Setup Wizard,Installationsguiden
 DocType: Industry Type,Industry Type,Industrityp
 apps/erpnext/erpnext/templates/includes/cart.js +137,Something went wrong!,Något gick snett!
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +68,Warning: Leave application contains following block dates,Varning: Ledighetsansökan innehåller följande block datum
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +251,Sales Invoice {0} has already been submitted,Fakturan {0} har redan lämnats in
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +100,Warning: Leave application contains following block dates,Varning: Ledighetsansökan innehåller följande block datum
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +256,Sales Invoice {0} has already been submitted,Fakturan {0} har redan lämnats in
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,Slutförande Datum
 DocType: Purchase Invoice Item,Amount (Company Currency),Belopp (Företagsvaluta)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +10,Die casting,Gjutning
 DocType: Email Alert,Reference Date,Referensdatum
 apps/erpnext/erpnext/config/hr.py +105,Organization unit (department) master.,Organisation enhet (avdelnings) ledare.
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +25,Please enter valid mobile nos,Ange giltiga mobil nos
 DocType: Budget Detail,Budget Detail,Budgetdetalj
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +75,Please enter message before sending,Ange meddelandet innan du skickar
 DocType: Async Task,Status,Status
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +65,Stock UOM updated for Item {0},Stock UOM uppdaterad till punkt {0}
 DocType: Company History,Year,År
 apps/erpnext/erpnext/config/accounts.py +127,Point-of-Sale Profile,Butikförsäljnings profil
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +68,Please Update SMS Settings,Uppdatera SMS Inställningar
@@ -3514,12 +3366,12 @@
 ,Serial No Service Contract Expiry,Löpnummer serviceavtal löper ut
 DocType: Item,Unit of Measure Conversion,Enhet Omvandling
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +86,Employee can not be changed,Anställd kan inte ändras
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +259,You cannot credit and debit same account at the same time,Du kan inte kreditera och debitera samma konto på samma gång
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,You cannot credit and debit same account at the same time,Du kan inte kreditera och debitera samma konto på samma gång
 DocType: Naming Series,Help HTML,Hjälp HTML
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},Totalt weightage delas ska vara 100%. Det är {0}
 apps/erpnext/erpnext/controllers/status_updater.py +140,Allowance for over-{0} crossed for Item {1},Ersättning för över {0} korsade till punkt {1}
 DocType: Address,Name of person or organization that this address belongs to.,Namn på den person eller organisation som den här adressen tillhör.
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +587,Your Suppliers,Dina Leverantörer
+apps/erpnext/erpnext/public/js/setup_wizard.js +325,Your Suppliers,Dina Leverantörer
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,Kan inte ställa in då Förlorad kundorder är gjord.
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +65,Another Salary Structure {0} is active for employee {1}. Please make its status 'Inactive' to proceed.,En annan lönestruktur {0} är aktiv anställd {1}. Gör sin status &quot;Inaktiv&quot; för att fortsätta.
 DocType: Purchase Invoice,Contact,Kontakt
@@ -3528,37 +3380,35 @@
 DocType: Item,Has Serial No,Har Löpnummer
 DocType: Employee,Date of Issue,Utgivningsdatum
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +16,{0}: From {0} for {1},{0}: Från {0} för {1}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +154,Row #{0}: Set Supplier for item {1},Rad # {0}: Ställ Leverantör för punkt {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +149,Row #{0}: Set Supplier for item {1},Rad # {0}: Ställ Leverantör för punkt {1}
 DocType: Issue,Content Type,Typ av innehåll
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +17,Computer,Dator
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,Dator
 DocType: Item,List this Item in multiple groups on the website.,Lista detta objekt i flera grupper på webbplatsen.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +283,Please check Multi Currency option to allow accounts with other currency,Kontrollera flera valutor möjlighet att tillåta konton med annan valuta
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +285,Please check Multi Currency option to allow accounts with other currency,Kontrollera flera valutor möjlighet att tillåta konton med annan valuta
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +62,Item: {0} does not exist in the system,Produkt: {0} existerar inte i systemet
 apps/erpnext/erpnext/accounts/doctype/account/account.py +81,You are not authorized to set Frozen value,Du har inte behörighet att ställa in Frysta värden
 DocType: Payment Reconciliation,Get Unreconciled Entries,Hämta ej verifierade Anteckningar
 DocType: Cost Center,Budgets,Budgetar
 apps/frappe/frappe/core/page/modules_setup/modules_setup.py +11,Updated,Uppdaterad
 DocType: Employee,Emergency Contact Details,Akut Kontaktuppgifter
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +396,What does it do?,Vad gör den?
+apps/erpnext/erpnext/public/js/setup_wizard.js +144,What does it do?,Vad gör den?
 DocType: Delivery Note,To Warehouse,Till Warehouse
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +45,Account {0} has been entered more than once for fiscal year {1},Kontot {0} har angetts mer än en gång för räkenskapsåret {1}
 ,Average Commission Rate,Genomsnittligt commisionbetyg
-apps/erpnext/erpnext/stock/doctype/item/item.py +313,'Has Serial No' can not be 'Yes' for non-stock item,&quot;Har Löpnummer&quot; kan inte vara &quot;ja&quot; för icke Beställningsvara
+apps/erpnext/erpnext/stock/doctype/item/item.py +317,'Has Serial No' can not be 'Yes' for non-stock item,&quot;Har Löpnummer&quot; kan inte vara &quot;ja&quot; för icke Beställningsvara
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Attendance can not be marked for future dates,Närvaro kan inte markeras för framtida datum
 DocType: Pricing Rule,Pricing Rule Help,Prissättning Regel Hjälp
 DocType: Purchase Taxes and Charges,Account Head,Kontohuvud
 apps/erpnext/erpnext/config/stock.py +79,Update additional costs to calculate landed cost of items,Uppdatera merkostnader för att beräkna landade kostnaden för objekt
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +111,Electrical,Elektrisk
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +111,Electrical,Elektrisk
 DocType: Stock Entry,Total Value Difference (Out - In),Total Value Skillnad (Out - In)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +302,Row {0}: Exchange Rate is mandatory,Rad {0}: Växelkurser är obligatorisk
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +304,Row {0}: Exchange Rate is mandatory,Rad {0}: Växelkurser är obligatorisk
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},Användar-ID inte satt för anställd {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +72,Peening,Peening
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,From Warranty Claim,Från garantianspråk
 DocType: Stock Entry,Default Source Warehouse,Standardkälla Lager
 DocType: Item,Customer Code,Kund kod
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +212,Birthday Reminder for {0},Påminnelse födelsedag för {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +163,Lapping,Läppning
-apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.js +8,Days Since Last Order,Dagar sedan senast Order
+apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +72,Days Since Last Order,Dagar sedan senast Order
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +299,Debit To account must be a Balance Sheet account,Debitering av kontot måste vara ett balanskonto
 DocType: Buying Settings,Naming Series,Namge Serien
 DocType: Leave Block List,Leave Block List Name,Lämna Blocklistnamn
@@ -3572,7 +3422,7 @@
 DocType: Notification Control,Sales Invoice Message,Fakturan Meddelande
 DocType: Authorization Rule,Based On,Baserat På
 DocType: Sales Order Item,Ordered Qty,Beställde Antal
-apps/erpnext/erpnext/stock/doctype/item/item.py +539,Item {0} is disabled,Punkt {0} är inaktiverad
+apps/erpnext/erpnext/stock/doctype/item/item.py +543,Item {0} is disabled,Punkt {0} är inaktiverad
 DocType: Stock Settings,Stock Frozen Upto,Lager Fryst Upp
 apps/erpnext/erpnext/controllers/recurring_document.py +166,Period From and Period To dates mandatory for recurring {0},Period Från och period datum obligatoriska för återkommande {0}
 apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,Projektverksamhet / uppgift.
@@ -3582,7 +3432,6 @@
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,Rabatt måste vara mindre än 100
 DocType: ToDo,Low,Låg
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Skriv engångsavgift (Company valuta)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +71,Spinning,Spinning
 DocType: Landed Cost Voucher,Landed Cost Voucher,Landad Kostnad rabatt
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +55,Please set {0},Ställ in {0}
 DocType: Purchase Invoice,Repeat on Day of Month,Upprepa på Månadsdag
@@ -3604,7 +3453,6 @@
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +37,Campaign Name is required,Kampanjens namn krävs
 DocType: Maintenance Visit,Maintenance Date,Underhållsdatum
 DocType: Purchase Receipt Item,Rejected Serial No,Avvisat Serienummer
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +51,Deep drawing,Djupdragning
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +40,New Newsletter,Nytt Nyhetsbrev
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +157,Start date should be less than end date for Item {0},Startdatum bör vara mindre än slutdatumet för punkt {0}
 apps/erpnext/erpnext/stock/doctype/item/item.js +17,Show Balance,Visa Balans
@@ -3614,7 +3462,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +119,BOM and Manufacturing Quantity are required,BOM och tillverkningskvantitet krävs
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Åldringsräckvidd 2
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +450,Amount,Mängd
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +147,Riveting,Nitning
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,BOM ersatte
 ,Sales Analytics,Försäljnings Analytics
 DocType: Manufacturing Settings,Manufacturing Settings,Tillverknings Inställningar
@@ -3626,20 +3473,19 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +207,New Account Name,Nytt kontonamn
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,Råvaror Levererans Kostnad
 DocType: Selling Settings,Settings for Selling Module,Inställningar för att sälja Modul
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +73,Customer Service,Kundtjänst
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Customer Service,Kundtjänst
 DocType: Item,Thumbnail,Miniatyr
 DocType: Item Customer Detail,Item Customer Detail,Produktdetaljer kund
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +147,Confirm Your Email,Bekräfta din e-post
 apps/erpnext/erpnext/config/hr.py +53,Offer candidate a Job.,Erbjud kandidaten ett jobb.
 DocType: Notification Control,Prompt for Email on Submission of,Fråga för e-post på Inlämning av
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +81,Total allocated leaves are more than days in the period,Totalt tilldelade bladen är mer än dagar under perioden
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +70,Item {0} must be a stock Item,Produkt {0} måste vara en lagervara
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,Standard Work In Progress Warehouse
 apps/erpnext/erpnext/config/accounts.py +107,Default settings for accounting transactions.,Standardinställningarna för bokföringstransaktioner.
 apps/frappe/frappe/model/naming.py +40,{0} is required,{0} krävs
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +21,Vacuum molding,Vakuumformning
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,Förväntad Datum kan inte vara före Material Begäran Datum
 DocType: Contact Us Settings,City,Stad
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +132,Ultrasonic machining,Ultraljuds bearbetning
 apps/frappe/frappe/templates/base.html +137,Error: Not a valid id?,Fel: Inte ett giltigt id?
 apps/erpnext/erpnext/stock/get_item_details.py +125,Item {0} must be a Sales Item,Produkt {0} måste vara ett försäljningsprodukt
 DocType: Naming Series,Update Series Number,Uppdatera Serie Nummer
@@ -3647,7 +3493,7 @@
 DocType: Sales Order,Printing Details,Utskrifter Detaljer
 DocType: Task,Closing Date,Slutdatum
 DocType: Sales Order Item,Produced Quantity,Producerat Kvantitet
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +84,Engineer,Ingenjör
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Engineer,Ingenjör
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,Sök Sub Assemblies
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +379,Item Code required at Row No {0},Produkt kod krävs vid Radnr {0}
 DocType: Sales Partner,Partner Type,Partner Typ
@@ -3655,7 +3501,7 @@
 DocType: Authorization Rule,Customerwise Discount,Kundrabatt
 DocType: Purchase Invoice,Against Expense Account,Mot utgiftskonto
 DocType: Production Order,Production Order,Produktionsorder
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +258,Installation Note {0} has already been submitted,Installeringsnotis {0} har redan lämnats in
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +263,Installation Note {0} has already been submitted,Installeringsnotis {0} har redan lämnats in
 DocType: Quotation Item,Against Docname,Mot doknamn
 DocType: SMS Center,All Employee (Active),Personal (aktiv)
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,Visa nu
@@ -3664,19 +3510,19 @@
 DocType: Item,Re-Order Level,Återuppta nivå
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,Ange produkter och planerad ant. som du vill höja produktionsorder eller hämta råvaror för analys.
 apps/frappe/frappe/public/js/frappe/views/ganttview.js +45,Gantt Chart,Gantt-Schema
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +57,Part-time,Deltid
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,Part-time,Deltid
 DocType: Employee,Applicable Holiday List,Tillämplig kalender
 DocType: Employee,Cheque,Check
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,Serie Uppdaterad
 apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Report Type is mandatory,Rapporttyp är obligatorisk
 DocType: Item,Serial Number Series,Serial Number Series
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},Lager är obligatoriskt för Lagervara {0} i rad {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +45,Retail & Wholesale,Detaljhandel och grossisthandel
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,Detaljhandel och grossisthandel
 DocType: Issue,First Responded On,Först svarade den
 DocType: Website Item Group,Cross Listing of Item in multiple groups,Kors Notering av punkt i flera grupper
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +351,The First User: You,Den första användaren: Du
+apps/erpnext/erpnext/public/js/setup_wizard.js +101,The First User: You,Den första användaren: Du
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +48,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},Räkenskapsårets Startdatum och Räkenskapsårets Slutdatum är redan inställd under räkenskapsåret {0}
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +172,Successfully Reconciled,Framgångsrikt Avstämt
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +119,Successfully Reconciled,Framgångsrikt Avstämt
 DocType: Production Order,Planned End Date,Planerat Slutdatum
 apps/erpnext/erpnext/config/stock.py +43,Where items are stored.,Där artiklar lagras.
 DocType: Tax Rule,Validity,Giltighet
@@ -3696,39 +3542,36 @@
 DocType: DocPerm,Level,Nivå
 DocType: Purchase Taxes and Charges,On Net Total,På Net Totalt
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +160,Target warehouse in row {0} must be same as Production Order,Target lager i rad {0} måste vara densamma som produktionsorder
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +59,No permission to use Payment Tool,Ingen tillåtelse att använda betalningsverktyg
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +97,No permission to use Payment Tool,Ingen tillåtelse att använda betalningsverktyg
 apps/erpnext/erpnext/controllers/recurring_document.py +192,'Notification Email Addresses' not specified for recurring %s,"""Anmälan e-postadresser"" inte angett för återkommande% s"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +86,Milling,Fräsning
 apps/erpnext/erpnext/accounts/doctype/account/account.py +99,Currency can not be changed after making entries using some other currency,Valuta kan inte ändras efter att ha gjort poster med någon annan valuta
 DocType: Company,Round Off Account,Avrunda konto
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +60,Nibbling,Nibbling
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,Administrativa kostnader
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +18,Consulting,Konsultering
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +18,Consulting,Konsultering
 DocType: Customer Group,Parent Customer Group,Överordnad kundgrupp
 apps/erpnext/erpnext/public/js/pos/pos.js +429,Change,Byta
 DocType: Purchase Invoice,Contact Email,Kontakt E-Post
 DocType: Appraisal Goal,Score Earned,Betyg förtjänat
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +393,"e.g. ""My Company LLC""","t.ex. ""Mitt Företag LLC"""
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +173,Notice Period,Uppsägningstid
+apps/erpnext/erpnext/public/js/setup_wizard.js +141,"e.g. ""My Company LLC""","t.ex. ""Mitt Företag LLC"""
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +173,Notice Period,Uppsägningstid
 DocType: Bank Reconciliation Detail,Voucher ID,Rabatt-ID
 apps/erpnext/erpnext/setup/doctype/territory/territory.js +14,This is a root territory and cannot be edited.,Detta är en rot territorium och kan inte ändras.
 DocType: Packing Slip,Gross Weight UOM,Bruttovikt UOM
 DocType: Email Digest,Receivables / Payables,Fordringar / skulder
 DocType: Delivery Note Item,Against Sales Invoice,Mot fakturan
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +63,Stamping,Prägling
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +457,Credit Account,KUNDKONTO
 DocType: Landed Cost Item,Landed Cost Item,Landad kostnadspost
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +56,Show zero values,Visa nollvärden
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,Antal av objekt som erhålls efter tillverkning / ompackning från givna mängder av råvaror
 DocType: Payment Reconciliation,Receivable / Payable Account,Fordran / Betal konto
 DocType: Delivery Note Item,Against Sales Order Item,Mot Försäljningvara
-apps/erpnext/erpnext/stock/doctype/item/item.py +521,Please specify Attribute Value for attribute {0},Ange Attribut Värde för attribut {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +525,Please specify Attribute Value for attribute {0},Ange Attribut Värde för attribut {0}
 DocType: Item,Default Warehouse,Standard Lager
 DocType: Task,Actual End Date (via Time Logs),Faktiskt Slutdatum (via Tidslogg)
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +37,Budget cannot be assigned against Group Account {0},Budget kan inte tilldelas mot gruppkonto {0}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +23,Please enter parent cost center,Ange huvud kostnadsställe
 DocType: Delivery Note,Print Without Amount,Skriv ut utan Belopp
-apps/erpnext/erpnext/controllers/buying_controller.py +69,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,Skatte Kategori kan inte vara &quot;Värdering&quot; eller &quot;Värdering och Total&quot; som alla artiklar är icke-lager
+apps/erpnext/erpnext/controllers/buying_controller.py +60,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,Skatte Kategori kan inte vara &quot;Värdering&quot; eller &quot;Värdering och Total&quot; som alla artiklar är icke-lager
 DocType: User,Last Name,Efternamn
 DocType: Web Page,Left,Vänster
 DocType: Event,All Day,Hela Dagen
@@ -3736,7 +3579,7 @@
 DocType: Appraisal,Total Score (Out of 5),Totalt Betyg (Out of 5)
 DocType: Contact Us Settings,State,Status
 DocType: Batch,Batch,Batch
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +51,Balance,Balans
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +28,Balance,Balans
 DocType: Project,Total Expense Claim (via Expense Claims),Totalkostnadskrav (via räkningar)
 DocType: User,Gender,Kön
 DocType: Journal Entry,Debit Note,Debetnota
@@ -3766,8 +3609,7 @@
 DocType: Purchase Order,Get Last Purchase Rate,Hämta Senaste Beställningsvärdet
 DocType: Time Log,Billing Rate based on Activity Type (per hour),Billing Pris baseras på Aktivitetstyp (per timme)
 DocType: Company,Company Info,Företagsinfo
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +76,Seaming,Falsning
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +197,"Company Email ID not found, hence mail not sent","Företagets epost-ID hittades inte, darför inte epost skickas"
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +206,"Company Email ID not found, hence mail not sent","Företagets epost-ID hittades inte, darför inte epost skickas"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Tillämpning av medel (tillgångar)
 DocType: Production Planning Tool,Filter based on item,Filter baserat på objektet
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +451,Debit Account,Bankkortkonto
@@ -3779,17 +3621,16 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +95,{0} {1} has been modified. Please refresh.,{0} {1} har ändrats. Vänligen uppdatera.
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,Stoppa användare från att göra Lämna program på följande dagarna.
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +591,From Opportunity,Från Möjlighet
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +46,Blanking,Blind
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +166,Employee Benefits,Ersättningar till anställda
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,Employee Benefits,Ersättningar till anställda
 DocType: Sales Invoice,Is POS,Är POS
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +240,Packed quantity must equal quantity for Item {0} in row {1},Packad kvantitet måste vara samma kvantitet för punkt {0} i rad {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +245,Packed quantity must equal quantity for Item {0} in row {1},Packad kvantitet måste vara samma kvantitet för punkt {0} i rad {1}
 DocType: Production Order,Manufactured Qty,Tillverkas Antal
 DocType: Purchase Receipt Item,Accepted Quantity,Godkänd Kvantitet
 apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} existerar inte
 apps/erpnext/erpnext/config/accounts.py +18,Bills raised to Customers.,Fakturor till kunder.
 DocType: DocField,Default,Standard
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Projekt Id
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +466,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Rad nr {0}: Beloppet kan inte vara större än utestående beloppet mot utgiftsräkning {1}. I avvaktan på Beloppet är {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +468,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Rad nr {0}: Beloppet kan inte vara större än utestående beloppet mot utgiftsräkning {1}. I avvaktan på Beloppet är {2}
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +40,{0} subscribers added,{0} abonnenter tillagda
 DocType: Maintenance Schedule,Schedule,Tidtabell
 DocType: Cost Center,"Define Budget for this Cost Center. To set budget action, see ""Company List""","Definiera budget för detta kostnadsställe. Om du vill ställa budget action, se &quot;Företag Lista&quot;"
@@ -3800,7 +3641,7 @@
 apps/erpnext/erpnext/public/js/pos/pos.js +91,Price List not found or disabled,Prislista hittades inte eller avaktiverad
 DocType: Expense Claim,Approved,Godkänd
 DocType: Pricing Rule,Price,Pris
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +79,Employee relieved on {0} must be set as 'Left',"Anställd sparkades på {0} måste ställas in som ""lämnat"""
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +88,Employee relieved on {0} must be set as 'Left',"Anställd sparkades på {0} måste ställas in som ""lämnat"""
 DocType: Item,"Selecting ""Yes"" will give a unique identity to each entity of this item which can be viewed in the Serial No master.",Om du väljer &quot;Yes&quot; kommer att ge en unik identitet för varje enhet i denna punkt som kan ses i Löpnummer mästare.
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +39,Appraisal {0} created for Employee {1} in the given date range,Bedömning {0} skapades för anställd {1} på visst datumintervall
 DocType: Employee,Education,Utbildning
@@ -3811,7 +3652,7 @@
 apps/frappe/frappe/desk/moduleview.py +67,Standard Reports,Standardrapporter
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,Redovisning journalanteckningar.
 DocType: Delivery Note Item,Available Qty at From Warehouse,Tillgång Antal på From Warehouse
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +209,Please select Employee Record first.,Välj Anställningsregister först.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +224,Please select Employee Record first.,Välj Anställningsregister först.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Rad {0}: Party / konto stämmer inte med {1} / {2} i {3} {4}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +35,To create a Tax Account,För att skapa en skattekontot
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +233,Please enter Expense Account,Ange utgiftskonto
@@ -3824,46 +3665,43 @@
 DocType: Sales Order,Track this Sales Order against any Project,Prenumerera på det här kundorder mot varje Project
 DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,Hämta försäljningsorder (i avvaktan på att leverera) baserat på ovanstående kriterier
 DocType: DocShare,Document Type,Dokumentstyp
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +565,From Supplier Quotation,Från leverantör Offert
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +588,From Supplier Quotation,Från leverantör Offert
 DocType: Deduction Type,Deduction Type,Avdragstyp
 DocType: Attendance,Half Day,Halv Dag
 DocType: Pricing Rule,Min Qty,Min Antal
 DocType: Features Setup,"To track items in sales and purchase documents with batch nos. ""Preferred Industry: Chemicals""",Om du vill spåra objekt i försäljnings- och inköpsdokument med sats nos. &quot;Önskad Bransch: Kemikalier&quot;
 DocType: GL Entry,Transaction Date,Transaktionsdatum
 DocType: Production Plan Item,Planned Qty,Planerade Antal
-apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +91,Total Tax,Totalt Skatt
+apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +93,Total Tax,Totalt Skatt
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +178,For Quantity (Manufactured Qty) is mandatory,För Kvantitet (Tillverkad Antal) är obligatorisk
 DocType: Stock Entry,Default Target Warehouse,Standard Valt Lager
 DocType: Purchase Invoice,Net Total (Company Currency),Netto Totalt (Företagsvaluta)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +79,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Rad {0}: Parti Typ och Parti gäller endast mot Fordran / Betal konto
 DocType: Notification Control,Purchase Receipt Message,Inköpskvitto Meddelande
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +95,Total allocated leaves are more than period,Totalt tilldelade bladen är mer än period
 DocType: Production Order,Actual Start Date,Faktiskt startdatum
 DocType: Sales Order,% of materials delivered against this Sales Order,% Av material som levereras mot denna kundorder
 apps/erpnext/erpnext/config/stock.py +23,Record item movement.,Regsiterobjektets rörelse.
 DocType: Newsletter List Subscriber,Newsletter List Subscriber,Nyhetsbrev listade Abonnenter
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +164,Morticing,Tapphåls
 DocType: Email Account,Service,Tjänsten
 DocType: Hub Settings,Hub Settings,Nav Inställningar
 DocType: Project,Gross Margin %,Bruttomarginal%
 DocType: BOM,With Operations,Med verksamhet
 apps/erpnext/erpnext/accounts/party.py +232,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Bokföringsposter har redan gjorts i valuta {0} för företag {1}. Välj en fordran eller skuld konto med valuta {0}.
 ,Monthly Salary Register,Månadslön Register
-apps/frappe/frappe/website/template.py +140,Next,Nästa
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard_page.html +17,Next,Nästa
 DocType: Warranty Claim,If different than customer address,Om annan än kundens adress
 DocType: BOM Operation,BOM Operation,BOM Drift
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +118,Electropolishing,Elektrisk polering
 DocType: Purchase Taxes and Charges,On Previous Row Amount,På föregående v Belopp
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +24,Please enter Payment Amount in atleast one row,Ange Betalningsbelopp i minst en rad
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +33,Please enter Payment Amount in atleast one row,Ange Betalningsbelopp i minst en rad
 DocType: POS Profile,POS Profile,POS-Profil
 apps/erpnext/erpnext/config/accounts.py +153,"Seasonality for setting budgets, targets etc.","Säsongs för att fastställa budgeten, mål etc."
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +238,Row {0}: Payment Amount cannot be greater than Outstanding Amount,Rad {0}: Betalningsbeloppet kan inte vara större än utestående beloppet
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +46,Total Unpaid,Totalt Obetald
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +21,Time Log is not billable,Tid Log är inte debiterbar
 apps/erpnext/erpnext/stock/get_item_details.py +128,"Item {0} is a template, please select one of its variants","Punkt {0} är en mall, välj en av dess varianter"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +528,Purchaser,Inköparen
+apps/erpnext/erpnext/public/js/setup_wizard.js +272,Purchaser,Inköparen
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +81,Net pay cannot be negative,Nettolön kan inte vara negativ
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +71,Please enter the Against Vouchers manually,Ange mot mot vilken rabattkod manuellt
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +107,Please enter the Against Vouchers manually,Ange mot mot vilken rabattkod manuellt
 DocType: SMS Settings,Static Parameters,Statiska Parametrar
 DocType: Purchase Order,Advance Paid,Förskottsbetalning
 DocType: Item,Item Tax,Produkt Skatt
@@ -3872,14 +3710,12 @@
 apps/erpnext/erpnext/config/crm.py +48,Send mass SMS to your contacts,Skicka mass SMS till dina kontakter
 DocType: Purchase Taxes and Charges,Consider Tax or Charge for,Värdera skatt eller avgift för
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,Faktiska Antal är obligatorisk
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +42,Cross-rolling,Korsvalsning
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +132,Credit Card,Kreditkort
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +132,Credit Card,Kreditkort
 DocType: BOM,Item to be manufactured or repacked,Produkt som skall tillverkas eller packas
 apps/erpnext/erpnext/config/stock.py +95,Default settings for stock transactions.,Standardinställningarna för aktietransaktioner.
 DocType: Purchase Invoice,Next Date,Nästa Datum
 DocType: Employee Education,Major/Optional Subjects,Stora / valfria ämnen
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +49,Please enter Taxes and Charges,Ange skatter och avgifter
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +85,Machining,Bearbetning
 DocType: Sales Invoice Item,Drop Ship,Drop Ship
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","Här kan du behålla familje detaljer som namn och ockupationen av förälder, make och barn"
 DocType: Hub Settings,Seller Name,Säljaren Namn
@@ -3889,7 +3725,7 @@
 DocType: Stock Entry,Repack,Packa om
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +6,You must Save the form before proceeding,Du måste spara formuläret innan du fortsätter
 DocType: Item Attribute,Numeric Values,Numeriska värden
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +500,Attach Logo,Fäst Logo
+apps/erpnext/erpnext/public/js/setup_wizard.js +246,Attach Logo,Fäst Logo
 DocType: Customer,Commission Rate,Provisionbetyg
 apps/erpnext/erpnext/stock/doctype/item/item.js +38,Make Variant,Gör Variant
 apps/erpnext/erpnext/config/hr.py +145,Block leave applications by department.,Block ledighet applikationer avdelningsvis.
@@ -3904,19 +3740,19 @@
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +105,Please select a csv file,Välj en csv-fil
 DocType: Dropbox Backup,Send Backups to Dropbox,Skicka säkerhetskopior till Dropbox
 DocType: Purchase Order,To Receive and Bill,Ta emot och Bill
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +94,Designer,Designer
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Designer,Designer
 apps/erpnext/erpnext/config/selling.py +121,Terms and Conditions Template,Villkor Mall
 DocType: Serial No,Delivery Details,Leveransdetaljer
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +383,Cost Center is required in row {0} in Taxes table for type {1},Kostnadsställe krävs rad {0} i skatte tabellen för typ {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +386,Cost Center is required in row {0} in Taxes table for type {1},Kostnadsställe krävs rad {0} i skatte tabellen för typ {1}
 DocType: Item,Automatically create Material Request if quantity falls below this level,Skapa automatiskt Material Begäran om kvantitet understiger denna nivå
 ,Item-wise Purchase Register,Produktvis Inköpsregister
 DocType: Batch,Expiry Date,Utgångsdatum
-apps/erpnext/erpnext/stock/doctype/item/item.py +375,"To set reorder level, item must be a Purchase Item or Manufacturing Item","För att ställa in beställningsnivå, måste objektet vara en inköpsobjekt eller tillverkning Punkt"
+apps/erpnext/erpnext/stock/doctype/item/item.py +379,"To set reorder level, item must be a Purchase Item or Manufacturing Item","För att ställa in beställningsnivå, måste objektet vara en inköpsobjekt eller tillverkning Punkt"
 ,Supplier Addresses and Contacts,Leverantör adresser och kontakter
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,Vänligen välj kategori först
 apps/erpnext/erpnext/config/projects.py +18,Project master.,Projektchef.
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,Visa inte någon symbol som $ etc bredvid valutor.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +330, (Half Day),(Halv Dag)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +374, (Half Day),(Halv Dag)
 DocType: Supplier,Credit Days,Kreditdagar
 DocType: Leave Type,Is Carry Forward,Är Överförd
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +478,Get Items from BOM,Hämta artiklar från BOM
@@ -3924,7 +3760,7 @@
 apps/erpnext/erpnext/config/manufacturing.py +120,Bill of Materials,Bill of Materials
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +77,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Rad {0}: Parti Typ och Parti krävs för obetalda / konto {1}
 DocType: Dropbox Backup,Send Notifications To,Skicka meddelanden till
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html +26,Ref Date,Ref Datum
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +54,Ref Date,Ref Datum
 DocType: Employee,Reason for Leaving,Anledning för att lämna
 DocType: Expense Claim Detail,Sanctioned Amount,Sanktionerade Belopp
 DocType: GL Entry,Is Opening,Är Öppning
@@ -3932,4 +3768,3 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +188,Account {0} does not exist,Kontot {0} existerar inte
 DocType: Account,Cash,Kontanter
 DocType: Employee,Short biography for website and other publications.,Kort biografi för webbplatsen och andra publikationer.
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +31,Please create Salary Structure for employee {0},Skapa lönestruktur för arbetstagare {0}
diff --git a/erpnext/translations/ta.csv b/erpnext/translations/ta.csv
index 30840b7..d75d11b 100644
--- a/erpnext/translations/ta.csv
+++ b/erpnext/translations/ta.csv
@@ -1,13 +1,12 @@
 DocType: Employee,Salary Mode,சம்பளம் முறை
 DocType: Cost Center,"Select Monthly Distribution, if you want to track based on seasonality.","நீங்கள் பருவகாலம் அடிப்படையில் கண்காணிக்க வேண்டும் என்றால், மாதாந்திர, விநியோகம் தேர்ந்தெடுக்கவும்."
 DocType: Employee,Divorced,விவாகரத்து
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +86,Warning: Same item has been entered multiple times.,எச்சரிக்கை: ஒரே பொருளைப் பலமுறை உள்ளிட்ட வருகிறது.
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +80,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,பொருள் ஒரு பரிமாற்றத்தில் பல முறை சேர்க்க அனுமதி
 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/page/setup_wizard/fixtures/industry_type.py +19,Consumer Products,நுகர்வோர் தயாரிப்புகள்
+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,முதல் கட்சி வகையைத் தேர்வு செய்க
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +90,Annealing,தூண்டு
 DocType: Item,Customer Items,வாடிக்கையாளர் பொருட்கள்
 apps/erpnext/erpnext/accounts/doctype/account/account.py +45,Account {0}: Parent account {1} can not be a ledger,கணக்கு {0}: பெற்றோர் கணக்கு {1} ஒரு பேரேட்டில் இருக்க முடியாது
 DocType: Item,Publish Item to hub.erpnext.com,Hub.erpnext.com செய்ய உருப்படியை வெளியிட
@@ -20,15 +19,14 @@
 DocType: About Us Settings,Website,இணையதளம்
 DocType: POS Profile,Applicable for User,பயனர் பொருந்தும்
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +169,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","நிறுத்தி உற்பத்தி ஆணை ரத்து செய்ய முடியாது, ரத்து செய்ய முதலில் அதை தடை இல்லாத"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +23,Compaction plus sintering,சுருக்கம் பிளஸ் வெப்பப்படுத்தலுக்கு
 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.,* பரிமாற்றத்தில் கணக்கிடப்படுகிறது.
 DocType: Purchase Order,Customer Contact,வாடிக்கையாளர் தொடர்பு
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +549,From Material Request,பொருள் கோரிக்கையை இருந்து
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +572,From Material Request,பொருள் கோரிக்கையை இருந்து
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} மரம்
 DocType: Job Applicant,Job Applicant,வேலை விண்ணப்பதாரர்
 apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,மேலும் முடிவுகள் இல்லை.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +78,Legal,சட்ட
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +34,Legal,சட்ட
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +114,Actual type tax cannot be included in Item rate in row {0},உண்மையான வகை வரி வரிசையில் மதிப்பிட சேர்க்கப்பட்டுள்ளது முடியாது {0}
 DocType: C-Form,Customer,வாடிக்கையாளர்
 DocType: Purchase Receipt Item,Required By,By தேவை
@@ -43,7 +41,6 @@
 DocType: Manufacturing Settings,Default 10 mins,10 நிமிடங்கள் Default
 DocType: Leave Type,Leave Type Name,வகை பெயர் விட்டு
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +148,Series Updated Successfully,தொடர் வெற்றிகரமாக புதுப்பிக்கப்பட்டது
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +150,Stitching,தையல்
 DocType: Pricing Rule,Apply On,விண்ணப்பிக்க
 DocType: Item Price,Multiple Item prices.,பல பொருள் விலை .
 ,Purchase Order Items To Be Received,"பெறப்பட்டுள்ள இருக்கவும் செய்ய வாங்குதல், ஆர்டர் உருப்படிகள்"
@@ -51,8 +48,8 @@
 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 +104,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 +189,New Leave Application,புதிய விடுப்பு விண்ணப்பம்
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +134,Bank Draft,வங்கி உண்டியல்
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +204,New Leave Application,புதிய விடுப்பு விண்ணப்பம்
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +134,Bank Draft,வங்கி உண்டியல்
 DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,1. வாடிக்கையாளர் வாரியாக உருப்படியை குறியீடு பராமரிக்க மற்றும் அவற்றின் குறியீடு அடிப்படையில் அவர்களை தேடும் செய்ய இந்த விருப்பத்தை பயன்படுத்த
 DocType: Mode of Payment Account,Mode of Payment Account,கொடுப்பனவு கணக்கு முறை
 apps/erpnext/erpnext/stock/doctype/item/item.js +34,Show Variants,காட்டு மாறிகள்
@@ -64,25 +61,23 @@
 DocType: Production Plan Item,Production Plan Item,உற்பத்தி திட்டம் பொருள்
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +141,User {0} is already assigned to Employee {1},பயனர் {0} ஏற்கனவே பணியாளர் ஒதுக்கப்படும் {1}
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +13,Make new POS Profile,புதிய பிஓஎஸ் செய்தது செய்ய
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +31,Health Care,உடல்நலம்
+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 +494,Invoice,விலைப்பட்டியல்
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +519,Invoice,விலைப்பட்டியல்
 DocType: Maintenance Schedule Item,Periodicity,வட்டம்
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +357,Email Address,மின்னஞ்சல் முகவரி
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +21,Defense,பாதுகாப்பு
+apps/erpnext/erpnext/public/js/setup_wizard.js +107,Email Address,மின்னஞ்சல் முகவரி
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,பாதுகாப்பு
 DocType: Company,Abbr,Abbr
 DocType: Appraisal Goal,Score (0-5),ஸ்கோர் (0-5)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +193,Row {0}: {1} {2} does not match with {3},ரோ {0} {1} {2} பொருந்தவில்லை {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +67,Row # {0}:,ரோ # {0}:
 DocType: Delivery Note,Vehicle No,வாகனம் இல்லை
 apps/erpnext/erpnext/public/js/pos/pos.js +528,Please select Price List,விலை பட்டியல் தேர்ந்தெடுக்கவும்
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +162,Woodworking,மரப்பொருட்கள்
 DocType: Production Order Operation,Work In Progress,முன்னேற்றம் வேலை
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +153,3D printing,3D அச்சிடும்
 DocType: Employee,Holiday List,விடுமுறை பட்டியல்
 DocType: Time Log,Time Log,நேரம் புகுபதிகை
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +530,Accountant,கணக்கர்
+apps/erpnext/erpnext/public/js/setup_wizard.js +274,Accountant,கணக்கர்
 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.","செயல்பாடுகள் பரிசீலனை, பில்லிங் நேரம் கண்காணிப்பு பயன்படுத்த முடியும் என்று பணிகளை எதிராக செய்த செய்யப்படுகிறது."
@@ -98,18 +93,19 @@
 DocType: Bin,Quantity Requested for Purchase,அளவு கொள்முதல் செய்ய கோரப்பட்ட
 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/setup/page/setup_wizard/setup_wizard.js +626,Kg,கிலோ
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Kg,கிலோ
 apps/erpnext/erpnext/config/hr.py +48,Opening for a Job.,ஒரு வேலை திறப்பு.
 DocType: Item Attribute,Increment,சம்பள உயர்வு
 apps/erpnext/erpnext/public/js/stock_analytics.js +63,Select Warehouse...,கிடங்கு தேர்ந்தெடுக்கவும் ...
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +6,Advertising,விளம்பரம்
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,விளம்பரம்
+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/doctype/sales_invoice/sales_invoice.py +389,Stock cannot be updated against Delivery Note {0},பங்கு விநியோக குறிப்பு எதிராக மேம்படுத்தப்பட்டது முடியாது {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +391,Stock cannot be updated against Delivery Note {0},பங்கு விநியோக குறிப்பு எதிராக மேம்படுத்தப்பட்டது முடியாது {0}
 DocType: Payment Reconciliation,Reconcile,சமரசம்
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +30,Grocery,மளிகை
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,மளிகை
 DocType: Quality Inspection Reading,Reading 1,1 படித்தல்
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Make Bank Entry,வங்கி நுழைவு செய்ய
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +40,Pension Funds,ஓய்வூதிய நிதி
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,ஓய்வூதிய நிதி
 apps/erpnext/erpnext/accounts/doctype/account/account.py +142,Warehouse is mandatory if account type is Warehouse,கணக்கு வகை கிடங்கு என்றால் கிடங்கு கட்டாய ஆகிறது
 DocType: SMS Center,All Sales Person,அனைத்து விற்பனை நபர்
 DocType: Lead,Person Name,நபர் பெயர்
@@ -131,7 +127,7 @@
 DocType: Quality Inspection,Get Specification Details,குறிப்பு விவரம் கிடைக்கும்
 DocType: Lead,Interested,அக்கறை உள்ள
 apps/erpnext/erpnext/config/manufacturing.py +14,Bill of Material,பொருள் பில்
-apps/erpnext/erpnext/public/js/stock_analytics.js +45,Opening,திறப்பு
+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,பொருள் குழு நகல்
 DocType: Journal Entry,Opening Entry,நுழைவு திறந்து
@@ -145,23 +141,22 @@
 DocType: Employee Education,Under Graduate,பட்டதாரி கீழ்
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +22,Target On,இலக்கு
 DocType: BOM,Total Cost,மொத்த செலவு
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +99,Reaming,Reaming
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +9,Activity Log:,செயல்பாடு : புகுபதிகை
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +199,Item {0} does not exist in the system or has expired,பொருள் {0} அமைப்பில் இல்லை அல்லது காலாவதியானது
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +44,Real Estate,வீடு
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +44,Real Estate,வீடு
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +4,Statement of Account,கணக்கு அறிக்கை
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +41,Pharmaceuticals,மருந்துப்பொருள்கள்
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,மருந்துப்பொருள்கள்
 DocType: Expense Claim Detail,Claim Amount,உரிமை தொகை
 DocType: Employee,Mr,திரு
 DocType: Custom Script,Client,கிளையன்
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,வழங்குபவர் வகை / வழங்குபவர்
 DocType: Naming Series,Prefix,முற்சேர்க்கை
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Consumable,நுகர்வோர்
+apps/erpnext/erpnext/public/js/setup_wizard.js +359,Consumable,நுகர்வோர்
 DocType: Upload Attendance,Import Log,புகுபதிகை இறக்குமதி
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.js +19,Send,அனுப்பு
 DocType: Sales Invoice Item,Delivered By Supplier,சப்ளையர் மூலம் வழங்கப்படுகிறது
 DocType: SMS Center,All Contact,அனைத்து தொடர்பு
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +164,Annual Salary,ஆண்டு சம்பளம்
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +164,Annual Salary,ஆண்டு சம்பளம்
 DocType: Period Closing Voucher,Closing Fiscal Year,நிதியாண்டு மூடுவதற்கு
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +69,Stock Expenses,பங்கு செலவுகள்
 DocType: Newsletter,Email Sent?,அனுப்பிய மின்னஞ்சல்?
@@ -169,7 +164,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +92,Show Time Logs,காட்டு நேரத்தில் பதிவுகள்
 DocType: Journal Entry Account,Credit in Company Currency,நிறுவனத்தின் நாணய கடன்
 DocType: Delivery Note,Installation Status,நிறுவல் நிலைமை
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +115,Accepted + Rejected Qty must be equal to Received quantity for Item {0},அக்செப்டட் + நிராகரிக்கப்பட்டது அளவு பொருள் பெறப்பட்டது அளவு சமமாக இருக்க வேண்டும் {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +118,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 +133,Item {0} must be a Purchase Item,பொருள் {0} ஒரு கொள்முதல் பொருள் இருக்க வேண்டும்
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
@@ -177,19 +172,17 @@
  தேர்வு காலம் இருக்கும் அனைத்து தேதிகளும் ஊழியர் இணைந்து ஏற்கனவே உள்ள வருகைப் பதிவேடுகள் கொண்டு, டெம்ப்ளேட் வரும்"
 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 +493,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","வரிசையில் வரி ஆகியவை அடங்கும் {0} பொருள் விகிதம் , வரிசைகளில் வரிகளை {1} சேர்க்கப்பட்டுள்ளது"
+apps/erpnext/erpnext/controllers/accounts_controller.py +494,"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 +90,Settings for HR Module,அலுவலக தொகுதி அமைப்புகள்
 DocType: SMS Center,SMS Center,எஸ்எம்எஸ் மையம்
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +78,Straightening,நேராக்க
 DocType: BOM Replace Tool,New BOM,புதிய BOM
 apps/erpnext/erpnext/config/projects.py +28,Batch Time Logs for billing.,தொகுதி பில்லிங் நேரம் பதிவுகள்.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +15,Countergravity casting,Countergravity நடிப்பதற்கு
 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/setup/page/setup_wizard/fixtures/industry_type.py +14,Broadcasting,ஒலிபரப்புதல்
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +140,Execution,நிர்வாகத்தினருக்கு
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +364,The first user will become the System Manager (you can change this later).,கணினி மேலாளர் மாறும் முதல் பயனர் (இந்த பிறகு மாற்றலாம்).
+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/public/js/setup_wizard.js +114,The first user will become the System Manager (you can change this later).,கணினி மேலாளர் மாறும் முதல் பயனர் (இந்த பிறகு மாற்றலாம்).
 apps/erpnext/erpnext/config/manufacturing.py +39,Details of the operations carried out.,குலையை மூடுதல் மேற்கொள்ளப்படும்.
 DocType: Serial No,Maintenance Status,பராமரிப்பு நிலைமை
 apps/erpnext/erpnext/config/stock.py +263,Items and Pricing,பொருட்கள் மற்றும் விலை
@@ -206,7 +199,6 @@
 DocType: Pricing Rule,Discount on Price List Rate (%),விலை பட்டியல் விகிதம் தள்ளுபடி (%)
 apps/frappe/frappe/public/js/frappe/form/print.js +96,Start,தொடக்கம்
 DocType: User,First Name,முதல் பெயர்
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +12,Full-mold casting,முழு அச்சு வார்ப்பு
 DocType: Offer Letter,Select Terms and Conditions,தேர்வு விதிமுறைகள் மற்றும் நிபந்தனைகள்
 DocType: Production Planning Tool,Sales Orders,விற்பனை ஆணைகள்
 DocType: Purchase Taxes and Charges,Valuation,மதிப்பு மிக்க
@@ -218,8 +210,7 @@
 DocType: Bank Reconciliation,Bank Account,வங்கி கணக்கு
 DocType: Leave Type,Allow Negative Balance,எதிர்மறை இருப்பு அனுமதி
 DocType: Selling Settings,Default Territory,முன்னிருப்பு மண்டலம்
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +53,Television,தொலை காட்சி
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +138,Gashing,Gashing
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,தொலை காட்சி
 DocType: Production Order Operation,Updated via 'Time Log','டைம் பரிசீலனை' வழியாக புதுப்பிக்கப்பட்டது
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +82,Account {0} does not belong to Company {1},கணக்கு {0} நிறுவனத்திற்கு சொந்தமானது இல்லை {1}
 DocType: Naming Series,Series List for this Transaction,இந்த பரிவர்த்தனை தொடர் பட்டியல்
@@ -234,14 +225,13 @@
 DocType: Leave Allocation,Add unused leaves from previous allocations,முந்தைய ஒதுக்கீடுகளை இருந்து பயன்படுத்தப்படாத இலைகள் சேர்க்கவும்
 apps/erpnext/erpnext/controllers/recurring_document.py +206,Next Recurring {0} will be created on {1},அடுத்த தொடர் {0} ம் உருவாக்கப்பட்ட {1}
 DocType: Newsletter List,Total Subscribers,மொத்த சந்தாதாரர்கள்
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +575,Contact Name,பெயர் தொடர்பு
+,Contact Name,பெயர் தொடர்பு
 DocType: Production Plan Item,SO Pending Qty,எனவே அளவு நிலுவையில்
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,மேலே குறிப்பிட்டுள்ள அடிப்படை சம்பளம் சீட்டு உருவாக்குகிறது.
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,வாங்குவதற்கு கோரிக்கை.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +107,Double housing,இரட்டை வீடுகள்
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +156,Only the selected Leave Approver can submit this Leave Application,"தேர்வு விடுமுறை வீடு, இந்த விடுமுறை விண்ணப்பத்தை"
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +171,Only the selected Leave Approver can submit this Leave Application,"தேர்வு விடுமுறை வீடு, இந்த விடுமுறை விண்ணப்பத்தை"
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,தேதி நிவாரணத்தில் சேர தேதி விட அதிகமாக இருக்க வேண்டும்
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +172,Leaves per Year,வருடத்திற்கு இலைகள்
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +172,Leaves per Year,வருடத்திற்கு இலைகள்
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup > Settings > Naming Series,{0} அமைப்பு&gt; அமைப்புகள் வழியாக&gt; பெயரிடும் தொடர் தொடர் பெயரிடும் அமைக்க தயவு செய்து
 DocType: Time Log,Will be updated when batched.,Batched போது புதுப்பிக்கப்படும்.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +104,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,ரோ {0}: சரிபார்க்கவும் கணக்கு எதிராக 'அட்வான்ஸ்' என்ற {1} இந்த ஒரு முன்கூட்டியே நுழைவு என்றால்.
@@ -250,25 +240,24 @@
 DocType: Item Website Specification,Item Website Specification,உருப்படியை வலைத்தளம் குறிப்புகள்
 DocType: Dropbox Backup,Dropbox Access Key,டிரா பாக்ஸ் அணுகல் விசை
 DocType: Payment Tool,Reference No,குறிப்பு இல்லை
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +348,Leave Blocked,தடுக்கப்பட்ட விட்டு
-apps/erpnext/erpnext/stock/doctype/item/item.py +535,Item {0} has reached its end of life on {1},பொருள் {0} வாழ்க்கை அதன் இறுதியில் அடைந்துவிட்டது {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +392,Leave Blocked,தடுக்கப்பட்ட விட்டு
+apps/erpnext/erpnext/stock/doctype/item/item.py +539,Item {0} has reached its end of life on {1},பொருள் {0} வாழ்க்கை அதன் இறுதியில் அடைந்துவிட்டது {1}
 apps/erpnext/erpnext/accounts/utils.py +339,Annual,வருடாந்திர
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,பங்கு நல்லிணக்க பொருள்
 DocType: Stock Entry,Sales Invoice No,விற்பனை விலைப்பட்டியல் இல்லை
 DocType: Material Request Item,Min Order Qty,Min ஆர்டர் அளவு
 DocType: Lead,Do Not Contact,தொடர்பு இல்லை
 DocType: Sales Invoice,The unique id for tracking all recurring invoices. It is generated on submit.,அனைத்து மீண்டும் பொருள் தேடும் தனிப்பட்ட ஐடி. அதை சமர்ப்பிக்க இல் உருவாக்கப்பட்டது.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +93,Software Developer,மென்பொருள் டெவலப்பர்
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +93,Software Developer,மென்பொருள் டெவலப்பர்
 DocType: Item,Minimum Order Qty,குறைந்தபட்ச ஆணை அளவு
 DocType: Pricing Rule,Supplier Type,வழங்குபவர் வகை
 DocType: Item,Publish in Hub,மையம் உள்ள வெளியிடு
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +555,Item {0} is cancelled,பொருள் {0} ரத்து
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +598,Material Request,பொருள் கோரிக்கை
+apps/erpnext/erpnext/stock/doctype/item/item.py +559,Item {0} is cancelled,பொருள் {0} ரத்து
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +607,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},கொள்முதல் ஆணை உள்ள &#39;மூலப்பொருட்கள் சப்ளை&#39; அட்டவணை காணப்படவில்லை பொருள் {0} {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +129,Wire brushing,வயர் துலக்குதல்
 DocType: Employee,Relation,உறவு
 DocType: Shipping Rule,Worldwide Shipping,உலகம் முழுவதும் கப்பல்
 apps/erpnext/erpnext/config/selling.py +23,Confirmed orders from Customers.,வாடிக்கையாளர்கள் இருந்து உத்தரவுகளை உறுதி.
@@ -284,12 +273,11 @@
 DocType: Supplier,Address HTML,HTML முகவரி
 DocType: Lead,Mobile No.,மொபைல் எண்
 DocType: Maintenance Schedule,Generate Schedule,அட்டவணை உருவாக்க
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +81,Hubbing,Hubbing
 DocType: Purchase Invoice Item,Expense Head,இழப்பில் தலைமை
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +86,Please select Charge Type first,பொறுப்பு வகை முதல் தேர்வு செய்க
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,சமீபத்திய
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +395,Max 5 characters,மேக்ஸ் 5 எழுத்துக்கள்
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +195,Select Your Language,உங்கள் மொழி தேர்வு
+apps/erpnext/erpnext/public/js/setup_wizard.js +143,Max 5 characters,மேக்ஸ் 5 எழுத்துக்கள்
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +245,Select Your Language,உங்கள் மொழி தேர்வு
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,பட்டியலில் முதல் விடுப்பு சர்க்கார் தரப்பில் சாட்சி இயல்புநிலை விடுப்பு சர்க்கார் தரப்பில் சாட்சி என அமைக்க வேண்டும்
 DocType: Manufacturing Settings,"Disables creation of time logs against Production Orders.
 Operations shall not be tracked against Production Order",உற்பத்தி உத்தரவுகளுக்கு எதிராக நேரத்தில் பதிவுகள் உருவாக்கம் முடக்குகிறது. ஆபரேஷன்ஸ் உத்தரவு எதிராக தொடர்ந்து கண்காணிக்கப்படுகிறது
@@ -301,8 +289,6 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +34,Item {0} must be Service Item,பொருள் {0} சேவை பொருளாக இருக்க வேண்டும்
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +303,Completed Qty can not be greater than 'Qty to Manufacture',அது 'அளவு உற்பத்தி செய்ய' நிறைவு அளவு அதிகமாக இருக்க முடியாது
 DocType: DocType,Administrator,நிர்வாகி
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +136,Laser drilling,லேசர் தோண்டுதல்
-DocType: Stock UOM Replace Utility,New Stock UOM,புதிய பங்கு மொறட்டுவ பல்கலைகழகம்
 DocType: Period Closing Voucher,Closing Account Head,கணக்கு தலைமை மூடுவதற்கு
 DocType: Employee,External Work History,வெளி வேலை வரலாறு
 apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,வட்ட குறிப்பு பிழை
@@ -311,18 +297,15 @@
 DocType: Lead,Industry,தொழில்
 DocType: Employee,Job Profile,வேலை விவரம்
 DocType: Newsletter,Newsletter,செய்தி மடல்
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +84,Hydroforming,Hydroforming
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +49,Necking,Necking
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,தானியங்கி பொருள் கோரிக்கை உருவாக்கம் மின்னஞ்சல் மூலம் தெரிவிக்க
 DocType: Journal Entry,Multi Currency,பல நாணய
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +51,Item is updated,பொருள் மேம்படுத்தப்பட்டது
 DocType: Async Task,System Manager,கணினி மேலாளர்
 DocType: Payment Reconciliation Invoice,Invoice Type,விலைப்பட்டியல் வகை
 DocType: Sales Invoice Item,Delivery Note,டெலிவரி குறிப்பு
 DocType: Dropbox Backup,Allow Dropbox Access,டிராப்பாக்ஸ் அணுகல் அனுமதி
 apps/erpnext/erpnext/config/learn.py +72,Setting up Taxes,வரி அமைத்தல்
 apps/erpnext/erpnext/accounts/utils.py +189,Payment Entry has been modified after you pulled it. Please pull it again.,நீங்கள் அதை இழுத்து பின்னர் கொடுப்பனவு நுழைவு மாற்றப்பட்டுள்ளது. மீண்டும் அதை இழுக்க கொள்ளவும்.
-apps/erpnext/erpnext/stock/doctype/item/item.py +343,{0} entered twice in Item Tax,{0} பொருள் வரி இரண்டு முறை
+apps/erpnext/erpnext/stock/doctype/item/item.py +347,{0} entered twice in Item Tax,{0} பொருள் வரி இரண்டு முறை
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +105,Summary for this week and pending activities,இந்த வாரம் மற்றும் நிலுவையில் நடவடிக்கைகள் சுருக்கம்
 DocType: Workstation,Rent Cost,வாடகை செலவு
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +74,Please select month and year,மாதம் மற்றும் ஆண்டு தேர்ந்தெடுக்கவும்
@@ -339,24 +322,22 @@
 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","Bom, டெலிவரி குறிப்பு , கொள்முதல் விலைப்பட்டியல் , உத்தரவு , கொள்முதல் ஆணை , கொள்முதல் ரசீது , கவிஞருக்கு , விற்பனை , பங்கு நுழைவு , எங்கோ கிடைக்கும்"
 DocType: Item Tax,Tax Rate,வரி விகிதம்
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Select Item,உருப்படி தேர்வுசெய்க
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +540,Select Item,உருப்படி தேர்வுசெய்க
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +143,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","பொருள்: {0} தொகுதி வாரியாக, அதற்கு பதிலாக பயன்படுத்த பங்கு நுழைவு \
  பங்கு நல்லிணக்க பயன்படுத்தி சமரசப்படுத்த முடியாது நிர்வகிக்கப்படத்தது"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +259,Purchase Invoice {0} is already submitted,கொள்முதல் விலைப்பட்டியல் {0} ஏற்கனவே சமர்ப்பிக்கப்பட்ட
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +262,Purchase Invoice {0} is already submitted,கொள்முதல் விலைப்பட்டியல் {0} ஏற்கனவே சமர்ப்பிக்கப்பட்ட
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Batch No must be same as {1} {2},ரோ # {0}: கூறு எண் அதே இருக்க வேண்டும் {1} {2}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Convert to non-Group,அல்லாத குழு மாற்றுக
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +55,Purchase Receipt must be submitted,வாங்கும் ரசீது சமர்ப்பிக்க வேண்டும்
-DocType: Stock UOM Replace Utility,Current Stock UOM,தற்போதைய பங்கு மொறட்டுவ பல்கலைகழகம்
 apps/erpnext/erpnext/config/stock.py +53,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}
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Your email address,உங்கள் மின்னஞ்சல் முகவரியை
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +194,Please see attachment,இணைப்பு பார்க்கவும்
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +203,Please see attachment,இணைப்பு பார்க்கவும்
 DocType: Purchase Order,% Received,% பெறப்பட்டது
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +109,Water jet cutting,வாட்டர் ஜெட் அறுக்கும்
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +24,Setup Already Complete!!,அமைப்பு ஏற்கனவே முடிந்து !
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +20,Setup Already Complete!!,அமைப்பு ஏற்கனவே முடிந்து !
 ,Finished Goods,முடிக்கப்பட்ட பொருட்கள்
 DocType: Delivery Note,Instructions,அறிவுறுத்தல்கள்
 DocType: Quality Inspection,Inspected By,மூலம் ஆய்வு
@@ -371,6 +352,7 @@
 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,நாணய பரிவர்த்தனை
 DocType: Purchase Invoice Item,Item Name,உருப்படி பெயர்
+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",&quot;அவுட் பங்கு பற்றிய&quot; எந்த கோரிய வேண்டும் பொருட்களை உத்தேச அளவு மற்றும் குறைந்த ஆர்டர் அளவு அடிப்படையில் அனைத்து கிடங்குகள் பரிசீலித்து
@@ -380,11 +362,10 @@
 ,Purchase Register,பதிவு வாங்குவதற்கு
 DocType: Landed Cost Item,Applicable Charges,பிரயோகிக்கப்படும் கட்டணங்கள்
 DocType: Workstation,Consumable Cost,நுகர்வோர் விலை
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,{0} ({1}) must have role 'Leave Approver',{0} ({1}) பங்கு வேண்டும் 'விடுப்பு தரப்பில் சாட்சி'
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +167,{0} ({1}) must have role 'Leave Approver',{0} ({1}) பங்கு வேண்டும் 'விடுப்பு தரப்பில் சாட்சி'
 DocType: Purchase Receipt,Vehicle Date,வாகன தேதி
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +39,Medical,மருத்துவம்
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +39,Medical,மருத்துவம்
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,இழந்து காரணம்
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +36,Tube beading,குழாய் ஓரம்
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},பணிநிலையம் விடுமுறை பட்டியல் படி பின்வரும் தேதிகளில் மூடப்பட்டுள்ளது {0}
 DocType: Employee,Single,ஒற்றை
 DocType: Issue,Attachment,இணைப்பு
@@ -405,10 +386,8 @@
 DocType: Account,Is Group,குழு
 DocType: Stock Settings,Automatically Set Serial Nos based on FIFO,தானாகவே மற்றும் FIFO அடிப்படையில் நாம் சீரியல் அமை
 DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,காசோலை சப்ளையர் விலைப்பட்டியல் எண் தனித்துவம்
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +31,Thermoforming,Thermoforming
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +66,Slitting,அறுத்துக்
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +57,'To Case No.' cannot be less than 'From Case No.',&#39;வழக்கு எண் வேண்டும்&#39; &#39;வழக்கு எண் வரம்பு&#39; விட குறைவாக இருக்க முடியாது
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +104,Non Profit,லாபம்
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +104,Non Profit,லாபம்
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_list.js +7,Not Started,தொடங்குதல்
 DocType: Lead,Channel Partner,சேனல் வரன்வாழ்க்கை துணை
 DocType: Account,Old Parent,பழைய பெற்றோர்
@@ -417,13 +396,12 @@
 apps/erpnext/erpnext/config/manufacturing.py +74,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 +512,Attribute {0} selected multiple times in Attributes Table,கற்பிதம் {0} காரணிகள் அட்டவணை பல முறை தேர்வு
+apps/erpnext/erpnext/stock/doctype/item/item.py +516,Attribute {0} selected multiple times in Attributes Table,கற்பிதம் {0} காரணிகள் அட்டவணை பல முறை தேர்வு
 DocType: Sales Order,Not Applicable,பொருந்தாது
 apps/erpnext/erpnext/config/hr.py +140,Holiday master.,விடுமுறை மாஸ்டர் .
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +19,Shell molding,ஷெல் வடிவமைத்தல்
 DocType: Material Request Item,Required Date,தேவையான தேதி
 DocType: Delivery Note,Billing Address,பில்லிங் முகவரி
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +644,Please enter Item Code.,பொருள் கோட் உள்ளிடவும்.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +648,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,மொத்த அளவு
@@ -433,7 +411,7 @@
 DocType: Item Attribute,To Range,வரையறைக்கு
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,பத்திரங்கள் மற்றும் வைப்பு
 DocType: Features Setup,Imports,இறக்குமதி
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +144,Adhesive bonding,ஒட்டு பிணைப்பு
+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.,வருகை பதிவு.
@@ -441,26 +419,25 @@
 DocType: Sales Order Item,Used for Production Plan,உற்பத்தி திட்டத்தை பயன்படுத்திய
 DocType: System Settings,Loading...,ஏற்றுகிறது ...
 DocType: DocField,Password,கடவுச்சொல்
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +155,Fused deposition modeling,இணைந்தது படிவு மாடலிங்
 DocType: Manufacturing Settings,Time Between Operations (in mins),(நிமிடங்கள்) செயல்களுக்கு இடையே நேரம்
 DocType: Customer,Buyer of Goods and Services.,பொருட்கள் மற்றும் சேவைகள் வாங்குபவர்.
 DocType: Journal Entry,Accounts Payable,கணக்குகள் செலுத்த வேண்டிய
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +24,Add Subscribers,சந்தாதாரர்கள் சேர்க்கவும்
 apps/erpnext/erpnext/public/js/feature_setup.js +220,""" does not exists",""" உள்ளது இல்லை"
 DocType: Pricing Rule,Valid Upto,வரை செல்லுபடியாகும்
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +564,List a few of your customers. They could be organizations or individuals.,உங்கள் வாடிக்கையாளர்களுக்கு ஒரு சில பட்டியல் . அவர்கள் நிறுவனங்கள் அல்லது தனிநபர்கள் இருக்க முடியும் .
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,List a few of your customers. They could be organizations or individuals.,உங்கள் வாடிக்கையாளர்களுக்கு ஒரு சில பட்டியல் . அவர்கள் நிறுவனங்கள் அல்லது தனிநபர்கள் இருக்க முடியும் .
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Direct Income,நேரடி வருமானம்
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +33,"Can not filter based on Account, if grouped by Account","கணக்கு மூலம் தொகுக்கப்பட்டுள்ளது என்றால் , கணக்கு அடிப்படையில் வடிகட்ட முடியாது"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +88,Administrative Officer,நிர்வாக அதிகாரி
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Administrative Officer,நிர்வாக அதிகாரி
 DocType: Payment Tool,Received Or Paid,பெறப்படும் அல்லது
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +318,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 +305,Please enter Warehouse for which Material Request will be raised,பொருள் கோரிக்கை எழுப்பப்படும் எந்த கிடங்கு உள்ளிடவும்
 DocType: Production Order,Additional Operating Cost,கூடுதல் இயக்க செலவு
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +20,Cosmetics,ஒப்பனை
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,ஒப்பனை
 DocType: DocField,Type,மாதிரி
-apps/erpnext/erpnext/stock/doctype/item/item.py +417,"To merge, following properties must be same for both items","ஒன்றாக்க , பின்வரும் பண்புகளை இரு பொருட்களை சமமாக இருக்க வேண்டும்"
+apps/erpnext/erpnext/stock/doctype/item/item.py +421,"To merge, following properties must be same for both items","ஒன்றாக்க , பின்வரும் பண்புகளை இரு பொருட்களை சமமாக இருக்க வேண்டும்"
 DocType: Communication,Subject,பொருள்
 DocType: Shipping Rule,Net Weight,நிகர எடை
 DocType: Employee,Emergency Phone,அவசர தொலைபேசி
@@ -470,7 +447,6 @@
 DocType: Journal Entry,Difference (Dr - Cr),வேறுபாடு ( டாக்டர் - CR)
 DocType: Account,Profit and Loss,இலாப நட்ட
 apps/erpnext/erpnext/config/stock.py +293,Managing Subcontracting,நிர்வாக உப ஒப்பந்தமிடல்
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +58,New UOM must NOT be of type Whole Number,புதிய மொறட்டுவ பல்கலைகழகம் வகை முழு எண் இருக்க கூடாது
 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 +47,Account {0} does not belong to company: {1},கணக்கு {0} நிறுவனத்திற்கு சொந்தமானது இல்லை: {1}
@@ -490,14 +466,14 @@
 DocType: Purchase Invoice,Supplier Invoice No,வழங்குபவர் விலைப்பட்டியல் இல்லை
 DocType: Territory,For reference,குறிப்பிற்கு
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +154,"Cannot delete Serial No {0}, as it is used in stock transactions","நீக்க முடியாது தொ.எ. {0}, அது பங்கு பரிவர்த்தனைகள் பயன்படுத்தப்படும் விதத்தில்"
-apps/erpnext/erpnext/public/js/account_tree_grid.js +52,Closing (Cr),நிறைவு (CR)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +227,Closing (Cr),நிறைவு (CR)
 DocType: Serial No,Warranty Period (Days),உத்தரவாதத்தை காலம் (நாட்கள்)
 DocType: Installation Note Item,Installation Note Item,நிறுவல் குறிப்பு பொருள்
 ,Pending Qty,நிலுவையில் அளவு
 DocType: Job Applicant,Thread HTML,Thread HTML
 DocType: Company,Ignore,புறக்கணி
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +86,SMS sent to following numbers: {0},எஸ்எம்எஸ் எண்களில் அனுப்பப்பட்டது: {0}
-apps/erpnext/erpnext/controllers/buying_controller.py +135,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,துணை ஒப்பந்த கொள்முதல் ரசீது கட்டாயமாக வழங்குபவர் கிடங்கு
+apps/erpnext/erpnext/controllers/buying_controller.py +126,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,துணை ஒப்பந்த கொள்முதல் ரசீது கட்டாயமாக வழங்குபவர் கிடங்கு
 DocType: Pricing Rule,Valid From,செல்லுபடியான
 DocType: Sales Invoice,Total Commission,மொத்த ஆணையம்
 DocType: Pricing Rule,Sales Partner,விற்பனை வரன்வாழ்க்கை துணை
@@ -507,7 +483,7 @@
 To distribute a budget using this distribution, set this **Monthly Distribution** in the **Cost Center**","** மாதந்திர விநியோகம் ** உங்கள் தொழிலுக்கு பருவகாலம் வேண்டும் என்றால் நீங்கள் மாதங்களுக்கு முழுவதும் உங்கள் வரவு செலவு திட்டம் விநியோகிக்க உதவுகிறது.
 
 , இந்த விநியோக பயன்படுத்தி ஒரு பட்ஜெட் விநியோகிக்க ** விலை மையத்தில் ** இந்த ** மாதந்திர விநியோகம் அமைக்க **"
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +183,No records found in the Invoice table,விலைப்பட்டியல் அட்டவணை காணப்படவில்லை பதிவுகள்
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +130,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 +84,Financial / accounting year.,நிதி / கணக்கு ஆண்டு .
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","மன்னிக்கவும், சீரியல் இலக்கங்கள் ஒன்றாக்க முடியாது"
@@ -523,25 +499,25 @@
 DocType: Sales Order,Billing and Delivery Status,பில்லிங் மற்றும் டெலிவரி நிலை
 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/setup/page/setup_wizard/setup_wizard_page.html +16,Previous,முந்தைய
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard_page.html +16,Previous,முந்தைய
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +620,Sales Return,விற்பனை Return
 DocType: Production Planning Tool,Select Sales Orders from which you want to create Production Orders.,நீங்கள் உற்பத்தி ஆணைகள் உருவாக்க வேண்டிய இருந்து விற்பனை ஆணைகள் தேர்ந்தெடுக்கவும்.
 DocType: Item,Delivered by Supplier (Drop Ship),சப்ளையர் மூலம் வழங்கப்படுகிறது (டிராப் கப்பல்)
 apps/erpnext/erpnext/config/hr.py +120,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.,வாடிக்கையாளர் தகவல்.
 DocType: Quotation,Quotation To,என்று மேற்கோள்
 DocType: Lead,Middle Income,நடுத்தர வருமானம்
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),துவாரம் ( CR)
 apps/erpnext/erpnext/accounts/utils.py +193,Allocated amount can not be negative,ஒதுக்கப்பட்ட தொகை எதிர்மறை இருக்க முடியாது
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +123,Tumbling,தரைமட்டத்திற்கு
 DocType: Purchase Order Item,Billed Amt,கணக்கில் AMT
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,"பங்கு உள்ளீடுகளை செய்யப்படுகின்றன எதிராக, ஒரு தருக்க கிடங்கு."
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +92,Reference No & Reference Date is required for {0},குறிப்பு இல்லை & பரிந்துரை தேதி தேவைப்படுகிறது {0}
 DocType: Event,Wednesday,புதன்கிழமை
 DocType: Sales Invoice,Customer's Vendor,வாடிக்கையாளர் விற்பனையாளர்
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +214,Production Order is Mandatory,உற்பத்தி ஓட்டப் ஆகிறது
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +139,Proposal Writing,மானசாவுடன்
+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} அதே பணியாளர் ஐடி கொண்டு உள்ளது
 apps/erpnext/erpnext/stock/stock_ledger.py +336,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},எதிர்மறை பங்கு பிழை ( {6} ) உருப்படி {0} கிடங்கு உள்ள {1} ம் {2} {3} ல் {4} {5}
 DocType: Fiscal Year Company,Fiscal Year Company,நிதியாண்டு நிறுவனத்தின்
@@ -564,7 +540,7 @@
 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/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.py +179,Please install dropbox python module,டிரா பாக்ஸ் பைதான் தொகுதி நிறுவவும்
 DocType: Employee,Passport Number,பாஸ்போர்ட் எண்
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +82,Manager,மேலாளர்
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Manager,மேலாளர்
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +494,From Purchase Receipt,கொள்முதல் ரசீது இருந்து
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +219,Same item has been entered multiple times.,ஒரே பொருளைப் பலமுறை உள்ளிட்ட.
 DocType: SMS Settings,Receiver Parameter,ரிசீவர் அளவுரு
@@ -572,10 +548,9 @@
 DocType: Sales Person,Sales Person Targets,விற்பனை நபர் இலக்குகள்
 apps/frappe/frappe/public/js/frappe/form/workflow.js +116,To,செய்ய
 apps/frappe/frappe/templates/base.html +145,Please enter email address,மின்னஞ்சல் முகவரியை உள்ளிடவும்
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +35,End tube forming,உருவாக்கும் முடிவு குழாய்
 DocType: Production Order Operation,In minutes,நிமிடங்களில்
 DocType: Issue,Resolution Date,தீர்மானம் தேதி
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +635,Please set default Cash or Bank account in Mode of Payment {0},கொடுப்பனவு முறையில் இயல்புநிலை பண அல்லது வங்கி கணக்கு அமைக்கவும் {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +637,Please set default Cash or Bank account in Mode of Payment {0},கொடுப்பனவு முறையில் இயல்புநிலை பண அல்லது வங்கி கணக்கு அமைக்கவும் {0}
 DocType: Selling Settings,Customer Naming By,மூலம் பெயரிடுதல் வாடிக்கையாளர்
 apps/erpnext/erpnext/accounts/doctype/account/account.js +67,Convert to Group,குழு மாற்ற
 DocType: Activity Cost,Activity Type,நடவடிக்கை வகை
@@ -583,12 +558,12 @@
 DocType: Customer,Fixed Days,நிலையான நாட்கள்
 DocType: Sales Invoice,Packing List,பட்டியல் பொதி
 apps/erpnext/erpnext/config/buying.py +28,Purchase Orders given to Suppliers.,விநியோகஸ்தர்கள் கொடுக்கப்பட்ட ஆணைகள் வாங்க.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +43,Publishing,வெளியீடு
+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 +198,{0}: {1} not found in Invoice Details table,{0} {1} விலைப்பட்டியல் விவரம் அட்டவணையில் இல்லை
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,{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 +208,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,பராமரிப்பு வருகை {0} இந்த விற்பனை ஆணை ரத்து முன் ரத்து செய்யப்பட வேண்டும்
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +203,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),துவாரம் ( டாக்டர் )
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},பதிவுசெய்ய நேர முத்திரை பின்னர் இருக்க வேண்டும் {0}
@@ -600,7 +575,6 @@
 DocType: Pricing Rule,Sales Manager,விற்பனை மேலாளர்
 apps/frappe/frappe/public/js/frappe/model/model.js +492,Rename,மறுபெயரிடு
 DocType: Journal Entry,Write Off Amount,மொத்த தொகை இனிய எழுத
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +52,Bending,வளைக்கும்
 apps/frappe/frappe/core/page/user_permissions/user_permissions.js +246,Allow User,பயனர் அனுமதி
 DocType: Journal Entry,Bill No,பில் இல்லை
 DocType: Purchase Invoice,Quarterly,கால் ஆண்டுக்கு ஒரு முறை நிகழ்கிற
@@ -610,17 +584,16 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Please enter item details,உருப்படியை விவரங்கள் உள்ளிடவும்
 DocType: Purchase Receipt,Other Details,மற்ற விவரங்கள்
 DocType: Account,Accounts,கணக்குகள்
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +67,Marketing,மார்கெட்டிங்
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +65,Straight shearing,நேராக வெட்டுதல்
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +67,Marketing,மார்கெட்டிங்
 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/stock/doctype/purchase_receipt/purchase_receipt.py +99,Rejected Warehouse is mandatory against regected item,நிராகரிக்கப்பட்டது கிடங்கு regected உருப்படியை எதிராக கட்டாய ஆகிறது
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +102,Rejected Warehouse is mandatory against regected item,நிராகரிக்கப்பட்டது கிடங்கு regected உருப்படியை எதிராக கட்டாய ஆகிறது
 DocType: Account,Expenses Included In Valuation,செலவுகள் மதிப்பீட்டு சேர்க்கப்பட்டுள்ளது
 DocType: Employee,Provide email id registered in company,நிறுவனத்தின் பதிவு மின்னஞ்சல் ஐடி வழங்கும்
 DocType: Hub Settings,Seller City,விற்பனையாளர் நகரத்தை
 DocType: Email Digest,Next email will be sent on:,அடுத்த மின்னஞ்சலில் அனுப்பி வைக்கப்படும்:
 DocType: Offer Letter Term,Offer Letter Term,கடிதம் கால ஆஃபர்
-apps/erpnext/erpnext/stock/doctype/item/item.py +492,Item has variants.,பொருள் வகைகள் உண்டு.
+apps/erpnext/erpnext/stock/doctype/item/item.py +496,Item has variants.,பொருள் வகைகள் உண்டு.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,பொருள் {0} இல்லை
 DocType: Bin,Stock Value,பங்கு மதிப்பு
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,மரம் வகை
@@ -629,10 +602,9 @@
 DocType: Material Request Item,Quantity and Warehouse,அளவு மற்றும் சேமிப்பு கிடங்கு
 DocType: Sales Invoice,Commission Rate (%),கமிஷன் விகிதம் (%)
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +172,"Against Voucher Type must be one of Sales Order, Sales Invoice or Journal Entry","வவுச்சர் எதிராக வகை விற்பனை ஆணை ஒன்று, விற்பனை விலைப்பட்டியல் அல்லது பத்திரிகை நுழைவு இருக்க வேண்டும்"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +139,Biomachining,Biomachining
 apps/erpnext/erpnext/setup/utils.py +89,Unable to find exchange rate,மாற்று விகிதம் கண்டுபிடிக்க முடியவில்லை
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +7,Aerospace,ஏரோஸ்பேஸ்
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +19,Welcome,நல்வரவு
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +7,Aerospace,ஏரோஸ்பேஸ்
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +40,Welcome,நல்வரவு
 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.,பொருட்கள் விநியோகஸ்தர்கள் இருந்து பெற்றார்.
@@ -655,19 +627,19 @@
 DocType: Employee,Cell Number,செல் எண்
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,லாஸ்ட்
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +120,You can not enter current voucher in 'Against Journal Entry' column,"நீங்கள் பத்தியில், 'ஜர்னல் ஆஃப் நுழைவு எதிராக' தற்போதைய ரசீது நுழைய முடியாது"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +25,Energy,சக்தி
+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.,மாத சம்பளம் அறிக்கை.
 DocType: Item Group,Website Specifications,இணையத்தளம் விருப்பம்
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +205,New Account,புதிய கணக்கு
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +21,{0}: From {0} of type {1},{0} இருந்து: {0} வகை {1}
-apps/erpnext/erpnext/controllers/buying_controller.py +283,Row {0}: Conversion Factor is mandatory,ரோ {0}: மாற்று காரணி கட்டாய ஆகிறது
+apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,ரோ {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.,கணக்கியல் உள்ளீடுகள் இலை முனைகளில் எதிராகவும். குழுக்களுக்கு எதிராக பதிவுகள் அனுமதி இல்லை.
 DocType: ToDo,High,உயர்
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +361,Cannot deactivate or cancel BOM as it is linked with other BOMs,செயலிழக்க அல்லது அது மற்ற BOM கள் தொடர்பு உள்ளது என BOM ரத்துசெய்ய முடியாது
 DocType: Opportunity,Maintenance,பராமரிப்பு
 DocType: User,Male,ஆண்
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +182,Purchase Receipt number required for Item {0},பொருள் தேவை கொள்முதல் ரசீது எண் {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +183,Purchase Receipt number required for Item {0},பொருள் தேவை கொள்முதல் ரசீது எண் {0}
 DocType: Item Attribute Value,Item Attribute Value,பொருள் மதிப்பு பண்பு
 apps/erpnext/erpnext/config/crm.py +64,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.
@@ -715,10 +687,9 @@
 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 +324,"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/page/setup_wizard/fixtures/industry_type.py +13,Biotechnology,பயோடெக்னாலஜி
+apps/erpnext/erpnext/controllers/accounts_controller.py +325,"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,அலுவலகம் பராமரிப்பு செலவுகள்
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +53,Hemming,ஹெம்மிங்
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +66,Please enter Item first,முதல் பொருள் உள்ளிடவும்
 DocType: Account,Liability,கடமை
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +62,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,ஒப்புதல் தொகை ரோ கூறுகின்றனர் காட்டிலும் அதிகமாக இருக்க முடியாது {0}.
@@ -731,10 +702,10 @@
 DocType: Company,Default Bank Account,முன்னிருப்பு வங்கி கணக்கு
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +47,"To filter based on Party, select Party Type first",கட்சி அடிப்படையில் வடிகட்ட தேர்ந்தெடுக்கவும் கட்சி முதல் வகை
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},"பொருட்களை வழியாக இல்லை, ஏனெனில் &#39;மேம்படுத்தல் பங்கு&#39; சோதிக்க முடியாது, {0}"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Nos,இலக்கங்கள்
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,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 +627,My Invoices,என் பொருள்
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +629,My Invoices,என் பொருள்
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,எதுவும் ஊழியர்
 DocType: Purchase Order,Stopped,நிறுத்தி
 DocType: Item,If subcontracted to a vendor,ஒரு விற்பனையாளர் ஒப்பந்தக்காரர்களுக்கு என்றால்
@@ -753,35 +724,33 @@
 DocType: Features Setup,"To enable ""Point of Sale"" features",&quot;விற்பனை செய்யுமிடம்&quot; அம்சங்களை செயல்படுத்த
 DocType: Bin,Moving Average Rate,சராசரி விகிதம் நகரும்
 DocType: Production Planning Tool,Select Items,தேர்ந்தெடு
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,{0} against Bill {1} dated {2},{0} பில் எதிராக {1} தேதியிட்ட {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +328,{0} against Bill {1} dated {2},{0} பில் எதிராக {1} தேதியிட்ட {2}
 DocType: Comment,Reference Name,குறிப்பு பெயர்
 DocType: Maintenance Visit,Completion Status,நிறைவு நிலைமை
 DocType: Sales Invoice Item,Target Warehouse,இலக்கு கிடங்கு
 DocType: Item,Allow over delivery or receipt upto this percent,இந்த சதவிகிதம் வரை விநியோக அல்லது ரசீது மீது அனுமதிக்கவும்
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +49,Expected Delivery Date cannot be before Sales Order Date,எதிர்பார்க்கப்படுகிறது பிரசவ தேதி முன் விற்பனை ஆணை தேதி இருக்க முடியாது
 DocType: Upload Attendance,Import Attendance,இறக்குமதி பங்கேற்கும்
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +17,All Item Groups,அனைத்து பொருள் குழுக்கள்
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +17,All Item Groups,அனைத்து பொருள் குழுக்கள்
 DocType: Process Payroll,Activity Log,நடவடிக்கை புகுபதிகை
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +30,Net Profit / Loss,நிகர லாபம் / இழப்பு
 apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,தானாக நடவடிக்கைகள் சமர்ப்பிப்பு செய்தி உருவாக்கும் .
 DocType: Production Order,Item To Manufacture,உற்பத்தி பொருள்
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +16,Permanent mold casting,நிரந்தர அச்சு வார்ப்பு
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} நிலையை {2} ஆகிறது
 apps/erpnext/erpnext/config/learn.py +172,Purchase Order to Payment,கொடுப்பனவு ஆணை வாங்க
 DocType: Sales Order Item,Projected Qty,திட்டமிட்டிருந்தது அளவு
 DocType: Sales Invoice,Payment Due Date,கொடுப்பனவு காரணமாக தேதி
 DocType: Newsletter,Newsletter Manager,செய்திமடல் மேலாளர்
-apps/erpnext/erpnext/stock/doctype/item/item.js +229,Item Variant {0} already exists with same attributes,பொருள் மாற்று {0} ஏற்கனவே அதே பண்புகளை கொண்ட உள்ளது
+apps/erpnext/erpnext/stock/doctype/item/item.js +231,Item Variant {0} already exists with same attributes,பொருள் மாற்று {0} ஏற்கனவே அதே பண்புகளை கொண்ட உள்ளது
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening',&#39;திறந்து&#39;
 DocType: Notification Control,Delivery Note Message,டெலிவரி குறிப்பு செய்தி
 DocType: Expense Claim,Expenses,செலவுகள்
 DocType: Item Variant Attribute,Item Variant Attribute,பொருள் மாற்று கற்பிதம்
 ,Purchase Receipt Trends,ரிசிப்ட் போக்குகள் வாங்குவதற்கு
 DocType: Appraisal,Select template from which you want to get the Goals,நீங்கள் இலக்குகள் பெற விரும்பும் டெம்ப்ளேட்டை தேர்வு
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +77,Research & Development,ஆராய்ச்சி மற்றும் அபிவிருத்தி
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Research & Development,ஆராய்ச்சி மற்றும் அபிவிருத்தி
 ,Amount to Bill,பில் தொகை
 DocType: Company,Registration Details,பதிவு விவரங்கள்
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +75,Staking,பெற்றுக்கொள்வதில் உறுதியாக
 DocType: Item,Re-Order Qty,மீண்டும் ஒழுங்கு அளவு
 DocType: Leave Block List Date,Leave Block List Date,பிளாக் பட்டியல் தேதி விட்டு
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +25,Scheduled to send to {0},அனுப்ப திட்டமிடப்பட்டுள்ளது {0}
@@ -792,18 +761,16 @@
 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/hr/doctype/leave_allocation/leave_allocation.py +71,Cannot carry forward {0},முன்னோக்கி செல்ல முடியாது {0}
 apps/erpnext/erpnext/accounts/doctype/account/account.py +91,"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,இழப்பில் கோரிக்கை செய்தி நிராகரிக்கப்பட்டது
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +145,Nailing,தட்டுதல்
 ,Available Qty,கிடைக்கும் அளவு
 DocType: Purchase Taxes and Charges,On Previous Row Total,முந்தைய வரிசை மொத்த மீது
 DocType: Salary Slip,Working Days,வேலை நாட்கள்
 DocType: Serial No,Incoming Rate,உள்வரும் விகிதம்
 DocType: Packing Slip,Gross Weight,மொத்த எடை
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +410,The name of your company for which you are setting up this system.,நீங்கள் இந்த அமைப்பை அமைக்க இது உங்கள் நிறுவனத்தின் பெயர் .
+apps/erpnext/erpnext/public/js/setup_wizard.js +158,The name of your company for which you are setting up this system.,நீங்கள் இந்த அமைப்பை அமைக்க இது உங்கள் நிறுவனத்தின் பெயர் .
 DocType: HR Settings,Include holidays in Total no. of Working Days,மொத்த எந்த விடுமுறை அடங்கும். வேலை நாட்கள்
 DocType: Job Applicant,Hold,பிடி
 DocType: Employee,Date of Joining,சேர்வது தேதி
@@ -813,7 +780,6 @@
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +3,View Subscribers,பார்வை சந்தாதாரர்கள்
 DocType: Purchase Invoice Item,Purchase Receipt,ரசீது வாங்க
 ,Received Items To Be Billed,கட்டணம் பெறப்படும் பொருட்கள்
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +114,Abrasive blasting,ஊது சிராய்ப்பு
 DocType: Employee,Ms,Ms
 apps/erpnext/erpnext/config/accounts.py +148,Currency exchange rate master.,நாணய மாற்று வீதம் மாஸ்டர் .
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +253,Unable to find Time Slot in the next {0} days for Operation {1},ஆபரேஷன் அடுத்த {0} நாட்கள் நேரத்தில் கண்டுபிடிக்க முடியவில்லை {1}
@@ -825,7 +791,7 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +209,Serial No {0} does not belong to Item {1},தொடர் இல {0} பொருள் அல்ல {1}
 DocType: Purchase Receipt Item Supplied,Required Qty,தேவையான அளவு
 DocType: Bank Reconciliation,Total Amount,மொத்த தொகை
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +32,Internet Publishing,இணைய பப்ளிஷிங்
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,இணைய பப்ளிஷிங்
 DocType: Production Planning Tool,Production Orders,தயாரிப்பு ஆணைகள்
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +35,Balance Value,இருப்பு மதிப்பு
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,விற்பனை விலை பட்டியல்
@@ -836,7 +802,7 @@
 DocType: Supplier,Default Payable Accounts,இயல்புநிலை செலுத்தத்தக்க கணக்குகள்
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,பணியாளர் {0} செயலில் இல்லை அல்லது இல்லை
 DocType: Features Setup,Item Barcode,உருப்படியை பார்கோடு
-apps/erpnext/erpnext/stock/doctype/item/item.py +487,Item Variants {0} updated,பொருள் மாறிகள் {0} மேம்படுத்தப்பட்டது
+apps/erpnext/erpnext/stock/doctype/item/item.py +491,Item Variants {0} updated,பொருள் மாறிகள் {0} மேம்படுத்தப்பட்டது
 DocType: Quality Inspection Reading,Reading 6,6 படித்தல்
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,விலைப்பட்டியல் அட்வான்ஸ் வாங்குவதற்கு
 DocType: Address,Shop,ஷாப்பிங்
@@ -845,7 +811,7 @@
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,இந்த முறையில் தேர்ந்தெடுக்கும் போது முன்னிருப்பு வங்கி / பண கணக்கு தானாக பிஓஎஸ் விலைப்பட்டியல் உள்ள புதுப்பிக்கப்படும்.
 DocType: Employee,Permanent Address Is,நிரந்தர முகவரி
 DocType: Production Order Operation,Operation completed for how many finished goods?,ஆபரேஷன் எத்தனை முடிக்கப்பட்ட பொருட்கள் நிறைவு?
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +491,The Brand,பிராண்ட்
+apps/erpnext/erpnext/public/js/setup_wizard.js +237,The Brand,பிராண்ட்
 apps/erpnext/erpnext/controllers/status_updater.py +163,Allowance for over-{0} crossed for Item {1}.,அலவன்ஸ் அதிகமாக {0} பொருள் கடந்து ஐந்து {1}.
 DocType: Employee,Exit Interview Details,பேட்டி விவரம் வெளியேற
 DocType: Item,Is Purchase Item,கொள்முதல் உருப்படி உள்ளது
@@ -865,16 +831,16 @@
 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,அமை செலுத்தும் தொகை = மிகச்சிறந்த தொகை
 DocType: Contact Us Settings,Address Line 1,முகவரி வரி 1
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Variance,மாறுபாடு
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +392,Company Name,நிறுவனத்தின் பெயர்
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +53,Variance,மாறுபாடு
+,Company Name,நிறுவனத்தின் பெயர்
 DocType: SMS Center,Total Message(s),மொத்த செய்தி (கள்)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +515,Select Item for Transfer,மாற்றம் உருப்படி தேர்வுசெய்க
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +538,Select Item for Transfer,மாற்றம் உருப்படி தேர்வுசெய்க
 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.,காசோலை டெபாசிட் அங்கு வங்கி கணக்கு தலைவர் தேர்வு.
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,பயனர் நடவடிக்கைகளில் விலை பட்டியல் விகிதம் திருத்த அனுமதி
 DocType: Pricing Rule,Max Qty,மேக்ஸ் அளவு
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +106,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,ரோ {0}: விற்பனை / கொள்முதல் ஆணை எதிரான கொடுப்பனவு எப்போதும் முன்கூட்டியே குறித்தது வேண்டும்
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +16,Chemical,இரசாயன
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,இரசாயன
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +693,All items have already been transferred for this Production Order.,அனைத்து பொருட்களும் ஏற்கனவே இந்த உத்தரவு க்கு மாற்றப்பட்டது.
 DocType: Process Payroll,Select Payroll Year and Month,சம்பளப்பட்டியல் ஆண்டு மற்றும் மாத தேர்ந்தெடுக்கவும்
 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""",அதற்கான குழு (பொதுவாக நிதிகள் விண்ணப்ப&gt; நடப்பு சொத்துக்கள்&gt; வங்கி கணக்குகள் சென்று வகை) குழந்தை சேர் கிளிக் செய்வதன் மூலம் (ஒரு புதிய கணக்கு உருவாக்க &quot;வங்கி&quot;
@@ -885,12 +851,12 @@
 DocType: Item,Inspection Criteria,ஆய்வு வரையறைகள்
 apps/erpnext/erpnext/config/accounts.py +101,Tree of finanial Cost Centers.,Finanial செலவு மையங்கள் மரம் .
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,மாற்றப்பட்டால்
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +492,Upload your letter head and logo. (you can edit them later).,உங்கள் கடிதம் தலை மற்றும் சின்னம் பதிவேற்ற. (நீங்கள் பின்னர் அவர்களை திருத்த முடியும்).
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +156,White,வெள்ளை
+apps/erpnext/erpnext/public/js/setup_wizard.js +238,Upload your letter head and logo. (you can edit them later).,உங்கள் கடிதம் தலை மற்றும் சின்னம் பதிவேற்ற. (நீங்கள் பின்னர் அவர்களை திருத்த முடியும்).
+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/setup/page/setup_wizard/setup_wizard.js +362,Attach Your Picture,உங்கள் படம் இணைக்கவும்
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Make ,செய்ய
+apps/erpnext/erpnext/public/js/setup_wizard.js +112,Attach Your Picture,உங்கள் படம் இணைக்கவும்
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +540,Make ,செய்ய
 DocType: Journal Entry,Total Amount in Words,சொற்கள் மொத்த தொகை
 DocType: Workflow State,Stop,நிறுத்த
 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 தொடர்பு கொள்ளவும்.
@@ -899,14 +865,13 @@
 DocType: Lead,Next Contact Date,அடுத்த தொடர்பு தேதி
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,திறந்து அளவு
 DocType: Holiday List,Holiday List Name,விடுமுறை பட்டியல் பெயர்
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +168,Stock Options,ஸ்டாக் ஆப்ஷன்ஸ்
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +168,Stock Options,ஸ்டாக் ஆப்ஷன்ஸ்
 DocType: Journal Entry Account,Expense Claim,இழப்பில் கோரிக்கை
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +181,Qty for {0},ஐந்து அளவு {0}
 DocType: Leave Application,Leave Application,விண்ணப்ப விட்டு
 apps/erpnext/erpnext/config/hr.py +77,Leave Allocation Tool,ஒதுக்கீடு கருவி விட்டு
 DocType: Leave Block List,Leave Block List Dates,பிளாக் பட்டியல் தினங்கள் விட்டு
 DocType: Company,If Monthly Budget Exceeded (for expense account),மாதாந்திர பட்ஜெட் (செலவு கணக்கு க்கான) மீறிவிட்டது
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +56,Trimming,Trimming
 DocType: Workstation,Net Hour Rate,நிகர ஹவர் விகிதம்
 DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,இறங்கினார் செலவு கொள்முதல் ரசீது
 DocType: Company,Default Terms,இயல்புநிலை நெறிமுறைகள்
@@ -914,10 +879,9 @@
 DocType: POS Profile,Cash/Bank Account,பண / வங்கி கணக்கு
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,Removed items with no change in quantity or value.,அளவு அல்லது மதிப்பு எந்த மாற்றமும் நீக்கப்பட்ட விடயங்கள்.
 DocType: Delivery Note,Delivery To,வழங்கும்
-apps/erpnext/erpnext/stock/doctype/item/item.py +509,Attribute table is mandatory,கற்பிதம் அட்டவணையின் கட்டாயமாகும்
+apps/erpnext/erpnext/stock/doctype/item/item.py +513,Attribute table is mandatory,கற்பிதம் அட்டவணையின் கட்டாயமாகும்
 DocType: Production Planning Tool,Get Sales Orders,விற்பனை ஆணைகள் கிடைக்கும்
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} எதிர்மறை இருக்க முடியாது
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +103,Filing,தாக்கல்
 apps/erpnext/erpnext/templates/form_grid/item_grid.html +72,Discount,தள்ளுபடி
 DocType: Features Setup,Purchase Discounts,கொள்முதல் தள்ளுபடி
 DocType: Workstation,Wages,ஊதியங்கள்
@@ -934,6 +898,7 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +112,You are the Expense Approver for this record. Please Update the 'Status' and Save,இந்த பதிவு செலவு அப்ரூவரான இருக்கிறீர்கள் . 'தகுதி' புதுப்பி இரட்சியும்
 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 +136,"Attributes for Item Variants. e.g Size, Color etc.","பொருள் வகைகளையும் காரணிகள். எ.கா. அளவு, நிறம், முதலியன"
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +39,WIP Warehouse,காதல் களம் கிடங்கு
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +194,Serial No {0} is under maintenance contract upto {1},தொடர் இல {0} வரை பராமரிப்பு ஒப்பந்தத்தின் கீழ் உள்ளது {1}
@@ -942,7 +907,7 @@
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,விற்பனை செலவு
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Buying,ஸ்டாண்டர்ட் வாங்குதல்
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +120,Standard Buying,ஸ்டாண்டர்ட் வாங்குதல்
 DocType: GL Entry,Against,எதிராக
 DocType: Item,Default Selling Cost Center,இயல்புநிலை விற்பனை செலவு மையம்
 DocType: Sales Partner,Implementation Partner,செயல்படுத்தல் வரன்வாழ்க்கை துணை
@@ -963,29 +928,29 @@
 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/setup/page/setup_wizard/setup_wizard.js +588,List a few of your suppliers. They could be organizations or individuals.,உங்கள் சப்ளையர்கள் ஒரு சில பட்டியல் . அவர்கள் நிறுவனங்கள் அல்லது தனிநபர்கள் இருக்க முடியும் .
+apps/erpnext/erpnext/public/js/setup_wizard.js +326,List a few of your suppliers. They could be organizations or individuals.,உங்கள் சப்ளையர்கள் ஒரு சில பட்டியல் . அவர்கள் நிறுவனங்கள் அல்லது தனிநபர்கள் இருக்க முடியும் .
 DocType: Company,Default Currency,முன்னிருப்பு நாணயத்தின்
 DocType: Contact,Enter designation of this Contact,இந்த தொடர்பு பதவி உள்ளிடவும்
 DocType: Contact Us Settings,Address,முகவரி
 DocType: Expense Claim,From Employee,பணியாளர் இருந்து
-apps/erpnext/erpnext/controllers/accounts_controller.py +338,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,எச்சரிக்கை: முறைமை {0} {1} பூஜ்யம் பொருள் தொகை என்பதால் overbilling பார்க்க மாட்டேன்
+apps/erpnext/erpnext/controllers/accounts_controller.py +339,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,எச்சரிக்கை: முறைமை {0} {1} பூஜ்யம் பொருள் தொகை என்பதால் overbilling பார்க்க மாட்டேன்
 DocType: Journal Entry,Make Difference Entry,வித்தியாசம் நுழைவு செய்ய
 DocType: Upload Attendance,Attendance From Date,வரம்பு தேதி வருகை
 DocType: Appraisal Template Goal,Key Performance Area,முக்கிய செயல்திறன் பகுதி
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +54,Transportation,போக்குவரத்து
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +54,Transportation,போக்குவரத்து
 apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +67, and year: ,ஆண்டு:
 DocType: Email Digest,Annual Expense,வருடாந்த செலவு
 DocType: SMS Center,Total Characters,மொத்த எழுத்துகள்
-apps/erpnext/erpnext/controllers/buying_controller.py +139,Please select BOM in BOM field for Item {0},பொருள் BOM துறையில் BOM தேர்ந்தெடுக்கவும் {0}
+apps/erpnext/erpnext/controllers/buying_controller.py +130,Please select BOM in BOM field for Item {0},பொருள் BOM துறையில் BOM தேர்ந்தெடுக்கவும் {0}
 DocType: C-Form Invoice Detail,C-Form Invoice Detail,சி படிவம் விலைப்பட்டியல் விரிவாக
 DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,கொடுப்பனவு நல்லிணக்க விலைப்பட்டியல்
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +32,Contribution %,பங்களிப்பு%
 DocType: Item,website page link,இணைய பக்கம் இணைப்பு
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +192,Let's prepare the system for first use.,முதல் பயன்படுத்த அமைப்பு தயார் செய்யட்டும்.
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +242,Let's prepare the system for first use.,முதல் பயன்படுத்த அமைப்பு தயார் செய்யட்டும்.
 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 +214,Production Order {0} must be cancelled before cancelling this Sales Order,உத்தரவு {0} இந்த விற்பனை ஆணை ரத்து முன் ரத்து செய்யப்பட வேண்டும்
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +209,Production Order {0} must be cancelled before cancelling this Sales Order,உத்தரவு {0} இந்த விற்பனை ஆணை ரத்து முன் ரத்து செய்யப்பட வேண்டும்
 ,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.,நேரம் பதிவுகள் தேர்ந்தெடுத்து ஒரு புதிய விற்பனை விலைப்பட்டியல் உருவாக்க சமர்ப்பிக்கவும்.
@@ -1005,14 +970,13 @@
 DocType: Sales Invoice Advance,Sales Invoice Advance,விற்பனை விலைப்பட்டியல் முன்பணம்
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +398,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/page/setup_wizard/install_fixtures.py +75,Management,மேலாண்மை
+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/setup/page/setup_wizard/fixtures/operations.py +14,Investment casting,முதலீட்டு நடிப்பதற்கு
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +51,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""","இந்த மாற்று பொருள் குறியீடு இணைக்கப்படும். உங்கள் சுருக்கம் ""எஸ்.எம்"", மற்றும் என்றால் உதாரணமாக, இந்த உருப்படியை குறியீடு ""சட்டை"", ""டி-சட்டை-எஸ்.எம்"" இருக்கும் மாறுபாடு உருப்படியை குறியீடு ஆகிறது"
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,நீங்கள் சம்பளம் ஸ்லிப் சேமிக்க முறை நிகர வருவாய் (வார்த்தைகளில்) காண முடியும்.
 apps/frappe/frappe/core/doctype/user/user_list.js +12,Active,செயலில்
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +154,Blue,ப்ளூ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +154,Blue,ப்ளூ
 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,மேலும் முனைகளில் ஒரே 'குரூப்' வகை முனைகளில் கீழ் உருவாக்கப்பட்ட
@@ -1022,18 +986,16 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +22,POS Profile {0} already created for user: {1} and company {2},பிஓஎஸ் சுயவிவரம் {0} ஏற்கனவே பயனர் உருவாக்கப்பட்டது: {1} நிறுவனத்தின் {2}
 DocType: Purchase Order Item,UOM Conversion Factor,மொறட்டுவ பல்கலைகழகம் மாற்ற காரணி
 DocType: Stock Settings,Default Item Group,முன்னிருப்பு உருப்படி குழு
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +156,Laminated object manufacturing,லேமினேட் பொருள் உற்பத்தி
 apps/erpnext/erpnext/config/buying.py +13,Supplier database.,வழங்குபவர் தரவுத்தள.
 DocType: Account,Balance Sheet,ஐந்தொகை
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +561,Cost Center For Item with Item Code ','பொருள் கோட் பொருள் சென்டர் செலவாகும்
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +45,Stretch forming,உருவாக்கும் நீட்சி
 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 +210,"Further accounts can be made under Groups, but entries can be made against non-Groups","மேலும் கணக்குகளை குழுக்கள் கீழ் செய்யப்பட்ட, ஆனால் உள்ளீடுகளை அல்லாத குழுக்கள் எதிராகவும் முடியும்"
 apps/erpnext/erpnext/config/hr.py +125,Tax and other salary deductions.,வரி மற்றும் பிற சம்பளம் கழிவுகள்.
 DocType: Lead,Lead,தலைமை
 DocType: Email Digest,Payables,Payables
 DocType: Account,Warehouse,கிடங்கு
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +90,Row #{0}: Rejected Qty can not be entered in Purchase Return,ரோ # {0}: அளவு கொள்முதல் ரிட்டன் உள்ளிட முடியாது நிராகரிக்கப்பட்டது
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +93,Row #{0}: Rejected Qty can not be entered in Purchase Return,ரோ # {0}: அளவு கொள்முதல் ரிட்டன் உள்ளிட முடியாது நிராகரிக்கப்பட்டது
 ,Purchase Order Items To Be Billed,"பில்லிங் செய்யப்படும் விதமே இருக்கவும் செய்ய வாங்குதல், ஆர்டர் உருப்படிகள்"
 DocType: Purchase Invoice Item,Net Rate,நிகர விகிதம்
 DocType: Purchase Invoice Item,Purchase Invoice Item,விலைப்பட்டியல் பொருள் வாங்க
@@ -1048,13 +1010,13 @@
 DocType: Global Defaults,Current Fiscal Year,தற்போதைய நிதியாண்டு
 DocType: Global Defaults,Disable Rounded Total,வட்டமான மொத்த முடக்கு
 DocType: Lead,Call,அழைப்பு
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +384,'Entries' cannot be empty,' பதிவுகள் ' காலியாக இருக்க முடியாது
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +386,'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 +205,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/page/setup_wizard/install_fixtures.py +138,Research,ஆராய்ச்சி
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +138,Research,ஆராய்ச்சி
 DocType: Maintenance Visit Purpose,Work Done,வேலை
 apps/erpnext/erpnext/controllers/item_variant.py +25,Please specify at least one attribute in the Attributes table,காரணிகள் அட்டவணை குறைந்தது ஒரு கற்பிதம் குறிப்பிட தயவு செய்து
 DocType: Contact,User ID,பயனர் ஐடி
@@ -1062,10 +1024,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +57,View Ledger,காட்சி லெட்ஜர்
 DocType: File,Lft,LFT
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,மிகமுந்திய
-apps/erpnext/erpnext/stock/doctype/item/item.py +394,"An Item Group exists with same name, please change the item name or rename the item group","ஒரு உருப்படி குழு அதே பெயரில் , உருப்படி பெயர் மாற்ற அல்லது உருப்படியை குழு பெயர்மாற்றம் செய்க"
+apps/erpnext/erpnext/stock/doctype/item/item.py +398,"An Item Group exists with same name, please change the item name or rename the item group","ஒரு உருப்படி குழு அதே பெயரில் , உருப்படி பெயர் மாற்ற அல்லது உருப்படியை குழு பெயர்மாற்றம் செய்க"
 DocType: Communication,Delivery Status,விநியோக நிலைமை
 DocType: Production Order,Manufacture against Sales Order,விற்பனை அமைப்புக்கு எதிராக உற்பத்தி
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +517,Rest Of The World,உலகம் முழுவதும்
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +455,Rest Of The World,உலகம் முழுவதும்
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,பொருள் {0} பணி முடியாது
 ,Budget Variance Report,வரவு செலவு வேறுபாடு அறிக்கை
 DocType: Salary Slip,Gross Pay,ஒட்டு மொத்த ஊதியம் / சம்பளம்
@@ -1076,13 +1038,11 @@
 DocType: BOM Item,Item Description,உருப்படி விளக்கம்
 DocType: Payment Tool,Payment Mode,பணம் செலுத்தும் முறை
 DocType: Purchase Invoice,Is Recurring,மீண்டும் மீண்டும்
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +154,Direct metal laser sintering,நேரடி உலோக லேசர் வெப்பப்படுத்தலுக்கு
 DocType: Purchase Order,Supplied Items,வழங்கப்பட்ட பொருட்கள்
 DocType: Production Order,Qty To Manufacture,உற்பத்தி அளவு
 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,தற்காலிக திறப்பு
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +41,Cryorolling,Cryorolling
 ,Employee Leave Balance,பணியாளர் விடுப்பு இருப்பு
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +128,Balance for Account {0} must always be {1},{0} எப்போதும் இருக்க வேண்டும் கணக்கு இருப்பு {1}
 DocType: Address,Address Type,முகவரி வகை
@@ -1098,23 +1058,23 @@
 DocType: Journal Entry,Get Outstanding Invoices,சிறந்த பற்றுச்சீட்டுகள் கிடைக்கும்
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,விற்பனை ஆணை {0} தவறானது
 apps/erpnext/erpnext/setup/doctype/company/company.py +172,"Sorry, companies cannot be merged","மன்னிக்கவும், நிறுவனங்கள் ஒன்றாக்க முடியாது"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +145,Small,சிறிய
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Small,சிறிய
 DocType: Employee,Employee Number,பணியாளர் எண்
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},வழக்கு எண் (கள்) ஏற்கனவே பயன்பாட்டில் உள்ளது. வழக்கு எண் இருந்து முயற்சி {0}
 ,Invoiced Amount (Exculsive Tax),விலை விவரம் தொகை ( ஒதுக்கி தள்ளும் பண்புடைய வரி )
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,பொருள் 2
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +59,Account head {0} created,கணக்கு தலையில் {0} உருவாக்கப்பட்டது
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +153,Green,பச்சை
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Green,பச்சை
 DocType: Item,Auto re-order,வாகன மறு ஒழுங்கு
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +57,Total Achieved,மொத்த Achieved
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +59,Total Achieved,மொத்த Achieved
 DocType: Employee,Place of Issue,இந்த இடத்தில்
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +59,Contract,ஒப்பந்த
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Contract,ஒப்பந்த
 DocType: Report,Disabled,முடக்கப்பட்டது
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +490,UOM coversion factor required for UOM: {0} in Item: {1},மொறட்டுவ பல்கலைகழகம் தேவையான மொறட்டுவ பல்கலைகழகம் Coversion காரணி: {0} உருப்படியை: {1}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +83,Indirect Expenses,மறைமுக செலவுகள்
 apps/erpnext/erpnext/controllers/selling_controller.py +163,Row {0}: Qty is mandatory,ரோ {0}: அளவு கட்டாய ஆகிறது
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +8,Agriculture,விவசாயம்
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +611,Your Products or Services,உங்கள் தயாரிப்புகள் அல்லது சேவைகள்
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,விவசாயம்
+apps/erpnext/erpnext/public/js/setup_wizard.js +347,Your Products or Services,உங்கள் தயாரிப்புகள் அல்லது சேவைகள்
 DocType: Mode of Payment,Mode of Payment,கட்டணம் செலுத்தும் முறை
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,இந்த ஒரு ரூட் உருப்படியை குழு மற்றும் திருத்த முடியாது .
 DocType: Journal Entry Account,Purchase Order,ஆர்டர் வாங்க
@@ -1126,7 +1086,7 @@
 DocType: Serial No,Serial No Details,தொடர் எண் விவரம்
 DocType: Purchase Invoice Item,Item Tax Rate,உருப்படியை வரி விகிதம்
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +113,"For {0}, only credit accounts can be linked against another debit entry",{0} மட்டுமே கடன் கணக்குகள் மற்றொரு பற்று நுழைவு எதிராக இணைக்கப்பட்ட ஐந்து
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Delivery Note {0} is not submitted,டெலிவரி குறிப்பு {0} சமர்ப்பிக்க
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +470,Delivery Note {0} is not submitted,டெலிவரி குறிப்பு {0} சமர்ப்பிக்க
 apps/erpnext/erpnext/stock/get_item_details.py +136,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.","விலை விதி முதல் பொருள், பொருள் பிரிவு அல்லது பிராண்ட் முடியும், துறையில் 'விண்ணப்பிக்க' அடிப்படையில் தேர்வு செய்யப்படுகிறது."
@@ -1136,7 +1096,7 @@
 DocType: Appraisal Goal,Goal,இலக்கு
 DocType: Sales Invoice Item,Edit Description,திருத்த விளக்கம்
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +318,Expected Delivery Date is lesser than Planned Start Date.,எதிர்பார்த்த வழங்குதல் தேதி திட்டமிட்ட தொடக்க தேதி விட குறைந்த உள்ளது.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +579,For Supplier,சப்ளையர்
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +602,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,மொத்த வெளிச்செல்லும்
@@ -1162,10 +1122,10 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +74,"Total {0} for all items is zero, may you should change 'Distribute Charges Based On'","மொத்த {0} அனைத்தையும் நீங்கள் அடிப்படையாகக் கட்டணங்கள் பகிர்ந்தளிப்பதற்காக &#39;மாற்ற வேண்டும் இருக்கலாம், பூஜ்யம் என்ற"
 DocType: Purchase Invoice,Taxes and Charges Calculation,வரிகள் மற்றும் கட்டணங்கள் கணக்கிடுதல்
 DocType: BOM Operation,Workstation,பணிநிலையம்
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +112,Hardware,வன்பொருள்
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +112,Hardware,வன்பொருள்
 DocType: Attendance,HR Manager,அலுவலக மேலாளர்
 apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,ஒரு நிறுவனத்தின் தேர்ந்தெடுக்கவும்
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +50,Privilege Leave,தனிச்சலுகை விடுப்பு
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +50,Privilege Leave,தனிச்சலுகை விடுப்பு
 DocType: Purchase Invoice,Supplier Invoice Date,வழங்குபவர் விலைப்பட்டியல் தேதி
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +79,You need to enable Shopping Cart,வண்டியில் செயல்படுத்த வேண்டும்
 apps/frappe/frappe/public/js/frappe/form/grid_body.html +6,No Data,தரவு இல்லை
@@ -1178,7 +1138,7 @@
 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 +168,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/setup/page/setup_wizard/install_fixtures.py +38,Food,உணவு
+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 +139,You can make a time log only against a submitted production order,நீ மட்டும் ஒரு சமர்ப்பிக்க உத்தரவு எதிராக நேரம் பதிவு செய்ய முடியும்
 DocType: Maintenance Schedule Item,No of Visits,வருகைகள் எண்ணிக்கை
@@ -1198,6 +1158,7 @@
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,View Offer Letter,சலுகையைப் கடிதம்
 DocType: Communication,Communication,தகவல்
 DocType: Item,Is Service Item,சேவை பொருள் ஆகும்
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +81,Application period cannot be outside leave allocation period,விண்ணப்ப காலம் வெளியே விடுப்பு ஒதுக்கீடு காலம் இருக்க முடியாது
 DocType: Activity Cost,Projects,திட்டங்கள்
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +31,Please select Fiscal Year,நிதியாண்டு தேர்வு செய்க
 apps/erpnext/erpnext/controllers/buying_controller.py +23,From {0} | {1} {2},இருந்து {0} | {1} {2}
@@ -1216,7 +1177,7 @@
 DocType: Item,Maintain Stock,பங்கு பராமரிக்கவும்
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +213,Stock Entries already created for Production Order ,ஏற்கனவே உற்பத்தி ஆணை உருவாக்கப்பட்ட பங்கு பதிவுகள்
 DocType: Leave Control Panel,Leave blank if considered for all designations,அனைத்து வடிவ கருத்தில் இருந்தால் வெறுமையாக
-apps/erpnext/erpnext/controllers/accounts_controller.py +499,Charge of type 'Actual' in row {0} cannot be included in Item Rate,வகை வரிசையில் {0} ல் ' உண்மையான ' பொறுப்பு மதிப்பிட சேர்க்கப்பட்டுள்ளது முடியாது
+apps/erpnext/erpnext/controllers/accounts_controller.py +500,Charge of type 'Actual' in row {0} cannot be included in Item Rate,வகை வரிசையில் {0} ல் ' உண்மையான ' பொறுப்பு மதிப்பிட சேர்க்கப்பட்டுள்ளது முடியாது
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,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,நிறுவனத்தின்
@@ -1226,7 +1187,7 @@
 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 +471,cannot be greater than 100,100 க்கும் அதிகமாக இருக்க முடியாது
-apps/erpnext/erpnext/stock/doctype/item/item.py +546,Item {0} is not a stock Item,பொருள் {0} ஒரு பங்கு பொருள் அல்ல
+apps/erpnext/erpnext/stock/doctype/item/item.py +550,Item {0} is not a stock Item,பொருள் {0} ஒரு பங்கு பொருள் அல்ல
 DocType: Maintenance Visit,Unscheduled,திட்டமிடப்படாத
 DocType: Employee,Owned,சொந்தமானது
 DocType: Salary Slip Deduction,Depends on Leave Without Pay,சம்பளமில்லா விடுப்பு பொறுத்தது
@@ -1240,31 +1201,29 @@
 DocType: HR Settings,Employee Settings,பணியாளர் அமைப்புகள்
 ,Batch-Wise Balance History,தொகுதி-வைஸ் இருப்பு வரலாறு
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +72,To Do List,பட்டியல் செய்ய வேண்டும்
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +63,Apprentice,வேலை கற்க நியமி
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Apprentice,வேலை கற்க நியமி
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +99,Negative Quantity is not allowed,எதிர்மறை அளவு அனுமதி இல்லை
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
 Used for Taxes and Charges","ஒரு சரம் போன்ற உருப்படியை மாஸ்டர் இருந்து எடுத்தது இந்த துறையில் சேமிக்கப்படும் வரி விவரம் அட்டவணை.
  வரிகள் மற்றும் கட்டணங்கள் பயன்படுத்திய"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +61,Lancing,Lancing
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +151,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 +435,Accounting Entry for {0}: {1} can only be made in currency: {2},{1} மட்டுமே நாணய முடியும்: {0} பைனான்ஸ் நுழைவு {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +436,Accounting Entry for {0}: {1} can only be made in currency: {2},{1} மட்டுமே நாணய முடியும்: {0} பைனான்ஸ் நுழைவு {2}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +38,No active Salary Structure found for employee {0} and the month,ஊழியர் {0} மற்றும் மாதம் எண் எதுவும் இல்லை செயலில் சம்பளம் அமைப்பு
 DocType: Job Opening,"Job profile, qualifications required etc.","Required வேலை சுயவிவரத்தை, தகுதிகள் முதலியன"
 DocType: Journal Entry Account,Account Balance,கணக்கு இருப்பு
 apps/erpnext/erpnext/config/accounts.py +112,Tax Rule for transactions.,பரிவர்த்தனைகள் வரி விதி.
 DocType: Rename Tool,Type of document to rename.,மறுபெயர் ஆவணம் வகை.
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +630,We buy this Item,நாம் இந்த பொருள் வாங்க
+apps/erpnext/erpnext/public/js/setup_wizard.js +366,We buy this Item,நாம் இந்த பொருள் வாங்க
 DocType: Address,Billing,பட்டியலிடல்
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +77,Flanging,Flanging
 DocType: Bulk Email,Not Sent,அனுப்பப்பட்டது
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +73,Explosive forming,உருவாக்கும் வெடிப்பு
 DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),மொத்த வரி மற்றும் கட்டணங்கள் (நிறுவனத்தின் கரன்சி)
 DocType: Shipping Rule,Shipping Account,கப்பல் கணக்கு
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +43,Scheduled to send to {0} recipients,{0} பெறுபவர்கள் அனுப்ப திட்டமிடப்பட்டுள்ளது
 DocType: Quality Inspection,Readings,அளவீடுகளும்
 DocType: Stock Entry,Total Additional Costs,மொத்த கூடுதல் செலவுகள்
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Sub Assemblies,துணை சபைகளின்
+apps/erpnext/erpnext/public/js/setup_wizard.js +359,Sub Assemblies,துணை சபைகளின்
 DocType: Shipping Rule Condition,To Value,மதிப்பு
 DocType: Supplier,Stock Manager,பங்கு மேலாளர்
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +143,Source warehouse is mandatory for row {0},மூல கிடங்கில் வரிசையில் கட்டாய {0}
@@ -1274,44 +1233,42 @@
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,இறக்குமதி தோல்வி!
 apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,இல்லை முகவரி இன்னும் கூறினார்.
 DocType: Workstation Working Hour,Workstation Working Hour,பணிநிலையம் வேலை செய்யும் நேரம்
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +83,Analyst,ஆய்வாளர்
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +202,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},ரோ {0}: ஒதுக்கப்பட்டுள்ள தொகை {1} குறைவாக இருக்க வேண்டும் அல்லது கூட்டுத் தொழில் தொகை சமம் வேண்டும் {2}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Analyst,ஆய்வாளர்
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +149,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},ரோ {0}: ஒதுக்கப்பட்டுள்ள தொகை {1} குறைவாக இருக்க வேண்டும் அல்லது கூட்டுத் தொழில் தொகை சமம் வேண்டும் {2}
 DocType: Item,Inventory,சரக்கு
 DocType: Features Setup,"To enable ""Point of Sale"" view",பார்வை &quot;விற்பனை செய்யுமிடம்&quot; செயல்படுத்த
 apps/erpnext/erpnext/public/js/pos/pos.js +402,Payment cannot be made for empty cart,கொடுப்பனவு காலியாக வண்டி முடியாது
 DocType: Item,Sales Details,விற்பனை விவரம்
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +149,Pinning,பின்செய்யப்படுகிறது
 DocType: Opportunity,With Items,பொருட்களை கொண்டு
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,அளவு உள்ள
 DocType: Notification Control,Expense Claim Rejected,இழப்பில் கோரிக்கை நிராகரிக்கப்பட்டது
 DocType: Sales Invoice,"The date on which next invoice will be generated. It is generated on submit.
 ",அடுத்து விலைப்பட்டியல் உருவாக்கப்படும் எந்த தேதி. அதை சமர்ப்பிக்க உருவாக்கப்படும்.
 DocType: Item Attribute,Item Attribute,பொருள் கற்பிதம்
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +105,Government,அரசாங்கம்
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Government,அரசாங்கம்
 apps/erpnext/erpnext/config/stock.py +268,Item Variants,பொருள் மாறிகள்
 DocType: Company,Services,சேவைகள்
 apps/erpnext/erpnext/accounts/report/financial_statements.py +147,Total ({0}),மொத்த ({0})
 DocType: Cost Center,Parent Cost Center,பெற்றோர் செலவு மையம்
 DocType: Sales Invoice,Source,மூல
 DocType: Leave Type,Is Leave Without Pay,சம்பளமில்லா விடுப்பு
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +186,No records found in the Payment table,கொடுப்பனவு அட்டவணை காணப்படவில்லை பதிவுகள்
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +405,Financial Year Start Date,நிதி ஆண்டு தொடக்கம் தேதி
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +133,No records found in the Payment table,கொடுப்பனவு அட்டவணை காணப்படவில்லை பதிவுகள்
+apps/erpnext/erpnext/public/js/setup_wizard.js +153,Financial Year Start Date,நிதி ஆண்டு தொடக்கம் தேதி
 DocType: Employee External Work History,Total Experience,மொத்த அனுபவம்
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +100,Countersinking,மெலிதமரிடல்
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +271,Packing Slip(s) cancelled,மூட்டை சீட்டு (கள்) ரத்து
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +276,Packing Slip(s) cancelled,மூட்டை சீட்டு (கள்) ரத்து
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,சரக்கு மற்றும் அனுப்புதல் கட்டணம்
 DocType: Material Request Item,Sales Order No,விற்பனை ஆணை இல்லை
 DocType: Item Group,Item Group Name,உருப்படியை குழு பெயர்
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +50,Taken,எடுக்கப்பட்ட
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,எடுக்கப்பட்ட
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +66,Transfer Materials for Manufacture,உற்பத்தி இடமாற்றத் பொருட்கள்
 DocType: Pricing Rule,For Price List,விலை பட்டியல்
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +27,Executive Search,நிறைவேற்று தேடல்
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,நிறைவேற்று தேடல்
 apps/erpnext/erpnext/stock/stock_ledger.py +405,"Purchase rate for item: {0} not found, which is required to book accounting entry (expense). Please mention item price against a buying price list.","உருப்படியை கொள்முதல் விகிதம்: {0} கிடைக்கவில்லை, கணக்கியல் உள்ளீடு (இழப்பில்) பதிவு செய்ய தேவைப்படும். ஒரு கொள்முதல் விலை பட்டியல் எதிரான பொருளின் விலை குறிப்பிட கொள்ளவும்."
 DocType: Maintenance Schedule,Schedules,கால அட்டவணைகள்
 DocType: Purchase Invoice Item,Net Amount,நிகர
 DocType: Purchase Order Item Supplied,BOM Detail No,BOM விரிவாக இல்லை
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),கூடுதல் தள்ளுபடி தொகை (நிறுவனத்தின் நாணயம்)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +537,Error: {0} > {1},பிழை: {0} > {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +541,Error: {0} > {1},பிழை: {0} > {1}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,கணக்கு பட்டியலில் இருந்து புதிய கணக்கை உருவாக்கு .
 DocType: Maintenance Visit,Maintenance Visit,பராமரிப்பு வருகை
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer > Customer Group > Territory,வாடிக்கையாளர்> வாடிக்கையாளர் குழு> மண்டலம்
@@ -1322,7 +1279,6 @@
 DocType: Event,Tuesday,செவ்வாய்க்கிழமை
 DocType: Leave Block List,Block Holidays on important days.,முக்கிய நாட்களில் பிளாக் விடுமுறை.
 ,Accounts Receivable Summary,கணக்குகள் சுருக்கம்
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +43,Leaves for type {0} already allocated for Employee {1} for period {2} - {3},ஏற்கனவே காலம் பணியாளர் {1} ஒதுக்கப்பட்ட வகை {0} திரும்புதல் {2} - {3}
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +187,Please set User ID field in an Employee record to set Employee Role,பணியாளர் பங்கு அமைக்க ஒரு பணியாளர் சாதனை பயனர் ஐடி துறையில் அமைக்கவும்
 DocType: UOM,UOM Name,மொறட்டுவ பல்கலைகழகம் பெயர்
 DocType: Top Bar Item,Target,இலக்கு
@@ -1334,15 +1290,14 @@
 DocType: ToDo,Due Date,காரணம் தேதி
 DocType: Sales Invoice Item,Brand Name,குறியீட்டு பெயர்
 DocType: Purchase Receipt,Transporter Details,இடமாற்றி விபரங்கள்
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Box,பெட்டி
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +389,The Organization,அமைப்பு
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Box,பெட்டி
+apps/erpnext/erpnext/public/js/setup_wizard.js +137,The Organization,அமைப்பு
 DocType: Monthly Distribution,Monthly Distribution,மாதாந்திர விநியோகம்
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,"ரிசீவர் பட்டியல் காலியாக உள்ளது . பெறுநர் பட்டியலை உருவாக்க , தயவு செய்து"
 DocType: Production Plan Sales Order,Production Plan Sales Order,உற்பத்தி திட்டம் விற்பனை ஆணை
 DocType: Sales Partner,Sales Partner Target,விற்பனை வரன்வாழ்க்கை துணை இலக்கு
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},{0} பைனான்ஸ் உள்நுழைய மட்டும் நாணய முடியும்: {1}
 DocType: Pricing Rule,Pricing Rule,விலை விதி
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +58,Notching,"போதினும்,"
 apps/erpnext/erpnext/config/learn.py +167,Material Request to Purchase Order,ஆணை வாங்க பொருள் வேண்டுதல்
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +74,Row # {0}: Returned Item {1} does not exists in {2} {3},ரோ # {0}: திரும்பினார் பொருள் {1} இல்லை நிலவும் {2} {3}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,வங்கி கணக்குகள்
@@ -1359,20 +1314,19 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Amounts not reflected in bank,வங்கி பிரதிபலித்தது
 DocType: Quality Inspection Reading,Reading 4,4 படித்தல்
 apps/erpnext/erpnext/config/hr.py +23,Claims for company expense.,நிறுவனத்தின் செலவினம் கூற்றுக்கள்.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +8,Centrifugal casting,மையவிலக்கு வார்ப்பு
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +119,Magnetic field-assisted finishing,காந்தப் புலம் உதவியுடனான முடித்த
 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,இல்லை மொபைல் தொடர்பு
 DocType: Production Planning Tool,Select Sales Orders,விற்பனை ஆணைகள் தேர்வு
 ,Material Requests for which Supplier Quotations are not created,வழங்குபவர் மேற்கோள்கள் உருவாக்கப்பட்ட எந்த பொருள் கோரிக்கைகள்
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +117,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,நீங்கள் விடுப்பு விண்ணப்பிக்கும் எந்த நாள் (கள்) விடுமுறை. நீங்கள் விடுப்பு விண்ணப்பிக்க வேண்டும்.
 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/buying/doctype/purchase_order/purchase_order.js +477,Mark as Delivered,மார்க் வழங்கப்படுகிறது என
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +497,Mark as Delivered,மார்க் வழங்கப்படுகிறது என
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +34,Make Quotation,விலைப்பட்டியல் செய்ய
 DocType: Dependent Task,Dependent Task,தங்கிவாழும் பணி
-apps/erpnext/erpnext/stock/doctype/item/item.py +306,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 +141,Leave of type {0} cannot be longer than {1},வகை விடுப்பு {0} மேலாக இருக்க முடியாது {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +310,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 +155,Leave of type {0} cannot be longer than {1},வகை விடுப்பு {0} மேலாக இருக்க முடியாது {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,முன்கூட்டியே எக்ஸ் நாட்கள் நடவடிக்கைகளுக்குத் திட்டமிட்டுள்ளது முயற்சி.
 DocType: HR Settings,Stop Birthday Reminders,நிறுத்து நினைவூட்டல்கள்
 DocType: SMS Center,Receiver List,ரிசீவர் பட்டியல்
@@ -1380,15 +1334,14 @@
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,உட்கொள்ளுகிறது தொகை
 apps/erpnext/erpnext/public/js/pos/pos.js +491,{0} View,{0} காண்க
 DocType: Salary Structure Deduction,Salary Structure Deduction,சம்பளம் அமைப்பு பொருத்தியறிதல்
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +158,Selective laser sintering,தேர்ந்தெடுக்கப்பட்ட லேசர் வெப்பப்படுத்தல்
-apps/erpnext/erpnext/stock/doctype/item/item.py +301,Unit of Measure {0} has been entered more than once in Conversion Factor Table,நடவடிக்கை அலகு {0} மேலும் மாற்று காரணி அட்டவணை முறை விட உள்ளிட்ட
+apps/erpnext/erpnext/stock/doctype/item/item.py +305,Unit of Measure {0} has been entered more than once in Conversion Factor Table,நடவடிக்கை அலகு {0} மேலும் மாற்று காரணி அட்டவணை முறை விட உள்ளிட்ட
 apps/frappe/frappe/core/page/data_import_tool/data_import_tool.js +108,Import Successful!,வெற்றிகரமான இறக்குமதி!
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,வெளியிடப்படுகிறது பொருட்களை செலவு
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +185,Quantity must not be more than {0},அளவு அதிகமாக இருக்க கூடாது {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +41,Age (Days),வயது (நாட்கள்)
 DocType: Quotation Item,Quotation Item,மேற்கோள் பொருள்
 DocType: Account,Account Name,கணக்கு பெயர்
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +41,From Date cannot be greater than To Date,தேதி முதல் இன்று வரை விட முடியாது
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +34,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.,வழங்குபவர் வகை மாஸ்டர் .
 DocType: Purchase Order Item,Supplier Part Number,வழங்குபவர் பாகம் எண்
@@ -1397,14 +1350,14 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +247,{0} {1} is cancelled or stopped,{0} {1} ரத்து அல்லது நிறுத்தி உள்ளது
 DocType: Accounts Settings,Credit Controller,கடன் கட்டுப்பாட்டாளர்
 DocType: Delivery Note,Vehicle Dispatch Date,வாகன அனுப்புகை தேதி
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +197,Purchase Receipt {0} is not submitted,கொள்முதல் ரசீது {0} சமர்ப்பிக்க
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +198,Purchase Receipt {0} is not submitted,கொள்முதல் ரசீது {0} சமர்ப்பிக்க
 DocType: Company,Default Payable Account,இயல்புநிலை செலுத்த வேண்டிய கணக்கு
 apps/erpnext/erpnext/config/website.py +13,"Settings for online shopping cart such as shipping rules, price list etc.","அத்தகைய கப்பல் விதிகள், விலை பட்டியல் முதலியன போன்ற ஆன்லைன் வணிக வண்டி அமைப்புகள்"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +660,Setup Complete,அமைப்பு முழு
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +124,Setup Complete,அமைப்பு முழு
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +65,{0}% Billed,{0}% கூறப்பட்டு
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +17,Reserved Qty,பாதுகாக்கப்பட்டவை அளவு
 DocType: Party Account,Party Account,கட்சி கணக்கு
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +74,Human Resources,மனித வளங்கள்
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +74,Human Resources,மனித வளங்கள்
 DocType: Lead,Upper Income,உயர் வருமானம்
 DocType: Journal Entry Account,Debit in Company Currency,நிறுவனத்தின் நாணய பற்று
 apps/erpnext/erpnext/support/doctype/issue/issue.py +58,My Issues,என் சிக்கல்கள்
@@ -1413,11 +1366,9 @@
 DocType: Company,Default Values,இயல்புநிலை கலாச்சாரம்
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +236,Row {0}: Payment amount can not be negative,ரோ {0}: கட்டணம் அளவு எதிர்மறையாக இருக்க முடியாது
 DocType: Expense Claim,Total Amount Reimbursed,மொத்த அளவு திரும்ப
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +152,Press fitting,பிரஸ் பொருத்தி
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +64,Against Supplier Invoice {0} dated {1},வழங்குபவர் எதிராக விலைப்பட்டியல் {0} தேதியிட்ட {1}
 DocType: Customer,Default Price List,முன்னிருப்பு விலை பட்டியல்
 DocType: Payment Reconciliation,Payments,பணம்
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +24,Hot isostatic pressing,அழுத்தி சூடான isostatic
 DocType: ToDo,Medium,ஊடகம்
 DocType: Budget Detail,Budget Allocated,பட்ஜெட் ஒதுக்கப்பட்ட
 DocType: Journal Entry,Entry Type,நுழைவு வகை
@@ -1430,9 +1381,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +56,None of the items have any change in quantity or value.,பொருட்களை எதுவும் அளவு அல்லது பெறுமதியில் எந்த மாற்று வேண்டும்.
 DocType: Warranty Claim,Warranty Claim,உத்தரவாதத்தை கூறுகின்றனர்
 ,Lead Details,விவரம் இட்டு
-DocType: Authorization Rule,Approving User,பயனர் ஒப்புதல்
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +37,Forging,மோசடி
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +126,Plating,முலாம்
 DocType: Purchase Invoice,End date of current invoice's period,தற்போதைய விலைப்பட்டியல் நேரத்தில் முடிவு தேதி
 DocType: Pricing Rule,Applicable For,பொருந்தும்
 DocType: Bank Reconciliation,From Date,தேதி
@@ -1454,31 +1402,29 @@
 DocType: Sales Invoice,Paid Amount (Company Currency),செலுத்தப்பட்ட தொகை எவ்வளவு (நிறுவனத்தின் நாணய)
 DocType: Purchase Invoice,Additional Discount,கூடுதல் தள்ளுபடி
 DocType: Selling Settings,Selling Settings,அமைப்புகள் விற்பனை
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +39,Online Auctions,ஆன்லைன் ஏலங்களில்
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,ஆன்லைன் ஏலங்களில்
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +94,Please specify either Quantity or Valuation Rate or both,அளவு அல்லது மதிப்பீட்டு விகிதம் அல்லது இரண்டு அல்லது குறிப்பிடவும்
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +50,"Company, Month and Fiscal Year is mandatory","நிறுவனத்தின் , மாதம் மற்றும் நிதியாண்டு கட்டாயமாகும்"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Marketing Expenses,மார்க்கெட்டிங் செலவுகள்
 ,Item Shortage Report,பொருள் பற்றாக்குறை அறிக்கை
-apps/erpnext/erpnext/stock/doctype/item/item.js +183,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","எடை கூட ""எடை UOM"" குறிப்பிட தயவு செய்து \n குறிப்பிடப்பட்டுள்ளது"
+apps/erpnext/erpnext/stock/doctype/item/item.js +185,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","எடை கூட ""எடை UOM"" குறிப்பிட தயவு செய்து \n குறிப்பிடப்பட்டுள்ளது"
 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 +212,Time Log Batch {0} must be 'Submitted',நேரம் பதிவு தொகுப்பு {0} ' Submitted'
 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 +384,Warehouse required at Row No {0},ரோ இல்லை தேவையான கிடங்கு {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +386,Warehouse required at Row No {0},ரோ இல்லை தேவையான கிடங்கு {0}
 DocType: Employee,Date Of Retirement,ஓய்வு தேதி
 DocType: Upload Attendance,Get Template,வார்ப்புரு கிடைக்கும்
 DocType: Address,Postal,தபால் அலுவலகம் சார்ந்த
 DocType: Item,Weightage,Weightage
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +159,Mining,சுரங்க
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +17,Resin casting,ரெசின் நடிப்பதற்கு
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,ஒரு வாடிக்கையாளர் குழு அதே பெயரில் வாடிக்கையாளர் பெயர் மாற்ற அல்லது வாடிக்கையாளர் குழு பெயர்மாற்றம் செய்க
 apps/erpnext/erpnext/public/js/pos/pos.js +147,Please select {0} first.,முதல் {0} தேர்ந்தெடுக்கவும்.
 apps/erpnext/erpnext/templates/pages/order.html +57,text {0},உரை {0}
 DocType: Territory,Parent Territory,பெற்றோர் மண்டலம்
 DocType: Quality Inspection Reading,Reading 2,2 படித்தல்
 DocType: Stock Entry,Material Receipt,பொருள் ரசீது
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +622,Products,தயாரிப்புகள்
+apps/erpnext/erpnext/public/js/setup_wizard.js +358,Products,தயாரிப்புகள்
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +47,Party Type and Party is required for Receivable / Payable account {0},கட்சி டைப் கட்சி பெறத்தக்க / செலுத்த வேண்டிய கணக்கு தேவையான {0}
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.","இந்த உருப்படியை வகைகள் உண்டு என்றால், அது விற்பனை ஆணைகள் முதலியன தேர்வு"
 DocType: Lead,Next Contact By,அடுத்த தொடர்பு
@@ -1488,13 +1434,13 @@
 DocType: Purchase Invoice,Notification Email Address,அறிவிப்பு மின்னஞ்சல் முகவரி
 DocType: Payment Tool,Find Invoices to Match,போட்டி வேண்டும் பொருள் காணவும்
 ,Item-wise Sales Register,உருப்படியை வாரியான விற்பனை பதிவு
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +399,"e.g. ""XYZ National Bank""","எ.கா. ""இஸ்ஸட் தேசிய வங்கி """
+apps/erpnext/erpnext/public/js/setup_wizard.js +147,"e.g. ""XYZ National Bank""","எ.கா. ""இஸ்ஸட் தேசிய வங்கி """
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,இந்த வரி அடிப்படை விகிதம் சேர்க்கப்பட்டுள்ளது?
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +57,Total Target,மொத்த இலக்கு
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Target,மொத்த இலக்கு
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.js +22,Shopping Cart is enabled,வண்டியில் செயல்படுத்தப்படும்
 DocType: Job Applicant,Applicant for a Job,ஒரு வேலை விண்ணப்பதாரர்
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +173,No Production Orders created,உருவாக்கப்பட்ட எந்த உற்பத்தி ஆணைகள்
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +131,Salary Slip of employee {0} already created for this month,ஊழியர் சம்பள {0} ஏற்கனவே இந்த மாதம் உருவாக்கப்பட்ட
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +140,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.,பல பத்திகள். அறிக்கை ஏற்றுமதி மற்றும் ஒரு விரிதாள் பயன்பாட்டை பயன்படுத்தி அச்சிட.
 DocType: Sales Invoice Item,Batch No,தொகுதி இல்லை
@@ -1504,14 +1450,14 @@
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +13,Variant,மாற்று
 apps/frappe/frappe/public/js/frappe/form/toolbar.js +165,New {0},புதிய {0}
 DocType: Naming Series,Set prefix for numbering series on your transactions,உங்கள் நடவடிக்கைகள் மீது தொடர் எண்ணுவதற்கான முன்னொட்டு அமைக்க
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +169,Stopped order cannot be cancelled. Unstop to cancel.,நிறுத்தி பொருட்டு ரத்து செய்ய முடியாது . ரத்து செய்ய தடை இல்லாத .
-apps/erpnext/erpnext/stock/doctype/item/item.py +323,Default BOM ({0}) must be active for this item or its template,"இயல்புநிலை BOM, ({0}) இந்த உருப்படியை அல்லது அதன் டெம்ப்ளேட் தீவிரமாக இருக்க வேண்டும்"
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +164,Stopped order cannot be cancelled. Unstop to cancel.,நிறுத்தி பொருட்டு ரத்து செய்ய முடியாது . ரத்து செய்ய தடை இல்லாத .
+apps/erpnext/erpnext/stock/doctype/item/item.py +327,Default BOM ({0}) must be active for this item or its template,"இயல்புநிலை BOM, ({0}) இந்த உருப்படியை அல்லது அதன் டெம்ப்ளேட் தீவிரமாக இருக்க வேண்டும்"
 DocType: Employee,Leave Encashed?,காசாக்கப்பட்டால் விட்டு?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,துறையில் இருந்து வாய்ப்பு கட்டாய ஆகிறது
 DocType: Item,Variants,மாறிகள்
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +458,Make Purchase Order,செய்ய கொள்முதல் ஆணை
 DocType: SMS Center,Send To,அனுப்பு
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +111,There is not enough leave balance for Leave Type {0},விடுப்பு வகை போதுமான விடுப்பு சமநிலை இல்லை {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +127,There is not enough leave balance for Leave Type {0},விடுப்பு வகை போதுமான விடுப்பு சமநிலை இல்லை {0}
 DocType: Sales Team,Contribution to Net Total,நிகர மொத்த பங்களிப்பு
 DocType: Sales Invoice Item,Customer's Item Code,வாடிக்கையாளர் பொருள் குறியீடு
 DocType: Stock Reconciliation,Stock Reconciliation,பங்கு நல்லிணக்க
@@ -1548,11 +1494,11 @@
 DocType: Sales Order Item,Actual Qty,உண்மையான அளவு
 DocType: Sales Invoice Item,References,குறிப்புகள்
 DocType: Quality Inspection Reading,Reading 10,10 படித்தல்
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +612,"List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start.",உங்கள் தயாரிப்புகள் அல்லது நீங்கள் வாங்க அல்லது விற்க என்று சேவைகள் பட்டியலில் .
+apps/erpnext/erpnext/public/js/setup_wizard.js +348,"List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start.",உங்கள் தயாரிப்புகள் அல்லது நீங்கள் வாங்க அல்லது விற்க என்று சேவைகள் பட்டியலில் .
 DocType: Hub Settings,Hub Node,ஹப் கணு
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,நீங்கள் போலி பொருட்களை நுழைந்தது. சரிசெய்து மீண்டும் முயற்சிக்கவும்.
 apps/erpnext/erpnext/controllers/item_variant.py +65,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values,மதிப்பு {0} பண்பு {1} செல்லுபடியாகும் பொருள் பட்டியலில் இல்லை கற்பித மதிப்புகள்
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +87,Associate,இணை
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Associate,இணை
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +46,Item {0} is not a serialized Item,பொருள் {0} ஒரு தொடர் பொருள் அல்ல
 DocType: SMS Center,Create Receiver List,பெறுநர் பட்டியல் உருவாக்க
 apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +5,Expired,காலாவதியான
@@ -1561,7 +1507,7 @@
 DocType: Warranty Claim,Issue Date,பிரச்சினை தேதி
 DocType: Activity Cost,Activity Cost,நடவடிக்கை செலவு
 DocType: Purchase Receipt Item Supplied,Consumed Qty,நுகரப்படும் அளவு
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +52,Telecommunications,தொலைத்தொடர்பு
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +52,Telecommunications,தொலைத்தொடர்பு
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),தொகுப்பு இந்த விநியோக ஒரு பகுதியாக உள்ளது என்று குறிக்கிறது (மட்டும் வரைவு)
 DocType: Payment Tool,Make Payment Entry,கொடுப்பனவு உள்ளீடு செய்ய
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +119,Quantity for Item {0} must be less than {1},அளவு உருப்படி {0} விட குறைவாக இருக்க வேண்டும் {1}
@@ -1578,10 +1524,8 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +37,"Selling must be checked, if Applicable For is selected as {0}","பொருந்துகின்ற என தேர்வு என்றால் விற்பனை, சரிபார்க்கப்பட வேண்டும் {0}"
 DocType: Purchase Order Item,Supplier Quotation Item,வழங்குபவர் மேற்கோள் பொருள்
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +27,Make Salary Structure,சம்பள கட்டமைப்பு செய்ய
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +54,Shearing,வெட்டுதல்
 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.,ஒரு புதிய விற்பனை விலைப்பட்டியல் உருவாக்க பொத்தானை &#39;விற்பனை விலைப்பட்டியல் கொள்ளுங்கள்&#39; கிளிக்.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +166,Packaging and labeling,பேக்கேஜிங் மற்றும் பெயரிடல்
 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,நிறுவனத்தின் மாஸ்டர் மற்றும் உலகளாவிய செலுத்தமுடியாத இயல்புநிலை நாணய குறிப்பிடவும்
@@ -1592,19 +1536,18 @@
 DocType: Budget Detail,Fiscal Year,நிதியாண்டு
 DocType: Cost Center,Budget,வரவு செலவு திட்டம்
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +41,"Budget cannot be assigned against {0}, as it's not an Income or Expense account",அது ஒரு வருமான அல்லது செலவு கணக்கு அல்ல என பட்ஜெட் எதிராக {0} ஒதுக்கப்படும் முடியாது
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Achieved,Achieved
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,Achieved
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +65,Territory / Customer,மண்டலம் / வாடிக்கையாளர்
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,e.g. 5,"உதாரணமாக, 5"
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +207,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},ரோ {0}: ஒதுக்கப்பட்டுள்ள தொகை {1} குறைவாக இருக்க வேண்டும் அல்லது நிலுவை தொகை விலைப்பட்டியல் சமம் வேண்டும் {2}
+apps/erpnext/erpnext/public/js/setup_wizard.js +294,e.g. 5,"உதாரணமாக, 5"
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},ரோ {0}: ஒதுக்கப்பட்டுள்ள தொகை {1} குறைவாக இருக்க வேண்டும் அல்லது நிலுவை தொகை விலைப்பட்டியல் சமம் வேண்டும் {2}
 DocType: Sales Invoice,In Words will be visible once you save the Sales Invoice.,நீங்கள் விற்பனை விலைப்பட்டியல் சேமிக்க முறை சொற்கள் காணக்கூடியதாக இருக்கும்.
 DocType: Item,Is Sales Item,விற்பனை பொருள் ஆகும்
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,பொருள் குழு மரம்
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,பொருள் {0} சீரியல் எண்கள் சோதனை பொருள் மாஸ்டர் அமைப்பு அல்ல
 DocType: Maintenance Visit,Maintenance Time,பராமரிப்பு நேரம்
 ,Amount to Deliver,அளவு வழங்க வேண்டும்
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +620,A Product or Service,ஒரு பொருள் அல்லது சேவை
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +158,There were errors.,பிழைகள் இருந்தன .
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +101,Tapping,தட்டுவதன்
+apps/erpnext/erpnext/public/js/setup_wizard.js +356,A Product or Service,ஒரு பொருள் அல்லது சேவை
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +146,There were errors.,பிழைகள் இருந்தன .
 DocType: Naming Series,Current Value,தற்போதைய மதிப்பு
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +171,{0} created,{0} உருவாக்கப்பட்டது
 DocType: Delivery Note Item,Against Sales Order,விற்னையாளர் எதிராக
@@ -1619,7 +1562,7 @@
 apps/erpnext/erpnext/accounts/party.py +275,Due Date cannot be before Posting Date,காரணம் தேதி தேதி தகவல்களுக்கு முன் இருக்க முடியாது
 DocType: Website Item Group,Website Item Group,இணைய தகவல்கள் குழு
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Duties and Taxes,கடமைகள் மற்றும் வரி
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Please enter Reference date,குறிப்பு தேதியை உள்ளிடவும்
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +312,Please enter Reference date,குறிப்பு தேதியை உள்ளிடவும்
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} கட்டணம் உள்ளீடுகளை வடிகட்டி {1}
 DocType: Item Website Specification,Table for Item that will be shown in Web Site,வலை தளத்தில் காட்டப்படும் என்று பொருள் அட்டவணை
 DocType: Purchase Order Item Supplied,Supplied Qty,வழங்கப்பட்ட அளவு
@@ -1627,7 +1570,7 @@
 apps/erpnext/erpnext/config/stock.py +103,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,உருப்படியை வாரியான கொள்முதல் வரலாறு
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +152,Red,ரெட்
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Red,ரெட்
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +228,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},"சீரியல் இல்லை பொருள் சேர்க்க எடுக்க ' உருவாக்குதல் அட்டவணை ' கிளிக் செய்து, {0}"
 DocType: Account,Frozen,நிலையாக்கப்பட்டன
 ,Open Production Orders,திறந்த உற்பத்தி ஆணைகள்
@@ -1642,7 +1585,7 @@
 DocType: Item Attribute,Attribute Name,பெயர் பண்பு
 apps/erpnext/erpnext/controllers/selling_controller.py +236,Item {0} must be Sales or Service Item in {1},பொருள் {0} விற்பனை அல்லது சேவை பொருளாக இருக்க வேண்டும் {1}
 DocType: Item Group,Show In Website,இணையத்தளம் காண்பி
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +621,Group,தொகுதி
+apps/erpnext/erpnext/public/js/setup_wizard.js +357,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","பின்வரும் ஆவணங்களை விநியோகக் குறிப்பு, Opportunity பொருள் கோரிக்கை, பொருள், கொள்முதல் ஆணை, கொள்முதல் ரசீது, வாங்குபவர் சீட்டு, மேற்கோள், விற்பனை விலைப்பட்டியல், தயாரிப்பு மூட்டை, விற்பனை, தொ.எ. உள்ள பிராண்ட் பெயர் கண்காணிக்க"
@@ -1652,6 +1595,7 @@
 DocType: Features Setup,Brands,பிராண்ட்கள்
 DocType: C-Form Invoice Detail,Invoice No,இல்லை விலைப்பட்டியல்
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +480,From Purchase Order,கொள்முதல் ஆணை இருந்து
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +92,"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,ராஜினாமா கடிதம் தேதி
@@ -1659,35 +1603,31 @@
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +137,Not Set,அமை
 DocType: Communication,Date,தேதி
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,மீண்டும் வாடிக்கையாளர் வருவாய்
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +651,Sit tight while your system is being setup. This may take a few moments.,உங்கள் கணினி அமைப்பு என்றாலும் அமர்ந்து . இந்த ஒரு சில நிமிடங்கள் ஆகலாம்.
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +115,Sit tight while your system is being setup. This may take a few moments.,உங்கள் கணினி அமைப்பு என்றாலும் அமர்ந்து . இந்த ஒரு சில நிமிடங்கள் ஆகலாம்.
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +51,{0} ({1}) must have role 'Expense Approver',{0} ({1}) பங்கு செலவில் தரப்பில் சாட்சி 'வேண்டும்;
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Pair,இணை
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Pair,இணை
 DocType: Bank Reconciliation Detail,Against Account,கணக்கு எதிராக
 DocType: Maintenance Schedule Detail,Actual Date,உண்மையான தேதி
 DocType: Item,Has Batch No,கூறு எண் உள்ளது
 DocType: Delivery Note,Excise Page Number,கலால் பக்கம் எண்
 DocType: Employee,Personal Details,தனிப்பட்ட விவரங்கள்
 ,Maintenance Schedules,பராமரிப்பு அட்டவணை
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +44,Embossing,பொறித்தல்
 ,Quotation Trends,மேற்கோள் போக்குகள்
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +139,Item Group not mentioned in item master for item {0},உருப்படி உருப்படியை மாஸ்டர் குறிப்பிடப்பட்டுள்ளது பொருள் பிரிவு {0}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +302,Debit To account must be a Receivable account,கணக்கில் பற்று ஒரு பெறத்தக்க கணக்கு இருக்க வேண்டும்
-apps/erpnext/erpnext/stock/doctype/item/item.py +310,"As Production Order can be made for this item, it must be a stock item.","உத்தரவு இந்த உருப்படிக்கு செய்து கொள்ள முடியும் என , அது ஒரு பங்கு பொருளாக இருக்க வேண்டும் ."
 DocType: Shipping Rule Condition,Shipping Amount,கப்பல் தொகை
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +140,Joining,சேர்வது
-DocType: Authorization Rule,Above Value,மதிப்பு மேலே
 ,Pending Amount,நிலுவையில் தொகை
 DocType: Purchase Invoice Item,Conversion Factor,மாற்ற காரணி
 DocType: Purchase Order,Delivered,வழங்கினார்
 apps/erpnext/erpnext/config/hr.py +160,Setup incoming server for jobs email id. (e.g. jobs@example.com),வேலைகள் மின்னஞ்சல் ஐடி அமைப்பு உள்வரும் சர்வர் . (எ. கா: jobs@example.com )
 DocType: Purchase Receipt,Vehicle Number,வாகன எண்
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,மீண்டும் விலைப்பட்டியல் நிறுத்த வேண்டும் எந்த தேதி
+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,கணக்குகள்
 ,Supplier-Wise Sales Analytics,வழங்குபவர் - தம்பதியினர் அனலிட்டிக்ஸ்
 DocType: Address Template,This format is used if country specific format is not found,நாட்டின் குறிப்பிட்ட வடிவமைப்பில் இல்லை என்றால் இந்த வடிவமைப்பு பயன்படுத்தப்படும்
 DocType: Custom Field,Custom,வழக்கம்
 DocType: Production Order,Use Multi-Level BOM,மல்டி லெவல் BOM பயன்படுத்த
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +26,Injection molding,ஊசி மருந்து வடிவமைத்தல்
 DocType: Bank Reconciliation,Include Reconciled Entries,ஆர தழுவி பதிவுகள் சேர்க்கிறது
 apps/erpnext/erpnext/config/accounts.py +41,Tree of finanial accounts.,Finanial கணக்குகளின் மரம் .
 DocType: Leave Control Panel,Leave blank if considered for all employee types,அனைத்து பணியாளர் வகையான கருதப்படுகிறது என்றால் வெறுமையாக
@@ -1697,30 +1637,28 @@
 apps/frappe/frappe/config/setup.py +130,Printing,அச்சிடுதல்
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +114,Expense Claim is pending approval. Only the Expense Approver can update status.,செலவு கோரும் அனுமதிக்காக நிலுவையில் உள்ளது . மட்டுமே செலவு அப்ரூவரான நிலையை மேம்படுத்த முடியும் .
 DocType: Purchase Invoice,Additional Discount Amount,கூடுதல் தள்ளுபடி தொகை
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +99,The day(s) on which you are applying for leave are holiday. You need not apply for leave.,நீங்கள் விடுப்பு விண்ணப்பிக்கும் எந்த நாள் (கள்) விடுமுறை இருக்கிறது . நீங்கள் விடுப்பு விண்ணப்பிக்க தேவையில்லை .
 apps/frappe/frappe/public/js/frappe/misc/utils.js +110,and,மற்றும்
 DocType: Leave Block List Allow,Leave Block List Allow,பிளாக் பட்டியல் அனுமதி விட்டு
 apps/erpnext/erpnext/setup/doctype/company/company.py +236,Abbr can not be blank or space,Abbr வெற்று இடைவெளி அல்லது இருக்க முடியாது
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +50,Sports,விளையாட்டு
+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/setup/page/setup_wizard/setup_wizard.js +626,Unit,அலகு
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Unit,அலகு
 apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.py +182,Please set Dropbox access keys in your site config,உங்கள் தளத்தில் கட்டமைப்பு டிராப்பாக்ஸ் அணுகல் விசைகள் அமைக்கவும்
 apps/erpnext/erpnext/stock/get_item_details.py +113,Please specify Company,நிறுவனத்தின் குறிப்பிடவும்
 ,Customer Acquisition and Loyalty,வாடிக்கையாளர் கையகப்படுத்துதல் மற்றும் லாயல்டி
 DocType: Purchase Receipt,Warehouse where you are maintaining stock of rejected items,நீங்கள் நிராகரித்து பொருட்களை பங்கு வைத்து எங்கே கிடங்கு
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +408,Your financial year ends on,உங்கள் நிதி ஆண்டில் முடிவடைகிறது
+apps/erpnext/erpnext/public/js/setup_wizard.js +156,Your financial year ends on,உங்கள் நிதி ஆண்டில் முடிவடைகிறது
 DocType: POS Profile,Price List,விலை பட்டியல்
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +20,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0} இப்போது இயல்புநிலை நிதியாண்டு ஆகிறது . விளைவு எடுக்க மாற்றம் உங்களது உலாவி புதுப்பிக்கவும் .
 apps/erpnext/erpnext/projects/doctype/project/project.js +47,Expense Claims,செலவு சட்டக்கோரல்கள்
 DocType: Issue,Support,ஆதரவு
-DocType: Authorization Rule,Approving Role,பங்கு ஒப்புதல்
 ,BOM Search,"BOM, தேடல்"
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +176,Closing (Opening + Totals),நிறைவு (+ கூட்டுத்தொகை திறக்கப்படவுள்ளது)
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +26,Please specify currency in Company,நிறுவனத்தின் நாணய குறிப்பிடவும்
 DocType: Workstation,Wages per hour,ஒரு மணி நேரத்திற்கு ஊதியங்கள்
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,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.","பல தொடர் இலக்கங்கள் , பிஓஎஸ் போன்ற காட்டு / மறை அம்சங்கள்"
-apps/erpnext/erpnext/controllers/accounts_controller.py +236,Account {0} is invalid. Account Currency must be {1},கணக்கு {0} தவறானது. கணக்கு நாணய இருக்க வேண்டும் {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +237,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}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +53,Clearance date cannot be before check date in row {0},இசைவு தேதி வரிசையில் காசோலை தேதி முன் இருக்க முடியாது {0}
 DocType: Salary Slip,Deduction,கழித்தல்
@@ -1739,13 +1677,13 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +82,Item {0} has already been returned,பொருள் {0} ஏற்கனவே திரும்பினார்
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** நிதியாண்டு ** ஒரு நிதி ஆண்டு பிரதிபலிக்கிறது. அனைத்து உள்ளீடுகளை மற்றும் பிற முக்கிய பரிமாற்றங்கள் ** ** நிதியாண்டு எதிரான கண்காணிக்கப்படும்.
 DocType: Opportunity,Customer / Lead Address,வாடிக்கையாளர் / முன்னணி முகவரி
+apps/erpnext/erpnext/stock/doctype/item/item.py +112,Warning: Invalid SSL certificate on attachment {0},எச்சரிக்கை: இணைப்பு தவறான SSL சான்றிதழ் {0}
 DocType: Production Order Operation,Actual Operation Time,உண்மையான நடவடிக்கையை நேரம்
 DocType: Authorization Rule,Applicable To (User),பொருந்தும் (பயனர்)
 DocType: Purchase Taxes and Charges,Deduct,தள்ளு
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +170,Job Description,வேலை விபரம்
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +170,Job Description,வேலை விபரம்
 DocType: Purchase Order Item,Qty as per Stock UOM,பங்கு மொறட்டுவ பல்கலைகழகம் படி அளவு
 apps/frappe/frappe/model/rename_doc.py +343,Please select a valid csv file with data,தரவு ஒரு செல்லுபடியாகும் CSV கோப்பை தேர்ந்தெடுக்கவும்
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +92,Coating,பூச்சு
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +126,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","தவிர, சிறப்பு எழுத்துக்கள் ""-"" ""."", ""#"", மற்றும் ""/"" தொடர் பெயரிடும் அனுமதி இல்லை"
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","விற்பனை பிரச்சாரங்கள் கண்காணிக்க. லீட்ஸ், மேற்கோள்கள் கண்காணிக்கவும், விற்பனை போன்றவை பிரச்சாரங்கள் இருந்து முதலீட்டு மீது மீண்டும் அளவிடுவதற்கு. "
 DocType: Expense Claim,Approver,சர்க்கார் தரப்பில் சாட்சி சொல்லும் குற்றவாளி
@@ -1755,12 +1693,11 @@
 DocType: Supplier Quotation,Manufacturing Manager,தயாரிப்பு மேலாளர்
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +191,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/hooks.py +84,Shipments,படுவதற்கு
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +29,Dip molding,சாய்வு வடிவமைத்தல்
+apps/erpnext/erpnext/hooks.py +68,Shipments,படுவதற்கு
 DocType: Purchase Order,To be delivered to customer,வாடிக்கையாளர் வழங்க வேண்டும்
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,நேரம் பதிவு நிலைமை சமர்ப்பிக்க வேண்டும்.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,தொ.எ. {0} எந்த கிடங்கு சொந்தம் இல்லை
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +650,Setting Up,அமைக்கிறது
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +114,Setting Up,அமைக்கிறது
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,Row # ,ரோ #
 DocType: Purchase Invoice,In Words (Company Currency),வேர்ட்ஸ் (நிறுவனத்தின் கரன்சி)
 DocType: Pricing Rule,Supplier,கொடுப்பவர்
@@ -1768,7 +1705,7 @@
 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 +166,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,செலவு வேறுபாடு கணக்கு கட்டாய உருப்படி {0} பாதிப்பை ஒட்டுமொத்த பங்கு மதிப்பு
-apps/erpnext/erpnext/controllers/accounts_controller.py +354,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings",வரிசையில் பொருள் {0} ஐந்து overbill முடியாது {1} விட {2}. Overbilling பங்கு அமைப்புகள் அமைக்க தயவு செய்து அனுமதிக்க
+apps/erpnext/erpnext/controllers/accounts_controller.py +355,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings",வரிசையில் பொருள் {0} ஐந்து overbill முடியாது {1} விட {2}. Overbilling பங்கு அமைப்புகள் அமைக்க தயவு செய்து அனுமதிக்க
 DocType: Employee,Bank Name,வங்கி பெயர்
 apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +27,-Above,-Above
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +135,User {0} is disabled,பயனர் {0} முடக்கப்பட்டுள்ளது
@@ -1781,27 +1718,26 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,{0} is mandatory for Item {1},{0} பொருள் கட்டாய {1}
 DocType: Currency Exchange,From Currency,நாணய இருந்து
 DocType: DocField,Name,பெயர்
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +211,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","குறைந்தது ஒரு வரிசையில் ஒதுக்கப்பட்டுள்ள தொகை, விலைப்பட்டியல் வகை மற்றும் விலைப்பட்டியல் எண் தேர்ந்தெடுக்கவும்"
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +104,Sales Order required for Item {0},பொருள் தேவை விற்பனை ஆணை {0}
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +158,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","குறைந்தது ஒரு வரிசையில் ஒதுக்கப்பட்டுள்ள தொகை, விலைப்பட்டியல் வகை மற்றும் விலைப்பட்டியல் எண் தேர்ந்தெடுக்கவும்"
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +107,Sales Order required for Item {0},பொருள் தேவை விற்பனை ஆணை {0}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +43,Amounts not reflected in system,அமைப்பு பிரதிபலித்தது
 DocType: Purchase Invoice Item,Rate (Company Currency),விகிதம் (நிறுவனத்தின் கரன்சி)
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +40,Others,மற்றவை
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +40,Others,மற்றவை
 apps/erpnext/erpnext/templates/includes/product_page.js +80,Cannot find a matching Item. Please select some other value for {0}.,ஒரு பொருத்தமான பொருள் கண்டுபிடிக்க முடியவில்லை. ஐந்து {0} வேறு சில மதிப்பு தேர்ந்தெடுக்கவும்.
 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/frappe/frappe/core/doctype/doctype/boilerplate/controller_list.html +31,Completed,நிறைவு
 DocType: Web Form,Select DocType,DOCTYPE தேர்வு
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +104,Broaching,கொந்துதல்
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +12,Banking,வங்கி
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,வங்கி
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +38,Please click on 'Generate Schedule' to get schedule,"அட்டவணை பெற ' உருவாக்குதல் அட்டவணை ' கிளிக் செய்து,"
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +283,New Cost Center,புதிய செலவு மையம்
 DocType: Bin,Ordered Quantity,உத்தரவிட்டார் அளவு
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +397,"e.g. ""Build tools for builders""","உதாரணமாக, "" கட்டுமான கருவிகள் கட்ட """
+apps/erpnext/erpnext/public/js/setup_wizard.js +145,"e.g. ""Build tools for builders""","உதாரணமாக, "" கட்டுமான கருவிகள் கட்ட """
 DocType: Quality Inspection,In Process,செயல்முறை உள்ள
 DocType: Authorization Rule,Itemwise Discount,இனவாரியாக தள்ளுபடி
 DocType: Purchase Order Item,Reference Document Type,குறிப்பு ஆவண வகை
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +318,{0} against Sales Order {1},{0} விற்பனை ஆணை எதிரான {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +320,{0} against Sales Order {1},{0} விற்பனை ஆணை எதிரான {1}
 DocType: Account,Fixed Asset,நிலையான சொத்து
 apps/erpnext/erpnext/config/stock.py +283,Serialized Inventory,தொடர் சரக்கு
 DocType: Activity Type,Default Billing Rate,இயல்புநிலை பில்லிங் மதிப்பீடு
@@ -1816,14 +1752,13 @@
 DocType: Purchase Invoice Item,Page Break,பக்கம் பிரேக்
 DocType: Production Order Operation,Pending,முடிவுபெறாத
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,ஒரு குறிப்பிட்ட ஊழியர் விடுப்பு விண்ணப்பங்கள் ஒப்புதல் முடியும் பயனர்கள்
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +33,You cannot change default UOM of Variant. To change default UOM for Variant change default UOM of the Template,நீங்கள் மாற்று இயல்புநிலை UOM மாற்ற முடியாது. டெம்ப்ளேட் மாற்று மாற்றம் இயல்புநிலை UOM இயல்புநிலை UOM மாற்ற
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +50,Office Equipments,அலுவலக உபகரணங்கள்
 DocType: Purchase Invoice Item,Qty,அளவு
 DocType: Fiscal Year,Companies,நிறுவனங்கள்
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +24,Electronics,மின்னணுவியல்
+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/support/doctype/maintenance_visit/maintenance_visit.js +18,From Maintenance Schedule,பராமரிப்பு அட்டவணை இருந்து
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +56,Full-time,முழு நேர
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +56,Full-time,முழு நேர
 DocType: Purchase Invoice,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.","நீங்கள் விற்பனை வரி மற்றும் கட்டணங்கள் டெம்ப்ளேட் ஒரு நிலையான டெம்ப்ளேட் கொண்டிருக்கிறீர்கள் என்றால், ஒரு தேர்வு, கீழே உள்ள பொத்தானை கிளிக் செய்யவும்."
@@ -1835,11 +1770,12 @@
 DocType: Job Applicant,Job Opening,வேலை திறக்கிறது
 DocType: Payment Reconciliation,Payment Reconciliation,கொடுப்பனவு நல்லிணக்க
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +154,Please select Incharge Person's name,பொறுப்பாளர் நபரின் பெயர் தேர்வு செய்க
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +51,Technology,தொழில்நுட்ப
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,தொழில்நுட்ப
 DocType: Offer Letter,Offer Letter,கடிதம் ஆஃபர்
 apps/erpnext/erpnext/config/manufacturing.py +51,Generate Material Requests (MRP) and Production Orders.,பொருள் கோரிக்கைகள் (எம்ஆர்பி) மற்றும் உற்பத்தி ஆணைகள் உருவாக்க.
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +68,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.","குழந்தை முனைகள் சேர்க்க, மரம் ஆராய நீங்கள் மேலும் முனைகளில் சேர்க்க வேண்டும் கீழ் முனை மீது கிளிக் செய்யவும்."
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +102,Credit To account must be a Payable account,கணக்கில் வரவு ஒரு செலுத்த வேண்டிய கணக்கு இருக்க வேண்டும்
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +233,BOM recursion: {0} cannot be parent or child of {2},BOM மறுநிகழ்வு : {0} பெற்றோர் அல்லது குழந்தை இருக்க முடியாது {2}
@@ -1852,10 +1788,8 @@
 DocType: Item,Customer Item Codes,வாடிக்கையாளர் பொருள் குறியீடுகள்
 DocType: Opportunity,Lost Reason,இழந்த காரணம்
 apps/erpnext/erpnext/config/accounts.py +68,Create Payment Entries against Orders or Invoices.,ஆணைகள் அல்லது பொருள் எதிரான கொடுப்பனவு பதிவுகள் உருவாக்கவும்.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +141,Welding,வெல்டிங்
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +40,New Stock UOM is required,புதிய பங்கு மொறட்டுவ பல்கலைகழகம் தேவை
 DocType: Quality Inspection,Sample Size,மாதிரி அளவு
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +443,All items have already been invoiced,அனைத்து பொருட்களும் ஏற்கனவே விலை விவரம்
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +446,All items have already been invoiced,அனைத்து பொருட்களும் ஏற்கனவே விலை விவரம்
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',&#39;வழக்கு எண் வரம்பு&#39; சரியான குறிப்பிடவும்
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +287,Further cost centers can be made under Groups but entries can be made against non-Groups,மேலும் செலவு மையங்கள் குழுக்கள் கீழ் செய்யப்பட்ட ஆனால் உள்ளீடுகளை அல்லாத குழுக்கள் எதிராகவும் முடியும்
 DocType: Project,External,வெளி
@@ -1867,8 +1801,7 @@
 DocType: Bin,Actual Quantity,உண்மையான அளவு
 DocType: Shipping Rule,example: Next Day Shipping,உதாரணமாக: அடுத்த நாள் கப்பல்
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,இல்லை தொ.இல. {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +563,Your Customers,உங்கள் வாடிக்கையாளர்கள்
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +27,Compression molding,சுருக்க மூடப்பட்ட
+apps/erpnext/erpnext/public/js/setup_wizard.js +303,Your Customers,உங்கள் வாடிக்கையாளர்கள்
 DocType: Leave Block List Date,Block Date,தேதி தடை
 DocType: Sales Order,Not Delivered,அனுப்பப்பட்டது
 ,Bank Clearance Summary,வங்கி இசைவு சுருக்கம்
@@ -1889,10 +1822,10 @@
 DocType: SMS Log,Sent To,அனுப்பப்படும்
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +28,Make Sales Invoice,கவிஞருக்கு செய்ய
 DocType: Company,For Reference Only.,குறிப்பு மட்டும்.
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +29,Invalid {0}: {1},தவறான {0}: {1}
+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,கொள்ளளவு திட்டமிடுதல்
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +49,'From Date' is required,' வரம்பு தேதி ' தேவைப்படுகிறது
+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,புதிய பணியிடத்தை
@@ -1907,7 +1840,7 @@
 DocType: Serial No,Delivery Time,விநியோக நேரம்
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,அன்று Based
 DocType: Item,End of Life,வாழ்க்கை முடிவுக்கு
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +41,Travel,சுற்றுலா
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +41,Travel,சுற்றுலா
 DocType: Leave Block List,Allow Users,பயனர்கள் அனுமதி
 DocType: Purchase Order,Customer Mobile No,வாடிக்கையாளர் கைப்பேசி
 DocType: Sales Invoice,Recurring,ரெக்கியூரிங்
@@ -1921,7 +1854,7 @@
 DocType: Naming Series,User must always select,பயனர் எப்போதும் தேர்ந்தெடுக்க வேண்டும்
 DocType: Stock Settings,Allow Negative Stock,எதிர்மறை பங்கு அனுமதிக்கும்
 DocType: Installation Note,Installation Note,நிறுவல் குறிப்பு
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +541,Add Taxes,வரிகளை சேர்க்க
+apps/erpnext/erpnext/public/js/setup_wizard.js +283,Add Taxes,வரிகளை சேர்க்க
 ,Financial Analytics,நிதி பகுப்பாய்வு
 DocType: Quality Inspection,Verified By,மூலம் சரிபார்க்கப்பட்ட
 DocType: Address,Subsidiary,உப
@@ -1931,7 +1864,6 @@
 DocType: System Settings,In Hours,மணி
 DocType: Process Payroll,Create Salary Slip,சம்பளம் ஸ்லிப் உருவாக்க
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Expected balance as per bank,வங்கி படி எதிர்பார்க்கப்படுகிறது சமநிலை
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +115,Buffing,மெருகேற்றும்
 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,ஊழியர்
@@ -1948,11 +1880,11 @@
 DocType: Rename Tool,File to Rename,மறுபெயர் கோப்புகள்
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +176,Purchse Order number required for Item {0},Purchse ஆணை எண் பொருள் தேவை {0}
 apps/erpnext/erpnext/public/js/controllers/transaction.js +136,Show Payments,காட்டு கொடுப்பனவு
-apps/erpnext/erpnext/controllers/buying_controller.py +245,Specified BOM {0} does not exist for Item {1},பொருள் இருப்பு இல்லை BOM {0} {1}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +202,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,பராமரிப்பு அட்டவணை {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 +197,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,பராமரிப்பு அட்டவணை {0} இந்த விற்பனை ஆணை ரத்து முன் ரத்து செய்யப்பட வேண்டும்
 apps/frappe/frappe/desk/page/backups/backups.html +13,Size,அளவு
 DocType: Notification Control,Expense Claim Approved,இழப்பில் கோரிக்கை ஏற்கப்பட்டது
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +113,Pharmaceutical,மருந்து
+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,விற்பனை ஆர்டர் தேவை
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +30,Create Customer,உருவாக்கு
@@ -1962,7 +1894,6 @@
 DocType: Quality Inspection Reading,Reading 9,9 படித்தல்
 DocType: Supplier,Is Frozen,உறைந்திருக்கும்
 DocType: Buying Settings,Buying Settings,அமைப்புகள் வாங்கும்
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +122,Mass finishing,மாஸ் முடித்த
 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),விற்பனை மின்னஞ்சல் ஐடி அமைப்பு உள்வரும் சர்வர் . (எ. கா: sales@example.com )
@@ -1970,7 +1901,7 @@
 DocType: Payment Tool,Payment Account,கொடுப்பனவு கணக்கு
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +713,Please specify Company to proceed,நிறுவனத்தின் தொடர குறிப்பிடவும்
 apps/frappe/frappe/public/js/frappe/model/indicator.js +30,Draft,காற்று வீச்சு
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +46,Compensatory Off,இழப்பீட்டு இனிய
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Compensatory Off,இழப்பீட்டு இனிய
 DocType: Quality Inspection Reading,Accepted,ஏற்று
 DocType: User,Female,பெண்
 DocType: Journal Entry Account,Debit in Account Currency,கணக்கு நாணய பற்று
@@ -1982,7 +1913,7 @@
 DocType: Shipping Rule,Shipping Rule Label,கப்பல் விதி லேபிள்
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +209,Raw Materials cannot be blank.,மூலப்பொருட்கள் காலியாக இருக்க முடியாது.
 DocType: Newsletter,Test,சோதனை
-apps/erpnext/erpnext/stock/doctype/item/item.py +364,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +368,"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'","இருக்கும் பங்கு பரிவர்த்தனைகள் நீங்கள் மதிப்புகள் மாற்ற முடியாது \ இந்த உருப்படி, உள்ளன &#39;என்பதைப் தொ.எ. உள்ளது&#39;, &#39;தொகுதி எவ்வித&#39;, &#39;பங்கு உருப்படியை&#39; மற்றும் &#39;மதிப்பீட்டு முறை&#39;"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +448,Quick Journal Entry,விரைவு ஜர்னல் நுழைவு
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +92,You can not change rate if BOM mentioned agianst any item,BOM எந்த பொருளை agianst குறிப்பிட்டுள்ள நீங்கள் வீதம் மாற்ற முடியாது
@@ -1993,13 +1924,14 @@
 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.,தனி உற்பத்தி வரிசையில் ஒவ்வொரு முடிக்கப்பட்ட நல்ல உருப்படியை செய்தது.
 DocType: Purchase Invoice,Terms and Conditions1,விதிமுறைகள் மற்றும் Conditions1
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +18,Complete Setup,அமைவு
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard_page.html +18,Complete Setup,அமைவு
 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),அனுமதிப்பதில்லை உராய்வுகள் இந்த சரிபார்க்கவும். (இலக்கங்கள் ஐந்து)
 apps/erpnext/erpnext/config/crm.py +96,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 +57,Total Absent,மொத்த இருக்காது
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +746,Item or Warehouse for row {0} does not match Material Request,வரிசையில் பொருள் அல்லது கிடங்கு {0} பொருள் கோரிக்கை பொருந்தவில்லை
@@ -2024,16 +1956,15 @@
 DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),அடிப்படை வீத (பங்கு UOM படி)
 DocType: SMS Log,No of Requested SMS,கோரப்பட்ட எஸ்எம்எஸ் இல்லை
 DocType: Campaign,Campaign-.####,பிரச்சாரத்தின் . # # # #
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +55,Piercing,குத்திக்கொள்வது
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,அடுத்த படிகள்
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +117,Contract End Date must be greater than Date of Joining,இந்த ஒப்பந்தம் முடிவுக்கு தேதி சேர தேதி விட அதிகமாக இருக்க வேண்டும்
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,கமிஷன் நிறுவனங்கள் பொருட்கள் விற்கும் ஒரு மூன்றாம் தரப்பு விநியோகஸ்தராக / வியாபாரி / கமிஷன் முகவர் / இணைப்பு / விற்பனையாளரை.
 DocType: Customer Group,Has Child Node,குழந்தை கணு உள்ளது
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{0} against Purchase Order {1},{0} கொள்முதல் ஆணை எதிரான {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +332,{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/page/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
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +110,Photochemical machining,போட்டோகெமிக்கல் எந்திர
 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.
 
 #### Note
@@ -2079,7 +2010,7 @@
 DocType: Purchase Receipt Item,Recd Quantity,Recd அளவு
 DocType: Email Account,Email Ids,மின்னஞ்சல் ஐடிகள்
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},மேலும் பொருள் தயாரிக்க முடியாது {0} விட விற்பனை ஆணை அளவு {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +471,Stock Entry {0} is not submitted,பங்கு நுழைவு {0} சமர்ப்பிக்க
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +473,Stock Entry {0} is not submitted,பங்கு நுழைவு {0} சமர்ப்பிக்க
 DocType: Payment Reconciliation,Bank / Cash Account,வங்கி / பண கணக்கு
 DocType: Tax Rule,Billing City,பில்லிங் நகரம்
 DocType: Global Defaults,Hide Currency Symbol,நாணய சின்னம் மறைக்க
@@ -2095,7 +2026,7 @@
 DocType: Purchase Invoice,Currency and Price List,நாணயம் மற்றும் விலை பட்டியல்
 DocType: Opportunity,Customer / Lead Name,வாடிக்கையாளர் / முன்னணி பெயர்
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +63,Clearance Date not mentioned,இசைவு தேதி குறிப்பிடப்படவில்லை
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +71,Production,உற்பத்தி
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Production,உற்பத்தி
 DocType: Item,Allow Production Order,உற்பத்தி ஆர்டர் அனுமதி
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +60,Row {0}:Start Date must be before End Date,ரோ {0} : தொடங்கும் நாள் நிறைவு நாள் முன்னதாக இருக்க வேண்டும்
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),மொத்தம் (அளவு)
@@ -2108,7 +2039,7 @@
 apps/erpnext/erpnext/utilities/doctype/address/address.py +113,My Addresses,என்னுடைய ஒரு முகவரிக்கு
 DocType: Stock Ledger Entry,Outgoing Rate,வெளிச்செல்லும் விகிதம்
 apps/erpnext/erpnext/config/hr.py +100,Organization branch master.,அமைப்பு கிளை மாஸ்டர் .
-apps/erpnext/erpnext/controllers/accounts_controller.py +237, or ,அல்லது
+apps/erpnext/erpnext/controllers/accounts_controller.py +238, 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 மேலே
@@ -2135,6 +2066,7 @@
 DocType: Stock Entry Detail,Serial No / Batch,சீரியல் இல்லை / தொகுப்பு
 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 +213,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',"பராமரிப்பு அட்டவணை அனைத்து பொருட்களின் உருவாக்கப்பட்ட உள்ளது . ' உருவாக்குதல் அட்டவணை ' கிளிக் செய்து,"
 ,To Produce,தயாரிப்பாளர்கள்
 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} சேர்த்துக்கொள்ள வேண்டும்"
@@ -2142,10 +2074,7 @@
 DocType: Bin,Reserved Quantity,ஒதுக்கப்பட்ட அளவு
 DocType: Landed Cost Voucher,Purchase Receipt Items,ரசீது பொருட்கள் வாங்க
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,தனிப்பயனாக்குதலில் படிவங்கள்
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +62,Cutting,கட்டிங்
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +69,Flattening,சமதளமாக
 DocType: Account,Income Account,வருமான கணக்கு
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +22,Molding,மோல்டிங்
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +632,Delivery,டெலிவரி
 DocType: Stock Reconciliation Item,Current Qty,தற்போதைய அளவு
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",பகுதி செயற் கைக்கோள் நிலாவிலிருந்து உள்ள &quot;அடிப்படையில் பொருட்களின் விகிதம்&quot; பார்க்க
@@ -2155,20 +2084,19 @@
 apps/frappe/frappe/desk/moduleview.py +61,Documents,ஆவணங்கள்
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +17,Ref,குறிப்
 DocType: Cost Center,Cost Center,செலவு மையம்
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.js +48,Voucher #,வவுச்சர் #
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +36,Voucher #,வவுச்சர் #
 DocType: Notification Control,Purchase Order Message,ஆர்டர் செய்தி வாங்க
 DocType: Tax Rule,Shipping Country,கப்பல் நாடு
 DocType: Upload Attendance,Upload HTML,HTML பதிவேற்று
-apps/erpnext/erpnext/controllers/accounts_controller.py +391,"Total advance ({0}) against Order {1} cannot be greater \
+apps/erpnext/erpnext/controllers/accounts_controller.py +392,"Total advance ({0}) against Order {1} cannot be greater \
 				than the Grand Total ({2})","மொத்த முன்கூட்டியே ({0}) அமைப்புக்கு எதிராக {1} \
  அதிகமாக இருக்க முடியும் ஆக மொத்தம் விட ({2})"
 DocType: Employee,Relieving Date,தேதி நிவாரணத்தில்
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +12,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.","விலை விதி சில அடிப்படை அடிப்படையில், விலை பட்டியல் / தள்ளுபடி சதவீதம் வரையறுக்க மேலெழுத செய்யப்படுகிறது."
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,கிடங்கு மட்டுமே பங்கு நுழைவு / டெலிவரி குறிப்பு / கொள்முதல் ரசீது மூலம் மாற்ற முடியும்
 DocType: Employee Education,Class / Percentage,வர்க்கம் / சதவீதம்
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +92,Head of Marketing and Sales,சந்தைப்படுத்தல் மற்றும் விற்பனை தலைவர்
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +31,Income Tax,வருமான வரி
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +157,Laser engineered net shaping,லேசர் நிகர வடிவமைப்பதில் வடிவமைக்கப்பட்டுள்ளன
+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.,ட்ராக் தொழில் வகை செல்கிறது.
 DocType: Item Supplier,Item Supplier,உருப்படியை சப்ளையர்
@@ -2191,31 +2119,28 @@
 DocType: Stock Ledger Entry,Actual Qty After Transaction,பரிவர்த்தனை பிறகு உண்மையான அளவு
 ,Pending SO Items For Purchase Request,கொள்முதல் கோரிக்கை நிலுவையில் எனவே விடயங்கள்
 DocType: Supplier,Billing Currency,பில்லிங் நாணய
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +148,Extra Large,மிகப் பெரியவை
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,Extra Large,மிகப் பெரியவை
 ,Profit and Loss Statement,இலாப நட்ட அறிக்கை
 DocType: Bank Reconciliation Detail,Cheque Number,காசோலை எண்
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +43,Pressing,"அழுத்தினால்,"
 DocType: Payment Tool Detail,Payment Tool Detail,கொடுப்பனவு கருவி விபரம்
 ,Sales Browser,விற்னையாளர் உலாவி
 DocType: Journal Entry,Total Credit,மொத்த கடன்
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +474,Warning: Another {0} # {1} exists against stock entry {2},எச்சரிக்கை: மற்றொரு {0} # {1} பங்கு நுழைவதற்கு எதிராக உள்ளது {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +459,Local,உள்ளூர்
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +476,Warning: Another {0} # {1} exists against stock entry {2},எச்சரிக்கை: மற்றொரு {0} # {1} பங்கு நுழைவதற்கு எதிராக உள்ளது {2}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +397,Local,உள்ளூர்
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),கடன்கள் ( சொத்துக்கள் )
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,"இருப்பினும், கடனாளிகள்"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +147,Large,பெரிய
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +23,No employee found!,இல்லை ஊழியர் இல்லை!
+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 +152,Please mention no of visits required,குறிப்பிட தயவுசெய்து தேவையான வருகைகள் எந்த
 DocType: Purchase Order,Customer Address Display,வாடிக்கையாளர் முகவரி காட்சி
 DocType: Stock Settings,Default Valuation Method,முன்னிருப்பு மதிப்பீட்டு முறை
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +127,Polishing,பாலிஷ்
 DocType: Production Order Operation,Planned Start Time,திட்டமிட்ட தொடக்க நேரம்
 apps/erpnext/erpnext/config/accounts.py +63,Close Balance Sheet and book Profit or Loss.,Close இருப்புநிலை மற்றும் புத்தகம் லாபம் அல்லது நஷ்டம் .
-apps/erpnext/erpnext/stock/doctype/item/item.py +661,"Default Unit of Measure for Item {0} cannot be changed directly because \
+apps/erpnext/erpnext/stock/doctype/item/item.py +665,"Default Unit of Measure for Item {0} cannot be changed directly because \
 			you have already made some transaction(s) with another UOM. To change default UOM, \
 			use 'UOM Replace Utility' tool under Stock module.","நீங்கள் ஏற்கனவே மற்றொரு UOM சில பரிவர்த்தனை (ங்கள்) செய்துவிட்டேன் \ ஏனெனில் பொருள் நடவடிக்கையாக, இயல்புநிலை பிரிவு {0} நேரடியாக மாற்ற முடியாது. இயல்புநிலை UOM மாற்ற, \ பயன்படுத்த பங்கு தொகுதி கீழ் கருவி &#39;UOM பயனீட்டு மாற்றவும்."
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,நாணயமாற்று வீத மற்றொரு வகையில் ஒரு நாணயத்தை மாற்ற குறிப்பிடவும்
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +146,Quotation {0} is cancelled,மேற்கோள் {0} ரத்து
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +141,Quotation {0} is cancelled,மேற்கோள் {0} ரத்து
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,மொத்த நிலுவை தொகை
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} was on leave on {1}. Cannot mark attendance.,பணியாளர் {0} {1} ம் விடுப்பு இருந்தது. வருகை குறிக்க முடியாது.
 DocType: Sales Partner,Targets,இலக்குகள்
@@ -2226,7 +2151,6 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +158,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,கணினி
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +112,Electro-chemical grinding,மின்-ரசாயன அரைக்கும்
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +14,This is a root customer group and cannot be edited.,இந்த ஒரு ரூட் வாடிக்கையாளர் குழு மற்றும் திருத்த முடியாது .
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +39,Please setup your chart of accounts before you start Accounting Entries,நீங்கள் கணக்கியல் உள்ளீடுகள் தொடங்கும் முன் அமைப்பு உங்கள் மீது கணக்குகளின் அட்டவணை ப்ளீஸ்
 DocType: Purchase Invoice,Ignore Pricing Rule,விலை சொல்கிறேன்
@@ -2284,7 +2208,6 @@
 DocType: Maintenance Visit,Purposes,நோக்கங்கள்
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +103,Atleast one item should be entered with negative quantity in return document,குறைந்தபட்சம் ஒரு பொருளை திருப்பி ஆவணம் எதிர்மறை அளவு உள்ளிட்ட
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +67,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","ஆபரேஷன் {0} பணிநிலையம் உள்ள எந்த கிடைக்க வேலை மணி நேரத்திற்கு {1}, பல நடவடிக்கைகளில் அறுவை சிகிச்சை உடைந்து"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +134,Electrochemical machining,மின்வேதியியல் எந்திர
 ,Requested,கோரப்பட்ட
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +66,No Remarks,எந்த கருத்துக்கள்
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +13,Overdue,காலங்கடந்த
@@ -2293,7 +2216,7 @@
 DocType: Monthly Distribution,Distribution Name,விநியோக பெயர்
 DocType: Features Setup,Sales and Purchase,விற்பனை மற்றும் கொள்முதல்
 DocType: Supplier Quotation Item,Material Request No,பொருள் வேண்டுகோள் இல்லை
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +218,Quality Inspection required for Item {0},பொருள் தேவை தரமான ஆய்வு {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +221,Quality Inspection required for Item {0},பொருள் தேவை தரமான ஆய்வு {0}
 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),நிகர விகிதம் (நிறுவனத்தின் நாணயம்)
@@ -2311,9 +2234,8 @@
 apps/erpnext/erpnext/accounts/report/financial_statements.py +16,Fiscal Year {0} not found.,நிதியாண்டு {0} காணப்படும்.
 DocType: Bank Reconciliation,Get Relevant Entries,தொடர்புடைய பதிவுகள் பெற
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +407,Accounting Entry for Stock,பங்கு பைனான்ஸ் நுழைவு
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +64,Coining,கோர்ர்க்கும்
 DocType: Sales Invoice,Sales Team1,விற்பனை Team1
-apps/erpnext/erpnext/stock/doctype/item/item.py +412,Item {0} does not exist,பொருள் {0} இல்லை
+apps/erpnext/erpnext/stock/doctype/item/item.py +416,Item {0} does not exist,பொருள் {0} இல்லை
 DocType: Sales Invoice,Customer Address,வாடிக்கையாளர் முகவரி
 apps/frappe/frappe/desk/query_report.py +136,Total,மொத்தம்
 DocType: Purchase Invoice,Apply Additional Discount On,கூடுதல் தள்ளுபடி விண்ணப்பிக்கவும்
@@ -2325,14 +2247,13 @@
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),தள்ளுபடி தொகை பின்னர் வரி அளவு (நிறுவனத்தின் நாணயம்)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +149,Target warehouse is mandatory for row {0},இலக்கு கிடங்கில் வரிசையில் கட்டாய {0}
 DocType: Quality Inspection,Quality Inspection,தரமான ஆய்வு
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +144,Extra Small,கூடுதல் சிறிய
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +20,Spray forming,உருவாக்கும் தெளிக்கவும்
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Extra Small,கூடுதல் சிறிய
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +458,Warning: Material Requested Qty is less than Minimum Order Qty,எச்சரிக்கை : அளவு கோரப்பட்ட பொருள் குறைந்தபட்ச ஆணை அளவு குறைவாக உள்ளது
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +191,Account {0} is frozen,கணக்கு {0} உறைந்திருக்கும்
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,நிறுவனத்திற்கு சொந்தமான கணக்குகள் ஒரு தனி விளக்கப்படம் சட்ட நிறுவனம் / துணைநிறுவனத்திற்கு.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +29,"Food, Beverage & Tobacco","உணவு , குளிர்பானங்கள் & புகையிலை"
+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 +529,Can only make payment against unbilled {0},மட்டுமே எதிரான கட்டணம் செய்யலாம் unbilled {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +531,Can only make payment against unbilled {0},மட்டுமே எதிரான கட்டணம் செய்யலாம் unbilled {0}
 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,உள் ஒப்பந்தம்
@@ -2343,19 +2264,18 @@
 DocType: Item,Manufacturer Part Number,தயாரிப்பாளர் பாகம் எண்
 DocType: Production Order Operation,Estimated Time and Cost,கணக்கிடப்பட்ட நேரம் மற்றும் செலவு
 DocType: Bin,Bin,தொட்டி
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +50,Nosing,Nosing
 DocType: SMS Log,No of Sent SMS,அனுப்பிய எஸ்எம்எஸ் இல்லை
 DocType: Account,Company,நிறுவனம்
 DocType: Account,Expense Account,செலவு கணக்கு
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +49,Software,மென்பொருள்
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +151,Colour,வர்ண
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +49,Software,மென்பொருள்
+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","&quot;இல்லை&quot; மற்றும் &quot;விற்பனை பொருள் இது&quot;, &quot;பங்கு உருப்படியை&quot; எங்கே &quot;ஆம்&quot; என்று பொருள் தேர்ந்தெடுக்க மற்றும் வேறு எந்த தயாரிப்பு மூட்டை உள்ளது செய்க"
 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 +281,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 +134,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 +145,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,பதிவு மறுபெயர்
@@ -2365,7 +2285,7 @@
 apps/erpnext/erpnext/controllers/recurring_document.py +162,Please select {0},தேர்வு செய்க {0}
 DocType: C-Form,C-Form No,இல்லை சி படிவம்
 DocType: BOM,Exploded_items,Exploded_items
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +95,Researcher,ஆராய்ச்சியாளர்
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Researcher,ஆராய்ச்சியாளர்
 apps/frappe/frappe/custom/doctype/customize_form/customize_form.js +88,Update,புதுப்பிக்க
 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 +23,Name or Email is mandatory,பெயர் அல்லது மின்னஞ்சல் அத்தியாவசியமானதாகும்
@@ -2374,11 +2294,10 @@
 DocType: Employee,Exit,மரணம்
 apps/erpnext/erpnext/accounts/doctype/account/account.py +134,Root Type is mandatory,ரூட் வகை கட்டாய ஆகிறது
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +295,Serial No {0} created,தொடர் இல {0} உருவாக்கப்பட்டது
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +125,Vibratory finishing,அதிர்வுண்டாக்குகிற முடித்த
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","வாடிக்கையாளர்களின் வசதிக்காக, இந்த குறியீடுகள் பற்றுச்சீட்டுகள் மற்றும் டெலிவரி குறிப்புகள் போன்ற அச்சு வடிவங்கள் பயன்படுத்த முடியும்"
 DocType: Employee,You can enter any date manually,நீங்கள் கைமுறையாக எந்த தேதி நுழைய முடியும்
 DocType: Sales Invoice,Advertisement,விளம்பரம்
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +165,Probationary Period,ப்ரொபேஷ்னரி காலம்
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Probationary Period,ப்ரொபேஷ்னரி காலம்
 DocType: Customer Group,Only leaf nodes are allowed in transaction,ஒரே இலை முனைகள் பரிமாற்றத்தில் அனுமதிக்கப்படுகிறது
 DocType: Expense Claim,Expense Approver,செலவின தரப்பில் சாட்சி
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,கொள்முதல் ரசீது பொருள் வழங்கியது
@@ -2386,19 +2305,16 @@
 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/setup/page/setup_wizard/fixtures/operations.py +137,Grinding,அரைக்கும்
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +34,Shrink wrapping,போர்த்தி சுருக்கு
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +36,Pending Activities,நிலுவையில் நடவடிக்கைகள்
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,Confirmed,உறுதிப்படுத்தப்பட்டுள்ளதாகவும்
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier > Supplier Type,வழங்குபவர்> வழங்குபவர் வகை
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +127,Please enter relieving date.,தேதி நிவாரணத்தில் உள்ளிடவும்.
 apps/erpnext/erpnext/controllers/trends.py +137,Amt,விவரங்கள்
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' can be submitted,மட்டுமே சமர்ப்பிக்க முடியும் ' அங்கீகரிக்கப்பட்ட ' நிலை பயன்பாடுகள் விட்டு
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +51,Only Leave Applications with status 'Approved' can be submitted,மட்டுமே சமர்ப்பிக்க முடியும் ' அங்கீகரிக்கப்பட்ட ' நிலை பயன்பாடுகள் விட்டு
 apps/erpnext/erpnext/utilities/doctype/address/address.py +21,Address Title is mandatory.,முகவரி தலைப்பு கட்டாயமாகும்.
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,விசாரணை மூலம் பிரச்சாரம் என்று பிரச்சாரம் பெயரை உள்ளிடவும்
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +38,Newspaper Publishers,பத்திரிகை வெளியீட்டாளர்கள்
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +38,Newspaper Publishers,பத்திரிகை வெளியீட்டாளர்கள்
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,நிதியாண்டு வாய்ப்புகள்
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +88,Smelting,உருக்கு
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,மறுவரிசைப்படுத்துக நிலை
 DocType: Attendance,Attendance Date,வருகை தேதி
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,சம்பளம் கலைத்தல் வருமானம் மற்றும் துப்பறியும் அடிப்படையாக கொண்டது.
@@ -2413,16 +2329,15 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +414,[Error],[பிழை]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,நீங்கள் விற்பனை ஆணை சேமிக்க முறை சொற்கள் காணக்கூடியதாக இருக்கும்.
 ,Employee Birthday,பணியாளர் பிறந்தநாள்
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +55,Venture Capital,துணிகர முதலீடு
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,துணிகர முதலீடு
 DocType: UOM,Must be Whole Number,முழு எண் இருக்க வேண்டும்
 DocType: Leave Control Panel,New Leaves Allocated (In Days),புதிய இலைகள் (டேஸ்) ஒதுக்கப்பட்ட
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +51,Serial No {0} does not exist,தொடர் இல {0} இல்லை
 DocType: Pricing Rule,Discount Percentage,தள்ளுபடி சதவீதம்
 DocType: Payment Reconciliation Invoice,Invoice Number,விலைப்பட்டியல் எண்
-apps/erpnext/erpnext/hooks.py +70,Orders,ஆணைகள்
+apps/erpnext/erpnext/hooks.py +54,Orders,ஆணைகள்
 DocType: Leave Control Panel,Employee Type,பணியாளர் அமைப்பு
 DocType: Employee Leave Approver,Leave Approver,சர்க்கார் தரப்பில் சாட்சி விட்டு
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +70,Swaging,Swaging
 DocType: Manufacturing Settings,Material Transferred for Manufacture,பொருள் உற்பத்தி மாற்றப்பட்டது
 DocType: Expense Claim,"A user with ""Expense Approver"" role","""மன்றங்கள்கூட தரப்பில் சாட்சி"" பாத்திரம் ஒரு பயனர்"
 ,Issued Items Against Production Order,உற்பத்தி ஆர்டர் எதிராக வழங்கப்படும் பொருட்கள்
@@ -2434,7 +2349,6 @@
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +62,Cost Center with existing transactions can not be converted to group,ஏற்கனவே பரிவர்த்தனைகள் செலவு மையம் குழு மாற்றப்பட முடியாது
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Depreciation,மதிப்பிறக்கம் தேய்மானம்
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),வழங்குபவர் (கள்)
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +29,Invalid period,தவறான காலம்
 DocType: Customer,Credit Limit,கடன் எல்லை
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,பரிவர்த்தனை தேர்ந்தெடுக்கவும்
 DocType: GL Entry,Voucher No,ரசீது இல்லை
@@ -2444,9 +2358,9 @@
 DocType: Customer,Address and Contact,முகவரி மற்றும் தொடர்பு
 DocType: Customer,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}"
 apps/erpnext/erpnext/accounts/party.py +284,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),குறிப்பு: / குறிப்பு தேதி {0} நாள் அனுமதிக்கப்பட்ட வாடிக்கையாளர் கடன் அதிகமாகவும் (கள்)
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +621,Maint. Schedule,Maint. அட்டவணை
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +108,Abrasive jet machining,சிராய்ப்பு ஜெட் எந்திர
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +632,Maint. Schedule,Maint. அட்டவணை
 DocType: Stock Settings,Freeze Stock Entries,பங்கு பதிவுகள் நிறுத்தப்படலாம்
 DocType: Website Settings,Website Settings,இணைய அமைப்புகள்
 DocType: Item,Reorder level based on Warehouse,கிடங்கில் அடிப்படையில் மறுவரிசைப்படுத்துக நிலை
@@ -2463,7 +2377,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +75,Show Stock Entries,காட்டு பங்கு பதிவுகள்
 ,Is Primary Address,முதன்மை முகவரி
 DocType: Production Order,Work-in-Progress Warehouse,"வேலை, செயலில் கிடங்கு"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +308,Reference #{0} dated {1},குறிப்பு # {0} தேதியிட்ட {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Reference #{0} dated {1},குறிப்பு # {0} தேதியிட்ட {1}
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +13,Manage Addresses,முகவரிகள் நிர்வகிக்கவும்
 DocType: Pricing Rule,Item Code,உருப்படியை கோட்
 DocType: Production Planning Tool,Create Production Orders,உற்பத்தி ஆணைகள் உருவாக்க
@@ -2472,7 +2386,7 @@
 DocType: Lead,Market Segment,சந்தை பிரிவு
 DocType: Communication,Phone,தொலைபேசி
 DocType: Employee Internal Work History,Employee Internal Work History,ஊழியர் உள்நாட்டு வேலை வரலாறு
-apps/erpnext/erpnext/public/js/account_tree_grid.js +50,Closing (Dr),நிறைவு (டாக்டர்)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +221,Closing (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.,பரிவர்த்தனைகள் விற்பனை வரி வார்ப்புரு .
@@ -2488,8 +2402,8 @@
 ,Billed Amount,கூறப்படுவது தொகை
 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 +129,Material Request {0} is cancelled or stopped,பொருள் கோரிக்கை {0} ரத்து அல்லது நிறுத்தி
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +641,Add a few sample records,ஒரு சில மாதிரி பதிவுகளை சேர்க்கவும்
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +133,Material Request {0} is cancelled or stopped,பொருள் கோரிக்கை {0} ரத்து அல்லது நிறுத்தி
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Add a few sample records,ஒரு சில மாதிரி பதிவுகளை சேர்க்கவும்
 apps/erpnext/erpnext/config/hr.py +210,Leave Management,மேலாண்மை விடவும்
 DocType: Event,Groups,குழுக்கள்
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,கணக்கு குழு
@@ -2502,38 +2416,34 @@
 DocType: Features Setup,Sales Extras,விற்பனை உபரி
 apps/erpnext/erpnext/accounts/utils.py +344,{0} budget for Account {1} against Cost Center {2} will exceed by {3},{0} கணக்கு வரவு செலவு {1} செலவு மையம் எதிரான {2} {3} அதிகமாக இருக்கும்
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +236,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry",இந்த பங்கு நல்லிணக்க ஒரு தொடக்க நுழைவு என்பதால் வேறுபாடு அக்கவுண்ட் சொத்து / பொறுப்பு வகை கணக்கு இருக்க வேண்டும்
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +138,Purchase Order number required for Item {0},கொள்முதல் ஆணை எண் பொருள் தேவை {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Order number required for Item {0},கொள்முதல் ஆணை எண் பொருள் தேவை {0}
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',' வரம்பு தேதி ' தேதி ' பிறகு இருக்க வேண்டும்
 ,Stock Projected Qty,பங்கு அளவு திட்டமிடப்பட்ட
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +147,Customer {0} does not belong to project {1},வாடிக்கையாளர் {0} திட்டம் அல்ல {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +150,Customer {0} does not belong to project {1},வாடிக்கையாளர் {0} திட்டம் அல்ல {1}
 DocType: Sales Order,Customer's Purchase Order,வாடிக்கையாளர் கொள்முதல் ஆணை
 DocType: Warranty Claim,From Company,நிறுவனத்தின் இருந்து
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,மதிப்பு அல்லது அளவு
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Minute,நிமிஷம்
+apps/erpnext/erpnext/public/js/setup_wizard.js +363,Minute,நிமிஷம்
 DocType: Purchase Invoice,Purchase Taxes and Charges,கொள்முதல் வரி மற்றும் கட்டணங்கள்
 ,Qty to Receive,மதுரையில் அளவு
 DocType: Leave Block List,Leave Block List Allowed,அனுமதிக்கப்பட்ட பிளாக் பட்டியல் விட்டு
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +61,Conversion factor cannot be in fractions,மாற்ற காரணி உராய்வுகள் இருக்க முடியாது
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +358,You will use it to Login,நீங்கள் உள்நுழைய அதை பயன்படுத்த வேண்டும்
+apps/erpnext/erpnext/public/js/setup_wizard.js +108,You will use it to Login,நீங்கள் உள்நுழைய அதை பயன்படுத்த வேண்டும்
 DocType: Sales Partner,Retailer,சில்லறை
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +99,Credit To account must be a Balance Sheet account,கணக்கில் பணம் வரவு ஒரு ஐந்தொகை கணக்கில் இருக்க வேண்டும்
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,அனைத்து வழங்குபவர் வகைகள்
 apps/erpnext/erpnext/stock/doctype/item/item.py +37,Item Code is mandatory because Item is not automatically numbered,பொருள் தானாக எண் ஏனெனில் பொருள் கோட் கட்டாய ஆகிறது
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +99,Quotation {0} not of type {1},மேற்கோள் {0} அல்ல வகை {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +93,Quotation {0} not of type {1},மேற்கோள் {0} அல்ல வகை {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,பராமரிப்பு அட்டவணை உருப்படி
 DocType: Sales Order,%  Delivered,அனுப்பப்பட்டது%
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,Bank Overdraft Account,வங்கி மிகைஎடுப்பு கணக்கு
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +15,Make Salary Slip,சம்பள செய்ய
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +18,Browse BOM,"உலவ BOM,"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +175,Secured Loans,பிணை கடன்கள்
-apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +3,Awesome Products,அழகிய பொருட்களை
+apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +3,Awesome Products,அழகிய பொருட்களை
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +189,Opening Balance Equity,திறப்பு இருப்பு ஈக்விட்டி
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +80,Cannot approve leave as you are not authorized to approve leaves on Block Dates,நீங்கள் பிளாக் தேதிகளில் இலைகள் ஒப்புதல் அங்கீகாரம் இல்லை விடுப்பு அங்கீகரிக்க முடியாது
 DocType: Appraisal,Appraisal,மதிப்பிடுதல்
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +13,Lost-foam casting,லாஸ்ட்-நுரை நடிப்பதற்கு
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +47,Drawing,வரைதல்
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +22,Date is repeated,தேதி மீண்டும்
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +148,Leave approver must be one of {0},"விட்டு வீடு, ஒன்றாக இருக்க வேண்டும் {0}"
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +162,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,தொடக்க நேரம்
@@ -2547,7 +2457,7 @@
 DocType: Purchase Invoice Item,Net Amount (Company Currency),நிகர (நிறுவனத்தின் நாணயம்)
 DocType: BOM Operation,Hour Rate,மணி விகிதம்
 DocType: Stock Settings,Item Naming By,மூலம் பெயரிடுதல் உருப்படியை
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +642,From Quotation,கூறியவை
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +655,From Quotation,கூறியவை
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},மற்றொரு காலம் நிறைவு நுழைவு {0} பின்னர் செய்யப்பட்ட {1}
 DocType: Production Order,Material Transferred for Manufacturing,பொருள் தயாரிப்பு இடமாற்றம்
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +29,Account {0} does not exists,கணக்கு {0} இல்லை உள்ளது
@@ -2561,21 +2471,19 @@
 DocType: Purchase Invoice Item,PR Detail,PR விரிவாக
 DocType: Sales Order,Fully Billed,முழுமையாக வசூலிக்கப்படும்
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +20,Cash In Hand,கைப்பணம்
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +72,Delivery warehouse required for stock item {0},டெலிவரி கிடங்கு பங்கு உருப்படியை தேவையான {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +119,Delivery warehouse required for stock item {0},டெலிவரி கிடங்கு பங்கு உருப்படியை தேவையான {0}
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),தொகுப்பின் மொத்த எடை. பொதுவாக நிகர எடை + பேக்கேஜிங் பொருட்கள் எடை. (அச்சுக்கு)
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,இந்த பங்களிப்பை செய்த உறைந்த கணக்குகள் எதிராக கணக்கியல் உள்ளீடுகள் மாற்ற / உறைந்த கணக்குகள் அமைக்க உருவாக்க அனுமதி
 DocType: Serial No,Is Cancelled,ரத்து
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +281,My Shipments,என் படுவதற்கு
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +286,My Shipments,என் படுவதற்கு
 DocType: Journal Entry,Bill Date,பில் தேதி
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +43,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","அதிகபட்ச முன்னுரிமை கொண்ட பல விலை விதிகள் உள்ளன என்றால், பின் பின்வரும் உள் முன்னுரிமைகள் பயன்படுத்தப்படும்:"
 DocType: Supplier,Supplier Details,வழங்குபவர் விவரம்
 DocType: Communication,Recipients,பெறுநர்கள்
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +146,Screwing,Screwing
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +96,Knurling,பொளை
 DocType: Expense Claim,Approval Status,ஒப்புதல் நிலைமை
 DocType: Hub Settings,Publish Items to Hub,மையம் வெளியிடு
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +44,From value must be less than to value in row {0},மதிப்பு வரிசையில் மதிப்பு குறைவாக இருக்க வேண்டும் {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +133,Wire Transfer,வயர் மாற்றம்
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +133,Wire Transfer,வயர் மாற்றம்
 apps/erpnext/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py +25,Please select Bank Account,வங்கி கணக்கு தேர்ந்தெடுக்கவும்
 DocType: Newsletter,Create and Send Newsletters,உருவாக்க மற்றும் அனுப்பவும் செய்தி
 apps/frappe/frappe/public/js/frappe/views/reports/grid_report.js +305,From Date must be before To Date,தேதி முதல் தேதி முன் இருக்க வேண்டும்
@@ -2583,14 +2491,14 @@
 DocType: Company,Default Income Account,முன்னிருப்பு வருமானம் கணக்கு
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,வாடிக்கையாளர் குழு / வாடிக்கையாளர்
 DocType: Item Group,Check this if you want to show in website,நீங்கள் இணையதளத்தில் காட்ட வேண்டும் என்றால் இந்த சோதனை
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +190,Welcome to ERPNext,ERPNext வரவேற்கிறோம்
+,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/page/setup_wizard/install_fixtures.py +37,Calls,கால்ஸ்
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Calls,கால்ஸ்
 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 +193,Purchase Order {0} is not submitted,கொள்முதல் ஆணை {0} சமர்ப்பிக்க
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +194,Purchase Order {0} is not submitted,கொள்முதல் ஆணை {0} சமர்ப்பிக்க
 ,Projected,திட்டமிடப்பட்ட
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},தொடர் இல {0} கிடங்கு அல்ல {1}
 apps/erpnext/erpnext/controllers/status_updater.py +136,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,"குறிப்பு: இந்த அமைப்பு பொருள் விநியோகம் , மேல் முன்பதிவு பார்க்க மாட்டேன் {0} அளவு அல்லது அளவு 0 ஆகிறது"
@@ -2598,7 +2506,6 @@
 DocType: Issue,Opening Date,தேதி திறப்பு
 DocType: Journal Entry,Remark,குறிப்பு
 DocType: Purchase Receipt Item,Rate and Amount,விகிதம் மற்றும் தொகை
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +95,Boring,போரிங்
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +667,From Sales Order,விற்பனை ஆர்டர் இருந்து
 DocType: Blog Category,Parent Website Route,பெற்றோர் இணையத்தளம் வழி
 DocType: Sales Order,Not Billed,கட்டணம்
@@ -2612,19 +2519,17 @@
 apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount Amount,தள்ளுபடி தொகை
 DocType: Purchase Invoice,Return Against Purchase Invoice,எதிராக கொள்முதல் விலைப்பட்டியல் திரும்ப
 DocType: Item,Warranty Period (in days),உத்தரவாதத்தை காலம் (நாட்கள்)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +550,e.g. VAT,"உதாரணமாக, வரி"
+apps/erpnext/erpnext/public/js/setup_wizard.js +292,e.g. VAT,"உதாரணமாக, வரி"
 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,மேற்கோள் தொடர்
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +52,"An item exists with same name ({0}), please change the item group name or rename the item","ஒரு பொருளை ( {0} ) , உருப்படி குழு பெயர் மாற்ற அல்லது மறுபெயரிட தயவு செய்து அதே பெயரில்"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +82,Hot metal gas forming,உருவாக்கும் ஹாட் மெட்டல் எரிவாயு
 DocType: Sales Order Item,Sales Order Date,விற்பனை ஆர்டர் தேதி
 DocType: Sales Invoice Item,Delivered Qty,வழங்கப்படும் அளவு
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +63,Warehouse {0}: Company is mandatory,கிடங்கு {0}: நிறுவனத்தின் கட்டாய ஆகிறது
 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.",வரி விகிதம் பற்றி அதற்கான குழு (நிதிகள்&gt; நடப்பு சொத்துகள்&gt; வரி மற்றும் கடமைகள் வழக்கமாக மூலத்தின் சென்று வகை &quot;வரி&quot; என்ற) குழந்தை சேர் கிளிக் செய்வதன் மூலம் (ஒரு புதிய கணக்கு உருவாக்க மற்றும் செய்ய.
 ,Payment Period Based On Invoice Date,விலைப்பட்டியல் தேதியின் அடிப்படையில் கொடுப்பனவு காலம்
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +50,Missing Currency Exchange Rates for {0},காணாமல் செலாவணி விகிதங்கள் {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +135,Laser cutting,லேசர் வெட்டும்
 DocType: Event,Monday,திங்கட்கிழமை
 DocType: Journal Entry,Stock Entry,பங்கு நுழைவு
 DocType: Account,Payable,செலுத்த வேண்டிய
@@ -2657,7 +2562,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +111,Date Of Retirement must be greater than Date of Joining,ஓய்வு நாள் சேர தேதி விட அதிகமாக இருக்க வேண்டும்
 DocType: Sales Invoice,Against Income Account,வருமான கணக்கு எதிராக
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +69,{0}% Delivered,{0}% வழங்கப்படுகிறது
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +78,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,பொருள் {0}: உத்தரவிட்டார் அளவு {1} குறைந்தபட்ச வரிசை அளவு {2} (உருப்படியை வரையறுக்கப்பட்ட) விட குறைவாக இருக்க முடியாது.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,பொருள் {0}: உத்தரவிட்டார் அளவு {1} குறைந்தபட்ச வரிசை அளவு {2} (உருப்படியை வரையறுக்கப்பட்ட) விட குறைவாக இருக்க முடியாது.
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,மாதாந்திர விநியோகம் சதவீதம்
 DocType: Territory,Territory Targets,மண்டலம் இலக்குகள்
 DocType: Delivery Note,Transporter Info,போக்குவரத்து தகவல்
@@ -2666,7 +2571,6 @@
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,"அச்சு வார்ப்புருக்கள் தலைப்புகள் , எ.கா. செய்யறதுன்னு ."
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +140,Valuation type charges can not marked as Inclusive,மதிப்பீட்டு வகை குற்றச்சாட்டுக்கள் உள்ளீடான என குறிக்கப்பட்டுள்ளன
 DocType: POS Profile,Update Stock,பங்கு புதுப்பிக்க
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +128,Superfinishing,Superfinishing
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,பொருட்களை பல்வேறு மொறட்டுவ பல்கலைகழகம் தவறான ( மொத்த ) நிகர எடை மதிப்பு வழிவகுக்கும். ஒவ்வொரு பொருளின் நிகர எடை அதே மொறட்டுவ பல்கலைகழகம் உள்ளது என்று உறுதி.
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM விகிதம்
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +85,Please pull items from Delivery Note,"டெலிவரி குறிப்பு இருந்து உருப்படிகள் இழுக்க , தயவு செய்து"
@@ -2681,7 +2585,6 @@
 ,Purchase Analytics,கொள்முதல் ஆய்வு
 DocType: Sales Invoice Item,Delivery Note Item,டெலிவரி குறிப்பு பொருள்
 DocType: Expense Claim,Task,பணி
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +57,Shaving,சவர
 DocType: Purchase Taxes and Charges,Reference Row #,குறிப்பு வரிசை #
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},தொகுதி எண் பொருள் கட்டாயமாக {0}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js +14,This is a root sales person and cannot be edited.,இந்த ஒரு ரூட் விற்பனை நபர் மற்றும் திருத்த முடியாது .
@@ -2693,13 +2596,11 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +74,Purpose must be one of {0},நோக்கம் ஒன்றாக இருக்க வேண்டும் {0}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +108,Fill the form and save it,"படிவத்தை பூர்த்தி செய்து, அதை காப்பாற்ற"
 DocType: Production Planning Tool,Download a report containing all raw materials with their latest inventory status,அவர்களின் சமீபத்திய சரக்கு நிலை அனைத்து மூலப்பொருட்கள் கொண்ட ஒரு அறிக்கையை பதிவிறக்கு
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +94,Facing,எதிர்கொள்ளும்
 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: Time Log,Billable,பில்
-DocType: Authorization Rule,This will be used for setting rule in HR module,இந்த அலுவலக தொகுதி உள்ள அமைப்பு விதி பயன்படுத்தப்படும்
 DocType: Account,Rate at which this tax is applied,இந்த வரி செலுத்தப்படுகிறது விகிதத்தில்
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reorder Qty,மறுவரிசைப்படுத்துக அளவு
 DocType: Company,Stock Adjustment Account,பங்கு சரிசெய்தல் கணக்கு
@@ -2726,16 +2627,15 @@
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,சதவீதம் ஒதுக்கீடு 100% சமமாக இருக்க வேண்டும்
 DocType: Serial No,Out of AMC,AMC வெளியே
 DocType: Purchase Order Item,Material Request Detail No,பொருள் கோரிக்கை விரிவாக இல்லை
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +97,Hard turning,ஹார்ட் திருப்பு
 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 +79,Company (not Customer or Supplier) master.,நிறுவனத்தின் ( இல்லை வாடிக்கையாளருக்கு அல்லது வழங்குநருக்கு ) மாஸ்டர் .
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +106,Please enter 'Expected Delivery Date',' எதிர்பார்த்த டெலிவரி தேதி ' உள்ளிடவும்
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +187,Delivery Notes {0} must be cancelled before cancelling this Sales Order,டெலிவரி குறிப்புகள் {0} இந்த விற்பனை ஆணை ரத்து முன் ரத்து செய்யப்பட வேண்டும்
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +100,Please enter 'Expected Delivery Date',' எதிர்பார்த்த டெலிவரி தேதி ' உள்ளிடவும்
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +182,Delivery Notes {0} must be cancelled before cancelling this Sales Order,டெலிவரி குறிப்புகள் {0} இந்த விற்பனை ஆணை ரத்து முன் ரத்து செய்யப்பட வேண்டும்
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +373,Paid amount + Write Off Amount can not be greater than Grand Total,பணம் அளவு + அளவு தள்ளுபடி கிராண்ட் மொத்த விட முடியாது
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} உருப்படி ஒரு செல்லுபடியாகும் தொகுதி எண் அல்ல {1}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,Note: There is not enough leave balance for Leave Type {0},குறிப்பு: விடுப்பு வகை போதுமான விடுப்பு சமநிலை இல்லை {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +124,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,வாய்ப்பு வகை
@@ -2747,7 +2647,7 @@
 DocType: Hub Settings,Publish Availability,கிடைக்கும் வெளியிடு
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +105,Date of Birth cannot be greater than today.,பிறந்த தேதி இன்று விட அதிகமாக இருக்க முடியாது.
 ,Stock Ageing,பங்கு மூப்படைதலுக்கான
-apps/erpnext/erpnext/controllers/accounts_controller.py +200,{0} '{1}' is disabled,{0} {1} 'முடக்கப்பட்டுள்ளது
+apps/erpnext/erpnext/controllers/accounts_controller.py +201,{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.,சமர்ப்பிக்கும் பரிமாற்றங்கள் மீது தொடர்புகள் தானியங்கி மின்னஞ்சல்களை அனுப்ப.
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +232,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
@@ -2757,44 +2657,38 @@
 DocType: Purchase Order,Customer Contact Email,வாடிக்கையாளர் தொடர்பு மின்னஞ்சல்
 DocType: Event,Sunday,ஞாயிற்றுக்கிழமை
 DocType: Sales Team,Contribution (%),பங்களிப்பு (%)
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +455,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,குறிப்பு: கொடுப்பனவு நுழைவு ' பண அல்லது வங்கி கணக்கு ' குறிப்பிடப்படவில்லை என்பதால் உருவாக்கப்பட்டது முடியாது
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +171,Responsibilities,பொறுப்புகள்
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +457,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 +11,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,அட்டவணையில் குறைந்தது 1 விலைப்பட்டியல் உள்ளிடவும்
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +511,Add Users,பயனர்கள் சேர்க்கவும்
+apps/erpnext/erpnext/public/js/setup_wizard.js +255,Add Users,பயனர்கள் சேர்க்கவும்
 DocType: Pricing Rule,Item Group,உருப்படியை குழு
 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),வரிகள் மற்றும் கட்டணங்கள் சேர்க்கப்பட்டது (நிறுவனத்தின் கரன்சி)
-apps/erpnext/erpnext/stock/doctype/item/item.py +340,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,பொருள் வரி ரோ {0} வகை வரி அல்லது வருமான அல்லது செலவு அல்லது வசூலிக்கப்படும் கணக்கு இருக்க வேண்டும்
+apps/erpnext/erpnext/stock/doctype/item/item.py +344,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,பொருள் வரி ரோ {0} வகை வரி அல்லது வருமான அல்லது செலவு அல்லது வசூலிக்கப்படும் கணக்கு இருக்க வேண்டும்
 DocType: Sales Order,Partly Billed,இதற்கு கட்டணம்
 DocType: Item,Default BOM,முன்னிருப்பு BOM
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +79,Decambering,Decambering
 apps/erpnext/erpnext/setup/doctype/company/company.js +22,Please re-type company name to confirm,மீண்டும் தட்டச்சு நிறுவனத்தின் பெயர் உறுதிப்படுத்த தயவு செய்து
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,மொத்த மிகச்சிறந்த விவரங்கள்
 DocType: Time Log Batch,Total Hours,மொத்த நேரம்
 DocType: Journal Entry,Printing Settings,அச்சிடுதல் அமைப்புகள்
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +268,Total Debit must be equal to Total Credit. The difference is {0},மொத்த பற்று மொத்த கடன் சமமாக இருக்க வேண்டும் .
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +11,Automotive,வாகன
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +37,Item is required,பொருள் தேவைப்படுகிறது
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +25,Metal injection molding,மெட்டல் ஊசி மருந்து வடிவமைத்தல்
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +258,Total Debit must be equal to Total Credit. The difference is {0},மொத்த பற்று மொத்த கடன் சமமாக இருக்க வேண்டும் .
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,வாகன
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +684,From Delivery Note,டெலிவரி குறிப்பு இருந்து
 DocType: Time Log,From Time,நேரம் இருந்து
 DocType: Notification Control,Custom Message,தனிப்பயன் செய்தி
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +33,Investment Banking,முதலீட்டு வங்கி
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +261,"Select your Country, Time Zone and Currency","உங்கள் நாடு, நேர மண்டலம் மற்றும் நாணய வாய்ப்புகள்"
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,முதலீட்டு வங்கி
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +316,"Select your Country, Time Zone and Currency","உங்கள் நாடு, நேர மண்டலம் மற்றும் நாணய வாய்ப்புகள்"
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +369,Cash or Bank Account is mandatory for making payment entry,பண அல்லது வங்கி கணக்கு கொடுப்பனவு நுழைவு செய்யும் கட்டாய
 DocType: Purchase Invoice,Price List Exchange Rate,விலை பட்டியல் செலாவணி விகிதம்
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +91,Pickling,ஊறுகாய்களிலும்
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +18,Sand casting,மணல் நடிப்பதற்கு
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +117,Electroplating,மின்முலாம்
 DocType: Purchase Invoice Item,Rate,விலை
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +62,Intern,நடமாட்டத்தை கட்டுபடுத்து
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Intern,நடமாட்டத்தை கட்டுபடுத்து
 DocType: Newsletter,A Lead with this email id should exist,இந்த மின்னஞ்சல் ஐடியை கொண்ட ஒரு முன்னணி இருக்க வேண்டும்
 DocType: Stock Entry,From BOM,"BOM, இருந்து"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +34,Basic,அடிப்படையான
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +34,Basic,அடிப்படையான
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,{0} முன் பங்கு பரிவர்த்தனைகள் உறைந்திருக்கும்
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +217,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,தேதி அரை நாள் விடுப்பு வரம்பு தேதி அதே இருக்க வேண்டும்
@@ -2802,11 +2696,11 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +96,Reference No is mandatory if you entered Reference Date,நீங்கள் பரிந்துரை தேதி உள்ளிட்ட குறிப்பு இல்லை கட்டாயமாகும்
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +108,Date of Joining must be greater than Date of Birth,சேர தேதி பிறந்த தேதி விட அதிகமாக இருக்க வேண்டும்
 DocType: Salary Structure,Salary Structure,சம்பளம் அமைப்பு
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +242,"Multiple Price Rule exists with same criteria, please resolve \
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +246,"Multiple Price Rule exists with same criteria, please resolve \
 			conflict by assigning priority. Price Rules: {0}","பல விலை விதி அதே அளவுகோலை கொண்டு உள்ளது, முன்னுரிமை ஒதுக்க மூலம் \
  மோதல் தீர்க்க செய்யவும். விலை விதிகள்: {0}"
 DocType: Account,Bank,வங்கி
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +9,Airline,விமானத்துறை
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,விமானத்துறை
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +493,Issue Material,பிரச்சினை பொருள்
 DocType: Material Request Item,For Warehouse,சேமிப்பு
 DocType: Employee,Offer Date,ஆஃபர் தேதி
@@ -2816,29 +2710,24 @@
 DocType: Item,Is Fixed Asset Item,நிலையான சொத்து பொருள் ஆகிறது
 DocType: Stock Entry,Including items for sub assemblies,துணை தொகுதிகளுக்கான உருப்படிகள் உட்பட
 DocType: Features Setup,"If you have long print formats, this feature can be used to split the page to be printed on multiple pages with all headers and footers on each page","நீங்கள் நீண்ட வடிவங்கள் அச்சிட வேண்டும் என்றால், இந்த அம்சம் பக்கம் ஒவ்வொரு பக்கத்தில் அனைத்து தலைப்புகள் மற்றும் அடிக்குறிப்புகளும் பல பக்கங்களில் அச்சிடப்பட்ட வேண்டும் பிரித்து பயன்படுத்தலாம்"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +131,Hobbing,திருகால் வெட்டும்
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +98,All Territories,அனைத்து பிரதேசங்களையும்
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +98,All Territories,அனைத்து பிரதேசங்களையும்
 DocType: Purchase Invoice,Items,உருப்படிகள்
 DocType: Fiscal Year,Year Name,ஆண்டு பெயர்
 DocType: Process Payroll,Process Payroll,செயல்முறை சம்பளப்பட்டியல்
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +59,There are more holidays than working days this month.,இந்த மாதம் வேலை நாட்களுக்கு மேல் விடுமுறை உள்ளன .
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +68,There are more holidays than working days this month.,இந்த மாதம் வேலை நாட்களுக்கு மேல் விடுமுறை உள்ளன .
 DocType: Product Bundle Item,Product Bundle Item,தயாரிப்பு மூட்டை பொருள்
 DocType: Sales Partner,Sales Partner Name,விற்பனை வரன்வாழ்க்கை துணை பெயர்
 DocType: Purchase Invoice Item,Image View,பட காட்சி
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +113,Finishing & industrial finishing,முடித்த மற்றும் தொழில்துறை முடித்த
 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/page/setup_wizard/fixtures/industry_type.py +46,Securities & Commodity Exchanges,செக்யூரிட்டிஸ் & பண்ட பரிமாற்ற
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,செக்யூரிட்டிஸ் & பண்ட பரிமாற்ற
 DocType: Shipping Rule,Calculate Based On,ஆனால் அடிப்படையில் கணக்கிட
 DocType: Delivery Note Item,From Warehouse,கிடங்கில் இருந்து
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +98,Drilling,துளையிடும்
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +28,Blow molding,ஊதி வடிவமைத்தல்
 DocType: Purchase Taxes and Charges,Valuation and Total,மதிப்பீடு மற்றும் மொத்த
 DocType: Tax Rule,Shipping City,கப்பல் நகரம்
 apps/erpnext/erpnext/stock/doctype/item/item.js +43,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,இந்த பொருள் {0} (டெம்பிளேட்) ஒரு மாறுபாடு உள்ளது. 'இல்லை நகல் அமைக்க வரை காரணிகள் டெம்ப்ளேட் இருந்து நகல்
 DocType: Account,Purchase User,கொள்முதல் பயனர்
 DocType: Notification Control,Customize the Notification,அறிவிப்பு தனிப்பயனாக்கு
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +87,Hammering,சுத்தியால்
 DocType: Web Page,Slideshow,ஸ்லைடுஷோ
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +24,Default Address Template cannot be deleted,இயல்புநிலை முகவரி டெம்ப்ளேட் நீக்க முடியாது
 DocType: Sales Invoice,Shipping Rule,கப்பல் விதி
@@ -2847,9 +2736,8 @@
 DocType: Workflow State,Search,தேடல்
 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/setup/page/setup_wizard/fixtures/operations.py +142,Brazing,பற்ற வைத்தல்
 DocType: C-Form,Amended From,முதல் திருத்தப்பட்ட
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Raw Material,மூலப்பொருட்களின்
+apps/erpnext/erpnext/public/js/setup_wizard.js +359,Raw Material,மூலப்பொருட்களின்
 DocType: Leave Application,Follow via Email,மின்னஞ்சல் வழியாக பின்பற்றவும்
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,தள்ளுபடி தொகை பிறகு வரி தொகை
 apps/erpnext/erpnext/accounts/doctype/account/account.py +174,Child account exists for this account. You can not delete this account.,குழந்தை கணக்கு இந்த கணக்கு உள்ளது . நீங்கள் இந்த கணக்கை நீக்க முடியாது .
@@ -2863,10 +2751,10 @@
 ,Produced,உற்பத்தி
 DocType: Item,Item Code for Suppliers,சப்ளையர்கள் பொருள் குறியீடு
 DocType: Issue,Raised By (Email),(மின்னஞ்சல்) மூலம் எழுப்பப்பட்ட
-apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +72,General,பொதுவான
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +495,Attach Letterhead,லெட்டர் இணைக்கவும்
+apps/erpnext/erpnext/setup/setup_wizard/default_website.py +72,General,பொதுவான
+apps/erpnext/erpnext/public/js/setup_wizard.js +241,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/setup/page/setup_wizard/setup_wizard.js +542,"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/public/js/setup_wizard.js +284,"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}
 DocType: Journal Entry,Bank Entry,வங்கி நுழைவு
 DocType: Authorization Rule,Applicable To (Designation),பொருந்தும் (பதவி)
@@ -2875,33 +2763,32 @@
 apps/erpnext/erpnext/config/accounts.py +143,Enable / disable currencies.,/ முடக்கு நாணயங்கள் செயல்படுத்து.
 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),மொத்தம் (விவரங்கள்)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +26,Entertainment & Leisure,பொழுதுபோக்கு & ஓய்வு
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,பொழுதுபோக்கு & ஓய்வு
 DocType: Purchase Order,The date on which recurring order will be stop,மீண்டும் மீண்டும் வரும் பொருட்டு நிறுத்த வேண்டும் எந்த தேதி
 DocType: Quality Inspection,Item Serial No,உருப்படி இல்லை தொடர்
 apps/erpnext/erpnext/controllers/status_updater.py +142,{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 +57,Total Present,மொத்த தற்போதைய
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Hour,மணி
+apps/erpnext/erpnext/public/js/setup_wizard.js +363,Hour,மணி
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +138,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation","தொடராக பொருள் {0} பங்கு நல்லிணக்க பயன்படுத்தி \
  மேம்படுத்தப்பட்டது"
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +488,Transfer Material to Supplier,சப்ளையர் பொருள் மாற்றுவது
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +513,Transfer Material to Supplier,சப்ளையர் பொருள் மாற்றுவது
 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/crm/doctype/opportunity/opportunity.js +82,Create Quotation,மேற்கோள் உருவாக்கவும்
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +306,All these items have already been invoiced,இந்த பொருட்கள் ஏற்கனவே விலை விவரம்
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,You are not authorized to approve leaves on Block Dates,நீங்கள் பிளாக் தேதிகள் இலைகள் ஒப்புதல் அங்கீகாரம் இல்லை
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +311,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,மாற்று பின்னர் புதிய BOM
 DocType: Features Setup,Point of Sale,விற்பனை செய்யுமிடம்
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +83,Curling,கர்லிங்
 DocType: Account,Tax,வரி
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +28,Row {0}: {1} is not a valid {2},ரோ {0}: {1} ஒரு செல்லுபடியாகும் அல்ல {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +89,Refining,சுத்திகரிப்பில்
+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,உற்பத்தி திட்டமிடல் கருவி
 DocType: Quality Inspection,Report Date,தேதி அறிக்கை
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +130,Routing,வழிப்பாதை
 DocType: C-Form,Invoices,பொருள்
 DocType: Job Opening,Job Title,வேலை தலைப்பு
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +54,{0} already allocated for Employee {1} for period {2} - {3},{0} ஏற்கனவே காலத்தில் பணியாளர் {1} ஒதுக்கப்பட்ட {2} - {3}
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +80,{0} Recipients,{0} பெற்றவர்கள்
 DocType: Features Setup,Item Groups in Details,விவரங்கள் உருப்படியை குழுக்கள்
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +335,Quantity to Manufacture must be greater than 0.,உற்பத்தி செய்ய அளவு 0 அதிகமாக இருக்க வேண்டும்.
@@ -2919,14 +2806,13 @@
 DocType: DocType,Setup,அமைப்பு முறை
 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,இந்த மாதம் மற்றும் நிலுவையில் நடவடிக்கைகள் சுருக்கம்
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +39,Cold rolling,தண் உருட்டல்
 DocType: Customer Group,Customer Group Name,வாடிக்கையாளர் குழு பெயர்
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +408,Please remove this Invoice {0} from C-Form {1},சி-படிவம் இந்த விலைப்பட்டியல் {0} நீக்கவும் {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +410,Please remove this Invoice {0} from C-Form {1},சி-படிவம் இந்த விலைப்பட்டியல் {0} நீக்கவும் {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,கற்பிதங்கள்
 DocType: Packing Slip,Get Items,பொருட்கள் கிடைக்கும்
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +186,Please enter Write Off Account,கணக்கு எழுத உள்ளிடவும்
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +187,Please enter Write Off Account,கணக்கு எழுத உள்ளிடவும்
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +71,Last Order Date,கடைசி ஆர்டர் தேதி
 DocType: DocField,Image,படம்
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +179,Make Excise Invoice,கலால் விலைப்பட்டியல் செய்ய
@@ -2936,7 +2822,7 @@
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +146,Operation ID not set,ஆபரேஷன் ஐடி அமைக்க
 DocType: Production Order,Planned Start Date,திட்டமிட்ட தொடக்க தேதி
 DocType: Serial No,Creation Document Type,உருவாக்கம் ஆவண வகை
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +620,Maint. Visit,Maint. வருகை
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +631,Maint. Visit,Maint. வருகை
 DocType: Leave Type,Is Encash,ரொக்கமான மாற்று இல்லை
 DocType: Purchase Invoice,Mobile No,இல்லை மொபைல்
 DocType: Payment Tool,Make Journal Entry,பத்திரிகை பதிவு செய்ய
@@ -2944,35 +2830,31 @@
 apps/erpnext/erpnext/controllers/trends.py +257,Project-wise data is not available for Quotation,திட்ட வாரியான தரவு மேற்கோள் கிடைக்கவில்லை
 DocType: Project,Expected End Date,எதிர்பார்க்கப்படுகிறது முடிவு தேதி
 DocType: Appraisal Template,Appraisal Template Title,மதிப்பீட்டு வார்ப்புரு தலைப்பு
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +440,Commercial,வர்த்தகம்
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +378,Commercial,வர்த்தகம்
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +23,Parent Item {0} must not be a Stock Item,பெற்றோர் பொருள் {0} ஒரு பங்கு பொருள் இருக்க கூடாது
 DocType: Cost Center,Distribution Id,விநியோக அடையாளம்
-apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +14,Awesome Services,வியப்பா சேவைகள்
+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,வழங்குபவர் முகவரி
 DocType: Contact Us Settings,Address Line 2,முகவரி வரி 2
 DocType: ToDo,Reference,குறிப்பு
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +59,Perforating,துளையிடுதல்
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,அளவு அவுட்
 apps/erpnext/erpnext/config/accounts.py +128,Rules to calculate shipping amount for a sale,ஒரு விற்பனை கப்பல் அளவு கணக்கிட விதிகள்
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +29,Series is mandatory,தொடர் கட்டாயமாகும்
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +28,Financial Services,நிதி சேவைகள்
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,நிதி சேவைகள்
 apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3},{0} கற்பிதம் மதிப்பு எல்லைக்குள் இருக்க வேண்டும் {1} க்கு {2} அதிகரிப்பில் {3}
 DocType: Tax Rule,Sales,விற்பனை
 DocType: Stock Entry Detail,Basic Amount,அடிப்படை தொகை
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +173,Warehouse required for stock Item {0},பங்கு பொருள் தேவை கிடங்கு {0}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +178,Warehouse required for stock Item {0},பங்கு பொருள் தேவை கிடங்கு {0}
 DocType: Leave Allocation,Unused leaves,பயன்படுத்தப்படாத இலைகள்
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,Cr
 DocType: Customer,Default Receivable Accounts,கணக்குகள் இயல்புநிலை
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +102,Sawing,அறுக்கும்
 DocType: Tax Rule,Billing State,பில்லிங் மாநிலம்
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +32,Laminating,லேமினேட்டிங்
 DocType: Item Reorder,Transfer,பரிமாற்றம்
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +549,Fetch exploded BOM (including sub-assemblies),( துணை கூட்டங்கள் உட்பட ) வெடித்தது BOM எடு
 DocType: Authorization Rule,Applicable To (Employee),பொருந்தும் (பணியாளர்)
 apps/erpnext/erpnext/controllers/accounts_controller.py +101,Due Date is mandatory,தேதி அத்தியாவசியமானதாகும்
 apps/erpnext/erpnext/controllers/item_variant.py +51,Increment for Attribute {0} cannot be 0,பண்பு உயர்வு {0} 0 இருக்க முடியாது
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +143,Sintering,வெப்பப்படுத்தல்
 DocType: Journal Entry,Pay To / Recd From,வரம்பு / Recd செய்ய பணம்
 DocType: Naming Series,Setup Series,அமைப்பு தொடர்
 DocType: Supplier,Contact HTML,தொடர்பு HTML
@@ -2985,7 +2867,6 @@
 DocType: Attendance,Absent,வராதிரு
 DocType: Product Bundle,Product Bundle,தயாரிப்பு மூட்டை
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +180,Row {0}: Invalid reference {1},ரோ {0}: தவறான குறிப்பு {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +165,Crushing,நசுக்கிய
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,வரி மற்றும் கட்டணங்கள் வார்ப்புரு வாங்க
 DocType: Upload Attendance,Download Template,வார்ப்புரு பதிவிறக்க
 DocType: GL Entry,Remarks,கருத்துக்கள்
@@ -2993,14 +2874,12 @@
 DocType: Journal Entry,Write Off Based On,ஆனால் அடிப்படையில் இனிய எழுத
 DocType: Features Setup,POS View,பிஓஎஸ் பார்வையிடு
 apps/erpnext/erpnext/config/stock.py +38,Installation record for a Serial No.,ஒரு சீரியல் எண் நிறுவல் பதிவு
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +9,Continuous casting,தொடர்வார்ப்பு
 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/setup/page/setup_wizard/fixtures/operations.py +80,Cold sizing,குளிர் அளவு
 DocType: Salary Slip,Earning & Deduction,சம்பளம் மற்றும் பொருத்தியறிதல்
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +76,Account {0} cannot be a Group,கணக்கு {0} ஒரு குழு இருக்க முடியாது
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +259,Region,பகுதி
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +314,Region,பகுதி
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +213,Optional. This setting will be used to filter in various transactions.,விருப்ப . இந்த அமைப்பு பல்வேறு நடவடிக்கைகளில் வடிகட்ட பயன்படும்.
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +104,Negative Valuation Rate is not allowed,எதிர்மறை மதிப்பீட்டு விகிதம் அனுமதி இல்லை
 DocType: Holiday List,Weekly Off,இனிய வாராந்திர
@@ -3018,7 +2897,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,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,தேதி தேதி மற்றும் வருகை வருகை கட்டாய ஆகிறது
-apps/erpnext/erpnext/controllers/buying_controller.py +131,Please enter 'Is Subcontracted' as Yes or No,உள்ளிடவும் ஆம் அல்லது இல்லை என ' துணை ஒப்பந்தம்'
+apps/erpnext/erpnext/controllers/buying_controller.py +122,Please enter 'Is Subcontracted' as Yes or No,உள்ளிடவும் ஆம் அல்லது இல்லை என ' துணை ஒப்பந்தம்'
 DocType: Sales Team,Contact No.,இல்லை தொடர்பு
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,'Profit and Loss' type account {0} not allowed in Opening Entry,' இலாப நட்ட ' வகை கணக்கு {0} நுழைவு திறந்து அனுமதி இல்லை
 DocType: Workflow State,Time,காலம்
@@ -3027,14 +2906,13 @@
 DocType: Authorization Rule,Authorization Rule,அங்கீகார விதி
 DocType: Sales Invoice,Terms and Conditions Details,நிபந்தனைகள் விவரம்
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,விற்பனை வரி மற்றும் கட்டணங்கள் டெம்ப்ளேட்
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +10,Apparel & Accessories,ஆடை & ஆபரனங்கள்
+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,ஆணை எண்
 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 +121,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/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +47,Conversion Factor is required,மாற்று காரணி தேவை
 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,மதிப்பு / விளக்கம்
@@ -3042,10 +2920,8 @@
 ,Customers Not Buying Since Long Time,வாடிக்கையாளர்கள் நீண்ட நாட்களாக வாங்குதல்
 DocType: Production Order,Expected Delivery Date,எதிர்பார்க்கப்படுகிறது டெலிவரி தேதி
 apps/erpnext/erpnext/accounts/general_ledger.py +121,Debit and Credit not equal for {0} #{1}. Difference is {2}.,கடன் மற்றும் பற்று {0} # சம அல்ல {1}. வித்தியாசம் இருக்கிறது {2}.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +48,Bulging,வீக்கம்
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +11,Evaporative-pattern casting,ஆவியாக்கல் மாதிரி நடிப்பதற்கு
 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 +195,Sales Invoice {0} must be cancelled before cancelling this Sales Order,கவிஞருக்கு {0} இந்த விற்பனை ஆணை ரத்து முன் ரத்து செய்யப்பட வேண்டும்
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +190,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 அதிகமாக இருக்க வேண்டும் .
@@ -3064,26 +2940,24 @@
 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 +241,Account: {0} with currency: {1} can not be selected,கணக்கு: {0} நாணயத்துடன்: {1} தேர்வு செய்ய முடியாது
+apps/erpnext/erpnext/controllers/accounts_controller.py +242,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 +47,Account {0}: Parent account {1} does not belong to company: {2},கணக்கு {0}: பெற்றோர் கணக்கு {1} நிறுவனத்திற்கு சொந்தமானது இல்லை: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted all transactions related to this company!,வெற்றிகரமாக இந்த நிறுவனம் தொடர்பான அனைத்து நடவடிக்கைகளில் நீக்கப்பட்டது!
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,தேதி வரை
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +111,Honing,"இதனையடுத்து,"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +58,Probation,சோதனை காலம்
-apps/erpnext/erpnext/stock/doctype/item/item.py +264,Default Warehouse is mandatory for stock Item.,இயல்புநிலை கிடங்கு பங்கு பொருள் கட்டாயமாகும்.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Probation,சோதனை காலம்
+apps/erpnext/erpnext/stock/doctype/item/item.py +268,Default Warehouse is mandatory for stock Item.,இயல்புநிலை கிடங்கு பங்கு பொருள் கட்டாயமாகும்.
 DocType: Feed,Full Name,முழு பெயர்
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +148,Clinching,பெற்றுக்
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +191,Payment of salary for the month {0} and year {1},மாதம் சம்பளம் கொடுப்பனவு {0} மற்றும் ஆண்டு {1}
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +173,Payment of salary for the month {0} and year {1},மாதம் சம்பளம் கொடுப்பனவு {0} மற்றும் ஆண்டு {1}
 DocType: Stock Settings,Auto insert Price List rate if missing,வாகன நுழைவு விலை பட்டியல் விகிதம் காணாமல் என்றால்
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,மொத்த கட்டண தொகை
 ,Transferred Qty,அளவு மாற்றம்
 apps/erpnext/erpnext/config/learn.py +11,Navigating,வழிநடத்தல்
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +137,Planning,திட்டமிடல்
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +137,Planning,திட்டமிடல்
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +9,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),மொத்த பில்லிங் அளவு (நேரத்தில் பதிவுகள் வழியாக)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +629,We sell this Item,நாம் இந்த பொருளை விற்க
+apps/erpnext/erpnext/public/js/setup_wizard.js +365,We sell this Item,நாம் இந்த பொருளை விற்க
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +65,Supplier Id,வழங்குபவர் அடையாளம்
 DocType: Journal Entry,Cash Entry,பண நுழைவு
 DocType: Sales Partner,Contact Desc,தொடர்பு DESC
@@ -3092,18 +2966,16 @@
 DocType: Brand,Item Manager,பொருள் மேலாளர்
 DocType: Cost Center,Add rows to set annual budgets on Accounts.,கணக்கு ஆண்டு வரவு செலவு திட்டம் அமைக்க வரிசைகளை சேர்க்க.
 DocType: Buying Settings,Default Supplier Type,முன்னிருப்பு சப்ளையர் வகை
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +160,Quarrying,குவாரி
 DocType: Production Order,Total Operating Cost,மொத்த இயக்க செலவு
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +160,Note: Item {0} entered multiple times,குறிப்பு: பொருள் {0} பல முறை உள்ளிட்ட
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +163,Note: Item {0} entered multiple times,குறிப்பு: பொருள் {0} பல முறை உள்ளிட்ட
 apps/erpnext/erpnext/config/crm.py +27,All Contacts.,அனைத்து தொடர்புகள்.
 DocType: Newsletter,Test Email Id,டெஸ்ட் மின்னஞ்சல் விலாசம்
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +394,Company Abbreviation,நிறுவனத்தின் சுருக்கமான
+apps/erpnext/erpnext/public/js/setup_wizard.js +142,Company Abbreviation,நிறுவனத்தின் சுருக்கமான
 DocType: Features Setup,If you follow Quality Inspection. Enables Item QA Required and QA No in Purchase Receipt,நீங்கள் தரமான ஆய்வு பின்பற்ற என்றால் . எந்த கொள்முதல் ரசீது பொருள் QA தேவையான மற்றும் QA இயக்கும்
 DocType: GL Entry,Party Type,கட்சி வகை
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +68,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} வரம்புகளை அதிகமாக இருந்து authroized
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +30,Rotational molding,சுழற்சி மூடப்பட்ட
 apps/erpnext/erpnext/config/hr.py +115,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,வண்டியை அமைக்க வரி விதி
@@ -3117,15 +2989,15 @@
 apps/erpnext/erpnext/config/selling.py +18,Quotes to Leads or Customers.,தாங்கியவர்கள் விளைவாக அல்லது வாடிக்கையாளர்களுக்கு மேற்கோள்.
 DocType: Stock Settings,Role Allowed to edit frozen stock,உறைந்த பங்கு திருத்த அனுமதி பங்கு
 ,Territory Target Variance Item Group-Wise,மண்டலம் இலக்கு வேறுபாடு பொருள் குழு வாரியாக
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +101,All Customer Groups,அனைத்து வாடிக்கையாளர் குழுக்கள்
-apps/erpnext/erpnext/controllers/accounts_controller.py +474,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} கட்டாயமாகும். ஒருவேளை செலாவணி சாதனை {2} செய்ய {1} உருவாக்கப்பட்டது அல்ல.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +101,All Customer Groups,அனைத்து வாடிக்கையாளர் குழுக்கள்
+apps/erpnext/erpnext/controllers/accounts_controller.py +475,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} கட்டாயமாகும். ஒருவேளை செலாவணி சாதனை {2} செய்ய {1} உருவாக்கப்பட்டது அல்ல.
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +37,Tax Template is mandatory.,வரி டெம்ப்ளேட் கட்டாயமாகும்.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +41,Account {0}: Parent account {1} does not exist,கணக்கு {0}: பெற்றோர் கணக்கு {1} இல்லை
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),விலை பட்டியல் விகிதம் (நிறுவனத்தின் கரன்சி)
 DocType: Account,Temporary,தற்காலிக
 DocType: Address,Preferred Billing Address,விருப்பமான பில்லிங் முகவரி
 DocType: Monthly Distribution Percentage,Percentage Allocation,சதவீத ஒதுக்கீடு
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +86,Secretary,காரியதரிசி
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Secretary,காரியதரிசி
 DocType: Serial No,Distinct unit of an Item,"ஒரு பொருள், மாறுபட்ட அலகு"
 DocType: Pricing Rule,Buying,வாங்குதல்
 DocType: HR Settings,Employee Records to be created by,பணியாளர் ரெக்கார்ட்ஸ் விவரங்களை வேண்டும்
@@ -3138,9 +3010,8 @@
 ,Item-wise Price List Rate,பொருள் வாரியான விலை பட்டியல் விகிதம்
 DocType: Purchase Order Item,Supplier Quotation,வழங்குபவர் விலைப்பட்டியல்
 DocType: Quotation,In Words will be visible once you save the Quotation.,நீங்கள் மேற்கோள் சேமிக்க முறை சொற்கள் காணக்கூடியதாக இருக்கும்.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +68,Ironing,சலவை
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is stopped,{0} {1} நிறுத்தி உள்ளது
-apps/erpnext/erpnext/stock/doctype/item/item.py +352,Barcode {0} already used in Item {1},பார்கோடு {0} ஏற்கனவே பொருள் பயன்படுத்தப்படுகிறது {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +356,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/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,எதிர்வரும் நிகழ்வுகள்
@@ -3149,13 +3020,12 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +27,Quick Entry,விரைவு நுழைவு
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0} திரும்ப அத்தியாவசியமானதாகும்
 DocType: Purchase Order,To Receive,பெற
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +33,Shrink fitting,பொருத்தி சுருக்கு
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +522,user@example.com,user@example.com
+apps/erpnext/erpnext/public/js/setup_wizard.js +266,user@example.com,user@example.com
 DocType: Email Digest,Income / Expense,வருமான / செலவின
 DocType: Employee,Personal Email,தனிப்பட்ட மின்னஞ்சல்
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +58,Total Variance,மொத்த மாற்றத்துடன்
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +62,Total Variance,மொத்த மாற்றத்துடன்
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.","இயலுமைப்படுத்த என்றால், கணினி தானாக சரக்கு கணக்கியல் உள்ளீடுகள் பதிவு."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +15,Brokerage,தரக
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +15,Brokerage,தரக
 DocType: Address,Postal Code,அஞ்சல் குறியீடு
 DocType: Production Order Operation,"in Minutes
 Updated via 'Time Log'","மினிட்ஸ் 
@@ -3163,14 +3033,13 @@
 DocType: Customer,From Lead,முன்னணி இருந்து
 apps/erpnext/erpnext/config/manufacturing.py +19,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 +442,POS Profile required to make POS Entry,பிஓஎஸ் செய்தது பிஓஎஸ் நுழைவு செய்ய வேண்டும்
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +444,POS Profile required to make POS Entry,பிஓஎஸ் செய்தது பிஓஎஸ் நுழைவு செய்ய வேண்டும்
 DocType: Hub Settings,Name Token,பெயர் டோக்கன்
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +106,Planing,முன்பேர
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Selling,ஸ்டாண்டர்ட் விற்பனை
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +120,Standard Selling,ஸ்டாண்டர்ட் விற்பனை
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +137,Atleast one warehouse is mandatory,குறைந்தது ஒரு கிடங்கில் அவசியமானதாகும்
 DocType: Serial No,Out of Warranty,உத்தரவாதத்தை வெளியே
 DocType: BOM Replace Tool,Replace,பதிலாக
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +314,{0} against Sales Invoice {1},{0} விற்பனை விலைப்பட்டியல் எதிரான {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +316,{0} against Sales Invoice {1},{0} விற்பனை விலைப்பட்டியல் எதிரான {1}
 apps/erpnext/erpnext/stock/doctype/item/item.py +49,Please enter default Unit of Measure,நடவடிக்கை இயல்புநிலை அலகு உள்ளிடவும்
 DocType: Purchase Invoice Item,Project Name,திட்டம் பெயர்
 DocType: Supplier,Mention if non-standard receivable account,குறிப்பிட தரமற்ற பெறத்தக்க கணக்கு என்றால்
@@ -3186,9 +3055,8 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,Journal Entry {0} does not have account {1} or already matched against other voucher,பத்திரிகை நுழைவு {0} {1} அல்லது ஏற்கனவே மற்ற ரசீது எதிராக பொருந்தியது கணக்கு இல்லை
 DocType: Item,Moving Average,சராசரி நகரும்
 DocType: BOM Replace Tool,The BOM which will be replaced,பதிலீடு செய்யப்படும் BOM
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +43,New Stock UOM must be different from current stock UOM,புதிய பங்கு மொறட்டுவ பல்கலைகழகம் தற்போதைய பங்கு மொறட்டுவ பல்கலைகழகம் வித்தியாசமாக இருக்க வேண்டும்
 DocType: Account,Debit,பற்று
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +34,Leaves must be allocated in multiples of 0.5,இலைகள் 0.5 மடங்குகள் ஒதுக்கீடு
+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/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,மிகச்சிறந்த விவரங்கள்
@@ -3206,8 +3074,7 @@
 DocType: Employee,Internal Work History,உள் வேலை வரலாறு
 DocType: DocField,Column Break,நெடுவரிசை பிரிப்பு
 DocType: Event,Thursday,வியாழக்கிழமை
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +42,Private Equity,தனியார் சமபங்கு
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +93,Turning,திருப்பு
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,தனியார் சமபங்கு
 DocType: Maintenance Visit,Customer Feedback,வாடிக்கையாளர் கருத்து
 DocType: Account,Expense,செலவு
 DocType: Sales Invoice,Exhibition,கண்காட்சி
@@ -3220,19 +3087,19 @@
 DocType: Employee,Held On,இல் நடைபெற்றது
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +33,Production Item,உற்பத்தி பொருள்
 ,Employee Information,பணியாளர் தகவல்
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,Rate (%),விகிதம் (%)
+apps/erpnext/erpnext/public/js/setup_wizard.js +294,Rate (%),விகிதம் (%)
 DocType: Stock Entry Detail,Additional Cost,கூடுதல் செலவு
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +407,Financial Year End Date,நிதி ஆண்டு முடிவு தேதி
+apps/erpnext/erpnext/public/js/setup_wizard.js +155,Financial Year End Date,நிதி ஆண்டு முடிவு தேதி
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Voucher No, if grouped by Voucher","வவுச்சர் அடிப்படையில் வடிகட்ட முடியாது இல்லை , ரசீது மூலம் தொகுக்கப்பட்டுள்ளது என்றால்"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +484,Make Supplier Quotation,வழங்குபவர் மேற்கோள் செய்ய
 DocType: Quality Inspection,Incoming,அடுத்து வருகிற
 DocType: BOM,Materials Required (Exploded),பொருட்கள் தேவை (விரிவான)
 DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),சம்பளம் (LWP) இல்லாமல் விடுமுறை ஆதாயம் குறைக்க
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +512,"Add users to your organization, other than yourself","உன்னை தவிர, உங்கள் நிறுவனத்தின் பயனர் சேர்க்க"
+apps/erpnext/erpnext/public/js/setup_wizard.js +256,"Add users to your organization, other than yourself","உன்னை தவிர, உங்கள் நிறுவனத்தின் பயனர் சேர்க்க"
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No {1} does not match with {2} {3},ரோ # {0}: தொ.எ. {1} பொருந்தவில்லை {2} {3}
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +44,Casual Leave,தற்செயல் விடுப்பு
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +44,Casual Leave,தற்செயல் விடுப்பு
 DocType: Batch,Batch ID,தொகுதி அடையாள
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +334,Note: {0},குறிப்பு: {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +336,Note: {0},குறிப்பு: {0}
 ,Delivery Note Trends,பந்து குறிப்பு போக்குகள்
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +104,This Week's Summary,இந்த வார சுருக்கம்
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +74,{0} must be a Purchased or Sub-Contracted Item in row {1},{0} வரிசையில் ஒரு வாங்கப்பட்டது அல்லது துணை ஒப்பந்தம் பொருள் இருக்க வேண்டும் {1}
@@ -3244,7 +3111,7 @@
 DocType: Purchase Receipt,Return Against Purchase Receipt,வாங்கும் ரசீது எதிராக திரும்ப
 DocType: Purchase Order,To Bill,மசோதாவுக்கு
 DocType: Material Request,% Ordered,% உத்தரவிட்டார்
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +61,Piecework,சிறுதுண்டு வேலைக்கு
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Piecework,சிறுதுண்டு வேலைக்கு
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +64,Avg. Buying Rate,சராசரி. வாங்குதல் விகிதம்
 DocType: Task,Actual Time (in Hours),(மணிகளில்) உண்மையான நேரம்
 DocType: Employee,History In Company,நிறுவனத்தின் ஆண்டு வரலாறு
@@ -3261,13 +3128,13 @@
 DocType: Opportunity,To Discuss,ஆலோசிக்க வேண்டும்
 DocType: SMS Settings,SMS Settings,SMS அமைப்புகள்
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +60,Temporary Accounts,தற்காலிக கணக்குகளை
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +155,Black,கருப்பு
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Black,கருப்பு
 DocType: BOM Explosion Item,BOM Explosion Item,BOM வெடிப்பு பொருள்
 DocType: Account,Auditor,ஆடிட்டர்
 DocType: Purchase Order,End date of current order's period,தற்போதைய ஆர்டரை கால இறுதியில் தேதி
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +17,Make Offer Letter,ஆஃபர் கடிதம் செய்ய
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +10,Return,திரும்ப
-apps/erpnext/erpnext/stock/doctype/item/item.py +503,Default Unit of Measure for Variant must be same as Template,மாற்று அளவீடு இயல்புநிலை யூனிட் டெம்ப்ளேட் அதே இருக்க வேண்டும்
+apps/erpnext/erpnext/stock/doctype/item/item.py +507,Default Unit of Measure for Variant must be same as Template,மாற்று அளவீடு இயல்புநிலை யூனிட் டெம்ப்ளேட் அதே இருக்க வேண்டும்
 DocType: DocField,Fold,மடி
 DocType: Production Order Operation,Production Order Operation,உத்தரவு ஆபரேஷன்
 DocType: Pricing Rule,Disable,முடக்கு
@@ -3278,13 +3145,12 @@
 DocType: Page,Page Name,பக்கம் பெயர்
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +110,To Time must be greater than From Time,நேரம் இருந்து விட பெரியதாக இருக்க வேண்டும் வேண்டும்
 DocType: Journal Entry Account,Exchange Rate,அயல்நாட்டு நாணய பரிமாற்ற விகிதம் வீதம்
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +465,Sales Order {0} is not submitted,விற்பனை ஆணை {0} சமர்ப்பிக்க
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +467,Sales Order {0} is not submitted,விற்பனை ஆணை {0} சமர்ப்பிக்க
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0}: Parent account {1} does not bolong to the company {2},கிடங்கு {0}: பெற்றோர் கணக்கு {1} நிறுவனம் bolong இல்லை {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +124,Spindle finishing,சுழல் முடித்த
 DocType: BOM,Last Purchase Rate,கடந்த கொள்முதல் விலை
 DocType: Account,Asset,சொத்து
 DocType: Project Task,Task ID,பணி ஐடி
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +395,"e.g. ""MC""","உதாரணமாக, ""MC """
+apps/erpnext/erpnext/public/js/setup_wizard.js +143,"e.g. ""MC""","உதாரணமாக, ""MC """
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,Stock cannot exist for Item {0} since has variants,பொருள் இருக்க முடியாது பங்கு {0} என்பதால் வகைகள் உண்டு
 ,Sales Person-wise Transaction Summary,விற்பனை நபர் வாரியான பரிவர்த்தனை சுருக்கம்
 DocType: System Settings,Time Zone,நேரம் மண்டல
@@ -3293,9 +3159,7 @@
 DocType: Monthly Distribution,Monthly Distribution Percentages,மாதாந்திர விநியோகம் சதவீதங்கள்
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +16,The selected item cannot have Batch,தேர்ந்தெடுக்கப்பட்ட உருப்படியை தொகுதி முடியாது
 DocType: Delivery Note,% of materials delivered against this Delivery Note,இந்த டெலிவரி குறிப்பு எதிராக அளிக்கப்பட்ட பொருட்களை%
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +151,Stapling,Stapling
 DocType: Customer,Customer Details,வாடிக்கையாளர் விவரம்
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +105,Shaping,வடிவமைத்தல்
 DocType: Employee,Reports to,அறிக்கைகள்
 DocType: SMS Settings,Enter url parameter for receiver nos,ரிசீவர் இலக்கங்கள் URL ஐ அளவுரு உள்ளிடவும்
 DocType: Sales Invoice,Paid Amount,பணம் தொகை
@@ -3304,13 +3168,13 @@
 DocType: Item Variant,Item Variant,பொருள் மாற்று
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +15,Setting this Address Template as default as there is no other default,வேறு எந்த இயல்புநிலை உள்ளது என இயல்புநிலை முகவரி டெம்ப்ளேட் அமைக்க
 apps/erpnext/erpnext/accounts/doctype/account/account.py +89,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","ஏற்கனவே பற்று உள்ள கணக்கு நிலுவை, நீங்கள் 'கடன்' இருப்பு வேண்டும் 'அமைக்க அனுமதி இல்லை"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +76,Quality Management,தர மேலாண்மை
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Quality Management,தர மேலாண்மை
 DocType: Production Planning Tool,Filter based on customer,வாடிக்கையாளர் அடிப்படையில் வடிகட்ட
 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}
 DocType: Employee External Work History,Employee External Work History,ஊழியர் புற வேலை வரலாறு
 DocType: Tax Rule,Purchase,கொள்முதல்
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +34,Balance Qty,இருப்பு அளவு
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Balance Qty,இருப்பு அளவு
 DocType: Item Group,Parent Item Group,பெற்றோர் பொருள் பிரிவு
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +21,{0} for {1},{0} க்கான {1}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +96,Cost Centers,செலவு மையங்கள்
@@ -3320,12 +3184,12 @@
 DocType: Opportunity,Next Contact,அடுத்த தொடர்பு
 DocType: Employee,Employment Type,வேலை வகை
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,நிலையான சொத்துக்கள்
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +84,Application period cannot be across two alocation records,விண்ணப்ப காலம் இரண்டு alocation பதிவுகள் முழுவதும் இருக்க முடியாது
 DocType: Item Group,Default Expense Account,முன்னிருப்பு செலவு கணக்கு
 DocType: Employee,Notice (days),அறிவிப்பு ( நாட்கள்)
 DocType: Page,Yes,ஆம்
 DocType: Tax Rule,Sales Tax Template,விற்பனை வரி டெம்ப்ளேட்
 DocType: Employee,Encashment Date,பணமாக்கல் தேதி
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +74,Electroforming,மின்முறை
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +179,"Against Voucher Type must be one of Purchase Order, Purchase Invoice or Journal Entry","வவுச்சர் எதிராக வகை கொள்முதல் ஆணை ஒன்று, கொள்முதல் விலைப்பட்டியல் அல்லது பத்திரிகை நுழைவு இருக்க வேண்டும்"
 DocType: Account,Stock Adjustment,பங்கு சீரமைப்பு
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +34,Default Activity Cost exists for Activity Type - {0},இயல்புநிலை நடவடிக்கை செலவு நடவடிக்கை வகை உள்ளது - {0}
@@ -3361,12 +3225,12 @@
 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,பகிர்ந்தளித்தல்
 apps/erpnext/erpnext/public/js/pos/pos.html +36,Amount Paid,கட்டண தொகை
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +91,Project Manager,திட்ட மேலாளர்
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +72,Dispatch,கொல்
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Project Manager,திட்ட மேலாளர்
+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: Customer,Default Taxes and Charges,இயல்புநிலை வரி மற்றும் கட்டணங்கள்
 DocType: Account,Receivable,பெறத்தக்க
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +268,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,ரோ # {0}: கொள்முதல் ஆணை ஏற்கனவே உள்ளது என சப்ளையர் மாற்ற அனுமதி
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +263,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 மூலப்பொருட்கள் பெற கருதப்படுகிறது. மற்றபடி, அனைத்து துணை சட்டசபை பொருட்களை மூலப்பொருளாக கருதப்படுகிறது."
@@ -3374,8 +3238,8 @@
 DocType: Hub Settings,Seller Description,விற்பனையாளர் விளக்கம்
 DocType: Employee Education,Qualification,தகுதி
 DocType: Item Price,Item Price,உருப்படியை விலை
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +48,Soap & Detergent,சோப் & சோப்பு
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +36,Motion Picture & Video,மோஷன் பிக்சர் & வீடியோ
+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,ஆணையிட்டார்
 DocType: Warehouse,Warehouse Name,சேமிப்பு கிடங்கு பெயர்
 DocType: Naming Series,Select Transaction,பரிவர்த்தனை தேர்வு
@@ -3384,7 +3248,6 @@
 DocType: BOM,Rate Of Materials Based On,ஆனால் அடிப்படையில் பொருட்களின் விகிதம்
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,ஆதரவு Analtyics
 apps/erpnext/erpnext/accounts/doctype/accounts_settings/accounts_settings.py +27,Company is missing in warehouses {0},நிறுவனத்தின் கிடங்குகளில் காணவில்லை {0}
-DocType: Stock UOM Replace Utility,Stock UOM Replace Utility,பங்கு மொறட்டுவ பல்கலைகழகம் பதிலாக பயன்பாட்டு
 DocType: POS Profile,Terms and Conditions,நிபந்தனைகள்
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,To Date should be within the Fiscal Year. Assuming To Date = {0},தேதி நிதி ஆண்டின் க்குள் இருக்க வேண்டும். தேதி நிலையினை = {0}
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","இங்கே நீங்கள் உயரம், எடை, ஒவ்வாமை, மருத்துவ கவலைகள் ஹிப்ரு பராமரிக்க முடியும்"
@@ -3396,7 +3259,7 @@
 DocType: Sales Order Item,For Production,உற்பத்திக்கான
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +103,Please enter sales order in the above table,மேலே உள்ள அட்டவணையில் விற்பனை பொருட்டு உள்ளிடவும்
 DocType: Project Task,View Task,காண்க பணி
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +406,Your financial year begins on,உங்கள் நிதி ஆண்டு தொடங்கும்
+apps/erpnext/erpnext/public/js/setup_wizard.js +154,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: Email Digest,Add/Remove Recipients,சேர்க்க / பெற்றவர்கள் அகற்று
@@ -3404,16 +3267,14 @@
 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),ஆதரவு மின்னஞ்சல் ஐடி அமைப்பு உள்வரும் சர்வர் . (எ. கா: 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 +528,Item variant {0} exists with same attributes,பொருள் மாறுபாடு {0} அதே பண்புகளை கொண்ட உள்ளது
+apps/erpnext/erpnext/stock/doctype/item/item.py +532,Item variant {0} exists with same attributes,பொருள் மாறுபாடு {0} அதே பண்புகளை கொண்ட உள்ளது
 DocType: Salary Slip,Salary Slip,சம்பளம் ஸ்லிப்
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +116,Burnishing,துலக்குதல்
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +54,'To Date' is required,' தேதி ' தேவைப்படுகிறது
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,' தேதி ' தேவைப்படுகிறது
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","தொகுப்புகள் வழங்க வேண்டும் ஐந்து சீட்டுகள் பொதி உருவாக்குதல். தொகுப்பு எண், தொகுப்பு உள்ளடக்கங்களை மற்றும் அதன் எடை தெரிவிக்க பயன்படுகிறது."
 DocType: Sales Invoice Item,Sales Order Item,விற்பனை ஆணை உருப்படி
 DocType: Salary Slip,Payment Days,கட்டணம் நாட்கள்
 DocType: BOM,Manage cost of operations,நடவடிக்கைகள் செலவு மேலாண்மை
 DocType: Features Setup,Item Advanced,உருப்படியை மேம்பட்ட
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +40,Hot rolling,சூடாக்கி உருட்டல்
 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.","சரி நடவடிக்கைகள் எந்த &quot;Submitted&quot; போது, ஒரு மின்னஞ்சல் பாப் அப் தானாகவே ஒரு இணைப்பாக பரிவர்த்தனை மூலம், அந்த பரிமாற்றத்தில் தொடர்புடைய &quot;தொடர்பு&quot; ஒரு மின்னஞ்சல் அனுப்ப திறக்கப்பட்டது. பயனர் அல்லது மின்னஞ்சல் அனுப்ப முடியாது."
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,உலகளாவிய அமைப்புகள்
 DocType: Employee Education,Employee Education,ஊழியர் கல்வி
@@ -3426,25 +3287,23 @@
 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/setup/page/setup_wizard/install_fixtures.py +48,Sick Leave,விடுப்பு
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +174,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/page/setup_wizard/fixtures/industry_type.py +22,Department Stores,டிபார்ட்மெண்ட் ஸ்டோர்கள்
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,டிபார்ட்மெண்ட் ஸ்டோர்கள்
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +40,System Balance,கணினி இருப்பு
 DocType: Workflow,Is Active,செயலில் உள்ளது
 apps/erpnext/erpnext/controllers/stock_controller.py +71,No accounting entries for the following warehouses,பின்வரும் கிடங்குகள் இல்லை கணக்கியல் உள்ளீடுகள்
 apps/erpnext/erpnext/projects/doctype/project/project.js +22,Save the document first.,முதல் ஆவணம் சேமிக்கவும்.
 DocType: Account,Chargeable,குற்றம் சாட்டப்பட தக்க
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +121,Linishing,Linishing
 DocType: Company,Change Abbreviation,மாற்றம் சுருக்கமான
 DocType: Workflow State,Primary,முதல்
 DocType: Expense Claim Detail,Expense Date,இழப்பில் தேதி
 DocType: Item,Max Discount (%),மேக்ஸ் தள்ளுபடி (%)
 DocType: Communication,More Information,மேலும் தகவல்
 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/setup/page/setup_wizard/fixtures/operations.py +161,Blasting,வெடித்தல்
 DocType: Company,Warn,எச்சரிக்கை
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +111,Item valuation updated,பொருள் மதிப்பீடு மேம்படுத்தப்பட்டது
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","வேறு எந்த கருத்துக்கள், பதிவுகள் செல்ல வேண்டும் என்று குறிப்பிடத்தக்கது முயற்சியாகும்."
 DocType: BOM,Manufacturing User,உற்பத்தி பயனர்
 DocType: Purchase Order,Raw Materials Supplied,மூலப்பொருட்கள் வழங்கியது
@@ -3454,7 +3313,7 @@
 DocType: Appraisal,Appraisal Template,மதிப்பீட்டு வார்ப்புரு
 DocType: Communication,Email,மின்னஞ்சல்
 DocType: Item Group,Item Classification,பொருள் பிரிவுகள்
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +89,Business Development Manager,வணிக மேம்பாட்டு மேலாளர்
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Business Development Manager,வணிக மேம்பாட்டு மேலாளர்
 DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,பராமரிப்பு சென்று நோக்கம்
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.js +15,Period,காலம்
 ,General Ledger,பொது லெட்ஜர்
@@ -3464,9 +3323,7 @@
 ,Itemwise Recommended Reorder Level,இனவாரியாக நிலை மறுவரிசைப்படுத்துக பரிந்துரைக்கப்பட்ட
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +264,Please select {0} first,முதல் {0} தேர்வு செய்க
 DocType: Features Setup,To get Item Group in details table,விவரங்கள் அட்டவணையில் உருப்படி குழு பெற
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +67,Redrawing,மாற்றியமைத்துள்ளது
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +112,Batch {0} of Item {1} has expired.,பொருள் ஒரு தொகுதி {0} {1} காலாவதியாகிவிட்டது.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +120,Etching,ஓவிய
 DocType: Sales Invoice,Commission,தரகு
 DocType: Address Template,"<h4>Default Template</h4>
 <p>Uses <a href=""http://jinja.pocoo.org/docs/templates/"">Jinja Templating</a> and all the fields of Address (including Custom Fields if any) will be available</p>
@@ -3511,7 +3368,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +340,Operation Time must be greater than 0 for Operation {0},ஆபரேஷன் நேரம் ஆபரேஷன் 0 விட இருக்க வேண்டும் {0}
 DocType: Supplier,Address and Contacts,முகவரி மற்றும் தொடர்புகள்
 DocType: UOM Conversion Detail,UOM Conversion Detail,மொறட்டுவ பல்கலைகழகம் மாற்றம் விரிவாக
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +496,Keep it web friendly 900px (w) by 100px (h),100px வலை நட்பு 900px ( W ) வைத்து ( H )
+apps/erpnext/erpnext/public/js/setup_wizard.js +242,Keep it web friendly 900px (w) by 100px (h),100px வலை நட்பு 900px ( W ) வைத்து ( H )
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +329,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,மிகச்சிறந்த உறுதி சீட்டு கிடைக்கும்
@@ -3527,54 +3384,49 @@
 DocType: Item,Average time taken by the supplier to deliver,சப்ளையர் எடுக்கப்படும் சராசரி நேரம் வழங்க
 DocType: Time Log,Hours,மணி
 DocType: Project,Expected Start Date,எதிர்பார்க்கப்படுகிறது தொடக்க தேதி
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +38,Rolling,ரோலிங்
 DocType: ToDo,Priority,முதன்மை
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +41,Remove item if charges is not applicable to that item,குற்றச்சாட்டுக்கள் அந்த பொருளை பொருந்தாது என்றால் உருப்படியை அகற்று
 DocType: Dropbox Backup,Dropbox Access Allowed,டிரா பாக்ஸ் அனுமதி
 DocType: Dropbox Backup,Weekly,வாரந்தோறும்
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,உதாரணம். smsgateway.com / API / send_sms.cgi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +485,Receive,பெறவும்
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +510,Receive,பெறவும்
 DocType: Maintenance Visit,Fully Completed,முழுமையாக பூர்த்தி
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% முழுமையான
 DocType: Employee,Educational Qualification,கல்வி தகுதி
 DocType: Workstation,Operating Costs,செலவுகள்
 DocType: Employee Leave Approver,Employee Leave Approver,பணியாளர் விடுப்பு சர்க்கார் தரப்பில் சாட்சி
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,{0} has been successfully added to our Newsletter list.,{0} வெற்றிகரமாக எங்கள் செய்திமடல் பட்டியலில் சேர்க்க.
-apps/erpnext/erpnext/stock/doctype/item/item.py +383,Row {0}: An Reorder entry already exists for this warehouse {1},ரோ {0}: ஒரு மறுவரிசைப்படுத்துக நுழைவு ஏற்கனவே இந்த கிடங்கு உள்ளது {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +387,Row {0}: An Reorder entry already exists for this warehouse {1},ரோ {0}: ஒரு மறுவரிசைப்படுத்துக நுழைவு ஏற்கனவே இந்த கிடங்கு உள்ளது {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +67,"Cannot declare as lost, because Quotation has been made.","இழந்தது மேற்கோள் செய்யப்பட்டது ஏனெனில் , அறிவிக்க முடியாது ."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +133,Electron beam machining,எலக்ட்ரான் கற்றை எந்திர
 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 +150,Please select Start Date and End Date for Item {0},தொடக்க தேதி மற்றும் பொருள் முடிவு தேதி தேர்வு செய்க {0}
 apps/erpnext/erpnext/config/stock.py +141,Main Reports,முக்கிய செய்திகள்
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +102,Stock Ledger entries balances updated,பங்கு லெட்ஜர் மேம்படுத்தப்பட்டது நிலுவைகளை உள்ளீட்டுகளின்
 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 டாக்டைப்பின்
-apps/erpnext/erpnext/stock/doctype/item/item.js +176,Add / Edit Prices,/ திருத்த விலை சேர்க்கவும்
+apps/erpnext/erpnext/stock/doctype/item/item.js +178,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 +298,My Orders,என்னுடைய கட்டளைகள்
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +293,My Orders,என்னுடைய கட்டளைகள்
 DocType: Price List,Price List Name,விலை பட்டியல் பெயர்
 DocType: Time Log,For Manufacturing,உற்பத்தி
-apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +70,Totals,மொத்த
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +174,Totals,மொத்த
 DocType: BOM,Manufacturing,உருவாக்கம்
 ,Ordered Items To Be Delivered,விநியோகிப்பதற்காக உத்தரவிட்டார் உருப்படிகள்
 DocType: Account,Income,வருமானம்
 ,Setup Wizard,அமைவு வழிகாட்டி
 DocType: Industry Type,Industry Type,தொழில் அமைப்பு
 apps/erpnext/erpnext/templates/includes/cart.js +137,Something went wrong!,ஏதோ தவறு நடந்து!
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +68,Warning: Leave application contains following block dates,எச்சரிக்கை: விடுப்பு பயன்பாடு பின்வரும் தொகுதி தேதிகள் உள்ளன
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +251,Sales Invoice {0} has already been submitted,கவிஞருக்கு {0} ஏற்கனவே சமர்ப்பித்த
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +100,Warning: Leave application contains following block dates,எச்சரிக்கை: விடுப்பு பயன்பாடு பின்வரும் தொகுதி தேதிகள் உள்ளன
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +256,Sales Invoice {0} has already been submitted,கவிஞருக்கு {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/setup/page/setup_wizard/fixtures/operations.py +10,Die casting,அச்சு வார்ப்பு
 DocType: Email Alert,Reference Date,குறிப்பு தேதி
 apps/erpnext/erpnext/config/hr.py +105,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,அனுப்புவதற்கு முன் செய்தி உள்ளிடவும்
 DocType: Async Task,Status,அந்தஸ்து
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +65,Stock UOM updated for Item {0},பங்கு UOM பொருள் மேம்படுத்தப்பட்டது {0}
 DocType: Company History,Year,ஆண்டு
 apps/erpnext/erpnext/config/accounts.py +127,Point-of-Sale Profile,புள்ளி விற்பனை செய்தது
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +68,Please Update SMS Settings,SMS அமைப்புகள் மேம்படுத்த
@@ -3588,12 +3440,12 @@
 ,Serial No Service Contract Expiry,தொடர் எண் சேவை ஒப்பந்தம் காலாவதியாகும்
 DocType: Item,Unit of Measure Conversion,நடவடிக்கையாக மாற்றும் அலகு
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +86,Employee can not be changed,பணியாளர் மாற்ற முடியாது
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +259,You cannot credit and debit same account at the same time,நீங்கள் கடன் மற்றும் அதே நேரத்தில் அதே கணக்கு பற்று முடியாது
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,You cannot credit and debit same account at the same time,நீங்கள் கடன் மற்றும் அதே நேரத்தில் அதே கணக்கு பற்று முடியாது
 DocType: Naming Series,Help HTML,HTML உதவி
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},ஒதுக்கப்படும் மொத்த தாக்கத்தில் 100 % இருக்க வேண்டும். இது {0}
 apps/erpnext/erpnext/controllers/status_updater.py +140,Allowance for over-{0} crossed for Item {1},அலவன்ஸ் அதிகமாக {0} பொருள் கடந்து ஐந்து {1}
 DocType: Address,Name of person or organization that this address belongs to.,நபர் அல்லது இந்த முகவரியை சொந்தமானது என்று நிறுவனத்தின் பெயர்.
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +587,Your Suppliers,உங்கள் சப்ளையர்கள்
+apps/erpnext/erpnext/public/js/setup_wizard.js +325,Your Suppliers,உங்கள் சப்ளையர்கள்
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,விற்பனை ஆணை உள்ளது என இழந்தது அமைக்க முடியாது.
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +65,Another Salary Structure {0} is active for employee {1}. Please make its status 'Inactive' to proceed.,மற்றொரு சம்பள {0} ஊழியர் செயலில் உள்ளது {1}. அதன் நிலை 'செயலற்ற' தொடர உறுதி செய்து கொள்ளவும்.
 DocType: Purchase Invoice,Contact,தொடர்பு
@@ -3602,37 +3454,35 @@
 DocType: Item,Has Serial No,இல்லை வரிசை உள்ளது
 DocType: Employee,Date of Issue,இந்த தேதி
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +16,{0}: From {0} for {1},{0} இருந்து: {0} ஐந்து {1}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +154,Row #{0}: Set Supplier for item {1},ரோ # {0}: உருப்படியை அமைக்க சப்ளையர் {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +149,Row #{0}: Set Supplier for item {1},ரோ # {0}: உருப்படியை அமைக்க சப்ளையர் {1}
 DocType: Issue,Content Type,உள்ளடக்க வகை
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +17,Computer,கம்ப்யூட்டர்
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,கம்ப்யூட்டர்
 DocType: Item,List this Item in multiple groups on the website.,வலைத்தளத்தில் பல குழுக்கள் இந்த உருப்படி பட்டியல்.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +283,Please check Multi Currency option to allow accounts with other currency,மற்ற நாணய கணக்குகளை அனுமதிக்க பல நாணய விருப்பத்தை சரிபார்க்கவும்
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +285,Please check Multi Currency option to allow accounts with other currency,மற்ற நாணய கணக்குகளை அனுமதிக்க பல நாணய விருப்பத்தை சரிபார்க்கவும்
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +62,Item: {0} does not exist in the system,பொருள்: {0} அமைப்பின் இல்லை
 apps/erpnext/erpnext/accounts/doctype/account/account.py +81,You are not authorized to set Frozen value,நீங்கள் உறைந்த மதிப்பை அமைக்க அதிகாரம் இல்லை
 DocType: Payment Reconciliation,Get Unreconciled Entries,ஒப்புரவாகவேயில்லை பதிவுகள் பெற
 DocType: Cost Center,Budgets,"வரவு செலவு திட்டம்,"
 apps/frappe/frappe/core/page/modules_setup/modules_setup.py +11,Updated,புதுப்பிக்கப்பட்ட
 DocType: Employee,Emergency Contact Details,அவசர தொடர்பு விவரம்
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +396,What does it do?,அது என்ன?
+apps/erpnext/erpnext/public/js/setup_wizard.js +144,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,சராசரி கமிஷன் விகிதம்
-apps/erpnext/erpnext/stock/doctype/item/item.py +313,'Has Serial No' can not be 'Yes' for non-stock item,' சீரியல் இல்லை உள்ளது ' அல்லாத பங்கு உருப்படியை 'ஆம்' இருக்க முடியாது
+apps/erpnext/erpnext/stock/doctype/item/item.py +317,'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/setup/page/setup_wizard/install_fixtures.py +111,Electrical,மின்
+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 +302,Row {0}: Exchange Rate is mandatory,ரோ {0}: மாற்று வீதம் கட்டாயமாகும்
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +304,Row {0}: Exchange Rate is mandatory,ரோ {0}: மாற்று வீதம் கட்டாயமாகும்
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},பயனர் ஐடி பணியாளர் அமைக்க{0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +72,Peening,Peening
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,From Warranty Claim,உத்தரவாதத்தை கூறுகின்றனர் இருந்து
 DocType: Stock Entry,Default Source Warehouse,முன்னிருப்பு மூல கிடங்கு
 DocType: Item,Customer Code,வாடிக்கையாளர் கோட்
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +212,Birthday Reminder for {0},பிறந்த நாள் நினைவூட்டல் {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +163,Lapping,படிதல்
-apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.js +8,Days Since Last Order,கடந்த சில நாட்களாக கடைசி ஆர்டர்
+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 +299,Debit To account must be a Balance Sheet account,கணக்கில் பற்று ஒரு ஐந்தொகை கணக்கில் இருக்க வேண்டும்
 DocType: Buying Settings,Naming Series,தொடர் பெயரிடும்
 DocType: Leave Block List,Leave Block List Name,பிளாக் பட்டியல் பெயர் விட்டு
@@ -3646,7 +3496,7 @@
 DocType: Notification Control,Sales Invoice Message,விற்பனை விலைப்பட்டியல் செய்தி
 DocType: Authorization Rule,Based On,அடிப்படையில்
 DocType: Sales Order Item,Ordered Qty,அளவு உத்தரவிட்டார்
-apps/erpnext/erpnext/stock/doctype/item/item.py +539,Item {0} is disabled,பொருள் {0} முடக்கப்பட்டுள்ளது
+apps/erpnext/erpnext/stock/doctype/item/item.py +543,Item {0} is disabled,பொருள் {0} முடக்கப்பட்டுள்ளது
 DocType: Stock Settings,Stock Frozen Upto,பங்கு வரை உறை
 apps/erpnext/erpnext/controllers/recurring_document.py +166,Period From and Period To dates mandatory for recurring {0},வரம்பு மற்றும் காலம் மீண்டும் மீண்டும் கட்டாய தேதிகள் காலம் {0}
 apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,திட்ட செயல்பாடு / பணி.
@@ -3656,7 +3506,6 @@
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,தள்ளுபடி 100 க்கும் குறைவான இருக்க வேண்டும்
 DocType: ToDo,Low,குறைந்த
 DocType: Purchase Invoice,Write Off Amount (Company Currency),தொகை ஆஃப் எழுத (நிறுவனத்தின் நாணய)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +71,Spinning,ஸ்பின்னிங்
 DocType: Landed Cost Voucher,Landed Cost Voucher,Landed செலவு வவுச்சர்
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +55,Please set {0},அமைக்கவும் {0}
 DocType: Purchase Invoice,Repeat on Day of Month,மாதம் ஒரு நாள் மீண்டும்
@@ -3678,7 +3527,6 @@
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +37,Campaign Name is required,பிரச்சாரம் பெயர் தேவைப்படுகிறது
 DocType: Maintenance Visit,Maintenance Date,பராமரிப்பு தேதி
 DocType: Purchase Receipt Item,Rejected Serial No,நிராகரிக்கப்பட்டது சீரியல் இல்லை
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +51,Deep drawing,டீப் வரைதல்
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +40,New Newsletter,புதிய செய்திமடல்
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +157,Start date should be less than end date for Item {0},தொடக்க தேதி பொருள் முடிவு தேதி விட குறைவாக இருக்க வேண்டும் {0}
 apps/erpnext/erpnext/stock/doctype/item/item.js +17,Show Balance,காட்டு இருப்பு
@@ -3689,7 +3537,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +119,BOM and Manufacturing Quantity are required,"BOM, மற்றும் தயாரிப்பு தேவையான அளவு"
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,வயதான ரேஞ்ச் 2
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +450,Amount,அளவு
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +147,Riveting,குடையாணி
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,BOM பதிலாக
 ,Sales Analytics,விற்பனை அனலிட்டிக்ஸ்
 DocType: Manufacturing Settings,Manufacturing Settings,உற்பத்தி அமைப்புகள்
@@ -3701,20 +3548,19 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +207,New Account Name,புதிய கணக்கு பெயர்
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,மூலப்பொருட்கள் விலை வழங்கியது
 DocType: Selling Settings,Settings for Selling Module,தொகுதி விற்பனையான அமைப்புகள்
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +73,Customer Service,வாடிக்கையாளர் சேவை
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Customer Service,வாடிக்கையாளர் சேவை
 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.,ஆஃபர் வேட்பாளர் ஒரு வேலை.
 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 +70,Item {0} must be a stock Item,பொருள் {0} ஒரு பங்கு பொருளாக இருக்க வேண்டும்
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,முன்னேற்றம் கிடங்கில் இயல்புநிலை வேலை
 apps/erpnext/erpnext/config/accounts.py +107,Default settings for accounting transactions.,கணக்கு பரிமாற்றங்கள் இயல்புநிலை அமைப்புகளை .
 apps/frappe/frappe/model/naming.py +40,{0} is required,{0} தேவைப்படுகிறது
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +21,Vacuum molding,வாக்குவம் வடிவமைத்தல்
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,எதிர்பார்க்கப்படுகிறது தேதி பொருள் கோரிக்கை தேதி முன் இருக்க முடியாது
 DocType: Contact Us Settings,City,நகரம்
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +132,Ultrasonic machining,மீயொலி எந்திர
 apps/frappe/frappe/templates/base.html +137,Error: Not a valid id?,பிழை: ஒரு செல்லுபடியாகும் அடையாள?
 apps/erpnext/erpnext/stock/get_item_details.py +125,Item {0} must be a Sales Item,பொருள் {0} ஒரு விற்பனை பொருளாக இருக்க வேண்டும்
 DocType: Naming Series,Update Series Number,மேம்படுத்தல் தொடர் எண்
@@ -3722,7 +3568,7 @@
 DocType: Sales Order,Printing Details,அச்சிடுதல் விபரங்கள்
 DocType: Task,Closing Date,தேதி மூடுவது
 DocType: Sales Order Item,Produced Quantity,உற்பத்தி அளவு
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +84,Engineer,பொறியாளர்
+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 +379,Item Code required at Row No {0},வரிசை எண் தேவையான பொருள் கோட் {0}
 DocType: Sales Partner,Partner Type,வரன்வாழ்க்கை துணை வகை
@@ -3730,7 +3576,7 @@
 DocType: Authorization Rule,Customerwise Discount,Customerwise தள்ளுபடி
 DocType: Purchase Invoice,Against Expense Account,செலவு கணக்கு எதிராக
 DocType: Production Order,Production Order,உற்பத்தி ஆணை
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +258,Installation Note {0} has already been submitted,நிறுவல் குறிப்பு {0} ஏற்கனவே சமர்ப்பித்த
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +263,Installation Note {0} has already been submitted,நிறுவல் குறிப்பு {0} ஏற்கனவே சமர்ப்பித்த
 DocType: Quotation Item,Against Docname,Docname எதிராக
 DocType: SMS Center,All Employee (Active),அனைத்து பணியாளர் (செயலில்)
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,இப்போது காண்க
@@ -3739,19 +3585,19 @@
 DocType: Item,Re-Order Level,மீண்டும் ஒழுங்கு நிலை
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,நீங்கள் உற்பத்தி ஆர்டர்கள் உயர்த்த அல்லது ஆய்வில் மூலப்பொருட்கள் பதிவிறக்க வேண்டிய உருப்படிகளை மற்றும் திட்டமிட்ட அளவு உள்ளிடவும்.
 apps/frappe/frappe/public/js/frappe/views/ganttview.js +45,Gantt Chart,காண்ட் விளக்கப்படம்
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +57,Part-time,பகுதி நேர
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,Part-time,பகுதி நேர
 DocType: Employee,Applicable Holiday List,பொருந்தும் விடுமுறை பட்டியல்
 DocType: Employee,Cheque,காசோலை
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,தொடர் இற்றை
 apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Report Type is mandatory,புகார் வகை கட்டாய ஆகிறது
 DocType: Item,Serial Number Series,வரிசை எண் தொடர்
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},கிடங்கு பங்கு பொருள் கட்டாய {0} வரிசையில் {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +45,Retail & Wholesale,சில்லறை & விற்பனை
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,சில்லறை & விற்பனை
 DocType: Issue,First Responded On,முதல் தேதி இணையம்
 DocType: Website Item Group,Cross Listing of Item in multiple groups,பல குழுக்கள் பொருள் கிராஸ் பட்டியல்
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +351,The First User: You,முதல் பயனர் : நீங்கள்
+apps/erpnext/erpnext/public/js/setup_wizard.js +101,The First User: You,முதல் பயனர் : நீங்கள்
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +48,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 +172,Successfully Reconciled,வெற்றிகரமாக ஒருமைப்படுத்திய
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +119,Successfully Reconciled,வெற்றிகரமாக ஒருமைப்படுத்திய
 DocType: Production Order,Planned End Date,திட்டமிட்ட தேதி
 apps/erpnext/erpnext/config/stock.py +43,Where items are stored.,அங்கு பொருட்களை சேமிக்கப்படும்.
 DocType: Tax Rule,Validity,ஏற்றுக்கொள்ளக்கூடிய
@@ -3771,39 +3617,36 @@
 DocType: DocPerm,Level,நிலை
 DocType: Purchase Taxes and Charges,On Net Total,நிகர மொத்தம் உள்ள
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +160,Target warehouse in row {0} must be same as Production Order,வரிசையில் இலக்கு கிடங்கில் {0} அதே இருக்க வேண்டும் உத்தரவு
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +59,No permission to use Payment Tool,அனுமதி இல்லை கொடுப்பனவு கருவி பயன்படுத்த
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +97,No permission to use Payment Tool,அனுமதி இல்லை கொடுப்பனவு கருவி பயன்படுத்த
 apps/erpnext/erpnext/controllers/recurring_document.py +192,'Notification Email Addresses' not specified for recurring %s,% கள் மீண்டும் மீண்டும் குறிப்பிடப்படவில்லை 'அறிவிப்பு மின்னஞ்சல் முகவரிகளில்'
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +86,Milling,அரைக்கும்
 apps/erpnext/erpnext/accounts/doctype/account/account.py +99,Currency can not be changed after making entries using some other currency,நாணய வேறு நாணயங்களுக்கு பயன்படுத்தி உள்ளீடுகள் செய்வதில் பிறகு மாற்றிக்கொள்ள
 DocType: Company,Round Off Account,கணக்கு ஆஃப் சுற்றுக்கு
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +60,Nibbling,நிப்பிலிங்
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,நிர்வாக செலவுகள்
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +18,Consulting,ஆலோசனை
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +18,Consulting,ஆலோசனை
 DocType: Customer Group,Parent Customer Group,பெற்றோர் வாடிக்கையாளர் பிரிவு
 apps/erpnext/erpnext/public/js/pos/pos.js +429,Change,மாற்றம்
 DocType: Purchase Invoice,Contact Email,மின்னஞ்சல் தொடர்பு
 DocType: Appraisal Goal,Score Earned,ஜூலை ஈட்டிய
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +393,"e.g. ""My Company LLC""","உதாரணமாக, ""என் கம்பெனி எல்எல்சி"""
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +173,Notice Period,அறிவிப்பு காலம்
+apps/erpnext/erpnext/public/js/setup_wizard.js +141,"e.g. ""My Company LLC""","உதாரணமாக, ""என் கம்பெனி எல்எல்சி"""
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +173,Notice Period,அறிவிப்பு காலம்
 DocType: Bank Reconciliation Detail,Voucher ID,ரசீது அடையாள
 apps/erpnext/erpnext/setup/doctype/territory/territory.js +14,This is a root territory and cannot be edited.,இந்த வேர் பகுதியில் மற்றும் திருத்த முடியாது .
 DocType: Packing Slip,Gross Weight UOM,மொத்த எடை மொறட்டுவ பல்கலைகழகம்
 DocType: Email Digest,Receivables / Payables,வரவுகள் / Payables
 DocType: Delivery Note Item,Against Sales Invoice,விற்பனை விலைப்பட்டியல் எதிராக
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +63,Stamping,ஸ்டாம்பிங்
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +457,Credit Account,கடன் கணக்கு
 DocType: Landed Cost Item,Landed Cost Item,இறங்கினார் செலவு உருப்படி
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +56,Show zero values,பூஜ்ய மதிப்புகள் காட்டு
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,உருப்படி அளவு மூலப்பொருட்களை கொடுக்கப்பட்ட அளவு இருந்து உற்பத்தி / repacking பின்னர் பெறப்படும்
 DocType: Payment Reconciliation,Receivable / Payable Account,பெறத்தக்க / செலுத்த வேண்டிய கணக்கு
 DocType: Delivery Note Item,Against Sales Order Item,விற்பனை ஆணை பொருள் எதிராக
-apps/erpnext/erpnext/stock/doctype/item/item.py +521,Please specify Attribute Value for attribute {0},பண்பு மதிப்பு பண்பு குறிப்பிடவும் {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +525,Please specify Attribute Value for attribute {0},பண்பு மதிப்பு பண்பு குறிப்பிடவும் {0}
 DocType: Item,Default Warehouse,இயல்புநிலை சேமிப்பு கிடங்கு
 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,மொத்த தொகை இல்லாமல் அச்சிட
-apps/erpnext/erpnext/controllers/buying_controller.py +69,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,வரி பகுப்பு ' மதிப்பீட்டு ' அல்லது ' மதிப்பீடு மற்றும் மொத்த ' அனைத்து பொருட்களை அல்லாத பங்கு பொருட்களை இருக்க முடியாது
+apps/erpnext/erpnext/controllers/buying_controller.py +60,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,வரி பகுப்பு ' மதிப்பீட்டு ' அல்லது ' மதிப்பீடு மற்றும் மொத்த ' அனைத்து பொருட்களை அல்லாத பங்கு பொருட்களை இருக்க முடியாது
 DocType: User,Last Name,கடந்த பெயர்
 DocType: Web Page,Left,விட்டு
 DocType: Event,All Day,அனைத்து தினம்
@@ -3811,7 +3654,7 @@
 DocType: Appraisal,Total Score (Out of 5),மொத்த மதிப்பெண் (5 அவுட்)
 DocType: Contact Us Settings,State,நிலை
 DocType: Batch,Batch,கூட்டம்
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +51,Balance,இருப்பு
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +28,Balance,இருப்பு
 DocType: Project,Total Expense Claim (via Expense Claims),மொத்த செலவு கூறுகின்றனர் (செலவு பற்றிய கூற்றுக்கள் வழியாக)
 DocType: User,Gender,பாலினம்
 DocType: Journal Entry,Debit Note,பற்றுக்குறிப்பு
@@ -3841,8 +3684,7 @@
 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/setup/page/setup_wizard/fixtures/operations.py +76,Seaming,Seaming
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +197,"Company Email ID not found, hence mail not sent","நிறுவனத்தின் மின்னஞ்சல் ஐடி இல்லை , எனவே அனுப்பிய மின்னஞ்சல்"
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +206,"Company Email ID not found, hence mail not sent","நிறுவனத்தின் மின்னஞ்சல் ஐடி இல்லை , எனவே அனுப்பிய மின்னஞ்சல்"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),நிதி பயன்பாடு ( சொத்துக்கள் )
 DocType: Production Planning Tool,Filter based on item,உருப்படியை அடிப்படையில் வடிகட்ட
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +451,Debit Account,பற்று கணக்கு
@@ -3854,17 +3696,16 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +95,{0} {1} has been modified. Please refresh.,{0} {1} மாற்றப்பட்டுள்ளது . புதுப்பிக்கவும்.
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,பின்வரும் நாட்களில் விடுப்பு விண்ணப்பங்கள் செய்து பயனர்களை நிறுத்த.
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +591,From Opportunity,வாய்ப்பை இருந்து
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +46,Blanking,வெற்று
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +166,Employee Benefits,பணியாளர் நன்மைகள்
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,Employee Benefits,பணியாளர் நன்மைகள்
 DocType: Sales Invoice,Is POS,பிஓஎஸ் உள்ளது
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +240,Packed quantity must equal quantity for Item {0} in row {1},{0} வரிசையில் {1} நிரம்பிய அளவு உருப்படி அளவு சமமாக வேண்டும்
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +245,Packed quantity must equal quantity for Item {0} in row {1},{0} வரிசையில் {1} நிரம்பிய அளவு உருப்படி அளவு சமமாக வேண்டும்
 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.,பில்கள் வாடிக்கையாளர்கள் உயர்த்தப்பட்டுள்ளது.
 DocType: DocField,Default,தவறுதல்
 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 +466,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},ரோ இல்லை {0}: தொகை செலவு கூறுகின்றனர் {1} எதிராக தொகை நிலுவையில் விட அதிகமாக இருக்க முடியாது. நிலுவையில் அளவு {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +468,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} சந்தாதாரர்கள் சேர்ந்தன
 DocType: Maintenance Schedule,Schedule,அனுபந்தம்
 DocType: Cost Center,"Define Budget for this Cost Center. To set budget action, see ""Company List""","இந்த செலவு மையம் பட்ஜெட் வரையறை. பட்ஜெட் அமைக்க, பார்க்க &quot;நிறுவனத்தின் பட்டியல்&quot;"
@@ -3875,7 +3716,7 @@
 apps/erpnext/erpnext/public/js/pos/pos.js +91,Price List not found or disabled,விலை பட்டியல் காணப்படும் அல்லது ஊனமுற்ற
 DocType: Expense Claim,Approved,ஏற்பளிக்கப்பட்ட
 DocType: Pricing Rule,Price,விலை
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +79,Employee relieved on {0} must be set as 'Left',{0} ம் நிம்மதியாக பணியாளர் 'இடது' அமைக்க வேண்டும்
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +88,Employee relieved on {0} must be set as 'Left',{0} ம் நிம்மதியாக பணியாளர் 'இடது' அமைக்க வேண்டும்
 DocType: Item,"Selecting ""Yes"" will give a unique identity to each entity of this item which can be viewed in the Serial No master.",&quot;ஆமாம்&quot; தேர்வு தொடர் மாஸ்டர் இல்லை காணலாம் இந்த உருப்படியை ஒவ்வொரு நிறுவனம் ஒரு தனிப்பட்ட அடையாள கொடுக்கும்.
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +39,Appraisal {0} created for Employee {1} in the given date range,மதிப்பீடு {0} {1} தேதியில் வரம்பில் பணியாளர் உருவாக்கப்பட்டது
 DocType: Employee,Education,கல்வி
@@ -3886,7 +3727,7 @@
 apps/frappe/frappe/desk/moduleview.py +67,Standard Reports,ஸ்டாண்டர்ட் அறிக்கைகள்
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,பைனான்ஸ் ஜர்னல் பதிவுகள்.
 DocType: Delivery Note Item,Available Qty at From Warehouse,கிடங்கில் இருந்து கிடைக்கும் அளவு
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +209,Please select Employee Record first.,முதல் பணியாளர் பதிவு தேர்ந்தெடுத்து கொள்ளவும்.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +224,Please select Employee Record first.,முதல் பணியாளர் பதிவு தேர்ந்தெடுத்து கொள்ளவும்.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,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 +233,Please enter Expense Account,செலவு கணக்கு உள்ளிடவும்
@@ -3899,46 +3740,43 @@
 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,மேலே அடிப்படை அடிப்படையில் விற்பனை ஆணைகள் (வழங்க நிலுவையில்) இழுக்க
 DocType: DocShare,Document Type,ஆவண வகை
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +565,From Supplier Quotation,வழங்குபவர் கூறியவை
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +588,From Supplier Quotation,வழங்குபவர் கூறியவை
 DocType: Deduction Type,Deduction Type,துப்பறியும் வகை
 DocType: Attendance,Half Day,அரை நாள்
 DocType: Pricing Rule,Min Qty,min அளவு
 DocType: Features Setup,"To track items in sales and purchase documents with batch nos. ""Preferred Industry: Chemicals""",தொகுதி இலக்கங்கள் கொண்ட விற்பனை மற்றும் கொள்முதல் ஆவணங்களில் பொருட்களை கண்காணிக்க. &quot;விருப்பமான தொழில்: கெமிக்கல்ஸ்&quot;
 DocType: GL Entry,Transaction Date,பரிவர்த்தனை தேதி
 DocType: Production Plan Item,Planned Qty,திட்டமிட்ட அளவு
-apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +91,Total Tax,மொத்த வரி
+apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +93,Total Tax,மொத்த வரி
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +178,For Quantity (Manufactured Qty) is mandatory,அளவு (அளவு உற்பத்தி) என்பது கட்டாயம்
 DocType: Stock Entry,Default Target Warehouse,முன்னிருப்பு அடைவு கிடங்கு
 DocType: Purchase Invoice,Net Total (Company Currency),நிகர மொத்தம் (நிறுவனத்தின் கரன்சி)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +79,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,ரோ {0}: கட்சி வகை மற்றும் கட்சி பெறத்தக்க / செலுத்த வேண்டிய கணக்கை எதிராக மட்டுமே பொருந்தும்
 DocType: Notification Control,Purchase Receipt Message,ரசீது செய்தி வாங்க
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +95,Total allocated leaves are more than period,மொத்த ஒதுக்கீடு இலைகள் காலம் விட
 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.,உருப்படியை இயக்கம் பதிவு.
 DocType: Newsletter List Subscriber,Newsletter List Subscriber,செய்திமடல் பட்டியல் சந்தாதாரர்
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +164,Morticing,Morticing
 DocType: Email Account,Service,சேவை
 DocType: Hub Settings,Hub Settings,ஹப் அமைப்புகள்
 DocType: Project,Gross Margin %,மொத்த அளவு%
 DocType: BOM,With Operations,செயல்பாடுகள் மூலம்
 apps/erpnext/erpnext/accounts/party.py +232,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,கணக்கு உள்ளீடுகளை ஏற்கனவே நாணய செய்யப்பட்டுள்ளது {0} நிறுவனம் {1}. நாணயத்துடன் ஒரு பெறத்தக்க செலுத்தவேண்டிய கணக்கைத் தேர்ந்தெடுக்கவும் {0}.
 ,Monthly Salary Register,மாத சம்பளம் பதிவு
-apps/frappe/frappe/website/template.py +140,Next,அடுத்து
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard_page.html +17,Next,அடுத்து
 DocType: Warranty Claim,If different than customer address,என்றால் வாடிக்கையாளர் தான் முகவரி விட வேறு
 DocType: BOM Operation,BOM Operation,BOM ஆபரேஷன்
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +118,Electropolishing,Electropolishing
 DocType: Purchase Taxes and Charges,On Previous Row Amount,முந்தைய வரிசை தொகை
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +24,Please enter Payment Amount in atleast one row,குறைந்தது ஒரு வரிசையில் செலுத்தும் தொகை உள்ளிடவும்
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +33,Please enter Payment Amount in atleast one row,குறைந்தது ஒரு வரிசையில் செலுத்தும் தொகை உள்ளிடவும்
 DocType: POS Profile,POS Profile,பிஓஎஸ் செய்தது
 apps/erpnext/erpnext/config/accounts.py +153,"Seasonality for setting budgets, targets etc.","அமைக்க வரவு செலவு திட்டம், இலக்குகளை முதலியன உங்கம்மா"
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +238,Row {0}: Payment Amount cannot be greater than Outstanding Amount,ரோ {0}: பணம் அளவு நிலுவை தொகை விட அதிகமாக இருக்க முடியாது
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +46,Total Unpaid,செலுத்தப்படாத மொத்த
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +21,Time Log is not billable,நேரம் பதிவு பில் இல்லை
 apps/erpnext/erpnext/stock/get_item_details.py +128,"Item {0} is a template, please select one of its variants","{0} பொருள் ஒரு டெம்ப்ளேட் உள்ளது, அதன் வகைகள் ஒன்றைத் தேர்ந்தெடுக்கவும்"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +528,Purchaser,வாங்குபவர்
+apps/erpnext/erpnext/public/js/setup_wizard.js +272,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 +71,Please enter the Against Vouchers manually,கைமுறையாக எதிராக உறுதி சீட்டு உள்ளிடவும்
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +107,Please enter the Against Vouchers manually,கைமுறையாக எதிராக உறுதி சீட்டு உள்ளிடவும்
 DocType: SMS Settings,Static Parameters,நிலையான அளவுருக்களை
 DocType: Purchase Order,Advance Paid,முன்பணம்
 DocType: Item,Item Tax,உருப்படியை வரி
@@ -3947,14 +3785,12 @@
 apps/erpnext/erpnext/config/crm.py +48,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 +57,Actual Qty is mandatory,உண்மையான அளவு கட்டாய ஆகிறது
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +42,Cross-rolling,குறுக்கு உருட்டல்
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +132,Credit Card,கடன் அட்டை
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +132,Credit Card,கடன் அட்டை
 DocType: BOM,Item to be manufactured or repacked,உருப்படியை உற்பத்தி அல்லது repacked வேண்டும்
 apps/erpnext/erpnext/config/stock.py +95,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,வரிகள் மற்றும் கட்டணங்கள் உள்ளிடவும்
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +85,Machining,எந்திர
 DocType: Sales Invoice Item,Drop Ship,டிராப் கப்பல்
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","இங்கே நீங்கள் பெற்றோர், மனைவி மற்றும் குழந்தைகள் பெயர் மற்றும் ஆக்கிரமிப்பு போன்ற குடும்ப விவரங்கள் பராமரிக்க முடியும்"
 DocType: Hub Settings,Seller Name,விற்பனையாளர் பெயர்
@@ -3964,7 +3800,7 @@
 DocType: Stock Entry,Repack,RePack
 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/setup/page/setup_wizard/setup_wizard.js +500,Attach Logo,லோகோ இணைக்கவும்
+apps/erpnext/erpnext/public/js/setup_wizard.js +246,Attach Logo,லோகோ இணைக்கவும்
 DocType: Customer,Commission Rate,கமிஷன் விகிதம்
 apps/erpnext/erpnext/stock/doctype/item/item.js +38,Make Variant,மாற்று செய்ய
 apps/erpnext/erpnext/config/hr.py +145,Block leave applications by department.,துறை மூலம் பயன்பாடுகள் விட்டு தடுக்கும்.
@@ -3979,19 +3815,19 @@
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +105,Please select a csv file,ஒரு கோப்பை தேர்ந்தெடுக்கவும்
 DocType: Dropbox Backup,Send Backups to Dropbox,டிராப்பாக்ஸ் காப்பு அனுப்பவும்
 DocType: Purchase Order,To Receive and Bill,பெறுதல் மற்றும் பில்
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +94,Designer,வடிவமைப்புகள்
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Designer,வடிவமைப்புகள்
 apps/erpnext/erpnext/config/selling.py +121,Terms and Conditions Template,நிபந்தனைகள் வார்ப்புரு
 DocType: Serial No,Delivery Details,விநியோக விவரம்
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +383,Cost Center is required in row {0} in Taxes table for type {1},செலவு மையம் வரிசையில் தேவைப்படுகிறது {0} வரி அட்டவணையில் வகை {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +386,Cost Center is required in row {0} in Taxes table for type {1},செலவு மையம் வரிசையில் தேவைப்படுகிறது {0} வரி அட்டவணையில் வகை {1}
 DocType: Item,Automatically create Material Request if quantity falls below this level,அளவு இந்த அளவு கீழே விழும் என்றால் தானாக பொருள் வேண்டுதல் உருவாக்க
 ,Item-wise Purchase Register,உருப்படியை வாரியான வாங்குதல் பதிவு
 DocType: Batch,Expiry Date,காலாவதியாகும் தேதி
-apps/erpnext/erpnext/stock/doctype/item/item.py +375,"To set reorder level, item must be a Purchase Item or Manufacturing Item","மீள் கட்டளை நிலை அமைக்க, உருப்படி ஒரு கொள்முதல் பொருள் அல்லது தயாரிப்பு பொருள் இருக்க வேண்டும்"
+apps/erpnext/erpnext/stock/doctype/item/item.py +379,"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.,திட்டம் மாஸ்டர்.
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,நாணயங்கள் அடுத்த $ ஹிப்ரு போன்றவை எந்த சின்னம் காட்டாதே.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +330, (Half Day),(அரை நாள்)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +374, (Half Day),(அரை நாள்)
 DocType: Supplier,Credit Days,கடன் நாட்கள்
 DocType: Leave Type,Is Carry Forward,அடுத்த Carry
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +478,Get Items from BOM,BOM இருந்து பொருட்களை பெற
@@ -3999,7 +3835,7 @@
 apps/erpnext/erpnext/config/manufacturing.py +120,Bill of Materials,பொருட்களின் பில்
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +77,Row {0}: Party Type and Party is required for Receivable / Payable account {1},ரோ {0}: கட்சி வகை மற்றும் கட்சி பெறத்தக்க / செலுத்த வேண்டிய கணக்கிற்கு தேவையான {1}
 DocType: Dropbox Backup,Send Notifications To,அறிவிப்புகளை அனுப்பவும்
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html +26,Ref Date,Ref தேதி
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +54,Ref Date,Ref தேதி
 DocType: Employee,Reason for Leaving,விட்டு காரணம்
 DocType: Expense Claim Detail,Sanctioned Amount,ஒப்புதல் தொகை
 DocType: GL Entry,Is Opening,திறக்கிறது
@@ -4007,4 +3843,3 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +188,Account {0} does not exist,கணக்கு {0} இல்லை
 DocType: Account,Cash,பணம்
 DocType: Employee,Short biography for website and other publications.,இணையதளம் மற்றும் பிற வெளியீடுகள் குறுகிய வாழ்க்கை.
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +31,Please create Salary Structure for employee {0},ஊழியர் சம்பள கட்டமைப்பை உருவாக்க தயவுசெய்து {0}
diff --git a/erpnext/translations/th.csv b/erpnext/translations/th.csv
index 7f7f57c..eee7623 100644
--- a/erpnext/translations/th.csv
+++ b/erpnext/translations/th.csv
@@ -1,13 +1,12 @@
 DocType: Employee,Salary Mode,โหมดเงินเดือน
 DocType: Cost Center,"Select Monthly Distribution, if you want to track based on seasonality.",เลือกการกระจายรายเดือนถ้าคุณต้องการที่จะติดตามการขึ้นอยู่กับฤดูกาล
 DocType: Employee,Divorced,หย่าร้าง
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +86,Warning: Same item has been entered multiple times.,คำเตือน: รายการเดียวกันได้รับการป้อนหลายครั้ง
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +80,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,อนุญาตให้รายการที่จะเพิ่มหลายครั้งในการทำธุรกรรม
 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/page/setup_wizard/fixtures/industry_type.py +19,Consumer Products,สินค้าอุปโภคบริโภค
+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,กรุณาเลือกประเภทพรรคแรก
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +90,Annealing,การหลอม
 DocType: Item,Customer Items,รายการลูกค้า
 apps/erpnext/erpnext/accounts/doctype/account/account.py +45,Account {0}: Parent account {1} can not be a ledger,บัญชี {0}: บัญชีผู้ปกครอง {1} ไม่สามารถแยกประเภท
 DocType: Item,Publish Item to hub.erpnext.com,เผยแพร่รายการที่จะ hub.erpnext.com
@@ -20,15 +19,14 @@
 DocType: About Us Settings,Website,เว็บไซต์
 DocType: POS Profile,Applicable for User,ใช้งานได้สำหรับผู้ใช้
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +169,"Stopped Production Order cannot be cancelled, Unstop it first to cancel",หยุดใบสั่งผลิตไม่สามารถยกเลิกจุกมันเป็นครั้งแรกที่จะยกเลิก
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +23,Compaction plus sintering,รถบดรวมทั้งการเผา
 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.,* จะได้รับการคำนวณในการทำธุรกรรม
 DocType: Purchase Order,Customer Contact,ติดต่อลูกค้า
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +549,From Material Request,ขอ จาก วัสดุ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +572,From Material Request,ขอ จาก วัสดุ
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} ต้นไม้
 DocType: Job Applicant,Job Applicant,ผู้สมัครงาน
 apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,ไม่มีผลมากขึ้น
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +78,Legal,ถูกกฎหมาย
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +34,Legal,ถูกกฎหมาย
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +114,Actual type tax cannot be included in Item rate in row {0},ประเภทภาษีที่เกิดขึ้นจริงไม่สามารถรวมอยู่ในราคาสินค้าในแถว {0}
 DocType: C-Form,Customer,ลูกค้า
 DocType: Purchase Receipt Item,Required By,ที่จำเป็นโดย
@@ -43,7 +41,6 @@
 DocType: Manufacturing Settings,Default 10 mins,เริ่มต้น 10 นาที
 DocType: Leave Type,Leave Type Name,ฝากชื่อประเภท
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +148,Series Updated Successfully,ชุด ล่าสุด ที่ประสบความสำเร็จ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +150,Stitching,เย็บ
 DocType: Pricing Rule,Apply On,สมัคร เมื่อวันที่
 DocType: Item Price,Multiple Item prices.,ราคา หลายรายการ
 ,Purchase Order Items To Be Received,รายการสั่งซื้อที่จะได้รับ
@@ -51,8 +48,8 @@
 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 +104,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 +189,New Leave Application,แอพลิเคชันออกใหม่
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +134,Bank Draft,ตั๋วแลกเงิน
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +204,New Leave Application,แอพลิเคชันออกใหม่
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +134,Bank Draft,ตั๋วแลกเงิน
 DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,1 เพื่อรักษารหัสรายการลูกค้าที่ฉลาดและจะทำให้พวกเขาค้นหาตามรหัสของพวกเขาใช้ตัวเลือกนี้
 DocType: Mode of Payment Account,Mode of Payment Account,โหมดของการบัญชีการชำระเงิน
 apps/erpnext/erpnext/stock/doctype/item/item.js +34,Show Variants,แสดงหลากหลายรูปแบบ
@@ -64,25 +61,23 @@
 DocType: Production Plan Item,Production Plan Item,สินค้าแผนการผลิต
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +141,User {0} is already assigned to Employee {1},ผู้ใช้ {0} จะถูก กำหนดให้กับ พนักงาน {1}
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +13,Make new POS Profile,ให้รายละเอียด POS ใหม่
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +31,Health Care,การดูแลสุขภาพ
+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 +494,Invoice,ใบกำกับสินค้า
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +519,Invoice,ใบกำกับสินค้า
 DocType: Maintenance Schedule Item,Periodicity,การเป็นช่วง ๆ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +357,Email Address,ที่อยู่อีเมล
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +21,Defense,ฝ่ายจำเลย
+apps/erpnext/erpnext/public/js/setup_wizard.js +107,Email Address,ที่อยู่อีเมล
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,ฝ่ายจำเลย
 DocType: Company,Abbr,ตัวอักษรย่อ
 DocType: Appraisal Goal,Score (0-5),คะแนน (0-5)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +193,Row {0}: {1} {2} does not match with {3},แถว {0}: {1} {2} ไม่ตรงกับ {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +67,Row # {0}:,แถว # {0}:
 DocType: Delivery Note,Vehicle No,รถไม่มี
 apps/erpnext/erpnext/public/js/pos/pos.js +528,Please select Price List,เลือกรายชื่อราคา
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +162,Woodworking,งานไม้
 DocType: Production Order Operation,Work In Progress,ทำงานในความคืบหน้า
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +153,3D printing,การพิมพ์ 3 มิติ
 DocType: Employee,Holiday List,รายการวันหยุด
 DocType: Time Log,Time Log,บันทึกเวลา
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +530,Accountant,นักบัญชี
+apps/erpnext/erpnext/public/js/setup_wizard.js +274,Accountant,นักบัญชี
 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.",บันทึกกิจกรรมที่ดำเนินการโดยผู้ใช้ ในงานต่างๆ ซึ่งสามารถใช้ติดตามเวลา หรือออกใบเสร็จได้
@@ -98,18 +93,19 @@
 DocType: Bin,Quantity Requested for Purchase,ปริมาณที่ขอซื้อ
 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/setup/page/setup_wizard/setup_wizard.js +626,Kg,กิโลกรัม
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Kg,กิโลกรัม
 apps/erpnext/erpnext/config/hr.py +48,Opening for a Job.,เปิดงาน
 DocType: Item Attribute,Increment,การเพิ่มขึ้น
 apps/erpnext/erpnext/public/js/stock_analytics.js +63,Select Warehouse...,เลือกคลังสินค้า ...
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +6,Advertising,การโฆษณา
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,การโฆษณา
+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/doctype/sales_invoice/sales_invoice.py +389,Stock cannot be updated against Delivery Note {0},หุ้น ไม่สามารถปรับปรุง กับ การจัดส่งสินค้า หมายเหตุ {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +391,Stock cannot be updated against Delivery Note {0},หุ้น ไม่สามารถปรับปรุง กับ การจัดส่งสินค้า หมายเหตุ {0}
 DocType: Payment Reconciliation,Reconcile,คืนดี
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +30,Grocery,ร้านขายของชำ
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,ร้านขายของชำ
 DocType: Quality Inspection Reading,Reading 1,Reading 1
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Make Bank Entry,ให้ธนาคารเข้า
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +40,Pension Funds,กองทุน บำเหน็จบำนาญ
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,กองทุน บำเหน็จบำนาญ
 apps/erpnext/erpnext/accounts/doctype/account/account.py +142,Warehouse is mandatory if account type is Warehouse,คลังสินค้ามีผลบังคับใช้ถ้าเป็นประเภทบัญชีคลังสินค้า
 DocType: SMS Center,All Sales Person,คนขายทั้งหมด
 DocType: Lead,Person Name,คนที่ชื่อ
@@ -131,7 +127,7 @@
 DocType: Quality Inspection,Get Specification Details,ดูรายละเอียดสเปค
 DocType: Lead,Interested,สนใจ
 apps/erpnext/erpnext/config/manufacturing.py +14,Bill of Material,รายการวัสดุ
-apps/erpnext/erpnext/public/js/stock_analytics.js +45,Opening,การเปิด
+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,คัดลอกจากกลุ่มสินค้า
 DocType: Journal Entry,Opening Entry,เปิดรายการ
@@ -145,23 +141,22 @@
 DocType: Employee Education,Under Graduate,ภายใต้บัณฑิต
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +22,Target On,เป้าหมาย ที่
 DocType: BOM,Total Cost,ค่าใช้จ่ายรวม
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +99,Reaming,คว้าน
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +9,Activity Log:,บันทึกกิจกรรม:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +199,Item {0} does not exist in the system or has expired,รายการที่ {0} ไม่อยู่ใน ระบบหรือ หมดอายุแล้ว
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +44,Real Estate,อสังหาริมทรัพย์
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +44,Real Estate,อสังหาริมทรัพย์
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +4,Statement of Account,งบบัญชี
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +41,Pharmaceuticals,ยา
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,ยา
 DocType: Expense Claim Detail,Claim Amount,จำนวนการเรียกร้อง
 DocType: Employee,Mr,นาย
 DocType: Custom Script,Client,ลูกค้า
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,ประเภท ผู้ผลิต / ผู้จัดจำหน่าย
 DocType: Naming Series,Prefix,อุปสรรค
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Consumable,วัสดุสิ้นเปลือง
+apps/erpnext/erpnext/public/js/setup_wizard.js +359,Consumable,วัสดุสิ้นเปลือง
 DocType: Upload Attendance,Import Log,นำเข้าสู่ระบบ
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.js +19,Send,ส่ง
 DocType: Sales Invoice Item,Delivered By Supplier,จัดส่งโดยผู้ผลิต
 DocType: SMS Center,All Contact,ติดต่อทั้งหมด
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +164,Annual Salary,เงินเดือนประจำปี
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +164,Annual Salary,เงินเดือนประจำปี
 DocType: Period Closing Voucher,Closing Fiscal Year,ปิดปีงบประมาณ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +69,Stock Expenses,ค่าใช้จ่ายใน สต็อก
 DocType: Newsletter,Email Sent?,อีเมลที่ส่ง?
@@ -169,7 +164,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +92,Show Time Logs,แสดงบันทึกเวลา
 DocType: Journal Entry Account,Credit in Company Currency,เครดิตสกุลเงินใน บริษัท
 DocType: Delivery Note,Installation Status,สถานะการติดตั้ง
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +115,Accepted + Rejected Qty must be equal to Received quantity for Item {0},จำนวนสินค้าที่ผ่านการตรวจรับ + จำนวนสินค้าที่ไม่ผ่านการตรวจรับ จะต้องมีปริมาณเท่ากับ  จำนวน สืนค้าที่ได้รับ สำหรับ รายการ {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +118,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 +133,Item {0} must be a Purchase Item,รายการ {0} จะต้องมี การสั่งซื้อ สินค้า
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
@@ -177,19 +172,17 @@
  ทุกวันและการรวมกันของพนักงานในระยะเวลาที่เลือกจะมาในแม่แบบที่มีการบันทึกการเข้าร่วมที่มีอยู่"
 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 +493,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included",จะรวมถึง ภาษี ในแถว {0} ใน อัตรา รายการ ภาษี ใน แถว {1} จะต้องรวม
+apps/erpnext/erpnext/controllers/accounts_controller.py +494,"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 +90,Settings for HR Module,การตั้งค่าสำหรับ โมดูล ทรัพยากรบุคคล
 DocType: SMS Center,SMS Center,ศูนย์ SMS
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +78,Straightening,ยืด
 DocType: BOM Replace Tool,New BOM,BOM ใหม่
 apps/erpnext/erpnext/config/projects.py +28,Batch Time Logs for billing.,บันทึกเวลา Batch สำหรับการเรียกเก็บเงิน
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +15,Countergravity casting,หล่อ Countergravity
 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/setup/page/setup_wizard/fixtures/industry_type.py +14,Broadcasting,บรอดคาสติ้ง
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +140,Execution,การปฏิบัติ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +364,The first user will become the System Manager (you can change this later).,ผู้ใช้คนแรกจะกลายเป็นตัวจัดการระบบ (คุณสามารถเปลี่ยนภายหลัง)
+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/public/js/setup_wizard.js +114,The first user will become the System Manager (you can change this later).,ผู้ใช้คนแรกจะกลายเป็นตัวจัดการระบบ (คุณสามารถเปลี่ยนภายหลัง)
 apps/erpnext/erpnext/config/manufacturing.py +39,Details of the operations carried out.,รายละเอียดของการดำเนินการดำเนินการ
 DocType: Serial No,Maintenance Status,สถานะการบำรุงรักษา
 apps/erpnext/erpnext/config/stock.py +263,Items and Pricing,รายการและราคา
@@ -206,7 +199,6 @@
 DocType: Pricing Rule,Discount on Price List Rate (%),ส่วนลดราคา Rate (%)
 apps/frappe/frappe/public/js/frappe/form/print.js +96,Start,เริ่มต้น
 DocType: User,First Name,ชื่อแรก
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +12,Full-mold casting,หล่อเต็มแม่พิมพ์
 DocType: Offer Letter,Select Terms and Conditions,เลือกข้อตกลงและเงื่อนไข
 DocType: Production Planning Tool,Sales Orders,ใบสั่งขาย
 DocType: Purchase Taxes and Charges,Valuation,การประเมินค่า
@@ -218,8 +210,7 @@
 DocType: Bank Reconciliation,Bank Account,บัญชีเงินฝาก
 DocType: Leave Type,Allow Negative Balance,อนุญาตให้ยอดคงเหลือติดลบ
 DocType: Selling Settings,Default Territory,ดินแดนเริ่มต้น
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +53,Television,โทรทัศน์
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +138,Gashing,Gashing
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,โทรทัศน์
 DocType: Production Order Operation,Updated via 'Time Log',ปรับปรุงแล้วทาง 'บันทึกเวลา'
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +82,Account {0} does not belong to Company {1},บัญชี {0} ไม่ได้เป็นของ บริษัท {1}
 DocType: Naming Series,Series List for this Transaction,รายชื่อชุดสำหรับการทำธุรกรรมนี้
@@ -234,14 +225,13 @@
 DocType: Leave Allocation,Add unused leaves from previous allocations,เพิ่มใบไม่ได้ใช้จากการจัดสรรก่อนหน้า
 apps/erpnext/erpnext/controllers/recurring_document.py +206,Next Recurring {0} will be created on {1},ที่เกิดขึ้นต่อไป {0} จะถูกสร้างขึ้นบน {1}
 DocType: Newsletter List,Total Subscribers,สมาชิกทั้งหมด
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +575,Contact Name,ชื่อผู้ติดต่อ
+,Contact Name,ชื่อผู้ติดต่อ
 DocType: Production Plan Item,SO Pending Qty,ดังนั้นรอจำนวน
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,สร้างสลิปเงินเดือนสำหรับเกณฑ์ดังกล่าวข้างต้น
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,ขอซื้อ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +107,Double housing,ที่อยู่อาศัยที่มีเตียงคู่
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +156,Only the selected Leave Approver can submit this Leave Application,เพียง เลือก ผู้อนุมัติ ออกสามารถส่ง ออกจาก โปรแกรมนี้
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +171,Only the selected Leave Approver can submit this Leave Application,เพียง เลือก ผู้อนุมัติ ออกสามารถส่ง ออกจาก โปรแกรมนี้
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,บรรเทา วันที่ ต้องมากกว่า วันที่ เข้าร่วม
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +172,Leaves per Year,ใบต่อปี
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +172,Leaves per Year,ใบต่อปี
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup > Settings > Naming Series,กรุณาตั้งค่าการตั้งชื่อซีรีส์สำหรับ {0} ผ่านการตั้งค่า&gt; การตั้งค่า&gt; การตั้งชื่อซีรีส์
 DocType: Time Log,Will be updated when batched.,จะมีการปรับปรุงเมื่อ batched
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +104,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,แถว {0}: โปรดตรวจสอบ 'เป็นล่วงหน้า' กับบัญชี {1} ถ้านี้เป็นรายการล่วงหน้า
@@ -250,25 +240,24 @@
 DocType: Item Website Specification,Item Website Specification,สเปกเว็บไซต์รายการ
 DocType: Dropbox Backup,Dropbox Access Key,ที่สำคัญในการเข้าถึง Dropbox
 DocType: Payment Tool,Reference No,อ้างอิง
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +348,Leave Blocked,ฝากที่ถูกบล็อก
-apps/erpnext/erpnext/stock/doctype/item/item.py +535,Item {0} has reached its end of life on {1},รายการ {0} ได้ ถึงจุดสิ้นสุด ของ ชีวิตบน {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +392,Leave Blocked,ฝากที่ถูกบล็อก
+apps/erpnext/erpnext/stock/doctype/item/item.py +539,Item {0} has reached its end of life on {1},รายการ {0} ได้ ถึงจุดสิ้นสุด ของ ชีวิตบน {1}
 apps/erpnext/erpnext/accounts/utils.py +339,Annual,ประจำปี
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,สต็อกสินค้าสมานฉันท์
 DocType: Stock Entry,Sales Invoice No,ขายใบแจ้งหนี้ไม่มี
 DocType: Material Request Item,Min Order Qty,จำนวนสั่งซื้อขั้นต่ำ
 DocType: Lead,Do Not Contact,ไม่ ติดต่อ
 DocType: Sales Invoice,The unique id for tracking all recurring invoices. It is generated on submit.,ID ไม่ซ้ำกันสำหรับการติดตามใบแจ้งหนี้ที่เกิดขึ้นทั้งหมด มันถูกสร้างขึ้นเมื่อส่ง
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +93,Software Developer,นักพัฒนาซอฟต์แวร์
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +93,Software Developer,นักพัฒนาซอฟต์แวร์
 DocType: Item,Minimum Order Qty,จำนวนสั่งซื้อขั้นต่ำ
 DocType: Pricing Rule,Supplier Type,ประเภทผู้ผลิต
 DocType: Item,Publish in Hub,เผยแพร่ใน Hub
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +555,Item {0} is cancelled,รายการ {0} จะถูกยกเลิก
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +598,Material Request,ขอวัสดุ
+apps/erpnext/erpnext/stock/doctype/item/item.py +559,Item {0} is cancelled,รายการ {0} จะถูกยกเลิก
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +607,Material Request,ขอวัสดุ
 DocType: Bank Reconciliation,Update Clearance Date,อัพเดทวันที่ Clearance
 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} ไม่พบใน &#39;วัตถุดิบมา&#39; ตารางในการสั่งซื้อ {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +129,Wire brushing,แปรงลวด
 DocType: Employee,Relation,ความสัมพันธ์
 DocType: Shipping Rule,Worldwide Shipping,การจัดส่งสินค้าทั่วโลก
 apps/erpnext/erpnext/config/selling.py +23,Confirmed orders from Customers.,คำสั่งซื้อได้รับการยืนยันจากลูกค้า
@@ -284,12 +273,11 @@
 DocType: Supplier,Address HTML,ที่อยู่ HTML
 DocType: Lead,Mobile No.,เบอร์มือถือ
 DocType: Maintenance Schedule,Generate Schedule,สร้างตาราง
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +81,Hubbing,Hubbing
 DocType: Purchase Invoice Item,Expense Head,หัวหน้าค่าใช้จ่าย
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +86,Please select Charge Type first,กรุณาเลือก ประเภท ค่าใช้จ่าย ครั้งแรก
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,ล่าสุด
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +395,Max 5 characters,สูงสุด 5 ตัวอักษร
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +195,Select Your Language,เลือกภาษา ของคุณ
+apps/erpnext/erpnext/public/js/setup_wizard.js +143,Max 5 characters,สูงสุด 5 ตัวอักษร
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +245,Select Your Language,เลือกภาษา ของคุณ
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,อนุมัติไว้ครั้งแรกในรายการจะถูกกำหนดเป็นค่าเริ่มต้นอนุมัติไว้
 DocType: Manufacturing Settings,"Disables creation of time logs against Production Orders.
 Operations shall not be tracked against Production Order",ปิดการใช้งานการสร้างบันทึกเวลากับการสั่งซื้อการผลิต การดำเนินงานจะไม่ได้รับการติดตามกับใบสั่งผลิต
@@ -301,8 +289,6 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +34,Item {0} must be Service Item,รายการ {0} จะต้อง บริการ รายการ
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +303,Completed Qty can not be greater than 'Qty to Manufacture',เสร็จสมบูรณ์จำนวนไม่สามารถจะสูงกว่า 'จำนวนการผลิต'
 DocType: DocType,Administrator,ผู้บริหาร
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +136,Laser drilling,การขุดเจาะด้วยเลเซอร์
-DocType: Stock UOM Replace Utility,New Stock UOM,ใหม่ UOM สต็อก
 DocType: Period Closing Voucher,Closing Account Head,ปิดหัวบัญชี
 DocType: Employee,External Work History,ประวัติการทำงานภายนอก
 apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,ข้อผิดพลาดในการอ้างอิงแบบวงกลม
@@ -311,18 +297,15 @@
 DocType: Lead,Industry,อุตสาหกรรม
 DocType: Employee,Job Profile,รายละเอียด งาน
 DocType: Newsletter,Newsletter,จดหมายข่าว
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +84,Hydroforming,hydroforming
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +49,Necking,การกอดคอ
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,แจ้งทางอีเมล์เมื่อการสร้างการร้องขอวัสดุโดยอัตโนมัติ
 DocType: Journal Entry,Multi Currency,หลายสกุลเงิน
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +51,Item is updated,รายการที่ มีการปรับปรุง
 DocType: Async Task,System Manager,จัดการระบบ
 DocType: Payment Reconciliation Invoice,Invoice Type,ประเภทใบแจ้งหนี้
 DocType: Sales Invoice Item,Delivery Note,หมายเหตุจัดส่งสินค้า
 DocType: Dropbox Backup,Allow Dropbox Access,ที่อนุญาตให้เข้าถึง Dropbox
 apps/erpnext/erpnext/config/learn.py +72,Setting up Taxes,การตั้งค่าภาษี
 apps/erpnext/erpnext/accounts/utils.py +189,Payment Entry has been modified after you pulled it. Please pull it again.,เข้าชำระเงินได้รับการแก้ไขหลังจากที่คุณดึงมัน กรุณาดึงมันอีกครั้ง
-apps/erpnext/erpnext/stock/doctype/item/item.py +343,{0} entered twice in Item Tax,{0} เข้ามา เป็นครั้งที่สอง ใน รายการ ภาษี
+apps/erpnext/erpnext/stock/doctype/item/item.py +347,{0} entered twice in Item Tax,{0} เข้ามา เป็นครั้งที่สอง ใน รายการ ภาษี
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +105,Summary for this week and pending activities,สรุปในสัปดาห์นี้และกิจกรรมที่ค้างอยู่
 DocType: Workstation,Rent Cost,ต้นทุนการ ให้เช่า
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +74,Please select month and year,กรุณาเลือกเดือนและปี
@@ -339,24 +322,22 @@
 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","ที่มีจำหน่ายใน BOM , หมายเหตุ การจัดส่ง ใบแจ้งหนี้ การซื้อ , การผลิต สั่งซื้อ สั่ง ซื้อ รับซื้อ , ขายใบแจ้งหนี้ การขายสินค้า สต็อก เข้า Timesheet"
 DocType: Item Tax,Tax Rate,อัตราภาษี
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Select Item,เลือกรายการ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +540,Select Item,เลือกรายการ
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +143,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","รายการ: {0} การจัดการชุดฉลาดไม่สามารถคืนดีใช้ \
  สมานฉันท์หุ้นแทนที่จะใช้เข้าสต็อก"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +259,Purchase Invoice {0} is already submitted,ซื้อ ใบแจ้งหนี้ {0} มีการส่ง แล้ว
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +262,Purchase Invoice {0} is already submitted,ซื้อ ใบแจ้งหนี้ {0} มีการส่ง แล้ว
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Batch No must be same as {1} {2},แถว # {0}: รุ่นที่ไม่มีจะต้องเป็นเช่นเดียวกับ {1} {2}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Convert to non-Group,แปลงที่ไม่ใช่กลุ่ม
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +55,Purchase Receipt must be submitted,ใบเสร็จรับเงินจะต้องส่ง
-DocType: Stock UOM Replace Utility,Current Stock UOM,UOM ต็อกสินค้าปัจจุบัน
 apps/erpnext/erpnext/config/stock.py +53,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}
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Your email address,ที่อยู่ อีเมลของคุณ
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +194,Please see attachment,โปรดดูสิ่งที่แนบมา
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +203,Please see attachment,โปรดดูสิ่งที่แนบมา
 DocType: Purchase Order,% Received,% ที่ได้รับแล้ว
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +109,Water jet cutting,ตัดดำน้ำ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +24,Setup Already Complete!!,การติดตั้ง เสร็จสมบูรณ์ แล้ว !
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +20,Setup Already Complete!!,การติดตั้ง เสร็จสมบูรณ์ แล้ว !
 ,Finished Goods,สินค้า สำเร็จรูป
 DocType: Delivery Note,Instructions,คำแนะนำ
 DocType: Quality Inspection,Inspected By,การตรวจสอบโดย
@@ -371,6 +352,7 @@
 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,แลกเปลี่ยนเงินตรา
 DocType: Purchase Invoice Item,Item Name,ชื่อรายการ
+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",รายการที่จะได้รับการร้องขอซึ่งเป็น &quot;ออกจากสต็อก&quot; พิจารณาโกดังทั้งหมดขึ้นอยู่กับจำนวนที่คาดการณ์ไว้และจำนวนสั่งซื้อขั้นต่ำ
@@ -380,11 +362,10 @@
 ,Purchase Register,สั่งซื้อสมัครสมาชิก
 DocType: Landed Cost Item,Applicable Charges,ค่าใช้จ่าย
 DocType: Workstation,Consumable Cost,ค่าใช้จ่ายที่ สิ้นเปลือง
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,{0} ({1}) must have role 'Leave Approver',{0} ({1}) จะต้องมีบทบาท 'ออกอนุมัติ'
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +167,{0} ({1}) must have role 'Leave Approver',{0} ({1}) จะต้องมีบทบาท 'ออกอนุมัติ'
 DocType: Purchase Receipt,Vehicle Date,วันที่ยานพาหนะ
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +39,Medical,ทางการแพทย์
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +39,Medical,ทางการแพทย์
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,เหตุผล สำหรับการสูญเสีย
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +36,Tube beading,ประดับด้วยลูกปัดหลอด
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},เวิร์คสเตชั่จะปิดทำการในวันที่ต่อไปนี้เป็นรายชื่อต่อวันหยุด: {0}
 DocType: Employee,Single,เดียว
 DocType: Issue,Attachment,ความผูกพัน
@@ -405,10 +386,8 @@
 DocType: Account,Is Group,มีกลุ่ม
 DocType: Stock Settings,Automatically Set Serial Nos based on FIFO,ตั้งโดยอัตโนมัติอนุกรมเลขที่อยู่บนพื้นฐานของ FIFO
 DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,ผู้ตรวจสอบใบแจ้งหนี้จำนวนเอกลักษณ์
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +31,Thermoforming,Thermoforming
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +66,Slitting,ตัด
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +57,'To Case No.' cannot be less than 'From Case No.',&#39;to คดีหมายเลข&#39; ไม่สามารถจะน้อยกว่า &#39;จากคดีหมายเลข&#39;
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +104,Non Profit,องค์กรไม่แสวงหากำไร
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +104,Non Profit,องค์กรไม่แสวงหากำไร
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_list.js +7,Not Started,ยังไม่เริ่มต้น
 DocType: Lead,Channel Partner,พันธมิตรช่องทาง
 DocType: Account,Old Parent,ผู้ปกครองเก่า
@@ -417,13 +396,12 @@
 apps/erpnext/erpnext/config/manufacturing.py +74,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 +512,Attribute {0} selected multiple times in Attributes Table,แอตทริบิวต์ {0} เลือกหลายครั้งในคุณสมบัติตาราง
+apps/erpnext/erpnext/stock/doctype/item/item.py +516,Attribute {0} selected multiple times in Attributes Table,แอตทริบิวต์ {0} เลือกหลายครั้งในคุณสมบัติตาราง
 DocType: Sales Order,Not Applicable,ไม่สามารถใช้งาน
 apps/erpnext/erpnext/config/hr.py +140,Holiday master.,นาย ฮอลิเดย์
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +19,Shell molding,ปั้นเชลล์
 DocType: Material Request Item,Required Date,วันที่ที่ต้องการ
 DocType: Delivery Note,Billing Address,ที่อยู่การเรียกเก็บเงิน
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +644,Please enter Item Code.,กรุณากรอก รหัสสินค้า
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +648,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,จำนวนรวม
@@ -433,7 +411,7 @@
 DocType: Item Attribute,To Range,ช่วง
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,หลักทรัพย์และ เงินฝาก
 DocType: Features Setup,Imports,การนำเข้า
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +144,Adhesive bonding,ทำให้ติด
+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.,บันทึกการเข้าร่วมประชุม
@@ -441,26 +419,25 @@
 DocType: Sales Order Item,Used for Production Plan,ที่ใช้ในการวางแผนการผลิต
 DocType: System Settings,Loading...,กำลังโหลด ...
 DocType: DocField,Password,รหัสผ่าน
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +155,Fused deposition modeling,การสร้างแบบจำลองการสะสมผสม
 DocType: Manufacturing Settings,Time Between Operations (in mins),เวลาระหว่างการดำเนินงาน (ในนาที)
 DocType: Customer,Buyer of Goods and Services.,ผู้ซื้อสินค้าและบริการ
 DocType: Journal Entry,Accounts Payable,บัญชีเจ้าหนี้
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +24,Add Subscribers,เพิ่มสมาชิก
 apps/erpnext/erpnext/public/js/feature_setup.js +220,""" does not exists",“ ไม่พบข้อมูล
 DocType: Pricing Rule,Valid Upto,ที่ถูกต้องไม่เกิน
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +564,List a few of your customers. They could be organizations or individuals.,รายการ บางส่วนของ ลูกค้าของคุณ พวกเขาจะเป็น องค์กร หรือบุคคล
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,List a few of your customers. They could be organizations or individuals.,รายการ บางส่วนของ ลูกค้าของคุณ พวกเขาจะเป็น องค์กร หรือบุคคล
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Direct Income,รายได้ โดยตรง
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +33,"Can not filter based on Account, if grouped by Account",ไม่สามารถกรอง ตาม บัญชี ถ้า จัดกลุ่มตาม บัญชี
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +88,Administrative Officer,พนักงานธุรการ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Administrative Officer,พนักงานธุรการ
 DocType: Payment Tool,Received Or Paid,ที่ได้รับหรือชำระ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +318,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 +305,Please enter Warehouse for which Material Request will be raised,กรุณากรอก คลังสินค้า ที่ ขอ วัสดุ จะ ได้รับการเลี้ยงดู
 DocType: Production Order,Additional Operating Cost,เพิ่มเติมต้นทุนการดำเนินงาน
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +20,Cosmetics,เครื่องสำอาง
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,เครื่องสำอาง
 DocType: DocField,Type,ชนิด
-apps/erpnext/erpnext/stock/doctype/item/item.py +417,"To merge, following properties must be same for both items",ที่จะ ผสาน คุณสมบัติต่อไปนี้ จะต้อง เหมือนกันสำหรับ ทั้งสองรายการ
+apps/erpnext/erpnext/stock/doctype/item/item.py +421,"To merge, following properties must be same for both items",ที่จะ ผสาน คุณสมบัติต่อไปนี้ จะต้อง เหมือนกันสำหรับ ทั้งสองรายการ
 DocType: Communication,Subject,เรื่อง
 DocType: Shipping Rule,Net Weight,ปริมาณสุทธิ
 DocType: Employee,Emergency Phone,โทรศัพท์ ฉุกเฉิน
@@ -470,7 +447,6 @@
 DocType: Journal Entry,Difference (Dr - Cr),แตกต่าง ( ดร. - Cr )
 DocType: Account,Profit and Loss,กำไรและ ขาดทุน
 apps/erpnext/erpnext/config/stock.py +293,Managing Subcontracting,รับเหมาช่วงการจัดการ
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +58,New UOM must NOT be of type Whole Number,ใหม่ UOM ไม่ ต้องเป็นชนิด ทั้ง จำนวน
 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 +47,Account {0} does not belong to company: {1},บัญชี {0} ไม่ได้เป็นของ บริษัท : {1}
@@ -490,14 +466,14 @@
 DocType: Purchase Invoice,Supplier Invoice No,ใบแจ้งหนี้ที่ผู้ผลิตไม่มี
 DocType: Territory,For reference,สำหรับการอ้างอิง
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +154,"Cannot delete Serial No {0}, as it is used in stock transactions",ไม่สามารถลบไม่มี Serial {0} เป็นมันถูกนำมาใช้ในการทำธุรกรรมหุ้น
-apps/erpnext/erpnext/public/js/account_tree_grid.js +52,Closing (Cr),ปิด (Cr)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +227,Closing (Cr),ปิด (Cr)
 DocType: Serial No,Warranty Period (Days),ระยะเวลารับประกัน (วัน)
 DocType: Installation Note Item,Installation Note Item,รายการหมายเหตุการติดตั้ง
 ,Pending Qty,รอดำเนินการจำนวน
 DocType: Job Applicant,Thread HTML,HTML กระทู้
 DocType: Company,Ignore,ไม่สนใจ
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +86,SMS sent to following numbers: {0},SMS ที่ส่งไปยังหมายเลขดังต่อไปนี้: {0}
-apps/erpnext/erpnext/controllers/buying_controller.py +135,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,คลังสินค้า ผู้จัดจำหน่าย ผลบังคับใช้สำหรับ ย่อย ทำสัญญา รับซื้อ
+apps/erpnext/erpnext/controllers/buying_controller.py +126,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,คลังสินค้า ผู้จัดจำหน่าย ผลบังคับใช้สำหรับ ย่อย ทำสัญญา รับซื้อ
 DocType: Pricing Rule,Valid From,ที่ถูกต้อง จาก
 DocType: Sales Invoice,Total Commission,คณะกรรมการรวม
 DocType: Pricing Rule,Sales Partner,พันธมิตรการขาย
@@ -507,7 +483,7 @@
 To distribute a budget using this distribution, set this **Monthly Distribution** in the **Cost Center**","** การกระจายรายเดือน ** จะช่วยให้คุณกระจายงบประมาณของคุณในเดือนถ้าคุณมีฤดูกาลในธุรกิจของคุณ
 
  ต้องการกระจายงบประมาณโดยใช้การกระจายนี้ตั้งนี้การกระจายรายเดือน ** ** ** ในศูนย์ต้นทุน **"
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +183,No records found in the Invoice table,ไม่พบใบแจ้งหนี้ในตารางบันทึก
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +130,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 +84,Financial / accounting year.,การเงิน รอบปีบัญชี /
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged",ขออภัย อนุกรม Nos ไม่สามารถ รวม
@@ -523,25 +499,25 @@
 DocType: Sales Order,Billing and Delivery Status,เรียกเก็บเงินและสถานะการจัดส่ง
 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/setup/page/setup_wizard/setup_wizard_page.html +16,Previous,ก่อน
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard_page.html +16,Previous,ก่อน
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +620,Sales Return,ขายกลับ
 DocType: Production Planning Tool,Select Sales Orders from which you want to create Production Orders.,เลือกขายที่คุณต้องการที่จะสร้างคำสั่งการผลิตสั่งซื้อ
 DocType: Item,Delivered by Supplier (Drop Ship),จัดส่งโดยผู้ผลิต (Drop Ship)
 apps/erpnext/erpnext/config/hr.py +120,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.,ฐานข้อมูลลูกค้า
 DocType: Quotation,Quotation To,ใบเสนอราคาเพื่อ
 DocType: Lead,Middle Income,มีรายได้ปานกลาง
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),เปิด ( Cr )
 apps/erpnext/erpnext/accounts/utils.py +193,Allocated amount can not be negative,จำนวนเงินที่จัดสรร ไม่สามารถ ลบ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +123,Tumbling,ไม้ลอย
 DocType: Purchase Order Item,Billed Amt,จำนวนจำนวนมากที่สุด
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,โกดังตรรกะกับที่รายการหุ้นที่ทำ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +92,Reference No & Reference Date is required for {0},ไม่มี การอ้างอิง และการอ้างอิง วันที่ เป็นสิ่งจำเป็นสำหรับ {0}
 DocType: Event,Wednesday,วันพุธ
 DocType: Sales Invoice,Customer's Vendor,ผู้ขายของลูกค้า
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +214,Production Order is Mandatory,การสั่งซื้อการผลิตบังคับ
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +139,Proposal Writing,การเขียน ข้อเสนอ
+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} อยู่กับรหัสพนักงานเดียวกัน
 apps/erpnext/erpnext/stock/stock_ledger.py +336,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},ข้อผิดพลาด หุ้น ลบ ( {6}) กับ รายการ {0} ใน คลังสินค้า {1} ใน {2} {3} ใน {4} {5}
 DocType: Fiscal Year Company,Fiscal Year Company,ปีงบประมาณ บริษัท
@@ -564,7 +540,7 @@
 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/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.py +179,Please install dropbox python module,กรุณาติดตั้ง dropbox หลามโมดูล
 DocType: Employee,Passport Number,หมายเลขหนังสือเดินทาง
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +82,Manager,ผู้จัดการ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Manager,ผู้จัดการ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +494,From Purchase Receipt,จากการรับซื้อ
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +219,Same item has been entered multiple times.,รายการเดียวกันได้รับการป้อนหลายครั้ง
 DocType: SMS Settings,Receiver Parameter,พารามิเตอร์รับ
@@ -572,10 +548,9 @@
 DocType: Sales Person,Sales Person Targets,ขายเป้าหมายคน
 apps/frappe/frappe/public/js/frappe/form/workflow.js +116,To,ไปยัง
 apps/frappe/frappe/templates/base.html +145,Please enter email address,กรุณากรอกอีเมล์
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +35,End tube forming,หลอดสิ้นสุดการขึ้นรูป
 DocType: Production Order Operation,In minutes,ในไม่กี่นาที
 DocType: Issue,Resolution Date,วันที่ความละเอียด
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +635,Please set default Cash or Bank account in Mode of Payment {0},กรุณาตั้ง ค่าเริ่มต้น เงินสด หรือ บัญชีเงินฝากธนาคาร ใน โหมด ของ การชำระเงิน {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +637,Please set default Cash or Bank account in Mode of Payment {0},กรุณาตั้ง ค่าเริ่มต้น เงินสด หรือ บัญชีเงินฝากธนาคาร ใน โหมด ของ การชำระเงิน {0}
 DocType: Selling Settings,Customer Naming By,การตั้งชื่อตามลูกค้า
 apps/erpnext/erpnext/accounts/doctype/account/account.js +67,Convert to Group,แปลงเป็น กลุ่ม
 DocType: Activity Cost,Activity Type,ประเภทกิจกรรม
@@ -583,12 +558,12 @@
 DocType: Customer,Fixed Days,วันคงที่
 DocType: Sales Invoice,Packing List,รายการบรรจุ
 apps/erpnext/erpnext/config/buying.py +28,Purchase Orders given to Suppliers.,ใบสั่งซื้อให้กับซัพพลายเออร์
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +43,Publishing,การประกาศ
+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 +198,{0}: {1} not found in Invoice Details table,{0}: {1} ไม่พบในตารางรายละเอียดใบแจ้งหนี้
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,{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 +208,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,การบำรุงรักษา ไปที่ {0} ต้อง ถูกยกเลิก ก่อนที่จะ ยกเลิกการ สั่งซื้อการขาย นี้
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +203,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}
@@ -600,7 +575,6 @@
 DocType: Pricing Rule,Sales Manager,ผู้จัดการฝ่ายขาย
 apps/frappe/frappe/public/js/frappe/model/model.js +492,Rename,ตั้งชื่อใหม่
 DocType: Journal Entry,Write Off Amount,เขียนทันทีจำนวน
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +52,Bending,การดัด
 apps/frappe/frappe/core/page/user_permissions/user_permissions.js +246,Allow User,อนุญาตให้ผู้ใช้
 DocType: Journal Entry,Bill No,ไม่มีบิล
 DocType: Purchase Invoice,Quarterly,ทุกสามเดือน
@@ -610,17 +584,16 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Please enter item details,กรุณากรอก รายละเอียดของรายการ
 DocType: Purchase Receipt,Other Details,รายละเอียดอื่น ๆ
 DocType: Account,Accounts,บัญชี
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +67,Marketing,การตลาด
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +65,Straight shearing,ตัดตรง
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +67,Marketing,การตลาด
 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.,เพื่อติดตามรายการในเอกสารการขายและการซื้อจาก Nos อนุกรมของพวกเขา นี้สามารถใช้ในการติดตามรายละเอียดการรับประกันของผลิตภัณฑ์
 DocType: Purchase Receipt Item Supplied,Current Stock,สต็อกปัจจุบัน
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +99,Rejected Warehouse is mandatory against regected item,คลังสินค้า ปฏิเสธ มีผลบังคับใช้ กับ รายการ regected
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +102,Rejected Warehouse is mandatory against regected item,คลังสินค้า ปฏิเสธ มีผลบังคับใช้ กับ รายการ regected
 DocType: Account,Expenses Included In Valuation,ค่าใช้จ่ายรวมอยู่ในการประเมินมูลค่า
 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,เสนอระยะจดหมาย
-apps/erpnext/erpnext/stock/doctype/item/item.py +492,Item has variants.,รายการที่มีสายพันธุ์
+apps/erpnext/erpnext/stock/doctype/item/item.py +496,Item has variants.,รายการที่มีสายพันธุ์
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,รายการที่ {0} ไม่พบ
 DocType: Bin,Stock Value,มูลค่าหุ้น
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,ประเภท ต้นไม้
@@ -629,10 +602,9 @@
 DocType: Material Request Item,Quantity and Warehouse,ปริมาณและคลังสินค้า
 DocType: Sales Invoice,Commission Rate (%),อัตราค่าคอมมิชชั่น (%)
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +172,"Against Voucher Type must be one of Sales Order, Sales Invoice or Journal Entry","กับคูปองประเภทต้องเป็นหนึ่งในการสั่งซื้อการขาย, การขายใบแจ้งหนี้หรือวารสารเข้า"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +139,Biomachining,Biomachining
 apps/erpnext/erpnext/setup/utils.py +89,Unable to find exchange rate,ไม่สามารถหาอัตราแลกเปลี่ยน
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +7,Aerospace,การบินและอวกาศ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +19,Welcome,ยินดีต้อนรับ
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +7,Aerospace,การบินและอวกาศ
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +40,Welcome,ยินดีต้อนรับ
 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.,สินค้าที่ได้รับจากผู้จำหน่าย
@@ -655,19 +627,19 @@
 DocType: Employee,Cell Number,จำนวนเซลล์
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,สูญหาย
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +120,You can not enter current voucher in 'Against Journal Entry' column,คุณไม่สามารถใส่บัตรกำนัลในปัจจุบัน 'กับอนุทิน' คอลัมน์
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +25,Energy,พลังงาน
+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.,งบเงินเดือน
 DocType: Item Group,Website Specifications,ข้อมูลจำเพาะเว็บไซต์
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +205,New Account,บัญชีผู้ใช้ใหม่
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +21,{0}: From {0} of type {1},{0}: จาก {0} ประเภท {1}
-apps/erpnext/erpnext/controllers/buying_controller.py +283,Row {0}: Conversion Factor is mandatory,แถว {0}: ปัจจัยการแปลงมีผลบังคับใช้
+apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,แถว {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.,รายการทางบัญชีสามารถทำกับโหนดใบ คอมเมนต์กับกลุ่มไม่ได้รับอนุญาต
 DocType: ToDo,High,สูง
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +361,Cannot deactivate or cancel BOM as it is linked with other BOMs,ไม่สามารถยกเลิกการใช้งานหรือยกเลิก BOM ตามที่มีการเชื่อมโยงกับ BOMs อื่น ๆ
 DocType: Opportunity,Maintenance,การบำรุงรักษา
 DocType: User,Male,ชาย
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +182,Purchase Receipt number required for Item {0},จำนวน รับซื้อ ที่จำเป็นสำหรับ รายการ {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +183,Purchase Receipt number required for Item {0},จำนวน รับซื้อ ที่จำเป็นสำหรับ รายการ {0}
 DocType: Item Attribute Value,Item Attribute Value,รายการค่าแอตทริบิวต์
 apps/erpnext/erpnext/config/crm.py +64,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.
@@ -715,10 +687,9 @@
 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 +324,"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/page/setup_wizard/fixtures/industry_type.py +13,Biotechnology,เทคโนโลยีชีวภาพ
+apps/erpnext/erpnext/controllers/accounts_controller.py +325,"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,ค่าใช้จ่ายใน การบำรุงรักษา สำนักงาน
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +53,Hemming,ริม
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +66,Please enter Item first,กรุณากรอก รายการ แรก
 DocType: Account,Liability,ความรับผิดชอบ
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +62,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,ตามทำนองคลองธรรมจำนวนเงินไม่สามารถจะสูงกว่าจำนวนเงินที่เรียกร้องในแถว {0}
@@ -731,10 +702,10 @@
 DocType: Company,Default Bank Account,บัญชีธนาคารเริ่มต้น
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +47,"To filter based on Party, select Party Type first",ในการกรองขึ้นอยู่กับพรรคเลือกพรรคพิมพ์ครั้งแรก
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},&#39;การปรับปรุงสต็อก&#39; ไม่สามารถตรวจสอบได้เพราะรายการที่ไม่ได้จัดส่งผ่านทาง {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Nos,Nos
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Nos,Nos
 DocType: Item,Items with higher weightage will be shown higher,รายการที่มี weightage ที่สูงขึ้นจะแสดงที่สูงขึ้น
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,รายละเอียดการกระทบยอดธนาคาร
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +627,My Invoices,ใบแจ้งหนี้ของฉัน
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +629,My Invoices,ใบแจ้งหนี้ของฉัน
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,พบว่า พนักงานที่ ไม่มี
 DocType: Purchase Order,Stopped,หยุด
 DocType: Item,If subcontracted to a vendor,ถ้าเหมาไปยังผู้ขาย
@@ -753,35 +724,33 @@
 DocType: Features Setup,"To enable ""Point of Sale"" features",ต้องการเปิดใช้งาน &quot;จุดขาย&quot; คุณสมบัติ
 DocType: Bin,Moving Average Rate,ย้ายอัตราเฉลี่ย
 DocType: Production Planning Tool,Select Items,เลือกรายการ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,{0} against Bill {1} dated {2},{0} กับบิล {1} ลงวันที่ {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +328,{0} against Bill {1} dated {2},{0} กับบิล {1} ลงวันที่ {2}
 DocType: Comment,Reference Name,ชื่ออ้างอิง
 DocType: Maintenance Visit,Completion Status,สถานะเสร็จ
 DocType: Sales Invoice Item,Target Warehouse,คลังสินค้าเป้าหมาย
 DocType: Item,Allow over delivery or receipt upto this percent,อนุญาตให้ส่งมอบหรือใบเสร็จรับเงินได้ไม่เกินร้อยละนี้
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +49,Expected Delivery Date cannot be before Sales Order Date,วันที่ส่ง ที่คาดว่าจะ ไม่สามารถเป็น วัน ก่อนที่จะ ขายสินค้า
 DocType: Upload Attendance,Import Attendance,การเข้าร่วมประชุมและนำเข้า
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +17,All Item Groups,ทั้งหมด รายการ กลุ่ม
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +17,All Item Groups,ทั้งหมด รายการ กลุ่ม
 DocType: Process Payroll,Activity Log,บันทึกกิจกรรม
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +30,Net Profit / Loss,กำไร / ขาดทุน
 apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,เขียนข้อความ โดยอัตโนมัติใน การส่ง ของ การทำธุรกรรม
 DocType: Production Order,Item To Manufacture,รายการที่จะผลิต
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +16,Permanent mold casting,แม่พิมพ์ถาวร
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} สถานะเป็น {2}
 apps/erpnext/erpnext/config/learn.py +172,Purchase Order to Payment,การสั่งซื้อที่จะชำระเงิน
 DocType: Sales Order Item,Projected Qty,จำนวนที่คาดการณ์ไว้
 DocType: Sales Invoice,Payment Due Date,วันที่ครบกำหนด ชำระเงิน
 DocType: Newsletter,Newsletter Manager,ผู้จัดการจดหมายข่าว
-apps/erpnext/erpnext/stock/doctype/item/item.js +229,Item Variant {0} already exists with same attributes,รายการตัวแปร {0} อยู่แล้วที่มีลักษณะเดียวกัน
+apps/erpnext/erpnext/stock/doctype/item/item.js +231,Item Variant {0} already exists with same attributes,รายการตัวแปร {0} อยู่แล้วที่มีลักษณะเดียวกัน
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening','กำลังเปิด'
 DocType: Notification Control,Delivery Note Message,ข้อความหมายเหตุจัดส่งสินค้า
 DocType: Expense Claim,Expenses,รายจ่าย
 DocType: Item Variant Attribute,Item Variant Attribute,รายการตัวแปรคุณสมบัติ
 ,Purchase Receipt Trends,ซื้อแนวโน้มใบเสร็จรับเงิน
 DocType: Appraisal,Select template from which you want to get the Goals,เลือกแม่แบบที่คุณต้องการที่จะได้รับเป้าหมาย
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +77,Research & Development,การวิจัยและพัฒนา
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Research & Development,การวิจัยและพัฒนา
 ,Amount to Bill,จำนวนเงินที่จะเรียกเก็บเงิน
 DocType: Company,Registration Details,รายละเอียดการลงทะเบียน
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +75,Staking,ปักหลัก
 DocType: Item,Re-Order Qty,Re สั่งซื้อจำนวน
 DocType: Leave Block List Date,Leave Block List Date,ฝากวันที่รายการบล็อก
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +25,Scheduled to send to {0},กำหนดให้ ส่งไปที่ {0}
@@ -792,18 +761,16 @@
 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/hr/doctype/leave_allocation/leave_allocation.py +71,Cannot carry forward {0},ไม่สามารถดำเนินการ ไปข้างหน้า {0}
 apps/erpnext/erpnext/accounts/doctype/account/account.py +91,"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,เรียกร้องค่าใช้จ่ายที่ถูกปฏิเสธข้อความ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +145,Nailing,เก่ง
 ,Available Qty,จำนวนที่มีจำหน่าย
 DocType: Purchase Taxes and Charges,On Previous Row Total,เมื่อรวมแถวก่อนหน้า
 DocType: Salary Slip,Working Days,วันทำการ
 DocType: Serial No,Incoming Rate,อัตราเข้า
 DocType: Packing Slip,Gross Weight,น้ำหนักรวม
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +410,The name of your company for which you are setting up this system.,ชื่อของ บริษัท ของคุณ ที่คุณ มีการตั้งค่า ระบบนี้
+apps/erpnext/erpnext/public/js/setup_wizard.js +158,The name of your company for which you are setting up this system.,ชื่อของ บริษัท ของคุณ ที่คุณ มีการตั้งค่า ระบบนี้
 DocType: HR Settings,Include holidays in Total no. of Working Days,รวมถึงวันหยุดในไม่รวม ของวันทําการ
 DocType: Job Applicant,Hold,ถือ
 DocType: Employee,Date of Joining,วันที่ของการเข้าร่วม
@@ -813,7 +780,6 @@
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +3,View Subscribers,ดูสมาชิก
 DocType: Purchase Invoice Item,Purchase Receipt,ใบเสร็จรับเงินการสั่งซื้อ
 ,Received Items To Be Billed,รายการที่ได้รับจะถูกเรียกเก็บเงิน
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +114,Abrasive blasting,พ่นขัด
 DocType: Employee,Ms,ms
 apps/erpnext/erpnext/config/accounts.py +148,Currency exchange rate master.,นาย อัตรา แลกเปลี่ยนเงินตราต่างประเทศ
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +253,Unable to find Time Slot in the next {0} days for Operation {1},ไม่สามารถหาช่วงเวลาใน {0} วันถัดไปสำหรับการปฏิบัติงาน {1}
@@ -825,7 +791,7 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +209,Serial No {0} does not belong to Item {1},อนุกรม ไม่มี {0} ไม่ได้อยู่ใน รายการ {1}
 DocType: Purchase Receipt Item Supplied,Required Qty,จำนวนที่ต้องการ
 DocType: Bank Reconciliation,Total Amount,รวมเป็นเงิน
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +32,Internet Publishing,สำนักพิมพ์ ทางอินเทอร์เน็ต
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,สำนักพิมพ์ ทางอินเทอร์เน็ต
 DocType: Production Planning Tool,Production Orders,คำสั่งซื้อการผลิต
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +35,Balance Value,ความสมดุลของ ความคุ้มค่า
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,ขายราคาตามรายการ
@@ -836,7 +802,7 @@
 DocType: Supplier,Default Payable Accounts,บัญชีเจ้าหนี้เริ่มต้น
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,พนักงาน {0} ไม่ได้ ใช้งานอยู่หรือ ไม่อยู่
 DocType: Features Setup,Item Barcode,บาร์โค้ดสินค้า
-apps/erpnext/erpnext/stock/doctype/item/item.py +487,Item Variants {0} updated,สินค้าหลากหลายรูปแบบ {0} ปรับปรุง
+apps/erpnext/erpnext/stock/doctype/item/item.py +491,Item Variants {0} updated,สินค้าหลากหลายรูปแบบ {0} ปรับปรุง
 DocType: Quality Inspection Reading,Reading 6,Reading 6
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,ใบแจ้งหนี้การซื้อล่วงหน้า
 DocType: Address,Shop,ร้านค้า
@@ -845,7 +811,7 @@
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,เริ่มต้นบัญชีธนาคาร / เงินสดจะถูกปรับปรุงโดยอัตโนมัติในใบแจ้งหนี้ POS เมื่อโหมดนี้ถูกเลือก
 DocType: Employee,Permanent Address Is,ที่อยู่ ถาวร เป็น
 DocType: Production Order Operation,Operation completed for how many finished goods?,การดำเนินการเสร็จสมบูรณ์สำหรับวิธีการหลายสินค้าสำเร็จรูป?
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +491,The Brand,ยี่ห้อ
+apps/erpnext/erpnext/public/js/setup_wizard.js +237,The Brand,ยี่ห้อ
 apps/erpnext/erpnext/controllers/status_updater.py +163,Allowance for over-{0} crossed for Item {1}.,ค่าเผื่อเกิน {0} ข้ามกับรายการ {1}
 DocType: Employee,Exit Interview Details,ออกจากรายละเอียดการสัมภาษณ์
 DocType: Item,Is Purchase Item,รายการซื้อเป็น
@@ -865,16 +831,16 @@
 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,ระบุจำนวนเงินที่ชำระ = จำนวนเงินที่โดดเด่น
 DocType: Contact Us Settings,Address Line 1,ที่อยู่บรรทัดที่ 1
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Variance,ความแปรปรวน
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +392,Company Name,ชื่อ บริษัท
+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 +515,Select Item for Transfer,เลือกรายการสำหรับการโอนเงิน
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +538,Select Item for Transfer,เลือกรายการสำหรับการโอนเงิน
 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.,เลือกหัวที่บัญชีของธนาคารที่ตรวจสอบถูกวาง
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,ช่วยให้ผู้ใช้ในการแก้ไขอัตราราคาปกติในการทำธุรกรรม
 DocType: Pricing Rule,Max Qty,แม็กซ์ จำนวน
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +106,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,แถว {0}: การชำระเงินกับการขาย / การสั่งซื้อควรจะทำเครื่องหมายเป็นล่วงหน้า
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +16,Chemical,สารเคมี
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,สารเคมี
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +693,All items have already been transferred for this Production Order.,รายการทั้งหมดที่ได้รับการโอนใบสั่งผลิตนี้
 DocType: Process Payroll,Select Payroll Year and Month,เลือกเงินเดือนปีและเดือน
 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""",ไปที่กลุ่มที่เหมาะสม (โดยปกติแอพลิเคชันของกองทุน&gt; สินทรัพย์หมุนเวียน&gt; บัญชีธนาคารและสร้างบัญชีใหม่ (โดยการคลิกที่เพิ่มเด็ก) ประเภท &quot;ธนาคาร&quot;
@@ -885,12 +851,12 @@
 DocType: Item,Inspection Criteria,เกณฑ์การตรวจสอบ
 apps/erpnext/erpnext/config/accounts.py +101,Tree of finanial Cost Centers.,ต้นไม้ ของ ศูนย์ ต้นทุน finanial
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,โอน
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +492,Upload your letter head and logo. (you can edit them later).,อัปโหลดหัวจดหมายของคุณและโลโก้ (คุณสามารถแก้ไขได้ในภายหลัง)
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +156,White,ขาว
+apps/erpnext/erpnext/public/js/setup_wizard.js +238,Upload your letter head and logo. (you can edit them later).,อัปโหลดหัวจดหมายของคุณและโลโก้ (คุณสามารถแก้ไขได้ในภายหลัง)
+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/setup/page/setup_wizard/setup_wizard.js +362,Attach Your Picture,แนบ รูปของคุณ
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Make ,ทำ
+apps/erpnext/erpnext/public/js/setup_wizard.js +112,Attach Your Picture,แนบ รูปของคุณ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +540,Make ,ทำ
 DocType: Journal Entry,Total Amount in Words,จำนวนเงินทั้งหมดในคำ
 DocType: Workflow State,Stop,หยุด
 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 ถ้า ปัญหายังคงอยู่
@@ -899,14 +865,13 @@
 DocType: Lead,Next Contact Date,วันที่ถัดไปติดต่อ
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,เปิด จำนวน
 DocType: Holiday List,Holiday List Name,ชื่อรายการวันหยุด
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +168,Stock Options,ตัวเลือกหุ้น
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +168,Stock Options,ตัวเลือกหุ้น
 DocType: Journal Entry Account,Expense Claim,เรียกร้องค่าใช้จ่าย
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +181,Qty for {0},จำนวนสำหรับ {0}
 DocType: Leave Application,Leave Application,ฝากแอพลิเคชัน
 apps/erpnext/erpnext/config/hr.py +77,Leave Allocation Tool,ฝากเครื่องมือการจัดสรร
 DocType: Leave Block List,Leave Block List Dates,ไม่ระบุวันที่รายการบล็อก
 DocType: Company,If Monthly Budget Exceeded (for expense account),หากเกินงบประมาณรายเดือน (สำหรับบัญชีค่าใช้จ่าย)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +56,Trimming,การพ่ายแพ้
 DocType: Workstation,Net Hour Rate,อัตราชั่วโมงสุทธิ
 DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,ค่าใช้จ่ายใบเสร็จรับเงินลงซื้อ
 DocType: Company,Default Terms,ข้อกำหนดในการเริ่มต้น
@@ -914,10 +879,9 @@
 DocType: POS Profile,Cash/Bank Account,เงินสด / บัญชีธนาคาร
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,Removed items with no change in quantity or value.,รายการที่ลบออกด้วยการเปลี่ยนแปลงในปริมาณหรือไม่มีค่า
 DocType: Delivery Note,Delivery To,เพื่อจัดส่งสินค้า
-apps/erpnext/erpnext/stock/doctype/item/item.py +509,Attribute table is mandatory,ตาราง Attribute มีผลบังคับใช้
+apps/erpnext/erpnext/stock/doctype/item/item.py +513,Attribute table is mandatory,ตาราง Attribute มีผลบังคับใช้
 DocType: Production Planning Tool,Get Sales Orders,รับการสั่งซื้อการขาย
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} ไม่สามารถเป็นจำนวนลบได้
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +103,Filing,ยื่น
 apps/erpnext/erpnext/templates/form_grid/item_grid.html +72,Discount,ส่วนลด
 DocType: Features Setup,Purchase Discounts,ส่วนลดการซื้อ
 DocType: Workstation,Wages,ค่าจ้าง
@@ -934,6 +898,7 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +112,You are the Expense Approver for this record. Please Update the 'Status' and Save,คุณเป็น ผู้อนุมัติ ค่าใช้จ่าย สำหรับการ บันทึก นี้ กรุณา อัปเดต 'สถานะ ' และ ประหยัด
 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 +136,"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 +194,Serial No {0} is under maintenance contract upto {1},อนุกรม ไม่มี {0} อยู่ภายใต้สัญญา การบำรุงรักษา ไม่เกิน {1}
@@ -942,7 +907,7 @@
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,ค่าใช้จ่ายใน การขาย
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Buying,การซื้อมาตรฐาน
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +120,Standard Buying,การซื้อมาตรฐาน
 DocType: GL Entry,Against,กับ
 DocType: Item,Default Selling Cost Center,ขาย เริ่มต้นที่ ศูนย์ต้นทุน
 DocType: Sales Partner,Implementation Partner,พันธมิตรการดำเนินงาน
@@ -963,29 +928,29 @@
 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/setup/page/setup_wizard/setup_wizard.js +588,List a few of your suppliers. They could be organizations or individuals.,รายการ บางส่วนของ ซัพพลายเออร์ ของคุณ พวกเขาจะเป็น องค์กร หรือบุคคล
+apps/erpnext/erpnext/public/js/setup_wizard.js +326,List a few of your suppliers. They could be organizations or individuals.,รายการ บางส่วนของ ซัพพลายเออร์ ของคุณ พวกเขาจะเป็น องค์กร หรือบุคคล
 DocType: Company,Default Currency,สกุลเงินเริ่มต้น
 DocType: Contact,Enter designation of this Contact,ใส่ชื่อของเราได้ที่นี่
 DocType: Contact Us Settings,Address,ที่อยู่
 DocType: Expense Claim,From Employee,จากพนักงาน
-apps/erpnext/erpnext/controllers/accounts_controller.py +338,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,คำเตือน: ระบบ จะไม่ตรวจสอบ overbilling ตั้งแต่ จำนวนเงิน รายการ {0} ใน {1} เป็นศูนย์
+apps/erpnext/erpnext/controllers/accounts_controller.py +339,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,คำเตือน: ระบบ จะไม่ตรวจสอบ overbilling ตั้งแต่ จำนวนเงิน รายการ {0} ใน {1} เป็นศูนย์
 DocType: Journal Entry,Make Difference Entry,ทำรายการที่แตกต่าง
 DocType: Upload Attendance,Attendance From Date,ผู้เข้าร่วมจากวันที่
 DocType: Appraisal Template Goal,Key Performance Area,พื้นที่การดำเนินงานหลัก
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +54,Transportation,การขนส่ง
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +54,Transportation,การขนส่ง
 apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +67, and year: ,และปี:
 DocType: Email Digest,Annual Expense,ค่าใช้จ่ายประจำปี
 DocType: SMS Center,Total Characters,ตัวอักษรรวม
-apps/erpnext/erpnext/controllers/buying_controller.py +139,Please select BOM in BOM field for Item {0},กรุณาเลือก BOM BOM ในด้านการพิจารณาวาระที่ {0}
+apps/erpnext/erpnext/controllers/buying_controller.py +130,Please select BOM in BOM field for Item {0},กรุณาเลือก BOM BOM ในด้านการพิจารณาวาระที่ {0}
 DocType: C-Form Invoice Detail,C-Form Invoice Detail,C-Form รายละเอียดใบแจ้งหนี้
 DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,กระทบยอดใบแจ้งหนี้การชำระเงิน
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +32,Contribution %,เงินสมทบ%
 DocType: Item,website page link,การเชื่อมโยงหน้าเว็บไซต์
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +192,Let's prepare the system for first use.,ลองจัดเตรียมระบบสำหรับการใช้งานครั้งแรก
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +242,Let's prepare the system for first use.,ลองจัดเตรียมระบบสำหรับการใช้งานครั้งแรก
 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 +214,Production Order {0} must be cancelled before cancelling this Sales Order,สั่งผลิต {0} ต้อง ถูกยกเลิก ก่อนที่จะ ยกเลิกการ สั่งซื้อการขาย นี้
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +209,Production Order {0} must be cancelled before cancelling this Sales Order,สั่งผลิต {0} ต้อง ถูกยกเลิก ก่อนที่จะ ยกเลิกการ สั่งซื้อการขาย นี้
 ,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.,เลือกบันทึกเวลา และส่งมาเพื่อสร้างเป็นใบแจ้งหนี้การขายใหม่
@@ -1005,14 +970,13 @@
 DocType: Sales Invoice Advance,Sales Invoice Advance,ขายใบแจ้งหนี้ล่วงหน้า
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +398,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/page/setup_wizard/install_fixtures.py +75,Management,การจัดการ
+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/setup/page/setup_wizard/fixtures/operations.py +14,Investment casting,การหล่อการลงทุน
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +51,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"""
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,จ่ายสุทธิ (คำ) จะสามารถมองเห็นได้เมื่อคุณบันทึกสลิปเงินเดือน
 apps/frappe/frappe/core/doctype/user/user_list.js +12,Active,ใช้งาน
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +154,Blue,สีน้ำเงิน
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +154,Blue,สีน้ำเงิน
 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,โหนด เพิ่มเติมสามารถ ถูกสร้างขึ้น ภายใต้ โหนด ' กลุ่ม ประเภท
@@ -1022,18 +986,16 @@
 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,ปัจจัยการแปลง UOM
 DocType: Stock Settings,Default Item Group,กลุ่มสินค้าเริ่มต้น
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +156,Laminated object manufacturing,การผลิตวัตถุลามิเนต
 apps/erpnext/erpnext/config/buying.py +13,Supplier database.,ฐานข้อมูลผู้ผลิต
 DocType: Account,Balance Sheet,งบดุล
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +561,Cost Center For Item with Item Code ',ศูนย์ต้นทุนสำหรับสินค้าที่มีรหัสสินค้า '
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +45,Stretch forming,ยืดการขึ้นรูป
 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 +210,"Further accounts can be made under Groups, but entries can be made against non-Groups",บัญชีเพิ่มเติมสามารถทำภายใต้กลุ่ม แต่รายการที่สามารถทำกับกลุ่มที่ไม่
 apps/erpnext/erpnext/config/hr.py +125,Tax and other salary deductions.,ภาษีและอื่น ๆ หักเงินเดือน
 DocType: Lead,Lead,ช่องทาง
 DocType: Email Digest,Payables,เจ้าหนี้
 DocType: Account,Warehouse,คลังสินค้า
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +90,Row #{0}: Rejected Qty can not be entered in Purchase Return,แถว # {0}: ปฏิเสธจำนวนไม่สามารถเข้าไปอยู่ในการซื้อกลับ
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +93,Row #{0}: Rejected Qty can not be entered in Purchase Return,แถว # {0}: ปฏิเสธจำนวนไม่สามารถเข้าไปอยู่ในการซื้อกลับ
 ,Purchase Order Items To Be Billed,รายการใบสั่งซื้อที่จะได้รับจำนวนมากที่สุด
 DocType: Purchase Invoice Item,Net Rate,อัตราการสุทธิ
 DocType: Purchase Invoice Item,Purchase Invoice Item,สั่งซื้อสินค้าใบแจ้งหนี้
@@ -1048,13 +1010,13 @@
 DocType: Global Defaults,Current Fiscal Year,ปีงบประมาณปัจจุบัน
 DocType: Global Defaults,Disable Rounded Total,ปิดการใช้งานรวมโค้ง
 DocType: Lead,Call,โทรศัพท์
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +384,'Entries' cannot be empty,' รายการ ' ต้องไม่ว่างเปล่า
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +386,'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 +205,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/page/setup_wizard/install_fixtures.py +138,Research,การวิจัย
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +138,Research,การวิจัย
 DocType: Maintenance Visit Purpose,Work Done,งานที่ทำ
 apps/erpnext/erpnext/controllers/item_variant.py +25,Please specify at least one attribute in the Attributes table,โปรดระบุอย่างน้อยหนึ่งแอตทริบิวต์ในตารางคุณสมบัติ
 DocType: Contact,User ID,รหัสผู้ใช้
@@ -1062,10 +1024,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +57,View Ledger,ดู บัญชีแยกประเภท
 DocType: File,Lft,ซ้าย
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,ที่เก่าแก่ที่สุด
-apps/erpnext/erpnext/stock/doctype/item/item.py +394,"An Item Group exists with same name, please change the item name or rename the item group",รายการกลุ่ม ที่มีอยู่ ที่มีชื่อเดียวกัน กรุณาเปลี่ยน ชื่อรายการหรือเปลี่ยนชื่อ กลุ่ม รายการ
+apps/erpnext/erpnext/stock/doctype/item/item.py +398,"An Item Group exists with same name, please change the item name or rename the item group",รายการกลุ่ม ที่มีอยู่ ที่มีชื่อเดียวกัน กรุณาเปลี่ยน ชื่อรายการหรือเปลี่ยนชื่อ กลุ่ม รายการ
 DocType: Communication,Delivery Status,สถานะการจัดส่งสินค้า
 DocType: Production Order,Manufacture against Sales Order,การผลิตกับการสั่งซื้อการขาย
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +517,Rest Of The World,ส่วนที่เหลือ ของโลก
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +455,Rest Of The World,ส่วนที่เหลือ ของโลก
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,รายการ {0} ไม่สามารถมีแบทช์
 ,Budget Variance Report,รายงานความแปรปรวนของงบประมาณ
 DocType: Salary Slip,Gross Pay,จ่ายขั้นต้น
@@ -1076,13 +1038,11 @@
 DocType: BOM Item,Item Description,รายละเอียดสินค้า
 DocType: Payment Tool,Payment Mode,วิธีการชำระเงิน
 DocType: Purchase Invoice,Is Recurring,เป็นที่เกิดขึ้น
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +154,Direct metal laser sintering,โลหะโดยตรงเผาเลเซอร์
 DocType: Purchase Order,Supplied Items,จัดรายการ
 DocType: Production Order,Qty To Manufacture,จำนวนการผลิต
 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,เปิดชั่วคราว
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +41,Cryorolling,Cryorolling
 ,Employee Leave Balance,ยอดคงเหลือพนักงานออก
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +128,Balance for Account {0} must always be {1},ยอดคงเหลือ บัญชี {0} จะต้อง {1}
 DocType: Address,Address Type,ประเภทของที่อยู่
@@ -1098,23 +1058,23 @@
 DocType: Journal Entry,Get Outstanding Invoices,รับใบแจ้งหนี้ค้าง
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,การขายสินค้า {0} ไม่ถูกต้อง
 apps/erpnext/erpnext/setup/doctype/company/company.py +172,"Sorry, companies cannot be merged",ขออภัย บริษัท ไม่สามารถ รวม
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +145,Small,เล็ก
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Small,เล็ก
 DocType: Employee,Employee Number,จำนวนพนักงาน
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},กรณีที่ ไม่ ( s) การใช้งานแล้ว ลอง จาก กรณี ไม่มี {0}
 ,Invoiced Amount (Exculsive Tax),จำนวนเงินที่ ออกใบแจ้งหนี้ ( Exculsive ภาษี )
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,รายการที่ 2
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +59,Account head {0} created,หัวบัญชีสำหรับ {0} ได้ถูกสร้างขึ้น
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +153,Green,สีเขียว
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Green,สีเขียว
 DocType: Item,Auto re-order,Auto สั่งซื้อใหม่
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +57,Total Achieved,รวมประสบความสำเร็จ
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +59,Total Achieved,รวมประสบความสำเร็จ
 DocType: Employee,Place of Issue,สถานที่ได้รับการรับรอง
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +59,Contract,สัญญา
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Contract,สัญญา
 DocType: Report,Disabled,พิการ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +490,UOM coversion factor required for UOM: {0} in Item: {1},ปัจจัย Coversion UOM จำเป็นสำหรับ UOM: {0} ในรายการ: {1}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +83,Indirect Expenses,ค่าใช้จ่าย ทางอ้อม
 apps/erpnext/erpnext/controllers/selling_controller.py +163,Row {0}: Qty is mandatory,แถว {0}: จำนวนมีผลบังคับใช้
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +8,Agriculture,การเกษตร
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +611,Your Products or Services,สินค้า หรือ บริการของคุณ
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,การเกษตร
+apps/erpnext/erpnext/public/js/setup_wizard.js +347,Your Products or Services,สินค้า หรือ บริการของคุณ
 DocType: Mode of Payment,Mode of Payment,โหมดของการชำระเงิน
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,กลุ่มนี้เป็นกลุ่ม รายการที่ ราก และ ไม่สามารถแก้ไขได้
 DocType: Journal Entry Account,Purchase Order,ใบสั่งซื้อ
@@ -1126,7 +1086,7 @@
 DocType: Serial No,Serial No Details,รายละเอียดหมายเลขเครื่อง
 DocType: Purchase Invoice Item,Item Tax Rate,อัตราภาษีสินค้า
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +113,"For {0}, only credit accounts can be linked against another debit entry",มีบัญชีประเภทเครดิตเท่านั้น ที่สามารถเชื่อมโยงกับรายการประเภทเดบิต สำหรับ {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Delivery Note {0} is not submitted,หมายเหตุ การจัดส่ง {0} ไม่ได้ ส่ง
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +470,Delivery Note {0} is not submitted,หมายเหตุ การจัดส่ง {0} ไม่ได้ ส่ง
 apps/erpnext/erpnext/stock/get_item_details.py +136,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.",กฎข้อแรกคือการกำหนดราคาเลือกตาม 'สมัครในสนามซึ่งจะมีรายการกลุ่มสินค้าหรือยี่ห้อ
@@ -1136,7 +1096,7 @@
 DocType: Appraisal Goal,Goal,เป้าหมาย
 DocType: Sales Invoice Item,Edit Description,แก้ไขรายละเอียด
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +318,Expected Delivery Date is lesser than Planned Start Date.,วันที่จัดส่งสินค้าที่คาดว่าจะน้อยกว่าวันเริ่มต้นการวางแผน
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +579,For Supplier,สำหรับ ผู้ผลิต
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +602,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,ขาออกทั้งหมด
@@ -1162,10 +1122,10 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +74,"Total {0} for all items is zero, may you should change 'Distribute Charges Based On'",รวม {0} สำหรับทุกรายการเป็นศูนย์คุณอาจจะเปลี่ยน &#39;กระจายค่าใช้จ่ายขึ้นอยู่กับ&#39;
 DocType: Purchase Invoice,Taxes and Charges Calculation,ภาษีและการคำนวณค่าใช้จ่าย
 DocType: BOM Operation,Workstation,เวิร์คสเตชั่
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +112,Hardware,ฮาร์ดแวร์
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +112,Hardware,ฮาร์ดแวร์
 DocType: Attendance,HR Manager,HR Manager
 apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,กรุณาเลือก บริษัท
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +50,Privilege Leave,สิทธิ ออก
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +50,Privilege Leave,สิทธิ ออก
 DocType: Purchase Invoice,Supplier Invoice Date,วันที่ใบแจ้งหนี้ผู้จัดจำหน่าย
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +79,You need to enable Shopping Cart,คุณจำเป็นต้องเปิดการใช้งานรถเข็น
 apps/frappe/frappe/public/js/frappe/form/grid_body.html +6,No Data,ไม่มีข้อมูล
@@ -1178,7 +1138,7 @@
 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 +168,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/setup/page/setup_wizard/install_fixtures.py +38,Food,อาหาร
+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 +139,You can make a time log only against a submitted production order,คุณสามารถสร้างบันทึกเวลา กับคำสั่งผลิตที่บันทึกไว้แล้วเท่านั้น
 DocType: Maintenance Schedule Item,No of Visits,ไม่มีการเข้าชม
@@ -1198,6 +1158,7 @@
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,View Offer Letter,ดูจดหมายเสนอ
 DocType: Communication,Communication,การสื่อสาร
 DocType: Item,Is Service Item,รายการบริการเป็น
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +81,Application period cannot be outside leave allocation period,รับสมัครไม่สามารถออกจากนอกระยะเวลาการจัดสรร
 DocType: Activity Cost,Projects,โครงการ
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +31,Please select Fiscal Year,กรุณาเลือก ปีงบประมาณ
 apps/erpnext/erpnext/controllers/buying_controller.py +23,From {0} | {1} {2},จาก {0} | {1} {2}
@@ -1216,7 +1177,7 @@
 DocType: Item,Maintain Stock,รักษาสต็อก
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +213,Stock Entries already created for Production Order ,รายการสต็อกที่สร้างไว้แล้วสำหรับการสั่งซื้อการผลิต
 DocType: Leave Control Panel,Leave blank if considered for all designations,เว้นไว้หากพิจารณากำหนดทั้งหมด
-apps/erpnext/erpnext/controllers/accounts_controller.py +499,Charge of type 'Actual' in row {0} cannot be included in Item Rate,ค่าใช้จ่าย ประเภท ' จริง ' ในแถว {0} ไม่สามารถ รวมอยู่ใน อัตรา รายการ
+apps/erpnext/erpnext/controllers/accounts_controller.py +500,Charge of type 'Actual' in row {0} cannot be included in Item Rate,ค่าใช้จ่าย ประเภท ' จริง ' ในแถว {0} ไม่สามารถ รวมอยู่ใน อัตรา รายการ
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,Max: {0},แม็กซ์: {0}
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +16,From Datetime,จาก Datetime
 DocType: Email Digest,For Company,สำหรับ บริษัท
@@ -1226,7 +1187,7 @@
 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 +471,cannot be greater than 100,ไม่สามารถจะมากกว่า 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +546,Item {0} is not a stock Item,รายการที่ {0} ไม่ได้เป็น รายการ สต็อก
+apps/erpnext/erpnext/stock/doctype/item/item.py +550,Item {0} is not a stock Item,รายการที่ {0} ไม่ได้เป็น รายการ สต็อก
 DocType: Maintenance Visit,Unscheduled,ไม่ได้หมายกำหนดการ
 DocType: Employee,Owned,เจ้าของ
 DocType: Salary Slip Deduction,Depends on Leave Without Pay,ขึ้นอยู่กับการออกโดยไม่จ่ายเงิน
@@ -1240,31 +1201,29 @@
 DocType: HR Settings,Employee Settings,การตั้งค่า การทำงานของพนักงาน
 ,Batch-Wise Balance History,ชุดฉลาดประวัติยอดคงเหลือ
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +72,To Do List,รายการสิ่งที่ต้องทำ
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +63,Apprentice,เด็กฝึกงาน
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Apprentice,เด็กฝึกงาน
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +99,Negative Quantity is not allowed,จำนวน เชิงลบ ไม่ได้รับอนุญาต
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
 Used for Taxes and Charges","ตารางรายละเอียดภาษีเรียกจากต้นแบบรายการเป็นสตริงและเก็บไว้ในฟิลด์นี้
  ใช้สำหรับภาษีและค่าใช้จ่าย"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +61,Lancing,การกรีด
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +151,Employee cannot report to himself.,พนักงานไม่สามารถรายงานให้กับตัวเอง
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.",หากบัญชีถูกแช่แข็ง รายการ จะได้รับอนุญาต ให้กับผู้ใช้ ที่ จำกัด
 DocType: Email Digest,Bank Balance,ธนาคาร Balance
-apps/erpnext/erpnext/controllers/accounts_controller.py +435,Accounting Entry for {0}: {1} can only be made in currency: {2},บัญชีรายการสำหรับ {0}: {1} สามารถทำได้ในสกุลเงิน: {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +436,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 +38,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 +112,Tax Rule for transactions.,กฎภาษีสำหรับการทำธุรกรรม
 DocType: Rename Tool,Type of document to rename.,ประเภทของเอกสารที่จะเปลี่ยนชื่อ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +630,We buy this Item,เราซื้อ รายการ นี้
+apps/erpnext/erpnext/public/js/setup_wizard.js +366,We buy this Item,เราซื้อ รายการ นี้
 DocType: Address,Billing,การเรียกเก็บเงิน
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +77,Flanging,จับเจ่า
 DocType: Bulk Email,Not Sent,ส่งไม่ได้
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +73,Explosive forming,ระเบิดขึ้นรูป
 DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),รวมภาษีและค่าบริการ (สกุลเงิน บริษัท )
 DocType: Shipping Rule,Shipping Account,บัญชีการจัดส่งสินค้า
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +43,Scheduled to send to {0} recipients,กำหนดให้ ส่งไปที่ {0} ผู้รับ
 DocType: Quality Inspection,Readings,อ่าน
 DocType: Stock Entry,Total Additional Costs,รวมค่าใช้จ่ายเพิ่มเติม
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Sub Assemblies,ประกอบ ย่อย
+apps/erpnext/erpnext/public/js/setup_wizard.js +359,Sub Assemblies,ประกอบ ย่อย
 DocType: Shipping Rule Condition,To Value,เพื่อให้มีค่า
 DocType: Supplier,Stock Manager,ผู้จัดการ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +143,Source warehouse is mandatory for row {0},คลังสินค้า ที่มา มีผลบังคับใช้ แถว {0}
@@ -1274,44 +1233,42 @@
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,นำเข้า ล้มเหลว
 apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,ที่อยู่ไม่เพิ่มเลย
 DocType: Workstation Working Hour,Workstation Working Hour,เวิร์คสเตชั่ชั่วโมงการทำงาน
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +83,Analyst,นักวิเคราะห์
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +202,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},แถว {0}: จำนวนจัดสรร {1} ต้องน้อยกว่าหรือเท่ากับจำนวนเงินที่ JV {2}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Analyst,นักวิเคราะห์
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +149,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},แถว {0}: จำนวนจัดสรร {1} ต้องน้อยกว่าหรือเท่ากับจำนวนเงินที่ JV {2}
 DocType: Item,Inventory,รายการสินค้า
 DocType: Features Setup,"To enable ""Point of Sale"" view",ต้องการเปิดใช้งาน &quot;จุดขาย&quot; มุมมอง
 apps/erpnext/erpnext/public/js/pos/pos.js +402,Payment cannot be made for empty cart,การชำระเงินไม่สามารถทำรถว่างเปล่า
 DocType: Item,Sales Details,รายละเอียดการขาย
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +149,Pinning,ปักหมุด
 DocType: Opportunity,With Items,กับรายการ
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,ใน จำนวน
 DocType: Notification Control,Expense Claim Rejected,เรียกร้องค่าใช้จ่ายที่ถูกปฏิเสธ
 DocType: Sales Invoice,"The date on which next invoice will be generated. It is generated on submit.
 ",วันที่ใบแจ้งหนี้ต่อไปจะถูกสร้างขึ้น มันถูกสร้างขึ้นบนส่ง
 DocType: Item Attribute,Item Attribute,รายการแอตทริบิวต์
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +105,Government,รัฐบาล
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Government,รัฐบาล
 apps/erpnext/erpnext/config/stock.py +268,Item Variants,รายการที่แตกต่าง
 DocType: Company,Services,การบริการ
 apps/erpnext/erpnext/accounts/report/financial_statements.py +147,Total ({0}),รวม ({0})
 DocType: Cost Center,Parent Cost Center,ศูนย์ต้นทุนผู้ปกครอง
 DocType: Sales Invoice,Source,แหล่ง
 DocType: Leave Type,Is Leave Without Pay,ถูกทิ้งไว้โดยไม่ต้องจ่ายเงิน
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +186,No records found in the Payment table,ไม่พบในตารางการชำระเงินบันทึก
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +405,Financial Year Start Date,วันเริ่มต้น ปี การเงิน
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +133,No records found in the Payment table,ไม่พบในตารางการชำระเงินบันทึก
+apps/erpnext/erpnext/public/js/setup_wizard.js +153,Financial Year Start Date,วันเริ่มต้น ปี การเงิน
 DocType: Employee External Work History,Total Experience,ประสบการณ์รวม
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +100,Countersinking,countersinking
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +271,Packing Slip(s) cancelled,บรรจุ สลิป (s) ยกเลิก
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +276,Packing Slip(s) cancelled,บรรจุ สลิป (s) ยกเลิก
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,การขนส่งสินค้าและ การส่งต่อ ค่าใช้จ่าย
 DocType: Material Request Item,Sales Order No,สั่งซื้อยอดขาย
 DocType: Item Group,Item Group Name,ชื่อกลุ่มสินค้า
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +50,Taken,ยึด
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,ยึด
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +66,Transfer Materials for Manufacture,วัสดุการโอนเงินสำหรับการผลิต
 DocType: Pricing Rule,For Price List,สำหรับราคาตามรายการ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +27,Executive Search,การค้นหา ผู้บริหาร
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,การค้นหา ผู้บริหาร
 apps/erpnext/erpnext/stock/stock_ledger.py +405,"Purchase rate for item: {0} not found, which is required to book accounting entry (expense). Please mention item price against a buying price list.",ไม่พบราคาซื้อของรายการ: {0} ซึ่งจำเป็นสำหรับการกรอกรายการเข้าบัญชี (รายจ่าย) กรุณาแจ้งราคาสินค้าไว้ในรายการราคาซื้อ
 DocType: Maintenance Schedule,Schedules,ตารางเวลา
 DocType: Purchase Invoice Item,Net Amount,ปริมาณสุทธิ
 DocType: Purchase Order Item Supplied,BOM Detail No,รายละเอียด BOM ไม่มี
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),จำนวนส่วนลดเพิ่มเติม (สกุลเงิน บริษัท )
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +537,Error: {0} > {1},ข้อผิดพลาด: {0}> {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +541,Error: {0} > {1},ข้อผิดพลาด: {0}> {1}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,กรุณาสร้างบัญชีใหม่ จากผังบัญชี
 DocType: Maintenance Visit,Maintenance Visit,ชมการบำรุงรักษา
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer > Customer Group > Territory,ลูกค้า> กลุ่มลูกค้า> มณฑล
@@ -1322,7 +1279,6 @@
 DocType: Event,Tuesday,วันอังคาร
 DocType: Leave Block List,Block Holidays on important days.,วันหยุดที่ถูกบล็อกในวันสำคัญ
 ,Accounts Receivable Summary,สรุปบัญชีลูกหนี้
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +43,Leaves for type {0} already allocated for Employee {1} for period {2} - {3},ใบสำหรับประเภท {0} จัดสรรแล้วสำหรับพนักงาน {1} สำหรับรอบระยะเวลา {2} - {3}
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +187,Please set User ID field in an Employee record to set Employee Role,กรุณาตั้งค่าข้อมูลรหัสผู้ใช้ในการบันทึกพนักงานที่จะตั้งบทบาทของพนักงาน
 DocType: UOM,UOM Name,ชื่อ UOM
 DocType: Top Bar Item,Target,เป้า
@@ -1334,15 +1290,14 @@
 DocType: ToDo,Due Date,วันที่ครบกำหนด
 DocType: Sales Invoice Item,Brand Name,ชื่อยี่ห้อ
 DocType: Purchase Receipt,Transporter Details,รายละเอียด Transporter
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Box,กล่อง
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +389,The Organization,องค์การ
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Box,กล่อง
+apps/erpnext/erpnext/public/js/setup_wizard.js +137,The Organization,องค์การ
 DocType: Monthly Distribution,Monthly Distribution,การกระจายรายเดือน
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,รายชื่อ ผู้รับ ว่างเปล่า กรุณาสร้าง รายชื่อ รับ
 DocType: Production Plan Sales Order,Production Plan Sales Order,แผนสั่งซื้อขาย
 DocType: Sales Partner,Sales Partner Target,เป้าหมายยอดขายพันธมิตร
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},รายการบัญชีสำหรับ {0} สามารถทำได้ในสกุลเงิน: {1}
 DocType: Pricing Rule,Pricing Rule,กฎ การกำหนดราคา
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +58,Notching,Notching
 apps/erpnext/erpnext/config/learn.py +167,Material Request to Purchase Order,วัสดุขอใบสั่งซื้อ
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +74,Row # {0}: Returned Item {1} does not exists in {2} {3},แถว # {0}: กลับรายการ {1} ไม่อยู่ใน {2} {3}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,บัญชีธนาคาร
@@ -1359,20 +1314,19 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Amounts not reflected in bank,จำนวนเงินไม่ได้สะท้อนให้เห็นในธนาคาร
 DocType: Quality Inspection Reading,Reading 4,Reading 4
 apps/erpnext/erpnext/config/hr.py +23,Claims for company expense.,การเรียกร้องค่าใช้จ่ายของ บริษัท
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +8,Centrifugal casting,หล่อแบบแรงเหวี่ยง
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +119,Magnetic field-assisted finishing,การตกแต่งสนามแม่เหล็กช่วย
 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,เบอร์มือถือไม่มี
 DocType: Production Planning Tool,Select Sales Orders,เลือกคำสั่งซื้อขาย
 ,Material Requests for which Supplier Quotations are not created,ขอ วัสดุ ที่ ใบเสนอราคา ของผู้ผลิต ไม่ได้สร้างขึ้น
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +117,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/buying/doctype/purchase_order/purchase_order.js +477,Mark as Delivered,มาร์คส่ง
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +497,Mark as Delivered,มาร์คส่ง
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +34,Make Quotation,ทำให้ใบเสนอราคา
 DocType: Dependent Task,Dependent Task,ขึ้นอยู่กับงาน
-apps/erpnext/erpnext/stock/doctype/item/item.py +306,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 +141,Leave of type {0} cannot be longer than {1},การลา ประเภท {0} ไม่สามารถ จะยาวกว่า {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +310,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 +155,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,รายชื่อผู้รับ
@@ -1380,15 +1334,14 @@
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,บริโภคจํานวนเงิน
 apps/erpnext/erpnext/public/js/pos/pos.js +491,{0} View,{0} ดู
 DocType: Salary Structure Deduction,Salary Structure Deduction,หักโครงสร้างเงินเดือน
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +158,Selective laser sintering,เผาเลเซอร์เลือก
-apps/erpnext/erpnext/stock/doctype/item/item.py +301,Unit of Measure {0} has been entered more than once in Conversion Factor Table,หน่วย ของการวัด {0} ได้รับการป้อน มากกว่าหนึ่งครั้งใน การแปลง ปัจจัย ตาราง
+apps/erpnext/erpnext/stock/doctype/item/item.py +305,Unit of Measure {0} has been entered more than once in Conversion Factor Table,หน่วย ของการวัด {0} ได้รับการป้อน มากกว่าหนึ่งครั้งใน การแปลง ปัจจัย ตาราง
 apps/frappe/frappe/core/page/data_import_tool/data_import_tool.js +108,Import Successful!,นำ ที่ประสบความสำเร็จ
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,ค่าใช้จ่ายของรายการที่ออก
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +185,Quantity must not be more than {0},จำนวนต้องไม่เกิน {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +41,Age (Days),อายุ (วัน)
 DocType: Quotation Item,Quotation Item,รายการใบเสนอราคา
 DocType: Account,Account Name,ชื่อบัญชี
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +41,From Date cannot be greater than To Date,จากวันที่ไม่สามารถจะมากกว่านัด
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +34,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.,ประเภท ผู้ผลิต หลัก
 DocType: Purchase Order Item,Supplier Part Number,หมายเลขชิ้นส่วนของผู้ผลิต
@@ -1397,14 +1350,14 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +247,{0} {1} is cancelled or stopped,{0} {1} จะถูกยกเลิกหรือหยุด
 DocType: Accounts Settings,Credit Controller,ควบคุมเครดิต
 DocType: Delivery Note,Vehicle Dispatch Date,วันที่ส่งรถ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +197,Purchase Receipt {0} is not submitted,รับซื้อ {0} ไม่ได้ ส่ง
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +198,Purchase Receipt {0} is not submitted,รับซื้อ {0} ไม่ได้ ส่ง
 DocType: Company,Default Payable Account,เริ่มต้นเจ้าหนี้การค้า
 apps/erpnext/erpnext/config/website.py +13,"Settings for online shopping cart such as shipping rules, price list etc.",การตั้งค่าสำหรับตะกร้าช้อปปิ้งออนไลน์เช่นกฎการจัดส่งรายการราคา ฯลฯ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +660,Setup Complete,การติดตั้ง เสร็จสมบูรณ์
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +124,Setup Complete,การติดตั้ง เสร็จสมบูรณ์
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +65,{0}% Billed,{0}% เรียกเก็บเงิน
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +17,Reserved Qty,สงวนไว้ จำนวน
 DocType: Party Account,Party Account,บัญชีพรรค
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +74,Human Resources,ทรัพยากรบุคคล
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +74,Human Resources,ทรัพยากรบุคคล
 DocType: Lead,Upper Income,รายได้บน
 DocType: Journal Entry Account,Debit in Company Currency,เดบิตใน บริษัท สกุล
 apps/erpnext/erpnext/support/doctype/issue/issue.py +58,My Issues,ปัญหาของฉัน
@@ -1413,11 +1366,9 @@
 DocType: Company,Default Values,เริ่มต้นค่า
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +236,Row {0}: Payment amount can not be negative,แถว {0}: จำนวนการชำระเงินไม่สามารถเป็นเชิงลบ
 DocType: Expense Claim,Total Amount Reimbursed,รวมจำนวนเงินชดเชย
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +152,Press fitting,กดที่เหมาะสม
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +64,Against Supplier Invoice {0} dated {1},กับผู้ผลิตใบแจ้งหนี้ {0} วัน {1}
 DocType: Customer,Default Price List,รายการราคาเริ่มต้น
 DocType: Payment Reconciliation,Payments,วิธีการชำระเงิน
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +24,Hot isostatic pressing,isostatic ร้อนกด
 DocType: ToDo,Medium,กลาง
 DocType: Budget Detail,Budget Allocated,งบประมาณที่จัดสรร
 DocType: Journal Entry,Entry Type,ประเภทรายการ
@@ -1430,9 +1381,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +56,None of the items have any change in quantity or value.,ไม่มีรายการมีการเปลี่ยนแปลงใด ๆ ในปริมาณหรือมูลค่า
 DocType: Warranty Claim,Warranty Claim,รับประกันเรียกร้อง
 ,Lead Details,รายละเอียดของช่องทาง
-DocType: Authorization Rule,Approving User,อนุมัติผู้ใช้
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +37,Forging,ปลอม
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +126,Plating,การชุบ
 DocType: Purchase Invoice,End date of current invoice's period,วันที่สิ้นสุดของรอบระยะเวลาใบแจ้งหนี้ปัจจุบัน
 DocType: Pricing Rule,Applicable For,สามารถใช้งานได้ สำหรับ
 DocType: Bank Reconciliation,From Date,จากวันที่
@@ -1454,31 +1402,29 @@
 DocType: Sales Invoice,Paid Amount (Company Currency),จำนวนเงินที่จ่าย (บริษัท สกุล)
 DocType: Purchase Invoice,Additional Discount,ส่วนลดเพิ่มเติม
 DocType: Selling Settings,Selling Settings,ตั้งค่าระบบการขาย
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +39,Online Auctions,การประมูล ออนไลน์
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,การประมูล ออนไลน์
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +94,Please specify either Quantity or Valuation Rate or both,โปรดระบุ ทั้ง จำนวน หรือ อัตรา การประเมิน หรือทั้งสองอย่าง
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +50,"Company, Month and Fiscal Year is mandatory",บริษัท เดือน และ ปีงบประมาณ มีผลบังคับใช้
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Marketing Expenses,ค่าใช้จ่ายใน การตลาด
 ,Item Shortage Report,รายงานสินค้าไม่เพียงพอ
-apps/erpnext/erpnext/stock/doctype/item/item.js +183,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","น้ำหนักที่ถูกกล่าวถึง, \n กรุณาระบุ ""น้ำหนัก UOM"" เกินไป"
+apps/erpnext/erpnext/stock/doctype/item/item.js +185,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","น้ำหนักที่ถูกกล่าวถึง, \n กรุณาระบุ ""น้ำหนัก UOM"" เกินไป"
 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 +212,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 +384,Warehouse required at Row No {0},โกดังสินค้าจำเป็นที่แถวไม่มี {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +386,Warehouse required at Row No {0},โกดังสินค้าจำเป็นที่แถวไม่มี {0}
 DocType: Employee,Date Of Retirement,วันที่ของการเกษียณอายุ
 DocType: Upload Attendance,Get Template,รับแม่แบบ
 DocType: Address,Postal,ไปรษณีย์
 DocType: Item,Weightage,weightage
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +159,Mining,การทำเหมืองแร่
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +17,Resin casting,การหล่อเรซิ่น
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,กลุ่ม ลูกค้าที่มีอยู่ ที่มีชื่อเดียวกัน โปรด เปลี่ยนชื่อ ลูกค้าหรือเปลี่ยนชื่อ กลุ่ม ลูกค้า
 apps/erpnext/erpnext/public/js/pos/pos.js +147,Please select {0} first.,กรุณาเลือก {0} ครั้งแรก
 apps/erpnext/erpnext/templates/pages/order.html +57,text {0},ข้อความ {0}
 DocType: Territory,Parent Territory,ดินแดนปกครอง
 DocType: Quality Inspection Reading,Reading 2,Reading 2
 DocType: Stock Entry,Material Receipt,ใบเสร็จรับเงินวัสดุ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +622,Products,ผลิตภัณฑ์
+apps/erpnext/erpnext/public/js/setup_wizard.js +358,Products,ผลิตภัณฑ์
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +47,Party Type and Party is required for Receivable / Payable account {0},ประเภทพรรคและพรรคเป็นสิ่งจำเป็นสำหรับลูกหนี้ / เจ้าหนี้ {0}
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.",หากรายการนี​​้มีสายพันธุ์แล้วมันไม่สามารถเลือกในการสั่งซื้อการขายอื่น ๆ
 DocType: Lead,Next Contact By,ติดต่อถัดไป
@@ -1488,13 +1434,13 @@
 DocType: Purchase Invoice,Notification Email Address,ที่อยู่อีเมลการแจ้งเตือน
 DocType: Payment Tool,Find Invoices to Match,ค้นหาใบแจ้งหนี้เพื่อให้ตรงกับ
 ,Item-wise Sales Register,การขายสินค้าที่ชาญฉลาดสมัครสมาชิก
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +399,"e.g. ""XYZ National Bank""","เช่น ""XYZ ธนาคารแห่งชาติ """
+apps/erpnext/erpnext/public/js/setup_wizard.js +147,"e.g. ""XYZ National Bank""","เช่น ""XYZ ธนาคารแห่งชาติ """
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,คือภาษีนี้รวมอยู่ในอัตราขั้นพื้นฐาน?
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +57,Total Target,เป้าหมายรวม
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Target,เป้าหมายรวม
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.js +22,Shopping Cart is enabled,รถเข็นถูกเปิดใช้งาน
 DocType: Job Applicant,Applicant for a Job,สำหรับผู้สมัครงาน
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +173,No Production Orders created,ไม่มี ใบสั่ง ผลิต สร้างขึ้น
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +131,Salary Slip of employee {0} already created for this month,สลิป เงินเดือน ของ พนักงาน {0} สร้างไว้แล้ว ในเดือนนี้
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +140,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.,คอลัมน์มากเกินไป ส่งออกรายงานและพิมพ์โดยใช้โปรแกรมสเปรดชีต
 DocType: Sales Invoice Item,Batch No,หมายเลขชุด
@@ -1504,14 +1450,14 @@
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +13,Variant,ตัวแปร
 apps/frappe/frappe/public/js/frappe/form/toolbar.js +165,New {0},ใหม่ {0}
 DocType: Naming Series,Set prefix for numbering series on your transactions,กำหนดคำนำหน้าสำหรับหมายเลขชุดทำธุรกรรมของคุณ
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +169,Stopped order cannot be cancelled. Unstop to cancel.,เพื่อ หยุด ไม่สามารถยกเลิกได้ เปิดจุก ที่จะยกเลิก
-apps/erpnext/erpnext/stock/doctype/item/item.py +323,Default BOM ({0}) must be active for this item or its template,BOM ค่าเริ่มต้น ({0}) จะต้องใช้งานสำหรับรายการนี​​้หรือแม่แบบของมัน
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +164,Stopped order cannot be cancelled. Unstop to cancel.,เพื่อ หยุด ไม่สามารถยกเลิกได้ เปิดจุก ที่จะยกเลิก
+apps/erpnext/erpnext/stock/doctype/item/item.py +327,Default BOM ({0}) must be active for this item or its template,BOM ค่าเริ่มต้น ({0}) จะต้องใช้งานสำหรับรายการนี​​้หรือแม่แบบของมัน
 DocType: Employee,Leave Encashed?,ฝาก Encashed?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,โอกาสจากข้อมูลมีผลบังคับใช้
 DocType: Item,Variants,สายพันธุ์
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +458,Make Purchase Order,ทำให้ การสั่งซื้อ
 DocType: SMS Center,Send To,ส่งให้
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +111,There is not enough leave balance for Leave Type {0},ที่มีอยู่ไม่ สมดุล เพียงพอสำหรับ การลา ออกจาก ประเภท {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +127,There is not enough leave balance for Leave Type {0},ที่มีอยู่ไม่ สมดุล เพียงพอสำหรับ การลา ออกจาก ประเภท {0}
 DocType: Sales Team,Contribution to Net Total,สมทบสุทธิ
 DocType: Sales Invoice Item,Customer's Item Code,รหัสสินค้าของลูกค้า
 DocType: Stock Reconciliation,Stock Reconciliation,สมานฉันท์สต็อก
@@ -1548,11 +1494,11 @@
 DocType: Sales Order Item,Actual Qty,จำนวนที่เกิดขึ้นจริง
 DocType: Sales Invoice Item,References,อ้างอิง
 DocType: Quality Inspection Reading,Reading 10,อ่าน 10
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +612,"List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start.",รายการสินค้า หรือบริการที่คุณ ซื้อหรือขาย ของคุณ
+apps/erpnext/erpnext/public/js/setup_wizard.js +348,"List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start.",รายการสินค้า หรือบริการที่คุณ ซื้อหรือขาย ของคุณ
 DocType: Hub Settings,Hub Node,Hub โหนด
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,คุณได้ป้อน รายการที่ซ้ำกัน กรุณา แก้ไข และลองอีกครั้ง
 apps/erpnext/erpnext/controllers/item_variant.py +65,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values,มูลค่า {0} สำหรับแอตทริบิวต์ {1} ไม่อยู่ในรายชื่อของรายการที่ถูกต้องแอตทริบิวต์ค่า
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +87,Associate,ภาคี
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Associate,ภาคี
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +46,Item {0} is not a serialized Item,รายการที่ {0} ไม่ได้เป็นรายการ ต่อเนื่อง
 DocType: SMS Center,Create Receiver List,สร้างรายการรับ
 apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +5,Expired,หมดอายุ
@@ -1561,7 +1507,7 @@
 DocType: Warranty Claim,Issue Date,วันที่ออก
 DocType: Activity Cost,Activity Cost,ค่าใช้จ่ายในกิจกรรม
 DocType: Purchase Receipt Item Supplied,Consumed Qty,จำนวนการบริโภค
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +52,Telecommunications,การสื่อสารโทรคมนาคม
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +52,Telecommunications,การสื่อสารโทรคมนาคม
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),แสดงให้เห็นว่าแพคเกจเป็นส่วนหนึ่งของการส่งมอบนี้ (เฉพาะร่าง)
 DocType: Payment Tool,Make Payment Entry,ทำ รายการ ชำระเงิน
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +119,Quantity for Item {0} must be less than {1},ปริมาณ รายการ {0} ต้องน้อยกว่า {1}
@@ -1578,10 +1524,8 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +37,"Selling must be checked, if Applicable For is selected as {0}",ขายจะต้องตรวจสอบถ้าใช้สำหรับการถูกเลือกเป็น {0}
 DocType: Purchase Order Item,Supplier Quotation Item,รายการใบเสนอราคาของผู้ผลิต
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +27,Make Salary Structure,ทำให้ โครงสร้าง เงินเดือน
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +54,Shearing,การตัด
 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.,คลิกที่ &#39;ให้ขายใบแจ้งหนี้&#39; เพื่อสร้างใบแจ้งหนี้การขายใหม่
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +166,Packaging and labeling,บรรจุภัณฑ์และการติดฉลาก
 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,โปรดระบุ สกุลเงิน เริ่มต้นใน บริษัท โท และ เริ่มต้น ทั่วโลก
@@ -1592,19 +1536,18 @@
 DocType: Budget Detail,Fiscal Year,ปีงบประมาณ
 DocType: Cost Center,Budget,งบ
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +41,"Budget cannot be assigned against {0}, as it's not an Income or Expense account",งบประมาณไม่สามารถกำหนดกับ {0} เป็นมันไม่ได้เป็นบัญ​​ชีรายได้หรือค่าใช้จ่าย
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Achieved,ที่ประสบความสำเร็จ
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,ที่ประสบความสำเร็จ
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +65,Territory / Customer,มณฑล / ลูกค้า
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,e.g. 5,เช่นผู้ 5
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +207,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},แถว {0}: จำนวนจัดสรร {1} ต้องน้อยกว่าหรือเท่ากับใบแจ้งหนี้ยอดคงค้าง {2}
+apps/erpnext/erpnext/public/js/setup_wizard.js +294,e.g. 5,เช่นผู้ 5
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},แถว {0}: จำนวนจัดสรร {1} ต้องน้อยกว่าหรือเท่ากับใบแจ้งหนี้ยอดคงค้าง {2}
 DocType: Sales Invoice,In Words will be visible once you save the Sales Invoice.,ในคำพูดของจะสามารถมองเห็นได้เมื่อคุณบันทึกใบแจ้งหนี้การขาย
 DocType: Item,Is Sales Item,รายการขาย
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,กลุ่มสินค้า ต้นไม้
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,รายการที่ {0} ไม่ได้ ติดตั้ง สำหรับต้นแบบ อนุกรม Nos ได้ ตรวจสอบ รายการ
 DocType: Maintenance Visit,Maintenance Time,เวลาการบำรุงรักษา
 ,Amount to Deliver,ปริมาณการส่ง
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +620,A Product or Service,สินค้าหรือบริการ
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +158,There were errors.,มีข้อผิดพลาด ได้
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +101,Tapping,แตะ
+apps/erpnext/erpnext/public/js/setup_wizard.js +356,A Product or Service,สินค้าหรือบริการ
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +146,There were errors.,มีข้อผิดพลาด ได้
 DocType: Naming Series,Current Value,ค่าปัจจุบัน
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +171,{0} created,{0} สร้าง
 DocType: Delivery Note Item,Against Sales Order,กับ การขายสินค้า
@@ -1619,7 +1562,7 @@
 apps/erpnext/erpnext/accounts/party.py +275,Due Date cannot be before Posting Date,วันที่ครบกำหนด ไม่สามารถ ก่อน วันที่ประกาศ
 DocType: Website Item Group,Website Item Group,กลุ่มสินค้าเว็บไซต์
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Duties and Taxes,หน้าที่ และภาษี
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Please enter Reference date,กรุณากรอก วันที่ อ้างอิง
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +312,Please enter Reference date,กรุณากรอก วันที่ อ้างอิง
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} รายการชำระเงินไม่สามารถกรองโดย {1}
 DocType: Item Website Specification,Table for Item that will be shown in Web Site,ตารางสำหรับรายการที่จะแสดงในเว็บไซต์
 DocType: Purchase Order Item Supplied,Supplied Qty,จำหน่ายจำนวน
@@ -1627,7 +1570,7 @@
 apps/erpnext/erpnext/config/stock.py +103,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,ประวัติการซื้อสินค้าที่ชาญฉลาด
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +152,Red,สีแดง
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Red,สีแดง
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +228,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},กรุณา คลิกที่ 'สร้าง ตาราง ' เพื่อ เรียก หมายเลขเครื่อง เพิ่มสำหรับ รายการ {0}
 DocType: Account,Frozen,แช่แข็ง
 ,Open Production Orders,สั่ง เปิด การผลิต
@@ -1642,7 +1585,7 @@
 DocType: Item Attribute,Attribute Name,ชื่อแอตทริบิวต์
 apps/erpnext/erpnext/controllers/selling_controller.py +236,Item {0} must be Sales or Service Item in {1},รายการ {0} จะต้องมี การขายหรือการ บริการ ใน รายการ {1}
 DocType: Item Group,Show In Website,แสดงในเว็บไซต์
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +621,Group,กลุ่ม
+apps/erpnext/erpnext/public/js/setup_wizard.js +357,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","เพื่อติดตามชื่อแบรนด์ในเอกสารดังต่อไปหมายเหตุการจัดส่งสินค้า, โอกาส, วัสดุขอรายการสั่งซื้อ, ซื้อคูปอง, ใบเสร็จรับเงินซื้อใบเสนอราคา, ใบแจ้งหนี้การขาย, Bundle สินค้า, การขายสินค้า, ไม่มี Serial"
@@ -1652,6 +1595,7 @@
 DocType: Features Setup,Brands,แบรนด์
 DocType: C-Form Invoice Detail,Invoice No,ใบแจ้งหนี้ไม่มี
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +480,From Purchase Order,จากการสั่งซื้อ
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +92,"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,วันที่ใบลาออก
@@ -1659,35 +1603,31 @@
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +137,Not Set,ยังไม่ได้ระบุ
 DocType: Communication,Date,วันที่
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,ซ้ำรายได้ของลูกค้า
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +651,Sit tight while your system is being setup. This may take a few moments.,นั่งตึงตัว ในขณะที่ ระบบของคุณ จะถูก ติดตั้ง ซึ่งอาจใช้เวลา สักครู่
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +115,Sit tight while your system is being setup. This may take a few moments.,นั่งตึงตัว ในขณะที่ ระบบของคุณ จะถูก ติดตั้ง ซึ่งอาจใช้เวลา สักครู่
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +51,{0} ({1}) must have role 'Expense Approver',{0} ({1}) จะต้องมีบทบาท 'ค่าใช้จ่ายอนุมัติ'
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Pair,คู่
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Pair,คู่
 DocType: Bank Reconciliation Detail,Against Account,กับบัญชี
 DocType: Maintenance Schedule Detail,Actual Date,วันที่เกิดขึ้นจริง
 DocType: Item,Has Batch No,ชุดมีไม่มี
 DocType: Delivery Note,Excise Page Number,หมายเลขหน้าสรรพสามิต
 DocType: Employee,Personal Details,รายละเอียดส่วนบุคคล
 ,Maintenance Schedules,ตารางการบำรุงรักษา
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +44,Embossing,ลายนูน
 ,Quotation Trends,ใบเสนอราคา แนวโน้ม
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +139,Item Group not mentioned in item master for item {0},กลุ่มสินค้าไม่ได้กล่าวถึงในหลักรายการสำหรับรายการที่ {0}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +302,Debit To account must be a Receivable account,เดบิตในการบัญชีจะต้องเป็นบัญ​​ชีลูกหนี้
-apps/erpnext/erpnext/stock/doctype/item/item.py +310,"As Production Order can be made for this item, it must be a stock item.",ในขณะที่ การผลิต สามารถสั่ง ทำ สำหรับรายการ นี้จะต้อง เป็นรายการ สต็อก
 DocType: Shipping Rule Condition,Shipping Amount,จำนวนการจัดส่งสินค้า
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +140,Joining,การร่วม
-DocType: Authorization Rule,Above Value,สูงกว่าค่า
 ,Pending Amount,จำนวนเงินที่ รอดำเนินการ
 DocType: Purchase Invoice Item,Conversion Factor,ปัจจัยการเปลี่ยนแปลง
 DocType: Purchase Order,Delivered,ส่ง
 apps/erpnext/erpnext/config/hr.py +160,Setup incoming server for jobs email id. (e.g. jobs@example.com),การตั้งค่า เซิร์ฟเวอร์ขาเข้า สำหรับงาน อีเมล์ ของคุณ (เช่น jobs@example.com )
 DocType: Purchase Receipt,Vehicle Number,จำนวนยานพาหนะ
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,วันที่ใบแจ้งหนี้ที่เกิดขึ้นจะถูกหยุด
+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,ลูกหนี้
 ,Supplier-Wise Sales Analytics,ผู้ผลิต ฉลาด Analytics ขาย
 DocType: Address Template,This format is used if country specific format is not found,รูปแบบนี้ใช้ในกรณีที่รูปแบบเฉพาะของประเทศจะไม่พบ
 DocType: Custom Field,Custom,ประเพณี
 DocType: Production Order,Use Multi-Level BOM,ใช้ BOM หลายระดับ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +26,Injection molding,การฉีดขึ้นรูป
 DocType: Bank Reconciliation,Include Reconciled Entries,รวมถึง คอมเมนต์ Reconciled
 apps/erpnext/erpnext/config/accounts.py +41,Tree of finanial accounts.,ผังต้นไม้ของบัญชีการเงิน
 DocType: Leave Control Panel,Leave blank if considered for all employee types,เว้นไว้หากพิจารณาให้พนักงานทุกประเภท
@@ -1697,30 +1637,28 @@
 apps/frappe/frappe/config/setup.py +130,Printing,การพิมพ์
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +114,Expense Claim is pending approval. Only the Expense Approver can update status.,ค่าใช้จ่ายที่ เรียกร้อง คือการ รอการอนุมัติ เพียง แต่ผู้อนุมัติ ค่าใช้จ่าย สามารถอัปเดต สถานะ
 DocType: Purchase Invoice,Additional Discount Amount,จำนวนส่วนลดเพิ่มเติม
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +99,The day(s) on which you are applying for leave are holiday. You need not apply for leave.,วัน(s) ที่ คุณจะใช้สำหรับ การลา เป็น วันหยุด คุณไม่จำเป็นต้อง ใช้สำหรับการ ออก
 apps/frappe/frappe/public/js/frappe/misc/utils.js +110,and,และ
 DocType: Leave Block List Allow,Leave Block List Allow,ฝากรายการบล็อกอนุญาตให้
 apps/erpnext/erpnext/setup/doctype/company/company.py +236,Abbr can not be blank or space,เงื่อนไขที่ไม่สามารถเป็นที่ว่างเปล่าหรือพื้นที่
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +50,Sports,กีฬา
+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/setup/page/setup_wizard/setup_wizard.js +626,Unit,หน่วย
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Unit,หน่วย
 apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.py +182,Please set Dropbox access keys in your site config,โปรดตั้งค่า คีย์ การเข้าถึง Dropbox ใน การตั้งค่า เว็บไซต์ของคุณ
 apps/erpnext/erpnext/stock/get_item_details.py +113,Please specify Company,โปรดระบุ บริษัท
 ,Customer Acquisition and Loyalty,การซื้อ ของลูกค้าและ ความจงรักภักดี
 DocType: Purchase Receipt,Warehouse where you are maintaining stock of rejected items,คลังสินค้าที่คุณจะรักษาสต็อกของรายการปฏิเสธ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +408,Your financial year ends on,ปี การเงินของคุณ จะสิ้นสุดลงใน
+apps/erpnext/erpnext/public/js/setup_wizard.js +156,Your financial year ends on,ปี การเงินของคุณ จะสิ้นสุดลงใน
 DocType: POS Profile,Price List,บัญชีแจ้งราคาสินค้า
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +20,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0} ตอนนี้ก็คือ การเริ่มต้น ปีงบประมาณ กรุณารีเฟรช เบราว์เซอร์ ของคุณ สำหรับการเปลี่ยนแปลงที่จะ มีผลบังคับใช้
 apps/erpnext/erpnext/projects/doctype/project/project.js +47,Expense Claims,ค่าใช้จ่ายในการเรียกร้อง
 DocType: Issue,Support,สนับสนุน
-DocType: Authorization Rule,Approving Role,อนุมัติบทบาท
 ,BOM Search,BOM ค้นหา
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +176,Closing (Opening + Totals),ปิด (เปิดผลรวม +)
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +26,Please specify currency in Company,โปรดระบุสกุลเงินใน บริษัท
 DocType: Workstation,Wages per hour,ค่าจ้างต่อชั่วโมง
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},สมดุลหุ้นใน Batch {0} จะกลายเป็นเชิงลบ {1} สำหรับรายการ {2} ที่โกดัง {3}
 apps/erpnext/erpnext/config/setup.py +83,"Show / Hide features like Serial Nos, POS etc.","แสดง / ซ่อน คุณสมบัติเช่น อนุกรม Nos , POS ฯลฯ"
-apps/erpnext/erpnext/controllers/accounts_controller.py +236,Account {0} is invalid. Account Currency must be {1},บัญชี {0} ไม่ถูกต้อง สกุลเงินในบัญชีจะต้องเป็น {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +237,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},ปัจจัย UOM แปลง จะต้อง อยู่ในแถว {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +53,Clearance date cannot be before check date in row {0},วันที่ โปรโมชั่น ไม่สามารถเป็น ก่อนวันที่ เช็คอิน แถว {0}
 DocType: Salary Slip,Deduction,การหัก
@@ -1739,13 +1677,13 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +82,Item {0} has already been returned,รายการ {0} ได้รับ กลับมา แล้ว
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** ปีงบประมาณ ** หมายถึงปีทางการเงิน ทุกรายการบัญชีและการทำธุรกรรมอื่น ๆ ที่สำคัญมีการติดตามต่อปี ** ** การคลัง
 DocType: Opportunity,Customer / Lead Address,ลูกค้า / ที่อยู่
+apps/erpnext/erpnext/stock/doctype/item/item.py +112,Warning: Invalid SSL certificate on attachment {0},คำเตือน: ใบรับรอง SSL ที่ไม่ถูกต้องในสิ่งที่แนบมา {0}
 DocType: Production Order Operation,Actual Operation Time,เวลาการดำเนินงานที่เกิดขึ้นจริง
 DocType: Authorization Rule,Applicable To (User),ที่ใช้บังคับกับ (User)
 DocType: Purchase Taxes and Charges,Deduct,หัก
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +170,Job Description,รายละเอียดตำแหน่งงาน
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +170,Job Description,รายละเอียดตำแหน่งงาน
 DocType: Purchase Order Item,Qty as per Stock UOM,จำนวนตามสต็อก UOM
 apps/frappe/frappe/model/rename_doc.py +343,Please select a valid csv file with data,กรุณาเลือก csv ที่ถูกต้อง กับข้อมูล
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +92,Coating,การเคลือบผิว
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +126,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","อักขระพิเศษยกเว้น ""-"" ""."", ""#"" และ ""/"" ไม่ได้รับอนุญาตในการตั้งชื่อชุด"
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.",ติดตามงานส่งเสริมการขาย ติดตามช่องทาง ใบเสนอราคา ใบสั่งขายต่างๆ ฯลฯ จากงานส่งเสริมการตลาดเพื่อวัดอัตราผลตอบแทนจากการลงทุน
 DocType: Expense Claim,Approver,อนุมัติ
@@ -1755,12 +1693,11 @@
 DocType: Supplier Quotation,Manufacturing Manager,ผู้จัดการฝ่ายผลิต
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +191,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/hooks.py +84,Shipments,การจัดส่ง
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +29,Dip molding,จุ่มปั้น
+apps/erpnext/erpnext/hooks.py +68,Shipments,การจัดส่ง
 DocType: Purchase Order,To be delivered to customer,ที่จะส่งมอบให้กับลูกค้า
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,ต้องส่งสถานะของบันทึกเวลา
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,ไม่มี Serial {0} ไม่ได้อยู่ในโกดังสินค้าใด ๆ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +650,Setting Up,การตั้งค่า
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +114,Setting Up,การตั้งค่า
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,Row # ,แถว #
 DocType: Purchase Invoice,In Words (Company Currency),ในคำ (สกุลเงิน บริษัท )
 DocType: Pricing Rule,Supplier,ผู้จัดจำหน่าย
@@ -1768,7 +1705,7 @@
 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 +166,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,ค่าใช้จ่าย หรือ ความแตกต่าง บัญชี มีผลบังคับใช้ กับ รายการ {0} ที่มัน มีผลกระทบต่อ มูลค่า หุ้น โดยรวม
-apps/erpnext/erpnext/controllers/accounts_controller.py +354,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings",ไม่สามารถ overbill สำหรับรายการ {0} ในแถว {1} มากกว่า {2} ที่จะอนุญาตให้ overbilling โปรดตั้งในการตั้งค่าสต็อก
+apps/erpnext/erpnext/controllers/accounts_controller.py +355,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings",ไม่สามารถ overbill สำหรับรายการ {0} ในแถว {1} มากกว่า {2} ที่จะอนุญาตให้ overbilling โปรดตั้งในการตั้งค่าสต็อก
 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 +135,User {0} is disabled,ผู้ใช้ {0} ถูกปิดใช้งาน
@@ -1781,27 +1718,26 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,{0} is mandatory for Item {1},{0} จำเป็นสำหรับ รายการ {1}
 DocType: Currency Exchange,From Currency,จากสกุลเงิน
 DocType: DocField,Name,ชื่อ
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +211,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row",กรุณาเลือกจำนวนเงินที่จัดสรรประเภทใบแจ้งหนี้และจำนวนใบแจ้งหนี้ในอย่างน้อยหนึ่งแถว
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +104,Sales Order required for Item {0},การสั่งซื้อสินค้า ที่จำเป็นสำหรับการ ขาย สินค้า {0}
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +158,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row",กรุณาเลือกจำนวนเงินที่จัดสรรประเภทใบแจ้งหนี้และจำนวนใบแจ้งหนี้ในอย่างน้อยหนึ่งแถว
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +107,Sales Order required for Item {0},การสั่งซื้อสินค้า ที่จำเป็นสำหรับการ ขาย สินค้า {0}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +43,Amounts not reflected in system,จำนวนเงินไม่ได้สะท้อนให้เห็นในระบบ
 DocType: Purchase Invoice Item,Rate (Company Currency),อัตรา (สกุลเงิน บริษัท )
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +40,Others,คนอื่น ๆ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +40,Others,คนอื่น ๆ
 apps/erpnext/erpnext/templates/includes/product_page.js +80,Cannot find a matching Item. Please select some other value for {0}.,ไม่พบรายการที่ตรงกัน กรุณาเลือกบางค่าอื่น ๆ สำหรับ {0}
 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/frappe/frappe/core/doctype/doctype/boilerplate/controller_list.html +31,Completed,เสร็จ
 DocType: Web Form,Select DocType,เลือก DocType
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +104,Broaching,เจาะ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +12,Banking,การธนาคาร
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,การธนาคาร
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +38,Please click on 'Generate Schedule' to get schedule,กรุณา คลิกที่ 'สร้าง ตาราง ' ที่จะได้รับ ตารางเวลา
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +283,New Cost Center,ศูนย์ต้นทุน ใหม่
 DocType: Bin,Ordered Quantity,จำนวนสั่ง
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +397,"e.g. ""Build tools for builders""","เช่นผู้ ""สร้าง เครื่องมือสำหรับการ สร้าง """
+apps/erpnext/erpnext/public/js/setup_wizard.js +145,"e.g. ""Build tools for builders""","เช่นผู้ ""สร้าง เครื่องมือสำหรับการ สร้าง """
 DocType: Quality Inspection,In Process,ในกระบวนการ
 DocType: Authorization Rule,Itemwise Discount,ส่วนลด Itemwise
 DocType: Purchase Order Item,Reference Document Type,เอกสารประเภท
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +318,{0} against Sales Order {1},{0} กับคำสั่งขาย {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +320,{0} against Sales Order {1},{0} กับคำสั่งขาย {1}
 DocType: Account,Fixed Asset,สินทรัพย์ คงที่
 apps/erpnext/erpnext/config/stock.py +283,Serialized Inventory,เนื่องสินค้าคงคลัง
 DocType: Activity Type,Default Billing Rate,เริ่มต้นอัตราการเรียกเก็บเงิน
@@ -1816,14 +1752,13 @@
 DocType: Purchase Invoice Item,Page Break,แบ่งหน้า
 DocType: Production Order Operation,Pending,คาราคาซัง
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,ผู้ใช้ที่สามารถอนุมัติพนักงานเฉพาะแอพพลิเคลา
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +33,You cannot change default UOM of Variant. To change default UOM for Variant change default UOM of the Template,คุณไม่สามารถเปลี่ยน UOM เริ่มต้นของตัวแปร ในการเปลี่ยน UOM เริ่มต้นสำหรับการเปลี่ยนแปลงตัวแปรเริ่มต้น UOM ของแม่แบบ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +50,Office Equipments,อุปกรณ์ สำนักงาน
 DocType: Purchase Invoice Item,Qty,จำนวน
 DocType: Fiscal Year,Companies,บริษัท
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +24,Electronics,อิเล็กทรอนิกส์
+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/support/doctype/maintenance_visit/maintenance_visit.js +18,From Maintenance Schedule,จาก ตาราง การบำรุงรักษา
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +56,Full-time,เต็มเวลา
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +56,Full-time,เต็มเวลา
 DocType: Purchase Invoice,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.",ถ้าคุณได้สร้างแม่แบบมาตรฐานในการภาษีขายและค่าใช้จ่ายแม่แบบให้เลือกและคลิกที่ปุ่มด้านล่าง
@@ -1835,11 +1770,12 @@
 DocType: Job Applicant,Job Opening,เปิดงาน
 DocType: Payment Reconciliation,Payment Reconciliation,กระทบยอดการชำระเงิน
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +154,Please select Incharge Person's name,กรุณา เลือกชื่อ Incharge บุคคล
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +51,Technology,เทคโนโลยี
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,เทคโนโลยี
 DocType: Offer Letter,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,รวมใบแจ้งหนี้ 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.",ในการเพิ่ม โหนด เด็ก สำรวจ ต้นไม้ และคลิกที่ โหนด ตามที่ คุณต้องการเพิ่ม โหนด เพิ่มเติม
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +102,Credit To account must be a Payable account,เครดิตการบัญชีจะต้องเป็นบัญ​​ชีเจ้าหนี้
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +233,BOM recursion: {0} cannot be parent or child of {2},BOM เรียกซ้ำ : {0} ไม่สามารถ เป็นผู้ปกครอง หรือเด็ก ของ {2}
@@ -1852,10 +1788,8 @@
 DocType: Item,Customer Item Codes,ลูกค้ารหัสสินค้า
 DocType: Opportunity,Lost Reason,เหตุผลที่หายไป
 apps/erpnext/erpnext/config/accounts.py +68,Create Payment Entries against Orders or Invoices.,สร้างรายการการชำระเงินกับคำสั่งซื้อหรือใบแจ้งหนี้
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +141,Welding,การเชื่อมโลหะ
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +40,New Stock UOM is required,มาใหม่พร้อมส่ง UOM จะต้อง
 DocType: Quality Inspection,Sample Size,ขนาดของกลุ่มตัวอย่าง
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +443,All items have already been invoiced,รายการทั้งหมดที่ ได้รับการ ออกใบแจ้งหนี้ แล้ว
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +446,All items have already been invoiced,รายการทั้งหมดที่ ได้รับการ ออกใบแจ้งหนี้ แล้ว
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',โปรดระบุที่ถูกต้อง &#39;จากคดีหมายเลข&#39;
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +287,Further cost centers can be made under Groups but entries can be made against non-Groups,ศูนย์ต้นทุนเพิ่มเติมสามารถทำภายใต้กลุ่ม แต่รายการที่สามารถทำกับกลุ่มที่ไม่
 DocType: Project,External,ภายนอก
@@ -1867,8 +1801,7 @@
 DocType: Bin,Actual Quantity,จำนวนที่เกิดขึ้นจริง
 DocType: Shipping Rule,example: Next Day Shipping,ตัวอย่างเช่นการจัดส่งสินค้าวันถัดไป
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,ไม่มี Serial {0} ไม่พบ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +563,Your Customers,ลูกค้าของคุณ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +27,Compression molding,การปั้นการบีบอัด
+apps/erpnext/erpnext/public/js/setup_wizard.js +303,Your Customers,ลูกค้าของคุณ
 DocType: Leave Block List Date,Block Date,บล็อกวันที่
 DocType: Sales Order,Not Delivered,ไม่ได้ส่ง
 ,Bank Clearance Summary,ข้อมูลอย่างย่อ Clearance ธนาคาร
@@ -1889,10 +1822,10 @@
 DocType: SMS Log,Sent To,ส่งไปยัง
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +28,Make Sales Invoice,ทำให้การ ขายใบแจ้งหนี้
 DocType: Company,For Reference Only.,สำหรับการอ้างอิงเท่านั้น
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +29,Invalid {0}: {1},ไม่ถูกต้อง {0}: {1}
+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,การวางแผนกำลังการผลิต
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +49,'From Date' is required,'จาก วันที่ ' จะต้อง
+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,สถานที่ทำงานใหม่
@@ -1907,7 +1840,7 @@
 DocType: Serial No,Delivery Time,เวลาจัดส่งสินค้า
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,เอจจิ้ง อยู่ ที่
 DocType: Item,End of Life,ในตอนท้ายของชีวิต
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +41,Travel,การเดินทาง
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +41,Travel,การเดินทาง
 DocType: Leave Block List,Allow Users,อนุญาตให้ผู้ใช้งาน
 DocType: Purchase Order,Customer Mobile No,มือถือของลูกค้าไม่มี
 DocType: Sales Invoice,Recurring,การคืน
@@ -1921,7 +1854,7 @@
 DocType: Naming Series,User must always select,ผู้ใช้จะต้องเลือก
 DocType: Stock Settings,Allow Negative Stock,อนุญาตให้สต็อกเชิงลบ
 DocType: Installation Note,Installation Note,หมายเหตุการติดตั้ง
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +541,Add Taxes,เพิ่ม ภาษี
+apps/erpnext/erpnext/public/js/setup_wizard.js +283,Add Taxes,เพิ่ม ภาษี
 ,Financial Analytics,Analytics การเงิน
 DocType: Quality Inspection,Verified By,ตรวจสอบโดย
 DocType: Address,Subsidiary,บริษัท สาขา
@@ -1931,7 +1864,6 @@
 DocType: System Settings,In Hours,ในชั่วโมง
 DocType: Process Payroll,Create Salary Slip,สร้างสลิปเงินเดือน
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Expected balance as per bank,ยอดเงินที่คาดว่าจะเป็นต่อธนาคาร
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +115,Buffing,ขัด
 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,ลูกจ้าง
@@ -1948,11 +1880,11 @@
 DocType: Rename Tool,File to Rename,การเปลี่ยนชื่อไฟล์
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +176,Purchse Order number required for Item {0},จำนวน การสั่งซื้อ Purchse จำเป็นสำหรับ รายการ {0}
 apps/erpnext/erpnext/public/js/controllers/transaction.js +136,Show Payments,แสดงการชำระเงิน
-apps/erpnext/erpnext/controllers/buying_controller.py +245,Specified BOM {0} does not exist for Item {1},ระบุ BOM {0} ไม่อยู่สำหรับรายการ {1}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +202,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,ตาราง การบำรุงรักษา {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 +197,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,ตาราง การบำรุงรักษา {0} ต้อง ถูกยกเลิก ก่อนที่จะ ยกเลิกการ สั่งซื้อการขาย นี้
 apps/frappe/frappe/desk/page/backups/backups.html +13,Size,ขนาด
 DocType: Notification Control,Expense Claim Approved,เรียกร้องค่าใช้จ่ายที่ได้รับอนุมัติ
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +113,Pharmaceutical,เภสัชกรรม
+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,สั่งซื้อยอดขายที่ต้องการ
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +30,Create Customer,สร้าง ลูกค้า
@@ -1962,7 +1894,6 @@
 DocType: Quality Inspection Reading,Reading 9,อ่าน 9
 DocType: Supplier,Is Frozen,ถูกแช่แข็ง
 DocType: Buying Settings,Buying Settings,ตั้งค่าการซื้อ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +122,Mass finishing,ตกแต่งมวล
 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),การตั้งค่า เซิร์ฟเวอร์ขาเข้า สำหรับอีเมล ขาย รหัส ของคุณ (เช่น sales@example.com )
@@ -1970,7 +1901,7 @@
 DocType: Payment Tool,Payment Account,บัญชีการชำระเงิน
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +713,Please specify Company to proceed,โปรดระบุ บริษัท ที่จะดำเนินการ
 apps/frappe/frappe/public/js/frappe/model/indicator.js +30,Draft,ร่าง
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +46,Compensatory Off,ชดเชย ปิด
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Compensatory Off,ชดเชย ปิด
 DocType: Quality Inspection Reading,Accepted,ได้รับการยอมรับ
 DocType: User,Female,หญิง
 DocType: Journal Entry Account,Debit in Account Currency,เดบิตในสกุลเงินในบัญชี
@@ -1982,7 +1913,7 @@
 DocType: Shipping Rule,Shipping Rule Label,ป้ายกฎการจัดส่งสินค้า
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +209,Raw Materials cannot be blank.,วัตถุดิบไม่สามารถมีช่องว่าง
 DocType: Newsletter,Test,ทดสอบ
-apps/erpnext/erpnext/stock/doctype/item/item.py +364,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +368,"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'","เนื่องจากมีการทำธุรกรรมที่มีอยู่สต็อกสำหรับรายการนี​​้ \ คุณไม่สามารถเปลี่ยนค่าของ &#39;มีไม่มี Serial&#39;, &#39;มีรุ่นที่ไม่มี&#39;, &#39;เป็นรายการสต็อก &quot;และ&quot; วิธีการประเมิน&#39;"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +448,Quick Journal Entry,วารสารรายการด่วน
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +92,You can not change rate if BOM mentioned agianst any item,คุณไม่สามารถเปลี่ยน อัตรา ถ้า BOM กล่าว agianst รายการใด ๆ
@@ -1993,13 +1924,14 @@
 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.,เพื่อผลิตแยกจะถูกสร้างขึ้นสำหรับรายการที่ดีในแต่ละสำเร็จรูป
 DocType: Purchase Invoice,Terms and Conditions1,ข้อตกลงและ Conditions1
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +18,Complete Setup,การติดตั้ง เสร็จสมบูรณ์
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard_page.html +18,Complete Setup,การติดตั้ง เสร็จสมบูรณ์
 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/config/crm.py +96,Newsletter Mailing List,จดหมายข่าวรายชื่อผู้รับจดหมาย
 DocType: Delivery Note,Transporter Name,ชื่อ Transporter
+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 +57,Total Absent,ขาดทั้งหมด
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +746,Item or Warehouse for row {0} does not match Material Request,สินค้าหรือ โกดัง แถว {0} ไม่ตรงกับที่ ขอ วัสดุ
@@ -2024,16 +1956,15 @@
 DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),อัตราขั้นพื้นฐาน (ตามหุ้น UOM)
 DocType: SMS Log,No of Requested SMS,ไม่มีของ SMS ขอ
 DocType: Campaign,Campaign-.####,แคมเปญ . # # # #
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +55,Piercing,แหลม
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,ขั้นตอนถัดไป
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +117,Contract End Date must be greater than Date of Joining,วันที่สิ้นสุด สัญญา จะต้องมากกว่า วันที่ เข้าร่วม
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,จำหน่ายบุคคลที่สาม / ตัวแทนจำหน่าย / ตัวแทนคณะกรรมการ / พันธมิตร / ผู้ค้าปลีกที่ขายสินค้า บริษัท สำหรับคณะกรรมการ
 DocType: Customer Group,Has Child Node,มีโหนดลูก
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{0} against Purchase Order {1},{0} กับใบสั่งซื้อ {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +332,{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/page/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
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +110,Photochemical machining,เครื่องจักรกลเคมี
 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.
 
 #### Note
@@ -2079,7 +2010,7 @@
 DocType: Purchase Receipt Item,Recd Quantity,จำนวน Recd
 DocType: Email Account,Email Ids,อีเมล์หมายเลข
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},ไม่สามารถผลิต สินค้า ได้มากขึ้น {0} กว่าปริมาณ การขายสินค้า {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +471,Stock Entry {0} is not submitted,หุ้นรายการ {0} ไม่ได้ส่ง
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +473,Stock Entry {0} is not submitted,หุ้นรายการ {0} ไม่ได้ส่ง
 DocType: Payment Reconciliation,Bank / Cash Account,บัญชีธนาคาร / เงินสด
 DocType: Tax Rule,Billing City,เมืองการเรียกเก็บเงิน
 DocType: Global Defaults,Hide Currency Symbol,ซ่อนสัญลักษณ์สกุลเงิน
@@ -2095,7 +2026,7 @@
 DocType: Purchase Invoice,Currency and Price List,สกุลเงินและรายชื่อราคา
 DocType: Opportunity,Customer / Lead Name,ลูกค้า / ชื่อ
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +63,Clearance Date not mentioned,โปรโมชั่น วันที่ ไม่ได้กล่าวถึง
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +71,Production,การผลิต
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Production,การผลิต
 DocType: Item,Allow Production Order,อนุญาตให้สั่งซื้อการผลิต
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +60,Row {0}:Start Date must be before End Date,แถว {0}: วันที่ เริ่มต้น ต้องอยู่ก่อน วันที่สิ้นสุด
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),รวม (จำนวน)
@@ -2108,7 +2039,7 @@
 apps/erpnext/erpnext/utilities/doctype/address/address.py +113,My Addresses,ที่อยู่ของฉัน
 DocType: Stock Ledger Entry,Outgoing Rate,อัตราการส่งออก
 apps/erpnext/erpnext/config/hr.py +100,Organization branch master.,ปริญญาโท สาขา องค์กร
-apps/erpnext/erpnext/controllers/accounts_controller.py +237, or ,หรือ
+apps/erpnext/erpnext/controllers/accounts_controller.py +238, 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-ขึ้นไป
@@ -2135,6 +2066,7 @@
 DocType: Stock Entry Detail,Serial No / Batch,หมายเลขเครื่อง / ชุด
 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 +213,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',ตาราง การบำรุงรักษา ที่ไม่ได้ สร้างขึ้นสำหรับ รายการทั้งหมด กรุณา คลิกที่ 'สร้าง ตาราง '
 ,To Produce,ในการ ผลิต
 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} จะต้องรวม
@@ -2142,10 +2074,7 @@
 DocType: Bin,Reserved Quantity,จำนวนสงวน
 DocType: Landed Cost Voucher,Purchase Receipt Items,ซื้อสินค้าใบเสร็จรับเงิน
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,การปรับรูปแบบ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +62,Cutting,ตัด
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +69,Flattening,ความแฟบ
 DocType: Account,Income Account,บัญชีรายได้
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +22,Molding,การปั้น
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +632,Delivery,การจัดส่งสินค้า
 DocType: Stock Reconciliation Item,Current Qty,จำนวนปัจจุบัน
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",โปรดดูที่ &quot;ค่าของวัสดุบนพื้นฐานของ&quot; ต้นทุนในมาตรา
@@ -2155,20 +2084,19 @@
 apps/frappe/frappe/desk/moduleview.py +61,Documents,เอกสาร
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +17,Ref,อ้าง
 DocType: Cost Center,Cost Center,ศูนย์ต้นทุน
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.js +48,Voucher #,บัตรกำนัล #
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +36,Voucher #,บัตรกำนัล #
 DocType: Notification Control,Purchase Order Message,ข้อความใบสั่งซื้อ
 DocType: Tax Rule,Shipping Country,การจัดส่งสินค้าประเทศ
 DocType: Upload Attendance,Upload HTML,อัพโหลด HTML
-apps/erpnext/erpnext/controllers/accounts_controller.py +391,"Total advance ({0}) against Order {1} cannot be greater \
+apps/erpnext/erpnext/controllers/accounts_controller.py +392,"Total advance ({0}) against Order {1} cannot be greater \
 				than the Grand Total ({2})","ล่วงหน้ารวม ({0}) กับการสั่งซื้อ {1} ไม่สามารถจะสูงกว่า \
  แกรนด์รวม ({2})"
 DocType: Employee,Relieving Date,บรรเทาวันที่
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +12,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.",กฎการกำหนดราคาจะทำเพื่อแทนที่ราคาตามรายการ / กำหนดเปอร์เซ็นต์ส่วนลดขึ้นอยู่กับเงื่อนไขบางอย่าง
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,คลังสินค้า สามารถ เปลี่ยน ผ่านทาง หุ้น เข้า / ส่ง หมายเหตุ / รับซื้อ
 DocType: Employee Education,Class / Percentage,ระดับ / ร้อยละ
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +92,Head of Marketing and Sales,หัวหน้าฝ่ายการตลาด และการขาย
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +31,Income Tax,ภาษีเงินได้
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +157,Laser engineered net shaping,เลเซอร์ออกแบบสร้างสุทธิ
+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.,ติดตาม ช่องทาง ตามประเภทอุตสาหกรรม
 DocType: Item Supplier,Item Supplier,ผู้ผลิตรายการ
@@ -2191,31 +2119,28 @@
 DocType: Stock Ledger Entry,Actual Qty After Transaction,จำนวนที่เกิดขึ้นจริงหลังทำรายการ
 ,Pending SO Items For Purchase Request,รายการที่รอดำเนินการเพื่อให้ใบขอซื้อ
 DocType: Supplier,Billing Currency,การเรียกเก็บเงินสกุลเงิน
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +148,Extra Large,ขนาดใหญ่พิเศษ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,Extra Large,ขนาดใหญ่พิเศษ
 ,Profit and Loss Statement,งบกำไรขาดทุน
 DocType: Bank Reconciliation Detail,Cheque Number,จำนวนเช็ค
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +43,Pressing,การกด
 DocType: Payment Tool Detail,Payment Tool Detail,รายละเอียดการชำระเงินเครื่องมือ
 ,Sales Browser,ขาย เบราว์เซอร์
 DocType: Journal Entry,Total Credit,เครดิตรวม
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +474,Warning: Another {0} # {1} exists against stock entry {2},คำเตือน: อีก {0} # {1} อยู่กับรายการหุ้น {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +459,Local,ในประเทศ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +476,Warning: Another {0} # {1} exists against stock entry {2},คำเตือน: อีก {0} # {1} อยู่กับรายการหุ้น {2}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +397,Local,ในประเทศ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),เงินให้กู้ยืม และ เงินทดรอง ( สินทรัพย์ )
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,ลูกหนี้
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +147,Large,ใหญ่
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +23,No employee found!,พนักงาน ไม่พบ !
+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 +152,Please mention no of visits required,กรุณาระบุ ไม่ จำเป็นต้องมี การเข้าชม
 DocType: Purchase Order,Customer Address Display,ที่อยู่ของลูกค้าแสดง
 DocType: Stock Settings,Default Valuation Method,วิธีการประเมินค่าเริ่มต้น
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +127,Polishing,ขัด
 DocType: Production Order Operation,Planned Start Time,เวลาเริ่มต้นการวางแผน
 apps/erpnext/erpnext/config/accounts.py +63,Close Balance Sheet and book Profit or Loss.,ปิด งบดุล และงบกำไร ขาดทุน หรือ หนังสือ
-apps/erpnext/erpnext/stock/doctype/item/item.py +661,"Default Unit of Measure for Item {0} cannot be changed directly because \
+apps/erpnext/erpnext/stock/doctype/item/item.py +665,"Default Unit of Measure for Item {0} cannot be changed directly because \
 			you have already made some transaction(s) with another UOM. To change default UOM, \
 			use 'UOM Replace Utility' tool under Stock module.",เริ่มต้นหน่วยวัดสำหรับรายการ {0} ไม่สามารถเปลี่ยนแปลงได้โดยตรงเพราะ \ คุณได้ทำแล้วการทำธุรกรรมบาง (s) กับ UOM อื่น การเปลี่ยนค่าเริ่มต้น UOM \ ใช้ &#39;UOM แทนที่ยูทิลิตี้&#39; เครื่องมือภายใต้โมดูลสต็อก
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,ระบุอัตราแลกเปลี่ยนการแปลงสกุลเงินหนึ่งไปยังอีก
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +146,Quotation {0} is cancelled,ใบเสนอราคา {0} จะถูกยกเลิก
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +141,Quotation {0} is cancelled,ใบเสนอราคา {0} จะถูกยกเลิก
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,ยอดคงค้างทั้งหมด
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} was on leave on {1}. Cannot mark attendance.,พนักงาน {0} ได้ลา ใน {1} ไม่ สามารถทำเครื่องหมาย การเข้าร่วม
 DocType: Sales Partner,Targets,เป้าหมาย
@@ -2226,7 +2151,6 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +158,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,คอมพิวเตอร์
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +112,Electro-chemical grinding,ไฟฟ้าเคมีบด
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +14,This is a root customer group and cannot be edited.,นี่คือกลุ่ม ลูกค้าราก และ ไม่สามารถแก้ไขได้
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +39,Please setup your chart of accounts before you start Accounting Entries,กรุณาตั้งค่า ผังบัญชี ก่อนที่จะเริ่ม รายการบัญชี
 DocType: Purchase Invoice,Ignore Pricing Rule,ละเว้นกฎการกำหนดราคา
@@ -2284,7 +2208,6 @@
 DocType: Maintenance Visit,Purposes,วัตถุประสงค์
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +103,Atleast one item should be entered with negative quantity in return document,อย่างน้อยหนึ่งรายการที่ควรจะใส่ที่มีปริมาณเชิงลบในเอกสารกลับมา
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +67,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations",การดำเนินงาน {0} นานกว่าชั่วโมงการทำงานใด ๆ ที่มีอยู่ในเวิร์กสเตชัน {1} ทำลายลงการดำเนินงานในการดำเนินงานหลาย
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +134,Electrochemical machining,เครื่องจักรกลไฟฟ้า
 ,Requested,ร้องขอ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +66,No Remarks,หมายเหตุไม่มี
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +13,Overdue,เกินกำหนด
@@ -2293,7 +2216,7 @@
 DocType: Monthly Distribution,Distribution Name,ชื่อการแจกจ่าย
 DocType: Features Setup,Sales and Purchase,การขายและการซื้อ
 DocType: Supplier Quotation Item,Material Request No,ขอวัสดุไม่มี
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +218,Quality Inspection required for Item {0},การตรวจสอบคุณภาพ ที่จำเป็นสำหรับ รายการ {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +221,Quality Inspection required for Item {0},การตรวจสอบคุณภาพ ที่จำเป็นสำหรับ รายการ {0}
 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),อัตราการสุทธิ (บริษัท สกุลเงิน)
@@ -2311,9 +2234,8 @@
 apps/erpnext/erpnext/accounts/report/financial_statements.py +16,Fiscal Year {0} not found.,ปีงบประมาณ {0} ไม่พบ
 DocType: Bank Reconciliation,Get Relevant Entries,ได้รับ คอมเมนต์ ที่เกี่ยวข้อง
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +407,Accounting Entry for Stock,เข้าบัญชีสำหรับสต็อก
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +64,Coining,การสร้าง
 DocType: Sales Invoice,Sales Team1,ขาย Team1
-apps/erpnext/erpnext/stock/doctype/item/item.py +412,Item {0} does not exist,รายการที่ {0} ไม่อยู่
+apps/erpnext/erpnext/stock/doctype/item/item.py +416,Item {0} does not exist,รายการที่ {0} ไม่อยู่
 DocType: Sales Invoice,Customer Address,ที่อยู่ของลูกค้า
 apps/frappe/frappe/desk/query_report.py +136,Total,ทั้งหมด
 DocType: Purchase Invoice,Apply Additional Discount On,สมัครสมาชิกเพิ่มเติมส่วนลด
@@ -2325,14 +2247,13 @@
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),จํานวนเงินภาษีหลังจากที่จำนวนส่วนลด (บริษัท สกุลเงิน)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +149,Target warehouse is mandatory for row {0},คลังสินค้า เป้าหมาย จำเป็นสำหรับ แถว {0}
 DocType: Quality Inspection,Quality Inspection,การตรวจสอบคุณภาพ
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +144,Extra Small,ขนาดเล็กเป็นพิเศษ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +20,Spray forming,สเปรย์สร้าง
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Extra Small,ขนาดเล็กเป็นพิเศษ
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +458,Warning: Material Requested Qty is less than Minimum Order Qty,คำเตือน: ขอ วัสดุ จำนวน น้อยกว่า จำนวน สั่งซื้อขั้นต่ำ
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +191,Account {0} is frozen,บัญชี {0} จะถูก แช่แข็ง
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,นิติบุคคล / สาขา ที่มีผังบัญชีแยกกัน ภายใต้องค์กร
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +29,"Food, Beverage & Tobacco","อาหาร, เครื่องดื่ม และ ยาสูบ"
+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 +529,Can only make payment against unbilled {0},สามารถชำระเงินยังไม่เรียกเก็บกับ {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +531,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/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Minimum Inventory Level,ระดับสินค้าคงคลังต่ำสุด
 DocType: Stock Entry,Subcontract,สัญญารับช่วง
@@ -2343,19 +2264,18 @@
 DocType: Item,Manufacturer Part Number,หมายเลขชิ้นส่วนของผู้ผลิต
 DocType: Production Order Operation,Estimated Time and Cost,เวลาโดยประมาณและค่าใช้จ่าย
 DocType: Bin,Bin,ถัง
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +50,Nosing,จมูก
 DocType: SMS Log,No of Sent SMS,ไม่มี SMS ที่ส่ง
 DocType: Account,Company,บริษัท
 DocType: Account,Expense Account,บัญชีค่าใช้จ่าย
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +49,Software,ซอฟต์แวร์
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +151,Colour,สี
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +49,Software,ซอฟต์แวร์
+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",กรุณาเลือกรายการที่ &quot;เป็นสต็อกสินค้า&quot; เป็น &quot;ไม่&quot; และ &quot;ขายเป็นรายการ&quot; คือ &quot;ใช่&quot; และไม่มีการ Bundle สินค้าอื่น ๆ
 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 +281,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 +134,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 +145,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,เปลี่ยนชื่อเข้าสู่ระบบ
@@ -2365,7 +2285,7 @@
 apps/erpnext/erpnext/controllers/recurring_document.py +162,Please select {0},กรุณาเลือก {0}
 DocType: C-Form,C-Form No,C-Form ไม่มี
 DocType: BOM,Exploded_items,Exploded_items
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +95,Researcher,นักวิจัย
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Researcher,นักวิจัย
 apps/frappe/frappe/custom/doctype/customize_form/customize_form.js +88,Update,อัพเดท
 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 +23,Name or Email is mandatory,ชื่อหรืออีเมล์มีผลบังคับใช้
@@ -2374,11 +2294,10 @@
 DocType: Employee,Exit,ทางออก
 apps/erpnext/erpnext/accounts/doctype/account/account.py +134,Root Type is mandatory,ประเภท ราก มีผลบังคับใช้
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +295,Serial No {0} created,อนุกรม ไม่มี {0} สร้าง
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +125,Vibratory finishing,การตกแต่งแบบสั่นสะเทือน
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes",เพื่อความสะดวกของลูกค้า รหัสเหล่านี้จะถูกใช้ในการพิมพ์เอกสาร เช่น ใบแจ้งหนี้ และใบนำส่งสินค้า
 DocType: Employee,You can enter any date manually,คุณสามารถป้อนวันที่ใด ๆ ด้วยตนเอง
 DocType: Sales Invoice,Advertisement,การโฆษณา
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +165,Probationary Period,ระยะเวลาการฝึกงาน
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Probationary Period,ระยะเวลาการฝึกงาน
 DocType: Customer Group,Only leaf nodes are allowed in transaction,โหนดใบเท่านั้นที่จะเข้าในการทำธุรกรรม
 DocType: Expense Claim,Expense Approver,ค่าใช้จ่ายที่อนุมัติ
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,รายการรับซื้อจำหน่าย
@@ -2386,19 +2305,16 @@
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +17,To Datetime,เพื่อ Datetime
 DocType: SMS Settings,SMS Gateway URL,URL เกตเวย์ SMS
 apps/erpnext/erpnext/config/crm.py +53,Logs for maintaining sms delivery status,บันทึกการรักษาสถานะการจัดส่งทาง SMS
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +137,Grinding,ที่บด
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +34,Shrink wrapping,หดห่อ
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +36,Pending Activities,ที่รอดำเนินการกิจกรรม
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,Confirmed,ได้รับการยืนยัน
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier > Supplier Type,ผู้ผลิต> ประเภทผู้ผลิต
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +127,Please enter relieving date.,กรุณากรอก วันที่ บรรเทา
 apps/erpnext/erpnext/controllers/trends.py +137,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/hr/doctype/leave_application/leave_application.py +51,Only Leave Applications with status 'Approved' can be submitted,เพียง ปล่อยให้ การใช้งาน ที่มีสถานะ 'อนุมัติ ' สามารถ ส่ง
 apps/erpnext/erpnext/utilities/doctype/address/address.py +21,Address Title is mandatory.,ที่อยู่ ชื่อเรื่อง มีผลบังคับใช้
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,ป้อนชื่อของแคมเปญหากแหล่งที่มาของการรณรงค์สอบถามรายละเอียดเพิ่มเติม
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +38,Newspaper Publishers,หนังสือพิมพ์ สำนักพิมพ์
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +38,Newspaper Publishers,หนังสือพิมพ์ สำนักพิมพ์
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,เลือกปีงบประมาณ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +88,Smelting,ถลุง
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,สั่งซื้อใหม่ระดับ
 DocType: Attendance,Attendance Date,วันที่เข้าร่วม
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,การล่มสลายเงินเดือนขึ้นอยู่กับกำไรและหัก
@@ -2413,16 +2329,15 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +414,[Error],[ข้อผิดพลาด]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,ในคำพูดของจะสามารถมองเห็นได้เมื่อคุณบันทึกการสั่งซื้อการขาย
 ,Employee Birthday,วันเกิดของพนักงาน
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +55,Venture Capital,บริษัท ร่วมทุน
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,บริษัท ร่วมทุน
 DocType: UOM,Must be Whole Number,ต้องเป็นจำนวนเต็ม
 DocType: Leave Control Panel,New Leaves Allocated (In Days),ใบใหม่ที่จัดสรร (ในวัน)
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +51,Serial No {0} does not exist,อนุกรม ไม่มี {0} ไม่อยู่
 DocType: Pricing Rule,Discount Percentage,ร้อยละ ส่วนลด
 DocType: Payment Reconciliation Invoice,Invoice Number,จำนวนใบแจ้งหนี้
-apps/erpnext/erpnext/hooks.py +70,Orders,คำสั่งซื้อ
+apps/erpnext/erpnext/hooks.py +54,Orders,คำสั่งซื้อ
 DocType: Leave Control Panel,Employee Type,ประเภทพนักงาน
 DocType: Employee Leave Approver,Leave Approver,ฝากอนุมัติ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +70,Swaging,Swaging
 DocType: Manufacturing Settings,Material Transferred for Manufacture,วัสดุสำหรับการผลิตโอน
 DocType: Expense Claim,"A user with ""Expense Approver"" role","ผู้ใช้ที่มีบทบาท ""ค่าใช้จ่ายอนุมัติ"""
 ,Issued Items Against Production Order,รายการที่ออกมาต่อต้านการสั่งซื้อการผลิต
@@ -2434,7 +2349,6 @@
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +62,Cost Center with existing transactions can not be converted to group,ศูนย์ต้นทุน กับการทำธุรกรรม ที่มีอยู่ ไม่สามารถ แปลงเป็น กลุ่ม
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Depreciation,ค่าเสื่อมราคา
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),ผู้ผลิต (s)
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +29,Invalid period,ระยะเวลาที่ไม่ถูกต้อง
 DocType: Customer,Credit Limit,วงเงินสินเชื่อ
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,เลือกประเภทของการทำธุรกรรม
 DocType: GL Entry,Voucher No,บัตรกำนัลไม่มี
@@ -2444,9 +2358,9 @@
 DocType: Customer,Address and Contact,ที่อยู่และการติดต่อ
 DocType: Customer,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}
 apps/erpnext/erpnext/accounts/party.py +284,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),หมายเหตุ: เนื่องจาก / วันอ้างอิงเกินวันที่ได้รับอนุญาตให้เครดิตของลูกค้าโดย {0} วัน (s)
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +621,Maint. Schedule,Maint ตารางการแข่งขัน
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +108,Abrasive jet machining,เครื่องจักรกลเจ็ทที่มีฤทธิ์กัดกร่อน
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +632,Maint. Schedule,Maint ตารางการแข่งขัน
 DocType: Stock Settings,Freeze Stock Entries,ตรึงคอมเมนต์สินค้า
 DocType: Website Settings,Website Settings,การตั้งค่าเว็บไซต์
 DocType: Item,Reorder level based on Warehouse,ระดับสั่งซื้อใหม่บนพื้นฐานของคลังสินค้า
@@ -2463,7 +2377,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +75,Show Stock Entries,แสดงรายการสต็อก
 ,Is Primary Address,เป็นที่อยู่หลัก
 DocType: Production Order,Work-in-Progress Warehouse,คลังสินค้าทำงานในความคืบหน้า
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +308,Reference #{0} dated {1},อ้างอิง # {0} วันที่ {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Reference #{0} dated {1},อ้างอิง # {0} วันที่ {1}
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +13,Manage Addresses,การจัดการที่อยู่
 DocType: Pricing Rule,Item Code,รหัสสินค้า
 DocType: Production Planning Tool,Create Production Orders,สร้างคำสั่งซื้อการผลิต
@@ -2472,7 +2386,7 @@
 DocType: Lead,Market Segment,ส่วนตลาด
 DocType: Communication,Phone,โทรศัพท์
 DocType: Employee Internal Work History,Employee Internal Work History,ประวัติการทำงานของพนักงานภายใน
-apps/erpnext/erpnext/public/js/account_tree_grid.js +50,Closing (Dr),ปิด (Dr)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +221,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.,แม่แบบ ภาษี สำหรับการขาย ในการทำธุรกรรม
@@ -2488,8 +2402,8 @@
 ,Billed Amount,จำนวนเงินที่ เรียกเก็บเงิน
 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 +129,Material Request {0} is cancelled or stopped,ขอ วัสดุ {0} จะถูกยกเลิก หรือ หยุด
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +641,Add a few sample records,เพิ่มบันทึกไม่กี่ตัวอย่าง
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +133,Material Request {0} is cancelled or stopped,ขอ วัสดุ {0} จะถูกยกเลิก หรือ หยุด
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Add a few sample records,เพิ่มบันทึกไม่กี่ตัวอย่าง
 apps/erpnext/erpnext/config/hr.py +210,Leave Management,ออกจากการบริหารจัดการ
 DocType: Event,Groups,กลุ่ม
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,โดย กลุ่ม บัญชี
@@ -2502,38 +2416,34 @@
 DocType: Features Setup,Sales Extras,พิเศษขาย
 apps/erpnext/erpnext/accounts/utils.py +344,{0} budget for Account {1} against Cost Center {2} will exceed by {3},{0} งบประมาณสำหรับ บัญชี {1} กับ ศูนย์ต้นทุน {2} จะเกิน โดย {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +236,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry",บัญชีที่แตกต่างจะต้องเป็นสินทรัพย์ / รับผิดบัญชีประเภทตั้งแต่นี้กระทบยอดสต็อกเป็นรายการเปิด
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +138,Purchase Order number required for Item {0},จำนวน การสั่งซื้อ สินค้า ที่จำเป็นสำหรับ {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Order number required for Item {0},จำนวน การสั่งซื้อ สินค้า ที่จำเป็นสำหรับ {0}
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date','จาก วันที่ ' ต้อง เป็นหลังจากที่ ' นัด '
 ,Stock Projected Qty,หุ้น ที่คาดการณ์ จำนวน
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +147,Customer {0} does not belong to project {1},ลูกค้า {0} ไม่ได้อยู่ใน โครงการ {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +150,Customer {0} does not belong to project {1},ลูกค้า {0} ไม่ได้อยู่ใน โครงการ {1}
 DocType: Sales Order,Customer's Purchase Order,การสั่งซื้อของลูกค้า
 DocType: Warranty Claim,From Company,จาก บริษัท
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,ค่าหรือ จำนวน
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Minute,นาที
+apps/erpnext/erpnext/public/js/setup_wizard.js +363,Minute,นาที
 DocType: Purchase Invoice,Purchase Taxes and Charges,ภาษีซื้อและค่าบริการ
 ,Qty to Receive,จำนวน การรับ
 DocType: Leave Block List,Leave Block List Allowed,ฝากรายการบล็อกอนุญาตให้นำ
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +61,Conversion factor cannot be in fractions,ปัจจัย การแปลง ไม่สามารถอยู่ใน เศษส่วน
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +358,You will use it to Login,คุณจะใช้มันเพื่อเข้าสู่ระบบ
+apps/erpnext/erpnext/public/js/setup_wizard.js +108,You will use it to Login,คุณจะใช้มันเพื่อเข้าสู่ระบบ
 DocType: Sales Partner,Retailer,พ่อค้าปลีก
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +99,Credit To account must be a Balance Sheet account,เครดิตไปยังบัญชีจะต้องเป็นบัญ​​ชีงบดุล
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,ทุก ประเภท ของผู้ผลิต
 apps/erpnext/erpnext/stock/doctype/item/item.py +37,Item Code is mandatory because Item is not automatically numbered,รหัสสินค้า ที่จำเป็น เพราะ สินค้า ไม่ เลขโดยอัตโนมัติ
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +99,Quotation {0} not of type {1},ไม่ได้ ชนิดของ ใบเสนอราคา {0} {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +93,Quotation {0} not of type {1},ไม่ได้ ชนิดของ ใบเสนอราคา {0} {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,รายการกำหนดการซ่อมบำรุง
 DocType: Sales Order,%  Delivered,% จัดส่งแล้ว
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,Bank Overdraft Account,บัญชี เงินเบิกเกินบัญชี ธนาคาร
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +15,Make Salary Slip,ให้ เงินเดือน สลิป
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +18,Browse BOM,ดู BOM
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +175,Secured Loans,เงินให้กู้ยืม ที่มีหลักประกัน
-apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +3,Awesome Products,ผลิตภัณฑ์ที่ดีเลิศ
+apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +3,Awesome Products,ผลิตภัณฑ์ที่ดีเลิศ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +189,Opening Balance Equity,เปิดทุนคงเหลือ
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +80,Cannot approve leave as you are not authorized to approve leaves on Block Dates,ไม่ สามารถอนุมัติ การลา ในขณะที่คุณ ไม่ได้รับอนุญาต ในการอนุมัติ ใบ ใน วัน ที่ถูกบล็อก
 DocType: Appraisal,Appraisal,การตีราคา
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +13,Lost-foam casting,Lost หล่อโฟม
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +47,Drawing,การวาดภาพ
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +22,Date is repeated,วันที่ซ้ำแล้วซ้ำอีก
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +148,Leave approver must be one of {0},ออกจาก ผู้อนุมัติ ต้องเป็นหนึ่งใน {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +162,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,เวลา
@@ -2547,7 +2457,7 @@
 DocType: Purchase Invoice Item,Net Amount (Company Currency),ปริมาณสุทธิ (บริษัท สกุลเงิน)
 DocType: BOM Operation,Hour Rate,อัตราชั่วโมง
 DocType: Stock Settings,Item Naming By,รายการการตั้งชื่อตาม
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +642,From Quotation,จาก ใบเสนอราคา
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +655,From Quotation,จาก ใบเสนอราคา
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},อีก รายการ ระยะเวลา ปิด {0} ได้รับการทำ หลังจาก {1}
 DocType: Production Order,Material Transferred for Manufacturing,วัสดุสำหรับการผลิตโอน
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +29,Account {0} does not exists,บัญชี {0} ไม่อยู่
@@ -2561,21 +2471,19 @@
 DocType: Purchase Invoice Item,PR Detail,รายละเอียดประชาสัมพันธ์
 DocType: Sales Order,Fully Billed,ในจำนวนอย่างเต็มที่
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +20,Cash In Hand,เงินสด ใน มือ
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +72,Delivery warehouse required for stock item {0},คลังสินค้าจัดส่งสินค้าที่จำเป็นสำหรับรายการหุ้น {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +119,Delivery warehouse required for stock item {0},คลังสินค้าจัดส่งสินค้าที่จำเป็นสำหรับรายการหุ้น {0}
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),น้ำหนักรวมของแพคเกจ น้ำหนักสุทธิปกติ + น้ำหนักวัสดุบรรจุภัณฑ์ (สำหรับพิมพ์)
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,ผู้ใช้ที่มี บทบาทนี้ ได้รับอนุญาตให้ตั้ง บัญชีแช่แข็งและ สร้าง / แก้ไข รายการบัญชี ในบัญชีแช่แข็ง
 DocType: Serial No,Is Cancelled,เป็นยกเลิก
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +281,My Shipments,การจัดส่งของฉัน
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +286,My Shipments,การจัดส่งของฉัน
 DocType: Journal Entry,Bill Date,วันที่บิล
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +43,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:",แม้ว่าจะมีกฎการกำหนดราคาหลายกับความสำคัญสูงสุดแล้วจัดลำดับความสำคัญดังต่อไปนี้ภายในจะใช้:
 DocType: Supplier,Supplier Details,รายละเอียดผู้จัดจำหน่าย
 DocType: Communication,Recipients,ผู้รับ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +146,Screwing,การกวดขัน
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +96,Knurling,knurling
 DocType: Expense Claim,Approval Status,สถานะการอนุมัติ
 DocType: Hub Settings,Publish Items to Hub,เผยแพร่รายการไปยัง Hub
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +44,From value must be less than to value in row {0},จากค่า ต้องน้อยกว่า ค่า ในแถว {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +133,Wire Transfer,โอนเงิน
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +133,Wire Transfer,โอนเงิน
 apps/erpnext/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py +25,Please select Bank Account,เลือกบัญชีธนาคาร
 DocType: Newsletter,Create and Send Newsletters,สร้างและส่งจดหมายข่าว
 apps/frappe/frappe/public/js/frappe/views/reports/grid_report.js +305,From Date must be before To Date,นับ แต่วันที่ต้องอยู่ก่อนวันที่ต้องการ
@@ -2583,14 +2491,14 @@
 DocType: Company,Default Income Account,บัญชีรายได้เริ่มต้น
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,กลุ่ม ลูกค้า / ลูกค้า
 DocType: Item Group,Check this if you want to show in website,ตรวจสอบนี้ถ้าคุณต้องการที่จะแสดงในเว็บไซต์
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +190,Welcome to ERPNext,ขอต้อนรับสู่ ERPNext
+,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/page/setup_wizard/install_fixtures.py +37,Calls,โทร
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Calls,โทร
 DocType: Project,Total Costing Amount (via Time Logs),จํานวนต้นทุนรวม (ผ่านบันทึกเวลา)
 DocType: Purchase Order Item Supplied,Stock UOM,UOM สต็อก
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Purchase Order {0} is not submitted,สั่งซื้อ {0} ไม่ได้ ส่ง
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +194,Purchase Order {0} is not submitted,สั่งซื้อ {0} ไม่ได้ ส่ง
 ,Projected,ที่คาดการณ์ไว้
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},อนุกรม ไม่มี {0} ไม่ได้อยู่ใน โกดัง {1}
 apps/erpnext/erpnext/controllers/status_updater.py +136,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,หมายเหตุ : ระบบ จะไม่ตรวจสอบ มากกว่าการ ส่งมอบและ มากกว่าการ จอง รายการ {0} เป็น ปริมาณ หรือจำนวน เป็น 0
@@ -2598,7 +2506,6 @@
 DocType: Issue,Opening Date,เปิดวันที่
 DocType: Journal Entry,Remark,คำพูด
 DocType: Purchase Receipt Item,Rate and Amount,อัตราและปริมาณ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +95,Boring,น่าเบื่อ
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +667,From Sales Order,จากการสั่งซื้อการขาย
 DocType: Blog Category,Parent Website Route,ผู้ปกครอง เว็บไซต์ เส้นทาง
 DocType: Sales Order,Not Billed,ไม่ได้เรียกเก็บ
@@ -2612,19 +2519,17 @@
 apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount Amount,จำนวน ส่วนลด
 DocType: Purchase Invoice,Return Against Purchase Invoice,กลับไปกับการซื้อใบแจ้งหนี้
 DocType: Item,Warranty Period (in days),ระยะเวลารับประกัน (วัน)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +550,e.g. VAT,เช่นผู้ ภาษีมูลค่าเพิ่ม
+apps/erpnext/erpnext/public/js/setup_wizard.js +292,e.g. VAT,เช่นผู้ ภาษีมูลค่าเพิ่ม
 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,ชุดใบเสนอราคา
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +52,"An item exists with same name ({0}), please change the item group name or rename the item",รายการที่มีอยู่ ที่มีชื่อเดียวกัน ({0}) กรุณาเปลี่ยนชื่อกลุ่ม รายการ หรือเปลี่ยนชื่อ รายการ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +82,Hot metal gas forming,ก๊าซร้อนขึ้นรูปโลหะ
 DocType: Sales Order Item,Sales Order Date,วันที่สั่งซื้อขาย
 DocType: Sales Invoice Item,Delivered Qty,จำนวนส่ง
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +63,Warehouse {0}: Company is mandatory,คลังสินค้า {0}: บริษัท มีผลบังคับใช้
 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.",ไปที่กลุ่มที่เหมาะสม (โดยปกติแหล่งเงินทุน&gt; หนี้สินหมุนเวียน&gt; ภาษีและหน้าที่และสร้างบัญชีใหม่ (โดยการคลิกที่เพิ่มเด็ก) ประเภท &quot;ภาษี&quot; และจะพูดถึงอัตราภาษี
 ,Payment Period Based On Invoice Date,ระยะเวลา ในการชำระเงิน ตาม ใบแจ้งหนี้ ใน วันที่
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +50,Missing Currency Exchange Rates for {0},สกุลเงินที่หายไปอัตราแลกเปลี่ยนสำหรับ {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +135,Laser cutting,ตัดเลเซอร์
 DocType: Event,Monday,วันจันทร์
 DocType: Journal Entry,Stock Entry,รายการสินค้า
 DocType: Account,Payable,ที่ต้องชำระ
@@ -2657,7 +2562,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +111,Date Of Retirement must be greater than Date of Joining,วันที่ ของ การเกษียณอายุ ต้องมากกว่า วันที่ เข้าร่วม
 DocType: Sales Invoice,Against Income Account,กับบัญชีรายได้
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +69,{0}% Delivered,{0}% ส่ง
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +78,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,รายการ {0}: จำนวนสั่ง {1} ไม่สามารถจะน้อยกว่าจำนวนสั่งซื้อขั้นต่ำ {2} (ที่กำหนดไว้ในรายการ)
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,รายการ {0}: จำนวนสั่ง {1} ไม่สามารถจะน้อยกว่าจำนวนสั่งซื้อขั้นต่ำ {2} (ที่กำหนดไว้ในรายการ)
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,การกระจายรายเดือนร้อยละ
 DocType: Territory,Territory Targets,เป้าหมายดินแดน
 DocType: Delivery Note,Transporter Info,ข้อมูลการขนย้าย
@@ -2666,7 +2571,6 @@
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,ชื่อ แม่แบบ สำหรับการพิมพ์ เช่นผู้ Proforma Invoice
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +140,Valuation type charges can not marked as Inclusive,ค่าใช้จ่ายประเภทการประเมินไม่สามารถทำเครื่องหมายเป็น Inclusive
 DocType: POS Profile,Update Stock,อัพเดทสต็อก
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +128,Superfinishing,superfinishing
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,UOM ที่แตกต่างกัน สำหรับรายการที่ จะ นำไปสู่การ ที่ไม่ถูกต้อง ( รวม ) ค่า น้ำหนักสุทธิ ให้แน่ใจว่า น้ำหนักสุทธิ ของแต่ละรายการ ที่อยู่ในUOM เดียวกัน
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,อัตรา BOM
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +85,Please pull items from Delivery Note,กรุณา ดึง รายการจาก การจัดส่งสินค้า หมายเหตุ
@@ -2681,7 +2585,6 @@
 ,Purchase Analytics,Analytics ซื้อ
 DocType: Sales Invoice Item,Delivery Note Item,รายการจัดส่งสินค้าหมายเหตุ
 DocType: Expense Claim,Task,งาน
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +57,Shaving,การโกน
 DocType: Purchase Taxes and Charges,Reference Row #,อ้างอิง แถว #
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},หมายเลข Batch มีผลบังคับใช้สำหรับสินค้า {0}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js +14,This is a root sales person and cannot be edited.,นี้เป็น คนขาย ราก และ ไม่สามารถแก้ไขได้
@@ -2693,13 +2596,11 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +74,Purpose must be one of {0},จุดประสงค์ ต้องเป็นหนึ่งใน {0}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +108,Fill the form and save it,กรอกแบบฟอร์ม และบันทึกไว้
 DocType: Production Planning Tool,Download a report containing all raw materials with their latest inventory status,ดาวน์โหลดรายงานที่มีวัตถุดิบทั้งหมดที่มีสถานะสินค้าคงคลังของพวกเขาล่าสุด
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +94,Facing,หันหน้าไปทาง
 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,ส่ง SMS
 DocType: Company,Default Letter Head,หัวหน้าเริ่มต้นจดหมาย
 DocType: Time Log,Billable,ที่เรียกเก็บเงิน
-DocType: Authorization Rule,This will be used for setting rule in HR module,นี้จะถูกใช้สำหรับกฎการตั้งค่าในโมดูลทรัพยากรบุคคล
 DocType: Account,Rate at which this tax is applied,อัตราที่ภาษีนี้จะถูกใช้
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reorder Qty,สั่งซื้อใหม่จำนวน
 DocType: Company,Stock Adjustment Account,การปรับบัญชีสินค้า
@@ -2726,16 +2627,15 @@
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,ร้อยละ จัดสรร ควรจะเท่ากับ 100%
 DocType: Serial No,Out of AMC,ออกของ AMC
 DocType: Purchase Order Item,Material Request Detail No,รายละเอียดขอวัสดุไม่มี
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +97,Hard turning,เปลี่ยนยาก
 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 +79,Company (not Customer or Supplier) master.,บริษัท (ไม่ใช่ ลูกค้า หรือ ซัพพลายเออร์ ) เจ้านาย
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +106,Please enter 'Expected Delivery Date',"โปรดป้อน "" วันที่ส่ง ที่คาดหวัง '"
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +187,Delivery Notes {0} must be cancelled before cancelling this Sales Order,ใบนำส่งสินค้า {0} ต้องถูกยกเลิก ก่อนยกเลิกคำสั่งขายนี้
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +100,Please enter 'Expected Delivery Date',"โปรดป้อน "" วันที่ส่ง ที่คาดหวัง '"
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +182,Delivery Notes {0} must be cancelled before cancelling this Sales Order,ใบนำส่งสินค้า {0} ต้องถูกยกเลิก ก่อนยกเลิกคำสั่งขายนี้
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +373,Paid amount + Write Off Amount can not be greater than Grand Total,ชำระ เงิน + เขียน ปิด จำนวน ไม่สามารถ จะสูงกว่า แกรนด์ รวม
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} ไม่ได้เป็น จำนวน ชุดที่ถูกต้องสำหรับ รายการ {1}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,Note: There is not enough leave balance for Leave Type {0},หมายเหตุ : มี ไม่ สมดุล เพียงพอสำหรับ การลา ออกจาก ประเภท {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +124,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,ประเภทโอกาส
@@ -2747,7 +2647,7 @@
 DocType: Hub Settings,Publish Availability,เผยแพร่ความพร้อม
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +105,Date of Birth cannot be greater than today.,วันเกิดไม่สามารถจะสูงกว่าวันนี้
 ,Stock Ageing,เอจจิ้งสต็อก
-apps/erpnext/erpnext/controllers/accounts_controller.py +200,{0} '{1}' is disabled,{0} ‘{1}' ถูกปิดใช้งาน
+apps/erpnext/erpnext/controllers/accounts_controller.py +201,{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.,ส่งอีเมลโดยอัตโนมัติไปยังรายชื่อในการทำธุรกรรมการส่ง
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +232,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
@@ -2757,44 +2657,38 @@
 DocType: Purchase Order,Customer Contact Email,อีเมล์ที่ใช้ติดต่อลูกค้า
 DocType: Event,Sunday,วันอาทิตย์
 DocType: Sales Team,Contribution (%),สมทบ (%)
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +455,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,หมายเหตุ : รายการ การชำระเงินจะ ไม่ได้รับการ สร้างขึ้นตั้งแต่ ' เงินสด หรือ บัญชี ธนาคาร ไม่ได้ระบุ
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +171,Responsibilities,ความรับผิดชอบ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +457,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 +11,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,กรุณากรอก atleast 1 ใบแจ้งหนี้ ในตาราง
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +511,Add Users,เพิ่มผู้ใช้
+apps/erpnext/erpnext/public/js/setup_wizard.js +255,Add Users,เพิ่มผู้ใช้
 DocType: Pricing Rule,Item Group,กลุ่มสินค้า
 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),ภาษีและค่าใช้จ่ายเพิ่ม (สกุลเงิน บริษัท )
-apps/erpnext/erpnext/stock/doctype/item/item.py +340,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,รายการ แถว ภาษี {0} ต้องมีบัญชี ภาษี ประเภท หรือ รายได้ หรือ ค่าใช้จ่าย หรือ คิดค่าบริการได้
+apps/erpnext/erpnext/stock/doctype/item/item.py +344,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,รายการ แถว ภาษี {0} ต้องมีบัญชี ภาษี ประเภท หรือ รายได้ หรือ ค่าใช้จ่าย หรือ คิดค่าบริการได้
 DocType: Sales Order,Partly Billed,จำนวนมากที่สุดเป็นส่วนใหญ่
 DocType: Item,Default BOM,BOM เริ่มต้น
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +79,Decambering,Decambering
 apps/erpnext/erpnext/setup/doctype/company/company.js +22,Please re-type company name to confirm,กรุณาชื่อ บริษัท อีกครั้งเพื่อยืนยันชนิด
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,รวมที่โดดเด่น Amt
 DocType: Time Log Batch,Total Hours,รวมชั่วโมง
 DocType: Journal Entry,Printing Settings,การตั้งค่าการพิมพ์
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +268,Total Debit must be equal to Total Credit. The difference is {0},เดบิต รวม ต้องเท่ากับ เครดิต รวม
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +11,Automotive,ยานยนต์
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +37,Item is required,รายการที่ จะต้อง
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +25,Metal injection molding,การฉีดขึ้นรูปโลหะ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +258,Total Debit must be equal to Total Credit. The difference is {0},เดบิต รวม ต้องเท่ากับ เครดิต รวม
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,ยานยนต์
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +684,From Delivery Note,จากหมายเหตุการจัดส่งสินค้า
 DocType: Time Log,From Time,ตั้งแต่เวลา
 DocType: Notification Control,Custom Message,ข้อความที่กำหนดเอง
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +33,Investment Banking,วาณิชธนกิจ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +261,"Select your Country, Time Zone and Currency",เลือกประเทศของคุณโซนเวลาและสกุลเงิน
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,วาณิชธนกิจ
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +316,"Select your Country, Time Zone and Currency",เลือกประเทศของคุณโซนเวลาและสกุลเงิน
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +369,Cash or Bank Account is mandatory for making payment entry,เงินสดหรือ บัญชีธนาคาร มีผลบังคับใช้ สำหรับการทำ รายการ ชำระเงิน
 DocType: Purchase Invoice,Price List Exchange Rate,ราคาอัตราแลกเปลี่ยนรายชื่อ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +91,Pickling,กัดกรด
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +18,Sand casting,ทรายหล่อ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +117,Electroplating,ไฟฟ้า
 DocType: Purchase Invoice Item,Rate,อัตรา
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +62,Intern,แพทย์ฝึกหัด
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Intern,แพทย์ฝึกหัด
 DocType: Newsletter,A Lead with this email id should exist,ควรมีช่องทางที่ใช้อีเมลนี้อยู่
 DocType: Stock Entry,From BOM,จาก BOM
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +34,Basic,ขั้นพื้นฐาน
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +34,Basic,ขั้นพื้นฐาน
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,ก่อนที่จะทำธุรกรรมหุ้น {0} ถูกแช่แข็ง
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +217,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,วันที่ ควรจะเป็น เช่นเดียวกับการ จาก วันที่ ลา ครึ่งวัน
@@ -2802,11 +2696,11 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +96,Reference No is mandatory if you entered Reference Date,ไม่มี การอ้างอิง มีผลบังคับใช้ ถ้า คุณป้อน วันที่ อ้างอิง
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +108,Date of Joining must be greater than Date of Birth,วันที่ เข้าร่วม จะต้องมากกว่า วันเกิด
 DocType: Salary Structure,Salary Structure,โครงสร้างเงินเดือน
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +242,"Multiple Price Rule exists with same criteria, please resolve \
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +246,"Multiple Price Rule exists with same criteria, please resolve \
 			conflict by assigning priority. Price Rules: {0}","กฎข้อที่ราคาหลายอยู่กับเกณฑ์เดียวกันกรุณาแก้ปัญหาความขัดแย้ง \
  โดยการกำหนดลำดับความสำคัญ ราคากฎ: {0}"
 DocType: Account,Bank,ธนาคาร
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +9,Airline,สายการบิน
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,สายการบิน
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +493,Issue Material,ฉบับวัสดุ
 DocType: Material Request Item,For Warehouse,สำหรับโกดัง
 DocType: Employee,Offer Date,ข้อเสนอ วันที่
@@ -2816,29 +2710,24 @@
 DocType: Item,Is Fixed Asset Item,เป็น รายการ สินทรัพย์ถาวร
 DocType: Stock Entry,Including items for sub assemblies,รวมทั้งรายการสำหรับส่วนประกอบย่อย
 DocType: Features Setup,"If you have long print formats, this feature can be used to split the page to be printed on multiple pages with all headers and footers on each page",หากคุณมีความยาวพิมพ์รูปแบบคุณลักษณะนี้สามารถใช้ในการแยกหน้าเว็บที่จะพิมพ์บนหน้าเว็บหลายหน้ากับส่วนหัวและท้ายกระดาษทั้งหมดในแต่ละหน้า
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +131,Hobbing,Hobbing
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +98,All Territories,ดินแดน ทั้งหมด
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +98,All Territories,ดินแดน ทั้งหมด
 DocType: Purchase Invoice,Items,รายการ
 DocType: Fiscal Year,Year Name,ปีชื่อ
 DocType: Process Payroll,Process Payroll,เงินเดือนกระบวนการ
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +59,There are more holidays than working days this month.,มี วันหยุด มากขึ้นกว่าที่ เป็น วันทำการ ในเดือนนี้
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +68,There are more holidays than working days this month.,มี วันหยุด มากขึ้นกว่าที่ เป็น วันทำการ ในเดือนนี้
 DocType: Product Bundle Item,Product Bundle Item,Bundle รายการสินค้า
 DocType: Sales Partner,Sales Partner Name,ชื่อพันธมิตรขาย
 DocType: Purchase Invoice Item,Image View,ดูภาพ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +113,Finishing & industrial finishing,การตกแต่งและการตกแต่งอุตสาหกรรม
 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/page/setup_wizard/fixtures/industry_type.py +46,Securities & Commodity Exchanges,หลักทรัพย์และ การแลกเปลี่ยน สินค้าโภคภัณฑ์
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,หลักทรัพย์และ การแลกเปลี่ยน สินค้าโภคภัณฑ์
 DocType: Shipping Rule,Calculate Based On,การคำนวณพื้นฐานตาม
 DocType: Delivery Note Item,From Warehouse,จากคลังสินค้า
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +98,Drilling,เจาะ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +28,Blow molding,เป่า
 DocType: Purchase Taxes and Charges,Valuation and Total,การประเมินและรวม
 DocType: Tax Rule,Shipping City,การจัดส่งสินค้าเมือง
 apps/erpnext/erpnext/stock/doctype/item/item.js +43,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,รายการนี​​้เป็นตัวแปรของ {0} (Template) คุณสมบัติจะถูกคัดลอกมาจากแม่แบบเว้นแต่ 'ไม่คัดลอก' ถูกตั้งค่า
 DocType: Account,Purchase User,ผู้ซื้อ
 DocType: Notification Control,Customize the Notification,กำหนดประกาศ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +87,Hammering,การตอก
 DocType: Web Page,Slideshow,สไลด์โชว์
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +24,Default Address Template cannot be deleted,แม่แบบเริ่มต้นที่อยู่ไม่สามารถลบได้
 DocType: Sales Invoice,Shipping Rule,กฎการจัดส่งสินค้า
@@ -2847,9 +2736,8 @@
 DocType: Workflow State,Search,ค้นหา
 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/setup/page/setup_wizard/fixtures/operations.py +142,Brazing,ประสาน
 DocType: C-Form,Amended From,แก้ไขเพิ่มเติมจาก
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Raw Material,วัตถุดิบ
+apps/erpnext/erpnext/public/js/setup_wizard.js +359,Raw Material,วัตถุดิบ
 DocType: Leave Application,Follow via Email,ผ่านทางอีเมล์ตาม
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,จำนวน ภาษี หลังจากที่ จำนวน ส่วนลด
 apps/erpnext/erpnext/accounts/doctype/account/account.py +174,Child account exists for this account. You can not delete this account.,บัญชีของเด็ก ที่มีอยู่ สำหรับบัญชีนี้ คุณไม่สามารถลบ บัญชีนี้
@@ -2863,10 +2751,10 @@
 ,Produced,ผลิต
 DocType: Item,Item Code for Suppliers,รหัสสินค้าสำหรับซัพพลายเออร์
 DocType: Issue,Raised By (Email),โดยยก (อีเมล์)
-apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +72,General,ทั่วไป
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +495,Attach Letterhead,แนบ จดหมาย
+apps/erpnext/erpnext/setup/setup_wizard/default_website.py +72,General,ทั่วไป
+apps/erpnext/erpnext/public/js/setup_wizard.js +241,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/setup/page/setup_wizard/setup_wizard.js +542,"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/public/js/setup_wizard.js +284,"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},อนุกรม Nos จำเป็นสำหรับ รายการ เนื่อง {0}
 DocType: Journal Entry,Bank Entry,ธนาคารเข้า
 DocType: Authorization Rule,Applicable To (Designation),ที่ใช้บังคับกับ (จุด)
@@ -2875,33 +2763,32 @@
 apps/erpnext/erpnext/config/accounts.py +143,Enable / disable currencies.,เปิด / ปิดการใช้งาน สกุลเงิน
 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)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +26,Entertainment & Leisure,บันเทิงและ การพักผ่อน
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,บันเทิงและ การพักผ่อน
 DocType: Purchase Order,The date on which recurring order will be stop,วันที่เกิดขึ้นเป็นประจำเพื่อที่จะหยุด
 DocType: Quality Inspection,Item Serial No,รายการ Serial No.
 apps/erpnext/erpnext/controllers/status_updater.py +142,{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 +57,Total Present,ปัจจุบันทั้งหมด
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Hour,ชั่วโมง
+apps/erpnext/erpnext/public/js/setup_wizard.js +363,Hour,ชั่วโมง
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +138,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation","เนื่องรายการ {0} ไม่สามารถปรับปรุง \
  ใช้การกระทบยอดสต็อก"
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +488,Transfer Material to Supplier,โอนวัสดุที่จะผลิต
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +513,Transfer Material to Supplier,โอนวัสดุที่จะผลิต
 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/crm/doctype/opportunity/opportunity.js +82,Create Quotation,สร้าง ใบเสนอราคา
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +306,All these items have already been invoiced,รายการทั้งหมด เหล่านี้ได้รับ ใบแจ้งหนี้ แล้ว
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,You are not authorized to approve leaves on Block Dates,คุณไม่ได้รับอนุญาตในการอนุมัติใบในวันที่ถูกบล็อก
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +311,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,BOM ใหม่หลังจากเปลี่ยน
 DocType: Features Setup,Point of Sale,จุดขาย
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +83,Curling,การดัดผม
 DocType: Account,Tax,ภาษี
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +28,Row {0}: {1} is not a valid {2},แถว {0}: {1} ไม่ถูกต้อง {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +89,Refining,การฟอก
+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,เครื่องมือการวางแผนการผลิต
 DocType: Quality Inspection,Report Date,รายงานวันที่
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +130,Routing,สายงานการผลิต
 DocType: C-Form,Invoices,ใบแจ้งหนี้
 DocType: Job Opening,Job Title,ตำแหน่งงาน
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +54,{0} already allocated for Employee {1} for period {2} - {3},{0} จัดสรรแล้วสำหรับพนักงาน {1} สำหรับรอบระยะเวลา {2} - {3}
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +80,{0} Recipients,{0} ผู้รับ
 DocType: Features Setup,Item Groups in Details,กลุ่มรายการในรายละเอียด
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +335,Quantity to Manufacture must be greater than 0.,ปริมาณการผลิตจะต้องมากกว่า 0
@@ -2919,14 +2806,13 @@
 DocType: DocType,Setup,การติดตั้ง
 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,สรุปในเดือนนี้และกิจกรรมที่อยู่ระหว่างดำเนินการ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +39,Cold rolling,รีดเย็น
 DocType: Customer Group,Customer Group Name,ชื่อกลุ่มลูกค้า
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +408,Please remove this Invoice {0} from C-Form {1},กรุณาลบนี้ใบแจ้งหนี้ {0} จาก C-แบบฟอร์ม {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +410,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,คุณลักษณะ
 DocType: Packing Slip,Get Items,รับสินค้า
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +186,Please enter Write Off Account,กรุณากรอกตัวอักษร เขียน ปิด บัญชี
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +187,Please enter Write Off Account,กรุณากรอกตัวอักษร เขียน ปิด บัญชี
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +71,Last Order Date,วันที่สั่งซื้อล่าสุด
 DocType: DocField,Image,ภาพ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +179,Make Excise Invoice,ให้ สรรพสามิต ใบแจ้งหนี้
@@ -2936,7 +2822,7 @@
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +146,Operation ID not set,รหัสการดำเนินงานไม่ได้ตั้งค่า
 DocType: Production Order,Planned Start Date,เริ่มต้นการวางแผนวันที่สมัคร
 DocType: Serial No,Creation Document Type,ประเภท การสร้าง เอกสาร
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +620,Maint. Visit,Maint เยี่ยมชม
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +631,Maint. Visit,Maint เยี่ยมชม
 DocType: Leave Type,Is Encash,เป็นได้เป็นเงินสด
 DocType: Purchase Invoice,Mobile No,มือถือไม่มี
 DocType: Payment Tool,Make Journal Entry,ทำให้อนุทิน
@@ -2944,35 +2830,31 @@
 apps/erpnext/erpnext/controllers/trends.py +257,Project-wise data is not available for Quotation,ข้อมูล โครงการ ฉลาด ไม่สามารถใช้ได้กับ ใบเสนอราคา
 DocType: Project,Expected End Date,คาดว่าวันที่สิ้นสุด
 DocType: Appraisal Template,Appraisal Template Title,หัวข้อแม่แบบประเมิน
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +440,Commercial,เชิงพาณิชย์
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +378,Commercial,เชิงพาณิชย์
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +23,Parent Item {0} must not be a Stock Item,ผู้ปกครองรายการ {0} ต้องไม่เป็นรายการสต็อก
 DocType: Cost Center,Distribution Id,รหัสกระจาย
-apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +14,Awesome Services,บริการ ที่น่ากลัว
+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,ที่อยู่ผู้ผลิต
 DocType: Contact Us Settings,Address Line 2,ที่อยู่บรรทัดที่ 2
 DocType: ToDo,Reference,การอ้างอิง
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +59,Perforating,Perforating
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,ออก จำนวน
 apps/erpnext/erpnext/config/accounts.py +128,Rules to calculate shipping amount for a sale,กฎระเบียบในการคำนวณปริมาณการขนส่งสินค้าสำหรับการขาย
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +29,Series is mandatory,ชุด มีผลบังคับใช้
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +28,Financial Services,บริการทางการเงิน
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,บริการทางการเงิน
 apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3},ราคาแอตทริบิวต์ {0} &#39;จะต้องอยู่ในช่วงของ {1} เป็น {2} ในการเพิ่มขึ้นของ {3}
 DocType: Tax Rule,Sales,ขาย
 DocType: Stock Entry Detail,Basic Amount,จํานวนเงินขั้นพื้นฐาน
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +173,Warehouse required for stock Item {0},คลังสินค้า ที่จำเป็นสำหรับ รายการ หุ้น {0}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +178,Warehouse required for stock Item {0},คลังสินค้า ที่จำเป็นสำหรับ รายการ หุ้น {0}
 DocType: Leave Allocation,Unused leaves,ใบที่ไม่ได้ใช้
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,Cr
 DocType: Customer,Default Receivable Accounts,บัญชีลูกหนี้เริ่มต้น
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +102,Sawing,เลื่อย
 DocType: Tax Rule,Billing State,รัฐเรียกเก็บเงิน
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +32,Laminating,ลามิเนต
 DocType: Item Reorder,Transfer,โอน
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +549,Fetch exploded BOM (including sub-assemblies),เรียก BOM ระเบิด (รวมถึงการ ประกอบย่อย )
 DocType: Authorization Rule,Applicable To (Employee),ที่ใช้บังคับกับ (พนักงาน)
 apps/erpnext/erpnext/controllers/accounts_controller.py +101,Due Date is mandatory,วันที่ครบกำหนดมีผลบังคับใช้
 apps/erpnext/erpnext/controllers/item_variant.py +51,Increment for Attribute {0} cannot be 0,เพิ่มสำหรับแอตทริบิวต์ {0} ไม่สามารถเป็น 0
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +143,Sintering,การเผา
 DocType: Journal Entry,Pay To / Recd From,จ่ายให้ Recd / จาก
 DocType: Naming Series,Setup Series,ชุดติดตั้ง
 DocType: Supplier,Contact HTML,HTML ติดต่อ
@@ -2985,7 +2867,6 @@
 DocType: Attendance,Absent,ขาด
 DocType: Product Bundle,Product Bundle,Bundle สินค้า
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +180,Row {0}: Invalid reference {1},แถว {0}: การอ้างอิงที่ไม่ถูกต้อง {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +165,Crushing,ย่อยยับ
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,ซื้อภาษีและค่าใช้จ่ายแม่แบบ
 DocType: Upload Attendance,Download Template,ดาวน์โหลดแม่แบบ
 DocType: GL Entry,Remarks,ข้อคิดเห็น
@@ -2993,14 +2874,12 @@
 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/setup/page/setup_wizard/fixtures/operations.py +9,Continuous casting,หล่ออย่างต่อเนื่อง
 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/setup/page/setup_wizard/fixtures/operations.py +80,Cold sizing,ขนาดเย็น
 DocType: Salary Slip,Earning & Deduction,รายได้และการหัก
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +76,Account {0} cannot be a Group,บัญชี {0} ไม่สามารถเป็น กลุ่ม
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +259,Region,ภูมิภาค
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +314,Region,ภูมิภาค
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +213,Optional. This setting will be used to filter in various transactions.,ไม่จำเป็น การตั้งค่านี้ จะถูก ใช้ในการกรอง ในการทำธุรกรรม ต่างๆ
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +104,Negative Valuation Rate is not allowed,อัตรา การประเมิน เชิงลบ ไม่ได้รับอนุญาต
 DocType: Holiday List,Weekly Off,สัปดาห์ปิด
@@ -3018,7 +2897,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,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,เข้าร่วมประชุม จาก วันที่และ การเข้าร่วมประชุม เพื่อให้ มีผลบังคับใช้ วันที่
-apps/erpnext/erpnext/controllers/buying_controller.py +131,Please enter 'Is Subcontracted' as Yes or No,กรุณากรอก ' คือ รับเหมา ' เป็น ใช่หรือไม่ใช่
+apps/erpnext/erpnext/controllers/buying_controller.py +122,Please enter 'Is Subcontracted' as Yes or No,กรุณากรอก ' คือ รับเหมา ' เป็น ใช่หรือไม่ใช่
 DocType: Sales Team,Contact No.,ติดต่อหมายเลข
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,'Profit and Loss' type account {0} not allowed in Opening Entry,' กำไรขาดทุน ประเภท บัญชี {0} ไม่ได้รับอนุญาต ใน การเปิด รายการ
 DocType: Workflow State,Time,เวลา
@@ -3027,14 +2906,13 @@
 DocType: Authorization Rule,Authorization Rule,กฎการอนุญาต
 DocType: Sales Invoice,Terms and Conditions Details,ข้อตกลงและเงื่อนไขรายละเอียด
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,ภาษีการขายและค่าใช้จ่ายแม่แบบ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +10,Apparel & Accessories,เครื่องแต่งกาย และอุปกรณ์เสริม
+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,จำนวนการสั่งซื้อ
 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 +121,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/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +47,Conversion Factor is required,ปัจจัย การแปลง ที่จำเป็น
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +37,Serial #,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,ค่า / รายละเอียด
@@ -3042,10 +2920,8 @@
 ,Customers Not Buying Since Long Time,ลูกค้าที่ไม่ได้สั่งซื้อเป็นเวลานาน
 DocType: Production Order,Expected Delivery Date,คาดว่าวันที่ส่ง
 apps/erpnext/erpnext/accounts/general_ledger.py +121,Debit and Credit not equal for {0} #{1}. Difference is {2}.,เดบิตและเครดิตไม่เท่ากันสำหรับ {0} # {1} ความแตกต่างคือ {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +48,Bulging,ปูด
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +11,Evaporative-pattern casting,หล่อระเหยรูปแบบ
 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 +195,Sales Invoice {0} must be cancelled before cancelling this Sales Order,ใบแจ้งหนี้ การขาย {0} ต้อง ถูกยกเลิก ก่อนที่จะ ยกเลิกการ สั่งซื้อการขาย นี้
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +190,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
@@ -3064,26 +2940,24 @@
 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 +241,Account: {0} with currency: {1} can not be selected,บัญชี: {0} กับสกุลเงิน: {1} ไม่สามารถเลือกได้
+apps/erpnext/erpnext/controllers/accounts_controller.py +242,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 +47,Account {0}: Parent account {1} does not belong to company: {2},บัญชี {0}: บัญชีผู้ปกครอง {1} ไม่ได้เป็นของ บริษัท : {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted all transactions related to this company!,ประสบความสำเร็จในการทำธุรกรรมที่ถูกลบทั้งหมดที่เกี่ยวข้องกับ บริษัท นี้!
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,ขณะที่ในวันที่
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +111,Honing,สร้างเสริม
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +58,Probation,การทดลอง
-apps/erpnext/erpnext/stock/doctype/item/item.py +264,Default Warehouse is mandatory for stock Item.,โกดัง เริ่มต้น มีผลบังคับใช้ กับ รายการ สต็อก
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Probation,การทดลอง
+apps/erpnext/erpnext/stock/doctype/item/item.py +268,Default Warehouse is mandatory for stock Item.,โกดัง เริ่มต้น มีผลบังคับใช้ กับ รายการ สต็อก
 DocType: Feed,Full Name,ชื่อเต็ม
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +148,Clinching,นัง
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +191,Payment of salary for the month {0} and year {1},การชำระเงิน ของเงินเดือน สำหรับเดือน{0} และปี {1}
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +173,Payment of salary for the month {0} and year {1},การชำระเงิน ของเงินเดือน สำหรับเดือน{0} และปี {1}
 DocType: Stock Settings,Auto insert Price List rate if missing,แทรกอัตโนมัติราคาอัตรารายชื่อถ้าขาดหายไป
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,รวมจำนวนเงินที่จ่าย
 ,Transferred Qty,โอน จำนวน
 apps/erpnext/erpnext/config/learn.py +11,Navigating,การนำ
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +137,Planning,การวางแผน
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +137,Planning,การวางแผน
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +9,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),จำนวนเงินที่เรียกเก็บเงินรวม (ผ่านบันทึกเวลา)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +629,We sell this Item,เราขาย สินค้า นี้
+apps/erpnext/erpnext/public/js/setup_wizard.js +365,We sell this Item,เราขาย สินค้า นี้
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +65,Supplier Id,Id ผู้ผลิต
 DocType: Journal Entry,Cash Entry,เงินสดเข้า
 DocType: Sales Partner,Contact Desc,Desc ติดต่อ
@@ -3092,18 +2966,16 @@
 DocType: Brand,Item Manager,ผู้จัดการฝ่ายรายการ
 DocType: Cost Center,Add rows to set annual budgets on Accounts.,เพิ่มแถวเพื่อตั้งงบประมาณประจำปีของบัญชี
 DocType: Buying Settings,Default Supplier Type,ซัพพลายเออร์ชนิดเริ่มต้น
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +160,Quarrying,การระเบิดหิน
 DocType: Production Order,Total Operating Cost,ค่าใช้จ่ายการดำเนินงานรวม
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +160,Note: Item {0} entered multiple times,หมายเหตุ : รายการ {0} เข้ามา หลายครั้ง
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +163,Note: Item {0} entered multiple times,หมายเหตุ : รายการ {0} เข้ามา หลายครั้ง
 apps/erpnext/erpnext/config/crm.py +27,All Contacts.,ติดต่อทั้งหมด
 DocType: Newsletter,Test Email Id,Email รหัสการทดสอบ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +394,Company Abbreviation,ชื่อย่อ บริษัท
+apps/erpnext/erpnext/public/js/setup_wizard.js +142,Company Abbreviation,ชื่อย่อ บริษัท
 DocType: Features Setup,If you follow Quality Inspection. Enables Item QA Required and QA No in Purchase Receipt,ถ้าคุณทำตาม การตรวจสอบคุณภาพ ช่วยให้ รายการ ที่จำเป็น และ QA QA ไม่มี ใน การซื้อ ใบเสร็จรับเงิน
 DocType: GL Entry,Party Type,ประเภท บุคคล
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +68,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,ไม่ authroized ตั้งแต่ {0} เกินขีด จำกัด
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +30,Rotational molding,การปั้นการหมุน
 apps/erpnext/erpnext/config/hr.py +115,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,ตั้งกฎภาษีสำหรับรถเข็น
@@ -3117,15 +2989,15 @@
 apps/erpnext/erpnext/config/selling.py +18,Quotes to Leads or Customers.,ใบเสนอราคาไปยังช่องทาง หรือลูกค้า
 DocType: Stock Settings,Role Allowed to edit frozen stock,บทบาทอนุญาตให้แก้ไขหุ้นแช่แข็ง
 ,Territory Target Variance Item Group-Wise,มณฑล เป้าหมาย แปรปรวน กลุ่มสินค้า - ฉลาด
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +101,All Customer Groups,ทุกกลุ่ม ลูกค้า
-apps/erpnext/erpnext/controllers/accounts_controller.py +474,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} มีผลบังคับใช้ อาจจะบันทึกแลกเปลี่ยนเงินตราไม่ได้สร้างขึ้นสำหรับ {1} เป็น {2}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +101,All Customer Groups,ทุกกลุ่ม ลูกค้า
+apps/erpnext/erpnext/controllers/accounts_controller.py +475,{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 +41,Account {0}: Parent account {1} does not exist,บัญชี {0}: บัญชีผู้ปกครอง {1} ไม่อยู่
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),อัตราราคาปกติ (สกุลเงิน บริษัท )
 DocType: Account,Temporary,ชั่วคราว
 DocType: Address,Preferred Billing Address,ที่อยู่การเรียกเก็บเงินที่ต้องการ
 DocType: Monthly Distribution Percentage,Percentage Allocation,การจัดสรรร้อยละ
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +86,Secretary,เลขา
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Secretary,เลขา
 DocType: Serial No,Distinct unit of an Item,หน่วยที่แตกต่างของสินค้า
 DocType: Pricing Rule,Buying,การซื้อ
 DocType: HR Settings,Employee Records to be created by,ระเบียนพนักงานที่จะถูกสร้างขึ้นโดย
@@ -3138,9 +3010,8 @@
 ,Item-wise Price List Rate,รายการ ฉลาด อัตรา ราคาตามรายการ
 DocType: Purchase Order Item,Supplier Quotation,ใบเสนอราคาของผู้ผลิต
 DocType: Quotation,In Words will be visible once you save the Quotation.,ในคำพูดของจะสามารถมองเห็นได้เมื่อคุณบันทึกใบเสนอราคา
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +68,Ironing,รีดผ้า
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is stopped,{0} {1} หยุดทำงาน
-apps/erpnext/erpnext/stock/doctype/item/item.py +352,Barcode {0} already used in Item {1},บาร์โค้ด {0} ใช้แล้ว ใน รายการ {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +356,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/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,เหตุการณ์ที่จะเกิดขึ้น
@@ -3149,27 +3020,25 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +27,Quick Entry,รายการด่วน
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0} เป็นข้อบังคับสำหรับการกลับมา
 DocType: Purchase Order,To Receive,ที่จะได้รับ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +33,Shrink fitting,หดตัวที่เหมาะสม
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +522,user@example.com,user@example.com
+apps/erpnext/erpnext/public/js/setup_wizard.js +266,user@example.com,user@example.com
 DocType: Email Digest,Income / Expense,รายได้ / ค่าใช้จ่าย
 DocType: Employee,Personal Email,อีเมลส่วนตัว
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +58,Total Variance,ความแปรปรวนทั้งหมด
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +62,Total Variance,ความแปรปรวนทั้งหมด
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.",ถ้าเปิดใช้งานระบบจะโพสต์รายการบัญชีสำหรับสินค้าคงคลังโดยอัตโนมัติ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +15,Brokerage,ค่านายหน้า
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +15,Brokerage,ค่านายหน้า
 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/accounts/page/financial_analytics/financial_analytics.js +42,Select Fiscal Year...,เลือกปีงบประมาณ ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +442,POS Profile required to make POS Entry,รายละเอียด POS ต้องทำให้ POS รายการ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +444,POS Profile required to make POS Entry,รายละเอียด POS ต้องทำให้ POS รายการ
 DocType: Hub Settings,Name Token,ชื่อ Token
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +106,Planing,วางแผน
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Selling,ขาย มาตรฐาน
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +120,Standard Selling,ขาย มาตรฐาน
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +137,Atleast one warehouse is mandatory,อย่างน้อยหนึ่งคลังสินค้ามีผลบังคับใช้
 DocType: Serial No,Out of Warranty,ออกจากการรับประกัน
 DocType: BOM Replace Tool,Replace,แทนที่
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +314,{0} against Sales Invoice {1},{0} กับการขายใบแจ้งหนี้ {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +316,{0} against Sales Invoice {1},{0} กับการขายใบแจ้งหนี้ {1}
 apps/erpnext/erpnext/stock/doctype/item/item.py +49,Please enter default Unit of Measure,กรุณาใส่ หน่วย เริ่มต้น ของการวัด
 DocType: Purchase Invoice Item,Project Name,ชื่อโครงการ
 DocType: Supplier,Mention if non-standard receivable account,ถ้าพูดถึงไม่ได้มาตรฐานบัญชีลูกหนี้
@@ -3185,9 +3054,8 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,Journal Entry {0} does not have account {1} or already matched against other voucher,อนุทิน {0} ไม่มีบัญชี {1} หรือการจับคู่แล้วกับบัตรกำนัลอื่น ๆ
 DocType: Item,Moving Average,ค่าเฉลี่ยเคลื่อนที่
 DocType: BOM Replace Tool,The BOM which will be replaced,BOM ซึ่งจะถูกแทนที่
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +43,New Stock UOM must be different from current stock UOM,มาใหม่พร้อมส่ง UOM ต้องแตกต่างจาก UOM ปัจจุบัน
 DocType: Account,Debit,หักบัญชี
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +34,Leaves must be allocated in multiples of 0.5,ใบ จะต้องมีการ จัดสรร หลายรายการ 0.5
+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/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,Amt ดีเด่น
@@ -3205,8 +3073,7 @@
 DocType: Employee,Internal Work History,ประวัติการทำงานภายใน
 DocType: DocField,Column Break,ตัวแบ่งคอลัมน์
 DocType: Event,Thursday,วันพฤหัสบดี
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +42,Private Equity,ส่วนของภาคเอกชน
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +93,Turning,การหมุน
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,ส่วนของภาคเอกชน
 DocType: Maintenance Visit,Customer Feedback,คำติชมของลูกค้า
 DocType: Account,Expense,ค่าใช้จ่าย
 DocType: Sales Invoice,Exhibition,งานมหกรรม
@@ -3219,19 +3086,19 @@
 DocType: Employee,Held On,จัดขึ้นเมื่อวันที่
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +33,Production Item,การผลิตสินค้า
 ,Employee Information,ข้อมูลของพนักงาน
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,Rate (%),อัตรา (%)
+apps/erpnext/erpnext/public/js/setup_wizard.js +294,Rate (%),อัตรา (%)
 DocType: Stock Entry Detail,Additional Cost,ค่าใช้จ่ายเพิ่มเติม
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +407,Financial Year End Date,ปี การเงิน สิ้นสุด วันที่
+apps/erpnext/erpnext/public/js/setup_wizard.js +155,Financial Year End Date,ปี การเงิน สิ้นสุด วันที่
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Voucher No, if grouped by Voucher",ไม่สามารถกรอง ตาม คูปอง ไม่ ถ้า จัดกลุ่มตาม คูปอง
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +484,Make Supplier Quotation,ทำ ใบเสนอราคา ของผู้ผลิต
 DocType: Quality Inspection,Incoming,ขาเข้า
 DocType: BOM,Materials Required (Exploded),วัสดุบังคับ (ระเบิด)
 DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),ลดรายได้สำหรับการออกโดยไม่จ่าย (LWP)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +512,"Add users to your organization, other than yourself",เพิ่มผู้ใช้องค์กรของคุณอื่นที่ไม่ใช่ตัวเอง
+apps/erpnext/erpnext/public/js/setup_wizard.js +256,"Add users to your organization, other than yourself",เพิ่มผู้ใช้องค์กรของคุณอื่นที่ไม่ใช่ตัวเอง
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No {1} does not match with {2} {3},แถว # {0}: ไม่มี Serial {1}​​ ไม่ตรงกับ {2} {3}
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +44,Casual Leave,สบาย ๆ ออก
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +44,Casual Leave,สบาย ๆ ออก
 DocType: Batch,Batch ID,ID ชุด
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +334,Note: {0},หมายเหตุ : {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +336,Note: {0},หมายเหตุ : {0}
 ,Delivery Note Trends,แนวโน้มหมายเหตุการจัดส่งสินค้า
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +104,This Week's Summary,ข้อมูลอย่างนี้สัปดาห์
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +74,{0} must be a Purchased or Sub-Contracted Item in row {1},{0} จะต้องเป็น รายการ ที่จัดซื้อ หรือ ย่อย สัญญา ในแถว {1}
@@ -3243,7 +3110,7 @@
 DocType: Purchase Receipt,Return Against Purchase Receipt,กลับต่อต้านการซื้อใบเสร็จรับเงิน
 DocType: Purchase Order,To Bill,บิล
 DocType: Material Request,% Ordered,% สั่ง
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +61,Piecework,งานเหมา
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Piecework,งานเหมา
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +64,Avg. Buying Rate,ราคาซื้อเฉลี่ย
 DocType: Task,Actual Time (in Hours),เวลาที่เกิดขึ้นจริง (ในชั่วโมง)
 DocType: Employee,History In Company,ประวัติใน บริษัท
@@ -3260,13 +3127,13 @@
 DocType: Opportunity,To Discuss,เพื่อหารือเกี่ยวกับ
 DocType: SMS Settings,SMS Settings,การตั้งค่า SMS
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +60,Temporary Accounts,บัญชีชั่วคราว
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +155,Black,สีดำ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Black,สีดำ
 DocType: BOM Explosion Item,BOM Explosion Item,รายการระเบิด BOM
 DocType: Account,Auditor,ผู้สอบบัญชี
 DocType: Purchase Order,End date of current order's period,วันที่สิ้นสุดระยะเวลาการสั่งซื้อของ
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +17,Make Offer Letter,ทำให้หนังสือเสนอ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +10,Return,กลับ
-apps/erpnext/erpnext/stock/doctype/item/item.py +503,Default Unit of Measure for Variant must be same as Template,เริ่มต้นหน่วยวัดสำหรับตัวแปรจะต้องเป็นแม่แบบเดียวกับ
+apps/erpnext/erpnext/stock/doctype/item/item.py +507,Default Unit of Measure for Variant must be same as Template,เริ่มต้นหน่วยวัดสำหรับตัวแปรจะต้องเป็นแม่แบบเดียวกับ
 DocType: DocField,Fold,พับ
 DocType: Production Order Operation,Production Order Operation,การดำเนินงานการผลิตการสั่งซื้อ
 DocType: Pricing Rule,Disable,ปิดการใช้งาน
@@ -3277,13 +3144,12 @@
 DocType: Page,Page Name,ชื่อเพจ
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +110,To Time must be greater than From Time,เวลาที่จะต้องมากกว่าจากเวลา
 DocType: Journal Entry Account,Exchange Rate,อัตราแลกเปลี่ยน
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +465,Sales Order {0} is not submitted,การขายสินค้า {0} ไม่ได้ ส่ง
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +467,Sales Order {0} is not submitted,การขายสินค้า {0} ไม่ได้ ส่ง
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0}: Parent account {1} does not bolong to the company {2},คลังสินค้า {0}: บัญชีผู้ปกครอง {1} ไม่ bolong บริษัท {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +124,Spindle finishing,ตกแต่ง Spindle
 DocType: BOM,Last Purchase Rate,อัตราซื้อล่าสุด
 DocType: Account,Asset,สินทรัพย์
 DocType: Project Task,Task ID,รหัสงาน
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +395,"e.g. ""MC""","เช่นผู้ "" MC """
+apps/erpnext/erpnext/public/js/setup_wizard.js +143,"e.g. ""MC""","เช่นผู้ "" MC """
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,Stock cannot exist for Item {0} since has variants,หุ้นไม่สามารถที่มีอยู่สำหรับรายการ {0} ตั้งแต่มีสายพันธุ์
 ,Sales Person-wise Transaction Summary,การขายอย่างย่อรายการคนฉลาด
 DocType: System Settings,Time Zone,โซนเวลา
@@ -3292,9 +3158,7 @@
 DocType: Monthly Distribution,Monthly Distribution Percentages,เปอร์เซ็นต์การกระจายรายเดือน
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +16,The selected item cannot have Batch,รายการที่เลือกไม่สามารถมีแบทช์
 DocType: Delivery Note,% of materials delivered against this Delivery Note,% ของวัสดุที่ส่งกับส่งหมายเหตุนี้
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +151,Stapling,เย็บ
 DocType: Customer,Customer Details,รายละเอียดลูกค้า
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +105,Shaping,การสร้าง
 DocType: Employee,Reports to,รายงานไปยัง
 DocType: SMS Settings,Enter url parameter for receiver nos,ป้อนพารามิเตอร์ URL สำหรับ Nos รับ
 DocType: Sales Invoice,Paid Amount,จำนวนเงินที่ชำระ
@@ -3303,13 +3167,13 @@
 DocType: Item Variant,Item Variant,รายการตัวแปร
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +15,Setting this Address Template as default as there is no other default,การตั้งค่าแม่แบบที่อยู่นี้เป็นค่าเริ่มต้นที่ไม่มีค่าเริ่มต้นอื่น ๆ
 apps/erpnext/erpnext/accounts/doctype/account/account.py +89,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'",ยอดเงินในบัญชีแล้วในเดบิตคุณไม่ได้รับอนุญาตให้ตั้ง 'ยอดดุลต้องเป็น' เป็น 'เครดิต
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +76,Quality Management,การบริหารจัดการ ที่มีคุณภาพ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Quality Management,การบริหารจัดการ ที่มีคุณภาพ
 DocType: Production Planning Tool,Filter based on customer,กรองขึ้นอยู่กับลูกค้า
 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}
 DocType: Employee External Work History,Employee External Work History,ประวัติการทำงานของพนักงานภายนอก
 DocType: Tax Rule,Purchase,ซื้อ
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +34,Balance Qty,คงเหลือ จำนวน
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Balance Qty,คงเหลือ จำนวน
 DocType: Item Group,Parent Item Group,กลุ่มสินค้าหลัก
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +21,{0} for {1},{0} สำหรับ {1}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +96,Cost Centers,ศูนย์ต้นทุน
@@ -3319,12 +3183,12 @@
 DocType: Opportunity,Next Contact,ติดต่อถัดไป
 DocType: Employee,Employment Type,ประเภทการจ้างงาน
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,สินทรัพย์ถาวร
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +84,Application period cannot be across two alocation records,รับสมัครไม่สามารถบันทึกในสอง alocation
 DocType: Item Group,Default Expense Account,บัญชีค่าใช้จ่ายเริ่มต้น
 DocType: Employee,Notice (days),แจ้งให้ทราบล่วงหน้า (วัน)
 DocType: Page,Yes,ใช่
 DocType: Tax Rule,Sales Tax Template,แม่แบบภาษีการขาย
 DocType: Employee,Encashment Date,วันที่การได้เป็นเงินสด
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +74,Electroforming,electroforming
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +179,"Against Voucher Type must be one of Purchase Order, Purchase Invoice or Journal Entry",กับคูปองประเภทต้องเป็นหนึ่งในใบสั่งซื้อใบแจ้งหนี้หรือซื้ออนุทิน
 DocType: Account,Stock Adjustment,การปรับ สต็อก
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +34,Default Activity Cost exists for Activity Type - {0},ค่าใช้จ่ายเริ่มต้นกิจกรรมที่มีอยู่สำหรับประเภทกิจกรรม - {0}
@@ -3360,12 +3224,12 @@
 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,การกระจาย
 apps/erpnext/erpnext/public/js/pos/pos.html +36,Amount Paid,จำนวนเงินที่ชำระ
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +91,Project Manager,ผู้จัดการโครงการ
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +72,Dispatch,ส่งไป
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Project Manager,ผู้จัดการโครงการ
+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: Customer,Default Taxes and Charges,ภาษีและค่าใช้จ่ายเริ่มต้น
 DocType: Account,Receivable,ลูกหนี้
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +268,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,แถว # {0}: ไม่อนุญาตให้ผู้ผลิตที่จะเปลี่ยนเป็นใบสั่งซื้ออยู่แล้ว
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +263,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.",หากการตรวจสอบรายการวัสดุสำหรับรายการย่อยประกอบจะได้รับการพิจารณาสำหรับการใช้วัตถุดิบ มิฉะนั้นทุกรายการย่อยประกอบจะได้รับการปฏิบัติเป็นวัตถุดิบ
@@ -3373,8 +3237,8 @@
 DocType: Hub Settings,Seller Description,รายละเอียดผู้ขาย
 DocType: Employee Education,Qualification,คุณสมบัติ
 DocType: Item Price,Item Price,ราคาสินค้า
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +48,Soap & Detergent,สบู่ และ ผงซักฟอก
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +36,Motion Picture & Video,ภาพยนตร์ และวิดีโอ
+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,ได้รับคำสั่ง
 DocType: Warehouse,Warehouse Name,ชื่อคลังสินค้า
 DocType: Naming Series,Select Transaction,เลือกรายการ
@@ -3383,7 +3247,6 @@
 DocType: BOM,Rate Of Materials Based On,อัตราวัสดุตาม
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,Analtyics สนับสนุน
 apps/erpnext/erpnext/accounts/doctype/accounts_settings/accounts_settings.py +27,Company is missing in warehouses {0},บริษัท ที่ขาดหายไป ในคลังสินค้า {0}
-DocType: Stock UOM Replace Utility,Stock UOM Replace Utility,สต็อกยูทิลิตี้แทนที่ UOM
 DocType: POS Profile,Terms and Conditions,ข้อตกลงและเงื่อนไข
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,To Date should be within the Fiscal Year. Assuming To Date = {0},วันที่ควรจะเป็นภายในปีงบประมาณ สมมติว่านัด = {0}
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","ที่นี่คุณสามารถรักษาความสูงน้ำหนัก, ภูมิแพ้, ฯลฯ ปัญหาด้านการแพทย์"
@@ -3395,7 +3258,7 @@
 DocType: Sales Order Item,For Production,สำหรับการผลิต
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +103,Please enter sales order in the above table,กรุณาใส่ คำสั่งขาย ใน ตารางข้างต้น
 DocType: Project Task,View Task,ดูงาน
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +406,Your financial year begins on,ปี การเงินของคุณ จะเริ่มต้นใน
+apps/erpnext/erpnext/public/js/setup_wizard.js +154,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: Email Digest,Add/Remove Recipients,เพิ่ม / ลบ ชื่อผู้รับ
@@ -3403,16 +3266,14 @@
 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),การตั้งค่า เซิร์ฟเวอร์ขาเข้า สำหรับการสนับสนุน อีเมล์ ของคุณ (เช่น 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 +528,Item variant {0} exists with same attributes,ตัวแปรรายการ {0} อยู่ที่มีลักษณะเดียวกัน
+apps/erpnext/erpnext/stock/doctype/item/item.py +532,Item variant {0} exists with same attributes,ตัวแปรรายการ {0} อยู่ที่มีลักษณะเดียวกัน
 DocType: Salary Slip,Salary Slip,สลิปเงินเดือน
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +116,Burnishing,ปั่นเงา
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +54,'To Date' is required,"โปรดระบุ “วันที่สิ้นสุด"""
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,"โปรดระบุ “วันที่สิ้นสุด"""
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","สร้างบรรจุภัณฑ์สำหรับแพคเกจที่จะส่งมอบ ที่ใช้ในการแจ้งหมายเลขแพคเกจ, แพคเกจเนื้อหาและน้ำหนักของมัน"
 DocType: Sales Invoice Item,Sales Order Item,รายการสั่งซื้อการขาย
 DocType: Salary Slip,Payment Days,วันชำระเงิน
 DocType: BOM,Manage cost of operations,จัดการค่าใช้จ่ายในการดำเนินงาน
 DocType: Features Setup,Item Advanced,ขั้นสูงรายการ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +40,Hot rolling,รีดร้อน
 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.",เมื่อใดของการทำธุรกรรมการตรวจสอบเป็น &quot;Submitted&quot; อีเมล์แบบ pop-up เปิดโดยอัตโนมัติในการส่งอีเมลไปยัง &quot;ติดต่อ&quot; ที่เกี่ยวข้องในการทำธุรกรรมที่มีการทำธุรกรรมเป็นสิ่งที่แนบ ผู้ใช้อาจจะหรือไม่อาจจะส่งอีเมล
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,การตั้งค่าสากล
 DocType: Employee Education,Employee Education,การศึกษาการทำงานของพนักงาน
@@ -3425,25 +3286,23 @@
 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/setup/page/setup_wizard/install_fixtures.py +48,Sick Leave,ป่วย ออกจาก
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +174,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/page/setup_wizard/fixtures/industry_type.py +22,Department Stores,ห้างสรรพสินค้า
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,ห้างสรรพสินค้า
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +40,System Balance,ยอดคงเหลือระบบ
 DocType: Workflow,Is Active,มีการใช้งาน
 apps/erpnext/erpnext/controllers/stock_controller.py +71,No accounting entries for the following warehouses,ไม่มี รายการบัญชี สำหรับคลังสินค้า ดังต่อไปนี้
 apps/erpnext/erpnext/projects/doctype/project/project.js +22,Save the document first.,บันทึกเอกสารครั้งแรก
 DocType: Account,Chargeable,รับผิดชอบ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +121,Linishing,Linishing
 DocType: Company,Change Abbreviation,เปลี่ยนชื่อย่อ
 DocType: Workflow State,Primary,ประถม
 DocType: Expense Claim Detail,Expense Date,วันที่ค่าใช้จ่าย
 DocType: Item,Max Discount (%),ส่วนลดสูงสุด (%)
 DocType: Communication,More Information,ข้อมูลมากกว่านี้
 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/setup/page/setup_wizard/fixtures/operations.py +161,Blasting,การระเบิด
 DocType: Company,Warn,เตือน
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +111,Item valuation updated,การประเมินมูลค่า รายการ ปรับปรุง
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.",ใด ๆ ข้อสังเกตอื่น ๆ ความพยายามที่น่าสังเกตว่าควรจะไปในบันทึก
 DocType: BOM,Manufacturing User,ผู้ใช้การผลิต
 DocType: Purchase Order,Raw Materials Supplied,วัตถุดิบ
@@ -3453,7 +3312,7 @@
 DocType: Appraisal,Appraisal Template,แม่แบบการประเมิน
 DocType: Communication,Email,อีเมล์
 DocType: Item Group,Item Classification,การจัดประเภทรายการ
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +89,Business Development Manager,ผู้จัดการฝ่ายพัฒนาธุรกิจ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Business Development Manager,ผู้จัดการฝ่ายพัฒนาธุรกิจ
 DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,วัตถุประสงค์ชมการบำรุงรักษา
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.js +15,Period,ระยะเวลา
 ,General Ledger,บัญชีแยกประเภททั่วไป
@@ -3463,9 +3322,7 @@
 ,Itemwise Recommended Reorder Level,แนะนำ Itemwise Reorder ระดับ
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +264,Please select {0} first,กรุณาเลือก {0} ครั้งแรก
 DocType: Features Setup,To get Item Group in details table,ที่จะได้รับกลุ่มสินค้าในตารางรายละเอียด
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +67,Redrawing,redrawing
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +112,Batch {0} of Item {1} has expired.,รุ่นที่ {0} ของรายการ {1} หมดอายุ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +120,Etching,การแกะสลัก
 DocType: Sales Invoice,Commission,ค่านายหน้า
 DocType: Address Template,"<h4>Default Template</h4>
 <p>Uses <a href=""http://jinja.pocoo.org/docs/templates/"">Jinja Templating</a> and all the fields of Address (including Custom Fields if any) will be available</p>
@@ -3510,7 +3367,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +340,Operation Time must be greater than 0 for Operation {0},เวลาการดำเนินงานจะต้องมากกว่า 0 สำหรับการปฏิบัติงาน {0}
 DocType: Supplier,Address and Contacts,ที่อยู่และที่ติดต่อ
 DocType: UOM Conversion Detail,UOM Conversion Detail,รายละเอียดการแปลง UOM
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +496,Keep it web friendly 900px (w) by 100px (h),ให้มัน เว็บ 900px มิตร (กว้าง ) โดย 100px (ซ)
+apps/erpnext/erpnext/public/js/setup_wizard.js +242,Keep it web friendly 900px (w) by 100px (h),ให้มัน เว็บ 900px มิตร (กว้าง ) โดย 100px (ซ)
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +329,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,รับบัตรกำนัลที่โดดเด่น
@@ -3526,54 +3383,49 @@
 DocType: Item,Average time taken by the supplier to deliver,เวลาเฉลี่ยที่ถ่ายโดยผู้ผลิตเพื่อส่งมอบ
 DocType: Time Log,Hours,ชั่วโมง
 DocType: Project,Expected Start Date,วันที่เริ่มต้นคาดว่า
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +38,Rolling,กลิ้ง
 DocType: ToDo,Priority,บุริมสิทธิ์
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +41,Remove item if charges is not applicable to that item,ลบรายการค่าใช้จ่ายถ้าไม่สามารถใช้ได้กับรายการที่
 DocType: Dropbox Backup,Dropbox Access Allowed,Dropbox เข็น
 DocType: Dropbox Backup,Weekly,รายสัปดาห์
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,เช่น smsgateway.com / API / send_sms.cgi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +485,Receive,รับ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +510,Receive,รับ
 DocType: Maintenance Visit,Fully Completed,เสร็จสมบูรณ์
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% แล้วเสร็จ
 DocType: Employee,Educational Qualification,วุฒิการศึกษา
 DocType: Workstation,Operating Costs,ค่าใช้จ่ายในการดำเนินงาน
 DocType: Employee Leave Approver,Employee Leave Approver,อนุมัติพนักงานออก
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,{0} has been successfully added to our Newsletter list.,{0} ได้รับการเพิ่มประสบความสำเร็จในรายการจดหมายข่าวของเรา
-apps/erpnext/erpnext/stock/doctype/item/item.py +383,Row {0}: An Reorder entry already exists for this warehouse {1},แถว {0}: รายการสั่งซื้อใหม่อยู่แล้วสำหรับคลังสินค้านี้ {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +387,Row {0}: An Reorder entry already exists for this warehouse {1},แถว {0}: รายการสั่งซื้อใหม่อยู่แล้วสำหรับคลังสินค้านี้ {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +67,"Cannot declare as lost, because Quotation has been made.",ไม่ สามารถประกาศ เป็น หายไป เพราะ ใบเสนอราคา ได้รับการทำ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +133,Electron beam machining,เครื่องจักรกลลำแสงอิเล็กตรอน
 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 +150,Please select Start Date and End Date for Item {0},กรุณาเลือก วันเริ่มต้น และ วันที่สิ้นสุด สำหรับรายการที่ {0}
 apps/erpnext/erpnext/config/stock.py +141,Main Reports,รายงานหลัก
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +102,Stock Ledger entries balances updated,หุ้น บัญชีแยกประเภท รายการ ยอดคงเหลือ การปรับปรุง
 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,DocType Prevdoc
-apps/erpnext/erpnext/stock/doctype/item/item.js +176,Add / Edit Prices,เพิ่ม / แก้ไขราคา
+apps/erpnext/erpnext/stock/doctype/item/item.js +178,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 +298,My Orders,คำสั่งซื้อของฉัน
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +293,My Orders,คำสั่งซื้อของฉัน
 DocType: Price List,Price List Name,ชื่อรายการราคา
 DocType: Time Log,For Manufacturing,สำหรับการผลิต
-apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +70,Totals,ผลรวม
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +174,Totals,ผลรวม
 DocType: BOM,Manufacturing,การผลิต
 ,Ordered Items To Be Delivered,รายการที่สั่งซื้อจะถูกส่ง
 DocType: Account,Income,เงินได้
 ,Setup Wizard,ตัวช่วยสร้าง การติดตั้ง
 DocType: Industry Type,Industry Type,ประเภทอุตสาหกรรม
 apps/erpnext/erpnext/templates/includes/cart.js +137,Something went wrong!,สิ่งที่ผิดพลาด!
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +68,Warning: Leave application contains following block dates,คำเตือน: โปรแกรมออกมีวันที่บล็อกต่อไปนี้
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +251,Sales Invoice {0} has already been submitted,ใบแจ้งหนี้ การขาย {0} ได้ ถูกส่งมา อยู่แล้ว
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +100,Warning: Leave application contains following block dates,คำเตือน: โปรแกรมออกมีวันที่บล็อกต่อไปนี้
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +256,Sales Invoice {0} has already been submitted,ใบแจ้งหนี้ การขาย {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/setup/page/setup_wizard/fixtures/operations.py +10,Die casting,หล่อตาย
 DocType: Email Alert,Reference Date,วันที่อ้างอิง
 apps/erpnext/erpnext/config/hr.py +105,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,กรุณาใส่ข้อความ ก่อนที่จะส่ง
 DocType: Async Task,Status,สถานะ
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +65,Stock UOM updated for Item {0},หุ้น UOM ปรับปรุงสำหรับรายการ {0}
 DocType: Company History,Year,ปี
 apps/erpnext/erpnext/config/accounts.py +127,Point-of-Sale Profile,จุดขายข้อมูลส่วนตัว
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +68,Please Update SMS Settings,กรุณาอัปเดตการตั้งค่า SMS
@@ -3587,12 +3439,12 @@
 ,Serial No Service Contract Expiry,อนุกรมไม่มีหมดอายุสัญญาบริการ
 DocType: Item,Unit of Measure Conversion,หน่วยวัดแปลง
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +86,Employee can not be changed,พนักงานไม่สามารถเปลี่ยนแปลงได้
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +259,You cannot credit and debit same account at the same time,คุณไม่ สามารถเครดิต และ หักเงินจากบัญชี เดียวกันในเวลาเดียวกัน
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,You cannot credit and debit same account at the same time,คุณไม่ สามารถเครดิต และ หักเงินจากบัญชี เดียวกันในเวลาเดียวกัน
 DocType: Naming Series,Help HTML,วิธีใช้ HTML
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},weightage รวม ที่ได้รับมอบหมาย ควรจะ 100% มันเป็น {0}
 apps/erpnext/erpnext/controllers/status_updater.py +140,Allowance for over-{0} crossed for Item {1},ค่าเผื่อเกิน {0} ข้ามกับรายการ {1}
 DocType: Address,Name of person or organization that this address belongs to.,ชื่อบุคคลหรือองค์กรที่อยู่นี้เป็นของ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +587,Your Suppliers,ซัพพลายเออร์ ของคุณ
+apps/erpnext/erpnext/public/js/setup_wizard.js +325,Your Suppliers,ซัพพลายเออร์ ของคุณ
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,ไม่สามารถตั้งค่า ที่ หายไป ในขณะที่ การขายสินค้า ที่ทำ
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +65,Another Salary Structure {0} is active for employee {1}. Please make its status 'Inactive' to proceed.,อีกโครงสร้างเงินเดือน {0} เป็นงานสำหรับพนักงาน {1} กรุณาตรวจสถานะ 'ใช้งาน' เพื่อดำเนินการต่อไป
 DocType: Purchase Invoice,Contact,ติดต่อ
@@ -3601,37 +3453,35 @@
 DocType: Item,Has Serial No,มีซีเรียลไม่มี
 DocType: Employee,Date of Issue,วันที่ออก
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +16,{0}: From {0} for {1},{0}: จาก {0} สำหรับ {1}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +154,Row #{0}: Set Supplier for item {1},แถว # {0}: ตั้งผู้ผลิตสำหรับรายการ {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +149,Row #{0}: Set Supplier for item {1},แถว # {0}: ตั้งผู้ผลิตสำหรับรายการ {1}
 DocType: Issue,Content Type,ประเภทเนื้อหา
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +17,Computer,คอมพิวเตอร์
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,คอมพิวเตอร์
 DocType: Item,List this Item in multiple groups on the website.,รายการนี​​้ในหลายกลุ่มในเว็บไซต์
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +283,Please check Multi Currency option to allow accounts with other currency,กรุณาตรวจสอบตัวเลือกสกุลเงินที่จะอนุญาตให้มีหลายบัญชีที่มีสกุลเงินอื่น ๆ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +285,Please check Multi Currency option to allow accounts with other currency,กรุณาตรวจสอบตัวเลือกสกุลเงินที่จะอนุญาตให้มีหลายบัญชีที่มีสกุลเงินอื่น ๆ
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +62,Item: {0} does not exist in the system,รายการ: {0} ไม่อยู่ในระบบ
 apps/erpnext/erpnext/accounts/doctype/account/account.py +81,You are not authorized to set Frozen value,คุณยังไม่ได้ รับอนุญาตให้ กำหนดค่า แช่แข็ง
 DocType: Payment Reconciliation,Get Unreconciled Entries,คอมเมนต์ได้รับ Unreconciled
 DocType: Cost Center,Budgets,งบประมาณ
 apps/frappe/frappe/core/page/modules_setup/modules_setup.py +11,Updated,อัพเดต
 DocType: Employee,Emergency Contact Details,รายละเอียดการติดต่อในกรณีฉุกเฉิน
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +396,What does it do?,มัน ทำอะไรได้บ้าง
+apps/erpnext/erpnext/public/js/setup_wizard.js +144,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,อัตราเฉลี่ยของค่าคอมมิชชั่น
-apps/erpnext/erpnext/stock/doctype/item/item.py +313,'Has Serial No' can not be 'Yes' for non-stock item,'มี ซีเรียล ไม่' ไม่สามารถ 'ใช่' สำหรับรายการ ที่ไม่มี สต็อก
+apps/erpnext/erpnext/stock/doctype/item/item.py +317,'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/setup/page/setup_wizard/install_fixtures.py +111,Electrical,ไฟฟ้า
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +111,Electrical,ไฟฟ้า
 DocType: Stock Entry,Total Value Difference (Out - In),ความแตกต่างมูลค่ารวม (Out - In)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +302,Row {0}: Exchange Rate is mandatory,แถว {0}: อัตราแลกเปลี่ยนที่มีผลบังคับใช้
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +304,Row {0}: Exchange Rate is mandatory,แถว {0}: อัตราแลกเปลี่ยนที่มีผลบังคับใช้
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},รหัสผู้ใช้ ไม่ได้ ตั้งไว้สำหรับ พนักงาน {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +72,Peening,peening
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,From Warranty Claim,จากการรับประกันเรียกร้อง
 DocType: Stock Entry,Default Source Warehouse,คลังสินค้าที่มาเริ่มต้น
 DocType: Item,Customer Code,รหัสลูกค้า
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +212,Birthday Reminder for {0},เตือนวันเกิดสำหรับ {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +163,Lapping,การทับ
-apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.js +8,Days Since Last Order,ตั้งแต่ วันที่ สั่งซื้อ ล่าสุด
+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 +299,Debit To account must be a Balance Sheet account,เพื่อเดบิตบัญชีจะต้องเป็นบัญ​​ชีงบดุล
 DocType: Buying Settings,Naming Series,การตั้งชื่อซีรีส์
 DocType: Leave Block List,Leave Block List Name,ฝากชื่อรายการที่ถูกบล็อก
@@ -3645,7 +3495,7 @@
 DocType: Notification Control,Sales Invoice Message,ข้อความขายใบแจ้งหนี้
 DocType: Authorization Rule,Based On,ขึ้นอยู่กับ
 DocType: Sales Order Item,Ordered Qty,สั่งซื้อ จำนวน
-apps/erpnext/erpnext/stock/doctype/item/item.py +539,Item {0} is disabled,รายการ {0} ถูกปิดใช้งาน
+apps/erpnext/erpnext/stock/doctype/item/item.py +543,Item {0} is disabled,รายการ {0} ถูกปิดใช้งาน
 DocType: Stock Settings,Stock Frozen Upto,สต็อกไม่เกิน Frozen
 apps/erpnext/erpnext/controllers/recurring_document.py +166,Period From and Period To dates mandatory for recurring {0},ระยะเวลาเริ่มต้นและระยะเวลาในการบังคับใช้สำหรับวันที่เกิดขึ้น {0}
 apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,กิจกรรมของโครงการ / งาน
@@ -3655,7 +3505,6 @@
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,ส่วนลด จะต้อง น้อยกว่า 100
 DocType: ToDo,Low,ต่ำ
 DocType: Purchase Invoice,Write Off Amount (Company Currency),เขียนปิดจำนวนเงิน (บริษัท สกุล)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +71,Spinning,การปั่นด้าย
 DocType: Landed Cost Voucher,Landed Cost Voucher,ที่ดินคูปองต้นทุน
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +55,Please set {0},กรุณาตั้ง {0}
 DocType: Purchase Invoice,Repeat on Day of Month,ทำซ้ำในวันเดือน
@@ -3677,7 +3526,6 @@
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +37,Campaign Name is required,ชื่อแคมเปญ จะต้อง
 DocType: Maintenance Visit,Maintenance Date,วันที่การบำรุงรักษา
 DocType: Purchase Receipt Item,Rejected Serial No,หมายเลขเครื่องปฏิเสธ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +51,Deep drawing,การวาดภาพลึก
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +40,New Newsletter,จดหมายข่าวใหม่
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +157,Start date should be less than end date for Item {0},วันที่เริ่มต้น ควรจะน้อยกว่า วันที่ สิ้นสุดสำหรับ รายการ {0}
 apps/erpnext/erpnext/stock/doctype/item/item.js +17,Show Balance,แสดงยอดคงเหลือ
@@ -3688,7 +3536,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +119,BOM and Manufacturing Quantity are required,รายการวัสดุและปริมาณการผลิตจะต้อง
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,ช่วงสูงอายุ 2
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +450,Amount,จำนวน
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +147,Riveting,โลดโผน
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,BOM แทนที่
 ,Sales Analytics,Analytics ขาย
 DocType: Manufacturing Settings,Manufacturing Settings,การตั้งค่าการผลิต
@@ -3700,20 +3547,19 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +207,New Account Name,ชื่อ บัญชีผู้ใช้ใหม่
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,วัตถุดิบที่จำหน่ายค่าใช้จ่าย
 DocType: Selling Settings,Settings for Selling Module,การตั้งค่าสำหรับการขายโมดูล
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +73,Customer Service,บริการลูกค้า
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Customer Service,บริการลูกค้า
 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.,ผู้สมัครเสนองาน
 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 +70,Item {0} must be a stock Item,รายการ {0} จะต้องมี รายการ หุ้น
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,เริ่มต้นการทำงานในความคืบหน้าโกดัง
 apps/erpnext/erpnext/config/accounts.py +107,Default settings for accounting transactions.,ตั้งค่าเริ่มต้น สำหรับการทำธุรกรรม ทางบัญชี
 apps/frappe/frappe/model/naming.py +40,{0} is required,{0} จะต้อง
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +21,Vacuum molding,ปั้นสูญญากาศ
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,วันที่ คาดว่าจะ ไม่สามารถเป็น วัสดุ ก่อนที่จะ ขอ วันที่
 DocType: Contact Us Settings,City,เมือง
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +132,Ultrasonic machining,เครื่องจักรกลอัลตราโซนิก
 apps/frappe/frappe/templates/base.html +137,Error: Not a valid id?,ข้อผิดพลาด: ไม่ได้รหัสที่ถูกต้อง?
 apps/erpnext/erpnext/stock/get_item_details.py +125,Item {0} must be a Sales Item,รายการ {0} จะต้องเป็น รายการ ขาย
 DocType: Naming Series,Update Series Number,จำนวน Series ปรับปรุง
@@ -3721,7 +3567,7 @@
 DocType: Sales Order,Printing Details,รายละเอียดการพิมพ์
 DocType: Task,Closing Date,ปิดวันที่
 DocType: Sales Order Item,Produced Quantity,จำนวนที่ผลิต
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +84,Engineer,วิศวกร
+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 +379,Item Code required at Row No {0},รหัสสินค้า ที่จำเป็น ที่ แถว ไม่มี {0}
 DocType: Sales Partner,Partner Type,ประเภทคู่
@@ -3729,7 +3575,7 @@
 DocType: Authorization Rule,Customerwise Discount,ส่วนลด Customerwise
 DocType: Purchase Invoice,Against Expense Account,กับบัญชีค่าใช้จ่าย
 DocType: Production Order,Production Order,สั่งซื้อการผลิต
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +258,Installation Note {0} has already been submitted,หมายเหตุ การติดตั้ง {0} ได้ ถูกส่งมา อยู่แล้ว
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +263,Installation Note {0} has already been submitted,หมายเหตุ การติดตั้ง {0} ได้ ถูกส่งมา อยู่แล้ว
 DocType: Quotation Item,Against Docname,กับ ชื่อเอกสาร
 DocType: SMS Center,All Employee (Active),พนักงาน (Active) ทั้งหมด
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,ดู ตอนนี้
@@ -3738,19 +3584,19 @@
 DocType: Item,Re-Order Level,ระดับ Re-Order
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,ป้อนรายการและจำนวนที่วางแผนไว้สำหรับที่คุณต้องการที่จะยกระดับการสั่งผลิตหรือดาวน์โหลดวัตถุดิบสำหรับการวิเคราะห์
 apps/frappe/frappe/public/js/frappe/views/ganttview.js +45,Gantt Chart,แผนภูมิแกนต์
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +57,Part-time,Part-time
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,Part-time,Part-time
 DocType: Employee,Applicable Holiday List,รายการวันหยุดที่ใช้บังคับ
 DocType: Employee,Cheque,เช็ค
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,ชุด ล่าสุด
 apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Report Type is mandatory,ประเภทรายงาน มีผลบังคับใช้
 DocType: Item,Serial Number Series,ชุด หมายเลข
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},คลังสินค้า จำเป็นสำหรับ รายการ หุ้น {0} ในแถว {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +45,Retail & Wholesale,ค้าปลีกและ ขายส่ง
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,ค้าปลีกและ ขายส่ง
 DocType: Issue,First Responded On,ครั้งแรกเมื่อวันที่ง่วง
 DocType: Website Item Group,Cross Listing of Item in multiple groups,รายชื่อครอสของรายการในหลายกลุ่ม
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +351,The First User: You,ผู้ใช้งาน ครั้งแรก: คุณ
+apps/erpnext/erpnext/public/js/setup_wizard.js +101,The First User: You,ผู้ใช้งาน ครั้งแรก: คุณ
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +48,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 +172,Successfully Reconciled,Reconciled ประสบความสำเร็จ
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +119,Successfully Reconciled,Reconciled ประสบความสำเร็จ
 DocType: Production Order,Planned End Date,วันที่สิ้นสุดการวางแผน
 apps/erpnext/erpnext/config/stock.py +43,Where items are stored.,ที่รายการจะถูกเก็บไว้
 DocType: Tax Rule,Validity,ความถูกต้อง
@@ -3770,39 +3616,36 @@
 DocType: DocPerm,Level,ชั้น
 DocType: Purchase Taxes and Charges,On Net Total,เมื่อรวมสุทธิ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +160,Target warehouse in row {0} must be same as Production Order,คลังสินค้า เป้าหมาย ในแถว {0} จะต้อง เป็นเช่นเดียวกับ การผลิต การสั่งซื้อ
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +59,No permission to use Payment Tool,ไม่อนุญาตให้ใช้เครื่องมือการชำระเงิน
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +97,No permission to use Payment Tool,ไม่อนุญาตให้ใช้เครื่องมือการชำระเงิน
 apps/erpnext/erpnext/controllers/recurring_document.py +192,'Notification Email Addresses' not specified for recurring %s,'ประกาศที่อยู่อีเมล' ไม่ระบุที่เกิดขึ้นสำหรับ% s
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +86,Milling,การสี
 apps/erpnext/erpnext/accounts/doctype/account/account.py +99,Currency can not be changed after making entries using some other currency,สกุลเงินไม่สามารถเปลี่ยนแปลงได้หลังจากการทำรายการโดยใช้เงินสกุลอื่น
 DocType: Company,Round Off Account,ปิดรอบบัญชี
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +60,Nibbling,nibbling
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,ค่าใช้จ่ายใน การดูแลระบบ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +18,Consulting,การให้คำปรึกษา
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +18,Consulting,การให้คำปรึกษา
 DocType: Customer Group,Parent Customer Group,กลุ่มลูกค้าผู้ปกครอง
 apps/erpnext/erpnext/public/js/pos/pos.js +429,Change,เปลี่ยนแปลง
 DocType: Purchase Invoice,Contact Email,ติดต่ออีเมล์
 DocType: Appraisal Goal,Score Earned,คะแนนที่ได้รับ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +393,"e.g. ""My Company LLC""","เช่นผู้ ""บริษัท LLC ของฉัน"""
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +173,Notice Period,ระยะเวลาการแจ้งให้ทราบล่วงหน้า
+apps/erpnext/erpnext/public/js/setup_wizard.js +141,"e.g. ""My Company LLC""","เช่นผู้ ""บริษัท LLC ของฉัน"""
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +173,Notice Period,ระยะเวลาการแจ้งให้ทราบล่วงหน้า
 DocType: Bank Reconciliation Detail,Voucher ID,ID บัตรกำนัล
 apps/erpnext/erpnext/setup/doctype/territory/territory.js +14,This is a root territory and cannot be edited.,นี่คือ ดินแดนของ รากและ ไม่สามารถแก้ไขได้
 DocType: Packing Slip,Gross Weight UOM,UOM น้ำหนักรวม
 DocType: Email Digest,Receivables / Payables,ลูกหนี้ / เจ้าหนี้
 DocType: Delivery Note Item,Against Sales Invoice,กับขายใบแจ้งหนี้
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +63,Stamping,การกระแทก
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +457,Credit Account,บัญชีเครดิต
 DocType: Landed Cost Item,Landed Cost Item,รายการค่าใช้จ่ายลง
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +56,Show zero values,แสดงค่าศูนย์
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,จำนวนสินค้าที่ได้หลังการผลิต / บรรจุใหม่จากจำนวนวัตถุดิบที่มี
 DocType: Payment Reconciliation,Receivable / Payable Account,ลูกหนี้ / เจ้าหนี้การค้า
 DocType: Delivery Note Item,Against Sales Order Item,กับการขายรายการสั่งซื้อ
-apps/erpnext/erpnext/stock/doctype/item/item.py +521,Please specify Attribute Value for attribute {0},โปรดระบุคุณสมบัติราคาแอตทริบิวต์ {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +525,Please specify Attribute Value for attribute {0},โปรดระบุคุณสมบัติราคาแอตทริบิวต์ {0}
 DocType: Item,Default Warehouse,คลังสินค้าเริ่มต้น
 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,พิมพ์ที่ไม่มีจำนวน
-apps/erpnext/erpnext/controllers/buying_controller.py +69,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,หมวดหมู่ ภาษี ไม่สามารถ ' ประเมิน ' หรือ ' การประเมิน และ รวม เป็นรายการ ทุก รายการที่ไม่ สต็อก
+apps/erpnext/erpnext/controllers/buying_controller.py +60,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,หมวดหมู่ ภาษี ไม่สามารถ ' ประเมิน ' หรือ ' การประเมิน และ รวม เป็นรายการ ทุก รายการที่ไม่ สต็อก
 DocType: User,Last Name,นามสกุล
 DocType: Web Page,Left,ซ้าย
 DocType: Event,All Day,ทั้งวัน
@@ -3810,7 +3653,7 @@
 DocType: Appraisal,Total Score (Out of 5),คะแนนรวม (out of 5)
 DocType: Contact Us Settings,State,รัฐ
 DocType: Batch,Batch,ชุด
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +51,Balance,สมดุล
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +28,Balance,สมดุล
 DocType: Project,Total Expense Claim (via Expense Claims),การเรียกร้องค่าใช้จ่ายรวม (ผ่านการเรียกร้องค่าใช้จ่าย)
 DocType: User,Gender,เพศ
 DocType: Journal Entry,Debit Note,หมายเหตุเดบิต
@@ -3840,8 +3683,7 @@
 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/setup/page/setup_wizard/fixtures/operations.py +76,Seaming,sea​​ming
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +197,"Company Email ID not found, hence mail not sent",บริษัท ID อีเมล์ ไม่พบ จึง ส่ง ไม่ได้ส่ง
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +206,"Company Email ID not found, hence mail not sent",บริษัท ID อีเมล์ ไม่พบ จึง ส่ง ไม่ได้ส่ง
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),การใช้ประโยชน์กองทุน (สินทรัพย์)
 DocType: Production Planning Tool,Filter based on item,กรองขึ้นอยู่กับสินค้า
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +451,Debit Account,บัญชีเดบิต
@@ -3853,17 +3695,16 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +95,{0} {1} has been modified. Please refresh.,{0} {1} ได้รับการแก้ไข กรุณารีเฟรช
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,หยุดผู้ใช้จากการทำแอพพลิเคที่เดินทางในวันที่ดังต่อไปนี้
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +591,From Opportunity,จากโอกาส
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +46,Blanking,blanking
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +166,Employee Benefits,ผลประโยชน์ของพนักงาน
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,Employee Benefits,ผลประโยชน์ของพนักงาน
 DocType: Sales Invoice,Is POS,POS เป็น
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +240,Packed quantity must equal quantity for Item {0} in row {1},ปริมาณ การบรรจุ จะต้องเท่ากับ ปริมาณ สินค้า {0} ในแถว {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +245,Packed quantity must equal quantity for Item {0} in row {1},ปริมาณ การบรรจุ จะต้องเท่ากับ ปริมาณ สินค้า {0} ในแถว {1}
 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.,ตั๋วเงินยกให้กับลูกค้า
 DocType: DocField,Default,ผิดนัด
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Id โครงการ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +466,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},แถวไม่มี {0}: จำนวนเงินไม่สามารถจะสูงกว่าจำนวนเงินที่ค้างอยู่กับค่าใช้จ่ายในการเรียกร้อง {1} ที่รอดำเนินการเป็นจำนวน {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +468,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} สมาชิกเพิ่ม
 DocType: Maintenance Schedule,Schedule,กำหนดการ
 DocType: Cost Center,"Define Budget for this Cost Center. To set budget action, see ""Company List""",กำหนดงบประมาณสำหรับศูนย์ต้นทุนนี้ การดำเนินการในการตั้งงบประมาณให้ดูรายการ &quot;บริษัท ฯ &quot;
@@ -3874,7 +3715,7 @@
 apps/erpnext/erpnext/public/js/pos/pos.js +91,Price List not found or disabled,ราคาไม่พบหรือคนพิการ
 DocType: Expense Claim,Approved,ได้รับการอนุมัติ
 DocType: Pricing Rule,Price,ราคา
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +79,Employee relieved on {0} must be set as 'Left',พนักงาน โล่งใจ ที่ {0} จะต้องตั้งค่า เป็น ' ซ้าย '
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +88,Employee relieved on {0} must be set as 'Left',พนักงาน โล่งใจ ที่ {0} จะต้องตั้งค่า เป็น ' ซ้าย '
 DocType: Item,"Selecting ""Yes"" will give a unique identity to each entity of this item which can be viewed in the Serial No master.",เลือก &quot;Yes&quot; จะให้เอกลักษณ์เฉพาะของแต่ละองค์กรเพื่อรายการนี​​้ซึ่งสามารถดูได้ในหลักหมายเลขเครื่อง
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +39,Appraisal {0} created for Employee {1} in the given date range,ประเมิน {0} สร้างขึ้นสำหรับ พนักงาน {1} ใน ช่วงวันที่ ที่กำหนด
 DocType: Employee,Education,การศึกษา
@@ -3885,7 +3726,7 @@
 apps/frappe/frappe/desk/moduleview.py +67,Standard Reports,รายงาน มาตรฐาน
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,รายการบัญชีวารสาร
 DocType: Delivery Note Item,Available Qty at From Warehouse,จำนวนที่จำหน่ายจากคลังสินค้า
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +209,Please select Employee Record first.,กรุณาเลือกพนักงานบันทึกครั้งแรก
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +224,Please select Employee Record first.,กรุณาเลือกพนักงานบันทึกครั้งแรก
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,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 +233,Please enter Expense Account,กรุณากรอกบัญชีค่าใช้จ่าย
@@ -3898,46 +3739,43 @@
 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,ดึงยอดขาย (รอการส่งมอบ) คำสั่งตามเกณฑ์ดังกล่าวข้างต้น
 DocType: DocShare,Document Type,ประเภทเอกสาร
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +565,From Supplier Quotation,ใบเสนอราคา จาก ผู้ผลิต
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +588,From Supplier Quotation,ใบเสนอราคา จาก ผู้ผลิต
 DocType: Deduction Type,Deduction Type,ประเภทหัก
 DocType: Attendance,Half Day,ครึ่งวัน
 DocType: Pricing Rule,Min Qty,นาที จำนวน
 DocType: Features Setup,"To track items in sales and purchase documents with batch nos. ""Preferred Industry: Chemicals""",เพื่อติดตามรายการในการขายและเอกสารการจัดซื้อที่มีเลขชุด &quot;ที่ต้องการอุตสาหกรรม: สารเคมี&quot;
 DocType: GL Entry,Transaction Date,วันที่ทำรายการ
 DocType: Production Plan Item,Planned Qty,จำนวนวางแผน
-apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +91,Total Tax,ภาษีทั้งหมด
+apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +93,Total Tax,ภาษีทั้งหมด
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +178,For Quantity (Manufactured Qty) is mandatory,สำหรับปริมาณ (ผลิตจำนวน) มีผลบังคับใช้
 DocType: Stock Entry,Default Target Warehouse,คลังสินค้าเป้าหมายเริ่มต้น
 DocType: Purchase Invoice,Net Total (Company Currency),รวมสุทธิ (สกุลเงิน บริษัท )
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +79,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,แถว {0}: ประเภทพรรคและพรรคจะใช้ได้เฉพาะกับลูกหนี้ / เจ้าหนี้การค้า
 DocType: Notification Control,Purchase Receipt Message,ซื้อใบเสร็จรับเงินข้อความ
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +95,Total allocated leaves are more than period,ใบที่จัดสรรทั้งหมดมีมากขึ้นกว่าช่วงเวลา
 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.,การเคลื่อนไหวระเบียนรายการ
 DocType: Newsletter List Subscriber,Newsletter List Subscriber,จดหมายข่าวรายชื่อสมาชิก
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +164,Morticing,Morticing
 DocType: Email Account,Service,ให้บริการ
 DocType: Hub Settings,Hub Settings,การตั้งค่า Hub
 DocType: Project,Gross Margin %,อัตรากำไรขั้นต้น%
 DocType: BOM,With Operations,กับการดำเนินงาน
 apps/erpnext/erpnext/accounts/party.py +232,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,รายการบัญชีที่ได้รับการทำในสกุลเงิน {0} สำหรับ บริษัท {1} กรุณาเลือกบัญชีลูกหนี้หรือเจ้าหนี้กับสกุลเงิน {0}
 ,Monthly Salary Register,สมัครสมาชิกเงินเดือน
-apps/frappe/frappe/website/template.py +140,Next,ต่อไป
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard_page.html +17,Next,ต่อไป
 DocType: Warranty Claim,If different than customer address,หาก แตกต่างจาก ที่อยู่ของลูกค้า
 DocType: BOM Operation,BOM Operation,การดำเนินงาน BOM
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +118,Electropolishing,ไฟฟ้า
 DocType: Purchase Taxes and Charges,On Previous Row Amount,เกี่ยวกับจำนวนเงินแถวก่อนหน้า
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +24,Please enter Payment Amount in atleast one row,กรุณากรอกจำนวนเงินที่ชำระในอย่างน้อยหนึ่งแถว
+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
 apps/erpnext/erpnext/config/accounts.py +153,"Seasonality for setting budgets, targets etc.",ฤดูกาลสำหรับงบประมาณการตั้งค่าเป้าหมาย ฯลฯ
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +238,Row {0}: Payment Amount cannot be greater than Outstanding Amount,แถว {0}: จำนวนเงินที่ชำระไม่สามารถจะสูงกว่าจำนวนเงินที่โดดเด่น
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +46,Total Unpaid,รวมค้างชำระ
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +21,Time Log is not billable,บันทึกเวลาออกใบเสร็จไม่ได้
 apps/erpnext/erpnext/stock/get_item_details.py +128,"Item {0} is a template, please select one of its variants",รายการ {0} เป็นแม่แบบโปรดเลือกหนึ่งในตัวแปรของมัน
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +528,Purchaser,ผู้ซื้อ
+apps/erpnext/erpnext/public/js/setup_wizard.js +272,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 +71,Please enter the Against Vouchers manually,กรุณากรอกตัวกับบัตรกำนัลด้วยตนเอง
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +107,Please enter the Against Vouchers manually,กรุณากรอกตัวกับบัตรกำนัลด้วยตนเอง
 DocType: SMS Settings,Static Parameters,พารามิเตอร์คง
 DocType: Purchase Order,Advance Paid,จ่ายล่วงหน้า
 DocType: Item,Item Tax,ภาษีสินค้า
@@ -3946,14 +3784,12 @@
 apps/erpnext/erpnext/config/crm.py +48,Send mass SMS to your contacts,ส่ง SMS มวลการติดต่อของคุณ
 DocType: Purchase Taxes and Charges,Consider Tax or Charge for,พิจารณาภาษีหรือคิดค่าบริการสำหรับ
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,จำนวนที่เกิดขึ้นจริงมีผลบังคับใช้
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +42,Cross-rolling,ข้ามกลิ้ง
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +132,Credit Card,บัตรเครดิต
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +132,Credit Card,บัตรเครดิต
 DocType: BOM,Item to be manufactured or repacked,รายการที่จะผลิตหรือ repacked
 apps/erpnext/erpnext/config/stock.py +95,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,กรุณากรอกตัวอักษรภาษีและค่าใช้จ่าย
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +85,Machining,เครื่องจักรกล
 DocType: Sales Invoice Item,Drop Ship,Drop Ship
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children",ที่นี่คุณสามารถรักษารายละเอียดเช่นชื่อครอบครัวและอาชีพของผู้ปกครองคู่สมรสและเด็ก
 DocType: Hub Settings,Seller Name,ชื่อผู้ขาย
@@ -3963,7 +3799,7 @@
 DocType: Stock Entry,Repack,หีบห่ออีกครั้ง
 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/setup/page/setup_wizard/setup_wizard.js +500,Attach Logo,แนบ โลโก้
+apps/erpnext/erpnext/public/js/setup_wizard.js +246,Attach Logo,แนบ โลโก้
 DocType: Customer,Commission Rate,อัตราค่าคอมมิชชั่น
 apps/erpnext/erpnext/stock/doctype/item/item.js +38,Make Variant,ทำให้ตัวแปร
 apps/erpnext/erpnext/config/hr.py +145,Block leave applications by department.,ปิดกั้นการใช้งานออกโดยกรม
@@ -3978,19 +3814,19 @@
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +105,Please select a csv file,เลือกไฟล์ CSV
 DocType: Dropbox Backup,Send Backups to Dropbox,ส่งสำรองข้อมูลไปยัง Dropbox
 DocType: Purchase Order,To Receive and Bill,การรับและบิล
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +94,Designer,นักออกแบบ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Designer,นักออกแบบ
 apps/erpnext/erpnext/config/selling.py +121,Terms and Conditions Template,ข้อตกลงและเงื่อนไขของแม่แบบ
 DocType: Serial No,Delivery Details,รายละเอียดการจัดส่งสินค้า
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +383,Cost Center is required in row {0} in Taxes table for type {1},ศูนย์ต้นทุน ที่จะต้อง อยู่ในแถว {0} ในตาราง ภาษี สำหรับประเภท {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +386,Cost Center is required in row {0} in Taxes table for type {1},ศูนย์ต้นทุน ที่จะต้อง อยู่ในแถว {0} ในตาราง ภาษี สำหรับประเภท {1}
 DocType: Item,Automatically create Material Request if quantity falls below this level,โดยอัตโนมัติสร้างวัสดุขอถ้าปริมาณต่ำกว่าระดับนี้
 ,Item-wise Purchase Register,สมัครสมาชิกสั่งซื้อสินค้าที่ชาญฉลาด
 DocType: Batch,Expiry Date,วันหมดอายุ
-apps/erpnext/erpnext/stock/doctype/item/item.py +375,"To set reorder level, item must be a Purchase Item or Manufacturing Item",การตั้งค่าระดับสั่งซื้อสินค้าจะต้องเป็นรายการการซื้อหรือการผลิตรายการ
+apps/erpnext/erpnext/stock/doctype/item/item.py +379,"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.,ต้นแบบโครงการ
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,ไม่แสดงสัญลักษณ์ใด ๆ เช่น ฯลฯ $ ต่อไปกับเงินสกุล
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +330, (Half Day),(ครึ่งวัน)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +374, (Half Day),(ครึ่งวัน)
 DocType: Supplier,Credit Days,วันเครดิต
 DocType: Leave Type,Is Carry Forward,เป็น Carry Forward
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +478,Get Items from BOM,รับสินค้า จาก BOM
@@ -3998,7 +3834,7 @@
 apps/erpnext/erpnext/config/manufacturing.py +120,Bill of Materials,Bill of Materials
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +77,Row {0}: Party Type and Party is required for Receivable / Payable account {1},แถว {0}: ประเภทพรรคและพรรคเป็นสิ่งจำเป็นสำหรับลูกหนี้ / เจ้าหนี้บัญชี {1}
 DocType: Dropbox Backup,Send Notifications To,แจ้งเตือนไปให้
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html +26,Ref Date,Ref วันที่สมัคร
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +54,Ref Date,Ref วันที่สมัคร
 DocType: Employee,Reason for Leaving,เหตุผลที่ลาออก
 DocType: Expense Claim Detail,Sanctioned Amount,จำนวนตามทำนองคลองธรรม
 DocType: GL Entry,Is Opening,คือการเปิด
@@ -4006,4 +3842,3 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +188,Account {0} does not exist,บัญชี {0} ไม่อยู่
 DocType: Account,Cash,เงินสด
 DocType: Employee,Short biography for website and other publications.,ชีวประวัติสั้นสำหรับเว็บไซต์และสิ่งพิมพ์อื่น ๆ
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +31,Please create Salary Structure for employee {0},กรุณาสร้าง โครงสร้าง เงินเดือน สำหรับพนักงาน {0}
diff --git a/erpnext/translations/tr.csv b/erpnext/translations/tr.csv
index 944ce5a..3bd92cb 100644
--- a/erpnext/translations/tr.csv
+++ b/erpnext/translations/tr.csv
@@ -2,13 +2,12 @@
 DocType: Employee,Salary Mode,Maaş Modu
 DocType: Cost Center,"Select Monthly Distribution, if you want to track based on seasonality.","Eğer mevsimsellik dayalı izlemek istiyorsanız, Aylık Dağıtım seçin."
 DocType: Employee,Divorced,Ayrılmış
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +86,Warning: Same item has been entered multiple times.,Uyarı: Aynı madde birden çok kez girildi.
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +80,Warning: Same item has been entered multiple times.,Uyarı: Aynı madde birden çok kez girildi.
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +96,Items already synced,Öğeler zaten senkronize
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,Öğe bir işlemde birden çok kez eklenecek izin ver
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,Malzeme ziyaret {0} Bu Garanti Talep iptal etmeden önce iptal
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +19,Consumer Products,Tüketici Ürünleri
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,Tüketici Ürünleri
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +68,Please select Party Type first,İlk Parti Türünü seçiniz
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +90,Annealing,Tavlama
 DocType: Item,Customer Items,Müşteri Öğeler
 apps/erpnext/erpnext/accounts/doctype/account/account.py +45,Account {0}: Parent account {1} can not be a ledger,Hesap {0}: Ana hesap {1} bir defter olamaz
 apps/erpnext/erpnext/accounts/doctype/account/account.py +45,Account {0}: Parent account {1} can not be a ledger,Hesap {0}: Ana hesap {1} bir defter olamaz
@@ -26,16 +25,15 @@
 DocType: About Us Settings,Website,Web sitesi
 DocType: POS Profile,Applicable for User,Kullanıcı için geçerlidir
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +169,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Durduruldu Üretim Sipariş iptal edilemez, iptal etmek için ilk önce unstop"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +23,Compaction plus sintering,Sıkıştırma artı sinterleme
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,Currency is required for Price List {0},Döviz Fiyat Listesi için gereklidir {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* İşlemde hesaplanacaktır.
 DocType: Purchase Order,Customer Contact,Müşteri İletişim
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +549,From Material Request,Malzeme talebinden
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +572,From Material Request,Malzeme talebinden
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} Ağaç
 DocType: Job Applicant,Job Applicant,İş Başvuru Sahiibi
 apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,Daha fazla sonuç.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +78,Legal,Yasal
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +78,Legal,Yasal
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +34,Legal,Yasal
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +34,Legal,Yasal
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +114,Actual type tax cannot be included in Item rate in row {0},Gerçek tip vergi satırda Öğe fiyatına dahil edilemez {0}
 DocType: C-Form,Customer,Müşteri
 DocType: C-Form,Customer,Müşteri
@@ -53,7 +51,6 @@
 DocType: Manufacturing Settings,Default 10 mins,10 dakika Standart
 DocType: Leave Type,Leave Type Name,İzin Tipi Adı
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +148,Series Updated Successfully,Seri Başarıyla güncellendi
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +150,Stitching,Dikiş
 DocType: Pricing Rule,Apply On,Uygula
 DocType: Item Price,Multiple Item prices.,Çoklu Ürün fiyatları.
 DocType: Item Price,Multiple Item prices.,Çoklu Ürün fiyatları.
@@ -63,9 +60,9 @@
 DocType: Quality Inspection Reading,Parameter,Parametre
 apps/erpnext/erpnext/projects/doctype/project/project.py +43,Expected End Date can not be less than Expected Start Date,Beklenen Bitiş Tarihi Beklenen Başlangıç ​​Tarihinden daha az olamaz
 apps/erpnext/erpnext/utilities/transaction_base.py +104,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Satır # {0}: Puan aynı olmalıdır {1}: {2} ({3} / {4})
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +189,New Leave Application,Yeni İzin Uygulaması
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +134,Bank Draft,Banka poliçesi
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +134,Bank Draft,Banka poliçesi
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +204,New Leave Application,Yeni İzin Uygulaması
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +134,Bank Draft,Banka poliçesi
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +134,Bank Draft,Banka poliçesi
 DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,1.Müşteriye bilgilendirme sağlamak için Malzeme kodu ve bu seçenek kullanılarak onları kodları ile araştırılabilir yapmak
 DocType: Mode of Payment Account,Mode of Payment Account,Ödeme Hesabının Mod
 apps/erpnext/erpnext/stock/doctype/item/item.js +34,Show Variants,Göster Varyantlar
@@ -80,17 +77,17 @@
 DocType: Production Plan Item,Production Plan Item,Üretim Planı nesnesi
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +141,User {0} is already assigned to Employee {1},Kullanıcı {0} zaten Çalışan {1} e atanmış
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +13,Make new POS Profile,Yeni POS Profili Yap
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +31,Health Care,Sağlık hizmeti
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +31,Health Care,Sağlık hizmeti
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,Sağlık hizmeti
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,Sağlık hizmeti
 DocType: Purchase Invoice,Monthly,Aylık
 DocType: Purchase Invoice,Monthly,Aylık
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +66,Delay in payment (Days),Ödeme Gecikme (Gün)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +494,Invoice,Fatura
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +519,Invoice,Fatura
 DocType: Maintenance Schedule Item,Periodicity,Periyodik olarak tekrarlanma
 DocType: Maintenance Schedule Item,Periodicity,Periyodik olarak tekrarlanma
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +357,Email Address,E
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +21,Defense,Savunma
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +21,Defense,Savunma
+apps/erpnext/erpnext/public/js/setup_wizard.js +107,Email Address,E
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,Savunma
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,Savunma
 DocType: Company,Abbr,Kısaltma
 DocType: Company,Abbr,Kısaltma
 DocType: Appraisal Goal,Score (0-5),Skor (0-5)
@@ -99,14 +96,12 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +67,Row # {0}:,Satır # {0}:
 DocType: Delivery Note,Vehicle No,Araç No
 apps/erpnext/erpnext/public/js/pos/pos.js +528,Please select Price List,Fiyat Listesi seçiniz
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +162,Woodworking,Ağaç
 DocType: Production Order Operation,Work In Progress,Devam eden iş
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +153,3D printing,3D baskı
 DocType: Employee,Holiday List,Tatil Listesi
 DocType: Employee,Holiday List,Tatil Listesi
 DocType: Time Log,Time Log,Günlük
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +530,Accountant,Muhasebeci
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +530,Accountant,Muhasebeci
+apps/erpnext/erpnext/public/js/setup_wizard.js +274,Accountant,Muhasebeci
+apps/erpnext/erpnext/public/js/setup_wizard.js +274,Accountant,Muhasebeci
 DocType: Cost Center,Stock User,Hisse Senedi Kullanıcı
 DocType: Company,Phone No,Telefon No
 DocType: Time Log,"Log of Activities performed by users against Tasks that can be used for tracking time, billing.","Etkinlikler Günlüğü, fatura zamanlı izleme için kullanılabilir Görevler karşı kullanıcılar tarafından seslendirdi."
@@ -125,24 +120,25 @@
 DocType: Bin,Quantity Requested for Purchase,Alım için İstenen miktar
 DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name","Iki sütun, eski adı diğeri yeni isim biriyle .csv dosya eklemek"
 DocType: Packed Item,Parent Detail docname,Ana Detay belgesi adı
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Kg,Kilogram
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Kg,Kilogram
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Kg,Kilogram
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Kg,Kilogram
 apps/erpnext/erpnext/config/hr.py +48,Opening for a Job.,İş Açılışı.
 DocType: Item Attribute,Increment,Artım
 apps/erpnext/erpnext/public/js/stock_analytics.js +63,Select Warehouse...,Warehouse Seçiniz ...
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +6,Advertising,Reklamcılık
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +6,Advertising,Reklamcılık
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,Reklamcılık
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,Reklamcılık
+apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,Aynı şirket birden fazla girilir
 DocType: Employee,Married,Evli
 DocType: Employee,Married,Evli
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +389,Stock cannot be updated against Delivery Note {0},Stok İrsaliye {0} karşısı güncellenmez
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +391,Stock cannot be updated against Delivery Note {0},Stok İrsaliye {0} karşısı güncellenmez
 DocType: Payment Reconciliation,Reconcile,Uzlaştırmak
 DocType: Payment Reconciliation,Reconcile,Uzlaştırmak
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +30,Grocery,Bakkal
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +30,Grocery,Bakkal
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,Bakkal
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,Bakkal
 DocType: Quality Inspection Reading,Reading 1,1 Okuma
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Make Bank Entry,Banka Girişi Yap
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +40,Pension Funds,Emeklilik Fonları
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +40,Pension Funds,Emeklilik Fonları
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,Emeklilik Fonları
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,Emeklilik Fonları
 apps/erpnext/erpnext/accounts/doctype/account/account.py +142,Warehouse is mandatory if account type is Warehouse,Hesap türü Depo ise Depo zorunludur
 DocType: SMS Center,All Sales Person,Bütün Satış Kişileri
 DocType: Lead,Person Name,Kişi Adı
@@ -164,7 +160,7 @@
 DocType: Quality Inspection,Get Specification Details,Şartname Detaylarını alın
 DocType: Lead,Interested,İlgili
 apps/erpnext/erpnext/config/manufacturing.py +14,Bill of Material,Ürün Ağacı
-apps/erpnext/erpnext/public/js/stock_analytics.js +45,Opening,Açılış
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +158,Opening,Açılış
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},Gönderen {0} için {1}
 DocType: Item,Copy From Item Group,Ürün Grubundan kopyalayın
 DocType: Journal Entry,Opening Entry,Giriş Girdisi
@@ -182,14 +178,13 @@
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +22,Target On,Hedefi
 DocType: BOM,Total Cost,Toplam Maliyet
 DocType: BOM,Total Cost,Toplam Maliyet
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +99,Reaming,Oyma
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +9,Activity Log:,Etkinlik Günlüğü:
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +9,Activity Log:,Etkinlik Günlüğü:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +199,Item {0} does not exist in the system or has expired,Ürün {0} sistemde yoktur veya süresi dolmuştur
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +44,Real Estate,Gayrimenkul
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +44,Real Estate,Gayrimenkul
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +44,Real Estate,Gayrimenkul
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +44,Real Estate,Gayrimenkul
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +4,Statement of Account,Hesap Beyanı
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +41,Pharmaceuticals,Ecza
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,Ecza
 DocType: Expense Claim Detail,Claim Amount,Hasar Tutarı
 DocType: Expense Claim Detail,Claim Amount,Hasar Tutarı
 DocType: Employee,Mr,Bay
@@ -199,13 +194,13 @@
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,Tedarikçi Türü / Tedarikçi
 DocType: Naming Series,Prefix,Önek
 DocType: Naming Series,Prefix,Önek
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Consumable,Tüketilir
+apps/erpnext/erpnext/public/js/setup_wizard.js +359,Consumable,Tüketilir
 DocType: Upload Attendance,Import Log,İthalat Günlüğü
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.js +19,Send,Gönder
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.js +19,Send,Gönder
 DocType: Sales Invoice Item,Delivered By Supplier,Tedarikçi Tarafından Teslim
 DocType: SMS Center,All Contact,Tüm İrtibatlar
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +164,Annual Salary,Yıllık Gelir
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +164,Annual Salary,Yıllık Gelir
 DocType: Period Closing Voucher,Closing Fiscal Year,Mali Yılı Kapanış
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +69,Stock Expenses,Stok Giderleri
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +69,Stock Expenses,Stok Giderleri
@@ -214,7 +209,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +92,Show Time Logs,Show Time Kayıtlar
 DocType: Journal Entry Account,Credit in Company Currency,Şirket Para Kredi
 DocType: Delivery Note,Installation Status,Kurulum Durumu
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +115,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Onaylanan ve reddedilen miktarların toplamı alınan ürün miktarına eşit olmak zorundadır. {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +118,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Onaylanan ve reddedilen miktarların toplamı alınan ürün miktarına eşit olmak zorundadır. {0}
 DocType: Item,Supply Raw Materials for Purchase,Tedarik Hammadde Satın Alma için
 apps/erpnext/erpnext/stock/get_item_details.py +133,Item {0} must be a Purchase Item,Ürün {0} Satın alma ürünü olmalıdır
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
@@ -222,24 +217,22 @@
  Seçilen dönemde tüm tarihler ve çalışan kombinasyonu mevcut katılım kayıtları ile, şablonda gelecek"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +446,Item {0} is not active or end of life has been reached,Ürün {0} aktif değil veya kullanım ömrünün sonuna gelindi
 DocType: Time Log Batch,Will be updated after Sales Invoice is Submitted.,Satış Faturası verildikten sonra güncellenecektir.
-apps/erpnext/erpnext/controllers/accounts_controller.py +493,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included",Satır {0} a vergi eklemek için  {1} satırlarındaki vergiler de dahil edilmelidir
+apps/erpnext/erpnext/controllers/accounts_controller.py +494,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included",Satır {0} a vergi eklemek için  {1} satırlarındaki vergiler de dahil edilmelidir
 apps/erpnext/erpnext/config/hr.py +90,Settings for HR Module,İK Modülü Ayarları
 apps/erpnext/erpnext/config/hr.py +90,Settings for HR Module,İK Modülü Ayarları
 DocType: SMS Center,SMS Center,SMS Merkezi
 DocType: SMS Center,SMS Center,SMS Merkezi
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +78,Straightening,Doğrultma
 DocType: BOM Replace Tool,New BOM,Yeni BOM
 apps/erpnext/erpnext/config/projects.py +28,Batch Time Logs for billing.,Toplu Fatura Zaman Kayıtlar.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +15,Countergravity casting,Countergravity döküm
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +30,Newsletter has already been sent,Bülten zaten gönderildi
 DocType: Lead,Request Type,İstek Türü
 DocType: Lead,Request Type,İstek Türü
 DocType: Leave Application,Reason,Nedeni
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +14,Broadcasting,Yayın
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +14,Broadcasting,Yayın
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +140,Execution,Yerine Getirme
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +140,Execution,Yerine Getirme
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +364,The first user will become the System Manager (you can change this later).,Sistem Yöneticisi olacak ilk kullanıcı (bu daha sonra değiştirebilirsiniz).
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,Yayın
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,Yayın
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +140,Execution,Yerine Getirme
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +140,Execution,Yerine Getirme
+apps/erpnext/erpnext/public/js/setup_wizard.js +114,The first user will become the System Manager (you can change this later).,Sistem Yöneticisi olacak ilk kullanıcı (bu daha sonra değiştirebilirsiniz).
 apps/erpnext/erpnext/config/manufacturing.py +39,Details of the operations carried out.,Operasyonların detayları gerçekleştirdi.
 DocType: Serial No,Maintenance Status,Bakım Durumu
 DocType: Serial No,Maintenance Status,Bakım Durumu
@@ -261,7 +254,6 @@
 apps/frappe/frappe/public/js/frappe/form/print.js +96,Start,Başlangıç
 DocType: User,First Name,Ad
 DocType: User,First Name,Ad
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +12,Full-mold casting,Tam kalıba döküm
 DocType: Offer Letter,Select Terms and Conditions,Şartlar ve Koşulları Seç
 DocType: Production Planning Tool,Sales Orders,Satış Siparişleri
 DocType: Purchase Taxes and Charges,Valuation,Değerleme
@@ -276,9 +268,8 @@
 DocType: Bank Reconciliation,Bank Account,Banka Hesabı
 DocType: Leave Type,Allow Negative Balance,Negatif Bakiye izni
 DocType: Selling Settings,Default Territory,Standart Bölge
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +53,Television,Televizyon
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +53,Television,Televizyon
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +138,Gashing,Gashing
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,Televizyon
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,Televizyon
 DocType: Production Order Operation,Updated via 'Time Log','Zaman Log' aracılığıyla Güncelleme
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +82,Account {0} does not belong to Company {1},Hesap {0} Şirkete ait değil {1}
 DocType: Naming Series,Series List for this Transaction,Bu İşlem için Seri Listesi
@@ -295,14 +286,13 @@
 DocType: Leave Allocation,Add unused leaves from previous allocations,Önceki tahsisleri kullanılmayan yaprakları ekleyin
 apps/erpnext/erpnext/controllers/recurring_document.py +206,Next Recurring {0} will be created on {1},Sonraki Dönüşümlü {0} üzerinde oluşturulur {1}
 DocType: Newsletter List,Total Subscribers,Toplam Aboneler
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +575,Contact Name,İletişim İsmi
+,Contact Name,İletişim İsmi
 DocType: Production Plan Item,SO Pending Qty,SO Bekleyen Miktar
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Yukarıda belirtilen kriterler için maaş makbuzu oluştur.
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,Satın alma isteği.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +107,Double housing,Çift konut
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +156,Only the selected Leave Approver can submit this Leave Application,Yalnızca seçilen izin onaylayıcı bu İzin uygulamasını verebilir
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +171,Only the selected Leave Approver can submit this Leave Application,Yalnızca seçilen izin onaylayıcı bu İzin uygulamasını verebilir
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,Ayrılma tarihi Katılma tarihinden sonra olmalıdır
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +172,Leaves per Year,Yıl başına bırakır
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +172,Leaves per Year,Yıl başına bırakır
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup > Settings > Naming Series,{0} Ayarlar&gt; Ayarlar yoluyla&gt; Adlandırma Serisi Serisi adlandırma set Lütfen
 DocType: Time Log,Will be updated when batched.,Serilendiğinde güncellenecektir.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +104,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,Satır {0}: kontrol edin Hesabı karşı 'Advance mı' {1} Bu bir avans giriş ise.
@@ -314,8 +304,8 @@
 DocType: Dropbox Backup,Dropbox Access Key,Dropbox Erişim Anahtarı
 DocType: Dropbox Backup,Dropbox Access Key,Dropbox Erişim Anahtarı
 DocType: Payment Tool,Reference No,Referans No
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +348,Leave Blocked,İzin engellendi
-apps/erpnext/erpnext/stock/doctype/item/item.py +535,Item {0} has reached its end of life on {1},Ürün {0} {1}de kullanım ömrünün sonuna gelmiştir.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +392,Leave Blocked,İzin engellendi
+apps/erpnext/erpnext/stock/doctype/item/item.py +539,Item {0} has reached its end of life on {1},Ürün {0} {1}de kullanım ömrünün sonuna gelmiştir.
 apps/erpnext/erpnext/accounts/utils.py +339,Annual,Yıllık
 apps/erpnext/erpnext/accounts/utils.py +339,Annual,Yıllık
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Stok Uzlaşma Öğe
@@ -323,20 +313,19 @@
 DocType: Material Request Item,Min Order Qty,Minimum sipariş miktarı
 DocType: Lead,Do Not Contact,İrtibata Geçmeyin
 DocType: Sales Invoice,The unique id for tracking all recurring invoices. It is generated on submit.,Bütün mükerrer faturaları izlemek için özel kimlik. Teslimatta oluşturulacaktır.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +93,Software Developer,Yazılım Geliştirici
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +93,Software Developer,Yazılım Geliştirici
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +93,Software Developer,Yazılım Geliştirici
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +93,Software Developer,Yazılım Geliştirici
 DocType: Item,Minimum Order Qty,Minimum Sipariş Miktarı
 DocType: Pricing Rule,Supplier Type,Tedarikçi Türü
 DocType: Pricing Rule,Supplier Type,Tedarikçi Türü
 DocType: Item,Publish in Hub,Hub Yayınla
 ,Terretory,Bölge
-apps/erpnext/erpnext/stock/doctype/item/item.py +555,Item {0} is cancelled,Ürün {0} iptal edildi
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +598,Material Request,Malzeme Talebi
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +598,Material Request,Malzeme Talebi
+apps/erpnext/erpnext/stock/doctype/item/item.py +559,Item {0} is cancelled,Ürün {0} iptal edildi
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +607,Material Request,Malzeme Talebi
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +607,Material Request,Malzeme Talebi
 DocType: Bank Reconciliation,Update Clearance Date,Güncelleme Alma Tarihi
 DocType: Item,Purchase Details,Satın alma Detayları
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +323,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},Satın Alma Emri &#39;Hammadde Tedarik&#39; tablosunda bulunamadı Item {0} {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +129,Wire brushing,Tel fırçalama
 DocType: Employee,Relation,İlişki
 DocType: Shipping Rule,Worldwide Shipping,Dünya çapında Nakliye
 apps/erpnext/erpnext/config/selling.py +23,Confirmed orders from Customers.,Müşteriler Siparişi Onaylandı.
@@ -356,14 +345,13 @@
 DocType: Lead,Mobile No.,Cep No
 DocType: Lead,Mobile No.,Cep No
 DocType: Maintenance Schedule,Generate Schedule,Program Oluşturun
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +81,Hubbing,Daldırma ile elektro
 DocType: Purchase Invoice Item,Expense Head,Gider Başlığı
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +86,Please select Charge Type first,İlk şarj türünü seçiniz
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,Son
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,Son
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +395,Max 5 characters,En fazla 5 karakter
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +195,Select Your Language,Dil Seçiniz
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +195,Select Your Language,Dil Seçiniz
+apps/erpnext/erpnext/public/js/setup_wizard.js +143,Max 5 characters,En fazla 5 karakter
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +245,Select Your Language,Dil Seçiniz
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +245,Select Your Language,Dil Seçiniz
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,İlk kullanıcı sistem yöneticisi olacaktır (daha sonra değiştirebilirsiniz)
 DocType: Manufacturing Settings,"Disables creation of time logs against Production Orders.
 Operations shall not be tracked against Production Order",Üretim Siparişleri karşı gerçek zamanlı günlükleri oluşturulmasını devre dışı bırakır. Operasyonlar Üretim Emri karşı izlenen edilmez
@@ -375,8 +363,6 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +34,Item {0} must be Service Item,Ürün {0} Hizmet ürünü olmalıdır
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +303,Completed Qty can not be greater than 'Qty to Manufacture',Daha 'Miktar imalatı için' Tamamlandı Adet büyük olamaz
 DocType: DocType,Administrator,Yönetici
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +136,Laser drilling,Lazer delme
-DocType: Stock UOM Replace Utility,New Stock UOM,Yeni Stok UOM
 DocType: Period Closing Voucher,Closing Account Head,Kapanış Hesap Başkanı
 DocType: Employee,External Work History,Dış Çalışma Geçmişi
 apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,Dairesel Referans Hatası
@@ -388,12 +374,8 @@
 DocType: Employee,Job Profile,İş Profili
 DocType: Newsletter,Newsletter,Bülten
 DocType: Newsletter,Newsletter,Bülten
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +84,Hydroforming,Hydroforming
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +49,Necking,Sarmaş dolaş olma
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Otomatik Malzeme Talebi oluşturulması durumunda e-posta ile bildir
 DocType: Journal Entry,Multi Currency,Çoklu Para Birimi
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +51,Item is updated,Ürün güncellenir
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +51,Item is updated,Ürün güncellenir
 DocType: Async Task,System Manager,Sistem Yöneticisi
 DocType: Payment Reconciliation Invoice,Invoice Type,Fatura Türü
 DocType: Payment Reconciliation Invoice,Invoice Type,Fatura Türü
@@ -401,7 +383,7 @@
 DocType: Dropbox Backup,Allow Dropbox Access,Dropbox erişim izni
 apps/erpnext/erpnext/config/learn.py +72,Setting up Taxes,Vergiler kurma
 apps/erpnext/erpnext/accounts/utils.py +189,Payment Entry has been modified after you pulled it. Please pull it again.,Bunu çekti sonra Ödeme Giriş modifiye edilmiştir. Tekrar çekin lütfen.
-apps/erpnext/erpnext/stock/doctype/item/item.py +343,{0} entered twice in Item Tax,{0} iki kere ürün vergisi girildi
+apps/erpnext/erpnext/stock/doctype/item/item.py +347,{0} entered twice in Item Tax,{0} iki kere ürün vergisi girildi
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +105,Summary for this week and pending activities,Bu hafta ve bekleyen aktiviteler için Özet
 DocType: Workstation,Rent Cost,Kira Bedeli
 DocType: Workstation,Rent Cost,Kira Bedeli
@@ -420,16 +402,14 @@
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,Müşteri Para Biriminin Müşterinin temel birimine dönüştürülme oranı
 DocType: Features Setup,"Available in BOM, Delivery Note, Purchase Invoice, Production Order, Purchase Order, Purchase Receipt, Sales Invoice, Sales Order, Stock Entry, Timesheet","BOM,İrsaliye, Satın Alma Faturası, Satın Alma Makbuzu, Satış Faturası, Satış Emri, Stok Girdisi, Zaman Çizelgesinde Mevcut"
 DocType: Item Tax,Tax Rate,Vergi Oranı
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Select Item,Öğe Seç
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +540,Select Item,Öğe Seç
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +143,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","Ürün: {0} toplu-bilge, bunun yerine kullanmak Stok Girişi \
  Stok Uzlaşma kullanılarak uzlaşma olamaz yönetilen"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +259,Purchase Invoice {0} is already submitted,Satın alma Faturası {0} zaten teslim edildi
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +262,Purchase Invoice {0} is already submitted,Satın alma Faturası {0} zaten teslim edildi
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Batch No must be same as {1} {2},Satır # {0}: Toplu Hayır aynı olmalıdır {1} {2}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Convert to non-Group,Olmayan gruba dönüştürme
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +55,Purchase Receipt must be submitted,Satınalma Makbuzu teslim edilmelidir
-DocType: Stock UOM Replace Utility,Current Stock UOM,Cari Stok UOM
-DocType: Stock UOM Replace Utility,Current Stock UOM,Cari Stok UOM
 apps/erpnext/erpnext/config/stock.py +53,Batch (lot) of an Item.,Bir Öğe toplu (lot).
 DocType: C-Form Invoice Detail,Invoice Date,Fatura Tarihi
 DocType: C-Form Invoice Detail,Invoice Date,Fatura Tarihi
@@ -437,11 +417,10 @@
 apps/erpnext/erpnext/accounts/party.py +223,There can only be 1 Account per Company in {0} {1},Sadece Şirket&#39;in başına 1 Hesap olabilir {0} {1}
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Your email address,E-posta adresiniz
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Your email address,E-posta adresiniz
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +194,Please see attachment,Eke bakın
-DocType: Purchase Order,% Received,% Alınan
-DocType: Purchase Order,% Received,% Alınan
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +109,Water jet cutting,Su jeti kesme
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +24,Setup Already Complete!!,Kurulum Tamamlandı!
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +203,Please see attachment,Eke bakın
+DocType: Purchase Order,% Received,% Alındi
+DocType: Purchase Order,% Received,% Alindi
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +20,Setup Already Complete!!,Kurulum Tamamlandı!
 ,Finished Goods,Mamüller
 ,Finished Goods,Mamüller
 DocType: Delivery Note,Instructions,Talimatlar
@@ -461,6 +440,7 @@
 DocType: Currency Exchange,Currency Exchange,Döviz
 DocType: Currency Exchange,Currency Exchange,Döviz
 DocType: Purchase Invoice Item,Item Name,Nesne Adı
+DocType: Authorization Rule,Approving User  (above authorized value),(Yetkili değerin üstünde) Kullanıcı onaylanması
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Credit Balance,Alacak bakiyesi
 DocType: Employee,Widowed,Dul
 DocType: Employee,Widowed,Dul
@@ -472,13 +452,12 @@
 DocType: Landed Cost Item,Applicable Charges,Uygulanabilir Ücretler
 DocType: Workstation,Consumable Cost,Sarf Maliyeti
 DocType: Workstation,Consumable Cost,Sarf Maliyeti
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,{0} ({1}) must have role 'Leave Approver',{0} ({1}) rolü olmalıdır 'bırak Approver'
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +167,{0} ({1}) must have role 'Leave Approver',{0} ({1}) rolü olmalıdır 'bırak Approver'
 DocType: Purchase Receipt,Vehicle Date,Araç Tarihi
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +39,Medical,Tıbbi
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +39,Medical,Tıbbi
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +39,Medical,Tıbbi
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +39,Medical,Tıbbi
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,Kaybetme nedeni
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,Kaybetme nedeni
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +36,Tube beading,Tüp boncuk
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},İş İstasyonu Tatil List göre aşağıdaki tarihlerde kapalı: {0}
 DocType: Employee,Single,Tek
 DocType: Employee,Single,Tek
@@ -504,10 +483,8 @@
 DocType: Account,Is Group,Is Grubu
 DocType: Stock Settings,Automatically Set Serial Nos based on FIFO,Otomatik olarak FIFO göre Nos Seri Set
 DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,Kontrol Tedarikçi Fatura Numarası Teklik
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +31,Thermoforming,Termoform
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +66,Slitting,Dilme
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +57,'To Case No.' cannot be less than 'From Case No.','Son Olay No' 'İlk Olay No'  dan küçük olamaz.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +104,Non Profit,Kar Yok
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +104,Non Profit,Kar Yok
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_list.js +7,Not Started,Başlatan Değil
 DocType: Lead,Channel Partner,Kanal Ortağı
 DocType: Lead,Channel Partner,Kanal Ortağı
@@ -517,16 +494,15 @@
 apps/erpnext/erpnext/config/manufacturing.py +74,Global settings for all manufacturing processes.,Tüm üretim süreçleri için genel ayarlar.
 DocType: Accounts Settings,Accounts Frozen Upto,Dondurulmuş hesaplar
 DocType: SMS Log,Sent On,Gönderim Zamanı
-apps/erpnext/erpnext/stock/doctype/item/item.py +512,Attribute {0} selected multiple times in Attributes Table,Özellik {0} Nitelikler Tablo birden çok kez seçilmiş
+apps/erpnext/erpnext/stock/doctype/item/item.py +516,Attribute {0} selected multiple times in Attributes Table,Özellik {0} Nitelikler Tablo birden çok kez seçilmiş
 DocType: Sales Order,Not Applicable,Uygulanamaz
 DocType: Sales Order,Not Applicable,Uygulanamaz
 apps/erpnext/erpnext/config/hr.py +140,Holiday master.,Ana tatil. 
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +19,Shell molding,Kabuk kalıplama
 DocType: Material Request Item,Required Date,Gerekli Tarih
 DocType: Material Request Item,Required Date,Gerekli Tarih
 DocType: Delivery Note,Billing Address,Faturalama  Adresi
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +644,Please enter Item Code.,Ürün Kodu girin.
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +644,Please enter Item Code.,Ürün Kodu girin.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +648,Please enter Item Code.,Ürün Kodu girin.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +648,Please enter Item Code.,Ürün Kodu girin.
 DocType: BOM,Costing,Maliyetlendirme
 DocType: BOM,Costing,Maliyetlendirme
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount","İşaretli ise, vergi miktarının hali hazırda Basım Oranında/Basım Miktarında dahil olduğu düşünülecektir"
@@ -538,7 +514,7 @@
 DocType: Item Attribute,To Range,Range
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Teminatlar ve Mevduatlar
 DocType: Features Setup,Imports,İthalat
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +144,Adhesive bonding,Yapıştırma
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +77,Total leaves allocated is mandatory,Tahsis edilen toplam yaprakları zorunludur
 DocType: Job Opening,Description of a Job Opening,İş Açılış Açıklaması
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +102,Pending activities for today,Bugün için Bekleyen faaliyetler
 apps/erpnext/erpnext/config/hr.py +28,Attendance record.,Katılım kaydı.
@@ -548,19 +524,18 @@
 DocType: System Settings,Loading...,Yükleniyor...
 DocType: System Settings,Loading...,Yükleniyor...
 DocType: DocField,Password,Parola
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +155,Fused deposition modeling,Sigortalı birikim modelleme
 DocType: Manufacturing Settings,Time Between Operations (in mins),(Dakika içinde) Operasyonlar Arası Zaman
 DocType: Customer,Buyer of Goods and Services.,Mal ve Hizmet Alıcı.
 DocType: Journal Entry,Accounts Payable,Vadesi gelmiş hesaplar
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +24,Add Subscribers,Abone Ekle
 apps/erpnext/erpnext/public/js/feature_setup.js +220,""" does not exists",""" mevcut değildir"
 DocType: Pricing Rule,Valid Upto,Tarihine kadar geçerli
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +564,List a few of your customers. They could be organizations or individuals.,Müşterilerinizin birkaçını listeleyin. Bunlar kuruluşlar veya bireyler olabilir.
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,List a few of your customers. They could be organizations or individuals.,Müşterilerinizin birkaçını listeleyin. Bunlar kuruluşlar veya bireyler olabilir.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Direct Income,Doğrudan Gelir
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Direct Income,Doğrudan Gelir
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +33,"Can not filter based on Account, if grouped by Account","Hesap, olarak gruplandırıldı ise Hesaba dayalı filtreleme yapamaz"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +88,Administrative Officer,İdari Memur
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +88,Administrative Officer,İdari Memur
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Administrative Officer,İdari Memur
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Administrative Officer,İdari Memur
 DocType: Payment Tool,Received Or Paid,Alınan Veya Ücretli
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +318,Please select Company,Firma seçiniz
 DocType: Stock Entry,Difference Account,Fark Hesabı
@@ -568,10 +543,10 @@
 apps/erpnext/erpnext/projects/doctype/task/task.py +44,Cannot close task as its dependant task {0} is not closed.,Bağımlı görevi {0} kapalı değil yakın bir iş değildir Can.
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +305,Please enter Warehouse for which Material Request will be raised,Malzeme Talebinin yapılacağı Depoyu girin
 DocType: Production Order,Additional Operating Cost,Ek İşletme Maliyeti
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +20,Cosmetics,Bakım ürünleri
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,Bakım ürünleri
 DocType: DocField,Type,Türü
 DocType: DocField,Type,Türü
-apps/erpnext/erpnext/stock/doctype/item/item.py +417,"To merge, following properties must be same for both items","Birleştirmek için, aşağıdaki özellikler her iki Ürün için de aynı olmalıdır"
+apps/erpnext/erpnext/stock/doctype/item/item.py +421,"To merge, following properties must be same for both items","Birleştirmek için, aşağıdaki özellikler her iki Ürün için de aynı olmalıdır"
 DocType: Communication,Subject,Konu
 DocType: Communication,Subject,Konu
 DocType: Shipping Rule,Net Weight,Net Ağırlık 
@@ -586,7 +561,6 @@
 DocType: Account,Profit and Loss,Kar ve Zarar
 DocType: Account,Profit and Loss,Kar ve Zarar
 apps/erpnext/erpnext/config/stock.py +293,Managing Subcontracting,Yönetme Taşeronluk
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +58,New UOM must NOT be of type Whole Number,Yeni UOM tam sayı tipi olmamalıdır
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Furniture and Fixture,Mobilya ve Fikstürü
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Furniture and Fixture,Mobilya ve Fikstürü
 DocType: Quotation,Rate at which Price list currency is converted to company's base currency,Fiyat listesi para biriminin şirketin temel para birimine dönüştürülme oranı
@@ -609,8 +583,8 @@
 DocType: Purchase Invoice,Supplier Invoice No,Tedarikçi Fatura No
 DocType: Territory,For reference,Referans için
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +154,"Cannot delete Serial No {0}, as it is used in stock transactions","Silinemiyor Seri No {0}, hisse senedi işlemlerinde kullanıldığı gibi"
-apps/erpnext/erpnext/public/js/account_tree_grid.js +52,Closing (Cr),Kapanış (Cr)
-apps/erpnext/erpnext/public/js/account_tree_grid.js +52,Closing (Cr),Kapanış (Cr)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +227,Closing (Cr),Kapanış (Cr)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +227,Closing (Cr),Kapanış (Cr)
 DocType: Serial No,Warranty Period (Days),Garanti Süresi (Gün)
 DocType: Serial No,Warranty Period (Days),Garanti Süresi (Gün)
 DocType: Installation Note Item,Installation Note Item,Kurulum Notu Maddesi
@@ -620,7 +594,7 @@
 DocType: Company,Ignore,Yoksay
 DocType: Company,Ignore,Yoksay
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +86,SMS sent to following numbers: {0},SMS aşağıdaki numaralardan gönderilen: {0}
-apps/erpnext/erpnext/controllers/buying_controller.py +135,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Alt Sözleşmeye bağlı Alım makbuzu için Tedarikçi deposu zorunludur
+apps/erpnext/erpnext/controllers/buying_controller.py +126,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Alt Sözleşmeye bağlı Alım makbuzu için Tedarikçi deposu zorunludur
 DocType: Pricing Rule,Valid From,Itibaren geçerli
 DocType: Pricing Rule,Valid From,Itibaren geçerli
 DocType: Sales Invoice,Total Commission,Toplam Komisyon
@@ -633,8 +607,8 @@
 To distribute a budget using this distribution, set this **Monthly Distribution** in the **Cost Center**","** Aylık Dağılımı ** işinizde size mevsimsellik varsa ay boyunca bütçenizi dağıtmak yardımcı olur.
 
 , Bu dağılım kullanılarak bir bütçe dağıtmak ** Maliyet Merkezi'nde ** ** Bu Aylık Dağıtım ayarlamak için **"
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +183,No records found in the Invoice table,Fatura tablosunda kayıt bulunamadı
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +183,No records found in the Invoice table,Fatura tablosunda kayıt bulunamadı
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +130,No records found in the Invoice table,Fatura tablosunda kayıt bulunamadı
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +130,No records found in the Invoice table,Fatura tablosunda kayıt bulunamadı
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +20,Please select Company and Party Type first,İlk Şirket ve Parti Tipi seçiniz
 apps/erpnext/erpnext/config/accounts.py +84,Financial / accounting year.,Mali / Muhasebe yılı.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","Üzgünüz, seri numaraları birleştirilemiyor"
@@ -652,14 +626,15 @@
 DocType: Sales Order,Billing and Delivery Status,Fatura ve Teslimat Durumu
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Tekrar Müşteriler
 DocType: Leave Control Panel,Allocate,Tahsis
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +16,Previous,Önceki
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +16,Previous,Önceki
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard_page.html +16,Previous,Önceki
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard_page.html +16,Previous,Önceki
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +620,Sales Return,Satış İade
 DocType: Production Planning Tool,Select Sales Orders from which you want to create Production Orders.,Üretim Emri oluşturmak istediğiniz Satış Siparişlerini seçiniz.
 DocType: Item,Delivered by Supplier (Drop Ship),Yüklenici tarafından teslim (Bırak Gemi)
 apps/erpnext/erpnext/config/hr.py +120,Salary components.,Maaş bileşenleri.
 apps/erpnext/erpnext/config/hr.py +120,Salary components.,Maaş bileşenleri.
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,Potansiyel müşterilerin Veritabanı.
+DocType: Authorization Rule,Customer or Item,Müşteri ya da Öğe
 apps/erpnext/erpnext/config/crm.py +17,Customer database.,Müşteri veritabanı.
 apps/erpnext/erpnext/config/crm.py +17,Customer database.,Müşteri veritabanı.
 DocType: Quotation,Quotation To,Teklif Etmek
@@ -668,7 +643,6 @@
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),Açılış (Cr)
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),Açılış (Cr)
 apps/erpnext/erpnext/accounts/utils.py +193,Allocated amount can not be negative,Tahsis edilen miktar negatif olamaz
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +123,Tumbling,Tumbling
 DocType: Purchase Order Item,Billed Amt,Faturalı Tutarı
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,Stok girişleri mantıksal Depoya karşı yapıldı
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +92,Reference No & Reference Date is required for {0},Referans No ve Referans Tarihi gereklidir {0}
@@ -676,8 +650,8 @@
 DocType: Event,Wednesday,Çarşamba
 DocType: Sales Invoice,Customer's Vendor,Müşterinin Satıcısı
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +214,Production Order is Mandatory,Üretim Sipariş Zorunlu olan
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +139,Proposal Writing,Teklifi Yazma
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +139,Proposal Writing,Teklifi Yazma
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,Proposal Writing,Teklifi Yazma
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,Proposal Writing,Teklifi Yazma
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,Başka Satış Kişi {0} aynı Çalışan kimliği ile var
 apps/erpnext/erpnext/stock/stock_ledger.py +336,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},Negatif Stok Hatası ({6}) Ürün {0} için {4} {5} de {2} {3} üzerindeki Depoda
 DocType: Fiscal Year Company,Fiscal Year Company,Mali Yıl Şirketi
@@ -706,8 +680,8 @@
 apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.py +179,Please install dropbox python module,Dropbox python modunu kurun
 DocType: Employee,Passport Number,Pasaport Numarası
 DocType: Employee,Passport Number,Pasaport Numarası
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +82,Manager,Yönetici
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +82,Manager,Yönetici
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Manager,Yönetici
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Manager,Yönetici
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +494,From Purchase Receipt,Satın Alma Makbuzundan
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +219,Same item has been entered multiple times.,Aynı madde birden çok kez girildi.
 DocType: SMS Settings,Receiver Parameter,Alıcı Parametre
@@ -716,11 +690,10 @@
 DocType: Sales Person,Sales Person Targets,Satış Personeli Hedefleri
 apps/frappe/frappe/public/js/frappe/form/workflow.js +116,To,Şu kişiye
 apps/frappe/frappe/templates/base.html +145,Please enter email address,Lütfen E-posta adresinizi girin
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +35,End tube forming,Oluşturan boru ucu
 DocType: Production Order Operation,In minutes,Dakika içinde
 DocType: Issue,Resolution Date,Karar Tarihi
 DocType: Issue,Resolution Date,Karar Tarihi
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +635,Please set default Cash or Bank account in Mode of Payment {0},{0} Ödeme şeklinde varsayılan nakit veya banka hesabı ayarlayınız
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +637,Please set default Cash or Bank account in Mode of Payment {0},{0} Ödeme şeklinde varsayılan nakit veya banka hesabı ayarlayınız
 DocType: Selling Settings,Customer Naming By,Adlandırılan Müşteri 
 apps/erpnext/erpnext/accounts/doctype/account/account.js +67,Convert to Group,Gruba Dönüştürmek
 DocType: Activity Cost,Activity Type,Faaliyet Türü
@@ -729,14 +702,14 @@
 DocType: Customer,Fixed Days,Sabit Günleri
 DocType: Sales Invoice,Packing List,Paket listesi
 apps/erpnext/erpnext/config/buying.py +28,Purchase Orders given to Suppliers.,Tedarikçilere verilen Satın alma Siparişleri.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +43,Publishing,Yayıncılık
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +43,Publishing,Yayıncılık
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +43,Publishing,Yayıncılık
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +43,Publishing,Yayıncılık
 DocType: Activity Cost,Projects User,Projeler Kullanıcı
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Consumed,Tüketilen
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +198,{0}: {1} not found in Invoice Details table,{0}: {1} Fatura Ayrıntıları tablosunda bulunamadı
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +198,{0}: {1} not found in Invoice Details table,{0}: {1} Fatura Ayrıntıları tablosunda bulunamadı
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,{0}: {1} not found in Invoice Details table,{0}: {1} Fatura Ayrıntıları tablosunda bulunamadı
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,{0}: {1} not found in Invoice Details table,{0}: {1} Fatura Ayrıntıları tablosunda bulunamadı
 DocType: Company,Round Off Cost Center,Maliyet Merkezi Kapalı Yuvarlak
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +208,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Bakım Ziyareti {0} bu Satış Emri iptal edilmeden önce iptal edilmelidir
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +203,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Bakım Ziyareti {0} bu Satış Emri iptal edilmeden önce iptal edilmelidir
 DocType: Material Request,Material Transfer,Materyal Transfer
 DocType: Material Request,Material Transfer,Materyal Transfer
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +56,Opening (Dr),Açılış (Dr)
@@ -751,7 +724,6 @@
 DocType: Pricing Rule,Sales Manager,Satış Müdürü
 apps/frappe/frappe/public/js/frappe/model/model.js +492,Rename,Yeniden adlandır
 DocType: Journal Entry,Write Off Amount,Borç Silme Miktarı
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +52,Bending,Bükme
 apps/frappe/frappe/core/page/user_permissions/user_permissions.js +246,Allow User,Kullanıcı izni
 DocType: Journal Entry,Bill No,Fatura No
 DocType: Journal Entry,Bill No,Fatura No
@@ -765,19 +737,18 @@
 DocType: Purchase Receipt,Other Details,Diğer Detaylar
 DocType: Account,Accounts,Hesaplar
 DocType: Account,Accounts,Hesaplar
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +67,Marketing,Pazarlama
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +67,Marketing,Pazarlama
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +65,Straight shearing,Düz kesme
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +67,Marketing,Pazarlama
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +67,Marketing,Pazarlama
 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.,Ürünleri seri numaralarına bağlı olarak alım ve satış belgelerinde izlemek için. Bu aynı zamanda ürünün garanti ayarları için de kullanılabilir.
 DocType: Purchase Receipt Item Supplied,Current Stock,Güncel Stok
 DocType: Purchase Receipt Item Supplied,Current Stock,Güncel Stok
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +99,Rejected Warehouse is mandatory against regected item,Reddedilen Depo reddedilen Ürün karşılığı zorunludur
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +102,Rejected Warehouse is mandatory against regected item,Reddedilen Depo reddedilen Ürün karşılığı zorunludur
 DocType: Account,Expenses Included In Valuation,Değerlemeye dahil giderler
 DocType: Employee,Provide email id registered in company,Şirkette kayıtlı e-posta adresini veriniz
 DocType: Hub Settings,Seller City,Satıcı Şehri
 DocType: Email Digest,Next email will be sent on:,Sonraki e-posta gönderilecek:
 DocType: Offer Letter Term,Offer Letter Term,Mektubu Dönem Teklif
-apps/erpnext/erpnext/stock/doctype/item/item.py +492,Item has variants.,Öğe varyantları vardır.
+apps/erpnext/erpnext/stock/doctype/item/item.py +496,Item has variants.,Öğe varyantları vardır.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Ürün {0} bulunamadı
 DocType: Bin,Stock Value,Stok Değeri
 DocType: Bin,Stock Value,Stok Değeri
@@ -790,11 +761,10 @@
 DocType: Sales Invoice,Commission Rate (%),Komisyon Oranı (%)
 DocType: Sales Invoice,Commission Rate (%),Komisyon Oranı (%)
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +172,"Against Voucher Type must be one of Sales Order, Sales Invoice or Journal Entry","Fiş karşı Tipi Satış Sipariş biri, Satış Faturası veya günlük girdisi olmalıdır"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +139,Biomachining,Biomachining
 apps/erpnext/erpnext/setup/utils.py +89,Unable to find exchange rate,Döviz kurunu bulunamıyor
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +7,Aerospace,Havacılık ve Uzay;
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +19,Welcome,Hoşgeldiniz
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +19,Welcome,Hoşgeldiniz
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +7,Aerospace,Havacılık ve Uzay;
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +40,Welcome,Hoşgeldiniz
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +40,Welcome,Hoşgeldiniz
 DocType: Journal Entry,Credit Card Entry,Kredi Kartı Girişi
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +18,Task Subject,Görev Konusu
 apps/erpnext/erpnext/config/stock.py +33,Goods received from Suppliers.,Tedarikçilerden alınan mallar.
@@ -823,8 +793,8 @@
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Kayıp
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Kayıp
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +120,You can not enter current voucher in 'Against Journal Entry' column,Sen sütununda 'Journal girişine karşı' geçerli fiş giremezsiniz
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +25,Energy,Enerji
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +25,Energy,Enerji
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,Enerji
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,Enerji
 DocType: Opportunity,Opportunity From,Fırsattan itibaren
 apps/erpnext/erpnext/config/hr.py +33,Monthly salary statement.,Aylık maaş beyanı.
 apps/erpnext/erpnext/config/hr.py +33,Monthly salary statement.,Aylık maaş beyanı.
@@ -832,7 +802,7 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +205,New Account,Yeni Hesap
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +205,New Account,Yeni Hesap
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +21,{0}: From {0} of type {1},{0}: gönderen {0} çeşidi {1}
-apps/erpnext/erpnext/controllers/buying_controller.py +283,Row {0}: Conversion Factor is mandatory,Satır {0}: Dönüşüm katsayısı zorunludur
+apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,Satır {0}: Dönüşüm katsayısı zorunludur
 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.,Muhasebe Girişler yaprak düğümleri karşı yapılabilir. Gruplar karşı Girişler izin verilmez.
 DocType: ToDo,High,Yüksek
 DocType: ToDo,High,Yüksek
@@ -841,7 +811,7 @@
 DocType: Opportunity,Maintenance,Bakım
 DocType: User,Male,Erkek
 DocType: User,Male,Erkek
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +182,Purchase Receipt number required for Item {0},Ürün {0} için gerekli Satın alma makbuzu numarası
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +183,Purchase Receipt number required for Item {0},Ürün {0} için gerekli Satın alma makbuzu numarası
 DocType: Item Attribute Value,Item Attribute Value,Ürün Özellik Değeri
 apps/erpnext/erpnext/config/crm.py +64,Sales campaigns.,Satış kampanyaları.
 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.
@@ -891,11 +861,10 @@
 DocType: Address,Personal,Kişisel
 DocType: Expense Claim Detail,Expense Claim Type,Gideri Talebi Türü
 DocType: Shopping Cart Settings,Default settings for Shopping Cart,Alışveriş Sepeti Varsayılan ayarları
-apps/erpnext/erpnext/controllers/accounts_controller.py +324,"Journal Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Günlük girdisi {0} bu faturada avans olarak çekilmiş olmalıdır eğer {1}, kontrol Sipariş karşı bağlantılıdır."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +13,Biotechnology,Biyoteknoloji
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +13,Biotechnology,Biyoteknoloji
+apps/erpnext/erpnext/controllers/accounts_controller.py +325,"Journal Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Günlük girdisi {0} bu faturada avans olarak çekilmiş olmalıdır eğer {1}, kontrol Sipariş karşı bağlantılıdır."
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +13,Biotechnology,Biyoteknoloji
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +13,Biotechnology,Biyoteknoloji
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Office Maintenance Expenses,Ofis Bakım Giderleri
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +53,Hemming,Hemming
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +66,Please enter Item first,Ürün Kodu girin
 DocType: Account,Liability,Borç
 DocType: Account,Liability,Borç
@@ -911,11 +880,11 @@
 DocType: Company,Default Bank Account,Varsayılan Banka Hesabı
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +47,"To filter based on Party, select Party Type first",Parti dayalı filtrelemek için seçin Parti ilk yazınız
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0}, 'Stok Güncelle' seçilemez çünkü ürünler {0} ile teslim edilmemiş.
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Nos,Numaralar
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Nos,Numaralar
 DocType: Item,Items with higher weightage will be shown higher,Yüksek weightage Öğeler yüksek gösterilir
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Banka Uzlaşma Detay
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Banka Uzlaşma Detay
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +627,My Invoices,Benim Faturalar
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +629,My Invoices,Benim Faturalar
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,Çalışan bulunmadı
 DocType: Purchase Order,Stopped,Durduruldu
 DocType: Purchase Order,Stopped,Durduruldu
@@ -937,7 +906,7 @@
 DocType: Features Setup,"To enable ""Point of Sale"" features",&quot;Point of Sale&quot; özellikleri etkinleştirmek için
 DocType: Bin,Moving Average Rate,Hareketli Ortalama Kuru
 DocType: Production Planning Tool,Select Items,Ürünleri Seçin
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,{0} against Bill {1} dated {2},{0} Bill karşı {1} tarihli {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +328,{0} against Bill {1} dated {2},{0} Bill karşı {1} tarihli {2}
 DocType: Comment,Reference Name,Referans Adı
 DocType: Comment,Reference Name,Referans Adı
 DocType: Maintenance Visit,Completion Status,Tamamlanma Durumu
@@ -946,20 +915,19 @@
 DocType: Item,Allow over delivery or receipt upto this percent,Bu kadar yüzde teslimatı veya makbuz üzerinde izin ver
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +49,Expected Delivery Date cannot be before Sales Order Date,Beklenen Teslim Tarihi satış siparişi tarihinden önce olamaz
 DocType: Upload Attendance,Import Attendance,İthalat Katılımı 
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +17,All Item Groups,Bütün Ürün Grupları
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +17,All Item Groups,Bütün Ürün Grupları
 DocType: Process Payroll,Activity Log,Etkinlik Günlüğü
 DocType: Process Payroll,Activity Log,Etkinlik Günlüğü
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +30,Net Profit / Loss,Net Kar / Zarar
 apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,İşlemlerin sunulmasında otomatik olarak mesaj oluştur.
 DocType: Production Order,Item To Manufacture,Üretilecek Ürün
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +16,Permanent mold casting,Kalıcı kalıba döküm
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} durum {2} olduğu
 apps/erpnext/erpnext/config/learn.py +172,Purchase Order to Payment,Ödeme Satınalma Siparişi
 DocType: Sales Order Item,Projected Qty,Öngörülen Tutar
 DocType: Sales Invoice,Payment Due Date,Son Ödeme Tarihi
 DocType: Sales Invoice,Payment Due Date,Son Ödeme Tarihi
 DocType: Newsletter,Newsletter Manager,Bülten Müdürü
-apps/erpnext/erpnext/stock/doctype/item/item.js +229,Item Variant {0} already exists with same attributes,Öğe Variant {0} zaten aynı özelliklere sahip bulunmaktadır
+apps/erpnext/erpnext/stock/doctype/item/item.js +231,Item Variant {0} already exists with same attributes,Öğe Variant {0} zaten aynı özelliklere sahip bulunmaktadır
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening',&#39;Açılış&#39;
 DocType: Notification Control,Delivery Note Message,İrsaliye Mesajı
 DocType: Expense Claim,Expenses,Giderler
@@ -967,12 +935,11 @@
 DocType: Item Variant Attribute,Item Variant Attribute,Öğe Varyant Özellik
 ,Purchase Receipt Trends,Satın alma makbuzu eğilimleri
 DocType: Appraisal,Select template from which you want to get the Goals,Hedefleri almak istediğiniz şablonu seçiniz
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +77,Research & Development,Araştırma ve Geliştirme
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +77,Research & Development,Araştırma ve Geliştirme
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Research & Development,Araştırma ve Geliştirme
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Research & Development,Araştırma ve Geliştirme
 ,Amount to Bill,Faturalanacak Tutar
 DocType: Company,Registration Details,Kayıt Detayları
 DocType: Company,Registration Details,Kayıt Detayları
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +75,Staking,Esnetme
 DocType: Item,Re-Order Qty,Yeniden sipariş Adet
 DocType: Leave Block List Date,Leave Block List Date,İzin engel listesi tarihi
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +25,Scheduled to send to {0},Programlandı ve şuna gönderildi {0}
@@ -986,12 +953,10 @@
 DocType: Sales Invoice Item,Stock Details,Stok Detayları
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Proje Bedeli
 apps/erpnext/erpnext/config/selling.py +304,Point-of-Sale,Satış Noktası
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,Cannot carry forward {0},Ileriye taşıyamaz {0}
 apps/erpnext/erpnext/accounts/doctype/account/account.py +91,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'",Bakiye alacaklı durumdaysa borçlu duruma çevrilemez.
 DocType: Account,Balance must be,Bakiye şu olmalıdır
 DocType: Hub Settings,Publish Pricing,Fiyatlandırma Yayınla
 DocType: Notification Control,Expense Claim Rejected Message,Gider Talebi Reddedildi Mesajı
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +145,Nailing,Çivisi
 ,Available Qty,Mevcut Adet
 DocType: Purchase Taxes and Charges,On Previous Row Total,Önceki satır toplamı
 DocType: Salary Slip,Working Days,Çalışma Günleri
@@ -999,7 +964,7 @@
 DocType: Serial No,Incoming Rate,Gelen Oranı
 DocType: Packing Slip,Gross Weight,Brüt Ağırlık
 DocType: Packing Slip,Gross Weight,Brüt Ağırlık
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +410,The name of your company for which you are setting up this system.,Bu sistemi kurduğunu şirketinizin adı
+apps/erpnext/erpnext/public/js/setup_wizard.js +158,The name of your company for which you are setting up this system.,Bu sistemi kurduğunu şirketinizin adı
 DocType: HR Settings,Include holidays in Total no. of Working Days,Çalışma günlerinin toplam sayısı ile tatilleri dahil edin
 DocType: Job Applicant,Hold,Muhafaza et
 DocType: Employee,Date of Joining,Katılma Tarihi
@@ -1010,7 +975,6 @@
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +3,View Subscribers,Aboneleri Göster
 DocType: Purchase Invoice Item,Purchase Receipt,Satın Alma makbuzu
 ,Received Items To Be Billed,Faturalanacak  Alınan Malzemeler
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +114,Abrasive blasting,Raspa
 DocType: Employee,Ms,Bayan
 DocType: Employee,Ms,Bayan
 apps/erpnext/erpnext/config/accounts.py +148,Currency exchange rate master.,Ana Döviz Kuru.
@@ -1024,7 +988,7 @@
 DocType: Purchase Receipt Item Supplied,Required Qty,Gerekli Adet
 DocType: Bank Reconciliation,Total Amount,Toplam Tutar
 DocType: Bank Reconciliation,Total Amount,Toplam Tutar
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +32,Internet Publishing,İnternet Yayıncılığı
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,İnternet Yayıncılığı
 DocType: Production Planning Tool,Production Orders,Üretim Siparişleri
 DocType: Production Planning Tool,Production Orders,Üretim Siparişleri
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +35,Balance Value,Denge Değeri
@@ -1038,7 +1002,7 @@
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,Çalışan {0} aktif değil veya yok.
 DocType: Features Setup,Item Barcode,Ürün Barkodu
 DocType: Features Setup,Item Barcode,Ürün Barkodu
-apps/erpnext/erpnext/stock/doctype/item/item.py +487,Item Variants {0} updated,Öğe Türevleri {0} güncellendi
+apps/erpnext/erpnext/stock/doctype/item/item.py +491,Item Variants {0} updated,Öğe Türevleri {0} güncellendi
 DocType: Quality Inspection Reading,Reading 6,6 Okuma
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Fatura peşin alım
 DocType: Address,Shop,Mağaza
@@ -1048,7 +1012,7 @@
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,Bu mod seçildiğinde Varsayılan Banka / Kasa hesabı otomatik olarak POS Faturada güncellenecektir.
 DocType: Employee,Permanent Address Is,Kalıcı Adres
 DocType: Production Order Operation,Operation completed for how many finished goods?,Operasyon kaç mamul tamamlandı?
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +491,The Brand,Marka
+apps/erpnext/erpnext/public/js/setup_wizard.js +237,The Brand,Marka
 apps/erpnext/erpnext/controllers/status_updater.py +163,Allowance for over-{0} crossed for Item {1}.,{1} den fazla Ürün için {0} üzerinde ödenek
 DocType: Employee,Exit Interview Details,Çıkış Görüşmesi Detayları
 DocType: Item,Is Purchase Item,Satın Alma Maddesi 
@@ -1073,19 +1037,19 @@
 DocType: Payment Tool,Set Payment Amount = Outstanding Amount,Set Ödeme Tutarı = Üstün Tutar
 DocType: Contact Us Settings,Address Line 1,Adres Satırı 1
 DocType: Contact Us Settings,Address Line 1,Adres Satırı 1
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Variance,Varyans
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +392,Company Name,Firma Adı
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +392,Company Name,Firma Adı
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +53,Variance,Varyans
+,Company Name,Firma Adı
+,Company Name,Firma Adı
 DocType: SMS Center,Total Message(s),Toplam Mesaj (lar)
 DocType: SMS Center,Total Message(s),Toplam Mesaj (lar)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +515,Select Item for Transfer,Transferi için seçin Öğe
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +538,Select Item for Transfer,Transferi için seçin Öğe
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,Tüm yardım videoların bir listesini görüntüleyin
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,Çekin yatırıldığı bankadaki hesap başlığını seçiniz
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,Kullanıcıya işlemlerdeki Fiyat Listesi Oranını düzenlemek için izin ver
 DocType: Pricing Rule,Max Qty,En fazla miktar
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +106,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Satır {0}: Satış / Satınalma Siparişi karşı Ödeme hep avans olarak işaretlenmiş olmalıdır
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +16,Chemical,Kimyasal
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +16,Chemical,Kimyasal
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,Kimyasal
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,Kimyasal
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +693,All items have already been transferred for this Production Order.,Tüm öğeler zaten bu üretim Sipariş devredilmiştir.
 DocType: Process Payroll,Select Payroll Year and Month,Bordro Yılı ve Ay Seçiniz
 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""",Uygun bir grup (genellikle Fonların Uygulama&gt; Dönen Varlıklar&gt; Banka Hesapları gidin ve Çeşidi) Çocuk ekle üzerine tıklayarak (yeni Hesabı oluşturmak &quot;Banka&quot;
@@ -1097,12 +1061,12 @@
 DocType: Item,Inspection Criteria,Muayene Kriterleri
 apps/erpnext/erpnext/config/accounts.py +101,Tree of finanial Cost Centers.,Finansal Maliyet Merkezleri Ağacı
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,Aktarılan
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +492,Upload your letter head and logo. (you can edit them later).,Mektup baş ve logosu yükleyin. (Daha sonra bunları düzenleyebilirsiniz).
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +156,White,Beyaz
+apps/erpnext/erpnext/public/js/setup_wizard.js +238,Upload your letter head and logo. (you can edit them later).,Mektup baş ve logosu yükleyin. (Daha sonra bunları düzenleyebilirsiniz).
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,White,Beyaz
 DocType: SMS Center,All Lead (Open),Bütün Başlıklar (Açık)
 DocType: Purchase Invoice,Get Advances Paid,Avansları Öde
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +362,Attach Your Picture,Resminizi Ekleyin
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Make ,Yapmak
+apps/erpnext/erpnext/public/js/setup_wizard.js +112,Attach Your Picture,Resminizi Ekleyin
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +540,Make ,Yapmak
 DocType: Journal Entry,Total Amount in Words,Sözlü Toplam Tutar
 DocType: Workflow State,Stop,dur
 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.,Hata oluştu. Bunun sebebi formu kaydetmemeniz olabilir. Sorun devam ederse support@erpnext.com adresi ile iltişime geçiniz
@@ -1112,7 +1076,7 @@
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,Açılış Miktarı
 DocType: Holiday List,Holiday List Name,Tatil Listesi Adı
 DocType: Holiday List,Holiday List Name,Tatil Listesi Adı
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +168,Stock Options,Stok Seçenekleri
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +168,Stock Options,Stok Seçenekleri
 DocType: Journal Entry Account,Expense Claim,Gider Talebi
 DocType: Journal Entry Account,Expense Claim,Gider Talebi
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +181,Qty for {0},Için Adet {0}
@@ -1120,7 +1084,6 @@
 apps/erpnext/erpnext/config/hr.py +77,Leave Allocation Tool,İzin Tahsis Aracı
 DocType: Leave Block List,Leave Block List Dates,İzin engel listesi tarihleri
 DocType: Company,If Monthly Budget Exceeded (for expense account),Aylık Bütçe (gider hesabı için) aşıldı ise
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +56,Trimming,Süsleme
 DocType: Workstation,Net Hour Rate,Net Saat Hızı
 DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,İnen Maliyet Alım Makbuzu
 DocType: Company,Default Terms,Standart Şartları
@@ -1129,11 +1092,10 @@
 DocType: POS Profile,Cash/Bank Account,Kasa / Banka Hesabı
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,Removed items with no change in quantity or value.,Miktar veya değer hiçbir değişiklik ile kaldırıldı öğeler.
 DocType: Delivery Note,Delivery To,Teslim
-apps/erpnext/erpnext/stock/doctype/item/item.py +509,Attribute table is mandatory,Özellik tablosu zorunludur
+apps/erpnext/erpnext/stock/doctype/item/item.py +513,Attribute table is mandatory,Özellik tablosu zorunludur
 DocType: Production Planning Tool,Get Sales Orders,Satış Şiparişlerini alın
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} negatif olamaz
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} negatif olamaz
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +103,Filing,Dosyalama
 apps/erpnext/erpnext/templates/form_grid/item_grid.html +72,Discount,Indirim
 DocType: Features Setup,Purchase Discounts,Satın Alma indirimleri
 DocType: Workstation,Wages,Ücret
@@ -1151,6 +1113,7 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +112,You are the Expense Approver for this record. Please Update the 'Status' and Save,Bu Kayıt için Gider Onaylayıcısınız. Lütfen 'durumu' güncelleyip kaydedin.
 DocType: Serial No,Creation Document No,Oluşturulan Belge Tarihi
 DocType: Issue,Issue,Sayı
+apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account does not match with Company,Hesap firması ile eşleşmiyor
 apps/erpnext/erpnext/config/stock.py +136,"Attributes for Item Variants. e.g Size, Color etc.","Öğe Variantların için bağlıyor. Örneğin Boyut, Renk vb"
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +39,WIP Warehouse,WIP Depo
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +194,Serial No {0} is under maintenance contract upto {1},Seri No {0} Bakım sözleşmesi {1} uyarınca bakımda
@@ -1161,8 +1124,8 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,Ürün düğmesi 'satın alma makbuzlarını Öğeleri alın' kullanılarak eklenmelidir
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,Satış Giderleri
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,Satış Giderleri
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Buying,Standart Satın Alma
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Buying,Standart Satın Alma
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +120,Standard Buying,Standart Satın Alma
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +120,Standard Buying,Standart Satın Alma
 DocType: GL Entry,Against,Karşı
 DocType: Item,Default Selling Cost Center,Standart Satış Maliyet Merkezi
 DocType: Item,Default Selling Cost Center,Standart Satış Maliyet Merkezi
@@ -1187,31 +1150,31 @@
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,Ortalama Yaş
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,Ortalama Yaş
 DocType: Opportunity,Your sales person who will contact the customer in future,Müşteriyle ileride irtibat kuracak satış kişiniz
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +588,List a few of your suppliers. They could be organizations or individuals.,Tedarikçilerinizin birkaçını listeleyin. Bunlar kuruluşlar veya bireyler olabilir.
+apps/erpnext/erpnext/public/js/setup_wizard.js +326,List a few of your suppliers. They could be organizations or individuals.,Tedarikçilerinizin birkaçını listeleyin. Bunlar kuruluşlar veya bireyler olabilir.
 DocType: Company,Default Currency,Varsayılan Para Birimi
 DocType: Contact,Enter designation of this Contact,Bu irtibatın görevini girin
 DocType: Contact Us Settings,Address,Adres
 DocType: Expense Claim,From Employee,Çalışanlardan
-apps/erpnext/erpnext/controllers/accounts_controller.py +338,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Uyarı: {1} deki {0} ürünü miktarı sıfır olduğu için sistem fazla faturalamayı kontrol etmeyecektir
+apps/erpnext/erpnext/controllers/accounts_controller.py +339,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Uyarı: {1} deki {0} ürünü miktarı sıfır olduğu için sistem fazla faturalamayı kontrol etmeyecektir
 DocType: Journal Entry,Make Difference Entry,Fark Girişi yapın
 DocType: Upload Attendance,Attendance From Date,Tarihten itibaren katılım
 DocType: Appraisal Template Goal,Key Performance Area,Kilit Performans Alanı
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +54,Transportation,Taşıma
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +54,Transportation,Taşıma
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +54,Transportation,Taşıma
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +54,Transportation,Taşıma
 apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +67, and year: ,ve yıl
 DocType: Email Digest,Annual Expense,Yıllık Gider
 DocType: SMS Center,Total Characters,Toplam Karakterler
 DocType: SMS Center,Total Characters,Toplam Karakterler
-apps/erpnext/erpnext/controllers/buying_controller.py +139,Please select BOM in BOM field for Item {0},Ürün için BOM BOM alanında seçiniz {0}
+apps/erpnext/erpnext/controllers/buying_controller.py +130,Please select BOM in BOM field for Item {0},Ürün için BOM BOM alanında seçiniz {0}
 DocType: C-Form Invoice Detail,C-Form Invoice Detail,C-Form Fatura Ayrıntısı
 DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,Ödeme Mutabakat Faturası
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +32,Contribution %,Katkı%
 DocType: Item,website page link,web sayfa linki
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +192,Let's prepare the system for first use.,Ilk kullanım için sistemi hazırlamak edelim.
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +242,Let's prepare the system for first use.,Ilk kullanım için sistemi hazırlamak edelim.
 DocType: Company,Company registration numbers for your reference. Tax numbers etc.,Referans için şirket kayıt numaraları. Vergi numaraları vb
 DocType: Sales Partner,Distributor,Dağıtımcı
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Alışveriş Sepeti Nakliye Kural
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +214,Production Order {0} must be cancelled before cancelling this Sales Order,Üretim Siparişi {0} bu Satış Siparişi iptal edilmeden önce iptal edilmelidir
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +209,Production Order {0} must be cancelled before cancelling this Sales Order,Üretim Siparişi {0} bu Satış Siparişi iptal edilmeden önce iptal edilmelidir
 ,Ordered Items To Be Billed,Faturalanacak Sipariş Edilen Ürünler
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +24,From Range has to be less than To Range,Menzil az olmak zorundadır Kimden daha Range için
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +21,Select Time Logs and Submit to create a new Sales Invoice.,Günlükleri seçin ve yeni Satış Faturası oluşturmak için teslim edin.
@@ -1235,16 +1198,15 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +398,Nothing to request,Talep edecek bir şey yok
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date',"'Fiili Başlangıç ​​Tarihi', 'Fiili Bitiş Tarihi' den büyük olamaz"
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date',"'Fiili Başlangıç ​​Tarihi', 'Fiili Bitiş Tarihi' den büyük olamaz"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +75,Management,Yönetim
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +75,Management,Yönetim
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +75,Management,Yönetim
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +75,Management,Yönetim
 apps/erpnext/erpnext/config/projects.py +33,Types of activities for Time Sheets,Zaman Cetveli için faaliyet türleri
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +14,Investment casting,Yatırım döküm
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +51,Either debit or credit amount is required for {0},{0} için borç ya da kredi hesabı gereklidir
 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""","Bu varyant Ürün Kodu eklenecektir. Senin kısaltması ""SM"", ve eğer, örneğin, ürün kodu ""T-Shirt"", ""T-Shirt-SM"" olacak varyantın madde kodu"
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,Net Ödeme (sözlü) Maaş Makbuzunu kaydettiğinizde görünecektir
 apps/frappe/frappe/core/doctype/user/user_list.js +12,Active,Etkin
 apps/frappe/frappe/core/doctype/user/user_list.js +12,Active,Etkin
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +154,Blue,Mavi
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +154,Blue,Mavi
 DocType: Purchase Invoice,Is Return,İade mi
 DocType: Price List Country,Price List Country,Fiyat Listesi Ülke
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +123,Further nodes can be only created under 'Group' type nodes,Ek kısımlar ancak 'Grup' tipi kısımlar altında oluşturulabilir
@@ -1255,12 +1217,10 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +22,POS Profile {0} already created for user: {1} and company {2},POS Profili {0} zaten kullanıcı için oluşturulan: {1} ve şirket {2}
 DocType: Purchase Order Item,UOM Conversion Factor,UOM Dönüşüm Katsayısı
 DocType: Stock Settings,Default Item Group,Standart Ürün Grubu
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +156,Laminated object manufacturing,Lamine nesne imalatı
 apps/erpnext/erpnext/config/buying.py +13,Supplier database.,Tedarikçi Veritabanı.
 DocType: Account,Balance Sheet,Bilanço
 DocType: Account,Balance Sheet,Bilanço
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +561,Cost Center For Item with Item Code ','Ürün Kodu Ürün için Merkezi'ni Maliyet
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +45,Stretch forming,Oluşturucu Streç
 DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,Satış kişiniz bu tarihte müşteriyle irtibata geçmek için bir hatırlama alacaktır
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +210,"Further accounts can be made under Groups, but entries can be made against non-Groups","Ek hesaplar Gruplar altında yapılabilir, ancak girişler olmayan Gruplar karşı yapılabilir"
 apps/erpnext/erpnext/config/hr.py +125,Tax and other salary deductions.,Vergi ve diğer Maaş kesintileri.
@@ -1269,7 +1229,7 @@
 DocType: Email Digest,Payables,Borçlar
 DocType: Account,Warehouse,Depo
 DocType: Account,Warehouse,Depo
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +90,Row #{0}: Rejected Qty can not be entered in Purchase Return,Satır # {0}: Miktar Satınalma Return girilemez Reddedildi
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +93,Row #{0}: Rejected Qty can not be entered in Purchase Return,Satır # {0}: Miktar Satınalma Return girilemez Reddedildi
 ,Purchase Order Items To Be Billed,Faturalanacak Satınalma Siparişi Kalemleri
 DocType: Purchase Invoice Item,Net Rate,Net Hızı
 DocType: Purchase Invoice Item,Purchase Invoice Item,Satın alma Faturası Ürünleri
@@ -1289,7 +1249,7 @@
 DocType: Global Defaults,Disable Rounded Total,Yuvarlak toplam devre dışı
 DocType: Global Defaults,Disable Rounded Total,Yuvarlak toplam devre dışı
 DocType: Lead,Call,Çağrı
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +384,'Entries' cannot be empty,'Girdiler' boş olamaz
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +386,'Entries' cannot be empty,'Girdiler' boş olamaz
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},Satır {0} ı  {1} ile aynı biçimde kopyala
 ,Trial Balance,Mizan
 ,Trial Balance,Mizan
@@ -1297,8 +1257,8 @@
 apps/erpnext/erpnext/public/js/feature_setup.js +220,"Grid ""","Izgara """
 apps/erpnext/erpnext/public/js/feature_setup.js +220,"Grid ""","Izgara """
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +150,Please select prefix first,Önce Ön ek seçiniz
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +138,Research,Araştırma
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +138,Research,Araştırma
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +138,Research,Araştırma
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +138,Research,Araştırma
 DocType: Maintenance Visit Purpose,Work Done,Yapılan İş
 apps/erpnext/erpnext/controllers/item_variant.py +25,Please specify at least one attribute in the Attributes table,Nitelikler masada en az bir özellik belirtin
 DocType: Contact,User ID,Kullanıcı Kimliği
@@ -1308,10 +1268,10 @@
 DocType: File,Lft,Lft
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,En erken
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,En erken
-apps/erpnext/erpnext/stock/doctype/item/item.py +394,"An Item Group exists with same name, please change the item name or rename the item group","Bir Ürün grubu aynı isimle bulunuyorsa, lütfen Ürün veya Ürün grubu adını değiştirin"
+apps/erpnext/erpnext/stock/doctype/item/item.py +398,"An Item Group exists with same name, please change the item name or rename the item group","Bir Ürün grubu aynı isimle bulunuyorsa, lütfen Ürün veya Ürün grubu adını değiştirin"
 DocType: Communication,Delivery Status,Teslim Durumu
 DocType: Production Order,Manufacture against Sales Order,Satış Emrine Karşı Üretim
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +517,Rest Of The World,Dünyanın geri kalanı
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +455,Rest Of The World,Dünyanın geri kalanı
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,Öğe {0} Toplu olamaz
 ,Budget Variance Report,Bütçe Fark Raporu
 DocType: Salary Slip,Gross Pay,Brüt Ödeme
@@ -1322,13 +1282,11 @@
 DocType: BOM Item,Item Description,Ürün Tanımı
 DocType: Payment Tool,Payment Mode,Ödeme Modu
 DocType: Purchase Invoice,Is Recurring,Dönüşümlü mı
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +154,Direct metal laser sintering,Doğrudan metal lazer sinterleme
 DocType: Purchase Order,Supplied Items,Verilen Öğeler
 DocType: Production Order,Qty To Manufacture,Üretilecek Miktar
 DocType: Buying Settings,Maintain same rate throughout purchase cycle,Alım döngüsü boyunca aynı oranı koruyun
 DocType: Opportunity Item,Opportunity Item,Fırsat Ürünü
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +61,Temporary Opening,Geçici Açma
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +41,Cryorolling,Cryorolling
 ,Employee Leave Balance,Çalışanın Kalan İzni
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +128,Balance for Account {0} must always be {1},Hesap {0} her zaman dengede olmalı {1}
 DocType: Address,Address Type,Adres Tipi
@@ -1346,27 +1304,27 @@
 DocType: Journal Entry,Get Outstanding Invoices,Bekleyen Faturaları alın
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,Satış Sipariş {0} geçerli değildir
 apps/erpnext/erpnext/setup/doctype/company/company.py +172,"Sorry, companies cannot be merged","Üzgünüz, şirketler birleştirilemiyor"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +145,Small,Küçük
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Small,Küçük
 DocType: Employee,Employee Number,Çalışan sayısı
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},Konu Numarası/numaraları zaten kullanımda. Konu No {0} olarak deneyin.
 ,Invoiced Amount (Exculsive Tax),Faturalanan Tutar (Vergi Hariç)
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,Madde 2
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +59,Account head {0} created,Hesap başlığı {0} oluşturuldu
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +153,Green,Yeşil
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Green,Yeşil
 DocType: Item,Auto re-order,Otomatik yeniden sipariş
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +57,Total Achieved,Toplam Elde
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +59,Total Achieved,Toplam Elde
 DocType: Employee,Place of Issue,Verildiği yer
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +59,Contract,Sözleşme
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +59,Contract,Sözleşme
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Contract,Sözleşme
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Contract,Sözleşme
 DocType: Report,Disabled,Devredışı
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +490,UOM coversion factor required for UOM: {0} in Item: {1},Ürün {1} de UOM: {0} için UOM dönüştürme katsayısı gereklidir.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +83,Indirect Expenses,Dolaylı Giderler
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +83,Indirect Expenses,Dolaylı Giderler
 apps/erpnext/erpnext/controllers/selling_controller.py +163,Row {0}: Qty is mandatory,Satır {0}: Miktar zorunludur
 apps/erpnext/erpnext/controllers/selling_controller.py +163,Row {0}: Qty is mandatory,Satır {0}: Miktar zorunludur
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +8,Agriculture,Tarım
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +8,Agriculture,Tarım
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +611,Your Products or Services,Ürünleriniz veya hizmetleriniz
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,Tarım
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,Tarım
+apps/erpnext/erpnext/public/js/setup_wizard.js +347,Your Products or Services,Ürünleriniz veya hizmetleriniz
 DocType: Mode of Payment,Mode of Payment,Ödeme Şekli
 DocType: Mode of Payment,Mode of Payment,Ödeme Şekli
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,Bu bir kök Ürün grubudur ve düzenlenemez.
@@ -1382,7 +1340,7 @@
 DocType: Purchase Invoice Item,Item Tax Rate,Ürün Vergi Oranı
 DocType: Purchase Invoice Item,Item Tax Rate,Ürün Vergi Oranı
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +113,"For {0}, only credit accounts can be linked against another debit entry","{0}, sadece kredi hesapları başka bir ödeme girişine karşı bağlantılı olabilir için"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Delivery Note {0} is not submitted,İrsaliye {0} teslim edilmedi
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +470,Delivery Note {0} is not submitted,İrsaliye {0} teslim edilmedi
 apps/erpnext/erpnext/stock/get_item_details.py +136,Item {0} must be a Sub-contracted Item,Ürün {0} bir taşeron ürünü olmalıdır
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,Sermaye Ekipmanları
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,Sermaye Ekipmanları
@@ -1396,7 +1354,7 @@
 DocType: Appraisal Goal,Goal,Hedef
 DocType: Sales Invoice Item,Edit Description,Edit Açıklama
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +318,Expected Delivery Date is lesser than Planned Start Date.,Beklenen Teslim Tarihi Planlanan Başlama Tarihi daha az olduğunu.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +579,For Supplier,Tedarikçi İçin
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +602,For Supplier,Tedarikçi İçin
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,Hesap Türünü ayarlamak işlemlerde bu hesabı seçeren yardımcı olur
 DocType: Purchase Invoice,Grand Total (Company Currency),Genel Toplam (Şirket para birimi)
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,Toplam Giden
@@ -1428,13 +1386,13 @@
 DocType: Purchase Invoice,Taxes and Charges Calculation,Vergiler ve Ücretleri Hesaplama
 DocType: BOM Operation,Workstation,İş İstasyonu
 DocType: BOM Operation,Workstation,İş İstasyonu
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +112,Hardware,Donanım
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +112,Hardware,Donanım
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +112,Hardware,Donanım
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +112,Hardware,Donanım
 DocType: Attendance,HR Manager,İK Yöneticisi
 DocType: Attendance,HR Manager,İK Yöneticisi
 apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,Bir Şirket seçiniz
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +50,Privilege Leave,Privilege bırak
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +50,Privilege Leave,Privilege bırak
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +50,Privilege Leave,Privilege bırak
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +50,Privilege Leave,Privilege bırak
 DocType: Purchase Invoice,Supplier Invoice Date,Tedarikçi Fatura Tarihi
 DocType: Purchase Invoice,Supplier Invoice Date,Tedarikçi Fatura Tarihi
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +79,You need to enable Shopping Cart,Sen Alışveriş Sepeti etkinleştirmeniz gerekir
@@ -1448,8 +1406,8 @@
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +81,Overlapping conditions found between:,Şunların arasında çakışan koşullar bulundu:
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +168,Against Journal Entry {0} is already adjusted against some other voucher,Journal Karşı giriş {0} zaten başka çeki karşı ayarlanır
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +68,Total Order Value,Toplam Sipariş Miktarı
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +38,Food,Yiyecek Grupları
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +38,Food,Yiyecek Grupları
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +38,Food,Yiyecek Grupları
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +38,Food,Yiyecek Grupları
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Yaşlanma Aralığı 3
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +139,You can make a time log only against a submitted production order,Sadece bir gönderilen üretim düzenine karşı bir süre kayıtlarını yapabilir
 DocType: Maintenance Schedule Item,No of Visits,Ziyaret sayısı
@@ -1473,6 +1431,7 @@
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,View Offer Letter,Teklif Mektubunu Göster
 DocType: Communication,Communication,Iletişim becerisi
 DocType: Item,Is Service Item,Hizmet Maddesi
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +81,Application period cannot be outside leave allocation period,Uygulama süresi dışında izin tahsisi dönemi olamaz
 DocType: Activity Cost,Projects,Projeler
 DocType: Activity Cost,Projects,Projeler
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +31,Please select Fiscal Year,Mali Yıl seçiniz
@@ -1499,7 +1458,7 @@
 DocType: Item,Maintain Stock,Stok koruyun
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +213,Stock Entries already created for Production Order ,Zaten Üretim Siparişi için oluşturulan Stok Girişler
 DocType: Leave Control Panel,Leave blank if considered for all designations,Tüm tanımları için kabul ise boş bırakın
-apps/erpnext/erpnext/controllers/accounts_controller.py +499,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Satır {0}'daki 'Gerçek' ücret biçimi Ürün Br.Fiyatına dahil edilemez
+apps/erpnext/erpnext/controllers/accounts_controller.py +500,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Satır {0}'daki 'Gerçek' ücret biçimi Ürün Br.Fiyatına dahil edilemez
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,Max: {0},Max: {0}
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +16,From Datetime,DateTime Gönderen
 DocType: Email Digest,For Company,Şirket için
@@ -1511,7 +1470,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +50,Chart of Accounts,Hesap Tablosu
 DocType: Material Request,Terms and Conditions Content,Şartlar ve Koşullar İçeriği
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +471,cannot be greater than 100,100 'den daha büyük olamaz
-apps/erpnext/erpnext/stock/doctype/item/item.py +546,Item {0} is not a stock Item,Ürün {0} bir stok ürünü değildir
+apps/erpnext/erpnext/stock/doctype/item/item.py +550,Item {0} is not a stock Item,Ürün {0} bir stok ürünü değildir
 DocType: Maintenance Visit,Unscheduled,Plânlanmamış
 DocType: Employee,Owned,Hisseli
 DocType: Salary Slip Deduction,Depends on Leave Without Pay,Pay olmadan İzni bağlıdır
@@ -1529,36 +1488,34 @@
 ,Batch-Wise Balance History,Parti-Bilgi Bakiye Geçmişi
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +72,To Do List,Yapılacaklar Listesi
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +72,To Do List,Yapılacaklar Listesi
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +63,Apprentice,Çırak
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +63,Apprentice,Çırak
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Apprentice,Çırak
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Apprentice,Çırak
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +99,Negative Quantity is not allowed,Negatif Miktara izin verilmez
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
 Used for Taxes and Charges","Bir dize olarak madde ustadan getirilen ve bu alanda depolanan vergi detay tablo.
  Vergi ve Ücretleri için kullanılır"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +61,Lancing,Lancing
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +151,Employee cannot report to himself.,Çalışan kendi kendine rapor olamaz.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Hesap dondurulmuş ise, girdiler kısıtlı kullanıcılara açıktır."
 DocType: Email Digest,Bank Balance,Banka hesap bakiyesi
-apps/erpnext/erpnext/controllers/accounts_controller.py +435,Accounting Entry for {0}: {1} can only be made in currency: {2},{1} sadece para yapılabilir: {0} Muhasebe Kayıt {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +436,Accounting Entry for {0}: {1} can only be made in currency: {2},{1} sadece para yapılabilir: {0} Muhasebe Kayıt {2}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +38,No active Salary Structure found for employee {0} and the month,Çalışan {0} ve ay bulunamadı aktif Maaş Yapısı
 DocType: Job Opening,"Job profile, qualifications required etc.","İş Profili, gerekli nitelikler vb"
 DocType: Journal Entry Account,Account Balance,Hesap Bakiyesi
 DocType: Journal Entry Account,Account Balance,Hesap Bakiyesi
 apps/erpnext/erpnext/config/accounts.py +112,Tax Rule for transactions.,Işlemler için vergi Kural.
 DocType: Rename Tool,Type of document to rename.,Yeniden adlandırılacak Belge Türü.
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +630,We buy this Item,Bu ürünü alıyoruz
+apps/erpnext/erpnext/public/js/setup_wizard.js +366,We buy this Item,Bu ürünü alıyoruz
 DocType: Address,Billing,Faturalama
 DocType: Address,Billing,Faturalama
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +77,Flanging,Flanş
 DocType: Bulk Email,Not Sent,Gönderilen Değil
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +73,Explosive forming,Şekillendirme Patlayıcı
 DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),Toplam Vergi ve Harçlar (Şirket Para Birimi)
 DocType: Shipping Rule,Shipping Account,Nakliye Hesap
 DocType: Shipping Rule,Shipping Account,Nakliye Hesap
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +43,Scheduled to send to {0} recipients,{0} gönderilmek üzere programlandı
 DocType: Quality Inspection,Readings,Okumalar
 DocType: Stock Entry,Total Additional Costs,Toplam Ek Maliyetler
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Sub Assemblies,Alt Kurullar
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Sub Assemblies,Alt Kurullar
+apps/erpnext/erpnext/public/js/setup_wizard.js +359,Sub Assemblies,Alt Kurullar
+apps/erpnext/erpnext/public/js/setup_wizard.js +359,Sub Assemblies,Alt Kurullar
 DocType: Shipping Rule Condition,To Value,Değer Vermek
 DocType: Shipping Rule Condition,To Value,Değer Vermek
 DocType: Supplier,Stock Manager,Stok Müdürü
@@ -1571,22 +1528,21 @@
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,İthalat Başarısız oldu
 apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,Hiçbir adres Henüz eklenmiş.
 DocType: Workstation Working Hour,Workstation Working Hour,İş İstasyonu Çalışma Saati
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +83,Analyst,Analist
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +83,Analyst,Analist
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +202,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Satır {0}: Tahsis miktar {1} daha az olması veya JV miktarı eşittir gerekir {2}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Analyst,Analist
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Analyst,Analist
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +149,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Satır {0}: Tahsis miktar {1} daha az olması veya JV miktarı eşittir gerekir {2}
 DocType: Item,Inventory,Stok
 DocType: Features Setup,"To enable ""Point of Sale"" view",Bakış &quot;Sale Noktası&quot; etkinleştirmek için
 apps/erpnext/erpnext/public/js/pos/pos.js +402,Payment cannot be made for empty cart,Boş sepet için ödeme yapılamaz
 DocType: Item,Sales Details,Satış Ayrıntılar
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +149,Pinning,Iğneleme
 DocType: Opportunity,With Items,Öğeler ile
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,Miktarında
 DocType: Notification Control,Expense Claim Rejected,Gider Talebi Reddedildi
 DocType: Sales Invoice,"The date on which next invoice will be generated. It is generated on submit.
 ",Bir sonraki fatura oluşturulur tarih. Bu teslim oluşturulur.
 DocType: Item Attribute,Item Attribute,Ürün Özellik
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +105,Government,Devlet
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +105,Government,Devlet
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Government,Devlet
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Government,Devlet
 apps/erpnext/erpnext/config/stock.py +268,Item Variants,Öğe Türevleri
 DocType: Company,Services,Servisler
 DocType: Company,Services,Servisler
@@ -1596,29 +1552,28 @@
 DocType: Sales Invoice,Source,Kaynak
 DocType: Sales Invoice,Source,Kaynak
 DocType: Leave Type,Is Leave Without Pay,Pay Yapmadan mı
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +186,No records found in the Payment table,Ödeme tablosunda kayıt bulunamadı
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +186,No records found in the Payment table,Ödeme tablosunda kayıt bulunamadı
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +405,Financial Year Start Date,Mali Yıl Başlangıç Tarihi
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +133,No records found in the Payment table,Ödeme tablosunda kayıt bulunamadı
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +133,No records found in the Payment table,Ödeme tablosunda kayıt bulunamadı
+apps/erpnext/erpnext/public/js/setup_wizard.js +153,Financial Year Start Date,Mali Yıl Başlangıç Tarihi
 DocType: Employee External Work History,Total Experience,Toplam Deneyim
 DocType: Employee External Work History,Total Experience,Toplam Deneyim
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +100,Countersinking,Havşa
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +271,Packing Slip(s) cancelled,Ambalaj Makbuzları İptal Edildi
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +276,Packing Slip(s) cancelled,Ambalaj Makbuzları İptal Edildi
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,Navlun ve Sevkiyat Ücretleri
 DocType: Material Request Item,Sales Order No,Satış Sipariş No
 DocType: Material Request Item,Sales Order No,Satış Sipariş No
 DocType: Item Group,Item Group Name,Ürün Grup Adı
 DocType: Item Group,Item Group Name,Ürün Grup Adı
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +50,Taken,Alınmış
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,Alınmış
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +66,Transfer Materials for Manufacture,Üretim için Aktarım Malzemeleri
 DocType: Pricing Rule,For Price List,Fiyat Listesi İçin
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +27,Executive Search,Yürütücü Arama
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,Yürütücü Arama
 apps/erpnext/erpnext/stock/stock_ledger.py +405,"Purchase rate for item: {0} not found, which is required to book accounting entry (expense). Please mention item price against a buying price list.","Öğe için satın alma oranı: {0} bulunamadı, muhasebe girişi (gideri) kitap için gereklidir. Bir satın alma fiyat listesi karşı madde fiyatı belirtiniz."
 DocType: Maintenance Schedule,Schedules,Programlar
 DocType: Purchase Invoice Item,Net Amount,Net Miktar
 DocType: Purchase Order Item Supplied,BOM Detail No,BOM Detay yok
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),Ek İndirim Tutarı (Şirket Para)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +537,Error: {0} > {1},Hata: {0}> {1}
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +537,Error: {0} > {1},Hata: {0}> {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +541,Error: {0} > {1},Hata: {0}> {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +541,Error: {0} > {1},Hata: {0}> {1}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,Lütfen hesap tablosundan yeni hesap oluşturunuz
 DocType: Maintenance Visit,Maintenance Visit,Bakım Ziyareti
 DocType: Maintenance Visit,Maintenance Visit,Bakım Ziyareti
@@ -1632,7 +1587,6 @@
 DocType: Event,Tuesday,Salı
 DocType: Leave Block List,Block Holidays on important days.,Önemli günlerde Blok Tatil.
 ,Accounts Receivable Summary,Alacak Hesapları Özeti
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +43,Leaves for type {0} already allocated for Employee {1} for period {2} - {3},Zaten bir süre için Çalışanı {1} için ayrılan tip {0} için bırakır {2} - {3}
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +187,Please set User ID field in an Employee record to set Employee Role,Çalışan Rolü ayarlamak için Çalışan kaydındaki Kullanıcı Kimliği alanını Lütfen
 DocType: UOM,UOM Name,UOM Adı
 DocType: Top Bar Item,Target,Hedef
@@ -1645,10 +1599,10 @@
 DocType: Sales Invoice Item,Brand Name,Marka Adı
 DocType: Sales Invoice Item,Brand Name,Marka Adı
 DocType: Purchase Receipt,Transporter Details,Taşıyıcı Detayları
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Box,Kutu
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Box,Kutu
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +389,The Organization,Organizasyon
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +389,The Organization,Organizasyon
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Box,Kutu
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Box,Kutu
+apps/erpnext/erpnext/public/js/setup_wizard.js +137,The Organization,Organizasyon
+apps/erpnext/erpnext/public/js/setup_wizard.js +137,The Organization,Organizasyon
 DocType: Monthly Distribution,Monthly Distribution,Aylık Dağılımı
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,Alıcı listesi boş. Alıcı listesi oluşturunuz
 DocType: Production Plan Sales Order,Production Plan Sales Order,Üretim Planı Satış Siparişi
@@ -1656,7 +1610,6 @@
 DocType: Sales Partner,Sales Partner Target,Satış Ortağı Hedefi
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},"{0} için muhasebe kayıt, sadece para yapılabilir: {1}"
 DocType: Pricing Rule,Pricing Rule,Fiyatlandırma Kuralı
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +58,Notching,Notching
 apps/erpnext/erpnext/config/learn.py +167,Material Request to Purchase Order,Satınalma Siparişi Malzeme Talebi
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +74,Row # {0}: Returned Item {1} does not exists in {2} {3},Satır # {0}: İade Item {1} değil var yok {2} {3}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,Banka Hesapları
@@ -1676,8 +1629,6 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Amounts not reflected in bank,Bankaya yansıyan değil tutarlar
 DocType: Quality Inspection Reading,Reading 4,4 Okuma
 apps/erpnext/erpnext/config/hr.py +23,Claims for company expense.,Şirket Gideri Talepleri.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +8,Centrifugal casting,Savurma döküm
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +119,Magnetic field-assisted finishing,Manyetik alan destekli bitirme
 DocType: Company,Default Holiday List,Tatil Listesini Standart
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +165,Stock Liabilities,Stok Yükümlülükleri
 DocType: Purchase Receipt,Supplier Warehouse,Tedarikçi Deposu
@@ -1685,12 +1636,13 @@
 DocType: Opportunity,Contact Mobile No,İrtibat Mobil No
 DocType: Production Planning Tool,Select Sales Orders,Satış Siparişleri Seçiniz
 ,Material Requests for which Supplier Quotations are not created,Kendisi için tedarikçi fiyat teklifi oluşturulmamış Malzeme Talepleri
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +117,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,Eğer izin için başvuruda edildiği gün (ler) tatildir. Sen izin talebinde gerekmez.
 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.,Ürünleri barkod kullanarak aramak için. Ürünlerin barkodunu taratarak Ürünleri İrsaliye ev Satış Faturasına girebilirsiniz
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +477,Mark as Delivered,Mark Teslim olarak
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +497,Mark as Delivered,Mark Teslim olarak
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +34,Make Quotation,Teklifi Yap
 DocType: Dependent Task,Dependent Task,Bağımlı Görev
-apps/erpnext/erpnext/stock/doctype/item/item.py +306,Conversion factor for default Unit of Measure must be 1 in row {0},Tedbir varsayılan Birimi için dönüşüm faktörü satırda 1 olmalıdır {0}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,Leave of type {0} cannot be longer than {1},Tip{0} izin  {1}'den uzun olamaz
+apps/erpnext/erpnext/stock/doctype/item/item.py +310,Conversion factor for default Unit of Measure must be 1 in row {0},Tedbir varsayılan Birimi için dönüşüm faktörü satırda 1 olmalıdır {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +155,Leave of type {0} cannot be longer than {1},Tip{0} izin  {1}'den uzun olamaz
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Peşin X gün için operasyonlar planlama deneyin.
 DocType: HR Settings,Stop Birthday Reminders,Doğum günü hatırlatıcılarını durdur
 DocType: SMS Center,Receiver List,Alıcı Listesi
@@ -1700,8 +1652,7 @@
 apps/erpnext/erpnext/public/js/pos/pos.js +491,{0} View,{0} Görüntüle
 DocType: Salary Structure Deduction,Salary Structure Deduction,Maaş Yapısı Kesintisi
 DocType: Salary Structure Deduction,Salary Structure Deduction,Maaş Yapısı Kesintisi
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +158,Selective laser sintering,Selektif Lazer sinterleme
-apps/erpnext/erpnext/stock/doctype/item/item.py +301,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Ölçü Birimi {0} Dönüşüm katsayısı tablosunda birden fazla kez girildi.
+apps/erpnext/erpnext/stock/doctype/item/item.py +305,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Ölçü Birimi {0} Dönüşüm katsayısı tablosunda birden fazla kez girildi.
 apps/frappe/frappe/core/page/data_import_tool/data_import_tool.js +108,Import Successful!,Başarılı İthalat!
 apps/frappe/frappe/core/page/data_import_tool/data_import_tool.js +108,Import Successful!,Başarılı İthalat!
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,İhraç Öğeler Maliyeti
@@ -1710,7 +1661,7 @@
 DocType: Quotation Item,Quotation Item,Teklif Ürünü
 DocType: Account,Account Name,Hesap adı
 DocType: Account,Account Name,Hesap adı
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +41,From Date cannot be greater than To Date,Tarihten itibaren tarihe kadardan ileride olamaz
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +34,From Date cannot be greater than To Date,Tarihten itibaren tarihe kadardan ileride olamaz
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +194,Serial No {0} quantity {1} cannot be a fraction,Seri No {0} miktar {1} kesir olamaz
 apps/erpnext/erpnext/config/buying.py +59,Supplier Type master.,Tedarikçi Türü Alanı.
 DocType: Purchase Order Item,Supplier Part Number,Tedarikçi Parti Numarası
@@ -1721,16 +1672,16 @@
 DocType: Accounts Settings,Credit Controller,Kredi Kontrolü
 DocType: Delivery Note,Vehicle Dispatch Date,Araç Sevk Tarihi
 DocType: Delivery Note,Vehicle Dispatch Date,Araç Sevk Tarihi
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +197,Purchase Receipt {0} is not submitted,Satın alma makbuzu {0} teslim edilmedi
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +198,Purchase Receipt {0} is not submitted,Satın alma makbuzu {0} teslim edilmedi
 DocType: Company,Default Payable Account,Standart Ödenecek Hesap
 apps/erpnext/erpnext/config/website.py +13,"Settings for online shopping cart such as shipping rules, price list etc.","Böyle nakliye kuralları, fiyat listesi vb gibi online alışveriş sepeti için Ayarlar"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +660,Setup Complete,Kurulum Tamamlandı
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +660,Setup Complete,Kurulum Tamamlandı
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +124,Setup Complete,Kurulum Tamamlandı
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +124,Setup Complete,Kurulum Tamamlandı
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +65,{0}% Billed,{0}% Faturalandırıldı
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +17,Reserved Qty,Ayrılmış Miktar
 DocType: Party Account,Party Account,Taraf Hesabı
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +74,Human Resources,İnsan Kaynakları
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +74,Human Resources,İnsan Kaynakları
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +74,Human Resources,İnsan Kaynakları
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +74,Human Resources,İnsan Kaynakları
 DocType: Lead,Upper Income,Üst Gelir
 DocType: Lead,Upper Income,Üst Gelir
 DocType: Journal Entry Account,Debit in Company Currency,Şirket Para Birimi Bankamatik
@@ -1740,13 +1691,11 @@
 DocType: Company,Default Values,Varsayılan Değerler
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +236,Row {0}: Payment amount can not be negative,Satır {0}: Ödeme tutarı negatif olamaz
 DocType: Expense Claim,Total Amount Reimbursed,Toplam Tutar Geri ödenen
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +152,Press fitting,Preslenerek
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +64,Against Supplier Invoice {0} dated {1},Tedarikçi karşı Fatura {0} tarihli {1}
 DocType: Customer,Default Price List,Standart Fiyat Listesi
 DocType: Customer,Default Price List,Standart Fiyat Listesi
 DocType: Payment Reconciliation,Payments,Ödemeler
 DocType: Payment Reconciliation,Payments,Ödemeler
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +24,Hot isostatic pressing,Presleme Sıcak izostatik
 DocType: ToDo,Medium,Orta
 DocType: ToDo,Medium,Orta
 DocType: Budget Detail,Budget Allocated,Ayrılan Bütçe
@@ -1762,9 +1711,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +56,None of the items have any change in quantity or value.,Öğelerin hiçbiri miktar veya değer bir değişiklik var.
 DocType: Warranty Claim,Warranty Claim,Garanti Talebi
 ,Lead Details,Talep Yaratma Detayları
-DocType: Authorization Rule,Approving User,Onaylayan Kullanıcı
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +37,Forging,Dövme
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +126,Plating,Kaplama
 DocType: Purchase Invoice,End date of current invoice's period,Cari fatura döneminin bitiş tarihi
 DocType: Pricing Rule,Applicable For,İçin uygulanabilir
 DocType: Bank Reconciliation,From Date,Tarihinden itibaren
@@ -1789,37 +1735,35 @@
 DocType: Sales Invoice,Paid Amount (Company Currency),Ücretli Tutar (Şirket Para)
 DocType: Purchase Invoice,Additional Discount,Ek İndirim
 DocType: Selling Settings,Selling Settings,Satış Ayarları 
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +39,Online Auctions,Online Müzayede
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +39,Online Auctions,Online Müzayede
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,Online Müzayede
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,Online Müzayede
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +94,Please specify either Quantity or Valuation Rate or both,Miktar veya Değerleme Br.Fiyatı ya da her ikisini de belirtiniz
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +50,"Company, Month and Fiscal Year is mandatory","Şirket, Ay ve Mali Yıl zorunludur"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Marketing Expenses,Pazarlama Giderleri
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Marketing Expenses,Pazarlama Giderleri
 ,Item Shortage Report,Ürün yetersizliği Raporu
 ,Item Shortage Report,Ürün yetersizliği Raporu
-apps/erpnext/erpnext/stock/doctype/item/item.js +183,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Ağırlık çok ""Ağırlık UoM"" belirtiniz \n, söz edilmektedir"
+apps/erpnext/erpnext/stock/doctype/item/item.js +185,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Ağırlık çok ""Ağırlık UoM"" belirtiniz \n, söz edilmektedir"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,Bu stok girdisini yapmak için kullanılan Malzeme Talebi
 apps/erpnext/erpnext/config/support.py +43,Single unit of an Item.,Bir Ürünün tek birimi
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +212,Time Log Batch {0} must be 'Submitted',Günlük Seri {0} 'Teslim edilmelidir'
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,Her Stok Hareketi için Muhasebe kaydı oluştur
 DocType: Leave Allocation,Total Leaves Allocated,Ayrılan toplam izinler
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +384,Warehouse required at Row No {0},Satır No gerekli Depo {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +386,Warehouse required at Row No {0},Satır No gerekli Depo {0}
 DocType: Employee,Date Of Retirement,Emeklilik Tarihiniz
 DocType: Employee,Date Of Retirement,Emeklilik Tarihiniz
 DocType: Upload Attendance,Get Template,Şablon alın
 DocType: Address,Postal,Posta
 DocType: Address,Postal,Posta
 DocType: Item,Weightage,Ağırlık
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +159,Mining,Madencilik
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +17,Resin casting,Reçine döküm
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,Aynı adda bir Müşteri Grubu bulunmaktadır. Lütfen Müşteri Grubu ismini değiştirin.
 apps/erpnext/erpnext/public/js/pos/pos.js +147,Please select {0} first.,Önce {0} seçiniz
 apps/erpnext/erpnext/templates/pages/order.html +57,text {0},Metin {0}
 DocType: Territory,Parent Territory,Ana Bölge
 DocType: Quality Inspection Reading,Reading 2,2 Okuma
 DocType: Stock Entry,Material Receipt,Malzeme Alındısı
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +622,Products,Ürünler
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +622,Products,Ürünler
+apps/erpnext/erpnext/public/js/setup_wizard.js +358,Products,Ürünler
+apps/erpnext/erpnext/public/js/setup_wizard.js +358,Products,Ürünler
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +47,Party Type and Party is required for Receivable / Payable account {0},Parti Tipi ve Parti Alacak / Borç hesabı için gereklidir {0}
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.","Bu öğeyi varyantları varsa, o zaman satış siparişleri vb seçilemez"
 DocType: Lead,Next Contact By,Sonraki İrtibat
@@ -1831,13 +1775,13 @@
 DocType: Purchase Invoice,Notification Email Address,Bildirim E-posta Adresi
 DocType: Payment Tool,Find Invoices to Match,Maç için Faturalar bul
 ,Item-wise Sales Register,Ürün bilgisi Satış Kaydı
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +399,"e.g. ""XYZ National Bank""","örneğin ""XYZ Ulusal Bankası """
+apps/erpnext/erpnext/public/js/setup_wizard.js +147,"e.g. ""XYZ National Bank""","örneğin ""XYZ Ulusal Bankası """
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,Bu Vergi Temel Br.Fiyata dahil mi?
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +57,Total Target,Toplam Hedef
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Target,Toplam Hedef
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.js +22,Shopping Cart is enabled,Alışveriş Sepeti etkindir
 DocType: Job Applicant,Applicant for a Job,İş için aday
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +173,No Production Orders created,Üretim Emri Oluşturulmadı
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +131,Salary Slip of employee {0} already created for this month,Çalışan {0} için Maaş makbuzu bu ay için zaten oluşturuldu
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +140,Salary Slip of employee {0} already created for this month,Çalışan {0} için Maaş makbuzu bu ay için zaten oluşturuldu
 DocType: Stock Reconciliation,Reconciliation JSON,Uzlaşma JSON
 DocType: Stock Reconciliation,Reconciliation JSON,Uzlaşma JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Çok fazla sütun. Raporu çıkarın ve spreadsheet uygulaması kullanarak yazdırın.
@@ -1850,14 +1794,14 @@
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +13,Variant,Varyant
 apps/frappe/frappe/public/js/frappe/form/toolbar.js +165,New {0},Yeni {0}
 DocType: Naming Series,Set prefix for numbering series on your transactions,İşlemlerinizde seri numaralandırma için ön ek ayarlayın
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +169,Stopped order cannot be cancelled. Unstop to cancel.,Durdurulan Sipariş iptal edilemez. İptali kaldırın
-apps/erpnext/erpnext/stock/doctype/item/item.py +323,Default BOM ({0}) must be active for this item or its template,Standart BOM ({0}) Bu öğe veya şablon için aktif olmalıdır
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +164,Stopped order cannot be cancelled. Unstop to cancel.,Durdurulan Sipariş iptal edilemez. İptali kaldırın
+apps/erpnext/erpnext/stock/doctype/item/item.py +327,Default BOM ({0}) must be active for this item or its template,Standart BOM ({0}) Bu öğe veya şablon için aktif olmalıdır
 DocType: Employee,Leave Encashed?,İzin Tahsil Edilmiş mi?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Kimden alanında Fırsat zorunludur
 DocType: Item,Variants,Varyantlar
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +458,Make Purchase Order,Satın Alma Emri verin
 DocType: SMS Center,Send To,Gönder
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +111,There is not enough leave balance for Leave Type {0},İzin tipi{0} için yeterli izin bakiyesi yok
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +127,There is not enough leave balance for Leave Type {0},İzin tipi{0} için yeterli izin bakiyesi yok
 DocType: Sales Team,Contribution to Net Total,Net Toplam Katkı
 DocType: Sales Invoice Item,Customer's Item Code,Müşterinin Ürün Kodu
 DocType: Sales Invoice Item,Customer's Item Code,Müşterinin Ürün Kodu
@@ -1903,12 +1847,12 @@
 DocType: Sales Order Item,Actual Qty,Gerçek Adet
 DocType: Sales Invoice Item,References,Kaynaklar
 DocType: Quality Inspection Reading,Reading 10,10 Okuma
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +612,"List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start.","Sattığınız veya satın aldığınız ürün veya hizmetleri listeleyin, başladığınızda Ürün grubunu, ölçü birimini ve diğer özellikleri işaretlediğinizden emin olun"
+apps/erpnext/erpnext/public/js/setup_wizard.js +348,"List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start.","Sattığınız veya satın aldığınız ürün veya hizmetleri listeleyin, başladığınızda Ürün grubunu, ölçü birimini ve diğer özellikleri işaretlediğinizden emin olun"
 DocType: Hub Settings,Hub Node,Hub Düğüm
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,Yinelenen Ürünler girdiniz. Lütfen düzeltip yeniden deneyin.
 apps/erpnext/erpnext/controllers/item_variant.py +65,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values,Değeri {0} özniteliği için {1} geçerli Öğe listesinde yok Değerler Özellik
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +87,Associate,Ortak
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +87,Associate,Ortak
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Associate,Ortak
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Associate,Ortak
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +46,Item {0} is not a serialized Item,Ürün {0} bir seri Ürün değildir
 DocType: SMS Center,Create Receiver List,Alıcı listesi oluşturma
 apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +5,Expired,Süresi Doldu
@@ -1918,8 +1862,8 @@
 DocType: Warranty Claim,Issue Date,Veriliş tarihi
 DocType: Activity Cost,Activity Cost,Etkinlik Maliyeti
 DocType: Purchase Receipt Item Supplied,Consumed Qty,Tüketilen Adet
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +52,Telecommunications,Telekomünikasyon
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +52,Telecommunications,Telekomünikasyon
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +52,Telecommunications,Telekomünikasyon
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +52,Telecommunications,Telekomünikasyon
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),Paketin bu teslimatın bir parçası olduğunu gösterir (Sadece Taslak)
 DocType: Payment Tool,Make Payment Entry,Ödeme Girdisi Oluştur
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +119,Quantity for Item {0} must be less than {1},Ürün {0} için miktar{1} den az olmalıdır
@@ -1938,10 +1882,8 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +37,"Selling must be checked, if Applicable For is selected as {0}",Uygulanabilir {0} olarak seçildiyse satış işaretlenmelidir
 DocType: Purchase Order Item,Supplier Quotation Item,Tedarikçi Teklif ürünü
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +27,Make Salary Structure,Maaş Yapısı oluşturun
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +54,Shearing,Makaslama
 DocType: Item,Has Variants,Varyasyoları var
 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.,Yeni Satış Faturası oluşturmak için 'Satış Fatura Yap' butonuna tıklayın.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +166,Packaging and labeling,Paketleme ve etiketleme
 DocType: Monthly Distribution,Name of the Monthly Distribution,Aylık Dağıtım Adı
 DocType: Sales Person,Parent Sales Person,Ana Satış Elemanı
 apps/erpnext/erpnext/setup/utils.py +14,Please specify Default Currency in Company Master and Global Defaults,Şirket Alanı ve Küresel Standartlardaki Para Birimini belirtiniz
@@ -1953,11 +1895,11 @@
 DocType: Cost Center,Budget,Bütçe
 DocType: Cost Center,Budget,Bütçe
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +41,"Budget cannot be assigned against {0}, as it's not an Income or Expense account","Bir gelir ya da gider hesabı değil gibi Bütçe, karşı {0} atanamaz"
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Achieved,Arşivlendi
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,Arşivlendi
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +65,Territory / Customer,Bölge / Müşteri
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,e.g. 5,örneğin 5
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,e.g. 5,örneğin 5
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +207,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},Satır {0}: Tahsis miktar {1} daha az ya da olağanüstü miktarda fatura eşit olmalıdır {2}
+apps/erpnext/erpnext/public/js/setup_wizard.js +294,e.g. 5,örneğin 5
+apps/erpnext/erpnext/public/js/setup_wizard.js +294,e.g. 5,örneğin 5
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},Satır {0}: Tahsis miktar {1} daha az ya da olağanüstü miktarda fatura eşit olmalıdır {2}
 DocType: Sales Invoice,In Words will be visible once you save the Sales Invoice.,Satış faturasını kaydettiğinizde görünür olacaktır.
 DocType: Item,Is Sales Item,Satış Maddesi
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,Ürün Grubu Ağacı
@@ -1966,9 +1908,8 @@
 DocType: Maintenance Visit,Maintenance Time,Bakım Zamanı
 DocType: Maintenance Visit,Maintenance Time,Bakım Zamanı
 ,Amount to Deliver,Tutar sunun
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +620,A Product or Service,Ürün veya Hizmet
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +158,There were errors.,Hatalar vardı
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +101,Tapping,Vurma
+apps/erpnext/erpnext/public/js/setup_wizard.js +356,A Product or Service,Ürün veya Hizmet
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +146,There were errors.,Hatalar vardı
 DocType: Naming Series,Current Value,Mevcut değer
 DocType: Naming Series,Current Value,Mevcut değer
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +171,{0} created,{0} oluşturuldu
@@ -1988,7 +1929,7 @@
 DocType: Website Item Group,Website Item Group,Web Sitesi Ürün Grubu
 DocType: Website Item Group,Website Item Group,Web Sitesi Ürün Grubu
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Duties and Taxes,Harç ve Vergiler
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Please enter Reference date,Referrans tarihi girin
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +312,Please enter Reference date,Referrans tarihi girin
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} ödeme girişleri şu tarafından filtrelenemez {1}
 DocType: Item Website Specification,Table for Item that will be shown in Web Site,Web Sitesi gösterilir Öğe için Tablo
 DocType: Purchase Order Item Supplied,Supplied Qty,Verilen Adet
@@ -1996,7 +1937,7 @@
 apps/erpnext/erpnext/config/stock.py +103,Tree of Item Groups.,Ürün Grupları Ağacı
 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, Kolon numarası bu Ücret tipi için kolon numarasından büyük veya eşit olamaz
 ,Item-wise Purchase History,Ürün bilgisi Satın Alma Geçmişi
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +152,Red,Kırmızı
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Red,Kırmızı
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +228,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},Ürün {0} seri numarası eklemek için 'Program Ekle' ye tıklayınız
 DocType: Account,Frozen,Dondurulmuş
 ,Open Production Orders,Üretim Siparişlerini Aç
@@ -2014,8 +1955,8 @@
 DocType: Item Attribute,Attribute Name,Öznitelik Adı
 apps/erpnext/erpnext/controllers/selling_controller.py +236,Item {0} must be Sales or Service Item in {1},Ürün {0} {1} de Satış veya Hizmet ürünü olmalıdır
 DocType: Item Group,Show In Website,Web sitesinde Göster
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +621,Group,Grup
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +621,Group,Grup
+apps/erpnext/erpnext/public/js/setup_wizard.js +357,Group,Grup
+apps/erpnext/erpnext/public/js/setup_wizard.js +357,Group,Grup
 DocType: Task,Expected Time (in hours),(Saat) Beklenen Zaman
 ,Qty to Order,Sipariş Miktarı
 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","Aşağıdaki belgeler İrsaliye, Fırsat, Malzeme Request, Öğe, Satınalma Siparişi, Satınalma Fiş, Makbuz Alıcı, Kotasyon, Satış Faturası, Ürün Paketi, Satış Sipariş, Seri No markası izlemek için"
@@ -2027,6 +1968,7 @@
 DocType: C-Form Invoice Detail,Invoice No,Fatura No
 DocType: C-Form Invoice Detail,Invoice No,Fatura No
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +480,From Purchase Order,Satın Alma Emrinden
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +92,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Izin dengesi zaten carry iletilen gelecek izin tahsisi kayıtlarında olduğu gibi, daha önce {0} iptal / tatbik edilemez bırakın {1}"
 DocType: Activity Cost,Costing Rate,Maliyet Oranı
 ,Customer Addresses And Contacts,Müşteri Adresleri ve İletişim
 ,Customer Addresses And Contacts,Müşteri Adresleri Ve İletişim
@@ -2037,10 +1979,10 @@
 DocType: Communication,Date,Tarih
 DocType: Communication,Date,Tarih
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,Tekrar Müşteri Gelir
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +651,Sit tight while your system is being setup. This may take a few moments.,Sistem kurulurken birkaç dakika bekleyiniz
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +115,Sit tight while your system is being setup. This may take a few moments.,Sistem kurulurken birkaç dakika bekleyiniz
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +51,{0} ({1}) must have role 'Expense Approver',{0} ({1}) rolü 'Gider onaylayansanız' olmalıdır
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Pair,Çift
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Pair,Çift
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Pair,Çift
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Pair,Çift
 DocType: Bank Reconciliation Detail,Against Account,Hesap karşılığı
 DocType: Maintenance Schedule Detail,Actual Date,Gerçek Tarih
 DocType: Item,Has Batch No,Parti No Var
@@ -2048,15 +1990,11 @@
 DocType: Delivery Note,Excise Page Number,Tüketim Sayfa Numarası
 DocType: Employee,Personal Details,Kişisel Bilgiler
 ,Maintenance Schedules,Bakım Programları
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +44,Embossing,Kabartma
 ,Quotation Trends,Teklif Trendleri
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +139,Item Group not mentioned in item master for item {0},Ürün {0} içim Ürün alanında Ürün grubu belirtilmemiş
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +302,Debit To account must be a Receivable account,Hesaba için Bankamatik bir Alacak hesabı olması gerekir
-apps/erpnext/erpnext/stock/doctype/item/item.py +310,"As Production Order can be made for this item, it must be a stock item.","Bu Ürün içim Üretim Emri verilebilmesi için, Ürün stok Ürünü olmalıdır."
 DocType: Shipping Rule Condition,Shipping Amount,Kargo Tutarı
 DocType: Shipping Rule Condition,Shipping Amount,Kargo Tutarı
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +140,Joining,Birleştirme
-DocType: Authorization Rule,Above Value,Değerin üstünde
 ,Pending Amount,Bekleyen Tutar
 ,Pending Amount,Bekleyen Tutar
 DocType: Purchase Invoice Item,Conversion Factor,Katsayı
@@ -2064,6 +2002,7 @@
 apps/erpnext/erpnext/config/hr.py +160,Setup incoming server for jobs email id. (e.g. jobs@example.com),İş e-mail kimliği için gelen sunucu kurulumu (örneğin: jobs@example.com)
 DocType: Purchase Receipt,Vehicle Number,Araç Sayısı
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,Yinelenen faturanın durdurulacağı tarih
+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,Toplam ayrılan yapraklar {0} az olamaz dönem için önceden onaylanmış yaprakları {1} den
 DocType: Journal Entry,Accounts Receivable,Alacak hesapları
 DocType: Journal Entry,Accounts Receivable,Alacak hesapları
 ,Supplier-Wise Sales Analytics,Tedarikçi Satış Analizi
@@ -2071,7 +2010,6 @@
 DocType: Custom Field,Custom,Özel
 DocType: Custom Field,Custom,Özel
 DocType: Production Order,Use Multi-Level BOM,Çok Seviyeli BOM kullan
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +26,Injection molding,Enjeksiyon kalıplama
 DocType: Bank Reconciliation,Include Reconciled Entries,Mutabık girdileri dahil edin
 apps/erpnext/erpnext/config/accounts.py +41,Tree of finanial accounts.,Finansal Hesaplar Ağacı
 DocType: Leave Control Panel,Leave blank if considered for all employee types,Tüm çalışan tipleri için kabul ise boş bırakın
@@ -2082,37 +2020,35 @@
 apps/frappe/frappe/config/setup.py +130,Printing,Baskı
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +114,Expense Claim is pending approval. Only the Expense Approver can update status.,Gider Talebi onay bekliyor. Yalnızca Gider yetkilisi durumu güncelleyebilir.
 DocType: Purchase Invoice,Additional Discount Amount,Ek İndirim Tutarı
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +99,The day(s) on which you are applying for leave are holiday. You need not apply for leave.,Listedeki ilk izin onaylayıcı varsayılan izin onaylayıcı olarak atanacaktır.
 apps/frappe/frappe/public/js/frappe/misc/utils.js +110,and,ve
 apps/frappe/frappe/public/js/frappe/misc/utils.js +110,and,ve
 DocType: Leave Block List Allow,Leave Block List Allow,İzin engel listesi müsaade eder
 apps/erpnext/erpnext/setup/doctype/company/company.py +236,Abbr can not be blank or space,Kısaltma boş veya boşluktan oluşamaz
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +50,Sports,Spor
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +50,Sports,Spor
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,Spor
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,Spor
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Actual,Gerçek Toplam
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Unit,Birim
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Unit,Birim
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Unit,Birim
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Unit,Birim
 apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.py +182,Please set Dropbox access keys in your site config,Lütfen site yapılandırmanızda Dropbox erişim anahtarı ayarlayınız
 apps/erpnext/erpnext/stock/get_item_details.py +113,Please specify Company,Şirket belirtiniz
 apps/erpnext/erpnext/stock/get_item_details.py +113,Please specify Company,Şirket belirtiniz
 ,Customer Acquisition and Loyalty,Müşteri Edinme ve Sadakat
 ,Customer Acquisition and Loyalty,Müşteri Edinme ve Sadakat
 DocType: Purchase Receipt,Warehouse where you are maintaining stock of rejected items,Reddedilen Ürün stoklarını muhafaza ettiğiniz depo
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +408,Your financial year ends on,Mali yılınız şu tarihte sona eriyor:
+apps/erpnext/erpnext/public/js/setup_wizard.js +156,Your financial year ends on,Mali yılınız şu tarihte sona eriyor:
 DocType: POS Profile,Price List,Fiyat listesi
 DocType: POS Profile,Price List,Fiyat listesi
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +20,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0} varsayılan Mali Yıldır. Değiştirmek için tarayıcınızı yenileyiniz
 apps/erpnext/erpnext/projects/doctype/project/project.js +47,Expense Claims,Gider İddiaları
 DocType: Issue,Support,Destek
 DocType: Issue,Support,Destek
-DocType: Authorization Rule,Approving Role,Onaylama Rolü
 ,BOM Search,BOM Arama
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +176,Closing (Opening + Totals),Kapanış (+ toplamları Açılış)
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +26,Please specify currency in Company,Şirket para belirtiniz
 DocType: Workstation,Wages per hour,Saatlik ücret
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},Toplu stok bakiyesi {0} olacak olumsuz {1} Warehouse Ürün {2} için {3}
 apps/erpnext/erpnext/config/setup.py +83,"Show / Hide features like Serial Nos, POS etc.","Seri No, POS vb gibi özellikleri göster/sakla"
-apps/erpnext/erpnext/controllers/accounts_controller.py +236,Account {0} is invalid. Account Currency must be {1},Hesap {0} geçersiz. Hesap Para olmalıdır {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +237,Account {0} is invalid. Account Currency must be {1},Hesap {0} geçersiz. Hesap Para olmalıdır {1}
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +34,UOM Conversion factor is required in row {0},UOM Dönüşüm katsayısı satır {0} da gereklidir
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +53,Clearance date cannot be before check date in row {0},Gümrükleme tarihi {0} satırındaki kontrol tarihinden önce olamaz
 DocType: Salary Slip,Deduction,Kesinti
@@ -2134,13 +2070,13 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +82,Item {0} has already been returned,Ürün {0} zaten iade edilmiş
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** Mali Yılı ** Mali Yılı temsil eder. Tüm muhasebe kayıtları ve diğer önemli işlemler ** ** Mali Yılı karşı izlenir.
 DocType: Opportunity,Customer / Lead Address,Müşteri / Adres
+apps/erpnext/erpnext/stock/doctype/item/item.py +112,Warning: Invalid SSL certificate on attachment {0},Uyarı: eki Geçersiz SSL sertifikası {0}
 DocType: Production Order Operation,Actual Operation Time,Gerçek Çalışma Süresi
 DocType: Authorization Rule,Applicable To (User),(Kullanıcıya) Uygulanabilir
 DocType: Purchase Taxes and Charges,Deduct,Düşmek
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +170,Job Description,İş Tanımı
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +170,Job Description,İş Tanımı
 DocType: Purchase Order Item,Qty as per Stock UOM,Her Stok UOM(birim) için miktar
 apps/frappe/frappe/model/rename_doc.py +343,Please select a valid csv file with data,Veri içeren geçerli bir csv dosyası seçiniz
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +92,Coating,Tabaka
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +126,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Dışında Özel Karakterler ""-"" ""."", ""#"", ve ""/"" serisi adlandırma izin verilmiyor"
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Satış Kampanyaları Takip Edin. İlanlar, Özlü Sözler takip edin, Satış Sipariş vb Kampanyalar dan Yatırım Dönüş ölçmek için. "
 DocType: Expense Claim,Approver,Onaylayan
@@ -2153,12 +2089,11 @@
 DocType: Supplier Quotation,Manufacturing Manager,Üretim Müdürü
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},Seri No {0} {1} uyarınca garantide
 apps/erpnext/erpnext/config/stock.py +69,Split Delivery Note into packages.,İrsaliyeyi ambalajlara böl.
-apps/erpnext/erpnext/hooks.py +84,Shipments,Gönderiler
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +29,Dip molding,Dip kalıplama
+apps/erpnext/erpnext/hooks.py +68,Shipments,Gönderiler
 DocType: Purchase Order,To be delivered to customer,Müşteriye teslim edilmek üzere
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,Günlük durumu Teslim Edildi olmalıdır.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,Seri Hayır {0} herhangi Warehouse ait değil
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +650,Setting Up,Kurma
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +114,Setting Up,Kurma
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,Row # ,Satır #
 DocType: Purchase Invoice,In Words (Company Currency),Sözlü (Firma para birimi) olarak
 DocType: Pricing Rule,Supplier,Tedarikçi
@@ -2169,7 +2104,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +105,Miscellaneous Expenses,Çeşitli Giderler
 DocType: Global Defaults,Default Company,Standart Firma
 apps/erpnext/erpnext/controllers/stock_controller.py +166,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,Ürün {0} için gider veya fark hesabı bütün stok değerini etkilediği için zorunludur
-apps/erpnext/erpnext/controllers/accounts_controller.py +354,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","Arka arkaya Ürün {0} için Overbill olamaz {1} daha {2}. Overbilling, Stok Ayarları ayarlamak lütfen izin vermek için"
+apps/erpnext/erpnext/controllers/accounts_controller.py +355,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","Arka arkaya Ürün {0} için Overbill olamaz {1} daha {2}. Overbilling, Stok Ayarları ayarlamak lütfen izin vermek için"
 DocType: Employee,Bank Name,Banka Adı
 DocType: Employee,Bank Name,Banka Adı
 apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +27,-Above,-Üstte
@@ -2184,13 +2119,13 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,{0} is mandatory for Item {1},{0} Ürün {1} için zorunludur 
 DocType: Currency Exchange,From Currency,Para biriminden
 DocType: DocField,Name,İsim
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +211,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","En az bir satırda Tahsis Tutar, Fatura Türü ve Fatura Numarası seçiniz"
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +104,Sales Order required for Item {0},Ürün {0}için Satış Sipariş  gerekli 
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +158,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","En az bir satırda Tahsis Tutar, Fatura Türü ve Fatura Numarası seçiniz"
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +107,Sales Order required for Item {0},Ürün {0}için Satış Sipariş  gerekli 
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +43,Amounts not reflected in system,Sistemde yer almamaktadır tutarlar
 DocType: Purchase Invoice Item,Rate (Company Currency),Oranı (Şirket para birimi)
 DocType: Purchase Invoice Item,Rate (Company Currency),Oranı (Şirket para birimi)
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +40,Others,Diğer
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +40,Others,Diğer
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +40,Others,Diğer
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +40,Others,Diğer
 apps/erpnext/erpnext/templates/includes/product_page.js +80,Cannot find a matching Item. Please select some other value for {0}.,Eşleşen bir öğe bulunamıyor. Için {0} diğer bazı değer seçiniz.
 DocType: POS Profile,Taxes and Charges,Vergi ve Harçlar
 DocType: Item,"A Product or a Service that is bought, sold or kept in stock.","Bir Ürün veya satın alınan, satılan veya stokta tutulan bir hizmet."
@@ -2198,18 +2133,17 @@
 apps/frappe/frappe/core/doctype/doctype/boilerplate/controller_list.html +31,Completed,Tamamlandı
 apps/frappe/frappe/core/doctype/doctype/boilerplate/controller_list.html +31,Completed,Tamamlandı
 DocType: Web Form,Select DocType,Belge Tipi seçine
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +104,Broaching,Broş
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +12,Banking,Bankacılık
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +12,Banking,Bankacılık
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,Bankacılık
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,Bankacılık
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +38,Please click on 'Generate Schedule' to get schedule,Programı almak için 'Program Oluştura' tıklayınız
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +283,New Cost Center,Yeni Maliyet Merkezi
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +283,New Cost Center,Yeni Maliyet Merkezi
 DocType: Bin,Ordered Quantity,Sipariş Edilen Miktar
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +397,"e.g. ""Build tools for builders""","örneğin """"İnşaatçılar için inşaat araçları"
+apps/erpnext/erpnext/public/js/setup_wizard.js +145,"e.g. ""Build tools for builders""","örneğin """"İnşaatçılar için inşaat araçları"
 DocType: Quality Inspection,In Process,Süreci
 DocType: Authorization Rule,Itemwise Discount,Ürün İndirimi
 DocType: Purchase Order Item,Reference Document Type,Referans Belge Türü
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +318,{0} against Sales Order {1},{0} Satış Siparişine karşı {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +320,{0} against Sales Order {1},{0} Satış Siparişine karşı {1}
 DocType: Account,Fixed Asset,Sabit Varlık
 apps/erpnext/erpnext/config/stock.py +283,Serialized Inventory,Serileştirilmiş Envanteri
 DocType: Activity Type,Default Billing Rate,Varsayılan Fatura Oranı
@@ -2226,16 +2160,15 @@
 DocType: Purchase Invoice Item,Page Break,Sayfa Sonu
 DocType: Production Order Operation,Pending,Bekliyor
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,Belirli bir çalışanın izni uygulamalarını onaylayabilir Kullanıcılar
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +33,You cannot change default UOM of Variant. To change default UOM for Variant change default UOM of the Template,Sen Variant varsayılan UOM değiştiremezsiniz. Şablon Varyant değişiklik varsayılan UOM varsayılan UOM değiştirmek için
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +50,Office Equipments,Ofis Gereçleri
 DocType: Purchase Invoice Item,Qty,Miktar
 DocType: Purchase Invoice Item,Qty,Miktar
 DocType: Fiscal Year,Companies,Şirketler
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +24,Electronics,Elektronik
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +24,Electronics,Elektronik
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +24,Electronics,Elektronik
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +24,Electronics,Elektronik
 DocType: Stock Settings,Raise Material Request when stock reaches re-order level,Stok yeniden sipariş düzeyine ulaştığında Malzeme talebinde bulun
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +18,From Maintenance Schedule,Bakım Programından
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +56,Full-time,Tam zamanlı
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +56,Full-time,Tam zamanlı
 DocType: Purchase Invoice,Contact Details,İletişim Bilgileri
 DocType: C-Form,Received Date,Alınan Tarih
 DocType: Delivery Note,"If you have created a standard template in Sales Taxes and Charges Template, select one and click on the button below.","Satış Vergi ve Harçlar Şablon standart bir şablon oluşturdu varsa, birini seçin ve aşağıdaki butona tıklayın."
@@ -2247,13 +2180,14 @@
 DocType: Job Applicant,Job Opening,İş Açılışı
 DocType: Payment Reconciliation,Payment Reconciliation,Ödeme Mutabakat
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +154,Please select Incharge Person's name,Sorumlu kişinin adını seçiniz
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +51,Technology,Teknoloji
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +51,Technology,Teknoloji
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,Teknoloji
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,Teknoloji
 DocType: Offer Letter,Offer Letter,Mektubu Teklif
 apps/erpnext/erpnext/config/manufacturing.py +51,Generate Material Requests (MRP) and Production Orders.,Malzeme İstekleri (MRP) ve Üretim Emirleri oluşturun.
 apps/erpnext/erpnext/config/manufacturing.py +51,Generate Material Requests (MRP) and Production Orders.,Malzeme İstekleri (MRP) ve Üretim Emirleri oluşturun.
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +68,Total Invoiced Amt,Toplam Faturalandırılan Tutarı
 DocType: Time Log,To Time,Zamana
+DocType: Authorization Rule,Approving Role (above authorized value),(Yetkili değerin üstünde) Rolü onaylanması
 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.",Alt devreler 'node' eklemek için tüm devreye bakarak eklemek istediğiniz alana tıklayın
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +102,Credit To account must be a Payable account,Hesaba için Kredi bir Ödenecek hesabı olması gerekir
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +233,BOM recursion: {0} cannot be parent or child of {2},BOM özyineleme: {0} ebeveyn veya çocuk olamaz {2}
@@ -2269,11 +2203,8 @@
 DocType: Opportunity,Lost Reason,Kayıp Nedeni
 DocType: Opportunity,Lost Reason,Kayıp Nedeni
 apps/erpnext/erpnext/config/accounts.py +68,Create Payment Entries against Orders or Invoices.,Siparişler veya Faturalar karşı Ödeme Girişleri oluşturun.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +141,Welding,Kaynak
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +40,New Stock UOM is required,Yeni Stok UoM gereklidir
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +40,New Stock UOM is required,Yeni Stok UoM gereklidir
 DocType: Quality Inspection,Sample Size,Numune Boyu
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +443,All items have already been invoiced,Bütün Ürünler zaten faturalandırılmıştır
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +446,All items have already been invoiced,Bütün Ürünler zaten faturalandırılmıştır
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',Lütfen geçerlli bir 'durum nodan başlayarak' belirtiniz
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +287,Further cost centers can be made under Groups but entries can be made against non-Groups,"Daha fazla masraf Gruplar altında yapılabilir, ancak girişleri olmayan Gruplar karşı yapılabilir"
 DocType: Project,External,Harici
@@ -2286,9 +2217,8 @@
 DocType: Bin,Actual Quantity,Gerçek Miktar
 DocType: Shipping Rule,example: Next Day Shipping,Örnek: Bir sonraki gün sevkiyat
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,Bulunamadı Seri No {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +563,Your Customers,Müşterileriniz
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +563,Your Customers,Müşterileriniz
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +27,Compression molding,Sıkıştırma kalıplamada
+apps/erpnext/erpnext/public/js/setup_wizard.js +303,Your Customers,Müşterileriniz
+apps/erpnext/erpnext/public/js/setup_wizard.js +303,Your Customers,Müşterileriniz
 DocType: Leave Block List Date,Block Date,Blok Tarih
 DocType: Sales Order,Not Delivered,Teslim Edilmedi
 DocType: Sales Order,Not Delivered,Teslim Edilmedi
@@ -2316,11 +2246,11 @@
 DocType: SMS Log,Sent To,Gönderildiği Kişi
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +28,Make Sales Invoice,Satış Faturası Oluştur
 DocType: Company,For Reference Only.,Başvuru için sadece.
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +29,Invalid {0}: {1},Geçersiz {0}: {1}
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +49,Invalid {0}: {1},Geçersiz {0}: {1}
 DocType: Sales Invoice Advance,Advance Amount,Avans miktarı
 DocType: Sales Invoice Advance,Advance Amount,Avans Tutarı
 DocType: Manufacturing Settings,Capacity Planning,Kapasite Planlama
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +49,'From Date' is required,'Tarihten itibaren' gereklidir
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +43,'From Date' is required,'Tarihten itibaren' gereklidir
 DocType: Journal Entry,Reference Number,Referans Numarası
 DocType: Journal Entry,Reference Number,Referans Numarası
 DocType: Employee,Employment Details,İstihdam Detayları
@@ -2339,8 +2269,8 @@
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Dayalı Yaşlanma
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Dayalı Yaşlanma
 DocType: Item,End of Life,Kullanım süresi Sonu
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +41,Travel,Gezi
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +41,Travel,Gezi
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +41,Travel,Gezi
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +41,Travel,Gezi
 DocType: Leave Block List,Allow Users,Kullanıcılara İzin Ver
 DocType: Purchase Order,Customer Mobile No,Müşteri Mobil Hayır
 DocType: Sales Invoice,Recurring,Yinelenen
@@ -2357,8 +2287,8 @@
 DocType: Stock Settings,Allow Negative Stock,Negatif Stok izni
 DocType: Installation Note,Installation Note,Kurulum Not
 DocType: Installation Note,Installation Note,Kurulum Not
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +541,Add Taxes,Vergi Ekle
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +541,Add Taxes,Vergi Ekle
+apps/erpnext/erpnext/public/js/setup_wizard.js +283,Add Taxes,Vergi Ekle
+apps/erpnext/erpnext/public/js/setup_wizard.js +283,Add Taxes,Vergi Ekle
 ,Financial Analytics,Mali Analitik
 DocType: Quality Inspection,Verified By,Onaylayan Kişi
 DocType: Address,Subsidiary,Yardımcı
@@ -2371,7 +2301,6 @@
 DocType: System Settings,In Hours,Saatleri
 DocType: Process Payroll,Create Salary Slip,Maaş Makbuzu Oluştur
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Expected balance as per bank,Banka başına beklendiği gibi denge
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +115,Buffing,Parlatıcı
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Source of Funds (Liabilities),Fon kaynakları (Yükümlülükler)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +347,Quantity in row {0} ({1}) must be same as manufactured quantity {2},Satır {0} ({1}) deki miktar üretilen miktar {2} ile aynı olmalıdır
 DocType: Appraisal,Employee,Çalışan
@@ -2391,11 +2320,11 @@
 DocType: Rename Tool,File to Rename,Rename Dosya
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +176,Purchse Order number required for Item {0},Ürün {0} için Sipariş numarası gerekli
 apps/erpnext/erpnext/public/js/controllers/transaction.js +136,Show Payments,Göster Ödemeleri
-apps/erpnext/erpnext/controllers/buying_controller.py +245,Specified BOM {0} does not exist for Item {1},Ürün için yok Belirtilen BOM {0} {1}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +202,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Bakım Programı {0} bu Satış Emri iptal edilmeden önce iptal edilmelidir
+apps/erpnext/erpnext/controllers/buying_controller.py +236,Specified BOM {0} does not exist for Item {1},Ürün için yok Belirtilen BOM {0} {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Bakım Programı {0} bu Satış Emri iptal edilmeden önce iptal edilmelidir
 apps/frappe/frappe/desk/page/backups/backups.html +13,Size,Boyut
 DocType: Notification Control,Expense Claim Approved,Gideri Talebi Onaylandı
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +113,Pharmaceutical,Ecza
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Pharmaceutical,Ecza
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,Satın Öğeler Maliyeti
 DocType: Selling Settings,Sales Order Required,Satış Sipariş Gerekli
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +30,Create Customer,Müşteri Oluştur
@@ -2408,7 +2337,6 @@
 DocType: Quality Inspection Reading,Reading 9,9 Okuma
 DocType: Supplier,Is Frozen,Donmuş
 DocType: Buying Settings,Buying Settings,Satınalma Ayarları
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +122,Mass finishing,Kitle bitirme
 DocType: Stock Entry Detail,BOM No. for a Finished Good Item,Biten İyi Ürün için BOM numarası
 DocType: Upload Attendance,Attendance To Date,Tarihine kadar katılım
 apps/erpnext/erpnext/config/selling.py +158,Setup incoming server for sales email id. (e.g. sales@example.com),İş e-mail kimliği için gelen sunucu kurulumu (örneğin: sales@example.com)
@@ -2418,7 +2346,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +713,Please specify Company to proceed,Devam etmek için Firma belirtin
 apps/frappe/frappe/public/js/frappe/model/indicator.js +30,Draft,Taslak
 apps/frappe/frappe/public/js/frappe/model/indicator.js +30,Draft,Taslak
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +46,Compensatory Off,Telafi İzni
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Compensatory Off,Telafi İzni
 DocType: Quality Inspection Reading,Accepted,Onaylanmış
 DocType: User,Female,Kadın
 DocType: User,Female,Kadın
@@ -2433,7 +2361,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +209,Raw Materials cannot be blank.,Hammaddeler boş olamaz.
 DocType: Newsletter,Test,Test
 DocType: Newsletter,Test,Test
-apps/erpnext/erpnext/stock/doctype/item/item.py +364,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +368,"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'","Mevcut stok işlemleri size değerlerini değiştiremezsiniz \ Bu öğe, orada olduğundan &#39;Seri No Has&#39;, &#39;Toplu Has Hayır&#39;, &#39;Stok Öğe mı&#39; ve &#39;Değerleme Metodu&#39;"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +448,Quick Journal Entry,Hızlı Dergisi Girişi
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +92,You can not change rate if BOM mentioned agianst any item,Herhangi bir Ürünye karşo BOM belirtildiyse oran değiştiremezsiniz.
@@ -2445,14 +2373,15 @@
 apps/erpnext/erpnext/config/stock.py +18,Requests for items.,Ürün istekleri.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,Her mamül madde için ayrı üretim emri oluşturulacaktır.
 DocType: Purchase Invoice,Terms and Conditions1,Şartlar ve Koşullar 1
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +18,Complete Setup,Kurulum Tamamlandı
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +18,Complete Setup,Kurulum Tamamlandı
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard_page.html +18,Complete Setup,Kurulum Tamamlandı
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard_page.html +18,Complete Setup,Kurulum Tamamlandı
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","Muhasebe entry bu tarihe kadar dondurulmuş, kimse / aşağıda belirtilen rolü dışında girdisini değiştirin yapabilirsiniz."
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +121,Please save the document before generating maintenance schedule,Bakım programı oluşturmadan önce belgeyi kaydedin
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,Proje Durumu
 DocType: UOM,Check this to disallow fractions. (for Nos),Kesirlere izin vermemek için işaretleyin (Numaralar için)
 apps/erpnext/erpnext/config/crm.py +96,Newsletter Mailing List,Bülten Posta Listesi
 DocType: Delivery Note,Transporter Name,Taşıyıcı Adı
+DocType: Authorization Rule,Authorized Value,Yetkili Değer
 DocType: Contact,Enter department to which this Contact belongs,Bu irtibatın ait olduğu departmanı girin
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Absent,Toplam Yok
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +746,Item or Warehouse for row {0} does not match Material Request,Satır {0} daki Ürün veya Depo Ürün isteğini karşılamıyor
@@ -2485,16 +2414,15 @@
 DocType: SMS Log,No of Requested SMS,İstenen SMS Sayısı
 DocType: Campaign,Campaign-.####,Kampanya-.####
 DocType: Campaign,Campaign-.####,Kampanya-.####
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +55,Piercing,Delici
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,Sonraki adımlar
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +117,Contract End Date must be greater than Date of Joining,Sözleşme Bitiş tarihi Katılma tarihinden büyük olmalıdır
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,Bir komisyon için şirketlerin ürünlerini satan bir üçüncü taraf dağıtıcı / bayi / komisyon ajan / ortaklık / bayi.
 DocType: Customer Group,Has Child Node,Çocuk Kısmı Var
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{0} against Purchase Order {1},{0} Satınalma siparişine karşı{1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +332,{0} against Purchase Order {1},{0} Satınalma siparişine karşı{1}
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","Buraya statik url parametreleri girin (Örn. gönderen = ERPNext, kullanıcı adı = ERPNext, Şifre = 1234 vb)"
 apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,{0} {1} değil herhangi bir aktif Mali Yılı içinde. Daha fazla bilgi kontrol ediniz {2}.
-apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,Bu ERPNextten otomatik olarak üretilmiş bir örnek web sitedir.
+apps/erpnext/erpnext/setup/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,Bu ERPNextten otomatik olarak üretilmiş bir örnek web sitedir.
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +37,Ageing Range 1,Yaşlanma Aralığı 1
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +110,Photochemical machining,Fotokimyasal işleme
 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.
 
 #### Note
@@ -2541,7 +2469,7 @@
 DocType: Purchase Receipt Item,Recd Quantity,Alınan Miktar
 DocType: Email Account,Email Ids,E-posta Noları
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},Satış Sipariş Miktarı {1} den fazla Ürün {0} üretilemez
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +471,Stock Entry {0} is not submitted,Stok Giriş {0} teslim edilmez
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +473,Stock Entry {0} is not submitted,Stok Giriş {0} teslim edilmez
 DocType: Payment Reconciliation,Bank / Cash Account,Banka / Kasa Hesabı
 DocType: Payment Reconciliation,Bank / Cash Account,Banka / Kasa Hesabı
 DocType: Tax Rule,Billing City,Fatura Şehir
@@ -2563,8 +2491,8 @@
 DocType: Purchase Invoice,Currency and Price List,Döviz ve Fiyat Listesi
 DocType: Opportunity,Customer / Lead Name,Müşteri/ İlk isim
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +63,Clearance Date not mentioned,Gümrükleme Tarih belirtilmeyen
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +71,Production,Üretim
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +71,Production,Üretim
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Production,Üretim
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Production,Üretim
 DocType: Item,Allow Production Order,Üretim Emri izni
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +60,Row {0}:Start Date must be before End Date,Satır {0}: Başlangıç tarihi bitiş tarihinden önce olmalıdır
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Toplam (Adet)
@@ -2580,7 +2508,7 @@
 apps/erpnext/erpnext/utilities/doctype/address/address.py +113,My Addresses,Benim Adresleri
 DocType: Stock Ledger Entry,Outgoing Rate,Giden Oranı
 apps/erpnext/erpnext/config/hr.py +100,Organization branch master.,Kuruluş Şube Alanı
-apps/erpnext/erpnext/controllers/accounts_controller.py +237, or ,veya
+apps/erpnext/erpnext/controllers/accounts_controller.py +238, or ,veya
 DocType: Sales Order,Billing Status,Fatura Durumu
 DocType: Sales Order,Billing Status,Fatura Durumu
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Utility Expenses,Yardımcı Giderleri
@@ -2614,6 +2542,7 @@
 DocType: Stock Entry Detail,Serial No / Batch,Seri No / Parti
 DocType: Product Bundle,Parent Item,Ana Ürün
 DocType: Account,Account Type,Hesap Tipi
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +113,Leave Type {0} cannot be carry-forwarded,{0} carry-iletilmesine olamaz Type bırakın
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +213,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',Bakım Programı bütün Ürünler için oluşturulmamıştır. Lütfen 'Program Oluştura' tıklayın
 ,To Produce,Üretilecek
 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","Satırdaki {0} içinde {1}. Ürün fiyatına {2} eklemek için, satır {3} de dahil edilmelidir"
@@ -2621,11 +2550,8 @@
 DocType: Bin,Reserved Quantity,Ayrılan Miktar
 DocType: Landed Cost Voucher,Purchase Receipt Items,Satın alma makbuzu Ürünleri
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,Özelleştirme Formları
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +62,Cutting,Kesme
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +69,Flattening,Düzleşme
 DocType: Account,Income Account,Gelir Hesabı
 DocType: Account,Income Account,Gelir Hesabı
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +22,Molding,Döküm
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +632,Delivery,Teslimat
 DocType: Stock Reconciliation Item,Current Qty,Güncel Adet
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section","Maliyetlendirme Bölümünde ""Dayalı Ürünler Br.Fiyatına"" bakınız"
@@ -2638,11 +2564,11 @@
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +17,Ref,Ref
 DocType: Cost Center,Cost Center,Maliyet Merkezi
 DocType: Cost Center,Cost Center,Maliyet Merkezi
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.js +48,Voucher #,Föy #
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +36,Voucher #,Föy #
 DocType: Notification Control,Purchase Order Message,Satınalma Siparişi Mesajı
 DocType: Tax Rule,Shipping Country,Nakliye Ülke
 DocType: Upload Attendance,Upload HTML,HTML Yükle
-apps/erpnext/erpnext/controllers/accounts_controller.py +391,"Total advance ({0}) against Order {1} cannot be greater \
+apps/erpnext/erpnext/controllers/accounts_controller.py +392,"Total advance ({0}) against Order {1} cannot be greater \
 				than the Grand Total ({2})","Toplam avans ({0}) Sipariş karşı {1} \
  büyük olamaz Büyük Toplam den ({2})"
 DocType: Employee,Relieving Date,Ayrılma Tarihi
@@ -2650,10 +2576,9 @@
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,Depo yalnızca Stok Girdisi / İrsaliye / Satın Alım Makbuzu üzerinden değiştirilebilir
 DocType: Employee Education,Class / Percentage,Sınıf / Yüzde
 DocType: Employee Education,Class / Percentage,Sınıf / Yüzde
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +92,Head of Marketing and Sales,Satış ve Pazarlama Müdürü
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +31,Income Tax,Gelir vergisi
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +31,Income Tax,Gelir vergisi
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +157,Laser engineered net shaping,Lazer net şekillendirme mühendislik
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Head of Marketing and Sales,Satış ve Pazarlama Müdürü
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +31,Income Tax,Gelir vergisi
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +31,Income Tax,Gelir vergisi
 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.","Seçilen Fiyatlandırma Kural 'Fiyat' için yapılırsa, bu fiyat listesi üzerine yazılır. Fiyatlandırma Kural fiyat nihai fiyat, bu yüzden başka indirim uygulanmalıdır. Dolayısıyla, vb Satış Siparişi, Satınalma Siparişi gibi işlemlerde, oldukça 'Fiyat Listesi Oranı' alanına daha, 'Oranı' alanına getirilen edilecektir."
 apps/erpnext/erpnext/config/selling.py +163,Track Leads by Industry Type.,Sanayi Tipine Göre izleme talebi.
 DocType: Item Supplier,Item Supplier,Ürün Tedarikçisi
@@ -2680,37 +2605,34 @@
 DocType: Stock Ledger Entry,Actual Qty After Transaction,İşlem sonrası gerçek Adet
 ,Pending SO Items For Purchase Request,Satın Alma Talebi bekleyen PO Ürünleri
 DocType: Supplier,Billing Currency,Fatura Döviz
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +148,Extra Large,Ekstra Büyük
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,Extra Large,Ekstra Büyük
 ,Profit and Loss Statement,Kar ve Zarar Tablosu
 ,Profit and Loss Statement,Kar ve Zarar Tablosu
 DocType: Bank Reconciliation Detail,Cheque Number,Çek Numarası
 DocType: Bank Reconciliation Detail,Cheque Number,Çek Numarası
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +43,Pressing,Presleme
 DocType: Payment Tool Detail,Payment Tool Detail,Ödeme Aracı Detayı
 ,Sales Browser,Satış Tarayıcı
 DocType: Journal Entry,Total Credit,Toplam Kredi
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +474,Warning: Another {0} # {1} exists against stock entry {2},Uyarı: Başka {0} # {1} stok girişi karşı var {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +459,Local,Yerel
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +459,Local,Yerel
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +476,Warning: Another {0} # {1} exists against stock entry {2},Uyarı: Başka {0} # {1} stok girişi karşı var {2}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +397,Local,Yerel
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +397,Local,Yerel
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),Krediler ve avanslar (Varlıklar)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),Krediler ve avanslar (Varlıklar)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,Borçlular
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +147,Large,Büyük
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +23,No employee found!,Çalışan bulunmadı!
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Large,Büyük
 DocType: C-Form Invoice Detail,Territory,Bölge
 DocType: C-Form Invoice Detail,Territory,Bölge
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,Lütfen gerekli ziyaretlerin sayısını belirtin
 DocType: Purchase Order,Customer Address Display,Müşteri Adresi Ekran
 DocType: Stock Settings,Default Valuation Method,Standart Değerleme Yöntemi
 DocType: Stock Settings,Default Valuation Method,Standart Değerleme Yöntemi
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +127,Polishing,Parlatma
 DocType: Production Order Operation,Planned Start Time,Planlanan Başlangıç ​​Zamanı
 apps/erpnext/erpnext/config/accounts.py +63,Close Balance Sheet and book Profit or Loss.,Bilançoyu Kapat ve Kar veya Zararı ayır.
-apps/erpnext/erpnext/stock/doctype/item/item.py +661,"Default Unit of Measure for Item {0} cannot be changed directly because \
+apps/erpnext/erpnext/stock/doctype/item/item.py +665,"Default Unit of Measure for Item {0} cannot be changed directly because \
 			you have already made some transaction(s) with another UOM. To change default UOM, \
 			use 'UOM Replace Utility' tool under Stock module.","Zaten başka UOM bazı işlem (ler) yaptık \ çünkü Öğe için Ölçü Varsayılan Birim {0} doğrudan değiştirilemez. Varsayılan UOM değiştirmek için, \ kullanımı Stok modülü altında araç &#39;UOM Programı Değiştir&#39;."
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,Döviz Kuru içine başka bir para birimi dönüştürme belirtin
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +146,Quotation {0} is cancelled,Teklif {0} iptal edildi
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +141,Quotation {0} is cancelled,Teklif {0} iptal edildi
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,Toplam Üstün Tutar
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} was on leave on {1}. Cannot mark attendance.,Çalışan {0} {1} tarihinde izinli oldu. Katılım işaretlenemez.
 DocType: Sales Partner,Targets,Hedefler
@@ -2723,7 +2645,6 @@
 DocType: Price List,Applicable for Countries,Ülkeler için geçerlidir
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Computers,Bilgisayarlar
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Computers,Bilgisayarlar
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +112,Electro-chemical grinding,Elektro-kimyasal taşlama
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +14,This is a root customer group and cannot be edited.,Bu bir kök müşteri grubudur ve düzenlenemez.
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +39,Please setup your chart of accounts before you start Accounting Entries,Muhasebe girdilerine başlamadan önce hesap şemanızı kurunuz
 DocType: Purchase Invoice,Ignore Pricing Rule,Fiyatlandırma Kuralı Yoksay
@@ -2782,7 +2703,6 @@
 DocType: Maintenance Visit,Purposes,Amaçları
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +103,Atleast one item should be entered with negative quantity in return document,En az bir öğe dönüş belgesinde negatif miktar ile girilmelidir
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +67,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","Çalışma {0} iş istasyonunda herhangi bir mevcut çalışma saatleri daha uzun {1}, birden operasyonlarına operasyon yıkmak"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +134,Electrochemical machining,Elektrokimyasal işleme
 ,Requested,Talep
 ,Requested,Talep
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +66,No Remarks,Hiçbir Açıklamalar
@@ -2794,7 +2714,7 @@
 DocType: Features Setup,Sales and Purchase,Satış ve Satın Alma
 DocType: Features Setup,Sales and Purchase,Satış ve Satın Alma
 DocType: Supplier Quotation Item,Material Request No,Malzeme Talebi No
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +218,Quality Inspection required for Item {0},Ürün  {0} için gerekli Kalite Kontrol
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +221,Quality Inspection required for Item {0},Ürün  {0} için gerekli Kalite Kontrol
 DocType: Quotation,Rate at which customer's currency is converted to company's base currency,Müşterinin para biriminin şirketin temel para birimine dönüştürülme oranı
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +107,{0} has been successfully unsubscribed from this list.,{0} isimli kişi başarı ile listeden çıkarıldı.
 DocType: Purchase Invoice Item,Net Rate (Company Currency),Net Oranı (Şirket Para)
@@ -2813,10 +2733,9 @@
 apps/erpnext/erpnext/accounts/report/financial_statements.py +16,Fiscal Year {0} not found.,Mali Yılı {0} bulunamadı.
 DocType: Bank Reconciliation,Get Relevant Entries,İlgili girdileri alın
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +407,Accounting Entry for Stock,Stokta Muhasebe Giriş
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +64,Coining,Para basma
 DocType: Sales Invoice,Sales Team1,Satış Ekibi1
 DocType: Sales Invoice,Sales Team1,Satış Ekibi1
-apps/erpnext/erpnext/stock/doctype/item/item.py +412,Item {0} does not exist,Ürün {0} yoktur
+apps/erpnext/erpnext/stock/doctype/item/item.py +416,Item {0} does not exist,Ürün {0} yoktur
 DocType: Sales Invoice,Customer Address,Müşteri Adresi
 DocType: Sales Invoice,Customer Address,Müşteri Adresi
 apps/frappe/frappe/desk/query_report.py +136,Total,Toplam
@@ -2833,17 +2752,16 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +149,Target warehouse is mandatory for row {0},Satır {0} için hedef depo zorunludur
 DocType: Quality Inspection,Quality Inspection,Kalite Kontrol
 DocType: Quality Inspection,Quality Inspection,Kalite Kontrol
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +144,Extra Small,Extra Small
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +20,Spray forming,Şekillendirme Sprey
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Extra Small,Extra Small
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +458,Warning: Material Requested Qty is less than Minimum Order Qty,Uyarı: İstenen Ürün Miktarı Minimum Sipariş Miktarından az 
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +191,Account {0} is frozen,Hesap {0} dondurulmuş
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +191,Account {0} is frozen,Hesap {0} donduruldu
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Örgüte ait Hesap ayrı Planı Tüzel Kişilik / Yardımcı.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +29,"Food, Beverage & Tobacco","Gıda, İçecek ve Tütün"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +29,"Food, Beverage & Tobacco","Gıda, İçecek ve Tütün"
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","Gıda, İçecek ve Tütün"
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","Gıda, İçecek ve Tütün"
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +20,PL or BS,PL veya BS
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +20,PL or BS,PL veya BS
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,Can only make payment against unbilled {0},Sadece karşı ödeme yapabilirsiniz faturalanmamış {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +531,Can only make payment against unbilled {0},Sadece karşı ödeme yapabilirsiniz faturalanmamış {0}
 apps/erpnext/erpnext/controllers/selling_controller.py +122,Commission rate cannot be greater than 100,Komisyon oranı 100'den fazla olamaz
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Minimum Inventory Level,Asgari Stok Seviyesi
 DocType: Stock Entry,Subcontract,Alt sözleşme
@@ -2856,14 +2774,13 @@
 DocType: Production Order Operation,Estimated Time and Cost,Tahmini Süre ve Maliyet
 DocType: Bin,Bin,Kutu
 DocType: Bin,Bin,Kutu
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +50,Nosing,Nosing
 DocType: SMS Log,No of Sent SMS,Gönderilen SMS sayısı
 DocType: Account,Company,Şirket
 DocType: Account,Expense Account,Gider Hesabı
 DocType: Account,Expense Account,Gider Hesabı
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +49,Software,Yazılım
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +49,Software,Yazılım
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +151,Colour,Renk
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +49,Software,Yazılım
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +49,Software,Yazılım
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Colour,Renk
 DocType: Maintenance Visit,Scheduled,Planlandı
 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",&quot;Hayır&quot; ve &quot;Satış Öğe mı&quot; &quot;Stok Öğe mı&quot; nerede &quot;Evet&quot; ise Birimini seçmek ve başka hiçbir Ürün Paketi var Lütfen
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,Dengesiz ay boyunca hedefleri dağıtmak için Aylık Dağıtım seçin.
@@ -2871,7 +2788,7 @@
 DocType: Purchase Invoice Item,Valuation Rate,Değerleme Oranı
 apps/erpnext/erpnext/stock/get_item_details.py +281,Price List Currency not selected,Fiyat Listesi para birimi seçilmemiş
 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,Öğe Satır {0}: {1} Yukarıdaki 'satın alma makbuzlarını' tablosunda yok Satınalma Makbuzu
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +134,Employee {0} has already applied for {1} between {2} and {3},Çalışan {0} hali hazırda  {2} ve {3} arasında {1} için başvurmuştur
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +145,Employee {0} has already applied for {1} between {2} and {3},Çalışan {0} hali hazırda  {2} ve {3} arasında {1} için başvurmuştur
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Proje Başlangıç ​​Tarihi
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +8,Until,Kadar
 DocType: Rename Tool,Rename Log,Girişi yeniden adlandır
@@ -2883,8 +2800,8 @@
 DocType: C-Form,C-Form No,C-Form No
 DocType: C-Form,C-Form No,C-Form No
 DocType: BOM,Exploded_items,Exploded_items
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +95,Researcher,Araştırmacı
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +95,Researcher,Araştırmacı
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Researcher,Araştırmacı
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Researcher,Araştırmacı
 apps/frappe/frappe/custom/doctype/customize_form/customize_form.js +88,Update,Güncelleme
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +78,Please save the Newsletter before sending,Lütfen göndermeden önce bülteni kaydedin
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +23,Name or Email is mandatory,Adı veya E-posta zorunludur
@@ -2897,11 +2814,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +134,Root Type is mandatory,Kök Tipi zorunludur
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +295,Serial No {0} created,Seri No {0} oluşturuldu
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +295,Serial No {0} created,Seri No {0} oluşturuldu
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +125,Vibratory finishing,Titreşimli bitirme
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","Müşterilerinin rahatlığı için, bu kodlar faturalarda ve irsaliyelerde olduğu gibi basılı formatta kullanılabilir."
 DocType: Employee,You can enter any date manually,Elle tarih girebilirsiniz
 DocType: Sales Invoice,Advertisement,Reklâm
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +165,Probationary Period,Deneme süresi
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Probationary Period,Deneme süresi
 DocType: Customer Group,Only leaf nodes are allowed in transaction,İşlemde yalnızca yaprak düğümlere izin verilir
 DocType: Expense Claim,Expense Approver,Gider Approver
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,Tedarik edilen satın alma makbuzu ürünü
@@ -2910,20 +2826,17 @@
 DocType: SMS Settings,SMS Gateway URL,SMS Anageçit Adresi
 DocType: SMS Settings,SMS Gateway URL,SMS Anageçit Adresi
 apps/erpnext/erpnext/config/crm.py +53,Logs for maintaining sms delivery status,Sms teslim durumunu korumak için Günlükleri
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +137,Grinding,Öğütme
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +34,Shrink wrapping,Shrink
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +36,Pending Activities,Bekleyen Etkinlikleri
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,Confirmed,Onaylı
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier > Supplier Type,Tedarikçi> Tedarikçi Türü
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier > Supplier Type,Tedarikçi> Tedarikçi Türü
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +127,Please enter relieving date.,Lütfen Boşaltma tarihi girin.
 apps/erpnext/erpnext/controllers/trends.py +137,Amt,Amt
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' can be submitted,Sadece durumu 'Onaylandı' olan İzin Uygulamaları verilebilir
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +51,Only Leave Applications with status 'Approved' can be submitted,Sadece durumu 'Onaylandı' olan İzin Uygulamaları verilebilir
 apps/erpnext/erpnext/utilities/doctype/address/address.py +21,Address Title is mandatory.,Adres Başlığı zorunludur.
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,Sorgu kaynağı kampanya ise kampanya adı girin
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +38,Newspaper Publishers,Gazete Yayıncıları
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +38,Newspaper Publishers,Gazete Yayıncıları
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,Mali Yıl Seçin
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +88,Smelting,Döküm
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Yeniden Sipariş Seviyesi
 DocType: Attendance,Attendance Date,Katılım Tarihi
 DocType: Attendance,Attendance Date,Katılım Tarihi
@@ -2945,8 +2858,8 @@
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,Satış emrini kaydettiğinizde görünür olacaktır.
 ,Employee Birthday,Çalışan Doğum Günü
 ,Employee Birthday,Çalışan Doğum Günü
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +55,Venture Capital,Girişim Sermayesi
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +55,Venture Capital,Girişim Sermayesi
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,Girişim Sermayesi
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,Girişim Sermayesi
 DocType: UOM,Must be Whole Number,Tam Numara olmalı
 DocType: Leave Control Panel,New Leaves Allocated (In Days),Tahsis Edilen Yeni İzinler (Günler)
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +51,Serial No {0} does not exist,Seri No {0} yok
@@ -2955,11 +2868,10 @@
 DocType: Pricing Rule,Discount Percentage,İndirim Yüzdesi
 DocType: Payment Reconciliation Invoice,Invoice Number,Fatura Numarası
 DocType: Payment Reconciliation Invoice,Invoice Number,Fatura Numarası
-apps/erpnext/erpnext/hooks.py +70,Orders,Siparişler
+apps/erpnext/erpnext/hooks.py +54,Orders,Siparişler
 DocType: Leave Control Panel,Employee Type,Çalışan Tipi
 DocType: Leave Control Panel,Employee Type,Çalışan Tipi
 DocType: Employee Leave Approver,Leave Approver,İzin Onaylayan
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +70,Swaging,Dövme
 DocType: Manufacturing Settings,Material Transferred for Manufacture,Malzeme imalatı için transfer
 DocType: Expense Claim,"A user with ""Expense Approver"" role","""Gider Onaylayıcısı"" rolü ile bir kullanıcı"
 ,Issued Items Against Production Order,Üretim Emrine Karşı verilmiş maddeler
@@ -2972,7 +2884,6 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Depreciation,Amortisman
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Depreciation,Amortisman
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Tedarikçi (ler)
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +29,Invalid period,Geçersiz dönemi
 DocType: Customer,Credit Limit,Kredi Limiti
 DocType: Customer,Credit Limit,Kredi Limiti
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,Işlemin türünü seçin
@@ -2983,9 +2894,9 @@
 DocType: Customer,Address and Contact,Adresler ve Kontaklar
 DocType: Customer,Last Day of the Next Month,Sonraki Ay Son Gün
 DocType: Employee,Feedback,Geri bildirim
+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}","Önce tahsis edilemez bırakın {0}, izin dengesi zaten carry iletilen gelecek izin tahsisi kayıtlarında olduğu gibi {1}"
 apps/erpnext/erpnext/accounts/party.py +284,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Not: nedeniyle / Referans Tarihi {0} gün izin müşteri kredi günü aştığı (ler)
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +621,Maint. Schedule,Bakım. Program
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +108,Abrasive jet machining,Zımpara jet işleme
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +632,Maint. Schedule,Bakım. Program
 DocType: Stock Settings,Freeze Stock Entries,Donmuş Stok Girdileri
 DocType: Website Settings,Website Settings,Web Sitesi Ayarları
 DocType: Website Settings,Website Settings,Web Sitesi Ayarları
@@ -3006,8 +2917,8 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +75,Show Stock Entries,Göster Stok Girişler
 ,Is Primary Address,Birincil Adres mı
 DocType: Production Order,Work-in-Progress Warehouse,Devam eden depo işi
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +308,Reference #{0} dated {1},Referans # {0} tarihli {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +308,Reference #{0} dated {1},Referans # {0} tarihli {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Reference #{0} dated {1},Referans # {0} tarihli {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Reference #{0} dated {1},Referans # {0} tarihli {1}
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +13,Manage Addresses,Adresleri yönetin
 DocType: Pricing Rule,Item Code,Ürün Kodu
 DocType: Pricing Rule,Item Code,Ürün Kodu
@@ -3019,8 +2930,8 @@
 DocType: Communication,Phone,Telefon
 DocType: Communication,Phone,Telefon
 DocType: Employee Internal Work History,Employee Internal Work History,Çalışan Dahili İş Geçmişi
-apps/erpnext/erpnext/public/js/account_tree_grid.js +50,Closing (Dr),Kapanış (Dr)
-apps/erpnext/erpnext/public/js/account_tree_grid.js +50,Closing (Dr),Kapanış (Dr)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +221,Closing (Dr),Kapanış (Dr)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +221,Closing (Dr),Kapanış (Dr)
 DocType: Contact,Passive,Pasif
 DocType: Contact,Passive,Pasif
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,Seri No {0} stokta değil
@@ -3038,8 +2949,8 @@
 DocType: Bank Reconciliation,Bank Reconciliation,Banka Uzlaşma
 DocType: Bank Reconciliation,Bank Reconciliation,Banka Uzlaşma
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +9,Get Updates,Güncellemeler Alın
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +129,Material Request {0} is cancelled or stopped,Malzeme Talebi {0} iptal edilmiş veya durdurulmuştur
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +641,Add a few sample records,Birkaç örnek kayıtları ekle
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +133,Material Request {0} is cancelled or stopped,Malzeme Talebi {0} iptal edilmiş veya durdurulmuştur
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Add a few sample records,Birkaç örnek kayıtları ekle
 apps/erpnext/erpnext/config/hr.py +210,Leave Management,Yönetim bırakın
 DocType: Event,Groups,Gruplar
 DocType: Event,Groups,Gruplar
@@ -3056,26 +2967,25 @@
 DocType: Features Setup,Sales Extras,Satış Ekstralar
 apps/erpnext/erpnext/accounts/utils.py +344,{0} budget for Account {1} against Cost Center {2} will exceed by {3},Maliyet Merkezi {2}'ye karşı {1} hesabı için {0} bütçesi {3} ile aşılmıştır.
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +236,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Bu Stok Uzlaşma bir Açılış Giriş olduğundan fark Hesabı, bir Aktif / Pasif tipi hesabı olmalıdır"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +138,Purchase Order number required for Item {0},Ürüni {0} için Satınalma Siparişi numarası gerekli
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Order number required for Item {0},Ürüni {0} için Satınalma Siparişi numarası gerekli
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date','Tarihten itibaren ' Tarihine Kadar' dan sonra olmalıdır
 ,Stock Projected Qty,Öngörülen Stok Miktarı
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +147,Customer {0} does not belong to project {1},Müşteri {0} projeye ait değil {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +150,Customer {0} does not belong to project {1},Müşteri {0} projeye ait değil {1}
 DocType: Sales Order,Customer's Purchase Order,Müşterinin Sipariş
 DocType: Warranty Claim,From Company,Şirketten
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,Değer veya Miktar
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Minute,Dakika
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Minute,Dakika
+apps/erpnext/erpnext/public/js/setup_wizard.js +363,Minute,Dakika
+apps/erpnext/erpnext/public/js/setup_wizard.js +363,Minute,Dakika
 DocType: Purchase Invoice,Purchase Taxes and Charges,Alım Vergi ve Harçları
 ,Qty to Receive,Alınacak Miktar
 DocType: Leave Block List,Leave Block List Allowed,Müsaade edilen izin engel listesi
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +61,Conversion factor cannot be in fractions,Dönüşüm faktörü kesirler olamaz
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +358,You will use it to Login,Giriş yapmak için kullanılacak
+apps/erpnext/erpnext/public/js/setup_wizard.js +108,You will use it to Login,Giriş yapmak için kullanılacak
 DocType: Sales Partner,Retailer,Perakendeci
 DocType: Sales Partner,Retailer,Perakendeci
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +99,Credit To account must be a Balance Sheet account,Hesabın için Kredi bir bilanço hesabı olmalıdır
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,Bütün Tedarikçi Tipleri
 apps/erpnext/erpnext/stock/doctype/item/item.py +37,Item Code is mandatory because Item is not automatically numbered,Ürün Kodu zorunludur çünkü Ürün otomatik olarak numaralandırmaz
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +99,Quotation {0} not of type {1},Teklif {0} {1} türünde
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +93,Quotation {0} not of type {1},Teklif {0} {1} türünde
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,Bakım Programı Ürünü
 DocType: Sales Order,%  Delivered,% Teslim Edildi
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,Bank Overdraft Account,Banka Kredili Mevduat Hesabı
@@ -3084,15 +2994,12 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +18,Browse BOM,Araştır BOM
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +175,Secured Loans,Teminatlı Krediler
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +175,Secured Loans,Teminatlı Krediler
-apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +3,Awesome Products,Başarılı Ürünler
+apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +3,Awesome Products,Başarılı Ürünler
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +189,Opening Balance Equity,Açılış Bakiyesi Hisse
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +80,Cannot approve leave as you are not authorized to approve leaves on Block Dates,Engel tarihlerinde izin onaylamaya yetkiniz olmadığından izin onaylanamaz
 DocType: Appraisal,Appraisal,Appraisal:Değerlendirme
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +13,Lost-foam casting,Kayıp köpük döküm
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +47,Drawing,Çizim
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +22,Date is repeated,Tarih tekrarlanır
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +148,Leave approver must be one of {0},Bırakın onaylayan biri olmalıdır {0}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +148,Leave approver must be one of {0},Bırakın onaylayan biri olmalıdır {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +162,Leave approver must be one of {0},Bırakın onaylayan biri olmalıdır {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +162,Leave approver must be one of {0},Bırakın onaylayan biri olmalıdır {0}
 DocType: Hub Settings,Seller Email,Satıcı E-
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Toplam Satınalma Maliyeti (Satın Alma Fatura üzerinden)
 DocType: Workstation Working Hour,Start Time,Başlangıç ​​Zamanı
@@ -3108,7 +3015,7 @@
 DocType: BOM Operation,Hour Rate,Saat Hızı
 DocType: BOM Operation,Hour Rate,Saat Hızı
 DocType: Stock Settings,Item Naming By,Ürün adlandırma
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +642,From Quotation,Fiyat Teklifinden
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +655,From Quotation,Fiyat Teklifinden
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},{1} den sonra başka bir dönem kapatma girdisi {0} yapılmıştır
 DocType: Production Order,Material Transferred for Manufacturing,Malzeme İmalat transfer
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +29,Account {0} does not exists,Hesap {0} yok
@@ -3124,24 +3031,22 @@
 DocType: Purchase Invoice Item,PR Detail,PR Detayı
 DocType: Sales Order,Fully Billed,Tam Faturalı
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +20,Cash In Hand,Eldeki Nakit
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +72,Delivery warehouse required for stock item {0},Teslim depo stok kalemi için gerekli {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +119,Delivery warehouse required for stock item {0},Teslim depo stok kalemi için gerekli {0}
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),Paketin brüt ağırlığı. Genellikle net ağırlığı + ambalaj Ürünü ağırlığı. (Baskı için)
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Bu role sahip kullanıcıların dondurulmuş hesapları ayarlama ve dondurulmuş hesaplara karşı muhasebe girdileri oluşturma/düzenleme yetkileri vardır
 DocType: Serial No,Is Cancelled,İptal edilmiş
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +281,My Shipments,Benim Gönderiler
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +286,My Shipments,Benim Gönderiler
 DocType: Journal Entry,Bill Date,Fatura tarihi
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +43,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","Eğer yüksek öncelikli birden çok Fiyatlandırma Kuralı varsa, şu iç öncelikler geçerli olacaktır."
 DocType: Supplier,Supplier Details,Tedarikçi Ayrıntıları
 DocType: Communication,Recipients,Alıcılar
 DocType: Communication,Recipients,Alıcılar
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +146,Screwing,Vidalama
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +96,Knurling,Tırtık
 DocType: Expense Claim,Approval Status,Onay Durumu
 DocType: Expense Claim,Approval Status,Onay Durumu
 DocType: Hub Settings,Publish Items to Hub,Hub Öğe yayınlayın
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +44,From value must be less than to value in row {0},"Değerden, {0} satırındaki değerden az olmalıdır"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +133,Wire Transfer,Elektronik transfer
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +133,Wire Transfer,Elektronik transfer
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +133,Wire Transfer,Elektronik transfer
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +133,Wire Transfer,Elektronik transfer
 apps/erpnext/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py +25,Please select Bank Account,Banka Hesabı seçiniz
 apps/erpnext/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py +25,Please select Bank Account,Banka Hesabı seçiniz
 DocType: Newsletter,Create and Send Newsletters,Oluşturun ve gönderin Haber
@@ -3151,15 +3056,15 @@
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,Müşteri Grup / Müşteri
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,Müşteri Grup / Müşteri
 DocType: Item Group,Check this if you want to show in website,Web sitesinde göstermek istiyorsanız işaretleyin
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +190,Welcome to ERPNext,Hoşgeldiniz
+,Welcome to ERPNext,Hoşgeldiniz
 DocType: Payment Reconciliation Payment,Voucher Detail Number,Föy Detay Numarası
 apps/erpnext/erpnext/config/crm.py +146,Lead to Quotation,Teklif yol
 DocType: Lead,From Customer,Müşteriden
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +37,Calls,Aramalar
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +37,Calls,Aramalar
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Calls,Aramalar
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Calls,Aramalar
 DocType: Project,Total Costing Amount (via Time Logs),Toplam Maliyet Tutarı (Zaman Kayıtlar üzerinden)
 DocType: Purchase Order Item Supplied,Stock UOM,Stok Uom
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Purchase Order {0} is not submitted,Satınalma Siparişi {0} teslim edilmedi
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +194,Purchase Order {0} is not submitted,Satınalma Siparişi {0} teslim edilmedi
 ,Projected,Öngörülen
 ,Projected,Öngörülen
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},Seri No {0} Depo  {1} e ait değil
@@ -3169,7 +3074,6 @@
 DocType: Issue,Opening Date,Açılış Tarihi
 DocType: Journal Entry,Remark,Dikkat
 DocType: Purchase Receipt Item,Rate and Amount,Br.Fiyat ve Miktar
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +95,Boring,Sıkıcı
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +667,From Sales Order,Satış Emrinden
 DocType: Blog Category,Parent Website Route,Ana Site Rotası
 DocType: Sales Order,Not Billed,Faturalanmamış
@@ -3184,12 +3088,11 @@
 apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount Amount,İndirim Tutarı
 DocType: Purchase Invoice,Return Against Purchase Invoice,Karşı Satınalma Fatura Dönüş
 DocType: Item,Warranty Period (in days),(Gün) Garanti Süresi
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +550,e.g. VAT,Örneğin KDV
+apps/erpnext/erpnext/public/js/setup_wizard.js +292,e.g. VAT,Örneğin KDV
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,Madde 4
 DocType: Journal Entry Account,Journal Entry Account,Dergi Girişi Hesabı
 DocType: Shopping Cart Settings,Quotation Series,Teklif Serisi
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +52,"An item exists with same name ({0}), please change the item group name or rename the item","Bir Ürün aynı isimle bulunuyorsa ({0}), lütfen madde grubunun veya maddenin adını değiştirin"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +82,Hot metal gas forming,Oluşturan sıcak metal gaz
 DocType: Sales Order Item,Sales Order Date,Satış Sipariş Tarihi
 DocType: Sales Order Item,Sales Order Date,Satış Sipariş Tarihi
 DocType: Sales Invoice Item,Delivered Qty,Teslim Edilen Miktar
@@ -3198,7 +3101,6 @@
 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.",Vergi oranı söz uygun grubuna (Fon&gt; Güncel Yükümlülüklerin&gt; Vergi ve Görevleri genellikle Kaynak gidin ve türü &quot;Vergi&quot; nin) Çocuk ekle üzerine tıklayarak (yeni Hesabı oluşturmak ve mutlaka.
 ,Payment Period Based On Invoice Date,Fatura Tarihine Dayalı Ödeme Süresi
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +50,Missing Currency Exchange Rates for {0},Eksik Döviz Kurları {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +135,Laser cutting,Lazer kesim
 DocType: Event,Monday,Pazartesi
 DocType: Event,Monday,Pazartesi
 DocType: Journal Entry,Stock Entry,Stok Girdisi
@@ -3238,7 +3140,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +111,Date Of Retirement must be greater than Date of Joining,Emeklilik Tarihi katılım tarihinden büyük olmalıdır
 DocType: Sales Invoice,Against Income Account,Gelir Hesabı Karşılığı
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +69,{0}% Delivered,{0}% Teslim Edildi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +78,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Öğe {0}: Sıralı qty {1} minimum sipariş qty {2} (Öğe tanımlanan) daha az olamaz.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Öğe {0}: Sıralı qty {1} minimum sipariş qty {2} (Öğe tanımlanan) daha az olamaz.
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Aylık Dağılımı Yüzde
 DocType: Territory,Territory Targets,Bölge Hedefleri
 DocType: Territory,Territory Targets,Bölge Hedefleri
@@ -3248,7 +3150,6 @@
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,"Baskı Şablonları için başlıklar, örneğin Proforma Fatura"
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +140,Valuation type charges can not marked as Inclusive,Değerleme tipi ücretleri dahil olarak işaretlenmiş olamaz
 DocType: POS Profile,Update Stock,Stok güncelle
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +128,Superfinishing,Süperfiniş
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,Ürünler için farklı UOM yanlış (Toplam) net ağırlıklı değere yol açacaktır. Net ağırlıklı değerin aynı olduğundan emin olun.
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM Oranı
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +85,Please pull items from Delivery Note,İrsaliyeden Ürünleri çekin
@@ -3265,7 +3166,6 @@
 DocType: Sales Invoice Item,Delivery Note Item,Ürün İrsaliyesi
 DocType: Expense Claim,Task,Görev
 DocType: Expense Claim,Task,Görev
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +57,Shaving,Tıraş
 DocType: Purchase Taxes and Charges,Reference Row #,Referans Satırı #
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},Toplu numarası Ürün için zorunludur {0}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js +14,This is a root sales person and cannot be edited.,Bu bir kök satış kişisidir ve düzenlenemez.
@@ -3278,14 +3178,12 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +74,Purpose must be one of {0},Amaç şunlardan biri olmalıdır: {0}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +108,Fill the form and save it,Formu doldurun ve kaydedin
 DocType: Production Planning Tool,Download a report containing all raw materials with their latest inventory status,En son stok durumu ile bütün ham maddeleri içeren bir rapor indir
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +94,Facing,Kaplama
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,Forum
 DocType: Leave Application,Leave Balance Before Application,Uygulamadan Önce Kalan İzin
 DocType: SMS Center,Send SMS,SMS Gönder
 DocType: Company,Default Letter Head,Mektubu Başkanı Standart
 DocType: Time Log,Billable,Faturalandırılabilir
 DocType: Time Log,Billable,Faturalandırılabilir
-DocType: Authorization Rule,This will be used for setting rule in HR module,Bu İK modunda ayarlama kuralı için kullanılacaktır
 DocType: Account,Rate at which this tax is applied,Vergi uygulanma oranı
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reorder Qty,Yeniden Sipariş Adet
 DocType: Company,Stock Adjustment Account,Stok Düzeltme Hesabı
@@ -3314,18 +3212,17 @@
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,Yüzde Tahsisi % 100'e eşit olmalıdır
 DocType: Serial No,Out of AMC,Çıkış AMC
 DocType: Purchase Order Item,Material Request Detail No,Malzeme Talebi Detay No
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +97,Hard turning,Sert bir dönüm
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +33,Make Maintenance Visit,Bakım Ziyareti Yapın
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +187,Please contact to the user who have Sales Master Manager {0} role,Satış Usta Müdürü {0} role sahip kullanıcıya irtibata geçiniz
 DocType: Company,Default Cash Account,Standart Kasa Hesabı
 DocType: Company,Default Cash Account,Standart Kasa Hesabı
 apps/erpnext/erpnext/config/accounts.py +79,Company (not Customer or Supplier) master.,Şirket (değil Müşteri veya alanı) usta.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +106,Please enter 'Expected Delivery Date','Beklenen Teslim Tarihi' girin
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +106,Please enter 'Expected Delivery Date','Beklenen Teslim Tarihi' girin
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +187,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Satış Emri iptal edilmeden önce İrsaliyeler {0} iptal edilmelidir
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +100,Please enter 'Expected Delivery Date','Beklenen Teslim Tarihi' girin
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +100,Please enter 'Expected Delivery Date','Beklenen Teslim Tarihi' girin
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +182,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Satış Emri iptal edilmeden önce İrsaliyeler {0} iptal edilmelidir
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +373,Paid amount + Write Off Amount can not be greater than Grand Total,Ödenen miktar + Borç İptali  Toplamdan fazla olamaz
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} Ürün {1} için geçerli bir parti numarası değildir
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,Note: There is not enough leave balance for Leave Type {0},Not: İzin tipi {0} için yeterli izin günü kalmamış
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +124,Note: There is not enough leave balance for Leave Type {0},Not: İzin tipi {0} için yeterli izin günü kalmamış
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +9,"Note: If payment is not made against any reference, make Journal Entry manually.","Not: Ödeme herhangi bir referansa karşı yapılmış değilse, elle Dergisi girişi yapmak."
 DocType: Item,Supplier Items,Tedarikçi Öğeler
 DocType: Opportunity,Opportunity Type,Fırsat Türü
@@ -3340,7 +3237,7 @@
 DocType: Hub Settings,Publish Availability,Durumunu Yayınla
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +105,Date of Birth cannot be greater than today.,Doğum Tarihi bugünkünden daha büyük olamaz.
 ,Stock Ageing,Stok Yaşlanması
-apps/erpnext/erpnext/controllers/accounts_controller.py +200,{0} '{1}' is disabled,{0} '{1}' devre dışı
+apps/erpnext/erpnext/controllers/accounts_controller.py +201,{0} '{1}' is disabled,{0} '{1}' devre dışı
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Açık olarak ayarlayın
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Gönderilmesi işlemlere Kişiler otomatik e-postalar gönderin.
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +232,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
@@ -3352,53 +3249,46 @@
 DocType: Event,Sunday,Pazar
 DocType: Sales Team,Contribution (%),Katkı Payı (%)
 DocType: Sales Team,Contribution (%),Katkı Payı (%)
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +455,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,"'Nakit veya Banka Hesabı' belirtilmediğinden ötürü, Ödeme Girdisi oluşturulmayacaktır"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +171,Responsibilities,Sorumluluklar
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +457,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,"'Nakit veya Banka Hesabı' belirtilmediğinden ötürü, Ödeme Girdisi oluşturulmayacaktır"
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +171,Responsibilities,Sorumluluklar
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Template,Şablon
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Template,Şablon
 DocType: Sales Person,Sales Person Name,Satış Personeli Adı
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,Tabloya en az 1 fatura girin
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +511,Add Users,Kullanıcı Ekle
+apps/erpnext/erpnext/public/js/setup_wizard.js +255,Add Users,Kullanıcı Ekle
 DocType: Pricing Rule,Item Group,Ürün Grubu
 DocType: Pricing Rule,Item Group,Ürün Grubu
 DocType: Task,Actual Start Date (via Time Logs),Fiili Başlangıç ​​Tarihi (Saat Kayıtlar üzerinden)
 DocType: Stock Reconciliation Item,Before reconciliation,Uzlaşma önce
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +12,To {0},Şu kişiye {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Eklenen Vergi ve Harçlar (Şirket Para Birimi)
-apps/erpnext/erpnext/stock/doctype/item/item.py +340,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Ürün Vergi Satırı {0} Vergi Gelir Gider veya Ödenebilir türde hesabı olmalıdır.
+apps/erpnext/erpnext/stock/doctype/item/item.py +344,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Ürün Vergi Satırı {0} Vergi Gelir Gider veya Ödenebilir türde hesabı olmalıdır.
 DocType: Sales Order,Partly Billed,Kısmen Faturalandı
 DocType: Item,Default BOM,Standart BOM
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +79,Decambering,Decambering
 apps/erpnext/erpnext/setup/doctype/company/company.js +22,Please re-type company name to confirm,Re-tipi şirket ismi onaylamak için lütfen
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,Toplam Üstün Tutarı
 DocType: Time Log Batch,Total Hours,Toplam Saat
 DocType: Time Log Batch,Total Hours,Toplam Saat
 DocType: Journal Entry,Printing Settings,Baskı Ayarları
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +268,Total Debit must be equal to Total Credit. The difference is {0},"Toplam Borç Toplam Krediye eşit olmalıdırr. Aradaki fark, {0}"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +11,Automotive,Otomotiv
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +11,Automotive,Otomotiv
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +37,Item is required,Ürün gereklidir
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +37,Item is required,Ürün gereklidir
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +25,Metal injection molding,Metal enjeksiyon kalıplama
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +258,Total Debit must be equal to Total Credit. The difference is {0},"Toplam Borç Toplam Krediye eşit olmalıdırr. Aradaki fark, {0}"
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,Otomotiv
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,Otomotiv
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +684,From Delivery Note,İrsaliyeden
 DocType: Time Log,From Time,Zamandan
 DocType: Notification Control,Custom Message,Özel Mesaj
 DocType: Notification Control,Custom Message,Özel Mesaj
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +33,Investment Banking,Yatırım Bankacılığı
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +33,Investment Banking,Yatırım Bankacılığı
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +261,"Select your Country, Time Zone and Currency","Ülkenizi, Zaman Dilimi ve Para Birimi Seçiniz"
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,Yatırım Bankacılığı
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,Yatırım Bankacılığı
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +316,"Select your Country, Time Zone and Currency","Ülkenizi, Zaman Dilimi ve Para Birimi Seçiniz"
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +369,Cash or Bank Account is mandatory for making payment entry,Kasa veya Banka Hesabı ödeme girişi yapmak için zorunludur
 DocType: Purchase Invoice,Price List Exchange Rate,Fiyat Listesi Döviz Kuru
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +91,Pickling,Asitle temizleme
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +18,Sand casting,Kum döküm
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +117,Electroplating,Elektrokaplama
 DocType: Purchase Invoice Item,Rate, Br.Fiyat
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +62,Intern,Stajyer
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +62,Intern,Stajyer
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Intern,Stajyer
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Intern,Stajyer
 DocType: Newsletter,A Lead with this email id should exist,Bu e-posta sistemde zaten kayıtlı
 DocType: Stock Entry,From BOM,BOM Gönderen
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +34,Basic,Temel
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +34,Basic,Temel
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +34,Basic,Temel
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +34,Basic,Temel
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,{0} dan önceki stok işlemleri dondurulmuştur
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +217,Please click on 'Generate Schedule','Takvim Oluştura' tıklayınız
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +61,To Date should be same as From Date for Half Day leave,Tarihine Kadar ile Tarihinden itibaren aynı olmalıdır
@@ -3407,13 +3297,13 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +108,Date of Joining must be greater than Date of Birth,Katılım Tarihi Doğum Tarihinden büyük olmalıdır
 DocType: Salary Structure,Salary Structure,Maaş Yapısı
 DocType: Salary Structure,Salary Structure,Maaş Yapısı
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +242,"Multiple Price Rule exists with same criteria, please resolve \
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +246,"Multiple Price Rule exists with same criteria, please resolve \
 			conflict by assigning priority. Price Rules: {0}","Çoklu Fiyat Kural aynı kriterlerle var, öncelik atayarak \
  çatışmayı çözmek lütfen. Fiyat Kuralları: {0}"
 DocType: Account,Bank,Banka
 DocType: Account,Bank,Banka
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +9,Airline,Havayolu
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +9,Airline,Havayolu
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,Havayolu
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,Havayolu
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +493,Issue Material,Sayı Malzeme
 DocType: Material Request Item,For Warehouse,Depo için
 DocType: Material Request Item,For Warehouse,Depo için
@@ -3426,34 +3316,29 @@
 DocType: Item,Is Fixed Asset Item,Sabit Varlık Maddesi
 DocType: Stock Entry,Including items for sub assemblies,Alt montajlar için öğeleri içeren
 DocType: Features Setup,"If you have long print formats, this feature can be used to split the page to be printed on multiple pages with all headers and footers on each page","Uzun baskı formatlarınız varsa, bu özellik basılacak sayfayı başlıkları ve dipnotları her sayfada olmak üzere birden fazla sayfaya bölmek için kullanılabilir"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +131,Hobbing,Azdırma
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +98,All Territories,Bütün Bölgeler
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +98,All Territories,Bütün Bölgeler
 DocType: Purchase Invoice,Items,Ürünler
 DocType: Purchase Invoice,Items,Ürünler
 DocType: Fiscal Year,Year Name,Yıl Adı
 DocType: Fiscal Year,Year Name,Yıl Adı
 DocType: Process Payroll,Process Payroll,Süreç Bordrosu
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +59,There are more holidays than working days this month.,Bu ayda çalışma günlerinden daha fazla tatil vardır.
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +68,There are more holidays than working days this month.,Bu ayda çalışma günlerinden daha fazla tatil vardır.
 DocType: Product Bundle Item,Product Bundle Item,Ürün Paketi Ürün
 DocType: Sales Partner,Sales Partner Name,Satış Ortağı Adı
 DocType: Sales Partner,Sales Partner Name,Satış Ortağı Adı
 DocType: Purchase Invoice Item,Image View,Resim Görüntüle
 DocType: Purchase Invoice Item,Image View,Resim Görüntüle
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +113,Finishing & industrial finishing,Terbiye ve endüstriyel bitirme
 DocType: Issue,Opening Time,Açılış Zamanı
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,Tarih aralığı gerekli
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +46,Securities & Commodity Exchanges,Teminatlar ve Emtia Borsaları
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Teminatlar ve Emtia Borsaları
 DocType: Shipping Rule,Calculate Based On,Tabanlı hesaplayın
 DocType: Delivery Note Item,From Warehouse,Atölyesi&#39;nden
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +98,Drilling,Delme
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +28,Blow molding,Şişirme
 DocType: Purchase Taxes and Charges,Valuation and Total,Değerleme ve Toplam
 DocType: Purchase Taxes and Charges,Valuation and Total,Değerleme ve Toplam
 DocType: Tax Rule,Shipping City,Nakliye Şehri
 apps/erpnext/erpnext/stock/doctype/item/item.js +43,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,Bu Öğe {0} (Şablon) bir Variant olduğunu. 'Hayır Kopyala' ayarlanmadığı sürece Öznitelikler şablon üzerinden kopyalanır
 DocType: Account,Purchase User,Satınalma Kullanıcı
 DocType: Notification Control,Customize the Notification,Bildirim özelleştirin
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +87,Hammering,Dövme
 DocType: Web Page,Slideshow,Slayt Gösterisi
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +24,Default Address Template cannot be deleted,Varsayılan Adres Şablon silinemez
 DocType: Sales Invoice,Shipping Rule,Kargo Kuralı
@@ -3463,10 +3348,9 @@
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +54,Total cannot be zero,Toplam sıfır olamaz
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +54,Total cannot be zero,Toplam sıfır olamaz
 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,'Son Siparişten bu yana geçen süre' sıfırdan büyük veya sıfıra eşit olmalıdır
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +142,Brazing,Lehimleme
 DocType: C-Form,Amended From,İtibaren değiştirilmiş
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Raw Material,Hammadde
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Raw Material,Hammadde
+apps/erpnext/erpnext/public/js/setup_wizard.js +359,Raw Material,Hammadde
+apps/erpnext/erpnext/public/js/setup_wizard.js +359,Raw Material,Hammadde
 DocType: Leave Application,Follow via Email,E-posta ile takip
 DocType: Leave Application,Follow via Email,E-posta ile takip
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,İndirim Tutarından sonraki vergi miktarı
@@ -3483,11 +3367,11 @@
 ,Produced,Üretilmiş
 DocType: Item,Item Code for Suppliers,Tedarikçi Ürün Kodu
 DocType: Issue,Raised By (Email),(Email)  ile talep edilen
-apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +72,General,Genel
-apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +72,General,Genel
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +495,Attach Letterhead,Antetli Kağıt Ekleyin
+apps/erpnext/erpnext/setup/setup_wizard/default_website.py +72,General,Genel
+apps/erpnext/erpnext/setup/setup_wizard/default_website.py +72,General,Genel
+apps/erpnext/erpnext/public/js/setup_wizard.js +241,Attach Letterhead,Antetli Kağıt Ekleyin
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +272,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',Kategori 'Değerleme' veya 'Toplam ve Değerleme' olduğu zaman çıkarılamaz
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +542,"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.","Vergi kafaları Liste (örn KDV, gümrük vb; onlar benzersiz adlara sahip olmalıdır) ve bunların standart oranları. Bu düzenlemek ve daha sonra ekleyebilirsiniz standart bir şablon oluşturmak olacaktır."
+apps/erpnext/erpnext/public/js/setup_wizard.js +284,"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.","Vergi kafaları Liste (örn KDV, gümrük vb; onlar benzersiz adlara sahip olmalıdır) ve bunların standart oranları. Bu düzenlemek ve daha sonra ekleyebilirsiniz standart bir şablon oluşturmak olacaktır."
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial Nos Required for Serialized Item {0},Seri Ürün{0} için Seri numaraları gereklidir
 DocType: Journal Entry,Bank Entry,Banka Girişi
 DocType: Authorization Rule,Applicable To (Designation),(Görev) için uygulanabilir
@@ -3497,39 +3381,38 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Postal Expenses,Posta Giderleri
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Postal Expenses,Posta Giderleri
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Toplam (Amt)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +26,Entertainment & Leisure,Eğlence ve Boş Zaman
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +26,Entertainment & Leisure,Eğlence ve Boş Zaman
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,Eğlence ve Boş Zaman
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,Eğlence ve Boş Zaman
 DocType: Purchase Order,The date on which recurring order will be stop,yinelenen sipariş durdurmak hangi tarih
 DocType: Quality Inspection,Item Serial No,Ürün Seri No
 DocType: Quality Inspection,Item Serial No,Ürün Seri No
 apps/erpnext/erpnext/controllers/status_updater.py +142,{0} must be reduced by {1} or you should increase overflow tolerance,{0} değeri {1} oranında azaltılmalıdır veya tolerans durumu artırılmalıdır 
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Present,Toplam Mevcut
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Hour,Saat
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Hour,Saat
+apps/erpnext/erpnext/public/js/setup_wizard.js +363,Hour,Saat
+apps/erpnext/erpnext/public/js/setup_wizard.js +363,Hour,Saat
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +138,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation","Serileştirilmiş Öğe {0} Stok Uzlaşma kullanarak \
  güncellenmiş olamaz"
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +488,Transfer Material to Supplier,Tedarikçi Malzeme Transferi
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +513,Transfer Material to Supplier,Tedarikçi Malzeme Transferi
 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,Yeni Seri No Warehouse olamaz. Depo Stok girişiyle veya alım makbuzuyla ayarlanmalıdır
 DocType: Lead,Lead Type,Talep Yaratma Tipi
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +82,Create Quotation,Teklif oluşturma
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +306,All these items have already been invoiced,Bütün Ürünler zaten faturalandırılmıştır
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,You are not authorized to approve leaves on Block Dates,Blok Tarihlerde yaprakları onaylama yetkiniz yok
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +311,All these items have already been invoiced,Bütün Ürünler zaten faturalandırılmıştır
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},{0} tarafından onaylanmış
 DocType: Shipping Rule,Shipping Rule Conditions,Kargo Kural Koşulları
 DocType: BOM Replace Tool,The new BOM after replacement,Değiştirilmesinden sonra yeni BOM
 DocType: Features Setup,Point of Sale,Satış Noktası
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +83,Curling,Kıvırma
 DocType: Account,Tax,Vergi
 DocType: Account,Tax,Vergi
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +28,Row {0}: {1} is not a valid {2},Satır {0}: {1} geçerli değil {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +89,Refining,Inceltme
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +37,Row {0}: {1} is not a valid {2},Satır {0}: {1} geçerli değil {2}
 DocType: Production Planning Tool,Production Planning Tool,Üretim Planlama Aracı
 DocType: Production Planning Tool,Production Planning Tool,Üretim Planlama Aracı
 DocType: Quality Inspection,Report Date,Rapor Tarihi
 DocType: Quality Inspection,Report Date,Rapor Tarihi
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +130,Routing,Yönlendirme
 DocType: C-Form,Invoices,Faturalar
 DocType: Job Opening,Job Title,İş Unvanı
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +54,{0} already allocated for Employee {1} for period {2} - {3},{0} zaten dönem için Çalışanı {1} için ayrılan {2} - {3}
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +80,{0} Recipients,{0} Alıcılar
 DocType: Features Setup,Item Groups in Details,Ayrıntılı Ürün Grupları
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +335,Quantity to Manufacture must be greater than 0.,Üretim Miktar 0&#39;dan büyük olmalıdır.
@@ -3551,15 +3434,14 @@
 DocType: DocType,Setup,Kurulum
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,Düzenlenecek bir şey yok
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +108,Summary for this month and pending activities,Bu ay ve bekleyen aktiviteler için Özet
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +39,Cold rolling,Soğuk haddeleme
 DocType: Customer Group,Customer Group Name,Müşteri Grup Adı
 DocType: Customer Group,Customer Group Name,Müşteri Grup Adı
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +408,Please remove this Invoice {0} from C-Form {1},C-Form bu Fatura {0} kaldırın lütfen {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +410,Please remove this Invoice {0} from C-Form {1},C-Form bu Fatura {0} kaldırın lütfen {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,Geçen mali yılın bakiyelerini bu mali yıla dahil etmek isterseniz Lütfen İleri Taşıyı seçin
 DocType: GL Entry,Against Voucher Type,Dekont  Tipi Karşılığı
 DocType: Item,Attributes,Nitelikler
 DocType: Packing Slip,Get Items,Ürünleri alın
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +186,Please enter Write Off Account,Borç Silme Hesabı Girin
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +187,Please enter Write Off Account,Borç Silme Hesabı Girin
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +71,Last Order Date,Son Sipariş Tarihi
 DocType: DocField,Image,Resim
 DocType: DocField,Image,Resim
@@ -3572,7 +3454,7 @@
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +146,Operation ID not set,Çalışma kimliği ayarlanmamış
 DocType: Production Order,Planned Start Date,Planlanan Başlangıç ​​Tarihi
 DocType: Serial No,Creation Document Type,Oluşturulan Belge Türü
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +620,Maint. Visit,Bakım. Ziyaret
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +631,Maint. Visit,Bakım. Ziyaret
 DocType: Leave Type,Is Encash,Bozdurulmuş
 DocType: Purchase Invoice,Mobile No,Mobil No
 DocType: Payment Tool,Make Journal Entry,Dergi Girişi Yap
@@ -3581,12 +3463,12 @@
 DocType: Project,Expected End Date,Beklenen Bitiş Tarihi
 DocType: Project,Expected End Date,Beklenen Bitiş Tarihi
 DocType: Appraisal Template,Appraisal Template Title,Değerlendirme Şablonu Başlığı
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +440,Commercial,Ticari
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +440,Commercial,Ticari
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +378,Commercial,Ticari
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +378,Commercial,Ticari
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +23,Parent Item {0} must not be a Stock Item,Veli Öğe {0} Stok Öğe olmamalıdır
 DocType: Cost Center,Distribution Id,Dağıtım Kimliği
 DocType: Cost Center,Distribution Id,Dağıtım Kimliği
-apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +14,Awesome Services,Başarılı Hizmetler
+apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +14,Awesome Services,Başarılı Hizmetler
 apps/erpnext/erpnext/config/manufacturing.py +29,All Products or Services.,Bütün Ürünler veya Hizmetler.
 DocType: Purchase Invoice,Supplier Address,Tedarikçi Adresi
 DocType: Purchase Invoice,Supplier Address,Tedarikçi Adresi
@@ -3594,29 +3476,25 @@
 DocType: Contact Us Settings,Address Line 2,Adres Satırı 2
 DocType: ToDo,Reference,Referans
 DocType: ToDo,Reference,Referans
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +59,Perforating,Perforan
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,Çıkış Miktarı
 apps/erpnext/erpnext/config/accounts.py +128,Rules to calculate shipping amount for a sale,Bir Satış için nakliye miktarı hesaplama için kuralları
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +29,Series is mandatory,Seri zorunludur
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +28,Financial Services,Finansal Hizmetler
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +28,Financial Services,Finansal Hizmetler
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,Finansal Hizmetler
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,Finansal Hizmetler
 apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3},{0} Attribute değer aralığında olmalıdır {1} {2} artışlarla {3}
 DocType: Tax Rule,Sales,Satışlar
 DocType: Stock Entry Detail,Basic Amount,Temel Tutar
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +173,Warehouse required for stock Item {0},Stok Ürünü {0} için depo gereklidir
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +178,Warehouse required for stock Item {0},Stok Ürünü {0} için depo gereklidir
 DocType: Leave Allocation,Unused leaves,Kullanılmayan yapraklar
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,Cr
 DocType: Customer,Default Receivable Accounts,Alacak Hesapları Standart
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +102,Sawing,Testere
 DocType: Tax Rule,Billing State,Fatura Devlet
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +32,Laminating,Laminasyon
 DocType: Item Reorder,Transfer,Transfer
 DocType: Item Reorder,Transfer,Transfer
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +549,Fetch exploded BOM (including sub-assemblies),(Alt-montajlar dahil) patlamış BOM'ları getir
 DocType: Authorization Rule,Applicable To (Employee),(Çalışana) uygulanabilir
 apps/erpnext/erpnext/controllers/accounts_controller.py +101,Due Date is mandatory,Due Date zorunludur
 apps/erpnext/erpnext/controllers/item_variant.py +51,Increment for Attribute {0} cannot be 0,Attribute için Artım {0} 0 olamaz
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +143,Sintering,Sinterleme
 DocType: Journal Entry,Pay To / Recd From,Gönderen/Alınan
 DocType: Naming Series,Setup Series,Kurulum Serisi
 DocType: Naming Series,Setup Series,Kurulum Serisi
@@ -3632,7 +3510,6 @@
 DocType: Attendance,Absent,Eksik
 DocType: Product Bundle,Product Bundle,Ürün Paketi
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +180,Row {0}: Invalid reference {1},Satır {0}: Geçersiz başvuru {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +165,Crushing,Ezme
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Vergiler ve Harçlar Şablon Satınalma
 DocType: Upload Attendance,Download Template,Şablonu İndir
 DocType: GL Entry,Remarks,Açıklamalar
@@ -3642,15 +3519,13 @@
 DocType: Features Setup,POS View,POS görüntüle
 DocType: Features Setup,POS View,POS görüntüle
 apps/erpnext/erpnext/config/stock.py +38,Installation record for a Serial No.,Bir Seri No için kurulum kaydı.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +9,Continuous casting,Sürekli döküm
 apps/erpnext/erpnext/public/js/queries.js +39,Please specify a,Lütfen belirtiniz
 apps/erpnext/erpnext/public/js/queries.js +39,Please specify a,Lütfen belirtiniz
 DocType: Offer Letter,Awaiting Response,Tepki bekliyor
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +53,Above,Yukarıdaki
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +80,Cold sizing,Soğuk boyutlandırma
 DocType: Salary Slip,Earning & Deduction,Kazanma & Kesintisi
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +76,Account {0} cannot be a Group,Hesap {0} Grup olamaz
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +259,Region,Bölge
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +314,Region,Bölge
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +213,Optional. This setting will be used to filter in various transactions.,İsteğe bağlı. Bu ayar çeşitli işlemlerde filtreleme yapmak için kullanılacaktır
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +104,Negative Valuation Rate is not allowed,Negatif Değerleme Br.Fiyatına izin verilmez
 DocType: Holiday List,Weekly Off,Haftalık İzin
@@ -3671,7 +3546,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,Account {0} is inactive,Hesap {0} etkin değil
 DocType: GL Entry,Is Advance,Avans
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,tarihinden  Tarihine kadar katılım zorunludur
-apps/erpnext/erpnext/controllers/buying_controller.py +131,Please enter 'Is Subcontracted' as Yes or No,'Taşeron var mı' alanına Evet veya Hayır giriniz
+apps/erpnext/erpnext/controllers/buying_controller.py +122,Please enter 'Is Subcontracted' as Yes or No,'Taşeron var mı' alanına Evet veya Hayır giriniz
 DocType: Sales Team,Contact No.,İletişim No
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,'Profit and Loss' type account {0} not allowed in Opening Entry,'Kar ve Zarar' tipi hesaba {0} izin verilmez
 DocType: Workflow State,Time,Zaman
@@ -3682,15 +3557,14 @@
 DocType: Sales Invoice,Terms and Conditions Details,Şartlar ve Koşullar Detayları
 DocType: Sales Invoice,Terms and Conditions Details,Şartlar ve Koşullar Detayları
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,Satış Vergi ve Harçlar Şablon
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +10,Apparel & Accessories,Giyim ve Aksesuar
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +10,Apparel & Accessories,Giyim ve Aksesuar
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,Giyim ve Aksesuar
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,Giyim ve Aksesuar
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +67,Number of Order,Sipariş Sayısı
 DocType: Item Group,HTML / Banner that will show on the top of product list.,Ürün listesinin tepesinde görünecek HTML / Banner.
 DocType: Shipping Rule,Specify conditions to calculate shipping amount,Nakliye miktarını hesaplamak için koşulları belirtin
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +121,Add Child,Alt öğe ekle
 DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,Rol Dondurulmuş Hesaplar ve Düzenleme Dondurulmuş Girişleri Set İzin
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +52,Cannot convert Cost Center to ledger as it has child nodes,Çocuk nodları olduğundan Maliyet Merkezi ana deftere dönüştürülemez
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +47,Conversion Factor is required,Katsayı gereklidir
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +37,Serial #,Seri #
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +87,Commission on Sales,Satış Komisyonu
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +87,Commission on Sales,Satış Komisyonu
@@ -3700,11 +3574,9 @@
 DocType: Production Order,Expected Delivery Date,Beklenen Teslim Tarihi
 DocType: Production Order,Expected Delivery Date,Beklenen Teslim Tarihi
 apps/erpnext/erpnext/accounts/general_ledger.py +121,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Borç ve Kredi {0} # için eşit değil {1}. Fark {2}.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +48,Bulging,Şişkin
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +11,Evaporative-pattern casting,Evaporatif-model döküm
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Entertainment Expenses,Eğlence Giderleri
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Entertainment Expenses,Eğlence Giderleri
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +195,Sales Invoice {0} must be cancelled before cancelling this Sales Order,Satış Faturası {0} bu Satış Siparişi iptal edilmeden önce iptal edilmelidir
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +190,Sales Invoice {0} must be cancelled before cancelling this Sales Order,Satış Faturası {0} bu Satış Siparişi iptal edilmeden önce iptal edilmelidir
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +61,Age,Yaş
 DocType: Time Log,Billing Amount,Fatura Tutarı
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +84,Invalid quantity specified for item {0}. Quantity should be greater than 0.,Ürün {0} için geçersiz miktar belirtildi. Miktar 0 dan fazla olmalıdır
@@ -3730,29 +3602,27 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Travel Expenses,Seyahat Giderleri
 DocType: Maintenance Visit,Breakdown,Arıza
 DocType: Maintenance Visit,Breakdown,Arıza
-apps/erpnext/erpnext/controllers/accounts_controller.py +241,Account: {0} with currency: {1} can not be selected,Hesap: {0} para ile: {1} seçilemez
+apps/erpnext/erpnext/controllers/accounts_controller.py +242,Account: {0} with currency: {1} can not be selected,Hesap: {0} para ile: {1} seçilemez
 DocType: Bank Reconciliation Detail,Cheque Date,Çek Tarih
 apps/erpnext/erpnext/accounts/doctype/account/account.py +47,Account {0}: Parent account {1} does not belong to company: {2},Hesap {0}: Ana hesap {1} şirkete ait değil: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted all transactions related to this company!,Başarıyla bu şirket ile ilgili tüm işlemleri silindi!
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,Tarihinde gibi
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +111,Honing,Honlama
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +58,Probation,Deneme Süresi
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +58,Probation,Deneme Süresi
-apps/erpnext/erpnext/stock/doctype/item/item.py +264,Default Warehouse is mandatory for stock Item.,Standart Depo stok Ürünleri için zorunludur.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Probation,Deneme Süresi
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Probation,Deneme Süresi
+apps/erpnext/erpnext/stock/doctype/item/item.py +268,Default Warehouse is mandatory for stock Item.,Standart Depo stok Ürünleri için zorunludur.
 DocType: Feed,Full Name,Tam Adı
 DocType: Feed,Full Name,Tam Adı
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +148,Clinching,Clinching
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +191,Payment of salary for the month {0} and year {1},Ay {0} ve yıl {1} için maaş ödemesi
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +173,Payment of salary for the month {0} and year {1},Ay {0} ve yıl {1} için maaş ödemesi
 DocType: Stock Settings,Auto insert Price List rate if missing,Otomatik ekleme Fiyat Listesi oranı eksik ise
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,Toplam Ödenen Tutar
 ,Transferred Qty,Transfer Edilen Miktar
 apps/erpnext/erpnext/config/learn.py +11,Navigating,Gezinme
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +137,Planning,Planlama
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +137,Planning,Planlama
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +137,Planning,Planlama
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +137,Planning,Planlama
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +9,Make Time Log Batch,Günlük Parti oluşturun
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Issued,Veriliş
 DocType: Project,Total Billing Amount (via Time Logs),Toplam Fatura Tutarı (Zaman Kayıtlar üzerinden)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +629,We sell this Item,Bu ürünü satıyoruz
+apps/erpnext/erpnext/public/js/setup_wizard.js +365,We sell this Item,Bu ürünü satıyoruz
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +65,Supplier Id,Tedarikçi Kimliği
 DocType: Journal Entry,Cash Entry,Nakit Girişi
 DocType: Sales Partner,Contact Desc,İrtibat Desc
@@ -3761,22 +3631,20 @@
 DocType: Brand,Item Manager,Ürün Yöneticisi
 DocType: Cost Center,Add rows to set annual budgets on Accounts.,Hesaplarda yıllık bütçeleri ayarlamak için kolon ekle.
 DocType: Buying Settings,Default Supplier Type,Standart Tedarikçii Türü
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +160,Quarrying,Taşocakçılığı
 DocType: Production Order,Total Operating Cost,Toplam İşletme Maliyeti
 DocType: Production Order,Total Operating Cost,Toplam İşletme Maliyeti
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +160,Note: Item {0} entered multiple times,Not: Ürün {0} birden çok kez girilmiş
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +160,Note: Item {0} entered multiple times,Not: Ürün {0} birden çok kez girilmiş
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +163,Note: Item {0} entered multiple times,Not: Ürün {0} birden çok kez girilmiş
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +163,Note: Item {0} entered multiple times,Not: Ürün {0} birden çok kez girilmiş
 apps/erpnext/erpnext/config/crm.py +27,All Contacts.,Tüm Kişiler.
 apps/erpnext/erpnext/config/crm.py +27,All Contacts.,Tüm Kişiler.
 DocType: Newsletter,Test Email Id,Test E-posta Kimliği
 DocType: Newsletter,Test Email Id,Test E-posta Kimliği
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +394,Company Abbreviation,Şirket Kısaltma
+apps/erpnext/erpnext/public/js/setup_wizard.js +142,Company Abbreviation,Şirket Kısaltma
 DocType: Features Setup,If you follow Quality Inspection. Enables Item QA Required and QA No in Purchase Receipt,Kalite Denetimini izlerseniz Alım Makbuzunda Ürünlerin Kalite Güvencesini ve Kalite Güvence numarasını verir.
 DocType: GL Entry,Party Type,Taraf Türü
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +68,Raw material cannot be same as main Item,Hammadde ana Malzeme ile aynı olamaz
 DocType: Item Attribute Value,Abbreviation,Kısaltma
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,{0} Yetkili değil {0} sınırı aşar
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +30,Rotational molding,Dönme kalıplama
 apps/erpnext/erpnext/config/hr.py +115,Salary template master.,Maaş Şablon Alanı.
 DocType: Leave Type,Max Days Leave Allowed,En fazla izin günü
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +55,Set Tax Rule for shopping cart,Alışveriş sepeti için ayarla Vergi Kural
@@ -3790,8 +3658,8 @@
 apps/erpnext/erpnext/config/selling.py +18,Quotes to Leads or Customers.,Müşterilere veya Taleplere verilen fiyatlar.
 DocType: Stock Settings,Role Allowed to edit frozen stock,dondurulmuş stok düzenlemeye İzinli rol
 ,Territory Target Variance Item Group-Wise,Bölge Hedef Varyans Ürün Grubu
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +101,All Customer Groups,Bütün Müşteri Grupları
-apps/erpnext/erpnext/controllers/accounts_controller.py +474,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} zorunludur. {1} ve {2} için Döviz kaydı oluşturulmayabilir.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +101,All Customer Groups,Bütün Müşteri Grupları
+apps/erpnext/erpnext/controllers/accounts_controller.py +475,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} zorunludur. {1} ve {2} için Döviz kaydı oluşturulmayabilir.
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +37,Tax Template is mandatory.,Vergi Şablon zorunludur.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +41,Account {0}: Parent account {1} does not exist,Hesap {0}: Ana hesap {1} yok
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Fiyat Listesi Oranı (Şirket para birimi)
@@ -3800,8 +3668,8 @@
 DocType: Address,Preferred Billing Address,Tercih edilen Fatura Adresi
 DocType: Monthly Distribution Percentage,Percentage Allocation,Yüzde Tahsisi
 DocType: Monthly Distribution Percentage,Percentage Allocation,Yüzde Tahsisi
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +86,Secretary,Sekreter
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +86,Secretary,Sekreter
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Secretary,Sekreter
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Secretary,Sekreter
 DocType: Serial No,Distinct unit of an Item,Bir Öğe Farklı birim
 DocType: Pricing Rule,Buying,Satın alma
 DocType: HR Settings,Employee Records to be created by,Oluşturulacak Çalışan Kayıtları
@@ -3814,9 +3682,8 @@
 ,Item-wise Price List Rate,Ürün bilgisi Fiyat Listesi Oranı
 DocType: Purchase Order Item,Supplier Quotation,Tedarikçi Teklifi
 DocType: Quotation,In Words will be visible once you save the Quotation.,fiyat teklifini kaydettiğinizde görünür olacaktır
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +68,Ironing,Ütü
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is stopped,{0} {1} durduruldu
-apps/erpnext/erpnext/stock/doctype/item/item.py +352,Barcode {0} already used in Item {1},Barkod {0} zaten Ürün {1} de kullanılmış
+apps/erpnext/erpnext/stock/doctype/item/item.py +356,Barcode {0} already used in Item {1},Barkod {0} zaten Ürün {1} de kullanılmış
 DocType: Lead,Add to calendar on this date,Bu tarihe Takvime ekle
 apps/erpnext/erpnext/config/selling.py +132,Rules for adding shipping costs.,Nakliye maliyetleri ekleme  Kuralları.
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,Yaklaşan Etkinlikler
@@ -3826,16 +3693,15 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +27,Quick Entry,Hızlı Girişi
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0} Dönüş için zorunludur
 DocType: Purchase Order,To Receive,Almak
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +33,Shrink fitting,Uydurma Shrink
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +522,user@example.com,user@example.com
+apps/erpnext/erpnext/public/js/setup_wizard.js +266,user@example.com,user@example.com
 DocType: Email Digest,Income / Expense,Gelir / Gider
 DocType: Email Digest,Income / Expense,Gelir / Gider
 DocType: Employee,Personal Email,Kişisel E-posta
 DocType: Employee,Personal Email,Kişisel E-posta
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +58,Total Variance,Toplam Varyans
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +62,Total Variance,Toplam Varyans
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.","Etkinse, sistem otomatik olarak envanter için muhasebe kayıtlarını yayınlayacaktır"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +15,Brokerage,Komisyonculuk
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +15,Brokerage,Komisyonculuk
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +15,Brokerage,Komisyonculuk
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +15,Brokerage,Komisyonculuk
 DocType: Address,Postal Code,Posta Kodu
 DocType: Production Order Operation,"in Minutes
 Updated via 'Time Log'","Dakika 
@@ -3844,17 +3710,16 @@
 apps/erpnext/erpnext/config/manufacturing.py +19,Orders released for production.,Üretim için verilen emirler.
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +42,Select Fiscal Year...,Mali Yıl Seçin ...
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +42,Select Fiscal Year...,Mali Yıl Seçin ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +442,POS Profile required to make POS Entry,POS Profil POS Girişi yapmak için gerekli
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +444,POS Profile required to make POS Entry,POS Profil POS Girişi yapmak için gerekli
 DocType: Hub Settings,Name Token,İsim Jetonu
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +106,Planing,Rendeleme
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Selling,Standart Satış
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Selling,Standart Satış
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +120,Standard Selling,Standart Satış
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +120,Standard Selling,Standart Satış
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +137,Atleast one warehouse is mandatory,En az bir depo zorunludur
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +137,Atleast one warehouse is mandatory,En az bir depo zorunludur
 DocType: Serial No,Out of Warranty,Garanti Dışı
 DocType: Serial No,Out of Warranty,Garanti Dışı
 DocType: BOM Replace Tool,Replace,Değiştir
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +314,{0} against Sales Invoice {1},{0} Satış Faturasına karşı {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +316,{0} against Sales Invoice {1},{0} Satış Faturasına karşı {1}
 apps/erpnext/erpnext/stock/doctype/item/item.py +49,Please enter default Unit of Measure,Lütfen Varsayılan Ölçü birimini girin
 DocType: Purchase Invoice Item,Project Name,Proje Adı
 DocType: Purchase Invoice Item,Project Name,Proje Adı
@@ -3874,10 +3739,9 @@
 DocType: Item,Moving Average,Hareketli Ortalama
 DocType: Item,Moving Average,Hareketli Ortalama
 DocType: BOM Replace Tool,The BOM which will be replaced,Değiştirilecek BOM
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +43,New Stock UOM must be different from current stock UOM,Yeni Stok UOM mevcut stok UOM dan farklı olmalıdır
 DocType: Account,Debit,Borç
 DocType: Account,Debit,Borç
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +34,Leaves must be allocated in multiples of 0.5,İzinler 0.5 katlanarak tahsis edilmelidir
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +44,Leaves must be allocated in multiples of 0.5,İzinler 0.5 katlanarak tahsis edilmelidir
 DocType: Production Order,Operation Cost,Operasyon Maliyeti
 apps/erpnext/erpnext/config/hr.py +71,Upload attendance from a .csv file,Bir. Csv dosyasından devamlılığı yükle
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,Üstün Amt
@@ -3900,9 +3764,8 @@
 DocType: DocField,Column Break,Sütun Arası
 DocType: Event,Thursday,Perşembe
 DocType: Event,Thursday,Perşembe
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +42,Private Equity,Özel Sermaye
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +42,Private Equity,Özel Sermaye
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +93,Turning,Dönme
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,Özel Sermaye
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,Özel Sermaye
 DocType: Maintenance Visit,Customer Feedback,Müşteri Görüşleri
 DocType: Account,Expense,Gider
 DocType: Account,Expense,Gider
@@ -3919,22 +3782,22 @@
 DocType: Employee,Held On,Yapılan
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +33,Production Item,Üretim Öğe
 ,Employee Information,Çalışan Bilgileri
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,Rate (%),Oranı (%)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,Rate (%),Oranı (%)
+apps/erpnext/erpnext/public/js/setup_wizard.js +294,Rate (%),Oranı (%)
+apps/erpnext/erpnext/public/js/setup_wizard.js +294,Rate (%),Oranı (%)
 DocType: Stock Entry Detail,Additional Cost,Ek maliyet
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +407,Financial Year End Date,Mali Yıl Bitiş Tarihi
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +407,Financial Year End Date,Mali Yıl Bitiş Tarihi
+apps/erpnext/erpnext/public/js/setup_wizard.js +155,Financial Year End Date,Mali Yıl Bitiş Tarihi
+apps/erpnext/erpnext/public/js/setup_wizard.js +155,Financial Year End Date,Mali Yıl Bitiş Tarihi
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Voucher No, if grouped by Voucher","Dekont, olarak gruplandırıldı ise Makbuz numarasına dayalı filtreleme yapamaz"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +484,Make Supplier Quotation,Tedarikçi Teklifi Oluştur
 DocType: Quality Inspection,Incoming,Alınan
 DocType: BOM,Materials Required (Exploded),Gerekli Malzemeler (patlamış)
 DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),Ücretsiz İzin (Üİ) için Kazancı azalt
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +512,"Add users to your organization, other than yourself",Kendiniz dışında kuruluşunuz kullanıcıları ekle
+apps/erpnext/erpnext/public/js/setup_wizard.js +256,"Add users to your organization, other than yourself",Kendiniz dışında kuruluşunuz kullanıcıları ekle
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No {1} does not match with {2} {3},Satır # {0}: Seri No {1} ile eşleşmiyor {2} {3}
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +44,Casual Leave,Mazeret İzni
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +44,Casual Leave,Mazeret İzni
 DocType: Batch,Batch ID,Seri Kimliği
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +334,Note: {0},Not: {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +334,Note: {0},Not: {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +336,Note: {0},Not: {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +336,Note: {0},Not: {0}
 ,Delivery Note Trends,İrsaliye Eğilimleri;
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +104,This Week's Summary,Bu Haftanın Özeti
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +74,{0} must be a Purchased or Sub-Contracted Item in row {1},{0} satır {1} de Alınan veya Taşerona verilen bir Ürün olmalıdır.
@@ -3947,8 +3810,8 @@
 DocType: Purchase Receipt,Return Against Purchase Receipt,Satınalma Makbuzu Karşı dön
 DocType: Purchase Order,To Bill,Bill için
 DocType: Material Request,% Ordered,% Sipariş edildi
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +61,Piecework,Parça başı iş
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +61,Piecework,Parça başı iş
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Piecework,Parça başı iş
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Piecework,Parça başı iş
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +64,Avg. Buying Rate,Ort. Alış Oranı
 DocType: Task,Actual Time (in Hours),(Saati) Gerçek Zaman
 DocType: Employee,History In Company,Şirketteki Geçmişi
@@ -3968,13 +3831,13 @@
 DocType: SMS Settings,SMS Settings,SMS Ayarları
 DocType: SMS Settings,SMS Settings,SMS Ayarları
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +60,Temporary Accounts,Geçici Hesaplar
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +155,Black,Siyah
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Black,Siyah
 DocType: BOM Explosion Item,BOM Explosion Item,BOM Patlatılmış Malzemeler
 DocType: Account,Auditor,Denetçi
 DocType: Purchase Order,End date of current order's period,Cari Siparişin dönemi bitiş tarihi
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +17,Make Offer Letter,Teklif Mektubu Yap
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +10,Return,Dönüş
-apps/erpnext/erpnext/stock/doctype/item/item.py +503,Default Unit of Measure for Variant must be same as Template,Variant için Ölçü Varsayılan Birim Şablon aynı olmalıdır
+apps/erpnext/erpnext/stock/doctype/item/item.py +507,Default Unit of Measure for Variant must be same as Template,Variant için Ölçü Varsayılan Birim Şablon aynı olmalıdır
 DocType: DocField,Fold,Kat
 DocType: Production Order Operation,Production Order Operation,Üretim Sipariş Operasyonu
 DocType: Pricing Rule,Disable,Devre Dışı Bırak
@@ -3987,15 +3850,14 @@
 DocType: Page,Page Name,Sayfa Adı
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +110,To Time must be greater than From Time,Zaman Zaman itibaren daha büyük olmalıdır için
 DocType: Journal Entry Account,Exchange Rate,Döviz Kuru
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +465,Sales Order {0} is not submitted,Satış Sipariş {0} teslim edilmedi
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +467,Sales Order {0} is not submitted,Satış Sipariş {0} teslim edilmedi
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0}: Parent account {1} does not bolong to the company {2},Depo {0}: Ana hesap {1} Şirket {2} ye ait değildir
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +124,Spindle finishing,Mil bitirme
 DocType: BOM,Last Purchase Rate,Son Satış Fiyatı
 DocType: Account,Asset,Varlık
 DocType: Account,Asset,Varlık
 DocType: Project Task,Task ID,Görev Kimliği
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +395,"e.g. ""MC""","örneğin ""MC """
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +395,"e.g. ""MC""","örneğin ""MC """
+apps/erpnext/erpnext/public/js/setup_wizard.js +143,"e.g. ""MC""","örneğin ""MC """
+apps/erpnext/erpnext/public/js/setup_wizard.js +143,"e.g. ""MC""","örneğin ""MC """
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,Stock cannot exist for Item {0} since has variants,Ürün için var olamaz Stok {0} yana varyantları vardır
 ,Sales Person-wise Transaction Summary,Satış Personeli bilgisi İşlem Özeti
 DocType: System Settings,Time Zone,Saat Dilimi
@@ -4004,10 +3866,8 @@
 DocType: Monthly Distribution,Monthly Distribution Percentages,Aylık Dağılımı Yüzdeler
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +16,The selected item cannot have Batch,Seçilen öğe Toplu olamaz
 DocType: Delivery Note,% of materials delivered against this Delivery Note,% malzeme bu İrsaliye karşılığında teslim edildi
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +151,Stapling,Zımbalama
 DocType: Customer,Customer Details,Müşteri Detayları
 DocType: Customer,Customer Details,Müşteri Detayları
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +105,Shaping,Şekillendirme
 DocType: Employee,Reports to,Raporlar
 DocType: Employee,Reports to,Raporlar
 DocType: SMS Settings,Enter url parameter for receiver nos,Alıcı numaraları için url parametresi girin
@@ -4018,14 +3878,14 @@
 DocType: Item Variant,Item Variant,Öğe Varyant
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +15,Setting this Address Template as default as there is no other default,"Bu adres şablonunu varsayılan olarak kaydedin, başka varsayılan bulunmamaktadır"
 apps/erpnext/erpnext/accounts/doctype/account/account.py +89,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'",Bakiye borçlu durumdaysa alacaklı duruma çevrilemez.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +76,Quality Management,Kalite Yönetimi
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +76,Quality Management,Kalite Yönetimi
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Quality Management,Kalite Yönetimi
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Quality Management,Kalite Yönetimi
 DocType: Production Planning Tool,Filter based on customer,Müşteriye dayalı filtre
 DocType: Payment Tool Detail,Against Voucher No,Çeki No Karşı
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +47,Please enter quantity for Item {0},Lütfen Ürün {0} için miktar giriniz
 DocType: Employee External Work History,Employee External Work History,Çalışan Harici İş Geçmişi
 DocType: Tax Rule,Purchase,Satın Alım
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +34,Balance Qty,Denge Adet
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Balance Qty,Denge Adet
 DocType: Item Group,Parent Item Group,Ana Ürün Grubu
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +21,{0} for {1},{0} için {1}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +96,Cost Centers,Maliyet Merkezleri
@@ -4038,6 +3898,7 @@
 DocType: Employee,Employment Type,İstihdam Tipi
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,Duran Varlıklar
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,Duran Varlıklar
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +84,Application period cannot be across two alocation records,Uygulama süresi iki alocation kayıtları arasında olamaz
 DocType: Item Group,Default Expense Account,Standart Gider Hesabı
 DocType: Employee,Notice (days),Bildirimi (gün)
 DocType: Employee,Notice (days),Bildirimi (gün)
@@ -4045,7 +3906,6 @@
 DocType: Page,Yes,Evet
 DocType: Tax Rule,Sales Tax Template,Satış Vergisi Şablon
 DocType: Employee,Encashment Date,Nakit Çekim Tarihi
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +74,Electroforming,Elektroform
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +179,"Against Voucher Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Fiş karşı Tipi Satınalma Siparişi biri, Alış Fatura veya günlük girdisi olmalıdır"
 DocType: Account,Stock Adjustment,Stok Ayarı
 DocType: Account,Stock Adjustment,Stok Ayarı
@@ -4089,15 +3949,15 @@
 DocType: Company,Distribution,Dağıtım
 DocType: Company,Distribution,Dağıtım
 apps/erpnext/erpnext/public/js/pos/pos.html +36,Amount Paid,Ödenen Tutar;
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +91,Project Manager,Proje Müdürü
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +91,Project Manager,Proje Müdürü
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +72,Dispatch,Sevk
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +72,Dispatch,Sevk
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Project Manager,Proje Müdürü
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Project Manager,Proje Müdürü
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +72,Dispatch,Sevk
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +72,Dispatch,Sevk
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,Malzeme {0 }için izin verilen maksimum indirim} {1}% 
 DocType: Customer,Default Taxes and Charges,Standart Vergi ve Harçlar
 DocType: Account,Receivable,Alacak
 DocType: Account,Receivable,Alacak
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +268,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,Satır # {0}: Sipariş zaten var olduğu Tedarikçi değiştirmek için izin verilmez
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +263,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,Satır # {0}: Sipariş zaten var olduğu Tedarikçi değiştirmek için izin verilmez
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,Kredi limiti ayarlarını geçen işlemleri teslim etmeye izinli rol
 DocType: Sales Invoice,Supplier Reference,Tedarikçi Referansı
 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.","Eğer işaretli ise, alt-montaj kalemleri için BOM hammadde almak için kabul edilecektir. Aksi takdirde, tüm alt-montaj ögeleri bir hammadde olarak kabul edilecektir."
@@ -4106,10 +3966,10 @@
 DocType: Employee Education,Qualification,{0}Yeterlilik{/0} {1} {/1}
 DocType: Item Price,Item Price,Ürün Fiyatı
 DocType: Item Price,Item Price,Ürün Fiyatı
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +48,Soap & Detergent,Sabun ve Deterjan
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +48,Soap & Detergent,Sabun ve Deterjan
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +36,Motion Picture & Video,Motion Picture & Video
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +36,Motion Picture & Video,Motion Picture & Video
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +48,Soap & Detergent,Sabun ve Deterjan
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +48,Soap & Detergent,Sabun ve Deterjan
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +36,Motion Picture & Video,Motion Picture & Video
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +36,Motion Picture & Video,Motion Picture & Video
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Sipariş Edildi
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Sipariş Edildi
 DocType: Warehouse,Warehouse Name,Depo Adı
@@ -4121,7 +3981,6 @@
 DocType: BOM,Rate Of Materials Based On,Dayalı Ürün Br. Fiyatı
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,Destek Analizi
 apps/erpnext/erpnext/accounts/doctype/accounts_settings/accounts_settings.py +27,Company is missing in warehouses {0},Şirket depolarda eksik {0}
-DocType: Stock UOM Replace Utility,Stock UOM Replace Utility,Stok UOM Değiştirme
 DocType: POS Profile,Terms and Conditions,Şartlar ve Koşullar
 DocType: POS Profile,Terms and Conditions,Şartlar ve Koşullar
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,To Date should be within the Fiscal Year. Assuming To Date = {0},Tarih Mali Yıl içinde olmalıdır. Tarih = {0}
@@ -4136,7 +3995,7 @@
 DocType: Sales Order Item,For Production,Üretim için
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +103,Please enter sales order in the above table,Lütfen Yukarıdaki tabloya satış siparişi giriniz
 DocType: Project Task,View Task,Görevleri Göster
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +406,Your financial year begins on,Mali yılınız şu tarihte başlıyor:
+apps/erpnext/erpnext/public/js/setup_wizard.js +154,Your financial year begins on,Mali yılınız şu tarihte başlıyor:
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +46,Please enter Purchase Receipts,Satınalma Makbuzlar giriniz
 DocType: Sales Invoice,Get Advances Received,Avansların alınmasını sağla
 DocType: Email Digest,Add/Remove Recipients,Alıcı Ekle/Kaldır
@@ -4145,16 +4004,14 @@
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","Varsayılan olarak bu Mali Yılı ayarlamak için, 'Varsayılan olarak ayarla' seçeneğini tıklayın"
 apps/erpnext/erpnext/config/support.py +54,Setup incoming server for support email id. (e.g. support@example.com),Destek e-mail kimliği için gelen sunucu kurulumu (örneğin:support@example.com)
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,Yetersizlik adeti
-apps/erpnext/erpnext/stock/doctype/item/item.py +528,Item variant {0} exists with same attributes,Ürün çeşidi {0} aynı özelliklere sahip bulunmaktadır
+apps/erpnext/erpnext/stock/doctype/item/item.py +532,Item variant {0} exists with same attributes,Ürün çeşidi {0} aynı özelliklere sahip bulunmaktadır
 DocType: Salary Slip,Salary Slip,Bordro
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +116,Burnishing,Cilalama
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +54,'To Date' is required,'Tarihine Kadar' gereklidir
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,'Tarihine Kadar' gereklidir
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","Paketleri teslim edilmek üzere fişleri ambalaj oluşturun. Paket numarası, paket içeriğini ve ağırlığını bildirmek için kullanılır."
 DocType: Sales Invoice Item,Sales Order Item,Satış Sipariş Ürünü
 DocType: Salary Slip,Payment Days,Ödeme Günleri
 DocType: BOM,Manage cost of operations,İşlem Maliyetlerini Yönetin
 DocType: Features Setup,Item Advanced,İleri Madde
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +40,Hot rolling,Sıcak haddeleme
 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.","İşaretli işlemlerden biri ""Teslim Edildiğinde"" işlemdeki ilgili ""Kişi""ye e-mail gönderecek bir e-mail penceresi açılacaktır, işlemi ekte gönderecektir."
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,Genel Ayarlar
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,Genel Ayarlar
@@ -4170,29 +4027,26 @@
 DocType: Customer,Sales Team Details,Satış Ekibi Ayrıntıları
 DocType: Expense Claim,Total Claimed Amount,Toplam İade edilen Tutar
 apps/erpnext/erpnext/config/crm.py +22,Potential opportunities for selling.,Satış için potansiyel Fırsatlar.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +48,Sick Leave,Hastalık izni
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +48,Sick Leave,Hastalık izni
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +174,Invalid {0},Geçersiz {0}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +48,Sick Leave,Hastalık izni
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +48,Sick Leave,Hastalık izni
 DocType: Email Digest,Email Digest,E-Mail Bülteni
 DocType: Delivery Note,Billing Address Name,Fatura Adresi Adı
 DocType: Delivery Note,Billing Address Name,Fatura Adresi Adı
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +22,Department Stores,Departman mağazaları
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,Departman mağazaları
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +40,System Balance,Sistem Dengesi
 DocType: Workflow,Is Active,Aktif
 apps/erpnext/erpnext/controllers/stock_controller.py +71,No accounting entries for the following warehouses,Şu depolar için muhasebe girdisi yok
 apps/erpnext/erpnext/projects/doctype/project/project.js +22,Save the document first.,İlk belgeyi kaydedin.
 DocType: Account,Chargeable,Ücretli
 DocType: Account,Chargeable,Ücretli
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +121,Linishing,Linishing
 DocType: Company,Change Abbreviation,Değişim Kısaltma
 DocType: Workflow State,Primary,Birincil
 DocType: Expense Claim Detail,Expense Date,Gider Tarih
 DocType: Item,Max Discount (%),En fazla İndirim (%
 DocType: Communication,More Information,Daha fazla bilgi
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +70,Last Order Amount,Son Sipariş Miktarı
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +161,Blasting,Patlatma
 DocType: Company,Warn,Uyarmak
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +111,Item valuation updated,Ürün değerleme güncellendi
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +111,Item valuation updated,Ürün değerleme güncellendi
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Başka bir konuşmasında, kayıtlarda gitmeli kayda değer çaba."
 DocType: BOM,Manufacturing User,Üretim Kullanıcı
 DocType: Purchase Order,Raw Materials Supplied,Tedarik edilen Hammaddeler
@@ -4203,7 +4057,7 @@
 DocType: Appraisal,Appraisal Template,Değerlendirme Şablonu
 DocType: Communication,Email,E-posta;
 DocType: Item Group,Item Classification,Ürün Sınıflandırması
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +89,Business Development Manager,İş Geliştirme Müdürü
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Business Development Manager,İş Geliştirme Müdürü
 DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,Bakım ziyareti Amacı
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.js +15,Period,Dönem
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.js +15,Period,Dönem
@@ -4215,9 +4069,7 @@
 ,Itemwise Recommended Reorder Level,Ürünnin Önerilen Yeniden Sipariş Düzeyi
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +264,Please select {0} first,Önce {0} seçiniz
 DocType: Features Setup,To get Item Group in details table,Detaylar tablosunda Ürün Grubu almak için
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +67,Redrawing,Redrawing
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +112,Batch {0} of Item {1} has expired.,Öğe Toplu {0} {1} süresi doldu.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +120,Etching,Gravür
 DocType: Sales Invoice,Commission,Komisyon
 DocType: Sales Invoice,Commission,Komisyon
 DocType: Address Template,"<h4>Default Template</h4>
@@ -4270,7 +4122,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +340,Operation Time must be greater than 0 for Operation {0},Çalışma Süresi Çalışma için 0&#39;dan büyük olmalıdır {0}
 DocType: Supplier,Address and Contacts,Adresler ve Kontaklar
 DocType: UOM Conversion Detail,UOM Conversion Detail,UOM Dönüşüm Detayı
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +496,Keep it web friendly 900px (w) by 100px (h),100px (yukseklik) ile 900 px (genislik) web dostu tutun
+apps/erpnext/erpnext/public/js/setup_wizard.js +242,Keep it web friendly 900px (w) by 100px (h),100px (yukseklik) ile 900 px (genislik) web dostu tutun
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +329,Production Order cannot be raised against a Item Template,Üretim siparişi Ürün Şablon karşı yükseltilmiş edilemez
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +44,Charges are updated in Purchase Receipt against each item,Ücretler her öğenin karşı Satınalma Fiş güncellenir
 DocType: Payment Tool,Get Outstanding Vouchers,Üstün Fişler alın
@@ -4290,7 +4142,6 @@
 DocType: Time Log,Hours,Saat
 DocType: Time Log,Hours,Saat
 DocType: Project,Expected Start Date,Beklenen BaşlangıçTarihi
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +38,Rolling,Rolling
 DocType: ToDo,Priority,Öncelik
 DocType: ToDo,Priority,Öncelik
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +41,Remove item if charges is not applicable to that item,Ücretleri bu öğeye geçerli değilse öğeyi çıkar
@@ -4298,34 +4149,32 @@
 DocType: Dropbox Backup,Weekly,Haftalık
 DocType: Dropbox Backup,Weekly,Haftalık
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,Örn. msgateway.com / api / send_sms.cgi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +485,Receive,Alma
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +510,Receive,Alma
 DocType: Maintenance Visit,Fully Completed,Tamamen Tamamlanmış
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% Tamamlandı
 DocType: Employee,Educational Qualification,Eğitim Yeterliliği
 DocType: Workstation,Operating Costs,İşletim Maliyetleri
 DocType: Employee Leave Approver,Employee Leave Approver,Çalışan izin Onayı
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,{0} has been successfully added to our Newsletter list.,{0} başarıyla Haber listesine eklendi.
-apps/erpnext/erpnext/stock/doctype/item/item.py +383,Row {0}: An Reorder entry already exists for this warehouse {1},Satır {0}: Bir Yeniden Sipariş girişi zaten bu depo için var {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +387,Row {0}: An Reorder entry already exists for this warehouse {1},Satır {0}: Bir Yeniden Sipariş girişi zaten bu depo için var {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +67,"Cannot declare as lost, because Quotation has been made.","Kayıp olarak Kotasyon yapılmış çünkü, ilan edemez."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +133,Electron beam machining,Elektron ışın işleme
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Satınalma Usta Müdürü
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +424,Production Order {0} must be submitted,Üretim Siparişi {0} verilmelidir
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +150,Please select Start Date and End Date for Item {0},Ürün {0} için Başlangıç ve Bitiş tarihi seçiniz
 apps/erpnext/erpnext/config/stock.py +141,Main Reports,Ana Raporlar
 apps/erpnext/erpnext/config/stock.py +141,Main Reports,Ana Raporlar
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +102,Stock Ledger entries balances updated,Stok Defteri girdi bakiyeleri güncellendi
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,Tarihine kadar kısmı tarihinden itibaren kısmından önce olamaz
 DocType: Purchase Receipt Item,Prevdoc DocType,Prevdoc Doctype
 DocType: Purchase Receipt Item,Prevdoc DocType,Prevdoc DocType
-apps/erpnext/erpnext/stock/doctype/item/item.js +176,Add / Edit Prices,Fiyatları Ekle / Düzenle
+apps/erpnext/erpnext/stock/doctype/item/item.js +178,Add / Edit Prices,Fiyatları Ekle / Düzenle
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +53,Chart of Cost Centers,Maliyet Merkezlerinin Grafikleri
 ,Requested Items To Be Ordered,Sipariş edilmesi istenen Ürünler
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +298,My Orders,Siparişlerim
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +293,My Orders,Siparişlerim
 DocType: Price List,Price List Name,Fiyat Listesi Adı
 DocType: Price List,Price List Name,Fiyat Listesi Adı
 DocType: Time Log,For Manufacturing,Üretim için
-apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +70,Totals,Toplamlar
-apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +70,Totals,Toplamlar
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +174,Totals,Toplamlar
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +174,Totals,Toplamlar
 DocType: BOM,Manufacturing,Üretim
 DocType: BOM,Manufacturing,Üretim
 ,Ordered Items To Be Delivered,Teslim edilecek Sipariş Edilen Ürünler
@@ -4335,14 +4184,13 @@
 ,Setup Wizard,Kurulum Sihirbazı
 DocType: Industry Type,Industry Type,Sanayi Tipi
 apps/erpnext/erpnext/templates/includes/cart.js +137,Something went wrong!,Bir şeyler yanlış gitti!
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +68,Warning: Leave application contains following block dates,Uyarı: İzin uygulamasında aşağıdaki engel tarihleri bulunmaktadır
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +251,Sales Invoice {0} has already been submitted,Satış Faturası {0} zaten gönderildi
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +251,Sales Invoice {0} has already been submitted,Satış Faturası {0} zaten gönderildi
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +100,Warning: Leave application contains following block dates,Uyarı: İzin uygulamasında aşağıdaki engel tarihleri bulunmaktadır
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +256,Sales Invoice {0} has already been submitted,Satış Faturası {0} zaten gönderildi
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +256,Sales Invoice {0} has already been submitted,Satış Faturası {0} zaten gönderildi
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,Bitiş Tarihi
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,Bitiş Tarihi
 DocType: Purchase Invoice Item,Amount (Company Currency),Tutar (Şirket Para Birimi)
 DocType: Purchase Invoice Item,Amount (Company Currency),Tutar (Şirket Para Birimi)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +10,Die casting,Basınçlı döküm
 DocType: Email Alert,Reference Date,Referans Tarihi
 apps/erpnext/erpnext/config/hr.py +105,Organization unit (department) master.,Kuruluş Birimi (departman) alanı
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +25,Please enter valid mobile nos,Lütfen Geçerli bir cep telefonu numarası giriniz
@@ -4350,7 +4198,6 @@
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +75,Please enter message before sending,Lütfen Göndermeden önce mesajı giriniz
 DocType: Async Task,Status,Durum
 DocType: Async Task,Status,Durum
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +65,Stock UOM updated for Item {0},Stok UOM Ürün için güncelleştirilmiş {0}
 DocType: Company History,Year,Yıl
 DocType: Company History,Year,Yıl
 apps/erpnext/erpnext/config/accounts.py +127,Point-of-Sale Profile,Satış Noktası Profili
@@ -4367,13 +4214,13 @@
 ,Serial No Service Contract Expiry,Seri No Hizmet Sözleşmesi Vadesi
 DocType: Item,Unit of Measure Conversion,Ölçü Dönüşüm Birimi
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +86,Employee can not be changed,Çalışan değiştirilemez
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +259,You cannot credit and debit same account at the same time,Aynı hesabı aynı anda kredilendirip borçlandıramazsınız
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,You cannot credit and debit same account at the same time,Aynı hesabı aynı anda kredilendirip borçlandıramazsınız
 DocType: Naming Series,Help HTML,Yardım HTML
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},Atanan toplam ağırlık % 100 olmalıdır. Bu {0} dır
 apps/erpnext/erpnext/controllers/status_updater.py +140,Allowance for over-{0} crossed for Item {1},{1} den fazla Ürün için {0} üzerinde ödenek
 DocType: Address,Name of person or organization that this address belongs to.,Bu adresin ait olduğu kişi veya kurumun adı.
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +587,Your Suppliers,Tedarikçileriniz
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +587,Your Suppliers,Tedarikçileriniz
+apps/erpnext/erpnext/public/js/setup_wizard.js +325,Your Suppliers,Tedarikçileriniz
+apps/erpnext/erpnext/public/js/setup_wizard.js +325,Your Suppliers,Tedarikçileriniz
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,Satış Emri yapıldığında Kayıp olarak ayarlanamaz.
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +65,Another Salary Structure {0} is active for employee {1}. Please make its status 'Inactive' to proceed.,Başka Maaş Yapısı {0} çalışan için aktif {1}. Onun durumu 'Etkin değil' devam etmek olun.
 DocType: Purchase Invoice,Contact,İletişim
@@ -4384,13 +4231,13 @@
 DocType: Employee,Date of Issue,Veriliş tarihi
 DocType: Employee,Date of Issue,Veriliş tarihi
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +16,{0}: From {0} for {1},{0}: Tarafından {0} {1} için
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +154,Row #{0}: Set Supplier for item {1},Satır # {0}: öğe için Set Tedarikçi {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +149,Row #{0}: Set Supplier for item {1},Satır # {0}: öğe için Set Tedarikçi {1}
 DocType: Issue,Content Type,İçerik Türü
 DocType: Issue,Content Type,İçerik Türü
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +17,Computer,Bilgisayar
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +17,Computer,Bilgisayar
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,Bilgisayar
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,Bilgisayar
 DocType: Item,List this Item in multiple groups on the website.,Bu Ürünü web sitesinde gruplar halinde listeleyin
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +283,Please check Multi Currency option to allow accounts with other currency,Diğer para ile hesap izin Çoklu Para Birimi seçeneğini kontrol edin
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +285,Please check Multi Currency option to allow accounts with other currency,Diğer para ile hesap izin Çoklu Para Birimi seçeneğini kontrol edin
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +62,Item: {0} does not exist in the system,Ürün: {0} sistemde mevcut değil
 apps/erpnext/erpnext/accounts/doctype/account/account.py +81,You are not authorized to set Frozen value,Donmuş değer ayarlama yetkiniz yok
 DocType: Payment Reconciliation,Get Unreconciled Entries,Mutabık olmayan girdileri alın
@@ -4398,32 +4245,30 @@
 apps/frappe/frappe/core/page/modules_setup/modules_setup.py +11,Updated,Güncellenmiş
 apps/frappe/frappe/core/page/modules_setup/modules_setup.py +11,Updated,Güncellenmiş
 DocType: Employee,Emergency Contact Details,Acil Durum İrtibat Kişisi Bilgileri
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +396,What does it do?,Ne yapar?
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +396,What does it do?,Ne yapar?
+apps/erpnext/erpnext/public/js/setup_wizard.js +144,What does it do?,Ne yapar?
+apps/erpnext/erpnext/public/js/setup_wizard.js +144,What does it do?,Ne yapar?
 DocType: Delivery Note,To Warehouse,Depoya
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +45,Account {0} has been entered more than once for fiscal year {1},Hesap {0} bir mali yıl içerisinde birden fazla girildi {1}
 ,Average Commission Rate,Ortalama Komisyon Oranı
 ,Average Commission Rate,Ortalama Komisyon Oranı
-apps/erpnext/erpnext/stock/doctype/item/item.py +313,'Has Serial No' can not be 'Yes' for non-stock item,Stokta olmayan ürünün 'Seri Nosu Var' 'Evet' olamaz
+apps/erpnext/erpnext/stock/doctype/item/item.py +317,'Has Serial No' can not be 'Yes' for non-stock item,Stokta olmayan ürünün 'Seri Nosu Var' 'Evet' olamaz
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Attendance can not be marked for future dates,İlerideki tarihler için katılım işaretlenemez
 DocType: Pricing Rule,Pricing Rule Help,Fiyatlandırma Kuralı Yardım
 DocType: Purchase Taxes and Charges,Account Head,Hesap Başlığı
 DocType: Purchase Taxes and Charges,Account Head,Hesap Başlığı
 apps/erpnext/erpnext/config/stock.py +79,Update additional costs to calculate landed cost of items,Öğelerin indi maliyetini hesaplamak için ek maliyetler güncelleyin
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +111,Electrical,Elektrik
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +111,Electrical,Elektrik
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +111,Electrical,Elektrik
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +111,Electrical,Elektrik
 DocType: Stock Entry,Total Value Difference (Out - In),Toplam Değer Farkı (Out - In)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +302,Row {0}: Exchange Rate is mandatory,Satır {0}: Döviz Kuru zorunludur
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +304,Row {0}: Exchange Rate is mandatory,Satır {0}: Döviz Kuru zorunludur
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},Çalışan {0} için kullanıcı kimliği ayarlanmamış
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +72,Peening,Peening
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,From Warranty Claim,Garanti İstem itibaren
 DocType: Stock Entry,Default Source Warehouse,Varsayılan Kaynak Deposu
 DocType: Stock Entry,Default Source Warehouse,Varsayılan Kaynak Deposu
 DocType: Item,Customer Code,Müşteri Kodu
 DocType: Item,Customer Code,Müşteri Kodu
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +212,Birthday Reminder for {0},Için Doğum Günü Hatırlatıcı {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +163,Lapping,Rodaj
-apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.js +8,Days Since Last Order,Son siparişten bu yana geçen günler
+apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +72,Days Since Last Order,Son siparişten bu yana geçen günler
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +299,Debit To account must be a Balance Sheet account,Hesabın için Bankamatik bir bilanço hesabı olmalıdır
 DocType: Buying Settings,Naming Series,Seri Adlandırma
 DocType: Leave Block List,Leave Block List Name,İzin engel listesi adı
@@ -4442,7 +4287,7 @@
 DocType: Authorization Rule,Based On,Göre
 DocType: Sales Order Item,Ordered Qty,Sipariş Miktarı
 DocType: Sales Order Item,Ordered Qty,Sipariş Miktarı
-apps/erpnext/erpnext/stock/doctype/item/item.py +539,Item {0} is disabled,Öğe {0} devre dışı
+apps/erpnext/erpnext/stock/doctype/item/item.py +543,Item {0} is disabled,Öğe {0} devre dışı
 DocType: Stock Settings,Stock Frozen Upto,Stok Dondurulmuş
 apps/erpnext/erpnext/controllers/recurring_document.py +166,Period From and Period To dates mandatory for recurring {0},Kimden ve Dönemi yinelenen için zorunlu tarihler için Dönem {0}
 apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,Proje faaliyeti / görev.
@@ -4453,7 +4298,6 @@
 DocType: ToDo,Low,Düşük
 DocType: ToDo,Low,Düşük
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Tutar Off yazın (Şirket Para)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +71,Spinning,Döndürme
 DocType: Landed Cost Voucher,Landed Cost Voucher,Indi Maliyet Çeki
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +55,Please set {0},Lütfen {0} ayarlayınız
 DocType: Purchase Invoice,Repeat on Day of Month,Ayın gününde tekrarlayın
@@ -4481,7 +4325,6 @@
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +37,Campaign Name is required,Kampanya Adı gereklidir
 DocType: Maintenance Visit,Maintenance Date,Bakım Tarih
 DocType: Purchase Receipt Item,Rejected Serial No,Seri No Reddedildi
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +51,Deep drawing,Derin çekme
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +40,New Newsletter,Yeni Haber
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +157,Start date should be less than end date for Item {0},Başlangıç tarihi Ürün {0} için bitiş tarihinden daha az olmalıdır 
 apps/erpnext/erpnext/stock/doctype/item/item.js +17,Show Balance,Balansı Göster
@@ -4492,7 +4335,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +119,BOM and Manufacturing Quantity are required,BOM ve İmalat Miktarı gereklidir
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Yaşlanma Aralığı 2
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +450,Amount,Tutar
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +147,Riveting,Perçinleme
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,BOM yerine
 ,Sales Analytics,Satış Analizleri
 DocType: Manufacturing Settings,Manufacturing Settings,Üretim Ayarları
@@ -4505,23 +4347,22 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +207,New Account Name,Yeni Hesap Adı
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,Tedarik edilen Hammadde  Maliyeti
 DocType: Selling Settings,Settings for Selling Module,Modülü Satış için Ayarlar
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +73,Customer Service,Müşteri Hizmetleri
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +73,Customer Service,Müşteri Hizmetleri
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Customer Service,Müşteri Hizmetleri
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Customer Service,Müşteri Hizmetleri
 DocType: Item,Thumbnail,Başparmak tırnağı
 DocType: Item Customer Detail,Item Customer Detail,Ürün Müşteri Detayı
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +147,Confirm Your Email,E-posta adresiniz Onayla
 apps/erpnext/erpnext/config/hr.py +53,Offer candidate a Job.,Teklif aday İş.
 DocType: Notification Control,Prompt for Email on Submission of,Başvuru üzerine E-posta cevabı
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +81,Total allocated leaves are more than days in the period,Toplam ayrılan yapraklar dönemde gün daha vardır
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +70,Item {0} must be a stock Item,Ürün {0} bir stok ürünü olmalıdır
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,İlerleme Ambarlar&#39;da Standart Çalışma
 apps/erpnext/erpnext/config/accounts.py +107,Default settings for accounting transactions.,Muhasebe işlemleri için Varsayılan ayarlar.
 apps/frappe/frappe/model/naming.py +40,{0} is required,{0} gereklidir
 apps/frappe/frappe/model/naming.py +40,{0} is required,{0} gereklidir
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +21,Vacuum molding,Vakum kalıplama
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,Beklenen Tarih Malzeme Talep Tarihinden önce olamaz
 DocType: Contact Us Settings,City,İl
 DocType: Contact Us Settings,City,İl
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +132,Ultrasonic machining,Ultrasonik işleme
 apps/frappe/frappe/templates/base.html +137,Error: Not a valid id?,Hata: Geçerli bir kimliği?
 apps/erpnext/erpnext/stock/get_item_details.py +125,Item {0} must be a Sales Item,Ürün {0} Satış ürünü olmalı
 DocType: Naming Series,Update Series Number,Seri Numarasını Güncelle
@@ -4532,8 +4373,8 @@
 DocType: Task,Closing Date,Kapanış Tarihi
 DocType: Sales Order Item,Produced Quantity,Üretilen Miktar
 DocType: Sales Order Item,Produced Quantity,Üretilen Miktar
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +84,Engineer,Mühendis
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +84,Engineer,Mühendis
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Engineer,Mühendis
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Engineer,Mühendis
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,Arama Alt Kurullar
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +379,Item Code required at Row No {0},{0} Numaralı satırda Ürün Kodu gereklidir
 DocType: Sales Partner,Partner Type,Ortak Türü
@@ -4544,8 +4385,8 @@
 DocType: Purchase Invoice,Against Expense Account,Gider Hesabı Karşılığı
 DocType: Production Order,Production Order,Üretim Siparişi
 DocType: Production Order,Production Order,Üretim Siparişi
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +258,Installation Note {0} has already been submitted,Kurulum Not {0} zaten gönderildi
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +258,Installation Note {0} has already been submitted,Kurulum Not {0} zaten gönderildi
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +263,Installation Note {0} has already been submitted,Kurulum Not {0} zaten gönderildi
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +263,Installation Note {0} has already been submitted,Kurulum Not {0} zaten gönderildi
 DocType: Quotation Item,Against Docname,Belge adı karşılığı
 DocType: SMS Center,All Employee (Active),Tüm Çalışanlar (Aktif)
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,Şimdi görüntüle
@@ -4557,7 +4398,7 @@
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,Kendisi için üretim emri vermek istediğiniz Malzemeleri girin veya analiz için ham maddeleri indirin.
 apps/frappe/frappe/public/js/frappe/views/ganttview.js +45,Gantt Chart,Gantt Şeması
 apps/frappe/frappe/public/js/frappe/views/ganttview.js +45,Gantt Chart,Gantt Şeması
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +57,Part-time,Yarı Zamanlı
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,Part-time,Yarı Zamanlı
 DocType: Employee,Applicable Holiday List,Uygulanabilir Tatil Listesi
 DocType: Employee,Applicable Holiday List,Uygulanabilir Tatil Listesi
 DocType: Employee,Cheque,Çek
@@ -4568,14 +4409,14 @@
 DocType: Item,Serial Number Series,Seri Numarası Serisi
 DocType: Item,Serial Number Series,Seri Numarası Serisi
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},Satır {1} de stok Ürünü {0} için depo zorunludur
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +45,Retail & Wholesale,Toptan ve Perakende Satış
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +45,Retail & Wholesale,Toptan ve Perakende Satış
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,Toptan ve Perakende Satış
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,Toptan ve Perakende Satış
 DocType: Issue,First Responded On,İlk cevap verilen
 DocType: Website Item Group,Cross Listing of Item in multiple groups,Çoklu gruplarda Ürün Cross İlanı
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +351,The First User: You,İlk Kullanıcı: Sen
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +351,The First User: You,İlk Kullanıcı: Sen
+apps/erpnext/erpnext/public/js/setup_wizard.js +101,The First User: You,İlk Kullanıcı: Sen
+apps/erpnext/erpnext/public/js/setup_wizard.js +101,The First User: You,İlk Kullanıcı: Sen
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +48,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},Mali Yıl {0} da Mali Yıl Başlangıç Tarihi ve Mali Yıl Bitiş Tarihi zaten ayarlanmış
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +172,Successfully Reconciled,Başarıyla Uzlaştırıldı
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +119,Successfully Reconciled,Başarıyla Uzlaştırıldı
 DocType: Production Order,Planned End Date,Planlanan Bitiş Tarihi
 apps/erpnext/erpnext/config/stock.py +43,Where items are stored.,Ürünlerin saklandığı yer
 DocType: Tax Rule,Validity,Geçerlilik
@@ -4599,43 +4440,40 @@
 DocType: DocPerm,Level,Seviye
 DocType: Purchase Taxes and Charges,On Net Total,Net toplam
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +160,Target warehouse in row {0} must be same as Production Order,Satır {0} daki hedef depo Üretim Emrindekiyle aynı olmalıdır
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +59,No permission to use Payment Tool,Hiçbir izin Ödeme Aracı kullanmak için
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +97,No permission to use Payment Tool,Hiçbir izin Ödeme Aracı kullanmak için
 apps/erpnext/erpnext/controllers/recurring_document.py +192,'Notification Email Addresses' not specified for recurring %s,Yinelenen %s için 'Bildirim E-posta Adresleri' belirtilmemmiş.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +86,Milling,Değirmencilik
 apps/erpnext/erpnext/accounts/doctype/account/account.py +99,Currency can not be changed after making entries using some other currency,Para başka bir para birimini kullanarak girdileri yaptıktan sonra değiştirilemez
 DocType: Company,Round Off Account,Hesap Off Yuvarlak
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +60,Nibbling,Nibbling
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,Yönetim Giderleri
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,Yönetim Giderleri
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +18,Consulting,Danışmanlık
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +18,Consulting,Danışmanlık
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +18,Consulting,Danışmanlık
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +18,Consulting,Danışmanlık
 DocType: Customer Group,Parent Customer Group,Ana Müşteri Grubu
 apps/erpnext/erpnext/public/js/pos/pos.js +429,Change,Değişiklik
 DocType: Purchase Invoice,Contact Email,İletişim E-Posta
 DocType: Appraisal Goal,Score Earned,Kazanılan Puan
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +393,"e.g. ""My Company LLC""","Örneğin ""Benim Şirketim LLC """
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +173,Notice Period,İhbar Süresi
+apps/erpnext/erpnext/public/js/setup_wizard.js +141,"e.g. ""My Company LLC""","Örneğin ""Benim Şirketim LLC """
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +173,Notice Period,İhbar Süresi
 DocType: Bank Reconciliation Detail,Voucher ID,Föy Kimliği
 apps/erpnext/erpnext/setup/doctype/territory/territory.js +14,This is a root territory and cannot be edited.,Bu bir kök bölgedir ve düzenlenemez.
 DocType: Packing Slip,Gross Weight UOM,Brüt Ağırlık UOM
 DocType: Email Digest,Receivables / Payables,Alacaklar / Borçlar
 DocType: Email Digest,Receivables / Payables,Alacaklar / Borçlar
 DocType: Delivery Note Item,Against Sales Invoice,Satış Faturası Karşılığı
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +63,Stamping,Presleme
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +457,Credit Account,Kredi hesabı
 DocType: Landed Cost Item,Landed Cost Item,İnen Maliyet Kalemi
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +56,Show zero values,Sıfır değerleri göster
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,Üretimden sonra elde edilen Ürün miktarı/ ham maddelerin belli miktarlarında yeniden ambalajlama
 DocType: Payment Reconciliation,Receivable / Payable Account,Alacak / Borç Hesap
 DocType: Delivery Note Item,Against Sales Order Item,Satış Sipariş Ürün Karşı
-apps/erpnext/erpnext/stock/doctype/item/item.py +521,Please specify Attribute Value for attribute {0},Öznitelik için değeri Özellik belirtiniz {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +525,Please specify Attribute Value for attribute {0},Öznitelik için değeri Özellik belirtiniz {0}
 DocType: Item,Default Warehouse,Standart Depo
 DocType: Item,Default Warehouse,Standart Depo
 DocType: Task,Actual End Date (via Time Logs),Gerçek Bitiş Tarihi (Saat Kayıtlar üzerinden)
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +37,Budget cannot be assigned against Group Account {0},Bütçe Grubu Hesabı karşı atanamayan {0}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +23,Please enter parent cost center,Lütfen ana maliyet merkezi giriniz
 DocType: Delivery Note,Print Without Amount,Tutarı olmadan yazdır
-apps/erpnext/erpnext/controllers/buying_controller.py +69,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,"'Değerleme', 'Değerlendirme ve Toplam stok maddeleri olduğundan ötürü Vergi kategorisi bunlardan biri olamaz."
+apps/erpnext/erpnext/controllers/buying_controller.py +60,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,"'Değerleme', 'Değerlendirme ve Toplam stok maddeleri olduğundan ötürü Vergi kategorisi bunlardan biri olamaz."
 DocType: User,Last Name,Soyadı
 DocType: Web Page,Left,Bırakmak
 DocType: Event,All Day,Bütün Gün
@@ -4644,7 +4482,7 @@
 DocType: Contact Us Settings,State,Devlet
 DocType: Contact Us Settings,State,Devlet
 DocType: Batch,Batch,Yığın
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +51,Balance,Bakiye
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +28,Balance,Bakiye
 DocType: Project,Total Expense Claim (via Expense Claims),Toplam Gider İddiası (Gider Talepleri yoluyla)
 DocType: User,Gender,Cinsiyet
 DocType: User,Gender,Cinsiyet
@@ -4683,8 +4521,7 @@
 DocType: Time Log,Billing Rate based on Activity Type (per hour),Etkinlik Türü dayalı Fatura Oranı (saatte)
 DocType: Company,Company Info,Şirket Bilgisi
 DocType: Company,Company Info,Şirket Bilgisi
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +76,Seaming,Dikiş
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +197,"Company Email ID not found, hence mail not sent","Şirket e-posta kimliği bulunamadı, mail gönderilemedi"
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +206,"Company Email ID not found, hence mail not sent","Şirket e-posta kimliği bulunamadı, mail gönderilemedi"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Fon (varlık) başvurusu
 DocType: Production Planning Tool,Filter based on item,Ürüne dayalı filtre
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +451,Debit Account,Borç Hesabı
@@ -4698,10 +4535,9 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +95,{0} {1} has been modified. Please refresh.,"{0}, {1} düzenlenmiştir. Lütfen yenileyin."
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,Kullanıcıların şu günlerde İzin almasını engelle.
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +591,From Opportunity,Fırsattan
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +46,Blanking,Karartma
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +166,Employee Benefits,Çalışanlara Sağlanan Faydalar
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,Employee Benefits,Çalışanlara Sağlanan Faydalar
 DocType: Sales Invoice,Is POS,POS
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +240,Packed quantity must equal quantity for Item {0} in row {1},{1} Paketli miktar satır {1} deki Ürün {0} a eşit olmalıdır
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +245,Packed quantity must equal quantity for Item {0} in row {1},{1} Paketli miktar satır {1} deki Ürün {0} a eşit olmalıdır
 DocType: Production Order,Manufactured Qty,Üretilen Miktar
 DocType: Purchase Receipt Item,Accepted Quantity,Kabul edilen Miktar
 DocType: Purchase Receipt Item,Accepted Quantity,Kabul edilen Miktar
@@ -4710,7 +4546,7 @@
 DocType: DocField,Default,Varsayılan
 DocType: DocField,Default,Varsayılan
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Proje Kimliği
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +466,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Sıra Hayır {0}: Tutar Gider İstem {1} karşı Tutar Bekleyen daha büyük olamaz. Bekleyen Tutar {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +468,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Sıra Hayır {0}: Tutar Gider İstem {1} karşı Tutar Bekleyen daha büyük olamaz. Bekleyen Tutar {2}
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +40,{0} subscribers added,{0} aboneler eklendi
 DocType: Maintenance Schedule,Schedule,Program
 DocType: Cost Center,"Define Budget for this Cost Center. To set budget action, see ""Company List""","Bu Maliyet Merkezi için Bütçe tanımlayın. Bütçe eylemi ayarlamak için, bkz: &quot;Şirket Listesi&quot;"
@@ -4723,7 +4559,7 @@
 DocType: Expense Claim,Approved,Onaylandı
 DocType: Pricing Rule,Price,Fiyat
 DocType: Pricing Rule,Price,Fiyat
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +79,Employee relieved on {0} must be set as 'Left',"{0} üzerinde bırakılan işçi 'ayrılı' olarak ayarlanmalıdır"""
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +88,Employee relieved on {0} must be set as 'Left',"{0} üzerinde bırakılan işçi 'ayrılı' olarak ayarlanmalıdır"""
 DocType: Item,"Selecting ""Yes"" will give a unique identity to each entity of this item which can be viewed in the Serial No master.","""Evet"" işaretlemek Seri no alanında görüntülenebilecek Ürünnin her elemanını tanımlayacak ayrı kimlik verecektir"
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +39,Appraisal {0} created for Employee {1} in the given date range,Verilen aralıkta Çalışan {1} için oluşturulan değerlendirme {0}
 DocType: Employee,Education,Eğitim
@@ -4737,7 +4573,7 @@
 apps/frappe/frappe/desk/moduleview.py +67,Standard Reports,Standart Raporlar
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,Muhasebe günlük girişleri.
 DocType: Delivery Note Item,Available Qty at From Warehouse,Depo itibaren Boş Adet
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +209,Please select Employee Record first.,İlk Çalışan Kaydı seçiniz.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +224,Please select Employee Record first.,İlk Çalışan Kaydı seçiniz.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Satır {0}: Parti / Hesap ile eşleşmiyor {1} / {2} içinde {3} {4}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +35,To create a Tax Account,Vergi Hesabı oluşturmak için
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +35,To create a Tax Account,Vergi Hesabı oluşturmak için
@@ -4755,7 +4591,7 @@
 DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,Yukarıdaki kriterlere dayalı olarak (teslimat bekleyen) satış emirlerini çek
 DocType: DocShare,Document Type,Belge Türü
 DocType: DocShare,Document Type,Belge Türü
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +565,From Supplier Quotation,Tedarikçi fiyat teklifinden
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +588,From Supplier Quotation,Tedarikçi fiyat teklifinden
 DocType: Deduction Type,Deduction Type,Kesinti Türü
 DocType: Deduction Type,Deduction Type,Kesinti Türü
 DocType: Attendance,Half Day,Yarım Gün
@@ -4766,20 +4602,18 @@
 DocType: GL Entry,Transaction Date,İşlem Tarihi
 DocType: Production Plan Item,Planned Qty,Planlanan Miktar
 DocType: Production Plan Item,Planned Qty,Planlanan Miktar
-apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +91,Total Tax,Toplam Vergi
+apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +93,Total Tax,Toplam Vergi
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +178,For Quantity (Manufactured Qty) is mandatory,Miktar (Adet Üretilen) zorunludur
 DocType: Stock Entry,Default Target Warehouse,Standart Hedef Depo
 DocType: Purchase Invoice,Net Total (Company Currency),Net Toplam (Şirket para birimi)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +79,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Satır {0}: Parti Tipi ve Parti Alacak / Borç hesabına karşı geçerlidir
 DocType: Notification Control,Purchase Receipt Message,Satın alma makbuzu mesajı
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +95,Total allocated leaves are more than period,Toplam ayrılan yapraklar dönem daha vardır
 DocType: Production Order,Actual Start Date,Fiili Başlangıç ​​Tarihi
 DocType: Production Order,Actual Start Date,Fiili Başlangıç ​​Tarihi
 DocType: Sales Order,% of materials delivered against this Sales Order,% malzeme bu satış emri karşılığında teslim edildi
 apps/erpnext/erpnext/config/stock.py +23,Record item movement.,Tutanak madde hareketi.
 apps/erpnext/erpnext/config/stock.py +23,Record item movement.,Tutanak madde hareketi.
 DocType: Newsletter List Subscriber,Newsletter List Subscriber,Bülten Listesi Abone
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +164,Morticing,Morticing
 DocType: Email Account,Service,Servis
 DocType: Email Account,Service,Servis
 DocType: Hub Settings,Hub Settings,Hub Ayarları
@@ -4789,23 +4623,22 @@
 DocType: BOM,With Operations,Operasyon ile
 apps/erpnext/erpnext/accounts/party.py +232,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Muhasebe kayıtları zaten para yapılmış {0} şirket için {1}. Para ile bir alacak ya da borç hesabı seçin {0}.
 ,Monthly Salary Register,Aylık Maaş Kaydı
-apps/frappe/frappe/website/template.py +140,Next,Sonraki
-apps/frappe/frappe/website/template.py +140,Next,Sonraki
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard_page.html +17,Next,Sonraki
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard_page.html +17,Next,Sonraki
 DocType: Warranty Claim,If different than customer address,Müşteri adresinden farklı ise
 DocType: BOM Operation,BOM Operation,BOM Operasyonu
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +118,Electropolishing,Elektro
 DocType: Purchase Taxes and Charges,On Previous Row Amount,Önceki satır toplamı
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +24,Please enter Payment Amount in atleast one row,En az bir satır Ödeme Tutarı giriniz
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +33,Please enter Payment Amount in atleast one row,En az bir satır Ödeme Tutarı giriniz
 DocType: POS Profile,POS Profile,POS Profili
 apps/erpnext/erpnext/config/accounts.py +153,"Seasonality for setting budgets, targets etc.","Ayar bütçeler, hedefler vb Mevsimselliği"
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +238,Row {0}: Payment Amount cannot be greater than Outstanding Amount,Satır {0}: Ödeme Bakiye Tutarı daha büyük olamaz
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +46,Total Unpaid,Ödenmemiş Toplam
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +21,Time Log is not billable,Günlük faturalandırılamaz
 apps/erpnext/erpnext/stock/get_item_details.py +128,"Item {0} is a template, please select one of its variants","{0} Öğe bir şablon, türevleri birini seçiniz"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +528,Purchaser,Alıcı
+apps/erpnext/erpnext/public/js/setup_wizard.js +272,Purchaser,Alıcı
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +81,Net pay cannot be negative,Net ödeme negatif olamaz
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +81,Net pay cannot be negative,Net ödeme negatif olamaz
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +71,Please enter the Against Vouchers manually,El Karşı Fişler giriniz
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +107,Please enter the Against Vouchers manually,El Karşı Fişler giriniz
 DocType: SMS Settings,Static Parameters,Statik Parametreleri
 DocType: Purchase Order,Advance Paid,Peşin Ödenen
 DocType: Item,Item Tax,Ürün Vergisi
@@ -4815,14 +4648,12 @@
 apps/erpnext/erpnext/config/crm.py +48,Send mass SMS to your contacts,Kişilerinize toplu SMS Gönder
 DocType: Purchase Taxes and Charges,Consider Tax or Charge for,Vergi veya Ücret
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,Gerçek Adet zorunludur
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +42,Cross-rolling,Çapraz haddeleme
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +132,Credit Card,Kredi kartı
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +132,Credit Card,Kredi kartı
 DocType: BOM,Item to be manufactured or repacked,Üretilecek veya yeniden paketlenecek Ürün
 apps/erpnext/erpnext/config/stock.py +95,Default settings for stock transactions.,Stok işlemleri için Varsayılan ayarlar.
 DocType: Purchase Invoice,Next Date,Sonraki Tarihi
 DocType: Employee Education,Major/Optional Subjects,Ana / Opsiyonel Konular
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +49,Please enter Taxes and Charges,Vergi ve Ücretleri giriniz
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +85,Machining,İşleme
 DocType: Sales Invoice Item,Drop Ship,Bırak Gemi
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","Burada ebeveyn, eş ve çocukların isim ve meslek gibi aile ayrıntıları  muhafaza edebilirsiniz"
 DocType: Hub Settings,Seller Name,Satıcı Adı
@@ -4832,7 +4663,7 @@
 DocType: Stock Entry,Repack,Yeniden paketlemek
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +6,You must Save the form before proceeding,Devam etmeden önce formu kaydetmelisiniz
 DocType: Item Attribute,Numeric Values,Sayısal Değerler
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +500,Attach Logo,Logo Ekleyin
+apps/erpnext/erpnext/public/js/setup_wizard.js +246,Attach Logo,Logo Ekleyin
 DocType: Customer,Commission Rate,Komisyon Oranı
 apps/erpnext/erpnext/stock/doctype/item/item.js +38,Make Variant,Variant olun
 apps/erpnext/erpnext/config/hr.py +145,Block leave applications by department.,Departman tarafından blok aralığı uygulamaları.
@@ -4849,22 +4680,22 @@
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +105,Please select a csv file,Bir csv dosyası seçiniz
 DocType: Dropbox Backup,Send Backups to Dropbox,Yedeklerinizi Dropboxa gönderin
 DocType: Purchase Order,To Receive and Bill,Alma ve Bill için
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +94,Designer,Tasarımcı
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Designer,Tasarımcı
 apps/erpnext/erpnext/config/selling.py +121,Terms and Conditions Template,Şartlar ve Koşullar Şablon
 apps/erpnext/erpnext/config/selling.py +121,Terms and Conditions Template,Şartlar ve Koşullar Şablon
 DocType: Serial No,Delivery Details,Teslim Bilgileri
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +383,Cost Center is required in row {0} in Taxes table for type {1},Satır {0} da Vergiler Tablosunda tip {1} için Maliyet Merkezi gereklidir
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +386,Cost Center is required in row {0} in Taxes table for type {1},Satır {0} da Vergiler Tablosunda tip {1} için Maliyet Merkezi gereklidir
 DocType: Item,Automatically create Material Request if quantity falls below this level,"Miktar, bu seviyenin altına düşerse otomatik olarak Malzeme İsteği oluşturmak"
 ,Item-wise Purchase Register,Ürün bilgisi Alım Kaydı
 DocType: Batch,Expiry Date,Son kullanma tarihi
-apps/erpnext/erpnext/stock/doctype/item/item.py +375,"To set reorder level, item must be a Purchase Item or Manufacturing Item","Yeniden sipariş düzeyini ayarlamak için, öğenin bir Satınalma Ürün ve Üretim Öğe olmalı"
+apps/erpnext/erpnext/stock/doctype/item/item.py +379,"To set reorder level, item must be a Purchase Item or Manufacturing Item","Yeniden sipariş düzeyini ayarlamak için, öğenin bir Satınalma Ürün ve Üretim Öğe olmalı"
 ,Supplier Addresses and Contacts,Tedarikçi Adresler ve İletişim
 ,Supplier Addresses and Contacts,Tedarikçi Adresler ve İletişim
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,İlk Kategori seçiniz
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,İlk Kategori seçiniz
 apps/erpnext/erpnext/config/projects.py +18,Project master.,Proje alanı.
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,Para birimlerinin yanında $ vb semboller kullanmayın.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +330, (Half Day),(Yarım Gün)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +374, (Half Day),(Yarım Gün)
 DocType: Supplier,Credit Days,Kredi Günleri
 DocType: Leave Type,Is Carry Forward,İleri taşınmış
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +478,Get Items from BOM,BOM dan Ürünleri alın
@@ -4872,7 +4703,7 @@
 apps/erpnext/erpnext/config/manufacturing.py +120,Bill of Materials,Malzeme Listesi
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +77,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Satır {0}: Parti Tipi ve Parti Alacak / Borç hesabı için gerekli olan {1}
 DocType: Dropbox Backup,Send Notifications To,Bildirimlerin Gönderileceği Kişi
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html +26,Ref Date,Ref Tarihi
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +54,Ref Date,Ref Tarihi
 DocType: Employee,Reason for Leaving,Ayrılma Nedeni
 DocType: Employee,Reason for Leaving,Ayrılma Nedeni
 DocType: Expense Claim Detail,Sanctioned Amount,tasdik edilmiş tutar
@@ -4883,4 +4714,3 @@
 DocType: Account,Cash,Nakit
 DocType: Employee,Short biography for website and other publications.,Web sitesi ve diğer yayınlar için kısa biyografi.
 DocType: Employee,Short biography for website and other publications.,Web sitesi ve diğer yayınlar için kısa biyografi.
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +31,Please create Salary Structure for employee {0},Lütfen çalışan {0} için Maaş Yapısı oluşturunuz
diff --git a/erpnext/translations/uk.csv b/erpnext/translations/uk.csv
index fb7cd0c..7be6810 100644
--- a/erpnext/translations/uk.csv
+++ b/erpnext/translations/uk.csv
@@ -1,13 +1,12 @@
 DocType: Employee,Salary Mode,Режим Зарплата
 DocType: Cost Center,"Select Monthly Distribution, if you want to track based on seasonality.","Виберіть щомісячний розподіл, якщо ви хочете, щоб відстежувати на основі сезонності."
 DocType: Employee,Divorced,У розлученні
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +86,Warning: Same item has been entered multiple times.,Увага: Такий же деталь був введений кілька разів.
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +80,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,Дозволити пункт буде додано кілька разів в угоді
 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/page/setup_wizard/fixtures/industry_type.py +19,Consumer Products,Споживацькі товари
+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,"Будь ласка, виберіть партії першого типу"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +90,Annealing,Відпал
 DocType: Item,Customer Items,Предмети з клієнтами
 apps/erpnext/erpnext/accounts/doctype/account/account.py +45,Account {0}: Parent account {1} can not be a ledger,Рахунок {0}: Батьки рахунку {1} ​​не може бути книга
 DocType: Item,Publish Item to hub.erpnext.com,Опублікувати пункт в hub.erpnext.com
@@ -20,15 +19,14 @@
 DocType: About Us Settings,Website,Сайт
 DocType: POS Profile,Applicable for User,Стосується для користувача
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +169,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Зупинився виробничого замовлення не може бути скасовано, відкорковувати спочатку скасувати"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +23,Compaction plus sintering,Ущільнення плюс спікання
 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.,* Буде розраховується в угоді.
 DocType: Purchase Order,Customer Contact,Контакти з клієнтами
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +549,From Material Request,З матеріалів Запит
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +572,From Material Request,З матеріалів Запит
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} Дерево
 DocType: Job Applicant,Job Applicant,Робота Заявник
 apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,Немає більше результатів.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +78,Legal,Правовий
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +34,Legal,Правовий
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +114,Actual type tax cannot be included in Item rate in row {0},Фактичний тип податку не може бути включений у вартість товару в рядку {0}
 DocType: C-Form,Customer,Клієнт
 DocType: Purchase Receipt Item,Required By,Потрібно За
@@ -43,7 +41,6 @@
 DocType: Manufacturing Settings,Default 10 mins,За замовчуванням 10 хвилин
 DocType: Leave Type,Leave Type Name,Залиште Тип Назва
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +148,Series Updated Successfully,Серія Оновлене Успішно
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +150,Stitching,Зшивання
 DocType: Pricing Rule,Apply On,Нанесіть на
 DocType: Item Price,Multiple Item prices.,Кілька ціни товару.
 ,Purchase Order Items To Be Received,"Купівля Замовити товари, які будуть отримані"
@@ -51,8 +48,8 @@
 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 +104,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 +189,New Leave Application,Новий Залишити заявку
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +134,Bank Draft,Банківський чек
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +204,New Leave Application,Новий Залишити заявку
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +134,Bank Draft,Банківський чек
 DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,1. Для підтримки клієнтської мудрий код пункт і зробити їх пошуку на основі їх використання коду цю опцію
 DocType: Mode of Payment Account,Mode of Payment Account,Режим розрахунковий рахунок
 apps/erpnext/erpnext/stock/doctype/item/item.js +34,Show Variants,Показати варіанти
@@ -64,25 +61,23 @@
 DocType: Production Plan Item,Production Plan Item,Виробничий план товару
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +141,User {0} is already assigned to Employee {1},Користувач {0} вже присвоєний працівникові {1}
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +13,Make new POS Profile,Створіть новий POS профілю
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +31,Health Care,Охорона здоров&#39;я
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,Охорона здоров&#39;я
 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 +494,Invoice,Рахунок-фактура
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +519,Invoice,Рахунок-фактура
 DocType: Maintenance Schedule Item,Periodicity,Періодичність
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +357,Email Address,Адреса електронної пошти
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +21,Defense,Захист
+apps/erpnext/erpnext/public/js/setup_wizard.js +107,Email Address,Адреса електронної пошти
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,Захист
 DocType: Company,Abbr,Абревіатура
 DocType: Appraisal Goal,Score (0-5),Рахунок (0-5)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +193,Row {0}: {1} {2} does not match with {3},Ряд {0}: {1} {2} не відповідає {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +67,Row # {0}:,Ряд # {0}:
 DocType: Delivery Note,Vehicle No,Автомобіль Немає
 apps/erpnext/erpnext/public/js/pos/pos.js +528,Please select Price List,"Будь ласка, виберіть Прайс-лист"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +162,Woodworking,Деревообробний
 DocType: Production Order Operation,Work In Progress,В роботі
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +153,3D printing,3D-друк
 DocType: Employee,Holiday List,Список свят
 DocType: Time Log,Time Log,Час входу
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +530,Accountant,Бухгалтер
+apps/erpnext/erpnext/public/js/setup_wizard.js +274,Accountant,Бухгалтер
 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.","Журнал діяльності здійснюється користувачами проти Завдання, які можуть бути використані для відстеження часу, виставлення рахунків."
@@ -98,18 +93,19 @@
 DocType: Bin,Quantity Requested for Purchase,Кількість просив для покупки
 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/setup/page/setup_wizard/setup_wizard.js +626,Kg,Кг
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Kg,Кг
 apps/erpnext/erpnext/config/hr.py +48,Opening for a Job.,Відкриття на роботу.
 DocType: Item Attribute,Increment,Приріст
 apps/erpnext/erpnext/public/js/stock_analytics.js +63,Select Warehouse...,Виберіть Склад ...
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +6,Advertising,Реклама
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,Реклама
+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/doctype/sales_invoice/sales_invoice.py +389,Stock cannot be updated against Delivery Note {0},Фото не можуть бути оновлені проти накладної {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +391,Stock cannot be updated against Delivery Note {0},Фото не можуть бути оновлені проти накладної {0}
 DocType: Payment Reconciliation,Reconcile,Узгодити
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +30,Grocery,Продуктовий
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,Продуктовий
 DocType: Quality Inspection Reading,Reading 1,Читання 1
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Make Bank Entry,Зробити запис банку
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +40,Pension Funds,Пенсійні фонди
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,Пенсійні фонди
 apps/erpnext/erpnext/accounts/doctype/account/account.py +142,Warehouse is mandatory if account type is Warehouse,"Склад є обов&#39;язковим, якщо тип рахунку Склад"
 DocType: SMS Center,All Sales Person,Всі Продажі Особа
 DocType: Lead,Person Name,Ім&#39;я особи
@@ -131,7 +127,7 @@
 DocType: Quality Inspection,Get Specification Details,Отримати специфікація подробиці
 DocType: Lead,Interested,Зацікавлений
 apps/erpnext/erpnext/config/manufacturing.py +14,Bill of Material,Рахунок за матеріали
-apps/erpnext/erpnext/public/js/stock_analytics.js +45,Opening,Відкриття
+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,Копіювати з групи товарів
 DocType: Journal Entry,Opening Entry,Відкриття запис
@@ -145,23 +141,22 @@
 DocType: Employee Education,Under Graduate,Під Випускник
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +22,Target On,Цільова На
 DocType: BOM,Total Cost,Загальна вартість
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +99,Reaming,Розгортання
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +9,Activity Log:,Журнал активності:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +199,Item {0} does not exist in the system or has expired,"Пункт {0} не існує в системі, або закінчився"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +44,Real Estate,Нерухомість
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +44,Real Estate,Нерухомість
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +4,Statement of Account,Виписка
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +41,Pharmaceuticals,Фармацевтика
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,Фармацевтика
 DocType: Expense Claim Detail,Claim Amount,Сума претензії
 DocType: Employee,Mr,Містер
 DocType: Custom Script,Client,Клієнт
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,Постачальник Тип / Постачальник
 DocType: Naming Series,Prefix,Префікс
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Consumable,Споживаний
+apps/erpnext/erpnext/public/js/setup_wizard.js +359,Consumable,Споживаний
 DocType: Upload Attendance,Import Log,Імпорт Ввійти
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.js +19,Send,Послати
 DocType: Sales Invoice Item,Delivered By Supplier,Поставляється Постачальником
 DocType: SMS Center,All Contact,Всі контактні
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +164,Annual Salary,Річна заробітна плата
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +164,Annual Salary,Річна заробітна плата
 DocType: Period Closing Voucher,Closing Fiscal Year,Закриття фінансового року
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +69,Stock Expenses,Сток Витрати
 DocType: Newsletter,Email Sent?,Листа відправлено?
@@ -169,26 +164,24 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +92,Show Time Logs,Показати журнали Час
 DocType: Journal Entry Account,Credit in Company Currency,Кредит у валюті компанії
 DocType: Delivery Note,Installation Status,Стан установки
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +115,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Прийнято Відхилено + Кількість має дорівнювати кількості Надійшло у пункті {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +118,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 +133,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 +493,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Щоб включити податок у рядку {0} у розмірі Item, податки в рядках {1} повинні бути також включені"
+apps/erpnext/erpnext/controllers/accounts_controller.py +494,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Щоб включити податок у рядку {0} у розмірі Item, податки в рядках {1} повинні бути також включені"
 apps/erpnext/erpnext/config/hr.py +90,Settings for HR Module,Налаштування модуля HR для
 DocType: SMS Center,SMS Center,SMS-центр
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +78,Straightening,Випрямлення
 DocType: BOM Replace Tool,New BOM,Новий специфікації
 apps/erpnext/erpnext/config/projects.py +28,Batch Time Logs for billing.,Пакетна Журнали Час для виставлення рахунків.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +15,Countergravity casting,Лиття сифонной
 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/setup/page/setup_wizard/fixtures/industry_type.py +14,Broadcasting,Радіомовлення
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +140,Execution,Виконання
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +364,The first user will become the System Manager (you can change this later).,Перший користувач стане System Manager (ви можете змінити це пізніше).
+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/public/js/setup_wizard.js +114,The first user will become the System Manager (you can change this later).,Перший користувач стане System Manager (ви можете змінити це пізніше).
 apps/erpnext/erpnext/config/manufacturing.py +39,Details of the operations carried out.,Детальна інформація про виконані операції.
 DocType: Serial No,Maintenance Status,Технічне обслуговування Статус
 apps/erpnext/erpnext/config/stock.py +263,Items and Pricing,Товари та ціни
@@ -205,7 +198,6 @@
 DocType: Pricing Rule,Discount on Price List Rate (%),Знижка на Прайс-лист ставка (%)
 apps/frappe/frappe/public/js/frappe/form/print.js +96,Start,Початок
 DocType: User,First Name,Ім&#39;я
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +12,Full-mold casting,Лиття Повний цвілі
 DocType: Offer Letter,Select Terms and Conditions,Виберіть Терміни та умови
 DocType: Production Planning Tool,Sales Orders,Замовлення
 DocType: Purchase Taxes and Charges,Valuation,Оцінка
@@ -217,8 +209,7 @@
 DocType: Bank Reconciliation,Bank Account,Банківський рахунок
 DocType: Leave Type,Allow Negative Balance,Дозволити негативний баланс
 DocType: Selling Settings,Default Territory,За замовчуванням Територія
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +53,Television,Телебачення
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +138,Gashing,Наносить розріз
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,Телебачення
 DocType: Production Order Operation,Updated via 'Time Log',Оновлене допомогою &#39;Час Вхід &quot;
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +82,Account {0} does not belong to Company {1},Рахунок {0} не належать компанії {1}
 DocType: Naming Series,Series List for this Transaction,Список серії для даної транзакції
@@ -233,14 +224,13 @@
 DocType: Leave Allocation,Add unused leaves from previous allocations,Додати невикористовувані листя від попередніх асигнувань
 apps/erpnext/erpnext/controllers/recurring_document.py +206,Next Recurring {0} will be created on {1},Наступна Періодичні {0} буде створений на {1}
 DocType: Newsletter List,Total Subscribers,Всього Передплатники
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +575,Contact Name,Контактна особа
+,Contact Name,Контактна особа
 DocType: Production Plan Item,SO Pending Qty,ТАК В очікуванні Кількість
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Створює зарплати ковзання для згаданих вище критеріїв.
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,Запит на покупку.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +107,Double housing,Двомісний житла
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +156,Only the selected Leave Approver can submit this Leave Application,Тільки вибраний Залишити затверджує може представити цей Залишити заявку
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +171,Only the selected Leave Approver can submit this Leave Application,Тільки вибраний Залишити затверджує може представити цей Залишити заявку
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,"Звільнення Дата повинна бути більше, ніж дата вступу"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +172,Leaves per Year,Листя на рік
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +172,Leaves per Year,Листя на рік
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup > Settings > Naming Series,"Будь ласка, встановіть іменування серія для {0} через Setup&gt; Установки&gt; іменування серії"
 DocType: Time Log,Will be updated when batched.,Буде оновлюватися при пакетному.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +104,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,"Ряд {0}: Будь ласка, перевірте &#39;Як Предварительная &quot;проти рахунки {1}, якщо це заздалегідь запис."
@@ -249,25 +239,24 @@
 DocType: Item Website Specification,Item Website Specification,Пункт Сайт Специфікація
 DocType: Dropbox Backup,Dropbox Access Key,Dropbox ключ доступу
 DocType: Payment Tool,Reference No,Посилання Немає
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +348,Leave Blocked,Залишити Заблоковані
-apps/erpnext/erpnext/stock/doctype/item/item.py +535,Item {0} has reached its end of life on {1},Пункт {0} досяг кінець життя на {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +392,Leave Blocked,Залишити Заблоковані
+apps/erpnext/erpnext/stock/doctype/item/item.py +539,Item {0} has reached its end of life on {1},Пункт {0} досяг кінець життя на {1}
 apps/erpnext/erpnext/accounts/utils.py +339,Annual,Річний
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Фото Примирення товару
 DocType: Stock Entry,Sales Invoice No,Видаткова накладна Немає
 DocType: Material Request Item,Min Order Qty,Мінімальне замовлення Кількість
 DocType: Lead,Do Not Contact,Чи не Контакти
 DocType: Sales Invoice,The unique id for tracking all recurring invoices. It is generated on submit.,Унікальний ідентифікатор для відстеження всі повторювані рахунків-фактур. Він створюється на форму.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +93,Software Developer,Розробник програмного забезпечення
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +93,Software Developer,Розробник програмного забезпечення
 DocType: Item,Minimum Order Qty,Мінімальне замовлення Кількість
 DocType: Pricing Rule,Supplier Type,Постачальник Тип
 DocType: Item,Publish in Hub,Опублікувати в Hub
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +555,Item {0} is cancelled,Пункт {0} скасовується
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +598,Material Request,Матеріал Запит
+apps/erpnext/erpnext/stock/doctype/item/item.py +559,Item {0} is cancelled,Пункт {0} скасовується
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +607,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} знайдений в &quot;давальницька сировина&quot; таблиці в Замовленні {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +129,Wire brushing,Дротяною щіткою
 DocType: Employee,Relation,Ставлення
 DocType: Shipping Rule,Worldwide Shipping,Доставка по всьому світу
 apps/erpnext/erpnext/config/selling.py +23,Confirmed orders from Customers.,Підтверджені замовлення від клієнтів.
@@ -283,12 +272,11 @@
 DocType: Supplier,Address HTML,Адреса HTML
 DocType: Lead,Mobile No.,Номер мобільного.
 DocType: Maintenance Schedule,Generate Schedule,Створити розклад
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +81,Hubbing,Вдавлення
 DocType: Purchase Invoice Item,Expense Head,Витрати Керівник
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +86,Please select Charge Type first,"Будь ласка, виберіть Charge першого типу"
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,Останній
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +395,Max 5 characters,Макс 5 знаків
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +195,Select Your Language,Виберіть мову
+apps/erpnext/erpnext/public/js/setup_wizard.js +143,Max 5 characters,Макс 5 знаків
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +245,Select Your Language,Виберіть мову
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,Залишити затверджує в списку буде встановлено стандартним Залишити який стверджує
 DocType: Manufacturing Settings,"Disables creation of time logs against Production Orders.
 Operations shall not be tracked against Production Order","Відключення створення тимчасових журналів проти виробничих замовлень. Операції, що не буде відслідковуватися відносно виробничого замовлення"
@@ -300,8 +288,6 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +34,Item {0} must be Service Item,Пункт {0} повинен бути служба товару
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +303,Completed Qty can not be greater than 'Qty to Manufacture',"Завершений Кількість не може бути більше, ніж &quot;Кількість для виробництва&quot;"
 DocType: DocType,Administrator,Адміністратор
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +136,Laser drilling,Лазерне буріння
-DocType: Stock UOM Replace Utility,New Stock UOM,Новий зі UOM
 DocType: Period Closing Voucher,Closing Account Head,Закриття рахунку Керівник
 DocType: Employee,External Work History,Зовнішній роботи Історія
 apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,Циклічна посилання Помилка
@@ -310,18 +296,15 @@
 DocType: Lead,Industry,Промисловість
 DocType: Employee,Job Profile,Профіль роботи
 DocType: Newsletter,Newsletter,Інформаційний бюлетень
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +84,Hydroforming,Дегідрогенізація нафтопродуктів
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +49,Necking,Освіта шийки
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Повідомляти електронною поштою про створення автоматичної матеріалів Запит
 DocType: Journal Entry,Multi Currency,Мульти валют
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +51,Item is updated,Стан оновлюється
 DocType: Async Task,System Manager,Менеджер системи
 DocType: Payment Reconciliation Invoice,Invoice Type,Рахунок Тип
 DocType: Sales Invoice Item,Delivery Note,Накладна
 DocType: Dropbox Backup,Allow Dropbox Access,Дозволити доступ Dropbox
 apps/erpnext/erpnext/config/learn.py +72,Setting up Taxes,Налаштування Податки
 apps/erpnext/erpnext/accounts/utils.py +189,Payment Entry has been modified after you pulled it. Please pull it again.,"Оплата запис була змінена після витягнув його. Ласка, витягнути його знову."
-apps/erpnext/erpnext/stock/doctype/item/item.py +343,{0} entered twice in Item Tax,{0} введений двічі на п податку
+apps/erpnext/erpnext/stock/doctype/item/item.py +347,{0} entered twice in Item Tax,{0} введений двічі на п податку
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +105,Summary for this week and pending activities,Резюме на цьому тижні і в очікуванні діяльності
 DocType: Workstation,Rent Cost,Вартість оренди
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +74,Please select month and year,"Ласка, виберіть місяць та рік"
@@ -338,23 +321,21 @@
 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","Доступний в специфікації, накладної, рахунку-фактурі, замовлення продукції, покупки замовлення, покупка отриманні, накладна, замовлення клієнта, Фото в&#39;їзду, розкладі"
 DocType: Item Tax,Tax Rate,Ставка податку
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Select Item,Вибрати пункт
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +540,Select Item,Вибрати пункт
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +143,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","Стан: {0} вдалося порційно, не можуть бути узгоджені з допомогою \ зі примирення, а не використовувати зі запис"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +259,Purchase Invoice {0} is already submitted,Купівля Рахунок {0} вже представили
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +262,Purchase Invoice {0} is already submitted,Купівля Рахунок {0} вже представили
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Batch No must be same as {1} {2},"Ряд # {0}: Пакетне Немає повинно бути таким же, як {1} {2}"
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Convert to non-Group,Перетворити в негрупповой
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +55,Purchase Receipt must be submitted,Купівля Надходження повинні бути представлені
-DocType: Stock UOM Replace Utility,Current Stock UOM,Наявність на складі Одиниця виміру
 apps/erpnext/erpnext/config/stock.py +53,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}
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Your email address,Ваша електронна адреса
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +194,Please see attachment,"Будь ласка, див вкладення"
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +203,Please see attachment,"Будь ласка, див вкладення"
 DocType: Purchase Order,% Received,Отримане%
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +109,Water jet cutting,Різка струменем води
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +24,Setup Already Complete!!,Налаштування Вже Повний !!
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +20,Setup Already Complete!!,Налаштування Вже Повний !!
 ,Finished Goods,Готові вироби
 DocType: Delivery Note,Instructions,Інструкції
 DocType: Quality Inspection,Inspected By,Перевірено
@@ -369,6 +350,7 @@
 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,Обмін валюти
 DocType: Purchase Invoice Item,Item Name,Назва виробу
+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","Пункти, які просили &quot;на складі&quot; з урахуванням всіх складів на основі прогнозованих Кол і мінімальної Кіл замовлення"
@@ -378,11 +360,10 @@
 ,Purchase Register,Купівля Реєстрація
 DocType: Landed Cost Item,Applicable Charges,Застосовувані Збори
 DocType: Workstation,Consumable Cost,Вартість витратних
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,{0} ({1}) must have role 'Leave Approver',{0} ({1}) повинен мати роль &quot;Залишити затверджує&quot;
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +167,{0} ({1}) must have role 'Leave Approver',{0} ({1}) повинен мати роль &quot;Залишити затверджує&quot;
 DocType: Purchase Receipt,Vehicle Date,Дата
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +39,Medical,Медична
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +39,Medical,Медична
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,Причина втрати
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +36,Tube beading,Труба бісером
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},Робоча станція закрита в наступні терміни відповідно курортні Список: {0}
 DocType: Employee,Single,Одиночний
 DocType: Issue,Attachment,Прихильність
@@ -403,10 +384,8 @@
 DocType: Account,Is Group,Є Група
 DocType: Stock Settings,Automatically Set Serial Nos based on FIFO,Автоматично вказаний серійний пп на основі FIFO
 DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,Перевірте Постачальник Номер рахунку Унікальність
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +31,Thermoforming,Термоформування
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +66,Slitting,Поздовжня різка
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +57,'To Case No.' cannot be less than 'From Case No.',"&quot;Щоб Справа №&quot; не може бути менше, ніж &quot;З справі № &#39;"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +104,Non Profit,Некомерційне
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +104,Non Profit,Некомерційне
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_list.js +7,Not Started,Не розпочато
 DocType: Lead,Channel Partner,Канал Партнер
 DocType: Account,Old Parent,Старий Батько
@@ -415,13 +394,12 @@
 apps/erpnext/erpnext/config/manufacturing.py +74,Global settings for all manufacturing processes.,Глобальні налаштування для всіх виробничих процесів.
 DocType: Accounts Settings,Accounts Frozen Upto,Рахунки заморожені Upto
 DocType: SMS Log,Sent On,Відправлено На
-apps/erpnext/erpnext/stock/doctype/item/item.py +512,Attribute {0} selected multiple times in Attributes Table,Атрибут {0} вибрано кілька разів в таблиці атрибутів
+apps/erpnext/erpnext/stock/doctype/item/item.py +516,Attribute {0} selected multiple times in Attributes Table,Атрибут {0} вибрано кілька разів в таблиці атрибутів
 DocType: Sales Order,Not Applicable,Не застосовується
 apps/erpnext/erpnext/config/hr.py +140,Holiday master.,Майстер відпочинку.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +19,Shell molding,Shell лиття
 DocType: Material Request Item,Required Date,Потрібно Дата
 DocType: Delivery Note,Billing Address,Платіжний адреса
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +644,Please enter Item Code.,"Будь ласка, введіть код предмета."
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +648,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,Всього Кількість
@@ -431,7 +409,7 @@
 DocType: Item Attribute,To Range,Для Діапазон
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Цінні папери та депозити
 DocType: Features Setup,Imports,Імпорт
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +144,Adhesive bonding,Склеювання
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +77,Total leaves allocated is mandatory,"Всього листя, виділені є обов&#39;язковим"
 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.,Відвідуваність запис.
@@ -439,26 +417,25 @@
 DocType: Sales Order Item,Used for Production Plan,Використовується для виробничого плану
 DocType: System Settings,Loading...,Завантаження ...
 DocType: DocField,Password,Пароль
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +155,Fused deposition modeling,Плавлений осадження Моделювання
 DocType: Manufacturing Settings,Time Between Operations (in mins),Час між операціями (в хв)
 DocType: Customer,Buyer of Goods and Services.,Покупець товарів і послуг.
 DocType: Journal Entry,Accounts Payable,Рахунки кредиторів
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +24,Add Subscribers,Додати Передплатники
 apps/erpnext/erpnext/public/js/feature_setup.js +220,""" does not exists",&quot;Існує не
 DocType: Pricing Rule,Valid Upto,Дійсно Upto
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +564,List a few of your customers. They could be organizations or individuals.,Перерахуйте деякі з ваших клієнтів. Вони можуть бути організації або окремі особи.
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,List a few of your customers. They could be organizations or individuals.,Перерахуйте деякі з ваших клієнтів. Вони можуть бути організації або окремі особи.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Direct Income,Пряма прибуток
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +33,"Can not filter based on Account, if grouped by Account","Не можете фільтрувати на основі рахунку, якщо рахунок згруповані по"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +88,Administrative Officer,Адміністративний співробітник
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Administrative Officer,Адміністративний співробітник
 DocType: Payment Tool,Received Or Paid,Отримані або сплачені
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +318,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 +305,Please enter Warehouse for which Material Request will be raised,"Будь ласка, введіть Склад для яких Матеріал Запит буде піднято"
 DocType: Production Order,Additional Operating Cost,Додаткова Експлуатаційні витрати
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +20,Cosmetics,Косметика
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,Косметика
 DocType: DocField,Type,Тип
-apps/erpnext/erpnext/stock/doctype/item/item.py +417,"To merge, following properties must be same for both items","Щоб об&#39;єднати, наступні властивості повинні бути однаковими для обох пунктів"
+apps/erpnext/erpnext/stock/doctype/item/item.py +421,"To merge, following properties must be same for both items","Щоб об&#39;єднати, наступні властивості повинні бути однаковими для обох пунктів"
 DocType: Communication,Subject,Предмет
 DocType: Shipping Rule,Net Weight,Вага нетто
 DocType: Employee,Emergency Phone,Аварійний телефон
@@ -468,7 +445,6 @@
 DocType: Journal Entry,Difference (Dr - Cr),Різниця (Д - Cr)
 DocType: Account,Profit and Loss,Про прибутки та збитки
 apps/erpnext/erpnext/config/stock.py +293,Managing Subcontracting,Управління субпідряду
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +58,New UOM must NOT be of type Whole Number,Новий Одиниця виміру не повинна бути типу ціле число
 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 +47,Account {0} does not belong to company: {1},Рахунок {0} не належить компанії: {1}
@@ -487,14 +463,14 @@
 DocType: Purchase Invoice,Supplier Invoice No,Постачальник Рахунок Немає
 DocType: Territory,For reference,Для довідки
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +154,"Cannot delete Serial No {0}, as it is used in stock transactions","Не вдається видалити Серійний номер {0}, так як він використовується в угодах з акціями"
-apps/erpnext/erpnext/public/js/account_tree_grid.js +52,Closing (Cr),Закриття (Cr)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +227,Closing (Cr),Закриття (Cr)
 DocType: Serial No,Warranty Period (Days),Гарантійний термін (днів)
 DocType: Installation Note Item,Installation Note Item,Установка Примітка Пункт
 ,Pending Qty,В очікуванні Кількість
 DocType: Job Applicant,Thread HTML,Автор HTML-
 DocType: Company,Ignore,Ігнорувати
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +86,SMS sent to following numbers: {0},SMS відправлено наступних номерів: {0}
-apps/erpnext/erpnext/controllers/buying_controller.py +135,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Постачальник Склад обов&#39;язковим для суб-контракту купівлі отриманні
+apps/erpnext/erpnext/controllers/buying_controller.py +126,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Постачальник Склад обов&#39;язковим для суб-контракту купівлі отриманні
 DocType: Pricing Rule,Valid From,Діє з
 DocType: Sales Invoice,Total Commission,Всього комісія
 DocType: Pricing Rule,Sales Partner,Партнер по продажах
@@ -502,7 +478,7 @@
 DocType: Monthly Distribution,"**Monthly Distribution** helps you distribute your budget across months if you have seasonality in your business.
 
 To distribute a budget using this distribution, set this **Monthly Distribution** in the **Cost Center**","** Щомісячна поширення ** допомагає розподілити свій бюджет по місяців, якщо у вас є сезонність у вашому бізнесі. Щоб розподілити бюджет за допомогою цього розподілу, встановіть цей ** ** щомісячний розподіл в ** ** МВЗ"
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +183,No records found in the Invoice table,Записи не знайдені в таблиці рахунків
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +130,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 +84,Financial / accounting year.,Фінансова / звітний рік.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","На жаль, послідовний пп не можуть бути об&#39;єднані"
@@ -518,25 +494,25 @@
 DocType: Sales Order,Billing and Delivery Status,Біллінг і доставка Статус
 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/setup/page/setup_wizard/setup_wizard_page.html +16,Previous,Попередній
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard_page.html +16,Previous,Попередній
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +620,Sales Return,Продажі Повернутися
 DocType: Production Planning Tool,Select Sales Orders from which you want to create Production Orders.,"Виберіть замовлень клієнта, з якого ви хочете створити виробничі замовлення."
 DocType: Item,Delivered by Supplier (Drop Ship),Поставляється Постачальником (Drop кораблів)
 apps/erpnext/erpnext/config/hr.py +120,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.,Бази даних клієнтів.
 DocType: Quotation,Quotation To,Цитата Для
 DocType: Lead,Middle Income,Середній дохід
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),Відкриття (Cr)
 apps/erpnext/erpnext/accounts/utils.py +193,Allocated amount can not be negative,Позначена сума не може бути негативним
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +123,Tumbling,Акробатика
 DocType: Purchase Order Item,Billed Amt,Оголошений Amt
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,"Логічний склад, на якому акції записів зроблені."
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +92,Reference No & Reference Date is required for {0},Посилання № &amp; Посилання Дата потрібно для {0}
 DocType: Event,Wednesday,Середа
 DocType: Sales Invoice,Customer's Vendor,Виробник Клієнтам
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +214,Production Order is Mandatory,Виробничий замовлення є обов&#39;язковим
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +139,Proposal Writing,Пропозиція Написання
+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} існує з тим же ідентифікатором Співробітника
 DocType: Fiscal Year Company,Fiscal Year Company,Фінансовий рік компанії
 DocType: Packing Slip Item,DN Detail,DN Деталь
@@ -558,7 +534,7 @@
 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.","Тоді ціноутворення Правила фільтруються на основі Замовника, Група покупців, краю, постачальник, Тип постачальник, кампанії, і т.д. Sales Partner"
 apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.py +179,Please install dropbox python module,"Будь ласка, встановіть модуль пітона Dropbox"
 DocType: Employee,Passport Number,Номер паспорта
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +82,Manager,Менеджер
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Manager,Менеджер
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +494,From Purchase Receipt,Від покупки отриманні
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +219,Same item has been entered multiple times.,Такий же деталь був введений кілька разів.
 DocType: SMS Settings,Receiver Parameter,Приймач Параметр
@@ -566,10 +542,9 @@
 DocType: Sales Person,Sales Person Targets,Продавець Цілі
 apps/frappe/frappe/public/js/frappe/form/workflow.js +116,To,Для
 apps/frappe/frappe/templates/base.html +145,Please enter email address,"Будь ласка, введіть адресу електронної пошти"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +35,End tube forming,Кінець трубки формування
 DocType: Production Order Operation,In minutes,У хвилини
 DocType: Issue,Resolution Date,Дозвіл Дата
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +635,Please set default Cash or Bank account in Mode of Payment {0},"Будь ласка, встановіть Cash замовчуванням або банківського рахунку в режимі з оплати {0}"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +637,Please set default Cash or Bank account in Mode of Payment {0},"Будь ласка, встановіть Cash замовчуванням або банківського рахунку в режимі з оплати {0}"
 DocType: Selling Settings,Customer Naming By,Неймінг клієнтів по
 apps/erpnext/erpnext/accounts/doctype/account/account.js +67,Convert to Group,Перетворити в групі
 DocType: Activity Cost,Activity Type,Тип діяльності
@@ -577,12 +552,12 @@
 DocType: Customer,Fixed Days,Основні Дні
 DocType: Sales Invoice,Packing List,Список Упаковка
 apps/erpnext/erpnext/config/buying.py +28,Purchase Orders given to Suppliers.,"Замовлення, видані постачальникам."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +43,Publishing,Видавнича
+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 +198,{0}: {1} not found in Invoice Details table,{0}: {1} не найден в рахунку-фактурі таблиці
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,{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 +208,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Обслуговування Відвідати {0} має бути скасований до скасування цього замовлення клієнта
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +203,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),Відкриття (д-р)
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},Проводка повинна бути відмітка після {0}
@@ -594,7 +569,6 @@
 DocType: Pricing Rule,Sales Manager,Менеджер з продажу
 apps/frappe/frappe/public/js/frappe/model/model.js +492,Rename,Перейменувати
 DocType: Journal Entry,Write Off Amount,Списання Сума
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +52,Bending,Вигин
 apps/frappe/frappe/core/page/user_permissions/user_permissions.js +246,Allow User,Дозволити користувачеві
 DocType: Journal Entry,Bill No,Білл Немає
 DocType: Purchase Invoice,Quarterly,Щоквартальний
@@ -604,17 +578,16 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Please enter item details,"Будь ласка, введіть дані товаром"
 DocType: Purchase Receipt,Other Details,Інші подробиці
 DocType: Account,Accounts,Рахунки
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +67,Marketing,Маркетинг
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +65,Straight shearing,Прямо ножиці
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +67,Marketing,Маркетинг
 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/stock/doctype/purchase_receipt/purchase_receipt.py +99,Rejected Warehouse is mandatory against regected item,Відхилено Склад є обов&#39;язковим проти відкинуті пункту
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +102,Rejected Warehouse is mandatory against regected item,Відхилено Склад є обов&#39;язковим проти відкинуті пункту
 DocType: Account,Expenses Included In Valuation,"Витрат, що включаються в оцінці"
 DocType: Employee,Provide email id registered in company,Забезпечити електронний ідентифікатор зареєстрованого в компанії
 DocType: Hub Settings,Seller City,Продавець Місто
 DocType: Email Digest,Next email will be sent on:,Наступна буде відправлено листа на:
 DocType: Offer Letter Term,Offer Letter Term,Пропозиція Лист термін
-apps/erpnext/erpnext/stock/doctype/item/item.py +492,Item has variants.,Пункт має варіанти.
+apps/erpnext/erpnext/stock/doctype/item/item.py +496,Item has variants.,Пункт має варіанти.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Пункт {0} знайдений
 DocType: Bin,Stock Value,Вартість акцій
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,Дерево Тип
@@ -623,10 +596,9 @@
 DocType: Material Request Item,Quantity and Warehouse,Кількість і Склад
 DocType: Sales Invoice,Commission Rate (%),Комісія ставка (%)
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +172,"Against Voucher Type must be one of Sales Order, Sales Invoice or Journal Entry","На ваучері Тип повинен бути одним із замовлення клієнта, накладна або журнал запис"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +139,Biomachining,Biomachining
 apps/erpnext/erpnext/setup/utils.py +89,Unable to find exchange rate,Неможливо знайти обмінний курс
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +7,Aerospace,Авіаційно-космічний
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +19,Welcome,Ласкаво просимо
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +7,Aerospace,Авіаційно-космічний
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +40,Welcome,Ласкаво просимо
 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.,"Товари, отримані від постачальників."
@@ -649,19 +621,19 @@
 DocType: Employee,Cell Number,Кількість стільникових
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Втрачений
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +120,You can not enter current voucher in 'Against Journal Entry' column,Ви не можете ввести поточний ваучер в «Проти Запис у журналі &#39;колонці
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +25,Energy,Енергія
+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.,Щомісячна виписка зарплата.
 DocType: Item Group,Website Specifications,Сайт характеристики
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +205,New Account,Новий акаунт
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +21,{0}: From {0} of type {1},{0}: З {0} типу {1}
-apps/erpnext/erpnext/controllers/buying_controller.py +283,Row {0}: Conversion Factor is mandatory,Ряд {0}: Коефіцієнт перетворення є обов&#39;язковим
+apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,Ряд {0}: Коефіцієнт перетворення є обов&#39;язковим
 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.,Бухгалтерські записи можна з листовими вузлами. Записи проти груп не допускається.
 DocType: ToDo,High,Високий
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +361,Cannot deactivate or cancel BOM as it is linked with other BOMs,"Не можете деактивувати або скасувати специфікації, як вона пов&#39;язана з іншими специфікаціями"
 DocType: Opportunity,Maintenance,Технічне обслуговування
 DocType: User,Male,Чоловік
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +182,Purchase Receipt number required for Item {0},Купівля Надходження номер потрібно для пункту {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +183,Purchase Receipt number required for Item {0},Купівля Надходження номер потрібно для пункту {0}
 DocType: Item Attribute Value,Item Attribute Value,Стан Значення атрибуту
 apps/erpnext/erpnext/config/crm.py +64,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.
@@ -690,10 +662,9 @@
 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 +324,"Journal Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Запис у щоденнику {0} пов&#39;язана з наказом {1}, перевірити, якщо він повинен бути підтягнутий, як просунутися в цьому рахунку-фактурі."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +13,Biotechnology,Біотехнологія
+apps/erpnext/erpnext/controllers/accounts_controller.py +325,"Journal Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Запис у щоденнику {0} пов&#39;язана з наказом {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,Витрати офісу обслуговування
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +53,Hemming,Хеммінг
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +66,Please enter Item first,"Будь ласка, введіть перший пункт"
 DocType: Account,Liability,Відповідальність
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +62,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,"Санкціонований сума не може бути більше, ніж претензії Сума в рядку {0}."
@@ -706,10 +677,10 @@
 DocType: Company,Default Bank Account,За замовчуванням Банківський рахунок
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +47,"To filter based on Party, select Party Type first","Щоб відфільтрувати на основі партії, виберіть партія першого типу"
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},"&quot;Оновлення зі &#39;не може бути перевірено, тому що речі не поставляється через {0}"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Nos,Пп
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Nos,Пп
 DocType: Item,Items with higher weightage will be shown higher,"Елементи з більш високою weightage буде показано вище,"
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Банк примирення Подробиці
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +627,My Invoices,Мої Рахунки
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +629,My Invoices,Мої Рахунки
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,Жоден працівник не знайдено
 DocType: Purchase Order,Stopped,Зупинився
 DocType: Item,If subcontracted to a vendor,Якщо по субпідряду постачальника
@@ -728,35 +699,33 @@
 DocType: Features Setup,"To enable ""Point of Sale"" features",Щоб включити &quot;Точки продажу&quot; Особливості
 DocType: Bin,Moving Average Rate,Moving Average Rate
 DocType: Production Planning Tool,Select Items,Оберіть товари
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,{0} against Bill {1} dated {2},{0} проти Білла {1} від {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +328,{0} against Bill {1} dated {2},{0} проти Білла {1} від {2}
 DocType: Comment,Reference Name,Ім&#39;я посилання
 DocType: Maintenance Visit,Completion Status,Статус завершення
 DocType: Sales Invoice Item,Target Warehouse,Цільова Склад
 DocType: Item,Allow over delivery or receipt upto this percent,Дозволити доставку по квитанції або Шифрування до цього відсотка
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +49,Expected Delivery Date cannot be before Sales Order Date,"Очікувана дата поставки не може бути, перш ніж Sales Order Дата"
 DocType: Upload Attendance,Import Attendance,Імпорт Відвідуваність
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +17,All Item Groups,Всі Групи товарів
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +17,All Item Groups,Всі Групи товарів
 DocType: Process Payroll,Activity Log,Журнал активності
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +30,Net Profit / Loss,Чистий прибуток / збиток
 apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,Автоматично написати повідомлення за поданням угод.
 DocType: Production Order,Item To Manufacture,Елемент Виробництво
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +16,Permanent mold casting,Постійна ливарна форма
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} статус {2}
 apps/erpnext/erpnext/config/learn.py +172,Purchase Order to Payment,Замовлення на Оплата
 DocType: Sales Order Item,Projected Qty,Прогнозований Кількість
 DocType: Sales Invoice,Payment Due Date,Дата платежу
 DocType: Newsletter,Newsletter Manager,Розсилка менеджер
-apps/erpnext/erpnext/stock/doctype/item/item.js +229,Item Variant {0} already exists with same attributes,Пункт Варіант {0} вже існує ж атрибутами
+apps/erpnext/erpnext/stock/doctype/item/item.js +231,Item Variant {0} already exists with same attributes,Пункт Варіант {0} вже існує ж атрибутами
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening',&quot;Відкриття&quot;
 DocType: Notification Control,Delivery Note Message,Доставка Примітка Повідомлення
 DocType: Expense Claim,Expenses,Витрати
 DocType: Item Variant Attribute,Item Variant Attribute,Варіант Пункт Атрибут
 ,Purchase Receipt Trends,Купівля розписок Тенденції
 DocType: Appraisal,Select template from which you want to get the Goals,"Виберіть шаблон, з якого ви хочете отримати тисячоліття"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +77,Research & Development,Дослідження і розвиток
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Research & Development,Дослідження і розвиток
 ,Amount to Bill,Сума Білла
 DocType: Company,Registration Details,Реєстраційні дані
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +75,Staking,Розбивка
 DocType: Item,Re-Order Qty,Re-Order Кіл
 DocType: Leave Block List Date,Leave Block List Date,Залишити Чорний список Реєстрація
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +25,Scheduled to send to {0},Планується відправити {0}
@@ -767,18 +736,16 @@
 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/hr/doctype/leave_allocation/leave_allocation.py +71,Cannot carry forward {0},Не можете переносити {0}
 apps/erpnext/erpnext/accounts/doctype/account/account.py +91,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","Баланс рахунку вже в кредит, ви не можете встановити &quot;баланс повинен бути&quot;, як &quot;дебет&quot;"
 DocType: Account,Balance must be,Баланс повинен бути
 DocType: Hub Settings,Publish Pricing,Опублікувати Ціни
 DocType: Notification Control,Expense Claim Rejected Message,Витрати Заявити Відхилено повідомлення
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +145,Nailing,Чудовий
 ,Available Qty,Доступно Кількість
 DocType: Purchase Taxes and Charges,On Previous Row Total,На попередньому рядку Total
 DocType: Salary Slip,Working Days,Робочі дні
 DocType: Serial No,Incoming Rate,Вхідний Оцінити
 DocType: Packing Slip,Gross Weight,Вага брутто
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +410,The name of your company for which you are setting up this system.,"Назва вашої компанії, для якої ви налаштовуєте цю систему."
+apps/erpnext/erpnext/public/js/setup_wizard.js +158,The name of your company for which you are setting up this system.,"Назва вашої компанії, для якої ви налаштовуєте цю систему."
 DocType: HR Settings,Include holidays in Total no. of Working Days,Включити відпустку в Total No. робочих днів
 DocType: Job Applicant,Hold,Тримати
 DocType: Employee,Date of Joining,Дата вступу
@@ -788,7 +755,6 @@
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +3,View Subscribers,Подивитися Передплатники
 DocType: Purchase Invoice Item,Purchase Receipt,Купівля Надходження
 ,Received Items To Be Billed,"Надійшли пунктів, які будуть Оголошений"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +114,Abrasive blasting,Абразивний вибухових
 DocType: Employee,Ms,Міссісіпі
 apps/erpnext/erpnext/config/accounts.py +148,Currency exchange rate master.,Валютний курс майстер.
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +253,Unable to find Time Slot in the next {0} days for Operation {1},Неможливо знайти часовий інтервал в найближчі {0} днів для роботи {1}
@@ -800,7 +766,7 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +209,Serial No {0} does not belong to Item {1},Серійний номер {0} не належить до пункту {1}
 DocType: Purchase Receipt Item Supplied,Required Qty,Обов&#39;язково Кількість
 DocType: Bank Reconciliation,Total Amount,Загальна кількість
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +32,Internet Publishing,Інтернет видання
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,Інтернет видання
 DocType: Production Planning Tool,Production Orders,Виробничі замовлення
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +35,Balance Value,Валюта балансу
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,Продажі Прайс-лист
@@ -811,7 +777,7 @@
 DocType: Supplier,Default Payable Accounts,За замовчуванням заборгованість Кредиторська
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,Співробітник {0} не є активним або не існує
 DocType: Features Setup,Item Barcode,Пункт Штрих
-apps/erpnext/erpnext/stock/doctype/item/item.py +487,Item Variants {0} updated,Пункт Варіанти {0} оновлюються
+apps/erpnext/erpnext/stock/doctype/item/item.py +491,Item Variants {0} updated,Пункт Варіанти {0} оновлюються
 DocType: Quality Inspection Reading,Reading 6,Читання 6
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Рахунок покупки Advance
 DocType: Address,Shop,Магазин
@@ -820,7 +786,7 @@
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,Обліковий запис за замовчуванням банк / Ксерокопіювання буде автоматично оновлюватися в POS фактурі коли обрано цей режим.
 DocType: Employee,Permanent Address Is,Постійна адреса Є
 DocType: Production Order Operation,Operation completed for how many finished goods?,"Операція виконана для багатьох, як готової продукції?"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +491,The Brand,Бренд
+apps/erpnext/erpnext/public/js/setup_wizard.js +237,The Brand,Бренд
 apps/erpnext/erpnext/controllers/status_updater.py +163,Allowance for over-{0} crossed for Item {1}.,Посібник для пере- {0} схрещеними Пункт {1}.
 DocType: Employee,Exit Interview Details,Вихід Інтерв&#39;ю Подробиці
 DocType: Item,Is Purchase Item,Хіба Купівля товару
@@ -840,16 +806,16 @@
 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,Встановіть Сума платежу = сума Видатний
 DocType: Contact Us Settings,Address Line 1,Адресний рядок 1
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Variance,Дисперсія
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +392,Company Name,Назва компанії
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +53,Variance,Дисперсія
+,Company Name,Назва компанії
 DocType: SMS Center,Total Message(s),Всього повідомлень (їй)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +515,Select Item for Transfer,Вибрати пункт трансферу
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +538,Select Item for Transfer,Вибрати пункт трансферу
 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.,"Вибір рахунка керівник банку, в якому перевірка була зберігання."
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,Дозволити користувачеві редагувати прайс-лист в угодах Оцінити
 DocType: Pricing Rule,Max Qty,Макс Кількість
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +106,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Ряд {0}: Оплата проти продажів / Замовлення повинні бути завжди заздалегідь відзначений як
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +16,Chemical,Хімічна
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,Хімічна
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +693,All items have already been transferred for this Production Order.,Всі деталі вже були передані для цього виробничого замовлення.
 DocType: Process Payroll,Select Payroll Year and Month,Виберіть Payroll рік і місяць
 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""",Перейти до відповідної групи (зазвичай використання коштів&gt; Поточні активи&gt; Банківські рахунки і створити новий акаунт (натиснувши на Додати Дитину) типу &quot;банк&quot;
@@ -860,12 +826,12 @@
 DocType: Item,Inspection Criteria,Інспекційні Критерії
 apps/erpnext/erpnext/config/accounts.py +101,Tree of finanial Cost Centers.,Дерево finanial МВЗ.
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,Всі передані
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +492,Upload your letter head and logo. (you can edit them later).,Завантажити лист голову і логотип. (ви можете редагувати їх пізніше).
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +156,White,Білий
+apps/erpnext/erpnext/public/js/setup_wizard.js +238,Upload your letter head and logo. (you can edit them later).,Завантажити лист голову і логотип. (ви можете редагувати їх пізніше).
+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/setup/page/setup_wizard/setup_wizard.js +362,Attach Your Picture,Прикріпіть свою фотографію
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Make ,Зробити
+apps/erpnext/erpnext/public/js/setup_wizard.js +112,Attach Your Picture,Прикріпіть свою фотографію
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +540,Make ,Зробити
 DocType: Journal Entry,Total Amount in Words,Загальна сума прописом
 DocType: Workflow State,Stop,Стоп
 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.,"Був помилка. Одна з можливих причин може бути те, що ви не зберегли форму. Будь ласка, зв&#39;яжіться з support@erpnext.com якщо проблема не усунена."
@@ -874,14 +840,13 @@
 DocType: Lead,Next Contact Date,Наступна Контактні Дата
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,Відкриття Кількість
 DocType: Holiday List,Holiday List Name,Ім&#39;я відпочинку Список
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +168,Stock Options,Опціони
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +168,Stock Options,Опціони
 DocType: Journal Entry Account,Expense Claim,Витрати Заявити
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +181,Qty for {0},Кількість для {0}
 DocType: Leave Application,Leave Application,Залишити заявку
 apps/erpnext/erpnext/config/hr.py +77,Leave Allocation Tool,Залишити Allocation Tool
 DocType: Leave Block List,Leave Block List Dates,Залишити Чорний список дат
 DocType: Company,If Monthly Budget Exceeded (for expense account),Якщо Щомісячний бюджет перевищено (за рахунок витрат)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +56,Trimming,Обрізки
 DocType: Workstation,Net Hour Rate,Чистий годину Оцінити
 DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,Приземлився Вартість Купівля Надходження
 DocType: Company,Default Terms,Умови замовчуванням
@@ -889,10 +854,9 @@
 DocType: POS Profile,Cash/Bank Account,Готівковий / Банківський рахунок
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,Removed items with no change in quantity or value.,Вилучені пункти без зміни в кількості або вартості.
 DocType: Delivery Note,Delivery To,Доставка Для
-apps/erpnext/erpnext/stock/doctype/item/item.py +509,Attribute table is mandatory,Атрибут стіл є обов&#39;язковим
+apps/erpnext/erpnext/stock/doctype/item/item.py +513,Attribute table is mandatory,Атрибут стіл є обов&#39;язковим
 DocType: Production Planning Tool,Get Sales Orders,Отримати замовлень клієнта
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} не може бути негативним
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +103,Filing,Подача
 apps/erpnext/erpnext/templates/form_grid/item_grid.html +72,Discount,Знижка
 DocType: Features Setup,Purchase Discounts,Купівля Знижки
 DocType: Workstation,Wages,Заробітна плата
@@ -909,6 +873,7 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +112,You are the Expense Approver for this record. Please Update the 'Status' and Save,Ви рахунок затверджує для цього запису. Оновіть &#39;Стан&#39; і збережіть
 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 +136,"Attributes for Item Variants. e.g Size, Color etc.","Атрибути для товара Variant. наприклад, розмір, колір і т.д."
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +39,WIP Warehouse,НЗП Склад
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +194,Serial No {0} is under maintenance contract upto {1},Серійний номер {0} за контрактом Шифрування до обслуговування {1}
@@ -917,7 +882,7 @@
 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,Товар повинен бути додані за допомогою &quot;Отримати товари від покупки розписок&quot; кнопки
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,Продажі Витрати
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Buying,Стандартний Купівля
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +120,Standard Buying,Стандартний Купівля
 DocType: GL Entry,Against,Проти
 DocType: Item,Default Selling Cost Center,За замовчуванням Продаж МВЗ
 DocType: Sales Partner,Implementation Partner,Реалізація Партнер
@@ -938,29 +903,29 @@
 DocType: Time Log Batch,updated via Time Logs,оновлюється через журнали Time
 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,"Ваш менеджер з продажу, який зв&#39;яжеться з вами в майбутньому"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +588,List a few of your suppliers. They could be organizations or individuals.,Перерахуйте деякі з ваших постачальників. Вони можуть бути організації або окремі особи.
+apps/erpnext/erpnext/public/js/setup_wizard.js +326,List a few of your suppliers. They could be organizations or individuals.,Перерахуйте деякі з ваших постачальників. Вони можуть бути організації або окремі особи.
 DocType: Company,Default Currency,Базова валюта
 DocType: Contact,Enter designation of this Contact,Введіть позначення цього контакту
 DocType: Contact Us Settings,Address,Адреса
 DocType: Expense Claim,From Employee,Від працівника
-apps/erpnext/erpnext/controllers/accounts_controller.py +338,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Увага: Система не перевірятиме overbilling так суми за Пункт {0} {1} дорівнює нулю
+apps/erpnext/erpnext/controllers/accounts_controller.py +339,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Увага: Система не перевірятиме overbilling так суми за Пункт {0} {1} дорівнює нулю
 DocType: Journal Entry,Make Difference Entry,Зробити запис Difference
 DocType: Upload Attendance,Attendance From Date,Відвідуваність З дати
 DocType: Appraisal Template Goal,Key Performance Area,Ключ Площа Продуктивність
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +54,Transportation,Транспорт
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +54,Transportation,Транспорт
 apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +67, and year: ,і рік:
 DocType: Email Digest,Annual Expense,Річні витрати
 DocType: SMS Center,Total Characters,Всього Персонажі
-apps/erpnext/erpnext/controllers/buying_controller.py +139,Please select BOM in BOM field for Item {0},"Будь ласка, виберіть специфікації в специфікації поля для Пункт {0}"
+apps/erpnext/erpnext/controllers/buying_controller.py +130,Please select BOM in BOM field for Item {0},"Будь ласка, виберіть специфікації в специфікації поля для Пункт {0}"
 DocType: C-Form Invoice Detail,C-Form Invoice Detail,С-форма рахунки-фактури Подробиці
 DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,Оплата рахунку-фактури Примирення
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +32,Contribution %,Внесок%
 DocType: Item,website page link,сайт посилання на сторінку
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +192,Let's prepare the system for first use.,Давайте підготувати систему для першого використання.
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +242,Let's prepare the system for first use.,Давайте підготувати систему для першого використання.
 DocType: Company,Company registration numbers for your reference. Tax numbers etc.,Реєстраційні номери компанії для вашої довідки. Податкові номери і т.д.
 DocType: Sales Partner,Distributor,Дистриб&#39;ютор
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Кошик Правило Доставка
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +214,Production Order {0} must be cancelled before cancelling this Sales Order,Виробничий замовлення {0} має бути скасований до скасування цього замовлення клієнта
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +209,Production Order {0} must be cancelled before cancelling this Sales Order,Виробничий замовлення {0} має бути скасований до скасування цього замовлення клієнта
 ,Ordered Items To Be Billed,Замовлені товари To Be Оголошений
 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.,Виберіть час і журнали Розмістити створити нову рахунок-фактуру.
@@ -980,14 +945,13 @@
 DocType: Sales Invoice Advance,Sales Invoice Advance,Видаткова накладна Попередня
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +398,Nothing to request,Нічого не просити
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date',"&quot;Фактичний початок Дата&quot; не може бути більше, ніж «Фактичне Дата закінчення &#39;"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +75,Management,Управління
+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/setup/page/setup_wizard/fixtures/operations.py +14,Investment casting,Лиття по виплавлюваних моделях
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +51,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», і код пункт &quot;Футболки&quot;, пункт код варіанта буде &quot;Футболки-СМ&quot;"
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,"Чистий Платне (на словах) будуть видні, як тільки ви збережете зарплата ковзання."
 apps/frappe/frappe/core/doctype/user/user_list.js +12,Active,Активний
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +154,Blue,Синій
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +154,Blue,Синій
 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,Подальші вузли можуть бути створені тільки під вузлами типу &quot;група&quot;
@@ -997,18 +961,16 @@
 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,За замовчуванням Об&#39;єкт Група
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +156,Laminated object manufacturing,Виробництво багатошарового об&#39;єкта
 apps/erpnext/erpnext/config/buying.py +13,Supplier database.,Постачальник баз даних.
 DocType: Account,Balance Sheet,Бухгалтерський баланс
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +561,Cost Center For Item with Item Code ',Вартість Center For Пункт із Код товару &quot;
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +45,Stretch forming,Стретч формування
 DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,"Ваш менеджер з продажу отримаєте нагадування в цей день, щоб зв&#39;язатися з клієнтом"
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +210,"Further accounts can be made under Groups, but entries can be made against non-Groups","Подальші рахунки можуть бути зроблені відповідно до груп, але Ви можете бути проти НЕ-груп"
 apps/erpnext/erpnext/config/hr.py +125,Tax and other salary deductions.,Податкові та інші відрахування заробітної плати.
 DocType: Lead,Lead,Вести
 DocType: Email Digest,Payables,Кредиторська заборгованість
 DocType: Account,Warehouse,Склад
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +90,Row #{0}: Rejected Qty can not be entered in Purchase Return,Ряд # {0}: Відхилено Кількість не може бути введений в придбанні Повернутися
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +93,Row #{0}: Rejected Qty can not be entered in Purchase Return,Ряд # {0}: Відхилено Кількість не може бути введений в придбанні Повернутися
 ,Purchase Order Items To Be Billed,"Купівля Замовити пунктів, які будуть Оголошений"
 DocType: Purchase Invoice Item,Net Rate,Нетто-ставка
 DocType: Purchase Invoice Item,Purchase Invoice Item,Рахунок покупки пункт
@@ -1023,13 +985,13 @@
 DocType: Global Defaults,Current Fiscal Year,Поточний фінансовий рік
 DocType: Global Defaults,Disable Rounded Total,Відключити Rounded Всього
 DocType: Lead,Call,Виклик
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +384,'Entries' cannot be empty,&quot;Записи&quot; не може бути порожнім
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +386,'Entries' cannot be empty,&quot;Записи&quot; не може бути порожнім
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},Дублікат ряд {0} з такою ж {1}
 ,Trial Balance,Пробний баланс
 apps/erpnext/erpnext/config/hr.py +205,Setting up Employees,Налаштування Співробітники
 apps/erpnext/erpnext/public/js/feature_setup.js +220,"Grid """,Сітка &quot;
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +150,Please select prefix first,"Будь ласка, виберіть префікс в першу чергу"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +138,Research,Дослідження
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +138,Research,Дослідження
 DocType: Maintenance Visit Purpose,Work Done,Зроблено
 apps/erpnext/erpnext/controllers/item_variant.py +25,Please specify at least one attribute in the Attributes table,"Будь ласка, вкажіть як мінімум один атрибут в таблиці атрибутів"
 DocType: Contact,User ID,ідентифікатор користувача
@@ -1037,10 +999,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +57,View Ledger,Подивитися Леджер
 DocType: File,Lft,Lft
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Найперша
-apps/erpnext/erpnext/stock/doctype/item/item.py +394,"An Item Group exists with same name, please change the item name or rename the item group","Пункт Група існує з таким же ім&#39;ям, будь ласка, змініть ім&#39;я пункту або перейменувати групу товарів"
+apps/erpnext/erpnext/stock/doctype/item/item.py +398,"An Item Group exists with same name, please change the item name or rename the item group","Пункт Група існує з таким же ім&#39;ям, будь ласка, змініть ім&#39;я пункту або перейменувати групу товарів"
 DocType: Communication,Delivery Status,Статус поставки
 DocType: Production Order,Manufacture against Sales Order,Виробництво проти замовлення клієнта
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +517,Rest Of The World,Решта світу
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +455,Rest Of The World,Решта світу
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,Деталь {0} не може мати Batch
 ,Budget Variance Report,Бюджет Різниця Повідомити
 DocType: Salary Slip,Gross Pay,Повна Платне
@@ -1051,13 +1013,11 @@
 DocType: BOM Item,Item Description,Опис товару
 DocType: Payment Tool,Payment Mode,Режим компенсації
 DocType: Purchase Invoice,Is Recurring,Повторюється
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +154,Direct metal laser sintering,Пряма металева лазерне спікання
 DocType: Purchase Order,Supplied Items,"Товари, що поставляються"
 DocType: Production Order,Qty To Manufacture,Кількість для виробництва
 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,Тимчасове відкриття
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +41,Cryorolling,Cryorolling
 ,Employee Leave Balance,Співробітник Залишити Баланс
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +128,Balance for Account {0} must always be {1},Ваги для рахунку {0} повинен бути завжди {1}
 DocType: Address,Address Type,Адреса Тип
@@ -1073,23 +1033,23 @@
 DocType: Journal Entry,Get Outstanding Invoices,Отримати неоплачених рахунків
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,Продажі Замовити {0} не є допустимим
 apps/erpnext/erpnext/setup/doctype/company/company.py +172,"Sorry, companies cannot be merged","На жаль, компанії не можуть бути об&#39;єднані"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +145,Small,Невеликий
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Small,Невеликий
 DocType: Employee,Employee Number,Кількість працівників
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},Справа Ні (и) вже використовується. Спробуйте зі справи № {0}
 ,Invoiced Amount (Exculsive Tax),Сума за рахунками (Exculsive вартість)
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,Пункт 2
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +59,Account head {0} created,Рахунок глава {0} створена
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +153,Green,Зелений
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Green,Зелений
 DocType: Item,Auto re-order,Авто повторного замовлення
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +57,Total Achieved,Всього Виконано
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +59,Total Achieved,Всього Виконано
 DocType: Employee,Place of Issue,Місце видачі
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +59,Contract,Контракт
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Contract,Контракт
 DocType: Report,Disabled,Інвалід
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +490,UOM coversion factor required for UOM: {0} in Item: {1},Одиниця виміру фактором Coversion потрібно для UOM: {0} в пункті: {1}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +83,Indirect Expenses,Непрямі витрати
 apps/erpnext/erpnext/controllers/selling_controller.py +163,Row {0}: Qty is mandatory,Ряд {0}: Кількість обов&#39;язково
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +8,Agriculture,Сільське господарство
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +611,Your Products or Services,Ваші продукти або послуги
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,Сільське господарство
+apps/erpnext/erpnext/public/js/setup_wizard.js +347,Your Products or Services,Ваші продукти або послуги
 DocType: Mode of Payment,Mode of Payment,Спосіб платежу
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,Це кореневий елемент групи і не можуть бути змінені.
 DocType: Journal Entry Account,Purchase Order,Замовлення на придбання
@@ -1101,7 +1061,7 @@
 DocType: Serial No,Serial No Details,Серійний номер деталі
 DocType: Purchase Invoice Item,Item Tax Rate,Пункт Податкова ставка
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +113,"For {0}, only credit accounts can be linked against another debit entry","Для {0}, тільки кредитні рахунки можуть бути пов&#39;язані з іншою дебету"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Delivery Note {0} is not submitted,Доставка Примітка {0} не представлено
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +470,Delivery Note {0} is not submitted,Доставка Примітка {0} не представлено
 apps/erpnext/erpnext/stock/get_item_details.py +136,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.","Ціни Правило спочатку вибирається на основі &quot;Застосувати На&quot; поле, яке може бути Пункт, Пункт Група або Марка."
@@ -1111,7 +1071,7 @@
 DocType: Appraisal Goal,Goal,Мета
 DocType: Sales Invoice Item,Edit Description,Редагувати опис
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +318,Expected Delivery Date is lesser than Planned Start Date.,"Очікувана дата поставки менше, ніж Запланована дата початку."
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +579,For Supplier,Для Постачальника
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +602,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,Всього Вихідні
@@ -1137,10 +1097,10 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +74,"Total {0} for all items is zero, may you should change 'Distribute Charges Based On'","Всього {0} для всіх елементів дорівнює нулю, може, ви повинні змінити &quot;Розподілити плату на основі&quot;"
 DocType: Purchase Invoice,Taxes and Charges Calculation,Податки і збори Розрахунок
 DocType: BOM Operation,Workstation,Робоча станція
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +112,Hardware,Апаратний
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +112,Hardware,Апаратний
 DocType: Attendance,HR Manager,менеджер з персоналу
 apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,"Будь ласка, виберіть компанію"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +50,Privilege Leave,Привілейований Залишити
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +50,Privilege Leave,Привілейований Залишити
 DocType: Purchase Invoice,Supplier Invoice Date,Постачальник Рахунок Дата
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +79,You need to enable Shopping Cart,Вам необхідно включити Кошик
 apps/frappe/frappe/public/js/frappe/form/grid_body.html +6,No Data,Немає даних
@@ -1153,7 +1113,7 @@
 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 +168,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/setup/page/setup_wizard/install_fixtures.py +38,Food,Їжа
+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 +139,You can make a time log only against a submitted production order,Ви можете зробити журнал часу тільки проти представленого виробничого замовлення
 DocType: Maintenance Schedule Item,No of Visits,Немає відвідувань
@@ -1173,6 +1133,7 @@
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,View Offer Letter,Подивитися пропозицію Лист
 DocType: Communication,Communication,Зв&#39;язки
 DocType: Item,Is Service Item,Є служба товару
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +81,Application period cannot be outside leave allocation period,Термін подачі заяв не може бути період розподілу межами відпустку
 DocType: Activity Cost,Projects,Проектів
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +31,Please select Fiscal Year,"Будь ласка, виберіть фінансовий рік"
 apps/erpnext/erpnext/controllers/buying_controller.py +23,From {0} | {1} {2},З {0} | {1} {2}
@@ -1191,7 +1152,7 @@
 DocType: Item,Maintain Stock,Підтримання складі
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +213,Stock Entries already created for Production Order ,Сток Записи вже створені для виробничого замовлення
 DocType: Leave Control Panel,Leave blank if considered for all designations,"Залиште порожнім, якщо вважати всіх позначень"
-apps/erpnext/erpnext/controllers/accounts_controller.py +499,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Нарахування типу &quot;Актуальні &#39;в рядку {0} не можуть бути включені в п Оцінити
+apps/erpnext/erpnext/controllers/accounts_controller.py +500,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Нарахування типу &quot;Актуальні &#39;в рядку {0} не можуть бути включені в п Оцінити
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,Max: {0},Макс: {0}
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +16,From Datetime,З DateTime
 DocType: Email Digest,For Company,За компанію
@@ -1201,7 +1162,7 @@
 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 +471,cannot be greater than 100,не може бути більше ніж 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +546,Item {0} is not a stock Item,Пункт {0} не є акціонерним товару
+apps/erpnext/erpnext/stock/doctype/item/item.py +550,Item {0} is not a stock Item,Пункт {0} не є акціонерним товару
 DocType: Maintenance Visit,Unscheduled,Позапланові
 DocType: Employee,Owned,Бувший
 DocType: Salary Slip Deduction,Depends on Leave Without Pay,Залежить у відпустці без
@@ -1215,30 +1176,28 @@
 DocType: HR Settings,Employee Settings,Налаштування співробітників
 ,Batch-Wise Balance History,Пакетна Мудрий Баланс Історія
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +72,To Do List,Список справ
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +63,Apprentice,Учень
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Apprentice,Учень
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +99,Negative Quantity is not allowed,Негативний Кількість не допускається
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
 Used for Taxes and Charges",Податковий деталь стіл вуха від майстра пункт у вигляді рядка і зберігаються в цій галузі. Використовується з податків і зборів
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +61,Lancing,Розтин
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +151,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 +435,Accounting Entry for {0}: {1} can only be made in currency: {2},Облік Вхід для {0}: {1} можуть бути зроблені тільки у валюті: {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +436,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 +38,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 +112,Tax Rule for transactions.,Податковий Правило для угод.
 DocType: Rename Tool,Type of document to rename.,Тип документа перейменувати.
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +630,We buy this Item,Ми купуємо цей пункт
+apps/erpnext/erpnext/public/js/setup_wizard.js +366,We buy this Item,Ми купуємо цей пункт
 DocType: Address,Billing,Біллінг
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +77,Flanging,Загинання
 DocType: Bulk Email,Not Sent,Чи не Відправлено
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +73,Explosive forming,Вибухова формування
 DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),Всього Податки і збори (Компанія) Валюта
 DocType: Shipping Rule,Shipping Account,Доставка рахунки
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +43,Scheduled to send to {0} recipients,Планується відправити {0} одержувачів
 DocType: Quality Inspection,Readings,Показання
 DocType: Stock Entry,Total Additional Costs,Всього Додаткові витрати
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Sub Assemblies,Sub Асамблей
+apps/erpnext/erpnext/public/js/setup_wizard.js +359,Sub Assemblies,Sub Асамблей
 DocType: Shipping Rule Condition,To Value,Оцінювати
 DocType: Supplier,Stock Manager,Фото менеджер
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +143,Source warehouse is mandatory for row {0},Джерело склад є обов&#39;язковим для ряду {0}
@@ -1248,44 +1207,42 @@
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Імпорт вдалося!
 apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,Немає адреса ще не додавали.
 DocType: Workstation Working Hour,Workstation Working Hour,Робоча станція Робоча годину
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +83,Analyst,Аналітик
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +202,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Рядок {0}: виділеної суми {1} повинен бути менше або дорівнює кількості СП {2}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Analyst,Аналітик
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +149,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Рядок {0}: виділеної суми {1} повинен бути менше або дорівнює кількості СП {2}
 DocType: Item,Inventory,Інвентаризація
 DocType: Features Setup,"To enable ""Point of Sale"" view",Щоб включити &quot;Точка зору&quot; Продаж
 apps/erpnext/erpnext/public/js/pos/pos.js +402,Payment cannot be made for empty cart,Оплата не може бути зроблено для порожньої кошик
 DocType: Item,Sales Details,Продажі Детальніше
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +149,Pinning,Закріплення
 DocType: Opportunity,With Items,З пунктами
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,У К
 DocType: Notification Control,Expense Claim Rejected,Витрати Заявити Відхилено
 DocType: Sales Invoice,"The date on which next invoice will be generated. It is generated on submit.
 ","Дата, на яку буде генеруватися наступний рахунок-фактура. Він створюється на форму."
 DocType: Item Attribute,Item Attribute,Пункт Атрибут
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +105,Government,Уряд
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Government,Уряд
 apps/erpnext/erpnext/config/stock.py +268,Item Variants,Предмет Варіанти
 DocType: Company,Services,Послуги
 apps/erpnext/erpnext/accounts/report/financial_statements.py +147,Total ({0}),Всього ({0})
 DocType: Cost Center,Parent Cost Center,Батько Центр Вартість
 DocType: Sales Invoice,Source,Джерело
 DocType: Leave Type,Is Leave Without Pay,Є відпустці без
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +186,No records found in the Payment table,Записи не знайдені в таблиці Оплата
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +405,Financial Year Start Date,Фінансовий рік Дата початку
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +133,No records found in the Payment table,Записи не знайдені в таблиці Оплата
+apps/erpnext/erpnext/public/js/setup_wizard.js +153,Financial Year Start Date,Фінансовий рік Дата початку
 DocType: Employee External Work History,Total Experience,Загальний досвід
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +100,Countersinking,Зенкування
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +271,Packing Slip(s) cancelled,Упаковка ковзання (и) скасовується
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +276,Packing Slip(s) cancelled,Упаковка ковзання (и) скасовується
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,Вантажні та експедиторські Збори
 DocType: Material Request Item,Sales Order No,Продажі Замовити Немає
 DocType: Item Group,Item Group Name,Назва товару Група
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +50,Taken,Взятий
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,Взятий
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +66,Transfer Materials for Manufacture,Передача матеріалів для виробництва
 DocType: Pricing Rule,For Price List,Для Прайс-лист
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +27,Executive Search,Executive Search
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,Executive Search
 apps/erpnext/erpnext/stock/stock_ledger.py +405,"Purchase rate for item: {0} not found, which is required to book accounting entry (expense). Please mention item price against a buying price list.","Курс покупки по пункту: {0} не знайдений, який необхідний для ведення бухгалтерського обліку запис (рахунок). Будь ласка, вкажіть ціна товару проти цінової покупка списку."
 DocType: Maintenance Schedule,Schedules,Розклади
 DocType: Purchase Invoice Item,Net Amount,Чиста сума
 DocType: Purchase Order Item Supplied,BOM Detail No,Специфікація Деталь Немає
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),Додаткова знижка Сума (валюта компанії)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +537,Error: {0} > {1},Помилка: {0}&gt; {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +541,Error: {0} > {1},Помилка: {0}&gt; {1}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,"Будь ласка, створіть новий обліковий запис з Планом рахунків бухгалтерського обліку."
 DocType: Maintenance Visit,Maintenance Visit,Обслуговування відвідування
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer > Customer Group > Territory,Замовник&gt; Група клієнтів&gt; Територія
@@ -1296,7 +1253,6 @@
 DocType: Event,Tuesday,Вівторок
 DocType: Leave Block List,Block Holidays on important days.,Блок Відпочинок на важливих днів.
 ,Accounts Receivable Summary,Дебіторська заборгованість Основна
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +43,Leaves for type {0} already allocated for Employee {1} for period {2} - {3},"Листя для типу {0}, вже виділених на працівника {1} для періоду {2} - {3}"
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +187,Please set User ID field in an Employee record to set Employee Role,"Будь ласка, встановіть ID користувача поле в записі Employee, щоб встановити роль Employee"
 DocType: UOM,UOM Name,Ім&#39;я Одиниця виміру
 DocType: Top Bar Item,Target,Мета
@@ -1308,15 +1264,14 @@
 DocType: ToDo,Due Date,Термін оплати
 DocType: Sales Invoice Item,Brand Name,Бренд
 DocType: Purchase Receipt,Transporter Details,Transporter Деталі
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Box,Коробка
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +389,The Organization,Організація
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Box,Коробка
+apps/erpnext/erpnext/public/js/setup_wizard.js +137,The Organization,Організація
 DocType: Monthly Distribution,Monthly Distribution,Щомісячний поширення
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,"Приймач Список порожній. Будь ласка, створіть список приймач"
 DocType: Production Plan Sales Order,Production Plan Sales Order,Виробничий план з продажу Замовити
 DocType: Sales Partner,Sales Partner Target,Sales Partner Цільова
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},Облік Вхід для {0} можуть бути зроблені тільки у валюті: {1}
 DocType: Pricing Rule,Pricing Rule,Ціни Правило
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +58,Notching,Насічка
 apps/erpnext/erpnext/config/learn.py +167,Material Request to Purchase Order,Матеріал Запит Замовлення на
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +74,Row # {0}: Returned Item {1} does not exists in {2} {3},Ряд # {0}: повернутий деталь {1} не існує в {2} {3}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,Банківські рахунки
@@ -1333,20 +1288,19 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Amounts not reflected in bank,Суми не відбивається у банку
 DocType: Quality Inspection Reading,Reading 4,Читання 4
 apps/erpnext/erpnext/config/hr.py +23,Claims for company expense.,Претензії рахунок компанії.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +8,Centrifugal casting,Відцентрове лиття
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +119,Magnetic field-assisted finishing,Магнітне поле за сприяння обробка
 DocType: Company,Default Holiday List,За замовчуванням Список свят
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +165,Stock Liabilities,Сток зобов&#39;язання
 DocType: Purchase Receipt,Supplier Warehouse,Постачальник Склад
 DocType: Opportunity,Contact Mobile No,Зв&#39;язатися з мобільних Немає
 DocType: Production Planning Tool,Select Sales Orders,Виберіть замовлень клієнта
 ,Material Requests for which Supplier Quotations are not created,"Матеріал запити, для яких Постачальник Котирування не створюються"
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +117,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,"Наступного дня (с), на якій ви подаєте заяву на відпустку свята. Вам не потрібно звернутися за дозволом."
 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/buying/doctype/purchase_order/purchase_order.js +477,Mark as Delivered,Відзначити як при поставці
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +497,Mark as Delivered,Відзначити як при поставці
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +34,Make Quotation,Зробіть цитати
 DocType: Dependent Task,Dependent Task,Залежить Завдання
-apps/erpnext/erpnext/stock/doctype/item/item.py +306,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 +141,Leave of type {0} cannot be longer than {1},"Залишити типу {0} не може бути більше, ніж {1}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +310,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 +155,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,Приймач Список
@@ -1354,15 +1308,14 @@
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Споживана Сума
 apps/erpnext/erpnext/public/js/pos/pos.js +491,{0} View,Перегляд {0}
 DocType: Salary Structure Deduction,Salary Structure Deduction,Зарплата Структура Відрахування
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +158,Selective laser sintering,Селективний лазерного спікання
-apps/erpnext/erpnext/stock/doctype/item/item.py +301,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Одиниця виміру {0} був введений більш ніж один раз в таблицю перетворення фактора
+apps/erpnext/erpnext/stock/doctype/item/item.py +305,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Одиниця виміру {0} був введений більш ніж один раз в таблицю перетворення фактора
 apps/frappe/frappe/core/page/data_import_tool/data_import_tool.js +108,Import Successful!,Імпорт успішно!
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Вартість виданих предметів
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +185,Quantity must not be more than {0},"Кількість не повинна бути більше, ніж {0}"
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +41,Age (Days),Вік (днів)
 DocType: Quotation Item,Quotation Item,Цитата товару
 DocType: Account,Account Name,Ім&#39;я рахунку
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +41,From Date cannot be greater than To Date,"Від Дата не може бути більше, ніж до дати"
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +34,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.,Постачальник Тип майстром.
 DocType: Purchase Order Item,Supplier Part Number,Постачальник Номер деталі
@@ -1371,14 +1324,14 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +247,{0} {1} is cancelled or stopped,{0} {1} ануляції або зупинився
 DocType: Accounts Settings,Credit Controller,Кредитна контролер
 DocType: Delivery Note,Vehicle Dispatch Date,Відправка транспортного засобу Дата
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +197,Purchase Receipt {0} is not submitted,Купівля Отримання {0} не представлено
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +198,Purchase Receipt {0} is not submitted,Купівля Отримання {0} не представлено
 DocType: Company,Default Payable Account,За замовчуванням оплачується аккаунт
 apps/erpnext/erpnext/config/website.py +13,"Settings for online shopping cart such as shipping rules, price list etc.","Налаштування для онлайн Корзину, такі як правилами перевезень, прайс-лист і т.д."
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +660,Setup Complete,Завершення установки
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +124,Setup Complete,Завершення установки
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +65,{0}% Billed,{0}% Оголошений
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +17,Reserved Qty,Кількість захищені
 DocType: Party Account,Party Account,Рахунок партії
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +74,Human Resources,Людські ресурси
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +74,Human Resources,Людські ресурси
 DocType: Lead,Upper Income,Верхня прибуток
 DocType: Journal Entry Account,Debit in Company Currency,Дебет у валюті компанії
 apps/erpnext/erpnext/support/doctype/issue/issue.py +58,My Issues,Мої запитання
@@ -1387,11 +1340,9 @@
 DocType: Company,Default Values,Значення за замовчуванням
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +236,Row {0}: Payment amount can not be negative,Ряд {0}: Сума платежу не може бути негативним
 DocType: Expense Claim,Total Amount Reimbursed,Загальна сума відшкодовуються
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +152,Press fitting,Прес-фітинг
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +64,Against Supplier Invoice {0} dated {1},На Постачальником рахунку-фактури {0} від {1}
 DocType: Customer,Default Price List,За замовчуванням Ціни
 DocType: Payment Reconciliation,Payments,Платежі
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +24,Hot isostatic pressing,Гаряча ізостатичного пресування
 DocType: ToDo,Medium,Середній
 DocType: Budget Detail,Budget Allocated,Бюджету виділено
 DocType: Journal Entry,Entry Type,Тип запису
@@ -1404,9 +1355,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +56,None of the items have any change in quantity or value.,Жоден з пунктів не мають яких-небудь змін в кількості або вартості.
 DocType: Warranty Claim,Warranty Claim,Претензія по гарантії
 ,Lead Details,Провідні Детальніше
-DocType: Authorization Rule,Approving User,Користувач затвердження
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +37,Forging,Кування
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +126,Plating,Обшивка
 DocType: Purchase Invoice,End date of current invoice's period,Дата закінчення періоду поточного рахунку-фактури в
 DocType: Pricing Rule,Applicable For,Стосується для
 DocType: Bank Reconciliation,From Date,З дати
@@ -1428,31 +1376,29 @@
 DocType: Sales Invoice,Paid Amount (Company Currency),Платні Сума (Компанія валют)
 DocType: Purchase Invoice,Additional Discount,Додаткова знижка
 DocType: Selling Settings,Selling Settings,Продаж Налаштування
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +39,Online Auctions,Інтернет Аукціони
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,Інтернет Аукціони
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +94,Please specify either Quantity or Valuation Rate or both,"Будь ласка, сформулюйте або кількість чи оцінка, експертиза Оцінити або обидва"
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +50,"Company, Month and Fiscal Year is mandatory","Компанія, місяць і фінансовий рік є обов&#39;язковим"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Marketing Expenses,Маркетингові витрати
 ,Item Shortage Report,Пункт Брак Повідомити
-apps/erpnext/erpnext/stock/doctype/item/item.js +183,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Вага згадується, \ nБудь ласка, кажучи &quot;Вага Одиниця виміру&quot; занадто"
+apps/erpnext/erpnext/stock/doctype/item/item.js +185,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Вага згадується, \ nБудь ласка, кажучи &quot;Вага Одиниця виміру&quot; занадто"
 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 +212,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 +384,Warehouse required at Row No {0},Склад требуется в рядку Немає {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +386,Warehouse required at Row No {0},Склад требуется в рядку Немає {0}
 DocType: Employee,Date Of Retirement,Дата вибуття
 DocType: Upload Attendance,Get Template,Отримати шаблон
 DocType: Address,Postal,Поштовий
 DocType: Item,Weightage,Weightage
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +159,Mining,Видобуток
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +17,Resin casting,Смола лиття
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"А Група клієнтів існує з таким же ім&#39;ям, будь ласка, змініть ім&#39;я клієнта або перейменувати групу клієнтів"
 apps/erpnext/erpnext/public/js/pos/pos.js +147,Please select {0} first.,"Будь ласка, виберіть {0} перший."
 apps/erpnext/erpnext/templates/pages/order.html +57,text {0},Текст {0}
 DocType: Territory,Parent Territory,Батько Територія
 DocType: Quality Inspection Reading,Reading 2,Читання 2
 DocType: Stock Entry,Material Receipt,Матеріал Надходження
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +622,Products,Продукти
+apps/erpnext/erpnext/public/js/setup_wizard.js +358,Products,Продукти
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +47,Party Type and Party is required for Receivable / Payable account {0},Партія Тип і партія необхідна для / дебіторська заборгованість рахунок {0}
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.","Якщо цей пункт має варіанти, то вона не може бути обраний в замовленнях і т.д."
 DocType: Lead,Next Contact By,Наступна Контактні За
@@ -1462,13 +1408,13 @@
 DocType: Purchase Invoice,Notification Email Address,Повідомлення E-mail адреса
 DocType: Payment Tool,Find Invoices to Match,"Знайти фактури, щоб відповідати"
 ,Item-wise Sales Register,Пункт мудрий Продажі Реєстрація
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +399,"e.g. ""XYZ National Bank""","наприклад, &quot;XYZ Національний банк&quot;"
+apps/erpnext/erpnext/public/js/setup_wizard.js +147,"e.g. ""XYZ National Bank""","наприклад, &quot;XYZ Національний банк&quot;"
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,Це податок Включено в базовій ставці?
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +57,Total Target,Всього Цільовий
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Target,Всього Цільовий
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.js +22,Shopping Cart is enabled,Кошик включена
 DocType: Job Applicant,Applicant for a Job,Претендент на роботу
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +173,No Production Orders created,"Немає Виробничі замовлення, створені"
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +131,Salary Slip of employee {0} already created for this month,Зарплата ковзання працівника {0} вже створена за цей місяць
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +140,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.,Забагато стовбців. Експорт звіту і роздрукувати його за допомогою програми електронної таблиці.
 DocType: Sales Invoice Item,Batch No,Пакетна Немає
@@ -1478,14 +1424,14 @@
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +13,Variant,Варіант
 apps/frappe/frappe/public/js/frappe/form/toolbar.js +165,New {0},Новий {0}
 DocType: Naming Series,Set prefix for numbering series on your transactions,Встановіть префікс нумерації серії на ваших угод
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +169,Stopped order cannot be cancelled. Unstop to cancel.,"Зупинився замовлення не може бути скасований. Відкорковувати, щоб скасувати."
-apps/erpnext/erpnext/stock/doctype/item/item.py +323,Default BOM ({0}) must be active for this item or its template,За замовчуванням BOM ({0}) повинен бути активним для даного елемента або в шаблоні
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +164,Stopped order cannot be cancelled. Unstop to cancel.,"Зупинився замовлення не може бути скасований. Відкорковувати, щоб скасувати."
+apps/erpnext/erpnext/stock/doctype/item/item.py +327,Default BOM ({0}) must be active for this item or its template,За замовчуванням BOM ({0}) повинен бути активним для даного елемента або в шаблоні
 DocType: Employee,Leave Encashed?,Залишити інкасовано?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Можливість поле Від обов&#39;язкове
 DocType: Item,Variants,Варіанти
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +458,Make Purchase Order,Зробити замовлення на
 DocType: SMS Center,Send To,Відправити
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +111,There is not enough leave balance for Leave Type {0},Існує не вистачає відпустку баланс Залиште Тип {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +127,There is not enough leave balance for Leave Type {0},Існує не вистачає відпустку баланс Залиште Тип {0}
 DocType: Sales Team,Contribution to Net Total,Внесок у Net Total
 DocType: Sales Invoice Item,Customer's Item Code,Клієнтам Код товара
 DocType: Stock Reconciliation,Stock Reconciliation,Фото Примирення
@@ -1522,11 +1468,11 @@
 DocType: Sales Order Item,Actual Qty,Фактична Кількість
 DocType: Sales Invoice Item,References,Посилання
 DocType: Quality Inspection Reading,Reading 10,Читання 10
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +612,"List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start.","Перелічіть ваші продукти або послуги, які ви купуєте або продаєте. Переконайтеся, що для перевірки предмета Group, Одиниця виміру та інших властивостей, коли ви починаєте."
+apps/erpnext/erpnext/public/js/setup_wizard.js +348,"List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start.","Перелічіть ваші продукти або послуги, які ви купуєте або продаєте. Переконайтеся, що для перевірки предмета Group, Одиниця виміру та інших властивостей, коли ви починаєте."
 DocType: Hub Settings,Hub Node,Вузол концентратор
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,"Ви ввели повторювані елементи. Ласка, виправити і спробувати ще раз."
 apps/erpnext/erpnext/controllers/item_variant.py +65,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values,Значення {0} для атрибуту {1} ​​не існує в списку дійсного значення Пункт Атрибут
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +87,Associate,Асоціювати
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Associate,Асоціювати
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +46,Item {0} is not a serialized Item,Пункт {0} серіалізовані товару
 DocType: SMS Center,Create Receiver List,Створити приймач список
 apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +5,Expired,Закінчився
@@ -1535,7 +1481,7 @@
 DocType: Warranty Claim,Issue Date,Дата випуску
 DocType: Activity Cost,Activity Cost,Вартість активність
 DocType: Purchase Receipt Item Supplied,Consumed Qty,Споживана Кількість
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +52,Telecommunications,Телекомунікаційних
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +52,Telecommunications,Телекомунікаційних
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),"Вказує, що пакет є частиною цієї поставки (тільки проекту)"
 DocType: Payment Tool,Make Payment Entry,Зробити запис оплати
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +119,Quantity for Item {0} must be less than {1},"Кількість для пункту {0} має бути менше, ніж {1}"
@@ -1552,10 +1498,8 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +37,"Selling must be checked, if Applicable For is selected as {0}","Продаж повинні бути перевірені, якщо вибраний Стосується для в {0}"
 DocType: Purchase Order Item,Supplier Quotation Item,Постачальник цитати товару
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +27,Make Salary Structure,Зробити зарплата структури
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +54,Shearing,Ножиці
 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.,"Натисніть на кнопку &quot;Створити рахунок-фактуру&quot; з продажу, щоб створити новий рахунок-фактуру."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +166,Packaging and labeling,Упаковка та маркування
 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,"Будь ласка, сформулюйте замовчуванням Валюта в компанії Майстер і загальні налаштування за замовчуванням"
@@ -1566,19 +1510,18 @@
 DocType: Budget Detail,Fiscal Year,Звітний рік
 DocType: Cost Center,Budget,Бюджет
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +41,"Budget cannot be assigned against {0}, as it's not an Income or Expense account","Бюджет не може бути призначений на {0}, так як це не доход або витрата рахунки"
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Achieved,Досягнутий
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,Досягнутий
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +65,Territory / Customer,Територія / клієнтів
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,e.g. 5,"наприклад, 5"
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +207,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},Ряд {0}: Виділена сума {1} повинен бути менше або дорівнює виставити суму заборгованості {2}
+apps/erpnext/erpnext/public/js/setup_wizard.js +294,e.g. 5,"наприклад, 5"
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},Ряд {0}: Виділена сума {1} повинен бути менше або дорівнює виставити суму заборгованості {2}
 DocType: Sales Invoice,In Words will be visible once you save the Sales Invoice.,"За словами будуть видні, як тільки ви збережете рахунок-фактуру."
 DocType: Item,Is Sales Item,Є продаж товару
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,Пункт Група Дерево
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,Пункт {0} не налаштований на послідовний пп. Перевірити майстра предмета
 DocType: Maintenance Visit,Maintenance Time,Технічне обслуговування Час
 ,Amount to Deliver,Сума Поставте
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +620,A Product or Service,Продукт або послуга
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +158,There were errors.,Були помилки.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +101,Tapping,Натискання
+apps/erpnext/erpnext/public/js/setup_wizard.js +356,A Product or Service,Продукт або послуга
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +146,There were errors.,Були помилки.
 DocType: Naming Series,Current Value,Поточна вартість
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +171,{0} created,{0} створена
 DocType: Delivery Note Item,Against Sales Order,На замовлення клієнта
@@ -1592,7 +1535,7 @@
 apps/erpnext/erpnext/accounts/party.py +275,Due Date cannot be before Posting Date,"Завдяки Дата не може бути, перш ніж відправляти Реєстрація"
 DocType: Website Item Group,Website Item Group,Сайт групи товарів
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Duties and Taxes,Мита і податки
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Please enter Reference date,"Будь ласка, введіть дату Reference"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +312,Please enter Reference date,"Будь ласка, введіть дату Reference"
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} записів оплати не можуть бути відфільтровані по {1}
 DocType: Item Website Specification,Table for Item that will be shown in Web Site,"Таблиця для елемента, який буде показаний в веб-сайт"
 DocType: Purchase Order Item Supplied,Supplied Qty,Поставляється Кількість
@@ -1600,7 +1543,7 @@
 apps/erpnext/erpnext/config/stock.py +103,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,Пункт мудрий Історія покупок
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +152,Red,Червоний
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Red,Червоний
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +228,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},"Будь ласка, натисніть на кнопку &quot;Generate&quot; Розклад принести Серійний номер доданий для Пункт {0}"
 DocType: Account,Frozen,Заморожені
 ,Open Production Orders,Відкриті Виробничі замовлення
@@ -1615,7 +1558,7 @@
 DocType: Item Attribute,Attribute Name,Ім&#39;я атрибута
 apps/erpnext/erpnext/controllers/selling_controller.py +236,Item {0} must be Sales or Service Item in {1},Пункт {0} повинен бути Продажі або в пункті СЕРВІС {1}
 DocType: Item Group,Show In Website,Показати на веб-сайті
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +621,Group,Група
+apps/erpnext/erpnext/public/js/setup_wizard.js +357,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","Для відстеження бренд в наступні документи накладної, рідкісна можливість, матеріал запит, Пункт, замовлення, покупка ваучера, Покупець отриманні, цитати, накладна, товарів Bundle, Продажі замовлення, Серійний номер"
@@ -1625,6 +1568,7 @@
 DocType: Features Setup,Brands,Бренди
 DocType: C-Form Invoice Detail,Invoice No,Рахунок Немає
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +480,From Purchase Order,Від Замовлення
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +92,"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,Відставка Лист Дата
@@ -1632,35 +1576,31 @@
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +137,Not Set,Не вказаний
 DocType: Communication,Date,Дата
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,Повторіть Виручка клієнтів
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +651,Sit tight while your system is being setup. This may take a few moments.,"Сиди, поки система є установка. Це може зайняти кілька хвилин."
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +115,Sit tight while your system is being setup. This may take a few moments.,"Сиди, поки система є установка. Це може зайняти кілька хвилин."
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +51,{0} ({1}) must have role 'Expense Approver',{0} ({1}) повинен мати роль &quot;Expense який стверджує&quot;
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Pair,Пара
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Pair,Пара
 DocType: Bank Reconciliation Detail,Against Account,Проти Рахунок
 DocType: Maintenance Schedule Detail,Actual Date,Фактична дата
 DocType: Item,Has Batch No,Має Пакетне Немає
 DocType: Delivery Note,Excise Page Number,Акцизний Номер сторінки
 DocType: Employee,Personal Details,Особиста інформація
 ,Maintenance Schedules,Режими технічного обслуговування
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +44,Embossing,Вибивати
 ,Quotation Trends,Котирування Тенденції
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +139,Item Group not mentioned in item master for item {0},Пункт Група не згадується у майстри пункт за пунктом {0}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +302,Debit To account must be a Receivable account,Дебетом рахунка повинні бути заборгованість рахунок
-apps/erpnext/erpnext/stock/doctype/item/item.py +310,"As Production Order can be made for this item, it must be a stock item.","Як виробничого замовлення можуть бути зроблені за цією статтею, він повинен бути запас пункт."
 DocType: Shipping Rule Condition,Shipping Amount,Доставка Сума
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +140,Joining,Приєднання
-DocType: Authorization Rule,Above Value,Вище вартості
 ,Pending Amount,До Сума
 DocType: Purchase Invoice Item,Conversion Factor,Коефіцієнт перетворення
 DocType: Purchase Order,Delivered,Поставляється
 apps/erpnext/erpnext/config/hr.py +160,Setup incoming server for jobs email id. (e.g. jobs@example.com),"Налаштування сервера вхідної в робочі електронний ідентифікатор. (наприклад, jobs@example.com)"
 DocType: Purchase Receipt,Vehicle Number,Кількість транспортних засобів
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,"Дата, на яку повторюваних рахунок буде зупинити"
+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,Дебіторська заборгованість
 ,Supplier-Wise Sales Analytics,Постачальник-Мудрі продажів Аналітика
 DocType: Address Template,This format is used if country specific format is not found,"Цей формат використовується, якщо певний формат країна не знайдений"
 DocType: Custom Field,Custom,Звичай
 DocType: Production Order,Use Multi-Level BOM,Використовувати багаторівневе специфікації
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +26,Injection molding,Лиття під тиском
 DocType: Bank Reconciliation,Include Reconciled Entries,Включити примиритися Записи
 apps/erpnext/erpnext/config/accounts.py +41,Tree of finanial accounts.,Дерево finanial рахунків.
 DocType: Leave Control Panel,Leave blank if considered for all employee types,"Залиште порожнім, якщо розглядати для всіх типів працівників"
@@ -1670,30 +1610,28 @@
 apps/frappe/frappe/config/setup.py +130,Printing,Друк
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +114,Expense Claim is pending approval. Only the Expense Approver can update status.,Витрати Заявити очікує схвалення. Тільки за рахунок затверджує можете оновити статус.
 DocType: Purchase Invoice,Additional Discount Amount,Додаткова знижка Сума
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +99,The day(s) on which you are applying for leave are holiday. You need not apply for leave.,"Наступного дня (с), на якій ви подаєте заяву на відпустку в свято. Вам не потрібно звернутися за дозволом."
 apps/frappe/frappe/public/js/frappe/misc/utils.js +110,and,і
 DocType: Leave Block List Allow,Leave Block List Allow,Залишити Чорний список Дозволити
 apps/erpnext/erpnext/setup/doctype/company/company.py +236,Abbr can not be blank or space,Абревіатура не може бути порожнім або простір
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +50,Sports,Спортивний
+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/setup/page/setup_wizard/setup_wizard.js +626,Unit,Блок
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Unit,Блок
 apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.py +182,Please set Dropbox access keys in your site config,"Будь ласка, встановіть ключі доступу Dropbox на вашому сайті конфігурації"
 apps/erpnext/erpnext/stock/get_item_details.py +113,Please specify Company,"Будь ласка, сформулюйте компанії"
 ,Customer Acquisition and Loyalty,Придбання та лояльності клієнтів
 DocType: Purchase Receipt,Warehouse where you are maintaining stock of rejected items,"Склад, де ви підтримуєте акції відхилених елементів"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +408,Your financial year ends on,Ваш фінансовий рік закінчується
+apps/erpnext/erpnext/public/js/setup_wizard.js +156,Your financial year ends on,Ваш фінансовий рік закінчується
 DocType: POS Profile,Price List,Прейскурант
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +20,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,"{0} тепер за замовчуванням фінансовий рік. Будь ласка, поновіть ваш браузер для зміни вступили в силу."
 apps/erpnext/erpnext/projects/doctype/project/project.js +47,Expense Claims,Витратні Претензії
 DocType: Issue,Support,Підтримка
-DocType: Authorization Rule,Approving Role,Затвердження роль
 ,BOM Search,Специфікація Пошук
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +176,Closing (Opening + Totals),Закриття (відкриття + Итоги)
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +26,Please specify currency in Company,"Будь ласка, сформулюйте валюту в Компанії"
 DocType: Workstation,Wages per hour,Заробітна плата на годину
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,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/controllers/accounts_controller.py +236,Account {0} is invalid. Account Currency must be {1},Рахунок {0} є неприпустимим. Валюта рахунку повинні бути {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +237,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}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +53,Clearance date cannot be before check date in row {0},Дата просвіт не може бути до дати реєстрації в рядку {0}
 DocType: Salary Slip,Deduction,Відрахування
@@ -1712,13 +1650,13 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +82,Item {0} has already been returned,Пункт {0} вже повернулися
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** Фінансовий рік ** являє собою фінансовий рік. Всі бухгалтерські та інші великі угоди відслідковуються проти ** ** фінансовий рік.
 DocType: Opportunity,Customer / Lead Address,Замовник / Провідний Адреса
+apps/erpnext/erpnext/stock/doctype/item/item.py +112,Warning: Invalid SSL certificate on attachment {0},Увага: Невірний сертифікат SSL на прихильності {0}
 DocType: Production Order Operation,Actual Operation Time,Фактична Час роботи
 DocType: Authorization Rule,Applicable To (User),Застосовується до (Користувач)
 DocType: Purchase Taxes and Charges,Deduct,Відняти
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +170,Job Description,Описання роботи
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +170,Job Description,Описання роботи
 DocType: Purchase Order Item,Qty as per Stock UOM,Кількість у відповідності зі UOM
 apps/frappe/frappe/model/rename_doc.py +343,Please select a valid csv file with data,"Будь ласка, виберіть правильний файл CSV з даними"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +92,Coating,Покриття
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +126,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Спеціальні символи, крім &quot;-&quot; &quot;.&quot;, &quot;#&quot;, і &quot;/&quot; не допускається в серію імен"
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Слідкуйте продажів кампаній. Слідкуйте за проводами, цитати, Продажі замовлення і т.д. з кампаній, щоб оцінити повернення інвестицій."
 DocType: Expense Claim,Approver,Затверджуючий
@@ -1728,12 +1666,11 @@
 DocType: Supplier Quotation,Manufacturing Manager,Виробництво менеджер
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +191,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/hooks.py +84,Shipments,Поставки
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +29,Dip molding,Пориньте лиття
+apps/erpnext/erpnext/hooks.py +68,Shipments,Поставки
 DocType: Purchase Order,To be delivered to customer,Для поставлятися замовнику
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,Час Статус журналу повинні бути представлені.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,Серійний номер {0} не належить ні до однієї Склад
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +650,Setting Up,Налаштування
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +114,Setting Up,Налаштування
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,Row # ,Ряд #
 DocType: Purchase Invoice,In Words (Company Currency),У Слів (Компанія валют)
 DocType: Pricing Rule,Supplier,Постачальник
@@ -1741,7 +1678,7 @@
 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 +166,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,"Витрати або рахунок різниці є обов&#39;язковим для п {0}, як це впливає на вартість акцій в цілому"
-apps/erpnext/erpnext/controllers/accounts_controller.py +354,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","Не можете overbill для Пункт {0} в рядку {1} ​​більш {2}. Щоб overbilling, будь ласка, встановіть в налаштуваннях зображення"
+apps/erpnext/erpnext/controllers/accounts_controller.py +355,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","Не можете overbill для Пункт {0} в рядку {1} ​​більш {2}. Щоб overbilling, будь ласка, встановіть в налаштуваннях зображення"
 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 +135,User {0} is disabled,Користувач {0} відключена
@@ -1754,27 +1691,26 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,{0} is mandatory for Item {1},{0} є обов&#39;язковим для пп {1}
 DocType: Currency Exchange,From Currency,Від Валюта
 DocType: DocField,Name,Ім&#39;я
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +211,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Будь ласка, виберіть Виділена сума, рахунок-фактура Тип і номер рахунку-фактури в принаймні один ряд"
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +104,Sales Order required for Item {0},Продажі Замовити потрібно для пункту {0}
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +158,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Будь ласка, виберіть Виділена сума, рахунок-фактура Тип і номер рахунку-фактури в принаймні один ряд"
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +107,Sales Order required for Item {0},Продажі Замовити потрібно для пункту {0}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +43,Amounts not reflected in system,Суми не відображається в системі
 DocType: Purchase Invoice Item,Rate (Company Currency),Оцінити (Компанія валют)
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +40,Others,Інші
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +40,Others,Інші
 apps/erpnext/erpnext/templates/includes/product_page.js +80,Cannot find a matching Item. Please select some other value for {0}.,"Не можете знайти відповідний пункт. Будь ласка, виберіть інше значення для {0}."
 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,"Не можете обрати тип заряду, як «Про Попередня Сума Row» або «На попередньому рядку Total &#39;для першого рядка"
 apps/frappe/frappe/core/doctype/doctype/boilerplate/controller_list.html +31,Completed,Завершений
 DocType: Web Form,Select DocType,Виберіть DocType
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +104,Broaching,Протяжні
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +12,Banking,Банківські
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,Банківські
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +38,Please click on 'Generate Schedule' to get schedule,"Будь ласка, натисніть на кнопку &quot;Generate&quot; Розклад, щоб отримати розклад"
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +283,New Cost Center,Новий Центр Вартість
 DocType: Bin,Ordered Quantity,Замовлену кількість
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +397,"e.g. ""Build tools for builders""","наприклад, &quot;Створення інструментів для будівельників&quot;"
+apps/erpnext/erpnext/public/js/setup_wizard.js +145,"e.g. ""Build tools for builders""","наприклад, &quot;Створення інструментів для будівельників&quot;"
 DocType: Quality Inspection,In Process,В процесі
 DocType: Authorization Rule,Itemwise Discount,Itemwise Знижка
 DocType: Purchase Order Item,Reference Document Type,Посилання Тип документа
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +318,{0} against Sales Order {1},{0} проти замовлення клієнта {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +320,{0} against Sales Order {1},{0} проти замовлення клієнта {1}
 DocType: Account,Fixed Asset,Основних засобів
 apps/erpnext/erpnext/config/stock.py +283,Serialized Inventory,Серійний Інвентар
 DocType: Activity Type,Default Billing Rate,За замовчуванням Платіжна Оцінити
@@ -1789,14 +1725,13 @@
 DocType: Purchase Invoice Item,Page Break,Розрив сторінки
 DocType: Production Order Operation,Pending,До
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,"Користувачі, які можуть затвердити відпустки додатки конкретного працівника"
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +33,You cannot change default UOM of Variant. To change default UOM for Variant change default UOM of the Template,Ви не можете змінити за замовчуванням Одиниця виміру варіанта. Щоб змінити стандартну UOM для Variant зміна за замовчуванням Одиниця виміру шаблону
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +50,Office Equipments,Устаткування офісу
 DocType: Purchase Invoice Item,Qty,Кількість
 DocType: Fiscal Year,Companies,Компанії
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +24,Electronics,Електроніка
+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/support/doctype/maintenance_visit/maintenance_visit.js +18,From Maintenance Schedule,З графіком технічного обслуговування
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +56,Full-time,Повний день
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +56,Full-time,Повний день
 DocType: Purchase Invoice,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.","Якщо ви створили стандартний шаблон в продажах податки і збори шаблон, виберіть одну і натисніть на кнопку нижче."
@@ -1808,11 +1743,12 @@
 DocType: Job Applicant,Job Opening,Робота Відкриття
 DocType: Payment Reconciliation,Payment Reconciliation,Оплата Примирення
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +154,Please select Incharge Person's name,"Ласка, виберіть назву InCharge людини"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +51,Technology,Технологія
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,Технологія
 DocType: Offer Letter,Offer Letter,Лист-пропозиція
 apps/erpnext/erpnext/config/manufacturing.py +51,Generate Material Requests (MRP) and Production Orders.,Створення запитів матеріал (ППМ) і виробничі замовлення.
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +68,Total Invoiced Amt,Всього в рахунку-фактурі 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.","Щоб додати дочірні вузли, досліджувати дерево і натисніть на вузол, в який хочете додати більше вузлів."
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +102,Credit To account must be a Payable account,Кредит на рахунку повинен бути оплачується рахунок
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +233,BOM recursion: {0} cannot be parent or child of {2},Специфікація рекурсії: {0} не може бути батько або дитина {2}
@@ -1825,10 +1761,8 @@
 DocType: Item,Customer Item Codes,Замовник Предмет коди
 DocType: Opportunity,Lost Reason,Забули Причина
 apps/erpnext/erpnext/config/accounts.py +68,Create Payment Entries against Orders or Invoices.,Створити Записи оплати по замовленнях або рахунків-фактур.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +141,Welding,Зварювання
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +40,New Stock UOM is required,Новий зі Одиниця виміру потрібно
 DocType: Quality Inspection,Sample Size,Обсяг вибірки
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +443,All items have already been invoiced,Всі деталі вже виставлений
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +446,All items have already been invoiced,Всі деталі вже виставлений
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',"Будь ласка, вкажіть дійсний &quot;Від справі № &#39;"
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +287,Further cost centers can be made under Groups but entries can be made against non-Groups,"Подальші МВЗ можуть бути зроблені під угруповань, але дані можуть бути зроблені у відношенні не-груп"
 DocType: Project,External,Зовнішній
@@ -1840,8 +1774,7 @@
 DocType: Bin,Actual Quantity,Фактична кількість
 DocType: Shipping Rule,example: Next Day Shipping,приклад: на наступний день відправка
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,Серійний номер {0} знайдений
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +563,Your Customers,Ваші клієнти
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +27,Compression molding,Пресування
+apps/erpnext/erpnext/public/js/setup_wizard.js +303,Your Customers,Ваші клієнти
 DocType: Leave Block List Date,Block Date,Блок Дата
 DocType: Sales Order,Not Delivered,Чи не Поставляється
 ,Bank Clearance Summary,Банк оформлення Резюме
@@ -1862,10 +1795,10 @@
 DocType: SMS Log,Sent To,Відправлено
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +28,Make Sales Invoice,Зробити накладна
 DocType: Company,For Reference Only.,Для довідки тільки.
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +29,Invalid {0}: {1},Невірний {0}: {1}
+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,Планування потужностей
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +49,'From Date' is required,&quot;З дати&quot; потрібно
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +43,'From Date' is required,&quot;З дати&quot; потрібно
 DocType: Journal Entry,Reference Number,Номер для посилань
 DocType: Employee,Employment Details,Подробиці з працевлаштування
 DocType: Employee,New Workplace,Новий Робоче
@@ -1880,7 +1813,7 @@
 DocType: Serial No,Delivery Time,Час доставки
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,На підставі проблем старіння
 DocType: Item,End of Life,Кінець життя
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +41,Travel,Подорож
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +41,Travel,Подорож
 DocType: Leave Block List,Allow Users,Надання користувачам
 DocType: Purchase Order,Customer Mobile No,Замовник Мобільна Немає
 DocType: Sales Invoice,Recurring,Періодична
@@ -1894,7 +1827,7 @@
 DocType: Naming Series,User must always select,Користувач завжди повинен вибрати
 DocType: Stock Settings,Allow Negative Stock,Дозволити негативний складі
 DocType: Installation Note,Installation Note,Установка Примітка
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +541,Add Taxes,Додати Податки
+apps/erpnext/erpnext/public/js/setup_wizard.js +283,Add Taxes,Додати Податки
 ,Financial Analytics,Фінансова аналітика
 DocType: Quality Inspection,Verified By,Перевірено
 DocType: Address,Subsidiary,Дочірня компанія
@@ -1904,7 +1837,6 @@
 DocType: System Settings,In Hours,У годиннику
 DocType: Process Payroll,Create Salary Slip,Створити зарплата Сліп
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Expected balance as per bank,Очікуване сальдо за платіжними
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +115,Buffing,Полірування
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Source of Funds (Liabilities),Джерело фінансування (зобов&#39;язання)
 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,Співробітник
@@ -1921,11 +1853,11 @@
 DocType: Rename Tool,File to Rename,Файл Перейменувати
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +176,Purchse Order number required for Item {0},Purchse Номер замовлення необхідний для Пункт {0}
 apps/erpnext/erpnext/public/js/controllers/transaction.js +136,Show Payments,Показати платежі
-apps/erpnext/erpnext/controllers/buying_controller.py +245,Specified BOM {0} does not exist for Item {1},Зазначено специфікації {0} не існує для п {1}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +202,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Технічне обслуговування Розклад {0} має бути скасований до скасування цього замовлення клієнта
+apps/erpnext/erpnext/controllers/buying_controller.py +236,Specified BOM {0} does not exist for Item {1},Зазначено специфікації {0} не існує для п {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Технічне обслуговування Розклад {0} має бути скасований до скасування цього замовлення клієнта
 apps/frappe/frappe/desk/page/backups/backups.html +13,Size,Розмір
 DocType: Notification Control,Expense Claim Approved,Витрати Заявити Затверджено
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +113,Pharmaceutical,Фармацевтична
+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,Продажі Замовити Обов&#39;язкові
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +30,Create Customer,Створити клієнта
@@ -1935,7 +1867,6 @@
 DocType: Quality Inspection Reading,Reading 9,Читання 9
 DocType: Supplier,Is Frozen,Заморожене
 DocType: Buying Settings,Buying Settings,Налаштування Купівля
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +122,Mass finishing,Маса обробка
 DocType: Stock Entry Detail,BOM No. for a Finished Good Item,Специфікація Номер для готового виробу Пункт
 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),"Налаштування сервера вхідної у продажу електронний ідентифікатор. (наприклад, sales@example.com)"
@@ -1943,7 +1874,7 @@
 DocType: Payment Tool,Payment Account,Оплата рахунку
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +713,Please specify Company to proceed,"Будь ласка, сформулюйте компанії, щоб продовжити"
 apps/frappe/frappe/public/js/frappe/model/indicator.js +30,Draft,Проект
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +46,Compensatory Off,Компенсаційні Викл
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Compensatory Off,Компенсаційні Викл
 DocType: Quality Inspection Reading,Accepted,Прийняті
 DocType: User,Female,Жінка
 DocType: Journal Entry Account,Debit in Account Currency,Дебет у валюті рахунку
@@ -1955,7 +1886,7 @@
 DocType: Shipping Rule,Shipping Rule Label,Правило ярлику
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +209,Raw Materials cannot be blank.,Сировина не може бути порожнім.
 DocType: Newsletter,Test,Тест
-apps/erpnext/erpnext/stock/doctype/item/item.py +364,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +368,"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'","Як є існуючі біржові операції по цьому пункту, \ ви не можете змінити значення &#39;Має серійний номер &quot;,&quot; Має Batch Ні »,« Чи є зі Пункт &quot;і&quot; Оцінка Метод &quot;"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +448,Quick Journal Entry,Швидкий журнал запис
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +92,You can not change rate if BOM mentioned agianst any item,"Ви не можете змінити ставку, якщо специфікації згадується agianst будь-якого елементу"
@@ -1966,13 +1897,14 @@
 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.,Окрема виробничий замовлення буде створено для кожного готового виробу пункту.
 DocType: Purchase Invoice,Terms and Conditions1,Умови та условія1
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +18,Complete Setup,Завершення установки
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard_page.html +18,Complete Setup,Завершення установки
 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),"Перевірте це, щоб заборонити фракції. (для №)"
 apps/erpnext/erpnext/config/crm.py +96,Newsletter Mailing List,Розсилка розсилки
 DocType: Delivery Note,Transporter Name,Transporter Назва
+DocType: Authorization Rule,Authorized Value,Статутний Значення
 DocType: Contact,Enter department to which this Contact belongs,"Введіть відділ, до якого належить ця Зв&#39;язатися"
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Absent,Всього Відсутня
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +746,Item or Warehouse for row {0} does not match Material Request,Елемент або Склад ряду {0} не відповідає матеріалів Запит
@@ -1997,16 +1929,15 @@
 DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),Basic Rate (як у фондовій UOM)
 DocType: SMS Log,No of Requested SMS,Немає запитуваних SMS
 DocType: Campaign,Campaign-.####,Кампанія -. ####
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +55,Piercing,Пронизливий
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,Наступні кроки
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +117,Contract End Date must be greater than Date of Joining,"Договір Кінцева дата повинна бути більше, ніж дата вступу"
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,"Третя сторона дистриб&#39;ютор / дилер / комісіонер / Партнери /, який продає продукти компаній на комісію."
 DocType: Customer Group,Has Child Node,Має дочірній вузол
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{0} against Purchase Order {1},{0} проти Замовлення {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +332,{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, ім&#39;я користувача = ERPNext, пароль = один тисяча двісті тридцять чотири і т.д.)"
 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/page/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
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +110,Photochemical machining,Фотохімічні обробки
 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.
 
 #### Note
@@ -2032,7 +1963,7 @@
 DocType: Purchase Receipt Item,Recd Quantity,Кількість RECD
 DocType: Email Account,Email Ids,E-mail ідентифікатори
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},"Не можете виробляти більше Пункт {0}, ніж кількість продажів Замовити {1}"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +471,Stock Entry {0} is not submitted,Фото запис {0} не представлено
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +473,Stock Entry {0} is not submitted,Фото запис {0} не представлено
 DocType: Payment Reconciliation,Bank / Cash Account,Банк / грошовий рахунок
 DocType: Tax Rule,Billing City,Біллінг Місто
 DocType: Global Defaults,Hide Currency Symbol,Приховати символ валюти
@@ -2048,7 +1979,7 @@
 DocType: Purchase Invoice,Currency and Price List,Валюта і Ціни
 DocType: Opportunity,Customer / Lead Name,Замовник / Провідний Ім&#39;я
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +63,Clearance Date not mentioned,Зазор Дата не згадується
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +71,Production,Виробництво
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Production,Виробництво
 DocType: Item,Allow Production Order,Дозволити виробничого замовлення
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +60,Row {0}:Start Date must be before End Date,Ряд {0}: Дата початку повинна бути раніше дати закінчення
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Всього (Кількість)
@@ -2061,7 +1992,7 @@
 apps/erpnext/erpnext/utilities/doctype/address/address.py +113,My Addresses,Мої Адреси
 DocType: Stock Ledger Entry,Outgoing Rate,Вихідні Оцінити
 apps/erpnext/erpnext/config/hr.py +100,Organization branch master.,Організація філії господар.
-apps/erpnext/erpnext/controllers/accounts_controller.py +237, or ,або
+apps/erpnext/erpnext/controllers/accounts_controller.py +238, 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-Над
@@ -2088,6 +2019,7 @@
 DocType: Stock Entry Detail,Serial No / Batch,Серійний номер / партія
 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 +213,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',"Графік проведення технічного обслуговування не генерується для всіх елементів. Будь ласка, натисніть на кнопку &quot;Generate&quot; Розклад"
 ,To Produce,Виробляти
 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} у розмірі Item ряди також повинні бути включені {3}
@@ -2095,10 +2027,7 @@
 DocType: Bin,Reserved Quantity,Зарезервовано Кількість
 DocType: Landed Cost Voucher,Purchase Receipt Items,Купівля розписок товари
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,Налаштування форми
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +62,Cutting,Різка
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +69,Flattening,Сплощення
 DocType: Account,Income Account,Рахунок Доходи
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +22,Molding,Молдинг
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +632,Delivery,Доставка
 DocType: Stock Reconciliation Item,Current Qty,Поточний Кількість
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",Див &quot;Оцінити матеріалів на основі&quot; в розділі калькуляції
@@ -2108,19 +2037,18 @@
 apps/frappe/frappe/desk/moduleview.py +61,Documents,Документи
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +17,Ref,Посилання
 DocType: Cost Center,Cost Center,Центр витрат
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.js +48,Voucher #,Ваучер #
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +36,Voucher #,Ваучер #
 DocType: Notification Control,Purchase Order Message,Замовлення на повідомлення
 DocType: Tax Rule,Shipping Country,Доставка Країна
 DocType: Upload Attendance,Upload HTML,Завантажити HTML-
-apps/erpnext/erpnext/controllers/accounts_controller.py +391,"Total advance ({0}) against Order {1} cannot be greater \
+apps/erpnext/erpnext/controllers/accounts_controller.py +392,"Total advance ({0}) against Order {1} cannot be greater \
 				than the Grand Total ({2})","Всього аванс ({0}) проти ордена {1} не може бути більше \, ніж загальний підсумок ({2})"
 DocType: Employee,Relieving Date,Звільнення Дата
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +12,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.",Ціни правила робиться для перезапису Прайс-лист / визначити відсоток дисконтування на основі деяких критеріїв.
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,Склад може бути змінений тільки через фондовій входу / накладної / Купівля Надходження
 DocType: Employee Education,Class / Percentage,Клас / у відсотках
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +92,Head of Marketing and Sales,Начальник відділу маркетингу та продажів
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +31,Income Tax,Податок на прибуток
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +157,Laser engineered net shaping,Лазерна інженерії чистий формування
+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.","Якщо обрано Ціни Правило зроблено для &quot;ціна&quot;, це буде перезаписувати Прайс-лист. Ціни Правило ціна остаточна ціна, так що далі знижка не повинні застосовуватися. Отже, у таких угодах, як замовлення клієнта, замовлення і т.д., це буде вибрано в полі &#39;Rate&#39;, а не &#39;поле прайс-лист Rate&#39;."
 apps/erpnext/erpnext/config/selling.py +163,Track Leads by Industry Type.,Трек веде по промисловості Type.
 DocType: Item Supplier,Item Supplier,Пункт Постачальник
@@ -2143,31 +2071,28 @@
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Фактична Кількість Угоди Після
 ,Pending SO Items For Purchase Request,В очікуванні SO предмети для покупки запит
 DocType: Supplier,Billing Currency,Платіжна валют
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +148,Extra Large,Дуже великий
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,Extra Large,Дуже великий
 ,Profit and Loss Statement,Рахунок прибутків і збитків
 DocType: Bank Reconciliation Detail,Cheque Number,Чек Кількість
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +43,Pressing,Пресування
 DocType: Payment Tool Detail,Payment Tool Detail,"Подробиці платіжний інструмент,"
 ,Sales Browser,Браузер з продажу
 DocType: Journal Entry,Total Credit,Всього Кредитна
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +474,Warning: Another {0} # {1} exists against stock entry {2},Увага: Ще {0} # {1} існує проти вступу фондовій {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +459,Local,Місцевий
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +476,Warning: Another {0} # {1} exists against stock entry {2},Увага: Ще {0} # {1} існує проти вступу фондовій {2}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +397,Local,Місцевий
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),Кредити та аванси (активів)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,Боржники
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +147,Large,Великий
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +23,No employee found!,Жоден працівник не знайдено!
+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 +152,Please mention no of visits required,"Не кажучи вже про НЕ ласка відвідувань, необхідних"
 DocType: Purchase Order,Customer Address Display,Замовник Адреса Показати
 DocType: Stock Settings,Default Valuation Method,Оцінка за замовчуванням метод
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +127,Polishing,Полірування
 DocType: Production Order Operation,Planned Start Time,Плановані Час
 apps/erpnext/erpnext/config/accounts.py +63,Close Balance Sheet and book Profit or Loss.,Закрити Баланс і книга Прибуток або збиток.
-apps/erpnext/erpnext/stock/doctype/item/item.py +661,"Default Unit of Measure for Item {0} cannot be changed directly because \
+apps/erpnext/erpnext/stock/doctype/item/item.py +665,"Default Unit of Measure for Item {0} cannot be changed directly because \
 			you have already made some transaction(s) with another UOM. To change default UOM, \
 			use 'UOM Replace Utility' tool under Stock module.","За замовчуванням Одиниця виміру для п {0} не може бути змінений безпосередньо, тому що \ ви вже зробили деякі угоди (угод) з іншим UOM. Щоб змінити стандартну UOM, \ використання &quot;Одиниця виміру Замінити Utility &#39;інструмент під фондовій модуля."
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,Вкажіть обмінний курс для перетворення однієї валюти в іншу
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +146,Quotation {0} is cancelled,Цитата {0} скасовується
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +141,Quotation {0} is cancelled,Цитата {0} скасовується
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,Загальною сумою заборгованості
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} was on leave on {1}. Cannot mark attendance.,Співробітник {0} був у відпустці на {1}. Не можете відзначити відвідуваність.
 DocType: Sales Partner,Targets,Цільові
@@ -2178,7 +2103,6 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +158,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,Комп&#39;ютери
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +112,Electro-chemical grinding,Електро-хімічний шліфування
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +14,This is a root customer group and cannot be edited.,Це корінь групи клієнтів і не можуть бути змінені.
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +39,Please setup your chart of accounts before you start Accounting Entries,"Будь ласка, встановіть ваш план рахунків, перш ніж почати бухгалтерських проводок"
 DocType: Purchase Invoice,Ignore Pricing Rule,Ігнорувати Ціни правило
@@ -2224,7 +2148,6 @@
 DocType: Maintenance Visit,Purposes,Мети
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +103,Atleast one item should be entered with negative quantity in return document,Принаймні один елемент повинен бути введений з негативним кількістю у зворотному документа
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +67,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","Операція {0} більше, ніж будь-яких наявних робочих годин на робочої станції {1}, зламати операції в кілька операцій"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +134,Electrochemical machining,Анодно-хімічна обробка
 ,Requested,Запитаний
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +66,No Remarks,Немає Зауваження
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +13,Overdue,Прострочені
@@ -2233,7 +2156,7 @@
 DocType: Monthly Distribution,Distribution Name,Розподіл Ім&#39;я
 DocType: Features Setup,Sales and Purchase,Купівлі-продажу
 DocType: Supplier Quotation Item,Material Request No,Матеріал Запит Немає
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +218,Quality Inspection required for Item {0},Контроль якості потрібні для Пункт {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +221,Quality Inspection required for Item {0},Контроль якості потрібні для Пункт {0}
 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),Чистий швидкість (Компанія валют)
@@ -2251,9 +2174,8 @@
 apps/erpnext/erpnext/accounts/report/financial_statements.py +16,Fiscal Year {0} not found.,Фінансовий рік {0} знайдений.
 DocType: Bank Reconciliation,Get Relevant Entries,Одержати відповідні записи
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +407,Accounting Entry for Stock,Облік Вхід для запасі
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +64,Coining,Coining
 DocType: Sales Invoice,Sales Team1,Команда1 продажів
-apps/erpnext/erpnext/stock/doctype/item/item.py +412,Item {0} does not exist,Пункт {0} не існує
+apps/erpnext/erpnext/stock/doctype/item/item.py +416,Item {0} does not exist,Пункт {0} не існує
 DocType: Sales Invoice,Customer Address,Замовник Адреса
 apps/frappe/frappe/desk/query_report.py +136,Total,Загальна
 DocType: Purchase Invoice,Apply Additional Discount On,Застосувати Додаткова знижка на
@@ -2265,14 +2187,13 @@
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),Сума податку після скидки Сума (Компанія валют)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +149,Target warehouse is mandatory for row {0},Цільова склад є обов&#39;язковим для ряду {0}
 DocType: Quality Inspection,Quality Inspection,Контроль якості
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +144,Extra Small,Дуже невеликий
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +20,Spray forming,Спрей формування
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Extra Small,Дуже невеликий
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +458,Warning: Material Requested Qty is less than Minimum Order Qty,"Увага: Матеріал Запитувана Кількість менше, ніж мінімальне замовлення Кількість"
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +191,Account {0} is frozen,Рахунок {0} заморожені
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,"Юридична особа / Допоміжний з окремим Плану рахунків, що належать Організації."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +29,"Food, Beverage & Tobacco","Продукти харчування, напої і тютюн"
+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 +529,Can only make payment against unbilled {0},Можу тільки здійснити платіж проти нефактурірованних {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +531,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/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Minimum Inventory Level,Мінімальний рівень запасів
 DocType: Stock Entry,Subcontract,Субпідряд
@@ -2283,19 +2204,18 @@
 DocType: Item,Manufacturer Part Number,Виробник Номер деталі
 DocType: Production Order Operation,Estimated Time and Cost,Розрахунковий час і вартість
 DocType: Bin,Bin,Бункер
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +50,Nosing,Капотування
 DocType: SMS Log,No of Sent SMS,Немає відправлених SMS
 DocType: Account,Company,Компанія
 DocType: Account,Expense Account,Витрати аккаунт
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +49,Software,Програмне забезпечення
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +151,Colour,Колір
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +49,Software,Програмне забезпечення
+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","Будь ласка, виберіть пункт, де &quot;Чи зі Пункт&quot; &quot;Ні&quot; і &quot;є продаж товару&quot; &quot;Так&quot;, і немає ніякої іншої продукт Зв&#39;язка"
 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 +281,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}, не існує в таблиці вище &quot;Купити&quot; НАДХОДЖЕННЯ"
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +134,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 +145,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,Перейменувати Вхід
@@ -2305,7 +2225,7 @@
 apps/erpnext/erpnext/controllers/recurring_document.py +162,Please select {0},"Будь ласка, виберіть {0}"
 DocType: C-Form,C-Form No,С-Форма Немає
 DocType: BOM,Exploded_items,Exploded_items
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +95,Researcher,Дослідник
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Researcher,Дослідник
 apps/frappe/frappe/custom/doctype/customize_form/customize_form.js +88,Update,Оновлення
 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 +23,Name or Email is mandatory,Або адреса електронної пошти є обов&#39;язковим
@@ -2314,11 +2234,10 @@
 DocType: Employee,Exit,Вихід
 apps/erpnext/erpnext/accounts/doctype/account/account.py +134,Root Type is mandatory,Корінь Тип обов&#39;язково
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +295,Serial No {0} created,Серійний номер {0} створена
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +125,Vibratory finishing,Вібраційний обробка
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","Для зручності клієнтів, ці коди можуть бути використані в друкованих форматів, таких як рахунки-фактури і доставки Нотатки"
 DocType: Employee,You can enter any date manually,Ви можете ввести дату вручну будь
 DocType: Sales Invoice,Advertisement,Реклама
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +165,Probationary Period,Випробувальний термін
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Probationary Period,Випробувальний термін
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Тільки вузли лист дозволені в угоді
 DocType: Expense Claim,Expense Approver,Витрати затверджує
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,Купівля Надходження товару Поставляється
@@ -2326,19 +2245,16 @@
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +17,To Datetime,Для DateTime
 DocType: SMS Settings,SMS Gateway URL,SMS Gateway URL
 apps/erpnext/erpnext/config/crm.py +53,Logs for maintaining sms delivery status,Журнали для підтримки статус доставки смс
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +137,Grinding,Подрібнення
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +34,Shrink wrapping,Упаковка в термоусадочну плівку
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +36,Pending Activities,В очікуванні Діяльність
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,Confirmed,Підтвердив
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier > Supplier Type,Постачальник&gt; Постачальник Тип
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +127,Please enter relieving date.,"Будь ласка, введіть дату зняття."
 apps/erpnext/erpnext/controllers/trends.py +137,Amt,Amt
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' can be submitted,Тільки Залиште додатків зі статусом «Схвалено&quot; можуть бути представлені
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +51,Only Leave Applications with status 'Approved' can be submitted,Тільки Залиште додатків зі статусом «Схвалено&quot; можуть бути представлені
 apps/erpnext/erpnext/utilities/doctype/address/address.py +21,Address Title is mandatory.,Адреса Назва є обов&#39;язковим.
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,"Введіть ім&#39;я кампанії, якщо джерелом є кампанія запит"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +38,Newspaper Publishers,Газетних видавців
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +38,Newspaper Publishers,Газетних видавців
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,Виберіть фінансовий рік
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +88,Smelting,Виплавка
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Змінити порядок Рівень
 DocType: Attendance,Attendance Date,Відвідуваність Дата
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,Зарплата розпаду на основі Заробіток і дедукції.
@@ -2353,16 +2269,15 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +414,[Error],[Помилка]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,"За словами будуть видні, як тільки ви збережете замовлення клієнта."
 ,Employee Birthday,Співробітник народження
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +55,Venture Capital,Венчурний капітал
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,Венчурний капітал
 DocType: UOM,Must be Whole Number,Повинно бути ціле число
 DocType: Leave Control Panel,New Leaves Allocated (In Days),Нові листя Виділені (у днях)
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +51,Serial No {0} does not exist,Серійний номер {0} не існує
 DocType: Pricing Rule,Discount Percentage,Знижка у відсотках
 DocType: Payment Reconciliation Invoice,Invoice Number,Номер накладної
-apps/erpnext/erpnext/hooks.py +70,Orders,Замовлення
+apps/erpnext/erpnext/hooks.py +54,Orders,Замовлення
 DocType: Leave Control Panel,Employee Type,Співробітник Тип
 DocType: Employee Leave Approver,Leave Approver,Залишити який стверджує
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +70,Swaging,Кування
 DocType: Manufacturing Settings,Material Transferred for Manufacture,"Матеріал, переданий для виробництва"
 DocType: Expense Claim,"A user with ""Expense Approver"" role",Користувач з &quot;Витрати затверджує&quot; ролі
 ,Issued Items Against Production Order,Випущені товари з виробництвом ордена
@@ -2374,7 +2289,6 @@
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +62,Cost Center with existing transactions can not be converted to group,"Центр Вартість з існуючими операцій, не може бути перетворений в групі"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Depreciation,Амортизація
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Постачальник (и)
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +29,Invalid period,Невірний період
 DocType: Customer,Credit Limit,Кредитний ліміт
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,Виберіть тип угоди
 DocType: GL Entry,Voucher No,Ваучер Немає
@@ -2384,9 +2298,9 @@
 DocType: Customer,Address and Contact,Адреса та контактна
 DocType: Customer,Last Day of the Next Month,Останній день наступного місяця
 DocType: Employee,Feedback,Зворотній зв&#39;язок
+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}"
 apps/erpnext/erpnext/accounts/party.py +284,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Примітка: Через / Вихідна дата перевищує дозволений кредит клієнт дня {0} день (їй)
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +621,Maint. Schedule,Maint. Графік
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +108,Abrasive jet machining,Абразивної обробки струмінь
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +632,Maint. Schedule,Maint. Графік
 DocType: Stock Settings,Freeze Stock Entries,Заморожування зображення щоденнику
 DocType: Website Settings,Website Settings,Налаштування сайту
 DocType: Item,Reorder level based on Warehouse,Рівень Зміна порядку на основі Склад
@@ -2403,7 +2317,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +75,Show Stock Entries,Показати фонду Записи
 ,Is Primary Address,Є первинним Адреса
 DocType: Production Order,Work-in-Progress Warehouse,Робота-в-Прогрес Склад
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +308,Reference #{0} dated {1},Посилання # {0} від {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Reference #{0} dated {1},Посилання # {0} від {1}
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +13,Manage Addresses,Управління адрес
 DocType: Pricing Rule,Item Code,Код товару
 DocType: Production Planning Tool,Create Production Orders,Створити виробничі замовлення
@@ -2412,7 +2326,7 @@
 DocType: Lead,Market Segment,Сегмент ринку
 DocType: Communication,Phone,Телефон
 DocType: Employee Internal Work History,Employee Internal Work History,Співробітник внутрішньої історії роботи
-apps/erpnext/erpnext/public/js/account_tree_grid.js +50,Closing (Dr),Закриття (д-р)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +221,Closing (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.,Податковий шаблон для продажу угод.
@@ -2428,8 +2342,8 @@
 ,Billed Amount,Оголошений Сума
 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 +129,Material Request {0} is cancelled or stopped,Матеріал Запит {0} ануляції або зупинився
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +641,Add a few sample records,Додати кілька пробних записів
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +133,Material Request {0} is cancelled or stopped,Матеріал Запит {0} ануляції або зупинився
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Add a few sample records,Додати кілька пробних записів
 apps/erpnext/erpnext/config/hr.py +210,Leave Management,Залишити управління
 DocType: Event,Groups,Групи
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,Група по рахунок
@@ -2442,38 +2356,34 @@
 DocType: Features Setup,Sales Extras,Продажі Додатково
 apps/erpnext/erpnext/accounts/utils.py +344,{0} budget for Account {1} against Cost Center {2} will exceed by {3},{0} бюджет за рахунок {1} проти МВЗ {2} буде перевищувати {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +236,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Різниця аккаунт повинен бути тип рахунки активів / пасивів, так як це зі Примирення є запис Відкриття"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +138,Purchase Order number required for Item {0},"Купівля Номер замовлення, необхідну для п {0}"
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Order number required for Item {0},"Купівля Номер замовлення, необхідну для п {0}"
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',&quot;З дати&quot; повинно бути після &quot;Для Дата&quot;
 ,Stock Projected Qty,Фото Прогнозований Кількість
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +147,Customer {0} does not belong to project {1},Замовник {0} не належить до проекту {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +150,Customer {0} does not belong to project {1},Замовник {0} не належить до проекту {1}
 DocType: Sales Order,Customer's Purchase Order,Замовлення клієнта
 DocType: Warranty Claim,From Company,Від компанії
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,Значення або Кількість
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Minute,Хвилин
+apps/erpnext/erpnext/public/js/setup_wizard.js +363,Minute,Хвилин
 DocType: Purchase Invoice,Purchase Taxes and Charges,Купити податки і збори
 ,Qty to Receive,Кількість на отримання
 DocType: Leave Block List,Leave Block List Allowed,Залишити Чорний список тварин
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +61,Conversion factor cannot be in fractions,Коефіцієнт перетворення не можуть бути в фракцій
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +358,You will use it to Login,"Ви будете використовувати його, щоб Вхід"
+apps/erpnext/erpnext/public/js/setup_wizard.js +108,You will use it to Login,"Ви будете використовувати його, щоб Вхід"
 DocType: Sales Partner,Retailer,Роздрібний торговець
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +99,Credit To account must be a Balance Sheet account,Кредит на рахунку повинен бути баланс рахунку
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,Всі типи Постачальник
 apps/erpnext/erpnext/stock/doctype/item/item.py +37,Item Code is mandatory because Item is not automatically numbered,"Код товару є обов&#39;язковим, оскільки товар не автоматично нумеруються"
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +99,Quotation {0} not of type {1},Цитата {0} типу {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +93,Quotation {0} not of type {1},Цитата {0} типу {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,Технічне обслуговування Розклад товару
 DocType: Sales Order,%  Delivered,Поставляється%
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,Bank Overdraft Account,Банк Овердрафт аккаунт
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +15,Make Salary Slip,Зробити зарплата Сліп
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +18,Browse BOM,Відображення специфікації
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +175,Secured Loans,Забезпечені кредити
-apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +3,Awesome Products,Високий Продукти
+apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +3,Awesome Products,Високий Продукти
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +189,Opening Balance Equity,Відкриття Баланс акцій
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +80,Cannot approve leave as you are not authorized to approve leaves on Block Dates,"Не можете схвалити відпустку, поки ви не уповноважений стверджувати листя на блокових Терміни"
 DocType: Appraisal,Appraisal,Оцінка
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +13,Lost-foam casting,Лиття по виплавлюваних піни
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +47,Drawing,Малюнок
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +22,Date is repeated,Дата повторюється
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +148,Leave approver must be one of {0},Залишити затверджує повинен бути одним з {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +162,Leave approver must be one of {0},Залишити затверджує повинен бути одним з {0}
 DocType: Hub Settings,Seller Email,Продавець E-mail
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Загальна вартість покупки (через рахунок покупки)
 DocType: Workstation Working Hour,Start Time,Час початку
@@ -2487,7 +2397,7 @@
 DocType: Purchase Invoice Item,Net Amount (Company Currency),Чиста сума (Компанія валют)
 DocType: BOM Operation,Hour Rate,Година Оцінити
 DocType: Stock Settings,Item Naming By,Пункт Іменування За
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +642,From Quotation,З цитати
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +655,From Quotation,З цитати
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},"Ще Період закриття входу {0} була зроблена після того, як {1}"
 DocType: Production Order,Material Transferred for Manufacturing,Матеріал для виготовлення Переведений
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +29,Account {0} does not exists,Рахунок {0} не існує робить
@@ -2501,21 +2411,19 @@
 DocType: Purchase Invoice Item,PR Detail,PR-Деталь
 DocType: Sales Order,Fully Billed,Повністю Оголошений
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +20,Cash In Hand,Готівка касова
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +72,Delivery warehouse required for stock item {0},Склад Доставка потрібно для фондового пункту {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +119,Delivery warehouse required for stock item {0},Склад Доставка потрібно для фондового пункту {0}
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),Вага брутто упаковки. Зазвичай вага нетто + пакувальний матеріал вагу. (для друку)
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Користувачі з цією роллю можуть встановлювати заморожені рахунки і створювати / змінювати записи бухгалтерського обліку стосовно заморожених рахунків
 DocType: Serial No,Is Cancelled,Скасовується
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +281,My Shipments,Мої замовлення
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +286,My Shipments,Мої замовлення
 DocType: Journal Entry,Bill Date,Білл Дата
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +43,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","Навіть якщо є кілька правил ціноутворення з найвищим пріоритетом, то наступні внутрішні пріоритети застосовуються:"
 DocType: Supplier,Supplier Details,Постачальник Подробиці
 DocType: Communication,Recipients,Одержувачі
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +146,Screwing,Загвинчування
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +96,Knurling,Накатки
 DocType: Expense Claim,Approval Status,Стан затвердження
 DocType: Hub Settings,Publish Items to Hub,Опублікувати товари в Hub
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +44,From value must be less than to value in row {0},"З значення має бути менше, ніж значення в рядку в {0}"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +133,Wire Transfer,Банківський переказ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +133,Wire Transfer,Банківський переказ
 apps/erpnext/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py +25,Please select Bank Account,"Будь ласка, виберіть банківський рахунок"
 DocType: Newsletter,Create and Send Newsletters,Створення і відправлення розсилки
 apps/frappe/frappe/public/js/frappe/views/reports/grid_report.js +305,From Date must be before To Date,"З дати повинні бути, перш ніж Дата"
@@ -2523,14 +2431,14 @@
 DocType: Company,Default Income Account,За замовчуванням Рахунок Доходи
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,Група клієнтів / клієнтів
 DocType: Item Group,Check this if you want to show in website,"Перевірте це, якщо ви хочете, щоб показати на веб-сайті"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +190,Welcome to ERPNext,Ласкаво просимо в ERPNext
+,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/page/setup_wizard/install_fixtures.py +37,Calls,Дзвінки
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Calls,Дзвінки
 DocType: Project,Total Costing Amount (via Time Logs),Всього Калькуляція Сума (за допомогою журналів Time)
 DocType: Purchase Order Item Supplied,Stock UOM,Фото Одиниця виміру
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Purchase Order {0} is not submitted,Замовлення на {0} не представлено
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +194,Purchase Order {0} is not submitted,Замовлення на {0} не представлено
 ,Projected,Прогнозований
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},Серійний номер {0} не належить Склад {1}
 apps/erpnext/erpnext/controllers/status_updater.py +136,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,"Примітка: Система не перевірятиме по-доставки і більш-бронювання для Пункт {0}, як кількість або сума 0"
@@ -2538,7 +2446,6 @@
 DocType: Issue,Opening Date,Дата розкриття
 DocType: Journal Entry,Remark,Зауваження
 DocType: Purchase Receipt Item,Rate and Amount,Темпи і обсяг
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +95,Boring,Нудний
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +667,From Sales Order,Від замовлення клієнта
 DocType: Blog Category,Parent Website Route,Батько Сайт маршруту
 DocType: Sales Order,Not Billed,Чи не Оголошений
@@ -2552,19 +2459,17 @@
 apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount Amount,Сума знижки
 DocType: Purchase Invoice,Return Against Purchase Invoice,Повернутися в рахунку-фактурі проти
 DocType: Item,Warranty Period (in days),Гарантійний термін (в днях)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +550,e.g. VAT,"наприклад, ПДВ"
+apps/erpnext/erpnext/public/js/setup_wizard.js +292,e.g. VAT,"наприклад, ПДВ"
 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,Цитата серії
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +52,"An item exists with same name ({0}), please change the item group name or rename the item","Пункт існує з таким же ім&#39;ям ({0}), будь ласка, змініть назву групи товарів або перейменувати пункт"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +82,Hot metal gas forming,Гаряча металу газу формування
 DocType: Sales Order Item,Sales Order Date,Продажі Порядок Дата
 DocType: Sales Invoice Item,Delivered Qty,Поставляється Кількість
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +63,Warehouse {0}: Company is mandatory,Склад {0}: Компанія є обов&#39;язковим
 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.",Перейти до відповідної групи (зазвичай джерело коштів&gt; Короткострокові зобов&#39;язання&gt; податків і зборів та створити новий обліковий запис (натиснувши на Додати Дитину) типу &quot;Податок&quot; і згадують ставка податку.
 ,Payment Period Based On Invoice Date,Оплата період на основі рахунку-фактури Дата
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +50,Missing Currency Exchange Rates for {0},Зниклих безвісти Курси валют на {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +135,Laser cutting,Лазерне різання
 DocType: Event,Monday,Понеділок
 DocType: Journal Entry,Stock Entry,Фото запис
 DocType: Account,Payable,До оплати
@@ -2597,7 +2502,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +111,Date Of Retirement must be greater than Date of Joining,"Дата виходу на пенсію повинен бути більше, ніж дата вступу"
 DocType: Sales Invoice,Against Income Account,На рахунок доходів
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +69,{0}% Delivered,{0}% Поставляється
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +78,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Пункт {0}: Замовив Кількість {1} не може бути менше мінімального замовлення Кіл {2} (визначених у пункті).
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Пункт {0}: Замовив Кількість {1} не може бути менше мінімального замовлення Кіл {2} (визначених у пункті).
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Щомісячний Процентний розподіл
 DocType: Territory,Territory Targets,Територія Цілі
 DocType: Delivery Note,Transporter Info,Транспортер інформація
@@ -2606,7 +2511,6 @@
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,"Назви для шаблонів друку, наприклад рахунок-проформа."
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +140,Valuation type charges can not marked as Inclusive,Звинувачення типу Оцінка не може відзначений як включено
 DocType: POS Profile,Update Stock,Оновлення зі
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +128,Superfinishing,Суперфінішування
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,"Різні Одиниця виміру для елементів призведе до неправильної (всього) значення маси нетто. Переконайтеся, що вага нетто кожного елемента знаходиться в тій же UOM."
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,Специфікація Оцінити
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +85,Please pull items from Delivery Note,"Ласка, витягнути речі з накладної"
@@ -2621,7 +2525,6 @@
 ,Purchase Analytics,Купівля Аналітика
 DocType: Sales Invoice Item,Delivery Note Item,Доставка товару Примітка
 DocType: Expense Claim,Task,Завдання
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +57,Shaving,Гоління
 DocType: Purchase Taxes and Charges,Reference Row #,Посилання ряд #
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},Серійний номер є обов&#39;язковим для пп {0}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js +14,This is a root sales person and cannot be edited.,Це корінь продавець і не можуть бути змінені.
@@ -2633,13 +2536,11 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +74,Purpose must be one of {0},Мета повинна бути одним з {0}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +108,Fill the form and save it,Заповніть форму і зберегти його
 DocType: Production Planning Tool,Download a report containing all raw materials with their latest inventory status,"Завантажити звіт, що містить всю сировину з їх останньої інвентаризації статус"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +94,Facing,Лицьова
 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,Відправити SMS
 DocType: Company,Default Letter Head,За замовчуванням бланку
 DocType: Time Log,Billable,Платіжні
-DocType: Authorization Rule,This will be used for setting rule in HR module,Ця інформація буде використовуватися для установки модуля правило в HR
 DocType: Account,Rate at which this tax is applied,"Швидкість, з якою цей податок застосовується"
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reorder Qty,Зміна порядку Кількість
 DocType: Company,Stock Adjustment Account,Фото коригування рахунку
@@ -2666,16 +2567,15 @@
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,Відсоток Розподіл має дорівнювати 100%
 DocType: Serial No,Out of AMC,З КУА
 DocType: Purchase Order Item,Material Request Detail No,Матеріал Запит Деталь Немає
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +97,Hard turning,Жорсткий поворотним
 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,"Будь ласка, зв&#39;яжіться з користувачем, які мають по продажах Майстер диспетчера {0} роль"
 DocType: Company,Default Cash Account,За замовчуванням Грошовий рахунок
 apps/erpnext/erpnext/config/accounts.py +79,Company (not Customer or Supplier) master.,Компанії (не клієнтів або постачальників) господар.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +106,Please enter 'Expected Delivery Date',"Будь ласка, введіть &quot;Очікувана дата доставки&quot;"
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +187,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Доставка Примітки {0} має бути скасований до скасування цього замовлення клієнта
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +100,Please enter 'Expected Delivery Date',"Будь ласка, введіть &quot;Очікувана дата доставки&quot;"
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +182,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Доставка Примітки {0} має бути скасований до скасування цього замовлення клієнта
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +373,Paid amount + Write Off Amount can not be greater than Grand Total,"Платні сума + Списання Сума не може бути більше, ніж загальний підсумок"
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} не є допустимим Номер партії за Пункт {1}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,Note: There is not enough leave balance for Leave Type {0},Примітка: Існує не достатньо відпустку баланс Залиште Тип {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +124,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,Можливість Тип
@@ -2687,51 +2587,45 @@
 DocType: Hub Settings,Publish Availability,Опублікувати Наявність
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +105,Date of Birth cannot be greater than today.,"Дата народження не може бути більше, ніж сьогодні."
 ,Stock Ageing,Фото Старіння
-apps/erpnext/erpnext/controllers/accounts_controller.py +200,{0} '{1}' is disabled,{0} {1} &#39;відключений
+apps/erpnext/erpnext/controllers/accounts_controller.py +201,{0} '{1}' is disabled,{0} {1} &#39;відключений
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Встановити як Open
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Відправити автоматичні листи на Контакти Про подання операцій.
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,Пункт 3
 DocType: Purchase Order,Customer Contact Email,Контакти з клієнтами E-mail
 DocType: Event,Sunday,Неділя
 DocType: Sales Team,Contribution (%),Внесок (%)
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +455,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,"Примітка: Оплата запис не буде створена, так як &quot;Готівкою або банківський рахунок&quot; не було зазначено"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +171,Responsibilities,Обов&#39;язки
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +457,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,"Примітка: Оплата запис не буде створена, так як &quot;Готівкою або банківський рахунок&quot; не було зазначено"
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +171,Responsibilities,Обов&#39;язки
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Template,Шаблон
 DocType: Sales Person,Sales Person Name,Продажі Особа Ім&#39;я
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,"Будь ласка, введіть принаймні 1-фактуру в таблиці"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +511,Add Users,Додавання користувачів
+apps/erpnext/erpnext/public/js/setup_wizard.js +255,Add Users,Додавання користувачів
 DocType: Pricing Rule,Item Group,Пункт Група
 DocType: Task,Actual Start Date (via Time Logs),Фактична дата початку (за допомогою журналів Time)
 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),Податки і збори Додав (Компанія валют)
-apps/erpnext/erpnext/stock/doctype/item/item.py +340,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Пункт Податковий ряд {0} повинен мати обліковий запис типу податку або доходів або витрат або платно
+apps/erpnext/erpnext/stock/doctype/item/item.py +344,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Пункт Податковий ряд {0} повинен мати обліковий запис типу податку або доходів або витрат або платно
 DocType: Sales Order,Partly Billed,Невелика Оголошений
 DocType: Item,Default BOM,За замовчуванням BOM
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +79,Decambering,Decambering
 apps/erpnext/erpnext/setup/doctype/company/company.js +22,Please re-type company name to confirm,"Будь ласка, повторіть введення назва компанії, щоб підтвердити"
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,Загальна сума заборгованості з Amt
 DocType: Time Log Batch,Total Hours,Загальна кількість годин
 DocType: Journal Entry,Printing Settings,Налаштування друку
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +268,Total Debit must be equal to Total Credit. The difference is {0},"Всього Дебет повинна дорівнювати загальній виробленні. Різниця в тому, {0}"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +11,Automotive,Автомобільний
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +37,Item is required,Стан вимагається
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +25,Metal injection molding,Метал лиття під тиском
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +258,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/accounts/doctype/sales_invoice/sales_invoice.js +684,From Delivery Note,З накладної
 DocType: Time Log,From Time,Від часу
 DocType: Notification Control,Custom Message,Текст повідомлення
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +33,Investment Banking,Інвестиційний банкінг
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +261,"Select your Country, Time Zone and Currency","Виберіть вашу країну, часовий пояс і валюту"
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,Інвестиційний банкінг
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +316,"Select your Country, Time Zone and Currency","Виберіть вашу країну, часовий пояс і валюту"
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +369,Cash or Bank Account is mandatory for making payment entry,Готівкою або банківський рахунок є обов&#39;язковим для внесення запису оплата
 DocType: Purchase Invoice,Price List Exchange Rate,Ціни обмінний курс
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +91,Pickling,Маринування
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +18,Sand casting,Лиття в піщані
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +117,Electroplating,Гальваніка
 DocType: Purchase Invoice Item,Rate,Ставка
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +62,Intern,Інтерн
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Intern,Інтерн
 DocType: Newsletter,A Lead with this email id should exist,Провід з цієї електронної пошти ID повинен існувати
 DocType: Stock Entry,From BOM,З специфікації
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +34,Basic,Основний
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +34,Basic,Основний
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,Біржові операції до {0} заморожені
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +217,Please click on 'Generate Schedule',"Будь ласка, натисніть на кнопку &quot;Generate&quot; Розклад"
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +61,To Date should be same as From Date for Half Day leave,"Для Дата повинна бути такою ж, як від Дата для половини дня відпустки"
@@ -2739,10 +2633,10 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +96,Reference No is mandatory if you entered Reference Date,"Посилання № є обов&#39;язковим, якщо ви увійшли Reference Дата"
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +108,Date of Joining must be greater than Date of Birth,"Дата вступу повинні бути більше, ніж Дата народження"
 DocType: Salary Structure,Salary Structure,Зарплата Структура
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +242,"Multiple Price Rule exists with same criteria, please resolve \
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +246,"Multiple Price Rule exists with same criteria, please resolve \
 			conflict by assigning priority. Price Rules: {0}","Кілька Ціна Правило існує з тими ж критеріями ,, будь ласка, вирішити \ конфлікту віддаючи пріоритет. Ціна Правила: {0}"
 DocType: Account,Bank,Банк
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +9,Airline,Авіакомпанія
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,Авіакомпанія
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +493,Issue Material,Матеріал Випуск
 DocType: Material Request Item,For Warehouse,Для складу
 DocType: Employee,Offer Date,Пропозиція Дата
@@ -2752,29 +2646,24 @@
 DocType: Item,Is Fixed Asset Item,Фіксується активами товару
 DocType: Stock Entry,Including items for sub assemblies,У тому числі предмети для суб зібрань
 DocType: Features Setup,"If you have long print formats, this feature can be used to split the page to be printed on multiple pages with all headers and footers on each page","Якщо у вас довге формати друку, ця функція може бути використана, щоб розділити сторінку, яка буде надрукована на декількох сторінках з усіма колонтитули на кожній сторінці"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +131,Hobbing,Hobbing
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +98,All Territories,Всі території
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +98,All Territories,Всі території
 DocType: Purchase Invoice,Items,Предмети
 DocType: Fiscal Year,Year Name,Рік Назва
 DocType: Process Payroll,Process Payroll,Процес розрахунку заробітної плати
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +59,There are more holidays than working days this month.,"Є більше свят, ніж робочих днів у цьому місяці."
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +68,There are more holidays than working days this month.,"Є більше свят, ніж робочих днів у цьому місяці."
 DocType: Product Bundle Item,Product Bundle Item,Продукт Зв&#39;язка товару
 DocType: Sales Partner,Sales Partner Name,Партнер по продажах Ім&#39;я
 DocType: Purchase Invoice Item,Image View,Перегляд зображення
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +113,Finishing & industrial finishing,Оздоблювальні та промислового обробка
 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/page/setup_wizard/fixtures/industry_type.py +46,Securities & Commodity Exchanges,Цінні папери та бірж
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Цінні папери та бірж
 DocType: Shipping Rule,Calculate Based On,"Розрахувати, засновані на"
 DocType: Delivery Note Item,From Warehouse,Від Склад
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +98,Drilling,Буріння
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +28,Blow molding,Видувна
 DocType: Purchase Taxes and Charges,Valuation and Total,Оцінка і Загальна
 DocType: Tax Rule,Shipping City,Доставка Місто
 apps/erpnext/erpnext/stock/doctype/item/item.js +43,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,"Цей пункт є Варіант {0} (шаблон). Атрибути будуть скопійовані з шаблону, якщо &quot;Ні Копіювати&quot; не встановлений"
 DocType: Account,Purchase User,Купівля користувача
 DocType: Notification Control,Customize the Notification,Налаштувати повідомлення
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +87,Hammering,Стук
 DocType: Web Page,Slideshow,Слайд-шоу
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +24,Default Address Template cannot be deleted,За замовчуванням Адреса Шаблон не може бути видалений
 DocType: Sales Invoice,Shipping Rule,Правило Доставка
@@ -2783,9 +2672,8 @@
 DocType: Workflow State,Search,Пошуковий
 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,&quot;Дні з останнього ордена&quot; повинен бути більше або дорівнює нулю
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +142,Brazing,Пайка
 DocType: C-Form,Amended From,Змінений З
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Raw Material,Сирий матеріал
+apps/erpnext/erpnext/public/js/setup_wizard.js +359,Raw Material,Сирий матеріал
 DocType: Leave Application,Follow via Email,Дотримуйтесь по електронній пошті
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Сума податку після скидки Сума
 apps/erpnext/erpnext/accounts/doctype/account/account.py +174,Child account exists for this account. You can not delete this account.,Дитячий рахунок існує для цього облікового запису. Ви не можете видалити цей аккаунт.
@@ -2799,10 +2687,10 @@
 ,Produced,Вироблений
 DocType: Item,Item Code for Suppliers,Код товару для постачальників
 DocType: Issue,Raised By (Email),Raised By (E-mail)
-apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +72,General,Генеральна
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +495,Attach Letterhead,Прикріпіть бланка
+apps/erpnext/erpnext/setup/setup_wizard/default_website.py +72,General,Генеральна
+apps/erpnext/erpnext/public/js/setup_wizard.js +241,Attach Letterhead,Прикріпіть бланка
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +272,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',"Не можете відняти, коли категорія для &quot;Оцінка&quot; або &quot;Оцінка і Total &#39;"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +542,"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/public/js/setup_wizard.js +284,"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},Серійний пп Обов&#39;язково для серіалізовані елемент {0}
 DocType: Journal Entry,Bank Entry,Банк Стажер
 DocType: Authorization Rule,Applicable To (Designation),Застосовується до (Позначення)
@@ -2811,31 +2699,30 @@
 apps/erpnext/erpnext/config/accounts.py +143,Enable / disable currencies.,Включити / відключити валюти.
 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),Всього (АМТ)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +26,Entertainment & Leisure,Розваги і дозвілля
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,Розваги і дозвілля
 DocType: Purchase Order,The date on which recurring order will be stop,"Дата, на яку повторюване замовлення буде зупинити"
 DocType: Quality Inspection,Item Serial No,Пункт Серійний номер
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Present,Разом Поточна
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Hour,Година
+apps/erpnext/erpnext/public/js/setup_wizard.js +363,Hour,Година
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +138,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation",Серійний товару {0} не може бути оновлена ​​\ на примирення зі
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +488,Transfer Material to Supplier,Провести Матеріал Постачальнику
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +513,Transfer Material to Supplier,Провести Матеріал Постачальнику
 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/crm/doctype/opportunity/opportunity.js +82,Create Quotation,Створити цитати
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +306,All these items have already been invoiced,Всі ці предмети вже виставлений
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,You are not authorized to approve leaves on Block Dates,Ви не уповноважений стверджувати листя на Блок Терміни
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +311,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/setup/page/setup_wizard/fixtures/operations.py +83,Curling,Керлінг
 DocType: Account,Tax,Податок
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +28,Row {0}: {1} is not a valid {2},"Ряд {0}: {1}, не є допустимим {2}"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +89,Refining,Рафінування
+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,Планування виробництва інструменту
 DocType: Quality Inspection,Report Date,Дата звіту
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +130,Routing,Маршрутизація
 DocType: C-Form,Invoices,Рахунки
 DocType: Job Opening,Job Title,Професія
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +54,{0} already allocated for Employee {1} for period {2} - {3},{0} вже виділено Потрібні {1} для періоду {2} - {3}
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +80,{0} Recipients,{0} Одержувачі
 DocType: Features Setup,Item Groups in Details,Групи товарів в деталі
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +335,Quantity to Manufacture must be greater than 0.,"Кількість, Виготовлення повинні бути більше, ніж 0."
@@ -2853,14 +2740,13 @@
 DocType: DocType,Setup,Установка
 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,Резюме для цього місяця і в очікуванні діяльності
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +39,Cold rolling,Холодна прокатка
 DocType: Customer Group,Customer Group Name,Група Ім&#39;я клієнта
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +408,Please remove this Invoice {0} from C-Form {1},"Будь ласка, видаліть цю фактуру {0} з C-Form {1}"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +410,Please remove this Invoice {0} from C-Form {1},"Будь ласка, видаліть цю фактуру {0} з C-Form {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,Атрибути
 DocType: Packing Slip,Get Items,Отримати товари
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +186,Please enter Write Off Account,"Будь ласка, введіть Списання аккаунт"
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +187,Please enter Write Off Account,"Будь ласка, введіть Списання аккаунт"
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +71,Last Order Date,Остання дата замовлення
 DocType: DocField,Image,Зображення
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +179,Make Excise Invoice,Зробити акцизний Рахунок
@@ -2870,7 +2756,7 @@
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +146,Operation ID not set,Код операції не встановлений
 DocType: Production Order,Planned Start Date,Планована дата початку
 DocType: Serial No,Creation Document Type,Створення типу документа
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +620,Maint. Visit,Maint. Візит
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +631,Maint. Visit,Maint. Візит
 DocType: Leave Type,Is Encash,Є Обналічиваніє
 DocType: Purchase Invoice,Mobile No,Номер мобільного
 DocType: Payment Tool,Make Journal Entry,Зробити запис журналу
@@ -2878,35 +2764,31 @@
 apps/erpnext/erpnext/controllers/trends.py +257,Project-wise data is not available for Quotation,Дані проекту мудрий не доступні для цитати
 DocType: Project,Expected End Date,Очікувана Дата закінчення
 DocType: Appraisal Template,Appraisal Template Title,Оцінка шаблону Назва
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +440,Commercial,Комерційна
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +378,Commercial,Комерційна
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +23,Parent Item {0} must not be a Stock Item,Батько товару {0} не повинні бути зі пункт
 DocType: Cost Center,Distribution Id,Розподіл Id
-apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +14,Awesome Services,Високий Послуги
+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,Постачальник Адреса
 DocType: Contact Us Settings,Address Line 2,Адресний рядок 2
 DocType: ToDo,Reference,Посилання
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +59,Perforating,Перфорування
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,З Кількість
 apps/erpnext/erpnext/config/accounts.py +128,Rules to calculate shipping amount for a sale,Правила для розрахунку кількості вантажу для продажу
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +29,Series is mandatory,Серія є обов&#39;язковим
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +28,Financial Services,Фінансові послуги
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,Фінансові послуги
 apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3},Відповідність атрибутів {0} має бути в межах {1} до {2} в збільшень {3}
 DocType: Tax Rule,Sales,Продажів
 DocType: Stock Entry Detail,Basic Amount,Основна кількість
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +173,Warehouse required for stock Item {0},Склад необхідний для складі Пункт {0}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +178,Warehouse required for stock Item {0},Склад необхідний для складі Пункт {0}
 DocType: Leave Allocation,Unused leaves,Невикористані листя
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,Cr
 DocType: Customer,Default Receivable Accounts,За замовчуванням заборгованість Дебіторська
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +102,Sawing,Розпилювання
 DocType: Tax Rule,Billing State,Державний рахунків
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +32,Laminating,Ламінування
 DocType: Item Reorder,Transfer,Переклад
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +549,Fetch exploded BOM (including sub-assemblies),Fetch розібраному специфікації (у тому числі вузлів)
 DocType: Authorization Rule,Applicable To (Employee),Застосовується до (Співробітник)
 apps/erpnext/erpnext/controllers/accounts_controller.py +101,Due Date is mandatory,Завдяки Дата є обов&#39;язковим
 apps/erpnext/erpnext/controllers/item_variant.py +51,Increment for Attribute {0} cannot be 0,Приріст за атрибут {0} не може бути 0
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +143,Sintering,Спікання
 DocType: Journal Entry,Pay To / Recd From,Зверніть Для / RECD Від
 DocType: Naming Series,Setup Series,Серія установки
 DocType: Supplier,Contact HTML,Зв&#39;язатися з HTML-
@@ -2919,7 +2801,6 @@
 DocType: Attendance,Absent,Відсутнім
 DocType: Product Bundle,Product Bundle,Зв&#39;язка товарів
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +180,Row {0}: Invalid reference {1},Ряд {0}: Неприпустима посилання {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +165,Crushing,Дроблення
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Купити податки і збори шаблон
 DocType: Upload Attendance,Download Template,Завантажити Шаблон
 DocType: GL Entry,Remarks,Зауваження
@@ -2927,14 +2808,12 @@
 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/setup/page/setup_wizard/fixtures/operations.py +9,Continuous casting,Безперервне розливання
 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/setup/page/setup_wizard/fixtures/operations.py +80,Cold sizing,Холодна розмірів
 DocType: Salary Slip,Earning & Deduction,Заробіток і дедукція
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +76,Account {0} cannot be a Group,Рахунок {0} не може бути група
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +259,Region,Область
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +314,Region,Область
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +213,Optional. This setting will be used to filter in various transactions.,Необов&#39;язково. Ця установка буде використовуватися для фільтрації в різних угод.
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +104,Negative Valuation Rate is not allowed,Негативний Оцінка Оцініть не допускається
 DocType: Holiday List,Weekly Off,Щотижневий Викл
@@ -2952,7 +2831,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,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,Відвідуваність З Дата і відвідуваність Дата є обов&#39;язковим
-apps/erpnext/erpnext/controllers/buying_controller.py +131,Please enter 'Is Subcontracted' as Yes or No,"Будь ласка, введіть &quot;субпідряду&quot;, як так чи ні"
+apps/erpnext/erpnext/controllers/buying_controller.py +122,Please enter 'Is Subcontracted' as Yes or No,"Будь ласка, введіть &quot;субпідряду&quot;, як так чи ні"
 DocType: Sales Team,Contact No.,Зв&#39;язатися No.
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,'Profit and Loss' type account {0} not allowed in Opening Entry,&quot;Прибуток і збитки&quot; тип рахунку {0} не допускаються в вхідний отвір
 DocType: Workflow State,Time,Час
@@ -2961,14 +2840,13 @@
 DocType: Authorization Rule,Authorization Rule,Авторизація Правило
 DocType: Sales Invoice,Terms and Conditions Details,Правила та умови подробиці
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,Продажі Податки і збори шаблону
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +10,Apparel & Accessories,Одяг та аксесуари
+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,Кількість ордена
 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 +121,Add Child,Додати Дитину
 DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,Роль тварин у зазначений заморожені рахунки &amp; Редагувати заморожені Записи
 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/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +47,Conversion Factor is required,Коефіцієнт перетворення потрібно
 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,Значення / Опис
@@ -2976,10 +2854,8 @@
 ,Customers Not Buying Since Long Time,Клієнти не купувати з довгого часу
 DocType: Production Order,Expected Delivery Date,Очікувана дата поставки
 apps/erpnext/erpnext/accounts/general_ledger.py +121,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Дебет і Кредит не рівні для {0} # {1}. Різниця {2}.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +48,Bulging,Опуклий
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +11,Evaporative-pattern casting,Лиття випарного-модель
 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 +195,Sales Invoice {0} must be cancelled before cancelling this Sales Order,Видаткова накладна {0} має бути скасований до скасування цього замовлення клієнта
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +190,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.
@@ -2998,26 +2874,24 @@
 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 +241,Account: {0} with currency: {1} can not be selected,Рахунок: {0} з валютою: {1} не може бути обраний
+apps/erpnext/erpnext/controllers/accounts_controller.py +242,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 +47,Account {0}: Parent account {1} does not belong to company: {2},Рахунок {0}: Батьки рахунку {1} ​​не належить компанії: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted all transactions related to this company!,"Успішно видалений всі угоди, пов&#39;язані з цією компанією!"
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,Станом на Дата
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +111,Honing,Хонингование
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +58,Probation,Випробувальний термін
-apps/erpnext/erpnext/stock/doctype/item/item.py +264,Default Warehouse is mandatory for stock Item.,За замовчуванням Склад є обов&#39;язковим для фондового Пункт.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Probation,Випробувальний термін
+apps/erpnext/erpnext/stock/doctype/item/item.py +268,Default Warehouse is mandatory for stock Item.,За замовчуванням Склад є обов&#39;язковим для фондового Пункт.
 DocType: Feed,Full Name,Повне ім&#39;я
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +148,Clinching,Клінч
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +191,Payment of salary for the month {0} and year {1},Виплата заробітної плати за місяць {0} і рік {1}
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +173,Payment of salary for the month {0} and year {1},Виплата заробітної плати за місяць {0} і рік {1}
 DocType: Stock Settings,Auto insert Price List rate if missing,"Авто вставка Швидкість Ціни, якщо не вистачає"
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,Всього сплачена сума
 ,Transferred Qty,Переведений Кількість
 apps/erpnext/erpnext/config/learn.py +11,Navigating,Навігаційний
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +137,Planning,Планування
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +137,Planning,Планування
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +9,Make Time Log Batch,Зробіть Час Увійдіть Batch
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Issued,Виданий
 DocType: Project,Total Billing Amount (via Time Logs),Всього рахунків Сума (за допомогою журналів Time)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +629,We sell this Item,Ми продаємо цей пункт
+apps/erpnext/erpnext/public/js/setup_wizard.js +365,We sell this Item,Ми продаємо цей пункт
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +65,Supplier Id,Постачальник Id
 DocType: Journal Entry,Cash Entry,Грошові запис
 DocType: Sales Partner,Contact Desc,Зв&#39;язатися Опис вироби
@@ -3026,18 +2900,16 @@
 DocType: Brand,Item Manager,Стан менеджер
 DocType: Cost Center,Add rows to set annual budgets on Accounts.,"Додати рядки, щоб встановити щорічні бюджети на рахунках."
 DocType: Buying Settings,Default Supplier Type,За замовчуванням Тип Постачальник
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +160,Quarrying,Кар&#39;єр
 DocType: Production Order,Total Operating Cost,Загальна експлуатаційна вартість
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +160,Note: Item {0} entered multiple times,Примітка: Пункт {0} введений кілька разів
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +163,Note: Item {0} entered multiple times,Примітка: Пункт {0} введений кілька разів
 apps/erpnext/erpnext/config/crm.py +27,All Contacts.,Всі контакти.
 DocType: Newsletter,Test Email Id,Тест Email ID
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +394,Company Abbreviation,Абревіатура Компанія
+apps/erpnext/erpnext/public/js/setup_wizard.js +142,Company Abbreviation,Абревіатура Компанія
 DocType: Features Setup,If you follow Quality Inspection. Enables Item QA Required and QA No in Purchase Receipt,Якщо ви будете слідувати контроль якості. Дозволяє предмета потрібно і QA QA Товар отриманні покупки
 DocType: GL Entry,Party Type,Тип партія
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +68,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,Не так Authroized {0} перевищує межі
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +30,Rotational molding,Ротаційного формування
 apps/erpnext/erpnext/config/hr.py +115,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,Встановіть Податковий Правило кошику
@@ -3051,15 +2923,15 @@
 apps/erpnext/erpnext/config/selling.py +18,Quotes to Leads or Customers.,Котирування на постачанні або клієнтів.
 DocType: Stock Settings,Role Allowed to edit frozen stock,Роль тварин редагувати заморожені акції
 ,Territory Target Variance Item Group-Wise,Територія Цільова Різниця Пункт Група Мудрий
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +101,All Customer Groups,Всі групи покупців
-apps/erpnext/erpnext/controllers/accounts_controller.py +474,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,"{0} є обов&#39;язковим. Може бути, Обмін валюти запис не створена для {1} до {2}."
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +101,All Customer Groups,Всі групи покупців
+apps/erpnext/erpnext/controllers/accounts_controller.py +475,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,"{0} є обов&#39;язковим. Може бути, Обмін валюти запис не створена для {1} до {2}."
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +37,Tax Template is mandatory.,Податковий шаблону є обов&#39;язковим.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +41,Account {0}: Parent account {1} does not exist,Рахунок {0}: Батько не існує обліковий запис {1}
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Ціни Оцінити (Компанія валют)
 DocType: Account,Temporary,Тимчасовий
 DocType: Address,Preferred Billing Address,Перевага платіжний адреса
 DocType: Monthly Distribution Percentage,Percentage Allocation,Відсоток Розподіл
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +86,Secretary,Секретар
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Secretary,Секретар
 DocType: Serial No,Distinct unit of an Item,Окремий підрозділ в пункті
 DocType: Pricing Rule,Buying,Купівля
 DocType: HR Settings,Employee Records to be created by,"Співробітник звіти, які будуть створені"
@@ -3072,7 +2944,6 @@
 ,Item-wise Price List Rate,Пункт мудрий Ціни Оцінити
 DocType: Purchase Order Item,Supplier Quotation,Постачальник цитати
 DocType: Quotation,In Words will be visible once you save the Quotation.,"За словами будуть видні, як тільки ви збережете цитати."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +68,Ironing,По прасуванню одягу
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is stopped,{0} {1} зупинений
 DocType: Lead,Add to calendar on this date,Додати в календар в цей день
 apps/erpnext/erpnext/config/selling.py +132,Rules for adding shipping costs.,Правила для додавання транспортні витрати.
@@ -3082,27 +2953,25 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +27,Quick Entry,Швидкий доступ
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0} є обов&#39;язковим для повернення
 DocType: Purchase Order,To Receive,Отримати
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +33,Shrink fitting,Термозбіжна Місце
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +522,user@example.com,user@example.com
+apps/erpnext/erpnext/public/js/setup_wizard.js +266,user@example.com,user@example.com
 DocType: Email Digest,Income / Expense,Доходи / витрати
 DocType: Employee,Personal Email,Особиста пошта
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +58,Total Variance,Всього Різниця
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +62,Total Variance,Всього Різниця
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.","Якщо опція включена, то система буде відправляти бухгалтерських проводок з інвентаризації автоматично."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +15,Brokerage,Брокерська діяльність
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +15,Brokerage,Брокерська діяльність
 DocType: Address,Postal Code,Поштовий індекс
 DocType: Production Order Operation,"in Minutes
 Updated via 'Time Log'",у хвилинах Оновлене допомогою &#39;Час Вхід &quot;
 DocType: Customer,From Lead,Зі свинцю
 apps/erpnext/erpnext/config/manufacturing.py +19,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 +442,POS Profile required to make POS Entry,"POS-профілю потрібно, щоб зробити запис POS"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +444,POS Profile required to make POS Entry,"POS-профілю потрібно, щоб зробити запис POS"
 DocType: Hub Settings,Name Token,Ім&#39;я маркера
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +106,Planing,Стругання
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Selling,Стандартний Продаж
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +120,Standard Selling,Стандартний Продаж
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +137,Atleast one warehouse is mandatory,Принаймні одне склад є обов&#39;язковим
 DocType: Serial No,Out of Warranty,З гарантії
 DocType: BOM Replace Tool,Replace,Замінювати
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +314,{0} against Sales Invoice {1},{0} проти накладна {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +316,{0} against Sales Invoice {1},{0} проти накладна {1}
 apps/erpnext/erpnext/stock/doctype/item/item.py +49,Please enter default Unit of Measure,"Будь ласка, введіть замовчуванням Одиниця виміру"
 DocType: Purchase Invoice Item,Project Name,Назва проекту
 DocType: Supplier,Mention if non-standard receivable account,Згадка якщо нестандартна заборгованість рахунок
@@ -3118,9 +2987,8 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,Journal Entry {0} does not have account {1} or already matched against other voucher,Запис у щоденнику {0} не має облікового запису {1} ​​або вже порівнюється з іншою ваучер
 DocType: Item,Moving Average,Moving Average
 DocType: BOM Replace Tool,The BOM which will be replaced,"Специфікації, які будуть замінені"
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +43,New Stock UOM must be different from current stock UOM,Новий зі Одиниця виміру повинен відрізнятися від поточного запасу Одиниця виміру
 DocType: Account,Debit,Дебет
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +34,Leaves must be allocated in multiples of 0.5,"Листя повинні бути виділені в упаковці 0,5"
+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/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,Видатний Amt
@@ -3138,8 +3006,7 @@
 DocType: Employee,Internal Work History,Внутрішня Історія роботи
 DocType: DocField,Column Break,Розрив стовпця
 DocType: Event,Thursday,Четвер
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +42,Private Equity,Private Equity
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +93,Turning,Звертаючись
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,Private Equity
 DocType: Maintenance Visit,Customer Feedback,Зворотній зв&#39;язок з клієнтами
 DocType: Account,Expense,Витрати
 DocType: Sales Invoice,Exhibition,Виставка
@@ -3152,19 +3019,19 @@
 DocType: Employee,Held On,Відбудеться
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +33,Production Item,Виробництво товару
 ,Employee Information,Співробітник Інформація
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,Rate (%),Ставка (%)
+apps/erpnext/erpnext/public/js/setup_wizard.js +294,Rate (%),Ставка (%)
 DocType: Stock Entry Detail,Additional Cost,Додаткова вартість
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +407,Financial Year End Date,Фінансовий рік Дата закінчення
+apps/erpnext/erpnext/public/js/setup_wizard.js +155,Financial Year End Date,Фінансовий рік Дата закінчення
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Voucher No, if grouped by Voucher","Не можете фільтрувати на основі Сертифікати Ні, якщо згруповані по Ваучер"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +484,Make Supplier Quotation,Зробити постачальників цитати
 DocType: Quality Inspection,Incoming,Вхідний
 DocType: BOM,Materials Required (Exploded),"Матеріалів, необхідних (в розібраному)"
 DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),Скорочення Заробіток для відпустки без збереження (LWP)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +512,"Add users to your organization, other than yourself","Додайте користувачів у вашій організації, крім себе"
+apps/erpnext/erpnext/public/js/setup_wizard.js +256,"Add users to your organization, other than yourself","Додайте користувачів у вашій організації, крім себе"
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No {1} does not match with {2} {3},"Ряд # {0}: Серійний номер {1}, не відповідає {2} {3}"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +44,Casual Leave,Повсякденне Залишити
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +44,Casual Leave,Повсякденне Залишити
 DocType: Batch,Batch ID,Пакетна ID
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +334,Note: {0},Примітка: {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +336,Note: {0},Примітка: {0}
 ,Delivery Note Trends,Накладний Тенденції
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +104,This Week's Summary,Резюме цього тижня
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +74,{0} must be a Purchased or Sub-Contracted Item in row {1},{0} повинен бути куплені або субпідрядником товару в рядку {1}
@@ -3176,7 +3043,7 @@
 DocType: Purchase Receipt,Return Against Purchase Receipt,Повернутися Проти покупки отриманні
 DocType: Purchase Order,To Bill,Для Білла
 DocType: Material Request,% Ordered,Замовив%
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +61,Piecework,Відрядна робота
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Piecework,Відрядна робота
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +64,Avg. Buying Rate,СР Купівля Оцінити
 DocType: Task,Actual Time (in Hours),Фактичний час (в годинах)
 DocType: Employee,History In Company,Історія У Компанії
@@ -3193,13 +3060,13 @@
 DocType: Opportunity,To Discuss,Обговорити
 DocType: SMS Settings,SMS Settings,Налаштування SMS
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +60,Temporary Accounts,Тимчасові рахунки
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +155,Black,Чорний
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Black,Чорний
 DocType: BOM Explosion Item,BOM Explosion Item,Специфікація Вибух товару
 DocType: Account,Auditor,Аудитор
 DocType: Purchase Order,End date of current order's period,Дата закінчення періоду поточного замовлення
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +17,Make Offer Letter,Зробити пропозицію лист
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +10,Return,Повернення
-apps/erpnext/erpnext/stock/doctype/item/item.py +503,Default Unit of Measure for Variant must be same as Template,"За замовчуванням Одиниця виміру для варіанту повинні бути такими ж, як шаблон"
+apps/erpnext/erpnext/stock/doctype/item/item.py +507,Default Unit of Measure for Variant must be same as Template,"За замовчуванням Одиниця виміру для варіанту повинні бути такими ж, як шаблон"
 DocType: DocField,Fold,Скласти
 DocType: Production Order Operation,Production Order Operation,Виробництво Порядок роботи
 DocType: Pricing Rule,Disable,Відключити
@@ -3210,13 +3077,12 @@
 DocType: Page,Page Name,Сторінку
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +110,To Time must be greater than From Time,"Часу повинен бути більше, ніж від часу"
 DocType: Journal Entry Account,Exchange Rate,Курс валюти
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +465,Sales Order {0} is not submitted,Продажі Замовити {0} не представлено
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +467,Sales Order {0} is not submitted,Продажі Замовити {0} не представлено
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0}: Parent account {1} does not bolong to the company {2},Склад {0}: Батьки рахунку {1} ​​НЕ Bolong компанії {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +124,Spindle finishing,Шпиндель обробка
 DocType: BOM,Last Purchase Rate,Остання Купівля Оцінити
 DocType: Account,Asset,Актив
 DocType: Project Task,Task ID,Завдання ID
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +395,"e.g. ""MC""","наприклад, &quot;МК&quot;"
+apps/erpnext/erpnext/public/js/setup_wizard.js +143,"e.g. ""MC""","наприклад, &quot;МК&quot;"
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,Stock cannot exist for Item {0} since has variants,"Фото не може існувати Пункт {0}, так як має варіанти"
 ,Sales Person-wise Transaction Summary,Продажі Людина-мудрий Резюме угода
 DocType: System Settings,Time Zone,Часовий пояс
@@ -3225,9 +3091,7 @@
 DocType: Monthly Distribution,Monthly Distribution Percentages,Щомісячні Відсотки розподілу
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +16,The selected item cannot have Batch,Обраний елемент не може мати Batch
 DocType: Delivery Note,% of materials delivered against this Delivery Note,% Матеріалів поставляється на цьому накладної
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +151,Stapling,Зшивання
 DocType: Customer,Customer Details,Реквізити клієнта
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +105,Shaping,Формування
 DocType: Employee,Reports to,Доповіді
 DocType: SMS Settings,Enter url parameter for receiver nos,Введіть URL параметр для приймача ДАІ
 DocType: Sales Invoice,Paid Amount,Виплачена сума
@@ -3236,13 +3100,13 @@
 DocType: Item Variant,Item Variant,Пункт Варіант
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +15,Setting this Address Template as default as there is no other default,"Установка цього Адреса шаблон за замовчуванням, оскільки немає ніякого іншого замовчуванням"
 apps/erpnext/erpnext/accounts/doctype/account/account.py +89,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Баланс рахунку в дебет вже, ви не можете встановити &quot;баланс повинен бути&quot;, як &quot;Кредит»"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +76,Quality Management,Управління якістю
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Quality Management,Управління якістю
 DocType: Production Planning Tool,Filter based on customer,Фільтр на основі клієнта
 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}"
 DocType: Employee External Work History,Employee External Work History,Співробітник зовнішньої роботи Історія
 DocType: Tax Rule,Purchase,Купівля
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +34,Balance Qty,Баланс Кількість
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Balance Qty,Баланс Кількість
 DocType: Item Group,Parent Item Group,Батько товару Група
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +21,{0} for {1},{0} для {1}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +96,Cost Centers,МВЗ
@@ -3252,12 +3116,12 @@
 DocType: Opportunity,Next Contact,Наступна Контактні
 DocType: Employee,Employment Type,Вид зайнятості
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,Основні активи
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +84,Application period cannot be across two alocation records,Термін подачі заяв не може бути з двох alocation записів
 DocType: Item Group,Default Expense Account,За замовчуванням Витрати аккаунт
 DocType: Employee,Notice (days),Примітка (днів)
 DocType: Page,Yes,Так
 DocType: Tax Rule,Sales Tax Template,Податок з продажу шаблону
 DocType: Employee,Encashment Date,Інкасація Дата
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +74,Electroforming,Гальванопластика
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +179,"Against Voucher Type must be one of Purchase Order, Purchase Invoice or Journal Entry","На ваучері Тип повинен бути одним із Замовлення, накладна або журнал запис"
 DocType: Account,Stock Adjustment,Фото Регулювання
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +34,Default Activity Cost exists for Activity Type - {0},За замовчуванням активність Вартість існує для виду діяльності - {0}
@@ -3293,12 +3157,12 @@
 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,Розподіл
 apps/erpnext/erpnext/public/js/pos/pos.html +36,Amount Paid,Виплачувана сума
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +91,Project Manager,Керівник проекту
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +72,Dispatch,Відправка
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Project Manager,Керівник проекту
+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: Customer,Default Taxes and Charges,За замовчуванням Податки і збори
 DocType: Account,Receivable,Дебіторська заборгованість
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +268,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,Ряд # {0}: Чи не дозволено змінювати Постачальник як вже існує замовлення
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +263,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.","Якщо відзначене, специфікації на південь від складання деталей будуть розглядатися на отримання сировини. В іншому випадку, всі елементи під-монтажні буде розглядатися в якості сировинного матеріалу."
@@ -3306,8 +3170,8 @@
 DocType: Hub Settings,Seller Description,Продавець Опис
 DocType: Employee Education,Qualification,Кваліфікація
 DocType: Item Price,Item Price,Ціна товару
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +48,Soap & Detergent,Мило і миючих засобів
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +36,Motion Picture & Video,Кінофільм &amp; Відео
+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,Кінофільм &amp; Відео
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Упорядкований
 DocType: Warehouse,Warehouse Name,Склад Ім&#39;я
 DocType: Naming Series,Select Transaction,Виберіть угода
@@ -3316,7 +3180,6 @@
 DocType: BOM,Rate Of Materials Based On,Оцінити матеріалів на основі
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,Підтримка Analtyics
 apps/erpnext/erpnext/accounts/doctype/accounts_settings/accounts_settings.py +27,Company is missing in warehouses {0},Компанія на складах не вистачає {0}
-DocType: Stock UOM Replace Utility,Stock UOM Replace Utility,Фото Одиниця виміру Замінити Utility
 DocType: POS Profile,Terms and Conditions,Правила та умови
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,To Date should be within the Fiscal Year. Assuming To Date = {0},Для Дата повинна бути в межах фінансового року. Припускаючи Дата = {0}
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","Тут ви можете зберегти зріст, вага, алергії, медичні проблеми і т.д."
@@ -3328,7 +3191,7 @@
 DocType: Sales Order Item,For Production,Для виробництва
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +103,Please enter sales order in the above table,"Будь ласка, введіть замовлення клієнта в таблиці вище"
 DocType: Project Task,View Task,Подивитися Завдання
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +406,Your financial year begins on,Ваш фінансовий рік починається
+apps/erpnext/erpnext/public/js/setup_wizard.js +154,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: Email Digest,Add/Remove Recipients,Додати / Видалити Одержувачів
@@ -3336,16 +3199,14 @@
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","Щоб встановити цей фінансовий рік, за замовчуванням, натисніть на кнопку &quot;Встановити за замовчуванням&quot;"
 apps/erpnext/erpnext/config/support.py +54,Setup incoming server for support email id. (e.g. support@example.com),"Налаштування сервера вхідної в підтримку електронний ідентифікатор. (наприклад, 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 +528,Item variant {0} exists with same attributes,Стан варіант {0} існує з тими ж атрибутами
+apps/erpnext/erpnext/stock/doctype/item/item.py +532,Item variant {0} exists with same attributes,Стан варіант {0} існує з тими ж атрибутами
 DocType: Salary Slip,Salary Slip,Зарплата ковзання
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +116,Burnishing,Полірувальний
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +54,'To Date' is required,&quot;Для Дата&quot; потрібно
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,&quot;Для Дата&quot; потрібно
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","Створення пакувальні листи для упаковки повинні бути доставлені. Використовується для повідомлення номер пакету, вміст пакету і його вага."
 DocType: Sales Invoice Item,Sales Order Item,Продажі замовлення Продукт
 DocType: Salary Slip,Payment Days,Дні оплати
 DocType: BOM,Manage cost of operations,Управління вартість операцій
 DocType: Features Setup,Item Advanced,Пункт Розширений
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +40,Hot rolling,Гаряча прокатка
 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.","Коли будь-який з перевірених угод &quot;Передано&quot;, електронною поштою спливаюче автоматично відкривається, щоб відправити лист у відповідний &quot;Контакт&quot; в цій транзакції, з угоди ролі вкладення. Користувач може або не може відправити по електронній пошті."
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,Глобальні налаштування
 DocType: Employee Education,Employee Education,Співробітник Освіта
@@ -3358,25 +3219,23 @@
 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/setup/page/setup_wizard/install_fixtures.py +48,Sick Leave,Лікарняний
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +174,Invalid {0},Невірний {0}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +48,Sick Leave,Лікарняний
 DocType: Email Digest,Email Digest,E-mail Дайджест
 DocType: Delivery Note,Billing Address Name,Платіжний адреса Ім&#39;я
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +22,Department Stores,Універмаги
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,Універмаги
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +40,System Balance,Система Баланс
 DocType: Workflow,Is Active,Активний
 apps/erpnext/erpnext/controllers/stock_controller.py +71,No accounting entries for the following warehouses,Немає бухгалтерських записів для наступних складів
 apps/erpnext/erpnext/projects/doctype/project/project.js +22,Save the document first.,Зберегти документ у першу чергу.
 DocType: Account,Chargeable,Оплаті
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +121,Linishing,Linishing
 DocType: Company,Change Abbreviation,Змінити Абревіатура
 DocType: Workflow State,Primary,Основний
 DocType: Expense Claim Detail,Expense Date,Витрати Дата
 DocType: Item,Max Discount (%),Макс Знижка (%)
 DocType: Communication,More Information,Більше інформації
 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/setup/page/setup_wizard/fixtures/operations.py +161,Blasting,Вибухові роботи
 DocType: Company,Warn,Попереджати
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +111,Item valuation updated,Стан оцінка оновлюються
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Будь-які інші зауваження, відзначити зусилля, які повинні йти в записах."
 DocType: BOM,Manufacturing User,Виробництво користувача
 DocType: Purchase Order,Raw Materials Supplied,Сировина постачається
@@ -3386,7 +3245,7 @@
 DocType: Appraisal,Appraisal Template,Оцінка шаблону
 DocType: Communication,Email,E-mail
 DocType: Item Group,Item Classification,Пункт Класифікація
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +89,Business Development Manager,менеджер з розвитку бізнесу
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Business Development Manager,менеджер з розвитку бізнесу
 DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,Технічне обслуговування Мета візиту
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.js +15,Period,Період
 ,General Ledger,Головна бухгалтерська книга
@@ -3396,9 +3255,7 @@
 ,Itemwise Recommended Reorder Level,Itemwise Рекомендуємо Змінити порядок Рівень
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +264,Please select {0} first,"Будь ласка, виберіть {0} в першу чергу"
 DocType: Features Setup,To get Item Group in details table,Щоб отримати елемент групи в таблиці дані
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +67,Redrawing,Перемальовування
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +112,Batch {0} of Item {1} has expired.,Пакетна {0} пункту {1} ​​закінчився.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +120,Etching,Травлення
 DocType: Sales Invoice,Commission,Комісія
 DocType: Address Template,"<h4>Default Template</h4>
 <p>Uses <a href=""http://jinja.pocoo.org/docs/templates/"">Jinja Templating</a> and all the fields of Address (including Custom Fields if any) will be available</p>
@@ -3432,7 +3289,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +340,Operation Time must be greater than 0 for Operation {0},"Час роботи повинно бути більше, ніж 0 для операції {0}"
 DocType: Supplier,Address and Contacts,Адреса та контакти
 DocType: UOM Conversion Detail,UOM Conversion Detail,Одиниця виміру Перетворення Деталь
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +496,Keep it web friendly 900px (w) by 100px (h),Тримайте це веб-дружній 900px (W) по 100px (ч)
+apps/erpnext/erpnext/public/js/setup_wizard.js +242,Keep it web friendly 900px (w) by 100px (h),Тримайте це веб-дружній 900px (W) по 100px (ч)
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +329,Production Order cannot be raised against a Item Template,Виробничий замовлення не може бути піднято проти Item Шаблон
 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,Отримати Видатні Ваучери
@@ -3448,54 +3305,49 @@
 DocType: Item,Average time taken by the supplier to deliver,"Середній час прийняті постачальником, щоб доставити"
 DocType: Time Log,Hours,Часів
 DocType: Project,Expected Start Date,Очікувана дата початку
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +38,Rolling,Рухомий
 DocType: ToDo,Priority,Пріоритет
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +41,Remove item if charges is not applicable to that item,"Видалити елемент, якщо звинувачення не застосовується до цього пункту"
 DocType: Dropbox Backup,Dropbox Access Allowed,Дозволено Dropbox доступу
 DocType: Dropbox Backup,Weekly,Щотижня
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,"Напр., smsgateway.com/api/send_sms.cgi"
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +485,Receive,Отримати
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +510,Receive,Отримати
 DocType: Maintenance Visit,Fully Completed,Повністю завершено
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% Повний
 DocType: Employee,Educational Qualification,Освітня кваліфікація
 DocType: Workstation,Operating Costs,Експлуатаційні витрати
 DocType: Employee Leave Approver,Employee Leave Approver,Співробітник Залишити затверджує
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,{0} has been successfully added to our Newsletter list.,{0} був успішно доданий в нашу розсилку.
-apps/erpnext/erpnext/stock/doctype/item/item.py +383,Row {0}: An Reorder entry already exists for this warehouse {1},Ряд {0}: Змінити порядок вступу вже існує для цього складу {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +387,Row {0}: An Reorder entry already exists for this warehouse {1},Ряд {0}: Змінити порядок вступу вже існує для цього складу {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +67,"Cannot declare as lost, because Quotation has been made.","Не можете оголосити як втрачений, бо цитати був зроблений."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +133,Electron beam machining,Електронно-променева обробка
 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 +150,Please select Start Date and End Date for Item {0},"Будь ласка, виберіть дату початку та дату закінчення Пункт {0}"
 apps/erpnext/erpnext/config/stock.py +141,Main Reports,Основні доповіді
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +102,Stock Ledger entries balances updated,Фото Леджер записів залишки оновлюються
 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 +176,Add / Edit Prices,Додати / Редагувати Ціни
+apps/erpnext/erpnext/stock/doctype/item/item.js +178,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 +298,My Orders,Мої Замовлення
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +293,My Orders,Мої Замовлення
 DocType: Price List,Price List Name,Ціна Ім&#39;я
 DocType: Time Log,For Manufacturing,Для виготовлення
-apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +70,Totals,Загальні дані
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +174,Totals,Загальні дані
 DocType: BOM,Manufacturing,Виробництво
 ,Ordered Items To Be Delivered,Замовлені товари повинні бути доставлені
 DocType: Account,Income,Дохід
 ,Setup Wizard,Майстер установки
 DocType: Industry Type,Industry Type,Промисловість Тип
 apps/erpnext/erpnext/templates/includes/cart.js +137,Something went wrong!,Щось пішло не так!
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +68,Warning: Leave application contains following block dates,Увага: Залиште додаток містить наступні дати блок
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +251,Sales Invoice {0} has already been submitted,Видаткова накладна {0} вже були представлені
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +100,Warning: Leave application contains following block dates,Увага: Залиште додаток містить наступні дати блок
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +256,Sales Invoice {0} has already been submitted,Видаткова накладна {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/setup/page/setup_wizard/fixtures/operations.py +10,Die casting,Лиття під тиском
 DocType: Email Alert,Reference Date,Посилання Дата
 apps/erpnext/erpnext/config/hr.py +105,Organization unit (department) master.,Організація блок (департамент) господар.
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +25,Please enter valid mobile nos,"Будь ласка, введіть дійсні мобільних NOS"
 DocType: Budget Detail,Budget Detail,Бюджет Подробиці
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +75,Please enter message before sending,"Будь ласка, введіть повідомлення перед відправкою"
 DocType: Async Task,Status,Статус
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +65,Stock UOM updated for Item {0},Фото Одиниця виміру оновлюється Пункт {0}
 DocType: Company History,Year,Рік
 apps/erpnext/erpnext/config/accounts.py +127,Point-of-Sale Profile,Точка-в-продажу Профіль
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +68,Please Update SMS Settings,Оновіть SMS Налаштування
@@ -3509,12 +3361,12 @@
 ,Serial No Service Contract Expiry,Серійний номер Сервіс контракт Термін
 DocType: Item,Unit of Measure Conversion,Одиниця виміру конверсії
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +86,Employee can not be changed,Співробітник не може бути змінений
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +259,You cannot credit and debit same account at the same time,Ви не можете кредитні та дебетові ж обліковий запис в той же час
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,You cannot credit and debit same account at the same time,Ви не можете кредитні та дебетові ж обліковий запис в той же час
 DocType: Naming Series,Help HTML,Допомога HTML
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},Всього weightage призначений повинна бути 100%. Це {0}
 apps/erpnext/erpnext/controllers/status_updater.py +140,Allowance for over-{0} crossed for Item {1},Посібник для пере- {0} схрещеними Пункт {1}
 DocType: Address,Name of person or organization that this address belongs to.,"Назва особі або організації, що ця адреса належить."
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +587,Your Suppliers,Ваші Постачальники
+apps/erpnext/erpnext/public/js/setup_wizard.js +325,Your Suppliers,Ваші Постачальники
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,"Неможливо встановити, як втратив у продажу замовлення провадиться."
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +65,Another Salary Structure {0} is active for employee {1}. Please make its status 'Inactive' to proceed.,"Інший Зарплата Структура {0} активним співробітником {1}. Будь ласка, його статус «Неактивний», щоб продовжити."
 DocType: Purchase Invoice,Contact,Контакт
@@ -3523,37 +3375,35 @@
 DocType: Item,Has Serial No,Має серійний номер
 DocType: Employee,Date of Issue,Дата випуску
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +16,{0}: From {0} for {1},{0}: З {0} для {1}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +154,Row #{0}: Set Supplier for item {1},Ряд # {0}: Встановити Постачальник по пункту {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +149,Row #{0}: Set Supplier for item {1},Ряд # {0}: Встановити Постачальник по пункту {1}
 DocType: Issue,Content Type,Тип вмісту
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +17,Computer,Комп&#39;ютер
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,Комп&#39;ютер
 DocType: Item,List this Item in multiple groups on the website.,Список цей пункт в декількох групах на сайті.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +283,Please check Multi Currency option to allow accounts with other currency,"Будь ласка, перевірте мультивалютний варіант, що дозволяє рахунки іншій валюті"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +285,Please check Multi Currency option to allow accounts with other currency,"Будь ласка, перевірте мультивалютний варіант, що дозволяє рахунки іншій валюті"
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +62,Item: {0} does not exist in the system,Пункт: {0} не існує в системі
 apps/erpnext/erpnext/accounts/doctype/account/account.py +81,You are not authorized to set Frozen value,"Ви не авторизовані, щоб встановити значення Frozen"
 DocType: Payment Reconciliation,Get Unreconciled Entries,Отримати Неузгоджені Записи
 DocType: Cost Center,Budgets,Бюджети
 apps/frappe/frappe/core/page/modules_setup/modules_setup.py +11,Updated,Оновлений
 DocType: Employee,Emergency Contact Details,Аварійний Контактні дані
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +396,What does it do?,Що це робить?
+apps/erpnext/erpnext/public/js/setup_wizard.js +144,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,Середня ставка комісії
-apps/erpnext/erpnext/stock/doctype/item/item.py +313,'Has Serial No' can not be 'Yes' for non-stock item,&quot;Має серійний номер &#39;не може бути&#39; Так &#39;для не-фондовій пункту
+apps/erpnext/erpnext/stock/doctype/item/item.py +317,'Has Serial No' can not be 'Yes' for non-stock item,&quot;Має серійний номер &#39;не може бути&#39; Так &#39;для не-фондовій пункту
 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/setup/page/setup_wizard/install_fixtures.py +111,Electrical,Електричний
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +111,Electrical,Електричний
 DocType: Stock Entry,Total Value Difference (Out - In),Загальна вартість Різниця (з - In)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +302,Row {0}: Exchange Rate is mandatory,Ряд {0}: Курс є обов&#39;язковим
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +304,Row {0}: Exchange Rate is mandatory,Ряд {0}: Курс є обов&#39;язковим
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},Ідентифікатор користувача не встановлений Employee {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +72,Peening,Зміцнення
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,From Warranty Claim,Від гарантії Претензії
 DocType: Stock Entry,Default Source Warehouse,Джерело за замовчуванням Склад
 DocType: Item,Customer Code,Код клієнта
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +212,Birthday Reminder for {0},Нагадування про день народження для {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +163,Lapping,Притирання
-apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.js +8,Days Since Last Order,Дні з останнього ордена
+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 +299,Debit To account must be a Balance Sheet account,Дебетом рахунка повинні бути баланс рахунку
 DocType: Buying Settings,Naming Series,Іменування серії
 DocType: Leave Block List,Leave Block List Name,Залиште Ім&#39;я Чорний список
@@ -3566,7 +3416,7 @@
 DocType: Notification Control,Sales Invoice Message,Рахунок по продажах повідомлення
 DocType: Authorization Rule,Based On,Грунтуючись на
 DocType: Sales Order Item,Ordered Qty,Замовив Кількість
-apps/erpnext/erpnext/stock/doctype/item/item.py +539,Item {0} is disabled,Пункт {0} відключена
+apps/erpnext/erpnext/stock/doctype/item/item.py +543,Item {0} is disabled,Пункт {0} відключена
 DocType: Stock Settings,Stock Frozen Upto,Фото Заморожені Upto
 apps/erpnext/erpnext/controllers/recurring_document.py +166,Period From and Period To dates mandatory for recurring {0},Період з Період і датам обов&#39;язкових для повторюваних {0}
 apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,Проектна діяльність / завдання.
@@ -3576,7 +3426,6 @@
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,"Знижка повинна бути менше, ніж 100"
 DocType: ToDo,Low,Низький
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Списання Сума (Компанія валют)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +71,Spinning,Спінінг
 DocType: Landed Cost Voucher,Landed Cost Voucher,Приземлився Вартість ваучера
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +55,Please set {0},"Будь ласка, встановіть {0}"
 DocType: Purchase Invoice,Repeat on Day of Month,Повторіть день місяця
@@ -3598,7 +3447,6 @@
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +37,Campaign Name is required,Назва кампанії потрібно
 DocType: Maintenance Visit,Maintenance Date,Технічне обслуговування Дата
 DocType: Purchase Receipt Item,Rejected Serial No,Відхилено Серійний номер
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +51,Deep drawing,Глибокий малюнок
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +40,New Newsletter,Новий бюлетень
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +157,Start date should be less than end date for Item {0},"Дата початку повинна бути менше, ніж дата закінчення Пункт {0}"
 apps/erpnext/erpnext/stock/doctype/item/item.js +17,Show Balance,Показати Баланс
@@ -3608,7 +3456,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +119,BOM and Manufacturing Quantity are required,Специфікація і виробництво Кількість потрібні
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Старіння Діапазон 2
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +450,Amount,Кількість
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +147,Riveting,Клепка
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,Специфікація замінити
 ,Sales Analytics,Продажі Аналітика
 DocType: Manufacturing Settings,Manufacturing Settings,Налаштування Виробництво
@@ -3620,20 +3467,19 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +207,New Account Name,Новий акаунт Ім&#39;я
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,Сировина постачається Вартість
 DocType: Selling Settings,Settings for Selling Module,Налаштування для модуля Продаж
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +73,Customer Service,Обслуговування клієнтів
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Customer Service,Обслуговування клієнтів
 DocType: Item,Thumbnail,Мініатюра
 DocType: Item Customer Detail,Item Customer Detail,Пункт Подробиці клієнтів
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +147,Confirm Your Email,Підтвердіть Ваш E-mail
 apps/erpnext/erpnext/config/hr.py +53,Offer candidate a Job.,Пропозиція кандидата на роботу.
 DocType: Notification Control,Prompt for Email on Submission of,Запитувати Email про подання
+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 +70,Item {0} must be a stock Item,Пункт {0} повинен бути запас товару
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,За замовчуванням роботи на складі Прогрес
 apps/erpnext/erpnext/config/accounts.py +107,Default settings for accounting transactions.,Налаштування за замовчуванням для обліку операцій.
 apps/frappe/frappe/model/naming.py +40,{0} is required,{0} вимагається
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +21,Vacuum molding,Вакуумного формування
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,Очікувана дата не може бути перед матеріалу Запит Дата
 DocType: Contact Us Settings,City,Місто
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +132,Ultrasonic machining,Ультразвукової обробки
 apps/frappe/frappe/templates/base.html +137,Error: Not a valid id?,Помилка: Чи не діє ID?
 apps/erpnext/erpnext/stock/get_item_details.py +125,Item {0} must be a Sales Item,Пункт {0} повинен бути Продажі товару
 DocType: Naming Series,Update Series Number,Оновлення Кількість Серія
@@ -3641,7 +3487,7 @@
 DocType: Sales Order,Printing Details,Друк Подробиці
 DocType: Task,Closing Date,Дата закриття
 DocType: Sales Order Item,Produced Quantity,Здобуте кількість
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +84,Engineer,Інженер
+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,Пошук Sub Асамблей
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +379,Item Code required at Row No {0},Код товара потрібно в рядку Немає {0}
 DocType: Sales Partner,Partner Type,Тип Партнер
@@ -3649,7 +3495,7 @@
 DocType: Authorization Rule,Customerwise Discount,Customerwise Знижка
 DocType: Purchase Invoice,Against Expense Account,На рахунки витрат
 DocType: Production Order,Production Order,Виробничий замовлення
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +258,Installation Note {0} has already been submitted,Установка Примітка {0} вже були представлені
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +263,Installation Note {0} has already been submitted,Установка Примітка {0} вже були представлені
 DocType: Quotation Item,Against Docname,На DOCNAME
 DocType: SMS Center,All Employee (Active),Всі Співробітник (Активний)
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,Дивитися зараз
@@ -3658,19 +3504,19 @@
 DocType: Item,Re-Order Level,Re-Order рівні
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,"Введіть предметів і плановий Кількість, для якого ви хочете, щоб підняти виробничі замовлення або завантажити сировини для аналізу."
 apps/frappe/frappe/public/js/frappe/views/ganttview.js +45,Gantt Chart,Діаграма Ганта
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +57,Part-time,Неповний робочий день
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,Part-time,Неповний робочий день
 DocType: Employee,Applicable Holiday List,Стосується Список відпочинку
 DocType: Employee,Cheque,Чек
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,Серія Оновлене
 apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Report Type is mandatory,Тип звіту є обов&#39;язковим
 DocType: Item,Serial Number Series,Серійний номер серії
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},Склад є обов&#39;язковим для фондового Пункт {0} в рядку {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +45,Retail & Wholesale,Роздрібна та оптова
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,Роздрібна та оптова
 DocType: Issue,First Responded On,По-перше відгукнувся на
 DocType: Website Item Group,Cross Listing of Item in multiple groups,Хрест Лістинг Пункт в декількох групах
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +351,The First User: You,Перший користувача: Ви
+apps/erpnext/erpnext/public/js/setup_wizard.js +101,The First User: You,Перший користувача: Ви
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +48,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 +172,Successfully Reconciled,Успішно Примирення
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +119,Successfully Reconciled,Успішно Примирення
 DocType: Production Order,Planned End Date,Планована Дата закінчення
 apps/erpnext/erpnext/config/stock.py +43,Where items are stored.,Де елементи зберігаються.
 DocType: Tax Rule,Validity,Термін дії
@@ -3690,39 +3536,36 @@
 DocType: DocPerm,Level,Рівень
 DocType: Purchase Taxes and Charges,On Net Total,На Net Total
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +160,Target warehouse in row {0} must be same as Production Order,"Цільова склад у рядку {0} повинен бути такий же, як виробничого замовлення"
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +59,No permission to use Payment Tool,Немає дозволу на використання платіжного інструмента
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +97,No permission to use Payment Tool,Немає дозволу на використання платіжного інструмента
 apps/erpnext/erpnext/controllers/recurring_document.py +192,'Notification Email Addresses' not specified for recurring %s,"&quot;Повідомлення Адреси електронної пошти&quot;, не зазначені для повторюваних% S"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +86,Milling,Фрезерний
 apps/erpnext/erpnext/accounts/doctype/account/account.py +99,Currency can not be changed after making entries using some other currency,"Валюта не може бути змінена після внесення запису, використовуючи інший валюти"
 DocType: Company,Round Off Account,Округлення аккаунт
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +60,Nibbling,Нарізки
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,Адміністративні витрати
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +18,Consulting,Консалтинг
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +18,Consulting,Консалтинг
 DocType: Customer Group,Parent Customer Group,Батько Група клієнтів
 apps/erpnext/erpnext/public/js/pos/pos.js +429,Change,Зміна
 DocType: Purchase Invoice,Contact Email,Контактний Email
 DocType: Appraisal Goal,Score Earned,Оцінка Зароблені
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +393,"e.g. ""My Company LLC""","наприклад, &quot;Моя компанія ТОВ&quot;"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +173,Notice Period,Примітка Період
+apps/erpnext/erpnext/public/js/setup_wizard.js +141,"e.g. ""My Company LLC""","наприклад, &quot;Моя компанія ТОВ&quot;"
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +173,Notice Period,Примітка Період
 DocType: Bank Reconciliation Detail,Voucher ID,Ваучер ID
 apps/erpnext/erpnext/setup/doctype/territory/territory.js +14,This is a root territory and cannot be edited.,Це корінь територія і не можуть бути змінені.
 DocType: Packing Slip,Gross Weight UOM,Вага брутто Одиниця виміру
 DocType: Email Digest,Receivables / Payables,Дебіторська заборгованість Кредиторська заборгованість /
 DocType: Delivery Note Item,Against Sales Invoice,На рахунок продажу
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +63,Stamping,Тиснення
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +457,Credit Account,Рахунок з кредитовим сальдо
 DocType: Landed Cost Item,Landed Cost Item,Приземлився Вартість товару
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +56,Show zero values,Показати нульові значення
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,Кількість пункту отримані після виготовлення / перепакування із заданих кількостях сировини
 DocType: Payment Reconciliation,Receivable / Payable Account,/ Дебіторська заборгованість аккаунт
 DocType: Delivery Note Item,Against Sales Order Item,На Sales Order Пункт
-apps/erpnext/erpnext/stock/doctype/item/item.py +521,Please specify Attribute Value for attribute {0},"Будь ласка, сформулюйте Значення атрибуту для атрибуту {0}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +525,Please specify Attribute Value for attribute {0},"Будь ласка, сформулюйте Значення атрибуту для атрибуту {0}"
 DocType: Item,Default Warehouse,За замовчуванням Склад
 DocType: Task,Actual End Date (via Time Logs),Фактична Дата закінчення (через журнали Time)
 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,Друк без розмірі
-apps/erpnext/erpnext/controllers/buying_controller.py +69,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,"Податковий Категорія не може бути &quot;Оцінка&quot; або &quot;Оцінка і загальне&quot;, як всі елементи, немає в наявності"
+apps/erpnext/erpnext/controllers/buying_controller.py +60,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,"Податковий Категорія не може бути &quot;Оцінка&quot; або &quot;Оцінка і загальне&quot;, як всі елементи, немає в наявності"
 DocType: User,Last Name,Прізвище
 DocType: Web Page,Left,Зліва
 DocType: Event,All Day,Весь день
@@ -3730,7 +3573,7 @@
 DocType: Appraisal,Total Score (Out of 5),Всього балів (з 5)
 DocType: Contact Us Settings,State,Державний
 DocType: Batch,Batch,Партія
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +51,Balance,Баланс
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +28,Balance,Баланс
 DocType: Project,Total Expense Claim (via Expense Claims),Всього витрат претензії (за допомогою витратні Претензії)
 DocType: User,Gender,Стать
 DocType: Journal Entry,Debit Note,Дебет-нота
@@ -3760,8 +3603,7 @@
 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/setup/page/setup_wizard/fixtures/operations.py +76,Seaming,Закачування
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +197,"Company Email ID not found, hence mail not sent","Компанія Email ID не знайдений, отже, пошта не відправлено"
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +206,"Company Email ID not found, hence mail not sent","Компанія Email ID не знайдений, отже, пошта не відправлено"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Застосування засобів (активів)
 DocType: Production Planning Tool,Filter based on item,Фільтр на основі пункту
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +451,Debit Account,Дебетовий рахунок
@@ -3773,17 +3615,16 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +95,{0} {1} has been modified. Please refresh.,"{0} {1} був змінений. Будь ласка, поновіть."
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,Стоп користувачам вносити Залишити додатків на наступні дні.
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +591,From Opportunity,Від можливостей
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +46,Blanking,Гасіння
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +166,Employee Benefits,Виплати працівникам
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,Employee Benefits,Виплати працівникам
 DocType: Sales Invoice,Is POS,Це POS-
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +240,Packed quantity must equal quantity for Item {0} in row {1},Упакування кількість повинна дорівнювати кількість для пункту {0} в рядку {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +245,Packed quantity must equal quantity for Item {0} in row {1},Упакування кількість повинна дорівнювати кількість для пункту {0} в рядку {1}
 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.,"Законопроекти, підняті клієнтам."
 DocType: DocField,Default,Дефолт
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Проект Id
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +466,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},"Ряд Немає {0}: Сума не може бути більше, ніж очікуванні Сума проти Витрата претензії {1}. В очікуванні сума {2}"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +468,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} додав абоненти
 DocType: Maintenance Schedule,Schedule,Графік
 DocType: Cost Center,"Define Budget for this Cost Center. To set budget action, see ""Company List""",Визначити бюджет для цього МВЗ. Щоб встановити бюджету дію см &quot;Список компанії&quot;
@@ -3794,7 +3635,7 @@
 apps/erpnext/erpnext/public/js/pos/pos.js +91,Price List not found or disabled,Ціни не знайдений або відключений
 DocType: Expense Claim,Approved,Затверджений
 DocType: Pricing Rule,Price,Ціна
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +79,Employee relieved on {0} must be set as 'Left',Співробітник звільняється від {0} повинен бути встановлений як &quot;ліві&quot;
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +88,Employee relieved on {0} must be set as 'Left',Співробітник звільняється від {0} повинен бути встановлений як &quot;ліві&quot;
 DocType: Item,"Selecting ""Yes"" will give a unique identity to each entity of this item which can be viewed in the Serial No master.","Вибір &quot;Так&quot; дасть унікальну ідентичність кожного суб&#39;єкта цього пункту, який можна переглянути в серійний номер майстра."
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +39,Appraisal {0} created for Employee {1} in the given date range,Оцінка {0} створений для працівника {1} в зазначений діапазон дат
 DocType: Employee,Education,Освіта
@@ -3805,7 +3646,7 @@
 apps/frappe/frappe/desk/moduleview.py +67,Standard Reports,Стандартні звіти
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,Бухгалтерських журналів.
 DocType: Delivery Note Item,Available Qty at From Warehouse,Доступно Кількість на зі складу
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +209,Please select Employee Record first.,"Будь ласка, виберіть Employee Record перший."
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +224,Please select Employee Record first.,"Будь ласка, виберіть Employee Record перший."
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,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 +233,Please enter Expense Account,"Будь ласка, введіть видатковий рахунок"
@@ -3818,46 +3659,43 @@
 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,Замовлення на продаж Витягніть (до пологів) на основі вищеперелічених критеріїв
 DocType: DocShare,Document Type,Тип документа
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +565,From Supplier Quotation,Від постачальника цитати
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +588,From Supplier Quotation,Від постачальника цитати
 DocType: Deduction Type,Deduction Type,Відрахування Тип
 DocType: Attendance,Half Day,Половина дня
 DocType: Pricing Rule,Min Qty,Мінімальна Кількість
 DocType: Features Setup,"To track items in sales and purchase documents with batch nos. ""Preferred Industry: Chemicals""",Щоб відстежувати елементи в купівлі та продажу документів з пакетних пп. &quot;Переважний Промисловість: Хімія&quot;
 DocType: GL Entry,Transaction Date,Угода Дата
 DocType: Production Plan Item,Planned Qty,Плановані Кількість
-apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +91,Total Tax,Загальні податкові
+apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +93,Total Tax,Загальні податкові
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +178,For Quantity (Manufactured Qty) is mandatory,Для Кількість (Виробник Кількість) є обов&#39;язковим
 DocType: Stock Entry,Default Target Warehouse,Мета за замовчуванням Склад
 DocType: Purchase Invoice,Net Total (Company Currency),Чистий Всього (Компанія валют)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +79,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Ряд {0}: Партія Тип і партія застосовується лише щодо / дебіторська заборгованість рахунок
 DocType: Notification Control,Purchase Receipt Message,Купівля Надходження повідомлення
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +95,Total allocated leaves are more than period,Сумарна кількість виділених листя більш періоду
 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.,Запис руху пункт.
 DocType: Newsletter List Subscriber,Newsletter List Subscriber,Розсилка передплатника
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +164,Morticing,Morticing
 DocType: Email Account,Service,Сервіс
 DocType: Hub Settings,Hub Settings,Налаштування Hub
 DocType: Project,Gross Margin %,Валовий дохід %
 DocType: BOM,With Operations,З операцій
 apps/erpnext/erpnext/accounts/party.py +232,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,"Бухгалтерські вже були зроблені у валюті {0} для компанії {1}. Будь ласка, виберіть дебіторської або кредиторської заборгованості рахунок з валютою {0}."
 ,Monthly Salary Register,Щомісячна зарплата Реєстрація
-apps/frappe/frappe/website/template.py +140,Next,Наступний
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard_page.html +17,Next,Наступний
 DocType: Warranty Claim,If different than customer address,"Якщо відрізняється, ніж адресою замовника"
 DocType: BOM Operation,BOM Operation,Специфікація Операція
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +118,Electropolishing,Електрополіровка
 DocType: Purchase Taxes and Charges,On Previous Row Amount,На Попередня Сума Row
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +24,Please enter Payment Amount in atleast one row,"Будь ласка, введіть Сума платежу в принаймні один ряд"
+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-профілю
 apps/erpnext/erpnext/config/accounts.py +153,"Seasonality for setting budgets, targets etc.","Сезонність для установки бюджети, цільові тощо"
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +238,Row {0}: Payment Amount cannot be greater than Outstanding Amount,"Ряд {0}: Сума платежу не може бути більше, ніж суми заборгованості"
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +46,Total Unpaid,Всього Неоплачений
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +21,Time Log is not billable,Час входу не оплачується
 apps/erpnext/erpnext/stock/get_item_details.py +128,"Item {0} is a template, please select one of its variants","Пункт {0} шаблон, виберіть один з його варіантів"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +528,Purchaser,Покупець
+apps/erpnext/erpnext/public/js/setup_wizard.js +272,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 +71,Please enter the Against Vouchers manually,"Будь ласка, введіть проти Ваучери вручну"
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +107,Please enter the Against Vouchers manually,"Будь ласка, введіть проти Ваучери вручну"
 DocType: SMS Settings,Static Parameters,Статичні параметри
 DocType: Purchase Order,Advance Paid,Попередня Платні
 DocType: Item,Item Tax,Стан податкової
@@ -3866,14 +3704,12 @@
 apps/erpnext/erpnext/config/crm.py +48,Send mass SMS to your contacts,Відправити SMS масового вашим контактам
 DocType: Purchase Taxes and Charges,Consider Tax or Charge for,Розглянемо податку або збору для
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,Фактична Кількість обов&#39;язково
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +42,Cross-rolling,Крос-прокатки
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +132,Credit Card,Кредитна карта
+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 +95,Default settings for stock transactions.,Налаштування за замовчуванням для біржових операцій.
 DocType: Purchase Invoice,Next Date,Наступна дата
 DocType: Employee Education,Major/Optional Subjects,Основні / Додаткові Суб&#39;єкти
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +49,Please enter Taxes and Charges,"Будь ласка, введіть податків і зборів"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +85,Machining,Обробка
 DocType: Sales Invoice Item,Drop Ship,Корабель падіння
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","Тут ви можете зберегти сімейні дані, як ім&#39;я та окупації батька, чоловіка і дітей"
 DocType: Hub Settings,Seller Name,Продавець Ім&#39;я
@@ -3883,7 +3719,7 @@
 DocType: Stock Entry,Repack,Перепакувати
 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/setup/page/setup_wizard/setup_wizard.js +500,Attach Logo,Прикріпіть логотип
+apps/erpnext/erpnext/public/js/setup_wizard.js +246,Attach Logo,Прикріпіть логотип
 DocType: Customer,Commission Rate,Ставка комісії
 apps/erpnext/erpnext/stock/doctype/item/item.js +38,Make Variant,Зробити Variant
 apps/erpnext/erpnext/config/hr.py +145,Block leave applications by department.,Блок відпустки додатки по кафедрі.
@@ -3898,19 +3734,19 @@
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +105,Please select a csv file,"Будь ласка, виберіть файл CSV з"
 DocType: Dropbox Backup,Send Backups to Dropbox,Відправити резервних копій в Dropbox
 DocType: Purchase Order,To Receive and Bill,Для прийому і Білл
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +94,Designer,Дизайнер
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Designer,Дизайнер
 apps/erpnext/erpnext/config/selling.py +121,Terms and Conditions Template,Умови шаблону
 DocType: Serial No,Delivery Details,Деталі Доставка
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +383,Cost Center is required in row {0} in Taxes table for type {1},Вартість Центр потрібно в рядку {0} в таблиці податків для типу {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +386,Cost Center is required in row {0} in Taxes table for type {1},Вартість Центр потрібно в рядку {0} в таблиці податків для типу {1}
 DocType: Item,Automatically create Material Request if quantity falls below this level,"Автоматичне створення матеріалів запит, якщо кількість падає нижче цього рівня,"
 ,Item-wise Purchase Register,Пункт мудрий Купівля Реєстрація
 DocType: Batch,Expiry Date,Термін придатності
-apps/erpnext/erpnext/stock/doctype/item/item.py +375,"To set reorder level, item must be a Purchase Item or Manufacturing Item","Щоб встановити рівень повторного замовлення, деталь повинна бути Купівля товару або товару Виробництво"
+apps/erpnext/erpnext/stock/doctype/item/item.py +379,"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.,Майстер проекту.
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,"Не відображати будь-який символ, як $ і т.д. поряд з валютами."
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +330, (Half Day),(Половина дня)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +374, (Half Day),(Половина дня)
 DocType: Supplier,Credit Days,Кредитні Дні
 DocType: Leave Type,Is Carry Forward,Є переносити
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +478,Get Items from BOM,Отримати елементів із специфікації
@@ -3918,7 +3754,7 @@
 apps/erpnext/erpnext/config/manufacturing.py +120,Bill of Materials,Відомість матеріалів
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +77,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Ряд {0}: Партія Тип і партія необхідна для / дебіторська заборгованість увагу {1}
 DocType: Dropbox Backup,Send Notifications To,Включити повідомлення
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html +26,Ref Date,Посилання Дата
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +54,Ref Date,Посилання Дата
 DocType: Employee,Reason for Leaving,Причина виїзду
 DocType: Expense Claim Detail,Sanctioned Amount,Санкціонований Сума
 DocType: GL Entry,Is Opening,Відкриває
@@ -3926,4 +3762,3 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +188,Account {0} does not exist,Рахунок {0} не існує
 DocType: Account,Cash,Грошові кошти
 DocType: Employee,Short biography for website and other publications.,Коротка біографія для веб-сайту та інших публікацій.
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +31,Please create Salary Structure for employee {0},"Будь ласка, створіть зарплата структури для співробітника {0}"
diff --git a/erpnext/translations/vi.csv b/erpnext/translations/vi.csv
index 81cfd40..8d52fd6 100644
--- a/erpnext/translations/vi.csv
+++ b/erpnext/translations/vi.csv
@@ -1,13 +1,12 @@
 DocType: Employee,Salary Mode,Chế độ tiền lương
 DocType: Cost Center,"Select Monthly Distribution, if you want to track based on seasonality.","Chọn phân phối hàng tháng, nếu bạn muốn theo dõi dựa trên thời vụ."
 DocType: Employee,Divorced,Đa ly dị
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +86,Warning: Same item has been entered multiple times.,Cảnh báo: Cùng một mục đã được nhập nhiều lần.
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +80,Warning: Same item has been entered multiple times.,Cảnh báo: Cùng một mục đã được nhập nhiều lần.
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +96,Items already synced,Mục đã được đồng bộ hóa
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,Cho phép hàng để được thêm nhiều lần trong một giao dịch
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,Hủy {0} Material Visit trước hủy bỏ yêu cầu bồi thường bảo hành này
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +19,Consumer Products,Sản phẩm tiêu dùng
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,Sản phẩm tiêu dùng
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +68,Please select Party Type first,Vui lòng chọn Đảng Loại đầu tiên
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +90,Annealing,Làm cho dẽo
 DocType: Item,Customer Items,Mục hàng
 apps/erpnext/erpnext/accounts/doctype/account/account.py +45,Account {0}: Parent account {1} can not be a ledger,Tài khoản {0}: Cha mẹ tài khoản {1} không thể là một sổ cái
 DocType: Item,Publish Item to hub.erpnext.com,Publish khoản để hub.erpnext.com
@@ -20,15 +19,14 @@
 DocType: About Us Settings,Website,Trang web
 DocType: POS Profile,Applicable for User,Áp dụng cho User
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +169,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Ngưng tự sản xuất không thể được hủy bỏ, rút ​​nút nó đầu tiên để hủy bỏ"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +23,Compaction plus sintering,Đầm cộng thiêu kết
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,Currency is required for Price List {0},Tiền tệ là cần thiết cho Danh sách Price {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Sẽ được tính toán trong các giao dịch.
 DocType: Purchase Order,Customer Contact,Khách hàng Liên hệ
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +549,From Material Request,Từ vật liệu Yêu cầu
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +572,From Material Request,Từ vật liệu Yêu cầu
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} Tree
 DocType: Job Applicant,Job Applicant,Nộp đơn công việc
 apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,Không có thêm kết quả.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +78,Legal,pháp lý
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +34,Legal,pháp lý
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +114,Actual type tax cannot be included in Item rate in row {0},Thuế loại hình thực tế có thể không được bao gồm trong giá Item trong hàng {0}
 DocType: C-Form,Customer,Sự hài lòng của Khách hàng
 DocType: Purchase Receipt Item,Required By,Yêu cầu bởi
@@ -43,7 +41,6 @@
 DocType: Manufacturing Settings,Default 10 mins,Mặc định 10 phút
 DocType: Leave Type,Leave Type Name,Loại bỏ Tên
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +148,Series Updated Successfully,Loạt Cập nhật thành công
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +150,Stitching,Khâu
 DocType: Pricing Rule,Apply On,Áp dụng trên
 DocType: Item Price,Multiple Item prices.,Nhiều giá Item.
 ,Purchase Order Items To Be Received,Tìm mua hàng để trở nhận
@@ -51,8 +48,8 @@
 DocType: Quality Inspection Reading,Parameter,Thông số
 apps/erpnext/erpnext/projects/doctype/project/project.py +43,Expected End Date can not be less than Expected Start Date,Dự kiến ​​kết thúc ngày không thể nhỏ hơn so với dự kiến ​​Ngày bắt đầu
 apps/erpnext/erpnext/utilities/transaction_base.py +104,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Row # {0}: Tỷ giá phải được giống như {1}: {2} ({3} / {4})
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +189,New Leave Application,Để lại ứng dụng mới
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +134,Bank Draft,Dự thảo ngân hàng
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +204,New Leave Application,Để lại ứng dụng mới
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +134,Bank Draft,Dự thảo ngân hàng
 DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,1 Để duy trì khách hàng mã hàng khôn ngoan và để làm cho họ tìm kiếm dựa trên mã sử dụng tùy chọn này
 DocType: Mode of Payment Account,Mode of Payment Account,Phương thức thanh toán Tài khoản
 apps/erpnext/erpnext/stock/doctype/item/item.js +34,Show Variants,Hiện biến thể
@@ -64,25 +61,23 @@
 DocType: Production Plan Item,Production Plan Item,Kế hoạch sản xuất hàng
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +141,User {0} is already assigned to Employee {1},Người sử dụng {0} đã được giao cho nhân viên {1}
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +13,Make new POS Profile,Làm mới POS hồ sơ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +31,Health Care,Chăm sóc sức khỏe
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,Chăm sóc sức khỏe
 DocType: Purchase Invoice,Monthly,Hàng tháng
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +66,Delay in payment (Days),Chậm trễ trong thanh toán (Ngày)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +494,Invoice,Hóa đơn
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +519,Invoice,Hóa đơn
 DocType: Maintenance Schedule Item,Periodicity,Tính tuần hoàn
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +357,Email Address,Địa chỉ Email
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +21,Defense,Quốc phòng
+apps/erpnext/erpnext/public/js/setup_wizard.js +107,Email Address,Địa chỉ Email
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,Quốc phòng
 DocType: Company,Abbr,Abbr
 DocType: Appraisal Goal,Score (0-5),Điểm số (0-5)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +193,Row {0}: {1} {2} does not match with {3},Row {0}: {1} {2} không phù hợp với {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +67,Row # {0}:,Row # {0}:
 DocType: Delivery Note,Vehicle No,Không có xe
 apps/erpnext/erpnext/public/js/pos/pos.js +528,Please select Price List,Vui lòng chọn Bảng giá
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +162,Woodworking,Chế biến gỗ
 DocType: Production Order Operation,Work In Progress,Làm việc dở dang
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +153,3D printing,In ấn 3D
 DocType: Employee,Holiday List,Danh sách kỳ nghỉ
 DocType: Time Log,Time Log,Giờ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +530,Accountant,Kế toán
+apps/erpnext/erpnext/public/js/setup_wizard.js +274,Accountant,Kế toán
 DocType: Cost Center,Stock User,Cổ khoản
 DocType: Company,Phone No,Không điện thoại
 DocType: Time Log,"Log of Activities performed by users against Tasks that can be used for tracking time, billing.","Đăng nhập của hoạt động được thực hiện bởi người dùng chống lại tác vụ này có thể được sử dụng để theo dõi thời gian, thanh toán."
@@ -98,18 +93,19 @@
 DocType: Bin,Quantity Requested for Purchase,Số lượng yêu cầu cho mua
 DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name","Đính kèm tập tin .csv với hai cột, một cho tên tuổi và một cho tên mới"
 DocType: Packed Item,Parent Detail docname,Cha mẹ chi tiết docname
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Kg,Kg
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Kg,Kg
 apps/erpnext/erpnext/config/hr.py +48,Opening for a Job.,Mở đầu cho một công việc.
 DocType: Item Attribute,Increment,Tăng
 apps/erpnext/erpnext/public/js/stock_analytics.js +63,Select Warehouse...,Chọn nhà kho ...
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +6,Advertising,Quảng cáo
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,Quảng cáo
+apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,Cùng Công ty được nhập nhiều hơn một lần
 DocType: Employee,Married,Kết hôn
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +389,Stock cannot be updated against Delivery Note {0},Chứng khoán không thể được cập nhật với giao hàng Lưu ý {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +391,Stock cannot be updated against Delivery Note {0},Chứng khoán không thể được cập nhật với giao hàng Lưu ý {0}
 DocType: Payment Reconciliation,Reconcile,Hòa giải
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +30,Grocery,Cửa hàng tạp hóa
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,Cửa hàng tạp hóa
 DocType: Quality Inspection Reading,Reading 1,Đọc 1
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Make Bank Entry,Hãy nhập Ngân hàng
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +40,Pension Funds,Quỹ lương hưu
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,Quỹ lương hưu
 apps/erpnext/erpnext/accounts/doctype/account/account.py +142,Warehouse is mandatory if account type is Warehouse,Kho là bắt buộc nếu loại tài khoản là kho
 DocType: SMS Center,All Sales Person,Tất cả các doanh Người
 DocType: Lead,Person Name,Tên người
@@ -131,7 +127,7 @@
 DocType: Quality Inspection,Get Specification Details,Thông số kỹ thuật chi tiết được
 DocType: Lead,Interested,Quan tâm
 apps/erpnext/erpnext/config/manufacturing.py +14,Bill of Material,Bill of Material
-apps/erpnext/erpnext/public/js/stock_analytics.js +45,Opening,Mở ra
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +158,Opening,Mở ra
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},Từ {0} đến {1}
 DocType: Item,Copy From Item Group,Sao chép Từ mục Nhóm
 DocType: Journal Entry,Opening Entry,Mở nhập
@@ -145,23 +141,22 @@
 DocType: Employee Education,Under Graduate,Dưới đại học
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +22,Target On,Mục tiêu trên
 DocType: BOM,Total Cost,Tổng chi phí
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +99,Reaming,Reaming
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +9,Activity Log:,Lần đăng nhập:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +199,Item {0} does not exist in the system or has expired,Mục {0} không tồn tại trong hệ thống hoặc đã hết hạn
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +44,Real Estate,Buôn bán bất động sản
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +44,Real Estate,Buôn bán bất động sản
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +4,Statement of Account,Tuyên bố của Tài khoản
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +41,Pharmaceuticals,Dược phẩm
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,Dược phẩm
 DocType: Expense Claim Detail,Claim Amount,Số tiền yêu cầu bồi thường
 DocType: Employee,Mr,Ông
 DocType: Custom Script,Client,Khách hàng
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,Loại nhà cung cấp / Nhà cung cấp
 DocType: Naming Series,Prefix,Tiền tố
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Consumable,Tiêu hao
+apps/erpnext/erpnext/public/js/setup_wizard.js +359,Consumable,Tiêu hao
 DocType: Upload Attendance,Import Log,Nhập khẩu Đăng nhập
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.js +19,Send,Gửi
 DocType: Sales Invoice Item,Delivered By Supplier,Giao By Nhà cung cấp
 DocType: SMS Center,All Contact,Liên hệ với tất cả
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +164,Annual Salary,Mức lương hàng năm
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +164,Annual Salary,Mức lương hàng năm
 DocType: Period Closing Voucher,Closing Fiscal Year,Đóng cửa năm tài chính
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +69,Stock Expenses,Chi phí chứng khoán
 DocType: Newsletter,Email Sent?,Email gửi?
@@ -169,7 +164,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +92,Show Time Logs,Hiển thị Thời gian Logs
 DocType: Journal Entry Account,Credit in Company Currency,Tín dụng tại Công ty ngoại tệ
 DocType: Delivery Note,Installation Status,Tình trạng cài đặt
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +115,Accepted + Rejected Qty must be equal to Received quantity for Item {0},+ Bị từ chối chấp nhận lượng phải bằng số lượng nhận cho hàng {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +118,Accepted + Rejected Qty must be equal to Received quantity for Item {0},+ Bị từ chối chấp nhận lượng phải bằng số lượng nhận cho hàng {0}
 DocType: Item,Supply Raw Materials for Purchase,Cung cấp nguyên liệu thô cho Purchase
 apps/erpnext/erpnext/stock/get_item_details.py +133,Item {0} must be a Purchase Item,Mục {0} phải là mua hàng
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
@@ -177,19 +172,17 @@
  Tất cả các ngày và nhân viên kết hợp trong giai đoạn được chọn sẽ đến trong bản mẫu, hồ sơ tham dự với hiện tại"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +446,Item {0} is not active or end of life has been reached,Mục {0} không hoạt động hoặc kết thúc của cuộc sống đã đạt tới
 DocType: Time Log Batch,Will be updated after Sales Invoice is Submitted.,Sẽ được cập nhật sau khi bán hàng hóa đơn được Gửi.
-apps/erpnext/erpnext/controllers/accounts_controller.py +493,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Bao gồm thuế hàng {0} trong tỷ lệ khoản, thuế hàng {1} cũng phải được bao gồm"
+apps/erpnext/erpnext/controllers/accounts_controller.py +494,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Bao gồm thuế hàng {0} trong tỷ lệ khoản, thuế hàng {1} cũng phải được bao gồm"
 apps/erpnext/erpnext/config/hr.py +90,Settings for HR Module,Cài đặt cho nhân sự Mô-đun
 DocType: SMS Center,SMS Center,Trung tâm nhắn tin
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +78,Straightening,Thẳng
 DocType: BOM Replace Tool,New BOM,Mới BOM
 apps/erpnext/erpnext/config/projects.py +28,Batch Time Logs for billing.,Hàng loạt Time Logs cho Thanh toán.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +15,Countergravity casting,Đúc Countergravity
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +30,Newsletter has already been sent,Bản tin đã được gửi
 DocType: Lead,Request Type,Yêu cầu Loại
 DocType: Leave Application,Reason,Nguyên nhân
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +14,Broadcasting,Phát thanh truyền hình
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +140,Execution,Thực hiện
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +364,The first user will become the System Manager (you can change this later).,Người dùng đầu tiên sẽ trở thành quản lý hệ thống (bạn có thể thay đổi điều này sau).
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,Phát thanh truyền hình
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +140,Execution,Thực hiện
+apps/erpnext/erpnext/public/js/setup_wizard.js +114,The first user will become the System Manager (you can change this later).,Người dùng đầu tiên sẽ trở thành quản lý hệ thống (bạn có thể thay đổi điều này sau).
 apps/erpnext/erpnext/config/manufacturing.py +39,Details of the operations carried out.,Chi tiết về các hoạt động thực hiện.
 DocType: Serial No,Maintenance Status,Tình trạng bảo trì
 apps/erpnext/erpnext/config/stock.py +263,Items and Pricing,Items Vật giá
@@ -206,7 +199,6 @@
 DocType: Pricing Rule,Discount on Price List Rate (%),Giảm giá Giá Tỷ lệ (%)
 apps/frappe/frappe/public/js/frappe/form/print.js +96,Start,Bắt đầu
 DocType: User,First Name,Họ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +12,Full-mold casting,Đúc Full-mốc
 DocType: Offer Letter,Select Terms and Conditions,Chọn Điều khoản và Điều kiện
 DocType: Production Planning Tool,Sales Orders,Đơn đặt hàng bán hàng
 DocType: Purchase Taxes and Charges,Valuation,Định giá
@@ -218,8 +210,7 @@
 DocType: Bank Reconciliation,Bank Account,Tài khoản ngân hàng
 DocType: Leave Type,Allow Negative Balance,Cho phép cân đối tiêu cực
 DocType: Selling Settings,Default Territory,Vui lòng ghi rõ tiền tệ tại Công ty
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +53,Television,Tivi
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +138,Gashing,Gashing
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,Tivi
 DocType: Production Order Operation,Updated via 'Time Log',Cập nhật thông qua 'Giờ'
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +82,Account {0} does not belong to Company {1},Tài khoản {0} không thuộc về Công ty {1}
 DocType: Naming Series,Series List for this Transaction,Danh sách loạt cho các giao dịch này
@@ -234,14 +225,13 @@
 DocType: Leave Allocation,Add unused leaves from previous allocations,Thêm lá không sử dụng từ phân bổ trước
 apps/erpnext/erpnext/controllers/recurring_document.py +206,Next Recurring {0} will be created on {1},Tiếp theo định kỳ {0} sẽ được tạo ra trên {1}
 DocType: Newsletter List,Total Subscribers,Tổng số thuê bao
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +575,Contact Name,Tên liên lạc
+,Contact Name,Tên liên lạc
 DocType: Production Plan Item,SO Pending Qty,SO chờ Số lượng
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Tạo phiếu lương cho các tiêu chí nêu trên.
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,Yêu cầu để mua hàng.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +107,Double housing,Nhà ở kép
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +156,Only the selected Leave Approver can submit this Leave Application,Chỉ chọn Để lại phê duyệt có thể gửi ứng dụng Để lại này
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +171,Only the selected Leave Approver can submit this Leave Application,Chỉ chọn Để lại phê duyệt có thể gửi ứng dụng Để lại này
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,Giảm ngày phải lớn hơn ngày của Tham gia
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +172,Leaves per Year,Lá mỗi năm
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +172,Leaves per Year,Lá mỗi năm
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup > Settings > Naming Series,Hãy đặt Naming Series cho {0} qua Setup&gt; Cài đặt&gt; Đặt tên series
 DocType: Time Log,Will be updated when batched.,Sẽ được cập nhật khi trộn.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +104,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,Row {0}: Vui lòng kiểm tra 'là Advance chống Account {1} nếu điều này là một entry trước.
@@ -250,25 +240,24 @@
 DocType: Item Website Specification,Item Website Specification,Mục Trang Thông số kỹ thuật
 DocType: Dropbox Backup,Dropbox Access Key,Dropbox Access Key
 DocType: Payment Tool,Reference No,Reference No
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +348,Leave Blocked,Lại bị chặn
-apps/erpnext/erpnext/stock/doctype/item/item.py +535,Item {0} has reached its end of life on {1},Mục {0} đã đạt đến kết thúc của sự sống trên {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +392,Leave Blocked,Lại bị chặn
+apps/erpnext/erpnext/stock/doctype/item/item.py +539,Item {0} has reached its end of life on {1},Mục {0} đã đạt đến kết thúc của sự sống trên {1}
 apps/erpnext/erpnext/accounts/utils.py +339,Annual,Hàng năm
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Cổ hòa giải hàng
 DocType: Stock Entry,Sales Invoice No,Hóa đơn bán hàng không
 DocType: Material Request Item,Min Order Qty,Đặt mua tối thiểu Số lượng
 DocType: Lead,Do Not Contact,Không Liên
 DocType: Sales Invoice,The unique id for tracking all recurring invoices. It is generated on submit.,Id duy nhất để theo dõi tất cả các hoá đơn định kỳ. Nó được tạo ra trên trình.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +93,Software Developer,Phần mềm phát triển
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +93,Software Developer,Phần mềm phát triển
 DocType: Item,Minimum Order Qty,Đặt hàng tối thiểu Số lượng
 DocType: Pricing Rule,Supplier Type,Loại nhà cung cấp
 DocType: Item,Publish in Hub,Xuất bản trong Hub
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +555,Item {0} is cancelled,Mục {0} bị hủy bỏ
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +598,Material Request,Yêu cầu tài liệu
+apps/erpnext/erpnext/stock/doctype/item/item.py +559,Item {0} is cancelled,Mục {0} bị hủy bỏ
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +607,Material Request,Yêu cầu tài liệu
 DocType: Bank Reconciliation,Update Clearance Date,Cập nhật thông quan ngày
 DocType: Item,Purchase Details,Thông tin chi tiết mua
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +323,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},Mục {0} không tìm thấy trong &#39;Nguyên liệu Supplied&#39; bảng trong Purchase Order {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +129,Wire brushing,Dây đánh răng
 DocType: Employee,Relation,Mối quan hệ
 DocType: Shipping Rule,Worldwide Shipping,Vận chuyển trên toàn thế giới
 apps/erpnext/erpnext/config/selling.py +23,Confirmed orders from Customers.,Đơn đặt hàng xác nhận từ khách hàng.
@@ -284,12 +273,11 @@
 DocType: Supplier,Address HTML,Địa chỉ HTML
 DocType: Lead,Mobile No.,Điện thoại di động số
 DocType: Maintenance Schedule,Generate Schedule,Tạo Lịch
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +81,Hubbing,Hubbing
 DocType: Purchase Invoice Item,Expense Head,Chi phí đầu
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +86,Please select Charge Type first,Vui lòng chọn Charge Loại đầu tiên
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,Mới nhất
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +395,Max 5 characters,Tối đa 5 ký tự
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +195,Select Your Language,Chọn ngôn ngữ của bạn
+apps/erpnext/erpnext/public/js/setup_wizard.js +143,Max 5 characters,Tối đa 5 ký tự
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +245,Select Your Language,Chọn ngôn ngữ của bạn
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,Người phê duyệt Để lại đầu tiên trong danh sách sẽ được thiết lập mặc định Để lại phê duyệt
 DocType: Manufacturing Settings,"Disables creation of time logs against Production Orders.
 Operations shall not be tracked against Production Order",Vô hiệu hóa việc tạo ra các bản ghi thời gian so với đơn đặt hàng sản xuất. Hoạt động sẽ không được theo dõi chống sản xuất hàng
@@ -301,8 +289,6 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +34,Item {0} must be Service Item,Mục {0} phải là dịch vụ hàng
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +303,Completed Qty can not be greater than 'Qty to Manufacture',Đã hoàn thành Số lượng không có thể lớn hơn 'SL đặt Sản xuất'
 DocType: DocType,Administrator,Quản trị viên
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +136,Laser drilling,Khoan Laser
-DocType: Stock UOM Replace Utility,New Stock UOM,Mới Cổ UOM
 DocType: Period Closing Voucher,Closing Account Head,Đóng Trưởng Tài khoản
 DocType: Employee,External Work History,Bên ngoài Quá trình công tác
 apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,Thông tư tham khảo Lỗi
@@ -311,18 +297,15 @@
 DocType: Lead,Industry,Ngành công nghiệp
 DocType: Employee,Job Profile,Hồ sơ công việc
 DocType: Newsletter,Newsletter,Đăng ký nhận tin
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +84,Hydroforming,Hydroforming
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +49,Necking,Sự nốc rượu
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Thông báo qua email trên tạo ra các yêu cầu vật liệu tự động
 DocType: Journal Entry,Multi Currency,Đa ngoại tệ
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +51,Item is updated,Mục được cập nhật
 DocType: Async Task,System Manager,Hệ thống quản lý
 DocType: Payment Reconciliation Invoice,Invoice Type,Loại hóa đơn
 DocType: Sales Invoice Item,Delivery Note,Giao hàng Ghi
 DocType: Dropbox Backup,Allow Dropbox Access,Cho phép truy cập Dropbox
 apps/erpnext/erpnext/config/learn.py +72,Setting up Taxes,Thiết lập Thuế
 apps/erpnext/erpnext/accounts/utils.py +189,Payment Entry has been modified after you pulled it. Please pull it again.,Nhập thanh toán đã được sửa đổi sau khi bạn kéo nó. Hãy kéo nó một lần nữa.
-apps/erpnext/erpnext/stock/doctype/item/item.py +343,{0} entered twice in Item Tax,{0} vào hai lần tại khoản thuế
+apps/erpnext/erpnext/stock/doctype/item/item.py +347,{0} entered twice in Item Tax,{0} vào hai lần tại khoản thuế
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +105,Summary for this week and pending activities,Tóm tắt cho tuần này và các hoạt động cấp phát
 DocType: Workstation,Rent Cost,Chi phí thuê
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +74,Please select month and year,Vui lòng chọn tháng và năm
@@ -339,24 +322,22 @@
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,Tốc độ mà khách hàng tệ được chuyển đổi sang tiền tệ cơ bản của khách hàng
 DocType: Features Setup,"Available in BOM, Delivery Note, Purchase Invoice, Production Order, Purchase Order, Purchase Receipt, Sales Invoice, Sales Order, Stock Entry, Timesheet","Có sẵn trong HĐQT, Giao hàng tận nơi Lưu ý, mua hóa đơn, sản xuất hàng, Mua hàng, mua hóa đơn, hóa đơn bán hàng, bán hàng đặt hàng, chứng khoán nhập cảnh, timesheet"
 DocType: Item Tax,Tax Rate,Tỷ lệ thuế
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Select Item,Chọn nhiều Item
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +540,Select Item,Chọn nhiều Item
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +143,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","Item: {0} được quản lý theo từng đợt, không thể hòa giải được sử dụng \
  Cổ hòa giải, thay vì sử dụng cổ nhập"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +259,Purchase Invoice {0} is already submitted,Mua hóa đơn {0} đã gửi
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +262,Purchase Invoice {0} is already submitted,Mua hóa đơn {0} đã gửi
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Batch No must be same as {1} {2},Row # {0}: Batch Không phải giống như {1} {2}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Convert to non-Group,Chuyển đổi sang non-Group
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +55,Purchase Receipt must be submitted,Mua hóa đơn phải được gửi
-DocType: Stock UOM Replace Utility,Current Stock UOM,Tình trạng hàng UOM
 apps/erpnext/erpnext/config/stock.py +53,Batch (lot) of an Item.,Hàng loạt (rất nhiều) của một Item.
 DocType: C-Form Invoice Detail,Invoice Date,Hóa đơn ngày
 DocType: GL Entry,Debit Amount,Số tiền ghi nợ
 apps/erpnext/erpnext/accounts/party.py +223,There can only be 1 Account per Company in {0} {1},Chỉ có thể có 1 tài khoản cho mỗi công ty trong {0} {1}
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Your email address,Địa chỉ email của bạn
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +194,Please see attachment,Xin vui lòng xem file đính kèm
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +203,Please see attachment,Xin vui lòng xem file đính kèm
 DocType: Purchase Order,% Received,% Nhận
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +109,Water jet cutting,Cắt tia nước
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +24,Setup Already Complete!!,Đã thiết lập hoàn chỉnh!
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +20,Setup Already Complete!!,Đã thiết lập hoàn chỉnh!
 ,Finished Goods,Hoàn thành Hàng
 DocType: Delivery Note,Instructions,Hướng dẫn
 DocType: Quality Inspection,Inspected By,Kiểm tra bởi
@@ -371,6 +352,7 @@
 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.,Xin vui lòng không tạo tài khoản cho khách hàng và nhà cung cấp. Chúng được tạo ra trực tiếp từ các chuyên gia hàng / Nhà cung cấp.
 DocType: Currency Exchange,Currency Exchange,Thu đổi ngoại tệ
 DocType: Purchase Invoice Item,Item Name,Tên hàng
+DocType: Authorization Rule,Approving User  (above authorized value),Phê duyệt tài (trên giá trị ủy quyền)
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Credit Balance,Balance tín dụng
 DocType: Employee,Widowed,Góa chồng
 DocType: Production Planning Tool,"Items to be requested which are ""Out of Stock"" considering all warehouses based on projected qty and minimum order qty","Các mặt hàng được yêu cầu đó là ""Hết hàng"" xem xét tất cả các kho dựa trên SL dự và trật tự tối thiểu SL"
@@ -380,11 +362,10 @@
 ,Purchase Register,Đăng ký mua
 DocType: Landed Cost Item,Applicable Charges,Phí áp dụng
 DocType: Workstation,Consumable Cost,Chi phí tiêu hao
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,{0} ({1}) must have role 'Leave Approver',{0} ({1}) phải có vai trò 'Leave Người phê duyệt'
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +167,{0} ({1}) must have role 'Leave Approver',{0} ({1}) phải có vai trò 'Leave Người phê duyệt'
 DocType: Purchase Receipt,Vehicle Date,Xe ngày
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +39,Medical,Y khoa
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +39,Medical,Y khoa
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,Lý do mất
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +36,Tube beading,Ống beading
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},Workstation được đóng cửa vào các ngày sau đây theo Danh sách khách sạn Holiday: {0}
 DocType: Employee,Single,Một lần
 DocType: Issue,Attachment,File đính kèm
@@ -405,10 +386,8 @@
 DocType: Account,Is Group,Is Nhóm
 DocType: Stock Settings,Automatically Set Serial Nos based on FIFO,Tự động Đặt nối tiếp Nos dựa trên FIFO
 DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,Kiểm tra nhà cung cấp hóa đơn Số độc đáo
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +31,Thermoforming,Thermoforming
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +66,Slitting,Xả băng
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +57,'To Case No.' cannot be less than 'From Case No.',"'Để Trường hợp số' không thể nhỏ hơn ""Từ trường hợp số '"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +104,Non Profit,Không lợi nhuận
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +104,Non Profit,Không lợi nhuận
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_list.js +7,Not Started,Chưa Bắt Đầu
 DocType: Lead,Channel Partner,Đối tác
 DocType: Account,Old Parent,Cũ Chánh
@@ -417,13 +396,12 @@
 apps/erpnext/erpnext/config/manufacturing.py +74,Global settings for all manufacturing processes.,Cài đặt chung cho tất cả các quá trình sản xuất.
 DocType: Accounts Settings,Accounts Frozen Upto,"Chiếm đông lạnh HCM,"
 DocType: SMS Log,Sent On,Gửi On
-apps/erpnext/erpnext/stock/doctype/item/item.py +512,Attribute {0} selected multiple times in Attributes Table,Thuộc tính {0} được chọn nhiều lần trong Thuộc tính Bảng
+apps/erpnext/erpnext/stock/doctype/item/item.py +516,Attribute {0} selected multiple times in Attributes Table,Thuộc tính {0} được chọn nhiều lần trong Thuộc tính Bảng
 DocType: Sales Order,Not Applicable,Không áp dụng
 apps/erpnext/erpnext/config/hr.py +140,Holiday master.,Chủ lễ.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +19,Shell molding,Shell đúc
 DocType: Material Request Item,Required Date,Ngày yêu cầu
 DocType: Delivery Note,Billing Address,Địa chỉ thanh toán
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +644,Please enter Item Code.,Vui lòng nhập Item Code.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +648,Please enter Item Code.,Vui lòng nhập Item Code.
 DocType: BOM,Costing,Chi phí
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount","Nếu được chọn, số tiền thuế sẽ được coi là đã có trong tiền lệ In / In"
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,Tổng số Số lượng
@@ -433,7 +411,7 @@
 DocType: Item Attribute,To Range,Thành vùng
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Chứng khoán và tiền gửi
 DocType: Features Setup,Imports,Nhập khẩu
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +144,Adhesive bonding,Liên kết dính
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +77,Total leaves allocated is mandatory,Tổng số lá được giao là bắt buộc
 DocType: Job Opening,Description of a Job Opening,Mô tả công việc một Opening
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +102,Pending activities for today,Hoạt động cấp phát cho ngày hôm nay
 apps/erpnext/erpnext/config/hr.py +28,Attendance record.,Kỷ lục tham dự.
@@ -441,26 +419,25 @@
 DocType: Sales Order Item,Used for Production Plan,Sử dụng cho kế hoạch sản xuất
 DocType: System Settings,Loading...,Đang tải...
 DocType: DocField,Password,Mật khẩu
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +155,Fused deposition modeling,Mô hình lắng đọng hợp nhất
 DocType: Manufacturing Settings,Time Between Operations (in mins),Time Between Operations (trong phút)
 DocType: Customer,Buyer of Goods and Services.,Người mua hàng hoá và dịch vụ.
 DocType: Journal Entry,Accounts Payable,Tài khoản Phải trả
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +24,Add Subscribers,Thêm Subscribers
 apps/erpnext/erpnext/public/js/feature_setup.js +220,""" does not exists","""Không tồn tại"
 DocType: Pricing Rule,Valid Upto,"HCM, đến hợp lệ"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +564,List a few of your customers. They could be organizations or individuals.,"Danh sách một số khách hàng của bạn. Họ có thể là các tổ chức, cá nhân."
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,List a few of your customers. They could be organizations or individuals.,"Danh sách một số khách hàng của bạn. Họ có thể là các tổ chức, cá nhân."
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Direct Income,Thu nhập trực tiếp
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +33,"Can not filter based on Account, if grouped by Account","Không thể lọc dựa trên tài khoản, nếu nhóm lại theo tài khoản"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +88,Administrative Officer,Nhân viên hành chính
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Administrative Officer,Nhân viên hành chính
 DocType: Payment Tool,Received Or Paid,Nhận Hoặc Paid
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +318,Please select Company,Vui lòng chọn Công ty
 DocType: Stock Entry,Difference Account,Tài khoản chênh lệch
 apps/erpnext/erpnext/projects/doctype/task/task.py +44,Cannot close task as its dependant task {0} is not closed.,Không thể nhiệm vụ gần như là nhiệm vụ của nó phụ thuộc {0} là không đóng cửa.
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +305,Please enter Warehouse for which Material Request will be raised,Vui lòng nhập kho mà Chất liệu Yêu cầu sẽ được nâng lên
 DocType: Production Order,Additional Operating Cost,Chi phí điều hành khác
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +20,Cosmetics,Mỹ phẩm
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,Mỹ phẩm
 DocType: DocField,Type,Loại
-apps/erpnext/erpnext/stock/doctype/item/item.py +417,"To merge, following properties must be same for both items","Sáp nhập, tài sản sau đây là giống nhau cho cả hai mục"
+apps/erpnext/erpnext/stock/doctype/item/item.py +421,"To merge, following properties must be same for both items","Sáp nhập, tài sản sau đây là giống nhau cho cả hai mục"
 DocType: Communication,Subject,Chủ đề
 DocType: Shipping Rule,Net Weight,Trọng lượng
 DocType: Employee,Emergency Phone,Điện thoại khẩn cấp
@@ -470,7 +447,6 @@
 DocType: Journal Entry,Difference (Dr - Cr),Sự khác biệt (Tiến sĩ - Cr)
 DocType: Account,Profit and Loss,Báo cáo kết quả hoạt động kinh doanh
 apps/erpnext/erpnext/config/stock.py +293,Managing Subcontracting,Quản lý Hợp đồng phụ
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +58,New UOM must NOT be of type Whole Number,Mới UOM không phải là loại nguyên số
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Furniture and Fixture,Đồ nội thất và đấu
 DocType: Quotation,Rate at which Price list currency is converted to company's base currency,Tốc độ mà danh sách Giá tiền tệ được chuyển đổi sang tiền tệ cơ bản của công ty
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Account {0} does not belong to company: {1},Tài khoản {0} không thuộc về công ty: {1}
@@ -490,14 +466,14 @@
 DocType: Purchase Invoice,Supplier Invoice No,Nhà cung cấp hóa đơn Không
 DocType: Territory,For reference,Để tham khảo
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +154,"Cannot delete Serial No {0}, as it is used in stock transactions","Không thể xóa tiếp Serial No {0}, vì nó được sử dụng trong các giao dịch chứng khoán"
-apps/erpnext/erpnext/public/js/account_tree_grid.js +52,Closing (Cr),Đóng cửa (Cr)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +227,Closing (Cr),Đóng cửa (Cr)
 DocType: Serial No,Warranty Period (Days),Thời gian bảo hành (ngày)
 DocType: Installation Note Item,Installation Note Item,Lưu ý cài đặt hàng
 ,Pending Qty,Pending Qty
 DocType: Job Applicant,Thread HTML,Chủ đề HTML
 DocType: Company,Ignore,Bỏ qua
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +86,SMS sent to following numbers: {0},SMS gửi đến số điện thoại sau: {0}
-apps/erpnext/erpnext/controllers/buying_controller.py +135,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Nhà cung cấp kho bắt buộc đối với thầu phụ mua hóa đơn
+apps/erpnext/erpnext/controllers/buying_controller.py +126,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Nhà cung cấp kho bắt buộc đối với thầu phụ mua hóa đơn
 DocType: Pricing Rule,Valid From,Từ hợp lệ
 DocType: Sales Invoice,Total Commission,Tổng số Ủy ban
 DocType: Pricing Rule,Sales Partner,Đối tác bán hàng
@@ -507,7 +483,7 @@
 To distribute a budget using this distribution, set this **Monthly Distribution** in the **Cost Center**","** Phân phối hàng tháng ** giúp bạn phân phối ngân sách của bạn trên tháng nếu bạn có tính thời vụ trong kinh doanh của bạn.
 
  Để phân phối một ngân sách bằng cách sử dụng phân phối này, thiết lập phân phối hàng tháng ** ** này trong ** Trung tâm chi phí **"
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +183,No records found in the Invoice table,Không có hồ sơ được tìm thấy trong bảng hóa đơn
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +130,No records found in the Invoice table,Không có hồ sơ được tìm thấy trong bảng hóa đơn
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +20,Please select Company and Party Type first,Vui lòng chọn Công ty và Đảng Loại đầu tiên
 apps/erpnext/erpnext/config/accounts.py +84,Financial / accounting year.,Năm tài chính / kế toán.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","Xin lỗi, Serial Nos không thể được sáp nhập"
@@ -523,25 +499,25 @@
 DocType: Sales Order,Billing and Delivery Status,Thanh toán và giao hàng Status
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Khách hàng lặp lại
 DocType: Leave Control Panel,Allocate,Phân bổ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +16,Previous,Trang trước
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard_page.html +16,Previous,Trang trước
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +620,Sales Return,Bán hàng trở lại
 DocType: Production Planning Tool,Select Sales Orders from which you want to create Production Orders.,Chọn bán hàng đơn đặt hàng mà từ đó bạn muốn tạo ra đơn đặt hàng sản xuất.
 DocType: Item,Delivered by Supplier (Drop Ship),Cung cấp bởi Nhà cung cấp (Drop Ship)
 apps/erpnext/erpnext/config/hr.py +120,Salary components.,Thành phần lương.
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,Cơ sở dữ liệu khách hàng tiềm năng.
+DocType: Authorization Rule,Customer or Item,Khách hàng hoặc Khoản
 apps/erpnext/erpnext/config/crm.py +17,Customer database.,Cơ sở dữ liệu khách hàng.
 DocType: Quotation,Quotation To,Để báo giá
 DocType: Lead,Middle Income,Thu nhập trung bình
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),Mở (Cr)
 apps/erpnext/erpnext/accounts/utils.py +193,Allocated amount can not be negative,Số lượng phân bổ không thể phủ định
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +123,Tumbling,Sự té nhào xuống
 DocType: Purchase Order Item,Billed Amt,Billed Amt
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,Một kho hợp lý chống lại các entry chứng khoán được thực hiện.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +92,Reference No & Reference Date is required for {0},Không tham khảo và tham khảo ngày là cần thiết cho {0}
 DocType: Event,Wednesday,Thứ tư
 DocType: Sales Invoice,Customer's Vendor,Bán hàng của khách hàng
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +214,Production Order is Mandatory,Sản xuất theo thứ tự là bắt buộc
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +139,Proposal Writing,Đề nghị Viết
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,Proposal Writing,Đề nghị Viết
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,Một người bán hàng {0} tồn tại với cùng id viên
 apps/erpnext/erpnext/stock/stock_ledger.py +336,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},Tiêu cực Cổ Lỗi ({6}) cho mục {0} trong kho {1} trên {2} {3} trong {4} {5}
 DocType: Fiscal Year Company,Fiscal Year Company,Công ty tài chính Năm
@@ -564,7 +540,7 @@
 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.","Sau đó biết giá quy được lọc ra dựa trên khách hàng, Nhóm khách hàng, lãnh thổ, Nhà cung cấp, Loại Nhà cung cấp, vận động, đối tác kinh doanh, vv"
 apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.py +179,Please install dropbox python module,Hãy cài đặt Dropbox mô-đun python
 DocType: Employee,Passport Number,Số hộ chiếu
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +82,Manager,Chi cục trưởng
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Manager,Chi cục trưởng
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +494,From Purchase Receipt,Từ mua hóa đơn
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +219,Same item has been entered multiple times.,Cùng mục đã được nhập nhiều lần.
 DocType: SMS Settings,Receiver Parameter,Nhận thông số
@@ -572,10 +548,9 @@
 DocType: Sales Person,Sales Person Targets,Mục tiêu người bán hàng
 apps/frappe/frappe/public/js/frappe/form/workflow.js +116,To,đến
 apps/frappe/frappe/templates/base.html +145,Please enter email address,Vui lòng nhập địa chỉ email
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +35,End tube forming,Ống End hình thành
 DocType: Production Order Operation,In minutes,Trong phút
 DocType: Issue,Resolution Date,Độ phân giải ngày
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +635,Please set default Cash or Bank account in Mode of Payment {0},Xin vui lòng thiết lập mặc định hoặc tiền trong tài khoản ngân hàng Phương thức thanh toán {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +637,Please set default Cash or Bank account in Mode of Payment {0},Xin vui lòng thiết lập mặc định hoặc tiền trong tài khoản ngân hàng Phương thức thanh toán {0}
 DocType: Selling Settings,Customer Naming By,Khách hàng đặt tên By
 apps/erpnext/erpnext/accounts/doctype/account/account.js +67,Convert to Group,Chuyển đổi cho Tập đoàn
 DocType: Activity Cost,Activity Type,Loại hoạt động
@@ -583,12 +558,12 @@
 DocType: Customer,Fixed Days,Days cố định
 DocType: Sales Invoice,Packing List,Danh sách đóng gói
 apps/erpnext/erpnext/config/buying.py +28,Purchase Orders given to Suppliers.,Đơn đặt hàng mua cho nhà cung cấp.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +43,Publishing,Xuất bản
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +43,Publishing,Xuất bản
 DocType: Activity Cost,Projects User,Dự án tài
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Consumed,Tiêu thụ
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +198,{0}: {1} not found in Invoice Details table,{0}: {1} không tìm thấy trong bảng hóa đơn chi tiết
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,{0}: {1} not found in Invoice Details table,{0}: {1} không tìm thấy trong bảng hóa đơn chi tiết
 DocType: Company,Round Off Cost Center,Vòng Tắt Center Chi phí
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +208,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Bảo trì đăng nhập {0} phải được hủy bỏ trước khi hủy bỏ đơn đặt hàng này
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +203,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Bảo trì đăng nhập {0} phải được hủy bỏ trước khi hủy bỏ đơn đặt hàng này
 DocType: Material Request,Material Transfer,Chuyển tài liệu
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +56,Opening (Dr),Mở (Tiến sĩ)
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},Đăng dấu thời gian phải sau ngày {0}
@@ -600,7 +575,6 @@
 DocType: Pricing Rule,Sales Manager,Quản lý bán hàng
 apps/frappe/frappe/public/js/frappe/model/model.js +492,Rename,Đổi tên
 DocType: Journal Entry,Write Off Amount,Viết Tắt Số tiền
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +52,Bending,Uốn
 apps/frappe/frappe/core/page/user_permissions/user_permissions.js +246,Allow User,Cho phép tài
 DocType: Journal Entry,Bill No,Bill Không
 DocType: Purchase Invoice,Quarterly,Quý
@@ -610,17 +584,16 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Please enter item details,Xin vui lòng nhập các chi tiết sản phẩm
 DocType: Purchase Receipt,Other Details,Các chi tiết khác
 DocType: Account,Accounts,Tài khoản
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +67,Marketing,Marketing
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +65,Straight shearing,Cắt thẳng
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +67,Marketing,Marketing
 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.,Để theo dõi mục trong bán hàng và giấy tờ mua bán dựa trên nos nối tiếp của họ. Này cũng có thể được sử dụng để theo dõi các chi tiết bảo hành của sản phẩm.
 DocType: Purchase Receipt Item Supplied,Current Stock,Cổ hiện tại
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +99,Rejected Warehouse is mandatory against regected item,Kho từ chối là bắt buộc đối với mục regected
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +102,Rejected Warehouse is mandatory against regected item,Kho từ chối là bắt buộc đối với mục regected
 DocType: Account,Expenses Included In Valuation,Chi phí bao gồm trong định giá
 DocType: Employee,Provide email id registered in company,Cung cấp email id đăng ký tại công ty
 DocType: Hub Settings,Seller City,Người bán Thành phố
 DocType: Email Digest,Next email will be sent on:,Email tiếp theo sẽ được gửi về:
 DocType: Offer Letter Term,Offer Letter Term,Cung cấp văn Term
-apps/erpnext/erpnext/stock/doctype/item/item.py +492,Item has variants.,Mục có các biến thể.
+apps/erpnext/erpnext/stock/doctype/item/item.py +496,Item has variants.,Mục có các biến thể.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Mục {0} không tìm thấy
 DocType: Bin,Stock Value,Giá trị cổ phiếu
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,Loại cây
@@ -629,10 +602,9 @@
 DocType: Material Request Item,Quantity and Warehouse,Số lượng và kho
 DocType: Sales Invoice,Commission Rate (%),Hoa hồng Tỷ lệ (%)
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +172,"Against Voucher Type must be one of Sales Order, Sales Invoice or Journal Entry","Chống Voucher Loại phải là một trong bán hàng đặt hàng, bán hàng hoặc hóa đơn Journal nhập"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +139,Biomachining,Biomachining
 apps/erpnext/erpnext/setup/utils.py +89,Unable to find exchange rate,Không tìm thấy tỷ giá hối đoái
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +7,Aerospace,Hàng không vũ trụ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +19,Welcome,Chào mừng bạn
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +7,Aerospace,Hàng không vũ trụ
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +40,Welcome,Chào mừng bạn
 DocType: Journal Entry,Credit Card Entry,Thẻ tín dụng nhập
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +18,Task Subject,Nhiệm vụ đề
 apps/erpnext/erpnext/config/stock.py +33,Goods received from Suppliers.,Hàng nhận được từ nhà cung cấp.
@@ -655,19 +627,19 @@
 DocType: Employee,Cell Number,Số di động
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Thua
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +120,You can not enter current voucher in 'Against Journal Entry' column,Bạn không thể nhập chứng từ hiện tại 'Against Journal nhập' cột
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +25,Energy,Năng lượng
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,Năng lượng
 DocType: Opportunity,Opportunity From,Từ cơ hội
 apps/erpnext/erpnext/config/hr.py +33,Monthly salary statement.,Báo cáo tiền lương hàng tháng.
 DocType: Item Group,Website Specifications,Website Thông số kỹ thuật
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +205,New Account,Tài khoản mới
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +21,{0}: From {0} of type {1},{0}: Từ {0} của loại {1}
-apps/erpnext/erpnext/controllers/buying_controller.py +283,Row {0}: Conversion Factor is mandatory,Hàng {0}: Chuyển đổi Factor là bắt buộc
+apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,Hàng {0}: Chuyển đổi Factor là bắt buộc
 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.,Kế toán Entries có thể được thực hiện đối với các nút lá. Entries chống lại nhóm không được phép.
 DocType: ToDo,High,Cao
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +361,Cannot deactivate or cancel BOM as it is linked with other BOMs,Không thể tắt hoặc hủy bỏ BOM như nó được liên kết với BOMs khác
 DocType: Opportunity,Maintenance,Bảo trì
 DocType: User,Male,Name
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +182,Purchase Receipt number required for Item {0},Số mua hóa đơn cần thiết cho mục {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +183,Purchase Receipt number required for Item {0},Số mua hóa đơn cần thiết cho mục {0}
 DocType: Item Attribute Value,Item Attribute Value,Mục Attribute Value
 apps/erpnext/erpnext/config/crm.py +64,Sales campaigns.,Các chiến dịch bán hàng.
 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.
@@ -715,10 +687,9 @@
 DocType: Address,Personal,Cá nhân
 DocType: Expense Claim Detail,Expense Claim Type,Loại chi phí yêu cầu bồi thường
 DocType: Shopping Cart Settings,Default settings for Shopping Cart,Các thiết lập mặc định cho Giỏ hàng
-apps/erpnext/erpnext/controllers/accounts_controller.py +324,"Journal Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","{0} Journal Entry được liên kết chống lại thứ tự {1}, kiểm tra xem nó nên được kéo như trước trong hóa đơn này."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +13,Biotechnology,Công nghệ sinh học
+apps/erpnext/erpnext/controllers/accounts_controller.py +325,"Journal Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","{0} Journal Entry được liên kết chống lại thứ tự {1}, kiểm tra xem nó nên được kéo như trước trong hóa đơn này."
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +13,Biotechnology,Công nghệ sinh học
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Office Maintenance Expenses,Chi phí bảo trì văn phòng
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +53,Hemming,Hemming
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +66,Please enter Item first,Vui lòng nhập mục đầu tiên
 DocType: Account,Liability,Trách nhiệm
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +62,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Số tiền bị xử phạt không thể lớn hơn so với yêu cầu bồi thường Số tiền trong Row {0}.
@@ -731,10 +702,10 @@
 DocType: Company,Default Bank Account,Tài khoản Ngân hàng mặc định
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +47,"To filter based on Party, select Party Type first","Để lọc dựa vào Đảng, Đảng chọn Gõ đầu tiên"
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},&#39;Update Cổ&#39; không thể được kiểm tra vì mục này không được cung cấp thông qua {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Nos,lớp
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Nos,lớp
 DocType: Item,Items with higher weightage will be shown higher,Mục weightage cao sẽ được hiển thị cao hơn
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Ngân hàng hòa giải chi tiết
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +627,My Invoices,Hoá đơn của tôi
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +629,My Invoices,Hoá đơn của tôi
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,Không có nhân viên tìm thấy
 DocType: Purchase Order,Stopped,Đã ngưng
 DocType: Item,If subcontracted to a vendor,Nếu hợp đồng phụ với một nhà cung cấp
@@ -753,35 +724,33 @@
 DocType: Features Setup,"To enable ""Point of Sale"" features",Để kích hoạt tính năng &quot;Point of Sale&quot; tính năng
 DocType: Bin,Moving Average Rate,Tỷ lệ trung bình di chuyển
 DocType: Production Planning Tool,Select Items,Chọn mục
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,{0} against Bill {1} dated {2},{0} với Bill {1} ​​{2} ngày
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +328,{0} against Bill {1} dated {2},{0} với Bill {1} ​​{2} ngày
 DocType: Comment,Reference Name,Tên tài liệu tham khảo
 DocType: Maintenance Visit,Completion Status,Tình trạng hoàn thành
 DocType: Sales Invoice Item,Target Warehouse,Mục tiêu kho
 DocType: Item,Allow over delivery or receipt upto this percent,Cho phép trên giao nhận tối đa tỷ lệ này
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +49,Expected Delivery Date cannot be before Sales Order Date,Dự kiến sẽ giao hàng ngày không thể trước khi bán hàng đặt hàng ngày
 DocType: Upload Attendance,Import Attendance,Nhập khẩu tham dự
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +17,All Item Groups,Tất cả các nhóm hàng
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +17,All Item Groups,Tất cả các nhóm hàng
 DocType: Process Payroll,Activity Log,Đăng nhập hoạt động
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +30,Net Profit / Loss,Lợi nhuận ròng / lỗ
 apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,Tự động soạn tin nhắn trên trình giao dịch.
 DocType: Production Order,Item To Manufacture,Để mục Sản xuất
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +16,Permanent mold casting,Đúc khuôn vĩnh viễn
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} tình trạng là {2}
 apps/erpnext/erpnext/config/learn.py +172,Purchase Order to Payment,Mua hàng để thanh toán
 DocType: Sales Order Item,Projected Qty,Số lượng dự kiến
 DocType: Sales Invoice,Payment Due Date,Thanh toán Due Date
 DocType: Newsletter,Newsletter Manager,Bản tin Quản lý
-apps/erpnext/erpnext/stock/doctype/item/item.js +229,Item Variant {0} already exists with same attributes,Mục Variant {0} đã tồn tại với cùng một thuộc tính
+apps/erpnext/erpnext/stock/doctype/item/item.js +231,Item Variant {0} already exists with same attributes,Mục Variant {0} đã tồn tại với cùng một thuộc tính
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening',&#39;Mở&#39;
 DocType: Notification Control,Delivery Note Message,Giao hàng tận nơi Lưu ý tin nhắn
 DocType: Expense Claim,Expenses,Chi phí
 DocType: Item Variant Attribute,Item Variant Attribute,Mục Variant Attribute
 ,Purchase Receipt Trends,Xu hướng mua hóa đơn
 DocType: Appraisal,Select template from which you want to get the Goals,Chọn mẫu mà bạn muốn để có được các Mục tiêu
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +77,Research & Development,Nghiên cứu & Phát triể
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Research & Development,Nghiên cứu & Phát triể
 ,Amount to Bill,Số tiền Bill
 DocType: Company,Registration Details,Thông tin chi tiết đăng ký
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +75,Staking,Khoanh vùng
 DocType: Item,Re-Order Qty,Re-trật tự Qty
 DocType: Leave Block List Date,Leave Block List Date,Để lại Danh sách Chặn ngày
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +25,Scheduled to send to {0},Dự kiến gửi đến {0}
@@ -792,18 +761,16 @@
 DocType: Sales Invoice Item,Stock Details,Chi tiết chứng khoán
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Giá trị dự án
 apps/erpnext/erpnext/config/selling.py +304,Point-of-Sale,Điểm bán hàng
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,Cannot carry forward {0},Không thể thực hiện chuyển tiếp {0}
 apps/erpnext/erpnext/accounts/doctype/account/account.py +91,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","Số dư tài khoản đã có trong tín dụng, bạn không được phép để thiết lập 'cân Must Be' là 'Nợ'"
 DocType: Account,Balance must be,Cân bằng phải
 DocType: Hub Settings,Publish Pricing,Xuất bản Pricing
 DocType: Notification Control,Expense Claim Rejected Message,Thông báo yêu cầu bồi thường chi phí từ chối
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +145,Nailing,Xuất chúng
 ,Available Qty,Số lượng có sẵn
 DocType: Purchase Taxes and Charges,On Previous Row Total,Trước trên Row Tổng số
 DocType: Salary Slip,Working Days,Ngày làm việc
 DocType: Serial No,Incoming Rate,Tỷ lệ đến
 DocType: Packing Slip,Gross Weight,Tổng trọng lượng
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +410,The name of your company for which you are setting up this system.,Tên của công ty của bạn mà bạn đang thiết lập hệ thống này.
+apps/erpnext/erpnext/public/js/setup_wizard.js +158,The name of your company for which you are setting up this system.,Tên của công ty của bạn mà bạn đang thiết lập hệ thống này.
 DocType: HR Settings,Include holidays in Total no. of Working Days,Bao gồm các ngày lễ trong Tổng số không. Days làm việc
 DocType: Job Applicant,Hold,Giữ
 DocType: Employee,Date of Joining,Tham gia ngày
@@ -813,7 +780,6 @@
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +3,View Subscribers,Xem Subscribers
 DocType: Purchase Invoice Item,Purchase Receipt,Mua hóa đơn
 ,Received Items To Be Billed,Mục nhận được lập hoá đơn
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +114,Abrasive blasting,Phun mài mòn
 DocType: Employee,Ms,Ms
 apps/erpnext/erpnext/config/accounts.py +148,Currency exchange rate master.,Tổng tỷ giá hối đoái.
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +253,Unable to find Time Slot in the next {0} days for Operation {1},Không thể tìm Time Khe cắm trong {0} ngày tới cho Chiến {1}
@@ -825,7 +791,7 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +209,Serial No {0} does not belong to Item {1},Không nối tiếp {0} không thuộc về hàng {1}
 DocType: Purchase Receipt Item Supplied,Required Qty,Số lượng yêu cầu
 DocType: Bank Reconciliation,Total Amount,Tổng tiền
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +32,Internet Publishing,Internet xuất bản
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,Internet xuất bản
 DocType: Production Planning Tool,Production Orders,Đơn đặt hàng sản xuất
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +35,Balance Value,Cân bằng giá trị gia tăng
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,Danh sách bán hàng giá
@@ -836,7 +802,7 @@
 DocType: Supplier,Default Payable Accounts,Mặc định Accounts Payable
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,Nhân viên {0} không hoạt động hoặc không tồn tại
 DocType: Features Setup,Item Barcode,Mục mã vạch
-apps/erpnext/erpnext/stock/doctype/item/item.py +487,Item Variants {0} updated,Các biến thể mục {0} cập nhật
+apps/erpnext/erpnext/stock/doctype/item/item.py +491,Item Variants {0} updated,Các biến thể mục {0} cập nhật
 DocType: Quality Inspection Reading,Reading 6,Đọc 6
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Mua hóa đơn trước
 DocType: Address,Shop,Cửa hàng
@@ -845,7 +811,7 @@
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,Mặc định tài khoản ngân hàng / tiền mặt sẽ được tự động cập nhật trong POS hóa đơn khi chế độ này được chọn.
 DocType: Employee,Permanent Address Is,Địa chỉ thường trú là
 DocType: Production Order Operation,Operation completed for how many finished goods?,Hoạt động hoàn thành cho bao nhiêu thành phẩm?
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +491,The Brand,Các thương hiệu
+apps/erpnext/erpnext/public/js/setup_wizard.js +237,The Brand,Các thương hiệu
 apps/erpnext/erpnext/controllers/status_updater.py +163,Allowance for over-{0} crossed for Item {1}.,Trợ cấp cho quá {0} vượt qua cho mục {1}.
 DocType: Employee,Exit Interview Details,Chi tiết thoát Phỏng vấn
 DocType: Item,Is Purchase Item,Là mua hàng
@@ -865,16 +831,16 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Indirect Income,Thu nhập gián tiếp
 DocType: Payment Tool,Set Payment Amount = Outstanding Amount,Đặt Số tiền thanh toán = Số tiền xuất sắc
 DocType: Contact Us Settings,Address Line 1,Địa chỉ Line 1
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Variance,Variance
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +392,Company Name,Tên công ty
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +53,Variance,Variance
+,Company Name,Tên công ty
 DocType: SMS Center,Total Message(s),Tổng số tin nhắn (s)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +515,Select Item for Transfer,Chọn mục Chuyển giao
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +538,Select Item for Transfer,Chọn mục Chuyển giao
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,Xem danh sách tất cả các video giúp đỡ
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,Chọn đầu tài khoản của ngân hàng nơi kiểm tra đã được gửi.
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,Cho phép người dùng chỉnh sửa Giá liệt kê Tỷ giá giao dịch
 DocType: Pricing Rule,Max Qty,Số lượng tối đa
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +106,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Row {0}: Thanh toán chống Bán hàng / Mua hàng nên luôn luôn được đánh dấu là trước
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +16,Chemical,Mối nguy hóa học
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,Mối nguy hóa học
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +693,All items have already been transferred for this Production Order.,Tất cả các mặt hàng đã được chuyển giao cho đặt hàng sản xuất này.
 DocType: Process Payroll,Select Payroll Year and Month,Chọn Payroll Năm và Tháng
 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""",Tới các nhóm thích hợp (thường là ứng dụng của Quỹ&gt; Tài sản ngắn hạn&gt; Tài khoản ngân hàng và tạo một tài khoản mới (bằng cách nhấn vào Add Child) của loại &quot;Ngân hàng&quot;
@@ -885,12 +851,12 @@
 DocType: Item,Inspection Criteria,Tiêu chuẩn kiểm tra
 apps/erpnext/erpnext/config/accounts.py +101,Tree of finanial Cost Centers.,Cây của Trung tâm Chi phí finanial.
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,Nhận chuyển nhượng
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +492,Upload your letter head and logo. (you can edit them later).,Tải lên đầu thư của bạn và logo. (Bạn có thể chỉnh sửa chúng sau này).
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +156,White,Trắng
+apps/erpnext/erpnext/public/js/setup_wizard.js +238,Upload your letter head and logo. (you can edit them later).,Tải lên đầu thư của bạn và logo. (Bạn có thể chỉnh sửa chúng sau này).
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,White,Trắng
 DocType: SMS Center,All Lead (Open),Tất cả chì (Open)
 DocType: Purchase Invoice,Get Advances Paid,Được trả tiền trước
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +362,Attach Your Picture,Hình ảnh đính kèm của bạn
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Make ,Làm
+apps/erpnext/erpnext/public/js/setup_wizard.js +112,Attach Your Picture,Hình ảnh đính kèm của bạn
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +540,Make ,Làm
 DocType: Journal Entry,Total Amount in Words,Tổng số tiền trong từ
 DocType: Workflow State,Stop,dừng lại
 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.,Có một lỗi. Một lý do có thể xảy ra có thể là bạn đã không được lưu dưới dạng. Vui lòng liên hệ support@erpnext.com nếu vấn đề vẫn tồn tại.
@@ -899,14 +865,13 @@
 DocType: Lead,Next Contact Date,Tiếp theo Liên lạc ngày
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,Mở Số lượng
 DocType: Holiday List,Holiday List Name,Kỳ nghỉ Danh sách Tên
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +168,Stock Options,Tùy chọn chứng khoán
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +168,Stock Options,Tùy chọn chứng khoán
 DocType: Journal Entry Account,Expense Claim,Chi phí bồi thường
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +181,Qty for {0},Số lượng cho {0}
 DocType: Leave Application,Leave Application,Để lại ứng dụng
 apps/erpnext/erpnext/config/hr.py +77,Leave Allocation Tool,Công cụ để phân bổ
 DocType: Leave Block List,Leave Block List Dates,Để lại Danh sách Chặn Ngày
 DocType: Company,If Monthly Budget Exceeded (for expense account),Nếu ngân sách hàng tháng Vượt quá (đối với tài khoản chi phí)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +56,Trimming,Cắt
 DocType: Workstation,Net Hour Rate,Tỷ Hour Net
 DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,Chi phí hạ cánh mua hóa đơn
 DocType: Company,Default Terms,Mặc định khoản
@@ -914,10 +879,9 @@
 DocType: POS Profile,Cash/Bank Account,Tài khoản tiền mặt / Ngân hàng
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,Removed items with no change in quantity or value.,Các mục gỡ bỏ không có thay đổi về số lượng hoặc giá trị.
 DocType: Delivery Note,Delivery To,Để giao hàng
-apps/erpnext/erpnext/stock/doctype/item/item.py +509,Attribute table is mandatory,Bảng thuộc tính là bắt buộc
+apps/erpnext/erpnext/stock/doctype/item/item.py +513,Attribute table is mandatory,Bảng thuộc tính là bắt buộc
 DocType: Production Planning Tool,Get Sales Orders,Nhận hàng đơn đặt hàng
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} không bị âm
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +103,Filing,Nộp hồ sơ
 apps/erpnext/erpnext/templates/form_grid/item_grid.html +72,Discount,Giảm giá
 DocType: Features Setup,Purchase Discounts,Giảm giá mua
 DocType: Workstation,Wages,Tiền lương
@@ -934,6 +898,7 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +112,You are the Expense Approver for this record. Please Update the 'Status' and Save,Bạn là người phê duyệt chi phí cho hồ sơ này. Xin vui lòng cập nhật 'Trạng thái' và tiết kiệm
 DocType: Serial No,Creation Document No,Tạo ra văn bản số
 DocType: Issue,Issue,Nội dung:
+apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account does not match with Company,Tài khoản không phù hợp với Công ty
 apps/erpnext/erpnext/config/stock.py +136,"Attributes for Item Variants. e.g Size, Color etc.","Các thuộc tính cho khoản biến thể. ví dụ như kích cỡ, màu sắc, vv"
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +39,WIP Warehouse,WIP kho
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +194,Serial No {0} is under maintenance contract upto {1},Không nối tiếp {0} là theo hợp đồng bảo trì tối đa {1}
@@ -942,7 +907,7 @@
 DocType: Tax Rule,Shipping State,Vận Chuyển Nhà nước
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,Item phải được bổ sung bằng cách sử dụng 'Nhận Items từ Mua Tiền thu' nút
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,Chi phí bán hàng
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Buying,Tiêu chuẩn mua
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +120,Standard Buying,Tiêu chuẩn mua
 DocType: GL Entry,Against,Chống lại
 DocType: Item,Default Selling Cost Center,Trung tâm Chi phí bán hàng mặc định
 DocType: Sales Partner,Implementation Partner,Đối tác thực hiện
@@ -963,29 +928,29 @@
 DocType: Time Log Batch,updated via Time Logs,cập nhật thông qua Thời gian Logs
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,Tuổi trung bình
 DocType: Opportunity,Your sales person who will contact the customer in future,"Người bán hàng của bạn, những người sẽ liên lạc với khách hàng trong tương lai"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +588,List a few of your suppliers. They could be organizations or individuals.,"Danh sách một số nhà cung cấp của bạn. Họ có thể là các tổ chức, cá nhân."
+apps/erpnext/erpnext/public/js/setup_wizard.js +326,List a few of your suppliers. They could be organizations or individuals.,"Danh sách một số nhà cung cấp của bạn. Họ có thể là các tổ chức, cá nhân."
 DocType: Company,Default Currency,Mặc định tệ
 DocType: Contact,Enter designation of this Contact,Nhập chỉ định liên lạc này
 DocType: Contact Us Settings,Address,Địa chỉ
 DocType: Expense Claim,From Employee,Từ nhân viên
-apps/erpnext/erpnext/controllers/accounts_controller.py +338,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Cảnh báo: Hệ thống sẽ không kiểm tra overbilling từ số tiền cho mục {0} trong {1} là số không
+apps/erpnext/erpnext/controllers/accounts_controller.py +339,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Cảnh báo: Hệ thống sẽ không kiểm tra overbilling từ số tiền cho mục {0} trong {1} là số không
 DocType: Journal Entry,Make Difference Entry,Hãy khác biệt nhập
 DocType: Upload Attendance,Attendance From Date,Từ ngày tham gia
 DocType: Appraisal Template Goal,Key Performance Area,Hiệu suất chủ chốt trong khu vực
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +54,Transportation,Vận chuyển
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +54,Transportation,Vận chuyển
 apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +67, and year: ,
 DocType: Email Digest,Annual Expense,Chi phí hàng năm
 DocType: SMS Center,Total Characters,Tổng số nhân vật
-apps/erpnext/erpnext/controllers/buying_controller.py +139,Please select BOM in BOM field for Item {0},Vui lòng chọn BOM BOM trong lĩnh vực cho hàng {0}
+apps/erpnext/erpnext/controllers/buying_controller.py +130,Please select BOM in BOM field for Item {0},Vui lòng chọn BOM BOM trong lĩnh vực cho hàng {0}
 DocType: C-Form Invoice Detail,C-Form Invoice Detail,C-Mẫu hóa đơn chi tiết
 DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,Hòa giải thanh toán hóa đơn
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +32,Contribution %,Đóng góp%
 DocType: Item,website page link,liên kết trang web
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +192,Let's prepare the system for first use.,Hãy chuẩn bị hệ thống để sử dụng đầu tiên.
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +242,Let's prepare the system for first use.,Hãy chuẩn bị hệ thống để sử dụng đầu tiên.
 DocType: Company,Company registration numbers for your reference. Tax numbers etc.,Số đăng ký công ty để bạn tham khảo. Số thuế vv
 DocType: Sales Partner,Distributor,Nhà phân phối
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Shopping Cart Shipping Rule
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +214,Production Order {0} must be cancelled before cancelling this Sales Order,Đặt hàng sản xuất {0} phải được hủy bỏ trước khi hủy bỏ đơn đặt hàng này
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +209,Production Order {0} must be cancelled before cancelling this Sales Order,Đặt hàng sản xuất {0} phải được hủy bỏ trước khi hủy bỏ đơn đặt hàng này
 ,Ordered Items To Be Billed,Ra lệnh tiêu được lập hoá đơn
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +24,From Range has to be less than To Range,Từ Phạm vi có thể ít hơn Để Phạm vi
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +21,Select Time Logs and Submit to create a new Sales Invoice.,Chọn Thời gian Logs và Submit để tạo ra một hóa đơn bán hàng mới.
@@ -1005,14 +970,13 @@
 DocType: Sales Invoice Advance,Sales Invoice Advance,Hóa đơn bán hàng trước
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +398,Nothing to request,Không có gì để yêu cầu
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date','Ngày bắt đầu thực tế' không thể lớn hơn 'thực tế Ngày kết thúc'
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +75,Management,Quản lý
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +75,Management,Quản lý
 apps/erpnext/erpnext/config/projects.py +33,Types of activities for Time Sheets,Loại hoạt động cho Thời gian Sheets
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +14,Investment casting,Đầu tư đúc
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +51,Either debit or credit amount is required for {0},Hoặc thẻ ghi nợ hoặc tín dụng số tiền được yêu cầu cho {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""","Điều này sẽ được nối thêm vào các mã hàng của các biến thể. Ví dụ, nếu bạn viết tắt là ""SM"", và các mã hàng là ""T-shirt"", các mã hàng của các biến thể sẽ là ""T-shirt-SM"""
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,Net phải trả tiền (bằng chữ) sẽ được hiển thị khi bạn lưu Phiếu lương.
 apps/frappe/frappe/core/doctype/user/user_list.js +12,Active,Chủ động
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +154,Blue,Màu xanh
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +154,Blue,Màu xanh
 DocType: Purchase Invoice,Is Return,Là Return
 DocType: Price List Country,Price List Country,Giá Danh sách Country
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +123,Further nodes can be only created under 'Group' type nodes,Các nút khác có thể được chỉ tạo ra dưới các nút kiểu 'Nhóm'
@@ -1022,18 +986,16 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +22,POS Profile {0} already created for user: {1} and company {2},POS Hồ sơ {0} đã được tạo ra cho người sử dụng: {1} và công ty {2}
 DocType: Purchase Order Item,UOM Conversion Factor,UOM chuyển đổi yếu tố
 DocType: Stock Settings,Default Item Group,Mặc định mục Nhóm
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +156,Laminated object manufacturing,Sản xuất vật Laminated
 apps/erpnext/erpnext/config/buying.py +13,Supplier database.,Cơ sở dữ liệu nhà cung cấp.
 DocType: Account,Balance Sheet,Cân đối kế toán
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +561,Cost Center For Item with Item Code ',Trung tâm chi phí Đối với mục Item Code '
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +45,Stretch forming,Stretch hình thành
 DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,Người bán hàng của bạn sẽ nhận được một lời nhắc nhở trong ngày này để liên lạc với khách hàng
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +210,"Further accounts can be made under Groups, but entries can be made against non-Groups","Tài khoản có thể tiếp tục được thực hiện theo nhóm, nhưng mục có thể được thực hiện đối với phi Groups"
 apps/erpnext/erpnext/config/hr.py +125,Tax and other salary deductions.,Thuế và các khoản khấu trừ lương khác.
 DocType: Lead,Lead,Lead
 DocType: Email Digest,Payables,Phải trả
 DocType: Account,Warehouse,Web App Ghi chú
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +90,Row #{0}: Rejected Qty can not be entered in Purchase Return,Row # {0}: Bị từ chối Số lượng không thể được nhập vào Mua Return
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +93,Row #{0}: Rejected Qty can not be entered in Purchase Return,Row # {0}: Bị từ chối Số lượng không thể được nhập vào Mua Return
 ,Purchase Order Items To Be Billed,Tìm mua hàng được lập hoá đơn
 DocType: Purchase Invoice Item,Net Rate,Tỷ Net
 DocType: Purchase Invoice Item,Purchase Invoice Item,Hóa đơn mua hàng
@@ -1048,13 +1010,13 @@
 DocType: Global Defaults,Current Fiscal Year,Năm tài chính hiện tại
 DocType: Global Defaults,Disable Rounded Total,Vô hiệu hóa Tròn Tổng số
 DocType: Lead,Call,Cuộc gọi
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +384,'Entries' cannot be empty,'Entries' không thể để trống
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +386,'Entries' cannot be empty,'Entries' không thể để trống
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},Hàng trùng lặp {0} với cùng {1}
 ,Trial Balance,Xét xử dư
 apps/erpnext/erpnext/config/hr.py +205,Setting up Employees,Thiết lập Nhân viên
 apps/erpnext/erpnext/public/js/feature_setup.js +220,"Grid ""","Lưới """
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +150,Please select prefix first,Vui lòng chọn tiền tố đầu tiên
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +138,Research,Nghiên cứu
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +138,Research,Nghiên cứu
 DocType: Maintenance Visit Purpose,Work Done,Xong công việc
 apps/erpnext/erpnext/controllers/item_variant.py +25,Please specify at least one attribute in the Attributes table,Xin vui lòng ghi rõ ít nhất một thuộc tính trong bảng thuộc tính
 DocType: Contact,User ID,ID người dùng
@@ -1062,10 +1024,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +57,View Ledger,Xem Ledger
 DocType: File,Lft,lft
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Sớm nhất
-apps/erpnext/erpnext/stock/doctype/item/item.py +394,"An Item Group exists with same name, please change the item name or rename the item group","Một mục Nhóm tồn tại với cùng một tên, hãy thay đổi tên mục hoặc đổi tên nhóm mặt hàng"
+apps/erpnext/erpnext/stock/doctype/item/item.py +398,"An Item Group exists with same name, please change the item name or rename the item group","Một mục Nhóm tồn tại với cùng một tên, hãy thay đổi tên mục hoặc đổi tên nhóm mặt hàng"
 DocType: Communication,Delivery Status,Tình trạng giao
 DocType: Production Order,Manufacture against Sales Order,Sản xuất với bán hàng đặt hàng
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +517,Rest Of The World,Phần còn lại của Thế giới
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +455,Rest Of The World,Phần còn lại của Thế giới
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,Item {0} không thể có hàng loạt
 ,Budget Variance Report,Báo cáo ngân sách phương sai
 DocType: Salary Slip,Gross Pay,Tổng phải trả tiền
@@ -1076,13 +1038,11 @@
 DocType: BOM Item,Item Description,Mô tả hạng mục
 DocType: Payment Tool,Payment Mode,Chế độ thanh toán
 DocType: Purchase Invoice,Is Recurring,Là định kỳ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +154,Direct metal laser sintering,Kim loại trực tiếp tia laser thiêu kết
 DocType: Purchase Order,Supplied Items,Hàng đã cung cấp
 DocType: Production Order,Qty To Manufacture,Số lượng Để sản xuất
 DocType: Buying Settings,Maintain same rate throughout purchase cycle,Duy trì cùng một tốc độ trong suốt chu kỳ mua
 DocType: Opportunity Item,Opportunity Item,Cơ hội mục
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +61,Temporary Opening,Mở cửa tạm thời
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +41,Cryorolling,Cryorolling
 ,Employee Leave Balance,Để lại cân nhân viên
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +128,Balance for Account {0} must always be {1},Cân bằng cho Tài khoản {0} luôn luôn phải có {1}
 DocType: Address,Address Type,Địa chỉ Loại
@@ -1098,23 +1058,23 @@
 DocType: Journal Entry,Get Outstanding Invoices,Được nổi bật Hoá đơn
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,Bán hàng đặt hàng {0} không hợp lệ
 apps/erpnext/erpnext/setup/doctype/company/company.py +172,"Sorry, companies cannot be merged","Xin lỗi, công ty không thể được sáp nhập"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +145,Small,Nhỏ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Small,Nhỏ
 DocType: Employee,Employee Number,Số nhân viên
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},Không trường hợp (s) đã được sử dụng. Cố gắng từ Trường hợp thứ {0}
 ,Invoiced Amount (Exculsive Tax),Số tiền ghi trên hóa đơn (thuế Exculsive)
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,Khoản 2
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +59,Account head {0} created,Đầu tài khoản {0} tạo
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +153,Green,Xanh
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Green,Xanh
 DocType: Item,Auto re-order,Auto lại trật tự
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +57,Total Achieved,Tổng số đã đạt được
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +59,Total Achieved,Tổng số đã đạt được
 DocType: Employee,Place of Issue,Nơi cấp
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +59,Contract,hợp đồng
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Contract,hợp đồng
 DocType: Report,Disabled,Đã tắt
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +490,UOM coversion factor required for UOM: {0} in Item: {1},Yếu tố cần thiết cho coversion UOM UOM: {0} trong Item: {1}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +83,Indirect Expenses,Chi phí gián tiếp
 apps/erpnext/erpnext/controllers/selling_controller.py +163,Row {0}: Qty is mandatory,Hàng {0}: Số lượng là bắt buộc
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +8,Agriculture,Nông nghiệp
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +611,Your Products or Services,Sản phẩm hoặc dịch vụ của bạn
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,Nông nghiệp
+apps/erpnext/erpnext/public/js/setup_wizard.js +347,Your Products or Services,Sản phẩm hoặc dịch vụ của bạn
 DocType: Mode of Payment,Mode of Payment,Hình thức thanh toán
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,Đây là một nhóm mục gốc và không thể được chỉnh sửa.
 DocType: Journal Entry Account,Purchase Order,Mua hàng
@@ -1126,7 +1086,7 @@
 DocType: Serial No,Serial No Details,Không có chi tiết nối tiếp
 DocType: Purchase Invoice Item,Item Tax Rate,Mục Thuế suất
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +113,"For {0}, only credit accounts can be linked against another debit entry","Đối với {0}, tài khoản tín dụng chỉ có thể được liên kết chống lại mục nợ khác"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Delivery Note {0} is not submitted,Giao hàng Ghi {0} không nộp
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +470,Delivery Note {0} is not submitted,Giao hàng Ghi {0} không nộp
 apps/erpnext/erpnext/stock/get_item_details.py +136,Item {0} must be a Sub-contracted Item,Mục {0} phải là một mục phụ ký hợp đồng
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,Thiết bị vốn
 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.","Giá Rule là lần đầu tiên được lựa chọn dựa trên 'Áp dụng trên' lĩnh vực, có thể được Item, mục Nhóm hoặc thương hiệu."
@@ -1136,7 +1096,7 @@
 DocType: Appraisal Goal,Goal,Mục tiêu
 DocType: Sales Invoice Item,Edit Description,Chỉnh sửa Mô tả
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +318,Expected Delivery Date is lesser than Planned Start Date.,Dự kiến ​​giao hàng ngày là ít hơn so với Planned Ngày bắt đầu.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +579,For Supplier,Cho Nhà cung cấp
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +602,For Supplier,Cho Nhà cung cấp
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,Loại Cài đặt Tài khoản giúp trong việc lựa chọn tài khoản này trong các giao dịch.
 DocType: Purchase Invoice,Grand Total (Company Currency),Tổng cộng (Công ty tiền tệ)
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,Tổng số Outgoing
@@ -1162,10 +1122,10 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +74,"Total {0} for all items is zero, may you should change 'Distribute Charges Based On'","Tổng số {0} cho tất cả các mặt hàng là số không, có thể bạn nên thay đổi &#39;Phân phối Phí Dựa trên&#39;"
 DocType: Purchase Invoice,Taxes and Charges Calculation,Thuế và lệ phí tính
 DocType: BOM Operation,Workstation,Máy trạm
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +112,Hardware,Phần cứng
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +112,Hardware,Phần cứng
 DocType: Attendance,HR Manager,Trưởng phòng Nhân sự
 apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,Hãy lựa chọn một công ty
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +50,Privilege Leave,Để lại đặc quyền
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +50,Privilege Leave,Để lại đặc quyền
 DocType: Purchase Invoice,Supplier Invoice Date,Nhà cung cấp hóa đơn ngày
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +79,You need to enable Shopping Cart,Bạn cần phải kích hoạt Giỏ hàng
 apps/frappe/frappe/public/js/frappe/form/grid_body.html +6,No Data,Không có dữ liệu
@@ -1178,7 +1138,7 @@
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +81,Overlapping conditions found between:,Điều kiện chồng chéo tìm thấy giữa:
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +168,Against Journal Entry {0} is already adjusted against some other voucher,Chống Journal nhập {0} đã được điều chỉnh đối với một số chứng từ khác
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +68,Total Order Value,Tổng giá trị theo thứ tự
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +38,Food,Thực phẩm
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +38,Food,Thực phẩm
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Phạm vi Ageing 3
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +139,You can make a time log only against a submitted production order,Bạn có thể tạo một bản ghi thời gian chỉ chống lại một lệnh sản xuất gửi
 DocType: Maintenance Schedule Item,No of Visits,Không có các chuyến thăm
@@ -1198,6 +1158,7 @@
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,View Offer Letter,Xem Offer Letter
 DocType: Communication,Communication,Liên lạc
 DocType: Item,Is Service Item,Là dịch vụ hàng
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +81,Application period cannot be outside leave allocation period,Kỳ ứng dụng không thể có thời gian phân bổ nghỉ bên ngoài
 DocType: Activity Cost,Projects,Dự án
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +31,Please select Fiscal Year,Vui lòng chọn năm tài chính
 apps/erpnext/erpnext/controllers/buying_controller.py +23,From {0} | {1} {2},Từ {0} | {1} {2}
@@ -1216,7 +1177,7 @@
 DocType: Item,Maintain Stock,Duy trì Cổ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +213,Stock Entries already created for Production Order ,Cổ Entries đã tạo ra cho sản xuất theo thứ tự
 DocType: Leave Control Panel,Leave blank if considered for all designations,Để trống nếu xem xét tất cả các chỉ định
-apps/erpnext/erpnext/controllers/accounts_controller.py +499,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Phí của loại 'thực tế' {0} hàng không có thể được bao gồm trong mục Rate
+apps/erpnext/erpnext/controllers/accounts_controller.py +500,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Phí của loại 'thực tế' {0} hàng không có thể được bao gồm trong mục Rate
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,Max: {0},Max: {0}
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +16,From Datetime,Từ Datetime
 DocType: Email Digest,For Company,Đối với công ty
@@ -1226,7 +1187,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +50,Chart of Accounts,Danh mục tài khoản
 DocType: Material Request,Terms and Conditions Content,Điều khoản và Điều kiện nội dung
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +471,cannot be greater than 100,không có thể lớn hơn 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +546,Item {0} is not a stock Item,Mục {0} không phải là một cổ phiếu hàng
+apps/erpnext/erpnext/stock/doctype/item/item.py +550,Item {0} is not a stock Item,Mục {0} không phải là một cổ phiếu hàng
 DocType: Maintenance Visit,Unscheduled,Đột xuất
 DocType: Employee,Owned,Sở hữu
 DocType: Salary Slip Deduction,Depends on Leave Without Pay,Phụ thuộc vào Leave Nếu không phải trả tiền
@@ -1240,31 +1201,29 @@
 DocType: HR Settings,Employee Settings,Thiết lập nhân viên
 ,Batch-Wise Balance History,Lô-Wise cân Lịch sử
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +72,To Do List,Để làm Danh sách
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +63,Apprentice,Người học việc
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Apprentice,Người học việc
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +99,Negative Quantity is not allowed,Số lượng tiêu cực không được phép
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
 Used for Taxes and Charges","Thuế bảng chi tiết lấy từ chủ hàng là một chuỗi và lưu trữ trong lĩnh vực này.
  Được sử dụng cho thuế và phí"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +61,Lancing,Lancing
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +151,Employee cannot report to himself.,Nhân viên không thể báo cáo với chính mình.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Nếu tài khoản bị đóng băng, các mục được phép sử dụng hạn chế."
 DocType: Email Digest,Bank Balance,Ngân hàng Balance
-apps/erpnext/erpnext/controllers/accounts_controller.py +435,Accounting Entry for {0}: {1} can only be made in currency: {2},Nhập kế toán cho {0}: {1} chỉ có thể được thực hiện bằng tiền tệ: {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +436,Accounting Entry for {0}: {1} can only be made in currency: {2},Nhập kế toán cho {0}: {1} chỉ có thể được thực hiện bằng tiền tệ: {2}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +38,No active Salary Structure found for employee {0} and the month,Không có cấu lương cho người lao động tìm thấy {0} và tháng
 DocType: Job Opening,"Job profile, qualifications required etc.","Hồ sơ công việc, trình độ chuyên môn cần thiết vv"
 DocType: Journal Entry Account,Account Balance,Số dư tài khoản
 apps/erpnext/erpnext/config/accounts.py +112,Tax Rule for transactions.,Rule thuế cho các giao dịch.
 DocType: Rename Tool,Type of document to rename.,Loại tài liệu để đổi tên.
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +630,We buy this Item,Chúng tôi mua sản phẩm này
+apps/erpnext/erpnext/public/js/setup_wizard.js +366,We buy this Item,Chúng tôi mua sản phẩm này
 DocType: Address,Billing,Thanh toán cước
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +77,Flanging,Gấp mép
 DocType: Bulk Email,Not Sent,Không gửi
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +73,Explosive forming,Nổ hình thành
 DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),Tổng số thuế và lệ phí (Công ty tiền tệ)
 DocType: Shipping Rule,Shipping Account,Tài khoản vận chuyển
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +43,Scheduled to send to {0} recipients,Dự kiến gửi đến {0} người nhận
 DocType: Quality Inspection,Readings,Đọc
 DocType: Stock Entry,Total Additional Costs,Tổng chi phí bổ sung
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Sub Assemblies,Phụ hội
+apps/erpnext/erpnext/public/js/setup_wizard.js +359,Sub Assemblies,Phụ hội
 DocType: Shipping Rule Condition,To Value,Để giá trị gia tăng
 DocType: Supplier,Stock Manager,Cổ Quản lý
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +143,Source warehouse is mandatory for row {0},Kho nguồn là bắt buộc đối với hàng {0}
@@ -1274,44 +1233,42 @@
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Nhập khẩu thất bại!
 apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,Không có địa chỉ nào được bổ sung.
 DocType: Workstation Working Hour,Workstation Working Hour,Workstation Giờ làm việc
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +83,Analyst,Chuyên viên phân tích
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +202,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Row {0}: Phân bổ số lượng {1} phải nhỏ hơn hoặc bằng số tiền JV {2}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Analyst,Chuyên viên phân tích
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +149,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Row {0}: Phân bổ số lượng {1} phải nhỏ hơn hoặc bằng số tiền JV {2}
 DocType: Item,Inventory,Hàng tồn kho
 DocType: Features Setup,"To enable ""Point of Sale"" view",Để kích hoạt tính năng &quot;Point of Sale&quot; view
 apps/erpnext/erpnext/public/js/pos/pos.js +402,Payment cannot be made for empty cart,Thanh toán không thể được thực hiện cho hàng trống
 DocType: Item,Sales Details,Thông tin chi tiết bán hàng
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +149,Pinning,Ghim
 DocType: Opportunity,With Items,Với mục
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,Số lượng trong
 DocType: Notification Control,Expense Claim Rejected,Chi phí yêu cầu bồi thường bị từ chối
 DocType: Sales Invoice,"The date on which next invoice will be generated. It is generated on submit.
 ","Ngày, tháng, hóa đơn tiếp theo sẽ được tạo ra. Nó được tạo ra trên trình."
 DocType: Item Attribute,Item Attribute,Mục Attribute
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +105,Government,Chính phủ.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Government,Chính phủ.
 apps/erpnext/erpnext/config/stock.py +268,Item Variants,Mục Biến thể
 DocType: Company,Services,Dịch vụ
 apps/erpnext/erpnext/accounts/report/financial_statements.py +147,Total ({0}),Tổng số ({0})
 DocType: Cost Center,Parent Cost Center,Trung tâm Chi phí cha mẹ
 DocType: Sales Invoice,Source,Nguồn
 DocType: Leave Type,Is Leave Without Pay,Nếu không có được Leave Pay
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +186,No records found in the Payment table,Không có hồ sơ được tìm thấy trong bảng thanh toán
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +405,Financial Year Start Date,Năm tài chính bắt đầu ngày
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +133,No records found in the Payment table,Không có hồ sơ được tìm thấy trong bảng thanh toán
+apps/erpnext/erpnext/public/js/setup_wizard.js +153,Financial Year Start Date,Năm tài chính bắt đầu ngày
 DocType: Employee External Work History,Total Experience,Tổng số kinh nghiệm
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +100,Countersinking,Countersinking
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +271,Packing Slip(s) cancelled,Đóng gói trượt (s) bị hủy bỏ
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +276,Packing Slip(s) cancelled,Đóng gói trượt (s) bị hủy bỏ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,Vận tải hàng hóa và chuyển tiếp phí
 DocType: Material Request Item,Sales Order No,Không bán hàng đặt hàng
 DocType: Item Group,Item Group Name,Mục Group Name
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +50,Taken,Lấy
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,Lấy
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +66,Transfer Materials for Manufacture,Chuyển Vật liệu cho sản xuất
 DocType: Pricing Rule,For Price List,Đối với Bảng giá
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +27,Executive Search,Điều hành Tìm kiếm
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,Điều hành Tìm kiếm
 apps/erpnext/erpnext/stock/stock_ledger.py +405,"Purchase rate for item: {0} not found, which is required to book accounting entry (expense). Please mention item price against a buying price list.","Mua suất cho mặt hàng: {0} không tìm thấy, đó là cần thiết để đặt mục chiếm (chi phí). Xin đề cập đến giá mục với một danh sách giá mua."
 DocType: Maintenance Schedule,Schedules,Lịch
 DocType: Purchase Invoice Item,Net Amount,Số tiền Net
 DocType: Purchase Order Item Supplied,BOM Detail No,BOM chi tiết Không
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),Thêm GIẢM Số tiền (Công ty tiền tệ)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +537,Error: {0} > {1},Lỗi: {0}> {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +541,Error: {0} > {1},Lỗi: {0}> {1}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,Xin vui lòng tạo tài khoản mới từ mục tài khoản.
 DocType: Maintenance Visit,Maintenance Visit,Bảo trì đăng nhập
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer > Customer Group > Territory,Khách hàng> Nhóm khách hàng> Lãnh thổ
@@ -1322,7 +1279,6 @@
 DocType: Event,Tuesday,Thứ ba
 DocType: Leave Block List,Block Holidays on important days.,Khối Holidays vào những ngày quan trọng.
 ,Accounts Receivable Summary,Tóm tắt các tài khoản phải thu
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +43,Leaves for type {0} already allocated for Employee {1} for period {2} - {3},Giữ cho loại {0} đã được phân bổ cho {1} Employee cho kỳ {2} - {3}
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +187,Please set User ID field in an Employee record to set Employee Role,Hãy thiết lập trường ID người dùng trong một hồ sơ nhân viên để thiết lập nhân viên Role
 DocType: UOM,UOM Name,Tên UOM
 DocType: Top Bar Item,Target,File thiết kế nguồn
@@ -1334,15 +1290,14 @@
 DocType: ToDo,Due Date,Ngày đáo hạn
 DocType: Sales Invoice Item,Brand Name,Thương hiệu
 DocType: Purchase Receipt,Transporter Details,Chi tiết Transporter
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Box,Box
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +389,The Organization,Tổ chức
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Box,Box
+apps/erpnext/erpnext/public/js/setup_wizard.js +137,The Organization,Tổ chức
 DocType: Monthly Distribution,Monthly Distribution,Phân phối hàng tháng
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,Danh sách người nhận có sản phẩm nào. Hãy tạo nhận Danh sách
 DocType: Production Plan Sales Order,Production Plan Sales Order,Kế hoạch sản xuất bán hàng đặt hàng
 DocType: Sales Partner,Sales Partner Target,Đối tác bán hàng mục tiêu
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},Nhập kế toán cho {0} chỉ có thể được thực hiện bằng tiền tệ: {1}
 DocType: Pricing Rule,Pricing Rule,Quy tắc định giá
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +58,Notching,Notching
 apps/erpnext/erpnext/config/learn.py +167,Material Request to Purchase Order,Yêu cầu vật chất để mua hàng
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +74,Row # {0}: Returned Item {1} does not exists in {2} {3},Row # {0}: trả lại hàng {1} không tồn tại trong {2} {3}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,Tài khoản ngân hàng
@@ -1359,20 +1314,19 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Amounts not reflected in bank,Số đã không được phản ánh trong ngân hàng
 DocType: Quality Inspection Reading,Reading 4,Đọc 4
 apps/erpnext/erpnext/config/hr.py +23,Claims for company expense.,Tuyên bố cho chi phí công ty.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +8,Centrifugal casting,Đúc ly tâm
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +119,Magnetic field-assisted finishing,Magnetic hoàn thiện lĩnh vực hỗ trợ
 DocType: Company,Default Holiday List,Mặc định Danh sách khách sạn Holiday
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +165,Stock Liabilities,Nợ phải trả chứng khoán
 DocType: Purchase Receipt,Supplier Warehouse,Nhà cung cấp kho
 DocType: Opportunity,Contact Mobile No,Liên hệ điện thoại di động Không
 DocType: Production Planning Tool,Select Sales Orders,Chọn hàng đơn đặt hàng
 ,Material Requests for which Supplier Quotations are not created,Các yêu cầu vật chất mà Trích dẫn Nhà cung cấp không được tạo ra
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +117,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,Ngày (s) mà bạn đang nộp đơn xin nghỉ phép là ngày nghỉ. Bạn không cần phải nộp đơn xin nghỉ phép.
 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.,Để theo dõi các mục sử dụng mã vạch. Bạn sẽ có thể nhập vào các mục trong giao hàng và hóa đơn bán hàng Lưu ý bằng cách quét mã vạch của sản phẩm.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +477,Mark as Delivered,Đánh dấu như Delivered
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +497,Mark as Delivered,Đánh dấu như Delivered
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +34,Make Quotation,Hãy báo giá
 DocType: Dependent Task,Dependent Task,Nhiệm vụ phụ thuộc
-apps/erpnext/erpnext/stock/doctype/item/item.py +306,Conversion factor for default Unit of Measure must be 1 in row {0},Yếu tố chuyển đổi cho Đơn vị đo mặc định phải là 1 trong hàng {0}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,Leave of type {0} cannot be longer than {1},Nghỉ phép loại {0} không thể dài hơn {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +310,Conversion factor for default Unit of Measure must be 1 in row {0},Yếu tố chuyển đổi cho Đơn vị đo mặc định phải là 1 trong hàng {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +155,Leave of type {0} cannot be longer than {1},Nghỉ phép loại {0} không thể dài hơn {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Hãy thử lên kế hoạch hoạt động cho ngày X trước.
 DocType: HR Settings,Stop Birthday Reminders,Ngừng sinh Nhắc nhở
 DocType: SMS Center,Receiver List,Danh sách người nhận
@@ -1380,15 +1334,14 @@
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Số tiền được tiêu thụ
 apps/erpnext/erpnext/public/js/pos/pos.js +491,{0} View,{0} Xem
 DocType: Salary Structure Deduction,Salary Structure Deduction,Cơ cấu tiền lương trích
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +158,Selective laser sintering,Selective thiêu kết bằng laser
-apps/erpnext/erpnext/stock/doctype/item/item.py +301,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Đơn vị đo {0} đã được nhập vào nhiều hơn một lần trong chuyển đổi yếu tố Bảng
+apps/erpnext/erpnext/stock/doctype/item/item.py +305,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Đơn vị đo {0} đã được nhập vào nhiều hơn một lần trong chuyển đổi yếu tố Bảng
 apps/frappe/frappe/core/page/data_import_tool/data_import_tool.js +108,Import Successful!,Nhập khẩu thành công!
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Chi phí của Items Ban hành
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +185,Quantity must not be more than {0},Số lượng không phải lớn hơn {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +41,Age (Days),Tuổi (Ngày)
 DocType: Quotation Item,Quotation Item,Báo giá hàng
 DocType: Account,Account Name,Tên tài khoản
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +41,From Date cannot be greater than To Date,Từ ngày không có thể lớn hơn Đến ngày
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +34,From Date cannot be greater than To Date,Từ ngày không có thể lớn hơn Đến ngày
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +194,Serial No {0} quantity {1} cannot be a fraction,Không nối tiếp {0} {1} số lượng không thể là một phần nhỏ
 apps/erpnext/erpnext/config/buying.py +59,Supplier Type master.,Loại nhà cung cấp tổng thể.
 DocType: Purchase Order Item,Supplier Part Number,Nhà cung cấp Phần số
@@ -1397,14 +1350,14 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +247,{0} {1} is cancelled or stopped,{0} {1} được huỷ bỏ hoặc dừng lại
 DocType: Accounts Settings,Credit Controller,Bộ điều khiển tín dụng
 DocType: Delivery Note,Vehicle Dispatch Date,Xe công văn ngày
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +197,Purchase Receipt {0} is not submitted,Mua hóa đơn {0} không nộp
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +198,Purchase Receipt {0} is not submitted,Mua hóa đơn {0} không nộp
 DocType: Company,Default Payable Account,Mặc định Account Payable
 apps/erpnext/erpnext/config/website.py +13,"Settings for online shopping cart such as shipping rules, price list etc.","Cài đặt cho các giỏ hàng mua sắm trực tuyến chẳng hạn như các quy tắc vận chuyển, bảng giá, vv"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +660,Setup Complete,การติดตั้งเสร็จสมบูรณ์
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +124,Setup Complete,การติดตั้งเสร็จสมบูรณ์
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +65,{0}% Billed,{0}% Được xem
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +17,Reserved Qty,Số lượng dự trữ
 DocType: Party Account,Party Account,Tài khoản của bên
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +74,Human Resources,Nhân sự
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +74,Human Resources,Nhân sự
 DocType: Lead,Upper Income,Thu nhập trên
 DocType: Journal Entry Account,Debit in Company Currency,Nợ Công ty ngoại tệ
 apps/erpnext/erpnext/support/doctype/issue/issue.py +58,My Issues,Các vấn đề của tôi
@@ -1413,11 +1366,9 @@
 DocType: Company,Default Values,Giá trị mặc định
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +236,Row {0}: Payment amount can not be negative,Row {0}: Số tiền thanh toán không thể phủ định
 DocType: Expense Claim,Total Amount Reimbursed,Tổng số tiền bồi hoàn
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +152,Press fitting,Nhấn lắp
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +64,Against Supplier Invoice {0} dated {1},Chống lại Nhà cung cấp hóa đơn {0} ngày {1}
 DocType: Customer,Default Price List,Mặc định Giá liệt kê
 DocType: Payment Reconciliation,Payments,Thanh toán
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +24,Hot isostatic pressing,Đẳng tĩnh Hot nhấn
 DocType: ToDo,Medium,Trung bình
 DocType: Budget Detail,Budget Allocated,Phân bổ ngân sách
 DocType: Journal Entry,Entry Type,Loại mục
@@ -1430,9 +1381,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +56,None of the items have any change in quantity or value.,Không ai trong số các mặt hàng có bất kỳ sự thay đổi về số lượng hoặc giá trị.
 DocType: Warranty Claim,Warranty Claim,Bảo hành yêu cầu bồi thường
 ,Lead Details,Chi tiết yêu cầu
-DocType: Authorization Rule,Approving User,Phê duyệt danh
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +37,Forging,Rèn
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +126,Plating,Mạ
 DocType: Purchase Invoice,End date of current invoice's period,Ngày kết thúc của thời kỳ hóa đơn hiện tại của
 DocType: Pricing Rule,Applicable For,Đối với áp dụng
 DocType: Bank Reconciliation,From Date,Từ ngày
@@ -1454,31 +1402,29 @@
 DocType: Sales Invoice,Paid Amount (Company Currency),Số tiền thanh toán (Công ty tiền tệ)
 DocType: Purchase Invoice,Additional Discount,Giảm thêm
 DocType: Selling Settings,Selling Settings,Bán thiết lập
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +39,Online Auctions,Đấu giá trực tuyến
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,Đấu giá trực tuyến
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +94,Please specify either Quantity or Valuation Rate or both,Xin vui lòng chỉ định hoặc lượng hoặc Tỷ lệ định giá hoặc cả hai
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +50,"Company, Month and Fiscal Year is mandatory","Công ty, tháng và năm tài chính là bắt buộc"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Marketing Expenses,Chi phí tiếp thị
 ,Item Shortage Report,Thiếu mục Báo cáo
-apps/erpnext/erpnext/stock/doctype/item/item.js +183,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Trọng lượng được đề cập, \n Xin đề cập đến ""Weight Ươm"" quá"
+apps/erpnext/erpnext/stock/doctype/item/item.js +185,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Trọng lượng được đề cập, \n Xin đề cập đến ""Weight Ươm"" quá"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,Yêu cầu vật liệu sử dụng để làm cho nhập chứng khoán này
 apps/erpnext/erpnext/config/support.py +43,Single unit of an Item.,Đơn vị duy nhất của một Item.
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +212,Time Log Batch {0} must be 'Submitted',Giờ hàng loạt {0} phải được 'Gửi'
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,Làm kế toán nhập Đối với tất cả phong trào Cổ
 DocType: Leave Allocation,Total Leaves Allocated,Tổng Lá Phân bổ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +384,Warehouse required at Row No {0},Kho yêu cầu tại Row Không {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +386,Warehouse required at Row No {0},Kho yêu cầu tại Row Không {0}
 DocType: Employee,Date Of Retirement,Trong ngày hưu trí
 DocType: Upload Attendance,Get Template,Nhận Mẫu
 DocType: Address,Postal,Bưu chính
 DocType: Item,Weightage,Weightage
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +159,Mining,Khai thác mỏ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +17,Resin casting,Đúc nhựa
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,Một Nhóm khách hàng tồn tại với cùng một tên xin thay đổi tên khách hàng hoặc đổi tên nhóm khách hàng
 apps/erpnext/erpnext/public/js/pos/pos.js +147,Please select {0} first.,Vui lòng chọn {0} đầu tiên.
 apps/erpnext/erpnext/templates/pages/order.html +57,text {0},text {0}
 DocType: Territory,Parent Territory,Lãnh thổ cha mẹ
 DocType: Quality Inspection Reading,Reading 2,Đọc 2
 DocType: Stock Entry,Material Receipt,Tiếp nhận tài liệu
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +622,Products,Sản phẩm
+apps/erpnext/erpnext/public/js/setup_wizard.js +358,Products,Sản phẩm
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +47,Party Type and Party is required for Receivable / Payable account {0},Đảng Loại và Đảng là cần thiết cho thu / tài khoản phải trả {0}
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.","Nếu mặt hàng này có các biến thể, sau đó nó có thể không được lựa chọn trong các đơn đặt hàng bán hàng vv"
 DocType: Lead,Next Contact By,Tiếp theo Liên By
@@ -1488,13 +1434,13 @@
 DocType: Purchase Invoice,Notification Email Address,Thông báo Địa chỉ Email
 DocType: Payment Tool,Find Invoices to Match,Tìm Hoá đơn to Match
 ,Item-wise Sales Register,Item-khôn ngoan doanh Đăng ký
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +399,"e.g. ""XYZ National Bank""","ví dụ như ""Ngân hàng Quốc gia XYZ """
+apps/erpnext/erpnext/public/js/setup_wizard.js +147,"e.g. ""XYZ National Bank""","ví dụ như ""Ngân hàng Quốc gia XYZ """
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,Là thuế này bao gồm trong suất cơ bản?
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +57,Total Target,Tổng số mục tiêu
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Target,Tổng số mục tiêu
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.js +22,Shopping Cart is enabled,Giỏ hàng được kích hoạt
 DocType: Job Applicant,Applicant for a Job,Nộp đơn xin việc
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +173,No Production Orders created,Không có đơn đặt hàng sản xuất tạo ra
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +131,Salary Slip of employee {0} already created for this month,Tiền lương của người lao động trượt {0} đã được tạo ra trong tháng này
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +140,Salary Slip of employee {0} already created for this month,Tiền lương của người lao động trượt {0} đã được tạo ra trong tháng này
 DocType: Stock Reconciliation,Reconciliation JSON,Hòa giải JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Quá nhiều cột. Xuất báo cáo và in nó sử dụng một ứng dụng bảng tính.
 DocType: Sales Invoice Item,Batch No,Không có hàng loạt
@@ -1504,14 +1450,14 @@
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +13,Variant,Biến thể
 apps/frappe/frappe/public/js/frappe/form/toolbar.js +165,New {0},Mới {0}
 DocType: Naming Series,Set prefix for numbering series on your transactions,Thiết lập tiền tố cho đánh số hàng loạt các giao dịch của bạn
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +169,Stopped order cannot be cancelled. Unstop to cancel.,Để dừng lại không thể bị hủy bỏ. Tháo nút để hủy bỏ.
-apps/erpnext/erpnext/stock/doctype/item/item.py +323,Default BOM ({0}) must be active for this item or its template,Mặc định BOM ({0}) phải được hoạt động cho mục này hoặc mẫu của mình
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +164,Stopped order cannot be cancelled. Unstop to cancel.,Để dừng lại không thể bị hủy bỏ. Tháo nút để hủy bỏ.
+apps/erpnext/erpnext/stock/doctype/item/item.py +327,Default BOM ({0}) must be active for this item or its template,Mặc định BOM ({0}) phải được hoạt động cho mục này hoặc mẫu của mình
 DocType: Employee,Leave Encashed?,Để lại Encashed?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Cơ hội Từ trường là bắt buộc
 DocType: Item,Variants,Biến thể
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +458,Make Purchase Order,Từ mua hóa đơn
 DocType: SMS Center,Send To,Để gửi
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +111,There is not enough leave balance for Leave Type {0},Không có đủ số dư để lại cho Rời Loại {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +127,There is not enough leave balance for Leave Type {0},Không có đủ số dư để lại cho Rời Loại {0}
 DocType: Sales Team,Contribution to Net Total,Đóng góp Net Tổng số
 DocType: Sales Invoice Item,Customer's Item Code,Của khách hàng Item Code
 DocType: Stock Reconciliation,Stock Reconciliation,Chứng khoán Hòa giải
@@ -1548,11 +1494,11 @@
 DocType: Sales Order Item,Actual Qty,Số lượng thực tế
 DocType: Sales Invoice Item,References,Tài liệu tham khảo
 DocType: Quality Inspection Reading,Reading 10,Đọc 10
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +612,"List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start.","Danh sách sản phẩm hoặc dịch vụ mà bạn mua hoặc bán của bạn. Hãy chắc chắn để kiểm tra các mục Group, Đơn vị đo và các tài sản khác khi bạn bắt đầu."
+apps/erpnext/erpnext/public/js/setup_wizard.js +348,"List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start.","Danh sách sản phẩm hoặc dịch vụ mà bạn mua hoặc bán của bạn. Hãy chắc chắn để kiểm tra các mục Group, Đơn vị đo và các tài sản khác khi bạn bắt đầu."
 DocType: Hub Settings,Hub Node,Hub Node
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,Bạn đã nhập các mặt hàng trùng lặp. Xin khắc phục và thử lại.
 apps/erpnext/erpnext/controllers/item_variant.py +65,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values,Giá trị {0} cho thuộc tính {1} không tồn tại trong danh sách các mục có giá trị thuộc tính giá trị
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +87,Associate,Liên kết
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Associate,Liên kết
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +46,Item {0} is not a serialized Item,Mục {0} không phải là một khoản đăng
 DocType: SMS Center,Create Receiver List,Tạo ra nhận Danh sách
 apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +5,Expired,Hết hạn
@@ -1561,7 +1507,7 @@
 DocType: Warranty Claim,Issue Date,Ngày phát hành
 DocType: Activity Cost,Activity Cost,Hoạt động Chi phí
 DocType: Purchase Receipt Item Supplied,Consumed Qty,Số lượng tiêu thụ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +52,Telecommunications,Viễn thông
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +52,Telecommunications,Viễn thông
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),Chỉ ra rằng gói là một phần của việc phân phối này (Chỉ có Dự thảo)
 DocType: Payment Tool,Make Payment Entry,Thực hiện thanh toán nhập
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +119,Quantity for Item {0} must be less than {1},Số lượng cho hàng {0} phải nhỏ hơn {1}
@@ -1578,10 +1524,8 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +37,"Selling must be checked, if Applicable For is selected as {0}","Bán phải được kiểm tra, nếu áp dụng Đối với được chọn là {0}"
 DocType: Purchase Order Item,Supplier Quotation Item,Nhà cung cấp báo giá hàng
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +27,Make Salary Structure,Làm cho cấu trúc lương
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +54,Shearing,Sự xén lông trừu
 DocType: Item,Has Variants,Có biến thể
 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.,"Bấm vào nút ""Thực hiện kinh doanh Hoá đơn 'để tạo ra một hóa đơn bán hàng mới."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +166,Packaging and labeling,Đóng gói và ghi nhãn
 DocType: Monthly Distribution,Name of the Monthly Distribution,Tên của phân phối hàng tháng
 DocType: Sales Person,Parent Sales Person,Người bán hàng mẹ
 apps/erpnext/erpnext/setup/utils.py +14,Please specify Default Currency in Company Master and Global Defaults,Vui lòng chỉ định ngoại tệ tại Công ty Thạc sĩ và mặc định toàn cầu
@@ -1592,19 +1536,18 @@
 DocType: Budget Detail,Fiscal Year,Năm tài chính
 DocType: Cost Center,Budget,Ngân sách
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +41,"Budget cannot be assigned against {0}, as it's not an Income or Expense account","Ngân sách không thể được chỉ định đối với {0}, vì nó không phải là một tài khoản thu nhập hoặc chi phí"
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Achieved,Đạt được
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,Đạt được
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +65,Territory / Customer,Lãnh thổ / khách hàng
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,e.g. 5,ví dụ như 5
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +207,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},Row {0}: Phân bổ số lượng {1} phải nhỏ hơn hoặc bằng cho hóa đơn số tiền còn nợ {2}
+apps/erpnext/erpnext/public/js/setup_wizard.js +294,e.g. 5,ví dụ như 5
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},Row {0}: Phân bổ số lượng {1} phải nhỏ hơn hoặc bằng cho hóa đơn số tiền còn nợ {2}
 DocType: Sales Invoice,In Words will be visible once you save the Sales Invoice.,Trong từ sẽ được hiển thị khi bạn lưu các hóa đơn bán hàng.
 DocType: Item,Is Sales Item,Là bán hàng
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,Nhóm mục Tree
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,Mục {0} không phải là thiết lập cho Serial Nos Kiểm tra mục chủ
 DocType: Maintenance Visit,Maintenance Time,Thời gian bảo trì
 ,Amount to Deliver,Số tiền để Cung cấp
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +620,A Product or Service,Một sản phẩm hoặc dịch vụ
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +158,There were errors.,Có một số lỗi.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +101,Tapping,Khai thác
+apps/erpnext/erpnext/public/js/setup_wizard.js +356,A Product or Service,Một sản phẩm hoặc dịch vụ
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +146,There were errors.,Có một số lỗi.
 DocType: Naming Series,Current Value,Giá trị hiện tại
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +171,{0} created,{0} tạo
 DocType: Delivery Note Item,Against Sales Order,So với bán hàng đặt hàng
@@ -1619,7 +1562,7 @@
 apps/erpnext/erpnext/accounts/party.py +275,Due Date cannot be before Posting Date,Do ngày không thể trước khi viết bài ngày
 DocType: Website Item Group,Website Item Group,Trang web mục Nhóm
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Duties and Taxes,Nhiệm vụ và thuế
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Please enter Reference date,Vui lòng nhập ngày tham khảo
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +312,Please enter Reference date,Vui lòng nhập ngày tham khảo
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} mục thanh toán không thể được lọc bởi {1}
 DocType: Item Website Specification,Table for Item that will be shown in Web Site,Bảng cho khoản đó sẽ được hiển thị trong trang Web
 DocType: Purchase Order Item Supplied,Supplied Qty,Đã cung cấp Số lượng
@@ -1627,7 +1570,7 @@
 apps/erpnext/erpnext/config/stock.py +103,Tree of Item Groups.,Cây khoản 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,Không có thể tham khảo số lượng hàng lớn hơn hoặc bằng số lượng hàng hiện tại cho loại phí này
 ,Item-wise Purchase History,Item-khôn ngoan Lịch sử mua hàng
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +152,Red,Đỏ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Red,Đỏ
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +228,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},Vui lòng click vào 'Tạo Lịch trình' để lấy Serial No bổ sung cho hàng {0}
 DocType: Account,Frozen,Đông lạnh
 ,Open Production Orders,Đơn đặt hàng mở sản xuất
@@ -1642,7 +1585,7 @@
 DocType: Item Attribute,Attribute Name,Tên thuộc tính
 apps/erpnext/erpnext/controllers/selling_controller.py +236,Item {0} must be Sales or Service Item in {1},Mục {0} phải bán hàng hoặc dịch vụ trong mục {1}
 DocType: Item Group,Show In Website,Hiện Trong Website
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +621,Group,Nhóm
+apps/erpnext/erpnext/public/js/setup_wizard.js +357,Group,Nhóm
 DocType: Task,Expected Time (in hours),Thời gian dự kiến ​​(trong giờ)
 ,Qty to Order,Số lượng đặt hàng
 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","Để theo dõi các tên thương hiệu trong các tài liệu sau Delivery Note, Cơ hội, yêu cầu vật liệu, Item, Mua hàng, mua Voucher, mua hóa đơn, báo giá, bán hàng hóa đơn, gói sản phẩm, bán hàng đặt, Serial No"
@@ -1652,6 +1595,7 @@
 DocType: Features Setup,Brands,Thương hiệu
 DocType: C-Form Invoice Detail,Invoice No,Không hóa đơn
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +480,From Purchase Order,Từ Mua hàng
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +92,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Để lại không thể áp dụng / hủy bỏ trước khi {0}, như cân bằng nghỉ phép đã được carry-chuyển tiếp trong hồ sơ giao đất nghỉ tương lai {1}"
 DocType: Activity Cost,Costing Rate,Chi phí Rate
 ,Customer Addresses And Contacts,Địa chỉ khách hàng và Liên hệ
 DocType: Employee,Resignation Letter Date,Thư từ chức ngày
@@ -1659,35 +1603,31 @@
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +137,Not Set,Không đặt
 DocType: Communication,Date,Năm
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,Lặp lại Doanh thu khách hàng
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +651,Sit tight while your system is being setup. This may take a few moments.,Ngồi chặt chẽ trong khi hệ thống của bạn đang được thiết lập. Điều này có thể mất một vài phút.
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +115,Sit tight while your system is being setup. This may take a few moments.,Ngồi chặt chẽ trong khi hệ thống của bạn đang được thiết lập. Điều này có thể mất một vài phút.
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +51,{0} ({1}) must have role 'Expense Approver',{0} ({1}) phải có vai trò 'Chi Người phê duyệt'
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Pair,Đôi
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Pair,Đôi
 DocType: Bank Reconciliation Detail,Against Account,Đối với tài khoản
 DocType: Maintenance Schedule Detail,Actual Date,Thực tế ngày
 DocType: Item,Has Batch No,Có hàng loạt Không
 DocType: Delivery Note,Excise Page Number,Tiêu thụ đặc biệt số trang
 DocType: Employee,Personal Details,Thông tin chi tiết cá nhân
 ,Maintenance Schedules,Lịch bảo trì
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +44,Embossing,Dập nổi
 ,Quotation Trends,Xu hướng báo giá
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +139,Item Group not mentioned in item master for item {0},Nhóm mục không được đề cập trong mục tổng thể cho mục {0}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +302,Debit To account must be a Receivable account,Để ghi nợ tài khoản phải có một tài khoản phải thu
-apps/erpnext/erpnext/stock/doctype/item/item.py +310,"As Production Order can be made for this item, it must be a stock item.","Như sản xuất hàng có thể được thực hiện cho mặt hàng này, nó phải là một mục chứng khoán."
 DocType: Shipping Rule Condition,Shipping Amount,Số tiền vận chuyển
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +140,Joining,Tham gia
-DocType: Authorization Rule,Above Value,Trên giá trị gia tăng
 ,Pending Amount,Số tiền cấp phát
 DocType: Purchase Invoice Item,Conversion Factor,Yếu tố chuyển đổi
 DocType: Purchase Order,Delivered,"Nếu được chỉ định, gửi các bản tin sử dụng địa chỉ email này"
 apps/erpnext/erpnext/config/hr.py +160,Setup incoming server for jobs email id. (e.g. jobs@example.com),Thiết lập máy chủ đến cho công việc email id. (Ví dụ như jobs@example.com)
 DocType: Purchase Receipt,Vehicle Number,Số xe
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,Ngày mà hóa đơn định kỳ sẽ được dừng lại
+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,Tổng số lá được phân bổ {0} không thể ít hơn so với lá đã được phê duyệt {1} cho giai đoạn
 DocType: Journal Entry,Accounts Receivable,Tài khoản Phải thu
 ,Supplier-Wise Sales Analytics,Nhà cung cấp-Wise Doanh Analytics
 DocType: Address Template,This format is used if country specific format is not found,Định dạng này được sử dụng nếu định dạng quốc gia cụ thể không được tìm thấy
 DocType: Custom Field,Custom,Tuỳ chỉnh
 DocType: Production Order,Use Multi-Level BOM,Sử dụng Multi-Level BOM
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +26,Injection molding,Ép phun
 DocType: Bank Reconciliation,Include Reconciled Entries,Bao gồm Entries hòa giải
 apps/erpnext/erpnext/config/accounts.py +41,Tree of finanial accounts.,Cây tài khoản finanial.
 DocType: Leave Control Panel,Leave blank if considered for all employee types,Để trống nếu xem xét tất cả các loại nhân viên
@@ -1697,30 +1637,28 @@
 apps/frappe/frappe/config/setup.py +130,Printing,In ấn
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +114,Expense Claim is pending approval. Only the Expense Approver can update status.,Chi phí bồi thường đang chờ phê duyệt. Chỉ phê duyệt chi phí có thể cập nhật trạng thái.
 DocType: Purchase Invoice,Additional Discount Amount,Thêm GIẢM Số tiền
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +99,The day(s) on which you are applying for leave are holiday. You need not apply for leave.,Ngày (s) mà bạn đang nộp đơn xin nghỉ là nghỉ. Bạn không cần phải nộp đơn xin nghỉ phép.
 apps/frappe/frappe/public/js/frappe/misc/utils.js +110,and,và
 DocType: Leave Block List Allow,Leave Block List Allow,Để lại Block List phép
 apps/erpnext/erpnext/setup/doctype/company/company.py +236,Abbr can not be blank or space,Abbr không thể để trống hoặc không gian
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +50,Sports,Thể thao
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,Thể thao
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Actual,Tổng số thực tế
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Unit,Đơn vị
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Unit,Đơn vị
 apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.py +182,Please set Dropbox access keys in your site config,Xin vui lòng thiết lập các phím truy cập Dropbox trong cấu hình trang web của bạn
 apps/erpnext/erpnext/stock/get_item_details.py +113,Please specify Company,Vui lòng ghi rõ Công ty
 ,Customer Acquisition and Loyalty,Mua hàng và trung thành
 DocType: Purchase Receipt,Warehouse where you are maintaining stock of rejected items,Kho nơi bạn đang duy trì cổ phiếu của các mặt hàng từ chối
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +408,Your financial year ends on,Năm tài chính kết thúc vào ngày của bạn
+apps/erpnext/erpnext/public/js/setup_wizard.js +156,Your financial year ends on,Năm tài chính kết thúc vào ngày của bạn
 DocType: POS Profile,Price List,"<a href=""#Sales Browser/Customer Group""> Add / Edit </ a>"
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +20,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0} bây giờ là mặc định năm tài chính. Xin vui lòng làm mới trình duyệt của bạn để thay đổi có hiệu lực.
 apps/erpnext/erpnext/projects/doctype/project/project.js +47,Expense Claims,Claims Expense
 DocType: Issue,Support,Hỗ trợ
-DocType: Authorization Rule,Approving Role,Phê duyệt Vai trò
 ,BOM Search,BOM Tìm kiếm
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +176,Closing (Opening + Totals),Đóng cửa (mở cửa + Các tổng số)
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +26,Please specify currency in Company,Hãy xác định tiền tệ của Công ty
 DocType: Workstation,Wages per hour,Tiền lương mỗi giờ
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},Số dư chứng khoán trong Batch {0} sẽ trở nên tiêu cực {1} cho khoản {2} tại Kho {3}
 apps/erpnext/erpnext/config/setup.py +83,"Show / Hide features like Serial Nos, POS etc.","Show / Hide các tính năng như nối tiếp Nos, POS, vv"
-apps/erpnext/erpnext/controllers/accounts_controller.py +236,Account {0} is invalid. Account Currency must be {1},Tài khoản của {0} là không hợp lệ. Tài khoản tiền tệ phải {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +237,Account {0} is invalid. Account Currency must be {1},Tài khoản của {0} là không hợp lệ. Tài khoản tiền tệ phải {1}
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +34,UOM Conversion factor is required in row {0},Yếu tố UOM chuyển đổi là cần thiết trong hàng {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +53,Clearance date cannot be before check date in row {0},Ngày giải phóng mặt bằng không có thể trước ngày kiểm tra trong hàng {0}
 DocType: Salary Slip,Deduction,Khấu trừ
@@ -1739,13 +1677,13 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +82,Item {0} has already been returned,Mục {0} đã được trả lại
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** ** Năm tài chính đại diện cho một năm tài chính. Tất cả các bút toán và giao dịch lớn khác đang theo dõi chống lại năm tài chính ** **.
 DocType: Opportunity,Customer / Lead Address,Khách hàng / Chì Địa chỉ
+apps/erpnext/erpnext/stock/doctype/item/item.py +112,Warning: Invalid SSL certificate on attachment {0},Cảnh báo: Giấy chứng nhận SSL không hợp lệ vào luyến {0}
 DocType: Production Order Operation,Actual Operation Time,Thời gian hoạt động thực tế
 DocType: Authorization Rule,Applicable To (User),Để áp dụng (Thành viên)
 DocType: Purchase Taxes and Charges,Deduct,Trích
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +170,Job Description,Mô Tả Công Việc
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +170,Job Description,Mô Tả Công Việc
 DocType: Purchase Order Item,Qty as per Stock UOM,Số lượng theo chứng khoán UOM
 apps/frappe/frappe/model/rename_doc.py +343,Please select a valid csv file with data,Vui lòng chọn một tập tin csv hợp lệ với các dữ liệu
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +92,Coating,Coating
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +126,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Nhân vật đặc biệt ngoại trừ ""-"" ""."", ""#"", và ""/"" không được phép đặt tên hàng loạt"
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Giữ Theo dõi của Sales Chiến dịch. Theo dõi các Leads, Báo giá, bán hàng đặt hàng vv từ Chiến dịch để đánh giá lợi nhuận trên đầu tư. "
 DocType: Expense Claim,Approver,Người Xét Duyệt
@@ -1755,12 +1693,11 @@
 DocType: Supplier Quotation,Manufacturing Manager,Sản xuất Quản lý
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},Không nối tiếp {0} được bảo hành tối đa {1}
 apps/erpnext/erpnext/config/stock.py +69,Split Delivery Note into packages.,Giao hàng tận nơi chia Lưu ý thành các gói.
-apps/erpnext/erpnext/hooks.py +84,Shipments,Lô hàng
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +29,Dip molding,Đúc Dip
+apps/erpnext/erpnext/hooks.py +68,Shipments,Lô hàng
 DocType: Purchase Order,To be delivered to customer,Sẽ được chuyển giao cho khách hàng
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,Giờ trạng phải Đăng.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,{0} nối tiếp Không không thuộc về bất kỳ kho
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +650,Setting Up,Thiết lập
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +114,Setting Up,Thiết lập
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,Row # ,Row #
 DocType: Purchase Invoice,In Words (Company Currency),Trong từ (Công ty tiền tệ)
 DocType: Pricing Rule,Supplier,Nhà cung cấp
@@ -1768,7 +1705,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +105,Miscellaneous Expenses,Chi phí linh tinh
 DocType: Global Defaults,Default Company,Công ty mặc định
 apps/erpnext/erpnext/controllers/stock_controller.py +166,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,Chi phí hoặc khác biệt tài khoản là bắt buộc đối với mục {0} vì nó tác động tổng thể giá trị cổ phiếu
-apps/erpnext/erpnext/controllers/accounts_controller.py +354,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","Không thể overbill cho khoản {0} trong hàng {1} hơn {2}. Để cho phép overbilling, xin vui lòng thiết lập trong Settings Cổ"
+apps/erpnext/erpnext/controllers/accounts_controller.py +355,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","Không thể overbill cho khoản {0} trong hàng {1} hơn {2}. Để cho phép overbilling, xin vui lòng thiết lập trong Settings Cổ"
 DocType: Employee,Bank Name,Tên ngân hàng
 apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +27,-Above,-Above
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +135,User {0} is disabled,Người sử dụng {0} bị vô hiệu hóa
@@ -1781,27 +1718,26 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,{0} is mandatory for Item {1},{0} là bắt buộc đối với mục {1}
 DocType: Currency Exchange,From Currency,Từ tệ
 DocType: DocField,Name,Tên
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +211,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Vui lòng chọn Số tiền phân bổ, Loại hóa đơn và hóa đơn số trong ít nhất một hàng"
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +104,Sales Order required for Item {0},Đặt hàng bán hàng cần thiết cho mục {0}
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +158,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Vui lòng chọn Số tiền phân bổ, Loại hóa đơn và hóa đơn số trong ít nhất một hàng"
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +107,Sales Order required for Item {0},Đặt hàng bán hàng cần thiết cho mục {0}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +43,Amounts not reflected in system,Số đã không được phản ánh trong hệ thống
 DocType: Purchase Invoice Item,Rate (Company Currency),Tỷ lệ (Công ty tiền tệ)
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +40,Others,Các thông tin khác
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +40,Others,Các thông tin khác
 apps/erpnext/erpnext/templates/includes/product_page.js +80,Cannot find a matching Item. Please select some other value for {0}.,Không thể tìm thấy một kết hợp Item. Hãy chọn một vài giá trị khác cho {0}.
 DocType: POS Profile,Taxes and Charges,Thuế và lệ phí
 DocType: Item,"A Product or a Service that is bought, sold or kept in stock.","Một sản phẩm hay một dịch vụ được mua, bán hoặc lưu giữ trong kho."
 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,Không có thể chọn loại phí như 'Mở hàng trước Số tiền' hoặc 'On Trước Row Tổng số' cho hàng đầu tiên
 apps/frappe/frappe/core/doctype/doctype/boilerplate/controller_list.html +31,Completed,Hoàn thành
 DocType: Web Form,Select DocType,Chọn DocType
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +104,Broaching,Chuốt
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +12,Banking,Ngân hàng
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,Ngân hàng
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +38,Please click on 'Generate Schedule' to get schedule,Vui lòng click vào 'Tạo Lịch trình' để có được lịch trình
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +283,New Cost Center,Trung tâm Chi phí mới
 DocType: Bin,Ordered Quantity,Số lượng đặt hàng
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +397,"e.g. ""Build tools for builders""","ví dụ như ""Xây dựng các công cụ cho các nhà xây dựng """
+apps/erpnext/erpnext/public/js/setup_wizard.js +145,"e.g. ""Build tools for builders""","ví dụ như ""Xây dựng các công cụ cho các nhà xây dựng """
 DocType: Quality Inspection,In Process,Trong quá trình
 DocType: Authorization Rule,Itemwise Discount,Itemwise Giảm giá
 DocType: Purchase Order Item,Reference Document Type,Tài liệu tham chiếu Type
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +318,{0} against Sales Order {1},{0} với Sales Order {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +320,{0} against Sales Order {1},{0} với Sales Order {1}
 DocType: Account,Fixed Asset,Tài sản cố định
 apps/erpnext/erpnext/config/stock.py +283,Serialized Inventory,Hàng tồn kho được tuần tự
 DocType: Activity Type,Default Billing Rate,Mặc định Thanh toán Rate
@@ -1816,14 +1752,13 @@
 DocType: Purchase Invoice Item,Page Break,Page Break
 DocType: Production Order Operation,Pending,Chờ
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,Người dùng có thể duyệt các ứng dụng nghỉ phép một nhân viên nào đó của
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +33,You cannot change default UOM of Variant. To change default UOM for Variant change default UOM of the Template,Bạn không thể thay đổi mặc định của Ươm Variant. Để thay đổi Ươm mặc định cho Variant Ươm thay đổi mặc định của Template
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +50,Office Equipments,Thiết bị văn phòng
 DocType: Purchase Invoice Item,Qty,Số lượng
 DocType: Fiscal Year,Companies,Các công ty
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +24,Electronics,Thiết bị điện tử
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +24,Electronics,Thiết bị điện tử
 DocType: Stock Settings,Raise Material Request when stock reaches re-order level,Nâng cao Chất liệu Yêu cầu khi cổ phiếu đạt đến cấp độ sắp xếp lại
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +18,From Maintenance Schedule,Từ lịch bảo trì
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +56,Full-time,Toàn thời gian
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +56,Full-time,Toàn thời gian
 DocType: Purchase Invoice,Contact Details,Thông tin chi tiết liên hệ
 DocType: C-Form,Received Date,Nhận ngày
 DocType: Delivery Note,"If you have created a standard template in Sales Taxes and Charges Template, select one and click on the button below.","Nếu bạn đã tạo ra một tiêu chuẩn mẫu trong thuế bán hàng và phí Template, chọn một và nhấp vào nút dưới đây."
@@ -1835,11 +1770,12 @@
 DocType: Job Applicant,Job Opening,Cơ hội nghề nghiệp
 DocType: Payment Reconciliation,Payment Reconciliation,Hòa giải thanh toán
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +154,Please select Incharge Person's name,Vui lòng chọn tên incharge của Người
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +51,Technology,Công nghệ
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,Công nghệ
 DocType: Offer Letter,Offer Letter,Cung cấp Letter
 apps/erpnext/erpnext/config/manufacturing.py +51,Generate Material Requests (MRP) and Production Orders.,Các yêu cầu tạo ra vật liệu (MRP) và đơn đặt hàng sản xuất.
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +68,Total Invoiced Amt,Tổng số Hoá đơn Amt
 DocType: Time Log,To Time,Giờ
+DocType: Authorization Rule,Approving Role (above authorized value),Phê duyệt Role (trên giá trị ủy quyền)
 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.","Để thêm các nút con, khám phá cây và bấm vào nút dưới mà bạn muốn thêm các nút hơn."
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +102,Credit To account must be a Payable account,Để tín dụng tài khoản phải có một tài khoản phải trả
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +233,BOM recursion: {0} cannot be parent or child of {2},"BOM đệ quy: {0} không thể là cha mẹ, con của {2}"
@@ -1852,10 +1788,8 @@
 DocType: Item,Customer Item Codes,Khách hàng mục Codes
 DocType: Opportunity,Lost Reason,Lý do bị mất
 apps/erpnext/erpnext/config/accounts.py +68,Create Payment Entries against Orders or Invoices.,Tạo Entries thanh toán đối với đơn đặt hàng hoặc hoá đơn.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +141,Welding,Sự hàn
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +40,New Stock UOM is required,Mới Cổ UOM được yêu cầu
 DocType: Quality Inspection,Sample Size,Kích thước mẫu
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +443,All items have already been invoiced,Tất cả các mục đã được lập hoá đơn
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +446,All items have already been invoiced,Tất cả các mục đã được lập hoá đơn
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',"Vui lòng xác định hợp lệ ""Từ trường hợp số '"
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +287,Further cost centers can be made under Groups but entries can be made against non-Groups,Trung tâm chi phí có thể tiếp tục được thực hiện theo nhóm nhưng mục có thể được thực hiện đối với phi Groups
 DocType: Project,External,Bên ngoài
@@ -1867,8 +1801,7 @@
 DocType: Bin,Actual Quantity,Số lượng thực tế
 DocType: Shipping Rule,example: Next Day Shipping,Ví dụ: Ngày hôm sau Vận chuyển
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,Số thứ tự {0} không tìm thấy
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +563,Your Customers,Khách hàng của bạn
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +27,Compression molding,Đúc nén
+apps/erpnext/erpnext/public/js/setup_wizard.js +303,Your Customers,Khách hàng của bạn
 DocType: Leave Block List Date,Block Date,Khối ngày
 DocType: Sales Order,Not Delivered,Không Delivered
 ,Bank Clearance Summary,Tóm tắt thông quan ngân hàng
@@ -1889,10 +1822,10 @@
 DocType: SMS Log,Sent To,Gửi Đến
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +28,Make Sales Invoice,Làm Mua hàng
 DocType: Company,For Reference Only.,Chỉ để tham khảo.
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +29,Invalid {0}: {1},Không hợp lệ {0}: {1}
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +49,Invalid {0}: {1},Không hợp lệ {0}: {1}
 DocType: Sales Invoice Advance,Advance Amount,Số tiền ứng trước
 DocType: Manufacturing Settings,Capacity Planning,Kế hoạch công suất
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +49,'From Date' is required,"""Từ ngày"" là cần thiết"
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +43,'From Date' is required,"""Từ ngày"" là cần thiết"
 DocType: Journal Entry,Reference Number,Số tài liệu tham khảo
 DocType: Employee,Employment Details,Chi tiết việc làm
 DocType: Employee,New Workplace,Nơi làm việc mới
@@ -1907,7 +1840,7 @@
 DocType: Serial No,Delivery Time,Thời gian giao hàng
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Người cao tuổi Dựa trên
 DocType: Item,End of Life,Kết thúc của cuộc sống
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +41,Travel,Du lịch
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +41,Travel,Du lịch
 DocType: Leave Block List,Allow Users,Cho phép người sử dụng
 DocType: Purchase Order,Customer Mobile No,Khách hàng Điện thoại di động Không
 DocType: Sales Invoice,Recurring,Định kỳ
@@ -1921,7 +1854,7 @@
 DocType: Naming Series,User must always select,Người sử dụng phải luôn luôn chọn
 DocType: Stock Settings,Allow Negative Stock,Cho phép Cổ âm
 DocType: Installation Note,Installation Note,Lưu ý cài đặt
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +541,Add Taxes,Thêm Thuế
+apps/erpnext/erpnext/public/js/setup_wizard.js +283,Add Taxes,Thêm Thuế
 ,Financial Analytics,Analytics tài chính
 DocType: Quality Inspection,Verified By,Xác nhận bởi
 DocType: Address,Subsidiary,Công ty con
@@ -1931,7 +1864,6 @@
 DocType: System Settings,In Hours,Trong Hours
 DocType: Process Payroll,Create Salary Slip,Tạo Mức lương trượt
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Expected balance as per bank,Cán cân dự kiến ​​theo ngân hàng
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +115,Buffing,Buffing
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Source of Funds (Liabilities),Nguồn vốn (nợ)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +347,Quantity in row {0} ({1}) must be same as manufactured quantity {2},Số lượng trong hàng {0} ({1}) phải được giống như số lượng sản xuất {2}
 DocType: Appraisal,Employee,Nhân viên
@@ -1948,11 +1880,11 @@
 DocType: Rename Tool,File to Rename,File để Đổi tên
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +176,Purchse Order number required for Item {0},Số thứ tự Purchse cần thiết cho mục {0}
 apps/erpnext/erpnext/public/js/controllers/transaction.js +136,Show Payments,Hiện Thanh toán
-apps/erpnext/erpnext/controllers/buying_controller.py +245,Specified BOM {0} does not exist for Item {1},Quy định BOM {0} không tồn tại cho mục {1}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +202,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Lịch trình bảo trì {0} phải được hủy bỏ trước khi hủy bỏ đơn đặt hàng này
+apps/erpnext/erpnext/controllers/buying_controller.py +236,Specified BOM {0} does not exist for Item {1},Quy định BOM {0} không tồn tại cho mục {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Lịch trình bảo trì {0} phải được hủy bỏ trước khi hủy bỏ đơn đặt hàng này
 apps/frappe/frappe/desk/page/backups/backups.html +13,Size,Kích thước
 DocType: Notification Control,Expense Claim Approved,Chi phí bồi thường được phê duyệt
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +113,Pharmaceutical,Dược phẩm
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Pharmaceutical,Dược phẩm
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,Chi phí Mua Items
 DocType: Selling Settings,Sales Order Required,Bán hàng đặt hàng yêu cầu
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +30,Create Customer,Tạo ra khách hàng
@@ -1962,7 +1894,6 @@
 DocType: Quality Inspection Reading,Reading 9,Đọc 9
 DocType: Supplier,Is Frozen,Là đông lạnh
 DocType: Buying Settings,Buying Settings,Mua thiết lập
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +122,Mass finishing,Hoàn thiện hàng loạt
 DocType: Stock Entry Detail,BOM No. for a Finished Good Item,BOM số cho một hoàn thiện tốt mục
 DocType: Upload Attendance,Attendance To Date,Tham gia Đến ngày
 apps/erpnext/erpnext/config/selling.py +158,Setup incoming server for sales email id. (e.g. sales@example.com),Thiết lập máy chủ đến cho email bán hàng id. (Ví dụ như sales@example.com)
@@ -1970,7 +1901,7 @@
 DocType: Payment Tool,Payment Account,Tài khoản thanh toán
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +713,Please specify Company to proceed,Vui lòng ghi rõ Công ty để tiến hành
 apps/frappe/frappe/public/js/frappe/model/indicator.js +30,Draft,Dự thảo
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +46,Compensatory Off,Đền bù Tắt
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Compensatory Off,Đền bù Tắt
 DocType: Quality Inspection Reading,Accepted,Chấp nhận
 DocType: User,Female,Nữ
 DocType: Journal Entry Account,Debit in Account Currency,Nợ Tài khoản ngoại tệ
@@ -1982,7 +1913,7 @@
 DocType: Shipping Rule,Shipping Rule Label,Quy tắc vận chuyển Label
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +209,Raw Materials cannot be blank.,Nguyên liệu thô không thể để trống.
 DocType: Newsletter,Test,K.tra
-apps/erpnext/erpnext/stock/doctype/item/item.py +364,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +368,"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'","Như có những giao dịch chứng khoán hiện có cho mặt hàng này, \ bạn không thể thay đổi các giá trị của &#39;Có tiếp Serial No&#39;, &#39;Có hàng loạt No&#39;, &#39;Liệu Cổ Mã&#39; và &#39;Phương pháp định giá&#39;"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +448,Quick Journal Entry,Tạp chí nhanh chóng nhập
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +92,You can not change rate if BOM mentioned agianst any item,Bạn không thể thay đổi tỷ lệ nếu HĐQT đã đề cập agianst bất kỳ mục nào
@@ -1993,13 +1924,14 @@
 apps/erpnext/erpnext/config/stock.py +18,Requests for items.,Yêu cầu cho các hạng mục.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,Để sản xuất riêng biệt sẽ được tạo ra cho mỗi mục tốt đã hoàn thành.
 DocType: Purchase Invoice,Terms and Conditions1,Điều khoản và Conditions1
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +18,Complete Setup,Hoàn thành cài đặt
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard_page.html +18,Complete Setup,Hoàn thành cài đặt
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","Nhập kế toán đông lạnh đến ngày này, không ai có thể làm / sửa đổi nào ngoại trừ vai trò quy định dưới đây."
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +121,Please save the document before generating maintenance schedule,Xin vui lòng lưu các tài liệu trước khi tạo ra lịch trình bảo trì
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,Tình trạng dự án
 DocType: UOM,Check this to disallow fractions. (for Nos),Kiểm tra này để không cho phép các phần phân đoạn. (Cho Nos)
 apps/erpnext/erpnext/config/crm.py +96,Newsletter Mailing List,Bản tin danh sách gửi thư
 DocType: Delivery Note,Transporter Name,Tên vận chuyển
+DocType: Authorization Rule,Authorized Value,Giá trị được ủy quyền
 DocType: Contact,Enter department to which this Contact belongs,Nhập bộ phận mà mối liên lạc này thuộc về
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Absent,Tổng số Vắng
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +746,Item or Warehouse for row {0} does not match Material Request,Mục hoặc Kho cho hàng {0} không phù hợp với liệu Yêu cầu
@@ -2024,16 +1956,15 @@
 DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),Tỷ lệ cơ bản (theo Cổ Ươm)
 DocType: SMS Log,No of Requested SMS,Không được yêu cầu của tin nhắn SMS
 DocType: Campaign,Campaign-.####,Chiến dịch.# # # #
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +55,Piercing,Piercing
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,Bước tiếp theo
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +117,Contract End Date must be greater than Date of Joining,Ngày kết thúc hợp đồng phải lớn hơn ngày của Tham gia
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,Một nhà phân phối của bên thứ ba / đại lý / hoa hồng đại lý / chi nhánh / đại lý bán lẻ chuyên bán các sản phẩm công ty cho một hoa hồng.
 DocType: Customer Group,Has Child Node,Có Node trẻ em
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{0} against Purchase Order {1},{0} chống Mua hàng {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +332,{0} against Purchase Order {1},{0} chống Mua hàng {1}
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","Nhập các thông số url tĩnh ở đây (Ví dụ người gửi = ERPNext, tên người dùng = ERPNext, mật khẩu = 1234, vv)"
 apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,{0} {1} không có trong bất kỳ năm tài chính đang hoạt động. Để biết thêm chi tiết kiểm tra {2}.
-apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,Đây là một trang web ví dụ tự động tạo ra từ ERPNext
+apps/erpnext/erpnext/setup/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,Đây là một trang web ví dụ tự động tạo ra từ ERPNext
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +37,Ageing Range 1,Phạm vi Ageing 1
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +110,Photochemical machining,Gia công quang hóa
 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.
 
 #### Note
@@ -2079,7 +2010,7 @@
 DocType: Purchase Receipt Item,Recd Quantity,Recd Số lượng
 DocType: Email Account,Email Ids,Email Id
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},Không thể sản xuất nhiều hàng {0} là số lượng bán hàng đặt hàng {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +471,Stock Entry {0} is not submitted,Cổ nhập {0} không được đệ trình
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +473,Stock Entry {0} is not submitted,Cổ nhập {0} không được đệ trình
 DocType: Payment Reconciliation,Bank / Cash Account,Tài khoản ngân hàng Tiền mặt /
 DocType: Tax Rule,Billing City,Thanh toán Thành phố
 DocType: Global Defaults,Hide Currency Symbol,Ẩn tệ Ký hiệu
@@ -2095,7 +2026,7 @@
 DocType: Purchase Invoice,Currency and Price List,Tiền tệ và Bảng giá
 DocType: Opportunity,Customer / Lead Name,Khách hàng / chì Tên
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +63,Clearance Date not mentioned,Giải phóng mặt bằng ngày không được đề cập
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +71,Production,Sản xuất
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Production,Sản xuất
 DocType: Item,Allow Production Order,Cho phép sản xuất hàng
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +60,Row {0}:Start Date must be before End Date,Hàng {0}: Ngày bắt đầu phải trước khi kết thúc ngày
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Tổng số (SL)
@@ -2108,7 +2039,7 @@
 apps/erpnext/erpnext/utilities/doctype/address/address.py +113,My Addresses,Địa chỉ của tôi
 DocType: Stock Ledger Entry,Outgoing Rate,Tỷ Outgoing
 apps/erpnext/erpnext/config/hr.py +100,Organization branch master.,Chủ chi nhánh tổ chức.
-apps/erpnext/erpnext/controllers/accounts_controller.py +237, or ,hoặc là
+apps/erpnext/erpnext/controllers/accounts_controller.py +238, or ,hoặc là
 DocType: Sales Order,Billing Status,Tình trạng thanh toán
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Utility Expenses,Chi phí tiện ích
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,90-Above,90-Trên
@@ -2135,6 +2066,7 @@
 DocType: Stock Entry Detail,Serial No / Batch,Không nối tiếp / hàng loạt
 DocType: Product Bundle,Parent Item,Cha mẹ mục
 DocType: Account,Account Type,Loại tài khoản
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +113,Leave Type {0} cannot be carry-forwarded,Để lại Loại {0} có thể không được thực hiện chuyển tiếp-
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +213,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',Lịch trình bảo trì không được tạo ra cho tất cả các mục. Vui lòng click vào 'Tạo lịch'
 ,To Produce,Để sản xuất
 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","Đối với hàng {0} trong {1}. Để bao gồm {2} tỷ lệ Item, hàng {3} cũng phải được bao gồm"
@@ -2142,10 +2074,7 @@
 DocType: Bin,Reserved Quantity,Ltd Số lượng
 DocType: Landed Cost Voucher,Purchase Receipt Items,Mua hóa đơn mục
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,Các hình thức tùy biến
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +62,Cutting,Cắt
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +69,Flattening,Làm lạt lẻo
 DocType: Account,Income Account,Tài khoản thu nhập
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +22,Molding,Molding
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +632,Delivery,Giao hàng
 DocType: Stock Reconciliation Item,Current Qty,Số lượng hiện tại
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section","Xem ""Tỷ lệ Of Vật liệu Dựa trên"" trong mục Chi phí"
@@ -2155,20 +2084,19 @@
 apps/frappe/frappe/desk/moduleview.py +61,Documents,Tài liệu
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +17,Ref,Tài liệu tham khảo
 DocType: Cost Center,Cost Center,Trung tâm chi phí
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.js +48,Voucher #,Chứng từ #
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +36,Voucher #,Chứng từ #
 DocType: Notification Control,Purchase Order Message,Thông báo Mua hàng
 DocType: Tax Rule,Shipping Country,Vận Chuyển Country
 DocType: Upload Attendance,Upload HTML,Tải lên HTML
-apps/erpnext/erpnext/controllers/accounts_controller.py +391,"Total advance ({0}) against Order {1} cannot be greater \
+apps/erpnext/erpnext/controllers/accounts_controller.py +392,"Total advance ({0}) against Order {1} cannot be greater \
 				than the Grand Total ({2})","Tổng số trước ({0}) chống lại thứ tự {1} có thể không được lớn hơn \
  Grand Total ({2})"
 DocType: Employee,Relieving Date,Giảm ngày
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +12,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.","Quy tắc định giá được thực hiện để ghi đè lên Giá liệt kê / xác định tỷ lệ phần trăm giảm giá, dựa trên một số tiêu chí."
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,Kho chỉ có thể được thay đổi thông qua chứng khoán Entry / Giao hàng tận nơi Lưu ý / mua hóa đơn
 DocType: Employee Education,Class / Percentage,Lớp / Tỷ lệ phần trăm
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +92,Head of Marketing and Sales,Trưởng phòng Marketing và Bán hàng
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +31,Income Tax,Thuế thu nhập
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +157,Laser engineered net shaping,Laser thiết kế tạo hình net
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Head of Marketing and Sales,Trưởng phòng Marketing và Bán hàng
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +31,Income Tax,Thuế thu nhập
 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.","Nếu chọn giá Rule được làm cho 'giá', nó sẽ ghi đè lên giá List. Giá giá Rule là giá cuối cùng, do đó, không giảm giá hơn nữa nên được áp dụng. Do đó, trong các giao dịch như bán hàng đặt hàng, đặt hàng mua vv, nó sẽ được lấy trong trường 'Giá', chứ không phải là lĩnh vực 'Giá Giá'."
 apps/erpnext/erpnext/config/selling.py +163,Track Leads by Industry Type.,Theo dõi Dẫn theo ngành Type.
 DocType: Item Supplier,Item Supplier,Mục Nhà cung cấp
@@ -2191,31 +2119,28 @@
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Số lượng thực tế Sau khi giao dịch
 ,Pending SO Items For Purchase Request,Trong khi chờ SO mục Đối với mua Yêu cầu
 DocType: Supplier,Billing Currency,Thanh toán ngoại tệ
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +148,Extra Large,Cực lớn
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,Extra Large,Cực lớn
 ,Profit and Loss Statement,Lợi nhuận và mất Trữ
 DocType: Bank Reconciliation Detail,Cheque Number,Số séc
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +43,Pressing,Nhấn
 DocType: Payment Tool Detail,Payment Tool Detail,Công cụ thanh toán chi tiết
 ,Sales Browser,Doanh số bán hàng của trình duyệt
 DocType: Journal Entry,Total Credit,Tổng số tín dụng
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +474,Warning: Another {0} # {1} exists against stock entry {2},Cảnh báo: {0} # Một {1} tồn tại với mục cổ phiếu {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +459,Local,địa phương
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +476,Warning: Another {0} # {1} exists against stock entry {2},Cảnh báo: {0} # Một {1} tồn tại với mục cổ phiếu {2}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +397,Local,địa phương
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),Cho vay trước (tài sản)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,Con nợ
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +147,Large,Lớn
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +23,No employee found!,Không có nhân viên tìm thấy!
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Large,Lớn
 DocType: C-Form Invoice Detail,Territory,Lãnh thổ
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,Xin đề cập không có các yêu cầu thăm
 DocType: Purchase Order,Customer Address Display,Khách hàng Địa chỉ Display
 DocType: Stock Settings,Default Valuation Method,Phương pháp mặc định Định giá
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +127,Polishing,Đánh bóng
 DocType: Production Order Operation,Planned Start Time,Planned Start Time
 apps/erpnext/erpnext/config/accounts.py +63,Close Balance Sheet and book Profit or Loss.,Gần Cân đối kế toán và lợi nhuận cuốn sách hay mất.
-apps/erpnext/erpnext/stock/doctype/item/item.py +661,"Default Unit of Measure for Item {0} cannot be changed directly because \
+apps/erpnext/erpnext/stock/doctype/item/item.py +665,"Default Unit of Measure for Item {0} cannot be changed directly because \
 			you have already made some transaction(s) with another UOM. To change default UOM, \
 			use 'UOM Replace Utility' tool under Stock module.","Mặc định Đơn vị đo lường cho mục {0} không thể thay đổi trực tiếp vì \ bạn đã thực hiện một số giao dịch (s) với một ươm. Để thay đổi Ươm mặc định, \ sử dụng &#39;Ươm Thay Utility&#39; công cụ theo mô-đun Cổ."
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,Xác định thị trường ngoại tệ để chuyển đổi một đồng tiền vào một
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +146,Quotation {0} is cancelled,Báo giá {0} bị hủy bỏ
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +141,Quotation {0} is cancelled,Báo giá {0} bị hủy bỏ
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,Tổng số tiền nợ
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} was on leave on {1}. Cannot mark attendance.,Nhân viên {0} đã nghỉ trên {1}. Không thể đánh dấu tham dự.
 DocType: Sales Partner,Targets,Mục tiêu
@@ -2226,7 +2151,6 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +158,Please create Customer from Lead {0},Hãy tạo khách hàng từ chì {0}
 DocType: Price List,Applicable for Countries,Áp dụng đối với các nước
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Computers,Máy tính
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +112,Electro-chemical grinding,Electro-hóa chất mài
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +14,This is a root customer group and cannot be edited.,Đây là một nhóm khách hàng gốc và không thể được chỉnh sửa.
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +39,Please setup your chart of accounts before you start Accounting Entries,Xin vui lòng thiết lập biểu đồ của bạn của tài khoản trước khi bạn bắt đầu kế toán Entries
 DocType: Purchase Invoice,Ignore Pricing Rule,Bỏ qua giá Rule
@@ -2284,7 +2208,6 @@
 DocType: Maintenance Visit,Purposes,Mục đích
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +103,Atleast one item should be entered with negative quantity in return document,Ít nhất một mặt hàng cần được nhập với số lượng tiêu cực trong tài liệu trở lại
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +67,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","Operation {0} lâu hơn bất kỳ giờ làm việc có sẵn trong máy trạm {1}, phá vỡ các hoạt động vào nhiều hoạt động"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +134,Electrochemical machining,Công điện
 ,Requested,Yêu cầu
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +66,No Remarks,Không có Bình luận
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +13,Overdue,Quá hạn
@@ -2293,7 +2216,7 @@
 DocType: Monthly Distribution,Distribution Name,Tên phân phối
 DocType: Features Setup,Sales and Purchase,Bán hàng và mua hàng
 DocType: Supplier Quotation Item,Material Request No,Yêu cầu tài liệu Không
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +218,Quality Inspection required for Item {0},Kiểm tra chất lượng cần thiết cho mục {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +221,Quality Inspection required for Item {0},Kiểm tra chất lượng cần thiết cho mục {0}
 DocType: Quotation,Rate at which customer's currency is converted to company's base currency,Tốc độ tiền tệ của khách hàng được chuyển đổi sang tiền tệ cơ bản của công ty
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +107,{0} has been successfully unsubscribed from this list.,{0} đã được hủy đăng ký thành từ danh sách này.
 DocType: Purchase Invoice Item,Net Rate (Company Currency),Tỷ Net (Công ty tiền tệ)
@@ -2311,9 +2234,8 @@
 apps/erpnext/erpnext/accounts/report/financial_statements.py +16,Fiscal Year {0} not found.,Năm tài chính {0} không tìm thấy.
 DocType: Bank Reconciliation,Get Relevant Entries,Được viết liên quan
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +407,Accounting Entry for Stock,Nhập kế toán cho Stock
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +64,Coining,Đúc
 DocType: Sales Invoice,Sales Team1,Team1 bán hàng
-apps/erpnext/erpnext/stock/doctype/item/item.py +412,Item {0} does not exist,Mục {0} không tồn tại
+apps/erpnext/erpnext/stock/doctype/item/item.py +416,Item {0} does not exist,Mục {0} không tồn tại
 DocType: Sales Invoice,Customer Address,Địa chỉ khách hàng
 apps/frappe/frappe/desk/query_report.py +136,Total,Tổng sồ
 DocType: Purchase Invoice,Apply Additional Discount On,Áp dụng khác Giảm Ngày
@@ -2325,14 +2247,13 @@
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),Số tiền thuế Sau GIẢM Số tiền (Công ty tiền tệ)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +149,Target warehouse is mandatory for row {0},Kho mục tiêu là bắt buộc đối với hàng {0}
 DocType: Quality Inspection,Quality Inspection,Kiểm tra chất lượng
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +144,Extra Small,Tắm nhỏ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +20,Spray forming,Phun hình thành
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Extra Small,Tắm nhỏ
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +458,Warning: Material Requested Qty is less than Minimum Order Qty,Cảnh báo: Chất liệu được yêu cầu Số lượng ít hơn hàng tối thiểu Số lượng
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +191,Account {0} is frozen,Tài khoản {0} được đông lạnh
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Pháp nhân / Công ty con với một biểu đồ riêng của tài khoản thuộc Tổ chức.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +29,"Food, Beverage & Tobacco","Thực phẩm, đồ uống và thuốc lá"
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","Thực phẩm, đồ uống và thuốc lá"
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +20,PL or BS,PL hoặc BS
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,Can only make payment against unbilled {0},Chỉ có thể thực hiện thanh toán đối với unbilled {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +531,Can only make payment against unbilled {0},Chỉ có thể thực hiện thanh toán đối với unbilled {0}
 apps/erpnext/erpnext/controllers/selling_controller.py +122,Commission rate cannot be greater than 100,Tỷ lệ hoa hồng không có thể lớn hơn 100
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Minimum Inventory Level,Tối thiểu hàng tồn kho Cấp
 DocType: Stock Entry,Subcontract,Cho thầu lại
@@ -2343,19 +2264,18 @@
 DocType: Item,Manufacturer Part Number,Nhà sản xuất Phần số
 DocType: Production Order Operation,Estimated Time and Cost,Thời gian dự kiến ​​và chi phí
 DocType: Bin,Bin,Bin
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +50,Nosing,Đang sục sạo
 DocType: SMS Log,No of Sent SMS,Không có tin nhắn SMS gửi
 DocType: Account,Company,Giỏ hàng Giá liệt kê
 DocType: Account,Expense Account,Tài khoản chi phí
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +49,Software,Phần mềm
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +151,Colour,Màu
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +49,Software,Phần mềm
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Colour,Màu
 DocType: Maintenance Visit,Scheduled,Dự kiến
 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",Vui lòng chọn mục nơi &quot;Là Cổ Item&quot; là &quot;Không&quot; và &quot;Có Sales Item&quot; là &quot;Có&quot; và không có Bundle sản phẩm khác
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,Chọn phân phối không đồng đều hàng tháng để phân phối các mục tiêu ở tháng.
 DocType: Purchase Invoice Item,Valuation Rate,Tỷ lệ định giá
 apps/erpnext/erpnext/stock/get_item_details.py +281,Price List Currency not selected,Danh sách giá ngoại tệ không được chọn
 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,Mục Row {0}: Mua Receipt {1} không tồn tại trên bảng 'Mua Biên lai'
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +134,Employee {0} has already applied for {1} between {2} and {3},Nhân viên {0} đã áp dụng cho {1} {2} giữa và {3}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +145,Employee {0} has already applied for {1} between {2} and {3},Nhân viên {0} đã áp dụng cho {1} {2} giữa và {3}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Dự án Ngày bắt đầu
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +8,Until,Cho đến khi
 DocType: Rename Tool,Rename Log,Đổi tên Đăng nhập
@@ -2365,7 +2285,7 @@
 apps/erpnext/erpnext/controllers/recurring_document.py +162,Please select {0},Vui lòng chọn {0}
 DocType: C-Form,C-Form No,C-Mẫu Không
 DocType: BOM,Exploded_items,Exploded_items
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +95,Researcher,Nhà nghiên cứu
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Researcher,Nhà nghiên cứu
 apps/frappe/frappe/custom/doctype/customize_form/customize_form.js +88,Update,Cập nhật
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +78,Please save the Newsletter before sending,Xin vui lòng lưu bản tin trước khi gửi
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +23,Name or Email is mandatory,Tên hoặc Email là bắt buộc
@@ -2374,11 +2294,10 @@
 DocType: Employee,Exit,Thoát
 apps/erpnext/erpnext/accounts/doctype/account/account.py +134,Root Type is mandatory,Loại rễ là bắt buộc
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +295,Serial No {0} created,Không nối tiếp {0} tạo
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +125,Vibratory finishing,Hoàn thiện rung
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","Để thuận tiện cho khách hàng, các mã có thể được sử dụng trong các định dạng như in hóa đơn và giao hàng Ghi chú"
 DocType: Employee,You can enter any date manually,Bạn có thể nhập bất kỳ ngày nào tay
 DocType: Sales Invoice,Advertisement,Quảng cáo
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +165,Probationary Period,Thời gian thử việc
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Probationary Period,Thời gian thử việc
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Chỉ các nút lá được cho phép trong giao dịch
 DocType: Expense Claim,Expense Approver,Người phê duyệt chi phí
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,Mua hóa đơn hàng Cung cấp
@@ -2386,19 +2305,16 @@
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +17,To Datetime,Để Datetime
 DocType: SMS Settings,SMS Gateway URL,SMS Gateway URL
 apps/erpnext/erpnext/config/crm.py +53,Logs for maintaining sms delivery status,Logs cho việc duy trì tình trạng giao hàng sms
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +137,Grinding,Nghiền
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +34,Shrink wrapping,Shrink gói
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +36,Pending Activities,Các hoạt động cấp phát
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,Confirmed,Xác nhận
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier > Supplier Type,Nhà cung cấp> Nhà cung cấp Loại
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +127,Please enter relieving date.,Vui lòng nhập ngày giảm.
 apps/erpnext/erpnext/controllers/trends.py +137,Amt,Amt
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' can be submitted,Để lại chỉ ứng dụng với tình trạng 'chấp nhận' có thể được gửi
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +51,Only Leave Applications with status 'Approved' can be submitted,Để lại chỉ ứng dụng với tình trạng 'chấp nhận' có thể được gửi
 apps/erpnext/erpnext/utilities/doctype/address/address.py +21,Address Title is mandatory.,Địa chỉ Tiêu đề là bắt buộc.
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,Nhập tên của chiến dịch nếu nguồn gốc của cuộc điều tra là chiến dịch
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +38,Newspaper Publishers,Các nhà xuất bản báo
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +38,Newspaper Publishers,Các nhà xuất bản báo
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,Chọn năm tài chính
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +88,Smelting,Smelting
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Sắp xếp lại Cấp
 DocType: Attendance,Attendance Date,Tham gia
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,Lương chia tay dựa trên Lợi nhuận và khấu trừ.
@@ -2413,16 +2329,15 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +414,[Error],[Lỗi]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,Trong từ sẽ được hiển thị khi bạn lưu các thứ tự bán hàng.
 ,Employee Birthday,Nhân viên sinh nhật
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +55,Venture Capital,Vốn đầu tư mạo hiểm
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,Vốn đầu tư mạo hiểm
 DocType: UOM,Must be Whole Number,Phải có nguyên số
 DocType: Leave Control Panel,New Leaves Allocated (In Days),Lá mới phân bổ (Trong ngày)
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +51,Serial No {0} does not exist,Không nối tiếp {0} không tồn tại
 DocType: Pricing Rule,Discount Percentage,Tỷ lệ phần trăm giảm giá
 DocType: Payment Reconciliation Invoice,Invoice Number,Số hóa đơn
-apps/erpnext/erpnext/hooks.py +70,Orders,Đơn đặt hàng
+apps/erpnext/erpnext/hooks.py +54,Orders,Đơn đặt hàng
 DocType: Leave Control Panel,Employee Type,Loại nhân viên
 DocType: Employee Leave Approver,Leave Approver,Để phê duyệt
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +70,Swaging,Swaging
 DocType: Manufacturing Settings,Material Transferred for Manufacture,Chất liệu được chuyển giao cho sản xuất
 DocType: Expense Claim,"A user with ""Expense Approver"" role","Một người dùng với ""Chi phí Người phê duyệt"" vai trò"
 ,Issued Items Against Production Order,Mục ban hành đối với sản xuất hàng
@@ -2434,7 +2349,6 @@
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +62,Cost Center with existing transactions can not be converted to group,Trung tâm chi phí với các giao dịch hiện có không thể chuyển đổi sang nhóm
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Depreciation,Khấu hao
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Nhà cung cấp (s)
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +29,Invalid period,Thời gian không hợp lệ
 DocType: Customer,Credit Limit,Hạn chế tín dụng
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,Chọn loại giao dịch
 DocType: GL Entry,Voucher No,Không chứng từ
@@ -2444,9 +2358,9 @@
 DocType: Customer,Address and Contact,Địa chỉ và liên hệ
 DocType: Customer,Last Day of the Next Month,Ngày cuối cùng của tháng kế tiếp
 DocType: Employee,Feedback,Thông tin phản hồi
+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}","Để lại không thể được phân bổ trước khi {0}, như cân bằng nghỉ phép đã được carry-chuyển tiếp trong hồ sơ giao đất nghỉ tương lai {1}"
 apps/erpnext/erpnext/accounts/party.py +284,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Lưu ý: Do / Reference ngày vượt quá cho phép ngày tín dụng của khách hàng bởi {0} ngày (s)
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +621,Maint. Schedule,Maint. Lịch trình
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +108,Abrasive jet machining,Gia công máy bay phản lực mài mòn
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +632,Maint. Schedule,Maint. Lịch trình
 DocType: Stock Settings,Freeze Stock Entries,Đóng băng Cổ Entries
 DocType: Website Settings,Website Settings,Thiết lập trang web
 DocType: Item,Reorder level based on Warehouse,Mức độ sắp xếp lại dựa vào kho
@@ -2463,7 +2377,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +75,Show Stock Entries,Hiện Cổ Entries
 ,Is Primary Address,Là Tiểu học Địa chỉ
 DocType: Production Order,Work-in-Progress Warehouse,Làm việc-trong-Tiến kho
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +308,Reference #{0} dated {1},Tài liệu tham khảo # {0} ngày {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Reference #{0} dated {1},Tài liệu tham khảo # {0} ngày {1}
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +13,Manage Addresses,Quản lý địa chỉ
 DocType: Pricing Rule,Item Code,Mã hàng
 DocType: Production Planning Tool,Create Production Orders,Tạo đơn đặt hàng sản xuất
@@ -2472,7 +2386,7 @@
 DocType: Lead,Market Segment,Phân khúc thị trường
 DocType: Communication,Phone,Chuyển tệp
 DocType: Employee Internal Work History,Employee Internal Work History,Lịch sử nhân viên nội bộ làm việc
-apps/erpnext/erpnext/public/js/account_tree_grid.js +50,Closing (Dr),Đóng cửa (Tiến sĩ)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +221,Closing (Dr),Đóng cửa (Tiến sĩ)
 DocType: Contact,Passive,Thụ động
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,Không nối tiếp {0} không có trong kho
 apps/erpnext/erpnext/config/selling.py +127,Tax template for selling transactions.,Mẫu thuế cho các giao dịch bán.
@@ -2488,8 +2402,8 @@
 ,Billed Amount,Số tiền hóa đơn
 DocType: Bank Reconciliation,Bank Reconciliation,Ngân hàng hòa giải
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +9,Get Updates,Nhận thông tin cập nhật
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +129,Material Request {0} is cancelled or stopped,Yêu cầu tài liệu {0} được huỷ bỏ hoặc dừng lại
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +641,Add a few sample records,Thêm một vài biên bản lấy mẫu
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +133,Material Request {0} is cancelled or stopped,Yêu cầu tài liệu {0} được huỷ bỏ hoặc dừng lại
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Add a few sample records,Thêm một vài biên bản lấy mẫu
 apps/erpnext/erpnext/config/hr.py +210,Leave Management,Để quản lý
 DocType: Event,Groups,Nhóm
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,Nhóm bởi tài khoản
@@ -2502,38 +2416,34 @@
 DocType: Features Setup,Sales Extras,Extras bán hàng
 apps/erpnext/erpnext/accounts/utils.py +344,{0} budget for Account {1} against Cost Center {2} will exceed by {3},{0} ngân sách cho tài khoản {1} chống lại Trung tâm Chi phí {2} sẽ vượt quá bởi {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +236,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Tài khoản chênh lệch phải là một loại tài khoản tài sản / trách nhiệm pháp lý, kể từ khi hòa giải cổ này là một Entry Mở"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +138,Purchase Order number required for Item {0},Số mua hàng cần thiết cho mục {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Order number required for Item {0},Số mua hàng cần thiết cho mục {0}
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date','Từ ngày' phải sau 'Đến ngày'
 ,Stock Projected Qty,Dự kiến cổ phiếu Số lượng
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +147,Customer {0} does not belong to project {1},Khách hàng {0} không thuộc về dự án {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +150,Customer {0} does not belong to project {1},Khách hàng {0} không thuộc về dự án {1}
 DocType: Sales Order,Customer's Purchase Order,Mua hàng của khách hàng
 DocType: Warranty Claim,From Company,Từ Công ty
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,Giá trị hoặc lượng
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Minute,Phút
+apps/erpnext/erpnext/public/js/setup_wizard.js +363,Minute,Phút
 DocType: Purchase Invoice,Purchase Taxes and Charges,Thuế mua và lệ phí
 ,Qty to Receive,Số lượng để nhận
 DocType: Leave Block List,Leave Block List Allowed,Để lại Block List phép
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +61,Conversion factor cannot be in fractions,Yếu tố chuyển đổi không có thể được trong phần
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +358,You will use it to Login,Bạn sẽ sử dụng nó để đăng nhập
+apps/erpnext/erpnext/public/js/setup_wizard.js +108,You will use it to Login,Bạn sẽ sử dụng nó để đăng nhập
 DocType: Sales Partner,Retailer,Cửa hàng bán lẻ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +99,Credit To account must be a Balance Sheet account,Để tín dụng tài khoản phải có một tài khoản Cân đối kế toán
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,Nhà cung cấp tất cả các loại
 apps/erpnext/erpnext/stock/doctype/item/item.py +37,Item Code is mandatory because Item is not automatically numbered,Mục Mã số là bắt buộc vì mục không tự động đánh số
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +99,Quotation {0} not of type {1},Báo giá {0} không loại {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +93,Quotation {0} not of type {1},Báo giá {0} không loại {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,Lịch trình bảo trì hàng
 DocType: Sales Order,%  Delivered,% Giao
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,Bank Overdraft Account,Tài khoản thấu chi ngân hàng
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +15,Make Salary Slip,Làm cho lương trượt
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +18,Browse BOM,Duyệt BOM
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +175,Secured Loans,Các khoản cho vay được bảo đảm
-apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +3,Awesome Products,Sản phẩm tuyệt vời
+apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +3,Awesome Products,Sản phẩm tuyệt vời
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +189,Opening Balance Equity,Khai mạc Balance Equity
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +80,Cannot approve leave as you are not authorized to approve leaves on Block Dates,Không thể chấp nhận nghỉ như bạn không được uỷ quyền phê duyệt lá trên Khối Ngày
 DocType: Appraisal,Appraisal,Thẩm định
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +13,Lost-foam casting,Đúc Lost-xốp
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +47,Drawing,Vẽ
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +22,Date is repeated,Ngày được lặp đi lặp lại
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +148,Leave approver must be one of {0},Để phê duyệt phải là một trong {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +162,Leave approver must be one of {0},Để phê duyệt phải là một trong {0}
 DocType: Hub Settings,Seller Email,Người bán Email
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Tổng Chi phí mua hàng (thông qua mua Invoice)
 DocType: Workstation Working Hour,Start Time,Thời gian bắt đầu
@@ -2547,7 +2457,7 @@
 DocType: Purchase Invoice Item,Net Amount (Company Currency),Số tiền Net (Công ty tiền tệ)
 DocType: BOM Operation,Hour Rate,Tỷ lệ giờ
 DocType: Stock Settings,Item Naming By,Mục đặt tên By
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +642,From Quotation,Từ báo giá
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +655,From Quotation,Từ báo giá
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},Thời gian đóng cửa khác nhập {0} đã được thực hiện sau khi {1}
 DocType: Production Order,Material Transferred for Manufacturing,Chất liệu được chuyển giao cho sản xuất
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +29,Account {0} does not exists,Tài khoản của {0} không tồn tại
@@ -2561,21 +2471,19 @@
 DocType: Purchase Invoice Item,PR Detail,PR chi tiết
 DocType: Sales Order,Fully Billed,Được quảng cáo đầy đủ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +20,Cash In Hand,Tiền mặt trong tay
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +72,Delivery warehouse required for stock item {0},Kho giao hàng yêu cầu cho mục cổ phiếu {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +119,Delivery warehouse required for stock item {0},Kho giao hàng yêu cầu cho mục cổ phiếu {0}
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),Tổng trọng lượng của gói. Thường net trọng lượng đóng gói + trọng lượng vật liệu. (Đối với in)
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Người sử dụng với vai trò này được phép thiết lập tài khoản phong toả và tạo / sửa đổi ghi sổ kế toán đối với tài khoản phong toả
 DocType: Serial No,Is Cancelled,Được hủy bỏ
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +281,My Shipments,Lô hàng của tôi
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +286,My Shipments,Lô hàng của tôi
 DocType: Journal Entry,Bill Date,Hóa đơn ngày
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +43,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","Ngay cả khi có nhiều quy giá với ưu tiên cao nhất, ưu tiên nội bộ sau đó sau được áp dụng:"
 DocType: Supplier,Supplier Details,Thông tin chi tiết nhà cung cấp
 DocType: Communication,Recipients,Người nhận
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +146,Screwing,Screwing
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +96,Knurling,-sự Cán vân
 DocType: Expense Claim,Approval Status,Tình trạng chính
 DocType: Hub Settings,Publish Items to Hub,Xuất bản Items để Hub
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +44,From value must be less than to value in row {0},Từ giá trị phải nhỏ hơn giá trị trong hàng {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +133,Wire Transfer,Chuyển khoản
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +133,Wire Transfer,Chuyển khoản
 apps/erpnext/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py +25,Please select Bank Account,Vui lòng chọn tài khoản ngân hàng
 DocType: Newsletter,Create and Send Newsletters,Tạo và Gửi Tin
 apps/frappe/frappe/public/js/frappe/views/reports/grid_report.js +305,From Date must be before To Date,Từ ngày phải trước Đến ngày
@@ -2583,14 +2491,14 @@
 DocType: Company,Default Income Account,Tài khoản thu nhập mặc định
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,Nhóm khách hàng / khách hàng
 DocType: Item Group,Check this if you want to show in website,Kiểm tra này nếu bạn muốn hiển thị trong trang web
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +190,Welcome to ERPNext,Chào mừng bạn đến ERPNext
+,Welcome to ERPNext,Chào mừng bạn đến ERPNext
 DocType: Payment Reconciliation Payment,Voucher Detail Number,Chứng từ chi tiết Số
 apps/erpnext/erpnext/config/crm.py +146,Lead to Quotation,Dẫn đến bảng báo giá
 DocType: Lead,From Customer,Từ khách hàng
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +37,Calls,Cuộc gọi
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Calls,Cuộc gọi
 DocType: Project,Total Costing Amount (via Time Logs),Tổng số tiền Chi phí (thông qua Time Logs)
 DocType: Purchase Order Item Supplied,Stock UOM,Chứng khoán UOM
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Purchase Order {0} is not submitted,Mua hàng {0} không nộp
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +194,Purchase Order {0} is not submitted,Mua hàng {0} không nộp
 ,Projected,Dự kiến
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},Không nối tiếp {0} không thuộc về kho {1}
 apps/erpnext/erpnext/controllers/status_updater.py +136,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Lưu ý: Hệ thống sẽ không kiểm tra trên giao và quá đặt phòng cho hàng {0} như số lượng hoặc số lượng là 0
@@ -2598,7 +2506,6 @@
 DocType: Issue,Opening Date,Mở ngày
 DocType: Journal Entry,Remark,Nhận xét
 DocType: Purchase Receipt Item,Rate and Amount,Tỷ lệ và Số tiền
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +95,Boring,Chán nản
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +667,From Sales Order,Không có hồ sơ tìm thấy
 DocType: Blog Category,Parent Website Route,Mẹ Trang web Route
 DocType: Sales Order,Not Billed,Không Được quảng cáo
@@ -2612,19 +2519,17 @@
 apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount Amount,Số tiền giảm giá
 DocType: Purchase Invoice,Return Against Purchase Invoice,Return Against Mua hóa đơn
 DocType: Item,Warranty Period (in days),Thời gian bảo hành (trong ngày)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +550,e.g. VAT,ví dụ như thuế GTGT
+apps/erpnext/erpnext/public/js/setup_wizard.js +292,e.g. VAT,ví dụ như thuế GTGT
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,Khoản 4
 DocType: Journal Entry Account,Journal Entry Account,Tài khoản nhập Journal
 DocType: Shopping Cart Settings,Quotation Series,Báo giá dòng
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +52,"An item exists with same name ({0}), please change the item group name or rename the item","Một mục tồn tại với cùng một tên ({0}), hãy thay đổi tên nhóm mục hoặc đổi tên mục"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +82,Hot metal gas forming,Khí kim loại nóng hình thành
 DocType: Sales Order Item,Sales Order Date,Bán hàng đặt hàng ngày
 DocType: Sales Invoice Item,Delivered Qty,Số lượng giao
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +63,Warehouse {0}: Company is mandatory,Kho {0}: Công ty là bắt buộc
 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.",Đi đến các nhóm thích hợp (thường Nguồn vốn&gt; Nợ ngắn hạn&gt; Thuế và Nhiệm vụ và tạo một tài khoản mới (bằng cách nhấn vào Add Child) của loại &quot;thuế&quot; và làm đề cập đến tỷ lệ thuế.
 ,Payment Period Based On Invoice Date,Thời hạn thanh toán Dựa trên hóa đơn ngày
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +50,Missing Currency Exchange Rates for {0},Thiếu ngoại tệ Tỷ giá ngoại tệ cho {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +135,Laser cutting,Cắt laser
 DocType: Event,Monday,Thứ Hai
 DocType: Journal Entry,Stock Entry,Chứng khoán nhập
 DocType: Account,Payable,Phải nộp
@@ -2657,7 +2562,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +111,Date Of Retirement must be greater than Date of Joining,Trong ngày hưu trí phải lớn hơn ngày của Tham gia
 DocType: Sales Invoice,Against Income Account,Đối với tài khoản thu nhập
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +69,{0}% Delivered,{0}% Phân phối
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +78,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Mục {0}: qty Ra lệnh {1} không thể ít hơn qty đặt hàng tối thiểu {2} (quy định tại khoản).
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Mục {0}: qty Ra lệnh {1} không thể ít hơn qty đặt hàng tối thiểu {2} (quy định tại khoản).
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Tỷ lệ phân phối hàng tháng
 DocType: Territory,Territory Targets,Mục tiêu lãnh thổ
 DocType: Delivery Note,Transporter Info,Thông tin vận chuyển
@@ -2666,7 +2571,6 @@
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,"Tiêu đề cho các mẫu in, ví dụ như hóa đơn chiếu lệ."
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +140,Valuation type charges can not marked as Inclusive,Phí kiểu định giá không thể đánh dấu là Inclusive
 DocType: POS Profile,Update Stock,Cập nhật chứng khoán
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +128,Superfinishing,Superfinishing
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,UOM khác nhau cho các hạng mục sẽ dẫn đến không chính xác (Tổng số) giá trị Trọng lượng. Hãy chắc chắn rằng Trọng lượng của mỗi mục là trong cùng một UOM.
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM Rate
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +85,Please pull items from Delivery Note,Hãy kéo các mục từ giao hàng Lưu ý
@@ -2681,7 +2585,6 @@
 ,Purchase Analytics,Mua Analytics
 DocType: Sales Invoice Item,Delivery Note Item,Giao hàng Ghi mục
 DocType: Expense Claim,Task,Nhiệm vụ Tự tắt Lựa chọn
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +57,Shaving,Cạo
 DocType: Purchase Taxes and Charges,Reference Row #,Tài liệu tham khảo Row #
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},Batch số là bắt buộc đối với hàng {0}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js +14,This is a root sales person and cannot be edited.,Đây là một người bán hàng gốc và không thể được chỉnh sửa.
@@ -2693,13 +2596,11 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +74,Purpose must be one of {0},Mục đích phải là một trong {0}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +108,Fill the form and save it,Điền vào mẫu và lưu nó
 DocType: Production Planning Tool,Download a report containing all raw materials with their latest inventory status,Tải về một bản báo cáo có chứa tất cả các nguyên liệu với tình trạng hàng tồn kho mới nhất của họ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +94,Facing,Đối mặt
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,Cộng đồng Diễn đàn
 DocType: Leave Application,Leave Balance Before Application,Trước khi rời khỏi cân ứng dụng
 DocType: SMS Center,Send SMS,Gửi tin nhắn SMS
 DocType: Company,Default Letter Head,Mặc định Letter Head
 DocType: Time Log,Billable,Lập hoá đơn
-DocType: Authorization Rule,This will be used for setting rule in HR module,Điều này sẽ được sử dụng để thiết lập quy tắc trong quản lý Nhân sự
 DocType: Account,Rate at which this tax is applied,Tốc độ thuế này được áp dụng
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reorder Qty,Sắp xếp lại Qty
 DocType: Company,Stock Adjustment Account,Tài khoản điều chỉnh chứng khoán
@@ -2726,16 +2627,15 @@
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,Tỷ lệ phần trăm phân bổ phải bằng 100%
 DocType: Serial No,Out of AMC,Của AMC
 DocType: Purchase Order Item,Material Request Detail No,Yêu cầu tài liệu chi tiết Không
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +97,Hard turning,Ngoặt cứng
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +33,Make Maintenance Visit,Thực hiện bảo trì đăng nhập
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +187,Please contact to the user who have Sales Master Manager {0} role,Vui lòng liên hệ để người sử dụng có doanh Thạc sĩ Quản lý {0} vai trò
 DocType: Company,Default Cash Account,Tài khoản mặc định tiền
 apps/erpnext/erpnext/config/accounts.py +79,Company (not Customer or Supplier) master.,Công ty (không khách hàng hoặc nhà cung cấp) làm chủ.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +106,Please enter 'Expected Delivery Date',Vui lòng nhập 'dự kiến giao hàng ngày'
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +187,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Ghi chú giao hàng {0} phải được hủy bỏ trước khi hủy bỏ đơn đặt hàng này
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +100,Please enter 'Expected Delivery Date',Vui lòng nhập 'dự kiến giao hàng ngày'
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +182,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Ghi chú giao hàng {0} phải được hủy bỏ trước khi hủy bỏ đơn đặt hàng này
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +373,Paid amount + Write Off Amount can not be greater than Grand Total,Số tiền thanh toán + Viết Tắt Số tiền không thể lớn hơn Tổng cộng
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} không phải là một số hợp lệ cho hàng loạt mục {1}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,Note: There is not enough leave balance for Leave Type {0},Lưu ý: Không có đủ số dư để lại cho Rời Loại {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +124,Note: There is not enough leave balance for Leave Type {0},Lưu ý: Không có đủ số dư để lại cho Rời Loại {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.","Lưu ý: Nếu thanh toán không được thực hiện đối với bất kỳ tài liệu tham khảo, làm Journal nhập bằng tay."
 DocType: Item,Supplier Items,Nhà cung cấp Items
 DocType: Opportunity,Opportunity Type,Loại cơ hội
@@ -2747,7 +2647,7 @@
 DocType: Hub Settings,Publish Availability,Xuất bản sẵn có
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +105,Date of Birth cannot be greater than today.,Ngày sinh thể không được lớn hơn ngày hôm nay.
 ,Stock Ageing,Cổ người cao tuổi
-apps/erpnext/erpnext/controllers/accounts_controller.py +200,{0} '{1}' is disabled,{0} '{1}' bị vô hiệu hóa
+apps/erpnext/erpnext/controllers/accounts_controller.py +201,{0} '{1}' is disabled,{0} '{1}' bị vô hiệu hóa
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Đặt làm mở
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Gửi email tự động đến hệ về giao dịch Trình.
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +232,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
@@ -2757,44 +2657,38 @@
 DocType: Purchase Order,Customer Contact Email,Khách hàng Liên hệ Email
 DocType: Event,Sunday,Chủ Nhật
 DocType: Sales Team,Contribution (%),Đóng góp (%)
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +455,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,Lưu ý: Hiệu thanh toán sẽ không được tạo ra từ 'tiền mặt hoặc tài khoản ngân hàng' không quy định rõ
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +171,Responsibilities,Trách nhiệm
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +457,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,Lưu ý: Hiệu thanh toán sẽ không được tạo ra từ 'tiền mặt hoặc tài khoản ngân hàng' không quy định rõ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +171,Responsibilities,Trách nhiệm
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Template,Mẫu
 DocType: Sales Person,Sales Person Name,Người bán hàng Tên
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,Vui lòng nhập ít nhất 1 hóa đơn trong bảng
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +511,Add Users,Thêm người dùng
+apps/erpnext/erpnext/public/js/setup_wizard.js +255,Add Users,Thêm người dùng
 DocType: Pricing Rule,Item Group,Nhóm hàng
 DocType: Task,Actual Start Date (via Time Logs),Ngày bắt đầu thực tế (thông qua Time Logs)
 DocType: Stock Reconciliation Item,Before reconciliation,Trước khi hòa giải
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +12,To {0},Để {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Thuế và lệ phí nhập (Công ty tiền tệ)
-apps/erpnext/erpnext/stock/doctype/item/item.py +340,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,"Mục thuế Row {0} phải có tài khoản của các loại thuế, thu nhập hoặc chi phí hoặc có thu phí"
+apps/erpnext/erpnext/stock/doctype/item/item.py +344,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,"Mục thuế Row {0} phải có tài khoản của các loại thuế, thu nhập hoặc chi phí hoặc có thu phí"
 DocType: Sales Order,Partly Billed,Được quảng cáo một phần
 DocType: Item,Default BOM,Mặc định HĐQT
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +79,Decambering,Decambering
 apps/erpnext/erpnext/setup/doctype/company/company.js +22,Please re-type company name to confirm,Hãy gõ lại tên công ty để xác nhận
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,Tổng số nợ Amt
 DocType: Time Log Batch,Total Hours,Tổng số giờ
 DocType: Journal Entry,Printing Settings,In ấn Cài đặt
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +268,Total Debit must be equal to Total Credit. The difference is {0},Tổng Nợ phải bằng Tổng số tín dụng. Sự khác biệt là {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +11,Automotive,Ô tô
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +37,Item is required,Mục được yêu cầu
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +25,Metal injection molding,Kim loại đúc phun
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +258,Total Debit must be equal to Total Credit. The difference is {0},Tổng Nợ phải bằng Tổng số tín dụng. Sự khác biệt là {0}
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,Ô tô
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +684,From Delivery Note,Giao hàng tận nơi từ Lưu ý
 DocType: Time Log,From Time,Thời gian từ
 DocType: Notification Control,Custom Message,Tùy chỉnh tin nhắn
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +33,Investment Banking,Ngân hàng đầu tư
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +261,"Select your Country, Time Zone and Currency","Chọn quốc gia của bạn, Time Zone và ngoại tệ"
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,Ngân hàng đầu tư
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +316,"Select your Country, Time Zone and Currency","Chọn quốc gia của bạn, Time Zone và ngoại tệ"
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +369,Cash or Bank Account is mandatory for making payment entry,Tiền mặt hoặc tài khoản ngân hàng là bắt buộc đối với việc nhập cảnh thanh toán
 DocType: Purchase Invoice,Price List Exchange Rate,Danh sách giá Tỷ giá
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +91,Pickling,Sự ngâm trong muối
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +18,Sand casting,Đúc cát
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +117,Electroplating,Mạ điện
 DocType: Purchase Invoice Item,Rate,Đánh giá
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +62,Intern,Tập
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Intern,Tập
 DocType: Newsletter,A Lead with this email id should exist,Một chì với id email này nên tồn tại
 DocType: Stock Entry,From BOM,Từ BOM
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +34,Basic,Gói Cơ bản
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +34,Basic,Gói Cơ bản
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,Giao dịch chứng khoán trước ngày {0} được đông lạnh
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +217,Please click on 'Generate Schedule',Vui lòng click vào 'Tạo lịch'
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +61,To Date should be same as From Date for Half Day leave,Đến ngày nên giống như Từ ngày cho nửa ngày nghỉ
@@ -2802,11 +2696,11 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +96,Reference No is mandatory if you entered Reference Date,Không tham khảo là bắt buộc nếu bạn bước vào tham khảo ngày
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +108,Date of Joining must be greater than Date of Birth,Tham gia ngày phải lớn hơn ngày sinh
 DocType: Salary Structure,Salary Structure,Cơ cấu tiền lương
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +242,"Multiple Price Rule exists with same criteria, please resolve \
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +246,"Multiple Price Rule exists with same criteria, please resolve \
 			conflict by assigning priority. Price Rules: {0}","Nhiều Giá Rule tồn tại với cùng một tiêu chí, xin vui lòng giải quyết xung đột bằng cách gán \
  ưu tiên. Quy định giá: {0}"
 DocType: Account,Bank,Tài khoản
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +9,Airline,Hãng hàng không
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,Hãng hàng không
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +493,Issue Material,Vấn đề liệu
 DocType: Material Request Item,For Warehouse,Cho kho
 DocType: Employee,Offer Date,Phục vụ ngày
@@ -2816,29 +2710,24 @@
 DocType: Item,Is Fixed Asset Item,Tài sản cố định là mục
 DocType: Stock Entry,Including items for sub assemblies,Bao gồm các mặt hàng cho các tiểu hội
 DocType: Features Setup,"If you have long print formats, this feature can be used to split the page to be printed on multiple pages with all headers and footers on each page","Nếu bạn có định dạng in dài, tính năng này có thể được sử dụng để phân chia các trang được in trên nhiều trang với tất cả các header và footer trên mỗi trang"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +131,Hobbing,Hobbing
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +98,All Territories,Tất cả các vùng lãnh thổ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +98,All Territories,Tất cả các vùng lãnh thổ
 DocType: Purchase Invoice,Items,Mục
 DocType: Fiscal Year,Year Name,Năm Tên
 DocType: Process Payroll,Process Payroll,Quá trình tính lương
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +59,There are more holidays than working days this month.,Có ngày lễ hơn ngày làm việc trong tháng này.
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +68,There are more holidays than working days this month.,Có ngày lễ hơn ngày làm việc trong tháng này.
 DocType: Product Bundle Item,Product Bundle Item,Gói sản phẩm hàng
 DocType: Sales Partner,Sales Partner Name,Đối tác bán hàng Tên
 DocType: Purchase Invoice Item,Image View,Xem hình ảnh
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +113,Finishing & industrial finishing,Hoàn thiện và hoàn thiện công nghiệp
 DocType: Issue,Opening Time,Thời gian mở
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,From và To ngày cần
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +46,Securities & Commodity Exchanges,Chứng khoán và Sở Giao dịch hàng hóa
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Chứng khoán và Sở Giao dịch hàng hóa
 DocType: Shipping Rule,Calculate Based On,Dựa trên tính toán
 DocType: Delivery Note Item,From Warehouse,Từ kho
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +98,Drilling,Khoan
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +28,Blow molding,Thổi
 DocType: Purchase Taxes and Charges,Valuation and Total,Định giá và Tổng
 DocType: Tax Rule,Shipping City,Vận Chuyển Thành phố
 apps/erpnext/erpnext/stock/doctype/item/item.js +43,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,Mục này là một biến thể của {0} (Template). Các thuộc tính sẽ được sao chép từ các mẫu trừ 'Không Copy' được thiết lập
 DocType: Account,Purchase User,Mua tài khoản
 DocType: Notification Control,Customize the Notification,Tùy chỉnh thông báo
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +87,Hammering,Đánh bằng búa
 DocType: Web Page,Slideshow,Ảnh Slideshow
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +24,Default Address Template cannot be deleted,Địa chỉ mặc định mẫu không thể bị xóa
 DocType: Sales Invoice,Shipping Rule,Này ! Đi trước và thêm một địa chỉ
@@ -2847,9 +2736,8 @@
 DocType: Workflow State,Search,Tìm kiếm
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +54,Total cannot be zero,Tổng số không có thể được không
 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,"""Kể từ ngày Last Order"" phải lớn hơn hoặc bằng số không"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +142,Brazing,Hàn thau
 DocType: C-Form,Amended From,Sửa đổi Từ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Raw Material,Nguyên liệu
+apps/erpnext/erpnext/public/js/setup_wizard.js +359,Raw Material,Nguyên liệu
 DocType: Leave Application,Follow via Email,Theo qua email
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Số tiền thuế Sau khi giảm giá tiền
 apps/erpnext/erpnext/accounts/doctype/account/account.py +174,Child account exists for this account. You can not delete this account.,Tài khoản con tồn tại cho tài khoản này. Bạn không thể xóa tài khoản này.
@@ -2863,10 +2751,10 @@
 ,Produced,Sản xuất
 DocType: Item,Item Code for Suppliers,Item Code cho nhà cung cấp
 DocType: Issue,Raised By (Email),Nâng By (Email)
-apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +72,General,Chung
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +495,Attach Letterhead,Đính kèm thư của
+apps/erpnext/erpnext/setup/setup_wizard/default_website.py +72,General,Chung
+apps/erpnext/erpnext/public/js/setup_wizard.js +241,Attach Letterhead,Đính kèm thư của
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +272,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',Không thể khấu trừ khi loại là 'định giá' hoặc 'Định giá và Total'
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +542,"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.","Danh sách đầu thuế của bạn (ví dụ như thuế GTGT, Hải vv; họ cần phải có tên duy nhất) và tỷ lệ tiêu chuẩn của họ. Điều này sẽ tạo ra một mẫu tiêu chuẩn, trong đó bạn có thể chỉnh sửa và thêm nhiều hơn sau này."
+apps/erpnext/erpnext/public/js/setup_wizard.js +284,"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.","Danh sách đầu thuế của bạn (ví dụ như thuế GTGT, Hải vv; họ cần phải có tên duy nhất) và tỷ lệ tiêu chuẩn của họ. Điều này sẽ tạo ra một mẫu tiêu chuẩn, trong đó bạn có thể chỉnh sửa và thêm nhiều hơn sau này."
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial Nos Required for Serialized Item {0},Nối tiếp Nos Yêu cầu cho In nhiều mục {0}
 DocType: Journal Entry,Bank Entry,Ngân hàng nhập
 DocType: Authorization Rule,Applicable To (Designation),Để áp dụng (Chỉ)
@@ -2875,33 +2763,32 @@
 apps/erpnext/erpnext/config/accounts.py +143,Enable / disable currencies.,Cho phép / vô hiệu hóa tiền tệ.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Postal Expenses,Chi phí bưu điện
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Tổng số (Amt)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +26,Entertainment & Leisure,Giải trí & Giải trí
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,Giải trí & Giải trí
 DocType: Purchase Order,The date on which recurring order will be stop,"Ngày, tháng, để định kỳ sẽ được dừng lại"
 DocType: Quality Inspection,Item Serial No,Mục Serial No
 apps/erpnext/erpnext/controllers/status_updater.py +142,{0} must be reduced by {1} or you should increase overflow tolerance,{0} phải được giảm {1} hoặc bạn nên tăng khả năng chịu tràn
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Present,Tổng số hiện tại
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Hour,Giờ
+apps/erpnext/erpnext/public/js/setup_wizard.js +363,Hour,Giờ
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +138,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation","Mục đăng {0} không thể được cập nhật bằng cách sử dụng \
  Cổ hòa giải"
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +488,Transfer Material to Supplier,Chuyển Vật liệu để Nhà cung cấp
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +513,Transfer Material to Supplier,Chuyển Vật liệu để Nhà cung cấp
 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,Mới Serial No không thể có Warehouse. Kho phải được thiết lập bởi Cổ nhập hoặc mua hóa đơn
 DocType: Lead,Lead Type,Loại chì
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +82,Create Quotation,Tạo báo giá
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +306,All these items have already been invoiced,Tất cả các mặt hàng này đã được lập hoá đơn
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,You are not authorized to approve leaves on Block Dates,Bạn không được uỷ quyền phê duyệt lá trên Khối Ngày
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +311,All these items have already been invoiced,Tất cả các mặt hàng này đã được lập hoá đơn
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},Có thể được chấp thuận bởi {0}
 DocType: Shipping Rule,Shipping Rule Conditions,Điều kiện vận chuyển Rule
 DocType: BOM Replace Tool,The new BOM after replacement,Hội đồng quản trị mới sau khi thay thế
 DocType: Features Setup,Point of Sale,Điểm bán hàng
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +83,Curling,Quăn
 DocType: Account,Tax,Thuế
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +28,Row {0}: {1} is not a valid {2},Row {0}: {1} không phải là một giá trị {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +89,Refining,Refining
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +37,Row {0}: {1} is not a valid {2},Row {0}: {1} không phải là một giá trị {2}
 DocType: Production Planning Tool,Production Planning Tool,Công cụ sản xuất Kế hoạch
 DocType: Quality Inspection,Report Date,Báo cáo ngày
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +130,Routing,Routing
 DocType: C-Form,Invoices,Hoá đơn
 DocType: Job Opening,Job Title,Chức vụ
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +54,{0} already allocated for Employee {1} for period {2} - {3},{0} đã được phân bổ cho {1} Employee cho kỳ {2} - {3}
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +80,{0} Recipients,{0} người nhận
 DocType: Features Setup,Item Groups in Details,Nhóm mục trong chi tiết
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +335,Quantity to Manufacture must be greater than 0.,Số lượng để sản xuất phải lớn hơn 0.
@@ -2919,14 +2806,13 @@
 DocType: DocType,Setup,Cài đặt
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,Không có gì phải chỉnh sửa là.
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +108,Summary for this month and pending activities,Tóm tắt cho tháng này và các hoạt động cấp phát
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +39,Cold rolling,Cán nguội
 DocType: Customer Group,Customer Group Name,Nhóm khách hàng Tên
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +408,Please remove this Invoice {0} from C-Form {1},Hãy loại bỏ hóa đơn này {0} từ C-Form {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +410,Please remove this Invoice {0} from C-Form {1},Hãy loại bỏ hóa đơn này {0} từ C-Form {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,Vui lòng chọn Carry Forward nếu bạn cũng muốn bao gồm cân bằng tài chính của năm trước để lại cho năm tài chính này
 DocType: GL Entry,Against Voucher Type,Loại chống lại Voucher
 DocType: Item,Attributes,Thuộc tính
 DocType: Packing Slip,Get Items,Được mục
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +186,Please enter Write Off Account,Vui lòng nhập Viết Tắt tài khoản
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +187,Please enter Write Off Account,Vui lòng nhập Viết Tắt tài khoản
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +71,Last Order Date,Last Order ngày
 DocType: DocField,Image,Hình
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +179,Make Excise Invoice,Làm cho tiêu thụ đặc biệt Hóa đơn
@@ -2936,7 +2822,7 @@
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +146,Operation ID not set,ID hoạt động không được thiết lập
 DocType: Production Order,Planned Start Date,Ngày bắt đầu lên kế hoạch
 DocType: Serial No,Creation Document Type,Loại tài liệu sáng tạo
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +620,Maint. Visit,Maint. Chuyến thăm
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +631,Maint. Visit,Maint. Chuyến thăm
 DocType: Leave Type,Is Encash,Là thâu tiền bạc
 DocType: Purchase Invoice,Mobile No,Điện thoại di động Không
 DocType: Payment Tool,Make Journal Entry,Hãy Journal nhập
@@ -2944,35 +2830,31 @@
 apps/erpnext/erpnext/controllers/trends.py +257,Project-wise data is not available for Quotation,Dữ liệu dự án khôn ngoan là không có sẵn cho báo giá
 DocType: Project,Expected End Date,Dự kiến kết thúc ngày
 DocType: Appraisal Template,Appraisal Template Title,Thẩm định Mẫu Tiêu đề
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +440,Commercial,Thương mại
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +378,Commercial,Thương mại
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +23,Parent Item {0} must not be a Stock Item,Chánh mục {0} không phải là Cổ Mã
 DocType: Cost Center,Distribution Id,Id phân phối
-apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +14,Awesome Services,Dịch vụ tuyệt vời
+apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +14,Awesome Services,Dịch vụ tuyệt vời
 apps/erpnext/erpnext/config/manufacturing.py +29,All Products or Services.,Tất cả sản phẩm hoặc dịch vụ.
 DocType: Purchase Invoice,Supplier Address,Địa chỉ nhà cung cấp
 DocType: Contact Us Settings,Address Line 2,Địa chỉ Dòng 2
 DocType: ToDo,Reference,Tham chiếu
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +59,Perforating,Đục lỗ
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,Số lượng ra
 apps/erpnext/erpnext/config/accounts.py +128,Rules to calculate shipping amount for a sale,Quy tắc để tính toán tiền vận chuyển để bán
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +29,Series is mandatory,Series là bắt buộc
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +28,Financial Services,Dịch vụ tài chính
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,Dịch vụ tài chính
 apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3},Giá trị {0} Thuộc tính phải nằm trong phạm vi của {1} để {2} trong gia số của {3}
 DocType: Tax Rule,Sales,Bán hàng
 DocType: Stock Entry Detail,Basic Amount,Số tiền cơ bản
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +173,Warehouse required for stock Item {0},Kho cần thiết cho chứng khoán hàng {0}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +178,Warehouse required for stock Item {0},Kho cần thiết cho chứng khoán hàng {0}
 DocType: Leave Allocation,Unused leaves,Lá chưa sử dụng
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,Cr
 DocType: Customer,Default Receivable Accounts,Mặc định thu khoản
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +102,Sawing,Cưa
 DocType: Tax Rule,Billing State,Thanh toán Nhà nước
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +32,Laminating,Ép tấm nhiều lớp
 DocType: Item Reorder,Transfer,Truyền
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +549,Fetch exploded BOM (including sub-assemblies),Lấy BOM nổ (bao gồm các cụm chi tiết)
 DocType: Authorization Rule,Applicable To (Employee),Để áp dụng (nhân viên)
 apps/erpnext/erpnext/controllers/accounts_controller.py +101,Due Date is mandatory,Due Date là bắt buộc
 apps/erpnext/erpnext/controllers/item_variant.py +51,Increment for Attribute {0} cannot be 0,Tăng cho Attribute {0} không thể là 0
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +143,Sintering,Quá trình thiêu kết
 DocType: Journal Entry,Pay To / Recd From,Để trả / Recd Từ
 DocType: Naming Series,Setup Series,Thiết lập Dòng
 DocType: Supplier,Contact HTML,Liên hệ với HTML
@@ -2985,7 +2867,6 @@
 DocType: Attendance,Absent,Vắng mặt
 DocType: Product Bundle,Product Bundle,Bundle sản phẩm
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +180,Row {0}: Invalid reference {1},Row {0}: tham chiếu không hợp lệ {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +165,Crushing,Máy nghiền
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Mua Thuế và phí Template
 DocType: Upload Attendance,Download Template,Tải mẫu
 DocType: GL Entry,Remarks,Ghi chú
@@ -2993,14 +2874,12 @@
 DocType: Journal Entry,Write Off Based On,Viết Tắt Dựa trên
 DocType: Features Setup,POS View,POS Xem
 apps/erpnext/erpnext/config/stock.py +38,Installation record for a Serial No.,Bản ghi cài đặt cho một Số sản
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +9,Continuous casting,Đúc liên tục
 apps/erpnext/erpnext/public/js/queries.js +39,Please specify a,Vui lòng xác định
 DocType: Offer Letter,Awaiting Response,Đang chờ Response
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +53,Above,Ở trên
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +80,Cold sizing,Lạnh sizing
 DocType: Salary Slip,Earning & Deduction,Thu nhập và khoản giảm trừ
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +76,Account {0} cannot be a Group,Tài khoản {0} không thể là một Tập đoàn
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +259,Region,Vùng
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +314,Region,Vùng
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +213,Optional. This setting will be used to filter in various transactions.,Tùy chọn. Thiết lập này sẽ được sử dụng để lọc các giao dịch khác nhau.
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +104,Negative Valuation Rate is not allowed,Tỷ lệ tiêu cực Định giá không được phép
 DocType: Holiday List,Weekly Off,Tắt tuần
@@ -3018,7 +2897,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,Account {0} is inactive,Tài khoản {0} không hoạt động
 DocType: GL Entry,Is Advance,Là Trước
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,Từ ngày tham gia và tham dự Đến ngày là bắt buộc
-apps/erpnext/erpnext/controllers/buying_controller.py +131,Please enter 'Is Subcontracted' as Yes or No,"Vui lòng nhập 'là hợp đồng phụ ""là Có hoặc Không"
+apps/erpnext/erpnext/controllers/buying_controller.py +122,Please enter 'Is Subcontracted' as Yes or No,"Vui lòng nhập 'là hợp đồng phụ ""là Có hoặc Không"
 DocType: Sales Team,Contact No.,Liên hệ với số
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,'Profit and Loss' type account {0} not allowed in Opening Entry,"""Lợi nhuận và mất 'loại tài khoản {0} không được phép vào khai nhập"
 DocType: Workflow State,Time,Thời gian
@@ -3027,14 +2906,13 @@
 DocType: Authorization Rule,Authorization Rule,Quy tắc ủy quyền
 DocType: Sales Invoice,Terms and Conditions Details,Điều khoản và Điều kiện chi tiết
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,Thuế doanh thu và lệ phí mẫu
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +10,Apparel & Accessories,May mặc và phụ kiện
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,May mặc và phụ kiện
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +67,Number of Order,Số thứ tự
 DocType: Item Group,HTML / Banner that will show on the top of product list.,HTML / Banner đó sẽ hiển thị trên đầu danh sách sản phẩm.
 DocType: Shipping Rule,Specify conditions to calculate shipping amount,Xác định điều kiện để tính toán tiền vận chuyển
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +121,Add Child,Thêm trẻ em
 DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,Vai trò Được phép Thiết lập 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,Không thể chuyển đổi Trung tâm Chi phí sổ cái vì nó có các nút con
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +47,Conversion Factor is required,Yếu tố chuyển đổi là cần thiết
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +37,Serial #,Serial #
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +87,Commission on Sales,Hoa hồng trên doanh
 DocType: Offer Letter Term,Value / Description,Giá trị / Mô tả
@@ -3042,10 +2920,8 @@
 ,Customers Not Buying Since Long Time,Khách hàng không mua từ Long Time
 DocType: Production Order,Expected Delivery Date,Dự kiến sẽ giao hàng ngày
 apps/erpnext/erpnext/accounts/general_ledger.py +121,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Thẻ ghi nợ và tín dụng không bằng cho {0} # {1}. Sự khác biệt là {2}.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +48,Bulging,Lồi lên
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +11,Evaporative-pattern casting,Casting bay hơi-pattern
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Entertainment Expenses,Chi phí Giải trí
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +195,Sales Invoice {0} must be cancelled before cancelling this Sales Order,Hóa đơn bán hàng {0} phải được hủy bỏ trước khi hủy bỏ đơn đặt hàng này
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +190,Sales Invoice {0} must be cancelled before cancelling this Sales Order,Hóa đơn bán hàng {0} phải được hủy bỏ trước khi hủy bỏ đơn đặt hàng này
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +61,Age,Tuổi
 DocType: Time Log,Billing Amount,Số tiền thanh toán
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +84,Invalid quantity specified for item {0}. Quantity should be greater than 0.,Số lượng không hợp lệ quy định cho mặt hàng {0}. Số lượng phải lớn hơn 0.
@@ -3064,26 +2940,24 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,New Doanh thu khách hàng
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Travel Expenses,Chi phí đi lại
 DocType: Maintenance Visit,Breakdown,Hỏng
-apps/erpnext/erpnext/controllers/accounts_controller.py +241,Account: {0} with currency: {1} can not be selected,Tài khoản: {0} với tệ: {1} có thể không được lựa chọn
+apps/erpnext/erpnext/controllers/accounts_controller.py +242,Account: {0} with currency: {1} can not be selected,Tài khoản: {0} với tệ: {1} có thể không được lựa chọn
 DocType: Bank Reconciliation Detail,Cheque Date,Séc ngày
 apps/erpnext/erpnext/accounts/doctype/account/account.py +47,Account {0}: Parent account {1} does not belong to company: {2},Tài khoản {0}: Cha mẹ tài khoản {1} không thuộc về công ty: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted all transactions related to this company!,Xóa thành công tất cả các giao dịch liên quan đến công ty này!
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,Như trên ngày
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +111,Honing,Mài giũa
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +58,Probation,Quản chế
-apps/erpnext/erpnext/stock/doctype/item/item.py +264,Default Warehouse is mandatory for stock Item.,Kho mặc định là bắt buộc đối với cổ phiếu Item.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Probation,Quản chế
+apps/erpnext/erpnext/stock/doctype/item/item.py +268,Default Warehouse is mandatory for stock Item.,Kho mặc định là bắt buộc đối với cổ phiếu Item.
 DocType: Feed,Full Name,Tên đầy đủ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +148,Clinching,Clinching
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +191,Payment of salary for the month {0} and year {1},Thanh toán tiền lương trong tháng {0} và năm {1}
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +173,Payment of salary for the month {0} and year {1},Thanh toán tiền lương trong tháng {0} và năm {1}
 DocType: Stock Settings,Auto insert Price List rate if missing,Auto chèn tỷ Bảng giá nếu mất tích
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,Tổng số tiền trả
 ,Transferred Qty,Số lượng chuyển giao
 apps/erpnext/erpnext/config/learn.py +11,Navigating,Duyệt
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +137,Planning,Hoạch định
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +137,Planning,Hoạch định
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +9,Make Time Log Batch,Giờ làm hàng loạt
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Issued,Ban hành
 DocType: Project,Total Billing Amount (via Time Logs),Tổng số tiền Thanh toán (thông qua Time Logs)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +629,We sell this Item,Chúng tôi bán sản phẩm này
+apps/erpnext/erpnext/public/js/setup_wizard.js +365,We sell this Item,Chúng tôi bán sản phẩm này
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +65,Supplier Id,Nhà cung cấp Id
 DocType: Journal Entry,Cash Entry,Cash nhập
 DocType: Sales Partner,Contact Desc,Liên hệ với quyết định
@@ -3092,18 +2966,16 @@
 DocType: Brand,Item Manager,Mã Manager
 DocType: Cost Center,Add rows to set annual budgets on Accounts.,Thêm hàng để thiết lập ngân sách hàng năm trên tài khoản.
 DocType: Buying Settings,Default Supplier Type,Loại mặc định Nhà cung cấp
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +160,Quarrying,Khai thác đá
 DocType: Production Order,Total Operating Cost,Tổng chi phí hoạt động kinh doanh
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +160,Note: Item {0} entered multiple times,Lưu ý: Item {0} nhập nhiều lần
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +163,Note: Item {0} entered multiple times,Lưu ý: Item {0} nhập nhiều lần
 apps/erpnext/erpnext/config/crm.py +27,All Contacts.,Tất cả các hệ.
 DocType: Newsletter,Test Email Id,Kiểm tra Email Id
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +394,Company Abbreviation,Công ty viết tắt
+apps/erpnext/erpnext/public/js/setup_wizard.js +142,Company Abbreviation,Công ty viết tắt
 DocType: Features Setup,If you follow Quality Inspection. Enables Item QA Required and QA No in Purchase Receipt,Nếu bạn làm theo kiểm tra chất lượng. Cho phép hàng bảo đảm chất lượng yêu cầu và bảo đảm chất lượng Không có trong mua hóa đơn
 DocType: GL Entry,Party Type,Loại bên
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +68,Raw material cannot be same as main Item,Nguyên liệu không thể giống nhau như mục chính
 DocType: Item Attribute Value,Abbreviation,Tên viết tắt
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,Không authroized từ {0} vượt quá giới hạn
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +30,Rotational molding,Khuôn đúc
 apps/erpnext/erpnext/config/hr.py +115,Salary template master.,Lương mẫu chủ.
 DocType: Leave Type,Max Days Leave Allowed,Để lại tối đa ngày phép
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +55,Set Tax Rule for shopping cart,Đặt Rule thuế cho giỏ hàng
@@ -3117,15 +2989,15 @@
 apps/erpnext/erpnext/config/selling.py +18,Quotes to Leads or Customers.,Giá để chào hoặc khách hàng.
 DocType: Stock Settings,Role Allowed to edit frozen stock,Vai trò được phép chỉnh sửa cổ đông lạnh
 ,Territory Target Variance Item Group-Wise,Lãnh thổ mục tiêu phương sai mục Nhóm-Wise
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +101,All Customer Groups,Tất cả các nhóm khách hàng
-apps/erpnext/erpnext/controllers/accounts_controller.py +474,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} là bắt buộc. Có thể đổi tiền kỷ lục không được tạo ra cho {1} đến {2}.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +101,All Customer Groups,Tất cả các nhóm khách hàng
+apps/erpnext/erpnext/controllers/accounts_controller.py +475,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} là bắt buộc. Có thể đổi tiền kỷ lục không được tạo ra cho {1} đến {2}.
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +37,Tax Template is mandatory.,Template thuế là bắt buộc.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +41,Account {0}: Parent account {1} does not exist,Tài khoản {0}: Cha mẹ tài khoản {1} không tồn tại
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Danh sách giá Tỷ lệ (Công ty tiền tệ)
 DocType: Account,Temporary,Tạm thời
 DocType: Address,Preferred Billing Address,Địa chỉ ưa thích Thanh toán
 DocType: Monthly Distribution Percentage,Percentage Allocation,Tỷ lệ phần trăm phân bổ
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +86,Secretary,Thư ký
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Secretary,Thư ký
 DocType: Serial No,Distinct unit of an Item,Đơn vị riêng biệt của một khoản
 DocType: Pricing Rule,Buying,Mua
 DocType: HR Settings,Employee Records to be created by,Nhân viên ghi được tạo ra bởi
@@ -3138,9 +3010,8 @@
 ,Item-wise Price List Rate,Item-khôn ngoan Giá liệt kê Tỷ giá
 DocType: Purchase Order Item,Supplier Quotation,Nhà cung cấp báo giá
 DocType: Quotation,In Words will be visible once you save the Quotation.,Trong từ sẽ được hiển thị khi bạn lưu các báo giá.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +68,Ironing,Bàn
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is stopped,{0} {1} là dừng lại
-apps/erpnext/erpnext/stock/doctype/item/item.py +352,Barcode {0} already used in Item {1},Mã vạch {0} đã được sử dụng trong mục {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +356,Barcode {0} already used in Item {1},Mã vạch {0} đã được sử dụng trong mục {1}
 DocType: Lead,Add to calendar on this date,Thêm vào lịch trong ngày này
 apps/erpnext/erpnext/config/selling.py +132,Rules for adding shipping costs.,Quy tắc để thêm chi phí vận chuyển.
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,sự kiện sắp tới
@@ -3149,13 +3020,12 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +27,Quick Entry,Quick Entry
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0} là bắt buộc đối với Return
 DocType: Purchase Order,To Receive,Nhận
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +33,Shrink fitting,Shrink lắp
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +522,user@example.com,user@example.com
+apps/erpnext/erpnext/public/js/setup_wizard.js +266,user@example.com,user@example.com
 DocType: Email Digest,Income / Expense,Thu nhập / chi phí
 DocType: Employee,Personal Email,Email cá nhân
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +58,Total Variance,Tổng số Variance
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +62,Total Variance,Tổng số Variance
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.","Nếu được kích hoạt, hệ thống sẽ gửi ghi sổ kế toán hàng tồn kho tự động."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +15,Brokerage,Môi giới
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +15,Brokerage,Môi giới
 DocType: Address,Postal Code,Mã bưu chính
 DocType: Production Order Operation,"in Minutes
 Updated via 'Time Log'","trong Minutes 
@@ -3163,14 +3033,13 @@
 DocType: Customer,From Lead,Từ chì
 apps/erpnext/erpnext/config/manufacturing.py +19,Orders released for production.,Đơn đặt hàng phát hành để sản xuất.
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +42,Select Fiscal Year...,Chọn năm tài chính ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +442,POS Profile required to make POS Entry,POS hồ sơ cần thiết để làm cho POS nhập
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +444,POS Profile required to make POS Entry,POS hồ sơ cần thiết để làm cho POS nhập
 DocType: Hub Settings,Name Token,Tên Mã
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +106,Planing,Kế hoạch
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Selling,Tiêu chuẩn bán hàng
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +120,Standard Selling,Tiêu chuẩn bán hàng
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +137,Atleast one warehouse is mandatory,Ít nhất một kho là bắt buộc
 DocType: Serial No,Out of Warranty,Ra khỏi bảo hành
 DocType: BOM Replace Tool,Replace,Thay thế
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +314,{0} against Sales Invoice {1},{0} với Sales Invoice {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +316,{0} against Sales Invoice {1},{0} với Sales Invoice {1}
 apps/erpnext/erpnext/stock/doctype/item/item.py +49,Please enter default Unit of Measure,Vui lòng nhập mặc định Đơn vị đo
 DocType: Purchase Invoice Item,Project Name,Tên dự án
 DocType: Supplier,Mention if non-standard receivable account,Đề cập đến nếu tài khoản phải thu phi tiêu chuẩn
@@ -3186,9 +3055,8 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,Journal Entry {0} does not have account {1} or already matched against other voucher,Tạp chí nhập {0} không có tài khoản {1} hoặc đã đối chiếu với các chứng từ khác
 DocType: Item,Moving Average,Di chuyển trung bình
 DocType: BOM Replace Tool,The BOM which will be replaced,Hội đồng quản trị sẽ được thay thế
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +43,New Stock UOM must be different from current stock UOM,Mới Cổ UOM phải khác UOM cổ phiếu hiện tại
 DocType: Account,Debit,Thẻ ghi nợ
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +34,Leaves must be allocated in multiples of 0.5,"Lá phải được phân bổ trong bội số của 0,5"
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +44,Leaves must be allocated in multiples of 0.5,"Lá phải được phân bổ trong bội số của 0,5"
 DocType: Production Order,Operation Cost,Chi phí hoạt động
 apps/erpnext/erpnext/config/hr.py +71,Upload attendance from a .csv file,Tải lên tham gia từ một tập tin csv.
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,Nổi bật Amt
@@ -3206,8 +3074,7 @@
 DocType: Employee,Internal Work History,Quá trình công tác nội bộ
 DocType: DocField,Column Break,Cột lao
 DocType: Event,Thursday,Thứ năm
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +42,Private Equity,Vốn chủ sở hữu tư nhân
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +93,Turning,Quay
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,Vốn chủ sở hữu tư nhân
 DocType: Maintenance Visit,Customer Feedback,Ý kiến khách hàng
 DocType: Account,Expense,chi tiêu
 DocType: Sales Invoice,Exhibition,Triển lam
@@ -3220,19 +3087,19 @@
 DocType: Employee,Held On,Tổ chức Ngày
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +33,Production Item,Sản xuất hàng
 ,Employee Information,Thông tin nhân viên
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,Rate (%),Tỷ lệ (%)
+apps/erpnext/erpnext/public/js/setup_wizard.js +294,Rate (%),Tỷ lệ (%)
 DocType: Stock Entry Detail,Additional Cost,Chi phí bổ sung
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +407,Financial Year End Date,Năm tài chính kết thúc ngày
+apps/erpnext/erpnext/public/js/setup_wizard.js +155,Financial Year End Date,Năm tài chính kết thúc ngày
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Voucher No, if grouped by Voucher","Không thể lọc dựa trên Voucher Không, nếu nhóm theo Phiếu"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +484,Make Supplier Quotation,Nhà cung cấp báo giá thực hiện
 DocType: Quality Inspection,Incoming,Đến
 DocType: BOM,Materials Required (Exploded),Vật liệu bắt buộc (phát nổ)
 DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),Giảm Thu cho nghỉ việc không phải trả tiền (LWP)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +512,"Add users to your organization, other than yourself","Thêm người dùng để tổ chức của bạn, trừ chính mình"
+apps/erpnext/erpnext/public/js/setup_wizard.js +256,"Add users to your organization, other than yourself","Thêm người dùng để tổ chức của bạn, trừ chính mình"
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No {1} does not match with {2} {3},Row # {0}: Serial No {1} không phù hợp với {2} {3}
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +44,Casual Leave,Để lại bình thường
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +44,Casual Leave,Để lại bình thường
 DocType: Batch,Batch ID,ID hàng loạt
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +334,Note: {0},Lưu ý: {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +336,Note: {0},Lưu ý: {0}
 ,Delivery Note Trends,Giao hàng Ghi Xu hướng
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +104,This Week's Summary,Tóm tắt tuần này
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +74,{0} must be a Purchased or Sub-Contracted Item in row {1},{0} phải là một mục Mua hoặc Chi ký hợp đồng trong hàng {1}
@@ -3244,7 +3111,7 @@
 DocType: Purchase Receipt,Return Against Purchase Receipt,Return Against Mua Receipt
 DocType: Purchase Order,To Bill,Để Bill
 DocType: Material Request,% Ordered,% Có thứ tự
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +61,Piecework,Việc làm ăn khoán
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Piecework,Việc làm ăn khoán
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +64,Avg. Buying Rate,Avg. Tỷ giá mua
 DocType: Task,Actual Time (in Hours),Thời gian thực tế (trong giờ)
 DocType: Employee,History In Company,Trong lịch sử Công ty
@@ -3261,13 +3128,13 @@
 DocType: Opportunity,To Discuss,Để thảo luận
 DocType: SMS Settings,SMS Settings,Thiết lập tin nhắn SMS
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +60,Temporary Accounts,Tài khoản tạm thời
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +155,Black,Đen
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Black,Đen
 DocType: BOM Explosion Item,BOM Explosion Item,BOM nổ hàng
 DocType: Account,Auditor,Người kiểm tra
 DocType: Purchase Order,End date of current order's period,Ngày kết thúc của thời kỳ hiện tại của trật tự
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +17,Make Offer Letter,Hãy Letter Offer
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +10,Return,Trở về
-apps/erpnext/erpnext/stock/doctype/item/item.py +503,Default Unit of Measure for Variant must be same as Template,Mặc định Đơn vị đo lường cho Variant phải được giống như Template
+apps/erpnext/erpnext/stock/doctype/item/item.py +507,Default Unit of Measure for Variant must be same as Template,Mặc định Đơn vị đo lường cho Variant phải được giống như Template
 DocType: DocField,Fold,Gập lại
 DocType: Production Order Operation,Production Order Operation,Sản xuất tự Operation
 DocType: Pricing Rule,Disable,Vô hiệu hóa
@@ -3278,13 +3145,12 @@
 DocType: Page,Page Name,Tên trang
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +110,To Time must be greater than From Time,Giờ phải lớn hơn From Time
 DocType: Journal Entry Account,Exchange Rate,Tỷ giá
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +465,Sales Order {0} is not submitted,Bán hàng đặt hàng {0} không nộp
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +467,Sales Order {0} is not submitted,Bán hàng đặt hàng {0} không nộp
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0}: Parent account {1} does not bolong to the company {2},Kho {0}: Cha mẹ tài khoản {1} không Bolong cho công ty {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +124,Spindle finishing,Hoàn thiện Spindle
 DocType: BOM,Last Purchase Rate,Cuối cùng Rate
 DocType: Account,Asset,Tài sản
 DocType: Project Task,Task ID,Nhiệm vụ ID
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +395,"e.g. ""MC""","ví dụ như ""MC """
+apps/erpnext/erpnext/public/js/setup_wizard.js +143,"e.g. ""MC""","ví dụ như ""MC """
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,Stock cannot exist for Item {0} since has variants,Cổ không thể tồn tại cho mục {0} vì có các biến thể
 ,Sales Person-wise Transaction Summary,Người khôn ngoan bán hàng Tóm tắt thông tin giao dịch
 DocType: System Settings,Time Zone,Múi giờ
@@ -3293,9 +3159,7 @@
 DocType: Monthly Distribution,Monthly Distribution Percentages,Tỷ lệ phân phối hàng tháng
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +16,The selected item cannot have Batch,Các sản phẩm được chọn không thể có hàng loạt
 DocType: Delivery Note,% of materials delivered against this Delivery Note,% Nguyên liệu chuyển giao chống lại Giao hàng tận nơi này Lưu ý
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +151,Stapling,Máy đóng ghim
 DocType: Customer,Customer Details,Chi tiết khách hàng
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +105,Shaping,Shaping
 DocType: Employee,Reports to,Báo cáo
 DocType: SMS Settings,Enter url parameter for receiver nos,Nhập tham số url cho người nhận nos
 DocType: Sales Invoice,Paid Amount,Số tiền thanh toán
@@ -3304,13 +3168,13 @@
 DocType: Item Variant,Item Variant,Mục Variant
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +15,Setting this Address Template as default as there is no other default,Địa chỉ thiết lập mẫu này như mặc định là không có mặc định khác
 apps/erpnext/erpnext/accounts/doctype/account/account.py +89,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Số dư tài khoản đã được ghi nợ, bạn không được phép để thiết lập 'cân Must Be' là 'tín dụng'"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +76,Quality Management,Quản lý chất lượng
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Quality Management,Quản lý chất lượng
 DocType: Production Planning Tool,Filter based on customer,Bộ lọc dựa trên khách hàng
 DocType: Payment Tool Detail,Against Voucher No,Chống Voucher Không
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +47,Please enter quantity for Item {0},Vui lòng nhập số lượng cho hàng {0}
 DocType: Employee External Work History,Employee External Work History,Nhân viên làm việc ngoài Lịch sử
 DocType: Tax Rule,Purchase,Mua
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +34,Balance Qty,Số lượng cân bằng
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Balance Qty,Số lượng cân bằng
 DocType: Item Group,Parent Item Group,Cha mẹ mục Nhóm
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +21,{0} for {1},{0} cho {1}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +96,Cost Centers,Trung tâm chi phí
@@ -3320,12 +3184,12 @@
 DocType: Opportunity,Next Contact,Tiếp theo Liên lạc
 DocType: Employee,Employment Type,Loại việc làm
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,Tài sản cố định
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +84,Application period cannot be across two alocation records,Kỳ ứng dụng không thể được qua hai hồ sơ alocation
 DocType: Item Group,Default Expense Account,Tài khoản mặc định chi phí
 DocType: Employee,Notice (days),Thông báo (ngày)
 DocType: Page,Yes,Đồng ý
 DocType: Tax Rule,Sales Tax Template,Template Thuế bán hàng
 DocType: Employee,Encashment Date,Séc ngày
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +74,Electroforming,Electroforming
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +179,"Against Voucher Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Chống Voucher Loại phải là một trong lý Mua hàng, mua hóa đơn hoặc Journal nhập"
 DocType: Account,Stock Adjustment,Điều chỉnh chứng khoán
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +34,Default Activity Cost exists for Activity Type - {0},Mặc định Hoạt động Chi phí tồn tại cho Type Hoạt động - {0}
@@ -3361,12 +3225,12 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,Kho không thể bị xóa sổ cái như nhập chứng khoán tồn tại cho kho này.
 DocType: Company,Distribution,Gửi đến:
 apps/erpnext/erpnext/public/js/pos/pos.html +36,Amount Paid,Số tiền trả
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +91,Project Manager,Giám đốc dự án
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +72,Dispatch,Công văn
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Project Manager,Giám đốc dự án
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +72,Dispatch,Công văn
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,Tối đa cho phép giảm giá cho mặt hàng: {0} {1}%
 DocType: Customer,Default Taxes and Charges,Thuế mặc định và lệ phí
 DocType: Account,Receivable,Thu
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +268,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,Row # {0}: Không được phép thay đổi Supplier Mua hàng đã tồn tại
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +263,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,Row # {0}: Không được phép thay đổi Supplier Mua hàng đã tồn tại
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,Vai trò được phép trình giao dịch vượt quá hạn mức tín dụng được thiết lập.
 DocType: Sales Invoice,Supplier Reference,Nhà cung cấp tham khảo
 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.","Nếu được chọn, Hội đồng quản trị cho các hạng mục phụ lắp ráp sẽ được xem xét để có được nguyên liệu. Nếu không, tất cả các mục phụ lắp ráp sẽ được coi như một nguyên liệu thô."
@@ -3374,8 +3238,8 @@
 DocType: Hub Settings,Seller Description,Người bán Mô tả
 DocType: Employee Education,Qualification,Trình độ chuyên môn
 DocType: Item Price,Item Price,Giá mục
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +48,Soap & Detergent,Xà phòng và chất tẩy rửa
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +36,Motion Picture & Video,Điện ảnh & Video
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +48,Soap & Detergent,Xà phòng và chất tẩy rửa
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +36,Motion Picture & Video,Điện ảnh & Video
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Ra lệnh
 DocType: Warehouse,Warehouse Name,Tên kho
 DocType: Naming Series,Select Transaction,Chọn giao dịch
@@ -3384,7 +3248,6 @@
 DocType: BOM,Rate Of Materials Based On,Tỷ lệ Of Vật liệu Dựa trên
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,Hỗ trợ Analtyics
 apps/erpnext/erpnext/accounts/doctype/accounts_settings/accounts_settings.py +27,Company is missing in warehouses {0},Công ty là mất tích trong kho {0}
-DocType: Stock UOM Replace Utility,Stock UOM Replace Utility,Chứng khoán UOM Thay Tiện ích
 DocType: POS Profile,Terms and Conditions,Điều khoản/Điều kiện thi hành
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,To Date should be within the Fiscal Year. Assuming To Date = {0},Đến ngày phải được trong năm tài chính. Giả sử Đến ngày = {0}
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","Ở đây bạn có thể duy trì chiều cao, cân nặng, dị ứng, mối quan tâm y tế vv"
@@ -3396,7 +3259,7 @@
 DocType: Sales Order Item,For Production,Cho sản xuất
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +103,Please enter sales order in the above table,Vui lòng nhập đơn đặt hàng trong bảng trên
 DocType: Project Task,View Task,Xem Nhiệm vụ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +406,Your financial year begins on,Năm tài chính của bạn bắt đầu từ ngày
+apps/erpnext/erpnext/public/js/setup_wizard.js +154,Your financial year begins on,Năm tài chính của bạn bắt đầu từ ngày
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +46,Please enter Purchase Receipts,Vui lòng nhập Mua Tiền thu
 DocType: Sales Invoice,Get Advances Received,Được nhận trước
 DocType: Email Digest,Add/Remove Recipients,Add / Remove người nhận
@@ -3404,16 +3267,14 @@
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","Thiết lập năm tài chính này như mặc định, nhấp vào 'Set as Default'"
 apps/erpnext/erpnext/config/support.py +54,Setup incoming server for support email id. (e.g. support@example.com),Thiết lập máy chủ cho đến hỗ trợ email id. (Ví dụ như support@example.com)
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,Thiếu Qty
-apps/erpnext/erpnext/stock/doctype/item/item.py +528,Item variant {0} exists with same attributes,Mục biến {0} tồn tại với cùng một thuộc tính
+apps/erpnext/erpnext/stock/doctype/item/item.py +532,Item variant {0} exists with same attributes,Mục biến {0} tồn tại với cùng một thuộc tính
 DocType: Salary Slip,Salary Slip,Lương trượt
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +116,Burnishing,Đánh bóng
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +54,'To Date' is required,"""Đến ngày"" là cần thiết"
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,"""Đến ngày"" là cần thiết"
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","Tạo phiếu đóng gói các gói sẽ được chuyển giao. Được sử dụng để thông báo cho số gói phần mềm, nội dung gói và trọng lượng của nó."
 DocType: Sales Invoice Item,Sales Order Item,Bán hàng đặt hàng
 DocType: Salary Slip,Payment Days,Ngày thanh toán
 DocType: BOM,Manage cost of operations,Quản lý chi phí hoạt động
 DocType: Features Setup,Item Advanced,Mục chi tiết
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +40,Hot rolling,Cán nóng
 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.","Khi bất cứ giao dịch kiểm tra được ""Gửi"", một email pop-up tự động mở để gửi một email đến các liên kết ""Liên hệ"" trong giao dịch, với các giao dịch như là một tập tin đính kèm. Người sử dụng có thể hoặc không có thể gửi email."
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,Cài đặt toàn cầu
 DocType: Employee Education,Employee Education,Giáo dục nhân viên
@@ -3426,25 +3287,23 @@
 DocType: Customer,Sales Team Details,Thông tin chi tiết Nhóm bán hàng
 DocType: Expense Claim,Total Claimed Amount,Tổng số tiền tuyên bố chủ quyền
 apps/erpnext/erpnext/config/crm.py +22,Potential opportunities for selling.,Cơ hội tiềm năng để bán.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +48,Sick Leave,Để lại bệnh
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +174,Invalid {0},Không hợp lệ {0}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +48,Sick Leave,Để lại bệnh
 DocType: Email Digest,Email Digest,Email thông báo
 DocType: Delivery Note,Billing Address Name,Địa chỉ thanh toán Tên
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +22,Department Stores,Cửa hàng bách
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,Cửa hàng bách
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +40,System Balance,Hệ thống cân bằng
 DocType: Workflow,Is Active,Là hoạt động
 apps/erpnext/erpnext/controllers/stock_controller.py +71,No accounting entries for the following warehouses,Không ghi sổ kế toán cho các kho sau
 apps/erpnext/erpnext/projects/doctype/project/project.js +22,Save the document first.,Lưu tài liệu đầu tiên.
 DocType: Account,Chargeable,Buộc tội
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +121,Linishing,Linishing
 DocType: Company,Change Abbreviation,Thay đổi Tên viết tắt
 DocType: Workflow State,Primary,Vũ khí chinh
 DocType: Expense Claim Detail,Expense Date,Chi phí ngày
 DocType: Item,Max Discount (%),Giảm giá tối đa (%)
 DocType: Communication,More Information,Thêm thông tin
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +70,Last Order Amount,Số tiền Last Order
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +161,Blasting,Nổ mìn
 DocType: Company,Warn,Cảnh báo
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +111,Item valuation updated,Mục định giá được cập nhật
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Bất kỳ nhận xét khác, nỗ lực đáng chú ý mà nên đi vào biên bản."
 DocType: BOM,Manufacturing User,Sản xuất tài
 DocType: Purchase Order,Raw Materials Supplied,Nguyên liệu thô Cung cấp
@@ -3454,7 +3313,7 @@
 DocType: Appraisal,Appraisal Template,Thẩm định mẫu
 DocType: Communication,Email,Email
 DocType: Item Group,Item Classification,Phân mục
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +89,Business Development Manager,Giám đốc phát triển kinh doanh
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Business Development Manager,Giám đốc phát triển kinh doanh
 DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,Bảo trì đăng nhập Mục đích
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.js +15,Period,Thời gian
 ,General Ledger,Sổ cái chung
@@ -3464,9 +3323,7 @@
 ,Itemwise Recommended Reorder Level,Itemwise Đê Sắp xếp lại Cấp
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +264,Please select {0} first,Vui lòng chọn {0} đầu tiên
 DocType: Features Setup,To get Item Group in details table,Để có được mục Nhóm trong bảng chi tiết
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +67,Redrawing,Vẽ lại
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +112,Batch {0} of Item {1} has expired.,{0} lô hàng {1} đã hết hạn.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +120,Etching,Etching
 DocType: Sales Invoice,Commission,Huê hồng
 DocType: Address Template,"<h4>Default Template</h4>
 <p>Uses <a href=""http://jinja.pocoo.org/docs/templates/"">Jinja Templating</a> and all the fields of Address (including Custom Fields if any) will be available</p>
@@ -3511,7 +3368,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +340,Operation Time must be greater than 0 for Operation {0},Thời gian hoạt động phải lớn hơn 0 cho hoạt động {0}
 DocType: Supplier,Address and Contacts,Địa chỉ và liên hệ
 DocType: UOM Conversion Detail,UOM Conversion Detail,Xem chi tiết UOM Chuyển đổi
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +496,Keep it web friendly 900px (w) by 100px (h),Giữ cho nó thân thiện với web 900px (w) bởi 100px (h)
+apps/erpnext/erpnext/public/js/setup_wizard.js +242,Keep it web friendly 900px (w) by 100px (h),Giữ cho nó thân thiện với web 900px (w) bởi 100px (h)
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +329,Production Order cannot be raised against a Item Template,Đặt hàng sản xuất không thể được đưa ra chống lại một khoản Template
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +44,Charges are updated in Purchase Receipt against each item,Cước phí được cập nhật tại Purchase Receipt với mỗi mục
 DocType: Payment Tool,Get Outstanding Vouchers,Nhận chứng từ xuất sắc
@@ -3527,54 +3384,49 @@
 DocType: Item,Average time taken by the supplier to deliver,Thời gian trung bình thực hiện bởi các nhà cung cấp để cung cấp
 DocType: Time Log,Hours,Giờ
 DocType: Project,Expected Start Date,Dự kiến sẽ bắt đầu ngày
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +38,Rolling,Lăn
 DocType: ToDo,Priority,Ưu tiên
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +41,Remove item if charges is not applicable to that item,Xóa item này nếu chi phí là không áp dụng đối với mặt hàng đó
 DocType: Dropbox Backup,Dropbox Access Allowed,Dropbox truy cập được phép
 DocType: Dropbox Backup,Weekly,Hàng tuần
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,Ví dụ. smsgateway.com / api / send_sms.cgi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +485,Receive,Nhận
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +510,Receive,Nhận
 DocType: Maintenance Visit,Fully Completed,Hoàn thành đầy đủ
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% Complete
 DocType: Employee,Educational Qualification,Trình độ chuyên môn giáo dục
 DocType: Workstation,Operating Costs,Chi phí điều hành
 DocType: Employee Leave Approver,Employee Leave Approver,Nhân viên Để lại phê duyệt
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,{0} has been successfully added to our Newsletter list.,{0} đã được thêm thành công vào danh sách tin của chúng tôi.
-apps/erpnext/erpnext/stock/doctype/item/item.py +383,Row {0}: An Reorder entry already exists for this warehouse {1},Row {0}: Một mục Sắp xếp lại đã tồn tại cho nhà kho này {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +387,Row {0}: An Reorder entry already exists for this warehouse {1},Row {0}: Một mục Sắp xếp lại đã tồn tại cho nhà kho này {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +67,"Cannot declare as lost, because Quotation has been made.","Không thể khai báo như bị mất, bởi vì báo giá đã được thực hiện."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +133,Electron beam machining,Gia công tia điện tử
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Thạc sĩ Quản lý mua hàng
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +424,Production Order {0} must be submitted,Đặt hàng sản xuất {0} phải được gửi
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +150,Please select Start Date and End Date for Item {0},Vui lòng chọn ngày bắt đầu và ngày kết thúc cho hàng {0}
 apps/erpnext/erpnext/config/stock.py +141,Main Reports,Báo cáo chính
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +102,Stock Ledger entries balances updated,Chứng khoán Ledger các mục dư cập nhật
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,Cho đến nay không có thể trước khi từ ngày
 DocType: Purchase Receipt Item,Prevdoc DocType,Prevdoc DocType
-apps/erpnext/erpnext/stock/doctype/item/item.js +176,Add / Edit Prices,Thêm / Sửa giá
+apps/erpnext/erpnext/stock/doctype/item/item.js +178,Add / Edit Prices,Thêm / Sửa giá
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +53,Chart of Cost Centers,Biểu đồ của Trung tâm Chi phí
 ,Requested Items To Be Ordered,Mục yêu cầu để trở thứ tự
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +298,My Orders,Đơn hàng của tôi
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +293,My Orders,Đơn hàng của tôi
 DocType: Price List,Price List Name,Danh sách giá Tên
 DocType: Time Log,For Manufacturing,Đối với sản xuất
-apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +70,Totals,{0}{/0}{1}{/1} {2}{/2}Tổng giá trị
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +174,Totals,{0}{/0}{1}{/1} {2}{/2}Tổng giá trị
 DocType: BOM,Manufacturing,Sản xuất
 ,Ordered Items To Be Delivered,Ra lệnh tiêu được giao
 DocType: Account,Income,Thu nhập
 ,Setup Wizard,Trình cài đặt
 DocType: Industry Type,Industry Type,Loại công nghiệp
 apps/erpnext/erpnext/templates/includes/cart.js +137,Something went wrong!,Một cái gì đó đã đi sai!
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +68,Warning: Leave application contains following block dates,Cảnh báo: Để lại ứng dụng có chứa khối ngày sau
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +251,Sales Invoice {0} has already been submitted,Hóa đơn bán hàng {0} đã được gửi
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +100,Warning: Leave application contains following block dates,Cảnh báo: Để lại ứng dụng có chứa khối ngày sau
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +256,Sales Invoice {0} has already been submitted,Hóa đơn bán hàng {0} đã được gửi
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,Ngày kết thúc
 DocType: Purchase Invoice Item,Amount (Company Currency),Số tiền (Công ty tiền tệ)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +10,Die casting,Đúc Die
 DocType: Email Alert,Reference Date,Tài liệu tham khảo ngày
 apps/erpnext/erpnext/config/hr.py +105,Organization unit (department) master.,Đơn vị tổ chức (bộ phận) làm chủ.
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +25,Please enter valid mobile nos,Vui lòng nhập nos điện thoại di động hợp lệ
 DocType: Budget Detail,Budget Detail,Ngân sách chi tiết
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +75,Please enter message before sending,Vui lòng nhập tin nhắn trước khi gửi
 DocType: Async Task,Status,Trạng thái
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +65,Stock UOM updated for Item {0},Cổ Ươm cập nhật cho khoản {0}
 DocType: Company History,Year,Năm
 apps/erpnext/erpnext/config/accounts.py +127,Point-of-Sale Profile,Point-of-Sale hồ sơ
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +68,Please Update SMS Settings,Xin vui lòng cập nhật cài đặt tin nhắn SMS
@@ -3588,12 +3440,12 @@
 ,Serial No Service Contract Expiry,Không nối tiếp Hợp đồng dịch vụ hết hạn
 DocType: Item,Unit of Measure Conversion,Đơn vị chuyển đổi đo lường
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +86,Employee can not be changed,Nhân viên không thể thay đổi
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +259,You cannot credit and debit same account at the same time,Bạn không thể tín dụng và ghi nợ cùng một tài khoản cùng một lúc
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,You cannot credit and debit same account at the same time,Bạn không thể tín dụng và ghi nợ cùng một tài khoản cùng một lúc
 DocType: Naming Series,Help HTML,Giúp đỡ HTML
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},Tổng số weightage giao nên được 100%. Nó là {0}
 apps/erpnext/erpnext/controllers/status_updater.py +140,Allowance for over-{0} crossed for Item {1},Trợ cấp cho quá {0} vượt qua cho mục {1}
 DocType: Address,Name of person or organization that this address belongs to.,Tên của người hoặc tổ chức địa chỉ này thuộc về.
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +587,Your Suppliers,Các nhà cung cấp của bạn
+apps/erpnext/erpnext/public/js/setup_wizard.js +325,Your Suppliers,Các nhà cung cấp của bạn
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,Không thể thiết lập như Lost như bán hàng đặt hàng được thực hiện.
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +65,Another Salary Structure {0} is active for employee {1}. Please make its status 'Inactive' to proceed.,Một cấu trúc lương {0} là hoạt động cho nhân viên {1}. Hãy làm cho tình trạng của nó 'hoạt động' để tiến hành.
 DocType: Purchase Invoice,Contact,Liên hệ
@@ -3602,37 +3454,35 @@
 DocType: Item,Has Serial No,Có Serial No
 DocType: Employee,Date of Issue,Ngày phát hành
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +16,{0}: From {0} for {1},{0}: Từ {0} cho {1}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +154,Row #{0}: Set Supplier for item {1},Row # {0}: Thiết lập Nhà cung cấp cho mặt hàng {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +149,Row #{0}: Set Supplier for item {1},Row # {0}: Thiết lập Nhà cung cấp cho mặt hàng {1}
 DocType: Issue,Content Type,Loại nội dung
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +17,Computer,Máy tính
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,Máy tính
 DocType: Item,List this Item in multiple groups on the website.,Danh sách sản phẩm này trong nhiều nhóm trên trang web.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +283,Please check Multi Currency option to allow accounts with other currency,Vui lòng kiểm tra chọn ngoại tệ nhiều để cho phép các tài khoản với loại tiền tệ khác
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +285,Please check Multi Currency option to allow accounts with other currency,Vui lòng kiểm tra chọn ngoại tệ nhiều để cho phép các tài khoản với loại tiền tệ khác
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +62,Item: {0} does not exist in the system,Item: {0} không tồn tại trong hệ thống
 apps/erpnext/erpnext/accounts/doctype/account/account.py +81,You are not authorized to set Frozen value,Bạn không được phép để thiết lập giá trị đông lạnh
 DocType: Payment Reconciliation,Get Unreconciled Entries,Nhận Unreconciled Entries
 DocType: Cost Center,Budgets,Ngân sách
 apps/frappe/frappe/core/page/modules_setup/modules_setup.py +11,Updated,Xin vui lòng viết một cái gì đó
 DocType: Employee,Emergency Contact Details,Chi tiết liên lạc khẩn cấp
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +396,What does it do?,Nó làm gì?
+apps/erpnext/erpnext/public/js/setup_wizard.js +144,What does it do?,Nó làm gì?
 DocType: Delivery Note,To Warehouse,Để kho
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +45,Account {0} has been entered more than once for fiscal year {1},Tài khoản {0} đã được nhập vào nhiều hơn một lần cho năm tài chính {1}
 ,Average Commission Rate,Ủy ban trung bình Tỷ giá
-apps/erpnext/erpnext/stock/doctype/item/item.py +313,'Has Serial No' can not be 'Yes' for non-stock item,'Có Serial No' không thể 'Có' cho mục chứng khoán không
+apps/erpnext/erpnext/stock/doctype/item/item.py +317,'Has Serial No' can not be 'Yes' for non-stock item,'Có Serial No' không thể 'Có' cho mục chứng khoán không
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Attendance can not be marked for future dates,Tham dự không thể được đánh dấu cho những ngày tương lai
 DocType: Pricing Rule,Pricing Rule Help,Quy tắc định giá giúp
 DocType: Purchase Taxes and Charges,Account Head,Trưởng tài khoản
 apps/erpnext/erpnext/config/stock.py +79,Update additional costs to calculate landed cost of items,Cập nhật chi phí bổ sung để tính toán chi phí hạ cánh của các mặt hàng
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +111,Electrical,Hệ thống điện
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +111,Electrical,Hệ thống điện
 DocType: Stock Entry,Total Value Difference (Out - In),Tổng giá trị khác biệt (Out - In)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +302,Row {0}: Exchange Rate is mandatory,Row {0}: Exchange Rate là bắt buộc
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +304,Row {0}: Exchange Rate is mandatory,Row {0}: Exchange Rate là bắt buộc
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},ID người dùng không thiết lập cho nhân viên {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +72,Peening,Peening
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,From Warranty Claim,Từ Bảo hành yêu cầu bồi thường
 DocType: Stock Entry,Default Source Warehouse,Mặc định Nguồn Kho
 DocType: Item,Customer Code,Mã số khách hàng
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +212,Birthday Reminder for {0},Birthday Reminder cho {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +163,Lapping,Lapping
-apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.js +8,Days Since Last Order,Kể từ ngày thứ tự cuối
+apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +72,Days Since Last Order,Kể từ ngày thứ tự cuối
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +299,Debit To account must be a Balance Sheet account,Nợ Để tài khoản phải có một tài khoản Cân đối kế toán
 DocType: Buying Settings,Naming Series,Đặt tên dòng
 DocType: Leave Block List,Leave Block List Name,Để lại Block List Tên
@@ -3646,7 +3496,7 @@
 DocType: Notification Control,Sales Invoice Message,Hóa đơn bán hàng nhắn
 DocType: Authorization Rule,Based On,Dựa trên
 DocType: Sales Order Item,Ordered Qty,Số lượng đặt hàng
-apps/erpnext/erpnext/stock/doctype/item/item.py +539,Item {0} is disabled,Mục {0} bị vô hiệu hóa
+apps/erpnext/erpnext/stock/doctype/item/item.py +543,Item {0} is disabled,Mục {0} bị vô hiệu hóa
 DocType: Stock Settings,Stock Frozen Upto,"Cổ đông lạnh HCM,"
 apps/erpnext/erpnext/controllers/recurring_document.py +166,Period From and Period To dates mandatory for recurring {0},Từ giai đoạn và thời gian Để ngày bắt buộc cho kỳ {0}
 apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,Hoạt động dự án / nhiệm vụ.
@@ -3656,7 +3506,6 @@
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,Giảm giá phải được ít hơn 100
 DocType: ToDo,Low,Thấp
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Viết Tắt Số tiền (Công ty tiền tệ)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +71,Spinning,Spinning
 DocType: Landed Cost Voucher,Landed Cost Voucher,Voucher Chi phí hạ cánh
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +55,Please set {0},Hãy đặt {0}
 DocType: Purchase Invoice,Repeat on Day of Month,Lặp lại vào ngày của tháng
@@ -3678,7 +3527,6 @@
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +37,Campaign Name is required,Tên chiến dịch là cần thiết
 DocType: Maintenance Visit,Maintenance Date,Bảo trì ngày
 DocType: Purchase Receipt Item,Rejected Serial No,Từ chối Serial No
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +51,Deep drawing,Sâu vẽ
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +40,New Newsletter,Bản tin mới
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +157,Start date should be less than end date for Item {0},Ngày bắt đầu phải nhỏ hơn ngày kết thúc cho hàng {0}
 apps/erpnext/erpnext/stock/doctype/item/item.js +17,Show Balance,Hiện Balance
@@ -3689,7 +3537,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +119,BOM and Manufacturing Quantity are required,BOM và Sản xuất Số lượng được yêu cầu
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Ageing đun 2
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +450,Amount,Giá trị
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +147,Riveting,Tán đinh
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,HĐQT thay thế
 ,Sales Analytics,Bán hàng Analytics
 DocType: Manufacturing Settings,Manufacturing Settings,Cài đặt sản xuất
@@ -3701,20 +3548,19 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +207,New Account Name,Tài khoản mới Tên
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,Chi phí nguyên vật liệu Cung cấp
 DocType: Selling Settings,Settings for Selling Module,Cài đặt cho bán Mô-đun
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +73,Customer Service,Dịch vụ khách hàng
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Customer Service,Dịch vụ khách hàng
 DocType: Item,Thumbnail,Thumbnail
 DocType: Item Customer Detail,Item Customer Detail,Mục chi tiết khách hàng
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +147,Confirm Your Email,Xác nhận Email của bạn
 apps/erpnext/erpnext/config/hr.py +53,Offer candidate a Job.,Offer ứng cử viên một công việc.
 DocType: Notification Control,Prompt for Email on Submission of,Nhắc nhở cho Email trên thông tin của
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +81,Total allocated leaves are more than days in the period,Tổng số lá được giao rất nhiều so với những ngày trong kỳ
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +70,Item {0} must be a stock Item,Mục {0} phải là một cổ phiếu hàng
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,Mặc định Work In Progress Kho
 apps/erpnext/erpnext/config/accounts.py +107,Default settings for accounting transactions.,Thiết lập mặc định cho các giao dịch kế toán.
 apps/frappe/frappe/model/naming.py +40,{0} is required,Cho phép Giỏ hàng
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +21,Vacuum molding,Chân không đúc
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,Dự kiến ngày không thể trước khi vật liệu Yêu cầu ngày
 DocType: Contact Us Settings,City,Thành phố
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +132,Ultrasonic machining,Công bằng siêu âm
 apps/frappe/frappe/templates/base.html +137,Error: Not a valid id?,Lỗi: Không phải là một id hợp lệ?
 apps/erpnext/erpnext/stock/get_item_details.py +125,Item {0} must be a Sales Item,Mục {0} phải là một mục bán hàng
 DocType: Naming Series,Update Series Number,Cập nhật Dòng Số
@@ -3722,7 +3568,7 @@
 DocType: Sales Order,Printing Details,Các chi tiết in ấn
 DocType: Task,Closing Date,Đóng cửa ngày
 DocType: Sales Order Item,Produced Quantity,Số lượng sản xuất
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +84,Engineer,Kỹ sư
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Engineer,Kỹ sư
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,Assemblies Tìm kiếm Sub
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +379,Item Code required at Row No {0},Mã mục bắt buộc khi Row Không có {0}
 DocType: Sales Partner,Partner Type,Loại đối tác
@@ -3730,7 +3576,7 @@
 DocType: Authorization Rule,Customerwise Discount,Customerwise Giảm giá
 DocType: Purchase Invoice,Against Expense Account,Đối với tài khoản chi phí
 DocType: Production Order,Production Order,Đặt hàng sản xuất
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +258,Installation Note {0} has already been submitted,Lưu ý cài đặt {0} đã được gửi
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +263,Installation Note {0} has already been submitted,Lưu ý cài đặt {0} đã được gửi
 DocType: Quotation Item,Against Docname,Chống lại Docname
 DocType: SMS Center,All Employee (Active),Tất cả các nhân viên (Active)
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,Bây giờ xem
@@ -3739,19 +3585,19 @@
 DocType: Item,Re-Order Level,Re-tự cấp
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,Nhập các mặt hàng và qty kế hoạch mà bạn muốn nâng cao các đơn đặt hàng sản xuất hoặc tải nguyên liệu để phân tích.
 apps/frappe/frappe/public/js/frappe/views/ganttview.js +45,Gantt Chart,Biểu đồ Gantt
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +57,Part-time,Bán thời gian
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,Part-time,Bán thời gian
 DocType: Employee,Applicable Holiday List,Áp dụng lễ Danh sách
 DocType: Employee,Cheque,Séc
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,Cập nhật hàng loạt
 apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Report Type is mandatory,Loại Báo cáo là bắt buộc
 DocType: Item,Serial Number Series,Serial Number Dòng
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},Kho là bắt buộc đối với cổ phiếu hàng {0} trong hàng {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +45,Retail & Wholesale,Bán Lẻ & Bán
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,Bán Lẻ & Bán
 DocType: Issue,First Responded On,Đã trả lời đầu tiên On
 DocType: Website Item Group,Cross Listing of Item in multiple groups,Hội Chữ thập Danh bạ nhà hàng ở nhiều nhóm
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +351,The First User: You,Những thành viên đầu tiên: Bạn
+apps/erpnext/erpnext/public/js/setup_wizard.js +101,The First User: You,Những thành viên đầu tiên: Bạn
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +48,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},Năm tài chính Ngày bắt đầu và tài chính cuối năm ngày đã được thiết lập trong năm tài chính {0}
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +172,Successfully Reconciled,Hòa giải thành công
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +119,Successfully Reconciled,Hòa giải thành công
 DocType: Production Order,Planned End Date,Kế hoạch End ngày
 apps/erpnext/erpnext/config/stock.py +43,Where items are stored.,Nơi các mặt hàng được lưu trữ.
 DocType: Tax Rule,Validity,Hiệu lực
@@ -3771,39 +3617,36 @@
 DocType: DocPerm,Level,Mức độ
 DocType: Purchase Taxes and Charges,On Net Total,Trên Net Tổng số
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +160,Target warehouse in row {0} must be same as Production Order,Kho hàng mục tiêu trong {0} phải được giống như sản xuất theo thứ tự
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +59,No permission to use Payment Tool,Không được phép sử dụng công cụ thanh toán
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +97,No permission to use Payment Tool,Không được phép sử dụng công cụ thanh toán
 apps/erpnext/erpnext/controllers/recurring_document.py +192,'Notification Email Addresses' not specified for recurring %s,'Thông báo địa chỉ email không định kỳ cho% s
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +86,Milling,Phay
 apps/erpnext/erpnext/accounts/doctype/account/account.py +99,Currency can not be changed after making entries using some other currency,Tiền tệ không thể thay đổi sau khi thực hiện các mục sử dụng một số loại tiền tệ khác
 DocType: Company,Round Off Account,Vòng Tắt tài khoản
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +60,Nibbling,Tỉa
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,Chi phí hành chính
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +18,Consulting,Tư vấn
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +18,Consulting,Tư vấn
 DocType: Customer Group,Parent Customer Group,Cha mẹ Nhóm khách hàng
 apps/erpnext/erpnext/public/js/pos/pos.js +429,Change,Thay đổi
 DocType: Purchase Invoice,Contact Email,Liên hệ Email
 DocType: Appraisal Goal,Score Earned,Điểm số kiếm được
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +393,"e.g. ""My Company LLC""","ví dụ như ""Công ty của tôi LLC """
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +173,Notice Period,Thông báo Thời gian
+apps/erpnext/erpnext/public/js/setup_wizard.js +141,"e.g. ""My Company LLC""","ví dụ như ""Công ty của tôi LLC """
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +173,Notice Period,Thông báo Thời gian
 DocType: Bank Reconciliation Detail,Voucher ID,ID chứng từ
 apps/erpnext/erpnext/setup/doctype/territory/territory.js +14,This is a root territory and cannot be edited.,Đây là một lãnh thổ gốc và không thể được chỉnh sửa.
 DocType: Packing Slip,Gross Weight UOM,Tổng trọng lượng UOM
 DocType: Email Digest,Receivables / Payables,Các khoản phải thu / phải trả
 DocType: Delivery Note Item,Against Sales Invoice,Chống bán hóa đơn
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +63,Stamping,Stamping
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +457,Credit Account,Tài khoản tín dụng
 DocType: Landed Cost Item,Landed Cost Item,Chi phí hạ cánh hàng
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +56,Show zero values,Hiện không có giá trị
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,Số lượng mặt hàng thu được sau khi sản xuất / đóng gói lại từ số lượng nhất định của nguyên liệu
 DocType: Payment Reconciliation,Receivable / Payable Account,Thu / Account Payable
 DocType: Delivery Note Item,Against Sales Order Item,Chống bán hàng đặt hàng
-apps/erpnext/erpnext/stock/doctype/item/item.py +521,Please specify Attribute Value for attribute {0},Hãy xác định thuộc tính Giá trị thuộc tính {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +525,Please specify Attribute Value for attribute {0},Hãy xác định thuộc tính Giá trị thuộc tính {0}
 DocType: Item,Default Warehouse,Kho mặc định
 DocType: Task,Actual End Date (via Time Logs),Thực tế End Date (qua Thời gian Logs)
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +37,Budget cannot be assigned against Group Account {0},Ngân sách không thể được chỉ định đối với tài khoản Nhóm {0}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +23,Please enter parent cost center,Vui lòng nhập trung tâm chi phí cha mẹ
 DocType: Delivery Note,Print Without Amount,In Nếu không có tiền
-apps/erpnext/erpnext/controllers/buying_controller.py +69,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,"Thuế Thể loại không thể được ""định giá"" hay ""Định giá và Total 'như tất cả các mục là những mặt hàng không cổ"
+apps/erpnext/erpnext/controllers/buying_controller.py +60,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,"Thuế Thể loại không thể được ""định giá"" hay ""Định giá và Total 'như tất cả các mục là những mặt hàng không cổ"
 DocType: User,Last Name,Tên
 DocType: Web Page,Left,Trái
 DocType: Event,All Day,Tất cả các ngày
@@ -3811,7 +3654,7 @@
 DocType: Appraisal,Total Score (Out of 5),Tổng số điểm (Out of 5)
 DocType: Contact Us Settings,State,Trạng thái
 DocType: Batch,Batch,Hàng loạt
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +51,Balance,Balance
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +28,Balance,Balance
 DocType: Project,Total Expense Claim (via Expense Claims),Tổng số yêu cầu bồi thường chi phí (thông qua Tuyên bố Expense)
 DocType: User,Gender,Giới Tính
 DocType: Journal Entry,Debit Note,nợ Ghi
@@ -3841,8 +3684,7 @@
 DocType: Purchase Order,Get Last Purchase Rate,Nhận cuối Rate
 DocType: Time Log,Billing Rate based on Activity Type (per hour),Tỷ lệ thanh toán dựa trên Loại hoạt động (mỗi giờ)
 DocType: Company,Company Info,Thông tin công ty
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +76,Seaming,Ghép mí lon
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +197,"Company Email ID not found, hence mail not sent","Công ty Email ID không tìm thấy, do đó thư không gửi"
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +206,"Company Email ID not found, hence mail not sent","Công ty Email ID không tìm thấy, do đó thư không gửi"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Ứng dụng của Quỹ (tài sản)
 DocType: Production Planning Tool,Filter based on item,Lọc dựa trên mục
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +451,Debit Account,Nợ TK
@@ -3854,17 +3696,16 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +95,{0} {1} has been modified. Please refresh.,{0} {1} đã được sửa đổi. Xin vui lòng làm mới.
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,Ngăn chặn người dùng từ việc ứng dụng Để lại vào những ngày sau.
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +591,From Opportunity,Cơ hội từ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +46,Blanking,Tẩy trống
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +166,Employee Benefits,Lợi ích của nhân viên
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,Employee Benefits,Lợi ích của nhân viên
 DocType: Sales Invoice,Is POS,Là POS
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +240,Packed quantity must equal quantity for Item {0} in row {1},Số lượng đóng gói phải bằng số lượng cho hàng {0} trong hàng {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +245,Packed quantity must equal quantity for Item {0} in row {1},Số lượng đóng gói phải bằng số lượng cho hàng {0} trong hàng {1}
 DocType: Production Order,Manufactured Qty,Số lượng sản xuất
 DocType: Purchase Receipt Item,Accepted Quantity,Số lượng chấp nhận
 apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} không tồn tại
 apps/erpnext/erpnext/config/accounts.py +18,Bills raised to Customers.,Hóa đơn tăng cho khách hàng.
 DocType: DocField,Default,Mặc định
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Id dự án
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +466,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Row Không {0}: Số tiền có thể không được lớn hơn khi chờ Số tiền yêu cầu bồi thường đối với Chi {1}. Trong khi chờ Số tiền là {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +468,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Row Không {0}: Số tiền có thể không được lớn hơn khi chờ Số tiền yêu cầu bồi thường đối với Chi {1}. Trong khi chờ Số tiền là {2}
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +40,{0} subscribers added,{0} thuê bao thêm
 DocType: Maintenance Schedule,Schedule,Lập lịch quét
 DocType: Cost Center,"Define Budget for this Cost Center. To set budget action, see ""Company List""","Xác định ngân sách cho Trung tâm chi phí này. Để thiết lập hành động ngân sách, xem &quot;Công ty List&quot;"
@@ -3875,7 +3716,7 @@
 apps/erpnext/erpnext/public/js/pos/pos.js +91,Price List not found or disabled,Danh sách giá không tìm thấy hoặc bị vô hiệu hóa
 DocType: Expense Claim,Approved,Đã được phê duyệt
 DocType: Pricing Rule,Price,Giá
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +79,Employee relieved on {0} must be set as 'Left',Nhân viên bớt căng thẳng trên {0} phải được thiết lập như là 'trái'
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +88,Employee relieved on {0} must be set as 'Left',Nhân viên bớt căng thẳng trên {0} phải được thiết lập như là 'trái'
 DocType: Item,"Selecting ""Yes"" will give a unique identity to each entity of this item which can be viewed in the Serial No master.","Chọn ""Có"" sẽ đưa ra một bản sắc độc đáo cho mỗi thực thể của mặt hàng này có thể được xem trong Serial No chủ."
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +39,Appraisal {0} created for Employee {1} in the given date range,Thẩm định {0} tạo ra cho nhân viên {1} trong phạm vi ngày cho
 DocType: Employee,Education,Đào tạo
@@ -3886,7 +3727,7 @@
 apps/frappe/frappe/desk/moduleview.py +67,Standard Reports,Báo cáo tiêu chuẩn
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,Sổ nhật ký kế toán.
 DocType: Delivery Note Item,Available Qty at From Warehouse,Số lượng có sẵn tại Từ kho
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +209,Please select Employee Record first.,Vui lòng chọn nhân viên ghi đầu tiên.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +224,Please select Employee Record first.,Vui lòng chọn nhân viên ghi đầu tiên.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Row {0}: Đảng / tài khoản không khớp với {1} / {2} trong {3} {4}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +35,To create a Tax Account,Để tạo ra một tài khoản thuế
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +233,Please enter Expense Account,Vui lòng nhập tài khoản chi phí
@@ -3899,46 +3740,43 @@
 DocType: Sales Order,Track this Sales Order against any Project,Theo dõi đơn hàng bán hàng này chống lại bất kỳ dự án
 DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,Kéo đơn bán hàng (đang chờ để cung cấp) dựa trên các tiêu chí trên
 DocType: DocShare,Document Type,Loại tài liệu
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +565,From Supplier Quotation,Nhà cung cấp báo giá từ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +588,From Supplier Quotation,Nhà cung cấp báo giá từ
 DocType: Deduction Type,Deduction Type,Loại trừ
 DocType: Attendance,Half Day,Nửa ngày
 DocType: Pricing Rule,Min Qty,Min Số lượng
 DocType: Features Setup,"To track items in sales and purchase documents with batch nos. ""Preferred Industry: Chemicals""",Để theo dõi các mục trong bán hàng và giấy tờ mua bán với nos hàng loạt. &quot;Công nghiệp ưa thích: Hóa chất&quot;
 DocType: GL Entry,Transaction Date,Giao dịch ngày
 DocType: Production Plan Item,Planned Qty,Số lượng dự kiến
-apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +91,Total Tax,Tổng số thuế
+apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +93,Total Tax,Tổng số thuế
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +178,For Quantity (Manufactured Qty) is mandatory,Đối với lượng (Sản xuất Qty) là bắt buộc
 DocType: Stock Entry,Default Target Warehouse,Mặc định mục tiêu kho
 DocType: Purchase Invoice,Net Total (Company Currency),Net Tổng số (Công ty tiền tệ)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +79,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Row {0}: Đảng Type và Đảng là chỉ áp dụng đối với thu / tài khoản phải trả
 DocType: Notification Control,Purchase Receipt Message,Thông báo mua hóa đơn
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +95,Total allocated leaves are more than period,Tổng số lá được giao rất nhiều so với cùng kỳ
 DocType: Production Order,Actual Start Date,Thực tế Ngày bắt đầu
 DocType: Sales Order,% of materials delivered against this Sales Order,% Nguyên liệu chuyển giao chống lại thứ tự bán hàng này
 apps/erpnext/erpnext/config/stock.py +23,Record item movement.,Phong trào kỷ lục mục.
 DocType: Newsletter List Subscriber,Newsletter List Subscriber,Danh sách bản tin thuê bao
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +164,Morticing,Morticing
 DocType: Email Account,Service,Dịch vụ
 DocType: Hub Settings,Hub Settings,Cài đặt Hub
 DocType: Project,Gross Margin %,Lợi nhuận gộp%
 DocType: BOM,With Operations,Với hoạt động
 apps/erpnext/erpnext/accounts/party.py +232,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Ghi sổ kế toán đã được thực hiện bằng tiền {0} cho công ty {1}. Hãy lựa chọn một tài khoản phải thu hoặc phải trả tiền với {0}.
 ,Monthly Salary Register,Hàng tháng Lương Đăng ký
-apps/frappe/frappe/website/template.py +140,Next,Tiếp theo
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard_page.html +17,Next,Tiếp theo
 DocType: Warranty Claim,If different than customer address,Nếu khác với địa chỉ của khách hàng
 DocType: BOM Operation,BOM Operation,BOM hoạt động
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +118,Electropolishing,Đánh bóng điện
 DocType: Purchase Taxes and Charges,On Previous Row Amount,Trước trên Row Số tiền
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +24,Please enter Payment Amount in atleast one row,Vui lòng nhập Số tiền thanh toán trong ít nhất một hàng
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +33,Please enter Payment Amount in atleast one row,Vui lòng nhập Số tiền thanh toán trong ít nhất một hàng
 DocType: POS Profile,POS Profile,POS hồ sơ
 apps/erpnext/erpnext/config/accounts.py +153,"Seasonality for setting budgets, targets etc.","Tính mùa vụ để thiết lập ngân sách, mục tiêu, vv"
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +238,Row {0}: Payment Amount cannot be greater than Outstanding Amount,Row {0}: Số tiền thanh toán không thể lớn hơn số tiền nợ
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +46,Total Unpaid,Tổng số chưa được thanh toán
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +21,Time Log is not billable,Giờ không phải là lập hoá đơn
 apps/erpnext/erpnext/stock/get_item_details.py +128,"Item {0} is a template, please select one of its variants","Mục {0} là một mẫu, xin vui lòng chọn một trong các biến thể của nó"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +528,Purchaser,Người mua
+apps/erpnext/erpnext/public/js/setup_wizard.js +272,Purchaser,Người mua
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +81,Net pay cannot be negative,Trả tiền net không thể phủ định
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +71,Please enter the Against Vouchers manually,Vui lòng nhập các Against Vouchers tay
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +107,Please enter the Against Vouchers manually,Vui lòng nhập các Against Vouchers tay
 DocType: SMS Settings,Static Parameters,Các thông số tĩnh
 DocType: Purchase Order,Advance Paid,Trước Paid
 DocType: Item,Item Tax,Mục thuế
@@ -3947,14 +3785,12 @@
 apps/erpnext/erpnext/config/crm.py +48,Send mass SMS to your contacts,Gửi tin nhắn SMS hàng loạt địa chỉ liên lạc của bạn
 DocType: Purchase Taxes and Charges,Consider Tax or Charge for,Xem xét thuế hoặc phí cho
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,Số lượng thực tế là bắt buộc
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +42,Cross-rolling,Cross-cán
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +132,Credit Card,Thẻ tín dụng
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +132,Credit Card,Thẻ tín dụng
 DocType: BOM,Item to be manufactured or repacked,Mục được sản xuất hoặc đóng gói lại
 apps/erpnext/erpnext/config/stock.py +95,Default settings for stock transactions.,Thiết lập mặc định cho các giao dịch chứng khoán.
 DocType: Purchase Invoice,Next Date,Tiếp theo ngày
 DocType: Employee Education,Major/Optional Subjects,Chính / Đối tượng bắt buộc
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +49,Please enter Taxes and Charges,Vui lòng nhập Thuế và phí
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +85,Machining,Máy
 DocType: Sales Invoice Item,Drop Ship,Thả tàu
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","Ở đây bạn có thể duy trì chi tiết gia đình như tên và nghề nghiệp của cha mẹ, vợ, chồng và con cái"
 DocType: Hub Settings,Seller Name,Tên người bán
@@ -3964,7 +3800,7 @@
 DocType: Stock Entry,Repack,Repack
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +6,You must Save the form before proceeding,Bạn phải tiết kiệm các hình thức trước khi tiếp tục
 DocType: Item Attribute,Numeric Values,Giá trị Số
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +500,Attach Logo,Logo đính kèm
+apps/erpnext/erpnext/public/js/setup_wizard.js +246,Attach Logo,Logo đính kèm
 DocType: Customer,Commission Rate,Tỷ lệ hoa hồng
 apps/erpnext/erpnext/stock/doctype/item/item.js +38,Make Variant,Hãy Variant
 apps/erpnext/erpnext/config/hr.py +145,Block leave applications by department.,Ngăn chặn các ứng dụng của bộ phận nghỉ.
@@ -3979,19 +3815,19 @@
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +105,Please select a csv file,Vui lòng chọn một tập tin csv
 DocType: Dropbox Backup,Send Backups to Dropbox,Gửi Backups để Dropbox
 DocType: Purchase Order,To Receive and Bill,Nhận và Bill
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +94,Designer,Nhà thiết kế
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Designer,Nhà thiết kế
 apps/erpnext/erpnext/config/selling.py +121,Terms and Conditions Template,Điều khoản và Điều kiện Template
 DocType: Serial No,Delivery Details,Chi tiết giao hàng
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +383,Cost Center is required in row {0} in Taxes table for type {1},Trung tâm chi phí là cần thiết trong hàng {0} trong bảng Thuế cho loại {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +386,Cost Center is required in row {0} in Taxes table for type {1},Trung tâm chi phí là cần thiết trong hàng {0} trong bảng Thuế cho loại {1}
 DocType: Item,Automatically create Material Request if quantity falls below this level,Tự động tạo Material Request nếu số lượng giảm xuống dưới mức này
 ,Item-wise Purchase Register,Item-khôn ngoan mua Đăng ký
 DocType: Batch,Expiry Date,Ngày hết hiệu lực
-apps/erpnext/erpnext/stock/doctype/item/item.py +375,"To set reorder level, item must be a Purchase Item or Manufacturing Item","Để thiết lập mức độ sắp xếp lại, mục phải là một khoản mua hoặc sản xuất hàng"
+apps/erpnext/erpnext/stock/doctype/item/item.py +379,"To set reorder level, item must be a Purchase Item or Manufacturing Item","Để thiết lập mức độ sắp xếp lại, mục phải là một khoản mua hoặc sản xuất hàng"
 ,Supplier Addresses and Contacts,Địa chỉ nhà cung cấp và hệ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,Vui lòng chọn mục đầu tiên
 apps/erpnext/erpnext/config/projects.py +18,Project master.,Chủ dự án.
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,Không hiển thị bất kỳ biểu tượng như $ vv bên cạnh tiền tệ.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +330, (Half Day),(Nửa ngày)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +374, (Half Day),(Nửa ngày)
 DocType: Supplier,Credit Days,Ngày tín dụng
 DocType: Leave Type,Is Carry Forward,Được Carry Forward
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +478,Get Items from BOM,Được mục từ BOM
@@ -3999,7 +3835,7 @@
 apps/erpnext/erpnext/config/manufacturing.py +120,Bill of Materials,Hóa đơn nguyên vật liệu
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +77,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Row {0}: Đảng Type và Đảng là cần thiết cho thu / tài khoản phải trả {1}
 DocType: Dropbox Backup,Send Notifications To,Gửi thông báo để
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html +26,Ref Date,Ref ngày
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +54,Ref Date,Ref ngày
 DocType: Employee,Reason for Leaving,Lý do Rời
 DocType: Expense Claim Detail,Sanctioned Amount,Số tiền xử phạt
 DocType: GL Entry,Is Opening,Được mở cửa
@@ -4007,4 +3843,3 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +188,Account {0} does not exist,Tài khoản {0} không tồn tại
 DocType: Account,Cash,Tiền mặt
 DocType: Employee,Short biography for website and other publications.,Tiểu sử ngắn cho trang web và các ấn phẩm khác.
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +31,Please create Salary Structure for employee {0},Hãy tạo cấu trúc lương cho nhân viên {0}
diff --git a/erpnext/translations/zh-cn.csv b/erpnext/translations/zh-cn.csv
index 716c076..78cd3de 100644
--- a/erpnext/translations/zh-cn.csv
+++ b/erpnext/translations/zh-cn.csv
@@ -1,13 +1,12 @@
 DocType: Employee,Salary Mode,薪酬模式
 DocType: Cost Center,"Select Monthly Distribution, if you want to track based on seasonality.",如果需要按季节跟踪的话请选择“月度分布”。
 DocType: Employee,Divorced,离婚
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +86,Warning: Same item has been entered multiple times.,警告：相同项目已经输入多次。
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +80,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,允许项目将在一个事务中多次添加
 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/page/setup_wizard/fixtures/industry_type.py +19,Consumer Products,消费类产品
+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,请选择党第一型
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +90,Annealing,退火
 DocType: Item,Customer Items,客户项目
 apps/erpnext/erpnext/accounts/doctype/account/account.py +45,Account {0}: Parent account {1} can not be a ledger,科目{0}的上级科目{1}不能是分类账
 DocType: Item,Publish Item to hub.erpnext.com,发布项目hub.erpnext.com
@@ -20,15 +19,14 @@
 DocType: About Us Settings,Website,网站
 DocType: POS Profile,Applicable for User,适用于用户
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +169,"Stopped Production Order cannot be cancelled, Unstop it first to cancel",停止生产订单无法取消，首先Unstop它取消
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +23,Compaction plus sintering,压实加烧结
 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.,*将被计算在该交易内。
 DocType: Purchase Order,Customer Contact,客户联系
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +549,From Material Request,来自物料申请
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +572,From Material Request,来自物料申请
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} 树
 DocType: Job Applicant,Job Applicant,求职者
 apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,没有更多结果。
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +78,Legal,法律
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +34,Legal,法律
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +114,Actual type tax cannot be included in Item rate in row {0},实际类型税不能被包含在商品率排{0}
 DocType: C-Form,Customer,顾客
 DocType: Purchase Receipt Item,Required By,必选
@@ -43,7 +41,6 @@
 DocType: Manufacturing Settings,Default 10 mins,默认为10分钟
 DocType: Leave Type,Leave Type Name,假期类型名称
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +148,Series Updated Successfully,系列已成功更新
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +150,Stitching,拼接
 DocType: Pricing Rule,Apply On,应用于
 DocType: Item Price,Multiple Item prices.,多个品目的价格。
 ,Purchase Order Items To Be Received,采购订单项目可收
@@ -51,8 +48,8 @@
 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 +104,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 +189,New Leave Application,新建假期申请
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +134,Bank Draft,银行汇票
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +204,New Leave Application,新建假期申请
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +134,Bank Draft,银行汇票
 DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,1。为了保持客户明智的项目代码，并使其搜索根据自己的代码中使用这个选项
 DocType: Mode of Payment Account,Mode of Payment Account,付款方式账户
 apps/erpnext/erpnext/stock/doctype/item/item.js +34,Show Variants,显示变体
@@ -64,25 +61,23 @@
 DocType: Production Plan Item,Production Plan Item,生产计划项目
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +141,User {0} is already assigned to Employee {1},用户{0}已经被分配给员工{1}
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +13,Make new POS Profile,使新的POS简介
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +31,Health Care,医疗保健
+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 +494,Invoice,发票
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +519,Invoice,发票
 DocType: Maintenance Schedule Item,Periodicity,周期性
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +357,Email Address,邮件提醒
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +21,Defense,Defense
+apps/erpnext/erpnext/public/js/setup_wizard.js +107,Email Address,邮件提醒
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,Defense
 DocType: Company,Abbr,缩写
 DocType: Appraisal Goal,Score (0-5),得分（0-5）
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +193,Row {0}: {1} {2} does not match with {3},行{0}：{1} {2}不相匹配{3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +67,Row # {0}:,行＃{0}：
 DocType: Delivery Note,Vehicle No,车辆编号
 apps/erpnext/erpnext/public/js/pos/pos.js +528,Please select Price List,请选择价格表
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +162,Woodworking,木工
 DocType: Production Order Operation,Work In Progress,在制品
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +153,3D printing,3D打印
 DocType: Employee,Holiday List,假期列表
 DocType: Time Log,Time Log,时间日志
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +530,Accountant,会计
+apps/erpnext/erpnext/public/js/setup_wizard.js +274,Accountant,会计
 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.",用户对任务的操作记录，可以用来追踪时间和付款。
@@ -98,18 +93,19 @@
 DocType: Bin,Quantity Requested for Purchase,申请采购的数量
 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/setup/page/setup_wizard/setup_wizard.js +626,Kg,千克
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Kg,千克
 apps/erpnext/erpnext/config/hr.py +48,Opening for a Job.,开放的工作。
 DocType: Item Attribute,Increment,增量
 apps/erpnext/erpnext/public/js/stock_analytics.js +63,Select Warehouse...,选择仓库...
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +6,Advertising,广告
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,广告
+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/doctype/sales_invoice/sales_invoice.py +389,Stock cannot be updated against Delivery Note {0},送货单{0}不能更新库存
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +391,Stock cannot be updated against Delivery Note {0},送货单{0}不能更新库存
 DocType: Payment Reconciliation,Reconcile,调和
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +30,Grocery,杂货
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,杂货
 DocType: Quality Inspection Reading,Reading 1,阅读1
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Make Bank Entry,创建银行分录
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +40,Pension Funds,养老基金
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,养老基金
 apps/erpnext/erpnext/accounts/doctype/account/account.py +142,Warehouse is mandatory if account type is Warehouse,类型为仓库的账户必须指定仓库
 DocType: SMS Center,All Sales Person,所有的销售人员
 DocType: Lead,Person Name,人姓名
@@ -131,7 +127,7 @@
 DocType: Quality Inspection,Get Specification Details,获取详细规格
 DocType: Lead,Interested,有兴趣
 apps/erpnext/erpnext/config/manufacturing.py +14,Bill of Material,物料清单
-apps/erpnext/erpnext/public/js/stock_analytics.js +45,Opening,开盘
+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,从品目组复制
 DocType: Journal Entry,Opening Entry,开放报名
@@ -145,23 +141,22 @@
 DocType: Employee Education,Under Graduate,本科
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +22,Target On,目标类型
 DocType: BOM,Total Cost,总成本
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +99,Reaming,扩孔
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +9,Activity Log:,活动日志：
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +199,Item {0} does not exist in the system or has expired,品目{0}不存在于系统中或已过期
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +44,Real Estate,房地产
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +44,Real Estate,房地产
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +4,Statement of Account,对账单
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +41,Pharmaceuticals,制药
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,制药
 DocType: Expense Claim Detail,Claim Amount,报销金额
 DocType: Employee,Mr,先生
 DocType: Custom Script,Client,客户
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,供应商类型/供应商
 DocType: Naming Series,Prefix,字首
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Consumable,耗材
+apps/erpnext/erpnext/public/js/setup_wizard.js +359,Consumable,耗材
 DocType: Upload Attendance,Import Log,导入日志
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.js +19,Send,发送
 DocType: Sales Invoice Item,Delivered By Supplier,交付供应商
 DocType: SMS Center,All Contact,所有联系人
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +164,Annual Salary,年薪
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +164,Annual Salary,年薪
 DocType: Period Closing Voucher,Closing Fiscal Year,结算财年
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +69,Stock Expenses,库存费用
 DocType: Newsletter,Email Sent?,邮件已发送？
@@ -169,26 +164,24 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +92,Show Time Logs,显示的时间记录
 DocType: Journal Entry Account,Credit in Company Currency,信用在公司货币
 DocType: Delivery Note,Installation Status,安装状态
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +115,Accepted + Rejected Qty must be equal to Received quantity for Item {0},已接受+已拒绝的数量必须等于条目{0}的已接收数量
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +118,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 +133,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 +493,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included",要包括税款，行{0}项率，税收行{1}也必须包括在内
+apps/erpnext/erpnext/controllers/accounts_controller.py +494,"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 +90,Settings for HR Module,人力资源模块的设置
 DocType: SMS Center,SMS Center,短信中心
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +78,Straightening,直
 DocType: BOM Replace Tool,New BOM,新建物料清单
 apps/erpnext/erpnext/config/projects.py +28,Batch Time Logs for billing.,批处理的时间记录进行计费。
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +15,Countergravity casting,反重力铸造
 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/setup/page/setup_wizard/fixtures/industry_type.py +14,Broadcasting,广播
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +140,Execution,执行
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +364,The first user will become the System Manager (you can change this later).,第一个用户将成为系统管理员，你以后可以更改。
+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/public/js/setup_wizard.js +114,The first user will become the System Manager (you can change this later).,第一个用户将成为系统管理员，你以后可以更改。
 apps/erpnext/erpnext/config/manufacturing.py +39,Details of the operations carried out.,生产操作详情。
 DocType: Serial No,Maintenance Status,维护状态
 apps/erpnext/erpnext/config/stock.py +263,Items and Pricing,项目和定价
@@ -205,7 +198,6 @@
 DocType: Pricing Rule,Discount on Price List Rate (%),折扣价目表率（％）
 apps/frappe/frappe/public/js/frappe/form/print.js +96,Start,开始
 DocType: User,First Name,姓
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +12,Full-mold casting,全模铸造
 DocType: Offer Letter,Select Terms and Conditions,选择条款和条件
 DocType: Production Planning Tool,Sales Orders,销售订单
 DocType: Purchase Taxes and Charges,Valuation,估值
@@ -217,8 +209,7 @@
 DocType: Bank Reconciliation,Bank Account,银行帐户
 DocType: Leave Type,Allow Negative Balance,允许负余额
 DocType: Selling Settings,Default Territory,默认地区
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +53,Television,电视
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +138,Gashing,Gashing
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,电视
 DocType: Production Order Operation,Updated via 'Time Log',通过“时间日志”更新
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +82,Account {0} does not belong to Company {1},科目{0}不属于公司{1}
 DocType: Naming Series,Series List for this Transaction,此交易的系列列表
@@ -233,14 +224,13 @@
 DocType: Leave Allocation,Add unused leaves from previous allocations,添加未使用的叶子从以前的分配
 apps/erpnext/erpnext/controllers/recurring_document.py +206,Next Recurring {0} will be created on {1},周期{0}下次创建时间为{1}
 DocType: Newsletter List,Total Subscribers,用户总数
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +575,Contact Name,联系人姓名
+,Contact Name,联系人姓名
 DocType: Production Plan Item,SO Pending Qty,销售订单待定数量
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,依上述条件创建工资单
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,请求您的报价。
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +107,Double housing,双人房
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +156,Only the selected Leave Approver can submit this Leave Application,只有选择的休假审批者可以提交此请假
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +171,Only the selected Leave Approver can submit this Leave Application,只有选择的休假审批者可以提交此请假
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,解除日期必须大于加入的日期
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +172,Leaves per Year,每年叶
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +172,Leaves per Year,每年叶
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup > Settings > Naming Series,请设置命名序列{0}通过设置&gt;设置&gt;命名系列
 DocType: Time Log,Will be updated when batched.,批处理后将会更新。
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +104,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,行{0}：请检查'是推进'对帐户{1}，如果这是一个进步条目。
@@ -249,25 +239,24 @@
 DocType: Item Website Specification,Item Website Specification,品目网站规格
 DocType: Dropbox Backup,Dropbox Access Key,Dropbox的Key
 DocType: Payment Tool,Reference No,参考编号
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +348,Leave Blocked,已禁止请假
-apps/erpnext/erpnext/stock/doctype/item/item.py +535,Item {0} has reached its end of life on {1},品目{0}已经到达寿命终止日期{1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +392,Leave Blocked,已禁止请假
+apps/erpnext/erpnext/stock/doctype/item/item.py +539,Item {0} has reached its end of life on {1},品目{0}已经到达寿命终止日期{1}
 apps/erpnext/erpnext/accounts/utils.py +339,Annual,全年
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,库存盘点品目
 DocType: Stock Entry,Sales Invoice No,销售发票编号
 DocType: Material Request Item,Min Order Qty,最小订货量
 DocType: Lead,Do Not Contact,不要联系
 DocType: Sales Invoice,The unique id for tracking all recurring invoices. It is generated on submit.,跟踪所有周期性发票的唯一ID，提交时自动生成。
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +93,Software Developer,软件开发人员
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +93,Software Developer,软件开发人员
 DocType: Item,Minimum Order Qty,最小起订量
 DocType: Pricing Rule,Supplier Type,供应商类型
 DocType: Item,Publish in Hub,在发布中心
 ,Terretory,区域
-apps/erpnext/erpnext/stock/doctype/item/item.py +555,Item {0} is cancelled,品目{0}已取消
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +598,Material Request,物料申请
+apps/erpnext/erpnext/stock/doctype/item/item.py +559,Item {0} is cancelled,品目{0}已取消
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +607,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}未发现“原材料提供&#39;表中的采购订单{1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +129,Wire brushing,钢丝刷
 DocType: Employee,Relation,关系
 DocType: Shipping Rule,Worldwide Shipping,全球航运
 apps/erpnext/erpnext/config/selling.py +23,Confirmed orders from Customers.,确认客户订单。
@@ -283,12 +272,11 @@
 DocType: Supplier,Address HTML,地址HTML
 DocType: Lead,Mobile No.,手机号码
 DocType: Maintenance Schedule,Generate Schedule,生成时间表
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +81,Hubbing,枢纽
 DocType: Purchase Invoice Item,Expense Head,总支出
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +86,Please select Charge Type first,预计日期不能前材料申请日期
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,最新
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +395,Max 5 characters,最多5个字符
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +195,Select Your Language,设置你的语言
+apps/erpnext/erpnext/public/js/setup_wizard.js +143,Max 5 characters,最多5个字符
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +245,Select Your Language,设置你的语言
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,假期审批人列表的第一个将被设为默认审批人
 DocType: Manufacturing Settings,"Disables creation of time logs against Production Orders.
 Operations shall not be tracked against Production Order",禁止对创作生产订单的时间日志。操作不得对生产订单追踪
@@ -300,8 +288,6 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +34,Item {0} must be Service Item,品目{0}必须是服务品目
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +303,Completed Qty can not be greater than 'Qty to Manufacture',完成数量不能大于“生产数量”
 DocType: DocType,Administrator,管理员
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +136,Laser drilling,激光打孔
-DocType: Stock UOM Replace Utility,New Stock UOM,新建库存计量单位
 DocType: Period Closing Voucher,Closing Account Head,结算帐户头
 DocType: Employee,External Work History,外部就职经历
 apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,循环引用错误
@@ -310,18 +296,15 @@
 DocType: Lead,Industry,行业
 DocType: Employee,Job Profile,工作简介
 DocType: Newsletter,Newsletter,通讯
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +84,Hydroforming,液压成形
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +49,Necking,缩颈
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,自动创建物料申请时通过邮件通知
 DocType: Journal Entry,Multi Currency,多币种
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +51,Item is updated,品目已更新
 DocType: Async Task,System Manager,系统管理员
 DocType: Payment Reconciliation Invoice,Invoice Type,发票类型
 DocType: Sales Invoice Item,Delivery Note,送货单
 DocType: Dropbox Backup,Allow Dropbox Access,允许访问Dropbox
 apps/erpnext/erpnext/config/learn.py +72,Setting up Taxes,建立税
 apps/erpnext/erpnext/accounts/utils.py +189,Payment Entry has been modified after you pulled it. Please pull it again.,付款项被修改，你把它之后。请重新拉。
-apps/erpnext/erpnext/stock/doctype/item/item.py +343,{0} entered twice in Item Tax,{0}输入两次税项
+apps/erpnext/erpnext/stock/doctype/item/item.py +347,{0} entered twice in Item Tax,{0}输入两次税项
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +105,Summary for this week and pending activities,本周和待活动总结
 DocType: Workstation,Rent Cost,租金成本
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +74,Please select month and year,请选择年份和月份
@@ -338,23 +321,21 @@
 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/buying/doctype/purchase_order/purchase_order.js +517,Select Item,选择项目
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +540,Select Item,选择项目
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +143,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry",品目{0}通过批次管理，不能通过库存盘点进行盘点，请使用库存登记
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +259,Purchase Invoice {0} is already submitted,采购发票{0}已经提交
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +262,Purchase Invoice {0} is already submitted,采购发票{0}已经提交
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Batch No must be same as {1} {2},行＃{0}：批号必须与{1} {2}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Convert to non-Group,转换为非集团
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +55,Purchase Receipt must be submitted,购买收据必须提交
-DocType: Stock UOM Replace Utility,Current Stock UOM,当前库存计量单位
 apps/erpnext/erpnext/config/stock.py +53,Batch (lot) of an Item.,产品批次(patch)/批(lot)。
 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}
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Your email address,您的电子邮件地址
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +194,Please see attachment,请参阅附件
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +203,Please see attachment,请参阅附件
 DocType: Purchase Order,% Received,％已收货
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +109,Water jet cutting,水射流切割
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +24,Setup Already Complete!!,安装已经完成！
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +20,Setup Already Complete!!,安装已经完成！
 ,Finished Goods,成品
 DocType: Delivery Note,Instructions,说明
 DocType: Quality Inspection,Inspected By,验货人
@@ -369,6 +350,7 @@
 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,货币兑换
 DocType: Purchase Invoice Item,Item Name,品目名称
+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",要申请的品目，这些品目基于实际存库量和最低订货量的结算结果为“库存量不足”
@@ -378,11 +360,10 @@
 ,Purchase Register,购买注册
 DocType: Landed Cost Item,Applicable Charges,适用费用
 DocType: Workstation,Consumable Cost,耗材成本
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,{0} ({1}) must have role 'Leave Approver',{0} {1}必须有“假期审批人”的角色
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +167,{0} ({1}) must have role 'Leave Approver',{0} {1}必须有“假期审批人”的角色
 DocType: Purchase Receipt,Vehicle Date,车日期
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +39,Medical,医药
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +39,Medical,医药
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,原因丢失
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +36,Tube beading,管钉珠
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},工作站在以下假期关闭：{0}
 DocType: Employee,Single,单身
 DocType: Issue,Attachment,附件
@@ -403,10 +384,8 @@
 DocType: Account,Is Group,是集团
 DocType: Stock Settings,Automatically Set Serial Nos based on FIFO,自动设置序列号的基础上FIFO
 DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,检查供应商发票编号唯一性
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +31,Thermoforming,热成型
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +66,Slitting,纵剪
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +57,'To Case No.' cannot be less than 'From Case No.','起始箱号'不能小于'结束箱号'
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +104,Non Profit,非营利
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +104,Non Profit,非营利
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_list.js +7,Not Started,未开始
 DocType: Lead,Channel Partner,渠道合作伙伴
 DocType: Account,Old Parent,旧上级
@@ -415,13 +394,12 @@
 apps/erpnext/erpnext/config/manufacturing.py +74,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 +512,Attribute {0} selected multiple times in Attributes Table,属性{0}多次选择在属性表
+apps/erpnext/erpnext/stock/doctype/item/item.py +516,Attribute {0} selected multiple times in Attributes Table,属性{0}多次选择在属性表
 DocType: Sales Order,Not Applicable,不适用
 apps/erpnext/erpnext/config/hr.py +140,Holiday master.,假期大师
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +19,Shell molding,外壳成型
 DocType: Material Request Item,Required Date,所需时间
 DocType: Delivery Note,Billing Address,帐单地址
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +644,Please enter Item Code.,请输入产品编号。
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +648,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,总数量
@@ -431,7 +409,7 @@
 DocType: Item Attribute,To Range,为了范围
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,证券及存款
 DocType: Features Setup,Imports,导入
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +144,Adhesive bonding,粘接
+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.,考勤记录。
@@ -439,26 +417,25 @@
 DocType: Sales Order Item,Used for Production Plan,用于生产计划
 DocType: System Settings,Loading...,载入中...
 DocType: DocField,Password,密码
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +155,Fused deposition modeling,熔融沉积成型
 DocType: Manufacturing Settings,Time Between Operations (in mins),时间操作之间（以分钟）
 DocType: Customer,Buyer of Goods and Services.,产品和服务购买者。
 DocType: Journal Entry,Accounts Payable,应付帐款
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +24,Add Subscribers,添加订阅
 apps/erpnext/erpnext/public/js/feature_setup.js +220,""" does not exists",“不存在
 DocType: Pricing Rule,Valid Upto,有效期至
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +564,List a few of your customers. They could be organizations or individuals.,列出一些你的客户，他们可以是组织或个人。
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,List a few of your customers. They could be organizations or individuals.,列出一些你的客户，他们可以是组织或个人。
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Direct Income,直接收益
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +33,"Can not filter based on Account, if grouped by Account",按科目分类后不能根据科目过滤
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +88,Administrative Officer,行政主任
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Administrative Officer,行政主任
 DocType: Payment Tool,Received Or Paid,收到或支付
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +318,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 +305,Please enter Warehouse for which Material Request will be raised,请重新拉。
 DocType: Production Order,Additional Operating Cost,额外的运营成本
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +20,Cosmetics,化妆品
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,化妆品
 DocType: DocField,Type,类型
-apps/erpnext/erpnext/stock/doctype/item/item.py +417,"To merge, following properties must be same for both items",若要合并，以下属性必须为这两个项目是相同的
+apps/erpnext/erpnext/stock/doctype/item/item.py +421,"To merge, following properties must be same for both items",若要合并，以下属性必须为这两个项目是相同的
 DocType: Communication,Subject,主题
 DocType: Shipping Rule,Net Weight,净重
 DocType: Employee,Emergency Phone,紧急电话
@@ -468,7 +445,6 @@
 DocType: Journal Entry,Difference (Dr - Cr),差异(贷方-借方)
 DocType: Account,Profit and Loss,损益
 apps/erpnext/erpnext/config/stock.py +293,Managing Subcontracting,管理转包
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +58,New UOM must NOT be of type Whole Number,新计量单位的类型不能是整数
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Furniture and Fixture,factory furniture and fixtures
 DocType: Quotation,Rate at which Price list currency is converted to company's base currency,速率价目表货币转换为公司的基础货币
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Account {0} does not belong to company: {1},科目{0}不属于公司：{1}
@@ -487,14 +463,14 @@
 DocType: Purchase Invoice,Supplier Invoice No,供应商发票编号
 DocType: Territory,For reference,供参考
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +154,"Cannot delete Serial No {0}, as it is used in stock transactions",无法删除序列号{0}，因为它采用的是现货交易
-apps/erpnext/erpnext/public/js/account_tree_grid.js +52,Closing (Cr),结算(信用)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +227,Closing (Cr),结算(信用)
 DocType: Serial No,Warranty Period (Days),保修期限（天数）
 DocType: Installation Note Item,Installation Note Item,安装单品目
 ,Pending Qty,待定数量
 DocType: Job Applicant,Thread HTML,主题HTML
 DocType: Company,Ignore,忽略
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +86,SMS sent to following numbers: {0},短信发送至以下号码：{0}
-apps/erpnext/erpnext/controllers/buying_controller.py +135,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,外包采购收据必须指定供应商仓库
+apps/erpnext/erpnext/controllers/buying_controller.py +126,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,外包采购收据必须指定供应商仓库
 DocType: Pricing Rule,Valid From,有效期自
 DocType: Sales Invoice,Total Commission,总委员会
 DocType: Pricing Rule,Sales Partner,销售合作伙伴
@@ -502,7 +478,7 @@
 DocType: Monthly Distribution,"**Monthly Distribution** helps you distribute your budget across months if you have seasonality in your business.
 
 To distribute a budget using this distribution, set this **Monthly Distribution** in the **Cost Center**",如果你有季节性的业务，**月度分配**将帮助你按月分配预算。要使用这种分配方式，请在**成本中心**内设置**月度分配**。
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +183,No records found in the Invoice table,没有在发票表中找到记录
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +130,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 +84,Financial / accounting year.,财务/会计年度。
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged",抱歉，序列号无法合并
@@ -518,25 +494,25 @@
 DocType: Sales Order,Billing and Delivery Status,结算和交货状态
 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/setup/page/setup_wizard/setup_wizard_page.html +16,Previous,以前
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard_page.html +16,Previous,以前
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +620,Sales Return,销售退货
 DocType: Production Planning Tool,Select Sales Orders from which you want to create Production Orders.,选择该生产订单的源销售订单。
 DocType: Item,Delivered by Supplier (Drop Ship),由供应商交货（直接发运）
 apps/erpnext/erpnext/config/hr.py +120,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.,客户数据库。
 DocType: Quotation,Quotation To,报价对象
 DocType: Lead,Middle Income,中等收入
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),开幕（CR ）
 apps/erpnext/erpnext/accounts/utils.py +193,Allocated amount can not be negative,调配数量不能为负
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +123,Tumbling,翻筋斗
 DocType: Purchase Order Item,Billed Amt,已开票金额
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,创建库存记录所依赖的逻辑仓库。
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +92,Reference No & Reference Date is required for {0},参考号与参考日期须为{0}
 DocType: Event,Wednesday,星期三
 DocType: Sales Invoice,Customer's Vendor,客户的供应商
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +214,Production Order is Mandatory,生产订单是强制性
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +139,Proposal Writing,提案写作
+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/stock/stock_ledger.py +336,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},负库存错误({6})。品目{0}，仓库{1}，提交时间{2}{3}，凭证类型{4}，凭证编号{5}
 DocType: Fiscal Year Company,Fiscal Year Company,公司财政年度
@@ -559,7 +535,7 @@
 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/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.py +179,Please install dropbox python module,请安装Dropbox的Python模块
 DocType: Employee,Passport Number,护照号码
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +82,Manager,经理
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Manager,经理
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +494,From Purchase Receipt,来自采购收据
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +219,Same item has been entered multiple times.,相同的品目已输入多次
 DocType: SMS Settings,Receiver Parameter,接收机参数
@@ -567,10 +543,9 @@
 DocType: Sales Person,Sales Person Targets,销售人员目标
 apps/frappe/frappe/public/js/frappe/form/workflow.js +116,To,到
 apps/frappe/frappe/templates/base.html +145,Please enter email address,请输入您的电子邮件地址
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +35,End tube forming,尾管成型
 DocType: Production Order Operation,In minutes,已分钟为单位
 DocType: Issue,Resolution Date,决议日期
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +635,Please set default Cash or Bank account in Mode of Payment {0},请设置默认的现金或银行账户的付款方式{0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +637,Please set default Cash or Bank account in Mode of Payment {0},请设置默认的现金或银行账户的付款方式{0}
 DocType: Selling Settings,Customer Naming By,客户命名方式
 apps/erpnext/erpnext/accounts/doctype/account/account.js +67,Convert to Group,转换为组
 DocType: Activity Cost,Activity Type,活动类型
@@ -578,12 +553,12 @@
 DocType: Customer,Fixed Days,固定天
 DocType: Sales Invoice,Packing List,包装清单
 apps/erpnext/erpnext/config/buying.py +28,Purchase Orders given to Suppliers.,购买给供应商的订单。
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +43,Publishing,出版
+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 +198,{0}: {1} not found in Invoice Details table,{0}：{1}在发票明细表中无法找到
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,{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 +208,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,取消此销售订单前必须取消维护访问{0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +203,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),开幕（博士）
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},发布时间标记必须经过{0}
@@ -595,7 +570,6 @@
 DocType: Pricing Rule,Sales Manager,销售经理
 apps/frappe/frappe/public/js/frappe/model/model.js +492,Rename,重命名
 DocType: Journal Entry,Write Off Amount,核销金额
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +52,Bending,弯曲
 apps/frappe/frappe/core/page/user_permissions/user_permissions.js +246,Allow User,允许用户
 DocType: Journal Entry,Bill No,账单编号
 DocType: Purchase Invoice,Quarterly,季度
@@ -605,17 +579,16 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Please enter item details,请输入项目细节
 DocType: Purchase Receipt,Other Details,其他详细信息
 DocType: Account,Accounts,会计
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +67,Marketing,市场营销
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +65,Straight shearing,直剪
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +67,Marketing,市场营销
 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/stock/doctype/purchase_receipt/purchase_receipt.py +99,Rejected Warehouse is mandatory against regected item,拒绝仓库是必须反对regected项目
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +102,Rejected Warehouse is mandatory against regected item,拒绝仓库是必须反对regected项目
 DocType: Account,Expenses Included In Valuation,开支计入估值
 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,报价函期限
-apps/erpnext/erpnext/stock/doctype/item/item.py +492,Item has variants.,项目已变种。
+apps/erpnext/erpnext/stock/doctype/item/item.py +496,Item has variants.,项目已变种。
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,品目{0}未找到
 DocType: Bin,Stock Value,库存值
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,树类型
@@ -624,10 +597,9 @@
 DocType: Material Request Item,Quantity and Warehouse,数量和仓库
 DocType: Sales Invoice,Commission Rate (%),佣金率（％）
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +172,"Against Voucher Type must be one of Sales Order, Sales Invoice or Journal Entry",凭证类型必须是销售订单，销售发票或日记帐分录之一
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +139,Biomachining,Biomachining
 apps/erpnext/erpnext/setup/utils.py +89,Unable to find exchange rate,找不到汇率
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +7,Aerospace,航天
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +19,Welcome,欢迎
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +7,Aerospace,航天
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +40,Welcome,欢迎
 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.,来自供应商的已收入成品。
@@ -650,19 +622,19 @@
 DocType: Employee,Cell Number,手机号码
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,丧失
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +120,You can not enter current voucher in 'Against Journal Entry' column,您不能在“对日记账分录”列中选择此凭证。
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +25,Energy,能源
+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.,月度工资结算
 DocType: Item Group,Website Specifications,网站规格
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +205,New Account,新建账户
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +21,{0}: From {0} of type {1},{0}：申请者{0} 假期类型{1}
-apps/erpnext/erpnext/controllers/buying_controller.py +283,Row {0}: Conversion Factor is mandatory,行{0}：转换系数是强制性的
+apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,行{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.,会计分录可对叶节点。对组参赛作品是不允许的。
 DocType: ToDo,High,高
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +361,Cannot deactivate or cancel BOM as it is linked with other BOMs,无法停用或取消BOM，因为它被其他BOM引用。
 DocType: Opportunity,Maintenance,维护
 DocType: User,Male,男性
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +182,Purchase Receipt number required for Item {0},所需物品交易收据号码{0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +183,Purchase Receipt number required for Item {0},所需物品交易收据号码{0}
 DocType: Item Attribute Value,Item Attribute Value,品目属性值
 apps/erpnext/erpnext/config/crm.py +64,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.
@@ -702,10 +674,9 @@
 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 +324,"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/page/setup_wizard/fixtures/industry_type.py +13,Biotechnology,生物技术
+apps/erpnext/erpnext/controllers/accounts_controller.py +325,"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,办公维护费用
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +53,Hemming,海明
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +66,Please enter Item first,没有客户或供应商帐户发现。账户是根据\确定
 DocType: Account,Liability,负债
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +62,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,制裁金额不能大于索赔额行{0}。
@@ -718,10 +689,10 @@
 DocType: Company,Default Bank Account,默认银行账户
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +47,"To filter based on Party, select Party Type first",要根据党的筛选，选择党第一类型
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},“库存更新'校验不通过，因为{0}中的退货条目未交付
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Nos,Nos
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,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 +627,My Invoices,我的发票
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +629,My Invoices,我的发票
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,未找到任何雇员
 DocType: Purchase Order,Stopped,已停止
 DocType: Item,If subcontracted to a vendor,如果分包给供应商
@@ -740,35 +711,33 @@
 DocType: Features Setup,"To enable ""Point of Sale"" features",为了使“销售点”的特点
 DocType: Bin,Moving Average Rate,移动平均价格
 DocType: Production Planning Tool,Select Items,选择品目
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,{0} against Bill {1} dated {2},{0}对日期为{2}的账单{1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +328,{0} against Bill {1} dated {2},{0}对日期为{2}的账单{1}
 DocType: Comment,Reference Name,参考名称
 DocType: Maintenance Visit,Completion Status,完成状态
 DocType: Sales Invoice Item,Target Warehouse,目标仓库
 DocType: Item,Allow over delivery or receipt upto this percent,允许在交付或接收高达百分之这
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +49,Expected Delivery Date cannot be before Sales Order Date,预计交货日期不能早于销售订单日期
 DocType: Upload Attendance,Import Attendance,导入考勤记录
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +17,All Item Groups,所有品目群组
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +17,All Item Groups,所有品目群组
 DocType: Process Payroll,Activity Log,活动日志
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +30,Net Profit / Loss,净利润/亏损
 apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,在提交交易时自动编写信息。
 DocType: Production Order,Item To Manufacture,要生产的品目
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +16,Permanent mold casting,永久模铸造
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1}的状态为{2}
 apps/erpnext/erpnext/config/learn.py +172,Purchase Order to Payment,采购订单到付款
 DocType: Sales Order Item,Projected Qty,预计数量
 DocType: Sales Invoice,Payment Due Date,付款到期日
 DocType: Newsletter,Newsletter Manager,通讯经理
-apps/erpnext/erpnext/stock/doctype/item/item.js +229,Item Variant {0} already exists with same attributes,项目变种{0}已经具有相同属性的存在
+apps/erpnext/erpnext/stock/doctype/item/item.js +231,Item Variant {0} already exists with same attributes,项目变种{0}已经具有相同属性的存在
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening',“打开”
 DocType: Notification Control,Delivery Note Message,送货单留言
 DocType: Expense Claim,Expenses,开支
 DocType: Item Variant Attribute,Item Variant Attribute,产品规格属性
 ,Purchase Receipt Trends,购买收据趋势
 DocType: Appraisal,Select template from which you want to get the Goals, 选择要从中获得目标的模板
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +77,Research & Development,研究与发展
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Research & Development,研究与发展
 ,Amount to Bill,帐单数额
 DocType: Company,Registration Details,报名详情
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +75,Staking,跑马圈地
 DocType: Item,Re-Order Qty,重新排序数量
 DocType: Leave Block List Date,Leave Block List Date,禁离日日期
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +25,Scheduled to send to {0},计划发送到{0}
@@ -779,18 +748,16 @@
 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/hr/doctype/leave_allocation/leave_allocation.py +71,Cannot carry forward {0},无法顺延{0}
 apps/erpnext/erpnext/accounts/doctype/account/account.py +91,"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,报销拒绝消息
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +145,Nailing,钉
 ,Available Qty,可用数量
 DocType: Purchase Taxes and Charges,On Previous Row Total,基于前一行的总计
 DocType: Salary Slip,Working Days,工作日
 DocType: Serial No,Incoming Rate,入库价格
 DocType: Packing Slip,Gross Weight,毛重
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +410,The name of your company for which you are setting up this system.,贵公司的名称
+apps/erpnext/erpnext/public/js/setup_wizard.js +158,The name of your company for which you are setting up this system.,贵公司的名称
 DocType: HR Settings,Include holidays in Total no. of Working Days,将假期包含在工作日内
 DocType: Job Applicant,Hold,持有
 DocType: Employee,Date of Joining,入职日期
@@ -800,7 +767,6 @@
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +3,View Subscribers,查看订阅
 DocType: Purchase Invoice Item,Purchase Receipt,外购入库单
 ,Received Items To Be Billed,收到的项目要被收取
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +114,Abrasive blasting,喷砂
 DocType: Employee,Ms,女士
 apps/erpnext/erpnext/config/accounts.py +148,Currency exchange rate master.,货币汇率大师
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +253,Unable to find Time Slot in the next {0} days for Operation {1},找不到时隙在未来{0}天操作{1}
@@ -812,7 +778,7 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +209,Serial No {0} does not belong to Item {1},序列号{0}不属于品目{1}
 DocType: Purchase Receipt Item Supplied,Required Qty,所需数量
 DocType: Bank Reconciliation,Total Amount,总金额
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +32,Internet Publishing,互联网出版
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,互联网出版
 DocType: Production Planning Tool,Production Orders,生产订单
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +35,Balance Value,余额值
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,销售价格表
@@ -823,7 +789,7 @@
 DocType: Supplier,Default Payable Accounts,默认应付账户(多个)
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,雇员{0}非活动或不存在
 DocType: Features Setup,Item Barcode,品目条码
-apps/erpnext/erpnext/stock/doctype/item/item.py +487,Item Variants {0} updated,品目变种{0}已更新
+apps/erpnext/erpnext/stock/doctype/item/item.py +491,Item Variants {0} updated,品目变种{0}已更新
 DocType: Quality Inspection Reading,Reading 6,6阅读
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,购买发票提前
 DocType: Address,Shop,商店
@@ -832,7 +798,7 @@
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,选择此模式时POS发票的银行/现金账户将会被自动更新。
 DocType: Employee,Permanent Address Is,永久地址
 DocType: Production Order Operation,Operation completed for how many finished goods?,操作完成多少成品？
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +491,The Brand,你的品牌
+apps/erpnext/erpnext/public/js/setup_wizard.js +237,The Brand,你的品牌
 apps/erpnext/erpnext/controllers/status_updater.py +163,Allowance for over-{0} crossed for Item {1}.,品目{1}已经超过允许的超额{0}。
 DocType: Employee,Exit Interview Details,退出面试细节
 DocType: Item,Is Purchase Item,是否采购品目
@@ -852,16 +818,16 @@
 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,将付款金额=未偿还
 DocType: Contact Us Settings,Address Line 1,地址行1
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Variance,方差
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +392,Company Name,公司名称
+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 +515,Select Item for Transfer,对于转让项目选择
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +538,Select Item for Transfer,对于转让项目选择
 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.,请选择支票存入的银行账户头。
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,允许用户编辑交易中的价目表率。
 DocType: Pricing Rule,Max Qty,最大数量
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +106,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,行{0}：付款方式对销售/采购订单应始终被标记为提前
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +16,Chemical,化学品
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,化学品
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +693,All items have already been transferred for this Production Order.,所有品目都已经转移到这个生产订单。
 DocType: Process Payroll,Select Payroll Year and Month,选择薪资年和月
 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""",转到相应的组（通常资金运用&gt;流动资产&gt;银行帐户，并创建一个新帐户（通过点击添加类型的儿童），“银行”
@@ -872,12 +838,12 @@
 DocType: Item,Inspection Criteria,检验标准
 apps/erpnext/erpnext/config/accounts.py +101,Tree of finanial Cost Centers.,树finanial成本中心。
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,转移
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +492,Upload your letter head and logo. (you can edit them later).,上传你的信头和logo。(您可以在以后对其进行编辑）。
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +156,White,白
+apps/erpnext/erpnext/public/js/setup_wizard.js +238,Upload your letter head and logo. (you can edit them later).,上传你的信头和logo。(您可以在以后对其进行编辑）。
+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/setup/page/setup_wizard/setup_wizard.js +362,Attach Your Picture,附上你的照片
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Make ,使
+apps/erpnext/erpnext/public/js/setup_wizard.js +112,Attach Your Picture,附上你的照片
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +540,Make ,使
 DocType: Journal Entry,Total Amount in Words,总金额词
 DocType: Workflow State,Stop,停止
 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。
@@ -886,14 +852,13 @@
 DocType: Lead,Next Contact Date,下次联络日期
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,开放数量
 DocType: Holiday List,Holiday List Name,假期列表名称
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +168,Stock Options,股票期权
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +168,Stock Options,股票期权
 DocType: Journal Entry Account,Expense Claim,报销
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +181,Qty for {0},{0}数量
 DocType: Leave Application,Leave Application,假期申请
 apps/erpnext/erpnext/config/hr.py +77,Leave Allocation Tool,假期调配工具
 DocType: Leave Block List,Leave Block List Dates,禁离日列表日期
 DocType: Company,If Monthly Budget Exceeded (for expense account),如果每月超出预算（用于报销）
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +56,Trimming,修剪
 DocType: Workstation,Net Hour Rate,净小时价格
 DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,到岸成本采购收据
 DocType: Company,Default Terms,默认条款
@@ -901,10 +866,9 @@
 DocType: POS Profile,Cash/Bank Account,现金/银行账户
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,Removed items with no change in quantity or value.,删除的项目在数量或价值没有变化。
 DocType: Delivery Note,Delivery To,交货对象
-apps/erpnext/erpnext/stock/doctype/item/item.py +509,Attribute table is mandatory,属性表是强制性的
+apps/erpnext/erpnext/stock/doctype/item/item.py +513,Attribute table is mandatory,属性表是强制性的
 DocType: Production Planning Tool,Get Sales Orders,获取销售订单
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0}不能为负
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +103,Filing,备案
 apps/erpnext/erpnext/templates/form_grid/item_grid.html +72,Discount,折扣
 DocType: Features Setup,Purchase Discounts,购买折扣
 DocType: Workstation,Wages,薪金
@@ -921,6 +885,7 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +112,You are the Expense Approver for this record. Please Update the 'Status' and Save,你是本记录的费用审批人，请更新‘状态’字段并保存。
 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 +136,"Attributes for Item Variants. e.g Size, Color etc.",品目变体的属性。如大小，颜色等。
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +39,WIP Warehouse,在制品仓库
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +194,Serial No {0} is under maintenance contract upto {1},序列号{0}截至至{1}之前在年度保养合同内。
@@ -929,7 +894,7 @@
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,销售费用
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Buying,标准采购
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +120,Standard Buying,标准采购
 DocType: GL Entry,Against,针对
 DocType: Item,Default Selling Cost Center,默认销售成本中心
 DocType: Sales Partner,Implementation Partner,实施合作伙伴
@@ -950,29 +915,29 @@
 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/setup/page/setup_wizard/setup_wizard.js +588,List a few of your suppliers. They could be organizations or individuals.,列出一些你的供应商，他们可以是组织或个人。
+apps/erpnext/erpnext/public/js/setup_wizard.js +326,List a few of your suppliers. They could be organizations or individuals.,列出一些你的供应商，他们可以是组织或个人。
 DocType: Company,Default Currency,默认货币
 DocType: Contact,Enter designation of this Contact,输入联系人的职务
 DocType: Contact Us Settings,Address,地址
 DocType: Expense Claim,From Employee,来自员工
-apps/erpnext/erpnext/controllers/accounts_controller.py +338,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,警告： 因为{1}中的物件{0}为零，系统将不会检查超额
+apps/erpnext/erpnext/controllers/accounts_controller.py +339,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,警告： 因为{1}中的物件{0}为零，系统将不会检查超额
 DocType: Journal Entry,Make Difference Entry,创建差异分录
 DocType: Upload Attendance,Attendance From Date,考勤起始日期
 DocType: Appraisal Template Goal,Key Performance Area,关键绩效区
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +54,Transportation,运输
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +54,Transportation,运输
 apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +67, and year: ,和年份：
 DocType: Email Digest,Annual Expense,年费用
 DocType: SMS Center,Total Characters,总字符
-apps/erpnext/erpnext/controllers/buying_controller.py +139,Please select BOM in BOM field for Item {0},请BOM字段中选择BOM的项目{0}
+apps/erpnext/erpnext/controllers/buying_controller.py +130,Please select BOM in BOM field for Item {0},请BOM字段中选择BOM的项目{0}
 DocType: C-Form Invoice Detail,C-Form Invoice Detail,C-形式发票详细信息
 DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,付款发票对账
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +32,Contribution %,贡献％
 DocType: Item,website page link,网站页面链接
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +192,Let's prepare the system for first use.,让我们为首次使用准备一下。
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +242,Let's prepare the system for first use.,让我们为首次使用准备一下。
 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 +214,Production Order {0} must be cancelled before cancelling this Sales Order,生产订单{0}必须取消这个销售订单之前被取消
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +209,Production Order {0} must be cancelled before cancelling this Sales Order,生产订单{0}必须取消这个销售订单之前被取消
 ,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.,选择时间记录然后提交来创建一个新的销售发票。
@@ -992,14 +957,13 @@
 DocType: Sales Invoice Advance,Sales Invoice Advance,销售发票预付款
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +398,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/page/setup_wizard/install_fixtures.py +75,Management,管理人员
+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/setup/page/setup_wizard/fixtures/operations.py +14,Investment casting,熔模铸造
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +51,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.,保存工资单后会显示净支付金额(大写)。
 apps/frappe/frappe/core/doctype/user/user_list.js +12,Active,活动
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +154,Blue,蓝色
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +154,Blue,蓝色
 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,只能在“组”节点下新建节点
@@ -1009,18 +973,16 @@
 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/setup/page/setup_wizard/fixtures/operations.py +156,Laminated object manufacturing,分层实体制造
 apps/erpnext/erpnext/config/buying.py +13,Supplier database.,供应商数据库。
 DocType: Account,Balance Sheet,资产负债表
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +561,Cost Center For Item with Item Code ',成本中心：品目代码‘
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +45,Stretch forming,拉伸成型
 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 +210,"Further accounts can be made under Groups, but entries can be made against non-Groups",进一步帐户可以根据组进行，但条目可针对非组进行
 apps/erpnext/erpnext/config/hr.py +125,Tax and other salary deductions.,税项及其他扣款。
 DocType: Lead,Lead,线索
 DocType: Email Digest,Payables,应付账款
 DocType: Account,Warehouse,仓库
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +90,Row #{0}: Rejected Qty can not be entered in Purchase Return,行＃{0}：驳回采购退货数量不能进入
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +93,Row #{0}: Rejected Qty can not be entered in Purchase Return,行＃{0}：驳回采购退货数量不能进入
 ,Purchase Order Items To Be Billed,采购订单的项目被标榜
 DocType: Purchase Invoice Item,Net Rate,净费率
 DocType: Purchase Invoice Item,Purchase Invoice Item,采购发票项目
@@ -1035,13 +997,13 @@
 DocType: Global Defaults,Current Fiscal Year,当前财年
 DocType: Global Defaults,Disable Rounded Total,禁用总计化整
 DocType: Lead,Call,通话
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +384,'Entries' cannot be empty,“分录”不能为空
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +386,'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 +205,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/page/setup_wizard/install_fixtures.py +138,Research,研究
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +138,Research,研究
 DocType: Maintenance Visit Purpose,Work Done,已完成工作
 apps/erpnext/erpnext/controllers/item_variant.py +25,Please specify at least one attribute in the Attributes table,请指定属性表中的至少一个属性
 DocType: Contact,User ID,用户ID
@@ -1049,10 +1011,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +57,View Ledger,查看总帐
 DocType: File,Lft,Lft
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,最早
-apps/erpnext/erpnext/stock/doctype/item/item.py +394,"An Item Group exists with same name, please change the item name or rename the item group",同名品目群组已存在，请修改品目名或群组名
+apps/erpnext/erpnext/stock/doctype/item/item.py +398,"An Item Group exists with same name, please change the item name or rename the item group",同名品目群组已存在，请修改品目名或群组名
 DocType: Communication,Delivery Status,交货状态
 DocType: Production Order,Manufacture against Sales Order,按销售订单生产
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +517,Rest Of The World,世界其他地区
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +455,Rest Of The World,世界其他地区
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,物件{0}不能有批次
 ,Budget Variance Report,预算差异报告
 DocType: Salary Slip,Gross Pay,工资总额
@@ -1063,13 +1025,11 @@
 DocType: BOM Item,Item Description,品目说明
 DocType: Payment Tool,Payment Mode,付款方式
 DocType: Purchase Invoice,Is Recurring,是否周期性
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +154,Direct metal laser sintering,直接金属激光烧结
 DocType: Purchase Order,Supplied Items,供应的品目
 DocType: Production Order,Qty To Manufacture,生产数量
 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,临时开通
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +41,Cryorolling,Cryorolling
 ,Employee Leave Balance,雇员假期余量
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +128,Balance for Account {0} must always be {1},账户{0}的余额必须总是{1}
 DocType: Address,Address Type,地址类型
@@ -1085,23 +1045,23 @@
 DocType: Journal Entry,Get Outstanding Invoices,获取未清发票
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,销售订单{0}无效
 apps/erpnext/erpnext/setup/doctype/company/company.py +172,"Sorry, companies cannot be merged",抱歉，公司不能合并
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +145,Small,小
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Small,小
 DocType: Employee,Employee Number,雇员编号
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},箱号已被使用，请尝试从{0}开始
 ,Invoiced Amount (Exculsive Tax),已开票金额（未含税）
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,项目2
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +59,Account head {0} created,账户头{0}已创建
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +153,Green,绿
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Green,绿
 DocType: Item,Auto re-order,自动重新排序
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +57,Total Achieved,总体上实现
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +59,Total Achieved,总体上实现
 DocType: Employee,Place of Issue,签发地点
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +59,Contract,合同
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Contract,合同
 DocType: Report,Disabled,已禁用
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +490,UOM coversion factor required for UOM: {0} in Item: {1},物件{1}的计量单位{0}需要单位换算系数
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +83,Indirect Expenses,间接支出
 apps/erpnext/erpnext/controllers/selling_controller.py +163,Row {0}: Qty is mandatory,行{0}：数量是强制性的
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +8,Agriculture,农业
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +611,Your Products or Services,您的产品或服务
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,农业
+apps/erpnext/erpnext/public/js/setup_wizard.js +347,Your Products or Services,您的产品或服务
 DocType: Mode of Payment,Mode of Payment,付款方式
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,请先输入项目
 DocType: Journal Entry Account,Purchase Order,采购订单
@@ -1113,7 +1073,7 @@
 DocType: Serial No,Serial No Details,序列号详情
 DocType: Purchase Invoice Item,Item Tax Rate,品目税率
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +113,"For {0}, only credit accounts can be linked against another debit entry",对于{0}，贷方分录只能选择贷方账户
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Delivery Note {0} is not submitted,送货单{0}未提交
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +470,Delivery Note {0} is not submitted,送货单{0}未提交
 apps/erpnext/erpnext/stock/get_item_details.py +136,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.",定价规则是第一选择是基于“应用在”字段，可以是项目，项目组或品牌。
@@ -1123,7 +1083,7 @@
 DocType: Appraisal Goal,Goal,目标
 DocType: Sales Invoice Item,Edit Description,编辑说明
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +318,Expected Delivery Date is lesser than Planned Start Date.,预计交付日期比计划开始日期较小。
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +579,For Supplier,对供应商
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +602,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,即将离任的总
@@ -1149,10 +1109,10 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +74,"Total {0} for all items is zero, may you should change 'Distribute Charges Based On'",共有{0}所有项目为零，可能你应该改变“基于分布式费”
 DocType: Purchase Invoice,Taxes and Charges Calculation,税费计算
 DocType: BOM Operation,Workstation,工作站
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +112,Hardware,硬件
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +112,Hardware,硬件
 DocType: Attendance,HR Manager,人力资源经理
 apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,请选择一个公司
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +50,Privilege Leave,特权休假
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +50,Privilege Leave,特权休假
 DocType: Purchase Invoice,Supplier Invoice Date,供应商发票日期
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +79,You need to enable Shopping Cart,您需要启用购物车
 apps/frappe/frappe/public/js/frappe/form/grid_body.html +6,No Data,无数据
@@ -1165,7 +1125,7 @@
 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 +168,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/setup/page/setup_wizard/install_fixtures.py +38,Food,食品
+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 +139,You can make a time log only against a submitted production order,您只能对已提交的生产订单进行时间日志记录
 DocType: Maintenance Schedule Item,No of Visits,访问数量
@@ -1185,6 +1145,7 @@
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,View Offer Letter,查看录取通知书
 DocType: Communication,Communication,通讯
 DocType: Item,Is Service Item,是否服务品目
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +81,Application period cannot be outside leave allocation period,申请期间不能请假外分配周期
 DocType: Activity Cost,Projects,项目
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +31,Please select Fiscal Year,请选择会计年度
 apps/erpnext/erpnext/controllers/buying_controller.py +23,From {0} | {1} {2},来自{0} | {1} {2}
@@ -1203,7 +1164,7 @@
 DocType: Item,Maintain Stock,维持股票
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +213,Stock Entries already created for Production Order ,生产订单已创建Stock条目
 DocType: Leave Control Panel,Leave blank if considered for all designations,如果针对所有 职位请留空
-apps/erpnext/erpnext/controllers/accounts_controller.py +499,Charge of type 'Actual' in row {0} cannot be included in Item Rate,行{0}中的收取类型“实际”不能有“品目税率”
+apps/erpnext/erpnext/controllers/accounts_controller.py +500,Charge of type 'Actual' in row {0} cannot be included in Item Rate,行{0}中的收取类型“实际”不能有“品目税率”
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,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,对公司
@@ -1213,7 +1174,7 @@
 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 +471,cannot be greater than 100,不能大于100
-apps/erpnext/erpnext/stock/doctype/item/item.py +546,Item {0} is not a stock Item,品目{0}不是库存品目
+apps/erpnext/erpnext/stock/doctype/item/item.py +550,Item {0} is not a stock Item,品目{0}不是库存品目
 DocType: Maintenance Visit,Unscheduled,计划外
 DocType: Employee,Owned,资
 DocType: Salary Slip Deduction,Depends on Leave Without Pay,依赖于无薪休假
@@ -1227,30 +1188,28 @@
 DocType: HR Settings,Employee Settings,雇员设置
 ,Batch-Wise Balance History,批次余额历史
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +72,To Do List,待办事项列表
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +63,Apprentice,学徒
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Apprentice,学徒
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +99,Negative Quantity is not allowed,负数量是不允许的
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
 Used for Taxes and Charges",从物件大师取得税项详细信息表，嵌入在此字段内。用作税金和费用。
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +61,Lancing,采血
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +151,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 +435,Accounting Entry for {0}: {1} can only be made in currency: {2},会计分录为{0}：{1}只能在货币做：{2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +436,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 +38,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 +112,Tax Rule for transactions.,税收规则进行的交易。
 DocType: Rename Tool,Type of document to rename.,的文件类型进行重命名。
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +630,We buy this Item,我们购买这些物件
+apps/erpnext/erpnext/public/js/setup_wizard.js +366,We buy this Item,我们购买这些物件
 DocType: Address,Billing,账单
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +77,Flanging,翻边
 DocType: Bulk Email,Not Sent,未发送
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +73,Explosive forming,爆炸成形
 DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),总税费和费用（公司货币）
 DocType: Shipping Rule,Shipping Account,送货账户
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +43,Scheduled to send to {0} recipients,计划发送到{0}个收件人
 DocType: Quality Inspection,Readings,阅读
 DocType: Stock Entry,Total Additional Costs,总额外费用
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Sub Assemblies,半成品
+apps/erpnext/erpnext/public/js/setup_wizard.js +359,Sub Assemblies,半成品
 DocType: Shipping Rule Condition,To Value,To值
 DocType: Supplier,Stock Manager,库存管理
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +143,Source warehouse is mandatory for row {0},行{0}中源仓库为必须项
@@ -1260,44 +1219,42 @@
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,导入失败！
 apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,未添加地址。
 DocType: Workstation Working Hour,Workstation Working Hour,工作站工作时间
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +83,Analyst,分析员
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +202,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},行{0}：分配量{1}必须小于或等于合资量{2}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Analyst,分析员
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +149,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},行{0}：分配量{1}必须小于或等于合资量{2}
 DocType: Item,Inventory,库存
 DocType: Features Setup,"To enable ""Point of Sale"" view",为了让观“销售点”
 apps/erpnext/erpnext/public/js/pos/pos.js +402,Payment cannot be made for empty cart,付款方式不能为空购物车制造
 DocType: Item,Sales Details,销售详情
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +149,Pinning,钢钉
 DocType: Opportunity,With Items,随着项目
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,在数量
 DocType: Notification Control,Expense Claim Rejected,报销拒绝
 DocType: Sales Invoice,"The date on which next invoice will be generated. It is generated on submit.
 ",在这接下来的发票将生成的日期。它在提交生成。
 DocType: Item Attribute,Item Attribute,品目属性
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +105,Government,政府
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Government,政府
 apps/erpnext/erpnext/config/stock.py +268,Item Variants,项目变体
 DocType: Company,Services,服务
 apps/erpnext/erpnext/accounts/report/financial_statements.py +147,Total ({0}),总计（{0}）
 DocType: Cost Center,Parent Cost Center,父成本中心
 DocType: Sales Invoice,Source,源
 DocType: Leave Type,Is Leave Without Pay,是无薪休假
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +186,No records found in the Payment table,没有在支付表中找到记录
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +405,Financial Year Start Date,财政年度开始日期
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +133,No records found in the Payment table,没有在支付表中找到记录
+apps/erpnext/erpnext/public/js/setup_wizard.js +153,Financial Year Start Date,财政年度开始日期
 DocType: Employee External Work History,Total Experience,总经验
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +100,Countersinking,扩孔
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +271,Packing Slip(s) cancelled,装箱单（ S）取消
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +276,Packing Slip(s) cancelled,装箱单（ S）取消
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,货运及转运费
 DocType: Material Request Item,Sales Order No,销售订单编号
 DocType: Item Group,Item Group Name,品目群组名称
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +50,Taken,已经过
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,已经过
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +66,Transfer Materials for Manufacture,转移制造材料
 DocType: Pricing Rule,For Price List,对价格表
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +27,Executive Search,猎头
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,猎头
 apps/erpnext/erpnext/stock/stock_ledger.py +405,"Purchase rate for item: {0} not found, which is required to book accounting entry (expense). Please mention item price against a buying price list.",购买率的项目：{0}没有找到，这是需要预订会计分录（费用）。请注明项目价格对买入价格表。
 DocType: Maintenance Schedule,Schedules,计划任务
 DocType: Purchase Invoice Item,Net Amount,净额
 DocType: Purchase Order Item Supplied,BOM Detail No,BOM详情编号
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),额外的优惠金额（公司货币）
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +537,Error: {0} > {1},错误： {0} > {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +541,Error: {0} > {1},错误： {0} > {1}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,请从科目表创建新帐户。
 DocType: Maintenance Visit,Maintenance Visit,维护访问
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer > Customer Group > Territory,客户>客户群组>地区
@@ -1308,7 +1265,6 @@
 DocType: Event,Tuesday,星期二
 DocType: Leave Block List,Block Holidays on important days.,禁止重要日子的假期。
 ,Accounts Receivable Summary,应收账款汇总
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +43,Leaves for type {0} already allocated for Employee {1} for period {2} - {3},叶为已分配给员工{1}的期间类型{0} {2}  -  {3}
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +187,Please set User ID field in an Employee record to set Employee Role,请在员工记录设置员工角色设置用户ID字段
 DocType: UOM,UOM Name,计量单位名称
 DocType: Top Bar Item,Target,目标
@@ -1316,19 +1272,18 @@
 DocType: Sales 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 +120,Brand master.,品牌大师
+apps/erpnext/erpnext/config/stock.py +120,Brand master.,主要品牌
 DocType: ToDo,Due Date,到期日
 DocType: Sales Invoice Item,Brand Name,品牌名称
 DocType: Purchase Receipt,Transporter Details,转运详细
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Box,箱
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +389,The Organization,本组织设置
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Box,箱
+apps/erpnext/erpnext/public/js/setup_wizard.js +137,The Organization,本组织设置
 DocType: Monthly Distribution,Monthly Distribution,月度分布
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,接收器列表为空。请创建接收器列表
 DocType: Production Plan Sales Order,Production Plan Sales Order,生产计划销售订单
 DocType: Sales Partner,Sales Partner Target,销售合作伙伴目标
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},会计分录为{0}只能在货币进行：{1}
 DocType: Pricing Rule,Pricing Rule,定价规则
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +58,Notching,开槽
 apps/erpnext/erpnext/config/learn.py +167,Material Request to Purchase Order,材料要求采购订单
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +74,Row # {0}: Returned Item {1} does not exists in {2} {3},行＃{0}：返回的项目{1}不存在{2} {3}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,银行账户
@@ -1345,20 +1300,19 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Amounts not reflected in bank,银行无记录的数额
 DocType: Quality Inspection Reading,Reading 4,4阅读
 apps/erpnext/erpnext/config/hr.py +23,Claims for company expense.,公司开支报销
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +8,Centrifugal casting,离心铸造
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +119,Magnetic field-assisted finishing,磁场辅助整理
 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,联系人手机号码
 DocType: Production Planning Tool,Select Sales Orders,选择销售订单
 ,Material Requests for which Supplier Quotations are not created,无供应商报价的物料申请
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +117,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/buying/doctype/purchase_order/purchase_order.js +477,Mark as Delivered,标记为交付
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +497,Mark as Delivered,标记为交付
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +34,Make Quotation,请报价
 DocType: Dependent Task,Dependent Task,相关任务
-apps/erpnext/erpnext/stock/doctype/item/item.py +306,Conversion factor for default Unit of Measure must be 1 in row {0},行{0}中默认计量单位的转换系数必须是1
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,Leave of type {0} cannot be longer than {1},类型为{0}的假期不能长于{1}天
+apps/erpnext/erpnext/stock/doctype/item/item.py +310,Conversion factor for default Unit of Measure must be 1 in row {0},行{0}中默认计量单位的转换系数必须是1
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +155,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,接收器列表
@@ -1366,15 +1320,14 @@
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,消耗量
 apps/erpnext/erpnext/public/js/pos/pos.js +491,{0} View,{0}查看
 DocType: Salary Structure Deduction,Salary Structure Deduction,薪酬结构扣款
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +158,Selective laser sintering,选择性激光烧结
-apps/erpnext/erpnext/stock/doctype/item/item.py +301,Unit of Measure {0} has been entered more than once in Conversion Factor Table,计量单位{0}已经在换算系数表内
+apps/erpnext/erpnext/stock/doctype/item/item.py +305,Unit of Measure {0} has been entered more than once in Conversion Factor Table,计量单位{0}已经在换算系数表内
 apps/frappe/frappe/core/page/data_import_tool/data_import_tool.js +108,Import Successful!,导入成功！
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,已发料品目成本
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +185,Quantity must not be more than {0},数量不能超过{0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +41,Age (Days),时间（天）
 DocType: Quotation Item,Quotation Item,报价品目
 DocType: Account,Account Name,帐户名称
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +41,From Date cannot be greater than To Date,起始日期不能大于结束日期
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +34,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.,主要的供应商类型。
 DocType: Purchase Order Item,Supplier Part Number,供应商零件编号
@@ -1383,14 +1336,14 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +247,{0} {1} is cancelled or stopped,{0} {1}被取消或停止
 DocType: Accounts Settings,Credit Controller,信用控制人
 DocType: Delivery Note,Vehicle Dispatch Date,车辆调度日期
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +197,Purchase Receipt {0} is not submitted,外购入库单{0}未提交
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +198,Purchase Receipt {0} is not submitted,外购入库单{0}未提交
 DocType: Company,Default Payable Account,默认应付账户
 apps/erpnext/erpnext/config/website.py +13,"Settings for online shopping cart such as shipping rules, price list etc.",网上购物车，如配送规则，价格表等的设置
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +660,Setup Complete,安装完成
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +124,Setup Complete,安装完成
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +65,{0}% Billed,{0}％帐单
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +17,Reserved Qty,保留数量
 DocType: Party Account,Party Account,党的帐户
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +74,Human Resources,人力资源
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +74,Human Resources,人力资源
 DocType: Lead,Upper Income,高收入
 DocType: Journal Entry Account,Debit in Company Currency,借记卡在公司货币
 apps/erpnext/erpnext/support/doctype/issue/issue.py +58,My Issues,我的问题
@@ -1399,11 +1352,9 @@
 DocType: Company,Default Values,默认值
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +236,Row {0}: Payment amount can not be negative,行{0}：付款金额不能为负
 DocType: Expense Claim,Total Amount Reimbursed,报销金额合计
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +152,Press fitting,按拟合
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +64,Against Supplier Invoice {0} dated {1},对日期为{1}的供应商发票{0}
 DocType: Customer,Default Price List,默认价格表
 DocType: Payment Reconciliation,Payments,付款
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +24,Hot isostatic pressing,热等静压
 DocType: ToDo,Medium,中
 DocType: Budget Detail,Budget Allocated,已分配预算
 DocType: Journal Entry,Entry Type,条目类型
@@ -1416,9 +1367,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +56,None of the items have any change in quantity or value.,没有一个项目无论在数量或价值的任何变化。
 DocType: Warranty Claim,Warranty Claim,保修申请
 ,Lead Details,线索详情
-DocType: Authorization Rule,Approving User,审批用户
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +37,Forging,锻造
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +126,Plating,电镀
 DocType: Purchase Invoice,End date of current invoice's period,当前发票周期的结束日期
 DocType: Pricing Rule,Applicable For,适用于
 DocType: Bank Reconciliation,From Date,起始日期
@@ -1440,31 +1388,29 @@
 DocType: Sales Invoice,Paid Amount (Company Currency),支付的金额（公司货币）
 DocType: Purchase Invoice,Additional Discount,更多优惠
 DocType: Selling Settings,Selling Settings,销售设置
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +39,Online Auctions,网上拍卖
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,网上拍卖
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +94,Please specify either Quantity or Valuation Rate or both,请注明无论是数量或估价率或两者
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +50,"Company, Month and Fiscal Year is mandatory",公司，月度和财年是必须项
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Marketing Expenses,市场营销开支
 ,Item Shortage Report,品目短缺报告
-apps/erpnext/erpnext/stock/doctype/item/item.js +183,"Weight is mentioned,\nPlease mention ""Weight UOM"" too",重量被提及，\n请注明“重量计量单位”
+apps/erpnext/erpnext/stock/doctype/item/item.js +185,"Weight is mentioned,\nPlease mention ""Weight UOM"" too",重量被提及，\n请注明“重量计量单位”
 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 +212,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 +384,Warehouse required at Row No {0},在行无需仓库{0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +386,Warehouse required at Row No {0},在行无需仓库{0}
 DocType: Employee,Date Of Retirement,退休日期
 DocType: Upload Attendance,Get Template,获取模板
 DocType: Address,Postal,邮政
 DocType: Item,Weightage,权重
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +159,Mining,矿业
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +17,Resin casting,树脂浇注
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,同名的客户组已经存在，请更改客户姓名或重命名该客户组
 apps/erpnext/erpnext/public/js/pos/pos.js +147,Please select {0} first.,请选择{0}第一。
 apps/erpnext/erpnext/templates/pages/order.html +57,text {0},文字{0}
 DocType: Territory,Parent Territory,家长领地
 DocType: Quality Inspection Reading,Reading 2,阅读2
 DocType: Stock Entry,Material Receipt,物料收据
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +622,Products,产品展示
+apps/erpnext/erpnext/public/js/setup_wizard.js +358,Products,产品展示
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +47,Party Type and Party is required for Receivable / Payable account {0},党的类型和党的需要应收/应付帐户{0}
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.",如果此项目已变种，那么它不能在销售订单等选择
 DocType: Lead,Next Contact By,下次联络人
@@ -1474,13 +1420,13 @@
 DocType: Purchase Invoice,Notification Email Address,通知邮件地址
 DocType: Payment Tool,Find Invoices to Match,查找发票到匹配
 ,Item-wise Sales Register,品目特定的销售记录
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +399,"e.g. ""XYZ National Bank""",例如“XYZ国家银行“
+apps/erpnext/erpnext/public/js/setup_wizard.js +147,"e.g. ""XYZ National Bank""",例如“XYZ国家银行“
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,此税项是否包含在基本价格中？
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +57,Total Target,总目标
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Target,总目标
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.js +22,Shopping Cart is enabled,购物车启用
 DocType: Job Applicant,Applicant for a Job,求职申请
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +173,No Production Orders created,暂无生产订单
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +131,Salary Slip of employee {0} already created for this month,雇员的本月工资单{0}已经创建过
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +140,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.,太多的列。导出报表，并使用电子表格应用程序进行打印。
 DocType: Sales Invoice Item,Batch No,批号
@@ -1490,14 +1436,14 @@
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +13,Variant,变体
 apps/frappe/frappe/public/js/frappe/form/toolbar.js +165,New {0},新建{0}
 DocType: Naming Series,Set prefix for numbering series on your transactions,为交易设置编号系列的前缀
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +169,Stopped order cannot be cancelled. Unstop to cancel.,已停止的订单无法取消，请先点击“重新开始”
-apps/erpnext/erpnext/stock/doctype/item/item.py +323,Default BOM ({0}) must be active for this item or its template,默认BOM（{0}）必须是活动的这个项目或者其模板
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +164,Stopped order cannot be cancelled. Unstop to cancel.,已停止的订单无法取消，请先点击“重新开始”
+apps/erpnext/erpnext/stock/doctype/item/item.py +327,Default BOM ({0}) must be active for this item or its template,默认BOM（{0}）必须是活动的这个项目或者其模板
 DocType: Employee,Leave Encashed?,假期已使用？
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,从机会是必选项
 DocType: Item,Variants,变种
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +458,Make Purchase Order,创建采购订单
 DocType: SMS Center,Send To,发送到
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +111,There is not enough leave balance for Leave Type {0},假期类型{0}的余额不足了
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +127,There is not enough leave balance for Leave Type {0},假期类型{0}的余额不足了
 DocType: Sales Team,Contribution to Net Total,贡献净总计
 DocType: Sales Invoice Item,Customer's Item Code,客户的品目编号
 DocType: Stock Reconciliation,Stock Reconciliation,库存盘点
@@ -1534,11 +1480,11 @@
 DocType: Sales Order Item,Actual Qty,实际数量
 DocType: Sales Invoice Item,References,参考
 DocType: Quality Inspection Reading,Reading 10,阅读10
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +612,"List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start.",列出您采购或销售的产品或服务。请确认品目群组，计量单位或其他属性。
+apps/erpnext/erpnext/public/js/setup_wizard.js +348,"List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start.",列出您采购或销售的产品或服务。请确认品目群组，计量单位或其他属性。
 DocType: Hub Settings,Hub Node,Hub节点
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,您输入了重复的条目。请纠正然后重试。
 apps/erpnext/erpnext/controllers/item_variant.py +65,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values,值{0}的属性{1}不在有效的项目列表存在属性值
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +87,Associate,协理
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Associate,协理
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +46,Item {0} is not a serialized Item,品目{0}不是一个序列品目
 DocType: SMS Center,Create Receiver List,创建接收人列表
 apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +5,Expired,已过期
@@ -1547,7 +1493,7 @@
 DocType: Warranty Claim,Issue Date,问题日期
 DocType: Activity Cost,Activity Cost,活动费用
 DocType: Purchase Receipt Item Supplied,Consumed Qty,已消耗数量
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +52,Telecommunications,电信
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +52,Telecommunications,电信
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),表示该打包是这个交付的一部分（仅草稿）
 DocType: Payment Tool,Make Payment Entry,创建付款分录
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +119,Quantity for Item {0} must be less than {1},品目{0}的数量必须小于{1}
@@ -1564,10 +1510,8 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +37,"Selling must be checked, if Applicable For is selected as {0}",如果“适用于”的值为{0}，则必须选择“销售”
 DocType: Purchase Order Item,Supplier Quotation Item,供应商报价品目
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +27,Make Salary Structure,创建薪酬结构
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +54,Shearing,剪毛
 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.,单击“创建销售发票”按钮来创建一个新的销售发票。
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +166,Packaging and labeling,包装和标签
 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,请在公司主及全球默认指定默认货币
@@ -1578,19 +1522,18 @@
 DocType: Budget Detail,Fiscal Year,财政年度
 DocType: Cost Center,Budget,预算
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +41,"Budget cannot be assigned against {0}, as it's not an Income or Expense account",财政预算案不能对{0}指定的，因为它不是一个收入或支出帐户
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Achieved,已实现
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,已实现
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +65,Territory / Customer,区域/客户
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,e.g. 5,例如5
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +207,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},行{0}：已分配量{1}必须小于或等于发票余额{2}
+apps/erpnext/erpnext/public/js/setup_wizard.js +294,e.g. 5,例如5
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},行{0}：已分配量{1}必须小于或等于发票余额{2}
 DocType: Sales Invoice,In Words will be visible once you save the Sales Invoice.,大写金额将在销售发票保存后显示。
 DocType: Item,Is Sales Item,是否销售品目
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,品目群组树
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,品目{0}没有设置序列号，请进入品目大师中修改
 DocType: Maintenance Visit,Maintenance Time,维护时间
 ,Amount to Deliver,量交付
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +620,A Product or Service,产品或服务
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +158,There were errors.,有错误发生
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +101,Tapping,窃听
+apps/erpnext/erpnext/public/js/setup_wizard.js +356,A Product or Service,产品或服务
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +146,There were errors.,有错误发生
 DocType: Naming Series,Current Value,当前值
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +171,{0} created,{0}已创建
 DocType: Delivery Note Item,Against Sales Order,对销售订单
@@ -1605,7 +1548,7 @@
 apps/erpnext/erpnext/accounts/party.py +275,Due Date cannot be before Posting Date,到期日不能前于过账日期
 DocType: Website Item Group,Website Item Group,网站物件组
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Duties and Taxes,关税与税项
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Please enter Reference date,参考日期请输入
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +312,Please enter Reference date,参考日期请输入
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0}付款项不能由{1}过滤
 DocType: Item Website Specification,Table for Item that will be shown in Web Site,将在网站显示的物件表
 DocType: Purchase Order Item Supplied,Supplied Qty,附送数量
@@ -1613,7 +1556,7 @@
 apps/erpnext/erpnext/config/stock.py +103,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,品目特定的采购历史
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +152,Red,红
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Red,红
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +228,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},请点击“生成表”来获取序列号增加了对项目{0}
 DocType: Account,Frozen,冻结的
 ,Open Production Orders,清生产订单
@@ -1628,7 +1571,7 @@
 DocType: Item Attribute,Attribute Name,属性名称
 apps/erpnext/erpnext/controllers/selling_controller.py +236,Item {0} must be Sales or Service Item in {1},{1}中的品目{0}必须是销售或服务品目
 DocType: Item Group,Show In Website,在网站上显示
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +621,Group,组
+apps/erpnext/erpnext/public/js/setup_wizard.js +357,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",在下列文件送货单，机遇，材料要求，项目，采购订单，采购凭证，买方收货，报价单，销售发票，产品捆绑，销售订单，序列号跟踪名牌
@@ -1638,6 +1581,7 @@
 DocType: Features Setup,Brands,品牌
 DocType: C-Form Invoice Detail,Invoice No,发票号码
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +480,From Purchase Order,来自采购订单
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +92,"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,辞职信日期
@@ -1645,37 +1589,33 @@
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +137,Not Set,未设置
 DocType: Communication,Date,日期
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,重复客户收入
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +651,Sit tight while your system is being setup. This may take a few moments.,系统正在安装设置，请稍后。这可能需要一段时间。
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +115,Sit tight while your system is being setup. This may take a few moments.,系统正在安装设置，请稍后。这可能需要一段时间。
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +51,{0} ({1}) must have role 'Expense Approver',{0} {1}必须有“费用审批人”的角色
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Pair,对
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Pair,对
 DocType: Bank Reconciliation Detail,Against Account,针对科目
 DocType: Maintenance Schedule Detail,Actual Date,实际日期
 DocType: Item,Has Batch No,有批号
 DocType: Delivery Note,Excise Page Number,Excise页码
 DocType: Employee,Personal Details,个人资料
 ,Maintenance Schedules,维护计划
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +44,Embossing,压花
 ,Quotation Trends,报价趋势
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +139,Item Group not mentioned in item master for item {0},品目{0}的品目群组没有设置
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +302,Debit To account must be a Receivable account,入借帐户必须是应收账科目
-apps/erpnext/erpnext/stock/doctype/item/item.py +310,"As Production Order can be made for this item, it must be a stock item.",此品目必须是库存品目，因为它可以生成生产订单
 DocType: Shipping Rule Condition,Shipping Amount,发货数量
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +140,Joining,加盟
-DocType: Authorization Rule,Above Value,上述值
 ,Pending Amount,待审核金额
 DocType: Purchase Invoice Item,Conversion Factor,转换系数
 DocType: Purchase Order,Delivered,已交付
 apps/erpnext/erpnext/config/hr.py +160,Setup incoming server for jobs email id. (e.g. jobs@example.com),设置接收简历的电子邮件地址 。 （例如jobs@example.com ）
 DocType: Purchase Receipt,Vehicle Number,车号
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,经常性发票终止日期
+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,应收帐款
 ,Supplier-Wise Sales Analytics,供应商特定的销售分析
 DocType: Address Template,This format is used if country specific format is not found,此格式用于如果找不到特定国家的格式
 DocType: Custom Field,Custom,习俗
 DocType: Production Order,Use Multi-Level BOM,采用多级物料清单
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +26,Injection molding,注塑
 DocType: Bank Reconciliation,Include Reconciled Entries,包括核销分录
-apps/erpnext/erpnext/config/accounts.py +41,Tree of finanial accounts.,树finanial帐户。
+apps/erpnext/erpnext/config/accounts.py +41,Tree of finanial accounts.,会计科目树
 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 +312,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,因为账项{1}是一个资产条目，所以科目{0}的类型必须为“固定资产”
@@ -1683,30 +1623,28 @@
 apps/frappe/frappe/config/setup.py +130,Printing,印花
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +114,Expense Claim is pending approval. Only the Expense Approver can update status.,报销正在等待批准。只有开支审批人才能更改其状态。
 DocType: Purchase Invoice,Additional Discount Amount,额外的折扣金额
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +99,The day(s) on which you are applying for leave are holiday. You need not apply for leave.,你要申请的假期位于假日内，无需请假。
 apps/frappe/frappe/public/js/frappe/misc/utils.js +110,and,和
 DocType: Leave Block List Allow,Leave Block List Allow,例外用户
 apps/erpnext/erpnext/setup/doctype/company/company.py +236,Abbr can not be blank or space,缩写不能为空或空格
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +50,Sports,体育
+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/setup/page/setup_wizard/setup_wizard.js +626,Unit,单位
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Unit,单位
 apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.py +182,Please set Dropbox access keys in your site config,请在您的网站配置设置Dropbox的访问键
 apps/erpnext/erpnext/stock/get_item_details.py +113,Please specify Company,请注明公司
 ,Customer Acquisition and Loyalty,客户获得和忠诚度
 DocType: Purchase Receipt,Warehouse where you are maintaining stock of rejected items,维护拒收物件的仓库
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +408,Your financial year ends on,您的会计年度结束于
+apps/erpnext/erpnext/public/js/setup_wizard.js +156,Your financial year ends on,您的会计年度结束于
 DocType: POS Profile,Price List,价格表
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +20,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,默认财政年度已经更新为{0}。请刷新您的浏览器以使更改生效。
 apps/erpnext/erpnext/projects/doctype/project/project.js +47,Expense Claims,报销
 DocType: Issue,Support,支持
-DocType: Authorization Rule,Approving Role,审批者角色
 ,BOM Search,BOM搜索
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +176,Closing (Opening + Totals),截止（开标+总计）
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +26,Please specify currency in Company,请公司指定的货币
 DocType: Workstation,Wages per hour,时薪
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},批次{0}中，仓库{3}中品目{2}的库存余额将变为{1}
 apps/erpnext/erpnext/config/setup.py +83,"Show / Hide features like Serial Nos, POS etc.",显示或隐藏如序列号，POS等特性。
-apps/erpnext/erpnext/controllers/accounts_controller.py +236,Account {0} is invalid. Account Currency must be {1},帐户{0}是无效的。帐户货币必须是{1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +237,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}计量单位换算系数是必须项
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +53,Clearance date cannot be before check date in row {0},行{0}中清拆日期不能在支票日期前
 DocType: Salary Slip,Deduction,扣款
@@ -1725,13 +1663,13 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +82,Item {0} has already been returned,品目{0}已被退回
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,**财年**表示财政年度。所有的会计分录和其他重大交易将根据**财年**跟踪。
 DocType: Opportunity,Customer / Lead Address,客户/潜在客户地址
+apps/erpnext/erpnext/stock/doctype/item/item.py +112,Warning: Invalid SSL certificate on attachment {0},警告：附件无效的SSL证书{0}
 DocType: Production Order Operation,Actual Operation Time,实际操作时间
 DocType: Authorization Rule,Applicable To (User),适用于(用户)
 DocType: Purchase Taxes and Charges,Deduct,扣款
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +170,Job Description,职位描述
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +170,Job Description,职位描述
 DocType: Purchase Order Item,Qty as per Stock UOM,按库存计量单位数量
 apps/frappe/frappe/model/rename_doc.py +343,Please select a valid csv file with data,请选择与数据的有效csv文件
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +92,Coating,涂层
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +126,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","命名序列中不能输入特殊符号，""-""，""#""，"".""和""/""除外"
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.",追踪销售活动。追踪来自活动的潜在客户，报价，销售订单等，统计投资回报率。
 DocType: Expense Claim,Approver,审批者
@@ -1741,12 +1679,11 @@
 DocType: Supplier Quotation,Manufacturing Manager,生产经理
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +191,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/hooks.py +84,Shipments,发货
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +29,Dip molding,浸成型
+apps/erpnext/erpnext/hooks.py +68,Shipments,发货
 DocType: Purchase Order,To be delivered to customer,要传送给客户
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,时间日志状态必须被提交。
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,序列号{0}不属于任何仓库
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +650,Setting Up,正在设置
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +114,Setting Up,正在设置
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,Row # ,行＃
 DocType: Purchase Invoice,In Words (Company Currency),大写金额（公司货币）
 DocType: Pricing Rule,Supplier,供应商
@@ -1754,7 +1691,7 @@
 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 +166,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,品目{0}必须指定开支/差异账户。
-apps/erpnext/erpnext/controllers/accounts_controller.py +354,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings",不能为行{1}的{0}开具超过{2}的超额账单。要允许超额账单请更改仓储设置。
+apps/erpnext/erpnext/controllers/accounts_controller.py +355,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings",不能为行{1}的{0}开具超过{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 +135,User {0} is disabled,用户{0}已禁用
@@ -1767,27 +1704,26 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,{0} is mandatory for Item {1},品目{1}必须有{0}
 DocType: Currency Exchange,From Currency,源货币
 DocType: DocField,Name,名称
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +211,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row",请ATLEAST一行选择分配金额，发票类型和发票号码
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +104,Sales Order required for Item {0},销售订单为品目{0}的必须项
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +158,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row",请ATLEAST一行选择分配金额，发票类型和发票号码
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +107,Sales Order required for Item {0},销售订单为品目{0}的必须项
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +43,Amounts not reflected in system,系统无记录的数额
 DocType: Purchase Invoice Item,Rate (Company Currency),率（公司货币）
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +40,Others,他人
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +40,Others,他人
 apps/erpnext/erpnext/templates/includes/product_page.js +80,Cannot find a matching Item. Please select some other value for {0}.,无法找到匹配的项目。请选择其他值{0}。
 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/frappe/frappe/core/doctype/doctype/boilerplate/controller_list.html +31,Completed,已完成
 DocType: Web Form,Select DocType,选择文档类型
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +104,Broaching,拉床
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +12,Banking,银行业
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,银行业
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +38,Please click on 'Generate Schedule' to get schedule,请在“生成表”点击获取时间表
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +283,New Cost Center,新建成本中心
 DocType: Bin,Ordered Quantity,订购数量
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +397,"e.g. ""Build tools for builders""",例如“建筑工人的建筑工具！”
+apps/erpnext/erpnext/public/js/setup_wizard.js +145,"e.g. ""Build tools for builders""",例如“建筑工人的建筑工具！”
 DocType: Quality Inspection,In Process,进行中
 DocType: Authorization Rule,Itemwise Discount,品目特定的折扣
 DocType: Purchase Order Item,Reference Document Type,参考文档类型
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +318,{0} against Sales Order {1},{0}不允许销售订单{1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +320,{0} against Sales Order {1},{0}不允许销售订单{1}
 DocType: Account,Fixed Asset,固定资产
 apps/erpnext/erpnext/config/stock.py +283,Serialized Inventory,序列化库存
 DocType: Activity Type,Default Billing Rate,默认计费率
@@ -1802,14 +1738,13 @@
 DocType: Purchase Invoice Item,Page Break,分页符
 DocType: Production Order Operation,Pending,有待
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,可以为特定用户批准假期的用户
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +33,You cannot change default UOM of Variant. To change default UOM for Variant change default UOM of the Template,你不能改变变异的默认计量单位。要更改默认的计量单位为模板的变种改变默认的计量单位
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +50,Office Equipments,办公设备
 DocType: Purchase Invoice Item,Qty,数量
 DocType: Fiscal Year,Companies,企业
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +24,Electronics,电子
+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/support/doctype/maintenance_visit/maintenance_visit.js +18,From Maintenance Schedule,来自保养计划
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +56,Full-time,全职
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +56,Full-time,全职
 DocType: Purchase Invoice,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.",如果您已经创建了销售税和费模板标准模板，选择一个，然后点击下面的按钮。
@@ -1821,11 +1756,12 @@
 DocType: Job Applicant,Job Opening,职务空缺
 DocType: Payment Reconciliation,Payment Reconciliation,付款对账
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +154,Please select Incharge Person's name,请选择Incharge人的名字
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +51,Technology,技术
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,技术
 DocType: Offer Letter,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,总开票金额
 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.",要添加子节点，探索树，然后单击要在其中添加更多节点的节点上。
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +102,Credit To account must be a Payable account,入贷科目必须是一个“应付”科目
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +233,BOM recursion: {0} cannot be parent or child of {2},BOM {0}不能是{2}的上级或下级
@@ -1838,10 +1774,8 @@
 DocType: Item,Customer Item Codes,客户项目代码
 DocType: Opportunity,Lost Reason,丧失原因
 apps/erpnext/erpnext/config/accounts.py +68,Create Payment Entries against Orders or Invoices.,创建订单或发票的支付分录。
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +141,Welding,焊接
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +40,New Stock UOM is required,新库存计量单位是必须项
 DocType: Quality Inspection,Sample Size,样本大小
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +443,All items have already been invoiced,所有品目已开具发票
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +446,All items have already been invoiced,所有品目已开具发票
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',请指定一个有效的“从案号”
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +287,Further cost centers can be made under Groups but entries can be made against non-Groups,进一步的成本中心可以根据组进行，但项可以对非组进行
 DocType: Project,External,外部
@@ -1853,8 +1787,7 @@
 DocType: Bin,Actual Quantity,实际数量
 DocType: Shipping Rule,example: Next Day Shipping,例如：次日发货
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,序列号{0}未找到
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +563,Your Customers,您的客户
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +27,Compression molding,压缩成型
+apps/erpnext/erpnext/public/js/setup_wizard.js +303,Your Customers,您的客户
 DocType: Leave Block List Date,Block Date,禁离日期
 DocType: Sales Order,Not Delivered,未交付
 ,Bank Clearance Summary,银行结算摘要
@@ -1875,10 +1808,10 @@
 DocType: SMS Log,Sent To,发给
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +28,Make Sales Invoice,创建销售发票
 DocType: Company,For Reference Only.,仅供参考。
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +29,Invalid {0}: {1},无效的{0}：{1}
+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,容量规划
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +49,'From Date' is required,“起始日期”是必需的
+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,新建工作地点
@@ -1893,7 +1826,7 @@
 DocType: Serial No,Delivery Time,交货时间
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,账龄基于
 DocType: Item,End of Life,寿命结束
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +41,Travel,旅游
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +41,Travel,旅游
 DocType: Leave Block List,Allow Users,允许用户(多个)
 DocType: Purchase Order,Customer Mobile No,客户手机号码
 DocType: Sales Invoice,Recurring,经常性
@@ -1907,7 +1840,7 @@
 DocType: Naming Series,User must always select,用户必须始终选择
 DocType: Stock Settings,Allow Negative Stock,允许负库存
 DocType: Installation Note,Installation Note,安装注意事项
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +541,Add Taxes,添加税款
+apps/erpnext/erpnext/public/js/setup_wizard.js +283,Add Taxes,添加税款
 ,Financial Analytics,财务分析
 DocType: Quality Inspection,Verified By,认证机构
 DocType: Address,Subsidiary,子机构
@@ -1917,7 +1850,6 @@
 DocType: System Settings,In Hours,以小时为单位
 DocType: Process Payroll,Create Salary Slip,建立工资单
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Expected balance as per bank,银行预期结余
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +115,Buffing,抛光
 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,雇员
@@ -1934,11 +1866,11 @@
 DocType: Rename Tool,File to Rename,文件重命名
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +176,Purchse Order number required for Item {0},要求项目Purchse订单号{0}
 apps/erpnext/erpnext/public/js/controllers/transaction.js +136,Show Payments,显示支付
-apps/erpnext/erpnext/controllers/buying_controller.py +245,Specified BOM {0} does not exist for Item {1},品目{1}指定的BOM{0}不存在
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +202,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,取消此销售订单前必须取消维护计划{0}
+apps/erpnext/erpnext/controllers/buying_controller.py +236,Specified BOM {0} does not exist for Item {1},品目{1}指定的BOM{0}不存在
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,取消此销售订单前必须取消维护计划{0}
 apps/frappe/frappe/desk/page/backups/backups.html +13,Size,尺寸
 DocType: Notification Control,Expense Claim Approved,报销批准
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +113,Pharmaceutical,医药
+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,销售订单为必须项
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +30,Create Customer,创建客户
@@ -1948,7 +1880,6 @@
 DocType: Quality Inspection Reading,Reading 9,9阅读
 DocType: Supplier,Is Frozen,被冻结
 DocType: Buying Settings,Buying Settings,采购设置
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +122,Mass finishing,质量精加工
 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),设置接收销售信息的电子邮件地址 。 （例如sales@example.com ）
@@ -1956,7 +1887,7 @@
 DocType: Payment Tool,Payment Account,付款帐号
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +713,Please specify Company to proceed,请注明公司进行
 apps/frappe/frappe/public/js/frappe/model/indicator.js +30,Draft,草稿
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +46,Compensatory Off,补假
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Compensatory Off,补假
 DocType: Quality Inspection Reading,Accepted,已接受
 DocType: User,Female,女
 DocType: Journal Entry Account,Debit in Account Currency,借记卡账户中的货币
@@ -1968,7 +1899,7 @@
 DocType: Shipping Rule,Shipping Rule Label,配送规则标签
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +209,Raw Materials cannot be blank.,原材料不能为空。
 DocType: Newsletter,Test,测试
-apps/erpnext/erpnext/stock/doctype/item/item.py +364,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +368,"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'",由于有存量交易为这个项目，\你不能改变的值&#39;有序列号&#39;，&#39;有批号&#39;，&#39;是股票项目“和”评估方法“
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +448,Quick Journal Entry,快速日记帐分录
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +92,You can not change rate if BOM mentioned agianst any item,如果任何条目中引用了BOM，你不能更改其税率
@@ -1979,13 +1910,14 @@
 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.,独立的生产订单将每个成品项目被创建。
 DocType: Purchase Invoice,Terms and Conditions1,条款和条件1
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +18,Complete Setup,完成安装
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard_page.html +18,Complete Setup,完成安装
 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,9 。考虑税收或支出：在本部分中，您可以指定，如果税务/充电仅适用于估值（总共不一部分） ，或只为总（不增加价值的项目） ，或两者兼有。
 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),要对编号禁止分数，请勾选此项。
 apps/erpnext/erpnext/config/crm.py +96,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 +57,Total Absent,共缺席
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +746,Item or Warehouse for row {0} does not match Material Request,行{0}中的品目或仓库与物料申请不符合
@@ -2010,16 +1942,15 @@
 DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),基础利率（按库存计量单位）
 DocType: SMS Log,No of Requested SMS,请求短信数量
 DocType: Campaign,Campaign-.####,活动-.####
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +55,Piercing,冲孔
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,下一步
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +117,Contract End Date must be greater than Date of Joining,合同结束日期必须大于加入的日期
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,授权销售公司产品的第三方分销商/经销商/授权代理商/分支机构/转销商
 DocType: Customer Group,Has Child Node,有子节点
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{0} against Purchase Order {1},{0}不允许采购订单{1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +332,{0} against Purchase Order {1},{0}不允许采购订单{1}
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","请输入静态的URL参数(例如 sender=ERPNext, username=ERPNext, password=1234 etc.)"
 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/page/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
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +110,Photochemical machining,光化学加工
 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.
 
 #### Note
@@ -2057,7 +1988,7 @@
 DocType: Purchase Receipt Item,Recd Quantity,RECD数量
 DocType: Email Account,Email Ids,电子邮件ID
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},不能生产超过销售订单数量{1}的品目{0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +471,Stock Entry {0} is not submitted,股票输入{0}不提交
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +473,Stock Entry {0} is not submitted,股票输入{0}不提交
 DocType: Payment Reconciliation,Bank / Cash Account,银行/现金账户
 DocType: Tax Rule,Billing City,结算城市
 DocType: Global Defaults,Hide Currency Symbol,隐藏货币符号
@@ -2073,7 +2004,7 @@
 DocType: Purchase Invoice,Currency and Price List,货币和价格表
 DocType: Opportunity,Customer / Lead Name,客户/潜在客户名称
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +63,Clearance Date not mentioned,清拆日期未提及
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +71,Production,生产
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Production,生产
 DocType: Item,Allow Production Order,允许生产订单
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +60,Row {0}:Start Date must be before End Date,行{0} ：开始日期必须是之前结束日期
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),总计（数量）
@@ -2086,7 +2017,7 @@
 apps/erpnext/erpnext/utilities/doctype/address/address.py +113,My Addresses,我的地址
 DocType: Stock Ledger Entry,Outgoing Rate,传出率
 apps/erpnext/erpnext/config/hr.py +100,Organization branch master.,组织分支主。
-apps/erpnext/erpnext/controllers/accounts_controller.py +237, or ,或
+apps/erpnext/erpnext/controllers/accounts_controller.py +238, 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以上
@@ -2113,6 +2044,7 @@
 DocType: Stock Entry Detail,Serial No / Batch,序列号/批次
 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 +213,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',维护计划没有为所有品目生成，请点击“生产计划”
 ,To Produce,以生产
 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}也必须包括
@@ -2120,10 +2052,7 @@
 DocType: Bin,Reserved Quantity,保留数量
 DocType: Landed Cost Voucher,Purchase Receipt Items,采购入库项目
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,自定义表单
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +62,Cutting,切割
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +69,Flattening,压扁
 DocType: Account,Income Account,收益账户
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +22,Molding,模
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +632,Delivery,交货
 DocType: Stock Reconciliation Item,Current Qty,目前数量
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",参见成本部分的“材料价格基于”
@@ -2133,20 +2062,19 @@
 apps/frappe/frappe/desk/moduleview.py +61,Documents,文档
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +17,Ref,参考
 DocType: Cost Center,Cost Center,成本中心
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.js +48,Voucher #,凭证 #
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +36,Voucher #,凭证 #
 DocType: Notification Control,Purchase Order Message,采购订单的消息
 DocType: Tax Rule,Shipping Country,航运国家
 DocType: Upload Attendance,Upload HTML,上传HTML
-apps/erpnext/erpnext/controllers/accounts_controller.py +391,"Total advance ({0}) against Order {1} cannot be greater \
+apps/erpnext/erpnext/controllers/accounts_controller.py +392,"Total advance ({0}) against Order {1} cannot be greater \
 				than the Grand Total ({2})","预付款总额（{0}）反对令{1}不能大于\
 比总计（{2}）"
 DocType: Employee,Relieving Date,解除日期
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +12,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.",定价规则是由覆盖价格表/定义折扣百分比，基于某些条件。
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,仓库只能通过仓储记录/送货单/采购收据来修改
 DocType: Employee Education,Class / Percentage,类/百分比
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +92,Head of Marketing and Sales,营销和销售主管
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +31,Income Tax,所得税
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +157,Laser engineered net shaping,激光直接成型
+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.,轨道信息通过行业类型。
 DocType: Item Supplier,Item Supplier,品目供应商
@@ -2169,31 +2097,28 @@
 DocType: Stock Ledger Entry,Actual Qty After Transaction,事务后实际数量
 ,Pending SO Items For Purchase Request,待处理的SO项目对于采购申请
 DocType: Supplier,Billing Currency,结算货币
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +148,Extra Large,特大号
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,Extra Large,特大号
 ,Profit and Loss Statement,损益表
 DocType: Bank Reconciliation Detail,Cheque Number,支票号码
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +43,Pressing,压制
 DocType: Payment Tool Detail,Payment Tool Detail,支付工具的详细信息
 ,Sales Browser,销售列表
 DocType: Journal Entry,Total Credit,总积分
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +474,Warning: Another {0} # {1} exists against stock entry {2},警告：另一个{0}＃{1}存在对股票入门{2}
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +459,Local,当地
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +476,Warning: Another {0} # {1} exists against stock entry {2},警告：另一个{0}＃{1}存在对股票入门{2}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +397,Local,当地
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),贷款及垫款（资产）
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,债务人
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +147,Large,大
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +23,No employee found!,未找到任何雇员！
+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 +152,Please mention no of visits required,请注明无需访问
 DocType: Purchase Order,Customer Address Display,客户地址显示
 DocType: Stock Settings,Default Valuation Method,默认估值方法
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +127,Polishing,抛光
 DocType: Production Order Operation,Planned Start Time,计划开始时间
 apps/erpnext/erpnext/config/accounts.py +63,Close Balance Sheet and book Profit or Loss.,关闭资产负债表，打开损益表。
-apps/erpnext/erpnext/stock/doctype/item/item.py +661,"Default Unit of Measure for Item {0} cannot be changed directly because \
+apps/erpnext/erpnext/stock/doctype/item/item.py +665,"Default Unit of Measure for Item {0} cannot be changed directly because \
 			you have already made some transaction(s) with another UOM. To change default UOM, \
 			use 'UOM Replace Utility' tool under Stock module.",测度项目的默认单位{0}不能直接改变，因为\你已经做了一些交易（S）与其他计量单位。要更改默认的计量单位，\使用“计量单位更换工具”下的股票模块工具。
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,指定货币兑换的汇率
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +146,Quotation {0} is cancelled,报价{0}已被取消
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +141,Quotation {0} is cancelled,报价{0}已被取消
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,未偿还总额
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} was on leave on {1}. Cannot mark attendance.,雇员{0}在{1}日休假，不能标记考勤。
 DocType: Sales Partner,Targets,目标
@@ -2204,7 +2129,6 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +158,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,电脑
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +112,Electro-chemical grinding,电化学磨
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +14,This is a root customer group and cannot be edited.,ERPNext是一个开源的基于Web的ERP系统通过网络注技术私人有限公司向提供集成的工具，在一个小的组织管理大多数进程。有关Web注释，或购买托管楝更多信息，请访问
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +39,Please setup your chart of accounts before you start Accounting Entries,请设置您的会计科目表你开始会计分录前
 DocType: Purchase Invoice,Ignore Pricing Rule,忽略定价规则
@@ -2250,7 +2174,6 @@
 DocType: Maintenance Visit,Purposes,用途
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +103,Atleast one item should be entered with negative quantity in return document,ATLEAST一个项目应该负数量回报文档中输入
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +67,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations",操作{0}比任何可用的工作时间更长工作站{1}，分解成运行多个操作
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +134,Electrochemical machining,电化学加工
 ,Requested,要求
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +66,No Remarks,暂无说明
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +13,Overdue,过期的
@@ -2259,7 +2182,7 @@
 DocType: Monthly Distribution,Distribution Name,分配名称
 DocType: Features Setup,Sales and Purchase,销售及采购
 DocType: Supplier Quotation Item,Material Request No,物料申请编号
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +218,Quality Inspection required for Item {0},品目{0}要求质量检验
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +221,Quality Inspection required for Item {0},品目{0}要求质量检验
 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),净利率（公司货币）
@@ -2277,9 +2200,8 @@
 apps/erpnext/erpnext/accounts/report/financial_statements.py +16,Fiscal Year {0} not found.,财年{0}未找到。
 DocType: Bank Reconciliation,Get Relevant Entries,获取相关条目
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +407,Accounting Entry for Stock,库存的会计分录
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +64,Coining,铸币
 DocType: Sales Invoice,Sales Team1,销售团队1
-apps/erpnext/erpnext/stock/doctype/item/item.py +412,Item {0} does not exist,品目{0}不存在
+apps/erpnext/erpnext/stock/doctype/item/item.py +416,Item {0} does not exist,品目{0}不存在
 DocType: Sales Invoice,Customer Address,客户地址
 apps/frappe/frappe/desk/query_report.py +136,Total,总
 DocType: Purchase Invoice,Apply Additional Discount On,收取额外折扣
@@ -2291,14 +2213,13 @@
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),税额后，优惠金额（公司货币）
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +149,Target warehouse is mandatory for row {0},行{0}必须指定目标仓库
 DocType: Quality Inspection,Quality Inspection,质量检验
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +144,Extra Small,超小
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +20,Spray forming,喷射成形
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Extra Small,超小
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +458,Warning: Material Requested Qty is less than Minimum Order Qty,警告：物料请求的数量低于最低起订量
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +191,Account {0} is frozen,科目{0}已冻结
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,属于本机构的，带独立科目表的法人/附属机构。
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +29,"Food, Beverage & Tobacco",食品，饮料与烟草
+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 +529,Can only make payment against unbilled {0},只能使支付对未付款的{0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +531,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/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Minimum Inventory Level,最低库存水平
 DocType: Stock Entry,Subcontract,外包
@@ -2309,19 +2230,18 @@
 DocType: Item,Manufacturer Part Number,制造商零件编号
 DocType: Production Order Operation,Estimated Time and Cost,预计时间和成本
 DocType: Bin,Bin,仓位
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +50,Nosing,减噪
 DocType: SMS Log,No of Sent SMS,发送短信数量
 DocType: Account,Company,公司
 DocType: Account,Expense Account,开支帐户
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +49,Software,软件
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +151,Colour,颜色
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +49,Software,软件
+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",请选择项，其中“正股项”是“否”和“是销售物品”是“是”，没有其他产品捆绑
 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 +281,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 +134,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 +145,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,重命名日志
@@ -2331,7 +2251,7 @@
 apps/erpnext/erpnext/controllers/recurring_document.py +162,Please select {0},请选择{0}
 DocType: C-Form,C-Form No,C-表编号
 DocType: BOM,Exploded_items,展开品目
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +95,Researcher,研究员
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Researcher,研究员
 apps/frappe/frappe/custom/doctype/customize_form/customize_form.js +88,Update,更新
 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 +23,Name or Email is mandatory,姓名或电子邮件是强制性
@@ -2340,11 +2260,10 @@
 DocType: Employee,Exit,退出
 apps/erpnext/erpnext/accounts/doctype/account/account.py +134,Root Type is mandatory,根类型是强制性的
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +295,Serial No {0} created,序列号{0}已创建
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +125,Vibratory finishing,震荡整理
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes",为方便客户，这些代码可以在打印格式(如发票和送货单)中使用
 DocType: Employee,You can enter any date manually,您可以手动输入日期
 DocType: Sales Invoice,Advertisement,广告
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +165,Probationary Period,试用期
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Probationary Period,试用期
 DocType: Customer Group,Only leaf nodes are allowed in transaction,只有叶节点中允许交易
 DocType: Expense Claim,Expense Approver,开支审批人
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,采购入库项目提供
@@ -2352,19 +2271,16 @@
 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/setup/page/setup_wizard/fixtures/operations.py +137,Grinding,磨碎
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +34,Shrink wrapping,收缩包装
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +36,Pending Activities,待活动
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,Confirmed,确认
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier > Supplier Type,供应商 > 供应商类型
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +127,Please enter relieving date.,请输入解除日期。
 apps/erpnext/erpnext/controllers/trends.py +137,Amt,金额
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' can be submitted,只留下带有状态的应用“已批准” ，可以提交
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +51,Only Leave Applications with status 'Approved' can be submitted,只留下带有状态的应用“已批准” ，可以提交
 apps/erpnext/erpnext/utilities/doctype/address/address.py +21,Address Title is mandatory.,地址标题是必须项。
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,如果询价的来源是活动的话请输入活动名称。
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +38,Newspaper Publishers,报纸出版商
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +38,Newspaper Publishers,报纸出版商
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,选择财政年度
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +88,Smelting,熔炼
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,重新排序级别
 DocType: Attendance,Attendance Date,考勤日期
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,基于收入和扣款的工资明细。
@@ -2379,16 +2295,15 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +414,[Error],[错误]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,大写金额将在销售订单保存后显示。
 ,Employee Birthday,雇员生日
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +55,Venture Capital,创业投资
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,创业投资
 DocType: UOM,Must be Whole Number,必须是整数
 DocType: Leave Control Panel,New Leaves Allocated (In Days),新调配的假期(天数)
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +51,Serial No {0} does not exist,序列号{0}不存在
 DocType: Pricing Rule,Discount Percentage,折扣百分比
 DocType: Payment Reconciliation Invoice,Invoice Number,发票号码
-apps/erpnext/erpnext/hooks.py +70,Orders,订单
+apps/erpnext/erpnext/hooks.py +54,Orders,订单
 DocType: Leave Control Panel,Employee Type,雇员类型
 DocType: Employee Leave Approver,Leave Approver,假期审批人
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +70,Swaging,模锻
 DocType: Manufacturing Settings,Material Transferred for Manufacture,材料移送制造
 DocType: Expense Claim,"A user with ""Expense Approver"" role",有“费用审批人”角色的用户
 ,Issued Items Against Production Order,生产订单已发料的品目
@@ -2400,7 +2315,6 @@
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +62,Cost Center with existing transactions can not be converted to group,有交易的成本中心不能转化为组
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Depreciation,折旧
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),供应商
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +29,Invalid period,无效的时期
 DocType: Customer,Credit Limit,信用额度
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,选择交易类型
 DocType: GL Entry,Voucher No,凭证编号
@@ -2410,9 +2324,9 @@
 DocType: Customer,Address and Contact,地址和联系方式
 DocType: Customer,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}
 apps/erpnext/erpnext/accounts/party.py +284,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),注意：到期日/计入日已超过客户信用日期{0}天。
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +621,Maint. Schedule,维护手册。计划
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +108,Abrasive jet machining,磨料喷射加工
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +632,Maint. Schedule,维护手册。计划
 DocType: Stock Settings,Freeze Stock Entries,冻结仓储记录
 DocType: Website Settings,Website Settings,网站设置
 DocType: Item,Reorder level based on Warehouse,根据仓库订货点水平
@@ -2429,7 +2343,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +75,Show Stock Entries,显示库存记录
 ,Is Primary Address,是主地址
 DocType: Production Order,Work-in-Progress Warehouse,在制品仓库
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +308,Reference #{0} dated {1},参考＃ {0}于{1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Reference #{0} dated {1},参考＃ {0}于{1}
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +13,Manage Addresses,管理地址
 DocType: Pricing Rule,Item Code,品目编号
 DocType: Production Planning Tool,Create Production Orders,创建生产订单
@@ -2438,7 +2352,7 @@
 DocType: Lead,Market Segment,市场分类
 DocType: Communication,Phone,电话
 DocType: Employee Internal Work History,Employee Internal Work History,雇员内部就职经历
-apps/erpnext/erpnext/public/js/account_tree_grid.js +50,Closing (Dr),结算(借记)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +221,Closing (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.,销售业务的税务模板。
@@ -2454,8 +2368,8 @@
 ,Billed Amount,已开票金额
 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 +129,Material Request {0} is cancelled or stopped,物料申请{0}已取消或已停止
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +641,Add a few sample records,添加了一些样本记录
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +133,Material Request {0} is cancelled or stopped,物料申请{0}已取消或已停止
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Add a few sample records,添加了一些样本记录
 apps/erpnext/erpnext/config/hr.py +210,Leave Management,离开管理
 DocType: Event,Groups,组
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,基于账户分组
@@ -2468,38 +2382,34 @@
 DocType: Features Setup,Sales Extras,销售额外选项
 apps/erpnext/erpnext/accounts/utils.py +344,{0} budget for Account {1} against Cost Center {2} will exceed by {3},{0} 成本中心{2}账户{1}的预算将超过{3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +236,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry",差异帐户必须是资产/负债类型的帐户，因为此股票和解是一个进入开幕
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +138,Purchase Order number required for Item {0},所需物品的采购订单号{0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Order number required for Item {0},所需物品的采购订单号{0}
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',“起始日期”必须早于'终止日期'
 ,Stock Projected Qty,预计库存量
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +147,Customer {0} does not belong to project {1},客户{0}不属于项目{1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +150,Customer {0} does not belong to project {1},客户{0}不属于项目{1}
 DocType: Sales Order,Customer's Purchase Order,客户采购订单
 DocType: Warranty Claim,From Company,源公司
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,价值或数量
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Minute,分钟
+apps/erpnext/erpnext/public/js/setup_wizard.js +363,Minute,分钟
 DocType: Purchase Invoice,Purchase Taxes and Charges,购置税和费
 ,Qty to Receive,接收数量
 DocType: Leave Block List,Leave Block List Allowed,禁离日例外用户
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +61,Conversion factor cannot be in fractions,转换系数不能是分数
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +358,You will use it to Login,你将使用它来进行登录
+apps/erpnext/erpnext/public/js/setup_wizard.js +108,You will use it to Login,你将使用它来进行登录
 DocType: Sales Partner,Retailer,零售商
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +99,Credit To account must be a Balance Sheet account,信用帐户必须是资产负债表科目
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,所有供应商类型
 apps/erpnext/erpnext/stock/doctype/item/item.py +37,Item Code is mandatory because Item is not automatically numbered,品目编号是必须项，因为品目没有自动编号
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +99,Quotation {0} not of type {1},报价{0} 不属于{1}类型
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +93,Quotation {0} not of type {1},报价{0} 不属于{1}类型
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,维护计划品目
 DocType: Sales Order,%  Delivered,％已交付
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,Bank Overdraft Account,银行透支账户
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +15,Make Salary Slip,创建工资单
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +18,Browse BOM,浏览BOM
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +175,Secured Loans,抵押贷款
-apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +3,Awesome Products,优质产品
+apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +3,Awesome Products,优质产品
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +189,Opening Balance Equity,期初余额权益
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +80,Cannot approve leave as you are not authorized to approve leaves on Block Dates,无法批准，你没有在禁离日批准假期的权限
 DocType: Appraisal,Appraisal,评估
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +13,Lost-foam casting,失模铸造
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +47,Drawing,图纸
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +22,Date is repeated,日期重复
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +148,Leave approver must be one of {0},假期审批人有{0}的角色
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +162,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,开始时间
@@ -2513,7 +2423,7 @@
 DocType: Purchase Invoice Item,Net Amount (Company Currency),净金额（公司货币）
 DocType: BOM Operation,Hour Rate,时薪
 DocType: Stock Settings,Item Naming By,品目命名方式
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +642,From Quotation,来自报价
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +655,From Quotation,来自报价
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},在{1}之后另一个年终结束分录{0}已经被录入
 DocType: Production Order,Material Transferred for Manufacturing,材料移送制造
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +29,Account {0} does not exists,科目{0}不存在
@@ -2527,21 +2437,19 @@
 DocType: Purchase Invoice Item,PR Detail,PR详细
 DocType: Sales Order,Fully Billed,完全开票
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +20,Cash In Hand,现款
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +72,Delivery warehouse required for stock item {0},需要的库存项目交割仓库{0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +119,Delivery warehouse required for stock item {0},需要的库存项目交割仓库{0}
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),包的总重量，通常是净重+包装材料的重量。 （用于打印）
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,拥有此角色的用户可以设置冻结账户和创建/修改冻结账户的会计分录
 DocType: Serial No,Is Cancelled,是否注销
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +281,My Shipments,我的出货量
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +286,My Shipments,我的出货量
 DocType: Journal Entry,Bill Date,账单日期
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +43,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:",有多个最高优先级定价规则时使用以下的内部优先级：
 DocType: Supplier,Supplier Details,供应商详情
 DocType: Communication,Recipients,受助人
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +146,Screwing,拧
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +96,Knurling,滚花
 DocType: Expense Claim,Approval Status,审批状态
 DocType: Hub Settings,Publish Items to Hub,发布项目到集线器
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +44,From value must be less than to value in row {0},行{0}的起始值必须更小
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +133,Wire Transfer,电汇
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +133,Wire Transfer,电汇
 apps/erpnext/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py +25,Please select Bank Account,请选择银行帐户
 DocType: Newsletter,Create and Send Newsletters,创建和发送新闻邮件
 apps/frappe/frappe/public/js/frappe/views/reports/grid_report.js +305,From Date must be before To Date,起始日期日期必须在结束日期之前
@@ -2549,14 +2457,14 @@
 DocType: Company,Default Income Account,默认收益账户
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,客户群组/客户
 DocType: Item Group,Check this if you want to show in website,要显示在网站上，请勾选此项。
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +190,Welcome to ERPNext,欢迎使用ERPNext
+,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/page/setup_wizard/install_fixtures.py +37,Calls,电话
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Calls,电话
 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 +193,Purchase Order {0} is not submitted,采购订单{0}未提交
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +194,Purchase Order {0} is not submitted,采购订单{0}未提交
 ,Projected,预计
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},序列号{0}不属于仓库{1}
 apps/erpnext/erpnext/controllers/status_updater.py +136,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,注意：系统将不会为品目{0}检查超额发货或超额预订，因为其数量或金额为0
@@ -2564,7 +2472,6 @@
 DocType: Issue,Opening Date,开幕日期
 DocType: Journal Entry,Remark,备注
 DocType: Purchase Receipt Item,Rate and Amount,率及金额
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +95,Boring,无聊
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +667,From Sales Order,来自销售订单
 DocType: Blog Category,Parent Website Route,父网站路线
 DocType: Sales Order,Not Billed,未开票
@@ -2578,19 +2485,17 @@
 apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount Amount,折扣金额
 DocType: Purchase Invoice,Return Against Purchase Invoice,回到对采购发票
 DocType: Item,Warranty Period (in days),保修期限（天数）
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +550,e.g. VAT,例如增值税
+apps/erpnext/erpnext/public/js/setup_wizard.js +292,e.g. VAT,例如增值税
 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,报价系列
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +52,"An item exists with same name ({0}), please change the item group name or rename the item",具有名称 {0} 的品目已存在，请更名
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +82,Hot metal gas forming,铁水形成气
 DocType: Sales Order Item,Sales Order Date,销售订单日期
 DocType: Sales Invoice Item,Delivered Qty,已交付数量
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +63,Warehouse {0}: Company is mandatory,仓库{0}必须指定公司
 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.",转到相应的组（通常基金&gt;流动负债&gt;税和关税的来源，并创建一个新帐户（通过点击输入“税”添加儿童），做提税率。
 ,Payment Period Based On Invoice Date,已经提交。
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +50,Missing Currency Exchange Rates for {0},{0}没有货币汇率
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +135,Laser cutting,激光切割
 DocType: Event,Monday,星期一
 DocType: Journal Entry,Stock Entry,库存记录
 DocType: Account,Payable,支付
@@ -2623,7 +2528,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +111,Date Of Retirement must be greater than Date of Joining,退休日期必须大于入职日期
 DocType: Sales Invoice,Against Income Account,对收益账目
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +69,{0}% Delivered,{0}％交付
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +78,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,项目{0}：有序数量{1}不能低于最低订货量{2}（项中定义）。
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,项目{0}：有序数量{1}不能低于最低订货量{2}（项中定义）。
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,月度分布比例
 DocType: Territory,Territory Targets,区域目标
 DocType: Delivery Note,Transporter Info,转运信息
@@ -2632,7 +2537,6 @@
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,标题打印模板例如形式发票。
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +140,Valuation type charges can not marked as Inclusive,估值类型罪名不能标记为包容性
 DocType: POS Profile,Update Stock,更新库存
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +128,Superfinishing,超精研
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,不同计量单位的项目会导致不正确的（总）净重值。请确保每个品目的净重使用同一个计量单位。
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM税率
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +85,Please pull items from Delivery Note,请送货单拉项目
@@ -2647,7 +2551,6 @@
 ,Purchase Analytics,购买Analytics（分析）
 DocType: Sales Invoice Item,Delivery Note Item,送货单品目
 DocType: Expense Claim,Task,任务
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +57,Shaving,刮
 DocType: Purchase Taxes and Charges,Reference Row #,参考行＃
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},品目{0}必须指定批次号
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js +14,This is a root sales person and cannot be edited.,您可以通过选择备份频率启动和\
@@ -2659,13 +2562,11 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +74,Purpose must be one of {0},目的必须是一个{0}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +108,Fill the form and save it,填写表格并保存
 DocType: Production Planning Tool,Download a report containing all raw materials with their latest inventory status,下载一个包含所有原材料及其库存状态的报告
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +94,Facing,面对
 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: Time Log,Billable,可开票
-DocType: Authorization Rule,This will be used for setting rule in HR module,这将用于在人力资源模块的设置规则
 DocType: Account,Rate at which this tax is applied,速率此税适用
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reorder Qty,再订购数量
 DocType: Company,Stock Adjustment Account,库存调整账户
@@ -2692,16 +2593,15 @@
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,百分比分配应该等于100 ％
 DocType: Serial No,Out of AMC,出资产管理公司
 DocType: Purchase Order Item,Material Request Detail No,物料申请详情编号
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +97,Hard turning,硬车削
 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 +79,Company (not Customer or Supplier) master.,公司(非客户或供应商)大师。
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +106,Please enter 'Expected Delivery Date',请输入“预产期”
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +187,Delivery Notes {0} must be cancelled before cancelling this Sales Order,取消这个销售订单之前必须取消送货单{0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +100,Please enter 'Expected Delivery Date',请输入“预产期”
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +182,Delivery Notes {0} must be cancelled before cancelling this Sales Order,取消这个销售订单之前必须取消送货单{0}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +373,Paid amount + Write Off Amount can not be greater than Grand Total,支付的金额+写的抵销金额不能大于总计
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0}不是品目{1}的有效批次号
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,Note: There is not enough leave balance for Leave Type {0},注意：假期类型{0}的余量不足
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +124,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,机会类型
@@ -2713,7 +2613,7 @@
 DocType: Hub Settings,Publish Availability,发布房源
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +105,Date of Birth cannot be greater than today.,出生日期不能大于今天。
 ,Stock Ageing,库存账龄
-apps/erpnext/erpnext/controllers/accounts_controller.py +200,{0} '{1}' is disabled,{0}“{1}”被禁用
+apps/erpnext/erpnext/controllers/accounts_controller.py +201,{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.,交易提交时自动向联系人发送电子邮件。
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +232,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
@@ -2723,44 +2623,38 @@
 DocType: Purchase Order,Customer Contact Email,客户联系电子邮件
 DocType: Event,Sunday,星期天
 DocType: Sales Team,Contribution (%),贡献（％）
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +455,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,注意：付款分录不会创建，因为“现金或银行账户”没有指定
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +171,Responsibilities,职责
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +457,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 +11,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,请在表中输入ATLEAST 1发票
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +511,Add Users,添加用户
+apps/erpnext/erpnext/public/js/setup_wizard.js +255,Add Users,添加用户
 DocType: Pricing Rule,Item Group,品目群组
 DocType: Task,Actual Start Date (via Time Logs),实际开始日期（通过时间日志）
-DocType: Stock Reconciliation Item,Before reconciliation,前和解
+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),已添加的税费（公司货币）
-apps/erpnext/erpnext/stock/doctype/item/item.py +340,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,品目税项的行{0}中必须指定类型为税项/收益/支出/应课的账户。
+apps/erpnext/erpnext/stock/doctype/item/item.py +344,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,品目税项的行{0}中必须指定类型为税项/收益/支出/应课的账户。
 DocType: Sales Order,Partly Billed,天色帐单
 DocType: Item,Default BOM,默认的BOM
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +79,Decambering,Decambering
 apps/erpnext/erpnext/setup/doctype/company/company.js +22,Please re-type company name to confirm,请确认重新输入公司名称
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,总街货量金额
 DocType: Time Log Batch,Total Hours,总时数
 DocType: Journal Entry,Printing Settings,打印设置
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +268,Total Debit must be equal to Total Credit. The difference is {0},总借记必须等于总积分。
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +11,Automotive,汽车
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +37,Item is required,品目是必须项
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +25,Metal injection molding,金属注射成型
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +258,Total Debit must be equal to Total Credit. The difference is {0},总借记必须等于总积分。
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,汽车
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +684,From Delivery Note,来自送货单
 DocType: Time Log,From Time,起始时间
 DocType: Notification Control,Custom Message,自定义消息
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +33,Investment Banking,投资银行业务
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +261,"Select your Country, Time Zone and Currency",设置你的国家，时区和货币
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,投资银行业务
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +316,"Select your Country, Time Zone and Currency",设置你的国家，时区和货币
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +369,Cash or Bank Account is mandatory for making payment entry,“现金”或“银行账户”是付款分录的必须项
 DocType: Purchase Invoice,Price List Exchange Rate,价目表汇率
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +91,Pickling,酸洗
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +18,Sand casting,砂型铸造
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +117,Electroplating,电镀
 DocType: Purchase Invoice Item,Rate,率
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +62,Intern,实习生
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Intern,实习生
 DocType: Newsletter,A Lead with this email id should exist,与此电子邮件关联的潜在客户不存在
 DocType: Stock Entry,From BOM,从BOM
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +34,Basic,基本
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +34,Basic,基本
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,早于{0}的库存事务已冻结
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +217,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,日期应该是一样的起始日期为半天假
@@ -2768,10 +2662,10 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +96,Reference No is mandatory if you entered Reference Date,参考编号是强制性的，如果你输入的参考日期
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +108,Date of Joining must be greater than Date of Birth,入职日期必须大于出生日期
 DocType: Salary Structure,Salary Structure,薪酬结构
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +242,"Multiple Price Rule exists with same criteria, please resolve \
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +246,"Multiple Price Rule exists with same criteria, please resolve \
 			conflict by assigning priority. Price Rules: {0}",存在多个符合条件的价格列表，请指定优先级来解决冲突。价格列表{0}
 DocType: Account,Bank,银行
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +9,Airline,航空公司
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,航空公司
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +493,Issue Material,发料
 DocType: Material Request Item,For Warehouse,对仓库
 DocType: Employee,Offer Date,报价有效期
@@ -2781,29 +2675,24 @@
 DocType: Item,Is Fixed Asset Item,是否固定资产项目
 DocType: Stock Entry,Including items for sub assemblies,包括子组件项目
 DocType: Features Setup,"If you have long print formats, this feature can be used to split the page to be printed on multiple pages with all headers and footers on each page",如果你的打印格式很长，这个功能可以被用来分割打印多个页面，每个页面上的都会有页眉和页脚。
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +131,Hobbing,滚齿机
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +98,All Territories,所有的区域
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +98,All Territories,所有的区域
 DocType: Purchase Invoice,Items,品目
 DocType: Fiscal Year,Year Name,年度名称
 DocType: Process Payroll,Process Payroll,处理工资
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +59,There are more holidays than working days this month.,这个月的假期比工作日多。
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +68,There are more holidays than working days this month.,这个月的假期比工作日多。
 DocType: Product Bundle Item,Product Bundle Item,产品包项目
 DocType: Sales Partner,Sales Partner Name,销售合作伙伴名称
 DocType: Purchase Invoice Item,Image View,图像查看
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +113,Finishing & industrial finishing,精加工和精加工工业
 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/page/setup_wizard/fixtures/industry_type.py +46,Securities & Commodity Exchanges,证券及商品交易
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,证券及商品交易
 DocType: Shipping Rule,Calculate Based On,计算基于
 DocType: Delivery Note Item,From Warehouse,从仓库
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +98,Drilling,钻孔
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +28,Blow molding,吹塑
 DocType: Purchase Taxes and Charges,Valuation and Total,估值与总计
 DocType: Tax Rule,Shipping City,航运市
 apps/erpnext/erpnext/stock/doctype/item/item.js +43,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,该项目是{0}（模板）的变体。属性将被复制的模板，除非“不复制”设置
 DocType: Account,Purchase User,购买用户
 DocType: Notification Control,Customize the Notification,自定义通知
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +87,Hammering,锻造
 DocType: Web Page,Slideshow,幻灯片
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +24,Default Address Template cannot be deleted,默认地址模板不能删除
 DocType: Sales Invoice,Shipping Rule,配送规则
@@ -2812,9 +2701,8 @@
 DocType: Workflow State,Search,搜索
 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/setup/page/setup_wizard/fixtures/operations.py +142,Brazing,铜焊
 DocType: C-Form,Amended From,修订源
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Raw Material,原料
+apps/erpnext/erpnext/public/js/setup_wizard.js +359,Raw Material,原料
 DocType: Leave Application,Follow via Email,通过电子邮件关注
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,税额折后金额
 apps/erpnext/erpnext/accounts/doctype/account/account.py +174,Child account exists for this account. You can not delete this account.,此科目有子科目，无法删除。
@@ -2828,10 +2716,10 @@
 ,Produced,生产
 DocType: Item,Item Code for Suppliers,对于供应商产品编号
 DocType: Issue,Raised By (Email),提出（电子邮件）
-apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +72,General,一般
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +495,Attach Letterhead,附加信头
+apps/erpnext/erpnext/setup/setup_wizard/default_website.py +72,General,一般
+apps/erpnext/erpnext/public/js/setup_wizard.js +241,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/setup/page/setup_wizard/setup_wizard.js +542,"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/public/js/setup_wizard.js +284,"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}必须指定序列号
 DocType: Journal Entry,Bank Entry,银行记录
 DocType: Authorization Rule,Applicable To (Designation),适用于(指定)
@@ -2840,32 +2728,31 @@
 apps/erpnext/erpnext/config/accounts.py +143,Enable / disable currencies.,启用/禁用货币。
 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）
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +26,Entertainment & Leisure,娱乐休闲
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,娱乐休闲
 DocType: Purchase Order,The date on which recurring order will be stop,经常性发票终止日期
 DocType: Quality Inspection,Item Serial No,品目序列号
 apps/erpnext/erpnext/controllers/status_updater.py +142,{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 +57,Total Present,总现
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Hour,小时
+apps/erpnext/erpnext/public/js/setup_wizard.js +363,Hour,小时
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +138,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation",序列化的品目{0}不能被“库存盘点”更新
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +488,Transfer Material to Supplier,转印材料供应商
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +513,Transfer Material to Supplier,转印材料供应商
 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/crm/doctype/opportunity/opportunity.js +82,Create Quotation,创建报价
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +306,All these items have already been invoiced,这些品目都已开具发票
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,You are not authorized to approve leaves on Block Dates,您无权批准叶子座日期
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +311,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/setup/page/setup_wizard/fixtures/operations.py +83,Curling,冰壶
 DocType: Account,Tax,税项
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +28,Row {0}: {1} is not a valid {2},行{0}：{1}不是有效的{2}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +89,Refining,精制
+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,生产规划工具
 DocType: Quality Inspection,Report Date,报告日期
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +130,Routing,路由
 DocType: C-Form,Invoices,发票
 DocType: Job Opening,Job Title,职位
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +54,{0} already allocated for Employee {1} for period {2} - {3},{0}已分配给员工{1}的时期{2}  -  {3}
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +80,{0} Recipients,{0}个收件人
 DocType: Features Setup,Item Groups in Details,详细品目群组
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +335,Quantity to Manufacture must be greater than 0.,量生产必须大于0。
@@ -2883,14 +2770,13 @@
 DocType: DocType,Setup,设置
 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,本月和待活动总结
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +39,Cold rolling,冷轧
 DocType: Customer Group,Customer Group Name,客户群组名称
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +408,Please remove this Invoice {0} from C-Form {1},请删除此发票{0}从C-表格{1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +410,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,属性
 DocType: Packing Slip,Get Items,获取品目
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +186,Please enter Write Off Account,请输入核销帐户
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +187,Please enter Write Off Account,请输入核销帐户
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +71,Last Order Date,最后订购日期
 DocType: DocField,Image,图像
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +179,Make Excise Invoice,创建消费发票
@@ -2900,7 +2786,7 @@
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +146,Operation ID not set,操作ID没有设置
 DocType: Production Order,Planned Start Date,计划开始日期
 DocType: Serial No,Creation Document Type,创建文件类型
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +620,Maint. Visit,维护手册。访
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +631,Maint. Visit,维护手册。访
 DocType: Leave Type,Is Encash,是否兑现
 DocType: Purchase Invoice,Mobile No,手机号码
 DocType: Payment Tool,Make Journal Entry,创建日记帐分录
@@ -2908,35 +2794,31 @@
 apps/erpnext/erpnext/controllers/trends.py +257,Project-wise data is not available for Quotation,项目明智的数据不适用于报价
 DocType: Project,Expected End Date,预计结束日期
 DocType: Appraisal Template,Appraisal Template Title,评估模板标题
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +440,Commercial,广告
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +378,Commercial,广告
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +23,Parent Item {0} must not be a Stock Item,父项{0}不能是库存产品
 DocType: Cost Center,Distribution Id,分配标识
-apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +14,Awesome Services,优质服务
+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,供应商地址
 DocType: Contact Us Settings,Address Line 2,地址行2
 DocType: ToDo,Reference,参考
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +59,Perforating,射孔
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,输出数量
 apps/erpnext/erpnext/config/accounts.py +128,Rules to calculate shipping amount for a sale,规则来计算销售运输量
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +29,Series is mandatory,系列是必须项
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +28,Financial Services,金融服务
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,金融服务
 apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3},为属性{0}值必须的范围内{1}到{2}中的增量{3}
 DocType: Tax Rule,Sales,销售
 DocType: Stock Entry Detail,Basic Amount,基本金额
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +173,Warehouse required for stock Item {0},物件{0}需要指定仓库
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +178,Warehouse required for stock Item {0},物件{0}需要指定仓库
 DocType: Leave Allocation,Unused leaves,未使用的叶子
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,信用
 DocType: Customer,Default Receivable Accounts,默认应收账户(多个)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +102,Sawing,锯切
 DocType: Tax Rule,Billing State,计费状态
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +32,Laminating,层压
 DocType: Item Reorder,Transfer,转让
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +549,Fetch exploded BOM (including sub-assemblies),获取展开BOM（包括子品目）
 DocType: Authorization Rule,Applicable To (Employee),适用于(员工)
 apps/erpnext/erpnext/controllers/accounts_controller.py +101,Due Date is mandatory,截止日期是强制性的
 apps/erpnext/erpnext/controllers/item_variant.py +51,Increment for Attribute {0} cannot be 0,增量属性{0}不能为0
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +143,Sintering,烧结
 DocType: Journal Entry,Pay To / Recd From,支付/ RECD从
 DocType: Naming Series,Setup Series,设置系列
 DocType: Supplier,Contact HTML,联系HTML
@@ -2949,7 +2831,6 @@
 DocType: Attendance,Absent,缺席
 DocType: Product Bundle,Product Bundle,产品包
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +180,Row {0}: Invalid reference {1},行{0}：无效参考{1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +165,Crushing,破碎
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,购置税和费模板
 DocType: Upload Attendance,Download Template,下载模板
 DocType: GL Entry,Remarks,备注
@@ -2957,14 +2838,12 @@
 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/setup/page/setup_wizard/fixtures/operations.py +9,Continuous casting,连铸
 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/setup/page/setup_wizard/fixtures/operations.py +80,Cold sizing,冷上浆
 DocType: Salary Slip,Earning & Deduction,盈余及扣除
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +76,Account {0} cannot be a Group,科目{0}不能为组
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +259,Region,区域
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +314,Region,区域
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +213,Optional. This setting will be used to filter in various transactions.,可选。此设置将被应用于各种交易进行过滤。
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +104,Negative Valuation Rate is not allowed,负评估价格是不允许的
 DocType: Holiday List,Weekly Off,周末
@@ -2982,7 +2861,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,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,必须指定考勤起始日期和结束日期
-apps/erpnext/erpnext/controllers/buying_controller.py +131,Please enter 'Is Subcontracted' as Yes or No,请输入'转包' YES或NO
+apps/erpnext/erpnext/controllers/buying_controller.py +122,Please enter 'Is Subcontracted' as Yes or No,请输入'转包' YES或NO
 DocType: Sales Team,Contact No.,联络人电话
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,'Profit and Loss' type account {0} not allowed in Opening Entry,期初分录中不允许有“损益”类型的账户{0}
 DocType: Workflow State,Time,时间
@@ -2991,14 +2870,13 @@
 DocType: Authorization Rule,Authorization Rule,授权规则
 DocType: Sales Invoice,Terms and Conditions Details,条款和条件详情
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,营业税金及费用模板
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +10,Apparel & Accessories,服装及配饰
+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,订购次数
 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 +121,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/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +47,Conversion Factor is required,转换系数是必须项
 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,值/说明
@@ -3006,10 +2884,8 @@
 ,Customers Not Buying Since Long Time,长时间没有购买的客户
 DocType: Production Order,Expected Delivery Date,预计交货日期
 apps/erpnext/erpnext/accounts/general_ledger.py +121,Debit and Credit not equal for {0} #{1}. Difference is {2}.,借贷{0}＃不等于{1}。不同的是{2}。
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +48,Bulging,挺着
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +11,Evaporative-pattern casting,蒸发图案铸造
 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 +195,Sales Invoice {0} must be cancelled before cancelling this Sales Order,取消此销售订单前必须取消销售发票{0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +190,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的数字。
@@ -3028,26 +2904,24 @@
 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 +241,Account: {0} with currency: {1} can not be selected,帐号：{0}币种：{1}不能选择
+apps/erpnext/erpnext/controllers/accounts_controller.py +242,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 +47,Account {0}: Parent account {1} does not belong to company: {2},科目{0}的上级科目{1}不属于公司{2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted all transactions related to this company!,成功删除与该公司相关的所有交易！
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,随着对日
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +111,Honing,珩磨
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +58,Probation,缓刑
-apps/erpnext/erpnext/stock/doctype/item/item.py +264,Default Warehouse is mandatory for stock Item.,库存品目必须指定默认仓库。
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Probation,缓刑
+apps/erpnext/erpnext/stock/doctype/item/item.py +268,Default Warehouse is mandatory for stock Item.,库存品目必须指定默认仓库。
 DocType: Feed,Full Name,全名
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +148,Clinching,铆
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +191,Payment of salary for the month {0} and year {1},支付工资的月{0}和年{1}
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +173,Payment of salary for the month {0} and year {1},支付工资的月{0}和年{1}
 DocType: Stock Settings,Auto insert Price List rate if missing,自动插入价目表率，如果丢失
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,总支付金额
 ,Transferred Qty,转让数量
 apps/erpnext/erpnext/config/learn.py +11,Navigating,导航
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +137,Planning,规划
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +137,Planning,规划
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +9,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),总结算金额（通过时间日志）
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +629,We sell this Item,我们卖这些物件
+apps/erpnext/erpnext/public/js/setup_wizard.js +365,We sell this Item,我们卖这些物件
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +65,Supplier Id,供应商编号
 DocType: Journal Entry,Cash Entry,现金分录
 DocType: Sales Partner,Contact Desc,联系人倒序
@@ -3056,18 +2930,16 @@
 DocType: Brand,Item Manager,项目经理
 DocType: Cost Center,Add rows to set annual budgets on Accounts.,添加新行为科目设定年度预算。
 DocType: Buying Settings,Default Supplier Type,默认供应商类别
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +160,Quarrying,采石
 DocType: Production Order,Total Operating Cost,总营运成本
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +160,Note: Item {0} entered multiple times,注意：品目{0}已多次输入
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +163,Note: Item {0} entered multiple times,注意：品目{0}已多次输入
 apps/erpnext/erpnext/config/crm.py +27,All Contacts.,所有联系人。
 DocType: Newsletter,Test Email Id,测试电子邮件Id
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +394,Company Abbreviation,公司缩写
+apps/erpnext/erpnext/public/js/setup_wizard.js +142,Company Abbreviation,公司缩写
 DocType: Features Setup,If you follow Quality Inspection. Enables Item QA Required and QA No in Purchase Receipt,如果你使用质量检验的话。将启动采购收据内的“品目需要检验”和“QA编号”。
 DocType: GL Entry,Party Type,党的类型
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +68,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/setup/page/setup_wizard/fixtures/operations.py +30,Rotational molding,滚塑成型
 apps/erpnext/erpnext/config/hr.py +115,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,购物车设置税收规则
@@ -3081,15 +2953,15 @@
 apps/erpnext/erpnext/config/selling.py +18,Quotes to Leads or Customers.,向潜在客户或客户发出的报价。
 DocType: Stock Settings,Role Allowed to edit frozen stock,角色可以编辑冻结股票
 ,Territory Target Variance Item Group-Wise,按物件组的区域目标波动
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +101,All Customer Groups,所有客户群组
-apps/erpnext/erpnext/controllers/accounts_controller.py +474,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0}是必填项。可能是没有由{1}到{2}的货币转换记录。
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +101,All Customer Groups,所有客户群组
+apps/erpnext/erpnext/controllers/accounts_controller.py +475,{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 +41,Account {0}: Parent account {1} does not exist,科目{0}的上级科目{1}不存在
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),价格列表费率（公司货币）
 DocType: Account,Temporary,临时
 DocType: Address,Preferred Billing Address,首选帐单地址
 DocType: Monthly Distribution Percentage,Percentage Allocation,百分比分配
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +86,Secretary,秘书
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Secretary,秘书
 DocType: Serial No,Distinct unit of an Item,品目的属性
 DocType: Pricing Rule,Buying,采购
 DocType: HR Settings,Employee Records to be created by,雇员记录创建于
@@ -3102,9 +2974,8 @@
 ,Item-wise Price List Rate,品目特定的价目表率
 DocType: Purchase Order Item,Supplier Quotation,供应商报价
 DocType: Quotation,In Words will be visible once you save the Quotation.,大写金额将在报价单保存后显示。
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +68,Ironing,熨衣服
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is stopped,{0} {1}已停止
-apps/erpnext/erpnext/stock/doctype/item/item.py +352,Barcode {0} already used in Item {1},条码{0}已被品目{1}使用
+apps/erpnext/erpnext/stock/doctype/item/item.py +356,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/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,即将举行的活动
@@ -3113,27 +2984,25 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +27,Quick Entry,快速入门
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0}是退货单的必填项
 DocType: Purchase Order,To Receive,接受
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +33,Shrink fitting,冷缩配合
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +522,user@example.com,user@example.com
+apps/erpnext/erpnext/public/js/setup_wizard.js +266,user@example.com,user@example.com
 DocType: Email Digest,Income / Expense,收益/支出
 DocType: Employee,Personal Email,个人电子邮件
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +58,Total Variance,总方差
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +62,Total Variance,总方差
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.",如果启用，系统将自动为库存创建会计分录。
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +15,Brokerage,佣金
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +15,Brokerage,佣金
 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/accounts/page/financial_analytics/financial_analytics.js +42,Select Fiscal Year...,选择财政年度...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +442,POS Profile required to make POS Entry,需要POS资料，使POS进入
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +444,POS Profile required to make POS Entry,需要POS资料，使POS进入
 DocType: Hub Settings,Name Token,名称令牌
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +106,Planing,刨
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Selling,标准销售
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +120,Standard Selling,标准销售
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +137,Atleast one warehouse is mandatory,必须选择至少一个仓库
 DocType: Serial No,Out of Warranty,超出保修期
 DocType: BOM Replace Tool,Replace,更换
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +314,{0} against Sales Invoice {1},{0}不允许销售发票{1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +316,{0} against Sales Invoice {1},{0}不允许销售发票{1}
 apps/erpnext/erpnext/stock/doctype/item/item.py +49,Please enter default Unit of Measure,请输入缺省的计量单位
 DocType: Purchase Invoice Item,Project Name,项目名称
 DocType: Supplier,Mention if non-standard receivable account,提到如果不规范应收账款
@@ -3149,9 +3018,8 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,Journal Entry {0} does not have account {1} or already matched against other voucher,日记帐分录{0}没有科目{1}或已经匹配其他凭证
 DocType: Item,Moving Average,移动平均
 DocType: BOM Replace Tool,The BOM which will be replaced,此物料清单将被替换
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +43,New Stock UOM must be different from current stock UOM,新库存计量单位必须于当前单位不同
 DocType: Account,Debit,借方
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +34,Leaves must be allocated in multiples of 0.5,假期天数必须为0.5的倍数
+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/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,优秀的金额
@@ -3169,8 +3037,7 @@
 DocType: Employee,Internal Work History,内部工作经历
 DocType: DocField,Column Break,分栏符
 DocType: Event,Thursday,星期四
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +42,Private Equity,私募股权投资
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +93,Turning,车削
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,私募股权投资
 DocType: Maintenance Visit,Customer Feedback,客户反馈
 DocType: Account,Expense,开支
 DocType: Sales Invoice,Exhibition,展览
@@ -3183,19 +3050,19 @@
 DocType: Employee,Held On,举行日期
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +33,Production Item,生产项目
 ,Employee Information,雇员资料
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,Rate (%),率（ ％ ）
+apps/erpnext/erpnext/public/js/setup_wizard.js +294,Rate (%),率（ ％ ）
 DocType: Stock Entry Detail,Additional Cost,额外费用
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +407,Financial Year End Date,财政年度结束日期
+apps/erpnext/erpnext/public/js/setup_wizard.js +155,Financial Year End Date,财政年度结束日期
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Voucher No, if grouped by Voucher",按凭证分类后不能根据凭证编号过滤
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +484,Make Supplier Quotation,创建供应商报价
 DocType: Quality Inspection,Incoming,接收
 DocType: BOM,Materials Required (Exploded),所需物料（正展开）
 DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),降低盈利停薪留职（LWP）
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +512,"Add users to your organization, other than yourself",将用户添加到您的组织，除了自己
+apps/erpnext/erpnext/public/js/setup_wizard.js +256,"Add users to your organization, other than yourself",将用户添加到您的组织，除了自己
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No {1} does not match with {2} {3},行＃{0}：序列号{1}不相匹配{2} {3}
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +44,Casual Leave,事假
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +44,Casual Leave,事假
 DocType: Batch,Batch ID,批次ID
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +334,Note: {0},注： {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +336,Note: {0},注： {0}
 ,Delivery Note Trends,送货单趋势
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +104,This Week's Summary,本周的总结
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +74,{0} must be a Purchased or Sub-Contracted Item in row {1},行{1}中的{0}必须是“采购”或“转包”类型的品目
@@ -3207,7 +3074,7 @@
 DocType: Purchase Receipt,Return Against Purchase Receipt,回到对外购入库单
 DocType: Purchase Order,To Bill,比尔
 DocType: Material Request,% Ordered,％有序
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +61,Piecework,计件工作
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Piecework,计件工作
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +64,Avg. Buying Rate,平均买入价
 DocType: Task,Actual Time (in Hours),实际时间（小时）
 DocType: Employee,History In Company,公司内历史
@@ -3224,13 +3091,13 @@
 DocType: Opportunity,To Discuss,为了讨论
 DocType: SMS Settings,SMS Settings,短信设置
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +60,Temporary Accounts,临时账户
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +155,Black,黑
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Black,黑
 DocType: BOM Explosion Item,BOM Explosion Item,BOM展开品目
 DocType: Account,Auditor,审计员
 DocType: Purchase Order,End date of current order's period,当前订单周期的结束日期
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +17,Make Offer Letter,使录取通知书
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +10,Return,回报
-apps/erpnext/erpnext/stock/doctype/item/item.py +503,Default Unit of Measure for Variant must be same as Template,测度变异的默认单位必须与模板
+apps/erpnext/erpnext/stock/doctype/item/item.py +507,Default Unit of Measure for Variant must be same as Template,测度变异的默认单位必须与模板
 DocType: DocField,Fold,折叠
 DocType: Production Order Operation,Production Order Operation,生产订单操作
 DocType: Pricing Rule,Disable,禁用
@@ -3241,13 +3108,12 @@
 DocType: Page,Page Name,网页名称
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +110,To Time must be greater than From Time,到时间必须大于从时间
 DocType: Journal Entry Account,Exchange Rate,汇率
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +465,Sales Order {0} is not submitted,销售订单{0}未提交
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +467,Sales Order {0} is not submitted,销售订单{0}未提交
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0}: Parent account {1} does not bolong to the company {2},仓库{0}的上级账户{1}不属于公司{2}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +124,Spindle finishing,主轴整理
 DocType: BOM,Last Purchase Rate,最后采购价格
 DocType: Account,Asset,资产
 DocType: Project Task,Task ID,任务ID
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +395,"e.g. ""MC""",例如“MC”
+apps/erpnext/erpnext/public/js/setup_wizard.js +143,"e.g. ""MC""",例如“MC”
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,Stock cannot exist for Item {0} since has variants,品目{0}不能有库存，因为他存在变体
 ,Sales Person-wise Transaction Summary,销售人员特定的交易汇总
 DocType: System Settings,Time Zone,时区
@@ -3256,9 +3122,7 @@
 DocType: Monthly Distribution,Monthly Distribution Percentages,月度分布比例
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +16,The selected item cannot have Batch,所选项目不能有批次
 DocType: Delivery Note,% of materials delivered against this Delivery Note,此出货单％的材料已交货。
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +151,Stapling,装订
 DocType: Customer,Customer Details,客户详细信息
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +105,Shaping,成型
 DocType: Employee,Reports to,报告以
 DocType: SMS Settings,Enter url parameter for receiver nos,请输入收件人编号的URL参数
 DocType: Sales Invoice,Paid Amount,支付的金额
@@ -3267,13 +3131,13 @@
 DocType: Item Variant,Item Variant,品目变体
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +15,Setting this Address Template as default as there is no other default,将此地址模板设置为默认，因为没有其他的默认项
 apps/erpnext/erpnext/accounts/doctype/account/account.py +89,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'",账户余额已设置为'借方'，不能设置为'贷方'
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +76,Quality Management,质量管理
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Quality Management,质量管理
 DocType: Production Planning Tool,Filter based on customer,根据客户筛选
 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}
 DocType: Employee External Work History,Employee External Work History,雇员外部就职经历
 DocType: Tax Rule,Purchase,采购
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +34,Balance Qty,余额数量
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Balance Qty,余额数量
 DocType: Item Group,Parent Item Group,父项目组
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +21,{0} for {1},{0} {1}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +96,Cost Centers,成本中心
@@ -3283,12 +3147,12 @@
 DocType: Opportunity,Next Contact,下一页联系
 DocType: Employee,Employment Type,就职类型
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,固定资产
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +84,Application period cannot be across two alocation records,申请期间不能跨两个alocation记录
 DocType: Item Group,Default Expense Account,默认支出账户
 DocType: Employee,Notice (days),通告（天）
 DocType: Page,Yes,是
 DocType: Tax Rule,Sales Tax Template,销售税模板
 DocType: Employee,Encashment Date,兑现日期
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +74,Electroforming,电铸
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +179,"Against Voucher Type must be one of Purchase Order, Purchase Invoice or Journal Entry",凭证类型必须是采购订单，采购发票或日记帐分录之一
 DocType: Account,Stock Adjustment,库存调整
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +34,Default Activity Cost exists for Activity Type - {0},默认情况下存在作业成本的活动类型 -  {0}
@@ -3324,12 +3188,12 @@
 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,分配
 apps/erpnext/erpnext/public/js/pos/pos.html +36,Amount Paid,已支付的款项
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +91,Project Manager,项目经理
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +72,Dispatch,调度
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Project Manager,项目经理
+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: Customer,Default Taxes and Charges,默认税费
 DocType: Account,Receivable,应收账款
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +268,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,行＃{0}：不能更改供应商的采购订单已经存在
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +263,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。否则会将半成品当作原材料。
@@ -3337,8 +3201,8 @@
 DocType: Hub Settings,Seller Description,卖家描述
 DocType: Employee Education,Qualification,学历
 DocType: Item Price,Item Price,品目价格
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +48,Soap & Detergent,肥皂和洗涤剂
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +36,Motion Picture & Video,影视业
+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,订购
 DocType: Warehouse,Warehouse Name,仓库名称
 DocType: Naming Series,Select Transaction,选择交易
@@ -3347,7 +3211,6 @@
 DocType: BOM,Rate Of Materials Based On,率材料的基础上
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,客户支持分析
 apps/erpnext/erpnext/accounts/doctype/accounts_settings/accounts_settings.py +27,Company is missing in warehouses {0},仓库{0}缺少公司
-DocType: Stock UOM Replace Utility,Stock UOM Replace Utility,库存计量单位替换工具
 DocType: POS Profile,Terms and Conditions,条款和条件
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,To Date should be within the Fiscal Year. Assuming To Date = {0},日期应该是在财政年度内。假设终止日期= {0}
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc",在这里，你可以保持身高，体重，过敏，医疗问题等
@@ -3359,7 +3222,7 @@
 DocType: Sales Order Item,For Production,对生产
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +103,Please enter sales order in the above table,小于等于零系统，估值率是强制性的资料
 DocType: Project Task,View Task,查看任务
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +406,Your financial year begins on,您的会计年度开始于
+apps/erpnext/erpnext/public/js/setup_wizard.js +154,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: Email Digest,Add/Remove Recipients,添加/删除收件人
@@ -3367,16 +3230,14 @@
 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),设置接收支持的电子邮件地址。 （例如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 +528,Item variant {0} exists with same attributes,项目变种{0}存在具有相同属性
+apps/erpnext/erpnext/stock/doctype/item/item.py +532,Item variant {0} exists with same attributes,项目变种{0}存在具有相同属性
 DocType: Salary Slip,Salary Slip,工资单
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +116,Burnishing,打磨
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +54,'To Date' is required,“结束日期”必需设置
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,“结束日期”必需设置
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.",生成要发货品目的装箱单，包括包号，内容和重量。
 DocType: Sales Invoice Item,Sales Order Item,销售订单品目
 DocType: Salary Slip,Payment Days,金天
 DocType: BOM,Manage cost of operations,管理流程成本
 DocType: Features Setup,Item Advanced,品目高级设置
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +40,Hot rolling,热轧
 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,雇员教育
@@ -3389,25 +3250,23 @@
 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/setup/page/setup_wizard/install_fixtures.py +48,Sick Leave,病假
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +174,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/page/setup_wizard/fixtures/industry_type.py +22,Department Stores,百货
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,百货
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +40,System Balance,系统余额
 DocType: Workflow,Is Active,是否活动
 apps/erpnext/erpnext/controllers/stock_controller.py +71,No accounting entries for the following warehouses,没有以下仓库的会计分录
 apps/erpnext/erpnext/projects/doctype/project/project.js +22,Save the document first.,首先保存文档。
 DocType: Account,Chargeable,应课
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +121,Linishing,Linishing
 DocType: Company,Change Abbreviation,更改缩写
 DocType: Workflow State,Primary,初级
 DocType: Expense Claim Detail,Expense Date,报销日期
 DocType: Item,Max Discount (%),最大折扣(%)
 DocType: Communication,More Information,更多信息
 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/setup/page/setup_wizard/fixtures/operations.py +161,Blasting,爆破
 DocType: Company,Warn,警告
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +111,Item valuation updated,品目评估价格已更新
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.",任何其他言论，值得一提的努力，应该在记录中。
 DocType: BOM,Manufacturing User,生产用户
 DocType: Purchase Order,Raw Materials Supplied,提供原料
@@ -3417,7 +3276,7 @@
 DocType: Appraisal,Appraisal Template,评估模板
 DocType: Communication,Email,邮件
 DocType: Item Group,Item Classification,品目分类
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +89,Business Development Manager,业务发展经理
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Business Development Manager,业务发展经理
 DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,维护访问目的
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.js +15,Period,期
 ,General Ledger,总帐
@@ -3427,9 +3286,7 @@
 ,Itemwise Recommended Reorder Level,品目特定的推荐重订购级别
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +264,Please select {0} first,请选择{0}第一
 DocType: Features Setup,To get Item Group in details table,为了让项目组在详细信息表
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +67,Redrawing,重绘
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +112,Batch {0} of Item {1} has expired.,一批项目的{0} {1}已过期。
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +120,Etching,蚀刻
 DocType: Sales Invoice,Commission,佣金
 DocType: Address Template,"<h4>Default Template</h4>
 <p>Uses <a href=""http://jinja.pocoo.org/docs/templates/"">Jinja Templating</a> and all the fields of Address (including Custom Fields if any) will be available</p>
@@ -3474,7 +3331,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +340,Operation Time must be greater than 0 for Operation {0},运行时间必须大于0的操作{0}
 DocType: Supplier,Address and Contacts,地址和联系方式
 DocType: UOM Conversion Detail,UOM Conversion Detail,计量单位换算详情
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +496,Keep it web friendly 900px (w) by 100px (h),建议900px宽乘以100px高。
+apps/erpnext/erpnext/public/js/setup_wizard.js +242,Keep it web friendly 900px (w) by 100px (h),建议900px宽乘以100px高。
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +329,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,获取未清凭证
@@ -3490,54 +3347,49 @@
 DocType: Item,Average time taken by the supplier to deliver,采取供应商的平均时间交付
 DocType: Time Log,Hours,小时
 DocType: Project,Expected Start Date,预计开始日期
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +38,Rolling,滚动
 DocType: ToDo,Priority,优先
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +41,Remove item if charges is not applicable to that item,删除项目，如果收费并不适用于该项目
 DocType: Dropbox Backup,Dropbox Access Allowed,Dropbox访问已允许
 DocType: Dropbox Backup,Weekly,每周
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,例如：smsgateway.com/API/send_sms.cgi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +485,Receive,接受
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +510,Receive,接受
 DocType: Maintenance Visit,Fully Completed,全部完成
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}％已完成
 DocType: Employee,Educational Qualification,学历
 DocType: Workstation,Operating Costs,运营成本
 DocType: Employee Leave Approver,Employee Leave Approver,雇员假期审批者
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,{0} has been successfully added to our Newsletter list.,{0}已成功添加到我们的新闻列表。
-apps/erpnext/erpnext/stock/doctype/item/item.py +383,Row {0}: An Reorder entry already exists for this warehouse {1},行{0}：一个重新排序条目已存在这个仓库{1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +387,Row {0}: An Reorder entry already exists for this warehouse {1},行{0}：一个重新排序条目已存在这个仓库{1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +67,"Cannot declare as lost, because Quotation has been made.",不能更改状态为丧失，因为已有报价。
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +133,Electron beam machining,电子束加工
 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 +150,Please select Start Date and End Date for Item {0},请选择开始日期和结束日期的项目{0}
 apps/erpnext/erpnext/config/stock.py +141,Main Reports,主报告
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +102,Stock Ledger entries balances updated,存库分类帐分录的余额已更新
 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 +176,Add / Edit Prices,添加/编辑价格
+apps/erpnext/erpnext/stock/doctype/item/item.js +178,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 +298,My Orders,我的订单
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +293,My Orders,我的订单
 DocType: Price List,Price List Name,价格列表名称
 DocType: Time Log,For Manufacturing,对于制造业
-apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +70,Totals,总计
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +174,Totals,总计
 DocType: BOM,Manufacturing,生产
 ,Ordered Items To Be Delivered,订购项目交付
 DocType: Account,Income,收益
 ,Setup Wizard,设置向导
 DocType: Industry Type,Industry Type,行业类型
 apps/erpnext/erpnext/templates/includes/cart.js +137,Something went wrong!,发现错误！
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +68,Warning: Leave application contains following block dates,警告：申请的假期含有以下的禁离日
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +251,Sales Invoice {0} has already been submitted,销售发票{0}已提交过
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +100,Warning: Leave application contains following block dates,警告：申请的假期含有以下的禁离日
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +256,Sales Invoice {0} has already been submitted,销售发票{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/setup/page/setup_wizard/fixtures/operations.py +10,Die casting,压铸模具
 DocType: Email Alert,Reference Date,参考日期
 apps/erpnext/erpnext/config/hr.py +105,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,在发送前，请填写留言
 DocType: Async Task,Status,状态
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +65,Stock UOM updated for Item {0},品目{0}的库存计量单位已更新
 DocType: Company History,Year,年
 apps/erpnext/erpnext/config/accounts.py +127,Point-of-Sale Profile,简介销售点的
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +68,Please Update SMS Settings,请更新短信设置
@@ -3551,12 +3403,12 @@
 ,Serial No Service Contract Expiry,序列号/年度保养合同过期
 DocType: Item,Unit of Measure Conversion,转换度量单位
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +86,Employee can not be changed,雇员不能更改
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +259,You cannot credit and debit same account at the same time,你不能同时将一个账户设为借方和贷方。
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,You cannot credit and debit same account at the same time,你不能同时将一个账户设为借方和贷方。
 DocType: Naming Series,Help HTML,HTML帮助
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},分配的总权重应为100 ％ 。这是{0}
 apps/erpnext/erpnext/controllers/status_updater.py +140,Allowance for over-{0} crossed for Item {1},品目{1}已经超过允许的超额{0}
 DocType: Address,Name of person or organization that this address belongs to.,此地址所属的人或组织的名称
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +587,Your Suppliers,您的供应商
+apps/erpnext/erpnext/public/js/setup_wizard.js +325,Your Suppliers,您的供应商
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,不能更改状态为丧失，因为已有销售订单。
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +65,Another Salary Structure {0} is active for employee {1}. Please make its status 'Inactive' to proceed.,雇员{1}已经有另一套薪金结构{0}，请将原来的薪金结构改为‘已停用’状态.
 DocType: Purchase Invoice,Contact,联系人
@@ -3565,37 +3417,35 @@
 DocType: Item,Has Serial No,有序列号
 DocType: Employee,Date of Issue,签发日期
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +16,{0}: From {0} for {1},{0}：申请者{0} 金额{1} 
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +154,Row #{0}: Set Supplier for item {1},行＃{0}：设置供应商项目{1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +149,Row #{0}: Set Supplier for item {1},行＃{0}：设置供应商项目{1}
 DocType: Issue,Content Type,内容类型
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +17,Computer,电脑
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,电脑
 DocType: Item,List this Item in multiple groups on the website.,在网站上的多个组中显示此品目
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +283,Please check Multi Currency option to allow accounts with other currency,请检查多币种选项，允许帐户与其他货币
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +285,Please check Multi Currency option to allow accounts with other currency,请检查多币种选项，允许帐户与其他货币
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +62,Item: {0} does not exist in the system,品目{0}不存在
 apps/erpnext/erpnext/accounts/doctype/account/account.py +81,You are not authorized to set Frozen value,您没有权限设定冻结值
 DocType: Payment Reconciliation,Get Unreconciled Entries,获取未调节分录
 DocType: Cost Center,Budgets,预算
 apps/frappe/frappe/core/page/modules_setup/modules_setup.py +11,Updated,已更新
 DocType: Employee,Emergency Contact Details,紧急联系方式
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +396,What does it do?,贵公司的标语
+apps/erpnext/erpnext/public/js/setup_wizard.js +144,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},财年{1}中已多次输入科目{0}
 ,Average Commission Rate,平均佣金率
-apps/erpnext/erpnext/stock/doctype/item/item.py +313,'Has Serial No' can not be 'Yes' for non-stock item,非库存项目不能勾选'是否有序列号'
+apps/erpnext/erpnext/stock/doctype/item/item.py +317,'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/setup/page/setup_wizard/install_fixtures.py +111,Electrical,电气
+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 +302,Row {0}: Exchange Rate is mandatory,行{0}：汇率是必须的
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +304,Row {0}: Exchange Rate is mandatory,行{0}：汇率是必须的
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},员工设置{0}为设置用户ID
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +72,Peening,喷丸
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,From Warranty Claim,来自保修申请
 DocType: Stock Entry,Default Source Warehouse,默认源仓库
 DocType: Item,Customer Code,客户代码
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +212,Birthday Reminder for {0},{0}的生日提醒
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +163,Lapping,精研
-apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.js +8,Days Since Last Order,自上次订购天数
+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 +299,Debit To account must be a Balance Sheet account,借记帐户必须是资产负债表科目
 DocType: Buying Settings,Naming Series,命名系列
 DocType: Leave Block List,Leave Block List Name,禁离日列表名称
@@ -3609,7 +3459,7 @@
 DocType: Notification Control,Sales Invoice Message,销售发票信息
 DocType: Authorization Rule,Based On,基于
 DocType: Sales Order Item,Ordered Qty,订购数量
-apps/erpnext/erpnext/stock/doctype/item/item.py +539,Item {0} is disabled,项目{0}无效
+apps/erpnext/erpnext/stock/doctype/item/item.py +543,Item {0} is disabled,项目{0}无效
 DocType: Stock Settings,Stock Frozen Upto,库存冻结止
 apps/erpnext/erpnext/controllers/recurring_document.py +166,Period From and Period To dates mandatory for recurring {0},期间从和周期要日期强制性的经常性{0}
 apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,项目活动/任务。
@@ -3619,7 +3469,6 @@
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,折扣必须小于100
 DocType: ToDo,Low,低
 DocType: Purchase Invoice,Write Off Amount (Company Currency),核销金额（公司货币）
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +71,Spinning,纺织
 DocType: Landed Cost Voucher,Landed Cost Voucher,到岸成本凭证
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +55,Please set {0},请设置{0}
 DocType: Purchase Invoice,Repeat on Day of Month,重复上月的日
@@ -3641,7 +3490,6 @@
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +37,Campaign Name is required,活动名称是必须项
 DocType: Maintenance Visit,Maintenance Date,维护日期
 DocType: Purchase Receipt Item,Rejected Serial No,拒绝序列号
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +51,Deep drawing,深拉伸
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +40,New Newsletter,新的通讯
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +157,Start date should be less than end date for Item {0},品目{0}的开始日期必须小于结束日期
 apps/erpnext/erpnext/stock/doctype/item/item.js +17,Show Balance,显示余额
@@ -3652,7 +3500,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +119,BOM and Manufacturing Quantity are required,BOM和生产量是必需的
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,账龄范围2
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +450,Amount,量
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +147,Riveting,铆
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,BOM已替换
 ,Sales Analytics,销售分析
 DocType: Manufacturing Settings,Manufacturing Settings,生产设置
@@ -3664,20 +3511,19 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +207,New Account Name,新建账户名称
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,原料提供成本
 DocType: Selling Settings,Settings for Selling Module,销售模块的设置
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +73,Customer Service,顾客服务
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Customer Service,顾客服务
 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.,报价候选作业。
 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 +70,Item {0} must be a stock Item,品目{0}必须是库存品目
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,默认工作正在进行仓库
 apps/erpnext/erpnext/config/accounts.py +107,Default settings for accounting transactions.,业务会计的默认设置。
 apps/frappe/frappe/model/naming.py +40,{0} is required,{0}是必填项
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +21,Vacuum molding,真空成型
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,预计日期不能早于物料申请时间
 DocType: Contact Us Settings,City,城市
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +132,Ultrasonic machining,超声波加工
 apps/frappe/frappe/templates/base.html +137,Error: Not a valid id?,错误：没有有效的身份证？
 apps/erpnext/erpnext/stock/get_item_details.py +125,Item {0} must be a Sales Item,品目{0}必须是销售品目
 DocType: Naming Series,Update Series Number,更新序列号
@@ -3685,7 +3531,7 @@
 DocType: Sales Order,Printing Details,印刷详情
 DocType: Task,Closing Date,结算日期
 DocType: Sales Order Item,Produced Quantity,生产的产品数量
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +84,Engineer,工程师
+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 +379,Item Code required at Row No {0},行{0}中的品目编号是必须项
 DocType: Sales Partner,Partner Type,合作伙伴类型
@@ -3693,7 +3539,7 @@
 DocType: Authorization Rule,Customerwise Discount,客户折扣
 DocType: Purchase Invoice,Against Expense Account,对开支账目
 DocType: Production Order,Production Order,生产订单
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +258,Installation Note {0} has already been submitted,安装单{0}已经提交过
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +263,Installation Note {0} has already been submitted,安装单{0}已经提交过
 DocType: Quotation Item,Against Docname,对文档名称
 DocType: SMS Center,All Employee (Active),所有员工（活动）
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,立即查看
@@ -3702,19 +3548,19 @@
 DocType: Item,Re-Order Level,重新排序级别
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,输入要生产的品目和数量或者下载物料清单。
 apps/frappe/frappe/public/js/frappe/views/ganttview.js +45,Gantt Chart,甘特图
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +57,Part-time,兼任
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,Part-time,兼任
 DocType: Employee,Applicable Holiday List,可申请假期列表
 DocType: Employee,Cheque,支票
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,系列已更新
 apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Report Type is mandatory,报告类型是强制性的
 DocType: Item,Serial Number Series,序列号系列
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},行{1}中的物件{0}必须指定仓库
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +45,Retail & Wholesale,零售及批发
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,零售及批发
 DocType: Issue,First Responded On,首次回复时间
 DocType: Website Item Group,Cross Listing of Item in multiple groups,多个群组品目交叉显示
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +351,The First User: You,第一个用户：您
+apps/erpnext/erpnext/public/js/setup_wizard.js +101,The First User: You,第一个用户：您
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +48,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 +172,Successfully Reconciled,对账/盘点成功
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +119,Successfully Reconciled,对账/盘点成功
 DocType: Production Order,Planned End Date,计划的结束日期
 apps/erpnext/erpnext/config/stock.py +43,Where items are stored.,物件的存储位置。
 DocType: Tax Rule,Validity,有效性
@@ -3734,39 +3580,36 @@
 DocType: DocPerm,Level,级别
 DocType: Purchase Taxes and Charges,On Net Total,基于净总计
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +160,Target warehouse in row {0} must be same as Production Order,行{0}的目标仓库必须与生产订单的仓库相同
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +59,No permission to use Payment Tool,没有使用付款工具的权限
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +97,No permission to use Payment Tool,没有使用付款工具的权限
 apps/erpnext/erpnext/controllers/recurring_document.py +192,'Notification Email Addresses' not specified for recurring %s,循环%s中未指定“通知电子邮件地址”
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +86,Milling,磨
 apps/erpnext/erpnext/accounts/doctype/account/account.py +99,Currency can not be changed after making entries using some other currency,货币不能使用其他货币进行输入后更改
 DocType: Company,Round Off Account,四舍五入账户
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +60,Nibbling,嗑
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,行政开支
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +18,Consulting,咨询
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +18,Consulting,咨询
 DocType: Customer Group,Parent Customer Group,母公司集团客户
 apps/erpnext/erpnext/public/js/pos/pos.js +429,Change,变化
 DocType: Purchase Invoice,Contact Email,联络人电邮
 DocType: Appraisal Goal,Score Earned,已得分数
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +393,"e.g. ""My Company LLC""",例如“XX有限责任公司”
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +173,Notice Period,通知期
+apps/erpnext/erpnext/public/js/setup_wizard.js +141,"e.g. ""My Company LLC""",例如“XX有限责任公司”
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +173,Notice Period,通知期
 DocType: Bank Reconciliation Detail,Voucher ID,凭证ID
 apps/erpnext/erpnext/setup/doctype/territory/territory.js +14,This is a root territory and cannot be edited.,集团或Ledger ，借方或贷方，是特等帐户
 DocType: Packing Slip,Gross Weight UOM,毛重计量单位
 DocType: Email Digest,Receivables / Payables,应收/应付账款
 DocType: Delivery Note Item,Against Sales Invoice,对销售发票
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +63,Stamping,冲压
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +457,Credit Account,信用账户
 DocType: Landed Cost Item,Landed Cost Item,到岸成本品目
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +56,Show zero values,显示零值
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,原材料被生产/重新打包后得到的品目数量
 DocType: Payment Reconciliation,Receivable / Payable Account,应收/应付账款
 DocType: Delivery Note Item,Against Sales Order Item,对销售订单项目
-apps/erpnext/erpnext/stock/doctype/item/item.py +521,Please specify Attribute Value for attribute {0},请指定属性值的属性{0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +525,Please specify Attribute Value for attribute {0},请指定属性值的属性{0}
 DocType: Item,Default Warehouse,默认仓库
 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,打印量不
-apps/erpnext/erpnext/controllers/buying_controller.py +69,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,税项类型不能是“估值”或“估值和总计”，因为所有的物件都不是库存物件
+apps/erpnext/erpnext/controllers/buying_controller.py +60,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,税项类型不能是“估值”或“估值和总计”，因为所有的物件都不是库存物件
 DocType: User,Last Name,姓
 DocType: Web Page,Left,离开
 DocType: Event,All Day,全日
@@ -3774,7 +3617,7 @@
 DocType: Appraisal,Total Score (Out of 5),总分（满分5分）
 DocType: Contact Us Settings,State,状态
 DocType: Batch,Batch,批次
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +51,Balance,余额
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +28,Balance,余额
 DocType: Project,Total Expense Claim (via Expense Claims),总费用报销（通过费用报销）
 DocType: User,Gender,性别
 DocType: Journal Entry,Debit Note,借项通知单
@@ -3804,8 +3647,7 @@
 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/setup/page/setup_wizard/fixtures/operations.py +76,Seaming,封罐
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +197,"Company Email ID not found, hence mail not sent",公司电子邮件ID没有找到，因此邮件无法发送
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +206,"Company Email ID not found, hence mail not sent",公司电子邮件ID没有找到，因此邮件无法发送
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),资金(资产)申请
 DocType: Production Planning Tool,Filter based on item,根据项目筛选
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +451,Debit Account,借方科目
@@ -3817,17 +3659,16 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +95,{0} {1} has been modified. Please refresh.,{0} {1}已被修改过，请刷新。
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,禁止用户在以下日期提交假期申请。
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +591,From Opportunity,来自机会
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +46,Blanking,消隐
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +166,Employee Benefits,员工福利
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,Employee Benefits,员工福利
 DocType: Sales Invoice,Is POS,是否POS机
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +240,Packed quantity must equal quantity for Item {0} in row {1},盒装数量必须等于量项目{0}行{1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +245,Packed quantity must equal quantity for Item {0} in row {1},盒装数量必须等于量项目{0}行{1}
 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.,对客户开出的账单。
 DocType: DocField,Default,默认
 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 +466,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},行无{0}：金额不能大于金额之前对报销{1}。待审核金额为{2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +468,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}新增用户
 DocType: Maintenance Schedule,Schedule,计划任务
 DocType: Cost Center,"Define Budget for this Cost Center. To set budget action, see ""Company List""",定义预算这个成本中心。要设置预算的行动，请参阅“企业名录”
@@ -3838,7 +3679,7 @@
 apps/erpnext/erpnext/public/js/pos/pos.js +91,Price List not found or disabled,价格表未找到或禁用
 DocType: Expense Claim,Approved,已批准
 DocType: Pricing Rule,Price,价格
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +79,Employee relieved on {0} must be set as 'Left',{0}的假期批准后，雇员的状态必须设置为“离开”
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +88,Employee relieved on {0} must be set as 'Left',{0}的假期批准后，雇员的状态必须设置为“离开”
 DocType: Item,"Selecting ""Yes"" will give a unique identity to each entity of this item which can be viewed in the Serial No master.",选择“Yes”将为此品目的所有实体创建唯一标识，你可以在序列号大师中查看他们的序列好。
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +39,Appraisal {0} created for Employee {1} in the given date range,雇员{1}的限期评估{0}已经创建
 DocType: Employee,Education,教育
@@ -3849,7 +3690,7 @@
 apps/frappe/frappe/desk/moduleview.py +67,Standard Reports,标准报告
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,会计记账分录。
 DocType: Delivery Note Item,Available Qty at From Warehouse,可用数量从仓库
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +209,Please select Employee Record first.,请选择员工记录第一。
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +224,Please select Employee Record first.,请选择员工记录第一。
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,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 +233,Please enter Expense Account,请输入您的费用帐户
@@ -3862,46 +3703,43 @@
 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,基于上述标准拉销售订单（待定提供）
 DocType: DocShare,Document Type,文档类型
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +565,From Supplier Quotation,来自供应商报价
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +588,From Supplier Quotation,来自供应商报价
 DocType: Deduction Type,Deduction Type,扣款类型
 DocType: Attendance,Half Day,半天
 DocType: Pricing Rule,Min Qty,最小数量
 DocType: Features Setup,"To track items in sales and purchase documents with batch nos. ""Preferred Industry: Chemicals""",要跟踪与批次号的销售和采购文件的项目。 “首选行业：化工”
 DocType: GL Entry,Transaction Date,交易日期
 DocType: Production Plan Item,Planned Qty,计划数量
-apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +91,Total Tax,总税收
+apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +93,Total Tax,总税收
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +178,For Quantity (Manufactured Qty) is mandatory,对于数量（制造数量）是强制性的
 DocType: Stock Entry,Default Target Warehouse,默认目标仓库
 DocType: Purchase Invoice,Net Total (Company Currency),总净金额（公司货币）
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +79,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,行{0}：党的类型和党的只适用对应收/应付帐户
 DocType: Notification Control,Purchase Receipt Message,外购入库单信息
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +95,Total allocated leaves are more than period,分配的总叶多期
 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.,记录项目的运动。
 DocType: Newsletter List Subscriber,Newsletter List Subscriber,通讯订户名单
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +164,Morticing,Morticing
 DocType: Email Account,Service,服务
 DocType: Hub Settings,Hub Settings,Hub设置
 DocType: Project,Gross Margin %,毛利率％
 DocType: BOM,With Operations,带工艺
 apps/erpnext/erpnext/accounts/party.py +232,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,会计分录已取得货币{0}为公司{1}。请选择一个应收或应付账户币种{0}。
 ,Monthly Salary Register,月度工资记录
-apps/frappe/frappe/website/template.py +140,Next,下一个
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard_page.html +17,Next,下一个
 DocType: Warranty Claim,If different than customer address,如果客户地址不同的话
 DocType: BOM Operation,BOM Operation,BOM操作
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +118,Electropolishing,电解
 DocType: Purchase Taxes and Charges,On Previous Row Amount,基于前一行的金额
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +24,Please enter Payment Amount in atleast one row,请ATLEAST一行输入付款金额
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +33,Please enter Payment Amount in atleast one row,请ATLEAST一行输入付款金额
 DocType: POS Profile,POS Profile,POS简介
 apps/erpnext/erpnext/config/accounts.py +153,"Seasonality for setting budgets, targets etc.",设置季节性的预算，目标等。
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +238,Row {0}: Payment Amount cannot be greater than Outstanding Amount,行{0}：付款金额不能大于杰出金额
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +46,Total Unpaid,总未付
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +21,Time Log is not billable,时间日志是不计费
 apps/erpnext/erpnext/stock/get_item_details.py +128,"Item {0} is a template, please select one of its variants",项目{0}是一个模板，请选择它的一个变体
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +528,Purchaser,购买者
+apps/erpnext/erpnext/public/js/setup_wizard.js +272,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 +71,Please enter the Against Vouchers manually,请手动输入对优惠券
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +107,Please enter the Against Vouchers manually,请手动输入对优惠券
 DocType: SMS Settings,Static Parameters,静态参数
 DocType: Purchase Order,Advance Paid,已支付的预付款
 DocType: Item,Item Tax,品目税项
@@ -3910,14 +3748,12 @@
 apps/erpnext/erpnext/config/crm.py +48,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 +57,Actual Qty is mandatory,实际数量是必须项
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +42,Cross-rolling,交叉轧制
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +132,Credit Card,信用卡
+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 +95,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,请输入税费
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +85,Machining,加工
 DocType: Sales Invoice Item,Drop Ship,落船
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children",在这里，您可以维系家庭的详细信息，如姓名的父母，配偶和子女及职业
 DocType: Hub Settings,Seller Name,卖家名称
@@ -3927,7 +3763,7 @@
 DocType: Stock Entry,Repack,改装
 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/setup/page/setup_wizard/setup_wizard.js +500,Attach Logo,附加标志
+apps/erpnext/erpnext/public/js/setup_wizard.js +246,Attach Logo,附加标志
 DocType: Customer,Commission Rate,佣金率
 apps/erpnext/erpnext/stock/doctype/item/item.js +38,Make Variant,在Variant
 apps/erpnext/erpnext/config/hr.py +145,Block leave applications by department.,按部门禁止假期申请。
@@ -3942,19 +3778,19 @@
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +105,Please select a csv file,请选择一个csv文件
 DocType: Dropbox Backup,Send Backups to Dropbox,发送到备份Dropbox的
 DocType: Purchase Order,To Receive and Bill,接收和比尔
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +94,Designer,设计师
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Designer,设计师
 apps/erpnext/erpnext/config/selling.py +121,Terms and Conditions Template,条款和条件模板
 DocType: Serial No,Delivery Details,交货细节
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +383,Cost Center is required in row {0} in Taxes table for type {1},类型{1}税费表的行{0}必须有成本中心
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +386,Cost Center is required in row {0} in Taxes table for type {1},类型{1}税费表的行{0}必须有成本中心
 DocType: Item,Automatically create Material Request if quantity falls below this level,自动创建材料，如果申请数量低于这个水平
 ,Item-wise Purchase Register,品目特定的采购记录
 DocType: Batch,Expiry Date,到期时间
-apps/erpnext/erpnext/stock/doctype/item/item.py +375,"To set reorder level, item must be a Purchase Item or Manufacturing Item",要设置订货点水平，项目必须购买项目或生产项目
+apps/erpnext/erpnext/stock/doctype/item/item.py +379,"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.,项目主。
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,不要在货币旁显示货币代号，例如$等。
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +330, (Half Day),（半天）
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +374, (Half Day),（半天）
 DocType: Supplier,Credit Days,信用期
 DocType: Leave Type,Is Carry Forward,是否顺延假期
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +478,Get Items from BOM,从物料清单获取品目
@@ -3962,7 +3798,7 @@
 apps/erpnext/erpnext/config/manufacturing.py +120,Bill of Materials,材料清单
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +77,Row {0}: Party Type and Party is required for Receivable / Payable account {1},行{0}：党的类型和党的需要应收/应付帐户{1}
 DocType: Dropbox Backup,Send Notifications To,将通知发给
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html +26,Ref Date,参考日期
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +54,Ref Date,参考日期
 DocType: Employee,Reason for Leaving,离职原因
 DocType: Expense Claim Detail,Sanctioned Amount,已批准金额
 DocType: GL Entry,Is Opening,是否起始
@@ -3970,4 +3806,3 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +188,Account {0} does not exist,科目{0}不存在
 DocType: Account,Cash,现金
 DocType: Employee,Short biography for website and other publications.,在网站或其他出版物使用的个人简介。
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +31,Please create Salary Structure for employee {0},员工请建立薪酬结构{0}
diff --git a/erpnext/translations/zh-tw.csv b/erpnext/translations/zh-tw.csv
index bae4c27..4711b02 100644
--- a/erpnext/translations/zh-tw.csv
+++ b/erpnext/translations/zh-tw.csv
@@ -1,13 +1,12 @@
 DocType: Employee,Salary Mode,薪酬模式
 DocType: Cost Center,"Select Monthly Distribution, if you want to track based on seasonality.",選擇月度分配，如果你想根據季節進行跟踪。
 DocType: Employee,Divorced,離婚
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +86,Warning: Same item has been entered multiple times.,警告：相同項目已經輸入多次。
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +80,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,允許項目將在一個事務中多次添加
 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/page/setup_wizard/fixtures/industry_type.py +19,Consumer Products,消費類產品
+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,請選擇黨第一型
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +90,Annealing,退火
 DocType: Item,Customer Items,客戶項目
 apps/erpnext/erpnext/accounts/doctype/account/account.py +45,Account {0}: Parent account {1} can not be a ledger,帳戶{0}：父帳戶{1}不能是總帳
 DocType: Item,Publish Item to hub.erpnext.com,發布項目hub.erpnext.com
@@ -20,15 +19,14 @@
 DocType: About Us Settings,Website,網站
 DocType: POS Profile,Applicable for User,適用於用戶
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +169,"Stopped Production Order cannot be cancelled, Unstop it first to cancel",停止生產訂單無法取消，首先Unstop它取消
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +23,Compaction plus sintering,壓實加燒結
 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.,*將被計算在該交易。
 DocType: Purchase Order,Customer Contact,客戶聯繫
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +549,From Material Request,從物料需求
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +572,From Material Request,從物料需求
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0}樹
 DocType: Job Applicant,Job Applicant,求職者
 apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,沒有更多的結果。
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +78,Legal,法律
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +34,Legal,法律
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +114,Actual type tax cannot be included in Item rate in row {0},實際類型稅不能被包含在商品率排{0}
 DocType: C-Form,Customer,客戶
 DocType: Purchase Receipt Item,Required By,需求來自
@@ -43,7 +41,6 @@
 DocType: Manufacturing Settings,Default 10 mins,預設為10分鐘
 DocType: Leave Type,Leave Type Name,休假類型名稱
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +148,Series Updated Successfully,系列已成功更新
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +150,Stitching,拼接
 DocType: Pricing Rule,Apply On,適用於
 DocType: Item Price,Multiple Item prices.,多個項目的價格。
 ,Purchase Order Items To Be Received,未到貨的採購訂單項目
@@ -51,8 +48,8 @@
 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 +104,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 +189,New Leave Application,新假期申請
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +134,Bank Draft,銀行匯票
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +204,New Leave Application,新假期申請
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +134,Bank Draft,銀行匯票
 DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,1。使用這個選項來維護客戶的項目代碼，並可根據客戶的項目代碼做搜索。
 DocType: Mode of Payment Account,Mode of Payment Account,支付帳戶模式
 apps/erpnext/erpnext/stock/doctype/item/item.js +34,Show Variants,顯示變體
@@ -64,25 +61,23 @@
 DocType: Production Plan Item,Production Plan Item,生產計劃項目
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +141,User {0} is already assigned to Employee {1},用戶{0}已經被分配給員工{1}
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +13,Make new POS Profile,建立新的POS簡介
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +31,Health Care,保健
+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 +494,Invoice,發票
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +519,Invoice,發票
 DocType: Maintenance Schedule Item,Periodicity,週期性
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +357,Email Address,電子郵件地址
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +21,Defense,防禦
+apps/erpnext/erpnext/public/js/setup_wizard.js +107,Email Address,電子郵件地址
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,防禦
 DocType: Company,Abbr,縮寫
 DocType: Appraisal Goal,Score (0-5),得分（0-5）
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +193,Row {0}: {1} {2} does not match with {3},行{0}：{1} {2}不相匹配{3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +67,Row # {0}:,行＃{0}：
 DocType: Delivery Note,Vehicle No,車輛無
 apps/erpnext/erpnext/public/js/pos/pos.js +528,Please select Price List,請選擇價格表
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +162,Woodworking,木工
 DocType: Production Order Operation,Work In Progress,在製品
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +153,3D printing,3D列印
 DocType: Employee,Holiday List,假日列表
 DocType: Time Log,Time Log,時間日誌
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +530,Accountant,會計人員
+apps/erpnext/erpnext/public/js/setup_wizard.js +274,Accountant,會計人員
 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.",活動日誌由用戶對任務可用於跟踪時間，計費執行。
@@ -98,18 +93,19 @@
 DocType: Bin,Quantity Requested for Purchase,需購買的數量
 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/setup/page/setup_wizard/setup_wizard.js +626,Kg,公斤
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Kg,公斤
 apps/erpnext/erpnext/config/hr.py +48,Opening for a Job.,開放的工作。
 DocType: Item Attribute,Increment,增量
 apps/erpnext/erpnext/public/js/stock_analytics.js +63,Select Warehouse...,選擇倉庫...
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +6,Advertising,廣告
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,廣告
+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/doctype/sales_invoice/sales_invoice.py +389,Stock cannot be updated against Delivery Note {0},股票不能對送貨單更新的{0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +391,Stock cannot be updated against Delivery Note {0},股票不能對送貨單更新的{0}
 DocType: Payment Reconciliation,Reconcile,調和
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +30,Grocery,雜貨
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,雜貨
 DocType: Quality Inspection Reading,Reading 1,閱讀1
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Make Bank Entry,使銀行進入
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +40,Pension Funds,養老基金
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,養老基金
 apps/erpnext/erpnext/accounts/doctype/account/account.py +142,Warehouse is mandatory if account type is Warehouse,如果帳戶類型是倉庫，其倉庫項目是強制要設定的，
 DocType: SMS Center,All Sales Person,所有的銷售人員
 DocType: Lead,Person Name,人姓名
@@ -131,7 +127,7 @@
 DocType: Quality Inspection,Get Specification Details,獲取詳細規格
 DocType: Lead,Interested,有興趣
 apps/erpnext/erpnext/config/manufacturing.py +14,Bill of Material,物料清單
-apps/erpnext/erpnext/public/js/stock_analytics.js +45,Opening,開盤
+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,從項目群組複製
 DocType: Journal Entry,Opening Entry,開放報名
@@ -145,23 +141,22 @@
 DocType: Employee Education,Under Graduate,根據研究生
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +22,Target On,目標在
 DocType: BOM,Total Cost,總成本
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +99,Reaming,擴孔
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +9,Activity Log:,活動日誌：
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +199,Item {0} does not exist in the system or has expired,項目{0}不存在於系統中或已過期
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +44,Real Estate,房地產
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +44,Real Estate,房地產
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +4,Statement of Account,帳戶狀態
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +41,Pharmaceuticals,製藥
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,製藥
 DocType: Expense Claim Detail,Claim Amount,索賠金額
 DocType: Employee,Mr,先生
 DocType: Custom Script,Client,客戶
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,供應商類型/供應商
 DocType: Naming Series,Prefix,字首
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Consumable,耗材
+apps/erpnext/erpnext/public/js/setup_wizard.js +359,Consumable,耗材
 DocType: Upload Attendance,Import Log,導入日誌
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.js +19,Send,發送
 DocType: Sales Invoice Item,Delivered By Supplier,交付供應商
 DocType: SMS Center,All Contact,所有聯繫
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +164,Annual Salary,年薪
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +164,Annual Salary,年薪
 DocType: Period Closing Voucher,Closing Fiscal Year,截止會計年度
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +69,Stock Expenses,庫存費用
 DocType: Newsletter,Email Sent?,郵件發送？
@@ -169,7 +164,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +92,Show Time Logs,顯示的時間記錄
 DocType: Journal Entry Account,Credit in Company Currency,信用在公司貨幣
 DocType: Delivery Note,Installation Status,安裝狀態
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +115,Accepted + Rejected Qty must be equal to Received quantity for Item {0},品項{0}的允收＋批退的數量必須等於收到量
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +118,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 +133,Item {0} must be a Purchase Item,項{0}必須是一個採購項目
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
@@ -177,19 +172,17 @@
 在選定時間段內所有時間和員工的組合會在模板中，與現有的考勤記錄"
 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 +493,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included",要包括稅款，行{0}項率，稅收行{1}也必須包括在內
+apps/erpnext/erpnext/controllers/accounts_controller.py +494,"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 +90,Settings for HR Module,設定人力資源模塊
 DocType: SMS Center,SMS Center,短信中心
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +78,Straightening,直
 DocType: BOM Replace Tool,New BOM,新的物料清單
 apps/erpnext/erpnext/config/projects.py +28,Batch Time Logs for billing.,批處理的時間記錄進行計費。
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +15,Countergravity casting,反重力鑄造
 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/setup/page/setup_wizard/fixtures/industry_type.py +14,Broadcasting,廣播
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +140,Execution,執行
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +364,The first user will become the System Manager (you can change this later).,第一個用戶將成為系統管理器（你可以改變這個版本）。
+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/public/js/setup_wizard.js +114,The first user will become the System Manager (you can change this later).,第一個用戶將成為系統管理器（你可以改變這個版本）。
 apps/erpnext/erpnext/config/manufacturing.py +39,Details of the operations carried out.,進行的作業細節。
 DocType: Serial No,Maintenance Status,維修狀態
 apps/erpnext/erpnext/config/stock.py +263,Items and Pricing,項目和定價
@@ -206,7 +199,6 @@
 DocType: Pricing Rule,Discount on Price List Rate (%),折扣價目表率（％）
 apps/frappe/frappe/public/js/frappe/form/print.js +96,Start,開始
 DocType: User,First Name,名字
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +12,Full-mold casting,全模鑄造
 DocType: Offer Letter,Select Terms and Conditions,選擇條款和條件
 DocType: Production Planning Tool,Sales Orders,銷售訂單
 DocType: Purchase Taxes and Charges,Valuation,計價
@@ -218,8 +210,7 @@
 DocType: Bank Reconciliation,Bank Account,銀行帳戶
 DocType: Leave Type,Allow Negative Balance,允許負平衡
 DocType: Selling Settings,Default Territory,預設地域
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +53,Television,電視
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +138,Gashing,Gashing
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,電視
 DocType: Production Order Operation,Updated via 'Time Log',通過“時間日誌”更新
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +82,Account {0} does not belong to Company {1},帳戶{0}不屬於公司{1}
 DocType: Naming Series,Series List for this Transaction,本交易系列表
@@ -234,14 +225,13 @@
 DocType: Leave Allocation,Add unused leaves from previous allocations,添加未使用的葉子從以前的分配
 apps/erpnext/erpnext/controllers/recurring_document.py +206,Next Recurring {0} will be created on {1},下一循環{0}將上創建{1}
 DocType: Newsletter List,Total Subscribers,用戶總數
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +575,Contact Name,聯繫人姓名
+,Contact Name,聯繫人姓名
 DocType: Production Plan Item,SO Pending Qty,SO待定數量
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,建立工資單上面提到的標準。
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,請求您的報價。
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +107,Double housing,雙人房
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +156,Only the selected Leave Approver can submit this Leave Application,只有選擇的休假審批者可以提交此請假
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +171,Only the selected Leave Approver can submit this Leave Application,只有選擇的休假審批者可以提交此請假
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,解除日期必須大於加入的日期
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +172,Leaves per Year,每年葉
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +172,Leaves per Year,每年葉
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup > Settings > Naming Series,請設置命名序列{0}通過設置&gt;設置&gt;命名系列
 DocType: Time Log,Will be updated when batched.,批處理時將被更新。
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +104,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,行{0}：請檢查'是推進'對帳戶{1}，如果這是一個進步條目。
@@ -250,25 +240,24 @@
 DocType: Item Website Specification,Item Website Specification,項目網站規格
 DocType: Dropbox Backup,Dropbox Access Key,Dropbox Access Key
 DocType: Payment Tool,Reference No,參考編號
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +348,Leave Blocked,禁假的
-apps/erpnext/erpnext/stock/doctype/item/item.py +535,Item {0} has reached its end of life on {1},項{0}已達到其壽命結束於{1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +392,Leave Blocked,禁假的
+apps/erpnext/erpnext/stock/doctype/item/item.py +539,Item {0} has reached its end of life on {1},項{0}已達到其壽命結束於{1}
 apps/erpnext/erpnext/accounts/utils.py +339,Annual,全年
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,庫存調整項目
 DocType: Stock Entry,Sales Invoice No,銷售發票號碼
 DocType: Material Request Item,Min Order Qty,最小訂貨量
 DocType: Lead,Do Not Contact,不要聯繫
 DocType: Sales Invoice,The unique id for tracking all recurring invoices. It is generated on submit.,唯一ID來跟踪所有的經常性發票。它是在提交生成的。
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +93,Software Developer,軟件開發人員
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +93,Software Developer,軟件開發人員
 DocType: Item,Minimum Order Qty,最低起訂量
 DocType: Pricing Rule,Supplier Type,供應商類型
 DocType: Item,Publish in Hub,在發布中心
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +555,Item {0} is cancelled,項{0}將被取消
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +598,Material Request,物料需求
+apps/erpnext/erpnext/stock/doctype/item/item.py +559,Item {0} is cancelled,項{0}將被取消
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +607,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}未發現“原材料提供&#39;表中的採購訂單{1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +129,Wire brushing,鋼絲刷
 DocType: Employee,Relation,關係
 DocType: Shipping Rule,Worldwide Shipping,全球航運
 apps/erpnext/erpnext/config/selling.py +23,Confirmed orders from Customers.,確認客戶的訂單。
@@ -284,12 +273,11 @@
 DocType: Supplier,Address HTML,地址HTML
 DocType: Lead,Mobile No.,手機號碼
 DocType: Maintenance Schedule,Generate Schedule,生成時間表
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +81,Hubbing,樞紐
 DocType: Purchase Invoice Item,Expense Head,總支出
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +86,Please select Charge Type first,請先選擇付款類別
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,最新
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +395,Max 5 characters,最多5個字符
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +195,Select Your Language,選擇您的語言
+apps/erpnext/erpnext/public/js/setup_wizard.js +143,Max 5 characters,最多5個字符
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +245,Select Your Language,選擇您的語言
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,該列表中的第一個請假審核將被設定為預設請假審核
 DocType: Manufacturing Settings,"Disables creation of time logs against Production Orders.
 Operations shall not be tracked against Production Order",禁止對創作生產訂單的時間日誌。操作不得對生產訂單追踪
@@ -301,8 +289,6 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +34,Item {0} must be Service Item,項{0}必須是服務項目
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +303,Completed Qty can not be greater than 'Qty to Manufacture',完成數量不能大於“數量來製造”
 DocType: DocType,Administrator,管理員
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +136,Laser drilling,激光打孔
-DocType: Stock UOM Replace Utility,New Stock UOM,新的庫存計量單位
 DocType: Period Closing Voucher,Closing Account Head,關閉帳戶頭
 DocType: Employee,External Work History,外部工作經歷
 apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,循環引用錯誤
@@ -311,18 +297,15 @@
 DocType: Lead,Industry,行業
 DocType: Employee,Job Profile,工作簡介
 DocType: Newsletter,Newsletter,新聞
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +84,Hydroforming,液壓成形
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +49,Necking,縮頸
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,在創建自動材料需求時已電子郵件通知
 DocType: Journal Entry,Multi Currency,多幣種
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +51,Item is updated,項目更新
 DocType: Async Task,System Manager,系統管理器
 DocType: Payment Reconciliation Invoice,Invoice Type,發票類型
 DocType: Sales Invoice Item,Delivery Note,送貨單
 DocType: Dropbox Backup,Allow Dropbox Access,讓Dropbox的訪問
 apps/erpnext/erpnext/config/learn.py +72,Setting up Taxes,建立稅
 apps/erpnext/erpnext/accounts/utils.py +189,Payment Entry has been modified after you pulled it. Please pull it again.,付款項被修改，你把它之後。請重新拉。
-apps/erpnext/erpnext/stock/doctype/item/item.py +343,{0} entered twice in Item Tax,{0}輸入兩次項目稅
+apps/erpnext/erpnext/stock/doctype/item/item.py +347,{0} entered twice in Item Tax,{0}輸入兩次項目稅
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +105,Summary for this week and pending activities,本週和待活動總結
 DocType: Workstation,Rent Cost,租金成本
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +74,Please select month and year,請選擇年份和月份
@@ -339,24 +322,22 @@
 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/buying/doctype/purchase_order/purchase_order.js +517,Select Item,選擇項目
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +540,Select Item,選擇項目
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +143,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","項目：{0}管理分批，不能使用\
 庫存調整，而是使用庫存分錄。"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +259,Purchase Invoice {0} is already submitted,採購發票{0}已經提交
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +262,Purchase Invoice {0} is already submitted,採購發票{0}已經提交
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Batch No must be same as {1} {2},行＃{0}：批號必須與{1} {2}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Convert to non-Group,轉換為非集團
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +55,Purchase Receipt must be submitted,購買收據必須提交
-DocType: Stock UOM Replace Utility,Current Stock UOM,目前的庫存計量單位
 apps/erpnext/erpnext/config/stock.py +53,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}
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Your email address,您的電子郵件地址
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +194,Please see attachment,請參閱附件
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +203,Please see attachment,請參閱附件
 DocType: Purchase Order,% Received,％ 已收
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +109,Water jet cutting,水射流切割
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +24,Setup Already Complete!!,安裝已經完成！
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +20,Setup Already Complete!!,安裝已經完成！
 ,Finished Goods,成品
 DocType: Delivery Note,Instructions,說明
 DocType: Quality Inspection,Inspected By,視察
@@ -371,6 +352,7 @@
 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,外幣兌換
 DocType: Purchase Invoice Item,Item Name,項目名稱
+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",這是“缺貨”的項目被要求考慮根據預計數量和最小起訂量為所有倉庫
@@ -380,11 +362,10 @@
 ,Purchase Register,購買註冊
 DocType: Landed Cost Item,Applicable Charges,相關費用
 DocType: Workstation,Consumable Cost,耗材成本
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,{0} ({1}) must have role 'Leave Approver',"{0}（{1}）必須有權限 ""假期審批“"
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +167,{0} ({1}) must have role 'Leave Approver',"{0}（{1}）必須有權限 ""假期審批“"
 DocType: Purchase Receipt,Vehicle Date,車日期
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +39,Medical,醫療
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +39,Medical,醫療
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,原因丟失
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +36,Tube beading,管釘珠
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},工作站在以下日期關閉按假日列表：{0}
 DocType: Employee,Single,單
 DocType: Issue,Attachment,附件
@@ -405,10 +386,8 @@
 DocType: Account,Is Group,是集團
 DocType: Stock Settings,Automatically Set Serial Nos based on FIFO,自動設置序列號的基礎上FIFO
 DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,檢查供應商發票編號唯一性
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +31,Thermoforming,熱成型
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +66,Slitting,縱剪
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +57,'To Case No.' cannot be less than 'From Case No.',“至案件編號”不能少於'從案件編號“
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +104,Non Profit,非營利
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +104,Non Profit,非營利
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_list.js +7,Not Started,未啟動
 DocType: Lead,Channel Partner,渠道合作夥伴
 DocType: Account,Old Parent,老家長
@@ -417,13 +396,12 @@
 apps/erpnext/erpnext/config/manufacturing.py +74,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 +512,Attribute {0} selected multiple times in Attributes Table,屬性{0}多次選擇在屬性表
+apps/erpnext/erpnext/stock/doctype/item/item.py +516,Attribute {0} selected multiple times in Attributes Table,屬性{0}多次選擇在屬性表
 DocType: Sales Order,Not Applicable,不適用
 apps/erpnext/erpnext/config/hr.py +140,Holiday master.,假日高手。
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +19,Shell molding,外殼成型
 DocType: Material Request Item,Required Date,所需時間
 DocType: Delivery Note,Billing Address,帳單地址
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +644,Please enter Item Code.,請輸入產品編號。
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +648,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,總數量
@@ -433,7 +411,7 @@
 DocType: Item Attribute,To Range,為了範圍
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,證券及存款
 DocType: Features Setup,Imports,進口
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +144,Adhesive bonding,粘接
+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.,考勤記錄。
@@ -441,26 +419,25 @@
 DocType: Sales Order Item,Used for Production Plan,用於生產計劃
 DocType: System Settings,Loading...,載入中...
 DocType: DocField,Password,密碼
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +155,Fused deposition modeling,熔融沉積成型
 DocType: Manufacturing Settings,Time Between Operations (in mins),作業間隔時間（以分鐘計）
 DocType: Customer,Buyer of Goods and Services.,買家商品和服務。
 DocType: Journal Entry,Accounts Payable,應付帳款
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +24,Add Subscribers,添加訂閱
 apps/erpnext/erpnext/public/js/feature_setup.js +220,""" does not exists",“不存在
 DocType: Pricing Rule,Valid Upto,到...為止有效
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +564,List a few of your customers. They could be organizations or individuals.,列出一些你的客戶。他們可以是組織或個人。
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,List a few of your customers. They could be organizations or individuals.,列出一些你的客戶。他們可以是組織或個人。
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Direct Income,直接收入
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +33,"Can not filter based on Account, if grouped by Account",7 。總計：累積總數達到了這一點。
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +88,Administrative Officer,政務主任
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Administrative Officer,政務主任
 DocType: Payment Tool,Received Or Paid,收到或支付
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +318,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 +305,Please enter Warehouse for which Material Request will be raised,請輸入物料需求欲增加的倉庫
 DocType: Production Order,Additional Operating Cost,額外的運營成本
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +20,Cosmetics,化妝品
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,化妝品
 DocType: DocField,Type,類型
-apps/erpnext/erpnext/stock/doctype/item/item.py +417,"To merge, following properties must be same for both items",若要合併，以下屬性必須為這兩個項目是相同的
+apps/erpnext/erpnext/stock/doctype/item/item.py +421,"To merge, following properties must be same for both items",若要合併，以下屬性必須為這兩個項目是相同的
 DocType: Communication,Subject,主題
 DocType: Shipping Rule,Net Weight,淨重
 DocType: Employee,Emergency Phone,緊急電話
@@ -470,7 +447,6 @@
 DocType: Journal Entry,Difference (Dr - Cr),差異（Dr - Cr）
 DocType: Account,Profit and Loss,損益
 apps/erpnext/erpnext/config/stock.py +293,Managing Subcontracting,管理轉包
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +58,New UOM must NOT be of type Whole Number,新的計量單位不能是類型整數
 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 +47,Account {0} does not belong to company: {1},帳戶{0}不屬於公司：{1}
@@ -490,14 +466,14 @@
 DocType: Purchase Invoice,Supplier Invoice No,供應商發票號碼
 DocType: Territory,For reference,供參考
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +154,"Cannot delete Serial No {0}, as it is used in stock transactions",無法刪除序列號{0}，因為它採用的是現貨交易
-apps/erpnext/erpnext/public/js/account_tree_grid.js +52,Closing (Cr),關閉（Cr）
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +227,Closing (Cr),關閉（Cr）
 DocType: Serial No,Warranty Period (Days),保修期限（天數）
 DocType: Installation Note Item,Installation Note Item,安裝注意項
 ,Pending Qty,待定數量
 DocType: Job Applicant,Thread HTML,主題HTML
 DocType: Company,Ignore,忽略
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +86,SMS sent to following numbers: {0},短信發送至以下號碼：{0}
-apps/erpnext/erpnext/controllers/buying_controller.py +135,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,對於轉包的採購入庫單，供應商倉庫是強制性輸入的。
+apps/erpnext/erpnext/controllers/buying_controller.py +126,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,對於轉包的採購入庫單，供應商倉庫是強制性輸入的。
 DocType: Pricing Rule,Valid From,有效期自
 DocType: Sales Invoice,Total Commission,佣金總計
 DocType: Pricing Rule,Sales Partner,銷售合作夥伴
@@ -507,7 +483,7 @@
 To distribute a budget using this distribution, set this **Monthly Distribution** in the **Cost Center**","**月**分佈幫助你分配你整個月的預算，如果你有季節性的業務。
 
 要使用這種分佈分配預算，在**成本中心**設置這個**月**分佈"
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +183,No records found in the Invoice table,沒有在發票表中找到記錄
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +130,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 +84,Financial / accounting year.,財務／會計年度。
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged",對不起，序列號無法合併
@@ -523,25 +499,25 @@
 DocType: Sales Order,Billing and Delivery Status,結算和交貨狀態
 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/setup/page/setup_wizard/setup_wizard_page.html +16,Previous,上一筆
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard_page.html +16,Previous,上一筆
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +620,Sales Return,銷貨退回
 DocType: Production Planning Tool,Select Sales Orders from which you want to create Production Orders.,要從創建生產訂單選擇銷售訂單。
 DocType: Item,Delivered by Supplier (Drop Ship),由供應商交貨（直接發運）
 apps/erpnext/erpnext/config/hr.py +120,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.,客戶數據庫。
 DocType: Quotation,Quotation To,報價到
 DocType: Lead,Middle Income,中等收入
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),開啟（Cr ）
 apps/erpnext/erpnext/accounts/utils.py +193,Allocated amount can not be negative,分配金額不能為負
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +123,Tumbling,翻筋斗
 DocType: Purchase Order Item,Billed Amt,已結算額
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,對這些庫存分錄帳進行的邏輯倉庫。
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +92,Reference No & Reference Date is required for {0},參考號與參考日期須為{0}
 DocType: Event,Wednesday,星期三
 DocType: Sales Invoice,Customer's Vendor,客戶的供應商
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +214,Production Order is Mandatory,生產訂單是強制性
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +139,Proposal Writing,提案寫作
+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/stock/stock_ledger.py +336,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},負庫存錯誤（ {6}）的項目{0}在倉庫{1}在{2} {3} {4} {5}
 DocType: Fiscal Year Company,Fiscal Year Company,會計年度公司
@@ -564,7 +540,7 @@
 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/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.py +179,Please install dropbox python module,請安裝Dropbox的Python模塊
 DocType: Employee,Passport Number,護照號碼
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +82,Manager,經理
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Manager,經理
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +494,From Purchase Receipt,從採購入庫單
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +219,Same item has been entered multiple times.,相同的項目已被輸入多次。
 DocType: SMS Settings,Receiver Parameter,收受方參數
@@ -572,10 +548,9 @@
 DocType: Sales Person,Sales Person Targets,銷售人員目標
 apps/frappe/frappe/public/js/frappe/form/workflow.js +116,To,到
 apps/frappe/frappe/templates/base.html +145,Please enter email address,請輸入您的電子郵件地址
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +35,End tube forming,尾管成型
 DocType: Production Order Operation,In minutes,在幾分鐘內
 DocType: Issue,Resolution Date,決議日期
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +635,Please set default Cash or Bank account in Mode of Payment {0},請設定現金或銀行帳戶的預設付款方式{0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +637,Please set default Cash or Bank account in Mode of Payment {0},請設定現金或銀行帳戶的預設付款方式{0}
 DocType: Selling Settings,Customer Naming By,客戶命名由
 apps/erpnext/erpnext/accounts/doctype/account/account.js +67,Convert to Group,轉換為集團
 DocType: Activity Cost,Activity Type,活動類型
@@ -583,12 +558,12 @@
 DocType: Customer,Fixed Days,固定天
 DocType: Sales Invoice,Packing List,包裝清單
 apps/erpnext/erpnext/config/buying.py +28,Purchase Orders given to Suppliers.,購買給供應商的訂單。
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +43,Publishing,出版
+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 +198,{0}: {1} not found in Invoice Details table,{0}：在發票明細表中找不到{1}
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,{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 +208,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,維護訪問{0}必須取消這個銷售訂單之前被取消
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +203,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}
@@ -600,7 +575,6 @@
 DocType: Pricing Rule,Sales Manager,銷售經理
 apps/frappe/frappe/public/js/frappe/model/model.js +492,Rename,重命名
 DocType: Journal Entry,Write Off Amount,核銷金額
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +52,Bending,彎曲
 apps/frappe/frappe/core/page/user_permissions/user_permissions.js +246,Allow User,允許用戶
 DocType: Journal Entry,Bill No,帳單號碼
 DocType: Purchase Invoice,Quarterly,每季
@@ -610,17 +584,16 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Please enter item details,請輸入項目細節
 DocType: Purchase Receipt,Other Details,其他詳細資訊
 DocType: Account,Accounts,會計
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +67,Marketing,市場營銷
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +65,Straight shearing,直剪
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +67,Marketing,市場營銷
 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/stock/doctype/purchase_receipt/purchase_receipt.py +99,Rejected Warehouse is mandatory against regected item,拒絕倉庫是必須反對regected項目
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +102,Rejected Warehouse is mandatory against regected item,拒絕倉庫是必須反對regected項目
 DocType: Account,Expenses Included In Valuation,支出計入估值
 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,報價函期限
-apps/erpnext/erpnext/stock/doctype/item/item.py +492,Item has variants.,項目已變種。
+apps/erpnext/erpnext/stock/doctype/item/item.py +496,Item has variants.,項目已變種。
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,項{0}未找到
 DocType: Bin,Stock Value,庫存價值
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,樹類型
@@ -629,10 +602,9 @@
 DocType: Material Request Item,Quantity and Warehouse,數量和倉庫
 DocType: Sales Invoice,Commission Rate (%),佣金率（％）
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +172,"Against Voucher Type must be one of Sales Order, Sales Invoice or Journal Entry",對憑證類型必須是一個銷售訂單，銷售發票或日記帳分錄
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +139,Biomachining,Biomachining
 apps/erpnext/erpnext/setup/utils.py +89,Unable to find exchange rate,找不到匯率
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +7,Aerospace,航天
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +19,Welcome,歡迎
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +7,Aerospace,航天
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +40,Welcome,歡迎
 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.,從供應商收到貨。
@@ -655,19 +627,19 @@
 DocType: Employee,Cell Number,手機號碼
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,丟失
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +120,You can not enter current voucher in 'Against Journal Entry' column,在您不能輸入電流券“對日記帳分錄”專欄
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +25,Energy,能源
+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.,月薪聲明。
 DocType: Item Group,Website Specifications,網站規格
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +205,New Account,新帳號
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +21,{0}: From {0} of type {1},{0}：從{0}類型{1}
-apps/erpnext/erpnext/controllers/buying_controller.py +283,Row {0}: Conversion Factor is mandatory,列#{0}：轉換係數是強制性的
+apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,列#{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.,會計分錄可針對葉節點。不允許針對組的分錄。
 DocType: ToDo,High,高
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +361,Cannot deactivate or cancel BOM as it is linked with other BOMs,無法關閉或取消BOM，因為它是與其他材料明細表鏈接
 DocType: Opportunity,Maintenance,維護
 DocType: User,Male,男性
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +182,Purchase Receipt number required for Item {0},物品{0}所需交易收據號碼
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +183,Purchase Receipt number required for Item {0},物品{0}所需交易收據號碼
 DocType: Item Attribute Value,Item Attribute Value,項目屬性值
 apps/erpnext/erpnext/config/crm.py +64,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.
@@ -715,10 +687,9 @@
 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 +324,"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/page/setup_wizard/fixtures/industry_type.py +13,Biotechnology,生物技術
+apps/erpnext/erpnext/controllers/accounts_controller.py +325,"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/setup/page/setup_wizard/fixtures/operations.py +53,Hemming,海明
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +66,Please enter Item first,請先輸入品項
 DocType: Account,Liability,責任
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +62,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,制裁金額不能大於索賠額行{0}。
@@ -731,10 +702,10 @@
 DocType: Company,Default Bank Account,預設銀行帳戶
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +47,"To filter based on Party, select Party Type first",要根據黨的篩選，選擇黨第一類型
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},不能勾選`更新庫存'，因為項目未交付{0}
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Nos,NOS
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,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 +627,My Invoices,我的發票
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +629,My Invoices,我的發票
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,無發現任何員工
 DocType: Purchase Order,Stopped,停止
 DocType: Item,If subcontracted to a vendor,如果分包給供應商
@@ -753,35 +724,33 @@
 DocType: Features Setup,"To enable ""Point of Sale"" features",為了使“銷售點”的特點
 DocType: Bin,Moving Average Rate,移動平均房價
 DocType: Production Planning Tool,Select Items,選擇項目
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,{0} against Bill {1} dated {2},{0}針對帳單{1}日期{2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +328,{0} against Bill {1} dated {2},{0}針對帳單{1}日期{2}
 DocType: Comment,Reference Name,參考名稱
 DocType: Maintenance Visit,Completion Status,完成狀態
 DocType: Sales Invoice Item,Target Warehouse,目標倉庫
 DocType: Item,Allow over delivery or receipt upto this percent,允許在交付或接收高達百分之這
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +49,Expected Delivery Date cannot be before Sales Order Date,預計交貨日期不能早於銷售訂單日期
 DocType: Upload Attendance,Import Attendance,進口出席
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +17,All Item Groups,所有項目群組
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +17,All Item Groups,所有項目群組
 DocType: Process Payroll,Activity Log,活動日誌
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +30,Net Profit / Loss,淨利／虧損
 apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,自動編寫郵件在提交交易。
 DocType: Production Order,Item To Manufacture,產品製造
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +16,Permanent mold casting,永久模鑄造
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1}的狀態為{2}
 apps/erpnext/erpnext/config/learn.py +172,Purchase Order to Payment,採購訂單到付款
 DocType: Sales Order Item,Projected Qty,預計數量
 DocType: Sales Invoice,Payment Due Date,付款到期日
 DocType: Newsletter,Newsletter Manager,通訊經理
-apps/erpnext/erpnext/stock/doctype/item/item.js +229,Item Variant {0} already exists with same attributes,項目變種{0}已經具有相同屬性的存在
+apps/erpnext/erpnext/stock/doctype/item/item.js +231,Item Variant {0} already exists with same attributes,項目變種{0}已經具有相同屬性的存在
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening',“開放”
 DocType: Notification Control,Delivery Note Message,送貨單留言
 DocType: Expense Claim,Expenses,開支
 DocType: Item Variant Attribute,Item Variant Attribute,產品規格屬性
 ,Purchase Receipt Trends,採購入庫趨勢
 DocType: Appraisal,Select template from which you want to get the Goals,選擇您想要得到的目標模板
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +77,Research & Development,研究與發展
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Research & Development,研究與發展
 ,Amount to Bill,帳單數額
 DocType: Company,Registration Details,註冊細節
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +75,Staking,跑馬圈地
 DocType: Item,Re-Order Qty,重新排序數量
 DocType: Leave Block List Date,Leave Block List Date,休假區塊清單日期表
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +25,Scheduled to send to {0},要寄送給{0}的排程
@@ -792,18 +761,16 @@
 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/hr/doctype/leave_allocation/leave_allocation.py +71,Cannot carry forward {0},不能發揚{0}
 apps/erpnext/erpnext/accounts/doctype/account/account.py +91,"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,報銷回絕訊息
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +145,Nailing,釘
 ,Available Qty,可用數量
 DocType: Purchase Taxes and Charges,On Previous Row Total,在上一行共
 DocType: Salary Slip,Working Days,工作日
 DocType: Serial No,Incoming Rate,傳入速率
 DocType: Packing Slip,Gross Weight,毛重
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +410,The name of your company for which you are setting up this system.,您的公司要為其設立這個系統的名稱。
+apps/erpnext/erpnext/public/js/setup_wizard.js +158,The name of your company for which you are setting up this system.,您的公司要為其設立這個系統的名稱。
 DocType: HR Settings,Include holidays in Total no. of Working Days,包括節假日的總數。工作日
 DocType: Job Applicant,Hold,持有
 DocType: Employee,Date of Joining,加入日期
@@ -813,7 +780,6 @@
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +3,View Subscribers,查看訂閱
 DocType: Purchase Invoice Item,Purchase Receipt,採購入庫單
 ,Received Items To Be Billed,待付款的收受品項
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +114,Abrasive blasting,噴砂
 DocType: Employee,Ms,女士
 apps/erpnext/erpnext/config/accounts.py +148,Currency exchange rate master.,貨幣匯率的主人。
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +253,Unable to find Time Slot in the next {0} days for Operation {1},找不到時隙在未來{0}天操作{1}
@@ -825,7 +791,7 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +209,Serial No {0} does not belong to Item {1},序列號{0}不屬於項目{1}
 DocType: Purchase Receipt Item Supplied,Required Qty,所需數量
 DocType: Bank Reconciliation,Total Amount,總金額
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +32,Internet Publishing,互聯網出版
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,互聯網出版
 DocType: Production Planning Tool,Production Orders,生產訂單
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +35,Balance Value,平衡值
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,銷售價格表
@@ -836,7 +802,7 @@
 DocType: Supplier,Default Payable Accounts,預設應付帳款
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,員工{0}不活躍或不存在
 DocType: Features Setup,Item Barcode,商品條碼
-apps/erpnext/erpnext/stock/doctype/item/item.py +487,Item Variants {0} updated,項目變種{0}更新
+apps/erpnext/erpnext/stock/doctype/item/item.py +491,Item Variants {0} updated,項目變種{0}更新
 DocType: Quality Inspection Reading,Reading 6,6閱讀
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,購買發票提前
 DocType: Address,Shop,店
@@ -845,7 +811,7 @@
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,預設銀行/現金帳戶將被在POS機開發票，且選擇此模式時自動更新。
 DocType: Employee,Permanent Address Is,永久地址
 DocType: Production Order Operation,Operation completed for how many finished goods?,操作完成多少成品？
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +491,The Brand,品牌
+apps/erpnext/erpnext/public/js/setup_wizard.js +237,The Brand,品牌
 apps/erpnext/erpnext/controllers/status_updater.py +163,Allowance for over-{0} crossed for Item {1}.,備抵過{0}越過為項目{1}。
 DocType: Employee,Exit Interview Details,退出面試細節
 DocType: Item,Is Purchase Item,是購買項目
@@ -865,16 +831,16 @@
 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,將付款金額=未償還
 DocType: Contact Us Settings,Address Line 1,地址行1
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Variance,方差
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +392,Company Name,公司名稱
+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 +515,Select Item for Transfer,對於轉讓項目選擇
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +538,Select Item for Transfer,對於轉讓項目選擇
 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.,選取支票存入該銀行帳戶的頭。
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,允許用戶編輯價目表率的交易
 DocType: Pricing Rule,Max Qty,最大數量
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +106,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,行{0}：付款方式對銷售/採購訂單應始終被標記為提前
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +16,Chemical,化學藥品
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,化學藥品
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +693,All items have already been transferred for this Production Order.,所有項目都已經被轉移為這個生產訂單。
 DocType: Process Payroll,Select Payroll Year and Month,選擇薪資年和月
 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""",轉到相應的群組（通常資金運用>流動資產>銀行帳戶，並新增一個新帳戶（通過點擊添加類型的兒童），“銀行”
@@ -885,12 +851,12 @@
 DocType: Item,Inspection Criteria,檢驗標準
 apps/erpnext/erpnext/config/accounts.py +101,Tree of finanial Cost Centers.,樹finanial成本中心。
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,轉移
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +492,Upload your letter head and logo. (you can edit them later).,上傳你的信頭和標誌。 （您可以在以後對其進行編輯）。
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +156,White,白
+apps/erpnext/erpnext/public/js/setup_wizard.js +238,Upload your letter head and logo. (you can edit them later).,上傳你的信頭和標誌。 （您可以在以後對其進行編輯）。
+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/setup/page/setup_wizard/setup_wizard.js +362,Attach Your Picture,附上你的照片
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Make ,使
+apps/erpnext/erpnext/public/js/setup_wizard.js +112,Attach Your Picture,附上你的照片
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +540,Make ,使
 DocType: Journal Entry,Total Amount in Words,總金額大寫
 DocType: Workflow State,Stop,停止
 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如果問題仍然存在。
@@ -899,14 +865,13 @@
 DocType: Lead,Next Contact Date,下次聯絡日期
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,開放數量
 DocType: Holiday List,Holiday List Name,假日列表名稱
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +168,Stock Options,股票期權
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +168,Stock Options,股票期權
 DocType: Journal Entry Account,Expense Claim,報銷
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +181,Qty for {0},數量為{0}
 DocType: Leave Application,Leave Application,休假申請
 apps/erpnext/erpnext/config/hr.py +77,Leave Allocation Tool,排假工具
 DocType: Leave Block List,Leave Block List Dates,休假區塊清單日期表
 DocType: Company,If Monthly Budget Exceeded (for expense account),如果每月超出預算（用於報銷）
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +56,Trimming,修剪
 DocType: Workstation,Net Hour Rate,淨小時率
 DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,到岸成本採購入庫單
 DocType: Company,Default Terms,默認條款
@@ -914,10 +879,9 @@
 DocType: POS Profile,Cash/Bank Account,現金／銀行帳戶
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,Removed items with no change in quantity or value.,刪除的項目在數量或價值沒有變化。
 DocType: Delivery Note,Delivery To,交貨給
-apps/erpnext/erpnext/stock/doctype/item/item.py +509,Attribute table is mandatory,屬性表是強制性的
+apps/erpnext/erpnext/stock/doctype/item/item.py +513,Attribute table is mandatory,屬性表是強制性的
 DocType: Production Planning Tool,Get Sales Orders,獲取銷售訂單
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0}不能為負數
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +103,Filing,備案
 apps/erpnext/erpnext/templates/form_grid/item_grid.html +72,Discount,折扣
 DocType: Features Setup,Purchase Discounts,採購折扣
 DocType: Workstation,Wages,工資
@@ -934,6 +898,7 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +112,You are the Expense Approver for this record. Please Update the 'Status' and Save,你是這條記錄的費用批審人，請更新“狀態”並儲存
 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 +136,"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 +194,Serial No {0} is under maintenance contract upto {1},序列號{0}在維護合約期間內直到{1}
@@ -942,7 +907,7 @@
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,銷售費用
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Buying,標準採購
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +120,Standard Buying,標準採購
 DocType: GL Entry,Against,針對
 DocType: Item,Default Selling Cost Center,預設銷售成本中心
 DocType: Sales Partner,Implementation Partner,實施合作夥伴
@@ -963,29 +928,29 @@
 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/setup/page/setup_wizard/setup_wizard.js +588,List a few of your suppliers. They could be organizations or individuals.,列出一些你的供應商。他們可以是組織或個人。
+apps/erpnext/erpnext/public/js/setup_wizard.js +326,List a few of your suppliers. They could be organizations or individuals.,列出一些你的供應商。他們可以是組織或個人。
 DocType: Company,Default Currency,預設貨幣
 DocType: Contact,Enter designation of this Contact,輸入該聯繫人指定
 DocType: Contact Us Settings,Address,地址
 DocType: Expense Claim,From Employee,從員工
-apps/erpnext/erpnext/controllers/accounts_controller.py +338,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,警告： {0} {1}為零，系統將不檢查超收因為金額項目
+apps/erpnext/erpnext/controllers/accounts_controller.py +339,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,關鍵績效區
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +54,Transportation,運輸
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +54,Transportation,運輸
 apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +67, and year: ,和年份：
 DocType: Email Digest,Annual Expense,年費用
 DocType: SMS Center,Total Characters,總字元數
-apps/erpnext/erpnext/controllers/buying_controller.py +139,Please select BOM in BOM field for Item {0},請BOM字段中選擇BOM的項目{0}
+apps/erpnext/erpnext/controllers/buying_controller.py +130,Please select BOM in BOM field for Item {0},請BOM字段中選擇BOM的項目{0}
 DocType: C-Form Invoice Detail,C-Form Invoice Detail,C-表 發票詳細資訊
 DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,付款發票對帳
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +32,Contribution %,貢獻％
 DocType: Item,website page link,網站頁面的鏈接
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +192,Let's prepare the system for first use.,讓我們準備系統首次使用。
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +242,Let's prepare the system for first use.,讓我們準備系統首次使用。
 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 +214,Production Order {0} must be cancelled before cancelling this Sales Order,{0}生產單必須早於售貨單前取消
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +209,Production Order {0} must be cancelled before cancelling this Sales Order,{0}生產單必須早於售貨單前取消
 ,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.,選擇時間日誌並提交以創建一個新的銷售發票。
@@ -1005,35 +970,32 @@
 DocType: Sales Invoice Advance,Sales Invoice Advance,銷售發票提前
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +398,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/page/setup_wizard/install_fixtures.py +75,Management,管理
+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/setup/page/setup_wizard/fixtures/operations.py +14,Investment casting,熔模鑄造
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +51,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.,薪資單一被儲存，淨付款就會被顯示出來。
 apps/frappe/frappe/core/doctype/user/user_list.js +12,Active,啟用
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +154,Blue,藍色
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +154,Blue,藍色
 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,此外節點可以在&#39;集團&#39;類型的節點上創建
 DocType: Item,UOMs,計量單位
-apps/erpnext/erpnext/stock/utils.py +167,{0} valid serial nos for Item {1},{0}有效的序列號的項目{1}
+apps/erpnext/erpnext/stock/utils.py +167,{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/setup/page/setup_wizard/fixtures/operations.py +156,Laminated object manufacturing,分層實體製造
 apps/erpnext/erpnext/config/buying.py +13,Supplier database.,供應商數據庫。
 DocType: Account,Balance Sheet,資產負債表
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +561,Cost Center For Item with Item Code ',成本中心與項目代碼“項目
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +45,Stretch forming,拉伸成型
 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 +210,"Further accounts can be made under Groups, but entries can be made against non-Groups",進一步帳戶可以根據組進行，但條目可針對非組進行
 apps/erpnext/erpnext/config/hr.py +125,Tax and other salary deductions.,稅務及其他薪金中扣除。
 DocType: Lead,Lead,鉛
 DocType: Email Digest,Payables,應付賬款
 DocType: Account,Warehouse,倉庫
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +90,Row #{0}: Rejected Qty can not be entered in Purchase Return,行＃{0}：駁回採購退貨數量不能進入
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +93,Row #{0}: Rejected Qty can not be entered in Purchase Return,行＃{0}：駁回採購退貨數量不能進入
 ,Purchase Order Items To Be Billed,欲付款的採購訂單品項
 DocType: Purchase Invoice Item,Net Rate,淨費率
 DocType: Purchase Invoice Item,Purchase Invoice Item,採購發票項目
@@ -1048,13 +1010,13 @@
 DocType: Global Defaults,Current Fiscal Year,當前會計年度
 DocType: Global Defaults,Disable Rounded Total,禁用圓角總
 DocType: Lead,Call,通話
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +384,'Entries' cannot be empty,“分錄”不能是空的
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +386,'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 +205,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/page/setup_wizard/install_fixtures.py +138,Research,研究
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +138,Research,研究
 DocType: Maintenance Visit Purpose,Work Done,工作完成
 apps/erpnext/erpnext/controllers/item_variant.py +25,Please specify at least one attribute in the Attributes table,請指定屬性表中的至少一個屬性
 DocType: Contact,User ID,使用者 ID
@@ -1062,10 +1024,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +57,View Ledger,查看總帳
 DocType: File,Lft,LFT
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,最早
-apps/erpnext/erpnext/stock/doctype/item/item.py +394,"An Item Group exists with same name, please change the item name or rename the item group",具有具有相同名稱的項目群組存在，請更改項目名稱或重新命名該項目群組
+apps/erpnext/erpnext/stock/doctype/item/item.py +398,"An Item Group exists with same name, please change the item name or rename the item group",具有具有相同名稱的項目群組存在，請更改項目名稱或重新命名該項目群組
 DocType: Communication,Delivery Status,交貨狀態
 DocType: Production Order,Manufacture against Sales Order,對製造銷售訂單
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +517,Rest Of The World,世界其他地區
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +455,Rest Of The World,世界其他地區
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,該項目{0}不能有批
 ,Budget Variance Report,預算差異報告
 DocType: Salary Slip,Gross Pay,工資總額
@@ -1076,13 +1038,11 @@
 DocType: BOM Item,Item Description,項目說明
 DocType: Payment Tool,Payment Mode,付款方式
 DocType: Purchase Invoice,Is Recurring,是經常性
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +154,Direct metal laser sintering,直接金屬激光燒結
 DocType: Purchase Order,Supplied Items,提供的物品
 DocType: Production Order,Qty To Manufacture,製造數量
 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,臨時開通
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +41,Cryorolling,Cryorolling
 ,Employee Leave Balance,員工休假餘額
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +128,Balance for Account {0} must always be {1},帳戶{0}的餘額必須始終為{1}
 DocType: Address,Address Type,地址類型
@@ -1098,23 +1058,23 @@
 DocType: Journal Entry,Get Outstanding Invoices,獲取未付發票
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,銷售訂單{0}無效
 apps/erpnext/erpnext/setup/doctype/company/company.py +172,"Sorry, companies cannot be merged",對不起，企業不能合併
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +145,Small,小
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Small,小
 DocType: Employee,Employee Number,員工人數
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},案例編號已在使用中（ S） 。從案例沒有嘗試{0}
 ,Invoiced Amount (Exculsive Tax),發票金額（Exculsive稅）
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,項目2
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +59,Account head {0} created,帳戶頭{0}創建
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +153,Green,綠
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Green,綠
 DocType: Item,Auto re-order,自動重新排序
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +57,Total Achieved,實現總計
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +59,Total Achieved,實現總計
 DocType: Employee,Place of Issue,簽發地點
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +59,Contract,合同
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Contract,合同
 DocType: Report,Disabled,不使用
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +490,UOM coversion factor required for UOM: {0} in Item: {1},所需的計量單位計量單位：丁文因素：{0}項：{1}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +83,Indirect Expenses,間接費用
 apps/erpnext/erpnext/controllers/selling_controller.py +163,Row {0}: Qty is mandatory,列#{0}：數量是強制性的
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +8,Agriculture,農業
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +611,Your Products or Services,您的產品或服務
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,農業
+apps/erpnext/erpnext/public/js/setup_wizard.js +347,Your Products or Services,您的產品或服務
 DocType: Mode of Payment,Mode of Payment,付款方式
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,請先輸入項目
 DocType: Journal Entry Account,Purchase Order,採購訂單
@@ -1126,7 +1086,7 @@
 DocType: Serial No,Serial No Details,序列號詳細資訊
 DocType: Purchase Invoice Item,Item Tax Rate,項目稅率
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +113,"For {0}, only credit accounts can be linked against another debit entry",{0}，只有貸方帳戶可以連接另一個借方分錄
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Delivery Note {0} is not submitted,送貨單{0}未提交
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +470,Delivery Note {0} is not submitted,送貨單{0}未提交
 apps/erpnext/erpnext/stock/get_item_details.py +136,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.",基於“適用於”欄位是「項目」，「項目群組」或「品牌」，而選擇定價規則。
@@ -1136,7 +1096,7 @@
 DocType: Appraisal Goal,Goal,目標
 DocType: Sales Invoice Item,Edit Description,編輯說明
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +318,Expected Delivery Date is lesser than Planned Start Date.,預計交貨日期比計劃開始日期較早。
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +579,For Supplier,對供應商
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +602,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,出貨總計
@@ -1162,10 +1122,10 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +74,"Total {0} for all items is zero, may you should change 'Distribute Charges Based On'",共有{0}所有項目為零，可能你應該改變“基於分佈式費”
 DocType: Purchase Invoice,Taxes and Charges Calculation,稅費計算
 DocType: BOM Operation,Workstation,工作站
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +112,Hardware,硬件
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +112,Hardware,硬件
 DocType: Attendance,HR Manager,人力資源經理
 apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,請選擇一個公司
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +50,Privilege Leave,特權休假
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +50,Privilege Leave,特權休假
 DocType: Purchase Invoice,Supplier Invoice Date,供應商發票日期
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +79,You need to enable Shopping Cart,您需要啟用購物車
 apps/frappe/frappe/public/js/frappe/form/grid_body.html +6,No Data,無數據
@@ -1178,7 +1138,7 @@
 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 +168,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/setup/page/setup_wizard/install_fixtures.py +38,Food,食物
+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 +139,You can make a time log only against a submitted production order,您只能對已提交的生產訂單進行時間記錄
 DocType: Maintenance Schedule Item,No of Visits,沒有訪問量的
@@ -1198,6 +1158,7 @@
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,View Offer Letter,查看錄取通知書
 DocType: Communication,Communication,通訊
 DocType: Item,Is Service Item,是服務項目
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +81,Application period cannot be outside leave allocation period,申請期間不能請假外分配週期
 DocType: Activity Cost,Projects,專案
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +31,Please select Fiscal Year,請選擇會計年度
 apps/erpnext/erpnext/controllers/buying_controller.py +23,From {0} | {1} {2},從{0} | {1} {2}
@@ -1216,7 +1177,7 @@
 DocType: Item,Maintain Stock,維護庫存資料
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +213,Stock Entries already created for Production Order ,生產訂單已創建Stock條目
 DocType: Leave Control Panel,Leave blank if considered for all designations,離開，如果考慮所有指定空白
-apps/erpnext/erpnext/controllers/accounts_controller.py +499,Charge of type 'Actual' in row {0} cannot be included in Item Rate,類型'實際'行{0}的計費，不能被包含在項目單價
+apps/erpnext/erpnext/controllers/accounts_controller.py +500,Charge of type 'Actual' in row {0} cannot be included in Item Rate,類型'實際'行{0}的計費，不能被包含在項目單價
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,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,對於公司
@@ -1226,7 +1187,7 @@
 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 +471,cannot be greater than 100,不能大於100
-apps/erpnext/erpnext/stock/doctype/item/item.py +546,Item {0} is not a stock Item,項{0}不是缺貨登記
+apps/erpnext/erpnext/stock/doctype/item/item.py +550,Item {0} is not a stock Item,項{0}不是缺貨登記
 DocType: Maintenance Visit,Unscheduled,計劃外
 DocType: Employee,Owned,擁有的
 DocType: Salary Slip Deduction,Depends on Leave Without Pay,依賴於無薪休假
@@ -1240,30 +1201,28 @@
 DocType: HR Settings,Employee Settings,員工設置
 ,Batch-Wise Balance History,間歇式平衡歷史
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +72,To Do List,待辦事項列表
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +63,Apprentice,學徒
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Apprentice,學徒
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +99,Negative Quantity is not allowed,負數量是不允許
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
 Used for Taxes and Charges",從項目主檔獲取的稅務詳細資訊表，成為字串並存儲在這欄位。用於稅賦及費用
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +61,Lancing,採血
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +151,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 +435,Accounting Entry for {0}: {1} can only be made in currency: {2},會計分錄為{0}：{1}只能在貨幣做：{2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +436,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 +38,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 +112,Tax Rule for transactions.,稅收規則進行的交易。
 DocType: Rename Tool,Type of document to rename.,的文件類型進行重命名。
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +630,We buy this Item,我們買這個項目
+apps/erpnext/erpnext/public/js/setup_wizard.js +366,We buy this Item,我們買這個項目
 DocType: Address,Billing,計費
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +77,Flanging,翻邊
 DocType: Bulk Email,Not Sent,未發送
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +73,Explosive forming,爆炸成形
 DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),總稅費和費用（公司貨幣）
 DocType: Shipping Rule,Shipping Account,送貨帳戶
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +43,Scheduled to send to {0} recipients,原定發送到{0}受助人
 DocType: Quality Inspection,Readings,閱讀
 DocType: Stock Entry,Total Additional Costs,總額外費用
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Sub Assemblies,子組件
+apps/erpnext/erpnext/public/js/setup_wizard.js +359,Sub Assemblies,子組件
 DocType: Shipping Rule Condition,To Value,To值
 DocType: Supplier,Stock Manager,庫存管理
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +143,Source warehouse is mandatory for row {0},列{0}的來源倉是必要的
@@ -1273,44 +1232,42 @@
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,導入失敗！
 apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,尚未新增地址。
 DocType: Workstation Working Hour,Workstation Working Hour,工作站工作時間
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +83,Analyst,分析人士
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +202,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},行{0}：分配量{1}必須小於或等於合資量{2}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Analyst,分析人士
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +149,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},行{0}：分配量{1}必須小於或等於合資量{2}
 DocType: Item,Inventory,庫存
 DocType: Features Setup,"To enable ""Point of Sale"" view",為了讓觀“銷售點”
 apps/erpnext/erpnext/public/js/pos/pos.js +402,Payment cannot be made for empty cart,無法由空的購物車產生款項
 DocType: Item,Sales Details,銷售詳細資訊
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +149,Pinning,鋼釘
 DocType: Opportunity,With Items,隨著項目
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,在數量
 DocType: Notification Control,Expense Claim Rejected,費用索賠被拒絕
 DocType: Sales Invoice,"The date on which next invoice will be generated. It is generated on submit.
 ",在這接下來的發票將生成的日期。它在提交生成。
 DocType: Item Attribute,Item Attribute,項目屬性
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +105,Government,政府
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Government,政府
 apps/erpnext/erpnext/config/stock.py +268,Item Variants,項目變體
 DocType: Company,Services,服務
 apps/erpnext/erpnext/accounts/report/financial_statements.py +147,Total ({0}),總計（{0}）
 DocType: Cost Center,Parent Cost Center,父成本中心
 DocType: Sales Invoice,Source,源
 DocType: Leave Type,Is Leave Without Pay,是無薪休假
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +186,No records found in the Payment table,沒有在支付表中找到記錄
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +405,Financial Year Start Date,財政年度開始日期
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +133,No records found in the Payment table,沒有在支付表中找到記錄
+apps/erpnext/erpnext/public/js/setup_wizard.js +153,Financial Year Start Date,財政年度開始日期
 DocType: Employee External Work History,Total Experience,總經驗
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +100,Countersinking,擴孔
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +271,Packing Slip(s) cancelled,包裝單（ S）已取消
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +276,Packing Slip(s) cancelled,包裝單（ S）已取消
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,貨運代理費
 DocType: Material Request Item,Sales Order No,銷售訂單號
 DocType: Item Group,Item Group Name,項目群組名稱
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +50,Taken,拍攝
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,拍攝
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +66,Transfer Materials for Manufacture,轉移製造材料
 DocType: Pricing Rule,For Price List,對於價格表
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +27,Executive Search,獵頭
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,獵頭
 apps/erpnext/erpnext/stock/stock_ledger.py +405,"Purchase rate for item: {0} not found, which is required to book accounting entry (expense). Please mention item price against a buying price list.",購買率的項目：{0}沒有找到，這是需要預訂會計分錄（費用）。請註明項目價格對買入價格表。
 DocType: Maintenance Schedule,Schedules,時間表
 DocType: Purchase Invoice Item,Net Amount,淨額
 DocType: Purchase Order Item Supplied,BOM Detail No,BOM表詳細編號
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),額外的優惠金額（公司貨幣）
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +537,Error: {0} > {1},錯誤： {0} > {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +541,Error: {0} > {1},錯誤： {0} > {1}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,請從科目表建立新帳戶。
 DocType: Maintenance Visit,Maintenance Visit,維護訪問
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer > Customer Group > Territory,客戶>客戶群組>領地
@@ -1321,7 +1278,6 @@
 DocType: Event,Tuesday,星期二
 DocType: Leave Block List,Block Holidays on important days.,重要的日子中封鎖假期。
 ,Accounts Receivable Summary,應收賬款匯總
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +43,Leaves for type {0} already allocated for Employee {1} for period {2} - {3},葉為已分配給員工{1}的期間類型{0} {2}  -  {3}
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +187,Please set User ID field in an Employee record to set Employee Role,請在員工記錄設定員工角色設置用戶ID字段
 DocType: UOM,UOM Name,計量單位名稱
 DocType: Top Bar Item,Target,目標
@@ -1333,15 +1289,14 @@
 DocType: ToDo,Due Date,到期日
 DocType: Sales Invoice Item,Brand Name,商標名稱
 DocType: Purchase Receipt,Transporter Details,轉運詳細
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Box,箱
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +389,The Organization,本組織
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Box,箱
+apps/erpnext/erpnext/public/js/setup_wizard.js +137,The Organization,本組織
 DocType: Monthly Distribution,Monthly Distribution,月度分佈
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,收受方列表為空。請創建收受方列表
 DocType: Production Plan Sales Order,Production Plan Sales Order,生產計劃銷售訂單
 DocType: Sales Partner,Sales Partner Target,銷售合作夥伴目標
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},會計分錄為{0}只能在貨幣進行：{1}
 DocType: Pricing Rule,Pricing Rule,定價規則
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +58,Notching,開槽
 apps/erpnext/erpnext/config/learn.py +167,Material Request to Purchase Order,材料要求採購訂單
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +74,Row # {0}: Returned Item {1} does not exists in {2} {3},行＃{0}：返回的項目{1}不存在{2} {3}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,銀行帳戶
@@ -1358,20 +1313,19 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Amounts not reflected in bank,數額沒有反映在銀行
 DocType: Quality Inspection Reading,Reading 4,4閱讀
 apps/erpnext/erpnext/config/hr.py +23,Claims for company expense.,索賠費用由公司負責。
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +8,Centrifugal casting,離心鑄造
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +119,Magnetic field-assisted finishing,磁場輔助整理
 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,聯繫手機號碼
 DocType: Production Planning Tool,Select Sales Orders,選擇銷售訂單
 ,Material Requests for which Supplier Quotations are not created,對該供應商報價的材料需求尚未建立
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +117,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/buying/doctype/purchase_order/purchase_order.js +477,Mark as Delivered,標記為交付
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +497,Mark as Delivered,標記為交付
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +34,Make Quotation,請報價
 DocType: Dependent Task,Dependent Task,相關任務
-apps/erpnext/erpnext/stock/doctype/item/item.py +306,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 +141,Leave of type {0} cannot be longer than {1},請假類型{0}不能長於{1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +310,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 +155,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,收受方列表
@@ -1379,15 +1333,14 @@
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,消耗量
 apps/erpnext/erpnext/public/js/pos/pos.js +491,{0} View,{0}查看
 DocType: Salary Structure Deduction,Salary Structure Deduction,薪酬結構演繹
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +158,Selective laser sintering,選擇性激光燒結
-apps/erpnext/erpnext/stock/doctype/item/item.py +301,Unit of Measure {0} has been entered more than once in Conversion Factor Table,計量單位{0}已經進入不止一次在轉換係數表
+apps/erpnext/erpnext/stock/doctype/item/item.py +305,Unit of Measure {0} has been entered more than once in Conversion Factor Table,計量單位{0}已經進入不止一次在轉換係數表
 apps/frappe/frappe/core/page/data_import_tool/data_import_tool.js +108,Import Successful!,導入成功！
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,發布項目成本
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +185,Quantity must not be more than {0},數量必須不超過{0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +41,Age (Days),時間（天）
 DocType: Quotation Item,Quotation Item,產品報價
 DocType: Account,Account Name,帳戶名稱
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +41,From Date cannot be greater than To Date,起始日期不能大於結束日期
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +34,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.,供應商類型高手。
 DocType: Purchase Order Item,Supplier Part Number,供應商零件編號
@@ -1396,14 +1349,14 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +247,{0} {1} is cancelled or stopped,{0} {1}被取消或停止
 DocType: Accounts Settings,Credit Controller,信用控制器
 DocType: Delivery Note,Vehicle Dispatch Date,車輛調度日期
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +197,Purchase Receipt {0} is not submitted,採購入庫單{0}未提交
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +198,Purchase Receipt {0} is not submitted,採購入庫單{0}未提交
 DocType: Company,Default Payable Account,預設應付賬款
 apps/erpnext/erpnext/config/website.py +13,"Settings for online shopping cart such as shipping rules, price list etc.",設置網上購物車，如航運規則，價格表等
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +660,Setup Complete,安裝完成
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +124,Setup Complete,安裝完成
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +65,{0}% Billed,{0}％已開立帳單
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +17,Reserved Qty,保留數量
 DocType: Party Account,Party Account,黨的帳戶
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +74,Human Resources,人力資源
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +74,Human Resources,人力資源
 DocType: Lead,Upper Income,高收入
 DocType: Journal Entry Account,Debit in Company Currency,借記卡在公司貨幣
 apps/erpnext/erpnext/support/doctype/issue/issue.py +58,My Issues,我的問題
@@ -1412,11 +1365,9 @@
 DocType: Company,Default Values,默認值
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +236,Row {0}: Payment amount can not be negative,行{0}：付款金額不能為負
 DocType: Expense Claim,Total Amount Reimbursed,報銷金額合計
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +152,Press fitting,按擬合
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +64,Against Supplier Invoice {0} dated {1},對供應商發票{0}日期{1}
 DocType: Customer,Default Price List,預設價格表
 DocType: Payment Reconciliation,Payments,付款
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +24,Hot isostatic pressing,熱等靜壓
 DocType: ToDo,Medium,中
 DocType: Budget Detail,Budget Allocated,預算分配
 DocType: Journal Entry,Entry Type,條目類型
@@ -1429,9 +1380,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +56,None of the items have any change in quantity or value.,沒有一個項目無論在數量或價值的任何變化。
 DocType: Warranty Claim,Warranty Claim,保修索賠
 ,Lead Details,鉛詳情
-DocType: Authorization Rule,Approving User,批准用戶
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +37,Forging,鍛造
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +126,Plating,電鍍
 DocType: Purchase Invoice,End date of current invoice's period,當前發票的期限的最後一天
 DocType: Pricing Rule,Applicable For,適用
 DocType: Bank Reconciliation,From Date,從日期
@@ -1453,31 +1401,29 @@
 DocType: Sales Invoice,Paid Amount (Company Currency),支付的金額（公司貨幣）
 DocType: Purchase Invoice,Additional Discount,更多優惠
 DocType: Selling Settings,Selling Settings,銷售設置
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +39,Online Auctions,網上拍賣
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,網上拍賣
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +94,Please specify either Quantity or Valuation Rate or both,請註明無論是數量或估價率或兩者
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +50,"Company, Month and Fiscal Year is mandatory",公司、月分與財務年度是必填的
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Marketing Expenses,市場推廣開支
 ,Item Shortage Report,商品短缺報告
-apps/erpnext/erpnext/stock/doctype/item/item.js +183,"Weight is mentioned,\nPlease mention ""Weight UOM"" too",重量被提及，請同時註明“重量計量單位”
+apps/erpnext/erpnext/stock/doctype/item/item.js +185,"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 +212,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 +384,Warehouse required at Row No {0},在第{0}行需要倉庫
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +386,Warehouse required at Row No {0},在第{0}行需要倉庫
 DocType: Employee,Date Of Retirement,退休日
 DocType: Upload Attendance,Get Template,獲取模板
 DocType: Address,Postal,郵政
 DocType: Item,Weightage,權重
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +159,Mining,礦業
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +17,Resin casting,樹脂澆注
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,客戶群組存在相同名稱，請更改客戶名稱或重新命名客戶群組
 apps/erpnext/erpnext/public/js/pos/pos.js +147,Please select {0} first.,請先選擇{0}。
 apps/erpnext/erpnext/templates/pages/order.html +57,text {0},文字{0}
 DocType: Territory,Parent Territory,家長領地
 DocType: Quality Inspection Reading,Reading 2,閱讀2
 DocType: Stock Entry,Material Receipt,收料
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +622,Products,產品
+apps/erpnext/erpnext/public/js/setup_wizard.js +358,Products,產品
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +47,Party Type and Party is required for Receivable / Payable account {0},黨的類型和黨的需要應收/應付帳戶{0}
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.",如果此項目已變種，那麼它不能在銷售訂單等選擇
 DocType: Lead,Next Contact By,下一個聯絡人由
@@ -1487,13 +1433,13 @@
 DocType: Purchase Invoice,Notification Email Address,通知電子郵件地址
 DocType: Payment Tool,Find Invoices to Match,查找發票到匹配
 ,Item-wise Sales Register,項目明智的銷售登記
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +399,"e.g. ""XYZ National Bank""",例如“XYZ國家銀行“
+apps/erpnext/erpnext/public/js/setup_wizard.js +147,"e.g. ""XYZ National Bank""",例如“XYZ國家銀行“
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,包括在基本速率此稅？
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +57,Total Target,總目標
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Target,總目標
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.js +22,Shopping Cart is enabled,購物車啟用
 DocType: Job Applicant,Applicant for a Job,申請人作業
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +173,No Production Orders created,沒有創建生產訂單
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +131,Salary Slip of employee {0} already created for this month,員工{0}於本月的工資單已經創建
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +140,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.,過多的列數。請導出報表，並使用試算表程式進行列印。
 DocType: Sales Invoice Item,Batch No,批號
@@ -1503,14 +1449,14 @@
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +13,Variant,變種
 apps/frappe/frappe/public/js/frappe/form/toolbar.js +165,New {0},新的{0}
 DocType: Naming Series,Set prefix for numbering series on your transactions,為你的交易編號序列設置的前綴
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +169,Stopped order cannot be cancelled. Unstop to cancel.,已停止訂單無法取消。 撤銷停止再取消。
-apps/erpnext/erpnext/stock/doctype/item/item.py +323,Default BOM ({0}) must be active for this item or its template,預設BOM（{0}）必須是活動的這個項目或者其模板
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +164,Stopped order cannot be cancelled. Unstop to cancel.,已停止訂單無法取消。 撤銷停止再取消。
+apps/erpnext/erpnext/stock/doctype/item/item.py +327,Default BOM ({0}) must be active for this item or its template,預設BOM（{0}）必須是活動的這個項目或者其模板
 DocType: Employee,Leave Encashed?,離開兌現？
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,機會從字段是強制性的
 DocType: Item,Variants,變種
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +458,Make Purchase Order,製作採購訂單
 DocType: SMS Center,Send To,發送到
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +111,There is not enough leave balance for Leave Type {0},沒有足夠的餘額休假請假類型{0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +127,There is not enough leave balance for Leave Type {0},沒有足夠的餘額休假請假類型{0}
 DocType: Sales Team,Contribution to Net Total,貢獻合計淨
 DocType: Sales Invoice Item,Customer's Item Code,客戶的產品編號
 DocType: Stock Reconciliation,Stock Reconciliation,庫存調整
@@ -1547,11 +1493,11 @@
 DocType: Sales Order Item,Actual Qty,實際數量
 DocType: Sales Invoice Item,References,參考
 DocType: Quality Inspection Reading,Reading 10,閱讀10
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +612,"List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start.",列出您售出或購買的產品或服務，並請確認品項群駔、單位與其它屬性。
+apps/erpnext/erpnext/public/js/setup_wizard.js +348,"List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start.",列出您售出或購買的產品或服務，並請確認品項群駔、單位與其它屬性。
 DocType: Hub Settings,Hub Node,樞紐節點
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,您輸入重複的項目。請糾正，然後再試一次。
 apps/erpnext/erpnext/controllers/item_variant.py +65,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values,值{0}的屬性{1}不在有效的項目列表存在屬性值
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +87,Associate,關聯
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Associate,關聯
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +46,Item {0} is not a serialized Item,項{0}不是一個序列化的項目
 DocType: SMS Center,Create Receiver List,創建接收器列表
 apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +5,Expired,過期
@@ -1560,7 +1506,7 @@
 DocType: Warranty Claim,Issue Date,發行日期
 DocType: Activity Cost,Activity Cost,活動費用
 DocType: Purchase Receipt Item Supplied,Consumed Qty,消耗的數量
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +52,Telecommunications,電信
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +52,Telecommunications,電信
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),表示該包是這個交付的一部分（僅草案）
 DocType: Payment Tool,Make Payment Entry,製作付款分錄
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +119,Quantity for Item {0} must be less than {1},項目{0}的數量必須小於{1}
@@ -1577,10 +1523,8 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +37,"Selling must be checked, if Applicable For is selected as {0}",銷售必須進行檢查，如果適用於被選擇為{0}
 DocType: Purchase Order Item,Supplier Quotation Item,供應商報價項目
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +27,Make Salary Structure,製作薪酬結構
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +54,Shearing,剪毛
 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.,單擊“製作銷售發票”按鈕來創建一個新的銷售發票。
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +166,Packaging and labeling,包裝和標籤
 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,請在公司主檔及全域性預設值指定預設貨幣
@@ -1591,19 +1535,18 @@
 DocType: Budget Detail,Fiscal Year,財政年度
 DocType: Cost Center,Budget,預算
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +41,"Budget cannot be assigned against {0}, as it's not an Income or Expense account",財政預算案不能對{0}指定的，因為它不是一個收入或支出帳戶
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Achieved,實現
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,實現
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +65,Territory / Customer,區域/客戶
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,e.g. 5,例如5
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +207,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},行{0}：已分配量{1}必須小於或等於發票餘額{2}
+apps/erpnext/erpnext/public/js/setup_wizard.js +294,e.g. 5,例如5
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},行{0}：已分配量{1}必須小於或等於發票餘額{2}
 DocType: Sales Invoice,In Words will be visible once you save the Sales Invoice.,銷售發票一被儲存，就會顯示出來。
 DocType: Item,Is Sales Item,是銷售項目
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,由於生產訂單可以為這個項目， \作
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,項{0}不是設置為序列號檢查項目主
 DocType: Maintenance Visit,Maintenance Time,維護時間
 ,Amount to Deliver,量交付
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +620,A Product or Service,產品或服務
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +158,There were errors.,有錯誤。
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +101,Tapping,竊聽
+apps/erpnext/erpnext/public/js/setup_wizard.js +356,A Product or Service,產品或服務
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +146,There were errors.,有錯誤。
 DocType: Naming Series,Current Value,當前值
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +171,{0} created,{0}已新增
 DocType: Delivery Note Item,Against Sales Order,對銷售訂單
@@ -1618,7 +1561,7 @@
 apps/erpnext/erpnext/accounts/party.py +275,Due Date cannot be before Posting Date,到期日不能在寄發日期之前
 DocType: Website Item Group,Website Item Group,網站項目群組
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Duties and Taxes,關稅和稅款
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Please enter Reference date,參考日期請輸入
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +312,Please enter Reference date,參考日期請輸入
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0}付款分錄不能由{1}過濾
 DocType: Item Website Specification,Table for Item that will be shown in Web Site,表項，將在網站顯示出來
 DocType: Purchase Order Item Supplied,Supplied Qty,附送數量
@@ -1626,7 +1569,7 @@
 apps/erpnext/erpnext/config/stock.py +103,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,項目明智的購買歷史
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +152,Red,紅
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Red,紅
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +228,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},請點擊“生成表”來獲取序列號增加了對項目{0}
 DocType: Account,Frozen,凍結的
 ,Open Production Orders,開啟生產訂單
@@ -1641,7 +1584,7 @@
 DocType: Item Attribute,Attribute Name,屬性名稱
 apps/erpnext/erpnext/controllers/selling_controller.py +236,Item {0} must be Sales or Service Item in {1},項{0}必須在銷售或服務項目{1}
 DocType: Item Group,Show In Website,顯示在網站
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +621,Group,組
+apps/erpnext/erpnext/public/js/setup_wizard.js +357,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",在下列文件送貨單，機遇，材料要求，項目，採購訂單，採購憑證，買方收貨，報價單，銷售發票，產品捆綁，銷售訂單，序列號跟踪名牌
@@ -1651,6 +1594,7 @@
 DocType: Features Setup,Brands,品牌
 DocType: C-Form Invoice Detail,Invoice No,發票號碼
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +480,From Purchase Order,從採購訂單
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +92,"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,辭退信日期
@@ -1658,35 +1602,31 @@
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +137,Not Set,沒有設置
 DocType: Communication,Date,日期
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,重複客戶收入
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +651,Sit tight while your system is being setup. This may take a few moments.,坐好囉！您的系統正在安裝。這可能需要一些時間。
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +115,Sit tight while your system is being setup. This may take a few moments.,坐好囉！您的系統正在安裝。這可能需要一些時間。
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +51,{0} ({1}) must have role 'Expense Approver',{0}（{1}）必須有權限 “費用審批”
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Pair,對
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Pair,對
 DocType: Bank Reconciliation Detail,Against Account,針對帳戶
 DocType: Maintenance Schedule Detail,Actual Date,實際日期
 DocType: Item,Has Batch No,有批號
 DocType: Delivery Note,Excise Page Number,消費頁碼
 DocType: Employee,Personal Details,個人資料
 ,Maintenance Schedules,保養時間表
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +44,Embossing,壓花
 ,Quotation Trends,報價趨勢
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +139,Item Group not mentioned in item master for item {0},項目{0}之項目主檔未提及之項目群組
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +302,Debit To account must be a Receivable account,借記帳戶必須是應收賬款
-apps/erpnext/erpnext/stock/doctype/item/item.py +310,"As Production Order can be made for this item, it must be a stock item.",由於生產訂單可以為這個項目提出，它必須是一個股票項目。
 DocType: Shipping Rule Condition,Shipping Amount,航運量
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +140,Joining,加盟
-DocType: Authorization Rule,Above Value,上述值
 ,Pending Amount,待審核金額
 DocType: Purchase Invoice Item,Conversion Factor,轉換因子
 DocType: Purchase Order,Delivered,交付
 apps/erpnext/erpnext/config/hr.py +160,Setup incoming server for jobs email id. (e.g. jobs@example.com),設置接收服務器的工作電子郵件ID 。 （例如jobs@example.com ）
 DocType: Purchase Receipt,Vehicle Number,車號
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,在其經常性發票將被停止日期
+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,應收帳款
 ,Supplier-Wise Sales Analytics,供應商相關的銷售分析
 DocType: Address Template,This format is used if country specific format is not found,此格式用於如果找不到特定國家的格式
 DocType: Custom Field,Custom,自訂
 DocType: Production Order,Use Multi-Level BOM,採用多級物料清單
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +26,Injection molding,注塑
 DocType: Bank Reconciliation,Include Reconciled Entries,包括對賬項目
 apps/erpnext/erpnext/config/accounts.py +41,Tree of finanial accounts.,樹finanial帳戶。
 DocType: Leave Control Panel,Leave blank if considered for all employee types,保持空白如果考慮到所有的員工類型
@@ -1696,30 +1636,28 @@
 apps/frappe/frappe/config/setup.py +130,Printing,列印
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +114,Expense Claim is pending approval. Only the Expense Approver can update status.,使項目所需的質量保證和質量保證在沒有採購入庫單
 DocType: Purchase Invoice,Additional Discount Amount,額外的折扣金額
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +99,The day(s) on which you are applying for leave are holiday. You need not apply for leave.,在天在你申請許可的假期。你不需要申請許可。
 apps/frappe/frappe/public/js/frappe/misc/utils.js +110,and,和
 DocType: Leave Block List Allow,Leave Block List Allow,休假區塊清單准許
 apps/erpnext/erpnext/setup/doctype/company/company.py +236,Abbr can not be blank or space,縮寫不能為空或空間
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +50,Sports,體育
+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/setup/page/setup_wizard/setup_wizard.js +626,Unit,單位
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Unit,單位
 apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.py +182,Please set Dropbox access keys in your site config,請在您的網站配置設定Dropbox的存取碼
 apps/erpnext/erpnext/stock/get_item_details.py +113,Please specify Company,請註明公司
 ,Customer Acquisition and Loyalty,客戶獲得和忠誠度
 DocType: Purchase Receipt,Warehouse where you are maintaining stock of rejected items,你維護退貨庫存的倉庫
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +408,Your financial year ends on,您的財政年度結束於
+apps/erpnext/erpnext/public/js/setup_wizard.js +156,Your financial year ends on,您的財政年度結束於
 DocType: POS Profile,Price List,價格表
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +20,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0}現在是預設的會計年度。請重新載入您的瀏覽器，以使更改生效。
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +20,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0}是現在預設的會計年度。請重新載入您的瀏覽器，以使更改生效。
 apps/erpnext/erpnext/projects/doctype/project/project.js +47,Expense Claims,報銷
 DocType: Issue,Support,支持
-DocType: Authorization Rule,Approving Role,審批角色
 ,BOM Search,BOM搜索
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +176,Closing (Opening + Totals),截止（開標+總計）
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +26,Please specify currency in Company,請公司指定的貨幣
 DocType: Workstation,Wages per hour,時薪
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,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/controllers/accounts_controller.py +236,Account {0} is invalid. Account Currency must be {1},帳戶{0}是無效的。帳戶貨幣必須是{1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +237,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}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +53,Clearance date cannot be before check date in row {0},清拆日期不能行檢查日期前{0}
 DocType: Salary Slip,Deduction,扣除
@@ -1738,13 +1676,13 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +82,Item {0} has already been returned,項{0}已被退回
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,**財年**表示財政年度。所有的會計輸入項目和其他重大交易針對**財年**進行追蹤。
 DocType: Opportunity,Customer / Lead Address,客戶/鉛地址
+apps/erpnext/erpnext/stock/doctype/item/item.py +112,Warning: Invalid SSL certificate on attachment {0},警告：附件無效的SSL證書{0}
 DocType: Production Order Operation,Actual Operation Time,實際操作時間
 DocType: Authorization Rule,Applicable To (User),適用於（用戶）
 DocType: Purchase Taxes and Charges,Deduct,扣除
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +170,Job Description,職位描述
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +170,Job Description,職位描述
 DocType: Purchase Order Item,Qty as per Stock UOM,數量按庫存計量單位
 apps/frappe/frappe/model/rename_doc.py +343,Please select a valid csv file with data,請選擇有合格資料的csv檔案
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +92,Coating,塗層
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +126,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series",特殊字符除了“ - ”，“”，“＃”，和“/”未命名序列允許
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.",追蹤銷售計劃。追踪訊息，報價，銷售訂單等，從競賽來衡量投資報酬。
 DocType: Expense Claim,Approver,審批人
@@ -1754,12 +1692,11 @@
 DocType: Supplier Quotation,Manufacturing Manager,生產經理
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +191,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/hooks.py +84,Shipments,發貨
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +29,Dip molding,浸成型
+apps/erpnext/erpnext/hooks.py +68,Shipments,發貨
 DocType: Purchase Order,To be delivered to customer,要傳送給客戶
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,時間日誌狀態必須被提交。
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,序列號{0}不屬於任何倉庫
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +650,Setting Up,設置
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +114,Setting Up,設置
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,Row # ,行＃
 DocType: Purchase Invoice,In Words (Company Currency),大寫（Company Currency）
 DocType: Pricing Rule,Supplier,供應商
@@ -1767,7 +1704,7 @@
 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 +166,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,費用或差異帳戶是強制性的項目{0} ，因為它影響整個股票價值
-apps/erpnext/erpnext/controllers/accounts_controller.py +354,"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/accounts_controller.py +355,"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 +135,User {0} is disabled,用戶{0}被禁用
@@ -1780,27 +1717,26 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,{0} is mandatory for Item {1},{0}是強制性的項目{1}
 DocType: Currency Exchange,From Currency,從貨幣
 DocType: DocField,Name,名稱
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +211,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row",請ATLEAST一行選擇分配金額，發票類型和發票號碼
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +104,Sales Order required for Item {0},所需的{0}項目銷售訂單
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +158,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row",請ATLEAST一行選擇分配金額，發票類型和發票號碼
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +107,Sales Order required for Item {0},所需的{0}項目銷售訂單
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +43,Amounts not reflected in system,量以不反映在系統
 DocType: Purchase Invoice Item,Rate (Company Currency),率（公司貨幣）
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +40,Others,他人
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +40,Others,他人
 apps/erpnext/erpnext/templates/includes/product_page.js +80,Cannot find a matching Item. Please select some other value for {0}.,無法找到匹配的項目。請選擇其他值{0}。
 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/frappe/frappe/core/doctype/doctype/boilerplate/controller_list.html +31,Completed,已完成
 DocType: Web Form,Select DocType,選擇DocType
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +104,Broaching,拉床
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +12,Banking,銀行業
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,銀行業
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +38,Please click on 'Generate Schedule' to get schedule,請在“產生排程”點擊以得到排程表
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +283,New Cost Center,新的成本中心
 DocType: Bin,Ordered Quantity,訂購數量
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +397,"e.g. ""Build tools for builders""",例如「建設建設者工具“
+apps/erpnext/erpnext/public/js/setup_wizard.js +145,"e.g. ""Build tools for builders""",例如「建設建設者工具“
 DocType: Quality Inspection,In Process,在過程
 DocType: Authorization Rule,Itemwise Discount,Itemwise折扣
 DocType: Purchase Order Item,Reference Document Type,參考文檔類型
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +318,{0} against Sales Order {1},{0}針對銷售訂單{1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +320,{0} against Sales Order {1},{0}針對銷售訂單{1}
 DocType: Account,Fixed Asset,固定資產
 apps/erpnext/erpnext/config/stock.py +283,Serialized Inventory,序列化庫存
 DocType: Activity Type,Default Billing Rate,默認計費率
@@ -1815,14 +1751,13 @@
 DocType: Purchase Invoice Item,Page Break,分頁符
 DocType: Production Order Operation,Pending,擱置
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,用戶可以批准特定員工的休假申請
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +33,You cannot change default UOM of Variant. To change default UOM for Variant change default UOM of the Template,你不能改變變異的默認計量單位。要更改默認的計量單位為模板的變種改變默認的計量單位
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +50,Office Equipments,辦公設備
 DocType: Purchase Invoice Item,Qty,數量
 DocType: Fiscal Year,Companies,企業
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +24,Electronics,電子
+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/support/doctype/maintenance_visit/maintenance_visit.js +18,From Maintenance Schedule,對維護期間
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +56,Full-time,全日制
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +56,Full-time,全日制
 DocType: Purchase Invoice,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.",如果您已經創建了銷售稅和費模板標準模板，選擇一個，然後點擊下面的按鈕。
@@ -1834,11 +1769,12 @@
 DocType: Job Applicant,Job Opening,開放職位
 DocType: Payment Reconciliation,Payment Reconciliation,付款對帳
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +154,Please select Incharge Person's name,請選擇Incharge人的名字
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +51,Technology,技術
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,技術
 DocType: Offer Letter,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,總開票金額
 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.",要添加子節點，探索樹，然後單擊要在其中添加更多節點的節點上。
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +102,Credit To account must be a Payable account,信用帳戶必須是應付賬款
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +233,BOM recursion: {0} cannot be parent or child of {2},BOM遞歸： {0}不能父母或兒童{2}
@@ -1846,15 +1782,13 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +116,"For {0}, only debit accounts can be linked against another credit entry",{0}，只有借方帳戶可以連接另一個貸方分錄
 apps/erpnext/erpnext/stock/get_item_details.py +260,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}。
+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 +68,Create Payment Entries against Orders or Invoices.,對訂單或發票建立付款分錄。
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +141,Welding,焊接
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +40,New Stock UOM is required,新的庫存計量單位是必需的
 DocType: Quality Inspection,Sample Size,樣本大小
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +443,All items have already been invoiced,所有項目已開具發票
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +446,All items have already been invoiced,所有項目已開具發票
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',請指定一個有效的“從案號”
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +287,Further cost centers can be made under Groups but entries can be made against non-Groups,進一步的成本中心可以根據組進行，但項可以對非組進行
 DocType: Project,External,外部
@@ -1866,8 +1800,7 @@
 DocType: Bin,Actual Quantity,實際數量
 DocType: Shipping Rule,example: Next Day Shipping,例如：次日發貨
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,序列號{0}未找到
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +563,Your Customers,您的客戶
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +27,Compression molding,壓縮成型
+apps/erpnext/erpnext/public/js/setup_wizard.js +303,Your Customers,您的客戶
 DocType: Leave Block List Date,Block Date,封鎖日期
 DocType: Sales Order,Not Delivered,未交付
 ,Bank Clearance Summary,銀行結算摘要
@@ -1888,10 +1821,10 @@
 DocType: SMS Log,Sent To,發給
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +28,Make Sales Invoice,做銷售發票
 DocType: Company,For Reference Only.,僅供參考。
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +29,Invalid {0}: {1},無效的{0}：{1}
+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,容量規劃
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +49,'From Date' is required,“起始日期”是必需的
+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,新工作空間
@@ -1906,7 +1839,7 @@
 DocType: Serial No,Delivery Time,交貨時間
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,老齡化基於
 DocType: Item,End of Life,壽命結束
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +41,Travel,旅遊
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +41,Travel,旅遊
 DocType: Leave Block List,Allow Users,允許用戶
 DocType: Purchase Order,Customer Mobile No,客戶手機號碼
 DocType: Sales Invoice,Recurring,經常性
@@ -1920,7 +1853,7 @@
 DocType: Naming Series,User must always select,用戶必須始終選擇
 DocType: Stock Settings,Allow Negative Stock,允許負庫存
 DocType: Installation Note,Installation Note,安裝注意事項
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +541,Add Taxes,添加稅賦
+apps/erpnext/erpnext/public/js/setup_wizard.js +283,Add Taxes,添加稅賦
 ,Financial Analytics,財務分析
 DocType: Quality Inspection,Verified By,認證機構
 DocType: Address,Subsidiary,副
@@ -1930,7 +1863,6 @@
 DocType: System Settings,In Hours,以小時為單位
 DocType: Process Payroll,Create Salary Slip,建立工資單
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Expected balance as per bank,預計結餘按銀行
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +115,Buffing,拋光
 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,僱員
@@ -1947,11 +1879,11 @@
 DocType: Rename Tool,File to Rename,文件重命名
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +176,Purchse Order number required for Item {0},項目{0}需要採購訂單號
 apps/erpnext/erpnext/public/js/controllers/transaction.js +136,Show Payments,顯示支付
-apps/erpnext/erpnext/controllers/buying_controller.py +245,Specified BOM {0} does not exist for Item {1},指定BOM {0}的項目不存在{1}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +202,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,維護時間表{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 +197,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,維護時間表{0}必須取消早於取消這個銷售訂單
 apps/frappe/frappe/desk/page/backups/backups.html +13,Size,尺寸
 DocType: Notification Control,Expense Claim Approved,報銷批准
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +113,Pharmaceutical,製藥
+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,銷售訂單需求
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +30,Create Customer,建立客戶
@@ -1961,7 +1893,6 @@
 DocType: Quality Inspection Reading,Reading 9,9閱讀
 DocType: Supplier,Is Frozen,就是冰凍
 DocType: Buying Settings,Buying Settings,採購設定
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +122,Mass finishing,質量精加工
 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 ）
@@ -1969,7 +1900,7 @@
 DocType: Payment Tool,Payment Account,付款帳號
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +713,Please specify Company to proceed,請註明公司以處理
 apps/frappe/frappe/public/js/frappe/model/indicator.js +30,Draft,草稿
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +46,Compensatory Off,補假
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Compensatory Off,補假
 DocType: Quality Inspection Reading,Accepted,接受的
 DocType: User,Female,女
 DocType: Journal Entry Account,Debit in Account Currency,借記卡賬戶中的貨幣
@@ -1977,14 +1908,11 @@
 DocType: Print Settings,Modern,現代
 DocType: Communication,Replied,回答
 DocType: Payment Tool,Total Payment Amount,總付款金額
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +145,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},"{0}（{1}）不能大於計劃quanitity（{2}）的生產訂單{3}
-
-cannot be greater than planned quanitity in Production Order translates into
-不能大於生產訂單的計畫數量"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +145,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0}（{1}）不能大於計劃數量（{2}）生產訂單的{3}
 DocType: Shipping Rule,Shipping Rule Label,送貨規則標籤
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +209,Raw Materials cannot be blank.,原材料不能為空。
 DocType: Newsletter,Test,測試
-apps/erpnext/erpnext/stock/doctype/item/item.py +364,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +368,"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'",由於有存量交易為這個項目，\你不能改變的值&#39;有序列號&#39;，&#39;有批號&#39;，&#39;是股票項目“和”評估方法“
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +448,Quick Journal Entry,快速日記帳分錄
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +92,You can not change rate if BOM mentioned agianst any item,你不能改變速度，如果BOM中提到反對的任何項目
@@ -1995,13 +1923,14 @@
 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.,將對每個成品項目創建獨立的生產訂單。
 DocType: Purchase Invoice,Terms and Conditions1,條款及條件1
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +18,Complete Setup,完成安裝
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard_page.html +18,Complete Setup,完成安裝
 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/config/crm.py +96,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 +57,Total Absent,共缺席
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +746,Item or Warehouse for row {0} does not match Material Request,行{0}的項目或倉庫不符合物料需求
@@ -2026,16 +1955,15 @@
 DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),基本速率（按庫存計量單位）
 DocType: SMS Log,No of Requested SMS,無的請求短信
 DocType: Campaign,Campaign-.####,運動 - ＃＃ ＃ ＃
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +55,Piercing,沖孔
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,下一步
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +117,Contract End Date must be greater than Date of Joining,合同結束日期必須大於加入的日期
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,第三方分銷商/經銷商/代理商/分支機構/分銷商誰銷售公司產品的佣金。
 DocType: Customer Group,Has Child Node,有子節點
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{0} against Purchase Order {1},{0}針對採購訂單{1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +332,{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/page/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
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +110,Photochemical machining,光化學加工
 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.
 
 #### Note
@@ -2081,7 +2009,7 @@
 DocType: Purchase Receipt Item,Recd Quantity,RECD數量
 DocType: Email Account,Email Ids,電子郵件ID
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},無法產生更多的項目{0}不是銷售訂單數量{1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +471,Stock Entry {0} is not submitted,股票輸入{0}不提交
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +473,Stock Entry {0} is not submitted,股票輸入{0}不提交
 DocType: Payment Reconciliation,Bank / Cash Account,銀行／現金帳戶
 DocType: Tax Rule,Billing City,結算城市
 DocType: Global Defaults,Hide Currency Symbol,隱藏貨幣符號
@@ -2097,7 +2025,7 @@
 DocType: Purchase Invoice,Currency and Price List,貨幣和價格表
 DocType: Opportunity,Customer / Lead Name,客戶/鉛名稱
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +63,Clearance Date not mentioned,清拆日期未提及
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +71,Production,生產
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Production,生產
 DocType: Item,Allow Production Order,允許生產訂單
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +60,Row {0}:Start Date must be before End Date,列#{0}：開始日期必須早於結束日期
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),總計（數量）
@@ -2110,7 +2038,7 @@
 apps/erpnext/erpnext/utilities/doctype/address/address.py +113,My Addresses,我的地址
 DocType: Stock Ledger Entry,Outgoing Rate,傳出率
 apps/erpnext/erpnext/config/hr.py +100,Organization branch master.,組織分支主檔。
-apps/erpnext/erpnext/controllers/accounts_controller.py +237, or ,或
+apps/erpnext/erpnext/controllers/accounts_controller.py +238, 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以上
@@ -2137,6 +2065,7 @@
 DocType: Stock Entry Detail,Serial No / Batch,序列號/批次
 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 +213,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',維護計畫不會為全部品項生成。請點擊“生成表”
 ,To Produce,以生產
 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}也必須包括
@@ -2144,10 +2073,7 @@
 DocType: Bin,Reserved Quantity,保留數量
 DocType: Landed Cost Voucher,Purchase Receipt Items,採購入庫項目
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,自定義表單
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +62,Cutting,切割
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +69,Flattening,壓扁
 DocType: Account,Income Account,收入帳戶
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +22,Molding,模
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +632,Delivery,交貨
 DocType: Stock Reconciliation Item,Current Qty,目前數量
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",請見“材料成本基於”在成本核算章節
@@ -2157,20 +2083,19 @@
 apps/frappe/frappe/desk/moduleview.py +61,Documents,文件
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +17,Ref,參考
 DocType: Cost Center,Cost Center,成本中心
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.js +48,Voucher #,憑證＃
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +36,Voucher #,憑證＃
 DocType: Notification Control,Purchase Order Message,採購訂單的訊息
 DocType: Tax Rule,Shipping Country,航運國家
 DocType: Upload Attendance,Upload HTML,上傳HTML
-apps/erpnext/erpnext/controllers/accounts_controller.py +391,"Total advance ({0}) against Order {1} cannot be greater \
+apps/erpnext/erpnext/controllers/accounts_controller.py +392,"Total advance ({0}) against Order {1} cannot be greater \
 				than the Grand Total ({2})","預付款總額（{0}）反對令{1}不能大於\
 比總計（{2}）"
 DocType: Employee,Relieving Date,解除日期
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +12,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.",定價規則是由覆蓋價格表/定義折扣百分比，基於某些條件。
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,倉庫只能通過存貨分錄/送貨單/採購入庫單來改變
 DocType: Employee Education,Class / Percentage,類／百分比
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +92,Head of Marketing and Sales,營銷和銷售主管
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +31,Income Tax,所得稅
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +157,Laser engineered net shaping,激光直接成型
+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.,以行業類型追蹤訊息。
 DocType: Item Supplier,Item Supplier,產品供應商
@@ -2193,31 +2118,28 @@
 DocType: Stock Ledger Entry,Actual Qty After Transaction,交易後實際數量
 ,Pending SO Items For Purchase Request,待處理的SO項目對於採購申請
 DocType: Supplier,Billing Currency,結算貨幣
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +148,Extra Large,特大號
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,Extra Large,特大號
 ,Profit and Loss Statement,損益表
 DocType: Bank Reconciliation Detail,Cheque Number,支票號碼
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +43,Pressing,壓制
 DocType: Payment Tool Detail,Payment Tool Detail,支付工具的詳細資訊
 ,Sales Browser,銷售瀏覽器
 DocType: Journal Entry,Total Credit,貸方總額
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +474,Warning: Another {0} # {1} exists against stock entry {2},警告：另一個{0}＃{1}存在對股票入門{2}
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +459,Local,當地
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +476,Warning: Another {0} # {1} exists against stock entry {2},警告：另一個{0}＃{1}存在對股票入門{2}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +397,Local,當地
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),貸款及墊款（資產）
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,債務人
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +147,Large,大
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +23,No employee found!,無發現任何員工！
+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 +152,Please mention no of visits required,請註明無需訪問
 DocType: Purchase Order,Customer Address Display,客戶地址顯示
 DocType: Stock Settings,Default Valuation Method,預設的估值方法
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +127,Polishing,拋光
 DocType: Production Order Operation,Planned Start Time,計劃開始時間
 apps/erpnext/erpnext/config/accounts.py +63,Close Balance Sheet and book Profit or Loss.,關閉資產負債表和賬面利潤或虧損。
-apps/erpnext/erpnext/stock/doctype/item/item.py +661,"Default Unit of Measure for Item {0} cannot be changed directly because \
+apps/erpnext/erpnext/stock/doctype/item/item.py +665,"Default Unit of Measure for Item {0} cannot be changed directly because \
 			you have already made some transaction(s) with another UOM. To change default UOM, \
 			use 'UOM Replace Utility' tool under Stock module.",測度項目的默認單位{0}不能直接改變，因為\你已經做了一些交易（S）與其他計量單位。要更改默認的計量單位，\使用“計量單位更換工具”下的股票模塊工具。
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,指定的匯率將一種貨幣兌換成另一種
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +146,Quotation {0} is cancelled,{0}報價被取消
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +141,Quotation {0} is cancelled,{0}報價被取消
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,未償還總額
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} was on leave on {1}. Cannot mark attendance.,員工{0}於{1}休假。不能標記考勤。
 DocType: Sales Partner,Targets,目標
@@ -2228,7 +2150,6 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +158,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,電腦
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +112,Electro-chemical grinding,電化學磨
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +14,This is a root customer group and cannot be edited.,ERPNext是一個開源的基於Web的ERP系統，通過網路技術，向私人有限公司提供整合的工具，在一個小的組織管理大多數流程。有關Web註釋，或購買託管，想得到更多資訊，請連結
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +39,Please setup your chart of accounts before you start Accounting Entries,開始會計分錄前，請設定您的會計科目表
 DocType: Purchase Invoice,Ignore Pricing Rule,忽略定價規則
@@ -2286,7 +2207,6 @@
 DocType: Maintenance Visit,Purposes,用途
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +103,Atleast one item should be entered with negative quantity in return document,ATLEAST一個項目應該負數量回報文檔中輸入
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +67,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations",操作{0}比任何可用的工作時間更長工作站{1}，分解成運行多個操作
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +134,Electrochemical machining,電化學加工
 ,Requested,要求
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +66,No Remarks,暫無產品說明
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +13,Overdue,過期的
@@ -2295,7 +2215,7 @@
 DocType: Monthly Distribution,Distribution Name,分配名稱
 DocType: Features Setup,Sales and Purchase,買賣
 DocType: Supplier Quotation Item,Material Request No,材料需求編號
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +218,Quality Inspection required for Item {0},項目{0}需要品質檢驗
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +221,Quality Inspection required for Item {0},項目{0}需要品質檢驗
 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),淨利率（公司貨幣）
@@ -2313,9 +2233,8 @@
 apps/erpnext/erpnext/accounts/report/financial_statements.py +16,Fiscal Year {0} not found.,會計年度{0}未找到。
 DocType: Bank Reconciliation,Get Relevant Entries,獲取相關條目
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +407,Accounting Entry for Stock,存貨的會計分錄
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +64,Coining,鑄幣
 DocType: Sales Invoice,Sales Team1,銷售團隊1
-apps/erpnext/erpnext/stock/doctype/item/item.py +412,Item {0} does not exist,項目{0}不存在
+apps/erpnext/erpnext/stock/doctype/item/item.py +416,Item {0} does not exist,項目{0}不存在
 DocType: Sales Invoice,Customer Address,客戶地址
 apps/frappe/frappe/desk/query_report.py +136,Total,總計
 DocType: Purchase Invoice,Apply Additional Discount On,收取額外折扣
@@ -2327,14 +2246,13 @@
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),稅額後，優惠金額（公司貨幣）
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +149,Target warehouse is mandatory for row {0},目標倉庫是強制性的行{0}
 DocType: Quality Inspection,Quality Inspection,品質檢驗
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +144,Extra Small,超小
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +20,Spray forming,噴射成形
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Extra Small,超小
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +458,Warning: Material Requested Qty is less than Minimum Order Qty,警告：物料需求的數量低於最少訂購量
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +191,Account {0} is frozen,帳戶{0}被凍結
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,法人/子公司與帳戶的獨立走勢屬於該組織。
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +29,"Food, Beverage & Tobacco",食品、飲料＆煙草
+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 +529,Can only make payment against unbilled {0},只能使支付對未付款的{0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +531,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/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Minimum Inventory Level,最低庫存水平
 DocType: Stock Entry,Subcontract,轉包
@@ -2345,19 +2263,18 @@
 DocType: Item,Manufacturer Part Number,製造商零件編號
 DocType: Production Order Operation,Estimated Time and Cost,估計時間和成本
 DocType: Bin,Bin,箱子
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +50,Nosing,減噪
 DocType: SMS Log,No of Sent SMS,沒有發送短信
 DocType: Account,Company,公司
 DocType: Account,Expense Account,費用帳戶
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +49,Software,軟件
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +151,Colour,顏色
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +49,Software,軟件
+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",請選擇項，其中“正股項”是“否”和“是銷售物品”是“是”，沒有其他產品捆綁
 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 +281,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 +134,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 +145,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,重命名日誌
@@ -2367,7 +2284,7 @@
 apps/erpnext/erpnext/controllers/recurring_document.py +162,Please select {0},請選擇{0}
 DocType: C-Form,C-Form No,C-表格編號
 DocType: BOM,Exploded_items,Exploded_items
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +95,Researcher,研究員
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Researcher,研究員
 apps/frappe/frappe/custom/doctype/customize_form/customize_form.js +88,Update,更新
 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 +23,Name or Email is mandatory,姓名或電子郵件是強制性
@@ -2376,11 +2293,10 @@
 DocType: Employee,Exit,出口
 apps/erpnext/erpnext/accounts/doctype/account/account.py +134,Root Type is mandatory,root類型是強制性的
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +295,Serial No {0} created,序列號{0}創建
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +125,Vibratory finishing,震盪整理
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes",為方便客戶，這些代碼可以在列印格式，如發票和送貨單使用
 DocType: Employee,You can enter any date manually,您可以手動輸入任何日期
 DocType: Sales Invoice,Advertisement,廣告
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +165,Probationary Period,試用期
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Probationary Period,試用期
 DocType: Customer Group,Only leaf nodes are allowed in transaction,只有葉節點中允許交易
 DocType: Expense Claim,Expense Approver,費用審批
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,採購入庫項目供應商
@@ -2388,19 +2304,16 @@
 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/setup/page/setup_wizard/fixtures/operations.py +137,Grinding,磨碎
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +34,Shrink wrapping,收縮包裝
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +36,Pending Activities,待活動
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,Confirmed,確認
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier > Supplier Type,供應商>供應商類型
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +127,Please enter relieving date.,請輸入解除日期。
 apps/erpnext/erpnext/controllers/trends.py +137,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/hr/doctype/leave_application/leave_application.py +51,Only Leave Applications with status 'Approved' can be submitted,只允許提交狀態為「已批准」的休假申請
 apps/erpnext/erpnext/utilities/doctype/address/address.py +21,Address Title is mandatory.,地址標題是強制性的。
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,輸入活動的名稱，如果查詢來源是運動
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +38,Newspaper Publishers,報紙出版商
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +38,Newspaper Publishers,報紙出版商
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,選擇財政年度
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +88,Smelting,熔煉
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,重新排序級別
 DocType: Attendance,Attendance Date,考勤日期
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,工資分手基於盈利和演繹。
@@ -2415,28 +2328,26 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +414,[Error],[錯誤]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,銷售訂單一被儲存，就會顯示出來。
 ,Employee Birthday,員工生日
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +55,Venture Capital,創業投資
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,創業投資
 DocType: UOM,Must be Whole Number,必須是整數
 DocType: Leave Control Panel,New Leaves Allocated (In Days),新的排假（天）
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +51,Serial No {0} does not exist,序列號{0}不存在
 DocType: Pricing Rule,Discount Percentage,折扣百分比
 DocType: Payment Reconciliation Invoice,Invoice Number,發票號碼
-apps/erpnext/erpnext/hooks.py +70,Orders,訂單
+apps/erpnext/erpnext/hooks.py +54,Orders,訂單
 DocType: Leave Control Panel,Employee Type,員工類型
 DocType: Employee Leave Approver,Leave Approver,休假審批人
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +70,Swaging,模鍛
 DocType: Manufacturing Settings,Material Transferred for Manufacture,材料移送製造
 DocType: Expense Claim,"A user with ""Expense Approver"" role",與“費用審批人”角色的用戶
 ,Issued Items Against Production Order,發出對項目生產訂單
 DocType: Pricing Rule,Purchase Manager,採購經理
 DocType: Payment Tool,Payment Tool,支付工具
 DocType: Target Detail,Target Detail,目標詳細資訊
-DocType: Sales Order,% of materials billed against this Sales Order,針對這張銷售訂單的已出帳物料的百分比(%)
+DocType: Sales Order,% of materials billed against this Sales Order,針對這張銷售訂單的已開立帳單的百分比(%)
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +50,Period Closing Entry,期末進入
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +62,Cost Center with existing transactions can not be converted to group,與現有的交易成本中心，不能轉化為組
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Depreciation,折舊
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),供應商（S）
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +29,Invalid period,無效的時期
 DocType: Customer,Credit Limit,信用額度
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,交易的選擇類型
 DocType: GL Entry,Voucher No,憑證編號
@@ -2446,9 +2357,9 @@
 DocType: Customer,Address and Contact,地址和聯繫方式
 DocType: Customer,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}
 apps/erpnext/erpnext/accounts/party.py +284,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),注：由於/參考日期由{0}天超過了允許客戶信用天（S）
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +621,Maint. Schedule,維護手冊。計劃
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +108,Abrasive jet machining,磨料噴射加工
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +632,Maint. Schedule,維護手冊。計劃
 DocType: Stock Settings,Freeze Stock Entries,凍結庫存項目
 DocType: Website Settings,Website Settings,網站設置
 DocType: Item,Reorder level based on Warehouse,根據倉庫訂貨點水平
@@ -2465,7 +2376,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +75,Show Stock Entries,顯示Stock條目
 ,Is Primary Address,是主地址
 DocType: Production Order,Work-in-Progress Warehouse,在製品倉庫
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +308,Reference #{0} dated {1},參考＃ {0}於{1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Reference #{0} dated {1},參考＃ {0}於{1}
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +13,Manage Addresses,管理地址
 DocType: Pricing Rule,Item Code,產品編號
 DocType: Production Planning Tool,Create Production Orders,建立生產訂單
@@ -2474,7 +2385,7 @@
 DocType: Lead,Market Segment,市場分類
 DocType: Communication,Phone,電話
 DocType: Employee Internal Work History,Employee Internal Work History,員工內部工作經歷
-apps/erpnext/erpnext/public/js/account_tree_grid.js +50,Closing (Dr),關閉（Dr）
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +221,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.,稅務模板賣出的交易。
@@ -2490,8 +2401,8 @@
 ,Billed Amount,帳單金額
 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 +129,Material Request {0} is cancelled or stopped,材料需求{0}被取消或停止
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +641,Add a few sample records,添加了一些樣本記錄
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +133,Material Request {0} is cancelled or stopped,材料需求{0}被取消或停止
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Add a few sample records,添加了一些樣本記錄
 apps/erpnext/erpnext/config/hr.py +210,Leave Management,離開管理
 DocType: Event,Groups,組
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,以帳戶分群組
@@ -2504,38 +2415,34 @@
 DocType: Features Setup,Sales Extras,額外銷售
 apps/erpnext/erpnext/accounts/utils.py +344,{0} budget for Account {1} against Cost Center {2} will exceed by {3},{0}預算帳戶{1}對成本中心{2}將超過{3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +236,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry",差異帳戶必須是資產/負債類型的帳戶，因為此庫存調整是一個開始分錄
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +138,Purchase Order number required for Item {0},所需物品{0}的採購訂單號
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Order number required for Item {0},所需物品{0}的採購訂單號
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',“起始日期”必須經過'終止日期'
 ,Stock Projected Qty,存貨預計數量
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +147,Customer {0} does not belong to project {1},客戶{0}不屬於項目{1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +150,Customer {0} does not belong to project {1},客戶{0}不屬於項目{1}
 DocType: Sales Order,Customer's Purchase Order,客戶採購訂單
 DocType: Warranty Claim,From Company,從公司
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,價值或數量
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Minute,分鐘
+apps/erpnext/erpnext/public/js/setup_wizard.js +363,Minute,分鐘
 DocType: Purchase Invoice,Purchase Taxes and Charges,購置稅和費
 ,Qty to Receive,未到貨量
 DocType: Leave Block List,Leave Block List Allowed,准許的休假區塊清單
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +61,Conversion factor cannot be in fractions,轉換係數不能在分數
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +358,You will use it to Login,你會用它來登入
+apps/erpnext/erpnext/public/js/setup_wizard.js +108,You will use it to Login,你會用它來登入
 DocType: Sales Partner,Retailer,零售商
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +99,Credit To account must be a Balance Sheet account,信用帳戶必須是資產負債表科目
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,所有供應商類型
 apps/erpnext/erpnext/stock/doctype/item/item.py +37,Item Code is mandatory because Item is not automatically numbered,產品編號是強制性的，因為項目沒有自動編號
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +99,Quotation {0} not of type {1},報價{0}非為{1}類型
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +93,Quotation {0} not of type {1},報價{0}非為{1}類型
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,維護計劃項目
 DocType: Sales Order,%  Delivered,％交付
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,Bank Overdraft Account,銀行透支戶口
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +15,Make Salary Slip,製作工資單
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +18,Browse BOM,瀏覽BOM
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +175,Secured Loans,抵押貸款
-apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +3,Awesome Products,真棒產品
+apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +3,Awesome Products,真棒產品
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +189,Opening Balance Equity,期初餘額權益
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +80,Cannot approve leave as you are not authorized to approve leaves on Block Dates,不能批准休假，你無權在批准休假在被標記的日期
 DocType: Appraisal,Appraisal,評價
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +13,Lost-foam casting,失模鑄造
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +47,Drawing,圖紙
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +22,Date is repeated,日期重複
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +148,Leave approver must be one of {0},休假審批人必須是一個{0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +162,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,開始時間
@@ -2549,7 +2456,7 @@
 DocType: Purchase Invoice Item,Net Amount (Company Currency),淨金額（公司貨幣）
 DocType: BOM Operation,Hour Rate,小時率
 DocType: Stock Settings,Item Naming By,產品命名規則
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +642,From Quotation,從報價
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +655,From Quotation,從報價
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},另一個期末錄入{0}作出後{1}
 DocType: Production Order,Material Transferred for Manufacturing,物料轉倉用於製造
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +29,Account {0} does not exists,帳戶{0}不存在
@@ -2563,21 +2470,19 @@
 DocType: Purchase Invoice Item,PR Detail,詳細新聞稿
 DocType: Sales Order,Fully Billed,完全開票
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +20,Cash In Hand,手頭現金
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +72,Delivery warehouse required for stock item {0},需要的庫存項目交割倉庫{0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +119,Delivery warehouse required for stock item {0},需要的庫存項目交割倉庫{0}
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),包裹的總重量。通常為淨重+包裝材料的重量。 （用於列印）
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,具有此角色的用戶可以設置凍結帳戶，並新增/修改對凍結帳戶的會計分錄
 DocType: Serial No,Is Cancelled,被註銷
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +281,My Shipments,我的出貨量
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +286,My Shipments,我的出貨量
 DocType: Journal Entry,Bill Date,帳單日期
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +43,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:",即使有更高優先級的多個定價規則，然後按照內部優先級應用：
 DocType: Supplier,Supplier Details,供應商詳細資訊
 DocType: Communication,Recipients,受助人
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +146,Screwing,擰
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +96,Knurling,滾花
 DocType: Expense Claim,Approval Status,審批狀態
 DocType: Hub Settings,Publish Items to Hub,發布項目到集線器
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +44,From value must be less than to value in row {0},來源值必須小於列{0}的值
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +133,Wire Transfer,電匯
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +133,Wire Transfer,電匯
 apps/erpnext/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py +25,Please select Bank Account,請選擇銀行帳戶
 DocType: Newsletter,Create and Send Newsletters,建立和發送簡訊
 apps/frappe/frappe/public/js/frappe/views/reports/grid_report.js +305,From Date must be before To Date,起始日期必須早於終點日期
@@ -2585,14 +2490,14 @@
 DocType: Company,Default Income Account,預設之收入帳戶
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,客戶群組／客戶
 DocType: Item Group,Check this if you want to show in website,勾選本項以顯示在網頁上
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +190,Welcome to ERPNext,歡迎來到ERPNext
+,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/page/setup_wizard/install_fixtures.py +37,Calls,電話
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Calls,電話
 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 +193,Purchase Order {0} is not submitted,採購訂單{0}未提交
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +194,Purchase Order {0} is not submitted,採購訂單{0}未提交
 ,Projected,預計
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},序列號{0}不屬於倉庫{1}
 apps/erpnext/erpnext/controllers/status_updater.py +136,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,注：系統將不檢查過交付和超額預訂的項目{0}的數量或金額為0
@@ -2600,7 +2505,6 @@
 DocType: Issue,Opening Date,開幕日期
 DocType: Journal Entry,Remark,備註
 DocType: Purchase Receipt Item,Rate and Amount,率及金額
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +95,Boring,無聊
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +667,From Sales Order,從銷售訂單
 DocType: Blog Category,Parent Website Route,父網站路由
 DocType: Sales Order,Not Billed,不發單
@@ -2614,19 +2518,17 @@
 apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount Amount,折扣金額
 DocType: Purchase Invoice,Return Against Purchase Invoice,回到對採購發票
 DocType: Item,Warranty Period (in days),保修期限（天數）
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +550,e.g. VAT,例如增值稅
+apps/erpnext/erpnext/public/js/setup_wizard.js +292,e.g. VAT,例如增值稅
 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,報價系列
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +52,"An item exists with same name ({0}), please change the item group name or rename the item",具有相同名稱的項目存在（ {0} ） ，請更改項目群組名或重新命名該項目
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +82,Hot metal gas forming,鐵水形成氣
 DocType: Sales Order Item,Sales Order Date,銷售訂單日期
 DocType: Sales Invoice Item,Delivered Qty,交付數量
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +63,Warehouse {0}: Company is mandatory,倉庫{0}：公司是強制性的
 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.",轉到相應的群組（通常基金>流動負債>稅和關稅的來源，並新增一個新帳戶（通過點擊輸入“稅”添加兒童），做提稅率。
 ,Payment Period Based On Invoice Date,基於發票日的付款期
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +50,Missing Currency Exchange Rates for {0},缺少貨幣匯率{0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +135,Laser cutting,激光切割
 DocType: Event,Monday,星期一
 DocType: Journal Entry,Stock Entry,存貨分錄
 DocType: Account,Payable,支付
@@ -2659,7 +2561,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +111,Date Of Retirement must be greater than Date of Joining,日期退休必須大於加入的日期
 DocType: Sales Invoice,Against Income Account,對收入帳戶
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +69,{0}% Delivered,{0}％交付
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +78,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,項目{0}：有序數量{1}不能低於最低訂貨量{2}（項中定義）。
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,項目{0}：有序數量{1}不能低於最低訂貨量{2}（項中定義）。
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,每月分配比例
 DocType: Territory,Territory Targets,境內目標
 DocType: Delivery Note,Transporter Info,轉運資訊
@@ -2668,7 +2570,6 @@
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,"列印模板的標題, 例如 Proforma Invoice。"
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +140,Valuation type charges can not marked as Inclusive,估值類型罪名不能標記為包容性
 DocType: POS Profile,Update Stock,庫存更新
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +128,Superfinishing,超精研
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,不同計量單位的項目會導致不正確的（總）淨重值。確保每個項目的淨重是在同一個計量單位。
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM率
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +85,Please pull items from Delivery Note,請送貨單拉項目
@@ -2683,7 +2584,6 @@
 ,Purchase Analytics,採購分析
 DocType: Sales Invoice Item,Delivery Note Item,送貨單項目
 DocType: Expense Claim,Task,任務
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +57,Shaving,刮
 DocType: Purchase Taxes and Charges,Reference Row #,參考列#
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},批號是強制性的項目{0}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js +14,This is a root sales person and cannot be edited.,您可以通過選擇備份頻率啟動和\
@@ -2695,13 +2595,11 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +74,Purpose must be one of {0},目的必須是一個{0}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +108,Fill the form and save it,填寫表格，並將其保存
 DocType: Production Planning Tool,Download a report containing all raw materials with their latest inventory status,下載一個包含所有原料一份報告，他們最新的庫存狀態
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +94,Facing,面對
 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: Time Log,Billable,計費
-DocType: Authorization Rule,This will be used for setting rule in HR module,這將用於在人力資源模塊的設置規則
 DocType: Account,Rate at which this tax is applied,此稅適用的匯率
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reorder Qty,再訂購數量
 DocType: Company,Stock Adjustment Account,庫存調整帳戶
@@ -2728,16 +2626,15 @@
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,百分比分配總和應該等於100%
 DocType: Serial No,Out of AMC,出資產管理公司
 DocType: Purchase Order Item,Material Request Detail No,物料需求詳細說明編號
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +97,Hard turning,硬車削
 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 +79,Company (not Customer or Supplier) master.,公司（不是客戶或供應商）的主人。
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +106,Please enter 'Expected Delivery Date',請輸入「預定交付日」
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +187,Delivery Notes {0} must be cancelled before cancelling this Sales Order,送貨單{0}必須先取消才能取消銷貨訂單
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +100,Please enter 'Expected Delivery Date',請輸入「預定交付日」
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +182,Delivery Notes {0} must be cancelled before cancelling this Sales Order,送貨單{0}必須先取消才能取消銷貨訂單
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +373,Paid amount + Write Off Amount can not be greater than Grand Total,支付的金額+寫的抵銷金額不能大於總計
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0}不是對項目的有效批號{1}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,Note: There is not enough leave balance for Leave Type {0},注：沒有足夠的休假餘額請假類型{0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +124,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,機會型
@@ -2749,7 +2646,7 @@
 DocType: Hub Settings,Publish Availability,發布房源
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +105,Date of Birth cannot be greater than today.,出生日期不能大於今天。
 ,Stock Ageing,存貨帳齡分析表
-apps/erpnext/erpnext/controllers/accounts_controller.py +200,{0} '{1}' is disabled,{0}“{1}”被禁用
+apps/erpnext/erpnext/controllers/accounts_controller.py +201,{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.,發送電子郵件的自動對提交的交易聯繫。
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +232,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
@@ -2759,44 +2656,38 @@
 DocType: Purchase Order,Customer Contact Email,客戶聯繫電子郵件
 DocType: Event,Sunday,星期天
 DocType: Sales Team,Contribution (%),貢獻（％）
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +455,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,注：付款項將不會被創建因為“現金或銀行帳戶”未指定
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +171,Responsibilities,職責
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +457,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 +11,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/setup/page/setup_wizard/setup_wizard.js +511,Add Users,添加用戶
+apps/erpnext/erpnext/public/js/setup_wizard.js +255,Add Users,添加用戶
 DocType: Pricing Rule,Item Group,項目群組
 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),稅收和收費上架（公司貨幣）
-apps/erpnext/erpnext/stock/doctype/item/item.py +340,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,商品稅行{0}必須有帳戶類型稅或收入或支出或課稅的
+apps/erpnext/erpnext/stock/doctype/item/item.py +344,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,商品稅行{0}必須有帳戶類型稅或收入或支出或課稅的
 DocType: Sales Order,Partly Billed,天色帳單
 DocType: Item,Default BOM,預設的BOM
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +79,Decambering,Decambering
 apps/erpnext/erpnext/setup/doctype/company/company.js +22,Please re-type company name to confirm,請確認重新輸入公司名稱
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,總街貨量金額
 DocType: Time Log Batch,Total Hours,總時數
 DocType: Journal Entry,Printing Settings,打印設置
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +268,Total Debit must be equal to Total Credit. The difference is {0},借方總額必須等於貸方總額。差額為{0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +11,Automotive,汽車
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +37,Item is required,項目是必需的
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +25,Metal injection molding,金屬注射成型
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +258,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/accounts/doctype/sales_invoice/sales_invoice.js +684,From Delivery Note,從送貨單
 DocType: Time Log,From Time,從時間
 DocType: Notification Control,Custom Message,自定義訊息
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +33,Investment Banking,投資銀行業務
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +261,"Select your Country, Time Zone and Currency",選擇國家時區和貨幣
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,投資銀行業務
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +316,"Select your Country, Time Zone and Currency",選擇國家時區和貨幣
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +369,Cash or Bank Account is mandatory for making payment entry,製作付款分錄時，現金或銀行帳戶是強制性輸入的欄位。
 DocType: Purchase Invoice,Price List Exchange Rate,價目表匯率
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +91,Pickling,酸洗
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +18,Sand casting,砂型鑄造
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +117,Electroplating,電鍍
 DocType: Purchase Invoice Item,Rate,單價
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +62,Intern,實習生
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Intern,實習生
 DocType: Newsletter,A Lead with this email id should exist,與此電子郵件id一個鉛應該存在
 DocType: Stock Entry,From BOM,從BOM
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +34,Basic,基本的
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +34,Basic,基本的
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,{0}前的庫存交易被凍結
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +217,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,日期應該是一樣的起始日期為半天假
@@ -2804,11 +2695,11 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +96,Reference No is mandatory if you entered Reference Date,如果你輸入的參考日期，參考編號是強制性的
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +108,Date of Joining must be greater than Date of Birth,加入日期必須大於出生日期
 DocType: Salary Structure,Salary Structure,薪酬結構
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +242,"Multiple Price Rule exists with same criteria, please resolve \
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +246,"Multiple Price Rule exists with same criteria, please resolve \
 			conflict by assigning priority. Price Rules: {0}","多次價格規則存在著同樣的標準，請解決衝突\
 通過分配優先級。價格規則：{0}"
 DocType: Account,Bank,銀行
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +9,Airline,航空公司
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,航空公司
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +493,Issue Material,發行材料
 DocType: Material Request Item,For Warehouse,對於倉​​庫
 DocType: Employee,Offer Date,到職日期
@@ -2818,29 +2709,24 @@
 DocType: Item,Is Fixed Asset Item,是固定資產項目
 DocType: Stock Entry,Including items for sub assemblies,包括子組件項目
 DocType: Features Setup,"If you have long print formats, this feature can be used to split the page to be printed on multiple pages with all headers and footers on each page",如果你有很長的列印格式，這個功能可以被用來分割要列印多個頁面，每個頁面上的所有頁眉和頁腳的頁
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +131,Hobbing,滾齒機
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +98,All Territories,所有的領土
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +98,All Territories,所有的領土
 DocType: Purchase Invoice,Items,項目
 DocType: Fiscal Year,Year Name,今年名稱
 DocType: Process Payroll,Process Payroll,處理工資
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +59,There are more holidays than working days this month.,還有比這個月工作日更多的假期。
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +68,There are more holidays than working days this month.,還有比這個月工作日更多的假期。
 DocType: Product Bundle Item,Product Bundle Item,產品包項目
 DocType: Sales Partner,Sales Partner Name,銷售合作夥伴名稱
 DocType: Purchase Invoice Item,Image View,圖像查看
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +113,Finishing & industrial finishing,精加工和精加工工業
 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/page/setup_wizard/fixtures/industry_type.py +46,Securities & Commodity Exchanges,證券及商品交易所
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,證券及商品交易所
 DocType: Shipping Rule,Calculate Based On,計算的基礎上
 DocType: Delivery Note Item,From Warehouse,從倉庫
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +98,Drilling,鑽孔
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +28,Blow molding,吹塑
 DocType: Purchase Taxes and Charges,Valuation and Total,估值與總計
 DocType: Tax Rule,Shipping City,航運市
 apps/erpnext/erpnext/stock/doctype/item/item.js +43,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,該項目是{0}（模板）的變體。屬性將被複製的模板，除非“不複製”設置
 DocType: Account,Purchase User,購買用戶
 DocType: Notification Control,Customize the Notification,自定義通知
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +87,Hammering,鍛造
 DocType: Web Page,Slideshow,連續播放
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +24,Default Address Template cannot be deleted,預設地址模板不能被刪除
 DocType: Sales Invoice,Shipping Rule,送貨規則
@@ -2849,9 +2735,8 @@
 DocType: Workflow State,Search,搜索
 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/setup/page/setup_wizard/fixtures/operations.py +142,Brazing,銅焊
 DocType: C-Form,Amended From,從修訂
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Raw Material,原料
+apps/erpnext/erpnext/public/js/setup_wizard.js +359,Raw Material,原料
 DocType: Leave Application,Follow via Email,通過電子郵件跟隨
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,稅額折後金額
 apps/erpnext/erpnext/accounts/doctype/account/account.py +174,Child account exists for this account. You can not delete this account.,此帳戶存在子帳戶。您無法刪除此帳戶。
@@ -2865,10 +2750,10 @@
 ,Produced,生產
 DocType: Item,Item Code for Suppliers,對於供應商產品編號
 DocType: Issue,Raised By (Email),提出（電子郵件）
-apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +72,General,一般
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +495,Attach Letterhead,附加信
+apps/erpnext/erpnext/setup/setup_wizard/default_website.py +72,General,一般
+apps/erpnext/erpnext/public/js/setup_wizard.js +241,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/setup/page/setup_wizard/setup_wizard.js +542,"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/public/js/setup_wizard.js +284,"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}
 DocType: Journal Entry,Bank Entry,銀行分錄
 DocType: Authorization Rule,Applicable To (Designation),適用於（指定）
@@ -2877,33 +2762,32 @@
 apps/erpnext/erpnext/config/accounts.py +143,Enable / disable currencies.,啟用／禁用的貨幣。
 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）
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +26,Entertainment & Leisure,娛樂休閒
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,娛樂休閒
 DocType: Purchase Order,The date on which recurring order will be stop,上反复出現的訂單將被終止日期
 DocType: Quality Inspection,Item Serial No,產品序列號
 apps/erpnext/erpnext/controllers/status_updater.py +142,{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 +57,Total Present,總現
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Hour,小時
+apps/erpnext/erpnext/public/js/setup_wizard.js +363,Hour,小時
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +138,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation","系列化項目{0}不能被更新\
 使用庫存調整"
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +488,Transfer Material to Supplier,轉印材料供應商
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +513,Transfer Material to Supplier,轉印材料供應商
 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/crm/doctype/opportunity/opportunity.js +82,Create Quotation,建立報價
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +306,All these items have already been invoiced,所有這些項目已開具發票
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,You are not authorized to approve leaves on Block Dates,您無權批准葉子座日期
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +311,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/setup/page/setup_wizard/fixtures/operations.py +83,Curling,冰壺
 DocType: Account,Tax,稅
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +28,Row {0}: {1} is not a valid {2},行{0}：{1}不是有效的{2}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +89,Refining,精製
+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,生產規劃工具
 DocType: Quality Inspection,Report Date,報告日期
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +130,Routing,路由
 DocType: C-Form,Invoices,發票
 DocType: Job Opening,Job Title,職位
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +54,{0} already allocated for Employee {1} for period {2} - {3},{0}已分配給員工{1}的時期{2}  -  {3}
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +80,{0} Recipients,{0}收件人
 DocType: Features Setup,Item Groups in Details,產品群組之詳細資訊
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +335,Quantity to Manufacture must be greater than 0.,量生產必須大於0。
@@ -2921,14 +2805,13 @@
 DocType: DocType,Setup,設定
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,對於如1美元= 100美分
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +108,Summary for this month and pending activities,本月和待活動總結
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +39,Cold rolling,冷軋
 DocType: Customer Group,Customer Group Name,客戶群組名稱
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +408,Please remove this Invoice {0} from C-Form {1},請刪除此發票{0}從C-表格{1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +410,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,屬性
 DocType: Packing Slip,Get Items,找項目
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +186,Please enter Write Off Account,請輸入核銷帳戶
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +187,Please enter Write Off Account,請輸入核銷帳戶
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +71,Last Order Date,最後訂購日期
 DocType: DocField,Image,圖像
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +179,Make Excise Invoice,使消費稅發票
@@ -2938,7 +2821,7 @@
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +146,Operation ID not set,操作ID沒有設定
 DocType: Production Order,Planned Start Date,計劃開始日期
 DocType: Serial No,Creation Document Type,創建文件類型
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +620,Maint. Visit,維護手冊。訪
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +631,Maint. Visit,維護手冊。訪
 DocType: Leave Type,Is Encash,為兌現
 DocType: Purchase Invoice,Mobile No,手機號碼
 DocType: Payment Tool,Make Journal Entry,使日記帳分錄
@@ -2946,35 +2829,31 @@
 apps/erpnext/erpnext/controllers/trends.py +257,Project-wise data is not available for Quotation,項目明智的數據不適用於報價
 DocType: Project,Expected End Date,預計結束日期
 DocType: Appraisal Template,Appraisal Template Title,評估模板標題
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +440,Commercial,商業
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +378,Commercial,商業
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +23,Parent Item {0} must not be a Stock Item,父項{0}不能是庫存產品
 DocType: Cost Center,Distribution Id,分配標識
-apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +14,Awesome Services,真棒服務
+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,供應商地址
 DocType: Contact Us Settings,Address Line 2,地址行2
 DocType: ToDo,Reference,參考
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +59,Perforating,射孔
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,輸出數量
 apps/erpnext/erpnext/config/accounts.py +128,Rules to calculate shipping amount for a sale,規則用於計算銷售運輸量
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +29,Series is mandatory,系列是強制性的
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +28,Financial Services,金融服務
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,金融服務
 apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3},為屬性{0}值必須的範圍內{1}到{2}中的增量{3}
 DocType: Tax Rule,Sales,銷售
 DocType: Stock Entry Detail,Basic Amount,基本金額
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +173,Warehouse required for stock Item {0},倉庫需要現貨產品{0}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +178,Warehouse required for stock Item {0},倉庫需要現貨產品{0}
 DocType: Leave Allocation,Unused leaves,未使用的葉子
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,鉻
 DocType: Customer,Default Receivable Accounts,預設應收帳款
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +102,Sawing,鋸切
 DocType: Tax Rule,Billing State,計費狀態
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +32,Laminating,層壓
 DocType: Item Reorder,Transfer,轉讓
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +549,Fetch exploded BOM (including sub-assemblies),取得爆炸BOM（包括子組件）
 DocType: Authorization Rule,Applicable To (Employee),適用於（員工）
 apps/erpnext/erpnext/controllers/accounts_controller.py +101,Due Date is mandatory,截止日期是強制性的
 apps/erpnext/erpnext/controllers/item_variant.py +51,Increment for Attribute {0} cannot be 0,增量屬性{0}不能為0
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +143,Sintering,燒結
 DocType: Journal Entry,Pay To / Recd From,支付/ 接收
 DocType: Naming Series,Setup Series,設置系列
 DocType: Supplier,Contact HTML,聯繫HTML
@@ -2987,7 +2866,6 @@
 DocType: Attendance,Absent,缺席
 DocType: Product Bundle,Product Bundle,產品包
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +180,Row {0}: Invalid reference {1},行{0}：無效參考{1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +165,Crushing,破碎
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,購置稅和費模板
 DocType: Upload Attendance,Download Template,下載模板
 DocType: GL Entry,Remarks,備註
@@ -2995,14 +2873,12 @@
 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/setup/page/setup_wizard/fixtures/operations.py +9,Continuous casting,連鑄
 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/setup/page/setup_wizard/fixtures/operations.py +80,Cold sizing,冷上漿
 DocType: Salary Slip,Earning & Deduction,收入及扣除
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +76,Account {0} cannot be a Group,帳戶{0}不能為集團
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +259,Region,區域
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +314,Region,區域
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +213,Optional. This setting will be used to filter in various transactions.,可選。此設置將被應用於過濾各種交易進行。
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +104,Negative Valuation Rate is not allowed,負面評價率是不允許的
 DocType: Holiday List,Weekly Off,每週關閉
@@ -3020,7 +2896,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,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,考勤起始日期和出席的日期，是強制性的
-apps/erpnext/erpnext/controllers/buying_controller.py +131,Please enter 'Is Subcontracted' as Yes or No,請輸入'轉包' YES或NO
+apps/erpnext/erpnext/controllers/buying_controller.py +122,Please enter 'Is Subcontracted' as Yes or No,請輸入'轉包' YES或NO
 DocType: Sales Team,Contact No.,聯絡電話
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,'Profit and Loss' type account {0} not allowed in Opening Entry,“損益”帳戶類型{0}不開放允許入境
 DocType: Workflow State,Time,時間
@@ -3029,14 +2905,13 @@
 DocType: Authorization Rule,Authorization Rule,授權規則
 DocType: Sales Invoice,Terms and Conditions Details,條款及細則詳情
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,營業稅金及費用套版
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +10,Apparel & Accessories,服裝及配飾
+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,訂購數量
 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 +121,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/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +47,Conversion Factor is required,轉換係數是必需的
 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,值/說明
@@ -3044,10 +2919,8 @@
 ,Customers Not Buying Since Long Time,客戶已久未購買
 DocType: Production Order,Expected Delivery Date,預計交貨日期
 apps/erpnext/erpnext/accounts/general_ledger.py +121,Debit and Credit not equal for {0} #{1}. Difference is {2}.,借貸{0}＃不等於{1}。區別是{2}。
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +48,Bulging,挺著
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +11,Evaporative-pattern casting,蒸發圖案鑄造
 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 +195,Sales Invoice {0} must be cancelled before cancelling this Sales Order,銷售發票{0}必須早於此銷售訂單之前取消
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +190,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 。
@@ -3066,26 +2939,24 @@
 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 +241,Account: {0} with currency: {1} can not be selected,帳號：{0}幣種：{1}不能選擇
+apps/erpnext/erpnext/controllers/accounts_controller.py +242,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 +47,Account {0}: Parent account {1} does not belong to company: {2},帳戶{0}：父帳戶{1}不屬於公司：{2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted all transactions related to this company!,成功刪除與該公司相關的所有交易！
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,隨著對日
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +111,Honing,珩磨
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +58,Probation,緩刑
-apps/erpnext/erpnext/stock/doctype/item/item.py +264,Default Warehouse is mandatory for stock Item.,預設倉庫對庫存項目是強制性的。
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Probation,緩刑
+apps/erpnext/erpnext/stock/doctype/item/item.py +268,Default Warehouse is mandatory for stock Item.,預設倉庫對庫存項目是強制性的。
 DocType: Feed,Full Name,全名
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +148,Clinching,鉚
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +191,Payment of salary for the month {0} and year {1},{1}年{0}月的薪資支付
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +173,Payment of salary for the month {0} and year {1},{1}年{0}月的薪資支付
 DocType: Stock Settings,Auto insert Price List rate if missing,自動插入價目表率，如果丟失
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,總支付金額
 ,Transferred Qty,轉讓數量
 apps/erpnext/erpnext/config/learn.py +11,Navigating,導航
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +137,Planning,規劃
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +137,Planning,規劃
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +9,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),總結算金額（通過時間日誌）
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +629,We sell this Item,我們賣這種產品
+apps/erpnext/erpnext/public/js/setup_wizard.js +365,We sell this Item,我們賣這種產品
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +65,Supplier Id,供應商編號
 DocType: Journal Entry,Cash Entry,"現金分錄
 "
@@ -3095,18 +2966,16 @@
 DocType: Brand,Item Manager,項目經理
 DocType: Cost Center,Add rows to set annual budgets on Accounts.,在帳戶的年度預算中加入新一列。
 DocType: Buying Settings,Default Supplier Type,預設的供應商類別
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +160,Quarrying,採石
 DocType: Production Order,Total Operating Cost,總營運成本
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +160,Note: Item {0} entered multiple times,注：項目{0}多次輸入
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +163,Note: Item {0} entered multiple times,注：項目{0}多次輸入
 apps/erpnext/erpnext/config/crm.py +27,All Contacts.,所有聯繫人。
 DocType: Newsletter,Test Email Id,測試電子郵件Id
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +394,Company Abbreviation,公司縮寫
+apps/erpnext/erpnext/public/js/setup_wizard.js +142,Company Abbreviation,公司縮寫
 DocType: Features Setup,If you follow Quality Inspection. Enables Item QA Required and QA No in Purchase Receipt,如果你遵循質量檢驗。使產品的質量保證要求和質量保證在沒有採購入庫單
 DocType: GL Entry,Party Type,黨的類型
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +68,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/setup/page/setup_wizard/fixtures/operations.py +30,Rotational molding,滾塑成型
 apps/erpnext/erpnext/config/hr.py +115,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,購物車設置稅收規則
@@ -3120,15 +2989,15 @@
 apps/erpnext/erpnext/config/selling.py +18,Quotes to Leads or Customers.,行情到引線或客戶。
 DocType: Stock Settings,Role Allowed to edit frozen stock,角色可以編輯凍結的庫存
 ,Territory Target Variance Item Group-Wise,地域內跨項目群組間的目標差異
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +101,All Customer Groups,所有客戶群組
-apps/erpnext/erpnext/controllers/accounts_controller.py +474,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0}是強制性的。也許外幣兌換記錄為{1}到{2}尚未建立。
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +101,All Customer Groups,所有客戶群組
+apps/erpnext/erpnext/controllers/accounts_controller.py +475,{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 +41,Account {0}: Parent account {1} does not exist,帳戶{0}：父帳戶{1}不存在
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),價格列表費率（公司貨幣）
 DocType: Account,Temporary,臨時
 DocType: Address,Preferred Billing Address,偏好的帳單地址
 DocType: Monthly Distribution Percentage,Percentage Allocation,百分比分配
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +86,Secretary,秘書
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Secretary,秘書
 DocType: Serial No,Distinct unit of an Item,一個項目的不同的單元
 DocType: Pricing Rule,Buying,採購
 DocType: HR Settings,Employee Records to be created by,員工紀錄的創造者
@@ -3141,24 +3010,22 @@
 ,Item-wise Price List Rate,全部項目的價格表
 DocType: Purchase Order Item,Supplier Quotation,供應商報價
 DocType: Quotation,In Words will be visible once you save the Quotation.,報價一被儲存，就會顯示出來。
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +68,Ironing,熨衣服
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is stopped,{0} {1}已停止
-apps/erpnext/erpnext/stock/doctype/item/item.py +352,Barcode {0} already used in Item {1},條碼{0}已經用在項目{1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +356,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/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,活動預告
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,客戶是必需的
 DocType: Letter Head,Letter Head,信頭
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +27,Quick Entry,快速入門
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0}是強制性的回報
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0}是強制性的退回
 DocType: Purchase Order,To Receive,接受
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +33,Shrink fitting,冷縮配合
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +522,user@example.com,user@example.com
+apps/erpnext/erpnext/public/js/setup_wizard.js +266,user@example.com,user@example.com
 DocType: Email Digest,Income / Expense,收入／支出
 DocType: Employee,Personal Email,個人電子郵件
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +58,Total Variance,總方差
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +62,Total Variance,總方差
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.",如果啟用，系統將自動為發布庫存會計分錄。
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +15,Brokerage,佣金
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +15,Brokerage,佣金
 DocType: Address,Postal Code,郵政編碼
 DocType: Production Order Operation,"in Minutes
 Updated via 'Time Log'","在分
@@ -3166,14 +3033,13 @@
 DocType: Customer,From Lead,從鉛
 apps/erpnext/erpnext/config/manufacturing.py +19,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 +442,POS Profile required to make POS Entry,所需的POS資料，使POS進入
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +444,POS Profile required to make POS Entry,所需的POS資料，使POS進入
 DocType: Hub Settings,Name Token,名令牌
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +106,Planing,刨
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Selling,標準銷售
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +120,Standard Selling,標準銷售
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +137,Atleast one warehouse is mandatory,至少要有一間倉庫
 DocType: Serial No,Out of Warranty,超出保修期
 DocType: BOM Replace Tool,Replace,更換
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +314,{0} against Sales Invoice {1},{0}對銷售發票{1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +316,{0} against Sales Invoice {1},{0}針對銷售發票{1}
 apps/erpnext/erpnext/stock/doctype/item/item.py +49,Please enter default Unit of Measure,請輸入預設的計量單位
 DocType: Purchase Invoice Item,Project Name,專案名稱
 DocType: Supplier,Mention if non-standard receivable account,提到如果不規範應收賬款
@@ -3189,9 +3055,8 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,Journal Entry {0} does not have account {1} or already matched against other voucher,日記條目{0}沒有帳號{1}或已經匹配其他憑證
 DocType: Item,Moving Average,移動平均線
 DocType: BOM Replace Tool,The BOM which will be replaced,這將被替換的物料清單
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +43,New Stock UOM must be different from current stock UOM,全新庫存計量單位必須不同於目前的計量單位
 DocType: Account,Debit,借方
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +34,Leaves must be allocated in multiples of 0.5,休假必須安排成0.5倍的
+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/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,優秀的金額
@@ -3209,8 +3074,7 @@
 DocType: Employee,Internal Work History,內部工作經歷
 DocType: DocField,Column Break,分欄符
 DocType: Event,Thursday,星期四
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +42,Private Equity,私募股權投資
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +93,Turning,車削
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,私募股權投資
 DocType: Maintenance Visit,Customer Feedback,客戶反饋
 DocType: Account,Expense,費用
 DocType: Sales Invoice,Exhibition,展覽
@@ -3223,19 +3087,19 @@
 DocType: Employee,Held On,舉行
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +33,Production Item,生產項目
 ,Employee Information,僱員資料
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,Rate (%),率（ ％ ）
+apps/erpnext/erpnext/public/js/setup_wizard.js +294,Rate (%),率（ ％ ）
 DocType: Stock Entry Detail,Additional Cost,額外費用
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +407,Financial Year End Date,財政年度年結日
+apps/erpnext/erpnext/public/js/setup_wizard.js +155,Financial Year End Date,財政年度年結日
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Voucher No, if grouped by Voucher",是冷凍的帳戶。要禁止該帳戶創建/編輯事務，你需要角色
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +484,Make Supplier Quotation,讓供應商報價
 DocType: Quality Inspection,Incoming,來
 DocType: BOM,Materials Required (Exploded),所需材料（分解）
 DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),降低盈利停薪留職（LWP）
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +512,"Add users to your organization, other than yourself",將用戶添加到您的組織，除了自己
+apps/erpnext/erpnext/public/js/setup_wizard.js +256,"Add users to your organization, other than yourself",將用戶添加到您的組織，除了自己
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No {1} does not match with {2} {3},行＃{0}：序列號{1}不相匹配{2} {3}
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +44,Casual Leave,事假
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +44,Casual Leave,事假
 DocType: Batch,Batch ID,批次ID
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +334,Note: {0},注： {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +336,Note: {0},注： {0}
 ,Delivery Note Trends,送貨單趨勢
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +104,This Week's Summary,本週的總結
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +74,{0} must be a Purchased or Sub-Contracted Item in row {1},{0}必須是購買或分包項目中列{1}
@@ -3247,7 +3111,7 @@
 DocType: Purchase Receipt,Return Against Purchase Receipt,採購入庫的退貨
 DocType: Purchase Order,To Bill,發票待輸入
 DocType: Material Request,% Ordered,％有序
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +61,Piecework,計件工作
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Piecework,計件工作
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +64,Avg. Buying Rate,平均。買入價
 DocType: Task,Actual Time (in Hours),實際時間（小時）
 DocType: Employee,History In Company,公司歷史
@@ -3264,13 +3128,13 @@
 DocType: Opportunity,To Discuss,為了討論
 DocType: SMS Settings,SMS Settings,短信設置
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +60,Temporary Accounts,臨時帳戶
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +155,Black,黑
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Black,黑
 DocType: BOM Explosion Item,BOM Explosion Item,BOM展開項目
 DocType: Account,Auditor,核數師
 DocType: Purchase Order,End date of current order's period,當前訂單的週期的最後一天
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +17,Make Offer Letter,使錄取通知書
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +10,Return,退貨
-apps/erpnext/erpnext/stock/doctype/item/item.py +503,Default Unit of Measure for Variant must be same as Template,測度變異的默認單位必須與模板
+apps/erpnext/erpnext/stock/doctype/item/item.py +507,Default Unit of Measure for Variant must be same as Template,測度變異的默認單位必須與模板
 DocType: DocField,Fold,折
 DocType: Production Order Operation,Production Order Operation,生產訂單操作
 DocType: Pricing Rule,Disable,關閉
@@ -3281,13 +3145,12 @@
 DocType: Page,Page Name,網頁名稱
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +110,To Time must be greater than From Time,到時間必須大於從時間
 DocType: Journal Entry Account,Exchange Rate,匯率
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +465,Sales Order {0} is not submitted,銷售訂單{0}未提交
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +467,Sales Order {0} is not submitted,銷售訂單{0}未提交
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0}: Parent account {1} does not bolong to the company {2},倉庫{0}：父帳戶{1}不屬於該公司{2}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +124,Spindle finishing,主軸整理
 DocType: BOM,Last Purchase Rate,最後預訂價
 DocType: Account,Asset,財富
 DocType: Project Task,Task ID,任務ID
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +395,"e.g. ""MC""",例如“MC”
+apps/erpnext/erpnext/public/js/setup_wizard.js +143,"e.g. ""MC""",例如“MC”
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,Stock cannot exist for Item {0} since has variants,股票可以為項目不存在{0}，因為有變種
 ,Sales Person-wise Transaction Summary,銷售人員相關的交易匯總
 DocType: System Settings,Time Zone,時區
@@ -3295,10 +3158,8 @@
 apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,立即註冊ERPNext中心
 DocType: Monthly Distribution,Monthly Distribution Percentages,每月分佈百分比
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +16,The selected item cannot have Batch,所選項目不能批
-DocType: Delivery Note,% of materials delivered against this Delivery Note,針對這張送貨單 ％ 的物料已交貨
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +151,Stapling,裝訂
+DocType: Delivery Note,% of materials delivered against this Delivery Note,針對這張送貨單物料已交貨的百分比(%)
 DocType: Customer,Customer Details,客戶詳細資訊
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +105,Shaping,成型
 DocType: Employee,Reports to,隸屬於
 DocType: SMS Settings,Enter url parameter for receiver nos,輸入URL參數的接收器號
 DocType: Sales Invoice,Paid Amount,支付的金額
@@ -3307,13 +3168,13 @@
 DocType: Item Variant,Item Variant,項目變
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +15,Setting this Address Template as default as there is no other default,設置此地址模板為預設當沒有其它的預設值
 apps/erpnext/erpnext/accounts/doctype/account/account.py +89,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'",帳戶餘額已歸為借記帳戶，不允許設為信用帳戶
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +76,Quality Management,品質管理
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Quality Management,品質管理
 DocType: Production Planning Tool,Filter based on customer,過濾器可根據客戶
 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}的量
 DocType: Employee External Work History,Employee External Work History,員工對外工作歷史
 DocType: Tax Rule,Purchase,採購
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +34,Balance Qty,餘額數量
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Balance Qty,餘額數量
 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/accounts/page/accounts_browser/accounts_browser.js +96,Cost Centers,成本中心
@@ -3323,12 +3184,12 @@
 DocType: Opportunity,Next Contact,下一頁聯繫
 DocType: Employee,Employment Type,就業類型
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,固定資產
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +84,Application period cannot be across two alocation records,申請期間不能跨兩個alocation記錄
 DocType: Item Group,Default Expense Account,預設費用帳戶
 DocType: Employee,Notice (days),通告（天）
 DocType: Page,Yes,是的
 DocType: Tax Rule,Sales Tax Template,銷售稅模板
 DocType: Employee,Encashment Date,兌現日期
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +74,Electroforming,電鑄
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +179,"Against Voucher Type must be one of Purchase Order, Purchase Invoice or Journal Entry",對憑證類型必須是採購訂單，採購發票或日記帳分錄
 DocType: Account,Stock Adjustment,庫存調整
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +34,Default Activity Cost exists for Activity Type - {0},默認情況下存在作業成本的活動類型 -  {0}
@@ -3364,12 +3225,12 @@
 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,分配
 apps/erpnext/erpnext/public/js/pos/pos.html +36,Amount Paid,已支付的款項
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +91,Project Manager,專案經理
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +72,Dispatch,調度
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Project Manager,專案經理
+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: Customer,Default Taxes and Charges,默認稅費
 DocType: Account,Receivable,應收賬款
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +268,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,行＃{0}：不能更改供應商的採購訂單已經存在
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +263,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的子裝配項目將被視為獲取原料。否則，所有的子組件件，將被視為一個原料。
@@ -3377,8 +3238,8 @@
 DocType: Hub Settings,Seller Description,賣家描述
 DocType: Employee Education,Qualification,合格
 DocType: Item Price,Item Price,商品價格
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +48,Soap & Detergent,肥皂和洗滌劑
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +36,Motion Picture & Video,電影和視頻
+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,訂購
 DocType: Warehouse,Warehouse Name,倉庫名稱
 DocType: Naming Series,Select Transaction,選擇交易
@@ -3387,7 +3248,6 @@
 DocType: BOM,Rate Of Materials Based On,材料成本基於
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,支援分析
 apps/erpnext/erpnext/accounts/doctype/accounts_settings/accounts_settings.py +27,Company is missing in warehouses {0},公司在倉庫缺少{0}
-DocType: Stock UOM Replace Utility,Stock UOM Replace Utility,庫存計量單位更換工具
 DocType: POS Profile,Terms and Conditions,條款和條件
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,To Date should be within the Fiscal Year. Assuming To Date = {0},日期應該是在財政年度內。假設終止日期= {0}
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc",在這裡，你可以保持身高，體重，過敏，醫療問題等
@@ -3399,7 +3259,7 @@
 DocType: Sales Order Item,For Production,對於生產
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +103,Please enter sales order in the above table,請在上表輸入訂單
 DocType: Project Task,View Task,查看任務
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +406,Your financial year begins on,您的會計年度自
+apps/erpnext/erpnext/public/js/setup_wizard.js +154,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: Email Digest,Add/Remove Recipients,添加／刪除收件人
@@ -3407,16 +3267,14 @@
 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 +528,Item variant {0} exists with same attributes,項目變種{0}存在具有相同屬性
+apps/erpnext/erpnext/stock/doctype/item/item.py +532,Item variant {0} exists with same attributes,項目變種{0}存在具有相同屬性
 DocType: Salary Slip,Salary Slip,工資單
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +116,Burnishing,打磨
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +54,'To Date' is required,“至日期”是必需填寫的
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,“至日期”是必需填寫的
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.",產生交貨的包裝單。用於通知箱號，內容及重量。
 DocType: Sales Invoice Item,Sales Order Item,銷售訂單項目
 DocType: Salary Slip,Payment Days,付款日
 DocType: BOM,Manage cost of operations,管理作業成本
 DocType: Features Setup,Item Advanced,項目高級
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +40,Hot rolling,熱軋
 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,員工教育
@@ -3429,25 +3287,23 @@
 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/setup/page/setup_wizard/install_fixtures.py +48,Sick Leave,病假
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +174,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/page/setup_wizard/fixtures/industry_type.py +22,Department Stores,百貨
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,百貨
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +40,System Balance,系統平衡
 DocType: Workflow,Is Active,啟用
 apps/erpnext/erpnext/controllers/stock_controller.py +71,No accounting entries for the following warehouses,沒有以下的倉庫會計分錄
 apps/erpnext/erpnext/projects/doctype/project/project.js +22,Save the document first.,首先保存文檔。
 DocType: Account,Chargeable,收費
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +121,Linishing,Linishing
 DocType: Company,Change Abbreviation,更改縮寫
 DocType: Workflow State,Primary,主要的
 DocType: Expense Claim Detail,Expense Date,犧牲日期
 DocType: Item,Max Discount (%),最大折讓（％）
 DocType: Communication,More Information,更多信息
 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/setup/page/setup_wizard/fixtures/operations.py +161,Blasting,爆破
 DocType: Company,Warn,警告
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +111,Item valuation updated,物品估價更新
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.",任何其他言論，值得一提的努力，應該在記錄中。
 DocType: BOM,Manufacturing User,製造業用戶
 DocType: Purchase Order,Raw Materials Supplied,提供供應商
@@ -3457,7 +3313,7 @@
 DocType: Appraisal,Appraisal Template,評估模板
 DocType: Communication,Email,電子郵件
 DocType: Item Group,Item Classification,項目分類
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +89,Business Development Manager,業務發展經理
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Business Development Manager,業務發展經理
 DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,維護訪問目的
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.js +15,Period,期間
 ,General Ledger,總帳
@@ -3467,9 +3323,7 @@
 ,Itemwise Recommended Reorder Level,Itemwise推薦級別重新排序
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +264,Please select {0} first,請先選擇{0}
 DocType: Features Setup,To get Item Group in details table,取得詳細表格裡的項目群組
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +67,Redrawing,重繪
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +112,Batch {0} of Item {1} has expired.,一批項目的{0} {1}已過期。
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +120,Etching,蝕刻
 DocType: Sales Invoice,Commission,佣金
 DocType: Address Template,"<h4>Default Template</h4>
 <p>Uses <a href=""http://jinja.pocoo.org/docs/templates/"">Jinja Templating</a> and all the fields of Address (including Custom Fields if any) will be available</p>
@@ -3514,7 +3368,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +340,Operation Time must be greater than 0 for Operation {0},運行時間必須大於0的操作{0}
 DocType: Supplier,Address and Contacts,地址和聯繫方式
 DocType: UOM Conversion Detail,UOM Conversion Detail,計量單位換算詳細
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +496,Keep it web friendly 900px (w) by 100px (h),900px （寬）x 100像素（高）
+apps/erpnext/erpnext/public/js/setup_wizard.js +242,Keep it web friendly 900px (w) by 100px (h),900px （寬）x 100像素（高）
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +329,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,獲得傑出禮券
@@ -3530,54 +3384,49 @@
 DocType: Item,Average time taken by the supplier to deliver,採取供應商的平均時間交付
 DocType: Time Log,Hours,小時
 DocType: Project,Expected Start Date,預計開始日期
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +38,Rolling,滾動
 DocType: ToDo,Priority,優先
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +41,Remove item if charges is not applicable to that item,刪除項目，如果收費並不適用於該項目
 DocType: Dropbox Backup,Dropbox Access Allowed,允許訪問Dropbox
 DocType: Dropbox Backup,Weekly,每週
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,例如：。 smsgateway.com / API / send_sms.cgi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +485,Receive,接受
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +510,Receive,接受
 DocType: Maintenance Visit,Fully Completed,全面完成
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}％完成
 DocType: Employee,Educational Qualification,學歷
 DocType: Workstation,Operating Costs,運營成本
 DocType: Employee Leave Approver,Employee Leave Approver,員工請假審批
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,{0} has been successfully added to our Newsletter list.,{0}已成功添加到我們的新聞列表。
-apps/erpnext/erpnext/stock/doctype/item/item.py +383,Row {0}: An Reorder entry already exists for this warehouse {1},行{0}：一個重新排序條目已存在這個倉庫{1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +387,Row {0}: An Reorder entry already exists for this warehouse {1},行{0}：一個重新排序條目已存在這個倉庫{1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +67,"Cannot declare as lost, because Quotation has been made.",不能聲明為丟失，因為報價已經取得進展。
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +133,Electron beam machining,電子束加工
 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 +150,Please select Start Date and End Date for Item {0},請選擇項目{0}的開始日期和結束日期
 apps/erpnext/erpnext/config/stock.py +141,Main Reports,主報告
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +102,Stock Ledger entries balances updated,庫存總帳條目更新結餘
 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 +176,Add / Edit Prices,新增/編輯價格
+apps/erpnext/erpnext/stock/doctype/item/item.js +178,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 +298,My Orders,我的訂單
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +293,My Orders,我的訂單
 DocType: Price List,Price List Name,價格列表名稱
 DocType: Time Log,For Manufacturing,對於製造業
-apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +70,Totals,總計
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +174,Totals,總計
 DocType: BOM,Manufacturing,製造
 ,Ordered Items To Be Delivered,訂購項目交付
 DocType: Account,Income,收入
 ,Setup Wizard,設置嚮導
 DocType: Industry Type,Industry Type,行業類型
 apps/erpnext/erpnext/templates/includes/cart.js +137,Something went wrong!,出事了！
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +68,Warning: Leave application contains following block dates,警告：離開包含以下日期區塊的應用程式
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +251,Sales Invoice {0} has already been submitted,銷售發票{0}已提交
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +100,Warning: Leave application contains following block dates,警告：離開包含以下日期區塊的應用程式
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +256,Sales Invoice {0} has already been submitted,銷售發票{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/setup/page/setup_wizard/fixtures/operations.py +10,Die casting,壓鑄模具
 DocType: Email Alert,Reference Date,參考日期
 apps/erpnext/erpnext/config/hr.py +105,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,在發送前，請填寫留言
 DocType: Async Task,Status,狀態
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +65,Stock UOM updated for Item {0},股票UOM更新的項目{0}
 DocType: Company History,Year,年
 apps/erpnext/erpnext/config/accounts.py +127,Point-of-Sale Profile,簡介銷售點的
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +68,Please Update SMS Settings,請更新短信設置
@@ -3591,12 +3440,12 @@
 ,Serial No Service Contract Expiry,序號服務合同到期
 DocType: Item,Unit of Measure Conversion,轉換度量單位
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +86,Employee can not be changed,僱員不能改變
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +259,You cannot credit and debit same account at the same time,你無法將貸方與借方在同一時間記在同一帳戶
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,You cannot credit and debit same account at the same time,你無法將貸方與借方在同一時間記在同一帳戶
 DocType: Naming Series,Help HTML,HTML幫助
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},分配的總權重應為100 ％ 。這是{0}
 apps/erpnext/erpnext/controllers/status_updater.py +140,Allowance for over-{0} crossed for Item {1},備抵過{0}越過為項目{1}
 DocType: Address,Name of person or organization that this address belongs to.,此地址所屬的人或組織的名稱。
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +587,Your Suppliers,您的供應商
+apps/erpnext/erpnext/public/js/setup_wizard.js +325,Your Suppliers,您的供應商
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,不能設置為失落的銷售訂單而成。
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +65,Another Salary Structure {0} is active for employee {1}. Please make its status 'Inactive' to proceed.,另外工資結構{0}激活員工{1}。請其狀態“無效”繼續。
 DocType: Purchase Invoice,Contact,聯繫
@@ -3604,38 +3453,36 @@
 DocType: Lead,Converted,轉換
 DocType: Item,Has Serial No,有序列號
 DocType: Employee,Date of Issue,發行日期
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +16,{0}: From {0} for {1},{0}：從{0} {1}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +154,Row #{0}: Set Supplier for item {1},行＃{0}：設置供應商項目{1}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +16,{0}: From {0} for {1},{0}：從{0}給 {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +149,Row #{0}: Set Supplier for item {1},行＃{0}：設置供應商項目{1}
 DocType: Issue,Content Type,內容類型
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +17,Computer,電腦
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,電腦
 DocType: Item,List this Item in multiple groups on the website.,列出這個項目在網站上多個組。
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +283,Please check Multi Currency option to allow accounts with other currency,請檢查多幣種選項，允許帳戶與其他貨幣
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +285,Please check Multi Currency option to allow accounts with other currency,請檢查多幣種選項，允許帳戶與其他貨幣
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +62,Item: {0} does not exist in the system,項：{0}不存在於系統中
 apps/erpnext/erpnext/accounts/doctype/account/account.py +81,You are not authorized to set Frozen value,您無權設定值凍結
 DocType: Payment Reconciliation,Get Unreconciled Entries,獲取未調節項
 DocType: Cost Center,Budgets,預算
 apps/frappe/frappe/core/page/modules_setup/modules_setup.py +11,Updated,已更新
 DocType: Employee,Emergency Contact Details,緊急聯繫方式
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +396,What does it do?,它有什麼作用？
+apps/erpnext/erpnext/public/js/setup_wizard.js +144,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,平均佣金率
-apps/erpnext/erpnext/stock/doctype/item/item.py +313,'Has Serial No' can not be 'Yes' for non-stock item,非庫存項目不能有序號
+apps/erpnext/erpnext/stock/doctype/item/item.py +317,'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/setup/page/setup_wizard/install_fixtures.py +111,Electrical,電子的
+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 +302,Row {0}: Exchange Rate is mandatory,行{0}：匯率是必須的
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +304,Row {0}: Exchange Rate is mandatory,行{0}：匯率是必須的
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},用戶ID不為員工設置{0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +72,Peening,噴丸
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,From Warranty Claim,從保修索賠
 DocType: Stock Entry,Default Source Warehouse,預設來源倉庫
 DocType: Item,Customer Code,客戶代碼
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +212,Birthday Reminder for {0},生日提醒{0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +163,Lapping,精研
-apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.js +8,Days Since Last Order,天自上次訂購
+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 +299,Debit To account must be a Balance Sheet account,借記帳戶必須是資產負債表科目
 DocType: Buying Settings,Naming Series,命名系列
 DocType: Leave Block List,Leave Block List Name,休假區塊清單名稱
@@ -3649,7 +3496,7 @@
 DocType: Notification Control,Sales Invoice Message,銷售發票訊息
 DocType: Authorization Rule,Based On,基於
 DocType: Sales Order Item,Ordered Qty,訂購數量
-apps/erpnext/erpnext/stock/doctype/item/item.py +539,Item {0} is disabled,項目{0}無效
+apps/erpnext/erpnext/stock/doctype/item/item.py +543,Item {0} is disabled,項目{0}無效
 DocType: Stock Settings,Stock Frozen Upto,存貨凍結到...為止
 apps/erpnext/erpnext/controllers/recurring_document.py +166,Period From and Period To dates mandatory for recurring {0},期間從和週期要日期強制性的經常性{0}
 apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,專案活動／任務。
@@ -3659,7 +3506,6 @@
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,折扣必須小於100
 DocType: ToDo,Low,低
 DocType: Purchase Invoice,Write Off Amount (Company Currency),核銷金額（公司貨幣）
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +71,Spinning,紡織
 DocType: Landed Cost Voucher,Landed Cost Voucher,到岸成本憑證
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +55,Please set {0},請設置{0}
 DocType: Purchase Invoice,Repeat on Day of Month,在月內的一天重複
@@ -3681,7 +3527,6 @@
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +37,Campaign Name is required,活動名稱是必需的
 DocType: Maintenance Visit,Maintenance Date,維修日期
 DocType: Purchase Receipt Item,Rejected Serial No,拒絕序列號
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +51,Deep drawing,深拉伸
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +40,New Newsletter,新的通訊
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +157,Start date should be less than end date for Item {0},項目{0}的開始日期必須小於結束日期
 apps/erpnext/erpnext/stock/doctype/item/item.js +17,Show Balance,顯示庫存餘額
@@ -3692,7 +3537,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +119,BOM and Manufacturing Quantity are required,BOM和生產量是必需的
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,老齡範圍2
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +450,Amount,量
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +147,Riveting,鉚
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,BOM取代
 ,Sales Analytics,銷售分析
 DocType: Manufacturing Settings,Manufacturing Settings,製造設定
@@ -3704,20 +3548,19 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +207,New Account Name,新帳號名稱
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,原料供應成本
 DocType: Selling Settings,Settings for Selling Module,設置銷售模塊
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +73,Customer Service,顧客服務
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Customer Service,顧客服務
 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.,報價候選作業。
 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 +70,Item {0} must be a stock Item,項{0}必須是一個缺貨登記
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,預設在製品倉庫
 apps/erpnext/erpnext/config/accounts.py +107,Default settings for accounting transactions.,會計交易的預設設定。
 apps/frappe/frappe/model/naming.py +40,{0} is required,{0}是必需的
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +21,Vacuum molding,真空成型
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,訊息大於160個字符將會被分成多個訊息
 DocType: Contact Us Settings,City,城市
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +132,Ultrasonic machining,超聲波加工
 apps/frappe/frappe/templates/base.html +137,Error: Not a valid id?,錯誤：沒有有效的身份證？
 apps/erpnext/erpnext/stock/get_item_details.py +125,Item {0} must be a Sales Item,項{0}必須是一個銷售項目
 DocType: Naming Series,Update Series Number,更新序列號
@@ -3725,7 +3568,7 @@
 DocType: Sales Order,Printing Details,印刷詳情
 DocType: Task,Closing Date,截止日期
 DocType: Sales Order Item,Produced Quantity,生產的產品數量
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +84,Engineer,工程師
+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 +379,Item Code required at Row No {0},於列{0}需要產品編號
 DocType: Sales Partner,Partner Type,合作夥伴類型
@@ -3733,7 +3576,7 @@
 DocType: Authorization Rule,Customerwise Discount,Customerwise折扣
 DocType: Purchase Invoice,Against Expense Account,對費用帳戶
 DocType: Production Order,Production Order,生產訂單
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +258,Installation Note {0} has already been submitted,安裝注意{0}已提交
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +263,Installation Note {0} has already been submitted,安裝注意{0}已提交
 DocType: Quotation Item,Against Docname,對Docname
 DocType: SMS Center,All Employee (Active),所有員工（活動）
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,立即觀看
@@ -3742,19 +3585,19 @@
 DocType: Item,Re-Order Level,重新排序級別
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,輸入您想要提高生產訂單或下載的原材料進行分析的項目和計劃數量。
 apps/frappe/frappe/public/js/frappe/views/ganttview.js +45,Gantt Chart,甘特圖
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +57,Part-time,兼任
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,Part-time,兼任
 DocType: Employee,Applicable Holiday List,適用假期表
 DocType: Employee,Cheque,支票
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,系列更新
 apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Report Type is mandatory,報告類型是強制性的
 DocType: Item,Serial Number Series,序列號系列
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},倉庫是強制性的股票項目{0}行{1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +45,Retail & Wholesale,零售及批發
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,零售及批發
 DocType: Issue,First Responded On,首先作出回應
 DocType: Website Item Group,Cross Listing of Item in multiple groups,在多組項目的交叉上市
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +351,The First User: You,第一個用戶：您
+apps/erpnext/erpnext/public/js/setup_wizard.js +101,The First User: You,第一個用戶：您
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +48,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 +172,Successfully Reconciled,不甘心成功
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +119,Successfully Reconciled,不甘心成功
 DocType: Production Order,Planned End Date,計劃的結束日期
 apps/erpnext/erpnext/config/stock.py +43,Where items are stored.,項目的存儲位置。
 DocType: Tax Rule,Validity,有效性
@@ -3774,39 +3617,36 @@
 DocType: DocPerm,Level,級別
 DocType: Purchase Taxes and Charges,On Net Total,在總淨
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +160,Target warehouse in row {0} must be same as Production Order,行目標倉庫{0}必須與生產訂單
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +59,No permission to use Payment Tool,沒有權限使用支付工具
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +97,No permission to use Payment Tool,沒有權限使用支付工具
 apps/erpnext/erpnext/controllers/recurring_document.py +192,'Notification Email Addresses' not specified for recurring %s,為重複％不是指定的“通知電子郵件地址”
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +86,Milling,磨
 apps/erpnext/erpnext/accounts/doctype/account/account.py +99,Currency can not be changed after making entries using some other currency,貨幣不能使用其他貨幣進行輸入後更改
 DocType: Company,Round Off Account,四捨五入賬戶
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +60,Nibbling,嗑
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,行政開支
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +18,Consulting,諮詢
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +18,Consulting,諮詢
 DocType: Customer Group,Parent Customer Group,母客戶群組
 apps/erpnext/erpnext/public/js/pos/pos.js +429,Change,更改
 DocType: Purchase Invoice,Contact Email,聯絡電郵
 DocType: Appraisal Goal,Score Earned,獲得得分
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +393,"e.g. ""My Company LLC""",例如“我的公司有限責任公司”
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +173,Notice Period,通知期
+apps/erpnext/erpnext/public/js/setup_wizard.js +141,"e.g. ""My Company LLC""",例如“我的公司有限責任公司”
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +173,Notice Period,通知期
 DocType: Bank Reconciliation Detail,Voucher ID,優惠券編號
 apps/erpnext/erpnext/setup/doctype/territory/territory.js +14,This is a root territory and cannot be edited.,集團或Ledger ，借方或貸方，是特等帳戶
 DocType: Packing Slip,Gross Weight UOM,毛重計量單位
 DocType: Email Digest,Receivables / Payables,應收/應付賬款
 DocType: Delivery Note Item,Against Sales Invoice,對銷售發票
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +63,Stamping,沖壓
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +457,Credit Account,信用賬戶
 DocType: Landed Cost Item,Landed Cost Item,到岸成本項目
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +56,Show zero values,顯示零值
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,製造/從原材料數量給予重新包裝後獲得的項目數量
 DocType: Payment Reconciliation,Receivable / Payable Account,應收/應付賬款
 DocType: Delivery Note Item,Against Sales Order Item,對銷售訂單項目
-apps/erpnext/erpnext/stock/doctype/item/item.py +521,Please specify Attribute Value for attribute {0},請指定屬性值的屬性{0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +525,Please specify Attribute Value for attribute {0},請指定屬性值的屬性{0}
 DocType: Item,Default Warehouse,預設倉庫
 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,列印表單時不印金額
-apps/erpnext/erpnext/controllers/buying_controller.py +69,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,稅務類別不能為'估值'或'估值及總，因為所有的項目都是非庫存產品
+apps/erpnext/erpnext/controllers/buying_controller.py +60,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,稅務類別不能為'估值'或'估值及總，因為所有的項目都是非庫存產品
 DocType: User,Last Name,姓
 DocType: Web Page,Left,左
 DocType: Event,All Day,全日
@@ -3814,7 +3654,7 @@
 DocType: Appraisal,Total Score (Out of 5),總分（滿分5分）
 DocType: Contact Us Settings,State,狀態
 DocType: Batch,Batch,批量
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +51,Balance,平衡
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +28,Balance,平衡
 DocType: Project,Total Expense Claim (via Expense Claims),總費用報銷（通過費用報銷）
 DocType: User,Gender,性別
 DocType: Journal Entry,Debit Note,繳費單
@@ -3844,8 +3684,7 @@
 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/setup/page/setup_wizard/fixtures/operations.py +76,Seaming,封罐
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +197,"Company Email ID not found, hence mail not sent",公司電子郵件ID沒有找到，因此郵件無法發送
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +206,"Company Email ID not found, hence mail not sent",公司電子郵件ID沒有找到，因此郵件無法發送
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),基金中的應用（資產）
 DocType: Production Planning Tool,Filter based on item,根據項目篩選
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +451,Debit Account,借方科目
@@ -3857,18 +3696,17 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +95,{0} {1} has been modified. Please refresh.,{0} {1}已修改。請更新。
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,停止用戶在下面日期提出休假申請。
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +591,From Opportunity,從機會
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +46,Blanking,消隱
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +166,Employee Benefits,員工福利
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,Employee Benefits,員工福利
 DocType: Sales Invoice,Is POS,是POS機
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +240,Packed quantity must equal quantity for Item {0} in row {1},盒裝數量必須等於{1}列品項{0}的數量
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +245,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.,客戶提出的賬單。
 DocType: DocField,Default,預設
 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 +466,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}新增用戶
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +468,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}用戶已新增
 DocType: Maintenance Schedule,Schedule,時間表
 DocType: Cost Center,"Define Budget for this Cost Center. To set budget action, see ""Company List""",定義預算這個成本中心。要設置預算的行動，請參閱“企業名錄”
 DocType: Account,Parent Account,父帳戶
@@ -3878,7 +3716,7 @@
 apps/erpnext/erpnext/public/js/pos/pos.js +91,Price List not found or disabled,價格表未找到或禁用
 DocType: Expense Claim,Approved,批准
 DocType: Pricing Rule,Price,價格
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +79,Employee relieved on {0} must be set as 'Left',員工解除對{0}必須設定為“左”
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +88,Employee relieved on {0} must be set as 'Left',員工解除對{0}必須設定為“左”
 DocType: Item,"Selecting ""Yes"" will give a unique identity to each entity of this item which can be viewed in the Serial No master.",選擇“Yes”將提供一個獨特的身份，以這個項目的每個實體可在序列號主觀看。
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +39,Appraisal {0} created for Employee {1} in the given date range,鑑定{0}為員工在給定日期範圍{1}創建
 DocType: Employee,Education,教育
@@ -3889,7 +3727,7 @@
 apps/frappe/frappe/desk/moduleview.py +67,Standard Reports,標準報告
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,會計日記帳分錄。
 DocType: Delivery Note Item,Available Qty at From Warehouse,可用數量從倉庫
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +209,Please select Employee Record first.,請選擇員工記錄第一。
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +224,Please select Employee Record first.,請選擇員工記錄第一。
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,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 +233,Please enter Expense Account,請輸入您的費用帳戶
@@ -3902,46 +3740,43 @@
 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,基於上述標準拉銷售訂單（待定提供）
 DocType: DocShare,Document Type,文件類型
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +565,From Supplier Quotation,從供應商報價
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +588,From Supplier Quotation,從供應商報價
 DocType: Deduction Type,Deduction Type,扣類型
 DocType: Attendance,Half Day,半天
 DocType: Pricing Rule,Min Qty,最小數量
 DocType: Features Setup,"To track items in sales and purchase documents with batch nos. ""Preferred Industry: Chemicals""",要跟踪與批次號的銷售和採購文件的項目。 “首選行業：化工”
 DocType: GL Entry,Transaction Date,交易日期
 DocType: Production Plan Item,Planned Qty,計劃數量
-apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +91,Total Tax,總稅收
+apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +93,Total Tax,總稅收
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +178,For Quantity (Manufactured Qty) is mandatory,對於數量（製造數量）是強制性的
 DocType: Stock Entry,Default Target Warehouse,預設目標倉庫
 DocType: Purchase Invoice,Net Total (Company Currency),總淨值（公司貨幣）
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +79,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,行{0}：黨的類型和黨的只適用對應收/應付帳戶
 DocType: Notification Control,Purchase Receipt Message,採購入庫單訊息
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +95,Total allocated leaves are more than period,分配的總葉多期
 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.,記錄項目移動。
 DocType: Newsletter List Subscriber,Newsletter List Subscriber,通訊訂戶名單
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +164,Morticing,Morticing
 DocType: Email Account,Service,服務
 DocType: Hub Settings,Hub Settings,中心設定
 DocType: Project,Gross Margin %,毛利率％
 DocType: BOM,With Operations,加入作業
 apps/erpnext/erpnext/accounts/party.py +232,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,會計分錄已取得貨幣{0}為公司{1}。請選擇一個應收或應付賬戶幣種{0}。
 ,Monthly Salary Register,月薪註冊
-apps/frappe/frappe/website/template.py +140,Next,下一個
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard_page.html +17,Next,下一個
 DocType: Warranty Claim,If different than customer address,如果與客戶地址不同
 DocType: BOM Operation,BOM Operation,BOM的操作
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +118,Electropolishing,電解
 DocType: Purchase Taxes and Charges,On Previous Row Amount,在上一行金額
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +24,Please enter Payment Amount in atleast one row,請輸入至少一行的付款金額
+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簡介
 apps/erpnext/erpnext/config/accounts.py +153,"Seasonality for setting budgets, targets etc.",季節性設置預算，目標等。
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +238,Row {0}: Payment Amount cannot be greater than Outstanding Amount,行{0}：付款金額不能大於傑出金額
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +46,Total Unpaid,總未付
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +21,Time Log is not billable,時間日誌是不計費
 apps/erpnext/erpnext/stock/get_item_details.py +128,"Item {0} is a template, please select one of its variants",項目{0}是一個模板，請選擇它的一個變體
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +528,Purchaser,購買者
+apps/erpnext/erpnext/public/js/setup_wizard.js +272,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 +71,Please enter the Against Vouchers manually,請手動輸入對優惠券
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +107,Please enter the Against Vouchers manually,請手動輸入對優惠券
 DocType: SMS Settings,Static Parameters,靜態參數
 DocType: Purchase Order,Advance Paid,提前支付
 DocType: Item,Item Tax,產品稅
@@ -3950,14 +3785,12 @@
 apps/erpnext/erpnext/config/crm.py +48,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 +57,Actual Qty is mandatory,實際數量是強制性
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +42,Cross-rolling,交叉軋製
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +132,Credit Card,信用卡
+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 +95,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,請輸入稅費
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +85,Machining,加工
 DocType: Sales Invoice Item,Drop Ship,直接發運給客戶
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children",在這裡，您可以維護家庭的詳細訊息，如父母，配偶和子女的姓名及職業
 DocType: Hub Settings,Seller Name,賣家名稱
@@ -3967,7 +3800,7 @@
 DocType: Stock Entry,Repack,重新包裝
 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/setup/page/setup_wizard/setup_wizard.js +500,Attach Logo,附加標誌
+apps/erpnext/erpnext/public/js/setup_wizard.js +246,Attach Logo,附加標誌
 DocType: Customer,Commission Rate,佣金率
 apps/erpnext/erpnext/stock/doctype/item/item.js +38,Make Variant,在Variant
 apps/erpnext/erpnext/config/hr.py +145,Block leave applications by department.,按部門封鎖請假申請。
@@ -3982,19 +3815,19 @@
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +105,Please select a csv file,請選擇一個csv文件
 DocType: Dropbox Backup,Send Backups to Dropbox,發送到備份Dropbox的
 DocType: Purchase Order,To Receive and Bill,準備收料及接收發票
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +94,Designer,設計師
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Designer,設計師
 apps/erpnext/erpnext/config/selling.py +121,Terms and Conditions Template,條款及細則範本
 DocType: Serial No,Delivery Details,交貨細節
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +383,Cost Center is required in row {0} in Taxes table for type {1},成本中心是必需的行{0}稅表型{1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +386,Cost Center is required in row {0} in Taxes table for type {1},成本中心是必需的行{0}稅表型{1}
 DocType: Item,Automatically create Material Request if quantity falls below this level,自動創建材料，如果申請數量低於這個水平
 ,Item-wise Purchase Register,項目明智的購買登記
 DocType: Batch,Expiry Date,到期時間
-apps/erpnext/erpnext/stock/doctype/item/item.py +375,"To set reorder level, item must be a Purchase Item or Manufacturing Item",要設置訂貨點水平，項目必須購買項目或生產項目
+apps/erpnext/erpnext/stock/doctype/item/item.py +379,"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.,專案主持。
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,不要顯示如$等任何貨幣符號。
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +330, (Half Day),（半天）
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +374, (Half Day),（半天）
 DocType: Supplier,Credit Days,信貸天
 DocType: Leave Type,Is Carry Forward,是弘揚
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +478,Get Items from BOM,從物料清單獲取項目
@@ -4002,7 +3835,7 @@
 apps/erpnext/erpnext/config/manufacturing.py +120,Bill of Materials,材料清單
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +77,Row {0}: Party Type and Party is required for Receivable / Payable account {1},行{0}：黨的類型和黨的需要應收/應付帳戶{1}
 DocType: Dropbox Backup,Send Notifications To,發送通知給
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html +26,Ref Date,參考日期
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +54,Ref Date,參考日期
 DocType: Employee,Reason for Leaving,離職原因
 DocType: Expense Claim Detail,Sanctioned Amount,制裁金額
 DocType: GL Entry,Is Opening,是開幕
@@ -4010,4 +3843,3 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +188,Account {0} does not exist,帳戶{0}不存在
 DocType: Account,Cash,現金
 DocType: Employee,Short biography for website and other publications.,網站和其他出版物的短的傳記。
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +31,Please create Salary Structure for employee {0},請對{0}員工建立薪酬結構